diff --git a/.eslintrc.js b/.eslintrc.js
deleted file mode 100644
index 248522c29d0..00000000000
--- a/.eslintrc.js
+++ /dev/null
@@ -1,372 +0,0 @@
-const path = require('path');
-
-module.exports = {
-    root: true,
-    parser: '@typescript-eslint/parser',
-    parserOptions: {
-        // latest is best, because it's backwards compatible and we have linted everything
-        ecmaVersion: 'latest',
-        sourceType: 'module',
-        ecmaFeatures: {
-            jsx: true,
-        },
-    },
-    plugins: [
-        'import',
-        '@typescript-eslint',
-        'react-hooks',
-        'jest',
-        'chai-friendly',
-        'react',
-        'local-rules',
-    ],
-    extends: [
-        'plugin:@typescript-eslint/recommended',
-        'plugin:react/recommended',
-        'plugin:import/typescript',
-        'plugin:react-hooks/recommended',
-    ],
-    settings: {
-        react: {
-            version: 'detect',
-        },
-        'import/ignore': ['node_modules', '\\.(coffee|scss|css|less|hbs|svg|json)$'],
-        'import/resolver': {
-            node: {
-                paths: [path.resolve(__dirname, 'eslint-rules')],
-            },
-        },
-    },
-    env: {
-        jest: true,
-        'jest/globals': true,
-    },
-    ignorePatterns: [
-        '**/lib/*',
-        '**/libDev/*',
-        '**/dist/*',
-        '**/coverage/*',
-        '**/build/*',
-        '**/build-electron/*',
-        '**/node_modules/*',
-        '**/public/*',
-        'packages/suite-data/files/*',
-        'packages/protobuf/scripts/protobuf-patches/*',
-        'packages/address-validator',
-        'packages/connect-examples',
-        'ci/',
-        'eslint-local-rules/*',
-    ],
-    rules: {
-        '@typescript-eslint/no-empty-object-type': 'off',
-        '@typescript-eslint/no-require-imports': 'off',
-        '@typescript-eslint/prefer-ts-expect-error': 'error',
-        // I believe type is enforced by callers.
-        '@typescript-eslint/explicit-function-return-type': 'off',
-        // Enforce arrow functions only is afaik not possible. But this helps.
-        'func-style': [
-            'error',
-            'declaration',
-            {
-                allowArrowFunctions: true,
-            },
-        ],
-        // Fix for TypeScript.
-        'react/jsx-filename-extension': [
-            'error',
-            {
-                extensions: ['.tsx'],
-            },
-        ],
-        'import/order': [
-            1,
-            {
-                groups: [['builtin', 'external'], 'internal', ['sibling', 'parent']],
-                pathGroups: [
-                    {
-                        pattern: 'react*',
-                        group: 'external',
-                        position: 'before',
-                    },
-                    { pattern: '@trezor/**', group: 'internal' }, // Translates to /packages/** */
-                    { pattern: '@suite-native/**', group: 'internal' },
-                    { pattern: '@suite-common/**', group: 'internal' },
-                    { pattern: 'src/**', group: 'internal', position: 'after' },
-                ],
-                pathGroupsExcludedImportTypes: ['internal', 'react'],
-                'newlines-between': 'always',
-            },
-        ],
-        'import/no-extraneous-dependencies': [
-            'error',
-            {
-                devDependencies: [
-                    '**/*fixtures*/**',
-                    '**/*.test.{tsx,ts,js}',
-                    '**/blockchain-link/tests/**',
-                    '**/blockchain-link/webpack/**',
-                    '**/suite-desktop-core/**',
-                    '**/*e2e/**',
-                    '**/suite/src/support/tests/**',
-                    '**/suite-data/**',
-                    '**/*.stories.*',
-                    '**/*webpack.config*',
-                    '**/webpack/**',
-                ],
-                includeTypes: true,
-            },
-        ],
-        // This promotes using default case, which is not always correct (explicit is better than implicit)
-        'default-case': 'off',
-        // Does not work with TypeScript export type.
-        'import/prefer-default-export': 'off',
-        'import/no-named-as-default': 'off', // default export is forbidden anyway
-        'no-nested-ternary': 'error',
-        // Does not work with Babel react-native to react-native-web
-        'import/no-unresolved': 'off',
-        'import/extensions': 'off',
-        // Could be useful, but it's very very very slow
-        'import/no-cycle': 'off',
-        'import/no-anonymous-default-export': [
-            'error',
-            {
-                allowArray: true,
-                allowLiteral: true,
-                allowObject: true,
-            },
-        ],
-        // We have typescript.
-        'react/prop-types': 'off',
-        // It's fine.
-        'react/no-multi-comp': 'off',
-        'react/no-unescaped-entities': 'off',
-        'react/jsx-curly-brace-presence': ['warn', { props: 'never', children: 'never' }],
-        // This is fine.
-        'class-methods-use-this': 'off',
-        'lines-between-class-members': 'off',
-        // We use it for immer. It should be checked by readonly anyway.
-        'no-param-reassign': 'off',
-        // Irrelevant.
-        'no-plusplus': 'off',
-        'no-return-assign': 'off',
-        'consistent-return': 'off',
-        'no-console': ['error', { allow: ['warn', 'error'] }],
-        // TSC checks it.
-        'no-undef': 'off',
-        'react/jsx-no-undef': 'off',
-        'react/react-in-jsx-scope': 'off',
-        // React Hooks.
-        'react-hooks/rules-of-hooks': 'error',
-        'react-hooks/exhaustive-deps': 'error',
-        // Reconsider, maybe enable later:
-        '@typescript-eslint/explicit-member-accessibility': 'off',
-        '@typescript-eslint/no-explicit-any': 'off',
-        'react/destructuring-assignment': 'off',
-        'func-names': 'off',
-        'react/require-default-props': 'off',
-        '@typescript-eslint/no-non-null-assertion': 'off',
-        // We use this syntax
-        '@typescript-eslint/triple-slash-reference': 'off',
-        // new rules (eslint 6) temporary disabled until components-v2 and ts-ignore resolve
-        'react/jsx-props-no-spreading': 'off',
-        '@typescript-eslint/ban-ts-ignore': 'off',
-        // We need empty functions for mocking modules for react-native
-        '@typescript-eslint/no-empty-function': 'off',
-        'no-useless-constructor': 'off',
-        '@typescript-eslint/no-useless-constructor': 'error',
-        // valid case of class method overloads in typescript
-        'no-dupe-class-members': 'off',
-        '@typescript-eslint/ban-ts-comment': 'off',
-        //  Missing return type on function
-        '@typescript-eslint/explicit-module-boundary-types': 'off',
-        // note you must disable the base rule as it can report incorrect errors
-        'no-use-before-define': 'off',
-        '@typescript-eslint/no-use-before-define': ['error'],
-        'require-await': ['error'],
-        'react/display-name': 'off',
-        'react/jsx-key': 'warn',
-        'react/prefer-stateless-function': 'off', // we don't use classes at all
-        'react/no-deprecated': 'off', // checked by TS
-        'react/no-direct-mutation-state': 'off', // we don't use classes at all
-        'react/require-render-return': 'off', // we don't use classes at all
-        'react/no-is-mounted': 'off', // we don't use classes at all
-        'react/jsx-indent': 'off', // we use prettier
-        'prefer-destructuring': [
-            'error',
-            {
-                VariableDeclarator: {
-                    array: false,
-                    object: true,
-                },
-                AssignmentExpression: {
-                    array: false,
-                    object: false,
-                },
-            },
-            {
-                enforceForRenamedProperties: false,
-            },
-        ],
-
-        // Node.js
-        // These rules are specific to JavaScript running on Node.js.
-        'handle-callback-err': 'error', // enforces error handling in callbacks (off by default) (on by default in the node environment)
-        'no-mixed-requires': 'error', // disallow mixing regular variable and require declarations (off by default) (on by default in the node environment)
-        'no-new-require': 'error', // disallow use of new operator with the require function (off by default) (on by default in the node environment)
-        'no-path-concat': 'error', // disallow string concatenation with __dirname and __filename (off by default) (on by default in the node environment)
-        'no-process-exit': 'off', // disallow process.exit() (on by default in the node environment)
-        'no-restricted-modules': 'error', // restrict usage of specified node modules (off by default)
-        'no-sync': 'off', // disallow use of synchronous methods (off by default)
-        'eol-last': 'error',
-        'import/no-default-export': 'error',
-
-        // Variables
-        // These rules have to do with variable declarations.
-        'no-label-var': 'error', // disallow labels that share a name with a variable
-        'no-shadow': 'off', // @typescript-eslint/no-shadow will be used instead
-        '@typescript-eslint/no-shadow': [
-            'error',
-            { builtinGlobals: true, allow: ['_', 'error', 'resolve', 'reject', 'fetch'] },
-        ], // disallow declaration of variables already declared in the outer scope
-        'no-shadow-restricted-names': 'error', // disallow shadowing of names such as arguments
-        'no-undefined': 'off', // disallow use of undefined variable (off by default)
-        'no-undef-init': 'error', // disallow use of undefined when initializing variables
-        'no-unused-vars': 'off',
-        'no-unused-expressions': 0,
-        'prefer-const': 'off',
-        'chai-friendly/no-unused-expressions': 2,
-        '@typescript-eslint/no-unused-vars': [
-            'error',
-            { vars: 'all', args: 'none', ignoreRestSiblings: true, varsIgnorePattern: '^_' },
-        ],
-        '@typescript-eslint/no-restricted-imports': [
-            'error',
-            {
-                paths: [{ name: '.' }, { name: '..' }, { name: '../..' }],
-                patterns: ['@trezor/*/lib', '@trezor/*/lib/**'],
-            },
-        ],
-        'no-restricted-syntax': [
-            'error',
-            {
-                message:
-                    "Please don't use createAsyncThunk. Use createThunk from @suite-common/redux-utils instead.",
-                selector: "CallExpression[callee.name='createAsyncThunk']",
-            },
-            {
-                message:
-                    'Please don\'t use getState directly. Always use strongly typed selector, because geState is typed as "any" and it\'s dangerous to use it directly.',
-                selector:
-                    'MemberExpression[property.type="Identifier"]:matches([object.callee.name="getState"])',
-            },
-            {
-                message:
-                    'Do not assign "getState" directly. Always use strongly typed selector, because geState is typed as "any" and it\'s dangerous to use it directly.',
-                selector:
-                    "VariableDeclarator[init.type='CallExpression']:matches([init.callee.name='getState'])",
-            },
-            {
-                message:
-                    'Please don\'t use "state" directly because it\'s typed as "any". Always use it only as parameter for strongly typed selector function.',
-                selector:
-                    "CallExpression[callee.name='useSelector'] MemberExpression[object.name='state']:matches([property.type='Identifier'])",
-            },
-        ],
-        'object-shorthand': [
-            'error',
-            'always',
-            {
-                ignoreConstructors: false,
-                avoidQuotes: true,
-            },
-        ],
-        'constructor-super': 'error',
-        'no-duplicate-imports': 'off',
-        // disallow renaming import, export, and destructured assignments to the same name
-        // https://eslint.org/docs/rules/no-useless-rename
-        'no-useless-rename': [
-            'error',
-            {
-                ignoreDestructuring: false,
-                ignoreImport: false,
-                ignoreExport: false,
-            },
-        ],
-        'prefer-numeric-literals': 'error',
-        'padding-line-between-statements': [
-            'error',
-            { blankLine: 'always', prev: '*', next: 'return' },
-        ],
-        'local-rules/no-override-ds-component': ['error', { packageName: '@trezor/components' }],
-        'local-rules/no-override-ds-component': [
-            'error',
-            { packageName: '@trezor/product-components' },
-        ],
-    },
-    overrides: [
-        {
-            files: ['**/*.js'],
-            rules: {
-                // JS files are usually configs or scripts where require is OK
-                '@typescript-eslint/no-var-requires': 'off',
-                'no-console': 'off',
-            },
-        },
-        {
-            // we are using explicit blacklist because this will enforce new rules in newly created packages
-            files: [
-                'packages/analytics/**/*',
-                'packages/blockchain-link/**/*',
-                'packages/components/**/*',
-                'packages/product-components/**/*',
-                'packages/connect/**/*',
-                'packages/connect-common/**/*',
-                'packages/connect-explorer/**/*',
-                'packages/connect-web/**/*',
-                'packages/connect-popup/**/*',
-                'packages/connect-iframe/**/*',
-                'packages/connect-examples/**/*',
-                'packages/connect-plugin-ethereum/**/*',
-                'packages/connect-plugin-stellar/**/*',
-                'packages/request-manager/**/*',
-                'packages/suite/**/*',
-                'packages/suite-build/**/*',
-                'packages/suite-data/**/*',
-                'packages/suite-desktop-api/**/*',
-                'packages/suite-storage/**/*',
-                'packages/suite-web/**/*',
-                'packages/transport/**/*',
-                'packages/utxo-lib/**/*',
-                'scripts/**/*',
-                'docs/**/*',
-            ],
-            rules: {
-                '@typescript-eslint/no-shadow': 'off',
-                'import/no-default-export': 'off',
-                'import/order': 'off',
-                '@typescript-eslint/no-unused-vars': 'off',
-                'no-console': 'off',
-                'react/jsx-no-undef': 'off',
-                'no-catch-shadow': 'off',
-                '@typescript-eslint/no-restricted-imports': 'off',
-                'no-restricted-syntax': 'off',
-            },
-        },
-        {
-            files: ['suite-native/**/*'],
-            rules: {
-                '@typescript-eslint/no-var-requires': 'off',
-                'global-require': 'off',
-            },
-        },
-        // tests
-        {
-            files: ['**/*.test.*', '**/__tests__/**/*'],
-            rules: {
-                'import/no-extraneous-dependencies': 'off',
-                'import/no-unresolved': 'off',
-                'import/no-default-export': 'off',
-            },
-        },
-    ],
-};
diff --git a/.github/workflows/build-desktop-apps.yml b/.github/workflows/build-desktop-apps.yml
index 2b5d7013bb1..2660e959946 100644
--- a/.github/workflows/build-desktop-apps.yml
+++ b/.github/workflows/build-desktop-apps.yml
@@ -48,10 +48,6 @@ jobs:
         with:
           node-version-file: ".nvmrc"
 
-      - name: Install missing Python deps (to build bcrypto lib in Node)
-        if: matrix.os == 'macos-14'
-        run: brew install python-setuptools
-
       - name: Install deps and build libs
         run: |
           yarn install --immutable
diff --git a/.github/workflows/build-node-bridge.yml b/.github/workflows/build-node-bridge.yml
index f936e657975..87af318f8fb 100644
--- a/.github/workflows/build-node-bridge.yml
+++ b/.github/workflows/build-node-bridge.yml
@@ -8,12 +8,11 @@ on:
   push:
     branches:
       - develop
-  pull_request:
-    types: [labeled]
   workflow_dispatch:
 
 jobs:
   node-bridge-bin-js:
+    if: github.repository == 'trezor/trezor-suite'
     name: Build node-bridge bin.js file
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/build-suite-native-preview.yml b/.github/workflows/build-suite-native-preview.yml
new file mode 100644
index 00000000000..dca504d7a21
--- /dev/null
+++ b/.github/workflows/build-suite-native-preview.yml
@@ -0,0 +1,81 @@
+name: "[Build] suite-native preview"
+
+on:
+  push:
+    # push develop(default) branch is necessary for this action to update its fingerprint database
+    branches: [develop]
+  pull_request:
+    types: [opened, synchronize, labeled]
+    paths:
+      - "suite-native/**"
+      - "suite-common/**"
+      - "packages/react-native-usb/**"
+      - "packages/transport-native/**"
+      - "yarn.lock"
+      - ".github/workflows/build-suite-native-preview.yml"
+      # list of paths is not complete, but it's always possible to dispatch manually using 'build-mobile' label
+  workflow_dispatch:
+    # manual dispatch will not add any comment to PR, use label 'build-mobile' if PR exists
+
+jobs:
+  update:
+    if: ( github.event.action != 'labeled' || contains(github.event.pull_request.labels.*.name, 'build-mobile')) && (github.repository == 'trezor/trezor-suite' || github.repository == 'trezor/trezor-suite-private')
+    name: EAS Update
+    runs-on: ubuntu-latest
+    concurrency: fingerprint-${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+    env:
+      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+      EXPO_PUBLIC_ENVIRONMENT: preview
+      BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+      COMMIT_HASH: ${{ github.sha }}
+    permissions:
+      contents: read
+      pull-requests: write
+      actions: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+          cache: yarn
+      - name: Setup EAS
+        uses: expo/expo-github-action@v8
+        with:
+          eas-version: latest
+          token: ${{ secrets.EXPO_TOKEN_DEVELOP }}
+      - name: Install libs
+        run: yarn workspaces focus @suite-native/app
+
+      - name: Check runtimeVersion builds
+        run: |
+          cd suite-native/app
+          # Read runtimeVersion from dynamic app.json
+          RUNTIME_VERSION=$(npx expo config --json | jq -r '.runtimeVersion')
+          echo "Current runtimeVersion is $RUNTIME_VERSION"
+          # Check if there is a build with the same runtimeVersion on EAS already
+          EXISTING_BUILD=$(eas build:list --status=finished  --build-profile=preview --channel=preview --limit=1  --non-interactive --json --runtime-version=$RUNTIME_VERSION)
+          if [ "$EXISTING_BUILD" = "[]" ]; then
+            echo "No build with runtimeVersion $RUNTIME_VERSION found"
+            echo "RUNTIME_BUILD_EXISTS=false" >> $GITHUB_ENV
+          else
+            echo "Found build with runtimeVersion $RUNTIME_VERSION"
+            echo "$EXISTING_BUILD"
+            echo "RUNTIME_BUILD_EXISTS=true" >> $GITHUB_ENV
+          fi
+
+      - name: Create preview builds if fingerprint changed
+        # Only create preview builds if there is no build with the same runtimeVersion on EAS already
+        if: env.RUNTIME_BUILD_EXISTS == 'false'
+        uses: expo/expo-github-action/preview-build@main
+        with:
+          command: eas build --profile preview --platform all
+          working-directory: suite-native/app
+
+      - name: Build message system config
+        run: yarn message-system-sign-config
+
+      - name: Create preview update
+        uses: expo/expo-github-action/preview@v8
+        with:
+          command: eas update --auto --branch ${{ env.BRANCH_NAME }}
+          working-directory: suite-native/app
diff --git a/.github/workflows/build-suite-web.yml b/.github/workflows/build-suite-web.yml
index d3f89a79679..e5822696110 100644
--- a/.github/workflows/build-suite-web.yml
+++ b/.github/workflows/build-suite-web.yml
@@ -65,7 +65,7 @@ jobs:
         run: |
           yarn message-system-sign-config
           yarn workspace @trezor/suite-data build:lib
-          yarn workspace @trezor/connect-iframe build:lib
+          NODE_ENV=production yarn workspace @trezor/connect-iframe build:lib
           yarn workspace @trezor/connect-web build
           yarn workspace @trezor/suite-web build
       # this step should upload build result to s3 bucket dev.suite.sldev.cz using awscli
diff --git a/.github/workflows/release-suite-desktop-web-staging.yml b/.github/workflows/release-suite-desktop-web-staging.yml
index ea7139b32bb..abdd85f67f7 100644
--- a/.github/workflows/release-suite-desktop-web-staging.yml
+++ b/.github/workflows/release-suite-desktop-web-staging.yml
@@ -179,7 +179,7 @@ jobs:
         run: |
           yarn message-system-sign-config
           yarn workspace @trezor/suite-data build:lib
-          yarn workspace @trezor/connect-iframe build:lib
+          NODE_ENV=production yarn workspace @trezor/connect-iframe build:lib
           yarn workspace @trezor/connect-web build
           yarn workspace @trezor/suite-web build
 
@@ -191,7 +191,7 @@ jobs:
 
   create-test-releases:
     if: github.repository == 'trezor/trezor-suite-release' && github.event.inputs.createTestRelease == 'true'
-    name: Create test versions for autoupdate sudite-desktop
+    name: Create test versions for autoupdate suite-desktop
     environment: suite-production
     needs:
       - suite-desktop
diff --git a/.github/workflows/template-connect-test-params.yml b/.github/workflows/template-connect-test-params.yml
index c95e9eec5ae..c8c3c25ea4f 100644
--- a/.github/workflows/template-connect-test-params.yml
+++ b/.github/workflows/template-connect-test-params.yml
@@ -2,14 +2,14 @@ name: "[Template] connect unit"
 on:
   workflow_call:
     inputs:
-      methods:
-        description: "List of methods to include in tests (example: applySettings,applyFlags,getFeatures)"
-        type: "string"
-        required: false
       testPattern:
-        description: "Test pattern to use (example: `init` or `methods`)"
+        description: "Test pattern to use to match for test files (example: `init` or `methods`)"
         type: "string"
         required: true
+      includeFilter:
+        description: "List of methods to include in tests (example: applySettings,applyFlags,getFeatures)"
+        type: "string"
+        required: false
       testsFirmware:
         description: "Firmware version for the tests (example: 2-latest, 2.2.0, 2-main)"
         type: "string"
@@ -19,16 +19,6 @@ on:
         description: "Firmware model for the tests (example: T3T1)"
         type: "string"
         required: false
-      nodeEnvironment:
-        description: "Should the test run on nodejs environment, it runs by default."
-        type: "boolean"
-        required: false
-        default: true
-      webEnvironment:
-        description: "Should the test run on web environment, it runs by default."
-        type: "boolean"
-        required: false
-        default: true
       testDescription:
         description: "A description to make test title more descriptive (example: T3T1-latest)"
         type: "string"
@@ -39,12 +29,25 @@ on:
         type: "boolean"
         required: false
         default: false
+      cache_tx:
+        description: "Cache transactions"
+        type: "string"
+        required: false
+        default: false
+      transport:
+        description: "Transport to use (example: bridge, node-bridge)"
+        type: "string"
+        required: false
+        default: "Bridge"
+      testEnv:
+        description: "Environment to test (example: node, web)"
+        type: "string"
+        required: true
 
 jobs:
-  node:
-    name: "node-${{ inputs.testDescription }}"
+  test:
+    name: "${{ inputs.testDescription }}"
     runs-on: ubuntu-latest
-    if: ${{ inputs.nodeEnvironment }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -54,54 +57,43 @@ jobs:
         with:
           node-version-file: ".nvmrc"
           cache: yarn
-      # todo: ideally do not install everything. possibly only devDependencies could be enough for testing (if there was not for building libs)?
-      - run: sed -i "/\"node\"/d" package.json
-      - run: yarn install
-      # nightly test - run without cached txs
-      - if: ${{ github.event_name == 'schedule' }}
-        run: echo "ADDITIONAL_ARGS=-c" >> "$GITHUB_ENV"
-      - if: ${{ inputs.testFirmwareModel }}
-        run: echo "ADDITIONAL_ARGS=$ADDITIONAL_ARGS -m ${{ inputs.testFirmwareModel }}" >> "$GITHUB_ENV"
-      - if: ${{ inputs.methods }}
-        run: echo "ADDITIONAL_ARGS=$ADDITIONAL_ARGS -i ${{ inputs.methods }}" >> "$GITHUB_ENV"
-      - if: ${{ inputs.testRandomizedOrder }}
-        run: echo "ADDITIONAL_ARGS=$ADDITIONAL_ARGS -r" >> "$GITHUB_ENV"
-      - run: './docker/docker-connect-test.sh node -p "${{ inputs.testPattern }}" -f "${{ inputs.testsFirmware }}" $ADDITIONAL_ARGS'
 
-  web:
-    name: "web-${{ inputs.testDescription }}"
-    runs-on: ubuntu-latest
-    if: ${{ inputs.webEnvironment }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: yarn
-      - run: |
+      - if: ${{ inputs.testEnv == 'web' }}
+        run: |
           echo -e "\nenableScripts: false" >> .yarnrc.yml
       # Install dependencies only for @trezor/connect package
-      - run: yarn workspaces focus @trezor/connect
-      - name: Retrieve build connect-web
+      - if: ${{ inputs.testEnv == 'web' }}
+        run: yarn workspaces focus @trezor/connect
+      - if: ${{ inputs.testEnv == 'web' }}
+        name: Retrieve build connect-web
         uses: actions/download-artifact@v4
         with:
           name: build-artifact-connect-web
           path: packages/connect-web/build
-      - name: Retrieve build connect-iframe
+      - if: ${{ inputs.testEnv == 'web' }}
+        name: Retrieve build connect-iframe
         uses: actions/download-artifact@v4
         with:
           name: build-artifact-connect-iframe
           path: packages/connect-iframe/build
-      - run: cd packages/connect-iframe && tree .
-      - name: "Echo download path"
+      - if: ${{ inputs.testEnv == 'web' }}
+        run: cd packages/connect-iframe && tree .
+      - if: ${{ inputs.testEnv == 'web' }}
+        name: "Echo download path"
         run: echo ${{steps.download.outputs.download-path}}
-      - if: ${{ github.event_name == 'schedule' }}
+
+      # todo: ideally do not install everything. possibly only devDependencies could be enough for testing (if there was not for building libs)?
+      - if: ${{ inputs.testEnv == 'node' }}
+        run: sed -i "/\"node\"/d" package.json
+      - if: ${{ inputs.testEnv == 'node' }}
+        run: yarn install
+
+      - if: ${{ inputs.cache_tx == 'true' }}
         run: echo "ADDITIONAL_ARGS=-c" >> "$GITHUB_ENV"
       - if: ${{ inputs.testFirmwareModel }}
         run: echo "ADDITIONAL_ARGS=$ADDITIONAL_ARGS -m ${{ inputs.testFirmwareModel }}" >> "$GITHUB_ENV"
-      - if: ${{ inputs.methods }}
-        run: echo "ADDITIONAL_ARGS=$ADDITIONAL_ARGS -i ${{ inputs.methods }}" >> "$GITHUB_ENV"
-      - run: './docker/docker-connect-test.sh web -p "${{ inputs.testPattern }}" -f "${{ inputs.testsFirmware }}" $ADDITIONAL_ARGS'
+      - if: ${{ inputs.includeFilter }}
+        run: echo "ADDITIONAL_ARGS=$ADDITIONAL_ARGS -i ${{ inputs.includeFilter }}" >> "$GITHUB_ENV"
+      - if: ${{ inputs.testRandomizedOrder }}
+        run: echo "ADDITIONAL_ARGS=$ADDITIONAL_ARGS -r" >> "$GITHUB_ENV"
+      - run: './docker/docker-connect-test.sh ${{ inputs.testEnv }} -p "${{ inputs.testPattern }}" -f "${{ inputs.testsFirmware }}" $ADDITIONAL_ARGS'
diff --git a/.github/workflows/test-connect.yml b/.github/workflows/test-connect.yml
index 30462d810ad..001be06a531 100644
--- a/.github/workflows/test-connect.yml
+++ b/.github/workflows/test-connect.yml
@@ -69,99 +69,92 @@ jobs:
     outputs:
       dailyMatrix: ${{ steps.set-matrix-daily.outputs.dailyMatrix }}
       otherDevicesMatrix: ${{ steps.set-matrix-other-devices.outputs.otherDevicesMatrix }}
-      legacyFirmwareMatrix: ${{ steps.set-matrix-legacy-firmware.outputs.legacyFirmwareMatrix }}
-      canaryFirmwareMatrix: ${{ steps.set-matrix-canary-firmware.outputs.canaryFirmwareMatrix }}
+      allFwsMatrix: ${{ steps.set-matrix-all-firmwares.outputs.allFwsMatrix }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
       - name: Set daily matrix
         id: set-matrix-daily
-        run: echo "dailyMatrix=$(node ./scripts/ci/connect-test-matrix-generator.js daily)" >> $GITHUB_OUTPUT
+        run: echo "dailyMatrix=$(node ./scripts/ci/connect-test-matrix-generator.js --model=T2T1 --firmware=2-latest --env=all --groups=api,api-flaky --cache_tx=true --transport=Bridge)" >> $GITHUB_OUTPUT
 
-      - name: Set legacy devices matrix
-        id: set-matrix-legacy-firmware
-        run: echo "legacyFirmwareMatrix=$(node ./scripts/ci/connect-test-matrix-generator.js legacyFirmware)" >> $GITHUB_OUTPUT
-
-      - name: Set canary devices matrix
-        id: set-matrix-canary-firmware
-        run: echo "canaryFirmwareMatrix=$(node ./scripts/ci/connect-test-matrix-generator.js canaryFirmware)" >> $GITHUB_OUTPUT
+      - name: Set all firmwares matrix
+        id: set-matrix-all-firmwares
+        run: echo "allFwsMatrix=$(node ./scripts/ci/connect-test-matrix-generator.js --model=T2T1 --firmware=all --env=all --groups=all --cache_tx=false --transport=Bridge)" >> $GITHUB_OUTPUT
 
       - name: Set other devices matrix
         id: set-matrix-other-devices
-        run: echo "otherDevicesMatrix=$(node ./scripts/ci/connect-test-matrix-generator.js otherDevices)" >> $GITHUB_OUTPUT
+        run: echo "otherDevicesMatrix=$(node ./scripts/ci/connect-test-matrix-generator.js --model=all --firmware=2-main --env=node --groups=api --cache_tx=true --transport=Bridge)" >> $GITHUB_OUTPUT
 
-  connect-PR:
+  PR-check:
     needs: [build, set-matrix]
-    name: PR-${{ matrix.name }}
+    name: PR-check ${{ matrix.key }}
+    if: github.repository == 'trezor/trezor-suite'
     uses: ./.github/workflows/template-connect-test-params.yml
     with:
-      testPattern: ${{ matrix.pattern }}
-      methods: ${{ matrix.methods }}
+      testPattern: ${{ matrix.groups.pattern }}
+      includeFilter: ${{ matrix.groups.includeFilter }}
       testsFirmware: ${{ matrix.firmware }}
-      testDescription: ${{ matrix.name }}
+      testDescription: ${{ matrix.env }}-${{ matrix.groups.pattern }}-${{ matrix.groups.name }}
+      cache_tx: ${{ matrix.cache_tx }}
+      transport: ${{ matrix.transport }}
+      testEnv: ${{ matrix.env }}
+      testFirmwareModel: ${{ matrix.model }}
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.set-matrix.outputs.dailyMatrix) }}
 
-  connect-randomized-order:
+  randomized:
     needs: [build, set-matrix]
-    if: github.event_name == 'schedule' &&  github.repository == 'trezor/trezor-suite'
-    name: randomized-${{ matrix.name }}
+    name: randomized ${{ matrix.key }}
+    if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'trezor/trezor-suite'
     uses: ./.github/workflows/template-connect-test-params.yml
     with:
-      testPattern: ${{ matrix.pattern }}
-      methods: ${{ matrix.methods }}
+      testPattern: ${{ matrix.groups.pattern }}
+      includeFilter: ${{ matrix.groups.includeFilter }}
       testsFirmware: ${{ matrix.firmware }}
-      testDescription: ${{ matrix.name }}-${{ matrix.firmware }}
+      testDescription: ${{ matrix.env }}-${{ matrix.groups.pattern }}-${{ matrix.groups.name }}
+      cache_tx: ${{ matrix.cache_tx }}
+      transport: ${{ matrix.transport }}
+      testEnv: ${{ matrix.env }}
+      testFirmwareModel: ${{ matrix.model }}
       testRandomizedOrder: true
-      webEnvironment: false
-      nodeEnvironment: true
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.set-matrix.outputs.dailyMatrix) }}
 
-  connect-legacy-firmware:
-    needs: [build, set-matrix]
-    if: github.event_name == 'schedule' &&  github.repository == 'trezor/trezor-suite'
-    name: legacy-${{ matrix.name }}
-    uses: ./.github/workflows/template-connect-test-params.yml
-    with:
-      testPattern: ${{ matrix.pattern }}
-      methods: ${{ matrix.methods }}
-      testsFirmware: ${{ matrix.firmware }}
-      testDescription: ${{ matrix.name }}-${{ matrix.firmware }}
-    strategy:
-      fail-fast: false
-      matrix: ${{ fromJson(needs.set-matrix.outputs.legacyFirmwareMatrix) }}
-
-  connect-canary-firmware:
+  all-fws:
     needs: [build, set-matrix]
-    if: github.event_name == 'schedule' &&  github.repository == 'trezor/trezor-suite'
-    name: canary-${{ matrix.name }}
+    name: all-fws ${{ matrix.key }} ${{ matrix.firmware }}
+    if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'trezor/trezor-suite'
     uses: ./.github/workflows/template-connect-test-params.yml
     with:
-      testPattern: ${{ matrix.pattern }}
-      methods: ${{ matrix.methods }}
+      testPattern: ${{ matrix.groups.pattern }}
+      includeFilter: ${{ matrix.groups.includeFilter }}
       testsFirmware: ${{ matrix.firmware }}
-      testDescription: ${{ matrix.name }}-${{ matrix.firmware }}
+      testDescription: ${{ matrix.firmware }}-${{ matrix.groups.pattern }}-${{ matrix.groups.name }}-${{ matrix.env }}
+      cache_tx: ${{ matrix.cache_tx }}
+      transport: ${{ matrix.transport }}
+      testEnv: ${{ matrix.env }}
+      testFirmwareModel: ${{ matrix.model }}
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.set-matrix.outputs.canaryFirmwareMatrix) }}
+      matrix: ${{ fromJson(needs.set-matrix.outputs.allFwsMatrix) }}
 
-  connect-other-devices:
+  all-models-api:
     needs: [build, set-matrix]
-    if: github.event_name == 'schedule' &&  github.repository == 'trezor/trezor-suite'
-    name: other-devices-${{ matrix.name }}-${{ matrix.model }}
+    name: all-models-api ${{ matrix.key }}
+    if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'trezor/trezor-suite'
     uses: ./.github/workflows/template-connect-test-params.yml
     with:
-      testPattern: ${{ matrix.pattern }}
-      methods: ${{ matrix.methods }}
+      testPattern: ${{ matrix.groups.pattern }}
+      includeFilter: ${{ matrix.groups.includeFilter }}
       testsFirmware: ${{ matrix.firmware }}
+      testDescription: ${{ matrix.model }}-${{ matrix.firmware }}
+      cache_tx: ${{ matrix.cache_tx }}
+      transport: ${{ matrix.transport }}
+      testEnv: ${{ matrix.env }}
       testFirmwareModel: ${{ matrix.model }}
-      nodeEnvironment: true
-      webEnvironment: false
-      testDescription: ${{ matrix.name }}-${{ matrix.firmware }}-${{ matrix.model }}
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.set-matrix.outputs.otherDevicesMatrix) }}
diff --git a/.github/workflows/test-suite-native-e2e-android.yml b/.github/workflows/test-suite-native-e2e-android.yml
index 3f55ace16ac..debaa53d2c5 100644
--- a/.github/workflows/test-suite-native-e2e-android.yml
+++ b/.github/workflows/test-suite-native-e2e-android.yml
@@ -158,11 +158,11 @@ jobs:
           force-avd-creation: true
           avd-name: ${{ steps.device.outputs.AVD_NAME }}
           emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -grpc 8554
-          script: yarn test:e2e android.emu.release --headless --take-screenshots failing --record-videos failing --retries 2
+          script: yarn test:e2e android.emu.release --headless --take-screenshots failing --record-videos failing
 
       - name: "Store failed test screenshot artifacts"
         if: ${{failure()}}
         uses: actions/upload-artifact@v4
         with:
-          name: failed-android-tests-screenshots
+          name: failed-android-tests
           path: suite-native/app/artifacts
diff --git a/.github/workflows/test-suite-web-e2e.yml b/.github/workflows/test-suite-web-e2e.yml
index 1bbc508ce08..f67047b39e1 100644
--- a/.github/workflows/test-suite-web-e2e.yml
+++ b/.github/workflows/test-suite-web-e2e.yml
@@ -22,6 +22,7 @@ on:
       - ".github/workflows/release*"
       - ".github/workflows/template*"
       - ".github/actions/release*/**"
+  workflow_dispatch:
 
 env:
   DEV_SERVER_URL: "https://dev.suite.sldev.cz"
@@ -65,7 +66,7 @@ jobs:
         run: |
           yarn message-system-sign-config
           yarn workspace @trezor/suite-data build:lib
-          yarn workspace @trezor/connect-iframe build:lib
+          NODE_ENV=production yarn workspace @trezor/connect-iframe build:lib
           yarn workspace @trezor/connect-web build
           yarn workspace @trezor/suite-web build
       # this step should upload build result to s3 bucket dev.suite.sldev.cz using awscli
diff --git a/.gitignore b/.gitignore
index 9f221c73a26..47a92d5492d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,6 +116,7 @@ local.properties
 
 !**/suite-native/app/.env.debug
 !**/suite-native/app/.env.develop
+!**/suite-native/app/.env.preview
 !**/suite-native/app/.env.production
 !**/suite-native/app/.env.staging
 
@@ -158,6 +159,3 @@ packages/suite-data/files/translations/master.json
 # cypress download folder
 
 packages/suite-web/e2e/downloads
-
-# python virtualenv, some Linux users may need it for workaround
-.venv
diff --git a/.prettierignore b/.prettierignore
index 4327d37037e..d2a9c2b4c04 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -160,6 +160,4 @@ packages/suite-data/files/translations/master.json
 # lottie animations
 packages/suite-data/files/videos/lottie/*.json
 
-# js files which look like ts files
-packages/protobuf/scripts/**
-/.nx/cache
\ No newline at end of file
+/.nx/cache
diff --git a/README.md b/README.md
index cc8571dd104..7e4240471d8 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ Development is not possible on Windows. This can be circumvented by tools such a
 ### Getting started
 
 -   `git clone git@github.com:trezor/trezor-suite.git`
+-   `cd trezor-suite`
 -   `git submodule update --init --recursive`
 -   `git lfs install` // Set up Git LFS for your user account. You only need to run this once per user account.
 -   `git lfs pull`
@@ -28,8 +29,6 @@ Development is not possible on Windows. This can be circumvented by tools such a
 -   `yarn`
 -   `yarn build:libs`
 
-For troubleshooting of common issues, [see guide](https://docs.trezor.io/trezor-suite/misc/suite-setup-troubleshooting.html).
-
 It's recommended to enable `git config --global submodule.recurse true` so you don't need to run `git submodule update --init --recursive` every time when submodules are updated.
 
 > You don't need a Trezor device to get into the app, you can use emulator. There is a [Trezor User Env](https://github.com/trezor/trezor-user-env) to help you set it up and run emulator for any Trezor model 🎉
diff --git a/docker/docker-compose.connect-popup-ci.yml b/docker/docker-compose.connect-popup-ci.yml
index ba56b58495c..49e81098ee8 100644
--- a/docker/docker-compose.connect-popup-ci.yml
+++ b/docker/docker-compose.connect-popup-ci.yml
@@ -1,7 +1,7 @@
 version: "3.9"
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:4ba1d062469911b9be78eff2c0503ac77b06f598
+    image: ghcr.io/trezor/trezor-user-env:c637c2f58e799284f6019481fa0de30457bd6b60
     environment:
       - SDL_VIDEODRIVER=dummy
       - XDG_RUNTIME_DIR=/var/tmp
diff --git a/docker/docker-compose.connect-popup-test.yml b/docker/docker-compose.connect-popup-test.yml
index 37dbbfbf477..65d20fbb18e 100644
--- a/docker/docker-compose.connect-popup-test.yml
+++ b/docker/docker-compose.connect-popup-test.yml
@@ -1,7 +1,7 @@
 version: "3.9"
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:4ba1d062469911b9be78eff2c0503ac77b06f598
+    image: ghcr.io/trezor/trezor-user-env:c637c2f58e799284f6019481fa0de30457bd6b60
     environment:
       - DISPLAY=$DISPLAY
       - QT_X11_NO_MITSHM=1
diff --git a/docker/docker-compose.connect-test.yml b/docker/docker-compose.connect-test.yml
index 1f356dd38a2..6f6295dac52 100644
--- a/docker/docker-compose.connect-test.yml
+++ b/docker/docker-compose.connect-test.yml
@@ -1,7 +1,7 @@
 version: "3.9"
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:4ba1d062469911b9be78eff2c0503ac77b06f598
+    image: ghcr.io/trezor/trezor-user-env:c637c2f58e799284f6019481fa0de30457bd6b60
     environment:
       - SDL_VIDEODRIVER=dummy
       - XDG_RUNTIME_DIR=/var/tmp
diff --git a/docker/docker-compose.connect-webextension-test.yml b/docker/docker-compose.connect-webextension-test.yml
index 79ee3393bf4..fe8dd07812d 100644
--- a/docker/docker-compose.connect-webextension-test.yml
+++ b/docker/docker-compose.connect-webextension-test.yml
@@ -1,7 +1,7 @@
 version: "3.9"
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:4ba1d062469911b9be78eff2c0503ac77b06f598
+    image: ghcr.io/trezor/trezor-user-env:c637c2f58e799284f6019481fa0de30457bd6b60
     environment:
       - SDL_VIDEODRIVER=dummy
       - XDG_RUNTIME_DIR=/var/tmp
diff --git a/docker/docker-compose.suite-ci.yml b/docker/docker-compose.suite-ci.yml
index 630a554a1be..a8a759ad41e 100644
--- a/docker/docker-compose.suite-ci.yml
+++ b/docker/docker-compose.suite-ci.yml
@@ -1,7 +1,7 @@
 version: "3.9"
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:4ba1d062469911b9be78eff2c0503ac77b06f598
+    image: ghcr.io/trezor/trezor-user-env:c637c2f58e799284f6019481fa0de30457bd6b60
     environment:
       - SDL_VIDEODRIVER=dummy
       - XDG_RUNTIME_DIR=/var/tmp
diff --git a/docker/docker-compose.suite-desktop-ci.yml b/docker/docker-compose.suite-desktop-ci.yml
index 69196cf66b7..a463ef434cc 100644
--- a/docker/docker-compose.suite-desktop-ci.yml
+++ b/docker/docker-compose.suite-desktop-ci.yml
@@ -1,7 +1,7 @@
 version: "3.9"
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:4ba1d062469911b9be78eff2c0503ac77b06f598
+    image: ghcr.io/trezor/trezor-user-env:c637c2f58e799284f6019481fa0de30457bd6b60
     environment:
       - SDL_VIDEODRIVER=dummy
       - XDG_RUNTIME_DIR=/var/tmp
diff --git a/docker/docker-compose.suite-dev.yml b/docker/docker-compose.suite-dev.yml
index 6390b28d3af..6bc20a5f44b 100644
--- a/docker/docker-compose.suite-dev.yml
+++ b/docker/docker-compose.suite-dev.yml
@@ -4,7 +4,7 @@
 version: "3.9"
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:4ba1d062469911b9be78eff2c0503ac77b06f598
+    image: ghcr.io/trezor/trezor-user-env:c637c2f58e799284f6019481fa0de30457bd6b60
     environment:
       - DISPLAY=$DISPLAY
       - QT_X11_NO_MITSHM=1
diff --git a/docker/docker-compose.suite-native-ci.yml b/docker/docker-compose.suite-native-ci.yml
index b09cfedf752..7c5e97aa093 100644
--- a/docker/docker-compose.suite-native-ci.yml
+++ b/docker/docker-compose.suite-native-ci.yml
@@ -3,7 +3,7 @@ services:
   trezor-user-env-unix:
     network_mode: "host"
     container_name: trezor-user-env.unix
-    image: ghcr.io/trezor/trezor-user-env:4ba1d062469911b9be78eff2c0503ac77b06f598
+    image: ghcr.io/trezor/trezor-user-env:c637c2f58e799284f6019481fa0de30457bd6b60
     environment:
       - SDL_VIDEODRIVER=dummy
       - XDG_RUNTIME_DIR=/var/tmp
diff --git a/docker/docker-compose.suite-test.yml b/docker/docker-compose.suite-test.yml
index e113aa1dd55..367d3d5c1ac 100644
--- a/docker/docker-compose.suite-test.yml
+++ b/docker/docker-compose.suite-test.yml
@@ -1,7 +1,7 @@
 version: "3.9"
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:4ba1d062469911b9be78eff2c0503ac77b06f598
+    image: ghcr.io/trezor/trezor-user-env:c637c2f58e799284f6019481fa0de30457bd6b60
     environment:
       - DISPLAY=$DISPLAY
       - QT_X11_NO_MITSHM=1
diff --git a/docker/docker-compose.transport-test-ci.yml b/docker/docker-compose.transport-test-ci.yml
index d755f65637b..a71c779ee62 100644
--- a/docker/docker-compose.transport-test-ci.yml
+++ b/docker/docker-compose.transport-test-ci.yml
@@ -1,7 +1,7 @@
 version: "3.9"
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:4ba1d062469911b9be78eff2c0503ac77b06f598
+    image: ghcr.io/trezor/trezor-user-env:c637c2f58e799284f6019481fa0de30457bd6b60
     environment:
       - SDL_VIDEODRIVER=dummy
       - XDG_RUNTIME_DIR=/var/tmp
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index e3da7a61254..a6fe0544ce3 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -21,47 +21,6 @@
         -   [events](./packages/connect/events.md)
         -   [path](./packages/connect/path.md)
         -   [methods](./packages/connect/methods.md)
-            -   [common parameters](./packages/connect/methods/commonParams.md)
-            -   [getPublicKey](./packages/connect/methods/getPublicKey.md)
-            -   [requestLogin](./packages/connect/methods/requestLogin.md)
-            -   [cipherKeyValue](./packages/connect/methods/cipherKeyValue.md)
-            -   [wipeDevice](./packages/connect/methods/wipeDevice.md)
-            -   [resetDevice](./packages/connect/methods/resetDevice.md)
-            -   [getCoinInfo](./packages/connect/methods/getCoinInfo.md)
-            -   [getAddress](./packages/connect/methods/getAddress.md)
-            -   [getAccountInfo](./packages/connect/methods/getAccountInfo.md)
-            -   [getOwnershipId](./packages/connect/methods/getOwnershipId.md)
-            -   [getOwnershipProof](./packages/connect/methods/getOwnershipProof.md)
-            -   [composeTransaction](./packages/connect/methods/composeTransaction.md)
-            -   [signTransaction](./packages/connect/methods/signTransaction.md)
-            -   [pushTransaction](./packages/connect/methods/pushTransaction.md)
-            -   [signMessage](./packages/connect/methods/signMessage.md)
-            -   [verifyMessage](./packages/connect/methods/verifyMessage.md)
-            -   [authorizeCoinjoin](./packages/connect/methods/authorizeCoinjoin.md)
-            -   [ethereumGetAddress](./packages/connect/methods/ethereumGetAddress.md)
-            -   [ethereumSignTransaction](./packages/connect/methods/ethereumSignTransaction.md)
-            -   [ethereumSignMessage](./packages/connect/methods/ethereumSignMessage.md)
-            -   [ethereumSignTypedData](./packages/connect/methods/ethereumSignTypedData.md)
-            -   [ethereumVerifyMessage](./packages/connect/methods/ethereumVerifyMessage.md)
-            -   [eosGetPublicKey](./packages/connect/methods/eosGetPublicKey.md)
-            -   [eosSignTransaction](./packages/connect/methods/eosSignTransaction.md)
-            -   [nemGetAddress](./packages/connect/methods/nemGetAddress.md)
-            -   [nemSignTransaction](./packages/connect/methods/nemSignTransaction.md)
-            -   [stellarGetAddress](./packages/connect/methods/stellarGetAddress.md)
-            -   [stellarSignTransaction](./packages/connect/methods/stellarSignTransaction.md)
-            -   [cardanoGetPublicKey](./packages/connect/methods/cardanoGetPublicKey.md)
-            -   [cardanoGetAddress](./packages/connect/methods/cardanoGetAddress.md)
-            -   [cardanoSignTransaction](./packages/connect/methods/cardanoSignTransaction.md)
-            -   [rippleGetAddress](./packages/connect/methods/rippleGetAddress.md)
-            -   [rippleSignTransaction](./packages/connect/methods/rippleSignTransaction.md)
-            -   [tezosGetAddress](./packages/connect/methods/tezosGetAddress.md)
-            -   [tezosGetPublicKey](./packages/connect/methods/tezosGetPublicKey.md)
-            -   [tezosSignTransaction](./packages/connect/methods/tezosSignTransaction.md)
-            -   [binanceGetAddress](./packages/connect/methods/binanceGetAddress.md)
-            -   [binanceGetPublicKey](./packages/connect/methods/binanceGetPublicKey.md)
-            -   [binanceSignTransaction](./packages/connect/methods/binanceSignTransaction.md)
-            -   [firmwareUpdate](./packages/connect/methods/firmwareUpdate.md)
-            -   [getFirmwareHash](./packages/connect/methods/getFirmwareHash.md)
     -   [@trezor/suite](./packages/suite/index.md)
         -   [send form](./packages/suite/send.md)
         -   [send form architecture](./packages/suite/send/ARCHITECTURE.md)
@@ -88,5 +47,4 @@
     -   [development on Windows](./misc/development-on-windows.md)
     -   [device naming](./misc/device-naming.md)
     -   [review](./misc/review.md)
-    -   [suite setup troubleshooting](./misc/suite-setup-troubleshooting.md)
     -   [videos](./misc/videos.md)
diff --git a/docs/features/localization.md b/docs/features/localization.md
index 4ca66a1497a..0f3c3de88ec 100644
--- a/docs/features/localization.md
+++ b/docs/features/localization.md
@@ -19,6 +19,7 @@ _Do not manually edit language json files in `suite-data/files/translations/` di
 -   `id`: We don't have strict conventions for generating these IDs, although using a prefix `TR_`, or expanded variant `TR_<SCOPE>`, where scope is, for example, "ONBOARDING" is really handy. ID must be the same as the object's key.
 -   `defaultMessage`: Used as a source string for translator. It's also a text that is shown in the app as a fallback till someone changes/improves it in Crowdin.
 -   `description`: Optional. Useful for describing the context in which the message occurs, especially if it is not clear from a `defaultMessage` field.
+-   `dynamic`: Optional. Must be set to true for programmatically constructed keys. Otherwise, the keys will be deleted by the list-duplicates script.
 
 Example:
 
diff --git a/docs/misc/development-on-windows.md b/docs/misc/development-on-windows.md
index a44e3e95ee9..b4a40d0ab86 100644
--- a/docs/misc/development-on-windows.md
+++ b/docs/misc/development-on-windows.md
@@ -19,8 +19,6 @@ In WSL:
 
 Proceed with the [general readme instructions](../../README.md#trezor-suite-trezorsuite).
 
-See general [setup troubleshooting docs](./suite-setup-troubleshooting.md) if necessary.
-
 ## Connecting USB device
 
 On Windows, run `usbipd list`, find the bus id of the Trezor device, e.g. `2-1`.
diff --git a/docs/misc/index.md b/docs/misc/index.md
index 38a08818b4f..68f032a9cde 100644
--- a/docs/misc/index.md
+++ b/docs/misc/index.md
@@ -8,6 +8,8 @@ At any time, information stored here might be restructured or moved to a differe
 location, so as to ensure that the documentation is well structured overall.
 
 -   [build](./build.md)
+-   [development on Windows](./development-on-windows.md)
 -   [device naming](./device-naming.md)
 -   [review](./review.md)
+-   [suite setup troubleshooting](./suite-setup-troubleshooting.md)
 -   [videos](./videos.md)
diff --git a/docs/misc/suite-setup-troubleshooting.md b/docs/misc/suite-setup-troubleshooting.md
deleted file mode 100644
index f356a1ba72b..00000000000
--- a/docs/misc/suite-setup-troubleshooting.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Suite setup troubleshooting
-
-This document is a guide to overcome common issues with Trezor Suite local dev environment setup.
-
-The setup happy path is described in the main [Suite README](https://github.com/trezor/trezor-suite).
-
-### bcrypto fails yarn install
-
-#### Issue
-
-On Linux, comamnd `yarn` fails with a similar error:
-
-```
-bcrypto@npm:5.4.0 couldn't be built successfully (exit code 1, logs can be found here: /tmp/something.log
-```
-
-And the mentioned logfile contains: `ModuleNotFoundError: No module named 'distutils'`
-
-#### Solution
-
-In trezor-suite root directory, run:
-
-```
-python3 -m venv .venv
-source .venv/bin/activate
-pip install setuptools
-yarn
-deactivate
-```
-
-When you need it next time in future, repeat the same, but **without** the first command (`python3 -m venv .venv`), because virtualenv has already been created.
-
-#### Explanation
-
-`bcrypto` is a native module that requires `node-gyp` to build, which in turn requires python `gyp`.
-However, `bcrypto` relies on the deprecated Python2 build method, and the built-in `distutils` package, which has been removed in Python 3.12.
-Installing `setuptools` via pip solves this, as it also provides legacy `distutils`...
-but on Linux Ubuntu you can't pip install globally, as it's managed by apt, and there is no apt package anymore which would solve it.
-Though you can install `setuptools` in a virtual environment (a.k.a. venv), and yarn then uses it.
diff --git a/docs/tests/e2e-suite-web.md b/docs/tests/e2e-suite-web.md
index a086174d848..cbcbcd5f8ac 100644
--- a/docs/tests/e2e-suite-web.md
+++ b/docs/tests/e2e-suite-web.md
@@ -103,6 +103,25 @@ Steps:
 
 ## Notes
 
+### Best practices and established patterns
+
+#### Page objects
+
+There should be no direct getting of elements in the test code. We want that and most other logic operating the app to be abstracted to the page objects located in `packages/suite-web/e2e/support/pageObjects`.
+
+#### Steps
+
+Give the test a structure by using cy.step() blocks.
+Example:
+
+```
+cy.step('Setup standard wallet with label', () => {...});
+```
+
+#### Easily understandable and readable code
+
+If there is a magic constant or hard to understand block of code, put it under a named constant/function.
+
 ### Image snapshots
 
 It is possible to run tests with image snapshots to test for visual regressions. To enable snapshots, use env variable:
diff --git a/eslint-local-rules/rules.ts b/eslint-local-rules/rules.ts
index c3b0d811265..003fa947b9e 100644
--- a/eslint-local-rules/rules.ts
+++ b/eslint-local-rules/rules.ts
@@ -1,5 +1,58 @@
 import type { Rule } from 'eslint';
 
+const findNodeWithCalleeInSubTree = (node, calleeName) => {
+    if (node.type === 'CallExpression' && node.callee.name === calleeName) {
+        return node;
+    }
+
+    if (
+        'callee' in node &&
+        typeof node.callee === 'object' &&
+        node.callee !== null &&
+        'object' in node.callee
+    ) {
+        return findNodeWithCalleeInSubTree(node.callee.object, calleeName);
+    }
+
+    return null;
+};
+
+const checkNodeForAvoidStyledComponent = (node, context, nodeRef, importedComponents) => {
+    if (node[nodeRef]?.type === 'CallExpression') {
+        // We need to recursively search for the styled component in the call tree in case its chained
+        //
+        // Example:
+        //      styled(Button).attrs(props => ({ ... {))`...`
+        //
+        const nodeWithCallee = findNodeWithCalleeInSubTree(node[nodeRef], 'styled');
+
+        if (nodeWithCallee === null) {
+            return;
+        }
+
+        if (
+            nodeWithCallee.callee.name === 'styled' &&
+            nodeWithCallee.arguments[0].type === 'Identifier'
+        ) {
+            const componentName = nodeWithCallee.arguments[0].name;
+
+            // Check if component name matches any imported component from the specified packages
+            for (const [pkgName, components] of importedComponents) {
+                if (components.has(componentName)) {
+                    context.report({
+                        node,
+                        messageId: 'avoidStyledComponent',
+                        data: {
+                            packageName: pkgName,
+                        },
+                    });
+                    break;
+                }
+            }
+        }
+    }
+};
+
 export default {
     'no-override-ds-component': {
         meta: {
@@ -19,8 +72,10 @@ export default {
                 {
                     type: 'object',
                     properties: {
-                        packageName: {
-                            type: 'string',
+                        packageNames: {
+                            type: 'array',
+                            items: { type: 'string' },
+                            minItems: 1,
                         },
                     },
                     additionalProperties: false,
@@ -28,41 +83,38 @@ export default {
             ],
         },
         create(context) {
-            const packageName = context.options[0] && context.options[0].packageName;
-            if (!packageName) {
+            const packageNames = context.options[0]?.packageNames || [];
+            if (packageNames.length === 0) {
                 return {};
             }
 
-            const importedComponents = new Set();
+            const importedComponents = new Map<string, Set<string>>(); // Map to store components per package name
 
             return {
                 ImportDeclaration(node) {
-                    if (node.source.value === packageName) {
+                    if (packageNames.includes(node.source.value)) {
                         node.specifiers.forEach(specifier => {
                             if (
                                 specifier.type === 'ImportSpecifier' ||
                                 specifier.type === 'ImportDefaultSpecifier'
                             ) {
-                                importedComponents.add(specifier.local.name);
+                                if (!importedComponents.has(node.source.value)) {
+                                    importedComponents.set(node.source.value, new Set<string>());
+                                }
+                                importedComponents.get(node.source.value).add(specifier.local.name);
                             }
                         });
                     }
                 },
+
+                // This is for case the styled component is assigned to a variable but not evaluated with `...`
+                VariableDeclarator(node) {
+                    checkNodeForAvoidStyledComponent(node, context, 'init', importedComponents);
+                },
+
+                // This for case when the standard styled(Component)`...` is used
                 TaggedTemplateExpression(node) {
-                    if (
-                        node.tag.type === 'CallExpression' &&
-                        node.tag.callee.name === 'styled' &&
-                        node.tag.arguments[0].type === 'Identifier' &&
-                        importedComponents.has(node.tag.arguments[0].name)
-                    ) {
-                        context.report({
-                            node,
-                            messageId: 'avoidStyledComponent',
-                            data: {
-                                packageName,
-                            },
-                        });
-                    }
+                    checkNodeForAvoidStyledComponent(node, context, 'tag', importedComponents);
                 },
             };
         },
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 00000000000..33fe02284bc
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,18 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/connect-examples/**', // This must be here, connect-examples are not a package
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/nx.json b/nx.json
index b0872c528d1..3c0f6271bde 100644
--- a/nx.json
+++ b/nx.json
@@ -44,11 +44,6 @@
             ],
             "cache": true
         },
-        "lint:js": {
-            "inputs": ["default", "{workspaceRoot}/.eslintrc.js"],
-            "outputs": ["{projectRoot}/.eslintcache"],
-            "cache": true
-        },
         "lint:styles": {
             "inputs": ["default", "{workspaceRoot}/.stylelintrc"],
             "outputs": ["{projectRoot}/.stylelintcache"],
diff --git a/package.json b/package.json
index 0206503c0f3..1805a93dfc6 100644
--- a/package.json
+++ b/package.json
@@ -31,13 +31,13 @@
         "type-check": "yarn nx run-many --target=type-check",
         "type-check:force": "rimraf -rf -- **/libDev && yarn type-check",
         "test:unit": "yarn nx run-many --target=test:unit",
-        "lint:js": "eslint . --cache --cache-strategy content --ignore-path .gitignore",
+        "lint:js": "eslint . --cache --cache-strategy content --flag unstable_config_lookup_from_file",
         "lint:styles": "yarn nx run-many --target=lint:styles",
         "lint": "yarn lint:styles && yarn lint:js",
         "lint-staged": "npx lint-staged",
         "lint:shellcheck": "./scripts/shellcheck.sh",
         "_______ Global Scripts _______": "Shared scripts for running in all workspaces",
-        "g:eslint": "cd $INIT_CWD && eslint --report-unused-disable-directives --cache --ignore-path ../../.gitignore",
+        "g:eslint": "cd $INIT_CWD && eslint . --cache --cache-strategy content --flag unstable_config_lookup_from_file",
         "g:jest": "cd $INIT_CWD && jest",
         "g:prettier": "cd $INIT_CWD && prettier",
         "g:rimraf": "cd $INIT_CWD && rimraf",
@@ -48,7 +48,6 @@
         "nx:build:libs": "yarn nx affected --target=build:lib",
         "nx:type-check": "yarn nx affected --target=type-check",
         "nx:test-unit": "yarn nx affected --target=test:unit",
-        "nx:lint:js": "yarn nx affected --target=lint:js",
         "nx:lint:styles": "yarn nx affected --target=lint:styles",
         "nx:format": "yarn nx format:check",
         "_______ Commands _______": "Useful commands and scripts.",
@@ -74,6 +73,7 @@
         "native:ios": "yarn workspace @suite-native/app ios",
         "native:prebuild": "yarn workspace @suite-native/app prebuild",
         "native:prebuild:clean": "yarn workspace @suite-native/app prebuild:clean",
+        "native:adhoc": "yarn workspace @suite-native/app build:adhoc",
         "native:reverse-ports": "yarn workspace @suite-native/app reverse-ports",
         "_______ Aliases _______": "Aliases for longer commands which we often have to run manually. Names don't have to be pretty or make total sense.",
         "refs": "yarn update-project-references",
@@ -103,10 +103,12 @@
         "type-fest": "4.24.0",
         "bcrypto": "5.4.0",
         "react": "18.2.0",
-        "electron": "32.1.2",
+        "electron": "33.1.0",
         "@types/node": "20.12.7",
         "@types/react": "18.2.55",
-        "bn.js": "5.2.1"
+        "bn.js": "5.2.1",
+        "node-gyp": "10.2.0",
+        "reselect": "5.1.1"
     },
     "devDependencies": {
         "@babel/cli": "^7.23.9",
@@ -120,28 +122,21 @@
         "@babel/preset-typescript": "^7.24.7",
         "@babel/runtime": "^7.23.9",
         "@suite-common/wallet-types": "workspace:*",
+        "@trezor/eslint": "workspace:*",
         "@types/jest": "29.5.12",
         "@types/node": "20.12.7",
         "@types/prettier": "^3.0.0",
         "@types/semver": "^7.5.6",
         "@types/tar": "^6.1.11",
-        "@typescript-eslint/eslint-plugin": "^8.5.0",
-        "@typescript-eslint/parser": "^8.5.0",
         "babel-jest": "29.7.0",
         "depcheck": "^1.4.7",
-        "eslint": "^8.56.0",
-        "eslint-plugin-chai-friendly": "^0.7.4",
-        "eslint-plugin-cypress": "^2.15.1",
-        "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-jest": "^27.6.3",
-        "eslint-plugin-jsx-a11y": "^6.8.0",
-        "eslint-plugin-local-rules": "^3.0.2",
-        "eslint-plugin-react": "^7.33.2",
-        "eslint-plugin-react-hooks": "^4.6.0",
+        "eslint": "^9.13.0",
+        "globals": "^15.11.0",
         "jest": "29.7.0",
         "jest-environment-jsdom": "29.7.0",
         "jest-expo": "^50.0.2",
         "metro-react-native-babel-preset": "0.77.0",
+        "node-fetch": "^2.6.4",
         "nx": "^18.0.3",
         "patch-package": "8.0.0",
         "prettier": "^3.3.2",
diff --git a/packages/address-validator/eslint.config.mjs b/packages/address-validator/eslint.config.mjs
new file mode 100644
index 00000000000..cc9da3ff07b
--- /dev/null
+++ b/packages/address-validator/eslint.config.mjs
@@ -0,0 +1,13 @@
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        ignores: [
+            // This is a JS only codebase written in JS, so we are not checking it
+            // Todo: reconsider this decision as most of the ESLint issues are auto-fixable
+            'src/**/*.js',
+            'tests/**/*.js',
+        ],
+    },
+];
diff --git a/packages/address-validator/package.json b/packages/address-validator/package.json
index a786e7281d6..481b68c110a 100644
--- a/packages/address-validator/package.json
+++ b/packages/address-validator/package.json
@@ -9,7 +9,7 @@
         "test:unit": "yarn g:jest -c ../../jest.config.base.js"
     },
     "dependencies": {
-        "base-x": "^3.0.7",
+        "base-x": "^5.0.0",
         "bech32": "^2.0.0",
         "browserify-bignum": "^1.3.0-2",
         "cbor-js": "^0.1.0",
@@ -19,6 +19,7 @@
         "lodash": "^4.17.15"
     },
     "devDependencies": {
+        "@trezor/eslint": "workspace:*",
         "rimraf": "^6.0.1"
     }
 }
diff --git a/packages/address-validator/src/crypto/blake256.js b/packages/address-validator/src/crypto/blake256.js
index a65a8e3d2f6..39ba7e83e81 100644
--- a/packages/address-validator/src/crypto/blake256.js
+++ b/packages/address-validator/src/crypto/blake256.js
@@ -27,7 +27,7 @@ Blake256.u256 = [
     0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c, 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
 ];
 
-Blake256.padding = new Buffer([
+Blake256.padding = Buffer.from([
     0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -44,7 +44,7 @@ Blake256.prototype._length_carry = function (arr) {
 };
 
 Blake256.prototype.update = function (data, encoding) {
-    data = new Buffer(data, encoding);
+    data = Buffer.from(data, encoding);
     var block = this._block;
     var offset = 0;
 
@@ -62,8 +62,8 @@ Blake256.prototype.update = function (data, encoding) {
     return this;
 };
 
-var zo = new Buffer([0x01]);
-var oo = new Buffer([0x81]);
+var zo = Buffer.from([0x01]);
+var oo = Buffer.from([0x81]);
 
 function rot(x, n) {
     return ((x << (32 - n)) | (x >>> n)) >>> 0;
@@ -91,7 +91,7 @@ function Blake256() {
 
     this._s = [0, 0, 0, 0];
 
-    this._block = new Buffer(64);
+    this._block = Buffer.alloc(64);
     this._blockOffset = 0;
     this._length = [0, 0];
 
@@ -144,7 +144,7 @@ Blake256.prototype._padding = function () {
         hi += 1;
     }
 
-    var msglen = new Buffer(8);
+    var msglen = Buffer.alloc(8);
     msglen.writeUInt32BE(hi, 0);
     msglen.writeUInt32BE(lo, 4);
 
@@ -175,7 +175,7 @@ Blake256.prototype._padding = function () {
 Blake256.prototype.digest = function (encoding) {
     this._padding();
 
-    var buffer = new Buffer(32);
+    var buffer = Buffer.alloc(32);
     for (var i = 0; i < 8; ++i) buffer.writeUInt32BE(this._h[i], i * 4);
     return buffer.toString(encoding);
 };
diff --git a/packages/address-validator/src/currencies.js b/packages/address-validator/src/currencies.js
index 410371a0dff..3538176897b 100644
--- a/packages/address-validator/src/currencies.js
+++ b/packages/address-validator/src/currencies.js
@@ -1451,6 +1451,11 @@ var CURRENCIES = [
         symbol: 'bnb',
         validator: ETHValidator,
     },
+    {
+        name: 'Optimism',
+        symbol: 'eth',
+        validator: ETHValidator,
+    },
     {
         name: 'EOS',
         symbol: 'eos',
diff --git a/packages/address-validator/src/index.d.ts b/packages/address-validator/src/index.d.ts
index 8658315aeae..4b3b38c17f8 100644
--- a/packages/address-validator/src/index.d.ts
+++ b/packages/address-validator/src/index.d.ts
@@ -3,6 +3,7 @@ declare module '@trezor/address-validator' {
         name: string;
         symbol: string;
     }
+
     export type AddressType =
         | 'address'
         | 'p2pkh'
@@ -11,16 +12,20 @@ declare module '@trezor/address-validator' {
         | 'p2sh'
         | 'p2tr'
         | 'pw-unknown';
+
     export function validate(
         address: string,
         currencyNameOrSymbol?: string,
         networkType?: string,
     ): boolean;
+
     export function getAddressType(
         address: string,
         currencyNameOrSymbol?: string,
         networkType?: string,
     ): AddressType | undefined;
+
     export function getCurrencies(): Currency[];
+
     export function findCurrency(symbol: string): Currency;
 }
diff --git a/packages/address-validator/src/nano_validator.js b/packages/address-validator/src/nano_validator.js
index f57f4e8e89d..c595e7f147d 100644
--- a/packages/address-validator/src/nano_validator.js
+++ b/packages/address-validator/src/nano_validator.js
@@ -1,6 +1,6 @@
 const { addressType } = require('./crypto/utils');
 var cryptoUtils = require('./crypto/utils');
-var baseX = require('base-x');
+var baseX = require('base-x').default;
 
 var ALLOWED_CHARS = '13456789abcdefghijkmnopqrstuwxyz';
 
diff --git a/packages/address-validator/src/ripple_validator.js b/packages/address-validator/src/ripple_validator.js
index 33dd3f36c9e..ffad6e9a9bb 100644
--- a/packages/address-validator/src/ripple_validator.js
+++ b/packages/address-validator/src/ripple_validator.js
@@ -1,6 +1,6 @@
 const { addressType } = require('./crypto/utils');
 var cryptoUtils = require('./crypto/utils');
-var baseX = require('base-x');
+var baseX = require('base-x').default;
 
 var ALLOWED_CHARS = 'rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz';
 
diff --git a/packages/address-validator/src/stellar_validator.js b/packages/address-validator/src/stellar_validator.js
index eed4bdc6479..cc788ce3010 100644
--- a/packages/address-validator/src/stellar_validator.js
+++ b/packages/address-validator/src/stellar_validator.js
@@ -1,5 +1,5 @@
 const { addressType } = require('./crypto/utils');
-const baseX = require('base-x');
+const baseX = require('base-x').default;
 const crc = require('crc');
 const cryptoUtils = require('./crypto/utils');
 
diff --git a/packages/address-validator/tsconfig.json b/packages/address-validator/tsconfig.json
index c7ebe855e21..d836e07709c 100644
--- a/packages/address-validator/tsconfig.json
+++ b/packages/address-validator/tsconfig.json
@@ -1,5 +1,5 @@
 {
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
-    "references": []
+    "references": [{ "path": "../eslint" }]
 }
diff --git a/packages/analytics/package.json b/packages/analytics/package.json
index a128603115d..f3f739419aa 100644
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@trezor/analytics",
-    "version": "1.2.1",
+    "version": "1.2.2-beta.1",
     "license": "See LICENSE.md in repo root",
     "sideEffects": false,
     "main": "src/index.ts",
@@ -12,7 +12,6 @@
         "!**/*.map"
     ],
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
diff --git a/packages/analytics/src/tests/analytics.test.ts b/packages/analytics/src/tests/analytics.test.ts
index ff342789000..291a8026d44 100644
--- a/packages/analytics/src/tests/analytics.test.ts
+++ b/packages/analytics/src/tests/analytics.test.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import { fixtures } from './fixtures/encodeDataToQueryString';
 import { Analytics } from '../analytics';
 import { encodeDataToQueryString, getRandomId } from '../utils';
diff --git a/packages/analytics/src/utils.ts b/packages/analytics/src/utils.ts
index 5cb59538ee6..031e6b6e043 100644
--- a/packages/analytics/src/utils.ts
+++ b/packages/analytics/src/utils.ts
@@ -1,7 +1,8 @@
 import type { Environment } from '@trezor/env-utils';
-import type { App, Event as AnalyticsEvent } from './types';
 import { getWeakRandomId } from '@trezor/utils';
 
+import type { App, Event as AnalyticsEvent } from './types';
+
 export const getTrackingRandomId = () => getWeakRandomId(10);
 
 export const getRandomId = () => getWeakRandomId(10);
diff --git a/packages/connect-deeplink/package.json b/packages/asset-utils/package.json
similarity index 55%
rename from packages/connect-deeplink/package.json
rename to packages/asset-utils/package.json
index 0329d95bc88..79425b37bda 100644
--- a/packages/connect-deeplink/package.json
+++ b/packages/asset-utils/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "@trezor/connect-deeplink",
+    "name": "@trezor/asset-utils",
     "version": "1.0.0",
     "private": true,
     "license": "See LICENSE.md in repo root",
@@ -7,11 +7,6 @@
     "main": "src/index",
     "scripts": {
         "depcheck": "yarn g:depcheck",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "type-check": "yarn g:tsc --build"
-    },
-    "dependencies": {
-        "@trezor/connect": "workspace:^",
-        "@trezor/utils": "workspace:^"
     }
 }
diff --git a/packages/asset-utils/src/asset-logo-urls.ts b/packages/asset-utils/src/asset-logo-urls.ts
new file mode 100644
index 00000000000..dc49d194ceb
--- /dev/null
+++ b/packages/asset-utils/src/asset-logo-urls.ts
@@ -0,0 +1,18 @@
+const ICONS_URL_BASE = 'https://data.trezor.io/suite/icons/coins/';
+
+const composeAssetLogoUrl = (fileName: string, quality?: '@2x') =>
+    `${ICONS_URL_BASE}${fileName}${quality === undefined ? '' : quality}.webp`;
+
+export const getAssetLogoUrl = ({
+    coingeckoId,
+    contractAddress,
+    quality,
+}: {
+    coingeckoId: string;
+    contractAddress?: string;
+    quality?: '@2x';
+}) =>
+    composeAssetLogoUrl(
+        contractAddress ? `${coingeckoId}--${contractAddress}` : coingeckoId,
+        quality,
+    );
diff --git a/packages/asset-utils/src/index.ts b/packages/asset-utils/src/index.ts
new file mode 100644
index 00000000000..5465a64c5b4
--- /dev/null
+++ b/packages/asset-utils/src/index.ts
@@ -0,0 +1 @@
+export { getAssetLogoUrl } from './asset-logo-urls';
diff --git a/packages/asset-utils/tsconfig.json b/packages/asset-utils/tsconfig.json
new file mode 100644
index 00000000000..c7ebe855e21
--- /dev/null
+++ b/packages/asset-utils/tsconfig.json
@@ -0,0 +1,5 @@
+{
+    "extends": "../../tsconfig.base.json",
+    "compilerOptions": { "outDir": "libDev" },
+    "references": []
+}
diff --git a/packages/auth-server/package.json b/packages/auth-server/package.json
index cb26b4f10a1..605af0c8452 100644
--- a/packages/auth-server/package.json
+++ b/packages/auth-server/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "dev": "yarn g:tsx watch ./src/index.ts",
@@ -15,7 +14,7 @@
     },
     "dependencies": {
         "cors": "^2.8.5",
-        "express": "^4.21.0"
+        "express": "^4.21.1"
     },
     "devDependencies": {
         "@types/cors": "^2.8.17"
diff --git a/packages/blockchain-link-types/package.json b/packages/blockchain-link-types/package.json
index 123b2a9839b..6880fad9811 100644
--- a/packages/blockchain-link-types/package.json
+++ b/packages/blockchain-link-types/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@trezor/blockchain-link-types",
-    "version": "1.2.1",
+    "version": "1.2.2-beta.2",
     "license": "See LICENSE.md in repo root",
     "sideEffects": false,
     "main": "src/index.ts",
@@ -12,7 +12,6 @@
         "!**/*.map"
     ],
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "build:lib": "yarn g:rimraf ./lib && yarn g:tsc --build tsconfig.lib.json && ../../scripts/replace-imports.sh ./lib",
@@ -20,10 +19,9 @@
         "prepublish": "yarn tsx ../../scripts/prepublish.js"
     },
     "dependencies": {
-        "@solana/web3.js": "^1.95.0",
+        "@solana/web3.js": "^1.95.4",
         "@trezor/type-utils": "workspace:*",
-        "@trezor/utxo-lib": "workspace:*",
-        "socks-proxy-agent": "6.1.1"
+        "@trezor/utxo-lib": "workspace:*"
     },
     "devDependencies": {
         "tsx": "^4.16.3"
diff --git a/packages/blockchain-link-types/src/blockbook-api.ts b/packages/blockchain-link-types/src/blockbook-api.ts
index 06835e78a8a..2debd21191f 100644
--- a/packages/blockchain-link-types/src/blockbook-api.ts
+++ b/packages/blockchain-link-types/src/blockbook-api.ts
@@ -33,6 +33,10 @@ export interface EthereumSpecific {
     gasLimit: number;
     gasUsed?: number;
     gasPrice?: string;
+    l1Fee?: number;
+    l1FeeScalar?: string;
+    l1GasPrice?: string;
+    l1GasUsed?: number;
     data?: string;
     parsedData?: EthereumParsedInputData;
     internalTransfers?: EthereumInternalTransfer[];
@@ -46,14 +50,11 @@ export interface TokenTransfer {
     from: string;
     to: string;
     contract: string;
-    name: string;
+    name?: string;
     symbol?: string;
-    decimals: number;
+    decimals: number; // it is optional #14796
     value?: string;
     multiTokenValues?: MultiTokenValue[];
-    fingerprint?: string;
-    policyId?: string;
-    unit?: string;
 }
 export interface Vout {
     value?: string;
@@ -114,6 +115,7 @@ export interface FeeStats {
 }
 export interface StakingPool {
     contract: string;
+    name: string;
     pendingBalance: string;
     pendingDepositedBalance: string;
     depositedBalance: string;
@@ -121,7 +123,6 @@ export interface StakingPool {
     claimableAmount: string;
     restakedReward: string;
     autocompoundBalance: string;
-    name: string;
 }
 export interface ContractInfo {
     type: string;
@@ -175,6 +176,7 @@ export interface Address {
     contractInfo?: ContractInfo;
     erc20Contract?: ContractInfo;
     addressAliases?: { [key: string]: AddressAlias };
+    stakingPools?: StakingPool[];
 }
 export interface Utxo {
     txid: string;
@@ -259,6 +261,7 @@ export interface InternalStateColumn {
 }
 export interface BlockbookInfo {
     coin: string;
+    network: string;
     host: string;
     version: string;
     gitCommit: string;
@@ -278,6 +281,7 @@ export interface BlockbookInfo {
     currentFiatRatesTime?: string;
     historicalFiatRatesTime?: string;
     historicalTokenFiatRatesTime?: string;
+    supportedStakingPools?: string[];
     dbSizeFromColumns?: number;
     dbColumns?: InternalStateColumn[];
     about: string;
@@ -352,6 +356,7 @@ export interface WsBackendInfo {
 export interface WsInfoRes {
     name: string;
     shortcut: string;
+    network: string;
     decimals: number;
     version: string;
     bestHeight: number;
@@ -372,11 +377,15 @@ export interface WsBlockReq {
     page?: number;
 }
 export interface WsBlockFilterReq {
+    scriptType: string;
     blockHash: string;
+    M?: number;
 }
 export interface WsBlockFiltersBatchReq {
+    scriptType: string;
     bestKnownBlockHash: string;
     pageSize?: number;
+    M?: number;
 }
 export interface WsAccountUtxoReq {
     descriptor: string;
@@ -437,7 +446,17 @@ export interface WsFiatRatesTickersListReq {
 export interface WsMempoolFiltersReq {
     scriptType: string;
     fromTimestamp: number;
+    M?: number;
+}
+export interface WsRpcCallReq {
+    from?: string;
+    to: string;
+    data: string;
+}
+export interface WsRpcCallRes {
+    data: string;
 }
 export interface MempoolTxidFilterEntries {
     entries?: { [key: string]: string };
+    usedZeroedKey?: boolean;
 }
diff --git a/packages/blockchain-link-types/src/blockbook.ts b/packages/blockchain-link-types/src/blockbook.ts
index 5ea2ab45c13..34973f812e0 100644
--- a/packages/blockchain-link-types/src/blockbook.ts
+++ b/packages/blockchain-link-types/src/blockbook.ts
@@ -6,6 +6,7 @@ import type {
     GetFiatRatesForTimestampsParams,
     GetFiatRatesTickersListParams,
     EstimateFeeParams,
+    RpcCallParams,
     AccountInfoParams,
 } from './params';
 import type { AccountBalanceHistory, FiatRatesBySymbol, TokenStandard } from './common';
@@ -210,6 +211,7 @@ declare function FSend(
     params: GetFiatRatesForTimestampsParams,
 ): Promise<FiatRatesForTimestamp>;
 declare function FSend(method: 'estimateFee', params: EstimateFeeParams): Promise<Fee>;
+declare function FSend(method: 'rpcCall', params: RpcCallParams): Promise<{ data: string }>;
 declare function FSend(
     method: 'subscribeAddresses',
     params: { addresses: string[] },
diff --git a/packages/blockchain-link-types/src/common.ts b/packages/blockchain-link-types/src/common.ts
index 2c7039f2179..75004777e2c 100644
--- a/packages/blockchain-link-types/src/common.ts
+++ b/packages/blockchain-link-types/src/common.ts
@@ -1,4 +1,4 @@
-import type { SocksProxyAgentOptions } from 'socks-proxy-agent';
+import type tls from 'tls';
 
 import type { Transaction as BlockbookTransaction, VinVout } from './blockbook';
 import type {
@@ -10,6 +10,25 @@ import type {
 
 /* Common types used in both params and responses */
 
+type AgentOptions = {
+    timeout?: number | undefined;
+};
+
+interface BaseSocksProxyAgentOptions {
+    host?: string | null;
+    port?: string | number | null;
+    username?: string | null;
+    tls?: tls.ConnectionOptions | null;
+    ipaddress?: string;
+    type: 4 | 5;
+    userId?: string;
+    password?: string;
+}
+
+// todo: connect10 here we are using the old `SocksProxyAgentOptions` from older version of socks-proxy-agent
+// but we keep the old API so we do not introduce breaking changes.
+interface SocksProxyAgentOptions extends AgentOptions, BaseSocksProxyAgentOptions {}
+
 export interface BlockchainSettings {
     name: string;
     worker: string | (() => any);
@@ -34,7 +53,7 @@ export interface ServerInfo {
     consensusBranchId?: number; // zcash current branch id
 }
 
-export type TokenStandard = 'ERC20' | 'ERC1155' | 'ERC721' | 'SPL';
+export type TokenStandard = 'ERC20' | 'ERC1155' | 'ERC721' | 'SPL' | 'BEP20';
 
 export type TransferType = 'sent' | 'recv' | 'self' | 'unknown';
 
diff --git a/packages/blockchain-link-types/src/constants/messages.ts b/packages/blockchain-link-types/src/constants/messages.ts
index 7b3ba7305d4..e3e82e88f85 100644
--- a/packages/blockchain-link-types/src/constants/messages.ts
+++ b/packages/blockchain-link-types/src/constants/messages.ts
@@ -14,6 +14,7 @@ export const GET_ACCOUNT_UTXO = 'm_get_account_utxo';
 export const GET_TRANSACTION = 'm_get_transaction';
 export const GET_TRANSACTION_HEX = 'm_get_transaction_hex';
 export const ESTIMATE_FEE = 'm_estimate_fee';
+export const RPC_CALL = 'm_rpc_call';
 export const SUBSCRIBE = 'm_subscribe';
 export const UNSUBSCRIBE = 'm_unsubscribe';
 export const PUSH_TRANSACTION = 'm_push_tx';
diff --git a/packages/blockchain-link-types/src/constants/responses.ts b/packages/blockchain-link-types/src/constants/responses.ts
index 313b58f16de..d975f5d6289 100644
--- a/packages/blockchain-link-types/src/constants/responses.ts
+++ b/packages/blockchain-link-types/src/constants/responses.ts
@@ -13,6 +13,7 @@ export const GET_ACCOUNT_BALANCE_HISTORY = 'r_get_account_balance_history';
 export const GET_TRANSACTION = 'r_get_transaction';
 export const GET_TRANSACTION_HEX = 'r_get_transaction_hex';
 export const ESTIMATE_FEE = 'r_estimate_fee';
+export const RPC_CALL = 'r_rpc_call';
 export const SUBSCRIBE = 'r_subscribe';
 export const UNSUBSCRIBE = 'r_unsubscribe';
 export const PUSH_TRANSACTION = 'r_push_tx';
diff --git a/packages/blockchain-link-types/src/messages.ts b/packages/blockchain-link-types/src/messages.ts
index 64d09f7e67a..ae9f7a4f09d 100644
--- a/packages/blockchain-link-types/src/messages.ts
+++ b/packages/blockchain-link-types/src/messages.ts
@@ -6,6 +6,7 @@ import type {
     GetFiatRatesForTimestampsParams,
     GetFiatRatesTickersListParams,
     EstimateFeeParams,
+    RpcCallParams,
     AccountInfoParams,
 } from './params';
 
@@ -77,6 +78,11 @@ export interface EstimateFee {
     payload: EstimateFeeParams;
 }
 
+export interface RpcCall {
+    type: typeof MESSAGES.RPC_CALL;
+    payload: RpcCallParams;
+}
+
 export interface Subscribe {
     type: typeof MESSAGES.SUBSCRIBE;
     payload:
@@ -144,6 +150,7 @@ export type Message =
     | ChannelMessage<GetAccountBalanceHistory>
     | ChannelMessage<GetFiatRatesTickersList>
     | ChannelMessage<EstimateFee>
+    | ChannelMessage<RpcCall>
     | ChannelMessage<Subscribe>
     | ChannelMessage<Unsubscribe>
     | ChannelMessage<PushTransaction>;
diff --git a/packages/blockchain-link-types/src/params.ts b/packages/blockchain-link-types/src/params.ts
index a5bbf442843..ebb9bd42662 100644
--- a/packages/blockchain-link-types/src/params.ts
+++ b/packages/blockchain-link-types/src/params.ts
@@ -35,6 +35,12 @@ export interface EstimateFeeParams {
     };
 }
 
+export interface RpcCallParams {
+    from: string;
+    to: string;
+    data: string;
+}
+
 export interface AccountInfoParams {
     descriptor: string; // address or xpub
     details?: 'basic' | 'tokens' | 'tokenBalances' | 'txids' | 'txs'; // depth, default: 'basic'
diff --git a/packages/blockchain-link-types/src/responses.ts b/packages/blockchain-link-types/src/responses.ts
index 5a88dbedf0f..aa96ef26489 100644
--- a/packages/blockchain-link-types/src/responses.ts
+++ b/packages/blockchain-link-types/src/responses.ts
@@ -101,6 +101,13 @@ export interface EstimateFee {
     }[];
 }
 
+export interface RpcCall {
+    type: typeof RESPONSES.RPC_CALL;
+    payload: {
+        data: string;
+    };
+}
+
 export interface Subscribe {
     type: typeof RESPONSES.SUBSCRIBE;
     payload: { subscribed: boolean };
@@ -173,6 +180,7 @@ export type Response =
     | ChannelMessage<GetFiatRatesForTimestamps>
     | ChannelMessage<GetFiatRatesTickersList>
     | ChannelMessage<EstimateFee>
+    | ChannelMessage<RpcCall>
     | ChannelMessage<Subscribe>
     | ChannelMessage<Unsubscribe>
     | ChannelMessage<Notification>
diff --git a/packages/blockchain-link-utils/.eslintrc.js b/packages/blockchain-link-utils/.eslintrc.js
deleted file mode 100644
index d5e6c09c159..00000000000
--- a/packages/blockchain-link-utils/.eslintrc.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-    rules: {
-        'import/no-extraneous-dependencies': ['error', { includeTypes: true }],
-    },
-};
diff --git a/packages/blockchain-link-utils/eslint.config.mjs b/packages/blockchain-link-utils/eslint.config.mjs
new file mode 100644
index 00000000000..eafc52e3d55
--- /dev/null
+++ b/packages/blockchain-link-utils/eslint.config.mjs
@@ -0,0 +1,15 @@
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    includeTypes: true,
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/blockchain-link-utils/package.json b/packages/blockchain-link-utils/package.json
index 113a2fdec92..59a6e5545b7 100644
--- a/packages/blockchain-link-utils/package.json
+++ b/packages/blockchain-link-utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@trezor/blockchain-link-utils",
-    "version": "1.2.1",
+    "version": "1.2.2-beta.2",
     "license": "See LICENSE.md in repo root",
     "sideEffects": false,
     "main": "src/index.ts",
@@ -12,7 +12,6 @@
         "!**/*.map"
     ],
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
@@ -22,12 +21,13 @@
     },
     "dependencies": {
         "@mobily/ts-belt": "^3.13.1",
-        "@solana/web3.js": "^1.95.0",
+        "@solana/web3.js": "^1.95.4",
         "@trezor/env-utils": "workspace:*",
         "@trezor/utils": "workspace:*"
     },
     "devDependencies": {
         "@trezor/blockchain-link-types": "workspace:*",
+        "@trezor/eslint": "workspace:*",
         "@trezor/type-utils": "workspace:*",
         "tsx": "^4.16.3"
     },
diff --git a/packages/blockchain-link-utils/src/solana.ts b/packages/blockchain-link-utils/src/solana.ts
index 918b212c122..e9682634953 100644
--- a/packages/blockchain-link-utils/src/solana.ts
+++ b/packages/blockchain-link-utils/src/solana.ts
@@ -242,9 +242,9 @@ export const getTargets = (
 ): Transaction['targets'] =>
     effects
         .filter(effect => {
-            // for 'self` transaction there is only one effect
+            // exclude target for 'self` transaction because it is redundant with fee
             if (txType === 'self') {
-                return true;
+                return false;
             }
             // ignore all targets for unknown transactions
             if (txType === 'unknown') {
@@ -365,10 +365,12 @@ export const getDetails = (
 
     // include positive effects only on accountAddress for tx types other then sent, otherwise it
     // leads to foreign address being displayed next to users own address which might lead to confusion
-    const receivers = effects.filter(
-        ({ amount, address }) =>
-            amount.isPositive() && (txType !== 'sent' ? address === accountAddress : true),
-    );
+    const receivers = effects
+        .filter(
+            ({ amount, address }) =>
+                amount.isPositive() && (txType !== 'sent' ? address === accountAddress : true),
+        )
+        .filter(({ address }) => !(txType === 'self' && address === accountAddress));
 
     const getVin = ({ address, amount }: { address: string; amount?: BigNumber }, i: number) => ({
         txid: transaction.transaction.signatures[0].toString(),
@@ -409,7 +411,8 @@ export const getAmount = (
         return '0';
     }
     if (txType === 'self') {
-        return accountEffect.amount?.abs().toString();
+        // we do not want to show amount because its redundant with fee
+        return '0';
     }
 
     return accountEffect.amount.toString();
diff --git a/packages/blockchain-link-utils/src/tests/fixtures/solana.ts b/packages/blockchain-link-utils/src/tests/fixtures/solana.ts
index daa33a96501..a00f2e06647 100644
--- a/packages/blockchain-link-utils/src/tests/fixtures/solana.ts
+++ b/packages/blockchain-link-utils/src/tests/fixtures/solana.ts
@@ -554,15 +554,7 @@ export const fixtures = {
                 txType: 'self',
                 accountAddress: effects.negative.address,
             },
-            expectedOutput: [
-                {
-                    n: 0,
-                    addresses: [effects.negative.address],
-                    isAddress: true,
-                    amount: effects.negative.amount.abs().toString(),
-                    isAccountTarget: true,
-                },
-            ],
+            expectedOutput: [],
         },
         {
             description: 'should return an array with a target for "sent" transaction type',
@@ -641,7 +633,7 @@ export const fixtures = {
                 accountEffect: effects.negative,
                 txType: 'self',
             },
-            expectedOutput: effects.negative.amount.abs().toString(),
+            expectedOutput: '0',
         },
         {
             description: 'should return the amount as a string for other transaction types',
diff --git a/packages/blockchain-link-utils/tsconfig.json b/packages/blockchain-link-utils/tsconfig.json
index 4a916aecceb..384167f6a4b 100644
--- a/packages/blockchain-link-utils/tsconfig.json
+++ b/packages/blockchain-link-utils/tsconfig.json
@@ -5,6 +5,7 @@
         { "path": "../env-utils" },
         { "path": "../utils" },
         { "path": "../blockchain-link-types" },
+        { "path": "../eslint" },
         { "path": "../type-utils" }
     ]
 }
diff --git a/packages/blockchain-link-utils/tsconfig.lib.json b/packages/blockchain-link-utils/tsconfig.lib.json
index 0a807b03a87..ff5e7509065 100644
--- a/packages/blockchain-link-utils/tsconfig.lib.json
+++ b/packages/blockchain-link-utils/tsconfig.lib.json
@@ -14,6 +14,9 @@
         {
             "path": "../blockchain-link-types"
         },
+        {
+            "path": "../eslint"
+        },
         {
             "path": "../type-utils"
         }
diff --git a/packages/blockchain-link/.eslintrc.js b/packages/blockchain-link/.eslintrc.js
deleted file mode 100644
index ee0d328e90a..00000000000
--- a/packages/blockchain-link/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
-    rules: {
-        camelcase: 'off',
-        'no-underscore-dangle': 'off',
-        'no-console': 'warn',
-    },
-};
diff --git a/packages/blockchain-link/eslint.config.mjs b/packages/blockchain-link/eslint.config.mjs
new file mode 100644
index 00000000000..a30c5e34ea0
--- /dev/null
+++ b/packages/blockchain-link/eslint.config.mjs
@@ -0,0 +1,24 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            camelcase: 'off',
+            'no-underscore-dangle': 'off',
+            'no-console': 'warn',
+            'import/no-default-export': 'off',
+            '@typescript-eslint/no-shadow': 'off', // Todo: shall be fixed
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/tests/**',
+                        '**/webpack/**',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/blockchain-link/package.json b/packages/blockchain-link/package.json
index 77b72c32733..d43338e6fc1 100644
--- a/packages/blockchain-link/package.json
+++ b/packages/blockchain-link/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@trezor/blockchain-link",
-    "version": "2.3.1",
+    "version": "2.3.2-beta.2",
     "author": "Trezor <info@trezor.io>",
     "homepage": "https://github.com/trezor/trezor-suite/tree/develop/packages/blockchain-link",
     "description": "High-level javascript interface for blockchain communication",
@@ -56,7 +56,6 @@
         "build:workers": "yarn g:rimraf build && yarn build:workers-web && yarn build:workers-module",
         "build:workers-web": "webpack --config ./webpack/workers.web.js",
         "build:workers-module": "webpack --config ./webpack/workers.module.js",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest --verbose -c jest.config.unit.js",
         "test:integration": "yarn g:jest -c jest.config.integration.js",
         "type-check": "yarn g:tsc --build tsconfig.json",
@@ -65,28 +64,29 @@
     },
     "devDependencies": {
         "@trezor/e2e-utils": "workspace:*",
+        "@trezor/eslint": "workspace:*",
         "@trezor/type-utils": "workspace:*",
         "fs-extra": "^11.2.0",
         "html-webpack-plugin": "^5.6.0",
         "tiny-worker": "^2.3.0",
         "tsx": "^4.16.3",
-        "webpack": "^5.94.0",
+        "webpack": "^5.96.1",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^5.0.4",
         "worker-loader": "^3.0.8"
     },
     "dependencies": {
         "@solana/buffer-layout": "^4.0.1",
-        "@solana/web3.js": "^1.95.0",
+        "@solana/web3.js": "^1.95.4",
         "@trezor/blockchain-link-types": "workspace:*",
         "@trezor/blockchain-link-utils": "workspace:*",
         "@trezor/env-utils": "workspace:*",
         "@trezor/utils": "workspace:*",
         "@trezor/utxo-lib": "workspace:*",
-        "@types/web": "^0.0.162",
+        "@types/web": "^0.0.174",
         "events": "^3.3.0",
         "ripple-lib": "^1.10.1",
-        "socks-proxy-agent": "6.1.1",
+        "socks-proxy-agent": "8.0.4",
         "ws": "^8.18.0"
     },
     "peerDependencies": {
diff --git a/packages/blockchain-link/src/index.ts b/packages/blockchain-link/src/index.ts
index 407483353c5..3ba26ef9942 100644
--- a/packages/blockchain-link/src/index.ts
+++ b/packages/blockchain-link/src/index.ts
@@ -50,7 +50,7 @@ const initWorker = async (settings: BlockchainSettings) => {
         worker.onerror = null;
         try {
             worker.terminate();
-        } catch (error) {
+        } catch {
             // empty
         }
 
@@ -229,6 +229,13 @@ class BlockchainLink extends TypedEmitter<Events> {
         });
     }
 
+    rpcCall(payload: MessageTypes.RpcCall['payload']): Promise<ResponseTypes.RpcCall['payload']> {
+        return this.sendMessage({
+            type: MESSAGES.RPC_CALL,
+            payload,
+        });
+    }
+
     /**
      * Subscribe for live changes in
      * - blockchain i.e new blocks mined.
diff --git a/packages/blockchain-link/src/ui/config.ts b/packages/blockchain-link/src/ui/config.ts
index df63223da52..dd35b4a197b 100644
--- a/packages/blockchain-link/src/ui/config.ts
+++ b/packages/blockchain-link/src/ui/config.ts
@@ -91,7 +91,29 @@ export default [
         blockchain: {
             name: 'BNB Smart Chain',
             worker: 'js/blockbook-worker.js',
-            server: ['https://bsc1.trezor.io'],
+            server: ['https://bsc1.trezor.io', 'https://bsc2.trezor.io'],
+            debug: true,
+        },
+        data: {
+            address: '',
+            accountInfoOptions: {
+                page: 1,
+                pageSize: 25,
+                contractFilter: undefined,
+            },
+            estimateFeeOptions: {
+                blocks: [1, 2, 10],
+            },
+            txid: '',
+            tx: '',
+            subscribe: '',
+        },
+    },
+    {
+        blockchain: {
+            name: 'Optimism',
+            worker: 'js/blockbook-worker.js',
+            server: ['https://op1.trezor.io', 'https://op2.trezor.io'],
             debug: true,
         },
         data: {
diff --git a/packages/blockchain-link/src/utils/socks-proxy-agent.ts b/packages/blockchain-link/src/utils/socks-proxy-agent.ts
index 4b4519d5ff5..d28767e5b7a 100644
--- a/packages/blockchain-link/src/utils/socks-proxy-agent.ts
+++ b/packages/blockchain-link/src/utils/socks-proxy-agent.ts
@@ -1,6 +1,4 @@
 // socks-proxy-agent is not supported in browser
 // use fallback module. see package.json "browser" field
 
-const createSocksProxyAgent = (_opts: string) => ({});
-
-export default createSocksProxyAgent;
+export const SocksProxyAgent = (_opts: string) => ({});
diff --git a/packages/blockchain-link/src/workers/baseWebsocket.ts b/packages/blockchain-link/src/workers/baseWebsocket.ts
index 349dc29026c..0132080c76e 100644
--- a/packages/blockchain-link/src/workers/baseWebsocket.ts
+++ b/packages/blockchain-link/src/workers/baseWebsocket.ts
@@ -1,8 +1,6 @@
 import WebSocket from 'ws';
-import { createDeferred } from '@trezor/utils';
-import { createDeferredManager } from '@trezor/utils';
-import { TypedEmitter } from '@trezor/utils';
 
+import { createDeferred, createDeferredManager, TypedEmitter } from '@trezor/utils';
 import { CustomError } from '@trezor/blockchain-link-types/src/constants/errors';
 
 interface Subscription<T> {
@@ -44,6 +42,7 @@ export abstract class BaseWebsocket<T extends EventMap> extends TypedEmitter<T &
     private connectPromise?: Promise<void>;
 
     protected abstract ping(): Promise<unknown>;
+
     protected abstract createWebsocket(): WebSocket;
 
     constructor(options: Options) {
@@ -81,7 +80,7 @@ export abstract class BaseWebsocket<T extends EventMap> extends TypedEmitter<T &
                 } else {
                     this.ws.close();
                 }
-            } catch (error) {
+            } catch {
                 // empty
             }
         }
@@ -125,7 +124,7 @@ export abstract class BaseWebsocket<T extends EventMap> extends TypedEmitter<T &
                     subs.callback(data);
                 }
             }
-        } catch (error) {
+        } catch {
             // empty
         }
 
@@ -170,7 +169,7 @@ export abstract class BaseWebsocket<T extends EventMap> extends TypedEmitter<T &
                 try {
                     ws.once('error', () => {}); // hack; ws throws uncaughtably when there's no error listener
                     ws.close();
-                } catch (error) {
+                } catch {
                     // empty
                 }
             },
diff --git a/packages/blockchain-link/src/workers/baseWorker.ts b/packages/blockchain-link/src/workers/baseWorker.ts
index e842786caa3..e1ad3184439 100644
--- a/packages/blockchain-link/src/workers/baseWorker.ts
+++ b/packages/blockchain-link/src/workers/baseWorker.ts
@@ -5,14 +5,16 @@
 // and
 // new BlockchainLink({ worker: () => new BlockchainLinkModule() });
 
-import SocksProxyAgent from 'socks-proxy-agent';
+import { SocksProxyAgent } from 'socks-proxy-agent';
+
 import { CustomError } from '@trezor/blockchain-link-types/src/constants/errors';
-import { WorkerState } from './state';
-import { prioritizeEndpoints } from './utils';
 import { MESSAGES, RESPONSES } from '@trezor/blockchain-link-types/src/constants';
 import type { Response, BlockchainSettings } from '@trezor/blockchain-link-types';
 import type { Message } from '@trezor/blockchain-link-types/src/messages';
 
+import { prioritizeEndpoints } from './utils';
+import { WorkerState } from './state';
+
 // self is not declared in TS Webworker lib typings
 declare const self: { postMessage: (...args: any[]) => any };
 
@@ -31,7 +33,7 @@ export type ContextType<API> = {
 
 export abstract class BaseWorker<API> {
     api: API | undefined;
-    proxyAgent: ReturnType<typeof SocksProxyAgent> | undefined;
+    proxyAgent: SocksProxyAgent | undefined;
     settings: Partial<BlockchainSettings> = {};
     state: WorkerState;
     post: (data: Response) => void;
@@ -141,9 +143,16 @@ export abstract class BaseWorker<API> {
 
         if (data.type === MESSAGES.HANDSHAKE) {
             this.settings = data.settings;
-            this.proxyAgent = data.settings.proxy
-                ? SocksProxyAgent(data.settings.proxy)
-                : undefined;
+            const { proxy } = data.settings;
+            if (proxy) {
+                const agentUri =
+                    typeof proxy === 'string' ? proxy : `socks://${proxy.host}:${proxy.port}`;
+                const socketOptions =
+                    typeof proxy === 'object' ? { timeout: proxy?.timeout } : undefined;
+                this.proxyAgent = new SocksProxyAgent(agentUri, socketOptions);
+            } else {
+                this.proxyAgent = undefined;
+            }
 
             return true;
         }
diff --git a/packages/blockchain-link/src/workers/blockbook/index.ts b/packages/blockchain-link/src/workers/blockbook/index.ts
index 58c1b428265..f552b4b6ed7 100644
--- a/packages/blockchain-link/src/workers/blockbook/index.ts
+++ b/packages/blockchain-link/src/workers/blockbook/index.ts
@@ -1,7 +1,5 @@
 import { CustomError } from '@trezor/blockchain-link-types/src/constants/errors';
 import { MESSAGES, RESPONSES } from '@trezor/blockchain-link-types/src/constants';
-import { BaseWorker, CONTEXT, ContextType } from '../baseWorker';
-import { BlockbookAPI } from './websocket';
 import * as utils from '@trezor/blockchain-link-utils/src/blockbook';
 import type { Response, SubscriptionAccountInfo } from '@trezor/blockchain-link-types';
 import type {
@@ -12,6 +10,9 @@ import type {
 } from '@trezor/blockchain-link-types/src/blockbook';
 import type * as MessageTypes from '@trezor/blockchain-link-types/src/messages';
 
+import { BlockbookAPI } from './websocket';
+import { BaseWorker, CONTEXT, ContextType } from '../baseWorker';
+
 type Context = ContextType<BlockbookAPI>;
 type Request<T> = T & Context;
 
@@ -163,6 +164,16 @@ const estimateFee = async (request: Request<MessageTypes.EstimateFee>) => {
     } as const;
 };
 
+const rpcCall = async (request: Request<MessageTypes.RpcCall>) => {
+    const api = await request.connect();
+    const resp = await api.rpcCall(request.payload);
+
+    return {
+        type: RESPONSES.RPC_CALL,
+        payload: resp,
+    } as const;
+};
+
 const onNewBlock = ({ post }: Context, event: BlockNotification) => {
     post({
         id: -1,
@@ -417,6 +428,8 @@ const onRequest = (request: Request<MessageTypes.Message>) => {
             return getFiatRatesTickersList(request);
         case MESSAGES.ESTIMATE_FEE:
             return estimateFee(request);
+        case MESSAGES.RPC_CALL:
+            return rpcCall(request);
         case MESSAGES.PUSH_TRANSACTION:
             return pushTransaction(request);
         case MESSAGES.SUBSCRIBE:
diff --git a/packages/blockchain-link/src/workers/blockbook/websocket.ts b/packages/blockchain-link/src/workers/blockbook/websocket.ts
index bfa6862946f..77a74f11a30 100644
--- a/packages/blockchain-link/src/workers/blockbook/websocket.ts
+++ b/packages/blockchain-link/src/workers/blockbook/websocket.ts
@@ -18,10 +18,11 @@ import type {
     AccountInfoParams,
     EstimateFeeParams,
     AccountBalanceHistoryParams,
+    RpcCallParams,
 } from '@trezor/blockchain-link-types/src/params';
+import { getSuiteVersion } from '@trezor/env-utils';
 
 import { BaseWebsocket } from '../baseWebsocket';
-import { getSuiteVersion } from '@trezor/env-utils';
 
 interface BlockbookEvents {
     block: BlockNotification;
@@ -126,6 +127,10 @@ export class BlockbookAPI extends BaseWebsocket<BlockbookEvents> {
         return this.send('estimateFee', payload);
     }
 
+    rpcCall(payload: RpcCallParams) {
+        return this.send('rpcCall', payload);
+    }
+
     getCurrentFiatRates(payload: GetCurrentFiatRates['payload']) {
         return this.send('getCurrentFiatRates', payload);
     }
diff --git a/packages/blockchain-link/src/workers/blockfrost/index.ts b/packages/blockchain-link/src/workers/blockfrost/index.ts
index 7fa640e7c7e..7b6f2b5ca69 100644
--- a/packages/blockchain-link/src/workers/blockfrost/index.ts
+++ b/packages/blockchain-link/src/workers/blockfrost/index.ts
@@ -1,7 +1,5 @@
 import { CustomError } from '@trezor/blockchain-link-types/src/constants/errors';
 import { MESSAGES, RESPONSES } from '@trezor/blockchain-link-types/src/constants';
-import { BaseWorker, CONTEXT, ContextType } from '../baseWorker';
-import { BlockfrostAPI } from './websocket';
 import {
     transformUtxos,
     transformAccountInfo,
@@ -15,6 +13,9 @@ import type {
 } from '@trezor/blockchain-link-types/src/blockfrost';
 import type * as MessageTypes from '@trezor/blockchain-link-types/src/messages';
 
+import { BlockfrostAPI } from './websocket';
+import { BaseWorker, CONTEXT, ContextType } from '../baseWorker';
+
 type Context = ContextType<BlockfrostAPI>;
 type Request<T> = T & Context;
 
diff --git a/packages/blockchain-link/src/workers/blockfrost/websocket.ts b/packages/blockchain-link/src/workers/blockfrost/websocket.ts
index f629692dffc..274477224e1 100644
--- a/packages/blockchain-link/src/workers/blockfrost/websocket.ts
+++ b/packages/blockchain-link/src/workers/blockfrost/websocket.ts
@@ -10,9 +10,9 @@ import type {
     EstimateFeeParams,
     AccountBalanceHistoryParams,
 } from '@trezor/blockchain-link-types/src/params';
+import { getSuiteVersion } from '@trezor/env-utils';
 
 import { BaseWebsocket } from '../baseWebsocket';
-import { getSuiteVersion } from '@trezor/env-utils';
 
 interface BlockfrostEvents {
     block: BlockContent;
diff --git a/packages/blockchain-link/src/workers/electrum/client/caching.ts b/packages/blockchain-link/src/workers/electrum/client/caching.ts
index 5ea93b48f5e..cbe8dd58002 100644
--- a/packages/blockchain-link/src/workers/electrum/client/caching.ts
+++ b/packages/blockchain-link/src/workers/electrum/client/caching.ts
@@ -1,6 +1,7 @@
-import { ElectrumClient } from './electrum';
 import { Status } from '@trezor/blockchain-link-types/src/electrum';
 
+import { ElectrumClient } from './electrum';
+
 type Cache = {
     [descriptor: string]: [Status, any];
 };
diff --git a/packages/blockchain-link/src/workers/electrum/client/electrum.ts b/packages/blockchain-link/src/workers/electrum/client/electrum.ts
index 4fbd3d50a5d..17733b50ef2 100644
--- a/packages/blockchain-link/src/workers/electrum/client/electrum.ts
+++ b/packages/blockchain-link/src/workers/electrum/client/electrum.ts
@@ -1,5 +1,6 @@
 import { Network, networks } from '@trezor/utxo-lib';
 import { ElectrumAPI, BlockHeader, Version } from '@trezor/blockchain-link-types/src/electrum';
+
 import { JsonRpcClientOptions } from './json-rpc';
 import { BatchingJsonRpcClient } from './batching';
 import type { ISocket } from '../sockets/interface';
diff --git a/packages/blockchain-link/src/workers/electrum/client/json-rpc.ts b/packages/blockchain-link/src/workers/electrum/client/json-rpc.ts
index d63e6554713..1d8add2ad97 100644
--- a/packages/blockchain-link/src/workers/electrum/client/json-rpc.ts
+++ b/packages/blockchain-link/src/workers/electrum/client/json-rpc.ts
@@ -1,5 +1,7 @@
 import { EventEmitter } from 'events';
+
 import { throwError } from '@trezor/utils';
+
 import type { ISocket } from '../sockets/interface';
 
 type Callback = (error: any, result?: any) => void;
diff --git a/packages/blockchain-link/src/workers/electrum/devrun.ts b/packages/blockchain-link/src/workers/electrum/devrun.ts
deleted file mode 100644
index ca15ba0cef0..00000000000
--- a/packages/blockchain-link/src/workers/electrum/devrun.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-// @ts-nocheck
-/// <reference path="../../../../suite/global.d.ts" />
-
-import ElectrumWorker from '.';
-import { createSocket } from './sockets';
-import type { Message, Response } from '../../types';
-
-const TOR_ADDRESS = '127.0.0.1:9050';
-
-const LOCALHOST_CONFIG = 'localhost:50001:t';
-const TCP_CONFIG = 'electrum.corp.sldev.cz:50001:t';
-const TLS_CONFIG = 'bitcoin.aranguren.org:50002:s';
-const IPv6_CONFIG = '[2401:d002:3902:700:d72c:5e22:4e95:389d]:50001:t';
-const TOR_CONFIG = ''; // My personal Umbrel
-
-const ADDR_REGTEST = 'bcrt1qx4009e2mpuch20p3uwvwmplaxgnjqwjmenrcfu';
-const ADDR_LEGACY = '1BitcoinEaterAddressDontSendf59kuE'; // 393 transactions
-const ADDR_SEGWIT = '3AVjhFvVHKhPfFccdFnPTBaqRqWq4EWoU2'; // 2 transactions
-const ADDR_SEGWIT_MID = '33QJtiYPkQzYf5BNbCztHWowhco77sg18g'; // 44 transactions
-const ADDR_BECH32 = 'bc1qwqdg6squsna38e46795at95yu9atm8azzmyvckulcc7kytlcckxswvvzej'; // almost 1M transactions
-const XPUB_ALL_SEED_1 =
-    'xpub6BiVtCpG9fQPxnPmHXG8PhtzQdWC2Su4qWu6XW9tpWFYhxydCLJGrWBJZ5H6qTAHdPQ7pQhtpjiYZVZARo14qHiay2fvrX996oEP42u8wZy';
-const XPUB_ALL_SEED_2 =
-    'xpub6BiVtCpG9fQQ1EW99bMSYwySbPWvzTFRQZCFgTmV3samLSZAYU7C3f4Je9vkNh7h1GAWi5Fn93BwoGBy9EAXbWTTgTnVKAbthHpxM1fXVRL';
-const YPUB =
-    'ypub6XKbB5DSkq8Royg8isNtGktj6bmEfGJXDs83Ad5CZ5tpDV8QofwSWQFTWP2Pv24vNdrPhquehL7vRMvSTj2GpKv6UaTQCBKZALm6RJAmxG6';
-const ZPUB =
-    'zpub6rDjzkRoJEhB4Z4j77umtwDFpuqDhNxWy85wZZwF6z7TM1TUw1oCucRsPHjeVNCPa29EXxFbzoPCSSbdcR66KUh9R7oPWD7XQtHuVSy47mk';
-const ZPUB_FIRST = 'bc1qqmu7jr0twysm6n0zd3xz93h3jysre8aaatd6g8';
-const ZPUB_SECOND = 'bc1qrhl9v6nagn9v9ckg4u63vwgzteh5wzdutj2ecd';
-const TX = '353cad24cf028dc32d7be44d9b96acc112dba7705a4f3bba4be077f500cdc416';
-const COINBASE_TX = '485579924ce684df7aa7a9861abb4b2858a8d917aa1df94bf3a234368a250516';
-const OP_RETURN_TX = '8bae12b5f4c088d940733dcd1455efc6a3a69cf9340e17a981286d3778615684';
-const MULTISIG_TX = 'aafbce314cadd619585034c4d949a59569fcf79902d3c35e162d25aa207dfb61';
-
-const SCRIPTHASH = '495fa456cdb66064db3dae04d7b2f307a874cb6f731ab4251b7d73308001ebba';
-
-const TX_HASH =
-    '02000000000102f503777e6e86bbdc285fdc781807466ab7187496b9c13d1e11aab6a45c3a31c90000000017160014207b37056ce222c4c7511dbaa9441df907904a73feffffffc1b3e9aa635f20f98a611bee50077aa7d36bde466a0deb547df1efbceecdfec30100000000feffffff02fa990e00000000001600148775fb220c008347029e71b76e3b31a941cf588269601a00000000001976a9140093caafa7c8d442cf37b26eb79e4c4f6a9afae188ac02473044022027a921f91fd8c5a5b198c8851c08a00824f8678768964c7069bcdc498513992802203b2eb659f5b7a77a17db8093e10e0dc4b35bf6315a4f6f4fa0b2e5fd8e6895760121036761cccced49d0500e036b59f69b21f9455bcd055e005405bd6c13b11d40293602473044022036da9dd150c2d3501fa18c1f3d121999c3bd64003137f9eb68330f1833c214f202206de0a66364b5ddb0feb12b87df6f15ec5389d4201bea1f929d7d6e8ea97a2d560121021506315fd256cfad9cf15257eebbf80411a1ab0cc00de3e96ff9df4a8cd1f83608cd0a00';
-
-(async () => {
-    const worker = ElectrumWorker();
-
-    const resolvers: { [id: number]: (value: any) => void } = {};
-
-    worker.onmessage = ({ data }: { data: Response }) => {
-        if (resolvers[data.id]) resolvers[data.id](data);
-    };
-
-    let id = 0;
-    const sendAndWait = (data: Message) =>
-        new Promise((resolve, reject) => {
-            resolvers[data.id] = resolve;
-            worker.postMessage(data);
-        });
-
-    worker.postMessage({
-        type: 'm_handshake',
-        id: 0,
-        settings: {
-            name: 'REGTEST',
-            worker: 'unknown',
-            server: [LOCALHOST_CONFIG],
-            debug: true,
-        },
-    });
-
-    await sendAndWait({ id: ++id, type: 'm_connect' });
-    // await sendAndWait({ id: ++id, type: 'm_push_tx', payload: TX_HASH });
-    /* await sendAndWait({
-        id: ++id,
-        // @ts-ignore
-        type: 'raw',
-        // @ts-ignore
-        payload: {
-            method: 'blockchain.block.headers',
-            params: [666666, 3],
-        },
-    });
-    return;
-    await sendAndWait({ id: ++id, type: 'm_get_info' });
-
-    console.time('tx');
-    await sendAndWait({ id: ++id, type: 'm_get_account_utxo', payload: ADDR_SEGWIT_MID });
-    console.timeEnd('tx');
-    return;
-
-    await sendAndWait({
-        id: ++id,
-        type: 'm_subscribe',
-        payload: { addresses: [ZPUB_FIRST], type: 'addresses' },
-    });
-    return;
-    await sendAndWait({ id: ++id, type: 'm_get_block_hash', payload: 666666 });
-
-    await sendAndWait({ id: ++id, type: 'm_get_transaction', payload: TX });
-    return;
-
-    await sendAndWait({
-        id: ++id,
-        // @ts-ignore
-        type: 'raw',
-        // @ts-ignore
-        payload: {
-            method: 'server.ping',
-        },
-    });
-
-    return;
-    */
-    /*
-    await sendAndWait({
-        id: ++id,
-        // @ts-ignore
-        type: 'raw',
-        // @ts-ignore
-        payload: {
-            method: 'blockchain.scripthash.subscribe',
-            params: ['ed11f638de44195276094b2f055628db95a1f726a65155debf45f54ffc799acb'],
-        },
-    });
-    */
-    /*
-    await sendAndWait({
-        id: ++id,
-        type: 'm_get_account_info',
-        payload: { descriptor: ADDR_REGTEST, details: 'txs' },
-    });
-    /*
-    return;
-    await sendAndWait({
-        id: ++id,
-        type: 'm_get_account_balance_history',
-        payload: {
-            descriptor: ADDR_REGTEST,
-            from: NaN,
-            to: NaN,
-            groupBy: 7200000,
-            currencies: ['btc'],
-        },
-    });
-    return;
-    await sendAndWait({ id: ++id, type: 'm_estimate_fee', payload: { blocks: [1, 2, 10] } });
-    */
-})();
diff --git a/packages/blockchain-link/src/workers/electrum/index.ts b/packages/blockchain-link/src/workers/electrum/index.ts
index af8af2c546b..bc732d36a94 100644
--- a/packages/blockchain-link/src/workers/electrum/index.ts
+++ b/packages/blockchain-link/src/workers/electrum/index.ts
@@ -1,13 +1,14 @@
 import { CustomError } from '@trezor/blockchain-link-types/src/constants/errors';
 import { MESSAGES, RESPONSES } from '@trezor/blockchain-link-types/src/constants';
+import type { Response } from '@trezor/blockchain-link-types';
+import { Message } from '@trezor/blockchain-link-types/src/messages';
+
 import { BaseWorker, CONTEXT, ContextType } from '../baseWorker';
 import * as M from './methods';
 import * as L from './listeners';
 import { createSocket } from './sockets';
 import { CachingElectrumClient } from './client/caching';
 import type { ElectrumClient } from './client/electrum';
-import type { Response } from '@trezor/blockchain-link-types';
-import { Message } from '@trezor/blockchain-link-types/src/messages';
 
 type BlockListener = ReturnType<typeof L.blockListener>;
 type TxListener = ReturnType<typeof L.txListener>;
@@ -127,14 +128,14 @@ const onRequest = async <T extends Message>(
                     throw new CustomError(`Subscription ${request.payload.type} not implemented`);
             }
         // @ts-expect-error this message is used in tests
-        case 'raw':
+        case 'raw': {
             // @ts-expect-error
-
             const { method, params } = request.payload;
 
             return client
                 .request(method, ...params)
                 .then((res: any) => ({ type: method, payload: res }));
+        }
         default:
             throw new CustomError('worker_unknown_request', `+${request.type}`);
     }
diff --git a/packages/blockchain-link/src/workers/electrum/listeners/blockListener.ts b/packages/blockchain-link/src/workers/electrum/listeners/blockListener.ts
index 94600a25da6..dca0709e606 100644
--- a/packages/blockchain-link/src/workers/electrum/listeners/blockListener.ts
+++ b/packages/blockchain-link/src/workers/electrum/listeners/blockListener.ts
@@ -1,8 +1,9 @@
 import { throwError } from '@trezor/utils';
 import { RESPONSES } from '@trezor/blockchain-link-types/src/constants';
+import type { BlockHeader, ElectrumAPI } from '@trezor/blockchain-link-types/src/electrum';
+
 import { blockheaderToBlockhash } from '../utils';
 import type { BaseWorker } from '../../baseWorker';
-import type { BlockHeader, ElectrumAPI } from '@trezor/blockchain-link-types/src/electrum';
 
 export const blockListener = (worker: BaseWorker<ElectrumAPI>) => {
     const { state } = worker;
diff --git a/packages/blockchain-link/src/workers/electrum/listeners/txListener.ts b/packages/blockchain-link/src/workers/electrum/listeners/txListener.ts
index 7e3f0c6d01b..204694af64b 100644
--- a/packages/blockchain-link/src/workers/electrum/listeners/txListener.ts
+++ b/packages/blockchain-link/src/workers/electrum/listeners/txListener.ts
@@ -1,8 +1,6 @@
 import { throwError } from '@trezor/utils';
 import { RESPONSES } from '@trezor/blockchain-link-types/src/constants';
-import { createAddressManager, getTransactions } from '../utils';
 import { transformTransaction } from '@trezor/blockchain-link-utils/src/blockbook';
-import type { BaseWorker } from '../../baseWorker';
 import type {
     ElectrumAPI,
     HistoryTx,
@@ -10,6 +8,9 @@ import type {
 } from '@trezor/blockchain-link-types/src/electrum';
 import type { Subscribe, Unsubscribe } from '@trezor/blockchain-link-types/src/messages';
 
+import type { BaseWorker } from '../../baseWorker';
+import { createAddressManager, getTransactions } from '../utils';
+
 type Payload<T extends { type: string; payload: any }> = Extract<
     T['payload'],
     { type: 'addresses' | 'accounts' }
diff --git a/packages/blockchain-link/src/workers/electrum/methods/estimateFee.ts b/packages/blockchain-link/src/workers/electrum/methods/estimateFee.ts
index 9be3f4bf75f..5dede3fe56e 100644
--- a/packages/blockchain-link/src/workers/electrum/methods/estimateFee.ts
+++ b/packages/blockchain-link/src/workers/electrum/methods/estimateFee.ts
@@ -1,7 +1,8 @@
-import { Api, btcToSat } from '../utils';
 import type { EstimateFee as Req } from '@trezor/blockchain-link-types/src/messages';
 import type { EstimateFee as Res } from '@trezor/blockchain-link-types/src/responses';
 
+import { Api, btcToSat } from '../utils';
+
 const estimateFee: Api<Req, Res> = (client, payload) =>
     Promise.all(
         (payload.blocks || []).map(num =>
diff --git a/packages/blockchain-link/src/workers/electrum/methods/getAccountBalanceHistory.ts b/packages/blockchain-link/src/workers/electrum/methods/getAccountBalanceHistory.ts
index a39c57f282e..b6d51ec3dbc 100644
--- a/packages/blockchain-link/src/workers/electrum/methods/getAccountBalanceHistory.ts
+++ b/packages/blockchain-link/src/workers/electrum/methods/getAccountBalanceHistory.ts
@@ -1,13 +1,14 @@
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { discovery } from '@trezor/utxo-lib';
 import { sumVinVout } from '@trezor/blockchain-link-utils';
-import { Api, tryGetScripthash, getTransactions, discoverAddress, AddressHistory } from '../utils';
 import { transformTransaction } from '@trezor/blockchain-link-utils/src/blockbook';
 import type { GetAccountBalanceHistory as Req } from '@trezor/blockchain-link-types/src/messages';
 import type { GetAccountBalanceHistory as Res } from '@trezor/blockchain-link-types/src/responses';
 import type { AccountAddresses, Transaction } from '@trezor/blockchain-link-types/src/common';
 import type { HistoryTx } from '@trezor/blockchain-link-types/src/electrum';
 
+import { Api, tryGetScripthash, getTransactions, discoverAddress, AddressHistory } from '../utils';
+
 const transformAddress = (addr: AddressHistory) => ({
     address: addr.address,
     path: addr.path,
diff --git a/packages/blockchain-link/src/workers/electrum/methods/getAccountInfo.ts b/packages/blockchain-link/src/workers/electrum/methods/getAccountInfo.ts
index 381a0724b9f..fd62f7f813f 100644
--- a/packages/blockchain-link/src/workers/electrum/methods/getAccountInfo.ts
+++ b/packages/blockchain-link/src/workers/electrum/methods/getAccountInfo.ts
@@ -1,6 +1,5 @@
 import { discovery } from '@trezor/utxo-lib';
 import { sortTxsFromLatest } from '@trezor/blockchain-link-utils';
-import { Api, tryGetScripthash, discoverAddress, AddressHistory, getTransactions } from '../utils';
 import { transformTransaction } from '@trezor/blockchain-link-utils/src/blockbook';
 import type { ElectrumAPI } from '@trezor/blockchain-link-types/src/electrum';
 import type { GetAccountInfo as Req } from '@trezor/blockchain-link-types/src/messages';
@@ -8,6 +7,8 @@ import type { GetAccountInfo as Res } from '@trezor/blockchain-link-types/src/re
 import type { VinVout } from '@trezor/blockchain-link-types/src/blockbook';
 import type { Address, Transaction } from '@trezor/blockchain-link-types';
 
+import { Api, tryGetScripthash, discoverAddress, AddressHistory, getTransactions } from '../utils';
+
 // const PAGE_DEFAULT = 0;
 const PAGE_SIZE_DEFAULT = 25;
 
diff --git a/packages/blockchain-link/src/workers/electrum/methods/getAccountUtxo.ts b/packages/blockchain-link/src/workers/electrum/methods/getAccountUtxo.ts
index cdea012d9a6..73736975d06 100644
--- a/packages/blockchain-link/src/workers/electrum/methods/getAccountUtxo.ts
+++ b/packages/blockchain-link/src/workers/electrum/methods/getAccountUtxo.ts
@@ -1,10 +1,11 @@
 import { throwError } from '@trezor/utils';
 import { discovery } from '@trezor/utxo-lib';
-import { Api, tryGetScripthash, discoverAddress } from '../utils';
 import type { GetAccountUtxo as Req } from '@trezor/blockchain-link-types/src/messages';
 import type { GetAccountUtxo as Res } from '@trezor/blockchain-link-types/src/responses';
 import type { Utxo } from '@trezor/blockchain-link-types/src/electrum';
 
+import { Api, tryGetScripthash, discoverAddress } from '../utils';
+
 const transformUtxo =
     (currentHeight: number, addressInfo: { address?: string; path?: string } = {}) =>
     ({ height, tx_hash, tx_pos, value }: Utxo): Res['payload'][number] => ({
diff --git a/packages/blockchain-link/src/workers/electrum/methods/getBlockHash.ts b/packages/blockchain-link/src/workers/electrum/methods/getBlockHash.ts
index c8e2e60879e..de8e55a0047 100644
--- a/packages/blockchain-link/src/workers/electrum/methods/getBlockHash.ts
+++ b/packages/blockchain-link/src/workers/electrum/methods/getBlockHash.ts
@@ -1,7 +1,8 @@
-import { Api, blockheaderToBlockhash } from '../utils';
 import type { GetBlockHash as Req } from '@trezor/blockchain-link-types/src/messages';
 import type { GetBlockHash as Res } from '@trezor/blockchain-link-types/src/responses';
 
+import { Api, blockheaderToBlockhash } from '../utils';
+
 const getBlockHash: Api<Req, Res> = async (client, payload) => {
     const blockheader = await client.request('blockchain.block.header', payload);
 
diff --git a/packages/blockchain-link/src/workers/electrum/methods/getInfo.ts b/packages/blockchain-link/src/workers/electrum/methods/getInfo.ts
index 88da9bb1a91..7b553cc8d6c 100644
--- a/packages/blockchain-link/src/workers/electrum/methods/getInfo.ts
+++ b/packages/blockchain-link/src/workers/electrum/methods/getInfo.ts
@@ -1,8 +1,9 @@
 import { throwError } from '@trezor/utils';
-import { Api, blockheaderToBlockhash } from '../utils';
 import type { GetInfo as Req } from '@trezor/blockchain-link-types/src/messages';
 import type { GetInfo as Res } from '@trezor/blockchain-link-types/src/responses';
 
+import { Api, blockheaderToBlockhash } from '../utils';
+
 const getInfo: Api<Req, Res> = client => {
     const {
         url,
diff --git a/packages/blockchain-link/src/workers/electrum/methods/getTransaction.ts b/packages/blockchain-link/src/workers/electrum/methods/getTransaction.ts
index 6efc4ee9591..c4a088ee6b4 100644
--- a/packages/blockchain-link/src/workers/electrum/methods/getTransaction.ts
+++ b/packages/blockchain-link/src/workers/electrum/methods/getTransaction.ts
@@ -1,8 +1,9 @@
-import { Api, getTransactions } from '../utils';
 import { transformTransaction } from '@trezor/blockchain-link-utils/src/blockbook';
 import type { GetTransaction as Req } from '@trezor/blockchain-link-types/src/messages';
 import type { GetTransaction as Res } from '@trezor/blockchain-link-types/src/responses';
 
+import { Api, getTransactions } from '../utils';
+
 const getTransaction: Api<Req, Res> = async (client, payload) => {
     const [tx] = await getTransactions(client, [{ tx_hash: payload, height: -1 }]);
 
diff --git a/packages/blockchain-link/src/workers/electrum/methods/pushTransaction.ts b/packages/blockchain-link/src/workers/electrum/methods/pushTransaction.ts
index 0ffbd7ef278..00122d50688 100644
--- a/packages/blockchain-link/src/workers/electrum/methods/pushTransaction.ts
+++ b/packages/blockchain-link/src/workers/electrum/methods/pushTransaction.ts
@@ -1,7 +1,8 @@
-import { Api } from '../utils';
 import type { PushTransaction as Req } from '@trezor/blockchain-link-types/src/messages';
 import type { PushTransaction as Res } from '@trezor/blockchain-link-types/src/responses';
 
+import { Api } from '../utils';
+
 const pushTransaction: Api<Req, Res> = async (client, payload) => {
     const res = await client.request('blockchain.transaction.broadcast', payload);
 
diff --git a/packages/blockchain-link/src/workers/electrum/sockets/base.ts b/packages/blockchain-link/src/workers/electrum/sockets/base.ts
index a724c199407..6b5614f0b1c 100644
--- a/packages/blockchain-link/src/workers/electrum/sockets/base.ts
+++ b/packages/blockchain-link/src/workers/electrum/sockets/base.ts
@@ -1,6 +1,7 @@
 import type { Socket as TCPSocket } from 'net';
 import type { TLSSocket } from 'tls';
 import type { SocksProxyAgent } from 'socks-proxy-agent';
+
 import type { ISocket, SocketListener } from './interface';
 
 const TIMEOUT = 10000;
diff --git a/packages/blockchain-link/src/workers/electrum/sockets/index.ts b/packages/blockchain-link/src/workers/electrum/sockets/index.ts
index dfb401af562..888d286708c 100644
--- a/packages/blockchain-link/src/workers/electrum/sockets/index.ts
+++ b/packages/blockchain-link/src/workers/electrum/sockets/index.ts
@@ -1,5 +1,6 @@
 import { parseElectrumUrl } from '@trezor/utils';
 import { CustomError } from '@trezor/blockchain-link-types/src/constants/errors';
+
 import { TcpSocket } from './tcp';
 import { TlsSocket } from './tls';
 import { TorSocket } from './tor';
diff --git a/packages/blockchain-link/src/workers/electrum/sockets/tcp.ts b/packages/blockchain-link/src/workers/electrum/sockets/tcp.ts
index e183142ed4c..f4ed9bfe994 100644
--- a/packages/blockchain-link/src/workers/electrum/sockets/tcp.ts
+++ b/packages/blockchain-link/src/workers/electrum/sockets/tcp.ts
@@ -1,4 +1,5 @@
 import { Socket as TCPSocket } from 'net';
+
 import { SocketBase } from './base';
 import type { SocketListener } from './interface';
 
diff --git a/packages/blockchain-link/src/workers/electrum/sockets/tls.ts b/packages/blockchain-link/src/workers/electrum/sockets/tls.ts
index 71d09798bd6..16bbe5bab7e 100644
--- a/packages/blockchain-link/src/workers/electrum/sockets/tls.ts
+++ b/packages/blockchain-link/src/workers/electrum/sockets/tls.ts
@@ -1,4 +1,5 @@
 import { TLSSocket } from 'tls';
+
 import { SocketBase } from './base';
 import type { SocketListener } from './interface';
 
diff --git a/packages/blockchain-link/src/workers/electrum/sockets/tor.ts b/packages/blockchain-link/src/workers/electrum/sockets/tor.ts
index a1cc5ce1aa6..902456364cb 100644
--- a/packages/blockchain-link/src/workers/electrum/sockets/tor.ts
+++ b/packages/blockchain-link/src/workers/electrum/sockets/tor.ts
@@ -1,5 +1,6 @@
-import { SocketBase, SocketConfig } from './base';
 import type { SocksProxyAgent } from 'socks-proxy-agent';
+
+import { SocketBase, SocketConfig } from './base';
 import type { SocketListener } from './interface';
 
 type TorSocketConfig = SocketConfig & {
@@ -17,7 +18,7 @@ export class TorSocket extends SocketBase {
     protected async openSocket(listener: SocketListener) {
         const { host, port } = this;
         const socket = await this.proxyAgent
-            .callback(null as any, { host, port, timeout: this.timeout, secureEndpoint: false })
+            .connect(null as any, { host, port, timeout: this.timeout, secureEndpoint: false })
             .catch(e => {
                 listener.onError(e);
                 throw e;
diff --git a/packages/blockchain-link/src/workers/electrum/utils/addressManager.ts b/packages/blockchain-link/src/workers/electrum/utils/addressManager.ts
index d6bfe7495c2..2a950b4bc29 100644
--- a/packages/blockchain-link/src/workers/electrum/utils/addressManager.ts
+++ b/packages/blockchain-link/src/workers/electrum/utils/addressManager.ts
@@ -1,8 +1,9 @@
 import { isNotUndefined, arrayDistinct, objectPartition } from '@trezor/utils';
-import { addressToScripthash } from './transform';
 import type { Network } from '@trezor/utxo-lib';
 import type { AccountAddresses, SubscriptionAccountInfo } from '@trezor/blockchain-link-types/src';
 
+import { addressToScripthash } from './transform';
+
 type AddressMap = { [address: string]: string };
 type AccountMap = { [descriptor: string]: AccountAddresses };
 
diff --git a/packages/blockchain-link/src/workers/electrum/utils/discovery.ts b/packages/blockchain-link/src/workers/electrum/utils/discovery.ts
index 4d29a33388c..8a26ab70763 100644
--- a/packages/blockchain-link/src/workers/electrum/utils/discovery.ts
+++ b/packages/blockchain-link/src/workers/electrum/utils/discovery.ts
@@ -1,6 +1,7 @@
-import { addressToScripthash } from './transform';
 import type { ElectrumAPI, HistoryTx } from '@trezor/blockchain-link-types/src/electrum';
 
+import { addressToScripthash } from './transform';
+
 export type AddressHistory = {
     address: string;
     scripthash: string;
diff --git a/packages/blockchain-link/src/workers/electrum/utils/transaction.ts b/packages/blockchain-link/src/workers/electrum/utils/transaction.ts
index 6e1feb07d70..d6ac609b584 100644
--- a/packages/blockchain-link/src/workers/electrum/utils/transaction.ts
+++ b/packages/blockchain-link/src/workers/electrum/utils/transaction.ts
@@ -1,5 +1,4 @@
 import { arrayToDictionary, arrayDistinct } from '@trezor/utils';
-import { btcToSat } from './transform';
 import type { Transaction as BlockbookTransaction } from '@trezor/blockchain-link-types/src/blockbook';
 import type {
     ElectrumAPI,
@@ -10,6 +9,8 @@ import type {
     HistoryTx,
 } from '@trezor/blockchain-link-types/src/electrum';
 
+import { btcToSat } from './transform';
+
 const transformOpReturn = (hex: string) => {
     const [, _len, data] = hex.match(/^6a(?:4c)?([0-9a-f]{2})([0-9a-f]*)$/i) ?? [];
 
diff --git a/packages/blockchain-link/src/workers/ripple/index.ts b/packages/blockchain-link/src/workers/ripple/index.ts
index 5ee200360e9..94224e1153f 100644
--- a/packages/blockchain-link/src/workers/ripple/index.ts
+++ b/packages/blockchain-link/src/workers/ripple/index.ts
@@ -1,13 +1,15 @@
 import { RippleAPI, APIOptions } from 'ripple-lib';
 import { RippleError } from 'ripple-lib/dist/npm/common/errors';
+
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { CustomError } from '@trezor/blockchain-link-types/src/constants/errors';
 import { MESSAGES, RESPONSES } from '@trezor/blockchain-link-types/src/constants';
-import { BaseWorker, CONTEXT, ContextType } from '../baseWorker';
 import * as utils from '@trezor/blockchain-link-utils/src/ripple';
 import type { Response, SubscriptionAccountInfo, AccountInfo } from '@trezor/blockchain-link-types';
 import type * as MessageTypes from '@trezor/blockchain-link-types/src/messages';
 
+import { BaseWorker, CONTEXT, ContextType } from '../baseWorker';
+
 type Context = ContextType<RippleAPI>;
 type Request<T> = T & Context;
 
@@ -139,7 +141,7 @@ const getAccountInfo = async (request: Request<MessageTypes.GetAccountInfo>) =>
         account.availableBalance = new BigNumber(mempoolInfo.xrpBalance).minus(reserve).toString();
         account.misc.sequence = mempoolInfo.sequence;
         account.history.unconfirmed = mempoolInfo.txs;
-    } catch (error) {
+    } catch {
         // do not throw error for mempool (ledger_index: "current")
         // mainnet sometimes return "error": "noNetwork", "error_message": "InsufficientNetworkMode",
         // TODO: investigate
diff --git a/packages/blockchain-link/src/workers/solana/fee.ts b/packages/blockchain-link/src/workers/solana/fee.ts
index 72c46971abb..dcaa4e6967b 100644
--- a/packages/blockchain-link/src/workers/solana/fee.ts
+++ b/packages/blockchain-link/src/workers/solana/fee.ts
@@ -1,4 +1,5 @@
 import { Connection, Message, PublicKey } from '@solana/web3.js';
+
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 
 const COMPUTE_BUDGET_PROGRAM_ID = 'ComputeBudget111111111111111111111111111111';
diff --git a/packages/blockchain-link/src/workers/solana/index.ts b/packages/blockchain-link/src/workers/solana/index.ts
index 1753f1af26c..52a55969eed 100644
--- a/packages/blockchain-link/src/workers/solana/index.ts
+++ b/packages/blockchain-link/src/workers/solana/index.ts
@@ -1,3 +1,5 @@
+import { Connection, Message, PublicKey, SendTransactionError } from '@solana/web3.js';
+
 import type {
     Response,
     AccountInfo,
@@ -13,20 +15,19 @@ import type {
 } from '@trezor/blockchain-link-types/src/solana';
 import type * as MessageTypes from '@trezor/blockchain-link-types/src/messages';
 import { CustomError } from '@trezor/blockchain-link-types/src/constants/errors';
-import { BaseWorker, ContextType, CONTEXT } from '../baseWorker';
 import { MESSAGES, RESPONSES } from '@trezor/blockchain-link-types/src/constants';
-import { Connection, Message, PublicKey } from '@solana/web3.js';
 import { solanaUtils } from '@trezor/blockchain-link-utils';
 import { createLazy } from '@trezor/utils';
-
 import {
     transformTokenInfo,
     TOKEN_PROGRAM_PUBLIC_KEY,
 } from '@trezor/blockchain-link-utils/src/solana';
+import { getSuiteVersion } from '@trezor/env-utils';
+
 import { TOKEN_ACCOUNT_LAYOUT } from './tokenUtils';
 import { getBaseFee, getPriorityFee } from './fee';
 import { confirmTransactionWithResubmit } from './transactionConfirmation';
-import { getSuiteVersion } from '@trezor/env-utils';
+import { BaseWorker, ContextType, CONTEXT } from '../baseWorker';
 
 export type SolanaAPI = Connection;
 
@@ -105,17 +106,35 @@ const pushTransaction = async (request: Request<MessageTypes.PushTransaction>) =
     const { lastValidBlockHeight } = await api.getLatestBlockhash('finalized');
 
     const txBuffer = Buffer.from(rawTx, 'hex');
-    const signature = await api.sendRawTransaction(txBuffer, {
-        skipPreflight: true,
-        maxRetries: 0,
-    });
 
-    await confirmTransactionWithResubmit(api, txBuffer, signature, lastValidBlockHeight);
+    try {
+        await api.sendRawTransaction(txBuffer, {
+            skipPreflight: true,
+            maxRetries: 0,
+        });
+
+        const signature = await api.sendRawTransaction(txBuffer, {
+            skipPreflight: true,
+            maxRetries: 0,
+        });
 
-    return {
-        type: RESPONSES.PUSH_TRANSACTION,
-        payload: signature,
-    } as const;
+        await confirmTransactionWithResubmit(api, txBuffer, signature, lastValidBlockHeight);
+
+        return {
+            type: RESPONSES.PUSH_TRANSACTION,
+            payload: signature,
+        } as const;
+    } catch (error) {
+        if (
+            error instanceof SendTransactionError &&
+            error?.transactionError?.message === 'Internal error'
+        ) {
+            throw new Error(
+                'Please make sure that you submit the transaction within 1 minute after signing.',
+            );
+        }
+        throw error;
+    }
 };
 
 const getAccountInfo = async (request: Request<MessageTypes.GetAccountInfo>) => {
@@ -154,14 +173,21 @@ const getAccountInfo = async (request: Request<MessageTypes.GetAccountInfo>) =>
 
     const allAccounts = [payload.descriptor, ...tokenAccounts.value.map(a => a.pubkey.toString())];
 
-    const allTxIds = Array.from(
-        new Set(
-            (await Promise.all(allAccounts.map(account => getAllSignatures(api, account))))
-                .flat()
-                .sort((a, b) => b.slot - a.slot)
-                .map(it => it.signature),
-        ),
-    );
+    const allTxIds =
+        details === 'basic' || details === 'txs' || details === 'txids'
+            ? Array.from(
+                  new Set(
+                      (
+                          await Promise.all(
+                              allAccounts.map(account => getAllSignatures(api, account)),
+                          )
+                      )
+                          .flat()
+                          .sort((a, b) => b.slot - a.slot)
+                          .map(it => it.signature),
+                  ),
+              )
+            : [];
 
     const pageNumber = payload.page ? payload.page - 1 : 0;
     // for the first page of txs, payload.page is undefined, for the second page is 2
diff --git a/packages/blockchain-link/src/workers/solana/transactionConfirmation.ts b/packages/blockchain-link/src/workers/solana/transactionConfirmation.ts
index d475248a87c..693136b658e 100644
--- a/packages/blockchain-link/src/workers/solana/transactionConfirmation.ts
+++ b/packages/blockchain-link/src/workers/solana/transactionConfirmation.ts
@@ -12,7 +12,7 @@ const tryConfirmBySignatureStatus = async (
     const getCurrentBlockHeight = async () => {
         try {
             return await api.getBlockHeight('finalized');
-        } catch (_) {
+        } catch {
             return -1;
         }
     };
diff --git a/packages/blockchain-link/tests/integration/blockbook.test.ts b/packages/blockchain-link/tests/integration/blockbook.test.ts
index 389a80689d7..4dd92f02049 100644
--- a/packages/blockchain-link/tests/integration/blockbook.test.ts
+++ b/packages/blockchain-link/tests/integration/blockbook.test.ts
@@ -1,4 +1,5 @@
 import { BackendWebsocketServerMock } from '@trezor/e2e-utils';
+
 import BlockchainLink from '../../src';
 import {
     // blockbookWorkerFactory,
diff --git a/packages/blockchain-link/tests/integration/blockfrost.test.ts b/packages/blockchain-link/tests/integration/blockfrost.test.ts
index ddccb1f5e96..9f03bd8f1d7 100644
--- a/packages/blockchain-link/tests/integration/blockfrost.test.ts
+++ b/packages/blockchain-link/tests/integration/blockfrost.test.ts
@@ -1,4 +1,5 @@
 import { BackendWebsocketServerMock } from '@trezor/e2e-utils';
+
 import BlockchainLink from '../../src';
 import {
     //  blockfrostWorkerFactory,
diff --git a/packages/blockchain-link/tests/integration/connection.test.ts b/packages/blockchain-link/tests/integration/connection.test.ts
index 180767616ba..ef68ff4137b 100644
--- a/packages/blockchain-link/tests/integration/connection.test.ts
+++ b/packages/blockchain-link/tests/integration/connection.test.ts
@@ -1,4 +1,5 @@
 import { BackendWebsocketServerMock } from '@trezor/e2e-utils';
+
 import BlockchainLink from '../../src';
 import {
     // rippleWorkerFactory,
@@ -131,17 +132,19 @@ backends.forEach((b, i) => {
         }, 10000);
 
         describe('Event listeners', () => {
-            it('Handle connect event', done => {
-                blockchain.on('connected', () => done());
-                blockchain.connect();
-            });
+            it('Handle connect event', () =>
+                new Promise<void>(done => {
+                    blockchain.on('connected', () => done());
+                    blockchain.connect();
+                }));
 
-            it('Handle disconnect event', done => {
-                blockchain.on('disconnected', () => done());
-                blockchain.connect().then(() => {
-                    blockchain.disconnect();
-                });
-            });
+            it('Handle disconnect event', () =>
+                new Promise<void>(done => {
+                    blockchain.on('disconnected', () => done());
+                    blockchain.connect().then(() => {
+                        blockchain.disconnect();
+                    });
+                }));
         });
     });
 });
diff --git a/packages/blockchain-link/tests/integration/electrum.test.ts b/packages/blockchain-link/tests/integration/electrum.test.ts
index d3e927f424d..3781c2fea8f 100644
--- a/packages/blockchain-link/tests/integration/electrum.test.ts
+++ b/packages/blockchain-link/tests/integration/electrum.test.ts
@@ -1,8 +1,9 @@
-import ElectrumWorker from '../../src/workers/electrum';
 import type { Message } from '@trezor/blockchain-link-types/src/messages';
 import type { Response } from '@trezor/blockchain-link-types/src/responses';
 import { GET_ACCOUNT_INFO, HANDSHAKE } from '@trezor/blockchain-link-types/src/constants/messages';
 
+import ElectrumWorker from '../../src/workers/electrum';
+
 const TCP_CONFIG = '127.0.0.1:50001:t';
 const NETWORK = 'REGTEST';
 
diff --git a/packages/blockchain-link/tests/integration/ripple.test.ts b/packages/blockchain-link/tests/integration/ripple.test.ts
index 4119cf331bd..c64c807148c 100644
--- a/packages/blockchain-link/tests/integration/ripple.test.ts
+++ b/packages/blockchain-link/tests/integration/ripple.test.ts
@@ -1,4 +1,5 @@
 import { BackendWebsocketServerMock } from '@trezor/e2e-utils';
+
 import BlockchainLink from '../../src';
 import {
     // rippleWorkerFactory,
diff --git a/packages/blockchain-link/tests/integration/solana.test.ts b/packages/blockchain-link/tests/integration/solana.test.ts
index 001a8fe2ef5..2752bc95c03 100644
--- a/packages/blockchain-link/tests/integration/solana.test.ts
+++ b/packages/blockchain-link/tests/integration/solana.test.ts
@@ -1,4 +1,5 @@
 import { AccountInfoParams } from '@trezor/blockchain-link-types';
+
 import BlockchainLink from '../../src';
 import SolanaWorker, { SolanaAPI } from '../../src/workers/solana';
 
@@ -111,7 +112,7 @@ const fixtures = {
     ],
 };
 
-export const solanaApi = {
+const solanaApi = {
     getGenesisHash: () => '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdpKuc147dw2N9d',
     getVersion: () => ({ 'feature-set': 1879391783, 'solana-core': '1.14.22' }),
     getParsedBlock: () => ({
diff --git a/packages/blockchain-link/tests/integration/worker/index.ts b/packages/blockchain-link/tests/integration/worker/index.ts
index acc8ee443c5..aa2f58d11fa 100644
--- a/packages/blockchain-link/tests/integration/worker/index.ts
+++ b/packages/blockchain-link/tests/integration/worker/index.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
 import TinyWorker from 'tiny-worker';
 
 const BlockbookWorkerModule = require('../../../build/module/blockbook-worker');
@@ -8,7 +7,6 @@ const BlockfrostWorkerModule = require('../../../build/module/blockfrost-worker'
 export const rippleWorkerFactory = () => {
     if (typeof Worker === 'undefined') {
         return new TinyWorker(() => {
-            // eslint-disable-next-line import/no-extraneous-dependencies
             require('@trezor/blockchain-link/src/workers/ripple');
         });
         // return new TinyWorker('./build/module/blockbook-worker.js');
@@ -26,7 +24,6 @@ export const rippleModuleFactory = RippleWorkerModule;
 export const blockbookWorkerFactory = () => {
     if (typeof Worker === 'undefined') {
         return new TinyWorker(() => {
-            // eslint-disable-next-line import/no-extraneous-dependencies
             require('@trezor/blockchain-link/src/workers/blockbook');
         });
         // return new TinyWorker('./build/module/blockbook-worker.js');
@@ -44,7 +41,6 @@ export const blockbookModuleFactory = BlockbookWorkerModule;
 export const blockfrostWorkerFactory = () => {
     if (typeof Worker === 'undefined') {
         return new TinyWorker(() => {
-            // eslint-disable-next-line import/no-extraneous-dependencies
             require('@trezor/blockchain-link/src/workers/blockfrost');
         });
         // return new TinyWorker('./build/module/blockfrost-worker.js');
diff --git a/packages/blockchain-link/tests/unit/connection.test.ts b/packages/blockchain-link/tests/unit/connection.test.ts
index 4d7c0223501..86e42eccf9a 100644
--- a/packages/blockchain-link/tests/unit/connection.test.ts
+++ b/packages/blockchain-link/tests/unit/connection.test.ts
@@ -1,4 +1,6 @@
+/* eslint-disable jest/no-jasmine-globals */
 import { BackendWebsocketServerMock } from '@trezor/e2e-utils';
+
 import workers from './worker';
 import BlockchainLink from '../../src';
 
@@ -127,27 +129,29 @@ workers.forEach(instance => {
             expect(server.getFixtures()!.length).toEqual(2);
         });
 
-        it('Handle connect event', done => {
-            blockchain.on('connected', done);
-            blockchain.connect().then(result => {
-                expect(result).toEqual(true);
-            });
-        });
-
-        it('Handle disconnect event', done => {
-            blockchain.on('disconnected', done);
-            blockchain.connect().then(() => {
-                // TODO: ripple-lib throws error when disconnect is called immediately
-                // investigate more, use setTimeout as a workaround
-                // Error [ERR_UNHANDLED_ERROR]: Unhandled error. (websocket)
-                // at Connection.RippleAPI.connection.on (../../node_modules/ripple-lib/src/api.ts:133:14)
-                if (instance.name === 'ripple') {
-                    setTimeout(() => blockchain.disconnect(), 100);
-                } else {
-                    blockchain.disconnect();
-                }
-            });
-        });
+        it('Handle connect event', () =>
+            new Promise<void>(done => {
+                blockchain.on('connected', done);
+                blockchain.connect().then(result => {
+                    expect(result).toEqual(true);
+                });
+            }));
+
+        it('Handle disconnect event', () =>
+            new Promise<void>(done => {
+                blockchain.on('disconnected', done);
+                blockchain.connect().then(() => {
+                    // TODO: ripple-lib throws error when disconnect is called immediately
+                    // investigate more, use setTimeout as a workaround
+                    // Error [ERR_UNHANDLED_ERROR]: Unhandled error. (websocket)
+                    // at Connection.RippleAPI.connection.on (../../node_modules/ripple-lib/src/api.ts:133:14)
+                    if (instance.name === 'ripple') {
+                        setTimeout(() => blockchain.disconnect(), 100);
+                    } else {
+                        blockchain.disconnect();
+                    }
+                });
+            }));
 
         it('Connect (only one endpoint is valid)', async () => {
             // blockfrost has only one valid endpoint
diff --git a/packages/blockchain-link/tests/unit/estimateFee.test.ts b/packages/blockchain-link/tests/unit/estimateFee.test.ts
index 57a4b1187fe..db58740a5a5 100644
--- a/packages/blockchain-link/tests/unit/estimateFee.test.ts
+++ b/packages/blockchain-link/tests/unit/estimateFee.test.ts
@@ -1,4 +1,5 @@
 import { BackendWebsocketServerMock } from '@trezor/e2e-utils';
+
 import workers from './worker';
 import BlockchainLink from '../../src';
 import fixtures from './fixtures/estimateFee';
diff --git a/packages/blockchain-link/tests/unit/getAccountInfo.test.ts b/packages/blockchain-link/tests/unit/getAccountInfo.test.ts
index 24c1ec08db9..8712a6464a0 100644
--- a/packages/blockchain-link/tests/unit/getAccountInfo.test.ts
+++ b/packages/blockchain-link/tests/unit/getAccountInfo.test.ts
@@ -1,4 +1,5 @@
 import { BackendWebsocketServerMock } from '@trezor/e2e-utils';
+
 import workers from './worker';
 import BlockchainLink from '../../src';
 import fixtures from './fixtures/getAccountInfo';
diff --git a/packages/blockchain-link/tests/unit/getAccountUtxo.test.ts b/packages/blockchain-link/tests/unit/getAccountUtxo.test.ts
index 9fb0b3ada3d..500c3f31a1c 100644
--- a/packages/blockchain-link/tests/unit/getAccountUtxo.test.ts
+++ b/packages/blockchain-link/tests/unit/getAccountUtxo.test.ts
@@ -1,4 +1,5 @@
 import { BackendWebsocketServerMock } from '@trezor/e2e-utils';
+
 import workers from './worker';
 import BlockchainLink from '../../src';
 import fixtures from './fixtures/getAccountUtxo';
diff --git a/packages/blockchain-link/tests/unit/getBlockHash.test.ts b/packages/blockchain-link/tests/unit/getBlockHash.test.ts
index 347a77615e7..9a63c0873da 100644
--- a/packages/blockchain-link/tests/unit/getBlockHash.test.ts
+++ b/packages/blockchain-link/tests/unit/getBlockHash.test.ts
@@ -1,4 +1,5 @@
 import { BackendWebsocketServerMock } from '@trezor/e2e-utils';
+
 import workers from './worker';
 import BlockchainLink from '../../src';
 import fixtures from './fixtures/getBlockHash';
diff --git a/packages/blockchain-link/tests/unit/getInfo.test.ts b/packages/blockchain-link/tests/unit/getInfo.test.ts
index 53b1a2fd85a..f143f1af43c 100644
--- a/packages/blockchain-link/tests/unit/getInfo.test.ts
+++ b/packages/blockchain-link/tests/unit/getInfo.test.ts
@@ -1,4 +1,5 @@
 import { BackendWebsocketServerMock } from '@trezor/e2e-utils';
+
 import workers from './worker';
 import BlockchainLink from '../../src';
 import fixtures from './fixtures/getInfo';
diff --git a/packages/blockchain-link/tests/unit/getTransaction.test.ts b/packages/blockchain-link/tests/unit/getTransaction.test.ts
index a821639183c..3aacdca842a 100644
--- a/packages/blockchain-link/tests/unit/getTransaction.test.ts
+++ b/packages/blockchain-link/tests/unit/getTransaction.test.ts
@@ -1,4 +1,5 @@
 import { BackendWebsocketServerMock } from '@trezor/e2e-utils';
+
 import workers from './worker';
 import BlockchainLink from '../../src';
 import fixtures from './fixtures/getTransaction';
diff --git a/packages/blockchain-link/tests/unit/notifications.test.ts b/packages/blockchain-link/tests/unit/notifications.test.ts
index b0ecbf1687f..dbab1887fdb 100644
--- a/packages/blockchain-link/tests/unit/notifications.test.ts
+++ b/packages/blockchain-link/tests/unit/notifications.test.ts
@@ -1,7 +1,7 @@
 import { BackendWebsocketServerMock } from '@trezor/e2e-utils';
+
 import workers from './worker';
 import BlockchainLink from '../../src';
-
 import fixturesBlockbook from './fixtures/notifications-blockbook';
 import fixturesRipple from './fixtures/notifications-ripple';
 import fixturesBlockfrost from './fixtures/notifications-blockfrost';
diff --git a/packages/blockchain-link/tests/unit/pushTransaction.test.ts b/packages/blockchain-link/tests/unit/pushTransaction.test.ts
index 0b58302d260..c27b934611d 100644
--- a/packages/blockchain-link/tests/unit/pushTransaction.test.ts
+++ b/packages/blockchain-link/tests/unit/pushTransaction.test.ts
@@ -1,4 +1,5 @@
 import { BackendWebsocketServerMock } from '@trezor/e2e-utils';
+
 import workers from './worker';
 import BlockchainLink from '../../src';
 import fixtures from './fixtures/pushTransaction';
diff --git a/packages/blockchain-link/tests/unit/subscribe.test.ts b/packages/blockchain-link/tests/unit/subscribe.test.ts
index 83db8ed478f..66d6051a46d 100644
--- a/packages/blockchain-link/tests/unit/subscribe.test.ts
+++ b/packages/blockchain-link/tests/unit/subscribe.test.ts
@@ -1,4 +1,5 @@
 import { BackendWebsocketServerMock } from '@trezor/e2e-utils';
+
 import workers from './worker';
 import BlockchainLink from '../../src';
 import fixtures from './fixtures/subscribe';
diff --git a/packages/blockchain-link/tests/unit/utils.test.ts b/packages/blockchain-link/tests/unit/utils.test.ts
index b8e3eba9cfc..a294210a0c1 100644
--- a/packages/blockchain-link/tests/unit/utils.test.ts
+++ b/packages/blockchain-link/tests/unit/utils.test.ts
@@ -1,5 +1,4 @@
 import { prioritizeEndpoints } from '../../src/workers/utils';
-
 import * as fixtures from './fixtures/utils';
 
 describe('prioritizeEndpoints', () => {
diff --git a/packages/blockchain-link/tests/unit/workers.test.ts b/packages/blockchain-link/tests/unit/workers.test.ts
index 81959fc6980..ee5d9649f3a 100644
--- a/packages/blockchain-link/tests/unit/workers.test.ts
+++ b/packages/blockchain-link/tests/unit/workers.test.ts
@@ -1,4 +1,6 @@
+/* eslint-disable jest/no-jasmine-globals */
 import TinyWorker from 'tiny-worker';
+
 import BlockchainLink from '../../src';
 
 class BaseMockWorker {
@@ -165,6 +167,7 @@ describe('Worker', () => {
                 return new TinyWorker(() => {
                     self.onmessage = () => {
                         // @ts-expect-error undefined "x"
+                        // eslint-disable-next-line @typescript-eslint/no-unused-vars
                         const r = 1 / x;
                     };
 
diff --git a/packages/blockchain-link/tsconfig.json b/packages/blockchain-link/tsconfig.json
index 8835026e99c..e13bab8d4a8 100644
--- a/packages/blockchain-link/tsconfig.json
+++ b/packages/blockchain-link/tsconfig.json
@@ -13,6 +13,7 @@
         { "path": "../utils" },
         { "path": "../utxo-lib" },
         { "path": "../e2e-utils" },
+        { "path": "../eslint" },
         { "path": "../type-utils" }
     ]
 }
diff --git a/packages/blockchain-link/tsconfig.lib.json b/packages/blockchain-link/tsconfig.lib.json
index 54918d49e91..428254ad4b5 100644
--- a/packages/blockchain-link/tsconfig.lib.json
+++ b/packages/blockchain-link/tsconfig.lib.json
@@ -25,6 +25,9 @@
         {
             "path": "../e2e-utils"
         },
+        {
+            "path": "../eslint"
+        },
         {
             "path": "../type-utils"
         }
diff --git a/packages/blockchain-link/webpack/dev.js b/packages/blockchain-link/webpack/dev.js
index ff811e42dd4..2d583b3dcb4 100644
--- a/packages/blockchain-link/webpack/dev.js
+++ b/packages/blockchain-link/webpack/dev.js
@@ -1,5 +1,6 @@
 const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
+
 const { SRC, BUILD, PORT } = require('./constants');
 
 module.exports = {
@@ -22,7 +23,6 @@ module.exports = {
             directory: `${SRC}ui`,
         },
         hot: false,
-        https: false,
         port: PORT,
     },
     module: {
diff --git a/packages/blockchain-link/webpack/workers.web.js b/packages/blockchain-link/webpack/workers.web.js
index bb8b9594a77..4197bfb4ada 100644
--- a/packages/blockchain-link/webpack/workers.web.js
+++ b/packages/blockchain-link/webpack/workers.web.js
@@ -1,4 +1,5 @@
 const webpack = require('webpack');
+
 const { SRC, BUILD } = require('./constants');
 
 module.exports = {
diff --git a/packages/coinjoin/.eslintrc.js b/packages/coinjoin/.eslintrc.js
deleted file mode 100644
index adfdb637ac9..00000000000
--- a/packages/coinjoin/.eslintrc.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-    rules: {
-        'no-bitwise': 'off',
-        'no-console': 'warn',
-    },
-};
diff --git a/packages/coinjoin/eslint.config.mjs b/packages/coinjoin/eslint.config.mjs
new file mode 100644
index 00000000000..6287357377b
--- /dev/null
+++ b/packages/coinjoin/eslint.config.mjs
@@ -0,0 +1,11 @@
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'no-bitwise': 'off',
+            'no-console': 'warn',
+        },
+    },
+];
diff --git a/packages/coinjoin/package.json b/packages/coinjoin/package.json
index dee79661a65..a6ca08ffb54 100644
--- a/packages/coinjoin/package.json
+++ b/packages/coinjoin/package.json
@@ -16,7 +16,6 @@
     "sideEffects": false,
     "main": "src/index.ts",
     "scripts": {
-        "lint:js": "eslint '**/*.{ts,js}'",
         "test:unit": "yarn g:jest",
         "test:discovery": "yarn g:tsx ./tests/tools/discovery-test.ts",
         "test:anonymity": "yarn g:tsx ./tests/tools/anonymity-test.ts",
@@ -25,9 +24,11 @@
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
+        "@suite-common/suite-constants": "workspace:*",
         "@trezor/blockchain-link": "workspace:*",
         "@trezor/blockchain-link-types": "workspace:*",
         "@trezor/blockchain-link-utils": "workspace:*",
+        "@trezor/eslint": "workspace:*",
         "@trezor/utils": "workspace:*",
         "@trezor/utxo-lib": "workspace:*",
         "cross-fetch": "^4.0.0",
diff --git a/packages/coinjoin/src/backend/CoinjoinBackendClient.ts b/packages/coinjoin/src/backend/CoinjoinBackendClient.ts
index 99de08ffa84..740962d3bb5 100644
--- a/packages/coinjoin/src/backend/CoinjoinBackendClient.ts
+++ b/packages/coinjoin/src/backend/CoinjoinBackendClient.ts
@@ -1,5 +1,10 @@
-import { scheduleAction, arrayShuffle, urlToOnion } from '@trezor/utils';
-import { TypedEmitter } from '@trezor/utils';
+import {
+    scheduleAction,
+    arrayShuffle,
+    urlToOnion,
+    getWeakRandomInt,
+    TypedEmitter,
+} from '@trezor/utils';
 import type { BlockbookAPI } from '@trezor/blockchain-link/src/workers/blockbook/websocket';
 
 import { RequestOptions, resetIdentityCircuit } from '../utils/http';
@@ -38,7 +43,7 @@ export class CoinjoinBackendClient {
 
     constructor(settings: CoinjoinBackendClientSettings) {
         this.logger = settings.logger;
-        this.blockbookUrls = arrayShuffle(settings.blockbookUrls);
+        this.blockbookUrls = arrayShuffle(settings.blockbookUrls, { randomInt: getWeakRandomInt });
         this.onionDomains = settings.onionDomains ?? {};
         this.blockbookRequestId = Math.floor(Math.random() * settings.blockbookUrls.length);
         this.websockets = new CoinjoinWebsocketController(settings);
diff --git a/packages/coinjoin/src/client/CoinjoinRound.ts b/packages/coinjoin/src/client/CoinjoinRound.ts
index bb81fb6560d..982858a7693 100644
--- a/packages/coinjoin/src/client/CoinjoinRound.ts
+++ b/packages/coinjoin/src/client/CoinjoinRound.ts
@@ -1,5 +1,4 @@
-import { TypedEmitter } from '@trezor/utils';
-import { scheduleAction, arrayDistinct, arrayPartition } from '@trezor/utils';
+import { TypedEmitter, scheduleAction, arrayDistinct, arrayPartition } from '@trezor/utils';
 import { Network } from '@trezor/utxo-lib';
 
 import {
diff --git a/packages/coinjoin/src/client/Status.ts b/packages/coinjoin/src/client/Status.ts
index 47ca5535d4c..68ea510ddd9 100644
--- a/packages/coinjoin/src/client/Status.ts
+++ b/packages/coinjoin/src/client/Status.ts
@@ -240,15 +240,15 @@ export class Status extends TypedEmitter<StatusEvents> {
                 identity: this.identities[0],
                 attempts: 3, // schedule 3 attempts on start
             },
-        ).then(patchResponse);
-
-        return version
-            ? ({
-                  majorVersion: version.BackenMajordVersion,
-                  commitHash: version.CommitHash,
-                  legalDocumentsVersion: version.Ww2LegalDocumentsVersion,
-              } as CoinjoinClientVersion)
-            : undefined;
+        )
+            .then(patchResponse)
+            .catch(() => undefined);
+
+        return {
+            majorVersion: version?.BackenMajordVersion ?? '0',
+            commitHash: version?.CommitHash ?? 'deadbeef',
+            legalDocumentsVersion: version?.Ww2LegalDocumentsVersion ?? '1.0',
+        } as CoinjoinClientVersion;
     }
 
     async start() {
diff --git a/packages/coinjoin/src/client/round/endedRound.ts b/packages/coinjoin/src/client/round/endedRound.ts
index 844af2a7324..1d561b9f35f 100644
--- a/packages/coinjoin/src/client/round/endedRound.ts
+++ b/packages/coinjoin/src/client/round/endedRound.ts
@@ -1,4 +1,4 @@
-import { enumUtils, getRandomNumberInRange } from '@trezor/utils';
+import { enumUtils, getWeakRandomNumberInRange } from '@trezor/utils';
 
 import type { CoinjoinRound, CoinjoinRoundOptions } from '../CoinjoinRound';
 import { EndRoundState, WabiSabiProtocolErrorCode } from '../../enums';
@@ -56,7 +56,7 @@ export const ended = (round: CoinjoinRound, { logger, network }: CoinjoinRoundOp
         // repeated input-registration will tell if they are really banned,
         // make sure that addresses registered in round are recycled (reset Infinity sentence)
         const minute = 60 * 1000;
-        const sentenceEnd = getRandomNumberInRange(5 * minute, 10 * minute);
+        const sentenceEnd = getWeakRandomNumberInRange(5 * minute, 10 * minute);
         [...inputs, ...addresses].forEach(vinvout =>
             prison.detain(vinvout, {
                 sentenceEnd,
diff --git a/packages/coinjoin/src/client/round/inputRegistration.ts b/packages/coinjoin/src/client/round/inputRegistration.ts
index 2e20812a4a3..9bc93b77d5b 100644
--- a/packages/coinjoin/src/client/round/inputRegistration.ts
+++ b/packages/coinjoin/src/client/round/inputRegistration.ts
@@ -1,4 +1,4 @@
-import { getRandomNumberInRange } from '@trezor/utils';
+import { getWeakRandomNumberInRange } from '@trezor/utils';
 
 import * as coordinator from '../coordinator';
 import * as middleware from '../middleware';
@@ -56,7 +56,7 @@ const registerInput = async (
     // setup random delay for registration request. we want each input to be registered in different time as different TOR identity
     // note that this may cause that the input will not be registered if phase change before expected deadline
     const deadline = round.phaseDeadline - Date.now() - ROUND_SELECTION_REGISTRATION_OFFSET;
-    const delay = deadline > 0 ? getRandomNumberInRange(0, deadline) : 0;
+    const delay = deadline > 0 ? getWeakRandomNumberInRange(0, deadline) : 0;
     logger.info(
         `Trying to register ~~${input.outpoint}~~ to ~~${round.id}~~ with delay ${delay}ms and deadline ${round.phaseDeadline}`,
     );
diff --git a/packages/coinjoin/src/client/round/outputRegistration.ts b/packages/coinjoin/src/client/round/outputRegistration.ts
index 19d9c5a8153..6c7ac003408 100644
--- a/packages/coinjoin/src/client/round/outputRegistration.ts
+++ b/packages/coinjoin/src/client/round/outputRegistration.ts
@@ -1,4 +1,4 @@
-import { getWeakRandomId, arrayShuffle } from '@trezor/utils';
+import { getWeakRandomId, arrayShuffle, getWeakRandomInt } from '@trezor/utils';
 
 import * as coordinator from '../coordinator';
 import * as middleware from '../middleware';
@@ -160,7 +160,7 @@ export const outputRegistration = async (
                 const assignedAddresses: AccountAddress[] = [];
 
                 return Promise.all(
-                    arrayShuffle(outputs).map(output =>
+                    arrayShuffle(outputs, { randomInt: getWeakRandomInt }).map(output =>
                         registerOutput(round, account, output, assignedAddresses, options),
                     ),
                 );
@@ -170,7 +170,9 @@ export const outputRegistration = async (
         round.setSessionPhase(SessionPhase.AwaitingOthersOutputs);
         // inform coordinator that each registered input is ready to sign
         await Promise.all(
-            arrayShuffle(round.inputs).map(input => readyToSign(round, input, options)),
+            arrayShuffle(round.inputs, { randomInt: getWeakRandomInt }).map(input =>
+                readyToSign(round, input, options),
+            ),
         );
         logger.info(`Ready to sign ~~${round.id}~~`);
     } catch (error) {
diff --git a/packages/coinjoin/src/client/round/transactionSigning.ts b/packages/coinjoin/src/client/round/transactionSigning.ts
index d8a5677696a..9424d587daf 100644
--- a/packages/coinjoin/src/client/round/transactionSigning.ts
+++ b/packages/coinjoin/src/client/round/transactionSigning.ts
@@ -1,4 +1,4 @@
-import { arrayShuffle } from '@trezor/utils';
+import { arrayShuffle, getWeakRandomInt } from '@trezor/utils';
 
 import * as coordinator from '../coordinator';
 import * as middleware from '../middleware';
@@ -234,7 +234,7 @@ export const transactionSigning = async (
 
         round.setSessionPhase(SessionPhase.SendingSignature);
         await Promise.all(
-            arrayShuffle(round.inputs).map(input =>
+            arrayShuffle(round.inputs, { randomInt: getWeakRandomInt }).map(input =>
                 sendTxSignature(round, resolvedTime, input, options),
             ),
         );
diff --git a/packages/coinjoin/src/utils/roundUtils.ts b/packages/coinjoin/src/utils/roundUtils.ts
index 93fa5ab67d1..763d294a43b 100644
--- a/packages/coinjoin/src/utils/roundUtils.ts
+++ b/packages/coinjoin/src/utils/roundUtils.ts
@@ -1,5 +1,5 @@
 import { bufferutils, Transaction, Network } from '@trezor/utxo-lib';
-import { getRandomNumberInRange } from '@trezor/utils';
+import { getWeakRandomNumberInRange } from '@trezor/utils';
 
 import {
     COORDINATOR_FEE_RATE_FALLBACK,
@@ -88,7 +88,7 @@ export const scheduleDelay = (
     // and at most 1 sec before the calculated max (so there's room for randomness)
     const min = clamp(minimumDelay, 0, max - 1000);
 
-    return getRandomNumberInRange(min, max);
+    return getWeakRandomNumberInRange(min, max);
 };
 
 // NOTE: deadlines are not accurate. phase may change earlier
diff --git a/packages/coinjoin/tests/client/CoinjoinPrison.test.ts b/packages/coinjoin/tests/client/CoinjoinPrison.test.ts
index b0418b2680f..d80699fedc5 100644
--- a/packages/coinjoin/tests/client/CoinjoinPrison.test.ts
+++ b/packages/coinjoin/tests/client/CoinjoinPrison.test.ts
@@ -1,24 +1,25 @@
 import { CoinjoinPrison } from '../../src/client/CoinjoinPrison';
 
 describe('CoinjoinPrison', () => {
-    it('release inmate when Round is no longer present in Status', done => {
-        const inmate = {
-            accountKey: 'account-A',
-            type: 'input',
-            sentenceStart: Date.now() - 10000,
-        } as const;
+    it('release inmate when Round is no longer present in Status', () =>
+        new Promise<void>(done => {
+            const inmate = {
+                accountKey: 'account-A',
+                type: 'input',
+                sentenceStart: Date.now() - 10000,
+            } as const;
 
-        const prison = new CoinjoinPrison([
-            { ...inmate, id: '00AA', roundId: '00', sentenceEnd: Date.now() + 10000 }, // will be released - round not present)
-            { ...inmate, id: '00AB', roundId: '00', sentenceEnd: Infinity }, // will NOT be released - sentence Infinity
-            { ...inmate, id: '01AA', roundId: '01', sentenceEnd: Date.now() + 10000 }, // wil NOT be released - round IS present
-            { ...inmate, id: '01AB', roundId: '01', sentenceEnd: Date.now() - 1 }, // will be released - sentence is lower
-        ]);
+            const prison = new CoinjoinPrison([
+                { ...inmate, id: '00AA', roundId: '00', sentenceEnd: Date.now() + 10000 }, // will be released - round not present)
+                { ...inmate, id: '00AB', roundId: '00', sentenceEnd: Infinity }, // will NOT be released - sentence Infinity
+                { ...inmate, id: '01AA', roundId: '01', sentenceEnd: Date.now() + 10000 }, // wil NOT be released - round IS present
+                { ...inmate, id: '01AB', roundId: '01', sentenceEnd: Date.now() - 1 }, // will be released - sentence is lower
+            ]);
 
-        prison.on('change', () => done()); // end test after change event
+            prison.on('change', () => done()); // end test after change event
 
-        prison.release(['01']); // only one round is present in Status
+            prison.release(['01']); // only one round is present in Status
 
-        expect(prison.inmates.map(({ id }) => id)).toEqual(['00AB', '01AA']);
-    });
+            expect(prison.inmates.map(({ id }) => id)).toEqual(['00AB', '01AA']);
+        }));
 });
diff --git a/packages/coinjoin/tests/client/CoinjoinRound.test.ts b/packages/coinjoin/tests/client/CoinjoinRound.test.ts
index f6a3dc638d4..52d886d76a6 100644
--- a/packages/coinjoin/tests/client/CoinjoinRound.test.ts
+++ b/packages/coinjoin/tests/client/CoinjoinRound.test.ts
@@ -12,7 +12,7 @@ jest.mock('@trezor/utils', () => {
     return {
         __esModule: true,
         ...originalModule,
-        getRandomNumberInRange: () => 0,
+        getWeakRandomNumberInRange: () => 0,
     };
 });
 
@@ -188,7 +188,7 @@ describe(`CoinjoinRound`, () => {
 
     it('onPhaseChange lock cool off resolved', async () => {
         const delayMock = jest
-            .spyOn(trezorUtils, 'getRandomNumberInRange')
+            .spyOn(trezorUtils, 'getWeakRandomNumberInRange')
             .mockImplementation(() => 800);
 
         const constantsMock = jest
@@ -396,7 +396,7 @@ describe(`CoinjoinRound`, () => {
 
     it('unregisterAccount when round is locked', async () => {
         const delayMock = jest
-            .spyOn(trezorUtils, 'getRandomNumberInRange')
+            .spyOn(trezorUtils, 'getWeakRandomNumberInRange')
             .mockImplementation(() => 800);
 
         const constantsMock = jest
@@ -420,6 +420,7 @@ describe(`CoinjoinRound`, () => {
         round.on('changed', spyChanged);
 
         // process but not wait for the result
+        // eslint-disable-next-line jest/valid-expect-in-promise
         round.process([]).then(() => {
             expect(spyEnded).toHaveBeenCalledTimes(1);
             expect(spyChanged).toHaveBeenCalledTimes(1);
diff --git a/packages/coinjoin/tests/client/Status.test.ts b/packages/coinjoin/tests/client/Status.test.ts
index 093fc63fbc4..cff39db0b5d 100644
--- a/packages/coinjoin/tests/client/Status.test.ts
+++ b/packages/coinjoin/tests/client/Status.test.ts
@@ -208,25 +208,26 @@ describe('Status', () => {
         expect(identities.length).toEqual(1);
     });
 
-    it('Status start and immediate stop', done => {
-        status = new Status(server?.requestOptions);
-        const errorListener = jest.fn();
-        status.on('log', errorListener);
-        const updateListener = jest.fn();
-        status.on('update', updateListener);
-        const requestListener = jest.fn();
-        server?.addListener('test-handle-request', requestListener);
-
-        // start but not await
-        status.start().then(() => {
-            expect(requestListener).toHaveBeenCalledTimes(0); // aborted, request not sent
-            expect(updateListener).toHaveBeenCalledTimes(0); // not emitted, listener removed by .stop()
-            expect(errorListener).toHaveBeenCalledTimes(0); // not emitted, listener removed by .stop()
-            done();
-        });
-        // immediate stop
-        status.stop();
-    });
+    it('Status start and immediate stop', () =>
+        new Promise<void>(done => {
+            status = new Status(server?.requestOptions);
+            const errorListener = jest.fn();
+            status.on('log', errorListener);
+            const updateListener = jest.fn();
+            status.on('update', updateListener);
+            const requestListener = jest.fn();
+            server?.addListener('test-handle-request', requestListener);
+
+            // start but not await
+            status.start().then(() => {
+                expect(requestListener).toHaveBeenCalledTimes(0); // aborted, request not sent
+                expect(updateListener).toHaveBeenCalledTimes(0); // not emitted, listener removed by .stop()
+                expect(errorListener).toHaveBeenCalledTimes(0); // not emitted, listener removed by .stop()
+                done();
+            });
+            // immediate stop
+            status.stop();
+        }));
 
     it('Status start attempts, keep lifecycle regardless of failed requests', async () => {
         jest.spyOn(STATUS_TIMEOUT, 'registered', 'get').mockReturnValue(250 as any);
diff --git a/packages/coinjoin/tests/client/connectionConfirmation.test.ts b/packages/coinjoin/tests/client/connectionConfirmation.test.ts
index 985863ec82e..680d4c4538e 100644
--- a/packages/coinjoin/tests/client/connectionConfirmation.test.ts
+++ b/packages/coinjoin/tests/client/connectionConfirmation.test.ts
@@ -14,7 +14,7 @@ jest.mock('@trezor/utils', () => {
     return {
         __esModule: true,
         ...originalModule,
-        getRandomNumberInRange: () => 0,
+        getWeakRandomNumberInRange: () => 0,
     };
 });
 
@@ -196,38 +196,39 @@ describe('connectionConfirmation', () => {
             });
     });
 
-    it('connection-confirmation interval aborted, Alice unregistered', done => {
-        const alice = createInput('account-A', 'A1', {
-            registrationData: {
-                AliceId: '01A1-01a1',
-            },
-            realAmountCredentials: {},
-            realVsizeCredentials: {},
-        });
-
-        const interval = confirmationInterval(
-            createCoinjoinRound([alice], {
-                ...server?.requestOptions,
-                roundParameters: {
-                    ConnectionConfirmationTimeout: '0d 0h 0m 2s', // intervalDelay = 1 sec
-                },
-                round: {
-                    phaseDeadline: Date.now() + 1000, // phase will end in less than intervalDelay
+    it('connection-confirmation interval aborted, Alice unregistered', () =>
+        new Promise<void>(done => {
+            const alice = createInput('account-A', 'A1', {
+                registrationData: {
+                    AliceId: '01A1-01a1',
                 },
-            }),
-            alice,
-            server?.requestOptions,
-        );
+                realAmountCredentials: {},
+                realVsizeCredentials: {},
+            });
 
-        server?.addListener('test-request', ({ url, resolve }) => {
-            resolve();
-            if (url.includes('input-unregistration')) {
-                done();
-            }
-        });
+            const interval = confirmationInterval(
+                createCoinjoinRound([alice], {
+                    ...server?.requestOptions,
+                    roundParameters: {
+                        ConnectionConfirmationTimeout: '0d 0h 0m 2s', // intervalDelay = 1 sec
+                    },
+                    round: {
+                        phaseDeadline: Date.now() + 1000, // phase will end in less than intervalDelay
+                    },
+                }),
+                alice,
+                server?.requestOptions,
+            );
 
-        interval.abort();
-    });
+            server?.addListener('test-request', ({ url, resolve }) => {
+                resolve();
+                if (url.includes('input-unregistration')) {
+                    done();
+                }
+            });
+
+            interval.abort();
+        }));
 
     it('404 error in coordinator connection-confirmation', async () => {
         server?.addListener('test-request', ({ url, data, resolve, reject }) => {
diff --git a/packages/coinjoin/tests/client/coordinatorRequest.test.ts b/packages/coinjoin/tests/client/coordinatorRequest.test.ts
index e7065315a06..6d91ce6adc1 100644
--- a/packages/coinjoin/tests/client/coordinatorRequest.test.ts
+++ b/packages/coinjoin/tests/client/coordinatorRequest.test.ts
@@ -146,20 +146,21 @@ describe('http', () => {
         ).rejects.toThrow('Aborted by signal');
     });
 
-    it('successful', done => {
-        coordinatorRequest('input-registration', {}, { baseUrl }).then(resp => {
-            expect(resp).toMatchObject({ AliceId: expect.any(String) });
-        });
-        // without baseUrl
-        coordinatorRequest<any>(`status`, {}, { baseUrl }).then(resp => {
-            expect(resp.RoundStates.length).toEqual(1);
-        });
-        // without json response
-        coordinatorRequest('ready-to-sign', {}, { baseUrl }).then(resp => {
-            expect(resp).toEqual('');
-            done();
-        });
-    });
+    it('successful', () =>
+        new Promise<void>(done => {
+            coordinatorRequest('input-registration', {}, { baseUrl }).then(resp => {
+                expect(resp).toMatchObject({ AliceId: expect.any(String) });
+            });
+            // without baseUrl
+            coordinatorRequest<any>(`status`, {}, { baseUrl }).then(resp => {
+                expect(resp.RoundStates.length).toEqual(1);
+            });
+            // without json response
+            coordinatorRequest('ready-to-sign', {}, { baseUrl }).then(resp => {
+                expect(resp).toEqual('');
+                done();
+            });
+        }));
 
     it('with identity', async () => {
         const requestListener = jest.fn(req => {
diff --git a/packages/coinjoin/tests/client/inputRegistration.test.ts b/packages/coinjoin/tests/client/inputRegistration.test.ts
index d6afb9f851f..c79c5a23ac6 100644
--- a/packages/coinjoin/tests/client/inputRegistration.test.ts
+++ b/packages/coinjoin/tests/client/inputRegistration.test.ts
@@ -10,7 +10,7 @@ jest.mock('@trezor/utils', () => {
     return {
         __esModule: true,
         ...originalModule,
-        getRandomNumberInRange: () => 0,
+        getWeakRandomNumberInRange: () => 0,
     };
 });
 
@@ -342,15 +342,16 @@ describe('inputRegistration', () => {
         expect(spy.mock.calls.length).toBeGreaterThan(0);
 
         // 2. wait for confirmation interval to resolve
-        Promise.all(response.inputs.map(input => input.getConfirmationInterval()?.promise)).then(
-            res => {
-                res.forEach(input => {
-                    expect(input?.getConfirmationInterval()).toBeUndefined();
-                });
-            },
+        const promises = Promise.all(
+            response.inputs.map(input => input.getConfirmationInterval()?.promise),
         );
 
         // 1. abort confirmation interval
         response.inputs.forEach(input => input.clearConfirmationInterval());
+
+        const res = await promises;
+        res.forEach(input => {
+            expect(input?.getConfirmationInterval()).toBeUndefined();
+        });
     });
 });
diff --git a/packages/coinjoin/tests/client/outputRegistration.test.ts b/packages/coinjoin/tests/client/outputRegistration.test.ts
index 890efd0155d..f927f41d9ca 100644
--- a/packages/coinjoin/tests/client/outputRegistration.test.ts
+++ b/packages/coinjoin/tests/client/outputRegistration.test.ts
@@ -11,7 +11,7 @@ jest.mock('@trezor/utils', () => {
     return {
         __esModule: true,
         ...originalModule,
-        getRandomNumberInRange: () => 0,
+        getWeakRandomNumberInRange: () => 0,
     };
 });
 
diff --git a/packages/coinjoin/tests/client/transactionSigning.test.ts b/packages/coinjoin/tests/client/transactionSigning.test.ts
index 35db099f4f4..66cf63eb7b4 100644
--- a/packages/coinjoin/tests/client/transactionSigning.test.ts
+++ b/packages/coinjoin/tests/client/transactionSigning.test.ts
@@ -1,5 +1,5 @@
 import { networks } from '@trezor/utxo-lib';
-import { getRandomNumberInRange } from '@trezor/utils';
+import { getWeakRandomNumberInRange } from '@trezor/utils';
 
 import { transactionSigning } from '../../src/client/round/transactionSigning';
 import { createServer } from '../mocks/server';
@@ -13,7 +13,7 @@ jest.mock('@trezor/utils', () => {
     return {
         __esModule: true,
         ...originalModule,
-        getRandomNumberInRange: jest.fn(() => 0),
+        getWeakRandomNumberInRange: jest.fn(() => 0),
     };
 });
 
@@ -529,7 +529,7 @@ describe('transactionSigning signature delay', () => {
         );
 
         // signature is sent in range 17-67 sec. (resolve time is less than 50 sec TX_SIGNING_DELAY)
-        expect(getRandomNumberInRange).toHaveBeenLastCalledWith(17000, 67000);
+        expect(getWeakRandomNumberInRange).toHaveBeenLastCalledWith(17000, 67000);
         expect(response.isSignedSuccessfully()).toBe(true);
     });
 
@@ -558,7 +558,7 @@ describe('transactionSigning signature delay', () => {
         );
 
         // signature is sent in range 0-46.21 sec. (resolve time is greater than 50 sec of TX_SIGNING_DELAY)
-        expect(getRandomNumberInRange).toHaveBeenLastCalledWith(0, 46210);
+        expect(getWeakRandomNumberInRange).toHaveBeenLastCalledWith(0, 46210);
         expect(response.isSignedSuccessfully()).toBe(true);
     });
 
@@ -588,7 +588,7 @@ describe('transactionSigning signature delay', () => {
         );
 
         // signature is sent in default range 0-1 sec.
-        expect(getRandomNumberInRange).toHaveBeenLastCalledWith(0, 1000);
+        expect(getWeakRandomNumberInRange).toHaveBeenLastCalledWith(0, 1000);
         expect(response.isSignedSuccessfully()).toBe(true);
     });
 });
diff --git a/packages/coinjoin/tests/tools/benchmark-test.ts b/packages/coinjoin/tests/tools/benchmark-test.ts
index bf020c0b6b2..af5a2df5340 100644
--- a/packages/coinjoin/tests/tools/benchmark-test.ts
+++ b/packages/coinjoin/tests/tools/benchmark-test.ts
@@ -15,7 +15,7 @@ const TIMEOUT = 20000;
 const [bestKnownHash, batchSizeString = '500', torSocket = ''] = process.argv.slice(2);
 const batchSize = Number(batchSizeString);
 const [host, port] = torSocket.split(':');
-const agent = host && port ? new SocksProxyAgent({ host, port }) : undefined;
+const agent = host && port ? new SocksProxyAgent(`socks://${host}:${port}`) : undefined;
 
 // Copied from request-manager to remove disallowed headers because of Wasabi
 const stripHeaders = () => {
diff --git a/packages/coinjoin/tests/tools/discovery.ts b/packages/coinjoin/tests/tools/discovery.ts
index f497a227da4..17cf5a084c2 100644
--- a/packages/coinjoin/tests/tools/discovery.ts
+++ b/packages/coinjoin/tests/tools/discovery.ts
@@ -1,14 +1,18 @@
 /* eslint-disable no-console */
-/* eslint-disable @typescript-eslint/no-var-requires */
+
+import { BITCOIN_ONLY_NETWORKS } from '@suite-common/suite-constants';
+import { isArrayMember } from '@trezor/utils';
 
 import { CoinjoinBackend } from '../../src/backend/CoinjoinBackend';
 import type { CoinjoinBackendSettings } from '../../src/types';
 
 const { getCoinjoinConfig } = require('../../../suite/src/services/coinjoin/config');
 
-const supportedNetworks = ['btc', 'test', 'regtest'] as const;
-const isSupportedNetwork = (network: string): network is (typeof supportedNetworks)[number] =>
-    supportedNetworks.includes(network as any);
+const supportedNetworks = BITCOIN_ONLY_NETWORKS;
+type SupportedNetwork = (typeof supportedNetworks)[number];
+
+const isSupportedNetwork = (network: string): network is SupportedNetwork =>
+    isArrayMember(network, supportedNetworks);
 
 export const getAccountInfoParams = (network: string, descriptor: string) => {
     if (!network) throw new Error('network arg missing');
diff --git a/packages/coinjoin/tests/utils/roundUtils.test.ts b/packages/coinjoin/tests/utils/roundUtils.test.ts
index fbb6597ea29..c28166694fe 100644
--- a/packages/coinjoin/tests/utils/roundUtils.test.ts
+++ b/packages/coinjoin/tests/utils/roundUtils.test.ts
@@ -1,4 +1,4 @@
-import { getRandomNumberInRange } from '@trezor/utils';
+import { getWeakRandomNumberInRange } from '@trezor/utils';
 
 import {
     getCommitmentData,
@@ -19,7 +19,7 @@ jest.mock('@trezor/utils', () => {
     return {
         __esModule: true,
         ...originalModule,
-        getRandomNumberInRange: jest.fn(originalModule.getRandomNumberInRange),
+        getWeakRandomNumberInRange: jest.fn(originalModule.getWeakRandomNumberInRange),
     };
 });
 
@@ -150,38 +150,38 @@ describe('roundUtils', () => {
 
         // default (no min, no max) range 0-10 sec.
         resultInRange(scheduleDelay(60000), 0, 10000);
-        expect(getRandomNumberInRange).toHaveBeenLastCalledWith(0, 10000);
+        expect(getWeakRandomNumberInRange).toHaveBeenLastCalledWith(0, 10000);
 
         // range 3-10sec.
         resultInRange(scheduleDelay(20000, 3000), 3000, 10000);
-        expect(getRandomNumberInRange).toHaveBeenLastCalledWith(3000, 10000);
+        expect(getWeakRandomNumberInRange).toHaveBeenLastCalledWith(3000, 10000);
 
         // deadlineOffset < 0, range 0-1 sec.
         resultInRange(scheduleDelay(1000, 3000), 0, 1000);
-        expect(getRandomNumberInRange).toHaveBeenLastCalledWith(0, 1000);
+        expect(getWeakRandomNumberInRange).toHaveBeenLastCalledWith(0, 1000);
 
         // deadline < min, range 9-10 sec.
         resultInRange(scheduleDelay(60000, 61000), 9000, 10000);
-        expect(getRandomNumberInRange).toHaveBeenLastCalledWith(9000, 10000);
+        expect(getWeakRandomNumberInRange).toHaveBeenLastCalledWith(9000, 10000);
 
         // deadline < min && deadline < max, range 49-50 sec.
         resultInRange(scheduleDelay(60000, 61000, 62000), 49000, 50000);
-        expect(getRandomNumberInRange).toHaveBeenLastCalledWith(49000, 50000);
+        expect(getWeakRandomNumberInRange).toHaveBeenLastCalledWith(49000, 50000);
 
         // deadline > min && deadline < max, range 3-20 sec.
         resultInRange(scheduleDelay(30000, 3000, 50000), 3000, 20000);
-        expect(getRandomNumberInRange).toHaveBeenLastCalledWith(3000, 20000);
+        expect(getWeakRandomNumberInRange).toHaveBeenLastCalledWith(3000, 20000);
 
         // min < 0 && deadline < max && deadlineOffset > 0, range 0-2.5 sec.
         resultInRange(scheduleDelay(12500, -3000, 50000), 0, 2500);
-        expect(getRandomNumberInRange).toHaveBeenLastCalledWith(0, 2500);
+        expect(getWeakRandomNumberInRange).toHaveBeenLastCalledWith(0, 2500);
 
         // min < 0 && max < 0 && deadlineOffset > 0, range 0-1 sec.
         resultInRange(scheduleDelay(12500, -10000, -5000), 0, 1000);
-        expect(getRandomNumberInRange).toHaveBeenLastCalledWith(0, 1000);
+        expect(getWeakRandomNumberInRange).toHaveBeenLastCalledWith(0, 1000);
 
         // min < 0 && max < 0 && deadlineOffset < 0, range 0-1 sec.
         resultInRange(scheduleDelay(7500, -10000, -5000), 0, 1000);
-        expect(getRandomNumberInRange).toHaveBeenLastCalledWith(0, 1000);
+        expect(getWeakRandomNumberInRange).toHaveBeenLastCalledWith(0, 1000);
     });
 });
diff --git a/packages/coinjoin/tsconfig.json b/packages/coinjoin/tsconfig.json
index 5a6ff6da88b..0dc96bcb848 100644
--- a/packages/coinjoin/tsconfig.json
+++ b/packages/coinjoin/tsconfig.json
@@ -2,9 +2,13 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
+        {
+            "path": "../../suite-common/suite-constants"
+        },
         { "path": "../blockchain-link" },
         { "path": "../blockchain-link-types" },
         { "path": "../blockchain-link-utils" },
+        { "path": "../eslint" },
         { "path": "../utils" },
         { "path": "../utxo-lib" }
     ]
diff --git a/packages/components/.storybook/main.js b/packages/components/.storybook/main.js
index 681db99f95d..63df8f0b85d 100644
--- a/packages/components/.storybook/main.js
+++ b/packages/components/.storybook/main.js
@@ -1,5 +1,13 @@
 import { dirname, join } from 'path';
 
+/**
+ * This function is used to resolve the absolute path of a package.
+ * It is needed in projects that use Yarn PnP or are set up within a monorepo.
+ */
+function getAbsolutePath(value) {
+    return dirname(require.resolve(join(value, 'package.json')));
+}
+
 module.exports = {
     stories: ['../src/**/*.stories.*'],
     logLevel: 'debug',
@@ -14,18 +22,12 @@ module.exports = {
         name: getAbsolutePath('@storybook/react-webpack5'),
         options: {},
     },
-    babel: async options => {
+    babel: options => {
         options.presets.push('@babel/preset-typescript');
+
         return options;
     },
     features: {
         storyStoreV7: false, // Remove this line when storiesOf is not used anymore
     },
 };
-/**
- * This function is used to resolve the absolute path of a package.
- * It is needed in projects that use Yarn PnP or are set up within a monorepo.
- */
-function getAbsolutePath(value) {
-    return dirname(require.resolve(join(value, 'package.json')));
-}
diff --git a/packages/components/.storybook/manager.js b/packages/components/.storybook/manager.js
index 17b478d55a6..f6074ea0baa 100644
--- a/packages/components/.storybook/manager.js
+++ b/packages/components/.storybook/manager.js
@@ -1,6 +1,7 @@
 import { addons } from '@storybook/addons';
+
 import theme from './theme';
 
 addons.setConfig({
-    theme: theme,
+    theme,
 });
diff --git a/packages/components/.storybook/preview.js b/packages/components/.storybook/preview.jsx
similarity index 100%
rename from packages/components/.storybook/preview.js
rename to packages/components/.storybook/preview.jsx
diff --git a/packages/components/.storybook/theme.js b/packages/components/.storybook/theme.js
index 3b857ccf19c..19faabd46ba 100644
--- a/packages/components/.storybook/theme.js
+++ b/packages/components/.storybook/theme.js
@@ -1,5 +1,6 @@
 import { create } from '@storybook/theming/create';
 
+// eslint-disable-next-line import/no-default-export
 export default create({
     base: 'light',
     fontBase: 'TT Satoshi',
diff --git a/packages/components/eslint.config.mjs b/packages/components/eslint.config.mjs
new file mode 100644
index 00000000000..367e76114ae
--- /dev/null
+++ b/packages/components/eslint.config.mjs
@@ -0,0 +1,27 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    { ignores: ['**/.build-storybook/*'] },
+    {
+        files: ['**/*.stories.tsx'],
+        rules: {
+            'no-console': 'off',
+            'import/no-default-export': 'off',
+        },
+    },
+    {
+        rules: {
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/*.stories.*',
+                        '**/.storybook/**',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/components/package.json b/packages/components/package.json
index cc59a1e6dc6..98b2282d699 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -8,7 +8,6 @@
     "sideEffects": false,
     "scripts": {
         "lint": "yarn lint:js && yarn lint:styles",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "lint:styles": "npx stylelint './src/**/*{.ts,.tsx}' --cache --config ../../.stylelintrc",
         "lint-fix": "npx eslint ./src --fix",
         "type-check": "yarn g:tsc --build tsconfig.json",
@@ -23,6 +22,7 @@
         "@suite-common/suite-constants": "workspace:*",
         "@suite-common/suite-utils": "workspace:*",
         "@suite-common/validators": "workspace:*",
+        "@trezor/asset-utils": "workspace:*",
         "@trezor/connect": "workspace:*",
         "@trezor/dom-utils": "workspace:*",
         "@trezor/env-utils": "workspace:*",
@@ -54,6 +54,8 @@
         "@storybook/client-api": "^7.6.13",
         "@storybook/react": "^7.6.13",
         "@storybook/react-webpack5": "^7.6.13",
+        "@storybook/theming": "^7.6.13",
+        "@trezor/eslint": "workspace:*",
         "@types/react": "18.2.79",
         "@types/react-date-range": "^1.4.9",
         "postcss-styled-syntax": "^0.6.4",
diff --git a/packages/components/src/components/AssetLogo/AssetInitials.tsx b/packages/components/src/components/AssetLogo/AssetInitials.tsx
index e22a3fede70..23ff3f25efe 100644
--- a/packages/components/src/components/AssetLogo/AssetInitials.tsx
+++ b/packages/components/src/components/AssetLogo/AssetInitials.tsx
@@ -1,5 +1,5 @@
 import styled from 'styled-components';
-import { ElevationUp, useElevation } from '../ElevationContext/ElevationContext';
+
 import {
     borders,
     Elevation,
@@ -7,6 +7,8 @@ import {
     mapElevationToBorder,
     spacingsPx,
 } from '@trezor/theme';
+
+import { ElevationUp, useElevation } from '../ElevationContext/ElevationContext';
 import { Text } from '../typography/Text/Text';
 import { Tooltip } from '../Tooltip/Tooltip';
 
@@ -27,18 +29,24 @@ const Circle = styled.div<{ $size: number; $elevation: Elevation }>`
 `;
 type AssetInitialsProps = {
     children: string;
+    withTooltip?: boolean;
     size: number;
 };
 
-const AssetInitialsInner = ({ children, size }: AssetInitialsProps) => {
+const AssetInitialsInner = ({ children, size, withTooltip = true }: AssetInitialsProps) => {
     const { elevation } = useElevation();
+    const firstChar = children[0];
 
     return (
         <Circle $elevation={elevation} $size={size}>
             <Content>
-                <Tooltip content={children}>
-                    <Text typographyStyle="callout">{children[0]}</Text>
-                </Tooltip>
+                {withTooltip ? (
+                    <Tooltip content={children}>
+                        <Text typographyStyle="callout">{firstChar}</Text>
+                    </Tooltip>
+                ) : (
+                    <Text typographyStyle="callout">{firstChar}</Text>
+                )}
             </Content>
         </Circle>
     );
diff --git a/packages/components/src/components/AssetLogo/AssetLogo.tsx b/packages/components/src/components/AssetLogo/AssetLogo.tsx
index b4af7cf5100..c515cedd030 100644
--- a/packages/components/src/components/AssetLogo/AssetLogo.tsx
+++ b/packages/components/src/components/AssetLogo/AssetLogo.tsx
@@ -1,17 +1,19 @@
+import { useEffect, useState } from 'react';
+
+import styled from 'styled-components';
+
+import { borders, Elevation, mapElevationToBackground, mapElevationToBorder } from '@trezor/theme';
+import { getAssetLogoUrl } from '@trezor/asset-utils';
+
 import {
     FrameProps,
     FramePropsKeys,
     pickAndPrepareFrameProps,
     withFrameProps,
 } from '../../utils/frameProps';
-import { useEffect, useState } from 'react';
-import styled from 'styled-components';
-import { borders } from '@trezor/theme';
-
 import { AssetInitials } from './AssetInitials';
 import { TransientProps } from '../../utils/transientProps';
-
-const ICONS_URL_BASE = 'https://data.trezor.io/suite/icons/coins/';
+import { ElevationUp, useElevation } from '../ElevationContext/ElevationContext';
 
 export const allowedAssetLogoSizes = [20, 24];
 type AssetLogoSize = (typeof allowedAssetLogoSizes)[number];
@@ -24,6 +26,7 @@ export type AssetLogoProps = AllowedFrameProps & {
     coingeckoId: string;
     contractAddress?: string;
     shouldTryToFetch?: boolean;
+    placeholderWithTooltip?: boolean;
     placeholder: string;
     'data-testid'?: string;
 };
@@ -36,17 +39,25 @@ const Container = styled.div<TransientProps<AllowedFrameProps> & { $size: number
     ${withFrameProps}
 `;
 
-const Logo = styled.img<{ $size: number; $isVisible: boolean }>(
-    ({ $size, $isVisible }) => `
-        width: ${$size}px;
-        height: ${$size}px;
-        border-radius: ${borders.radii.full};
-        visibility: ${$isVisible ? 'visible' : 'hidden'};
-    `,
-);
+const Logo = styled.img<{ $size: number; $isVisible: boolean; $elevation: Elevation }>`
+    width: ${({ $size }) => $size}px;
+    height: ${({ $size }) => $size}px;
+    border-radius: ${borders.radii.full};
+    visibility: ${({ $isVisible }) => ($isVisible ? 'visible' : 'hidden')};
+    box-shadow: inset 0 0 0 1px ${mapElevationToBorder};
+    background-color: ${mapElevationToBackground};
+`;
+
+interface LogoProps extends React.ImgHTMLAttributes<HTMLImageElement> {
+    $size: number;
+    $isVisible: boolean;
+}
 
-const getAssetLogoUrl = (fileName: string, quality?: '@2x') =>
-    `${ICONS_URL_BASE}${fileName}${quality === undefined ? '' : quality}.webp`;
+const ElevatedLogo = (props: LogoProps) => {
+    const { elevation } = useElevation();
+
+    return <Logo {...props} $elevation={elevation} />;
+};
 
 export const AssetLogo = ({
     size,
@@ -54,13 +65,15 @@ export const AssetLogo = ({
     contractAddress,
     shouldTryToFetch = true,
     placeholder,
+    placeholderWithTooltip = true,
     'data-testid': dataTest,
     ...rest
 }: AssetLogoProps) => {
     const [isLoading, setIsLoading] = useState(true);
     const [isPlaceholder, setIsPlaceholder] = useState(!shouldTryToFetch);
-    const fileName = contractAddress ? `${coingeckoId}--${contractAddress}` : coingeckoId;
-    const logoUrl = getAssetLogoUrl(fileName);
+
+    const logoUrl = getAssetLogoUrl({ coingeckoId, contractAddress });
+    const logoUrl2x = getAssetLogoUrl({ coingeckoId, contractAddress, quality: '@2x' });
 
     const frameProps = pickAndPrepareFrameProps(rest, allowedAssetLogoFrameProps);
 
@@ -76,19 +89,25 @@ export const AssetLogo = ({
 
     return (
         <Container $size={size} {...frameProps}>
-            {isPlaceholder && <AssetInitials size={size}>{placeholder}</AssetInitials>}
+            {isPlaceholder && (
+                <AssetInitials size={size} withTooltip={placeholderWithTooltip}>
+                    {placeholder}
+                </AssetInitials>
+            )}
             {!isPlaceholder && (
-                <Logo
-                    src={logoUrl}
-                    srcSet={`${logoUrl} 1x, ${getAssetLogoUrl(fileName, '@2x')} 2x`}
-                    $size={size}
-                    onLoad={handleLoad}
-                    onError={handleError}
-                    $isVisible={!isLoading}
-                    data-testid={dataTest}
-                    alt={placeholder}
-                    loading="lazy"
-                />
+                <ElevationUp>
+                    <ElevatedLogo
+                        src={logoUrl}
+                        srcSet={`${logoUrl} 1x, ${logoUrl2x} 2x`}
+                        $size={size}
+                        onLoad={handleLoad}
+                        onError={handleError}
+                        $isVisible={!isLoading}
+                        data-testid={dataTest}
+                        alt={placeholder}
+                        loading="lazy"
+                    />
+                </ElevationUp>
             )}
         </Container>
     );
diff --git a/packages/components/src/components/AutoScalingInput/AutoScalingInput.stories.tsx b/packages/components/src/components/AutoScalingInput/AutoScalingInput.stories.tsx
index c6f5a269363..d8cd47f8067 100644
--- a/packages/components/src/components/AutoScalingInput/AutoScalingInput.stories.tsx
+++ b/packages/components/src/components/AutoScalingInput/AutoScalingInput.stories.tsx
@@ -1,7 +1,9 @@
 import { ForwardRefExoticComponent, RefAttributes } from 'react';
-import { AutoScalingInput as AutoScalingInputComponent, Props } from './AutoScalingInput';
+
 import { Meta, StoryObj } from '@storybook/react';
 
+import { AutoScalingInput as AutoScalingInputComponent, Props } from './AutoScalingInput';
+
 const meta: Meta = {
     title: 'Form/AutoScalingInput',
     component: AutoScalingInputComponent,
diff --git a/packages/components/src/components/AutoScalingInput/AutoScalingInput.tsx b/packages/components/src/components/AutoScalingInput/AutoScalingInput.tsx
index 72e940cc7f0..402af20f113 100644
--- a/packages/components/src/components/AutoScalingInput/AutoScalingInput.tsx
+++ b/packages/components/src/components/AutoScalingInput/AutoScalingInput.tsx
@@ -1,4 +1,5 @@
 import React, { useRef, useEffect, forwardRef, useState, ChangeEvent, useCallback } from 'react';
+
 import styled from 'styled-components';
 
 const HiddenInputToMeasurePlaceholderScrollableWidth = styled.input`
diff --git a/packages/components/src/components/AutoScalingInput/AutoScalingInputExamples.stories.tsx b/packages/components/src/components/AutoScalingInput/AutoScalingInputExamples.stories.tsx
index 480071c9b3c..a4e8f2d90e0 100644
--- a/packages/components/src/components/AutoScalingInput/AutoScalingInputExamples.stories.tsx
+++ b/packages/components/src/components/AutoScalingInput/AutoScalingInputExamples.stories.tsx
@@ -1,14 +1,14 @@
 import styled from 'styled-components';
-import { AutoScalingInput as Input } from './AutoScalingInput';
 import { Meta } from '@storybook/react';
 
+import { AutoScalingInput as Input } from './AutoScalingInput';
+
 const Wrapper = styled.div`
     display: flex;
     flex: 1;
     flex-direction: column;
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
 const BorderAutoScalingInput = styled(Input)`
     padding: 1px 5px;
     border-radius: 3px;
@@ -16,7 +16,6 @@ const BorderAutoScalingInput = styled(Input)`
     border-width: 1px;
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
 const BorderlessAutoScalingInput = styled(Input)`
     padding: 1px 5px;
     border-style: solid;
diff --git a/packages/components/src/components/Badge/Badge.stories.tsx b/packages/components/src/components/Badge/Badge.stories.tsx
index 91256ca80fa..38b0bb26787 100644
--- a/packages/components/src/components/Badge/Badge.stories.tsx
+++ b/packages/components/src/components/Badge/Badge.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { Badge as BadgeComponent, BadgeProps, allowedBadgeFrameProps, badgeSizes } from './Badge';
 import { getFramePropsStory } from '../../utils/frameProps';
 
@@ -11,10 +12,24 @@ export default meta;
 export const Badge: StoryObj<BadgeProps> = {
     args: {
         children: 'Badge label',
+        isDisabled: false,
+        variant: 'primary',
         size: 'tiny',
         ...getFramePropsStory(allowedBadgeFrameProps).args,
     },
     argTypes: {
+        isDisabled: { control: 'boolean' },
+        variant: {
+            control: {
+                type: 'radio',
+            },
+            options: [
+                'primary',
+                'tertiary',
+                'destructive',
+                undefined,
+            ] satisfies BadgeProps['variant'][],
+        },
         size: {
             control: {
                 type: 'radio',
diff --git a/packages/components/src/components/Badge/Badge.tsx b/packages/components/src/components/Badge/Badge.tsx
index 66199cbf0ce..856c27264a3 100644
--- a/packages/components/src/components/Badge/Badge.tsx
+++ b/packages/components/src/components/Badge/Badge.tsx
@@ -1,6 +1,9 @@
 import React from 'react';
+
 import styled, { css, DefaultTheme, useTheme } from 'styled-components';
+
 import { borders, Color, CSSColor, spacings, spacingsPx, typography } from '@trezor/theme';
+
 import { focusStyleTransition, getFocusShadowStyle } from '../../utils/utils';
 import type { UISize, UIVariant } from '../../config/types';
 import {
@@ -18,7 +21,7 @@ export type BadgeSize = Extract<UISize, (typeof badgeSizes)[number]>;
 export const allowedBadgeFrameProps = ['margin'] as const satisfies FramePropsKeys[];
 type AllowedFrameProps = Pick<FrameProps, (typeof allowedBadgeFrameProps)[number]>;
 
-type BadgeVariant = Extract<UIVariant, 'primary' | 'tertiary' | 'destructive'>;
+export type BadgeVariant = Extract<UIVariant, 'primary' | 'tertiary' | 'destructive'>;
 
 export type BadgeProps = AllowedFrameProps & {
     size?: BadgeSize;
@@ -150,7 +153,7 @@ export const Badge = ({
                     name={icon}
                     color={
                         isDisabled
-                            ? 'iconDisabled'
+                            ? theme.iconDisabled
                             : mapVariantToIconColor({ $variant: variant, theme })
                     }
                 />
diff --git a/packages/components/src/components/Banner/Banner.stories.tsx b/packages/components/src/components/Banner/Banner.stories.tsx
index 54565c6bf5a..3349a7f91ef 100644
--- a/packages/components/src/components/Banner/Banner.stories.tsx
+++ b/packages/components/src/components/Banner/Banner.stories.tsx
@@ -1,7 +1,8 @@
 import { Meta, StoryObj } from '@storybook/react';
+import styled from 'styled-components';
+
 import { Banner as BannerComponent, BannerProps, variables, Row } from '../../index';
 import { allowedBannerFrameProps } from './Banner';
-import styled from 'styled-components';
 import { getFramePropsStory } from '../../utils/frameProps';
 
 const Wrapper = styled.div`
@@ -43,6 +44,8 @@ export const Banner: StoryObj<BannerProps> = {
         variant: 'warning',
         icon: undefined,
         rightContent: <BannerComponent.Button>Click</BannerComponent.Button>,
+        color: 'inherit',
+        spacingX: 'lg',
         ...getFramePropsStory(allowedBannerFrameProps).args,
     },
     argTypes: {
@@ -55,6 +58,18 @@ export const Banner: StoryObj<BannerProps> = {
                 type: 'select',
             },
         },
+        color: {
+            options: ['inherit', 'default'],
+            control: {
+                type: 'select',
+            },
+        },
+        spacingX: {
+            options: ['xs', 'lg'],
+            control: {
+                type: 'select',
+            },
+        },
         rightContent: {
             options: ['nothing', 'button', 'combinedButtons', 'iconButton', 'iconButtons'],
             mapping: {
diff --git a/packages/components/src/components/Banner/Banner.tsx b/packages/components/src/components/Banner/Banner.tsx
index b433e331e99..5cf523ed6e7 100755
--- a/packages/components/src/components/Banner/Banner.tsx
+++ b/packages/components/src/components/Banner/Banner.tsx
@@ -1,9 +1,9 @@
 import { ReactNode } from 'react';
-import styled, { css, useTheme } from 'styled-components';
 
-import { variables } from '../../config';
+import styled, { css, DefaultTheme, useTheme } from 'styled-components';
+
 import { Elevation, borders, spacingsPx, typography, spacings } from '@trezor/theme';
-import { Row, Column, TransientProps, useElevation, useMediaQuery } from '../..';
+
 import {
     FrameProps,
     FramePropsKeys,
@@ -23,9 +23,16 @@ import {
 } from './utils';
 import { Icon, IconName } from '../Icon/Icon';
 import { SCREEN_SIZE } from '../../config/variables';
+import { TransientProps } from '../../utils/transientProps';
+import { useMediaQuery } from '../../utils/useMediaQuery';
+import { useElevation } from '../ElevationContext/ElevationContext';
+import { Column, Row } from '../Flex/Flex';
+import { variables } from '../../config';
 
 export const allowedBannerFrameProps = ['margin'] as const satisfies FramePropsKeys[];
 type AllowedFrameProps = Pick<FrameProps, (typeof allowedBannerFrameProps)[number]>;
+type SpacingX = 'xs' | 'lg';
+type Color = 'inherit' | 'default';
 
 export type BannerProps = AllowedFrameProps & {
     children: ReactNode;
@@ -35,6 +42,8 @@ export type BannerProps = AllowedFrameProps & {
     icon?: IconName | true;
     filled?: boolean;
     'data-testid'?: string;
+    spacingX?: SpacingX;
+    color?: Color;
 };
 
 type WrapperParams = TransientProps<AllowedFrameProps> & {
@@ -42,8 +51,15 @@ type WrapperParams = TransientProps<AllowedFrameProps> & {
     $withIcon?: boolean;
     $elevation: Elevation;
     $filled: boolean;
+    $spacingX: SpacingX;
+    $color: Color;
 };
 
+const colorMap = (theme: DefaultTheme) => ({
+    inherit: mapVariantToTextColor,
+    default: theme.textDefault,
+});
+
 const Wrapper = styled.div<WrapperParams>`
     align-items: center;
     ${({ $filled }) =>
@@ -54,14 +70,13 @@ const Wrapper = styled.div<WrapperParams>`
               `
             : ''}
 
-    color: ${mapVariantToTextColor};
+    color: ${({ $color, theme }) => colorMap(theme)[$color]};
     display: flex;
     ${typography.hint}
     gap: ${spacingsPx.sm};
-    padding: ${spacingsPx.sm} ${spacingsPx.lg};
+    padding: ${spacingsPx.sm} ${({ $spacingX }) => spacingsPx[$spacingX]};
 
     ${withFrameProps}
-
     ${variables.SCREEN_QUERY.MOBILE} {
         align-items: stretch;
         flex-direction: column;
@@ -72,10 +87,12 @@ const Wrapper = styled.div<WrapperParams>`
 export const Banner = ({
     children,
     className,
+    color = 'inherit',
     variant = DEFAULT_VARIANT,
     icon,
     filled = true,
     rightContent,
+    spacingX = 'lg',
     'data-testid': dataTest,
     ...rest
 }: BannerProps) => {
@@ -86,6 +103,7 @@ export const Banner = ({
 
     const isMobile = useMediaQuery(`(max-width: ${SCREEN_SIZE.SM})`);
 
+    // eslint-disable-next-line @typescript-eslint/no-shadow
     const ContentComponent = ({ children }: { children: ReactNode }) => {
         const commonProps = {
             justifyContent: 'space-between' as const,
@@ -110,6 +128,8 @@ export const Banner = ({
             className={className}
             $elevation={elevation}
             $filled={filled}
+            $spacingX={spacingX}
+            $color={color}
             data-testid={dataTest}
             {...frameProps}
         >
diff --git a/packages/components/src/components/Banner/BannerContext.ts b/packages/components/src/components/Banner/BannerContext.ts
index cddde230cc2..58ba257eded 100644
--- a/packages/components/src/components/Banner/BannerContext.ts
+++ b/packages/components/src/components/Banner/BannerContext.ts
@@ -1,4 +1,5 @@
 import { createContext, useContext } from 'react';
+
 import { BannerVariant } from './types';
 
 export const BannerContext = createContext<{
diff --git a/packages/components/src/components/Banner/utils.tsx b/packages/components/src/components/Banner/utils.tsx
index ded9531ee3d..ea4165229d4 100644
--- a/packages/components/src/components/Banner/utils.tsx
+++ b/packages/components/src/components/Banner/utils.tsx
@@ -1,6 +1,8 @@
+import { DefaultTheme } from 'styled-components';
+
 import { Color, CSSColor, Elevation, mapElevationToBackgroundToken } from '@trezor/theme';
+
 import { BannerVariant } from './types';
-import { DefaultTheme } from 'styled-components';
 import { IconName } from '../Icon/Icon';
 
 type MapArgs = {
diff --git a/packages/components/src/components/Card/Card.stories.tsx b/packages/components/src/components/Card/Card.stories.tsx
index cf82770cc85..46d13292a32 100644
--- a/packages/components/src/components/Card/Card.stories.tsx
+++ b/packages/components/src/components/Card/Card.stories.tsx
@@ -1,5 +1,7 @@
 import { Meta, StoryObj } from '@storybook/react';
-import { Card as CardComponent, allowedCardFrameProps, paddingTypes } from './Card';
+
+import { Card as CardComponent, allowedCardFrameProps } from './Card';
+import { paddingTypes, fillTypes } from './types';
 import { getFramePropsStory } from '../../utils/frameProps';
 
 const meta: Meta = {
@@ -10,18 +12,48 @@ export default meta;
 
 export const Card: StoryObj = {
     args: {
-        children: 'Some content',
+        children: (
+            <p>
+                Quos delectus veritatis est doloribus dolor. Odit fugit omnis magni ipsam quia rem
+                aut. Et alias sint non. Consequuntur dignissimos veritatis debitis corporis esse.
+                Quaerat voluptatem unde aut. Iusto laborum omnis quis amet atque. Sint culpa
+                delectus non soluta temporibus saepe. Sequi saepe corrupti aliquam ut sit assumenda
+                aspernatur consequuntur. Ut est ullam iusto facilis voluptatibus. Sit est cum quos.
+                Quasi deleniti non fugit iste alias consequuntur. Ullam ad ut culpa est reiciendis
+                molestiae. Reiciendis ab veritatis a totam inventore nihil voluptatem occaecati.
+                Quisquam atque odit quia nam. Laboriosam rem et ut. Maxime qui voluptatem
+                voluptatem.
+            </p>
+        ),
         label: '',
         paddingType: 'normal',
+        fillType: 'default',
+        isHiglighted: false,
         ...getFramePropsStory(allowedCardFrameProps).args,
     },
     argTypes: {
+        onClick: {
+            options: ['onClick'],
+            control: { type: 'select' },
+            mapping: { onClick: () => {} },
+        },
         paddingType: {
             options: paddingTypes,
             control: {
                 type: 'radio',
             },
         },
+        fillType: {
+            options: fillTypes,
+            control: {
+                type: 'radio',
+            },
+        },
+        isHiglighted: {
+            control: {
+                type: 'boolean',
+            },
+        },
         ...getFramePropsStory(allowedCardFrameProps).argTypes,
     },
 };
diff --git a/packages/components/src/components/Card/Card.tsx b/packages/components/src/components/Card/Card.tsx
index b67f5b6ba71..aa25ce8c267 100644
--- a/packages/components/src/components/Card/Card.tsx
+++ b/packages/components/src/components/Card/Card.tsx
@@ -1,7 +1,10 @@
 import { forwardRef, HTMLAttributes, ReactNode } from 'react';
+
 import styled, { css } from 'styled-components';
-import { borders, Elevation, mapElevationToBackground, spacingsPx } from '@trezor/theme';
-import { ElevationContext, useElevation } from '../ElevationContext/ElevationContext';
+
+import { borders, Elevation, spacingsPx } from '@trezor/theme';
+
+import { ElevationUp, useElevation } from '../ElevationContext/ElevationContext';
 import {
     FrameProps,
     FramePropsKeys,
@@ -10,13 +13,8 @@ import {
 } from '../../utils/frameProps';
 import { TransientProps } from '../../utils/transientProps';
 import { AccessibilityProps, withAccessibilityProps } from '../../utils/accessibilityProps';
-
-export const paddingTypes = ['small', 'none', 'normal', 'large'] as const;
-export type PaddingType = (typeof paddingTypes)[number];
-
-type MapArgs = {
-    $paddingType: PaddingType;
-};
+import { PaddingType, FillType } from './types';
+import { mapPaddingTypeToLabelPadding, mapPaddingTypeToPadding, mapFillTypeToCSS } from './utils';
 
 export const allowedCardFrameProps = [
     'margin',
@@ -30,30 +28,11 @@ export const allowedCardFrameProps = [
 ] as const satisfies FramePropsKeys[];
 type AllowedFrameProps = Pick<FrameProps, (typeof allowedCardFrameProps)[number]>;
 
-const mapPaddingTypeToLabelPadding = ({ $paddingType }: MapArgs): number | string => {
-    const paddingMap: Record<PaddingType, number | string> = {
-        none: `${spacingsPx.xxs} 0`,
-        small: `${spacingsPx.xxs} ${spacingsPx.sm}`,
-        normal: `${spacingsPx.xs} ${spacingsPx.lg}`,
-        large: `${spacingsPx.sm} ${spacingsPx.xl}`,
-    };
-
-    return paddingMap[$paddingType];
-};
-const mapPaddingTypeToPadding = ({ $paddingType }: MapArgs): number | string => {
-    const paddingMap: Record<PaddingType, number | string> = {
-        none: 0,
-        small: spacingsPx.sm,
-        normal: spacingsPx.lg,
-        large: spacingsPx.xl,
-    };
-
-    return paddingMap[$paddingType];
-};
-
-const Container = styled.div<TransientProps<AllowedFrameProps>>`
+const Container = styled.div<{ $fillType: FillType } & TransientProps<AllowedFrameProps>>`
+    width: 100%;
     border-radius: ${borders.radii.md};
-    background: ${({ theme }) => theme.backgroundTertiaryDefaultOnElevation0};
+    background: ${({ theme, $fillType }) =>
+        $fillType !== 'none' && theme.backgroundTertiaryDefaultOnElevation0};
     padding: ${spacingsPx.xxxs};
 
     ${withFrameProps}
@@ -68,86 +47,90 @@ const CardContainer = styled.div<
     {
         $elevation: Elevation;
         $paddingType: PaddingType;
+        $fillType: FillType;
         $isClickable: boolean;
+        $isHiglighted: boolean;
+        $hasLabel: boolean;
     } & TransientProps<AllowedFrameProps>
 >`
-    display: flex;
     width: 100%;
+    display: flex;
     flex-direction: column;
+    position: relative;
     padding: ${mapPaddingTypeToPadding};
-    background: ${mapElevationToBackground};
     border-radius: ${borders.radii.md};
-
-    ${({ $isClickable, theme }) =>
-        $isClickable &&
-        `
-    &:hover {
-        box-shadow: ${theme.boxShadowElevated};
-        cursor: pointer;
-    }
-    `}
-
-    box-shadow: ${({ theme, $elevation }) => $elevation === 1 && theme.boxShadowBase};
-
-    ${({ onClick, theme }) =>
-        onClick !== undefined
-            ? css`
-                  &:hover {
-                      cursor: pointer;
-
-                      box-shadow: ${() => theme.boxShadowElevated};
-                  }
-              `
-            : ''}
-
-    /* when theme changes from light to dark */
-    transition: background 0.3s, box-shadow 0.2s;
-
+    transition:
+        background 0.3s,
+        box-shadow 0.2s,
+        border-color 0.2s;
+    cursor: ${({ $isClickable }) => ($isClickable ? 'pointer' : 'default')};
+
+    ${({ theme, $isHiglighted, $paddingType }) =>
+        $isHiglighted &&
+        css`
+            overflow: hidden;
+            padding-left: calc(${spacingsPx.xxs} + ${mapPaddingTypeToPadding({ $paddingType })});
+
+            &::before {
+                content: '';
+                position: absolute;
+                left: 0;
+                top: 0;
+                bottom: 0;
+                width: ${spacingsPx.xxs};
+                background: ${theme.backgroundSecondaryDefault};
+            }
+        `}
+
+    ${mapFillTypeToCSS}
     ${withFrameProps}
 `;
 
 type CommonCardProps = AccessibilityProps & {
     paddingType?: PaddingType;
+    fillType?: FillType;
     onMouseEnter?: HTMLAttributes<HTMLDivElement>['onMouseEnter'];
     onMouseLeave?: HTMLAttributes<HTMLDivElement>['onMouseLeave'];
     onClick?: HTMLAttributes<HTMLDivElement>['onClick'];
     children?: ReactNode;
     className?: string;
     label?: ReactNode;
-    forceElevation?: Elevation;
+    isHiglighted?: boolean;
     'data-testid'?: string;
 };
 
 export type CardPropsWithTransientProps = CommonCardProps & TransientProps<AllowedFrameProps>;
 export type CardProps = CommonCardProps & AllowedFrameProps;
 
-const CardComponent = forwardRef<
-    HTMLDivElement,
-    CardPropsWithTransientProps & { $paddingType: PaddingType }
->(
+const CardComponent = forwardRef<HTMLDivElement, CardPropsWithTransientProps>(
     (
         {
             children,
-            forceElevation,
-            $paddingType,
+            paddingType = 'normal',
+            fillType = 'default',
             onClick,
             onMouseEnter,
             onMouseLeave,
             className,
             tabIndex,
+            label,
+            isHiglighted = false,
             'data-testid': dataTest,
             ...rest
         },
         ref,
     ) => {
-        const { elevation } = useElevation(forceElevation);
+        const { elevation } = useElevation();
 
         return (
             <CardContainer
                 ref={ref}
                 $elevation={elevation}
-                $paddingType={$paddingType}
+                $paddingType={paddingType}
+                $fillType={fillType}
                 $isClickable={Boolean(onClick)}
+                $isHiglighted={isHiglighted}
+                $hasLabel={Boolean(label)}
                 onClick={onClick}
                 onMouseEnter={onMouseEnter}
                 className={className}
@@ -156,7 +139,7 @@ const CardComponent = forwardRef<
                 {...rest}
                 data-testid={dataTest}
             >
-                <ElevationContext baseElevation={elevation}>{children}</ElevationContext>
+                {fillType === 'none' ? children : <ElevationUp>{children}</ElevationUp>}
             </CardContainer>
         );
     },
@@ -166,6 +149,7 @@ export const Card = forwardRef<HTMLDivElement, CardProps>(
     (
         {
             paddingType = 'normal',
+            fillType = 'default',
             label,
             onClick,
             onMouseEnter,
@@ -174,6 +158,7 @@ export const Card = forwardRef<HTMLDivElement, CardProps>(
             tabIndex,
             children,
             'data-testid': dataTest,
+            isHiglighted,
             ...rest
         },
         ref,
@@ -184,14 +169,17 @@ export const Card = forwardRef<HTMLDivElement, CardProps>(
             onMouseLeave,
             className,
             tabIndex,
-            $paddingType: paddingType,
+            paddingType,
+            fillType,
             children,
+            label,
+            isHiglighted,
             'data-testid': dataTest,
         };
         const frameProps = pickAndPrepareFrameProps(rest, allowedCardFrameProps);
 
         return label ? (
-            <Container {...frameProps}>
+            <Container $fillType={fillType} {...frameProps}>
                 <LabelContainer $paddingType={paddingType}>{label}</LabelContainer>
                 <CardComponent {...commonProps} ref={ref} />
             </Container>
diff --git a/packages/components/src/components/Card/types.tsx b/packages/components/src/components/Card/types.tsx
new file mode 100644
index 00000000000..dd37487f9f0
--- /dev/null
+++ b/packages/components/src/components/Card/types.tsx
@@ -0,0 +1,5 @@
+export const paddingTypes = ['small', 'none', 'normal', 'large'] as const;
+export type PaddingType = (typeof paddingTypes)[number];
+
+export const fillTypes = ['none', 'default'] as const;
+export type FillType = (typeof fillTypes)[number];
diff --git a/packages/components/src/components/Card/utils.tsx b/packages/components/src/components/Card/utils.tsx
new file mode 100644
index 00000000000..7ab24439420
--- /dev/null
+++ b/packages/components/src/components/Card/utils.tsx
@@ -0,0 +1,72 @@
+import { css, DefaultTheme, RuleSet } from 'styled-components';
+
+import {
+    spacingsPx,
+    Elevation,
+    mapElevationToBackground,
+    mapElevationToBorder,
+    SpacingPxValues,
+} from '@trezor/theme';
+
+import { PaddingType, FillType } from './types';
+
+type PaddingMapArgs = {
+    $paddingType: PaddingType;
+};
+
+type FillTypeMapArgs = {
+    $fillType: FillType;
+    $elevation: Elevation;
+    $isClickable: boolean;
+    $hasLabel: boolean;
+    theme: DefaultTheme;
+};
+
+export const mapPaddingTypeToLabelPadding = ({ $paddingType }: PaddingMapArgs): string => {
+    const paddingMap: Record<PaddingType, string> = {
+        none: `${spacingsPx.xxs} 0`,
+        small: `${spacingsPx.xxs} ${spacingsPx.sm}`,
+        normal: `${spacingsPx.xs} ${spacingsPx.lg}`,
+        large: `${spacingsPx.sm} ${spacingsPx.xl}`,
+    };
+
+    return paddingMap[$paddingType];
+};
+
+export const mapPaddingTypeToPadding = ({ $paddingType }: PaddingMapArgs): SpacingPxValues => {
+    const paddingMap: Record<PaddingType, SpacingPxValues> = {
+        none: '0px',
+        small: spacingsPx.sm,
+        normal: spacingsPx.lg,
+        large: spacingsPx.xl,
+    };
+
+    return paddingMap[$paddingType];
+};
+
+export const mapFillTypeToCSS = ({
+    $fillType,
+    $elevation,
+    $isClickable,
+    $hasLabel,
+    theme,
+}: FillTypeMapArgs): RuleSet<object> => {
+    const cssMap: Record<FillType, RuleSet<object>> = {
+        default: css`
+            background: ${mapElevationToBackground({ $elevation, theme })};
+            box-shadow: ${$elevation === 1 && !$hasLabel && theme.boxShadowBase};
+
+            ${$isClickable &&
+            css`
+                &:hover {
+                    box-shadow: ${$elevation === 1 && theme.boxShadowElevated};
+                }
+            `}
+        `,
+        none: css`
+            border: 1px solid ${mapElevationToBorder({ $elevation, theme })};
+        `,
+    };
+
+    return cssMap[$fillType];
+};
diff --git a/packages/components/src/components/CollapsibleBox/CollapsibleBox.stories.tsx b/packages/components/src/components/CollapsibleBox/CollapsibleBox.stories.tsx
index f782c0bd909..80a051a02d5 100644
--- a/packages/components/src/components/CollapsibleBox/CollapsibleBox.stories.tsx
+++ b/packages/components/src/components/CollapsibleBox/CollapsibleBox.stories.tsx
@@ -24,6 +24,9 @@ export const CollapsibleBox: StoryObj = {
             </p>
         ),
         hasDivider: true,
+        fillType: 'default',
+        paddingType: 'normal',
+        headingSize: 'large',
         ...getFramePropsStory(allowedCollapsibleBoxFrameProps).args,
     },
     argTypes: {
@@ -34,19 +37,19 @@ export const CollapsibleBox: StoryObj = {
         hasDivider: { type: 'boolean' },
         fillType: {
             control: {
-                type: 'select',
+                type: 'radio',
             },
             options: fillTypes,
         },
         paddingType: {
             control: {
-                type: 'select',
+                type: 'radio',
             },
             options: paddingTypes,
         },
         headingSize: {
             control: {
-                type: 'select',
+                type: 'radio',
             },
             options: headingSizes,
         },
diff --git a/packages/components/src/components/CollapsibleBox/CollapsibleBox.tsx b/packages/components/src/components/CollapsibleBox/CollapsibleBox.tsx
index 90990b206a0..3f6dfaca3db 100644
--- a/packages/components/src/components/CollapsibleBox/CollapsibleBox.tsx
+++ b/packages/components/src/components/CollapsibleBox/CollapsibleBox.tsx
@@ -1,6 +1,8 @@
 import { useState, ReactNode, MouseEvent } from 'react';
+
 import { motion } from 'framer-motion';
 import styled, { css } from 'styled-components';
+
 import {
     spacingsPx,
     borders,
@@ -9,9 +11,9 @@ import {
     mapElevationToBorder,
     spacings,
 } from '@trezor/theme';
+
 import { Icon } from '../Icon/Icon';
 import { Row, Column } from '../Flex/Flex';
-import { Paragraph } from '../typography/Paragraph/Paragraph';
 import { Text } from '../typography/Text/Text';
 import { motionEasing } from '../../config/motion';
 import { ElevationUp, useElevation } from './../ElevationContext/ElevationContext';
@@ -83,7 +85,6 @@ export type CollapsibleBoxProps = AllowedFrameProps & {
 };
 
 const Container = styled.div<TransientProps<AllowedFrameProps> & ContainerProps>`
-    flex: 1;
     width: 100%;
     border-radius: ${borders.radii.sm};
     transition: background 0.3s;
@@ -175,6 +176,51 @@ export const CollapsibleBox = ({
         setIsOpen(!isOpen);
     };
 
+    const headerContent = (
+        <Row gap={spacings.xs} justifyContent="space-between">
+            <Column alignItems="flex-start">
+                <Text
+                    as="div"
+                    typographyStyle={mapSizeToHeadingTypography({
+                        $headingSize: headingSize,
+                    })}
+                >
+                    {heading}
+                </Text>
+                {subHeading && (
+                    <Text
+                        as="div"
+                        typographyStyle={mapSizeToSubheadingTypography({
+                            $headingSize: headingSize,
+                        })}
+                        variant="tertiary"
+                    >
+                        {subHeading}
+                    </Text>
+                )}
+            </Column>
+            <Toggle>
+                <Row gap={spacings.sm}>
+                    {toggleLabel && (
+                        <Text typographyStyle="hint" variant="tertiary">
+                            {toggleLabel}
+                        </Text>
+                    )}
+                    <IconWrapper $isCollapsed={!isOpen}>
+                        {toggleComponent ?? (
+                            <Icon
+                                name="caretCircleDown"
+                                size={mapSizeToIconSize({ $headingSize: headingSize })}
+                                data-testid={`@collapsible-box/icon-${isOpen ? 'expanded' : 'collapsed'}`}
+                                variant="tertiary"
+                            />
+                        )}
+                    </IconWrapper>
+                </Row>
+            </Toggle>
+        </Row>
+    );
+
     return (
         <Container
             {...frameProps}
@@ -184,46 +230,7 @@ export const CollapsibleBox = ({
             data-testid={dataTest}
         >
             <Header $paddingType={paddingType} onClick={onClick}>
-                <Row gap={spacings.xs} justifyContent="space-between">
-                    <Column alignItems="flex-start">
-                        <Paragraph
-                            typographyStyle={mapSizeToHeadingTypography({
-                                $headingSize: headingSize,
-                            })}
-                        >
-                            {heading}
-                        </Paragraph>
-                        {subHeading && (
-                            <Paragraph
-                                variant="tertiary"
-                                typographyStyle={mapSizeToSubheadingTypography({
-                                    $headingSize: headingSize,
-                                })}
-                            >
-                                {subHeading}
-                            </Paragraph>
-                        )}
-                    </Column>
-                    <Toggle>
-                        <Row gap={spacings.sm}>
-                            {toggleLabel && (
-                                <Text typographyStyle="hint" variant="tertiary">
-                                    {toggleLabel}
-                                </Text>
-                            )}
-                            <IconWrapper $isCollapsed={!isOpen}>
-                                {toggleComponent ?? (
-                                    <Icon
-                                        name="caretCircleDown"
-                                        size={mapSizeToIconSize({ $headingSize: headingSize })}
-                                        data-testid={`@collapsible-box/icon-${isOpen ? 'expanded' : 'collapsed'}`}
-                                        variant="tertiary"
-                                    />
-                                )}
-                            </IconWrapper>
-                        </Row>
-                    </Toggle>
-                </Row>
+                {fillType === 'none' ? headerContent : <ElevationUp>{headerContent}</ElevationUp>}
             </Header>
             <Collapser
                 initial={false} // Prevents animation on mount when expanded === false
@@ -240,7 +247,7 @@ export const CollapsibleBox = ({
                 data-testid="@collapsible-box/body"
             >
                 <Content $elevation={elevation} $paddingType={paddingType} $hasDivider={hasDivider}>
-                    <ElevationUp>{children}</ElevationUp>
+                    {fillType === 'none' ? children : <ElevationUp>{children}</ElevationUp>}
                 </Content>
             </Collapser>
         </Container>
diff --git a/packages/components/src/components/CollapsibleBox/utils.tsx b/packages/components/src/components/CollapsibleBox/utils.tsx
index 6691b9a7b68..4d107dfb60b 100644
--- a/packages/components/src/components/CollapsibleBox/utils.tsx
+++ b/packages/components/src/components/CollapsibleBox/utils.tsx
@@ -1,4 +1,5 @@
 import { spacingsPx, TypographyStyle } from '@trezor/theme';
+
 import { HeadingSize, PaddingType } from './types';
 import { IconSize } from '../Icon/Icon';
 
diff --git a/packages/components/src/components/ComponentWithSubIcon/ComponentWithSubIcon.stories.tsx b/packages/components/src/components/ComponentWithSubIcon/ComponentWithSubIcon.stories.tsx
index 6cc42af8c57..74c18b1bf77 100644
--- a/packages/components/src/components/ComponentWithSubIcon/ComponentWithSubIcon.stories.tsx
+++ b/packages/components/src/components/ComponentWithSubIcon/ComponentWithSubIcon.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { Icon, iconVariants } from '../Icon/Icon';
 import {
     allowedComponentWithSubIconFrameProps,
diff --git a/packages/components/src/components/ComponentWithSubIcon/ComponentWithSubIcon.tsx b/packages/components/src/components/ComponentWithSubIcon/ComponentWithSubIcon.tsx
index 32125d7d71f..632436ff1db 100644
--- a/packages/components/src/components/ComponentWithSubIcon/ComponentWithSubIcon.tsx
+++ b/packages/components/src/components/ComponentWithSubIcon/ComponentWithSubIcon.tsx
@@ -1,4 +1,9 @@
+import { ReactNode } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
+import { borders, spacingsPx } from '@trezor/theme';
+
 import {
     ExclusiveColorOrVariant,
     getColorForIconVariant,
@@ -6,9 +11,7 @@ import {
     Icon,
     IconProps,
 } from '../Icon/Icon';
-import { borders, spacingsPx } from '@trezor/theme';
 import { TransientProps } from '../../utils/transientProps';
-import { ReactNode } from 'react';
 import {
     FramePropsKeys,
     FrameProps,
diff --git a/packages/components/src/components/DataAnalytics.tsx b/packages/components/src/components/DataAnalytics.tsx
index 665c8c2ee05..b3f6cab5042 100644
--- a/packages/components/src/components/DataAnalytics.tsx
+++ b/packages/components/src/components/DataAnalytics.tsx
@@ -1,13 +1,15 @@
 import { Fragment, useState, ReactNode } from 'react';
+import { FormattedMessage } from 'react-intl';
+
 import styled from 'styled-components';
 
-import { FormattedMessage } from 'react-intl';
+import { spacingsPx } from '@trezor/theme';
+
 import { variables } from '../config';
 import { Button } from './buttons/Button/Button';
 import { CollapsibleBox } from './CollapsibleBox/CollapsibleBox';
 import { Card } from './Card/Card';
 import { Switch } from './form/Switch/Switch';
-import { spacingsPx } from '@trezor/theme';
 
 const Wrapper = styled.div`
     display: flex;
@@ -30,7 +32,6 @@ const ButtonWrapper = styled.div`
     align-self: center;
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
 const StyledButton = styled(Button)`
     min-width: 180px;
 `;
diff --git a/packages/components/src/components/Divider/Divider.stories.tsx b/packages/components/src/components/Divider/Divider.stories.tsx
index c93e77fd5e4..41faa6ccc28 100644
--- a/packages/components/src/components/Divider/Divider.stories.tsx
+++ b/packages/components/src/components/Divider/Divider.stories.tsx
@@ -1,6 +1,7 @@
 import { Meta, StoryObj } from '@storybook/react';
-import { Divider as DividerComponent, allowedDividerFrameProps } from './Divider';
 import styled from 'styled-components';
+
+import { Divider as DividerComponent, allowedDividerFrameProps } from './Divider';
 import { getFramePropsStory } from '../../utils/frameProps';
 
 const Container = styled.div`
@@ -35,7 +36,7 @@ export const Divider: StoryObj = {
             type: 'number',
         },
         color: {
-            type: 'string',
+            control: 'color',
         },
         ...getFramePropsStory(allowedDividerFrameProps).argTypes,
     },
diff --git a/packages/components/src/components/Divider/Divider.tsx b/packages/components/src/components/Divider/Divider.tsx
index 3df4fcd2552..04b78ec99f3 100644
--- a/packages/components/src/components/Divider/Divider.tsx
+++ b/packages/components/src/components/Divider/Divider.tsx
@@ -1,5 +1,7 @@
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
+
 import { Color, Elevation, mapElevationToBorder, spacings } from '@trezor/theme';
+
 import { useElevation } from '../ElevationContext/ElevationContext';
 import {
     FrameProps,
@@ -8,13 +10,16 @@ import {
     withFrameProps,
 } from '../../utils/frameProps';
 import { TransientProps } from '../../utils/transientProps';
-import { allowedHeadingFrameProps } from '../typography/Heading/Heading';
 
-export const allowedDividerFrameProps = ['margin'] as const satisfies FramePropsKeys[];
+export const allowedDividerFrameProps = [
+    'margin',
+    'width',
+    'overflow',
+] as const satisfies FramePropsKeys[];
 type AllowedFrameProps = Pick<FrameProps, (typeof allowedDividerFrameProps)[number]>;
 type DividerOrientation = 'horizontal' | 'vertical';
 
-type DividerProps = AllowedFrameProps & {
+export type DividerProps = AllowedFrameProps & {
     orientation?: DividerOrientation;
     strokeWidth?: number;
     color?: Color;
@@ -30,15 +35,16 @@ const Line = styled.div<
 >`
     ${({ $orientation, $strokeWidth }) =>
         $orientation === 'vertical'
-            ? `
-                height: 100%;
-                width: ${$strokeWidth}px;
-                min-width: ${$strokeWidth}px;`
-            : `
-                width: 100%;
-                height: ${$strokeWidth}px;
-                min-height: ${$strokeWidth}px;
-    `}
+            ? css`
+                  height: 100%;
+                  width: ${$strokeWidth}px;
+                  min-width: ${$strokeWidth}px;
+              `
+            : css`
+                  width: 100%;
+                  height: ${$strokeWidth}px;
+                  min-height: ${$strokeWidth}px;
+              `}
 
     background: ${({ theme, $elevation, $color }) =>
         $color ? theme[$color] : mapElevationToBorder({ theme, $elevation })};
@@ -56,7 +62,7 @@ export const Divider = ({
 
     const frameProps = pickAndPrepareFrameProps(
         { ...rest, margin: rest.margin ?? { top: spacings.md, bottom: spacings.md } },
-        allowedHeadingFrameProps,
+        allowedDividerFrameProps,
     );
 
     return (
diff --git a/packages/components/src/components/Dropdown/Dropdown.stories.tsx b/packages/components/src/components/Dropdown/Dropdown.stories.tsx
index f5b6becf2ed..97f48f9b6ad 100644
--- a/packages/components/src/components/Dropdown/Dropdown.stories.tsx
+++ b/packages/components/src/components/Dropdown/Dropdown.stories.tsx
@@ -1,6 +1,8 @@
 import React from 'react';
+
 import styled from 'styled-components';
 import { Meta, StoryObj } from '@storybook/react';
+
 import { Dropdown as DropdownComponent, DropdownProps } from './Dropdown';
 
 const Center = styled.div`
diff --git a/packages/components/src/components/Dropdown/Dropdown.tsx b/packages/components/src/components/Dropdown/Dropdown.tsx
index 0a18745ba6a..ff0d11c3a8c 100644
--- a/packages/components/src/components/Dropdown/Dropdown.tsx
+++ b/packages/components/src/components/Dropdown/Dropdown.tsx
@@ -11,8 +11,11 @@ import {
     useEffect,
 } from 'react';
 import { createPortal } from 'react-dom';
+
 import styled from 'styled-components';
+
 import { useOnClickOutside } from '@trezor/react-utils';
+
 import { Menu, MenuProps, DropdownMenuItemProps } from './Menu';
 import { Coords, getAdjustedCoords } from './getAdjustedCoords';
 import { IconButton } from '../buttons/IconButton/IconButton';
@@ -124,7 +127,7 @@ export const Dropdown = forwardRef(
                 return;
             }
 
-            const { width, height } = menuRef.current?.getBoundingClientRect();
+            const { width, height } = menuRef.current.getBoundingClientRect();
 
             const adjustedCoords = getAdjustedCoords({
                 coords: coordsToUse,
@@ -149,9 +152,9 @@ export const Dropdown = forwardRef(
             }
         }, [isToggled, content]);
 
-        const setToggled = (isToggled: boolean) => {
-            if (onToggle) onToggle(isToggled);
-            setIsToggledState(isToggled);
+        const setToggled = (isToggled2: boolean) => {
+            if (onToggle) onToggle(isToggled2);
+            setIsToggledState(isToggled2);
         };
 
         useImperativeHandle(ref, () => ({
diff --git a/packages/components/src/components/Dropdown/Menu.tsx b/packages/components/src/components/Dropdown/Menu.tsx
index 646fc96df97..cd2c1218a0f 100644
--- a/packages/components/src/components/Dropdown/Menu.tsx
+++ b/packages/components/src/components/Dropdown/Menu.tsx
@@ -1,5 +1,7 @@
 import React, { forwardRef, useEffect, useState } from 'react';
+
 import styled, { css, keyframes, useTheme } from 'styled-components';
+
 import {
     borders,
     spacings,
@@ -9,6 +11,7 @@ import {
     mapElevationToBackground,
     nextElevation,
 } from '@trezor/theme';
+
 import type { Coords } from './getAdjustedCoords';
 import { menuStyle } from './menuStyle';
 import { useElevation } from '../ElevationContext/ElevationContext';
@@ -270,11 +273,11 @@ const getNextIndex =
                 nextIndex = getPrevIndex(nextIndex);
             }
         } else if (keyboardKey === 'ArrowDown') {
-            const getNextIndex = (current: number) => (current < lastIndex ? current + 1 : 0);
-            nextIndex = getNextIndex(nextIndex);
+            const getNextIndex2 = (current: number) => (current < lastIndex ? current + 1 : 0);
+            nextIndex = getNextIndex2(nextIndex);
             // skip disabled items
             while (flatGroupItems[nextIndex].isDisabled) {
-                nextIndex = getNextIndex(nextIndex);
+                nextIndex = getNextIndex2(nextIndex);
             }
         }
 
diff --git a/packages/components/src/components/Dropdown/menuStyle.ts b/packages/components/src/components/Dropdown/menuStyle.ts
index 773550a5db5..4d9bcf01b61 100644
--- a/packages/components/src/components/Dropdown/menuStyle.ts
+++ b/packages/components/src/components/Dropdown/menuStyle.ts
@@ -1,4 +1,5 @@
 import { css, keyframes } from 'styled-components';
+
 import {
     spacingsPx,
     borders,
diff --git a/packages/components/src/components/ElevationContext/ElevationContext.stories.tsx b/packages/components/src/components/ElevationContext/ElevationContext.stories.tsx
index 859b816350b..5159c0dea27 100644
--- a/packages/components/src/components/ElevationContext/ElevationContext.stories.tsx
+++ b/packages/components/src/components/ElevationContext/ElevationContext.stories.tsx
@@ -1,7 +1,18 @@
+import { ReactNode } from 'react';
+
 import { Meta, StoryObj } from '@storybook/react';
+import styled from 'styled-components';
+
+import {
+    Elevation,
+    borders,
+    mapElevationToBackground,
+    mapElevationToBorder,
+    spacingsPx,
+} from '@trezor/theme';
+
 import { Card } from '../Card/Card';
 import { Modal } from '../modals/Modal/Modal';
-import styled from 'styled-components';
 import { Textarea } from '../form/Textarea/Textarea';
 import {
     useElevation,
@@ -9,14 +20,6 @@ import {
     ElevationDown,
     ElevationUp,
 } from './ElevationContext';
-import {
-    Elevation,
-    borders,
-    mapElevationToBackground,
-    mapElevationToBorder,
-    spacingsPx,
-} from '@trezor/theme';
-import { ReactNode } from 'react';
 
 const UiBox = styled.div<{ $elevation: Elevation }>`
     background-color: ${mapElevationToBackground};
@@ -109,12 +112,12 @@ export const ElevationContext: StoryObj = {
 
             <Background>
                 <Card>
-                    Card and Textarea inside it wrapped in the "extender" component with same
-                    elevation as the Textarea has.
+                    Card and Textarea inside it wrapped in the &quot;extender&quot; component with
+                    same elevation as the Textarea has.
                     <TextareaExtender>
                         <Textarea>
-                            "If you don’t believe it or don’t get it, I don’t have the time to try
-                            to convince you, sorry." ― Satoshi Nakamoto
+                            &quot;If you don’t believe it or don’t get it, I don’t have the time to
+                            try to convince you, sorry.&quot; ― Satoshi Nakamoto
                         </Textarea>
                     </TextareaExtender>
                 </Card>
diff --git a/packages/components/src/components/ElevationContext/ElevationContext.tsx b/packages/components/src/components/ElevationContext/ElevationContext.tsx
index cea2ee7011b..291f5834c68 100644
--- a/packages/components/src/components/ElevationContext/ElevationContext.tsx
+++ b/packages/components/src/components/ElevationContext/ElevationContext.tsx
@@ -1,7 +1,9 @@
-import { Elevation, nextElevation, prevElevation } from '@trezor/theme';
 import { ReactNode, createContext, useContext, useMemo } from 'react';
+
 import styled from 'styled-components';
 
+import { Elevation, nextElevation, prevElevation } from '@trezor/theme';
+
 const DEBUG = false;
 
 const ElevationReactContext = createContext<{
diff --git a/packages/components/src/components/Flag/Flag.stories.tsx b/packages/components/src/components/Flag/Flag.stories.tsx
index 603200398d0..ee375c2fccf 100644
--- a/packages/components/src/components/Flag/Flag.stories.tsx
+++ b/packages/components/src/components/Flag/Flag.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { Flag as FlagComponent } from './Flag';
 
 const meta: Meta = {
diff --git a/packages/components/src/components/Flag/Flag.tsx b/packages/components/src/components/Flag/Flag.tsx
index f0b2e7c4564..393f1000648 100644
--- a/packages/components/src/components/Flag/Flag.tsx
+++ b/packages/components/src/components/Flag/Flag.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { FLAGS } from './flags';
 
 export type FlagType = keyof typeof FLAGS;
diff --git a/packages/components/src/components/Flex/Flex.stories.tsx b/packages/components/src/components/Flex/Flex.stories.tsx
index 80e4a22729d..fd4cced5f86 100644
--- a/packages/components/src/components/Flex/Flex.stories.tsx
+++ b/packages/components/src/components/Flex/Flex.stories.tsx
@@ -1,4 +1,8 @@
 import { ArgTypes, Meta, StoryObj } from '@storybook/react';
+import styled from 'styled-components';
+
+import { spacings } from '@trezor/theme';
+
 import {
     FlexProps,
     flexAlignItems,
@@ -8,8 +12,6 @@ import {
     Column as ColumnComponent,
     allowedFlexFrameProps,
 } from './Flex';
-import { spacings } from '@trezor/theme';
-import styled from 'styled-components';
 import { getFramePropsStory } from '../../utils/frameProps';
 
 const Container = styled.div`
@@ -90,9 +92,9 @@ const meta: Meta = {
 export default meta;
 
 export const Row: StoryObj<FlexProps> = {
-    render: args => (
+    render: rowArgs => (
         <Container>
-            <RowComponent {...args} />
+            <RowComponent {...rowArgs} />
         </Container>
     ),
     args,
@@ -100,9 +102,9 @@ export const Row: StoryObj<FlexProps> = {
 };
 
 export const Column: StoryObj<FlexProps> = {
-    render: args => (
+    render: columnArgs => (
         <Container>
-            <ColumnComponent {...args} />
+            <ColumnComponent {...columnArgs} />
         </Container>
     ),
     args,
diff --git a/packages/components/src/components/Flex/Flex.tsx b/packages/components/src/components/Flex/Flex.tsx
index bb5635eee9a..8fec08e74ae 100644
--- a/packages/components/src/components/Flex/Flex.tsx
+++ b/packages/components/src/components/Flex/Flex.tsx
@@ -1,5 +1,9 @@
-import { Elevation, mapElevationToBorder, SpacingValues } from '@trezor/theme';
+import React from 'react';
+
 import styled, { css, DefaultTheme } from 'styled-components';
+
+import { Elevation, mapElevationToBorder, SpacingValues } from '@trezor/theme';
+
 import {
     FrameProps,
     FramePropsKeys,
@@ -8,13 +12,13 @@ import {
 } from '../../utils/frameProps';
 import { makePropsTransient, TransientProps } from '../../utils/transientProps';
 import { useElevation } from '../ElevationContext/ElevationContext';
-import React from 'react';
 
 export const allowedFlexFrameProps = [
     'margin',
     'width',
     'height',
     'minHeight',
+    'maxWidth',
     'overflow',
 ] as const satisfies FramePropsKeys[];
 type AllowedFrameProps = Pick<FrameProps, (typeof allowedFlexFrameProps)[number]>;
@@ -112,6 +116,7 @@ type ContainerProps = TransientProps<AllowedFrameProps> & {
     $direction: FlexDirection;
     $flex: Flex;
     $flexWrap: FlexWrap;
+    $order?: number;
     $isReversed: boolean;
     $hasDivider: boolean;
     $dividerColor?: string;
@@ -127,6 +132,7 @@ const Container = styled.div<ContainerProps>`
     gap: ${({ $gap }) => $gap}px;
     justify-content: ${({ $justifyContent }) => $justifyContent};
     align-items: ${({ $alignItems }) => $alignItems};
+    ${({ $order }) => (typeof $order !== 'undefined' ? `order: ${$order};` : '')}
 
     ${({ $hasDivider, ...props }) => $hasDivider && withDivider(props)}
     ${withFrameProps}
@@ -140,6 +146,7 @@ export type FlexProps = AllowedFrameProps & {
     direction?: FlexDirection;
     flex?: Flex;
     flexWrap?: FlexWrap;
+    order?: number;
     isReversed?: boolean;
     hasDivider?: boolean;
     /** @deprecated Use only is case of absolute desperation. Prefer keep it according to elevation. */
@@ -147,19 +154,23 @@ export type FlexProps = AllowedFrameProps & {
     className?: string;
     onClick?: () => void;
     'data-testid'?: string;
+    as?: string;
 };
 
-const Flex = ({
+export const Flex = ({
     gap = 0,
     justifyContent = 'flex-start',
     alignItems = 'center',
     children,
     direction = 'row',
     flex = 'initial',
+    // eslint-disable-next-line @typescript-eslint/no-shadow
     flexWrap = 'nowrap',
+    order,
     isReversed = false,
     className,
     'data-testid': dataTestId,
+    as = 'div',
     hasDivider = false,
     dividerColor,
     onClick,
@@ -180,12 +191,14 @@ const Flex = ({
                 direction,
                 flex,
                 flexWrap,
+                order,
                 isReversed,
                 hasDivider,
                 dividerColor,
                 elevation,
             })}
             onClick={onClick}
+            as={as}
             {...frameProps}
         >
             {children}
diff --git a/packages/components/src/components/GradientOverlay/GradientOverlay.stories.tsx b/packages/components/src/components/GradientOverlay/GradientOverlay.stories.tsx
index db8cc9b3416..2d7eda6a8f5 100644
--- a/packages/components/src/components/GradientOverlay/GradientOverlay.stories.tsx
+++ b/packages/components/src/components/GradientOverlay/GradientOverlay.stories.tsx
@@ -1,9 +1,10 @@
 import { Meta, StoryObj } from '@storybook/react';
+import styled from 'styled-components';
+
 import {
     GradientOverlay as GradientOverlayComponent,
     GradientOverlayProps,
 } from './GradientOverlay';
-import styled from 'styled-components';
 import { Card } from '../Card/Card';
 import { ElevationContext } from '../ElevationContext/ElevationContext';
 
diff --git a/packages/components/src/components/GradientOverlay/GradientOverlay.tsx b/packages/components/src/components/GradientOverlay/GradientOverlay.tsx
index b399bb68c51..f0d0c8874b5 100644
--- a/packages/components/src/components/GradientOverlay/GradientOverlay.tsx
+++ b/packages/components/src/components/GradientOverlay/GradientOverlay.tsx
@@ -1,5 +1,7 @@
-import { Elevation, mapElevationToBackground } from '@trezor/theme';
 import styled from 'styled-components';
+
+import { Elevation, mapElevationToBackground } from '@trezor/theme';
+
 import { useElevation } from '../ElevationContext/ElevationContext';
 
 export interface GradientOverlayProps {
diff --git a/packages/components/src/components/Grid/Grid.stories.tsx b/packages/components/src/components/Grid/Grid.stories.tsx
index bc4c60cc523..3f0f37b7d92 100644
--- a/packages/components/src/components/Grid/Grid.stories.tsx
+++ b/packages/components/src/components/Grid/Grid.stories.tsx
@@ -1,7 +1,9 @@
 import { ArgTypes, Meta, StoryObj } from '@storybook/react';
-import { GridProps, Grid as GridComponent, allowedGridFrameProps } from './Grid';
-import { spacings } from '@trezor/theme';
 import styled from 'styled-components';
+
+import { spacings } from '@trezor/theme';
+
+import { GridProps, Grid as GridComponent, allowedGridFrameProps } from './Grid';
 import { getFramePropsStory } from '../../utils/frameProps';
 
 const Container = styled.div`
@@ -60,9 +62,9 @@ const meta: Meta = {
 export default meta;
 
 export const Grid: StoryObj<GridProps> = {
-    render: args => (
+    render: gridArgs => (
         <Container>
-            <GridComponent {...args} />
+            <GridComponent {...gridArgs} />
         </Container>
     ),
     args,
diff --git a/packages/components/src/components/Grid/Grid.tsx b/packages/components/src/components/Grid/Grid.tsx
index 26cbf3a1093..27d3a24a606 100644
--- a/packages/components/src/components/Grid/Grid.tsx
+++ b/packages/components/src/components/Grid/Grid.tsx
@@ -1,5 +1,7 @@
-import { SpacingValues } from '@trezor/theme';
 import styled from 'styled-components';
+
+import { SpacingValues } from '@trezor/theme';
+
 import { FrameProps, FramePropsKeys, withFrameProps } from '../../utils/frameProps';
 import { makePropsTransient, TransientProps } from '../../utils/transientProps';
 
diff --git a/packages/components/src/components/HotkeyBadge/HotkeyBadge.stories.tsx b/packages/components/src/components/HotkeyBadge/HotkeyBadge.stories.tsx
index 42e43595f90..90e3ad32595 100644
--- a/packages/components/src/components/HotkeyBadge/HotkeyBadge.stories.tsx
+++ b/packages/components/src/components/HotkeyBadge/HotkeyBadge.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { HotkeyBadge as HotkeyBadgeComponent, HotkeyBadgeProps } from './HotkeyBadge';
 
 const meta: Meta = {
diff --git a/packages/components/src/components/HotkeyBadge/HotkeyBadge.tsx b/packages/components/src/components/HotkeyBadge/HotkeyBadge.tsx
index 19ebd53f4a0..cc8553f28a6 100644
--- a/packages/components/src/components/HotkeyBadge/HotkeyBadge.tsx
+++ b/packages/components/src/components/HotkeyBadge/HotkeyBadge.tsx
@@ -1,3 +1,7 @@
+import { Fragment } from 'react';
+
+import styled from 'styled-components';
+
 import {
     Elevation,
     borders,
@@ -5,10 +9,9 @@ import {
     spacingsPx,
     typography,
 } from '@trezor/theme';
-import styled from 'styled-components';
+
 import { ElevationDown, useElevation } from '../ElevationContext/ElevationContext';
 import { Keys, keyboardKeys } from './keyboardKeys';
-import { Fragment } from 'react';
 
 export const Container = styled.div<{ $elevation: Elevation; $isActive: boolean }>`
     display: flex;
diff --git a/packages/components/src/components/Icon/Icon.stories.tsx b/packages/components/src/components/Icon/Icon.stories.tsx
index 595e387aae2..7c9d2518b41 100644
--- a/packages/components/src/components/Icon/Icon.stories.tsx
+++ b/packages/components/src/components/Icon/Icon.stories.tsx
@@ -1,4 +1,11 @@
 import { Meta, StoryObj } from '@storybook/react';
+
+import { IconName, icons } from '@suite-common/icons/src/icons';
+import {
+    icons as iconsDeprecated,
+    IconName as IconNameDeprecated,
+} from '@suite-common/icons-deprecated';
+
 import {
     allowedIconFrameProps,
     Icon as IconComponent,
@@ -6,12 +13,8 @@ import {
     iconVariants,
     iconSizes,
 } from './Icon';
-import { IconName, icons } from '@suite-common/icons';
-import {
-    icons as iconsDeprecated,
-    IconName as IconNameDeprecated,
-} from '@suite-common/icons-deprecated/src/webComponents';
 import { getFramePropsStory } from '../../utils/frameProps';
+
 const meta: Meta = {
     title: 'Icons',
     component: IconComponent,
@@ -55,6 +58,9 @@ export const Icon: StoryObj<IconProps> = {
                 type: 'select',
             },
         },
+        color: {
+            control: 'color',
+        },
         size: {
             options: iconSizes,
             control: {
diff --git a/packages/components/src/components/Icon/Icon.tsx b/packages/components/src/components/Icon/Icon.tsx
index 6ce0eb7c68c..62ce1458e3b 100644
--- a/packages/components/src/components/Icon/Icon.tsx
+++ b/packages/components/src/components/Icon/Icon.tsx
@@ -2,11 +2,12 @@ import { ReactSVG } from 'react-svg';
 import { forwardRef, MouseEvent, Ref } from 'react';
 
 import styled, { css, DefaultTheme } from 'styled-components';
+
 import {
     icons as iconsDeprecated,
     IconName as IconNameDeprecated,
-} from '@suite-common/icons-deprecated/src/webComponents';
-import { icons, IconName as IconNameNew } from '@suite-common/icons';
+} from '@suite-common/icons-deprecated';
+import { icons, IconName as IconNameNew } from '@suite-common/icons/src/icons';
 import { CSSColor, Color } from '@trezor/theme';
 
 import { UIVariant } from '../../config/types';
@@ -21,10 +22,12 @@ import {
 export const iconVariants = [
     'primary',
     'tertiary',
+    'default',
     'info',
     'warning',
     'destructive',
     'purple',
+    'disabled',
 ] as const;
 
 export type IconVariant = Extract<UIVariant, (typeof iconVariants)[number]> | 'purple';
@@ -34,7 +37,7 @@ export type ExclusiveColorOrVariant =
     | {
           variant?: undefined;
           /** @deprecated Use only is case of absolute desperation. Prefer using `variant`. */
-          color?: string;
+          color?: CSSColor;
       };
 
 export const allowedIconFrameProps = [
@@ -64,16 +67,15 @@ const variantColorMap: Record<IconVariant, Color> = {
     warning: 'iconAlertYellow',
     destructive: 'iconAlertRed',
     purple: 'iconAlertPurple',
+    default: 'iconDefault',
+    disabled: 'iconDisabled',
 };
 
 export const getColorForIconVariant = ({
     variant,
     theme,
     color,
-}: Pick<IconProps, 'color' | 'variant'> & { theme: DefaultTheme }):
-    | CSSColor
-    | 'inherit'
-    | string => {
+}: Pick<IconProps, 'color' | 'variant'> & { theme: DefaultTheme }): CSSColor => {
     if (color !== undefined) {
         return color;
     }
@@ -92,7 +94,6 @@ const SvgWrapper = styled.div<SvgWrapperProps & TransientProps<AllowedFrameProps
         css`
             cursor: pointer;
         `}
-
     path {
         fill: ${({ $variant, $color, theme }) =>
             getColorForIconVariant({ variant: $variant, color: $color, theme })};
@@ -124,19 +125,6 @@ const SVG = styled(ReactSVG)`
             stroke 0.15s,
             fill 0.15s;
     }
-
-    ${({ onClick }) =>
-        onClick &&
-        css`
-            cursor: pointer;
-
-            &:focus-visible {
-                svg {
-                    transition: opacity 0.2s;
-                    opacity: 0.5;
-                }
-            }
-        `}
 ` as typeof ReactSVG;
 
 export type IconName = IconNameNew | IconNameDeprecated;
@@ -197,7 +185,7 @@ export const Icon = forwardRef(
 
         return (
             <SvgWrapper
-                $cursorPointer={cursorPointer}
+                $cursorPointer={!!onClick || cursorPointer}
                 $hoverColor={hoverColor}
                 $color={color}
                 $variant={variant}
diff --git a/packages/components/src/components/Icon/icons.stories.tsx b/packages/components/src/components/Icon/icons.stories.tsx
index 9f94ce79390..35fa698e81f 100644
--- a/packages/components/src/components/Icon/icons.stories.tsx
+++ b/packages/components/src/components/Icon/icons.stories.tsx
@@ -1,17 +1,20 @@
 import React, { useState } from 'react';
+
 import styled, { useTheme } from 'styled-components';
 import { Meta, StoryObj } from '@storybook/react';
+
+import { typography } from '@trezor/theme';
+import { icons, IconName } from '@suite-common/icons/src/icons';
+import {
+    icons as iconsDeprecated,
+    IconName as IconNameDeprecated,
+} from '@suite-common/icons-deprecated';
+
 import { Icon, IconProps, allowedIconFrameProps, iconVariants, iconSizes } from './Icon';
 import { getFramePropsStory } from '../../utils/frameProps';
 import { Input } from '../form/Input/Input';
 import { Checkbox } from '../form/Checkbox/Checkbox';
 import { Text } from '../typography/Text/Text';
-import { typography } from '@trezor/theme';
-import { icons, IconName } from '@suite-common/icons';
-import {
-    icons as iconsDeprecated,
-    IconName as IconNameDeprecated,
-} from '@suite-common/icons-deprecated/src/webComponents';
 
 const CopiedText = styled.div`
     display: flex;
@@ -99,6 +102,7 @@ const Render = (props: IconProps) => {
                     placeholder="Search icon"
                     value={search}
                     onChange={event => setSearch(event.target.value)}
+                    // eslint-disable-next-line jsx-a11y/no-autofocus
                     autoFocus={theme.legacy.THEME === 'light'}
                     onClear={() => setSearch('')}
                     showClearButton="always"
@@ -152,6 +156,9 @@ export const AllIcons: StoryObj<IconProps> = {
                 type: 'select',
             },
         },
+        color: {
+            control: 'color',
+        },
         size: {
             options: iconSizes,
             control: {
diff --git a/packages/components/src/components/IconCircle/IconCircle.stories.tsx b/packages/components/src/components/IconCircle/IconCircle.stories.tsx
new file mode 100644
index 00000000000..d20b670aa83
--- /dev/null
+++ b/packages/components/src/components/IconCircle/IconCircle.stories.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+
+import { Meta, StoryObj } from '@storybook/react';
+
+import { icons, IconName } from '@suite-common/icons/src/icons';
+
+import {
+    IconCircle as IconCircleComponent,
+    IconCircleProps,
+    allowedIconCircleFrameProps,
+} from './IconCircle';
+import { iconCircleVariants } from './types';
+import { getFramePropsStory } from '../../utils/frameProps';
+
+const meta: Meta = {
+    title: 'IconCircle',
+} as Meta;
+export default meta;
+
+export const IconCircle: StoryObj = {
+    render: props => <IconCircleComponent {...(props as IconCircleProps)} />,
+    args: {
+        variant: 'primary',
+        name: 'butterfly',
+        size: 40,
+        hasBorder: true,
+        ...getFramePropsStory(allowedIconCircleFrameProps).args,
+    },
+    argTypes: {
+        variant: {
+            control: {
+                type: 'select',
+            },
+            options: iconCircleVariants,
+        },
+        size: {
+            control: {
+                type: 'number',
+            },
+        },
+        hasBorder: {
+            control: {
+                type: 'boolean',
+            },
+        },
+        name: {
+            control: {
+                type: 'select',
+            },
+            options: Object.keys(icons) as IconName[],
+        },
+        ...getFramePropsStory(allowedIconCircleFrameProps).argTypes,
+    },
+};
diff --git a/packages/components/src/components/IconCircle/IconCircle.tsx b/packages/components/src/components/IconCircle/IconCircle.tsx
new file mode 100644
index 00000000000..5fe6b78708d
--- /dev/null
+++ b/packages/components/src/components/IconCircle/IconCircle.tsx
@@ -0,0 +1,74 @@
+import styled from 'styled-components';
+
+import { ExclusiveColorOrVariant, Icon, IconName, IconSize, getIconSize } from '../Icon/Icon';
+import { TransientProps } from '../../utils/transientProps';
+import { IconCircleExclusiveColorOrVariant, IconCircleVariant, IconCircleColors } from './types';
+import { mapVariantToIconBackground, mapVariantToIconBorderColor } from './utils';
+import {
+    FrameProps,
+    FramePropsKeys,
+    pickAndPrepareFrameProps,
+    withFrameProps,
+} from '../../utils/frameProps';
+
+export const allowedIconCircleFrameProps = ['margin'] as const satisfies FramePropsKeys[];
+type AllowedFrameProps = Pick<FrameProps, (typeof allowedIconCircleFrameProps)[number]>;
+
+type IconCircleWrapperProps = TransientProps<
+    IconCircleExclusiveColorOrVariant & AllowedFrameProps
+> & {
+    $size: number;
+    $hasBorder: boolean;
+};
+
+const IconCircleWrapper = styled.div<IconCircleWrapperProps>`
+    width: ${({ $size }) => $size}px;
+    background: ${mapVariantToIconBackground};
+    padding: ${({ $size }) => $size * 0.75}px;
+    border-radius: 50%;
+    box-shadow: inset 0 0 0 ${({ $hasBorder, $size }) => ($hasBorder ? $size / 4 : 0)}px
+        ${mapVariantToIconBorderColor};
+    box-sizing: content-box;
+
+    ${withFrameProps}
+`;
+
+export type IconCircleProps = {
+    name: IconName;
+    size: IconSize | number;
+    hasBorder?: boolean;
+} & IconCircleExclusiveColorOrVariant &
+    AllowedFrameProps;
+
+export const IconCircle = ({
+    name,
+    size,
+    hasBorder = true,
+    iconColor,
+    variant,
+    ...rest
+}: IconCircleProps) => {
+    const wrapperColorOrVariant: TransientProps<IconCircleExclusiveColorOrVariant> =
+        iconColor === undefined ? { $variant: variant ?? 'primary' } : { $iconColor: iconColor };
+
+    const iconColorOrVariant: ExclusiveColorOrVariant =
+        iconColor === undefined
+            ? { variant: variant ?? 'primary' }
+            : { color: iconColor.foreground };
+
+    const iconSize = getIconSize(size);
+    const frameProps = pickAndPrepareFrameProps(rest, allowedIconCircleFrameProps);
+
+    return (
+        <IconCircleWrapper
+            $size={iconSize}
+            $hasBorder={hasBorder}
+            {...wrapperColorOrVariant}
+            {...frameProps}
+        >
+            <Icon name={name} size={size} {...iconColorOrVariant} />
+        </IconCircleWrapper>
+    );
+};
+
+export type { IconCircleVariant, IconCircleColors };
diff --git a/packages/components/src/components/IconCircle/types.tsx b/packages/components/src/components/IconCircle/types.tsx
new file mode 100644
index 00000000000..c813c094a60
--- /dev/null
+++ b/packages/components/src/components/IconCircle/types.tsx
@@ -0,0 +1,19 @@
+import { CSSColor } from '@trezor/theme';
+
+import { UIVariant } from '../../config/types';
+
+export const iconCircleVariants = [
+    'primary',
+    'warning',
+    'destructive',
+    'info',
+    'tertiary',
+] as const;
+
+export type IconCircleVariant = Extract<UIVariant, (typeof iconCircleVariants)[number]>;
+
+export type IconCircleColors = { foreground: CSSColor; background: CSSColor };
+
+export type IconCircleExclusiveColorOrVariant =
+    | { variant?: IconCircleVariant; iconColor?: undefined }
+    | { variant?: undefined; iconColor?: IconCircleColors };
diff --git a/packages/components/src/components/IconCircle/utils.tsx b/packages/components/src/components/IconCircle/utils.tsx
new file mode 100644
index 00000000000..2e2358bc032
--- /dev/null
+++ b/packages/components/src/components/IconCircle/utils.tsx
@@ -0,0 +1,56 @@
+import { DefaultTheme } from 'styled-components';
+
+import { Color, CSSColor } from '@trezor/theme';
+
+import { IconCircleVariant, IconCircleExclusiveColorOrVariant } from './types';
+import { TransientProps } from '../../utils/transientProps';
+
+type MapArgs = {
+    theme: DefaultTheme;
+    $hasBorder: boolean;
+} & TransientProps<IconCircleExclusiveColorOrVariant>;
+
+export const mapVariantToIconBorderColor = ({ $variant, theme, $iconColor }: MapArgs): CSSColor => {
+    if ($variant === undefined) {
+        return $iconColor?.foreground ?? 'transparent';
+    }
+
+    const colorMap: Record<IconCircleVariant, Color> = {
+        primary: 'backgroundPrimarySubtleOnElevation0',
+        warning: 'backgroundAlertYellowSubtleOnElevation0',
+        destructive: 'backgroundAlertRedSubtleOnElevation0',
+        info: 'backgroundAlertBlueSubtleOnElevation0',
+        tertiary: 'backgroundTertiaryDefaultOnElevation0',
+    };
+
+    return theme[colorMap[$variant]];
+};
+
+export const mapVariantToIconBackground = ({
+    theme,
+    $hasBorder,
+    $iconColor,
+    $variant,
+}: MapArgs): CSSColor => {
+    if ($variant === undefined) {
+        return $iconColor?.background ?? 'transparent';
+    }
+
+    const noBorderColorMap: Record<IconCircleVariant, Color> = {
+        primary: 'backgroundPrimarySubtleOnElevation1',
+        warning: 'backgroundAlertYellowSubtleOnElevation1',
+        destructive: 'backgroundAlertRedSubtleOnElevation1',
+        info: 'backgroundAlertBlueSubtleOnElevation1',
+        tertiary: 'backgroundTertiaryDefaultOnElevation1',
+    };
+
+    const borderColorMap: Record<IconCircleVariant, Color> = {
+        primary: 'backgroundPrimarySubtleOnElevation2',
+        warning: 'backgroundAlertYellowSubtleOnElevation2',
+        destructive: 'backgroundAlertRedSubtleOnElevation2',
+        info: 'backgroundAlertBlueSubtleOnElevation2',
+        tertiary: 'backgroundTertiaryDefaultOnElevation1',
+    };
+
+    return theme[($hasBorder ? borderColorMap : noBorderColorMap)[$variant]];
+};
diff --git a/packages/components/src/components/Image/Image.stories.tsx b/packages/components/src/components/Image/Image.stories.tsx
index 9efd31fcea7..21dd8faf331 100644
--- a/packages/components/src/components/Image/Image.stories.tsx
+++ b/packages/components/src/components/Image/Image.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { Image as ImageComponent, ImageProps } from './Image';
 import { PNG_IMAGES, SVG_IMAGES } from './images';
 
@@ -10,7 +11,7 @@ export default meta;
 
 export const Image: StoryObj<ImageProps> = {
     args: {
-        image: 'EARLY_ACCESS',
+        image: 'BACKUP',
         width: undefined,
         height: undefined,
         imageSrc: undefined,
diff --git a/packages/components/src/components/Image/Image.tsx b/packages/components/src/components/Image/Image.tsx
index 4cbc1ff2695..c8b29cc4691 100644
--- a/packages/components/src/components/Image/Image.tsx
+++ b/packages/components/src/components/Image/Image.tsx
@@ -1,5 +1,7 @@
 import { ImgHTMLAttributes } from 'react';
+
 import styled from 'styled-components';
+
 import { PngImage, SvgImage, PNG_IMAGES, SVG_IMAGES } from './images';
 import { resolveStaticPath } from '../../utils/resolveStaticPath';
 
diff --git a/packages/components/src/components/Image/images.ts b/packages/components/src/components/Image/images.ts
index c8450adc9ee..fe6cd2a0a14 100644
--- a/packages/components/src/components/Image/images.ts
+++ b/packages/components/src/components/Image/images.ts
@@ -10,6 +10,7 @@ export const SVG_IMAGES = {
     DEVICE_CONFIRM_TREZOR_T2B1: 'device-confirm-trezor-t3b1.svg',
     DEVICE_CONFIRM_TREZOR_T3B1: 'device-confirm-trezor-t3b1.svg',
     DEVICE_CONFIRM_TREZOR_T3T1: 'device-confirm-trezor-t3t1.svg',
+    DEVICE_CONFIRM_TREZOR_T3W1: 'device-confirm-trezor-t3w1.svg',
     SPINNER: 'spinner.svg',
     SPINNER_GREY: 'spinner-grey.svg',
     SPINNER_LIGHT_GREY: 'spinner-light-grey.svg',
@@ -18,8 +19,6 @@ export const SVG_IMAGES = {
     DEVICE_ANOTHER_SESSION: 'device-another-session.svg',
     CONNECT_DEVICE: 'connect-device.svg',
     ERROR_404: 'error-404.svg',
-    EARLY_ACCESS: 'early-access.svg',
-    EARLY_ACCESS_DISABLE: 'early-access-disable.svg',
     INVITY_LOGO: 'invity-logo.svg',
     COINMARKET_AVATAR: 'coinmarket-avatar.svg',
     COINMARKET_SUCCESS: 'coinmarket-success.svg',
@@ -39,6 +38,7 @@ export const SVG_IMAGES = {
     TREZOR_SAFE_PROMO_UNDERLINE: 'trezor-safe-promo-underline.svg',
     CONFIRM_EVM_EXPLANATION_ETH: 'confirm-evm-explanation-eth.svg',
     CONFIRM_EVM_EXPLANATION_OTHER: 'confirm-evm-explanation-other.svg',
+    GAINS_GRAPH: 'gains-graph.svg',
 } as const;
 
 export type PngImage = keyof typeof PNG_IMAGES;
@@ -92,6 +92,8 @@ export const PNG_IMAGES = {
     DONT_DISCONNECT_TREZOR_T3B1_2x: 'dont-disconnect-trezor-t3b1@2x.png',
     DONT_DISCONNECT_TREZOR_T3T1: 'dont-disconnect-trezor-t3t1.png',
     DONT_DISCONNECT_TREZOR_T3T1_2x: 'dont-disconnect-trezor-t3t1@2x.png',
+    DONT_DISCONNECT_TREZOR_T3W1: 'dont-disconnect-trezor-t3w1.png',
+    DONT_DISCONNECT_TREZOR_T3W1_2x: 'dont-disconnect-trezor-t3w1@2x.png',
     TREZOR_T1B1: 'trezor-t1b1.png',
     TREZOR_T1B1_2x: 'trezor-t1b1@2x.png',
     TREZOR_T2T1: 'trezor-t2t1.png',
@@ -102,6 +104,8 @@ export const PNG_IMAGES = {
     TREZOR_T3B1_2x: 'trezor-t3b1@2x.png',
     TREZOR_T3T1: 'trezor-t3t1.png',
     TREZOR_T3T1_2x: 'trezor-t3t1@2x.png',
+    TREZOR_T3W1: 'trezor-t3w1.png',
+    TREZOR_T3W1_2x: 'trezor-t3w1@2x.png',
     TREZOR_T1B1_LARGE: 'trezor-t1b1-large.png',
     TREZOR_T1B1_LARGE_2x: 'trezor-t1b1-large@2x.png',
     TREZOR_T2T1_LARGE: 'trezor-t2t1-large.png',
@@ -112,6 +116,8 @@ export const PNG_IMAGES = {
     TREZOR_T3B1_LARGE_2x: 'trezor-t3b1-large@2x.png',
     TREZOR_T3T1_LARGE: 'trezor-t3t1-large.png',
     TREZOR_T3T1_LARGE_2x: 'trezor-t3t1-large@2x.png',
+    TREZOR_T3W1_LARGE: 'trezor-t3w1-large.png',
+    TREZOR_T3W1_LARGE_2x: 'trezor-t3w1-large@2x.png',
     TREZOR_T1B1_GHOST: 'trezor-t1b1-ghost.png',
     TREZOR_T1B1_GHOST_2x: 'trezor-t1b1-ghost@2x.png',
     TREZOR_T2T1_GHOST: 'trezor-t2t1-ghost.png',
@@ -122,6 +128,8 @@ export const PNG_IMAGES = {
     TREZOR_T3B1_GHOST_2x: 'trezor-t3b1-ghost@2x.png',
     TREZOR_T3T1_GHOST: 'trezor-t3t1-ghost.png',
     TREZOR_T3T1_GHOST_2x: 'trezor-t3t1-ghost@2x.png',
+    TREZOR_T3W1_GHOST: 'trezor-t3w1-ghost.png',
+    TREZOR_T3W1_GHOST_2x: 'trezor-t3w1-ghost@2x.png',
     TREZOR_SAFE_PROMO_PRODUCTS: 'trezor-safe-promo-products.png',
     TREZOR_SAFE_PROMO_PRODUCTS_2x: 'trezor-safe-promo-products@2x.png',
 } as const;
diff --git a/packages/components/src/components/InfoRow/InfoRow.stories.tsx b/packages/components/src/components/InfoRow/InfoRow.stories.tsx
new file mode 100644
index 00000000000..ec339c91557
--- /dev/null
+++ b/packages/components/src/components/InfoRow/InfoRow.stories.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+
+import { Meta, StoryObj } from '@storybook/react';
+
+import {
+    InfoRow as InfoRowComponent,
+    allowedInfoRowFrameProps,
+    allowedInfoRowTextProps,
+} from './InfoRow';
+import { flexDirection } from '../Flex/Flex';
+import { getFramePropsStory } from '../../utils/frameProps';
+import { getTextPropsStory } from '../typography/utils';
+
+const meta: Meta = {
+    title: 'InfoRow',
+} as Meta;
+export default meta;
+
+export const InfoRow: StoryObj = {
+    render: props => (
+        <InfoRowComponent label={undefined} {...props}>
+            Lorem ipsum
+        </InfoRowComponent>
+    ),
+    args: {
+        direction: 'column',
+        label: 'Label',
+        ...getFramePropsStory(allowedInfoRowFrameProps).args,
+        ...getTextPropsStory(allowedInfoRowTextProps).args,
+    },
+    argTypes: {
+        direction: {
+            options: flexDirection,
+            control: {
+                type: 'radio',
+            },
+        },
+        label: {
+            control: {
+                type: 'text',
+            },
+        },
+        ...getFramePropsStory(allowedInfoRowFrameProps).argTypes,
+        ...getTextPropsStory(allowedInfoRowTextProps).argTypes,
+    },
+};
diff --git a/packages/components/src/components/InfoRow/InfoRow.tsx b/packages/components/src/components/InfoRow/InfoRow.tsx
new file mode 100644
index 00000000000..ae361bb8aea
--- /dev/null
+++ b/packages/components/src/components/InfoRow/InfoRow.tsx
@@ -0,0 +1,68 @@
+import { ReactNode } from 'react';
+
+import styled from 'styled-components';
+
+import { spacings, TypographyStyle } from '@trezor/theme';
+
+import {
+    FrameProps,
+    FramePropsKeys,
+    pickAndPrepareFrameProps,
+    withFrameProps,
+} from '../../utils/frameProps';
+import { TextPropsKeys, TextProps } from '../typography/utils';
+import { TransientProps } from '../../utils/transientProps';
+import { FlexDirection, Flex } from '../Flex/Flex';
+import { Text } from '../typography/Text/Text';
+
+export const allowedInfoRowTextProps = ['typographyStyle'] as const satisfies TextPropsKeys[];
+type AllowedInfoRowTextProps = Pick<TextProps, (typeof allowedInfoRowTextProps)[number]>;
+
+export const allowedInfoRowFrameProps = ['margin'] as const satisfies FramePropsKeys[];
+type AllowedFrameProps = Pick<FrameProps, (typeof allowedInfoRowFrameProps)[number]>;
+
+type ContainerProps = TransientProps<AllowedFrameProps & AllowedInfoRowTextProps>;
+
+const Container = styled.div<ContainerProps>`
+    width: 100%;
+
+    ${withFrameProps}
+`;
+
+export type InfoRowProps = AllowedFrameProps &
+    AllowedInfoRowTextProps & {
+        children?: ReactNode;
+        direction?: FlexDirection;
+        label: ReactNode;
+        labelTypographyStyle?: TypographyStyle;
+    };
+
+export const InfoRow = ({
+    children,
+    label,
+    direction = 'column',
+    typographyStyle = 'body',
+    labelTypographyStyle = 'hint',
+    ...rest
+}: InfoRowProps) => {
+    const frameProps = pickAndPrepareFrameProps(rest, allowedInfoRowFrameProps);
+    const isRow = direction === 'row';
+
+    return (
+        <Container {...frameProps}>
+            <Flex
+                direction={direction}
+                alignItems={isRow ? 'center' : 'stretch'}
+                justifyContent={isRow ? 'space-between' : undefined}
+                gap={isRow ? spacings.md : spacings.xxs}
+            >
+                <Text variant="tertiary" typographyStyle={labelTypographyStyle} as="div">
+                    {label}
+                </Text>
+                <Text as="div" typographyStyle={typographyStyle} align={isRow ? 'right' : 'left'}>
+                    {children}
+                </Text>
+            </Flex>
+        </Container>
+    );
+};
diff --git a/packages/components/src/components/List/List.stories.tsx b/packages/components/src/components/List/List.stories.tsx
index 4f08099bfef..9d809b6ce98 100644
--- a/packages/components/src/components/List/List.stories.tsx
+++ b/packages/components/src/components/List/List.stories.tsx
@@ -1,7 +1,9 @@
 import React from 'react';
+
 import { Meta, StoryObj } from '@storybook/react';
 
 import { spacings } from '@trezor/theme';
+
 import { Icon } from '../Icon/Icon';
 import {
     List as ListComponent,
diff --git a/packages/components/src/components/List/List.tsx b/packages/components/src/components/List/List.tsx
index 16ef3a8cb04..232630cb65a 100644
--- a/packages/components/src/components/List/List.tsx
+++ b/packages/components/src/components/List/List.tsx
@@ -1,7 +1,9 @@
 import { createContext, useContext } from 'react';
 
-import { spacings, SpacingValues } from '@trezor/theme';
 import styled from 'styled-components';
+
+import { spacings, SpacingValues } from '@trezor/theme';
+
 import {
     FrameProps,
     FramePropsKeys,
@@ -34,10 +36,9 @@ type AllowedTextProps = Pick<TextProps, (typeof allowedListTextProps)[number]>;
 export const bulletVerticalAlignments = uiVerticalAlignments;
 export type BulletVerticalAlignment = (typeof uiVerticalAlignments)[number];
 
-type ContainerProps = TransientProps<AllowedFrameProps> &
-    TransientProps<AllowedTextProps> & {
-        $gap: SpacingValues;
-    };
+type ContainerProps = TransientProps<AllowedFrameProps & AllowedTextProps> & {
+    $gap: SpacingValues;
+};
 
 const Container = styled.ul<ContainerProps>`
     display: flex;
diff --git a/packages/components/src/components/List/ListItem.tsx b/packages/components/src/components/List/ListItem.tsx
index 638d0832dda..55aa6342a16 100644
--- a/packages/components/src/components/List/ListItem.tsx
+++ b/packages/components/src/components/List/ListItem.tsx
@@ -1,6 +1,9 @@
 import { useEffect, useRef } from 'react';
-import { SpacingValues, spacingsPx, borders } from '@trezor/theme';
+
 import styled, { css } from 'styled-components';
+
+import { SpacingValues, spacingsPx, borders } from '@trezor/theme';
+
 import { FlexAlignItems } from '../Flex/Flex';
 import { useList, BulletVerticalAlignment } from './List';
 
diff --git a/packages/components/src/components/Markdown/Markdown.stories.tsx b/packages/components/src/components/Markdown/Markdown.stories.tsx
index e845eeb37c7..0c41f39734a 100644
--- a/packages/components/src/components/Markdown/Markdown.stories.tsx
+++ b/packages/components/src/components/Markdown/Markdown.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { Markdown as MarkdownComponent } from './Markdown';
 
 const meta: Meta = {
diff --git a/packages/components/src/components/Markdown/Markdown.tsx b/packages/components/src/components/Markdown/Markdown.tsx
index 67cb605bd47..3ad56b5f766 100644
--- a/packages/components/src/components/Markdown/Markdown.tsx
+++ b/packages/components/src/components/Markdown/Markdown.tsx
@@ -1,9 +1,11 @@
+import ReactMarkdown, { Options } from 'react-markdown';
+
 import styled from 'styled-components';
 
-import ReactMarkdown, { Options } from 'react-markdown';
-import { variables } from '../../config';
 import { typography } from '@trezor/theme';
 
+import { variables } from '../../config';
+
 const StyledMarkdown = styled.div`
     ${typography.hint}
 
diff --git a/packages/components/src/components/NewModal/NewModal.stories.tsx b/packages/components/src/components/NewModal/NewModal.stories.tsx
index 0121aa1d309..3da32c7bfcf 100644
--- a/packages/components/src/components/NewModal/NewModal.stories.tsx
+++ b/packages/components/src/components/NewModal/NewModal.stories.tsx
@@ -1,13 +1,16 @@
 import { Meta, StoryObj } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
+import { ThemeProvider } from 'styled-components';
+
 import {
     allowedNewModalFrameProps,
     NewModal as ModalComponent,
     NewModalProps,
     variables,
+    intermediaryTheme,
+    IconCircle,
 } from '../../index';
-import { ThemeProvider } from 'styled-components';
-import { intermediaryTheme } from '../../index';
+import { newModalVariants, newModalSizes } from './types';
 import { getFramePropsStory } from '../../utils/frameProps';
 
 const Buttons = () => (
@@ -46,6 +49,8 @@ export default meta;
 export const NewModal: StoryObj<NewModalProps> = {
     args: {
         variant: 'primary',
+        iconName: undefined,
+        iconComponent: undefined,
         heading: 'Modal heading',
         description: 'Modal description',
         children:
@@ -60,15 +65,28 @@ export const NewModal: StoryObj<NewModalProps> = {
     argTypes: {
         variant: {
             control: {
-                type: 'radio',
+                type: 'select',
+            },
+            options: [...newModalVariants, undefined],
+        },
+        iconComponent: {
+            options: ['nothing', 'purple'],
+            mapping: {
+                nothing: undefined,
+                purple: (
+                    <IconCircle
+                        name="eap"
+                        iconColor={{ foreground: '#550070', background: '#c458d9' }}
+                        size={40}
+                    />
+                ),
             },
-            options: ['primary', 'warning', 'destructive'],
         },
         size: {
             control: {
-                type: 'radio',
+                type: 'select',
             },
-            options: ['tiny', 'small', 'medium', 'large'],
+            options: newModalSizes,
         },
         heading: {
             control: 'text',
@@ -112,7 +130,7 @@ export const NewModal: StoryObj<NewModalProps> = {
                 },
             },
         },
-        icon: {
+        iconName: {
             options: ['none', ...variables.ICONS],
             mapping: {
                 ...variables.ICONS,
diff --git a/packages/components/src/components/NewModal/NewModal.tsx b/packages/components/src/components/NewModal/NewModal.tsx
index c422161aea2..287204a3b1f 100644
--- a/packages/components/src/components/NewModal/NewModal.tsx
+++ b/packages/components/src/components/NewModal/NewModal.tsx
@@ -1,11 +1,15 @@
 import { ReactNode } from 'react';
-import styled from 'styled-components';
 import { useEvent } from 'react-use';
+
+import styled from 'styled-components';
+
 import {
     borders,
     Elevation,
     mapElevationToBackground,
     prevElevation,
+    spacings,
+    negativeSpacings,
     spacingsPx,
 } from '@trezor/theme';
 
@@ -14,17 +18,15 @@ import { Text } from '../typography/Text/Text';
 import { H3 } from '../typography/Heading/Heading';
 import { ElevationContext, ElevationUp, useElevation } from '../ElevationContext/ElevationContext';
 import { useScrollShadow } from '../../utils/useScrollShadow';
+import { IconCircle } from '../IconCircle/IconCircle';
+import { IconName } from '../Icon/Icon';
+import { Row } from '../Flex/Flex';
 import { NewModalButton } from './NewModalButton';
 import { NewModalContext } from './NewModalContext';
 import { NewModalBackdrop } from './NewModalBackdrop';
 import { NewModalProvider } from './NewModalProvider';
-import type { NewModalVariant, NewModalSize, NewModalAlignment } from './types';
-import {
-    mapVariantToIconBackground,
-    mapVariantToIconBorderColor,
-    mapModalSizeToWidth,
-} from './utils';
-import { Icon, IconName } from '../Icon/Icon';
+import { NewModalSize, NewModalAlignment, NewModalVariant } from './types';
+import { mapModalSizeToWidth } from './utils';
 import {
     FrameProps,
     FramePropsKeys,
@@ -38,7 +40,6 @@ type AllowedFrameProps = Pick<FrameProps, (typeof allowedNewModalFrameProps)[num
 
 const NEW_MODAL_CONTENT_ID = 'modal-content';
 const MODAL_ELEVATION = 0;
-const ICON_SIZE = 40;
 
 const Container = styled.div<
     TransientProps<AllowedFrameProps> & { $elevation: Elevation; $size: NewModalSize }
@@ -75,13 +76,6 @@ const HeadingContainer = styled.div`
     overflow: hidden;
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const Heading = styled(H3)`
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-`;
-
 const ScrollContainer = styled.div`
     display: flex;
     flex-direction: column;
@@ -105,43 +99,36 @@ const Footer = styled.footer`
     border-top: 1px solid ${({ theme }) => theme.borderElevation0};
 `;
 
-const IconWrapper = styled.div<{ $variant: NewModalVariant; $size: number; $isPushedTop: boolean }>`
-    width: ${({ $size }) => $size}px;
-    background: ${({ theme, $variant }) => mapVariantToIconBackground({ theme, $variant })};
-    padding: ${spacingsPx.lg};
-    border-radius: ${borders.radii.full};
-    border: ${spacingsPx.sm} solid
-        ${({ theme, $variant }) => mapVariantToIconBorderColor({ theme, $variant })};
-    box-sizing: content-box;
-    margin-bottom: ${spacingsPx.md};
-    margin-top: ${({ $isPushedTop }) => ($isPushedTop ? `-${spacingsPx.md}` : 0)};
-`;
+type ExclusiveIconNameOrComponent =
+    | { iconName?: IconName; iconComponent?: undefined }
+    | { iconName?: undefined; iconComponent?: ReactNode };
 
 type NewModalProps = AllowedFrameProps & {
-    children?: ReactNode;
     variant?: NewModalVariant;
+    children?: ReactNode;
     heading?: ReactNode;
     description?: ReactNode;
     bottomContent?: ReactNode;
     onBackClick?: () => void;
     onCancel?: () => void;
     isBackdropCancelable?: boolean;
-    icon?: IconName;
     alignment?: NewModalAlignment;
     size?: NewModalSize;
     'data-testid'?: string;
-};
+} & ExclusiveIconNameOrComponent;
 
-const _NewModalBase = ({
+const InnerNewModalBase = ({
     children,
-    variant = 'primary',
+    variant,
     size = 'medium',
     heading,
     description,
     bottomContent,
-    icon,
+    iconName,
+    iconComponent,
     onBackClick,
     onCancel,
+    isBackdropCancelable,
     'data-testid': dataTest = '@modal',
     ...rest
 }: NewModalProps) => {
@@ -152,9 +139,10 @@ const _NewModalBase = ({
     const { elevation } = useElevation();
 
     const hasHeader = onBackClick || onCancel || heading || description;
+    const isIconPushedTop = onCancel !== undefined && !heading && !description && !onBackClick;
 
     useEvent('keydown', (e: KeyboardEvent) => {
-        if (onCancel && e.key === 'Escape') {
+        if (isBackdropCancelable && onCancel && e.key === 'Escape') {
             onCancel?.();
         }
     });
@@ -181,7 +169,7 @@ const _NewModalBase = ({
                         )}
 
                         <HeadingContainer>
-                            {heading && <Heading>{heading}</Heading>}
+                            {heading && <H3 ellipsisLineCount={1}>{heading}</H3>}
                             {description && (
                                 <Text variant="tertiary" typographyStyle="hint">
                                     {description}
@@ -205,16 +193,18 @@ const _NewModalBase = ({
                 <ShadowTop />
                 <ScrollContainer onScroll={onScroll} ref={scrollElementRef}>
                     <Body id={NEW_MODAL_CONTENT_ID}>
-                        {icon && (
-                            <IconWrapper
-                                $variant={variant}
-                                $size={ICON_SIZE}
-                                $isPushedTop={
-                                    !!onCancel && !heading && !description && !onBackClick
-                                }
+                        {(iconComponent || iconName) && (
+                            <Row
+                                margin={{
+                                    bottom: spacings.md,
+                                    top: isIconPushedTop ? negativeSpacings.md : 0,
+                                }}
                             >
-                                <Icon name={icon} size={ICON_SIZE} variant={variant} />
-                            </IconWrapper>
+                                {iconComponent ??
+                                    (iconName && (
+                                        <IconCircle name={iconName} size={40} variant={variant} />
+                                    ))}
+                            </Row>
                         )}
                         <ElevationUp>{children}</ElevationUp>
                     </Body>
@@ -229,11 +219,10 @@ const _NewModalBase = ({
         </Container>
     );
 };
-
 const NewModalBase = (props: NewModalProps) => (
     <ElevationContext baseElevation={prevElevation[MODAL_ELEVATION]}>
         <NewModalContext.Provider value={{ variant: props.variant }}>
-            <_NewModalBase {...props} />
+            <InnerNewModalBase {...props} />
         </NewModalContext.Provider>
     </ElevationContext>
 );
diff --git a/packages/components/src/components/NewModal/NewModalBackdrop.tsx b/packages/components/src/components/NewModal/NewModalBackdrop.tsx
index 5939346cf75..7ffc7189d2c 100644
--- a/packages/components/src/components/NewModal/NewModalBackdrop.tsx
+++ b/packages/components/src/components/NewModal/NewModalBackdrop.tsx
@@ -1,9 +1,11 @@
 import { ReactNode } from 'react';
-import styled from 'styled-components';
 import FocusLock from 'react-focus-lock';
-import { zIndices, spacings } from '@trezor/theme';
 import { createPortal } from 'react-dom';
 
+import styled from 'styled-components';
+
+import { zIndices, spacings } from '@trezor/theme';
+
 import { NewModalAlignment } from './types';
 import { mapAlignmentToAlignItems, mapAlignmentToJustifyContent } from './utils';
 import { useModalTarget } from './NewModalProvider';
@@ -42,6 +44,7 @@ export const NewModalBackdrop = ({
     const modalTarget = useModalTarget();
 
     const backdrop = (
+        // eslint-disable-next-line jsx-a11y/no-autofocus
         <FocusLock autoFocus={false}>
             <Wrapper onClick={onClick} $alignment={alignment} $padding={padding}>
                 {children}
diff --git a/packages/components/src/components/NewModal/NewModalContext.tsx b/packages/components/src/components/NewModal/NewModalContext.tsx
index b94f5479a73..8f436e34c4e 100644
--- a/packages/components/src/components/NewModal/NewModalContext.tsx
+++ b/packages/components/src/components/NewModal/NewModalContext.tsx
@@ -1,4 +1,5 @@
 import { createContext, useContext } from 'react';
+
 import { NewModalVariant } from './types';
 
 export const NewModalContext = createContext<{
diff --git a/packages/components/src/components/NewModal/types.tsx b/packages/components/src/components/NewModal/types.tsx
index 5a0d01bd1f3..8b28791aea4 100644
--- a/packages/components/src/components/NewModal/types.tsx
+++ b/packages/components/src/components/NewModal/types.tsx
@@ -1,7 +1,9 @@
 import { UIVariant, UISize, UIHorizontalAlignment, UIVerticalAlignment } from '../../config/types';
 
-export type NewModalVariant = Extract<UIVariant, 'primary' | 'warning' | 'destructive'>;
+export const newModalVariants = ['primary', 'warning', 'destructive'] as const;
+export type NewModalVariant = Extract<UIVariant, (typeof newModalVariants)[number]>;
 
-export type NewModalSize = Extract<UISize, 'large' | 'medium' | 'small' | 'tiny'>;
+export const newModalSizes = ['huge', 'large', 'medium', 'small', 'tiny'] as const;
+export type NewModalSize = Extract<UISize, (typeof newModalSizes)[number]>;
 
 export type NewModalAlignment = { x: UIHorizontalAlignment; y: UIVerticalAlignment };
diff --git a/packages/components/src/components/NewModal/utils.tsx b/packages/components/src/components/NewModal/utils.tsx
index bc5057f62ac..f3c25d7c84b 100644
--- a/packages/components/src/components/NewModal/utils.tsx
+++ b/packages/components/src/components/NewModal/utils.tsx
@@ -1,39 +1,13 @@
-import { Color, CSSColor } from '@trezor/theme';
-import { NewModalVariant, NewModalSize, NewModalAlignment } from './types';
-import { DefaultTheme } from 'styled-components';
+import { NewModalSize, NewModalAlignment } from './types';
 import { UIVerticalAlignment, UIHorizontalAlignment } from '../../config/types';
 
-type MapArgs = {
-    $variant: NewModalVariant;
-    theme: DefaultTheme;
-};
-
-export const mapVariantToIconBackground = ({ $variant, theme }: MapArgs): CSSColor => {
-    const colorMap: Record<NewModalVariant, Color> = {
-        primary: 'backgroundPrimarySubtleOnElevation2',
-        warning: 'backgroundAlertYellowSubtleOnElevation2',
-        destructive: 'backgroundAlertRedSubtleOnElevation2',
-    };
-
-    return theme[colorMap[$variant]];
-};
-
-export const mapVariantToIconBorderColor = ({ $variant, theme }: MapArgs): CSSColor => {
-    const colorMap: Record<NewModalVariant, Color> = {
-        primary: 'backgroundPrimarySubtleOnElevation0',
-        warning: 'backgroundAlertYellowSubtleOnElevation0',
-        destructive: 'backgroundAlertRedSubtleOnElevation0',
-    };
-
-    return theme[colorMap[$variant]];
-};
-
 export const mapModalSizeToWidth = (size: NewModalSize) => {
     const widthMap: Record<NewModalSize, number> = {
         tiny: 400,
         small: 600,
         medium: 680,
         large: 760,
+        huge: 960,
     };
 
     return widthMap[size];
diff --git a/packages/components/src/components/Note/Note.stories.tsx b/packages/components/src/components/Note/Note.stories.tsx
index 068de82c543..8dbebcdc98e 100644
--- a/packages/components/src/components/Note/Note.stories.tsx
+++ b/packages/components/src/components/Note/Note.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { Note as NoteComponent, NoteProps } from './Note';
 
 const meta: Meta = {
diff --git a/packages/components/src/components/Note/Note.tsx b/packages/components/src/components/Note/Note.tsx
index 9fd581cbc80..f5ce682a71e 100644
--- a/packages/components/src/components/Note/Note.tsx
+++ b/packages/components/src/components/Note/Note.tsx
@@ -1,35 +1,25 @@
 import { ReactNode } from 'react';
-import styled, { useTheme } from 'styled-components';
 
-import { spacings, spacingsPx } from '@trezor/theme';
+import { spacings } from '@trezor/theme';
 
 import { Paragraph } from '../typography/Paragraph/Paragraph';
 import { Icon } from '../Icon/Icon';
+import { Row } from '../Flex/Flex';
+import { FrameProps, FramePropsKeys } from '../../utils/frameProps';
 
-const Row = styled.div`
-    display: flex;
-    gap: ${spacingsPx.xs};
-`;
+export const allowedNoteFrameProps = ['margin'] as const satisfies FramePropsKeys[];
+type AllowedFrameProps = Pick<FrameProps, (typeof allowedNoteFrameProps)[number]>;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledParagraph = styled(Paragraph)<{ $color?: string }>`
-    color: ${({ $color }) => $color};
-`;
-
-export interface NoteProps {
+export type NoteProps = AllowedFrameProps & {
     children: ReactNode;
     className?: string;
-}
-
-export const Note = ({ children, className }: NoteProps) => {
-    const theme = useTheme();
-
-    return (
-        <Row className={className}>
-            <Icon name="info" size={14} color={theme.textSubdued} margin={{ top: spacings.xxxs }} />
-            <StyledParagraph typographyStyle="hint" $color={theme.textSubdued}>
-                {children}
-            </StyledParagraph>
-        </Row>
-    );
 };
+
+export const Note = ({ children, className, margin }: NoteProps) => (
+    <Row className={className} gap={spacings.xs} margin={margin}>
+        <Icon name="info" size={14} variant="tertiary" />
+        <Paragraph typographyStyle="hint" variant="tertiary">
+            {children}
+        </Paragraph>
+    </Row>
+);
diff --git a/packages/components/src/components/ResizableBox/ResizableBox.stories.tsx b/packages/components/src/components/ResizableBox/ResizableBox.stories.tsx
index 1a530f6ddfb..19edddb5cbf 100644
--- a/packages/components/src/components/ResizableBox/ResizableBox.stories.tsx
+++ b/packages/components/src/components/ResizableBox/ResizableBox.stories.tsx
@@ -1,5 +1,6 @@
 import styled from 'styled-components';
 import { Meta, StoryObj } from '@storybook/react';
+
 import { ResizableBoxProps, ResizableBox as ResizableBoxComponent } from './ResizableBox';
 
 const Container = styled.div`
diff --git a/packages/components/src/components/ResizableBox/ResizableBox.tsx b/packages/components/src/components/ResizableBox/ResizableBox.tsx
index 72fabc73862..9964aebf3b0 100644
--- a/packages/components/src/components/ResizableBox/ResizableBox.tsx
+++ b/packages/components/src/components/ResizableBox/ResizableBox.tsx
@@ -1,8 +1,12 @@
-import styled, { css } from 'styled-components';
 import { useCallback, useEffect, useRef, useState } from 'react';
+
+import styled, { css } from 'styled-components';
+
 import { createCooldown } from '@trezor/utils';
 import { ZIndexValues, zIndices } from '@trezor/theme';
 
+import { getSafeWindowSize } from '../../utils/getSafeWindowSize';
+
 type Direction = 'top' | 'left' | 'right' | 'bottom';
 type Directions = Array<Direction>;
 
@@ -250,10 +254,10 @@ export const ResizableBox = ({
         [direction, maxHeight, maxWidth, minHeight, minWidth, newHeight, newWidth, newX, newY],
     );
 
-    const startResizing = (direction: Direction) => {
+    const startResizing = (direction2: Direction) => {
         setIsResizing(true);
         setIsHovering(false);
-        setDirection(direction);
+        setDirection(direction2);
     };
 
     useEffect(() => {
@@ -290,11 +294,12 @@ export const ResizableBox = ({
 
         window.onresize = () => {
             if (resizeCooldown() === true) {
+                const { windowHeight, windowWidth } = getSafeWindowSize();
                 if (updateHeightOnWindowResize) {
-                    setNewHeight(getMaxResult(maxHeight, window.innerHeight));
+                    setNewHeight(getMaxResult(maxHeight, windowHeight));
                 }
                 if (updateWidthOnWindowResize) {
-                    setNewWidth(getMaxResult(maxWidth, window.innerWidth));
+                    setNewWidth(getMaxResult(maxWidth, windowWidth));
                 }
             }
         };
@@ -315,18 +320,18 @@ export const ResizableBox = ({
         updateWidthOnWindowResize,
     ]);
 
-    const handleMouseOverDirection = (direction: Direction) => {
+    const handleMouseOverDirection = (direction2: Direction) => {
         if (!isResizing) {
             setIsHovering(true);
-            setDirection(direction);
+            setDirection(direction2);
         }
     };
 
     const highlightDirection = isHovering || isResizing ? direction : null;
 
-    const handleMouseOver = (direction: Direction) => () => handleMouseOverDirection(direction);
+    const handleMouseOver = (direction2: Direction) => () => handleMouseOverDirection(direction2);
 
-    const handleMouseDown = (direction: Direction) => () => startResizing(direction);
+    const handleMouseDown = (direction2: Direction) => () => startResizing(direction2);
 
     const handleMouseOut = () => {
         if (isHovering) {
@@ -338,10 +343,10 @@ export const ResizableBox = ({
         }
     };
 
-    const divsProps = (direction: Direction) => {
+    const divsProps = (direction2: Direction) => {
         return {
-            onMouseDown: handleMouseDown(direction),
-            onMouseOver: handleMouseOver(direction),
+            onMouseDown: handleMouseDown(direction2),
+            onMouseOver: handleMouseOver(direction2),
             onMouseOut: handleMouseOut,
             $highlightDirection: highlightDirection,
             $zIndex: zIndex,
diff --git a/packages/components/src/components/ResizableBox/ResizableBoxExamples.stories.tsx b/packages/components/src/components/ResizableBox/ResizableBoxExamples.stories.tsx
index 6381e50563c..24bce4ef473 100644
--- a/packages/components/src/components/ResizableBox/ResizableBoxExamples.stories.tsx
+++ b/packages/components/src/components/ResizableBox/ResizableBoxExamples.stories.tsx
@@ -1,5 +1,6 @@
 import styled from 'styled-components';
 import { Meta, StoryObj } from '@storybook/react';
+
 import { ResizableBox } from './ResizableBox';
 
 const Container = styled.div`
diff --git a/packages/components/src/components/Table/Table.stories.tsx b/packages/components/src/components/Table/Table.stories.tsx
index 0b7ab6d55f9..cb32af84897 100644
--- a/packages/components/src/components/Table/Table.stories.tsx
+++ b/packages/components/src/components/Table/Table.stories.tsx
@@ -14,8 +14,13 @@ const meta: Meta = {
 } as Meta;
 export default meta;
 
+interface TableProps {
+    colWidths?: { minWidth?: string | undefined; maxWidth?: string | undefined }[];
+    isRowHighlightedOnHover?: boolean;
+}
+
 export const Table: StoryObj = {
-    render: props => (
+    render: (props: TableProps) => (
         <TableComponent {...props}>
             <TableComponent.Header>
                 <TableComponent.Row>
@@ -26,7 +31,10 @@ export const Table: StoryObj = {
             </TableComponent.Header>
             <TableComponent.Body>
                 {EXAMPLE_TOKENS.map((token, i) => (
-                    <TableComponent.Row key={i}>
+                    <TableComponent.Row
+                        key={i}
+                        onClick={props.isRowHighlightedOnHover ? () => {} : undefined}
+                    >
                         <TableComponent.Cell>{token.name}</TableComponent.Cell>
                         <TableComponent.Cell>{token.balance}</TableComponent.Cell>
                         <TableComponent.Cell align="right">{token.price}</TableComponent.Cell>
@@ -37,8 +45,29 @@ export const Table: StoryObj = {
     ),
     args: {
         ...getFramePropsStory(allowedTableFrameProps).args,
+        colWidths: 'none',
+        isRowHighlightedOnHover: true,
     },
     argTypes: {
         ...getFramePropsStory(allowedTableFrameProps).argTypes,
+        colWidths: {
+            options: ['none', 'secondCol300px'],
+            mapping: {
+                none: undefined,
+                secondCol300px: [{}, { minWidth: '300px', maxWidth: '300px' }],
+            },
+            control: {
+                type: 'select',
+                labels: {
+                    none: 'undefined',
+                    secondCol300px: 'second column 300px',
+                },
+            },
+        },
+        isRowHighlightedOnHover: {
+            control: {
+                type: 'boolean',
+            },
+        },
     },
 };
diff --git a/packages/components/src/components/Table/Table.tsx b/packages/components/src/components/Table/Table.tsx
index 1bf4303411a..da0a985d208 100644
--- a/packages/components/src/components/Table/Table.tsx
+++ b/packages/components/src/components/Table/Table.tsx
@@ -1,7 +1,9 @@
-import { ReactNode } from 'react';
+import { createContext, ReactNode, useContext } from 'react';
+
 import styled from 'styled-components';
 
 import { mapElevationToBackgroundToken } from '@trezor/theme';
+
 import { FrameProps, FramePropsKeys, withFrameProps } from '../../utils/frameProps';
 import { makePropsTransient, TransientProps } from '../../utils/transientProps';
 import { TableHeader } from './TableHeader';
@@ -14,6 +16,14 @@ import { useElevation } from '../ElevationContext/ElevationContext';
 export const allowedTableFrameProps = ['margin'] as const satisfies FramePropsKeys[];
 type AllowedFrameProps = Pick<FrameProps, (typeof allowedTableFrameProps)[number]>;
 
+interface TableContextProps {
+    isRowHighlightedOnHover: boolean;
+}
+
+const TableContext = createContext<TableContextProps>({ isRowHighlightedOnHover: false });
+
+export const useTable = () => useContext(TableContext);
+
 const Container = styled.table<TransientProps<AllowedFrameProps>>`
     width: 100%;
     border-collapse: collapse;
@@ -29,31 +39,46 @@ const ScrollContainer = styled.div`
 
 export type TableProps = AllowedFrameProps & {
     children: ReactNode;
-    colWidths?: string[];
+    colWidths?: {
+        minWidth?: string;
+        maxWidth?: string;
+        width?: string;
+    }[];
+    isRowHighlightedOnHover?: boolean;
 };
 
-export const Table = ({ children, margin, colWidths }: TableProps) => {
+export const Table = ({
+    children,
+    margin,
+    colWidths,
+    isRowHighlightedOnHover = false,
+}: TableProps) => {
     const { scrollElementRef, onScroll, ShadowContainer, ShadowRight } = useScrollShadow();
     const { parentElevation } = useElevation();
 
     return (
-        <ShadowContainer>
-            <ScrollContainer onScroll={onScroll} ref={scrollElementRef}>
-                <Container {...makePropsTransient({ margin })}>
-                    {colWidths && (
-                        <colgroup>
-                            {colWidths.map((width, index) => (
-                                <col key={index} style={{ width }} />
-                            ))}
-                        </colgroup>
-                    )}
-                    {children}
-                </Container>
-            </ScrollContainer>
-            <ShadowRight
-                backgroundColor={mapElevationToBackgroundToken({ $elevation: parentElevation })}
-            />
-        </ShadowContainer>
+        <TableContext.Provider value={{ isRowHighlightedOnHover }}>
+            <ShadowContainer>
+                <ScrollContainer onScroll={onScroll} ref={scrollElementRef}>
+                    <Container {...makePropsTransient({ margin })}>
+                        {colWidths && (
+                            <colgroup>
+                                {colWidths.map((widths, index) => (
+                                    <col key={index} style={widths} />
+                                ))}
+                            </colgroup>
+                        )}
+                        {children}
+                    </Container>
+                </ScrollContainer>
+                <ShadowRight
+                    backgroundColor={mapElevationToBackgroundToken({ $elevation: parentElevation })}
+                    style={{
+                        borderRadius: '16px',
+                    }}
+                />
+            </ShadowContainer>
+        </TableContext.Provider>
     );
 };
 
diff --git a/packages/components/src/components/Table/TableCell.tsx b/packages/components/src/components/Table/TableCell.tsx
index 1022b7a5c97..34efa2b4009 100644
--- a/packages/components/src/components/Table/TableCell.tsx
+++ b/packages/components/src/components/Table/TableCell.tsx
@@ -1,16 +1,31 @@
 import { ReactNode } from 'react';
-import styled from 'styled-components';
 
-import { typography, spacingsPx, Elevation, mapElevationToBackground } from '@trezor/theme';
+import styled, { css } from 'styled-components';
+
+import {
+    typography,
+    spacings,
+    Elevation,
+    mapElevationToBackground,
+    SpacingValues,
+} from '@trezor/theme';
 
 import { useTableHeader } from './TableHeader';
 import { UIHorizontalAlignment } from '../../config/types';
 import { useElevation } from '../ElevationContext/ElevationContext';
 
+type Padding = {
+    top?: SpacingValues;
+    bottom?: SpacingValues;
+    left?: SpacingValues;
+    right?: SpacingValues;
+};
+
 export type TableCellProps = {
     children?: ReactNode;
     colSpan?: number;
     align?: UIHorizontalAlignment;
+    padding?: Padding;
 };
 
 const mapAlignmentToJustifyContent = (align: UIHorizontalAlignment) => {
@@ -23,14 +38,20 @@ const mapAlignmentToJustifyContent = (align: UIHorizontalAlignment) => {
     return map[align];
 };
 
-const Cell = styled.td<{ $isHeader: boolean; $elevation: Elevation }>`
+const Cell = styled.td<{ $isHeader: boolean; $elevation: Elevation; $padding?: Padding }>`
     ${({ $isHeader }) => ($isHeader ? typography.hint : typography.body)}
     color: ${({ theme, $isHeader }) => ($isHeader ? theme.textSubdued : theme.textDefault)};
     text-align: left;
-    padding: ${spacingsPx.sm} ${spacingsPx.lg};
     max-width: 300px;
     overflow: hidden;
 
+    ${({ $padding }) =>
+        $padding &&
+        css`
+            padding: ${$padding.top ?? 0}px ${$padding.right ?? 0}px ${$padding.bottom ?? 0}px
+                ${$padding.left ?? 0}px;
+        `}
+
     &:first-child {
         position: sticky;
         left: 0;
@@ -44,7 +65,12 @@ const Content = styled.div<{ $align: UIHorizontalAlignment }>`
     justify-content: ${({ $align }) => mapAlignmentToJustifyContent($align)};
 `;
 
-export const TableCell = ({ children, colSpan = 1, align = 'left' }: TableCellProps) => {
+export const TableCell = ({
+    children,
+    colSpan = 1,
+    align = 'left',
+    padding = { top: spacings.sm, right: spacings.lg, bottom: spacings.sm, left: spacings.lg },
+}: TableCellProps) => {
     const isHeader = useTableHeader();
     const { parentElevation } = useElevation();
 
@@ -54,6 +80,7 @@ export const TableCell = ({ children, colSpan = 1, align = 'left' }: TableCellPr
             colSpan={colSpan}
             $isHeader={isHeader}
             $elevation={parentElevation}
+            $padding={padding}
         >
             <Content $align={align}>{children}</Content>
         </Cell>
diff --git a/packages/components/src/components/Table/TableHeader.tsx b/packages/components/src/components/Table/TableHeader.tsx
index e3fdff18f64..92bb419a548 100644
--- a/packages/components/src/components/Table/TableHeader.tsx
+++ b/packages/components/src/components/Table/TableHeader.tsx
@@ -1,4 +1,5 @@
 import { createContext, useContext, ReactNode } from 'react';
+
 import styled from 'styled-components';
 
 import { Elevation, mapElevationToBorder } from '@trezor/theme';
diff --git a/packages/components/src/components/Table/TableRow.tsx b/packages/components/src/components/Table/TableRow.tsx
index 8e547eb80a9..00b7c2d27df 100644
--- a/packages/components/src/components/Table/TableRow.tsx
+++ b/packages/components/src/components/Table/TableRow.tsx
@@ -1,17 +1,59 @@
 import { ReactNode } from 'react';
+
 import styled, { css } from 'styled-components';
 
-import { Elevation, mapElevationToBorder } from '@trezor/theme';
+import {
+    Elevation,
+    mapElevationToBackground,
+    mapElevationToBorder,
+    nextElevation,
+} from '@trezor/theme';
 
 import { useElevation } from '../ElevationContext/ElevationContext';
+import { useTable } from './Table';
+import { useTableHeader } from './TableHeader';
 
-export const Row = styled.tr<{ $elevation: Elevation; $isCollapsed: boolean }>`
-    border-top: 1px solid ${mapElevationToBorder};
+export const Row = styled.tr<{
+    $elevation: Elevation;
+    $isCollapsed: boolean;
+    $isHighlighted: boolean;
+    $isHeader: boolean;
+    $hasBorderTop: boolean;
+}>`
+    ${({ $hasBorderTop, theme, $elevation }) =>
+        $hasBorderTop &&
+        css`
+            border-top: 1px solid ${mapElevationToBorder({ theme, $elevation })};
+        `}
 
     &:first-child {
         border-top: 0;
     }
 
+    ${({ $isHighlighted, theme, $elevation, $isHeader }) =>
+        $isHighlighted &&
+        !$isHeader &&
+        css`
+            &:hover {
+                background-color: ${mapElevationToBackground({
+                    theme,
+                    $elevation: nextElevation[$elevation],
+                })};
+
+                & > td:first-child {
+                    background: linear-gradient(
+                        to right,
+                        ${mapElevationToBackground({
+                                theme,
+                                $elevation: nextElevation[$elevation],
+                            })}
+                            90%,
+                        rgba(0 0 0 / 0%)
+                    );
+                }
+            }
+        `}
+
     ${({ $isCollapsed }) =>
         $isCollapsed &&
         css`
@@ -19,18 +61,48 @@ export const Row = styled.tr<{ $elevation: Elevation; $isCollapsed: boolean }>`
             border-top: 0;
             opacity: 0;
         `}
+
+        ${({ onClick }) =>
+        onClick &&
+        css`
+            &:hover {
+                cursor: pointer;
+            }
+        `}
 `;
 
 export interface TableRowProps {
     children: ReactNode;
     isCollapsed?: boolean;
+    isHighlightedOnHover?: boolean;
+    onClick?: () => void;
+    onHover?: (isHovering: boolean) => void;
+    hasBorderTop?: boolean;
 }
 
-export const TableRow = ({ children, isCollapsed = false }: TableRowProps) => {
+export const TableRow = ({
+    children,
+    isCollapsed = false,
+    onClick,
+    onHover,
+    isHighlightedOnHover,
+    hasBorderTop = true,
+}: TableRowProps) => {
     const { elevation } = useElevation();
+    const isHeader = useTableHeader();
+    const { isRowHighlightedOnHover } = useTable();
 
     return (
-        <Row $elevation={elevation} $isCollapsed={isCollapsed}>
+        <Row
+            $elevation={elevation}
+            $isCollapsed={isCollapsed}
+            $isHighlighted={isHighlightedOnHover ?? isRowHighlightedOnHover}
+            $isHeader={isHeader}
+            $hasBorderTop={hasBorderTop}
+            onClick={onClick}
+            onMouseEnter={() => onHover?.(true)}
+            onMouseLeave={() => onHover?.(false)}
+        >
             {children}
         </Row>
     );
diff --git a/packages/components/src/components/Timerange/Timerange.stories.tsx b/packages/components/src/components/Timerange/Timerange.stories.tsx
index 5d2bf6cce4b..3397b4e3f06 100644
--- a/packages/components/src/components/Timerange/Timerange.stories.tsx
+++ b/packages/components/src/components/Timerange/Timerange.stories.tsx
@@ -1,5 +1,6 @@
 import styled from 'styled-components';
 import { Meta, StoryObj } from '@storybook/react';
+
 import { Timerange as TimerangeComponent, TimerangeProps } from './Timerange';
 
 const Center = styled.div`
diff --git a/packages/components/src/components/Timerange/Timerange.tsx b/packages/components/src/components/Timerange/Timerange.tsx
index 73c6c456a40..ad39c88e705 100644
--- a/packages/components/src/components/Timerange/Timerange.tsx
+++ b/packages/components/src/components/Timerange/Timerange.tsx
@@ -1,11 +1,12 @@
 import { useState, ReactNode } from 'react';
 import { DateRange } from 'react-date-range';
+
 import styled, { css } from 'styled-components';
+import type { Locale } from 'date-fns';
+
 import { mediaQueries } from '@trezor/styles';
 import { borders, spacingsPx, zIndices } from '@trezor/theme';
 
-import type { Locale } from 'date-fns';
-
 import { Button } from '../buttons/Button/Button';
 
 type Selection = {
diff --git a/packages/components/src/components/Tooltip/Tooltip.stories.tsx b/packages/components/src/components/Tooltip/Tooltip.stories.tsx
index 339431bd32f..9dd0ae1bd1d 100644
--- a/packages/components/src/components/Tooltip/Tooltip.stories.tsx
+++ b/packages/components/src/components/Tooltip/Tooltip.stories.tsx
@@ -1,8 +1,12 @@
+import { useState } from 'react';
+
 import styled from 'styled-components';
-import { Tooltip as TooltipComponent, TooltipProps } from './Tooltip';
 import { Meta, StoryObj } from '@storybook/react';
 import { Placement } from '@floating-ui/react';
+
 import { Elevation, mapElevationToBackground, spacingsPx, zIndices } from '@trezor/theme';
+
+import { Tooltip as TooltipComponent, TooltipProps } from './Tooltip';
 import { ElevationContext, useElevation } from '../ElevationContext/ElevationContext';
 import {
     TOOLTIP_DELAY_LONG,
@@ -10,7 +14,6 @@ import {
     TOOLTIP_DELAY_NORMAL,
     TOOLTIP_DELAY_SHORT,
 } from './TooltipDelay';
-import { useState } from 'react';
 import { Button } from '../buttons/Button/Button';
 
 const Center = styled.div`
diff --git a/packages/components/src/components/Tooltip/Tooltip.tsx b/packages/components/src/components/Tooltip/Tooltip.tsx
index f98a3f4ff28..f60221c3dc5 100644
--- a/packages/components/src/components/Tooltip/Tooltip.tsx
+++ b/packages/components/src/components/Tooltip/Tooltip.tsx
@@ -1,15 +1,17 @@
-import styled, { ThemeProvider } from 'styled-components';
 import { ReactNode, MutableRefObject } from 'react';
+
+import styled, { ThemeProvider } from 'styled-components';
 import { transparentize } from 'polished';
+import { Placement, ShiftOptions } from '@floating-ui/react';
+
 import { ZIndexValues, spacingsPx, spacings, zIndices } from '@trezor/theme';
 
 import { Icon } from '../Icon/Icon';
 import { TooltipContent, TooltipFloatingUi, TooltipTrigger } from './TooltipFloatingUi';
-import { Placement, ShiftOptions } from '@floating-ui/react';
 import { TooltipBox, TooltipBoxProps } from './TooltipBox';
 import { TooltipArrow } from './TooltipArrow';
 import { TOOLTIP_DELAY_SHORT, TooltipDelay } from './TooltipDelay';
-import { intermediaryTheme } from '../..';
+import { intermediaryTheme } from '../../config/colors';
 
 export type Cursor = 'inherit' | 'pointer' | 'help' | 'default' | 'not-allowed';
 
diff --git a/packages/components/src/components/Tooltip/TooltipArrow.tsx b/packages/components/src/components/Tooltip/TooltipArrow.tsx
index 346ef76dd4b..4c375516c9d 100644
--- a/packages/components/src/components/Tooltip/TooltipArrow.tsx
+++ b/packages/components/src/components/Tooltip/TooltipArrow.tsx
@@ -1,6 +1,8 @@
 import { FloatingArrow } from '@floating-ui/react';
-import { ArrowProps } from './TooltipFloatingUi';
+
 import { palette } from '@trezor/theme';
+
+import { ArrowProps } from './TooltipFloatingUi';
 import { TOOLTIP_BORDER_RADIUS } from './TooltipBox';
 
 export const TooltipArrow = ({ ref, context }: ArrowProps) => (
diff --git a/packages/components/src/components/Tooltip/TooltipBox.tsx b/packages/components/src/components/Tooltip/TooltipBox.tsx
index b48a1b6c31b..3b05063d05f 100644
--- a/packages/components/src/components/Tooltip/TooltipBox.tsx
+++ b/packages/components/src/components/Tooltip/TooltipBox.tsx
@@ -1,6 +1,9 @@
 import { ReactElement, ReactNode } from 'react';
-import { borders, palette, spacings, spacingsPx, typography } from '@trezor/theme';
+
 import styled from 'styled-components';
+
+import { borders, palette, spacings, spacingsPx, typography } from '@trezor/theme';
+
 import { Icon, IconName } from '../Icon/Icon';
 
 export const TOOLTIP_BORDER_RADIUS = borders.radii.sm;
@@ -29,9 +32,10 @@ const TooltipContainerStyled = styled.div<TooltipContainerStyledProps>`
     border-radius: ${TOOLTIP_BORDER_RADIUS};
     text-align: left;
     border: solid 1.5px ${palette.darkGray100};
+    margin: ${spacingsPx.xxxs};
     max-width: ${props => props.$maxWidth}px;
-    ${typography.hint}
 
+    ${typography.hint}
     > div {
         padding: ${({ $isLarge, $isWithHeader }) => getContainerPadding($isLarge, $isWithHeader)};
     }
diff --git a/packages/components/src/components/Tooltip/TooltipFloatingUi.tsx b/packages/components/src/components/Tooltip/TooltipFloatingUi.tsx
index 7745feded01..ff2561723aa 100644
--- a/packages/components/src/components/Tooltip/TooltipFloatingUi.tsx
+++ b/packages/components/src/components/Tooltip/TooltipFloatingUi.tsx
@@ -1,3 +1,19 @@
+import {
+    useState,
+    useMemo,
+    createContext,
+    useContext,
+    ReactNode,
+    HTMLProps,
+    forwardRef,
+    isValidElement,
+    cloneElement,
+    useRef,
+    RefObject,
+    CSSProperties,
+    MutableRefObject,
+} from 'react';
+
 import {
     useFloating,
     autoUpdate,
@@ -15,21 +31,6 @@ import {
     arrow,
 } from '@floating-ui/react';
 import type { Placement, ShiftOptions, UseFloatingReturn } from '@floating-ui/react';
-import {
-    useState,
-    useMemo,
-    createContext,
-    useContext,
-    ReactNode,
-    HTMLProps,
-    forwardRef,
-    isValidElement,
-    cloneElement,
-    useRef,
-    RefObject,
-    CSSProperties,
-    MutableRefObject,
-} from 'react';
 
 /**
  * Based on https://floating-ui.com/docs/tooltip but heavily modified
diff --git a/packages/components/src/components/VirtualizedList/VirtualizedList.stories.tsx b/packages/components/src/components/VirtualizedList/VirtualizedList.stories.tsx
index b764a92990f..9462f98bf67 100644
--- a/packages/components/src/components/VirtualizedList/VirtualizedList.stories.tsx
+++ b/packages/components/src/components/VirtualizedList/VirtualizedList.stories.tsx
@@ -1,7 +1,9 @@
+import { useEffect, useState } from 'react';
+
 import { Meta, StoryFn } from '@storybook/react';
 import styled from 'styled-components';
+
 import { VirtualizedList as VirtualizedListComponent } from './VirtualizedList';
-import { useEffect, useState } from 'react';
 
 const meta: Meta = {
     title: 'VirtualizedList',
diff --git a/packages/components/src/components/VirtualizedList/VirtualizedList.tsx b/packages/components/src/components/VirtualizedList/VirtualizedList.tsx
index 2b7718c58ba..4ae6dd13404 100644
--- a/packages/components/src/components/VirtualizedList/VirtualizedList.tsx
+++ b/packages/components/src/components/VirtualizedList/VirtualizedList.tsx
@@ -1,7 +1,9 @@
-import { isChanged } from '@suite-common/suite-utils';
 import React, { useState, useEffect, useCallback, forwardRef, useRef } from 'react';
+
 import styled from 'styled-components';
 
+import { isChanged } from '@suite-common/suite-utils';
+
 function debounce<T extends (...args: unknown[]) => void>(
     func: T,
     wait: number,
diff --git a/packages/components/src/components/animations/AnimationPrimitives.tsx b/packages/components/src/components/animations/AnimationPrimitives.tsx
index a646cc8be04..dc4b99fb193 100644
--- a/packages/components/src/components/animations/AnimationPrimitives.tsx
+++ b/packages/components/src/components/animations/AnimationPrimitives.tsx
@@ -1,6 +1,7 @@
-import { borders } from '@trezor/theme';
 import styled, { CSSProperties, css } from 'styled-components';
 
+import { borders } from '@trezor/theme';
+
 export type Shape = 'CIRCLE' | 'ROUNDED' | 'ROUNDED-SMALL';
 
 export const AnimationWrapper = styled.div<{
diff --git a/packages/components/src/components/animations/DeviceAnimation.tsx b/packages/components/src/components/animations/DeviceAnimation.tsx
index debcebf67d9..1f927e4c520 100644
--- a/packages/components/src/components/animations/DeviceAnimation.tsx
+++ b/packages/components/src/components/animations/DeviceAnimation.tsx
@@ -1,9 +1,13 @@
-import styled, { useTheme } from 'styled-components';
 import { CSSProperties, MouseEventHandler, forwardRef } from 'react';
+
+import styled, { useTheme } from 'styled-components';
+
+import { DEFAULT_FLAGSHIP_MODEL } from '@suite-common/suite-constants';
+import { getNarrowedDeviceModelInternal } from '@suite-common/suite-utils';
 import { DeviceModelInternal } from '@trezor/connect';
+
 import { AnimationWrapper, Shape } from './AnimationPrimitives';
 import { resolveStaticPath } from '../../utils/resolveStaticPath';
-import { DEFAULT_FLAGSHIP_MODEL } from '@suite-common/suite-constants';
 
 const StyledVideo = styled.video`
     width: 100%;
@@ -54,23 +58,16 @@ export const DeviceAnimation = forwardRef<HTMLVideoElement, DeviceAnimationProps
             DeviceModelInternal.T2B1,
             DeviceModelInternal.T3B1,
             DeviceModelInternal.T3T1,
+            DeviceModelInternal.T3W1,
         ].includes(deviceModelInternal)
             ? ''
             : `_${theme.legacy.THEME}`;
 
-        const getDeviceModelInFilename = () => {
-            let deviceModel: string = deviceModelInternal;
-
-            // T2B1 looks the same as T3B1, thus uses the same animations.
-            if (deviceModelInternal === DeviceModelInternal.T2B1) {
-                deviceModel = DeviceModelInternal.T3B1;
-                // T2B1s with old packaging have two variants of security seal.
-            } else if (type === 'HOLOGRAM' && isOldT2B1Packaging) {
-                deviceModel = DeviceModelInternal.T2B1;
-            }
-
-            return deviceModel.toLowerCase();
-        };
+        const deviceModelInFilename = (
+            type === 'HOLOGRAM' && isOldT2B1Packaging
+                ? DeviceModelInternal.T2B1
+                : getNarrowedDeviceModelInternal(deviceModelInternal)
+        ).toLowerCase();
 
         return (
             <AnimationWrapper height={height} width={width} shape={shape} {...props}>
@@ -86,7 +83,7 @@ export const DeviceAnimation = forwardRef<HTMLVideoElement, DeviceAnimationProps
                     >
                         <source
                             src={resolveStaticPath(
-                                `videos/device/trezor_${getDeviceModelInFilename()}_${type.toLowerCase()}${themeSuffix}.webm`,
+                                `videos/device/trezor_${deviceModelInFilename}_${type.toLowerCase()}${themeSuffix}.webm`,
                             )}
                             type="video/webm"
                         />
@@ -121,7 +118,7 @@ export const DeviceAnimation = forwardRef<HTMLVideoElement, DeviceAnimationProps
                     >
                         <source
                             src={resolveStaticPath(
-                                `videos/device/trezor_${getDeviceModelInFilename()}_hologram.webm`,
+                                `videos/device/trezor_${deviceModelInFilename}_hologram.webm`,
                             )}
                             type="video/webm"
                         />
@@ -139,7 +136,7 @@ export const DeviceAnimation = forwardRef<HTMLVideoElement, DeviceAnimationProps
                     >
                         <source
                             src={resolveStaticPath(
-                                `videos/device/trezor_${getDeviceModelInFilename()}_rotate_color_${
+                                `videos/device/trezor_${deviceModelInFilename}_rotate_color_${
                                     // if device unit color is not set, use first color available
                                     deviceUnitColor ?? 1
                                 }.webm`,
diff --git a/packages/components/src/components/animations/LottieAnimation.tsx b/packages/components/src/components/animations/LottieAnimation.tsx
index d4b5a30f4e3..9cc264c9651 100644
--- a/packages/components/src/components/animations/LottieAnimation.tsx
+++ b/packages/components/src/components/animations/LottieAnimation.tsx
@@ -1,11 +1,14 @@
-import styled from 'styled-components';
 import React, { useEffect, useState } from 'react';
+
+import styled from 'styled-components';
 import Lottie, { LottieOptions } from 'lottie-react';
 
+import { DEFAULT_FLAGSHIP_MODEL } from '@suite-common/suite-constants';
+import { getNarrowedDeviceModelInternal } from '@suite-common/suite-utils';
 import { DeviceModelInternal } from '@trezor/connect';
+
 import { AnimationWrapper, Shape } from './AnimationPrimitives';
 import { resolveStaticPath } from '../../utils/resolveStaticPath';
-import { DEFAULT_FLAGSHIP_MODEL } from '@suite-common/suite-constants';
 
 const StyledLottie = styled(Lottie)`
     width: 100%;
@@ -45,14 +48,14 @@ export const LottieAnimation = ({
                 ).json();
 
                 setLottieAnimationData(animation);
-            } catch (error) {
+            } catch {
                 // do not need to handle error
             }
         };
 
         if (type === 'CONNECT') {
             loadAnimation(
-                `trezor_${(deviceModelInternal === DeviceModelInternal.T2B1 ? DeviceModelInternal.T3B1 : deviceModelInternal).toLowerCase()}_connect`,
+                `trezor_${getNarrowedDeviceModelInternal(deviceModelInternal).toLowerCase()}_connect`,
             );
         } else if (type === 'BLOCK') {
             loadAnimation('cubes_line');
diff --git a/packages/components/src/components/buttons/Button/Button.stories.tsx b/packages/components/src/components/buttons/Button/Button.stories.tsx
index 8defbc1befa..e0822a1cf87 100644
--- a/packages/components/src/components/buttons/Button/Button.stories.tsx
+++ b/packages/components/src/components/buttons/Button/Button.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { allowedButtonFrameProps, Button as ButtonComponent, ButtonProps } from './Button';
 import { getFramePropsStory } from '../../../utils/frameProps';
 import { variables } from '../../../config';
diff --git a/packages/components/src/components/buttons/Button/Button.tsx b/packages/components/src/components/buttons/Button/Button.tsx
index 934bbfb7d85..be95425b49e 100644
--- a/packages/components/src/components/buttons/Button/Button.tsx
+++ b/packages/components/src/components/buttons/Button/Button.tsx
@@ -1,6 +1,9 @@
 import { ButtonHTMLAttributes } from 'react';
+
 import styled, { useTheme } from 'styled-components';
-import { borders, Elevation, spacingsPx, typography } from '@trezor/theme';
+
+import { borders, CSSColor, Elevation, spacingsPx, typography } from '@trezor/theme';
+
 import { Spinner } from '../../loaders/Spinner/Spinner';
 import {
     ButtonSize,
@@ -61,7 +64,6 @@ export const ButtonContainer = styled.button<ButtonContainerProps>`
 
     ${getFocusShadowStyle()}
     ${({ $variant, $isSubtle, $elevation }) => useVariantStyle($variant, $isSubtle, $elevation)}
-
     &:disabled {
         background: ${({ theme }) => theme.backgroundNeutralDisabled};
         color: ${({ theme }) => theme.textDisabled};
@@ -127,15 +129,13 @@ export type ButtonProps = SelectedHTMLButtonProps &
         textWrap?: boolean;
     };
 
-export const getIcon = ({
-    icon,
-    size,
-    color,
-}: {
+type GetIconProps = {
     icon?: IconName | React.ReactElement;
     size?: number;
-    color?: string;
-}) => {
+    color?: CSSColor;
+};
+
+export const getIcon = ({ icon, size, color }: GetIconProps) => {
     if (!icon) return null;
     if (typeof icon === 'string') {
         return <Icon name={icon as IconName} size={size} color={color} />;
diff --git a/packages/components/src/components/buttons/Button/buttons.stories.tsx b/packages/components/src/components/buttons/Button/buttons.stories.tsx
index 1fc6df2080d..e120c3a9599 100644
--- a/packages/components/src/components/buttons/Button/buttons.stories.tsx
+++ b/packages/components/src/components/buttons/Button/buttons.stories.tsx
@@ -1,9 +1,11 @@
-import { Button } from '../../../index';
 import { Meta, StoryFn } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+
 import { capitalizeFirstLetter } from '@trezor/utils';
+
+import { Button } from '../../../index';
 import { StoryColumn } from '../../../support/Story';
 import { ButtonVariant } from '../buttonStyleUtils';
-import { action } from '@storybook/addon-actions';
 
 const variants: Array<ButtonVariant> = ['primary', 'tertiary', 'info', 'warning', 'destructive'];
 
diff --git a/packages/components/src/components/buttons/ButtonGroup/ButtonGroup.tsx b/packages/components/src/components/buttons/ButtonGroup/ButtonGroup.tsx
index eb561288197..c7631de2823 100644
--- a/packages/components/src/components/buttons/ButtonGroup/ButtonGroup.tsx
+++ b/packages/components/src/components/buttons/ButtonGroup/ButtonGroup.tsx
@@ -1,6 +1,9 @@
 import React from 'react';
+
 import styled from 'styled-components';
+
 import { borders } from '@trezor/theme';
+
 import { ButtonProps } from '../Button/Button';
 import { ButtonSize, ButtonVariant } from '../buttonStyleUtils';
 import { IconButtonProps } from '../IconButton/IconButton';
diff --git a/packages/components/src/components/buttons/ButtonGroup/ButtonGroups.stories.tsx b/packages/components/src/components/buttons/ButtonGroup/ButtonGroups.stories.tsx
index 3a2f79b7ed7..95dacead1c6 100644
--- a/packages/components/src/components/buttons/ButtonGroup/ButtonGroups.stories.tsx
+++ b/packages/components/src/components/buttons/ButtonGroup/ButtonGroups.stories.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
+
 import { Meta, StoryObj } from '@storybook/react';
+
 import { StoryColumn } from '../../../support/Story';
 import { Button } from '../Button/Button';
 import { ButtonGroup } from './ButtonGroup';
diff --git a/packages/components/src/components/buttons/IconButton/IconButton.stories.tsx b/packages/components/src/components/buttons/IconButton/IconButton.stories.tsx
index 9fb9db388b8..1ba9795d09a 100644
--- a/packages/components/src/components/buttons/IconButton/IconButton.stories.tsx
+++ b/packages/components/src/components/buttons/IconButton/IconButton.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { IconButton as IconButtonComponent, IconButtonProps } from './IconButton';
 import { variables } from '../../../config';
 import { buttonSizes, buttonVariants, subtleButtonVariants } from '../buttonStyleUtils';
diff --git a/packages/components/src/components/buttons/IconButton/IconButton.tsx b/packages/components/src/components/buttons/IconButton/IconButton.tsx
index af676067806..39c7c441eda 100644
--- a/packages/components/src/components/buttons/IconButton/IconButton.tsx
+++ b/packages/components/src/components/buttons/IconButton/IconButton.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
 import { Spinner } from '../../loaders/Spinner/Spinner';
 import { ButtonContainer, ButtonProps, getIcon, IconOrComponent } from '../Button/Button';
 import { ButtonVariant, getIconColor, getIconSize, getPadding } from '../buttonStyleUtils';
diff --git a/packages/components/src/components/buttons/IconButton/IconButtons.stories.tsx b/packages/components/src/components/buttons/IconButton/IconButtons.stories.tsx
index e49974fc70c..f7442d3e9be 100644
--- a/packages/components/src/components/buttons/IconButton/IconButtons.stories.tsx
+++ b/packages/components/src/components/buttons/IconButton/IconButtons.stories.tsx
@@ -1,8 +1,10 @@
 import React from 'react';
+
+import { Meta, StoryObj } from '@storybook/react';
+
 import { IconButton } from '../../../index';
 import { StoryColumn } from '../../../support/Story';
 import { ButtonVariant } from '../buttonStyleUtils';
-import { Meta, StoryObj } from '@storybook/react';
 
 const variants: Array<Exclude<ButtonVariant, 'danger'>> = ['primary', 'tertiary'];
 
diff --git a/packages/components/src/components/buttons/PinButton/PinButton.stories.tsx b/packages/components/src/components/buttons/PinButton/PinButton.stories.tsx
index 7d330768fdb..9cbcedeae7a 100644
--- a/packages/components/src/components/buttons/PinButton/PinButton.stories.tsx
+++ b/packages/components/src/components/buttons/PinButton/PinButton.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { PinButton as PinButtonComponent } from './PinButton';
 
 const meta: Meta = {
diff --git a/packages/components/src/components/buttons/PinButton/PinButton.tsx b/packages/components/src/components/buttons/PinButton/PinButton.tsx
index e881aba4bec..d22e9e57666 100644
--- a/packages/components/src/components/buttons/PinButton/PinButton.tsx
+++ b/packages/components/src/components/buttons/PinButton/PinButton.tsx
@@ -1,3 +1,7 @@
+import { ButtonHTMLAttributes } from 'react';
+
+import styled from 'styled-components';
+
 import {
     Elevation,
     borders,
@@ -5,8 +9,7 @@ import {
     mapElevationToBorder,
     spacingsPx,
 } from '@trezor/theme';
-import { ButtonHTMLAttributes } from 'react';
-import styled from 'styled-components';
+
 import { useElevation } from '../../ElevationContext/ElevationContext';
 
 const Button = styled.button<{ $elevation: Elevation }>`
diff --git a/packages/components/src/components/buttons/TextButton/TextButton.stories.tsx b/packages/components/src/components/buttons/TextButton/TextButton.stories.tsx
index a467b60a466..666318f5977 100644
--- a/packages/components/src/components/buttons/TextButton/TextButton.stories.tsx
+++ b/packages/components/src/components/buttons/TextButton/TextButton.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { TextButton as TextButtonComponent, TextButtonProps } from './TextButton';
 import { variables } from '../../../config';
 import { buttonSizes } from '../buttonStyleUtils';
diff --git a/packages/components/src/components/buttons/TextButton/TextButton.tsx b/packages/components/src/components/buttons/TextButton/TextButton.tsx
index 1057bf04716..b5746b4c592 100644
--- a/packages/components/src/components/buttons/TextButton/TextButton.tsx
+++ b/packages/components/src/components/buttons/TextButton/TextButton.tsx
@@ -1,6 +1,9 @@
 import React from 'react';
+
 import styled from 'styled-components';
+
 import { borders, spacingsPx, typography } from '@trezor/theme';
+
 import { ButtonProps, getIcon } from '../Button/Button';
 import { ButtonSize, getIconSize, IconAlignment } from '../buttonStyleUtils';
 import { Spinner } from '../../loaders/Spinner/Spinner';
@@ -9,12 +12,11 @@ import { focusStyleTransition, getFocusShadowStyle } from '../../../utils/utils'
 const TextButtonContainer = styled.button<{
     $size: ButtonSize;
     $iconAlignment: IconAlignment;
-    $hasIcon: boolean;
 }>`
     display: flex;
     align-items: center;
     flex-direction: ${({ $iconAlignment }) => $iconAlignment === 'right' && 'row-reverse'};
-    gap: ${({ $hasIcon }) => $hasIcon && spacingsPx.xs};
+    gap: ${spacingsPx.xs};
     height: ${({ $size: size }) => (size === 'small' ? 22 : 26)}px;
     padding: ${spacingsPx.xxs};
     border: 1px solid transparent;
@@ -68,12 +70,10 @@ export const TextButton = ({
     ...rest
 }: TextButtonProps) => {
     const IconComponent = getIcon({ icon, size: getIconSize(size) });
-
     const Loader = <Spinner size={getIconSize(size)} />;
 
     return (
         <TextButtonContainer
-            $hasIcon={!!icon}
             $size={size}
             $iconAlignment={iconAlignment}
             disabled={isDisabled || isLoading}
@@ -81,7 +81,6 @@ export const TextButton = ({
         >
             {!isLoading && icon && IconComponent}
             {isLoading && Loader}
-
             {children}
         </TextButtonContainer>
     );
diff --git a/packages/components/src/components/buttons/TextButton/TextButtons.stories.tsx b/packages/components/src/components/buttons/TextButton/TextButtons.stories.tsx
index 22eebfbc248..42fa8c88d59 100644
--- a/packages/components/src/components/buttons/TextButton/TextButtons.stories.tsx
+++ b/packages/components/src/components/buttons/TextButton/TextButtons.stories.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
+
 import { Meta, StoryFn } from '@storybook/react';
+
 import { TextButton } from '../../../index';
 import { StoryColumn } from '../../../support/Story';
 
diff --git a/packages/components/src/components/buttons/buttonStyleUtils.ts b/packages/components/src/components/buttons/buttonStyleUtils.ts
index 25c41071ba0..fb00519dad3 100644
--- a/packages/components/src/components/buttons/buttonStyleUtils.ts
+++ b/packages/components/src/components/buttons/buttonStyleUtils.ts
@@ -1,10 +1,11 @@
 import { DefaultTheme, css, useTheme } from 'styled-components';
 
 import { Color, Colors, Elevation, spacings, spacingsPx } from '@trezor/theme';
-import type { UIHorizontalAlignment, UISize, UIVariant } from '../../config/types';
 import { hexToRgba } from '@suite-common/suite-utils';
 import { capitalizeFirstLetter } from '@trezor/utils';
 
+import type { UIHorizontalAlignment, UISize, UIVariant } from '../../config/types';
+
 const SUBTLE_ALPHA = 0.12;
 const SUBTLE_ALPHA_HOVER = 0.2;
 
@@ -14,7 +15,7 @@ export const buttonVariants = ['primary', 'tertiary', ...subtleButtonVariants] a
 
 export type ButtonVariant = Extract<UIVariant, (typeof buttonVariants)[number]>;
 
-export const buttonSizes: Array<UISize> = ['large', 'medium', 'small', 'tiny'];
+export const buttonSizes = ['large', 'medium', 'small', 'tiny'] as const;
 export type ButtonSize = Extract<UISize, (typeof buttonSizes)[number]>;
 
 export type IconAlignment = Extract<UIHorizontalAlignment, 'left' | 'right'>;
diff --git a/packages/components/src/components/form/BottomText.tsx b/packages/components/src/components/form/BottomText.tsx
index 2e1204590fd..63de78a3517 100644
--- a/packages/components/src/components/form/BottomText.tsx
+++ b/packages/components/src/components/form/BottomText.tsx
@@ -1,10 +1,25 @@
-import styled, { keyframes } from 'styled-components';
-import { spacingsPx, typography } from '@trezor/theme';
-import { getInputStateTextColor } from './InputStyles';
 import { ReactNode } from 'react';
+
+import styled, { keyframes } from 'styled-components';
+
+import { spacings } from '@trezor/theme';
+
+import { IconName, Icon, IconVariant } from '../Icon/Icon';
 import { InputState } from './inputTypes';
+import { Row } from '../Flex/Flex';
+import { Text, TextVariant } from '../typography/Text/Text';
+import { UIVariant } from '../../config/types';
 
-export const BOTTOM_TEXT_MIN_HEIGHT = 26; // 1 line of text + top padding
+export const mapInputStateToUIVariant = (inputState: InputState): UIVariant => {
+    const variantMap: Record<InputState, UIVariant> = {
+        error: 'destructive',
+        primary: 'primary',
+        warning: 'warning',
+        default: 'tertiary',
+    };
+
+    return variantMap[inputState];
+};
 
 const slideDown = keyframes`
     from {
@@ -17,35 +32,38 @@ const slideDown = keyframes`
     }
 `;
 
-export const Container = styled.div<{ $inputState?: InputState; $isDisabled?: boolean }>`
-    display: flex;
-    align-items: center;
-    gap: ${spacingsPx.xxs};
-    padding: ${spacingsPx.xs} ${spacingsPx.sm} 0 ${spacingsPx.sm};
-    min-height: ${BOTTOM_TEXT_MIN_HEIGHT}px;
-    color: ${({ $inputState, $isDisabled, theme }) =>
-        $isDisabled ? theme.textDisabled : getInputStateTextColor($inputState, theme)};
-    ${typography.label}
+export const Container = styled.div`
     animation: ${slideDown} 0.18s ease-in-out forwards;
 `;
 
-interface BottomTextProps {
+type BottomTextProps = {
     inputState?: InputState;
     isDisabled?: boolean;
     iconComponent?: ReactNode;
+    iconName?: IconName;
     children: ReactNode;
-}
+};
 
 export const BottomText = ({
-    inputState,
+    inputState = 'default',
     isDisabled,
     iconComponent,
+    iconName,
     children,
 }: BottomTextProps) => {
+    const variant = isDisabled ? 'disabled' : mapInputStateToUIVariant(inputState);
+
     return (
-        <Container $inputState={inputState} $isDisabled={isDisabled}>
-            {iconComponent}
-            {children}
+        <Container>
+            <Row gap={spacings.xxs}>
+                {iconComponent ??
+                    (iconName && (
+                        <Icon name={iconName} size="medium" variant={variant as IconVariant} />
+                    ))}
+                <Text variant={variant as TextVariant} typographyStyle="hint" as="div">
+                    {children}
+                </Text>
+            </Row>
         </Container>
     );
 };
diff --git a/packages/components/src/components/form/Checkbox/Checkbox.tsx b/packages/components/src/components/form/Checkbox/Checkbox.tsx
index 17dac7db245..0926274b8eb 100755
--- a/packages/components/src/components/form/Checkbox/Checkbox.tsx
+++ b/packages/components/src/components/form/Checkbox/Checkbox.tsx
@@ -1,5 +1,7 @@
 import { EventHandler, SyntheticEvent, KeyboardEvent, ReactNode } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
 import { borders, Color, spacingsPx, typography } from '@trezor/theme';
 
 import { KEYBOARD_CODE } from '../../../constants/keyboardEvents';
@@ -142,7 +144,7 @@ const CheckIcon = styled(Icon)<{ $isVisible: boolean }>`
 
 export const Label = styled.div<{ $isRed: boolean }>`
     display: flex;
-    justify-content: center;
+    flex: 1;
     text-align: left;
     user-select: none;
     color: ${({ theme, $isRed }) => $isRed && theme.textAlertRed};
@@ -206,12 +208,14 @@ export const Checkbox = ({
 
     return (
         <Container
+            // @ts-expect-error - needed for cypress retry-ability
+            disabled={isDisabled}
+            data-testid={dataTest}
             $isDisabled={isDisabled}
             $labelAlignment={labelAlignment}
             $verticalAlignment={verticalAlignment}
             onClick={isDisabled ? undefined : onClick}
             onKeyUp={handleKeyUp}
-            data-testid={dataTest}
             className={className}
             {...frameProps}
         >
diff --git a/packages/components/src/components/form/FormCell/FormCell.stories.tsx b/packages/components/src/components/form/FormCell/FormCell.stories.tsx
new file mode 100644
index 00000000000..789acb1ed93
--- /dev/null
+++ b/packages/components/src/components/form/FormCell/FormCell.stories.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+
+import { Meta, StoryObj } from '@storybook/react';
+
+import { FormCell as FormCellComponent, allowedFormCellFrameProps } from './FormCell';
+import { SkeletonRectangle } from '../../skeletons/SkeletonRectangle';
+import { variables } from '../../../config';
+import { getFramePropsStory } from '../../../utils/frameProps';
+
+const meta: Meta = {
+    title: 'Form',
+} as Meta;
+export default meta;
+
+export const FormCell: StoryObj = {
+    render: props => (
+        <FormCellComponent {...props}>
+            <SkeletonRectangle width="100%" height={40} />
+        </FormCellComponent>
+    ),
+    args: {
+        inputState: 'error',
+        labelLeft: 'Label left',
+        labelRight: 'Label right',
+        labelHoverRight: 'Label hover right',
+        bottomText: 'Bottom text',
+        bottomTextIconName: 'info',
+        ...getFramePropsStory(allowedFormCellFrameProps).args,
+    },
+    argTypes: {
+        bottomText: { control: 'text' },
+        labelHoverRight: { control: 'text' },
+        labelLeft: { control: 'text' },
+        labelRight: { control: 'text' },
+        inputState: { control: 'select', options: ['error', 'warning', 'primary'] },
+        bottomTextIconName: {
+            options: ['none', ...variables.ICONS],
+            mapping: {
+                ...variables.ICONS,
+                none: undefined,
+            },
+            control: {
+                type: 'select',
+            },
+        },
+        ...getFramePropsStory(allowedFormCellFrameProps).argTypes,
+    },
+};
diff --git a/packages/components/src/components/form/FormCell/FormCell.tsx b/packages/components/src/components/form/FormCell/FormCell.tsx
new file mode 100644
index 00000000000..ab788ca8377
--- /dev/null
+++ b/packages/components/src/components/form/FormCell/FormCell.tsx
@@ -0,0 +1,108 @@
+import { ReactNode, useState } from 'react';
+
+import styled from 'styled-components';
+
+import { spacings } from '@trezor/theme';
+
+import {
+    FrameProps,
+    FramePropsKeys,
+    pickAndPrepareFrameProps,
+    withFrameProps,
+} from '../../../utils/frameProps';
+import { Column } from '../../Flex/Flex';
+import { InputState } from '../inputTypes';
+import { TopAddons } from '../TopAddons';
+import { BottomText } from '../BottomText';
+import { IconName } from '../../Icon/Icon';
+import { TransientProps } from '../../../utils/transientProps';
+
+export const allowedFormCellFrameProps = [
+    'margin',
+    'width',
+    'maxWidth',
+] as const satisfies FramePropsKeys[];
+type AllowedFrameProps = Pick<FrameProps, (typeof allowedFormCellFrameProps)[number]>;
+
+const formCellProps = [
+    'labelHoverRight',
+    'labelLeft',
+    'labelRight',
+    'bottomText',
+    'bottomTextIconComponent',
+    'inputState',
+    'isDisabled',
+    'className',
+    ...allowedFormCellFrameProps,
+] as const satisfies (keyof FormCellProps)[];
+
+export const pickFormCellProps = (props: Record<string, any>): Partial<FormCellProps> =>
+    formCellProps.reduce(
+        (acc: Partial<FormCellProps>, prop: string) => ({ ...acc, [prop]: props[prop] }),
+        {},
+    );
+
+const Wrapper = styled.div<TransientProps<AllowedFrameProps>>`
+    width: 100%;
+
+    ${withFrameProps}
+`;
+
+export type FormCellProps = AllowedFrameProps & {
+    labelHoverRight?: React.ReactNode;
+    labelLeft?: React.ReactNode;
+    labelRight?: React.ReactNode;
+    bottomText?: ReactNode;
+    bottomTextIconComponent?: ReactNode;
+    bottomTextIconName?: IconName;
+    inputState?: InputState;
+    isDisabled?: boolean;
+    children: ReactNode;
+    className?: string;
+};
+
+export const FormCell = ({
+    children,
+    labelLeft,
+    labelRight,
+    labelHoverRight,
+    bottomText,
+    bottomTextIconComponent,
+    bottomTextIconName,
+    inputState,
+    isDisabled,
+    className,
+    ...rest
+}: FormCellProps) => {
+    const [isHovered, setIsHovered] = useState(false);
+    const frameProps = pickAndPrepareFrameProps(rest, allowedFormCellFrameProps);
+
+    return (
+        <Wrapper
+            {...frameProps}
+            className={className}
+            onMouseEnter={() => setIsHovered(true)}
+            onMouseLeave={() => setIsHovered(false)}
+        >
+            <Column alignItems="stretch" gap={spacings.xs}>
+                <TopAddons
+                    isHovered={isHovered}
+                    addonLeft={labelLeft}
+                    hoverAddonRight={labelHoverRight}
+                    addonRight={labelRight}
+                />
+                {children}
+                {bottomText && (
+                    <BottomText
+                        inputState={inputState}
+                        isDisabled={isDisabled}
+                        iconComponent={bottomTextIconComponent}
+                        iconName={bottomTextIconName}
+                    >
+                        {bottomText}
+                    </BottomText>
+                )}
+            </Column>
+        </Wrapper>
+    );
+};
diff --git a/packages/components/src/components/form/Input/Input.stories.tsx b/packages/components/src/components/form/Input/Input.stories.tsx
index 9ca6ed3ecb4..1cb8d34a625 100644
--- a/packages/components/src/components/form/Input/Input.stories.tsx
+++ b/packages/components/src/components/form/Input/Input.stories.tsx
@@ -1,8 +1,16 @@
 import { ChangeEvent } from 'react';
+
 import { useArgs } from '@storybook/client-api';
 import { Meta, StoryObj } from '@storybook/react';
 
-import { Input as InputComponent, InputProps } from './Input';
+import {
+    Input as InputComponent,
+    InputProps,
+    allowedInputFrameProps,
+    allowedInputTextProps,
+} from './Input';
+import { getFramePropsStory } from '../../../utils/frameProps';
+import { getTextPropsStory } from '../../typography/utils';
 
 const meta: Meta = {
     title: 'Form',
@@ -13,7 +21,8 @@ const meta: Meta = {
         size: 'large',
         inputState: null,
         innerAddonAlign: 'right',
-        hasBottomPadding: true,
+        ...getFramePropsStory(allowedInputFrameProps).args,
+        ...getTextPropsStory(allowedInputTextProps).args,
     },
     argTypes: {
         bottomText: { control: 'text' },
@@ -28,12 +37,7 @@ const meta: Meta = {
             },
             options: ['large', 'small'],
         },
-        inputState: {
-            control: {
-                type: 'radio',
-            },
-            options: [null, 'warning', 'error'],
-        },
+        inputState: { control: 'select', options: ['error', 'warning', 'primary'] },
         innerAddonAlign: {
             control: {
                 type: 'radio',
@@ -46,6 +50,8 @@ const meta: Meta = {
             },
             options: [null, 'hover', 'always'],
         },
+        ...getFramePropsStory(allowedInputFrameProps).argTypes,
+        ...getTextPropsStory(allowedInputTextProps).argTypes,
     },
 } as Meta;
 export default meta;
diff --git a/packages/components/src/components/form/Input/Input.tsx b/packages/components/src/components/form/Input/Input.tsx
index a7068830bac..c46db9c9b12 100644
--- a/packages/components/src/components/form/Input/Input.tsx
+++ b/packages/components/src/components/form/Input/Input.tsx
@@ -1,7 +1,10 @@
-import { useState, Ref, ReactNode, ReactElement, InputHTMLAttributes } from 'react';
-import styled, { useTheme } from 'styled-components';
+import { useState, Ref, ReactElement, InputHTMLAttributes } from 'react';
 import { useMeasure } from 'react-use';
-import { spacingsPx, spacings, typography, TypographyStyle } from '@trezor/theme';
+
+import styled from 'styled-components';
+
+import { spacingsPx, spacings, typography } from '@trezor/theme';
+
 import { Icon } from '../../Icon/Icon';
 import {
     baseInputStyle,
@@ -10,24 +13,32 @@ import {
     Label,
     LABEL_TRANSFORM,
 } from '../InputStyles';
-import { BOTTOM_TEXT_MIN_HEIGHT, BottomText } from '../BottomText';
-import { InputState, InputSize } from '../inputTypes';
-import { TopAddons } from '../TopAddons';
+import { InputSize } from '../inputTypes';
+import {
+    FormCell,
+    FormCellProps,
+    allowedFormCellFrameProps,
+    pickFormCellProps,
+} from '../FormCell/FormCell';
 import { useElevation } from '../../ElevationContext/ElevationContext';
 import { UIHorizontalAlignment } from '../../../config/types';
-import { TextPropsKeys, withTextProps, TextProps as TextPropsCommon } from '../../typography/utils';
+import {
+    TextPropsKeys,
+    withTextProps,
+    TextProps,
+    pickAndPrepareTextProps,
+} from '../../typography/utils';
 import { TransientProps } from '../../../utils/transientProps';
+import { FrameProps } from '../../../utils/frameProps';
 
-export const allowedInputTextProps = ['typographyStyle'] as const satisfies TextPropsKeys[];
-type AllowedInputTextProps = Pick<TextPropsCommon, (typeof allowedInputTextProps)[number]>;
+export const allowedInputFrameProps = allowedFormCellFrameProps;
+type AllowedFrameProps = Pick<FrameProps, (typeof allowedInputFrameProps)[number]>;
 
-const Wrapper = styled.div<{ $width?: number; $hasBottomPadding: boolean }>`
-    display: inline-flex;
-    flex-direction: column;
-    width: ${({ $width }) => ($width ? `${$width}px` : '100%')};
-    padding-bottom: ${({ $hasBottomPadding }) =>
-        $hasBottomPadding ? `${BOTTOM_TEXT_MIN_HEIGHT}px` : '0'};
-`;
+export const allowedInputTextProps = [
+    'typographyStyle',
+    'align',
+] as const satisfies TextPropsKeys[];
+type AllowedTextProps = Pick<TextProps, (typeof allowedInputTextProps)[number]>;
 
 interface StyledInputProps extends BaseInputProps {
     $size: InputSize;
@@ -39,7 +50,7 @@ interface StyledInputProps extends BaseInputProps {
 const getExtraAddonPadding = (size: InputSize) =>
     (size === 'small' ? spacings.sm : spacings.md) + spacings.xs;
 
-const StyledInput = styled.input<StyledInputProps & TransientProps<AllowedInputTextProps>>`
+const StyledInput = styled.input<StyledInputProps & TransientProps<AllowedTextProps>>`
     padding: 0 ${spacingsPx.md};
     padding-left: ${({ $leftAddonWidth, $size }) =>
         $leftAddonWidth ? `${$leftAddonWidth + getExtraAddonPadding($size)}px` : undefined};
@@ -48,12 +59,13 @@ const StyledInput = styled.input<StyledInputProps & TransientProps<AllowedInputT
     height: ${({ $size }) => `${INPUT_HEIGHTS[$size as InputSize]}px`};
     ${baseInputStyle}
     ${({ $size }) => $size === 'small' && typography.hint};
-    ${withTextProps}
 
     &:disabled {
         pointer-events: auto;
         cursor: not-allowed;
     }
+
+    ${withTextProps}
 `;
 
 const InputWrapper = styled.div`
@@ -84,61 +96,45 @@ const InputLabel = styled(Label)`
 
 type innerAddonAlignment = Extract<UIHorizontalAlignment, 'left' | 'right'>;
 
-export interface InputProps extends Omit<InputHTMLAttributes<HTMLInputElement>, 'size'> {
-    value?: string;
-    innerRef?: Ref<HTMLInputElement>;
-    label?: ReactElement | string;
-    labelHoverRight?: React.ReactNode;
-    labelLeft?: React.ReactNode;
-    labelRight?: React.ReactNode;
-    innerAddon?: ReactElement;
-    /**
-     * @description pass `null` if bottom text can be `undefined`
-     */
-    bottomText?: ReactNode;
-    bottomTextIconComponent?: ReactNode;
-    isDisabled?: boolean;
-    size?: InputSize;
-    className?: string;
-    'data-testid'?: string;
-    inputState?: InputState; // TODO: do we need this? we only have the error state right now
-    innerAddonAlign?: innerAddonAlignment;
-    hasBottomPadding?: boolean;
-    typographyStyle?: TypographyStyle;
-    /**
-     * @description the clear button replaces the addon on the right side
-     */
-    showClearButton?: 'hover' | 'always';
-    onClear?: () => void;
-}
+export type InputProps = Omit<InputHTMLAttributes<HTMLInputElement>, 'size'> &
+    AllowedFrameProps &
+    AllowedTextProps &
+    Omit<FormCellProps, 'children'> & {
+        value?: string;
+        innerRef?: Ref<HTMLInputElement>;
+        label?: ReactElement | string;
+        innerAddon?: ReactElement;
+        size?: InputSize;
+        'data-testid'?: string;
+        innerAddonAlign?: innerAddonAlignment;
+        hasBottomPadding?: boolean;
+        /**
+         * @description the clear button replaces the addon on the right side
+         */
+        showClearButton?: 'hover' | 'always';
+        onClear?: () => void;
+    };
 
 const Input = ({
     value,
     innerRef,
     inputState,
     label,
-    labelLeft,
-    labelRight,
-    labelHoverRight,
     innerAddon,
-    bottomTextIconComponent,
     innerAddonAlign = 'right',
-    bottomText,
     size = 'large',
-    isDisabled,
     'data-testid': dataTest,
     showClearButton,
     placeholder,
+    isDisabled,
     onClear,
     hasBottomPadding = true,
-    typographyStyle = 'body',
-    className,
     ...rest
 }: InputProps) => {
     const [isHovered, setIsHovered] = useState(false);
-
-    const theme = useTheme();
     const { elevation } = useElevation();
+    const textProps = pickAndPrepareTextProps(rest, allowedInputTextProps);
+    const formCellProps = pickFormCellProps(rest);
 
     const hasShowClearButton =
         (showClearButton === 'always' || (showClearButton === 'hover' && isHovered)) &&
@@ -149,20 +145,11 @@ const Input = ({
     const [measureRightAddon, { width: rightAddonWidth }] = useMeasure<HTMLDivElement>();
 
     return (
-        <Wrapper
-            onMouseEnter={() => setIsHovered(true)}
-            onMouseLeave={() => setIsHovered(false)}
-            $hasBottomPadding={hasBottomPadding === true && bottomText === null}
-            className={className}
-        >
-            <TopAddons
-                isHovered={isHovered}
-                addonLeft={labelLeft}
-                hoverAddonRight={labelHoverRight}
-                addonRight={labelRight}
-            />
-
-            <InputWrapper>
+        <FormCell {...formCellProps} isDisabled={isDisabled} inputState={inputState}>
+            <InputWrapper
+                onMouseEnter={() => setIsHovered(true)}
+                onMouseLeave={() => setIsHovered(false)}
+            >
                 {innerAddon && innerAddonAlign === 'left' && (
                     <InputAddon $align="left" ref={measureLeftAddon} $size={size}>
                         {innerAddon}
@@ -174,13 +161,7 @@ const Input = ({
                         {!hasShowClearButton && innerAddon}
 
                         {hasShowClearButton && (
-                            <Icon
-                                name="cancel"
-                                size={16}
-                                onClick={onClear}
-                                color={theme.legacy.TYPE_DARK_GREY}
-                                cursorPointer
-                            />
+                            <Icon name="xCircle" size={16} onClick={onClear} cursorPointer />
                         )}
                     </InputAddon>
                 )}
@@ -200,9 +181,9 @@ const Input = ({
                     $leftAddonWidth={leftAddonWidth}
                     $rightAddonWidth={rightAddonWidth}
                     $isWithLabel={!!label}
-                    $typographyStyle={typographyStyle}
                     placeholder={placeholder || ''} // needed for uncontrolled inputs
                     data-testid={dataTest}
+                    {...textProps}
                     {...rest}
                 />
 
@@ -212,17 +193,7 @@ const Input = ({
                     </InputLabel>
                 )}
             </InputWrapper>
-
-            {bottomText && (
-                <BottomText
-                    inputState={inputState}
-                    isDisabled={isDisabled}
-                    iconComponent={bottomTextIconComponent}
-                >
-                    {bottomText}
-                </BottomText>
-            )}
-        </Wrapper>
+        </FormCell>
     );
 };
 
diff --git a/packages/components/src/components/form/InputStyles.ts b/packages/components/src/components/form/InputStyles.ts
index c5aa3f26140..0e1ed09effa 100644
--- a/packages/components/src/components/form/InputStyles.ts
+++ b/packages/components/src/components/form/InputStyles.ts
@@ -1,4 +1,5 @@
 import styled, { css, DefaultTheme } from 'styled-components';
+
 import {
     borders,
     spacingsPx,
diff --git a/packages/components/src/components/form/Radio/Radio.stories.tsx b/packages/components/src/components/form/Radio/Radio.stories.tsx
index 604e27a3dc0..8c38067465c 100644
--- a/packages/components/src/components/form/Radio/Radio.stories.tsx
+++ b/packages/components/src/components/form/Radio/Radio.stories.tsx
@@ -71,7 +71,7 @@ export const RadioButtonGroup: StoryObj = {
         // eslint-disable-next-line
         const [{ option }, updateArgs] = useArgs();
 
-        const setOption = (option: string) => updateArgs({ option });
+        const setOption = (option2: string) => updateArgs({ option: option2 });
 
         return (
             <Wrapper>
diff --git a/packages/components/src/components/form/Radio/Radio.tsx b/packages/components/src/components/form/Radio/Radio.tsx
index e60fc22a591..25d6c59396a 100755
--- a/packages/components/src/components/form/Radio/Radio.tsx
+++ b/packages/components/src/components/form/Radio/Radio.tsx
@@ -1,5 +1,7 @@
 import { EventHandler, KeyboardEvent, ReactNode, SyntheticEvent } from 'react';
+
 import styled from 'styled-components';
+
 import { Color, borders } from '@trezor/theme';
 
 import { KEYBOARD_CODE } from '../../../constants/keyboardEvents';
diff --git a/packages/components/src/components/form/Range/Range.tsx b/packages/components/src/components/form/Range/Range.tsx
index 1e94733617c..9416ae2676e 100644
--- a/packages/components/src/components/form/Range/Range.tsx
+++ b/packages/components/src/components/form/Range/Range.tsx
@@ -6,6 +6,7 @@ import {
     KeyboardEventHandler,
     ChangeEventHandler,
 } from 'react';
+
 import styled, { css, CSSObject } from 'styled-components';
 
 import { borders, spacingsPx, typography } from '@trezor/theme';
diff --git a/packages/components/src/components/form/Select/Select.stories.tsx b/packages/components/src/components/form/Select/Select.stories.tsx
index 90ae578a8d9..dc56e31d38a 100644
--- a/packages/components/src/components/form/Select/Select.stories.tsx
+++ b/packages/components/src/components/form/Select/Select.stories.tsx
@@ -25,7 +25,8 @@ export const Select: StoryObj<SelectProps> = {
     render: ({ ...args }) => {
         // eslint-disable-next-line
         const [{ option }, updateArgs] = useArgs();
-        const setOption = (option: { label: string; value: 'string' }) => updateArgs({ option });
+        const setOption = (option2: { label: string; value: 'string' }) =>
+            updateArgs({ option: option2 });
 
         return <SelectComponent {...args} value={option} onChange={setOption} options={options} />;
     },
@@ -34,7 +35,6 @@ export const Select: StoryObj<SelectProps> = {
         isClean: false,
         isDisabled: false,
         isSearchable: false,
-        hasBottomPadding: true,
         size: 'large',
         minValueWidth: 'initial',
         isMenuOpen: undefined,
@@ -66,11 +66,9 @@ export const Select: StoryObj<SelectProps> = {
         bottomText: {
             control: { type: 'text' },
         },
-        hasBottomPadding: {
-            control: {
-                type: 'boolean',
-            },
-        },
+        labelHoverRight: { control: 'text' },
+        labelLeft: { control: 'text' },
+        labelRight: { control: 'text' },
         size: {
             control: {
                 type: 'radio',
@@ -90,12 +88,7 @@ export const Select: StoryObj<SelectProps> = {
                 type: 'boolean',
             },
         },
-        inputState: {
-            control: {
-                type: 'radio',
-            },
-            options: [null, 'warning', 'error'],
-        },
+        inputState: { control: 'select', options: ['error', 'warning', 'primary'] },
         placeholder: {
             control: { type: 'text' },
         },
diff --git a/packages/components/src/components/form/Select/Select.tsx b/packages/components/src/components/form/Select/Select.tsx
index 623d09fc0c3..473c7fc819d 100644
--- a/packages/components/src/components/form/Select/Select.tsx
+++ b/packages/components/src/components/form/Select/Select.tsx
@@ -1,6 +1,8 @@
 import { useCallback, useRef, ReactNode, useMemo } from 'react';
 import ReactSelect, { Props as ReactSelectProps, StylesConfig, SelectInstance } from 'react-select';
+
 import styled, { css, DefaultTheme, useTheme } from 'styled-components';
+
 import {
     borders,
     spacings,
@@ -14,8 +16,13 @@ import {
 } from '@trezor/theme';
 
 import { INPUT_HEIGHTS, LABEL_TRANSFORM, Label, baseInputStyle } from '../InputStyles';
-import { BOTTOM_TEXT_MIN_HEIGHT, BottomText } from '../BottomText';
-import { InputState, InputSize } from '../inputTypes';
+import { InputSize } from '../inputTypes';
+import {
+    FormCell,
+    FormCellProps,
+    allowedFormCellFrameProps,
+    pickFormCellProps,
+} from '../FormCell/FormCell';
 import {
     Control,
     ControlComponentProps,
@@ -27,10 +34,15 @@ import { useOnKeyDown } from './useOnKeyDown';
 import { useDetectPortalTarget } from './useDetectPortalTarget';
 import { DROPDOWN_MENU, menuStyle } from '../../Dropdown/menuStyle';
 import { useElevation } from '../../ElevationContext/ElevationContext';
+import { Spinner } from '../../loaders/Spinner/Spinner';
 import { TransientProps } from '../../../utils/transientProps';
+import { FrameProps } from '../../../utils/frameProps';
 
 const reactSelectClassNamePrefix = 'react-select';
 
+export const allowedSelectFrameProps = allowedFormCellFrameProps;
+type AllowedFrameProps = Pick<FrameProps, (typeof allowedSelectFrameProps)[number]>;
+
 const createSelectStyle = (
     theme: DefaultTheme,
     elevation: Elevation,
@@ -107,16 +119,14 @@ type WrapperProps = TransientProps<
 > & {
     $isWithLabel: boolean;
     $isWithPlaceholder: boolean;
-    $hasBottomPadding: boolean;
     $elevation: Elevation;
+    $isLoading?: boolean;
 };
 
-const Wrapper = styled.div<WrapperProps>`
+const SelectWrapper = styled.div<WrapperProps>`
     /* stylelint-disable selector-class-pattern */
-    position: relative;
     width: 100%;
-    padding-bottom: ${({ $hasBottomPadding: hasBottomPadding }) =>
-        hasBottomPadding ? `${BOTTOM_TEXT_MIN_HEIGHT}px` : '0'};
+    position: relative;
 
     ${({ $isClean }) =>
         !$isClean &&
@@ -176,7 +186,7 @@ const Wrapper = styled.div<WrapperProps>`
 
     .${reactSelectClassNamePrefix}__single-value {
         position: static;
-        display: flex;
+        display: ${({ $isLoading }) => ($isLoading ? 'none' : 'flex')};
         align-items: center;
         justify-content: ${({ $isClean }) => ($isClean ? 'flex-end' : 'flex-start')};
         max-width: initial;
@@ -244,61 +254,64 @@ const SelectLabel = styled(Label)`
     }
 `;
 
+const SpinnerWrapper = styled.div`
+    position: absolute;
+    top: 50%;
+    left: ${spacingsPx.md};
+    transform: translateY(-50%);
+`;
+
 // Prevent closing the menu when scrolling through options.
 const closeMenuOnScroll = (e: Event) =>
     !(e.target as Element)?.className?.startsWith(reactSelectClassNamePrefix);
 
 export type Option = any;
 
-interface CommonProps extends Omit<ReactSelectProps<Option>, 'onChange' | 'menuIsOpen'> {
-    isClean?: boolean;
-    label?: ReactNode;
-    size?: InputSize;
-    /**
-     * @description pass `null` if bottom text can be `undefined`
-     */
-    bottomText?: ReactNode;
-    hasBottomPadding?: boolean;
-    minValueWidth?: string; // TODO: should be probably removed
-    inputState?: InputState;
-    isMenuOpen?: boolean;
-    onChange?: (value: Option, ref?: SelectInstance<Option, boolean> | null) => void;
-    'data-testid'?: string;
-}
-
 // Make sure isSearchable can't be defined if useKeyPressScroll===true
 // If useKeyPressScroll is false or undefined, isSearchable is a boolean value
 type KeyPressScrollProps =
     | { useKeyPressScroll: true; isSearchable?: never }
     | { useKeyPressScroll?: false; isSearchable?: boolean };
 
-export type SelectProps = CommonProps & KeyPressScrollProps;
+export type SelectProps = KeyPressScrollProps &
+    AllowedFrameProps &
+    Omit<FormCellProps, 'children'> &
+    Omit<ReactSelectProps<Option>, 'onChange' | 'menuIsOpen'> & {
+        isClean?: boolean;
+        label?: ReactNode;
+        size?: InputSize;
+        hasBottomPadding?: boolean;
+        minValueWidth?: string;
+        isMenuOpen?: boolean;
+        isLoading?: boolean;
+        onChange?: (value: Option, ref?: SelectInstance<Option, boolean> | null) => void;
+        'data-testid'?: string;
+    };
 
 export const Select = ({
-    className,
     isClean = false,
     label,
     size = 'large',
-    bottomText,
     hasBottomPadding = true,
     useKeyPressScroll,
     isSearchable = false,
     minValueWidth = 'initial',
     isMenuOpen,
-    inputState,
     components,
     onChange,
     placeholder,
     isDisabled = false,
+    isLoading = false,
     'data-testid': dataTest,
     ...props
 }: SelectProps) => {
     const selectRef = useRef<SelectInstance<Option, boolean>>(null);
     const { elevation } = useElevation();
-
     const theme = useTheme();
     const onKeyDown = useOnKeyDown(selectRef, useKeyPressScroll);
     const menuPortalTarget = useDetectPortalTarget(selectRef);
+    const formCellProps = pickFormCellProps(props);
+
     const isRenderedInModal = menuPortalTarget !== null;
 
     const handleOnChange = useCallback<Required<ReactSelectProps>['onChange']>(
@@ -336,49 +349,50 @@ export const Select = ({
     );
 
     return (
-        <Wrapper
-            className={className}
-            $isClean={isClean}
-            $elevation={elevation}
-            $isSearchable={isSearchable}
-            $size={size}
-            $minValueWidth={minValueWidth}
-            $isDisabled={isDisabled}
-            $isMenuOpen={isMenuOpen}
-            $isWithLabel={!!label}
-            $isWithPlaceholder={!!placeholder}
-            $hasBottomPadding={hasBottomPadding === true && bottomText === null}
-        >
-            <ReactSelect
-                ref={selectRef}
-                onKeyDown={onKeyDown}
-                classNamePrefix={reactSelectClassNamePrefix}
-                openMenuOnFocus
-                closeMenuOnScroll={closeMenuOnScroll}
-                menuPosition="fixed" // Required for closeMenuOnScroll to work properly when near page bottom
-                menuPortalTarget={menuPortalTarget}
-                styles={createSelectStyle(theme, elevation, isRenderedInModal)}
-                onChange={handleOnChange}
-                isSearchable={isSearchable}
-                menuIsOpen={isMenuOpen}
-                isDisabled={isDisabled}
-                menuPlacement="auto"
-                placeholder={placeholder || ''}
-                {...props}
-                components={memoizedComponents}
-            />
-
-            {label && (
-                <SelectLabel $size={size} $isDisabled={isDisabled}>
-                    {label}
-                </SelectLabel>
-            )}
-
-            {bottomText && (
-                <BottomText inputState={inputState} isDisabled={isDisabled}>
-                    {bottomText}
-                </BottomText>
-            )}
-        </Wrapper>
+        <FormCell {...formCellProps} isDisabled={isDisabled}>
+            <SelectWrapper
+                $isClean={isClean}
+                $elevation={elevation}
+                $isSearchable={isSearchable}
+                $size={size}
+                $minValueWidth={minValueWidth}
+                $isDisabled={isDisabled}
+                $isLoading={isLoading}
+                $isMenuOpen={isMenuOpen}
+                $isWithLabel={!!label}
+                $isWithPlaceholder={!!placeholder}
+            >
+                <ReactSelect
+                    ref={selectRef}
+                    onKeyDown={onKeyDown}
+                    classNamePrefix={reactSelectClassNamePrefix}
+                    openMenuOnFocus
+                    closeMenuOnScroll={closeMenuOnScroll}
+                    menuPosition="fixed" // Required for closeMenuOnScroll to work properly when near page bottom
+                    menuPortalTarget={menuPortalTarget}
+                    styles={createSelectStyle(theme, elevation, isRenderedInModal)}
+                    onChange={handleOnChange}
+                    isSearchable={isSearchable}
+                    menuIsOpen={isMenuOpen}
+                    isDisabled={isDisabled}
+                    menuPlacement="auto"
+                    placeholder={placeholder || ''}
+                    {...props}
+                    components={memoizedComponents}
+                />
+
+                {isLoading && (
+                    <SpinnerWrapper>
+                        <Spinner size={24} isGrey={false} />
+                    </SpinnerWrapper>
+                )}
+
+                {label && (
+                    <SelectLabel $size={size} $isDisabled={isDisabled}>
+                        {label}
+                    </SelectLabel>
+                )}
+            </SelectWrapper>
+        </FormCell>
     );
 };
diff --git a/packages/components/src/components/form/Select/customComponents.tsx b/packages/components/src/components/form/Select/customComponents.tsx
index c2297931bd7..2143922bc43 100644
--- a/packages/components/src/components/form/Select/customComponents.tsx
+++ b/packages/components/src/components/form/Select/customComponents.tsx
@@ -1,4 +1,5 @@
 import { components, ControlProps, OptionProps, GroupHeadingProps } from 'react-select';
+
 import type { Option as OptionType } from './Select';
 
 export interface ControlComponentProps extends ControlProps<OptionType, boolean> {
diff --git a/packages/components/src/components/form/Select/useDetectPortalTarget.ts b/packages/components/src/components/form/Select/useDetectPortalTarget.ts
index 8b90d84a507..22757fc43e9 100644
--- a/packages/components/src/components/form/Select/useDetectPortalTarget.ts
+++ b/packages/components/src/components/form/Select/useDetectPortalTarget.ts
@@ -1,5 +1,6 @@
 import { useState, useEffect, RefObject } from 'react';
 import { SelectInstance } from 'react-select';
+
 import { MODAL_CONTENT_ID } from '../../modals/Modal/Modal';
 import type { Option } from './Select';
 
diff --git a/packages/components/src/components/form/Select/useOnKeyDown.ts b/packages/components/src/components/form/Select/useOnKeyDown.ts
index 793d98fe465..633a557df82 100644
--- a/packages/components/src/components/form/Select/useOnKeyDown.ts
+++ b/packages/components/src/components/form/Select/useOnKeyDown.ts
@@ -1,5 +1,6 @@
 import { useRef, useCallback, RefObject, KeyboardEvent } from 'react';
 import { GroupBase, Options, OptionsOrGroups, SelectInstance } from 'react-select';
+
 import type { Option } from './Select';
 
 /** Custom Type Guards to check if options are grouped or not */
diff --git a/packages/components/src/components/form/SelectBar/SelectBar.tsx b/packages/components/src/components/form/SelectBar/SelectBar.tsx
index 11e07f99718..e3680cc965e 100644
--- a/packages/components/src/components/form/SelectBar/SelectBar.tsx
+++ b/packages/components/src/components/form/SelectBar/SelectBar.tsx
@@ -1,10 +1,32 @@
 import { useState, useEffect, ReactNode, useCallback, KeyboardEvent } from 'react';
+
 import styled, { css } from 'styled-components';
+
 import { breakpointMediaQueries } from '@trezor/styles';
-import { borders, spacings, spacingsPx, typography } from '@trezor/theme';
-import { focusStyleTransition, getFocusShadowStyle } from '../../../utils/utils';
+import {
+    borders,
+    spacings,
+    spacingsPx,
+    typography,
+    Elevation,
+    mapElevationToBackground,
+    nextElevation,
+} from '@trezor/theme';
 
-const Wrapper = styled.div<{ $isFullWidth?: boolean }>`
+import { focusStyleTransition, getFocusShadowStyle } from '../../../utils/utils';
+import { useElevation } from '../../ElevationContext/ElevationContext';
+import {
+    FrameProps,
+    FramePropsKeys,
+    pickAndPrepareFrameProps,
+    withFrameProps,
+} from '../../../utils/frameProps';
+import { TransientProps } from '../../../utils/transientProps';
+
+export const allowedSelectBarFrameProps = ['margin', 'width'] as const satisfies FramePropsKeys[];
+type AllowedFrameProps = Pick<FrameProps, (typeof allowedSelectBarFrameProps)[number]>;
+
+const Wrapper = styled.div<TransientProps<AllowedFrameProps> & { $isFullWidth?: boolean }>`
     display: flex;
     align-items: center;
     gap: ${spacingsPx.sm};
@@ -15,6 +37,8 @@ const Wrapper = styled.div<{ $isFullWidth?: boolean }>`
         align-items: flex-start;
         width: 100%;
     }
+
+    ${withFrameProps}
 `;
 
 const Label = styled.span`
@@ -35,14 +59,18 @@ const getTranslateValue = (index: number) => {
 const getPuckWidth = (optionsCount: number) =>
     `calc((100% - 8px - ${(optionsCount - 1) * spacings.xxs}px) / ${optionsCount})`;
 
-const Options = styled.div<{ $optionsCount: number; $isFullWidth?: boolean }>`
+const Options = styled.div<{
+    $optionsCount: number;
+    $isFullWidth?: boolean;
+    $elevation: Elevation;
+}>`
     position: relative;
     display: grid;
     grid-auto-columns: ${({ $optionsCount }) => `minmax(${getPuckWidth($optionsCount)}, 1fr)`};
     grid-auto-flow: column;
     gap: ${spacingsPx.xxs};
     padding: ${spacingsPx.xxs};
-    background: ${({ theme }) => theme.backgroundSurfaceElevation0};
+    background: ${mapElevationToBackground};
     border-radius: ${borders.radii.full};
     width: ${({ $isFullWidth }) => ($isFullWidth ? '100%' : 'auto')};
 
@@ -53,16 +81,16 @@ const Options = styled.div<{ $optionsCount: number; $isFullWidth?: boolean }>`
     }
 `;
 
-const Puck = styled.div<{ $optionsCount: number; $selectedIndex: number }>`
+const Puck = styled.div<{ $optionsCount: number; $selectedIndex: number; $elevation: Elevation }>`
     position: absolute;
     left: 4px;
     top: 4px;
     bottom: 4px;
     width: ${({ $optionsCount }) => getPuckWidth($optionsCount)};
     padding: ${spacingsPx.xxs} ${spacingsPx.xl};
-    background: ${({ theme }) => theme.backgroundSurfaceElevation1};
+    background: ${mapElevationToBackground};
     border-radius: ${borders.radii.full};
-    box-shadow: ${({ theme }) => theme.boxShadowBase};
+    box-shadow: ${({ theme, $elevation }) => $elevation === 1 && theme.boxShadowBase};
     transform: ${({ $selectedIndex }) => `translateX(${getTranslateValue($selectedIndex)})`};
     transition:
         transform 0.175s cubic-bezier(1, 0.02, 0.38, 0.74),
@@ -125,12 +153,12 @@ const Option = styled.div<{ $isSelected: boolean; $isDisabled: boolean }>`
 
 type ValueTypes = number | string | boolean;
 
-interface Option<V extends ValueTypes> {
+type Option<V extends ValueTypes> = {
     label: ReactNode;
     value: V;
-}
+};
 
-export interface SelectBarProps<V extends ValueTypes> {
+export type SelectBarProps<V extends ValueTypes> = {
     label?: ReactNode;
     options: Option<V>[];
     selectedOption?: V;
@@ -138,7 +166,8 @@ export interface SelectBarProps<V extends ValueTypes> {
     isDisabled?: boolean;
     isFullWidth?: boolean;
     className?: string;
-}
+    'data-testid'?: string;
+} & AllowedFrameProps;
 
 // Generic type V is determined by selectedOption/options values
 export const SelectBar: <V extends ValueTypes>(props: SelectBarProps<V>) => JSX.Element = ({
@@ -149,9 +178,12 @@ export const SelectBar: <V extends ValueTypes>(props: SelectBarProps<V>) => JSX.
     isDisabled = false,
     isFullWidth,
     className,
+    'data-testid': dataTest,
     ...rest
 }) => {
     const [selectedOptionIn, setSelected] = useState<ValueTypes | undefined>(selectedOption);
+    const { elevation } = useElevation();
+    const frameProps = pickAndPrepareFrameProps(rest, allowedSelectBarFrameProps);
 
     useEffect(() => {
         if (selectedOption !== undefined) {
@@ -203,13 +235,23 @@ export const SelectBar: <V extends ValueTypes>(props: SelectBarProps<V>) => JSX.
     const selectedIndex = options.findIndex(option => option.value === selectedOptionIn);
 
     return (
-        <Wrapper className={className} $isFullWidth={isFullWidth} {...rest}>
+        <Wrapper
+            className={className}
+            $isFullWidth={isFullWidth}
+            data-testid={dataTest}
+            {...frameProps}
+        >
             {label && <Label>{label}</Label>}
 
-            <Options $optionsCount={options.length} $isFullWidth={isFullWidth}>
+            <Options
+                $optionsCount={options.length}
+                $isFullWidth={isFullWidth}
+                $elevation={elevation}
+            >
                 <Puck
                     $optionsCount={options.length}
                     $selectedIndex={selectedIndex}
+                    $elevation={nextElevation[elevation]}
                     tabIndex={0}
                     onKeyDown={handleKeyboardNav}
                 />
diff --git a/packages/components/src/components/form/Switch/Switch.tsx b/packages/components/src/components/form/Switch/Switch.tsx
index 3ef680f6624..2f1e09e8aa5 100755
--- a/packages/components/src/components/form/Switch/Switch.tsx
+++ b/packages/components/src/components/form/Switch/Switch.tsx
@@ -1,7 +1,10 @@
 import { ReactNode } from 'react';
+
 import styled, { css } from 'styled-components';
+
 import { borders, spacingsPx, typography } from '@trezor/theme';
 import { getWeakRandomId } from '@trezor/utils';
+
 import {
     getInputColor,
     getLabelColor,
@@ -142,6 +145,8 @@ export const Switch = ({
     return (
         <Wrapper $labelPosition={labelPosition} className={className}>
             <Container
+                // @ts-expect-error - needed for cypress retry-ability
+                disabled={isDisabled}
                 $isChecked={isChecked}
                 $isDisabled={isDisabled}
                 $isAlert={isAlert}
diff --git a/packages/components/src/components/form/Textarea/CharacterCount.tsx b/packages/components/src/components/form/Textarea/CharacterCount.tsx
index 64c875c6278..de8debece6f 100644
--- a/packages/components/src/components/form/Textarea/CharacterCount.tsx
+++ b/packages/components/src/components/form/Textarea/CharacterCount.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { borders, spacings, spacingsPx, typography } from '@trezor/theme';
 
 const Container = styled.div`
diff --git a/packages/components/src/components/form/Textarea/Textarea.stories.tsx b/packages/components/src/components/form/Textarea/Textarea.stories.tsx
index 76057136f9a..30b4d06e14f 100644
--- a/packages/components/src/components/form/Textarea/Textarea.stories.tsx
+++ b/packages/components/src/components/form/Textarea/Textarea.stories.tsx
@@ -1,6 +1,8 @@
+import { ChangeEventHandler } from 'react';
+
 import { useArgs } from '@storybook/client-api';
 import { Meta, StoryObj } from '@storybook/react';
-import { ChangeEventHandler } from 'react';
+
 import { Textarea as TextareaComponent, TextareaProps } from './Textarea';
 
 const meta: Meta = {
@@ -26,7 +28,6 @@ export const Textarea: StoryObj<TextareaProps> = {
         rows: 5,
         maxLength: 500,
         characterCount: true,
-        hasBottomPadding: true,
     },
     argTypes: {
         isDisabled: {
@@ -35,10 +36,10 @@ export const Textarea: StoryObj<TextareaProps> = {
             },
         },
         label: {
-            control: { type: 'text' },
+            control: 'text',
         },
         placeholder: {
-            control: { type: 'text' },
+            control: 'text',
         },
         rows: {
             control: {
@@ -51,14 +52,17 @@ export const Textarea: StoryObj<TextareaProps> = {
         maxLength: {
             control: { type: 'number' },
         },
+        labelLeft: {
+            control: 'text',
+        },
         labelHoverRight: {
-            control: { type: 'text' },
+            control: 'text',
         },
         labelRight: {
-            control: { type: 'text' },
+            control: 'text',
         },
         bottomText: {
-            control: { type: 'text' },
+            control: 'text',
         },
         innerRef: {
             table: {
@@ -68,7 +72,7 @@ export const Textarea: StoryObj<TextareaProps> = {
             },
         },
         value: {
-            control: { type: 'text' },
+            control: 'text',
         },
         characterCount: {
             control: {
@@ -80,12 +84,7 @@ export const Textarea: StoryObj<TextareaProps> = {
                 },
             },
         },
-        inputState: {
-            control: {
-                type: 'radio',
-            },
-            options: [null, 'warning', 'error'],
-        },
+        inputState: { control: 'select', options: ['error', 'warning', 'primary'] },
         hasBottomPadding: {
             control: {
                 type: 'boolean',
diff --git a/packages/components/src/components/form/Textarea/Textarea.tsx b/packages/components/src/components/form/Textarea/Textarea.tsx
index c295c65ba6d..bd909c9628e 100644
--- a/packages/components/src/components/form/Textarea/Textarea.tsx
+++ b/packages/components/src/components/form/Textarea/Textarea.tsx
@@ -1,5 +1,7 @@
+import { Ref, ReactNode, TextareaHTMLAttributes } from 'react';
+
 import styled from 'styled-components';
-import { useState, Ref, ReactNode, TextareaHTMLAttributes } from 'react';
+
 import { spacingsPx, Elevation } from '@trezor/theme';
 
 import { InputState } from '../inputTypes';
@@ -11,21 +13,10 @@ import {
     INPUT_PADDING_TOP,
     LABEL_TRANSFORM,
 } from '../InputStyles';
-import { BOTTOM_TEXT_MIN_HEIGHT, BottomText } from '../BottomText';
-import { TopAddons } from '../TopAddons';
+import { FormCell, FormCellProps, pickFormCellProps } from '../FormCell/FormCell';
 import { CharacterCount, CharacterCountProps } from './CharacterCount';
 import { useElevation } from '../../ElevationContext/ElevationContext';
 
-const Wrapper = styled.div<{ $hasBottomPadding: boolean }>`
-    width: 100%;
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
-    padding-bottom: ${({ $hasBottomPadding }) =>
-        $hasBottomPadding ? `${BOTTOM_TEXT_MIN_HEIGHT}px` : '0'};
-`;
-
 const TextareaWrapper = styled(InputWrapper)<{
     disabled?: boolean; // intentionally not transient, disabled is HTML <input> prop
     $elevation: Elevation;
@@ -74,57 +65,35 @@ const TextareaLabel = styled(Label)`
     }
 `;
 
-export interface TextareaProps extends TextareaHTMLAttributes<HTMLTextAreaElement> {
-    isDisabled?: boolean;
-    label?: ReactNode;
-    labelHoverRight?: ReactNode;
-    labelRight?: ReactNode;
-    innerRef?: Ref<HTMLTextAreaElement>;
-    /**
-     * @description pass `null` if bottom text can be `undefined`
-     */
-    bottomText?: ReactNode;
-    inputState?: InputState;
-    hasBottomPadding?: boolean;
-    value?: string;
-    characterCount?: CharacterCountProps['characterCount'];
-    'data-testid'?: string;
-}
+export type TextareaProps = TextareaHTMLAttributes<HTMLTextAreaElement> &
+    Omit<FormCellProps, 'children'> & {
+        isDisabled?: boolean;
+        label?: ReactNode;
+        innerRef?: Ref<HTMLTextAreaElement>;
+        hasBottomPadding?: boolean;
+        value?: string;
+        characterCount?: CharacterCountProps['characterCount'];
+        'data-testid'?: string;
+    };
 
 export const Textarea = ({
-    className,
     value,
     maxLength,
-    labelHoverRight,
     isDisabled = false,
     innerRef,
     label,
-    inputState,
-    bottomText,
     placeholder,
     rows = 5,
-    labelRight,
+    inputState,
     characterCount,
-    hasBottomPadding = true,
     'data-testid': dataTest,
     ...rest
 }: TextareaProps) => {
-    const [isHovered, setIsHovered] = useState(false);
     const { elevation } = useElevation();
+    const formCellProps = pickFormCellProps(rest);
 
     return (
-        <Wrapper
-            className={className}
-            onMouseEnter={() => setIsHovered(true)}
-            onMouseLeave={() => setIsHovered(false)}
-            $hasBottomPadding={hasBottomPadding === true && bottomText === null}
-        >
-            <TopAddons
-                isHovered={isHovered}
-                hoverAddonRight={labelHoverRight}
-                addonRight={labelRight}
-            />
-
+        <FormCell {...formCellProps} inputState={inputState} isDisabled={isDisabled}>
             <TextareaWrapper $inputState={inputState} disabled={isDisabled} $elevation={elevation}>
                 <StyledTextarea
                     $elevation={elevation}
@@ -150,12 +119,6 @@ export const Textarea = ({
 
                 {label && <TextareaLabel $isDisabled={isDisabled}>{label}</TextareaLabel>}
             </TextareaWrapper>
-
-            {bottomText && (
-                <BottomText inputState={inputState} isDisabled={isDisabled}>
-                    {bottomText}
-                </BottomText>
-            )}
-        </Wrapper>
+        </FormCell>
     );
 };
diff --git a/packages/components/src/components/form/TopAddons.tsx b/packages/components/src/components/form/TopAddons.tsx
index a3fdc9827ef..d75e6daf7a6 100644
--- a/packages/components/src/components/form/TopAddons.tsx
+++ b/packages/components/src/components/form/TopAddons.tsx
@@ -1,42 +1,22 @@
 import React from 'react';
-import styled from 'styled-components';
-import { spacingsPx } from '@trezor/theme';
 
-const Container = styled.div<{ $hasLeftAddon?: boolean }>`
-    display: flex;
-    justify-content: ${({ $hasLeftAddon }) => ($hasLeftAddon ? 'space-between' : 'flex-end')};
-    align-items: flex-end;
-    gap: ${spacingsPx.xs};
-    min-height: 30px;
-    padding-bottom: 6px;
-`;
+import styled from 'styled-components';
 
-export const RightAddonWrapper = styled.div`
-    display: flex;
-    gap: 6px;
-`;
+import { spacings } from '@trezor/theme';
 
-export const RightAddon = styled.div`
-    display: flex;
-    align-items: center;
-`;
+import { Row } from '../Flex/Flex';
 
 export const HoverAddonRight = styled.div<{ $isVisible?: boolean }>`
     opacity: ${({ $isVisible }) => ($isVisible ? 1 : 0)};
     transition: opacity 0.1s ease-out;
 `;
 
-export const LeftAddon = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-interface TopAddonsProps {
+type TopAddonsProps = {
     isHovered?: boolean;
     addonLeft?: React.ReactNode;
     addonRight?: React.ReactNode;
     hoverAddonRight?: React.ReactNode;
-}
+};
 
 export const TopAddons = ({
     isHovered,
@@ -53,16 +33,20 @@ export const TopAddons = ({
     }
 
     return (
-        <Container $hasLeftAddon={!!addonLeft}>
-            {addonLeft && <LeftAddon>{addonLeft}</LeftAddon>}
+        <Row
+            gap={spacings.xs}
+            alignItems="flex-end"
+            justifyContent={addonLeft ? 'space-between' : 'flex-end'}
+        >
+            {addonLeft && <Row>{addonLeft}</Row>}
             {isWithRightLabel && (
-                <RightAddonWrapper>
+                <Row gap={spacings.xxs}>
                     {hoverAddonRight && (
                         <HoverAddonRight $isVisible={isHovered}>{hoverAddonRight}</HoverAddonRight>
                     )}
-                    {addonRight && <RightAddon>{addonRight}</RightAddon>}
-                </RightAddonWrapper>
+                    {addonRight && <Row>{addonRight}</Row>}
+                </Row>
             )}
-        </Container>
+        </Row>
     );
 };
diff --git a/packages/components/src/components/form/inputTypes.ts b/packages/components/src/components/form/inputTypes.ts
index 608e6ae841e..d2aafbd0f80 100644
--- a/packages/components/src/components/form/inputTypes.ts
+++ b/packages/components/src/components/form/inputTypes.ts
@@ -1,5 +1,5 @@
 import { UISize } from '../../config/types';
 
-export type InputState = 'warning' | 'error' | 'primary';
+export type InputState = 'warning' | 'error' | 'primary' | 'default';
 
 export type InputSize = Extract<UISize, 'small' | 'large'>;
diff --git a/packages/components/src/components/loaders/LoadingContent/LoadingContent.stories.tsx b/packages/components/src/components/loaders/LoadingContent/LoadingContent.stories.tsx
index 13081b7f922..2d16178f4ea 100644
--- a/packages/components/src/components/loaders/LoadingContent/LoadingContent.stories.tsx
+++ b/packages/components/src/components/loaders/LoadingContent/LoadingContent.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { H1, LoadingContent as LoadingContentComponent, LoadingContentProps } from '../../../index';
 
 const meta: Meta = {
diff --git a/packages/components/src/components/loaders/LoadingContent/LoadingContent.tsx b/packages/components/src/components/loaders/LoadingContent/LoadingContent.tsx
index 62603ca36d1..1eeeb9f720d 100644
--- a/packages/components/src/components/loaders/LoadingContent/LoadingContent.tsx
+++ b/packages/components/src/components/loaders/LoadingContent/LoadingContent.tsx
@@ -1,5 +1,7 @@
 import { ReactNode, useState, useEffect } from 'react';
+
 import styled, { css } from 'styled-components';
+
 import { Spinner } from '../Spinner/Spinner';
 
 const LoadingWrapper = styled.div`
diff --git a/packages/components/src/components/loaders/ProgressBar/ProgressBar.stories.tsx b/packages/components/src/components/loaders/ProgressBar/ProgressBar.stories.tsx
index 7c4a8ad1a57..ba82870a6d5 100644
--- a/packages/components/src/components/loaders/ProgressBar/ProgressBar.stories.tsx
+++ b/packages/components/src/components/loaders/ProgressBar/ProgressBar.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { ProgressBar as ProgressBarComponent, ProgressBarProps } from './ProgressBar';
 
 const meta: Meta = {
diff --git a/packages/components/src/components/loaders/ProgressBar/ProgressBar.tsx b/packages/components/src/components/loaders/ProgressBar/ProgressBar.tsx
index 76343684d15..96b610b273e 100644
--- a/packages/components/src/components/loaders/ProgressBar/ProgressBar.tsx
+++ b/packages/components/src/components/loaders/ProgressBar/ProgressBar.tsx
@@ -1,6 +1,7 @@
-import { borders } from '@trezor/theme';
 import styled from 'styled-components';
 
+import { borders } from '@trezor/theme';
+
 const Wrapper = styled.div`
     background: ${({ theme }) => theme.backgroundNeutralSubdued};
     width: 100%;
diff --git a/packages/components/src/components/loaders/ProgressPie/ProgressPie.stories.tsx b/packages/components/src/components/loaders/ProgressPie/ProgressPie.stories.tsx
index eb0d2d48cb1..c3ababa25fd 100644
--- a/packages/components/src/components/loaders/ProgressPie/ProgressPie.stories.tsx
+++ b/packages/components/src/components/loaders/ProgressPie/ProgressPie.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { ProgressPie as ProgressPieComponent, ProgressPieProps } from './ProgressPie';
 
 const meta: Meta = {
diff --git a/packages/components/src/components/loaders/ProgressPie/ProgressPie.tsx b/packages/components/src/components/loaders/ProgressPie/ProgressPie.tsx
index 8941fe4fcb2..1547cf215f3 100644
--- a/packages/components/src/components/loaders/ProgressPie/ProgressPie.tsx
+++ b/packages/components/src/components/loaders/ProgressPie/ProgressPie.tsx
@@ -1,4 +1,5 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
 
 const Container = styled.div<{
diff --git a/packages/components/src/components/loaders/Spinner/Spinner.stories.tsx b/packages/components/src/components/loaders/Spinner/Spinner.stories.tsx
index 81aca151198..fabd17abd93 100644
--- a/packages/components/src/components/loaders/Spinner/Spinner.stories.tsx
+++ b/packages/components/src/components/loaders/Spinner/Spinner.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { Spinner as SpinnerComponent, SpinnerProps, allowedSpinnerFrameProps } from './Spinner';
 import { getFramePropsStory } from '../../../utils/frameProps';
 
diff --git a/packages/components/src/components/loaders/Spinner/Spinner.tsx b/packages/components/src/components/loaders/Spinner/Spinner.tsx
index 31b1058652f..b17aaed948f 100644
--- a/packages/components/src/components/loaders/Spinner/Spinner.tsx
+++ b/packages/components/src/components/loaders/Spinner/Spinner.tsx
@@ -1,6 +1,8 @@
 import { useState } from 'react';
+
 import Lottie from 'lottie-react';
 import styled from 'styled-components';
+
 import animationStart from './animationData/refresh-spinner-start.json';
 import animationMiddle from './animationData/refresh-spinner-middle.json';
 import animationEnd from './animationData/refresh-spinner-end-success.json';
diff --git a/packages/components/src/components/loaders/Stepper/Stepper.stories.tsx b/packages/components/src/components/loaders/Stepper/Stepper.stories.tsx
index cbbe0fd68e8..3e7791ee086 100644
--- a/packages/components/src/components/loaders/Stepper/Stepper.stories.tsx
+++ b/packages/components/src/components/loaders/Stepper/Stepper.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { Stepper as StepperComponent, StepperProps } from './Stepper';
 
 const meta: Meta = {
diff --git a/packages/components/src/components/loaders/Stepper/Stepper.tsx b/packages/components/src/components/loaders/Stepper/Stepper.tsx
index 764e2612ab3..5e9ee5235e4 100644
--- a/packages/components/src/components/loaders/Stepper/Stepper.tsx
+++ b/packages/components/src/components/loaders/Stepper/Stepper.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { borders, spacingsPx } from '@trezor/theme';
 
 const Container = styled.div<{ $maxWidth: number }>`
diff --git a/packages/components/src/components/modals/DialogModal/DialogModal.stories.tsx b/packages/components/src/components/modals/DialogModal/DialogModal.stories.tsx
index 75b7897dca6..4ffd033529e 100644
--- a/packages/components/src/components/modals/DialogModal/DialogModal.stories.tsx
+++ b/packages/components/src/components/modals/DialogModal/DialogModal.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { DialogModal as ModalComponent, Button, DialogModalProps } from '../../../index';
 import { variables } from '../../../config';
 
diff --git a/packages/components/src/components/modals/DialogModal/DialogModal.tsx b/packages/components/src/components/modals/DialogModal/DialogModal.tsx
index 6ca8294107e..bf92ab9ccac 100644
--- a/packages/components/src/components/modals/DialogModal/DialogModal.tsx
+++ b/packages/components/src/components/modals/DialogModal/DialogModal.tsx
@@ -1,8 +1,11 @@
+import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { borders, spacingsPx, typography } from '@trezor/theme';
+
 import { Icon, IconName } from '../../Icon/Icon';
 import { Modal, ModalProps } from '../Modal/Modal';
-import { ReactNode } from 'react';
 
 const BodyHeading = styled.div`
     margin-bottom: ${spacingsPx.xs};
diff --git a/packages/components/src/components/modals/Modal/Backdrop.tsx b/packages/components/src/components/modals/Modal/Backdrop.tsx
index 0531615229b..ffa2b952230 100644
--- a/packages/components/src/components/modals/Modal/Backdrop.tsx
+++ b/packages/components/src/components/modals/Modal/Backdrop.tsx
@@ -1,5 +1,7 @@
 import { ReactNode } from 'react';
+
 import styled, { css } from 'styled-components';
+
 import { zIndices } from '@trezor/theme';
 
 export type ModalAlignment = { x: 'center' | 'left'; y: 'center' | 'top' };
@@ -13,7 +15,7 @@ export type BackdropProps = {
 
 const Wrapper = styled.div<{ $alignment: ModalAlignment }>`
     position: absolute;
-    z-index: ${zIndices.modal};
+    z-index: ${zIndices.legacyModal};
     inset: 0;
     display: flex;
     flex-direction: column;
diff --git a/packages/components/src/components/modals/Modal/Modal.stories.tsx b/packages/components/src/components/modals/Modal/Modal.stories.tsx
index 7fe6e9d6c7d..aebc56f081e 100644
--- a/packages/components/src/components/modals/Modal/Modal.stories.tsx
+++ b/packages/components/src/components/modals/Modal/Modal.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { Modal as ModalComponent, Button, ModalProps } from '../../../index';
 import { Icon } from '../../Icon/Icon';
 
diff --git a/packages/components/src/components/modals/Modal/Modal.tsx b/packages/components/src/components/modals/Modal/Modal.tsx
index 9d884dae45c..dc814c895e6 100644
--- a/packages/components/src/components/modals/Modal/Modal.tsx
+++ b/packages/components/src/components/modals/Modal/Modal.tsx
@@ -1,7 +1,8 @@
 import { useCallback, useState, ReactNode, useEffect } from 'react';
+import { useEvent } from 'react-use';
 
 import styled, { css, useTheme } from 'styled-components';
-import { useEvent } from 'react-use';
+
 import { borders, spacings, spacingsPx, typography } from '@trezor/theme';
 
 import { Stepper } from '../../loaders/Stepper/Stepper';
@@ -54,7 +55,7 @@ const Header = styled.header<HeaderProps>`
 `;
 
 const BACK_ICON_WIDTH = spacingsPx.xxxl;
-// eslint-disable-next-line local-rules/no-override-ds-component
+
 const BackIcon = styled(Icon)`
     position: relative;
     width: ${BACK_ICON_WIDTH};
@@ -95,7 +96,6 @@ type HeadingSize = keyof typeof HEADING_SIZES;
 
 type HeadingProps = { $isWithIcon?: boolean; $headingSize: HeadingSize };
 
-// eslint-disable-next-line local-rules/no-override-ds-component
 const Heading = styled(H3)<HeadingProps>`
     ${({ $isWithIcon }) =>
         $isWithIcon &&
diff --git a/packages/components/src/components/skeletons/SkeletonCircle.stories.tsx b/packages/components/src/components/skeletons/SkeletonCircle.stories.tsx
index 79ca80dc133..2e46a667b2e 100644
--- a/packages/components/src/components/skeletons/SkeletonCircle.stories.tsx
+++ b/packages/components/src/components/skeletons/SkeletonCircle.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { SkeletonCircle as SkeletonCircleComponent, SkeletonCircleProps } from './SkeletonCircle';
 
 const meta: Meta = {
diff --git a/packages/components/src/components/skeletons/SkeletonCircle.tsx b/packages/components/src/components/skeletons/SkeletonCircle.tsx
index c2cf1d98c90..6926817b517 100644
--- a/packages/components/src/components/skeletons/SkeletonCircle.tsx
+++ b/packages/components/src/components/skeletons/SkeletonCircle.tsx
@@ -1,7 +1,9 @@
 import styled, { css } from 'styled-components';
+
+import { Elevation, mapElevationToBackground } from '@trezor/theme';
+
 import { getValue, shimmerEffect } from './utils';
 import { SkeletonBaseProps } from './types';
-import { Elevation, mapElevationToBackground } from '@trezor/theme';
 import { useElevation } from '../ElevationContext/ElevationContext';
 import { TransientProps } from '../../utils/transientProps';
 
diff --git a/packages/components/src/components/skeletons/SkeletonRectangle.stories.tsx b/packages/components/src/components/skeletons/SkeletonRectangle.stories.tsx
index aba04a8c7f1..70a836674e1 100644
--- a/packages/components/src/components/skeletons/SkeletonRectangle.stories.tsx
+++ b/packages/components/src/components/skeletons/SkeletonRectangle.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import {
     SkeletonRectangle as SkeletonRectangleComponent,
     SkeletonRectangleProps,
diff --git a/packages/components/src/components/skeletons/SkeletonRectangle.tsx b/packages/components/src/components/skeletons/SkeletonRectangle.tsx
index 2b0244467cb..b9b8d0f82a4 100644
--- a/packages/components/src/components/skeletons/SkeletonRectangle.tsx
+++ b/packages/components/src/components/skeletons/SkeletonRectangle.tsx
@@ -1,7 +1,9 @@
 import styled, { css } from 'styled-components';
+
+import { Elevation, borders, mapElevationToBackground } from '@trezor/theme';
+
 import { SkeletonBaseProps } from './types';
 import { getValue, shimmerEffect } from './utils';
-import { Elevation, borders, mapElevationToBackground } from '@trezor/theme';
 import { useElevation } from '../ElevationContext/ElevationContext';
 import { TransientProps } from '../../utils/transientProps';
 
diff --git a/packages/components/src/components/skeletons/SkeletonSpread.stories.tsx b/packages/components/src/components/skeletons/SkeletonSpread.stories.tsx
index b73a202b307..99260d771c2 100644
--- a/packages/components/src/components/skeletons/SkeletonSpread.stories.tsx
+++ b/packages/components/src/components/skeletons/SkeletonSpread.stories.tsx
@@ -1,7 +1,8 @@
 import { Meta, StoryObj } from '@storybook/react';
+import styled from 'styled-components';
+
 import { SkeletonSpread as SkeletonSpreadComponent, SkeletonSpreadProps } from './SkeletonSpread';
 import { SkeletonCircle } from './SkeletonCircle';
-import styled from 'styled-components';
 import { ElevationContext } from '../ElevationContext/ElevationContext';
 
 const Container = styled.div`
diff --git a/packages/components/src/components/skeletons/SkeletonSpread.tsx b/packages/components/src/components/skeletons/SkeletonSpread.tsx
index ee17ea2304e..4cc0d379ce7 100644
--- a/packages/components/src/components/skeletons/SkeletonSpread.tsx
+++ b/packages/components/src/components/skeletons/SkeletonSpread.tsx
@@ -1,11 +1,11 @@
 import styled from 'styled-components';
+
 import { SkeletonStack, SkeletonStackProps } from './SkeletonStack';
 
 export interface SkeletonSpreadProps extends SkeletonStackProps {
     $spaceAround?: boolean;
 }
 
-// eslint-disable-next-line local-rules/no-override-ds-component
 export const SkeletonSpread = styled(SkeletonStack)<SkeletonSpreadProps>`
     justify-content: ${props => (props.$spaceAround ? 'space-around' : 'space-between')};
 `;
diff --git a/packages/components/src/components/skeletons/SkeletonStack.stories.tsx b/packages/components/src/components/skeletons/SkeletonStack.stories.tsx
index c9d3508e56d..04db1ac42cc 100644
--- a/packages/components/src/components/skeletons/SkeletonStack.stories.tsx
+++ b/packages/components/src/components/skeletons/SkeletonStack.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { SkeletonStack as SkeletonStackComponent, SkeletonStackProps } from './SkeletonStack';
 import { SkeletonCircle } from './SkeletonCircle';
 import { ElevationContext } from '../ElevationContext/ElevationContext';
diff --git a/packages/components/src/components/skeletons/utils.ts b/packages/components/src/components/skeletons/utils.ts
index d8be77b695b..f9e1e61b684 100644
--- a/packages/components/src/components/skeletons/utils.ts
+++ b/packages/components/src/components/skeletons/utils.ts
@@ -1,5 +1,7 @@
-import { Elevation, mapElevationToBackground } from '@trezor/theme';
 import { css, keyframes } from 'styled-components';
+
+import { Elevation, mapElevationToBackground } from '@trezor/theme';
+
 import { mapElevationToSkeletonForeground } from './colors';
 
 const SHINE = keyframes`
diff --git a/packages/components/src/components/typography/Code/Code.stories.tsx b/packages/components/src/components/typography/Code/Code.stories.tsx
new file mode 100644
index 00000000000..dede65b54c6
--- /dev/null
+++ b/packages/components/src/components/typography/Code/Code.stories.tsx
@@ -0,0 +1,17 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { Code } from './Code';
+
+const meta: Meta = {
+    title: 'Code',
+    component: Code,
+};
+
+export default meta;
+type Story = StoryObj<typeof Code>;
+
+export const Default: Story = {
+    args: {
+        children: 'ABC',
+    },
+};
diff --git a/packages/components/src/components/typography/Code/Code.tsx b/packages/components/src/components/typography/Code/Code.tsx
new file mode 100644
index 00000000000..977c95c0a58
--- /dev/null
+++ b/packages/components/src/components/typography/Code/Code.tsx
@@ -0,0 +1,22 @@
+import React, { type ReactNode } from 'react';
+
+import styled from 'styled-components';
+
+import { borders, spacingsPx } from '@trezor/theme';
+
+const StyledCode = styled.code`
+    font-family: RobotoMono, 'PixelOperatorMono8', monospace;
+    display: inline;
+    font-size: inherit;
+    line-height: 1.5;
+    font-weight: 400;
+    letter-spacing: -0.4px;
+    padding: 0 ${() => spacingsPx.xxxs};
+    background-color: ${({ theme }) => theme.backgroundNeutralSubtleOnElevation1};
+    box-shadow: inset 0 0 0 1px ${({ theme }) => theme.borderElevation0};
+    border-radius: ${() => borders.radii.xxs};
+`;
+
+export const Code: React.FC<{ children: ReactNode }> = ({ children }) => {
+    return <StyledCode>{children}</StyledCode>;
+};
diff --git a/packages/components/src/components/typography/Heading/Heading.stories.tsx b/packages/components/src/components/typography/Heading/Heading.stories.tsx
index c053fbcb0c9..d25aadaf8be 100644
--- a/packages/components/src/components/typography/Heading/Heading.stories.tsx
+++ b/packages/components/src/components/typography/Heading/Heading.stories.tsx
@@ -1,12 +1,15 @@
 import styled from 'styled-components';
 import { Meta, StoryObj } from '@storybook/react';
-import { H1, H2, H3, allowedHeadingFrameProps, allowedHeadingTextProps } from './Heading';
+
+import { H1, H2, H3, H4 } from './Heading';
 import { getFramePropsStory } from '../../../utils/frameProps';
 import { getTextPropsStory } from '../utils';
+import { allowedTextFrameProps, allowedTextTextProps, textVariants } from '../Text/Text';
 
 const Wrapper = styled.div`
     display: flex;
     flex-direction: column;
+    overflow: hidden;
 `;
 
 const meta: Meta = {
@@ -20,14 +23,21 @@ export const Heading: StoryObj = {
             <H1 {...props}>This is heading 1</H1>
             <H2 {...props}>This is heading 2</H2>
             <H3 {...props}>This is heading 3</H3>
+            <H4 {...props}>This is heading 4</H4>
         </Wrapper>
     ),
     args: {
-        ...getTextPropsStory(allowedHeadingTextProps).args,
-        ...getFramePropsStory(allowedHeadingFrameProps).args,
+        ...getTextPropsStory(allowedTextTextProps).args,
+        ...getFramePropsStory(allowedTextFrameProps).args,
     },
     argTypes: {
-        ...getTextPropsStory(allowedHeadingTextProps).argTypes,
-        ...getFramePropsStory(allowedHeadingFrameProps).argTypes,
+        variant: {
+            control: {
+                type: 'select',
+            },
+            options: textVariants,
+        },
+        ...getTextPropsStory(allowedTextTextProps).argTypes,
+        ...getFramePropsStory(allowedTextFrameProps).argTypes,
     },
 };
diff --git a/packages/components/src/components/typography/Heading/Heading.tsx b/packages/components/src/components/typography/Heading/Heading.tsx
index d9d511898f0..bcbf9ddb95b 100644
--- a/packages/components/src/components/typography/Heading/Heading.tsx
+++ b/packages/components/src/components/typography/Heading/Heading.tsx
@@ -1,146 +1,16 @@
-import styled from 'styled-components';
+import { TypographyStyle } from '@trezor/theme';
 
-import { Color } from '@trezor/theme';
-import {
-    FrameProps,
-    FramePropsKeys,
-    pickAndPrepareFrameProps,
-    withFrameProps,
-} from '../../../utils/frameProps';
-import { makePropsTransient, TransientProps } from '../../../utils/transientProps';
-import { TextProps as TextPropsCommon, TextPropsKeys, withTextProps } from '../utils';
+import { Text, TextProps } from '../Text/Text';
 
-export const allowedHeadingTextProps: TextPropsKeys[] = ['typographyStyle', 'textWrap', 'align'];
-type AllowedHeadingTextProps = Pick<TextPropsCommon, (typeof allowedHeadingTextProps)[number]>;
-
-export const allowedHeadingFrameProps = ['margin'] as const satisfies FramePropsKeys[];
-type AllowedFrameProps = Pick<FrameProps, (typeof allowedHeadingFrameProps)[number]>;
-
-type HeadingProps = TransientProps<AllowedFrameProps> &
-    TransientProps<AllowedHeadingTextProps> & {
-        $color?: Color;
-    };
-
-const Heading = styled.h1<HeadingProps>`
-    ${({ $color, theme }) => $color && `color: ${theme[$color]}`};
-
-    ${withTextProps}
-    ${withFrameProps}
-`;
-
-type HProps = AllowedFrameProps &
-    AllowedHeadingTextProps & {
-        color?: Color;
-        children: React.ReactNode;
-        className?: string;
-        onClick?: () => void;
-        'data-testid'?: string;
-    };
-
-export const H1 = ({
-    color,
-    align,
-    typographyStyle = 'titleLarge',
-    textWrap,
-    onClick,
-    'data-testid': dataTest,
-    children,
-    className,
-    ...rest
-}: HProps) => {
-    const frameProps = pickAndPrepareFrameProps(rest, allowedHeadingFrameProps);
-
-    return (
-        <Heading
-            as="h1"
-            onClick={onClick}
-            data-testid={dataTest}
-            className={className}
-            {...makePropsTransient({ color, align, typographyStyle, textWrap })}
-            {...frameProps}
-        >
-            {children}
-        </Heading>
-    );
-};
-
-export const H2 = ({
-    color,
-    align,
-    typographyStyle = 'titleMedium',
-    textWrap,
-    onClick,
-    'data-testid': dataTest,
-    children,
-    className,
-    ...rest
-}: HProps) => {
-    const frameProps = pickAndPrepareFrameProps(rest, allowedHeadingFrameProps);
-
-    return (
-        <Heading
-            as="h2"
-            onClick={onClick}
-            data-testid={dataTest}
-            className={className}
-            {...makePropsTransient({ color, align, typographyStyle, textWrap })}
-            {...frameProps}
-        >
+const createHeading =
+    (as: 'h1' | 'h2' | 'h3' | 'h4', defaultTypographyStyle: TypographyStyle) =>
+    ({ children, ...rest }: TextProps) => (
+        <Text as={as} typographyStyle={defaultTypographyStyle} {...rest}>
             {children}
-        </Heading>
+        </Text>
     );
-};
-
-export const H3 = ({
-    color,
-    align,
-    typographyStyle = 'titleSmall',
-    textWrap,
-    onClick,
-    'data-testid': dataTest,
-    children,
-    className,
-    ...rest
-}: HProps) => {
-    const frameProps = pickAndPrepareFrameProps(rest, allowedHeadingFrameProps);
 
-    return (
-        <Heading
-            as="h3"
-            onClick={onClick}
-            data-testid={dataTest}
-            className={className}
-            {...makePropsTransient({ color, align, typographyStyle, textWrap })}
-            {...frameProps}
-        >
-            {children}
-        </Heading>
-    );
-};
-
-export const H4 = ({
-    color,
-    align,
-    typographyStyle = 'highlight',
-    textWrap,
-    onClick,
-    'data-testid': dataTest,
-    children,
-    className,
-    ...rest
-}: HProps) => {
-    const frameProps = pickAndPrepareFrameProps(rest, allowedHeadingFrameProps);
-
-    return (
-        <Heading
-            as="h4"
-            onClick={onClick}
-            data-testid={dataTest}
-            className={className}
-            {...makePropsTransient({ color, align, typographyStyle, textWrap })}
-            {...frameProps}
-        >
-            {children}
-        </Heading>
-    );
-};
+export const H1 = createHeading('h1', 'titleLarge');
+export const H2 = createHeading('h2', 'titleMedium');
+export const H3 = createHeading('h3', 'titleSmall');
+export const H4 = createHeading('h4', 'highlight');
diff --git a/packages/components/src/components/typography/Link/Link.stories.tsx b/packages/components/src/components/typography/Link/Link.stories.tsx
index 22066c78a98..0f158d4562d 100644
--- a/packages/components/src/components/typography/Link/Link.stories.tsx
+++ b/packages/components/src/components/typography/Link/Link.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { Link as LinkComponent, LinkProps } from '../../../index';
 
 const meta: Meta = {
diff --git a/packages/components/src/components/typography/Link/Link.tsx b/packages/components/src/components/typography/Link/Link.tsx
index a60566d3561..d4058186c08 100644
--- a/packages/components/src/components/typography/Link/Link.tsx
+++ b/packages/components/src/components/typography/Link/Link.tsx
@@ -1,6 +1,9 @@
 import { ReactNode, MouseEvent } from 'react';
+
 import styled, { css } from 'styled-components';
+
 import { TypographyStyle, spacingsPx, typography, typographyStylesBase } from '@trezor/theme';
+
 import { Icon, IconName } from '../../Icon/Icon';
 
 type AProps = {
diff --git a/packages/components/src/components/typography/Paragraph/Paragraph.stories.tsx b/packages/components/src/components/typography/Paragraph/Paragraph.stories.tsx
index 948a75b3d1f..656aef28702 100644
--- a/packages/components/src/components/typography/Paragraph/Paragraph.stories.tsx
+++ b/packages/components/src/components/typography/Paragraph/Paragraph.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { Paragraph as P } from './Paragraph';
 import { getFramePropsStory } from '../../../utils/frameProps';
 import { getTextPropsStory } from '../utils';
@@ -19,19 +20,6 @@ export const Paragraph: StoryObj<TextProps> = {
         ...getTextPropsStory(allowedTextTextProps).args,
     },
     argTypes: {
-        typographyStyle: {
-            control: 'select',
-            options: [
-                'titleLarge',
-                'titleMedium',
-                'titleSmall',
-                'highlight',
-                'body',
-                'callout',
-                'hint',
-                'label',
-            ],
-        },
         variant: {
             control: {
                 type: 'select',
diff --git a/packages/components/src/components/typography/Paragraph/Paragraph.tsx b/packages/components/src/components/typography/Paragraph/Paragraph.tsx
index f81f563230a..9ae742fbec5 100644
--- a/packages/components/src/components/typography/Paragraph/Paragraph.tsx
+++ b/packages/components/src/components/typography/Paragraph/Paragraph.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+
 import { Text, TextProps } from '../Text/Text';
 
 export const Paragraph = ({ children, ...rest }: TextProps) => {
diff --git a/packages/components/src/components/typography/Text/Text.stories.tsx b/packages/components/src/components/typography/Text/Text.stories.tsx
index 5c1d39fd3c7..8c84f1c8b10 100644
--- a/packages/components/src/components/typography/Text/Text.stories.tsx
+++ b/packages/components/src/components/typography/Text/Text.stories.tsx
@@ -1,5 +1,6 @@
 import styled from 'styled-components';
 import { Meta, StoryObj } from '@storybook/react';
+
 import { allowedTextFrameProps, allowedTextTextProps, Text as TextComponent } from './Text';
 import { getFramePropsStory } from '../../../utils/frameProps';
 import { getTextPropsStory } from '../utils';
diff --git a/packages/components/src/components/typography/Text/Text.tsx b/packages/components/src/components/typography/Text/Text.tsx
index 5b342dcc382..7676533dc01 100644
--- a/packages/components/src/components/typography/Text/Text.tsx
+++ b/packages/components/src/components/typography/Text/Text.tsx
@@ -1,20 +1,29 @@
+import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { CSSColor, Color, Colors } from '@trezor/theme';
-import { ReactNode } from 'react';
-import { makePropsTransient, TransientProps } from '../../../utils/transientProps';
+
+import { TransientProps } from '../../../utils/transientProps';
 import {
     FrameProps,
     FramePropsKeys,
     pickAndPrepareFrameProps,
     withFrameProps,
 } from '../../../utils/frameProps';
-import { TextPropsKeys, withTextProps, TextProps as TextPropsCommon } from '../utils';
+import {
+    TextPropsKeys,
+    withTextProps,
+    TextProps as TextPropsCommon,
+    pickAndPrepareTextProps,
+} from '../utils';
 import { uiVariants } from '../../../config/types';
 
 export const allowedTextTextProps = [
     'typographyStyle',
     'textWrap',
     'align',
+    'ellipsisLineCount',
 ] as const satisfies TextPropsKeys[];
 type AllowedTextTextProps = Pick<TextPropsCommon, (typeof allowedTextTextProps)[number]>;
 
@@ -41,6 +50,7 @@ const variantColorMap: Record<TextVariant, Color> = {
     warning: 'textAlertYellow',
     destructive: 'textAlertRed',
     purple: 'textAlertPurple',
+    disabled: 'textDisabled',
 };
 
 type ColorProps = {
@@ -56,11 +66,11 @@ const getColorForTextVariant = ({ $variant, theme, $color }: ColorProps): CSSCol
 };
 
 type StyledTextProps = ExclusiveColorOrVariant &
-    TransientProps<AllowedFrameProps> &
-    TransientProps<AllowedTextTextProps>;
+    TransientProps<AllowedFrameProps & AllowedTextTextProps>;
 
 const StyledText = styled.span<StyledTextProps>`
     color: ${getColorForTextVariant};
+
     ${withTextProps}
     ${withFrameProps}
 `;
@@ -69,6 +79,7 @@ export type TextProps = {
     children: ReactNode;
     className?: string;
     as?: string;
+    onClick?: () => void;
     'data-testid'?: string;
 } & ExclusiveColorOrVariant &
     AllowedFrameProps &
@@ -79,22 +90,22 @@ export const Text = ({
     color,
     children,
     className,
-    typographyStyle,
-    textWrap,
-    align,
     as = 'span',
     'data-testid': dataTest,
+    onClick,
     ...rest
 }: TextProps) => {
     const frameProps = pickAndPrepareFrameProps(rest, allowedTextFrameProps);
+    const textProps = pickAndPrepareTextProps(rest, allowedTextTextProps);
 
     return (
         <StyledText
             {...(variant !== undefined ? { $variant: variant } : { $color: color })}
             className={className}
             as={as}
+            onClick={onClick}
             data-testid={dataTest}
-            {...makePropsTransient({ typographyStyle, textWrap, align })}
+            {...textProps}
             {...frameProps}
         >
             {children}
diff --git a/packages/components/src/components/typography/TruncateWithTooltip/TruncateWithTooltip.stories.tsx b/packages/components/src/components/typography/TruncateWithTooltip/TruncateWithTooltip.stories.tsx
index 960bd860776..18c99733291 100644
--- a/packages/components/src/components/typography/TruncateWithTooltip/TruncateWithTooltip.stories.tsx
+++ b/packages/components/src/components/typography/TruncateWithTooltip/TruncateWithTooltip.stories.tsx
@@ -1,9 +1,10 @@
 import { Meta, StoryObj } from '@storybook/react';
+import styled from 'styled-components';
+
 import {
     TruncateWithTooltip as TruncateWithTooltipComponent,
     TruncateWithTooltipProps,
 } from './TruncateWithTooltip';
-import styled from 'styled-components';
 
 const Container = styled.div`
     overflow: hidden;
diff --git a/packages/components/src/components/typography/TruncateWithTooltip/TruncateWithTooltip.tsx b/packages/components/src/components/typography/TruncateWithTooltip/TruncateWithTooltip.tsx
index 165679a2abb..decf5aa4c54 100644
--- a/packages/components/src/components/typography/TruncateWithTooltip/TruncateWithTooltip.tsx
+++ b/packages/components/src/components/typography/TruncateWithTooltip/TruncateWithTooltip.tsx
@@ -1,5 +1,7 @@
-import styled from 'styled-components';
 import { useEffect, useRef, useState } from 'react';
+
+import styled from 'styled-components';
+
 import { Tooltip, Cursor } from '../../Tooltip/Tooltip';
 import { TooltipDelay } from '../../Tooltip/TooltipDelay';
 
@@ -29,8 +31,13 @@ export const TruncateWithTooltip = ({
     useEffect(() => {
         if (!containerRef.current || !scrollWidth || !scrollHeight) return;
         const resizeObserver = new ResizeObserver(entries => {
-            const { inlineSize: elementWidth, blockSize: elementHeight } =
-                entries[0].borderBoxSize?.[0];
+            const borderBoxSize = entries[0].borderBoxSize?.[0];
+            if (!borderBoxSize) {
+                return;
+            }
+
+            const { inlineSize: elementWidth, blockSize: elementHeight } = borderBoxSize;
+
             setIsTooltipVisible(
                 scrollWidth > Math.ceil(elementWidth) || scrollHeight > Math.ceil(elementHeight),
             );
diff --git a/packages/components/src/components/typography/typography.stories.tsx b/packages/components/src/components/typography/typography.stories.tsx
index f6473c92daa..e437df113a6 100644
--- a/packages/components/src/components/typography/typography.stories.tsx
+++ b/packages/components/src/components/typography/typography.stories.tsx
@@ -1,6 +1,7 @@
+import { Meta, StoryFn } from '@storybook/react';
+
 import { StoryColumn } from '../../support/Story';
 import { H1, H2, Paragraph, Link } from '../../index';
-import { Meta, StoryFn } from '@storybook/react';
 
 const meta: Meta = {
     title: 'Typography',
@@ -23,49 +24,56 @@ export const AllTypography: StoryFn = () => (
                 feugiat vel mi.
             </Paragraph>
             <Paragraph typographyStyle="titleLarge" data-testid="paragraph-titleLarge">
-                type="titleLarge" <br />
+                type=&quot;titleLarge&quot;
+                <br />
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a ante quis lectus
                 eleifend rutrum. Aenean tincidunt odio vel fermentum ultricies. Sed suscipit
                 interdum eros, eget placerat lorem pulvinar in. Ut elit orci, rhoncus eu porta vel,
                 feugiat vel mi.
             </Paragraph>
             <Paragraph typographyStyle="titleMedium" data-testid="paragraph-titleMedium">
-                type="titleMedium" <br />
+                type=&quot;titleMedium&quot;
+                <br />
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a ante quis lectus
                 eleifend rutrum. Aenean tincidunt odio vel fermentum ultricies. Sed suscipit
                 interdum eros, eget placerat lorem pulvinar in. Ut elit orci, rhoncus eu porta vel,
                 feugiat vel mi.
             </Paragraph>
             <Paragraph typographyStyle="titleSmall" data-testid="paragraph-titleSmall">
-                type ="titleSmall" <br />
+                type=&quot;titleSmall&quot;
+                <br />
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a ante quis lectus
                 eleifend rutrum. Aenean tincidunt odio vel fermentum ultricies. Sed suscipit
                 interdum eros, eget placerat lorem pulvinar in. Ut elit orci, rhoncus eu porta vel,
                 feugiat vel mi.
             </Paragraph>
             <Paragraph typographyStyle="highlight" data-testid="paragraph-highlight">
-                type="highlight" <br />
+                type=&quot;highlight&quot;
+                <br />
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a ante quis lectus
                 eleifend rutrum. Aenean tincidunt odio vel fermentum ultricies. Sed suscipit
                 interdum eros, eget placerat lorem pulvinar in. Ut elit orci, rhoncus eu porta vel,
                 feugiat vel mi.
             </Paragraph>
             <Paragraph typographyStyle="callout" data-testid="paragraph-callout">
-                type="callout" <br />
+                type=&quot;callout&quot;
+                <br />
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a ante quis lectus
                 eleifend rutrum. Aenean tincidunt odio vel fermentum ultricies. Sed suscipit
                 interdum eros, eget placerat lorem pulvinar in. Ut elit orci, rhoncus eu porta vel,
                 feugiat vel mi.
             </Paragraph>
             <Paragraph typographyStyle="hint" data-testid="paragraph-hint">
-                type="hint" <br />
+                type=&quot;hint&quot;
+                <br />
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a ante quis lectus
                 eleifend rutrum. Aenean tincidunt odio vel fermentum ultricies. Sed suscipit
                 interdum eros, eget placerat lorem pulvinar in. Ut elit orci, rhoncus eu porta vel,
                 feugiat vel mi.
             </Paragraph>
             <Paragraph typographyStyle="label" data-testid="paragraph-label">
-                type="label" <br />
+                type=&quot;label&quot;
+                <br />
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a ante quis lectus
                 eleifend rutrum. Aenean tincidunt odio vel fermentum ultricies. Sed suscipit
                 interdum eros, eget placerat lorem pulvinar in. Ut elit orci, rhoncus eu porta vel,
diff --git a/packages/components/src/components/typography/utils.tsx b/packages/components/src/components/typography/utils.tsx
index f70136b73ee..5c980549b77 100644
--- a/packages/components/src/components/typography/utils.tsx
+++ b/packages/components/src/components/typography/utils.tsx
@@ -1,8 +1,9 @@
+import { css } from 'styled-components';
+
 import { typography, TypographyStyle, typographyStyles } from '@trezor/theme';
-import { TransientProps } from '../../utils/transientProps';
+
+import { TransientProps, makePropsTransient } from '../../utils/transientProps';
 import { UIHorizontalAlignment, uiHorizontalAlignments } from '../../config/types';
-import { css } from 'styled-components';
-import { makePropsTransient } from '../../utils/transientProps';
 
 export const textWraps = ['balance', 'break-word'];
 export type TextWrap = (typeof textWraps)[number];
@@ -11,6 +12,7 @@ export type TextProps = {
     typographyStyle?: TypographyStyle;
     textWrap?: TextWrap;
     align?: UIHorizontalAlignment;
+    ellipsisLineCount?: number;
 };
 
 export type TextPropsKeys = keyof TextProps;
@@ -25,7 +27,12 @@ export const pickAndPrepareTextProps = (
         allowedTextProps.reduce((acc, item) => ({ ...acc, [item]: props[item] }), {}),
     );
 
-export const withTextProps = ({ $textWrap, $typographyStyle, $align }: TransientTextProps) => {
+export const withTextProps = ({
+    $textWrap,
+    $typographyStyle,
+    $align,
+    $ellipsisLineCount = 0,
+}: TransientTextProps) => {
     return css`
         ${$textWrap &&
         css`
@@ -40,6 +47,19 @@ export const withTextProps = ({ $textWrap, $typographyStyle, $align }: Transient
         css`
             text-align: ${$align};
         `}
+        ${$ellipsisLineCount > 0 &&
+        css`
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+        `}
+        ${$ellipsisLineCount > 1 &&
+        css`
+            white-space: initial;
+            -webkit-line-clamp: ${$ellipsisLineCount};
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+        `}
     `;
 };
 
@@ -66,6 +86,13 @@ const getStorybookType = (key: TextPropsKeys) => {
                     type: 'select',
                 },
             };
+        case 'ellipsisLineCount':
+            return {
+                control: {
+                    type: 'number',
+                    min: 0,
+                },
+            };
         default:
             return {
                 control: {
@@ -94,6 +121,7 @@ export const getTextPropsStory = (allowedTextProps: Array<TextPropsKeys>) => {
             ...(allowedTextProps.includes('textWrap') ? { textWrap: undefined } : {}),
             ...(allowedTextProps.includes('typographyStyle') ? { typographyStyle: undefined } : {}),
             ...(allowedTextProps.includes('align') ? { align: undefined } : {}),
+            ...(allowedTextProps.includes('ellipsisLineCount') ? { hasEllipsis: undefined } : {}),
         },
         argTypes,
     };
diff --git a/packages/components/src/config/types.ts b/packages/components/src/config/types.ts
index 5af08e70348..e2433ecaa80 100644
--- a/packages/components/src/config/types.ts
+++ b/packages/components/src/config/types.ts
@@ -6,10 +6,11 @@ export const uiVariants = [
     'info',
     'warning',
     'destructive',
+    'disabled',
 ] as const;
 export type UIVariant = (typeof uiVariants)[number];
 
-export const uiSizes = ['large', 'medium', 'small', 'tiny'] as const;
+export const uiSizes = ['huge', 'large', 'medium', 'small', 'tiny'] as const;
 export type UISize = (typeof uiSizes)[number];
 
 export const uiHorizontalAlignments = ['left', 'center', 'right'] as const;
diff --git a/packages/components/src/images/coins/ada.svg b/packages/components/src/images/coins/ada.svg
deleted file mode 100644
index 13f8cacd49d..00000000000
--- a/packages/components/src/images/coins/ada.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <circle cx="128" cy="128" r="128" fill="#3468d1"></circle>
-    <path fill="#ffffff"
-        d="M265.727,717.735a12.652,12.652,0,1,1-12.654,12.652A12.654,12.654,0,0,1,265.727,717.735Zm30.546,0a12.652,12.652,0,1,1-12.655,12.652A12.654,12.654,0,0,1,296.273,717.735Zm0,53.226a12.652,12.652,0,1,1-12.655,12.652A12.653,12.653,0,0,1,296.273,770.961Zm-30.546,0a12.652,12.652,0,1,1-12.654,12.652A12.653,12.653,0,0,1,265.727,770.961Zm-15.709-26.177a12.652,12.652,0,1,1-12.654,12.652A12.654,12.654,0,0,1,250.018,744.784Zm61.964,0a12.652,12.652,0,1,1-12.655,12.652A12.653,12.653,0,0,1,311.982,744.784Zm14.4-21.813a7.853,7.853,0,1,1-7.855,7.853A7.853,7.853,0,0,1,326.382,722.971Zm0,52.352a7.853,7.853,0,1,1-7.855,7.853A7.853,7.853,0,0,1,326.382,775.323Zm-90.764,0a7.853,7.853,0,1,1-7.854,7.853A7.854,7.854,0,0,1,235.618,775.323Zm0-52.352a7.853,7.853,0,1,1-7.854,7.853A7.854,7.854,0,0,1,235.618,722.971ZM281,696.794a7.853,7.853,0,1,1-7.855,7.853A7.853,7.853,0,0,1,281,696.794ZM281,801.5a7.853,7.853,0,1,1-7.855,7.853A7.853,7.853,0,0,1,281,801.5Zm33.6,7.853a6.544,6.544,0,1,1-6.546,6.544A6.544,6.544,0,0,1,314.6,809.353Zm-67.2,0a6.544,6.544,0,1,1-6.546,6.544A6.544,6.544,0,0,1,247.4,809.353Zm0-117.794a6.544,6.544,0,1,1-6.546,6.544A6.544,6.544,0,0,1,247.4,691.559Zm67.2,0a6.544,6.544,0,1,1-6.546,6.544A6.544,6.544,0,0,1,314.6,691.559Zm34.036,58.461a6.544,6.544,0,1,1-6.545,6.544A6.545,6.545,0,0,1,348.636,750.02Zm-135.273,0a6.544,6.544,0,1,1-6.545,6.544A6.544,6.544,0,0,1,213.363,750.02Zm-4.8-40.138a5.236,5.236,0,1,1-5.236,5.235A5.236,5.236,0,0,1,208.563,709.882Zm0,83.765a5.236,5.236,0,1,1-5.236,5.235A5.236,5.236,0,0,1,208.563,793.647Zm144.873,0a5.236,5.236,0,1,1-5.236,5.235A5.236,5.236,0,0,1,353.436,793.647Zm0-83.765a5.236,5.236,0,1,1-5.236,5.235A5.236,5.236,0,0,1,353.436,709.882ZM281,668a5.236,5.236,0,1,1-5.237,5.235A5.235,5.235,0,0,1,281,668Zm0,167.529a5.236,5.236,0,1,1-5.237,5.236A5.236,5.236,0,0,1,281,835.529Zm46.254-3.49a4.363,4.363,0,1,1-4.363,4.363A4.363,4.363,0,0,1,327.254,832.039Zm-92.509,0a4.363,4.363,0,1,1-4.363,4.363A4.363,4.363,0,0,1,234.745,832.039Zm0-158.8a4.363,4.363,0,1,1-4.363,4.363A4.363,4.363,0,0,1,234.745,673.235Zm92.509,0a4.363,4.363,0,1,1-4.363,4.363A4.363,4.363,0,0,1,327.254,673.235Zm45.382,79.4A4.363,4.363,0,1,1,368.273,757,4.363,4.363,0,0,1,372.636,752.637Zm-183.273,0A4.363,4.363,0,1,1,185,757,4.363,4.363,0,0,1,189.363,752.637Z"
-        transform="translate(-152 -629)"></path>
-</svg>
\ No newline at end of file
diff --git a/packages/components/src/images/coins/bch.svg b/packages/components/src/images/coins/bch.svg
deleted file mode 100644
index 4d4953f530d..00000000000
--- a/packages/components/src/images/coins/bch.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#0AC18E" />
-    <path fill="#fff" d="M15.743 7.97c-.603-1.367-1.989-1.66-3.685-1.376l-.545-2.114-1.286.332.536 2.108c-.338.085-.685.158-1.029.256L9.198 5.08l-1.285.332.545 2.114c-.277.08-2.595.673-2.595.673l.353 1.377s.944-.265.935-.244c.524-.137.77.125.887.372l1.498 5.793c.018.167-.012.454-.372.551.022.012-.935.24-.935.24l.14 1.606 2.598-.664.552 2.138 1.285-.332-.551-2.154c.353-.082.697-.167 1.032-.255l.549 2.14 1.285-.331-.551-2.135c1.98-.481 3.377-1.73 3.09-3.64-.182-1.151-1.44-2.095-2.484-2.202.642-.57.968-1.4.57-2.488zm-.618 5.041c.256 1.892-2.373 2.123-3.24 2.352l-.756-2.83c.871-.228 3.563-1.188 3.996.478zM13.54 9.16c.271 1.68-1.977 1.876-2.701 2.062l-.689-2.568c.728-.18 2.839-1.05 3.39.506z"/>
-</svg>
diff --git a/packages/components/src/images/coins/bnb.svg b/packages/components/src/images/coins/bnb.svg
deleted file mode 100644
index 42200ed25c9..00000000000
--- a/packages/components/src/images/coins/bnb.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-	<circle cx="12" cy="12" r="12" fill="#F0B90B" />
-	<path fill-rule="evenodd" clip-rule="evenodd" d="M15.9095 11.3987L15.9016 9.70015H15.9078L14.4651 8.8509L11.993 10.3085L9.53574 8.8509L8.09394 9.70015V11.3987L10.5661 12.8493V15.7575L12.0017 16.5988L13.4374 15.7575V12.8493L15.9095 11.3987ZM11.9938 4.5L8.09306 6.79985L9.5287 7.6491L11.9938 6.19148L14.466 7.6491L15.9016 6.79985L11.9938 4.5ZM7.06355 14.9012L7.05564 12L5.62087 11.1516V15.7584L9.52868 18.0503V16.3518L7.06355 14.9012ZM7.05564 10.7894V9.09882L8.49832 8.24956L7.05564 7.40031L5.62 8.24956V9.94016L7.05564 10.7894ZM11.9938 7.40031L10.5582 8.24956L11.9938 9.09882L13.4365 8.24956L11.9938 7.40031ZM8.09306 12.6013V14.2998L9.5287 15.1412V13.4506L8.09306 12.6013ZM11.9938 17.8094L10.5582 16.9601V18.6507L11.9938 19.5L13.4365 18.6507V16.9601L11.9938 17.8094ZM16.9311 7.40031L15.4955 8.24956L16.9311 9.09882V10.7894L18.3738 9.94016V8.24956L16.9311 7.40031ZM16.939 12L16.9311 14.9012L14.4669 16.3509V18.0494L18.3747 15.7575V11.1507L16.939 12ZM15.9016 14.2998L14.466 15.1412V13.4506L15.9016 12.6013V14.2998Z" fill="white" />
-</svg>
diff --git a/packages/components/src/images/coins/btc.svg b/packages/components/src/images/coins/btc.svg
deleted file mode 100644
index 3145115b021..00000000000
--- a/packages/components/src/images/coins/btc.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#F29937" fill-opacity=".95" />
-    <path fill="#fff" fill-rule="evenodd" d="M8.338 6.055l.008.002-.028.02s.007-.01.02-.022zm.083.023l.025-.098-.1.077.075.02zm0 0c-.046.174-.092.354-.137.534-.054.214-.109.427-.163.632-.036.074 0 .111.072.111l.174.044c.243.061.504.127.765.216.325.112.505.446.433.743-.433 1.932-.902 3.827-1.372 5.722-.036.26-.252.409-.541.335-.253-.038-.541-.112-.794-.186-.108 0-.144 0-.18.111-.109.297-.253.632-.398.966-.036.075-.063.14-.09.205-.027.065-.054.13-.09.204.866.223 1.696.446 2.527.669 0 .043-.013.074-.023.1-.007.017-.014.033-.014.048-.18.595-.324 1.226-.469 1.858-.036.074-.036.111.072.149.361.074.722.148 1.083.26.096.032.107.008.133-.05l.012-.025c.036-.167.08-.334.126-.501.045-.167.09-.335.126-.502.036-.167.082-.334.127-.501.045-.168.09-.335.126-.502.325.074.614.149.902.223.052.027.048.053.042.094-.003.016-.006.034-.006.055-.18.594-.325 1.226-.469 1.857-.036.075-.036.112.072.149.163.037.334.084.506.13.171.046.343.093.505.13.173.071.18.04.212-.093l.005-.019c.072-.297.144-.603.216-.91.072-.306.145-.613.217-.91.036-.111.108-.149.216-.111.722.111 1.444.185 2.202.074.578-.075 1.083-.335 1.48-.818.325-.408.505-.854.65-1.374.108-.409.144-.855.072-1.264-.145-.52-.433-.928-.867-1.263-.072-.055-.144-.102-.216-.148-.072-.047-.144-.093-.217-.149.043 0 .072-.013.097-.023.018-.008.033-.014.048-.014.289-.112.577-.26.794-.483.288-.297.433-.669.541-1.078.145-.594.108-1.189-.216-1.746-.253-.371-.578-.669-.939-.892l-1.19-.557c-.11-.037-.145-.074-.11-.186.073-.185.11-.371.145-.557.108-.446.217-.892.325-1.375-.018 0-.027-.009-.036-.018-.01-.01-.018-.019-.036-.019-.171-.048-.336-.089-.496-.13-.212-.052-.418-.104-.623-.167-.072-.037-.108 0-.108.074l-.109.446c-.144.483-.252.929-.36 1.412-.013.012-.025.029-.037.045-.024.033-.048.066-.072.066-.144-.037-.298-.074-.451-.111-.153-.037-.307-.074-.451-.112.036-.074.036-.111.036-.148.072-.297.144-.604.216-.91.073-.307.145-.613.217-.91.036-.075.036-.112-.072-.15-.361-.074-.686-.148-1.047-.26-.108-.037-.144 0-.18.112l-.217.929-.217.929c-.036.111-.072.148-.18.111-.199-.055-.397-.102-.596-.148-.198-.047-.397-.093-.595-.149-.199-.056-.397-.102-.596-.149-.17-.04-.342-.08-.512-.125zm1.758 9.155c.036 0 .072.037.072.037l.274.072c.495.13 1.013.268 1.53.3.434.037.83.037 1.228-.112.686-.223.974-1.152.577-1.746-.18-.298-.469-.483-.758-.67-.63-.36-1.363-.51-2.066-.655l-.063-.013c-.099-.034-.108-.006-.136.084l-.009.027c-.036.186-.08.363-.126.54-.045.176-.09.352-.126.538-.083.296-.153.593-.225.896-.055.229-.11.462-.172.702zm3.428-3.865c-.144.037-.324.075-.397.075-.419 0-.78-.059-1.154-.12-.142-.023-.285-.046-.434-.066-.072-.019-.135-.037-.198-.056-.063-.018-.127-.037-.199-.056-.072-.037-.108-.074-.072-.148.216-.78.397-1.524.577-2.304.037-.111.073-.148.18-.111.108.03.214.057.32.085.423.112.828.22 1.233.398.325.148.65.371.83.706.361.631 0 1.449-.686 1.597z" clip-rule="evenodd"/>
-</svg>
diff --git a/packages/components/src/images/coins/btctestnet.svg b/packages/components/src/images/coins/btctestnet.svg
deleted file mode 100644
index 0d63ab962f1..00000000000
--- a/packages/components/src/images/coins/btctestnet.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#E75F5F" />
-    <path fill="#fff" fill-rule="evenodd" d="M8.338 6.055l.008.002-.028.02s.007-.01.02-.022zm.083.023l.025-.098-.1.077.075.02zm0 0c-.046.174-.092.354-.137.534-.054.214-.109.427-.163.632-.036.074 0 .111.072.111l.174.044c.243.061.504.127.765.216.325.112.505.446.433.743-.433 1.932-.902 3.827-1.372 5.722-.036.26-.252.409-.541.335-.253-.038-.541-.112-.794-.186-.108 0-.144 0-.18.111-.109.297-.253.632-.398.966-.036.075-.063.14-.09.205-.027.065-.054.13-.09.204.866.223 1.696.446 2.527.669 0 .043-.013.074-.023.1-.007.017-.014.033-.014.048-.18.595-.324 1.226-.469 1.858-.036.074-.036.111.072.149.361.074.722.148 1.083.26.096.032.107.008.133-.05l.012-.025c.036-.167.08-.334.126-.501.045-.167.09-.335.126-.502.036-.167.082-.334.127-.501.045-.168.09-.335.126-.502.325.074.614.149.902.223.052.027.048.053.042.094-.003.016-.006.034-.006.055-.18.594-.325 1.226-.469 1.857-.036.075-.036.112.072.149.163.037.334.084.506.13.171.046.343.093.505.13.173.071.18.04.212-.093l.005-.019c.072-.297.144-.603.216-.91.072-.306.145-.613.217-.91.036-.111.108-.149.216-.111.722.111 1.444.185 2.202.074.578-.075 1.083-.335 1.48-.818.325-.408.505-.854.65-1.374.108-.409.144-.855.072-1.264-.145-.52-.433-.928-.867-1.263-.072-.055-.144-.102-.216-.148-.072-.047-.144-.093-.217-.149.043 0 .072-.013.097-.023.018-.008.033-.014.048-.014.289-.112.577-.26.794-.483.288-.297.433-.669.541-1.078.145-.594.108-1.189-.216-1.746-.253-.371-.578-.669-.939-.892l-1.19-.557c-.11-.037-.145-.074-.11-.186.073-.185.11-.371.145-.557.108-.446.217-.892.325-1.375-.018 0-.027-.009-.036-.018-.01-.01-.018-.019-.036-.019-.171-.048-.336-.089-.496-.13-.212-.052-.418-.104-.623-.167-.072-.037-.108 0-.108.074l-.109.446c-.144.483-.252.929-.36 1.412-.013.012-.025.029-.037.045-.024.033-.048.066-.072.066-.144-.037-.298-.074-.451-.111-.153-.037-.307-.074-.451-.112.036-.074.036-.111.036-.148.072-.297.144-.604.216-.91.073-.307.145-.613.217-.91.036-.075.036-.112-.072-.15-.361-.074-.686-.148-1.047-.26-.108-.037-.144 0-.18.112l-.217.929-.217.929c-.036.111-.072.148-.18.111-.199-.055-.397-.102-.596-.148-.198-.047-.397-.093-.595-.149-.199-.056-.397-.102-.596-.149-.17-.04-.342-.08-.512-.125zm1.758 9.155c.036 0 .072.037.072.037l.274.072c.495.13 1.013.268 1.53.3.434.037.83.037 1.228-.112.686-.223.974-1.152.577-1.746-.18-.298-.469-.483-.758-.67-.63-.36-1.363-.51-2.066-.655l-.063-.013c-.099-.034-.108-.006-.136.084l-.009.027c-.036.186-.08.363-.126.54-.045.176-.09.352-.126.538-.083.296-.153.593-.225.896-.055.229-.11.462-.172.702zm3.428-3.865c-.144.037-.324.075-.397.075-.419 0-.78-.059-1.154-.12-.142-.023-.285-.046-.434-.066-.072-.019-.135-.037-.198-.056-.063-.018-.127-.037-.199-.056-.072-.037-.108-.074-.072-.148.216-.78.397-1.524.577-2.304.037-.111.073-.148.18-.111.108.03.214.057.32.085.423.112.828.22 1.233.398.325.148.65.371.83.706.361.631 0 1.449-.686 1.597z" clip-rule="evenodd"/>
-</svg>
diff --git a/packages/components/src/images/coins/btg.svg b/packages/components/src/images/coins/btg.svg
deleted file mode 100644
index 46b004a45e3..00000000000
--- a/packages/components/src/images/coins/btg.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#052267" fill-opacity=".76" />
-    <path stroke="#fff" stroke-width=".6" d="M19.2 12c0 3.976-3.224 7.2-7.2 7.2S4.8 15.976 4.8 12 8.024 4.8 12 4.8s7.2 3.224 7.2 7.2z"/>
-    <path fill="#fff" d="M15.342 10.13c-.162-.99-1.014-1.413-2.165-1.514V7.149h-.89l-.007 1.46c-.234 0-.472-.011-.712-.006l.004-1.453h-.892v1.466c-.194.005-1.802.002-1.802.002l-.001.954s.658-.013.649 0c.363-.002.48.21.514.39v4.019c-.017.112-.085.293-.335.296.012.012-.648 0-.648 0l-.179 1.067 1.801.005v1.483h.89l.004-1.493c.244.006.482.008.715.007l-.004 1.485h.892v-1.48c1.369.02 2.488-.558 2.623-1.848.075-.78-.584-1.605-1.246-1.85.514-.262.866-.748.789-1.522zm-1.25 3.175c-.152 1.273-1.9.981-2.503.984l-.015-1.967c.605-.002 2.517-.173 2.518.983zm-.382-2.772c-.106 1.139-1.6.888-2.103.886l-.016-1.785c.503.006 2.023-.206 2.12.899z"/>
-</svg>
diff --git a/packages/components/src/images/coins/dash.svg b/packages/components/src/images/coins/dash.svg
deleted file mode 100644
index 8253297c56a..00000000000
--- a/packages/components/src/images/coins/dash.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#008DE4" fill-opacity=".9" />
-    <path fill="#fff" d="M14.07 6.994H9.58l-.372 2.08 4.053.005c1.996 0 2.586.725 2.569 1.926-.01.617-.275 1.659-.391 1.996-.308.9-.94 1.928-3.307 1.924l-3.94-.002-.373 2.082h4.48c1.58 0 2.252-.184 2.963-.512 1.579-.73 2.518-2.287 2.894-4.319.56-3.026-.139-5.18-4.085-5.18z"/>
-    <path fill="#fff" d="M7.642 10.955c-1.176 0-1.345.767-1.455 1.23-.146.607-.193.851-.193.851h4.597c1.176 0 1.345-.766 1.455-1.229.146-.607.194-.852.194-.852H7.642z"/>
-</svg>
diff --git a/packages/components/src/images/coins/dgb.svg b/packages/components/src/images/coins/dgb.svg
deleted file mode 100644
index 8aa60ba58bd..00000000000
--- a/packages/components/src/images/coins/dgb.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#2768C6" fill-opacity=".9" />
-    <path fill="#fff" d="M6.025 9.176h7.753s2.676-.025.826 3.427c0 0-1.351 2.7-4.702 2.65l1.805-4.611c.022-.055.03-.114.024-.172-.006-.059-.026-.115-.058-.164-.033-.05-.076-.09-.128-.119-.051-.028-.109-.044-.168-.045l-2.376-.04L6 17.405s1 .1 1.55.05l-.3.75h1.416c.04 0 .078-.011.11-.034.032-.022.057-.054.07-.091l.255-.675.6-.05-.35.85h1.381c.05 0 .1-.015.143-.043.041-.029.074-.07.092-.117l.385-.99s4.202-.7 6.103-4.102c0 0 2.55-3.952-.45-5.352-.585-.269-1.21-.438-1.851-.5l.35-.866c.01-.026.015-.053.012-.081-.002-.028-.012-.054-.027-.078-.016-.023-.036-.042-.06-.055-.025-.014-.052-.02-.08-.021h-1.296l-.4 1.05h-.55l.31-.815c.01-.026.013-.054.01-.082-.004-.027-.014-.054-.03-.077-.015-.022-.036-.041-.06-.055-.025-.013-.052-.02-.08-.021h-1.3l-.4 1.05H7.51c-.109 0-.216.03-.31.085-.092.055-.169.135-.22.23l-.956 1.811z"/>
-</svg>
diff --git a/packages/components/src/images/coins/doge.svg b/packages/components/src/images/coins/doge.svg
deleted file mode 100644
index a78eb50bb48..00000000000
--- a/packages/components/src/images/coins/doge.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#C2A633" fill-opacity=".9" />
-    <path fill="#fff" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12z" />
-    <path fill="#C2A633" fill-opacity=".9"
-        d="M12.288 7.908h-1.715v3.38h2.698v1.416h-2.698v3.38h1.799c.462 0 3.794.052 3.789-3.933-.005-3.985-3.232-4.243-3.873-4.243z" />
-    <path fill="#C2A633" fill-opacity=".9"
-        d="M12 0C5.373 0 0 5.373 0 12c0 6.628 5.373 12 12 12 6.628 0 12-5.372 12-12 0-6.627-5.372-12-12-12zm.472 18.481H8.126v-5.777H6.594v-1.416h1.532V5.511h3.73c.882 0 6.726-.184 6.726 6.593 0 6.89-6.11 6.377-6.11 6.377z" />
-</svg>
\ No newline at end of file
diff --git a/packages/components/src/images/coins/dsol.svg b/packages/components/src/images/coins/dsol.svg
deleted file mode 100644
index 7a24a48b42f..00000000000
--- a/packages/components/src/images/coins/dsol.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <circle cx="20" cy="20" r="20" fill="#E75F5F" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-        d="M13.8123 24.55C13.8741 24.4833 13.9488 24.4298 14.0318 24.3925C14.1149 24.3553 14.2046 24.3352 14.2957 24.3333H29.4831C29.5475 24.3342 29.61 24.3536 29.6635 24.3891C29.717 24.4246 29.759 24.4748 29.7846 24.5335C29.8101 24.5923 29.8181 24.6571 29.8074 24.7202C29.7969 24.7834 29.7682 24.8421 29.7249 24.8894L26.5056 28.45C26.4438 28.5166 26.3692 28.5702 26.2861 28.6074C26.2031 28.6447 26.1133 28.6648 26.0223 28.6666H10.8251C10.7609 28.6657 10.6982 28.6464 10.6448 28.6109C10.5913 28.5753 10.5493 28.5252 10.5237 28.4664C10.4982 28.4077 10.4903 28.3429 10.5008 28.2797C10.5114 28.2166 10.5401 28.1578 10.5834 28.1105L13.8123 24.55ZM29.7394 21.5985C29.7827 21.6458 29.8114 21.7045 29.8219 21.7677C29.8326 21.8308 29.8246 21.8956 29.7991 21.9544C29.7735 22.0132 29.7315 22.0633 29.678 22.0988C29.6245 22.1343 29.562 22.1537 29.4976 22.1546L14.3054 22.1666C14.2143 22.1648 14.1246 22.1447 14.0415 22.1074C13.9585 22.0702 13.8838 22.0166 13.822 21.95L10.5786 18.4015C10.5353 18.3542 10.5066 18.2954 10.496 18.2323C10.4854 18.1691 10.4934 18.1043 10.5189 18.0456C10.5444 17.9868 10.5865 17.9367 10.6399 17.9011C10.6934 17.8656 10.756 17.8463 10.8203 17.8454L26.0126 17.8333C26.1037 17.8352 26.1934 17.8553 26.2765 17.8925C26.3595 17.9298 26.4342 17.9833 26.496 18.05L29.7394 21.5985ZM13.8123 11.55C13.8741 11.4833 13.9488 11.4298 14.0318 11.3925C14.1149 11.3553 14.2046 11.3352 14.2957 11.3333L29.4929 11.3454C29.5571 11.3463 29.6198 11.3656 29.6733 11.4011C29.7267 11.4367 29.7688 11.4868 29.7942 11.5456C29.8197 11.6043 29.8277 11.6691 29.8172 11.7323C29.8065 11.7954 29.7779 11.8542 29.7345 11.9015L26.5056 15.45C26.4438 15.5166 26.3692 15.5702 26.2861 15.6074C26.2031 15.6447 26.1133 15.6648 26.0223 15.6666H10.8251C10.7609 15.6657 10.6982 15.6464 10.6448 15.6109C10.5913 15.5753 10.5493 15.5252 10.5237 15.4664C10.4982 15.4077 10.4903 15.3429 10.5008 15.2797C10.5114 15.2166 10.5401 15.1578 10.5834 15.1105L13.8123 11.55Z"
-        fill="white" />
-</svg>
diff --git a/packages/components/src/images/coins/etc.svg b/packages/components/src/images/coins/etc.svg
deleted file mode 100644
index b5ab9b89652..00000000000
--- a/packages/components/src/images/coins/etc.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#60C67E"/>
-    <g fill="#fff" clip-path="url(#clip0)">
-        <path d="M7.892 11.074l4.127-1.74 4 1.784-4.006-6.317-4.12 6.273zm.013 1.93l4.12 2.387 4.204-2.387-4.165 5.797-4.159-5.797z"/>
-        <path d="M12.038 10.184l-4.298 1.81 4.298 2.386 4.178-2.336-4.178-1.86z"/>
-    </g>
-    <defs>
-        <clipPath id="clip0">
-            <path fill="#fff" d="M0 0H8.489V14H0z" transform="translate(7.74 4.8)"/>
-        </clipPath>
-    </defs>
-</svg>
diff --git a/packages/components/src/images/coins/eth.svg b/packages/components/src/images/coins/eth.svg
deleted file mode 100644
index 50b5e7da3f0..00000000000
--- a/packages/components/src/images/coins/eth.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#454A75" fill-opacity=".9"/>
-    <path fill="#fff" d="M9.83 8.711l-2.206 3.751-.024.043.487.304 2.847 1.775.81.506.272.17.258-.16 3.225-2.013c.505-.315.92-.576.925-.58.004-.003-.28-.495-.632-1.092l-2.205-3.75C12.725 6.2 12.017 5 12.015 5c-.002 0-.985 1.67-2.185 3.711z"/>
-    <path fill="#fff" d="M7.609 13.401c0 .006 4.387 6.285 4.4 6.298.008.007.535-.74 2.215-3.144 1.212-1.735 2.203-3.155 2.202-3.156-.002-.002-.992.615-2.204 1.37-1.21.757-2.207 1.372-2.213 1.37-.008-.003-3.783-2.356-4.367-2.722-.018-.011-.033-.018-.033-.016z"/>
-</svg>
diff --git a/packages/components/src/images/coins/ltc.svg b/packages/components/src/images/coins/ltc.svg
deleted file mode 100644
index cd7239b3130..00000000000
--- a/packages/components/src/images/coins/ltc.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="100%" height="100%" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"
-    style="fill-rule:evenodd;clip-rule:evenodd;">
-    <circle cx="12" cy="12" r="12" fill="#a6a8a9" />
-    <path
-        d="M20.5,11.499c0,4.97 -4.03,8.999 -9,8.999c-4.97,0 -9,-4.03 -9,-9c0,-4.969 4.03,-8.998 9,-8.998c4.97,0 9,4.029 9,8.999Z"
-        style="fill:#fff;fill-rule:nonzero;stroke:#a6a8a9;stroke-width:1px;" />
-    <path
-        d="M6.5,4.017c1.48,-0.99 3.22,-1.517 5.001,-1.517c1.182,0 2.353,0.233 3.445,0.685c1.092,0.452 2.084,1.115 2.92,1.951c0.836,0.836 1.499,1.828 1.951,2.92c0.453,1.092 0.685,2.262 0.685,3.444c0,1.78 -0.528,3.52 -1.517,5c-0.989,1.48 -2.395,2.634 -4.04,3.315c-1.644,0.681 -3.454,0.86 -5.2,0.512c-1.746,-0.347 -3.35,-1.204 -4.609,-2.463c-1.258,-1.259 -2.116,-2.862 -2.463,-4.608c-0.347,-1.746 -0.17,-3.556 0.512,-5.2c0.681,-1.645 1.835,-3.05 3.315,-4.04l-0,0.001Zm7.597,5.582l-0.453,0.116l-0.982,0.299l0.64,-2.262l0.726,-2.429l0.212,-0.93l-3.298,0.07c-0.189,-0 -2.315,6.789 -2.315,6.789l-1.508,0.458l-0.69,2.231l1.522,-0.463l-1.29,4.361l8.742,0c-0,0 0.671,-3.192 0.551,-3.193l-4.617,0l0.707,-2.423l1.524,-0.443l0.09,-0.269l0.514,-1.737l-0.075,-0.175l0.149,-0.075l-0.074,0.25l0.431,1.001l0.533,3.871l-0.272,-3.264l-0.261,-0.607l-0.575,-5.452l-0.726,2.429l0.795,1.847Zm2.136,7.618l0.46,-1.583l-0.46,1.582l-0,0.001Zm-1.369,-5.835l0.272,3.264l0.818,0c0.12,0.001 0.238,0.03 0.344,0.083l0.008,0.004l-1.442,-3.351Zm-0.784,-6.418l-0.074,0.105l0.074,-0.105Zm0.327,-0.647c0.012,-0.003 0.013,-0.004 -0.001,-0.004l0.001,0.004Z"
-        style="fill:#a6a8a9;fill-rule:nonzero;stroke:#a6a8a9;stroke-width:1px;" />
-</svg>
\ No newline at end of file
diff --git a/packages/components/src/images/coins/nmc.svg b/packages/components/src/images/coins/nmc.svg
deleted file mode 100644
index a8b635fa68b..00000000000
--- a/packages/components/src/images/coins/nmc.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#186C9D" fill-opacity="0.9" />
-    <path fill="#fff"
-        d="M14.446 17.625v-.002c.116.003.232-.01.344-.037.657-.154 1.213-.727 1.345-1.347l2.615-9.822-2.079-.01-1.714 6.425-4.636-6.447-.002.003.002-.008-.766-.005c-.116-.001-.231.011-.344.037-.656.155-1.212.729-1.345 1.348L5.25 17.584l2.08.009 1.713-6.426 4.636 6.448h.002l.765.01zM9.5 9.455l.362-1.358 4.636 6.45-.362 1.357-4.635-6.45H9.5z" />
-</svg>
\ No newline at end of file
diff --git a/packages/components/src/images/coins/pol.svg b/packages/components/src/images/coins/pol.svg
deleted file mode 100644
index 9222cc41ec7..00000000000
--- a/packages/components/src/images/coins/pol.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<svg version="1.2"
-    xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500" width="24" height="24">
-    <defs>
-        <linearGradient id="b" x2="1" gradientUnits="userSpaceOnUse" gradientTransform="rotate(31.464 -104.14 -193.07) scale(648.96)">
-            <stop offset="0" stop-color="#a229c5"/>
-            <stop offset="1" stop-color="#7b3fe4"/>
-        </linearGradient>
-        <clipPath clipPathUnits="userSpaceOnUse" id="a">
-            <circle cx="250" cy="250" r="245"/>
-        </clipPath>
-    </defs>
-    <g clip-path="url(#a)">
-        <path d="M-18.1-18.1h536.2v536.2H-18.1z" fill="url(#b)"/>
-    </g>
-    <path d="m320.8 302.9 69.3-40.1c3.7-2.1 6-6 6-10.3v-80c0-4.2-2.3-8.1-6-10.3l-69.3-40c-3.6-2.1-8.2-2.1-11.9 0l-69.3 40c-3.6 2.2-5.9 6.1-5.9 10.3v143l-48.6 28.1-48.6-28.1v-56.1l48.6-28 32.1 18.5v-37.7l-26.1-15c-1.8-1.1-3.9-1.6-6-1.6s-4.1.5-5.9 1.6l-69.3 40c-3.7 2.1-6 6-6 10.3v80c0 4.2 2.3 8.2 6 10.3l69.3 40c3.6 2.1 8.2 2.1 11.9 0l69.2-40c3.7-2.1 6-6.1 6-10.3v-143l.9-.5 47.7-27.6 48.6 28.1v56.1l-48.6 28.1-32-18.5v37.6l26 15.1c3.7 2.1 8.3 2.1 11.9 0z" style="fill:#fff"/>
-</svg>
diff --git a/packages/components/src/images/coins/sol.svg b/packages/components/src/images/coins/sol.svg
deleted file mode 100644
index 44557700148..00000000000
--- a/packages/components/src/images/coins/sol.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <g clip-path="url(#clip0_1319_18)">
-        <circle cx="12" cy="12" r="12" fill="#000000"></circle>
-        <g clip-path="url(#clip1_1319_18)">
-            <path
-                d="M18.9279 15.7015L16.6168 18.2419C16.5666 18.2971 16.5058 18.3411 16.4382 18.3711C16.3707 18.4012 16.2978 18.4167 16.2242 18.4167H5.26831C5.21603 18.4167 5.16489 18.401 5.12118 18.3716C5.07746 18.3422 5.04307 18.3004 5.02224 18.2513C5.0014 18.2021 4.99502 18.1478 5.00389 18.095C5.01275 18.0422 5.03647 17.9932 5.07214 17.954L7.385 15.4137C7.43511 15.3586 7.4957 15.3147 7.56303 15.2847C7.63036 15.2546 7.703 15.239 7.77645 15.2389H18.7317C18.784 15.2389 18.8351 15.2545 18.8789 15.2839C18.9225 15.3133 18.9569 15.3551 18.9778 15.4043C18.9986 15.4534 19.005 15.5077 18.9961 15.5605C18.9872 15.6133 18.9635 15.6623 18.9279 15.7015ZM16.6168 10.5859C16.5666 10.5307 16.5058 10.4867 16.4382 10.4566C16.3707 10.4266 16.2978 10.4111 16.2242 10.4111H5.26831C5.21603 10.4111 5.16489 10.4268 5.12118 10.4561C5.07746 10.4855 5.04307 10.5274 5.02224 10.5765C5.0014 10.6256 4.99502 10.6799 5.00389 10.7327C5.01275 10.7855 5.03647 10.8345 5.07214 10.8737L7.385 13.4141C7.43511 13.4691 7.4957 13.513 7.56303 13.5431C7.63036 13.5732 7.703 13.5888 7.77645 13.5889H18.7317C18.784 13.5889 18.8351 13.5732 18.8789 13.5438C18.9225 13.5145 18.9569 13.4726 18.9778 13.4235C18.9986 13.3744 19.005 13.32 18.9961 13.2672C18.9872 13.2145 18.9635 13.1655 18.9279 13.1263L16.6168 10.5859ZM5.26831 8.76111H16.2242C16.2978 8.76114 16.3707 8.74565 16.4382 8.71558C16.5058 8.68551 16.5666 8.64151 16.6168 8.58633L18.9279 6.04594C18.9635 6.00677 18.9872 5.95777 18.9961 5.90496C19.005 5.85216 18.9986 5.79785 18.9778 5.74871C18.9569 5.69958 18.9225 5.65775 18.8789 5.62836C18.8351 5.59898 18.784 5.58333 18.7317 5.58333H7.77645C7.703 5.58346 7.63036 5.59903 7.56303 5.6291C7.4957 5.65916 7.43511 5.70307 7.385 5.75811L5.07273 8.2985C5.0371 8.33762 5.01339 8.38658 5.00451 8.43931C4.99562 8.49206 5.00195 8.54633 5.02271 8.59544C5.04348 8.64456 5.07777 8.68638 5.1214 8.71581C5.16502 8.74524 5.21608 8.76098 5.26831 8.76111Z"
-                fill="url(#paint0_linear_1319_18)" />
-        </g>
-    </g>
-    <defs>
-        <linearGradient id="paint0_linear_1319_18" x1="6.18176" y1="18.7225" x2="17.9883"
-            y2="5.73683" gradientUnits="userSpaceOnUse">
-            <stop offset="0.08" stop-color="#9945FF" />
-            <stop offset="0.3" stop-color="#8752F3" />
-            <stop offset="0.5" stop-color="#5497D5" />
-            <stop offset="0.6" stop-color="#43B4CA" />
-            <stop offset="0.72" stop-color="#28E0B9" />
-            <stop offset="0.97" stop-color="#19FB9B" />
-        </linearGradient>
-    </defs>
-</svg>
diff --git a/packages/components/src/images/coins/tada.svg b/packages/components/src/images/coins/tada.svg
deleted file mode 100644
index 5832b53043f..00000000000
--- a/packages/components/src/images/coins/tada.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <circle cx="128" cy="128" r="128" fill="#E75F5F"></circle>
-    <path fill="#ffffff"
-        d="M265.727,717.735a12.652,12.652,0,1,1-12.654,12.652A12.654,12.654,0,0,1,265.727,717.735Zm30.546,0a12.652,12.652,0,1,1-12.655,12.652A12.654,12.654,0,0,1,296.273,717.735Zm0,53.226a12.652,12.652,0,1,1-12.655,12.652A12.653,12.653,0,0,1,296.273,770.961Zm-30.546,0a12.652,12.652,0,1,1-12.654,12.652A12.653,12.653,0,0,1,265.727,770.961Zm-15.709-26.177a12.652,12.652,0,1,1-12.654,12.652A12.654,12.654,0,0,1,250.018,744.784Zm61.964,0a12.652,12.652,0,1,1-12.655,12.652A12.653,12.653,0,0,1,311.982,744.784Zm14.4-21.813a7.853,7.853,0,1,1-7.855,7.853A7.853,7.853,0,0,1,326.382,722.971Zm0,52.352a7.853,7.853,0,1,1-7.855,7.853A7.853,7.853,0,0,1,326.382,775.323Zm-90.764,0a7.853,7.853,0,1,1-7.854,7.853A7.854,7.854,0,0,1,235.618,775.323Zm0-52.352a7.853,7.853,0,1,1-7.854,7.853A7.854,7.854,0,0,1,235.618,722.971ZM281,696.794a7.853,7.853,0,1,1-7.855,7.853A7.853,7.853,0,0,1,281,696.794ZM281,801.5a7.853,7.853,0,1,1-7.855,7.853A7.853,7.853,0,0,1,281,801.5Zm33.6,7.853a6.544,6.544,0,1,1-6.546,6.544A6.544,6.544,0,0,1,314.6,809.353Zm-67.2,0a6.544,6.544,0,1,1-6.546,6.544A6.544,6.544,0,0,1,247.4,809.353Zm0-117.794a6.544,6.544,0,1,1-6.546,6.544A6.544,6.544,0,0,1,247.4,691.559Zm67.2,0a6.544,6.544,0,1,1-6.546,6.544A6.544,6.544,0,0,1,314.6,691.559Zm34.036,58.461a6.544,6.544,0,1,1-6.545,6.544A6.545,6.545,0,0,1,348.636,750.02Zm-135.273,0a6.544,6.544,0,1,1-6.545,6.544A6.544,6.544,0,0,1,213.363,750.02Zm-4.8-40.138a5.236,5.236,0,1,1-5.236,5.235A5.236,5.236,0,0,1,208.563,709.882Zm0,83.765a5.236,5.236,0,1,1-5.236,5.235A5.236,5.236,0,0,1,208.563,793.647Zm144.873,0a5.236,5.236,0,1,1-5.236,5.235A5.236,5.236,0,0,1,353.436,793.647Zm0-83.765a5.236,5.236,0,1,1-5.236,5.235A5.236,5.236,0,0,1,353.436,709.882ZM281,668a5.236,5.236,0,1,1-5.237,5.235A5.235,5.235,0,0,1,281,668Zm0,167.529a5.236,5.236,0,1,1-5.237,5.236A5.236,5.236,0,0,1,281,835.529Zm46.254-3.49a4.363,4.363,0,1,1-4.363,4.363A4.363,4.363,0,0,1,327.254,832.039Zm-92.509,0a4.363,4.363,0,1,1-4.363,4.363A4.363,4.363,0,0,1,234.745,832.039Zm0-158.8a4.363,4.363,0,1,1-4.363,4.363A4.363,4.363,0,0,1,234.745,673.235Zm92.509,0a4.363,4.363,0,1,1-4.363,4.363A4.363,4.363,0,0,1,327.254,673.235Zm45.382,79.4A4.363,4.363,0,1,1,368.273,757,4.363,4.363,0,0,1,372.636,752.637Zm-183.273,0A4.363,4.363,0,1,1,185,757,4.363,4.363,0,0,1,189.363,752.637Z"
-        transform="translate(-152 -629)"></path>
-</svg>
\ No newline at end of file
diff --git a/packages/components/src/images/coins/thol.svg b/packages/components/src/images/coins/thol.svg
deleted file mode 100644
index dddbe3a8020..00000000000
--- a/packages/components/src/images/coins/thol.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#E75F5F" />
-    <path fill="#fff"
-        d="M9.83 8.711l-2.206 3.751-.024.043.487.304 2.847 1.775.81.506.272.17.258-.16 3.225-2.013c.505-.315.92-.576.925-.58.004-.003-.28-.495-.632-1.092l-2.205-3.75C12.725 6.2 12.017 5 12.015 5c-.002 0-.985 1.67-2.185 3.711z" />
-    <path fill="#fff"
-        d="M7.609 13.401c0 .006 4.387 6.285 4.4 6.298.008.007.535-.74 2.215-3.144 1.212-1.735 2.203-3.155 2.202-3.156-.002-.002-.992.615-2.204 1.37-1.21.757-2.207 1.372-2.213 1.37-.008-.003-3.783-2.356-4.367-2.722-.018-.011-.033-.018-.033-.016z" />
-</svg>
\ No newline at end of file
diff --git a/packages/components/src/images/coins/tsep.svg b/packages/components/src/images/coins/tsep.svg
deleted file mode 100644
index dddbe3a8020..00000000000
--- a/packages/components/src/images/coins/tsep.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#E75F5F" />
-    <path fill="#fff"
-        d="M9.83 8.711l-2.206 3.751-.024.043.487.304 2.847 1.775.81.506.272.17.258-.16 3.225-2.013c.505-.315.92-.576.925-.58.004-.003-.28-.495-.632-1.092l-2.205-3.75C12.725 6.2 12.017 5 12.015 5c-.002 0-.985 1.67-2.185 3.711z" />
-    <path fill="#fff"
-        d="M7.609 13.401c0 .006 4.387 6.285 4.4 6.298.008.007.535-.74 2.215-3.144 1.212-1.735 2.203-3.155 2.202-3.156-.002-.002-.992.615-2.204 1.37-1.21.757-2.207 1.372-2.213 1.37-.008-.003-3.783-2.356-4.367-2.722-.018-.011-.033-.018-.033-.016z" />
-</svg>
\ No newline at end of file
diff --git a/packages/components/src/images/coins/txrp.svg b/packages/components/src/images/coins/txrp.svg
deleted file mode 100644
index c6a21ce3562..00000000000
--- a/packages/components/src/images/coins/txrp.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#E44749" />
-    <g clip-path="url(#clip0)">
-        <path fill="#fff"
-            d="M16.307 7h1.745l-3.632 3.596c-1.316 1.302-3.448 1.302-4.764 0L6.022 7H7.77l2.76 2.732c.401.396.943.618 1.508.618.564 0 1.106-.222 1.508-.618L16.307 7zM7.746 16.999H6l3.656-3.618c1.315-1.302 3.447-1.302 4.764 0l3.656 3.618H16.33l-2.783-2.754c-.402-.396-.944-.618-1.508-.618-.565 0-1.107.222-1.509.618l-2.784 2.754z" />
-    </g>
-    <defs>
-        <clipPath id="clip0">
-            <path fill="#fff" d="M0 0H12.075V10H0z" transform="translate(6 7)" />
-        </clipPath>
-    </defs>
-</svg>
\ No newline at end of file
diff --git a/packages/components/src/images/coins/vtc.svg b/packages/components/src/images/coins/vtc.svg
deleted file mode 100644
index a92548d7ea3..00000000000
--- a/packages/components/src/images/coins/vtc.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#048657" fill-opacity=".9" />
-    <path fill="#fff" fill-rule="evenodd"
-        d="M5 12.16l.972-1.118H9.43l2.125 2.738L17.115 6c.33.3.64.642.926 1.027.287.384.536.795.746 1.232l-6.826 9.536c-.129.137-.264.205-.406.205-.143 0-.286-.068-.43-.205L6.808 12.16H5z"
-        clip-rule="evenodd" />
-</svg>
\ No newline at end of file
diff --git a/packages/components/src/images/coins/xrp.svg b/packages/components/src/images/coins/xrp.svg
deleted file mode 100644
index 948e9311603..00000000000
--- a/packages/components/src/images/coins/xrp.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#24292E" />
-    <g clip-path="url(#clip0)">
-        <path fill="#fff"
-            d="M16.307 7h1.745l-3.632 3.596c-1.316 1.302-3.448 1.302-4.764 0L6.022 7H7.77l2.76 2.732c.401.396.943.618 1.508.618.564 0 1.106-.222 1.508-.618L16.307 7zM7.746 16.999H6l3.656-3.618c1.315-1.302 3.447-1.302 4.764 0l3.656 3.618H16.33l-2.783-2.754c-.402-.396-.944-.618-1.508-.618-.565 0-1.107.222-1.509.618l-2.784 2.754z" />
-    </g>
-    <defs>
-        <clipPath id="clip0">
-            <path fill="#fff" d="M0 0H12.075V10H0z" transform="translate(6 7)" />
-        </clipPath>
-    </defs>
-</svg>
\ No newline at end of file
diff --git a/packages/components/src/images/coins/zec.svg b/packages/components/src/images/coins/zec.svg
deleted file mode 100644
index 9901c0267be..00000000000
--- a/packages/components/src/images/coins/zec.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-    <circle cx="12" cy="12" r="12" fill="#fbc523" />
-    <path fill="#fff"
-        d="M15.873 8.53V6.85h-3.011V5H11.01v1.85H8v2.228h4.666L8 15.414v1.679h3.011v1.846h1.85v-1.846h3.012v-2.228h-4.671l4.67-6.335z" />
-</svg>
\ No newline at end of file
diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts
index 8f3fa5eecf7..ea3db70e489 100644
--- a/packages/components/src/index.ts
+++ b/packages/components/src/index.ts
@@ -27,6 +27,7 @@ export * from './components/Dropdown/Dropdown';
 export type { GroupedMenuItems } from './components/Dropdown/Menu';
 export * from './components/ElevationContext/ElevationContext';
 export * from './components/Flex/Flex';
+export { FormCell, type FormCellProps } from './components/form/FormCell/FormCell';
 export * from './components/form/Input/Input';
 export * from './components/form/InputStyles';
 export * from './components/form/Radio/Radio';
@@ -41,6 +42,13 @@ export * from './components/HotkeyBadge/HotkeyBadge';
 export * from './components/Image/Image';
 export * from './components/Image/images';
 export * from './components/Icon/Icon';
+export {
+    IconCircle,
+    type IconCircleProps,
+    type IconCircleVariant,
+    type IconCircleColors,
+} from './components/IconCircle/IconCircle';
+export { InfoRow, type InfoRowProps } from './components/InfoRow/InfoRow';
 export * from './components/loaders/LoadingContent/LoadingContent';
 export * from './components/loaders/ProgressBar/ProgressBar';
 export * from './components/loaders/ProgressPie/ProgressPie';
@@ -65,6 +73,7 @@ export * from './components/typography/Heading/Heading';
 export * from './components/typography/Link/Link';
 export * from './components/typography/Paragraph/Paragraph';
 export * from './components/typography/Text/Text';
+export * from './components/typography/Code/Code';
 export * from './components/typography/TruncateWithTooltip/TruncateWithTooltip';
 export * from './components/Banner/Banner';
 export { Table, type TableProps } from './components/Table/Table';
@@ -77,6 +86,7 @@ export * from './constants/keyboardEvents';
 export * from './utils/useScrollShadow';
 export * from './utils/transientProps';
 export { useMediaQuery } from './utils/useMediaQuery';
+export { getSafeWindowSize } from './utils/getSafeWindowSize';
 
 export { intermediaryTheme } from './config/colors';
 export type { SuiteThemeColors } from './config/colors';
diff --git a/packages/components/src/support/Story.tsx b/packages/components/src/support/Story.tsx
index ab437b298a7..53a440117c6 100644
--- a/packages/components/src/support/Story.tsx
+++ b/packages/components/src/support/Story.tsx
@@ -1,4 +1,5 @@
 import styled, { ThemeProvider } from 'styled-components';
+
 import { intermediaryTheme } from '../index';
 
 const Wrapper = styled.div`
diff --git a/packages/components/src/utils/frameProps.tsx b/packages/components/src/utils/frameProps.tsx
index 883c2b8e63a..54ffaa1b85a 100644
--- a/packages/components/src/utils/frameProps.tsx
+++ b/packages/components/src/utils/frameProps.tsx
@@ -1,12 +1,16 @@
 import { css } from 'styled-components';
-import { makePropsTransient, TransientProps } from './transientProps';
+
 import { SpacingValues } from '@trezor/theme';
 
+import { makePropsTransient, TransientProps } from './transientProps';
+
 type Margin = {
     top?: SpacingValues | 'auto';
     bottom?: SpacingValues | 'auto';
     left?: SpacingValues | 'auto';
     right?: SpacingValues | 'auto';
+    horizontal?: SpacingValues | 'auto';
+    vertical?: SpacingValues | 'auto';
 };
 const overflows = [
     'auto',
@@ -67,10 +71,10 @@ export const withFrameProps = ({
     return css`
         ${$margin &&
         css`
-            ${$margin.top ? `margin-top: ${getValueWithUnit($margin.top)};` : ''}
-            ${$margin.bottom ? `margin-bottom: ${getValueWithUnit($margin.bottom)};` : ''}
-            ${$margin.left ? `margin-left: ${getValueWithUnit($margin.left)};` : ''}
-            ${$margin.right ? `margin-right: ${getValueWithUnit($margin.right)};` : ''}
+            margin: ${getValueWithUnit($margin.top ?? $margin.vertical ?? 0)}
+                ${getValueWithUnit($margin.right ?? $margin.horizontal ?? 0)}
+                ${getValueWithUnit($margin.bottom ?? $margin.vertical ?? 0)}
+                ${getValueWithUnit($margin.left ?? $margin.horizontal ?? 0)};
         `}
 
         ${$minWidth &&
@@ -171,6 +175,8 @@ export const getFramePropsStory = (allowedFrameProps: Array<FramePropsKeys>) =>
                           right: undefined,
                           bottom: undefined,
                           left: undefined,
+                          horizontal: undefined,
+                          vertical: undefined,
                       },
                   }
                 : {}),
diff --git a/packages/components/src/utils/getSafeWindowSize.ts b/packages/components/src/utils/getSafeWindowSize.ts
new file mode 100644
index 00000000000..d1ab2f07fcc
--- /dev/null
+++ b/packages/components/src/utils/getSafeWindowSize.ts
@@ -0,0 +1,19 @@
+const roundDownFloatOrFallback = (value: string, fallback: number) => {
+    const parsed = Math.floor(parseFloat(value));
+
+    return Number.isNaN(parsed) ? fallback : parsed;
+};
+
+/**
+ * Get window size and try to round it down if it's a fractional number.
+ * Can happen at Windows with scaling enabled, see https://github.com/trezor/trezor-suite/issues/15195
+ */
+export const getSafeWindowSize = () => {
+    // window.innerWidth is always integer, but computedStyle bears the actual value if it's fractional
+    const computedStyle = window.getComputedStyle(document.body);
+    // but we have to convert from 'px' to number, so let's do it safely with fallback
+    const windowWidth = roundDownFloatOrFallback(computedStyle.width, window.innerWidth);
+    const windowHeight = roundDownFloatOrFallback(computedStyle.height, window.innerHeight);
+
+    return { windowWidth, windowHeight };
+};
diff --git a/packages/components/src/utils/useScrollShadow.tsx b/packages/components/src/utils/useScrollShadow.tsx
index 53cbf818814..c6abfb19ace 100644
--- a/packages/components/src/utils/useScrollShadow.tsx
+++ b/packages/components/src/utils/useScrollShadow.tsx
@@ -1,8 +1,10 @@
 import { useEffect, useRef, useState } from 'react';
-import styled, { CSSObject } from 'styled-components';
-import { useElevation } from '../components/ElevationContext/ElevationContext';
+
+import styled, { CSSObject, DefaultTheme } from 'styled-components';
+
 import { Color, Elevation, mapElevationToBackground } from '@trezor/theme';
-import { DefaultTheme } from 'styled-components';
+
+import { useElevation } from '../components/ElevationContext/ElevationContext';
 import { UIHorizontalAlignment, UIVerticalAlignment } from '../config/types';
 
 type GradientDirection = Exclude<UIHorizontalAlignment | UIVerticalAlignment, 'center'>;
diff --git a/packages/components/styled.d.ts b/packages/components/styled.d.ts
index ff56311cfb2..83b3a85013a 100644
--- a/packages/components/styled.d.ts
+++ b/packages/components/styled.d.ts
@@ -1,6 +1,7 @@
 // import original module declarations
 import 'styled-components';
 import { BoxShadows, Colors } from '@trezor/theme';
+
 import { SuiteThemeColors } from './src/config/colors';
 
 declare module 'styled-components' {
diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json
index 1ef55129990..7aed3d4037d 100644
--- a/packages/components/tsconfig.json
+++ b/packages/components/tsconfig.json
@@ -26,12 +26,14 @@
         {
             "path": "../../suite-common/validators"
         },
+        { "path": "../asset-utils" },
         { "path": "../connect" },
         { "path": "../dom-utils" },
         { "path": "../env-utils" },
         { "path": "../react-utils" },
         { "path": "../styles" },
         { "path": "../theme" },
-        { "path": "../utils" }
+        { "path": "../utils" },
+        { "path": "../eslint" }
     ]
 }
diff --git a/packages/connect-analytics/package.json b/packages/connect-analytics/package.json
index e0fe8041813..b6cbf058d24 100644
--- a/packages/connect-analytics/package.json
+++ b/packages/connect-analytics/package.json
@@ -12,7 +12,6 @@
         "!**/*.map"
     ],
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "build:lib": "yarn g:rimraf lib && yarn g:tsc --build tsconfig.lib.json && ../../scripts/replace-imports.sh ./lib"
diff --git a/packages/connect-common/files/coins-eth.json b/packages/connect-common/files/coins-eth.json
index bdb18954db7..468c0c35724 100644
--- a/packages/connect-common/files/coins-eth.json
+++ b/packages/connect-common/files/coins-eth.json
@@ -23,7 +23,7 @@
         {
             "blockchain_link": {
                 "type": "blockbook",
-                "url": ["https://bsc1.trezor.io"]
+                "url": ["https://bsc1.trezor.io", "https://bsc2.trezor.io"]
             },
             "chain": "bsc",
             "chain_id": 56,
@@ -80,6 +80,26 @@
                 "T3T1": "2.6.1"
             }
         },
+        {
+            "blockchain_link": {
+                "type": "blockbook",
+                "url": ["https://op1.trezor.io", "https://op2.trezor.io"]
+            },
+            "chain": "op",
+            "chain_id": 10,
+            "coingecko_id": "optimistic-ethereum",
+            "is_testnet": false,
+            "name": "Optimism",
+            "shortcut": "OP",
+            "slip44": 1,
+            "support": {
+                "T1B1": "1.9.4",
+                "T2B1": "2.6.1",
+                "T2T1": "2.3.5",
+                "T3B1": "2.8.1",
+                "T3T1": "2.6.1"
+            }
+        },
         {
             "blockchain_link": {
                 "type": "blockbook",
diff --git a/packages/connect-common/files/firmware/t3w1/releases.json b/packages/connect-common/files/firmware/t3w1/releases.json
new file mode 100644
index 00000000000..fe51488c706
--- /dev/null
+++ b/packages/connect-common/files/firmware/t3w1/releases.json
@@ -0,0 +1 @@
+[]
diff --git a/packages/connect-common/package.json b/packages/connect-common/package.json
index 2e26e81620f..58d0ed0eeb3 100644
--- a/packages/connect-common/package.json
+++ b/packages/connect-common/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@trezor/connect-common",
-    "version": "0.2.2",
+    "version": "0.2.3-beta.2",
     "author": "Trezor <info@trezor.io>",
     "homepage": "https://github.com/trezor/trezor-suite/tree/develop/packages/connect-common",
     "keywords": [
@@ -31,7 +31,6 @@
         "typings": "lib/index.d.ts"
     },
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest",
         "build:lib": "yarn g:rimraf lib && yarn g:tsc --build tsconfig.lib.json && ../../scripts/replace-imports.sh ./lib",
         "type-check": "yarn g:tsc --build tsconfig.json",
diff --git a/packages/connect-common/src/messageChannel/abstract.ts b/packages/connect-common/src/messageChannel/abstract.ts
index 79fcb620271..37d3161ff77 100644
--- a/packages/connect-common/src/messageChannel/abstract.ts
+++ b/packages/connect-common/src/messageChannel/abstract.ts
@@ -3,9 +3,7 @@
  * this file is bundled into content script so be careful what you are importing not to bloat the bundle
  */
 
-import { Deferred, createDeferred } from '@trezor/utils';
-import { TypedEmitter } from '@trezor/utils';
-import { scheduleAction } from '@trezor/utils';
+import { Deferred, createDeferred, TypedEmitter, scheduleAction } from '@trezor/utils';
 
 // TODO: so logger should be probably moved to connect common, or this file should be moved to connect
 // import type { Log } from '@trezor/connect/src/utils/debug';
@@ -50,7 +48,9 @@ export abstract class AbstractMessageChannel<
     protected messageID = 0;
 
     public isConnected = false;
+
     abstract connect(): void;
+
     abstract disconnect(): void;
 
     private readonly handshakeMaxRetries = 5;
@@ -221,7 +221,7 @@ export abstract class AbstractMessageChannel<
         if (!usePromise) {
             try {
                 this.sendFn(message);
-            } catch (err) {
+            } catch {
                 if (useQueue) {
                     this.messagesQueue.push(message);
                 }
@@ -236,7 +236,7 @@ export abstract class AbstractMessageChannel<
 
         try {
             this.sendFn(message);
-        } catch (err) {
+        } catch {
             if (useQueue) {
                 this.messagesQueue.push(message);
             }
diff --git a/packages/connect-common/src/storage.ts b/packages/connect-common/src/storage.ts
index 9a1d0b5b91c..471405e3926 100644
--- a/packages/connect-common/src/storage.ts
+++ b/packages/connect-common/src/storage.ts
@@ -17,7 +17,7 @@ export interface Permission {
  */
 export interface PreferredDevice {
     label?: string;
-    path: string;
+    path: string & { __type: 'DeviceUniquePath' };
     state?: string;
     internalState?: string;
     internalStateExpiration?: number;
@@ -73,7 +73,7 @@ class Storage extends TypedEmitter<Events> {
             const newState = getNewState(getPermanentStorage());
             localStorage.setItem(storageName, JSON.stringify(newState));
             this.emit('changed', newState);
-        } catch (err) {
+        } catch {
             // memory storage is fallback of the last resort
             console.warn('long term storage not available');
             memoryStorage = getNewState(memoryStorage);
@@ -104,7 +104,7 @@ class Storage extends TypedEmitter<Events> {
 
         try {
             return getPermanentStorage();
-        } catch (err) {
+        } catch {
             // memory storage is fallback of the last resort
             console.warn('long term storage not available');
 
diff --git a/packages/connect-common/src/test/storage.test.ts b/packages/connect-common/src/test/storage.test.ts
index 200316673c4..eab24509a2c 100644
--- a/packages/connect-common/src/test/storage.test.ts
+++ b/packages/connect-common/src/test/storage.test.ts
@@ -1,4 +1,4 @@
-import { storage } from '..';
+import { storage } from '../storage';
 
 const origin = 'foo.bar';
 
diff --git a/packages/connect-examples/electron-main-process/eslint.config.mjs b/packages/connect-examples/electron-main-process/eslint.config.mjs
new file mode 100644
index 00000000000..5d6bafcceb0
--- /dev/null
+++ b/packages/connect-examples/electron-main-process/eslint.config.mjs
@@ -0,0 +1,19 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        ignores: ['**/build-electron/*'],
+        rules: {
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/src/**',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/connect-examples/electron-main-process/package.json b/packages/connect-examples/electron-main-process/package.json
index 7777ce817d5..52cba059a08 100644
--- a/packages/connect-examples/electron-main-process/package.json
+++ b/packages/connect-examples/electron-main-process/package.json
@@ -55,7 +55,8 @@
         "@trezor/connect": "workspace:*"
     },
     "devDependencies": {
-        "electron": "32.1.2",
-        "electron-builder": "25.0.5"
+        "@trezor/eslint": "workspace:*",
+        "electron": "33.1.0",
+        "electron-builder": "25.1.8"
     }
 }
diff --git a/packages/connect-examples/electron-main-process/src/electron.js b/packages/connect-examples/electron-main-process/src/electron.js
index 1704aa14749..6c43d11fdc5 100644
--- a/packages/connect-examples/electron-main-process/src/electron.js
+++ b/packages/connect-examples/electron-main-process/src/electron.js
@@ -1,6 +1,7 @@
 const { app, ipcMain, BrowserWindow } = require('electron');
 const path = require('path');
 const url = require('url');
+
 const { initTrezorConnect, callTrezorConnect } = require('./trezor-connect-ipc');
 
 let mainWindow;
@@ -34,7 +35,7 @@ app.on('ready', init);
 
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
-    // On macOS it is common for applications and their menu bar
+    // On macOS, it is common for applications and their menu bar
     // to stay active until the user quits explicitly with Cmd + Q
     if (process.platform !== 'darwin') {
         app.quit();
diff --git a/packages/connect-examples/electron-main-process/tsconfig.json b/packages/connect-examples/electron-main-process/tsconfig.json
index 2f2029a0f6d..ee581a94a31 100644
--- a/packages/connect-examples/electron-main-process/tsconfig.json
+++ b/packages/connect-examples/electron-main-process/tsconfig.json
@@ -2,5 +2,8 @@
     "extends": "../../../tsconfig.base.json",
     "compilerOptions": { "outDir": "./libDev" },
     "include": ["."],
-    "references": [{ "path": "../../connect" }]
+    "references": [
+        { "path": "../../connect" },
+        { "path": "../../eslint" }
+    ]
 }
diff --git a/packages/connect-examples/electron-renderer-with-assets/eslint.config.mjs b/packages/connect-examples/electron-renderer-with-assets/eslint.config.mjs
new file mode 100644
index 00000000000..0d4aa8b45d2
--- /dev/null
+++ b/packages/connect-examples/electron-renderer-with-assets/eslint.config.mjs
@@ -0,0 +1,22 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        ignores: ['**/build-electron/*', '**/build-renderer/*'],
+    },
+    {
+        rules: {
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/src/**',
+                        '**/webpack/**',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/connect-examples/electron-renderer-with-assets/package.json b/packages/connect-examples/electron-renderer-with-assets/package.json
index c724f26b64f..70de1105576 100644
--- a/packages/connect-examples/electron-renderer-with-assets/package.json
+++ b/packages/connect-examples/electron-renderer-with-assets/package.json
@@ -57,17 +57,20 @@
     },
     "devDependencies": {
         "@trezor/connect": "workspace:*",
+        "@trezor/connect-web": "workspace:*",
+        "@trezor/eslint": "workspace:*",
         "babel-loader": "^9.1.3",
         "concurrently": "^8.2.2",
         "copy-webpack-plugin": "^12.0.2",
-        "electron": "32.1.2",
-        "electron-builder": "25.0.5",
+        "electron": "33.1.0",
+        "electron-builder": "25.1.8",
         "html-webpack-plugin": "^5.6.0",
         "terser-webpack-plugin": "^5.3.9",
         "wait-on": "^7.0.1",
-        "webpack": "^5.94.0",
+        "webpack": "^5.96.1",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^5.0.4",
+        "webpack-plugin-serve": "^1.6.0",
         "worker-loader": "^3.0.8"
     }
 }
diff --git a/packages/connect-examples/electron-renderer-with-assets/tsconfig.json b/packages/connect-examples/electron-renderer-with-assets/tsconfig.json
index 2f2029a0f6d..030ca8643b3 100644
--- a/packages/connect-examples/electron-renderer-with-assets/tsconfig.json
+++ b/packages/connect-examples/electron-renderer-with-assets/tsconfig.json
@@ -2,5 +2,9 @@
     "extends": "../../../tsconfig.base.json",
     "compilerOptions": { "outDir": "./libDev" },
     "include": ["."],
-    "references": [{ "path": "../../connect" }]
+    "references": [
+        { "path": "../../connect" },
+        { "path": "../../connect-web" },
+        { "path": "../../eslint" }
+    ]
 }
diff --git a/packages/connect-examples/electron-renderer-with-popup/eslint.config.mjs b/packages/connect-examples/electron-renderer-with-popup/eslint.config.mjs
new file mode 100644
index 00000000000..604a589cef6
--- /dev/null
+++ b/packages/connect-examples/electron-renderer-with-popup/eslint.config.mjs
@@ -0,0 +1,21 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        ignores: ['**/build-electron/*', '**/build-renderer/*'],
+    },
+    {
+        rules: {
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/src/**',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/connect-examples/electron-renderer-with-popup/package.json b/packages/connect-examples/electron-renderer-with-popup/package.json
index d5f5bed36df..56bf0543130 100644
--- a/packages/connect-examples/electron-renderer-with-popup/package.json
+++ b/packages/connect-examples/electron-renderer-with-popup/package.json
@@ -52,7 +52,8 @@
         }
     },
     "devDependencies": {
-        "electron": "32.1.2",
-        "electron-builder": "25.0.5"
+        "@trezor/eslint": "workspace:*",
+        "electron": "33.1.0",
+        "electron-builder": "25.1.8"
     }
 }
diff --git a/packages/connect-examples/electron-renderer-with-popup/tsconfig.json b/packages/connect-examples/electron-renderer-with-popup/tsconfig.json
index de4bd65a31b..a440c33b942 100644
--- a/packages/connect-examples/electron-renderer-with-popup/tsconfig.json
+++ b/packages/connect-examples/electron-renderer-with-popup/tsconfig.json
@@ -2,5 +2,5 @@
     "extends": "../../../tsconfig.base.json",
     "compilerOptions": { "outDir": "./libDev" },
     "include": ["."],
-    "references": []
+    "references": [{ "path": "../../eslint" }]
 }
diff --git a/packages/connect-examples/deeplink-expo/.gitignore b/packages/connect-examples/mobile-expo/.gitignore
similarity index 100%
rename from packages/connect-examples/deeplink-expo/.gitignore
rename to packages/connect-examples/mobile-expo/.gitignore
diff --git a/packages/connect-examples/deeplink-expo/App.tsx b/packages/connect-examples/mobile-expo/App.tsx
similarity index 91%
rename from packages/connect-examples/deeplink-expo/App.tsx
rename to packages/connect-examples/mobile-expo/App.tsx
index ba4d3d5811e..0c04fee7cae 100644
--- a/packages/connect-examples/deeplink-expo/App.tsx
+++ b/packages/connect-examples/mobile-expo/App.tsx
@@ -4,7 +4,7 @@ import { useEffect, useState } from 'react';
 import { StatusBar } from 'expo-status-bar';
 import * as Linking from 'expo-linking';
 
-import TrezorConnect from '@trezor/connect-deeplink';
+import TrezorConnect from '@trezor/connect-mobile';
 
 const styles = StyleSheet.create({
     container: {
@@ -22,6 +22,7 @@ const styles = StyleSheet.create({
 export const App = () => {
     const [errorData, setErrorData] = useState<any>(null);
     const [successData, setSuccessData] = useState<any>(null);
+    const isEmulator = true;
 
     const initialize = () => {
         TrezorConnect.init({
@@ -29,13 +30,14 @@ export const App = () => {
                 email: 'developer@xyz.com',
                 appUrl: 'http://your.application.com',
             },
+            // for local development purposes. for production, leave it undefined to use the default value.
+            connectSrc: isEmulator ? 'trezorsuitelite://connect' : undefined,
             deeplinkOpen: url => {
                 // eslint-disable-next-line no-console
                 console.log('deeplinkOpen', url);
                 Linking.openURL(url);
             },
             deeplinkCallbackUrl: Linking.createURL('/connect'),
-            // deeplinkUrl: 'https://dev.suite.sldev.cz/connect/develop/deeplink/',
         });
     };
 
diff --git a/packages/connect-examples/deeplink-expo/README.md b/packages/connect-examples/mobile-expo/README.md
similarity index 75%
rename from packages/connect-examples/deeplink-expo/README.md
rename to packages/connect-examples/mobile-expo/README.md
index 045a7fa4901..9feaaf60873 100644
--- a/packages/connect-examples/deeplink-expo/README.md
+++ b/packages/connect-examples/mobile-expo/README.md
@@ -1,6 +1,6 @@
-## Deep link example with Expo
+## Mobile example with Expo
 
-`@trezor/connect-deeplink` running with a React Native + Expo app
+`@trezor/connect-mobile` running with a React Native + Expo app
 
 ### Run it
 
diff --git a/packages/connect-examples/deeplink-expo/app.json b/packages/connect-examples/mobile-expo/app.json
similarity index 72%
rename from packages/connect-examples/deeplink-expo/app.json
rename to packages/connect-examples/mobile-expo/app.json
index be288d3acbe..cf0cfbc7048 100644
--- a/packages/connect-examples/deeplink-expo/app.json
+++ b/packages/connect-examples/mobile-expo/app.json
@@ -1,7 +1,7 @@
 {
     "expo": {
-        "name": "connect-deeplink-example",
-        "slug": "connect-deeplink-example",
+        "name": "connect-mobile-example",
+        "slug": "connect-mobile-example",
         "version": "1.0.0",
         "orientation": "portrait",
         "userInterfaceStyle": "light",
diff --git a/packages/connect-examples/deeplink-expo/babel.config.js b/packages/connect-examples/mobile-expo/babel.config.js
similarity index 100%
rename from packages/connect-examples/deeplink-expo/babel.config.js
rename to packages/connect-examples/mobile-expo/babel.config.js
diff --git a/packages/connect-examples/deeplink-expo/index.js b/packages/connect-examples/mobile-expo/index.js
similarity index 100%
rename from packages/connect-examples/deeplink-expo/index.js
rename to packages/connect-examples/mobile-expo/index.js
diff --git a/packages/connect-examples/deeplink-expo/package.json b/packages/connect-examples/mobile-expo/package.json
similarity index 85%
rename from packages/connect-examples/deeplink-expo/package.json
rename to packages/connect-examples/mobile-expo/package.json
index 6b1da406517..8d337b14eb4 100644
--- a/packages/connect-examples/deeplink-expo/package.json
+++ b/packages/connect-examples/mobile-expo/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "connect-deeplink-expo-example",
+    "name": "connect-mobile-example",
     "version": "1.0.0",
     "main": "index.js",
     "scripts": {
@@ -9,7 +9,7 @@
         "web": "expo start --web"
     },
     "dependencies": {
-        "@trezor/connect-deeplink": "workspace:*",
+        "@trezor/connect-mobile": "workspace:*",
         "expo": "51.0.31",
         "expo-linking": "6.3.1",
         "expo-status-bar": "1.12.1",
diff --git a/packages/connect-examples/deeplink-expo/tsconfig.json b/packages/connect-examples/mobile-expo/tsconfig.json
similarity index 73%
rename from packages/connect-examples/deeplink-expo/tsconfig.json
rename to packages/connect-examples/mobile-expo/tsconfig.json
index 969501df44d..a3f46dccb10 100644
--- a/packages/connect-examples/deeplink-expo/tsconfig.json
+++ b/packages/connect-examples/mobile-expo/tsconfig.json
@@ -2,6 +2,6 @@
     "extends": "../../../tsconfig.base.json",
     "compilerOptions": { "outDir": "./libDev" },
     "references": [
-        { "path": "../../connect-deeplink" }
+        { "path": "../../connect-mobile" }
     ]
 }
diff --git a/packages/connect-examples/update-webextensions-sw.js b/packages/connect-examples/update-webextensions-sw.js
index abd4c5568b9..6b8e412522b 100644
--- a/packages/connect-examples/update-webextensions-sw.js
+++ b/packages/connect-examples/update-webextensions-sw.js
@@ -66,19 +66,22 @@ rootPaths.forEach(dir => {
         const isJustCopied = ['.png'].some(ext => p.endsWith(ext));
         if (isJustCopied) {
             fs.copyFileSync(path.join(rootPath, 'src', p), path.join(rootPath, buildFolder, p));
+
             return;
         }
         fs.readFile(path.join(rootPath, 'src', p), 'utf-8', (err, contents) => {
             if (err) {
                 console.log(err);
+
                 return;
             }
 
             const replaced = contents.replace(DEFAULT_SRC, trezorConnectSrc);
 
-            fs.writeFile(path.join(rootPath, buildFolder, p), replaced, 'utf-8', err => {
-                if (err) {
-                    console.log(err);
+            fs.writeFile(path.join(rootPath, buildFolder, p), replaced, 'utf-8', err2 => {
+                if (err2) {
+                    console.log(err2);
+
                     return;
                 }
             });
diff --git a/packages/connect-examples/update-webextensions.js b/packages/connect-examples/update-webextensions.js
index e3a87302555..84a8dfdb372 100644
--- a/packages/connect-examples/update-webextensions.js
+++ b/packages/connect-examples/update-webextensions.js
@@ -41,7 +41,7 @@ rootPaths.forEach(dir => {
     const usbPermissionsScriptPath = path.join(vendorPath, 'trezor-usb-permissions.js');
     const usbPermissionsHtmlPath = path.join(rootPath, 'trezor-usb-permissions.html');
     const contentScriptPath = path.join(vendorPath, 'trezor-content-script.js');
-    const backgroundScriptPath = path.join(rootPath, 'background.js');
+    // const backgroundScriptPath = path.join(rootPath, 'background.js');
 
     fs.rmSync(buildPath, { recursive: true, force: true });
     if (!fs.existsSync(buildPath)) {
@@ -52,9 +52,9 @@ rootPaths.forEach(dir => {
     }
 
     [inlineScriptPath, usbPermissionsScriptPath, usbPermissionsHtmlPath, contentScriptPath].forEach(
-        path => {
-            if (fs.existsSync(path)) {
-                fs.rmSync(path);
+        path2 => {
+            if (fs.existsSync(path2)) {
+                fs.rmSync(path2);
             }
         },
     );
@@ -105,19 +105,22 @@ rootPaths.forEach(dir => {
         const isJustCopied = ['.png'].some(ext => p.endsWith(ext));
         if (isJustCopied) {
             fs.copyFileSync(path.join(rootPath, 'src', p), path.join(rootPath, buildFolder, p));
+
             return;
         }
         fs.readFile(path.join(rootPath, 'src', p), 'utf-8', (err, contents) => {
             if (err) {
                 console.log(err);
+
                 return;
             }
 
             const replaced = contents.replace(DEFAULT_SRC, trezorConnectSrc);
 
-            fs.writeFile(path.join(rootPath, buildFolder, p), replaced, 'utf-8', err => {
-                if (err) {
-                    console.log(err);
+            fs.writeFile(path.join(rootPath, buildFolder, p), replaced, 'utf-8', err2 => {
+                if (err2) {
+                    console.log(err2);
+
                     return;
                 }
             });
diff --git a/packages/connect-examples/webextension-mv2/.eslintrc.js b/packages/connect-examples/webextension-mv2/.eslintrc.js
deleted file mode 100644
index f9cfed3318c..00000000000
--- a/packages/connect-examples/webextension-mv2/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
-    rules: {
-        'no-underscore-dangle': 'off', // underscore is used
-        camelcase: 'off', // camelcase is used
-    },
-    ignorePatterns: ['**/vendor*/'],
-};
diff --git a/packages/connect-examples/webextension-mv2/eslint.config.mjs b/packages/connect-examples/webextension-mv2/eslint.config.mjs
new file mode 100644
index 00000000000..3c0f12191bb
--- /dev/null
+++ b/packages/connect-examples/webextension-mv2/eslint.config.mjs
@@ -0,0 +1,15 @@
+// Todo: figure out the better way, if this would be package, we would use "@trezor/eslint": "workspace:*" in package.json
+import parentConfig from '../../../eslint.config.mjs';
+
+export default [
+    ...parentConfig,
+    {
+        ignores: ['**/vendor*/'],
+    },
+    {
+        rules: {
+            'no-underscore-dangle': 'off',
+            camelcase: 'off',
+        },
+    },
+];
diff --git a/packages/connect-examples/webextension-mv2/src/background.js b/packages/connect-examples/webextension-mv2/src/background.js
index 46111c4cff9..802ecf01635 100644
--- a/packages/connect-examples/webextension-mv2/src/background.js
+++ b/packages/connect-examples/webextension-mv2/src/background.js
@@ -1,8 +1,8 @@
 /**
-TrezorConnect is loaded in background script but it is triggered from content script.
-- call for TrezorConnect action
-- show a notification with response
-*/
+ TrezorConnect is loaded in background script but it is triggered from content script.
+ - call for TrezorConnect action
+ - show a notification with response
+ */
 
 const DEFAULT_SRC = 'https://connect.trezor.io/9/';
 
@@ -25,21 +25,23 @@ function getAddress() {
 async function sendMessageToContentScript(tabID, type, data = null) {
     try {
         const response = await chrome.tabs.sendMessage(tabID, { type, data });
+
         return response;
-    } catch (error) {
+    } catch {
         return null;
     }
 }
 
 chrome.runtime.onMessage.addListener((message, sender) => {
     const { tab } = sender;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { type, data } = message;
     if (type === 'getAddress') {
         getAddress().then(response => {
-            const message = response.success
+            const message2 = response.success
                 ? `BTC Address: ${response.payload.address}`
                 : `Error: ${response.payload.error}`;
-            sendMessageToContentScript(tab.id, 'getAddress', message);
+            sendMessageToContentScript(tab.id, 'getAddress', message2);
         });
     } else if (type === 'pageLoaded') {
         loadTrezorConnect().then(() => {
diff --git a/packages/connect-examples/webextension-mv2/src/connect-manager.js b/packages/connect-examples/webextension-mv2/src/connect-manager.js
index f82c34681b2..270b0886d0b 100644
--- a/packages/connect-examples/webextension-mv2/src/connect-manager.js
+++ b/packages/connect-examples/webextension-mv2/src/connect-manager.js
@@ -1,9 +1,11 @@
 async function sendMessageToBackground(type, data = null) {
     try {
         const response = await chrome.runtime.sendMessage({ type, data });
+
         return response;
     } catch (error) {
         console.error('sendMessageToBackground error: ', error);
+
         return null;
     }
 }
diff --git a/packages/connect-examples/webextension-mv3-sw-ts/eslint.config.mjs b/packages/connect-examples/webextension-mv3-sw-ts/eslint.config.mjs
new file mode 100644
index 00000000000..52f1c6716cf
--- /dev/null
+++ b/packages/connect-examples/webextension-mv3-sw-ts/eslint.config.mjs
@@ -0,0 +1,21 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'no-console': 'off',
+
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/src/**', // Examples are just for development
+                        '**/webpack.config.js',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/connect-examples/webextension-mv3-sw-ts/package.json b/packages/connect-examples/webextension-mv3-sw-ts/package.json
index e12c5599f36..659680f4ec7 100644
--- a/packages/connect-examples/webextension-mv3-sw-ts/package.json
+++ b/packages/connect-examples/webextension-mv3-sw-ts/package.json
@@ -7,7 +7,6 @@
     "main": "src/index",
     "scripts": {
         "depcheck": "yarn g:depcheck",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "type-check": "yarn g:tsc --build",
         "build": "webpack --mode production"
     },
@@ -15,8 +14,9 @@
         "@trezor/connect-webextension": "workspace:^"
     },
     "devDependencies": {
+        "@trezor/eslint": "workspace:^",
         "copy-webpack-plugin": "^12.0.2",
         "html-webpack-plugin": "^5.6.0",
-        "webpack": "^5.94.0"
+        "webpack": "^5.96.1"
     }
 }
diff --git a/packages/connect-examples/webextension-mv3-sw-ts/src/service-worker.ts b/packages/connect-examples/webextension-mv3-sw-ts/src/service-worker.ts
index f7f8d8a1f03..bd79a30c011 100644
--- a/packages/connect-examples/webextension-mv3-sw-ts/src/service-worker.ts
+++ b/packages/connect-examples/webextension-mv3-sw-ts/src/service-worker.ts
@@ -32,12 +32,14 @@ chrome.runtime.onInstalled.addListener((details: chrome.runtime.InstalledDetails
             }).then(res => {
                 sendResponse(res); // Send the response back to the sender
             });
+
             // Return true to indicate you want to send a response asynchronously
             return true;
         } else if (message.action === 'getFeatures') {
             TrezorConnect.getFeatures().then(res => {
                 sendResponse(res); // Send the response back to the sender
             });
+
             // Return true to indicate you want to send a response asynchronously
             return true;
         }
diff --git a/packages/connect-examples/webextension-mv3-sw-ts/tsconfig.json b/packages/connect-examples/webextension-mv3-sw-ts/tsconfig.json
index 9296fa9f98a..54a73de3094 100644
--- a/packages/connect-examples/webextension-mv3-sw-ts/tsconfig.json
+++ b/packages/connect-examples/webextension-mv3-sw-ts/tsconfig.json
@@ -5,6 +5,7 @@
         "types": ["chrome"]
     },
     "references": [
-        { "path": "../../connect-webextension" }
+        { "path": "../../connect-webextension" },
+        { "path": "../../eslint" }
     ]
 }
diff --git a/packages/connect-examples/webextension-mv3-sw/src/serviceWorker.js b/packages/connect-examples/webextension-mv3-sw/src/serviceWorker.js
index d7c332f1686..643e7209024 100644
--- a/packages/connect-examples/webextension-mv3-sw/src/serviceWorker.js
+++ b/packages/connect-examples/webextension-mv3-sw/src/serviceWorker.js
@@ -30,12 +30,14 @@ chrome.runtime.onInstalled.addListener(details => {
             }).then(res => {
                 sendResponse(res); // Send the response back to the sender
             });
+
             // Return true to indicate you want to send a response asynchronously
             return true;
         } else if (message.action === 'getFeatures') {
             TrezorConnect.getFeatures().then(res => {
                 sendResponse(res); // Send the response back to the sender
             });
+
             // Return true to indicate you want to send a response asynchronously
             return true;
         }
diff --git a/packages/connect-explorer-theme/package.json b/packages/connect-explorer-theme/package.json
index f9bf61aaa97..5540125c7c6 100644
--- a/packages/connect-explorer-theme/package.json
+++ b/packages/connect-explorer-theme/package.json
@@ -32,7 +32,7 @@
         "escape-string-regexp": "^5.0.0",
         "flexsearch": "^0.7.31",
         "focus-visible": "^5.2.1",
-        "git-url-parse": "^13.1.0",
+        "git-url-parse": "^15.0.0",
         "intersection-observer": "^0.12.2",
         "match-sorter": "^6.3.1",
         "next-seo": "^6.0.0",
@@ -46,7 +46,7 @@
         "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
         "@testing-library/react": "^14.0.0",
         "@types/flexsearch": "^0.7.3",
-        "@types/git-url-parse": "^9.0.1",
+        "@types/git-url-parse": "^9.0.3",
         "@types/react": "^18.2.79",
         "@types/react-dom": "^18.2.7",
         "concurrently": "^8.0.0",
diff --git a/packages/connect-explorer-theme/src/components/anchor.tsx b/packages/connect-explorer-theme/src/components/anchor.tsx
index e1e1e2b6d64..4f7f35d6acd 100644
--- a/packages/connect-explorer-theme/src/components/anchor.tsx
+++ b/packages/connect-explorer-theme/src/components/anchor.tsx
@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-restricted-imports -- only in this file we determine either we include <a /> as child of <NextLink /> based of `newNextLinkBehavior` value
 import type { ComponentProps, ReactElement } from 'react';
 import { forwardRef } from 'react';
 
diff --git a/packages/connect-explorer-theme/src/components/search.tsx b/packages/connect-explorer-theme/src/components/search.tsx
index dfd49d88fb0..56001d35793 100644
--- a/packages/connect-explorer-theme/src/components/search.tsx
+++ b/packages/connect-explorer-theme/src/components/search.tsx
@@ -155,6 +155,7 @@ export function Search({
             leaveFrom="nx-opacity-100"
             leaveTo="nx-opacity-0"
         >
+            {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */}
             <kbd
                 className={cn(
                     'nx-absolute nx-my-1.5 nx-select-none ltr:nx-right-1.5 rtl:nx-left-1.5',
@@ -240,6 +241,7 @@ export function Search({
     return (
         <div className={cn('nextra-search nx-relative md:nx-w-64', className)}>
             {renderList && (
+                // eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions
                 <div className="nx-fixed nx-inset-0 nx-z-10" onClick={() => setShow(false)} />
             )}
 
diff --git a/packages/connect-explorer-theme/src/components/sidebar.tsx b/packages/connect-explorer-theme/src/components/sidebar.tsx
index 7fd51fac761..aaa16291c50 100644
--- a/packages/connect-explorer-theme/src/components/sidebar.tsx
+++ b/packages/connect-explorer-theme/src/components/sidebar.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-use-before-define */
 import type { ReactElement } from 'react';
 import { createContext, useEffect, useMemo, useRef, useState } from 'react';
 
@@ -110,6 +109,7 @@ export function Sidebar({
             {includePlaceholder && asPopover ? (
                 <div className="max-xl:nx-hidden nx-h-0 nx-w-64 nx-shrink-0" />
             ) : null}
+            {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */}
             <div
                 className={cn(
                     'motion-reduce:nx-transition-none [transition:background-color_1.5s_ease]',
diff --git a/packages/connect-explorer-theme/src/mdx-components.tsx b/packages/connect-explorer-theme/src/mdx-components.tsx
index a047b96e673..bae50c051f8 100644
--- a/packages/connect-explorer-theme/src/mdx-components.tsx
+++ b/packages/connect-explorer-theme/src/mdx-components.tsx
@@ -224,6 +224,7 @@ export const getComponents = ({
             return <section {...props} />;
         },
         h1: props => (
+            // eslint-disable-next-line jsx-a11y/heading-has-content
             <h1
                 className="nx-mt-2 nx-mb-2 nx-text-4xl nx-font-bold nx-tracking-tight nx-text-slate-900 dark:nx-text-slate-100"
                 {...props}
diff --git a/packages/connect-explorer/.eslintrc.js b/packages/connect-explorer/.eslintrc.js
deleted file mode 100644
index dbfe52ab94c..00000000000
--- a/packages/connect-explorer/.eslintrc.js
+++ /dev/null
@@ -1,18 +0,0 @@
-module.exports = {
-    rules: {
-        'jsx-a11y/click-events-have-key-events': 'off',
-        'jsx-a11y/no-static-element-interactions': 'off',
-        'import/no-default-export': 'off',
-        '@typescript-eslint/no-restricted-imports': 'off',
-        '@typescript-eslint/no-shadow': 'off',
-        'no-console': 'off',
-        'no-restricted-syntax': 'off',
-        'react/jsx-filename-extension': [
-            'error',
-            {
-                extensions: ['.tsx', '.mdx'],
-            },
-        ],
-    },
-    extends: ['plugin:mdx/recommended'],
-};
diff --git a/packages/connect-explorer/eslint.config.mjs b/packages/connect-explorer/eslint.config.mjs
new file mode 100644
index 00000000000..ac7e9c02422
--- /dev/null
+++ b/packages/connect-explorer/eslint.config.mjs
@@ -0,0 +1,53 @@
+import * as mdx from 'eslint-plugin-mdx';
+
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        ignores: ['.next/**/*'],
+    },
+
+    // Mdx
+    {
+        ...mdx.flat,
+        rules: {
+            'jsx-a11y/click-events-have-key-events': 'off',
+            'jsx-a11y/no-static-element-interactions': 'off',
+            'import/no-default-export': 'off',
+            'no-console': 'off',
+            'no-restricted-syntax': 'off',
+        },
+    },
+    {
+        files: ['**/*.mdx'],
+        rules: {
+            'react/no-unescaped-entities': 'off',
+            'local-rules/no-override-ds-component': 'off',
+        },
+    },
+    {
+        rules: {
+            'no-console': 'off',
+            'import/no-default-export': 'off', // Todo: shall be fixed
+            'no-restricted-syntax': 'off', // Todo: shall be fixed
+            '@typescript-eslint/no-restricted-imports': 'off',
+            '@typescript-eslint/no-shadow': 'off', // Todo: shall be fixed
+            'react/jsx-filename-extension': [
+                'error',
+                {
+                    extensions: ['.tsx', '.mdx'],
+                },
+            ],
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/webpack/**',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/connect-explorer/package.json b/packages/connect-explorer/package.json
index a2fabc6c895..a1f3f39f3cd 100644
--- a/packages/connect-explorer/package.json
+++ b/packages/connect-explorer/package.json
@@ -7,7 +7,6 @@
         "dev:explorer": "next -p 8088",
         "build": "next build && rm -rf build && mv out build",
         "build:webextension": "BUILD_TARGET=webextension yarn build && yarn g:rimraf build-webextension && TS_NODE_PROJECT=\"tsconfig.json\" yarn webpack --config ./webpack/webextension.webpack.config.ts && bash ./webpack/replace-next-filenames.sh",
-        "lint:js": "yarn g:eslint '**/*{.ts,.tsx}'",
         "lint:styles": "npx stylelint './src/**/*{.ts,.tsx}' --cache --config ../../.stylelintrc",
         "type-check": "yarn g:tsc --build tsconfig.json"
     },
@@ -18,6 +17,7 @@
         "@trezor/components": "workspace:^",
         "@trezor/connect": "workspace:^",
         "@trezor/connect-explorer-theme": "workspace:^",
+        "@trezor/connect-mobile": "workspace:^",
         "@trezor/connect-web": "workspace:^",
         "@trezor/connect-webextension": "workspace:^",
         "@trezor/protobuf": "workspace:^",
@@ -47,6 +47,7 @@
         "swr": "^2.2.5"
     },
     "devDependencies": {
+        "@trezor/eslint": "workspace:*",
         "@types/redux-logger": "^3.0.11",
         "babel-plugin-styled-components": "^2.1.4",
         "concurrently": "^8.2.2",
@@ -55,7 +56,7 @@
         "html-webpack-plugin": "^5.6.0",
         "rimraf": "^6.0.1",
         "tsx": "^4.16.3",
-        "webpack": "^5.94.0",
+        "webpack": "^5.96.1",
         "webpack-cli": "^5.1.4"
     }
 }
diff --git a/packages/connect-explorer/public/images/schema-connect-deeplink.svg b/packages/connect-explorer/public/images/schema-connect-deeplink.svg
new file mode 100644
index 00000000000..0425f91f571
--- /dev/null
+++ b/packages/connect-explorer/public/images/schema-connect-deeplink.svg
@@ -0,0 +1,37 @@
+<svg width="1294" height="497" viewBox="0 0 1294 497" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_7_2)">
+<rect x="0.5" y="0.5" width="1293" height="496" rx="23.5" stroke="#EEEEEE"/>
+<g clip-path="url(#clip1_7_2)">
+<rect x="95" y="85" width="290" height="228" rx="16" fill="#E4F1F6"/>
+<rect x="119" y="157" width="242" height="132" rx="8" fill="#C6E7DD"/>
+<path d="M211.76 217.18C210.944 217.18 210.218 217.078 209.582 216.874C208.958 216.658 208.424 216.364 207.98 215.992C207.536 215.62 207.2 215.182 206.972 214.678C206.744 214.174 206.63 213.628 206.63 213.04H208.97C208.97 213.316 209.036 213.574 209.168 213.814C209.3 214.054 209.486 214.264 209.726 214.444C209.966 214.624 210.254 214.768 210.59 214.876C210.938 214.972 211.328 215.02 211.76 215.02C212.66 215.02 213.302 214.864 213.686 214.552C214.082 214.24 214.28 213.856 214.28 213.4C214.28 213.22 214.244 213.046 214.172 212.878C214.112 212.71 214.004 212.56 213.848 212.428C213.692 212.284 213.482 212.158 213.218 212.05C212.954 211.942 212.618 211.852 212.21 211.78L210.05 211.42C208.958 211.24 208.16 210.85 207.656 210.25C207.152 209.65 206.9 208.9 206.9 208C206.9 207.484 207.002 206.998 207.206 206.542C207.422 206.074 207.728 205.672 208.124 205.336C208.52 204.988 209.006 204.718 209.582 204.526C210.17 204.322 210.836 204.22 211.58 204.22C212.384 204.22 213.092 204.328 213.704 204.544C214.316 204.748 214.82 205.036 215.216 205.408C215.624 205.78 215.93 206.218 216.134 206.722C216.338 207.226 216.44 207.772 216.44 208.36H214.1C214.1 207.82 213.884 207.358 213.452 206.974C213.02 206.578 212.396 206.38 211.58 206.38C210.764 206.38 210.17 206.536 209.798 206.848C209.426 207.16 209.24 207.544 209.24 208C209.24 208.36 209.354 208.66 209.582 208.9C209.822 209.14 210.278 209.32 210.95 209.44L212.93 209.8C214.202 210.028 215.132 210.424 215.72 210.988C216.32 211.552 216.62 212.356 216.62 213.4C216.62 213.94 216.518 214.444 216.314 214.912C216.11 215.368 215.804 215.764 215.396 216.1C215 216.436 214.496 216.7 213.884 216.892C213.272 217.084 212.564 217.18 211.76 217.18ZM218.776 204.4H223.366C224.218 204.4 225.016 204.562 225.76 204.886C226.504 205.198 227.152 205.636 227.704 206.2C228.256 206.764 228.688 207.43 229 208.198C229.324 208.966 229.486 209.8 229.486 210.7C229.486 211.6 229.324 212.434 229 213.202C228.688 213.97 228.256 214.636 227.704 215.2C227.152 215.764 226.504 216.208 225.76 216.532C225.016 216.844 224.218 217 223.366 217H218.776V204.4ZM223.366 214.75C223.906 214.75 224.404 214.654 224.86 214.462C225.328 214.27 225.73 214 226.066 213.652C226.402 213.292 226.666 212.866 226.858 212.374C227.05 211.87 227.146 211.312 227.146 210.7C227.146 210.088 227.05 209.536 226.858 209.044C226.666 208.54 226.402 208.114 226.066 207.766C225.73 207.406 225.328 207.13 224.86 206.938C224.404 206.746 223.906 206.65 223.366 206.65H221.116V214.75H223.366ZM231.643 204.4H233.983V210.07L238.303 204.4H241.183L236.413 210.61L241.543 217H238.663L233.983 211.15V217H231.643V204.4ZM250.191 204.4H253.611L258.111 217H255.501L254.547 214.3H249.255L248.301 217H245.691L250.191 204.4ZM253.791 212.14L252.081 207.1H251.721L250.011 212.14H253.791ZM259.469 204.4H265.139C265.727 204.4 266.261 204.502 266.741 204.706C267.233 204.898 267.653 205.18 268.001 205.552C268.349 205.912 268.619 206.356 268.811 206.884C269.003 207.4 269.099 207.982 269.099 208.63C269.099 209.278 269.003 209.866 268.811 210.394C268.619 210.91 268.349 211.354 268.001 211.726C267.653 212.086 267.233 212.368 266.741 212.572C266.261 212.764 265.727 212.86 265.139 212.86H261.809V217H259.469V204.4ZM265.049 210.61C265.553 210.61 265.961 210.442 266.273 210.106C266.597 209.758 266.759 209.266 266.759 208.63C266.759 207.994 266.597 207.508 266.273 207.172C265.961 206.824 265.553 206.65 265.049 206.65H261.809V210.61H265.049ZM271.176 204.4H273.516V217H271.176V204.4Z" fill="#171717"/>
+<path d="M151.44 243.6C150.459 243.6 149.563 243.44 148.752 243.12C147.952 242.811 147.264 242.379 146.688 241.824C146.112 241.269 145.664 240.613 145.344 239.856C145.035 239.088 144.88 238.256 144.88 237.36C144.88 236.421 145.045 235.563 145.376 234.784C145.707 233.995 146.165 233.317 146.752 232.752C147.349 232.187 148.053 231.749 148.864 231.44C149.675 231.12 150.56 230.96 151.52 230.96C152.523 230.96 153.435 231.12 154.256 231.44C155.077 231.76 155.781 232.197 156.368 232.752C156.965 233.296 157.424 233.947 157.744 234.704C158.075 235.451 158.24 236.256 158.24 237.12C158.24 237.739 158.171 238.277 158.032 238.736C157.904 239.184 157.712 239.557 157.456 239.856C157.211 240.144 156.907 240.363 156.544 240.512C156.192 240.651 155.797 240.72 155.36 240.72C155.019 240.72 154.731 240.672 154.496 240.576C154.272 240.469 154.085 240.357 153.936 240.24C153.765 240.101 153.627 239.941 153.52 239.76H153.44C153.28 239.941 153.088 240.101 152.864 240.24C152.672 240.357 152.437 240.469 152.16 240.576C151.883 240.672 151.563 240.72 151.2 240.72C150.741 240.72 150.315 240.64 149.92 240.48C149.536 240.32 149.2 240.096 148.912 239.808C148.624 239.509 148.4 239.163 148.24 238.768C148.08 238.363 148 237.92 148 237.44C148 236.96 148.08 236.523 148.24 236.128C148.4 235.723 148.624 235.376 148.912 235.088C149.2 234.789 149.536 234.56 149.92 234.4C150.315 234.24 150.741 234.16 151.2 234.16C151.509 234.16 151.781 234.203 152.016 234.288C152.261 234.363 152.464 234.443 152.624 234.528C152.816 234.635 152.981 234.752 153.12 234.88H153.2L153.36 234.24H154.56V238.48C154.56 238.757 154.629 238.976 154.768 239.136C154.917 239.285 155.115 239.36 155.36 239.36C155.765 239.36 156.107 239.189 156.384 238.848C156.661 238.496 156.8 237.92 156.8 237.12C156.8 236.437 156.672 235.803 156.416 235.216C156.16 234.629 155.797 234.123 155.328 233.696C154.869 233.259 154.315 232.923 153.664 232.688C153.024 232.443 152.309 232.32 151.52 232.32C150.784 232.32 150.096 232.448 149.456 232.704C148.827 232.96 148.277 233.312 147.808 233.76C147.349 234.208 146.987 234.741 146.72 235.36C146.453 235.979 146.32 236.645 146.32 237.36C146.32 238.064 146.448 238.715 146.704 239.312C146.96 239.899 147.312 240.411 147.76 240.848C148.219 241.285 148.763 241.627 149.392 241.872C150.021 242.117 150.704 242.24 151.44 242.24H154.72V243.6H151.44ZM151.28 239.44C151.803 239.44 152.24 239.259 152.592 238.896C152.944 238.533 153.12 238.048 153.12 237.44C153.12 236.832 152.944 236.347 152.592 235.984C152.24 235.621 151.803 235.44 151.28 235.44C150.757 235.44 150.32 235.621 149.968 235.984C149.616 236.347 149.44 236.832 149.44 237.44C149.44 238.048 149.616 238.533 149.968 238.896C150.32 239.259 150.757 239.44 151.28 239.44ZM162.393 242C161.828 242 161.39 241.851 161.081 241.552C160.782 241.253 160.633 240.843 160.633 240.32V235.52H159.353V234H160.633V231.76H162.233V234H164.073V235.52H162.233V240.08C162.233 240.4 162.393 240.56 162.713 240.56H164.073V242H162.393ZM165.837 234H167.197L167.357 234.72H167.437C167.501 234.645 167.57 234.565 167.645 234.48C167.72 234.395 167.81 234.315 167.917 234.24C168.034 234.165 168.173 234.107 168.333 234.064C168.504 234.021 168.712 234 168.957 234H170.397V235.44H169.117C167.997 235.44 167.437 235.995 167.437 237.104V242H165.837V234ZM174.89 242.16C174.314 242.16 173.781 242.059 173.29 241.856C172.799 241.653 172.373 241.371 172.01 241.008C171.658 240.645 171.381 240.208 171.178 239.696C170.986 239.184 170.89 238.619 170.89 238C170.89 237.381 170.986 236.816 171.178 236.304C171.381 235.792 171.658 235.355 172.01 234.992C172.373 234.629 172.799 234.347 173.29 234.144C173.781 233.941 174.314 233.84 174.89 233.84C175.434 233.84 175.935 233.941 176.394 234.144C176.863 234.336 177.269 234.608 177.61 234.96C177.962 235.312 178.234 235.728 178.426 236.208C178.629 236.688 178.73 237.205 178.73 237.76C178.73 237.877 178.725 237.984 178.714 238.08C178.703 238.176 178.693 238.261 178.682 238.336C178.671 238.421 178.661 238.496 178.65 238.56H172.49C172.575 239.243 172.837 239.787 173.274 240.192C173.711 240.597 174.25 240.8 174.89 240.8C175.125 240.8 175.343 240.768 175.546 240.704C175.759 240.64 175.946 240.555 176.106 240.448C176.277 240.341 176.421 240.224 176.538 240.096C176.655 239.957 176.746 239.819 176.81 239.68H178.49C178.394 239.936 178.25 240.213 178.058 240.512C177.866 240.8 177.621 241.067 177.322 241.312C177.023 241.557 176.671 241.76 176.266 241.92C175.871 242.08 175.413 242.16 174.89 242.16ZM177.21 237.36C177.125 236.72 176.874 236.203 176.458 235.808C176.053 235.403 175.53 235.2 174.89 235.2C174.207 235.2 173.663 235.403 173.258 235.808C172.863 236.203 172.607 236.72 172.49 237.36H177.21ZM179.699 240.56L183.859 235.52H179.779V234H185.939V235.44L181.779 240.48H186.019V242H179.699V240.56ZM190.984 242.16C190.408 242.16 189.874 242.059 189.384 241.856C188.893 241.653 188.466 241.371 188.104 241.008C187.752 240.645 187.474 240.208 187.272 239.696C187.08 239.184 186.984 238.619 186.984 238C186.984 237.381 187.08 236.816 187.272 236.304C187.474 235.792 187.752 235.355 188.104 234.992C188.466 234.629 188.893 234.347 189.384 234.144C189.874 233.941 190.408 233.84 190.984 233.84C191.56 233.84 192.093 233.941 192.584 234.144C193.074 234.347 193.496 234.629 193.848 234.992C194.21 235.355 194.488 235.792 194.68 236.304C194.882 236.816 194.984 237.381 194.984 238C194.984 238.619 194.882 239.184 194.68 239.696C194.488 240.208 194.21 240.645 193.848 241.008C193.496 241.371 193.074 241.653 192.584 241.856C192.093 242.059 191.56 242.16 190.984 242.16ZM190.984 240.72C191.325 240.72 191.64 240.656 191.928 240.528C192.226 240.4 192.482 240.219 192.696 239.984C192.909 239.749 193.074 239.467 193.192 239.136C193.32 238.795 193.384 238.416 193.384 238C193.384 237.584 193.32 237.211 193.192 236.88C193.074 236.539 192.909 236.251 192.696 236.016C192.482 235.781 192.226 235.6 191.928 235.472C191.64 235.344 191.325 235.28 190.984 235.28C190.642 235.28 190.322 235.344 190.024 235.472C189.736 235.6 189.485 235.781 189.272 236.016C189.058 236.251 188.888 236.539 188.76 236.88C188.642 237.211 188.584 237.584 188.584 238C188.584 238.416 188.642 238.795 188.76 239.136C188.888 239.467 189.058 239.749 189.272 239.984C189.485 240.219 189.736 240.4 190.024 240.528C190.322 240.656 190.642 240.72 190.984 240.72ZM196.665 234H198.025L198.185 234.72H198.265C198.329 234.645 198.398 234.565 198.473 234.48C198.548 234.395 198.638 234.315 198.745 234.24C198.862 234.165 199.001 234.107 199.161 234.064C199.332 234.021 199.54 234 199.785 234H201.225V235.44H199.945C198.825 235.44 198.265 235.995 198.265 237.104V242H196.665V234ZM205.791 230.32H207.391L202.991 245.2H201.391L205.791 230.32ZM212.031 242.16C211.455 242.16 210.921 242.059 210.431 241.856C209.94 241.653 209.513 241.371 209.151 241.008C208.799 240.645 208.521 240.208 208.319 239.696C208.127 239.184 208.031 238.619 208.031 238C208.031 237.381 208.127 236.816 208.319 236.304C208.521 235.792 208.799 235.355 209.151 234.992C209.513 234.629 209.94 234.347 210.431 234.144C210.921 233.941 211.455 233.84 212.031 233.84C212.628 233.84 213.145 233.941 213.583 234.144C214.02 234.336 214.383 234.576 214.671 234.864C214.969 235.152 215.199 235.467 215.359 235.808C215.529 236.139 215.647 236.443 215.711 236.72H214.111C214.047 236.539 213.956 236.363 213.839 236.192C213.732 236.021 213.593 235.867 213.423 235.728C213.263 235.589 213.065 235.483 212.831 235.408C212.596 235.323 212.329 235.28 212.031 235.28C211.689 235.28 211.369 235.344 211.071 235.472C210.783 235.6 210.532 235.781 210.319 236.016C210.105 236.251 209.935 236.539 209.807 236.88C209.689 237.211 209.631 237.584 209.631 238C209.631 238.416 209.689 238.795 209.807 239.136C209.935 239.467 210.105 239.749 210.319 239.984C210.532 240.219 210.783 240.4 211.071 240.528C211.369 240.656 211.689 240.72 212.031 240.72C212.351 240.72 212.628 240.672 212.863 240.576C213.108 240.48 213.316 240.357 213.487 240.208C213.657 240.048 213.791 239.883 213.887 239.712C213.993 239.531 214.068 239.36 214.111 239.2H215.711C215.647 239.499 215.529 239.824 215.359 240.176C215.199 240.517 214.969 240.837 214.671 241.136C214.383 241.424 214.02 241.669 213.583 241.872C213.145 242.064 212.628 242.16 212.031 242.16ZM220.906 242.16C220.33 242.16 219.796 242.059 219.306 241.856C218.815 241.653 218.388 241.371 218.026 241.008C217.674 240.645 217.396 240.208 217.194 239.696C217.002 239.184 216.906 238.619 216.906 238C216.906 237.381 217.002 236.816 217.194 236.304C217.396 235.792 217.674 235.355 218.026 234.992C218.388 234.629 218.815 234.347 219.306 234.144C219.796 233.941 220.33 233.84 220.906 233.84C221.482 233.84 222.015 233.941 222.506 234.144C222.996 234.347 223.418 234.629 223.77 234.992C224.132 235.355 224.41 235.792 224.602 236.304C224.804 236.816 224.906 237.381 224.906 238C224.906 238.619 224.804 239.184 224.602 239.696C224.41 240.208 224.132 240.645 223.77 241.008C223.418 241.371 222.996 241.653 222.506 241.856C222.015 242.059 221.482 242.16 220.906 242.16ZM220.906 240.72C221.247 240.72 221.562 240.656 221.85 240.528C222.148 240.4 222.404 240.219 222.618 239.984C222.831 239.749 222.996 239.467 223.114 239.136C223.242 238.795 223.306 238.416 223.306 238C223.306 237.584 223.242 237.211 223.114 236.88C222.996 236.539 222.831 236.251 222.618 236.016C222.404 235.781 222.148 235.6 221.85 235.472C221.562 235.344 221.247 235.28 220.906 235.28C220.564 235.28 220.244 235.344 219.946 235.472C219.658 235.6 219.407 235.781 219.194 236.016C218.98 236.251 218.81 236.539 218.682 236.88C218.564 237.211 218.506 237.584 218.506 238C218.506 238.416 218.564 238.795 218.682 239.136C218.81 239.467 218.98 239.749 219.194 239.984C219.407 240.219 219.658 240.4 219.946 240.528C220.244 240.656 220.564 240.72 220.906 240.72ZM226.587 234H228.027L228.187 234.8H228.267C228.438 234.619 228.635 234.459 228.859 234.32C229.051 234.203 229.291 234.096 229.579 234C229.867 233.893 230.203 233.84 230.587 233.84C231.067 233.84 231.504 233.92 231.899 234.08C232.294 234.229 232.63 234.448 232.907 234.736C233.184 235.024 233.398 235.376 233.547 235.792C233.707 236.208 233.787 236.677 233.787 237.2V242H232.187V237.2C232.187 236.944 232.139 236.699 232.043 236.464C231.947 236.229 231.814 236.027 231.643 235.856C231.472 235.675 231.27 235.536 231.035 235.44C230.8 235.333 230.544 235.28 230.267 235.28C229.968 235.28 229.691 235.333 229.435 235.44C229.179 235.536 228.96 235.675 228.779 235.856C228.598 236.027 228.454 236.229 228.347 236.464C228.24 236.699 228.187 236.944 228.187 237.2V242H226.587V234ZM235.79 234H237.23L237.39 234.8H237.47C237.641 234.619 237.838 234.459 238.062 234.32C238.254 234.203 238.494 234.096 238.782 234C239.07 233.893 239.406 233.84 239.79 233.84C240.27 233.84 240.707 233.92 241.102 234.08C241.497 234.229 241.833 234.448 242.11 234.736C242.387 235.024 242.601 235.376 242.75 235.792C242.91 236.208 242.99 236.677 242.99 237.2V242H241.39V237.2C241.39 236.944 241.342 236.699 241.246 236.464C241.15 236.229 241.017 236.027 240.846 235.856C240.675 235.675 240.473 235.536 240.238 235.44C240.003 235.333 239.747 235.28 239.47 235.28C239.171 235.28 238.894 235.333 238.638 235.44C238.382 235.536 238.163 235.675 237.982 235.856C237.801 236.027 237.657 236.229 237.55 236.464C237.443 236.699 237.39 236.944 237.39 237.2V242H235.79V234ZM248.593 242.16C248.017 242.16 247.484 242.059 246.993 241.856C246.502 241.653 246.076 241.371 245.713 241.008C245.361 240.645 245.084 240.208 244.881 239.696C244.689 239.184 244.593 238.619 244.593 238C244.593 237.381 244.689 236.816 244.881 236.304C245.084 235.792 245.361 235.355 245.713 234.992C246.076 234.629 246.502 234.347 246.993 234.144C247.484 233.941 248.017 233.84 248.593 233.84C249.137 233.84 249.638 233.941 250.097 234.144C250.566 234.336 250.972 234.608 251.313 234.96C251.665 235.312 251.937 235.728 252.129 236.208C252.332 236.688 252.433 237.205 252.433 237.76C252.433 237.877 252.428 237.984 252.417 238.08C252.406 238.176 252.396 238.261 252.385 238.336C252.374 238.421 252.364 238.496 252.353 238.56H246.193C246.278 239.243 246.54 239.787 246.977 240.192C247.414 240.597 247.953 240.8 248.593 240.8C248.828 240.8 249.046 240.768 249.249 240.704C249.462 240.64 249.649 240.555 249.809 240.448C249.98 240.341 250.124 240.224 250.241 240.096C250.358 239.957 250.449 239.819 250.513 239.68H252.193C252.097 239.936 251.953 240.213 251.761 240.512C251.569 240.8 251.324 241.067 251.025 241.312C250.726 241.557 250.374 241.76 249.969 241.92C249.574 242.08 249.116 242.16 248.593 242.16ZM250.913 237.36C250.828 236.72 250.577 236.203 250.161 235.808C249.756 235.403 249.233 235.2 248.593 235.2C247.91 235.2 247.366 235.403 246.961 235.808C246.566 236.203 246.31 236.72 246.193 237.36H250.913ZM257.718 242.16C257.142 242.16 256.609 242.059 256.118 241.856C255.627 241.653 255.201 241.371 254.838 241.008C254.486 240.645 254.209 240.208 254.006 239.696C253.814 239.184 253.718 238.619 253.718 238C253.718 237.381 253.814 236.816 254.006 236.304C254.209 235.792 254.486 235.355 254.838 234.992C255.201 234.629 255.627 234.347 256.118 234.144C256.609 233.941 257.142 233.84 257.718 233.84C258.315 233.84 258.833 233.941 259.27 234.144C259.707 234.336 260.07 234.576 260.358 234.864C260.657 235.152 260.886 235.467 261.046 235.808C261.217 236.139 261.334 236.443 261.398 236.72H259.798C259.734 236.539 259.643 236.363 259.526 236.192C259.419 236.021 259.281 235.867 259.11 235.728C258.95 235.589 258.753 235.483 258.518 235.408C258.283 235.323 258.017 235.28 257.718 235.28C257.377 235.28 257.057 235.344 256.758 235.472C256.47 235.6 256.219 235.781 256.006 236.016C255.793 236.251 255.622 236.539 255.494 236.88C255.377 237.211 255.318 237.584 255.318 238C255.318 238.416 255.377 238.795 255.494 239.136C255.622 239.467 255.793 239.749 256.006 239.984C256.219 240.219 256.47 240.4 256.758 240.528C257.057 240.656 257.377 240.72 257.718 240.72C258.038 240.72 258.315 240.672 258.55 240.576C258.795 240.48 259.003 240.357 259.174 240.208C259.345 240.048 259.478 239.883 259.574 239.712C259.681 239.531 259.755 239.36 259.798 239.2H261.398C261.334 239.499 261.217 239.824 261.046 240.176C260.886 240.517 260.657 240.837 260.358 241.136C260.07 241.424 259.707 241.669 259.27 241.872C258.833 242.064 258.315 242.16 257.718 242.16ZM265.393 242C264.828 242 264.39 241.851 264.081 241.552C263.782 241.253 263.633 240.843 263.633 240.32V235.52H262.353V234H263.633V231.76H265.233V234H267.073V235.52H265.233V240.08C265.233 240.4 265.393 240.56 265.713 240.56H267.073V242H265.393ZM268.517 236.72H273.797V238.16H268.517V236.72ZM278.836 242.16C278.313 242.16 277.828 242.064 277.38 241.872C276.932 241.68 276.542 241.403 276.212 241.04C275.881 240.677 275.62 240.24 275.428 239.728C275.246 239.216 275.156 238.64 275.156 238C275.156 237.36 275.246 236.784 275.428 236.272C275.62 235.76 275.881 235.323 276.212 234.96C276.542 234.597 276.932 234.32 277.38 234.128C277.828 233.936 278.313 233.84 278.836 233.84C279.22 233.84 279.55 233.883 279.828 233.968C280.116 234.053 280.356 234.16 280.548 234.288C280.75 234.405 280.91 234.528 281.028 234.656C281.156 234.784 281.252 234.885 281.316 234.96H281.396V230.8H282.996V242H281.556L281.396 241.04H281.316C281.252 241.125 281.156 241.232 281.028 241.36C280.91 241.477 280.75 241.6 280.548 241.728C280.356 241.845 280.116 241.947 279.828 242.032C279.55 242.117 279.22 242.16 278.836 242.16ZM279.076 240.72C279.396 240.72 279.694 240.656 279.972 240.528C280.26 240.4 280.505 240.219 280.708 239.984C280.921 239.749 281.086 239.467 281.204 239.136C281.332 238.795 281.396 238.416 281.396 238C281.396 237.584 281.332 237.211 281.204 236.88C281.086 236.539 280.921 236.251 280.708 236.016C280.505 235.781 280.26 235.6 279.972 235.472C279.694 235.344 279.396 235.28 279.076 235.28C278.756 235.28 278.452 235.344 278.164 235.472C277.886 235.6 277.641 235.781 277.428 236.016C277.225 236.251 277.06 236.539 276.932 236.88C276.814 237.211 276.756 237.584 276.756 238C276.756 238.416 276.814 238.795 276.932 239.136C277.06 239.467 277.225 239.749 277.428 239.984C277.641 240.219 277.886 240.4 278.164 240.528C278.452 240.656 278.756 240.72 279.076 240.72ZM288.749 242.16C288.173 242.16 287.64 242.059 287.149 241.856C286.659 241.653 286.232 241.371 285.869 241.008C285.517 240.645 285.24 240.208 285.037 239.696C284.845 239.184 284.749 238.619 284.749 238C284.749 237.381 284.845 236.816 285.037 236.304C285.24 235.792 285.517 235.355 285.869 234.992C286.232 234.629 286.659 234.347 287.149 234.144C287.64 233.941 288.173 233.84 288.749 233.84C289.293 233.84 289.795 233.941 290.253 234.144C290.723 234.336 291.128 234.608 291.469 234.96C291.821 235.312 292.093 235.728 292.285 236.208C292.488 236.688 292.589 237.205 292.589 237.76C292.589 237.877 292.584 237.984 292.573 238.08C292.563 238.176 292.552 238.261 292.541 238.336C292.531 238.421 292.52 238.496 292.509 238.56H286.349C286.435 239.243 286.696 239.787 287.133 240.192C287.571 240.597 288.109 240.8 288.749 240.8C288.984 240.8 289.203 240.768 289.405 240.704C289.619 240.64 289.805 240.555 289.965 240.448C290.136 240.341 290.28 240.224 290.397 240.096C290.515 239.957 290.605 239.819 290.669 239.68H292.349C292.253 239.936 292.109 240.213 291.917 240.512C291.725 240.8 291.48 241.067 291.181 241.312C290.883 241.557 290.531 241.76 290.125 241.92C289.731 242.08 289.272 242.16 288.749 242.16ZM291.069 237.36C290.984 236.72 290.733 236.203 290.317 235.808C289.912 235.403 289.389 235.2 288.749 235.2C288.067 235.2 287.523 235.403 287.117 235.808C286.723 236.203 286.467 236.72 286.349 237.36H291.069ZM297.874 242.16C297.298 242.16 296.765 242.059 296.274 241.856C295.784 241.653 295.357 241.371 294.994 241.008C294.642 240.645 294.365 240.208 294.162 239.696C293.97 239.184 293.874 238.619 293.874 238C293.874 237.381 293.97 236.816 294.162 236.304C294.365 235.792 294.642 235.355 294.994 234.992C295.357 234.629 295.784 234.347 296.274 234.144C296.765 233.941 297.298 233.84 297.874 233.84C298.418 233.84 298.92 233.941 299.378 234.144C299.848 234.336 300.253 234.608 300.594 234.96C300.946 235.312 301.218 235.728 301.41 236.208C301.613 236.688 301.714 237.205 301.714 237.76C301.714 237.877 301.709 237.984 301.698 238.08C301.688 238.176 301.677 238.261 301.666 238.336C301.656 238.421 301.645 238.496 301.634 238.56H295.474C295.56 239.243 295.821 239.787 296.258 240.192C296.696 240.597 297.234 240.8 297.874 240.8C298.109 240.8 298.328 240.768 298.53 240.704C298.744 240.64 298.93 240.555 299.09 240.448C299.261 240.341 299.405 240.224 299.522 240.096C299.64 239.957 299.73 239.819 299.794 239.68H301.474C301.378 239.936 301.234 240.213 301.042 240.512C300.85 240.8 300.605 241.067 300.306 241.312C300.008 241.557 299.656 241.76 299.25 241.92C298.856 242.08 298.397 242.16 297.874 242.16ZM300.194 237.36C300.109 236.72 299.858 236.203 299.442 235.808C299.037 235.403 298.514 235.2 297.874 235.2C297.192 235.2 296.648 235.403 296.242 235.808C295.848 236.203 295.592 236.72 295.474 237.36H300.194ZM303.399 234H304.839L304.999 234.96H305.079C305.143 234.885 305.234 234.784 305.351 234.656C305.479 234.528 305.639 234.405 305.831 234.288C306.034 234.16 306.274 234.053 306.551 233.968C306.839 233.883 307.175 233.84 307.559 233.84C308.082 233.84 308.567 233.936 309.015 234.128C309.463 234.32 309.853 234.597 310.183 234.96C310.514 235.323 310.77 235.76 310.951 236.272C311.143 236.784 311.239 237.36 311.239 238C311.239 238.64 311.143 239.216 310.951 239.728C310.77 240.24 310.514 240.677 310.183 241.04C309.853 241.403 309.463 241.68 309.015 241.872C308.567 242.064 308.082 242.16 307.559 242.16C307.175 242.16 306.839 242.117 306.551 242.032C306.274 241.947 306.034 241.845 305.831 241.728C305.639 241.6 305.479 241.477 305.351 241.36C305.234 241.232 305.143 241.125 305.079 241.04H304.999V245.2H303.399V234ZM307.319 240.72C307.639 240.72 307.938 240.656 308.215 240.528C308.503 240.4 308.749 240.219 308.951 239.984C309.165 239.749 309.33 239.467 309.447 239.136C309.575 238.795 309.639 238.416 309.639 238C309.639 237.584 309.575 237.211 309.447 236.88C309.33 236.539 309.165 236.251 308.951 236.016C308.749 235.781 308.503 235.6 308.215 235.472C307.938 235.344 307.639 235.28 307.319 235.28C306.999 235.28 306.695 235.344 306.407 235.472C306.13 235.6 305.885 235.781 305.671 236.016C305.469 236.251 305.303 236.539 305.175 236.88C305.058 237.211 304.999 237.584 304.999 238C304.999 238.416 305.058 238.795 305.175 239.136C305.303 239.467 305.469 239.749 305.671 239.984C305.885 240.219 306.13 240.4 306.407 240.528C306.695 240.656 306.999 240.72 307.319 240.72ZM312.995 230.8H314.595V242H312.995V230.8ZM316.759 234H318.359V242H316.759V234ZM316.679 230.8H318.439V232.48H316.679V230.8ZM320.446 234H321.886L322.046 234.8H322.126C322.297 234.619 322.494 234.459 322.718 234.32C322.91 234.203 323.15 234.096 323.438 234C323.726 233.893 324.062 233.84 324.446 233.84C324.926 233.84 325.364 233.92 325.758 234.08C326.153 234.229 326.489 234.448 326.766 234.736C327.044 235.024 327.257 235.376 327.406 235.792C327.566 236.208 327.646 236.677 327.646 237.2V242H326.046V237.2C326.046 236.944 325.998 236.699 325.902 236.464C325.806 236.229 325.673 236.027 325.502 235.856C325.332 235.675 325.129 235.536 324.894 235.44C324.66 235.333 324.404 235.28 324.126 235.28C323.828 235.28 323.55 235.333 323.294 235.44C323.038 235.536 322.82 235.675 322.638 235.856C322.457 236.027 322.313 236.229 322.206 236.464C322.1 236.699 322.046 236.944 322.046 237.2V242H320.446V234ZM329.729 230.8H331.329V237.68L334.689 234H336.609L333.009 237.92L336.769 242H334.849L331.329 238.16V242H329.729V230.8Z" fill="#616161"/>
+<path d="M169.56 127.16C168.984 127.16 168.456 127.075 167.976 126.904C167.507 126.723 167.101 126.483 166.76 126.184C166.429 125.875 166.173 125.517 165.992 125.112C165.811 124.696 165.72 124.259 165.72 123.8H167.4C167.4 124.024 167.453 124.243 167.56 124.456C167.667 124.659 167.811 124.845 167.992 125.016C168.184 125.176 168.413 125.309 168.68 125.416C168.947 125.512 169.24 125.56 169.56 125.56C170.243 125.56 170.76 125.4 171.112 125.08C171.464 124.749 171.64 124.323 171.64 123.8C171.64 123.32 171.448 122.909 171.064 122.568C170.691 122.216 170.163 122.04 169.48 122.04H168.76V120.52H169.48C170.12 120.52 170.611 120.36 170.952 120.04C171.304 119.72 171.48 119.32 171.48 118.84C171.48 118.392 171.309 118.013 170.968 117.704C170.637 117.395 170.168 117.24 169.56 117.24C168.952 117.24 168.467 117.395 168.104 117.704C167.741 118.013 167.56 118.392 167.56 118.84H165.88C165.88 118.403 165.965 117.992 166.136 117.608C166.307 117.213 166.552 116.872 166.872 116.584C167.192 116.296 167.576 116.067 168.024 115.896C168.483 115.725 168.995 115.64 169.56 115.64C170.104 115.64 170.595 115.725 171.032 115.896C171.48 116.067 171.859 116.296 172.168 116.584C172.488 116.872 172.733 117.213 172.904 117.608C173.075 117.992 173.16 118.403 173.16 118.84C173.16 119.288 173.075 119.661 172.904 119.96C172.744 120.259 172.563 120.504 172.36 120.696C172.125 120.92 171.859 121.101 171.56 121.24V121.32C171.88 121.459 172.173 121.645 172.44 121.88C172.653 122.083 172.851 122.349 173.032 122.68C173.224 123 173.32 123.4 173.32 123.88C173.32 124.339 173.229 124.771 173.048 125.176C172.867 125.571 172.611 125.917 172.28 126.216C171.949 126.504 171.549 126.733 171.08 126.904C170.621 127.075 170.115 127.16 169.56 127.16ZM175.165 119H176.525L176.685 119.72H176.765C176.829 119.645 176.898 119.565 176.973 119.48C177.048 119.395 177.138 119.315 177.245 119.24C177.362 119.165 177.501 119.107 177.661 119.064C177.832 119.021 178.04 119 178.285 119H179.725V120.44H178.445C177.325 120.44 176.765 120.995 176.765 122.104V127H175.165V119ZM183.898 127.16C183.375 127.16 182.89 127.064 182.442 126.872C181.994 126.68 181.605 126.403 181.274 126.04C180.943 125.677 180.682 125.24 180.49 124.728C180.309 124.216 180.218 123.64 180.218 123C180.218 122.36 180.309 121.784 180.49 121.272C180.682 120.76 180.943 120.323 181.274 119.96C181.605 119.597 181.994 119.32 182.442 119.128C182.89 118.936 183.375 118.84 183.898 118.84C184.282 118.84 184.613 118.883 184.89 118.968C185.178 119.053 185.418 119.16 185.61 119.288C185.813 119.405 185.973 119.528 186.09 119.656C186.218 119.784 186.314 119.885 186.378 119.96H186.458V115.8H188.058V127H186.618L186.458 126.04H186.378C186.314 126.125 186.218 126.232 186.09 126.36C185.973 126.477 185.813 126.6 185.61 126.728C185.418 126.845 185.178 126.947 184.89 127.032C184.613 127.117 184.282 127.16 183.898 127.16ZM184.138 125.72C184.458 125.72 184.757 125.656 185.034 125.528C185.322 125.4 185.567 125.219 185.77 124.984C185.983 124.749 186.149 124.467 186.266 124.136C186.394 123.795 186.458 123.416 186.458 123C186.458 122.584 186.394 122.211 186.266 121.88C186.149 121.539 185.983 121.251 185.77 121.016C185.567 120.781 185.322 120.6 185.034 120.472C184.757 120.344 184.458 120.28 184.138 120.28C183.818 120.28 183.514 120.344 183.226 120.472C182.949 120.6 182.703 120.781 182.49 121.016C182.287 121.251 182.122 121.539 181.994 121.88C181.877 122.211 181.818 122.584 181.818 123C181.818 123.416 181.877 123.795 181.994 124.136C182.122 124.467 182.287 124.749 182.49 124.984C182.703 125.219 182.949 125.4 183.226 125.528C183.514 125.656 183.818 125.72 184.138 125.72ZM193.978 119H195.418L195.578 119.96H195.658C195.722 119.885 195.812 119.784 195.93 119.656C196.058 119.528 196.218 119.405 196.41 119.288C196.612 119.16 196.852 119.053 197.13 118.968C197.418 118.883 197.754 118.84 198.138 118.84C198.66 118.84 199.146 118.936 199.594 119.128C200.042 119.32 200.431 119.597 200.762 119.96C201.092 120.323 201.348 120.76 201.53 121.272C201.722 121.784 201.818 122.36 201.818 123C201.818 123.64 201.722 124.216 201.53 124.728C201.348 125.24 201.092 125.677 200.762 126.04C200.431 126.403 200.042 126.68 199.594 126.872C199.146 127.064 198.66 127.16 198.138 127.16C197.754 127.16 197.418 127.117 197.13 127.032C196.852 126.947 196.612 126.845 196.41 126.728C196.218 126.6 196.058 126.477 195.93 126.36C195.812 126.232 195.722 126.125 195.658 126.04H195.578V130.2H193.978V119ZM197.898 125.72C198.218 125.72 198.516 125.656 198.794 125.528C199.082 125.4 199.327 125.219 199.53 124.984C199.743 124.749 199.908 124.467 200.026 124.136C200.154 123.795 200.218 123.416 200.218 123C200.218 122.584 200.154 122.211 200.026 121.88C199.908 121.539 199.743 121.251 199.53 121.016C199.327 120.781 199.082 120.6 198.794 120.472C198.516 120.344 198.218 120.28 197.898 120.28C197.578 120.28 197.274 120.344 196.986 120.472C196.708 120.6 196.463 120.781 196.25 121.016C196.047 121.251 195.882 121.539 195.754 121.88C195.636 122.211 195.578 122.584 195.578 123C195.578 123.416 195.636 123.795 195.754 124.136C195.882 124.467 196.047 124.749 196.25 124.984C196.463 125.219 196.708 125.4 196.986 125.528C197.274 125.656 197.578 125.72 197.898 125.72ZM206.053 127.16C205.616 127.16 205.216 127.101 204.853 126.984C204.501 126.856 204.197 126.685 203.941 126.472C203.696 126.248 203.504 125.987 203.365 125.688C203.237 125.379 203.173 125.043 203.173 124.68C203.173 123.88 203.44 123.24 203.973 122.76C204.506 122.28 205.333 122.04 206.453 122.04H208.453V121.88C208.453 121.357 208.304 120.947 208.005 120.648C207.706 120.349 207.296 120.2 206.773 120.2C206.496 120.2 206.256 120.237 206.053 120.312C205.85 120.376 205.68 120.467 205.541 120.584C205.402 120.691 205.296 120.813 205.221 120.952C205.157 121.08 205.114 121.203 205.093 121.32H203.493C203.514 120.979 203.6 120.659 203.749 120.36C203.909 120.061 204.128 119.8 204.405 119.576C204.693 119.352 205.034 119.176 205.429 119.048C205.824 118.909 206.272 118.84 206.773 118.84C207.818 118.84 208.624 119.117 209.189 119.672C209.765 120.216 210.053 120.952 210.053 121.88V127H208.693L208.533 126.12H208.453C208.293 126.323 208.101 126.499 207.877 126.648C207.685 126.776 207.434 126.893 207.125 127C206.826 127.107 206.469 127.16 206.053 127.16ZM206.213 125.8C206.938 125.8 207.493 125.613 207.877 125.24C208.261 124.856 208.453 124.323 208.453 123.64V123.32H206.533C205.925 123.32 205.477 123.443 205.189 123.688C204.912 123.933 204.773 124.237 204.773 124.6C204.773 124.963 204.89 125.256 205.125 125.48C205.37 125.693 205.733 125.8 206.213 125.8ZM212.056 119H213.416L213.576 119.72H213.656C213.72 119.645 213.789 119.565 213.864 119.48C213.938 119.395 214.029 119.315 214.136 119.24C214.253 119.165 214.392 119.107 214.552 119.064C214.722 119.021 214.93 119 215.176 119H216.616V120.44H215.336C214.216 120.44 213.656 120.995 213.656 122.104V127H212.056V119ZM220.221 127C219.656 127 219.219 126.851 218.909 126.552C218.611 126.253 218.461 125.843 218.461 125.32V120.52H217.181V119H218.461V116.76H220.061V119H221.901V120.52H220.061V125.08C220.061 125.4 220.221 125.56 220.541 125.56H221.901V127H220.221ZM223.585 128.76H225.185C225.345 128.76 225.468 128.701 225.553 128.584C225.649 128.467 225.708 128.365 225.729 128.28L225.985 127.56L222.705 119H224.385L226.705 125.08H227.025L229.105 119H230.785L227.265 128.84C227.105 129.277 226.881 129.613 226.593 129.848C226.305 130.083 225.862 130.2 225.265 130.2H223.585V128.76ZM237.741 127.16C237.303 127.16 236.903 127.101 236.541 126.984C236.189 126.856 235.885 126.685 235.629 126.472C235.383 126.248 235.191 125.987 235.053 125.688C234.925 125.379 234.861 125.043 234.861 124.68C234.861 123.88 235.127 123.24 235.661 122.76C236.194 122.28 237.021 122.04 238.141 122.04H240.141V121.88C240.141 121.357 239.991 120.947 239.693 120.648C239.394 120.349 238.983 120.2 238.461 120.2C238.183 120.2 237.943 120.237 237.741 120.312C237.538 120.376 237.367 120.467 237.229 120.584C237.09 120.691 236.983 120.813 236.909 120.952C236.845 121.08 236.802 121.203 236.781 121.32H235.181C235.202 120.979 235.287 120.659 235.437 120.36C235.597 120.061 235.815 119.8 236.093 119.576C236.381 119.352 236.722 119.176 237.117 119.048C237.511 118.909 237.959 118.84 238.461 118.84C239.506 118.84 240.311 119.117 240.877 119.672C241.453 120.216 241.741 120.952 241.741 121.88V127H240.381L240.221 126.12H240.141C239.981 126.323 239.789 126.499 239.565 126.648C239.373 126.776 239.122 126.893 238.813 127C238.514 127.107 238.157 127.16 237.741 127.16ZM237.901 125.8C238.626 125.8 239.181 125.613 239.565 125.24C239.949 124.856 240.141 124.323 240.141 123.64V123.32H238.221C237.613 123.32 237.165 123.443 236.877 123.688C236.599 123.933 236.461 124.237 236.461 124.6C236.461 124.963 236.578 125.256 236.813 125.48C237.058 125.693 237.421 125.8 237.901 125.8ZM243.743 119H245.183L245.343 119.96H245.423C245.487 119.885 245.578 119.784 245.695 119.656C245.823 119.528 245.983 119.405 246.175 119.288C246.378 119.16 246.618 119.053 246.895 118.968C247.183 118.883 247.519 118.84 247.903 118.84C248.426 118.84 248.911 118.936 249.359 119.128C249.807 119.32 250.196 119.597 250.527 119.96C250.858 120.323 251.114 120.76 251.295 121.272C251.487 121.784 251.583 122.36 251.583 123C251.583 123.64 251.487 124.216 251.295 124.728C251.114 125.24 250.858 125.677 250.527 126.04C250.196 126.403 249.807 126.68 249.359 126.872C248.911 127.064 248.426 127.16 247.903 127.16C247.519 127.16 247.183 127.117 246.895 127.032C246.618 126.947 246.378 126.845 246.175 126.728C245.983 126.6 245.823 126.477 245.695 126.36C245.578 126.232 245.487 126.125 245.423 126.04H245.343V130.2H243.743V119ZM247.663 125.72C247.983 125.72 248.282 125.656 248.559 125.528C248.847 125.4 249.092 125.219 249.295 124.984C249.508 124.749 249.674 124.467 249.791 124.136C249.919 123.795 249.983 123.416 249.983 123C249.983 122.584 249.919 122.211 249.791 121.88C249.674 121.539 249.508 121.251 249.295 121.016C249.092 120.781 248.847 120.6 248.559 120.472C248.282 120.344 247.983 120.28 247.663 120.28C247.343 120.28 247.039 120.344 246.751 120.472C246.474 120.6 246.228 120.781 246.015 121.016C245.812 121.251 245.647 121.539 245.519 121.88C245.402 122.211 245.343 122.584 245.343 123C245.343 123.416 245.402 123.795 245.519 124.136C245.647 124.467 245.812 124.749 246.015 124.984C246.228 125.219 246.474 125.4 246.751 125.528C247.039 125.656 247.343 125.72 247.663 125.72ZM253.259 119H254.699L254.859 119.96H254.939C255.003 119.885 255.093 119.784 255.211 119.656C255.339 119.528 255.499 119.405 255.691 119.288C255.893 119.16 256.133 119.053 256.411 118.968C256.699 118.883 257.035 118.84 257.419 118.84C257.941 118.84 258.427 118.936 258.875 119.128C259.323 119.32 259.712 119.597 260.043 119.96C260.373 120.323 260.629 120.76 260.811 121.272C261.003 121.784 261.099 122.36 261.099 123C261.099 123.64 261.003 124.216 260.811 124.728C260.629 125.24 260.373 125.677 260.043 126.04C259.712 126.403 259.323 126.68 258.875 126.872C258.427 127.064 257.941 127.16 257.419 127.16C257.035 127.16 256.699 127.117 256.411 127.032C256.133 126.947 255.893 126.845 255.691 126.728C255.499 126.6 255.339 126.477 255.211 126.36C255.093 126.232 255.003 126.125 254.939 126.04H254.859V130.2H253.259V119ZM257.179 125.72C257.499 125.72 257.797 125.656 258.075 125.528C258.363 125.4 258.608 125.219 258.811 124.984C259.024 124.749 259.189 124.467 259.307 124.136C259.435 123.795 259.499 123.416 259.499 123C259.499 122.584 259.435 122.211 259.307 121.88C259.189 121.539 259.024 121.251 258.811 121.016C258.608 120.781 258.363 120.6 258.075 120.472C257.797 120.344 257.499 120.28 257.179 120.28C256.859 120.28 256.555 120.344 256.267 120.472C255.989 120.6 255.744 120.781 255.531 121.016C255.328 121.251 255.163 121.539 255.035 121.88C254.917 122.211 254.859 122.584 254.859 123C254.859 123.416 254.917 123.795 255.035 124.136C255.163 124.467 255.328 124.749 255.531 124.984C255.744 125.219 255.989 125.4 256.267 125.528C256.555 125.656 256.859 125.72 257.179 125.72ZM262.854 115.8H264.454V127H262.854V115.8ZM266.618 119H268.218V127H266.618V119ZM266.538 115.8H268.298V117.48H266.538V115.8ZM273.906 127.16C273.33 127.16 272.796 127.059 272.306 126.856C271.815 126.653 271.388 126.371 271.026 126.008C270.674 125.645 270.396 125.208 270.194 124.696C270.002 124.184 269.906 123.619 269.906 123C269.906 122.381 270.002 121.816 270.194 121.304C270.396 120.792 270.674 120.355 271.026 119.992C271.388 119.629 271.815 119.347 272.306 119.144C272.796 118.941 273.33 118.84 273.906 118.84C274.503 118.84 275.02 118.941 275.458 119.144C275.895 119.336 276.258 119.576 276.546 119.864C276.844 120.152 277.074 120.467 277.234 120.808C277.404 121.139 277.522 121.443 277.586 121.72H275.986C275.922 121.539 275.831 121.363 275.714 121.192C275.607 121.021 275.468 120.867 275.298 120.728C275.138 120.589 274.94 120.483 274.706 120.408C274.471 120.323 274.204 120.28 273.906 120.28C273.564 120.28 273.244 120.344 272.946 120.472C272.658 120.6 272.407 120.781 272.194 121.016C271.98 121.251 271.81 121.539 271.682 121.88C271.564 122.211 271.506 122.584 271.506 123C271.506 123.416 271.564 123.795 271.682 124.136C271.81 124.467 271.98 124.749 272.194 124.984C272.407 125.219 272.658 125.4 272.946 125.528C273.244 125.656 273.564 125.72 273.906 125.72C274.226 125.72 274.503 125.672 274.738 125.576C274.983 125.48 275.191 125.357 275.362 125.208C275.532 125.048 275.666 124.883 275.762 124.712C275.868 124.531 275.943 124.36 275.986 124.2H277.586C277.522 124.499 277.404 124.824 277.234 125.176C277.074 125.517 276.844 125.837 276.546 126.136C276.258 126.424 275.895 126.669 275.458 126.872C275.02 127.064 274.503 127.16 273.906 127.16ZM281.741 127.16C281.303 127.16 280.903 127.101 280.541 126.984C280.189 126.856 279.885 126.685 279.629 126.472C279.383 126.248 279.191 125.987 279.053 125.688C278.925 125.379 278.861 125.043 278.861 124.68C278.861 123.88 279.127 123.24 279.661 122.76C280.194 122.28 281.021 122.04 282.141 122.04H284.141V121.88C284.141 121.357 283.991 120.947 283.693 120.648C283.394 120.349 282.983 120.2 282.461 120.2C282.183 120.2 281.943 120.237 281.741 120.312C281.538 120.376 281.367 120.467 281.229 120.584C281.09 120.691 280.983 120.813 280.909 120.952C280.845 121.08 280.802 121.203 280.781 121.32H279.181C279.202 120.979 279.287 120.659 279.437 120.36C279.597 120.061 279.815 119.8 280.093 119.576C280.381 119.352 280.722 119.176 281.117 119.048C281.511 118.909 281.959 118.84 282.461 118.84C283.506 118.84 284.311 119.117 284.877 119.672C285.453 120.216 285.741 120.952 285.741 121.88V127H284.381L284.221 126.12H284.141C283.981 126.323 283.789 126.499 283.565 126.648C283.373 126.776 283.122 126.893 282.813 127C282.514 127.107 282.157 127.16 281.741 127.16ZM281.901 125.8C282.626 125.8 283.181 125.613 283.565 125.24C283.949 124.856 284.141 124.323 284.141 123.64V123.32H282.221C281.613 123.32 281.165 123.443 280.877 123.688C280.599 123.933 280.461 124.237 280.461 124.6C280.461 124.963 280.578 125.256 280.813 125.48C281.058 125.693 281.421 125.8 281.901 125.8ZM289.831 127C289.265 127 288.828 126.851 288.519 126.552C288.22 126.253 288.071 125.843 288.071 125.32V120.52H286.791V119H288.071V116.76H289.671V119H291.511V120.52H289.671V125.08C289.671 125.4 289.831 125.56 290.151 125.56H291.511V127H289.831ZM293.274 119H294.874V127H293.274V119ZM293.194 115.8H294.954V117.48H293.194V115.8ZM300.562 127.16C299.986 127.16 299.453 127.059 298.962 126.856C298.471 126.653 298.045 126.371 297.682 126.008C297.33 125.645 297.053 125.208 296.85 124.696C296.658 124.184 296.562 123.619 296.562 123C296.562 122.381 296.658 121.816 296.85 121.304C297.053 120.792 297.33 120.355 297.682 119.992C298.045 119.629 298.471 119.347 298.962 119.144C299.453 118.941 299.986 118.84 300.562 118.84C301.138 118.84 301.671 118.941 302.162 119.144C302.653 119.347 303.074 119.629 303.426 119.992C303.789 120.355 304.066 120.792 304.258 121.304C304.461 121.816 304.562 122.381 304.562 123C304.562 123.619 304.461 124.184 304.258 124.696C304.066 125.208 303.789 125.645 303.426 126.008C303.074 126.371 302.653 126.653 302.162 126.856C301.671 127.059 301.138 127.16 300.562 127.16ZM300.562 125.72C300.903 125.72 301.218 125.656 301.506 125.528C301.805 125.4 302.061 125.219 302.274 124.984C302.487 124.749 302.653 124.467 302.77 124.136C302.898 123.795 302.962 123.416 302.962 123C302.962 122.584 302.898 122.211 302.77 121.88C302.653 121.539 302.487 121.251 302.274 121.016C302.061 120.781 301.805 120.6 301.506 120.472C301.218 120.344 300.903 120.28 300.562 120.28C300.221 120.28 299.901 120.344 299.602 120.472C299.314 120.6 299.063 120.781 298.85 121.016C298.637 121.251 298.466 121.539 298.338 121.88C298.221 122.211 298.162 122.584 298.162 123C298.162 123.416 298.221 123.795 298.338 124.136C298.466 124.467 298.637 124.749 298.85 124.984C299.063 125.219 299.314 125.4 299.602 125.528C299.901 125.656 300.221 125.72 300.562 125.72ZM306.243 119H307.683L307.843 119.8H307.923C308.094 119.619 308.291 119.459 308.515 119.32C308.707 119.203 308.947 119.096 309.235 119C309.523 118.893 309.859 118.84 310.243 118.84C310.723 118.84 311.16 118.92 311.555 119.08C311.95 119.229 312.286 119.448 312.563 119.736C312.84 120.024 313.054 120.376 313.203 120.792C313.363 121.208 313.443 121.677 313.443 122.2V127H311.843V122.2C311.843 121.944 311.795 121.699 311.699 121.464C311.603 121.229 311.47 121.027 311.299 120.856C311.128 120.675 310.926 120.536 310.691 120.44C310.456 120.333 310.2 120.28 309.923 120.28C309.624 120.28 309.347 120.333 309.091 120.44C308.835 120.536 308.616 120.675 308.435 120.856C308.254 121.027 308.11 121.229 308.003 121.464C307.896 121.699 307.843 121.944 307.843 122.2V127H306.243V119Z" fill="#171717"/>
+<rect x="623" y="85" width="371" height="228" rx="16" fill="#E4F1F6"/>
+<path d="M466.355 240.14C465.711 240.14 465.104 240.019 464.535 239.776C463.966 239.533 463.466 239.193 463.037 238.754C462.617 238.306 462.281 237.774 462.029 237.158C461.786 236.542 461.665 235.856 461.665 235.1C461.665 234.344 461.786 233.658 462.029 233.042C462.281 232.426 462.617 231.899 463.037 231.46C463.466 231.012 463.966 230.667 464.535 230.424C465.104 230.181 465.711 230.06 466.355 230.06C466.971 230.06 467.526 230.158 468.021 230.354C468.516 230.541 468.95 230.797 469.323 231.124C469.696 231.441 470.004 231.805 470.247 232.216C470.49 232.627 470.662 233.051 470.765 233.49H469.225C468.982 232.827 468.6 232.323 468.077 231.978C467.554 231.633 466.98 231.46 466.355 231.46C465.898 231.46 465.473 231.544 465.081 231.712C464.689 231.88 464.348 232.123 464.059 232.44C463.77 232.757 463.541 233.14 463.373 233.588C463.214 234.036 463.135 234.54 463.135 235.1C463.135 235.66 463.214 236.164 463.373 236.612C463.541 237.06 463.77 237.443 464.059 237.76C464.348 238.077 464.689 238.32 465.081 238.488C465.473 238.656 465.898 238.74 466.355 238.74C466.756 238.74 467.116 238.679 467.433 238.558C467.75 238.437 468.026 238.278 468.259 238.082C468.502 237.886 468.702 237.662 468.861 237.41C469.02 237.158 469.141 236.901 469.225 236.64H470.765C470.681 237.023 470.527 237.424 470.303 237.844C470.079 238.255 469.785 238.633 469.421 238.978C469.057 239.314 468.618 239.594 468.105 239.818C467.601 240.033 467.018 240.14 466.355 240.14ZM474.412 240.14C474.029 240.14 473.679 240.089 473.362 239.986C473.054 239.874 472.788 239.725 472.564 239.538C472.349 239.342 472.181 239.113 472.06 238.852C471.948 238.581 471.892 238.287 471.892 237.97C471.892 237.27 472.125 236.71 472.592 236.29C473.058 235.87 473.782 235.66 474.762 235.66H476.512V235.52C476.512 235.063 476.381 234.703 476.12 234.442C475.858 234.181 475.499 234.05 475.042 234.05C474.799 234.05 474.589 234.083 474.412 234.148C474.234 234.204 474.085 234.283 473.964 234.386C473.842 234.479 473.749 234.587 473.684 234.708C473.628 234.82 473.59 234.927 473.572 235.03H472.172C472.19 234.731 472.265 234.451 472.396 234.19C472.536 233.929 472.727 233.7 472.97 233.504C473.222 233.308 473.52 233.154 473.866 233.042C474.211 232.921 474.603 232.86 475.042 232.86C475.956 232.86 476.661 233.103 477.156 233.588C477.66 234.064 477.912 234.708 477.912 235.52V240H476.722L476.582 239.23H476.512C476.372 239.407 476.204 239.561 476.008 239.692C475.84 239.804 475.62 239.907 475.35 240C475.088 240.093 474.776 240.14 474.412 240.14ZM474.552 238.95C475.186 238.95 475.672 238.787 476.008 238.46C476.344 238.124 476.512 237.657 476.512 237.06V236.78H474.832C474.3 236.78 473.908 236.887 473.656 237.102C473.413 237.317 473.292 237.583 473.292 237.9C473.292 238.217 473.394 238.474 473.6 238.67C473.814 238.857 474.132 238.95 474.552 238.95ZM479.734 230.2H481.134V240H479.734V230.2ZM483.097 230.2H484.497V240H483.097V230.2ZM490.1 240.14C489.764 240.14 489.47 240.103 489.218 240.028C488.976 239.953 488.766 239.865 488.588 239.762C488.42 239.65 488.28 239.543 488.168 239.44C488.066 239.328 487.986 239.235 487.93 239.16H487.86L487.72 240H486.46V230.2H487.86V233.84H487.93C487.986 233.775 488.066 233.686 488.168 233.574C488.28 233.462 488.42 233.355 488.588 233.252C488.766 233.14 488.976 233.047 489.218 232.972C489.47 232.897 489.764 232.86 490.1 232.86C490.558 232.86 490.982 232.944 491.374 233.112C491.766 233.28 492.107 233.523 492.396 233.84C492.686 234.157 492.91 234.54 493.068 234.988C493.236 235.436 493.32 235.94 493.32 236.5C493.32 237.06 493.236 237.564 493.068 238.012C492.91 238.46 492.686 238.843 492.396 239.16C492.107 239.477 491.766 239.72 491.374 239.888C490.982 240.056 490.558 240.14 490.1 240.14ZM489.89 238.88C490.17 238.88 490.432 238.824 490.674 238.712C490.926 238.6 491.141 238.441 491.318 238.236C491.505 238.031 491.65 237.783 491.752 237.494C491.864 237.195 491.92 236.864 491.92 236.5C491.92 236.136 491.864 235.809 491.752 235.52C491.65 235.221 491.505 234.969 491.318 234.764C491.141 234.559 490.926 234.4 490.674 234.288C490.432 234.176 490.17 234.12 489.89 234.12C489.61 234.12 489.344 234.176 489.092 234.288C488.85 234.4 488.635 234.559 488.448 234.764C488.271 234.969 488.126 235.221 488.014 235.52C487.912 235.809 487.86 236.136 487.86 236.5C487.86 236.864 487.912 237.195 488.014 237.494C488.126 237.783 488.271 238.031 488.448 238.236C488.635 238.441 488.85 238.6 489.092 238.712C489.344 238.824 489.61 238.88 489.89 238.88ZM497.025 240.14C496.642 240.14 496.292 240.089 495.975 239.986C495.667 239.874 495.401 239.725 495.177 239.538C494.962 239.342 494.794 239.113 494.673 238.852C494.561 238.581 494.505 238.287 494.505 237.97C494.505 237.27 494.738 236.71 495.205 236.29C495.672 235.87 496.395 235.66 497.375 235.66H499.125V235.52C499.125 235.063 498.994 234.703 498.733 234.442C498.472 234.181 498.112 234.05 497.655 234.05C497.412 234.05 497.202 234.083 497.025 234.148C496.848 234.204 496.698 234.283 496.577 234.386C496.456 234.479 496.362 234.587 496.297 234.708C496.241 234.82 496.204 234.927 496.185 235.03H494.785C494.804 234.731 494.878 234.451 495.009 234.19C495.149 233.929 495.34 233.7 495.583 233.504C495.835 233.308 496.134 233.154 496.479 233.042C496.824 232.921 497.216 232.86 497.655 232.86C498.57 232.86 499.274 233.103 499.769 233.588C500.273 234.064 500.525 234.708 500.525 235.52V240H499.335L499.195 239.23H499.125C498.985 239.407 498.817 239.561 498.621 239.692C498.453 239.804 498.234 239.907 497.963 240C497.702 240.093 497.389 240.14 497.025 240.14ZM497.165 238.95C497.8 238.95 498.285 238.787 498.621 238.46C498.957 238.124 499.125 237.657 499.125 237.06V236.78H497.445C496.913 236.78 496.521 236.887 496.269 237.102C496.026 237.317 495.905 237.583 495.905 237.9C495.905 238.217 496.008 238.474 496.213 238.67C496.428 238.857 496.745 238.95 497.165 238.95ZM505.427 240.14C504.923 240.14 504.457 240.051 504.027 239.874C503.598 239.697 503.225 239.449 502.907 239.132C502.599 238.815 502.357 238.432 502.179 237.984C502.011 237.536 501.927 237.041 501.927 236.5C501.927 235.959 502.011 235.464 502.179 235.016C502.357 234.568 502.599 234.185 502.907 233.868C503.225 233.551 503.598 233.303 504.027 233.126C504.457 232.949 504.923 232.86 505.427 232.86C505.95 232.86 506.403 232.949 506.785 233.126C507.168 233.294 507.485 233.504 507.737 233.756C507.999 234.008 508.199 234.283 508.339 234.582C508.489 234.871 508.591 235.137 508.647 235.38H507.247C507.191 235.221 507.112 235.067 507.009 234.918C506.916 234.769 506.795 234.633 506.645 234.512C506.505 234.391 506.333 234.297 506.127 234.232C505.922 234.157 505.689 234.12 505.427 234.12C505.129 234.12 504.849 234.176 504.587 234.288C504.335 234.4 504.116 234.559 503.929 234.764C503.743 234.969 503.593 235.221 503.481 235.52C503.379 235.809 503.327 236.136 503.327 236.5C503.327 236.864 503.379 237.195 503.481 237.494C503.593 237.783 503.743 238.031 503.929 238.236C504.116 238.441 504.335 238.6 504.587 238.712C504.849 238.824 505.129 238.88 505.427 238.88C505.707 238.88 505.95 238.838 506.155 238.754C506.37 238.67 506.552 238.563 506.701 238.432C506.851 238.292 506.967 238.147 507.051 237.998C507.145 237.839 507.21 237.69 507.247 237.55H508.647C508.591 237.811 508.489 238.096 508.339 238.404C508.199 238.703 507.999 238.983 507.737 239.244C507.485 239.496 507.168 239.711 506.785 239.888C506.403 240.056 505.95 240.14 505.427 240.14ZM510.113 230.2H511.513V236.22L514.453 233H516.133L512.983 236.43L516.273 240H514.593L511.513 236.64V240H510.113V230.2ZM524.396 240.14C523.817 240.14 523.285 240.047 522.8 239.86C522.324 239.664 521.913 239.389 521.568 239.034C521.223 238.679 520.952 238.255 520.756 237.76C520.569 237.256 520.476 236.696 520.476 236.08V230.2H521.946V236.08C521.946 236.481 522.007 236.845 522.128 237.172C522.259 237.499 522.431 237.779 522.646 238.012C522.861 238.245 523.117 238.427 523.416 238.558C523.715 238.679 524.041 238.74 524.396 238.74C524.741 238.74 525.063 238.679 525.362 238.558C525.67 238.427 525.931 238.245 526.146 238.012C526.361 237.779 526.529 237.499 526.65 237.172C526.781 236.845 526.846 236.481 526.846 236.08V230.2H528.316V236.08C528.316 236.696 528.218 237.256 528.022 237.76C527.835 238.255 527.569 238.679 527.224 239.034C526.879 239.389 526.463 239.664 525.978 239.86C525.502 240.047 524.975 240.14 524.396 240.14ZM530.349 230.2H534.759C535.16 230.2 535.533 230.275 535.879 230.424C536.233 230.573 536.537 230.788 536.789 231.068C537.05 231.339 537.255 231.67 537.405 232.062C537.554 232.445 537.629 232.874 537.629 233.35C537.629 233.826 537.554 234.26 537.405 234.652C537.255 235.035 537.05 235.366 536.789 235.646C536.537 235.917 536.233 236.127 535.879 236.276C535.533 236.425 535.16 236.5 534.759 236.5H534.409L537.909 240H536.019L532.519 236.5H531.819V240H530.349V230.2ZM534.689 235.1C534.885 235.1 535.071 235.058 535.249 234.974C535.426 234.89 535.58 234.773 535.711 234.624C535.851 234.465 535.958 234.279 536.033 234.064C536.117 233.849 536.159 233.611 536.159 233.35C536.159 233.089 536.117 232.851 536.033 232.636C535.958 232.421 535.851 232.239 535.711 232.09C535.58 231.931 535.426 231.81 535.249 231.726C535.071 231.642 534.885 231.6 534.689 231.6H531.819V235.1H534.689ZM539.454 230.2H540.924V238.6H545.684V240H539.454V230.2Z" fill="#616161"/>
+<path d="M462.264 158.2H465.694C466.357 158.2 466.973 158.321 467.542 158.564C468.121 158.807 468.62 159.147 469.04 159.586C469.46 160.015 469.787 160.529 470.02 161.126C470.263 161.723 470.384 162.381 470.384 163.1C470.384 163.819 470.263 164.477 470.02 165.074C469.787 165.671 469.46 166.189 469.04 166.628C468.62 167.057 468.121 167.393 467.542 167.636C466.973 167.879 466.357 168 465.694 168H462.264V158.2ZM465.694 166.6C466.151 166.6 466.576 166.516 466.968 166.348C467.36 166.18 467.701 165.942 467.99 165.634C468.279 165.326 468.503 164.957 468.662 164.528C468.83 164.099 468.914 163.623 468.914 163.1C468.914 162.577 468.83 162.101 468.662 161.672C468.503 161.243 468.279 160.874 467.99 160.566C467.701 160.258 467.36 160.02 466.968 159.852C466.576 159.684 466.151 159.6 465.694 159.6H463.734V166.6H465.694ZM475.077 168.14C474.573 168.14 474.106 168.051 473.677 167.874C473.247 167.697 472.874 167.449 472.557 167.132C472.249 166.815 472.006 166.432 471.829 165.984C471.661 165.536 471.577 165.041 471.577 164.5C471.577 163.959 471.661 163.464 471.829 163.016C472.006 162.568 472.249 162.185 472.557 161.868C472.874 161.551 473.247 161.303 473.677 161.126C474.106 160.949 474.573 160.86 475.077 160.86C475.553 160.86 475.991 160.949 476.393 161.126C476.803 161.294 477.158 161.532 477.457 161.84C477.765 162.148 478.003 162.512 478.171 162.932C478.348 163.352 478.437 163.805 478.437 164.29C478.437 164.393 478.432 164.486 478.423 164.57C478.413 164.654 478.404 164.729 478.395 164.794C478.385 164.869 478.376 164.934 478.367 164.99H472.977C473.051 165.587 473.28 166.063 473.663 166.418C474.045 166.773 474.517 166.95 475.077 166.95C475.282 166.95 475.473 166.922 475.651 166.866C475.837 166.81 476.001 166.735 476.141 166.642C476.29 166.549 476.416 166.446 476.519 166.334C476.621 166.213 476.701 166.091 476.757 165.97H478.227C478.143 166.194 478.017 166.437 477.849 166.698C477.681 166.95 477.466 167.183 477.205 167.398C476.943 167.613 476.635 167.79 476.281 167.93C475.935 168.07 475.534 168.14 475.077 168.14ZM477.107 163.94C477.032 163.38 476.813 162.927 476.449 162.582C476.094 162.227 475.637 162.05 475.077 162.05C474.479 162.05 474.003 162.227 473.649 162.582C473.303 162.927 473.079 163.38 472.977 163.94H477.107ZM483.061 168.14C482.557 168.14 482.09 168.051 481.661 167.874C481.232 167.697 480.858 167.449 480.541 167.132C480.233 166.815 479.99 166.432 479.813 165.984C479.645 165.536 479.561 165.041 479.561 164.5C479.561 163.959 479.645 163.464 479.813 163.016C479.99 162.568 480.233 162.185 480.541 161.868C480.858 161.551 481.232 161.303 481.661 161.126C482.09 160.949 482.557 160.86 483.061 160.86C483.537 160.86 483.976 160.949 484.377 161.126C484.788 161.294 485.142 161.532 485.441 161.84C485.749 162.148 485.987 162.512 486.155 162.932C486.332 163.352 486.421 163.805 486.421 164.29C486.421 164.393 486.416 164.486 486.407 164.57C486.398 164.654 486.388 164.729 486.379 164.794C486.37 164.869 486.36 164.934 486.351 164.99H480.961C481.036 165.587 481.264 166.063 481.647 166.418C482.03 166.773 482.501 166.95 483.061 166.95C483.266 166.95 483.458 166.922 483.635 166.866C483.822 166.81 483.985 166.735 484.125 166.642C484.274 166.549 484.4 166.446 484.503 166.334C484.606 166.213 484.685 166.091 484.741 165.97H486.211C486.127 166.194 486.001 166.437 485.833 166.698C485.665 166.95 485.45 167.183 485.189 167.398C484.928 167.613 484.62 167.79 484.265 167.93C483.92 168.07 483.518 168.14 483.061 168.14ZM485.091 163.94C485.016 163.38 484.797 162.927 484.433 162.582C484.078 162.227 483.621 162.05 483.061 162.05C482.464 162.05 481.988 162.227 481.633 162.582C481.288 162.927 481.064 163.38 480.961 163.94H485.091ZM487.895 161H489.155L489.295 161.84H489.365C489.421 161.775 489.501 161.686 489.603 161.574C489.715 161.462 489.855 161.355 490.023 161.252C490.201 161.14 490.411 161.047 490.653 160.972C490.905 160.897 491.199 160.86 491.535 160.86C491.993 160.86 492.417 160.944 492.809 161.112C493.201 161.28 493.542 161.523 493.831 161.84C494.121 162.157 494.345 162.54 494.503 162.988C494.671 163.436 494.755 163.94 494.755 164.5C494.755 165.06 494.671 165.564 494.503 166.012C494.345 166.46 494.121 166.843 493.831 167.16C493.542 167.477 493.201 167.72 492.809 167.888C492.417 168.056 491.993 168.14 491.535 168.14C491.199 168.14 490.905 168.103 490.653 168.028C490.411 167.953 490.201 167.865 490.023 167.762C489.855 167.65 489.715 167.543 489.603 167.44C489.501 167.328 489.421 167.235 489.365 167.16H489.295V170.8H487.895V161ZM491.325 166.88C491.605 166.88 491.867 166.824 492.109 166.712C492.361 166.6 492.576 166.441 492.753 166.236C492.94 166.031 493.085 165.783 493.187 165.494C493.299 165.195 493.355 164.864 493.355 164.5C493.355 164.136 493.299 163.809 493.187 163.52C493.085 163.221 492.94 162.969 492.753 162.764C492.576 162.559 492.361 162.4 492.109 162.288C491.867 162.176 491.605 162.12 491.325 162.12C491.045 162.12 490.779 162.176 490.527 162.288C490.285 162.4 490.07 162.559 489.883 162.764C489.706 162.969 489.561 163.221 489.449 163.52C489.347 163.809 489.295 164.136 489.295 164.5C489.295 164.864 489.347 165.195 489.449 165.494C489.561 165.783 489.706 166.031 489.883 166.236C490.07 166.441 490.285 166.6 490.527 166.712C490.779 166.824 491.045 166.88 491.325 166.88ZM496.292 158.2H497.692V168H496.292V158.2ZM499.585 161H500.985V168H499.585V161ZM499.515 158.2H501.055V159.67H499.515V158.2ZM502.811 161H504.071L504.211 161.7H504.281C504.431 161.541 504.603 161.401 504.799 161.28C504.967 161.177 505.177 161.084 505.429 161C505.681 160.907 505.975 160.86 506.311 160.86C506.731 160.86 507.114 160.93 507.459 161.07C507.805 161.201 508.099 161.392 508.341 161.644C508.584 161.896 508.771 162.204 508.901 162.568C509.041 162.932 509.111 163.343 509.111 163.8V168H507.711V163.8C507.711 163.576 507.669 163.361 507.585 163.156C507.501 162.951 507.385 162.773 507.235 162.624C507.086 162.465 506.909 162.344 506.703 162.26C506.498 162.167 506.274 162.12 506.031 162.12C505.77 162.12 505.527 162.167 505.303 162.26C505.079 162.344 504.888 162.465 504.729 162.624C504.571 162.773 504.445 162.951 504.351 163.156C504.258 163.361 504.211 163.576 504.211 163.8V168H502.811V161ZM510.934 158.2H512.334V164.22L515.274 161H516.954L513.804 164.43L517.094 168H515.414L512.334 164.64V168H510.934V158.2ZM525.217 168.14C524.639 168.14 524.107 168.047 523.621 167.86C523.145 167.664 522.735 167.389 522.389 167.034C522.044 166.679 521.773 166.255 521.577 165.76C521.391 165.256 521.297 164.696 521.297 164.08V158.2H522.767V164.08C522.767 164.481 522.828 164.845 522.949 165.172C523.08 165.499 523.253 165.779 523.467 166.012C523.682 166.245 523.939 166.427 524.237 166.558C524.536 166.679 524.863 166.74 525.217 166.74C525.563 166.74 525.885 166.679 526.183 166.558C526.491 166.427 526.753 166.245 526.967 166.012C527.182 165.779 527.35 165.499 527.471 165.172C527.602 164.845 527.667 164.481 527.667 164.08V158.2H529.137V164.08C529.137 164.696 529.039 165.256 528.843 165.76C528.657 166.255 528.391 166.679 528.045 167.034C527.7 167.389 527.285 167.664 526.799 167.86C526.323 168.047 525.796 168.14 525.217 168.14ZM531.17 158.2H535.58C535.981 158.2 536.355 158.275 536.7 158.424C537.055 158.573 537.358 158.788 537.61 159.068C537.871 159.339 538.077 159.67 538.226 160.062C538.375 160.445 538.45 160.874 538.45 161.35C538.45 161.826 538.375 162.26 538.226 162.652C538.077 163.035 537.871 163.366 537.61 163.646C537.358 163.917 537.055 164.127 536.7 164.276C536.355 164.425 535.981 164.5 535.58 164.5H535.23L538.73 168H536.84L533.34 164.5H532.64V168H531.17V158.2ZM535.51 163.1C535.706 163.1 535.893 163.058 536.07 162.974C536.247 162.89 536.401 162.773 536.532 162.624C536.672 162.465 536.779 162.279 536.854 162.064C536.938 161.849 536.98 161.611 536.98 161.35C536.98 161.089 536.938 160.851 536.854 160.636C536.779 160.421 536.672 160.239 536.532 160.09C536.401 159.931 536.247 159.81 536.07 159.726C535.893 159.642 535.706 159.6 535.51 159.6H532.64V163.1H535.51ZM540.276 158.2H541.746V166.6H546.506V168H540.276V158.2Z" fill="#616161"/>
+<path d="M384.293 258.293C383.902 258.683 383.902 259.317 384.293 259.707L390.657 266.071C391.047 266.462 391.681 266.462 392.071 266.071C392.462 265.681 392.462 265.047 392.071 264.657L386.414 259L392.071 253.343C392.462 252.953 392.462 252.319 392.071 251.929C391.681 251.538 391.047 251.538 390.657 251.929L384.293 258.293ZM623 258L385 258V260L623 260V258Z" fill="#333333"/>
+<path d="M623.707 187.707C624.098 187.317 624.098 186.683 623.707 186.293L617.343 179.929C616.953 179.538 616.319 179.538 615.929 179.929C615.538 180.319 615.538 180.953 615.929 181.343L621.586 187L615.929 192.657C615.538 193.047 615.538 193.681 615.929 194.071C616.319 194.462 616.953 194.462 617.343 194.071L623.707 187.707ZM385 188L623 188L623 186L385 186L385 188Z" fill="#333333"/>
+<path d="M751.84 117.4H748.32V115.8H757.04V117.4H753.52V127H751.84V117.4ZM757.446 119H758.806L758.966 119.72H759.046C759.11 119.645 759.18 119.565 759.254 119.48C759.329 119.395 759.42 119.315 759.526 119.24C759.644 119.165 759.782 119.107 759.942 119.064C760.113 119.021 760.321 119 760.566 119H762.006V120.44H760.726C759.606 120.44 759.046 120.995 759.046 122.104V127H757.446V119ZM766.499 127.16C765.923 127.16 765.39 127.059 764.899 126.856C764.409 126.653 763.982 126.371 763.619 126.008C763.267 125.645 762.99 125.208 762.787 124.696C762.595 124.184 762.499 123.619 762.499 123C762.499 122.381 762.595 121.816 762.787 121.304C762.99 120.792 763.267 120.355 763.619 119.992C763.982 119.629 764.409 119.347 764.899 119.144C765.39 118.941 765.923 118.84 766.499 118.84C767.043 118.84 767.545 118.941 768.003 119.144C768.473 119.336 768.878 119.608 769.219 119.96C769.571 120.312 769.843 120.728 770.035 121.208C770.238 121.688 770.339 122.205 770.339 122.76C770.339 122.877 770.334 122.984 770.323 123.08C770.313 123.176 770.302 123.261 770.291 123.336C770.281 123.421 770.27 123.496 770.259 123.56H764.099C764.185 124.243 764.446 124.787 764.883 125.192C765.321 125.597 765.859 125.8 766.499 125.8C766.734 125.8 766.953 125.768 767.155 125.704C767.369 125.64 767.555 125.555 767.715 125.448C767.886 125.341 768.03 125.224 768.147 125.096C768.265 124.957 768.355 124.819 768.419 124.68H770.099C770.003 124.936 769.859 125.213 769.667 125.512C769.475 125.8 769.23 126.067 768.931 126.312C768.633 126.557 768.281 126.76 767.875 126.92C767.481 127.08 767.022 127.16 766.499 127.16ZM768.819 122.36C768.734 121.72 768.483 121.203 768.067 120.808C767.662 120.403 767.139 120.2 766.499 120.2C765.817 120.2 765.273 120.403 764.867 120.808C764.473 121.203 764.217 121.72 764.099 122.36H768.819ZM771.308 125.56L775.468 120.52H771.388V119H777.548V120.44L773.388 125.48H777.628V127H771.308V125.56ZM782.593 127.16C782.017 127.16 781.484 127.059 780.993 126.856C780.502 126.653 780.076 126.371 779.713 126.008C779.361 125.645 779.084 125.208 778.881 124.696C778.689 124.184 778.593 123.619 778.593 123C778.593 122.381 778.689 121.816 778.881 121.304C779.084 120.792 779.361 120.355 779.713 119.992C780.076 119.629 780.502 119.347 780.993 119.144C781.484 118.941 782.017 118.84 782.593 118.84C783.169 118.84 783.702 118.941 784.193 119.144C784.684 119.347 785.105 119.629 785.457 119.992C785.82 120.355 786.097 120.792 786.289 121.304C786.492 121.816 786.593 122.381 786.593 123C786.593 123.619 786.492 124.184 786.289 124.696C786.097 125.208 785.82 125.645 785.457 126.008C785.105 126.371 784.684 126.653 784.193 126.856C783.702 127.059 783.169 127.16 782.593 127.16ZM782.593 125.72C782.934 125.72 783.249 125.656 783.537 125.528C783.836 125.4 784.092 125.219 784.305 124.984C784.518 124.749 784.684 124.467 784.801 124.136C784.929 123.795 784.993 123.416 784.993 123C784.993 122.584 784.929 122.211 784.801 121.88C784.684 121.539 784.518 121.251 784.305 121.016C784.092 120.781 783.836 120.6 783.537 120.472C783.249 120.344 782.934 120.28 782.593 120.28C782.252 120.28 781.932 120.344 781.633 120.472C781.345 120.6 781.094 120.781 780.881 121.016C780.668 121.251 780.497 121.539 780.369 121.88C780.252 122.211 780.193 122.584 780.193 123C780.193 123.416 780.252 123.795 780.369 124.136C780.497 124.467 780.668 124.749 780.881 124.984C781.094 125.219 781.345 125.4 781.633 125.528C781.932 125.656 782.252 125.72 782.593 125.72ZM788.274 119H789.634L789.794 119.72H789.874C789.938 119.645 790.008 119.565 790.082 119.48C790.157 119.395 790.248 119.315 790.354 119.24C790.472 119.165 790.61 119.107 790.77 119.064C790.941 119.021 791.149 119 791.394 119H792.834V120.44H791.554C790.434 120.44 789.874 120.995 789.874 122.104V127H788.274V119ZM801.321 127.16C800.617 127.16 799.993 127.069 799.449 126.888C798.905 126.696 798.447 126.44 798.073 126.12C797.7 125.789 797.412 125.405 797.209 124.968C797.017 124.531 796.921 124.061 796.921 123.56H798.601C798.601 123.816 798.665 124.067 798.793 124.312C798.921 124.557 799.103 124.771 799.337 124.952C799.572 125.133 799.855 125.283 800.185 125.4C800.527 125.507 800.905 125.56 801.321 125.56C802.239 125.56 802.895 125.4 803.289 125.08C803.684 124.76 803.881 124.36 803.881 123.88C803.881 123.059 803.241 122.525 801.961 122.28L799.801 121.88C798.916 121.72 798.255 121.379 797.817 120.856C797.38 120.333 797.161 119.688 797.161 118.92C797.161 118.461 797.252 118.035 797.433 117.64C797.625 117.235 797.892 116.888 798.233 116.6C798.575 116.301 798.991 116.067 799.481 115.896C799.983 115.725 800.543 115.64 801.161 115.64C801.865 115.64 802.479 115.736 803.001 115.928C803.535 116.109 803.977 116.365 804.329 116.696C804.681 117.016 804.948 117.395 805.129 117.832C805.311 118.269 805.401 118.739 805.401 119.24H803.721C803.721 118.984 803.663 118.733 803.545 118.488C803.428 118.243 803.257 118.029 803.033 117.848C802.82 117.667 802.553 117.523 802.233 117.416C801.913 117.299 801.556 117.24 801.161 117.24C800.777 117.24 800.441 117.288 800.153 117.384C799.865 117.469 799.625 117.592 799.433 117.752C799.241 117.901 799.092 118.077 798.985 118.28C798.889 118.483 798.841 118.696 798.841 118.92C798.841 119.283 798.969 119.597 799.225 119.864C799.481 120.131 799.913 120.323 800.521 120.44L802.281 120.76C803.412 120.963 804.239 121.315 804.761 121.816C805.295 122.307 805.561 122.995 805.561 123.88C805.561 124.339 805.471 124.771 805.289 125.176C805.108 125.571 804.841 125.917 804.489 126.216C804.137 126.504 803.695 126.733 803.161 126.904C802.639 127.075 802.025 127.16 801.321 127.16ZM810.521 127.16C810.041 127.16 809.604 127.085 809.209 126.936C808.815 126.776 808.479 126.552 808.201 126.264C807.924 125.976 807.705 125.624 807.545 125.208C807.396 124.792 807.321 124.323 807.321 123.8V119H808.921V123.8C808.921 124.056 808.969 124.301 809.065 124.536C809.161 124.771 809.295 124.979 809.465 125.16C809.636 125.331 809.839 125.469 810.073 125.576C810.308 125.672 810.564 125.72 810.841 125.72C811.14 125.72 811.417 125.672 811.673 125.576C811.929 125.469 812.148 125.331 812.329 125.16C812.511 124.979 812.655 124.771 812.761 124.536C812.868 124.301 812.921 124.056 812.921 123.8V119H814.521V127H813.081L812.921 126.2H812.841C812.671 126.381 812.473 126.541 812.249 126.68C812.057 126.797 811.812 126.904 811.513 127C811.225 127.107 810.895 127.16 810.521 127.16ZM816.603 119H818.203V127H816.603V119ZM816.523 115.8H818.283V117.48H816.523V115.8ZM822.69 127C822.125 127 821.687 126.851 821.378 126.552C821.079 126.253 820.93 125.843 820.93 125.32V120.52H819.65V119H820.93V116.76H822.53V119H824.37V120.52H822.53V125.08C822.53 125.4 822.69 125.56 823.01 125.56H824.37V127H822.69ZM829.421 127.16C828.845 127.16 828.312 127.059 827.821 126.856C827.331 126.653 826.904 126.371 826.541 126.008C826.189 125.645 825.912 125.208 825.709 124.696C825.517 124.184 825.421 123.619 825.421 123C825.421 122.381 825.517 121.816 825.709 121.304C825.912 120.792 826.189 120.355 826.541 119.992C826.904 119.629 827.331 119.347 827.821 119.144C828.312 118.941 828.845 118.84 829.421 118.84C829.965 118.84 830.467 118.941 830.925 119.144C831.395 119.336 831.8 119.608 832.141 119.96C832.493 120.312 832.765 120.728 832.957 121.208C833.16 121.688 833.261 122.205 833.261 122.76C833.261 122.877 833.256 122.984 833.245 123.08C833.235 123.176 833.224 123.261 833.213 123.336C833.203 123.421 833.192 123.496 833.181 123.56H827.021C827.107 124.243 827.368 124.787 827.805 125.192C828.243 125.597 828.781 125.8 829.421 125.8C829.656 125.8 829.875 125.768 830.077 125.704C830.291 125.64 830.477 125.555 830.637 125.448C830.808 125.341 830.952 125.224 831.069 125.096C831.187 124.957 831.277 124.819 831.341 124.68H833.021C832.925 124.936 832.781 125.213 832.589 125.512C832.397 125.8 832.152 126.067 831.853 126.312C831.555 126.557 831.203 126.76 830.797 126.92C830.403 127.08 829.944 127.16 829.421 127.16ZM831.741 122.36C831.656 121.72 831.405 121.203 830.989 120.808C830.584 120.403 830.061 120.2 829.421 120.2C828.739 120.2 828.195 120.403 827.789 120.808C827.395 121.203 827.139 121.72 827.021 122.36H831.741ZM841.752 115.8H844.312L848.392 127H846.552L845.592 124.36H840.472L839.512 127H837.672L841.752 115.8ZM845.032 122.84L843.192 117.72H842.872L841.032 122.84H845.032ZM849.431 119H850.871L851.031 119.96H851.111C851.175 119.885 851.265 119.784 851.383 119.656C851.511 119.528 851.671 119.405 851.863 119.288C852.065 119.16 852.305 119.053 852.583 118.968C852.871 118.883 853.207 118.84 853.591 118.84C854.113 118.84 854.599 118.936 855.047 119.128C855.495 119.32 855.884 119.597 856.215 119.96C856.545 120.323 856.801 120.76 856.983 121.272C857.175 121.784 857.271 122.36 857.271 123C857.271 123.64 857.175 124.216 856.983 124.728C856.801 125.24 856.545 125.677 856.215 126.04C855.884 126.403 855.495 126.68 855.047 126.872C854.599 127.064 854.113 127.16 853.591 127.16C853.207 127.16 852.871 127.117 852.583 127.032C852.305 126.947 852.065 126.845 851.863 126.728C851.671 126.6 851.511 126.477 851.383 126.36C851.265 126.232 851.175 126.125 851.111 126.04H851.031V130.2H849.431V119ZM853.351 125.72C853.671 125.72 853.969 125.656 854.247 125.528C854.535 125.4 854.78 125.219 854.983 124.984C855.196 124.749 855.361 124.467 855.479 124.136C855.607 123.795 855.671 123.416 855.671 123C855.671 122.584 855.607 122.211 855.479 121.88C855.361 121.539 855.196 121.251 854.983 121.016C854.78 120.781 854.535 120.6 854.247 120.472C853.969 120.344 853.671 120.28 853.351 120.28C853.031 120.28 852.727 120.344 852.439 120.472C852.161 120.6 851.916 120.781 851.703 121.016C851.5 121.251 851.335 121.539 851.207 121.88C851.089 122.211 851.031 122.584 851.031 123C851.031 123.416 851.089 123.795 851.207 124.136C851.335 124.467 851.5 124.749 851.703 124.984C851.916 125.219 852.161 125.4 852.439 125.528C852.727 125.656 853.031 125.72 853.351 125.72ZM858.946 119H860.386L860.546 119.96H860.626C860.69 119.885 860.781 119.784 860.898 119.656C861.026 119.528 861.186 119.405 861.378 119.288C861.581 119.16 861.821 119.053 862.098 118.968C862.386 118.883 862.722 118.84 863.106 118.84C863.629 118.84 864.114 118.936 864.562 119.128C865.01 119.32 865.4 119.597 865.73 119.96C866.061 120.323 866.317 120.76 866.498 121.272C866.69 121.784 866.786 122.36 866.786 123C866.786 123.64 866.69 124.216 866.498 124.728C866.317 125.24 866.061 125.677 865.73 126.04C865.4 126.403 865.01 126.68 864.562 126.872C864.114 127.064 863.629 127.16 863.106 127.16C862.722 127.16 862.386 127.117 862.098 127.032C861.821 126.947 861.581 126.845 861.378 126.728C861.186 126.6 861.026 126.477 860.898 126.36C860.781 126.232 860.69 126.125 860.626 126.04H860.546V130.2H858.946V119ZM862.866 125.72C863.186 125.72 863.485 125.656 863.762 125.528C864.05 125.4 864.296 125.219 864.498 124.984C864.712 124.749 864.877 124.467 864.994 124.136C865.122 123.795 865.186 123.416 865.186 123C865.186 122.584 865.122 122.211 864.994 121.88C864.877 121.539 864.712 121.251 864.498 121.016C864.296 120.781 864.05 120.6 863.762 120.472C863.485 120.344 863.186 120.28 862.866 120.28C862.546 120.28 862.242 120.344 861.954 120.472C861.677 120.6 861.432 120.781 861.218 121.016C861.016 121.251 860.85 121.539 860.722 121.88C860.605 122.211 860.546 122.584 860.546 123C860.546 123.416 860.605 123.795 860.722 124.136C860.85 124.467 861.016 124.749 861.218 124.984C861.432 125.219 861.677 125.4 861.954 125.528C862.242 125.656 862.546 125.72 862.866 125.72Z" fill="#171717"/>
+<rect x="1040" y="157" width="149" height="84" rx="8" fill="#F6F6F6"/>
+<path d="M1062.62 193.18C1061.83 193.18 1061.11 193.054 1060.46 192.802C1059.83 192.55 1059.28 192.196 1058.82 191.74C1058.37 191.284 1058.01 190.732 1057.76 190.084C1057.52 189.424 1057.4 188.686 1057.4 187.87V180.4H1059.74V187.87C1059.74 188.326 1059.81 188.74 1059.96 189.112C1060.11 189.484 1060.32 189.808 1060.57 190.084C1060.83 190.348 1061.14 190.558 1061.49 190.714C1061.84 190.858 1062.21 190.93 1062.62 190.93C1063.03 190.93 1063.41 190.858 1063.76 190.714C1064.1 190.558 1064.4 190.348 1064.66 190.084C1064.92 189.808 1065.12 189.484 1065.27 189.112C1065.42 188.74 1065.5 188.326 1065.5 187.87V180.4H1067.84V187.87C1067.84 188.686 1067.72 189.424 1067.46 190.084C1067.22 190.732 1066.88 191.284 1066.42 191.74C1065.96 192.196 1065.41 192.55 1064.76 192.802C1064.13 193.054 1063.41 193.18 1062.62 193.18ZM1073.6 193.18C1072.75 193.18 1072.06 193.054 1071.53 192.802C1071.01 192.55 1070.61 192.262 1070.32 191.938C1070.05 191.602 1069.86 191.272 1069.76 190.948C1069.68 190.612 1069.64 190.366 1069.64 190.21H1071.8C1071.8 190.318 1071.83 190.444 1071.91 190.588C1071.98 190.72 1072.09 190.846 1072.23 190.966C1072.37 191.086 1072.56 191.188 1072.79 191.272C1073.02 191.344 1073.29 191.38 1073.6 191.38C1074.23 191.38 1074.68 191.284 1074.93 191.092C1075.18 190.9 1075.31 190.666 1075.31 190.39C1075.31 190.114 1075.22 189.898 1075.06 189.742C1074.89 189.574 1074.55 189.448 1074.05 189.364L1072.61 189.13C1071.66 188.974 1070.93 188.692 1070.41 188.284C1069.9 187.876 1069.64 187.288 1069.64 186.52C1069.64 186.136 1069.72 185.77 1069.89 185.422C1070.06 185.074 1070.3 184.768 1070.63 184.504C1070.95 184.24 1071.35 184.03 1071.83 183.874C1072.31 183.718 1072.87 183.64 1073.51 183.64C1074.18 183.64 1074.76 183.748 1075.24 183.964C1075.73 184.168 1076.13 184.42 1076.44 184.72C1076.77 185.02 1077 185.344 1077.14 185.692C1077.3 186.04 1077.38 186.346 1077.38 186.61H1075.22C1075.22 186.334 1075.07 186.07 1074.77 185.818C1074.47 185.566 1074.05 185.44 1073.51 185.44C1072.97 185.44 1072.56 185.554 1072.28 185.782C1072.02 185.998 1071.89 186.244 1071.89 186.52C1071.89 186.952 1072.31 187.234 1073.15 187.366L1074.68 187.6C1075.63 187.744 1076.34 188.044 1076.82 188.5C1077.31 188.944 1077.56 189.574 1077.56 190.39C1077.56 190.774 1077.47 191.134 1077.31 191.47C1077.15 191.806 1076.91 192.1 1076.59 192.352C1076.26 192.604 1075.85 192.808 1075.34 192.964C1074.85 193.108 1074.27 193.18 1073.6 193.18ZM1083.59 193.18C1082.91 193.18 1082.29 193.066 1081.71 192.838C1081.14 192.598 1080.64 192.268 1080.22 191.848C1079.81 191.416 1079.49 190.912 1079.25 190.336C1079.02 189.748 1078.91 189.106 1078.91 188.41C1078.91 187.714 1079.02 187.078 1079.25 186.502C1079.49 185.914 1079.81 185.41 1080.22 184.99C1080.64 184.558 1081.14 184.228 1081.71 184C1082.29 183.76 1082.91 183.64 1083.59 183.64C1084.21 183.64 1084.8 183.76 1085.35 184C1085.9 184.228 1086.38 184.546 1086.77 184.954C1087.18 185.362 1087.5 185.848 1087.73 186.412C1087.97 186.976 1088.09 187.582 1088.09 188.23C1088.09 188.362 1088.08 188.482 1088.07 188.59C1088.06 188.698 1088.04 188.794 1088.03 188.878C1088.02 188.974 1088.01 189.058 1088 189.13H1081.16C1081.25 189.766 1081.52 190.288 1081.97 190.696C1082.41 191.092 1082.95 191.29 1083.59 191.29C1083.85 191.29 1084.09 191.254 1084.31 191.182C1084.52 191.11 1084.71 191.026 1084.86 190.93C1085.02 190.834 1085.15 190.732 1085.24 190.624C1085.35 190.504 1085.43 190.396 1085.48 190.3H1087.82C1087.77 190.48 1087.65 190.732 1087.47 191.056C1087.31 191.38 1087.05 191.698 1086.72 192.01C1086.38 192.322 1085.96 192.598 1085.44 192.838C1084.92 193.066 1084.31 193.18 1083.59 193.18ZM1085.84 187.6C1085.74 187.012 1085.5 186.52 1085.12 186.124C1084.73 185.728 1084.22 185.53 1083.59 185.53C1082.9 185.53 1082.36 185.728 1081.95 186.124C1081.55 186.52 1081.29 187.012 1081.16 187.6H1085.84ZM1089.97 183.82H1091.86L1092.04 184.63H1092.13C1092.24 184.486 1092.37 184.354 1092.53 184.234C1092.66 184.138 1092.83 184.048 1093.03 183.964C1093.24 183.868 1093.48 183.82 1093.75 183.82H1095.55V185.98H1093.93C1092.79 185.98 1092.22 186.55 1092.22 187.69V193H1089.97V183.82ZM1100.85 183.82H1103.1V193H1100.85V183.82ZM1100.76 180.22H1103.19V182.38H1100.76V180.22ZM1105.44 183.82H1107.51L1107.69 184.72H1107.78C1107.95 184.516 1108.15 184.336 1108.39 184.18C1108.6 184.048 1108.86 183.928 1109.17 183.82C1109.49 183.7 1109.87 183.64 1110.3 183.64C1110.82 183.64 1111.29 183.736 1111.72 183.928C1112.17 184.108 1112.55 184.366 1112.88 184.702C1113.2 185.038 1113.45 185.446 1113.63 185.926C1113.81 186.394 1113.9 186.922 1113.9 187.51V193H1111.65V187.69C1111.65 187.102 1111.47 186.628 1111.09 186.268C1110.73 185.896 1110.26 185.71 1109.67 185.71C1109.08 185.71 1108.6 185.896 1108.23 186.268C1107.87 186.628 1107.69 187.102 1107.69 187.69V193H1105.44V183.82ZM1116.15 183.82H1118.22L1118.4 184.81H1118.49C1118.65 184.594 1118.86 184.402 1119.12 184.234C1119.33 184.09 1119.6 183.958 1119.93 183.838C1120.25 183.706 1120.64 183.64 1121.1 183.64C1121.68 183.64 1122.23 183.754 1122.73 183.982C1123.25 184.21 1123.7 184.534 1124.08 184.954C1124.47 185.362 1124.77 185.86 1124.98 186.448C1125.21 187.036 1125.33 187.69 1125.33 188.41C1125.33 189.13 1125.21 189.784 1124.98 190.372C1124.77 190.96 1124.47 191.464 1124.08 191.884C1123.7 192.292 1123.25 192.61 1122.73 192.838C1122.23 193.066 1121.68 193.18 1121.1 193.18C1120.62 193.18 1120.21 193.12 1119.87 193C1119.55 192.892 1119.28 192.772 1119.08 192.64C1118.84 192.484 1118.64 192.304 1118.49 192.1H1118.4V196.6H1116.15V183.82ZM1120.74 191.11C1121.42 191.11 1121.98 190.876 1122.41 190.408C1122.85 189.94 1123.08 189.274 1123.08 188.41C1123.08 187.546 1122.85 186.88 1122.41 186.412C1121.98 185.944 1121.42 185.71 1120.74 185.71C1120.05 185.71 1119.49 185.944 1119.04 186.412C1118.61 186.88 1118.4 187.546 1118.4 188.41C1118.4 189.274 1118.61 189.94 1119.04 190.408C1119.49 190.876 1120.05 191.11 1120.74 191.11ZM1130.82 193.18C1130.3 193.18 1129.82 193.09 1129.38 192.91C1128.95 192.718 1128.57 192.454 1128.25 192.118C1127.92 191.782 1127.67 191.38 1127.49 190.912C1127.31 190.432 1127.22 189.898 1127.22 189.31V183.82H1129.47V189.13C1129.47 189.718 1129.65 190.198 1130.01 190.57C1130.38 190.93 1130.86 191.11 1131.45 191.11C1132.04 191.11 1132.51 190.93 1132.87 190.57C1133.24 190.198 1133.43 189.718 1133.43 189.13V183.82H1135.68V193H1133.61L1133.43 192.1H1133.34C1133.17 192.304 1132.97 192.484 1132.73 192.64C1132.52 192.772 1132.26 192.892 1131.94 193C1131.61 193.12 1131.24 193.18 1130.82 193.18ZM1141.07 193C1140.31 193 1139.72 192.814 1139.33 192.442C1138.93 192.058 1138.73 191.524 1138.73 190.84V185.98H1137.29V183.82H1138.73V181.21H1140.98V183.82H1143.05V185.98H1140.98V190.39C1140.98 190.81 1141.19 191.02 1141.61 191.02H1143.05V193H1141.07Z" fill="#171717"/>
+<path d="M1057.2 207.8H1062.24C1062.7 207.8 1063.13 207.885 1063.52 208.056C1063.93 208.227 1064.27 208.472 1064.56 208.792C1064.86 209.101 1065.09 209.48 1065.26 209.928C1065.43 210.365 1065.52 210.856 1065.52 211.4C1065.52 211.944 1065.43 212.44 1065.26 212.888C1065.09 213.325 1064.86 213.704 1064.56 214.024C1064.27 214.333 1063.93 214.573 1063.52 214.744C1063.13 214.915 1062.7 215 1062.24 215H1058.88V219H1057.2V207.8ZM1062.16 213.4C1062.38 213.4 1062.6 213.352 1062.8 213.256C1063 213.16 1063.18 213.027 1063.33 212.856C1063.49 212.675 1063.61 212.461 1063.7 212.216C1063.79 211.971 1063.84 211.699 1063.84 211.4C1063.84 211.101 1063.79 210.829 1063.7 210.584C1063.61 210.339 1063.49 210.131 1063.33 209.96C1063.18 209.779 1063 209.64 1062.8 209.544C1062.6 209.448 1062.38 209.4 1062.16 209.4H1058.88V213.4H1062.16ZM1067.43 207.8H1069.11V219H1067.43V207.8ZM1071.51 207.8H1073.99L1078.55 216.52H1078.87V207.8H1080.55V219H1078.07L1073.51 210.28H1073.19V219H1071.51V207.8ZM1082.79 217.16H1084.63L1083.75 220.36H1082.47L1082.79 217.16ZM1090.32 211H1091.76L1091.92 211.96H1092C1092.07 211.885 1092.16 211.784 1092.27 211.656C1092.4 211.528 1092.56 211.405 1092.75 211.288C1092.96 211.16 1093.2 211.053 1093.47 210.968C1093.76 210.883 1094.1 210.84 1094.48 210.84C1095 210.84 1095.49 210.936 1095.94 211.128C1096.39 211.32 1096.77 211.597 1097.11 211.96C1097.44 212.323 1097.69 212.76 1097.87 213.272C1098.07 213.784 1098.16 214.36 1098.16 215C1098.16 215.64 1098.07 216.216 1097.87 216.728C1097.69 217.24 1097.44 217.677 1097.11 218.04C1096.77 218.403 1096.39 218.68 1095.94 218.872C1095.49 219.064 1095 219.16 1094.48 219.16C1094.1 219.16 1093.76 219.117 1093.47 219.032C1093.2 218.947 1092.96 218.845 1092.75 218.728C1092.56 218.6 1092.4 218.477 1092.27 218.36C1092.16 218.232 1092.07 218.125 1092 218.04H1091.92V222.2H1090.32V211ZM1094.24 217.72C1094.56 217.72 1094.86 217.656 1095.14 217.528C1095.43 217.4 1095.67 217.219 1095.87 216.984C1096.09 216.749 1096.25 216.467 1096.37 216.136C1096.5 215.795 1096.56 215.416 1096.56 215C1096.56 214.584 1096.5 214.211 1096.37 213.88C1096.25 213.539 1096.09 213.251 1095.87 213.016C1095.67 212.781 1095.43 212.6 1095.14 212.472C1094.86 212.344 1094.56 212.28 1094.24 212.28C1093.92 212.28 1093.62 212.344 1093.33 212.472C1093.05 212.6 1092.81 212.781 1092.59 213.016C1092.39 213.251 1092.23 213.539 1092.1 213.88C1091.98 214.211 1091.92 214.584 1091.92 215C1091.92 215.416 1091.98 215.795 1092.1 216.136C1092.23 216.467 1092.39 216.749 1092.59 216.984C1092.81 217.219 1093.05 217.4 1093.33 217.528C1093.62 217.656 1093.92 217.72 1094.24 217.72ZM1102.4 219.16C1101.96 219.16 1101.56 219.101 1101.2 218.984C1100.84 218.856 1100.54 218.685 1100.28 218.472C1100.04 218.248 1099.85 217.987 1099.71 217.688C1099.58 217.379 1099.52 217.043 1099.52 216.68C1099.52 215.88 1099.78 215.24 1100.32 214.76C1100.85 214.28 1101.68 214.04 1102.8 214.04H1104.8V213.88C1104.8 213.357 1104.65 212.947 1104.35 212.648C1104.05 212.349 1103.64 212.2 1103.12 212.2C1102.84 212.2 1102.6 212.237 1102.4 212.312C1102.19 212.376 1102.02 212.467 1101.88 212.584C1101.75 212.691 1101.64 212.813 1101.56 212.952C1101.5 213.08 1101.46 213.203 1101.44 213.32H1099.84C1099.86 212.979 1099.94 212.659 1100.09 212.36C1100.25 212.061 1100.47 211.8 1100.75 211.576C1101.04 211.352 1101.38 211.176 1101.77 211.048C1102.17 210.909 1102.62 210.84 1103.12 210.84C1104.16 210.84 1104.97 211.117 1105.53 211.672C1106.11 212.216 1106.4 212.952 1106.4 213.88V219H1105.04L1104.88 218.12H1104.8C1104.64 218.323 1104.44 218.499 1104.22 218.648C1104.03 218.776 1103.78 218.893 1103.47 219C1103.17 219.107 1102.81 219.16 1102.4 219.16ZM1102.56 217.8C1103.28 217.8 1103.84 217.613 1104.22 217.24C1104.6 216.856 1104.8 216.323 1104.8 215.64V215.32H1102.88C1102.27 215.32 1101.82 215.443 1101.53 215.688C1101.26 215.933 1101.12 216.237 1101.12 216.6C1101.12 216.963 1101.23 217.256 1101.47 217.48C1101.71 217.693 1102.08 217.8 1102.56 217.8ZM1111.28 219.16C1110.64 219.16 1110.1 219.069 1109.66 218.888C1109.23 218.696 1108.87 218.472 1108.59 218.216C1108.32 217.949 1108.13 217.672 1108.02 217.384C1107.9 217.085 1107.84 216.824 1107.84 216.6H1109.44C1109.44 216.717 1109.47 216.851 1109.54 217C1109.61 217.139 1109.72 217.267 1109.87 217.384C1110.03 217.501 1110.22 217.603 1110.45 217.688C1110.68 217.763 1110.96 217.8 1111.28 217.8C1111.88 217.8 1112.3 217.688 1112.56 217.464C1112.83 217.24 1112.96 217.005 1112.96 216.76C1112.96 216.483 1112.87 216.259 1112.69 216.088C1112.52 215.917 1112.21 215.795 1111.76 215.72L1110.32 215.48C1109.55 215.352 1108.97 215.107 1108.58 214.744C1108.19 214.371 1108 213.843 1108 213.16C1108 212.84 1108.06 212.541 1108.19 212.264C1108.33 211.976 1108.53 211.731 1108.78 211.528C1109.05 211.315 1109.38 211.149 1109.78 211.032C1110.18 210.904 1110.66 210.84 1111.2 210.84C1111.78 210.84 1112.27 210.931 1112.69 211.112C1113.1 211.283 1113.44 211.496 1113.71 211.752C1113.98 212.008 1114.17 212.28 1114.29 212.568C1114.42 212.845 1114.48 213.096 1114.48 213.32H1112.88C1112.88 213.203 1112.85 213.08 1112.78 212.952C1112.72 212.813 1112.62 212.691 1112.48 212.584C1112.35 212.467 1112.18 212.376 1111.97 212.312C1111.75 212.237 1111.5 212.2 1111.2 212.2C1110.63 212.2 1110.22 212.301 1109.97 212.504C1109.72 212.696 1109.6 212.915 1109.6 213.16C1109.6 213.405 1109.71 213.608 1109.92 213.768C1110.14 213.928 1110.44 214.045 1110.8 214.12L1112.24 214.36C1113.79 214.616 1114.56 215.416 1114.56 216.76C1114.56 217.08 1114.49 217.384 1114.35 217.672C1114.22 217.96 1114.03 218.216 1113.76 218.44C1113.49 218.664 1113.15 218.84 1112.74 218.968C1112.32 219.096 1111.83 219.16 1111.28 219.16ZM1119.05 219.16C1118.41 219.16 1117.87 219.069 1117.43 218.888C1116.99 218.696 1116.63 218.472 1116.36 218.216C1116.09 217.949 1115.9 217.672 1115.78 217.384C1115.66 217.085 1115.61 216.824 1115.61 216.6H1117.21C1117.21 216.717 1117.24 216.851 1117.3 217C1117.38 217.139 1117.49 217.267 1117.64 217.384C1117.8 217.501 1117.99 217.603 1118.21 217.688C1118.45 217.763 1118.73 217.8 1119.05 217.8C1119.64 217.8 1120.07 217.688 1120.33 217.464C1120.59 217.24 1120.73 217.005 1120.73 216.76C1120.73 216.483 1120.63 216.259 1120.45 216.088C1120.28 215.917 1119.97 215.795 1119.53 215.72L1118.09 215.48C1117.32 215.352 1116.74 215.107 1116.34 214.744C1115.96 214.371 1115.77 213.843 1115.77 213.16C1115.77 212.84 1115.83 212.541 1115.96 212.264C1116.1 211.976 1116.29 211.731 1116.55 211.528C1116.82 211.315 1117.15 211.149 1117.54 211.032C1117.95 210.904 1118.42 210.84 1118.97 210.84C1119.54 210.84 1120.04 210.931 1120.45 211.112C1120.87 211.283 1121.21 211.496 1121.48 211.752C1121.74 212.008 1121.94 212.28 1122.05 212.568C1122.18 212.845 1122.25 213.096 1122.25 213.32H1120.65C1120.65 213.203 1120.61 213.08 1120.55 212.952C1120.49 212.813 1120.38 212.691 1120.25 212.584C1120.12 212.467 1119.95 212.376 1119.73 212.312C1119.52 212.237 1119.26 212.2 1118.97 212.2C1118.4 212.2 1117.99 212.301 1117.73 212.504C1117.49 212.696 1117.37 212.915 1117.37 213.16C1117.37 213.405 1117.47 213.608 1117.69 213.768C1117.91 213.928 1118.2 214.045 1118.57 214.12L1120.01 214.36C1121.55 214.616 1122.33 215.416 1122.33 216.76C1122.33 217.08 1122.26 217.384 1122.12 217.672C1121.99 217.96 1121.79 218.216 1121.53 218.44C1121.26 218.664 1120.92 218.84 1120.5 218.968C1120.09 219.096 1119.6 219.16 1119.05 219.16ZM1123.93 211H1125.37L1125.53 211.96H1125.61C1125.67 211.885 1125.77 211.784 1125.88 211.656C1126.01 211.528 1126.17 211.405 1126.36 211.288C1126.57 211.16 1126.81 211.053 1127.08 210.968C1127.37 210.883 1127.71 210.84 1128.09 210.84C1128.61 210.84 1129.1 210.936 1129.55 211.128C1129.99 211.32 1130.38 211.597 1130.71 211.96C1131.05 212.323 1131.3 212.76 1131.48 213.272C1131.67 213.784 1131.77 214.36 1131.77 215C1131.77 215.64 1131.67 216.216 1131.48 216.728C1131.3 217.24 1131.05 217.677 1130.71 218.04C1130.38 218.403 1129.99 218.68 1129.55 218.872C1129.1 219.064 1128.61 219.16 1128.09 219.16C1127.71 219.16 1127.37 219.117 1127.08 219.032C1126.81 218.947 1126.57 218.845 1126.36 218.728C1126.17 218.6 1126.01 218.477 1125.88 218.36C1125.77 218.232 1125.67 218.125 1125.61 218.04H1125.53V222.2H1123.93V211ZM1127.85 217.72C1128.17 217.72 1128.47 217.656 1128.75 217.528C1129.03 217.4 1129.28 217.219 1129.48 216.984C1129.7 216.749 1129.86 216.467 1129.98 216.136C1130.11 215.795 1130.17 215.416 1130.17 215C1130.17 214.584 1130.11 214.211 1129.98 213.88C1129.86 213.539 1129.7 213.251 1129.48 213.016C1129.28 212.781 1129.03 212.6 1128.75 212.472C1128.47 212.344 1128.17 212.28 1127.85 212.28C1127.53 212.28 1127.23 212.344 1126.94 212.472C1126.66 212.6 1126.42 212.781 1126.2 213.016C1126 213.251 1125.83 213.539 1125.71 213.88C1125.59 214.211 1125.53 214.584 1125.53 215C1125.53 215.416 1125.59 215.795 1125.71 216.136C1125.83 216.467 1126 216.749 1126.2 216.984C1126.42 217.219 1126.66 217.4 1126.94 217.528C1127.23 217.656 1127.53 217.72 1127.85 217.72ZM1133.53 207.8H1135.13V211.8H1135.21C1135.38 211.619 1135.57 211.459 1135.8 211.32C1135.99 211.203 1136.23 211.096 1136.52 211C1136.81 210.893 1137.14 210.84 1137.53 210.84C1138.01 210.84 1138.44 210.92 1138.84 211.08C1139.23 211.229 1139.57 211.448 1139.85 211.736C1140.12 212.024 1140.34 212.376 1140.49 212.792C1140.65 213.208 1140.73 213.677 1140.73 214.2V219H1139.13V214.2C1139.13 213.944 1139.08 213.699 1138.98 213.464C1138.89 213.229 1138.75 213.027 1138.58 212.856C1138.41 212.675 1138.21 212.536 1137.97 212.44C1137.74 212.333 1137.48 212.28 1137.21 212.28C1136.91 212.28 1136.63 212.333 1136.37 212.44C1136.12 212.536 1135.9 212.675 1135.72 212.856C1135.54 213.027 1135.39 213.229 1135.29 213.464C1135.18 213.699 1135.13 213.944 1135.13 214.2V219H1133.53V207.8ZM1142.73 211H1144.09L1144.25 211.72H1144.33C1144.39 211.645 1144.46 211.565 1144.54 211.48C1144.61 211.395 1144.7 211.315 1144.81 211.24C1144.92 211.165 1145.06 211.107 1145.22 211.064C1145.39 211.021 1145.6 211 1145.85 211H1147.29V212.44H1146.01C1144.89 212.44 1144.33 212.995 1144.33 214.104V219H1142.73V211ZM1150.74 219.16C1150.3 219.16 1149.9 219.101 1149.54 218.984C1149.19 218.856 1148.88 218.685 1148.63 218.472C1148.38 218.248 1148.19 217.987 1148.05 217.688C1147.92 217.379 1147.86 217.043 1147.86 216.68C1147.86 215.88 1148.13 215.24 1148.66 214.76C1149.19 214.28 1150.02 214.04 1151.14 214.04H1153.14V213.88C1153.14 213.357 1152.99 212.947 1152.69 212.648C1152.39 212.349 1151.98 212.2 1151.46 212.2C1151.18 212.2 1150.94 212.237 1150.74 212.312C1150.54 212.376 1150.37 212.467 1150.23 212.584C1150.09 212.691 1149.98 212.813 1149.91 212.952C1149.84 213.08 1149.8 213.203 1149.78 213.32H1148.18C1148.2 212.979 1148.29 212.659 1148.44 212.36C1148.6 212.061 1148.82 211.8 1149.09 211.576C1149.38 211.352 1149.72 211.176 1150.12 211.048C1150.51 210.909 1150.96 210.84 1151.46 210.84C1152.51 210.84 1153.31 211.117 1153.88 211.672C1154.45 212.216 1154.74 212.952 1154.74 213.88V219H1153.38L1153.22 218.12H1153.14C1152.98 218.323 1152.79 218.499 1152.56 218.648C1152.37 218.776 1152.12 218.893 1151.81 219C1151.51 219.107 1151.16 219.16 1150.74 219.16ZM1150.9 217.8C1151.63 217.8 1152.18 217.613 1152.56 217.24C1152.95 216.856 1153.14 216.323 1153.14 215.64V215.32H1151.22C1150.61 215.32 1150.16 215.443 1149.88 215.688C1149.6 215.933 1149.46 216.237 1149.46 216.6C1149.46 216.963 1149.58 217.256 1149.81 217.48C1150.06 217.693 1150.42 217.8 1150.9 217.8ZM1159.62 219.16C1158.98 219.16 1158.44 219.069 1158.01 218.888C1157.57 218.696 1157.21 218.472 1156.94 218.216C1156.67 217.949 1156.48 217.672 1156.36 217.384C1156.24 217.085 1156.18 216.824 1156.18 216.6H1157.78C1157.78 216.717 1157.82 216.851 1157.88 217C1157.95 217.139 1158.07 217.267 1158.22 217.384C1158.38 217.501 1158.57 217.603 1158.79 217.688C1159.03 217.763 1159.3 217.8 1159.62 217.8C1160.22 217.8 1160.65 217.688 1160.9 217.464C1161.17 217.24 1161.3 217.005 1161.3 216.76C1161.3 216.483 1161.21 216.259 1161.03 216.088C1160.86 215.917 1160.55 215.795 1160.1 215.72L1158.66 215.48C1157.9 215.352 1157.31 215.107 1156.92 214.744C1156.54 214.371 1156.34 213.843 1156.34 213.16C1156.34 212.84 1156.41 212.541 1156.54 212.264C1156.67 211.976 1156.87 211.731 1157.13 211.528C1157.39 211.315 1157.72 211.149 1158.12 211.032C1158.52 210.904 1159 210.84 1159.54 210.84C1160.12 210.84 1160.62 210.931 1161.03 211.112C1161.45 211.283 1161.79 211.496 1162.06 211.752C1162.32 212.008 1162.51 212.28 1162.63 212.568C1162.76 212.845 1162.82 213.096 1162.82 213.32H1161.22C1161.22 213.203 1161.19 213.08 1161.13 212.952C1161.06 212.813 1160.96 212.691 1160.82 212.584C1160.7 212.467 1160.52 212.376 1160.31 212.312C1160.1 212.237 1159.84 212.2 1159.54 212.2C1158.98 212.2 1158.57 212.301 1158.31 212.504C1158.07 212.696 1157.94 212.915 1157.94 213.16C1157.94 213.405 1158.05 213.608 1158.26 213.768C1158.49 213.928 1158.78 214.045 1159.14 214.12L1160.58 214.36C1162.13 214.616 1162.9 215.416 1162.9 216.76C1162.9 217.08 1162.83 217.384 1162.7 217.672C1162.57 217.96 1162.37 218.216 1162.1 218.44C1161.84 218.664 1161.5 218.84 1161.08 218.968C1160.66 219.096 1160.18 219.16 1159.62 219.16ZM1168.11 219.16C1167.53 219.16 1167 219.059 1166.51 218.856C1166.02 218.653 1165.59 218.371 1165.23 218.008C1164.88 217.645 1164.6 217.208 1164.4 216.696C1164.2 216.184 1164.11 215.619 1164.11 215C1164.11 214.381 1164.2 213.816 1164.4 213.304C1164.6 212.792 1164.88 212.355 1165.23 211.992C1165.59 211.629 1166.02 211.347 1166.51 211.144C1167 210.941 1167.53 210.84 1168.11 210.84C1168.65 210.84 1169.15 210.941 1169.61 211.144C1170.08 211.336 1170.49 211.608 1170.83 211.96C1171.18 212.312 1171.45 212.728 1171.64 213.208C1171.85 213.688 1171.95 214.205 1171.95 214.76C1171.95 214.877 1171.94 214.984 1171.93 215.08C1171.92 215.176 1171.91 215.261 1171.9 215.336C1171.89 215.421 1171.88 215.496 1171.87 215.56H1165.71C1165.79 216.243 1166.06 216.787 1166.49 217.192C1166.93 217.597 1167.47 217.8 1168.11 217.8C1168.34 217.8 1168.56 217.768 1168.76 217.704C1168.98 217.64 1169.16 217.555 1169.32 217.448C1169.5 217.341 1169.64 217.224 1169.76 217.096C1169.87 216.957 1169.96 216.819 1170.03 216.68H1171.71C1171.61 216.936 1171.47 217.213 1171.28 217.512C1171.08 217.8 1170.84 218.067 1170.54 218.312C1170.24 218.557 1169.89 218.76 1169.48 218.92C1169.09 219.08 1168.63 219.16 1168.11 219.16ZM1170.43 214.36C1170.34 213.72 1170.09 213.203 1169.68 212.808C1169.27 212.403 1168.75 212.2 1168.11 212.2C1167.43 212.2 1166.88 212.403 1166.48 212.808C1166.08 213.203 1165.83 213.72 1165.71 214.36H1170.43Z" fill="#616161"/>
+<path d="M970.293 198.293C969.902 198.683 969.902 199.317 970.293 199.707L976.657 206.071C977.047 206.462 977.681 206.462 978.071 206.071C978.462 205.681 978.462 205.047 978.071 204.657L972.414 199L978.071 193.343C978.462 192.953 978.462 192.319 978.071 191.929C977.681 191.538 977.047 191.538 976.657 191.929L970.293 198.293ZM1040 198H971V200H1040V198Z" fill="#333333"/>
+<rect x="647" y="157" width="323" height="132" rx="8" fill="#C6E7DD"/>
+<rect x="667" y="181" width="114" height="84" rx="4" fill="#189A73"/>
+<path d="M710.32 216.18C709.468 216.18 708.67 216.024 707.926 215.712C707.182 215.388 706.534 214.938 705.982 214.362C705.43 213.786 704.992 213.102 704.668 212.31C704.356 211.518 704.2 210.648 704.2 209.7C704.2 208.752 704.356 207.882 704.668 207.09C704.992 206.298 705.43 205.614 705.982 205.038C706.534 204.462 707.182 204.018 707.926 203.706C708.67 203.382 709.468 203.22 710.32 203.22C711.244 203.22 712.042 203.382 712.714 203.706C713.386 204.018 713.95 204.408 714.406 204.876C714.862 205.344 715.216 205.842 715.468 206.37C715.72 206.898 715.894 207.378 715.99 207.81H713.56C713.464 207.558 713.332 207.3 713.164 207.036C712.996 206.76 712.78 206.508 712.516 206.28C712.252 206.04 711.934 205.848 711.562 205.704C711.202 205.548 710.788 205.47 710.32 205.47C709.78 205.47 709.276 205.572 708.808 205.776C708.352 205.968 707.956 206.25 707.62 206.622C707.284 206.982 707.02 207.426 706.828 207.954C706.636 208.47 706.54 209.052 706.54 209.7C706.54 210.348 706.636 210.936 706.828 211.464C707.02 211.98 707.284 212.424 707.62 212.796C707.956 213.156 708.352 213.438 708.808 213.642C709.276 213.834 709.78 213.93 710.32 213.93C710.788 213.93 711.202 213.858 711.562 213.714C711.934 213.558 712.252 213.36 712.516 213.12C712.78 212.88 712.996 212.622 713.164 212.346C713.332 212.058 713.464 211.776 713.56 211.5H715.99C715.942 211.74 715.858 212.022 715.738 212.346C715.63 212.67 715.474 213.006 715.27 213.354C715.078 213.702 714.832 214.044 714.532 214.38C714.244 214.716 713.896 215.022 713.488 215.298C713.08 215.562 712.612 215.778 712.084 215.946C711.568 216.102 710.98 216.18 710.32 216.18ZM722.026 216.18C721.354 216.18 720.73 216.066 720.154 215.838C719.578 215.598 719.08 215.268 718.66 214.848C718.252 214.416 717.928 213.912 717.688 213.336C717.46 212.748 717.346 212.106 717.346 211.41C717.346 210.714 717.46 210.078 717.688 209.502C717.928 208.914 718.252 208.41 718.66 207.99C719.08 207.558 719.578 207.228 720.154 207C720.73 206.76 721.354 206.64 722.026 206.64C722.698 206.64 723.322 206.76 723.898 207C724.474 207.228 724.966 207.558 725.374 207.99C725.794 208.41 726.118 208.914 726.346 209.502C726.586 210.078 726.706 210.714 726.706 211.41C726.706 212.106 726.586 212.748 726.346 213.336C726.118 213.912 725.794 214.416 725.374 214.848C724.966 215.268 724.474 215.598 723.898 215.838C723.322 216.066 722.698 216.18 722.026 216.18ZM722.026 214.11C722.362 214.11 722.674 214.044 722.962 213.912C723.262 213.78 723.52 213.6 723.736 213.372C723.964 213.132 724.138 212.85 724.258 212.526C724.39 212.19 724.456 211.818 724.456 211.41C724.456 211.002 724.39 210.636 724.258 210.312C724.138 209.976 723.964 209.694 723.736 209.466C723.52 209.226 723.262 209.04 722.962 208.908C722.674 208.776 722.362 208.71 722.026 208.71C721.69 208.71 721.372 208.776 721.072 208.908C720.784 209.04 720.526 209.226 720.298 209.466C720.082 209.694 719.908 209.976 719.776 210.312C719.656 210.636 719.596 211.002 719.596 211.41C719.596 211.818 719.656 212.19 719.776 212.526C719.908 212.85 720.082 213.132 720.298 213.372C720.526 213.6 720.784 213.78 721.072 213.912C721.372 214.044 721.69 214.11 722.026 214.11ZM728.589 206.82H730.479L730.659 207.63H730.749C730.857 207.486 730.989 207.354 731.145 207.234C731.277 207.138 731.445 207.048 731.649 206.964C731.853 206.868 732.093 206.82 732.369 206.82H734.169V208.98H732.549C731.409 208.98 730.839 209.55 730.839 210.69V216H728.589V206.82ZM739.393 216.18C738.721 216.18 738.097 216.066 737.521 215.838C736.945 215.598 736.447 215.268 736.027 214.848C735.619 214.416 735.295 213.912 735.055 213.336C734.827 212.748 734.713 212.106 734.713 211.41C734.713 210.714 734.827 210.078 735.055 209.502C735.295 208.914 735.619 208.41 736.027 207.99C736.447 207.558 736.945 207.228 737.521 207C738.097 206.76 738.721 206.64 739.393 206.64C740.017 206.64 740.605 206.76 741.157 207C741.709 207.228 742.183 207.546 742.579 207.954C742.987 208.362 743.305 208.848 743.533 209.412C743.773 209.976 743.893 210.582 743.893 211.23C743.893 211.362 743.887 211.482 743.875 211.59C743.863 211.698 743.851 211.794 743.839 211.878C743.827 211.974 743.815 212.058 743.803 212.13H736.963C737.059 212.766 737.329 213.288 737.773 213.696C738.217 214.092 738.757 214.29 739.393 214.29C739.657 214.29 739.897 214.254 740.113 214.182C740.329 214.11 740.515 214.026 740.671 213.93C740.827 213.834 740.953 213.732 741.049 213.624C741.157 213.504 741.235 213.396 741.283 213.3H743.623C743.575 213.48 743.461 213.732 743.281 214.056C743.113 214.38 742.861 214.698 742.525 215.01C742.189 215.322 741.763 215.598 741.247 215.838C740.731 216.066 740.113 216.18 739.393 216.18ZM741.643 210.6C741.547 210.012 741.307 209.52 740.923 209.124C740.539 208.728 740.029 208.53 739.393 208.53C738.709 208.53 738.163 208.728 737.755 209.124C737.359 209.52 737.095 210.012 736.963 210.6H741.643ZM689.216 242.18C688.4 242.18 687.674 242.078 687.038 241.874C686.414 241.658 685.88 241.364 685.436 240.992C684.992 240.62 684.656 240.182 684.428 239.678C684.2 239.174 684.086 238.628 684.086 238.04H686.426C686.426 238.316 686.492 238.574 686.624 238.814C686.756 239.054 686.942 239.264 687.182 239.444C687.422 239.624 687.71 239.768 688.046 239.876C688.394 239.972 688.784 240.02 689.216 240.02C690.116 240.02 690.758 239.864 691.142 239.552C691.538 239.24 691.736 238.856 691.736 238.4C691.736 238.22 691.7 238.046 691.628 237.878C691.568 237.71 691.46 237.56 691.304 237.428C691.148 237.284 690.938 237.158 690.674 237.05C690.41 236.942 690.074 236.852 689.666 236.78L687.506 236.42C686.414 236.24 685.616 235.85 685.112 235.25C684.608 234.65 684.356 233.9 684.356 233C684.356 232.484 684.458 231.998 684.662 231.542C684.878 231.074 685.184 230.672 685.58 230.336C685.976 229.988 686.462 229.718 687.038 229.526C687.626 229.322 688.292 229.22 689.036 229.22C689.84 229.22 690.548 229.328 691.16 229.544C691.772 229.748 692.276 230.036 692.672 230.408C693.08 230.78 693.386 231.218 693.59 231.722C693.794 232.226 693.896 232.772 693.896 233.36H691.556C691.556 232.82 691.34 232.358 690.908 231.974C690.476 231.578 689.852 231.38 689.036 231.38C688.22 231.38 687.626 231.536 687.254 231.848C686.882 232.16 686.696 232.544 686.696 233C686.696 233.36 686.81 233.66 687.038 233.9C687.278 234.14 687.734 234.32 688.406 234.44L690.386 234.8C691.658 235.028 692.588 235.424 693.176 235.988C693.776 236.552 694.076 237.356 694.076 238.4C694.076 238.94 693.974 239.444 693.77 239.912C693.566 240.368 693.26 240.764 692.852 241.1C692.456 241.436 691.952 241.7 691.34 241.892C690.728 242.084 690.02 242.18 689.216 242.18ZM696.232 229.4H700.822C701.674 229.4 702.472 229.562 703.216 229.886C703.96 230.198 704.608 230.636 705.16 231.2C705.712 231.764 706.144 232.43 706.456 233.198C706.78 233.966 706.942 234.8 706.942 235.7C706.942 236.6 706.78 237.434 706.456 238.202C706.144 238.97 705.712 239.636 705.16 240.2C704.608 240.764 703.96 241.208 703.216 241.532C702.472 241.844 701.674 242 700.822 242H696.232V229.4ZM700.822 239.75C701.362 239.75 701.86 239.654 702.316 239.462C702.784 239.27 703.186 239 703.522 238.652C703.858 238.292 704.122 237.866 704.314 237.374C704.506 236.87 704.602 236.312 704.602 235.7C704.602 235.088 704.506 234.536 704.314 234.044C704.122 233.54 703.858 233.114 703.522 232.766C703.186 232.406 702.784 232.13 702.316 231.938C701.86 231.746 701.362 231.65 700.822 231.65H698.572V239.75H700.822ZM709.099 229.4H711.439V235.07L715.759 229.4H718.639L713.869 235.61L718.999 242H716.119L711.439 236.15V242H709.099V229.4ZM724.407 229.4H726.657V242H724.407V229.4ZM733.311 242.18C732.639 242.18 732.015 242.066 731.439 241.838C730.863 241.598 730.365 241.268 729.945 240.848C729.537 240.416 729.213 239.912 728.973 239.336C728.745 238.748 728.631 238.106 728.631 237.41C728.631 236.714 728.745 236.078 728.973 235.502C729.213 234.914 729.537 234.41 729.945 233.99C730.365 233.558 730.863 233.228 731.439 233C732.015 232.76 732.639 232.64 733.311 232.64C733.983 232.64 734.607 232.76 735.183 233C735.759 233.228 736.251 233.558 736.659 233.99C737.079 234.41 737.403 234.914 737.631 235.502C737.871 236.078 737.991 236.714 737.991 237.41C737.991 238.106 737.871 238.748 737.631 239.336C737.403 239.912 737.079 240.416 736.659 240.848C736.251 241.268 735.759 241.598 735.183 241.838C734.607 242.066 733.983 242.18 733.311 242.18ZM733.311 240.11C733.647 240.11 733.959 240.044 734.247 239.912C734.547 239.78 734.805 239.6 735.021 239.372C735.249 239.132 735.423 238.85 735.543 238.526C735.675 238.19 735.741 237.818 735.741 237.41C735.741 237.002 735.675 236.636 735.543 236.312C735.423 235.976 735.249 235.694 735.021 235.466C734.805 235.226 734.547 235.04 734.247 234.908C733.959 234.776 733.647 234.71 733.311 234.71C732.975 234.71 732.657 234.776 732.357 234.908C732.069 235.04 731.811 235.226 731.583 235.466C731.367 235.694 731.193 235.976 731.061 236.312C730.941 236.636 730.881 237.002 730.881 237.41C730.881 237.818 730.941 238.19 731.061 238.526C731.193 238.85 731.367 239.132 731.583 239.372C731.811 239.6 732.069 239.78 732.357 239.912C732.657 240.044 732.975 240.11 733.311 240.11ZM744.014 245.78C743.114 245.78 742.382 245.636 741.818 245.348C741.254 245.06 740.816 244.724 740.504 244.34C740.192 243.968 739.976 243.596 739.856 243.224C739.748 242.864 739.694 242.606 739.694 242.45H742.034C742.058 242.558 742.106 242.69 742.178 242.846C742.25 243.002 742.364 243.152 742.52 243.296C742.676 243.44 742.874 243.56 743.114 243.656C743.354 243.752 743.654 243.8 744.014 243.8C744.65 243.8 745.166 243.614 745.562 243.242C745.97 242.87 746.174 242.366 746.174 241.73V240.47H746.084C745.916 240.662 745.712 240.83 745.472 240.974C745.268 241.106 745.004 241.22 744.68 241.316C744.356 241.412 743.984 241.46 743.564 241.46C742.976 241.46 742.43 241.352 741.926 241.136C741.422 240.92 740.984 240.62 740.612 240.236C740.24 239.852 739.946 239.39 739.73 238.85C739.526 238.298 739.424 237.698 739.424 237.05C739.424 236.402 739.526 235.808 739.73 235.268C739.946 234.716 740.24 234.248 740.612 233.864C740.984 233.48 741.422 233.18 741.926 232.964C742.43 232.748 742.976 232.64 743.564 232.64C744.02 232.64 744.41 232.7 744.734 232.82C745.058 232.928 745.328 233.048 745.544 233.18C745.796 233.336 746.006 233.516 746.174 233.72H746.264L746.444 232.82H748.424V241.748C748.424 242.348 748.322 242.894 748.118 243.386C747.914 243.89 747.62 244.316 747.236 244.664C746.852 245.024 746.384 245.3 745.832 245.492C745.292 245.684 744.686 245.78 744.014 245.78ZM743.924 239.48C744.236 239.48 744.53 239.42 744.806 239.3C745.082 239.18 745.322 239.018 745.526 238.814C745.73 238.598 745.886 238.34 745.994 238.04C746.114 237.74 746.174 237.41 746.174 237.05C746.174 236.69 746.114 236.36 745.994 236.06C745.886 235.76 745.73 235.508 745.526 235.304C745.322 235.088 745.082 234.92 744.806 234.8C744.53 234.68 744.236 234.62 743.924 234.62C743.612 234.62 743.318 234.68 743.042 234.8C742.766 234.92 742.526 235.088 742.322 235.304C742.118 235.508 741.956 235.76 741.836 236.06C741.728 236.36 741.674 236.69 741.674 237.05C741.674 237.41 741.728 237.74 741.836 238.04C741.956 238.34 742.118 238.598 742.322 238.814C742.526 239.018 742.766 239.18 743.042 239.3C743.318 239.42 743.612 239.48 743.924 239.48ZM750.773 232.82H753.023V242H750.773V232.82ZM750.683 229.22H753.113V231.38H750.683V229.22ZM759.59 242.18C758.918 242.18 758.294 242.066 757.718 241.838C757.142 241.598 756.644 241.268 756.224 240.848C755.816 240.416 755.492 239.912 755.252 239.336C755.024 238.748 754.91 238.106 754.91 237.41C754.91 236.714 755.024 236.078 755.252 235.502C755.492 234.914 755.816 234.41 756.224 233.99C756.644 233.558 757.142 233.228 757.718 233C758.294 232.76 758.918 232.64 759.59 232.64C760.31 232.64 760.928 232.76 761.444 233C761.96 233.24 762.386 233.54 762.722 233.9C763.07 234.248 763.334 234.626 763.514 235.034C763.706 235.442 763.838 235.814 763.91 236.15H761.66C761.612 236.018 761.54 235.868 761.444 235.7C761.348 235.532 761.216 235.376 761.048 235.232C760.892 235.088 760.694 234.968 760.454 234.872C760.214 234.764 759.926 234.71 759.59 234.71C759.254 234.71 758.936 234.776 758.636 234.908C758.348 235.04 758.09 235.226 757.862 235.466C757.646 235.694 757.472 235.976 757.34 236.312C757.22 236.636 757.16 237.002 757.16 237.41C757.16 237.818 757.22 238.19 757.34 238.526C757.472 238.85 757.646 239.132 757.862 239.372C758.09 239.6 758.348 239.78 758.636 239.912C758.936 240.044 759.254 240.11 759.59 240.11C759.926 240.11 760.214 240.062 760.454 239.966C760.694 239.858 760.892 239.732 761.048 239.588C761.216 239.432 761.348 239.264 761.444 239.084C761.54 238.904 761.612 238.736 761.66 238.58H763.91C763.838 238.94 763.706 239.33 763.514 239.75C763.334 240.17 763.07 240.56 762.722 240.92C762.386 241.28 761.96 241.58 761.444 241.82C760.928 242.06 760.31 242.18 759.59 242.18Z" fill="white"/>
+<path d="M845.718 216.18C844.866 216.18 844.068 216.024 843.324 215.712C842.58 215.388 841.932 214.938 841.38 214.362C840.828 213.786 840.39 213.102 840.066 212.31C839.754 211.518 839.598 210.648 839.598 209.7C839.598 208.752 839.754 207.882 840.066 207.09C840.39 206.298 840.828 205.614 841.38 205.038C841.932 204.462 842.58 204.018 843.324 203.706C844.068 203.382 844.866 203.22 845.718 203.22C846.642 203.22 847.44 203.382 848.112 203.706C848.784 204.018 849.348 204.408 849.804 204.876C850.26 205.344 850.614 205.842 850.866 206.37C851.118 206.898 851.292 207.378 851.388 207.81H848.958C848.862 207.558 848.73 207.3 848.562 207.036C848.394 206.76 848.178 206.508 847.914 206.28C847.65 206.04 847.332 205.848 846.96 205.704C846.6 205.548 846.186 205.47 845.718 205.47C845.178 205.47 844.674 205.572 844.206 205.776C843.75 205.968 843.354 206.25 843.018 206.622C842.682 206.982 842.418 207.426 842.226 207.954C842.034 208.47 841.938 209.052 841.938 209.7C841.938 210.348 842.034 210.936 842.226 211.464C842.418 211.98 842.682 212.424 843.018 212.796C843.354 213.156 843.75 213.438 844.206 213.642C844.674 213.834 845.178 213.93 845.718 213.93C846.186 213.93 846.6 213.858 846.96 213.714C847.332 213.558 847.65 213.36 847.914 213.12C848.178 212.88 848.394 212.622 848.562 212.346C848.73 212.058 848.862 211.776 848.958 211.5H851.388C851.34 211.74 851.256 212.022 851.136 212.346C851.028 212.67 850.872 213.006 850.668 213.354C850.476 213.702 850.23 214.044 849.93 214.38C849.642 214.716 849.294 215.022 848.886 215.298C848.478 215.562 848.01 215.778 847.482 215.946C846.966 216.102 846.378 216.18 845.718 216.18ZM857.424 216.18C856.752 216.18 856.128 216.066 855.552 215.838C854.976 215.598 854.478 215.268 854.058 214.848C853.65 214.416 853.326 213.912 853.086 213.336C852.858 212.748 852.744 212.106 852.744 211.41C852.744 210.714 852.858 210.078 853.086 209.502C853.326 208.914 853.65 208.41 854.058 207.99C854.478 207.558 854.976 207.228 855.552 207C856.128 206.76 856.752 206.64 857.424 206.64C858.096 206.64 858.72 206.76 859.296 207C859.872 207.228 860.364 207.558 860.772 207.99C861.192 208.41 861.516 208.914 861.744 209.502C861.984 210.078 862.104 210.714 862.104 211.41C862.104 212.106 861.984 212.748 861.744 213.336C861.516 213.912 861.192 214.416 860.772 214.848C860.364 215.268 859.872 215.598 859.296 215.838C858.72 216.066 858.096 216.18 857.424 216.18ZM857.424 214.11C857.76 214.11 858.072 214.044 858.36 213.912C858.66 213.78 858.918 213.6 859.134 213.372C859.362 213.132 859.536 212.85 859.656 212.526C859.788 212.19 859.854 211.818 859.854 211.41C859.854 211.002 859.788 210.636 859.656 210.312C859.536 209.976 859.362 209.694 859.134 209.466C858.918 209.226 858.66 209.04 858.36 208.908C858.072 208.776 857.76 208.71 857.424 208.71C857.088 208.71 856.77 208.776 856.47 208.908C856.182 209.04 855.924 209.226 855.696 209.466C855.48 209.694 855.306 209.976 855.174 210.312C855.054 210.636 854.994 211.002 854.994 211.41C854.994 211.818 855.054 212.19 855.174 212.526C855.306 212.85 855.48 213.132 855.696 213.372C855.924 213.6 856.182 213.78 856.47 213.912C856.77 214.044 857.088 214.11 857.424 214.11ZM863.987 206.82H866.057L866.237 207.72H866.327C866.495 207.516 866.699 207.336 866.939 207.18C867.143 207.048 867.401 206.928 867.713 206.82C868.037 206.7 868.415 206.64 868.847 206.64C869.363 206.64 869.837 206.736 870.269 206.928C870.713 207.108 871.097 207.366 871.421 207.702C871.745 208.038 871.997 208.446 872.177 208.926C872.357 209.394 872.447 209.922 872.447 210.51V216H870.197V210.69C870.197 210.102 870.011 209.628 869.639 209.268C869.279 208.896 868.805 208.71 868.217 208.71C867.629 208.71 867.149 208.896 866.777 209.268C866.417 209.628 866.237 210.102 866.237 210.69V216H863.987V206.82ZM874.692 206.82H876.762L876.942 207.72H877.032C877.2 207.516 877.404 207.336 877.644 207.18C877.848 207.048 878.106 206.928 878.418 206.82C878.742 206.7 879.12 206.64 879.552 206.64C880.068 206.64 880.542 206.736 880.974 206.928C881.418 207.108 881.802 207.366 882.126 207.702C882.45 208.038 882.702 208.446 882.882 208.926C883.062 209.394 883.152 209.922 883.152 210.51V216H880.902V210.69C880.902 210.102 880.716 209.628 880.344 209.268C879.984 208.896 879.51 208.71 878.922 208.71C878.334 208.71 877.854 208.896 877.482 209.268C877.122 209.628 876.942 210.102 876.942 210.69V216H874.692V206.82ZM889.628 216.18C888.956 216.18 888.332 216.066 887.756 215.838C887.18 215.598 886.682 215.268 886.262 214.848C885.854 214.416 885.53 213.912 885.29 213.336C885.062 212.748 884.948 212.106 884.948 211.41C884.948 210.714 885.062 210.078 885.29 209.502C885.53 208.914 885.854 208.41 886.262 207.99C886.682 207.558 887.18 207.228 887.756 207C888.332 206.76 888.956 206.64 889.628 206.64C890.252 206.64 890.84 206.76 891.392 207C891.944 207.228 892.418 207.546 892.814 207.954C893.222 208.362 893.54 208.848 893.768 209.412C894.008 209.976 894.128 210.582 894.128 211.23C894.128 211.362 894.122 211.482 894.11 211.59C894.098 211.698 894.086 211.794 894.074 211.878C894.062 211.974 894.05 212.058 894.038 212.13H887.198C887.294 212.766 887.564 213.288 888.008 213.696C888.452 214.092 888.992 214.29 889.628 214.29C889.892 214.29 890.132 214.254 890.348 214.182C890.564 214.11 890.75 214.026 890.906 213.93C891.062 213.834 891.188 213.732 891.284 213.624C891.392 213.504 891.47 213.396 891.518 213.3H893.858C893.81 213.48 893.696 213.732 893.516 214.056C893.348 214.38 893.096 214.698 892.76 215.01C892.424 215.322 891.998 215.598 891.482 215.838C890.966 216.066 890.348 216.18 889.628 216.18ZM891.878 210.6C891.782 210.012 891.542 209.52 891.158 209.124C890.774 208.728 890.264 208.53 889.628 208.53C888.944 208.53 888.398 208.728 887.99 209.124C887.594 209.52 887.33 210.012 887.198 210.6H891.878ZM900.245 216.18C899.573 216.18 898.949 216.066 898.373 215.838C897.797 215.598 897.299 215.268 896.879 214.848C896.471 214.416 896.147 213.912 895.907 213.336C895.679 212.748 895.565 212.106 895.565 211.41C895.565 210.714 895.679 210.078 895.907 209.502C896.147 208.914 896.471 208.41 896.879 207.99C897.299 207.558 897.797 207.228 898.373 207C898.949 206.76 899.573 206.64 900.245 206.64C900.965 206.64 901.583 206.76 902.099 207C902.615 207.24 903.041 207.54 903.377 207.9C903.725 208.248 903.989 208.626 904.169 209.034C904.361 209.442 904.493 209.814 904.565 210.15H902.315C902.267 210.018 902.195 209.868 902.099 209.7C902.003 209.532 901.871 209.376 901.703 209.232C901.547 209.088 901.349 208.968 901.109 208.872C900.869 208.764 900.581 208.71 900.245 208.71C899.909 208.71 899.591 208.776 899.291 208.908C899.003 209.04 898.745 209.226 898.517 209.466C898.301 209.694 898.127 209.976 897.995 210.312C897.875 210.636 897.815 211.002 897.815 211.41C897.815 211.818 897.875 212.19 897.995 212.526C898.127 212.85 898.301 213.132 898.517 213.372C898.745 213.6 899.003 213.78 899.291 213.912C899.591 214.044 899.909 214.11 900.245 214.11C900.581 214.11 900.869 214.062 901.109 213.966C901.349 213.858 901.547 213.732 901.703 213.588C901.871 213.432 902.003 213.264 902.099 213.084C902.195 212.904 902.267 212.736 902.315 212.58H904.565C904.493 212.94 904.361 213.33 904.169 213.75C903.989 214.17 903.725 214.56 903.377 214.92C903.041 215.28 902.615 215.58 902.099 215.82C901.583 216.06 900.965 216.18 900.245 216.18ZM909.428 216C908.66 216 908.078 215.814 907.682 215.442C907.286 215.058 907.088 214.524 907.088 213.84V208.98H905.648V206.82H907.088V204.21H909.338V206.82H911.408V208.98H909.338V213.39C909.338 213.81 909.548 214.02 909.968 214.02H911.408V216H909.428ZM849.49 229.4H855.16C855.748 229.4 856.282 229.502 856.762 229.706C857.254 229.898 857.674 230.18 858.022 230.552C858.37 230.912 858.64 231.356 858.832 231.884C859.024 232.4 859.12 232.982 859.12 233.63C859.12 234.278 859.024 234.866 858.832 235.394C858.64 235.91 858.37 236.354 858.022 236.726C857.674 237.086 857.254 237.368 856.762 237.572C856.282 237.764 855.748 237.86 855.16 237.86H851.83V242H849.49V229.4ZM855.07 235.61C855.574 235.61 855.982 235.442 856.294 235.106C856.618 234.758 856.78 234.266 856.78 233.63C856.78 232.994 856.618 232.508 856.294 232.172C855.982 231.824 855.574 231.65 855.07 231.65H851.83V235.61H855.07ZM864.526 242.18C863.854 242.18 863.23 242.066 862.654 241.838C862.078 241.598 861.58 241.268 861.16 240.848C860.752 240.416 860.428 239.912 860.188 239.336C859.96 238.748 859.846 238.106 859.846 237.41C859.846 236.714 859.96 236.078 860.188 235.502C860.428 234.914 860.752 234.41 861.16 233.99C861.58 233.558 862.078 233.228 862.654 233C863.23 232.76 863.854 232.64 864.526 232.64C865.198 232.64 865.822 232.76 866.398 233C866.974 233.228 867.466 233.558 867.874 233.99C868.294 234.41 868.618 234.914 868.846 235.502C869.086 236.078 869.206 236.714 869.206 237.41C869.206 238.106 869.086 238.748 868.846 239.336C868.618 239.912 868.294 240.416 867.874 240.848C867.466 241.268 866.974 241.598 866.398 241.838C865.822 242.066 865.198 242.18 864.526 242.18ZM864.526 240.11C864.862 240.11 865.174 240.044 865.462 239.912C865.762 239.78 866.02 239.6 866.236 239.372C866.464 239.132 866.638 238.85 866.758 238.526C866.89 238.19 866.956 237.818 866.956 237.41C866.956 237.002 866.89 236.636 866.758 236.312C866.638 235.976 866.464 235.694 866.236 235.466C866.02 235.226 865.762 235.04 865.462 234.908C865.174 234.776 864.862 234.71 864.526 234.71C864.19 234.71 863.872 234.776 863.572 234.908C863.284 235.04 863.026 235.226 862.798 235.466C862.582 235.694 862.408 235.976 862.276 236.312C862.156 236.636 862.096 237.002 862.096 237.41C862.096 237.818 862.156 238.19 862.276 238.526C862.408 238.85 862.582 239.132 862.798 239.372C863.026 239.6 863.284 239.78 863.572 239.912C863.872 240.044 864.19 240.11 864.526 240.11ZM871.089 232.82H873.159L873.339 233.81H873.429C873.597 233.594 873.807 233.402 874.059 233.234C874.275 233.09 874.545 232.958 874.869 232.838C875.193 232.706 875.583 232.64 876.039 232.64C876.627 232.64 877.173 232.754 877.677 232.982C878.193 233.21 878.643 233.534 879.027 233.954C879.411 234.362 879.711 234.86 879.927 235.448C880.155 236.036 880.269 236.69 880.269 237.41C880.269 238.13 880.155 238.784 879.927 239.372C879.711 239.96 879.411 240.464 879.027 240.884C878.643 241.292 878.193 241.61 877.677 241.838C877.173 242.066 876.627 242.18 876.039 242.18C875.559 242.18 875.151 242.12 874.815 242C874.491 241.892 874.227 241.772 874.023 241.64C873.783 241.484 873.585 241.304 873.429 241.1H873.339V245.6H871.089V232.82ZM875.679 240.11C876.363 240.11 876.921 239.876 877.353 239.408C877.797 238.94 878.019 238.274 878.019 237.41C878.019 236.546 877.797 235.88 877.353 235.412C876.921 234.944 876.363 234.71 875.679 234.71C874.995 234.71 874.431 234.944 873.987 235.412C873.555 235.88 873.339 236.546 873.339 237.41C873.339 238.274 873.555 238.94 873.987 239.408C874.431 239.876 874.995 240.11 875.679 240.11ZM885.763 242.18C885.247 242.18 884.767 242.09 884.323 241.91C883.891 241.718 883.513 241.454 883.189 241.118C882.865 240.782 882.613 240.38 882.433 239.912C882.253 239.432 882.163 238.898 882.163 238.31V232.82H884.413V238.13C884.413 238.718 884.593 239.198 884.953 239.57C885.325 239.93 885.805 240.11 886.393 240.11C886.981 240.11 887.455 239.93 887.815 239.57C888.187 239.198 888.373 238.718 888.373 238.13V232.82H890.623V242H888.553L888.373 241.1H888.283C888.115 241.304 887.911 241.484 887.671 241.64C887.467 241.772 887.203 241.892 886.879 242C886.555 242.12 886.183 242.18 885.763 242.18ZM892.956 232.82H895.026L895.206 233.81H895.296C895.464 233.594 895.674 233.402 895.926 233.234C896.142 233.09 896.412 232.958 896.736 232.838C897.06 232.706 897.45 232.64 897.906 232.64C898.494 232.64 899.04 232.754 899.544 232.982C900.06 233.21 900.51 233.534 900.894 233.954C901.278 234.362 901.578 234.86 901.794 235.448C902.022 236.036 902.136 236.69 902.136 237.41C902.136 238.13 902.022 238.784 901.794 239.372C901.578 239.96 901.278 240.464 900.894 240.884C900.51 241.292 900.06 241.61 899.544 241.838C899.04 242.066 898.494 242.18 897.906 242.18C897.426 242.18 897.018 242.12 896.682 242C896.358 241.892 896.094 241.772 895.89 241.64C895.65 241.484 895.452 241.304 895.296 241.1H895.206V245.6H892.956V232.82ZM897.546 240.11C898.23 240.11 898.788 239.876 899.22 239.408C899.664 238.94 899.886 238.274 899.886 237.41C899.886 236.546 899.664 235.88 899.22 235.412C898.788 234.944 898.23 234.71 897.546 234.71C896.862 234.71 896.298 234.944 895.854 235.412C895.422 235.88 895.206 236.546 895.206 237.41C895.206 238.274 895.422 238.94 895.854 239.408C896.298 239.876 896.862 240.11 897.546 240.11Z" fill="#171717"/>
+<rect x="651" y="373" width="146" height="60" rx="8" fill="#F6F6F6"/>
+<path d="M671.582 398.65H667.802V396.4H677.702V398.65H673.922V409H671.582V398.65ZM678.157 399.82H680.047L680.227 400.63H680.317C680.425 400.486 680.557 400.354 680.713 400.234C680.845 400.138 681.013 400.048 681.217 399.964C681.421 399.868 681.661 399.82 681.937 399.82H683.737V401.98H682.117C680.977 401.98 680.407 402.55 680.407 403.69V409H678.157V399.82ZM688.962 409.18C688.29 409.18 687.666 409.066 687.09 408.838C686.514 408.598 686.016 408.268 685.596 407.848C685.188 407.416 684.864 406.912 684.624 406.336C684.396 405.748 684.282 405.106 684.282 404.41C684.282 403.714 684.396 403.078 684.624 402.502C684.864 401.914 685.188 401.41 685.596 400.99C686.016 400.558 686.514 400.228 687.09 400C687.666 399.76 688.29 399.64 688.962 399.64C689.586 399.64 690.174 399.76 690.726 400C691.278 400.228 691.752 400.546 692.148 400.954C692.556 401.362 692.874 401.848 693.102 402.412C693.342 402.976 693.462 403.582 693.462 404.23C693.462 404.362 693.456 404.482 693.444 404.59C693.432 404.698 693.42 404.794 693.408 404.878C693.396 404.974 693.384 405.058 693.372 405.13H686.532C686.628 405.766 686.898 406.288 687.342 406.696C687.786 407.092 688.326 407.29 688.962 407.29C689.226 407.29 689.466 407.254 689.682 407.182C689.898 407.11 690.084 407.026 690.24 406.93C690.396 406.834 690.522 406.732 690.618 406.624C690.726 406.504 690.804 406.396 690.852 406.3H693.192C693.144 406.48 693.03 406.732 692.85 407.056C692.682 407.38 692.43 407.698 692.094 408.01C691.758 408.322 691.332 408.598 690.816 408.838C690.3 409.066 689.682 409.18 688.962 409.18ZM691.212 403.6C691.116 403.012 690.876 402.52 690.492 402.124C690.108 401.728 689.598 401.53 688.962 401.53C688.278 401.53 687.732 401.728 687.324 402.124C686.928 402.52 686.664 403.012 686.532 403.6H691.212ZM694.543 407.02L699.043 401.89H694.633V399.82H701.923V401.8L697.423 406.93H702.013V409H694.543V407.02ZM707.77 409.18C707.098 409.18 706.474 409.066 705.898 408.838C705.322 408.598 704.824 408.268 704.404 407.848C703.996 407.416 703.672 406.912 703.432 406.336C703.204 405.748 703.09 405.106 703.09 404.41C703.09 403.714 703.204 403.078 703.432 402.502C703.672 401.914 703.996 401.41 704.404 400.99C704.824 400.558 705.322 400.228 705.898 400C706.474 399.76 707.098 399.64 707.77 399.64C708.442 399.64 709.066 399.76 709.642 400C710.218 400.228 710.71 400.558 711.118 400.99C711.538 401.41 711.862 401.914 712.09 402.502C712.33 403.078 712.45 403.714 712.45 404.41C712.45 405.106 712.33 405.748 712.09 406.336C711.862 406.912 711.538 407.416 711.118 407.848C710.71 408.268 710.218 408.598 709.642 408.838C709.066 409.066 708.442 409.18 707.77 409.18ZM707.77 407.11C708.106 407.11 708.418 407.044 708.706 406.912C709.006 406.78 709.264 406.6 709.48 406.372C709.708 406.132 709.882 405.85 710.002 405.526C710.134 405.19 710.2 404.818 710.2 404.41C710.2 404.002 710.134 403.636 710.002 403.312C709.882 402.976 709.708 402.694 709.48 402.466C709.264 402.226 709.006 402.04 708.706 401.908C708.418 401.776 708.106 401.71 707.77 401.71C707.434 401.71 707.116 401.776 706.816 401.908C706.528 402.04 706.27 402.226 706.042 402.466C705.826 402.694 705.652 402.976 705.52 403.312C705.4 403.636 705.34 404.002 705.34 404.41C705.34 404.818 705.4 405.19 705.52 405.526C705.652 405.85 705.826 406.132 706.042 406.372C706.27 406.6 706.528 406.78 706.816 406.912C707.116 407.044 707.434 407.11 707.77 407.11ZM714.333 399.82H716.223L716.403 400.63H716.493C716.601 400.486 716.733 400.354 716.889 400.234C717.021 400.138 717.189 400.048 717.393 399.964C717.597 399.868 717.837 399.82 718.113 399.82H719.913V401.98H718.293C717.153 401.98 716.583 402.55 716.583 403.69V409H714.333V399.82ZM728.994 409.18C728.406 409.18 727.854 409.066 727.338 408.838C726.834 408.61 726.39 408.292 726.006 407.884C725.622 407.464 725.316 406.96 725.088 406.372C724.872 405.784 724.764 405.13 724.764 404.41C724.764 403.69 724.872 403.036 725.088 402.448C725.316 401.86 725.622 401.362 726.006 400.954C726.39 400.534 726.834 400.21 727.338 399.982C727.854 399.754 728.406 399.64 728.994 399.64C729.45 399.64 729.84 399.706 730.164 399.838C730.488 399.958 730.758 400.09 730.974 400.234C731.226 400.402 731.436 400.594 731.604 400.81H731.694V396.4H733.944V409H731.964L731.784 408.01H731.694C731.514 408.238 731.298 408.436 731.046 408.604C730.83 408.748 730.548 408.88 730.2 409C729.864 409.12 729.462 409.18 728.994 409.18ZM729.354 407.11C730.038 407.11 730.596 406.876 731.028 406.408C731.472 405.94 731.694 405.274 731.694 404.41C731.694 403.546 731.472 402.88 731.028 402.412C730.596 401.944 730.038 401.71 729.354 401.71C728.67 401.71 728.106 401.944 727.662 402.412C727.23 402.88 727.014 403.546 727.014 404.41C727.014 405.274 727.23 405.94 727.662 406.408C728.106 406.876 728.67 407.11 729.354 407.11ZM740.606 409.18C739.934 409.18 739.31 409.066 738.734 408.838C738.158 408.598 737.66 408.268 737.24 407.848C736.832 407.416 736.508 406.912 736.268 406.336C736.04 405.748 735.926 405.106 735.926 404.41C735.926 403.714 736.04 403.078 736.268 402.502C736.508 401.914 736.832 401.41 737.24 400.99C737.66 400.558 738.158 400.228 738.734 400C739.31 399.76 739.934 399.64 740.606 399.64C741.23 399.64 741.818 399.76 742.37 400C742.922 400.228 743.396 400.546 743.792 400.954C744.2 401.362 744.518 401.848 744.746 402.412C744.986 402.976 745.106 403.582 745.106 404.23C745.106 404.362 745.1 404.482 745.088 404.59C745.076 404.698 745.064 404.794 745.052 404.878C745.04 404.974 745.028 405.058 745.016 405.13H738.176C738.272 405.766 738.542 406.288 738.986 406.696C739.43 407.092 739.97 407.29 740.606 407.29C740.87 407.29 741.11 407.254 741.326 407.182C741.542 407.11 741.728 407.026 741.884 406.93C742.04 406.834 742.166 406.732 742.262 406.624C742.37 406.504 742.448 406.396 742.496 406.3H744.836C744.788 406.48 744.674 406.732 744.494 407.056C744.326 407.38 744.074 407.698 743.738 408.01C743.402 408.322 742.976 408.598 742.46 408.838C741.944 409.066 741.326 409.18 740.606 409.18ZM742.856 403.6C742.76 403.012 742.52 402.52 742.136 402.124C741.752 401.728 741.242 401.53 740.606 401.53C739.922 401.53 739.376 401.728 738.968 402.124C738.572 402.52 738.308 403.012 738.176 403.6H742.856ZM745.647 399.82H747.987L750.147 406.21H750.507L752.667 399.82H755.007L751.857 409H748.797L745.647 399.82ZM756.169 399.82H758.419V409H756.169V399.82ZM756.079 396.22H758.509V398.38H756.079V396.22ZM764.987 409.18C764.315 409.18 763.691 409.066 763.115 408.838C762.539 408.598 762.041 408.268 761.621 407.848C761.213 407.416 760.889 406.912 760.649 406.336C760.421 405.748 760.307 405.106 760.307 404.41C760.307 403.714 760.421 403.078 760.649 402.502C760.889 401.914 761.213 401.41 761.621 400.99C762.041 400.558 762.539 400.228 763.115 400C763.691 399.76 764.315 399.64 764.987 399.64C765.707 399.64 766.325 399.76 766.841 400C767.357 400.24 767.783 400.54 768.119 400.9C768.467 401.248 768.731 401.626 768.911 402.034C769.103 402.442 769.235 402.814 769.307 403.15H767.057C767.009 403.018 766.937 402.868 766.841 402.7C766.745 402.532 766.613 402.376 766.445 402.232C766.289 402.088 766.091 401.968 765.851 401.872C765.611 401.764 765.323 401.71 764.987 401.71C764.651 401.71 764.333 401.776 764.033 401.908C763.745 402.04 763.487 402.226 763.259 402.466C763.043 402.694 762.869 402.976 762.737 403.312C762.617 403.636 762.557 404.002 762.557 404.41C762.557 404.818 762.617 405.19 762.737 405.526C762.869 405.85 763.043 406.132 763.259 406.372C763.487 406.6 763.745 406.78 764.033 406.912C764.333 407.044 764.651 407.11 764.987 407.11C765.323 407.11 765.611 407.062 765.851 406.966C766.091 406.858 766.289 406.732 766.445 406.588C766.613 406.432 766.745 406.264 766.841 406.084C766.937 405.904 767.009 405.736 767.057 405.58H769.307C769.235 405.94 769.103 406.33 768.911 406.75C768.731 407.17 768.467 407.56 768.119 407.92C767.783 408.28 767.357 408.58 766.841 408.82C766.325 409.06 765.707 409.18 764.987 409.18ZM775.34 409.18C774.668 409.18 774.044 409.066 773.468 408.838C772.892 408.598 772.394 408.268 771.974 407.848C771.566 407.416 771.242 406.912 771.002 406.336C770.774 405.748 770.66 405.106 770.66 404.41C770.66 403.714 770.774 403.078 771.002 402.502C771.242 401.914 771.566 401.41 771.974 400.99C772.394 400.558 772.892 400.228 773.468 400C774.044 399.76 774.668 399.64 775.34 399.64C775.964 399.64 776.552 399.76 777.104 400C777.656 400.228 778.13 400.546 778.526 400.954C778.934 401.362 779.252 401.848 779.48 402.412C779.72 402.976 779.84 403.582 779.84 404.23C779.84 404.362 779.834 404.482 779.822 404.59C779.81 404.698 779.798 404.794 779.786 404.878C779.774 404.974 779.762 405.058 779.75 405.13H772.91C773.006 405.766 773.276 406.288 773.72 406.696C774.164 407.092 774.704 407.29 775.34 407.29C775.604 407.29 775.844 407.254 776.06 407.182C776.276 407.11 776.462 407.026 776.618 406.93C776.774 406.834 776.9 406.732 776.996 406.624C777.104 406.504 777.182 406.396 777.23 406.3H779.57C779.522 406.48 779.408 406.732 779.228 407.056C779.06 407.38 778.808 407.698 778.472 408.01C778.136 408.322 777.71 408.598 777.194 408.838C776.678 409.066 776.06 409.18 775.34 409.18ZM777.59 403.6C777.494 403.012 777.254 402.52 776.87 402.124C776.486 401.728 775.976 401.53 775.34 401.53C774.656 401.53 774.11 401.728 773.702 402.124C773.306 402.52 773.042 403.012 772.91 403.6H777.59Z" fill="#171717"/>
+<path d="M723.293 373.707C723.683 374.098 724.317 374.098 724.707 373.707L731.071 367.343C731.462 366.953 731.462 366.319 731.071 365.929C730.681 365.538 730.047 365.538 729.657 365.929L724 371.586L718.343 365.929C717.953 365.538 717.319 365.538 716.929 365.929C716.538 366.319 716.538 366.953 716.929 367.343L723.293 373.707ZM724.707 264.293C724.317 263.902 723.683 263.902 723.293 264.293L716.929 270.657C716.538 271.047 716.538 271.681 716.929 272.071C717.319 272.462 717.953 272.462 718.343 272.071L724 266.414L729.657 272.071C730.047 272.462 730.681 272.462 731.071 272.071C731.462 271.681 731.462 271.047 731.071 270.657L724.707 264.293ZM725 373L725 265L723 265L723 373L725 373Z" fill="#333333"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_7_2">
+<rect width="1294" height="497" fill="white"/>
+</clipPath>
+<clipPath id="clip1_7_2">
+<rect x="95" y="48" width="1094" height="385" rx="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/connect-explorer/src/actions/methodActions.ts b/packages/connect-explorer/src/actions/methodActions.ts
index ac777b0cec4..392241bfafd 100644
--- a/packages/connect-explorer/src/actions/methodActions.ts
+++ b/packages/connect-explorer/src/actions/methodActions.ts
@@ -1,7 +1,8 @@
 import { TSchema } from '@sinclair/typebox';
 import JSON5 from 'json5';
 
-import TrezorConnect from '@trezor/connect-web';
+import TrezorConnect, { TrezorConnect as TrezorConnectType } from '@trezor/connect-web';
+import TrezorConnectMobile from '@trezor/connect-mobile';
 import { getDeepValue } from '@trezor/schema-utils/src/utils';
 
 import { GetState, Dispatch, Field } from '../types';
@@ -19,7 +20,7 @@ export const SET_METHOD_PROCESSING = 'method_set_processing';
 
 export type MethodAction =
     | { type: typeof SET_METHOD; methodConfig: any }
-    | { type: typeof SET_SCHEMA; method: keyof typeof TrezorConnect; schema: TSchema }
+    | { type: typeof SET_SCHEMA; method: keyof TrezorConnectType; schema: TSchema }
     | { type: typeof FIELD_CHANGE; field: Field<any>; value: any }
     | { type: typeof FIELD_DATA_CHANGE; field: Field<any>; data: any }
     | { type: typeof ADD_BATCH; field: Field<any>; item: any }
@@ -80,10 +81,12 @@ export const onSetManualMode = (manualMode: boolean) => ({
 });
 
 export const onSubmit = () => async (dispatch: Dispatch, getState: GetState) => {
-    const { method } = getState();
+    const { method, connect } = getState();
     if (!method?.name) throw new Error('method name not specified');
     dispatch({ type: SET_METHOD_PROCESSING, payload: true });
-    const connectMethod = TrezorConnect[method.name];
+    const trezorConnectImpl =
+        connect.options?.coreMode === 'deeplink' ? TrezorConnectMobile : TrezorConnect;
+    const connectMethod = trezorConnectImpl[method.name];
     if (typeof connectMethod !== 'function') {
         dispatch(
             onResponse({
diff --git a/packages/connect-explorer/src/actions/trezorConnectActions.ts b/packages/connect-explorer/src/actions/trezorConnectActions.ts
index d56caf9a952..c8ba3c357cd 100644
--- a/packages/connect-explorer/src/actions/trezorConnectActions.ts
+++ b/packages/connect-explorer/src/actions/trezorConnectActions.ts
@@ -4,6 +4,7 @@ import TrezorConnect, {
     TRANSPORT_EVENT,
     WEBEXTENSION,
 } from '@trezor/connect-web';
+import TrezorConnectMobile from '@trezor/connect-mobile';
 
 import { TrezorConnectDevice, Dispatch, Field, GetState } from '../types';
 
@@ -30,7 +31,7 @@ export function onSelectDevice(path: string) {
     };
 }
 
-export const onConnectOptionChange = (option: string, value: any) => ({
+export const onConnectOptionChange = (option: Field<any>, value: any) => ({
     type: ACTIONS.ON_CHANGE_CONNECT_OPTION,
     payload: {
         option,
@@ -122,7 +123,7 @@ export const init =
             try {
                 // Verify if valid by loading core.js, if this file exists we can assume the connectSrc is valid
                 await testLoadingScript(options.connectSrc + 'js/core.js');
-            } catch (err) {
+            } catch {
                 dispatch({
                     type: ACTIONS.ON_INIT_ERROR,
                     payload: `Invalid connectSrc: ${options.connectSrc}`,
@@ -144,6 +145,17 @@ export const init =
         const urlParams = new URLSearchParams(window.location.search);
         const coreMode = (urlParams.get('core-mode') as ConnectOptions['coreMode']) || 'auto';
 
+        // localhost + dev server
+        let _sessionsBackgroundUrl = process.env.CONNECT_EXPLORER_FULL_URL
+            ? `${process.env.CONNECT_EXPLORER_FULL_URL}/workers/sessions-background-sharedworker.js`
+            : window.origin + '/workers/sessions-background-sharedworker.js';
+
+        // connect.trezor.io/9 || connect.trezor.io/9.x.y
+        if (window.location.origin.endsWith('connect.trezor.io')) {
+            _sessionsBackgroundUrl =
+                'https://connect.trezor.io/9/workers/sessions-background-sharedworker.js';
+        }
+
         const connectOptions = {
             coreMode,
             transportReconnect: true,
@@ -156,11 +168,30 @@ export const init =
             },
             trustedHost: false,
             connectSrc: window.__TREZOR_CONNECT_SRC,
+            _sessionsBackgroundUrl,
             ...options,
         };
 
         try {
-            await TrezorConnect.init(connectOptions);
+            if (connectOptions.coreMode === 'deeplink') {
+                await TrezorConnectMobile.init({
+                    ...connectOptions,
+                    deeplinkOpen(url) {
+                        window.open(url, '_blank');
+                    },
+                    deeplinkCallbackUrl:
+                        (process.env.CONNECT_EXPLORER_FULL_URL || window.location.origin) +
+                        '/callback',
+                });
+                const bc = new BroadcastChannel('trezor_connect_callback');
+                bc.onmessage = e => {
+                    if (e.data.type === 'popup_callback') {
+                        TrezorConnectMobile.handleDeeplink(e.data.url);
+                    }
+                };
+            } else {
+                await TrezorConnect.init(connectOptions);
+            }
         } catch (err) {
             dispatch({ type: ACTIONS.ON_INIT_ERROR, payload: err.message });
 
@@ -174,6 +205,7 @@ export const onSubmitInit = () => async (dispatch: Dispatch, getState: GetState)
     const { connect } = getState();
     // Disposing TrezorConnect to init it again.
     await TrezorConnect.dispose();
+    await TrezorConnectMobile.dispose();
 
     return dispatch(init(connect.options));
 };
diff --git a/packages/connect-explorer/src/components/BetaOnly.tsx b/packages/connect-explorer/src/components/BetaOnly.tsx
new file mode 100644
index 00000000000..18995f7d04b
--- /dev/null
+++ b/packages/connect-explorer/src/components/BetaOnly.tsx
@@ -0,0 +1,11 @@
+export const isBetaOnly = !process.env.CONNECT_EXPLORER_FULL_URL?.startsWith(
+    'https://connect.trezor.io/9/',
+);
+
+export const BetaOnly = (props: React.PropsWithChildren) => {
+    if (isBetaOnly) {
+        return <>{props.children}</>;
+    }
+
+    return null;
+};
diff --git a/packages/connect-explorer/src/components/CommonParamsLink.tsx b/packages/connect-explorer/src/components/CommonParamsLink.tsx
index 74d224ebacd..1affce866bf 100644
--- a/packages/connect-explorer/src/components/CommonParamsLink.tsx
+++ b/packages/connect-explorer/src/components/CommonParamsLink.tsx
@@ -7,7 +7,6 @@ const Floating = styled.div`
     margin-top: -2rem;
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
 const StyledLink = styled(Link)`
     color: ${({ theme }) => theme.textPrimaryDefault};
     text-decoration: underline;
diff --git a/packages/connect-explorer/src/components/GuideIndex.tsx b/packages/connect-explorer/src/components/GuideIndex.tsx
index f369df52b82..f7e01a60fcc 100644
--- a/packages/connect-explorer/src/components/GuideIndex.tsx
+++ b/packages/connect-explorer/src/components/GuideIndex.tsx
@@ -1,11 +1,13 @@
+import { ReactNode } from 'react';
+
 import { getPagesUnderRoute } from 'nextra/context';
 import Link from 'next/link';
-import { ReactNode } from 'react';
+import styled from 'styled-components';
 
 import { Card as TrezorCard, H3, Paragraph, Button } from '@trezor/components';
-import styled from 'styled-components';
 import { spacingsPx } from '@trezor/theme';
 
+// eslint-disable-next-line local-rules/no-override-ds-component
 const SectionCard = styled(TrezorCard)`
     margin-bottom: ${spacingsPx.xl};
 `;
diff --git a/packages/connect-explorer/src/components/Settings.tsx b/packages/connect-explorer/src/components/Settings.tsx
new file mode 100644
index 00000000000..af00274eb73
--- /dev/null
+++ b/packages/connect-explorer/src/components/Settings.tsx
@@ -0,0 +1,94 @@
+import styled from 'styled-components';
+
+import { Button } from '@trezor/components';
+
+import * as trezorConnectActions from '../actions/trezorConnectActions';
+import { useSelector, useActions } from '../hooks';
+import { getField } from '../components/Method';
+import { isBetaOnly } from '../components/BetaOnly';
+
+export const SettingsContent = styled.section`
+    flex: 1;
+    padding: 10px 20px;
+    display: flex;
+    flex-direction: column;
+`;
+
+export const ConfirmationMessage = styled.div`
+    margin-top: 20px;
+    color: green;
+    font-weight: bold;
+`;
+
+export const ErrorMessage = styled(ConfirmationMessage)`
+    color: red;
+`;
+
+export const Settings = () => {
+    const connectOptions = useSelector(state => ({
+        trustedHost: state.connect?.options?.trustedHost,
+        connectSrc: state.connect?.options?.connectSrc,
+        coreMode: state?.connect?.options?.coreMode,
+    }));
+
+    const initError = useSelector(state => state.connect?.initError);
+    const isInitSuccess = useSelector(state => state.connect?.isInitSuccess || false);
+    const isHandshakeConfirmed = useSelector(state => state.connect?.isHandshakeConfirmed || false);
+    const actions = useActions({
+        onSubmitInit: trezorConnectActions.onSubmitInit,
+        onFieldChange: trezorConnectActions.onConnectOptionChange,
+    });
+
+    const submitButton = 'Init Connect';
+    const fields = [
+        {
+            name: 'trustedHost',
+            type: 'checkbox' as const,
+            key: 'trustedHost',
+            value: connectOptions?.trustedHost || false,
+        },
+        {
+            name: 'coreMode',
+            type: 'select' as const,
+            key: 'coreMode',
+            value: connectOptions?.coreMode || 'auto',
+            data: [
+                { value: 'auto', label: 'Auto' },
+                { value: 'iframe', label: 'Iframe' },
+                { value: 'popup', label: 'Popup' },
+                ...(isBetaOnly ? [{ value: 'deeplink', label: 'Deeplink (mobile)' }] : []),
+            ],
+        },
+        {
+            name: 'connectSrc',
+            type: 'input' as const,
+            key: 'connectSrc',
+            value: connectOptions?.connectSrc || '',
+        },
+    ];
+
+    return (
+        <SettingsContent>
+            {/* @ts-expect-error: actions is simplified for this case */}
+            {fields.map(field => getField(field, { actions }))}
+            <Button onClick={actions.onSubmitInit} data-testid="@submit-button">
+                {submitButton}
+            </Button>
+            {initError && (
+                <ErrorMessage data-testid="@settings/init-error">
+                    Init error: {initError}
+                </ErrorMessage>
+            )}
+            {isInitSuccess && (
+                <ConfirmationMessage data-testid="@settings/init-success">
+                    Init success!
+                </ConfirmationMessage>
+            )}
+            {isHandshakeConfirmed && (
+                <ConfirmationMessage data-testid="@settings/handshake-confirmed">
+                    Handshake confirmed!
+                </ConfirmationMessage>
+            )}
+        </SettingsContent>
+    );
+};
diff --git a/packages/connect-explorer/src/components/ZoomableIllustration.tsx b/packages/connect-explorer/src/components/ZoomableIllustration.tsx
index 8d33328c94b..0012c5aac65 100644
--- a/packages/connect-explorer/src/components/ZoomableIllustration.tsx
+++ b/packages/connect-explorer/src/components/ZoomableIllustration.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import Zoom from 'react-medium-image-zoom';
-import { useRouter } from 'next/router';
 
+import { useRouter } from 'next/router';
 import { createGlobalStyle, useTheme, styled } from 'styled-components';
 
 import 'react-medium-image-zoom/dist/styles.css';
diff --git a/packages/connect-explorer/src/components/fields/ArrayWrapper.tsx b/packages/connect-explorer/src/components/fields/ArrayWrapper.tsx
index 0d22e70f520..852e67a7317 100644
--- a/packages/connect-explorer/src/components/fields/ArrayWrapper.tsx
+++ b/packages/connect-explorer/src/components/fields/ArrayWrapper.tsx
@@ -2,9 +2,10 @@ import { ReactNode } from 'react';
 
 import styled from 'styled-components';
 
-import type { FieldWithBundle } from '../../types';
 import { Icon } from '@trezor/components';
 
+import type { FieldWithBundle } from '../../types';
+
 interface AddButtonProps {
     field: FieldWithBundle<any>;
     onAdd: () => void;
diff --git a/packages/connect-explorer/src/components/icons/IconMobile.tsx b/packages/connect-explorer/src/components/icons/IconMobile.tsx
new file mode 100644
index 00000000000..e5e986c1bcf
--- /dev/null
+++ b/packages/connect-explorer/src/components/icons/IconMobile.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+
+function IconMobile() {
+    return (
+        <svg
+            xmlns="http://www.w3.org/2000/svg"
+            width="32"
+            height="32"
+            fill="none"
+            viewBox="0 0 32 32"
+        >
+            <path
+                fill="#DF8432"
+                d="M22 2H10a3 3 0 0 0-3 3v22a3 3 0 0 0 3 3h12a3 3 0 0 0 3-3V5a3 3 0 0 0-3-3M10 4h12a1 1 0 0 1 1 1v1H9V5a1 1 0 0 1 1-1m12 24H10a1 1 0 0 1-1-1v-1h14v1a1 1 0 0 1-1 1"
+            />
+        </svg>
+    );
+}
+
+export default IconMobile;
diff --git a/packages/connect-explorer/src/data/methods/management/index.ts b/packages/connect-explorer/src/data/methods/management/index.ts
index 2ebcbe68848..880e838b08a 100644
--- a/packages/connect-explorer/src/data/methods/management/index.ts
+++ b/packages/connect-explorer/src/data/methods/management/index.ts
@@ -1,5 +1,6 @@
 import getFeatures from './getFeatures';
 import resetDevice from './resetDevice';
+import loadDevice from './loadDevice';
 import wipeDevice from './wipeDevice';
 import applyFlags from './applyFlags';
 import applySettings from './applySettings';
@@ -9,10 +10,10 @@ import changeLanguage from './changeLanguage';
 import changeWipeCode from './changeWipeCode';
 import recoverDevice from './recoverDevice';
 import firmwareUpdate from './firmwareUpdate';
-import rebootToBootloader from './rebootToBootloader';
 
 export default [
     ...getFeatures,
+    ...loadDevice,
     ...resetDevice,
     ...wipeDevice,
     ...applyFlags,
@@ -23,5 +24,4 @@ export default [
     ...changeWipeCode,
     ...recoverDevice,
     ...firmwareUpdate,
-    ...rebootToBootloader,
 ];
diff --git a/packages/connect-explorer/src/data/methods/management/loadDevice.ts b/packages/connect-explorer/src/data/methods/management/loadDevice.ts
new file mode 100644
index 00000000000..77fbfd1e227
--- /dev/null
+++ b/packages/connect-explorer/src/data/methods/management/loadDevice.ts
@@ -0,0 +1,63 @@
+const name = 'loadDevice';
+const docs = 'methods/loadDevice.md';
+
+export default [
+    {
+        url: '/method/loadDevice',
+        name,
+        docs,
+        submitButton: 'Load device',
+        fields: [
+            {
+                name: 'mnemonics',
+                label: 'Mnemonics',
+                type: 'input',
+                optional: false,
+                value: ['all all all all all all all all all all all all'],
+            },
+            {
+                name: 'label',
+                label: 'Label',
+                type: 'input',
+                optional: true,
+                value: 'Meow trezor',
+            },
+            {
+                name: 'pin',
+                label: 'Pin',
+                type: 'input',
+                optional: true,
+            },
+            {
+                name: 'passphrase_protection',
+                label: 'Passphrase protection',
+                type: 'checkbox',
+                optional: true,
+            },
+            {
+                name: 'skip_checksum',
+                label: 'Skip checksum',
+                type: 'checkbox',
+                optional: true,
+            },
+            {
+                name: 'u2f_counter',
+                label: 'U2F counter',
+                type: 'number',
+                optional: true,
+            },
+            {
+                name: 'no_backup',
+                label: 'No backup',
+                type: 'checkbox',
+                optional: true,
+            },
+            {
+                name: 'needs_backup',
+                label: 'Needs backup',
+                type: 'checkbox',
+                optional: true,
+            },
+        ],
+    },
+];
diff --git a/packages/connect-explorer/src/data/methods/management/rebootToBootloader.ts b/packages/connect-explorer/src/data/methods/management/rebootToBootloader.ts
deleted file mode 100644
index 3a08fcbdfed..00000000000
--- a/packages/connect-explorer/src/data/methods/management/rebootToBootloader.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-const name = 'rebootToBootloader';
-
-export default [
-    {
-        url: `/method/rebootToBootloader`,
-        name,
-        submitButton: 'Reboot to bootloader',
-        fields: [
-            {
-                name: 'boot_command',
-                label: 'boot_command',
-                type: 'select',
-                optional: false,
-                value: 0,
-                placeholder: 'Select',
-                data: [
-                    { value: 0, label: 'STOP_AND_WAIT' },
-                    { value: 1, label: 'INSTALL_UPGRADE' },
-                ],
-            },
-        ],
-    },
-];
diff --git a/packages/connect-explorer/src/pages/_app.tsx b/packages/connect-explorer/src/pages/_app.tsx
index 9176f1cd475..732673bbaae 100644
--- a/packages/connect-explorer/src/pages/_app.tsx
+++ b/packages/connect-explorer/src/pages/_app.tsx
@@ -1,10 +1,9 @@
 import React, { useEffect, useState } from 'react';
 import { Provider } from 'react-redux';
 
-import { ThemeProvider as NextThemeProvider } from 'next-themes';
+import { ThemeProvider as NextThemeProvider, useTheme } from 'next-themes';
 import { ThemeProvider } from 'styled-components';
 import type { AppProps } from 'next/app';
-import { useTheme } from 'next-themes';
 import Head from 'next/head';
 import { useRouter } from 'next/router';
 
diff --git a/packages/connect-explorer/src/pages/_meta.json b/packages/connect-explorer/src/pages/_meta.json
index 65a2f1571e4..bfddddd1a63 100644
--- a/packages/connect-explorer/src/pages/_meta.json
+++ b/packages/connect-explorer/src/pages/_meta.json
@@ -9,5 +9,9 @@
     "test": {
         "title": "Test",
         "display": "hidden"
+    },
+    "callback": {
+        "title": "Callback",
+        "display": "hidden"
     }
 }
diff --git a/packages/connect-explorer/src/pages/callback.mdx b/packages/connect-explorer/src/pages/callback.mdx
new file mode 100644
index 00000000000..fb77584a588
--- /dev/null
+++ b/packages/connect-explorer/src/pages/callback.mdx
@@ -0,0 +1,21 @@
+import { useEffect } from 'react';
+
+import { Button } from '@trezor/components';
+
+export const CallbackHandler = () => {
+    useEffect(() => {
+        const bc = new BroadcastChannel('trezor_connect_callback');
+        bc.postMessage({ type: 'popup_callback', url: window.location.href });
+    }, []);
+
+    return <div></div>;
+
+};
+
+# Trezor Connect Callback
+
+Callback received. You can close this window now.
+
+<Button onClick={() => window.close()}>Close</Button>
+
+<CallbackHandler />
diff --git a/packages/connect-explorer/src/pages/changelog.mdx b/packages/connect-explorer/src/pages/changelog.mdx
index 4a98128a31d..18de55d9b1e 100644
--- a/packages/connect-explorer/src/pages/changelog.mdx
+++ b/packages/connect-explorer/src/pages/changelog.mdx
@@ -2,14 +2,15 @@
 icon: log
 ---
 
+import Markdown from 'react-markdown';
+
 import rehypeSectionize from '@hbsnow/rehype-sectionize';
 import remarkGfm from 'remark-gfm';
 import remarkGemoji from 'remark-gemoji';
 import useSWR from 'swr';
-import Markdown from 'react-markdown';
-import { useMDXComponents } from '@trezor/connect-explorer-theme';
 import { Callout } from 'nextra/components';
 
+import { useMDXComponents } from '@trezor/connect-explorer-theme';
 import { spacings } from '@trezor/theme';
 import { CollapsibleBox } from '@trezor/components';
 import { isNewer } from '@trezor/utils/src/versionUtils';
@@ -30,8 +31,8 @@ export const loadChangelog = branch => {
             content = content.replace(/^(#+)/gm, '$1#');
             // Add links to commit hashes
             content = content.replace(
-                /([a-f0-9]{7,10})([\),])/g,
-                `[\$1](https://github.com/trezor/trezor-suite/commit/\$1)$2`,
+                /([a-f0-9]{7,10})([),])/g,
+                `[$1](https://github.com/trezor/trezor-suite/commit/$1)$2`,
             );
             const versionOverview =  `## Version overview\n\n` + content.substring(0, content.indexOf('##'));
             const changelog = content.substring(content.indexOf('##'));
diff --git a/packages/connect-explorer/src/pages/details/deeplinking.mdx b/packages/connect-explorer/src/pages/details/deeplinking.mdx
new file mode 100644
index 00000000000..b4c67277cbe
--- /dev/null
+++ b/packages/connect-explorer/src/pages/details/deeplinking.mdx
@@ -0,0 +1,72 @@
+import { Callout } from 'nextra/components';
+
+import { BetaOnly } from '../../components/BetaOnly';
+
+# Deep linking specification
+
+<BetaOnly>
+
+To support connecting to Trezor devices from 3rd party apps on mobile devices, Trezor Suite Lite provides a communication interface via deep linking.
+
+<Callout type="info">
+    **This feature is still in beta and is subject to change. It's currently available only in
+    development builds of Trezor Suite Lite.**
+</Callout>
+
+## Base URL
+
+The base URL for deep linking is different depending on the environment.
+
+| Environment | Base URL                                               |
+| ----------- | ------------------------------------------------------ |
+| Production  | currently unavailable                                  |
+| Development | `https://dev.suite.sldev.cz/connect/develop/deeplink/` |
+| Local       | `trezorsuitelite://connect`                            |
+
+## Query parameters
+
+The method call is specified using the query parameters.
+
+| Parameter  | Type        | Required | Description                                              |
+| ---------- | ----------- | -------- | -------------------------------------------------------- |
+| `method`   | string      | yes      | The name of the Connect method to call (eg. getAddress). |
+| `params`   | JSON object | yes      | The parameters for the method call encoded as JSON.      |
+| `callback` | string      | yes      | The URL to redirect to after the method call is made.    |
+
+## Callback
+
+To receive the result of the method call, the app must specify a callback URL. The callback URL is called with the result of the method call.
+
+The following query parameters are passed in the callback URL:
+
+| Parameter  | Type        | Description                                                                 |
+| ---------- | ----------- | --------------------------------------------------------------------------- |
+| `id`       | integer     | ID of the call                                                              |
+| `response` | JSON object | Result of the method call, equivalent to the object returned by the method. |
+
+## Example
+
+Let's imagine we want to convert the following call to a deep link:
+
+```
+const address = await TrezorConnect.getAddress({
+    coin: 'btc',
+    path: "m/44'/0'/0'/0/0",
+});
+```
+
+The parameters would be:
+
+-   **method**: `getAddress`
+-   **params**: `{"coin":"btc","path":"m/44'/0'/0'/0/0"}`
+-   **callback**: `https://httpbin.org/get` (as an example)
+
+The encoded deep link URL would then be:
+
+```
+trezorsuitelite://connect?method=getAddress&params=%7B%22coin%22%3A%22btc%22%2C%22path%22%3A%22m%2F44%27%2F0%27%2F0%27%2F0%2F0%22%7D&callback=https%3A%2F%2Fhttpbin.org%2Fget
+```
+
+When the user returns to the app, the callback URL is called with the result of the method call.
+
+</BetaOnly>
diff --git a/packages/connect-explorer/src/pages/guides/webextension-implementation-tutorial.mdx b/packages/connect-explorer/src/pages/guides/webextension-implementation-tutorial.mdx
index 73b892938d4..bd43b6d8bd3 100644
--- a/packages/connect-explorer/src/pages/guides/webextension-implementation-tutorial.mdx
+++ b/packages/connect-explorer/src/pages/guides/webextension-implementation-tutorial.mdx
@@ -287,7 +287,7 @@ export const SectionCard = styled(TrezorCard)`
         },
         "permissions": ["scripting"],
         "host_permissions": [
-            "*://connect.trezor.io/9/*",
+            "*://connect.trezor.io/9/*"
         ]
     }
     ```
diff --git a/packages/connect-explorer/src/pages/index.mdx b/packages/connect-explorer/src/pages/index.mdx
index 5a500b3980a..3d93a2bb29e 100644
--- a/packages/connect-explorer/src/pages/index.mdx
+++ b/packages/connect-explorer/src/pages/index.mdx
@@ -8,18 +8,14 @@ import styled from 'styled-components';
 import Link from 'next/link';
 
 import { spacings, spacingsPx } from '@trezor/theme';
-import {
-    Button,
-    Card as TrezorCard,
-    CollapsibleBox,
-    variables,
-    Paragraph,
-} from '@trezor/components';
+import { Button, Card as TrezorCard, CollapsibleBox, variables } from '@trezor/components';
 
 import IconNode from '../components/icons/IconNode';
 import IconWeb from '../components/icons/IconWeb';
 import IconExtension from '../components/icons/IconExtension';
+import IconMobile from '../components/icons/IconMobile';
 import ZoomableIllustration from '../components/ZoomableIllustration';
+import { BetaOnly } from '../components/BetaOnly';
 
 export const SectionCard = ({ children }) => (
     <TrezorCard margin={{ bottom: spacings.xl }}>{children}</TrezorCard>
@@ -106,10 +102,13 @@ export const ExampleHeading = styled.h3`
 
     Depending on your environment you need to chose the right package and follow the particular guide:
 
-    <Cards>
+    <Cards num={2}>
         <Card icon={<IconNode />} title="Node.js" href="#nodejs" />
         <Card icon={<IconWeb />} title="Web" href="#web" />
         <Card icon={<IconExtension />} title="Web extension" href="#web-extension" />
+        <BetaOnly>
+            <Card icon={<IconMobile />} title="Mobile" href="#mobile" />
+        </BetaOnly>
     </Cards>
 
     <CollapsibleBox heading="Still unsure?" margin={{ top: spacings.md }}>
@@ -441,7 +440,7 @@ export const ExampleHeading = styled.h3`
                     "host_permissions": ["*://connect.trezor.io/9/*"]
                     "background": {
                         "service_worker": "serviceWorker.js"
-                    },
+                    }
                 ```
 
                 For manual content script injection, you can [find more information in the README](/readme/connect-webextension).
@@ -498,3 +497,139 @@ export const ExampleHeading = styled.h3`
         </CollapsibleBox>
 
 </SectionCard>
+
+<BetaOnly>
+
+<HiddenNextraHeading>
+
+### Mobile
+
+</HiddenNextraHeading>
+<SectionCard>
+    <SdkHeading className='nx-text-slate-900 dark:nx-text-slate-100'>
+        <IconMobile />
+        <SdkName>Mobile</SdkName>
+        <SdkTag>Using deep linking</SdkTag>
+        <Link href="/readme/connect-mobile" passHref legacyBehavior>
+            <Button
+                variant="tertiary"
+                size="small"
+                icon="bookOpenText"
+                target="_self"
+                href="#">
+                README
+            </Button>
+        </Link>
+        <Button
+            as="a"
+            variant="tertiary"
+            size="small"
+            icon="githubLogoAlt"
+            href="https://github.com/trezor/trezor-suite/tree/develop/packages/connect-mobile"
+            target="_blank">
+            View on Github
+        </Button>
+    </SdkHeading>
+
+    <ZoomableIllustration src="/images/schema-connect-deeplink.svg" $darkMode alt="connect schema when used in deeplink" />
+
+    <SdkContainer>
+        <SdkDescription>
+            #### About
+
+            `@trezor/connect-mobile` is a package that allows you to communicate with Trezor devices from your mobile app.
+            This package is somewhat different from the other SDKs, as it doesn't provide a direct API to the device. Instead, it uses deep linking to open the Trezor Suite app and communicate with the device.
+
+            #### Use deep linking without SDK
+
+            If you are not able to use the SDK, for example on non-supported platforms, you can still use deep linking to open the Trezor Suite app and communicate with the device.
+
+            This can be done by implementing the following specification.
+
+            <Link href="/details/deeplinking" passHref legacyBehavior>
+                <Button
+                    variant="tertiary"
+                    className="nx-mt-4 nx-mb-8"
+                    size="small"
+                    icon="arrowRight"
+                    iconAlignment="right"
+                    target="_self"
+                    href="#">
+                    Deep linking specification
+                </Button>
+            </Link>
+
+        </SdkDescription>
+        <ExamplesAside>
+            <ExampleHeading>Examples:</ExampleHeading>
+            - [Expo App example](https://github.com/trezor/trezor-suite/tree/develop/packages/connect-examples/mobile-expo)
+        </ExamplesAside>
+    </SdkContainer>
+
+        <CollapsibleBox heading="Quick start manual" margin={{ top: spacings.md }}>
+            <Steps>
+                {<h3>Installation of the package</h3>}
+
+                Simply install the package using your preferred package manager:
+
+                ```bash
+                npm install @trezor/connect-mobile
+                # or
+                yarn add @trezor/connect-mobile
+                ```
+
+                {<h3>Initialization of the API</h3>}
+
+                ```javascript
+                import * as Linking from 'expo-linking';
+
+                TrezorConnect.init({
+                    manifest: {
+                        email: 'developer@xyz.com',
+                        appUrl: 'http://your.application.com',
+                    },
+                    deeplinkOpen: url => {
+                        Linking.openURL(url);
+                    },
+                    deeplinkCallbackUrl: Linking.createURL('/connect'),
+                });
+                ```
+
+                Trezor Connect Manifest requires that you, as a Trezor Connect integrator, share your email and application URL with us. This provides us with the ability to reach you in case of any required maintenance. This subscription is mandatory.
+
+                The deeplink SDK needs two extra parameters: `deeplinkOpen` and `deeplinkCallbackUrl`. The `deeplinkOpen` function is used to open the Trezor Suite app, and the `deeplinkCallbackUrl` is the URL that the app will redirect to after the operation is complete.
+
+                In this example, we are using the `Linking` API from Expo to open the Trezor Suite app, however this may be different depending on your mobile app's environment.
+
+                {<h3>Handling callbacks</h3>}
+
+                The app needs to pass results from the callback URL back to the SDK. This can be done by listening to the URL and passing the data to the SDK using the `handleDeeplink` method.
+
+                ```javascript
+                useEffect(() => {
+                    const subscription = Linking.addEventListener('url', event => {
+                        TrezorConnect.handleDeeplink(event.url);
+                    });
+
+                    return () => subscription?.remove();
+                }, []);
+                ```
+
+                {<h3>How to use?</h3>}
+
+                Here is an example of how to get the device's public key:
+
+                ```javascript
+                TrezorConnect.getPublicKey({
+                    path: "m/44'/0'/0'/0/0",
+                    showOnTrezor: true,
+                });
+                ```
+
+                More methods with detailed explanation can be found on the left under the 'Coin methods' section. You can also try the Method Testing Tool, where you can try interacting with the device by yourself.
+            </Steps>
+        </CollapsibleBox>
+
+</SectionCard>
+
+</BetaOnly>
diff --git a/packages/connect-explorer/src/pages/methods/bitcoin/getAccountInfo.mdx b/packages/connect-explorer/src/pages/methods/bitcoin/getAccountInfo.mdx
index 6a1aea00ee3..eea9b944eb2 100644
--- a/packages/connect-explorer/src/pages/methods/bitcoin/getAccountInfo.mdx
+++ b/packages/connect-explorer/src/pages/methods/bitcoin/getAccountInfo.mdx
@@ -42,7 +42,7 @@ export const UsingPathSchema = Type.Object({
 
 export const UsingPubkeySchema = Type.Object({
     descriptor: Type.String({
-        description: 'public key of account',
+        description: 'public key or address of account',
     }),
     coin: Type.String({
         description:
@@ -106,7 +106,7 @@ export const GetAccountInfoSchema = Type.Intersect([
 export const paramDescriptions = {
     path: 'minimum length is `3`. [read more](/details/path)',
     coin: 'determines network definition specified in [coins.json](https://github.com/trezor/trezor-suite/blob/develop/packages/connect-common/files/coins.json) file. Coin `shortcut`, `name` or `label` can be used.',
-    descriptor: 'public key of account',
+    descriptor: 'public key or address of account',
     page: 'transaction history page index, subject of `details: txs`',
     pageSize: 'transaction history page size, subject of `details: txs`',
     from: 'transaction history from block filter, subject of `details: txs`',
@@ -136,7 +136,7 @@ const result = await TrezorConnect.getAccountInfo(params);
 
 <ParamsTable schema={UsingPathSchema} />
 
-#### Using public key
+#### Using public key or address
 
 <ParamsTable schema={UsingPubkeySchema} />
 
diff --git a/packages/connect-explorer/src/pages/methods/device/loadDevice.mdx b/packages/connect-explorer/src/pages/methods/device/loadDevice.mdx
new file mode 100644
index 00000000000..b1f09481f7c
--- /dev/null
+++ b/packages/connect-explorer/src/pages/methods/device/loadDevice.mdx
@@ -0,0 +1,86 @@
+import { Callout } from 'nextra/components';
+
+import { PROTO } from '@trezor/connect/src/constants';
+
+import { ParamsTable } from '../../../components/ParamsTable';
+import { CommonParamsLink } from '../../../components/CommonParamsLink';
+import { ApiPlayground } from '../../../components/ApiPlayground';
+import loadDevice from '../../../data/methods/management/loadDevice.ts';
+
+<ApiPlayground options={[{ title: 'Load device', legacyConfig: loadDevice[0] }]} />
+
+export const paramDescriptions = {
+    mnemonics: '',
+    label: '',
+    u2fCounter: 'Default value is set to current time stamp in seconds.',
+    pin: '',
+    passphraseProtection: '',
+    skipBackup: '',
+    noBackup: 'create a seedless device',
+};
+
+## Load device
+
+<Callout type="error">
+    **Management command** - this method is restricted to Trezor.io and can't be used in 3rd party
+    applications.
+</Callout>
+<Callout type="error">
+    **Management command** - this method is not going to work on Trezor with production firmware, it
+    requires a debug firmware. More details:
+    https://docs.trezor.io/trezor-firmware/tests/device-tests.html#extended-testing-and-debugging
+</Callout>
+Load seed and related internal settings. The devices has to be wiped before initiating this command.
+
+```javascript
+const result = await TrezorConnect.loadDevice(params);
+```
+
+### Params
+
+<CommonParamsLink />
+
+#### LoadDevice
+
+<ParamsTable schema={PROTO.LoadDevice} descriptions={paramDescriptions} />
+
+### Example
+
+```javascript
+TrezorConnect.loadDevice({
+    mnemonics: ['all all all all all all all all all all all all'],
+});
+```
+
+### Result
+
+Success type
+
+```javascript
+{
+    success: true,
+    payload: {
+        message: 'Device loaded'
+    },
+    device: {
+        path: '1',
+        state: {
+            deriveCardano: false
+        },
+        instance: 0
+    }
+}
+```
+
+Error
+
+```javascript
+{
+    success: false,
+    payload: {
+        error: string // error message
+        code: string // error code
+    }
+    device: undefined
+}
+```
diff --git a/packages/connect-explorer/src/pages/readme/[name].mdx b/packages/connect-explorer/src/pages/readme/[name].mdx
index 3296b9dbed7..0002bd71e1f 100644
--- a/packages/connect-explorer/src/pages/readme/[name].mdx
+++ b/packages/connect-explorer/src/pages/readme/[name].mdx
@@ -3,8 +3,14 @@ import { buildDynamicMDX, buildDynamicMeta } from 'nextra/remote';
 import rehypeSectionize from '@hbsnow/rehype-sectionize';
 import remarkGemoji from 'remark-gemoji';
 
+import { isBetaOnly } from '../../components/BetaOnly';
+
 export const getStaticPaths = () => {
-    const packages = ["connect", "connect-web", "connect-webextension"]
+    const packages = ["connect", "connect-web", "connect-webextension"];
+    if(isBetaOnly) {
+        packages.push("connect-mobile");
+    }
+
     const paths = packages.map((name) => ({
         params: {
             name,
@@ -30,8 +36,8 @@ export const getStaticProps = ({ params }) => {
             content = content.replace(/^(#+)/gm, '$1#');
             // Add links to commit hashes
             content = content.replace(
-                /([a-f0-9]{7,10})([\),])/g,
-                `[\$1](https://github.com/trezor/trezor-suite/commit/\$1)$2`,
+                /([a-f0-9]{7,10})([),])/g,
+                `[$1](https://github.com/trezor/trezor-suite/commit/$1)$2`,
             );
             content = `---\ntitle: ${name}\n---\n${content}`;
 
diff --git a/packages/connect-explorer/src/pages/settings.mdx b/packages/connect-explorer/src/pages/settings.mdx
index 7d3308a156c..874570c71d7 100644
--- a/packages/connect-explorer/src/pages/settings.mdx
+++ b/packages/connect-explorer/src/pages/settings.mdx
@@ -1,96 +1,6 @@
-import styled from 'styled-components';
-
-import { Button } from '@trezor/components';
 import { Callout } from 'nextra/components';
 
-import * as trezorConnectActions from '../actions/trezorConnectActions';
-import { useSelector, useActions } from '../hooks';
-import { getField } from '../components/Method';
-
-export const SettingsContent = styled.section`
-    flex: 1;
-    padding: 10px 20px;
-    display: flex;
-    flex-direction: column;
-`;
-
-export const ConfirmationMessage = styled.div`
-    margin-top: 20px;
-    color: green;
-    font-weight: bold;
-`;
-
-export const ErrorMessage = styled(ConfirmationMessage)`
-    color: red;
-`;
-
-export const Settings = () => {
-    const connectOptions = useSelector(state => ({
-        trustedHost: state.connect?.options?.trustedHost,
-        connectSrc: state.connect?.options?.connectSrc,
-        coreMode: state?.connect?.options?.coreMode,
-    }));
-
-    const initError = useSelector(state => state.connect?.initError);
-    const isInitSuccess = useSelector(state => state.connect?.isInitSuccess || false);
-    const isHandshakeConfirmed = useSelector(state => state.connect?.isHandshakeConfirmed || false);
-    const actions = useActions({
-        onSubmitInit: trezorConnectActions.onSubmitInit,
-        onFieldChange: trezorConnectActions.onConnectOptionChange,
-    });
-
-    const submitButton = 'Init Connect';
-    const fields = [
-        {
-            name: 'trustedHost',
-            type: 'checkbox',
-            key: 'trustedHost',
-            value: connectOptions?.trustedHost || false,
-        },
-        {
-            name: 'coreMode',
-            type: 'select',
-            key: 'coreMode',
-            value: connectOptions?.coreMode || 'auto',
-            data: [
-                { value: 'auto', label: 'Auto' },
-                { value: 'iframe', label: 'Iframe' },
-                { value: 'popup', label: 'Popup' },
-            ],
-        },
-        {
-            name: 'connectSrc',
-            type: 'input',
-            key: 'connectSrc',
-            value: connectOptions?.connectSrc || '',
-        },
-    ];
-
-    return (
-        <SettingsContent>
-            {fields.map(field => getField(field, { actions }))}
-            <Button onClick={actions.onSubmitInit} data-testid="@submit-button">
-                {submitButton}
-            </Button>
-            {initError && (
-                <ErrorMessage data-testid="@settings/init-error">
-                    Init error: {initError}
-                </ErrorMessage>
-            )}
-            {isInitSuccess && (
-                <ConfirmationMessage data-testid="@settings/init-success">
-                    Init success!
-                </ConfirmationMessage>
-            )}
-            {isHandshakeConfirmed && (
-                <ConfirmationMessage data-testid="@settings/handshake-confirmed">
-                    Handshake confirmed!
-                </ConfirmationMessage>
-            )}
-        </SettingsContent>
-    );
-
-};
+import { Settings } from '../components/Settings';
 
 ## Settings
 
diff --git a/packages/connect-explorer/src/reducers/methodCommon.ts b/packages/connect-explorer/src/reducers/methodCommon.ts
index a2febc66346..7c42d4c00b7 100644
--- a/packages/connect-explorer/src/reducers/methodCommon.ts
+++ b/packages/connect-explorer/src/reducers/methodCommon.ts
@@ -1,11 +1,11 @@
-import TrezorConnect from '@trezor/connect-web';
+import type { TrezorConnect } from '@trezor/connect-web';
 import { TSchema } from '@trezor/schema-utils';
 import { setDeepValue } from '@trezor/schema-utils/src/utils';
 
 import { Field, FieldBasic, isFieldBasic } from '../types';
 
 export interface MethodState {
-    name?: keyof typeof TrezorConnect;
+    name?: keyof TrezorConnect;
     submitButton?: string;
     fields: Field<unknown>[];
     params: Record<string, unknown>;
diff --git a/packages/connect-explorer/src/reducers/methodInit.ts b/packages/connect-explorer/src/reducers/methodInit.ts
index 40befcf51ac..2ecfcf0ea54 100644
--- a/packages/connect-explorer/src/reducers/methodInit.ts
+++ b/packages/connect-explorer/src/reducers/methodInit.ts
@@ -1,6 +1,6 @@
 import { TSchema, Kind, OptionalKind } from '@sinclair/typebox';
 
-import type TrezorConnect from '@trezor/connect-web';
+import type { TrezorConnect } from '@trezor/connect-web';
 
 import {
     MethodState,
@@ -165,7 +165,7 @@ export const getMethodState = (methodConfig?: Partial<MethodState>) => {
 };
 
 // Get method state from TypeBox schema
-export const getMethodStateFromSchema = (method: keyof typeof TrezorConnect, schema: TSchema) => {
+export const getMethodStateFromSchema = (method: keyof TrezorConnect, schema: TSchema) => {
     return {
         ...getMethodState({
             name: method,
diff --git a/packages/connect-explorer/src/reducers/methodReducer.ts b/packages/connect-explorer/src/reducers/methodReducer.ts
index 238f80f5e21..83d2b425e48 100644
--- a/packages/connect-explorer/src/reducers/methodReducer.ts
+++ b/packages/connect-explorer/src/reducers/methodReducer.ts
@@ -46,10 +46,7 @@ const findField = (state: MethodState, field: Field<any>) => {
 
 // Update field value
 const onFieldChange = (state: MethodState, _field: Field<any>, value: any) => {
-    const newState = {
-        ...JSON.parse(JSON.stringify(state)),
-        ...state,
-    };
+    const newState = JSON.parse(JSON.stringify(state));
     const field = findField(newState, _field);
     if (!field || !isFieldBasic(field)) return state;
     field.value = value;
diff --git a/packages/connect-explorer/src/reducers/trezorConnectReducer.ts b/packages/connect-explorer/src/reducers/trezorConnectReducer.ts
index ec600143b04..99ca6da9642 100644
--- a/packages/connect-explorer/src/reducers/trezorConnectReducer.ts
+++ b/packages/connect-explorer/src/reducers/trezorConnectReducer.ts
@@ -3,7 +3,7 @@ import TrezorConnect, { DEVICE } from '@trezor/connect-web';
 import * as ACTIONS from '../actions/index';
 import { TrezorConnectDevice, Action, Field } from '../types';
 
-type ConnectState = {
+export type ConnectState = {
     devices: TrezorConnectDevice[];
     selectedDevice?: string;
     options?: Parameters<(typeof TrezorConnect)['init']>[0];
diff --git a/packages/connect-explorer/src/types/index.ts b/packages/connect-explorer/src/types/index.ts
index b3187465245..cd55d763f09 100644
--- a/packages/connect-explorer/src/types/index.ts
+++ b/packages/connect-explorer/src/types/index.ts
@@ -20,7 +20,7 @@ export type TrezorConnectDevice = KnownDevice | UnknownDevice | UnreadableDevice
 export interface FieldData {
     value: string;
     label: string;
-    affectedValue: string;
+    affectedValue?: string;
 }
 
 // Field path
diff --git a/packages/connect-explorer/tsconfig.json b/packages/connect-explorer/tsconfig.json
index ba288a9840b..ce360c089b1 100644
--- a/packages/connect-explorer/tsconfig.json
+++ b/packages/connect-explorer/tsconfig.json
@@ -18,11 +18,13 @@
         { "path": "../components" },
         { "path": "../connect" },
         { "path": "../connect-explorer-theme" },
+        { "path": "../connect-mobile" },
         { "path": "../connect-web" },
         { "path": "../connect-webextension" },
         { "path": "../protobuf" },
         { "path": "../schema-utils" },
         { "path": "../theme" },
-        { "path": "../utils" }
+        { "path": "../utils" },
+        { "path": "../eslint" }
     ]
 }
diff --git a/packages/connect-iframe/eslint.config.mjs b/packages/connect-iframe/eslint.config.mjs
new file mode 100644
index 00000000000..0091a8c91d2
--- /dev/null
+++ b/packages/connect-iframe/eslint.config.mjs
@@ -0,0 +1,20 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'import/no-default-export': 'off', // Todo: shall be fixed
+
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/webpack/**',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/connect-iframe/package.json b/packages/connect-iframe/package.json
index 60a20adbf3c..a3c55393a5e 100644
--- a/packages/connect-iframe/package.json
+++ b/packages/connect-iframe/package.json
@@ -3,7 +3,6 @@
     "version": "9.0.0",
     "private": true,
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "build:iframe": "TS_NODE_PROJECT=\"tsconfig.json\" yarn webpack --config ./webpack/prod.webpack.config.ts --stats-children",
         "build:core-module": "TS_NODE_PROJECT=\"tsconfig.json\" yarn webpack --config ./webpack/core.webpack.config.ts --stats-children",
         "build": "yarn rimraf build && yarn build:iframe && yarn build:core-module",
@@ -20,13 +19,14 @@
     "devDependencies": {
         "@babel/preset-typescript": "^7.24.7",
         "@trezor/env-utils": "workspace:*",
+        "@trezor/eslint": "workspace:*",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^12.0.2",
         "es6-promise": "^4.2.8",
         "html-webpack-plugin": "^5.6.0",
         "rimraf": "^6.0.1",
         "terser-webpack-plugin": "^5.3.9",
-        "webpack": "^5.94.0",
+        "webpack": "^5.96.1",
         "webpack-cli": "^5.1.4",
         "webpack-merge": "^6.0.1",
         "worker-loader": "^3.0.8"
diff --git a/packages/connect-iframe/src/connectSettings.ts b/packages/connect-iframe/src/connectSettings.ts
index 052e8de1ffc..2a403fb8132 100644
--- a/packages/connect-iframe/src/connectSettings.ts
+++ b/packages/connect-iframe/src/connectSettings.ts
@@ -76,7 +76,6 @@ export const parseConnectSettings = (
     }
 
     if (disableWebUsb) {
-        settings.webusb = false;
         // allow all but WebUsbTransport
         settings.transports = settings.transports?.filter(
             transport => transport !== 'WebUsbTransport',
diff --git a/packages/connect-iframe/src/index.ts b/packages/connect-iframe/src/index.ts
index 74f95a7da9f..9feeb5f8eba 100644
--- a/packages/connect-iframe/src/index.ts
+++ b/packages/connect-iframe/src/index.ts
@@ -28,8 +28,9 @@ import { getOrigin } from '@trezor/connect/src/utils/urlUtils';
 import { suggestBridgeInstaller } from '@trezor/connect/src/data/transportInfo';
 import { suggestUdevInstaller } from '@trezor/connect/src/data/udevInfo';
 import { storage, getSystemInfo, getInstallerPackage } from '@trezor/connect-common';
-import { parseConnectSettings, isOriginWhitelisted } from './connectSettings';
 import { analytics, EventType } from '@trezor/connect-analytics';
+
+import { parseConnectSettings, isOriginWhitelisted } from './connectSettings';
 // @ts-expect-error (typescript does not know this is worker constructor, this is done by webpack)
 import LogWorker from './sharedLoggerWorker';
 import { initLogWriterWithWorker } from './sharedLoggerUtils';
@@ -314,7 +315,7 @@ const init = async (payload: IFrameInit['payload'], origin: string) => {
             // throws DOMException: The operation is insecure.
             _popupMessagePort = new BroadcastChannel(broadcastID);
             _popupMessagePort.onmessage = message => handleMessage(message);
-        } catch (error) {
+        } catch {
             // popup will use MessageChannel fallback communication
         }
     }
diff --git a/packages/connect-iframe/src/sharedLoggerUtils.ts b/packages/connect-iframe/src/sharedLoggerUtils.ts
index 63690ddf40a..c021aa03cea 100644
--- a/packages/connect-iframe/src/sharedLoggerUtils.ts
+++ b/packages/connect-iframe/src/sharedLoggerUtils.ts
@@ -6,10 +6,10 @@ interface LogWorkerClass extends SharedWorker {
 
 let logWorker: SharedWorker | undefined;
 
-const logWriterFactory = (logWorker: SharedWorker | undefined) => (): LogWriter => ({
+const logWriterFactory = (logWorker2: SharedWorker | undefined) => (): LogWriter => ({
     add: (message: LogMessage) => {
-        if (logWorker) {
-            logWorker.port.postMessage({ type: 'add-log', data: message });
+        if (logWorker2) {
+            logWorker2.port.postMessage({ type: 'add-log', data: message });
         }
     },
 });
diff --git a/packages/connect-iframe/tsconfig.json b/packages/connect-iframe/tsconfig.json
index b85b5eb4b90..22e8c593575 100644
--- a/packages/connect-iframe/tsconfig.json
+++ b/packages/connect-iframe/tsconfig.json
@@ -9,6 +9,7 @@
         { "path": "../connect" },
         { "path": "../connect-analytics" },
         { "path": "../connect-common" },
-        { "path": "../env-utils" }
+        { "path": "../env-utils" },
+        { "path": "../eslint" }
     ]
 }
diff --git a/packages/connect-iframe/webpack/base.webpack.config.ts b/packages/connect-iframe/webpack/base.webpack.config.ts
index 1b73e0ea59f..8a8238ae09b 100644
--- a/packages/connect-iframe/webpack/base.webpack.config.ts
+++ b/packages/connect-iframe/webpack/base.webpack.config.ts
@@ -3,6 +3,7 @@ import { execSync } from 'child_process';
 import webpack from 'webpack';
 import CopyWebpackPlugin from 'copy-webpack-plugin';
 import TerserPlugin from 'terser-webpack-plugin';
+
 import { version } from '../package.json';
 
 const COMMON_DATA_SRC = '../../packages/connect-common/files';
diff --git a/packages/connect-deeplink/README.md b/packages/connect-mobile/README.md
similarity index 66%
rename from packages/connect-deeplink/README.md
rename to packages/connect-mobile/README.md
index 4604d578a9f..c7ae4c9bf4b 100644
--- a/packages/connect-deeplink/README.md
+++ b/packages/connect-mobile/README.md
@@ -1,8 +1,10 @@
-# @trezor/connect-deeplink
+# @trezor/connect-mobile
 
-[![NPM](https://img.shields.io/npm/v/@trezor/connect-deeplink.svg)](https://www.npmjs.org/package/@trezor/connect-deeplink)
+[![NPM](https://img.shields.io/npm/v/@trezor/connect-mobile.svg)](https://www.npmjs.org/package/@trezor/connect-mobile)
 
-The `@trezor/connect-deeplink` package provides an implementation of `@trezor/connect` which uses deep links to communicate with the Trezor Suite Lite app.
+The `@trezor/connect-mobile` package provides an implementation of `@trezor/connect` which uses deep links to communicate with the Trezor Suite Lite app.
+
+## 🚧 BETA version, work in progress 🚧
 
 Currently the library is still under development, only supports read-only methods and does not communicate with the production Suite Lite app.
 
@@ -13,7 +15,7 @@ To run a dev version of the Suite mobile app follow the instructions in [@suite-
 To use the library, you need to initialize it with the `deeplinkOpen` and `deeplinkCallbackUrl` settings.
 
 ```javascript
-import TrezorConnect from '@trezor/connect-deeplink';
+import TrezorConnect from '@trezor/connect-mobile';
 
 TrezorConnect.init({
     manifest: {
@@ -43,4 +45,4 @@ useEffect(() => {
 
 ## Example
 
-The [Connect deeplink example](https://github.com/trezor/trezor-suite/tree/develop/packages/connect-examples/deeplink-expo) shows how to use the library in a React Native + Expo app.
+The [Connect mobile example](https://github.com/trezor/trezor-suite/tree/develop/packages/connect-examples/mobile-expo) shows how to use the library in a React Native + Expo app.
diff --git a/packages/connect-mobile/package.json b/packages/connect-mobile/package.json
new file mode 100644
index 00000000000..403d1712d1c
--- /dev/null
+++ b/packages/connect-mobile/package.json
@@ -0,0 +1,31 @@
+{
+    "name": "@trezor/connect-mobile",
+    "version": "0.0.1-beta.1",
+    "license": "See LICENSE.md in repo root",
+    "sideEffects": false,
+    "main": "src/index.ts",
+    "publishConfig": {
+        "main": "lib/index.js"
+    },
+    "npmPublishAccess": "public",
+    "files": [
+        "lib/"
+    ],
+    "scripts": {
+        "depcheck": "yarn g:depcheck",
+        "type-check": "yarn g:tsc --build",
+        "build:lib": "yarn g:rimraf ./lib && yarn g:tsc --build tsconfig.lib.json && ../../scripts/replace-imports.sh ./lib",
+        "prepublishOnly": "yarn tsx ../../scripts/prepublishNPM.js",
+        "prepublish": "yarn tsx ../../scripts/prepublish.js"
+    },
+    "devDependencies": {
+        "tsx": "^4.16.3"
+    },
+    "dependencies": {
+        "@trezor/connect": "workspace:^",
+        "@trezor/utils": "workspace:^"
+    },
+    "peerDependencies": {
+        "tslib": "^2.6.2"
+    }
+}
diff --git a/packages/connect-deeplink/src/index.ts b/packages/connect-mobile/src/index.ts
similarity index 85%
rename from packages/connect-deeplink/src/index.ts
rename to packages/connect-mobile/src/index.ts
index b4b8422a0bc..f6400f9e387 100644
--- a/packages/connect-deeplink/src/index.ts
+++ b/packages/connect-mobile/src/index.ts
@@ -4,22 +4,21 @@ import * as ERRORS from '@trezor/connect/src/constants/errors';
 import { parseConnectSettings } from '@trezor/connect/src/data/connectSettings';
 import type { CallMethodPayload } from '@trezor/connect/src/events/call';
 import { ConnectFactoryDependencies, factory } from '@trezor/connect/src/factory';
-import type { TrezorConnect as TrezorConnectType } from '@trezor/connect/src/types';
 import type {
+    ConnectSettingsMobile,
     ConnectSettings,
-    ConnectSettingsPublic,
     Manifest,
     Response,
 } from '@trezor/connect/src/types';
 import { Login } from '@trezor/connect/src/types/api/requestLogin';
 import { Deferred, createDeferred } from '@trezor/utils';
+import { InitFullSettings } from '@trezor/connect/src/types/api/init';
 
-export class TrezorConnectDeeplink implements ConnectFactoryDependencies {
+export class TrezorConnectDeeplink implements ConnectFactoryDependencies<ConnectSettingsMobile> {
     public eventEmitter = new EventEmitter();
     private _settings: ConnectSettings;
     private messagePromises: Record<number, Deferred<any>> = {};
     private messageID = 0;
-    private defaultDeeplinkUrl = 'trezorsuitelite://connect';
 
     public constructor() {
         this._settings = {
@@ -40,7 +39,7 @@ export class TrezorConnectDeeplink implements ConnectFactoryDependencies {
         };
     }
 
-    public init(settings: Partial<ConnectSettingsPublic>) {
+    public init(settings: InitFullSettings<ConnectSettingsMobile>) {
         if (!settings.deeplinkOpen) {
             throw new Error('TrezorConnect native requires "deeplinkOpen" setting.');
         }
@@ -48,7 +47,6 @@ export class TrezorConnectDeeplink implements ConnectFactoryDependencies {
             ...parseConnectSettings({ ...this._settings, ...settings }),
             deeplinkOpen: settings.deeplinkOpen,
             deeplinkCallbackUrl: settings.deeplinkCallbackUrl,
-            deeplinkUrl: settings.deeplinkUrl || this.defaultDeeplinkUrl,
         };
 
         return Promise.resolve();
@@ -84,16 +82,6 @@ export class TrezorConnectDeeplink implements ConnectFactoryDependencies {
         throw ERRORS.TypedError('Method_InvalidPackage');
     }
 
-    public renderWebUSBButton() {}
-
-    public disableWebUSB() {
-        throw ERRORS.TypedError('Method_InvalidPackage');
-    }
-
-    public requestWebUSBDevice() {
-        throw ERRORS.TypedError('Method_InvalidPackage');
-    }
-
     public cancel(error?: string) {
         this.resolveMessagePromises({
             success: false,
@@ -125,6 +113,11 @@ export class TrezorConnectDeeplink implements ConnectFactoryDependencies {
             return;
         }
 
+        if (!this.messagePromises[id]) {
+            // Most likely old ID, ignore
+            return;
+        }
+
         const responseParam = parsedUrl.searchParams.get('response');
         if (!responseParam) {
             this.messagePromises[id].resolve({
@@ -140,7 +133,9 @@ export class TrezorConnectDeeplink implements ConnectFactoryDependencies {
         let parsedParams;
         try {
             parsedParams = JSON.parse(responseParam);
-        } catch {}
+        } catch {
+            /* empty */
+        }
 
         if (!parsedParams) {
             this.messagePromises[id].resolve({
@@ -156,7 +151,7 @@ export class TrezorConnectDeeplink implements ConnectFactoryDependencies {
         delete this.messagePromises[id];
     }
 
-    resolveMessagePromises(resolvePayload: Record<string, any>) {
+    private resolveMessagePromises(resolvePayload: Record<string, any>) {
         Object.keys(this.messagePromises).forEach(id => {
             this.messagePromises[id as any].resolve({
                 id,
@@ -187,24 +182,26 @@ export class TrezorConnectDeeplink implements ConnectFactoryDependencies {
 }
 
 const impl = new TrezorConnectDeeplink();
-const TrezorConnect: TrezorConnectType & {
-    handleDeeplink: (url: string) => void;
-} = {
-    ...factory({
+const TrezorConnect = factory<
+    ConnectSettingsMobile,
+    {
+        handleDeeplink: (url: string) => void;
+    }
+>(
+    {
         eventEmitter: impl.eventEmitter,
         init: impl.init.bind(impl),
         call: impl.call.bind(impl),
         manifest: impl.manifest.bind(impl),
         requestLogin: impl.requestLogin.bind(impl),
         uiResponse: impl.uiResponse.bind(impl),
-        renderWebUSBButton: impl.renderWebUSBButton.bind(impl),
-        disableWebUSB: impl.disableWebUSB.bind(impl),
-        requestWebUSBDevice: impl.requestWebUSBDevice.bind(impl),
         cancel: impl.cancel.bind(impl),
         dispose: impl.dispose.bind(impl),
-    }),
-    handleDeeplink: impl.handleDeeplink.bind(impl),
-};
+    },
+    {
+        handleDeeplink: impl.handleDeeplink.bind(impl),
+    },
+);
 
 // eslint-disable-next-line import/no-default-export
 export default TrezorConnect;
diff --git a/packages/connect-deeplink/tsconfig.json b/packages/connect-mobile/tsconfig.json
similarity index 100%
rename from packages/connect-deeplink/tsconfig.json
rename to packages/connect-mobile/tsconfig.json
diff --git a/packages/connect-mobile/tsconfig.lib.json b/packages/connect-mobile/tsconfig.lib.json
new file mode 100644
index 00000000000..dfc917a9a0d
--- /dev/null
+++ b/packages/connect-mobile/tsconfig.lib.json
@@ -0,0 +1,15 @@
+{
+    "extends": "../../tsconfig.lib.json",
+    "compilerOptions": {
+        "outDir": "lib"
+    },
+    "include": ["./src"],
+    "references": [
+        {
+            "path": "../connect"
+        },
+        {
+            "path": "../utils"
+        }
+    ]
+}
diff --git a/packages/connect-plugin-ethereum/CHANGELOG.md b/packages/connect-plugin-ethereum/CHANGELOG.md
index d6ab00a6ecd..76aaa81a529 100644
--- a/packages/connect-plugin-ethereum/CHANGELOG.md
+++ b/packages/connect-plugin-ethereum/CHANGELOG.md
@@ -1,6 +1,6 @@
 # UNRELEASED
 
--   updated `@metamask/eth-sig-util` from `^7.0.1` to `^7.0.3`
+-   updated `@metamask/eth-sig-util` from `^7.0.1` to `^8.0.0`
 
 # 9.0.3
 
diff --git a/packages/connect-plugin-ethereum/__tests__/index.test.ts b/packages/connect-plugin-ethereum/__tests__/index.test.ts
index d9e44c1f079..2d1e751c582 100644
--- a/packages/connect-plugin-ethereum/__tests__/index.test.ts
+++ b/packages/connect-plugin-ethereum/__tests__/index.test.ts
@@ -1,4 +1,4 @@
-// eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import commonFixtures from '../../../submodules/trezor-common/tests/fixtures/ethereum/sign_typed_data.json';
 import { transformTypedData } from '../src/index';
diff --git a/packages/connect-plugin-ethereum/package.json b/packages/connect-plugin-ethereum/package.json
index 6499479b1a6..5688c46ec20 100644
--- a/packages/connect-plugin-ethereum/package.json
+++ b/packages/connect-plugin-ethereum/package.json
@@ -26,14 +26,13 @@
         "lib/"
     ],
     "peerDependencies": {
-        "@metamask/eth-sig-util": "^7.0.3",
+        "@metamask/eth-sig-util": "^8.0.0",
         "tslib": "^2.6.2"
     },
     "devDependencies": {
-        "@metamask/eth-sig-util": "^7.0.3"
+        "@metamask/eth-sig-util": "^8.0.0"
     },
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js",
         "type-check": "yarn g:tsc --build tsconfig.json",
         "build:lib": "yarn g:rimraf ./lib && yarn g:tsc --build tsconfig.lib.json && ../../scripts/replace-imports.sh ./lib"
diff --git a/packages/connect-plugin-ethereum/src/index.ts b/packages/connect-plugin-ethereum/src/index.ts
index 605487701f2..b9808a1a476 100644
--- a/packages/connect-plugin-ethereum/src/index.ts
+++ b/packages/connect-plugin-ethereum/src/index.ts
@@ -68,4 +68,5 @@ export const transformTypedData = <T extends sigUtil.MessageTypes>(
     };
 };
 
+// eslint-disable-next-line import/no-default-export
 export default transformTypedData;
diff --git a/packages/connect-plugin-stellar/CHANGELOG.md b/packages/connect-plugin-stellar/CHANGELOG.md
index c7320c79b67..99902dbda30 100644
--- a/packages/connect-plugin-stellar/CHANGELOG.md
+++ b/packages/connect-plugin-stellar/CHANGELOG.md
@@ -1,6 +1,6 @@
 # UNRELEASED
 
--   chore: update @stellar/stellar-sdk to ^12.1.0
+-   chore: update @stellar/stellar-sdk to ^12.1.3
 
 # 9.0.3
 
diff --git a/packages/connect-plugin-stellar/eslint.config.mjs b/packages/connect-plugin-stellar/eslint.config.mjs
new file mode 100644
index 00000000000..7985d792067
--- /dev/null
+++ b/packages/connect-plugin-stellar/eslint.config.mjs
@@ -0,0 +1,10 @@
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'import/no-default-export': 'off', // Todo: fix and solve
+        },
+    },
+];
diff --git a/packages/connect-plugin-stellar/package.json b/packages/connect-plugin-stellar/package.json
index 1549b21d2b3..59e3984467e 100644
--- a/packages/connect-plugin-stellar/package.json
+++ b/packages/connect-plugin-stellar/package.json
@@ -26,18 +26,18 @@
         "lib/"
     ],
     "peerDependencies": {
-        "@stellar/stellar-sdk": "^12.1.0",
+        "@stellar/stellar-sdk": "^12.1.3",
         "@trezor/connect": "9.x.x",
         "tslib": "^2.6.2"
     },
     "devDependencies": {
-        "@stellar/stellar-sdk": "^12.1.0"
+        "@stellar/stellar-sdk": "^12.1.3",
+        "@trezor/eslint": "workspace:*"
     },
     "dependencies": {
         "@trezor/utils": "workspace:*"
     },
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "jest -c ../../jest.config.base.js",
         "type-check": "yarn g:tsc --build tsconfig.json",
         "build:lib": "yarn g:rimraf ./lib && yarn g:tsc --build tsconfig.lib.json && ../../scripts/replace-imports.sh ./lib"
diff --git a/packages/connect-plugin-stellar/src/index.ts b/packages/connect-plugin-stellar/src/index.ts
index bf42c2f23e5..21cb64240c3 100644
--- a/packages/connect-plugin-stellar/src/index.ts
+++ b/packages/connect-plugin-stellar/src/index.ts
@@ -9,6 +9,7 @@ import {
     MemoHash,
     MemoReturn,
 } from '@stellar/stellar-sdk';
+
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 
 /**
diff --git a/packages/connect-plugin-stellar/tsconfig.json b/packages/connect-plugin-stellar/tsconfig.json
index a8cca951753..72cf2ecc55c 100644
--- a/packages/connect-plugin-stellar/tsconfig.json
+++ b/packages/connect-plugin-stellar/tsconfig.json
@@ -2,5 +2,8 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "./libDev" },
     "include": ["."],
-    "references": [{ "path": "../utils" }]
+    "references": [
+        { "path": "../utils" },
+        { "path": "../eslint" }
+    ]
 }
diff --git a/packages/connect-plugin-stellar/tsconfig.lib.json b/packages/connect-plugin-stellar/tsconfig.lib.json
index 8cd606846ba..59c8b0c6763 100644
--- a/packages/connect-plugin-stellar/tsconfig.lib.json
+++ b/packages/connect-plugin-stellar/tsconfig.lib.json
@@ -7,6 +7,9 @@
     "references": [
         {
             "path": "../utils"
+        },
+        {
+            "path": "../eslint"
         }
     ]
 }
diff --git a/packages/connect-popup/e2e/playwright.config.ts b/packages/connect-popup/e2e/playwright.config.ts
index e3379a05507..2b18f455a80 100644
--- a/packages/connect-popup/e2e/playwright.config.ts
+++ b/packages/connect-popup/e2e/playwright.config.ts
@@ -12,4 +12,6 @@ const config: PlaywrightTestConfig = {
         ...devices[process.env.MOBILE ? 'Pixel 7' : 'Desktop Chrome'],
     },
 };
+
+// eslint-disable-next-line import/no-default-export
 export default config;
diff --git a/packages/connect-popup/e2e/support/helpers.ts b/packages/connect-popup/e2e/support/helpers.ts
index 257ac0147ba..af4b47f1852 100644
--- a/packages/connect-popup/e2e/support/helpers.ts
+++ b/packages/connect-popup/e2e/support/helpers.ts
@@ -22,14 +22,14 @@ export const log = (...val: string[]) => {
 
 // Next.js uses client side routing, so we use this to navigate without reloading the page
 export const nextJsGoto = async (page: Page, url: string) => {
-    await page.evaluate(url => {
-        (window as any).router.push(url);
+    await page.evaluate(url2 => {
+        (window as any).router.push(url2);
     }, url);
 };
 
-export const formatUrl = (baseUrl: string, path: string) => {
+export const formatUrl = (baseUrl: string, path2: string) => {
     const [baseUrlWithoutParams, params] = baseUrl.split('?');
-    const [pathWithoutParams, pathParams] = path.split('?');
+    const [pathWithoutParams, pathParams] = path2.split('?');
 
     return `${baseUrlWithoutParams}${pathWithoutParams}?${params ? `${params}&` : ''}${pathParams ?? ''}`;
 };
diff --git a/packages/connect-popup/e2e/tests/__fixtures__/methods.ts b/packages/connect-popup/e2e/tests/__fixtures__/methods.ts
index 2f005005ce8..6a9fd709fe6 100644
--- a/packages/connect-popup/e2e/tests/__fixtures__/methods.ts
+++ b/packages/connect-popup/e2e/tests/__fixtures__/methods.ts
@@ -309,6 +309,26 @@ const wipeDevice = [
     },
 ];
 
+const loadDevice = [
+    {
+        dir: 'device',
+        url: 'loadDevice',
+        device: {
+            wiped: true,
+        },
+        views: [
+            {
+                selector: '.device-management >> visible=true',
+                screenshot: {
+                    name: 'load-device',
+                },
+                next: 'button.confirm >> visible=true',
+            },
+            followDevice,
+        ],
+    },
+];
+
 /*const resetDevice = [
     {
         url: 'resetDevice',
@@ -693,6 +713,7 @@ export const fixtures = [
     // management methods
     // note that it is not so important to test these as they are not available to 3rd party
     ...wipeDevice,
+    ...loadDevice,
     // todo: resetDevice also breaks next test in queue and is flaky itself
     // ...resetDevice,
     // todo: missing
diff --git a/packages/connect-popup/e2e/tests/analytics.test.ts b/packages/connect-popup/e2e/tests/analytics.test.ts
index 9a9b20b049b..380347e5099 100644
--- a/packages/connect-popup/e2e/tests/analytics.test.ts
+++ b/packages/connect-popup/e2e/tests/analytics.test.ts
@@ -1,6 +1,7 @@
 import { test, expect } from '@playwright/test';
 
 import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
+
 import { waitAndClick } from '../support/helpers';
 
 const url = process.env.URL || 'http://localhost:8088/';
diff --git a/packages/connect-popup/e2e/tests/browser-support.test.ts b/packages/connect-popup/e2e/tests/browser-support.test.ts
index 58cca779072..8bab9442706 100644
--- a/packages/connect-popup/e2e/tests/browser-support.test.ts
+++ b/packages/connect-popup/e2e/tests/browser-support.test.ts
@@ -1,6 +1,8 @@
 import { test, expect, Page, devices } from '@playwright/test';
+
 import { ensureDirectoryExists } from '@trezor/node-utils';
 import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
+
 import { formatUrl, log, waitAndClick } from '../support/helpers';
 
 const url = process.env.URL || 'http://localhost:8088/';
diff --git a/packages/connect-popup/e2e/tests/methods.test.ts b/packages/connect-popup/e2e/tests/methods.test.ts
index 9cddbd281d7..88c333c1ea1 100644
--- a/packages/connect-popup/e2e/tests/methods.test.ts
+++ b/packages/connect-popup/e2e/tests/methods.test.ts
@@ -1,9 +1,10 @@
 import { expect, test } from '@playwright/test';
 
 import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
+import { ensureDirectoryExists } from '@trezor/node-utils';
+
 import { fixtures } from './__fixtures__/methods';
 import { buildOverview } from '../support/buildOverview';
-import { ensureDirectoryExists } from '@trezor/node-utils';
 import { getContexts, log, formatUrl, openPopup, setConnectSettings } from '../support/helpers';
 
 const url = process.env.URL || 'http://localhost:8088/';
@@ -62,6 +63,7 @@ filteredFixtures.forEach(f => {
         // - fixture require different device than prev fixture, or
         // - fixture is retried
         // FIXME: always reset for now, due to flaky tests with bridge bug
+        // eslint-disable-next-line no-constant-binary-expression,no-constant-condition
         if (true || JSON.stringify(device) !== JSON.stringify(f.device) || retry) {
             device = f.device;
             await TrezorUserEnvLink.stopBridge();
diff --git a/packages/connect-popup/e2e/tests/passphrase.test.ts b/packages/connect-popup/e2e/tests/passphrase.test.ts
index 252eec90ca8..df3f759854b 100644
--- a/packages/connect-popup/e2e/tests/passphrase.test.ts
+++ b/packages/connect-popup/e2e/tests/passphrase.test.ts
@@ -1,5 +1,7 @@
 import { test, Page, BrowserContext } from '@playwright/test';
+
 import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
+
 import {
     findElementByDataTest,
     formatUrl,
@@ -372,7 +374,7 @@ test('passphrase mismatch', async ({ page }) => {
             timeout: 10000,
         });
         await popup.click('.explain.unacquired');
-    } catch (error) {
+    } catch {
         // May appear or not
     }
 
diff --git a/packages/connect-popup/e2e/tests/permissions.test.ts b/packages/connect-popup/e2e/tests/permissions.test.ts
index 3d6837c3803..f5d8dc8d1b2 100644
--- a/packages/connect-popup/e2e/tests/permissions.test.ts
+++ b/packages/connect-popup/e2e/tests/permissions.test.ts
@@ -1,5 +1,7 @@
 import { test, chromium, Page } from '@playwright/test';
+
 import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
+
 import { setConnectSettings, waitAndClick } from '../support/helpers';
 
 const url = process.env.URL || 'http://localhost:8088/';
diff --git a/packages/connect-popup/e2e/tests/popup-close.test.ts b/packages/connect-popup/e2e/tests/popup-close.test.ts
index 2833a1cb9eb..2849a75021b 100644
--- a/packages/connect-popup/e2e/tests/popup-close.test.ts
+++ b/packages/connect-popup/e2e/tests/popup-close.test.ts
@@ -1,6 +1,8 @@
 import { test, Page, BrowserContext } from '@playwright/test';
+
 import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
 import { addDashesToSpaces, createTimeoutPromise } from '@trezor/utils';
+
 import {
     findElementByDataTest,
     waitAndClick,
@@ -186,7 +188,7 @@ test(`device disconnected during device interaction`, async ({ page, context })
     try {
         log('waiting to click @connect-ui/error-close-button');
         await popup.click("button[data-testid='@connect-ui/error-close-button']");
-    } catch (error) {
+    } catch {
         // Sometimes this crashes with error that the page is already closed.
     }
 
@@ -229,7 +231,7 @@ test('when user cancels permissions in popup it closes automatically', async ({
 
     await popup.waitForLoadState('load');
 
-    if (isCoreInPopup) {
+    if (isWebExtension || isCoreInPopup) {
         await popup.waitForSelector('.select-device-list button.list', { state: 'visible' });
         await popup.click('.select-device-list button.list');
     }
diff --git a/packages/connect-popup/e2e/tests/popup-pages.test.ts b/packages/connect-popup/e2e/tests/popup-pages.test.ts
index 84b3ed32ff3..2501726d290 100644
--- a/packages/connect-popup/e2e/tests/popup-pages.test.ts
+++ b/packages/connect-popup/e2e/tests/popup-pages.test.ts
@@ -1,5 +1,8 @@
 import { test, Page, BrowserContext, expect } from '@playwright/test';
+import fs from 'fs';
+
 import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
+
 import {
     getContexts,
     openPopup,
@@ -9,8 +12,6 @@ import {
     waitAndClick,
 } from '../support/helpers';
 
-import fs from 'fs';
-
 const url = process.env.URL || 'http://localhost:8088/';
 
 const bridgeVersion = '2.0.33';
diff --git a/packages/connect-popup/e2e/tests/transport.test.ts b/packages/connect-popup/e2e/tests/transport.test.ts
index d977fa15c4a..21bb1d86059 100644
--- a/packages/connect-popup/e2e/tests/transport.test.ts
+++ b/packages/connect-popup/e2e/tests/transport.test.ts
@@ -1,9 +1,11 @@
 import { test, expect, firefox, chromium, Page, BrowserContext } from '@playwright/test';
-import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
-import { waitAndClick, log, formatUrl } from '../support/helpers';
 import http from 'http';
 import https from 'https';
 
+import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
+
+import { waitAndClick, log, formatUrl } from '../support/helpers';
+
 const url = process.env.URL || 'http://localhost:8088/';
 
 // different origin URL for testing cross-origin requests
@@ -129,8 +131,9 @@ fixtures.forEach(f => {
 
         const afterCleanup = await f.setup?.(context);
 
-        log(`going to: ${url}${f.queryString}#/method/verifyMessage`);
-        await page.goto(formatUrl(url, `methods/bitcoin/verifyMessage/${f.queryString}`));
+        const formattedUrl = formatUrl(url, `methods/bitcoin/verifyMessage/${f.queryString}`);
+        log(`going to: ${formattedUrl}`);
+        await page.goto(formattedUrl);
         log('waiting for explorer to load');
         await waitAndClick(page, ['@api-playground/collapsible-box']);
         await page.waitForSelector("button[data-testid='@submit-button']", {
diff --git a/packages/connect-popup/e2e/tests/unchained.test.ts b/packages/connect-popup/e2e/tests/unchained.test.ts
index 17c3a975a81..099829b8ff9 100644
--- a/packages/connect-popup/e2e/tests/unchained.test.ts
+++ b/packages/connect-popup/e2e/tests/unchained.test.ts
@@ -1,6 +1,7 @@
 /* eslint no-await-in-loop: 0 */
 
 import { test, expect, Page } from '@playwright/test';
+
 import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
 
 const connectUrl = process.env.URL ? process.env.URL : 'https://connect.trezor.io/9/';
@@ -102,7 +103,7 @@ const signTransaction = async (page: Page, iteration: number) => {
             });
             await TrezorUserEnvLink.send({ type: 'emulator-press-yes' });
             await popup.waitForTimeout(501);
-        } catch (err) {
+        } catch {
             confirmOnTrezorScreenStilVisible = false;
         }
     }
diff --git a/packages/connect-popup/e2e/tests/webextension-example.test.ts b/packages/connect-popup/e2e/tests/webextension-example.test.ts
index a762b3978f8..68b00e79465 100644
--- a/packages/connect-popup/e2e/tests/webextension-example.test.ts
+++ b/packages/connect-popup/e2e/tests/webextension-example.test.ts
@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/no-shadow
 import { test, expect, chromium } from '@playwright/test';
 import path from 'path';
 
diff --git a/packages/connect-popup/eslint.config.mjs b/packages/connect-popup/eslint.config.mjs
new file mode 100644
index 00000000000..4dbf151aab2
--- /dev/null
+++ b/packages/connect-popup/eslint.config.mjs
@@ -0,0 +1,20 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'no-console': 'off',
+            'no-restricted-syntax': 'off', // Todo: fix and solve
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/webpack/**',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/connect-popup/package.json b/packages/connect-popup/package.json
index 41db6cafa1b..d79c6212ce6 100644
--- a/packages/connect-popup/package.json
+++ b/packages/connect-popup/package.json
@@ -4,7 +4,6 @@
     "private": true,
     "sideEffects": false,
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "lint:styles": "npx stylelint './src/**/*{.ts,.tsx}' --cache --config ../../.stylelintrc",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
@@ -36,6 +35,7 @@
         "@playwright/browser-firefox": "^1.46.1",
         "@playwright/browser-webkit": "^1.46.1",
         "@playwright/test": "^1.46.1",
+        "@trezor/eslint": "workspace:*",
         "@trezor/node-utils": "workspace:*",
         "@trezor/trezor-user-env-link": "workspace:*",
         "@trezor/utils": "workspace:*",
@@ -45,7 +45,7 @@
         "html-webpack-plugin": "^5.6.0",
         "rimraf": "^6.0.1",
         "terser-webpack-plugin": "^5.3.9",
-        "webpack": "^5.94.0",
+        "webpack": "^5.96.1",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^5.0.4",
         "webpack-merge": "^6.0.1",
diff --git a/packages/connect-popup/src/deeplink.tsx b/packages/connect-popup/src/deeplink.tsx
index a965066eff2..ae9e7c2dd30 100644
--- a/packages/connect-popup/src/deeplink.tsx
+++ b/packages/connect-popup/src/deeplink.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+
 import styled, { ThemeProvider } from 'styled-components';
 import { createRoot } from 'react-dom/client';
 
@@ -50,10 +51,10 @@ const DeeplinkFallback = () => {
                     You have opened a deep link to the Trezor Connect mobile application. Please
                     install the application from{' '}
                     <a href="https://play.google.com/store/apps/details?id=io.trezor.suite">
-                        Google Play
+                        Google&nbsp;Play
                     </a>
                     {' or '}
-                    <a href="https://apps.apple.com/app/id1631884497">App Store</a>.
+                    <a href="https://apps.apple.com/app/id1631884497">App&nbsp;Store</a>.
                 </StyledP>
             </View>
         </>
diff --git a/packages/connect-popup/src/index.tsx b/packages/connect-popup/src/index.tsx
index e2aea21941a..f3618a3c356 100644
--- a/packages/connect-popup/src/index.tsx
+++ b/packages/connect-popup/src/index.tsx
@@ -22,11 +22,12 @@ import type { Core } from '@trezor/connect/src/core';
 import { config } from '@trezor/connect/src/data/config';
 import { parseConnectSettings } from '@trezor/connect-iframe/src/connectSettings';
 import { initLogWriterWithSrcPath } from '@trezor/connect-iframe/src/sharedLoggerUtils';
-
 import { reactEventBus } from '@trezor/connect-ui/src/utils/eventBus';
 import { ErrorViewProps } from '@trezor/connect-ui/src/views/Error';
 import { analytics, EventType } from '@trezor/connect-analytics';
 import { getSystemInfo } from '@trezor/connect-common';
+import { initLog, setLogWriter, LogWriter } from '@trezor/connect/src/utils/debug';
+import { DEFAULT_DOMAIN } from '@trezor/connect/src/data/version';
 
 import * as view from './view';
 import {
@@ -38,8 +39,6 @@ import {
     showView,
 } from './view/common';
 import { isPhishingDomain } from './utils/isPhishingDomain';
-import { initLog, setLogWriter, LogWriter } from '@trezor/connect/src/utils/debug';
-import { DEFAULT_DOMAIN } from '@trezor/connect/src/data/version';
 
 const INTERVAL_CHECK_PARENT_ALIVE_MS = 1000;
 const INTERVAL_HANDSHAKE_TIMEOUT_MS = 90 * 1000;
@@ -58,7 +57,7 @@ const escapeHtml = (payload: any) => {
         div.appendChild(document.createTextNode(JSON.stringify(payload)));
 
         return JSON.parse(div.innerHTML);
-    } catch (error) {
+    } catch {
         // do nothing
     }
 };
@@ -193,6 +192,7 @@ const handleResponseEvent = (data: MethodResponseMessage) => {
             default:
                 fail({
                     type: 'error',
+                    code,
                     detail: 'response-event-error',
                     message: ('error' in data.payload && data.payload.error) || 'Unknown error',
                 });
@@ -320,6 +320,22 @@ const handleMessageInCoreMode = (
                 info: method.info,
             });
             reactEventBus.dispatch({ type: 'state-update', payload: getState() });
+
+            const { settings } = getState();
+            const transport = core.getTransportInfo();
+            analytics.report({
+                type: EventType.AppReady,
+                payload: {
+                    version: settings?.version,
+                    origin: settings?.origin,
+                    referrerApp: settings?.manifest?.appUrl,
+                    referrerEmail: settings?.manifest?.email,
+                    method: method?.name,
+                    payload: method?.payload ? Object.keys(method.payload) : undefined,
+                    transportType: transport?.type,
+                    transportVersion: transport?.version,
+                },
+            });
         });
     }
 
@@ -504,8 +520,8 @@ const initCoreInIframe = async (payload: PopupInit['payload']) => {
 };
 
 // handle POPUP.HANDSHAKE message from iframe or npm-client
-const handshake = (handshake: PopupHandshake, origin: string) => {
-    const { payload, ...handshakeRest } = handshake;
+const handshake = (handshake2: PopupHandshake, origin: string) => {
+    const { payload, ...handshakeRest } = handshake2;
     log.debug('handshake with origin: ', origin, 'payload: ', payload);
 
     if (!payload) return;
@@ -535,7 +551,7 @@ const handshake = (handshake: PopupHandshake, origin: string) => {
         const core = ensureCore();
         core.handleMessage(handshakeRest);
     }
-    reactEventBus.dispatch({ type: 'state-update', payload: handshake.payload });
+    reactEventBus.dispatch({ type: 'state-update', payload: handshake2.payload });
 
     log.debug('handshake done');
 };
diff --git a/packages/connect-popup/src/log.tsx b/packages/connect-popup/src/log.tsx
index 12c7b1dd9cb..95397127d8c 100644
--- a/packages/connect-popup/src/log.tsx
+++ b/packages/connect-popup/src/log.tsx
@@ -1,4 +1,5 @@
 import React, { useEffect, useState } from 'react';
+
 import styled, { ThemeProvider } from 'styled-components';
 import { createRoot } from 'react-dom/client';
 
@@ -102,7 +103,7 @@ const useLogWorker = (setLogs: React.Dispatch<React.SetStateAction<any[]>>) => {
 
     try {
         logWorker = new SharedWorker('./workers/shared-logger-worker.js');
-    } catch (error) {
+    } catch {
         console.warn('Failed to initialize SharedWorker');
     }
 
diff --git a/packages/connect-popup/src/static/deeplink.html b/packages/connect-popup/src/static/deeplink.html
index a19d5b56e17..454103ddc5b 100644
--- a/packages/connect-popup/src/static/deeplink.html
+++ b/packages/connect-popup/src/static/deeplink.html
@@ -16,10 +16,10 @@
         <meta name="theme-color" content="#ffffff" />
         <meta http-equiv="Pragma" content="no-cache" />
         <meta http-equiv="Expires" content="-1" />
-        <link href="../popup.css" rel="stylesheet" />
-        <link rel="icon" type="image/png" href="../images/favicon.png" />
+        <link href="../../popup.css" rel="stylesheet" />
+        <link rel="icon" type="image/png" href="../../images/favicon.png" />
         <!-- suite-like fonts -->
-        <link media="all" rel="stylesheet" href="../fonts/fonts.css" />
+        <link media="all" rel="stylesheet" href="../../fonts/fonts.css" />
     </head>
     <body>
         <div id="deeplink-react"></div>
@@ -27,7 +27,7 @@
         <script type="text/javascript" async="false">
             const pageScript = document.createElement('script');
             pageScript.setAttribute('type', 'text/javascript');
-            pageScript.setAttribute('src', '../<%= htmlWebpackPlugin.files.js[0] %>');
+            pageScript.setAttribute('src', '../../<%= htmlWebpackPlugin.files.js[0] %>');
             pageScript.setAttribute('async', 'false');
             document.body.appendChild(pageScript);
         </script>
diff --git a/packages/connect-popup/src/types/eth-phishing-detect.d.ts b/packages/connect-popup/src/types/eth-phishing-detect.d.ts
index 0c89fbe8d6b..34424c00151 100644
--- a/packages/connect-popup/src/types/eth-phishing-detect.d.ts
+++ b/packages/connect-popup/src/types/eth-phishing-detect.d.ts
@@ -1,3 +1,4 @@
 declare module 'eth-phishing-detect' {
+    // eslint-disable-next-line import/no-default-export
     export default function (domain: string): boolean;
 }
diff --git a/packages/connect-popup/src/view/browser.ts b/packages/connect-popup/src/view/browser.ts
index 782170d5c52..c193b80efc1 100644
--- a/packages/connect-popup/src/view/browser.ts
+++ b/packages/connect-popup/src/view/browser.ts
@@ -2,6 +2,7 @@
 
 import { SystemInfo } from '@trezor/connect';
 import { storage } from '@trezor/connect-common';
+
 import { container, showView } from './common';
 
 export const initBrowserView = (systemInfo: SystemInfo): Promise<boolean> => {
diff --git a/packages/connect-popup/src/view/common.tsx b/packages/connect-popup/src/view/common.tsx
index 29f3b98b480..dbc9cfda61b 100644
--- a/packages/connect-popup/src/view/common.tsx
+++ b/packages/connect-popup/src/view/common.tsx
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/popup/view/common.js
 
+import { createRoot } from 'react-dom/client';
+
 import {
     POPUP,
     ERRORS,
@@ -8,12 +10,11 @@ import {
     CoreRequestMessage,
     CoreEventMessage,
 } from '@trezor/connect';
-import { createRoot } from 'react-dom/client';
-
 import { ConnectUI, State, getDefaultState } from '@trezor/connect-ui';
-import { StyleSheetWrapper } from './react/StylesSheetWrapper';
 import { reactEventBus } from '@trezor/connect-ui/src/utils/eventBus';
 
+import { StyleSheetWrapper } from './react/StylesSheetWrapper';
+
 export const header: HTMLElement = document.getElementsByTagName('header')[0];
 export const container: HTMLElement = document.getElementById('container')!;
 export const views: HTMLElement = document.getElementById('views')!;
@@ -33,10 +34,10 @@ export const createTooltip = (text: string) => {
 
 export const clearLegacyView = () => {
     // clear and hide legacy views
-    const container = document.getElementById('container');
-    if (container) {
-        container.innerHTML = '';
-        container.style.display = 'none';
+    const container2 = document.getElementById('container');
+    if (container2) {
+        container2.innerHTML = '';
+        container2.style.display = 'none';
     }
 };
 
@@ -78,7 +79,7 @@ export const getIframeElement = () => {
             if (frames[i].location.host === window.location.host) {
                 iframe = frames[i];
             }
-        } catch (error) {
+        } catch {
             // do nothing, try next entry
         }
     }
@@ -106,9 +107,9 @@ export const initMessageChannelWithIframe = async (
     const handshakeLoader = (api: Pick<MessagePort, 'addEventListener' | 'removeEventListener'>) =>
         Promise.race([
             new Promise<boolean>(resolve => {
-                api.addEventListener('message', function handler(event) {
+                api.addEventListener('message', function messageHandler(event) {
                     if (event.data.type === POPUP.HANDSHAKE) {
-                        api.removeEventListener('message', handler);
+                        api.removeEventListener('message', messageHandler);
                         resolve(true);
                     }
                 });
@@ -146,7 +147,7 @@ export const initMessageChannelWithIframe = async (
             // otherwise close BroadcastChannel and try to use MessageChannel fallback
             broadcast.close();
             broadcast.removeEventListener('message', handler);
-        } catch (error) {
+        } catch {
             // silent error. use MessageChannel as fallback communication
         }
     }
diff --git a/packages/connect-popup/src/view/confirmation.ts b/packages/connect-popup/src/view/confirmation.ts
index 8bf81d8f8a7..f5806df33cf 100644
--- a/packages/connect-popup/src/view/confirmation.ts
+++ b/packages/connect-popup/src/view/confirmation.ts
@@ -1,6 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/popup/view/confirmation.js
 
 import { UI, createUiResponse, UiRequestConfirmation } from '@trezor/connect';
+
 import { container, showView, postMessage } from './common';
 
 export const initConfirmationView = (data: UiRequestConfirmation['payload']) => {
diff --git a/packages/connect-popup/src/view/firmwareNotCompatible.ts b/packages/connect-popup/src/view/firmwareNotCompatible.ts
index 5844b275cf3..1378f0f6ba7 100644
--- a/packages/connect-popup/src/view/firmwareNotCompatible.ts
+++ b/packages/connect-popup/src/view/firmwareNotCompatible.ts
@@ -1,9 +1,10 @@
 // origin https://github.com/trezor/connect/blob/develop/src/js/popup/view/firmwareNotCompatible.js
 
 import { UI, createUiResponse, UiRequestUnexpectedDeviceMode } from '@trezor/connect';
-import { showView, postMessage, getState } from './common';
 import { getFirmwareVersion } from '@trezor/device-utils';
 
+import { showView, postMessage, getState } from './common';
+
 export const firmwareNotCompatible = (device: UiRequestUnexpectedDeviceMode['payload']) => {
     const view = showView('firmware-not-compatible');
 
diff --git a/packages/connect-popup/src/view/firmwareNotSupported.ts b/packages/connect-popup/src/view/firmwareNotSupported.ts
index f59ad2fd9d3..5ada49d8373 100644
--- a/packages/connect-popup/src/view/firmwareNotSupported.ts
+++ b/packages/connect-popup/src/view/firmwareNotSupported.ts
@@ -1,6 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/popup/view/firmwareNotSupported.js
 
 import { UiRequestUnexpectedDeviceMode } from '@trezor/connect';
+
 import { showView } from './common';
 
 export const firmwareNotSupported = (device: UiRequestUnexpectedDeviceMode['payload']) => {
diff --git a/packages/connect-popup/src/view/firmwareRequiredUpdate.ts b/packages/connect-popup/src/view/firmwareRequiredUpdate.ts
index 4d7001a708f..411d740b419 100644
--- a/packages/connect-popup/src/view/firmwareRequiredUpdate.ts
+++ b/packages/connect-popup/src/view/firmwareRequiredUpdate.ts
@@ -2,6 +2,7 @@
 
 import { UiRequestUnexpectedDeviceMode } from '@trezor/connect';
 import { SUITE_FIRMWARE_URL } from '@trezor/urls';
+
 import { showView } from './common';
 
 export const firmwareRequiredUpdate = (device: UiRequestUnexpectedDeviceMode['payload']) => {
diff --git a/packages/connect-popup/src/view/invalidPassphrase.ts b/packages/connect-popup/src/view/invalidPassphrase.ts
index f33978b16fb..5924c0e6333 100644
--- a/packages/connect-popup/src/view/invalidPassphrase.ts
+++ b/packages/connect-popup/src/view/invalidPassphrase.ts
@@ -1,6 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/popup/view/invalidPassphrase.js
 
 import { UI, createUiResponse, UiRequestDeviceAction } from '@trezor/connect';
+
 import { container, showView, postMessage } from './common';
 
 export const initInvalidPassphraseView = (_payload: UiRequestDeviceAction['payload']) => {
diff --git a/packages/connect-popup/src/view/passphraseOnDevice.ts b/packages/connect-popup/src/view/passphraseOnDevice.ts
index 36f4cbd2e54..09776bdfa97 100644
--- a/packages/connect-popup/src/view/passphraseOnDevice.ts
+++ b/packages/connect-popup/src/view/passphraseOnDevice.ts
@@ -1,6 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/popup/view/passphraseOnDevice.js
 
 import { UiRequestDeviceAction } from '@trezor/connect';
+
 import { container, showView } from './common';
 
 export const passphraseOnDeviceView = (payload: UiRequestDeviceAction['payload']) => {
diff --git a/packages/connect-popup/src/view/permissions.ts b/packages/connect-popup/src/view/permissions.ts
index dfaf71a6499..cc2d80f2b95 100644
--- a/packages/connect-popup/src/view/permissions.ts
+++ b/packages/connect-popup/src/view/permissions.ts
@@ -2,6 +2,7 @@
 
 import { UI, createUiResponse, UiRequestPermission } from '@trezor/connect';
 import { analytics, EventType } from '@trezor/connect-analytics';
+
 import { container, showView, postMessage, createTooltip, getState } from './common';
 
 const getPermissionText = (permissionType: string, _deviceName: string) => {
diff --git a/packages/connect-popup/src/view/pin.ts b/packages/connect-popup/src/view/pin.ts
index 65c4a592197..826769368e2 100644
--- a/packages/connect-popup/src/view/pin.ts
+++ b/packages/connect-popup/src/view/pin.ts
@@ -1,6 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/popup/view/pin.js
 
 import { UI, createUiResponse, UiRequestDeviceAction } from '@trezor/connect';
+
 import { container, showView, postMessage } from './common';
 
 const isSubmitButtonDisabled = (isDisabled: boolean) => {
diff --git a/packages/connect-popup/src/view/react/StylesSheetWrapper.tsx b/packages/connect-popup/src/view/react/StylesSheetWrapper.tsx
index 403b9af421e..a9b2af0faf5 100644
--- a/packages/connect-popup/src/view/react/StylesSheetWrapper.tsx
+++ b/packages/connect-popup/src/view/react/StylesSheetWrapper.tsx
@@ -1,4 +1,5 @@
 import { ReactNode } from 'react';
+
 import { StyleSheetManager } from 'styled-components';
 
 interface StyleSheetWrapperProps {
diff --git a/packages/connect-popup/src/view/requestButton.ts b/packages/connect-popup/src/view/requestButton.ts
index 5f2a0e5fe83..44924f86d71 100644
--- a/packages/connect-popup/src/view/requestButton.ts
+++ b/packages/connect-popup/src/view/requestButton.ts
@@ -1,6 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/popup/view/requestButton.js
 
 import { UiRequestButton } from '@trezor/connect';
+
 import { container, showView } from './common';
 
 let toastTimeout: NodeJS.Timeout | undefined;
diff --git a/packages/connect-popup/src/view/selectAccount.ts b/packages/connect-popup/src/view/selectAccount.ts
index 25765e34e0a..32a0f6cf51c 100644
--- a/packages/connect-popup/src/view/selectAccount.ts
+++ b/packages/connect-popup/src/view/selectAccount.ts
@@ -7,6 +7,7 @@ import {
     UiRequestSelectAccount,
     DiscoveryAccountType,
 } from '@trezor/connect';
+
 import { container, showView, postMessage } from './common';
 
 const setHeader = (payload: UiRequestSelectAccount['payload']) => {
diff --git a/packages/connect-popup/src/view/selectDevice.ts b/packages/connect-popup/src/view/selectDevice.ts
index 5f46ad7f5bd..9f9e231a42a 100644
--- a/packages/connect-popup/src/view/selectDevice.ts
+++ b/packages/connect-popup/src/view/selectDevice.ts
@@ -12,9 +12,10 @@ import {
 } from '@trezor/connect';
 import { TREZOR_USB_DESCRIPTORS } from '@trezor/transport/src/constants';
 import { SUITE_URL, SUITE_UDEV_URL, TREZOR_SUPPORT_URL } from '@trezor/urls';
-import { container, getState, showView, postMessage } from './common';
 import { reactEventBus } from '@trezor/connect-ui/src/utils/eventBus';
 
+import { container, getState, showView, postMessage } from './common';
+
 const initWebUsbButton = (showLoader: boolean) => {
     const webusbContainer = container.getElementsByClassName('webusb')[0] as HTMLElement;
     webusbContainer.style.display = 'flex';
@@ -57,6 +58,7 @@ const initWebUsbButton = (showLoader: boolean) => {
                 filters: TREZOR_USB_DESCRIPTORS,
             });
 
+            // eslint-disable-next-line @typescript-eslint/no-shadow
             const { iframe, core } = getState();
 
             if (iframe) {
diff --git a/packages/connect-popup/src/view/selectFee.ts b/packages/connect-popup/src/view/selectFee.ts
index 255f110009c..41baf35336c 100644
--- a/packages/connect-popup/src/view/selectFee.ts
+++ b/packages/connect-popup/src/view/selectFee.ts
@@ -9,6 +9,7 @@ import {
     SelectFeeLevel,
 } from '@trezor/connect';
 import { formatAmount, formatTime } from '@trezor/connect/src/utils/formatUtils';
+
 import { container, showView, postMessage } from './common';
 
 const fees: SelectFeeLevel[] = [];
diff --git a/packages/connect-popup/src/view/word.ts b/packages/connect-popup/src/view/word.ts
index 0db8f117ae3..4c91de58cab 100644
--- a/packages/connect-popup/src/view/word.ts
+++ b/packages/connect-popup/src/view/word.ts
@@ -1,9 +1,10 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/popup/view/word.js
 
 import { UI, createUiResponse, UiRequestDeviceAction } from '@trezor/connect';
-import { container, showView, postMessage } from './common';
 import { bip39 } from '@trezor/crypto-utils';
 
+import { container, showView, postMessage } from './common';
+
 const initWordPlainView = (payload: UiRequestDeviceAction['payload']) => {
     showView('word-plain');
 
diff --git a/packages/connect-popup/tsconfig.json b/packages/connect-popup/tsconfig.json
index cf08ba98670..0e722bc91b0 100644
--- a/packages/connect-popup/tsconfig.json
+++ b/packages/connect-popup/tsconfig.json
@@ -16,6 +16,7 @@
         { "path": "../device-utils" },
         { "path": "../transport" },
         { "path": "../urls" },
+        { "path": "../eslint" },
         { "path": "../node-utils" },
         { "path": "../trezor-user-env-link" },
         { "path": "../utils" }
diff --git a/packages/connect-popup/webpack/dev.webpack.config.ts b/packages/connect-popup/webpack/dev.webpack.config.ts
index 0455850df4b..85aa832852d 100644
--- a/packages/connect-popup/webpack/dev.webpack.config.ts
+++ b/packages/connect-popup/webpack/dev.webpack.config.ts
@@ -1,6 +1,7 @@
 import path from 'path';
 import { merge } from 'webpack-merge';
 import { WebpackPluginServe } from 'webpack-plugin-serve';
+
 import prod from './prod.webpack.config';
 
 const dev = {
@@ -19,4 +20,5 @@ const dev = {
     ],
 };
 
+// eslint-disable-next-line import/no-default-export
 export default merge([prod, dev]);
diff --git a/packages/connect-popup/webpack/prod.webpack.config.ts b/packages/connect-popup/webpack/prod.webpack.config.ts
index 3840b4b4fbe..0d52b98006c 100644
--- a/packages/connect-popup/webpack/prod.webpack.config.ts
+++ b/packages/connect-popup/webpack/prod.webpack.config.ts
@@ -3,9 +3,12 @@ import webpack, { DefinePlugin } from 'webpack';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import TerserPlugin from 'terser-webpack-plugin';
 import CopyPlugin from 'copy-webpack-plugin';
+import { execSync } from 'child_process';
+
 import * as URLS from '@trezor/urls';
+import { DEEPLINK_VERSION } from '@trezor/connect/src/data/version';
+
 import { version } from '../package.json';
-import { execSync } from 'child_process';
 
 const STATIC_SRC = path.join(__dirname, '../src/static');
 const DIST = path.resolve(__dirname, '../build');
@@ -83,14 +86,19 @@ const config: webpack.Configuration = {
             minify: false,
             urls: URLS,
         }),
-        new HtmlWebpackPlugin({
-            chunks: ['deeplink'],
-            template: `${STATIC_SRC}/deeplink.html`,
-            filename: 'deeplink/index.html',
-            inject: false,
-            minify: false,
-            urls: URLS,
-        }),
+        // deeplink fallback page for all versions
+        ...Array.from(
+            { length: DEEPLINK_VERSION },
+            (_, i) =>
+                new HtmlWebpackPlugin({
+                    chunks: ['deeplink'],
+                    template: `${STATIC_SRC}/deeplink.html`,
+                    filename: `deeplink/${i + 1}/index.html`,
+                    inject: false,
+                    minify: false,
+                    urls: URLS,
+                }),
+        ),
         new HtmlWebpackPlugin({
             chunks: ['log'],
             template: `${STATIC_SRC}/log.html`,
@@ -143,4 +151,5 @@ const config: webpack.Configuration = {
     },
 };
 
+// eslint-disable-next-line import/no-default-export
 export default config;
diff --git a/packages/connect-ui/package.json b/packages/connect-ui/package.json
index 921660f6fca..7b0fdc33df9 100644
--- a/packages/connect-ui/package.json
+++ b/packages/connect-ui/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "lint:styles": "npx stylelint './src/**/*{.ts,.tsx}' --cache --config ../../.stylelintrc",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
diff --git a/packages/connect-ui/src/components/Passphrase/PassphraseTypeCard.tsx b/packages/connect-ui/src/components/Passphrase/PassphraseTypeCard.tsx
index bad33322e7d..3136dbb7f01 100644
--- a/packages/connect-ui/src/components/Passphrase/PassphraseTypeCard.tsx
+++ b/packages/connect-ui/src/components/Passphrase/PassphraseTypeCard.tsx
@@ -363,6 +363,7 @@ export const PassphraseTypeCard = (props: PassphraseTypeCardLegacyProps) => {
                                     ) : null
                                 }
                                 inputState={isTooLong ? 'error' : undefined}
+                                // eslint-disable-next-line jsx-a11y/no-autofocus
                                 autoFocus={!isAndroid()}
                                 innerAddon={
                                     <Icon
diff --git a/packages/connect-ui/src/components/Passphrase/PassphraseTypeCardContent.tsx b/packages/connect-ui/src/components/Passphrase/PassphraseTypeCardContent.tsx
index d5895a01ede..05adb990144 100644
--- a/packages/connect-ui/src/components/Passphrase/PassphraseTypeCardContent.tsx
+++ b/packages/connect-ui/src/components/Passphrase/PassphraseTypeCardContent.tsx
@@ -153,6 +153,7 @@ export const PassphraseTypeCardContent = ({
                                         ) : null
                                     }
                                     inputState={isPassphraseTooLong ? 'error' : undefined}
+                                    // eslint-disable-next-line jsx-a11y/no-autofocus
                                     autoFocus={!isAndroid()}
                                     innerAddon={
                                         <Icon
diff --git a/packages/connect-ui/src/views/Error.tsx b/packages/connect-ui/src/views/Error.tsx
index 56eb0778ace..3fbd130bc57 100644
--- a/packages/connect-ui/src/views/Error.tsx
+++ b/packages/connect-ui/src/views/Error.tsx
@@ -12,6 +12,8 @@ import {
     variables,
 } from '@trezor/components';
 import { isFirefox } from '@trezor/env-utils';
+import { HELP_FIRMWARE_TYPE } from '@trezor/urls';
+import { spacings } from '@trezor/theme';
 
 export interface ErrorViewProps {
     type: 'error';
@@ -22,6 +24,7 @@ export interface ErrorViewProps {
         | 'core-missing' // core was loaded correctly but became unavailable later
         | 'core-failed-to-load'; // dynamic import of core failed
     // future errors when using connect-ui in different contexts
+    code?: string;
     message?: string;
 }
 
@@ -145,7 +148,25 @@ const getTroubleshootingTips = (props: ErrorViewProps) => {
             icon: 'question',
             title: 'Action not completed',
             detail: {
-                steps: [<Step>{props.message}</Step>],
+                steps: [
+                    props.code === 'Device_MissingCapabilityBtcOnly' ? (
+                        <>
+                            <Step>{props.message}</Step>
+                            <Button
+                                href={HELP_FIRMWARE_TYPE}
+                                size="small"
+                                variant="tertiary"
+                                icon="arrowRight"
+                                iconAlignment="right"
+                                margin={{ top: spacings.md }}
+                            >
+                                Learn more
+                            </Button>
+                        </>
+                    ) : (
+                        <Step>{props.message}</Step>
+                    ),
+                ],
             },
         });
     }
diff --git a/packages/connect-web/.eslintrc.js b/packages/connect-web/.eslintrc.js
deleted file mode 100644
index a4fa9fb2181..00000000000
--- a/packages/connect-web/.eslintrc.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-    rules: {
-        'no-underscore-dangle': 'off', // underscore is used
-        camelcase: 'off', // camelcase is used
-    },
-};
diff --git a/packages/connect-web/README.md b/packages/connect-web/README.md
index b466017c9a4..f8a7e674524 100644
--- a/packages/connect-web/README.md
+++ b/packages/connect-web/README.md
@@ -54,3 +54,18 @@ For more instructions [refer to this document](https://github.com/trezor/trezor-
 -   install node_modules: `yarn && yarn build:libs`
 -   generate certs `yarn workspace @trezor/connect-web predev`
 -   It is possible to run local dev server with iframe and popup using: `yarn workspace @trezor/connect-web dev` Note: don't forget to visit `https://localhost:8088/` and allow self-signed certificate. No UI is displayed here.
+
+## TrezorConnect Support Matrix
+
+The table below details the support for different environments by TrezorConnect for integrating Trezor devices, including the use of WebUSB and the need for Trezor Bridge.
+
+| Environment                   | Chrome | Firefox | Safari | Chrome Android | Firefox Android | Notes                                                                   |
+| ----------------------------- | :----: | :-----: | :----: | :------------: | :-------------: | ----------------------------------------------------------------------- |
+| Web (WebUSB)                  |   ✓    |    ✗    |   ✗    |       ✓        |        ✗        | WebUSB is fully supported where indicated. (Chromium based browsers)    |
+| Web (Bridge)                  |   ✓    |    ✓    |   ✗    |       ✗        |        ✗        | Trezor Bridge is required where WebUSB is not supported. (e.g. Firefox) |
+| WebExtension (WebUSB, Bridge) |   ✓    |    ✓    |   ✗    |       ✓        |        ✗        | Requires Trezor Bridge on platforms not supporting WebUSB.              |
+
+## Key Differences
+
+-   **WebUSB**: Allows direct communication with Trezor devices via the browser. Supported by most modern browsers but may have limitations on mobile devices and is not supported by Safari.
+-   **Trezor Bridge**: A service that runs with Trezor Suite or Standalone that facilitates communication between your Trezor device and a web browser. Required for browsers that do not support WebUSB or for a more stable connection on desktop environments.
diff --git a/packages/connect-web/eslint.config.mjs b/packages/connect-web/eslint.config.mjs
new file mode 100644
index 00000000000..7000dd889a8
--- /dev/null
+++ b/packages/connect-web/eslint.config.mjs
@@ -0,0 +1,22 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'no-underscore-dangle': 'off', // underscore is used
+            camelcase: 'off', // camelcase is used
+            'jest/valid-expect': 'off', // because of cypress tests
+            'import/no-default-export': 'off', // Todo: shall be fixed
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/webpack/**',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/connect-web/package.json b/packages/connect-web/package.json
index fb194105987..f2de9a32b6c 100644
--- a/packages/connect-web/package.json
+++ b/packages/connect-web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@trezor/connect-web",
-    "version": "9.4.2",
+    "version": "9.4.3-beta.2",
     "author": "Trezor <info@trezor.io>",
     "homepage": "https://github.com/trezor/trezor-suite/tree/develop/packages/connect-web",
     "description": "High-level javascript interface for Trezor hardware wallet in web environment.",
@@ -29,7 +29,6 @@
     ],
     "scripts": {
         "predev": "node webpack/generate_dev_cert.js",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "test:unit": "yarn g:jest",
@@ -53,7 +52,8 @@
         "@playwright/browser-firefox": "^1.46.1",
         "@playwright/browser-webkit": "^1.46.1",
         "@playwright/test": "^1.46.1",
-        "@types/chrome": "^0.0.270",
+        "@trezor/eslint": "workspace:*",
+        "@types/chrome": "^0.0.278",
         "@types/w3c-web-usb": "^1.0.10",
         "babel-loader": "^9.1.3",
         "html-webpack-plugin": "^5.6.0",
@@ -61,7 +61,7 @@
         "selfsigned": "^2.4.1",
         "terser-webpack-plugin": "^5.3.9",
         "tsx": "^4.16.3",
-        "webpack": "^5.94.0",
+        "webpack": "^5.96.1",
         "webpack-cli": "^5.1.4",
         "webpack-merge": "^6.0.1",
         "webpack-plugin-serve": "^1.6.0",
diff --git a/packages/connect-web/src/iframe/index.ts b/packages/connect-web/src/iframe/index.ts
index b134ec3c80b..da4fd0b4cd1 100644
--- a/packages/connect-web/src/iframe/index.ts
+++ b/packages/connect-web/src/iframe/index.ts
@@ -6,6 +6,7 @@ import { IFRAME, CoreRequestMessage } from '@trezor/connect/src/events';
 import type { ConnectSettings } from '@trezor/connect/src/types';
 import { getOrigin } from '@trezor/connect/src/utils/urlUtils';
 import { setLogWriter, LogMessage, LogWriter } from '@trezor/connect/src/utils/debug';
+
 import css from './inlineStyles';
 
 export let instance: HTMLIFrameElement | null;
@@ -18,7 +19,7 @@ export const dispose = () => {
     if (instance && instance.parentNode) {
         try {
             instance.parentNode.removeChild(instance);
-        } catch (e) {
+        } catch {
             // do nothing
         }
     }
@@ -85,9 +86,6 @@ export const init = async (settings: ConnectSettings) => {
     }
 
     instance.setAttribute('src', src);
-    if (settings.webusb) {
-        console.warn('webusb option is deprecated. use `transports: ["WebUsbTransport"] instead`');
-    }
     if (navigator.usb) {
         instance.setAttribute('allow', 'usb');
     }
@@ -111,7 +109,7 @@ export const init = async (settings: ConnectSettings) => {
 
                 return;
             }
-        } catch (e) {
+        } catch {
             // empty
         }
 
diff --git a/packages/connect-web/src/impl/core-in-iframe.ts b/packages/connect-web/src/impl/core-in-iframe.ts
index f6efc1dc298..a4e19acbd26 100644
--- a/packages/connect-web/src/impl/core-in-iframe.ts
+++ b/packages/connect-web/src/impl/core-in-iframe.ts
@@ -19,18 +19,24 @@ import {
     CoreEventMessage,
     CallMethodPayload,
 } from '@trezor/connect/src/events';
-import type { ConnectSettings, DeviceIdentity, Manifest } from '@trezor/connect/src/types';
+import type {
+    ConnectSettings,
+    ConnectSettingsWeb,
+    DeviceIdentity,
+    Manifest,
+} from '@trezor/connect/src/types';
 import { ConnectFactoryDependencies, factory } from '@trezor/connect/src/factory';
 import { Log, initLog } from '@trezor/connect/src/utils/debug';
 import { config } from '@trezor/connect/src/data/config';
 import { DeferredManager, createDeferredManager } from '@trezor/utils/src/createDeferredManager';
+import { InitFullSettings } from '@trezor/connect/src/types/api/init';
 
 import * as iframe from '../iframe';
 import * as popup from '../popup';
 import webUSBButton from '../webusb/button';
 import { parseConnectSettings } from '../connectSettings';
 
-export class CoreInIframe implements ConnectFactoryDependencies {
+export class CoreInIframe implements ConnectFactoryDependencies<ConnectSettingsWeb> {
     public eventEmitter = new EventEmitter();
     protected _settings: ConnectSettings;
 
@@ -149,7 +155,7 @@ export class CoreInIframe implements ConnectFactoryDependencies {
         }
     }
 
-    public async init(settings: Partial<ConnectSettings> = {}) {
+    public async init(settings: InitFullSettings<ConnectSettingsWeb>) {
         if (iframe.instance) {
             throw ERRORS.TypedError('Init_AlreadyInitialized');
         }
@@ -221,6 +227,7 @@ export class CoreInIframe implements ConnectFactoryDependencies {
 
             // auto init with default settings
             try {
+                // @ts-expect-error manifest could have been changed in the meantime, hard to check this
                 await this.init(this._settings);
             } catch (error) {
                 if (this._popupManager) {
@@ -341,7 +348,7 @@ export class CoreInIframe implements ConnectFactoryDependencies {
         try {
             await window.navigator.usb.requestDevice({ filters: config.webusb });
             iframe.postMessage({ type: TRANSPORT.REQUEST_DEVICE });
-        } catch (_err) {
+        } catch {
             // user hits cancel gets "DOMException: No device selected."
             // no need to log this
         }
@@ -351,17 +358,21 @@ export class CoreInIframe implements ConnectFactoryDependencies {
 const impl = new CoreInIframe();
 
 // Exported to enable using directly
-export const TrezorConnect = factory({
-    // Bind all methods due to shadowing `this`
-    eventEmitter: impl.eventEmitter,
-    init: impl.init.bind(impl),
-    call: impl.call.bind(impl),
-    manifest: impl.manifest.bind(impl),
-    requestLogin: impl.requestLogin.bind(impl),
-    uiResponse: impl.uiResponse.bind(impl),
-    renderWebUSBButton: impl.renderWebUSBButton.bind(impl),
-    disableWebUSB: impl.disableWebUSB.bind(impl),
-    requestWebUSBDevice: impl.requestWebUSBDevice.bind(impl),
-    cancel: impl.cancel.bind(impl),
-    dispose: impl.dispose.bind(impl),
-});
+export const TrezorConnect = factory(
+    {
+        // Bind all methods due to shadowing `this`
+        eventEmitter: impl.eventEmitter,
+        init: impl.init.bind(impl),
+        call: impl.call.bind(impl),
+        manifest: impl.manifest.bind(impl),
+        requestLogin: impl.requestLogin.bind(impl),
+        uiResponse: impl.uiResponse.bind(impl),
+        cancel: impl.cancel.bind(impl),
+        dispose: impl.dispose.bind(impl),
+    },
+    {
+        renderWebUSBButton: impl.renderWebUSBButton.bind(impl),
+        disableWebUSB: impl.disableWebUSB.bind(impl),
+        requestWebUSBDevice: impl.requestWebUSBDevice.bind(impl),
+    },
+);
diff --git a/packages/connect-web/src/impl/core-in-popup.ts b/packages/connect-web/src/impl/core-in-popup.ts
index 58732b4071b..966b202c94b 100644
--- a/packages/connect-web/src/impl/core-in-popup.ts
+++ b/packages/connect-web/src/impl/core-in-popup.ts
@@ -13,23 +13,24 @@ import {
 import * as ERRORS from '@trezor/connect/src/constants/errors';
 import type {
     ConnectSettings,
-    ConnectSettingsPublic,
+    ConnectSettingsWeb,
     Manifest,
     Response,
 } from '@trezor/connect/src/types';
 import { ConnectFactoryDependencies, factory } from '@trezor/connect/src/factory';
 import { initLog, setLogWriter, LogMessage, LogWriter, Log } from '@trezor/connect/src/utils/debug';
-import * as popup from '../popup';
-
-import { parseConnectSettings } from '../connectSettings';
 import { Login } from '@trezor/connect/src/types/api/requestLogin';
 import { createDeferred } from '@trezor/utils';
+import { InitFullSettings } from '@trezor/connect/src/types/api/init';
+
+import { parseConnectSettings } from '../connectSettings';
+import * as popup from '../popup';
 
 /**
  * Base class for CoreInPopup methods for TrezorConnect factory.
  * This implementation is directly used here in connect-web, but it is also extended in connect-webextension.
  */
-export class CoreInPopup implements ConnectFactoryDependencies {
+export class CoreInPopup implements ConnectFactoryDependencies<ConnectSettingsWeb> {
     public eventEmitter = new EventEmitter();
     protected _settings: ConnectSettings;
 
@@ -81,7 +82,7 @@ export class CoreInPopup implements ConnectFactoryDependencies {
         }
     }
 
-    public init(settings: Partial<ConnectSettingsPublic> = {}): Promise<void> {
+    public init(settings: InitFullSettings<{}>): Promise<void> {
         const oldSettings = parseConnectSettings({
             ...this._settings,
         });
@@ -240,9 +241,6 @@ export const TrezorConnect = factory({
     manifest: impl.manifest.bind(impl),
     requestLogin: impl.requestLogin.bind(impl),
     uiResponse: impl.uiResponse.bind(impl),
-    renderWebUSBButton: impl.renderWebUSBButton.bind(impl),
-    disableWebUSB: impl.disableWebUSB.bind(impl),
-    requestWebUSBDevice: impl.requestWebUSBDevice.bind(impl),
     cancel: impl.cancel.bind(impl),
     dispose: impl.dispose.bind(impl),
 });
diff --git a/packages/connect-web/src/index.ts b/packages/connect-web/src/index.ts
index 7ead4ff22a5..052bf1c0994 100644
--- a/packages/connect-web/src/index.ts
+++ b/packages/connect-web/src/index.ts
@@ -1,107 +1,60 @@
 import { ConnectFactoryDependencies, factory } from '@trezor/connect/src/factory';
+import { TrezorConnectDynamic } from '@trezor/connect/src/impl/dynamic';
+import type { ConnectSettingsPublic, ConnectSettingsWeb } from '@trezor/connect';
+
 import { CoreInIframe } from './impl/core-in-iframe';
 import { CoreInPopup } from './impl/core-in-popup';
-import ProxyEventEmitter from './utils/proxy-event-emitter';
-import type { ConnectSettings, ConnectSettingsPublic, Manifest } from '@trezor/connect/src/types';
-import EventEmitter from 'events';
-import { CallMethodPayload } from '@trezor/connect/src/events';
 import { getEnv } from './connectSettings';
 
-type TrezorConnectType = 'core-in-popup' | 'iframe';
-
 const IFRAME_ERRORS = ['Init_IframeBlocked', 'Init_IframeTimeout', 'Transport_Missing'];
 
-/**
- * Implementation of TrezorConnect that can dynamically switch between iframe and core-in-popup implementations
- */
-export class TrezorConnectDynamicImpl implements ConnectFactoryDependencies {
-    public eventEmitter: EventEmitter;
-
-    private currentTarget: TrezorConnectType = 'iframe';
-    private coreInIframeImpl: CoreInIframe;
-    private coreInPopupImpl: CoreInPopup;
-
-    private lastSettings?: Partial<ConnectSettings>;
-
-    public constructor() {
-        this.coreInIframeImpl = new CoreInIframe();
-        this.coreInPopupImpl = new CoreInPopup();
-        this.eventEmitter = new ProxyEventEmitter([
-            this.coreInIframeImpl.eventEmitter,
-            this.coreInPopupImpl.eventEmitter,
-        ]);
-    }
-
-    private getTarget() {
-        return this.currentTarget === 'iframe' ? this.coreInIframeImpl : this.coreInPopupImpl;
-    }
-
-    private async switchTarget(target: TrezorConnectType) {
-        if (this.currentTarget === target) {
-            return;
-        }
-
-        await this.getTarget().dispose();
-        this.currentTarget = target;
-        await this.getTarget().init(this.lastSettings);
-    }
-
-    public manifest(manifest: Manifest) {
-        this.lastSettings = {
-            ...this.lastSettings,
-            manifest,
-        };
-
-        this.getTarget().manifest(manifest);
-    }
-
-    public async init(settings: Partial<ConnectSettingsPublic> = {}) {
-        const env = getEnv();
-        if (settings.coreMode === 'iframe' || settings.popup === false || env === 'webextension') {
-            this.currentTarget = 'iframe';
+type ConnectWebExtraMethods = {
+    renderWebUSBButton: (className?: string) => void;
+    disableWebUSB: () => void;
+    requestWebUSBDevice: () => void;
+};
+
+const impl = new TrezorConnectDynamic<
+    'iframe' | 'core-in-popup',
+    ConnectSettingsWeb,
+    ConnectFactoryDependencies<ConnectSettingsWeb> & ConnectWebExtraMethods
+>({
+    implementations: [
+        {
+            type: 'iframe',
+            impl: new CoreInIframe(),
+        },
+        {
+            type: 'core-in-popup',
+            impl: new CoreInPopup(),
+        },
+    ],
+    getInitTarget: (settings: Partial<ConnectSettingsPublic & ConnectSettingsWeb>) => {
+        if (settings.coreMode === 'iframe') {
+            return 'iframe';
         } else if (settings.coreMode === 'popup') {
-            this.currentTarget = 'core-in-popup';
+            return 'core-in-popup';
         } else {
-            // Default to auto mode with iframe as the first choice
-            settings.coreMode = 'auto';
-            this.currentTarget = 'iframe';
-        }
-
-        // Save settings for later use
-        this.lastSettings = settings;
-
-        // Initialize the target
-        try {
-            return await this.getTarget().init(settings);
-        } catch (error) {
-            // Handle iframe errors by switching to core-in-popup
-            if (await this.handleErrorFallback(error.code)) {
-                return await this.getTarget().init(settings);
+            if (settings.coreMode && settings.coreMode !== 'auto') {
+                console.warn(`Invalid coreMode: ${settings.coreMode}`);
             }
 
-            throw error;
-        }
-    }
-
-    public async call(params: CallMethodPayload) {
-        const response = await this.getTarget().call(params);
-        if (!response.success) {
-            if (await this.handleErrorFallback(response.payload.code)) {
-                return await this.getTarget().call(params);
-            }
+            return 'iframe';
         }
+    },
+    handleErrorFallback: async (errorCode: string) => {
+        const env = getEnv();
 
-        return response;
-    }
+        const isCoreModeDisabled = impl.lastSettings?.popup === false || env === 'webextension';
+        const isCoreModeAuto =
+            impl.lastSettings?.coreMode === 'auto' || impl.lastSettings?.coreMode === undefined;
 
-    private async handleErrorFallback(errorCode: string) {
         // Handle iframe errors by switching to core-in-popup
-        if (this.lastSettings?.coreMode === 'auto' && IFRAME_ERRORS.includes(errorCode)) {
+        if (!isCoreModeDisabled && isCoreModeAuto && IFRAME_ERRORS.includes(errorCode)) {
             // Check if WebUSB is available and enabled
-            const webUsbUnavailableInBrowser = !navigator.usb;
+            const webUsbUnavailableInBrowser = !(navigator as any)?.usb;
             const webUsbDisabledInSettings =
-                this.lastSettings.transports?.includes('WebUsbTransport') === false ||
-                this.lastSettings.webusb === false;
+                impl.lastSettings?.transports?.includes('WebUsbTransport') === false;
             if (
                 errorCode === 'Transport_Missing' &&
                 (webUsbUnavailableInBrowser || webUsbDisabledInSettings)
@@ -110,60 +63,32 @@ export class TrezorConnectDynamicImpl implements ConnectFactoryDependencies {
                 return false;
             }
 
-            await this.switchTarget('core-in-popup');
+            await impl.switchTarget('core-in-popup');
 
             return true;
         }
 
         return false;
-    }
-
-    public requestLogin(params: any) {
-        return this.getTarget().requestLogin(params);
-    }
-
-    public uiResponse(params: any) {
-        return this.getTarget().uiResponse(params);
-    }
-
-    public renderWebUSBButton() {
-        return this.getTarget().renderWebUSBButton();
-    }
-
-    public disableWebUSB() {
-        return this.getTarget().disableWebUSB();
-    }
-
-    public requestWebUSBDevice() {
-        return this.getTarget().requestWebUSBDevice();
-    }
-
-    public cancel(error?: string) {
-        return this.getTarget().cancel(error);
-    }
-
-    public dispose() {
-        this.eventEmitter.removeAllListeners();
-
-        return this.getTarget().dispose();
-    }
-}
-
-const impl = new TrezorConnectDynamicImpl();
-
-const TrezorConnect = factory({
-    eventEmitter: impl.eventEmitter,
-    init: impl.init.bind(impl),
-    call: impl.call.bind(impl),
-    manifest: impl.manifest.bind(impl),
-    requestLogin: impl.requestLogin.bind(impl),
-    uiResponse: impl.uiResponse.bind(impl),
-    renderWebUSBButton: impl.renderWebUSBButton.bind(impl),
-    disableWebUSB: impl.disableWebUSB.bind(impl),
-    requestWebUSBDevice: impl.requestWebUSBDevice.bind(impl),
-    cancel: impl.cancel.bind(impl),
-    dispose: impl.dispose.bind(impl),
+    },
 });
 
+const TrezorConnect = factory<ConnectSettingsWeb, ConnectWebExtraMethods>(
+    {
+        eventEmitter: impl.eventEmitter,
+        init: impl.init.bind(impl),
+        call: impl.call.bind(impl),
+        manifest: impl.manifest.bind(impl),
+        requestLogin: impl.requestLogin.bind(impl),
+        uiResponse: impl.uiResponse.bind(impl),
+        cancel: impl.cancel.bind(impl),
+        dispose: impl.dispose.bind(impl),
+    },
+    {
+        renderWebUSBButton: impl.getTarget().renderWebUSBButton.bind(impl),
+        disableWebUSB: impl.getTarget().disableWebUSB.bind(impl),
+        requestWebUSBDevice: impl.getTarget().requestWebUSBDevice.bind(impl),
+    },
+);
+
 export default TrezorConnect;
 export * from '@trezor/connect/src/exports';
diff --git a/packages/connect-web/src/popup/index.ts b/packages/connect-web/src/popup/index.ts
index b76e095c326..1019596eb3f 100644
--- a/packages/connect-web/src/popup/index.ts
+++ b/packages/connect-web/src/popup/index.ts
@@ -1,19 +1,20 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/popup/PopupManager.js
 
 import EventEmitter from 'events';
+
 import { createDeferred, Deferred, scheduleAction } from '@trezor/utils';
 import { POPUP, IFRAME, UI, CoreEventMessage, IFrameLoaded } from '@trezor/connect/src/events';
 import type { ConnectSettings } from '@trezor/connect/src/types';
 import { getOrigin } from '@trezor/connect/src/utils/urlUtils';
 import { CONTENT_SCRIPT_VERSION, VERSION } from '@trezor/connect/src/data/version';
-import { showPopupRequest } from './showPopupRequest';
 import { Log } from '@trezor/connect/src/utils/debug';
-
-import { ServiceWorkerWindowChannel } from '../channels/serviceworker-window';
 import {
     AbstractMessageChannel,
     Message,
 } from '@trezor/connect-common/src/messageChannel/abstract';
+
+import { showPopupRequest } from './showPopupRequest';
+import { ServiceWorkerWindowChannel } from '../channels/serviceworker-window';
 import { WindowWindowChannel } from '../channels/window-window';
 
 // Util
diff --git a/packages/connect-web/src/webextension/README.md b/packages/connect-web/src/webextension/README.md
index 77dedb276f0..5c5a5b494ab 100644
--- a/packages/connect-web/src/webextension/README.md
+++ b/packages/connect-web/src/webextension/README.md
@@ -1,6 +1,6 @@
 # Integrate @trezor/connect with a web extension
 
-**Note: only manifest version 2 is supported for now**
+**Note: Only manifest version 2 web extensions are supported by this package. For manifest version 3, use the [@trezor/connect-webextension](https://github.com/trezor/trezor-suite/tree/develop/packages/connect-webextension) package**
 
 [Example of a web extension project for both Google Chrome & Firefox](../../../connect-examples/webextension/README.md)
 
diff --git a/packages/connect-web/src/webextension/extensionPermissions.ts b/packages/connect-web/src/webextension/extensionPermissions.ts
index 5a84a4ff116..a71c7ceca58 100644
--- a/packages/connect-web/src/webextension/extensionPermissions.ts
+++ b/packages/connect-web/src/webextension/extensionPermissions.ts
@@ -35,7 +35,7 @@ const init = (label: string) => {
                 await usb.requestDevice({ filters: config.webusb });
                 sendMessage(WEBEXTENSION.USB_PERMISSIONS_CLOSE, '*');
                 broadcastPermissionFinished();
-            } catch (error) {
+            } catch {
                 // empty
             }
         }
diff --git a/packages/connect-web/src/webextension/trezor-usb-permissions.js b/packages/connect-web/src/webextension/trezor-usb-permissions.js
index 9d56e26e1c4..2ae008707d3 100644
--- a/packages/connect-web/src/webextension/trezor-usb-permissions.js
+++ b/packages/connect-web/src/webextension/trezor-usb-permissions.js
@@ -1,4 +1,4 @@
-const VERSION = '9.4.2';
+const VERSION = '9.4.3-beta.2';
 const versionN = VERSION.split('.').map(s => parseInt(s, 10));
 
 const isBeta = VERSION.includes('beta');
diff --git a/packages/connect-web/src/webusb/index.ts b/packages/connect-web/src/webusb/index.ts
index 4a53f8f6fbe..bb43f1ee252 100644
--- a/packages/connect-web/src/webusb/index.ts
+++ b/packages/connect-web/src/webusb/index.ts
@@ -16,7 +16,7 @@ const onload = () => {
         if (usb) {
             try {
                 await usb.requestDevice({ filters: config.webusb });
-            } catch (error) {
+            } catch {
                 // empty
             }
         }
diff --git a/packages/connect-web/tsconfig.json b/packages/connect-web/tsconfig.json
index a9b9b19bebd..33ef6527d75 100644
--- a/packages/connect-web/tsconfig.json
+++ b/packages/connect-web/tsconfig.json
@@ -23,6 +23,7 @@
     "references": [
         { "path": "../connect" },
         { "path": "../connect-common" },
-        { "path": "../utils" }
+        { "path": "../utils" },
+        { "path": "../eslint" }
     ]
 }
diff --git a/packages/connect-web/tsconfig.lib.json b/packages/connect-web/tsconfig.lib.json
index 28965c9985a..0120e049f8f 100644
--- a/packages/connect-web/tsconfig.lib.json
+++ b/packages/connect-web/tsconfig.lib.json
@@ -15,6 +15,9 @@
         },
         {
             "path": "../utils"
+        },
+        {
+            "path": "../eslint"
         }
     ]
 }
diff --git a/packages/connect-web/webpack/inline.webpack.config.ts b/packages/connect-web/webpack/inline.webpack.config.ts
index 1dd8abc4874..0e5101d024e 100644
--- a/packages/connect-web/webpack/inline.webpack.config.ts
+++ b/packages/connect-web/webpack/inline.webpack.config.ts
@@ -1,6 +1,7 @@
 import webpack from 'webpack';
 import path from 'path';
 import TerserPlugin from 'terser-webpack-plugin';
+
 import prod from './prod.webpack.config';
 
 // Generate inline script hosted on https://connect.trezor.io/X/trezor-connect.js
diff --git a/packages/connect-webextension/.eslintrc.js b/packages/connect-webextension/.eslintrc.js
deleted file mode 100644
index e67123643c6..00000000000
--- a/packages/connect-webextension/.eslintrc.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-    rules: {
-        'no-underscore-dangle': 'off', // underscore is used
-    },
-};
diff --git a/packages/connect-webextension/README.md b/packages/connect-webextension/README.md
index 2ba76ca491f..fff1e52e097 100644
--- a/packages/connect-webextension/README.md
+++ b/packages/connect-webextension/README.md
@@ -4,7 +4,7 @@
 [![NPM](https://img.shields.io/npm/v/@trezor/connect-webextension.svg)](https://www.npmjs.org/package/@trezor/connect-webextension)
 [![Known Vulnerabilities](https://snyk.io/test/github/trezor/connect-webextension/badge.svg?targetFile=package.json)](https://snyk.io/test/github/trezor/trezor-suite?targetFile=packages/connect-webextension/package.json)
 
-The @trezor/connect-webextension package provides an implementation of @trezor/connect designed specifically for use within web extensions. Key features include:
+The `@trezor/connect-webextension` package provides an implementation of `@trezor/connect` designed specifically for use within web extensions. Key features include:
 
 -   Compatibility with service worker environments.
 -   Full access to the TrezorConnect API.
@@ -24,7 +24,7 @@ For a seamless integration, especially with background processes, modify your ex
     "host_permissions": ["*://connect.trezor.io/9/*"]
     "background": {
         "service_worker": "serviceWorker.js"
-    },
+    }
 ```
 
 The content script will be injected automatically by the library using the scripting permission.
diff --git a/packages/connect-webextension/eslint.config.mjs b/packages/connect-webextension/eslint.config.mjs
new file mode 100644
index 00000000000..f7251bade75
--- /dev/null
+++ b/packages/connect-webextension/eslint.config.mjs
@@ -0,0 +1,19 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'no-underscore-dangle': 'off', // underscore is used
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/webpack/**',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/connect-webextension/package.json b/packages/connect-webextension/package.json
index 1bd1ccd2fd7..6d9fc98c0e5 100644
--- a/packages/connect-webextension/package.json
+++ b/packages/connect-webextension/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@trezor/connect-webextension",
-    "version": "9.4.2",
+    "version": "9.4.3-beta.2",
     "author": "Trezor <info@trezor.io>",
     "homepage": "https://github.com/trezor/trezor-suite/tree/develop/packages/connect-webextension",
     "description": "High-level javascript interface for Trezor hardware wallet in webextension serviceworker environment.",
@@ -30,7 +30,6 @@
         "!lib/proxy"
     ],
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "build:lib": "yarn g:rimraf ./lib && yarn g:tsc --build tsconfig.lib.json && ../../scripts/replace-imports.sh ./lib",
         "build:content-script": "TS_NODE_PROJECT=\"tsconfig.lib.json\" webpack --config ./webpack/content-script.webpack.config.ts",
         "build:inline": "TS_NODE_PROJECT=\"tsconfig.lib.json\" webpack --config ./webpack/inline.webpack.config.ts",
@@ -46,14 +45,15 @@
     },
     "devDependencies": {
         "@babel/preset-typescript": "^7.24.7",
+        "@trezor/eslint": "workspace:*",
         "@trezor/node-utils": "workspace:*",
         "@trezor/trezor-user-env-link": "workspace:*",
-        "@types/chrome": "^0.0.270",
+        "@types/chrome": "^0.0.278",
         "babel-loader": "^9.1.3",
         "copy-webpack-plugin": "^12.0.2",
         "rimraf": "^6.0.1",
         "terser-webpack-plugin": "^5.3.9",
-        "webpack": "^5.94.0",
+        "webpack": "^5.96.1",
         "webpack-cli": "^5.1.4",
         "webpack-merge": "^6.0.1",
         "webpack-plugin-serve": "^1.6.0",
diff --git a/packages/connect-webextension/src/index.ts b/packages/connect-webextension/src/index.ts
index c71ce17a669..9258cb261b9 100644
--- a/packages/connect-webextension/src/index.ts
+++ b/packages/connect-webextension/src/index.ts
@@ -3,13 +3,14 @@ import {
     POPUP,
     ConnectSettings,
     Manifest,
-    ConnectSettingsPublic,
+    ConnectSettingsWebextension,
 } from '@trezor/connect/src/exports';
 import { factory } from '@trezor/connect/src/factory';
 import { initLog } from '@trezor/connect/src/utils/debug';
 // Import as src not lib due to webpack issues with inlining content script later
 import { ServiceWorkerWindowChannel } from '@trezor/connect-web/src/channels/serviceworker-window';
 import { CoreInPopup } from '@trezor/connect-web/src/impl/core-in-popup';
+import { InitFullSettings } from '@trezor/connect/src/types/api/init';
 
 import { parseConnectSettings } from './connectSettings';
 
@@ -41,7 +42,7 @@ class CoreInPopupWebextension extends CoreInPopup {
         this.popupManagerLogger = initLog('@trezor/connect-webextension/popupManager');
     }
 
-    public init(settings: Partial<ConnectSettingsPublic> = {}): Promise<void> {
+    public init(settings: InitFullSettings<ConnectSettingsWebextension>): Promise<void> {
         if (settings._extendWebextensionLifetime) {
             extendLifetime();
         }
@@ -59,9 +60,6 @@ const TrezorConnect = factory({
     manifest: methods.manifest.bind(methods),
     requestLogin: methods.requestLogin.bind(methods),
     uiResponse: methods.uiResponse.bind(methods),
-    renderWebUSBButton: methods.renderWebUSBButton.bind(methods),
-    disableWebUSB: methods.disableWebUSB.bind(methods),
-    requestWebUSBDevice: methods.requestWebUSBDevice.bind(methods),
     cancel: methods.cancel.bind(methods),
     dispose: methods.dispose.bind(methods),
 });
diff --git a/packages/connect-webextension/src/proxy/index.ts b/packages/connect-webextension/src/proxy/index.ts
index e019c003a43..209a4b2f501 100644
--- a/packages/connect-webextension/src/proxy/index.ts
+++ b/packages/connect-webextension/src/proxy/index.ts
@@ -103,26 +103,11 @@ const uiResponse = () => {
     throw ERRORS.TypedError('Method_InvalidPackage');
 };
 
-const renderWebUSBButton = () => {
-    // Not needed here - webUSB pairing happens in popup.
-    throw ERRORS.TypedError('Method_InvalidPackage');
-};
-
 const requestLogin = () => {
     // Not needed here - Not used here.
     throw ERRORS.TypedError('Method_InvalidPackage');
 };
 
-const disableWebUSB = () => {
-    // Not needed here - webUSB pairing happens in popup.
-    throw ERRORS.TypedError('Method_InvalidPackage');
-};
-
-const requestWebUSBDevice = () => {
-    // Not needed here - webUSB pairing happens in popup.
-    throw ERRORS.TypedError('Method_InvalidPackage');
-};
-
 const TrezorConnect = factory({
     eventEmitter,
     manifest,
@@ -130,9 +115,6 @@ const TrezorConnect = factory({
     call,
     requestLogin,
     uiResponse,
-    renderWebUSBButton,
-    disableWebUSB,
-    requestWebUSBDevice,
     cancel,
     dispose,
 });
diff --git a/packages/connect-webextension/tsconfig.json b/packages/connect-webextension/tsconfig.json
index 1de2775067c..865c4a1398f 100644
--- a/packages/connect-webextension/tsconfig.json
+++ b/packages/connect-webextension/tsconfig.json
@@ -11,6 +11,7 @@
         { "path": "../connect-common" },
         { "path": "../connect-web" },
         { "path": "../utils" },
+        { "path": "../eslint" },
         { "path": "../node-utils" },
         { "path": "../trezor-user-env-link" }
     ]
diff --git a/packages/connect-webextension/tsconfig.lib.json b/packages/connect-webextension/tsconfig.lib.json
index 2600ac9935e..b2f9e227332 100644
--- a/packages/connect-webextension/tsconfig.lib.json
+++ b/packages/connect-webextension/tsconfig.lib.json
@@ -19,6 +19,9 @@
         {
             "path": "../utils"
         },
+        {
+            "path": "../eslint"
+        },
         {
             "path": "../node-utils"
         },
diff --git a/packages/connect/.eslintrc.js b/packages/connect/.eslintrc.js
deleted file mode 100644
index 0de74deae0e..00000000000
--- a/packages/connect/.eslintrc.js
+++ /dev/null
@@ -1,9 +0,0 @@
-module.exports = {
-    rules: {
-        'no-bitwise': 'off', // airbnb-base: used in hardending
-        'no-underscore-dangle': 'off', // underscore is used
-        camelcase: 'off', // camelcase is used
-        'no-console': 'warn',
-        'no-await-in-loop': 'off', // used in legacy trezor-connect codebase
-    },
-};
diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md
index 0ab12f364f2..d790b336876 100644
--- a/packages/connect/CHANGELOG.md
+++ b/packages/connect/CHANGELOG.md
@@ -1,15 +1,96 @@
-|             Package              | Stable | Canary |
-| :------------------------------: | :----: | :----: |
-|       npm @trezor/connect        | 9.4.2  |   -    |
-|     npm @trezor/connect-web      | 9.4.2  |   -    |
-| npm @trezor/connect-webextension | 9.4.2  |   -    |
+|             Package              | Stable |    Canary    |
+| :------------------------------: | :----: | :----------: |
+|       npm @trezor/connect        | 9.4.2  | 9.4.3-beta.2 |
+|     npm @trezor/connect-web      | 9.4.2  | 9.4.3-beta.2 |
+| npm @trezor/connect-webextension | 9.4.2  | 9.4.3-beta.2 |
 
-|     Deployment     | Stable | Canary |
-| :----------------: | :----: | :----: |
-| connect.trezor.io/ | 9.4.2  |   -    |
+|     Deployment     | Stable |    Canary    |
+| :----------------: | :----: | :----------: |
+| connect.trezor.io/ | 9.4.2  | 9.4.3-beta.2 |
 
 Use the persistent link [connect.trezor.io/9](https://connect.trezor.io/9/) to access the latest stable version of Connect Explorer.
 
+# 9.4.3-beta.2
+
+## Feature
+
+-   new (non public) method TrezorConnect.loadDevice (14aec5d5b6, f8a47401ec, 0d5b592ae7, e46c95ef9d, 18b5cbc9d3, 580f3a9325)
+-   make TrezorConnect.init transportReconnect implicitly true (19aeb1a0f7)
+-   in connect popup improve error handling screen for missing capabilities in FW (d2c8870944)
+-   Support for t3w1 support in types (f98990dfa0, 01cdee48f1, e9827eeaa8)
+-   remove auto-acquire after device was released elsewhere (dfa070fa2d, cdd2ac1ec7)
+-   implement random strategy for utxo sorting (6c3137fdf8)
+-   new public method TrezorConnect.blockchainEvmRpcCall (a507d1322a)
+-   make `manifest.appUrl` available as part of `Device.transportSessionOwner` (c98f7f8bf4)
+
+## Fixes
+
+-   local url in mobile example (e4365278aa)
+-   emit changed event with state change in keepSession (f8bcaf7203)
+-   don't trump Cancel with DeviceCommand disposed (d2f876e47c)
+-   WebUSB sessions sync in all deployments (13ec59a53d)
+-   skip fw hash check when binary too tiny (DX) (584d742ccc)
+-   usedElsewhere only for localSession (8fc98762ec)
+-   device.unreadableError is always string (aeab689d34)
+-   api.dispose on transport.stop (e79130e88e)
+-   analytics for core in popup (f08deff345)
+-   deeplink core mode from options (3eb7512b89)
+
+## Chores and improvements
+
+-   try to reuse initialized (passphrase) session (422476c9c0)
+-   uncouple enableFirmwareHashCheck setting from binFilesBaseUrl (768596bbe5)
+-   add sortingStrategy param to connect, deprecate skipPermutation param in composeTransaction (283d3f1eae)
+-   Eslint improvements (1ad7b6f9b1, 12b6fb18b9, f1bdc399e5, e22b683733, 5d1104bfeb, 4a3cdc7893, 5e33e3abb5)
+-   add recommended checks from eslint-plugin-jest (55d
+
+### Dependencies update
+
+-   chore(connect): update @ethereumjs libs (2d6465f, d6bc8c5020)
+-   bump electron,electron-builder and webpack (2b80c45c5f, e7a980bcf3, fc04fea1de)
+
+# 9.4.3-beta.1
+
+This release introduces `@trezor/connect-mobile`, which allows mobile apps to integrate with Trezor Suite mobile using deeplinks.
+This package is still beta and work in progress.
+
+### Connect Mobile related changes
+
+-   chore(connect-mobile): update package.json for publishing (fb157ef318)
+-   feat(connect-explorer): hiding beta-only content (21e0d42c6d)
+-   feat(connect-explorer): call deeplinks from method tester (f2a5f7460e)
+-   docs(connect): mobile connect popup (9f8f1c1bd2)
+-   chore(connect-popup): move deeplink fallback page to versioned url (e86e6aa5b3)
+-   chore: rename connect-deeplink to connect-mobile (d1c2bd7464)
+-   feat(connect): use separate versioning for deeplink protocol (40f3b53a34)
+-   feat(module-connect-popup): add version check to app link parser (fe8499ec1c)
+-   chore(connect-examples): change from deeplinkUrl to connectSrc (1ff479c545)
+-   feat(connect): take deeplinkUrl from connectSrc (1b88b3b72b)
+
+### Other changes
+
+-   refactor(connect-web): use dynamic from connect package (887889288f)
+-   refactor(connect): dynamic connect (96e81fe5bf)
+-   fix(connect): make getBinaryOptional async (e583e84c32)
+-   test(connect-popup): fix log going to (9dee606f43)
+-   feat(connect): fw hash check automatically for T1B1 (0fd023dbe8)
+-   docs(connect-web): Support matrix (44ed16a45d)
+-   chore: update backends for bsc and op (458f0fe3d9)
+-   docs(connect-explorer): mention address can be used in getAccountInfo (722a2b2b7f)
+-   chore(connect): cleanup some duplicities in fw download util (53456df94d)
+-   chore(connect): a cosmetic change in Device types (b718af4a2b)
+-   chore(connect): use import from @trezor/connect-analytics (1ee270b1cd)
+-   chore(protobuf): update messages.json (71bbde850b)
+-   feat(connect): add Optimism (c2fb244649)
+-   chore(connect): pol only to pol backend (fe589cf6bc)
+-   chore(connect): rename 'getAssetByUrl' to a more apt fn name 'tryLocalAssetRequire' (f5e8f256ae)
+-   docs(connect-explorer): remove trailing commas from json excerpts (dc0147900d)
+-   refactor(transport): background sessions improved (7644107353)
+-   refactor(connect): connect error codes typing (57815188d1)
+-   chore(connect): update device authenticity config (063d68379f)
+-   docs: fix header level in connect changelog (ac53d354cc)
+-   fix(connect): add other-error to FirmwareRevisionCheckResult errors (4361aba5b7)
+
 # 9.4.2
 
 This release fixes an issue with TypeScript and certain libraries not being resolved correctly in the previous version.
diff --git a/packages/connect/README.md b/packages/connect/README.md
index 101cef35161..3b9b74ae093 100644
--- a/packages/connect/README.md
+++ b/packages/connect/README.md
@@ -1,6 +1,6 @@
 # @trezor/connect
 
-API version 9.4.2
+API version 9.4.3-beta.2
 
 [![Build Status](https://github.com/trezor/trezor-suite/actions/workflows/test-connect.yml/badge.svg)](https://github.com/trezor/trezor-suite/actions/workflows/test-connect.yml)
 [![NPM](https://img.shields.io/npm/v/@trezor/connect.svg)](https://www.npmjs.org/package/@trezor/connect)
diff --git a/packages/connect/e2e/README.md b/packages/connect/e2e/README.md
index aebdcb79791..5f9db855961 100644
--- a/packages/connect/e2e/README.md
+++ b/packages/connect/e2e/README.md
@@ -36,7 +36,7 @@ Those data are automatically downloaded from backend defined in `coins.json` by
 _Note: Backends hosted on `*.trezor.io` are limiting requests per min._
 _Too many requests from not whitelisted origins may be penalized with temporary ban. ("All backends are down" error)_
 
-Backend connection will be omitted in case of providing `refTxs` so even coins without officially supported backends (like zcash testnet) may sign a transaction in _"offline mode"_. [see docs](../docs/method/signTransaction.md)
+Backend connection will be omitted in case of providing `refTxs` so even coins without officially supported backends (like zcash testnet) may sign a transaction in _"offline mode"_. [see docs](https://connect.trezor.io/9/methods/bitcoin/signTransaction/)
 
 To reduce network traffic `Github Actions CI` is using **cached** (offline) mode and whitelisted `GitLab CI` is using **default** (online) mode.
 
diff --git a/packages/connect/e2e/__fixtures__/cardanoGetAddress.ts b/packages/connect/e2e/__fixtures__/cardanoGetAddress.ts
index eea18c680b9..8317204bf99 100644
--- a/packages/connect/e2e/__fixtures__/cardanoGetAddress.ts
+++ b/packages/connect/e2e/__fixtures__/cardanoGetAddress.ts
@@ -1,8 +1,17 @@
-import { NETWORK_IDS, PROTOCOL_MAGICS } from '../../src/constants/cardano';
 import { MessagesSchema } from '@trezor/protobuf';
 
+import { NETWORK_IDS, PROTOCOL_MAGICS } from '../../src/constants/cardano';
+
 const { CardanoAddressType } = MessagesSchema;
 
+const legacyResults = {
+    minConnectVersion: {
+        // older FW does support Cardano but Connect does not
+        rules: ['<2.4.3', '1'],
+        payload: false,
+    },
+};
+
 export default {
     method: 'cardanoGetAddress',
     setup: {
@@ -496,5 +505,5 @@ export default {
             },
             result: false,
         },
-    ],
+    ].map(test => ({ ...test, legacyResults: [legacyResults.minConnectVersion] })),
 };
diff --git a/packages/connect/e2e/__fixtures__/cardanoGetAddressDerivations.ts b/packages/connect/e2e/__fixtures__/cardanoGetAddressDerivations.ts
index 4696d2c6cd4..e2ebff8ff38 100644
--- a/packages/connect/e2e/__fixtures__/cardanoGetAddressDerivations.ts
+++ b/packages/connect/e2e/__fixtures__/cardanoGetAddressDerivations.ts
@@ -1,11 +1,19 @@
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 // @ts-ignore
-import commonFixtures from '../../../../submodules/trezor-common/tests/fixtures/cardano/get_base_address.derivations.json';
-
 import { MessagesSchema } from '@trezor/protobuf';
 
+import commonFixtures from '../../../../submodules/trezor-common/tests/fixtures/cardano/get_base_address.derivations.json';
+
 const { CardanoAddressType, CardanoDerivationType } = MessagesSchema;
 
+const legacyResults = {
+    minConnectVersion: {
+        // older FW does support Cardano but Connect does not
+        rules: ['<2.4.3', '1'],
+        payload: false,
+    },
+};
+
 export default {
     method: 'cardanoGetAddress',
     setup: {
@@ -28,5 +36,6 @@ export default {
         result: {
             address: result.expected_address,
         },
+        legacyResults: [legacyResults.minConnectVersion],
     })),
 };
diff --git a/packages/connect/e2e/__fixtures__/cardanoGetNativeScriptHash.ts b/packages/connect/e2e/__fixtures__/cardanoGetNativeScriptHash.ts
index 219aea93755..86b3498c6b5 100644
--- a/packages/connect/e2e/__fixtures__/cardanoGetNativeScriptHash.ts
+++ b/packages/connect/e2e/__fixtures__/cardanoGetNativeScriptHash.ts
@@ -2,6 +2,14 @@ import { MessagesSchema } from '@trezor/protobuf';
 
 const { CardanoNativeScriptHashDisplayFormat, CardanoNativeScriptType } = MessagesSchema;
 
+const legacyResults = {
+    minConnectVersion: {
+        // older FW does support Cardano but Connect does not
+        rules: ['<2.4.3', '1'],
+        payload: false,
+    },
+};
+
 export default {
     method: 'cardanoGetNativeScriptHash',
     setup: {
@@ -306,5 +314,5 @@ export default {
                 scriptHash: '4a6b4288459bf34668c0b281f922691460caf0c7c09caee3a726c27a',
             },
         },
-    ],
+    ].map(test => ({ ...test, legacyResults: [legacyResults.minConnectVersion] })),
 };
diff --git a/packages/connect/e2e/__fixtures__/cardanoGetPublicKey.ts b/packages/connect/e2e/__fixtures__/cardanoGetPublicKey.ts
index 73a66fbef9d..304b2a885a0 100644
--- a/packages/connect/e2e/__fixtures__/cardanoGetPublicKey.ts
+++ b/packages/connect/e2e/__fixtures__/cardanoGetPublicKey.ts
@@ -1,3 +1,11 @@
+const legacyResults = {
+    minConnectVersion: {
+        // older FW does support Cardano but Connect does not
+        rules: ['<2.4.3', '1'],
+        payload: false,
+    },
+};
+
 export default {
     method: 'cardanoGetPublicKey',
     setup: {
@@ -61,5 +69,5 @@ export default {
                     '5d010cf16fdeff40955633d6c565f3844a288a24967cf6b76acbeb271b4f13c1f123474e140a2c360b01f0fa66f2f22e2e965a5b07a80358cf75f77abbd66088',
             },
         },
-    ],
+    ].map(t => ({ ...t, legacyResults: [legacyResults.minConnectVersion] })),
 };
diff --git a/packages/connect/e2e/__fixtures__/cardanoSignTransaction.ts b/packages/connect/e2e/__fixtures__/cardanoSignTransaction.ts
index b1841193bd8..59f5937e3c2 100644
--- a/packages/connect/e2e/__fixtures__/cardanoSignTransaction.ts
+++ b/packages/connect/e2e/__fixtures__/cardanoSignTransaction.ts
@@ -1,7 +1,7 @@
-import { NETWORK_IDS, PROTOCOL_MAGICS } from '../../src/constants/cardano';
-
 import { MessagesSchema } from '@trezor/protobuf';
 
+import { NETWORK_IDS, PROTOCOL_MAGICS } from '../../src/constants/cardano';
+
 const {
     CardanoAddressType,
     CardanoCVoteRegistrationFormat,
@@ -438,7 +438,11 @@ const SCRIPT_DATA_HASH = 'd593fd793c377ac50a3169bb8378ffc257c944da31aa8f355dfa5a
 const TOTAL_COLLATERAL = '1000';
 
 const legacyResults = {
-    // FW <2.6.0 is not supported by Connect at all
+    minConnectVersion: {
+        // older FW does support Cardano but Connect does not
+        rules: ['<2.4.3', '1'],
+        payload: false,
+    },
     beforeConway: {
         // older FW doesn't support Conway certificates
         rules: ['<2.7.1', '1'],
@@ -2898,5 +2902,11 @@ export default {
                 auxiliaryDataSupplement: undefined,
             },
         },
-    ],
+    ].map(test => {
+        if (test.legacyResults) {
+            return test;
+        }
+
+        return { ...test, legacyResults: [legacyResults.minConnectVersion] };
+    }),
 };
diff --git a/packages/connect/e2e/__fixtures__/composeTransaction.ts b/packages/connect/e2e/__fixtures__/composeTransaction.ts
index 65e989e5740..b1dda10b3e9 100644
--- a/packages/connect/e2e/__fixtures__/composeTransaction.ts
+++ b/packages/connect/e2e/__fixtures__/composeTransaction.ts
@@ -91,6 +91,7 @@ export default {
                     feePerByte: '1',
                     max: undefined,
                     totalSpent: '6639',
+                    // Order of inputs & outputs is important as we mock randomness in test to make it deterministic
                     inputs: [{ script_type: 'SPENDWITNESS', sequence: 0xffffffff }],
                     outputs: [
                         { amount: '2787', script_type: 'PAYTOWITNESS' },
@@ -102,7 +103,7 @@ export default {
         },
         {
             description:
-                'Bitcoin (Bech32/P2WPKH): precompose without outputs permutation, with baseFee and custom sequence',
+                'Bitcoin (Bech32/P2WPKH): precompose without outputs permutation (skipPermutation: true), with baseFee and custom sequence',
             params: {
                 account: BECH32_ACCOUNT,
                 feeLevels: FEE_LEVELS,
@@ -125,6 +126,42 @@ export default {
                     feePerByte: '2.176056338028169',
                     max: undefined,
                     totalSpent: '6806',
+                    // Order of inputs & outputs is important as we mock randomness in test to make it deterministic
+                    inputs: [{ script_type: 'SPENDWITNESS', sequence: 1 }],
+                    outputs: [
+                        { amount: '6497', script_type: 'PAYTOADDRESS' },
+                        { amount: '2620', script_type: 'PAYTOWITNESS' }, // skipped permutation
+                    ],
+                    outputsPermutation: [0, 1],
+                },
+            ],
+        },
+        {
+            description:
+                "Bitcoin (Bech32/P2WPKH): precompose without outputs permutation (sortingStrategy: 'none'), with baseFee and custom sequence",
+            params: {
+                account: BECH32_ACCOUNT,
+                feeLevels: FEE_LEVELS,
+                outputs: [
+                    {
+                        address: '36JkLACrdxARqXXffZk91V9W6SJvghKaVK',
+                        amount: '6497',
+                    },
+                ],
+                baseFee: 167,
+                sortingStrategy: 'none',
+                sequence: 1,
+                coin: 'btc',
+            },
+            result: [
+                {
+                    type: 'final',
+                    bytes: 142,
+                    fee: '309',
+                    feePerByte: '2.176056338028169',
+                    max: undefined,
+                    totalSpent: '6806',
+                    // Order of inputs & outputs is important as we mock randomness in test to make it deterministic
                     inputs: [{ script_type: 'SPENDWITNESS', sequence: 1 }],
                     outputs: [
                         { amount: '6497', script_type: 'PAYTOADDRESS' },
@@ -176,10 +213,11 @@ export default {
                     bytes: 142,
                     fee: '142',
                     totalSpent: '1142',
+                    // Order of inputs & outputs is important as we mock randomness in test to make it deterministic
                     inputs: [{ amount: '9426', script_type: 'SPENDWITNESS' }],
                     outputs: [
-                        { amount: '1000', script_type: 'PAYTOADDRESS' },
                         { amount: '8284', script_type: 'PAYTOWITNESS' },
+                        { amount: '1000', script_type: 'PAYTOADDRESS' },
                     ],
                 },
             ],
@@ -236,14 +274,15 @@ export default {
                     bytes: 278,
                     fee: '278',
                     totalSpent: '16678',
+                    // Order of inputs & outputs is important as we mock randomness in test to make it deterministic
                     inputs: [
-                        { amount: '7086' },
-                        { amount: '9426' },
                         { amount: '309896' }, // NOTE: this utxo is used because required utxo is not enough to cover fee
+                        { amount: '9426' },
+                        { amount: '7086' },
                     ],
                     outputs: [
-                        { amount: '16400', script_type: 'PAYTOADDRESS' },
                         { amount: '309730', script_type: 'PAYTOWITNESS' },
+                        { amount: '16400', script_type: 'PAYTOADDRESS' },
                     ],
                 },
             ],
@@ -295,6 +334,7 @@ export default {
                     feePerByte: '1',
                     max: '9315',
                     totalSpent: '9426',
+                    // Order of inputs & outputs is important as we mock randomness in test to make it deterministic
                     inputs: [{ script_type: 'SPENDWITNESS' }],
                     outputs: [{ amount: '9315', script_type: 'PAYTOADDRESS' }],
                 },
@@ -320,14 +360,15 @@ export default {
                     fee: '226000',
                     max: undefined,
                     totalSpent: '100226000',
+                    // Order of inputs & outputs is important as we mock randomness in test to make it deterministic
                     inputs: [{ script_type: 'SPENDADDRESS' }],
                     outputs: [
+                        { amount: '399774000', script_type: 'PAYTOADDRESS' },
                         {
                             address: 'DDn7UV1CrqVefzwrHyw7H2zEZZKqfzR2ZD',
                             amount: '100000000',
                             script_type: 'PAYTOADDRESS',
                         },
-                        { amount: '399774000', script_type: 'PAYTOADDRESS' },
                     ],
                 },
             ],
@@ -352,14 +393,15 @@ export default {
                     fee: '1226000', // NOTE: +0.01 DOGE per dust limit output
                     max: undefined,
                     totalSpent: '1326000',
+                    // Order of inputs & outputs is important as we mock randomness in test to make it deterministic
                     inputs: [{ script_type: 'SPENDADDRESS' }],
                     outputs: [
+                        { amount: '498674000', script_type: 'PAYTOADDRESS' },
                         {
                             address: 'DDn7UV1CrqVefzwrHyw7H2zEZZKqfzR2ZD',
                             amount: '100000',
                             script_type: 'PAYTOADDRESS',
                         },
-                        { amount: '498674000', script_type: 'PAYTOADDRESS' },
                     ],
                 },
             ],
@@ -389,16 +431,17 @@ export default {
                     fee: '1000000', // NOTE: +0.01 DOGE per dust limit output + ~0.08 DOGE dust limit change
                     max: undefined,
                     totalSpent: '500000000',
+                    // Order of inputs & outputs is important as we mock randomness in test to make it deterministic
                     inputs: [{ script_type: 'SPENDADDRESS' }],
                     outputs: [
                         {
                             address: 'DDn7UV1CrqVefzwrHyw7H2zEZZKqfzR2ZD',
-                            amount: '200000000',
+                            amount: '299000000',
                             script_type: 'PAYTOADDRESS',
                         },
                         {
                             address: 'DDn7UV1CrqVefzwrHyw7H2zEZZKqfzR2ZD',
-                            amount: '299000000',
+                            amount: '200000000',
                             script_type: 'PAYTOADDRESS',
                         },
                     ],
@@ -425,6 +468,7 @@ export default {
                     fee: '192000',
                     max: '499808000',
                     totalSpent: '500000000',
+                    // Order of inputs & outputs is important as we mock randomness in test to make it deterministic
                     inputs: [{ script_type: 'SPENDADDRESS' }],
                     outputs: [{ amount: '499808000', script_type: 'PAYTOADDRESS' }],
                 },
diff --git a/packages/connect/e2e/__fixtures__/ethereumGetAddress.ts b/packages/connect/e2e/__fixtures__/ethereumGetAddress.ts
index e7ba4ad07ab..1998c8f2dd6 100644
--- a/packages/connect/e2e/__fixtures__/ethereumGetAddress.ts
+++ b/packages/connect/e2e/__fixtures__/ethereumGetAddress.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 // @ts-ignore
 import commonFixtures from '../../../../submodules/trezor-common/tests/fixtures/ethereum/getaddress.json';
 
diff --git a/packages/connect/e2e/__fixtures__/ethereumGetPublicKey.ts b/packages/connect/e2e/__fixtures__/ethereumGetPublicKey.ts
index e3315150ddb..4a44dd5cebf 100644
--- a/packages/connect/e2e/__fixtures__/ethereumGetPublicKey.ts
+++ b/packages/connect/e2e/__fixtures__/ethereumGetPublicKey.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 // @ts-ignore
 import commonFixtures from '../../../../submodules/trezor-common/tests/fixtures/ethereum/getpublickey.json';
 
diff --git a/packages/connect/e2e/__fixtures__/ethereumSignMessage.ts b/packages/connect/e2e/__fixtures__/ethereumSignMessage.ts
index c0f7f676937..796d4da33d6 100644
--- a/packages/connect/e2e/__fixtures__/ethereumSignMessage.ts
+++ b/packages/connect/e2e/__fixtures__/ethereumSignMessage.ts
@@ -1,5 +1,6 @@
 import { arrayPartition } from '@trezor/utils';
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error */
+
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 // @ts-ignore
 import commonFixtures from '../../../../submodules/trezor-common/tests/fixtures/ethereum/signmessage.json';
 
diff --git a/packages/connect/e2e/__fixtures__/ethereumSignTransaction.ts b/packages/connect/e2e/__fixtures__/ethereumSignTransaction.ts
index 5b9be2ca82b..d58440b9a1e 100644
--- a/packages/connect/e2e/__fixtures__/ethereumSignTransaction.ts
+++ b/packages/connect/e2e/__fixtures__/ethereumSignTransaction.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 // @ts-ignore
 import commonFixtures from '../../../../submodules/trezor-common/tests/fixtures/ethereum/sign_tx.json';
 
diff --git a/packages/connect/e2e/__fixtures__/ethereumSignTransactionEip155.ts b/packages/connect/e2e/__fixtures__/ethereumSignTransactionEip155.ts
index d4197bf19eb..d240888f066 100644
--- a/packages/connect/e2e/__fixtures__/ethereumSignTransactionEip155.ts
+++ b/packages/connect/e2e/__fixtures__/ethereumSignTransactionEip155.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 // @ts-ignore
 import commonFixtures from '../../../../submodules/trezor-common/tests/fixtures/ethereum/sign_tx_eip155.json';
 
diff --git a/packages/connect/e2e/__fixtures__/ethereumSignTransactionEip1559.ts b/packages/connect/e2e/__fixtures__/ethereumSignTransactionEip1559.ts
index 1ae797c30fc..10581364c57 100644
--- a/packages/connect/e2e/__fixtures__/ethereumSignTransactionEip1559.ts
+++ b/packages/connect/e2e/__fixtures__/ethereumSignTransactionEip1559.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 // @ts-ignore
 import commonFixtures from '../../../../submodules/trezor-common/tests/fixtures/ethereum/sign_tx_eip1559.json';
 
diff --git a/packages/connect/e2e/__fixtures__/ethereumSignTypedData.ts b/packages/connect/e2e/__fixtures__/ethereumSignTypedData.ts
index 6d23644567e..2f1e7ae405e 100644
--- a/packages/connect/e2e/__fixtures__/ethereumSignTypedData.ts
+++ b/packages/connect/e2e/__fixtures__/ethereumSignTypedData.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error */
-// @ts-ignore
 import commonFixtures from '../../../../submodules/trezor-common/tests/fixtures/ethereum/sign_typed_data.json';
 
 const ethereumDefinitionFixture = [
diff --git a/packages/connect/e2e/__fixtures__/ethereumVerifyMessage.ts b/packages/connect/e2e/__fixtures__/ethereumVerifyMessage.ts
index 3bd49cc1a31..458f712dc7a 100644
--- a/packages/connect/e2e/__fixtures__/ethereumVerifyMessage.ts
+++ b/packages/connect/e2e/__fixtures__/ethereumVerifyMessage.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 // @ts-ignore
 import commonFixtures from '../../../../submodules/trezor-common/tests/fixtures/ethereum/verifymessage.json';
 
diff --git a/packages/connect/e2e/__fixtures__/index.ts b/packages/connect/e2e/__fixtures__/index.ts
index 533c622e437..0d28a2a8c11 100644
--- a/packages/connect/e2e/__fixtures__/index.ts
+++ b/packages/connect/e2e/__fixtures__/index.ts
@@ -1,72 +1,73 @@
-import applyFlags from './applyFlags';
-import applySettings from './applySettings';
-import binanceSignTransaction from './binanceSignTransaction';
-import binanceGetPublicKey from './binanceGetPublicKey';
-import binanceGetAddress from './binanceGetAddress';
-import cardanoGetAddress from './cardanoGetAddress';
-import cardanoGetAddressDerivations from './cardanoGetAddressDerivations';
-import cardanoGetNativeScriptHash from './cardanoGetNativeScriptHash';
-import cardanoGetPublicKey from './cardanoGetPublicKey';
-import cardanoSignTransaction from './cardanoSignTransaction';
-import changeLanguage from './changeLanguage';
-import composeTransaction from './composeTransaction';
-import eosGetPublicKey from './eosGetPublicKey';
-import eosSignTransaction from './eosSignTransaction';
-import ethereumGetAddress from './ethereumGetAddress';
-import ethereumGetPublicKey from './ethereumGetPublicKey';
-import ethereumSignMessage from './ethereumSignMessage';
-import ethereumSignTransaction from './ethereumSignTransaction';
-import ethereumSignTransactionEip155 from './ethereumSignTransactionEip155';
-import ethereumSignTransactionEip1559 from './ethereumSignTransactionEip1559';
-import ethereumSignTypedData from './ethereumSignTypedData';
-import ethereumVerifyMessage from './ethereumVerifyMessage';
-import getAccountDescriptor from './getAccountDescriptor';
-import getAccountInfo from './getAccountInfo';
-import getAddress from './getAddress';
-import getAddressMultisig from './getAddressMultisig';
-import getAddressSegwit from './getAddressSegwit';
-import getFeatures from './getFeatures';
-import getFirmwareHash from './getFirmwareHash';
-import getOwnershipId from './getOwnershipId';
-import getOwnershipProof from './getOwnershipProof';
-import getPublicKey from './getPublicKey';
-import getPublicKeyBip48 from './getPublicKeyBip48';
-import nemGetAddress from './nemGetAddress';
-import nemSignTransactionMosaic from './nemSignTransactionMosaic';
-import nemSignTransactionMultisig from './nemSignTransactionMultisig';
-import nemSignTransactionOthers from './nemSignTransactionOthers';
-import nemSignTransactionTransfer from './nemSignTransactionTransfer';
-import rippleGetAddress from './rippleGetAddress';
-import rippleSignTransaction from './rippleSignTransaction';
-import signMessage from './signMessage';
-import signTransaction from './signTransaction';
-import signTransactionBcash from './signTransactionBcash';
-import signTransactionBech32 from './signTransactionBech32';
-import signTransactionBgold from './signTransactionBgold';
-import signTransactionDash from './signTransactionDash';
-import signTransactionDecred from './signTransactionDecred';
-import signTransactionDoge from './signTransactionDoge';
-import signTransactionExternal from './signTransactionExternal';
-import signTransactionKomodo from './signTransactionKomodo';
-import signTransactionMultisig from './signTransactionMultisig';
-import signTransactionMultisigChange from './signTransactionMultisigChange';
-import signTransactionPaymentRequest from './signTransactionPaymentRequest';
-import signTransactionPeercoin from './signTransactionPeercoin';
-import signTransactionReplace from './signTransactionReplace';
-import signTransactionSegwit from './signTransactionSegwit';
-import signTransactionTaproot from './signTransactionTaproot';
-import signTransactionZcash from './signTransactionZcash';
-import solanaGetAddress from './solanaGetAddress';
-import solanaGetPublicKey from './solanaGetPublicKey';
-import solanaSignTransaction from './solanaSignTransaction';
-import stellarGetAddress from './stellarGetAddress';
-import stellarSignTransaction from './stellarSignTransaction';
-import tezosGetAddress from './tezosGetAddress';
-import tezosGetPublicKey from './tezosGetPublicKey';
-import tezosSignTransaction from './tezosSignTransaction';
-import verifyMessage from './verifyMessage';
-import verifyMessageSegwit from './verifyMessageSegwit';
-import verifyMessageSegwitNative from './verifyMessageSegwitNative';
+export { default as applyFlags } from './applyFlags';
+export { default as applySettings } from './applySettings';
+export { default as binanceSignTransaction } from './binanceSignTransaction';
+export { default as binanceGetPublicKey } from './binanceGetPublicKey';
+export { default as binanceGetAddress } from './binanceGetAddress';
+export { default as cardanoGetAddress } from './cardanoGetAddress';
+export { default as cardanoGetAddressDerivations } from './cardanoGetAddressDerivations';
+export { default as cardanoGetNativeScriptHash } from './cardanoGetNativeScriptHash';
+export { default as cardanoGetPublicKey } from './cardanoGetPublicKey';
+export { default as cardanoSignTransaction } from './cardanoSignTransaction';
+export { default as changeLanguage } from './changeLanguage';
+export { default as composeTransaction } from './composeTransaction';
+export { default as eosGetPublicKey } from './eosGetPublicKey';
+export { default as eosSignTransaction } from './eosSignTransaction';
+export { default as ethereumGetAddress } from './ethereumGetAddress';
+export { default as ethereumGetPublicKey } from './ethereumGetPublicKey';
+export { default as ethereumSignMessage } from './ethereumSignMessage';
+export { default as ethereumSignTransaction } from './ethereumSignTransaction';
+export { default as ethereumSignTransactionEip155 } from './ethereumSignTransactionEip155';
+export { default as ethereumSignTransactionEip1559 } from './ethereumSignTransactionEip1559';
+export { default as ethereumSignTypedData } from './ethereumSignTypedData';
+export { default as ethereumVerifyMessage } from './ethereumVerifyMessage';
+export { default as getAccountDescriptor } from './getAccountDescriptor';
+export { default as getAccountInfo } from './getAccountInfo';
+export { default as getAddress } from './getAddress';
+export { default as getAddressMultisig } from './getAddressMultisig';
+export { default as getAddressSegwit } from './getAddressSegwit';
+export { default as getFeatures } from './getFeatures';
+export { default as getFirmwareHash } from './getFirmwareHash';
+export { default as getOwnershipId } from './getOwnershipId';
+export { default as getOwnershipProof } from './getOwnershipProof';
+export { default as getPublicKey } from './getPublicKey';
+export { default as getPublicKeyBip48 } from './getPublicKeyBip48';
+export { default as nemGetAddress } from './nemGetAddress';
+export { default as nemSignTransactionMosaic } from './nemSignTransactionMosaic';
+export { default as nemSignTransactionMultisig } from './nemSignTransactionMultisig';
+export { default as nemSignTransactionOthers } from './nemSignTransactionOthers';
+export { default as nemSignTransactionTransfer } from './nemSignTransactionTransfer';
+export { default as rippleGetAddress } from './rippleGetAddress';
+export { default as rippleSignTransaction } from './rippleSignTransaction';
+export { default as signMessage } from './signMessage';
+export { default as signTransaction } from './signTransaction';
+export { default as signTransactionBcash } from './signTransactionBcash';
+export { default as signTransactionBech32 } from './signTransactionBech32';
+export { default as signTransactionBgold } from './signTransactionBgold';
+export { default as signTransactionDash } from './signTransactionDash';
+export { default as signTransactionDecred } from './signTransactionDecred';
+export { default as signTransactionDoge } from './signTransactionDoge';
+export { default as signTransactionExternal } from './signTransactionExternal';
+export { default as signTransactionKomodo } from './signTransactionKomodo';
+export { default as signTransactionMultisig } from './signTransactionMultisig';
+export { default as signTransactionMultisigChange } from './signTransactionMultisigChange';
+export { default as signTransactionPaymentRequest } from './signTransactionPaymentRequest';
+export { default as signTransactionPeercoin } from './signTransactionPeercoin';
+export { default as signTransactionReplace } from './signTransactionReplace';
+export { default as signTransactionSegwit } from './signTransactionSegwit';
+export { default as signTransactionTaproot } from './signTransactionTaproot';
+export { default as signTransactionZcash } from './signTransactionZcash';
+export { default as solanaGetAddress } from './solanaGetAddress';
+export { default as solanaGetPublicKey } from './solanaGetPublicKey';
+export { default as solanaSignTransaction } from './solanaSignTransaction';
+export { default as stellarGetAddress } from './stellarGetAddress';
+export { default as stellarSignTransaction } from './stellarSignTransaction';
+export { default as tezosGetAddress } from './tezosGetAddress';
+export { default as tezosGetPublicKey } from './tezosGetPublicKey';
+export { default as tezosSignTransaction } from './tezosSignTransaction';
+export { default as verifyMessage } from './verifyMessage';
+export { default as verifyMessageSegwit } from './verifyMessageSegwit';
+export { default as verifyMessageSegwitNative } from './verifyMessageSegwitNative';
+export { default as loadDevice } from './loadDevice';
 
 // TODO: add fixtures for missing dependencies https://github.com/trezor/trezor-suite/issues/5353
 // backupDevice
@@ -87,103 +88,9 @@ import verifyMessageSegwitNative from './verifyMessageSegwitNative';
 // getDeviceState
 // getSettings
 // pushTransaction
-// rebootToBootloader
 // recoveryDevice
 // requestLogin
 // resetDevice
 // setProxy
 // tezosSignTransaction
 // wipeDevice
-
-let fixtures = [
-    applyFlags,
-    applySettings,
-    binanceGetAddress,
-    binanceGetPublicKey,
-    binanceSignTransaction,
-    cardanoGetAddress,
-    cardanoGetAddressDerivations,
-    cardanoGetNativeScriptHash,
-    cardanoGetPublicKey,
-    cardanoSignTransaction,
-    changeLanguage,
-    composeTransaction,
-    eosGetPublicKey,
-    eosSignTransaction,
-    ethereumGetAddress,
-    ethereumGetPublicKey,
-    ethereumSignMessage,
-    ethereumSignTransaction,
-    ethereumSignTransactionEip155,
-    ethereumSignTransactionEip1559,
-    ethereumSignTypedData,
-    ethereumVerifyMessage,
-    getAccountDescriptor,
-    getAccountInfo,
-    getAddress,
-    getAddressMultisig,
-    getAddressSegwit,
-    getFeatures,
-    getFirmwareHash,
-    getOwnershipId,
-    getOwnershipProof,
-    getPublicKey,
-    getPublicKeyBip48,
-    nemGetAddress,
-    nemSignTransactionMosaic,
-    nemSignTransactionMultisig,
-    nemSignTransactionOthers,
-    nemSignTransactionTransfer,
-    rippleGetAddress,
-    rippleSignTransaction,
-    signMessage,
-    signTransaction,
-    signTransactionBcash,
-    signTransactionBech32,
-    signTransactionBgold,
-    signTransactionDash,
-    signTransactionDecred,
-    signTransactionDoge,
-    signTransactionExternal,
-    signTransactionKomodo,
-    signTransactionMultisig,
-    signTransactionMultisigChange,
-    signTransactionPaymentRequest,
-    signTransactionPeercoin,
-    signTransactionReplace,
-    signTransactionSegwit,
-    signTransactionTaproot,
-    signTransactionZcash,
-    solanaGetAddress,
-    solanaGetPublicKey,
-    solanaSignTransaction,
-    stellarGetAddress,
-    stellarSignTransaction,
-    tezosGetAddress,
-    tezosGetPublicKey,
-    tezosSignTransaction,
-    verifyMessage,
-    verifyMessageSegwit,
-    verifyMessageSegwitNative,
-];
-
-const includedMethods = process.env.TESTS_INCLUDED_METHODS;
-const excludedMethods = process.env.TESTS_EXCLUDED_METHODS;
-if (includedMethods) {
-    const methodsArr = includedMethods.split(',');
-    fixtures = fixtures.filter(f => methodsArr.some(includedM => includedM === f.method));
-} else if (excludedMethods) {
-    const methodsArr = excludedMethods.split(',');
-    fixtures = fixtures.filter(f => !methodsArr.includes(f.method));
-}
-
-// sort by mnemonic to avoid emu re-loading
-const result = fixtures.sort((a, b) => {
-    if (!a.setup.mnemonic || !b.setup.mnemonic) return 0;
-    if (a.setup.mnemonic > b.setup.mnemonic) return 1;
-    if (b.setup.mnemonic > a.setup.mnemonic) return -1;
-
-    return 0;
-});
-
-export default result;
diff --git a/packages/connect/e2e/__fixtures__/loadDevice.ts b/packages/connect/e2e/__fixtures__/loadDevice.ts
new file mode 100644
index 00000000000..804fb11e1e9
--- /dev/null
+++ b/packages/connect/e2e/__fixtures__/loadDevice.ts
@@ -0,0 +1,18 @@
+export default {
+    method: 'loadDevice',
+    setup: {
+        wiped: true,
+        mnemonic: '',
+    },
+    tests: [
+        {
+            description: 'Load device',
+            params: {
+                mnemonics: ['all all all all all all all all all all all all'],
+            },
+            result: {
+                message: 'Device loaded',
+            },
+        },
+    ],
+};
diff --git a/packages/connect/e2e/__fixtures__/stellarSignTransaction.ts b/packages/connect/e2e/__fixtures__/stellarSignTransaction.ts
index 22818af2705..c4666a2ab64 100644
--- a/packages/connect/e2e/__fixtures__/stellarSignTransaction.ts
+++ b/packages/connect/e2e/__fixtures__/stellarSignTransaction.ts
@@ -1,8 +1,9 @@
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 // @ts-ignore
-import commonFixtures from '../../../../submodules/trezor-common/tests/fixtures/stellar/sign_tx.json';
 import * as Messages from '@trezor/protobuf/src/messages';
 
+import commonFixtures from '../../../../submodules/trezor-common/tests/fixtures/stellar/sign_tx.json';
+
 // operations are in protobuf format (snake_case)
 
 const transformAsset = (asset: any) => ({
diff --git a/packages/connect/e2e/__txcache__/gen-reftx.ts b/packages/connect/e2e/__txcache__/gen-reftx.ts
index 468a2ca1cb0..0b064064c70 100644
--- a/packages/connect/e2e/__txcache__/gen-reftx.ts
+++ b/packages/connect/e2e/__txcache__/gen-reftx.ts
@@ -1,6 +1,7 @@
 import * as BitcoinJs from '@trezor/utxo-lib';
 import type { TxInput, TxOutput } from '@trezor/utxo-lib/src/transaction/base';
 import { bufferUtils } from '@trezor/utils';
+
 import { RefTransaction } from '../../src';
 
 // Referenced transaction generator script.
diff --git a/packages/connect/e2e/__wscache__/server.js b/packages/connect/e2e/__wscache__/server.js
index 00a5b23518a..9837576a51d 100644
--- a/packages/connect/e2e/__wscache__/server.js
+++ b/packages/connect/e2e/__wscache__/server.js
@@ -1,4 +1,5 @@
 const WebSocket = require('ws');
+
 const { blockbookFixtures } = require('./blockbook');
 const { rippleFixtures } = require('./ripple');
 const { blockfrostFixtures } = require('./blockfrost');
@@ -36,7 +37,7 @@ const createServer = () => {
         try {
             const data = fn(params, request);
             ws.send(JSON.stringify({ ...data, id: request.id }));
-        } catch (e) {
+        } catch {
             // empty
         }
     };
diff --git a/packages/connect/e2e/common.setup.ts b/packages/connect/e2e/common.setup.ts
index 7b2c951c210..89f3a425ffc 100644
--- a/packages/connect/e2e/common.setup.ts
+++ b/packages/connect/e2e/common.setup.ts
@@ -1,6 +1,4 @@
-import TrezorConnect from '../src';
 import { versionUtils } from '@trezor/utils';
-import { UI } from '../src/events';
 import {
     TrezorUserEnvLink,
     type TrezorUserEnvLinkClass,
@@ -9,6 +7,9 @@ import {
 } from '@trezor/trezor-user-env-link';
 import { ApplySettings } from '@trezor/protobuf/src/messages-schema';
 
+import { UI } from '../src/events';
+import TrezorConnect from '../src';
+
 const emulatorStartOpts =
     (process.env.emulatorStartOpts as StartEmu) || global.emulatorStartOpts || {};
 
@@ -33,8 +34,10 @@ type Options = {
     pin?: string;
     label?: string;
     settings?: ApplySettings;
+    wiped?: boolean;
 };
 export const setup = async (
+    // eslint-disable-next-line @typescript-eslint/no-shadow
     TrezorUserEnvLink: TrezorUserEnvLinkClass,
     options?: Partial<Options>,
 ) => {
@@ -50,20 +53,22 @@ export const setup = async (
     // the test using the same transport
     await TrezorUserEnvLink.stopBridge();
 
-    if (!options?.mnemonic) return true; // skip setup if test is not using the device (composeTransaction)
+    if (!options?.mnemonic && !options.wiped) return true; // skip setup if test is not using the device (composeTransaction)
 
     await TrezorUserEnvLink.startEmu(emulatorStartOpts);
 
-    const mnemonic = options.mnemonic || MNEMONICS.mnemonic_all;
+    if (!options.wiped) {
+        const mnemonic = options.mnemonic || MNEMONICS.mnemonic_all;
 
-    await TrezorUserEnvLink.setupEmu({
-        ...options,
-        mnemonic,
-        pin: options.pin || '',
-        passphrase_protection: !!options.passphrase_protection,
-        label: options.label || 'TrezorT',
-        needs_backup: false,
-    });
+        await TrezorUserEnvLink.setupEmu({
+            ...options,
+            mnemonic,
+            pin: options.pin || '',
+            passphrase_protection: !!options.passphrase_protection,
+            label: options.label || 'TrezorT',
+            needs_backup: false,
+        });
+    }
 
     if (options.settings) {
         // allow apply-settings to fail, older FW may not know some flags yet
@@ -82,6 +87,7 @@ export const setup = async (
 };
 
 export const initTrezorConnect = async (
+    // eslint-disable-next-line @typescript-eslint/no-shadow
     TrezorUserEnvLink: TrezorUserEnvLinkClass,
     options?: Partial<Parameters<typeof TrezorConnect.init>[0]>,
 ) => {
@@ -123,6 +129,7 @@ export const initTrezorConnect = async (
         debug: false,
         popup: false,
         pendingTransportEvent: true,
+        transportReconnect: false,
         connectSrc: process.env.TREZOR_CONNECT_SRC, // custom source for karma tests
         ...options,
     });
diff --git a/packages/connect/e2e/karma.config.js b/packages/connect/e2e/karma.config.js
index eba6f9ccf19..3836c2a0b1e 100644
--- a/packages/connect/e2e/karma.config.js
+++ b/packages/connect/e2e/karma.config.js
@@ -2,7 +2,7 @@ const path = require('path');
 const webpack = require('webpack');
 
 module.exports = config => {
-    const singleRun = process.env.KARMA_SINGLE_RUN === 'false' ? false : true;
+    const singleRun = process.env.KARMA_SINGLE_RUN !== 'false';
 
     config.set({
         basePath: path.resolve(__dirname, '../..'), // NOTE: "[monorepo-root]/packages", to have access to other packages
diff --git a/packages/connect/e2e/karma.setup.js b/packages/connect/e2e/karma.setup.js
index 73851c17b47..432d600aec8 100644
--- a/packages/connect/e2e/karma.setup.js
+++ b/packages/connect/e2e/karma.setup.js
@@ -50,6 +50,7 @@ jasmine.getEnv().beforeAll(() => {
                         return match;
                     }, {});
 
+                // eslint-disable-next-line jest/no-standalone-expect
                 expect(actual).toEqual(jasmine.objectContaining(nested(expected)));
 
                 return success;
diff --git a/packages/connect/e2e/run.ts b/packages/connect/e2e/run.ts
index c7021a236a5..f16e2b26afa 100644
--- a/packages/connect/e2e/run.ts
+++ b/packages/connect/e2e/run.ts
@@ -25,7 +25,7 @@ const getEmulatorOptions = (availableFirmwares: Firmwares) => {
             : 'T2T1';
     const latest = getLatestFirmware(model);
 
-    if (!latest) {
+    if (firmwareArg?.endsWith('-latest') && !latest) {
         // should never happen
         throw new Error('could not translate n-latest into specific firmware version');
     }
diff --git a/packages/connect/e2e/tests/device/authenticateDevice.test.ts b/packages/connect/e2e/tests/device/authenticateDevice.test.ts
index 15d62016ea0..8bc7c083ed0 100644
--- a/packages/connect/e2e/tests/device/authenticateDevice.test.ts
+++ b/packages/connect/e2e/tests/device/authenticateDevice.test.ts
@@ -1,6 +1,6 @@
 import { DeviceAuthenticityConfig } from '@trezor/connect/src/data/deviceAuthenticityConfigTypes';
-import TrezorConnect from '../../../src';
 
+import TrezorConnect from '../../../src';
 import { getController, setup, initTrezorConnect } from '../../common.setup';
 
 const controller = getController();
@@ -38,6 +38,10 @@ describe('TrezorConnect.authenticateDevice', () => {
                 '04ba6084cb9fba7c86d5d5a86108a91d55a27056da4eabbedde88a95e1cae8bce3620889167aaf7f2db166998f950984aa195e868f96e22803c3cd991be31d39e7',
             ],
         },
+        T3W1: {
+            rootPubKeys: ['you shall not pass'],
+            caPubKeys: ['you shall not pass'],
+        },
     } as DeviceAuthenticityConfig;
 
     it('validation successful', async () => {
diff --git a/packages/connect/e2e/tests/device/authorizeCoinjoin.test.ts b/packages/connect/e2e/tests/device/authorizeCoinjoin.test.ts
index 8d83cd42785..2935255ada6 100644
--- a/packages/connect/e2e/tests/device/authorizeCoinjoin.test.ts
+++ b/packages/connect/e2e/tests/device/authorizeCoinjoin.test.ts
@@ -1,5 +1,4 @@
 import TrezorConnect from '../../../src';
-
 import { getController, setup, conditionalTest, initTrezorConnect } from '../../common.setup';
 
 const controller = getController();
diff --git a/packages/connect/e2e/tests/device/cancel.test.ts b/packages/connect/e2e/tests/device/cancel.test.ts
index 10f0338cd5d..1cd9ed9d9d9 100644
--- a/packages/connect/e2e/tests/device/cancel.test.ts
+++ b/packages/connect/e2e/tests/device/cancel.test.ts
@@ -1,4 +1,5 @@
 import { StartEmu, SetupEmu } from '@trezor/trezor-user-env-link';
+
 import { getController, initTrezorConnect } from '../../common.setup';
 import TrezorConnect from '../../../src';
 
diff --git a/packages/connect/e2e/tests/device/cancelCoinjoinAuthorization.test.ts b/packages/connect/e2e/tests/device/cancelCoinjoinAuthorization.test.ts
index f83dcc1c2c3..6f1e2d3114f 100644
--- a/packages/connect/e2e/tests/device/cancelCoinjoinAuthorization.test.ts
+++ b/packages/connect/e2e/tests/device/cancelCoinjoinAuthorization.test.ts
@@ -1,5 +1,4 @@
 import TrezorConnect, { Success, PROTO, Unsuccessful } from '../../../src';
-
 import { getController, setup, conditionalTest, initTrezorConnect } from '../../common.setup';
 
 describe('TrezorConnect.cancelCoinjoinAuthorization', () => {
diff --git a/packages/connect/e2e/tests/device/checkFirmwareAuthenticity.test.ts b/packages/connect/e2e/tests/device/checkFirmwareAuthenticity.test.ts
deleted file mode 100644
index c1b6e63a64a..00000000000
--- a/packages/connect/e2e/tests/device/checkFirmwareAuthenticity.test.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import TrezorConnect from '../../../src';
-
-import { getController, setup, initTrezorConnect } from '../../common.setup';
-
-const controller = getController();
-
-describe('TrezorConnect.checkFirmwareAuthenticity', () => {
-    beforeAll(async () => {
-        await setup(controller, {
-            mnemonic: 'mnemonic_all',
-        });
-        await initTrezorConnect(controller);
-    });
-
-    afterAll(async () => {
-        controller.dispose();
-        await TrezorConnect.dispose();
-    });
-
-    it('sometimes valid sometimes not, depends on circumstances', async () => {
-        const result = await TrezorConnect.checkFirmwareAuthenticity({});
-
-        if (result.success) {
-            // when running with emulator, hashes will never match.
-            expect(typeof result.payload.valid).toEqual('boolean');
-            expect(typeof result.payload.expectedFirmwareHash).toEqual('string');
-            expect(typeof result.payload.actualFirmwareHash).toEqual('string');
-        }
-    });
-});
diff --git a/packages/connect/e2e/tests/device/info.test.ts b/packages/connect/e2e/tests/device/info.test.ts
new file mode 100644
index 00000000000..4f68d1a6376
--- /dev/null
+++ b/packages/connect/e2e/tests/device/info.test.ts
@@ -0,0 +1,24 @@
+import TrezorConnect from '../../../src';
+import { getController, initTrezorConnect } from '../../common.setup';
+
+describe('__info common param', () => {
+    beforeAll(async () => {
+        await TrezorConnect.dispose();
+
+        await initTrezorConnect(getController());
+    });
+
+    afterAll(async () => {
+        await TrezorConnect.dispose();
+    });
+
+    it('common param __info - only method info is returned', async () => {
+        const result = await TrezorConnect.getFeatures({
+            __info: true,
+        });
+        if (!result.success) throw new Error(result.payload.error);
+        // @ts-expect-error todo: types not finished
+        expect(result.payload.useDevice).toEqual(true);
+        expect(result.payload.minor_version).toEqual(undefined);
+    });
+});
diff --git a/packages/connect/e2e/tests/device/keepSession.test.ts b/packages/connect/e2e/tests/device/keepSession.test.ts
index 6a85c4304ec..a6c6f20e644 100644
--- a/packages/connect/e2e/tests/device/keepSession.test.ts
+++ b/packages/connect/e2e/tests/device/keepSession.test.ts
@@ -1,5 +1,4 @@
-import TrezorConnect from '../../../src';
-
+import TrezorConnect, { StaticSessionId } from '../../../src';
 import { getController, setup, conditionalTest, initTrezorConnect } from '../../common.setup';
 
 const controller = getController();
@@ -9,6 +8,7 @@ describe('keepSession common param', () => {
         await TrezorConnect.dispose();
         await setup(controller, {
             mnemonic: 'mnemonic_all',
+            passphrase_protection: true,
         });
         await initTrezorConnect(controller);
     });
@@ -19,6 +19,10 @@ describe('keepSession common param', () => {
     });
 
     conditionalTest(['1', '<2.3.2'], 'keepSession with changing useCardanoDerivation', async () => {
+        TrezorConnect.on('ui-request_passphrase', () => {
+            TrezorConnect.uiResponse({ type: 'ui-receive_passphrase', payload: { value: 'a' } });
+        });
+
         const noDerivation = await TrezorConnect.getAccountDescriptor({
             coin: 'ada',
             path: "m/1852'/1815'/0'/0/0",
@@ -38,5 +42,35 @@ describe('keepSession common param', () => {
         });
         if (!enableDerivation.success) throw new Error(enableDerivation.payload.error);
         expect(enableDerivation.payload.descriptor).toBeDefined();
+
+        const { device } = enableDerivation;
+        if (!device || !device.state) throw new Error('Device not found');
+
+        // change device instance to simulate app reload
+        // passphrase request should not be called
+        TrezorConnect.removeAllListeners('ui-request_passphrase');
+        // modify instance in staticSessionId
+        const staticSessionId = device.state.staticSessionId?.replace(
+            ':0',
+            ':1',
+        ) as StaticSessionId;
+        const keepCardanoDerivation = await TrezorConnect.getAccountDescriptor({
+            coin: 'ada',
+            path: "m/1852'/1815'/0'/0/0",
+            device: {
+                // change instance to new but use already initialized state
+                instance: 1,
+                state: {
+                    ...device.state,
+                    staticSessionId,
+                },
+                path: device.path,
+            },
+            // useCardanoDerivation: true, // NOTE: not required, its in the state
+        });
+        if (!keepCardanoDerivation.success) throw new Error(keepCardanoDerivation.payload.error);
+        expect(keepCardanoDerivation.payload.descriptor).toEqual(
+            enableDerivation.payload.descriptor,
+        );
     });
 });
diff --git a/packages/connect/e2e/tests/device/methods.test.ts b/packages/connect/e2e/tests/device/methods.test.ts
index 2ee7a64c815..f03352a8b21 100644
--- a/packages/connect/e2e/tests/device/methods.test.ts
+++ b/packages/connect/e2e/tests/device/methods.test.ts
@@ -1,6 +1,5 @@
 import TrezorConnect from '../../../src';
-import fixtures from '../../__fixtures__';
-
+import * as fixtures from '../../__fixtures__';
 import {
     getController,
     skipTest,
@@ -11,6 +10,58 @@ import {
 
 let controller: ReturnType<typeof getController> | undefined;
 
+// After the removal bip69, we sort inputs and outputs randomly
+// So we need to mock the source of randomness for all tests, so the fixtures are deterministic.
+
+// However, we run those test both in Node.js and in browser environment,
+// so we need to mock the source of randomness in both environments
+
+// This is mock of randomnes for Karma (web environment)
+if (typeof window !== 'undefined') {
+    window.crypto.getRandomValues = array => {
+        if (array instanceof Uint32Array) {
+            array[0] = 4;
+        }
+
+        return array;
+    };
+}
+
+// In Karma web environment, there is no `jest`, so we fake one
+if (typeof jest === 'undefined') {
+    globalThis.jest = { mock: () => undefined } as any;
+}
+
+// Jest.mock() MUST be called in global scope, if we put it into condition it won't work.
+jest.mock('@trezor/utils', () => ({
+    ...jest.requireActual('@trezor/utils'),
+    getRandomInt: (min: number, max: number) => min + (4 % max), // 4 is truly random number, I rolled the dice
+}));
+
+const getFixtures = () => {
+    const includedMethods = process.env.TESTS_INCLUDED_METHODS;
+    const excludedMethods = process.env.TESTS_EXCLUDED_METHODS;
+    let subset = Object.values(fixtures);
+    if (includedMethods) {
+        const methodsArr = includedMethods.split(',');
+        subset = subset.filter(f => methodsArr.some(includedM => includedM === f.method));
+    } else if (excludedMethods) {
+        const methodsArr = excludedMethods.split(',');
+        subset = subset.filter(f => !methodsArr.includes(f.method));
+    }
+
+    // sort by mnemonic to avoid emu re-loading
+    const result = subset?.sort((a, b) => {
+        if (!a.setup.mnemonic || !b.setup.mnemonic) return 0;
+        if (a.setup.mnemonic > b.setup.mnemonic) return 1;
+        if (b.setup.mnemonic > a.setup.mnemonic) return -1;
+
+        return 0;
+    });
+
+    return result || [];
+};
+
 describe(`TrezorConnect methods`, () => {
     afterAll(() => {
         // reset controller at the end
@@ -20,7 +71,7 @@ describe(`TrezorConnect methods`, () => {
         }
     });
 
-    fixtures.forEach((testCase: TestCase) => {
+    getFixtures().forEach((testCase: TestCase) => {
         describe(`TrezorConnect.${testCase.method}`, () => {
             beforeAll(async () => {
                 await TrezorConnect.dispose();
diff --git a/packages/connect/e2e/tests/device/override.test.ts b/packages/connect/e2e/tests/device/override.test.ts
index b3b2ac42410..1e21737c221 100644
--- a/packages/connect/e2e/tests/device/override.test.ts
+++ b/packages/connect/e2e/tests/device/override.test.ts
@@ -1,5 +1,4 @@
 import TrezorConnect from '../../../src';
-
 import { getController, setup, initTrezorConnect } from '../../common.setup';
 
 const controller = getController();
diff --git a/packages/connect/e2e/tests/device/passphrase.test.ts b/packages/connect/e2e/tests/device/passphrase.test.ts
index 8aa03fad36a..02a0786bf32 100644
--- a/packages/connect/e2e/tests/device/passphrase.test.ts
+++ b/packages/connect/e2e/tests/device/passphrase.test.ts
@@ -1,5 +1,4 @@
 import TrezorConnect from '../../../src';
-
 import { getController, setup, conditionalTest, initTrezorConnect } from '../../common.setup';
 
 const controller = getController();
diff --git a/packages/connect/e2e/tests/device/setBusy.test.ts b/packages/connect/e2e/tests/device/setBusy.test.ts
index f3ffdc504f9..0dc2f69077f 100644
--- a/packages/connect/e2e/tests/device/setBusy.test.ts
+++ b/packages/connect/e2e/tests/device/setBusy.test.ts
@@ -1,5 +1,4 @@
 import TrezorConnect from '../../../src';
-
 import { getController, setup, conditionalTest, initTrezorConnect } from '../../common.setup';
 
 const controller = getController();
diff --git a/packages/connect/e2e/tests/device/unlockPath.test.ts b/packages/connect/e2e/tests/device/unlockPath.test.ts
index 3c41c7cae8f..4a7506401b7 100644
--- a/packages/connect/e2e/tests/device/unlockPath.test.ts
+++ b/packages/connect/e2e/tests/device/unlockPath.test.ts
@@ -1,5 +1,4 @@
 import TrezorConnect from '../../../src';
-
 import { getController, setup, conditionalTest, initTrezorConnect } from '../../common.setup';
 
 const controller = getController();
diff --git a/packages/connect/e2e/utils.ts b/packages/connect/e2e/utils.ts
index f939c45603f..b943388cfe2 100644
--- a/packages/connect/e2e/utils.ts
+++ b/packages/connect/e2e/utils.ts
@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 let Trezor: {
     getController: (testName?: string) => any;
     setup: (controller: any, options: any) => any;
diff --git a/packages/connect/eslint.config.mjs b/packages/connect/eslint.config.mjs
new file mode 100644
index 00000000000..1838b0075e2
--- /dev/null
+++ b/packages/connect/eslint.config.mjs
@@ -0,0 +1,20 @@
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'no-bitwise': 'off', // airbnb-base: used in hardending
+            'no-underscore-dangle': 'off', // underscore is used
+            camelcase: 'off', // camelcase is used
+            'no-console': 'warn',
+            'no-await-in-loop': 'off', // used in legacy trezor-connect codebase
+            'jest/no-jasmine-globals': 'off', // Because of the Karma tests that uses Jasmine
+            'jest/no-standalone-expect': [
+                'error',
+                { additionalTestBlockFunctions: ['conditionalTest'] },
+            ],
+            'import/no-default-export': 'off', // Todo: shall be solved one day, but now its heavily used
+        },
+    },
+];
diff --git a/packages/connect/package.json b/packages/connect/package.json
index 1de183bfa4e..841ad84b5cd 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@trezor/connect",
-    "version": "9.4.2",
+    "version": "9.4.3-beta.2",
     "author": "Trezor <info@trezor.io>",
     "homepage": "https://github.com/trezor/trezor-suite/tree/develop/packages/connect",
     "description": "High-level javascript interface for Trezor hardware wallet.",
@@ -52,7 +52,6 @@
         "!**/*.map"
     ],
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "jest --version && jest",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
@@ -70,8 +69,8 @@
     },
     "dependencies": {
         "@babel/preset-typescript": "^7.24.7",
-        "@ethereumjs/common": "^4.3.0",
-        "@ethereumjs/tx": "^5.3.0",
+        "@ethereumjs/common": "^4.4.0",
+        "@ethereumjs/tx": "^5.4.0",
         "@fivebinaries/coin-selection": "2.2.1",
         "@trezor/blockchain-link": "workspace:*",
         "@trezor/blockchain-link-types": "workspace:*",
@@ -89,6 +88,7 @@
         "cross-fetch": "^4.0.0"
     },
     "devDependencies": {
+        "@trezor/eslint": "workspace:*",
         "@trezor/trezor-user-env-link": "workspace:*",
         "@types/karma": "^6.3.8",
         "babel-loader": "^9.1.3",
@@ -100,10 +100,12 @@
         "karma-jasmine-async": "^0.0.1",
         "karma-sourcemap-loader": "^0.4.0",
         "karma-webpack": "^5.0.1",
+        "node-fetch": "^2.6.4",
         "node-libs-browser": "^2.2.1",
         "ts-node": "^10.9.1",
         "tsx": "^4.16.3",
-        "webpack": "^5.94.0",
+        "web3-utils": "^4.3.2",
+        "webpack": "^5.96.1",
         "ws": "^8.18.0"
     },
     "peerDependencies": {
diff --git a/packages/connect/setupJest.ts b/packages/connect/setupJest.ts
index f0f1c3525a7..893737511e1 100644
--- a/packages/connect/setupJest.ts
+++ b/packages/connect/setupJest.ts
@@ -1,6 +1,7 @@
 /* WARNING! This file should be imported ONLY in tests! */
 
 import { AbstractApiTransport, UsbApi } from '@trezor/transport';
+
 import { DeviceModelInternal, type Features, type FirmwareRelease } from './src/types';
 
 class TestTransport extends AbstractApiTransport {
@@ -32,12 +33,15 @@ const createTransportApi = (override = {}) =>
                 // payload: Buffer.from('3f23230002000000060a046d656f77', 'hex'), // proto.Success
             });
         },
+        listen: () => {},
+        dispose: () => {},
         ...override,
     }) as unknown as UsbApi;
 
 export const createTestTransport = (apiMethods = {}) =>
     new TestTransport({
         api: createTransportApi(apiMethods),
+        id: 'foo-bar-id',
     });
 
 export const getDeviceFeatures = (feat?: Partial<Features>): Features => ({
diff --git a/packages/connect/src/api/applyFlags.ts b/packages/connect/src/api/applyFlags.ts
index a342871ed2c..0a728ef7186 100644
--- a/packages/connect/src/api/applyFlags.ts
+++ b/packages/connect/src/api/applyFlags.ts
@@ -1,8 +1,9 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/ApplyFlags.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { PROTO } from '../constants';
-import { Assert } from '@trezor/schema-utils';
 
 export default class ApplyFlags extends AbstractMethod<'applyFlags', PROTO.ApplyFlags> {
     init() {
diff --git a/packages/connect/src/api/applySettings.ts b/packages/connect/src/api/applySettings.ts
index c49067919b9..94391678170 100644
--- a/packages/connect/src/api/applySettings.ts
+++ b/packages/connect/src/api/applySettings.ts
@@ -1,8 +1,9 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/ApplySettings.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { PROTO } from '../constants';
-import { Assert } from '@trezor/schema-utils';
 import { ApplySettings as ApplySettingsSchema } from '../types/api/applySettings';
 
 export default class ApplySettings extends AbstractMethod<'applySettings', PROTO.ApplySettings> {
diff --git a/packages/connect/src/api/authenticateDevice.ts b/packages/connect/src/api/authenticateDevice.ts
index 6d0afb7a925..5bbe34ed379 100644
--- a/packages/connect/src/api/authenticateDevice.ts
+++ b/packages/connect/src/api/authenticateDevice.ts
@@ -1,10 +1,11 @@
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { UI } from '../events';
 import { getFirmwareRange } from './common/paramsValidator';
 import { deviceAuthenticityConfig } from '../data/deviceAuthenticityConfig';
 import { AuthenticateDeviceParams } from '../types/api/authenticateDevice';
 import { getRandomChallenge, verifyAuthenticityProof } from './firmware/verifyAuthenticityProof';
-import { Assert } from '@trezor/schema-utils';
 
 export default class AuthenticateDevice extends AbstractMethod<
     'authenticateDevice',
diff --git a/packages/connect/src/api/authorizeCoinjoin.ts b/packages/connect/src/api/authorizeCoinjoin.ts
index 5053c309429..4d1be821cea 100644
--- a/packages/connect/src/api/authorizeCoinjoin.ts
+++ b/packages/connect/src/api/authorizeCoinjoin.ts
@@ -1,9 +1,10 @@
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { getFirmwareRange } from './common/paramsValidator';
 import { validatePath, getScriptType } from '../utils/pathUtils';
 import { getBitcoinNetwork } from '../data/coinInfo';
 import { PROTO } from '../constants';
-import { Assert } from '@trezor/schema-utils';
 import { AuthorizeCoinjoin as AuthorizeCoinjoinSchema } from '../types/api/authorizeCoinjoin';
 
 export default class AuthorizeCoinjoin extends AbstractMethod<
diff --git a/packages/connect/src/api/backupDevice.ts b/packages/connect/src/api/backupDevice.ts
index 93f002cbdd6..68d3c0479db 100644
--- a/packages/connect/src/api/backupDevice.ts
+++ b/packages/connect/src/api/backupDevice.ts
@@ -1,8 +1,9 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/BackupDevice.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { PROTO } from '../constants';
-import { Assert } from '@trezor/schema-utils';
 
 export default class BackupDevice extends AbstractMethod<'backupDevice', PROTO.BackupDevice> {
     init() {
diff --git a/packages/connect/src/api/binance/api/binanceGetAddress.ts b/packages/connect/src/api/binance/api/binanceGetAddress.ts
index 3cec7c8b827..7ae967f1ea4 100644
--- a/packages/connect/src/api/binance/api/binanceGetAddress.ts
+++ b/packages/connect/src/api/binance/api/binanceGetAddress.ts
@@ -1,12 +1,13 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/BinanceGetAddress.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath, fromHardened, getSerializedPath } from '../../../utils/pathUtils';
 import { PROTO, ERRORS } from '../../../constants';
 import { UI, createUiMessage } from '../../../events';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle } from '../../../types';
 import { GetAddress as GetAddressSchema } from '../../../types/api/getAddress';
 
@@ -21,6 +22,7 @@ export default class BinanceGetAddress extends AbstractMethod<'binanceGetAddress
     init() {
         this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_Binance'];
         this.firmwareRange = getFirmwareRange(this.name, getMiscNetwork('BNB'), this.firmwareRange);
 
         // create a bundle with only one batch if bundle doesn't exists
diff --git a/packages/connect/src/api/binance/api/binanceGetPublicKey.ts b/packages/connect/src/api/binance/api/binanceGetPublicKey.ts
index a54121a708d..c9f15a1eb0b 100644
--- a/packages/connect/src/api/binance/api/binanceGetPublicKey.ts
+++ b/packages/connect/src/api/binance/api/binanceGetPublicKey.ts
@@ -1,12 +1,13 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/BinanceGetPublicKey.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath, fromHardened, getSerializedPath } from '../../../utils/pathUtils';
 import { UI, createUiMessage } from '../../../events';
 import type { PROTO } from '../../../constants';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle, GetPublicKey as GetPublicKeySchema } from '../../../types';
 
 export default class BinanceGetPublicKey extends AbstractMethod<
@@ -17,6 +18,7 @@ export default class BinanceGetPublicKey extends AbstractMethod<
 
     init() {
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_Binance'];
         this.firmwareRange = getFirmwareRange(this.name, getMiscNetwork('BNB'), this.firmwareRange);
 
         // create a bundle with only one batch if bundle doesn't exists
diff --git a/packages/connect/src/api/binance/api/binanceSignTransaction.ts b/packages/connect/src/api/binance/api/binanceSignTransaction.ts
index 4c8ef69e521..9b82cb0f509 100644
--- a/packages/connect/src/api/binance/api/binanceSignTransaction.ts
+++ b/packages/connect/src/api/binance/api/binanceSignTransaction.ts
@@ -1,13 +1,13 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/BinanceSignTransaction.js
 
+import { AssertWeak } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath } from '../../../utils/pathUtils';
 import * as helper from '../binanceSignTx';
 import { BinanceSignTransaction as BinanceSignTransactionSchema } from '../../../types/api/binance';
-import { AssertWeak } from '@trezor/schema-utils';
-
 import type { BinancePreparedTransaction } from '../../../types/api/binance';
 
 type Params = {
@@ -22,6 +22,7 @@ export default class BinanceSignTransaction extends AbstractMethod<
 > {
     init() {
         this.requiredPermissions = ['read', 'write'];
+        this.requiredDeviceCapabilities = ['Capability_Binance'];
         this.firmwareRange = getFirmwareRange(this.name, getMiscNetwork('BNB'), this.firmwareRange);
 
         const { payload } = this;
diff --git a/packages/connect/src/api/binance/binanceSignTx.ts b/packages/connect/src/api/binance/binanceSignTx.ts
index aec5165114b..e38dd384352 100644
--- a/packages/connect/src/api/binance/binanceSignTx.ts
+++ b/packages/connect/src/api/binance/binanceSignTx.ts
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/helpers/binanceSignTx.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { PROTO, ERRORS } from '../../constants';
 import {
     BinanceSDKTransaction,
@@ -7,7 +9,6 @@ import {
     BinancePreparedTransaction,
 } from '../../types/api/binance';
 import type { TypedCall } from '../../device/DeviceCommands';
-import { Assert } from '@trezor/schema-utils';
 
 const processTxRequest = async (
     typedCall: TypedCall,
diff --git a/packages/connect/src/api/bitcoin/Fees.ts b/packages/connect/src/api/bitcoin/Fees.ts
index 9c8b35fff64..1f41d03f33d 100644
--- a/packages/connect/src/api/bitcoin/Fees.ts
+++ b/packages/connect/src/api/bitcoin/Fees.ts
@@ -1,6 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/tx/Fees.js
 
 import { BigNumber } from '@trezor/utils/src/bigNumber';
+
 import { Blockchain } from '../../backend/BlockchainLink';
 import type { CoinInfo, FeeLevel } from '../../types';
 
@@ -94,7 +95,7 @@ export class FeeLevels {
                     Math.max(this.coinInfo.minFee, parseInt(response.feePerUnit, 10)),
                 ).toString(),
             };
-        } catch (error) {
+        } catch {
             // silent
         }
 
@@ -146,7 +147,7 @@ export class FeeLevels {
             });
 
             this.longTermFeeRate = findLowest(this.blocks);
-        } catch (error) {
+        } catch {
             // do not throw
         }
 
diff --git a/packages/connect/src/api/bitcoin/TransactionComposer.ts b/packages/connect/src/api/bitcoin/TransactionComposer.ts
index 029fa29ff73..31de94c5c57 100644
--- a/packages/connect/src/api/bitcoin/TransactionComposer.ts
+++ b/packages/connect/src/api/bitcoin/TransactionComposer.ts
@@ -1,7 +1,8 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/tx/TransactionComposer.js
 
 import { BigNumber } from '@trezor/utils/src/bigNumber';
-import { composeTx, ComposeOutput } from '@trezor/utxo-lib';
+import { composeTx, ComposeOutput, TransactionInputOutputSortingStrategy } from '@trezor/utxo-lib';
+
 import { FeeLevels } from './Fees';
 import { Blockchain } from '../../backend/BlockchainLink';
 import type { BitcoinNetworkInfo, DiscoveryAccount, SelectFeeLevel } from '../../types';
@@ -17,7 +18,7 @@ type Options = {
     outputs: ComposeOutput[];
     coinInfo: BitcoinNetworkInfo;
     baseFee?: number;
-    skipPermutation?: boolean;
+    sortingStrategy: TransactionInputOutputSortingStrategy;
 };
 
 export class TransactionComposer {
@@ -33,7 +34,7 @@ export class TransactionComposer {
 
     baseFee: number;
 
-    skipPermutation: boolean;
+    sortingStrategy: TransactionInputOutputSortingStrategy;
 
     feeLevels: FeeLevels;
 
@@ -45,7 +46,7 @@ export class TransactionComposer {
         this.coinInfo = options.coinInfo;
         this.blockHeight = 0;
         this.baseFee = options.baseFee || 0;
-        this.skipPermutation = options.skipPermutation || false;
+        this.sortingStrategy = options.sortingStrategy;
         this.feeLevels = new FeeLevels(options.coinInfo);
 
         // map to @trezor/utxo-lib/compose format
@@ -164,7 +165,7 @@ export class TransactionComposer {
             outputs: this.outputs,
             feeRate,
             longTermFeeRate: this.feeLevels.longTermFeeRate,
-            skipPermutation: this.skipPermutation,
+            sortingStrategy: this.sortingStrategy,
             network: coinInfo.network,
             changeAddress,
             dustThreshold: coinInfo.dustLimit,
diff --git a/packages/connect/src/api/bitcoin/__fixtures__/refTx.ts b/packages/connect/src/api/bitcoin/__fixtures__/refTx.ts
index 0b4bb35c6d5..eae74795ec8 100644
--- a/packages/connect/src/api/bitcoin/__fixtures__/refTx.ts
+++ b/packages/connect/src/api/bitcoin/__fixtures__/refTx.ts
@@ -1,5 +1,6 @@
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 import { networks } from '@trezor/utxo-lib';
+
 // @ts-ignore
 import tx43d273 from '../../../../e2e/__txcache__/testnet/43d273d3caf41759ad843474f960fbf80ff2ec961135d018b61e9fab3ad1fc06.json';
 // @ts-ignore
diff --git a/packages/connect/src/api/bitcoin/__tests__/Fees.test.ts b/packages/connect/src/api/bitcoin/__tests__/Fees.test.ts
index 695ad337530..401dc0c1156 100644
--- a/packages/connect/src/api/bitcoin/__tests__/Fees.test.ts
+++ b/packages/connect/src/api/bitcoin/__tests__/Fees.test.ts
@@ -1,6 +1,7 @@
 import coinsJSON from '@trezor/connect-common/files/coins.json';
 import coinsJSONEth from '@trezor/connect-common/files/coins-eth.json';
 import BlockchainLink from '@trezor/blockchain-link';
+
 import { parseCoinsJson, getBitcoinNetwork } from '../../../data/coinInfo';
 import { initBlockchain } from '../../../backend/BlockchainLink';
 import { FeeLevels } from '../Fees';
@@ -110,6 +111,7 @@ describe('api/bitcoin/Fees', () => {
 
     // const e2eNetworks = ['BTC', 'TEST', 'BCH', 'BTG', 'DASH', 'DGB', 'DOGE', 'LTC', 'NMC', 'VTC'];
     // e2eNetworks.forEach(network => {
+    // eslint-disable-next-line jest/no-commented-out-tests
     //     it.only(`${network} e2e smart FeeLevels`, async () => {
     //         const coinInfo = getBitcoinNetwork(network)!;
     //         if (!coinInfo) throw new Error('coinInfo is missing');
diff --git a/packages/connect/src/api/bitcoin/__tests__/inputs.test.ts b/packages/connect/src/api/bitcoin/__tests__/inputs.test.ts
index dce271afdf1..2eaf7207c9f 100644
--- a/packages/connect/src/api/bitcoin/__tests__/inputs.test.ts
+++ b/packages/connect/src/api/bitcoin/__tests__/inputs.test.ts
@@ -1,4 +1,5 @@
 import { networks } from '@trezor/utxo-lib';
+
 import { validateTrezorInputs } from '../inputs';
 import * as fixtures from '../__fixtures__/inputs';
 
diff --git a/packages/connect/src/api/bitcoin/__tests__/signtxVerify.test.ts b/packages/connect/src/api/bitcoin/__tests__/signtxVerify.test.ts
index 07c89977778..1ad323d7136 100644
--- a/packages/connect/src/api/bitcoin/__tests__/signtxVerify.test.ts
+++ b/packages/connect/src/api/bitcoin/__tests__/signtxVerify.test.ts
@@ -1,4 +1,5 @@
 import { networks } from '@trezor/utxo-lib';
+
 import { verifyTx } from '../signtxVerify';
 import fixtures from '../__fixtures__/signtxVerify';
 
diff --git a/packages/connect/src/api/bitcoin/createPendingTx.ts b/packages/connect/src/api/bitcoin/createPendingTx.ts
index 4ea0724950e..d5daedbbb07 100644
--- a/packages/connect/src/api/bitcoin/createPendingTx.ts
+++ b/packages/connect/src/api/bitcoin/createPendingTx.ts
@@ -1,9 +1,8 @@
 import { BigNumber } from '@trezor/utils/src/bigNumber';
-
 import { Transaction as BitcoinJsTransaction } from '@trezor/utxo-lib';
+
 import { getSerializedPath } from '../../utils/pathUtils';
 import { PROTO } from '../../constants';
-
 import type { AccountAddresses } from '../../types';
 
 export const createPendingTransaction = (
diff --git a/packages/connect/src/api/bitcoin/inputs.ts b/packages/connect/src/api/bitcoin/inputs.ts
index 856cbe01306..062834e8221 100644
--- a/packages/connect/src/api/bitcoin/inputs.ts
+++ b/packages/connect/src/api/bitcoin/inputs.ts
@@ -1,6 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/tx/inputs.js
 
 import { Transaction as BitcoinJsTransaction } from '@trezor/utxo-lib';
+
 import {
     validatePath,
     isSegwitPath,
diff --git a/packages/connect/src/api/bitcoin/outputs.ts b/packages/connect/src/api/bitcoin/outputs.ts
index 99e25ea4145..dd23bee93dc 100644
--- a/packages/connect/src/api/bitcoin/outputs.ts
+++ b/packages/connect/src/api/bitcoin/outputs.ts
@@ -1,6 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/tx/outputs.js
 
 import { ComposeOutput as ComposeOutputBase } from '@trezor/utxo-lib';
+
 import { getOutputScriptType, fixPath, getHDPath } from '../../utils/pathUtils';
 import { isValidAddress } from '../../utils/addressUtils';
 import { convertMultisigPubKey } from '../../utils/hdnodeUtils';
diff --git a/packages/connect/src/api/bitcoin/refTx.ts b/packages/connect/src/api/bitcoin/refTx.ts
index 27cd7bedc46..a2aeca99414 100644
--- a/packages/connect/src/api/bitcoin/refTx.ts
+++ b/packages/connect/src/api/bitcoin/refTx.ts
@@ -7,12 +7,14 @@ import {
     Network,
 } from '@trezor/utxo-lib';
 import { bufferUtils } from '@trezor/utils';
-import { getHDPath, getScriptType, getOutputScriptType } from '../../utils/pathUtils';
-import { TypedError } from '../../constants/errors';
 import type {
     TxInput as BitcoinJsInput,
     TxOutput as BitcoinJsOutput,
 } from '@trezor/utxo-lib/src/transaction/base';
+import { Assert, Type } from '@trezor/schema-utils';
+
+import { getHDPath, getScriptType, getOutputScriptType } from '../../utils/pathUtils';
+import { TypedError } from '../../constants/errors';
 import type {
     CoinInfo,
     AccountAddresses,
@@ -21,7 +23,6 @@ import type {
 } from '../../types';
 import type { RefTransaction, TransactionOptions } from '../../types/api/bitcoin';
 import { PROTO } from '../../constants';
-import { Assert, Type } from '@trezor/schema-utils';
 
 // Referenced transactions are not required if:
 // - all internal inputs script_type === SPENDTAPROOT
diff --git a/packages/connect/src/api/bitcoin/signtxVerify.ts b/packages/connect/src/api/bitcoin/signtxVerify.ts
index 10c70aa63cc..29887f26ea6 100644
--- a/packages/connect/src/api/bitcoin/signtxVerify.ts
+++ b/packages/connect/src/api/bitcoin/signtxVerify.ts
@@ -6,8 +6,8 @@ import {
     payments as BitcoinJsPayments,
     Transaction as BitcoinJsTransaction,
 } from '@trezor/utxo-lib';
-import { PROTO, ERRORS } from '../../constants';
 
+import { PROTO, ERRORS } from '../../constants';
 import type { BitcoinNetworkInfo } from '../../types';
 import type { DeviceCommands } from '../../device/DeviceCommands';
 
diff --git a/packages/connect/src/api/blockchainDisconnect.ts b/packages/connect/src/api/blockchainDisconnect.ts
index e3fafc4c422..ee21a745969 100644
--- a/packages/connect/src/api/blockchainDisconnect.ts
+++ b/packages/connect/src/api/blockchainDisconnect.ts
@@ -1,11 +1,12 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/blockchain/BlockchainDisconnect.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { ERRORS } from '../constants';
 import { isBackendSupported, findBackend } from '../backend/BlockchainLink';
 import { getCoinInfo } from '../data/coinInfo';
 import { CoinObj, CoinInfo } from '../types';
-import { Assert } from '@trezor/schema-utils';
 
 type Params = {
     coinInfo: CoinInfo;
diff --git a/packages/connect/src/api/blockchainEstimateFee.ts b/packages/connect/src/api/blockchainEstimateFee.ts
index f1cacb9e306..2bd37bd9562 100644
--- a/packages/connect/src/api/blockchainEstimateFee.ts
+++ b/packages/connect/src/api/blockchainEstimateFee.ts
@@ -73,9 +73,7 @@ export default class BlockchainEstimateFee extends AbstractMethod<'blockchainEst
         };
         if (request && request.feeLevels) {
             const fees = new FeeLevels(coinInfo);
-            // TODO: https://github.com/trezor/trezor-suite/issues/5340
-            // smart fees for DOGE are not relevant since their fee policy changed, see @trezor/utxo-lib/compose: baseFee
-            if (request.feeLevels === 'smart' && coinInfo.shortcut !== 'DOGE') {
+            if (request.feeLevels === 'smart') {
                 const backend = await initBlockchain(coinInfo, this.postMessage, identity);
                 await fees.load(backend);
             }
diff --git a/packages/connect/src/api/blockchainEvmRpcCall.ts b/packages/connect/src/api/blockchainEvmRpcCall.ts
new file mode 100644
index 00000000000..d2ebdc93756
--- /dev/null
+++ b/packages/connect/src/api/blockchainEvmRpcCall.ts
@@ -0,0 +1,63 @@
+import { AbstractMethod, Payload } from '../core/AbstractMethod';
+import { validateParams } from './common/paramsValidator';
+import { ERRORS } from '../constants';
+import { CoinInfo } from '../types';
+import { initBlockchain, isBackendSupported } from '../backend/BlockchainLink';
+import { getCoinInfo } from '../data/coinInfo';
+
+type Params = {
+    coinInfo: CoinInfo;
+    identity?: string;
+    request: Omit<Payload<'blockchainEvmRpcCall'>, 'method' | 'coin'>;
+};
+
+export default class BlockchainEvmRpcCall extends AbstractMethod<'blockchainEvmRpcCall', Params> {
+    init() {
+        this.useDevice = false;
+        this.useUi = false;
+
+        const { payload } = this;
+
+        // validate incoming parameters
+        validateParams(payload, [
+            { name: 'coin', type: 'string', required: true },
+            { name: 'identity', type: 'string' },
+            { name: 'from', type: 'string' },
+            { name: 'to', type: 'string', required: true },
+            { name: 'data', type: 'string', required: true },
+        ]);
+
+        const coinInfo = getCoinInfo(payload.coin);
+
+        if (!coinInfo) {
+            throw ERRORS.TypedError('Method_UnknownCoin');
+        }
+        // validate backend
+        isBackendSupported(coinInfo);
+
+        this.params = {
+            coinInfo,
+            identity: payload.identity,
+            request: {
+                from: payload.from,
+                to: payload.to,
+                data: payload.data,
+            },
+        };
+    }
+
+    get info() {
+        return 'Blockchain Evm Rpc Call';
+    }
+
+    async run() {
+        const backend = await initBlockchain(
+            this.params.coinInfo,
+            postMessage,
+            this.params.identity,
+        );
+        const response = await backend.rpcCall(this.params.request);
+
+        return response;
+    }
+}
diff --git a/packages/connect/src/api/cancelCoinjoinAuthorization.ts b/packages/connect/src/api/cancelCoinjoinAuthorization.ts
index 102a7caa0a6..c1f57db01d1 100644
--- a/packages/connect/src/api/cancelCoinjoinAuthorization.ts
+++ b/packages/connect/src/api/cancelCoinjoinAuthorization.ts
@@ -1,7 +1,8 @@
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { getFirmwareRange } from './common/paramsValidator';
 import { PROTO } from '../constants';
-import { Assert } from '@trezor/schema-utils';
 import { CancelCoinjoinAuthorization as CancelCoinjoinAuthorizationSchema } from '../types/api/cancelCoinjoinAuthorization';
 
 export default class CancelCoinjoinAuthorization extends AbstractMethod<
diff --git a/packages/connect/src/api/cardano/api/cardanoGetAddress.ts b/packages/connect/src/api/cardano/api/cardanoGetAddress.ts
index 07659a4c61d..e78ade2771a 100644
--- a/packages/connect/src/api/cardano/api/cardanoGetAddress.ts
+++ b/packages/connect/src/api/cardano/api/cardanoGetAddress.ts
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/CardanoGetAddress.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
@@ -12,7 +14,6 @@ import {
 } from '../cardanoAddressParameters';
 import { PROTO, ERRORS } from '../../../constants';
 import { UI, createUiMessage } from '../../../events';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle } from '../../../types';
 import { CardanoGetAddress as CardanoGetAddressSchema } from '../../../types/api/cardano';
 
@@ -27,6 +28,7 @@ export default class CardanoGetAddress extends AbstractMethod<'cardanoGetAddress
     init() {
         this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_Cardano'];
         this.firmwareRange = getFirmwareRange(
             this.name,
             getMiscNetwork('Cardano'),
diff --git a/packages/connect/src/api/cardano/api/cardanoGetNativeScriptHash.ts b/packages/connect/src/api/cardano/api/cardanoGetNativeScriptHash.ts
index ef7b2bcbf3a..57f616642bc 100644
--- a/packages/connect/src/api/cardano/api/cardanoGetNativeScriptHash.ts
+++ b/packages/connect/src/api/cardano/api/cardanoGetNativeScriptHash.ts
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/CardanoGetNativeScriptHash.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { PROTO } from '../../../constants';
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
@@ -9,7 +11,6 @@ import {
     CardanoGetNativeScriptHash as CardanoGetNativeScriptHashSchema,
     CardanoNativeScript,
 } from '../../../types/api/cardano';
-import { Assert } from '@trezor/schema-utils';
 
 export default class CardanoGetNativeScriptHash extends AbstractMethod<
     'cardanoGetNativeScriptHash',
@@ -17,6 +18,7 @@ export default class CardanoGetNativeScriptHash extends AbstractMethod<
 > {
     init() {
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_Cardano'];
         this.firmwareRange = getFirmwareRange(
             this.name,
             getMiscNetwork('Cardano'),
diff --git a/packages/connect/src/api/cardano/api/cardanoGetPublicKey.ts b/packages/connect/src/api/cardano/api/cardanoGetPublicKey.ts
index 814a02db15c..78a8fadff90 100644
--- a/packages/connect/src/api/cardano/api/cardanoGetPublicKey.ts
+++ b/packages/connect/src/api/cardano/api/cardanoGetPublicKey.ts
@@ -1,12 +1,13 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/CardanoGetPublicKey.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { PROTO } from '../../../constants';
 import { AbstractMethod, MethodReturnType } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath, fromHardened, getSerializedPath } from '../../../utils/pathUtils';
 import { UI, createUiMessage } from '../../../events';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle } from '../../../types';
 import { CardanoGetPublicKey as CardanoGetPublicKeySchema } from '../../../types/api/cardano';
 
@@ -19,6 +20,7 @@ export default class CardanoGetPublicKey extends AbstractMethod<'cardanoGetPubli
 
     init() {
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_Cardano'];
         this.firmwareRange = getFirmwareRange(
             this.name,
             getMiscNetwork('Cardano'),
diff --git a/packages/connect/src/api/cardano/api/cardanoSignTransaction.ts b/packages/connect/src/api/cardano/api/cardanoSignTransaction.ts
index ef748f83971..c780e77c505 100644
--- a/packages/connect/src/api/cardano/api/cardanoSignTransaction.ts
+++ b/packages/connect/src/api/cardano/api/cardanoSignTransaction.ts
@@ -4,6 +4,8 @@
 
 import { trezorUtils } from '@fivebinaries/coin-selection';
 
+import { AssertWeak, Type } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
@@ -35,7 +37,6 @@ import {
 import { gatherWitnessPaths } from '../cardanoWitnesses';
 import type { AssetGroupWithTokens } from '../cardanoTokenBundle';
 import { tokenBundleToProto } from '../cardanoTokenBundle';
-import { AssertWeak, Type } from '@trezor/schema-utils';
 
 const CardanoSignTransactionFeatures = Object.freeze({
     // FW <2.6.0 is not supported by Connect at all
@@ -77,6 +78,7 @@ export default class CardanoSignTransaction extends AbstractMethod<
 > {
     init() {
         this.requiredPermissions = ['read', 'write'];
+        this.requiredDeviceCapabilities = ['Capability_Cardano'];
         this.firmwareRange = getFirmwareRange(
             this.name,
             getMiscNetwork('Cardano'),
diff --git a/packages/connect/src/api/cardano/cardanoAddressParameters.ts b/packages/connect/src/api/cardano/cardanoAddressParameters.ts
index 7c5e76c71ff..2695f8eac57 100644
--- a/packages/connect/src/api/cardano/cardanoAddressParameters.ts
+++ b/packages/connect/src/api/cardano/cardanoAddressParameters.ts
@@ -1,9 +1,10 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/helpers/cardanoAddressParameters.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { validatePath } from '../../utils/pathUtils';
 import { PROTO, ERRORS } from '../../constants';
 import { CardanoAddressParameters } from '../../types/api/cardano';
-import { Assert } from '@trezor/schema-utils';
 
 export const validateAddressParameters = (addressParameters: CardanoAddressParameters) => {
     Assert(CardanoAddressParameters, addressParameters);
diff --git a/packages/connect/src/api/cardano/cardanoAuxiliaryData.ts b/packages/connect/src/api/cardano/cardanoAuxiliaryData.ts
index bb92b3557c3..e625c3c4d9a 100644
--- a/packages/connect/src/api/cardano/cardanoAuxiliaryData.ts
+++ b/packages/connect/src/api/cardano/cardanoAuxiliaryData.ts
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/helpers/cardanoAuxiliaryData.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import {
     addressParametersToProto,
     modifyAddressParametersForBackwardsCompatibility,
@@ -12,7 +14,6 @@ import {
     CardanoCVoteRegistrationDelegation,
     CardanoCVoteRegistrationParameters,
 } from '../../types/api/cardano';
-import { Assert } from '@trezor/schema-utils';
 
 const MAX_DELEGATION_COUNT = 32;
 
diff --git a/packages/connect/src/api/cardano/cardanoCertificate.ts b/packages/connect/src/api/cardano/cardanoCertificate.ts
index 92998d7545f..29d39b3db0a 100644
--- a/packages/connect/src/api/cardano/cardanoCertificate.ts
+++ b/packages/connect/src/api/cardano/cardanoCertificate.ts
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/helpers/cardanoCertificate.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { validatePath } from '../../utils/pathUtils';
 import { PROTO, ERRORS } from '../../constants';
 import {
@@ -9,7 +11,6 @@ import {
     CardanoPoolRelay,
     CardanoDRep,
 } from '../../types/api/cardano';
-import { Assert } from '@trezor/schema-utils';
 
 const ipv4AddressToHex = (ipv4Address: string) =>
     Buffer.from(ipv4Address.split('.').map(ipPart => parseInt(ipPart, 10))).toString('hex');
diff --git a/packages/connect/src/api/cardano/cardanoInputs.ts b/packages/connect/src/api/cardano/cardanoInputs.ts
index fe24e2940f8..86c80a830a4 100644
--- a/packages/connect/src/api/cardano/cardanoInputs.ts
+++ b/packages/connect/src/api/cardano/cardanoInputs.ts
@@ -1,8 +1,9 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/helpers/cardanoInputs.js
 
+import { Assert, Type, Static } from '@trezor/schema-utils';
+
 import { validatePath } from '../../utils/pathUtils';
 import { PROTO } from '../../constants';
-import { Assert, Type, Static } from '@trezor/schema-utils';
 import { DerivationPath } from '../../exports';
 
 export type Path = number[];
diff --git a/packages/connect/src/api/cardano/cardanoOutputs.ts b/packages/connect/src/api/cardano/cardanoOutputs.ts
index aa6638936d1..97ece64e515 100644
--- a/packages/connect/src/api/cardano/cardanoOutputs.ts
+++ b/packages/connect/src/api/cardano/cardanoOutputs.ts
@@ -2,12 +2,13 @@
 
 // allow for...of statements
 
+import { Assert, Type } from '@trezor/schema-utils';
+
 import { addressParametersToProto, validateAddressParameters } from './cardanoAddressParameters';
 import { tokenBundleToProto, AssetGroupWithTokens } from './cardanoTokenBundle';
 import { PROTO } from '../../constants';
 import { hexStringByteLength, sendChunkedHexString } from './cardanoUtils';
 import { CardanoAssetGroup, CardanoAddressParameters } from '../../types/api/cardano';
-import { Assert, Type } from '@trezor/schema-utils';
 
 export type OutputWithData = {
     output: PROTO.CardanoTxOutput;
diff --git a/packages/connect/src/api/cardano/cardanoTokenBundle.ts b/packages/connect/src/api/cardano/cardanoTokenBundle.ts
index 9916c5d0f52..ac98219e5e6 100644
--- a/packages/connect/src/api/cardano/cardanoTokenBundle.ts
+++ b/packages/connect/src/api/cardano/cardanoTokenBundle.ts
@@ -1,8 +1,9 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/helpers/cardanoTokenBundle.js
 
+import { Assert, Type, Static } from '@trezor/schema-utils';
+
 import { PROTO } from '../../constants';
 import { CardanoAssetGroup, CardanoToken } from '../../types/api/cardano';
-import { Assert, Type, Static } from '@trezor/schema-utils';
 
 export type AssetGroupWithTokens = Static<typeof AssetGroupWithTokens>;
 export const AssetGroupWithTokens = Type.Object({
diff --git a/packages/connect/src/api/changeLanguage.ts b/packages/connect/src/api/changeLanguage.ts
index 472da0522b3..d4576253e1d 100644
--- a/packages/connect/src/api/changeLanguage.ts
+++ b/packages/connect/src/api/changeLanguage.ts
@@ -1,8 +1,9 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/ChangeLanguage.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { UI } from '../events';
-import { Assert } from '@trezor/schema-utils';
 import { ChangeLanguage as ChangeLanguageSchema } from '../types/api/changeLanguage';
 
 export default class ChangeLanguage extends AbstractMethod<'changeLanguage', ChangeLanguageSchema> {
diff --git a/packages/connect/src/api/changePin.ts b/packages/connect/src/api/changePin.ts
index 932130fdddf..b0d094026f2 100644
--- a/packages/connect/src/api/changePin.ts
+++ b/packages/connect/src/api/changePin.ts
@@ -1,7 +1,8 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/ChangePin.js
 
-import { AbstractMethod } from '../core/AbstractMethod';
 import { Assert } from '@trezor/schema-utils';
+
+import { AbstractMethod } from '../core/AbstractMethod';
 import { PROTO } from '../constants';
 
 export default class ChangePin extends AbstractMethod<'changePin', PROTO.ChangePin> {
diff --git a/packages/connect/src/api/checkFirmwareAuthenticity.ts b/packages/connect/src/api/checkFirmwareAuthenticity.ts
deleted file mode 100644
index f2767999d5b..00000000000
--- a/packages/connect/src/api/checkFirmwareAuthenticity.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { randomBytes } from 'crypto';
-import { AbstractMethod } from '../core/AbstractMethod';
-import { stripFwHeaders, calculateFirmwareHash, getBinary } from './firmware';
-import { getReleases } from '../data/firmwareInfo';
-import { ERRORS } from '../constants';
-import { FirmwareType } from '../types';
-import { validateParams } from './common/paramsValidator';
-import { CheckFirmwareAuthenticityParams } from '../types/api/checkFirmwareAuthenticity';
-
-export default class CheckFirmwareAuthenticity extends AbstractMethod<
-    'checkFirmwareAuthenticity',
-    CheckFirmwareAuthenticityParams
-> {
-    init() {
-        this.useEmptyPassphrase = true;
-        this.requiredPermissions = ['management'];
-        this.useDeviceState = false;
-
-        const { payload } = this;
-        validateParams(payload, [{ name: 'baseUrl', type: 'string' }]);
-        this.params = { baseUrl: payload.baseUrl };
-    }
-
-    async run() {
-        const { device } = this;
-
-        if (!device.firmwareRelease) {
-            throw ERRORS.TypedError('Runtime', 'device.firmwareRelease is not set');
-        }
-
-        const btcOnly = device.firmwareType === FirmwareType.BitcoinOnly;
-
-        try {
-            const fw = await getBinary({
-                releases: getReleases(device.features?.internal_model),
-                baseUrl: this.params.baseUrl ?? 'https://data.trezor.io',
-                version: device.getVersion(),
-                btcOnly,
-            });
-
-            if (!fw) {
-                throw ERRORS.TypedError(
-                    'Runtime',
-                    'checkFirmwareAuthenticity: firmware binary not found',
-                );
-            }
-
-            const { hash: expectedFirmwareHash, challenge } = calculateFirmwareHash(
-                device.features.major_version,
-                stripFwHeaders(fw),
-                randomBytes(32),
-            );
-
-            const result = await this.device
-                .getCommands()
-                .typedCall('GetFirmwareHash', 'FirmwareHash', {
-                    challenge,
-                });
-
-            const { message } = result;
-            const { hash: actualFirmwareHash } = message;
-
-            return {
-                expectedFirmwareHash,
-                actualFirmwareHash,
-                valid: actualFirmwareHash === expectedFirmwareHash,
-            };
-        } catch (e) {
-            throw ERRORS.TypedError('Runtime', `${e}`);
-        }
-    }
-}
diff --git a/packages/connect/src/api/cipherKeyValue.ts b/packages/connect/src/api/cipherKeyValue.ts
index a7efc79921d..4a45b211928 100644
--- a/packages/connect/src/api/cipherKeyValue.ts
+++ b/packages/connect/src/api/cipherKeyValue.ts
@@ -1,11 +1,12 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/CipherKeyValue.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { UI, createUiMessage } from '../events';
 import { AbstractMethod } from '../core/AbstractMethod';
 import { getFirmwareRange } from './common/paramsValidator';
 import { validatePath } from '../utils/pathUtils';
 import type { PROTO } from '../constants';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle } from '../types/params';
 import { CipherKeyValue as CipherKeyValueSchema } from '../types/api/cipherKeyValue';
 
diff --git a/packages/connect/src/api/common/Discovery.ts b/packages/connect/src/api/common/Discovery.ts
index 7d4fafdeb63..d4251abd52e 100644
--- a/packages/connect/src/api/common/Discovery.ts
+++ b/packages/connect/src/api/common/Discovery.ts
@@ -1,6 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/helpers/Discovery.js
 
 import EventEmitter from 'events';
+
 import { PROTO, ERRORS } from '../../constants';
 import { Blockchain } from '../../backend/BlockchainLink';
 import { DeviceCommands } from '../../device/DeviceCommands';
diff --git a/packages/connect/src/api/common/__fixtures__/paramsValidator.ts b/packages/connect/src/api/common/__fixtures__/paramsValidator.ts
index 168533e5f7b..d81d982fee1 100644
--- a/packages/connect/src/api/common/__fixtures__/paramsValidator.ts
+++ b/packages/connect/src/api/common/__fixtures__/paramsValidator.ts
@@ -1,3 +1,5 @@
+import { DeviceModelInternal, FirmwareRange } from '../../../exports';
+
 export const validateParams = [
     {
         description: 'array',
@@ -171,13 +173,21 @@ export const validateParams = [
 const DEFAULT_RANGE = {
     T1B1: { min: '1.0.0', max: '0' },
     T2T1: { min: '2.0.0', max: '0' },
-    T2B1: { min: '2.6.1', max: '0' },
-    T3B1: { min: '2.8.1', max: '0' },
-    T3T1: { min: '2.7.1', max: '0' },
+    T2B1: { min: '2.0.0', max: '0' },
+    T3B1: { min: '2.0.0', max: '0' },
+    T3T1: { min: '2.0.0', max: '0' },
+    T3W1: { min: '2.0.0', max: '0' },
 };
 
 const DEFAULT_COIN_INFO = {
-    support: { T1B1: '1.6.2', T2T1: '2.1.0', T2B1: '2.6.1', T3B1: '2.8.1', T3T1: '2.7.1' },
+    support: {
+        T1B1: '1.6.2',
+        T2T1: '2.1.0',
+        T2B1: '2.0.0',
+        T3B1: '2.0.0',
+        T3T1: '2.0.0',
+        T3W1: '2.0.0',
+    },
     shortcut: 'btc',
     type: 'bitcoin',
 };
@@ -197,25 +207,30 @@ export const getFirmwareRange = [
         description: 'range from coinInfo',
         config: EMPTY_CONFIG,
         params: ['signTransaction', DEFAULT_COIN_INFO, DEFAULT_RANGE],
-        result: {
-            T1B1: { min: '1.6.2', max: '0' },
-            T2T1: { min: '2.1.0', max: '0' },
-            T2B1: { min: '2.6.1', max: '0' },
-            T3B1: { min: '2.8.1', max: '0' },
-            T3T1: { min: '2.7.1', max: '0' },
-        },
+        result: (Object.keys(DEFAULT_RANGE) as DeviceModelInternal[]).reduce(
+            (acc, model: DeviceModelInternal) => {
+                acc[model] = {
+                    min: DEFAULT_COIN_INFO.support[model],
+                    max: '0',
+                };
+
+                return acc;
+            },
+            {} as FirmwareRange,
+        ),
     },
     {
         description: 'coinInfo without support',
         config: EMPTY_CONFIG,
         params: ['signTransaction', { shortcut: 'btc', type: 'bitcoin' }, DEFAULT_RANGE],
-        result: {
-            T1B1: { min: '0', max: '0' },
-            T2T1: { min: '0', max: '0' },
-            T2B1: { min: '0', max: '0' },
-            T3B1: { min: '0', max: '0' },
-            T3T1: { min: '0', max: '0' },
-        },
+        result: (Object.keys(DEFAULT_COIN_INFO.support) as DeviceModelInternal[]).reduce(
+            (acc, model) => {
+                acc[model] = { min: '0', max: '0' };
+
+                return acc;
+            },
+            {} as FirmwareRange,
+        ),
     },
     {
         description: 'coinInfo without T1B1 support',
@@ -223,19 +238,22 @@ export const getFirmwareRange = [
         params: [
             'signTransaction',
             {
-                support: { T1B1: false, T2T1: '2.1.0', T2B1: '2.6.1', T3T1: '2.7.1' },
+                support: {
+                    T1B1: false,
+                    T2T1: '2.1.0',
+                },
                 shortcut: 'btc',
                 type: 'bitcoin',
             },
             DEFAULT_RANGE,
         ],
-        result: {
-            T1B1: { min: '0', max: '0' },
-            T2T1: { min: '2.1.0', max: '0' },
-            T2B1: { min: '2.6.1', max: '0' },
-            T3B1: { min: '2.8.1', max: '0' },
-            T3T1: { min: '2.7.1', max: '0' },
-        },
+        result: (
+            Object.entries(DEFAULT_COIN_INFO.support) as [DeviceModelInternal, string][]
+        ).reduce((acc, [model, min]) => {
+            acc[model] = { min: model === 'T1B1' ? '0' : min, max: '0' };
+
+            return acc;
+        }, {} as FirmwareRange),
     },
     {
         description: 'coinInfo without T2 support',
@@ -243,19 +261,26 @@ export const getFirmwareRange = [
         params: [
             'signTransaction',
             {
-                support: { T1B1: '1.6.2', T2T1: false, T2B1: false, T3B1: false, T3T1: false },
+                support: {
+                    T1B1: '1.6.2',
+                    T2T1: false,
+                    T2B1: false,
+                    T3B1: false,
+                    T3T1: false,
+                    T3W1: false,
+                },
                 shortcut: 'btc',
                 type: 'bitcoin',
             },
             DEFAULT_RANGE,
         ],
-        result: {
-            T1B1: { min: '1.6.2', max: '0' },
-            T2T1: { min: '0', max: '0' },
-            T2B1: { min: '0', max: '0' },
-            T3B1: { min: '0', max: '0' },
-            T3T1: { min: '0', max: '0' },
-        },
+        result: (
+            Object.entries(DEFAULT_COIN_INFO.support) as [DeviceModelInternal, string][]
+        ).reduce((acc, [model, min]) => {
+            acc[model] = { min: model === 'T1B1' ? min : '0', max: '0' };
+
+            return acc;
+        }, {} as FirmwareRange),
     },
     {
         description: 'coinInfo support is lower than default',
@@ -287,11 +312,9 @@ export const getFirmwareRange = [
         },
         params: ['signTransaction', DEFAULT_COIN_INFO, DEFAULT_RANGE],
         result: {
+            ...DEFAULT_RANGE,
             T1B1: { min: '1.11.0', max: '0' },
             T2T1: { min: '2.5.0', max: '0' },
-            T2B1: { min: '2.6.1', max: '0' },
-            T3B1: { min: '2.8.1', max: '0' },
-            T3T1: { min: '2.7.1', max: '0' },
         },
     },
     {
@@ -305,11 +328,9 @@ export const getFirmwareRange = [
         },
         params: ['signTransaction', DEFAULT_COIN_INFO, DEFAULT_RANGE],
         result: {
+            ...DEFAULT_RANGE,
             T1B1: { min: '1.10.0', max: '0' },
             T2T1: { min: '2.4.0', max: '0' },
-            T2B1: { min: '2.6.1', max: '0' },
-            T3B1: { min: '2.8.1', max: '0' },
-            T3T1: { min: '2.7.1', max: '0' },
         },
     },
     {
@@ -323,11 +344,9 @@ export const getFirmwareRange = [
         },
         params: ['signTransaction', DEFAULT_COIN_INFO, DEFAULT_RANGE],
         result: {
+            ...DEFAULT_RANGE,
             T1B1: { min: '1.10.0', max: '0' },
             T2T1: { min: '2.4.0', max: '0' },
-            T2B1: { min: '2.6.1', max: '0' },
-            T3B1: { min: '2.8.1', max: '0' },
-            T3T1: { min: '2.7.1', max: '0' },
         },
     },
     {
@@ -355,11 +374,9 @@ export const getFirmwareRange = [
         },
         params: ['signTransaction', DEFAULT_COIN_INFO, DEFAULT_RANGE],
         result: {
+            ...DEFAULT_RANGE,
             T1B1: { min: '1.10.0', max: '0' },
             T2T1: { min: '2.4.0', max: '0' },
-            T2B1: { min: '2.6.1', max: '0' },
-            T3B1: { min: '2.8.1', max: '0' },
-            T3T1: { min: '2.7.1', max: '0' },
         },
     },
     {
@@ -387,11 +404,9 @@ export const getFirmwareRange = [
         },
         params: ['decreaseOutput', DEFAULT_COIN_INFO, DEFAULT_RANGE],
         result: {
+            ...DEFAULT_RANGE,
             T1B1: { min: '1.10.0', max: '0' },
             T2T1: { min: '2.4.0', max: '0' },
-            T2B1: { min: '2.6.1', max: '0' },
-            T3B1: { min: '2.8.1', max: '0' },
-            T3T1: { min: '2.7.1', max: '0' },
         },
     },
     {
@@ -404,18 +419,16 @@ export const getFirmwareRange = [
         params: [
             'signTransaction',
             {
-                support: { T1B1: '1.10.0', T2T1: '2.4.0', T2B1: '2.6.1' },
+                support: { T1B1: '1.10.0', T2T1: '2.4.0' },
                 shortcut: 'btc',
                 type: 'bitcoin',
             },
             DEFAULT_RANGE,
         ],
         result: {
+            ...DEFAULT_RANGE,
             T1B1: { min: '1.10.0', max: '0' },
             T2T1: { min: '2.4.0', max: '0' },
-            T2B1: { min: '2.6.1', max: '0' },
-            T3B1: { min: '2.8.1', max: '0' },
-            T3T1: { min: '2.7.1', max: '0' },
         },
     },
     {
@@ -427,11 +440,9 @@ export const getFirmwareRange = [
         },
         params: ['signTransaction', DEFAULT_COIN_INFO, DEFAULT_RANGE],
         result: {
+            ...DEFAULT_RANGE,
             T1B1: { min: '1.6.2', max: '1.10.0' },
             T2T1: { min: '2.1.0', max: '2.4.0' },
-            T2B1: { min: '2.6.1', max: '0' },
-            T3B1: { min: '2.8.1', max: '0' },
-            T3T1: { min: '2.7.1', max: '0' },
         },
     },
     {
@@ -457,18 +468,16 @@ export const getFirmwareRange = [
         params: [
             'getAccountInfo',
             {
-                support: { T1B1: '1.0.1', T2T1: '2.0.1', T2B1: '2.6.1' },
+                support: { T1B1: '1.0.1', T2T1: '2.0.1' },
                 shortcut: 'xrp',
                 type: 'ripple',
             },
             DEFAULT_RANGE,
         ],
         result: {
+            ...DEFAULT_RANGE,
             T1B1: { min: '0', max: '0' },
             T2T1: { min: '2.1.0', max: '0' },
-            T2B1: { min: '2.6.1', max: '0' },
-            T3B1: { min: '2.8.1', max: '0' },
-            T3T1: { min: '2.7.1', max: '0' },
         },
     },
     {
@@ -481,28 +490,25 @@ export const getFirmwareRange = [
         params: [
             'eip1559',
             {
-                support: { T1B1: '1.6.2', T2T1: '2.1.0', T2B1: '2.6.1' },
+                support: { T1B1: '1.6.2', T2T1: '2.1.0' },
                 shortcut: 'eth',
                 type: 'ethereum',
             },
             DEFAULT_RANGE,
         ],
         result: {
+            ...DEFAULT_RANGE,
             T1B1: { min: '1.10.4', max: '0' },
             T2T1: { min: '2.4.2', max: '0' },
-            T2B1: { min: '2.6.1', max: '0' },
-            T3B1: { min: '2.8.1', max: '0' },
-            T3T1: { min: '2.7.1', max: '0' },
         },
     },
     {
         description: 'method not available for T1B1 and T2T1, defined by config',
         params: ['authenticateDevice', undefined, DEFAULT_RANGE],
         result: {
+            ...DEFAULT_RANGE,
             T1B1: { min: '0', max: '0' },
             T2T1: { min: '0', max: '0' },
-            T2B1: { min: '2.6.1', max: '0' },
-            T3B1: { min: '2.8.1', max: '0' },
             T3T1: { min: '2.8.0', max: '0' },
         },
     },
diff --git a/packages/connect/src/api/common/__tests__/paramsValidator.test.ts b/packages/connect/src/api/common/__tests__/paramsValidator.test.ts
index 6ac8188ea56..e79e709f562 100644
--- a/packages/connect/src/api/common/__tests__/paramsValidator.test.ts
+++ b/packages/connect/src/api/common/__tests__/paramsValidator.test.ts
@@ -23,24 +23,26 @@ describe('helpers/paramsValidator', () => {
             jest.clearAllMocks();
         });
         fixtures.getFirmwareRange.forEach(f => {
-            it(f.description, done => {
-                jest.resetModules();
+            it(f.description, () => {
+                return new Promise<void>(done => {
+                    jest.resetModules();
 
-                const mock = f.config;
-                jest.mock('../../../data/config', () => {
-                    const actualConfig = jest.requireActual('../../../data/config').config;
+                    const mock = f.config;
+                    jest.mock('../../../data/config', () => {
+                        const actualConfig = jest.requireActual('../../../data/config').config;
 
-                    return {
-                        __esModule: true,
-                        config: mock || actualConfig,
-                    };
-                });
+                        return {
+                            __esModule: true,
+                            config: mock || actualConfig,
+                        };
+                    });
 
-                import('../paramsValidator').then(({ getFirmwareRange }) => {
-                    // added new capability
-                    // @ts-expect-error
-                    expect(getFirmwareRange(...f.params)).toEqual(f.result);
-                    done();
+                    import('../paramsValidator').then(({ getFirmwareRange }) => {
+                        // added new capability
+                        // @ts-expect-error
+                        expect(getFirmwareRange(...f.params)).toEqual(f.result);
+                        done();
+                    });
                 });
             });
         });
diff --git a/packages/connect/src/api/common/paramsValidator.ts b/packages/connect/src/api/common/paramsValidator.ts
index 7af8bd6978f..b23a0bc0882 100644
--- a/packages/connect/src/api/common/paramsValidator.ts
+++ b/packages/connect/src/api/common/paramsValidator.ts
@@ -42,7 +42,7 @@ export function validateParams<P extends Record<string, any>>(params: P, schema:
                     validateParams(p, [{ name: field.name, type: t }]);
 
                     return count + 1;
-                } catch (e) {
+                } catch {
                     return count;
                 }
             }, 0);
@@ -166,7 +166,9 @@ export const getFirmwareRange = (
         // 0 may be confusing. means: no-support for "min" and unlimited support for "max"
         if (rule.min) {
             models.forEach(model => {
-                const modelMin = rule.min[model];
+                const modelMin = (rule.min as Record<DeviceModelInternal, string | undefined>)[
+                    model
+                ];
                 if (modelMin) {
                     if (
                         modelMin === '0' ||
diff --git a/packages/connect/src/api/composeTransaction.ts b/packages/connect/src/api/composeTransaction.ts
index f1b7ef42604..f72749c222d 100644
--- a/packages/connect/src/api/composeTransaction.ts
+++ b/packages/connect/src/api/composeTransaction.ts
@@ -1,6 +1,8 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/ComposeTransaction.js
 
 import { BigNumber } from '@trezor/utils/src/bigNumber';
+import type { ComposeOutput, TransactionInputOutputSortingStrategy } from '@trezor/utxo-lib';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { ERRORS } from '../constants';
 import { UI, createUiMessage } from '../events';
@@ -25,7 +27,6 @@ import {
     verifyTx,
     parseTransactionHexes,
 } from './bitcoin';
-import type { ComposeOutput } from '@trezor/utxo-lib';
 import type { BitcoinNetworkInfo, DiscoveryAccount, AccountUtxo } from '../types';
 import type {
     SignedTransaction,
@@ -34,6 +35,7 @@ import type {
     PrecomposedResult,
 } from '../types/api/composeTransaction';
 import type { RefTransaction } from '../types/api/bitcoin';
+import { DEFAULT_SORTING_STRATEGY } from '../constants/utxo';
 
 type Params = {
     outputs: ComposeOutput[];
@@ -45,9 +47,20 @@ type Params = {
     baseFee?: PrecomposeParams['baseFee'];
     floorBaseFee?: PrecomposeParams['floorBaseFee'];
     sequence?: PrecomposeParams['sequence'];
-    skipPermutation?: PrecomposeParams['skipPermutation'];
     total: BigNumber;
-};
+    sortingStrategy: PrecomposeParams['sortingStrategy'];
+} & (
+    | {
+          /** @deprecated: use sortingStrategy=none instead */
+          skipPermutation?: PrecomposeParams['skipPermutation'];
+          sortingStrategy?: undefined;
+      }
+    | {
+          /** @deprecated: use sortingStrategy=none instead */
+          skipPermutation?: undefined;
+          sortingStrategy?: TransactionInputOutputSortingStrategy;
+      }
+);
 
 export default class ComposeTransaction extends AbstractMethod<'composeTransaction', Params> {
     discovery?: Discovery;
@@ -68,6 +81,7 @@ export default class ComposeTransaction extends AbstractMethod<'composeTransacti
             { name: 'floorBaseFee', type: 'boolean' },
             { name: 'sequence', type: 'number' },
             { name: 'skipPermutation', type: 'boolean' },
+            { name: 'sortingStrategy', type: 'string' },
         ]);
 
         const coinInfo = getBitcoinNetwork(payload.coin);
@@ -115,7 +129,7 @@ export default class ComposeTransaction extends AbstractMethod<'composeTransacti
             baseFee: payload.baseFee,
             floorBaseFee: payload.floorBaseFee,
             sequence: payload.sequence,
-            skipPermutation: payload.skipPermutation,
+            sortingStrategy: payload.skipPermutation === true ? 'none' : payload.sortingStrategy,
             push: typeof payload.push === 'boolean' ? payload.push : false,
             total,
         };
@@ -143,7 +157,7 @@ export default class ComposeTransaction extends AbstractMethod<'composeTransacti
         account: PrecomposeParams['account'],
         feeLevels: PrecomposeParams['feeLevels'],
     ): Promise<PrecomposedResult[]> {
-        const { coinInfo, outputs, baseFee, skipPermutation } = this.params;
+        const { coinInfo, outputs, baseFee, sortingStrategy } = this.params;
         const address_n = pathUtils.validatePath(account.path);
         const composer = new TransactionComposer({
             account: {
@@ -157,7 +171,7 @@ export default class ComposeTransaction extends AbstractMethod<'composeTransacti
             coinInfo,
             outputs,
             baseFee,
-            skipPermutation,
+            sortingStrategy: sortingStrategy ?? DEFAULT_SORTING_STRATEGY,
         });
 
         // This is mandatory, @trezor/utxo-lib/compose expects current block height
@@ -301,7 +315,7 @@ export default class ComposeTransaction extends AbstractMethod<'composeTransacti
     }
 
     async selectFee(account: DiscoveryAccount, utxos: AccountUtxo[]) {
-        const { coinInfo, outputs } = this.params;
+        const { coinInfo, outputs, sortingStrategy, skipPermutation } = this.params;
 
         // get backend instance (it should be initialized before)
         const blockchain = await this.getBlockchain();
@@ -310,6 +324,8 @@ export default class ComposeTransaction extends AbstractMethod<'composeTransacti
             utxos,
             coinInfo,
             outputs,
+            sortingStrategy:
+                skipPermutation === true ? 'none' : sortingStrategy ?? DEFAULT_SORTING_STRATEGY,
         });
         await composer.init(blockchain);
 
diff --git a/packages/connect/src/api/eos/api/eosGetPublicKey.ts b/packages/connect/src/api/eos/api/eosGetPublicKey.ts
index 95196493b53..e4a61d2e140 100644
--- a/packages/connect/src/api/eos/api/eosGetPublicKey.ts
+++ b/packages/connect/src/api/eos/api/eosGetPublicKey.ts
@@ -1,12 +1,13 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/EosGetPublicKey.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath, fromHardened, getSerializedPath } from '../../../utils/pathUtils';
 import { UI, createUiMessage } from '../../../events';
 import type { PROTO } from '../../../constants';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle, GetPublicKey as GetPublicKeySchema } from '../../../types';
 
 export default class EosGetPublicKey extends AbstractMethod<
@@ -17,6 +18,7 @@ export default class EosGetPublicKey extends AbstractMethod<
 
     init() {
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_EOS'];
         this.firmwareRange = getFirmwareRange(this.name, getMiscNetwork('EOS'), this.firmwareRange);
 
         // create a bundle with only one batch if bundle doesn't exists
diff --git a/packages/connect/src/api/eos/api/eosSignTransaction.ts b/packages/connect/src/api/eos/api/eosSignTransaction.ts
index 32b4581608f..67d3653764d 100644
--- a/packages/connect/src/api/eos/api/eosSignTransaction.ts
+++ b/packages/connect/src/api/eos/api/eosSignTransaction.ts
@@ -1,12 +1,13 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/EosSignTransaction.js
 
+import { AssertWeak } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath } from '../../../utils/pathUtils';
 import * as helper from '../eosSignTx';
 import type { PROTO } from '../../../constants';
-import { AssertWeak } from '@trezor/schema-utils';
 import { EosSignTransaction as EosSignTransactionSchema } from '../../../types/api/eos';
 
 type Params = {
@@ -20,6 +21,7 @@ type Params = {
 export default class EosSignTransaction extends AbstractMethod<'eosSignTransaction', Params> {
     init() {
         this.requiredPermissions = ['read', 'write'];
+        this.requiredDeviceCapabilities = ['Capability_EOS'];
         this.firmwareRange = getFirmwareRange(this.name, getMiscNetwork('EOS'), this.firmwareRange);
 
         const { payload } = this;
diff --git a/packages/connect/src/api/ethereum/__fixtures__/ethereumSignTx.ts b/packages/connect/src/api/ethereum/__fixtures__/ethereumSignTx.ts
index dea0ca0011b..b8e26456300 100644
--- a/packages/connect/src/api/ethereum/__fixtures__/ethereumSignTx.ts
+++ b/packages/connect/src/api/ethereum/__fixtures__/ethereumSignTx.ts
@@ -1,12 +1,21 @@
-export const serializeEthereumTx = [
+import { LegacyTxData } from '@ethereumjs/tx';
+
+interface EthereumTxFixture {
+    description: string;
+    chainId: number;
+    tx: LegacyTxData; // + TODO: FeeMarketEIP1559TxData
+    result: string;
+}
+
+export const serializeEthereumTx: EthereumTxFixture[] = [
     {
         // https://eth1.trezor.io/tx/0xf6652a681b4474132b8b96512eb0bd5311f5ed8414af59e715c9738a3b3673f3
-        description: 'ETH regular',
+        description: 'Legacy tx - ETH regular',
+        chainId: 1,
         tx: {
             // data sent to TrezorConnect.ethereumSignTransaction
             to: '0x4dC573D5DB497C0bF0674599E81c7dB91151D4e6',
             value: '0x3905f13a8f0e',
-            chainId: 1,
             nonce: '0x12',
             gasLimit: '0x5208',
             gasPrice: '0x104c533c00',
@@ -20,11 +29,11 @@ export const serializeEthereumTx = [
     },
     {
         // https://eth1.trezor.io/tx/0xdcaf3eba690a3cdbad8c2926a8f5a95cd20003c5ba2aace91d8c5fe8048e395b
-        description: 'Eth with ERC20',
+        description: 'Legacy tx - ETH with ERC20',
+        chainId: 1,
         tx: {
             to: '0xa74476443119A942dE498590Fe1f2454d7D4aC0d',
             value: '0x0',
-            chainId: 1,
             nonce: '0xb',
             gasLimit: '0x30d40',
             gasPrice: '0x12a05f200',
@@ -37,11 +46,11 @@ export const serializeEthereumTx = [
     },
     {
         // https://etc1.trezor.io/tx/0xebd7ef20c4358a6fdb09a951d6e77b8e88b37ac0f7a8d4e3b68f1666bf4c1d1a
-        description: 'ETC regular',
+        description: 'Legacy tx - ETC regular',
+        chainId: 61,
         tx: {
             to: '0xABE894C18832edbe9B7926D729FA950673faD1EC',
             value: '0x56c212a8e4628',
-            chainId: 61,
             nonce: '0x0',
             gasLimit: '0x5208',
             gasPrice: '0x5409c6a7b',
@@ -53,3 +62,5 @@ export const serializeEthereumTx = [
         result: '0xebd7ef20c4358a6fdb09a951d6e77b8e88b37ac0f7a8d4e3b68f1666bf4c1d1a',
     },
 ];
+
+// TODO: add EIP1559 tx type
diff --git a/packages/connect/src/api/ethereum/__fixtures__/ethereumSignTypedData.ts b/packages/connect/src/api/ethereum/__fixtures__/ethereumSignTypedData.ts
index d28b3e5d9ca..caf948a62be 100644
--- a/packages/connect/src/api/ethereum/__fixtures__/ethereumSignTypedData.ts
+++ b/packages/connect/src/api/ethereum/__fixtures__/ethereumSignTypedData.ts
@@ -1,5 +1,5 @@
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error */
 import { BigNumber } from '@trezor/utils/src/bigNumber';
+
 import { TrezorError } from '../../../constants/errors';
 import { PROTO } from '../../../constants';
 
@@ -254,7 +254,6 @@ export const encodeData = [
         input: {
             typeName: 'int256',
             // `1n << 254n` instead of `2n ** 254n` since Babel replaces ** with Math.pow()
-            // @ts-ignore, BigInt literals are not available when targeting lower than ES2020
             data: -(1n << 254n) + 1n,
         },
         // Python (-(2 ** 254) + 1).to_bytes(32, "big", signed=True).hex()
@@ -264,7 +263,6 @@ export const encodeData = [
         description: `should encode int from string`,
         input: {
             typeName: 'int256',
-            // @ts-ignore, BigInt literals are not available when targeting lower than ES2020
             data: `${-(1n << 254n) + 1n}`,
         },
         // Python (-(2 ** 254) + 1).to_bytes(32, "big", signed=True).hex()
diff --git a/packages/connect/src/api/ethereum/__tests__/ethereumSignTx.test.ts b/packages/connect/src/api/ethereum/__tests__/ethereumSignTx.test.ts
index 1556d0358ab..b218957b39c 100644
--- a/packages/connect/src/api/ethereum/__tests__/ethereumSignTx.test.ts
+++ b/packages/connect/src/api/ethereum/__tests__/ethereumSignTx.test.ts
@@ -2,22 +2,22 @@ import { TransactionFactory } from '@ethereumjs/tx';
 import { keccak256, toHex } from 'web3-utils';
 
 import { serializeEthereumTx } from '../ethereumSignTx';
-
 import * as fixtures from '../__fixtures__/ethereumSignTx';
 
 describe('helpers/ethereumSignTx', () => {
     describe('serializeEthereumTx', () => {
         fixtures.serializeEthereumTx.forEach(f => {
             it(f.description, () => {
-                // verify hash using 2 different tools
-                if (f.tx.chainId !== 61) {
-                    // ETC is not supported
+                // ETC is not supported
+                if (f.chainId !== 61) {
                     const tx = TransactionFactory.fromTxData(f.tx);
                     const hash1 = Buffer.from(tx.hash()).toString('hex');
                     expect(`0x${hash1}`).toEqual(f.result);
                 }
-                const serialized = serializeEthereumTx({ ...f.tx, type: 0 }, f.tx.chainId);
-                const hash2 = toHex(keccak256(Buffer.from(serialized.slice(2), 'hex')));
+                const serialized = serializeEthereumTx({ ...f.tx, type: 0 }, f.chainId);
+                const hash2 = toHex(
+                    keccak256(Uint8Array.from(Buffer.from(serialized.slice(2), 'hex'))),
+                );
                 expect(hash2).toEqual(f.result);
             });
         });
diff --git a/packages/connect/src/api/ethereum/__tests__/ethereumSignTypedData.test.ts b/packages/connect/src/api/ethereum/__tests__/ethereumSignTypedData.test.ts
index 1b5d88f24ea..20e59de5575 100644
--- a/packages/connect/src/api/ethereum/__tests__/ethereumSignTypedData.test.ts
+++ b/packages/connect/src/api/ethereum/__tests__/ethereumSignTypedData.test.ts
@@ -6,7 +6,7 @@ describe('helpers/ethereumSignTypeData', () => {
         fixtures.parseArrayType.forEach(f => {
             it(`${f.description} - ${f.input}`, () => {
                 if (f.error) {
-                    expect(() => parseArrayType(f.input)).toThrowError(...f.error);
+                    expect(() => parseArrayType(f.input)).toThrow(...f.error);
                 } else {
                     expect(parseArrayType(f.input)).toEqual(f.output);
                 }
@@ -19,7 +19,7 @@ describe('helpers/ethereumSignTypeData', () => {
             const { typeName, types } = f.input;
             it(`${f.description} - ${typeName}`, () => {
                 if (f.error) {
-                    expect(() => getFieldType(typeName, types as any)).toThrowError(...f.error);
+                    expect(() => getFieldType(typeName, types as any)).toThrow(...f.error);
                 } else {
                     expect(getFieldType(typeName, types as any)).toEqual(f.output);
                 }
@@ -32,7 +32,7 @@ describe('helpers/ethereumSignTypeData', () => {
             const { typeName, data } = f.input;
             it(`${f.description}`, () => {
                 if (f.error) {
-                    expect(() => encodeData(typeName, data)).toThrowError(...f.error);
+                    expect(() => encodeData(typeName, data)).toThrow(...f.error);
                 } else {
                     expect(encodeData(typeName, data)).toEqual(f.output);
                 }
diff --git a/packages/connect/src/api/ethereum/api/ethereumGetAddress.ts b/packages/connect/src/api/ethereum/api/ethereumGetAddress.ts
index 9fc0bc46144..03c46401a43 100644
--- a/packages/connect/src/api/ethereum/api/ethereumGetAddress.ts
+++ b/packages/connect/src/api/ethereum/api/ethereumGetAddress.ts
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/EthereumGetAddress.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { validatePath, getSerializedPath, getSlip44ByPath } from '../../../utils/pathUtils';
@@ -14,7 +16,6 @@ import {
     decodeEthereumDefinition,
     ethereumNetworkInfoFromDefinition,
 } from '../ethereumDefinitions';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle } from '../../../types';
 import { GetAddress as GetAddressSchema } from '../../../types/api/getAddress';
 
@@ -31,6 +32,7 @@ export default class EthereumGetAddress extends AbstractMethod<'ethereumGetAddre
     init() {
         this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_Ethereum'];
 
         // create a bundle with only one batch if bundle doesn't exists
         this.hasBundle = !!this.payload.bundle;
diff --git a/packages/connect/src/api/ethereum/api/ethereumGetPublicKey.ts b/packages/connect/src/api/ethereum/api/ethereumGetPublicKey.ts
index c087c861524..f0f7d919bf8 100644
--- a/packages/connect/src/api/ethereum/api/ethereumGetPublicKey.ts
+++ b/packages/connect/src/api/ethereum/api/ethereumGetPublicKey.ts
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/EthereumGetPublicKey.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { validatePath } from '../../../utils/pathUtils';
@@ -8,7 +10,6 @@ import { getEthereumNetwork, getUniqueNetworks } from '../../../data/coinInfo';
 import { UI, createUiMessage } from '../../../events';
 import type { PROTO } from '../../../constants';
 import type { EthereumNetworkInfo } from '../../../types';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle, GetPublicKey as GetPublicKeySchema } from '../../../types';
 
 type Params = PROTO.EthereumGetPublicKey & {
@@ -20,6 +21,7 @@ export default class EthereumGetPublicKey extends AbstractMethod<'ethereumGetPub
 
     init() {
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_Ethereum'];
 
         // create a bundle with only one batch if bundle doesn't exists
         this.hasBundle = !!this.payload.bundle;
diff --git a/packages/connect/src/api/ethereum/api/ethereumSignMessage.ts b/packages/connect/src/api/ethereum/api/ethereumSignMessage.ts
index c1cf32ecfea..2b5d9a23437 100644
--- a/packages/connect/src/api/ethereum/api/ethereumSignMessage.ts
+++ b/packages/connect/src/api/ethereum/api/ethereumSignMessage.ts
@@ -1,5 +1,8 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/EthereumSignMessage.js
 
+import { MessagesSchema } from '@trezor/protobuf';
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getSlip44ByPath, validatePath } from '../../../utils/pathUtils';
@@ -12,8 +15,6 @@ import {
     EthereumNetworkInfo,
     EthereumSignMessage as EthereumSignMessageSchema,
 } from '../../../types';
-import { MessagesSchema } from '@trezor/protobuf';
-import { Assert } from '@trezor/schema-utils';
 
 type Params = PROTO.EthereumSignMessage & {
     network?: EthereumNetworkInfo;
@@ -23,6 +24,7 @@ type Params = PROTO.EthereumSignMessage & {
 export default class EthereumSignMessage extends AbstractMethod<'ethereumSignMessage', Params> {
     init() {
         this.requiredPermissions = ['read', 'write'];
+        this.requiredDeviceCapabilities = ['Capability_Ethereum'];
 
         const { payload } = this;
 
diff --git a/packages/connect/src/api/ethereum/api/ethereumSignTransaction.ts b/packages/connect/src/api/ethereum/api/ethereumSignTransaction.ts
index 2d2f4a26d24..611182bd16e 100644
--- a/packages/connect/src/api/ethereum/api/ethereumSignTransaction.ts
+++ b/packages/connect/src/api/ethereum/api/ethereumSignTransaction.ts
@@ -1,5 +1,10 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/EthereumSignTransaction.js
 
+import { FeeMarketEIP1559TxData, LegacyTxData } from '@ethereumjs/tx';
+
+import { MessagesSchema } from '@trezor/protobuf';
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getSlip44ByPath, validatePath } from '../../../utils/pathUtils';
@@ -17,8 +22,6 @@ import {
     EthereumNetworkInfo,
     EthereumSignTransaction as EthereumSignTransactionSchema,
 } from '../../../types';
-import { MessagesSchema } from '@trezor/protobuf';
-import { Assert } from '@trezor/schema-utils';
 
 type Params = {
     path: number[];
@@ -52,6 +55,7 @@ export default class EthereumSignTransaction extends AbstractMethod<
 > {
     init() {
         this.requiredPermissions = ['read', 'write'];
+        this.requiredDeviceCapabilities = ['Capability_Ethereum'];
 
         const { payload } = this;
         // validate incoming parameters
@@ -118,46 +122,49 @@ export default class EthereumSignTransaction extends AbstractMethod<
     async run() {
         const { type, tx, definitions, chunkify } = this.params;
 
-        const signature =
-            type === 'eip1559'
-                ? await helper.ethereumSignTxEIP1559(
-                      this.device.getCommands().typedCall.bind(this.device.getCommands()),
-                      this.params.path,
-                      tx.to,
-                      tx.value,
-                      tx.gasLimit,
-                      tx.maxFeePerGas,
-                      tx.maxPriorityFeePerGas,
-                      tx.nonce,
-                      tx.chainId,
-                      chunkify,
-                      tx.data,
-                      tx.accessList,
-                      definitions,
-                  )
-                : await helper.ethereumSignTx(
-                      this.device.getCommands().typedCall.bind(this.device.getCommands()),
-                      this.params.path,
-                      tx.to,
-                      tx.value,
-                      tx.gasLimit,
-                      tx.gasPrice,
-                      tx.nonce,
-                      tx.chainId,
-                      chunkify,
-                      tx.data,
-                      tx.txType,
-                      definitions,
-                  );
-
-        const serializedTx = helper.serializeEthereumTx(
-            {
-                ...tx,
-                ...signature,
-                type: type === 'legacy' ? 0 : 2,
-            },
-            tx.chainId,
-        );
+        const isLegacy = type === 'legacy';
+
+        const signature = isLegacy
+            ? await helper.ethereumSignTx(
+                  this.device.getCommands().typedCall.bind(this.device.getCommands()),
+                  this.params.path,
+                  tx.to,
+                  tx.value,
+                  tx.gasLimit,
+                  tx.gasPrice,
+                  tx.nonce,
+                  tx.chainId,
+                  chunkify,
+                  tx.data,
+                  tx.txType,
+                  definitions,
+              )
+            : await helper.ethereumSignTxEIP1559(
+                  this.device.getCommands().typedCall.bind(this.device.getCommands()),
+                  this.params.path,
+                  tx.to,
+                  tx.value,
+                  tx.gasLimit,
+                  tx.maxFeePerGas,
+                  tx.maxPriorityFeePerGas,
+                  tx.nonce,
+                  tx.chainId,
+                  chunkify,
+                  tx.data,
+                  tx.accessList,
+                  definitions,
+              );
+
+        const txData = {
+            ...tx,
+            ...signature,
+            type: isLegacy ? 0 : 2, // 0 for legacy, 2 for EIP-1559
+            gasPrice: isLegacy ? tx.gasPrice : null,
+            maxFeePerGas: isLegacy ? tx.maxFeePerGas : tx.maxPriorityFeePerGas,
+            maxPriorityFeePerGas: !isLegacy ? tx.maxPriorityFeePerGas : undefined,
+        } as LegacyTxData | FeeMarketEIP1559TxData;
+
+        const serializedTx = helper.serializeEthereumTx(txData, tx.chainId);
 
         return { ...signature, serializedTx };
     }
diff --git a/packages/connect/src/api/ethereum/api/ethereumSignTypedData.ts b/packages/connect/src/api/ethereum/api/ethereumSignTypedData.ts
index 1fdfb042a7d..ab27f21c2e2 100644
--- a/packages/connect/src/api/ethereum/api/ethereumSignTypedData.ts
+++ b/packages/connect/src/api/ethereum/api/ethereumSignTypedData.ts
@@ -1,5 +1,8 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/EthereumSignTypedData.js
 
+import { MessagesSchema } from '@trezor/protobuf';
+import { Assert, Type } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getSlip44ByPath, validatePath } from '../../../utils/pathUtils';
@@ -15,8 +18,6 @@ import { getFieldType, parseArrayType, encodeData } from '../ethereumSignTypedDa
 import { messageToHex } from '../../../utils/formatUtils';
 import { getEthereumDefinitions } from '../ethereumDefinitions';
 import { EthereumNetworkInfo, DeviceModelInternal } from '../../../types';
-import { MessagesSchema } from '@trezor/protobuf';
-import { Assert, Type } from '@trezor/schema-utils';
 
 // This type is not inferred, because it internally uses types that are generic
 type Params = (
@@ -42,6 +43,7 @@ const Params = Type.Intersect([
 export default class EthereumSignTypedData extends AbstractMethod<'ethereumSignTypedData', Params> {
     init() {
         this.requiredPermissions = ['read', 'write'];
+        this.requiredDeviceCapabilities = ['Capability_Ethereum'];
 
         const { payload } = this;
 
diff --git a/packages/connect/src/api/ethereum/api/ethereumVerifyMessage.ts b/packages/connect/src/api/ethereum/api/ethereumVerifyMessage.ts
index 9891a50f5ad..ba89fa88e77 100644
--- a/packages/connect/src/api/ethereum/api/ethereumVerifyMessage.ts
+++ b/packages/connect/src/api/ethereum/api/ethereumVerifyMessage.ts
@@ -1,10 +1,11 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/EthereumVerifyMessage.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { stripHexPrefix, messageToHex } from '../../../utils/formatUtils';
 import type { PROTO } from '../../../constants';
-import { Assert } from '@trezor/schema-utils';
 import { EthereumVerifyMessage as EthereumVerifyMessageSchema } from '../../../types';
 
 export default class EthereumVerifyMessage extends AbstractMethod<
@@ -14,6 +15,7 @@ export default class EthereumVerifyMessage extends AbstractMethod<
     init() {
         this.requiredPermissions = ['read', 'write'];
         this.firmwareRange = getFirmwareRange(this.name, null, this.firmwareRange);
+        this.requiredDeviceCapabilities = ['Capability_Ethereum'];
 
         const { payload } = this;
 
diff --git a/packages/connect/src/api/ethereum/ethereumDefinitions.ts b/packages/connect/src/api/ethereum/ethereumDefinitions.ts
index 2240b875b1a..3a1aaf98501 100644
--- a/packages/connect/src/api/ethereum/ethereumDefinitions.ts
+++ b/packages/connect/src/api/ethereum/ethereumDefinitions.ts
@@ -1,12 +1,12 @@
 import fetch from 'cross-fetch';
 
-import { MessagesSchema } from '@trezor/protobuf';
+import { MessagesSchema, parseConfigure, decode as decodeProtobuf } from '@trezor/protobuf';
 import { trzd } from '@trezor/protocol';
-import { parseConfigure, decode as decodeProtobuf } from '@trezor/protobuf';
+import { Type, Static, Assert } from '@trezor/schema-utils';
+
 import { DataManager } from '../../data/DataManager';
 import { EthereumNetworkInfo } from '../../types';
 import { ethereumNetworkInfoBase } from '../../data/coinInfo';
-import { Type, Static, Assert } from '@trezor/schema-utils';
 
 interface GetEthereumDefinitions {
     chainId?: number;
@@ -152,9 +152,10 @@ export const ethereumNetworkInfoFromDefinition = (
         connect: true,
         T1B1: '1.6.2',
         T2T1: '2.0.7',
-        T2B1: '2.6.1',
-        T3B1: '2.8.1',
-        T3T1: '2.7.1',
+        T2B1: '2.0.0',
+        T3B1: '2.0.0',
+        T3T1: '2.0.0',
+        T3W1: '2.0.0',
     },
     blockchainLink: undefined,
 });
diff --git a/packages/connect/src/api/ethereum/ethereumSignTx.ts b/packages/connect/src/api/ethereum/ethereumSignTx.ts
index 82205b30d9b..a844bc1d308 100644
--- a/packages/connect/src/api/ethereum/ethereumSignTx.ts
+++ b/packages/connect/src/api/ethereum/ethereumSignTx.ts
@@ -4,6 +4,7 @@ import { Common, Chain, Hardfork } from '@ethereumjs/common';
 import { FeeMarketEIP1559TxData, TransactionFactory, LegacyTxData } from '@ethereumjs/tx';
 
 import { MessagesSchema } from '@trezor/protobuf';
+
 import { PROTO, ERRORS } from '../../constants';
 import type { TypedCall } from '../../device/DeviceCommands';
 import type { EthereumAccessList } from '../../types/api/ethereum';
diff --git a/packages/connect/src/api/ethereum/ethereumSignTypedData.ts b/packages/connect/src/api/ethereum/ethereumSignTypedData.ts
index de0979f0a62..b65dbaa1975 100644
--- a/packages/connect/src/api/ethereum/ethereumSignTypedData.ts
+++ b/packages/connect/src/api/ethereum/ethereumSignTypedData.ts
@@ -1,6 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/helpers/ethereumSignTypedData.js
 
 import { BigNumber } from '@trezor/utils/src/bigNumber';
+
 import { PROTO, ERRORS } from '../../constants';
 import { messageToHex } from '../../utils/formatUtils';
 import type { EthereumSignTypedDataTypes } from '../../types/api/ethereum';
diff --git a/packages/connect/src/api/firmware/__tests__/calculateFirmwareHash.test.ts b/packages/connect/src/api/firmware/__tests__/calculateFirmwareHash.test.ts
index ebc42d89079..4e1f9f53821 100644
--- a/packages/connect/src/api/firmware/__tests__/calculateFirmwareHash.test.ts
+++ b/packages/connect/src/api/firmware/__tests__/calculateFirmwareHash.test.ts
@@ -43,8 +43,6 @@ describe('firmware/calculateFirmwareHash', () => {
     });
 
     it('Firmware too big', () => {
-        expect(() => calculateFirmwareHash(2, Buffer.alloc(100000000))).toThrowError(
-            'Firmware too big',
-        );
+        expect(() => calculateFirmwareHash(2, Buffer.alloc(100000000))).toThrow('Firmware too big');
     });
 });
diff --git a/packages/connect/src/api/firmware/__tests__/verifyAuthenticityProof.test.ts b/packages/connect/src/api/firmware/__tests__/verifyAuthenticityProof.test.ts
index 6f4263a8922..fd3804e275d 100644
--- a/packages/connect/src/api/firmware/__tests__/verifyAuthenticityProof.test.ts
+++ b/packages/connect/src/api/firmware/__tests__/verifyAuthenticityProof.test.ts
@@ -28,6 +28,10 @@ const CONFIG = {
             '041b36cc98d5e3d1a20677aaf26254ef3756f27c9d63080c93ad3e7d39d3ad23bf00497b924789bc8e3f87834994e16780ad4eae7e75db1f03835ca64363e980b4',
         ],
     },
+    T3W1: {
+        rootPubKeys: ['you shall not pass'], // TODO T3W1
+        caPubKeys: ['you shall not pass'], // TODO T3W1
+    },
 } as DeviceAuthenticityConfig;
 
 describe('firmware/verifyAuthenticityProof', () => {
diff --git a/packages/connect/src/api/firmware/getBinary.ts b/packages/connect/src/api/firmware/getBinary.ts
index a6568610826..50264a7eb43 100644
--- a/packages/connect/src/api/firmware/getBinary.ts
+++ b/packages/connect/src/api/firmware/getBinary.ts
@@ -1,42 +1,23 @@
-import { versionUtils } from '@trezor/utils';
 import { httpRequest } from '../../utils/assets';
-import { FirmwareRelease, IntermediaryVersion } from '../../types';
+import { FirmwareRelease } from '../../types';
 
 interface GetBinaryProps {
     baseUrl: string;
     btcOnly?: boolean;
-    version?: number[];
-    intermediaryVersion?: IntermediaryVersion;
-    releases: FirmwareRelease[];
+    release: FirmwareRelease;
 }
 
-export const getBinary = ({
-    releases,
-    baseUrl,
-    version,
-    btcOnly,
-    intermediaryVersion,
-}: GetBinaryProps) => {
-    if (intermediaryVersion) {
-        return httpRequest(
-            `${baseUrl}/firmware/t1b1/trezor-t1b1-inter-v${intermediaryVersion}.bin`,
-            'binary',
-        );
-    }
-
-    const releaseByFirmware = releases.find(
-        r =>
-            version &&
-            versionUtils.isVersionArray(version) &&
-            versionUtils.isEqual(r.version, version),
-    );
-
-    if (releaseByFirmware === undefined) {
-        throw new Error('no firmware found for this device');
-    }
-
-    const fwUrl = releaseByFirmware[btcOnly ? 'url_bitcoinonly' : 'url'];
+export const getBinary = ({ baseUrl, btcOnly, release }: GetBinaryProps) => {
+    const fwUrl = release[btcOnly ? 'url_bitcoinonly' : 'url'];
     const url = `${baseUrl}/${fwUrl}`;
 
     return httpRequest(url, 'binary');
 };
+
+export const getBinaryOptional = async (props: GetBinaryProps) => {
+    try {
+        return await getBinary(props);
+    } catch {
+        return null;
+    }
+};
diff --git a/packages/connect/src/api/firmware/getBinaryForFirmwareUpgrade.ts b/packages/connect/src/api/firmware/getBinaryForFirmwareUpgrade.ts
index 87751c891d2..1217761bf8d 100644
--- a/packages/connect/src/api/firmware/getBinaryForFirmwareUpgrade.ts
+++ b/packages/connect/src/api/firmware/getBinaryForFirmwareUpgrade.ts
@@ -3,13 +3,13 @@ import { versionUtils } from '@trezor/utils';
 import { httpRequest } from '../../utils/assets';
 import { isStrictFeatures } from '../../utils/firmwareUtils';
 import { getInfo, GetInfoProps } from '../../data/firmwareInfo';
-import { IntermediaryVersion } from '../../types';
+import { IntermediaryVersion, VersionArray } from '../../types';
 import { getBinary } from './getBinary';
 
 interface GetBinaryForFirmwareUpgradeProps extends GetInfoProps {
     baseUrl: string;
     btcOnly?: boolean;
-    version?: number[];
+    version?: VersionArray;
     intermediaryVersion?: IntermediaryVersion;
 }
 
@@ -19,12 +19,12 @@ interface GetBinaryForFirmwareUpgradeProps extends GetInfoProps {
  * is safe.
  */
 export const getBinaryForFirmwareUpgrade = ({
-    features,
     releases,
     baseUrl,
     version,
     btcOnly,
     intermediaryVersion,
+    features,
 }: GetBinaryForFirmwareUpgradeProps) => {
     if (!isStrictFeatures(features)) {
         throw new Error('Features of unexpected shape provided');
@@ -63,5 +63,5 @@ export const getBinaryForFirmwareUpgrade = ({
         );
     }
 
-    return getBinary({ releases, baseUrl, version, btcOnly, intermediaryVersion });
+    return getBinary({ release: releaseByFirmware, baseUrl, btcOnly });
 };
diff --git a/packages/connect/src/api/firmware/index.ts b/packages/connect/src/api/firmware/index.ts
index 47130d817b2..fe8e1d9aab7 100644
--- a/packages/connect/src/api/firmware/index.ts
+++ b/packages/connect/src/api/firmware/index.ts
@@ -1,5 +1,5 @@
 export { getBinaryForFirmwareUpgrade } from './getBinaryForFirmwareUpgrade';
-export { getBinary } from './getBinary';
+export { getBinary, getBinaryOptional } from './getBinary';
 export { getLanguage } from '../../data/getLanguage';
 export { shouldStripFwHeaders, stripFwHeaders } from './modifyFirmware';
 export { uploadFirmware } from './uploadFirmware';
diff --git a/packages/connect/src/api/firmware/verifyAuthenticityProof.ts b/packages/connect/src/api/firmware/verifyAuthenticityProof.ts
index 33e28ea740e..f86cd6d2a4b 100644
--- a/packages/connect/src/api/firmware/verifyAuthenticityProof.ts
+++ b/packages/connect/src/api/firmware/verifyAuthenticityProof.ts
@@ -1,4 +1,5 @@
 import * as crypto from 'crypto';
+
 import { bufferUtils } from '@trezor/utils';
 
 import { PROTO } from '../../constants';
diff --git a/packages/connect/src/api/firmware/x509certificate.ts b/packages/connect/src/api/firmware/x509certificate.ts
index 6f93bb86891..c01e48170e7 100644
--- a/packages/connect/src/api/firmware/x509certificate.ts
+++ b/packages/connect/src/api/firmware/x509certificate.ts
@@ -81,12 +81,9 @@ const derToAsn1 = (byteArray: Uint8Array): Asn1 => {
         throw new Error('Unsupported length encoding');
     }
 
-    let length = getLength(); // As encoded, which may be special value 0
-    let byteLength;
-    let contents;
-
-    byteLength = position + length;
-    contents = byteArray.subarray(position, byteLength);
+    const length = getLength(); // As encoded, which may be special value 0
+    const byteLength = position + length;
+    const contents = byteArray.subarray(position, byteLength);
 
     const raw = byteArray.subarray(0, byteLength); // May not be the whole input array
 
diff --git a/packages/connect/src/api/getAccountDescriptor.ts b/packages/connect/src/api/getAccountDescriptor.ts
index a78ba51ea53..1e5417a4916 100644
--- a/packages/connect/src/api/getAccountDescriptor.ts
+++ b/packages/connect/src/api/getAccountDescriptor.ts
@@ -1,3 +1,5 @@
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType, DEFAULT_FIRMWARE_RANGE } from '../core/AbstractMethod';
 import { getFirmwareRange } from './common/paramsValidator';
 import { validatePath, getSerializedPath } from '../utils/pathUtils';
@@ -10,7 +12,6 @@ import {
     GetAccountDescriptorParams,
     GetAccountDescriptorResponse,
 } from '../types/api/getAccountDescriptor';
-import { Assert } from '@trezor/schema-utils';
 
 type Request = GetAccountDescriptorParams & { address_n: number[]; coinInfo: CoinInfo };
 
diff --git a/packages/connect/src/api/getAddress.ts b/packages/connect/src/api/getAddress.ts
index d759a9ad7ac..bdf7140ecb3 100644
--- a/packages/connect/src/api/getAddress.ts
+++ b/packages/connect/src/api/getAddress.ts
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/GetAddress.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../core/AbstractMethod';
 import { validateCoinPath, getFirmwareRange } from './common/paramsValidator';
 import { validatePath, getLabel, getSerializedPath } from '../utils/pathUtils';
@@ -7,7 +9,6 @@ import { getBitcoinNetwork, fixCoinInfoNetwork, getUniqueNetworks } from '../dat
 import { PROTO, ERRORS } from '../constants';
 import { UI, createUiMessage } from '../events';
 import { Bundle, type BitcoinNetworkInfo } from '../types';
-import { Assert } from '@trezor/schema-utils';
 import { GetAddress as GetAddressSchema } from '../types/api/getAddress';
 
 type Params = PROTO.GetAddress & {
diff --git a/packages/connect/src/api/getCoinInfo.ts b/packages/connect/src/api/getCoinInfo.ts
index a948e487062..2b32220bb92 100644
--- a/packages/connect/src/api/getCoinInfo.ts
+++ b/packages/connect/src/api/getCoinInfo.ts
@@ -1,10 +1,11 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/GetCoinInfo.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { ERRORS } from '../constants';
 import { getCoinInfo } from '../data/coinInfo';
 import { CoinObj, CoinInfo } from '../types';
-import { Assert } from '@trezor/schema-utils';
 
 type Params = {
     coinInfo: CoinInfo;
diff --git a/packages/connect/src/api/getFirmwareHash.ts b/packages/connect/src/api/getFirmwareHash.ts
index e44ef009d6f..933ba5c4384 100644
--- a/packages/connect/src/api/getFirmwareHash.ts
+++ b/packages/connect/src/api/getFirmwareHash.ts
@@ -1,8 +1,9 @@
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { PROTO } from '../constants';
 import { UI } from '../events';
 import { getFirmwareRange } from './common/paramsValidator';
-import { Assert } from '@trezor/schema-utils';
 
 export default class GetFirmwareHash extends AbstractMethod<
     'getFirmwareHash',
diff --git a/packages/connect/src/api/getOwnershipId.ts b/packages/connect/src/api/getOwnershipId.ts
index f36d2615d1e..440fbea6423 100644
--- a/packages/connect/src/api/getOwnershipId.ts
+++ b/packages/connect/src/api/getOwnershipId.ts
@@ -1,10 +1,11 @@
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../core/AbstractMethod';
 import { getFirmwareRange } from './common/paramsValidator';
 import { validatePath, getScriptType, getSerializedPath } from '../utils/pathUtils';
 import { getBitcoinNetwork } from '../data/coinInfo';
 import { PROTO } from '../constants';
 import { UI, createUiMessage } from '../events';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle } from '../exports';
 import { GetOwnershipId as GetOwnershipIdSchema } from '../types/api/getOwnershipId';
 
diff --git a/packages/connect/src/api/getOwnershipProof.ts b/packages/connect/src/api/getOwnershipProof.ts
index 6e923cb69f5..eb8c4c7a195 100644
--- a/packages/connect/src/api/getOwnershipProof.ts
+++ b/packages/connect/src/api/getOwnershipProof.ts
@@ -1,10 +1,11 @@
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../core/AbstractMethod';
 import { getFirmwareRange } from './common/paramsValidator';
 import { validatePath, getScriptType, getSerializedPath } from '../utils/pathUtils';
 import { getBitcoinNetwork } from '../data/coinInfo';
 import { PROTO } from '../constants';
 import { UI, createUiMessage } from '../events';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle } from '../exports';
 import { GetOwnershipProof as GetOwnershipProofSchema } from '../types/api/getOwnershipProof';
 
diff --git a/packages/connect/src/api/getPublicKey.ts b/packages/connect/src/api/getPublicKey.ts
index d04b2aed617..c21b4a0455e 100644
--- a/packages/connect/src/api/getPublicKey.ts
+++ b/packages/connect/src/api/getPublicKey.ts
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/GetPublicKey.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../core/AbstractMethod';
 import { validateCoinPath, getFirmwareRange } from './common/paramsValidator';
 import { validatePath } from '../utils/pathUtils';
@@ -8,7 +10,6 @@ import { getBitcoinNetwork } from '../data/coinInfo';
 import { getPublicKeyLabel } from '../utils/accountUtils';
 import type { BitcoinNetworkInfo } from '../types';
 import type { PROTO } from '../constants';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle } from '../types';
 import { GetPublicKey as GetPublicKeySchema } from '../types/api/getPublicKey';
 
diff --git a/packages/connect/src/api/index.ts b/packages/connect/src/api/index.ts
index faa7c69d647..561e4bcde8f 100644
--- a/packages/connect/src/api/index.ts
+++ b/packages/connect/src/api/index.ts
@@ -9,6 +9,7 @@ export { default as blockchainDisconnect } from './blockchainDisconnect';
 export { default as blockchainEstimateFee } from './blockchainEstimateFee';
 export { default as blockchainGetAccountBalanceHistory } from './blockchainGetAccountBalanceHistory';
 export { default as blockchainGetCurrentFiatRates } from './blockchainGetCurrentFiatRates';
+export { default as blockchainEvmRpcCall } from './blockchainEvmRpcCall';
 export { default as blockchainGetFiatRatesForTimestamps } from './blockchainGetFiatRatesForTimestamps';
 export { default as blockchainGetTransactions } from './blockchainGetTransactions';
 export { default as blockchainSetCustomBackend } from './blockchainSetCustomBackend';
@@ -40,12 +41,12 @@ export { default as getSettings } from './getSettings';
 // export { default as off } from './off';
 // export { default as on } from './on';
 export { default as pushTransaction } from './pushTransaction';
-export { default as rebootToBootloader } from './rebootToBootloader';
 export { default as recoveryDevice } from './recoveryDevice';
 // export { default as removeAllListeners } from './composeTransaction';
 // export { default as renderWebUSBButton } from './composeTransaction';
 export { default as requestLogin } from './requestLogin';
 export { default as resetDevice } from './resetDevice';
+export { default as loadDevice } from './loadDevice';
 export { default as setBrightness } from './setBrightness';
 export { default as setBusy } from './setBusy';
 export { default as setProxy } from './setProxy';
@@ -55,4 +56,3 @@ export { default as unlockPath } from './unlockPath';
 // export { default as uiResponse } from './uiResponse';
 export { default as verifyMessage } from './verifyMessage';
 export { default as wipeDevice } from './wipeDevice';
-export { default as checkFirmwareAuthenticity } from './checkFirmwareAuthenticity';
diff --git a/packages/connect/src/api/loadDevice.ts b/packages/connect/src/api/loadDevice.ts
new file mode 100644
index 00000000000..53827718a22
--- /dev/null
+++ b/packages/connect/src/api/loadDevice.ts
@@ -0,0 +1,49 @@
+import { Assert } from '@trezor/schema-utils';
+
+import { AbstractMethod } from '../core/AbstractMethod';
+import { UI } from '../events';
+import { getFirmwareRange } from './common/paramsValidator';
+import { PROTO } from '../constants';
+
+export default class LoadDevice extends AbstractMethod<'loadDevice', PROTO.LoadDevice> {
+    init() {
+        this.allowDeviceMode = [UI.INITIALIZE];
+        this.useDeviceState = false;
+        this.requiredPermissions = ['management'];
+        this.firmwareRange = getFirmwareRange(this.name, null, this.firmwareRange);
+
+        const { payload } = this;
+        // validate bundle type
+        Assert(PROTO.LoadDevice, payload);
+
+        this.params = {
+            mnemonics: payload.mnemonics,
+            pin: payload.pin,
+            passphrase_protection: payload.passphrase_protection,
+            language: payload.language,
+            label: payload.label,
+            skip_checksum: payload.skip_checksum,
+            u2f_counter: payload.u2f_counter,
+            needs_backup: payload.needs_backup,
+            no_backup: payload.no_backup,
+        };
+    }
+
+    get info() {
+        return 'Load seed and related internal settings.';
+    }
+
+    get confirmation() {
+        return {
+            view: 'device-management' as const,
+            label: 'Do you really you want to load device?',
+        };
+    }
+
+    async run() {
+        const cmd = this.device.getCommands();
+        const response = await cmd.typedCall('LoadDevice', 'Success', this.params);
+
+        return response.message;
+    }
+}
diff --git a/packages/connect/src/api/nem/api/nemGetAddress.ts b/packages/connect/src/api/nem/api/nemGetAddress.ts
index baef0a318ef..931aea0c0be 100644
--- a/packages/connect/src/api/nem/api/nemGetAddress.ts
+++ b/packages/connect/src/api/nem/api/nemGetAddress.ts
@@ -1,12 +1,13 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/NEMGetAddress.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath, fromHardened, getSerializedPath } from '../../../utils/pathUtils';
 import { PROTO, ERRORS } from '../../../constants';
 import { UI, createUiMessage } from '../../../events';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle } from '../../../types';
 import { GetAddress as GetAddressSchema } from '../../../types/api/getAddress';
 
@@ -25,6 +26,7 @@ export default class NEMGetAddress extends AbstractMethod<'nemGetAddress', Param
     init() {
         this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_NEM'];
         this.firmwareRange = getFirmwareRange(this.name, getMiscNetwork('NEM'), this.firmwareRange);
 
         // create a bundle with only one batch if bundle doesn't exists
diff --git a/packages/connect/src/api/nem/api/nemSignTransaction.ts b/packages/connect/src/api/nem/api/nemSignTransaction.ts
index 0d962218d7d..086371e2b02 100644
--- a/packages/connect/src/api/nem/api/nemSignTransaction.ts
+++ b/packages/connect/src/api/nem/api/nemSignTransaction.ts
@@ -1,12 +1,13 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/NEMSignTransaction.js
 
+import { AssertWeak } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath } from '../../../utils/pathUtils';
 import * as helper from '../nemSignTx';
 import type { PROTO } from '../../../constants';
-import { AssertWeak } from '@trezor/schema-utils';
 import { NEMSignTransaction as NEMSignTransactionSchema } from '../../../types/api/nem';
 
 export default class NEMSignTransaction extends AbstractMethod<
@@ -15,6 +16,7 @@ export default class NEMSignTransaction extends AbstractMethod<
 > {
     init() {
         this.requiredPermissions = ['read', 'write'];
+        this.requiredDeviceCapabilities = ['Capability_NEM'];
         this.firmwareRange = getFirmwareRange(this.name, getMiscNetwork('NEM'), this.firmwareRange);
 
         const { payload } = this;
diff --git a/packages/connect/src/api/pushTransaction.ts b/packages/connect/src/api/pushTransaction.ts
index 14369bcdf2d..277624e9b3d 100644
--- a/packages/connect/src/api/pushTransaction.ts
+++ b/packages/connect/src/api/pushTransaction.ts
@@ -1,11 +1,12 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/PushTransaction.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { getCoinInfo } from '../data/coinInfo';
 import { ERRORS } from '../constants';
 import { isBackendSupported, initBlockchain } from '../backend/BlockchainLink';
 import type { CoinInfo } from '../types';
-import { Assert } from '@trezor/schema-utils';
 import { PushTransaction as PushTransactionSchema } from '../types/api/pushTransaction';
 
 type Params = {
diff --git a/packages/connect/src/api/rebootToBootloader.ts b/packages/connect/src/api/rebootToBootloader.ts
deleted file mode 100644
index e8036de919d..00000000000
--- a/packages/connect/src/api/rebootToBootloader.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/RebootToBootloader.js
-
-import { AbstractMethod } from '../core/AbstractMethod';
-import { getFirmwareRange } from './common/paramsValidator';
-import { UI } from '../events';
-import { Assert } from '@trezor/schema-utils';
-import { PROTO } from '../constants';
-
-export default class RebootToBootloader extends AbstractMethod<
-    'rebootToBootloader',
-    PROTO.RebootToBootloader
-> {
-    init() {
-        this.allowDeviceMode = [UI.INITIALIZE, UI.SEEDLESS];
-        this.skipFinalReload = true;
-        this.keepSession = false;
-        this.requiredPermissions = ['management'];
-        this.useDeviceState = false;
-        this.firmwareRange = getFirmwareRange(this.name, null, this.firmwareRange);
-
-        const { payload } = this;
-        Assert(PROTO.RebootToBootloader, payload);
-
-        this.params = {
-            boot_command: payload.boot_command,
-            firmware_header: payload.firmware_header,
-            language_data_length: payload.language_data_length,
-        };
-    }
-
-    get info() {
-        return 'Reboot to bootloader';
-    }
-
-    get confirmation() {
-        return {
-            view: 'device-management' as const,
-            customConfirmButton: {
-                className: 'confirm',
-                label: `Reboot`,
-            },
-            label: 'Are you sure you want to reboot to bootloader?',
-        };
-    }
-
-    async run() {
-        const cmd = this.device.getCommands();
-        const response = await cmd.typedCall('RebootToBootloader', 'Success', this.params);
-
-        return response.message;
-    }
-}
diff --git a/packages/connect/src/api/recoveryDevice.ts b/packages/connect/src/api/recoveryDevice.ts
index 337557d7a70..559d7d9abe2 100644
--- a/packages/connect/src/api/recoveryDevice.ts
+++ b/packages/connect/src/api/recoveryDevice.ts
@@ -1,8 +1,9 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/RecoveryDevice.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { UI } from '../events';
-import { Assert } from '@trezor/schema-utils';
 import type { PROTO } from '../constants';
 import { RecoveryDevice as RecoveryDeviceSchema } from '../types/api/recoveryDevice';
 
diff --git a/packages/connect/src/api/requestLogin.ts b/packages/connect/src/api/requestLogin.ts
index b835cf6d1dd..0dbf2e8d719 100644
--- a/packages/connect/src/api/requestLogin.ts
+++ b/packages/connect/src/api/requestLogin.ts
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/RequestLogin.js
 
+import { Assert, Type } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { getFirmwareRange } from './common/paramsValidator';
 import { ERRORS } from '../constants';
@@ -7,7 +9,6 @@ import { UI, createUiMessage } from '../events';
 import { DataManager } from '../data/DataManager';
 import type { ConnectSettings } from '../types';
 import type { PROTO } from '../constants';
-import { Assert, Type } from '@trezor/schema-utils';
 import { RequestLoginSchema } from '../types/api/requestLogin';
 
 export default class RequestLogin extends AbstractMethod<'requestLogin', PROTO.SignIdentity> {
diff --git a/packages/connect/src/api/resetDevice.ts b/packages/connect/src/api/resetDevice.ts
index 84d16c8e073..d19f695c271 100644
--- a/packages/connect/src/api/resetDevice.ts
+++ b/packages/connect/src/api/resetDevice.ts
@@ -1,10 +1,11 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/ResetDevice.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { UI } from '../events';
 import { getFirmwareRange } from './common/paramsValidator';
 import { PROTO } from '../constants';
-import { Assert } from '@trezor/schema-utils';
 
 export default class ResetDevice extends AbstractMethod<'resetDevice', PROTO.ResetDevice> {
     init() {
@@ -18,7 +19,6 @@ export default class ResetDevice extends AbstractMethod<'resetDevice', PROTO.Res
         Assert(PROTO.ResetDevice, payload);
 
         this.params = {
-            display_random: payload.display_random,
             strength: payload.strength || 256,
             passphrase_protection: payload.passphrase_protection,
             pin_protection: payload.pin_protection,
diff --git a/packages/connect/src/api/ripple/api/rippleGetAddress.ts b/packages/connect/src/api/ripple/api/rippleGetAddress.ts
index a2e8b5bc5c2..d8ca192d78e 100644
--- a/packages/connect/src/api/ripple/api/rippleGetAddress.ts
+++ b/packages/connect/src/api/ripple/api/rippleGetAddress.ts
@@ -1,12 +1,13 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/RippleGetAddress.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath, fromHardened, getSerializedPath } from '../../../utils/pathUtils';
 import { PROTO, ERRORS } from '../../../constants';
 import { UI, createUiMessage } from '../../../events';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle } from '../../../types';
 import { GetAddress as GetAddressSchema } from '../../../types/api/getAddress';
 
@@ -21,6 +22,7 @@ export default class RippleGetAddress extends AbstractMethod<'rippleGetAddress',
     init() {
         this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_Ripple'];
         this.firmwareRange = getFirmwareRange(
             this.name,
             getMiscNetwork('Ripple'),
diff --git a/packages/connect/src/api/ripple/api/rippleSignTransaction.ts b/packages/connect/src/api/ripple/api/rippleSignTransaction.ts
index 241f0475935..a53e64a3971 100644
--- a/packages/connect/src/api/ripple/api/rippleSignTransaction.ts
+++ b/packages/connect/src/api/ripple/api/rippleSignTransaction.ts
@@ -1,11 +1,12 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/RippleSignTransaction.js
 
+import { AssertWeak } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath } from '../../../utils/pathUtils';
 import type { PROTO } from '../../../constants';
-import { AssertWeak } from '@trezor/schema-utils';
 import { RippleSignTransaction as RippleSignTransactionSchema } from '../../../types/api/ripple';
 
 export default class RippleSignTransaction extends AbstractMethod<
@@ -14,6 +15,7 @@ export default class RippleSignTransaction extends AbstractMethod<
 > {
     init() {
         this.requiredPermissions = ['read', 'write'];
+        this.requiredDeviceCapabilities = ['Capability_Ripple'];
         this.firmwareRange = getFirmwareRange(
             this.name,
             getMiscNetwork('Ripple'),
diff --git a/packages/connect/src/api/setBrightness.ts b/packages/connect/src/api/setBrightness.ts
index 97a8fb89f71..ee0665c7eec 100644
--- a/packages/connect/src/api/setBrightness.ts
+++ b/packages/connect/src/api/setBrightness.ts
@@ -1,8 +1,9 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/SetBrightness.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { PROTO } from '../constants';
-import { Assert } from '@trezor/schema-utils';
 
 export default class SetBrightness extends AbstractMethod<'setBrightness', PROTO.SetBrightness> {
     init() {
diff --git a/packages/connect/src/api/setBusy.ts b/packages/connect/src/api/setBusy.ts
index 576aac81b1a..67940bbfedb 100644
--- a/packages/connect/src/api/setBusy.ts
+++ b/packages/connect/src/api/setBusy.ts
@@ -1,8 +1,9 @@
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { DEVICE, createDeviceMessage } from '../events';
 import { PROTO } from '../constants';
 import { getFirmwareRange } from './common/paramsValidator';
-import { Assert } from '@trezor/schema-utils';
 
 export default class SetBusy extends AbstractMethod<'setBusy', PROTO.SetBusy> {
     init() {
diff --git a/packages/connect/src/api/signMessage.ts b/packages/connect/src/api/signMessage.ts
index 3bf9e74b80a..d8c9b2eefa7 100644
--- a/packages/connect/src/api/signMessage.ts
+++ b/packages/connect/src/api/signMessage.ts
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/SignMessage.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { validateCoinPath, getFirmwareRange } from './common/paramsValidator';
 import { validatePath, getLabel, getScriptType } from '../utils/pathUtils';
@@ -8,7 +10,6 @@ import { messageToHex } from '../utils/formatUtils';
 import type { BitcoinNetworkInfo } from '../types';
 import type { PROTO } from '../constants';
 import { SignMessage as SignMessageSchema } from '../types';
-import { Assert } from '@trezor/schema-utils';
 
 export default class SignMessage extends AbstractMethod<'signMessage', PROTO.SignMessage> {
     init() {
diff --git a/packages/connect/src/api/solana/additionalInfo.ts b/packages/connect/src/api/solana/additionalInfo.ts
index c49490af41d..5a86efabeb9 100644
--- a/packages/connect/src/api/solana/additionalInfo.ts
+++ b/packages/connect/src/api/solana/additionalInfo.ts
@@ -1,4 +1,5 @@
 import { Assert } from '@trezor/schema-utils';
+
 import { SolanaTxAdditionalInfo } from '../../types/api/solana';
 
 export const transformAdditionalInfo = (additionalInfo?: SolanaTxAdditionalInfo) => {
diff --git a/packages/connect/src/api/solana/api/solanaGetAddress.ts b/packages/connect/src/api/solana/api/solanaGetAddress.ts
index c874c5038b9..793954c9cca 100644
--- a/packages/connect/src/api/solana/api/solanaGetAddress.ts
+++ b/packages/connect/src/api/solana/api/solanaGetAddress.ts
@@ -1,10 +1,11 @@
+import { Assert } from '@trezor/schema-utils';
+
 import { ERRORS, PROTO } from '../../../constants';
 import { AbstractMethod, MethodReturnType } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath, fromHardened, getSerializedPath } from '../../../utils/pathUtils';
 import { UI, createUiMessage } from '../../../events';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle } from '../../../types';
 import { GetAddress as GetAddressSchema } from '../../../types/api/getAddress';
 
@@ -19,6 +20,7 @@ export default class SolanaGetAddress extends AbstractMethod<'solanaGetAddress',
     init() {
         this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_Solana'];
         this.firmwareRange = getFirmwareRange(
             this.name,
             getMiscNetwork('Solana'),
diff --git a/packages/connect/src/api/solana/api/solanaGetPublicKey.ts b/packages/connect/src/api/solana/api/solanaGetPublicKey.ts
index 411c38901b0..de1fcc753ec 100644
--- a/packages/connect/src/api/solana/api/solanaGetPublicKey.ts
+++ b/packages/connect/src/api/solana/api/solanaGetPublicKey.ts
@@ -1,10 +1,11 @@
+import { Assert } from '@trezor/schema-utils';
+
 import { PROTO } from '../../../constants';
 import { AbstractMethod, MethodReturnType } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath, fromHardened, getSerializedPath } from '../../../utils/pathUtils';
 import { UI, createUiMessage } from '../../../events';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle, GetPublicKey as GetPublicKeySchema } from '../../../types';
 
 export default class SolanaGetPublicKey extends AbstractMethod<
@@ -16,6 +17,7 @@ export default class SolanaGetPublicKey extends AbstractMethod<
     init() {
         this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_Solana'];
         this.firmwareRange = getFirmwareRange(
             this.name,
             getMiscNetwork('Solana'),
diff --git a/packages/connect/src/api/solana/api/solanaSignTransaction.ts b/packages/connect/src/api/solana/api/solanaSignTransaction.ts
index e17f8dacd26..26a64d3fb5f 100644
--- a/packages/connect/src/api/solana/api/solanaSignTransaction.ts
+++ b/packages/connect/src/api/solana/api/solanaSignTransaction.ts
@@ -1,10 +1,11 @@
+import { AssertWeak } from '@trezor/schema-utils';
+
 import { PROTO } from '../../../constants';
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath } from '../../../utils/pathUtils';
 import { transformAdditionalInfo } from '../additionalInfo';
-import { AssertWeak } from '@trezor/schema-utils';
 import { SolanaSignTransaction as SolanaSignTransactionSchema } from '../../../types/api/solana';
 
 export default class SolanaSignTransaction extends AbstractMethod<
@@ -13,6 +14,7 @@ export default class SolanaSignTransaction extends AbstractMethod<
 > {
     init() {
         this.requiredPermissions = ['read', 'write'];
+        this.requiredDeviceCapabilities = ['Capability_Solana'];
         this.firmwareRange = getFirmwareRange(
             this.name,
             getMiscNetwork('Solana'),
diff --git a/packages/connect/src/api/stellar/api/stellarGetAddress.ts b/packages/connect/src/api/stellar/api/stellarGetAddress.ts
index 064485f2488..4cf73a86675 100644
--- a/packages/connect/src/api/stellar/api/stellarGetAddress.ts
+++ b/packages/connect/src/api/stellar/api/stellarGetAddress.ts
@@ -1,12 +1,13 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/StellarGetAddress.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath, fromHardened, getSerializedPath } from '../../../utils/pathUtils';
 import { PROTO, ERRORS } from '../../../constants';
 import { UI, createUiMessage } from '../../../events';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle } from '../../../types';
 import { GetAddress as GetAddressSchema } from '../../../types/api/getAddress';
 
@@ -21,6 +22,7 @@ export default class StellarGetAddress extends AbstractMethod<'stellarGetAddress
     init() {
         this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_Stellar'];
         this.firmwareRange = getFirmwareRange(
             this.name,
             getMiscNetwork('Stellar'),
diff --git a/packages/connect/src/api/stellar/api/stellarSignTransaction.ts b/packages/connect/src/api/stellar/api/stellarSignTransaction.ts
index 85264da1b82..1bd087a8347 100644
--- a/packages/connect/src/api/stellar/api/stellarSignTransaction.ts
+++ b/packages/connect/src/api/stellar/api/stellarSignTransaction.ts
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/StellarSignTransaction.js
 
+import { AssertWeak } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
@@ -10,7 +12,6 @@ import {
     StellarTransaction,
     StellarSignTransaction as StellarSignTransactionSchema,
 } from '../../../types/api/stellar';
-import { AssertWeak } from '@trezor/schema-utils';
 
 type Params = {
     path: number[];
@@ -29,6 +30,7 @@ export default class StellarSignTransaction extends AbstractMethod<
 > {
     init() {
         this.requiredPermissions = ['read', 'write'];
+        this.requiredDeviceCapabilities = ['Capability_Stellar'];
         this.firmwareRange = getFirmwareRange(
             this.name,
             getMiscNetwork('Stellar'),
diff --git a/packages/connect/src/api/stellar/stellarSignTx.ts b/packages/connect/src/api/stellar/stellarSignTx.ts
index c7b8197437c..9cf84b881dc 100644
--- a/packages/connect/src/api/stellar/stellarSignTx.ts
+++ b/packages/connect/src/api/stellar/stellarSignTx.ts
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/helpers/stellarSignTx.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { PROTO, ERRORS } from '../../constants';
 import type { TypedCall } from '../../device/DeviceCommands';
 import {
@@ -7,7 +9,6 @@ import {
     StellarOperation,
     StellarOperationMessage,
 } from '../../types/api/stellar';
-import { Assert } from '@trezor/schema-utils';
 
 const processTxRequest = async (
     typedCall: TypedCall,
diff --git a/packages/connect/src/api/tezos/api/tezosGetAddress.ts b/packages/connect/src/api/tezos/api/tezosGetAddress.ts
index dc669fbb3b1..07862cfa696 100644
--- a/packages/connect/src/api/tezos/api/tezosGetAddress.ts
+++ b/packages/connect/src/api/tezos/api/tezosGetAddress.ts
@@ -1,12 +1,13 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/TezosGetAddress.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath, fromHardened, getSerializedPath } from '../../../utils/pathUtils';
 import { PROTO, ERRORS } from '../../../constants';
 import { UI, createUiMessage } from '../../../events';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle } from '../../../types';
 import { GetAddress as GetAddressSchema } from '../../../types/api/getAddress';
 
@@ -21,6 +22,7 @@ export default class TezosGetAddress extends AbstractMethod<'tezosGetAddress', P
     init() {
         this.noBackupConfirmationMode = 'always';
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_Tezos'];
         this.firmwareRange = getFirmwareRange(
             this.name,
             getMiscNetwork('Tezos'),
diff --git a/packages/connect/src/api/tezos/api/tezosGetPublicKey.ts b/packages/connect/src/api/tezos/api/tezosGetPublicKey.ts
index c9a7400010c..beb8a5a1700 100644
--- a/packages/connect/src/api/tezos/api/tezosGetPublicKey.ts
+++ b/packages/connect/src/api/tezos/api/tezosGetPublicKey.ts
@@ -1,12 +1,13 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/TezosGetPublicKey.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod, MethodReturnType } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath, fromHardened, getSerializedPath } from '../../../utils/pathUtils';
 import { UI, createUiMessage } from '../../../events';
 import type { PROTO } from '../../../constants';
-import { Assert } from '@trezor/schema-utils';
 import { Bundle, GetPublicKey as GetPublicKeySchema } from '../../../types';
 
 export default class TezosGetPublicKey extends AbstractMethod<
@@ -17,6 +18,7 @@ export default class TezosGetPublicKey extends AbstractMethod<
 
     init() {
         this.requiredPermissions = ['read'];
+        this.requiredDeviceCapabilities = ['Capability_Tezos'];
         this.firmwareRange = getFirmwareRange(
             this.name,
             getMiscNetwork('Tezos'),
diff --git a/packages/connect/src/api/tezos/api/tezosSignTransaction.ts b/packages/connect/src/api/tezos/api/tezosSignTransaction.ts
index e307d2e8560..f2200be4f1a 100644
--- a/packages/connect/src/api/tezos/api/tezosSignTransaction.ts
+++ b/packages/connect/src/api/tezos/api/tezosSignTransaction.ts
@@ -1,12 +1,13 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/TezosSignTransaction.js
 
+import { AssertWeak } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../../../core/AbstractMethod';
 import { getFirmwareRange } from '../../common/paramsValidator';
 import { getMiscNetwork } from '../../../data/coinInfo';
 import { validatePath } from '../../../utils/pathUtils';
 import * as helper from '../tezosSignTx';
 import type { PROTO } from '../../../constants';
-import { AssertWeak } from '@trezor/schema-utils';
 import { TezosSignTransaction as TezosSignTransactionSchema } from '../../../types/api/tezos';
 
 export default class TezosSignTransaction extends AbstractMethod<
@@ -15,6 +16,7 @@ export default class TezosSignTransaction extends AbstractMethod<
 > {
     init() {
         this.requiredPermissions = ['read', 'write'];
+        this.requiredDeviceCapabilities = ['Capability_Tezos'];
         this.firmwareRange = getFirmwareRange(
             this.name,
             getMiscNetwork('Tezos'),
diff --git a/packages/connect/src/api/tezos/tezosSignTx.ts b/packages/connect/src/api/tezos/tezosSignTx.ts
index 268f2198c00..68951bb79b7 100644
--- a/packages/connect/src/api/tezos/tezosSignTx.ts
+++ b/packages/connect/src/api/tezos/tezosSignTx.ts
@@ -1,7 +1,9 @@
 import bs58check from 'bs58check';
+
+import { Assert } from '@trezor/schema-utils';
+
 import { PROTO, ERRORS } from '../../constants';
 import { TezosOperation } from '../../types/api/tezos';
-import { Assert } from '@trezor/schema-utils';
 
 const PREFIX = {
     B: new Uint8Array([1, 52]),
diff --git a/packages/connect/src/api/unlockPath.ts b/packages/connect/src/api/unlockPath.ts
index a445a67807b..89e852f3037 100644
--- a/packages/connect/src/api/unlockPath.ts
+++ b/packages/connect/src/api/unlockPath.ts
@@ -1,8 +1,9 @@
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { PROTO } from '../constants';
 import { validatePath } from '../utils/pathUtils';
 import { getFirmwareRange } from './common/paramsValidator';
-import { Assert } from '@trezor/schema-utils';
 import { UnlockPathParams } from '../types/api/unlockPath';
 
 export default class UnlockPath extends AbstractMethod<'unlockPath', PROTO.UnlockPath> {
diff --git a/packages/connect/src/api/verifyMessage.ts b/packages/connect/src/api/verifyMessage.ts
index 08a90a81a6f..9c6be6ff739 100644
--- a/packages/connect/src/api/verifyMessage.ts
+++ b/packages/connect/src/api/verifyMessage.ts
@@ -1,5 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/core/methods/VerifyMessage.js
 
+import { Assert } from '@trezor/schema-utils';
+
 import { AbstractMethod } from '../core/AbstractMethod';
 import { getFirmwareRange } from './common/paramsValidator';
 import { getBitcoinNetwork } from '../data/coinInfo';
@@ -7,7 +9,6 @@ import { getLabel } from '../utils/pathUtils';
 import { messageToHex } from '../utils/formatUtils';
 import { PROTO, ERRORS } from '../constants';
 import { VerifyMessage as VerifyMessageSchema } from '../types';
-import { Assert } from '@trezor/schema-utils';
 
 export default class VerifyMessage extends AbstractMethod<'verifyMessage', PROTO.VerifyMessage> {
     init() {
diff --git a/packages/connect/src/backend/BackendManager.ts b/packages/connect/src/backend/BackendManager.ts
index d2457e10358..fbe4767963f 100644
--- a/packages/connect/src/backend/BackendManager.ts
+++ b/packages/connect/src/backend/BackendManager.ts
@@ -2,7 +2,6 @@ import { DataManager } from '../data/DataManager';
 import { ERRORS } from '../constants';
 import { Blockchain, BlockchainOptions } from './Blockchain';
 import { createBlockchainMessage, BLOCKCHAIN } from '../events';
-
 import type { CoinInfo, BlockchainLink } from '../types';
 
 type CoinShortcut = CoinInfo['shortcut'];
diff --git a/packages/connect/src/backend/Blockchain.ts b/packages/connect/src/backend/Blockchain.ts
index dc373202d33..a20ed76536c 100644
--- a/packages/connect/src/backend/Blockchain.ts
+++ b/packages/connect/src/backend/Blockchain.ts
@@ -4,6 +4,7 @@ import BlockchainLink, {
     BlockchainLinkParams,
     BlockchainLinkResponse,
 } from '@trezor/blockchain-link';
+
 import { createBlockchainMessage, BLOCKCHAIN, CoreEventMessage } from '../events';
 import { ERRORS } from '../constants';
 import {
@@ -13,7 +14,6 @@ import {
     ElectrumWorker,
     SolanaWorker,
 } from '../workers/workers';
-
 import type { CoinInfo, Proxy } from '../types';
 
 const getWorker = (type: string) => {
@@ -40,13 +40,8 @@ const getNormalizedTrezorShortcut = (shortcut: string) => {
         return 'XRP';
     }
 
-    return shortcut;
-};
-
-const getNormalizedBackendShortcut = (shortcut: string) => {
-    // Can be safely removed when both Polygon PoS Blockbooks return POL as shortcut
-    if (shortcut.toLowerCase() === 'matic') {
-        return 'pol';
+    if (shortcut === 'OP') {
+        return 'ETH';
     }
 
     return shortcut;
@@ -138,7 +133,7 @@ export class Blockchain {
         this.serverInfo = info;
 
         const trezorShortcut = getNormalizedTrezorShortcut(this.coinInfo.shortcut);
-        const backendShortcut = getNormalizedBackendShortcut(this.serverInfo.shortcut);
+        const backendShortcut = this.serverInfo.shortcut;
 
         if (trezorShortcut.toLowerCase() !== backendShortcut.toLowerCase()) {
             throw ERRORS.TypedError('Backend_Invalid');
@@ -222,6 +217,10 @@ export class Blockchain {
         return this.link.getAccountUtxo(descriptor);
     }
 
+    rpcCall(params: BlockchainLinkParams<'rpcCall'>) {
+        return this.link.rpcCall(params);
+    }
+
     async estimateFee(request: Parameters<typeof this.link.estimateFee>[0]) {
         const { blocks } = request;
         // cache should be used if there is no specific data (ethereum case) and requested blocks are already cached/downloaded
diff --git a/packages/connect/src/backend/BlockchainLink.ts b/packages/connect/src/backend/BlockchainLink.ts
index 7efc4df87ab..3b57ed5e2c8 100644
--- a/packages/connect/src/backend/BlockchainLink.ts
+++ b/packages/connect/src/backend/BlockchainLink.ts
@@ -1,5 +1,4 @@
 import { BackendManager } from './BackendManager';
-
 import type { BlockchainOptions as Options } from './Blockchain';
 import type { CoinInfo } from '../types';
 
diff --git a/packages/connect/src/backend/__tests__/Blockchain.test.ts b/packages/connect/src/backend/__tests__/Blockchain.test.ts
index 363307a7a78..3d8e4086bd0 100644
--- a/packages/connect/src/backend/__tests__/Blockchain.test.ts
+++ b/packages/connect/src/backend/__tests__/Blockchain.test.ts
@@ -1,6 +1,7 @@
 import coinsJSON from '@trezor/connect-common/files/coins.json';
 import coinsJSONEth from '@trezor/connect-common/files/coins-eth.json';
 import BlockchainLink from '@trezor/blockchain-link';
+
 import { parseCoinsJson, getBitcoinNetwork, getEthereumNetwork } from '../../data/coinInfo';
 import { initBlockchain } from '../BlockchainLink';
 
diff --git a/packages/connect/src/constants/errors.ts b/packages/connect/src/constants/errors.ts
index eccb6436d4d..95ecf1fc038 100644
--- a/packages/connect/src/constants/errors.ts
+++ b/packages/connect/src/constants/errors.ts
@@ -42,13 +42,18 @@ export const ERROR_CODES = {
     Device_InvalidState: 'Passphrase is incorrect', // authorization error (device state comparison)
     Device_CallInProgress: 'Device call in progress', // thrown when trying to make another call while current is still running
     Device_MultipleNotSupported: 'Multiple devices are not supported', // thrown by methods which require single device
+    Device_MissingCapability: 'Device is missing capability', // thrown by methods which require specific capability
+    Device_MissingCapabilityBtcOnly: 'Device is missing capability (BTC only)', // thrown by methods which require specific capability when using BTC only firmware
 
     Failure_ActionCancelled: 'Action cancelled by user',
     Failure_FirmwareError: 'Firmware installation failed',
     Failure_UnknownCode: 'Unknown error',
     Failure_PinCancelled: 'PIN cancelled',
+    Failure_PinInvalid: 'PIN invalid',
     Failure_PinMismatch: 'PIN mismatch',
     Failure_WipeCodeMismatch: 'Wipe code mismatch',
+
+    Deeplink_VersionMismatch: 'Not compatible with current version of the app',
 } as const;
 
 export type ErrorCode = keyof typeof ERROR_CODES;
diff --git a/packages/connect/src/constants/firmware.ts b/packages/connect/src/constants/firmware.ts
new file mode 100644
index 00000000000..d6473fe1e80
--- /dev/null
+++ b/packages/connect/src/constants/firmware.ts
@@ -0,0 +1,3 @@
+// given that firmware hash is a security feature, we prefer to hardcode the version rather than to query the device capabilities
+// (a counterfeit device could simply declare it's incapable of hash check)
+export const FW_HASH_SUPPORTED_VERSIONS = ['1.11.1', '2.5.1'];
diff --git a/packages/connect/src/constants/index.ts b/packages/connect/src/constants/index.ts
index b8003479228..ffaeb61b37f 100644
--- a/packages/connect/src/constants/index.ts
+++ b/packages/connect/src/constants/index.ts
@@ -2,4 +2,6 @@ export * as ERRORS from './errors';
 export * as NETWORK from './network';
 export * as CARDANO from './cardano';
 export * as NEM from './nem';
+export * as FIRMWARE from './firmware';
+export { DEFAULT_SORTING_STRATEGY } from './utxo';
 export { MessagesSchema as PROTO } from '@trezor/protobuf';
diff --git a/packages/connect/src/constants/utxo.ts b/packages/connect/src/constants/utxo.ts
new file mode 100644
index 00000000000..f0f86f46db2
--- /dev/null
+++ b/packages/connect/src/constants/utxo.ts
@@ -0,0 +1,3 @@
+import type { TransactionInputOutputSortingStrategy } from '@trezor/utxo-lib';
+
+export const DEFAULT_SORTING_STRATEGY: TransactionInputOutputSortingStrategy = 'random';
diff --git a/packages/connect/src/core/AbstractMethod.ts b/packages/connect/src/core/AbstractMethod.ts
index 2976cfe8271..95713119a46 100644
--- a/packages/connect/src/core/AbstractMethod.ts
+++ b/packages/connect/src/core/AbstractMethod.ts
@@ -1,7 +1,8 @@
 import { storage } from '@trezor/connect-common';
 import { versionUtils } from '@trezor/utils';
-import { DataManager } from '../data/DataManager';
-import { NETWORK } from '../constants';
+import { Capability } from '@trezor/protobuf/src/messages';
+
+import { NETWORK, ERRORS } from '../constants';
 import {
     UI,
     DEVICE,
@@ -15,8 +16,14 @@ import {
 } from '../events';
 import { getHost } from '../utils/urlUtils';
 import type { Device } from '../device/Device';
-import type { FirmwareRange, DeviceState, StaticSessionId } from '../types';
-import { ERRORS } from '../constants';
+import type {
+    FirmwareRange,
+    DeviceState,
+    StaticSessionId,
+    DeviceUniquePath,
+    ConnectSettings,
+} from '../types';
+import { config } from '../data/config';
 
 export type Payload<M> = Extract<CallMethodPayload, { method: M }> & { override?: boolean };
 export type MethodReturnType<M extends CallMethodPayload['method']> = CallMethodResponse<M>;
@@ -30,6 +37,7 @@ export const DEFAULT_FIRMWARE_RANGE: FirmwareRange = {
     T2B1: { min: '2.6.1', max: '0' },
     T3B1: { min: '2.8.1', max: '0' },
     T3T1: { min: '2.7.1', max: '0' },
+    T3W1: { min: '2.7.1', max: '0' }, // TODO T3W1
 };
 
 function validateStaticSessionId(input: unknown): StaticSessionId {
@@ -53,6 +61,30 @@ function validateStaticSessionId(input: unknown): StaticSessionId {
         'DeviceState: invalid staticSessionId: ' + input,
     );
 }
+// validate expected state from method parameter.
+// it could be undefined
+function validateDeviceState(input: unknown): DeviceState | undefined {
+    if (typeof input === 'string') {
+        return { staticSessionId: validateStaticSessionId(input) };
+    }
+    if (input && typeof input === 'object') {
+        const state: DeviceState = {};
+        if ('staticSessionId' in input) {
+            state.staticSessionId = validateStaticSessionId(input.staticSessionId);
+        }
+        if ('sessionId' in input && typeof input.sessionId === 'string') {
+            state.sessionId = input.sessionId;
+        }
+        if ('deriveCardano' in input && typeof input.deriveCardano === 'boolean') {
+            state.deriveCardano = input.deriveCardano;
+        }
+
+        return state;
+    }
+
+    return undefined;
+}
+
 export abstract class AbstractMethod<Name extends CallMethodPayload['method'], Params = undefined> {
     responseID: number;
 
@@ -61,7 +93,7 @@ export abstract class AbstractMethod<Name extends CallMethodPayload['method'], P
     // @ts-expect-error: strictPropertyInitialization
     params: Params;
 
-    devicePath?: string;
+    devicePath?: DeviceUniquePath;
 
     deviceState?: DeviceState;
 
@@ -109,6 +141,8 @@ export abstract class AbstractMethod<Name extends CallMethodPayload['method'], P
 
     requireDeviceMode: DeviceMode[];
 
+    requiredDeviceCapabilities: Capability[] = [];
+
     network: NETWORK.NetworkType;
 
     useCardanoDerivation: boolean;
@@ -131,20 +165,7 @@ export abstract class AbstractMethod<Name extends CallMethodPayload['method'], P
         this.payload = payload;
         this.responseID = message.id || 0;
         this.devicePath = payload.device?.path;
-
-        // expected state from method parameter.
-        // it could be undefined
-        this.deviceState =
-            // eslint-disable-next-line no-nested-ternary
-            typeof payload.device?.state === 'string'
-                ? { staticSessionId: validateStaticSessionId(payload.device.state) }
-                : payload.device?.state?.staticSessionId
-                  ? {
-                        staticSessionId: validateStaticSessionId(
-                            payload.device.state.staticSessionId,
-                        ),
-                    }
-                  : undefined;
+        this.deviceState = validateDeviceState(payload.device?.state);
         this.hasExpectedDeviceState = payload.device
             ? Object.prototype.hasOwnProperty.call(payload.device, 'state')
             : false;
@@ -187,14 +208,13 @@ export abstract class AbstractMethod<Name extends CallMethodPayload['method'], P
 
     setDevice(device: Device) {
         this.device = device;
-        this.devicePath = device.getDevicePath();
+        this.devicePath = device.getUniquePath();
         // NOTE: every method should always send "device" parameter
         const originalFn = this.createUiPromise;
         this.createUiPromise = (t, d) => originalFn(t, d || device);
     }
 
-    private getOriginPermissions() {
-        const origin = DataManager.getSettings('origin');
+    private getOriginPermissions({ origin }: Pick<ConnectSettings, 'origin'>) {
         if (!origin) {
             return [];
         }
@@ -202,8 +222,8 @@ export abstract class AbstractMethod<Name extends CallMethodPayload['method'], P
         return storage.loadForOrigin(origin)?.permissions || [];
     }
 
-    checkPermissions() {
-        const originPermissions = this.getOriginPermissions();
+    checkPermissions({ origin }: Pick<ConnectSettings, 'origin'>) {
+        const originPermissions = this.getOriginPermissions({ origin });
         let notPermitted = [...this.requiredPermissions];
         if (originPermissions.length > 0) {
             // check if permission was granted
@@ -218,8 +238,8 @@ export abstract class AbstractMethod<Name extends CallMethodPayload['method'], P
         this.requiredPermissions = notPermitted;
     }
 
-    savePermissions(temporary = false) {
-        const originPermissions = this.getOriginPermissions();
+    savePermissions(temporary = false, { origin }: Pick<ConnectSettings, 'origin'>) {
+        const originPermissions = this.getOriginPermissions({ origin });
 
         let permissionsToSave = this.requiredPermissions.map(p => ({
             type: p,
@@ -248,13 +268,12 @@ export abstract class AbstractMethod<Name extends CallMethodPayload['method'], P
             });
         }
 
-        const origin = DataManager.getSettings('origin')!;
         storage.saveForOrigin(
             state => ({
                 ...state,
                 permissions: [...(state.permissions || []), ...permissionsToSave],
             }),
-            origin,
+            origin!,
             temporary,
         );
 
@@ -299,11 +318,10 @@ export abstract class AbstractMethod<Name extends CallMethodPayload['method'], P
         }
     }
 
-    isManagementRestricted() {
-        const { popup, origin } = DataManager.getSettings();
+    isManagementRestricted({ popup, origin }: Pick<ConnectSettings, 'popup' | 'origin'>) {
         if (popup && this.requiredPermissions.includes('management')) {
             const host = getHost(origin);
-            const allowed = DataManager.getConfig().management.find(
+            const allowed = config.management.find(
                 item => item.origin === host || item.origin === origin,
             );
 
@@ -313,6 +331,33 @@ export abstract class AbstractMethod<Name extends CallMethodPayload['method'], P
 
     abstract init(): void;
 
+    getMethodInfo() {
+        return {
+            useDevice: this.useDevice,
+            useDeviceState: this.useDeviceState,
+            name: this.name,
+            // this could be used for more. it could tell clients what are min firmware versions (firmwareRange) and much more
+        };
+    }
+
+    checkDeviceCapability() {
+        const deviceHasAllRequiredCapabilities = (this.requiredDeviceCapabilities || []).every(
+            capability => this.device.features.capabilities.includes(capability),
+        );
+        if (!deviceHasAllRequiredCapabilities) {
+            if (this.device.firmwareType === 'bitcoin-only') {
+                throw ERRORS.TypedError(
+                    'Device_MissingCapabilityBtcOnly',
+                    `Trezor has Bitcoin-only firmware installed, which does not support this operation. Please install Universal firmware through Trezor Suite.`,
+                );
+            }
+            throw ERRORS.TypedError(
+                'Device_MissingCapability',
+                'Device does not have capability to call this method. Make sure you have the latest firmware installed.',
+            );
+        }
+    }
+
     abstract run(): Promise<MethodReturnType<Name>>;
 
     dispose() {}
diff --git a/packages/connect/src/core/__tests__/Core.test.ts b/packages/connect/src/core/__tests__/Core.test.ts
index 68b80aaa1b4..bcd9e4dbcd8 100644
--- a/packages/connect/src/core/__tests__/Core.test.ts
+++ b/packages/connect/src/core/__tests__/Core.test.ts
@@ -7,7 +7,11 @@ import { initCoreState } from '../index';
 const { createTestTransport } = global.JestMocks;
 
 const getSettings = (partial: Partial<ConnectSettings> = {}) =>
-    parseConnectSettings({ transports: [createTestTransport()], ...partial });
+    parseConnectSettings({
+        transports: [createTestTransport()],
+        transportReconnect: false,
+        ...partial,
+    });
 
 describe('Core', () => {
     beforeAll(async () => {});
diff --git a/packages/connect/src/core/index.ts b/packages/connect/src/core/index.ts
index 561767f337c..7230c1d4e26 100644
--- a/packages/connect/src/core/index.ts
+++ b/packages/connect/src/core/index.ts
@@ -2,8 +2,7 @@
 import EventEmitter from 'events';
 
 import { TRANSPORT, TRANSPORT_ERROR } from '@trezor/transport';
-import { createLazy, createDeferred, throwError } from '@trezor/utils';
-import { getSynchronize } from '@trezor/utils';
+import { createLazy, createDeferred, throwError, getSynchronize } from '@trezor/utils';
 import { storage } from '@trezor/connect-common';
 
 import { DataManager } from '../data/DataManager';
@@ -29,14 +28,18 @@ import {
 } from '../events';
 import { getMethod } from './method';
 import { AbstractMethod } from './AbstractMethod';
-import { resolveAfter } from '../utils/promiseUtils';
 import { createUiPromiseManager } from '../utils/uiPromiseManager';
 import { createPopupPromiseManager } from '../utils/popupPromiseManager';
 import { initLog, enableLog, setLogWriter, LogWriter } from '../utils/debug';
 import { dispose as disposeBackend } from '../backend/BlockchainLink';
 import { InteractionTimeout } from '../utils/interactionTimeout';
 import type { DeviceEvents, Device } from '../device/Device';
-import type { ConnectSettings, Device as DeviceTyped, StaticSessionId } from '../types';
+import type {
+    ConnectSettings,
+    Device as DeviceTyped,
+    DeviceUniquePath,
+    StaticSessionId,
+} from '../types';
 import { onCallFirmwareUpdate } from './onCallFirmwareUpdate';
 import { WebextensionStateStorage } from '../device/StateStorage';
 
@@ -65,7 +68,7 @@ const startInteractionTimeout = (context: CoreContext) =>
  * @returns {Promise<Device>}
  * @memberof Core
  */
-const initDevice = async (context: CoreContext, devicePath?: string) => {
+const initDevice = async (context: CoreContext, devicePath?: DeviceUniquePath) => {
     const { uiPromises, deviceList, sendCoreMessage } = context;
 
     assertDeviceListConnected(deviceList);
@@ -77,7 +80,8 @@ const initDevice = async (context: CoreContext, devicePath?: string) => {
     const origin = DataManager.getSettings('origin')!;
     const useCoreInPopup = DataManager.getSettings('useCoreInPopup');
     const { preferredDevice } = storage.load().origin[origin] || {};
-    const preferredDeviceInList = preferredDevice && deviceList.getDevice(preferredDevice.path);
+    const preferredDeviceInList =
+        preferredDevice && deviceList.getDeviceByPath(preferredDevice.path);
 
     // we detected that there is a preferred device (user stored previously) but it's not in the list anymore (disconnected now)
     // we treat this situation as implicit forget
@@ -90,18 +94,18 @@ const initDevice = async (context: CoreContext, devicePath?: string) => {
     }
 
     if (devicePath) {
-        device = deviceList.getDevice(devicePath);
+        device = deviceList.getDeviceByPath(devicePath);
         showDeviceSelection =
-            !device || !!device?.unreadableError || (device.isUnacquired() && !!isUsingPopup);
+            !device || device.isUnreadable() || (device.isUnacquired() && !!isUsingPopup);
     } else {
-        const devices = deviceList.asArray();
-        if (devices.length === 1 && (!isWebUsb || !isUsingPopup)) {
+        const onlyDevice = deviceList.getOnlyDevice();
+        if (onlyDevice && (!isWebUsb || !isUsingPopup)) {
             // there is only one device available. use it
-            device = deviceList.getDevice(devices[0].path);
+            device = onlyDevice;
             // Show device selection if device is unreadable or unacquired
             // Also in case of core in popup, so user can press "Remember device"
             showDeviceSelection =
-                !!device?.unreadableError || device.isUnacquired() || !!useCoreInPopup;
+                device.isUnreadable() || device.isUnacquired() || !!useCoreInPopup;
         } else {
             showDeviceSelection = true;
         }
@@ -124,22 +128,22 @@ const initDevice = async (context: CoreContext, devicePath?: string) => {
 
         // check again for available devices
         // there is a possible race condition before popup open
-        const devices = deviceList.asArray();
+        const onlyDevice = deviceList.getOnlyDevice();
         if (
-            devices.length === 1 &&
-            devices[0].type !== 'unreadable' &&
-            devices[0].features &&
+            onlyDevice &&
+            !onlyDevice.isUnreadable() &&
+            !onlyDevice.isUnacquired() &&
             !isWebUsb &&
             !useCoreInPopup
         ) {
             // there is one device available. use it
-            device = deviceList.getDevice(devices[0].path);
+            device = onlyDevice;
         } else {
             // request select device view
             sendCoreMessage(
                 createUiMessage(UI.SELECT_DEVICE, {
                     webusb: isWebUsb,
-                    devices: deviceList.asArray(),
+                    devices: deviceList.getAllDevices().map(d => d.toMessageObject()),
                 }),
             );
 
@@ -157,7 +161,7 @@ const initDevice = async (context: CoreContext, devicePath?: string) => {
                         return store;
                     });
                 }
-                device = deviceList.getDevice(payload.device.path);
+                device = deviceList.getDeviceByPath(payload.device.path);
             }
         }
     } else if (uiPromises.exists(UI.RECEIVE_DEVICE)) {
@@ -246,7 +250,7 @@ const inner = async (context: CoreContext, method: AbstractMethod<any>, device:
         method.requireDeviceMode,
     );
     if (unexpectedMode) {
-        device.keepTransportSession = false;
+        device.releaseTransportSession();
         if (isUsingPopup) {
             // wait for popup handshake
             await waitForPopup(context);
@@ -264,8 +268,10 @@ const inner = async (context: CoreContext, method: AbstractMethod<any>, device:
         return Promise.reject(ERRORS.TypedError('Device_ModeException', unexpectedMode));
     }
 
+    method.checkDeviceCapability();
+
     // check and request permissions [read, write...]
-    method.checkPermissions();
+    method.checkPermissions({ origin: DataManager.getSettings('origin') });
     if (!trustedHost && method.requiredPermissions.length > 0) {
         // wait for popup window
         await waitForPopup(context);
@@ -281,7 +287,7 @@ const inner = async (context: CoreContext, method: AbstractMethod<any>, device:
         const { granted, remember } = await uiPromise.promise.then(({ payload }) => payload);
 
         if (granted) {
-            method.savePermissions(!remember);
+            method.savePermissions(!remember, { origin: DataManager.getSettings('origin') });
         } else {
             // interrupt process and go to "final" block
             return Promise.reject(ERRORS.TypedError('Method_PermissionsNotGranted'));
@@ -468,16 +474,16 @@ const onCall = async (context: CoreContext, message: IFrameCallMessage) => {
     try {
         method = await methodSynchronize(async () => {
             _log.debug('loading method...');
-            const method = await getMethod(message);
-            _log.debug('method selected', method.name);
+            const method2 = await getMethod(message);
+            _log.debug('method selected', method2.name);
             // bind callbacks
-            method.postMessage = sendCoreMessage;
-            method.createUiPromise = uiPromises.create;
+            method2.postMessage = sendCoreMessage;
+            method2.createUiPromise = uiPromises.create;
             // start validation process
-            method.init();
-            await method.initAsync?.();
+            method2.init();
+            await method2.initAsync?.();
 
-            return method;
+            return method2;
         });
         resolveWaitForFirstMethod();
         callMethods.push(method);
@@ -488,6 +494,13 @@ const onCall = async (context: CoreContext, message: IFrameCallMessage) => {
         return Promise.resolve();
     }
 
+    if (method.payload.__info) {
+        const response = method.getMethodInfo();
+        sendCoreMessage(createResponseMessage(method.responseID, true, response));
+
+        return Promise.resolve();
+    }
+
     // this method is not using the device, there is no need to acquire
     if (!method.useDevice) {
         try {
@@ -498,6 +511,7 @@ const onCall = async (context: CoreContext, message: IFrameCallMessage) => {
                 // cancel popup request
                 sendCoreMessage(createPopupMessage(POPUP.CANCEL_POPUP_REQUEST));
             }
+
             const response = await method.run();
             sendCoreMessage(createResponseMessage(method.responseID, true, response));
         } catch (error) {
@@ -507,7 +521,7 @@ const onCall = async (context: CoreContext, message: IFrameCallMessage) => {
         return Promise.resolve();
     }
 
-    if (method.isManagementRestricted()) {
+    if (method.isManagementRestricted({ origin: DataManager.getSettings('origin') })) {
         sendCoreMessage(createPopupMessage(POPUP.CANCEL_POPUP_REQUEST));
         sendCoreMessage(
             createResponseMessage(responseID, false, {
@@ -681,25 +695,20 @@ const onCallDevice = async (
         }
         // Work done
 
+        if (
+            method.keepSession &&
+            method.deviceState &&
+            method.deviceState.sessionId !== device.getState()?.sessionId
+        ) {
+            // if session was changed from the one that was sent, send a device changed event
+            sendCoreMessage(createDeviceMessage(DEVICE.CHANGED, device.toMessageObject()));
+        }
+
         // TODO: This requires a massive refactoring https://github.com/trezor/trezor-suite/issues/5323
         // @ts-expect-error TODO: messageResponse should be assigned from the response of "inner" function
         const response = messageResponse;
 
         if (response) {
-            if (method.name === 'rebootToBootloader' && response.success) {
-                // Wait for device to switch to bootloader
-                // This delay is crucial see https://github.com/trezor/trezor-firmware/issues/1983
-                await resolveAfter(1000).promise;
-                // call Device.run with empty function to fetch new Features
-                // (acquire > Initialize > nothing > release)
-                try {
-                    await device.run(() => Promise.resolve(), { skipFinalReload: true });
-                } catch (err) {
-                    // ignore. on model T, this block of code is probably not needed at all. but I am keeping it here for
-                    // backwards compatibility
-                }
-            }
-
             await device.cleanup();
 
             if (useCoreInPopup) {
@@ -896,9 +905,9 @@ const onPopupClosed = (context: CoreContext, customErrorMessage?: string) => {
         ? ERRORS.TypedError('Method_Cancel', customErrorMessage)
         : ERRORS.TypedError('Method_Interrupted');
     // Device was already acquired. Try to interrupt running action which will throw error from onCall try/catch block
-    if (deviceList.isConnected() && deviceList.asArray().length > 0) {
-        deviceList.allDevices().forEach(d => {
-            d.keepTransportSession = false; // clear transportSession on release
+    if (deviceList.isConnected() && deviceList.getDeviceCount() > 0) {
+        deviceList.getAllDevices().forEach(d => {
+            d.releaseTransportSession(); // clear transportSession on release
             if (d.isUsedHere()) {
                 setOverridePromise(d.interruptionFromUser(error));
             } else {
@@ -933,22 +942,22 @@ const handleDeviceSelectionChanges = (context: CoreContext, interruptDevice?: De
     // update list of devices in popup
     const promiseExists = uiPromises.exists(UI.RECEIVE_DEVICE);
     if (promiseExists && deviceList.isConnected()) {
-        const list = deviceList.asArray();
+        const onlyDevice = deviceList.getOnlyDevice();
         const isWebUsb = deviceList.transportType() === 'WebUsbTransport';
 
-        if (list.length === 1 && !isWebUsb) {
+        if (onlyDevice && !isWebUsb) {
             // there is only one device. use it
             // resolve uiPromise to looks like it's a user choice (see: handleMessage function)
             uiPromises.resolve({
                 type: UI.RECEIVE_DEVICE,
-                payload: { device: list[0] },
+                payload: { device: onlyDevice.toMessageObject() },
             });
         } else {
             // update device selection list view
             sendCoreMessage(
                 createUiMessage(UI.SELECT_DEVICE, {
                     webusb: isWebUsb,
-                    devices: list,
+                    devices: deviceList.getAllDevices().map(d => d.toMessageObject()),
                 }),
             );
         }
@@ -1192,7 +1201,7 @@ export class Core extends EventEmitter {
 
         try {
             await DataManager.load(settings);
-            const { debug, priority, _sessionsBackgroundUrl } = DataManager.getSettings();
+            const { debug, priority, _sessionsBackgroundUrl, manifest } = DataManager.getSettings();
             const messages = DataManager.getProtobufMessages();
 
             enableLog(debug);
@@ -1207,6 +1216,7 @@ export class Core extends EventEmitter {
                 messages,
                 priority,
                 _sessionsBackgroundUrl,
+                manifest,
             });
             initDeviceList(this.getCoreContext());
 
diff --git a/packages/connect/src/core/onCallFirmwareUpdate.ts b/packages/connect/src/core/onCallFirmwareUpdate.ts
index 0abdc690c2b..cc9531ea04b 100644
--- a/packages/connect/src/core/onCallFirmwareUpdate.ts
+++ b/packages/connect/src/core/onCallFirmwareUpdate.ts
@@ -1,6 +1,7 @@
 import { randomBytes } from 'crypto';
 
 import { createTimeoutPromise } from '@trezor/utils';
+import { isNewer } from '@trezor/utils/src/versionUtils';
 
 import { DeviceList } from '../device/DeviceList';
 import { UI, DEVICE, createUiMessage, createDeviceMessage, CoreEventMessage } from '../events';
@@ -14,11 +15,10 @@ import {
     stripFwHeaders,
 } from '../api/firmware';
 import { getReleases } from '../data/firmwareInfo';
-import { CommonParams, IntermediaryVersion } from '../types';
-import { PROTO, ERRORS } from '../constants';
+import { CommonParams, DeviceUniquePath, IntermediaryVersion } from '../types';
+import { FIRMWARE, PROTO, ERRORS } from '../constants';
 import type { Log } from '../utils/debug';
 import type { Device } from '../device/Device';
-import { isNewer } from '@trezor/utils/src/versionUtils';
 
 type PostMessage = (message: CoreEventMessage) => void;
 
@@ -91,9 +91,10 @@ const waitForReconnectedDevice = async (
 
         await createTimeoutPromise(2000);
         try {
-            const path = deviceList.getFirstDevicePath();
-            reconnectedDevice = deviceList.getDevice(path);
-        } catch {}
+            reconnectedDevice = deviceList.getOnlyDevice();
+        } catch {
+            /* empty */
+        }
         i++;
         log.debug('onCallFirmwareUpdate', 'waiting for device to reconnect', i);
     } while (
@@ -287,7 +288,7 @@ export type Params = {
 type Context = {
     deviceList: DeviceList;
     postMessage: PostMessage;
-    initDevice: (path?: string) => Promise<Device>;
+    initDevice: (path?: DeviceUniquePath) => Promise<Device>;
     log: Log;
     abortSignal: AbortSignal;
 };
@@ -306,7 +307,7 @@ export const onCallFirmwareUpdate = async ({
         throw ERRORS.TypedError('Runtime', 'device.firmwareRelease is not set');
     }
 
-    if (deviceList.allDevices().length > 1) {
+    if (deviceList.getDeviceCount() > 1) {
         throw ERRORS.TypedError(
             'Device_MultipleNotSupported',
             'Firmware update allowed with only 1 device connected',
@@ -493,7 +494,8 @@ export const onCallFirmwareUpdate = async ({
         }
     }
 
-    const checkSupported = reconnectedDevice.atLeast(['1.11.1', '2.5.1']) && !params.binary;
+    const checkSupported =
+        reconnectedDevice.atLeast(FIRMWARE.FW_HASH_SUPPORTED_VERSIONS) && !params.binary;
 
     if (checkSupported) {
         try {
@@ -513,8 +515,7 @@ export const onCallFirmwareUpdate = async ({
                 return { check: 'mismatch' as const };
             }
         } catch (err) {
-            // TrezorConnect error. Only 'softly' inform user that we were not able to
-            // validate firmware hash
+            // device failed to respond to the hash check, consider the firmware counterfeit
             return { check: 'other-error' as const, checkError: err.message };
         }
     } else {
diff --git a/packages/connect/src/data/DataManager.ts b/packages/connect/src/data/DataManager.ts
index cc17c9ecf1e..2413c2037e7 100644
--- a/packages/connect/src/data/DataManager.ts
+++ b/packages/connect/src/data/DataManager.ts
@@ -4,12 +4,49 @@ import { httpRequest } from '../utils/assets';
 import { parseCoinsJson } from './coinInfo';
 import { parseFirmware } from './firmwareInfo';
 import { parseBridgeJSON } from './transportInfo';
-import { config } from './config';
-
 import { ConnectSettings, DeviceModelInternal } from '../types';
 
 type AssetCollection = { [key: string]: Record<string, any> };
 
+const assets = [
+    {
+        name: 'coins',
+        url: './data/coins.json',
+    },
+    {
+        name: 'coinsEth',
+        url: './data/coins-eth.json',
+    },
+    {
+        name: 'bridge',
+        url: './data/bridge/releases.json',
+    },
+    {
+        name: 'firmware-t1b1',
+        url: './data/firmware/t1b1/releases.json',
+    },
+    {
+        name: 'firmware-t2t1',
+        url: './data/firmware/t2t1/releases.json',
+    },
+    {
+        name: 'firmware-t2b1',
+        url: './data/firmware/t2b1/releases.json',
+    },
+    {
+        name: 'firmware-t3b1',
+        url: './data/firmware/t3b1/releases.json',
+    },
+    {
+        name: 'firmware-t3t1',
+        url: './data/firmware/t3t1/releases.json',
+    },
+    {
+        name: 'firmware-t3tw1',
+        url: './data/firmware/t3w1/releases.json',
+    },
+];
+
 export class DataManager {
     static assets: AssetCollection = {};
 
@@ -22,13 +59,13 @@ export class DataManager {
 
         if (!withAssets) return;
 
-        const assetPromises = config.assets.map(async asset => {
+        const assetPromises = assets.map(async asset => {
             const json = await httpRequest(`${asset.url}${ts}`, 'json');
             this.assets[asset.name] = json;
         });
         await Promise.all(assetPromises);
 
-        this.messages = await httpRequest(`${config.messages}${ts}`, 'json');
+        this.messages = await httpRequest('./data/messages/messages.json', 'json');
 
         // parse bridge JSON
         parseBridgeJSON(this.assets.bridge);
@@ -64,8 +101,4 @@ export class DataManager {
 
         return this.settings;
     }
-
-    static getConfig() {
-        return config;
-    }
 }
diff --git a/packages/connect/src/data/__tests__/DataManager.test.ts b/packages/connect/src/data/__tests__/DataManager.test.ts
index a06976cc4bb..7265de88317 100644
--- a/packages/connect/src/data/__tests__/DataManager.test.ts
+++ b/packages/connect/src/data/__tests__/DataManager.test.ts
@@ -17,6 +17,7 @@ const settings = {
     iframeSrc: '',
     popupSrc: '',
     webusbSrc: '',
+    deeplinkUrl: '',
     version: '9.0.0',
     priority: 1,
     trustedHost: true,
@@ -31,6 +32,7 @@ describe('data/DataManager', () => {
         try {
             await DataManager.load(settings, false);
         } catch (err) {
+            // eslint-disable-next-line jest/no-standalone-expect
             expect(err).toBe(undefined);
         }
     });
diff --git a/packages/connect/src/data/__tests__/coinInfo.test.ts b/packages/connect/src/data/__tests__/coinInfo.test.ts
index ec23950cd45..da5b40e139b 100644
--- a/packages/connect/src/data/__tests__/coinInfo.test.ts
+++ b/packages/connect/src/data/__tests__/coinInfo.test.ts
@@ -1,4 +1,5 @@
 import coinsJSON from '@trezor/connect-common/files/coins.json';
+
 import { parseCoinsJson, getCoinInfo, getUniqueNetworks, getAllNetworks } from '../coinInfo';
 
 describe('data/coinInfo', () => {
diff --git a/packages/connect/src/data/__tests__/firmwareInfo.test.ts b/packages/connect/src/data/__tests__/firmwareInfo.test.ts
index 469b77fb26b..d345601e503 100644
--- a/packages/connect/src/data/__tests__/firmwareInfo.test.ts
+++ b/packages/connect/src/data/__tests__/firmwareInfo.test.ts
@@ -1,5 +1,6 @@
-import { getReleases, parseFirmware, getFirmwareStatus } from '../firmwareInfo';
 import * as releases2 from '@trezor/connect-common/files/firmware/t2t1/releases.json';
+
+import { getReleases, parseFirmware, getFirmwareStatus } from '../firmwareInfo';
 import { DeviceModelInternal } from '../../types';
 
 describe('data/firmwareInfo', () => {
diff --git a/packages/connect/src/data/__tests__/transportInfo.test.ts b/packages/connect/src/data/__tests__/transportInfo.test.ts
index c70d4348667..83add78dfca 100644
--- a/packages/connect/src/data/__tests__/transportInfo.test.ts
+++ b/packages/connect/src/data/__tests__/transportInfo.test.ts
@@ -1,6 +1,7 @@
-import { parseBridgeJSON } from '../transportInfo';
 import * as releases from '@trezor/connect-common/files/bridge/releases.json';
 
+import { parseBridgeJSON } from '../transportInfo';
+
 describe('data/transportInfo', () => {
     test('parseBridgeJSON', () => {
         expect(parseBridgeJSON(releases)).toEqual({
diff --git a/packages/connect/src/data/analyticsInfo.ts b/packages/connect/src/data/analyticsInfo.ts
index 928a277bd0d..b6cdf34b55b 100644
--- a/packages/connect/src/data/analyticsInfo.ts
+++ b/packages/connect/src/data/analyticsInfo.ts
@@ -1,28 +1,22 @@
-// import { EventType } from '@trezor/connect-analytics';
+import { EventType } from '@trezor/connect-analytics';
+
 import { CoreEventMessage, UI_REQUEST } from '../events';
 import type { Device } from '../types';
 
-// TODO: imho this belongs somewhere to packages/connect-iframe package.
-// There I can freely import from anyplace within monorepo without needing
-// to release new packages. Having it here means that I would need to
-// release 2 new packages to npm which is unjustifiable burden
 export const enhanceMessageWithAnalytics = (
     message: CoreEventMessage,
     data: { device?: Device },
 ): CoreEventMessage => {
     switch (message.type) {
-        case UI_REQUEST.REQUEST_CONFIRMATION:
+        case UI_REQUEST.REQUEST_CONFIRMATION: {
             const { device } = data;
 
             return {
                 ...message,
-                // @ts-expect-error (EventType.DeviceSelected is inlined here)
                 payload: {
                     ...message.payload,
                     analytics: {
-                        // todo: type inlined temporarily
-                        // type: EventType.DeviceSelected,
-                        type: 'device/selected',
+                        type: EventType.DeviceSelected,
                         payload: {
                             mode: device?.mode || '',
                             pinProtection: device?.features?.pin_protection || '',
@@ -44,6 +38,7 @@ export const enhanceMessageWithAnalytics = (
                     },
                 },
             };
+        }
 
         default:
             return message;
diff --git a/packages/connect/src/data/coinInfo.ts b/packages/connect/src/data/coinInfo.ts
index e937b9c08fc..92216cdf56c 100644
--- a/packages/connect/src/data/coinInfo.ts
+++ b/packages/connect/src/data/coinInfo.ts
@@ -1,5 +1,6 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/data/CoinInfo.js
 import { cloneObject } from '@trezor/utils';
+
 import { getBitcoinFeeLevels, getEthereumFeeLevels, getMiscFeeLevels } from './defaultFeeLevels';
 import { ERRORS } from '../constants';
 import { toHardened, fromHardened } from '../utils/pathUtils';
diff --git a/packages/connect/src/data/config.ts b/packages/connect/src/data/config.ts
index c4adf818de4..93d17614379 100644
--- a/packages/connect/src/data/config.ts
+++ b/packages/connect/src/data/config.ts
@@ -66,41 +66,6 @@ export const config = {
     onionDomains: {
         'trezor.io': 'trezoriovpjcahpzkrewelclulmszwbqpzmzgub37gbcjlvluxtruqad.onion',
     },
-    assets: [
-        {
-            name: 'coins',
-            url: './data/coins.json',
-        },
-        {
-            name: 'coinsEth',
-            url: './data/coins-eth.json',
-        },
-        {
-            name: 'bridge',
-            url: './data/bridge/releases.json',
-        },
-        {
-            name: 'firmware-t1b1',
-            url: './data/firmware/t1b1/releases.json',
-        },
-        {
-            name: 'firmware-t2t1',
-            url: './data/firmware/t2t1/releases.json',
-        },
-        {
-            name: 'firmware-t2b1',
-            url: './data/firmware/t2b1/releases.json',
-        },
-        {
-            name: 'firmware-t3b1',
-            url: './data/firmware/t3b1/releases.json',
-        },
-        {
-            name: 'firmware-t3t1',
-            url: './data/firmware/t3t1/releases.json',
-        },
-    ],
-    messages: './data/messages/messages.json',
     supportedBrowsers: {
         chrome: {
             version: 59,
@@ -257,11 +222,11 @@ export const config = {
         },
         {
             methods: ['showDeviceTutorial', 'authenticateDevice'],
-            min: { T1B1: '0', T2T1: '0', T2B1: '2.6.1', T3B1: '2.8.1', T3T1: '2.8.0' },
-        },
-        {
-            methods: ['rebootToBootloader'],
-            min: { T1B1: '1.10.0', T2T1: '2.6.0' },
+            min: {
+                T1B1: '0',
+                T2T1: '0',
+                T3T1: '2.8.0',
+            },
         },
         {
             methods: ['getFirmwareHash'],
@@ -269,11 +234,19 @@ export const config = {
         },
         {
             methods: ['solanaGetPublicKey', 'solanaGetAddress', 'solanaSignTransaction'],
-            min: { T1B1: '0', T2T1: '2.6.4', T2B1: '2.6.4', T3B1: '2.8.1', T3T1: '2.7.2' },
+            min: {
+                T1B1: '0',
+                T2T1: '2.6.4',
+                T2B1: '2.6.4',
+            },
         },
         {
             capabilities: ['chunkify'],
-            min: { T1B1: '0', T2T1: '2.6.3', T2B1: '2.6.3', T3B1: '2.8.1', T3T1: '2.7.2' },
+            min: {
+                T1B1: '0',
+                T2T1: '2.6.3',
+                T2B1: '2.6.3',
+            },
             comment: [
                 "Since firmware 2.6.3 there is a new protobuf field 'chunkify' in almost all getAddress and signTx methods",
             ],
@@ -284,8 +257,6 @@ export const config = {
                 T1B1: '0',
                 T2T1: '2.7.0',
                 T2B1: '2.7.0',
-                T3B1: '2.8.1', // adding T3B1 to the list so that it gets inferred as type
-                T3T1: '2.7.2',
             },
         },
     ],
diff --git a/packages/connect/src/data/connectSettings.ts b/packages/connect/src/data/connectSettings.ts
index f278b0eb778..1886127aa15 100644
--- a/packages/connect/src/data/connectSettings.ts
+++ b/packages/connect/src/data/connectSettings.ts
@@ -1,7 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/data/ConnectSettings.js
 
 import type { Manifest, ConnectSettings } from '../types';
-import { VERSION, DEFAULT_DOMAIN } from './version';
+import { VERSION, DEFAULT_DOMAIN, DEEPLINK_VERSION } from './version';
 
 /*
  * Initial settings for connect.
@@ -28,6 +28,8 @@ const initialSettings: ConnectSettings = {
     timestamp: new Date().getTime(),
     interactionTimeout: 600, // 5 minutes
     sharedLogger: true,
+    deeplinkUrl: `${DEFAULT_DOMAIN}deeplink/${DEEPLINK_VERSION}/`,
+    transportReconnect: true,
 };
 
 const parseManifest = (manifest?: Manifest) => {
@@ -83,16 +85,12 @@ export const parseConnectSettings = (input: Partial<ConnectSettings> = {}) => {
     settings.iframeSrc = `${src}iframe.html`;
     settings.popupSrc = `${src}popup.html`;
     settings.webusbSrc = `${src}webusb.html`;
+    settings.deeplinkUrl = `${src}deeplink/${DEEPLINK_VERSION}/`;
 
     if (typeof input.transportReconnect === 'boolean') {
         settings.transportReconnect = input.transportReconnect;
     }
 
-    // deprecated, settings.transport should be used instead
-    if (typeof input.webusb === 'boolean') {
-        settings.webusb = input.webusb;
-    }
-
     if (Array.isArray(input.transports)) {
         settings.transports = input.transports;
     }
@@ -144,9 +142,17 @@ export const parseConnectSettings = (input: Partial<ConnectSettings> = {}) => {
         settings._extendWebextensionLifetime = input._extendWebextensionLifetime;
     }
 
-    if (typeof input._sessionsBackgroundUrl === 'string') {
+    if (typeof input._sessionsBackgroundUrl === 'string' || input._sessionsBackgroundUrl === null) {
         settings._sessionsBackgroundUrl = input._sessionsBackgroundUrl;
     }
 
+    if (typeof input.binFilesBaseUrl === 'string') {
+        settings.binFilesBaseUrl = input.binFilesBaseUrl;
+    }
+
+    if (typeof input.enableFirmwareHashCheck === 'boolean') {
+        settings.enableFirmwareHashCheck = Boolean(input.enableFirmwareHashCheck);
+    }
+
     return settings;
 };
diff --git a/packages/connect/src/data/deviceAuthenticityConfig.ts b/packages/connect/src/data/deviceAuthenticityConfig.ts
index ba0c1ce6580..606a0c13d91 100644
--- a/packages/connect/src/data/deviceAuthenticityConfig.ts
+++ b/packages/connect/src/data/deviceAuthenticityConfig.ts
@@ -52,6 +52,12 @@ export const deviceAuthenticityConfig: DeviceAuthenticityConfig = {
             '04c243743ba6326a443c34d503ea5d2d3036e1fbc8dbb072d4ae0f9b8016910db38e234641b87557fb44bcddee612722a67831bbac9758982a5843d9077be9434d',
             '04f1a32b84249a4b909974e32b33cc78aeef8144ef57744e792e6203fb8acce348f0d5d5535ed9a65ac741744a264de2073e49dbcd989819cddc90285b5e97a28a',
             '04894fa385d11809244da4f3d7de8ddd70c25abd5d4d3054b438d09016f2fd0a98729e15ea1483fbde83489fec6c64f8be014db8dc22227babcecdb5fd996ea671',
+            '0488c8f35649583d68c01c3b34223f11cc61389bcc71707960a6b1c30854ac1a0b5da916c47ee4cb1a78a9bac3d602aec67a5cd49b34732b6d1cc4fb2cb6b04361',
+            '04e4be5f15b528c594bfe732e4fcae4e65d63580051bb0235e6c1ca91c2663d54afa4b873dfeacbc4df98c57a923f7b308277f9d6bd064e81ed8e6890a1c582532',
+            '041c6ff76562b8042cf0e678d4bf977da09947d531e628450acbda0f0609c242c63db0be7fa1c601940af499b455e207c252706b37487c41fa9086621c3bd5c131',
+            '041b31c4fc213b27a34106e5ee8c7516941fdf8b15e3410987592ee488081c8dde5f42d397901c6d8b1d029d89bd2286b9183091a1edf12914be29aea40968d039',
+            '045de24c0d64b611bee13f34d74a3df7b24a658e6fea1bf1b9b3b530c23177759ba757e86494ff51c688bd63c1c85e93148bd81f39c5db80d3b5a0c05a6da4f380',
+            '049fb194cd0f7d79b3aae0b681d9f324c3dd086bb3f568067070bed195e1d7f0c722f86f7f9476da68b4c57e42536e5ab8c7fc74ee4726208814897849cac77b47',
         ],
         debug: {
             rootPubKeys: [
@@ -99,6 +105,9 @@ export const deviceAuthenticityConfig: DeviceAuthenticityConfig = {
             '04b427eb0e1484b7127f82820edddbbb538c11d3c330b5f68acef96c8cf4601b30390311f2d48090f3f5c5e4bf56ca0396984797cd92ab0d12164600c9f43d2ba3',
             '0438e670e9eb3cd19f8579b3202caf9aa766c8d5735ab97bd3682155437499e062587bded86c732789345538581c83e9e42af0a15a4ad81bc42e1f28a7859ebce0',
             '04ac2a7e88ffc08186b3cb461966a96cacdb2c07b383018d708a6f0ce0b74f59dca97a6f31fc8d243a781c7fe5006dc6b8ef05347972082b32fb29c636c595ffbc',
+            '047c32e92dc23894b60b6c182f589a12e4e57f82e48176936f56646c14dd8f0d300fd4737e17501d71deb84127c272c5b797ccf30a7a4531846b9c79866f2892c6',
+            '046482d01c4dbdac60327352d150b5e6d5772cd68732616a0abc5649c49111bc3ba0eb28aa424100efa27cdb98675395df4b9097097e92adecc39f5587306a9fac',
+            '04f96a9fdecc4247c67e083a69037d1794230441270e4bda6d4151eb2e385d576d046d36734dd262e45c8cf3bbe24bdd11c1dc0e58437107d55cea3942f14b7d61',
         ],
         debug: {
             rootPubKeys: [
@@ -109,4 +118,12 @@ export const deviceAuthenticityConfig: DeviceAuthenticityConfig = {
             ],
         },
     },
+    T3W1: {
+        rootPubKeys: ['you shall not pass'], // TODO T3W1
+        caPubKeys: ['you shall not pass'], // TODO T3W1
+        debug: {
+            rootPubKeys: ['you shall not pass'], // TODO T3W1
+            caPubKeys: ['you shall not pass'], // TODO T3W1
+        },
+    },
 };
diff --git a/packages/connect/src/data/deviceAuthenticityConfigTypes.ts b/packages/connect/src/data/deviceAuthenticityConfigTypes.ts
index 7f61ba02d1a..004b30612c8 100644
--- a/packages/connect/src/data/deviceAuthenticityConfigTypes.ts
+++ b/packages/connect/src/data/deviceAuthenticityConfigTypes.ts
@@ -1,4 +1,5 @@
 import { Static, Type } from '@trezor/schema-utils';
+
 import { PROTO } from '../constants';
 
 type CertPubKeys = Static<typeof CertPubKeys>;
diff --git a/packages/connect/src/data/firmwareInfo.ts b/packages/connect/src/data/firmwareInfo.ts
index de9b904a450..a852e878a00 100644
--- a/packages/connect/src/data/firmwareInfo.ts
+++ b/packages/connect/src/data/firmwareInfo.ts
@@ -1,6 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/data/FirmwareInfo.js
 
 import { versionUtils } from '@trezor/utils';
+
 import {
     filterSafeListByFirmware,
     filterSafeListByBootloader,
@@ -34,7 +35,7 @@ export const parseFirmware = (json: any, deviceModel: DeviceModelInternal) => {
 
 export const getReleases = (deviceModel: DeviceModelInternal) => releases[deviceModel] || [];
 
-const getChangelog = (releases: FirmwareRelease[], features: StrictFeatures) => {
+const getChangelog = (releases2: FirmwareRelease[], features: StrictFeatures) => {
     // releases are already filtered, so they can be considered "safe".
     // so lets build changelog! It should include only those firmwares, that are
     // newer than currently installed firmware.
@@ -51,7 +52,7 @@ const getChangelog = (releases: FirmwareRelease[], features: StrictFeatures) =>
         if (features.firmware_present && features.major_version === 2) {
             // little different situation is with model 2, where in bootloader (and with some fw installed)
             // we actually know the firmware version
-            return releases.filter(r =>
+            return releases2.filter(r =>
                 versionUtils.isNewer(r.version, [
                     features.fw_major,
                     features.fw_minor,
@@ -61,13 +62,13 @@ const getChangelog = (releases: FirmwareRelease[], features: StrictFeatures) =>
         }
 
         // for fresh devices, we can assume that all releases are actually "new"
-        return releases;
+        return releases2;
     }
 
     // otherwise we are in firmware mode and because each release in releases list has
     // version higher than the previous one, we can filter out the version that is already
     // installed and show only what's new!
-    return releases.filter(r =>
+    return releases2.filter(r =>
         versionUtils.isNewer(r.version, [
             features.major_version,
             features.minor_version,
@@ -98,7 +99,7 @@ const isEqual = (release: FirmwareRelease, latest: FirmwareRelease) =>
     versionUtils.isEqual(release.version, latest.version);
 
 const getT1BootloaderVersion = (
-    releases: FirmwareRelease[],
+    releases2: FirmwareRelease[],
     features: StrictFeatures,
 ): VersionArray => {
     const { bootloader_mode, major_version, minor_version, patch_version } = features;
@@ -108,7 +109,7 @@ const getT1BootloaderVersion = (
         return versionArray;
     }
 
-    const release = releases.find(({ version }) => versionUtils.isEqual(version, versionArray));
+    const release = releases2.find(({ version }) => versionUtils.isEqual(version, versionArray));
 
     /**
      * FW version 1.6.0 and below don't have bootloader_version listed, so default to 1.0.0,
@@ -123,7 +124,7 @@ const getT1BootloaderVersion = (
  * v3 - bootloader >= 1.12.0
  */
 const getIntermediaryVersion = (
-    releases: FirmwareRelease[],
+    releases2: FirmwareRelease[],
     features: StrictFeatures,
     offerLatest: boolean,
 ): IntermediaryVersion | undefined => {
@@ -132,7 +133,7 @@ const getIntermediaryVersion = (
         return;
     }
 
-    const bootloaderVersion = getT1BootloaderVersion(releases, features);
+    const bootloaderVersion = getT1BootloaderVersion(releases2, features);
 
     if (versionUtils.isNewerOrEqual(bootloaderVersion, [1, 12, 0])) {
         return 3;
@@ -150,6 +151,7 @@ export interface GetInfoProps {
     releases: FirmwareRelease[];
 }
 
+// eslint-disable-next-line @typescript-eslint/no-shadow
 const getSafeReleases = ({ features, releases }: GetInfoProps) => {
     const {
         bootloader_mode,
@@ -193,6 +195,7 @@ const getSafeReleases = ({ features, releases }: GetInfoProps) => {
  * @param features
  * @param releases
  */
+// eslint-disable-next-line @typescript-eslint/no-shadow
 export const getInfo = ({ features, releases }: GetInfoProps): ReleaseInfo | null => {
     if (!Array.isArray(releases) || releases.length < 1) {
         // no available releases - should never happen for official firmware, only custom
diff --git a/packages/connect/src/data/models.ts b/packages/connect/src/data/models.ts
index c4cfe96d8e3..9882b244b46 100644
--- a/packages/connect/src/data/models.ts
+++ b/packages/connect/src/data/models.ts
@@ -29,4 +29,13 @@ export const models = {
             '4': 'Bitcoin Orange',
         },
     },
+    T3W1: {
+        name: 'Trezor Safe 7',
+        colors: {
+            '1': 'Fantastic Ethereum', // TODO T3W1
+            '2': 'Lunatic Dogecoin', // TODO T3W1
+            '3': 'Galactic Litecoin', // TODO T3W1
+            '4': 'Majestic Bitcoin', // TODO T3W1
+        },
+    },
 };
diff --git a/packages/connect/src/data/transportInfo.ts b/packages/connect/src/data/transportInfo.ts
index 7bae65e314d..ea1b1be5930 100644
--- a/packages/connect/src/data/transportInfo.ts
+++ b/packages/connect/src/data/transportInfo.ts
@@ -32,17 +32,17 @@ export const parseBridgeJSON = (json: any) => {
 export const getBridgeInfo = (): BridgeInfo => info;
 
 export const suggestBridgeInstaller = (platform?: string) => {
-    const info = getBridgeInfo();
+    const info2 = getBridgeInfo();
     // check if preferred field was already added
-    if (!info.packages.find(p => p.preferred)) {
+    if (!info2.packages.find(p => p.preferred)) {
         if (platform) {
             // override BridgeInfo packages, add preferred field
-            info.packages = info.packages.map(p => ({
+            info2.packages = info2.packages.map(p => ({
                 ...p,
                 preferred: p.platform.indexOf(platform) >= 0,
             }));
         }
     }
 
-    return info;
+    return info2;
 };
diff --git a/packages/connect/src/data/udevInfo.ts b/packages/connect/src/data/udevInfo.ts
index f5147e45884..75cd9f2fc87 100644
--- a/packages/connect/src/data/udevInfo.ts
+++ b/packages/connect/src/data/udevInfo.ts
@@ -24,17 +24,17 @@ const info: UdevInfo = {
 export const getUdevInfo = () => info;
 
 export const suggestUdevInstaller = (platform?: string) => {
-    const info = getUdevInfo();
+    const info2 = getUdevInfo();
     // check if preferred field was already added
-    if (!info.packages.find(p => p.preferred)) {
+    if (!info2.packages.find(p => p.preferred)) {
         if (platform) {
             // override UdevInfo packages, add preferred field
-            info.packages = info.packages.map(p => ({
+            info2.packages = info2.packages.map(p => ({
                 ...p,
                 preferred: p.platform.indexOf(platform) >= 0,
             }));
         }
     }
 
-    return info;
+    return info2;
 };
diff --git a/packages/connect/src/data/version.ts b/packages/connect/src/data/version.ts
index 2f5e69f32b4..9e247ebce7b 100644
--- a/packages/connect/src/data/version.ts
+++ b/packages/connect/src/data/version.ts
@@ -1,4 +1,4 @@
-export const VERSION = '9.4.2';
+export const VERSION = '9.4.3-beta.2';
 
 const versionN = VERSION.split('.').map(s => parseInt(s, 10));
 
@@ -10,3 +10,5 @@ export const DEFAULT_DOMAIN = isBeta
 
 // Increment with content script changes
 export const CONTENT_SCRIPT_VERSION = 1;
+// Increment with deeplink protocol changes
+export const DEEPLINK_VERSION = 1;
diff --git a/packages/connect/src/device/Device.ts b/packages/connect/src/device/Device.ts
index 19a338d616d..60bc96b2b89 100644
--- a/packages/connect/src/device/Device.ts
+++ b/packages/connect/src/device/Device.ts
@@ -1,9 +1,19 @@
 // original file https://github.com/trezor/connect/blob/develop/src/js/device/Device.js
-import { versionUtils, createDeferred, Deferred, TypedEmitter } from '@trezor/utils';
+import { randomBytes } from 'crypto';
+
+import {
+    versionUtils,
+    createDeferred,
+    Deferred,
+    TypedEmitter,
+    createTimeoutPromise,
+} from '@trezor/utils';
 import { Session } from '@trezor/transport';
 import { TransportProtocol, v1 as v1Protocol } from '@trezor/protocol';
+import { type Transport, type Descriptor, TRANSPORT_ERROR } from '@trezor/transport';
+
 import { DeviceCommands } from './DeviceCommands';
-import { PROTO, ERRORS, NETWORK } from '../constants';
+import { PROTO, ERRORS, FIRMWARE } from '../constants';
 import {
     DEVICE,
     DeviceButtonRequestPayload,
@@ -22,7 +32,6 @@ import {
     ensureInternalModelFeature,
 } from '../utils/deviceFeaturesUtils';
 import { initLog } from '../utils/debug';
-import { type Transport, type Descriptor, TRANSPORT_ERROR } from '@trezor/transport';
 import {
     Device as DeviceTyped,
     DeviceFirmwareStatus,
@@ -35,12 +44,16 @@ import {
     VersionArray,
     KnownDevice,
     StaticSessionId,
+    FirmwareHashCheckResult,
+    FirmwareHashCheckError,
+    DeviceUniquePath,
 } from '../types';
 import { models } from '../data/models';
 import { getLanguage } from '../data/getLanguage';
 import { checkFirmwareRevision } from './checkFirmwareRevision';
 import { IStateStorage } from './StateStorage';
 import type { PromptCallback } from './prompts';
+import { calculateFirmwareHash, getBinaryOptional, stripFwHeaders } from '../api/firmware';
 
 // custom log
 const _log = initLog('Device');
@@ -91,182 +104,318 @@ export interface DeviceEvents {
     ) => void;
     [DEVICE.PASSPHRASE_ON_DEVICE]: () => void;
     [DEVICE.BUTTON]: (device: Device, payload: DeviceButtonRequestPayload) => void;
-    [DEVICE.ACQUIRED]: () => void;
 }
 
+type DeviceLifecycle =
+    | typeof DEVICE.CONNECT
+    | typeof DEVICE.CONNECT_UNACQUIRED
+    | typeof DEVICE.DISCONNECT
+    | typeof DEVICE.CHANGED;
+
+type DeviceLifecycleListener = (lifecycle: DeviceLifecycle) => void;
+
+type DeviceParams = {
+    id: DeviceUniquePath;
+    transport: Transport;
+    descriptor: Descriptor;
+    listener: DeviceLifecycleListener;
+};
+
 /**
  * @export
  * @class Device
  * @extends {EventEmitter}
  */
 export class Device extends TypedEmitter<DeviceEvents> {
-    transport: Transport;
-    protocol: TransportProtocol;
-
-    originalDescriptor: Descriptor;
+    public readonly transport: Transport;
+    public readonly protocol: TransportProtocol;
+    private readonly transportPath;
+    private readonly transportSessionOwner;
+    private readonly transportDescriptorType;
+    private session;
+    private lastAcquiredHere;
 
     /**
      * descriptor was detected on transport layer but sending any messages (such as GetFeatures) to it failed either
      * with some expected error, for example HID device, LIBUSB_ERROR, or it simply timeout out. such device can't be worked
      * with and user needs to take some action. for example reconnect the device, update firmware or change transport type
      */
-    unreadableError?: string;
+    private unreadableError?: string;
 
     // @ts-expect-error: strictPropertyInitialization
-    firmwareStatus: DeviceFirmwareStatus;
+    private _firmwareStatus: DeviceFirmwareStatus;
+    public get firmwareStatus() {
+        return this._firmwareStatus;
+    }
 
-    firmwareRelease?: ReleaseInfo | null;
+    private _firmwareRelease?: ReleaseInfo | null;
+    public get firmwareRelease() {
+        return this._firmwareRelease;
+    }
 
     // @ts-expect-error: strictPropertyInitialization
-    features: Features;
+    private _features: Features;
+    public get features() {
+        return this._features;
+    }
 
-    featuresNeedsReload = false;
+    private _featuresNeedsReload = false;
 
     // variables used in one workflow: acquire -> transportSession -> commands -> run -> keepTransportSession -> release
     private acquirePromise?: ReturnType<Transport['acquire']>;
     private releasePromise?: ReturnType<Transport['release']>;
     private runPromise?: Deferred<void>;
-    transportSession?: Session | null;
-    keepTransportSession = false;
+
+    private keepTransportSession = false;
     public commands?: DeviceCommands;
     private cancelableAction?: (err?: Error) => Promise<unknown>;
 
-    loaded = false;
+    private loaded = false;
 
-    inconsistent = false;
+    private inconsistent = false;
 
-    firstRunPromise: Deferred<boolean>;
-    instance = 0;
+    private firstRunPromise: Deferred<boolean>;
+    private instance = 0;
 
     // DeviceState list [this.instance]: DeviceState | undefined
     private state: DeviceState[] = [];
     private stateStorage?: IStateStorage = undefined;
 
-    unavailableCapabilities: UnavailableCapabilities = {};
-
-    networkTypeState: NETWORK.NetworkType[] = [];
+    private _unavailableCapabilities: UnavailableCapabilities = {};
+    public get unavailableCapabilities(): Readonly<UnavailableCapabilities> {
+        return this._unavailableCapabilities;
+    }
 
-    firmwareType?: FirmwareType;
+    private _firmwareType?: FirmwareType;
+    public get firmwareType() {
+        return this._firmwareType;
+    }
 
-    name = 'Trezor';
+    private name = 'Trezor';
 
-    color?: string;
+    private color?: string;
 
-    availableTranslations: string[] = [];
+    private availableTranslations: string[] = [];
 
-    authenticityChecks: NonNullable<KnownDevice['authenticityChecks']> = {
+    private authenticityChecks: NonNullable<KnownDevice['authenticityChecks']> = {
         firmwareRevision: null,
+        firmwareHash: null,
     };
 
-    private useCardanoDerivation = false;
+    private readonly uniquePath;
+
+    private readonly emitLifecycle;
 
-    constructor(transport: Transport, descriptor: Descriptor) {
+    private sessionDfd?: Deferred<Session | null>;
+
+    constructor({ id, transport, descriptor, listener }: DeviceParams) {
         super();
 
+        this.emitLifecycle = listener;
         this.protocol = v1Protocol;
 
         // === immutable properties
+        this.uniquePath = id;
         this.transport = transport;
-        this.originalDescriptor = descriptor;
+        this.transportPath = descriptor.path;
+        this.transportSessionOwner = descriptor.sessionOwner;
+        this.transportDescriptorType = descriptor.type;
+
+        this.session = descriptor.session;
+        this.lastAcquiredHere = false;
 
         // this will be released after first run
         this.firstRunPromise = createDeferred();
     }
 
-    static fromDescriptor(transport: Transport, originalDescriptor: Descriptor) {
-        const descriptor = { ...originalDescriptor, session: null };
-        try {
-            const device: Device = new Device(transport, descriptor);
-
-            return device;
-        } catch (error) {
-            _log.error('Device.fromDescriptor', error);
-            throw error;
+    private getSessionChangePromise() {
+        if (!this.sessionDfd) {
+            this.sessionDfd = createDeferred<Session | null>();
+            this.sessionDfd.promise.finally(() => {
+                this.sessionDfd = undefined;
+            });
         }
-    }
-
-    static createUnacquired(
-        transport: Transport,
-        descriptor: Descriptor,
-        unreadableError?: string,
-    ) {
-        const device = new Device(transport, descriptor);
-        device.unreadableError = unreadableError;
 
-        return device;
+        return this.sessionDfd.promise;
     }
 
-    async acquire() {
-        this.acquirePromise = this.transport.acquire({
-            input: {
-                path: this.originalDescriptor.path,
-                previous: this.originalDescriptor.session,
-            },
-        });
-        const acquireResult = await this.acquirePromise;
-        this.acquirePromise = undefined;
-        if (!acquireResult.success) {
-            if (this.runPromise) {
-                this.runPromise.reject(new Error(acquireResult.error));
-                delete this.runPromise;
+    private async waitAndCompareSession<
+        T extends { success: true; payload: Session | null } | { success: false },
+    >(response: T, sessionPromise: Promise<Session | null>) {
+        if (response.success) {
+            try {
+                if ((await sessionPromise) !== response.payload) {
+                    return {
+                        success: false,
+                        error: TRANSPORT_ERROR.SESSION_WRONG_PREVIOUS,
+                    } as const;
+                }
+            } catch {
+                return {
+                    success: false,
+                    error: TRANSPORT_ERROR.DEVICE_DISCONNECTED_DURING_ACTION,
+                } as const;
             }
-            throw acquireResult.error;
         }
 
-        const transportSession = acquireResult.payload;
+        return response;
+    }
+
+    acquire() {
+        const sessionPromise = this.getSessionChangePromise();
 
-        _log.debug('Expected workflow id:', transportSession);
-        this.transportSession = transportSession;
-        // note: this.originalDescriptor is updated here and also in TRANSPORT.UPDATE listener.
-        // I would like to update it only in one place (listener) but it some cases (unchained test),
-        // listen response is not triggered by device acquire. not sure why.
-        this.originalDescriptor.session = transportSession;
+        this.acquirePromise = this.transport
+            .acquire({ input: { path: this.transportPath, previous: this.session } })
+            .then(result => this.waitAndCompareSession(result, sessionPromise))
+            .then(result => {
+                if (result.success) {
+                    this.session = result.payload;
+                    this.lastAcquiredHere = true;
+
+                    this.commands?.dispose();
+                    this.commands = new DeviceCommands(this, this.transport, this.session);
+
+                    return result;
+                } else {
+                    if (this.runPromise) {
+                        this.runPromise.reject(new Error(result.error));
+                        delete this.runPromise;
+                    }
+                    throw result.error;
+                }
+            })
+            .finally(() => {
+                this.acquirePromise = undefined;
+            });
+
+        return this.acquirePromise;
+    }
+
+    async release() {
+        const localSession = this.getLocalSession();
+        if (!localSession || this.keepTransportSession || this.releasePromise) {
+            return;
+        }
 
         if (this.commands) {
             this.commands.dispose();
+            if (this.commands.callPromise) {
+                await this.commands.callPromise;
+            }
         }
-        this.commands = new DeviceCommands(this, this.transport, transportSession);
-    }
 
-    async release() {
-        if (
-            this.isUsedHere() &&
-            this.transportSession &&
-            !this.keepTransportSession &&
-            !this.releasePromise
-        ) {
-            if (this.commands) {
-                this.commands.dispose();
-                if (this.commands.callPromise) {
-                    await this.commands.callPromise;
+        const sessionPromise = this.getSessionChangePromise();
+
+        this.releasePromise = this.transport
+            .release({ session: localSession, path: this.transportPath })
+            .then(result => this.waitAndCompareSession(result, sessionPromise))
+            .then(result => {
+                if (result.success) {
+                    this.session = null;
                 }
-            }
 
-            this.releasePromise = this.transport.release({
-                session: this.transportSession,
-                path: this.originalDescriptor.path,
+                return result;
+            })
+            .finally(() => {
+                this.releasePromise = undefined;
             });
 
-            const releaseResponse = await this.releasePromise;
-            this.releasePromise = undefined;
-            if (releaseResponse.success) {
-                this.transportSession = null;
-                this.originalDescriptor.session = null;
-            }
-        }
+        return this.releasePromise;
+    }
+
+    releaseTransportSession() {
+        this.keepTransportSession = false;
     }
 
     async cleanup() {
-        // remove all listeners **except** DEVICE.ACQUIRED - waiting for acquired Device in DeviceList
-        const acquiredListeners = this.listeners(DEVICE.ACQUIRED);
-        this.removeAllListeners();
+        // remove all listeners
+        this.eventNames().forEach(e => this.removeAllListeners(e as keyof DeviceEvents));
+
         // make sure that Device_CallInProgress will not be thrown
         delete this.runPromise;
         await this.release();
-        // restore DEVICE.ACQUIRED listeners
-        acquiredListeners.forEach(l => this.once(DEVICE.ACQUIRED, l));
     }
 
+    // call only once, right after device creation
+    async handshake(delay?: number) {
+        if (delay) {
+            await createTimeoutPromise(501 + delay);
+        }
+
+        while (true) {
+            if (this.isUsedElsewhere()) {
+                this.emitLifecycle(DEVICE.CONNECT_UNACQUIRED);
+            } else {
+                try {
+                    await this.run();
+                } catch (error) {
+                    if (
+                        error.code === 'Device_NotFound' ||
+                        error.message === TRANSPORT_ERROR.DEVICE_NOT_FOUND ||
+                        error.message === TRANSPORT_ERROR.DEVICE_DISCONNECTED_DURING_ACTION ||
+                        error.message === TRANSPORT_ERROR.UNEXPECTED_ERROR ||
+                        error.message === TRANSPORT_ERROR.DESCRIPTOR_NOT_FOUND ||
+                        error.message === TRANSPORT_ERROR.HTTP_ERROR // bridge died during device initialization
+                    ) {
+                        // disconnected, do nothing
+                    } else if (
+                        error.message === TRANSPORT_ERROR.SESSION_WRONG_PREVIOUS ||
+                        error.code === 'Device_UsedElsewhere' // most common error - someone else took the device at the same time
+                    ) {
+                        // TODO needed only for TRANSPORT_ERROR.SESSION_WRONG_PREVIOUS
+                        // this.enumerate(transport);
+                        this.emitLifecycle(DEVICE.CONNECT_UNACQUIRED);
+                    } else if (
+                        // device was claimed by another application on transport api layer (claimInterface in usb nomenclature) but never released (releaseInterface in usb nomenclature)
+                        // the only remedy for this is to reconnect device manually
+                        // or possibly there are 2 applications without common sessions background
+                        error.message === TRANSPORT_ERROR.INTERFACE_UNABLE_TO_OPEN_DEVICE ||
+                        // catch one of trezord LIBUSB_ERRORs
+                        error.message?.indexOf(ERRORS.LIBUSB_ERROR_MESSAGE) >= 0 ||
+                        // we tried to initialize device (either automatically after enumeration or after user click)
+                        // but it did not work out. this device is effectively unreadable and user should do something about it
+                        error.code === 'Device_InitializeFailed'
+                    ) {
+                        this.unreadableError = error?.message;
+                        this.emitLifecycle(DEVICE.CONNECT_UNACQUIRED);
+                    } else {
+                        await createTimeoutPromise(501);
+                        continue;
+                    }
+                }
+            }
+
+            return;
+        }
+    }
+
+    async updateDescriptor(descriptor: Descriptor) {
+        this.sessionDfd?.resolve(descriptor.session);
+
+        await Promise.all([this.acquirePromise, this.releasePromise]);
+
+        // TODO improve these conditions
+
+        // Session changed to different than the current one
+        // -> acquired by someone else
+        if (descriptor.session && descriptor.session !== this.session) {
+            this.usedElsewhere();
+        }
+
+        // Session changed to null
+        // -> released
+        if (!descriptor.session) {
+            const methodStillRunning = !this.commands?.isDisposed();
+            if (methodStillRunning) {
+                this.releaseTransportSession();
+            }
+        }
+
+        this.session = descriptor.session;
+        this.emitLifecycle(DEVICE.CHANGED);
+    }
+
+    // TODO empty fn variant can be split/removed
     run(fn?: () => Promise<void>, options?: RunOptions) {
         if (this.runPromise) {
             _log.warn('Previous call is still running');
@@ -275,12 +424,19 @@ export class Device extends TypedEmitter<DeviceEvents> {
 
         options = parseRunOptions(options);
 
+        const wasUnacquired = this.isUnacquired();
         const runPromise = createDeferred();
         this.runPromise = runPromise;
 
-        this._runInner(fn, options).catch(err => {
-            runPromise.reject(err);
-        });
+        this._runInner(fn, options)
+            .then(() => {
+                if (wasUnacquired && !this.isUnacquired()) {
+                    this.emitLifecycle(DEVICE.CONNECT);
+                }
+            })
+            .catch(err => {
+                runPromise.reject(err);
+            });
 
         return runPromise.promise;
     }
@@ -301,8 +457,8 @@ export class Device extends TypedEmitter<DeviceEvents> {
     setCancelableAction(callback: NonNullable<typeof this.cancelableAction>) {
         this.cancelableAction = (e?: Error) =>
             callback(e)
-                .catch(e => {
-                    _log.debug('cancelableAction error', e);
+                .catch(e2 => {
+                    _log.debug('cancelableAction error', e2);
                 })
                 .finally(() => {
                     this.clearCancelableAction();
@@ -326,14 +482,14 @@ export class Device extends TypedEmitter<DeviceEvents> {
         }
     }
 
-    /**
-     * TODO: this does not work properly (even before transport-refactor)
-     * one of the problem here is, that this.runPromise.reject is caught in src/core finally block that triggers
-     * device release. This is not right because we know that somebody else has already taken control of device
-     * which means that session management does not make sense anymore. releasing device, on the other hand
-     * makes sense, because this instance of connect might be the only one who has the right to do it.
-     */
-    interruptionFromOutside() {
+    public usedElsewhere() {
+        // only makes sense to continue when device held by this instance
+        if (!this.lastAcquiredHere) {
+            return;
+        }
+        this.lastAcquiredHere = false;
+        this._featuresNeedsReload = true;
+
         _log.debug('interruptionFromOutside');
 
         if (this.commands) {
@@ -347,8 +503,8 @@ export class Device extends TypedEmitter<DeviceEvents> {
         // session was acquired by another instance. but another might not have power to release interface
         // so it only notified about its session acquiral and the interrupted instance should cooperate
         // and release device too.
-        if (this.originalDescriptor.session) {
-            this.transport.releaseDevice(this.originalDescriptor.session);
+        if (this.session) {
+            this.transport.releaseDevice(this.session);
         }
     }
 
@@ -360,15 +516,14 @@ export class Device extends TypedEmitter<DeviceEvents> {
             await this.releasePromise;
         }
 
-        if (
-            !this.isUsedHere() ||
-            this.commands?.disposed ||
-            !this.getState()?.staticSessionId ||
-            this.useCardanoDerivation != !!options.useCardanoDerivation
-        ) {
+        const acquireNeeded = !this.isUsedHere() || this.commands?.disposed;
+        if (acquireNeeded) {
             // acquire session
             await this.acquire();
+        }
 
+        const { staticSessionId, deriveCardano } = this.getState() || {};
+        if (acquireNeeded || !staticSessionId || (!deriveCardano && options.useCardanoDerivation)) {
             // update features
             try {
                 if (fn) {
@@ -434,12 +589,6 @@ export class Device extends TypedEmitter<DeviceEvents> {
             this.keepTransportSession = true;
         }
 
-        // if we were waiting for device to be acquired, it should be guaranteed here that it had already happened
-        // (features are reloaded too)
-        if (this.listeners(DEVICE.ACQUIRED).length > 0) {
-            this.emit(DEVICE.ACQUIRED);
-        }
-
         // call inner function
         if (fn) {
             await fn();
@@ -484,7 +633,7 @@ export class Device extends TypedEmitter<DeviceEvents> {
             // and device wasn't released in previous call (example: interrupted discovery which set "keepSession" to true but never released)
             // clear "keepTransportSession" and reset "transportSession" to ensure that "initialize" will be called
             if (this.keepTransportSession) {
-                this.transportSession = null;
+                this.lastAcquiredHere = false;
                 this.keepTransportSession = false;
             }
         }
@@ -543,12 +692,12 @@ export class Device extends TypedEmitter<DeviceEvents> {
     async initialize(useCardanoDerivation: boolean) {
         let payload: PROTO.Initialize | undefined;
         if (this.features) {
-            const sessionId = this.getState()?.sessionId;
-            payload = {};
+            const { sessionId, deriveCardano } = this.getState() || {};
             // If the user has BIP-39 seed, and Initialize(derive_cardano=True) is not sent,
             // all Cardano calls will fail because the root secret will not be available.
-            payload.derive_cardano = useCardanoDerivation;
-            this.useCardanoDerivation = useCardanoDerivation;
+            payload = {
+                derive_cardano: deriveCardano || useCardanoDerivation,
+            };
             if (sessionId) {
                 payload.session_id = sessionId;
             }
@@ -556,6 +705,7 @@ export class Device extends TypedEmitter<DeviceEvents> {
 
         const { message } = await this.getCommands().typedCall('Initialize', 'Features', payload);
         this._updateFeatures(message);
+        this.setState({ deriveCardano: payload?.derive_cardano });
     }
 
     initStorage(storage: IStateStorage) {
@@ -567,6 +717,10 @@ export class Device extends TypedEmitter<DeviceEvents> {
         const { message } = await this.getCommands().typedCall('GetFeatures', 'Features', {});
         this._updateFeatures(message);
 
+        if (this.authenticityChecks.firmwareHash === null) {
+            this.authenticityChecks.firmwareHash = await this.checkFirmwareHash();
+        }
+
         if (
             // The check was not yet performed
             this.authenticityChecks.firmwareRevision === null ||
@@ -595,6 +749,68 @@ export class Device extends TypedEmitter<DeviceEvents> {
         }
     }
 
+    async checkFirmwareHash(): Promise<FirmwareHashCheckResult | null> {
+        const createFailResult = (error: FirmwareHashCheckError) => ({ success: false, error });
+
+        const baseUrl = DataManager.getSettings('binFilesBaseUrl');
+        const enabled = DataManager.getSettings('enableFirmwareHashCheck');
+        if (!enabled || baseUrl === undefined) return createFailResult('check-skipped');
+
+        const firmwareVersion = this.getVersion();
+        // device has no features (not yet connected) or no firmware
+        if (firmwareVersion === undefined || !this.features || this.features.bootloader_mode) {
+            return null;
+        }
+
+        const checkSupported = this.atLeast(FIRMWARE.FW_HASH_SUPPORTED_VERSIONS);
+        if (!checkSupported) return createFailResult('check-unsupported');
+
+        const release = getReleases(this.features.internal_model).find(r =>
+            versionUtils.isEqual(r.version, firmwareVersion),
+        );
+        // if version is expected to support hash check, but the release is unknown, then firmware is considered unofficial
+        if (release === undefined) return createFailResult('unknown-release');
+
+        const btcOnly = this.firmwareType === FirmwareType.BitcoinOnly;
+        const binary = await getBinaryOptional({ baseUrl, btcOnly, release });
+        // release was found, but not its binary - happens on desktop, where only local files are searched
+        if (binary === null) {
+            return createFailResult('check-unsupported');
+        }
+        // binary was found, but it's likely a git LFS pointer (can happen on dev) - see onCallFirmwareUpdate.ts
+        if (binary.byteLength < 200) {
+            _log.warn(`Firmware binary for hash check suspiciously small (< 200 b)`);
+
+            return createFailResult('check-unsupported');
+        }
+
+        const strippedBinary = stripFwHeaders(binary);
+        const { hash: expectedHash, challenge } = calculateFirmwareHash(
+            this.features.major_version,
+            strippedBinary,
+            randomBytes(32),
+        );
+
+        // handle rejection of call by a counterfeit device. If unhandled, it crashes device initialization,
+        // so device can't be used, but it's preferable to display proper message about counterfeit device
+        const getFirmwareHashOptional = async () => {
+            try {
+                return await this.getCommands().typedCall('GetFirmwareHash', 'FirmwareHash', {
+                    challenge,
+                });
+            } catch {
+                return null;
+            }
+        };
+        const deviceResponse = await getFirmwareHashOptional();
+
+        if (!deviceResponse?.message?.hash) return createFailResult('other-error');
+
+        if (deviceResponse.message.hash !== expectedHash) return createFailResult('hash-mismatch');
+
+        return { success: true };
+    }
+
     async checkFirmwareRevision() {
         const firmwareVersion = this.getVersion();
 
@@ -724,24 +940,24 @@ export class Device extends TypedEmitter<DeviceEvents> {
 
         // check if FW version or capabilities did change
         if (!version || !versionUtils.isEqual(version, newVersion)) {
-            this.unavailableCapabilities = getUnavailableCapabilities(feat, getAllNetworks());
-            this.firmwareStatus = getFirmwareStatus(feat);
-            this.firmwareRelease = getRelease(feat);
+            this._unavailableCapabilities = getUnavailableCapabilities(feat, getAllNetworks());
+            this._firmwareStatus = getFirmwareStatus(feat);
+            this._firmwareRelease = getRelease(feat);
 
             this.availableTranslations = this.firmwareRelease?.translations ?? [];
         }
 
-        this.features = feat;
-        this.featuresNeedsReload = false;
+        this._features = feat;
+        this._featuresNeedsReload = false;
 
         // Vendor headers have been changed in 2.6.3.
         if (feat.fw_vendor === 'Trezor Bitcoin-only') {
-            this.firmwareType = FirmwareType.BitcoinOnly;
+            this._firmwareType = FirmwareType.BitcoinOnly;
         } else if (feat.fw_vendor === 'Trezor') {
-            this.firmwareType = FirmwareType.Regular;
+            this._firmwareType = FirmwareType.Regular;
         } else if (this.getMode() !== 'bootloader') {
             // Relevant for T1B1, T2T1 and custom firmware with a different vendor header. Capabilities do not work in bootloader mode.
-            this.firmwareType =
+            this._firmwareType =
                 feat.capabilities &&
                 feat.capabilities.length > 0 &&
                 !feat.capabilities.includes('Capability_Bitcoin_like')
@@ -770,11 +986,19 @@ export class Device extends TypedEmitter<DeviceEvents> {
         return this.features === undefined;
     }
 
+    isUnreadable() {
+        return !!this.unreadableError;
+    }
+
     disconnect() {
         // TODO: cleanup everything
         _log.debug('Disconnect cleanup');
 
-        this.transportSession = null; // set to null to prevent transport.release and cancelableAction
+        this.sessionDfd?.reject(new Error());
+
+        this.lastAcquiredHere = false; // set to null to prevent transport.release and cancelableAction
+
+        this.emitLifecycle(DEVICE.DISCONNECT);
 
         return this.interruptionFromUser(ERRORS.TypedError('Device_Disconnected'));
     }
@@ -815,15 +1039,15 @@ export class Device extends TypedEmitter<DeviceEvents> {
     }
 
     isUsed() {
-        return typeof this.originalDescriptor.session === 'string';
+        return typeof this.session === 'string';
     }
 
     isUsedHere() {
-        return this.isUsed() && this.originalDescriptor.session === this.transportSession;
+        return this.isUsed() && this.lastAcquiredHere;
     }
 
     isUsedElsewhere() {
-        return this.isUsed() && !this.isUsedHere();
+        return this.isUsed() && !this.lastAcquiredHere;
     }
 
     isRunning() {
@@ -838,8 +1062,12 @@ export class Device extends TypedEmitter<DeviceEvents> {
         return this.firstRunPromise.promise;
     }
 
-    getDevicePath() {
-        return this.originalDescriptor.path;
+    getLocalSession() {
+        return this.lastAcquiredHere ? this.session : null;
+    }
+
+    getUniquePath() {
+        return this.uniquePath;
     }
 
     isT1() {
@@ -869,28 +1097,19 @@ export class Device extends TypedEmitter<DeviceEvents> {
         return null;
     }
 
-    updateDescriptor(descriptor: Descriptor) {
-        this.originalDescriptor = {
-            session: descriptor.session,
-            path: descriptor.path,
-            product: descriptor.product,
-            type: descriptor.type,
-        };
-    }
-
     async dispose() {
         this.removeAllListeners();
-        if (this.isUsedHere() && this.transportSession) {
+        if (this.session && this.lastAcquiredHere) {
             try {
                 await this.cancelableAction?.();
                 await this.commands?.cancel();
 
                 return this.transport.release({
-                    session: this.transportSession,
-                    path: this.originalDescriptor.path,
+                    session: this.session,
+                    path: this.transportPath,
                     onClose: true,
                 });
-            } catch (err) {
+            } catch {
                 // empty
             }
         }
@@ -906,39 +1125,42 @@ export class Device extends TypedEmitter<DeviceEvents> {
 
     // simplified object to pass via postMessage
     toMessageObject(): DeviceTyped {
+        const { name, uniquePath: path } = this;
+        const base = { path, name };
+
         if (this.unreadableError) {
             return {
+                ...base,
                 type: 'unreadable',
-                path: this.originalDescriptor.path,
                 error: this.unreadableError, // provide error details
                 label: 'Unreadable device',
-                name: this.name,
+                transportDescriptorType: this.transportDescriptorType,
             };
         }
         if (this.isUnacquired()) {
             return {
+                ...base,
                 type: 'unacquired',
-                path: this.originalDescriptor.path,
                 label: 'Unacquired device',
                 name: this.name,
+                transportSessionOwner: this.transportSessionOwner,
             };
         }
         const defaultLabel = 'My Trezor';
         const label =
             this.features.label === '' || !this.features.label ? defaultLabel : this.features.label;
         let status: DeviceStatus = this.isUsedElsewhere() ? 'occupied' : 'available';
-        if (this.featuresNeedsReload) status = 'used';
+        if (this._featuresNeedsReload) status = 'used';
 
         return {
+            ...base,
             type: 'acquired',
             id: this.features.device_id,
-            path: this.originalDescriptor.path,
             label,
             _state: this.getState(),
             state: this.getState()?.staticSessionId,
             status,
             mode: this.getMode(),
-            name: this.name,
             color: this.color,
             firmware: this.firmwareStatus,
             firmwareRelease: this.firmwareRelease,
diff --git a/packages/connect/src/device/DeviceCommands.ts b/packages/connect/src/device/DeviceCommands.ts
index 64a125c1b5f..ae99de4c7e3 100644
--- a/packages/connect/src/device/DeviceCommands.ts
+++ b/packages/connect/src/device/DeviceCommands.ts
@@ -1,9 +1,12 @@
 // original file https://github.com/trezor/connect/blob/develop/src/js/device/DeviceCommands.js
 
 import { randomBytes } from 'crypto';
+
 import { Transport, Session } from '@trezor/transport';
 import { MessagesSchema as Messages } from '@trezor/protobuf';
 import { createTimeoutPromise, versionUtils } from '@trezor/utils';
+import { Assert } from '@trezor/schema-utils';
+
 import { ERRORS } from '../constants';
 import { DEVICE } from '../events';
 import * as hdnodeUtils from '../utils/hdnodeUtils';
@@ -11,11 +14,9 @@ import { isTaprootPath, getSerializedPath, getScriptType, toHardened } from '../
 import { getAccountAddressN } from '../utils/accountUtils';
 import { getSegwitNetwork, getBech32Network } from '../data/coinInfo';
 import { initLog } from '../utils/debug';
-
 import { Device } from './Device';
 import type { CoinInfo, BitcoinNetworkInfo, Network } from '../types';
 import type { HDNodeResponse } from '../types/api/getPublicKey';
-import { Assert } from '@trezor/schema-utils';
 import { resolveDescriptorForTaproot } from './resolveDescriptorForTaproot';
 import { promptPin, promptPassphrase, promptWord, cancelPrompt } from './prompts';
 
@@ -45,7 +46,7 @@ const assertType = (res: DefaultPayloadMessage, resType: MessageKey | MessageKey
 const generateEntropy = (len: number) => {
     try {
         return randomBytes(len);
-    } catch (err) {
+    } catch {
         throw ERRORS.TypedError(
             'Runtime',
             'generateEntropy: Environment does not support crypto random',
@@ -373,10 +374,10 @@ export class DeviceCommands {
     }
 
     async _commonCall(type: MessageKey, msg?: DefaultPayloadMessage['message']) {
-        const resp = await this.call(type, msg);
         if (this.disposed) {
             throw ERRORS.TypedError('Runtime', 'typedCall: DeviceCommands already disposed');
         }
+        const resp = await this.call(type, msg);
 
         return this._filterCommonTypes(resp);
     }
@@ -563,7 +564,7 @@ export class DeviceCommands {
                 await createTimeoutPromise(1);
                 await this.device.acquire();
                 await cancelPrompt(this.device, false);
-            } catch (err) {
+            } catch {
                 // ignore whatever happens
             }
         } else {
diff --git a/packages/connect/src/device/DeviceList.ts b/packages/connect/src/device/DeviceList.ts
index 86277a773dc..5160eece0ab 100644
--- a/packages/connect/src/device/DeviceList.ts
+++ b/packages/connect/src/device/DeviceList.ts
@@ -1,6 +1,6 @@
 // original file https://github.com/trezor/connect/blob/develop/src/js/device/DeviceList.js
 
-import { TypedEmitter, Deferred, createDeferred, promiseAllSequence } from '@trezor/utils';
+import { TypedEmitter, createDeferred, getSynchronize } from '@trezor/utils';
 import {
     BridgeTransport,
     WebUsbTransport,
@@ -8,19 +8,18 @@ import {
     UdpTransport,
     Transport,
     TRANSPORT,
-    Descriptor,
-    TRANSPORT_ERROR,
     isTransportInstance,
-    DeviceDescriptorDiff,
 } from '@trezor/transport';
+import { Descriptor, PathPublic } from '@trezor/transport/src/types';
+
 import { ERRORS } from '../constants';
 import { DEVICE, TransportInfo } from '../events';
 import { Device } from './Device';
-import type { ConnectSettings, Device as DeviceTyped } from '../types';
-
+import { ConnectSettings, DeviceUniquePath, Device as DeviceTyped } from '../types';
 import { getBridgeInfo } from '../data/transportInfo';
 import { initLog } from '../utils/debug';
 import { resolveAfter } from '../utils/promiseUtils';
+import { typedObjectKeys } from '../types/utils';
 
 // custom log
 const _log = initLog('DeviceList');
@@ -60,8 +59,6 @@ interface DeviceListEvents {
     [DEVICE.CONNECT_UNACQUIRED]: DeviceTyped;
     [DEVICE.DISCONNECT]: DeviceTyped;
     [DEVICE.CHANGED]: DeviceTyped;
-    [DEVICE.RELEASED]: DeviceTyped;
-    [DEVICE.ACQUIRED]: DeviceTyped;
 }
 
 export interface IDeviceList {
@@ -82,7 +79,10 @@ export const assertDeviceListConnected: (
     if (!deviceList.isConnected()) throw ERRORS.TypedError('Transport_Missing');
 };
 
-type ConstructorParams = Pick<ConnectSettings, 'priority' | 'debug' | '_sessionsBackgroundUrl'> & {
+type ConstructorParams = Pick<
+    ConnectSettings,
+    'priority' | 'debug' | '_sessionsBackgroundUrl' | 'manifest'
+> & {
     messages: Record<string, any>;
 };
 type InitParams = Pick<ConnectSettings, 'pendingTransportEvent' | 'transportReconnect'>;
@@ -94,11 +94,10 @@ export class DeviceList extends TypedEmitter<DeviceListEvents> implements IDevic
     // array of transport that might be used in this environment
     private transports: Transport[];
 
-    private devices: { [path: string]: Device } = {};
-
-    private creatingDevicesDescriptors: { [k: string]: Descriptor } = {};
-    private createDevicesQueue: Deferred[] = [];
+    private devices: Record<PathPublic, Device> = {};
+    private deviceCounter = Date.now();
 
+    private readonly handshakeLock;
     private readonly authPenaltyManager;
 
     private initPromise?: Promise<void>;
@@ -115,16 +114,24 @@ export class DeviceList extends TypedEmitter<DeviceListEvents> implements IDevic
         return this.initPromise;
     }
 
-    constructor({ messages, priority, debug, _sessionsBackgroundUrl }: ConstructorParams) {
+    constructor({
+        messages,
+        priority,
+        debug,
+        _sessionsBackgroundUrl,
+        manifest,
+    }: ConstructorParams) {
         super();
 
         const transportLogger = initLog('@trezor/transport', debug);
 
+        this.handshakeLock = getSynchronize();
         this.authPenaltyManager = createAuthPenaltyManager(priority);
         this.transportCommonArgs = {
             messages,
             logger: transportLogger,
             sessionsBackgroundUrl: _sessionsBackgroundUrl,
+            id: manifest?.appUrl || 'unknown app',
         };
 
         this.transports = [
@@ -182,120 +189,46 @@ export class DeviceList extends TypedEmitter<DeviceListEvents> implements IDevic
         this.transports = transportTypes.map(this.createTransport.bind(this));
     }
 
-    private onTransportUpdate(diff: DeviceDescriptorDiff, transport: Transport) {
-        diff.forEach(async ({ descriptor, ...category }) => {
-            // whenever descriptors change we need to update them so that we can use them
-            // in subsequent transport.acquire calls
-            const path = descriptor.path.toString();
-            const device = this.devices[path] as Device | undefined;
-
-            // creatingDevicesDescriptors is needed, so that if *during* creating of Device,
-            // other application acquires the device and changes the descriptor,
-            // the new unacquired device has correct descriptor
-            this.creatingDevicesDescriptors[path] = descriptor;
-
-            switch (category.type) {
-                case 'disconnected':
-                    this.removeFromCreateDevicesQueue(path);
-
-                    if (!device) break;
-
-                    device.disconnect();
-                    delete this.devices[path];
-                    this.emit(DEVICE.DISCONNECT, device.toMessageObject());
-                    break;
-
-                case 'connected':
-                    if (!(await this.waitForCreateDevicesQueue(path))) {
-                        break;
-                    }
-
-                    const penalty = this.authPenaltyManager.get();
-
-                    if (penalty) {
-                        await resolveAfter(501 + penalty, null).promise;
-                    }
-                    if (this.creatingDevicesDescriptors[path].session == null) {
-                        await this._createAndSaveDevice(descriptor, transport);
-                    } else {
-                        const device = this._createUnacquiredDevice(descriptor, transport);
-                        this.devices[path] = device;
-                        this.emit(DEVICE.CONNECT_UNACQUIRED, device.toMessageObject());
-                    }
-
-                    this.removeFromCreateDevicesQueue(path);
-                    break;
-
-                case 'acquired':
-                    if (category.subtype === 'elsewhere') {
-                        this.removeFromCreateDevicesQueue(path);
-                        if (device) {
-                            device.featuresNeedsReload = true;
-                            device.interruptionFromOutside();
-                        }
-                    }
-
-                    if (!device) break;
-
-                    _log.debug('Event', DEVICE.CHANGED, device.toMessageObject());
-                    this.emit(DEVICE.CHANGED, device.toMessageObject());
-
-                    _log.debug('Event', DEVICE.ACQUIRED, device.toMessageObject());
-                    this.emit(DEVICE.ACQUIRED, device.toMessageObject());
-
-                    break;
-
-                case 'released':
-                    if (!device) break;
-
-                    const methodStillRunning = !device.commands?.isDisposed();
-                    if (methodStillRunning) {
-                        device.keepTransportSession = false;
-                    }
-
-                    _log.debug('Event', DEVICE.CHANGED, device.toMessageObject());
-                    this.emit(DEVICE.CHANGED, device.toMessageObject());
-
-                    _log.debug('Event', DEVICE.RELEASED, device.toMessageObject());
-                    this.emit(DEVICE.RELEASED, device.toMessageObject());
-
-                    if (category.subtype === 'elsewhere') {
-                        await resolveAfter(1000, null).promise;
-                        // after device was released in another window wait for a while (the other window might
-                        // have the intention of acquiring it again)
-                        // and if the device is still released and has never been acquired before, acquire it here.
-                        if (!device.isUsed() && device.isUnacquired() && !device.isInconsistent()) {
-                            _log.debug('Create device from unacquired', device.toMessageObject());
-                            await this._createAndSaveDevice(descriptor, transport);
-                        }
-                    }
-                    break;
-            }
+    private onDeviceConnected(descriptor: Descriptor, transport: Transport) {
+        const { path } = descriptor;
+        const id = (this.deviceCounter++).toString(16).slice(-8);
+        const device = new Device({
+            id: DeviceUniquePath(id),
+            transport,
+            descriptor,
+            listener: lifecycle => this.emit(lifecycle, device.toMessageObject()),
+        });
+        this.devices[path] = device;
 
-            device?.updateDescriptor(descriptor);
+        const penalty = this.authPenaltyManager.get();
+        this.handshakeLock(async () => {
+            if (this.devices[path]) {
+                // device wasn't removed while waiting for lock
+                await device.handshake(penalty);
+            }
         });
     }
 
-    private async waitForCreateDevicesQueue(path: string) {
-        const dfd = createDeferred(path);
-        const prevQueue = this.createDevicesQueue.slice();
-        this.createDevicesQueue.push(dfd);
-
-        await promiseAllSequence(prevQueue.map(pr => () => pr.promise));
-
-        // Return whether current pending action still in queue or it was
-        // removed by disconnected/acquiredElsewhere events or dispose
-        return this.createDevicesQueue.includes(dfd);
+    private onDeviceDisconnected(descriptor: Descriptor) {
+        const { path } = descriptor;
+        const device = this.devices[path];
+        if (device) {
+            device.disconnect();
+            delete this.devices[path];
+        }
     }
 
-    private removeFromCreateDevicesQueue(path: string) {
-        const index = this.createDevicesQueue.findIndex(dfd => dfd.id === path);
-        if (index >= 0) {
-            const [dfd] = this.createDevicesQueue.splice(index, 1);
-            dfd.resolve();
+    private onDeviceSessionChanged(descriptor: Descriptor) {
+        const device = this.devices[descriptor.path];
+        if (device) {
+            device.updateDescriptor(descriptor);
         }
     }
 
+    private onDeviceRequestRelease(descriptor: Descriptor) {
+        this.devices[descriptor.path]?.usedElsewhere();
+    }
+
     /**
      * Init @trezor/transport and do something with its results
      */
@@ -330,7 +263,9 @@ export class DeviceList extends TypedEmitter<DeviceListEvents> implements IDevic
         const { promise, reject } = resolveAfter(1000, initParams);
         this.rejectPending = reject;
 
-        return promise.then(this.createInitPromise.bind(this));
+        return promise.then(this.createInitPromise.bind(this)).finally(() => {
+            this.rejectPending = undefined;
+        });
     }
 
     private async selectTransport([transport, ...rest]: Transport[]): Promise<Transport> {
@@ -349,7 +284,10 @@ export class DeviceList extends TypedEmitter<DeviceListEvents> implements IDevic
          * releasing/acquiring device by this application is not solved here but directly
          * where transport.acquire, transport.release is called
          */
-        transport.on(TRANSPORT.UPDATE, diff => this.onTransportUpdate(diff, transport));
+        transport.on(TRANSPORT.DEVICE_CONNECTED, d => this.onDeviceConnected(d, transport));
+        transport.on(TRANSPORT.DEVICE_DISCONNECTED, this.onDeviceDisconnected.bind(this));
+        transport.on(TRANSPORT.DEVICE_SESSION_CHANGED, this.onDeviceSessionChanged.bind(this));
+        transport.on(TRANSPORT.DEVICE_REQUEST_RELEASE, this.onDeviceRequestRelease.bind(this));
 
         // just like transport emits updates, it may also start producing errors, for example bridge process crashes.
         transport.on(TRANSPORT.ERROR, error => {
@@ -375,7 +313,6 @@ export class DeviceList extends TypedEmitter<DeviceListEvents> implements IDevic
                 ? this.waitForDevices(descriptors.length, 10000)
                 : Promise.resolve();
 
-        // TODO handleDescriptorChange can emit TRANSPORT.UPDATE before TRANSPORT.START is emitted, check whether acceptable
         transport.handleDescriptorsChange(descriptors);
         transport.listen();
 
@@ -417,50 +354,20 @@ export class DeviceList extends TypedEmitter<DeviceListEvents> implements IDevic
         });
     }
 
-    private async _createAndSaveDevice(descriptor: Descriptor, transport: Transport) {
-        _log.debug('Creating Device', descriptor);
-        await this.handle(descriptor, transport);
-    }
-
-    private _createUnacquiredDevice(descriptor: Descriptor, transport: Transport) {
-        _log.debug('Creating Unacquired Device', descriptor);
-        const device = Device.createUnacquired(transport, descriptor);
-        device.once(DEVICE.ACQUIRED, () => {
-            // emit connect event once device becomes acquired
-            this.emit(DEVICE.CONNECT, device.toMessageObject());
-        });
-
-        return device;
-    }
-
-    private _createUnreadableDevice(
-        descriptor: Descriptor,
-        transport: Transport,
-        unreadableError: string,
-    ) {
-        _log.debug('Creating Unreadable Device', descriptor, unreadableError);
-
-        return Device.createUnacquired(transport, descriptor, unreadableError);
-    }
-
-    getDevice(path: string) {
-        return this.devices[path];
+    getDeviceCount() {
+        return Object.keys(this.devices).length;
     }
 
-    getFirstDevicePath() {
-        return this.asArray()[0].path;
+    getAllDevices(): Device[] {
+        return typedObjectKeys(this.devices).map(key => this.devices[key]);
     }
 
-    asArray(): DeviceTyped[] {
-        return this.allDevices().map(device => device.toMessageObject());
+    getOnlyDevice(): Device | undefined {
+        return this.getDeviceCount() === 1 ? Object.values(this.devices)[0] : undefined;
     }
 
-    allDevices(): Device[] {
-        return Object.keys(this.devices).map(key => this.devices[key]);
-    }
-
-    length() {
-        return this.asArray().length;
+    getDeviceByPath(path: DeviceUniquePath): Device | undefined {
+        return this.getAllDevices().find(d => d.getUniquePath() === path);
     }
 
     transportType() {
@@ -483,12 +390,12 @@ export class DeviceList extends TypedEmitter<DeviceListEvents> implements IDevic
 
     async cleanup() {
         const { transport } = this;
-        const devices = this.allDevices();
+        const devices = this.getAllDevices();
 
         // @ts-expect-error will be fixed later
         this.transport = undefined;
         this.authPenaltyManager.clear();
-        Object.keys(this.devices).forEach(key => delete this.devices[key]);
+        typedObjectKeys(this.devices).forEach(key => delete this.devices[key]);
 
         this.rejectPending?.(new Error('Disposed'));
 
@@ -498,9 +405,6 @@ export class DeviceList extends TypedEmitter<DeviceListEvents> implements IDevic
             this.emit(DEVICE.DISCONNECT, device.toMessageObject());
         });
 
-        this.createDevicesQueue.forEach(dfd => dfd.resolve());
-        this.createDevicesQueue = [];
-
         // release all devices
         await Promise.all(devices.map(device => device.dispose()));
 
@@ -518,11 +422,7 @@ export class DeviceList extends TypedEmitter<DeviceListEvents> implements IDevic
         }
 
         res.payload.forEach(d => {
-            if (this.devices[d.path]) {
-                this.devices[d.path].updateDescriptor(d);
-                // TODO: is this ok? transportSession should be set only as result of acquire/release
-                // this.devices[d.path].transportSession = d.session;
-            }
+            this.devices[d.path]?.updateDescriptor(d);
         });
     }
 
@@ -533,80 +433,4 @@ export class DeviceList extends TypedEmitter<DeviceListEvents> implements IDevic
     removeAuthPenalty(device: Device) {
         return this.authPenaltyManager.remove(device);
     }
-
-    // main logic
-    private async handle(descriptor: Descriptor, transport: Transport) {
-        const path = descriptor.path.toString();
-        try {
-            // "regular" device creation
-            await this._takeAndCreateDevice(descriptor, transport);
-        } catch (error) {
-            _log.debug('Cannot create device', error);
-            if (
-                error.code === 'Device_NotFound' ||
-                error.message === TRANSPORT_ERROR.DEVICE_NOT_FOUND ||
-                error.message === TRANSPORT_ERROR.DEVICE_DISCONNECTED_DURING_ACTION ||
-                error.message === TRANSPORT_ERROR.UNEXPECTED_ERROR ||
-                error.message === TRANSPORT_ERROR.DESCRIPTOR_NOT_FOUND ||
-                // bridge died during device initialization
-                error.message === TRANSPORT_ERROR.HTTP_ERROR
-            ) {
-                // do nothing
-                // For example:
-                // 1. connect device
-                // 2. _createAndSaveDevice => handle => _takeAndCreateDevice => device.run()
-                // 3. disconnect device
-                // 4. some of the above mentioned errors is returned.
-                delete this.devices[path];
-            } else if (error.message === TRANSPORT_ERROR.SESSION_WRONG_PREVIOUS) {
-                this.enumerate(transport);
-                this._handleUsedElsewhere(descriptor, transport);
-            } else if (
-                // device was claimed by another application on transport api layer (claimInterface in usb nomenclature) but never released (releaseInterface in usb nomenclature)
-                // the only remedy for this is to reconnect device manually
-                // or possibly there are 2 applications without common sessions background
-                error.message === TRANSPORT_ERROR.INTERFACE_UNABLE_TO_OPEN_DEVICE ||
-                // catch one of trezord LIBUSB_ERRORs
-                error.message?.indexOf(ERRORS.LIBUSB_ERROR_MESSAGE) >= 0 ||
-                // we tried to initialize device (either automatically after enumeration or after user click)
-                // but it did not work out. this device is effectively unreadable and user should do something about it
-                error.code === 'Device_InitializeFailed'
-            ) {
-                const device = this._createUnreadableDevice(
-                    this.creatingDevicesDescriptors[path],
-                    transport,
-                    error.message,
-                );
-                this.devices[path] = device;
-                this.emit(DEVICE.CONNECT_UNACQUIRED, device.toMessageObject());
-            } else if (error.code === 'Device_UsedElsewhere') {
-                // most common error - someone else took the device at the same time
-                this._handleUsedElsewhere(descriptor, transport);
-            } else {
-                await resolveAfter(501, null).promise;
-                await this.handle(descriptor, transport);
-            }
-        }
-    }
-
-    private async _takeAndCreateDevice(descriptor: Descriptor, transport: Transport) {
-        const device = Device.fromDescriptor(transport, descriptor);
-        const path = descriptor.path.toString();
-        this.devices[path] = device;
-        const promise = device.run();
-        await promise;
-
-        this.emit(DEVICE.CONNECT, device.toMessageObject());
-    }
-
-    private _handleUsedElsewhere(descriptor: Descriptor, transport: Transport) {
-        const path = descriptor.path.toString();
-
-        const device = this._createUnacquiredDevice(
-            this.creatingDevicesDescriptors[path],
-            transport,
-        );
-        this.devices[path] = device;
-        this.emit(DEVICE.CONNECT_UNACQUIRED, device.toMessageObject());
-    }
 }
diff --git a/packages/connect/src/device/StateStorage.ts b/packages/connect/src/device/StateStorage.ts
index f030c0c0007..7b13cd5a794 100644
--- a/packages/connect/src/device/StateStorage.ts
+++ b/packages/connect/src/device/StateStorage.ts
@@ -1,6 +1,7 @@
+import { storage } from '@trezor/connect-common';
+
 import { DeviceState } from '../types';
 import { Device } from './Device';
-import { storage } from '@trezor/connect-common';
 
 export interface IStateStorage {
     saveState(device: Device, state: DeviceState): void;
diff --git a/packages/connect/src/device/__tests__/DeviceList.test.ts b/packages/connect/src/device/__tests__/DeviceList.test.ts
index 696367e7f47..9c90023a4d0 100644
--- a/packages/connect/src/device/__tests__/DeviceList.test.ts
+++ b/packages/connect/src/device/__tests__/DeviceList.test.ts
@@ -21,13 +21,7 @@ const waitForNthEventOfType = (
     });
 };
 
-const DEVICE_CONNECTION_SEQUENCE = [
-    'device-changed',
-    'device-acquired',
-    'device-changed',
-    'device-released',
-    'device-connect',
-];
+const DEVICE_CONNECTION_SEQUENCE = ['device-changed', 'device-changed', 'device-connect'];
 
 describe('DeviceList', () => {
     beforeAll(async () => {
@@ -56,11 +50,9 @@ describe('DeviceList', () => {
             [
                 'transport-start',
                 'transport-error',
-                'device-changed',
                 'device-connect',
                 'device-connect_unacquired',
-                'device-acquired',
-                'device-released',
+                'device-changed',
                 'device-disconnect',
             ] as const
         ).forEach(event => {
@@ -186,12 +178,7 @@ describe('DeviceList', () => {
         await list.pendingConnection();
 
         const events = eventsSpy.mock.calls.map(call => call[0]);
-        expect(events).toEqual([
-            'device-changed',
-            'device-acquired',
-            'device-connect_unacquired',
-            'transport-start',
-        ]);
+        expect(events).toEqual(['device-changed', 'device-connect_unacquired', 'transport-start']);
     });
 
     it('.init() with pendingTransportEvent (multiple acquired devices)', async () => {
@@ -210,9 +197,9 @@ describe('DeviceList', () => {
         // note: acquire - release - connect should be ok.
         // acquire - deviceList._takeAndCreateDevice start (run -> rurInner -> getFeatures -> release) -> deviceList._takeAndCreateDevice end => emit DEVICE.CONNECT
         expect(events).toEqual([
-            ...DEVICE_CONNECTION_SEQUENCE.map(e => [e, '1']), // path 1
-            ...DEVICE_CONNECTION_SEQUENCE.map(e => [e, '2']), // path 2
-            ...DEVICE_CONNECTION_SEQUENCE.map(e => [e, '3']), // path 3
+            ...DEVICE_CONNECTION_SEQUENCE.map(e => [e, events[0][1]]), // path 1
+            ...DEVICE_CONNECTION_SEQUENCE.map(e => [e, events[3][1]]), // path 2
+            ...DEVICE_CONNECTION_SEQUENCE.map(e => [e, events[6][1]]), // path 3
             ['transport-start', undefined],
         ]);
     });
@@ -240,15 +227,11 @@ describe('DeviceList', () => {
         await transportFirstEvent;
         jest.useRealTimers();
 
-        expect(eventsSpy).toHaveBeenCalledTimes(8);
-        const events = eventsSpy.mock.calls.map(call => call[0]);
+        // expect(eventsSpy).toHaveBeenCalledTimes(5);
+        const events = eventsSpy.mock.calls.map(([event]) => event);
         expect(events).toEqual([
             'device-changed',
-            'device-acquired',
-            'device-changed',
-            'device-acquired',
             'device-changed',
-            'device-released',
             'device-connect',
             'transport-start',
         ]);
@@ -299,9 +282,10 @@ describe('DeviceList', () => {
 
         expect(events).toEqual([
             ['transport-start', undefined],
-            ...DEVICE_CONNECTION_SEQUENCE.map(e => [e, '1']), // path 1
-            ...DEVICE_CONNECTION_SEQUENCE.map(e => [e, '3']), // path 3
-            ...DEVICE_CONNECTION_SEQUENCE.map(e => [e, '4']), // path 4
+            ['device-disconnect', events[1][1]],
+            ...DEVICE_CONNECTION_SEQUENCE.map(e => [e, events[2][1]]), // path 1
+            ...DEVICE_CONNECTION_SEQUENCE.map(e => [e, events[5][1]]), // path 3
+            ...DEVICE_CONNECTION_SEQUENCE.map(e => [e, events[8][1]]), // path 4
         ]);
     });
 });
diff --git a/packages/connect/src/device/__tests__/checkFirmwareRevision.test.ts b/packages/connect/src/device/__tests__/checkFirmwareRevision.test.ts
index d5ad53d5c91..e54f5350669 100644
--- a/packages/connect/src/device/__tests__/checkFirmwareRevision.test.ts
+++ b/packages/connect/src/device/__tests__/checkFirmwareRevision.test.ts
@@ -1,6 +1,7 @@
 import { FetchError } from 'node-fetch';
 
 import { DeviceModelInternal } from '@trezor/protobuf';
+
 import { checkFirmwareRevision, CheckFirmwareRevisionParams } from '../checkFirmwareRevision';
 import { FirmwareRelease, FirmwareRevisionCheckResult } from '../../exports';
 import * as utilsAssets from '../../utils/assets';
diff --git a/packages/connect/src/device/__tests__/resolveDescriptorForTaproot.test.ts b/packages/connect/src/device/__tests__/resolveDescriptorForTaproot.test.ts
index 4d2fe5ccb67..b7e2a936a0a 100644
--- a/packages/connect/src/device/__tests__/resolveDescriptorForTaproot.test.ts
+++ b/packages/connect/src/device/__tests__/resolveDescriptorForTaproot.test.ts
@@ -1,6 +1,7 @@
+import { MessagesSchema as Messages } from '@trezor/protobuf';
+
 import { resolveDescriptorForTaproot } from '../resolveDescriptorForTaproot';
 import { HDNodeResponse } from '../../types/api/getPublicKey';
-import { MessagesSchema as Messages } from '@trezor/protobuf';
 
 const originalResponse: HDNodeResponse = {
     path: [2147483734, 2147483648, 2147483648],
diff --git a/packages/connect/src/device/calculateRevisionForDevice.ts b/packages/connect/src/device/calculateRevisionForDevice.ts
index a8d46948dae..93cfd5283b0 100644
--- a/packages/connect/src/device/calculateRevisionForDevice.ts
+++ b/packages/connect/src/device/calculateRevisionForDevice.ts
@@ -1,4 +1,5 @@
 import { isNewer } from '@trezor/utils/src/versionUtils';
+
 import { VersionArray } from '../exports';
 
 type calculateRevisionForDeviceParams = {
diff --git a/packages/connect/src/device/checkFirmwareRevision.ts b/packages/connect/src/device/checkFirmwareRevision.ts
index ade88aa48f1..e7da0dcdfc4 100644
--- a/packages/connect/src/device/checkFirmwareRevision.ts
+++ b/packages/connect/src/device/checkFirmwareRevision.ts
@@ -1,4 +1,5 @@
 import { isEqual } from '@trezor/utils/src/versionUtils';
+
 import { PROTO } from '../constants';
 import { downloadReleasesMetadata } from '../data/downloadReleasesMetadata';
 import { FirmwareRelease, VersionArray } from '../types';
diff --git a/packages/connect/src/device/prompts.ts b/packages/connect/src/device/prompts.ts
index cd163d78d86..1205969c223 100644
--- a/packages/connect/src/device/prompts.ts
+++ b/packages/connect/src/device/prompts.ts
@@ -20,7 +20,9 @@ type DeviceEventCallback<K extends keyof DeviceEvents> = DeviceEvents[K] extends
     : never;
 
 export const cancelPrompt = (device: Device, expectResponse = true) => {
-    if (!device.transportSession) {
+    const session = device.getLocalSession();
+
+    if (!session) {
         // device disconnected or acquired by someone else
         return Promise.resolve({
             success: false,
@@ -29,7 +31,7 @@ export const cancelPrompt = (device: Device, expectResponse = true) => {
     }
 
     const cancelArgs = {
-        session: device.transportSession,
+        session,
         name: 'Cancel',
         data: {},
         protocol: device.protocol,
diff --git a/packages/connect/src/device/resolveDescriptorForTaproot.ts b/packages/connect/src/device/resolveDescriptorForTaproot.ts
index 275212c437d..28bb8ec2e74 100644
--- a/packages/connect/src/device/resolveDescriptorForTaproot.ts
+++ b/packages/connect/src/device/resolveDescriptorForTaproot.ts
@@ -1,6 +1,7 @@
-import { HDNodeResponse } from '../types/api/getPublicKey';
 import { MessagesSchema as Messages } from '@trezor/protobuf';
 
+import { HDNodeResponse } from '../types/api/getPublicKey';
+
 interface Params {
     response: HDNodeResponse;
     publicKey: Messages.PublicKey;
diff --git a/packages/connect/src/events/blockchain.ts b/packages/connect/src/events/blockchain.ts
index a7a3cecb20b..624c7a06aed 100644
--- a/packages/connect/src/events/blockchain.ts
+++ b/packages/connect/src/events/blockchain.ts
@@ -4,6 +4,7 @@ import type {
     FiatRatesBySymbol,
     NotificationEvent,
 } from '@trezor/blockchain-link';
+
 import type { CoinInfo } from '../types/coinInfo';
 import type { MessageFactoryFn } from '../types/utils';
 
diff --git a/packages/connect/src/events/call.ts b/packages/connect/src/events/call.ts
index 70471b8e1cc..36b0072bd06 100644
--- a/packages/connect/src/events/call.ts
+++ b/packages/connect/src/events/call.ts
@@ -5,24 +5,28 @@ import type { CommonParams, DeviceIdentity } from '../types/params';
 import { Device } from '../device/Device';
 
 // conditionally unwrap TrezorConnect api method Success<T> response
-type UnwrappedResponse<T> =
-    T extends Promise<infer R> ? (R extends { success: true; payload: infer P } ? P : never) : void;
+type UnwrappedResponse<Response> =
+    Response extends Promise<infer R>
+        ? R extends { success: true; payload: infer P }
+            ? P
+            : never
+        : void;
 
 // https://github.com/microsoft/TypeScript/issues/32164
 // there is no native way how to get Parameters<Fn> for overloaded function
 // current TrezorConnect api methods have exactly 2 overloads (if any)
-type OverloadedMethod<T, E extends Record<string, string>> = T extends {
+type OverloadedMethod<Method, Params extends Record<string, string>> = Method extends {
     (params: infer P1): infer R1;
     (params: infer P2): infer R2;
 }
-    ? ((params: P1 & E) => R1) | ((params: P2 & E) => R2) // - method IS overloaded, result depends on params (example: getAddress)
-    : T extends (...args: infer P) => infer R
-      ? (params: E & P[0]) => R // - method in NOT overloaded, one set of params and one set of result (example: signTransaction)
+    ? ((params: P1 & Params) => R1) | ((params: P2 & Params) => R2) // - method IS overloaded, result depends on params (example: getAddress)
+    : Method extends (...args: infer P) => infer R
+      ? (params: Params & P[0]) => R // - method in NOT overloaded, one set of params and one set of result (example: signTransaction)
       : never;
 
-type UnwrappedMethod<T, M extends Record<string, string>> = T extends () => infer R
-    ? (params: M & CommonParams) => R // - method doesn't have params (example: dispose, disableWebUSB)
-    : OverloadedMethod<T, M>;
+type UnwrappedMethod<Method, Params extends Record<string, string>> = Method extends () => infer R
+    ? (params: Params & CommonParams) => R // - method doesn't have params (example: dispose, disableWebUSB)
+    : OverloadedMethod<Method, Params>;
 
 type IsMethodCallable<T> = T extends (...args: any[]) => infer R
     ? R extends Promise<{ success: boolean }>
@@ -76,9 +80,9 @@ export const createResponseMessage = (
     payload: success ? payload : serializeError(payload),
     device: device
         ? {
-              path: device?.originalDescriptor.path,
+              path: device?.getUniquePath(),
               state: device?.getState(),
-              instance: device?.instance,
+              instance: device?.getInstance(),
           }
         : undefined,
 });
diff --git a/packages/connect/src/events/device.ts b/packages/connect/src/events/device.ts
index 1cec7002019..aa94479a514 100644
--- a/packages/connect/src/events/device.ts
+++ b/packages/connect/src/events/device.ts
@@ -9,13 +9,6 @@ export const DEVICE = {
     CONNECT_UNACQUIRED: 'device-connect_unacquired',
     DISCONNECT: 'device-disconnect',
     CHANGED: 'device-changed',
-    ACQUIRE: 'device-acquire',
-    RELEASE: 'device-release',
-    ACQUIRED: 'device-acquired',
-    RELEASED: 'device-released',
-    USED_ELSEWHERE: 'device-used_elsewhere',
-
-    LOADING: 'device-loading',
 
     // trezor-link events in protobuf format
     BUTTON: 'button',
diff --git a/packages/connect/src/events/transport.ts b/packages/connect/src/events/transport.ts
index 38cb887e3be..f0d83f8442f 100644
--- a/packages/connect/src/events/transport.ts
+++ b/packages/connect/src/events/transport.ts
@@ -1,9 +1,9 @@
-import { serializeError } from '../constants/errors';
-import type { MessageFactoryFn } from '../types/utils';
 import type { Transport } from '@trezor/transport';
-
 import { TRANSPORT } from '@trezor/transport/src/constants';
 
+import { serializeError } from '../constants/errors';
+import type { MessageFactoryFn } from '../types/utils';
+
 export { TRANSPORT } from '@trezor/transport/src/constants';
 
 export const TRANSPORT_EVENT = 'TRANSPORT_EVENT';
diff --git a/packages/connect/src/events/ui-promise.ts b/packages/connect/src/events/ui-promise.ts
index 6604a6b7e2e..af125d0d9c7 100644
--- a/packages/connect/src/events/ui-promise.ts
+++ b/packages/connect/src/events/ui-promise.ts
@@ -1,4 +1,5 @@
 import type { Deferred } from '@trezor/utils';
+
 import type { DEVICE } from './device';
 import type { Device } from '../device/Device';
 import type { UiResponseEvent } from './ui-response';
diff --git a/packages/connect/src/factory.ts b/packages/connect/src/factory.ts
index 02c8f550a82..c3b8ed7bd4a 100644
--- a/packages/connect/src/factory.ts
+++ b/packages/connect/src/factory.ts
@@ -1,274 +1,264 @@
-import { UI } from './events';
 import type { EventEmitter } from 'events';
+
+import { UI } from './events';
 import type { TrezorConnect } from './types';
 import type { CallMethod } from './events/call';
+import type { InitType } from './types/api/init';
 
-export interface ConnectFactoryDependencies {
+export interface ConnectFactoryDependencies<SettingsType extends Record<string, any>> {
+    init: InitType<SettingsType>;
     call: CallMethod;
     eventEmitter: EventEmitter;
     manifest: TrezorConnect['manifest'];
-    init: TrezorConnect['init'];
     requestLogin: TrezorConnect['requestLogin'];
     uiResponse: TrezorConnect['uiResponse'];
-    renderWebUSBButton: TrezorConnect['renderWebUSBButton'];
-    disableWebUSB: TrezorConnect['disableWebUSB'];
-    requestWebUSBDevice: TrezorConnect['requestWebUSBDevice'];
     cancel: TrezorConnect['cancel'];
     dispose: TrezorConnect['dispose'];
 }
 
-export const factory = ({
-    eventEmitter,
-    manifest,
-    init,
-    call,
-    requestLogin,
-    uiResponse,
-    renderWebUSBButton,
-    disableWebUSB,
-    requestWebUSBDevice,
-    cancel,
-    dispose,
-}: ConnectFactoryDependencies): TrezorConnect => {
-    const api: TrezorConnect = {
+export const factory = <
+    SettingsType extends Record<string, any>,
+    ExtraMethodsType extends Record<string, any>,
+>(
+    {
+        eventEmitter,
         manifest,
         init,
-        getSettings: () => call({ method: 'getSettings' }),
-
-        on: <T extends string, P extends (...args: any[]) => any>(type: T, fn: P) => {
-            eventEmitter.on(type, fn);
-        },
-
-        off: (type, fn) => {
-            eventEmitter.removeListener(type, fn);
-        },
+        call,
+        requestLogin,
+        uiResponse,
+        cancel,
+        dispose,
+    }: ConnectFactoryDependencies<SettingsType>,
+    extraMethods: ExtraMethodsType = {} as ExtraMethodsType,
+): Omit<TrezorConnect, 'init'> & { init: InitType<SettingsType> } & ExtraMethodsType => ({
+    manifest,
+    init,
 
-        removeAllListeners: type => {
-            if (typeof type === 'string') {
-                eventEmitter.removeAllListeners(type);
-            } else {
-                eventEmitter.removeAllListeners();
-            }
-        },
+    on: <T extends string, P extends (...args: any[]) => any>(type: T, fn: P) => {
+        eventEmitter.on(type, fn);
+    },
 
-        uiResponse,
+    off: (type, fn) => {
+        eventEmitter.removeListener(type, fn);
+    },
 
-        // methods
+    removeAllListeners: type => {
+        if (typeof type === 'string') {
+            eventEmitter.removeAllListeners(type);
+        } else {
+            eventEmitter.removeAllListeners();
+        }
+    },
 
-        blockchainGetAccountBalanceHistory: params =>
-            call({ ...params, method: 'blockchainGetAccountBalanceHistory' }),
+    uiResponse,
 
-        blockchainGetCurrentFiatRates: params =>
-            call({ ...params, method: 'blockchainGetCurrentFiatRates' }),
+    // methods
 
-        blockchainGetFiatRatesForTimestamps: params =>
-            call({ ...params, method: 'blockchainGetFiatRatesForTimestamps' }),
+    blockchainGetAccountBalanceHistory: params =>
+        call({ ...params, method: 'blockchainGetAccountBalanceHistory' }),
 
-        blockchainDisconnect: params => call({ ...params, method: 'blockchainDisconnect' }),
+    blockchainGetCurrentFiatRates: params =>
+        call({ ...params, method: 'blockchainGetCurrentFiatRates' }),
 
-        blockchainEstimateFee: params => call({ ...params, method: 'blockchainEstimateFee' }),
+    blockchainGetFiatRatesForTimestamps: params =>
+        call({ ...params, method: 'blockchainGetFiatRatesForTimestamps' }),
 
-        blockchainGetTransactions: params =>
-            call({ ...params, method: 'blockchainGetTransactions' }),
+    blockchainEvmRpcCall: params => call({ ...params, method: 'blockchainEvmRpcCall' }),
 
-        blockchainSetCustomBackend: params =>
-            call({ ...params, method: 'blockchainSetCustomBackend' }),
+    blockchainDisconnect: params => call({ ...params, method: 'blockchainDisconnect' }),
 
-        blockchainSubscribe: params => call({ ...params, method: 'blockchainSubscribe' }),
+    blockchainEstimateFee: params => call({ ...params, method: 'blockchainEstimateFee' }),
 
-        blockchainSubscribeFiatRates: params =>
-            call({ ...params, method: 'blockchainSubscribeFiatRates' }),
+    blockchainGetTransactions: params => call({ ...params, method: 'blockchainGetTransactions' }),
 
-        blockchainUnsubscribe: params => call({ ...params, method: 'blockchainUnsubscribe' }),
+    blockchainSetCustomBackend: params => call({ ...params, method: 'blockchainSetCustomBackend' }),
 
-        blockchainUnsubscribeFiatRates: params =>
-            call({ ...params, method: 'blockchainUnsubscribeFiatRates' }),
+    blockchainSubscribe: params => call({ ...params, method: 'blockchainSubscribe' }),
 
-        requestLogin: params => requestLogin(params),
+    blockchainSubscribeFiatRates: params =>
+        call({ ...params, method: 'blockchainSubscribeFiatRates' }),
 
-        cardanoGetAddress: params =>
-            call({
-                ...params,
-                method: 'cardanoGetAddress',
-                useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
-            }),
+    blockchainUnsubscribe: params => call({ ...params, method: 'blockchainUnsubscribe' }),
 
-        cardanoGetNativeScriptHash: params =>
-            call({ ...params, method: 'cardanoGetNativeScriptHash' }),
+    blockchainUnsubscribeFiatRates: params =>
+        call({ ...params, method: 'blockchainUnsubscribeFiatRates' }),
 
-        cardanoGetPublicKey: params => call({ ...params, method: 'cardanoGetPublicKey' }),
+    requestLogin: params => requestLogin(params),
 
-        cardanoSignTransaction: params => call({ ...params, method: 'cardanoSignTransaction' }),
+    cardanoGetAddress: params =>
+        call({
+            ...params,
+            method: 'cardanoGetAddress',
+            useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
+        }),
 
-        cardanoComposeTransaction: params =>
-            call({ ...params, method: 'cardanoComposeTransaction' }),
+    cardanoGetNativeScriptHash: params => call({ ...params, method: 'cardanoGetNativeScriptHash' }),
 
-        cipherKeyValue: params => call({ ...params, method: 'cipherKeyValue' }),
+    cardanoGetPublicKey: params => call({ ...params, method: 'cardanoGetPublicKey' }),
 
-        composeTransaction: params => call({ ...params, method: 'composeTransaction' }),
+    cardanoSignTransaction: params => call({ ...params, method: 'cardanoSignTransaction' }),
 
-        ethereumGetAddress: params =>
-            call({
-                ...params,
-                method: 'ethereumGetAddress',
-                useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
-            }),
+    cardanoComposeTransaction: params => call({ ...params, method: 'cardanoComposeTransaction' }),
 
-        ethereumGetPublicKey: params => call({ ...params, method: 'ethereumGetPublicKey' }),
+    cipherKeyValue: params => call({ ...params, method: 'cipherKeyValue' }),
 
-        ethereumSignMessage: params => call({ ...params, method: 'ethereumSignMessage' }),
+    composeTransaction: params => call({ ...params, method: 'composeTransaction' }),
 
-        ethereumSignTransaction: params => call({ ...params, method: 'ethereumSignTransaction' }),
+    ethereumGetAddress: params =>
+        call({
+            ...params,
+            method: 'ethereumGetAddress',
+            useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
+        }),
 
-        // @ts-expect-error generic param
-        ethereumSignTypedData: params => call({ ...params, method: 'ethereumSignTypedData' }),
+    ethereumGetPublicKey: params => call({ ...params, method: 'ethereumGetPublicKey' }),
 
-        ethereumVerifyMessage: params => call({ ...params, method: 'ethereumVerifyMessage' }),
+    ethereumSignMessage: params => call({ ...params, method: 'ethereumSignMessage' }),
 
-        getAccountDescriptor: params => call({ ...params, method: 'getAccountDescriptor' }),
+    ethereumSignTransaction: params => call({ ...params, method: 'ethereumSignTransaction' }),
 
-        getAccountInfo: params => call({ ...params, method: 'getAccountInfo' }),
+    // @ts-expect-error generic param
+    ethereumSignTypedData: params => call({ ...params, method: 'ethereumSignTypedData' }),
 
-        getAddress: params =>
-            call({
-                ...params,
-                method: 'getAddress',
-                useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
-            }),
+    ethereumVerifyMessage: params => call({ ...params, method: 'ethereumVerifyMessage' }),
 
-        getDeviceState: params => call({ ...params, method: 'getDeviceState' }),
+    getAccountDescriptor: params => call({ ...params, method: 'getAccountDescriptor' }),
 
-        getFeatures: params => call({ ...params, method: 'getFeatures' }),
+    getAccountInfo: params => call({ ...params, method: 'getAccountInfo' }),
 
-        getFirmwareHash: params => call({ ...params, method: 'getFirmwareHash' }),
+    getAddress: params =>
+        call({
+            ...params,
+            method: 'getAddress',
+            useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
+        }),
 
-        getOwnershipId: params => call({ ...params, method: 'getOwnershipId' }),
+    getDeviceState: params => call({ ...params, method: 'getDeviceState' }),
 
-        getOwnershipProof: params => call({ ...params, method: 'getOwnershipProof' }),
+    getFeatures: params => call({ ...params, method: 'getFeatures' }),
 
-        getPublicKey: params => call({ ...params, method: 'getPublicKey' }),
+    getFirmwareHash: params => call({ ...params, method: 'getFirmwareHash' }),
 
-        nemGetAddress: params =>
-            call({
-                ...params,
-                method: 'nemGetAddress',
-                useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
-            }),
+    getOwnershipId: params => call({ ...params, method: 'getOwnershipId' }),
 
-        nemSignTransaction: params => call({ ...params, method: 'nemSignTransaction' }),
+    getOwnershipProof: params => call({ ...params, method: 'getOwnershipProof' }),
 
-        pushTransaction: params => call({ ...params, method: 'pushTransaction' }),
+    getPublicKey: params => call({ ...params, method: 'getPublicKey' }),
 
-        rippleGetAddress: params =>
-            call({
-                ...params,
-                method: 'rippleGetAddress',
-                useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
-            }),
+    nemGetAddress: params =>
+        call({
+            ...params,
+            method: 'nemGetAddress',
+            useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
+        }),
 
-        rippleSignTransaction: params => call({ ...params, method: 'rippleSignTransaction' }),
+    nemSignTransaction: params => call({ ...params, method: 'nemSignTransaction' }),
 
-        signMessage: params => call({ ...params, method: 'signMessage' }),
+    pushTransaction: params => call({ ...params, method: 'pushTransaction' }),
 
-        signTransaction: params => call({ ...params, method: 'signTransaction' }),
+    rippleGetAddress: params =>
+        call({
+            ...params,
+            method: 'rippleGetAddress',
+            useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
+        }),
 
-        solanaGetPublicKey: params => call({ ...params, method: 'solanaGetPublicKey' }),
+    rippleSignTransaction: params => call({ ...params, method: 'rippleSignTransaction' }),
 
-        solanaGetAddress: params => call({ ...params, method: 'solanaGetAddress' }),
+    signMessage: params => call({ ...params, method: 'signMessage' }),
 
-        solanaSignTransaction: params => call({ ...params, method: 'solanaSignTransaction' }),
+    signTransaction: params => call({ ...params, method: 'signTransaction' }),
 
-        stellarGetAddress: params =>
-            call({
-                ...params,
-                method: 'stellarGetAddress',
-                useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
-            }),
+    solanaGetPublicKey: params => call({ ...params, method: 'solanaGetPublicKey' }),
 
-        stellarSignTransaction: params => call({ ...params, method: 'stellarSignTransaction' }),
+    solanaGetAddress: params => call({ ...params, method: 'solanaGetAddress' }),
 
-        tezosGetAddress: params =>
-            call({
-                ...params,
-                method: 'tezosGetAddress',
-                useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
-            }),
+    solanaSignTransaction: params => call({ ...params, method: 'solanaSignTransaction' }),
 
-        tezosGetPublicKey: params => call({ ...params, method: 'tezosGetPublicKey' }),
+    stellarGetAddress: params =>
+        call({
+            ...params,
+            method: 'stellarGetAddress',
+            useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
+        }),
 
-        tezosSignTransaction: params => call({ ...params, method: 'tezosSignTransaction' }),
+    stellarSignTransaction: params => call({ ...params, method: 'stellarSignTransaction' }),
 
-        unlockPath: params => call({ ...params, method: 'unlockPath' }),
+    tezosGetAddress: params =>
+        call({
+            ...params,
+            method: 'tezosGetAddress',
+            useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
+        }),
 
-        eosGetPublicKey: params => call({ ...params, method: 'eosGetPublicKey' }),
+    tezosGetPublicKey: params => call({ ...params, method: 'tezosGetPublicKey' }),
 
-        eosSignTransaction: params => call({ ...params, method: 'eosSignTransaction' }),
+    tezosSignTransaction: params => call({ ...params, method: 'tezosSignTransaction' }),
 
-        binanceGetAddress: params =>
-            call({
-                ...params,
-                method: 'binanceGetAddress',
-                useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
-            }),
+    unlockPath: params => call({ ...params, method: 'unlockPath' }),
 
-        binanceGetPublicKey: params => call({ ...params, method: 'binanceGetPublicKey' }),
+    eosGetPublicKey: params => call({ ...params, method: 'eosGetPublicKey' }),
 
-        binanceSignTransaction: params => call({ ...params, method: 'binanceSignTransaction' }),
+    eosSignTransaction: params => call({ ...params, method: 'eosSignTransaction' }),
 
-        verifyMessage: params => call({ ...params, method: 'verifyMessage' }),
+    binanceGetAddress: params =>
+        call({
+            ...params,
+            method: 'binanceGetAddress',
+            useEventListener: eventEmitter.listenerCount(UI.ADDRESS_VALIDATION) > 0,
+        }),
 
-        resetDevice: params => call({ ...params, method: 'resetDevice' }),
+    binanceGetPublicKey: params => call({ ...params, method: 'binanceGetPublicKey' }),
 
-        wipeDevice: params => call({ ...params, method: 'wipeDevice' }),
+    binanceSignTransaction: params => call({ ...params, method: 'binanceSignTransaction' }),
 
-        checkFirmwareAuthenticity: params =>
-            call({ ...params, method: 'checkFirmwareAuthenticity' }),
+    verifyMessage: params => call({ ...params, method: 'verifyMessage' }),
 
-        applyFlags: params => call({ ...params, method: 'applyFlags' }),
+    resetDevice: params => call({ ...params, method: 'resetDevice' }),
 
-        applySettings: params => call({ ...params, method: 'applySettings' }),
+    loadDevice: params => call({ ...params, method: 'loadDevice' }),
 
-        authenticateDevice: params => call({ ...params, method: 'authenticateDevice' }),
+    wipeDevice: params => call({ ...params, method: 'wipeDevice' }),
 
-        authorizeCoinjoin: params => call({ ...params, method: 'authorizeCoinjoin' }),
+    applyFlags: params => call({ ...params, method: 'applyFlags' }),
 
-        cancelCoinjoinAuthorization: params =>
-            call({ ...params, method: 'cancelCoinjoinAuthorization' }),
+    applySettings: params => call({ ...params, method: 'applySettings' }),
 
-        showDeviceTutorial: params => call({ ...params, method: 'showDeviceTutorial' }),
+    getSettings: () => call({ method: 'getSettings' }),
 
-        backupDevice: params => call({ ...params, method: 'backupDevice' }),
+    authenticateDevice: params => call({ ...params, method: 'authenticateDevice' }),
 
-        changeLanguage: params => call({ ...params, method: 'changeLanguage' }),
+    authorizeCoinjoin: params => call({ ...params, method: 'authorizeCoinjoin' }),
 
-        changePin: params => call({ ...params, method: 'changePin' }),
+    cancelCoinjoinAuthorization: params =>
+        call({ ...params, method: 'cancelCoinjoinAuthorization' }),
 
-        changeWipeCode: params => call({ ...params, method: 'changeWipeCode' }),
+    showDeviceTutorial: params => call({ ...params, method: 'showDeviceTutorial' }),
 
-        firmwareUpdate: params => call({ ...params, method: 'firmwareUpdate' }),
+    backupDevice: params => call({ ...params, method: 'backupDevice' }),
 
-        recoveryDevice: params => call({ ...params, method: 'recoveryDevice' }),
+    changeLanguage: params => call({ ...params, method: 'changeLanguage' }),
 
-        getCoinInfo: params => call({ ...params, method: 'getCoinInfo' }),
+    changePin: params => call({ ...params, method: 'changePin' }),
 
-        rebootToBootloader: params => call({ ...params, method: 'rebootToBootloader' }),
+    changeWipeCode: params => call({ ...params, method: 'changeWipeCode' }),
 
-        setBrightness: params => call({ ...params, method: 'setBrightness' }),
+    firmwareUpdate: params => call({ ...params, method: 'firmwareUpdate' }),
 
-        setBusy: params => call({ ...params, method: 'setBusy' }),
+    recoveryDevice: params => call({ ...params, method: 'recoveryDevice' }),
 
-        setProxy: params => call({ ...params, method: 'setProxy' }),
+    getCoinInfo: params => call({ ...params, method: 'getCoinInfo' }),
 
-        dispose,
+    setBrightness: params => call({ ...params, method: 'setBrightness' }),
 
-        cancel,
+    setBusy: params => call({ ...params, method: 'setBusy' }),
 
-        renderWebUSBButton,
+    setProxy: params => call({ ...params, method: 'setProxy' }),
 
-        disableWebUSB,
+    dispose,
 
-        requestWebUSBDevice,
-    };
+    cancel,
 
-    return api;
-};
+    ...extraMethods,
+});
diff --git a/packages/connect/src/impl/dynamic.ts b/packages/connect/src/impl/dynamic.ts
new file mode 100644
index 00000000000..30a13f388f7
--- /dev/null
+++ b/packages/connect/src/impl/dynamic.ts
@@ -0,0 +1,145 @@
+import EventEmitter from 'events';
+
+import { ConnectFactoryDependencies } from '../factory';
+import type { Manifest } from '../types/settings';
+import { CallMethodPayload } from '../events';
+import { ERRORS } from '../constants';
+import { ProxyEventEmitter } from '../utils/proxy-event-emitter';
+import { InitFullSettings } from '../types/api/init';
+
+type TrezorConnectDynamicParams<
+    ImplType,
+    SettingsType extends Record<string, any>,
+    ImplInterface extends ConnectFactoryDependencies<SettingsType>,
+> = {
+    implementations: {
+        type: ImplType;
+        impl: ImplInterface;
+    }[];
+    getInitTarget: (settings: InitFullSettings<SettingsType>) => ImplType;
+    handleErrorFallback: (errorCode: string) => Promise<boolean>;
+};
+
+/**
+ * Implementation of TrezorConnect that can dynamically switch between different implementations.
+ *
+ */
+export class TrezorConnectDynamic<
+    ImplType,
+    SettingsType extends Record<string, any>,
+    ImplInterface extends ConnectFactoryDependencies<SettingsType>,
+> implements ConnectFactoryDependencies<SettingsType>
+{
+    public eventEmitter: EventEmitter;
+
+    private currentTarget: ImplType;
+    private implementations: TrezorConnectDynamicParams<
+        ImplType,
+        SettingsType,
+        ImplInterface
+    >['implementations'];
+    private getInitTarget: TrezorConnectDynamicParams<
+        ImplType,
+        SettingsType,
+        ImplInterface
+    >['getInitTarget'];
+    private handleErrorFallback: TrezorConnectDynamicParams<
+        ImplType,
+        SettingsType,
+        ImplInterface
+    >['handleErrorFallback'];
+
+    public lastSettings?: InitFullSettings<SettingsType>;
+
+    public constructor({
+        implementations,
+        getInitTarget,
+        handleErrorFallback,
+    }: TrezorConnectDynamicParams<ImplType, SettingsType, ImplInterface>) {
+        this.implementations = implementations;
+        this.currentTarget = this.implementations[0].type;
+        this.getInitTarget = getInitTarget;
+        this.handleErrorFallback = handleErrorFallback;
+        this.eventEmitter = new ProxyEventEmitter(
+            this.implementations.map(impl => impl.impl.eventEmitter),
+        );
+    }
+
+    public getTarget() {
+        return this.implementations.find(impl => impl.type === this.currentTarget)!.impl;
+    }
+
+    public async switchTarget(target: ImplType) {
+        if (this.currentTarget === target) {
+            return;
+        }
+
+        if (!this.lastSettings) {
+            throw ERRORS.TypedError('Init_NotInitialized');
+        }
+        await this.getTarget().dispose();
+        this.currentTarget = target;
+        await this.getTarget().init(this.lastSettings);
+    }
+
+    public manifest(manifest: Manifest) {
+        // @ts-expect-error hell knows why this is not working
+        this.lastSettings = {
+            ...this.lastSettings,
+            manifest,
+        };
+
+        this.getTarget().manifest(manifest);
+    }
+
+    public async init(settings: InitFullSettings<SettingsType>) {
+        if (!settings?.manifest) {
+            throw ERRORS.TypedError('Init_ManifestMissing');
+        }
+        // Save settings for later use
+        this.lastSettings = settings;
+
+        this.currentTarget = this.getInitTarget(settings);
+
+        // Initialize the target
+        try {
+            return await this.getTarget().init(this.lastSettings);
+        } catch (error) {
+            // Handle error by switching to other implementation if available as defined in `handleErrorFallback`.
+            if (await this.handleErrorFallback(error.code)) {
+                return await this.getTarget().init(settings);
+            }
+
+            throw error;
+        }
+    }
+
+    public async call(params: CallMethodPayload) {
+        const response = await this.getTarget().call(params);
+        if (!response.success) {
+            if (await this.handleErrorFallback(response.payload.code)) {
+                return await this.getTarget().call(params);
+            }
+        }
+
+        return response;
+    }
+
+    public requestLogin(params: any) {
+        return this.getTarget().requestLogin(params);
+    }
+
+    public uiResponse(params: any) {
+        return this.getTarget().uiResponse(params);
+    }
+
+    public cancel(error?: string) {
+        return this.getTarget().cancel(error);
+    }
+
+    public dispose() {
+        this.eventEmitter.removeAllListeners();
+
+        return this.getTarget().dispose();
+    }
+}
diff --git a/packages/connect/src/index-browser.ts b/packages/connect/src/index-browser.ts
index 02e6249dc98..bdf93de6ff4 100644
--- a/packages/connect/src/index-browser.ts
+++ b/packages/connect/src/index-browser.ts
@@ -17,10 +17,7 @@ const TrezorConnect = factory({
     init: fallback,
     call: fallback,
     requestLogin: fallback,
-    requestWebUSBDevice: fallback,
     uiResponse: fallback,
-    renderWebUSBButton: fallback,
-    disableWebUSB: fallback,
     cancel: fallback,
     dispose: fallback,
 });
diff --git a/packages/connect/src/index.ts b/packages/connect/src/index.ts
index 20fe0b18ae6..96988bcf66f 100644
--- a/packages/connect/src/index.ts
+++ b/packages/connect/src/index.ts
@@ -208,31 +208,19 @@ const cancel = (error?: string) => {
     });
 };
 
-const renderWebUSBButton = (_className?: string) => {
-    throw ERRORS.TypedError('Method_InvalidPackage');
-};
-
-const disableWebUSB = () => {
-    throw ERRORS.TypedError('Method_InvalidPackage');
-};
-
-const requestWebUSBDevice = () => {
-    throw ERRORS.TypedError('Method_InvalidPackage');
-};
-
-const TrezorConnect = factory({
-    eventEmitter,
-    manifest,
-    init,
-    call,
-    requestLogin,
-    uiResponse,
-    renderWebUSBButton,
-    disableWebUSB,
-    requestWebUSBDevice,
-    cancel,
-    dispose,
-});
+const TrezorConnect = factory(
+    {
+        eventEmitter,
+        manifest,
+        init,
+        call,
+        requestLogin,
+        uiResponse,
+        cancel,
+        dispose,
+    },
+    {},
+);
 
 export default TrezorConnect;
 export * from './exports';
diff --git a/packages/connect/src/types/api/__tests__/binance.ts b/packages/connect/src/types/api/__tests__/binance.ts
index 44c9df72139..507d9df4a43 100644
--- a/packages/connect/src/types/api/__tests__/binance.ts
+++ b/packages/connect/src/types/api/__tests__/binance.ts
@@ -1,4 +1,4 @@
-import { TrezorConnect } from '../../..';
+import { DeviceUniquePath, TrezorConnect } from '../../..';
 
 export const binanceGetAddress = async (api: TrezorConnect) => {
     // regular
@@ -29,7 +29,7 @@ export const binanceGetAddress = async (api: TrezorConnect) => {
     // with all possible params
     api.binanceGetAddress({
         device: {
-            path: '1',
+            path: DeviceUniquePath('1'),
             instance: 1,
             state: 'state@device-id:1',
         },
diff --git a/packages/connect/src/types/api/__tests__/bitcoin.ts b/packages/connect/src/types/api/__tests__/bitcoin.ts
index 64adc77b2ad..279abc3d425 100644
--- a/packages/connect/src/types/api/__tests__/bitcoin.ts
+++ b/packages/connect/src/types/api/__tests__/bitcoin.ts
@@ -1,4 +1,4 @@
-import { TrezorConnect } from '../../..';
+import { DeviceUniquePath, TrezorConnect } from '../../..';
 
 export const getAddress = async (api: TrezorConnect) => {
     // regular
@@ -29,7 +29,7 @@ export const getAddress = async (api: TrezorConnect) => {
     // with all possible params
     api.getAddress({
         device: {
-            path: '1',
+            path: DeviceUniquePath('1'),
             instance: 1,
             state: 'state@device-id:1',
         },
diff --git a/packages/connect/src/types/api/__tests__/cardano.ts b/packages/connect/src/types/api/__tests__/cardano.ts
index ab59c6d05be..b39c80f628e 100644
--- a/packages/connect/src/types/api/__tests__/cardano.ts
+++ b/packages/connect/src/types/api/__tests__/cardano.ts
@@ -1,4 +1,4 @@
-import { TrezorConnect, PROTO } from '../../..';
+import { TrezorConnect, PROTO, DeviceUniquePath } from '../../..';
 
 const {
     CardanoAddressType,
@@ -122,7 +122,7 @@ export const cardanoGetAddress = async (api: TrezorConnect) => {
     // with all possible params
     api.cardanoGetAddress({
         device: {
-            path: '1',
+            path: DeviceUniquePath('1'),
             instance: 1,
             state: 'state@device-id:1',
         },
diff --git a/packages/connect/src/types/api/__tests__/ethereum.ts b/packages/connect/src/types/api/__tests__/ethereum.ts
index cb6776ac942..ae6008f5ba3 100644
--- a/packages/connect/src/types/api/__tests__/ethereum.ts
+++ b/packages/connect/src/types/api/__tests__/ethereum.ts
@@ -1,4 +1,4 @@
-import { TrezorConnect } from '../../..';
+import { DeviceUniquePath, TrezorConnect } from '../../..';
 
 export const ethereumGetAddress = async (api: TrezorConnect) => {
     // regular
@@ -30,7 +30,7 @@ export const ethereumGetAddress = async (api: TrezorConnect) => {
     // with all possible params
     api.ethereumGetAddress({
         device: {
-            path: '1',
+            path: DeviceUniquePath('1'),
             instance: 1,
             state: 'state@device-id:1',
         },
diff --git a/packages/connect/src/types/api/__tests__/index.ts b/packages/connect/src/types/api/__tests__/index.ts
index 35cae9718f5..5b7c9a225f8 100644
--- a/packages/connect/src/types/api/__tests__/index.ts
+++ b/packages/connect/src/types/api/__tests__/index.ts
@@ -32,6 +32,4 @@ export const init = async (api: TrezorConnect) => {
     api.dispose();
     api.cancel();
     api.cancel('Interruption error');
-    api.renderWebUSBButton();
-    api.disableWebUSB();
 };
diff --git a/packages/connect/src/types/api/__tests__/management.ts b/packages/connect/src/types/api/__tests__/management.ts
index 232101e9ed5..d72095ded2e 100644
--- a/packages/connect/src/types/api/__tests__/management.ts
+++ b/packages/connect/src/types/api/__tests__/management.ts
@@ -70,7 +70,4 @@ export const management = async (api: TrezorConnect) => {
         word_count: 24,
     });
     if (recovery.success) recovery.payload.message.toLowerCase();
-
-    const reboot = await api.rebootToBootloader();
-    if (reboot.success) reboot.payload.message.toLowerCase();
 };
diff --git a/packages/connect/src/types/api/__tests__/nem.ts b/packages/connect/src/types/api/__tests__/nem.ts
index 6fb7a3350af..ab1e8d4c647 100644
--- a/packages/connect/src/types/api/__tests__/nem.ts
+++ b/packages/connect/src/types/api/__tests__/nem.ts
@@ -1,4 +1,4 @@
-import { TrezorConnect, NEM } from '../../..';
+import { TrezorConnect, NEM, DeviceUniquePath } from '../../..';
 
 export const nemGetAddress = async (api: TrezorConnect) => {
     // regular
@@ -33,7 +33,7 @@ export const nemGetAddress = async (api: TrezorConnect) => {
     // with all possible params
     api.nemGetAddress({
         device: {
-            path: '1',
+            path: DeviceUniquePath('1'),
             instance: 1,
             state: 'state@device-id:1',
         },
diff --git a/packages/connect/src/types/api/__tests__/ripple.ts b/packages/connect/src/types/api/__tests__/ripple.ts
index f84d8a6ab31..7a63fc0d5e6 100644
--- a/packages/connect/src/types/api/__tests__/ripple.ts
+++ b/packages/connect/src/types/api/__tests__/ripple.ts
@@ -1,4 +1,4 @@
-import { TrezorConnect } from '../../..';
+import { DeviceUniquePath, TrezorConnect } from '../../..';
 
 export const rippleGetAddress = async (api: TrezorConnect) => {
     // regular
@@ -31,7 +31,7 @@ export const rippleGetAddress = async (api: TrezorConnect) => {
     // with all possible params
     api.rippleGetAddress({
         device: {
-            path: '1',
+            path: DeviceUniquePath('1'),
             instance: 1,
             state: 'state@device-id:1',
         },
diff --git a/packages/connect/src/types/api/__tests__/stellar.ts b/packages/connect/src/types/api/__tests__/stellar.ts
index 4fc3811d59c..1164974b88b 100644
--- a/packages/connect/src/types/api/__tests__/stellar.ts
+++ b/packages/connect/src/types/api/__tests__/stellar.ts
@@ -1,4 +1,4 @@
-import { TrezorConnect } from '../../..';
+import { DeviceUniquePath, TrezorConnect } from '../../..';
 
 export const stellarGetAddress = async (api: TrezorConnect) => {
     // regular
@@ -29,7 +29,7 @@ export const stellarGetAddress = async (api: TrezorConnect) => {
     // with all possible params
     api.stellarGetAddress({
         device: {
-            path: '1',
+            path: DeviceUniquePath('1'),
             instance: 1,
             state: 'state@device-id:1',
         },
diff --git a/packages/connect/src/types/api/__tests__/tezos.ts b/packages/connect/src/types/api/__tests__/tezos.ts
index 7396ce5418d..e4887411f96 100644
--- a/packages/connect/src/types/api/__tests__/tezos.ts
+++ b/packages/connect/src/types/api/__tests__/tezos.ts
@@ -1,4 +1,4 @@
-import { TrezorConnect } from '../../..';
+import { DeviceUniquePath, TrezorConnect } from '../../..';
 
 export const tezosGetAddress = async (api: TrezorConnect) => {
     // regular
@@ -29,7 +29,7 @@ export const tezosGetAddress = async (api: TrezorConnect) => {
     // with all possible params
     api.tezosGetAddress({
         device: {
-            path: '1',
+            path: DeviceUniquePath('1'),
             instance: 1,
             state: 'state@device-id:1',
         },
diff --git a/packages/connect/src/types/api/applySettings.ts b/packages/connect/src/types/api/applySettings.ts
index e004e802b75..cd46568e8f3 100644
--- a/packages/connect/src/types/api/applySettings.ts
+++ b/packages/connect/src/types/api/applySettings.ts
@@ -1,4 +1,5 @@
 import { Type, Static } from '@trezor/schema-utils';
+
 import { PROTO } from '../../constants';
 import type { Params, Response } from '../params';
 
diff --git a/packages/connect/src/types/api/authenticateDevice.ts b/packages/connect/src/types/api/authenticateDevice.ts
index f81852dc68e..8a0cd30485c 100644
--- a/packages/connect/src/types/api/authenticateDevice.ts
+++ b/packages/connect/src/types/api/authenticateDevice.ts
@@ -1,4 +1,5 @@
 import { Static, Type } from '@trezor/schema-utils';
+
 import type { Params, Response } from '../params';
 import { DeviceAuthenticityConfig } from '../../data/deviceAuthenticityConfigTypes';
 
diff --git a/packages/connect/src/types/api/authorizeCoinjoin.ts b/packages/connect/src/types/api/authorizeCoinjoin.ts
index a1aea105f65..ed0b47b17a9 100644
--- a/packages/connect/src/types/api/authorizeCoinjoin.ts
+++ b/packages/connect/src/types/api/authorizeCoinjoin.ts
@@ -1,6 +1,6 @@
-import type { Params, Response } from '../params';
-
 import { Static, Type } from '@trezor/schema-utils';
+
+import type { Params, Response } from '../params';
 import { DerivationPath } from '../params';
 import { PROTO } from '../../constants';
 
diff --git a/packages/connect/src/types/api/binance/index.ts b/packages/connect/src/types/api/binance/index.ts
index 503c1ef1038..89497418438 100644
--- a/packages/connect/src/types/api/binance/index.ts
+++ b/packages/connect/src/types/api/binance/index.ts
@@ -1,6 +1,7 @@
+import { Type, Static } from '@trezor/schema-utils';
+
 import { PROTO } from '../../../constants';
 import { DerivationPath } from '../../params';
-import { Type, Static } from '@trezor/schema-utils';
 
 // BinanceSDKTransaction from https://github.com/binance-chain/javascript-sdk/blob/master/src/tx/index.js
 
diff --git a/packages/connect/src/types/api/bitcoin/index.ts b/packages/connect/src/types/api/bitcoin/index.ts
index 4877c0189bb..d7a1c33974e 100644
--- a/packages/connect/src/types/api/bitcoin/index.ts
+++ b/packages/connect/src/types/api/bitcoin/index.ts
@@ -1,9 +1,10 @@
 import type { AccountAddresses } from '@trezor/blockchain-link';
 import type { Transaction as BlockbookTransaction } from '@trezor/blockchain-link-types/src/blockbook';
+import { Static, Type } from '@trezor/schema-utils';
+
 import type { PROTO } from '../../../constants';
 import type { AccountTransaction } from '../../account';
 import { DerivationPath, ProtoWithDerivationPath } from '../../params';
-import { Static, Type } from '@trezor/schema-utils';
 
 // signMessage
 
diff --git a/packages/connect/src/types/api/blockchainEstimateFee.ts b/packages/connect/src/types/api/blockchainEstimateFee.ts
index a3e36f5efb5..e46fa9ebcaa 100644
--- a/packages/connect/src/types/api/blockchainEstimateFee.ts
+++ b/packages/connect/src/types/api/blockchainEstimateFee.ts
@@ -1,4 +1,5 @@
 import type { BlockchainLinkParams, BlockchainLinkResponse } from '@trezor/blockchain-link';
+
 import type { FeeLevel, FeeInfo } from '../fees';
 import type { CommonParamsWithCoin, Response } from '../params';
 
diff --git a/packages/connect/src/types/api/blockchainEvmRpcCall.ts b/packages/connect/src/types/api/blockchainEvmRpcCall.ts
new file mode 100644
index 00000000000..4573be6583c
--- /dev/null
+++ b/packages/connect/src/types/api/blockchainEvmRpcCall.ts
@@ -0,0 +1,7 @@
+import { BlockchainLinkParams, BlockchainLinkResponse } from '@trezor/blockchain-link';
+
+import type { CommonParamsWithCoin, Response } from '../params';
+
+export declare function blockchainEvmRpcCall(
+    params: CommonParamsWithCoin & BlockchainLinkParams<'rpcCall'>,
+): Response<BlockchainLinkResponse<'rpcCall'>>;
diff --git a/packages/connect/src/types/api/blockchainGetAccountBalanceHistory.ts b/packages/connect/src/types/api/blockchainGetAccountBalanceHistory.ts
index f2782d7f292..7e61b91450f 100644
--- a/packages/connect/src/types/api/blockchainGetAccountBalanceHistory.ts
+++ b/packages/connect/src/types/api/blockchainGetAccountBalanceHistory.ts
@@ -1,4 +1,5 @@
 import type { BlockchainLinkParams, BlockchainLinkResponse } from '@trezor/blockchain-link';
+
 import type { CommonParamsWithCoin, Response } from '../params';
 
 export declare function blockchainGetAccountBalanceHistory(
diff --git a/packages/connect/src/types/api/blockchainGetCurrentFiatRates.ts b/packages/connect/src/types/api/blockchainGetCurrentFiatRates.ts
index 08035337f1e..d98612dbd4a 100644
--- a/packages/connect/src/types/api/blockchainGetCurrentFiatRates.ts
+++ b/packages/connect/src/types/api/blockchainGetCurrentFiatRates.ts
@@ -1,4 +1,5 @@
 import type { BlockchainLinkParams, BlockchainLinkResponse } from '@trezor/blockchain-link';
+
 import type { CommonParamsWithCoin, Response } from '../params';
 
 export declare function blockchainGetCurrentFiatRates(
diff --git a/packages/connect/src/types/api/blockchainGetFiatRatesForTimestamps.ts b/packages/connect/src/types/api/blockchainGetFiatRatesForTimestamps.ts
index 6f9617afdd3..0c44f7c06c6 100644
--- a/packages/connect/src/types/api/blockchainGetFiatRatesForTimestamps.ts
+++ b/packages/connect/src/types/api/blockchainGetFiatRatesForTimestamps.ts
@@ -1,4 +1,5 @@
 import type { BlockchainLinkParams, BlockchainLinkResponse } from '@trezor/blockchain-link';
+
 import type { CommonParamsWithCoin, Response } from '../params';
 
 export declare function blockchainGetFiatRatesForTimestamps(
diff --git a/packages/connect/src/types/api/blockchainGetTransactions.ts b/packages/connect/src/types/api/blockchainGetTransactions.ts
index 51c2a9eeaed..294cef72b98 100644
--- a/packages/connect/src/types/api/blockchainGetTransactions.ts
+++ b/packages/connect/src/types/api/blockchainGetTransactions.ts
@@ -1,4 +1,5 @@
 import type { Transaction } from '@trezor/blockchain-link';
+
 import type { CommonParamsWithCoin, Response } from '../params';
 
 export type BlockchainGetTransactions = CommonParamsWithCoin & {
diff --git a/packages/connect/src/types/api/blockchainSubscribe.ts b/packages/connect/src/types/api/blockchainSubscribe.ts
index 63be8510669..ab66828cd3b 100644
--- a/packages/connect/src/types/api/blockchainSubscribe.ts
+++ b/packages/connect/src/types/api/blockchainSubscribe.ts
@@ -1,4 +1,5 @@
 import type { SubscriptionAccountInfo, BlockchainLinkResponse } from '@trezor/blockchain-link';
+
 import type { CommonParamsWithCoin, Response } from '../params';
 
 export type BlockchainSubscribe = CommonParamsWithCoin & {
diff --git a/packages/connect/src/types/api/blockchainSubscribeFiatRates.ts b/packages/connect/src/types/api/blockchainSubscribeFiatRates.ts
index 77c2312baa1..13e0d01af11 100644
--- a/packages/connect/src/types/api/blockchainSubscribeFiatRates.ts
+++ b/packages/connect/src/types/api/blockchainSubscribeFiatRates.ts
@@ -1,4 +1,5 @@
 import type { BlockchainLinkResponse } from '@trezor/blockchain-link';
+
 import type { CommonParamsWithCoin, Response } from '../params';
 
 export type BlockchainSubscribeFiatRates = CommonParamsWithCoin & {
diff --git a/packages/connect/src/types/api/blockchainUnsubscribe.ts b/packages/connect/src/types/api/blockchainUnsubscribe.ts
index 66c1290ea90..4b30fa3088a 100644
--- a/packages/connect/src/types/api/blockchainUnsubscribe.ts
+++ b/packages/connect/src/types/api/blockchainUnsubscribe.ts
@@ -1,4 +1,5 @@
 import type { BlockchainLinkResponse } from '@trezor/blockchain-link';
+
 import type { Response } from '../params';
 import type { BlockchainSubscribe } from './blockchainSubscribe';
 
diff --git a/packages/connect/src/types/api/blockchainUnsubscribeFiatRates.ts b/packages/connect/src/types/api/blockchainUnsubscribeFiatRates.ts
index f7b5052e83f..88e8d87dd17 100644
--- a/packages/connect/src/types/api/blockchainUnsubscribeFiatRates.ts
+++ b/packages/connect/src/types/api/blockchainUnsubscribeFiatRates.ts
@@ -1,4 +1,5 @@
 import type { BlockchainLinkResponse } from '@trezor/blockchain-link';
+
 import type { Response } from '../params';
 import type { BlockchainSubscribeFiatRates } from './blockchainSubscribeFiatRates';
 
diff --git a/packages/connect/src/types/api/cancelCoinjoinAuthorization.ts b/packages/connect/src/types/api/cancelCoinjoinAuthorization.ts
index 56de14b2300..c8faf394f3c 100644
--- a/packages/connect/src/types/api/cancelCoinjoinAuthorization.ts
+++ b/packages/connect/src/types/api/cancelCoinjoinAuthorization.ts
@@ -1,4 +1,5 @@
 import { Static, Type } from '@trezor/schema-utils';
+
 import type { PROTO } from '../../constants';
 import type { Params, Response } from '../params';
 
diff --git a/packages/connect/src/types/api/cardano/index.ts b/packages/connect/src/types/api/cardano/index.ts
index 7170a522713..8a836516863 100644
--- a/packages/connect/src/types/api/cardano/index.ts
+++ b/packages/connect/src/types/api/cardano/index.ts
@@ -1,4 +1,5 @@
 import { Type, Static } from '@trezor/schema-utils';
+
 import { PROTO } from '../../../constants';
 import { GetPublicKey, PublicKey, DerivationPath } from '../../params';
 
diff --git a/packages/connect/src/types/api/cardanoComposeTransaction.ts b/packages/connect/src/types/api/cardanoComposeTransaction.ts
index a9f01b7eef1..418d45f7e07 100644
--- a/packages/connect/src/types/api/cardanoComposeTransaction.ts
+++ b/packages/connect/src/types/api/cardanoComposeTransaction.ts
@@ -1,4 +1,5 @@
 import type { types, trezorUtils } from '@fivebinaries/coin-selection';
+
 import type { AccountAddresses, AccountUtxo } from '../../exports';
 import type { Params, Response } from '../params';
 import type { CardanoCertificate, CardanoInput, CardanoOutput } from './cardano';
diff --git a/packages/connect/src/types/api/changeLanguage.ts b/packages/connect/src/types/api/changeLanguage.ts
index 5709faaf2bf..1d1d2a37e52 100644
--- a/packages/connect/src/types/api/changeLanguage.ts
+++ b/packages/connect/src/types/api/changeLanguage.ts
@@ -1,4 +1,5 @@
 import { Type, Static } from '@trezor/schema-utils';
+
 import type { Params, Response } from '../params';
 import { PROTO } from '../../constants';
 
diff --git a/packages/connect/src/types/api/checkFirmwareAuthenticity.ts b/packages/connect/src/types/api/checkFirmwareAuthenticity.ts
deleted file mode 100644
index a8584e567d8..00000000000
--- a/packages/connect/src/types/api/checkFirmwareAuthenticity.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { Response, CommonParams } from '../params';
-
-export interface CheckFirmwareAuthenticityResponse {
-    expectedFirmwareHash: string;
-    actualFirmwareHash: string;
-    valid: boolean;
-}
-
-export type CheckFirmwareAuthenticityParams = CommonParams & { baseUrl?: string };
-
-export declare function checkFirmwareAuthenticity(
-    params: CheckFirmwareAuthenticityParams,
-): Response<CheckFirmwareAuthenticityResponse>;
diff --git a/packages/connect/src/types/api/cipherKeyValue.ts b/packages/connect/src/types/api/cipherKeyValue.ts
index dff6e40e849..1a652d5b76a 100644
--- a/packages/connect/src/types/api/cipherKeyValue.ts
+++ b/packages/connect/src/types/api/cipherKeyValue.ts
@@ -1,6 +1,7 @@
-import { Params, BundledParams, Response, DerivationPath } from '../params';
 import { Static, Type } from '@trezor/schema-utils';
 
+import { Params, BundledParams, Response, DerivationPath } from '../params';
+
 export type CipherKeyValue = Static<typeof CipherKeyValue>;
 export const CipherKeyValue = Type.Object({
     path: DerivationPath,
diff --git a/packages/connect/src/types/api/composeTransaction.ts b/packages/connect/src/types/api/composeTransaction.ts
index b8aa202444a..fae24cb4adb 100644
--- a/packages/connect/src/types/api/composeTransaction.ts
+++ b/packages/connect/src/types/api/composeTransaction.ts
@@ -9,7 +9,9 @@ import type {
     ComposeResultError as ComposeResultErrorBase,
     ComposeResultFinal as ComposeResultFinalBase,
     ComposeResultNonFinal as ComposeResultNonFinalBase,
+    TransactionInputOutputSortingStrategy,
 } from '@trezor/utxo-lib';
+
 import type { PROTO } from '../../constants';
 import type { Params, Response } from '../params';
 
@@ -20,7 +22,19 @@ export type ComposeOutputPayment = Omit<Extract<ComposeOutputBase, { type: 'paym
 
 export type ComposeOutput = Exclude<ComposeOutputBase, { type: 'payment' }> | ComposeOutputPayment;
 
-export interface ComposeParams {
+type SortingStrategyPropsWithBackCompatibility =
+    | {
+          /** @deprecated  use sortingStrategy=none instead */
+          skipPermutation?: boolean;
+          sortingStrategy?: undefined;
+      }
+    | {
+          /** @deprecated  use sortingStrategy=none instead */
+          skipPermutation?: undefined;
+          sortingStrategy?: TransactionInputOutputSortingStrategy;
+      };
+
+export type ComposeParams = {
     outputs: ComposeOutput[];
     coin: string;
     identity?: string;
@@ -30,8 +44,7 @@ export interface ComposeParams {
     sequence?: number;
     baseFee?: number;
     floorBaseFee?: boolean;
-    skipPermutation?: boolean;
-}
+} & SortingStrategyPropsWithBackCompatibility;
 
 export type SignedTransaction = {
     signatures: string[];
@@ -42,7 +55,7 @@ export type SignedTransaction = {
 // @trezor/utxo-lib `composeTx` ComposeInput required fields intersects AccountUtxo
 export type ComposeUtxo = AccountUtxo & Partial<ComposeInputBase>;
 
-export interface PrecomposeParams {
+export type PrecomposeParams = {
     outputs: ComposeOutput[];
     coin: string;
     identity?: string;
@@ -56,8 +69,7 @@ export interface PrecomposeParams {
     baseFee?: number;
     floorBaseFee?: boolean;
     sequence?: number;
-    skipPermutation?: boolean;
-}
+} & SortingStrategyPropsWithBackCompatibility;
 
 // @trezor/utxo-lib `composeTx` transaction.input (ComposeInput) response intersects AccountUtxo
 export type ComposedInputs = AccountUtxo & ComposeInputBase;
diff --git a/packages/connect/src/types/api/eos/index.ts b/packages/connect/src/types/api/eos/index.ts
index 468b0405dee..2e005b1578c 100644
--- a/packages/connect/src/types/api/eos/index.ts
+++ b/packages/connect/src/types/api/eos/index.ts
@@ -1,6 +1,7 @@
+import { Type, Static } from '@trezor/schema-utils';
+
 import { PROTO } from '../../../constants';
 import { DerivationPath } from '../../params';
-import { Type, Static } from '@trezor/schema-utils';
 
 // eosGetPublicKey
 
diff --git a/packages/connect/src/types/api/ethereum/index.ts b/packages/connect/src/types/api/ethereum/index.ts
index 777a78055f4..97de567044f 100644
--- a/packages/connect/src/types/api/ethereum/index.ts
+++ b/packages/connect/src/types/api/ethereum/index.ts
@@ -1,4 +1,5 @@
 import { Type, Static } from '@trezor/schema-utils';
+
 import { DerivationPath } from '../../params';
 
 // ethereumSignMessage
diff --git a/packages/connect/src/types/api/firmwareUpdate.ts b/packages/connect/src/types/api/firmwareUpdate.ts
index b2aaf881692..ff5238e53af 100644
--- a/packages/connect/src/types/api/firmwareUpdate.ts
+++ b/packages/connect/src/types/api/firmwareUpdate.ts
@@ -1,4 +1,5 @@
 import { Static, Type } from '@trezor/schema-utils';
+
 import type { Params, Response } from '../params';
 
 export type FirmwareUpdate = Static<typeof FirmwareUpdate>;
diff --git a/packages/connect/src/types/api/getAccountDescriptor.ts b/packages/connect/src/types/api/getAccountDescriptor.ts
index f80e193e8a7..80f043b37fe 100644
--- a/packages/connect/src/types/api/getAccountDescriptor.ts
+++ b/packages/connect/src/types/api/getAccountDescriptor.ts
@@ -1,4 +1,5 @@
 import { Static, Type } from '@trezor/schema-utils';
+
 import { PROTO } from '../../constants';
 import { Params, BundledParams, Response, DerivationPath } from '../params';
 
diff --git a/packages/connect/src/types/api/getAccountInfo.ts b/packages/connect/src/types/api/getAccountInfo.ts
index 4c607b989d9..5d0d540d7a0 100644
--- a/packages/connect/src/types/api/getAccountInfo.ts
+++ b/packages/connect/src/types/api/getAccountInfo.ts
@@ -1,4 +1,5 @@
 import type { BlockchainLinkParams } from '@trezor/blockchain-link';
+
 import type { PROTO } from '../../constants';
 import type { Params, BundledParams, Response } from '../params';
 import type { AccountInfo, DiscoveryAccountType } from '../account';
diff --git a/packages/connect/src/types/api/getAddress.ts b/packages/connect/src/types/api/getAddress.ts
index 6ab2e1e2b1f..162196f3407 100644
--- a/packages/connect/src/types/api/getAddress.ts
+++ b/packages/connect/src/types/api/getAddress.ts
@@ -1,4 +1,5 @@
 import { Static, Type } from '@trezor/schema-utils';
+
 import { PROTO } from '../../constants';
 import {
     GetAddress as GetAddressShared,
diff --git a/packages/connect/src/types/api/getOwnershipId.ts b/packages/connect/src/types/api/getOwnershipId.ts
index 81e7b77e057..9d7b4cda194 100644
--- a/packages/connect/src/types/api/getOwnershipId.ts
+++ b/packages/connect/src/types/api/getOwnershipId.ts
@@ -1,4 +1,5 @@
 import { Static, Type } from '@trezor/schema-utils';
+
 import { PROTO } from '../../constants';
 import { Params, BundledParams, Response, DerivationPath } from '../params';
 
diff --git a/packages/connect/src/types/api/getOwnershipProof.ts b/packages/connect/src/types/api/getOwnershipProof.ts
index a14d1879050..682588682a2 100644
--- a/packages/connect/src/types/api/getOwnershipProof.ts
+++ b/packages/connect/src/types/api/getOwnershipProof.ts
@@ -1,4 +1,5 @@
 import { Static, Type } from '@trezor/schema-utils';
+
 import { PROTO } from '../../constants';
 import { Params, BundledParams, Response, DerivationPath } from '../params';
 
diff --git a/packages/connect/src/types/api/getPublicKey.ts b/packages/connect/src/types/api/getPublicKey.ts
index a7a07d115b7..2d0eaacb7a9 100644
--- a/packages/connect/src/types/api/getPublicKey.ts
+++ b/packages/connect/src/types/api/getPublicKey.ts
@@ -1,6 +1,7 @@
+import { Type, Static } from '@trezor/schema-utils';
+
 import { PROTO } from '../../constants';
 import { GetPublicKey as GetPublicKeyShared, Params, BundledParams, Response } from '../params';
-import { Type, Static } from '@trezor/schema-utils';
 
 export type GetPublicKey = Static<typeof GetPublicKey>;
 export const GetPublicKey = Type.Intersect([
diff --git a/packages/connect/src/types/api/index.ts b/packages/connect/src/types/api/index.ts
index 0b4de7a08ce..131a38ca99e 100644
--- a/packages/connect/src/types/api/index.ts
+++ b/packages/connect/src/types/api/index.ts
@@ -10,6 +10,7 @@ import { blockchainDisconnect } from './blockchainDisconnect';
 import { blockchainEstimateFee } from './blockchainEstimateFee';
 import { blockchainGetAccountBalanceHistory } from './blockchainGetAccountBalanceHistory';
 import { blockchainGetCurrentFiatRates } from './blockchainGetCurrentFiatRates';
+import { blockchainEvmRpcCall } from './blockchainEvmRpcCall';
 import { blockchainGetFiatRatesForTimestamps } from './blockchainGetFiatRatesForTimestamps';
 import { blockchainGetTransactions } from './blockchainGetTransactions';
 import { blockchainSetCustomBackend } from './blockchainSetCustomBackend';
@@ -27,10 +28,8 @@ import { cardanoSignTransaction } from './cardanoSignTransaction';
 import { changeLanguage } from './changeLanguage';
 import { changePin } from './changePin';
 import { changeWipeCode } from './changeWipeCode';
-import { checkFirmwareAuthenticity } from './checkFirmwareAuthenticity';
 import { cipherKeyValue } from './cipherKeyValue';
 import { composeTransaction } from './composeTransaction';
-import { disableWebUSB } from './disableWebUSB';
 import { dispose } from './dispose';
 import { eosGetPublicKey } from './eosGetPublicKey';
 import { eosSignTransaction } from './eosSignTransaction';
@@ -59,13 +58,11 @@ import { nemSignTransaction } from './nemSignTransaction';
 import { off } from './off';
 import { on } from './on';
 import { pushTransaction } from './pushTransaction';
-import { rebootToBootloader } from './rebootToBootloader';
 import { recoveryDevice } from './recoveryDevice';
 import { removeAllListeners } from './removeAllListeners';
-import { renderWebUSBButton } from './renderWebUSBButton';
 import { requestLogin } from './requestLogin';
-import { requestWebUSBDevice } from './requestWebUSBDevice';
 import { resetDevice } from './resetDevice';
+import { loadDevice } from './loadDevice';
 import { rippleGetAddress } from './rippleGetAddress';
 import { rippleSignTransaction } from './rippleSignTransaction';
 import { setBrightness } from './setBrightness';
@@ -88,265 +85,257 @@ import { verifyMessage } from './verifyMessage';
 import { wipeDevice } from './wipeDevice';
 
 export interface TrezorConnect {
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/applyFlags.md
+    // https://connect.trezor.io/9/methods/device/applyFlags/
     applyFlags: typeof applyFlags;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/applySettings.md
+    // https://connect.trezor.io/9/methods/device/applySettings/
     applySettings: typeof applySettings;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/authenticateDevice.md
+    // https://connect.trezor.io/9/methods/device/authenticateDevice/
     authenticateDevice: typeof authenticateDevice;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/authorizeCoinjoin.md
+    // https://connect.trezor.io/9/methods/bitcoin/authorizeCoinjoin/
     authorizeCoinjoin: typeof authorizeCoinjoin;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/cancelCoinjoinAuthorization.md
+    // https://connect.trezor.io/9/methods/bitcoin/cancelCoinjoinAuthorization/
     cancelCoinjoinAuthorization: typeof cancelCoinjoinAuthorization;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/showDeviceTutorial.md
+    // https://connect.trezor.io/9/methods/device/showDeviceTutorial/
     showDeviceTutorial: typeof showDeviceTutorial;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/backupDevice.md
+    // https://connect.trezor.io/9/methods/device/backupDevice/
     backupDevice: typeof backupDevice;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/binanceGetAddress.md
+    // https://connect.trezor.io/9/methods/binance/binanceGetAddress/
     binanceGetAddress: typeof binanceGetAddress;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/binanceGetPublicKey.md
+    // https://connect.trezor.io/9/methods/binance/binanceGetPublicKey/
     binanceGetPublicKey: typeof binanceGetPublicKey;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/binanceSignTransaction.md
+    // https://connect.trezor.io/9/methods/binance/binanceSignTransaction/
     binanceSignTransaction: typeof binanceSignTransaction;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/blockchainDisconnect.md
+    // todo: link docs
     blockchainDisconnect: typeof blockchainDisconnect;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/blockchainEstimateFee.md
+    // todo: link docs
     blockchainEstimateFee: typeof blockchainEstimateFee;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/blockchainGetAccountBalanceHistory.md
+    // todo: link docs
     blockchainGetAccountBalanceHistory: typeof blockchainGetAccountBalanceHistory;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/blockchainGetCurrentFiatRates.md
+    // todo: link docs
     blockchainGetCurrentFiatRates: typeof blockchainGetCurrentFiatRates;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/blockchainGetFiatRatesForTimestamps.md
+    blockchainEvmRpcCall: typeof blockchainEvmRpcCall;
+
+    // todo: link docs
     blockchainGetFiatRatesForTimestamps: typeof blockchainGetFiatRatesForTimestamps;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/blockchainGetTransactions.md
+    // todo: link docs
     blockchainGetTransactions: typeof blockchainGetTransactions;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/blockchainSetCustomBackend.md
+    // todo: link docs
     blockchainSetCustomBackend: typeof blockchainSetCustomBackend;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/blockchainSubscribe.md
+    // todo: link docs
     blockchainSubscribe: typeof blockchainSubscribe;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/blockchainSubscribeFiatRates.md
+    // todo: link docs
     blockchainSubscribeFiatRates: typeof blockchainSubscribeFiatRates;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/blockchainUnsubscribe.md
+    // todo: link docs
     blockchainUnsubscribe: typeof blockchainUnsubscribe;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/blockchainUnsubscribeFiatRates.md
+    // todo: link docs
     blockchainUnsubscribeFiatRates: typeof blockchainUnsubscribeFiatRates;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/cancel.md
+    // todo: link docs
     cancel: typeof cancel;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/cardanoGetAddress.md
+    // https://connect.trezor.io/9/methods/cardano/cardanoGetAddress/
     cardanoGetAddress: typeof cardanoGetAddress;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/cardanoGetNativeScriptHash.md
+    // https://connect.trezor.io/9/methods/cardano/cardanoGetNativeScriptHash/
     cardanoGetNativeScriptHash: typeof cardanoGetNativeScriptHash;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/cardanoGetPublicKey.md
+    // https://connect.trezor.io/9/methods/cardano/cardanoGetPublicKey/
     cardanoGetPublicKey: typeof cardanoGetPublicKey;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/cardanoSignTransaction.md
+    // https://connect.trezor.io/9/methods/cardano/cardanoSignTransaction/
     cardanoSignTransaction: typeof cardanoSignTransaction;
 
+    // todo: link docs
     cardanoComposeTransaction: typeof cardanoComposeTransaction;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/changeLanguage.md
+    // https://connect.trezor.io/9/methods/device/changeLanguage/
     changeLanguage: typeof changeLanguage;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/changePin.md
+    // https://connect.trezor.io/9/methods/device/changePin/
     changePin: typeof changePin;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/changeWipeCode.md
+    // https://connect.trezor.io/9/methods/device/changeWipeCode/
     changeWipeCode: typeof changeWipeCode;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/cipherKeyValue.md
+    // https://connect.trezor.io/9/methods/other/cipherKeyValue/
     cipherKeyValue: typeof cipherKeyValue;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/composeTransaction.md
+    // https://connect.trezor.io/9/methods/bitcoin/composeTransaction/
     composeTransaction: typeof composeTransaction;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/disableWebUSB.md
-    disableWebUSB: typeof disableWebUSB;
-
-    requestWebUSBDevice: typeof requestWebUSBDevice;
-
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/dispose.md
+    // todo: link docs
     dispose: typeof dispose;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/eosGetPublicKey.md
+    // https://connect.trezor.io/9/methods/eos/eosGetPublicKey/
     eosGetPublicKey: typeof eosGetPublicKey;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/eosSignTransaction.md
+    // https://connect.trezor.io/9/methods/eos/eosSignTransaction/
     eosSignTransaction: typeof eosSignTransaction;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/ethereumGetAddress.md
+    // https://connect.trezor.io/9/methods/ethereum/ethereumGetAddress/
     ethereumGetAddress: typeof ethereumGetAddress;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/ethereumGetPublicKey.md
+    // https://connect.trezor.io/9/methods/ethereum/ethereumGetPublicKey/
     ethereumGetPublicKey: typeof ethereumGetPublicKey;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/ethereumSignMessage.md
+    // https://connect.trezor.io/9/methods/ethereum/ethereumSignMessage/
     ethereumSignMessage: typeof ethereumSignMessage;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/ethereumSignTransaction.md
+    // https://connect.trezor.io/9/methods/ethereum/ethereumSignTransaction/
     ethereumSignTransaction: typeof ethereumSignTransaction;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/ethereumSignTypedData.md
+    // https://connect.trezor.io/9/methods/ethereum/ethereumSignTypedData/
     ethereumSignTypedData: typeof ethereumSignTypedData;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/ethereumVerifyMessage.md
+    // https://connect.trezor.io/9/methods/ethereum/ethereumVerifyMessage/
     ethereumVerifyMessage: typeof ethereumVerifyMessage;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/firmwareUpdate.md
+    // https://connect.trezor.io/9/methods/device/firmwareUpdate/
     firmwareUpdate: typeof firmwareUpdate;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/getAccountDescriptor.md
+    // https://connect.trezor.io/9/methods/other/getAccountDescriptor/
     getAccountDescriptor: typeof getAccountDescriptor;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/getAccountInfo.md
+    // https://connect.trezor.io/9/methods/bitcoin/getAccountInfo/
     getAccountInfo: typeof getAccountInfo;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/getAddress.md
+    // https://connect.trezor.io/9/methods/bitcoin/getAddress/
     getAddress: typeof getAddress;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/getCoinInfo.md
+    // https://connect.trezor.io/9/methods/other/getCoinInfo/
     getCoinInfo: typeof getCoinInfo;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/getDeviceState.md
+    // https://connect.trezor.io/9/methods/device/getDeviceState/
     getDeviceState: typeof getDeviceState;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/getFeatures.md
+    // https://connect.trezor.io/9/methods/device/getFeatures/
     getFeatures: typeof getFeatures;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/getFirmwareHash.md
+    // https://connect.trezor.io/9/methods/device/getFirmwareHash/
     getFirmwareHash: typeof getFirmwareHash;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/getOwnershipId.md
+    // https://connect.trezor.io/9/methods/other/getOwnershipId/
     getOwnershipId: typeof getOwnershipId;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/getOwnershipProof.md
+    // https://connect.trezor.io/9/methods/other/getOwnershipProof/
     getOwnershipProof: typeof getOwnershipProof;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/getPublicKey.md
+    // https://connect.trezor.io/9/methods/bitcoin/getPublicKey/
     getPublicKey: typeof getPublicKey;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/getSettings.md
+    // todo: link docs
     getSettings: typeof getSettings;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/init.md
+    // https://connect.trezor.io/9/methods/other/init/
     init: typeof init;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/manifest.md
+    // https://connect.trezor.io/9/methods/other/manifest/
     manifest: typeof manifest;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/nemGetAddress.md
+    // https://connect.trezor.io/9/methods/nem/nemGetAddress/
     nemGetAddress: typeof nemGetAddress;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/nemSignTransaction.md
+    // https://connect.trezor.io/9/methods/nem/nemSignTransaction/
     nemSignTransaction: typeof nemSignTransaction;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/off.md
+    // todo: link docs
     off: typeof off;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/on.md
+    // todo: link docs
     on: typeof on;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/pushTransaction.md
+    // https://connect.trezor.io/9/methods/bitcoin/pushTransaction/
     pushTransaction: typeof pushTransaction;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/rebootToBootloader.md
-    rebootToBootloader: typeof rebootToBootloader;
-
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/recoveryDevice.md
+    // todo: link docs
     recoveryDevice: typeof recoveryDevice;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/removeAllListeners.md
+    // todo link docs
     removeAllListeners: typeof removeAllListeners;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/renderWebUSBButton.md
-    renderWebUSBButton: typeof renderWebUSBButton;
-
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/requestLogin.md
+    // https://connect.trezor.io/9/methods/other/requestLogin/
     requestLogin: typeof requestLogin;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/resetDevice.md
+    // https://connect.trezor.io/9/methods/device/resetDevice/
     resetDevice: typeof resetDevice;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/rippleGetAddress.md
+    // https://connect.trezor.io/9/methods/device/loadDevice/
+    loadDevice: typeof loadDevice;
+
+    // https://connect.trezor.io/9/methods/ripple/rippleGetAddress/
     rippleGetAddress: typeof rippleGetAddress;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/rippleSignTransaction.md
+    // https://connect.trezor.io/9/methods/ripple/rippleSignTransaction/
     rippleSignTransaction: typeof rippleSignTransaction;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/setBrightness.md
+    // todo: link docs
     setBrightness: typeof setBrightness;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/setBusy.md
+    // https://connect.trezor.io/9/methods/device/setBusy/
     setBusy: typeof setBusy;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/setProxy.md
+    // todo: link docs
     setProxy: typeof setProxy;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/signMessage.md
+    // https://connect.trezor.io/9/methods/bitcoin/signMessage/
     signMessage: typeof signMessage;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/signTransaction.md
+    // https://connect.trezor.io/9/methods/bitcoin/signTransaction/
     signTransaction: typeof signTransaction;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/solanaGetPublicKey.md
+    // https://connect.trezor.io/9/methods/solana/solanaGetPublicKey/
     solanaGetPublicKey: typeof solanaGetPublicKey;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/solanaGetAddress.md
+    // https://connect.trezor.io/9/methods/solana/solanaGetAddress/
     solanaGetAddress: typeof solanaGetAddress;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/solanaSignTransaction.md
+    // https://connect.trezor.io/9/methods/solana/solanaSignTransaction/
     solanaSignTransaction: typeof solanaSignTransaction;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/stellarGetAddress.md
+    // https://connect.trezor.io/9/methods/stellar/stellarGetAddress/
     stellarGetAddress: typeof stellarGetAddress;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/stellarSignTransaction.md
+    // https://connect.trezor.io/9/methods/stellar/stellarSignTransaction/
     stellarSignTransaction: typeof stellarSignTransaction;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/tezosGetAddress.md
+    // https://connect.trezor.io/9/methods/tezos/tezosGetAddress/
     tezosGetAddress: typeof tezosGetAddress;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/tezosGetPublicKey.md
+    // https://connect.trezor.io/9/methods/tezos/tezosGetPublicKey/
     tezosGetPublicKey: typeof tezosGetPublicKey;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/tezosSignTransaction.md
+    // https://connect.trezor.io/9/methods/tezos/tezosSignTransaction/
     tezosSignTransaction: typeof tezosSignTransaction;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/uiResponse.md
+    // todo: link docs
     uiResponse: typeof uiResponse;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/unlockPath.md
+    // https://connect.trezor.io/9/methods/other/unlockPath/
     unlockPath: typeof unlockPath;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/verifyMessage.md
+    // https://connect.trezor.io/9/methods/bitcoin/verifyMessage/
     verifyMessage: typeof verifyMessage;
 
-    // https://github.com/trezor/trezor-suite/blob/develop/docs/packages/connect/methods/wipeDevice.md
+    // https://connect.trezor.io/9/methods/device/wipeDevice/
     wipeDevice: typeof wipeDevice;
-
-    // todo: link docs
-    checkFirmwareAuthenticity: typeof checkFirmwareAuthenticity;
 }
diff --git a/packages/connect/src/types/api/init.ts b/packages/connect/src/types/api/init.ts
index bfd421126fd..25556144701 100644
--- a/packages/connect/src/types/api/init.ts
+++ b/packages/connect/src/types/api/init.ts
@@ -5,6 +5,17 @@
 
 import type { ConnectSettingsPublic, Manifest } from '../settings';
 
-export declare function init(
-    settings: { manifest: Manifest } & Partial<ConnectSettingsPublic>,
+// explicitly don't overlap types
+export type InitFullSettings<ExtraSettingsType extends Record<string, any>> = {
+    manifest: Manifest;
+} & Partial<
+    Omit<ConnectSettingsPublic, 'manifest'> & Omit<ExtraSettingsType, keyof ConnectSettingsPublic>
+>;
+
+export type InitType<ExtraSettingsType extends Record<string, any>> = (
+    settings: InitFullSettings<ExtraSettingsType>,
+) => Promise<void>;
+
+export declare function init<ExtraSettingsType extends Record<string, any>>(
+    settings: InitFullSettings<ExtraSettingsType>,
 ): Promise<void>;
diff --git a/packages/connect/src/types/api/loadDevice.ts b/packages/connect/src/types/api/loadDevice.ts
new file mode 100644
index 00000000000..b0209a6db24
--- /dev/null
+++ b/packages/connect/src/types/api/loadDevice.ts
@@ -0,0 +1,8 @@
+/**
+ * Performs device setup and generates a new seed.
+ */
+
+import { PROTO } from '../../constants';
+import type { Params, Response } from '../params';
+
+export declare function loadDevice(params: Params<PROTO.LoadDevice>): Response<PROTO.Success>;
diff --git a/packages/connect/src/types/api/nem/index.ts b/packages/connect/src/types/api/nem/index.ts
index 4aac576f3ea..56b13a9f8e7 100644
--- a/packages/connect/src/types/api/nem/index.ts
+++ b/packages/connect/src/types/api/nem/index.ts
@@ -1,6 +1,7 @@
+import { Type, Static } from '@trezor/schema-utils';
+
 import { PROTO, NEM } from '../../../constants';
 import { DerivationPath } from '../../params';
-import { Type, Static } from '@trezor/schema-utils';
 
 // NEM types from nem-sdk
 // https://nemproject.github.io/#transferTransaction
diff --git a/packages/connect/src/types/api/nemGetAddress.ts b/packages/connect/src/types/api/nemGetAddress.ts
index 9c4c25041b5..80d10b409e0 100644
--- a/packages/connect/src/types/api/nemGetAddress.ts
+++ b/packages/connect/src/types/api/nemGetAddress.ts
@@ -1,4 +1,5 @@
 import { Static, Type } from '@trezor/schema-utils';
+
 import { GetAddress, Address, Params, BundledParams, Response } from '../params';
 
 export type NEMGetAddress = Static<typeof NEMGetAddress>;
diff --git a/packages/connect/src/types/api/pushTransaction.ts b/packages/connect/src/types/api/pushTransaction.ts
index f62a9abaf76..aa991098b95 100644
--- a/packages/connect/src/types/api/pushTransaction.ts
+++ b/packages/connect/src/types/api/pushTransaction.ts
@@ -3,6 +3,7 @@
  * Broadcasts the transaction to the selected network.
  */
 import { Static, Type } from '@trezor/schema-utils';
+
 import type { Params, Response } from '../params';
 
 export type PushTransaction = Static<typeof PushTransaction>;
diff --git a/packages/connect/src/types/api/rebootToBootloader.ts b/packages/connect/src/types/api/rebootToBootloader.ts
deleted file mode 100644
index 855b9d467bc..00000000000
--- a/packages/connect/src/types/api/rebootToBootloader.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Reboots device (currently only T1B1 with fw >= 1.10.0) in bootloader mode
- */
-
-import type { PROTO } from '../../constants';
-import type { Params, Response } from '../params';
-
-export declare function rebootToBootloader(
-    params?: Params<PROTO.RebootToBootloader>,
-): Response<PROTO.Success>;
diff --git a/packages/connect/src/types/api/recoveryDevice.ts b/packages/connect/src/types/api/recoveryDevice.ts
index e1cd1350607..1316f77ca99 100644
--- a/packages/connect/src/types/api/recoveryDevice.ts
+++ b/packages/connect/src/types/api/recoveryDevice.ts
@@ -3,6 +3,7 @@
  */
 
 import { Static, Type } from '@trezor/schema-utils';
+
 import { PROTO } from '../../constants';
 import type { Params, Response } from '../params';
 
diff --git a/packages/connect/src/types/api/requestLogin.ts b/packages/connect/src/types/api/requestLogin.ts
index f5acbd76a8b..ba6acf441e8 100644
--- a/packages/connect/src/types/api/requestLogin.ts
+++ b/packages/connect/src/types/api/requestLogin.ts
@@ -6,6 +6,7 @@
  */
 
 import { Static, Type } from '@trezor/schema-utils';
+
 import type { Params, Response } from '../params';
 
 export type LoginChallenge = Static<typeof LoginChallenge>;
diff --git a/packages/connect/src/types/api/ripple/index.ts b/packages/connect/src/types/api/ripple/index.ts
index fa9d3955344..6ccf8d4f524 100644
--- a/packages/connect/src/types/api/ripple/index.ts
+++ b/packages/connect/src/types/api/ripple/index.ts
@@ -1,6 +1,7 @@
-import { DerivationPath } from '../../params';
 import { Type, Static } from '@trezor/schema-utils';
 
+import { DerivationPath } from '../../params';
+
 export type RipplePayment = Static<typeof RipplePayment>;
 export const RipplePayment = Type.Object({
     amount: Type.String(),
diff --git a/packages/connect/src/types/api/solana/index.ts b/packages/connect/src/types/api/solana/index.ts
index 1e9e5d2b1a2..f1498e78359 100644
--- a/packages/connect/src/types/api/solana/index.ts
+++ b/packages/connect/src/types/api/solana/index.ts
@@ -1,6 +1,7 @@
-import { PublicKey } from '../../params';
 import { Type, Static } from '@trezor/schema-utils';
 
+import { PublicKey } from '../../params';
+
 // solanaGetPublicKey
 
 export type SolanaPublicKey = Static<typeof SolanaPublicKey>;
diff --git a/packages/connect/src/types/api/stellar/index.ts b/packages/connect/src/types/api/stellar/index.ts
index bf26040150c..33247e2f72b 100644
--- a/packages/connect/src/types/api/stellar/index.ts
+++ b/packages/connect/src/types/api/stellar/index.ts
@@ -1,9 +1,10 @@
 // Stellar types from stellar-sdk
 // https://github.com/stellar/js-stellar-base
 
+import { Type, Static } from '@trezor/schema-utils';
+
 import { PROTO } from '../../../constants';
 import { DerivationPath } from '../../params';
-import { Type, Static } from '@trezor/schema-utils';
 
 export type StellarAsset = Static<typeof StellarAsset>;
 export const StellarAsset = Type.Object({
diff --git a/packages/connect/src/types/api/stellarSignTransaction.ts b/packages/connect/src/types/api/stellarSignTransaction.ts
index 2771aa9b106..19931f1b77c 100644
--- a/packages/connect/src/types/api/stellarSignTransaction.ts
+++ b/packages/connect/src/types/api/stellarSignTransaction.ts
@@ -1,5 +1,4 @@
 import type { Params, Response } from '../params';
-
 // todo:maybe we could unify terminology SignTransaction vs SignTx (across all methods)
 import type { StellarSignTransaction, StellarSignedTx } from './stellar';
 
diff --git a/packages/connect/src/types/api/tezos/index.ts b/packages/connect/src/types/api/tezos/index.ts
index 4f50db8e2d7..7630a640a34 100644
--- a/packages/connect/src/types/api/tezos/index.ts
+++ b/packages/connect/src/types/api/tezos/index.ts
@@ -1,6 +1,7 @@
-import { DerivationPath } from '../../params';
 import { Type, Static } from '@trezor/schema-utils';
 
+import { DerivationPath } from '../../params';
+
 export type TezosRevealOperation = Static<typeof TezosRevealOperation>;
 export const TezosRevealOperation = Type.Object({
     source: Type.String(),
diff --git a/packages/connect/src/types/api/unlockPath.ts b/packages/connect/src/types/api/unlockPath.ts
index 9e83ed30a5b..705648e71d3 100644
--- a/packages/connect/src/types/api/unlockPath.ts
+++ b/packages/connect/src/types/api/unlockPath.ts
@@ -1,4 +1,5 @@
 import { Static, Type } from '@trezor/schema-utils';
+
 import { Params, Response, DerivationPath } from '../params';
 import type { PROTO } from '../../constants';
 
diff --git a/packages/connect/src/types/coinInfo.ts b/packages/connect/src/types/coinInfo.ts
index f7afdf736d7..933d67595a5 100644
--- a/packages/connect/src/types/coinInfo.ts
+++ b/packages/connect/src/types/coinInfo.ts
@@ -1,4 +1,5 @@
 import { Type, Static } from '@trezor/schema-utils';
+
 import { FeeLevel } from './fees';
 import { DeviceModelInternal } from './device';
 
diff --git a/packages/connect/src/types/device.ts b/packages/connect/src/types/device.ts
index d1d4737d7e1..405a9c2a477 100644
--- a/packages/connect/src/types/device.ts
+++ b/packages/connect/src/types/device.ts
@@ -1,3 +1,5 @@
+import { Descriptor } from '@trezor/transport';
+
 import type { PROTO } from '../constants';
 import type { ReleaseInfo } from './firmware';
 
@@ -35,6 +37,7 @@ export type DeviceState = {
     sessionId?: string; // dynamic value: Features.session_id
     // ${first testnet address}@${device.features.device_id}:${device.instance}
     staticSessionId?: StaticSessionId;
+    deriveCardano?: boolean;
 };
 
 // NOTE: unavailableCapabilities is an object with information what is NOT supported by this device.
@@ -55,17 +58,33 @@ export type FirmwareRevisionCheckResult =
           error: FirmwareRevisionCheckError;
       };
 
-export type KnownDevice = {
+export type FirmwareHashCheckError =
+    | 'hash-mismatch'
+    | 'check-skipped'
+    | 'check-unsupported'
+    | 'unknown-release'
+    | 'other-error';
+export type FirmwareHashCheckResult =
+    | { success: true }
+    | { success: false; error: FirmwareHashCheckError };
+
+export type DeviceUniquePath = string & { __type: 'DeviceUniquePath' };
+export const DeviceUniquePath = (id: string) => id as DeviceUniquePath;
+
+type BaseDevice = {
+    path: DeviceUniquePath;
+    name: string;
+};
+
+export type KnownDevice = BaseDevice & {
     type: 'acquired';
     id: string | null;
-    path: string;
     /** @deprecated, use features.label instead */
     label: string;
     error?: typeof undefined;
     firmware: DeviceFirmwareStatus;
     firmwareRelease?: ReleaseInfo | null;
     firmwareType?: FirmwareType;
-    name: string;
     color?: string;
     status: DeviceStatus;
     mode: DeviceMode;
@@ -76,23 +95,23 @@ export type KnownDevice = {
     availableTranslations: string[];
     authenticityChecks?: {
         firmwareRevision: FirmwareRevisionCheckResult | null;
-        // Maybe add FirmwareHashCheck result here?
+        firmwareHash: FirmwareHashCheckResult | null;
         // Maybe add AuthenticityCheck result here?
     };
+    transportSessionOwner?: undefined;
+    transportDescriptorType?: typeof undefined;
 };
 
-export type UnknownDevice = {
+export type UnknownDevice = BaseDevice & {
     type: 'unacquired';
-    id?: null;
-    path: string;
     /** @deprecated, use features.label instead */
-    label: string;
+    label: 'Unacquired device';
+    id?: typeof undefined;
     error?: typeof undefined;
     features?: typeof undefined;
     firmware?: typeof undefined;
     firmwareRelease?: typeof undefined;
     firmwareType?: typeof undefined;
-    name: string;
     color?: typeof undefined;
     status?: typeof undefined;
     mode?: typeof undefined;
@@ -100,20 +119,20 @@ export type UnknownDevice = {
     state?: typeof undefined;
     unavailableCapabilities?: typeof undefined;
     availableTranslations?: typeof undefined;
+    transportSessionOwner?: string;
+    transportDescriptorType?: typeof undefined;
 };
 
-export type UnreadableDevice = {
+export type UnreadableDevice = BaseDevice & {
     type: 'unreadable';
-    id?: null;
-    path: string;
     /** @deprecated, use features.label instead */
-    label: string;
+    label: 'Unreadable device';
     error: string;
+    id?: typeof undefined;
     features?: typeof undefined;
     firmware?: typeof undefined;
     firmwareRelease?: typeof undefined;
     firmwareType?: typeof undefined;
-    name: string;
     color?: typeof undefined;
     status?: typeof undefined;
     mode?: typeof undefined;
@@ -121,6 +140,8 @@ export type UnreadableDevice = {
     state?: typeof undefined;
     unavailableCapabilities?: typeof undefined;
     availableTranslations?: typeof undefined;
+    transportSessionOwner?: undefined;
+    transportDescriptorType: Descriptor['type'];
 };
 
 export type Device = KnownDevice | UnknownDevice | UnreadableDevice;
diff --git a/packages/connect/src/types/params.ts b/packages/connect/src/types/params.ts
index 22ad6d7455c..21b86638679 100644
--- a/packages/connect/src/types/params.ts
+++ b/packages/connect/src/types/params.ts
@@ -1,17 +1,18 @@
 // API params
 
 import { Type, TSchema, Static } from '@trezor/schema-utils';
-import { DeviceState } from './device';
+
+import { DeviceState, DeviceUniquePath } from './device';
 import { ErrorCode } from '../constants/errors';
 
 export interface DeviceIdentity {
-    path?: string;
-    state?: string | DeviceState;
+    path?: DeviceUniquePath;
+    state?: DeviceState;
     instance?: number;
 }
 
 export interface CommonParams {
-    device?: DeviceIdentity;
+    device?: DeviceIdentity & { state?: DeviceState | string }; // Note: state as string should be removed https://github.com/trezor/trezor-suite/issues/12710
     useEmptyPassphrase?: boolean;
     useEventListener?: boolean; // this param is set automatically in factory
     allowSeedlessDevice?: boolean;
@@ -20,6 +21,11 @@ export interface CommonParams {
     skipFinalReload?: boolean;
     useCardanoDerivation?: boolean;
     chunkify?: boolean;
+    /**
+     * internal flag. if set to true, call will only return info about the method, not execute it.
+     * todo: this should be moved to another argument instead of mixing this with params
+     */
+    __info?: boolean;
 }
 
 export type Params<T> = CommonParams & T & { bundle?: undefined };
diff --git a/packages/connect/src/types/settings.ts b/packages/connect/src/types/settings.ts
index 842b2fdbe66..867cc44f6a9 100644
--- a/packages/connect/src/types/settings.ts
+++ b/packages/connect/src/types/settings.ts
@@ -13,27 +13,22 @@ export interface ConnectSettingsPublic {
     manifest?: Manifest;
     connectSrc?: string;
     debug?: boolean;
-    hostLabel?: string;
-    hostIcon?: string;
     popup?: boolean;
     transportReconnect?: boolean;
-    webusb?: boolean; // deprecated
     transports?: (Transport['name'] | Transport | (new (...args: any[]) => Transport))[];
     pendingTransportEvent?: boolean;
     lazyLoad?: boolean;
     interactionTimeout?: number;
     trustedHost: boolean;
-    coreMode?: 'auto' | 'popup' | 'iframe';
-    /* _extendWebextensionLifetime features makes the service worker in @trezor/connect-webextension stay alive longer */
-    _extendWebextensionLifetime?: boolean;
     /**
      * for internal use only!
      * in some exotic setups (suite-web where iframe is embedded locally), you might need to tell connect where it should search for sessions background shared-worker
      */
-    _sessionsBackgroundUrl?: string;
-    deeplinkOpen?: (url: string) => void;
-    deeplinkCallbackUrl?: string;
-    deeplinkUrl?: string;
+    _sessionsBackgroundUrl?: null | string;
+    // URL for binary files such as firmware, may be local or remote
+    binFilesBaseUrl?: string;
+    // enable firmware hash check automatically when device connects. Requires binFilesBaseUrl to be set.
+    enableFirmwareHashCheck?: boolean;
 }
 
 // internal part, not to be accepted from .init()
@@ -53,4 +48,23 @@ export interface ConnectSettingsInternal {
     useCoreInPopup?: boolean;
 }
 
-export type ConnectSettings = ConnectSettingsPublic & ConnectSettingsInternal;
+export interface ConnectSettingsWeb {
+    hostLabel?: string;
+    hostIcon?: string;
+    coreMode?: 'auto' | 'popup' | 'iframe' | 'deeplink';
+}
+export interface ConnectSettingsWebextension {
+    /** _extendWebextensionLifetime features makes the service worker in @trezor/connect-webextension stay alive longer */
+    _extendWebextensionLifetime?: boolean;
+}
+export interface ConnectSettingsMobile {
+    deeplinkUrl: string;
+    deeplinkOpen?: (url: string) => void;
+    deeplinkCallbackUrl?: string;
+}
+
+export type ConnectSettings = ConnectSettingsPublic &
+    ConnectSettingsInternal &
+    ConnectSettingsWeb &
+    ConnectSettingsWebextension &
+    ConnectSettingsMobile;
diff --git a/packages/connect/src/types/utils.ts b/packages/connect/src/types/utils.ts
index f2f63f42afb..0c0a70d8631 100644
--- a/packages/connect/src/types/utils.ts
+++ b/packages/connect/src/types/utils.ts
@@ -18,3 +18,6 @@ export type MessageFactoryFn<Group, Event> = UnionToIntersection<
               ) => { event: Group; type: Event['type']; payload: undefined }
         : never
 >;
+
+export const typedObjectKeys = <T extends Record<any, any>>(obj: T): Array<keyof T> =>
+    Object.keys(obj) as Array<keyof T>;
diff --git a/packages/connect/src/utils/__fixtures__/accountUtils.ts b/packages/connect/src/utils/__fixtures__/accountUtils.ts
index bb875aacee5..367b60e0154 100644
--- a/packages/connect/src/utils/__fixtures__/accountUtils.ts
+++ b/packages/connect/src/utils/__fixtures__/accountUtils.ts
@@ -2,7 +2,6 @@ import coinsJSON from '@trezor/connect-common/files/coins.json';
 import coinsJSONEth from '@trezor/connect-common/files/coins-eth.json';
 
 import { getAccountLabel, isUtxoBased } from '../accountUtils';
-
 import {
     parseCoinsJson,
     getBitcoinNetwork,
diff --git a/packages/connect/src/utils/__fixtures__/ethereumUtils.ts b/packages/connect/src/utils/__fixtures__/ethereumUtils.ts
index d796759e323..cb2e164f79d 100644
--- a/packages/connect/src/utils/__fixtures__/ethereumUtils.ts
+++ b/packages/connect/src/utils/__fixtures__/ethereumUtils.ts
@@ -2,7 +2,6 @@ import coinsJSON from '@trezor/connect-common/files/coins.json';
 import coinsJSONEth from '@trezor/connect-common/files/coins-eth.json';
 
 import { getNetworkLabel } from '../ethereumUtils';
-
 import { parseCoinsJson, getEthereumNetwork } from '../../data/coinInfo';
 
 parseCoinsJson({
diff --git a/packages/connect/src/utils/__fixtures__/formatUtils.ts b/packages/connect/src/utils/__fixtures__/formatUtils.ts
index 52d9a6fd123..1bcab841b21 100644
--- a/packages/connect/src/utils/__fixtures__/formatUtils.ts
+++ b/packages/connect/src/utils/__fixtures__/formatUtils.ts
@@ -1,7 +1,6 @@
 import coinsJSON from '@trezor/connect-common/files/coins.json';
 
 import { formatAmount } from '../formatUtils';
-
 import { parseCoinsJson, getBitcoinNetwork } from '../../data/coinInfo';
 
 parseCoinsJson(coinsJSON);
diff --git a/packages/connect/src/utils/__tests__/accountUtils.test.ts b/packages/connect/src/utils/__tests__/accountUtils.test.ts
index 52293b79030..6136ef991a1 100644
--- a/packages/connect/src/utils/__tests__/accountUtils.test.ts
+++ b/packages/connect/src/utils/__tests__/accountUtils.test.ts
@@ -1,5 +1,4 @@
 import { getAccountLabel, isUtxoBased } from '../accountUtils';
-
 import * as fixtures from '../__fixtures__/accountUtils';
 
 describe('utils/accountUtils', () => {
@@ -20,6 +19,5 @@ describe('utils/accountUtils', () => {
 
     // todo:
     describe.skip('getAccountAddressN', () => {});
-    describe.skip('getAccountLabel', () => {});
     describe.skip('getPublicKeyLabel', () => {});
 });
diff --git a/packages/connect/src/utils/__tests__/addressUtils.test.ts b/packages/connect/src/utils/__tests__/addressUtils.test.ts
index 392d87fb38f..2676b5e00d4 100644
--- a/packages/connect/src/utils/__tests__/addressUtils.test.ts
+++ b/packages/connect/src/utils/__tests__/addressUtils.test.ts
@@ -1,4 +1,5 @@
 import coinsJSON from '@trezor/connect-common/files/coins.json';
+
 import { parseCoinsJson, getBitcoinNetwork } from '../../data/coinInfo';
 import * as utils from '../addressUtils';
 import * as fixtures from '../__fixtures__/addressUtils';
diff --git a/packages/connect/src/utils/__tests__/deviceFeaturesUtils.test.ts b/packages/connect/src/utils/__tests__/deviceFeaturesUtils.test.ts
index 6ea27f6dd3e..7340ea089c5 100644
--- a/packages/connect/src/utils/__tests__/deviceFeaturesUtils.test.ts
+++ b/packages/connect/src/utils/__tests__/deviceFeaturesUtils.test.ts
@@ -2,7 +2,6 @@ import coinsJSON from '@trezor/connect-common/files/coins.json';
 import coinsJSONEth from '@trezor/connect-common/files/coins-eth.json';
 
 import { parseCoinsJson, getAllNetworks } from '../../data/coinInfo';
-
 import {
     getUnavailableCapabilities,
     parseCapabilities,
@@ -118,16 +117,16 @@ describe('utils/deviceFeaturesUtils', () => {
         const featT2B1 = {
             major_version: 2,
             minor_version: 6,
-            patch_version: 1,
+            patch_version: 2,
             capabilities: undefined,
             internal_model: DeviceModelInternal.T2B1,
         } as unknown as Features;
         featT2B1.capabilities = parseCapabilities(featT2B1);
 
         it('default T1B1', () => {
-            const coins = getAllNetworks();
+            const coins2 = getAllNetworks();
 
-            expect(getUnavailableCapabilities(featT1B1, coins)).toEqual({
+            expect(getUnavailableCapabilities(featT1B1, coins2)).toEqual({
                 ada: 'no-support',
                 tada: 'no-support',
                 bnb: 'update-required',
@@ -135,6 +134,7 @@ describe('utils/deviceFeaturesUtils', () => {
                 eos: 'no-support',
                 maid: 'no-capability',
                 pol: 'update-required',
+                op: 'update-required',
                 omni: 'no-capability',
                 ppc: 'update-required',
                 sol: 'no-support',
@@ -165,9 +165,9 @@ describe('utils/deviceFeaturesUtils', () => {
         });
 
         it('default T2T1', () => {
-            const coins = getAllNetworks();
+            const coins2 = getAllNetworks();
 
-            expect(getUnavailableCapabilities(featT2T1, coins)).toEqual({
+            expect(getUnavailableCapabilities(featT2T1, coins2)).toEqual({
                 replaceTransaction: 'update-required',
                 amountUnit: 'update-required',
                 bnb: 'update-required',
@@ -176,6 +176,7 @@ describe('utils/deviceFeaturesUtils', () => {
                 'eip712-domain-only': 'update-required',
                 maid: 'no-capability',
                 pol: 'update-required',
+                op: 'update-required',
                 omni: 'no-capability',
                 taproot: 'update-required',
                 tsep: 'update-required',
@@ -191,9 +192,9 @@ describe('utils/deviceFeaturesUtils', () => {
         });
 
         it('default T2B1', () => {
-            const coins = getAllNetworks();
+            const coins2 = getAllNetworks();
 
-            expect(getUnavailableCapabilities(featT2B1, coins)).toEqual({
+            expect(getUnavailableCapabilities(featT2B1, coins2)).toEqual({
                 breeze: 'no-support',
                 btg: 'no-support',
                 tbtg: 'no-support',
@@ -221,53 +222,57 @@ describe('utils/deviceFeaturesUtils', () => {
             });
         });
 
-        it('T2T1 update-required', done => {
-            jest.resetModules();
-
-            jest.mock('../../data/config', () => ({
-                __esModule: true,
-                config: {
-                    supportedFirmware: [
-                        {
-                            min: { T1B1: '0', T2T1: '2.99.99' },
-                            capabilities: ['newCapabilityOrFeature'],
-                        },
-                    ],
-                },
-            }));
-
-            import('../deviceFeaturesUtils').then(({ getUnavailableCapabilities }) => {
-                // added new capability
-                expect(getUnavailableCapabilities(featT2T1, coins)).toEqual({
-                    newCapabilityOrFeature: 'update-required',
+        it('T2T1 update-required', () =>
+            new Promise<void>(done => {
+                jest.resetModules();
+
+                jest.mock('../../data/config', () => ({
+                    __esModule: true,
+                    config: {
+                        supportedFirmware: [
+                            {
+                                min: { T1B1: '0', T2T1: '2.99.99' },
+                                capabilities: ['newCapabilityOrFeature'],
+                            },
+                        ],
+                    },
+                }));
+
+                // eslint-disable-next-line @typescript-eslint/no-shadow
+                import('../deviceFeaturesUtils').then(({ getUnavailableCapabilities }) => {
+                    // added new capability
+                    expect(getUnavailableCapabilities(featT2T1, coins)).toEqual({
+                        newCapabilityOrFeature: 'update-required',
+                    });
+                    done();
                 });
-                done();
-            });
-        });
-
-        it('T2T1 no-support', done => {
-            jest.resetModules();
-
-            jest.mock('../../data/config', () => ({
-                __esModule: true,
-                config: {
-                    supportedFirmware: [
-                        {
-                            min: { T1B1: '0', T2T1: '0' },
-                            capabilities: ['newCapabilityOrFeature'],
-                        },
-                    ],
-                },
             }));
 
-            import('../deviceFeaturesUtils').then(({ getUnavailableCapabilities }) => {
-                // added new capability
-                expect(getUnavailableCapabilities(featT2T1, coins)).toEqual({
-                    newCapabilityOrFeature: 'no-support',
+        it('T2T1 no-support', () =>
+            new Promise<void>(done => {
+                jest.resetModules();
+
+                jest.mock('../../data/config', () => ({
+                    __esModule: true,
+                    config: {
+                        supportedFirmware: [
+                            {
+                                min: { T1B1: '0', T2T1: '0' },
+                                capabilities: ['newCapabilityOrFeature'],
+                            },
+                        ],
+                    },
+                }));
+
+                // eslint-disable-next-line @typescript-eslint/no-shadow
+                import('../deviceFeaturesUtils').then(({ getUnavailableCapabilities }) => {
+                    // added new capability
+                    expect(getUnavailableCapabilities(featT2T1, coins)).toEqual({
+                        newCapabilityOrFeature: 'no-support',
+                    });
+                    done();
                 });
-                done();
-            });
-        });
+            }));
 
         it('handles duplicated shortcuts correctly, ', () => {
             const customCoins = [
diff --git a/packages/connect/src/utils/__tests__/ethereumUtils.test.ts b/packages/connect/src/utils/__tests__/ethereumUtils.test.ts
index b2b628f5594..4d9eff7f02c 100644
--- a/packages/connect/src/utils/__tests__/ethereumUtils.test.ts
+++ b/packages/connect/src/utils/__tests__/ethereumUtils.test.ts
@@ -1,5 +1,4 @@
 import { getNetworkLabel } from '../ethereumUtils';
-
 import * as fixtures from '../__fixtures__/ethereumUtils';
 
 describe('utils/ethereumUtils', () => {
diff --git a/packages/connect/src/utils/__tests__/formatUtils.test.ts b/packages/connect/src/utils/__tests__/formatUtils.test.ts
index a37413155c5..5d9d24ecbc7 100644
--- a/packages/connect/src/utils/__tests__/formatUtils.test.ts
+++ b/packages/connect/src/utils/__tests__/formatUtils.test.ts
@@ -1,5 +1,4 @@
 import { formatAmount } from '../formatUtils';
-
 import * as fixtures from '../__fixtures__/formatUtils';
 
 describe('utils/formatUtils', () => {
diff --git a/packages/connect/src/utils/addressUtils.ts b/packages/connect/src/utils/addressUtils.ts
index 7355dc8a2f6..339ff1f4672 100644
--- a/packages/connect/src/utils/addressUtils.ts
+++ b/packages/connect/src/utils/addressUtils.ts
@@ -1,6 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/utils/addressUtils.js
 
 import { address as BitcoinJSAddress } from '@trezor/utxo-lib';
+
 import type { BitcoinNetworkInfo } from '../types';
 
 // Base58
@@ -10,7 +11,7 @@ const isValidBase58Address = (address: string, network: BitcoinNetworkInfo['netw
         if (decoded.version !== network.pubKeyHash && decoded.version !== network.scriptHash) {
             return false;
         }
-    } catch (e) {
+    } catch {
         return false;
     }
 
@@ -24,7 +25,7 @@ const isValidBech32Address = (address: string, network: BitcoinNetworkInfo['netw
         if (decoded.prefix !== network.bech32) {
             return false;
         }
-    } catch (e) {
+    } catch {
         return false;
     }
 
diff --git a/packages/connect/src/utils/assetUtils.ts b/packages/connect/src/utils/assetUtils.ts
index be07387c59b..1a6b182bc47 100644
--- a/packages/connect/src/utils/assetUtils.ts
+++ b/packages/connect/src/utils/assetUtils.ts
@@ -1,8 +1,9 @@
+import { isArrayMember } from '@trezor/utils';
+
 import { DeviceModelInternal } from '../types';
 
-const isDeviceModel = (model: string): model is DeviceModelInternal => {
-    return Object.values(DeviceModelInternal).includes(model as DeviceModelInternal);
-};
+const isDeviceModel = (model: string): model is DeviceModelInternal =>
+    isArrayMember(model, Object.values(DeviceModelInternal));
 
 const firmwareAssets: Record<DeviceModelInternal, NodeRequire> = {
     [DeviceModelInternal.T1B1]: require('@trezor/connect-common/files/firmware/t1b1/releases.json'),
@@ -10,9 +11,10 @@ const firmwareAssets: Record<DeviceModelInternal, NodeRequire> = {
     [DeviceModelInternal.T2B1]: require('@trezor/connect-common/files/firmware/t2b1/releases.json'),
     [DeviceModelInternal.T3B1]: require('@trezor/connect-common/files/firmware/t3b1/releases.json'),
     [DeviceModelInternal.T3T1]: require('@trezor/connect-common/files/firmware/t3t1/releases.json'),
+    [DeviceModelInternal.T3W1]: require('@trezor/connect-common/files/firmware/t3w1/releases.json'),
 };
 
-export const getAssetByUrl = (url: string) => {
+export const tryLocalAssetRequire = (url: string) => {
     const fileUrl = url.split('?')[0];
 
     switch (fileUrl) {
diff --git a/packages/connect/src/utils/assets.native.ts b/packages/connect/src/utils/assets.native.ts
index f0bac432de7..d5564403e9d 100644
--- a/packages/connect/src/utils/assets.native.ts
+++ b/packages/connect/src/utils/assets.native.ts
@@ -1,3 +1,3 @@
-import { getAssetByUrl } from './assetUtils';
+import { tryLocalAssetRequire } from './assetUtils';
 
-export const httpRequest = (url: string, _type: string): any => getAssetByUrl(url);
+export const httpRequest = (url: string, _type: string): any => tryLocalAssetRequire(url);
diff --git a/packages/connect/src/utils/assets.ts b/packages/connect/src/utils/assets.ts
index 2439e3ab2e3..457970ada86 100644
--- a/packages/connect/src/utils/assets.ts
+++ b/packages/connect/src/utils/assets.ts
@@ -2,8 +2,9 @@
 
 import fetch from 'cross-fetch';
 import { promises as fs } from 'fs';
+
 import { httpRequest as browserHttpRequest } from './assets-browser';
-import { getAssetByUrl } from './assetUtils';
+import { tryLocalAssetRequire } from './assetUtils';
 
 if (global && typeof global.fetch !== 'function') {
     global.fetch = fetch;
@@ -36,7 +37,7 @@ export function httpRequest(
     options?: RequestInit,
     skipLocalForceDownload?: boolean,
 ) {
-    const asset = skipLocalForceDownload ? null : getAssetByUrl(url);
+    const asset = skipLocalForceDownload ? null : tryLocalAssetRequire(url);
 
     if (!asset) {
         return /^https?/.test(url) ? browserHttpRequest(url, type, options) : fs.readFile(url);
diff --git a/packages/connect/src/utils/deviceFeaturesUtils.ts b/packages/connect/src/utils/deviceFeaturesUtils.ts
index 56668275b10..a110c86c500 100644
--- a/packages/connect/src/utils/deviceFeaturesUtils.ts
+++ b/packages/connect/src/utils/deviceFeaturesUtils.ts
@@ -1,4 +1,5 @@
-import { versionUtils } from '@trezor/utils';
+import { isArrayMember, versionUtils } from '@trezor/utils';
+
 import { PROTO } from '../constants';
 import { config } from '../data/config';
 import { Features, CoinInfo, UnavailableCapabilities, DeviceModelInternal } from '../types';
@@ -63,7 +64,7 @@ export const getUnavailableCapabilities = (features: Features, coins: CoinInfo[]
             } else {
                 const occurrences = coins.filter(coin => shortcut == coin.shortcut.toLowerCase());
                 const allUnsupported = occurrences.every(
-                    info => !info.support || info.support[key] === false,
+                    info2 => !info2.support || info2.support[key] === false,
                 );
 
                 if (allUnsupported) {
@@ -106,7 +107,7 @@ export const getUnavailableCapabilities = (features: Features, coins: CoinInfo[]
             return !capabilities.includes('Capability_Solana');
         }
 
-        return !capabilities.includes(`Capability_${info.name}` as PROTO.Capability);
+        return !isArrayMember(`Capability_${info.name}`, capabilities);
     });
 
     // add unavailable coins to list
@@ -128,7 +129,7 @@ export const getUnavailableCapabilities = (features: Features, coins: CoinInfo[]
     // 4. check if firmware version is in range of capabilities in "config.supportedFirmware"
     config.supportedFirmware.forEach(s => {
         if (!s.capabilities) return;
-        const min = s.min ? s.min[key] : null;
+        const min = s.min ? (s.min as Record<DeviceModelInternal, string | undefined>)[key] : null;
         const max = s.max ? s.max[key] : null;
         if (min && (min === '0' || versionUtils.isNewer(min, fw))) {
             const value = min === '0' ? 'no-support' : 'update-required';
diff --git a/packages/connect/src/utils/firmwareUtils.ts b/packages/connect/src/utils/firmwareUtils.ts
index 73d82126e05..85a7656fccf 100644
--- a/packages/connect/src/utils/firmwareUtils.ts
+++ b/packages/connect/src/utils/firmwareUtils.ts
@@ -1,4 +1,5 @@
 import { versionUtils } from '@trezor/utils';
+
 import type { Features, StrictFeatures, FirmwareRelease, VersionArray } from '../types';
 
 export const isStrictFeatures = (extFeatures: Features): extFeatures is StrictFeatures =>
diff --git a/packages/connect/src/utils/formatUtils.ts b/packages/connect/src/utils/formatUtils.ts
index 47d92ae34f5..dce493ca259 100644
--- a/packages/connect/src/utils/formatUtils.ts
+++ b/packages/connect/src/utils/formatUtils.ts
@@ -1,6 +1,7 @@
 // origin: https://github.com/trezor/connect/blob/develop/src/js/utils/formatUtils.js
 
 import { BigNumber } from '@trezor/utils/src/bigNumber';
+
 import type { CoinInfo } from '../types';
 
 export const formatAmount = (n: string, coinInfo: CoinInfo) =>
diff --git a/packages/connect/src/utils/hdnodeUtils.ts b/packages/connect/src/utils/hdnodeUtils.ts
index 6f4b29f5067..87a4c2e92b5 100644
--- a/packages/connect/src/utils/hdnodeUtils.ts
+++ b/packages/connect/src/utils/hdnodeUtils.ts
@@ -2,6 +2,7 @@
 
 import { bip32 } from '@trezor/utxo-lib';
 import type { Network, BIP32Interface } from '@trezor/utxo-lib';
+
 import { PROTO, ERRORS } from '../constants';
 
 const pubNode2bjsNode = (node: PROTO.HDNodeType, network?: Network) => {
diff --git a/packages/connect-web/src/utils/proxy-event-emitter.ts b/packages/connect/src/utils/proxy-event-emitter.ts
similarity index 97%
rename from packages/connect-web/src/utils/proxy-event-emitter.ts
rename to packages/connect/src/utils/proxy-event-emitter.ts
index 77c0ea2b036..ad92f7b3728 100644
--- a/packages/connect-web/src/utils/proxy-event-emitter.ts
+++ b/packages/connect/src/utils/proxy-event-emitter.ts
@@ -4,7 +4,7 @@ import EventEmitter from 'events';
  * ProxyEventEmitter is an EventEmitter that allows to use multiple EventEmitters as one
  * This is used in connect-web to allow switching between iframe and core-in-popup implementations
  */
-export default class ProxyEventEmitter implements EventEmitter {
+export class ProxyEventEmitter implements EventEmitter {
     private eventEmitters: EventEmitter[];
 
     constructor(eventEmitters: EventEmitter[]) {
diff --git a/packages/connect/src/utils/uiPromiseManager.ts b/packages/connect/src/utils/uiPromiseManager.ts
index b80349afcb8..18c73e37b68 100644
--- a/packages/connect/src/utils/uiPromiseManager.ts
+++ b/packages/connect/src/utils/uiPromiseManager.ts
@@ -1,6 +1,8 @@
-import { DEVICE, UiPromise, AnyUiPromise, UiPromiseCreator, UiPromiseResponse } from '../events';
 import { createDeferred, arrayPartition } from '@trezor/utils';
 
+import { DEVICE, UiPromise, AnyUiPromise, UiPromiseCreator, UiPromiseResponse } from '../events';
+import { DeviceUniquePath } from '../types/device';
+
 export const createUiPromiseManager = (interactionTimeout: () => void) => {
     let _uiPromises: AnyUiPromise[] = [];
 
@@ -36,16 +38,16 @@ export const createUiPromiseManager = (interactionTimeout: () => void) => {
         _uiPromises = [];
     };
 
-    const disconnected = (devicePath: string) => {
+    const disconnected = (devicePath: DeviceUniquePath) => {
         const [toResolve, toKeep] = arrayPartition(
             _uiPromises,
             (p): p is UiPromise<typeof DEVICE.DISCONNECT> =>
-                p.device?.getDevicePath() === devicePath && p.id === DEVICE.DISCONNECT,
+                p.device?.getUniquePath() === devicePath && p.id === DEVICE.DISCONNECT,
         );
         toResolve.forEach(p => p.resolve({ type: DEVICE.DISCONNECT }));
         _uiPromises = toKeep;
 
-        return !!toResolve.length || toKeep.some(p => p.device?.getDevicePath() === devicePath);
+        return !!toResolve.length || toKeep.some(p => p.device?.getUniquePath() === devicePath);
     };
 
     const get = <T extends UiPromiseResponse['type']>(type: T) => {
diff --git a/packages/connect/tsconfig.json b/packages/connect/tsconfig.json
index 06ad952f548..9461881cd2a 100644
--- a/packages/connect/tsconfig.json
+++ b/packages/connect/tsconfig.json
@@ -12,6 +12,7 @@
         { "path": "../transport" },
         { "path": "../utils" },
         { "path": "../utxo-lib" },
+        { "path": "../eslint" },
         { "path": "../trezor-user-env-link" }
     ]
 }
diff --git a/packages/connect/tsconfig.lib.json b/packages/connect/tsconfig.lib.json
index dca0a4a6e3b..d9412084d95 100644
--- a/packages/connect/tsconfig.lib.json
+++ b/packages/connect/tsconfig.lib.json
@@ -34,6 +34,9 @@
         {
             "path": "../utxo-lib"
         },
+        {
+            "path": "../eslint"
+        },
         {
             "path": "../trezor-user-env-link"
         }
diff --git a/packages/crypto-utils/package.json b/packages/crypto-utils/package.json
index 8d0c3bd654f..32f127f095b 100644
--- a/packages/crypto-utils/package.json
+++ b/packages/crypto-utils/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     }
diff --git a/packages/device-utils/package.json b/packages/device-utils/package.json
index d26e3cdd7d2..8cef35c13bc 100644
--- a/packages/device-utils/package.json
+++ b/packages/device-utils/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js"
diff --git a/packages/device-utils/src/bootloaderUtils.ts b/packages/device-utils/src/bootloaderUtils.ts
index 016e67f5a72..6e035046f55 100644
--- a/packages/device-utils/src/bootloaderUtils.ts
+++ b/packages/device-utils/src/bootloaderUtils.ts
@@ -1,10 +1,10 @@
-import { Device } from '@trezor/connect';
-
 import { isDeviceInBootloaderMode } from './modeUtils';
+import { PartialDevice } from './types';
 
-export const getBootloaderHash = (device?: Device) => device?.features?.bootloader_hash || '';
+export const getBootloaderHash = (device?: PartialDevice) =>
+    device?.features?.bootloader_hash || '';
 
-export const getBootloaderVersion = (device?: Device) => {
+export const getBootloaderVersion = (device?: PartialDevice) => {
     if (!device?.features) {
         return '';
     }
diff --git a/packages/device-utils/src/firmwareUtils.ts b/packages/device-utils/src/firmwareUtils.ts
index 1a93ceaf753..f595bb6e514 100644
--- a/packages/device-utils/src/firmwareUtils.ts
+++ b/packages/device-utils/src/firmwareUtils.ts
@@ -1,10 +1,11 @@
-import { FirmwareType, Device, VersionArray } from '@trezor/connect';
+import { FirmwareType, VersionArray } from '@trezor/connect';
 
 import { isDeviceInBootloaderMode } from './modeUtils';
+import { PartialDevice } from './types';
 
-export const getFirmwareRevision = (device?: Device) => device?.features?.revision || '';
+export const getFirmwareRevision = (device?: PartialDevice) => device?.features?.revision || '';
 
-export const getFirmwareVersionArray = (device?: Device): VersionArray | null => {
+export const getFirmwareVersionArray = (device?: PartialDevice): VersionArray | null => {
     if (!device?.features) {
         return null;
     }
@@ -19,12 +20,15 @@ export const getFirmwareVersionArray = (device?: Device): VersionArray | null =>
     return [features.major_version, features.minor_version, features.patch_version];
 };
 
-export const getFirmwareVersion = (device?: Device) => {
+export const getFirmwareVersion = (
+    device?: PartialDevice,
+): '' | `${number}.${number}.${number}` => {
     if (!device?.features) {
         return '';
     }
     const { features } = device;
     if (isDeviceInBootloaderMode(device)) {
+        // @ts-expect-error fw_minor and fw_patch is imho always defined. maybe only for some very old firmwares only major version is defined.
         return features.fw_major
             ? `${features.fw_major}.${features.fw_minor}.${features.fw_patch}`
             : '';
@@ -34,9 +38,9 @@ export const getFirmwareVersion = (device?: Device) => {
 };
 
 // This can give a false negative in bootloader mode for T1B1 and T2T1.
-export const hasBitcoinOnlyFirmware = (device?: Device) =>
+export const hasBitcoinOnlyFirmware = (device?: PartialDevice) =>
     device?.firmwareType === FirmwareType.BitcoinOnly;
 
 // Bitcoin-only device with Universal firmware is treated as a regular device.
-export const isBitcoinOnlyDevice = (device?: Device) =>
+export const isBitcoinOnlyDevice = (device?: PartialDevice) =>
     !!device?.features?.unit_btconly && device?.firmwareType !== FirmwareType.Regular;
diff --git a/packages/device-utils/src/modeUtils.ts b/packages/device-utils/src/modeUtils.ts
index 4694d9cf593..8efde1e9cc8 100644
--- a/packages/device-utils/src/modeUtils.ts
+++ b/packages/device-utils/src/modeUtils.ts
@@ -1,8 +1,9 @@
-import { Device } from '@trezor/connect';
+import { PartialDevice } from './types';
 
-export const isDeviceInBootloaderMode = (device?: Device) => !!device?.features?.bootloader_mode;
+export const isDeviceInBootloaderMode = (device?: PartialDevice) =>
+    !!device?.features?.bootloader_mode;
 
-export const getDeviceMode = (device?: Device) => {
+export const getDeviceMode = (device?: PartialDevice) => {
     if (device?.features?.bootloader_mode) return 'bootloader';
     if (!device?.features?.initialized) return 'initialize';
     if (device?.features?.no_backup) return 'seedless';
diff --git a/packages/device-utils/src/types.ts b/packages/device-utils/src/types.ts
new file mode 100644
index 00000000000..9dc084d4f30
--- /dev/null
+++ b/packages/device-utils/src/types.ts
@@ -0,0 +1,6 @@
+import { Device } from '@trezor/connect';
+
+export type PartialDevice = {
+    features?: Device['features'];
+    firmwareType?: Device['firmwareType'];
+};
diff --git a/packages/dom-utils/package.json b/packages/dom-utils/package.json
index 776bc5c2716..8ef95fdd525 100644
--- a/packages/dom-utils/package.json
+++ b/packages/dom-utils/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     }
diff --git a/packages/e2e-utils/package.json b/packages/e2e-utils/package.json
index 07f2539c3bb..f60299a36ba 100644
--- a/packages/e2e-utils/package.json
+++ b/packages/e2e-utils/package.json
@@ -6,16 +6,12 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
-        "express": "^4.21.0",
-        "uuid": "^10.0.0",
+        "express": "^4.21.1",
+        "uuid": "^11.0.2",
         "ws": "^8.18.0"
-    },
-    "devDependencies": {
-        "@types/uuid": "^10.0.0"
     }
 }
diff --git a/packages/e2e-utils/src/mocks/bridge.ts b/packages/e2e-utils/src/mocks/bridge.ts
index 1a813c11271..c6c7037c4bf 100644
--- a/packages/e2e-utils/src/mocks/bridge.ts
+++ b/packages/e2e-utils/src/mocks/bridge.ts
@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 /* eslint-disable no-console */
 
diff --git a/packages/env-utils/package.json b/packages/env-utils/package.json
index 42552faaba4..a84f6b4f01f 100644
--- a/packages/env-utils/package.json
+++ b/packages/env-utils/package.json
@@ -21,7 +21,6 @@
         "!**/*.map"
     ],
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "build:lib": "yarn g:rimraf ./lib && yarn g:tsc --build tsconfig.lib.json && ../../scripts/replace-imports.sh ./lib",
diff --git a/packages/eslint/eslint.config.mjs b/packages/eslint/eslint.config.mjs
new file mode 100644
index 00000000000..0c2379d00cf
--- /dev/null
+++ b/packages/eslint/eslint.config.mjs
@@ -0,0 +1,14 @@
+import { eslint } from './src/index.mjs';
+
+// This config is just for this package.
+// The exported config, that shall be used in other packages, is in src/index.mjs.
+export default [
+    ...eslint,
+    {
+        files: ['**/*.mjs'], // disable for all other config-files in this package
+        rules: {
+            'import/no-default-export': 'off',
+            'import/no-extraneous-dependencies': 'off',
+        },
+    },
+];
diff --git a/packages/eslint/package.json b/packages/eslint/package.json
new file mode 100644
index 00000000000..4e0ff84d559
--- /dev/null
+++ b/packages/eslint/package.json
@@ -0,0 +1,24 @@
+{
+    "name": "@trezor/eslint",
+    "version": "1.0.0",
+    "license": "See LICENSE.md in repo root",
+    "private": true,
+    "sideEffects": false,
+    "main": "src/index.mjs",
+    "scripts": {
+        "depcheck": "yarn g:depcheck",
+        "type-check": "yarn g:tsc --build"
+    },
+    "devDependencies": {
+        "@eslint/js": "^9.13.0",
+        "eslint": "^9.13.0",
+        "eslint-plugin-chai-friendly": "^1.0.1",
+        "eslint-plugin-import": "^2.31.0",
+        "eslint-plugin-jest": "^28.8.3",
+        "eslint-plugin-jsx-a11y": "^6.10.2",
+        "eslint-plugin-local-rules": "^3.0.2",
+        "eslint-plugin-react": "^7.37.2",
+        "eslint-plugin-react-hooks": "^5.0.0",
+        "typescript-eslint": "^8.12.2"
+    }
+}
diff --git a/packages/eslint/src/chaiFriendlyConfig.mjs b/packages/eslint/src/chaiFriendlyConfig.mjs
new file mode 100644
index 00000000000..89a8328c907
--- /dev/null
+++ b/packages/eslint/src/chaiFriendlyConfig.mjs
@@ -0,0 +1,13 @@
+import pluginChaiFriendly from 'eslint-plugin-chai-friendly';
+
+export const chaiFriendlyConfig = [
+    {
+        plugins: { 'chai-friendly': pluginChaiFriendly },
+        rules: {
+            'no-unused-expressions': 'off', // disable original rule
+            // However this does not work for @typescript-eslint/no-unused-expressions
+            // See: https://github.com/ihordiachenko/eslint-plugin-chai-friendly/issues/41
+            'chai-friendly/no-unused-expressions': 'error',
+        },
+    },
+];
diff --git a/packages/eslint/src/importConfig.mjs b/packages/eslint/src/importConfig.mjs
new file mode 100644
index 00000000000..479e8252a9d
--- /dev/null
+++ b/packages/eslint/src/importConfig.mjs
@@ -0,0 +1,73 @@
+import path from 'path';
+import { fileURLToPath } from 'url';
+import pluginImport from 'eslint-plugin-import';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export const globalNoExtraneousDependenciesDevDependencies = [
+    // ----------------------------------------------------------------
+    // !!! DO NOT PUT STUFF THAT BELONGS TO THE PACKAGE ITSELF HERE !!!
+    // Only shared stuff (like tests.*.ts(x) or fixtures shall be here)
+    // ----------------------------------------------------------------
+    '**/*fixtures*/**',
+    '**/*.test.{tsx,ts,js}',
+    '**/eslint.config.mjs',
+
+    '**/*e2e/**', // Todo: This shall be only in packages that has e2e tests
+];
+
+export const importConfig = [
+    pluginImport.flatConfigs.recommended,
+    {
+        settings: {
+            'import/ignore': ['node_modules', '\\.(coffee|scss|css|less|hbs|svg|json)$'],
+            'import/resolver': {
+                node: {
+                    paths: [path.resolve(__dirname, 'eslint-rules')],
+                },
+            },
+        },
+        rules: {
+            // Additional
+            'import/no-default-export': 'error', // We don't want to use default exports, always use named exports
+            'import/no-anonymous-default-export': [
+                'error',
+                {
+                    allowArray: true,
+                    allowLiteral: true,
+                    allowObject: true,
+                },
+            ],
+            'import/order': [
+                1,
+                {
+                    groups: [['builtin', 'external'], 'internal', ['sibling', 'parent']],
+                    pathGroups: [
+                        {
+                            pattern: 'react*',
+                            group: 'external',
+                            position: 'before',
+                        },
+                        { pattern: '@trezor/**', group: 'internal' }, // Translates to /packages/** */
+                        { pattern: '@suite-native/**', group: 'internal' },
+                        { pattern: '@suite-common/**', group: 'internal' },
+                        { pattern: 'src/**', group: 'internal', position: 'after' },
+                    ],
+                    pathGroupsExcludedImportTypes: ['internal', 'react'],
+                    'newlines-between': 'always',
+                },
+            ],
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: globalNoExtraneousDependenciesDevDependencies,
+                    includeTypes: true,
+                },
+            ],
+
+            // Offs
+            'import/no-unresolved': 'off', // Does not work with Babel react-native to react-native-web
+        },
+    },
+];
diff --git a/packages/eslint/src/index.mjs b/packages/eslint/src/index.mjs
new file mode 100644
index 00000000000..5d36b2de05b
--- /dev/null
+++ b/packages/eslint/src/index.mjs
@@ -0,0 +1,68 @@
+import globals from 'globals';
+import jsxA11y from 'eslint-plugin-jsx-a11y';
+
+import { reactConfig } from './reactConfig.mjs';
+import { javascriptConfig } from './javascriptConfig.mjs';
+import { typescriptConfig } from './typescriptConfig.mjs';
+import { importConfig, globalNoExtraneousDependenciesDevDependencies } from './importConfig.mjs';
+import { jestConfig } from './jestConfig.mjs';
+import { javascriptNodejsConfig } from './javascriptNodejsConfig.mjs';
+import { localRulesConfig } from './localRulesConfig.mjs';
+import { chaiFriendlyConfig } from './chaiFriendlyConfig.mjs';
+
+export { globalNoExtraneousDependenciesDevDependencies };
+
+export const eslint = [
+    {
+        ignores: [
+            '**/.nx/*',
+            '**/lib/*',
+            '**/libDev/*',
+            '**/dist/*',
+            '**/coverage/*',
+            '**/build/*',
+            '**/build-electron/*',
+            '**/node_modules/*',
+            '**/public/*',
+            '**/ci/',
+            'eslint-local-rules/*',
+        ],
+    },
+    { files: ['**/*.{js,mjs,cjs,ts,jsx,tsx}'] },
+    { languageOptions: { globals: globals.browser } },
+    {
+        languageOptions: {
+            globals: {
+                ...globals.serviceworker,
+                ...globals.browser,
+            },
+        },
+    },
+
+    ...reactConfig,
+    ...javascriptConfig,
+    ...javascriptNodejsConfig,
+    ...typescriptConfig,
+    ...importConfig,
+    ...jestConfig,
+    ...localRulesConfig,
+    ...chaiFriendlyConfig,
+
+    jsxA11y.flatConfigs.recommended,
+
+    // Tests
+    {
+        files: ['**/__fixtures__/**/*'],
+        rules: {
+            'import/no-default-export': 'off', // Todo: we have many default exports in fixtures, we shall get rid of them
+        },
+    },
+
+    // ESLint config itself
+    {
+        files: ['eslint.config.mjs'],
+        rules: {
+            'import/no-default-export': 'off',
+        },
+    },
+];
diff --git a/packages/eslint/src/javascriptConfig.mjs b/packages/eslint/src/javascriptConfig.mjs
new file mode 100644
index 00000000000..2869b9e8ea3
--- /dev/null
+++ b/packages/eslint/src/javascriptConfig.mjs
@@ -0,0 +1,91 @@
+import pluginJs from '@eslint/js';
+
+export const javascriptConfig = [
+    pluginJs.configs.recommended,
+    {
+        rules: {
+            // Additional rules
+            'no-console': ['error', { allow: ['warn', 'error'] }],
+            'require-await': ['error'],
+            'no-nested-ternary': 'error',
+            'prefer-destructuring': [
+                'error',
+                {
+                    VariableDeclarator: {
+                        array: false,
+                        object: true,
+                    },
+                    AssignmentExpression: {
+                        array: false,
+                        object: false,
+                    },
+                },
+                {
+                    enforceForRenamedProperties: false,
+                },
+            ],
+            'no-label-var': 'error', // Disallow labels that share a name with a variable
+            'no-undef-init': 'error', // Disallow initializing variables to undefined
+            'no-restricted-syntax': [
+                'error',
+                {
+                    message:
+                        "Please don't use createAsyncThunk. Use createThunk from @suite-common/redux-utils instead.",
+                    selector: "CallExpression[callee.name='createAsyncThunk']",
+                },
+                {
+                    message:
+                        'Please don\'t use getState directly. Always use strongly typed selector, because geState is typed as "any" and it\'s dangerous to use it directly.',
+                    selector:
+                        'MemberExpression[property.type="Identifier"]:matches([object.callee.name="getState"])',
+                },
+                {
+                    message:
+                        'Do not assign "getState" directly. Always use strongly typed selector, because geState is typed as "any" and it\'s dangerous to use it directly.',
+                    selector:
+                        "VariableDeclarator[init.type='CallExpression']:matches([init.callee.name='getState'])",
+                },
+                {
+                    message:
+                        'Please don\'t use "state" directly because it\'s typed as "any". Always use it only as parameter for strongly typed selector function.',
+                    selector:
+                        "CallExpression[callee.name='useSelector'] MemberExpression[object.name='state']:matches([property.type='Identifier'])",
+                },
+            ],
+            'object-shorthand': [
+                'error',
+                'always',
+                {
+                    ignoreConstructors: false,
+                    avoidQuotes: true,
+                },
+            ],
+            'no-useless-rename': [
+                'error',
+                {
+                    ignoreDestructuring: false,
+                    ignoreImport: false,
+                    ignoreExport: false,
+                },
+            ],
+            'prefer-numeric-literals': 'error',
+            'padding-line-between-statements': [
+                'error', // Todo: deprecated, use @stylistic/eslint-plugin-js instead
+                { blankLine: 'always', prev: '*', next: 'return' },
+            ],
+
+            // Offs
+            'no-undef': 'off', // Todo: write description
+
+            // Offs for Node.js
+            'no-sync': 'off', // disallow use of synchronous methods (off by default)
+            'no-process-exit': 'off', // disallow process.exit() (on by default in the node environment)
+        },
+    },
+    {
+        files: ['**/*.js'], // Usually config files
+        rules: {
+            'no-console': 'off',
+        },
+    },
+];
diff --git a/packages/eslint/src/javascriptNodejsConfig.mjs b/packages/eslint/src/javascriptNodejsConfig.mjs
new file mode 100644
index 00000000000..b98c1c6434d
--- /dev/null
+++ b/packages/eslint/src/javascriptNodejsConfig.mjs
@@ -0,0 +1,18 @@
+export const javascriptNodejsConfig = [
+    {
+        // These rules are specific to JavaScript running on Node.js.
+        rules: {
+            // Additional
+            'handle-callback-err': 'error', // enforces error handling in callbacks (off by default) (on by default in the node environment)
+            'no-mixed-requires': 'error', // disallow mixing regular variable and require declarations (off by default) (on by default in the node environment)
+            'no-new-require': 'error', // disallow use of new operator with the require function (off by default) (on by default in the node environment)
+            'no-path-concat': 'error', // disallow string concatenation with __dirname and __filename (off by default) (on by default in the node environment)
+            'no-restricted-modules': 'error', // restrict usage of specified node modules (off by default)
+            'eol-last': 'error',
+
+            // Offs
+            'no-sync': 'off', // disallow use of synchronous methods (off by default)
+            'no-process-exit': 'off', // disallow process.exit() (on by default in the node environment)
+        },
+    },
+];
diff --git a/packages/eslint/src/jestConfig.mjs b/packages/eslint/src/jestConfig.mjs
new file mode 100644
index 00000000000..27579f01fed
--- /dev/null
+++ b/packages/eslint/src/jestConfig.mjs
@@ -0,0 +1,19 @@
+import pluginJest from 'eslint-plugin-jest';
+
+export const jestConfig = [
+    pluginJest.configs['flat/recommended'],
+    {
+        rules: {
+            // Additions
+            // Enforce arrow functions only is afaik not possible. But this helps.
+            'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
+
+            // Offs
+            'jest/valid-title': 'off', // This rule does not use Typescript and produces false positives
+            'jest/valid-describe-callback': 'off', // This rule does not use Typescript and produces false positives
+            'jest/no-disabled-tests': 'off',
+            'jest/no-conditional-expect': 'off', // Todo: we shall solve this, this is bad practice
+            'jest/expect-expect': 'off', // Todo: we have test with no assertions, this may be legit but it needs to be checked
+        },
+    },
+];
diff --git a/packages/eslint/src/localRulesConfig.mjs b/packages/eslint/src/localRulesConfig.mjs
new file mode 100644
index 00000000000..3eee2159afc
--- /dev/null
+++ b/packages/eslint/src/localRulesConfig.mjs
@@ -0,0 +1,15 @@
+import pluginLocalRules from 'eslint-plugin-local-rules';
+
+export const localRulesConfig = [
+    {
+        plugins: {
+            'local-rules': pluginLocalRules,
+        },
+        rules: {
+            'local-rules/no-override-ds-component': [
+                'error',
+                { packageNames: ['@trezor/components', '@trezor/product-components'] },
+            ],
+        },
+    },
+];
diff --git a/packages/eslint/src/reactConfig.mjs b/packages/eslint/src/reactConfig.mjs
new file mode 100644
index 00000000000..839f3db9174
--- /dev/null
+++ b/packages/eslint/src/reactConfig.mjs
@@ -0,0 +1,34 @@
+import pluginReact from 'eslint-plugin-react';
+import pluginReactHooks from 'eslint-plugin-react-hooks';
+
+export const reactConfig = [
+    // React
+    pluginReact.configs.flat.recommended,
+    {
+        languageOptions: {
+            ...pluginReact.configs.flat.recommended.languageOptions,
+        },
+        settings: { react: { version: 'detect' } },
+        rules: {
+            // Additions
+            'react/jsx-filename-extension': ['error', { extensions: ['.tsx', '.jsx'] }],
+            'react/jsx-curly-brace-presence': ['warn', { props: 'never', children: 'never' }],
+
+            // Offs
+            'react/react-in-jsx-scope': 'off', // We are not importing React in every file
+            'react/prop-types': 'off', // This rule is not needed when using TypeScript
+            'react/display-name': 'off', // This is annoying for stuff like `forwardRef`. Todo: reconsider
+            'no-prototype-builtins': 'off', // Todo: just temporary, reconsider to remove it
+        },
+    },
+
+    // React Hooks
+    {
+        plugins: { 'react-hooks': pluginReactHooks },
+        rules: {
+            ...pluginReactHooks.configs.recommended.rules,
+            'react-hooks/rules-of-hooks': 'error',
+            'react-hooks/exhaustive-deps': 'error',
+        },
+    },
+];
diff --git a/packages/eslint/src/typescriptConfig.mjs b/packages/eslint/src/typescriptConfig.mjs
new file mode 100644
index 00000000000..97728af8195
--- /dev/null
+++ b/packages/eslint/src/typescriptConfig.mjs
@@ -0,0 +1,49 @@
+import tseslint from 'typescript-eslint';
+
+export const typescriptConfig = [
+    ...tseslint.configs.recommended,
+    {
+        rules: {
+            // Additional rules
+            '@typescript-eslint/no-use-before-define': ['error'],
+            '@typescript-eslint/no-shadow': [
+                'error',
+                {
+                    builtinGlobals: false,
+                    allow: ['_', 'error', 'resolve', 'reject', 'fetch'],
+                },
+            ],
+            '@typescript-eslint/no-restricted-imports': [
+                'error',
+                {
+                    paths: [{ name: '.' }, { name: '..' }, { name: '../..' }],
+                    patterns: ['@trezor/*/lib', '@trezor/*/lib/**'],
+                },
+            ],
+
+            // Additions from "plugin:@typescript-eslint/strict" (we may turn this on one day as a whole)
+            '@typescript-eslint/no-useless-constructor': ['error'],
+            '@typescript-eslint/no-unused-vars': [
+                'error',
+                {
+                    vars: 'all',
+                    args: 'none',
+                    ignoreRestSiblings: true,
+                    varsIgnorePattern: '^_',
+                },
+            ],
+
+            // Offs
+            '@typescript-eslint/no-require-imports': 'off', // We just use require a lot (mostly for dynamic imports)
+            '@typescript-eslint/no-explicit-any': 'off', // Todo: write description
+            '@typescript-eslint/ban-ts-comment': [
+                'error',
+                {
+                    minimumDescriptionLength: 0, // Todo: reconsider
+                },
+            ],
+            '@typescript-eslint/no-empty-object-type': 'off', // Todo: we shall solve this, this is bad practice
+            '@typescript-eslint/triple-slash-reference': 'off', // Todo: solve before merge
+        },
+    },
+];
diff --git a/packages/eslint/tsconfig.json b/packages/eslint/tsconfig.json
new file mode 100644
index 00000000000..c7ebe855e21
--- /dev/null
+++ b/packages/eslint/tsconfig.json
@@ -0,0 +1,5 @@
+{
+    "extends": "../../tsconfig.base.json",
+    "compilerOptions": { "outDir": "libDev" },
+    "references": []
+}
diff --git a/packages/ipc-proxy/package.json b/packages/ipc-proxy/package.json
index 510756be7d0..278259f2d72 100644
--- a/packages/ipc-proxy/package.json
+++ b/packages/ipc-proxy/package.json
@@ -16,7 +16,6 @@
     "main": "src/index",
     "browser": "src/proxy",
     "scripts": {
-        "lint:js": "eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
diff --git a/packages/ipc-proxy/src/proxy-handler.ts b/packages/ipc-proxy/src/proxy-handler.ts
index b1420d322b9..1ec24ec1a83 100644
--- a/packages/ipc-proxy/src/proxy-handler.ts
+++ b/packages/ipc-proxy/src/proxy-handler.ts
@@ -43,10 +43,11 @@ interface IpcMainHandlers<Api> {
     '/invoke': Parameters<ApiUnion<Api>>; // methodName, ...params
 }
 
+// Electron.IpcMainInvokeEvent narowed down only to properties we actually need
 export interface ElectronIpcMainInvokeEvent {
     senderFrame: {
         url: string;
-    };
+    } | null;
 }
 
 export interface ElectronIpcMainEvent {
diff --git a/packages/ipc-proxy/src/validateIpcMessage.ts b/packages/ipc-proxy/src/validateIpcMessage.ts
index 821fd1ec171..5f997f706b5 100644
--- a/packages/ipc-proxy/src/validateIpcMessage.ts
+++ b/packages/ipc-proxy/src/validateIpcMessage.ts
@@ -1,6 +1,5 @@
 import { ElectronIpcMainInvokeEvent } from './proxy-handler';
 
-// ipcEvent: Electron.IpcMainInvokeEvent
 export const validateIpcMessage = (ipcEvent: ElectronIpcMainInvokeEvent) => {
     if (ipcEvent?.senderFrame && 'url' in ipcEvent.senderFrame) {
         const parsedUrl = new URL(ipcEvent.senderFrame.url);
diff --git a/packages/node-utils/package.json b/packages/node-utils/package.json
index 578067e307b..8fa40893642 100644
--- a/packages/node-utils/package.json
+++ b/packages/node-utils/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest --verbose -c ../../jest.config.base.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
diff --git a/packages/node-utils/src/http.ts b/packages/node-utils/src/http.ts
index 2d6094a9fe0..498c966eab6 100644
--- a/packages/node-utils/src/http.ts
+++ b/packages/node-utils/src/http.ts
@@ -3,8 +3,7 @@ import * as net from 'net';
 import * as url from 'url';
 
 import type { RequiredKey } from '@trezor/type-utils';
-import { Log, TypedEmitter } from '@trezor/utils';
-import { arrayPartition } from '@trezor/utils';
+import { Log, TypedEmitter, arrayPartition } from '@trezor/utils';
 
 import { getFreePort } from './getFreePort';
 
@@ -478,6 +477,14 @@ export const allowReferers =
 
 export const parseBodyTextHelper = (request: Request) =>
     new Promise<string>(resolve => {
+        const hasData =
+            (request.headers['content-length'] &&
+                Number.parseInt(request.headers['content-length']) > 0) ||
+            request.headers['transfer-encoding'] === 'chunked';
+
+        if (!hasData) {
+            return resolve('');
+        }
         const tmp: Buffer[] = [];
         request
             .on('data', chunk => {
@@ -495,7 +502,13 @@ export const parseBodyTextHelper = (request: Request) =>
  */
 export const parseBodyJSON: RequestHandler<unknown, JSON> = (request, response, next) => {
     parseBodyTextHelper(request)
-        .then(body => JSON.parse(body))
+        .then(body => {
+            if (!body) {
+                return {};
+            }
+
+            return JSON.parse(body);
+        })
         .then(body => {
             next({ ...request, body }, response);
         })
diff --git a/packages/node-utils/src/tests/http.test.ts b/packages/node-utils/src/tests/http.test.ts
index 72e12481f41..9b8401e05d0 100644
--- a/packages/node-utils/src/tests/http.test.ts
+++ b/packages/node-utils/src/tests/http.test.ts
@@ -26,14 +26,17 @@ describe('HttpServer', () => {
         });
     });
 
-    afterEach(done => {
-        server.stop().finally(() => {
-            done();
-        });
-    });
+    afterEach(
+        () =>
+            new Promise<void>(done => {
+                server.stop().finally(() => {
+                    done();
+                });
+            }),
+    );
 
     test('getServerAddress before server start', () => {
-        expect(() => server.getServerAddress()).toThrowError();
+        expect(() => server.getServerAddress()).toThrow();
     });
 
     test('getServerAddress after server start', async () => {
@@ -279,7 +282,7 @@ describe('HttpServer', () => {
         res = await post('foo-1/321', undefined); // body != array, fails in parseBodyJSON
         expect(res.status).toEqual(400);
         const { error } = await res.json();
-        expect(error).toMatch('Invalid json body:');
+        expect(error).toMatch('Invalid body');
 
         res = await post('foo-1/not-a-number', { foo: 'bar' });
         expect(res.status).toEqual(400);
diff --git a/packages/product-components/.storybook/main.js b/packages/product-components/.storybook/main.js
index 681db99f95d..63df8f0b85d 100644
--- a/packages/product-components/.storybook/main.js
+++ b/packages/product-components/.storybook/main.js
@@ -1,5 +1,13 @@
 import { dirname, join } from 'path';
 
+/**
+ * This function is used to resolve the absolute path of a package.
+ * It is needed in projects that use Yarn PnP or are set up within a monorepo.
+ */
+function getAbsolutePath(value) {
+    return dirname(require.resolve(join(value, 'package.json')));
+}
+
 module.exports = {
     stories: ['../src/**/*.stories.*'],
     logLevel: 'debug',
@@ -14,18 +22,12 @@ module.exports = {
         name: getAbsolutePath('@storybook/react-webpack5'),
         options: {},
     },
-    babel: async options => {
+    babel: options => {
         options.presets.push('@babel/preset-typescript');
+
         return options;
     },
     features: {
         storyStoreV7: false, // Remove this line when storiesOf is not used anymore
     },
 };
-/**
- * This function is used to resolve the absolute path of a package.
- * It is needed in projects that use Yarn PnP or are set up within a monorepo.
- */
-function getAbsolutePath(value) {
-    return dirname(require.resolve(join(value, 'package.json')));
-}
diff --git a/packages/product-components/.storybook/manager.js b/packages/product-components/.storybook/manager.js
index 17b478d55a6..f6074ea0baa 100644
--- a/packages/product-components/.storybook/manager.js
+++ b/packages/product-components/.storybook/manager.js
@@ -1,6 +1,7 @@
 import { addons } from '@storybook/addons';
+
 import theme from './theme';
 
 addons.setConfig({
-    theme: theme,
+    theme,
 });
diff --git a/packages/product-components/.storybook/preview.js b/packages/product-components/.storybook/preview.jsx
similarity index 100%
rename from packages/product-components/.storybook/preview.js
rename to packages/product-components/.storybook/preview.jsx
diff --git a/packages/product-components/.storybook/theme.js b/packages/product-components/.storybook/theme.js
index 6e73ee71658..a386cff0cb1 100644
--- a/packages/product-components/.storybook/theme.js
+++ b/packages/product-components/.storybook/theme.js
@@ -1,5 +1,6 @@
 import { create } from '@storybook/theming/create';
 
+// eslint-disable-next-line import/no-default-export
 export default create({
     base: 'light',
     fontBase: 'TT Satoshi',
diff --git a/packages/product-components/eslint.config.mjs b/packages/product-components/eslint.config.mjs
new file mode 100644
index 00000000000..406a8926dca
--- /dev/null
+++ b/packages/product-components/eslint.config.mjs
@@ -0,0 +1,29 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        ignores: ['**/.build-storybook/*'],
+    },
+    {
+        files: ['**/*.stories.tsx'],
+        rules: {
+            'no-console': 'off',
+            'import/no-default-export': 'off',
+        },
+    },
+    {
+        rules: {
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/*.stories.*',
+                        '**/.storybook/**',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/product-components/package.json b/packages/product-components/package.json
index aef8aa6dc87..170e55f0b1e 100644
--- a/packages/product-components/package.json
+++ b/packages/product-components/package.json
@@ -8,7 +8,6 @@
     "sideEffects": false,
     "scripts": {
         "lint": "yarn lint:js && yarn lint:styles",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "lint:styles": "npx stylelint './src/**/*{.ts,.tsx}' --cache --config ../../.stylelintrc",
         "lint-fix": "npx eslint ./src --fix",
         "type-check": "yarn g:tsc --build tsconfig.json",
@@ -19,12 +18,14 @@
     "dependencies": {
         "@suite-common/validators": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
+        "@suite-common/wallet-utils": "workspace:*",
         "@trezor/components": "workspace:*",
         "@trezor/connect": "workspace:*",
         "@trezor/dom-utils": "workspace:*",
         "@trezor/env-utils": "workspace:*",
         "@trezor/react-utils": "workspace:*",
         "@trezor/theme": "workspace:*",
+        "@trezor/urls": "workspace:*",
         "@trezor/utils": "workspace:*",
         "framer-motion": "^11.0.3",
         "react": "18.2.0",
@@ -42,6 +43,8 @@
         "@storybook/client-api": "^7.6.13",
         "@storybook/react": "^7.6.13",
         "@storybook/react-webpack5": "^7.6.13",
+        "@storybook/theming": "^7.6.13",
+        "@trezor/eslint": "workspace:*",
         "@types/react": "18.2.79",
         "storybook": "^7.6.13",
         "stylelint": "^16.2.1",
diff --git a/packages/product-components/src/components/AssetShareIndicator/AssetShareIndicator.tsx b/packages/product-components/src/components/AssetShareIndicator/AssetShareIndicator.tsx
index cfdbe8b60b4..f9c7aa89215 100644
--- a/packages/product-components/src/components/AssetShareIndicator/AssetShareIndicator.tsx
+++ b/packages/product-components/src/components/AssetShareIndicator/AssetShareIndicator.tsx
@@ -1,9 +1,13 @@
 import { SVGProps } from 'react';
+
 import { motion, AnimationProps, SVGMotionProps } from 'framer-motion';
 import styled, { useTheme } from 'styled-components';
+
 import { coinsColors } from '@trezor/theme';
-import { CoinLogo, CoinLogoProps } from '../CoinLogo/CoinLogo';
 import { motionEasing } from '@trezor/components';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+
+import { CoinLogo, CoinLogoProps } from '../CoinLogo/CoinLogo';
 
 const Container = styled.div`
     position: relative;
@@ -16,6 +20,7 @@ const Container = styled.div`
 `;
 
 export interface AssetShareIndicatorProps extends CoinLogoProps {
+    symbol: NetworkSymbol;
     percentageShare?: number;
 }
 
diff --git a/packages/product-components/src/components/CoinLogo/CoinLogo.stories.tsx b/packages/product-components/src/components/CoinLogo/CoinLogo.stories.tsx
index a3ee39f8c51..c98a9adee7e 100644
--- a/packages/product-components/src/components/CoinLogo/CoinLogo.stories.tsx
+++ b/packages/product-components/src/components/CoinLogo/CoinLogo.stories.tsx
@@ -1,5 +1,6 @@
 import styled from 'styled-components';
 import { Meta, StoryObj } from '@storybook/react';
+
 import { CoinLogo as CoinLogoComponent } from '../../index';
 import { COINS } from './coins';
 import { CoinLogoProps } from './CoinLogo';
diff --git a/packages/product-components/src/components/CoinLogo/CoinLogo.tsx b/packages/product-components/src/components/CoinLogo/CoinLogo.tsx
index c53954a0e0d..7f60f9927a2 100644
--- a/packages/product-components/src/components/CoinLogo/CoinLogo.tsx
+++ b/packages/product-components/src/components/CoinLogo/CoinLogo.tsx
@@ -1,11 +1,14 @@
 import { ImgHTMLAttributes } from 'react';
 import { ReactSVG } from 'react-svg';
+
 import styled from 'styled-components';
-import { COINS } from './coins';
+
 import { NetworkSymbol } from '@suite-common/wallet-config';
 
+import { COINS, LegacyNetworkSymbol } from './coins';
+
 export interface CoinLogoProps extends ImgHTMLAttributes<HTMLImageElement> {
-    symbol: NetworkSymbol;
+    symbol: NetworkSymbol | LegacyNetworkSymbol;
     className?: string;
     size?: number;
     index?: number;
diff --git a/packages/product-components/src/components/CoinLogo/coinLogos.stories.tsx b/packages/product-components/src/components/CoinLogo/coinLogos.stories.tsx
index 0df5feb64f6..03056d600af 100644
--- a/packages/product-components/src/components/CoinLogo/coinLogos.stories.tsx
+++ b/packages/product-components/src/components/CoinLogo/coinLogos.stories.tsx
@@ -1,10 +1,12 @@
 import styled from 'styled-components';
 import { Meta, StoryObj } from '@storybook/react';
-import { CoinLogo } from '../../index';
+
 import { StoryColumn } from '@trezor/components';
-import { COINS } from './coins';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 
+import { CoinLogo } from '../../index';
+import { COINS } from './coins';
+
 const CoinName = styled.div`
     margin-bottom: 0.5rem;
     color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
diff --git a/packages/product-components/src/components/CoinLogo/coins.ts b/packages/product-components/src/components/CoinLogo/coins.ts
index 360043461a1..bdfd08e8425 100644
--- a/packages/product-components/src/components/CoinLogo/coins.ts
+++ b/packages/product-components/src/components/CoinLogo/coins.ts
@@ -1,6 +1,9 @@
 import { NetworkSymbol } from '@suite-common/wallet-config';
 
-export const COINS: Record<NetworkSymbol, string> = {
+// These coins are not supported in Suite, but exist in Trezor Connect
+export type LegacyNetworkSymbol = 'eos' | 'nem' | 'xlm' | 'xtz';
+
+export const COINS: Record<NetworkSymbol | LegacyNetworkSymbol, string> = {
     ada: require('../../images/coins/ada.svg'),
     bch: require('../../images/coins/bch.svg'),
     bnb: require('../../images/coins/bnb.svg'),
@@ -10,10 +13,13 @@ export const COINS: Record<NetworkSymbol, string> = {
     dgb: require('../../images/coins/dgb.svg'),
     doge: require('../../images/coins/doge.svg'),
     dsol: require('../../images/coins/dsol.svg'),
+    eos: require('../../images/coins/eos.svg'),
     etc: require('../../images/coins/etc.svg'),
     eth: require('../../images/coins/eth.svg'),
     ltc: require('../../images/coins/ltc.svg'),
+    op: require('../../images/coins/op.svg'),
     pol: require('../../images/coins/pol.svg'),
+    nem: require('../../images/coins/nem.svg'),
     nmc: require('../../images/coins/nmc.svg'),
     regtest: require('../../images/coins/btc_test.svg'),
     sol: require('../../images/coins/sol.svg'),
@@ -23,6 +29,8 @@ export const COINS: Record<NetworkSymbol, string> = {
     tsep: require('../../images/coins/tsep.svg'),
     txrp: require('../../images/coins/txrp.svg'),
     vtc: require('../../images/coins/vtc.svg'),
+    xlm: require('../../images/coins/xlm.svg'),
     xrp: require('../../images/coins/xrp.svg'),
+    xtz: require('../../images/coins/xtz.svg'),
     zec: require('../../images/coins/zec.svg'),
 };
diff --git a/packages/product-components/src/components/ConfirmOnDevice/ConfirmOnDevice.stories.tsx b/packages/product-components/src/components/ConfirmOnDevice/ConfirmOnDevice.stories.tsx
index 483f80d0585..95ea5762569 100644
--- a/packages/product-components/src/components/ConfirmOnDevice/ConfirmOnDevice.stories.tsx
+++ b/packages/product-components/src/components/ConfirmOnDevice/ConfirmOnDevice.stories.tsx
@@ -1,8 +1,10 @@
 import { Meta, StoryFn } from '@storybook/react';
+
 import { DeviceModelInternal } from '@trezor/connect';
-import { ConfirmOnDevice as ConfirmOnDeviceComponent } from './ConfirmOnDevice';
 import { StoryColumn } from '@trezor/components';
 
+import { ConfirmOnDevice as ConfirmOnDeviceComponent } from './ConfirmOnDevice';
+
 const meta: Meta = {
     title: 'ConfirmOnDevice',
     parameters: {
@@ -106,5 +108,15 @@ export const ConfirmOnDevice: StoryFn = () => (
                 deviceModelInternal={DeviceModelInternal.T3T1}
             />
         </StoryColumn>
+        <StoryColumn minWidth={300}>
+            <ConfirmOnDeviceComponent
+                successText="Confirmed"
+                title="Confirm on T3W1"
+                steps={5}
+                activeStep={5}
+                onCancel={() => {}}
+                deviceModelInternal={DeviceModelInternal.T3W1}
+            />
+        </StoryColumn>
     </>
 );
diff --git a/packages/product-components/src/components/ConfirmOnDevice/ConfirmOnDevice.tsx b/packages/product-components/src/components/ConfirmOnDevice/ConfirmOnDevice.tsx
index 4e188c2363d..15cbb77f71b 100644
--- a/packages/product-components/src/components/ConfirmOnDevice/ConfirmOnDevice.tsx
+++ b/packages/product-components/src/components/ConfirmOnDevice/ConfirmOnDevice.tsx
@@ -1,9 +1,11 @@
 import { ReactNode } from 'react';
+
 import styled, { css, keyframes } from 'styled-components';
+
 import { DeviceModelInternal } from '@trezor/connect';
 import { borders, spacingsPx } from '@trezor/theme';
-
 import { ElevationUp } from '@trezor/components';
+
 import { ConfirmOnDeviceContent } from './ConfirmOnDeviceContent';
 
 enum AnimationDirection {
diff --git a/packages/product-components/src/components/ConfirmOnDevice/ConfirmOnDeviceContent.tsx b/packages/product-components/src/components/ConfirmOnDevice/ConfirmOnDeviceContent.tsx
index 72a4ed44f86..f3f09898b19 100644
--- a/packages/product-components/src/components/ConfirmOnDevice/ConfirmOnDeviceContent.tsx
+++ b/packages/product-components/src/components/ConfirmOnDevice/ConfirmOnDeviceContent.tsx
@@ -1,6 +1,8 @@
 import { ReactNode } from 'react';
+
 import styled, { css, useTheme } from 'styled-components';
-import { Icon } from '@trezor/components';
+
+import { Icon, useElevation } from '@trezor/components';
 import { DeviceModelInternal } from '@trezor/connect';
 import {
     Elevation,
@@ -9,7 +11,7 @@ import {
     spacingsPx,
     typography,
 } from '@trezor/theme';
-import { useElevation } from '@trezor/components';
+
 import { RotateDeviceImage } from '../RotateDeviceImage/RotateDeviceImage';
 
 const Column = styled.div`
@@ -84,7 +86,6 @@ const Step = styled.div<{ $isActive: boolean }>`
         `}
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
 const StyledRotateDeviceImage = styled(RotateDeviceImage)`
     height: 34px;
 `;
diff --git a/packages/product-components/src/components/PassphraseTypeCard/EnterOnTrezorButton.tsx b/packages/product-components/src/components/PassphraseTypeCard/EnterOnTrezorButton.tsx
index e578675beb5..ec7a22d5f2f 100644
--- a/packages/product-components/src/components/PassphraseTypeCard/EnterOnTrezorButton.tsx
+++ b/packages/product-components/src/components/PassphraseTypeCard/EnterOnTrezorButton.tsx
@@ -1,5 +1,7 @@
 import { FormattedMessage } from 'react-intl';
+
 import styled, { useTheme } from 'styled-components';
+
 import { Image, Card, Text, Row, Icon } from '@trezor/components';
 import { DeviceModelInternal } from '@trezor/connect';
 import { spacings } from '@trezor/theme';
diff --git a/packages/product-components/src/components/PassphraseTypeCard/NonAsciiBanner.tsx b/packages/product-components/src/components/PassphraseTypeCard/NonAsciiBanner.tsx
new file mode 100644
index 00000000000..1d328866a43
--- /dev/null
+++ b/packages/product-components/src/components/PassphraseTypeCard/NonAsciiBanner.tsx
@@ -0,0 +1,83 @@
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+
+import styled from 'styled-components';
+
+import { Banner, Button, Code, Text } from '@trezor/components';
+import { BannerVariant } from '@trezor/components/src/components/Banner/types';
+import { borders, spacingsPx, typography } from '@trezor/theme';
+import { HELP_CENTER_PASSPHRASE_URL } from '@trezor/urls';
+
+const ButtonWrapper = styled.div`
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+`;
+
+const SpecialCharsWrapper = styled.div`
+    display: flex;
+    flex-direction: column;
+    margin: ${spacingsPx.xxs} 0 0;
+    ${typography.label};
+    overflow: hidden;
+    border-radius: ${borders.radii.xs};
+`;
+
+const SpecialChars = styled.div`
+    padding: 0 ${spacingsPx.xxs};
+    box-shadow: inset 0 0 0 2px #f2f2f2;
+    font-family: RobotoMono, 'PixelOperatorMono8', monospace;
+    font-weight: 400;
+    letter-spacing: 0.1em;
+    background-color: ${({ theme }) => theme.backgroundNeutralSubtleOnElevation1};
+`;
+
+const SpecialDescription = styled.div`
+    background-color: ${({ theme }) => theme.backgroundNeutralDisabled};
+    padding: ${spacingsPx.xxs};
+    display: flex;
+    gap: ${spacingsPx.sm};
+    ${typography.label}
+`;
+
+type NonAsciiBannerProps = {
+    variant: BannerVariant;
+};
+
+export const NonAsciiBanner = ({ variant }: NonAsciiBannerProps) => {
+    return (
+        <Banner variant={variant} color="default" spacingX="xs">
+            <Text>
+                <FormattedMessage
+                    defaultMessage="We recommend using <code>ABC</code>, <code>abc</code>, <code>123</code>, <code>spaces</code> or <code>these special characters</code>"
+                    id="TR_PASSPHRASE_NON_ASCII_CHARS"
+                    values={{ code: text => <Code>{text}</Code> }}
+                />
+            </Text>
+            <SpecialCharsWrapper>
+                <SpecialChars>
+                    {'! " # $ % & \\ \' ( ) * +  - . / : ; < = > ? @ [  ] ^ _ ` { | } ~'}
+                </SpecialChars>
+                <SpecialDescription>
+                    <FormattedMessage
+                        defaultMessage="Using non-listed special characters risk future compatibility"
+                        id="TR_PASSPHRASE_NON_ASCII_CHARS_WARNING"
+                    />
+                    <ButtonWrapper>
+                        {/* TODO: better would be to reuse LearnMoreButton */}
+                        <Button
+                            href={HELP_CENTER_PASSPHRASE_URL}
+                            target="_blank"
+                            variant="tertiary"
+                            size="tiny"
+                            icon="arrowUpRight"
+                            iconAlignment="right"
+                        >
+                            <FormattedMessage id="TR_LEARN_MORE" defaultMessage="Learn" />
+                        </Button>
+                    </ButtonWrapper>
+                </SpecialDescription>
+            </SpecialCharsWrapper>
+        </Banner>
+    );
+};
diff --git a/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCard.stories.tsx b/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCard.stories.tsx
index 4de9375d95d..c9dfae10a63 100644
--- a/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCard.stories.tsx
+++ b/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCard.stories.tsx
@@ -1,9 +1,11 @@
 import { IntlProvider } from 'react-intl';
+
+import { Meta, StoryObj } from '@storybook/react';
+
 import {
     PassphraseTypeCard as PassphraseTypeCardComponent,
     PassphraseTypeCardProps,
 } from './PassphraseTypeCard';
-import { Meta, StoryObj } from '@storybook/react';
 
 const meta: Meta = {
     title: 'PassphraseTypeCard',
@@ -18,7 +20,7 @@ const meta: Meta = {
 } as Meta;
 export default meta;
 
-export const PassphraseTypeCard: StoryObj<PassphraseTypeCardProps> = {
+export const Standard: StoryObj<PassphraseTypeCardProps> = {
     args: {
         title: 'My Trezor',
         description:
@@ -38,3 +40,22 @@ export const PassphraseTypeCard: StoryObj<PassphraseTypeCardProps> = {
         },
     },
 };
+
+export const Hidden: StoryObj<PassphraseTypeCardProps> = {
+    args: {
+        submitLabel: 'Yes please',
+        offerPassphraseOnDevice: false,
+        singleColModal: true,
+        onSubmit: () => null,
+        type: 'hidden',
+        deviceBackup: 'Bip39',
+    },
+    argTypes: {
+        type: {
+            options: ['standard', 'hidden'],
+            control: {
+                type: 'select',
+            },
+        },
+    },
+};
diff --git a/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCard.tsx b/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCard.tsx
index ccd398b1abd..39a31c531d9 100644
--- a/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCard.tsx
+++ b/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCard.tsx
@@ -1,18 +1,23 @@
-import { useState, useRef, useEffect, useCallback, ReactNode } from 'react';
+import { ReactNode, useCallback, useEffect, useRef, useState } from 'react';
+
 import { AnimatePresence } from 'framer-motion';
+import styled, { css } from 'styled-components';
+
 import { useKeyPress } from '@trezor/react-utils';
 import { setCaretPosition } from '@trezor/dom-utils';
-import styled, { css } from 'styled-components';
 import { countBytesInString } from '@trezor/utils';
 import { formInputsMaxLength } from '@suite-common/validators';
 import { TooltipProps } from '@trezor/components';
+import { DeviceModelInternal, Features } from '@trezor/connect';
+import { borders, spacingsPx } from '@trezor/theme';
+
 import { EnterOnTrezorButton } from './EnterOnTrezorButton';
-import { DeviceModelInternal } from '@trezor/connect';
 import { PassphraseTypeCardHeading } from './PassphraseTypeCardHeading';
 import { WalletType } from './types';
 import { PassphraseTypeCardContent } from './PassphraseTypeCardContent';
 import { DOT } from './consts';
-import { borders, spacingsPx } from '@trezor/theme';
+import { useNonAsciiChars } from './useNonAsciiChars';
+import { getSubmitLabel } from './getSubmitLabel';
 
 type WrapperProps = {
     $type: WalletType;
@@ -59,6 +64,7 @@ export type PassphraseTypeCardProps = {
     offerPassphraseOnDevice?: boolean;
     singleColModal?: boolean;
     deviceModel?: DeviceModelInternal;
+    deviceBackup?: Features['backup_type'] | null;
     onSubmit: (value: string, passphraseOnDevice?: boolean) => void;
     learnMoreTooltipOnClick?: TooltipProps['addon'];
     learnMoreTooltipAppendTo?: TooltipProps['appendTo'];
@@ -69,6 +75,7 @@ export const PassphraseTypeCard = (props: PassphraseTypeCardProps) => {
     const [showPassword, setShowPassword] = useState(false);
     const [hiddenWalletTouched, setHiddenWalletTouched] = useState(false);
     const enterPressed = useKeyPress('Enter');
+    const { nonAsciiChars, showAsciiBanner } = useNonAsciiChars(value);
 
     const ref = useRef<HTMLInputElement>(null);
     const caretRef = useRef<number>(0);
@@ -83,17 +90,22 @@ export const PassphraseTypeCard = (props: PassphraseTypeCardProps) => {
         title,
         description,
         singleColModal,
-        submitLabel,
+        submitLabel: submitLabelProp,
         offerPassphraseOnDevice,
         deviceModel,
+        deviceBackup,
     } = props;
     const submit = useCallback(
-        (value: string, passphraseOnDevice?: boolean) => {
-            onSubmit(value, passphraseOnDevice);
+        (value2: string, passphraseOnDevice?: boolean) => {
+            onSubmit(value2, passphraseOnDevice);
         },
         [onSubmit],
     );
 
+    const isBip39 = deviceBackup === 'Bip39';
+
+    const submitLabel = getSubmitLabel({ nonAsciiChars, label: submitLabelProp, showPassword });
+
     const canSubmit = (singleColModal || type === 'hidden') && !isPassphraseTooLong;
 
     // Trigger submit on pressing Enter in case of single col modal (creating/confirming passphrase wallet)
@@ -144,9 +156,12 @@ export const PassphraseTypeCard = (props: PassphraseTypeCardProps) => {
             <Item>
                 <PassphraseTypeCardContent
                     submitLabel={submitLabel}
+                    submitVariant={nonAsciiChars && !isBip39 ? 'warning' : 'primary'}
                     value={value}
                     setValue={setValue}
                     showPassword={showPassword}
+                    showAsciiBanner={showAsciiBanner}
+                    asciiBannerVariant={isBip39 ? 'info' : 'warning'}
                     setShowPassword={setShowPassword}
                     hiddenWalletTouched={hiddenWalletTouched}
                     setHiddenWalletTouched={setHiddenWalletTouched}
diff --git a/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardContent.tsx b/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardContent.tsx
index 3da44d56d27..8e4fb932b2f 100644
--- a/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardContent.tsx
+++ b/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardContent.tsx
@@ -1,14 +1,20 @@
-import { isAndroid } from '@trezor/env-utils';
-import { AnimatePresence, motion } from 'framer-motion';
 import { FormattedMessage, useIntl } from 'react-intl';
-import { Card, Column, Row, Input, Button, motionAnimation, Icon } from '@trezor/components';
-import { PasswordStrengthIndicator } from '../PasswordStrengthIndicator/PasswordStrengthIndicator';
+import { ChangeEvent, MutableRefObject, ReactNode, RefObject } from 'react';
+
+import { AnimatePresence, motion } from 'framer-motion';
 import styled, { useTheme } from 'styled-components';
+
+import { isAndroid } from '@trezor/env-utils';
+import { Button, Card, Column, Icon, Input, motionAnimation, Row } from '@trezor/components';
+import { ButtonVariant } from '@trezor/components/src/components/buttons/buttonStyleUtils';
+import { BannerVariant } from '@trezor/components/src/components/Banner/types';
 import { spacings, spacingsPx, typography } from '@trezor/theme';
 import { useKeyPress } from '@trezor/react-utils';
-import { ChangeEvent, MutableRefObject, ReactNode, RefObject } from 'react';
+
+import { PasswordStrengthIndicator } from '../PasswordStrengthIndicator/PasswordStrengthIndicator';
 import { WalletType } from './types';
 import { DOT } from './consts';
+import { NonAsciiBanner } from './NonAsciiBanner';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const PassphraseInput = styled(Input)`
@@ -43,12 +49,15 @@ const Description = styled.div`
 
 type PassphraseTypeCardContentProps = {
     submitLabel: ReactNode;
+    submitVariant?: ButtonVariant;
     type: WalletType;
     singleColModal?: boolean;
     displayValue: string;
     isPassphraseTooLong: boolean;
     value: string;
     setValue: (value: string) => void;
+    showAsciiBanner?: boolean;
+    asciiBannerVariant?: BannerVariant;
     showPassword: boolean;
     setShowPassword: (showPassword: boolean) => void;
     hiddenWalletTouched: boolean;
@@ -59,6 +68,7 @@ type PassphraseTypeCardContentProps = {
 };
 
 export const PassphraseTypeCardContent = ({
+    asciiBannerVariant = 'info',
     type,
     displayValue,
     isPassphraseTooLong,
@@ -66,6 +76,8 @@ export const PassphraseTypeCardContent = ({
     value,
     setValue,
     submitLabel,
+    submitVariant = 'primary',
+    showAsciiBanner,
     showPassword,
     setShowPassword,
     hiddenWalletTouched,
@@ -150,6 +162,7 @@ export const PassphraseTypeCardContent = ({
                                         ) : null
                                     }
                                     inputState={isPassphraseTooLong ? 'error' : undefined}
+                                    // eslint-disable-next-line jsx-a11y/no-autofocus
                                     autoFocus={!isAndroid()}
                                     innerAddon={
                                         <Icon
@@ -175,6 +188,7 @@ export const PassphraseTypeCardContent = ({
                         {value && !isPassphraseTooLong && (
                             <PasswordStrengthIndicator password={value} />
                         )}
+                        {showAsciiBanner && <NonAsciiBanner variant={asciiBannerVariant} />}
                     </>
                 )}
 
@@ -190,7 +204,7 @@ export const PassphraseTypeCardContent = ({
                                             type === 'hidden' ? 'hidden' : 'standard'
                                         }/submit-button`}
                                         isDisabled={isPassphraseEmpty || isPassphraseTooLong}
-                                        variant="primary"
+                                        variant={submitVariant}
                                         onClick={() => submit(value)}
                                         isFullWidth
                                     >
diff --git a/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardHeading.tsx b/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardHeading.tsx
index a4b4f913cc6..4b7607f5313 100644
--- a/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardHeading.tsx
+++ b/packages/product-components/src/components/PassphraseTypeCard/PassphraseTypeCardHeading.tsx
@@ -1,9 +1,12 @@
-import { borders, spacings, spacingsPx, typography } from '@trezor/theme';
 import { FormattedMessage } from 'react-intl';
+import { ReactNode } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
+import { borders, spacings, spacingsPx, typography } from '@trezor/theme';
 import { Tooltip, TooltipProps, Column, Row, Icon } from '@trezor/components';
+
 import { WalletType } from './types';
-import { ReactNode } from 'react';
 
 const IconWrapper = styled.div<{ $type: WalletType }>`
     width: 38px;
diff --git a/packages/product-components/src/components/PassphraseTypeCard/getSubmitLabel.tsx b/packages/product-components/src/components/PassphraseTypeCard/getSubmitLabel.tsx
new file mode 100644
index 00000000000..1dc8f15d82b
--- /dev/null
+++ b/packages/product-components/src/components/PassphraseTypeCard/getSubmitLabel.tsx
@@ -0,0 +1,28 @@
+import type { ReactNode } from 'react';
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+
+export const getSubmitLabel = ({
+    nonAsciiChars,
+    label,
+    showPassword,
+}: {
+    nonAsciiChars: null | string[];
+    label: ReactNode;
+    showPassword: boolean;
+}) => {
+    if (!nonAsciiChars) return label;
+
+    const displaySingleChar = showPassword && nonAsciiChars.length === 1;
+    const messageId = displaySingleChar ? 'TR_NON_ASCII_CHAR' : 'TR_NON_ASCII_CHARS';
+    const chars = displaySingleChar ? '"{char}"' : 'characters';
+    const defaultMessage = `{label} (with non-recommended ${chars})`;
+
+    return (
+        <FormattedMessage
+            id={messageId}
+            defaultMessage={defaultMessage}
+            values={{ char: nonAsciiChars[0], label }}
+        />
+    );
+};
diff --git a/packages/product-components/src/components/PassphraseTypeCard/useNonAsciiChars.ts b/packages/product-components/src/components/PassphraseTypeCard/useNonAsciiChars.ts
new file mode 100644
index 00000000000..292ffe3d426
--- /dev/null
+++ b/packages/product-components/src/components/PassphraseTypeCard/useNonAsciiChars.ts
@@ -0,0 +1,18 @@
+import { useEffect, useMemo, useState } from 'react';
+
+import { getNonAsciiChars } from '@trezor/utils';
+
+export const useNonAsciiChars = (value: string) => {
+    const [showAsciiBanner, setShowAsciiBanner] = useState(false);
+
+    const nonAsciiChars = useMemo(() => getNonAsciiChars(value), [value]);
+
+    useEffect(() => {
+        if (nonAsciiChars !== null) {
+            // If the banner was displayed once, we don't hide it again
+            setShowAsciiBanner(true);
+        }
+    }, [nonAsciiChars]);
+
+    return { nonAsciiChars, showAsciiBanner };
+};
diff --git a/packages/product-components/src/components/PasswordStrengthIndicator/PasswordStrengthIndicator.stories.tsx b/packages/product-components/src/components/PasswordStrengthIndicator/PasswordStrengthIndicator.stories.tsx
index 2cfa25c4087..c6a4dcd54d4 100644
--- a/packages/product-components/src/components/PasswordStrengthIndicator/PasswordStrengthIndicator.stories.tsx
+++ b/packages/product-components/src/components/PasswordStrengthIndicator/PasswordStrengthIndicator.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import {
     PasswordStrengthIndicatorProps,
     PasswordStrengthIndicator as PasswordStrengthIndicatorComponent,
diff --git a/packages/product-components/src/components/PasswordStrengthIndicator/PasswordStrengthIndicator.tsx b/packages/product-components/src/components/PasswordStrengthIndicator/PasswordStrengthIndicator.tsx
index b9ce15f084e..97c06047cca 100644
--- a/packages/product-components/src/components/PasswordStrengthIndicator/PasswordStrengthIndicator.tsx
+++ b/packages/product-components/src/components/PasswordStrengthIndicator/PasswordStrengthIndicator.tsx
@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react';
-import styled from 'styled-components';
 
+import styled from 'styled-components';
 import type { ZXCVBNScore } from 'zxcvbn';
 
 interface WrapperProps {
diff --git a/packages/product-components/src/components/RotateDeviceImage/RotateDeviceImage.stories.tsx b/packages/product-components/src/components/RotateDeviceImage/RotateDeviceImage.stories.tsx
index 6103f698957..797c7d210ec 100644
--- a/packages/product-components/src/components/RotateDeviceImage/RotateDeviceImage.stories.tsx
+++ b/packages/product-components/src/components/RotateDeviceImage/RotateDeviceImage.stories.tsx
@@ -1,9 +1,11 @@
 import { Meta, StoryObj } from '@storybook/react';
+
+import { DeviceModelInternal } from '@trezor/connect';
+
 import {
     RotateDeviceImage as RotateDeviceImageComponent,
     RotateDeviceImageProps,
 } from './RotateDeviceImage';
-import { DeviceModelInternal } from '@trezor/connect';
 
 const meta: Meta = {
     title: 'RotateDeviceImage',
diff --git a/packages/product-components/src/components/RotateDeviceImage/RotateDeviceImage.tsx b/packages/product-components/src/components/RotateDeviceImage/RotateDeviceImage.tsx
index e616ccffebd..7c6407a3dc0 100644
--- a/packages/product-components/src/components/RotateDeviceImage/RotateDeviceImage.tsx
+++ b/packages/product-components/src/components/RotateDeviceImage/RotateDeviceImage.tsx
@@ -1,9 +1,10 @@
 import React from 'react';
-import { DeviceAnimation } from '@trezor/components';
-import { DeviceModelInternal } from '@trezor/connect';
-import { Image } from '@trezor/components';
+
 import styled from 'styled-components';
 
+import { DeviceAnimation, Image } from '@trezor/components';
+import { DeviceModelInternal } from '@trezor/connect';
+
 export type RotateDeviceImageProps = {
     deviceModel?: DeviceModelInternal;
     deviceColor?: number;
diff --git a/packages/product-components/src/components/SelectAssetModal/AssetItem.tsx b/packages/product-components/src/components/SelectAssetModal/AssetItem.tsx
index f0e060b91ef..a547042bf9e 100644
--- a/packages/product-components/src/components/SelectAssetModal/AssetItem.tsx
+++ b/packages/product-components/src/components/SelectAssetModal/AssetItem.tsx
@@ -1,6 +1,7 @@
+import styled, { useTheme } from 'styled-components';
+
 import { spacings, spacingsPx } from '@trezor/theme';
 import { Badge, Column, Icon, Row, Text } from '@trezor/components';
-import styled, { useTheme } from 'styled-components';
 
 const ClickableContainer = styled.div`
     cursor: pointer;
diff --git a/packages/product-components/src/components/SelectAssetModal/AssetItemNotFound.tsx b/packages/product-components/src/components/SelectAssetModal/AssetItemNotFound.tsx
index dd49d68e646..243cd7df5b3 100644
--- a/packages/product-components/src/components/SelectAssetModal/AssetItemNotFound.tsx
+++ b/packages/product-components/src/components/SelectAssetModal/AssetItemNotFound.tsx
@@ -1,8 +1,10 @@
-import { Column, Paragraph, Text } from '@trezor/components';
 import { FormattedMessage } from 'react-intl';
-import { SelectAssetNetworkProps, SelectAssetSearchCategoryType } from './SelectAssetModal';
+
+import { Column, Paragraph, Text } from '@trezor/components';
 import { spacings } from '@trezor/theme';
 
+import { SelectAssetNetworkProps, SelectAssetSearchCategoryType } from './SelectAssetModal';
+
 interface AssetItemNotFoundProps {
     searchCategory: SelectAssetSearchCategoryType;
     networkCategories: SelectAssetNetworkProps[];
diff --git a/packages/product-components/src/components/SelectAssetModal/CheckableTag.tsx b/packages/product-components/src/components/SelectAssetModal/CheckableTag.tsx
index 60d836cba8b..2ad8fc28648 100644
--- a/packages/product-components/src/components/SelectAssetModal/CheckableTag.tsx
+++ b/packages/product-components/src/components/SelectAssetModal/CheckableTag.tsx
@@ -1,3 +1,5 @@
+import styled, { DefaultTheme } from 'styled-components';
+
 import { UIVariant } from '@trezor/components/src/config/types';
 import {
     borders,
@@ -7,7 +9,6 @@ import {
     spacingsPx,
     typography,
 } from '@trezor/theme';
-import styled, { DefaultTheme } from 'styled-components';
 
 export const tagVariants = ['primary', 'tertiary'] as const;
 export type TagVariant = Extract<UIVariant, (typeof tagVariants)[number]>;
diff --git a/packages/product-components/src/components/SelectAssetModal/NetworkTabs.tsx b/packages/product-components/src/components/SelectAssetModal/NetworkTabs.tsx
index 9792e71f9c3..ddfe9308405 100644
--- a/packages/product-components/src/components/SelectAssetModal/NetworkTabs.tsx
+++ b/packages/product-components/src/components/SelectAssetModal/NetworkTabs.tsx
@@ -1,8 +1,11 @@
+import { FormattedMessage } from 'react-intl';
+
+import styled from 'styled-components';
+
 import { AssetLogo, Row, Tooltip, useElevation } from '@trezor/components';
 import { Elevation, mapElevationToBorder, spacings, spacingsPx } from '@trezor/theme';
+
 import { SelectAssetNetworkProps, SelectAssetSearchCategoryType } from './SelectAssetModal';
-import styled from 'styled-components';
-import { FormattedMessage } from 'react-intl';
 import { CheckableTag } from './CheckableTag';
 
 interface NetworkTabsWrapperProps {
diff --git a/packages/product-components/src/components/SelectAssetModal/SelectAssetModal.stories.tsx b/packages/product-components/src/components/SelectAssetModal/SelectAssetModal.stories.tsx
index 6a74a3394bf..8047029142d 100644
--- a/packages/product-components/src/components/SelectAssetModal/SelectAssetModal.stories.tsx
+++ b/packages/product-components/src/components/SelectAssetModal/SelectAssetModal.stories.tsx
@@ -1,9 +1,12 @@
+import { IntlProvider } from 'react-intl';
+
 import { Meta, StoryObj } from '@storybook/react';
-import { SelectAssetModal as SelectAssetModalComponent, SelectAssetModalProps } from '../../index';
 import { ThemeProvider } from 'styled-components';
-import { intermediaryTheme, NewModal } from '@trezor/components';
 import { action } from '@storybook/addon-actions';
-import { IntlProvider } from 'react-intl';
+
+import { intermediaryTheme, NewModal } from '@trezor/components';
+
+import { SelectAssetModal as SelectAssetModalComponent, SelectAssetModalProps } from '../../index';
 import { selectAssetModalOptions, selectAssetModalNetworks } from './mockData';
 
 const meta: Meta = {
diff --git a/packages/product-components/src/components/SelectAssetModal/SelectAssetModal.tsx b/packages/product-components/src/components/SelectAssetModal/SelectAssetModal.tsx
index f47e9a3acdc..723a890d45c 100644
--- a/packages/product-components/src/components/SelectAssetModal/SelectAssetModal.tsx
+++ b/packages/product-components/src/components/SelectAssetModal/SelectAssetModal.tsx
@@ -1,4 +1,6 @@
 import { useMemo, useState } from 'react';
+import { useIntl } from 'react-intl';
+
 import {
     AssetLogo,
     Column,
@@ -9,11 +11,11 @@ import {
     VirtualizedList,
 } from '@trezor/components';
 import { mapElevationToBackgroundToken, spacings } from '@trezor/theme';
+import { getNetworkByCoingeckoId, Network } from '@suite-common/wallet-config';
+
 import { AssetItem } from './AssetItem';
 import { NetworkTabs } from './NetworkTabs';
-import { useIntl } from 'react-intl';
 import { AssetItemNotFound } from './AssetItemNotFound';
-import { getNetworkByCoingeckoId, Network } from '@suite-common/wallet-config';
 
 export interface SelectAssetOptionCurrencyProps {
     type: 'currency';
@@ -24,12 +26,14 @@ export interface SelectAssetOptionCurrencyProps {
     contractAddress?: string; // CryptoId (contractAddress)
     networkName?: string;
 }
+
 export interface SelectAssetOptionGroupProps {
     type: 'group';
     label: string;
     networkName?: string;
     coingeckoId?: string;
 }
+
 export type SelectAssetOptionProps = SelectAssetOptionCurrencyProps | SelectAssetOptionGroupProps;
 
 export interface SelectAssetNetworkProps {
@@ -158,6 +162,7 @@ export const SelectAssetModal = ({
                     })}
                     value={search}
                     onChange={event => setSearch(event.target.value)}
+                    // eslint-disable-next-line jsx-a11y/no-autofocus
                     autoFocus
                     onClear={() => {
                         setSearch('');
diff --git a/packages/product-components/src/components/TokenIconSet/TokenIconSet.stories.tsx b/packages/product-components/src/components/TokenIconSet/TokenIconSet.stories.tsx
new file mode 100644
index 00000000000..9593ac33187
--- /dev/null
+++ b/packages/product-components/src/components/TokenIconSet/TokenIconSet.stories.tsx
@@ -0,0 +1,47 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { TokenIconSet as TokenIconSetComponent, TokenIconSetProps } from './TokenIconSet';
+
+const getToken = (contract: string, symbol: string, decimals: number) => ({
+    contract,
+    symbol,
+    decimals,
+    type: 'ERC20',
+});
+
+const TOKEN_1 = getToken('0xaea46a60368a7bd060eec7df8cba43b7ef41ad85', 'FET', 6);
+const TOKEN_2 = getToken('0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9', 'AAVE', 6);
+const TOKEN_3 = getToken('0x95ad61b0a150d79219dcf64e1e6cc01f0b64c4ce', 'SHIB', 18);
+const TOKEN_4 = getToken('0xdAC17F958D2ee523a2206206994597C13D831ec7', 'usdt', 6);
+
+const meta: Meta = {
+    title: 'TokenIconSet',
+} as Meta;
+export default meta;
+export const TokenIconSet: StoryObj<TokenIconSetProps> = {
+    render: (props: TokenIconSetProps) => <TokenIconSetComponent {...props} />,
+    args: {
+        network: 'eth',
+        tokens: [TOKEN_1, TOKEN_2, TOKEN_3, TOKEN_4],
+    },
+    argTypes: {
+        tokens: {
+            options: ['1', '2', '3', '4'],
+            mapping: {
+                '1': [TOKEN_1],
+                '2': [TOKEN_1, TOKEN_2],
+                '3': [TOKEN_1, TOKEN_2, TOKEN_3],
+                '4': [TOKEN_1, TOKEN_2, TOKEN_3, TOKEN_4],
+            },
+            control: {
+                type: 'select',
+                labels: {
+                    1: '1 token',
+                    2: '2 tokens',
+                    3: '3 tokens',
+                    4: '4+ tokens',
+                },
+            },
+        },
+    },
+};
diff --git a/packages/product-components/src/components/TokenIconSet/TokenIconSet.tsx b/packages/product-components/src/components/TokenIconSet/TokenIconSet.tsx
new file mode 100644
index 00000000000..4a23a768c6f
--- /dev/null
+++ b/packages/product-components/src/components/TokenIconSet/TokenIconSet.tsx
@@ -0,0 +1,67 @@
+import styled, { css } from 'styled-components';
+
+import { AssetLogo, useElevation } from '@trezor/components';
+import { getCoingeckoId, NetworkSymbol } from '@suite-common/wallet-config';
+import { TokenInfo } from '@trezor/connect';
+import { getContractAddressForNetwork } from '@suite-common/wallet-utils';
+import { borders, Elevation, mapElevationToBackground, mapElevationToBorder } from '@trezor/theme';
+
+export type TokenIconSetProps = {
+    network: NetworkSymbol;
+    tokens: TokenInfo[];
+};
+
+const IconContainer = styled.div<{ $length: number }>`
+    width: 24px;
+    justify-content: center;
+    display: flex;
+    align-items: center;
+    ${({ $length }) =>
+        $length > 1 &&
+        css`
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(${$length > 1 ? '1px' : '6px'}, 6px));
+            direction: rtl;
+            justify-items: center;
+        `}
+`;
+
+const TokenIconPlaceholder = styled.div<{ $elevation: Elevation }>`
+    width: 20px;
+    height: 20px;
+    border-radius: ${borders.radii.full};
+    border: 1px solid ${mapElevationToBorder};
+    background: ${mapElevationToBackground};
+`;
+
+/**
+ * @param tokens - provide already sorted tokens (for example by fiat value).
+ */
+export const TokenIconSet = ({ network, tokens }: TokenIconSetProps) => {
+    const { elevation } = useElevation();
+    const { length } = tokens;
+
+    if (length === 0) {
+        return null;
+    }
+
+    const visibleTokens = tokens.slice(0, 3).reverse();
+
+    const coingeckoId = getCoingeckoId(network);
+
+    return (
+        <IconContainer $length={length}>
+            {length > 3 && <TokenIconPlaceholder $elevation={elevation} />}
+            {visibleTokens.map(token => (
+                <AssetLogo
+                    key={token.contract}
+                    size={20}
+                    coingeckoId={coingeckoId ?? ''}
+                    contractAddress={getContractAddressForNetwork(network, token.contract)}
+                    placeholder={token.symbol?.toUpperCase() ?? ''}
+                    placeholderWithTooltip={false}
+                />
+            ))}
+        </IconContainer>
+    );
+};
diff --git a/packages/product-components/src/components/TrezorLogo/TrezorLogo.stories.tsx b/packages/product-components/src/components/TrezorLogo/TrezorLogo.stories.tsx
index 35990acb837..88e043b585b 100644
--- a/packages/product-components/src/components/TrezorLogo/TrezorLogo.stories.tsx
+++ b/packages/product-components/src/components/TrezorLogo/TrezorLogo.stories.tsx
@@ -1,4 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
+
 import { TrezorLogoProps, TrezorLogo as TrezorLogoComponent } from './TrezorLogo';
 
 const meta: Meta = {
diff --git a/packages/product-components/src/components/TrezorLogo/TrezorLogo.tsx b/packages/product-components/src/components/TrezorLogo/TrezorLogo.tsx
index 5d94bf063eb..056cb3429a3 100644
--- a/packages/product-components/src/components/TrezorLogo/TrezorLogo.tsx
+++ b/packages/product-components/src/components/TrezorLogo/TrezorLogo.tsx
@@ -1,5 +1,7 @@
 import { ReactSVG } from 'react-svg';
+
 import styled, { useTheme } from 'styled-components';
+
 import { LOGOS } from './trezorLogos';
 
 export type TrezorLogoType =
diff --git a/packages/product-components/src/components/TrezorLogo/trezorLogos.stories.tsx b/packages/product-components/src/components/TrezorLogo/trezorLogos.stories.tsx
index 53415f80ee5..494737ab363 100644
--- a/packages/product-components/src/components/TrezorLogo/trezorLogos.stories.tsx
+++ b/packages/product-components/src/components/TrezorLogo/trezorLogos.stories.tsx
@@ -1,8 +1,10 @@
 import styled from 'styled-components';
 import { Meta, StoryObj } from '@storybook/react';
-import { TrezorLogo } from './TrezorLogo';
+
 import { StoryColumn } from '@trezor/components';
 
+import { TrezorLogo } from './TrezorLogo';
+
 interface WrapperProps {
     isDark?: boolean;
 }
diff --git a/packages/components/src/images/coins/eos.svg b/packages/product-components/src/images/coins/eos.svg
similarity index 100%
rename from packages/components/src/images/coins/eos.svg
rename to packages/product-components/src/images/coins/eos.svg
diff --git a/packages/components/src/images/coins/nem.svg b/packages/product-components/src/images/coins/nem.svg
similarity index 100%
rename from packages/components/src/images/coins/nem.svg
rename to packages/product-components/src/images/coins/nem.svg
diff --git a/packages/product-components/src/images/coins/op.svg b/packages/product-components/src/images/coins/op.svg
new file mode 100644
index 00000000000..098392b7f62
--- /dev/null
+++ b/packages/product-components/src/images/coins/op.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FF0420;}
+	.st1{fill:#FFFFFF;}
+</style>
+<circle class="st0" cx="250" cy="250" r="250"/>
+<path class="st1" d="M177.1,316.4c-14.9,0-27.1-3.5-36.6-10.5c-9.4-7.1-14.1-17.3-14.1-30.4c0-2.8,0.3-6.1,0.9-10.1
+	c1.6-9,3.9-19.8,6.9-32.5c8.5-34.4,30.5-51.6,65.9-51.6c9.6,0,18.3,1.6,25.9,4.9c7.6,3.1,13.6,7.9,18,14.3
+	c4.4,6.3,6.6,13.8,6.6,22.5c0,2.6-0.3,5.9-0.9,9.9c-1.9,11.1-4.1,22-6.8,32.5c-4.4,17.1-11.9,30-22.7,38.5
+	C209.5,312.3,195.1,316.4,177.1,316.4z M179.8,289.4c7,0,12.9-2.1,17.8-6.2c5-4.1,8.6-10.4,10.7-19c2.9-11.8,5.1-22,6.6-30.8
+	c0.5-2.6,0.8-5.3,0.8-8.1c0-11.4-5.9-17.1-17.8-17.1c-7,0-13,2.1-18,6.2c-4.9,4.1-8.4,10.4-10.5,19c-2.3,8.4-4.5,18.6-6.8,30.8
+	c-0.5,2.5-0.8,5.1-0.8,7.9C161.7,283.7,167.8,289.4,179.8,289.4z"/>
+<path class="st1" d="M259.3,314.6c-1.4,0-2.4-0.4-3.2-1.3c-0.6-1-0.8-2.1-0.6-3.4l25.9-122c0.2-1.4,0.9-2.5,2.1-3.4
+	c1.1-0.9,2.3-1.3,3.6-1.3H337c13.9,0,25,2.9,33.4,8.6c8.5,5.8,12.8,14.1,12.8,25c0,3.1-0.4,6.4-1.1,9.8c-3.1,14.4-9.4,25-19,31.9
+	c-9.4,6.9-22.3,10.3-38.7,10.3h-25.3l-8.6,41.1c-0.3,1.4-0.9,2.5-2.1,3.4c-1.1,0.9-2.3,1.3-3.6,1.3H259.3z M325.7,242.9
+	c5.3,0,9.8-1.4,13.7-4.3c4-2.9,6.6-7,7.9-12.4c0.4-2.1,0.6-4,0.6-5.6c0-3.6-1.1-6.4-3.2-8.3c-2.1-2-5.8-3-10.9-3h-22.5l-7.1,33.6
+	H325.7z"/>
+</svg>
diff --git a/packages/components/src/images/coins/xlm.svg b/packages/product-components/src/images/coins/xlm.svg
similarity index 100%
rename from packages/components/src/images/coins/xlm.svg
rename to packages/product-components/src/images/coins/xlm.svg
diff --git a/packages/components/src/images/coins/xtz.svg b/packages/product-components/src/images/coins/xtz.svg
similarity index 100%
rename from packages/components/src/images/coins/xtz.svg
rename to packages/product-components/src/images/coins/xtz.svg
diff --git a/packages/product-components/src/index.ts b/packages/product-components/src/index.ts
index e4dbd2cfce1..dbc1071338b 100644
--- a/packages/product-components/src/index.ts
+++ b/packages/product-components/src/index.ts
@@ -15,3 +15,4 @@ export { TrezorLogo } from './components/TrezorLogo/TrezorLogo';
 export { PasswordStrengthIndicator } from './components/PasswordStrengthIndicator/PasswordStrengthIndicator';
 export { CoinLogo } from './components/CoinLogo/CoinLogo';
 export { AssetShareIndicator } from './components/AssetShareIndicator/AssetShareIndicator';
+export * from './components/TokenIconSet/TokenIconSet';
diff --git a/packages/product-components/src/utils/mapTrezorModelToIcon.ts b/packages/product-components/src/utils/mapTrezorModelToIcon.ts
index 0cbf0306da4..f2a92511fee 100644
--- a/packages/product-components/src/utils/mapTrezorModelToIcon.ts
+++ b/packages/product-components/src/utils/mapTrezorModelToIcon.ts
@@ -7,4 +7,5 @@ export const mapTrezorModelToIcon: Record<DeviceModelInternal, IconName> = {
     [DeviceModelInternal.T2B1]: 'trezorSafe3Filled',
     [DeviceModelInternal.T3B1]: 'trezorSafe3Filled',
     [DeviceModelInternal.T3T1]: 'trezorSafe5Filled',
+    [DeviceModelInternal.T3W1]: 'trezorSafe7Filled',
 };
diff --git a/packages/product-components/styled.d.ts b/packages/product-components/styled.d.ts
index ff56311cfb2..83b3a85013a 100644
--- a/packages/product-components/styled.d.ts
+++ b/packages/product-components/styled.d.ts
@@ -1,6 +1,7 @@
 // import original module declarations
 import 'styled-components';
 import { BoxShadows, Colors } from '@trezor/theme';
+
 import { SuiteThemeColors } from './src/config/colors';
 
 declare module 'styled-components' {
diff --git a/packages/product-components/tsconfig.json b/packages/product-components/tsconfig.json
index 64b47d80c4c..5389a996a22 100644
--- a/packages/product-components/tsconfig.json
+++ b/packages/product-components/tsconfig.json
@@ -19,12 +19,17 @@
         {
             "path": "../../suite-common/wallet-config"
         },
+        {
+            "path": "../../suite-common/wallet-utils"
+        },
         { "path": "../components" },
         { "path": "../connect" },
         { "path": "../dom-utils" },
         { "path": "../env-utils" },
         { "path": "../react-utils" },
         { "path": "../theme" },
-        { "path": "../utils" }
+        { "path": "../urls" },
+        { "path": "../utils" },
+        { "path": "../eslint" }
     ]
 }
diff --git a/packages/protobuf/.eslintrc.js b/packages/protobuf/.eslintrc.js
deleted file mode 100644
index 2c3cec6f758..00000000000
--- a/packages/protobuf/.eslintrc.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-    rules: {
-        '@typescript-eslint/ban-types': 'off', // allow {} in protobuf.d.ts
-        '@typescript-eslint/no-shadow': 'off',
-    },
-};
diff --git a/packages/protobuf/messages.json b/packages/protobuf/messages.json
index 8a19dcaf460..9a1cef61826 100644
--- a/packages/protobuf/messages.json
+++ b/packages/protobuf/messages.json
@@ -607,10 +607,7 @@
                 },
                 "overwintered": {
                     "type": "bool",
-                    "id": 7,
-                    "options": {
-                        "deprecated": true
-                    }
+                    "id": 7
                 },
                 "version_group_id": {
                     "type": "uint32",
@@ -751,9 +748,6 @@
             }
         },
         "TxAck": {
-            "options": {
-                "deprecated": true
-            },
             "fields": {
                 "tx": {
                     "type": "TransactionType",
@@ -808,10 +802,7 @@
                         },
                         "overwintered": {
                             "type": "bool",
-                            "id": 11,
-                            "options": {
-                                "deprecated": true
-                            }
+                            "id": 11
                         },
                         "version_group_id": {
                             "type": "uint32",
@@ -976,10 +967,7 @@
                                 },
                                 "payment_req_index": {
                                     "type": "uint32",
-                                    "id": 12,
-                                    "options": {
-                                        "(experimental_field)": true
-                                    }
+                                    "id": 12
                                 }
                             }
                         }
@@ -1119,10 +1107,7 @@
                 },
                 "payment_req_index": {
                     "type": "uint32",
-                    "id": 12,
-                    "options": {
-                        "(experimental_field)": true
-                    }
+                    "id": 12
                 }
             }
         },
@@ -1220,9 +1205,6 @@
             }
         },
         "TxAckPaymentRequest": {
-            "options": {
-                "(experimental_message)": true
-            },
             "fields": {
                 "nonce": {
                     "type": "bytes",
@@ -2572,15 +2554,14 @@
                 "pages": {
                     "type": "uint32",
                     "id": 2
+                },
+                "name": {
+                    "type": "string",
+                    "id": 4
                 }
             },
             "nested": {
                 "ButtonRequestType": {
-                    "valuesOptions": {
-                        "_Deprecated_ButtonRequest_PassphraseType": {
-                            "deprecated": true
-                        }
-                    },
                     "values": {
                         "ButtonRequest_Other": 1,
                         "ButtonRequest_FeeOverThreshold": 2,
@@ -2641,10 +2622,7 @@
             "fields": {
                 "_on_device": {
                     "type": "bool",
-                    "id": 1,
-                    "options": {
-                        "deprecated": true
-                    }
+                    "id": 1
                 }
             }
         },
@@ -2656,10 +2634,7 @@
                 },
                 "_state": {
                     "type": "bytes",
-                    "id": 2,
-                    "options": {
-                        "deprecated": true
-                    }
+                    "id": 2
                 },
                 "on_device": {
                     "type": "bool",
@@ -2668,9 +2643,6 @@
             }
         },
         "Deprecated_PassphraseStateRequest": {
-            "options": {
-                "deprecated": true
-            },
             "fields": {
                 "state": {
                     "type": "bytes",
@@ -2679,9 +2651,6 @@
             }
         },
         "Deprecated_PassphraseStateAck": {
-            "options": {
-                "deprecated": true
-            },
             "fields": {}
         },
         "HDNodeType": {
@@ -3118,6 +3087,9 @@
         "DebugLinkResetDebugEvents": {
             "fields": {}
         },
+        "DebugLinkOptigaSetSecMax": {
+            "fields": {}
+        },
         "EosGetPublicKey": {
             "fields": {
                 "address_n": {
@@ -3952,10 +3924,7 @@
             "fields": {
                 "_old_address": {
                     "type": "bytes",
-                    "id": 1,
-                    "options": {
-                        "deprecated": true
-                    }
+                    "id": 1
                 },
                 "address": {
                     "type": "string",
@@ -4289,10 +4258,7 @@
                 },
                 "_skip_passphrase": {
                     "type": "bool",
-                    "id": 2,
-                    "options": {
-                        "deprecated": true
-                    }
+                    "id": 2
                 },
                 "derive_cardano": {
                     "type": "bool",
@@ -4370,10 +4336,7 @@
                 },
                 "_passphrase_cached": {
                     "type": "bool",
-                    "id": 17,
-                    "options": {
-                        "deprecated": true
-                    }
+                    "id": 17
                 },
                 "firmware_present": {
                     "type": "bool",
@@ -4543,38 +4506,6 @@
                     }
                 },
                 "Capability": {
-                    "options": {
-                        "(has_bitcoin_only_values)": true
-                    },
-                    "valuesOptions": {
-                        "Capability_Bitcoin": {
-                            "(bitcoin_only)": true
-                        },
-                        "Capability_Crypto": {
-                            "(bitcoin_only)": true
-                        },
-                        "Capability_Lisk": {
-                            "deprecated": true
-                        },
-                        "Capability_Shamir": {
-                            "(bitcoin_only)": true
-                        },
-                        "Capability_ShamirGroups": {
-                            "(bitcoin_only)": true
-                        },
-                        "Capability_PassphraseEntry": {
-                            "(bitcoin_only)": true
-                        },
-                        "Capability_Translations": {
-                            "(bitcoin_only)": true
-                        },
-                        "Capability_Brightness": {
-                            "(bitcoin_only)": true
-                        },
-                        "Capability_Haptic": {
-                            "(bitcoin_only)": true
-                        }
-                    },
                     "values": {
                         "Capability_Bitcoin": 1,
                         "Capability_Bitcoin_like": 2,
@@ -4619,10 +4550,7 @@
             "fields": {
                 "language": {
                     "type": "string",
-                    "id": 1,
-                    "options": {
-                        "deprecated": true
-                    }
+                    "id": 1
                 },
                 "label": {
                     "type": "string",
@@ -4638,10 +4566,7 @@
                 },
                 "_passphrase_source": {
                     "type": "uint32",
-                    "id": 5,
-                    "options": {
-                        "deprecated": true
-                    }
+                    "id": 5
                 },
                 "auto_lock_delay_ms": {
                     "type": "uint32",
@@ -4848,10 +4773,7 @@
                 },
                 "language": {
                     "type": "string",
-                    "id": 5,
-                    "options": {
-                        "deprecated": true
-                    }
+                    "id": 5
                 },
                 "label": {
                     "type": "string",
@@ -4877,10 +4799,6 @@
         },
         "ResetDevice": {
             "fields": {
-                "display_random": {
-                    "type": "bool",
-                    "id": 1
-                },
                 "strength": {
                     "type": "uint32",
                     "id": 2,
@@ -4898,10 +4816,7 @@
                 },
                 "language": {
                     "type": "string",
-                    "id": 5,
-                    "options": {
-                        "deprecated": true
-                    }
+                    "id": 5
                 },
                 "label": {
                     "type": "string",
@@ -4985,10 +4900,7 @@
                 },
                 "language": {
                     "type": "string",
-                    "id": 4,
-                    "options": {
-                        "deprecated": true
-                    }
+                    "id": 4
                 },
                 "label": {
                     "type": "string",
@@ -5118,15 +5030,9 @@
             }
         },
         "GetNonce": {
-            "options": {
-                "(experimental_message)": true
-            },
             "fields": {}
         },
         "Nonce": {
-            "options": {
-                "(experimental_message)": true
-            },
             "fields": {
                 "nonce": {
                     "rule": "required",
@@ -5173,186 +5079,437 @@
                 }
             }
         },
-        "MoneroNetworkType": {
-            "values": {
-                "MAINNET": 0,
-                "TESTNET": 1,
-                "STAGENET": 2,
-                "FAKECHAIN": 3
+        "NEMGetAddress": {
+            "fields": {
+                "address_n": {
+                    "rule": "repeated",
+                    "type": "uint32",
+                    "id": 1,
+                    "options": {
+                        "packed": false
+                    }
+                },
+                "network": {
+                    "type": "uint32",
+                    "id": 2,
+                    "options": {
+                        "default": 104
+                    }
+                },
+                "show_display": {
+                    "type": "bool",
+                    "id": 3
+                },
+                "chunkify": {
+                    "type": "bool",
+                    "id": 4
+                }
             }
         },
-        "MoneroTransactionSourceEntry": {
+        "NEMAddress": {
             "fields": {
-                "outputs": {
-                    "rule": "repeated",
-                    "type": "MoneroOutputEntry",
+                "address": {
+                    "rule": "required",
+                    "type": "string",
+                    "id": 1
+                }
+            }
+        },
+        "NEMSignTx": {
+            "fields": {
+                "transaction": {
+                    "rule": "required",
+                    "type": "NEMTransactionCommon",
                     "id": 1
                 },
-                "real_output": {
-                    "type": "uint64",
+                "multisig": {
+                    "type": "NEMTransactionCommon",
                     "id": 2
                 },
-                "real_out_tx_key": {
-                    "type": "bytes",
+                "transfer": {
+                    "type": "NEMTransfer",
                     "id": 3
                 },
-                "real_out_additional_tx_keys": {
-                    "rule": "repeated",
-                    "type": "bytes",
+                "cosigning": {
+                    "type": "bool",
                     "id": 4
                 },
-                "real_output_in_tx_index": {
-                    "type": "uint64",
+                "provision_namespace": {
+                    "type": "NEMProvisionNamespace",
                     "id": 5
                 },
-                "amount": {
-                    "type": "uint64",
+                "mosaic_creation": {
+                    "type": "NEMMosaicCreation",
                     "id": 6
                 },
-                "rct": {
-                    "type": "bool",
+                "supply_change": {
+                    "type": "NEMMosaicSupplyChange",
                     "id": 7
                 },
-                "mask": {
-                    "type": "bytes",
+                "aggregate_modification": {
+                    "type": "NEMAggregateModification",
                     "id": 8
                 },
-                "multisig_kLRki": {
-                    "type": "MoneroMultisigKLRki",
+                "importance_transfer": {
+                    "type": "NEMImportanceTransfer",
                     "id": 9
                 },
-                "subaddr_minor": {
-                    "type": "uint32",
+                "chunkify": {
+                    "type": "bool",
                     "id": 10
                 }
             },
             "nested": {
-                "MoneroOutputEntry": {
+                "NEMTransactionCommon": {
                     "fields": {
-                        "idx": {
+                        "address_n": {
+                            "rule": "repeated",
+                            "type": "uint32",
+                            "id": 1,
+                            "options": {
+                                "packed": false
+                            }
+                        },
+                        "network": {
+                            "type": "uint32",
+                            "id": 2,
+                            "options": {
+                                "default": 104
+                            }
+                        },
+                        "timestamp": {
+                            "rule": "required",
+                            "type": "uint32",
+                            "id": 3
+                        },
+                        "fee": {
+                            "rule": "required",
                             "type": "uint64",
+                            "id": 4
+                        },
+                        "deadline": {
+                            "rule": "required",
+                            "type": "uint32",
+                            "id": 5
+                        },
+                        "signer": {
+                            "type": "bytes",
+                            "id": 6
+                        }
+                    }
+                },
+                "NEMTransfer": {
+                    "fields": {
+                        "recipient": {
+                            "rule": "required",
+                            "type": "string",
                             "id": 1
                         },
-                        "key": {
-                            "type": "MoneroRctKeyPublic",
+                        "amount": {
+                            "rule": "required",
+                            "type": "uint64",
                             "id": 2
+                        },
+                        "payload": {
+                            "type": "bytes",
+                            "id": 3
+                        },
+                        "public_key": {
+                            "type": "bytes",
+                            "id": 4
+                        },
+                        "mosaics": {
+                            "rule": "repeated",
+                            "type": "NEMMosaic",
+                            "id": 5
                         }
                     },
                     "nested": {
-                        "MoneroRctKeyPublic": {
+                        "NEMMosaic": {
                             "fields": {
-                                "dest": {
+                                "namespace": {
                                     "rule": "required",
-                                    "type": "bytes",
+                                    "type": "string",
                                     "id": 1
                                 },
-                                "commitment": {
+                                "mosaic": {
                                     "rule": "required",
-                                    "type": "bytes",
+                                    "type": "string",
                                     "id": 2
+                                },
+                                "quantity": {
+                                    "rule": "required",
+                                    "type": "uint64",
+                                    "id": 3
                                 }
                             }
                         }
                     }
                 },
-                "MoneroMultisigKLRki": {
+                "NEMProvisionNamespace": {
                     "fields": {
-                        "K": {
-                            "type": "bytes",
+                        "namespace": {
+                            "rule": "required",
+                            "type": "string",
                             "id": 1
                         },
-                        "L": {
-                            "type": "bytes",
+                        "parent": {
+                            "type": "string",
                             "id": 2
                         },
-                        "R": {
-                            "type": "bytes",
+                        "sink": {
+                            "rule": "required",
+                            "type": "string",
                             "id": 3
                         },
-                        "ki": {
-                            "type": "bytes",
+                        "fee": {
+                            "rule": "required",
+                            "type": "uint64",
                             "id": 4
                         }
                     }
-                }
-            }
-        },
-        "MoneroTransactionDestinationEntry": {
-            "fields": {
-                "amount": {
-                    "type": "uint64",
-                    "id": 1
-                },
-                "addr": {
-                    "type": "MoneroAccountPublicAddress",
-                    "id": 2
                 },
-                "is_subaddress": {
-                    "type": "bool",
-                    "id": 3
-                },
-                "original": {
-                    "type": "bytes",
-                    "id": 4
+                "NEMMosaicCreation": {
+                    "fields": {
+                        "definition": {
+                            "rule": "required",
+                            "type": "NEMMosaicDefinition",
+                            "id": 1
+                        },
+                        "sink": {
+                            "rule": "required",
+                            "type": "string",
+                            "id": 2
+                        },
+                        "fee": {
+                            "rule": "required",
+                            "type": "uint64",
+                            "id": 3
+                        }
+                    },
+                    "nested": {
+                        "NEMMosaicDefinition": {
+                            "fields": {
+                                "name": {
+                                    "type": "string",
+                                    "id": 1
+                                },
+                                "ticker": {
+                                    "type": "string",
+                                    "id": 2
+                                },
+                                "namespace": {
+                                    "rule": "required",
+                                    "type": "string",
+                                    "id": 3
+                                },
+                                "mosaic": {
+                                    "rule": "required",
+                                    "type": "string",
+                                    "id": 4
+                                },
+                                "divisibility": {
+                                    "type": "uint32",
+                                    "id": 5
+                                },
+                                "levy": {
+                                    "type": "NEMMosaicLevy",
+                                    "id": 6
+                                },
+                                "fee": {
+                                    "type": "uint64",
+                                    "id": 7
+                                },
+                                "levy_address": {
+                                    "type": "string",
+                                    "id": 8
+                                },
+                                "levy_namespace": {
+                                    "type": "string",
+                                    "id": 9
+                                },
+                                "levy_mosaic": {
+                                    "type": "string",
+                                    "id": 10
+                                },
+                                "supply": {
+                                    "type": "uint64",
+                                    "id": 11
+                                },
+                                "mutable_supply": {
+                                    "type": "bool",
+                                    "id": 12
+                                },
+                                "transferable": {
+                                    "type": "bool",
+                                    "id": 13
+                                },
+                                "description": {
+                                    "rule": "required",
+                                    "type": "string",
+                                    "id": 14
+                                },
+                                "networks": {
+                                    "rule": "repeated",
+                                    "type": "uint32",
+                                    "id": 15,
+                                    "options": {
+                                        "packed": false
+                                    }
+                                }
+                            },
+                            "nested": {
+                                "NEMMosaicLevy": {
+                                    "values": {
+                                        "MosaicLevy_Absolute": 1,
+                                        "MosaicLevy_Percentile": 2
+                                    }
+                                }
+                            }
+                        }
+                    }
                 },
-                "is_integrated": {
-                    "type": "bool",
-                    "id": 5
-                }
-            },
-            "nested": {
-                "MoneroAccountPublicAddress": {
+                "NEMMosaicSupplyChange": {
                     "fields": {
-                        "spend_public_key": {
-                            "type": "bytes",
+                        "namespace": {
+                            "rule": "required",
+                            "type": "string",
+                            "id": 1
+                        },
+                        "mosaic": {
+                            "rule": "required",
+                            "type": "string",
+                            "id": 2
+                        },
+                        "type": {
+                            "rule": "required",
+                            "type": "NEMSupplyChangeType",
+                            "id": 3
+                        },
+                        "delta": {
+                            "rule": "required",
+                            "type": "uint64",
+                            "id": 4
+                        }
+                    },
+                    "nested": {
+                        "NEMSupplyChangeType": {
+                            "values": {
+                                "SupplyChange_Increase": 1,
+                                "SupplyChange_Decrease": 2
+                            }
+                        }
+                    }
+                },
+                "NEMAggregateModification": {
+                    "fields": {
+                        "modifications": {
+                            "rule": "repeated",
+                            "type": "NEMCosignatoryModification",
+                            "id": 1
+                        },
+                        "relative_change": {
+                            "type": "sint32",
+                            "id": 2
+                        }
+                    },
+                    "nested": {
+                        "NEMCosignatoryModification": {
+                            "fields": {
+                                "type": {
+                                    "rule": "required",
+                                    "type": "NEMModificationType",
+                                    "id": 1
+                                },
+                                "public_key": {
+                                    "rule": "required",
+                                    "type": "bytes",
+                                    "id": 2
+                                }
+                            },
+                            "nested": {
+                                "NEMModificationType": {
+                                    "values": {
+                                        "CosignatoryModification_Add": 1,
+                                        "CosignatoryModification_Delete": 2
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "NEMImportanceTransfer": {
+                    "fields": {
+                        "mode": {
+                            "rule": "required",
+                            "type": "NEMImportanceTransferMode",
                             "id": 1
                         },
-                        "view_public_key": {
+                        "public_key": {
+                            "rule": "required",
                             "type": "bytes",
                             "id": 2
                         }
+                    },
+                    "nested": {
+                        "NEMImportanceTransferMode": {
+                            "values": {
+                                "ImportanceTransfer_Activate": 1,
+                                "ImportanceTransfer_Deactivate": 2
+                            }
+                        }
                     }
                 }
             }
         },
-        "MoneroTransactionRsigData": {
+        "NEMSignedTx": {
             "fields": {
-                "rsig_type": {
-                    "type": "uint32",
+                "data": {
+                    "rule": "required",
+                    "type": "bytes",
                     "id": 1
                 },
-                "offload_type": {
-                    "type": "uint32",
+                "signature": {
+                    "rule": "required",
+                    "type": "bytes",
                     "id": 2
-                },
-                "grouping": {
+                }
+            }
+        },
+        "NEMDecryptMessage": {
+            "fields": {
+                "address_n": {
                     "rule": "repeated",
-                    "type": "uint64",
-                    "id": 3,
+                    "type": "uint32",
+                    "id": 1,
                     "options": {
                         "packed": false
                     }
                 },
-                "mask": {
-                    "type": "bytes",
-                    "id": 4
+                "network": {
+                    "type": "uint32",
+                    "id": 2
                 },
-                "rsig": {
+                "public_key": {
                     "type": "bytes",
-                    "id": 5
+                    "id": 3
                 },
-                "rsig_parts": {
-                    "rule": "repeated",
+                "payload": {
                     "type": "bytes",
-                    "id": 6
-                },
-                "bp_version": {
-                    "type": "uint32",
-                    "id": 7
+                    "id": 4
                 }
             }
         },
-        "MoneroGetAddress": {
+        "NEMDecryptedMessage": {
+            "fields": {
+                "payload": {
+                    "rule": "required",
+                    "type": "bytes",
+                    "id": 1
+                }
+            }
+        },
+        "RippleGetAddress": {
             "fields": {
                 "address_n": {
                     "rule": "repeated",
@@ -5366,40 +5523,22 @@
                     "type": "bool",
                     "id": 2
                 },
-                "network_type": {
-                    "type": "MoneroNetworkType",
-                    "id": 3,
-                    "options": {
-                        "default": "MAINNET"
-                    }
-                },
-                "account": {
-                    "type": "uint32",
-                    "id": 4
-                },
-                "minor": {
-                    "type": "uint32",
-                    "id": 5
-                },
-                "payment_id": {
-                    "type": "bytes",
-                    "id": 6
-                },
                 "chunkify": {
                     "type": "bool",
-                    "id": 7
+                    "id": 3
                 }
             }
         },
-        "MoneroAddress": {
+        "RippleAddress": {
             "fields": {
                 "address": {
-                    "type": "bytes",
+                    "rule": "required",
+                    "type": "string",
                     "id": 1
                 }
             }
         },
-        "MoneroGetWatchKey": {
+        "RippleSignTx": {
             "fields": {
                 "address_n": {
                     "rule": "repeated",
@@ -5409,4206 +5548,1327 @@
                         "packed": false
                     }
                 },
-                "network_type": {
-                    "type": "MoneroNetworkType",
-                    "id": 2,
-                    "options": {
-                        "default": "MAINNET"
-                    }
-                }
-            }
-        },
-        "MoneroWatchKey": {
-            "fields": {
-                "watch_key": {
-                    "type": "bytes",
-                    "id": 1
-                },
-                "address": {
-                    "type": "bytes",
+                "fee": {
+                    "rule": "required",
+                    "type": "uint64",
                     "id": 2
-                }
-            }
-        },
-        "MoneroTransactionInitRequest": {
-            "fields": {
-                "version": {
-                    "type": "uint32",
-                    "id": 1
                 },
-                "address_n": {
-                    "rule": "repeated",
+                "flags": {
                     "type": "uint32",
-                    "id": 2,
-                    "options": {
-                        "packed": false
-                    }
-                },
-                "network_type": {
-                    "type": "MoneroNetworkType",
                     "id": 3,
                     "options": {
-                        "default": "MAINNET"
+                        "default": 0
                     }
                 },
-                "tsx_data": {
-                    "type": "MoneroTransactionData",
+                "sequence": {
+                    "rule": "required",
+                    "type": "uint32",
                     "id": 4
+                },
+                "last_ledger_sequence": {
+                    "type": "uint32",
+                    "id": 5
+                },
+                "payment": {
+                    "rule": "required",
+                    "type": "RipplePayment",
+                    "id": 6
+                },
+                "chunkify": {
+                    "type": "bool",
+                    "id": 7
                 }
             },
             "nested": {
-                "MoneroTransactionData": {
+                "RipplePayment": {
                     "fields": {
-                        "version": {
-                            "type": "uint32",
+                        "amount": {
+                            "rule": "required",
+                            "type": "uint64",
                             "id": 1
                         },
-                        "payment_id": {
-                            "type": "bytes",
+                        "destination": {
+                            "rule": "required",
+                            "type": "string",
                             "id": 2
                         },
-                        "unlock_time": {
-                            "type": "uint64",
-                            "id": 3
-                        },
-                        "outputs": {
-                            "rule": "repeated",
-                            "type": "MoneroTransactionDestinationEntry",
-                            "id": 4
-                        },
-                        "change_dts": {
-                            "type": "MoneroTransactionDestinationEntry",
-                            "id": 5
-                        },
-                        "num_inputs": {
-                            "type": "uint32",
-                            "id": 6
-                        },
-                        "mixin": {
-                            "type": "uint32",
-                            "id": 7
-                        },
-                        "fee": {
-                            "type": "uint64",
-                            "id": 8
-                        },
-                        "account": {
-                            "type": "uint32",
-                            "id": 9
-                        },
-                        "minor_indices": {
-                            "rule": "repeated",
-                            "type": "uint32",
-                            "id": 10,
-                            "options": {
-                                "packed": false
-                            }
-                        },
-                        "rsig_data": {
-                            "type": "MoneroTransactionRsigData",
-                            "id": 11
-                        },
-                        "integrated_indices": {
-                            "rule": "repeated",
-                            "type": "uint32",
-                            "id": 12,
-                            "options": {
-                                "packed": false
-                            }
-                        },
-                        "client_version": {
-                            "type": "uint32",
-                            "id": 13
-                        },
-                        "hard_fork": {
+                        "destination_tag": {
                             "type": "uint32",
-                            "id": 14
-                        },
-                        "monero_version": {
-                            "type": "bytes",
-                            "id": 15
-                        },
-                        "chunkify": {
-                            "type": "bool",
-                            "id": 16
+                            "id": 3
                         }
                     }
                 }
             }
         },
-        "MoneroTransactionInitAck": {
+        "RippleSignedTx": {
             "fields": {
-                "hmacs": {
-                    "rule": "repeated",
+                "signature": {
+                    "rule": "required",
                     "type": "bytes",
                     "id": 1
                 },
-                "rsig_data": {
-                    "type": "MoneroTransactionRsigData",
+                "serialized_tx": {
+                    "rule": "required",
+                    "type": "bytes",
                     "id": 2
                 }
             }
         },
-        "MoneroTransactionSetInputRequest": {
+        "SolanaGetPublicKey": {
             "fields": {
-                "src_entr": {
-                    "type": "MoneroTransactionSourceEntry",
-                    "id": 1
+                "address_n": {
+                    "rule": "repeated",
+                    "type": "uint32",
+                    "id": 1,
+                    "options": {
+                        "packed": false
+                    }
+                },
+                "show_display": {
+                    "type": "bool",
+                    "id": 2
                 }
             }
         },
-        "MoneroTransactionSetInputAck": {
+        "SolanaPublicKey": {
             "fields": {
-                "vini": {
+                "public_key": {
+                    "rule": "required",
                     "type": "bytes",
                     "id": 1
-                },
-                "vini_hmac": {
-                    "type": "bytes",
-                    "id": 2
-                },
-                "pseudo_out": {
-                    "type": "bytes",
-                    "id": 3
-                },
-                "pseudo_out_hmac": {
-                    "type": "bytes",
-                    "id": 4
-                },
-                "pseudo_out_alpha": {
-                    "type": "bytes",
-                    "id": 5
-                },
-                "spend_key": {
-                    "type": "bytes",
-                    "id": 6
                 }
             }
         },
-        "MoneroTransactionInputViniRequest": {
+        "SolanaGetAddress": {
             "fields": {
-                "src_entr": {
-                    "type": "MoneroTransactionSourceEntry",
-                    "id": 1
+                "address_n": {
+                    "rule": "repeated",
+                    "type": "uint32",
+                    "id": 1,
+                    "options": {
+                        "packed": false
+                    }
                 },
-                "vini": {
-                    "type": "bytes",
+                "show_display": {
+                    "type": "bool",
                     "id": 2
                 },
-                "vini_hmac": {
-                    "type": "bytes",
+                "chunkify": {
+                    "type": "bool",
                     "id": 3
-                },
-                "pseudo_out": {
-                    "type": "bytes",
-                    "id": 4
-                },
-                "pseudo_out_hmac": {
-                    "type": "bytes",
-                    "id": 5
-                },
-                "orig_idx": {
-                    "type": "uint32",
-                    "id": 6
                 }
             }
         },
-        "MoneroTransactionInputViniAck": {
-            "fields": {}
-        },
-        "MoneroTransactionAllInputsSetRequest": {
-            "fields": {}
-        },
-        "MoneroTransactionAllInputsSetAck": {
+        "SolanaAddress": {
             "fields": {
-                "rsig_data": {
-                    "type": "MoneroTransactionRsigData",
+                "address": {
+                    "rule": "required",
+                    "type": "string",
                     "id": 1
                 }
             }
         },
-        "MoneroTransactionSetOutputRequest": {
+        "SolanaTxTokenAccountInfo": {
             "fields": {
-                "dst_entr": {
-                    "type": "MoneroTransactionDestinationEntry",
+                "base_address": {
+                    "rule": "required",
+                    "type": "string",
                     "id": 1
                 },
-                "dst_entr_hmac": {
-                    "type": "bytes",
+                "token_program": {
+                    "rule": "required",
+                    "type": "string",
                     "id": 2
                 },
-                "rsig_data": {
-                    "type": "MoneroTransactionRsigData",
+                "token_mint": {
+                    "rule": "required",
+                    "type": "string",
                     "id": 3
                 },
-                "is_offloaded_bp": {
-                    "type": "bool",
+                "token_account": {
+                    "rule": "required",
+                    "type": "string",
                     "id": 4
                 }
             }
         },
-        "MoneroTransactionSetOutputAck": {
+        "SolanaTxAdditionalInfo": {
             "fields": {
-                "tx_out": {
-                    "type": "bytes",
+                "token_accounts_infos": {
+                    "rule": "repeated",
+                    "type": "SolanaTxTokenAccountInfo",
                     "id": 1
+                }
+            }
+        },
+        "SolanaSignTx": {
+            "fields": {
+                "address_n": {
+                    "rule": "repeated",
+                    "type": "uint32",
+                    "id": 1,
+                    "options": {
+                        "packed": false
+                    }
                 },
-                "vouti_hmac": {
+                "serialized_tx": {
+                    "rule": "required",
                     "type": "bytes",
                     "id": 2
                 },
-                "rsig_data": {
-                    "type": "MoneroTransactionRsigData",
+                "additional_info": {
+                    "type": "SolanaTxAdditionalInfo",
                     "id": 3
-                },
-                "out_pk": {
-                    "type": "bytes",
-                    "id": 4
-                },
-                "ecdh_info": {
-                    "type": "bytes",
-                    "id": 5
                 }
             }
         },
-        "MoneroTransactionAllOutSetRequest": {
+        "SolanaTxSignature": {
             "fields": {
-                "rsig_data": {
-                    "type": "MoneroTransactionRsigData",
+                "signature": {
+                    "rule": "required",
+                    "type": "bytes",
                     "id": 1
                 }
             }
         },
-        "MoneroTransactionAllOutSetAck": {
+        "StellarAssetType": {
+            "values": {
+                "NATIVE": 0,
+                "ALPHANUM4": 1,
+                "ALPHANUM12": 2
+            }
+        },
+        "StellarAsset": {
             "fields": {
-                "extra": {
-                    "type": "bytes",
+                "type": {
+                    "rule": "required",
+                    "type": "StellarAssetType",
                     "id": 1
                 },
-                "tx_prefix_hash": {
-                    "type": "bytes",
+                "code": {
+                    "type": "string",
                     "id": 2
                 },
-                "rv": {
-                    "type": "MoneroRingCtSig",
-                    "id": 4
-                },
-                "full_message_hash": {
-                    "type": "bytes",
-                    "id": 5
-                }
-            },
-            "nested": {
-                "MoneroRingCtSig": {
-                    "fields": {
-                        "txn_fee": {
-                            "type": "uint64",
-                            "id": 1
-                        },
-                        "message": {
-                            "type": "bytes",
-                            "id": 2
-                        },
-                        "rv_type": {
-                            "type": "uint32",
-                            "id": 3
-                        }
-                    }
+                "issuer": {
+                    "type": "string",
+                    "id": 3
                 }
             }
         },
-        "MoneroTransactionSignInputRequest": {
+        "StellarGetAddress": {
             "fields": {
-                "src_entr": {
-                    "type": "MoneroTransactionSourceEntry",
-                    "id": 1
+                "address_n": {
+                    "rule": "repeated",
+                    "type": "uint32",
+                    "id": 1,
+                    "options": {
+                        "packed": false
+                    }
                 },
-                "vini": {
-                    "type": "bytes",
+                "show_display": {
+                    "type": "bool",
                     "id": 2
                 },
-                "vini_hmac": {
-                    "type": "bytes",
+                "chunkify": {
+                    "type": "bool",
                     "id": 3
-                },
-                "pseudo_out": {
-                    "type": "bytes",
-                    "id": 4
-                },
-                "pseudo_out_hmac": {
-                    "type": "bytes",
-                    "id": 5
-                },
-                "pseudo_out_alpha": {
-                    "type": "bytes",
-                    "id": 6
-                },
-                "spend_key": {
-                    "type": "bytes",
-                    "id": 7
-                },
-                "orig_idx": {
-                    "type": "uint32",
-                    "id": 8
                 }
             }
         },
-        "MoneroTransactionSignInputAck": {
+        "StellarAddress": {
             "fields": {
-                "signature": {
-                    "type": "bytes",
+                "address": {
+                    "rule": "required",
+                    "type": "string",
                     "id": 1
-                },
-                "pseudo_out": {
-                    "type": "bytes",
-                    "id": 2
                 }
             }
         },
-        "MoneroTransactionFinalRequest": {
-            "fields": {}
-        },
-        "MoneroTransactionFinalAck": {
+        "StellarSignTx": {
             "fields": {
-                "cout_key": {
-                    "type": "bytes",
-                    "id": 1
-                },
-                "salt": {
-                    "type": "bytes",
-                    "id": 2
+                "address_n": {
+                    "rule": "repeated",
+                    "type": "uint32",
+                    "id": 2,
+                    "options": {
+                        "packed": false
+                    }
                 },
-                "rand_mult": {
-                    "type": "bytes",
+                "network_passphrase": {
+                    "rule": "required",
+                    "type": "string",
                     "id": 3
                 },
-                "tx_enc_keys": {
-                    "type": "bytes",
+                "source_account": {
+                    "rule": "required",
+                    "type": "string",
                     "id": 4
                 },
-                "opening_key": {
-                    "type": "bytes",
+                "fee": {
+                    "rule": "required",
+                    "type": "uint32",
                     "id": 5
-                }
-            }
-        },
-        "MoneroKeyImageExportInitRequest": {
-            "fields": {
-                "num": {
+                },
+                "sequence_number": {
                     "rule": "required",
                     "type": "uint64",
-                    "id": 1
+                    "id": 6
                 },
-                "hash": {
+                "timebounds_start": {
                     "rule": "required",
-                    "type": "bytes",
-                    "id": 2
+                    "type": "uint32",
+                    "id": 8
                 },
-                "address_n": {
-                    "rule": "repeated",
+                "timebounds_end": {
+                    "rule": "required",
                     "type": "uint32",
-                    "id": 3,
-                    "options": {
-                        "packed": false
-                    }
+                    "id": 9
                 },
-                "network_type": {
-                    "type": "MoneroNetworkType",
-                    "id": 4,
-                    "options": {
-                        "default": "MAINNET"
-                    }
+                "memo_type": {
+                    "rule": "required",
+                    "type": "StellarMemoType",
+                    "id": 10
                 },
-                "subs": {
-                    "rule": "repeated",
-                    "type": "MoneroSubAddressIndicesList",
-                    "id": 5
+                "memo_text": {
+                    "type": "string",
+                    "id": 11
+                },
+                "memo_id": {
+                    "type": "uint64",
+                    "id": 12
+                },
+                "memo_hash": {
+                    "type": "bytes",
+                    "id": 13
+                },
+                "num_operations": {
+                    "rule": "required",
+                    "type": "uint32",
+                    "id": 14
                 }
             },
             "nested": {
-                "MoneroSubAddressIndicesList": {
-                    "fields": {
-                        "account": {
-                            "rule": "required",
-                            "type": "uint32",
-                            "id": 1
-                        },
-                        "minor_indices": {
-                            "rule": "repeated",
-                            "type": "uint32",
-                            "id": 2,
-                            "options": {
-                                "packed": false
-                            }
-                        }
+                "StellarMemoType": {
+                    "values": {
+                        "NONE": 0,
+                        "TEXT": 1,
+                        "ID": 2,
+                        "HASH": 3,
+                        "RETURN": 4
                     }
                 }
             }
         },
-        "MoneroKeyImageExportInitAck": {
+        "StellarTxOpRequest": {
             "fields": {}
         },
-        "MoneroKeyImageSyncStepRequest": {
+        "StellarPaymentOp": {
             "fields": {
-                "tdis": {
-                    "rule": "repeated",
-                    "type": "MoneroTransferDetails",
+                "source_account": {
+                    "type": "string",
                     "id": 1
-                }
-            },
-            "nested": {
-                "MoneroTransferDetails": {
-                    "fields": {
-                        "out_key": {
-                            "rule": "required",
-                            "type": "bytes",
-                            "id": 1
-                        },
-                        "tx_pub_key": {
-                            "rule": "required",
-                            "type": "bytes",
-                            "id": 2
-                        },
-                        "additional_tx_pub_keys": {
-                            "rule": "repeated",
-                            "type": "bytes",
-                            "id": 3
-                        },
-                        "internal_output_index": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 4
-                        },
-                        "sub_addr_major": {
-                            "type": "uint32",
-                            "id": 5
-                        },
-                        "sub_addr_minor": {
-                            "type": "uint32",
-                            "id": 6
-                        }
-                    }
+                },
+                "destination_account": {
+                    "rule": "required",
+                    "type": "string",
+                    "id": 2
+                },
+                "asset": {
+                    "rule": "required",
+                    "type": "StellarAsset",
+                    "id": 3
+                },
+                "amount": {
+                    "rule": "required",
+                    "type": "sint64",
+                    "id": 4
                 }
             }
         },
-        "MoneroKeyImageSyncStepAck": {
+        "StellarCreateAccountOp": {
             "fields": {
-                "kis": {
-                    "rule": "repeated",
-                    "type": "MoneroExportedKeyImage",
+                "source_account": {
+                    "type": "string",
                     "id": 1
-                }
-            },
-            "nested": {
-                "MoneroExportedKeyImage": {
-                    "fields": {
-                        "iv": {
-                            "type": "bytes",
-                            "id": 1
-                        },
-                        "blob": {
-                            "type": "bytes",
-                            "id": 3
-                        }
-                    }
+                },
+                "new_account": {
+                    "rule": "required",
+                    "type": "string",
+                    "id": 2
+                },
+                "starting_balance": {
+                    "rule": "required",
+                    "type": "sint64",
+                    "id": 3
                 }
             }
         },
-        "MoneroKeyImageSyncFinalRequest": {
-            "fields": {}
-        },
-        "MoneroKeyImageSyncFinalAck": {
+        "StellarPathPaymentStrictReceiveOp": {
             "fields": {
-                "enc_key": {
-                    "type": "bytes",
+                "source_account": {
+                    "type": "string",
                     "id": 1
-                }
-            }
-        },
-        "MoneroGetTxKeyRequest": {
-            "fields": {
-                "address_n": {
-                    "rule": "repeated",
-                    "type": "uint32",
-                    "id": 1,
-                    "options": {
-                        "packed": false
-                    }
                 },
-                "network_type": {
-                    "type": "MoneroNetworkType",
-                    "id": 2,
-                    "options": {
-                        "default": "MAINNET"
-                    }
+                "send_asset": {
+                    "rule": "required",
+                    "type": "StellarAsset",
+                    "id": 2
                 },
-                "salt1": {
+                "send_max": {
                     "rule": "required",
-                    "type": "bytes",
+                    "type": "sint64",
                     "id": 3
                 },
-                "salt2": {
+                "destination_account": {
                     "rule": "required",
-                    "type": "bytes",
+                    "type": "string",
                     "id": 4
                 },
-                "tx_enc_keys": {
+                "destination_asset": {
                     "rule": "required",
-                    "type": "bytes",
+                    "type": "StellarAsset",
                     "id": 5
                 },
-                "tx_prefix_hash": {
+                "destination_amount": {
                     "rule": "required",
-                    "type": "bytes",
+                    "type": "sint64",
                     "id": 6
                 },
-                "reason": {
-                    "type": "uint32",
+                "paths": {
+                    "rule": "repeated",
+                    "type": "StellarAsset",
                     "id": 7
-                },
-                "view_public_key": {
-                    "type": "bytes",
-                    "id": 8
                 }
             }
         },
-        "MoneroGetTxKeyAck": {
+        "StellarPathPaymentStrictSendOp": {
             "fields": {
-                "salt": {
-                    "type": "bytes",
+                "source_account": {
+                    "type": "string",
                     "id": 1
                 },
-                "tx_keys": {
-                    "type": "bytes",
+                "send_asset": {
+                    "rule": "required",
+                    "type": "StellarAsset",
                     "id": 2
                 },
-                "tx_derivations": {
-                    "type": "bytes",
+                "send_amount": {
+                    "rule": "required",
+                    "type": "sint64",
                     "id": 3
-                }
-            }
-        },
-        "MoneroLiveRefreshStartRequest": {
-            "fields": {
-                "address_n": {
-                    "rule": "repeated",
-                    "type": "uint32",
-                    "id": 1,
-                    "options": {
-                        "packed": false
-                    }
                 },
-                "network_type": {
-                    "type": "MoneroNetworkType",
-                    "id": 2,
-                    "options": {
-                        "default": "MAINNET"
-                    }
+                "destination_account": {
+                    "rule": "required",
+                    "type": "string",
+                    "id": 4
+                },
+                "destination_asset": {
+                    "rule": "required",
+                    "type": "StellarAsset",
+                    "id": 5
+                },
+                "destination_min": {
+                    "rule": "required",
+                    "type": "sint64",
+                    "id": 6
+                },
+                "paths": {
+                    "rule": "repeated",
+                    "type": "StellarAsset",
+                    "id": 7
                 }
             }
         },
-        "MoneroLiveRefreshStartAck": {
-            "fields": {}
-        },
-        "MoneroLiveRefreshStepRequest": {
+        "StellarManageSellOfferOp": {
             "fields": {
-                "out_key": {
-                    "rule": "required",
-                    "type": "bytes",
+                "source_account": {
+                    "type": "string",
                     "id": 1
                 },
-                "recv_deriv": {
+                "selling_asset": {
                     "rule": "required",
-                    "type": "bytes",
+                    "type": "StellarAsset",
                     "id": 2
                 },
-                "real_out_idx": {
+                "buying_asset": {
                     "rule": "required",
-                    "type": "uint64",
+                    "type": "StellarAsset",
                     "id": 3
                 },
-                "sub_addr_major": {
+                "amount": {
                     "rule": "required",
-                    "type": "uint32",
+                    "type": "sint64",
                     "id": 4
                 },
-                "sub_addr_minor": {
+                "price_n": {
                     "rule": "required",
                     "type": "uint32",
                     "id": 5
+                },
+                "price_d": {
+                    "rule": "required",
+                    "type": "uint32",
+                    "id": 6
+                },
+                "offer_id": {
+                    "rule": "required",
+                    "type": "uint64",
+                    "id": 7
                 }
             }
         },
-        "MoneroLiveRefreshStepAck": {
+        "StellarManageBuyOfferOp": {
             "fields": {
-                "salt": {
-                    "type": "bytes",
+                "source_account": {
+                    "type": "string",
                     "id": 1
                 },
-                "key_image": {
-                    "type": "bytes",
+                "selling_asset": {
+                    "rule": "required",
+                    "type": "StellarAsset",
                     "id": 2
+                },
+                "buying_asset": {
+                    "rule": "required",
+                    "type": "StellarAsset",
+                    "id": 3
+                },
+                "amount": {
+                    "rule": "required",
+                    "type": "sint64",
+                    "id": 4
+                },
+                "price_n": {
+                    "rule": "required",
+                    "type": "uint32",
+                    "id": 5
+                },
+                "price_d": {
+                    "rule": "required",
+                    "type": "uint32",
+                    "id": 6
+                },
+                "offer_id": {
+                    "rule": "required",
+                    "type": "uint64",
+                    "id": 7
                 }
             }
         },
-        "MoneroLiveRefreshFinalRequest": {
-            "fields": {}
-        },
-        "MoneroLiveRefreshFinalAck": {
-            "fields": {}
-        },
-        "DebugMoneroDiagRequest": {
+        "StellarCreatePassiveSellOfferOp": {
             "fields": {
-                "ins": {
-                    "type": "uint64",
+                "source_account": {
+                    "type": "string",
                     "id": 1
                 },
-                "p1": {
-                    "type": "uint64",
+                "selling_asset": {
+                    "rule": "required",
+                    "type": "StellarAsset",
                     "id": 2
                 },
-                "p2": {
-                    "type": "uint64",
+                "buying_asset": {
+                    "rule": "required",
+                    "type": "StellarAsset",
                     "id": 3
                 },
-                "pd": {
-                    "rule": "repeated",
-                    "type": "uint64",
-                    "id": 4,
-                    "options": {
-                        "packed": false
-                    }
+                "amount": {
+                    "rule": "required",
+                    "type": "sint64",
+                    "id": 4
                 },
-                "data1": {
-                    "type": "bytes",
+                "price_n": {
+                    "rule": "required",
+                    "type": "uint32",
                     "id": 5
                 },
-                "data2": {
-                    "type": "bytes",
+                "price_d": {
+                    "rule": "required",
+                    "type": "uint32",
                     "id": 6
                 }
             }
         },
-        "DebugMoneroDiagAck": {
+        "StellarSetOptionsOp": {
             "fields": {
-                "ins": {
-                    "type": "uint64",
+                "source_account": {
+                    "type": "string",
                     "id": 1
                 },
-                "p1": {
-                    "type": "uint64",
+                "inflation_destination_account": {
+                    "type": "string",
                     "id": 2
                 },
-                "p2": {
-                    "type": "uint64",
+                "clear_flags": {
+                    "type": "uint32",
                     "id": 3
                 },
-                "pd": {
-                    "rule": "repeated",
-                    "type": "uint64",
-                    "id": 4,
-                    "options": {
-                        "packed": false
-                    }
+                "set_flags": {
+                    "type": "uint32",
+                    "id": 4
                 },
-                "data1": {
-                    "type": "bytes",
+                "master_weight": {
+                    "type": "uint32",
                     "id": 5
                 },
-                "data2": {
-                    "type": "bytes",
+                "low_threshold": {
+                    "type": "uint32",
                     "id": 6
-                }
-            }
-        },
-        "NEMGetAddress": {
-            "fields": {
-                "address_n": {
-                    "rule": "repeated",
+                },
+                "medium_threshold": {
                     "type": "uint32",
-                    "id": 1,
-                    "options": {
-                        "packed": false
-                    }
+                    "id": 7
                 },
-                "network": {
+                "high_threshold": {
                     "type": "uint32",
-                    "id": 2,
-                    "options": {
-                        "default": 104
-                    }
+                    "id": 8
                 },
-                "show_display": {
-                    "type": "bool",
-                    "id": 3
+                "home_domain": {
+                    "type": "string",
+                    "id": 9
                 },
-                "chunkify": {
-                    "type": "bool",
-                    "id": 4
+                "signer_type": {
+                    "type": "StellarSignerType",
+                    "id": 10
+                },
+                "signer_key": {
+                    "type": "bytes",
+                    "id": 11
+                },
+                "signer_weight": {
+                    "type": "uint32",
+                    "id": 12
+                }
+            },
+            "nested": {
+                "StellarSignerType": {
+                    "values": {
+                        "ACCOUNT": 0,
+                        "PRE_AUTH": 1,
+                        "HASH": 2
+                    }
                 }
             }
         },
-        "NEMAddress": {
+        "StellarChangeTrustOp": {
             "fields": {
-                "address": {
-                    "rule": "required",
+                "source_account": {
                     "type": "string",
                     "id": 1
+                },
+                "asset": {
+                    "rule": "required",
+                    "type": "StellarAsset",
+                    "id": 2
+                },
+                "limit": {
+                    "rule": "required",
+                    "type": "uint64",
+                    "id": 3
                 }
             }
         },
-        "NEMSignTx": {
+        "StellarAllowTrustOp": {
             "fields": {
-                "transaction": {
-                    "rule": "required",
-                    "type": "NEMTransactionCommon",
+                "source_account": {
+                    "type": "string",
                     "id": 1
                 },
-                "multisig": {
-                    "type": "NEMTransactionCommon",
+                "trusted_account": {
+                    "rule": "required",
+                    "type": "string",
                     "id": 2
                 },
-                "transfer": {
-                    "type": "NEMTransfer",
+                "asset_type": {
+                    "rule": "required",
+                    "type": "StellarAssetType",
                     "id": 3
                 },
-                "cosigning": {
-                    "type": "bool",
+                "asset_code": {
+                    "type": "string",
                     "id": 4
                 },
-                "provision_namespace": {
-                    "type": "NEMProvisionNamespace",
+                "is_authorized": {
+                    "rule": "required",
+                    "type": "bool",
                     "id": 5
+                }
+            }
+        },
+        "StellarAccountMergeOp": {
+            "fields": {
+                "source_account": {
+                    "type": "string",
+                    "id": 1
                 },
-                "mosaic_creation": {
-                    "type": "NEMMosaicCreation",
+                "destination_account": {
+                    "rule": "required",
+                    "type": "string",
+                    "id": 2
+                }
+            }
+        },
+        "StellarManageDataOp": {
+            "fields": {
+                "source_account": {
+                    "type": "string",
+                    "id": 1
+                },
+                "key": {
+                    "rule": "required",
+                    "type": "string",
+                    "id": 2
+                },
+                "value": {
+                    "type": "bytes",
+                    "id": 3
+                }
+            }
+        },
+        "StellarBumpSequenceOp": {
+            "fields": {
+                "source_account": {
+                    "type": "string",
+                    "id": 1
+                },
+                "bump_to": {
+                    "rule": "required",
+                    "type": "uint64",
+                    "id": 2
+                }
+            }
+        },
+        "StellarClaimClaimableBalanceOp": {
+            "fields": {
+                "source_account": {
+                    "type": "string",
+                    "id": 1
+                },
+                "balance_id": {
+                    "rule": "required",
+                    "type": "bytes",
+                    "id": 2
+                }
+            }
+        },
+        "StellarSignedTx": {
+            "fields": {
+                "public_key": {
+                    "rule": "required",
+                    "type": "bytes",
+                    "id": 1
+                },
+                "signature": {
+                    "rule": "required",
+                    "type": "bytes",
+                    "id": 2
+                }
+            }
+        },
+        "TezosGetAddress": {
+            "fields": {
+                "address_n": {
+                    "rule": "repeated",
+                    "type": "uint32",
+                    "id": 1,
+                    "options": {
+                        "packed": false
+                    }
+                },
+                "show_display": {
+                    "type": "bool",
+                    "id": 2
+                },
+                "chunkify": {
+                    "type": "bool",
+                    "id": 3
+                }
+            }
+        },
+        "TezosAddress": {
+            "fields": {
+                "address": {
+                    "rule": "required",
+                    "type": "string",
+                    "id": 1
+                }
+            }
+        },
+        "TezosGetPublicKey": {
+            "fields": {
+                "address_n": {
+                    "rule": "repeated",
+                    "type": "uint32",
+                    "id": 1,
+                    "options": {
+                        "packed": false
+                    }
+                },
+                "show_display": {
+                    "type": "bool",
+                    "id": 2
+                },
+                "chunkify": {
+                    "type": "bool",
+                    "id": 3
+                }
+            }
+        },
+        "TezosPublicKey": {
+            "fields": {
+                "public_key": {
+                    "rule": "required",
+                    "type": "string",
+                    "id": 1
+                }
+            }
+        },
+        "TezosSignTx": {
+            "fields": {
+                "address_n": {
+                    "rule": "repeated",
+                    "type": "uint32",
+                    "id": 1,
+                    "options": {
+                        "packed": false
+                    }
+                },
+                "branch": {
+                    "rule": "required",
+                    "type": "bytes",
+                    "id": 2
+                },
+                "reveal": {
+                    "type": "TezosRevealOp",
+                    "id": 3
+                },
+                "transaction": {
+                    "type": "TezosTransactionOp",
+                    "id": 4
+                },
+                "origination": {
+                    "type": "TezosOriginationOp",
+                    "id": 5
+                },
+                "delegation": {
+                    "type": "TezosDelegationOp",
                     "id": 6
                 },
-                "supply_change": {
-                    "type": "NEMMosaicSupplyChange",
+                "proposal": {
+                    "type": "TezosProposalOp",
                     "id": 7
                 },
-                "aggregate_modification": {
-                    "type": "NEMAggregateModification",
+                "ballot": {
+                    "type": "TezosBallotOp",
                     "id": 8
                 },
-                "importance_transfer": {
-                    "type": "NEMImportanceTransfer",
-                    "id": 9
-                },
                 "chunkify": {
                     "type": "bool",
-                    "id": 10
+                    "id": 9
                 }
             },
             "nested": {
-                "NEMTransactionCommon": {
+                "TezosContractID": {
                     "fields": {
-                        "address_n": {
-                            "rule": "repeated",
-                            "type": "uint32",
-                            "id": 1,
-                            "options": {
-                                "packed": false
-                            }
+                        "tag": {
+                            "rule": "required",
+                            "type": "TezosContractType",
+                            "id": 1
                         },
-                        "network": {
-                            "type": "uint32",
-                            "id": 2,
-                            "options": {
-                                "default": 104
+                        "hash": {
+                            "rule": "required",
+                            "type": "bytes",
+                            "id": 2
+                        }
+                    },
+                    "nested": {
+                        "TezosContractType": {
+                            "values": {
+                                "Implicit": 0,
+                                "Originated": 1
                             }
+                        }
+                    }
+                },
+                "TezosRevealOp": {
+                    "fields": {
+                        "source": {
+                            "rule": "required",
+                            "type": "bytes",
+                            "id": 7
                         },
-                        "timestamp": {
+                        "fee": {
                             "rule": "required",
-                            "type": "uint32",
+                            "type": "uint64",
+                            "id": 2
+                        },
+                        "counter": {
+                            "rule": "required",
+                            "type": "uint64",
                             "id": 3
                         },
-                        "fee": {
+                        "gas_limit": {
                             "rule": "required",
                             "type": "uint64",
                             "id": 4
                         },
-                        "deadline": {
+                        "storage_limit": {
                             "rule": "required",
-                            "type": "uint32",
+                            "type": "uint64",
                             "id": 5
                         },
-                        "signer": {
+                        "public_key": {
+                            "rule": "required",
                             "type": "bytes",
                             "id": 6
                         }
                     }
                 },
-                "NEMTransfer": {
+                "TezosTransactionOp": {
                     "fields": {
-                        "recipient": {
+                        "source": {
                             "rule": "required",
-                            "type": "string",
-                            "id": 1
+                            "type": "bytes",
+                            "id": 9
                         },
-                        "amount": {
+                        "fee": {
                             "rule": "required",
                             "type": "uint64",
                             "id": 2
                         },
-                        "payload": {
-                            "type": "bytes",
+                        "counter": {
+                            "rule": "required",
+                            "type": "uint64",
                             "id": 3
                         },
-                        "public_key": {
-                            "type": "bytes",
+                        "gas_limit": {
+                            "rule": "required",
+                            "type": "uint64",
                             "id": 4
                         },
-                        "mosaics": {
-                            "rule": "repeated",
-                            "type": "NEMMosaic",
+                        "storage_limit": {
+                            "rule": "required",
+                            "type": "uint64",
                             "id": 5
-                        }
-                    },
-                    "nested": {
-                        "NEMMosaic": {
-                            "fields": {
-                                "namespace": {
-                                    "rule": "required",
-                                    "type": "string",
-                                    "id": 1
+                        },
+                        "amount": {
+                            "rule": "required",
+                            "type": "uint64",
+                            "id": 6
+                        },
+                        "destination": {
+                            "rule": "required",
+                            "type": "TezosContractID",
+                            "id": 7
+                        },
+                        "parameters": {
+                            "type": "bytes",
+                            "id": 8
+                        },
+                        "parameters_manager": {
+                            "type": "TezosParametersManager",
+                            "id": 10
+                        }
+                    },
+                    "nested": {
+                        "TezosParametersManager": {
+                            "fields": {
+                                "set_delegate": {
+                                    "type": "bytes",
+                                    "id": 1
                                 },
-                                "mosaic": {
-                                    "rule": "required",
-                                    "type": "string",
+                                "cancel_delegate": {
+                                    "type": "bool",
                                     "id": 2
                                 },
-                                "quantity": {
-                                    "rule": "required",
-                                    "type": "uint64",
+                                "transfer": {
+                                    "type": "TezosManagerTransfer",
                                     "id": 3
                                 }
+                            },
+                            "nested": {
+                                "TezosManagerTransfer": {
+                                    "fields": {
+                                        "destination": {
+                                            "rule": "required",
+                                            "type": "TezosContractID",
+                                            "id": 1
+                                        },
+                                        "amount": {
+                                            "rule": "required",
+                                            "type": "uint64",
+                                            "id": 2
+                                        }
+                                    }
+                                }
                             }
                         }
                     }
                 },
-                "NEMProvisionNamespace": {
+                "TezosOriginationOp": {
                     "fields": {
-                        "namespace": {
+                        "source": {
                             "rule": "required",
-                            "type": "string",
-                            "id": 1
+                            "type": "bytes",
+                            "id": 12
                         },
-                        "parent": {
-                            "type": "string",
+                        "fee": {
+                            "rule": "required",
+                            "type": "uint64",
                             "id": 2
                         },
-                        "sink": {
+                        "counter": {
                             "rule": "required",
-                            "type": "string",
+                            "type": "uint64",
                             "id": 3
                         },
-                        "fee": {
+                        "gas_limit": {
                             "rule": "required",
                             "type": "uint64",
                             "id": 4
+                        },
+                        "storage_limit": {
+                            "rule": "required",
+                            "type": "uint64",
+                            "id": 5
+                        },
+                        "manager_pubkey": {
+                            "type": "bytes",
+                            "id": 6
+                        },
+                        "balance": {
+                            "rule": "required",
+                            "type": "uint64",
+                            "id": 7
+                        },
+                        "spendable": {
+                            "type": "bool",
+                            "id": 8
+                        },
+                        "delegatable": {
+                            "type": "bool",
+                            "id": 9
+                        },
+                        "delegate": {
+                            "type": "bytes",
+                            "id": 10
+                        },
+                        "script": {
+                            "rule": "required",
+                            "type": "bytes",
+                            "id": 11
                         }
                     }
                 },
-                "NEMMosaicCreation": {
+                "TezosDelegationOp": {
                     "fields": {
-                        "definition": {
+                        "source": {
                             "rule": "required",
-                            "type": "NEMMosaicDefinition",
-                            "id": 1
+                            "type": "bytes",
+                            "id": 7
                         },
-                        "sink": {
+                        "fee": {
                             "rule": "required",
-                            "type": "string",
+                            "type": "uint64",
                             "id": 2
                         },
-                        "fee": {
+                        "counter": {
                             "rule": "required",
                             "type": "uint64",
                             "id": 3
+                        },
+                        "gas_limit": {
+                            "rule": "required",
+                            "type": "uint64",
+                            "id": 4
+                        },
+                        "storage_limit": {
+                            "rule": "required",
+                            "type": "uint64",
+                            "id": 5
+                        },
+                        "delegate": {
+                            "rule": "required",
+                            "type": "bytes",
+                            "id": 6
                         }
-                    },
-                    "nested": {
-                        "NEMMosaicDefinition": {
-                            "fields": {
-                                "name": {
-                                    "type": "string",
-                                    "id": 1
-                                },
-                                "ticker": {
-                                    "type": "string",
-                                    "id": 2
-                                },
-                                "namespace": {
-                                    "rule": "required",
-                                    "type": "string",
-                                    "id": 3
-                                },
-                                "mosaic": {
-                                    "rule": "required",
-                                    "type": "string",
-                                    "id": 4
-                                },
-                                "divisibility": {
-                                    "type": "uint32",
-                                    "id": 5
-                                },
-                                "levy": {
-                                    "type": "NEMMosaicLevy",
-                                    "id": 6
-                                },
-                                "fee": {
-                                    "type": "uint64",
-                                    "id": 7
-                                },
-                                "levy_address": {
-                                    "type": "string",
-                                    "id": 8
-                                },
-                                "levy_namespace": {
-                                    "type": "string",
-                                    "id": 9
-                                },
-                                "levy_mosaic": {
-                                    "type": "string",
-                                    "id": 10
-                                },
-                                "supply": {
-                                    "type": "uint64",
-                                    "id": 11
-                                },
-                                "mutable_supply": {
-                                    "type": "bool",
-                                    "id": 12
-                                },
-                                "transferable": {
-                                    "type": "bool",
-                                    "id": 13
-                                },
-                                "description": {
-                                    "rule": "required",
-                                    "type": "string",
-                                    "id": 14
-                                },
-                                "networks": {
-                                    "rule": "repeated",
-                                    "type": "uint32",
-                                    "id": 15,
-                                    "options": {
-                                        "packed": false
-                                    }
-                                }
-                            },
-                            "nested": {
-                                "NEMMosaicLevy": {
-                                    "values": {
-                                        "MosaicLevy_Absolute": 1,
-                                        "MosaicLevy_Percentile": 2
-                                    }
-                                }
-                            }
+                    }
+                },
+                "TezosProposalOp": {
+                    "fields": {
+                        "source": {
+                            "rule": "required",
+                            "type": "bytes",
+                            "id": 1
+                        },
+                        "period": {
+                            "rule": "required",
+                            "type": "uint64",
+                            "id": 2
+                        },
+                        "proposals": {
+                            "rule": "repeated",
+                            "type": "bytes",
+                            "id": 4
                         }
                     }
                 },
-                "NEMMosaicSupplyChange": {
+                "TezosBallotOp": {
                     "fields": {
-                        "namespace": {
+                        "source": {
                             "rule": "required",
-                            "type": "string",
+                            "type": "bytes",
                             "id": 1
                         },
-                        "mosaic": {
+                        "period": {
                             "rule": "required",
-                            "type": "string",
+                            "type": "uint64",
                             "id": 2
                         },
-                        "type": {
+                        "proposal": {
                             "rule": "required",
-                            "type": "NEMSupplyChangeType",
+                            "type": "bytes",
                             "id": 3
                         },
-                        "delta": {
+                        "ballot": {
                             "rule": "required",
-                            "type": "uint64",
+                            "type": "TezosBallotType",
                             "id": 4
                         }
                     },
                     "nested": {
-                        "NEMSupplyChangeType": {
+                        "TezosBallotType": {
                             "values": {
-                                "SupplyChange_Increase": 1,
-                                "SupplyChange_Decrease": 2
-                            }
-                        }
-                    }
-                },
-                "NEMAggregateModification": {
-                    "fields": {
-                        "modifications": {
-                            "rule": "repeated",
-                            "type": "NEMCosignatoryModification",
-                            "id": 1
-                        },
-                        "relative_change": {
-                            "type": "sint32",
-                            "id": 2
-                        }
-                    },
-                    "nested": {
-                        "NEMCosignatoryModification": {
-                            "fields": {
-                                "type": {
-                                    "rule": "required",
-                                    "type": "NEMModificationType",
-                                    "id": 1
-                                },
-                                "public_key": {
-                                    "rule": "required",
-                                    "type": "bytes",
-                                    "id": 2
-                                }
-                            },
-                            "nested": {
-                                "NEMModificationType": {
-                                    "values": {
-                                        "CosignatoryModification_Add": 1,
-                                        "CosignatoryModification_Delete": 2
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
-                "NEMImportanceTransfer": {
-                    "fields": {
-                        "mode": {
-                            "rule": "required",
-                            "type": "NEMImportanceTransferMode",
-                            "id": 1
-                        },
-                        "public_key": {
-                            "rule": "required",
-                            "type": "bytes",
-                            "id": 2
-                        }
-                    },
-                    "nested": {
-                        "NEMImportanceTransferMode": {
-                            "values": {
-                                "ImportanceTransfer_Activate": 1,
-                                "ImportanceTransfer_Deactivate": 2
+                                "Yay": 0,
+                                "Nay": 1,
+                                "Pass": 2
                             }
                         }
                     }
                 }
             }
         },
-        "NEMSignedTx": {
+        "TezosSignedTx": {
             "fields": {
-                "data": {
-                    "rule": "required",
-                    "type": "bytes",
-                    "id": 1
-                },
                 "signature": {
-                    "rule": "required",
-                    "type": "bytes",
-                    "id": 2
-                }
-            }
-        },
-        "NEMDecryptMessage": {
-            "fields": {
-                "address_n": {
-                    "rule": "repeated",
-                    "type": "uint32",
-                    "id": 1,
-                    "options": {
-                        "packed": false
-                    }
-                },
-                "network": {
-                    "type": "uint32",
-                    "id": 2
-                },
-                "public_key": {
-                    "type": "bytes",
-                    "id": 3
-                },
-                "payload": {
-                    "type": "bytes",
-                    "id": 4
-                }
-            }
-        },
-        "NEMDecryptedMessage": {
-            "fields": {
-                "payload": {
-                    "rule": "required",
-                    "type": "bytes",
-                    "id": 1
-                }
-            }
-        },
-        "RippleGetAddress": {
-            "fields": {
-                "address_n": {
-                    "rule": "repeated",
-                    "type": "uint32",
-                    "id": 1,
-                    "options": {
-                        "packed": false
-                    }
-                },
-                "show_display": {
-                    "type": "bool",
-                    "id": 2
-                },
-                "chunkify": {
-                    "type": "bool",
-                    "id": 3
-                }
-            }
-        },
-        "RippleAddress": {
-            "fields": {
-                "address": {
                     "rule": "required",
                     "type": "string",
                     "id": 1
-                }
-            }
-        },
-        "RippleSignTx": {
-            "fields": {
-                "address_n": {
-                    "rule": "repeated",
-                    "type": "uint32",
-                    "id": 1,
-                    "options": {
-                        "packed": false
-                    }
-                },
-                "fee": {
-                    "rule": "required",
-                    "type": "uint64",
-                    "id": 2
-                },
-                "flags": {
-                    "type": "uint32",
-                    "id": 3,
-                    "options": {
-                        "default": 0
-                    }
-                },
-                "sequence": {
-                    "rule": "required",
-                    "type": "uint32",
-                    "id": 4
-                },
-                "last_ledger_sequence": {
-                    "type": "uint32",
-                    "id": 5
-                },
-                "payment": {
-                    "rule": "required",
-                    "type": "RipplePayment",
-                    "id": 6
-                },
-                "chunkify": {
-                    "type": "bool",
-                    "id": 7
-                }
-            },
-            "nested": {
-                "RipplePayment": {
-                    "fields": {
-                        "amount": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 1
-                        },
-                        "destination": {
-                            "rule": "required",
-                            "type": "string",
-                            "id": 2
-                        },
-                        "destination_tag": {
-                            "type": "uint32",
-                            "id": 3
-                        }
-                    }
-                }
-            }
-        },
-        "RippleSignedTx": {
-            "fields": {
-                "signature": {
-                    "rule": "required",
-                    "type": "bytes",
-                    "id": 1
-                },
-                "serialized_tx": {
-                    "rule": "required",
-                    "type": "bytes",
-                    "id": 2
-                }
-            }
-        },
-        "SolanaGetPublicKey": {
-            "fields": {
-                "address_n": {
-                    "rule": "repeated",
-                    "type": "uint32",
-                    "id": 1,
-                    "options": {
-                        "packed": false
-                    }
                 },
-                "show_display": {
-                    "type": "bool",
-                    "id": 2
-                }
-            }
-        },
-        "SolanaPublicKey": {
-            "fields": {
-                "public_key": {
+                "sig_op_contents": {
                     "rule": "required",
                     "type": "bytes",
-                    "id": 1
-                }
-            }
-        },
-        "SolanaGetAddress": {
-            "fields": {
-                "address_n": {
-                    "rule": "repeated",
-                    "type": "uint32",
-                    "id": 1,
-                    "options": {
-                        "packed": false
-                    }
-                },
-                "show_display": {
-                    "type": "bool",
                     "id": 2
                 },
-                "chunkify": {
-                    "type": "bool",
-                    "id": 3
-                }
-            }
-        },
-        "SolanaAddress": {
-            "fields": {
-                "address": {
+                "operation_hash": {
                     "rule": "required",
                     "type": "string",
-                    "id": 1
+                    "id": 3
                 }
             }
         },
-        "SolanaTxTokenAccountInfo": {
-            "fields": {
-                "base_address": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 1
-                },
-                "token_program": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 2
-                },
-                "token_mint": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 3
-                },
-                "token_account": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 4
-                }
-            }
-        },
-        "SolanaTxAdditionalInfo": {
-            "fields": {
-                "token_accounts_infos": {
-                    "rule": "repeated",
-                    "type": "SolanaTxTokenAccountInfo",
-                    "id": 1
-                }
-            }
-        },
-        "SolanaSignTx": {
-            "fields": {
-                "address_n": {
-                    "rule": "repeated",
-                    "type": "uint32",
-                    "id": 1,
-                    "options": {
-                        "packed": false
-                    }
-                },
-                "serialized_tx": {
-                    "rule": "required",
-                    "type": "bytes",
-                    "id": 2
-                },
-                "additional_info": {
-                    "type": "SolanaTxAdditionalInfo",
-                    "id": 3
-                }
-            }
-        },
-        "SolanaTxSignature": {
-            "fields": {
-                "signature": {
-                    "rule": "required",
-                    "type": "bytes",
-                    "id": 1
-                }
-            }
-        },
-        "StellarAssetType": {
+        "MessageType": {
             "values": {
-                "NATIVE": 0,
-                "ALPHANUM4": 1,
-                "ALPHANUM12": 2
-            }
-        },
-        "StellarAsset": {
-            "fields": {
-                "type": {
-                    "rule": "required",
-                    "type": "StellarAssetType",
-                    "id": 1
-                },
-                "code": {
-                    "type": "string",
-                    "id": 2
-                },
-                "issuer": {
-                    "type": "string",
-                    "id": 3
-                }
-            }
-        },
-        "StellarGetAddress": {
-            "fields": {
-                "address_n": {
-                    "rule": "repeated",
-                    "type": "uint32",
-                    "id": 1,
-                    "options": {
-                        "packed": false
-                    }
-                },
-                "show_display": {
-                    "type": "bool",
-                    "id": 2
-                },
-                "chunkify": {
-                    "type": "bool",
-                    "id": 3
-                }
-            }
-        },
-        "StellarAddress": {
-            "fields": {
-                "address": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 1
-                }
-            }
-        },
-        "StellarSignTx": {
-            "fields": {
-                "address_n": {
-                    "rule": "repeated",
-                    "type": "uint32",
-                    "id": 2,
-                    "options": {
-                        "packed": false
-                    }
-                },
-                "network_passphrase": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 3
-                },
-                "source_account": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 4
-                },
-                "fee": {
-                    "rule": "required",
-                    "type": "uint32",
-                    "id": 5
-                },
-                "sequence_number": {
-                    "rule": "required",
-                    "type": "uint64",
-                    "id": 6
-                },
-                "timebounds_start": {
-                    "rule": "required",
-                    "type": "uint32",
-                    "id": 8
-                },
-                "timebounds_end": {
-                    "rule": "required",
-                    "type": "uint32",
-                    "id": 9
-                },
-                "memo_type": {
-                    "rule": "required",
-                    "type": "StellarMemoType",
-                    "id": 10
-                },
-                "memo_text": {
-                    "type": "string",
-                    "id": 11
-                },
-                "memo_id": {
-                    "type": "uint64",
-                    "id": 12
-                },
-                "memo_hash": {
-                    "type": "bytes",
-                    "id": 13
-                },
-                "num_operations": {
-                    "rule": "required",
-                    "type": "uint32",
-                    "id": 14
-                }
-            },
-            "nested": {
-                "StellarMemoType": {
-                    "values": {
-                        "NONE": 0,
-                        "TEXT": 1,
-                        "ID": 2,
-                        "HASH": 3,
-                        "RETURN": 4
-                    }
-                }
-            }
-        },
-        "StellarTxOpRequest": {
-            "fields": {}
-        },
-        "StellarPaymentOp": {
-            "fields": {
-                "source_account": {
-                    "type": "string",
-                    "id": 1
-                },
-                "destination_account": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 2
-                },
-                "asset": {
-                    "rule": "required",
-                    "type": "StellarAsset",
-                    "id": 3
-                },
-                "amount": {
-                    "rule": "required",
-                    "type": "sint64",
-                    "id": 4
-                }
-            }
-        },
-        "StellarCreateAccountOp": {
-            "fields": {
-                "source_account": {
-                    "type": "string",
-                    "id": 1
-                },
-                "new_account": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 2
-                },
-                "starting_balance": {
-                    "rule": "required",
-                    "type": "sint64",
-                    "id": 3
-                }
-            }
-        },
-        "StellarPathPaymentStrictReceiveOp": {
-            "fields": {
-                "source_account": {
-                    "type": "string",
-                    "id": 1
-                },
-                "send_asset": {
-                    "rule": "required",
-                    "type": "StellarAsset",
-                    "id": 2
-                },
-                "send_max": {
-                    "rule": "required",
-                    "type": "sint64",
-                    "id": 3
-                },
-                "destination_account": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 4
-                },
-                "destination_asset": {
-                    "rule": "required",
-                    "type": "StellarAsset",
-                    "id": 5
-                },
-                "destination_amount": {
-                    "rule": "required",
-                    "type": "sint64",
-                    "id": 6
-                },
-                "paths": {
-                    "rule": "repeated",
-                    "type": "StellarAsset",
-                    "id": 7
-                }
-            }
-        },
-        "StellarPathPaymentStrictSendOp": {
-            "fields": {
-                "source_account": {
-                    "type": "string",
-                    "id": 1
-                },
-                "send_asset": {
-                    "rule": "required",
-                    "type": "StellarAsset",
-                    "id": 2
-                },
-                "send_amount": {
-                    "rule": "required",
-                    "type": "sint64",
-                    "id": 3
-                },
-                "destination_account": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 4
-                },
-                "destination_asset": {
-                    "rule": "required",
-                    "type": "StellarAsset",
-                    "id": 5
-                },
-                "destination_min": {
-                    "rule": "required",
-                    "type": "sint64",
-                    "id": 6
-                },
-                "paths": {
-                    "rule": "repeated",
-                    "type": "StellarAsset",
-                    "id": 7
-                }
-            }
-        },
-        "StellarManageSellOfferOp": {
-            "fields": {
-                "source_account": {
-                    "type": "string",
-                    "id": 1
-                },
-                "selling_asset": {
-                    "rule": "required",
-                    "type": "StellarAsset",
-                    "id": 2
-                },
-                "buying_asset": {
-                    "rule": "required",
-                    "type": "StellarAsset",
-                    "id": 3
-                },
-                "amount": {
-                    "rule": "required",
-                    "type": "sint64",
-                    "id": 4
-                },
-                "price_n": {
-                    "rule": "required",
-                    "type": "uint32",
-                    "id": 5
-                },
-                "price_d": {
-                    "rule": "required",
-                    "type": "uint32",
-                    "id": 6
-                },
-                "offer_id": {
-                    "rule": "required",
-                    "type": "uint64",
-                    "id": 7
-                }
-            }
-        },
-        "StellarManageBuyOfferOp": {
-            "fields": {
-                "source_account": {
-                    "type": "string",
-                    "id": 1
-                },
-                "selling_asset": {
-                    "rule": "required",
-                    "type": "StellarAsset",
-                    "id": 2
-                },
-                "buying_asset": {
-                    "rule": "required",
-                    "type": "StellarAsset",
-                    "id": 3
-                },
-                "amount": {
-                    "rule": "required",
-                    "type": "sint64",
-                    "id": 4
-                },
-                "price_n": {
-                    "rule": "required",
-                    "type": "uint32",
-                    "id": 5
-                },
-                "price_d": {
-                    "rule": "required",
-                    "type": "uint32",
-                    "id": 6
-                },
-                "offer_id": {
-                    "rule": "required",
-                    "type": "uint64",
-                    "id": 7
-                }
-            }
-        },
-        "StellarCreatePassiveSellOfferOp": {
-            "fields": {
-                "source_account": {
-                    "type": "string",
-                    "id": 1
-                },
-                "selling_asset": {
-                    "rule": "required",
-                    "type": "StellarAsset",
-                    "id": 2
-                },
-                "buying_asset": {
-                    "rule": "required",
-                    "type": "StellarAsset",
-                    "id": 3
-                },
-                "amount": {
-                    "rule": "required",
-                    "type": "sint64",
-                    "id": 4
-                },
-                "price_n": {
-                    "rule": "required",
-                    "type": "uint32",
-                    "id": 5
-                },
-                "price_d": {
-                    "rule": "required",
-                    "type": "uint32",
-                    "id": 6
-                }
-            }
-        },
-        "StellarSetOptionsOp": {
-            "fields": {
-                "source_account": {
-                    "type": "string",
-                    "id": 1
-                },
-                "inflation_destination_account": {
-                    "type": "string",
-                    "id": 2
-                },
-                "clear_flags": {
-                    "type": "uint32",
-                    "id": 3
-                },
-                "set_flags": {
-                    "type": "uint32",
-                    "id": 4
-                },
-                "master_weight": {
-                    "type": "uint32",
-                    "id": 5
-                },
-                "low_threshold": {
-                    "type": "uint32",
-                    "id": 6
-                },
-                "medium_threshold": {
-                    "type": "uint32",
-                    "id": 7
-                },
-                "high_threshold": {
-                    "type": "uint32",
-                    "id": 8
-                },
-                "home_domain": {
-                    "type": "string",
-                    "id": 9
-                },
-                "signer_type": {
-                    "type": "StellarSignerType",
-                    "id": 10
-                },
-                "signer_key": {
-                    "type": "bytes",
-                    "id": 11
-                },
-                "signer_weight": {
-                    "type": "uint32",
-                    "id": 12
-                }
-            },
-            "nested": {
-                "StellarSignerType": {
-                    "values": {
-                        "ACCOUNT": 0,
-                        "PRE_AUTH": 1,
-                        "HASH": 2
-                    }
-                }
-            }
-        },
-        "StellarChangeTrustOp": {
-            "fields": {
-                "source_account": {
-                    "type": "string",
-                    "id": 1
-                },
-                "asset": {
-                    "rule": "required",
-                    "type": "StellarAsset",
-                    "id": 2
-                },
-                "limit": {
-                    "rule": "required",
-                    "type": "uint64",
-                    "id": 3
-                }
-            }
-        },
-        "StellarAllowTrustOp": {
-            "fields": {
-                "source_account": {
-                    "type": "string",
-                    "id": 1
-                },
-                "trusted_account": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 2
-                },
-                "asset_type": {
-                    "rule": "required",
-                    "type": "StellarAssetType",
-                    "id": 3
-                },
-                "asset_code": {
-                    "type": "string",
-                    "id": 4
-                },
-                "is_authorized": {
-                    "rule": "required",
-                    "type": "bool",
-                    "id": 5
-                }
-            }
-        },
-        "StellarAccountMergeOp": {
-            "fields": {
-                "source_account": {
-                    "type": "string",
-                    "id": 1
-                },
-                "destination_account": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 2
-                }
-            }
-        },
-        "StellarManageDataOp": {
-            "fields": {
-                "source_account": {
-                    "type": "string",
-                    "id": 1
-                },
-                "key": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 2
-                },
-                "value": {
-                    "type": "bytes",
-                    "id": 3
-                }
-            }
-        },
-        "StellarBumpSequenceOp": {
-            "fields": {
-                "source_account": {
-                    "type": "string",
-                    "id": 1
-                },
-                "bump_to": {
-                    "rule": "required",
-                    "type": "uint64",
-                    "id": 2
-                }
-            }
-        },
-        "StellarClaimClaimableBalanceOp": {
-            "fields": {
-                "source_account": {
-                    "type": "string",
-                    "id": 1
-                },
-                "balance_id": {
-                    "rule": "required",
-                    "type": "bytes",
-                    "id": 2
-                }
-            }
-        },
-        "StellarSignedTx": {
-            "fields": {
-                "public_key": {
-                    "rule": "required",
-                    "type": "bytes",
-                    "id": 1
-                },
-                "signature": {
-                    "rule": "required",
-                    "type": "bytes",
-                    "id": 2
-                }
-            }
-        },
-        "TezosGetAddress": {
-            "fields": {
-                "address_n": {
-                    "rule": "repeated",
-                    "type": "uint32",
-                    "id": 1,
-                    "options": {
-                        "packed": false
-                    }
-                },
-                "show_display": {
-                    "type": "bool",
-                    "id": 2
-                },
-                "chunkify": {
-                    "type": "bool",
-                    "id": 3
-                }
-            }
-        },
-        "TezosAddress": {
-            "fields": {
-                "address": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 1
-                }
-            }
-        },
-        "TezosGetPublicKey": {
-            "fields": {
-                "address_n": {
-                    "rule": "repeated",
-                    "type": "uint32",
-                    "id": 1,
-                    "options": {
-                        "packed": false
-                    }
-                },
-                "show_display": {
-                    "type": "bool",
-                    "id": 2
-                },
-                "chunkify": {
-                    "type": "bool",
-                    "id": 3
-                }
-            }
-        },
-        "TezosPublicKey": {
-            "fields": {
-                "public_key": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 1
-                }
-            }
-        },
-        "TezosSignTx": {
-            "fields": {
-                "address_n": {
-                    "rule": "repeated",
-                    "type": "uint32",
-                    "id": 1,
-                    "options": {
-                        "packed": false
-                    }
-                },
-                "branch": {
-                    "rule": "required",
-                    "type": "bytes",
-                    "id": 2
-                },
-                "reveal": {
-                    "type": "TezosRevealOp",
-                    "id": 3
-                },
-                "transaction": {
-                    "type": "TezosTransactionOp",
-                    "id": 4
-                },
-                "origination": {
-                    "type": "TezosOriginationOp",
-                    "id": 5
-                },
-                "delegation": {
-                    "type": "TezosDelegationOp",
-                    "id": 6
-                },
-                "proposal": {
-                    "type": "TezosProposalOp",
-                    "id": 7
-                },
-                "ballot": {
-                    "type": "TezosBallotOp",
-                    "id": 8
-                },
-                "chunkify": {
-                    "type": "bool",
-                    "id": 9
-                }
-            },
-            "nested": {
-                "TezosContractID": {
-                    "fields": {
-                        "tag": {
-                            "rule": "required",
-                            "type": "TezosContractType",
-                            "id": 1
-                        },
-                        "hash": {
-                            "rule": "required",
-                            "type": "bytes",
-                            "id": 2
-                        }
-                    },
-                    "nested": {
-                        "TezosContractType": {
-                            "values": {
-                                "Implicit": 0,
-                                "Originated": 1
-                            }
-                        }
-                    }
-                },
-                "TezosRevealOp": {
-                    "fields": {
-                        "source": {
-                            "rule": "required",
-                            "type": "bytes",
-                            "id": 7
-                        },
-                        "fee": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 2
-                        },
-                        "counter": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 3
-                        },
-                        "gas_limit": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 4
-                        },
-                        "storage_limit": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 5
-                        },
-                        "public_key": {
-                            "rule": "required",
-                            "type": "bytes",
-                            "id": 6
-                        }
-                    }
-                },
-                "TezosTransactionOp": {
-                    "fields": {
-                        "source": {
-                            "rule": "required",
-                            "type": "bytes",
-                            "id": 9
-                        },
-                        "fee": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 2
-                        },
-                        "counter": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 3
-                        },
-                        "gas_limit": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 4
-                        },
-                        "storage_limit": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 5
-                        },
-                        "amount": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 6
-                        },
-                        "destination": {
-                            "rule": "required",
-                            "type": "TezosContractID",
-                            "id": 7
-                        },
-                        "parameters": {
-                            "type": "bytes",
-                            "id": 8
-                        },
-                        "parameters_manager": {
-                            "type": "TezosParametersManager",
-                            "id": 10
-                        }
-                    },
-                    "nested": {
-                        "TezosParametersManager": {
-                            "fields": {
-                                "set_delegate": {
-                                    "type": "bytes",
-                                    "id": 1
-                                },
-                                "cancel_delegate": {
-                                    "type": "bool",
-                                    "id": 2
-                                },
-                                "transfer": {
-                                    "type": "TezosManagerTransfer",
-                                    "id": 3
-                                }
-                            },
-                            "nested": {
-                                "TezosManagerTransfer": {
-                                    "fields": {
-                                        "destination": {
-                                            "rule": "required",
-                                            "type": "TezosContractID",
-                                            "id": 1
-                                        },
-                                        "amount": {
-                                            "rule": "required",
-                                            "type": "uint64",
-                                            "id": 2
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
-                "TezosOriginationOp": {
-                    "fields": {
-                        "source": {
-                            "rule": "required",
-                            "type": "bytes",
-                            "id": 12
-                        },
-                        "fee": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 2
-                        },
-                        "counter": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 3
-                        },
-                        "gas_limit": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 4
-                        },
-                        "storage_limit": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 5
-                        },
-                        "manager_pubkey": {
-                            "type": "bytes",
-                            "id": 6
-                        },
-                        "balance": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 7
-                        },
-                        "spendable": {
-                            "type": "bool",
-                            "id": 8
-                        },
-                        "delegatable": {
-                            "type": "bool",
-                            "id": 9
-                        },
-                        "delegate": {
-                            "type": "bytes",
-                            "id": 10
-                        },
-                        "script": {
-                            "rule": "required",
-                            "type": "bytes",
-                            "id": 11
-                        }
-                    }
-                },
-                "TezosDelegationOp": {
-                    "fields": {
-                        "source": {
-                            "rule": "required",
-                            "type": "bytes",
-                            "id": 7
-                        },
-                        "fee": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 2
-                        },
-                        "counter": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 3
-                        },
-                        "gas_limit": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 4
-                        },
-                        "storage_limit": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 5
-                        },
-                        "delegate": {
-                            "rule": "required",
-                            "type": "bytes",
-                            "id": 6
-                        }
-                    }
-                },
-                "TezosProposalOp": {
-                    "fields": {
-                        "source": {
-                            "rule": "required",
-                            "type": "bytes",
-                            "id": 1
-                        },
-                        "period": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 2
-                        },
-                        "proposals": {
-                            "rule": "repeated",
-                            "type": "bytes",
-                            "id": 4
-                        }
-                    }
-                },
-                "TezosBallotOp": {
-                    "fields": {
-                        "source": {
-                            "rule": "required",
-                            "type": "bytes",
-                            "id": 1
-                        },
-                        "period": {
-                            "rule": "required",
-                            "type": "uint64",
-                            "id": 2
-                        },
-                        "proposal": {
-                            "rule": "required",
-                            "type": "bytes",
-                            "id": 3
-                        },
-                        "ballot": {
-                            "rule": "required",
-                            "type": "TezosBallotType",
-                            "id": 4
-                        }
-                    },
-                    "nested": {
-                        "TezosBallotType": {
-                            "values": {
-                                "Yay": 0,
-                                "Nay": 1,
-                                "Pass": 2
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "TezosSignedTx": {
-            "fields": {
-                "signature": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 1
-                },
-                "sig_op_contents": {
-                    "rule": "required",
-                    "type": "bytes",
-                    "id": 2
-                },
-                "operation_hash": {
-                    "rule": "required",
-                    "type": "string",
-                    "id": 3
-                }
-            }
-        },
-        "WebAuthnListResidentCredentials": {
-            "fields": {}
-        },
-        "WebAuthnAddResidentCredential": {
-            "fields": {
-                "credential_id": {
-                    "type": "bytes",
-                    "id": 1
-                }
-            }
-        },
-        "WebAuthnRemoveResidentCredential": {
-            "fields": {
-                "index": {
-                    "type": "uint32",
-                    "id": 1
-                }
-            }
-        },
-        "WebAuthnCredentials": {
-            "fields": {
-                "credentials": {
-                    "rule": "repeated",
-                    "type": "WebAuthnCredential",
-                    "id": 1
-                }
-            },
-            "nested": {
-                "WebAuthnCredential": {
-                    "fields": {
-                        "index": {
-                            "type": "uint32",
-                            "id": 1
-                        },
-                        "id": {
-                            "type": "bytes",
-                            "id": 2
-                        },
-                        "rp_id": {
-                            "type": "string",
-                            "id": 3
-                        },
-                        "rp_name": {
-                            "type": "string",
-                            "id": 4
-                        },
-                        "user_id": {
-                            "type": "bytes",
-                            "id": 5
-                        },
-                        "user_name": {
-                            "type": "string",
-                            "id": 6
-                        },
-                        "user_display_name": {
-                            "type": "string",
-                            "id": 7
-                        },
-                        "creation_time": {
-                            "type": "uint32",
-                            "id": 8
-                        },
-                        "hmac_secret": {
-                            "type": "bool",
-                            "id": 9
-                        },
-                        "use_sign_count": {
-                            "type": "bool",
-                            "id": 10
-                        },
-                        "algorithm": {
-                            "type": "sint32",
-                            "id": 11
-                        },
-                        "curve": {
-                            "type": "sint32",
-                            "id": 12
-                        }
-                    }
-                }
-            }
-        },
-        "wire_in": {
-            "type": "bool",
-            "id": 50002,
-            "extend": "google.protobuf.EnumValueOptions"
-        },
-        "wire_out": {
-            "type": "bool",
-            "id": 50003,
-            "extend": "google.protobuf.EnumValueOptions"
-        },
-        "wire_debug_in": {
-            "type": "bool",
-            "id": 50004,
-            "extend": "google.protobuf.EnumValueOptions"
-        },
-        "wire_debug_out": {
-            "type": "bool",
-            "id": 50005,
-            "extend": "google.protobuf.EnumValueOptions"
-        },
-        "wire_tiny": {
-            "type": "bool",
-            "id": 50006,
-            "extend": "google.protobuf.EnumValueOptions"
-        },
-        "wire_bootloader": {
-            "type": "bool",
-            "id": 50007,
-            "extend": "google.protobuf.EnumValueOptions"
-        },
-        "wire_no_fsm": {
-            "type": "bool",
-            "id": 50008,
-            "extend": "google.protobuf.EnumValueOptions"
-        },
-        "bitcoin_only": {
-            "type": "bool",
-            "id": 60000,
-            "extend": "google.protobuf.EnumValueOptions"
-        },
-        "has_bitcoin_only_values": {
-            "type": "bool",
-            "id": 51001,
-            "extend": "google.protobuf.EnumOptions"
-        },
-        "experimental_message": {
-            "type": "bool",
-            "id": 52001,
-            "extend": "google.protobuf.MessageOptions"
-        },
-        "wire_type": {
-            "type": "uint32",
-            "id": 52002,
-            "extend": "google.protobuf.MessageOptions"
-        },
-        "experimental_field": {
-            "type": "bool",
-            "id": 53001,
-            "extend": "google.protobuf.FieldOptions"
-        },
-        "include_in_bitcoin_only": {
-            "type": "bool",
-            "id": 60000,
-            "extend": "google.protobuf.FileOptions"
-        },
-        "MessageType": {
-            "options": {
-                "(has_bitcoin_only_values)": true
-            },
-            "valuesOptions": {
-                "MessageType_Initialize": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true,
-                    "(wire_tiny)": true
-                },
-                "MessageType_Ping": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_Success": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true,
-                    "(wire_debug_out)": true
-                },
-                "MessageType_Failure": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true,
-                    "(wire_debug_out)": true
-                },
-                "MessageType_ChangePin": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_WipeDevice": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_GetEntropy": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_Entropy": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_LoadDevice": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_ResetDevice": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_SetBusy": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_Features": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_PinMatrixRequest": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_PinMatrixAck": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true,
-                    "(wire_tiny)": true,
-                    "(wire_no_fsm)": true
-                },
-                "MessageType_Cancel": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true,
-                    "(wire_tiny)": true
-                },
-                "MessageType_LockDevice": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_ApplySettings": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_ButtonRequest": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_ButtonAck": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true,
-                    "(wire_tiny)": true,
-                    "(wire_no_fsm)": true
-                },
-                "MessageType_ApplyFlags": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_GetNonce": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_Nonce": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_BackupDevice": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_EntropyRequest": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_EntropyAck": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_PassphraseRequest": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_PassphraseAck": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true,
-                    "(wire_tiny)": true,
-                    "(wire_no_fsm)": true
-                },
-                "MessageType_RecoveryDevice": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_WordRequest": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_WordAck": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_GetFeatures": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_SdProtect": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_ChangeWipeCode": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_EndSession": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_DoPreauthorized": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_PreauthorizedRequest": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_CancelAuthorization": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_RebootToBootloader": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_GetFirmwareHash": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_FirmwareHash": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_UnlockPath": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_UnlockedPathRequest": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_ShowDeviceTutorial": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_UnlockBootloader": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_AuthenticateDevice": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_AuthenticityProof": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_ChangeLanguage": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_TranslationDataRequest": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_TranslationDataAck": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_SetBrightness": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_SetU2FCounter": {
-                    "(wire_in)": true
-                },
-                "MessageType_GetNextU2FCounter": {
-                    "(wire_in)": true
-                },
-                "MessageType_NextU2FCounter": {
-                    "(wire_out)": true
-                },
-                "MessageType_Deprecated_PassphraseStateRequest": {
-                    "deprecated": true
-                },
-                "MessageType_Deprecated_PassphraseStateAck": {
-                    "deprecated": true
-                },
-                "MessageType_FirmwareErase": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true,
-                    "(wire_bootloader)": true
-                },
-                "MessageType_FirmwareUpload": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true,
-                    "(wire_bootloader)": true
-                },
-                "MessageType_FirmwareRequest": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true,
-                    "(wire_bootloader)": true
-                },
-                "MessageType_ProdTestT1": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true,
-                    "(wire_bootloader)": true
-                },
-                "MessageType_GetPublicKey": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_PublicKey": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_SignTx": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_TxRequest": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_TxAck": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_GetAddress": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_Address": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_TxAckPaymentRequest": {
-                    "(wire_in)": true
-                },
-                "MessageType_SignMessage": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_VerifyMessage": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_MessageSignature": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_GetOwnershipId": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_OwnershipId": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_GetOwnershipProof": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_OwnershipProof": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_AuthorizeCoinJoin": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_CipherKeyValue": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_CipheredKeyValue": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_SignIdentity": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_SignedIdentity": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_GetECDHSessionKey": {
-                    "(bitcoin_only)": true,
-                    "(wire_in)": true
-                },
-                "MessageType_ECDHSessionKey": {
-                    "(bitcoin_only)": true,
-                    "(wire_out)": true
-                },
-                "MessageType_DebugLinkDecision": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_in)": true,
-                    "(wire_tiny)": true,
-                    "(wire_no_fsm)": true
-                },
-                "MessageType_DebugLinkGetState": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_in)": true,
-                    "(wire_tiny)": true
-                },
-                "MessageType_DebugLinkState": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_out)": true
-                },
-                "MessageType_DebugLinkStop": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_in)": true
-                },
-                "MessageType_DebugLinkLog": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_out)": true
-                },
-                "MessageType_DebugLinkMemoryRead": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_in)": true
-                },
-                "MessageType_DebugLinkMemory": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_out)": true
-                },
-                "MessageType_DebugLinkMemoryWrite": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_in)": true
-                },
-                "MessageType_DebugLinkFlashErase": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_in)": true
-                },
-                "MessageType_DebugLinkLayout": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_out)": true
-                },
-                "MessageType_DebugLinkReseedRandom": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_in)": true
-                },
-                "MessageType_DebugLinkRecordScreen": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_in)": true
-                },
-                "MessageType_DebugLinkEraseSdCard": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_in)": true
-                },
-                "MessageType_DebugLinkWatchLayout": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_in)": true
-                },
-                "MessageType_DebugLinkResetDebugEvents": {
-                    "(bitcoin_only)": true,
-                    "(wire_debug_in)": true
-                },
-                "MessageType_EthereumGetPublicKey": {
-                    "(wire_in)": true
-                },
-                "MessageType_EthereumPublicKey": {
-                    "(wire_out)": true
-                },
-                "MessageType_EthereumGetAddress": {
-                    "(wire_in)": true
-                },
-                "MessageType_EthereumAddress": {
-                    "(wire_out)": true
-                },
-                "MessageType_EthereumSignTx": {
-                    "(wire_in)": true
-                },
-                "MessageType_EthereumSignTxEIP1559": {
-                    "(wire_in)": true
-                },
-                "MessageType_EthereumTxRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_EthereumTxAck": {
-                    "(wire_in)": true
-                },
-                "MessageType_EthereumSignMessage": {
-                    "(wire_in)": true
-                },
-                "MessageType_EthereumVerifyMessage": {
-                    "(wire_in)": true
-                },
-                "MessageType_EthereumMessageSignature": {
-                    "(wire_out)": true
-                },
-                "MessageType_EthereumSignTypedData": {
-                    "(wire_in)": true
-                },
-                "MessageType_EthereumTypedDataStructRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_EthereumTypedDataStructAck": {
-                    "(wire_in)": true
-                },
-                "MessageType_EthereumTypedDataValueRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_EthereumTypedDataValueAck": {
-                    "(wire_in)": true
-                },
-                "MessageType_EthereumTypedDataSignature": {
-                    "(wire_out)": true
-                },
-                "MessageType_EthereumSignTypedHash": {
-                    "(wire_in)": true
-                },
-                "MessageType_NEMGetAddress": {
-                    "(wire_in)": true
-                },
-                "MessageType_NEMAddress": {
-                    "(wire_out)": true
-                },
-                "MessageType_NEMSignTx": {
-                    "(wire_in)": true
-                },
-                "MessageType_NEMSignedTx": {
-                    "(wire_out)": true
-                },
-                "MessageType_NEMDecryptMessage": {
-                    "(wire_in)": true
-                },
-                "MessageType_NEMDecryptedMessage": {
-                    "(wire_out)": true
-                },
-                "MessageType_TezosGetAddress": {
-                    "(wire_in)": true
-                },
-                "MessageType_TezosAddress": {
-                    "(wire_out)": true
-                },
-                "MessageType_TezosSignTx": {
-                    "(wire_in)": true
-                },
-                "MessageType_TezosSignedTx": {
-                    "(wire_out)": true
-                },
-                "MessageType_TezosGetPublicKey": {
-                    "(wire_in)": true
-                },
-                "MessageType_TezosPublicKey": {
-                    "(wire_out)": true
-                },
-                "MessageType_StellarSignTx": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarTxOpRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_StellarGetAddress": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarAddress": {
-                    "(wire_out)": true
-                },
-                "MessageType_StellarCreateAccountOp": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarPaymentOp": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarPathPaymentStrictReceiveOp": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarManageSellOfferOp": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarCreatePassiveSellOfferOp": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarSetOptionsOp": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarChangeTrustOp": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarAllowTrustOp": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarAccountMergeOp": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarManageDataOp": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarBumpSequenceOp": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarManageBuyOfferOp": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarPathPaymentStrictSendOp": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarClaimClaimableBalanceOp": {
-                    "(wire_in)": true
-                },
-                "MessageType_StellarSignedTx": {
-                    "(wire_out)": true
-                },
-                "MessageType_CardanoGetPublicKey": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoPublicKey": {
-                    "(wire_out)": true
-                },
-                "MessageType_CardanoGetAddress": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoAddress": {
-                    "(wire_out)": true
-                },
-                "MessageType_CardanoTxItemAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_CardanoTxAuxiliaryDataSupplement": {
-                    "(wire_out)": true
-                },
-                "MessageType_CardanoTxWitnessRequest": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoTxWitnessResponse": {
-                    "(wire_out)": true
-                },
-                "MessageType_CardanoTxHostAck": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoTxBodyHash": {
-                    "(wire_out)": true
-                },
-                "MessageType_CardanoSignTxFinished": {
-                    "(wire_out)": true
-                },
-                "MessageType_CardanoSignTxInit": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoTxInput": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoTxOutput": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoAssetGroup": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoToken": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoTxCertificate": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoTxWithdrawal": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoTxAuxiliaryData": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoPoolOwner": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoPoolRelayParameters": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoGetNativeScriptHash": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoNativeScriptHash": {
-                    "(wire_out)": true
-                },
-                "MessageType_CardanoTxMint": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoTxCollateralInput": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoTxRequiredSigner": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoTxInlineDatumChunk": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoTxReferenceScriptChunk": {
-                    "(wire_in)": true
-                },
-                "MessageType_CardanoTxReferenceInput": {
-                    "(wire_in)": true
-                },
-                "MessageType_RippleGetAddress": {
-                    "(wire_in)": true
-                },
-                "MessageType_RippleAddress": {
-                    "(wire_out)": true
-                },
-                "MessageType_RippleSignTx": {
-                    "(wire_in)": true
-                },
-                "MessageType_RippleSignedTx": {
-                    "(wire_in)": true
-                },
-                "MessageType_MoneroTransactionInitRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionInitAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionSetInputRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionSetInputAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionInputViniRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionInputViniAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionAllInputsSetRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionAllInputsSetAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionSetOutputRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionSetOutputAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionAllOutSetRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionAllOutSetAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionSignInputRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionSignInputAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionFinalRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroTransactionFinalAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroKeyImageExportInitRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroKeyImageExportInitAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroKeyImageSyncStepRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroKeyImageSyncStepAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroKeyImageSyncFinalRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroKeyImageSyncFinalAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroGetAddress": {
-                    "(wire_in)": true
-                },
-                "MessageType_MoneroAddress": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroGetWatchKey": {
-                    "(wire_in)": true
-                },
-                "MessageType_MoneroWatchKey": {
-                    "(wire_out)": true
-                },
-                "MessageType_DebugMoneroDiagRequest": {
-                    "(wire_in)": true
-                },
-                "MessageType_DebugMoneroDiagAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroGetTxKeyRequest": {
-                    "(wire_in)": true
-                },
-                "MessageType_MoneroGetTxKeyAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroLiveRefreshStartRequest": {
-                    "(wire_in)": true
-                },
-                "MessageType_MoneroLiveRefreshStartAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroLiveRefreshStepRequest": {
-                    "(wire_in)": true
-                },
-                "MessageType_MoneroLiveRefreshStepAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_MoneroLiveRefreshFinalRequest": {
-                    "(wire_in)": true
-                },
-                "MessageType_MoneroLiveRefreshFinalAck": {
-                    "(wire_out)": true
-                },
-                "MessageType_EosGetPublicKey": {
-                    "(wire_in)": true
-                },
-                "MessageType_EosPublicKey": {
-                    "(wire_out)": true
-                },
-                "MessageType_EosSignTx": {
-                    "(wire_in)": true
-                },
-                "MessageType_EosTxActionRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_EosTxActionAck": {
-                    "(wire_in)": true
-                },
-                "MessageType_EosSignedTx": {
-                    "(wire_out)": true
-                },
-                "MessageType_BinanceGetAddress": {
-                    "(wire_in)": true
-                },
-                "MessageType_BinanceAddress": {
-                    "(wire_out)": true
-                },
-                "MessageType_BinanceGetPublicKey": {
-                    "(wire_in)": true
-                },
-                "MessageType_BinancePublicKey": {
-                    "(wire_out)": true
-                },
-                "MessageType_BinanceSignTx": {
-                    "(wire_in)": true
-                },
-                "MessageType_BinanceTxRequest": {
-                    "(wire_out)": true
-                },
-                "MessageType_BinanceTransferMsg": {
-                    "(wire_in)": true
-                },
-                "MessageType_BinanceOrderMsg": {
-                    "(wire_in)": true
-                },
-                "MessageType_BinanceCancelMsg": {
-                    "(wire_in)": true
-                },
-                "MessageType_BinanceSignedTx": {
-                    "(wire_out)": true
-                },
-                "MessageType_WebAuthnListResidentCredentials": {
-                    "(wire_in)": true
-                },
-                "MessageType_WebAuthnCredentials": {
-                    "(wire_out)": true
-                },
-                "MessageType_WebAuthnAddResidentCredential": {
-                    "(wire_in)": true
-                },
-                "MessageType_WebAuthnRemoveResidentCredential": {
-                    "(wire_in)": true
-                },
-                "MessageType_SolanaGetPublicKey": {
-                    "(wire_in)": true
-                },
-                "MessageType_SolanaPublicKey": {
-                    "(wire_out)": true
-                },
-                "MessageType_SolanaGetAddress": {
-                    "(wire_in)": true
-                },
-                "MessageType_SolanaAddress": {
-                    "(wire_out)": true
-                },
-                "MessageType_SolanaSignTx": {
-                    "(wire_in)": true
-                },
-                "MessageType_SolanaTxSignature": {
-                    "(wire_out)": true
-                }
-            },
-            "values": {
-                "MessageType_Initialize": 0,
-                "MessageType_Ping": 1,
-                "MessageType_Success": 2,
-                "MessageType_Failure": 3,
-                "MessageType_ChangePin": 4,
-                "MessageType_WipeDevice": 5,
-                "MessageType_GetEntropy": 9,
-                "MessageType_Entropy": 10,
-                "MessageType_LoadDevice": 13,
-                "MessageType_ResetDevice": 14,
-                "MessageType_SetBusy": 16,
-                "MessageType_Features": 17,
-                "MessageType_PinMatrixRequest": 18,
-                "MessageType_PinMatrixAck": 19,
-                "MessageType_Cancel": 20,
-                "MessageType_LockDevice": 24,
-                "MessageType_ApplySettings": 25,
-                "MessageType_ButtonRequest": 26,
-                "MessageType_ButtonAck": 27,
-                "MessageType_ApplyFlags": 28,
-                "MessageType_GetNonce": 31,
-                "MessageType_Nonce": 33,
-                "MessageType_BackupDevice": 34,
-                "MessageType_EntropyRequest": 35,
-                "MessageType_EntropyAck": 36,
-                "MessageType_PassphraseRequest": 41,
-                "MessageType_PassphraseAck": 42,
-                "MessageType_RecoveryDevice": 45,
-                "MessageType_WordRequest": 46,
-                "MessageType_WordAck": 47,
-                "MessageType_GetFeatures": 55,
-                "MessageType_SdProtect": 79,
-                "MessageType_ChangeWipeCode": 82,
-                "MessageType_EndSession": 83,
-                "MessageType_DoPreauthorized": 84,
-                "MessageType_PreauthorizedRequest": 85,
-                "MessageType_CancelAuthorization": 86,
-                "MessageType_RebootToBootloader": 87,
-                "MessageType_GetFirmwareHash": 88,
-                "MessageType_FirmwareHash": 89,
-                "MessageType_UnlockPath": 93,
-                "MessageType_UnlockedPathRequest": 94,
-                "MessageType_ShowDeviceTutorial": 95,
-                "MessageType_UnlockBootloader": 96,
-                "MessageType_AuthenticateDevice": 97,
-                "MessageType_AuthenticityProof": 98,
-                "MessageType_ChangeLanguage": 990,
-                "MessageType_TranslationDataRequest": 991,
-                "MessageType_TranslationDataAck": 992,
-                "MessageType_SetBrightness": 993,
-                "MessageType_SetU2FCounter": 63,
-                "MessageType_GetNextU2FCounter": 80,
-                "MessageType_NextU2FCounter": 81,
-                "MessageType_Deprecated_PassphraseStateRequest": 77,
-                "MessageType_Deprecated_PassphraseStateAck": 78,
-                "MessageType_FirmwareErase": 6,
-                "MessageType_FirmwareUpload": 7,
-                "MessageType_FirmwareRequest": 8,
-                "MessageType_ProdTestT1": 32,
-                "MessageType_GetPublicKey": 11,
-                "MessageType_PublicKey": 12,
-                "MessageType_SignTx": 15,
-                "MessageType_TxRequest": 21,
-                "MessageType_TxAck": 22,
-                "MessageType_GetAddress": 29,
-                "MessageType_Address": 30,
-                "MessageType_TxAckPaymentRequest": 37,
-                "MessageType_SignMessage": 38,
-                "MessageType_VerifyMessage": 39,
-                "MessageType_MessageSignature": 40,
-                "MessageType_GetOwnershipId": 43,
-                "MessageType_OwnershipId": 44,
-                "MessageType_GetOwnershipProof": 49,
-                "MessageType_OwnershipProof": 50,
-                "MessageType_AuthorizeCoinJoin": 51,
-                "MessageType_CipherKeyValue": 23,
-                "MessageType_CipheredKeyValue": 48,
-                "MessageType_SignIdentity": 53,
-                "MessageType_SignedIdentity": 54,
-                "MessageType_GetECDHSessionKey": 61,
-                "MessageType_ECDHSessionKey": 62,
-                "MessageType_DebugLinkDecision": 100,
-                "MessageType_DebugLinkGetState": 101,
-                "MessageType_DebugLinkState": 102,
-                "MessageType_DebugLinkStop": 103,
-                "MessageType_DebugLinkLog": 104,
-                "MessageType_DebugLinkMemoryRead": 110,
-                "MessageType_DebugLinkMemory": 111,
-                "MessageType_DebugLinkMemoryWrite": 112,
-                "MessageType_DebugLinkFlashErase": 113,
-                "MessageType_DebugLinkLayout": 9001,
-                "MessageType_DebugLinkReseedRandom": 9002,
-                "MessageType_DebugLinkRecordScreen": 9003,
-                "MessageType_DebugLinkEraseSdCard": 9005,
-                "MessageType_DebugLinkWatchLayout": 9006,
-                "MessageType_DebugLinkResetDebugEvents": 9007,
-                "MessageType_EthereumGetPublicKey": 450,
-                "MessageType_EthereumPublicKey": 451,
-                "MessageType_EthereumGetAddress": 56,
-                "MessageType_EthereumAddress": 57,
-                "MessageType_EthereumSignTx": 58,
-                "MessageType_EthereumSignTxEIP1559": 452,
-                "MessageType_EthereumTxRequest": 59,
-                "MessageType_EthereumTxAck": 60,
-                "MessageType_EthereumSignMessage": 64,
-                "MessageType_EthereumVerifyMessage": 65,
-                "MessageType_EthereumMessageSignature": 66,
-                "MessageType_EthereumSignTypedData": 464,
-                "MessageType_EthereumTypedDataStructRequest": 465,
-                "MessageType_EthereumTypedDataStructAck": 466,
-                "MessageType_EthereumTypedDataValueRequest": 467,
-                "MessageType_EthereumTypedDataValueAck": 468,
-                "MessageType_EthereumTypedDataSignature": 469,
-                "MessageType_EthereumSignTypedHash": 470,
-                "MessageType_NEMGetAddress": 67,
-                "MessageType_NEMAddress": 68,
-                "MessageType_NEMSignTx": 69,
-                "MessageType_NEMSignedTx": 70,
-                "MessageType_NEMDecryptMessage": 75,
-                "MessageType_NEMDecryptedMessage": 76,
-                "MessageType_TezosGetAddress": 150,
-                "MessageType_TezosAddress": 151,
-                "MessageType_TezosSignTx": 152,
-                "MessageType_TezosSignedTx": 153,
-                "MessageType_TezosGetPublicKey": 154,
-                "MessageType_TezosPublicKey": 155,
-                "MessageType_StellarSignTx": 202,
-                "MessageType_StellarTxOpRequest": 203,
-                "MessageType_StellarGetAddress": 207,
-                "MessageType_StellarAddress": 208,
-                "MessageType_StellarCreateAccountOp": 210,
-                "MessageType_StellarPaymentOp": 211,
-                "MessageType_StellarPathPaymentStrictReceiveOp": 212,
-                "MessageType_StellarManageSellOfferOp": 213,
-                "MessageType_StellarCreatePassiveSellOfferOp": 214,
-                "MessageType_StellarSetOptionsOp": 215,
-                "MessageType_StellarChangeTrustOp": 216,
-                "MessageType_StellarAllowTrustOp": 217,
-                "MessageType_StellarAccountMergeOp": 218,
-                "MessageType_StellarManageDataOp": 220,
-                "MessageType_StellarBumpSequenceOp": 221,
-                "MessageType_StellarManageBuyOfferOp": 222,
-                "MessageType_StellarPathPaymentStrictSendOp": 223,
-                "MessageType_StellarClaimClaimableBalanceOp": 225,
-                "MessageType_StellarSignedTx": 230,
-                "MessageType_CardanoGetPublicKey": 305,
-                "MessageType_CardanoPublicKey": 306,
-                "MessageType_CardanoGetAddress": 307,
-                "MessageType_CardanoAddress": 308,
-                "MessageType_CardanoTxItemAck": 313,
-                "MessageType_CardanoTxAuxiliaryDataSupplement": 314,
-                "MessageType_CardanoTxWitnessRequest": 315,
-                "MessageType_CardanoTxWitnessResponse": 316,
-                "MessageType_CardanoTxHostAck": 317,
-                "MessageType_CardanoTxBodyHash": 318,
-                "MessageType_CardanoSignTxFinished": 319,
-                "MessageType_CardanoSignTxInit": 320,
-                "MessageType_CardanoTxInput": 321,
-                "MessageType_CardanoTxOutput": 322,
-                "MessageType_CardanoAssetGroup": 323,
-                "MessageType_CardanoToken": 324,
-                "MessageType_CardanoTxCertificate": 325,
-                "MessageType_CardanoTxWithdrawal": 326,
-                "MessageType_CardanoTxAuxiliaryData": 327,
-                "MessageType_CardanoPoolOwner": 328,
-                "MessageType_CardanoPoolRelayParameters": 329,
-                "MessageType_CardanoGetNativeScriptHash": 330,
-                "MessageType_CardanoNativeScriptHash": 331,
-                "MessageType_CardanoTxMint": 332,
-                "MessageType_CardanoTxCollateralInput": 333,
-                "MessageType_CardanoTxRequiredSigner": 334,
-                "MessageType_CardanoTxInlineDatumChunk": 335,
-                "MessageType_CardanoTxReferenceScriptChunk": 336,
-                "MessageType_CardanoTxReferenceInput": 337,
-                "MessageType_RippleGetAddress": 400,
-                "MessageType_RippleAddress": 401,
-                "MessageType_RippleSignTx": 402,
-                "MessageType_RippleSignedTx": 403,
-                "MessageType_MoneroTransactionInitRequest": 501,
-                "MessageType_MoneroTransactionInitAck": 502,
-                "MessageType_MoneroTransactionSetInputRequest": 503,
-                "MessageType_MoneroTransactionSetInputAck": 504,
-                "MessageType_MoneroTransactionInputViniRequest": 507,
-                "MessageType_MoneroTransactionInputViniAck": 508,
-                "MessageType_MoneroTransactionAllInputsSetRequest": 509,
-                "MessageType_MoneroTransactionAllInputsSetAck": 510,
-                "MessageType_MoneroTransactionSetOutputRequest": 511,
-                "MessageType_MoneroTransactionSetOutputAck": 512,
-                "MessageType_MoneroTransactionAllOutSetRequest": 513,
-                "MessageType_MoneroTransactionAllOutSetAck": 514,
-                "MessageType_MoneroTransactionSignInputRequest": 515,
-                "MessageType_MoneroTransactionSignInputAck": 516,
-                "MessageType_MoneroTransactionFinalRequest": 517,
-                "MessageType_MoneroTransactionFinalAck": 518,
-                "MessageType_MoneroKeyImageExportInitRequest": 530,
-                "MessageType_MoneroKeyImageExportInitAck": 531,
-                "MessageType_MoneroKeyImageSyncStepRequest": 532,
-                "MessageType_MoneroKeyImageSyncStepAck": 533,
-                "MessageType_MoneroKeyImageSyncFinalRequest": 534,
-                "MessageType_MoneroKeyImageSyncFinalAck": 535,
-                "MessageType_MoneroGetAddress": 540,
-                "MessageType_MoneroAddress": 541,
-                "MessageType_MoneroGetWatchKey": 542,
-                "MessageType_MoneroWatchKey": 543,
-                "MessageType_DebugMoneroDiagRequest": 546,
-                "MessageType_DebugMoneroDiagAck": 547,
-                "MessageType_MoneroGetTxKeyRequest": 550,
-                "MessageType_MoneroGetTxKeyAck": 551,
-                "MessageType_MoneroLiveRefreshStartRequest": 552,
-                "MessageType_MoneroLiveRefreshStartAck": 553,
-                "MessageType_MoneroLiveRefreshStepRequest": 554,
-                "MessageType_MoneroLiveRefreshStepAck": 555,
-                "MessageType_MoneroLiveRefreshFinalRequest": 556,
-                "MessageType_MoneroLiveRefreshFinalAck": 557,
-                "MessageType_EosGetPublicKey": 600,
-                "MessageType_EosPublicKey": 601,
-                "MessageType_EosSignTx": 602,
-                "MessageType_EosTxActionRequest": 603,
-                "MessageType_EosTxActionAck": 604,
-                "MessageType_EosSignedTx": 605,
-                "MessageType_BinanceGetAddress": 700,
-                "MessageType_BinanceAddress": 701,
-                "MessageType_BinanceGetPublicKey": 702,
-                "MessageType_BinancePublicKey": 703,
-                "MessageType_BinanceSignTx": 704,
-                "MessageType_BinanceTxRequest": 705,
-                "MessageType_BinanceTransferMsg": 706,
-                "MessageType_BinanceOrderMsg": 707,
-                "MessageType_BinanceCancelMsg": 708,
-                "MessageType_BinanceSignedTx": 709,
-                "MessageType_WebAuthnListResidentCredentials": 800,
-                "MessageType_WebAuthnCredentials": 801,
-                "MessageType_WebAuthnAddResidentCredential": 802,
-                "MessageType_WebAuthnRemoveResidentCredential": 803,
-                "MessageType_SolanaGetPublicKey": 900,
-                "MessageType_SolanaPublicKey": 901,
-                "MessageType_SolanaGetAddress": 902,
-                "MessageType_SolanaAddress": 903,
-                "MessageType_SolanaSignTx": 904,
-                "MessageType_SolanaTxSignature": 905
-            }
-        },
-        "google": {
-            "nested": {
-                "protobuf": {
-                    "nested": {
-                        "FileDescriptorSet": {
-                            "fields": {
-                                "file": {
-                                    "rule": "repeated",
-                                    "type": "FileDescriptorProto",
-                                    "id": 1
-                                }
-                            }
-                        },
-                        "FileDescriptorProto": {
-                            "fields": {
-                                "name": {
-                                    "type": "string",
-                                    "id": 1
-                                },
-                                "package": {
-                                    "type": "string",
-                                    "id": 2
-                                },
-                                "dependency": {
-                                    "rule": "repeated",
-                                    "type": "string",
-                                    "id": 3
-                                },
-                                "public_dependency": {
-                                    "rule": "repeated",
-                                    "type": "int32",
-                                    "id": 10,
-                                    "options": {
-                                        "packed": false
-                                    }
-                                },
-                                "weak_dependency": {
-                                    "rule": "repeated",
-                                    "type": "int32",
-                                    "id": 11,
-                                    "options": {
-                                        "packed": false
-                                    }
-                                },
-                                "message_type": {
-                                    "rule": "repeated",
-                                    "type": "DescriptorProto",
-                                    "id": 4
-                                },
-                                "enum_type": {
-                                    "rule": "repeated",
-                                    "type": "EnumDescriptorProto",
-                                    "id": 5
-                                },
-                                "service": {
-                                    "rule": "repeated",
-                                    "type": "ServiceDescriptorProto",
-                                    "id": 6
-                                },
-                                "extension": {
-                                    "rule": "repeated",
-                                    "type": "FieldDescriptorProto",
-                                    "id": 7
-                                },
-                                "options": {
-                                    "type": "FileOptions",
-                                    "id": 8
-                                },
-                                "source_code_info": {
-                                    "type": "SourceCodeInfo",
-                                    "id": 9
-                                },
-                                "syntax": {
-                                    "type": "string",
-                                    "id": 12
-                                }
-                            }
-                        },
-                        "DescriptorProto": {
-                            "fields": {
-                                "name": {
-                                    "type": "string",
-                                    "id": 1
-                                },
-                                "field": {
-                                    "rule": "repeated",
-                                    "type": "FieldDescriptorProto",
-                                    "id": 2
-                                },
-                                "extension": {
-                                    "rule": "repeated",
-                                    "type": "FieldDescriptorProto",
-                                    "id": 6
-                                },
-                                "nested_type": {
-                                    "rule": "repeated",
-                                    "type": "DescriptorProto",
-                                    "id": 3
-                                },
-                                "enum_type": {
-                                    "rule": "repeated",
-                                    "type": "EnumDescriptorProto",
-                                    "id": 4
-                                },
-                                "extension_range": {
-                                    "rule": "repeated",
-                                    "type": "ExtensionRange",
-                                    "id": 5
-                                },
-                                "oneof_decl": {
-                                    "rule": "repeated",
-                                    "type": "OneofDescriptorProto",
-                                    "id": 8
-                                },
-                                "options": {
-                                    "type": "MessageOptions",
-                                    "id": 7
-                                },
-                                "reserved_range": {
-                                    "rule": "repeated",
-                                    "type": "ReservedRange",
-                                    "id": 9
-                                },
-                                "reserved_name": {
-                                    "rule": "repeated",
-                                    "type": "string",
-                                    "id": 10
-                                }
-                            },
-                            "nested": {
-                                "ExtensionRange": {
-                                    "fields": {
-                                        "start": {
-                                            "type": "int32",
-                                            "id": 1
-                                        },
-                                        "end": {
-                                            "type": "int32",
-                                            "id": 2
-                                        }
-                                    }
-                                },
-                                "ReservedRange": {
-                                    "fields": {
-                                        "start": {
-                                            "type": "int32",
-                                            "id": 1
-                                        },
-                                        "end": {
-                                            "type": "int32",
-                                            "id": 2
-                                        }
-                                    }
-                                }
-                            }
-                        },
-                        "FieldDescriptorProto": {
-                            "fields": {
-                                "name": {
-                                    "type": "string",
-                                    "id": 1
-                                },
-                                "number": {
-                                    "type": "int32",
-                                    "id": 3
-                                },
-                                "label": {
-                                    "type": "Label",
-                                    "id": 4
-                                },
-                                "type": {
-                                    "type": "Type",
-                                    "id": 5
-                                },
-                                "type_name": {
-                                    "type": "string",
-                                    "id": 6
-                                },
-                                "extendee": {
-                                    "type": "string",
-                                    "id": 2
-                                },
-                                "default_value": {
-                                    "type": "string",
-                                    "id": 7
-                                },
-                                "oneof_index": {
-                                    "type": "int32",
-                                    "id": 9
-                                },
-                                "json_name": {
-                                    "type": "string",
-                                    "id": 10
-                                },
-                                "options": {
-                                    "type": "FieldOptions",
-                                    "id": 8
-                                }
-                            },
-                            "nested": {
-                                "Type": {
-                                    "values": {
-                                        "TYPE_DOUBLE": 1,
-                                        "TYPE_FLOAT": 2,
-                                        "TYPE_INT64": 3,
-                                        "TYPE_UINT64": 4,
-                                        "TYPE_INT32": 5,
-                                        "TYPE_FIXED64": 6,
-                                        "TYPE_FIXED32": 7,
-                                        "TYPE_BOOL": 8,
-                                        "TYPE_STRING": 9,
-                                        "TYPE_GROUP": 10,
-                                        "TYPE_MESSAGE": 11,
-                                        "TYPE_BYTES": 12,
-                                        "TYPE_UINT32": 13,
-                                        "TYPE_ENUM": 14,
-                                        "TYPE_SFIXED32": 15,
-                                        "TYPE_SFIXED64": 16,
-                                        "TYPE_SINT32": 17,
-                                        "TYPE_SINT64": 18
-                                    }
-                                },
-                                "Label": {
-                                    "values": {
-                                        "LABEL_OPTIONAL": 1,
-                                        "LABEL_REQUIRED": 2,
-                                        "LABEL_REPEATED": 3
-                                    }
-                                }
-                            }
-                        },
-                        "OneofDescriptorProto": {
-                            "fields": {
-                                "name": {
-                                    "type": "string",
-                                    "id": 1
-                                },
-                                "options": {
-                                    "type": "OneofOptions",
-                                    "id": 2
-                                }
-                            }
-                        },
-                        "EnumDescriptorProto": {
-                            "fields": {
-                                "name": {
-                                    "type": "string",
-                                    "id": 1
-                                },
-                                "value": {
-                                    "rule": "repeated",
-                                    "type": "EnumValueDescriptorProto",
-                                    "id": 2
-                                },
-                                "options": {
-                                    "type": "EnumOptions",
-                                    "id": 3
-                                }
-                            }
-                        },
-                        "EnumValueDescriptorProto": {
-                            "fields": {
-                                "name": {
-                                    "type": "string",
-                                    "id": 1
-                                },
-                                "number": {
-                                    "type": "int32",
-                                    "id": 2
-                                },
-                                "options": {
-                                    "type": "EnumValueOptions",
-                                    "id": 3
-                                }
-                            }
-                        },
-                        "ServiceDescriptorProto": {
-                            "fields": {
-                                "name": {
-                                    "type": "string",
-                                    "id": 1
-                                },
-                                "method": {
-                                    "rule": "repeated",
-                                    "type": "MethodDescriptorProto",
-                                    "id": 2
-                                },
-                                "options": {
-                                    "type": "ServiceOptions",
-                                    "id": 3
-                                }
-                            }
-                        },
-                        "MethodDescriptorProto": {
-                            "fields": {
-                                "name": {
-                                    "type": "string",
-                                    "id": 1
-                                },
-                                "input_type": {
-                                    "type": "string",
-                                    "id": 2
-                                },
-                                "output_type": {
-                                    "type": "string",
-                                    "id": 3
-                                },
-                                "options": {
-                                    "type": "MethodOptions",
-                                    "id": 4
-                                },
-                                "client_streaming": {
-                                    "type": "bool",
-                                    "id": 5
-                                },
-                                "server_streaming": {
-                                    "type": "bool",
-                                    "id": 6
-                                }
-                            }
-                        },
-                        "FileOptions": {
-                            "fields": {
-                                "java_package": {
-                                    "type": "string",
-                                    "id": 1
-                                },
-                                "java_outer_classname": {
-                                    "type": "string",
-                                    "id": 8
-                                },
-                                "java_multiple_files": {
-                                    "type": "bool",
-                                    "id": 10
-                                },
-                                "java_generate_equals_and_hash": {
-                                    "type": "bool",
-                                    "id": 20,
-                                    "options": {
-                                        "deprecated": true
-                                    }
-                                },
-                                "java_string_check_utf8": {
-                                    "type": "bool",
-                                    "id": 27
-                                },
-                                "optimize_for": {
-                                    "type": "OptimizeMode",
-                                    "id": 9,
-                                    "options": {
-                                        "default": "SPEED"
-                                    }
-                                },
-                                "go_package": {
-                                    "type": "string",
-                                    "id": 11
-                                },
-                                "cc_generic_services": {
-                                    "type": "bool",
-                                    "id": 16
-                                },
-                                "java_generic_services": {
-                                    "type": "bool",
-                                    "id": 17
-                                },
-                                "py_generic_services": {
-                                    "type": "bool",
-                                    "id": 18
-                                },
-                                "deprecated": {
-                                    "type": "bool",
-                                    "id": 23
-                                },
-                                "cc_enable_arenas": {
-                                    "type": "bool",
-                                    "id": 31
-                                },
-                                "objc_class_prefix": {
-                                    "type": "string",
-                                    "id": 36
-                                },
-                                "csharp_namespace": {
-                                    "type": "string",
-                                    "id": 37
-                                },
-                                "uninterpreted_option": {
-                                    "rule": "repeated",
-                                    "type": "UninterpretedOption",
-                                    "id": 999
-                                }
-                            },
-                            "extensions": [[1000, 536870911]],
-                            "reserved": [[38, 38]],
-                            "nested": {
-                                "OptimizeMode": {
-                                    "values": {
-                                        "SPEED": 1,
-                                        "CODE_SIZE": 2,
-                                        "LITE_RUNTIME": 3
-                                    }
-                                }
-                            }
-                        },
-                        "MessageOptions": {
-                            "fields": {
-                                "message_set_wire_format": {
-                                    "type": "bool",
-                                    "id": 1
-                                },
-                                "no_standard_descriptor_accessor": {
-                                    "type": "bool",
-                                    "id": 2
-                                },
-                                "deprecated": {
-                                    "type": "bool",
-                                    "id": 3
-                                },
-                                "map_entry": {
-                                    "type": "bool",
-                                    "id": 7
-                                },
-                                "uninterpreted_option": {
-                                    "rule": "repeated",
-                                    "type": "UninterpretedOption",
-                                    "id": 999
-                                }
-                            },
-                            "extensions": [[1000, 536870911]],
-                            "reserved": [[8, 8]]
-                        },
-                        "FieldOptions": {
-                            "fields": {
-                                "ctype": {
-                                    "type": "CType",
-                                    "id": 1,
-                                    "options": {
-                                        "default": "STRING"
-                                    }
-                                },
-                                "packed": {
-                                    "type": "bool",
-                                    "id": 2
-                                },
-                                "jstype": {
-                                    "type": "JSType",
-                                    "id": 6,
-                                    "options": {
-                                        "default": "JS_NORMAL"
-                                    }
-                                },
-                                "lazy": {
-                                    "type": "bool",
-                                    "id": 5
-                                },
-                                "deprecated": {
-                                    "type": "bool",
-                                    "id": 3
-                                },
-                                "weak": {
-                                    "type": "bool",
-                                    "id": 10
-                                },
-                                "uninterpreted_option": {
-                                    "rule": "repeated",
-                                    "type": "UninterpretedOption",
-                                    "id": 999
-                                }
-                            },
-                            "extensions": [[1000, 536870911]],
-                            "reserved": [[4, 4]],
-                            "nested": {
-                                "CType": {
-                                    "values": {
-                                        "STRING": 0,
-                                        "CORD": 1,
-                                        "STRING_PIECE": 2
-                                    }
-                                },
-                                "JSType": {
-                                    "values": {
-                                        "JS_NORMAL": 0,
-                                        "JS_STRING": 1,
-                                        "JS_NUMBER": 2
-                                    }
-                                }
-                            }
-                        },
-                        "OneofOptions": {
-                            "fields": {
-                                "uninterpreted_option": {
-                                    "rule": "repeated",
-                                    "type": "UninterpretedOption",
-                                    "id": 999
-                                }
-                            },
-                            "extensions": [[1000, 536870911]]
-                        },
-                        "EnumOptions": {
-                            "fields": {
-                                "allow_alias": {
-                                    "type": "bool",
-                                    "id": 2
-                                },
-                                "deprecated": {
-                                    "type": "bool",
-                                    "id": 3
-                                },
-                                "uninterpreted_option": {
-                                    "rule": "repeated",
-                                    "type": "UninterpretedOption",
-                                    "id": 999
-                                }
-                            },
-                            "extensions": [[1000, 536870911]]
-                        },
-                        "EnumValueOptions": {
-                            "fields": {
-                                "deprecated": {
-                                    "type": "bool",
-                                    "id": 1
-                                },
-                                "uninterpreted_option": {
-                                    "rule": "repeated",
-                                    "type": "UninterpretedOption",
-                                    "id": 999
-                                }
-                            },
-                            "extensions": [[1000, 536870911]]
-                        },
-                        "ServiceOptions": {
-                            "fields": {
-                                "deprecated": {
-                                    "type": "bool",
-                                    "id": 33
-                                },
-                                "uninterpreted_option": {
-                                    "rule": "repeated",
-                                    "type": "UninterpretedOption",
-                                    "id": 999
-                                }
-                            },
-                            "extensions": [[1000, 536870911]]
-                        },
-                        "MethodOptions": {
-                            "fields": {
-                                "deprecated": {
-                                    "type": "bool",
-                                    "id": 33
-                                },
-                                "uninterpreted_option": {
-                                    "rule": "repeated",
-                                    "type": "UninterpretedOption",
-                                    "id": 999
-                                }
-                            },
-                            "extensions": [[1000, 536870911]]
-                        },
-                        "UninterpretedOption": {
-                            "fields": {
-                                "name": {
-                                    "rule": "repeated",
-                                    "type": "NamePart",
-                                    "id": 2
-                                },
-                                "identifier_value": {
-                                    "type": "string",
-                                    "id": 3
-                                },
-                                "positive_int_value": {
-                                    "type": "uint64",
-                                    "id": 4
-                                },
-                                "negative_int_value": {
-                                    "type": "int64",
-                                    "id": 5
-                                },
-                                "double_value": {
-                                    "type": "double",
-                                    "id": 6
-                                },
-                                "string_value": {
-                                    "type": "bytes",
-                                    "id": 7
-                                },
-                                "aggregate_value": {
-                                    "type": "string",
-                                    "id": 8
-                                }
-                            },
-                            "nested": {
-                                "NamePart": {
-                                    "fields": {
-                                        "name_part": {
-                                            "rule": "required",
-                                            "type": "string",
-                                            "id": 1
-                                        },
-                                        "is_extension": {
-                                            "rule": "required",
-                                            "type": "bool",
-                                            "id": 2
-                                        }
-                                    }
-                                }
-                            }
-                        },
-                        "SourceCodeInfo": {
-                            "fields": {
-                                "location": {
-                                    "rule": "repeated",
-                                    "type": "Location",
-                                    "id": 1
-                                }
-                            },
-                            "nested": {
-                                "Location": {
-                                    "fields": {
-                                        "path": {
-                                            "rule": "repeated",
-                                            "type": "int32",
-                                            "id": 1
-                                        },
-                                        "span": {
-                                            "rule": "repeated",
-                                            "type": "int32",
-                                            "id": 2
-                                        },
-                                        "leading_comments": {
-                                            "type": "string",
-                                            "id": 3
-                                        },
-                                        "trailing_comments": {
-                                            "type": "string",
-                                            "id": 4
-                                        },
-                                        "leading_detached_comments": {
-                                            "rule": "repeated",
-                                            "type": "string",
-                                            "id": 6
-                                        }
-                                    }
-                                }
-                            }
-                        },
-                        "GeneratedCodeInfo": {
-                            "fields": {
-                                "annotation": {
-                                    "rule": "repeated",
-                                    "type": "Annotation",
-                                    "id": 1
-                                }
-                            },
-                            "nested": {
-                                "Annotation": {
-                                    "fields": {
-                                        "path": {
-                                            "rule": "repeated",
-                                            "type": "int32",
-                                            "id": 1
-                                        },
-                                        "source_file": {
-                                            "type": "string",
-                                            "id": 2
-                                        },
-                                        "begin": {
-                                            "type": "int32",
-                                            "id": 3
-                                        },
-                                        "end": {
-                                            "type": "int32",
-                                            "id": 4
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
+                "Initialize": 0,
+                "Ping": 1,
+                "Success": 2,
+                "Failure": 3,
+                "ChangePin": 4,
+                "WipeDevice": 5,
+                "GetEntropy": 9,
+                "Entropy": 10,
+                "LoadDevice": 13,
+                "ResetDevice": 14,
+                "SetBusy": 16,
+                "Features": 17,
+                "PinMatrixRequest": 18,
+                "PinMatrixAck": 19,
+                "Cancel": 20,
+                "LockDevice": 24,
+                "ApplySettings": 25,
+                "ButtonRequest": 26,
+                "ButtonAck": 27,
+                "ApplyFlags": 28,
+                "GetNonce": 31,
+                "Nonce": 33,
+                "BackupDevice": 34,
+                "EntropyRequest": 35,
+                "EntropyAck": 36,
+                "PassphraseRequest": 41,
+                "PassphraseAck": 42,
+                "RecoveryDevice": 45,
+                "WordRequest": 46,
+                "WordAck": 47,
+                "GetFeatures": 55,
+                "SdProtect": 79,
+                "ChangeWipeCode": 82,
+                "EndSession": 83,
+                "DoPreauthorized": 84,
+                "PreauthorizedRequest": 85,
+                "CancelAuthorization": 86,
+                "RebootToBootloader": 87,
+                "GetFirmwareHash": 88,
+                "FirmwareHash": 89,
+                "UnlockPath": 93,
+                "UnlockedPathRequest": 94,
+                "ShowDeviceTutorial": 95,
+                "UnlockBootloader": 96,
+                "AuthenticateDevice": 97,
+                "AuthenticityProof": 98,
+                "ChangeLanguage": 990,
+                "TranslationDataRequest": 991,
+                "TranslationDataAck": 992,
+                "SetBrightness": 993,
+                "SetU2FCounter": 63,
+                "GetNextU2FCounter": 80,
+                "NextU2FCounter": 81,
+                "Deprecated_PassphraseStateRequest": 77,
+                "Deprecated_PassphraseStateAck": 78,
+                "FirmwareErase": 6,
+                "FirmwareUpload": 7,
+                "FirmwareRequest": 8,
+                "ProdTestT1": 32,
+                "GetPublicKey": 11,
+                "PublicKey": 12,
+                "SignTx": 15,
+                "TxRequest": 21,
+                "TxAck": 22,
+                "GetAddress": 29,
+                "Address": 30,
+                "TxAckPaymentRequest": 37,
+                "SignMessage": 38,
+                "VerifyMessage": 39,
+                "MessageSignature": 40,
+                "GetOwnershipId": 43,
+                "OwnershipId": 44,
+                "GetOwnershipProof": 49,
+                "OwnershipProof": 50,
+                "AuthorizeCoinJoin": 51,
+                "CipherKeyValue": 23,
+                "CipheredKeyValue": 48,
+                "SignIdentity": 53,
+                "SignedIdentity": 54,
+                "GetECDHSessionKey": 61,
+                "ECDHSessionKey": 62,
+                "DebugLinkDecision": 100,
+                "DebugLinkGetState": 101,
+                "DebugLinkState": 102,
+                "DebugLinkStop": 103,
+                "DebugLinkLog": 104,
+                "DebugLinkMemoryRead": 110,
+                "DebugLinkMemory": 111,
+                "DebugLinkMemoryWrite": 112,
+                "DebugLinkFlashErase": 113,
+                "DebugLinkLayout": 9001,
+                "DebugLinkReseedRandom": 9002,
+                "DebugLinkRecordScreen": 9003,
+                "DebugLinkEraseSdCard": 9005,
+                "DebugLinkWatchLayout": 9006,
+                "DebugLinkResetDebugEvents": 9007,
+                "DebugLinkOptigaSetSecMax": 9008,
+                "EthereumGetPublicKey": 450,
+                "EthereumPublicKey": 451,
+                "EthereumGetAddress": 56,
+                "EthereumAddress": 57,
+                "EthereumSignTx": 58,
+                "EthereumSignTxEIP1559": 452,
+                "EthereumTxRequest": 59,
+                "EthereumTxAck": 60,
+                "EthereumSignMessage": 64,
+                "EthereumVerifyMessage": 65,
+                "EthereumMessageSignature": 66,
+                "EthereumSignTypedData": 464,
+                "EthereumTypedDataStructRequest": 465,
+                "EthereumTypedDataStructAck": 466,
+                "EthereumTypedDataValueRequest": 467,
+                "EthereumTypedDataValueAck": 468,
+                "EthereumTypedDataSignature": 469,
+                "EthereumSignTypedHash": 470,
+                "NEMGetAddress": 67,
+                "NEMAddress": 68,
+                "NEMSignTx": 69,
+                "NEMSignedTx": 70,
+                "NEMDecryptMessage": 75,
+                "NEMDecryptedMessage": 76,
+                "TezosGetAddress": 150,
+                "TezosAddress": 151,
+                "TezosSignTx": 152,
+                "TezosSignedTx": 153,
+                "TezosGetPublicKey": 154,
+                "TezosPublicKey": 155,
+                "StellarSignTx": 202,
+                "StellarTxOpRequest": 203,
+                "StellarGetAddress": 207,
+                "StellarAddress": 208,
+                "StellarCreateAccountOp": 210,
+                "StellarPaymentOp": 211,
+                "StellarPathPaymentStrictReceiveOp": 212,
+                "StellarManageSellOfferOp": 213,
+                "StellarCreatePassiveSellOfferOp": 214,
+                "StellarSetOptionsOp": 215,
+                "StellarChangeTrustOp": 216,
+                "StellarAllowTrustOp": 217,
+                "StellarAccountMergeOp": 218,
+                "StellarManageDataOp": 220,
+                "StellarBumpSequenceOp": 221,
+                "StellarManageBuyOfferOp": 222,
+                "StellarPathPaymentStrictSendOp": 223,
+                "StellarClaimClaimableBalanceOp": 225,
+                "StellarSignedTx": 230,
+                "CardanoGetPublicKey": 305,
+                "CardanoPublicKey": 306,
+                "CardanoGetAddress": 307,
+                "CardanoAddress": 308,
+                "CardanoTxItemAck": 313,
+                "CardanoTxAuxiliaryDataSupplement": 314,
+                "CardanoTxWitnessRequest": 315,
+                "CardanoTxWitnessResponse": 316,
+                "CardanoTxHostAck": 317,
+                "CardanoTxBodyHash": 318,
+                "CardanoSignTxFinished": 319,
+                "CardanoSignTxInit": 320,
+                "CardanoTxInput": 321,
+                "CardanoTxOutput": 322,
+                "CardanoAssetGroup": 323,
+                "CardanoToken": 324,
+                "CardanoTxCertificate": 325,
+                "CardanoTxWithdrawal": 326,
+                "CardanoTxAuxiliaryData": 327,
+                "CardanoPoolOwner": 328,
+                "CardanoPoolRelayParameters": 329,
+                "CardanoGetNativeScriptHash": 330,
+                "CardanoNativeScriptHash": 331,
+                "CardanoTxMint": 332,
+                "CardanoTxCollateralInput": 333,
+                "CardanoTxRequiredSigner": 334,
+                "CardanoTxInlineDatumChunk": 335,
+                "CardanoTxReferenceScriptChunk": 336,
+                "CardanoTxReferenceInput": 337,
+                "RippleGetAddress": 400,
+                "RippleAddress": 401,
+                "RippleSignTx": 402,
+                "RippleSignedTx": 403,
+                "EosGetPublicKey": 600,
+                "EosPublicKey": 601,
+                "EosSignTx": 602,
+                "EosTxActionRequest": 603,
+                "EosTxActionAck": 604,
+                "EosSignedTx": 605,
+                "BinanceGetAddress": 700,
+                "BinanceAddress": 701,
+                "BinanceGetPublicKey": 702,
+                "BinancePublicKey": 703,
+                "BinanceSignTx": 704,
+                "BinanceTxRequest": 705,
+                "BinanceTransferMsg": 706,
+                "BinanceOrderMsg": 707,
+                "BinanceCancelMsg": 708,
+                "BinanceSignedTx": 709,
+                "SolanaGetPublicKey": 900,
+                "SolanaPublicKey": 901,
+                "SolanaGetAddress": 902,
+                "SolanaAddress": 903,
+                "SolanaSignTx": 904,
+                "SolanaTxSignature": 905
             }
         }
     }
diff --git a/packages/protobuf/package.json b/packages/protobuf/package.json
index 898cadbb197..305824ed1aa 100644
--- a/packages/protobuf/package.json
+++ b/packages/protobuf/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@trezor/protobuf",
-    "version": "1.2.2",
+    "version": "1.2.3-beta.2",
     "license": "See LICENSE.md in repo root",
     "repository": {
         "type": "git",
@@ -24,7 +24,6 @@
         "messages.json"
     ],
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
diff --git a/packages/protobuf/scripts/protobuf-build.sh b/packages/protobuf/scripts/protobuf-build.sh
index 1224afda5aa..967be987e23 100755
--- a/packages/protobuf/scripts/protobuf-build.sh
+++ b/packages/protobuf/scripts/protobuf-build.sh
@@ -4,11 +4,14 @@ set -euxo pipefail
 
 echo $#
 
-PARENT_PATH=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
+get_abs_path() {
+  echo "$( cd -- "$(dirname "$1")" >/dev/null 2>&1 ; pwd -P )"
+}
 
-BRANCH="main"
-DIST="."
-REPO_DIR_NAME="trezor-firmware-probuf-update"
+SCRIPTS_PATH=$(get_abs_path "${BASH_SOURCE[0]}")
+
+REPO_BRANCH="main"
+REPO_PATH=$(get_abs_path "$SCRIPTS_PATH/../../../../.")/trezor-firmware-probuf-update
 
 if [[ $# -ne 0 && $# -ne 1 ]]
     then
@@ -18,51 +21,26 @@ fi
 
 if [[ $# -eq 1 ]]
     then
-        BRANCH=$1
+        REPO_BRANCH=$1
 fi
 
-cd ../../../
-ls -la
-if test -d ./$REPO_DIR_NAME; then
-    echo "$REPO_DIR_NAME directory exists"
+if test -d "$REPO_PATH"; then
+    echo "$REPO_PATH directory exists"
 else
-    echo "$REPO_DIR_NAME directory does not exist"
-    git clone https://github.com/trezor/trezor-firmware.git $REPO_DIR_NAME
+    echo "$REPO_PATH directory does not exist"
+    git clone https://github.com/trezor/trezor-firmware.git "$REPO_PATH"
 fi
 
-cd $REPO_DIR_NAME
+cd "$REPO_PATH"
 git fetch origin
-git checkout "$BRANCH"
-git reset "origin/$BRANCH" --hard
+git checkout "$REPO_BRANCH"
+git reset "origin/$REPO_BRANCH" --hard
 cd ..
 
-cd "$PARENT_PATH/.."
-
-SRC="../../../$REPO_DIR_NAME/common/protob"
-
-# BUILD combined messages.proto file from protobuf files
-# this code was copied from ./submodules/trezor-common/protob Makekile
-# clear protobuf syntax and remove unknown values to be able to work with proto2js
-echo 'syntax = "proto2";' > "$DIST"/messages.proto
-echo 'import "google/protobuf/descriptor.proto";' >> "$DIST"/messages.proto
-echo "Build proto file from $SRC"
-# NOTE: grep sorting is not cross platform deterministic, make sure that the content of messages.proto ("Message_Type") is at the end of the generated file
-grep -hv -e '^import ' -e '^syntax' -e '^package' -e 'option java_' "$SRC"/messages-*.proto "$SRC"/messages.proto \
-| sed 's/ hw\.trezor\.messages\.common\./ /' \
-| sed 's/ common\./ /' \
-| sed 's/ ethereum_definitions\./ /' \
-| sed 's/ management\./ /' \
-| sed 's/^option /\/\/ option /' \
-| grep -v '    reserved '>> "$DIST"/messages.proto
-
-# BUILD messages.json from message.proto
-# pbjs command is added by protobufjs-cli package
-node ../../node_modules/.bin/pbjs -t json -p "$DIST" -o "$DIST"/messages.json --keep-case messages.proto
-rm "$DIST"/messages.proto
-
-cd "$PARENT_PATH"
+cd "$SCRIPTS_PATH"
 
-node ./protobuf-types.js typescript
+yarn tsx ./protobuf-definitions.ts "$REPO_PATH/common/protob" --skip=monero,webauthn,thp,benchmark
+yarn tsx ./protobuf-types.ts
 
 yarn workspace @trezor/protobuf g:prettier --write {messages.json,src/messages.ts} 
-yarn workspace @trezor/protobuf g:eslint --fix ./src/messages.ts
\ No newline at end of file
+yarn workspace @trezor/protobuf g:eslint --fix ./src/messages.ts
diff --git a/packages/protobuf/scripts/protobuf-definitions.ts b/packages/protobuf/scripts/protobuf-definitions.ts
new file mode 100644
index 00000000000..805c0acb088
--- /dev/null
+++ b/packages/protobuf/scripts/protobuf-definitions.ts
@@ -0,0 +1,200 @@
+/* eslint-disable no-console */
+import fs from 'fs';
+import path from 'path';
+import * as protobuf from 'protobufjs';
+
+// protobuf.ReflectionObject to JSON
+type Definition = {
+    reserved?: unknown[];
+    options?: Record<string, unknown>;
+    valuesOptions?: Record<string, unknown>;
+    rule?: string;
+    type?: string;
+    extend?: string;
+    nested?: Record<string, Definition>;
+    fields?: Record<string, Definition>;
+};
+
+const modifyDefinitionsJSON = (root: protobuf.Root, def: Definition) => {
+    // remove "reserved" fields
+    delete def.reserved;
+    // remove "valuesOptions" fields
+    delete def.valuesOptions;
+    // remove unused "options"
+    if (def.options) {
+        const ignoreOptions = [
+            '(experimental_field)',
+            '(experimental_message)',
+            '(has_bitcoin_only_values)',
+            'deprecated',
+        ];
+        const options = Object.keys(def.options);
+        // compatibility with json generated by `node_modules/.bin/pbjs`
+        // `packed` option is not set for custom types, it is set only for primitives like uint32
+        if (def.type && options.includes('packed')) {
+            const obj = root.lookup(def.type);
+            if (obj) {
+                try {
+                    root.lookupType(def.type);
+                    ignoreOptions.push('packed');
+                } catch {
+                    /* empty */
+                }
+            }
+        }
+        const opts = options
+            .filter(opt => !ignoreOptions.includes(opt))
+            .reduce((prev, curr) => {
+                prev[curr] = def.options?.[curr];
+
+                return prev;
+            }, {});
+
+        if (Object.keys(opts).length < 1) {
+            delete def.options;
+        }
+    }
+
+    // replace types pointing to different packages like "hw.trezor.messages.common"
+    if (def.type && def.type.includes('.')) {
+        def.type = def.type.split('.').pop();
+    }
+
+    // modify recursively for nested types and fields
+    const { nested } = def;
+    if (nested) {
+        Object.keys(nested).forEach(key => {
+            const item = nested[key];
+            if (item.extend && item.extend.startsWith('google')) {
+                delete nested[key];
+            } else {
+                modifyDefinitionsJSON(root, item);
+            }
+        });
+    }
+
+    if (def.fields) {
+        Object.values(def.fields).forEach(item => modifyDefinitionsJSON(root, item));
+    }
+
+    return def;
+};
+
+type BuildOptions = {
+    skipPackages?: string[];
+    onlyPackages?: string[];
+    includeImports?: boolean;
+    messageType?: string; // enum name, default MessageType
+};
+
+const modifyMessageType = (proto: protobuf.Root, name: string) => {
+    const messageTypeEnum = proto.lookupEnum(name);
+    if (messageTypeEnum) {
+        Object.keys(messageTypeEnum.values).forEach(key => {
+            // replace key `MessageType_Initialize` > `Initialize`
+            const newKey = key.replace(name + '_', '');
+            const value = messageTypeEnum.values[key];
+            // remove old key
+            messageTypeEnum.remove(key);
+            // check if MessageType is needed, package could be excluded
+            if (proto.lookup(newKey)) {
+                // add new key
+                messageTypeEnum.add(newKey, value);
+            }
+        });
+    }
+
+    if (name !== 'MessageType') {
+        // rename custom enum to be MessageType
+        const { parent } = messageTypeEnum;
+        parent?.remove(messageTypeEnum);
+
+        messageTypeEnum.name = 'MessageType';
+        parent?.add(messageTypeEnum);
+    }
+};
+
+export const buildDefinitions = (protoDir: string, args: BuildOptions) => {
+    // https://github.com/protobufjs/protobuf.js/blob/master/README.md#compatibility
+    // Because the internals of this package do not rely on google/protobuf/descriptor.proto, options are parsed and presented literally.
+    const root = new protobuf.Root({
+        common: protobuf.common('descriptor', {}),
+    });
+
+    const files: string[] = [];
+    const packages: string[] = [];
+    const { skipPackages, onlyPackages, includeImports } = args;
+
+    // read all messages*.proto files from directory
+    fs.readdirSync(protoDir).forEach(fileName => {
+        if (!/^messages.*.proto$/.test(fileName)) {
+            return;
+        }
+        // messages.proto file => empty pkg
+        const pkg = fileName.replace(/messages-?(.+)?.proto$/, '$1').replace('-', '_');
+        if (skipPackages?.includes(pkg)) {
+            return console.log('Skipping', pkg);
+        }
+        if (onlyPackages && !onlyPackages.includes(pkg)) {
+            return console.log('Skipping', pkg);
+        }
+
+        if (pkg) {
+            packages.push(pkg);
+        }
+        files.push(path.join(protoDir, fileName));
+    });
+
+    console.log('Loading files:', files);
+
+    const proto = root.loadSync(files, { keepCase: true });
+    const messages = proto.lookup('hw.trezor.messages');
+    if (!messages) {
+        throw new Error('hw.trezor.messages not found');
+    }
+
+    modifyMessageType(proto, args.messageType || 'MessageType');
+
+    const result = {};
+    // remove deep nesting (hw.trezor.messages.*)
+    packages.forEach(p => {
+        const pkg = proto.lookup(`hw.trezor.messages.${p}`);
+        if (!pkg) {
+            throw new Error(`hw.trezor.messages.${p} not found`);
+        }
+        const json = pkg.toJSON();
+        Object.assign(result, json.nested);
+    });
+
+    // @ts-expect-error typed as protobuf.Reflection but in fact it is a protobuf.Namespace
+    const topLevelMessages = includeImports ? messages.nested : {};
+    // hw.trezor.messages Namespace contains all the packages, ignore already processed
+    Object.keys(topLevelMessages).forEach(name => {
+        if (!packages.includes(name)) {
+            Object.assign(result, { [name]: topLevelMessages[name].toJSON() });
+        }
+    });
+
+    return modifyDefinitionsJSON(proto, { nested: result });
+};
+
+if (require.main === module) {
+    // called directly, otherwise required as a module
+    const [protoDir, ...args] = process.argv.slice(2);
+
+    // get --arg=X
+    const getArgValue = (args2: string[], arg: string) => {
+        return args2.find(a => a.startsWith(arg))?.substring(arg.length + 1);
+    };
+
+    const json = buildDefinitions(protoDir, {
+        includeImports: true,
+        skipPackages: getArgValue(args, '--skip')?.split(','),
+        onlyPackages: getArgValue(args, '--only')?.split(','),
+    });
+
+    const distDir = path.join(__dirname, '../');
+    fs.writeFile(`${distDir}/messages.json`, JSON.stringify(json, null, 2), err => {
+        if (err) throw err;
+    });
+}
diff --git a/packages/protobuf/scripts/protobuf-patches/MessageType.ts b/packages/protobuf/scripts/protobuf-patches/MessageType.ts
new file mode 100644
index 00000000000..6705283c24f
--- /dev/null
+++ b/packages/protobuf/scripts/protobuf-patches/MessageType.ts
@@ -0,0 +1,15 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+
+export type MessageKey = keyof MessageType;
+
+export type MessageResponse<T extends MessageKey> = {
+    type: T;
+    message: MessageType[T];
+};
+
+export type TypedCall = <T extends MessageKey, R extends MessageKey>(
+    type: T,
+    resType: R,
+    message?: MessageType[T],
+) => Promise<MessageResponse<R>>;
diff --git a/packages/protobuf/scripts/protobuf-patches/TxAck.js b/packages/protobuf/scripts/protobuf-patches/TxAck.js
deleted file mode 100644
index a236f5a9655..00000000000
--- a/packages/protobuf/scripts/protobuf-patches/TxAck.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// TxAck replacement
-// TxAck needs more exact types
-// PrevInput and TxInputType requires exact responses in TxAckResponse
-// main difference: PrevInput should not contain address_n (unexpected field by protobuf)
-
-export type TxAckResponse =
-    | {
-          inputs: Array<TxInputType | PrevInput>,
-      }
-    | {
-          bin_outputs: TxOutputBinType[],
-      }
-    | {
-          outputs: TxOutputType[],
-      }
-    | {
-          extra_data: string,
-      }
-    | {
-          version?: number,
-          lock_time?: number,
-          inputs_cnt: number,
-          outputs_cnt: number,
-          extra_data?: string,
-          extra_data_len?: number,
-          timestamp?: number,
-          version_group_id?: number,
-          expiry?: number,
-          branch_id?: number,
-      };
-
-export type TxAck = {
-    tx: TxAckResponse,
-};
-// - TxAck replacement end
diff --git a/packages/protobuf/scripts/protobuf-patches/TxAck.ts b/packages/protobuf/scripts/protobuf-patches/TxAck.ts
new file mode 100644
index 00000000000..d265cf09034
--- /dev/null
+++ b/packages/protobuf/scripts/protobuf-patches/TxAck.ts
@@ -0,0 +1,37 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+// TxAck replacement
+// TxAck needs more exact types
+// PrevInput and TxInputType requires exact responses in TxAckResponse
+// main difference: PrevInput should not contain address_n (unexpected field by protobuf)
+
+export type TxAckResponse =
+    | {
+          inputs: Array<TxInputType | PrevInput>;
+      }
+    | {
+          bin_outputs: TxOutputBinType[];
+      }
+    | {
+          outputs: TxOutputType[];
+      }
+    | {
+          extra_data: string;
+      }
+    | {
+          version?: number;
+          lock_time?: number;
+          inputs_cnt: number;
+          outputs_cnt: number;
+          extra_data?: string;
+          extra_data_len?: number;
+          timestamp?: number;
+          version_group_id?: number;
+          expiry?: number;
+          branch_id?: number;
+      };
+
+export type TxAck = {
+    tx: TxAckResponse;
+};
+// - TxAck replacement end
diff --git a/packages/protobuf/scripts/protobuf-patches/TxInputType.js b/packages/protobuf/scripts/protobuf-patches/TxInputType.js
deleted file mode 100644
index e53e2db0ba9..00000000000
--- a/packages/protobuf/scripts/protobuf-patches/TxInputType.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// TxInputType replacement
-// TxInputType needs more exact types
-// differences: external input (no address_n + required script_pubkey)
-
-export type InternalInputScriptType = Exclude<InputScriptType, 'EXTERNAL'>;
-
-type CommonTxInputType = {
-    prev_hash: string, // required: previous transaction hash (reversed)
-    prev_index: number, // required: previous transaction index
-    amount: UintType, // required
-    sequence?: number,
-    multisig?: MultisigRedeemScriptType,
-    decred_tree?: number,
-    orig_hash?: string, // RBF
-    orig_index?: number, // RBF
-    decred_staking_spend?: DecredStakingSpendType,
-    script_pubkey?: string, // required if script_type=EXTERNAL
-    coinjoin_flags?: number, // bit field of coinjoin-specific flags
-    script_sig?: string, // used by EXTERNAL, depending on script_pubkey
-    witness?: string, // used by EXTERNAL, depending on script_pubkey
-    ownership_proof?: string, // used by EXTERNAL, depending on script_pubkey
-    commitment_data?: string, // used by EXTERNAL, depending on ownership_proof
-};
-
-export type TxInputType =
-    | (CommonTxInputType & {
-          address_n: number[],
-          script_type?: InternalInputScriptType,
-      })
-    | (CommonTxInputType & {
-          address_n?: typeof undefined,
-          script_type: 'EXTERNAL',
-          script_pubkey: string,
-      });
-
-export type TxInput = TxInputType;
-
-// TxInputType replacement end
diff --git a/packages/protobuf/scripts/protobuf-patches/TxInputType.ts b/packages/protobuf/scripts/protobuf-patches/TxInputType.ts
new file mode 100644
index 00000000000..d2766ede51f
--- /dev/null
+++ b/packages/protobuf/scripts/protobuf-patches/TxInputType.ts
@@ -0,0 +1,40 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+// TxInputType replacement
+// TxInputType needs more exact types
+// differences: external input (no address_n + required script_pubkey)
+
+export type InternalInputScriptType = Exclude<InputScriptType, 'EXTERNAL'>;
+
+type CommonTxInputType = {
+    prev_hash: string; // required: previous transaction hash (reversed)
+    prev_index: number; // required: previous transaction index
+    amount: UintType; // required
+    sequence?: number;
+    multisig?: MultisigRedeemScriptType;
+    decred_tree?: number;
+    orig_hash?: string; // RBF
+    orig_index?: number; // RBF
+    decred_staking_spend?: DecredStakingSpendType;
+    script_pubkey?: string; // required if script_type=EXTERNAL
+    coinjoin_flags?: number; // bit field of coinjoin-specific flags
+    script_sig?: string; // used by EXTERNAL, depending on script_pubkey
+    witness?: string; // used by EXTERNAL, depending on script_pubkey
+    ownership_proof?: string; // used by EXTERNAL, depending on script_pubkey
+    commitment_data?: string; // used by EXTERNAL, depending on ownership_proof
+};
+
+export type TxInputType =
+    | (CommonTxInputType & {
+          address_n: number[];
+          script_type?: InternalInputScriptType;
+      })
+    | (CommonTxInputType & {
+          address_n?: typeof undefined;
+          script_type: 'EXTERNAL';
+          script_pubkey: string;
+      });
+
+export type TxInput = TxInputType;
+
+// TxInputType replacement end
diff --git a/packages/protobuf/scripts/protobuf-patches/TxOutputType.js b/packages/protobuf/scripts/protobuf-patches/TxOutputType.js
deleted file mode 100644
index 2dd0de18798..00000000000
--- a/packages/protobuf/scripts/protobuf-patches/TxOutputType.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// TxOutputType replacement
-// TxOutputType needs more exact types
-// differences: external output (no address_n), opreturn output (no address_n, no address)
-
-export type ChangeOutputScriptType = Exclude<OutputScriptType, 'PAYTOOPRETURN'>;
-
-export type TxOutputType =
-    | {
-          address: string,
-          address_n?: typeof undefined,
-          script_type: 'PAYTOADDRESS',
-          amount: UintType,
-          multisig?: MultisigRedeemScriptType,
-          orig_hash?: string,
-          orig_index?: number,
-          payment_req_index?: number,
-      }
-    | {
-          address?: typeof undefined,
-          address_n: number[],
-          script_type?: ChangeOutputScriptType,
-          amount: UintType,
-          multisig?: MultisigRedeemScriptType,
-          orig_hash?: string,
-          orig_index?: number,
-          payment_req_index?: number,
-      }
-    // NOTE: the type was loosened for compatibility (issue #10474)
-    // It is not originally intended to use address instead of address_n with change output
-    | {
-        address: string,
-        address_n?: typeof undefined,
-        script_type?: ChangeOutputScriptType,
-        amount: UintType,
-        multisig?: MultisigRedeemScriptType,
-        orig_hash?: string,
-        orig_index?: number,
-        payment_req_index?: number,
-    }
-    | {
-          address?: typeof undefined,
-          address_n?: typeof undefined,
-          amount: '0' | 0,
-          op_return_data: string,
-          script_type: 'PAYTOOPRETURN',
-          orig_hash?: string,
-          orig_index?: number,
-          payment_req_index?: number,
-      };
-
-export type TxOutput = TxOutputType;
-
-// - TxOutputType replacement end
diff --git a/packages/protobuf/scripts/protobuf-patches/TxOutputType.ts b/packages/protobuf/scripts/protobuf-patches/TxOutputType.ts
new file mode 100644
index 00000000000..e9524f937e5
--- /dev/null
+++ b/packages/protobuf/scripts/protobuf-patches/TxOutputType.ts
@@ -0,0 +1,55 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+// TxOutputType replacement
+// TxOutputType needs more exact types
+// differences: external output (no address_n), opreturn output (no address_n, no address)
+
+export type ChangeOutputScriptType = Exclude<OutputScriptType, 'PAYTOOPRETURN'>;
+
+export type TxOutputType =
+    | {
+          address: string;
+          address_n?: typeof undefined;
+          script_type: 'PAYTOADDRESS';
+          amount: UintType;
+          multisig?: MultisigRedeemScriptType;
+          orig_hash?: string;
+          orig_index?: number;
+          payment_req_index?: number;
+      }
+    | {
+          address?: typeof undefined;
+          address_n: number[];
+          script_type?: ChangeOutputScriptType;
+          amount: UintType;
+          multisig?: MultisigRedeemScriptType;
+          orig_hash?: string;
+          orig_index?: number;
+          payment_req_index?: number;
+      }
+    // NOTE: the type was loosened for compatibility (issue #10474)
+    // It is not originally intended to use address instead of address_n with change output
+    | {
+          address: string;
+          address_n?: typeof undefined;
+          script_type?: ChangeOutputScriptType;
+          amount: UintType;
+          multisig?: MultisigRedeemScriptType;
+          orig_hash?: string;
+          orig_index?: number;
+          payment_req_index?: number;
+      }
+    | {
+          address?: typeof undefined;
+          address_n?: typeof undefined;
+          amount: '0' | 0;
+          op_return_data: string;
+          script_type: 'PAYTOOPRETURN';
+          orig_hash?: string;
+          orig_index?: number;
+          payment_req_index?: number;
+      };
+
+export type TxOutput = TxOutputType;
+
+// - TxOutputType replacement end
diff --git a/packages/protobuf/scripts/protobuf-patches/customTypes.ts b/packages/protobuf/scripts/protobuf-patches/customTypes.ts
new file mode 100644
index 00000000000..7f8814da2a5
--- /dev/null
+++ b/packages/protobuf/scripts/protobuf-patches/customTypes.ts
@@ -0,0 +1,8 @@
+export enum DeviceModelInternal {
+    T1B1 = 'T1B1',
+    T2T1 = 'T2T1',
+    T2B1 = 'T2B1',
+    T3B1 = 'T3B1',
+    T3T1 = 'T3T1',
+    T3W1 = 'T3W1',
+}
diff --git a/packages/protobuf/scripts/protobuf-patches/index.js b/packages/protobuf/scripts/protobuf-patches/index.ts
similarity index 79%
rename from packages/protobuf/scripts/protobuf-patches/index.js
rename to packages/protobuf/scripts/protobuf-patches/index.ts
index 0b42d4e6b5e..d03e611ee57 100644
--- a/packages/protobuf/scripts/protobuf-patches/index.js
+++ b/packages/protobuf/scripts/protobuf-patches/index.ts
@@ -1,13 +1,55 @@
-const fs = require('fs');
-const path = require('path');
+import fs from 'fs';
+import path from 'path';
 
-const UINT_TYPE = 'UintType';
-const SINT_TYPE = 'SintType';
+export const UINT_TYPE = 'UintType';
+export const SINT_TYPE = 'SintType';
 const DeviceModelInternal = 'DeviceModelInternal';
 
+// proto types to javascript types
+export const FIELD_TYPES = {
+    uint32: 'number',
+    uint64: 'number',
+    sint32: 'number',
+    sint64: 'number',
+    bool: 'boolean',
+    bytes: 'string',
+    // 'bytes': 'Uint8Array | number[] | Buffer | string', // protobuf will handle conversion
+};
+
+// Types needs reordering (used before defined).
+// The Type in the Value NEEDs (depends on) the Type in the Key.
+export const ORDER = {
+    BinanceCoin: 'BinanceInputOutput',
+    HDNodeType: 'HDNodePathType',
+    TxAck: 'TxAckInputWrapper',
+    EthereumFieldType: 'EthereumStructMember',
+    EthereumDataType: 'EthereumFieldType',
+    PaymentRequestMemo: 'TxAckPaymentRequest',
+    RecoveryDevice: 'Features',
+    RecoveryType: 'RecoveryDevice',
+    RecoveryDeviceInputMethod: 'RecoveryType',
+};
+
+// enums used as keys (string), used as values (number) by default
+export const ENUM_KEYS = [
+    'InputScriptType',
+    'OutputScriptType',
+    'RequestType',
+    'BackupType',
+    'Capability',
+    'SafetyCheckLevel',
+    'ButtonRequestType',
+    'PinMatrixRequestType',
+    'WordRequestType',
+    'HomescreenFormat',
+    'RecoveryStatus',
+    'BackupAvailability',
+    'RecoveryType',
+];
+
 // type rule fixes, ideally it should not be here
-const RULE_PATCH = {
-    'BackupDevice.groups': "optional", // protobuf repeated bytes are always optional (fallback to [])
+export const RULE_PATCH = {
+    'BackupDevice.groups': 'optional', // protobuf repeated bytes are always optional (fallback to [])
     'MultisigRedeemScriptType.nodes': 'optional', // its valid to be undefined according to implementation/tests
     'MultisigRedeemScriptType.address_n': 'optional', // its valid to be undefined according to implementation/tests
     'TxRequestDetailsType.request_index': 'required',
@@ -82,7 +124,7 @@ const RULE_PATCH = {
 // custom types IN to trezor
 // protobuf lib will handle the translation to required type
 // connect or other 3rd party libs are using compatible types (string as number etc...)
-const TYPE_PATCH = {
+export const TYPE_PATCH = {
     'Features.bootloader_mode': 'boolean | null',
     'Features.device_id': 'string | null',
     'Features.pin_protection': 'boolean | null',
@@ -207,23 +249,25 @@ const TYPE_PATCH = {
     'Features.recovery_type': 'RecoveryType',
 };
 
-const DEFINITION_PATCH = {
-    TxInputType: fs.readFileSync(path.join(__dirname, './TxInputType.js'), 'utf8'),
-    TxOutputType: fs.readFileSync(path.join(__dirname, './TxOutputType.js'), 'utf8'),
-    TxAck: fs.readFileSync(path.join(__dirname, './TxAck.js'), 'utf8'),
+export const readPatch = (file: string) => {
+    return fs
+        .readFileSync(path.join(__dirname, file), 'utf8')
+        .replace(/^\/\/ @ts-nocheck.*\n?/gm, '');
+};
+
+export const DEFINITION_PATCH = {
+    TxInputType: () => readPatch('./TxInputType.ts'),
+    TxOutputType: () => readPatch('./TxOutputType.ts'),
+    TxAck: () => readPatch('./TxAck.ts'),
 };
 
 // skip unnecessary types
-const SKIP = [
+export const SKIP = [
     'MessageType', // connect uses custom definition
     'TransactionType', // connect uses custom definition
     'TxInput', // declared in TxInputType patch
     'TxOutput', // declared in TxOutputType patch
     // not implemented
-    'CosiCommit',
-    'CosiCommitment',
-    'CosiSign',
-    'CosiSignature',
     'DebugSwipeDirection',
     'DebugLinkDecision',
     'DebugLinkLayout',
@@ -239,82 +283,4 @@ const SKIP = [
     'DebugLinkFlashErase',
     'DebugLinkEraseSdCard',
     'DebugLinkWatchLayout',
-    'LoadDevice',
-    'MoneroRctKeyPublic',
-    'MoneroOutputEntry',
-    'MoneroMultisigKLRki',
-    'MoneroTransactionSourceEntry',
-    'MoneroAccountPublicAddress',
-    'MoneroTransactionDestinationEntry',
-    'MoneroTransactionRsigData',
-    'MoneroGetAddress',
-    'MoneroAddress',
-    'MoneroGetWatchKey',
-    'MoneroWatchKey',
-    'MoneroTransactionData',
-    'MoneroTransactionInitRequest',
-    'MoneroTransactionInitAck',
-    'MoneroTransactionSetInputRequest',
-    'MoneroTransactionSetInputAck',
-    'MoneroTransactionInputsPermutationRequest',
-    'MoneroTransactionInputsPermutationAck',
-    'MoneroTransactionInputViniRequest',
-    'MoneroTransactionInputViniAck',
-    'MoneroTransactionAllInputsSetRequest',
-    'MoneroTransactionAllInputsSetAck',
-    'MoneroTransactionSetOutputRequest',
-    'MoneroTransactionSetOutputAck',
-    'MoneroTransactionAllOutSetRequest',
-    'MoneroRingCtSig',
-    'MoneroTransactionAllOutSetAck',
-    'MoneroTransactionSignInputRequest',
-    'MoneroTransactionSignInputAck',
-    'MoneroTransactionFinalRequest',
-    'MoneroTransactionFinalAck',
-    'MoneroSubAddressIndicesList',
-    'MoneroKeyImageExportInitRequest',
-    'MoneroKeyImageExportInitAck',
-    'MoneroTransferDetails',
-    'MoneroKeyImageSyncStepRequest',
-    'MoneroExportedKeyImage',
-    'MoneroKeyImageSyncStepAck',
-    'MoneroKeyImageSyncFinalRequest',
-    'MoneroKeyImageSyncFinalAck',
-    'MoneroGetTxKeyRequest',
-    'MoneroGetTxKeyAck',
-    'MoneroLiveRefreshStartRequest',
-    'MoneroLiveRefreshStartAck',
-    'MoneroLiveRefreshStepRequest',
-    'MoneroLiveRefreshStepAck',
-    'MoneroLiveRefreshFinalRequest',
-    'MoneroLiveRefreshFinalAck',
-    'DebugMoneroDiagRequest',
-    'DebugMoneroDiagAck',
-    'WebAuthnListResidentCredentials',
-    'WebAuthnAddResidentCredential',
-    'WebAuthnRemoveResidentCredential',
-    'WebAuthnCredential',
-    'WebAuthnCredentials',
-    'wire_in',
-    'wire_out',
-    'wire_debug_in',
-    'wire_debug_out',
-    'wire_tiny',
-    'wire_bootloader',
-    'wire_no_fsm',
-    'bitcoin_only',
-    'has_bitcoin_only_values',
-    'unstable',
-    'wire_type',
-    'experimental',
-    'include_in_bitcoin_only',
 ];
-
-module.exports = {
-    RULE_PATCH,
-    TYPE_PATCH,
-    DEFINITION_PATCH,
-    SKIP,
-    UINT_TYPE,
-    SINT_TYPE,
-};
diff --git a/packages/protobuf/scripts/protobuf-types.js b/packages/protobuf/scripts/protobuf-types.js
deleted file mode 100644
index f10cc7bd3fc..00000000000
--- a/packages/protobuf/scripts/protobuf-types.js
+++ /dev/null
@@ -1,240 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const json = require('../messages.json');
-const {
-    RULE_PATCH,
-    TYPE_PATCH,
-    DEFINITION_PATCH,
-    SKIP,
-    UINT_TYPE,
-    SINT_TYPE,
-} = require('./protobuf-patches');
-
-CONSOLE_RED = "\x1b[31m"
-CONSOLE_RESET = "\x1b[0m"
-
-const logError = (text) => {
-    console.error(`Error: ${CONSOLE_RED}${text}${CONSOLE_RESET}`);
-}
-
-const INDENT = ' '.repeat(4);
-
-// proto types to javascript types
-const FIELD_TYPES = {
-    uint32: 'number',
-    uint64: 'number',
-    sint32: 'number',
-    sint64: 'number',
-    bool: 'boolean',
-    bytes: 'string',
-    // 'bytes': 'Uint8Array | number[] | Buffer | string', // protobuf will handle conversion
-};
-
-const types = []; // { type: 'enum | message', name: string, value: string[], exact?: boolean };
-
-// enums used as keys (string), used as values (number) by default
-const ENUM_KEYS = [
-    'InputScriptType',
-    'OutputScriptType',
-    'RequestType',
-    'BackupType',
-    'Capability',
-    'SafetyCheckLevel',
-    'ButtonRequestType',
-    'PinMatrixRequestType',
-    'WordRequestType',
-    'HomescreenFormat',
-    "RecoveryStatus",
-    "BackupAvailability",
-    "RecoveryType",
-];
-
-const parseEnum = (itemName, item) => {
-    const IS_KEY = ENUM_KEYS.includes(itemName);
-
-    // declare enum
-    const enumName = IS_KEY ? `Enum_${itemName}` : itemName;
-    const value = [`export enum ${enumName} {`];
-
-    // declare fields
-    value.push(...Object.entries(item.values).map(([name, id]) => `${INDENT}${name} = ${id},`));
-
-    // close enum declaration
-    value.push('}', '');
-
-    if (IS_KEY) {
-        value.push(`export type ${itemName} = keyof typeof ${enumName};`, '');
-    }
-
-    types.push({
-        type: 'enum',
-        name: itemName,
-        value: value.join('\n'),
-    });
-};
-
-const parseMessage = (messageName, message, depth = 0) => {
-    if (messageName === 'google') return;
-    const value = [];
-    // add comment line
-    if (!depth) value.push(`// ${messageName}`);
-    // declare nested enums
-
-    // declare nested values
-    if (message.nested) {
-        Object.keys(message.nested).map(item =>
-            parseMessage(item, message.nested[item], depth + 1),
-        );
-    }
-
-    if (message.values) {
-        return parseEnum(messageName, message);
-    }
-    if (!message.fields || !Object.keys(message.fields).length) {
-        // few types are just empty objects, make it one line
-        value.push(`export type ${messageName} = {};`);
-        value.push('');
-    } else {
-        // find patch
-        const definition = DEFINITION_PATCH[messageName];
-        if (definition) {
-            // replace whole declaration
-            value.push(definition);
-        } else {
-            // declare type
-            value.push(`export type ${messageName} = {`);
-            Object.keys(message.fields).forEach(fieldName => {
-                const field = message.fields[fieldName];
-                const fieldKey = `${messageName}.${fieldName}`;
-                // find patch for "rule"
-                const fieldRule = RULE_PATCH[fieldKey] || field.rule;
-                const rule = fieldRule === 'required' || fieldRule === 'repeated' ? ': ' : '?: ';
-                // find patch for "type"
-                let type = TYPE_PATCH[fieldKey] || FIELD_TYPES[field.type] || field.type;
-                // automatically convert all amount and fee fields to UINT_TYPE
-                if (['amount', 'fee'].includes(fieldName)) {
-                    type = UINT_TYPE;
-                }
-                // array
-                if (field.rule === 'repeated') {
-                    type = type.split('|').length > 1 ? `Array<${type}>` : `${type}[]`;
-                }
-                value.push(`    ${fieldName}${rule}${type};`);
-            });
-            // close type declaration
-            value.push('};');
-            // empty line
-            value.push('');
-        }
-    }
-    // type doest have to be e
-    const exact = message.fields && Object.values(message.fields).find(f => f.rule === 'required');
-    types.push({
-        type: 'message',
-        name: messageName,
-        value: value.join('\n'),
-        exact,
-    });
-};
-
-// top level messages and nested messages
-Object.keys(json.nested).map(e => parseMessage(e, json.nested[e]));
-
-// Types needs reordering (used before defined).
-// The Type in the Value NEEDs (depends on) the Type in the Key.
-const ORDER = {
-    BinanceCoin: 'BinanceInputOutput',
-    HDNodeType: 'HDNodePathType',
-    TxAck: 'TxAckInputWrapper',
-    EthereumFieldType: 'EthereumStructMember',
-    EthereumDataType: 'EthereumFieldType',
-    PaymentRequestMemo: 'TxAckPaymentRequest',
-    RecoveryDevice: 'Features',
-    RecoveryType: 'RecoveryDevice',
-    RecoveryDeviceInputMethod: 'RecoveryType',
-};
-
-Object.keys(ORDER).forEach(key => {
-    if (key === ORDER[key]) {
-        logError(`ORDER map cannot have key=value`)
-    }
-
-    // find indexes
-    const indexOfDependency = types.findIndex(t => t && t.name === key);
-    if (indexOfDependency === -1) {
-        logError(`Type from key: '${key}' not found in the 'types' variable!`)
-    }
-
-    const indexOfDependant = types.findIndex(t => t && t.name === ORDER[key]);
-    if (indexOfDependant === -1) {
-        logError(`Type from value: '${ORDER[key]}' not found in the 'types' variable!`)
-    }
-
-    const dependency = types[indexOfDependency];
-    // replace values
-    delete types[indexOfDependency];
-    types.splice(indexOfDependant, 0, dependency);
-});
-
-// skip not needed types
-SKIP.forEach(key => {
-    const index = types.findIndex(t => t && t.name === key);
-    delete types[index];
-});
-
-// create content from types
-const content = types.flatMap(t => (t ? [t.value] : [])).join('\n');
-
-const lines = []; // string[]
-
-lines.push('// This file is auto generated from data/messages/message.json', '');
-lines.push('// custom type uint32/64 may be represented as string');
-lines.push(`export type ${UINT_TYPE} = string | number;`, '');
-lines.push('// custom type sint32/64');
-lines.push(`export type ${SINT_TYPE} = string | number;`, '');
-lines.push(
-    `export enum DeviceModelInternal {
-    T1B1 = 'T1B1',
-    T2T1 = 'T2T1',
-    T2B1 = 'T2B1',
-    T3B1 = 'T3B1',
-    T3T1 = 'T3T1',
-}`,
-    '',
-);
-lines.push(content);
-
-// create custom definition
-
-lines.push('// custom connect definitions');
-lines.push('export type MessageType = {');
-types
-    .flatMap(t => (t && t.type === 'message' ? [t] : []))
-    .forEach(t => {
-        lines.push(`    ${t.name}: ${t.name};`);
-    });
-lines.push('};');
-
-// additional types utilities
-lines.push(`
-export type MessageKey = keyof MessageType;
-
-export type MessageResponse<T extends MessageKey> = {
-    type: T;
-    message: MessageType[T];
-};
-
-export type TypedCall = <T extends MessageKey, R extends MessageKey>(
-    type: T,
-    resType: R,
-    message?: MessageType[T],
-) => Promise<MessageResponse<R>>;
-`);
-
-// save to file
-const filePath = path.join(__dirname, '../src/messages.ts');
-
-fs.writeFile(filePath, lines.join('\n'), err => {
-    if (err) return console.log(err);
-});
diff --git a/packages/protobuf/scripts/protobuf-types.ts b/packages/protobuf/scripts/protobuf-types.ts
new file mode 100644
index 00000000000..45b3af909fb
--- /dev/null
+++ b/packages/protobuf/scripts/protobuf-types.ts
@@ -0,0 +1,226 @@
+import fs from 'fs';
+import path from 'path';
+
+import json from '../messages.json';
+import {
+    RULE_PATCH,
+    TYPE_PATCH,
+    DEFINITION_PATCH,
+    SKIP,
+    UINT_TYPE,
+    SINT_TYPE,
+    FIELD_TYPES,
+    ENUM_KEYS,
+    ORDER,
+    readPatch,
+} from './protobuf-patches';
+
+const CONSOLE_RED = '\x1b[31m';
+const CONSOLE_RESET = '\x1b[0m';
+
+const logError = (text: string) => {
+    console.error(`Error: ${CONSOLE_RED}${text}${CONSOLE_RESET}`);
+};
+
+const INDENT = ' '.repeat(4);
+
+type TypeItem = {
+    type: 'enum' | 'message';
+    name: string;
+    value: string;
+};
+
+type Definition = {
+    options?: Record<string, unknown>;
+    rule?: string;
+    type?: string;
+    nested?: Record<string, Definition>;
+    fields?: Record<string, Definition>;
+    values?: Record<string, unknown>;
+};
+
+type ParseMessageOptions = {
+    defaultRule?: 'required' | 'optional';
+    fixOrder?: boolean;
+};
+
+const parseEnum = (itemName: string, item: Definition): TypeItem => {
+    const IS_KEY = ENUM_KEYS.includes(itemName);
+
+    // declare enum
+    const enumName = IS_KEY ? `Enum_${itemName}` : itemName;
+    const value = [`export enum ${enumName} {`];
+
+    // declare fields
+    value.push(
+        ...Object.entries(item.values || {}).map(([name, id]) => `${INDENT}${name} = ${id},`),
+    );
+
+    // close enum declaration
+    value.push('}', '');
+
+    if (IS_KEY) {
+        value.push(`export type ${itemName} = keyof typeof ${enumName};`, '');
+    }
+
+    return {
+        type: 'enum',
+        name: itemName,
+        value: value.join('\n'),
+    };
+};
+
+const parseMessage = (
+    messageName: string,
+    message: Definition,
+    options?: ParseMessageOptions,
+): TypeItem | TypeItem[] => {
+    const lines: string[] = [];
+    // parse nested values
+    const { nested, fields } = message;
+    let nestedTypes;
+    if (nested) {
+        nestedTypes = Object.keys(nested).flatMap(item =>
+            parseMessage(item, nested[item], options),
+        );
+    }
+
+    // parse enum
+    if (message.values) {
+        return parseEnum(messageName, message);
+    }
+
+    if (DEFINITION_PATCH[messageName]) {
+        // replace whole declaration with patch
+        lines.push(DEFINITION_PATCH[messageName]());
+    } else if (!fields || !Object.keys(fields).length) {
+        // few types are just empty objects, make it one line
+        lines.push(`export type ${messageName} = {};`, '');
+    } else {
+        // declare type
+        lines.push(`export type ${messageName} = {`);
+        Object.keys(fields).forEach(fieldName => {
+            const field = fields[fieldName];
+            const fieldKey = `${messageName}.${fieldName}`;
+            // find patch for "rule"
+            const fieldRule = RULE_PATCH[fieldKey] || field.rule || options?.defaultRule;
+            const rule = fieldRule === 'required' || fieldRule === 'repeated' ? ': ' : '?: ';
+            // find patch for "type"
+            let type = TYPE_PATCH[fieldKey] || FIELD_TYPES[field.type || ''] || field.type;
+            // automatically convert all amount and fee fields to UINT_TYPE
+            if (['amount', 'fee'].includes(fieldName)) {
+                type = UINT_TYPE;
+            }
+            // array
+            if (field.rule === 'repeated') {
+                type = type.split('|').length > 1 ? `Array<${type}>` : `${type}[]`;
+            }
+            lines.push(`    ${fieldName}${rule}${type};`);
+        });
+        // close type declaration
+        lines.push('};', '');
+    }
+
+    return [
+        ...(nestedTypes || []),
+        {
+            type: 'message',
+            name: messageName,
+            value: lines.join('\n'),
+        },
+    ];
+};
+
+const fixOrder = (types: TypeItem[]) => {
+    Object.keys(ORDER).forEach(key => {
+        if (key === ORDER[key]) {
+            logError(`ORDER map cannot have key=value`);
+        }
+
+        // find indexes
+        const indexOfDependency = types.findIndex(t => t && t.name === key);
+        if (indexOfDependency === -1) {
+            logError(`Type from key: '${key}' not found in the 'types' variable!`);
+        }
+
+        const indexOfDependant = types.findIndex(t => t && t.name === ORDER[key]);
+        if (indexOfDependant === -1) {
+            logError(`Type from value: '${ORDER[key]}' not found in the 'types' variable!`);
+        }
+
+        const dependency = types[indexOfDependency];
+        // replace values
+        delete types[indexOfDependency];
+        types.splice(indexOfDependant, 0, dependency);
+    });
+};
+
+// skip not needed types
+const skipTypes = (types: TypeItem[]) => {
+    SKIP.forEach(key => {
+        const index = types.findIndex(t => t && t.name === key);
+        delete types[index];
+    });
+};
+
+export const createTypes = (
+    def: Definition | Record<string, Definition>,
+    options?: ParseMessageOptions,
+) => {
+    const root = def.nested ? def.nested : def;
+    const types = Object.keys(root).flatMap(key => {
+        return parseMessage(key, root[key], options);
+    });
+    skipTypes(types);
+    if (options?.fixOrder) {
+        fixOrder(types);
+    }
+
+    return types;
+};
+
+const createCustomTypes = () => {
+    const lines: string[] = [];
+    lines.push('// This file is auto generated by @trezor/protobuf package', '');
+    lines.push('// custom type uint32/64 may be represented as string');
+    lines.push(`export type ${UINT_TYPE} = string | number;`, '');
+    lines.push('// custom type sint32/64');
+    lines.push(`export type ${SINT_TYPE} = string | number;`, '');
+    lines.push(readPatch('customTypes.ts'), '');
+
+    return lines;
+};
+
+const createMessageType = (types: TypeItem[]) => {
+    const lines: string[] = [];
+    lines.push('// custom connect definitions');
+    lines.push('export type MessageType = {');
+    types
+        .flatMap(t => (t && t.type === 'message' ? t : []))
+        .forEach(t => {
+            lines.push(`    ${t.name}: ${t.name};`);
+        });
+    lines.push('};');
+
+    lines.push(readPatch('MessageType.ts'));
+
+    return lines;
+};
+
+if (require.main === module) {
+    // called directly, otherwise required as a module
+
+    const types = createTypes(json, { fixOrder: true });
+    const lines = createCustomTypes();
+    // create content from types
+    const content = types.flatMap(t => (t ? t.value : [])).join('\n');
+    lines.push(content);
+    // create custom MessageType definition
+    lines.push(...createMessageType(types));
+
+    // save to file
+    const filePath = path.join(__dirname, '../src/messages.ts');
+    fs.writeFile(filePath, lines.join('\n'), err => {
+        if (err) return logError(err.message);
+    });
+}
diff --git a/packages/protobuf/src/messages-schema.ts b/packages/protobuf/src/messages-schema.ts
index c1ec385fa17..332335f0b9a 100644
--- a/packages/protobuf/src/messages-schema.ts
+++ b/packages/protobuf/src/messages-schema.ts
@@ -6,6 +6,7 @@ export enum DeviceModelInternal {
     T2B1 = 'T2B1',
     T3B1 = 'T3B1',
     T3T1 = 'T3T1',
+    T3W1 = 'T3W1',
 }
 
 export type EnumDeviceModelInternal = Static<typeof EnumDeviceModelInternal>;
@@ -1416,6 +1417,7 @@ export const ButtonRequest = Type.Object(
     {
         code: Type.Optional(ButtonRequestType),
         pages: Type.Optional(Type.Number()),
+        name: Type.Optional(Type.String()),
     },
     { $id: 'ButtonRequest' },
 );
@@ -1583,6 +1585,9 @@ export const EnumDebugPhysicalButton = Type.Enum(DebugPhysicalButton);
 export type DebugLinkResetDebugEvents = Static<typeof DebugLinkResetDebugEvents>;
 export const DebugLinkResetDebugEvents = Type.Object({}, { $id: 'DebugLinkResetDebugEvents' });
 
+export type DebugLinkOptigaSetSecMax = Static<typeof DebugLinkOptigaSetSecMax>;
+export const DebugLinkOptigaSetSecMax = Type.Object({}, { $id: 'DebugLinkOptigaSetSecMax' });
+
 export type EosGetPublicKey = Static<typeof EosGetPublicKey>;
 export const EosGetPublicKey = Type.Object(
     {
@@ -2516,10 +2521,25 @@ export const AuthenticityProof = Type.Object(
 export type WipeDevice = Static<typeof WipeDevice>;
 export const WipeDevice = Type.Object({}, { $id: 'WipeDevice' });
 
+export type LoadDevice = Static<typeof LoadDevice>;
+export const LoadDevice = Type.Object(
+    {
+        mnemonics: Type.Array(Type.String()),
+        pin: Type.Optional(Type.String()),
+        passphrase_protection: Type.Optional(Type.Boolean()),
+        language: Type.Optional(Type.String()),
+        label: Type.Optional(Type.String()),
+        skip_checksum: Type.Optional(Type.Boolean()),
+        u2f_counter: Type.Optional(Type.Number()),
+        needs_backup: Type.Optional(Type.Boolean()),
+        no_backup: Type.Optional(Type.Boolean()),
+    },
+    { $id: 'LoadDevice' },
+);
+
 export type ResetDevice = Static<typeof ResetDevice>;
 export const ResetDevice = Type.Object(
     {
-        display_random: Type.Optional(Type.Boolean()),
         strength: Type.Optional(Type.Number()),
         passphrase_protection: Type.Optional(Type.Boolean()),
         pin_protection: Type.Optional(Type.Boolean()),
@@ -2678,16 +2698,6 @@ export const SetBrightness = Type.Object(
     { $id: 'SetBrightness' },
 );
 
-export enum MoneroNetworkType {
-    MAINNET = 0,
-    TESTNET = 1,
-    STAGENET = 2,
-    FAKECHAIN = 3,
-}
-
-export type EnumMoneroNetworkType = Static<typeof EnumMoneroNetworkType>;
-export const EnumMoneroNetworkType = Type.Enum(MoneroNetworkType);
-
 export type NEMGetAddress = Static<typeof NEMGetAddress>;
 export const NEMGetAddress = Type.Object(
     {
@@ -3474,12 +3484,6 @@ export const TezosSignedTx = Type.Object(
     { $id: 'TezosSignedTx' },
 );
 
-export type experimental_message = Static<typeof experimental_message>;
-export const experimental_message = Type.Object({}, { $id: 'experimental_message' });
-
-export type experimental_field = Static<typeof experimental_field>;
-export const experimental_field = Type.Object({}, { $id: 'experimental_field' });
-
 export type MessageType = Static<typeof MessageType>;
 export const MessageType = Type.Object(
     {
@@ -3597,6 +3601,7 @@ export const MessageType = Type.Object(
         GetECDHSessionKey,
         ECDHSessionKey,
         DebugLinkResetDebugEvents,
+        DebugLinkOptigaSetSecMax,
         EosGetPublicKey,
         EosPublicKey,
         EosTxHeader,
@@ -3673,6 +3678,7 @@ export const MessageType = Type.Object(
         AuthenticateDevice,
         AuthenticityProof,
         WipeDevice,
+        LoadDevice,
         ResetDevice,
         Slip39Group,
         BackupDevice,
@@ -3758,8 +3764,6 @@ export const MessageType = Type.Object(
         TezosBallotOp,
         TezosSignTx,
         TezosSignedTx,
-        experimental_message,
-        experimental_field,
     },
     { $id: 'MessageType' },
 );
diff --git a/packages/protobuf/src/messages.ts b/packages/protobuf/src/messages.ts
index 056985692f0..afb8dba4f55 100644
--- a/packages/protobuf/src/messages.ts
+++ b/packages/protobuf/src/messages.ts
@@ -1,4 +1,4 @@
-// This file is auto generated from data/messages/message.json
+// This file is auto generated by @trezor/protobuf package
 
 // custom type uint32/64 may be represented as string
 export type UintType = string | number;
@@ -10,33 +10,30 @@ export enum DeviceModelInternal {
     T1B1 = 'T1B1',
     T2T1 = 'T2T1',
     T2B1 = 'T2B1',
+    T3B1 = 'T3B1',
     T3T1 = 'T3T1',
+    T3W1 = 'T3W1',
 }
 
-// BinanceGetAddress
 export type BinanceGetAddress = {
     address_n: number[];
     show_display?: boolean;
     chunkify?: boolean;
 };
 
-// BinanceAddress
 export type BinanceAddress = {
     address: string;
 };
 
-// BinanceGetPublicKey
 export type BinanceGetPublicKey = {
     address_n: number[];
     show_display?: boolean;
 };
 
-// BinancePublicKey
 export type BinancePublicKey = {
     public_key: string;
 };
 
-// BinanceSignTx
 export type BinanceSignTx = {
     address_n: number[];
     msg_count: number;
@@ -48,7 +45,6 @@ export type BinanceSignTx = {
     chunkify?: boolean;
 };
 
-// BinanceTxRequest
 export type BinanceTxRequest = {};
 
 export type BinanceCoin = {
@@ -61,7 +57,6 @@ export type BinanceInputOutput = {
     coins: BinanceCoin[];
 };
 
-// BinanceTransferMsg
 export type BinanceTransferMsg = {
     inputs: BinanceInputOutput[];
     outputs: BinanceInputOutput[];
@@ -88,7 +83,6 @@ export enum BinanceTimeInForce {
     IOC = 3,
 }
 
-// BinanceOrderMsg
 export type BinanceOrderMsg = {
     id?: string;
     ordertype: BinanceOrderType;
@@ -100,14 +94,12 @@ export type BinanceOrderMsg = {
     timeinforce: BinanceTimeInForce;
 };
 
-// BinanceCancelMsg
 export type BinanceCancelMsg = {
     refid?: string;
     sender?: string;
     symbol?: string;
 };
 
-// BinanceSignedTx
 export type BinanceSignedTx = {
     signature: string;
     public_key: string;
@@ -148,7 +140,6 @@ export enum AmountUnit {
     SATOSHI = 3,
 }
 
-// HDNodeType
 export type HDNodeType = {
     depth: number;
     fingerprint: number;
@@ -163,7 +154,6 @@ export type HDNodePathType = {
     address_n: number[];
 };
 
-// MultisigRedeemScriptType
 export type MultisigRedeemScriptType = {
     pubkeys: HDNodePathType[];
     signatures: string[];
@@ -172,7 +162,6 @@ export type MultisigRedeemScriptType = {
     address_n?: number[];
 };
 
-// GetPublicKey
 export type GetPublicKey = {
     address_n: number[];
     ecdsa_curve_name?: string;
@@ -182,7 +171,6 @@ export type GetPublicKey = {
     ignore_xpub_magic?: boolean;
 };
 
-// PublicKey
 export type PublicKey = {
     node: HDNodeType;
     xpub: string;
@@ -190,7 +178,6 @@ export type PublicKey = {
     descriptor?: string;
 };
 
-// GetAddress
 export type GetAddress = {
     address_n: number[];
     coin_name?: string;
@@ -201,13 +188,11 @@ export type GetAddress = {
     chunkify?: boolean;
 };
 
-// Address
 export type Address = {
     address: string;
     mac?: string;
 };
 
-// GetOwnershipId
 export type GetOwnershipId = {
     address_n: number[];
     coin_name?: string;
@@ -215,12 +200,10 @@ export type GetOwnershipId = {
     script_type?: InputScriptType;
 };
 
-// OwnershipId
 export type OwnershipId = {
     ownership_id: string;
 };
 
-// SignMessage
 export type SignMessage = {
     address_n: number[];
     message: string;
@@ -230,13 +213,11 @@ export type SignMessage = {
     chunkify?: boolean;
 };
 
-// MessageSignature
 export type MessageSignature = {
     address: string;
     signature: string;
 };
 
-// VerifyMessage
 export type VerifyMessage = {
     address: string;
     signature: string;
@@ -253,7 +234,6 @@ export type CoinJoinRequest = {
     signature?: string;
 };
 
-// SignTx
 export type SignTx = {
     outputs_count: number;
     inputs_count: number;
@@ -298,7 +278,6 @@ export type TxRequestSerializedType = {
     serialized_tx?: string;
 };
 
-// TxRequest
 export type TxRequest = {
     request_type: RequestType;
     details: TxRequestDetailsType;
@@ -404,7 +383,6 @@ export type TxOutput = TxOutputType;
 
 // - TxOutputType replacement end
 
-// PrevTx
 export type PrevTx = {
     version: number;
     lock_time: number;
@@ -417,7 +395,6 @@ export type PrevTx = {
     branch_id?: number;
 };
 
-// PrevInput
 export type PrevInput = {
     prev_hash: string;
     prev_index: number;
@@ -426,7 +403,6 @@ export type PrevInput = {
     decred_tree?: number;
 };
 
-// PrevOutput
 export type PrevOutput = {
     amount: UintType;
     script_pubkey: string;
@@ -455,7 +431,6 @@ export type PaymentRequestMemo = {
     coin_purchase_memo?: CoinPurchaseMemo;
 };
 
-// TxAckPaymentRequest
 export type TxAckPaymentRequest = {
     nonce?: string;
     recipient_name: string;
@@ -464,7 +439,6 @@ export type TxAckPaymentRequest = {
     signature: string;
 };
 
-// TxAck
 // TxAck replacement
 // TxAck needs more exact types
 // PrevInput and TxInputType requires exact responses in TxAckResponse
@@ -505,7 +479,6 @@ export type TxAckInputWrapper = {
     input: TxInput;
 };
 
-// TxAckInput
 export type TxAckInput = {
     tx: TxAckInputWrapper;
 };
@@ -514,12 +487,10 @@ export type TxAckOutputWrapper = {
     output: TxOutput;
 };
 
-// TxAckOutput
 export type TxAckOutput = {
     tx: TxAckOutputWrapper;
 };
 
-// TxAckPrevMeta
 export type TxAckPrevMeta = {
     tx: PrevTx;
 };
@@ -528,7 +499,6 @@ export type TxAckPrevInputWrapper = {
     input: PrevInput;
 };
 
-// TxAckPrevInput
 export type TxAckPrevInput = {
     tx: TxAckPrevInputWrapper;
 };
@@ -537,7 +507,6 @@ export type TxAckPrevOutputWrapper = {
     output: PrevOutput;
 };
 
-// TxAckPrevOutput
 export type TxAckPrevOutput = {
     tx: TxAckPrevOutputWrapper;
 };
@@ -546,12 +515,10 @@ export type TxAckPrevExtraDataWrapper = {
     extra_data_chunk: string;
 };
 
-// TxAckPrevExtraData
 export type TxAckPrevExtraData = {
     tx: TxAckPrevExtraDataWrapper;
 };
 
-// GetOwnershipProof
 export type GetOwnershipProof = {
     address_n: number[];
     coin_name?: string;
@@ -562,13 +529,11 @@ export type GetOwnershipProof = {
     commitment_data?: string;
 };
 
-// OwnershipProof
 export type OwnershipProof = {
     ownership_proof: string;
     signature: string;
 };
 
-// AuthorizeCoinJoin
 export type AuthorizeCoinJoin = {
     coordinator: string;
     max_rounds: number;
@@ -580,24 +545,20 @@ export type AuthorizeCoinJoin = {
     amount_unit?: AmountUnit;
 };
 
-// FirmwareErase
 export type FirmwareErase = {
     length?: number;
 };
 
-// FirmwareRequest
 export type FirmwareRequest = {
     offset: number;
     length: number;
 };
 
-// FirmwareUpload
 export type FirmwareUpload = {
     payload: Buffer | ArrayBuffer;
     hash?: string;
 };
 
-// ProdTestT1
 export type ProdTestT1 = {
     payload?: string;
 };
@@ -687,14 +648,12 @@ export enum CardanoTxWitnessType {
     SHELLEY_WITNESS = 1,
 }
 
-// CardanoBlockchainPointerType
 export type CardanoBlockchainPointerType = {
     block_index: number;
     tx_index: number;
     certificate_index: number;
 };
 
-// CardanoNativeScript
 export type CardanoNativeScript = {
     type: CardanoNativeScriptType;
     scripts?: CardanoNativeScript[];
@@ -705,19 +664,16 @@ export type CardanoNativeScript = {
     invalid_hereafter?: UintType;
 };
 
-// CardanoGetNativeScriptHash
 export type CardanoGetNativeScriptHash = {
     script: CardanoNativeScript;
     display_format: CardanoNativeScriptHashDisplayFormat;
     derivation_type: CardanoDerivationType;
 };
 
-// CardanoNativeScriptHash
 export type CardanoNativeScriptHash = {
     script_hash: string;
 };
 
-// CardanoAddressParametersType
 export type CardanoAddressParametersType = {
     address_type: CardanoAddressType;
     address_n: number[];
@@ -728,7 +684,6 @@ export type CardanoAddressParametersType = {
     script_staking_hash?: string;
 };
 
-// CardanoGetAddress
 export type CardanoGetAddress = {
     show_display?: boolean;
     protocol_magic: number;
@@ -738,25 +693,21 @@ export type CardanoGetAddress = {
     chunkify?: boolean;
 };
 
-// CardanoAddress
 export type CardanoAddress = {
     address: string;
 };
 
-// CardanoGetPublicKey
 export type CardanoGetPublicKey = {
     address_n: number[];
     show_display?: boolean;
     derivation_type: CardanoDerivationType;
 };
 
-// CardanoPublicKey
 export type CardanoPublicKey = {
     xpub: string;
     node: HDNodeType;
 };
 
-// CardanoSignTxInit
 export type CardanoSignTxInit = {
     signing_mode: CardanoTxSigningMode;
     protocol_magic: number;
@@ -783,13 +734,11 @@ export type CardanoSignTxInit = {
     tag_cbor_sets?: boolean;
 };
 
-// CardanoTxInput
 export type CardanoTxInput = {
     prev_hash: string;
     prev_index: number;
 };
 
-// CardanoTxOutput
 export type CardanoTxOutput = {
     address?: string;
     address_parameters?: CardanoAddressParametersType;
@@ -801,36 +750,30 @@ export type CardanoTxOutput = {
     reference_script_size?: number;
 };
 
-// CardanoAssetGroup
 export type CardanoAssetGroup = {
     policy_id: string;
     tokens_count: number;
 };
 
-// CardanoToken
 export type CardanoToken = {
     asset_name_bytes: string;
     amount?: UintType;
     mint_amount?: SintType;
 };
 
-// CardanoTxInlineDatumChunk
 export type CardanoTxInlineDatumChunk = {
     data: string;
 };
 
-// CardanoTxReferenceScriptChunk
 export type CardanoTxReferenceScriptChunk = {
     data: string;
 };
 
-// CardanoPoolOwner
 export type CardanoPoolOwner = {
     staking_key_path?: number[];
     staking_key_hash?: string;
 };
 
-// CardanoPoolRelayParameters
 export type CardanoPoolRelayParameters = {
     type: CardanoPoolRelayType;
     ipv4_address?: string;
@@ -839,13 +782,11 @@ export type CardanoPoolRelayParameters = {
     port?: number;
 };
 
-// CardanoPoolMetadataType
 export type CardanoPoolMetadataType = {
     url: string;
     hash: string;
 };
 
-// CardanoPoolParametersType
 export type CardanoPoolParametersType = {
     pool_id: string;
     vrf_key_hash: string;
@@ -859,14 +800,12 @@ export type CardanoPoolParametersType = {
     relays_count: number;
 };
 
-// CardanoDRep
 export type CardanoDRep = {
     type: CardanoDRepType;
     key_hash?: string;
     script_hash?: string;
 };
 
-// CardanoTxCertificate
 export type CardanoTxCertificate = {
     type: CardanoCertificateType;
     path?: number[];
@@ -878,7 +817,6 @@ export type CardanoTxCertificate = {
     drep?: CardanoDRep;
 };
 
-// CardanoTxWithdrawal
 export type CardanoTxWithdrawal = {
     path?: number[];
     amount: UintType;
@@ -886,13 +824,11 @@ export type CardanoTxWithdrawal = {
     key_hash?: string;
 };
 
-// CardanoCVoteRegistrationDelegation
 export type CardanoCVoteRegistrationDelegation = {
     vote_public_key: string;
     weight: UintType;
 };
 
-// CardanoCVoteRegistrationParametersType
 export type CardanoCVoteRegistrationParametersType = {
     vote_public_key?: string;
     staking_path: number[];
@@ -904,51 +840,42 @@ export type CardanoCVoteRegistrationParametersType = {
     payment_address?: string;
 };
 
-// CardanoTxAuxiliaryData
 export type CardanoTxAuxiliaryData = {
     cvote_registration_parameters?: CardanoCVoteRegistrationParametersType;
     hash?: string;
 };
 
-// CardanoTxMint
 export type CardanoTxMint = {
     asset_groups_count: number;
 };
 
-// CardanoTxCollateralInput
 export type CardanoTxCollateralInput = {
     prev_hash: string;
     prev_index: number;
 };
 
-// CardanoTxRequiredSigner
 export type CardanoTxRequiredSigner = {
     key_hash?: string;
     key_path?: number[];
 };
 
-// CardanoTxReferenceInput
 export type CardanoTxReferenceInput = {
     prev_hash: string;
     prev_index: number;
 };
 
-// CardanoTxItemAck
 export type CardanoTxItemAck = {};
 
-// CardanoTxAuxiliaryDataSupplement
 export type CardanoTxAuxiliaryDataSupplement = {
     type: CardanoTxAuxiliaryDataSupplementType;
     auxiliary_data_hash?: string;
     cvote_registration_signature?: string;
 };
 
-// CardanoTxWitnessRequest
 export type CardanoTxWitnessRequest = {
     path: number[];
 };
 
-// CardanoTxWitnessResponse
 export type CardanoTxWitnessResponse = {
     type: CardanoTxWitnessType;
     pub_key: string;
@@ -956,18 +883,14 @@ export type CardanoTxWitnessResponse = {
     chain_code?: string;
 };
 
-// CardanoTxHostAck
 export type CardanoTxHostAck = {};
 
-// CardanoTxBodyHash
 export type CardanoTxBodyHash = {
     tx_hash: string;
 };
 
-// CardanoSignTxFinished
 export type CardanoSignTxFinished = {};
 
-// Success
 export type Success = {
     message: string;
 };
@@ -990,7 +913,6 @@ export enum FailureType {
     Failure_FirmwareError = 99,
 }
 
-// Failure
 export type Failure = {
     code?: FailureType;
     message?: string;
@@ -1021,13 +943,12 @@ export enum Enum_ButtonRequestType {
 
 export type ButtonRequestType = keyof typeof Enum_ButtonRequestType;
 
-// ButtonRequest
 export type ButtonRequest = {
     code?: ButtonRequestType;
     pages?: number;
+    name?: string;
 };
 
-// ButtonAck
 export type ButtonAck = {};
 
 export enum Enum_PinMatrixRequestType {
@@ -1040,37 +961,30 @@ export enum Enum_PinMatrixRequestType {
 
 export type PinMatrixRequestType = keyof typeof Enum_PinMatrixRequestType;
 
-// PinMatrixRequest
 export type PinMatrixRequest = {
     type?: PinMatrixRequestType;
 };
 
-// PinMatrixAck
 export type PinMatrixAck = {
     pin: string;
 };
 
-// PassphraseRequest
 export type PassphraseRequest = {
     _on_device?: boolean;
 };
 
-// PassphraseAck
 export type PassphraseAck = {
     passphrase?: string;
     _state?: string;
     on_device?: boolean;
 };
 
-// Deprecated_PassphraseStateRequest
 export type Deprecated_PassphraseStateRequest = {
     state?: string;
 };
 
-// Deprecated_PassphraseStateAck
 export type Deprecated_PassphraseStateAck = {};
 
-// CipherKeyValue
 export type CipherKeyValue = {
     address_n: number[];
     key: string;
@@ -1081,12 +995,10 @@ export type CipherKeyValue = {
     iv?: string;
 };
 
-// CipheredKeyValue
 export type CipheredKeyValue = {
     value: string;
 };
 
-// IdentityType
 export type IdentityType = {
     proto?: string;
     user?: string;
@@ -1096,7 +1008,6 @@ export type IdentityType = {
     index?: number;
 };
 
-// SignIdentity
 export type SignIdentity = {
     identity: IdentityType;
     challenge_hidden?: string;
@@ -1104,21 +1015,18 @@ export type SignIdentity = {
     ecdsa_curve_name?: string;
 };
 
-// SignedIdentity
 export type SignedIdentity = {
     address: string;
     public_key: string;
     signature: string;
 };
 
-// GetECDHSessionKey
 export type GetECDHSessionKey = {
     identity: IdentityType;
     peer_public_key: string;
     ecdsa_curve_name?: string;
 };
 
-// ECDHSessionKey
 export type ECDHSessionKey = {
     session_key: string;
     public_key?: string;
@@ -1136,17 +1044,16 @@ export enum DebugPhysicalButton {
     RIGHT_BTN = 2,
 }
 
-// DebugLinkResetDebugEvents
 export type DebugLinkResetDebugEvents = {};
 
-// EosGetPublicKey
+export type DebugLinkOptigaSetSecMax = {};
+
 export type EosGetPublicKey = {
     address_n: number[];
     show_display?: boolean;
     chunkify?: boolean;
 };
 
-// EosPublicKey
 export type EosPublicKey = {
     wif_public_key: string;
     raw_public_key: string;
@@ -1161,7 +1068,6 @@ export type EosTxHeader = {
     delay_sec: number;
 };
 
-// EosSignTx
 export type EosSignTx = {
     address_n: number[];
     chain_id: string;
@@ -1170,7 +1076,6 @@ export type EosSignTx = {
     chunkify?: boolean;
 };
 
-// EosTxActionRequest
 export type EosTxActionRequest = {
     data_size?: number;
 };
@@ -1301,7 +1206,6 @@ export type EosActionUnknown = {
     data_chunk: string;
 };
 
-// EosTxActionAck
 export type EosTxActionAck = {
     common: EosActionCommon;
     transfer?: EosActionTransfer;
@@ -1320,7 +1224,6 @@ export type EosTxActionAck = {
     unknown?: EosActionUnknown;
 };
 
-// EosSignedTx
 export type EosSignedTx = {
     signature: string;
 };
@@ -1330,7 +1233,6 @@ export enum EthereumDefinitionType {
     TOKEN = 1,
 }
 
-// EthereumNetworkInfo
 export type EthereumNetworkInfo = {
     chain_id: number;
     symbol: string;
@@ -1338,7 +1240,6 @@ export type EthereumNetworkInfo = {
     name: string;
 };
 
-// EthereumTokenInfo
 export type EthereumTokenInfo = {
     address: string;
     chain_id: number;
@@ -1347,13 +1248,11 @@ export type EthereumTokenInfo = {
     name: string;
 };
 
-// EthereumDefinitions
 export type EthereumDefinitions = {
     encoded_network?: ArrayBuffer;
     encoded_token?: ArrayBuffer;
 };
 
-// EthereumSignTypedData
 export type EthereumSignTypedData = {
     address_n: number[];
     primary_type: string;
@@ -1361,7 +1260,6 @@ export type EthereumSignTypedData = {
     definitions?: EthereumDefinitions;
 };
 
-// EthereumTypedDataStructRequest
 export type EthereumTypedDataStructRequest = {
     name: string;
 };
@@ -1389,34 +1287,28 @@ export type EthereumStructMember = {
     name: string;
 };
 
-// EthereumTypedDataStructAck
 export type EthereumTypedDataStructAck = {
     members: EthereumStructMember[];
 };
 
-// EthereumTypedDataValueRequest
 export type EthereumTypedDataValueRequest = {
     member_path: number[];
 };
 
-// EthereumTypedDataValueAck
 export type EthereumTypedDataValueAck = {
     value: string;
 };
 
-// EthereumGetPublicKey
 export type EthereumGetPublicKey = {
     address_n: number[];
     show_display?: boolean;
 };
 
-// EthereumPublicKey
 export type EthereumPublicKey = {
     node: HDNodeType;
     xpub: string;
 };
 
-// EthereumGetAddress
 export type EthereumGetAddress = {
     address_n: number[];
     show_display?: boolean;
@@ -1424,13 +1316,11 @@ export type EthereumGetAddress = {
     chunkify?: boolean;
 };
 
-// EthereumAddress
 export type EthereumAddress = {
     _old_address?: string;
     address: string;
 };
 
-// EthereumSignTx
 export type EthereumSignTx = {
     address_n: number[];
     nonce?: string;
@@ -1451,7 +1341,6 @@ export type EthereumAccessList = {
     storage_keys: string[];
 };
 
-// EthereumSignTxEIP1559
 export type EthereumSignTxEIP1559 = {
     address_n: number[];
     nonce: string;
@@ -1468,7 +1357,6 @@ export type EthereumSignTxEIP1559 = {
     chunkify?: boolean;
 };
 
-// EthereumTxRequest
 export type EthereumTxRequest = {
     data_length?: number;
     signature_v?: number;
@@ -1476,12 +1364,10 @@ export type EthereumTxRequest = {
     signature_s?: string;
 };
 
-// EthereumTxAck
 export type EthereumTxAck = {
     data_chunk: string;
 };
 
-// EthereumSignMessage
 export type EthereumSignMessage = {
     address_n: number[];
     message: string;
@@ -1489,13 +1375,11 @@ export type EthereumSignMessage = {
     chunkify?: boolean;
 };
 
-// EthereumMessageSignature
 export type EthereumMessageSignature = {
     signature: string;
     address: string;
 };
 
-// EthereumVerifyMessage
 export type EthereumVerifyMessage = {
     signature: string;
     message: string;
@@ -1503,7 +1387,6 @@ export type EthereumVerifyMessage = {
     chunkify?: boolean;
 };
 
-// EthereumSignTypedHash
 export type EthereumSignTypedHash = {
     address_n: number[];
     domain_separator_hash: string;
@@ -1511,7 +1394,6 @@ export type EthereumSignTypedHash = {
     encoded_network?: ArrayBuffer;
 };
 
-// EthereumTypedDataSignature
 export type EthereumTypedDataSignature = {
     signature: string;
     address: string;
@@ -1544,14 +1426,12 @@ export enum Enum_HomescreenFormat {
 
 export type HomescreenFormat = keyof typeof Enum_HomescreenFormat;
 
-// Initialize
 export type Initialize = {
     session_id?: string;
     _skip_passphrase?: boolean;
     derive_cardano?: boolean;
 };
 
-// GetFeatures
 export type GetFeatures = {};
 
 export enum Enum_BackupAvailability {
@@ -1609,7 +1489,6 @@ export enum Enum_RecoveryType {
 
 export type RecoveryType = keyof typeof Enum_RecoveryType;
 
-// RecoveryDevice
 export type RecoveryDevice = {
     word_count?: number;
     passphrase_protection?: boolean;
@@ -1622,7 +1501,6 @@ export type RecoveryDevice = {
     type?: RecoveryType;
 };
 
-// Features
 export type Features = {
     vendor: string;
     major_version: number;
@@ -1678,18 +1556,14 @@ export type Features = {
     optiga_sec?: number;
 };
 
-// LockDevice
 export type LockDevice = {};
 
-// SetBusy
 export type SetBusy = {
     expiry_ms?: number;
 };
 
-// EndSession
 export type EndSession = {};
 
-// ApplySettings
 export type ApplySettings = {
     language?: string;
     label?: string;
@@ -1705,34 +1579,28 @@ export type ApplySettings = {
     haptic_feedback?: boolean;
 };
 
-// ChangeLanguage
 export type ChangeLanguage = {
     data_length: number;
     show_display?: boolean;
 };
 
-// TranslationDataRequest
 export type TranslationDataRequest = {
     data_length: number;
     data_offset: number;
 };
 
-// TranslationDataAck
 export type TranslationDataAck = {
     data_chunk: string;
 };
 
-// ApplyFlags
 export type ApplyFlags = {
     flags: number;
 };
 
-// ChangePin
 export type ChangePin = {
     remove?: boolean;
 };
 
-// ChangeWipeCode
 export type ChangeWipeCode = {
     remove?: boolean;
 };
@@ -1743,57 +1611,57 @@ export enum SdProtectOperationType {
     REFRESH = 2,
 }
 
-// SdProtect
 export type SdProtect = {
     operation: SdProtectOperationType;
 };
 
-// Ping
 export type Ping = {
     message?: string;
     button_protection?: boolean;
 };
 
-// Cancel
 export type Cancel = {};
 
-// GetEntropy
 export type GetEntropy = {
     size: number;
 };
 
-// Entropy
 export type Entropy = {
     entropy: string;
 };
 
-// GetFirmwareHash
 export type GetFirmwareHash = {
     challenge?: string;
 };
 
-// FirmwareHash
 export type FirmwareHash = {
     hash: string;
 };
 
-// AuthenticateDevice
 export type AuthenticateDevice = {
     challenge: string;
 };
 
-// AuthenticityProof
 export type AuthenticityProof = {
     certificates: string[];
     signature: string;
 };
 
-// WipeDevice
 export type WipeDevice = {};
 
-// ResetDevice
+export type LoadDevice = {
+    mnemonics: string[];
+    pin?: string;
+    passphrase_protection?: boolean;
+    language?: string;
+    label?: string;
+    skip_checksum?: boolean;
+    u2f_counter?: number;
+    needs_backup?: boolean;
+    no_backup?: boolean;
+};
+
 export type ResetDevice = {
-    display_random?: boolean;
     strength?: number;
     passphrase_protection?: boolean;
     pin_protection?: boolean;
@@ -1810,16 +1678,13 @@ export type Slip39Group = {
     member_count: number;
 };
 
-// BackupDevice
 export type BackupDevice = {
     group_threshold?: number;
     groups?: Slip39Group[];
 };
 
-// EntropyRequest
 export type EntropyRequest = {};
 
-// EntropyAck
 export type EntropyAck = {
     entropy: string;
 };
@@ -1832,36 +1697,28 @@ export enum Enum_WordRequestType {
 
 export type WordRequestType = keyof typeof Enum_WordRequestType;
 
-// WordRequest
 export type WordRequest = {
     type: WordRequestType;
 };
 
-// WordAck
 export type WordAck = {
     word: string;
 };
 
-// SetU2FCounter
 export type SetU2FCounter = {
     u2f_counter: number;
 };
 
-// GetNextU2FCounter
 export type GetNextU2FCounter = {};
 
-// NextU2FCounter
 export type NextU2FCounter = {
     u2f_counter: number;
 };
 
-// DoPreauthorized
 export type DoPreauthorized = {};
 
-// PreauthorizedRequest
 export type PreauthorizedRequest = {};
 
-// CancelAuthorization
 export type CancelAuthorization = {};
 
 export enum BootCommand {
@@ -1869,51 +1726,35 @@ export enum BootCommand {
     INSTALL_UPGRADE = 1,
 }
 
-// RebootToBootloader
 export type RebootToBootloader = {
     boot_command?: BootCommand;
     firmware_header?: string;
     language_data_length?: number;
 };
 
-// GetNonce
 export type GetNonce = {};
 
-// Nonce
 export type Nonce = {
     nonce: string;
 };
 
-// UnlockPath
 export type UnlockPath = {
     address_n: number[];
     mac?: string;
 };
 
-// UnlockedPathRequest
 export type UnlockedPathRequest = {
     mac?: string;
 };
 
-// ShowDeviceTutorial
 export type ShowDeviceTutorial = {};
 
-// UnlockBootloader
 export type UnlockBootloader = {};
 
-// SetBrightness
 export type SetBrightness = {
     value?: number;
 };
 
-export enum MoneroNetworkType {
-    MAINNET = 0,
-    TESTNET = 1,
-    STAGENET = 2,
-    FAKECHAIN = 3,
-}
-
-// NEMGetAddress
 export type NEMGetAddress = {
     address_n: number[];
     network?: number;
@@ -1921,7 +1762,6 @@ export type NEMGetAddress = {
     chunkify?: boolean;
 };
 
-// NEMAddress
 export type NEMAddress = {
     address: string;
 };
@@ -2022,7 +1862,6 @@ export type NEMImportanceTransfer = {
     public_key: string;
 };
 
-// NEMSignTx
 export type NEMSignTx = {
     transaction: NEMTransactionCommon;
     multisig?: NEMTransactionCommon;
@@ -2036,13 +1875,11 @@ export type NEMSignTx = {
     chunkify?: boolean;
 };
 
-// NEMSignedTx
 export type NEMSignedTx = {
     data: string;
     signature: string;
 };
 
-// NEMDecryptMessage
 export type NEMDecryptMessage = {
     address_n: number[];
     network?: number;
@@ -2050,19 +1887,16 @@ export type NEMDecryptMessage = {
     payload?: string;
 };
 
-// NEMDecryptedMessage
 export type NEMDecryptedMessage = {
     payload: string;
 };
 
-// RippleGetAddress
 export type RippleGetAddress = {
     address_n: number[];
     show_display?: boolean;
     chunkify?: boolean;
 };
 
-// RippleAddress
 export type RippleAddress = {
     address: string;
 };
@@ -2073,7 +1907,6 @@ export type RipplePayment = {
     destination_tag?: number;
 };
 
-// RippleSignTx
 export type RippleSignTx = {
     address_n: number[];
     fee: UintType;
@@ -2084,36 +1917,30 @@ export type RippleSignTx = {
     chunkify?: boolean;
 };
 
-// RippleSignedTx
 export type RippleSignedTx = {
     signature: string;
     serialized_tx: string;
 };
 
-// SolanaGetPublicKey
 export type SolanaGetPublicKey = {
     address_n: number[];
     show_display?: boolean;
 };
 
-// SolanaPublicKey
 export type SolanaPublicKey = {
     public_key: string;
 };
 
-// SolanaGetAddress
 export type SolanaGetAddress = {
     address_n: number[];
     show_display?: boolean;
     chunkify?: boolean;
 };
 
-// SolanaAddress
 export type SolanaAddress = {
     address: string;
 };
 
-// SolanaTxTokenAccountInfo
 export type SolanaTxTokenAccountInfo = {
     base_address: string;
     token_program: string;
@@ -2121,19 +1948,16 @@ export type SolanaTxTokenAccountInfo = {
     token_account: string;
 };
 
-// SolanaTxAdditionalInfo
 export type SolanaTxAdditionalInfo = {
     token_accounts_infos: SolanaTxTokenAccountInfo[];
 };
 
-// SolanaSignTx
 export type SolanaSignTx = {
     address_n: number[];
     serialized_tx: string;
     additional_info?: SolanaTxAdditionalInfo;
 };
 
-// SolanaTxSignature
 export type SolanaTxSignature = {
     signature: string;
 };
@@ -2144,21 +1968,18 @@ export enum StellarAssetType {
     ALPHANUM12 = 2,
 }
 
-// StellarAsset
 export type StellarAsset = {
     type: 0 | 1 | 2 | 'NATIVE' | 'ALPHANUM4' | 'ALPHANUM12';
     code?: string;
     issuer?: string;
 };
 
-// StellarGetAddress
 export type StellarGetAddress = {
     address_n: number[];
     show_display?: boolean;
     chunkify?: boolean;
 };
 
-// StellarAddress
 export type StellarAddress = {
     address: string;
 };
@@ -2171,7 +1992,6 @@ export enum StellarMemoType {
     RETURN = 4,
 }
 
-// StellarSignTx
 export type StellarSignTx = {
     address_n: number[];
     network_passphrase: string;
@@ -2187,10 +2007,8 @@ export type StellarSignTx = {
     num_operations: number;
 };
 
-// StellarTxOpRequest
 export type StellarTxOpRequest = {};
 
-// StellarPaymentOp
 export type StellarPaymentOp = {
     source_account?: string;
     destination_account: string;
@@ -2198,14 +2016,12 @@ export type StellarPaymentOp = {
     amount: UintType;
 };
 
-// StellarCreateAccountOp
 export type StellarCreateAccountOp = {
     source_account?: string;
     new_account: string;
     starting_balance: UintType;
 };
 
-// StellarPathPaymentStrictReceiveOp
 export type StellarPathPaymentStrictReceiveOp = {
     source_account?: string;
     send_asset: StellarAsset;
@@ -2216,7 +2032,6 @@ export type StellarPathPaymentStrictReceiveOp = {
     paths?: StellarAsset[];
 };
 
-// StellarPathPaymentStrictSendOp
 export type StellarPathPaymentStrictSendOp = {
     source_account?: string;
     send_asset: StellarAsset;
@@ -2227,7 +2042,6 @@ export type StellarPathPaymentStrictSendOp = {
     paths?: StellarAsset[];
 };
 
-// StellarManageSellOfferOp
 export type StellarManageSellOfferOp = {
     source_account?: string;
     selling_asset: StellarAsset;
@@ -2238,7 +2052,6 @@ export type StellarManageSellOfferOp = {
     offer_id: UintType;
 };
 
-// StellarManageBuyOfferOp
 export type StellarManageBuyOfferOp = {
     source_account?: string;
     selling_asset: StellarAsset;
@@ -2249,7 +2062,6 @@ export type StellarManageBuyOfferOp = {
     offer_id: UintType;
 };
 
-// StellarCreatePassiveSellOfferOp
 export type StellarCreatePassiveSellOfferOp = {
     source_account?: string;
     selling_asset: StellarAsset;
@@ -2265,7 +2077,6 @@ export enum StellarSignerType {
     HASH = 2,
 }
 
-// StellarSetOptionsOp
 export type StellarSetOptionsOp = {
     source_account?: string;
     inflation_destination_account?: string;
@@ -2281,14 +2092,12 @@ export type StellarSetOptionsOp = {
     signer_weight?: number;
 };
 
-// StellarChangeTrustOp
 export type StellarChangeTrustOp = {
     source_account?: string;
     asset: StellarAsset;
     limit: UintType;
 };
 
-// StellarAllowTrustOp
 export type StellarAllowTrustOp = {
     source_account?: string;
     trusted_account: string;
@@ -2297,57 +2106,48 @@ export type StellarAllowTrustOp = {
     is_authorized: boolean;
 };
 
-// StellarAccountMergeOp
 export type StellarAccountMergeOp = {
     source_account?: string;
     destination_account: string;
 };
 
-// StellarManageDataOp
 export type StellarManageDataOp = {
     source_account?: string;
     key: string;
     value?: Buffer | string;
 };
 
-// StellarBumpSequenceOp
 export type StellarBumpSequenceOp = {
     source_account?: string;
     bump_to: UintType;
 };
 
-// StellarClaimClaimableBalanceOp
 export type StellarClaimClaimableBalanceOp = {
     source_account?: string;
     balance_id: string;
 };
 
-// StellarSignedTx
 export type StellarSignedTx = {
     public_key: string;
     signature: string;
 };
 
-// TezosGetAddress
 export type TezosGetAddress = {
     address_n: number[];
     show_display?: boolean;
     chunkify?: boolean;
 };
 
-// TezosAddress
 export type TezosAddress = {
     address: string;
 };
 
-// TezosGetPublicKey
 export type TezosGetPublicKey = {
     address_n: number[];
     show_display?: boolean;
     chunkify?: boolean;
 };
 
-// TezosPublicKey
 export type TezosPublicKey = {
     public_key: string;
 };
@@ -2436,7 +2236,6 @@ export type TezosBallotOp = {
     ballot: TezosBallotType;
 };
 
-// TezosSignTx
 export type TezosSignTx = {
     address_n: number[];
     branch: Uint8Array;
@@ -2449,19 +2248,12 @@ export type TezosSignTx = {
     chunkify?: boolean;
 };
 
-// TezosSignedTx
 export type TezosSignedTx = {
     signature: string;
     sig_op_contents: string;
     operation_hash: string;
 };
 
-// experimental_message
-export type experimental_message = {};
-
-// experimental_field
-export type experimental_field = {};
-
 // custom connect definitions
 export type MessageType = {
     BinanceGetAddress: BinanceGetAddress;
@@ -2578,6 +2370,7 @@ export type MessageType = {
     GetECDHSessionKey: GetECDHSessionKey;
     ECDHSessionKey: ECDHSessionKey;
     DebugLinkResetDebugEvents: DebugLinkResetDebugEvents;
+    DebugLinkOptigaSetSecMax: DebugLinkOptigaSetSecMax;
     EosGetPublicKey: EosGetPublicKey;
     EosPublicKey: EosPublicKey;
     EosTxHeader: EosTxHeader;
@@ -2654,6 +2447,7 @@ export type MessageType = {
     AuthenticateDevice: AuthenticateDevice;
     AuthenticityProof: AuthenticityProof;
     WipeDevice: WipeDevice;
+    LoadDevice: LoadDevice;
     ResetDevice: ResetDevice;
     Slip39Group: Slip39Group;
     BackupDevice: BackupDevice;
@@ -2739,8 +2533,6 @@ export type MessageType = {
     TezosBallotOp: TezosBallotOp;
     TezosSignTx: TezosSignTx;
     TezosSignedTx: TezosSignedTx;
-    experimental_message: experimental_message;
-    experimental_field: experimental_field;
 };
 
 export type MessageKey = keyof MessageType;
diff --git a/packages/protobuf/src/utils.ts b/packages/protobuf/src/utils.ts
index 4ae8b156cc0..53d0eb3c31f 100644
--- a/packages/protobuf/src/utils.ts
+++ b/packages/protobuf/src/utils.ts
@@ -39,8 +39,8 @@ export function parseConfigure(data: protobuf.INamespace) {
 
 export const createMessageFromName = (messages: protobuf.Root, name: string) => {
     const Message = messages.lookupType(name);
-    const MessageType = messages.lookupEnum('MessageType');
-    let messageTypeId = MessageType.values[`MessageType_${name}`];
+    const messageTypes = messages.lookupEnum('MessageType');
+    let messageTypeId = messageTypes.values[name];
 
     if (typeof messageTypeId !== 'number' && Message.options) {
         messageTypeId = Message.options['(wire_type)'];
@@ -64,10 +64,7 @@ export const createMessageFromType = (messages: protobuf.Root, messageType: numb
 
     const messageTypes = messages.lookupEnum('MessageType');
 
-    const messageName = messageTypes.valuesById[messageType].replace(
-        'MessageType_',
-        '',
-    ) as MessageFromTrezor['type'];
+    const messageName = messageTypes.valuesById[messageType] as MessageFromTrezor['type'];
 
     const Message = messages.lookupType(messageName);
 
diff --git a/packages/protobuf/tests/encode-decode.test.ts b/packages/protobuf/tests/encode-decode.test.ts
index e2a0d27d197..755ebdf7c4d 100644
--- a/packages/protobuf/tests/encode-decode.test.ts
+++ b/packages/protobuf/tests/encode-decode.test.ts
@@ -541,6 +541,6 @@ describe('Real messages', () => {
         expect(() => {
             // @ts-expect-error
             encode(null, {});
-        }).toThrowError();
+        }).toThrow();
     });
 });
diff --git a/packages/protobuf/tests/messages.test.ts b/packages/protobuf/tests/messages.test.ts
index 325488b9aed..0539229653f 100644
--- a/packages/protobuf/tests/messages.test.ts
+++ b/packages/protobuf/tests/messages.test.ts
@@ -47,7 +47,7 @@ const json = {
                                 },
                                 MessageType: {
                                     values: {
-                                        MessageType_Initialize: 0,
+                                        Initialize: 0,
                                     },
                                 },
                             },
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
index 7c709a228ad..31b71f25e54 100644
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -20,7 +20,6 @@
         "!**/*.map"
     ],
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
diff --git a/packages/react-native-usb/android/src/main/java/io/trezor/rnusb/ReactNativeUsbModule.kt b/packages/react-native-usb/android/src/main/java/io/trezor/rnusb/ReactNativeUsbModule.kt
index e87aa1508dd..14cdf92544f 100644
--- a/packages/react-native-usb/android/src/main/java/io/trezor/rnusb/ReactNativeUsbModule.kt
+++ b/packages/react-native-usb/android/src/main/java/io/trezor/rnusb/ReactNativeUsbModule.kt
@@ -150,7 +150,15 @@ class ReactNativeUsbModule : Module() {
             for (device in devicesList) {
                 if (usbManager.hasPermission(device)) {
                     Log.d(LOG_TAG, "Has permission, send event onDeviceConnected: $device")
-                    val webUsbDevice = openDevice(device.deviceName)
+                    
+                    val webUsbDevice = if (hasOpenedConnection(device.deviceName)) {
+                        Log.d(LOG_TAG, "Device already opened: $device")
+                        getWebUSBDevice(device)
+                    } else {
+                        Log.d(LOG_TAG, "Opening device: $device")
+                        openDevice(device.deviceName)
+                    }
+
                     sendEvent(ON_DEVICE_CONNECT_EVENT_NAME, webUsbDevice)
                     devicesHistory[device.deviceName] = webUsbDevice
                 } else if (!devicesRequestedPermissions.contains(
@@ -218,7 +226,7 @@ class ReactNativeUsbModule : Module() {
             Log.e(LOG_TAG, "Failed to open device ${device.deviceName}")
             throw Exception("Failed to open device ${device.deviceName}")
         }
-        Log.d(LOG_TAG, "Opening device ${device.deviceName}")
+
         openedConnections[device.deviceName] = usbConnection
 
         // log all endpoints for debug purposes
@@ -300,7 +308,10 @@ class ReactNativeUsbModule : Module() {
         val dataByteArray = data.split(",").map { it.toInt().toByte() }.toByteArray()
         Log.d(LOG_TAG, "dataByteArray: $dataByteArray")
         val device = getDeviceByName(deviceName)
-        val usbConnection = getOpenedConnection(deviceName)
+        val usbConnection = openedConnections.getOrPut(device.deviceName) {
+            Log.d(LOG_TAG, "Reopening device ${device.deviceName}")
+            usbManager.openDevice(device) ?: throw Exception("Failed to open device ${device.deviceName}")
+        }
 
         val usbEndpoint = device.getInterface(INTERFACE_INDEX).getEndpoint(1)
         if (usbEndpoint == null) {
@@ -315,7 +326,11 @@ class ReactNativeUsbModule : Module() {
     private fun transferIn(deviceName: String, endpointNumber: Int, length: Int): IntArray {
         Log.d(LOG_TAG, "Reading data from device $deviceName")
         val device = getDeviceByName(deviceName)
-        val usbConnection = getOpenedConnection(deviceName)
+
+        val usbConnection = openedConnections.getOrPut(device.deviceName) {
+            Log.d(LOG_TAG, "Reopening device ${device.deviceName}")
+            usbManager.openDevice(device) ?: throw Exception("Failed to open device ${device.deviceName}")
+        }
 
         val usbEndpoint = device.getInterface(INTERFACE_INDEX).getEndpoint(0)
 
diff --git a/packages/react-native-usb/package.json b/packages/react-native-usb/package.json
index f35497c05f3..27e9d0c0d4a 100644
--- a/packages/react-native-usb/package.json
+++ b/packages/react-native-usb/package.json
@@ -4,7 +4,6 @@
     "description": "React Native WebUSB implementation",
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "type-check": "yarn g:tsc --build tsconfig.json",
         "open:ios": "open -a \"Xcode\" example/ios",
         "open:android": "open -a \"Android Studio\" example/android"
diff --git a/packages/react-native-usb/plugins/withUSBDevice.js b/packages/react-native-usb/plugins/withUSBDevice.js
index 9bf33101c75..13c2e9335ff 100644
--- a/packages/react-native-usb/plugins/withUSBDevice.js
+++ b/packages/react-native-usb/plugins/withUSBDevice.js
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable require-await */
 const { AndroidConfig, withAndroidManifest } = require('expo/config-plugins');
 
@@ -62,9 +61,9 @@ async function setCustomConfigAsync(config, androidManifest) {
 }
 
 module.exports = config =>
-    withAndroidManifest(config, async config => {
+    withAndroidManifest(config, async config2 => {
         // Modifiers can be async, but try to keep them fast.
-        config.modResults = await setCustomConfigAsync(config, config.modResults);
+        config2.modResults = await setCustomConfigAsync(config2, config2.modResults);
 
-        return config;
+        return config2;
     });
diff --git a/packages/react-utils/package.json b/packages/react-utils/package.json
index c597ced1f47..96ee09c0d76 100644
--- a/packages/react-utils/package.json
+++ b/packages/react-utils/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/packages/react-utils/src/hooks/useTimer.ts b/packages/react-utils/src/hooks/useTimer.ts
index 4185af06797..d65929fcd29 100644
--- a/packages/react-utils/src/hooks/useTimer.ts
+++ b/packages/react-utils/src/hooks/useTimer.ts
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useRef } from 'react';
 
 export interface Timer {
     timeSpend: {
@@ -17,24 +17,32 @@ export const useTimer = (): Timer => {
     const [isLoading, setIsLoading] = useState(false);
     const [isStopped, setIsStopped] = useState(false);
     const [resetCount, setResetCount] = useState(0);
+    const intervalRef = useRef<NodeJS.Timeout | null>(null);
 
     useEffect(() => {
-        const timeout = setTimeout(() => {
-            setTimeSpend(timeSpend + 1000);
-        }, 1000);
-
         if (isStopped || isLoading) {
-            clearTimeout(timeout);
+            if (intervalRef.current) {
+                clearInterval(intervalRef.current);
+                intervalRef.current = null;
+            }
+
+            return;
         }
 
+        intervalRef.current = setInterval(() => {
+            setTimeSpend(prevTime => prevTime + 1000);
+        }, 1000);
+
         return () => {
-            clearTimeout(timeout);
+            if (intervalRef.current) {
+                clearInterval(intervalRef.current);
+            }
         };
-    });
+    }, [isLoading, isStopped]);
 
     const reset = () => {
         setIsLoading(false);
-        setResetCount(resetCount + 1);
+        setResetCount(prev => prev + 1);
         setTimeSpend(0);
         setIsStopped(false);
     };
diff --git a/packages/request-manager/e2e/identities-stress.ts b/packages/request-manager/e2e/identities-stress.ts
index e8d2bc647e5..5f1289c8c53 100644
--- a/packages/request-manager/e2e/identities-stress.ts
+++ b/packages/request-manager/e2e/identities-stress.ts
@@ -1,4 +1,5 @@
 import path from 'path';
+
 import { createInterceptor, TorController } from '../src';
 import { torRunner } from './torRunner';
 
@@ -55,8 +56,8 @@ const intervalBetweenRequests = 1000 * 20;
         identities.push(`Basic ${identity}`);
     }
 
-    const makeRequests = async (identities: any) => {
-        const promises: Promise<Response>[] = identities.map((identity: string) => {
+    const makeRequests = async (identities2: any) => {
+        const promises: Promise<Response>[] = identities2.map((identity: string) => {
             console.log('identity', identity);
 
             return fetch(testGetUrlHttps, {
diff --git a/packages/request-manager/e2e/interceptor.test.ts b/packages/request-manager/e2e/interceptor.test.ts
index c77b9c9bb98..dd12649c141 100644
--- a/packages/request-manager/e2e/interceptor.test.ts
+++ b/packages/request-manager/e2e/interceptor.test.ts
@@ -6,7 +6,7 @@ import { TorController, createInterceptor } from '../src';
 import { torRunner } from './torRunner';
 import { TorIdentities } from '../src/torIdentities';
 
-const host = '127.0.0.1';
+const hostIp = '127.0.0.1';
 const port = 38835;
 const controlPort = 35527;
 const processId = process.pid;
@@ -29,7 +29,7 @@ describe('Interceptor', () => {
     let torController: TorController;
     let torIdentities: TorIdentities;
 
-    const torSettings = { running: true, host, port, snowflakeBinaryPath };
+    const torSettings = { running: true, host: hostIp, port, snowflakeBinaryPath };
 
     const INTERCEPTOR = {
         handler: () => {},
@@ -37,11 +37,11 @@ describe('Interceptor', () => {
     };
 
     beforeAll(async () => {
-        // Callback in in createInterceptor should return true in order for the request to use Tor.
+        // Callback in createInterceptor should return true in order for the request to use Tor.
         torIdentities = createInterceptor(INTERCEPTOR).torIdentities;
         // Starting Tor controller to make sure that Tor is running.
         torController = new TorController({
-            host,
+            host: hostIp,
             port,
             controlPort,
             torDataDir,
diff --git a/packages/request-manager/eslint.config.mjs b/packages/request-manager/eslint.config.mjs
new file mode 100644
index 00000000000..ef851c90a97
--- /dev/null
+++ b/packages/request-manager/eslint.config.mjs
@@ -0,0 +1,11 @@
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        files: ['**/e2e/**/*'],
+        rules: {
+            'no-console': 'off', // used in e2e tests
+        },
+    },
+];
diff --git a/packages/request-manager/package.json b/packages/request-manager/package.json
index 37d4f21411b..f4ec89d00f9 100644
--- a/packages/request-manager/package.json
+++ b/packages/request-manager/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index.ts",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:e2e": "yarn g:jest --runInBand -c ../../jest.config.base.js",
         "type-check": "yarn g:tsc --build tsconfig.json",
         "test:stress": "ts-node  -O '{\"module\": \"commonjs\"}' ./e2e/identities-stress.ts"
@@ -14,9 +13,10 @@
     "dependencies": {
         "@trezor/node-utils": "workspace:^",
         "@trezor/utils": "workspace:*",
-        "socks-proxy-agent": "6.1.1"
+        "socks-proxy-agent": "8.0.4"
     },
     "devDependencies": {
+        "@trezor/eslint": "workspace:*",
         "ts-node": "^10.9.1",
         "ws": "^8.18.0"
     }
diff --git a/packages/request-manager/src/httpPool.ts b/packages/request-manager/src/httpPool.ts
index 7bf2450b825..fd678cc7756 100644
--- a/packages/request-manager/src/httpPool.ts
+++ b/packages/request-manager/src/httpPool.ts
@@ -1,4 +1,5 @@
 import http from 'http';
+
 import { InterceptorOptions } from './types';
 
 export const createRequestPool = (interceptorOptions: InterceptorOptions) => {
diff --git a/packages/request-manager/src/interceptor.ts b/packages/request-manager/src/interceptor.ts
index 00af5aef024..63afdabd7d5 100644
--- a/packages/request-manager/src/interceptor.ts
+++ b/packages/request-manager/src/interceptor.ts
@@ -2,7 +2,9 @@ import net from 'net';
 import http from 'http';
 import https from 'https';
 import tls from 'tls';
+
 import { getWeakRandomId } from '@trezor/utils';
+
 import { TorIdentities } from './torIdentities';
 import { InterceptorOptions } from './types';
 import { createRequestPool } from './httpPool';
diff --git a/packages/request-manager/src/torControlPort.ts b/packages/request-manager/src/torControlPort.ts
index 0803129aedb..134e8e40455 100644
--- a/packages/request-manager/src/torControlPort.ts
+++ b/packages/request-manager/src/torControlPort.ts
@@ -3,7 +3,9 @@ import fs from 'fs';
 import crypto from 'crypto';
 import util from 'util';
 import path from 'path';
+
 import { promiseAllSequence } from '@trezor/utils';
+
 import { TorConnectionOptions, TorCommandResponse } from './types';
 
 const readFile = util.promisify(fs.readFile);
@@ -67,7 +69,7 @@ export class TorControlPort {
                     let cookieString;
                     try {
                         cookieString = await getCookieString(this.options.torDataDir);
-                    } catch (error) {
+                    } catch {
                         reject(new Error('TOR control port control_auth_cookie cannot be read'));
                     }
                     const serverNonce = authchallengeResponse[2];
@@ -117,7 +119,7 @@ export class TorControlPort {
         }
         try {
             return !!this.write('GETINFO');
-        } catch (error) {
+        } catch {
             return false;
         }
     }
@@ -175,11 +177,11 @@ export class TorControlPort {
                     /^[0-9]+ (LAUNCHED|BUILT|GUARD_WAIT|EXTENDED|FAILED|CLOSED)/.test(line),
                 )
                 .map(line => {
-                    const [id, status, ...values] = line.split(' ');
+                    const [id, status2, ...values] = line.split(' ');
 
                     return {
                         id,
-                        status,
+                        status: status2,
                         // not used for now, left as example:
                         // buildFlags: getValue('BUILD_FLAGS', values),
                         // purpose: getValue('PURPOSE', values),
diff --git a/packages/request-manager/src/torIdentities.ts b/packages/request-manager/src/torIdentities.ts
index d6794f08b4d..0039c36d4a2 100644
--- a/packages/request-manager/src/torIdentities.ts
+++ b/packages/request-manager/src/torIdentities.ts
@@ -1,4 +1,5 @@
 import { SocksProxyAgent } from 'socks-proxy-agent';
+
 import type { TorSettings } from './types';
 
 export class TorIdentities {
@@ -29,13 +30,11 @@ export class TorIdentities {
         const { host, port } = this.getTorSettings();
 
         // TODO clean agents when host/port changes?
-
         if (!this.identities[user]) {
-            this.identities[user] = new SocksProxyAgent({
-                hostname: host,
-                port,
-                userId: user,
-                password: password || user,
+            const socksServerUrl = new URL(`socks://${host}:${port}`);
+            socksServerUrl.username = user;
+            socksServerUrl.password = password;
+            this.identities[user] = new SocksProxyAgent(socksServerUrl, {
                 timeout,
             });
         }
diff --git a/packages/request-manager/tsconfig.json b/packages/request-manager/tsconfig.json
index dca48f8097d..27750a8ccf5 100644
--- a/packages/request-manager/tsconfig.json
+++ b/packages/request-manager/tsconfig.json
@@ -7,6 +7,7 @@
     "include": ["."],
     "references": [
         { "path": "../node-utils" },
-        { "path": "../utils" }
+        { "path": "../utils" },
+        { "path": "../eslint" }
     ]
 }
diff --git a/packages/schema-utils/.eslintrc.js b/packages/schema-utils/.eslintrc.js
deleted file mode 100644
index 7e4917ac7e6..00000000000
--- a/packages/schema-utils/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
-    rules: {
-        'no-console': 'warn',
-        'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
-    },
-    ignorePatterns: ['**/__snapshots__/**'],
-};
diff --git a/packages/schema-utils/eslint.config.mjs b/packages/schema-utils/eslint.config.mjs
new file mode 100644
index 00000000000..9e581420940
--- /dev/null
+++ b/packages/schema-utils/eslint.config.mjs
@@ -0,0 +1,13 @@
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        ignores: ['**/__snapshots__/**/*'],
+    },
+    {
+        rules: {
+            'no-console': 'warn',
+        },
+    },
+];
diff --git a/packages/schema-utils/package.json b/packages/schema-utils/package.json
index c6d1b201844..d319d9a6e88 100644
--- a/packages/schema-utils/package.json
+++ b/packages/schema-utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@trezor/schema-utils",
-    "version": "1.2.1",
+    "version": "1.2.2-beta.1",
     "license": "See LICENSE.md in repo root",
     "sideEffects": false,
     "main": "src/index.ts",
@@ -13,7 +13,6 @@
     ],
     "scripts": {
         "test:unit": "yarn g:jest",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "build:lib": "yarn g:rimraf ./lib && yarn g:tsc --build tsconfig.lib.json && ../../scripts/replace-imports.sh ./lib",
@@ -23,6 +22,7 @@
     },
     "devDependencies": {
         "@sinclair/typebox-codegen": "^0.10.4",
+        "@trezor/eslint": "workspace:*",
         "ts-node": "^10.9.2",
         "tsx": "^4.16.3"
     },
diff --git a/packages/schema-utils/src/codegen.ts b/packages/schema-utils/src/codegen.ts
index f9c17715d33..6a390d6de18 100644
--- a/packages/schema-utils/src/codegen.ts
+++ b/packages/schema-utils/src/codegen.ts
@@ -1,3 +1,4 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 import * as Codegen from '@sinclair/typebox-codegen/typescript';
 import fs from 'fs';
 
diff --git a/packages/schema-utils/src/index.ts b/packages/schema-utils/src/index.ts
index 589e4e45918..64fd196a1d0 100644
--- a/packages/schema-utils/src/index.ts
+++ b/packages/schema-utils/src/index.ts
@@ -121,4 +121,4 @@ export function AssertWeak<T extends TSchema>(
 
 export const Type = new CustomTypeBuilder();
 export { Optional, CloneType };
-export type { Static, TObject, TSchema };
+export type * from '@sinclair/typebox';
diff --git a/packages/schema-utils/tsconfig.json b/packages/schema-utils/tsconfig.json
index c7ebe855e21..d836e07709c 100644
--- a/packages/schema-utils/tsconfig.json
+++ b/packages/schema-utils/tsconfig.json
@@ -1,5 +1,5 @@
 {
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
-    "references": []
+    "references": [{ "path": "../eslint" }]
 }
diff --git a/packages/schema-utils/tsconfig.lib.json b/packages/schema-utils/tsconfig.lib.json
index 81f5735adfc..3528a06e0f9 100644
--- a/packages/schema-utils/tsconfig.lib.json
+++ b/packages/schema-utils/tsconfig.lib.json
@@ -4,5 +4,9 @@
         "outDir": "lib"
     },
     "include": ["./src"],
-    "references": []
+    "references": [
+        {
+            "path": "../eslint"
+        }
+    ]
 }
diff --git a/packages/styles/package.json b/packages/styles/package.json
index 35eb020c6b0..1a64426f9de 100644
--- a/packages/styles/package.json
+++ b/packages/styles/package.json
@@ -8,7 +8,6 @@
     "scripts": {
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js"
     },
     "dependencies": {
diff --git a/packages/suite-analytics/package.json b/packages/suite-analytics/package.json
index f459c5a72a8..d17691893e0 100644
--- a/packages/suite-analytics/package.json
+++ b/packages/suite-analytics/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/packages/suite-analytics/src/constants.ts b/packages/suite-analytics/src/constants.ts
index 6a01143ae6d..1b88cb281eb 100644
--- a/packages/suite-analytics/src/constants.ts
+++ b/packages/suite-analytics/src/constants.ts
@@ -5,7 +5,6 @@ export enum AppUpdateEventStatus {
     InstallAndRestart = 'install-and-restart',
     InstallOnQuit = 'install-on-quit',
     Closed = 'closed',
-    // eslint-disable-next-line @typescript-eslint/no-shadow
     Error = 'error',
 }
 
@@ -17,6 +16,8 @@ export enum EventType {
 
     AppUriHandler = 'app/uri-handler',
 
+    DashboardActions = 'dashboard/actions',
+
     DeviceConnect = 'device-connect',
     DeviceDisconnect = 'device-disconnect',
     DeviceUpdateFirmware = 'device-update-firmware',
@@ -45,10 +46,10 @@ export enum EventType {
 
     CoinmarketConfirmTrade = 'trade/confirm-trade',
 
+    MenuGuide = 'menu/guide',
     MenuNotificationsToggle = 'menu/notifications/toggle',
     MenuToggleDiscreet = 'menu/toggle-discreet',
 
-    MenuGuide = 'menu/guide',
     GuideHeaderNavigation = 'guide/header/navigation',
     GuideNodeNavigation = 'guide/node/navigation',
     GuideFeedbackNavigation = 'guide/feedback/navigation',
diff --git a/packages/suite-analytics/src/types/events.ts b/packages/suite-analytics/src/types/events.ts
index 1df0488d33b..ef2d2bae379 100644
--- a/packages/suite-analytics/src/types/events.ts
+++ b/packages/suite-analytics/src/types/events.ts
@@ -52,6 +52,12 @@ export type SuiteAnalyticsEvent =
               isAmountPresent: boolean;
           };
       }
+    | {
+          type: EventType.DashboardActions;
+          payload: {
+              type: string;
+          };
+      }
     | {
           type: EventType.DeviceConnect;
           payload: {
diff --git a/packages/suite-build/configs/base.webpack.config.ts b/packages/suite-build/configs/base.webpack.config.ts
index d66451a8db9..30ad065ce8c 100644
--- a/packages/suite-build/configs/base.webpack.config.ts
+++ b/packages/suite-build/configs/base.webpack.config.ts
@@ -134,7 +134,7 @@ const config: webpack.Configuration = {
             },
             // Workers
             {
-                test: /\/workers\/[^\/]+\/index\.ts$/,
+                test: /\/workers\/[^/]+\/index\.ts$/,
                 use: [
                     {
                         loader: 'worker-loader',
diff --git a/packages/suite-build/configs/desktop.webpack.config.ts b/packages/suite-build/configs/desktop.webpack.config.ts
index b249c022a97..db7bd8fb2cf 100644
--- a/packages/suite-build/configs/desktop.webpack.config.ts
+++ b/packages/suite-build/configs/desktop.webpack.config.ts
@@ -17,7 +17,7 @@ const baseDirUI = getPathForProject('desktop-ui');
 const baseDir = getPathForProject('desktop');
 
 const config: webpack.Configuration = {
-    target: 'browserslist:Chrome >= 128', // Electron 32 is running on chromium 128
+    target: 'browserslist:Chrome >= 130', // Electron 33 is running on chromium 130
     entry: [path.join(baseDirUI, 'src', 'index.tsx')],
     output: {
         path: path.join(baseDir, 'build'),
diff --git a/packages/suite-build/eslint.config.mjs b/packages/suite-build/eslint.config.mjs
new file mode 100644
index 00000000000..e4553dfa266
--- /dev/null
+++ b/packages/suite-build/eslint.config.mjs
@@ -0,0 +1,22 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'no-console': 'off',
+            'import/no-default-export': 'off',
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/webpack/**',
+                        '**/builds/**',
+                        '**/configs/**',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/suite-build/package.json b/packages/suite-build/package.json
index 9ce7577117c..29308fc8de7 100644
--- a/packages/suite-build/package.json
+++ b/packages/suite-build/package.json
@@ -17,7 +17,6 @@
         "desktop": "PROJECT=desktop yarn run base",
         "dev:desktop": "yarn run desktop",
         "build:desktop": "NODE_ENV=production yarn run desktop",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "type-check": "yarn g:tsc --build tsconfig.json",
         "type-check:watch": "yarn type-check -- --watch"
     },
@@ -35,7 +34,7 @@
         "stream-browserify": "^3.0.0",
         "style-loader": "^3.3.4",
         "terser-webpack-plugin": "^5.3.9",
-        "webpack": "^5.94.0",
+        "webpack": "^5.96.1",
         "webpack-bundle-analyzer": "^4.10.1",
         "webpack-merge": "^6.0.1",
         "webpack-nano": "^1.1.1",
@@ -45,6 +44,7 @@
     "devDependencies": {
         "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
         "@sentry/webpack-plugin": "^2.14.0",
+        "@trezor/eslint": "workspace:*",
         "@types/copy-webpack-plugin": "^10.1.0",
         "@types/webpack-bundle-analyzer": "^4.7.0",
         "@types/webpack-plugin-serve": "^1.4.6",
diff --git a/packages/suite-build/tsconfig.json b/packages/suite-build/tsconfig.json
index ec831118d03..c049babcf11 100644
--- a/packages/suite-build/tsconfig.json
+++ b/packages/suite-build/tsconfig.json
@@ -6,6 +6,7 @@
         {
             "path": "../../suite-common/suite-config"
         },
-        { "path": "../suite" }
+        { "path": "../suite" },
+        { "path": "../eslint" }
     ]
 }
diff --git a/packages/suite-build/webpack.config.ts b/packages/suite-build/webpack.config.ts
index ce550c90975..78a7e619491 100644
--- a/packages/suite-build/webpack.config.ts
+++ b/packages/suite-build/webpack.config.ts
@@ -2,7 +2,6 @@ import { merge } from 'webpack-merge';
 
 // Env utils
 import { project, isDev } from './utils/env';
-
 // Configs
 import base from './configs/base.webpack.config';
 import dev from './configs/dev.webpack.config';
diff --git a/packages/suite-data/eslint.config.mjs b/packages/suite-data/eslint.config.mjs
new file mode 100644
index 00000000000..554dd66742e
--- /dev/null
+++ b/packages/suite-data/eslint.config.mjs
@@ -0,0 +1,23 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        ignores: ['files/**/*'],
+    },
+    {
+        rules: {
+            'no-console': 'off',
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/postcss.config.js',
+                        '**/src/**', // Todo: reconsider, this whole package is probably just "dev"
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/suite-data/files/images/favicons/trayLin.png b/packages/suite-data/files/images/favicons/trayLin.png
new file mode 100644
index 00000000000..249eaab702e
Binary files /dev/null and b/packages/suite-data/files/images/favicons/trayLin.png differ
diff --git a/packages/suite-data/files/images/favicons/trayMacTemplate.png b/packages/suite-data/files/images/favicons/trayMacTemplate.png
new file mode 100644
index 00000000000..9acc597d16a
Binary files /dev/null and b/packages/suite-data/files/images/favicons/trayMacTemplate.png differ
diff --git a/packages/suite-data/files/images/favicons/trayMacTemplate@2x.png b/packages/suite-data/files/images/favicons/trayMacTemplate@2x.png
new file mode 100644
index 00000000000..907a493aeaf
Binary files /dev/null and b/packages/suite-data/files/images/favicons/trayMacTemplate@2x.png differ
diff --git a/packages/suite-data/files/images/favicons/trayWin.ico b/packages/suite-data/files/images/favicons/trayWin.ico
new file mode 100644
index 00000000000..c53747140c5
Binary files /dev/null and b/packages/suite-data/files/images/favicons/trayWin.ico differ
diff --git a/packages/suite-data/files/images/homescreens/COLOR_520x380/green_t3w1.jpg b/packages/suite-data/files/images/homescreens/COLOR_520x380/green_t3w1.jpg
new file mode 100644
index 00000000000..af27950d07f
Binary files /dev/null and b/packages/suite-data/files/images/homescreens/COLOR_520x380/green_t3w1.jpg differ
diff --git a/packages/suite-data/files/images/homescreens/COLOR_520x380/orange_t3w1.jpg b/packages/suite-data/files/images/homescreens/COLOR_520x380/orange_t3w1.jpg
new file mode 100644
index 00000000000..021f180b03e
Binary files /dev/null and b/packages/suite-data/files/images/homescreens/COLOR_520x380/orange_t3w1.jpg differ
diff --git a/packages/suite-data/files/images/png/dont-disconnect-trezor-t3w1.png b/packages/suite-data/files/images/png/dont-disconnect-trezor-t3w1.png
new file mode 100644
index 00000000000..0ca0f862340
Binary files /dev/null and b/packages/suite-data/files/images/png/dont-disconnect-trezor-t3w1.png differ
diff --git a/packages/suite-data/files/images/png/dont-disconnect-trezor-t3w1@2x.png b/packages/suite-data/files/images/png/dont-disconnect-trezor-t3w1@2x.png
new file mode 100644
index 00000000000..8faa862198b
Binary files /dev/null and b/packages/suite-data/files/images/png/dont-disconnect-trezor-t3w1@2x.png differ
diff --git a/packages/suite-data/files/images/png/trezor-t3w1-ghost.png b/packages/suite-data/files/images/png/trezor-t3w1-ghost.png
new file mode 100644
index 00000000000..71fb7869942
Binary files /dev/null and b/packages/suite-data/files/images/png/trezor-t3w1-ghost.png differ
diff --git a/packages/suite-data/files/images/png/trezor-t3w1-ghost@2x.png b/packages/suite-data/files/images/png/trezor-t3w1-ghost@2x.png
new file mode 100644
index 00000000000..90b85f15f77
Binary files /dev/null and b/packages/suite-data/files/images/png/trezor-t3w1-ghost@2x.png differ
diff --git a/packages/suite-data/files/images/png/trezor-t3w1-large.png b/packages/suite-data/files/images/png/trezor-t3w1-large.png
new file mode 100644
index 00000000000..fff86d2da2f
Binary files /dev/null and b/packages/suite-data/files/images/png/trezor-t3w1-large.png differ
diff --git a/packages/suite-data/files/images/png/trezor-t3w1-large@2x.png b/packages/suite-data/files/images/png/trezor-t3w1-large@2x.png
new file mode 100644
index 00000000000..efb91cbfa06
Binary files /dev/null and b/packages/suite-data/files/images/png/trezor-t3w1-large@2x.png differ
diff --git a/packages/suite-data/files/images/png/trezor-t3w1.png b/packages/suite-data/files/images/png/trezor-t3w1.png
new file mode 100644
index 00000000000..ccaaf4c3c20
Binary files /dev/null and b/packages/suite-data/files/images/png/trezor-t3w1.png differ
diff --git a/packages/suite-data/files/images/png/trezor-t3w1@2x.png b/packages/suite-data/files/images/png/trezor-t3w1@2x.png
new file mode 100644
index 00000000000..5f1eab29d7b
Binary files /dev/null and b/packages/suite-data/files/images/png/trezor-t3w1@2x.png differ
diff --git a/packages/suite-data/files/images/svg/device_confirm_trezor_t3w1.svg b/packages/suite-data/files/images/svg/device_confirm_trezor_t3w1.svg
new file mode 100644
index 00000000000..7d2916471aa
--- /dev/null
+++ b/packages/suite-data/files/images/svg/device_confirm_trezor_t3w1.svg
@@ -0,0 +1,11 @@
+<svg width="360" height="280" xmlns="http://www.w3.org/2000/svg" version="1.2">
+ <title>device-confirm-trezor-t2t1-svg</title>
+ <defs>
+  <image xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJgAAADcCAYAAACMC2hbAAAAAXNSR0IB2cksfwAASuJJREFUeJztnQd8G8eV/yn2BhIAQRSCFWDvnWIR1ajee+/NkqxiWbJk2bJlS7blLluW7ThO4rTL+dLvknPK/Z3ESRzm0nvsOLFTfOnJXXLJJXF5/3mzO4vZ3dnFAlwIlER8Pu8DYLFYLHa++3tv3rSUlDgeP/3pT1NeeeU3qT//+X9lvvDCi/nPP/+86yMf/aj3qaeeCj780IXQPffcW3f27B3Nt95ya+epU6cmE5t+882n5p+6+dSKkydPbrzhhuO7jl5/9NDhQ4dPHDhw4NT+ffvP7L1m77lr9lzzIHl+bO/evU8Re3rv3n0fJc+fJM/Pkc++vHPnrm9u3779B9u2bXtpy5YtL2/evPlnmzZtenXTxk2/Js+/37Bhw39vWL/hz+vXrf/runXr/rZ27dp/rFm9+rVVq1a9tmL5iteXLV32+uLFi19ftHDhG/Pnz6c2b948anPnzqXPCxYseGPRokVvLFmy5PVly5a9vmLFitfx+2tWr3mNHO/v5Lj/t379+r8Q+9PGDRv+SH73t8R+Sc7lF1s2b/np1q1bf0zO78Xt27b/YMeOHd/dtXPXt3bv2v31Pbv3fOWaa/aOkv/yRfKfntu3b98niX2AvH4H+c8P4/+/9tr9tx4+fPj40aNHDx0/fuOum266aRO5diuJLbjl1C0zT918y8DpW093nT1zR+vdd9/T8OCD56sfffSxine9690lH/nIR72f+9xz7m9881uFP3rppbyf//zVrF/96jdpv/vd71JffPHFSfGU8yV5AEDKKy+/kvPMJz7Rcf7B8yuPHT123Z4915wnF+/p7Tu2/zu5mM9t3LjpK+vWr//e2rXrXiEF8VtSIP9LCubvWJik0N4cmTkC06ZNg+HhYZgyNARDg8TI8+DgoM4GBgZ01t/fT23y5MkwuW8y9PX1Uevt7VWsp6cnYt1o3dBtYl1dXYbW3aXfX3V8Yvxv9/X2KeeERs9TNnbuWsP/NTgwSK+D1qYMTYEpU6bQ6zV16lSYPn06jIyMwLy5c99E+FcsX/4Pco3/umbNmj+uWbP2v9atXfcTAvz3N27c+HUC+ZdImXyW3IjPkDL6ELH3kvK6ePz4icPvefd7Rl544SUXKdPxARy5GyrOnTt33549e76+cuXK35M7/jX8w3iB+EJmF50vuM7OTmodHR0GJvisvQPa29uptbW2QWtrK7Q0t0BzczM0NjZCQ0MD1NfXQ11dHdTW1kJ1dQ2Ew2EIhUJQVVUFoSrpmVplFVRWVkJlRSV9rqiogIpyycrLy6G8rIxaGVppKZTKViZvw33wO5VoldIx8Jj4W8zwt6urq6GmpoaeD55XfX0dPUc818aGRmhqaqKG/6GlpQVaibWR/4X/kV0Hdq3Q1NevS7cd4afPGugV2LFcJvep4MYbd8aMGbB06dK/EPBePH7D8Y986EMfXvrXv/41OaA9++xn/A8/9PAj27Zt/zMChX+mnRR+W1s7LfRm+aKxAseLixe7CguSFCAWWDAYhJKSEggEAuD3+8Hn80FxcTF4PB5wu93gcrmoeTxF4PV66ec+L9nHU6zsh4avmbH9/D5yPL+PHhcNfyPgR/NLz4GIlaCR80DDc+JBYhBROAkw1eFqCm1NjQSLBEy9BIwMTX2DDE+jHh68GVpbyE1BDLfhZwhZfR1/U1RDOBSOQEpe47XTmXzTKDeGfKNI5ymBjefKAMfjK1A3knNqaqbngOdDQe7skEAlZYnqSWCDM2fOfvnTn/x0J3qpS/b4/Oe/0Hb69OkXRkZm0RNqa2ujfwALBQuMgkBMVXjBEvraH4iAhBA5nU4oKCgAh8NBLT8/H/Ly88hzHuTlSZabmwvZOTmQlZVFLTMzk1pWpvSabUfLzs5WDL+HRo9Dj5mv/A7+ZmFhIf19hBjPpaioSIaUA5UAyYOnqJZckLxCMdgoWI0SVHiz4fVB5WVK093doyhJb2+fzpXy77Umudc+GgZQk1WId7nMa+DvSOrVy1kPOQfiBYgQIPAIHJ4/glpWVk7/J/4PBA7PdZCEKvv37//Txz/+8U3f+973Eg/Xvz/zzBAJMH+PfwIvHJ5gCSoRAQgLSlvgoveZ3HvRPnRbVqZwuxVDuHIIkCrA8kwAI8YAY4rIA4Y3igIYUTUGmKJqGhfI1EtxeZy7k1xZNy1sFTza9zrgtOCZg2i2H/ttPkZl8A0RV9lGzhX/H/4H6Ybohp07d/7l6af/ZefXvva1tITB9fyXvlRJai0/w7sE4cILihcbC8cQhijAmW3jt/PvM1XbxICh4plBhoDxkEmAiSELyCqMkDG3Wcm5TaZiWsDQ/SmAtfGAdUmVDEFFwKqSqcHR7GsAq1XD30ZVbG2VyhjPG7cfPHDwNx94/wf6EgLXK6+8kvrII4+8B2steLFYvICFJlImERxG6ib6XLS/GlzxPryLzBFAZgQY7yYVwIgxwAKBiJss06hYmFOxutpIAM/HXnhDMhXjA3CjAmbqoq0Ji+GxqmbmUInccR9xw7W1ksvEmiuJyT738ssv269iTz311II1a9f+lblFvKA5XFwkcm/RVIgpkNYd8t/NNIHVyHg3yQMmgqywIAIYGgJGYzEZMh9RMeYmRbEYrTVWSSpWw6tYPadizS2qWIxC1mkAWY+24I1h0ME3JjNyxb20ptpEbhQ8bwz8n3zyyVm2wvWh978/7djRY08ODAzSC4UXt8BRIFQqs9grKytTvJ/AzUWDSQesRtEiKqaOxxAuK8G+KBbjAcOA2IqK8bGYomJywE8Bw4Cfg0oXm1m1Hv67fZaOJapkiKyHGKZy8Nzxhjh6/fUfu3jxYqptgN1x9mzFmjVr/gt/AO9QLBC1CpmDIFmmAoEIHqvbeJBEn2ldpZmbNAIMzSjYV2IxlYphjbJKF4spNUouFmOQsVisuyuiYvrAv8c0nlKpX4/+s7hhFRwTbyL8b6hiK1as+M2pU6e8tgF25LojQ/PmznsDE5t4wbM1MZCpxeI2DWIyo++ogM1SP2shMwv2GWBmKuYX1CiVgJ+pGAIWZipWG4nFGptMapQCV9mjL2ShK9WaGSSqVAUHsAGg2rgMbxS8uTDXOW3atNf37t07ZBtg27Zt3Y6ZXgTMUeCwpFp8/KTeZqxWeheZBUaqZ/UYWsgYYAwyo2CfQoaAEdOlLLQ1Si5loatRyrEYS2ryrlKsYnLtkoEgUCYxiAK1E1QijCoWZiqJ54E3BP5/TKRjHm7L5i37bANs2bJlD+LFwLsPC8aoRmimNEb7GQHCVwaU/TLQMlTKqK8UmNcqTVWsUMqJmcViomC/ko/FNE1DmKGPlhfr1jTr9PZwoAnVRQyJETwqYHn1M3CHIqXEGwH/P547viZu8k7bAJs1a9YzrN0PCyharsqs1me43SzuMon1RK5VrWJ6wHjI4gn2GWSlBnkxBTDWPGOQ3de6SlFuzGrMFQFJo4Q6NVKDq2+rFJ8D3gD437FGjOc8Z86cJ20DbOrUqV/E9iq8MDnZOTHX8MSuTwyJkVmK90xcphYwo4BfUjECmMsdQ3afaz7SqJgS7AtUTHGVHZ2qtIVKubQQiJRGBIpWBQ0A69X2ABG42R4OMDx/PO/hKVP+1TbAhoeHR9lFySEFlaW4IT5FwOW1TOKiqPEUVxmwXJGIApdZwK8DTA72aXYf82KqNkrWkC52lZFGcTnYr67RxWIMMnbDtmNujOXFRD0gdDGYOVxK7ZGvHAhA1YLHH0tdMWC9YHpUgA0NDT1jO2BoEmDGtUglfSHITfHfM4Qsy9iNjhUylhPLyTXO7qObtJwXM8juG3XTETUh6QJ+HWBiBTI28X68C9UB3NPLfZerHKgAiygYnretgE2ZMiUCGCmg6IVrnO/KyBDUNE1zYOLMfiRuk+Bhx43mJq2omBgwVDGpRumVs/usiw8fi1WYtFGKkq+8iokgY6plpFJCmHqiAcmnN/Tf7enWf6e7R1KwpiYJsMHBQRsBGxpSASZKQ9htURVM83lGZoYh7KIapVnzEYOMNR9Zze5TwPi8WCiKigkCfiltoVcyI4uApHetUb/frXnWvjZRsMEBGwEbQsCapTwOD5iV1IMZFJfS6LkaNIQzwLSQOQWQCYN9HrIyLrvPBfy12EGxVlaxenHAb6RiiTE9gMpvCoDTAjZgN2DsYmAt0khtsrLGDoHWlYrM6LOMDLGKZcXYhITtrMauUuo5qwDmlzpVGmb35V6w6i7Tgt4WrcZpC0sqZLNpFZABhucsATZgP2BoWDjGBW/kpqx9bqZ+GVyCNW4FEwCmVbFosVhRUbQ2SpYXk7P7uobwWsNYjKmYtreFoQniLOuVAWvQMtCwtcHn8ysVlIF+GwEjAd0oa+pgtUgRLLjNCCJUnWiAWQWPKRg7ntXjKpBlqSFj3bINYzGasrCeF6M1Sk0TklbFqJvUqJi2e7U0cilOldJ+x+wYFvbFXrg+8j/xpkgIYOxCMBeZYcF9mQGn7CNQN+2xjZRNOr4VlRQncrUKxmf3o3VIZJCpxh8IeloIk6+1nJtkKhaPq+zuUbr88K0AIlCU/bTxVhTYWLqCucjGRknB+if32w8YmigG0xaqsJBNYqpYVEgytXIZPWdqVFOXfBW4SaO8GG2jdBurWECQFxONSIoai8k1Sm1uTAtEtwyX8plRTZAL0lXHiKZa3WrI8Lv4P5lbn2wnYCSgUxQMXYsVoMzdZRQwDI6tPaZ6f+mzDA4+w6DfJG1h1p1HUTG3DBinYsL+YqIBIkJX2ahAFsnwi7v08MolWY/muZsOKDYChlc8IXQGLpk1dkcAm2wjYP39oyx3w4L8DCEERoUfu3qJYOK3sZjOHLoosZigp4XVvJiHdqsu1ve0EKiYEvALMvyqgF/TvVrbpYfBoIVL5zKFIHbrgdPsr8R72nRFNwvyfdDQ2EAB6+vrsw+wfgIY9gRQASZQMSsxl3bfaCpnqGaZGbrjiI5npmJGgJm1U1LAXPrBIWYjkFRNSCHWf1/tKnkViwT8cvfqjk7NdAUG7lGrUjw0AoXSwseDq0DXIx2rS47BGhokBeu1GzCdgpmoixX3ZtX96fbJzFB9ple2DN13Rb8t6mkxpu48nKukebESrYrpk6+RPmNclx7FVcoBv8BVGs2JoQr4BS7Q6L2hCnKfdckxmAJYb28CAGtsUmIwUaHGm4YQAWQUl/EpClGNVfXdGJTMKC8WLRaL1oSkqFh5ha7nq1bFIq6SUzE5HmNdekSQ8W6N3yYK/iOf9Qhh1WXz6XOv5CK9PqVSYitgJKAbZV1N+EQrHwfFBJFOlfSqFa0CEE1Bo70XuUozyMyz+yadErU1SsVVCtIW3FA3Xe/X9g5ughMDMDQuUgVLtwF8prXRyDYW5DfIrry3x2bA2N2lBsw4yGYKYxYn8XBFi9GMADE6ntHv6lxlpnETktUBItq8mF/QEC4lX7U1yrA4bUEnJonUKkW9X1XpC5Fb5AAzUyu9iWIzOdHq88kq24Tb7QOM1BhUgGVk6hXIiptU9rGoclZdsZWYzEgJzWIxHjAGmVl/MY9ogEhQVjFtp0Sj3hZGI5FowC/XKjsFgPUIIBLWPNUw6T4zUEcGmDQUDxXMRsCIv1UAY1l1cWGbpRWs1/qibTeDJwKxeWUglmDfKBZzck1IHgsDRJROiRVqFdN2r9a6SiVt0aZXMaPAX+v24lEvLXg8YLYqGA8YH+SbqY2Rsgi3ZxrDE9lfnZ1Xu8XId9PT+eNEcc/sXGMagWReo+RVzGgUUqQJSZwXY2kLCTJ9H34KWYc0+ZwYMD0oxipmzVgMVi/DT6C1HzA0PpMfLb6K5vKsBOlRzSQfFs1EShZLf7FYAn5hE5LRHGN1AhVrkWqUongsJli6jN2gmeFv4X9iCtZtO2D0zmpQ9aSIrjrW3KVZHGUIR5xQxQqZlTktItM/qQEzG0upb0KS0xY1+rSF0vtVbkbSQmYKjdaNGu4X2V+0jxqwRsyL2QcYkddR9oeNAIvmKpX3otyVhRgr4gLTbQFLBBgbcGK1RilSMU+Rx1zFWG6szHimRLPGcF081qGem1UMTfQg3mg7i98QMJ8vAhjZ307AukdZw2xWdpYhBJkmaQlx4ardnDDtoDJxID9WwHjQpP5iGshQxfKsZ/d5JTOKxczaKWsN+vDzAT8/FZQ2dcFPBNzF1C0abCYqiPmwTiUGY4B1JVbBdMqSkc4VWrSCtQai1dqn1e+g+hkpoJGrzDFoCDeb10KZY8zi7Dz8tAPKPGN8rbJBnIDlB+5qG8VZasEsaDfaLvoeC/IZ9KSCYS9gdXViwMzSAGbboquVxmIJ/KkRkGSYtFBFgyxqwG/UnUeOxaKOQirRB/xmc74qjeFcM5LSd0xuEBcG/YY5LeO5/rtESkddZAIBIz8wyv6okYJZs1gh0SuQpX3SRVBZ/B2ivvgfc/OIQjld4PL4oDhQCr6ySghUhKGkqgaCoVoIVlVDSWUI/GUV4A0EoYhA5JKnXtcCJrlKr74JSTAdJ99OWWNFxVrbdMPe2NA3BTZu3nzVa86dStuNYzIag3kjgHV0dNoHGDkJIWC88kQrQMk9aRRDu0+MQIk+TxfApT+PdJW7xDxYDgGq0E2ACFZAMFwPZbVNktU1QXldM1TUt0BlQyu1qsY2CDW1Uws3d0B1SyfUtHZRCze1QVmoBgKlZeD1+WXIvFHTFmwxiJCJiomm5VQF/bySdapjMsPVSro46LSQcbCxWiRrNyW/k3jALLs3E7Py/VhrjqJYi8HNx4rZOblQgFCVVkAJgaq0plExBbBaCTAeMh4wLWS1bd1Q194D9R29UEdeh+rI8corSeH4hLGY0dTo6j78Upce3WgkbepCrlniggoMMKumCvS5CgIDTwGsLgGAEbkdZVlmChhTIpWC2Zs+iK5U6arXWqgUoLg4jL3Oys4Bty8I/spqChZasLqBmhYyBlcsKsZD1tDZB43E6lo7oSJco1p5JCjobSGaLVHbVslPosLiMaMpoSzB1cWrnNqdMgXUAdZuI2CdXZ2j7A9mjikGiw6PYU0vU7tP7MfHucLc/hIFKi1cvGmVjIdMpGRaFWOQIWBoTd390Nw9AI0EuopQtbIKispVVkSGuqkms6sW9xuj8Zg8TlEEmS6FwUDq1rtOPj7j0xvsNQb5CBgTGvIbNgLWGQEMFcwOtTIDhHdj+s/08EQ/n0zqCv0kQNeCVRJuMARN5CqNAAs1txurWAdRsa7J1BC0lt5BaGjvJq6zQoGMDdil6w6x6dGVtZHECVipE6h68C7reaHvQxZRJ511cqkJTUzG4jKmYAkHDLPdsYIjdmHytox0HTDRlIgpmBGk/O9l5+aSGKtSrVrVDbaoGBpCxkAzUjHFVcqANfcMUMhaiVXXN0JQsPiW0UARfmS4rmbJDRhRJWJZw3iUuMwohcG7SAYYOX4CFUwT41ip7ZkqVroxZAhgtDxWump7ZP+8QidVLQaMCiiViukhK63Rx2NltebxGAJmFPAzV8lD1to3RK2hrYvOuy+Kx6LVKvkRSaLmpHZBzdIIKm3tklc9BlhNbQ1tjLcVsI72dgmw2jpVLVKlTCZBdTSYRMpmpmr8PkbHK3B5IBCq0ymV2tSKpQ32RUG/Wa2SBwwtuopFIGsm2yuIWxRNoIJz8IfCkfxYnSh1YZLplwCLrPbWGUMNkyVfFcAI5FTBWu0ErKNjlN09fAyWritYizGWxfyW0X7az9XuNhNc3kAUsPSu0dRVotUSyOqboayhhVp5gxyLCSCrbuFUrFWCjAdM5yoJYG2Tp0Abea4MhYXNSGztSNN4rKlJNV26Ln3REYEsmoppDb/LXCT+bltra4IAy+TSFOkG6pNuHndZUS3xftx77XfkfRlcwbA+zhLFXkILESPxjG9KF3iWDoFr20xw7p8LzsPzwXVkATX34QVQtH8eeDfNhJKFU6B8sBeqCFgs6GcqVtMmSFvIgLGAn6kYgyxEVMqoGUkbj5ll+nVK1t6hr112RlbP7ers0rjSbg6wiILhb7baq2DtOgUzB4J7LWy2EQNkrHLmbpKZs9ivgkisTvq4S4KvHgKdbeCZNxkKd49AwbVzwLV5OniWDIJvWg+UdLVDkKhDaSNaC5SSQgsOdEPJgiHwrZ8BxXvnQfGxJRDYPgfKZw1CiBRO1ICfGFMxNASsvX+YPBPIwjXSss7afvxhjYrV1nEr2TYoqYvI8szqPmS6FAaFSg9aJMHapYBHAatmgNmoYCRQHK2ulv4QZt5FcZaoCcbQ3aVncDEbB47gGKL3WtWiMZfbQ0DRx1za4F60zdfbAa41w1C4dza4V0wB72AnlNQ10oqAUQJWFIuVd3dB6YIp4N8zD/yHFkHZyplQ3d1rKeDnXSWFrG+QxmRGKlajgYxf8EG7sojUG1ZusxTkyRS3ycEkvefWBycKhk1e7DdtBqxdCJhZkG01R6UFM1bDY+Q6CkwDem0Qz7YHyJ3uXj1M1cozpw8CpECi5cVEkOlyY60dUDE8GUq2zQX/9UuhcvE0Q8gUwHoirrKdQNYxMBVauvtUKmbkKrXxGOukqA36dY3jGpepi8/k16hiLAZTAGtpsQ8wckKjrMlCVItUAZYuUC0TVeItLS0taiym/Q42+/iwl4MF5YrEYvVQPK2bguVeNkjVyhROhK6+CYKkoILoGomVNrdCGQn6y00SsOGmDqia0g8lBxdDcN9CCE/u00HWxKsYpi44V4mQNbR1qnpcsMEi2iSsUTzWxGX6RT0weDWTcmbqigB7rQBGhKaG/FaLnYBJCiZNZMvHYGb5KaM4zU7D4xYFSoVAGQJW0wBFBCp0h76+DgqbtD+fIyPfbWgC36x+KCZguO/eAK7Hd4DrLTvA+dh28no7FD25GzyP7gDvrWshsHkOlBHFMmpCCpNAv3zNCARuWAahkSm6WiUL+EWuEiEL19RxCVi2CKpmjgs2QpwOGOFGJcmZfl1M1sq5S1QyA7fJ0hoMMDYtOzmenQrWOsr+SJbsInWQCWqU0cDS1jatWeQ7+YUuy+kI6hLrG8G5aTo4SfAeqBMASJTMP70Piq5bAgWPbIH8m5dAzqo+yOqohAy3AzKz5Tn98TkvB7LLvZA30gIF+2aB6/4NUPzwNghunw8VfT3CdsqqWUMQOL4cqhZOg7qOHuNYTKNibb0DJB6rjM1V1jfolExXu9QomSo26+jklK2Tfob92iKA2ahg5GRGw+EogJnAZBSsW9tfvC/25OB7QxipGNsWIHe0c+M0cK+aQuDSu0T/UDcUnVwBBXeuhpyl3ZBR6jb8n2i63q/YZ7+nGpzE7XovbIfgnkVQRWphzFWytEVo6gCUHF0GVctmQr3sKhs7jXNjDLL65jbNTD1V5pDVcZA1RBbiiiiZullJBRgXm4kAw9+xVcEQMNaqT/tvCSExr1VaAS8WKywqtpREpXDVNoBr7TC4SEBfUqtXruJtc6Dw4lbIntsG6USpzM5XBJgyWAS7V+MQt6ZycJ9YAoGHdkDljEGViqGFhwlkJ1ZAeN40rkuPnLboHhBChoF/JYm9VCrGpoOSE7BMXQyVrLFJ1W6pCv41SqZVNJyrTAVYk82AheWJOmgtMiPS5qczwXazdEOsMRc+46S+fM+IaE1CRUsGwbVpuk65Aq0tUHRqFeTftBgyfE7L8CugZYr78dP++3l5UDCtCbzvuAbKN81TAUZ7vk4dhOCJlVAzfUjQjKRWMkXFWtr1CVjNxHYid8lGY4vcJYvJWtFdahWtTQ0bAsY4IMewDzByIqPs5FmaQgsSn2m3UkBjUTC1epln532TO6CABPQIEw9joL0N3Heuh9yd0yA9Jyum348GGD/vq6OuFIovboeyXYt0jeGVS2dA6eGlUNc72SAeG1C7SmLlBCzeVRrGYzWRJKw2RyaMyXjQ2ricGYEMX7cS4xUswYAlplZoyZ2SZ23spVIlTs0CpCZYsJ/ERP0d6n2Ie3CdXQu5aydDepY+pmSGaROWOonmLo0Ao6OQAh7wPLgZynYvhnBrJ4WM9htr74aynfOhcsNcYVsly/DzkNU2tXATqXAN4nLqQqdiDDJtF59GPWSiCgAz3KZSsMZEK5igMC4FaHkFhdFri/Kze8kAjb20NcUiUpPL2zEV0rMzDc89Ld38/5gF/NoFUPNy88BRXwbe81ugYvmIutfFYD8Ej6+AmqEBvaukkEV6XCBgrUTZEC6mYlaUTNcwzkFGA38u669Ws0h8pgPMTgUjPz7KBoVqAUtLMygEoxhtjMbyXugajWIv3B4gF89xYA74W5rVAf3aGeA4uwrS87LHfHNoAVONDhcM2C2Y0gj+x3dDqLdXAQxzYhVrZ0P57oVQR3u/GnRO5FSsKlQt6KAoHlsZUTJ9tl/rLiVTKxmzlhYJsJDcFmqrgiFg0p1hrGCGLm0MxgqePWMOCt0jBUgDl+p9iKjXiiGiYIPquKutFQoe3QoZ5Z4xnZPadYqVLDtbDJlrB4m7blkPYS7gR1dZcuNKlYqpm5HUAX9Da4dqXKUwP0ZX3VW7S3Xgr8/4R2qY+lomvsYheAzepsZG+wBram7SAZao7LwILvY6r8AZgcWk5ugn6oXNQP7mZtW+RUeWQM66ft1xmUtUvdf8/qRJk4BcCqHhZ7iPPh4TQOYqBO9bd0PVrOFIwE+sfANRsS3zlGYkmh8TdOtBFUPg2IgkfrYePWSR9IU6RyaAjOvqwxtTM3zNA9ZoJ2ARBdO7yEtiaVJB0+44FjL2npm9NKmKShYISYD5B7qg8OHNkF6Yp1OjdJ0qicHKyEoHT5kLyltKINxdTp+LSp10O9snNTWVgqZddCs3NzL1gHMRUaxzm1WxWLh/MgROrIBaDjAzV1lGoNLNOaZVsipJyUwDf3mlEW0Nk4eNrRWqABYeh4ClmaiUrsAN9vOUlFvKe7nWTYXi6T0qtfPsngc5GwctuT98jaAwaHILsmHKhh449E/b4P7v3ARP/PIueNtv74a3/uouuO9bN8Kh926FWXuGwFGUpygag0wUj+X73OB9kqjY5L5IsN/WBSVHlkJ4ZAo3GqlX1wMWm5FaJw9BFQnedbP1yKu8CZuTLNQu2dywTQpozdQQLnyP0yEwT9bQYCdgTU2jbHFNBCxaDUtccLG7R94wueqr0KcntLBR97hnFvjbWyKAkW3Ou9ZBZn2Qc316qPj4isFV1hSAGz+2F97y6h0UKDM78/kj0Le8XQeZbu7XvFxwH5wHZdcsVmX5y1ePQPmmucLOiXzqAiGrbWoVznOhTsJWqWMyuTVGn4hVQyZSM3zPAMPjkP1sjMGapBgsFBLVIu1LT5jlnXD4Ga9IvPGAeXvaoHDHTNo8xPb1TemB/LMrId2RqzvnNJN4C+G68KPTepiIgj3563OGoK26dZ7iNo0gc3STysq9WyHUGBksUjWNxFYHl0AtCfzrorjKxo4e9QhxwRSdlZVsgrtIzZLvfcEgE4HGu02cMpMBxgYE19fbCBg5+Kh0J4RpI7MRFEZwmLm9aK6U7ZfrKDSFi733TO0G1+opqs+8K6dD7u7pCkxG54PGXGN2fhbc9pnDOnhOffoAtM5qgBnb++HAu7fAxZdvh7f+Wr3PW/7rTlh+0xzye6kUVrwptVNB5Xmc4Hv7Xqjq6Yl06+nsBv+J5VDT1UsBUyATZPkxR6aa50KeEspsWihdPCbnyKyoGb6mgMkut8FOwJqaGGAhjYKlUTMGy1idIu5IHItpj+WgXaLrdUBpXWXRon4oWtAvB/jytgOLIHtBu1JZUMxEvaZv6ycqpVcn3HbuKzdA18JmqlJ5rlxYdHQm3PONE7p9R3YPyu4yVahimN0vnztMAIuMSPIfWwbhoX7JTUZxlQgXrhmumz2R1iylTL8pZFzjuGENU4ZMAUxRsPpEKJgWMC0s1tylqpDT1FAZHcNZ7NOApXePNMBfNQU8I72cypFtp1ZCVn+N8Pj876ZysdfJf99nGm+hSu1+fC2tReL+gRovHP3gLtU+F1+5Hap7Kujn+BsqyLJzwHVyKZSuGuF6wLZD4NBiqJo5pOtiLXKVAQKVpGL6GXvM4jFttl+VJ1PVMCNqhg3mCmAE0vo6WwFr0AFm5mYkVyd/nhbdLTE1MQINX+NwNF61RHDhNuf6YeImu1QwOu9YC1lt5brja425Rzz3h390a9SgngX2tZOr6PewFnn9B3aqPr/tc9dRldO5SgKYc99sKCVBvQqwa+ZDxZwpUpZfMMcFS8CiBQhMqimhApKrZFN0GrlKBhiDTJ/118dl+Ox2FynHqEs0YGpTK5hQ0dLEqmEWn1F1k7/n8pUIXaPWZWL+q3i4SxWnFd69HjIbg0KoRIDlFuSYBvFae5hUBFpn1dPv5hPIzv/glOrznY+uUXJkfIN44Y7pENw2X+lmjRbYOQ8q5k5Rde2JQKZ2lwECE3ZjVqaE4tdHQiuTXKUWMu1AXnW2X91pkYGGzzhzI/uurS6SEDzKptumaYo0dewVgUQPmqGbTFerXZqBqiguklMwCliIB4sDbMNUKCaBPr+v8861kNlSZgiW4iIZYM4cJc9l1TDYrxsM0e8vuG6G6rMniDttm90gqSP5HQZZ4Z4RCBIFU/rxE/Pvngfls4dUgNVoapUsy+8nimU20XBkgjtuZJI8k2JknKU68GdTRfFxGTMeMPLePsAIraPspFgTkVL4acZuzaxWaZZkjWTYI59hFt+o9sgrGNYgPSM9qm3uW1ZBVl+1we/oa5CZORnw2M/PxgQYg6x/VQe0z23UfXb2+evBLcdreA1xqvTC44sguHJmZLBIQxv4rl0AFTMGNHNcRFSMgYaA4RSdyrrhBpCVlkbWD+eVTJuI5Se842uXDDJ8ThhgTMHw4LyL1BaQcU3RHDQzY/sVuIvVKYqwPidGu+gsJLXI+ZNVQX7RQVKLnNtqenwpyE9VkqSYsY8VMBr8v3oH3PH8UeFnm+5bBumZ6YqrdN2zHoJErcq5mXq8RxZBxUCveKYeeYQ4zgNbVd+sTDisXdZZNE0nm+/COBHLBf5yMpYP/mtqIoBVVYVwm52AiRXMCDAzF2kWZItSCNLrNNrQrY3BtHDRPNj0bnCtHKJg8V10crYOmyonM5amuPmT18YFmJk9+tMziqtMz82Goid2QVl3Z2RcZUsbeI4thsqOTiXolzonSu89gSCdrDg9I5PWePFcEVa86XFadQ9VMg1ggpqltsu1rnYpCP7REDAWKtkKWL0BYCKV0oLHB/hmCmemLDRuycnVJVlVaibHYTSTv20G+KsjAPqm9kL+6WWQlpcdFWwG2IZzS2wHDO2+b5+EPBLjTSJK5j62RDVwt6y/G4r3zyeuUj1bj7e0gtRQHdA6Ug+b71sOxz68G25+Zj9c9/QOWH16AYS6yqlbx3PHufuZipll+kVKpnOZHGQ4sh8Vs6pK4oC4UXtjMDYBB99NxwgI4xxZdJdoZNgXzId9wcJiyJiC+ZubwEGCZx95Zi7S39oChcQdZVQUR/0dFod1zG9KCGBoq29bAJNSJ0GuvxjKahqVOS4C8wfBt3FEFfQX+YPQu6yNtodiI7v2WFjbfYwo47Xv2gz1Q2F67rg6Catd8kpWGtRn+iNTdgqUTAaMGQLGhKa2psY+wEhAN8poNwJMBVea9RiLVzzRd3i19AQrdHkwHWxEuQo3TYPigQ6VwhUdWkyz+VbOBQvJ6S+Ah1+0lgszs7u/dgJuffaQrjJQ1VFGIEul8/KzOS6Kd82Bkln9ytScbl8JrZE+9rMzln4Lc3dz9g9TeLO1kMlzwSJsuN3NLRqB77GmqU1haJUM92dCU2M/YBEXaTmOisuMlZHVJM1iMbSiOb3gXDWk2uad0QeOBzZAWnamJTeJtv+pTWNXLKI66+9cDA9+/2bV9lOfupZWKtD147QFpa2t4Lp+oTKxXXGwHGbvnUJU686Yfg/3X3pitpRuyc2l7hIrAXQBL1c+lNR6oWl6LVXF7sUt1L0WFOfTc0EocX+WwuCD/xAxlYLZGYORg6kULFZoYoPReF+cKsAwDuPM19os9cevbeBUjNQwT6+BrOmNlt1k07TamBKuRnbhpdMwvKlXahjntmMfM/wdVCr/3H7wbBmhShYk51veXEYrBfH8HtZk2+c10psEuwbV9oVg/R1LiJoeh8fl9MuTvzlH/xvm6B764S1w7Ts3QbDBr8Rx2tFK+OxyupTJiW0FrK5OD5i9CmZeE2WWSWfS4frkm0DmXDsMRbN71eANdIHjwiZI9xRYUjG8q7Gpx464a9dja2HutVOVAka740tHqSum6rx7BEr6u6i7dHqL4diHdo/p98588QhVJozLtL09eHvsZ2fhkZ/cJoH5iztg/qHptBcILvjFT3yHkOGCX4wDW11kbW3NmBQsXsUSWVFJuSUV83a2QsG+2XTCE5X73L8Acg/Msqxik1d02ALYQySeaxyups1GvDtbduNsGjPlNFdCaV0T+MpDxH21W467DF0lUaaR3UP02HeOHjPc75Ef3wYH3rVF1e+NxnHkBqON21zzEg8YiclsdpHlUjOD/YDFZg5XkSXApGajaeBWJV1JLbOJKMS9GyB7dktUwKiLKciGGz66xxbINt27DByefFLgkUTsA9+7GUrqfDSvFaiqgaKADw7/83Zbfg/TGdivLVrKBVMn2y+sVsKB8z88RWIzqWmNr2GyID8BgNWM0mptQhQsNqMju0lBWAEMx0RiLOYjz6rtHW1QeGELZA3VGbaB8irWMrMOLv7k9jEX+EMv3AIBEmRXdZQS5Ygoxp4n1lGYs/Mc0D6nUZiOiMfQ/eHAFDz/aPvieIPj/3qN9J641I13L6XnhEE/a1pSK5iNLpL421GWN6GAjSGfZYdh1x2/EVhVmhrlrF4o3DqddqFWudDhHig8vwmypjWY/paULZ8E2x5eZUuhLzg8nR4Te7zy22vkLj+ocnb8DrOBNV1QXOHWVTC0hh0pZ+4coHEYvr/lPw5AbmEOXWyV5cro6/IEKJgOsCTCRZtGsrKJitXG4CqngmvZIM2RqSAjQb/z/o2QjXNUFOQa/iYWfI4jG+7+6nFbVCzfnUuz+Xyhn/7sIcgh7riyvZTW6uwCbNXp+eS3cqkbjLbvlgdWKDm78z+4BTzlbprqqJQBcxLA2NqWNgNWPW4A41XMKmA+EncVbJ8BRXP79J+1tYDrxHLIO7UUMpvLIJVTZ4SZd5XY5yve1AFv684uojVUdEvKduIWFx6ZQdVyyQ2zaJBuB2A4bgAb2Pm4z8iwVrvqlvn09SMv3QbeqiIKGKoWln8hA4woWDgcthcwNhHteAEsA6cRiEHFvO0tULBnBDwze/SxGnGfxUuGoYC4zNxDcyCjLkAKWg0ac5XLTs6Bt7w6tsLHGiImQ2/6xH7VdqzRYcCPinPjx827bFu1W/7jIK1Jnv7Moaj7XvixlK/jFYz1/MABwwgbUzBbAaseZ4AxZXHI6xFZVrKWJnBcMwvcCydTd6kF1F/fSHteOB/cDPnnVlPXmVEbgDR3PqTlZEEKThGQnkpqXPbEYyLDsQBYc8U+/hfl/NRY7Bxx6wjYiX+7Juq+mKDtWdIKb//d3XDb5w5TV77iprm0Lxs2qnsri+icaH6fH/Ni9sZgrIEUJ+5NCDipEji8ckQzrFGy9knr7rIRCrZNp4lYX4OUI2OgKc9E0bASULR3ATjvXg8FFwhwD2+E3GPzYVJWOmTlZlpShHgMc2MriZtCFzpjx0DMTUVau/87JylgRy0kbvG3sPnoqT/cS903utaDxMWyzzF9gQOLUc29Xq+NClY9NgWLBZpYj5udm6fK7vOgGBpRLwz6HbuJyxzuAn+1HjL+WFhjxYlUfP2dUFhWShupsXeqlbgmHkMl6VvRTuLBVNj56NoxHes8qTBYBQzjQArYH++DtWcW0bjzrq/coNuvaVoNfvZrYt5xAZidQIm25xe6hYD5+ZRFlR6e4v4OqmaFOBKpv10CiduHwqUDrg4c7mJ68UOdZfCgZoCHXfbg90/RnFm+Ow9ufy7+5iqsPSJgSo7LTMFIxaJncSu84/f3wLQtk2maQjRlwtkvXk/jRHINztoKGHWRDLAEqZJZzMWeRWZUqxQpkjbALyKBP/YhK9gyDYqmEUWrqTcEjG3PLSikkHUtarElVhIZVgIwdVHTVxl36uKer5+ggFnpoYvtpP2rOmlNuW4gRBO02Cgu2ndwXTf+/68Sy0oMYJrCHws4scIq/M30dHD7S6O6Sq1C0We0cB14BjugcPM0yL92Nk3Ouuf1QXFXK01z+OsaJPCwcoAutaYOspyFNB4ZWNsVNZEZr2GXIXSVQ6RA42mfvOvLx0g8Nwlu/3x0FXzohVtp3IcVAxx+hwG+0b7Ym5ag8TtirTYAFh5lAznNBq3G6+5YcM8/WwVM+o5kaXKnRK2LFMVXWnXi32Pwj7C5lg9CwY4ZkL9vFuQfmE3BU+zAHMjbO0JqmA6qENO39ycEMLSFR2bSoB/zZ2Y9I0R29gtHaLCOOa6oMP7nDTQPdvyje+iNc+07Nxsfl7hJgsbfiS0ZM2DhcHiUzaRnRy1SC5dZfKWCKS3V0F0yyLBmSZXMBCD+PQ+fCEj6uhID/VrwoYo1NoKvvlFSM7LdWxaCjKxs6i6xq8vjcQx3i2bYJRpdEqZItCPHoxnGb1jrPScI1rV26H3b4PoP7qL9/nHejds+q5/8hYcxRZpmYacNgIVGWV9uUZCfGqd7jKiWCWS8opkoG/sug4zFZBQQHThqwLSwaQFUtlfp3S26V1RNHOmDAGAWPhEq9sB3b6JTFOBcGFbUiNkZomDYzIWxWLR9V9w8l1YKUI0xyfqAydC9W589yADbN2bAQqGQomCGHQ3N4qhUMVy88qj31wAn+L7QRap+N52OpTQCyKymKAJM5Wb57XIMh5BRuDPTYP1di2N2ZVbsHFGNQq+DTt9pZUI8NOwLhu2e933LvC0Su+qM7Bqkk7qUNQdo37VHXzGO+Q6/bzsDbM+YAeMVDAETxUjaQtcWvkixRPtbPaaV12jZefngLQ8bQqN1keLt1qwoIA3kwJhnLYmX7GpP5A2bkLAXrNWetjgWACdluf+75gOJsYvQ4mOzqDvGmwTTFOaT7M1HuN4ktskGwMIqwGJzg+rsvBkUZgqleq+Fl4/NBN/HSfNw8hQrkBiql4lb5Q1/B5uUcJzizotrLIMTi2GPDKv7IuQIZDTAHiW1YOxJgc1CpMhh+ck5hoDhdpwfjez3N2ILxg4YcZF0SiAOMN7FGcFg7ta47QJlE6pkmgA2A9O5VrItJzefdrk2h4tzm3EAie8Li/100jk8333v2EQz5IkAzapVtAWjukhmB96zhdaK+a7dOhhfuR28VR4E7I/EesYMWChURQCLXcFYwQoLP0oMZaRuxipp/TdwOk4taLraY8i6axQZzsiIVX2cG+zge7cmFTDsOm0ph0bixpWn5lH1veEjxk1LWGHIystEwH5OrMwmwIKGgDEV4pXGGizMxWljLHN3yhRUW+uUzkMf9ym/w58D+R8Yn9HesWNwnWaW53RTd4OQWWmqSbZh1h4bs7EigQlaQ5V79xY2xcL3iOWMHbAqCTCMw8wUzMw9igBKSzNWKDPIRDHdWAzTGjn5BSR+CpIKQcgyQKq4TAYQG949pZVQUOSlg2rZXBfOQEHUaTmTbRiv4Yhz2lXIpGVi+rbJrAb5SWKTxgxYlQFgqTpg1KkJbc1RGLBHiaNEUBkqY6p6/3hgw/QGdmbMJcAVFBXTpG1RsByKy6pobdRbEaYQIYjFBCQ3cbU4OR6OdsrKzVNmvuGPySDzVxfTIDrZIBkZpiUw/1XbX2U4AR8G+KHOcgbY28cMFwUsJABMW+CKK4oE46lpevfG1/rMwDNTyPjAEX9PtN0uZRRBFmzw0Z4SyYZJZDj1J7pzdJNGjdxoOBROBuyUPYBVVaoA0wGQGnFr4mYg81yVsj01TZ25j1nlrJh9rjVeyLCKjzWxZAOltXu/cYI2K83dP9VwH0zcEqfIAFthE2BVGsAs5LxMgDAuYGsFH4E5cYqTKFVLoZMBT4LFx0aSDpTWsJt0WkYaHRNptA82gKdEVpprtAWwysrK0ZJgicpFqi96mq4maCWVYBUwUaohEYV/qSyFTpWeCkc/tOuSwWPFsBKC53bM5LxwpiAZLuxJkWcPYBUVo2zRJTFg1go51jjqcgPHqilrITWXxJSVT7RhvozOT/tt46z/kuOzGGC/TLGjBkkBQwWT5/pkMVhqmibO0sJggyu0BKGNx7rkkE2SpjxPRJtlvApWTqA3a4PELkkyYD+0BS41YJEgP5nB8pViKfJMirF0v0mkYU+K81G6Zi88PIMB9hXbAKsSKdiEjdmYq1x1ekHS4bJqy26cwwB73jbAKioqvhSQ5/jk0xTJLqArwbCwcJnmZINj1Tbds4wB9p2EAIY9Wq9WwBKVgJ1EYrG7/tO47W88GbZDyoD9IsWuIJ8A9pwWsOTYlQc1c5PYQzTZ8FixO7+sJFoxTZFvF2AfZ/OtJxewK88YYDiHa7LhsWI4f1hmdgZTsTZ7ACuv+BcKWPDqBoxNb641OwDb9/aNSYfHiuHEKDitkwzYFlsAKy+veJvfL7lIXBcn2QV9qYFKkRfIwmX+cFQPXmCcaQZTDNh2lxJpOokNukmpyvdwlE6y4bFqnfOb2Hk/ahdg5/3yYpeZmVeHgjGwikgNb+rmPjqF5s2fupYO68J573FVjXNfOU6be9bftYROVYm1QdYQbAU09huFvgI6n2qywbFqOJWTDNhniaXZAdgdEcDGi4IlJuBnhY7dVnBNIVzs3UqmHfe59xs30qH+vUvbaLfjFI2q8cZ/lqiFtxJlOM+FvPQhdpkuHzNgpaVlJ3G24fEFWGLgwgEPuBAWTi8+lkLAjPheElfh8n3oStlalCojaofTNNkxLeelNFzDyUlUl/yHfxBbO2bAykrLDjLAcD2bZIOQKLgQAlwfyNa+Wr+UhpnhVJY7HlkNCw7PoNNkImA4g80DUYaTjVfDmXfkG+W9KWPNh5WVlW1DwLAmifN0JhuGRBheLJyf1O6G58dJtX7jvcvoMjK41HKBJ5/GarP2DCVkHotLZTsurOYTrs4xKljpCq9XAqygoCDpMCRCvbBmiIG73QWBwOIQMJwiHOfAxxjt3m/emHRAxmq4sBZ2nCR4vEZs6pgACwZLp+OagggYri+YbCASARi6r2QX2mVlv76L9meTVezCmAAjsVc3AewNBMzj8SQdCLvhcpUU2rL46NVm8vwUaK+kjCVdQWKwSuIif4WpCozFrqSGbrxAuD5QsgvrcrSbntlP+/DLkA3HDVhVqMpRXFz8BQbYldInbJKcSV964+ykF9blaLigF46hlAF7Mm7AfN5AGnGN72VrQF8p7ZEs4Xm5JTrHjZE4DFsxZMBeJFYcF2ClpaUpBLCzuPYzAoZLiyQbDltMVjBcMCrphXWZGk7NKQ/ExaTrmrhVjAC2g9ibCFh+fn7y4YhZrcTbEbD+1Z0JmZHwajBMw2DCWFaxfyKWHhdgJPYacrvdf0LAcKndRLuuSwUcXhhcT/GRBM11fzXY9odXMcB+S6w6LsBKSkryXS7Xd3w+KQ4bDzVJqe3QhmMQ23L/8qQX1OVqOKdFRqQT4v64AMMHAezdLA7LyclJOmB2GV4YXEv71KcP0JVfk11gl5vhNete1MIA+zKx1LgAwzgMM/m4nBsuTplsMOxUwhS579fet21I+pSXl6Pte8dGdh3fIFYfF2DETfqcTuc/MBdGM/pJdpOTmGljNoOA3iy2U3qupk6ik7BhH3kcQo990OlURhPKZmoPfPdmOnGdrGJ3xqtgKYWFzu9iPgwhu7TpCjEcPDRji8c0nQEnpdCFqEobA1T+F10/kzZW73liPRx8z1a6niKz/e/cDNe8dQOFEgNebNfEyX+Pf2QPXRED57Q3G45/pdicfcMMsJdS4h1xRFzkaXSTCNh4T1fEDJwMq6jn6VgMl8UbWN1Fpz56EDsyXqFqeOJje+mqIinS/PnxTW9O1KuBxF9/QcCS0rPCwP1FhS1a6mNS5JmlMLQjh5TnVP12M2Og4feCDX66Esh4mlXHLsO+b/WDYfZ//zUuwAJ+fyaJw0axNomQZYyjQSBW82fa/VgcpwMqlUuFCMBW9udeq4ETw4fuGHu14kRvl1t36WiGYYQM2F+JlcQFWVFR0Tany0kBww6IiUiMsgIa0zGExzXO6sc67lEHYgyqxpQNuwotPzk37gVHx5vh6ChcpVeG7K64APP5Ai6ns/AvGOyj2aEw1gtVPk40+CzCKXSBfMVBcz7WIeLONcq+FLRAIa1IYIx2uVcIpm9Vpjn/ATF3XJARN3mRBft2Jl31BWgNVBEcUb83yRgYMRTR91GU08A9GrlNuUDoQF5cTg/7Wl2uffZxrld52B7mxOLL7BMJm04g+zsqWJHbvrZJviCMwDACzEz9TGGdpP7cCDijY1lxh7EYgoYLguJs1Lvfsg4u/Ph00qGJxaRgX2kAH0VcYgbM4ykmlcnCL2LCFSGLdbwkC45512fm2iZpoTAEzbqaqeESx14id2ymRHYb9hgtbQrAQuI+sVv320zmrx9Phi0iMmCvE1sWl4qRAP86omJvopvEpiOzAo0FvGjbIoWvTimoQDU5npHqqYJ1dnzN72hd66U0XIeyqNRFu8dM2dBDa6E4nQHOLYZTGjz+i/HjUtG9e8pdDLJvE8uMGbBib3Glw1HwM0xZoIl6WBglO6PBqC5oI8Cswyh6rTe9m1a/FtUcDeKwSwQdrq6SkZVBk7llROlwIMb9JkshX0rjeruibY5XxS643S7weX2Qn5enKyxTuCZZAzGaCpltUwAwBcsYjlSTuOxSmFBpTfbHwszMyaRrh9/7reSOv0RVDdQU8wN0gzEDRmKwBgLZ31HBiorcygofOiUxUxlD12UhfTEpApIISl4Jjdxj1EK2mG4Yb1bRGoQj79+RVMjW3LaAn5fjiZgBC4fDkwhgn8Jert5ir6WUhVkNUQeIQMVEwKlgNAHBELBU8b4R0FPpPvEAmixLkdtBt19I3qBi7IyIrlsGDJdgjn0UOAn0R0iQ/xrWJl1OpyU3xwrOHDQrcZOxstgLguZYlxFkuGzNylvmJQ2yA+/aAvI0A2hfS4k1+RoIBHKIin1TlLLQwsWDpS4svUKIITN2V4lQFlH8dTmpGA/Z1vMrkwZZz9I2BhgmX29JiXVGHpfLtYEoGQWMT1nwoFhVGitqpSrwJKUNrMJ5qb9rBBn2bzv4ni2JhemXUnsk5uxwjjXsiIjtrLgofbDexyD7HbH2mAAr9noKCgoLXmUqxkZ/W7loVrar4yGRu02GmVdIxpulyKvu2rl0DQ5bw6nNscPl0hOzYWh9DzTPqIVQVzntrBms90NFW5DOJ8YNb0N7d0yA4YMo1ynsZYE1SuyMSP9YVMhiSx3oX1spWDsKf/wDZAUwtM4FTWOCChvjz3zxeph3YBrUTq6CQp8DUtOlmuK0rZPh+g/shFufPQR3PH8UTvzbNVArg0WnP48sZorz7Mc2xI24yRoC2a9QxdAw8cpAENb2JiwuG4tqM8iw63esYOHkx/i9yrZS2ihfQ+DCBeJxPtuh9d1UtQ7+01Zl/9OfOUT7vbHf7V3eDofft42fBn1GTIARqFILCzHx6qYqlpebJ7w4sVwgw7yWDRf7ajQGGE7DbnXKKnSDOM4A3aujKI9OM3rmC0fg5DP7oITEVThGAeMunI0bpxLA7+AEddjXrWG4Gg7/83aqXuvOLqKfnSXq5wt58DyeS4m1CYmo2ACpUf6PlHgtSshdOB4y6pfO7E/BMMjW3L4wKlw4aKW6twKy87Jg8dERqmK4/cEfnKJTgbIFJG74yB6iZv3wxC/vhEd+fBvNfWHMdeFHpymgCBRrwkIXO7JrEM/h/4iFYgLM7/enEcA+ThOvJNjHSYOvzIK/fI0BhgqDI55EYGFjNXZ/RveHawBgLZANSkaAsO/9hruX0AEsOLQPg/jjJN7CWuTg2i7agZIBde07N9HOlOzY2y+sosDJS9LEvu43cZELSCz2JqoYpi7iuxAT4FwKyHY8skYH10PEdU5e2QG+sAeO/MsOOi++EuD/5hwN5OcdmKpsw/lnEUJ8jUP3MD47QgJ9fI9jDvpI7MWU77bPHoYCrwO2PriSrZIS38LyRMW+hSqGwT6On2RNMcnPWU3UKHnA6ofCqpm1MYYK91TQoB1jNOxZiyua0FiMqBPGUThjNrpC3Ia5LkxH4DPGZe6gky5aKu1/J1G5pXS4HlNFrHXi8Q+8ZwsbGBKbi2QPp7NwG7E3UMW0M1PzfzQ24C7/gh0vhm3GKfKKJjiHP1WXzx2GUGcZbLhrCe2Vimq18MhMyY0SV3jd09thxo4BpSs3bl943QxYc2YhXHz5duhe3ELjrsfkkVIYzM/YOUA/w/fr71xMe+pihaFzQTObxyI7LsCIejkLChw/kVSsiM6KGDtQ1mwiDovNsCzQs2AyHN+vIwWP8RL2vuBXfUPXiCPV8TXGYHP2D8P5H55SPr/pE/tpagLd3+7H10JBcT7dxj5HV4o1SHx9z9dP0AlmGkmtcvP9y9lsPEvigiuiYs6DGIOhijkcjgRcrAmw4jH0KDSNlCcNL2uaXktdJaYd+GRq/6pOeOiFW6mrW3HTXGlUOtckhAtLHHzvVgpnPlHC5TfNUT4/SVwrpiiY++2Y10jVa/WtC2iTFfndt6eMdYUQUot0k2D/v1ksxhKvY4cm2U1El6+harHyIID9kRTT7zHYRvenSk98+QZYcbPUA2P9uSVw+tlDqs+PfnAXdXPoLrsWttBUBtYu2eeDa7th9jVTqGtFdcPeFOUtJZArwfVJYp4xwcUezsLCW10uF/tDcV8YbQx3VbQKJOAmwiY8Vrsnr3EWnJPlLcG/nf+BeuAv9rxYcfNcurbSxnuWqj7DtZyqSKyGMRt20cZ1NDHAZ58jaDgVVk1fJWy+bznkOXNZpQLnrPgwsSJb4MIHgauRqNiv8a7BDL81FZuwRFhEvTBkyf8DcZVVpIgqiYK9MryxF+7+6nHFPS4+NkK/g+kIzHPxgO28uAZ6lrSSeG0T7dC4WTM75P3fPkkrDynqSWCw7fERYg7b4MKHz+dLL3QWPsZUDBfTMroAl6bjoF02Hs/J3PDao3phWRD1etLpcuFMhDhpLy7J9ypm5nEaAwTqJhKPHXj3Flqb5OF522/vpvOnbXtwJV2mEFMW2mQt5r6aI6uxof2a2MqUeEYWWXkUFbl7iYr9gamYqHtyLDZ+uuhcPobXjMVeRL1eczgKajXFhDHRw8T+G2uDc/YOw+3PXUdjLH4qg7f/7h7i8nJomyQ2NT2hmQ3ywe+fgrVnF7EhaxjjPUDMmxCw2MPv96U6nYUfRLjwD2bnJLb5aML0lkOuOade7yU3vKgGh9uqZCh+QWp9b5Y2+GmwjrXFM1+4ntYq15xeADd+bC+Nte775kmamthwbim0zmqgqYgUabbpx4ghxPHN1xrrg4CFKvYaAuaU++0n+6JfLYbXmt3cDofjfwlgky0UGboz7E6DcdMXiP00BRVpUsr/pWemv5aRnfF6aloqDuL4E7FXiX01RUo9rEuJN3k61gcB6zOKiiW4EXzCIpaTHVEvUpN/n7PQmRVj0eFKagFivcTmpkjx1KoUaRbDwRRJ9RITX8XycLtccwlkVMXYLNXJvvhXg7EKFlGvPxP1mpNsDhL2IME+zo74BaZitBF8HBTAlWzoKfBa4+h7ol4fI9c+/nUdL4cH+bMLSMBPazTxd+WZMCuGHgKvsaxebxKbmezyT/jD6/WSGqXzP11uSbZxDGWyC+JKNaZecs3xc8ku+0v2cBe5VxDIXkcVY2MoJ8xeQ/XCa+spour1DwLYwmSX+yV7FHuLC8ld9XmMxRCyzMyMpBfIlWboGRAuueb4FQJYTrLL/ZI+iHSvwyk4J1QsMYaxF15b7CZFAFuU7PK+5A+/P5BL7q5RvMMkFZuIxewyvJZ4TeXY6zsEsuTnqJLx8Af8q3EKTrwYrFt1sgvncjdWc5TV6zUCWHzzo14Jj+ra6nQS8H8b7zSMxybyYmM3vIZMvfLy858tIPFHsss5qQ+v17uRqZjDMaFiYzWMZ2X1+psjP39de3tsk9hccY+y0rJcckG+NRGLjd0k9VJqjv+vuLj46oy9+Me0adOwO886l0uKGyZqlPEZy3vhNSRx15sFBY65yS7bcfMIhULp5G77OsuLZU2oWMyGWXvW/EbU69mmpqaxjdi50h6kRrmMAPYaU7GJWMy6adTrb1dFm2Osj/LyMgdRsU8pKpadNQGZRWPqRfNeeXnPFBYUZiS7PMflo7S0dD4B7C8IGUr9xAik6IY3IasgEfV6nVhnsstx3D7KysrSiav8N5YXw1EwE5CZW3Z2jlQ5chYiYO8najYRe5k9KisrOzyeor8jYAgam9NiwvSGNx+7GQlc/0OsO9nlN+4fpPaTUhIIPC3JvpuOBp+IxcSGCs8qReQ6PUGeJ2IvK4+Kioo2j8fzZxaLTSRf9cZiL0m98n47EXvF8PB63ZPKykofczoV+Z+IxTSG1wSvDXYSIOp1MWWsM9VcbY/amppyr9f7N74hfMJVSoZzTOA1kQdy/MmRnx9Idnldlg/iKs9IF1K6UycCfsnwWshdnN4kgJ1Odjldto/a2uqqQMD/EoNsIm0xCbIys4DVsAlcP8l35Bcnu5wu20d3d2hSVVXVUXK3voEXFWtLV3vAj9eAxaXEdvv9/mQX0+X9aG5u9gSDJUp3nqs5bYFxKKtZEzV/gTxfXQM5EvVoaGzYyqZ+wot7NfZ8ZQ3asnq9fkVPAXCpH+0dzZkVFeXfYDVKXAPpaovFcNpxFibk5eY+Q0KFSzMt0tXyaGxsmEXijf91ua4+FcObCf+zHNjjBCatyS6PK+4xPDwlIxwOv5XVKDHIZfO8X+mWl5fLJ1UfJ6BNJFUT8ejs7GwsKSn5Bbubr4bkawa5ifC/4kKv+Xl5f3A4HBNJ1cQ9SlMaGhrOYCM4XvQrPfmKN4+jwEHVC0doE8BuTHYJXPGPoaEhZ0VFxS+4mOSKDfgxsKfqJfWz/44jP78k2df/qnj09PSs8/l8r7nJxccCwIK40iBD9++S/x+JN/9MALt6R2hf6seihQvT+3p7L7J+6GjYL/1KgQzhYgqNrtHhyD9P3OREWuJSPlavXp3e29Pz4WKP500GGbpLbEpC0C6X4F9ZIoecM8aT+B/Y/yEx5hsFDsdHyc2TnuzrfVU+Fi9a7CM1y6dIzfLv7I7HZ7zrsWEcVQ2BQ8PCG6tZPU6mxWOh4TniuWLahf8PuGIwsYeJchUk+zpf1Y8Vy5fnDg4MbgiHwn9gdz5vWFiX0jDTHsv+tHWCO1e5OehXnqKi/UVu98TQ//HymDt3bklPd/ep6nD4R16v9x+s3ZIWmlNQ6IX2Q0WfC7WfWYPO7XL/o7i4+OVgMHhdaTDoTvb1nHgIHjjPxeDgYD5xm4Mtzc3X1dXVPV5VWfW+8rKyp6mVl9PnstJSycpkk9+zz0pLI9tL+ffcd6XtQe6ZWDDIbZO2B7ltynflbfi6orz8yXAotL+qqqo9HA5flVMt/X+J8ngupTtAOAAAAABJRU5ErkJggg==" id="img1" height="220" width="152"/>
+ </defs>
+ <g>
+  <title>Layer 1</title>
+  <use y="39" x="112" href="#img1" id="Layer 1"/>
+  <text transform="matrix(8.99959 0 0 6.64956 -1287.93 -516.313)" stroke="#000" font-weight="bold" xml:space="preserve" text-anchor="start" font-family="'Alegreya'" font-size="24" id="svg_1" y="102.17221" x="157.99986" stroke-width="0" fill="#ff0a0a">7</text>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/packages/suite-data/files/images/svg/early-access-disable.svg b/packages/suite-data/files/images/svg/early-access-disable.svg
deleted file mode 100644
index 301d81441ab..00000000000
--- a/packages/suite-data/files/images/svg/early-access-disable.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle opacity="0.1" cx="32" cy="32" r="32" fill="#764EEA"/>
-<circle cx="32" cy="32" r="31" stroke="#531EEB" stroke-width="2"/>
-<path d="M33.3404 37.935L30.9383 44.455C30.8676 44.6469 30.7397 44.8125 30.5719 44.9295C30.4041 45.0465 30.2045 45.1093 29.9999 45.1093C29.7954 45.1093 29.5958 45.0465 29.428 44.9295C29.2602 44.8125 29.1323 44.6469 29.0616 44.455L26.6595 37.935C26.6095 37.7992 26.5306 37.6759 26.4283 37.5736C26.3259 37.4713 26.2026 37.3924 26.0669 37.3423L19.5469 34.9402C19.3549 34.8695 19.1893 34.7416 19.0723 34.5739C18.9553 34.4061 18.8926 34.2064 18.8926 34.0019C18.8926 33.7973 18.9553 33.5977 19.0723 33.4299C19.1893 33.2621 19.3549 33.1343 19.5469 33.0635L26.0669 30.6614C26.2026 30.6114 26.3259 30.5325 26.4283 30.4302C26.5306 30.3279 26.6095 30.2046 26.6595 30.0688L29.0616 23.5488C29.1323 23.3569 29.2602 23.1913 29.428 23.0743C29.5958 22.9573 29.7954 22.8945 29.9999 22.8945C30.2045 22.8945 30.4041 22.9573 30.5719 23.0743C30.7397 23.1913 30.8676 23.3569 30.9383 23.5488L33.3404 30.0688C33.3904 30.2046 33.4693 30.3279 33.5716 30.4302C33.6739 30.5325 33.7972 30.6114 33.933 30.6614L40.453 33.0635C40.6449 33.1343 40.8106 33.2621 40.9276 33.4299C41.0446 33.5977 41.1073 33.7973 41.1073 34.0019C41.1073 34.2064 41.0446 34.4061 40.9276 34.5739C40.8106 34.7416 40.6449 34.8695 40.453 34.9402L33.933 37.3423C33.7972 37.3924 33.6739 37.4713 33.5716 37.5736C33.4693 37.6759 33.3904 37.7992 33.3404 37.935V37.935Z" stroke="#531EEB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M38 18V24" stroke="#531EEB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M41 21H35" stroke="#531EEB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M44 25V29" stroke="#531EEB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M46 27H42" stroke="#531EEB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M54 10L10 54" stroke="#531EEB" stroke-width="2"/>
-</svg>
diff --git a/packages/suite-data/files/images/svg/early-access.svg b/packages/suite-data/files/images/svg/early-access.svg
deleted file mode 100644
index 4930936c1f9..00000000000
--- a/packages/suite-data/files/images/svg/early-access.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle opacity="0.1" cx="32" cy="32" r="32" fill="#764EEA"/>
-<path d="M33.3404 37.935L30.9383 44.455C30.8676 44.6469 30.7397 44.8125 30.5719 44.9295C30.4041 45.0465 30.2045 45.1093 29.9999 45.1093C29.7954 45.1093 29.5958 45.0465 29.428 44.9295C29.2602 44.8125 29.1323 44.6469 29.0616 44.455L26.6595 37.935C26.6095 37.7992 26.5306 37.6759 26.4283 37.5736C26.3259 37.4713 26.2026 37.3924 26.0669 37.3423L19.5469 34.9402C19.3549 34.8695 19.1893 34.7416 19.0723 34.5739C18.9553 34.4061 18.8926 34.2064 18.8926 34.0019C18.8926 33.7973 18.9553 33.5977 19.0723 33.4299C19.1893 33.2621 19.3549 33.1343 19.5469 33.0635L26.0669 30.6614C26.2026 30.6114 26.3259 30.5325 26.4283 30.4302C26.5306 30.3279 26.6095 30.2046 26.6595 30.0688L29.0616 23.5488C29.1323 23.3569 29.2602 23.1913 29.428 23.0743C29.5958 22.9573 29.7954 22.8945 29.9999 22.8945C30.2045 22.8945 30.4041 22.9573 30.5719 23.0743C30.7397 23.1913 30.8676 23.3569 30.9383 23.5488L33.3404 30.0688C33.3904 30.2046 33.4693 30.3279 33.5716 30.4302C33.6739 30.5325 33.7972 30.6114 33.933 30.6614L40.453 33.0635C40.6449 33.1343 40.8106 33.2621 40.9276 33.4299C41.0446 33.5977 41.1073 33.7973 41.1073 34.0019C41.1073 34.2064 41.0446 34.4061 40.9276 34.5739C40.8106 34.7416 40.6449 34.8695 40.453 34.9402L33.933 37.3423C33.7972 37.3924 33.6739 37.4713 33.5716 37.5736C33.4693 37.6759 33.3904 37.7992 33.3404 37.935V37.935Z" stroke="#531EEB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M38 18V24" stroke="#531EEB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M41 21H35" stroke="#531EEB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M44 25V29" stroke="#531EEB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M46 27H42" stroke="#531EEB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/packages/suite-data/files/images/svg/gains-graph.svg b/packages/suite-data/files/images/svg/gains-graph.svg
new file mode 100644
index 00000000000..21db6d03fdd
--- /dev/null
+++ b/packages/suite-data/files/images/svg/gains-graph.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 390 87">
+  <path stroke="#D6D6D6" d="M0 82h390"/>
+  <path fill="#D9D9D9" d="M124.5 79h1v8h-1z"/>
+  <path stroke="#00854D" stroke-width="1.5" d="M125 82c132.352 0 244.835-5.985 261-79"/>
+  <path fill="url(#prefix__a)" d="M386 3c-16.165 73.015-128.648 79-261 79h261z" opacity=".2"/>
+  <path fill="#00854D" d="M388.5 5h-6l3-5z"/>
+  <defs>
+    <linearGradient id="prefix__a" x1="255.5" x2="255.5" y1="3" y2="82" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#00854D"/>
+      <stop offset="1" stop-color="#00854D" stop-opacity="0"/>
+    </linearGradient>
+  </defs>
+</svg>
diff --git a/packages/suite-data/files/translations/cs.json b/packages/suite-data/files/translations/cs.json
index 1bb3169712b..f0804f7b413 100644
--- a/packages/suite-data/files/translations/cs.json
+++ b/packages/suite-data/files/translations/cs.json
@@ -1,5 +1,6 @@
 {
   "AMOUNT": "Částka",
+  "AMOUNT_EXCEEDS_MAX": "Částka překračuje maximální povolenou hodnotu {maxAmount}.",
   "AMOUNT_IS_BELOW_DUST": "Částka musí být alespoň {dust}",
   "AMOUNT_IS_LESS_THAN_RESERVE": "Účet příjemce musí mít minimální rezervu {reserve} XRP, aby bylo možné provést aktivaci",
   "AMOUNT_IS_MORE_THAN_RESERVE": "Částka je vyšší než požadovaná nevyužitá rezerva ({reserve} XRP)",
@@ -168,6 +169,7 @@
   "TOAST_PIN_CHANGED": "PIN kód byl změněn",
   "TOAST_QR_INCORRECT_ADDRESS": "QR kód obsahuje neplatnou adresu pro tento účet",
   "TOAST_QR_INCORRECT_COIN_SCHEME_PROTOCOL": "QR kód je pro účet {coin}",
+  "TOAST_QR_UNKNOWN_SCHEME_PROTOCOL": "Neznámé schéma protokolu: „{scheme}“. Zkuste to znovu nebo zadejte adresu ručně.",
   "TOAST_RAW_TX_SENT": "Transakce odeslána. TXID: {txid}",
   "TOAST_SETTINGS_APPLIED": "Nastavení bylo změněno",
   "TOAST_SIGN_MESSAGE_ERROR": "Chyba při podepisování zprávy: {error}",
@@ -193,7 +195,6 @@
   "TR_404_GO_TO_DASHBOARD": "Přejít na hlavní panel",
   "TR_404_TITLE": "Chyba 404: Odkaz nenalezen",
   "TR_7D_CHANGE": "7d změna",
-  "TR_ABORT": "Zrušit",
   "TR_ACCESS_HIDDEN_WALLET": "Otevřít passphrase peněženku",
   "TR_ACCESS_STANDARD_WALLET": "Otevřít standardní peněženku",
   "TR_ACCOUNT_DETAILS_HEADER": "Podrobnosti účtu",
@@ -232,10 +233,16 @@
   "TR_ACCOUNT_TYPE_BIP86_DESC": "Taproot je nový typ adresy, který zlepšuje soukromí a efektivitu sítě. Některé služby zatím nemusí adresy Taproot podporovat.",
   "TR_ACCOUNT_TYPE_BIP86_NAME": "Taproot",
   "TR_ACCOUNT_TYPE_BIP86_TECH": "BIP86, P2TR, Bech32m",
+  "TR_ACCOUNT_TYPE_CARDANO_DESC": "Současná a nejrozšířenější metoda generování a správy adres Cardano zajišťuje interoperabilitu, zabezpečení a podporu pro všechny typy tokenů.",
   "TR_ACCOUNT_TYPE_COINJOIN": "Coinjoin",
+  "TR_ACCOUNT_TYPE_DEFAULT": "Výchozí",
   "TR_ACCOUNT_TYPE_IMPORTED": "Importováno",
   "TR_ACCOUNT_TYPE_LEDGER": "Ledger",
+  "TR_ACCOUNT_TYPE_LEDGER_DESC": "Účty Ledger jsou kompatibilní s derivačními cestami Ledger Live, což umožňuje snadnou migraci z Ledger do Trezoru.",
   "TR_ACCOUNT_TYPE_LEGACY": "Legacy",
+  "TR_ACCOUNT_TYPE_LEGACY_DESC": "Legacy účty jsou kompatibilní s derivačními cestami Ledger Legacy, což umožňuje snadnou migraci z Ledger do Trezoru.",
+  "TR_ACCOUNT_TYPE_NORMAL_EVM_DESC": "Současná a nejrozšířenější metoda generování a správy adres {value} zajišťuje interoperabilitu, zabezpečení a podporu pro všechny typy tokenů.",
+  "TR_ACCOUNT_TYPE_NORMAL_SOLANA_DESC": "Současná a nejrozšířenější metoda generování a správy adres Solana zajišťuje interoperabilitu, zabezpečení a podporu pro tokeny SOL a SPL.",
   "TR_ACCOUNT_TYPE_NO_CAPABILITY": "Není podporováno.",
   "TR_ACCOUNT_TYPE_NO_SUPPORT": "Tento typ účtu není podporován u vašeho modelu Trezoru.",
   "TR_ACCOUNT_TYPE_SEGWIT": "Legacy SegWit",
@@ -249,10 +256,12 @@
   "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_TECH": "BIP44, Base58",
   "TR_ACCOUNT_TYPE_TAPROOT": "Taproot",
   "TR_ACCOUNT_TYPE_UPDATE_REQUIRED": "Aktualizujte firmware zařízení, pokud chcete aktivovat tento typ účtu.",
+  "TR_ACCOUNT_TYPE_XRP_DESC": "XRP je digitální měna, která umožňuje rychlé a levné přeshraniční platby bez nutnosti spoléhat se na tradiční těžbu, kdy využívá jednotnou účetní knihu k rychlému potvrzení transakcí.",
   "TR_ACQUIRE_DEVICE": "Použít Trezor tady",
   "TR_ACQUIRE_DEVICE_TITLE": "Je spuštěna další relace",
   "TR_ACTIVATED_COINS": "Aktivované kryptoměny",
   "TR_ACTIVE": "aktivní",
+  "TR_ADD": "Přidat",
   "TR_ADDRESSES": "Adresa",
   "TR_ADDRESSES_CHANGE": "Změnit adresy",
   "TR_ADDRESSES_FRESH": "Nové adresy",
@@ -262,7 +271,7 @@
   "TR_ADDRESS_MODAL_CLIPBOARD": "Kopírovat adresu",
   "TR_ADDRESS_MODAL_TITLE": "Adresa příjemce {networkName}",
   "TR_ADDRESS_MODAL_TITLE_EXCHANGE": "Adresa příjemce {networkCurrencyName} v síti {networkName}",
-  "TR_ADDRESS_PHISHING_WARNING": "Abyste zabránili phishingovým útokům, ověřte adresu v Trezoru. {claim}",
+  "TR_ADDRESS_PHISHING_WARNING": "Abyste zabránili phishingovým útokům, ověřte adresu příjemce v Trezoru. {claim}",
   "TR_ADD_ACCOUNT": "Přidat účet",
   "TR_ADD_HIDDEN_WALLET": "Passphrase peněženka",
   "TR_ADD_NETWORK_ACCOUNT": "Přidat účet {network}",
@@ -289,7 +298,9 @@
   "TR_ALLOW_ANALYTICS": "Využití údajů",
   "TR_ALLOW_ANALYTICS_DESCRIPTION": "Veškeré údaje se uchovávají přísně anonymně. Využívají se pouze ke zlepšení ekosystému Trezoru.",
   "TR_ALLOW_AUTOMATIC_SUITE_UPDATES": "Automatické aktualizace aplikace Trezor Suite",
-  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Aplikace Trezor Suite automaticky stáhne nejnovější verzi na pozadí a nainstaluje ji při restartování aplikace. Díky tomu budete mít vždy aktuální verzi s nejnovějšími funkcemi a bezpečnostními opravami. Aktualizace probíhají bez vašeho zásahu.",
+  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Automaticky stáhnout nejnovější verzi aplikace Trezor Suite na pozadí a nainstalovat ji při restartování aplikace. Díky tomu budete mít vždy aktuální verzi s nejnovějšími funkcemi a bezpečnostními opravami. Aktualizace probíhají bez vašeho zásahu.",
+  "TR_ALL_NETWORKS": "Všechny sítě ({networkCount})",
+  "TR_ALL_NETWORKS_TOOLTIP": "Zobrazit tokeny ze všech {networkCount} sítí. Filtrovat podle nejoblíbenějších sítí.",
   "TR_ALL_TRANSACTIONS": "Transakce",
   "TR_AMOUNT_SENT": "Odeslaná částka",
   "TR_AMOUNT_TOO_BIG_FOR_COINJOIN": "Nevhodné pro coinjoin – příliš vysoká částka",
@@ -348,20 +359,20 @@
   "TR_BEFORE_ANY_FURTHER_ACTIONS": "Je to sice nepravděpodobné, ale může se stát, že budete potřebovat zálohu peněženky v případě problému s aktualizací firmwaru.",
   "TR_BIP_SIG_FORMAT": "Trezor",
   "TR_BITCOIN_ONLY_UNAVAILABLE": "Před přechodem na {bitcoinOnly} je třeba aktualizovat firmware na nejnovější verzi.",
-  "TR_BREAKING_ANONYMITY_CHECKBOX": "Chápu, že porušuji svou anonymitu",
+  "TR_BREAKING_ANONYMITY_CHECKBOX": "Chápu, že ohrožuji svou anonymitu.",
   "TR_BRIDGE": "Trezor Bridge",
   "TR_BRIDGE_DEV_MODE_START": "Spouštění Trezor Bridge na portu 21324",
   "TR_BRIDGE_DEV_MODE_STOP": "Spouštění Trezor Bridge na výchozím portu",
   "TR_BRIDGE_GO_TO_WALLET_DESCRIPTION": "Jste si jistí? Zařízení můžete v daném okamžiku používat pouze v jedné aplikaci. Pokud zrovna používáte zařízení Trezor v jiné aplikaci, ukončete nejprve tuto relaci.",
   "TR_BRIDGE_NEEDED_DESCRIPTION": "Váš prohlížeč není podporován. Nejlepší možností je stáhnout si do počítače aplikaci Trezor Suite a spustit ji na pozadí nebo použít podporovaný prohlížeč založený na platformě Chromium, který je kompatibilní s rozhraním WebUSB.",
   "TR_BRIDGE_REQUESTED_DESCRIPTION": "Další aplikace požaduje připojení aplikace Trezor Suite k zařízení Trezor. Nechte aplikaci Trezor Suite spuštěnou na pozadí a zkuste akci provést znovu v druhé aplikaci.",
+  "TR_BRIDGE_TIP_AUTOSTART": "Tip: Povolte funkci automatického spuštění, aby aplikace Bridge vždy běžela na pozadí.",
   "TR_BTC_UNITS": "Bitcoinové jednotky",
   "TR_BUG": "Chyba",
   "TR_BUMP_FEE": "Urychlit transakci",
+  "TR_BUMP_FEE_DISABLED_TOOLTIP": "K urychlení transakcí zvyšte poplatek u nejstarší (podle nonce) nevyřízené transakce ve frontě. Transakce musí být potvrzeny v pořadí. <a>Zjistit více</a>",
   "TR_BUY": "Koupit",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "Transakce na účtu",
   "TR_BUY_BUY": "Koupit",
-  "TR_BUY_BUY_AGAIN": "Koupit znovu",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Potvrzeno na Trezoru",
   "TR_BUY_DETAIL_ERROR_BUTTON": "Zpět na účet",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "Otevřít stránku podpory poskytovatele",
@@ -386,12 +397,12 @@
   "TR_BUY_MODAL_FOR_YOUR_SAFETY": "Koupit {cryptocurrency} přes {provider}",
   "TR_BUY_MODAL_LEGAL_HEADER": "Právní ustanovení",
   "TR_BUY_MODAL_SECURITY_HEADER": "Bezpečnost je u Trezoru na prvním místě",
-  "TR_BUY_MODAL_TERMS_1": "Přišli jste si koupit kryptoměnu. Pokud jste byli na tuto stránku přesměrováni z jiného důvodu, obraťte se nejprve na podporu {provider}.",
-  "TR_BUY_MODAL_TERMS_2": "Tuto funkci používáte k nákupu finančních prostředků, které budou zaslány na účet pod vaší přímou osobní kontrolou.",
-  "TR_BUY_MODAL_TERMS_3": "Berete na vědomí, že kryptoměnové transakce jsou nevratné a nelze je vrátit. Podvodné nebo náhodné ztráty tak mohou být nenávratné.",
-  "TR_BUY_MODAL_TERMS_4": "Berete na vědomí, že Invity tuto službu neposkytuje. Služba se řídí podmínkami společnosti {provider}.",
-  "TR_BUY_MODAL_TERMS_5": "Tuto funkci nepoužíváte k hazardním hrám, podvodům ani k jakémukoli jinému jednání v rozporu s podmínkami služby Invity nebo poskytovatele nebo v rozporu s platnými předpisy.",
-  "TR_BUY_MODAL_TERMS_6": "Chápete, že kryptoměny jsou nově vznikajícím finančním nástrojem a že právní předpisy se mohou v různých zemích lišit. To vás může vystavit vyššímu riziku podvodu, krádeže nebo nestability trhu.",
+  "TR_BUY_MODAL_TERMS_1": "Chci si koupit kryptoměnu. Pokud mě aplikace na tuto stránku přesměruje z jiného důvodu, obrátím se nejprve na podporu {provider}.",
+  "TR_BUY_MODAL_TERMS_2": "Tuto funkci používám k nákupu kryptoměn, které budou zaslány na můj vlastní účet.",
+  "TR_BUY_MODAL_TERMS_3": "Rozumím, že transakce s kryptoměnami jsou konečné a nelze je vrátit. Ztráty způsobené podvodem nebo chybami mohou být nevratné.",
+  "TR_BUY_MODAL_TERMS_4": "Beru vědomí, že Invity tuto službu neposkytuje. Řídí se smluvními podmínkami společnosti {provider}.",
+  "TR_BUY_MODAL_TERMS_5": "Tuto funkci nepoužívám k hazardním hrám, podvodům ani k jakékoli jiné činnosti v rozporu s podmínkami služby Invity nebo poskytovatele nebo v rozporu s platnými zákony.",
+  "TR_BUY_MODAL_TERMS_6": "Chápu, že kryptoměny jsou nově vznikajícím finančním nástrojem a že právní předpisy se mohou v různých oblastech lišit. To může zvýšit riziko podvodu, krádeže nebo nestability trhu.",
   "TR_BUY_MODAL_VERIFIED_PARTNERS_HEADER": "Ověření partneři Invity",
   "TR_BUY_NETWORK": "Koupit {network}",
   "TR_BUY_NOT_TRANSACTIONS": "Zatím žádné transakce.",
@@ -406,12 +417,10 @@
   "TR_BUY_STATUS_PENDING": "Čeká na vyřízení",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "Čeká na vyřízení",
   "TR_BUY_STATUS_SUCCESS": "Schváleno",
-  "TR_BUY_TRANS_ID": "Trans. ID:",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "Maximum je {maximum}",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "Maximum je {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "Minimum je {minimum}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "Minimum je {minimum} {currency}",
-  "TR_BUY_VIEW_DETAILS": "Zobrazit podrobnosti",
   "TR_BYTES": "bajty",
   "TR_CAMERA_NOT_RECOGNIZED": "Kamera nebyla rozpoznána.",
   "TR_CAMERA_PERMISSION_DENIED": "Oprávnění pro přístup ke kameře bylo zamítnuto.",
@@ -430,12 +439,12 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Částka v Trezoru",
   "TR_CHAINED_TXS": "Řetězové transakce",
   "TR_CHANGELOG": "Changelog",
-  "TR_CHANGELOG_ON_GITHUB": "Changelog na GitHubu",
   "TR_CHANGE_ADDRESS_TOOLTIP": "Tato adresa vznikla při předchozí transakci jako adresa zpět na peněženku.",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "Typ firmwaru můžete kdykoli změnit v nastavení.",
   "TR_CHANGE_HOMESCREEN": "Změnit domovskou obrazovku",
   "TR_CHANGE_PIN": "Změnit PIN",
   "TR_CHANGE_WIPE_CODE": "Změnit kód pro vymazání",
+  "TR_CHECKED_BALANCES_ON": "Zůstatky zkontrolovány",
   "TR_CHECKING_YOUR_DEVICE": "Kontrola vašeho zařízení",
   "TR_CHECKSUM_CONVERSION_INFO": "Převedeno na kontrolní součet. <a>Zjistit více</a>",
   "TR_CHECK_DEVICE_ORIGIN_DESCRIPTION": "Ověříme integritu vašeho Trezoru, zkontrolujeme jeho bezpečnost a potvrdíme pravost čipu.",
@@ -447,8 +456,7 @@
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "Proveďte simulované zkušební obnovení peněženky za účelem ověření zálohy peněženky.",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "Zde zadejte slova ze zálohy peněženky v pořadí, jak jsou zobrazena na zařízení. V rámci dalšího bezpečnostního opatření můžete být požádáni o zadání několika slov, která nejsou součástí zálohy peněženky.",
   "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "Pomocí dvou tlačítek zadejte zálohu peněženky. Ochráníte tak své citlivé údaje mimo nedůvěryhodný nebo nezabezpečený počítač nebo webový prohlížeč.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "Zadejte zálohu peněženky pomocí dotykového displeje. Tím se vyhnete vystavení svých citlivých informací potenciálně nezabezpečenému počítači nebo webovému prohlížeči.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "Zadejte zálohu peněženky pomocí dotykového displeje. Tím se vyhnete vystavení svých citlivých informací potenciálně nezabezpečenému počítači nebo webovému prohlížeči.",
+  "TR_CHECK_RECOVERY_SEED_DESC_TOUCHSCREEN": "Zadejte zálohu peněženky pomocí dotykového displeje. Tím se vyhnete vystavení svých citlivých informací potenciálně nezabezpečenému počítači nebo webovému prohlížeči.",
   "TR_CHECK_SEED": "Zkontrolovat zálohu",
   "TR_CHECK_YOUR_DEVICE": "Zkontrolujte obrazovku Trezoru",
   "TR_CHOOSE_RECOVERY_TYPE": "Vyberte typ obnovy",
@@ -502,12 +510,37 @@
   "TR_COINJOIN_TILE_3_TITLE": "Chráněno Trezorem",
   "TR_COINJOIN_TRANSACTION_BATCH": "Coinjoinové transakce",
   "TR_COINMARKET_BEST_RATE": "Nejlepší kurz",
+  "TR_COINMARKET_BUY_AND_SELL": "Koupit a prodat",
+  "TR_COINMARKET_BUY_AND_SELL_COUNTER": "{totalBuys, plural, =0 {{totalBuys} nákupů} one {{totalBuys} nákup} few {{totalBuys} nákupy} other {{totalBuys} nákupů} } • {totalSells, plural, =0 {{totalSells} prodejů} one {{totalSells} prodej} few {{totalBuys} prodeje} other {{totalSells} prodejů} }",
   "TR_COINMARKET_CEX_TOOLTIP": "Centralizovaná směnárna",
+  "TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY": "Změňte částku nebo měnu.",
   "TR_COINMARKET_COMPARE_OFFERS": "Porovnat všechny nabídky",
   "TR_COINMARKET_COUNTRY": "Země trvalého bydliště",
+  "TR_COINMARKET_DCA_DOWNLOAD": "Stáhněte si mobilní aplikaci Invity a začněte spořit v Bitcoinech",
+  "TR_COINMARKET_DCA_FEATURE_1_DESCRIPTION": "Bezpečný a jednoduchý plán pravidelného investování.",
+  "TR_COINMARKET_DCA_FEATURE_1_SUBHEADING": "Vyvinuto společností SatoshiLabs",
+  "TR_COINMARKET_DCA_FEATURE_2_DESCRIPTION": "Výběr do vlastní úchovy bez dalších poplatků.",
+  "TR_COINMARKET_DCA_FEATURE_2_SUBHEADING": "Výběry bez poplatků",
+  "TR_COINMARKET_DCA_FEATURE_3_DESCRIPTION": "Přehledné, jednoduché a uživatelsky přívětivé rozhraní.",
+  "TR_COINMARKET_DCA_FEATURE_3_SUBHEADING": "Snadné používání",
+  "TR_COINMARKET_DCA_FEATURE_4_DESCRIPTION": "Sledujte historii investicí, jejich výši a frekvenci.",
+  "TR_COINMARKET_DCA_FEATURE_4_SUBHEADING": "Přehled pravidelného investování",
+  "TR_COINMARKET_DCA_HEADING": "Spořte si v Bitcoinech s aplikací Invity",
   "TR_COINMARKET_DEX_TOOLTIP": "Decentralizovaná směnárna",
   "TR_COINMARKET_ENTER_AMOUNT_IN": "Zadejte částku v {currency}",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_KYC_ALL": "Všechny možnosti ověření identity zákazníka",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_NO_KYC": "Ověření identity zákazníka není vyžadováno",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_ALL": "Všechny nabídky CEX a DEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_DEX": "DEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FIXED_CEX": "CEX s pevným kurzem",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FLOATING_CEX": "CEX s pohyblivým kurzem",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING": "DEX",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING_TOOLTIP": "Decentralizovaná směnárna (DEX) umožňuje obchodovat s kryptoměnami přímo na blockchainu bez nutnosti centrální autority nebo zprostředkovatele.",
+  "TR_COINMARKET_EXCHANGE_FIXED_OFFERS_HEADING": "CEX s pevným kurzem",
+  "TR_COINMARKET_EXCHANGE_FLOAT_OFFERS_HEADING": "CEX s pohyblivým kurzem",
   "TR_COINMARKET_FEATURED_OFFERS_HEADING": "Vybrané nabídky",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_BUY_LABEL": "Platba:",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_SELL_LABEL": "Způsob příjmu:",
   "TR_COINMARKET_FEES_INCLUDED": "Včetně poplatků",
   "TR_COINMARKET_FEES_NOT_INCLUDED": "Bez poplatků",
   "TR_COINMARKET_FEES_ON_WEBSITE": "V zobrazené ceně nejsou zahrnuty některé poplatky. Konečnou cenu najdete na webových stránkách poskytovatele.",
@@ -520,24 +553,18 @@
   "TR_COINMARKET_KYC_NO_REFUND": "Ověření identity zákazníka je vyžadováno ve výjimečných případech. Ověření identity zákazníka je vyžadováno při vrácení prostředků. 👈",
   "TR_COINMARKET_KYC_POLICY": "Zásady ověření identity zákazníka",
   "TR_COINMARKET_KYC_POLICY_NEVER_REQUIRED": "Ověření identity zákazníka není vyžadováno",
-  "TR_COINMARKET_KYC_YES_REFUND": "Ověření identity zákazníka je vyžadováno ve výjimečných případech. Ověření identity zákazníka není vyžadováno při vrácení prostředků. 🤝",
+  "TR_COINMARKET_KYC_YES_REFUND": "Ověření identity zákazníka je vyžadováno pouze ve výjimečných případech. Není vyžadováno při vrácení prostředků. 🤝",
   "TR_COINMARKET_LAST_TRANSACTIONS": "Poslední transakce",
   "TR_COINMARKET_NETWORK_FEE": "Síťový poplatek",
   "TR_COINMARKET_NETWORK_TOKENS": "Tokeny {networkName}",
   "TR_COINMARKET_NO_CEX_PROVIDER_FOUND": "Nebyl nalezen žádný poskytovatel CEX",
   "TR_COINMARKET_NO_DEX_PROVIDER_FOUND": "Nebyl nalezen žádný poskytovatel DEX",
   "TR_COINMARKET_NO_METHODS_AVAILABLE": "Nejsou k dispozici žádné metody",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "Automaticky se obnoví za",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "Zpět na obchod",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "Žádné nabídky",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "Kvůli problémům s připojením k serveru nyní bohužel nemáme žádné nabídky.",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "Momentálně bohužel nemáme žádné nabídky. Zkuste stránku znovu načíst nebo změňte dotaz.",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "Obnovit stránku",
   "TR_COINMARKET_OFFERS_EMPTY": "Pro váš požadavek není dostupná žádná nabídka. Změňte zemi nebo nakupované množství",
   "TR_COINMARKET_OFFERS_REFRESH": "Nabídky se aktualizují za",
   "TR_COINMARKET_OFFERS_SELECT": "Vybrat",
   "TR_COINMARKET_OFFER_LOOKING": "Hledáme nejlepší nabídku",
-  "TR_COINMARKET_OFFER_NO_FOUND": "Pro váš požadavek není dostupná žádná nabídka. Změňte částku nebo měnu.",
+  "TR_COINMARKET_OFFER_NO_FOUND": "Pro váš požadavek není dostupná žádná nabídka.",
   "TR_COINMARKET_ON_NETWORK_CHAIN": "Na řetězu {networkName}",
   "TR_COINMARKET_OTHER_CURRENCIES": "Další měny",
   "TR_COINMARKET_PAYMENT_METHOD": "Platební metoda",
@@ -546,9 +573,36 @@
   "TR_COINMARKET_RECEIVE_METHOD": "Způsob příjmu",
   "TR_COINMARKET_SELL": "Prodat",
   "TR_COINMARKET_SHOW_OFFERS": "Porovnat nabídky",
+  "TR_COINMARKET_SWAP": "Směnit",
+  "TR_COINMARKET_SWAP_AMOUNT": "Částka směny",
+  "TR_COINMARKET_SWAP_COUNTER": "{totalSwaps, plural, =0 {{totalSwaps} směn} one {{totalSwaps} směna} few {{totalSwaps} směny} other {{totalSwaps} směn} }",
+  "TR_COINMARKET_SWAP_DEX_MODAL_CONFIRM": "Chci směnit",
+  "TR_COINMARKET_SWAP_DEX_MODAL_FOR_YOUR_SAFETY": "Směnit {fromCrypto} na {toCrypto} u {provider}",
+  "TR_COINMARKET_SWAP_DEX_MODAL_LEGAL_HEADER": "Právní ustanovení",
+  "TR_COINMARKET_SWAP_DEX_MODAL_SECURITY_HEADER": "Bezpečnost je u Trezoru na prvním místě",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_1": "Chci směnit kryptoměny přes DEX (decentralizovaná směnárna) pomocí kontraktu {provider}.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_2": "Chci směnit kryptoměny pro svůj vlastní účet. Beru na vědomí, že zásady poskytovatele mohou vyžadovat ověření totožnosti.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_3": "Rozumím, že transakce s kryptoměnami jsou konečné a nelze je vrátit. Ztráty způsobené podvodem nebo chybami mohou být nevratné.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4": "Beru vědomí, že Invity tuto službu neposkytuje. Řídí se smluvními podmínkami společnosti {provider}.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_5": "Tuto funkci nepoužívám k hazardním hrám, podvodům ani k jakékoli jiné činnosti v rozporu s podmínkami služby Invity nebo poskytovatele nebo v rozporu s platnými zákony.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_6": "Chápu, že kryptoměny jsou nově vznikajícím finančním nástrojem a že právní předpisy se mohou v různých oblastech lišit. To může zvýšit riziko podvodu, krádeže nebo nestability trhu.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_VERIFIED_PARTNERS_HEADER": "Ověření partneři Invity",
+  "TR_COINMARKET_SWAP_MODAL_CONFIRM": "Chci směnit",
+  "TR_COINMARKET_SWAP_MODAL_FOR_YOUR_SAFETY": "Směnit {fromCrypto} na {toCrypto} u {provider}",
+  "TR_COINMARKET_SWAP_MODAL_LEGAL_HEADER": "Právní ustanovení",
+  "TR_COINMARKET_SWAP_MODAL_SECURITY_HEADER": "Bezpečnost je u Trezoru na prvním místě",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_1": "Chci směnit kryptoměny. Pokud mě aplikace na tuto stránku přesměruje z jiného důvodu, obrátím se nejprve na Trezor podporu. ",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_2": "Chci směnit kryptoměny pro svůj vlastní účet. Beru na vědomí, že zásady poskytovatele mohou vyžadovat ověření totožnosti.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_3": "Rozumím, že transakce s kryptoměnami jsou konečné a nelze je vrátit. Ztráty způsobené podvodem nebo chybami mohou být nevratné.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_4": "Beru vědomí, že Invity tuto službu neposkytuje. Řídí se smluvními podmínkami společnosti {provider}.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_5": "Tuto funkci nepoužívám k hazardním hrám, podvodům ani k jakékoli jiné činnosti v rozporu s podmínkami služby Invity nebo poskytovatele nebo v rozporu s platnými zákony.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_6": "Chápu, že kryptoměny jsou nově vznikajícím finančním nástrojem a že právní předpisy se mohou v různých oblastech lišit. To může zvýšit riziko podvodu, krádeže nebo nestability trhu.",
+  "TR_COINMARKET_SWAP_MODAL_VERIFIED_PARTNERS_HEADER": "Ověření partneři Invity",
   "TR_COINMARKET_TOKEN_NETWORK": "{tokenName} v síti {networkName}",
   "TR_COINMARKET_TRADE_FEE": "Obchodní poplatek",
+  "TR_COINMARKET_TRANS_ID": "Trans. ID:",
   "TR_COINMARKET_UNKNOWN_PROVIDER": "Neznámý poskytovatel",
+  "TR_COINMARKET_VIEW_DETAILS": "Zobrazit podrobnosti",
   "TR_COINMARKET_YOUR_BEST_OFFER": "Nejlepší nabídka",
   "TR_COINMARKET_YOU_BUY": "Nakoupíte",
   "TR_COINMARKET_YOU_GET": "Dostanete",
@@ -573,6 +627,7 @@
   "TR_CONFIRMED_TX": "Potvrzeno",
   "TR_CONFIRMING_TX": "Potvrzení transakce",
   "TR_CONFIRM_ACTION_ON_YOUR": "Postupujte podle pokynů na obrazovce Trezoru",
+  "TR_CONFIRM_ADDRESS": "Potvrďte adresu",
   "TR_CONFIRM_BEFORE_COPY": "Před kopírováním potvrďte na Trezoru",
   "TR_CONFIRM_CONDITIONS": "Než budete pokračovat, potvrďte podmínky.",
   "TR_CONFIRM_EMPTY_HIDDEN_WALLET_ON": "Potvrďte prázdnou passphrase peněženku na zařízení {deviceLabel}.",
@@ -601,7 +656,7 @@
   "TR_CONNECT_DEVICE_SEND_PROMO_TITLE": "Trezor není připojen",
   "TR_CONNECT_TREZOR_TO_SEND_BUTTON": "Před odesláním připojte Trezor",
   "TR_CONNECT_YOUR_DEVICE": "Připojte a odemkněte svůj Trezor",
-  "TR_CONTACT_SUPPORT": "Kontaktovat podporu",
+  "TR_CONTACT_SUPPORT": "Kontaktovat Trezor podporu",
   "TR_CONTACT_TREZOR_SUPPORT": "Kontaktovat Trezor podporu",
   "TR_CONTINUE": "Pokračovat",
   "TR_CONTINUE_ANYWAY": "Přesto pokračovat",
@@ -621,7 +676,7 @@
   "TR_COPY_ADDRESS_POLICY_ID": "Nikdy neposílejte prostředky na adresu ID zásady.",
   "TR_COPY_AND_CLOSE": "Zkopírovat a zavřít",
   "TR_COPY_SIGNED_MESSAGE": "Zkopírovat podepsanou zprávu",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "Kopírovat",
+  "TR_COPY_TO_CLIPBOARD": "Kopírovat",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "Nepodařilo se načíst changelog",
   "TR_COULD_NOT_RETRIEVE_DATA": "Nepodařilo se načíst data",
   "TR_COUNT_WALLETS": "{count} {count, plural, one {peněženka} other {peněženek}}",
@@ -632,7 +687,7 @@
   "TR_CREATE_SHARES": "Vytvořit zálohy na Trezoru",
   "TR_CREATE_SHARES_CARD_1": "Vezměte si tužku a papír a vytiskněte <cardsLink>karty se zálohou</cardsLink> nebo použijte <keepLink>Trezor Keep Metal</keepLink>.",
   "TR_CREATE_SHARES_CARD_2": "Zálohu peněženky si nefoťte ani nepořizujte její digitální kopii.",
-  "TR_CREATE_SHARES_CARD_3": "Ujistěte se, že kolem sebe nemáte zvídavé přihlížející.",
+  "TR_CREATE_SHARES_CARD_3": "Ujistěte se, že kolem sebe nemáte zvídavé přihlížející",
   "TR_CREATE_SHARES_EXAMPLE": "Například: Celkem 5 dílů, přičemž k obnovení peněženky jsou potřeba 3 libovolné díly",
   "TR_CREATE_SHARES_EXPLANATION": "Vyberte celkový počet dílů a poté zvolte minimální počet potřebný k obnovení Trezoru.",
   "TR_CREATE_WALLET": "Vytvořit novou peněženku",
@@ -655,6 +710,7 @@
   "TR_DASHBOARD_ASSET_FAILED": "Prostředek nebyl správně načten",
   "TR_DASHBOARD_DISCOVERY_ERROR": "Chyba kontroly",
   "TR_DASHBOARD_DISCOVERY_ERROR_PARTIAL_DESC": "Účty nebyly načteny správně {details}",
+  "TR_DATA": "Data",
   "TR_DATABASE_UPGRADE_BLOCKED": "Upgrade databáze zablokován jinou instancí aplikace",
   "TR_DATA_ANALYTICS_CATEGORY_1": "Platforma",
   "TR_DATA_ANALYTICS_CATEGORY_1_ITEM_1": "Operační systém, modelu Trezoru, verze atd.",
@@ -708,8 +764,13 @@
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT": "Přepnuli jste zařízení do bootloaderu nechtěně?",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_BUTTON": "Znovu připojte zařízení a nesahejte při tom na tlačítka.",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_TOUCH": "Odpojte a připojte zařízení, aniž byste se dotýkali jeho obrazovky.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED": "Toto zařízení se používá jinde.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION": "Zařízení možná aktuálně používá aplikace {transportSessionOwner}. V případě potřeby můžete převzít kontrolu nad zařízením.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION_UNKNOWN_APP": "Zařízení možná aktuálně používá jiná aplikace. V případě potřeby můžete převzít kontrolu nad zařízením.",
   "TR_DEVICE_CONNECTED_WRONG_STATE": "Zařízení detekováno v nesprávném stavu",
   "TR_DEVICE_DISCONNECTED_DURING_ACTION_DESCRIPTION": "Trezor byl během zálohování odpojen. Důrazně doporučujeme vymazat zařízení pomocí možnosti obnovení továrního nastavení v nastavení zařízení. Poté znovu spusťte proces zálohování.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH": "Nepodařilo se zkontrolovat hash firmwaru. Váš Trezor může být padělek.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR": "Nepodařilo se zkontrolovat hash firmwaru. Váš Trezor může být padělek.",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON": "Vypnout",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON_DISABLED": "Zapnout",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION": "Kontrola revize firmwaru je zásadní bezpečnostní funkce. Důrazně doporučujeme nechat ji zapnutou.",
@@ -728,6 +789,8 @@
   "TR_DEVICE_LABEL_IS_NOT_BACKED_UP": "Zařízení {deviceLabel} nemá zálohu",
   "TR_DEVICE_LABEL_IS_NOT_CONNECTED": "Zařízení {deviceLabel} není připojeno",
   "TR_DEVICE_LABEL_IS_UNAVAILABLE": "Zařízení {deviceLabel} není dostupné",
+  "TR_DEVICE_MAYBE_COMPROMISED_HEADING": "Zařízení se nepodařilo ověřit",
+  "TR_DEVICE_MAYBE_COMPROMISED_TEXT": "Znovu připojte zařízení a zkuste ověření spustit znovu. Pokud problém přetrvává, kontaktujte Trezor podporu a zjistěte, co se s vaším zařízením děje a co dělat dál.",
   "TR_DEVICE_NOT_CONNECTED": "Zařízení není připojeno",
   "TR_DEVICE_NOT_INITIALIZED": "Trezor není nastaven",
   "TR_DEVICE_NOT_INITIALIZED_TEXT": "Provedeme vás celým procesem, abyste mohli Trezor začít používat.",
@@ -790,7 +853,6 @@
   "TR_DOWNLOAD_LATEST_BRIDGE": "Stáhnout nejnovější Bridge {version}",
   "TR_DO_NOT_DISCONNECT_DEVICE": "Neodpojujte zařízení",
   "TR_DO_NOT_SHOW_AGAIN": "Znovu nezobrazovat",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "Přeskočit tento krok?",
   "TR_DROPBOX": "Dropbox",
   "TR_DROPZONE": "Přetáhněte soubor sem nebo kliknutím vyberte soubor",
   "TR_DROPZONE_ERROR": "Import se nezdařil: {error}",
@@ -811,13 +873,13 @@
   "TR_EARLY_ACCESS_ENABLE": "Připojit se",
   "TR_EARLY_ACCESS_ENABLED": "Program předběžného přístupu byl povolen",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM": "Připojit se",
-  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "Rozumím, že zapojení do tohoto programu mi umožní testovat software před vydáním. Tento software může obsahovat chyby, které mohou ovlivnit normální fungování aplikace Suite.",
+  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "Rozumím, že zapojení do tohoto programu mi umožní testovat software před vydáním. Tento software může obsahovat chyby, které mohou ovlivnit normální fungování aplikace Trezor Suite.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_DESCRIPTION": "Můžete ho kdykoli vypnout.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TITLE": "Vyzkoušejte nejnovější funkce před jejich vydáním široké veřejnosti.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TOOLTIP": "Nejprve zaškrtněte pole výše",
   "TR_EARLY_ACCESS_JOINED_DESCRIPTION": "Beta aktualizace můžete vyhledat teď nebo při příštím spuštění aplikace.",
   "TR_EARLY_ACCESS_JOINED_TITLE": "Program předběžného přístupu byl povolen",
-  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "Chcete-li provést downgrade na nejnovější stabilní verzi Suite, kliknutím na tlačítko „Stáhnout stabilní“ aplikaci přeinstalujte.",
+  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "Chcete-li provést downgrade na nejnovější stabilní verzi Trezor Suite, kliknutím na tlačítko „Stáhnout stabilní“ aplikaci přeinstalujte.",
   "TR_EARLY_ACCESS_LEFT_TITLE": "Opustili jste program předběžného přístupu. Již vám nebudeme nabízet beta verze.",
   "TR_EARLY_ACCESS_MENU": "Program předběžného přístupu",
   "TR_EARLY_ACCESS_REINSTALL": "Stáhnout stabilní",
@@ -872,7 +934,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "Schvalte pouze přesnou částku požadovanou pro tuto směnu. Pokud budete chtít podobnou směnu provést znovu, budete muset zaplatit další poplatek.",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "Odvolat předchozí schválení",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "Proveďte transakci, která zruší předchozí schválení kontraktu s {provider}.",
-  "TR_EXCHANGE_BUY": "Za",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Potvrdit na Trezoru a odeslat",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "Potvrdit a odeslat",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "Vytvořit schválení",
@@ -894,8 +955,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "Transakce byla úspěšná.",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "Schváleno",
   "TR_EXCHANGE_DEX": "Nabídka decentralizované směnárny",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "Poplatky za provedení této směny budou přibližně {approvalFee} ({approvalFeeFiat}) za schválení (pokud je vyžadováno) a {swapFee} ({swapFeeFiat}) za směnu.",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "Na transakční poplatky vám nezbývají žádné prostředky. Snižte částku směny na maximálně {symbol} {max}",
   "TR_EXCHANGE_EXTRA_FIELD": "{extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "Údaj {extraFieldName} je neplatný",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "{extraFieldDescription}",
@@ -905,7 +964,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "Pevné kurzy vám přesně ukáží, kolik na konci směny dostanete – částka zůstane stejná mezi výběrem kurzu a dokončením transakce. Uvedenou částku máte garantovanou, ale tyto kurzy jsou obvykle méně výhodné, což znamená, že si za své peníze nekoupíte tolik kryptoměn.",
   "TR_EXCHANGE_FLOAT": "Nabídka s pohyblivým kurzem",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "U pohyblivých kurzů se konečná částka, kterou získáte, může mírně změnit v důsledku výkyvů na trhu v době mezi výběrem kurzu a dokončením transakce. Tyto kurzy jsou obvykle vyšší, což znamená, že ve výsledku můžete získat více kryptoměn.",
-  "TR_EXCHANGE_PROVIDER": "Poskytovatel",
   "TR_EXCHANGE_RATE": "Cena",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "Účet příjemce je mimo aplikaci Suite.",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "Jedná se o konkrétní alfanumerickou adresu, na kterou budou vaše mince doručeny.",
@@ -932,23 +990,16 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "Zadejte číslo.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "Zadejte přijatelnou kurzovou odchylku.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "Částka nabídky směny",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "Souhrn kurzové odchylky",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "Tolerance kurzové odchylky",
-  "TR_EXCHANGE_TRANS_ID": "Trans. ID:",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "Použít účet ({symbol}), který není v Suite",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "Adresa příjemce",
-  "TR_EXCHANGE_VIEW_DETAILS": "Zobrazit podrobnosti",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE": "Automatické aktualizace aplikace Trezor Suite",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION": "Aplikace Trezor Suite automaticky stáhne nejnovější verzi na pozadí a nainstaluje ji při restartování aplikace. Díky tomu budete mít vždy aktuální verzi s nejnovějšími funkcemi a bezpečnostními opravami. Aktualizace probíhají bez vašeho zásahu.",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN": "BNB Smart Chain",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON": "Povolit síť BNB Smart Chain bez historických interních transakcí.",
   "TR_EXPERIMENTAL_FEATURES": "Experimentální",
   "TR_EXPERIMENTAL_FEATURES_ALLOW": "Experimentální funkce",
   "TR_EXPERIMENTAL_FEATURES_WARNING": "Pouze pro zkušené uživatele. Používejte na vlastní riziko. Tyto funkce jsou ve fázi testování, mohou být nestabilní a nemusí mít dlouhodobou podporu.",
   "TR_EXPERIMENTAL_PASSWORD_MANAGER": "Migrovat hesla Dropbox",
-  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Nástroj pro načítání hesel uložených ve službě Dropbox a zabezpečených Trezorem. Navržen pro dřívější uživatele rozšíření Trezor Password Manager pro Chrome.",
+  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Tento nástroj slouží k načítání hesel uložených ve službě Dropbox a zabezpečených Trezorem. Je určen pro dřívější uživatele rozšíření Trezor Password Manager pro Chrome.",
   "TR_EXPERIMENTAL_TOR_SNOWFLAKE": "Tor Snowflake",
-  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Tor Snowflake je systém, který umožňuje přístup k cenzurovaným webovým stránkám a aplikacím.",
+  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Pro přístup k cenzurovaným webům a aplikacím můžete používat Tor Snowflake, systém navržený tak, aby obešel omezení.",
   "TR_EXPORT_AS": "Exportovat jako {as}",
   "TR_EXPORT_FAIL": "Export se nezdařil.",
   "TR_EXPORT_TO_FILE": "Exportovat do souboru",
@@ -986,6 +1037,7 @@
   "TR_FIRMWARE_NEW_FW_DESCRIPTION": "Je k dispozici nový firmware. Aktualizujte zařízení nyní.",
   "TR_FIRMWARE_REINSTALL_FW_DESCRIPTION": "Vaše zařízení je již aktualizováno na nejnovější firmware. V případě potřeby můžete firmware přeinstalovat.",
   "TR_FIRMWARE_REVISION_CHECK_FAILED": "Nepodařilo se zkontrolovat revizi firmwaru. Váš Trezor může být padělek.",
+  "TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR": "Nepodařilo se zkontrolovat revizi firmwaru.",
   "TR_FIRMWARE_STATUS_INSTALLATION_COMPLETED": "Dokončeno",
   "TR_FIRMWARE_SUBHEADING_BITCOIN": "Odlehčený firmware podporující pouze operace s Bitcoinem.",
   "TR_FIRMWARE_SUBHEADING_NONE": "Trezor se dodává bez firmwaru. Chcete-li zařízení bezpečně používat, nainstalujte nejnovější firmware. Pokud používáte pouze bitcoiny, doporučujeme nainstalovat <button>{bitcoinOnly} firmware</button>.",
@@ -1023,7 +1075,7 @@
   "TR_GOT_IT_BUTTON": "Rozumím",
   "TR_GO_TO_ONBOARDING": "Spustit nastavení",
   "TR_GO_TO_SETTINGS": "Přejít do nastavení",
-  "TR_GO_TO_SUITE": "Přejít do Suite",
+  "TR_GO_TO_SUITE": "Přejít do Trezor Suite",
   "TR_GRAPH_LINEAR": "Lineární",
   "TR_GRAPH_LOGARITHMIC": "Logaritmický",
   "TR_GRAPH_MISSING_DATA": "Částky XRP, SOL a všech tokenů jsou zahrnuty v zůstatku portfolia, ale v současné době nejsou podporovány v zobrazení grafu.",
@@ -1042,7 +1094,7 @@
   "TR_GUIDE_FORUM": "Trezor fórum",
   "TR_GUIDE_FORUM_LABEL": "Přidejte se do komunity Trezoru",
   "TR_GUIDE_SUGGESTION_LABEL": "Jak si vedeme?",
-  "TR_GUIDE_SUPPORT": "Kontaktovat podporu",
+  "TR_GUIDE_SUPPORT": "Kontaktovat Trezor podporu",
   "TR_GUIDE_SUPPORT_AND_FEEDBACK": "Podpora a zpětná vazba",
   "TR_GUIDE_VIEW_HEADLINES_SUPPORT_FEEDBACK_SELECTION": "Podpora a zpětná vazba",
   "TR_GUIDE_VIEW_HEADLINE_HELP_US_IMPROVE": "Pomozte nám vylepšit aplikaci",
@@ -1174,7 +1226,7 @@
   "TR_LOCAL_FILE_SYSTEM": "Místní systém souborů",
   "TR_LOG": "Protokol aplikace",
   "TR_LOGIN_PROCEED": "Pokračovat",
-  "TR_LOG_DESCRIPTION": "Protokol obsahuje všechny potřebné technické informace o aplikaci Trezor Suite. Může být potřeba při komunikaci s Trezor podporou.",
+  "TR_LOG_DESCRIPTION": "Tento protokol obsahuje základní technické informace o aplikaci Trezor Suite a může být zapotřebí při kontaktování Trezor podpory.",
   "TR_LOOKING_FOR_COINJOIN_ROUND": "Čekání na kolo",
   "TR_LOW_ANONYMITY_WARNING": "<red>Velmi nízká anonymita.</red> Doporučujeme používat alespoň úroveň 1 z 5, protože cokoli pod 1 není bezpečné.",
   "TR_LTC_ADDRESS_INFO": "Litecoin změnil formát adresy. Více informací o tom, jak převést adresu, najdete na našem blogu. {TR_LEARN_MORE}",
@@ -1225,6 +1277,7 @@
   "TR_MY_PORTFOLIO": "Portfolio",
   "TR_NAV_ANONYMIZE": "Anonymizovat mince",
   "TR_NAV_BUY": "Koupit",
+  "TR_NAV_DCA": "Pravidelné investování fixní částky",
   "TR_NAV_DETAILS": "Detaily",
   "TR_NAV_RECEIVE": "Přijmout",
   "TR_NAV_SELL": "Prodat",
@@ -1266,6 +1319,7 @@
   "TR_NETWORK_LITECOIN": "Litecoin",
   "TR_NETWORK_NAMECOIN": "Namecoin",
   "TR_NETWORK_NEM": "NEM",
+  "TR_NETWORK_OP": "Optimismus",
   "TR_NETWORK_POLYGON": "Polygon PoS",
   "TR_NETWORK_SOLANA_DEVNET": "Solana Devnet",
   "TR_NETWORK_SOLANA_MAINNET": "Solana",
@@ -1278,9 +1332,10 @@
   "TR_NETWORK_ZCASH": "Zcash",
   "TR_NEW_FEE": "Nový",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "Je dostupná nová verze Trezor Bridge.",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "Je dostupný nový firmware Trezoru! Aktualizujte zařízení.",
   "TR_NEXT_UP": "Další",
   "TR_NONCE": "Nonce",
+  "TR_NON_ASCII_CHAR": "{label} (s nedoporučeným znakem „{char}“)",
+  "TR_NON_ASCII_CHARS": "{label} (s nedoporučenými znaky)",
   "TR_NORMAL_ACCOUNTS": "Výchozí účty",
   "TR_NORTH": "Sever",
   "TR_NOTHING_TO_ANONYMIZE": "Není co anonymizovat",
@@ -1304,10 +1359,6 @@
   "TR_N_MIN": "{n} min",
   "TR_N_TRANSACTIONS": "{value} {value, plural, one {transakce} other {transakcí}}",
   "TR_OFF": "vypnuto",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "Zvolená částka {amount} je vyšší než povolené maximum {max}.",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "Zvolená částka {amount} je vyšší než povolené maximum {max}.",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "Zvolená částka {amount} je nižší než povolené minimum {min}.",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "Zvolená částka {amount} je nižší než povolené minimum {min}.",
   "TR_OFFICIAL_LANGUAGES": "Oficiální",
   "TR_OK": "OK",
   "TR_ON": "zapnuto",
@@ -1335,7 +1386,7 @@
   "TR_ONBOARDING_DATA_COLLECTION_HEADING": "Anonymní shromažďování údajů",
   "TR_ONBOARDING_DEVICE_CHECK": "Bezpečnostní kontrola zařízení",
   "TR_ONBOARDING_DEVICE_CHECK_1": "<strong>Hologram</strong> byl neporušený a nepoškozený.",
-  "TR_ONBOARDING_DEVICE_CHECK_2": "Zařízení bylo zakoupeno v oficiálním Trezor eshopu nebo u důvěryhodného prodejce.",
+  "TR_ONBOARDING_DEVICE_CHECK_2": "Zařízení bylo zakoupeno v <shop>oficiálním Trezor eshopu</shop> nebo u <reseller>důvěryhodného prodejce</reseller>.",
   "TR_ONBOARDING_DEVICE_CHECK_3": "Balení bylo neporušené a nepoškozené.",
   "TR_ONBOARDING_DEVICE_CHECK_4": "V připojeném Trezoru již je nainstalován firmware. V nastavení pokračujte pouze v případě, že jste tento Trezor dříve používali.",
   "TR_ONBOARDING_DOWNLOAD_DESKTOP_APP": "Stáhnout aplikaci pro počítače",
@@ -1366,30 +1417,6 @@
   "TR_OTHER_INPUTS_AND_OUTPUTS": "Další vstupy a výstupy",
   "TR_OUTGOING": "Odchozí",
   "TR_OUTPUTS": "Výstupy",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "Minimální a maximální částka, za kterou je tento uživatel ochoten prodat {symbol}.",
-  "TR_P2P_GET_STARTED_INTRO": "Transakci je třeba zahájit na stránkách {providerName} – postupujte podle níže uvedených kroků.",
-  "TR_P2P_GET_STARTED_ITEM_1": "Kliknutím na „Přejít na stránky {providerName}“ budete přesměrováni na stránky našeho partnera.",
-  "TR_P2P_GET_STARTED_ITEM_3": "Jakmile vás stránka {providerName} požádá o „adresu vrácení zástavy“, vraťte se sem a pokračujte.",
-  "TR_P2P_GET_STARTED_ITEM_4": "Už to bude! Odhalte a zkopírujte svou adresu, vložte ji do pole „Adresa vrácení zástavy“ na stránkách {providerName} a dokončete transakci.",
-  "TR_P2P_GO_TO_PROVIDER": "Přejít na stránky {providerName}",
-  "TR_P2P_INFO": "S technologií {peerToPeer} (P2P) není na straně kupujícího ani prodávajícího vyžadováno ověření identity. Všechny strany jsou chráněny před podvody zabezpečeným {multisigEscrow}.",
-  "TR_P2P_MODAL_CONFIRM": "Chci koupit",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "Koupit Peer-to-Peer {cryptocurrency} přes {provider}",
-  "TR_P2P_MODAL_LEGAL_HEADER": "Právní ustanovení",
-  "TR_P2P_MODAL_SECURITY_HEADER": "Bezpečnost je u Trezoru na prvním místě",
-  "TR_P2P_MODAL_TERMS_1": "Chcete koupit kryptoměnu od jiné osoby, kterou si vyberete, pomocí technologie P2P (Peer-to-Peer) bez ověření totožnosti. Pokud jste byli na tuto stránku přesměrováni z jiného důvodu, obraťte se nejprve na podporu.",
-  "TR_P2P_MODAL_TERMS_2": "Berete na vědomí, že kryptoměnové transakce jsou nevratné a nelze je vrátit. Podvodné nebo náhodné ztráty tak mohou být nenávratné.",
-  "TR_P2P_MODAL_TERMS_4": "Berete na vědomí, že Invity tuto službu neposkytuje. Služba se řídí podmínkami společnosti {provider}.",
-  "TR_P2P_MODAL_TERMS_5": "Tuto funkci nepoužíváte k hazardním hrám, podvodům ani k jakémukoli jinému jednání v rozporu s podmínkami služby Invity nebo poskytovatele nebo v rozporu s platnými předpisy.",
-  "TR_P2P_MODAL_TERMS_6": "Chápete, že kryptoměny jsou nově vznikajícím finančním nástrojem a že právní předpisy se mohou v různých zemích lišit. To vás může vystavit vyššímu riziku podvodu, krádeže nebo nestability trhu.",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "Ověření partneři Invity",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "Transakce musí být dokončena v této lhůtě, počínaje vytvořením kontraktu na webu {providerName}.",
-  "TR_P2P_PRICE": "Cena za 1 {symbol}",
-  "TR_P2P_PRICE_TOOLTIP": "Cena {symbol} nabízená tímto uživatelem.",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "Ahoj, používám {providerName}!",
-  "TR_P2P_USER_REPUTATION": "({rating}, {numberOfTrades})",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "Zvolená částka {amount} je vyšší než povolené maximum {maximum}.",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "Zvolená částka {amount} je nižší než povolené minimum {minimum}.",
   "TR_PAGINATION_NEWER": "Novější",
   "TR_PAGINATION_OLDER": "Starší",
   "TR_PASSPHRASE_CASE_SENSITIVE": "Poznámka: Passphrase rozlišuje velká a malá písmena.",
@@ -1400,6 +1427,8 @@
   "TR_PASSPHRASE_MISMATCH": "Passphrase se neshoduje",
   "TR_PASSPHRASE_MISMATCH_DESCRIPTION": "Passphrase se neshodují. Z bezpečnostních důvodů začněte znovu a zadejte je správně.",
   "TR_PASSPHRASE_MISMATCH_START_OVER": "Začít znovu",
+  "TR_PASSPHRASE_NON_ASCII_CHARS": "Doporučujeme používat <code>ABC</code>, <code>abc</code>, <code>123</code>, <code>mezery</code> nebo <code>tyto speciální znaky</code>",
+  "TR_PASSPHRASE_NON_ASCII_CHARS_WARNING": "Při použití speciálních znaků, které zde nejsou uvedeny, riskujete budoucí nekompatibilitu",
   "TR_PASSPHRASE_TOO_LONG": "Délka passphrase překračuje povolený limit.",
   "TR_PASSPHRASE_WALLET": "Passphrase peněženka  #{id}",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT": "Zjistěte, jak funguje passphrase",
@@ -1441,15 +1470,30 @@
   "TR_PIN_SUBHEADING": "Chraňte zařízení před neoprávněným fyzickým přístupem pomocí silného PIN kódu.",
   "TR_PLAY_IT_SAFE": "Neriskujte",
   "TR_PLEASE_ALLOW_YOUR_CAMERA": "Povolte kameru, abyste mohli naskenovat QR kód.",
-  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Připojte zařízení a pokračujte v procesu ověření.",
+  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Připojte Trezor a pokračujte v procesu ověření.",
   "TR_PLEASE_ENABLE_PASSPHRASE": "Chcete-li pokračovat v procesu ověřování, zapněte použití passphrase.",
   "TR_POLICY_ID_ADDRESS": "ID zásady:",
   "TR_PRIMARY_FIAT": "Fiat měna",
   "TR_PRIVATE": "Soukromé",
   "TR_PRIVATE_DESCRIPTION": "Anonymita alespoň {targetAnonymity}",
+  "TR_PROCEED_UNVERIFIED_ADDRESS": "Pokračovat s neověřenou adresou",
   "TR_PROMO_BANNER_DASHBOARD": "<underline>Nejpohodlnější</underline> <rest>hardwarová peněženka pro bezpečnou správu vašich kryptoměn</rest>",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM": "Před skenováním potvrďte na Trezoru",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM_EXPLANATION": "Nejprve potvrďte adresu příjemce v Trezoru, protože jeho zabezpečený displej nelze nabourat.",
+  "TR_QUICK_ACTION_DEBUG_EAP_EXPERIMENTAL_ENABLED": "Zapnuto",
+  "TR_QUICK_ACTION_TOOLTIP_JUST_UPDATED": "Právě aktualizováno ({currentVersion})",
+  "TR_QUICK_ACTION_TOOLTIP_RESTART_TO_UPDATE": "Restartovat a aktualizovat",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_DEVICE": "Zařízení Trezor",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_SUITE": "Trezor Suite",
+  "TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE": "Je dostupná aktualizace ({newVersion})",
+  "TR_QUICK_ACTION_TOOLTIP_UP_TO_DATE": "Aktuální ({currentVersion})",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED": "Aplikace Trezor Suite stáhla novou aktualizaci.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED": "Aplikace Trezor Suite byla aktualizována.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE": "Je dostupná aktualizace aplikace Trezor Suite",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE": "Restartovat a aktualizovat",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE": "Spustit aktualizaci",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE": "Je dostupná aktualizace Trezoru",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW": "Co je nového?",
   "TR_RANDOM_SEED_WORDS_DISCLAIMER": "Můžete být požádáni o zadání některých slov, která nejsou součástí zálohy peněženky",
   "TR_RANGE": "rozsah",
   "TR_READ_AND_UNDERSTOOD": "Četl/a jsem a pochopil/a výše uvedené",
@@ -1501,7 +1545,7 @@
   "TR_SAFETY_CHECKS_MODAL_TITLE": "Bezpečnostní kontroly",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL": "Na výzvu",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL_DESC": "Povolit potenciálně nebezpečné akce, například neshody klíčů nebo extrémní poplatky, ručním schválením Trezoru.",
-  "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "Neměňte toto nastavení, pokud nevíte, co děláte!",
+  "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "Toto nastavení měňte, pouze pokud víte, co děláte!",
   "TR_SAFETY_CHECKS_STRICT_LEVEL": "Striktní",
   "TR_SAFETY_CHECKS_STRICT_LEVEL_DESC": "Kompletní zabezpečení Trezoru.",
   "TR_SCAN_QR_CODE": "Naskenujte QR kód",
@@ -1513,7 +1557,7 @@
   "TR_SECURITY_CHECKPOINT_GOT_SEED": "Máte zálohu peněženky?",
   "TR_SECURITY_CHECK_HOLOGRAM": "Upozorňujeme, že balení zařízení včetně hologramů a bezpečnostních samolepek se postupem času měnilo. Podrobnosti o balení si můžete ověřit <packaging>tady</packaging>. Ujistěte se, že zařízení pochází z oficiálního Trezor eshopu nebo od některého z <reseller>našich důvěryhodných prodejců</reseller>. V opačném případě hrozí riziko, že zařízení je padělek. Pokud máte podezření, že zařízení není pravé, obraťte se na <support>Trezor podporu</support>.",
   "TR_SECURITY_FEATURES_COMPLETED_N": "Zabezpečení ({n} z {m})",
-  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "Zařízení nastavená v režimu bez seedu nemají přístup k aplikaci Trezor Suite. Tím se zabrání nevratné ztrátě mincí při použití nevhodně nastaveného zařízení k nesprávnému účelu.",
+  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "Zařízení nastavená v režimu bez seedu nemají přístup k aplikaci Trezor Suite, aby nemohlo dojít k nevratné ztrátě mincí při nesprávném použití zařízení.",
   "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE": "Nastavení bez seedu není v Trezor Suite podporováno",
   "TR_SEED_BACKUP_LENGTH": "Záloha peněženky může obsahovat 12, 18 nebo 24 slov.",
   "TR_SEED_BACKUP_LENGTH_INCLUDING_SHAMIR": "Záloha peněženky může obsahovat 12, 18, 20, 24 nebo 33 slov.",
@@ -1524,12 +1568,15 @@
   "TR_SEED_WORDS_ENTER_COMPUTER": "Zadejte slova ze zálohy peněženky v pořadí, jak jsou zobrazena na Trezoru.",
   "TR_SEED_WORDS_ENTER_TOUCHSCREEN": "Pomocí dotykového displeje zadejte všechna slova ve správném pořadí.",
   "TR_SEE_DETAILS": "Zobrazit detaily",
+  "TR_SEE_IF_ISSUE_PERSISTS": "Zkontrolujte, zda problém přetrvává.",
   "TR_SELECTED": "Vybrána částka {amount}",
   "TR_SELECT_COIN_FOR_SETTINGS": "Vyberte aktivní kryptoměnu, jejíž nastavení chcete změnit",
   "TR_SELECT_DEVICE": "Vyberte zařízení",
+  "TR_SELECT_NAME_OR_ADDRESS": "Zkuste hledat podle názvu, symbolu, sítě nebo adresy kontraktu",
   "TR_SELECT_NUMBER_OF_WORDS": "Vyberte počet slov v záloze peněženky",
   "TR_SELECT_PASSPHRASE_SOURCE": "Vyberte, kam chcete zadat passphrase na zařízení {deviceLabel}.",
   "TR_SELECT_RECOVERY_METHOD": "Vyberte metodu obnovení",
+  "TR_SELECT_TOKEN": "Vyberte token",
   "TR_SELECT_TREZOR": "Vyberte Trezor",
   "TR_SELECT_TREZOR_TO_CONTINUE": "Chcete-li pokračovat, vyberte svůj Trezor.",
   "TR_SELECT_TYPE": "Vyberte typ",
@@ -1560,11 +1607,11 @@
   "TR_SELL_MODAL_FOR_YOUR_SAFETY": "Prodat {cryptocurrency} přes {provider}",
   "TR_SELL_MODAL_LEGAL_HEADER": "Právní ustanovení",
   "TR_SELL_MODAL_SECURITY_HEADER": "Bezpečnost je u Trezoru na prvním místě",
-  "TR_SELL_MODAL_TERMS_1": "Přišli jste si koupit kryptoměnu. Pokud jste byli na tuto stránku přesměrováni z jiného důvodu, obraťte se nejprve na podporu.",
+  "TR_SELL_MODAL_TERMS_1": "Přišli jste si koupit kryptoměnu. Pokud jste byli na tuto stránku přesměrováni z jiného důvodu, obraťte se nejprve na Trezor podporu.",
   "TR_SELL_MODAL_TERMS_2": "Kupujete kryptoměnu pro svůj vlastní účet. Berete na vědomí, že zásady poskytovatele mohou vyžadovat ověření totožnosti.",
   "TR_SELL_MODAL_TERMS_3": "Berete na vědomí, že kryptoměnové transakce jsou nevratné a nelze je vrátit. Podvodné nebo náhodné ztráty tak mohou být nenávratné.",
   "TR_SELL_MODAL_TERMS_4": "Berete na vědomí, že Invity tuto službu neposkytuje. Služba se řídí podmínkami společnosti {provider}.",
-  "TR_SELL_MODAL_TERMS_5": "Tuto funkci nepoužíváte k hazardním hrám, podvodům ani k jakémukoli jinému jednání v rozporu s podmínkami služby Invity nebo poskytovatele nebo v rozporu s platnými předpisy.",
+  "TR_SELL_MODAL_TERMS_5": "Tuto funkci nepoužívám k hazardním hrám, podvodům ani k jakékoli jiné činnosti v rozporu s podmínkami služby Invity nebo poskytovatele nebo v rozporu s platnými zákony.",
   "TR_SELL_MODAL_TERMS_6": "Chápete, že kryptoměny jsou nově vznikajícím finančním nástrojem a že právní předpisy se mohou v různých zemích lišit. To vás může vystavit vyššímu riziku podvodu, krádeže nebo nestability trhu.",
   "TR_SELL_MODAL_VERIFIED_PARTNERS_HEADER": "Ověření partneři Invity",
   "TR_SELL_REGISTER": "Registrovat",
@@ -1573,10 +1620,6 @@
   "TR_SELL_STATUS_ERROR": "Odmítnuto",
   "TR_SELL_STATUS_PENDING": "Čeká na vyřízení",
   "TR_SELL_STATUS_SUCCESS": "Schváleno",
-  "TR_SELL_TRANS_ID": "Trans. ID:",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "Maximum je {maximum} {currency}",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "Minimum je {minimum} {currency}",
-  "TR_SELL_VIEW_DETAILS": "Zobrazit podrobnosti",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "Spoření",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "Nájemné",
   "TR_SENDING_SYMBOL": "Odesílání {multiple, select, true {několika tokenů} false {{symbol}} other {{symbol}}}",
@@ -1631,6 +1674,8 @@
   "TR_SHOW_LOG": "Zobrazit protokol",
   "TR_SHOW_MORE": "Zobrazit více",
   "TR_SHOW_MORE_ADDRESSES": "Zobrazit více ({count})",
+  "TR_SHOW_ON_TRAY": "Zobrazit ikonu na hlavním panelu",
+  "TR_SHOW_ON_TRAY_DESCRIPTION": "Sledujte, zda je aplikace Trezor Suite spuštěná na pozadí.",
   "TR_SHOW_UNVERIFIED_ADDRESS": "Zobrazit neověřenou adresu",
   "TR_SHOW_UNVERIFIED_XPUB": "Zobrazit neověřený veřejný klíč",
   "TR_SIDEBAR_ADD_COIN": "Přidat minci",
@@ -1643,7 +1688,9 @@
   "TR_SIZE": "Velikost",
   "TR_SKIP": "Přeskočit",
   "TR_SKIP_BACKUP": "Přeskočit zálohování",
+  "TR_SKIP_BACKUP_DESCRIPTION": "Záloha peněženky vám umožní obnovit prostředky v případě ztráty, odcizení nebo poškození Trezoru. Bez zálohy můžete trvale ztratit přístup ke svým kryptoměnám.",
   "TR_SKIP_PIN": "Přeskočit PIN kód",
+  "TR_SKIP_PIN_DESCRIPTION": "PIN kód zařízení zabraňuje neoprávněnému přístupu k vašemu Trezoru. Bez něj bude mít přístup k vašim prostředkům každý, kdo bude mít vaše zařízení.",
   "TR_SKIP_ROUNDS": "Vynechání kol",
   "TR_SKIP_ROUNDS_DESCRIPTION": "Když povolíte vynechání kol, ztížíte prokázání jakéhokoli vztahu mezi vstupy. To znamená, že můžete dále zamaskovat původ prostředků.",
   "TR_SKIP_ROUNDS_HEADING": "Povolit Trezoru vynechávat kola",
@@ -1656,6 +1703,7 @@
   "TR_STAKE_ADDING_TO_POOL": "Přidání do stake poolu",
   "TR_STAKE_ANY_AMOUNT_ETH": "Stakujte alespoň {amount} {symbol} a začněte získávat odměny. S naší aktuální sazbou APY {apyPercent} % vydělávají i vaše odměny!",
   "TR_STAKE_APY": "Roční procentní výnos",
+  "TR_STAKE_APY_ABBR": "APY",
   "TR_STAKE_APY_DESC": "*Roční procentní výnos",
   "TR_STAKE_AVAILABLE": "K dispozici",
   "TR_STAKE_CAN_CLAIM_WARNING": "Již si můžete vybrat {amount} {symbol}. {br}Vyberte nebo počkejte, dokud se nezpracuje konec stakingu.",
@@ -1665,15 +1713,18 @@
   "TR_STAKE_CLAIM_AFTER_UNSTAKING": "Můžete vybrat, jakmile skončí období konce stakingu.",
   "TR_STAKE_CLAIM_IN_NEXT_BLOCK": "v dalším bloku",
   "TR_STAKE_CLAIM_PENDING": "Čeká na výběr",
+  "TR_STAKE_CLAIM_UNSTAKED": "Vybrat {symbol} ze zrušeného stakingu",
   "TR_STAKE_CONFIRM_AND_STAKE": "Potvrdit a stakovat",
   "TR_STAKE_CONFIRM_ENTRY_PERIOD": "Potvrdit období vstupu",
   "TR_STAKE_CONSENT_TO_STAKING_WITH_EVERSTAKE": "Beru na vědomí a souhlasím se stakingem na Everstake",
   "TR_STAKE_DAYS": "{count, plural, one {# den} few {# dny} other {# dní}}",
   "TR_STAKE_DELEGATED": "Delegace staku",
   "TR_STAKE_DEREGISTERED": "Zrušení registrace stake adresy",
+  "TR_STAKE_EARN_REWARDS_WEEKLY": "Získávejte odměny každý týden",
   "TR_STAKE_ENTERING_POOL_MAY_TAKE": "Vstup do stake poolu může trvat až {count, plural, one {# den} few {# dny} other {# dní}}",
+  "TR_STAKE_ENTER_THE_STAKING_POOL": "Zapojte se do stake poolu",
   "TR_STAKE_ETH": "Stake Ethereum",
-  "TR_STAKE_ETH_CARD_TITLE": "Nejsnazší způsob, jak získat {symbol}.",
+  "TR_STAKE_ETH_CARD_TITLE": "Nejsnazší způsob, jak získat {symbol}",
   "TR_STAKE_ETH_EARN_REPEAT": "Zapojte se. Získejte odměny. Opakujte proces.",
   "TR_STAKE_ETH_EVERSTAKE": "Trezor a Everstake",
   "TR_STAKE_ETH_EVERSTAKE_DESC": "Everstake je přední světový vývojář a dodavatel technologie stakingu",
@@ -1684,17 +1735,21 @@
   "TR_STAKE_ETH_REWARDS_EARN": "Vaše odměny také vydělávají. Nechte je stakovat a sledujte, jak vaše odměny za {symbol} stoupají.",
   "TR_STAKE_ETH_REWARDS_EARN_APY": "Vaše odměny {symbol} také vydělávají se sazbou APY. Stakujte své prostředky nebo přidejte další, abyste zvýšili své odměny.",
   "TR_STAKE_ETH_SEE_MONEY_DANCE": "Sledujte, jak se peníze sypou",
-  "TR_STAKE_ETH_SEE_MONEY_DANCE_DESC": "Vydělávejte {apyPercent} % APY* stakingem svého Etherea pomocí Trezoru.",
+  "TR_STAKE_ETH_SEE_MONEY_DANCE_DESC": "Vydělávejte {apyPercent} % <t>APY</t> stakingem svého Etherea pomocí Trezoru.",
   "TR_STAKE_ETH_WILL_BE_BLOCKED": "Během tohoto období bude vaše {symbol} zablokováno a toto blokování nelze zrušit. <a>Zjistit více</a>",
   "TR_STAKE_EVERSTAKE_MANAGES": "Everstake spravuje a chrání vaše stakované {symbol} <t>pomocí svých smart kontraktů, infrastruktury a technologie.</t>",
   "TR_STAKE_INSTANT": "Okamžité",
   "TR_STAKE_INSTANTLY_UNSTAKED_WITH_DAYS": "Obdrželi jste {amount} {symbol} „okamžitě“. {days, plural, =0 {} one {Zbytek vám bude vyplacen do # dne.} other { Zbytek vám bude vyplacen do # dnů.}}",
+  "TR_STAKE_IN_ACCOUNT": "{symbol} na účtu",
   "TR_STAKE_LEARN_MORE": "Zjistit více",
+  "TR_STAKE_LEAVE_STAKING_POOL": "Opustit stake pool",
   "TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL": "Nechali jsme vám {amount} {symbol}, abyste mohli zaplatit poplatky za výběr.",
+  "TR_STAKE_LEFT_SMALL_AMOUNT_FOR_WITHDRAWAL": "Nechali jsme vám malé množství {symbol}, abyste mohli zaplatit poplatky za výběr.",
   "TR_STAKE_MAX": "Maximální",
   "TR_STAKE_MAX_FEE_DESC": "Maximální poplatek je transakční poplatek sítě, který jste ochotni zaplatit v síti, abyste zajistili, že vaše transakce bude zpracována.",
   "TR_STAKE_MAX_REWARD_DAYS": "Max. {count, plural, one {# den} few {# dny} other {# dní}}",
   "TR_STAKE_MIN_AMOUNT_TOOLTIP": "Minimální vklad do staku je {amount} {symbol}",
+  "TR_STAKE_MONTHLY": "Měsíčně",
   "TR_STAKE_NEXT_PAYOUT": "Příští výplata odměn",
   "TR_STAKE_NOT_ENOUGH_FUNDS": "Nedostatek {symbol} na zaplacení síťových poplatků",
   "TR_STAKE_ONLY_REWARDS": "Pouze odměny",
@@ -1706,6 +1761,8 @@
   "TR_STAKE_REGISTERED": "Registrace stake adresy",
   "TR_STAKE_RESTAKED_BADGE": "Znovu stakováno",
   "TR_STAKE_REWARDS": "Odměny",
+  "TR_STAKE_SIGN_TRANSACTION": "Podepsat transakci",
+  "TR_STAKE_SIGN_UNSTAKING_TRANSACTION": "Podepsat transakci zrušení stakingu",
   "TR_STAKE_STAKE": "Stake",
   "TR_STAKE_STAKED_AMOUNT": "Stakovaná částka",
   "TR_STAKE_STAKED_AND_EARNING": "Staking a získávání odměn",
@@ -1713,6 +1770,7 @@
   "TR_STAKE_STAKE_MORE": "Stakovat více",
   "TR_STAKE_STAKING_IN_A_NUTSHELL": "Staking v kostce",
   "TR_STAKE_STAKING_IS": "Při stakingu dočasně uzamknete své Ethereum, abyste podpořili fungování blockchainu. Na oplátku získáte další Ethereum jako odměnu.",
+  "TR_STAKE_STAKING_PROCESS": "Proces stakingu",
   "TR_STAKE_START_STAKING": "Začněte stakovat",
   "TR_STAKE_TIME_TO_CLAIM": "Čas na výběr",
   "TR_STAKE_TOTAL_PENDING": "Celková výše staku čekající na vyřízení:",
@@ -1721,23 +1779,35 @@
   "TR_STAKE_UNSTAKED_AND_READY_TO_CLAIM": "Staking zrušen a připraveno na výběr",
   "TR_STAKE_UNSTAKE_TO_CLAIM": "Před výběrem zrušte staking",
   "TR_STAKE_UNSTAKING": "Zrušení stakingu",
+  "TR_STAKE_UNSTAKING_APPROXIMATE": "Přibližné množství {symbol}, které je okamžitě k dispozici",
+  "TR_STAKE_UNSTAKING_APPROXIMATE_DESCRIPTION": "Likvidita stake poolu umožňuje okamžité zrušení stakingu některých prostředků. Pro zbývající prostředky bude platit doba pro zrušení stakingu.",
   "TR_STAKE_UNSTAKING_PERIOD": "Doba pro zrušení stakingu",
+  "TR_STAKE_UNSTAKING_PROCESS": "Proces zrušení stakingu",
   "TR_STAKE_UNSTAKING_TAKES": "Zrušení stakingu aktuálně trvá {count, plural, one {# den} few {# dny} other {# dní}}. Po dokončení můžete s prostředky obchodovat nebo je odeslat.",
+  "TR_STAKE_WEEKLY": "Týdně",
   "TR_STAKE_WHAT_IS_STAKING": "Co je staking?",
+  "TR_STAKE_YEARLY": "Ročně",
   "TR_STAKE_YOUR_FUNDS_MAINTAINED": "Vaše stakované prostředky spravuje Everstake",
+  "TR_STAKING_AMOUNT_STAKED_INSTANTLY": "{amount} {symbol} bylo okamžitě stakováno!",
+  "TR_STAKING_AMOUNT_UNSTAKED_INSTANTLY": "Staking {amount} {symbol} byl okamžitě zrušen!",
+  "TR_STAKING_CONSOLIDATING_FUNDS": "Konsolidujeme vaše {symbol}",
   "TR_STAKING_DELEGATE": "Delegovat",
   "TR_STAKING_DEPOSIT": "Vratná záloha",
   "TR_STAKING_DEPOSIT_FEE_DECRIPTION": "Poplatek za vklad je {feeAmount} ADA a je vyžadován k registraci vaší adresy pro zahájení stakingu. Pokud se rozhodnete staking Cardana zrušit, dostanete vklad zpět.",
+  "TR_STAKING_ESTIMATED_GAINS": "Odhadované zisky",
   "TR_STAKING_FEE": "Poplatek",
+  "TR_STAKING_GETTING_READY": "{symbol} vám začne vydělávat",
   "TR_STAKING_INSTANTLY_STAKED": "Okamžitě jste stakovali {amount} {symbol}. {days, plural, =0 {} one {Zbytek {symbol} se stakuje do # dne.} other { Zbytek {symbol} se stakuje do # dnů.}}",
   "TR_STAKING_IS_NOT_SUPPORTED": "Staking není v této síti podporován.",
   "TR_STAKING_NOT_ENOUGH_FUNDS": "Na účtu nemáte dostatek prostředků.",
+  "TR_STAKING_ONCE_YOU_CONFIRM": "Jakmile potvrdíte",
   "TR_STAKING_ON_3RD_PARTY_DESCRIPTION": "Stakingem na stake pool Trezor přímo podporujete ekosystém Trezor a Cardano v rámci Trezor Suite.",
   "TR_STAKING_ON_3RD_PARTY_TITLE": "Delegujete na stake pool třetí strany",
   "TR_STAKING_POOL_OVERSATURATED_DESCRIPTION": "Stake pool, na který delegujete, je přesycen. Delegujte svůj vklad znovu, abyste maximalizovali své odměny za staking",
   "TR_STAKING_POOL_OVERSATURATED_TITLE": "Stake pool je přesycený",
   "TR_STAKING_REDELEGATE": "Znovu delegovat",
   "TR_STAKING_REWARDS": "Dostupné odměny",
+  "TR_STAKING_REWARDS_ARE_RESTAKED": "Odměny jsou automaticky znovu stakovány",
   "TR_STAKING_REWARDS_DESCRIPTION": "Upozorňujeme, že po počáteční registraci a delegaci stakingu může trvat až 20 dní, než začnete dostávat odměny. Po uplynutí této doby budete dostávat odměny každých 5 dní.",
   "TR_STAKING_REWARDS_TITLE": "Staking Cardana je aktivní",
   "TR_STAKING_STAKE_ADDRESS": "Vaše stake adresa",
@@ -1746,6 +1816,9 @@
   "TR_STAKING_TREZOR_POOL_FAIL": "Nepodařilo se nám připojit ke stake poolu Trezor, na který by bylo možné delegovat.",
   "TR_STAKING_TX_PENDING": "Vaše transakce {txid} byla odeslána do blockchainu a čeká na potvrzení.",
   "TR_STAKING_WITHDRAW": "Vybrat",
+  "TR_STAKING_YOUR_EARNINGS": "Vaše odměny jsou automaticky znovu stakovány, díky čemuž získáte <a>složený úrok</a>.",
+  "TR_STAKING_YOUR_UNSTAKED_FUNDS": "{symbol} ze zrušeného stakingu je k dispozici",
+  "TR_STAKING_YOU_ARE_HERE": "Jste tady",
   "TR_STANDARD_WALLET_DESCRIPTION": "Bez passphrase",
   "TR_START": "Začít",
   "TR_START_AGAIN": "Začít znovu",
@@ -1754,6 +1827,7 @@
   "TR_START_COINJOIN": "Spustit coinjoin",
   "TR_START_RECOVERY": "Spustit obnovení",
   "TR_STEP": "Krok {number}",
+  "TR_STEP_OF_TOTAL": "Krok {index} z {total}",
   "TR_STILL_DONT_SEE_YOUR_TREZOR": "Stále nevidíte svůj Trezor?",
   "TR_STOP": "Zastavit",
   "TR_STOPPING": "Zastavuji",
@@ -1805,7 +1879,11 @@
   "TR_TOKENS_EMPTY": "Zatím žádné tokeny…",
   "TR_TOKENS_EMPTY_CHECK_HIDDEN": "Žádné tokeny. Možná jsou skryté.",
   "TR_TOKENS_SEARCH_TOOLTIP": "Zkuste hledat podle tokenu, symbolu nebo adresy kontraktu.",
+  "TR_TOKEN_NOT_FOUND": "Token nebyl nalezen",
+  "TR_TOKEN_NOT_FOUND_ON_NETWORK": "Token nebyl nalezen v síti {networkName}.",
   "TR_TOKEN_TRANSFERS": "{standard} převody tokenů",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH": "Zkuste upravit vyhledávání.",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH_OR_SWITCH": "Zkuste upravit vyhledávání nebo přepněte na jinou síť.",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR": "Nerozpoznané tokeny",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR_TOOLTIP": "Nerozpoznané tokeny představují potenciální riziko. Buďte opatrní.",
   "TR_TOO_LONG": "Zpráva je příliš dlouhá",
@@ -1817,18 +1895,24 @@
   "TR_TOR_CONFIG_SNOWFLAKE_UPDATE_LABEL": "Aktualizovat cestu",
   "TR_TOR_DESCRIPTION": "Směrujte veškerý provoz Trezor Suite přes síť Tor, čímž se zvýší vaše soukromí a zabezpečení. Může chvíli trvat, než se Tor načte a naváže spojení.",
   "TR_TOR_DISABLE": "Vypnout Tor",
+  "TR_TOR_DISABLED": "Vypnuto",
   "TR_TOR_DISABLE_ONIONS_ONLY": "Chybí vlastní backendy, které nejsou onion",
   "TR_TOR_DISABLE_ONIONS_ONLY_DESCRIPTION": "Přidejte vlastní adresy backendu, které nejsou na bázi onion, aby nedocházelo k tomuto chování.",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_DESCRIPTION": "Nyní můžete Tor bezpečně vypnout.",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_TITLE": "Vlastní backendy již nepoužívají pouze adresy onion.",
   "TR_TOR_DISABLE_ONIONS_ONLY_RESOLVED": "Vypnout Tor",
   "TR_TOR_DISABLE_ONIONS_ONLY_TITLE": "Vypnutím Toru se všechny onion backendy přenastaví na výchozí servery Trezoru.",
+  "TR_TOR_DISABLING": "Vypínání",
   "TR_TOR_ENABLE": "Zapnout Tor",
+  "TR_TOR_ENABLED": "Zapnuto",
   "TR_TOR_ENABLE_AND_CONFIRM": "Zapnout Tor a potvrdit",
   "TR_TOR_ENABLE_TITLE": "Zapnout Tor",
+  "TR_TOR_ENABLING": "Zapínání",
+  "TR_TOR_ERROR": "Chyba",
   "TR_TOR_IS_SLOW_MESSAGE": "Tor se připojuje k síti.<br></br>Čekejte prosím.",
   "TR_TOR_KEEP_RUNNING": "Nechat Tor běžet",
-  "TR_TOR_KEEP_RUNNING_FOR_COIN_JOIN_SUBTITLE": "Chcete-li pokračovat, vyberte možnost „Nechat Tor běžet“ nebo „Zastavit Tor“.",
+  "TR_TOR_KEEP_RUNNING_FOR_COIN_JOIN_SUBTITLE": "Pokračujte výběrem možnosti „Nechat Tor běžet“ nebo výběrem „Zastavit Tor“ proces coinjoinu ukončete.",
+  "TR_TOR_MISBEHAVING": "Nesprávné chování",
   "TR_TOR_REMOVE_ONION_AND_DISABLE": "Vypnout Tor a přepnout na výchozí backendy",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_LEAVE": "Opustit",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_SUBTITLE": "Pokračujte výběrem možnosti „Povolit Tor“ nebo výběrem „Odejít“ proces ukončete.",
@@ -1843,11 +1927,7 @@
   "TR_TO_BTC": "Na BTC",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "Chcete-li, aby vaše popisky byly konzistentní a dostupné na všech zařízeních, připojte se ke cloudovému úložišti.",
   "TR_TO_SATOSHIS": "Na satoshi",
-  "TR_TRADE_BUYS": "kupuje",
-  "TR_TRADE_ENTER_COIN": "Zadejte název nebo symbol kryptoměny…",
-  "TR_TRADE_EXCHANGES": "směňuje",
   "TR_TRADE_REDIRECTING": "Přesměrování…",
-  "TR_TRADE_SELLS": "prodává",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "Historie transakcí není k dispozici",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "Tip: Můžete vyhledávat ID transakcí, adresy, tokeny, popisky, částky a data.",
   "TR_TRANSACTIONS_SEARCH_TIP_10": "Tip: Kombinací operátorů AND (&) a OR (|) můžete získat podrobnější výsledky. Například <strong>> {lastYear}-01-01 & < {lastYear}-01-31 | > {lastYear}-12-01 & < {lastYear}-12-31</strong> zobrazí všechny transakce z ledna nebo prosince {lastYear}.",
@@ -1862,6 +1942,7 @@
   "TR_TRANSACTIONS_SEARCH_TOOLTIP": "Vyhledávejte podle ID transakce, popisku nebo částky nebo použijte operátory jako < > | & = !=.",
   "TR_TRANSACTION_DETAILS": "Detaily",
   "TR_TREZOR_BRIDGE_RUNNING_VERSION": "Trezor Bridge ve verzi {version}",
+  "TR_TREZOR_CONNECT": "Trezor Connect",
   "TR_TREZOR_DEVICE_TUTORIAL_CANCELED_HEADING": "Tutoriál zrušen",
   "TR_TREZOR_DEVICE_TUTORIAL_COMPLETED_HEADING": "Tutoriál dokončen",
   "TR_TREZOR_DEVICE_TUTORIAL_DESCRIPTION": "Naučte se používat zařízení pomocí krátkého tutoriálu",
@@ -1869,32 +1950,40 @@
   "TR_TROUBLESHOOTING_CLOSE_TABS": "Zavřete ostatní panely a okna, které mohou používat váš Trezor",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION": "Po zavření ostatních panelů a oken zkuste tuto stránku obnovit.",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION_DESKTOP": "Po zavření ostatních panelů a oken prohlížeče zkuste aplikaci Trezor Suite zavřít a znovu otevřít.",
-  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Kroky potřebné k povolení komunikace",
+  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Zkuste problém vyřešit pomocí těchto kroků.",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_DESCRIPTION": "Navštivte <a>stránku se stavem Trezor Bridge</a>",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_TITLE": "Ujistěte se, že běží proces Trezor Bridge",
-  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Přímou komunikaci se zařízeními USB v současné době umožňují pouze prohlížeče založené na platformě Chromium",
+  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Přímou komunikaci se zařízeními USB v současné době umožňují pouze prohlížeče založené na platformě Chromium.",
   "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_TITLE": "Použijte prohlížeč založený na platformě Chromium",
   "TR_TROUBLESHOOTING_TIP_CABLE_DESCRIPTION": "Kabel musí být zcela zasunutý. Pokud máte zařízení s USB-C, měl by kabel zapadnout na místo.",
   "TR_TROUBLESHOOTING_TIP_CABLE_TITLE": "Vyzkoušejte jiný kabel",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_DESCRIPTION": "S nainstalovanou aplikací Trezor Bridge.",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_TITLE": "Zkuste použít jiný počítač, pokud je to možné",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Pro všechny případy",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Zkuste restartovat počítač",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Restartování počítače může vyřešit problém s komunikací mezi prohlížečem a zařízením.",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Restartujte počítač",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_DESCRIPTION": "Spustit desktopovou aplikaci <a>Trezor Suite</a>",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE": "Použijte desktopovou aplikaci Trezor Suite",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_DESCRIPTION": "<a>Kliknutím můžete přepínat</a> mezi různými implementaci bridge. Aktuální verze: ({currentVersion})",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_TITLE": "Použijte jinou verzi Trezor Bridge",
   "TR_TROUBLESHOOTING_TIP_UDEV_INSTALL_DESCRIPTION": "Zkuste nainstalovat <a>pravidla udev</a>. Před otevřením zkontrolujte, že se uložila do počítače.",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_DESCRIPTION": "Pokud jste firmware zařízení naposledy aktualizovali v roce 2019 nebo dříve, postupujte podle pokynů v <a>databázi znalostí</a>",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_TITLE": "Zdá se, že používáte starší model Trezoru.",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_DESCRIPTION": "Připojte jej přímo k počítači (ne do rozbočovače USB).",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_TITLE": "Vyzkoušejte jiný port USB",
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "Instalovat pravidla automaticky",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "Chybějící pravidla udev",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "Neočekávaný stav: {error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "Zařízení je správně připojeno, ale prohlížeč s ním momentálně nemůže komunikovat. Je potřeba nainstalovat aplikaci Trezor Bridge.",
   "TR_TRY_AGAIN": "Zkusit znovu",
   "TR_TXID": "TX ID",
   "TR_TXID_RBF": "Původní TX ID, které má být nahrazeno",
   "TR_TX_CONFIRMATIONS": "{confirmationsCount}x",
   "TR_TX_CONFIRMED": "Transakce potvrzena",
   "TR_TX_CONFIRMING": "Potvrzení transakce",
+  "TR_TX_DATA_FUNCTION": "Funkce",
+  "TR_TX_DATA_INPUT_DATA": "Vstupní data",
+  "TR_TX_DATA_METHOD": "Vstupní data",
+  "TR_TX_DATA_METHOD_NAME": "Název metody",
+  "TR_TX_DATA_PARAMS": "Parametry",
   "TR_TX_DEPOSIT": "Vklad",
   "TR_TX_FEE": "Poplatek",
   "TR_TX_TAB_AMOUNT": "Částka",
@@ -1934,13 +2023,18 @@
   "TR_UPDATE_FIRMWARE_HOMESCREEN_LATER_TOOLTIP": "Je vyžadována aktualizace firmwaru. Domovskou obrazovku můžete později změnit v nastavení",
   "TR_UPDATE_FIRMWARE_HOMESCREEN_TOOLTIP": "Aktualizujte firmware, abyste mohli změnit domovskou obrazovku",
   "TR_UPDATE_MODAL_AVAILABLE_HEADING": "Je dostupná aktualizace",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES": "Povolit automatické aktualizace",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG": "Nové",
   "TR_UPDATE_MODAL_INSTALL_AND_RESTART": "Aktualizovat a restartovat",
   "TR_UPDATE_MODAL_INSTALL_NOW_OR_LATER": "Nainstalovat aktualizaci?",
   "TR_UPDATE_MODAL_NOT_NOW": "Teď ne",
-  "TR_UPDATE_MODAL_RESTART_NEEDED": "Dojde k restartování aplikace Trezor Suite",
+  "TR_UPDATE_MODAL_RESTART_NEEDED": "Dojde k restartování aplikace Trezor Suite.",
   "TR_UPDATE_MODAL_START_DOWNLOAD": "Stáhnout",
   "TR_UPDATE_MODAL_UPDATE_DOWNLOADED": "Aktualizace stažena",
   "TR_UPDATE_MODAL_UPDATE_ON_QUIT": "Aktualizovat po ukončení",
+  "TR_UPDATE_MODAL_WHATS_NEW": "Co je nového?",
+  "TR_UPDATE_MODAL_YOUR_VERSION": "Vaše verze: v{version}",
+  "TR_UPGRADE_FIRMWARE_TO_DISCOVER_ACCOUNT_ERROR": "Přístup k tomuto účtu získáte po upgradu firmwaru. Viz modrý pruh nahoře.",
   "TR_UP_TO": "až",
   "TR_UP_TO_DATE": "Aktuální",
   "TR_UP_TO_DAYS": "až {count, plural, one {# den} few {# dny} other {# dní}}",
@@ -1994,6 +2088,7 @@
   "TR_WALLET_SELECTION_ACCESS_HIDDEN_WALLET": "Otevřít passphrase peněženku",
   "TR_WALLET_SELECTION_HIDDEN_WALLET": "Passphrase peněženka",
   "TR_WELCOME_TO_TREZOR_TEXT_WALLET_CREATION": "Vytvořte si novou peněženku nebo ji obnovte ze zálohy peněženky.",
+  "TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE": "Vždy se snažíme vám vylepšit používání Trezoru. Zde najdete popis novinek:",
   "TR_WEST": "Západ",
   "TR_WHAT_DATA_WE_COLLECT": "Jaké údaje shromažďujeme?",
   "TR_WHAT_IS_PASSPHRASE": "V čem je rozdíl",
@@ -2004,7 +2099,7 @@
   "TR_WIPE_DEVICE_CHECKBOX_2_TITLE": "Beru na vědomí, že musím mít zálohu peněženky, pokud chci získat přístup ke svým prostředkům",
   "TR_WIPE_DEVICE_TEXT": "Resetováním zařízení z něj odstraníte všechna data. Zařízení resetujte pouze v případě, že máte zálohu peněženky, která vám umožní obnovit přístup k prostředkům.",
   "TR_WIPE_OR_UPDATE": "Resetování zařízení nebo aktualizace firmwaru",
-  "TR_WIPE_OR_UPDATE_DESCRIPTION": "Přejděte do nastavení zařízení",
+  "TR_WIPE_OR_UPDATE_DESCRIPTION": "Přejděte do nastavení zařízení.",
   "TR_WIPING_YOUR_DEVICE": "Obnovení továrního nastavení vymaže paměť zařízení, čímž se vymažou všechny informace včetně zálohy peněženky a PIN kódu. Tovární nastavení obnovte pouze v případě, že máte zálohu peněženky, která je potřeba k obnovení přístupu k prostředkům.",
   "TR_WORDS": "Slova: {count}",
   "TR_WORD_DOES_NOT_EXIST": "Slovo „{word}“ neexistuje v seznamu slov BIP39.",
diff --git a/packages/suite-data/files/translations/de.json b/packages/suite-data/files/translations/de.json
index 656f347c3d7..1799c0204cd 100644
--- a/packages/suite-data/files/translations/de.json
+++ b/packages/suite-data/files/translations/de.json
@@ -1,5 +1,6 @@
 {
   "AMOUNT": "Betrag",
+  "AMOUNT_EXCEEDS_MAX": "Der Betrag übersteigt den zulässigen Höchstwert von {maxAmount}.",
   "AMOUNT_IS_BELOW_DUST": "Betrag muss mindestens {dust} sein",
   "AMOUNT_IS_LESS_THAN_RESERVE": "Das Empfängerkonto erfordert zur Aktivierung eine Mindestreserve von {reserve} XRP",
   "AMOUNT_IS_MORE_THAN_RESERVE": "Betrag liegt über der erforderlichen nicht abhebbaren Reserve ({reserve} XRP)",
@@ -31,7 +32,7 @@
   "DATA_NOT_VALID_HEX": "Ungültiger Hex",
   "DESTINATION_TAG": "Destination-Tag",
   "DESTINATION_TAG_IS_NOT_NUMBER": "Destination-Tag ist keine Zahl",
-  "DESTINATION_TAG_IS_NOT_VALID": "Destination-Tag ist ungültig",
+  "DESTINATION_TAG_IS_NOT_VALID": "Destination-Tag ist nicht gültig",
   "DESTINATION_TAG_NOT_SET": "Destination-Tag ist nicht festgelegt",
   "DESTINATION_TAG_TOOLTIP": "Ein Destination-Tag ist ein eindeutiger Code zur Identifizierung des Empfängers einer Transaktion.",
   "DISCONNECT_DEVICE_DESCRIPTION": "Dein Gerät wurde gelöscht und verwahrt keine Private Keys mehr.",
@@ -67,7 +68,7 @@
   "LOCKTIME_ADD_TOOLTIP": "Die Sperrzeit legt den frühesten Zeitpunkt fest, zu dem eine Transaktion in einen Block verarbeitet werden kann.",
   "LOCKTIME_BLOCKHEIGHT": "Sperrzeit Blockhöhe",
   "LOCKTIME_IS_NOT_INTEGER": "Sperrzeit ist keine ganze Zahl",
-  "LOCKTIME_IS_NOT_SET": "Sperrzeit nicht festgelegt",
+  "LOCKTIME_IS_NOT_SET": "Sperrzeit ist nicht festgelegt",
   "LOCKTIME_IS_TOO_BIG": "Zeitstempel ist zu groß",
   "LOCKTIME_IS_TOO_LOW": "Sperrzeit ist zu niedrig",
   "LOCKTIME_SCHEDULE_SEND": "Sperrzeit",
@@ -124,7 +125,7 @@
   "RECIPIENT_ADDRESS": "Adresse",
   "RECIPIENT_CANNOT_SEND_TO_MYSELF": "Kann nicht an mich selbst gesendet werden",
   "RECIPIENT_IS_NOT_SET": "Adresse ist nicht festgelegt",
-  "RECIPIENT_IS_NOT_VALID": "Adresse ist ungültig",
+  "RECIPIENT_IS_NOT_VALID": "Adresse ist nicht gültig",
   "RECIPIENT_REQUIRES_UPDATE": "Taproot wird von deiner Firmware-Version nicht unterstützt. Aktualisiere deine Geräte-Firmware.",
   "RECIPIENT_SCAN": "Scannen",
   "REFRESH": "Aktualisieren",
@@ -168,6 +169,7 @@
   "TOAST_PIN_CHANGED": "PIN erfolgreich geändert",
   "TOAST_QR_INCORRECT_ADDRESS": "Der QR-Code enthält eine ungültige Adresse für dieses Konto",
   "TOAST_QR_INCORRECT_COIN_SCHEME_PROTOCOL": "QR-Code ist für {coin}-Konto definiert",
+  "TOAST_QR_UNKNOWN_SCHEME_PROTOCOL": "Unbekanntes Protokollschema: „{scheme}“. Versuche es erneut, oder gib die Adresse manuell ein.",
   "TOAST_RAW_TX_SENT": "Transaktion gesendet. TXID: {txid}",
   "TOAST_SETTINGS_APPLIED": "Einstellungen erfolgreich geändert",
   "TOAST_SIGN_MESSAGE_ERROR": "Fehler in der Nachrichten-Signatur: {error}",
@@ -193,7 +195,6 @@
   "TR_404_GO_TO_DASHBOARD": "Zum Dashboard",
   "TR_404_TITLE": "Fehler 404: Link nicht gefunden",
   "TR_7D_CHANGE": "7T-Änderung",
-  "TR_ABORT": "Abbrechen",
   "TR_ACCESS_HIDDEN_WALLET": "Zugriff auf Passphrase Wallet",
   "TR_ACCESS_STANDARD_WALLET": "Zugriff auf Standard-Wallet",
   "TR_ACCOUNT_DETAILS_HEADER": "Kontoinformationen",
@@ -232,10 +233,16 @@
   "TR_ACCOUNT_TYPE_BIP86_DESC": "Taproot ist ein neuer Adresstyp, der Privatsphäre und Netzwerkeffizienz verbessern kann. Beachte, dass einige Dienste möglicherweise noch keine Taproot-Adressen unterstützen.",
   "TR_ACCOUNT_TYPE_BIP86_NAME": "Taproot",
   "TR_ACCOUNT_TYPE_BIP86_TECH": "BIP86, P2TR, Bech32m",
+  "TR_ACCOUNT_TYPE_CARDANO_DESC": "Mit der aktuellen und am weitesten verbreiteten Methode zur Generierung und Verwaltung von Cardano-Adressen wird Interoperabilität, Sicherheit und die Unterstützung aller Arten von Tokens gewährleistet.",
   "TR_ACCOUNT_TYPE_COINJOIN": "CoinJoin",
+  "TR_ACCOUNT_TYPE_DEFAULT": "Standard",
   "TR_ACCOUNT_TYPE_IMPORTED": "Importiert",
   "TR_ACCOUNT_TYPE_LEDGER": "Ledger",
+  "TR_ACCOUNT_TYPE_LEDGER_DESC": "Ledger-Konten sind kompatibel mit Ableitungspfaden von Ledger Live und gewährleisten so die reibungslose Migration von Ledger auf Trezor.",
   "TR_ACCOUNT_TYPE_LEGACY": "Veraltet",
+  "TR_ACCOUNT_TYPE_LEGACY_DESC": "Veraltete Konten sind kompatibel mit Ableitungspfaden von Ledger Legacy und gewährleisten so die reibungslose Migration von Ledger auf Trezor.",
+  "TR_ACCOUNT_TYPE_NORMAL_EVM_DESC": "Mit der aktuellen und am weitesten verbreiteten Methode zur Generierung und Verwaltung von {value}-Adressen wird Interoperabilität, Sicherheit und die Unterstützung aller Arten von Tokens gewährleistet.",
+  "TR_ACCOUNT_TYPE_NORMAL_SOLANA_DESC": "Mit der aktuellen und am weitesten verbreiteten Methode zur Generierung und Verwaltung von Solana-Adressen wird Interoperabilität, Sicherheit und die Unterstützung von SOL und SPL-Tokens gewährleistet.",
   "TR_ACCOUNT_TYPE_NO_CAPABILITY": "Nicht unterstützt.",
   "TR_ACCOUNT_TYPE_NO_SUPPORT": "Diese Kontoart wird von diesem Trezor Modell nicht unterstützt.",
   "TR_ACCOUNT_TYPE_SEGWIT": "Veraltetes SegWit",
@@ -249,10 +256,12 @@
   "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_TECH": "BIP44, Base58",
   "TR_ACCOUNT_TYPE_TAPROOT": "Taproot",
   "TR_ACCOUNT_TYPE_UPDATE_REQUIRED": "Bitte aktualisiere die Firmware des Geräts, um diese Kontoart zu aktivieren.",
+  "TR_ACCOUNT_TYPE_XRP_DESC": "XRP ist eine digitale Währung, die schnelle, kostengünstige internationale Zahlungen ermöglicht, ohne auf herkömmliches Mining angewiesen zu sein. Dabei wird ein Konsens-Ledger zur schnellen Bestätigung von Transaktionen genutzt.",
   "TR_ACQUIRE_DEVICE": "Trezor hier verwenden",
   "TR_ACQUIRE_DEVICE_TITLE": "Weitere Sitzung aktiv",
   "TR_ACTIVATED_COINS": "Aktivierte Coins",
   "TR_ACTIVE": "aktiv",
+  "TR_ADD": "Hinzufügen",
   "TR_ADDRESSES": "Adresse",
   "TR_ADDRESSES_CHANGE": "Adressen ändern",
   "TR_ADDRESSES_FRESH": "Neue Adressen",
@@ -262,7 +271,7 @@
   "TR_ADDRESS_MODAL_CLIPBOARD": "Adresse kopieren",
   "TR_ADDRESS_MODAL_TITLE": "Empfängeradresse für {networkName}",
   "TR_ADDRESS_MODAL_TITLE_EXCHANGE": "{networkCurrencyName} Empfängeradresse auf dem {networkName} Netzwerk",
-  "TR_ADDRESS_PHISHING_WARNING": "Um Phishing-Angriffe zu verhindern, solltest du die Adresse auf deinem Trezor verifizieren. {claim}",
+  "TR_ADDRESS_PHISHING_WARNING": "Um Phishing-Angriffe zu verhindern, verifiziere die Empfängeradresse auf deinem Trezor. {claim}",
   "TR_ADD_ACCOUNT": "Konto hinzufügen",
   "TR_ADD_HIDDEN_WALLET": "Passphrase Wallet",
   "TR_ADD_NETWORK_ACCOUNT": "{network}-Konto hinzufügen",
@@ -289,7 +298,9 @@
   "TR_ALLOW_ANALYTICS": "Datennutzung",
   "TR_ALLOW_ANALYTICS_DESCRIPTION": "Alle Daten werden streng anonym gehalten. Sie werden ausschließlich zur Verbesserung des Trezor Ecosystem genutzt.",
   "TR_ALLOW_AUTOMATIC_SUITE_UPDATES": "Automatische Updates für Trezor Suite",
-  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Trezor Suite lädt im Hintergrund automatisch die neueste Version herunter. Beim Neustart der App wird diese installiert. So bleibst du bei den neuesten Funktionen und Sicherheits-Patches immer auf dem Laufenden. Updates werden ausgeführt, ohne dass du deine Zustimmung erteilen musst.",
+  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Lade im Hintergrund automatisch die neueste Version von Trezor Suite herunter und installiere sie beim Neustart der App. So bleibst du bei den neuesten Funktionen und Sicherheits-Patches immer auf dem Laufenden. Updates werden ausgeführt, ohne dass du deine Zustimmung erteilen musst.",
+  "TR_ALL_NETWORKS": "Alle Netzwerke ({networkCount})",
+  "TR_ALL_NETWORKS_TOOLTIP": "Zeige Token aus allen {networkCount} Netzwerken an. Filtere die Ergebnisse nach den beliebtesten Netzwerken.",
   "TR_ALL_TRANSACTIONS": "Transaktionen",
   "TR_AMOUNT_SENT": "Gesendeter Betrag",
   "TR_AMOUNT_TOO_BIG_FOR_COINJOIN": "Nicht für CoinJoin geeignet – Betrag zu hoch",
@@ -348,20 +359,20 @@
   "TR_BEFORE_ANY_FURTHER_ACTIONS": "Es ist zwar unwahrscheinlich, doch im Falle eines Problems beim Firmware-Update musst du möglicherweise auf dein Wallet-Backup zugreifen.",
   "TR_BIP_SIG_FORMAT": "Trezor",
   "TR_BITCOIN_ONLY_UNAVAILABLE": "Bevor du zu {bitcoinOnly} wechseln kannst, musst du deine Firmware auf die neueste Version aktualisieren.",
-  "TR_BREAKING_ANONYMITY_CHECKBOX": "Ich weiß, dass ich meiner Anonymität schade",
+  "TR_BREAKING_ANONYMITY_CHECKBOX": "Mir ist bewusst, dass ich meine Anonymität beeinträchtige.",
   "TR_BRIDGE": "Trezor Bridge",
   "TR_BRIDGE_DEV_MODE_START": "Starte Trezor Bridge auf Port 21324",
   "TR_BRIDGE_DEV_MODE_STOP": "Starte Trezor Bridge auf dem Standardport",
   "TR_BRIDGE_GO_TO_WALLET_DESCRIPTION": "Bist du sicher? Das Gerät kann nur von einer einzigen Anwendung gleichzeitig verwendet werden. Wenn du gerade eine andere Anwendung mit deinem Trezor Gerät verwendest, stelle sicher, dass du diese zuerst beendest.",
   "TR_BRIDGE_NEEDED_DESCRIPTION": "Wir empfehlen dir, die Trezor Suite Desktop-App herunterzuladen und im Hintergrund laufen zu lassen, um ein optimales Ergebnis zu erzielen. Alternativ verwende einen unterstützten Browser, der mit WebUSB kompatibel ist.",
   "TR_BRIDGE_REQUESTED_DESCRIPTION": "Die Trezor Suite wurde von einer anderen Anwendung angefordert, um die Verbindung zu deinem Trezor-Gerät zu ermöglichen. Lass diese im Hintergrund laufen und alles wird gut.",
+  "TR_BRIDGE_TIP_AUTOSTART": "Tipp: Aktiviere die automatische Startfunktion, und lass Bridge immer im Hintergrund laufen.",
   "TR_BTC_UNITS": "Bitcoin-Einheiten",
   "TR_BUG": "Fehler",
   "TR_BUMP_FEE": "Transaktion beschleunigen",
+  "TR_BUMP_FEE_DISABLED_TOOLTIP": "Erhöhe die Gebühr für die älteste (nach Nonce) ausstehende Transaktion in der Warteschlange, um deine Transaktionen zu beschleunigen. Transaktionen müssen der Reihe nach bestätigt werden. <a>Mehr erfahren</a>",
   "TR_BUY": "Kaufen",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "Handelstransaktionen",
   "TR_BUY_BUY": "Kaufen",
-  "TR_BUY_BUY_AGAIN": "Erneut kaufen",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Auf Trezor bestätigt",
   "TR_BUY_DETAIL_ERROR_BUTTON": "Zurück zum Konto",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "Zum Anbieter-Support",
@@ -386,12 +397,12 @@
   "TR_BUY_MODAL_FOR_YOUR_SAFETY": "{cryptocurrency} mit {provider} kaufen",
   "TR_BUY_MODAL_LEGAL_HEADER": "Rechtlicher Hinweis",
   "TR_BUY_MODAL_SECURITY_HEADER": "Sicherheit geht bei Trezor vor",
-  "TR_BUY_MODAL_TERMS_1": "Du bist hier, um Kryptowährung zu kaufen. Wenn du aus einem anderen Grund auf diese Seite weitergeleitet wurdest, kontaktiere den {provider}-Support, bevor du fortfährst.",
-  "TR_BUY_MODAL_TERMS_2": "Du nutzt diese Funktion, um Assets zu kaufen, die an ein Konto unter deiner direkten persönlichen Kontrolle gesendet werden.",
-  "TR_BUY_MODAL_TERMS_3": "Dir ist klar, dass Krypto-Transaktionen unwiderruflich sind und nicht zurückerstattet werden können. Daher können betrügerische oder versehentliche Verluste permanent sein.",
-  "TR_BUY_MODAL_TERMS_4": "Dir ist klar, dass Invity diesen Dienst nicht anbietet. Der Dienst unterliegt den Bedingungen von {provider}.",
-  "TR_BUY_MODAL_TERMS_5": "Du nutzt diese Funktion nicht für Glücksspiele, Betrug oder andere Verstöße gegen die Nutzungsbedingungen von Invity oder des Anbieters oder gegen geltende Vorschriften.",
-  "TR_BUY_MODAL_TERMS_6": "Dir ist klar, dass Kryptowährungen ein aufstrebendes Finanzinstrument sind und dass die Vorschriften in verschiedenen Ländern unterschiedlich sein können. Daher kannst du einem höheren Risiko von Betrug, Diebstahl oder Marktunsicherheit ausgesetzt sein.",
+  "TR_BUY_MODAL_TERMS_1": "Ich bin hier, um Kryptowährungen zu kaufen. Wenn ich aus einem anderen Grund auf diese Seite weitergeleitet wurde, kontaktiere ich den {provider} Support, bevor ich fortfahre.",
+  "TR_BUY_MODAL_TERMS_2": "Ich nutze diese Funktion, um Kryptowährungen zu kaufen, die an mein eigenes Konto gesendet werden.",
+  "TR_BUY_MODAL_TERMS_3": "Mir ist bewusst, dass Krypto-Transaktionen endgültig sind und nicht rückgängig gemacht oder zurückerstattet werden können. Durch Betrug oder Fehler entstandene Verluste können möglicherweise nicht wiederhergestellt werden.",
+  "TR_BUY_MODAL_TERMS_4": "Mir ist bewusst, dass Invity diesen Dienst nicht anbietet. Er unterliegt den Geschäftsbedingungen von {provider}.",
+  "TR_BUY_MODAL_TERMS_5": "Ich nutze diese Funktion nicht für Spekulation, Betrug oder jegliche Aktivitäten, die gegen die Nutzungsbedingungen von Invity oder des Anbieters oder gegen geltende Vorschriften verstoßen.",
+  "TR_BUY_MODAL_TERMS_6": "Mir ist bewusst, dass Kryptowährungen ein aufstrebendes Finanzinstrument sind und dass die Vorschriften je nach Region unterschiedlich sein können. Dadurch kann das Risiko von Betrug, Diebstahl oder Marktunsicherheit erhöht sein.",
   "TR_BUY_MODAL_VERIFIED_PARTNERS_HEADER": "Verifizierte Partner von Invity",
   "TR_BUY_NETWORK": "{network} kaufen",
   "TR_BUY_NOT_TRANSACTIONS": "Noch keine Transaktionen.",
@@ -406,12 +417,10 @@
   "TR_BUY_STATUS_PENDING": "In Bearbeitung",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "In Bearbeitung",
   "TR_BUY_STATUS_SUCCESS": "Bestätigt",
-  "TR_BUY_TRANS_ID": "Trans. ID:",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "Maximum liegt bei {maximum}",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "Maximum liegt bei {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "Minimum liegt bei {minimum}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "Minimum liegt bei {minimum} {currency}",
-  "TR_BUY_VIEW_DETAILS": "Details anzeigen",
   "TR_BYTES": "Bytes",
   "TR_CAMERA_NOT_RECOGNIZED": "Die Kamera wurde nicht erkannt.",
   "TR_CAMERA_PERMISSION_DENIED": "Der Zugriff auf die Kamera wurde verweigert.",
@@ -430,12 +439,12 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Trezor Betrag",
   "TR_CHAINED_TXS": "Verkettete Transaktionen",
   "TR_CHANGELOG": "Änderungsprotokoll",
-  "TR_CHANGELOG_ON_GITHUB": "Änderungsprotokoll auf GitHub",
   "TR_CHANGE_ADDRESS_TOOLTIP": "Dies ist eine Wechselgeldadresse, die aus einer früheren Sendung stammt.",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "Du kannst deinen Firmware-Typ jederzeit in den Einstellungen ändern.",
   "TR_CHANGE_HOMESCREEN": "Startbildschirm ändern",
   "TR_CHANGE_PIN": "PIN ändern",
   "TR_CHANGE_WIPE_CODE": "Löschcode ändern",
+  "TR_CHECKED_BALANCES_ON": "Guthaben geprüft auf",
   "TR_CHECKING_YOUR_DEVICE": "Dein Gerät wird überprüft",
   "TR_CHECKSUM_CONVERSION_INFO": "In Prüfsumme umgewandelt. <a>Mehr erfahren</a>",
   "TR_CHECK_DEVICE_ORIGIN_DESCRIPTION": "Wir überprüfen die Integrität deines Trezor Geräts, um dessen Sicherheit zu gewährleisten und die Echtheit des Chips zu bestätigen.",
@@ -447,8 +456,7 @@
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "Führe eine simulierte Wiederherstellung durch, um dein Wallet-Backup zu überprüfen.",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "Gib hier die Wörter aus deinem Wallet-Backup in der auf dem Gerät angezeigten Reihenfolge ein. Du wirst möglicherweise aufgefordert, als zusätzliche Sicherheitsmaßnahme einige Wörter einzugeben, die nicht Teil deines Wallet-Backups sind.",
   "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "Verwende die Zwei-Tasten-Tastatur, um dein Wallet-Backup einzugeben. Dadurch hältst du all deine sensiblen Daten sicher und geschützt, fern von zwielichtigen oder unsicheren Computern oder Webbrowsern.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "Dein Wallet-Backup wird über den Touchscreen eingegeben. So werden deine sensiblen Daten vor unsicheren Computern oder Webbrowsern geschützt.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "Dein Wallet-Backup wird über den Touchscreen eingegeben. So werden deine sensiblen Daten vor unsicheren Computern oder Webbrowsern geschützt.",
+  "TR_CHECK_RECOVERY_SEED_DESC_TOUCHSCREEN": "Dein Wallet-Backup wird über den Touchscreen eingegeben. So werden deine sensiblen Daten vor unsicheren Computern oder Webbrowsern geschützt.",
   "TR_CHECK_SEED": "Backup überprüfen",
   "TR_CHECK_YOUR_DEVICE": "Deinen Trezor Bildschirm überprüfen",
   "TR_CHOOSE_RECOVERY_TYPE": "Wiederherstellungstyp wählen",
@@ -502,10 +510,37 @@
   "TR_COINJOIN_TILE_3_TITLE": "Geschützt durch deinen Trezor",
   "TR_COINJOIN_TRANSACTION_BATCH": "CoinJoin-Transaktionen",
   "TR_COINMARKET_BEST_RATE": "Bester Preis",
+  "TR_COINMARKET_BUY_AND_SELL": "Kaufen und verkaufen",
+  "TR_COINMARKET_BUY_AND_SELL_COUNTER": "{totalBuys, plural, =0 {{totalBuys} Kauf} one {{totalBuys} Kauf} other {{totalBuys} Käufe} } • {totalSells, plural, =0 {{totalSells} Verkauf} one {{totalSells} Verkauf} other {{totalSells} Verkäufe} }",
+  "TR_COINMARKET_CEX_TOOLTIP": "Zentrale Börse",
+  "TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY": "Ändere den Betrag oder die Währung.",
   "TR_COINMARKET_COMPARE_OFFERS": "Alle Angebote vergleichen",
   "TR_COINMARKET_COUNTRY": "Wohnsitzland",
+  "TR_COINMARKET_DCA_DOWNLOAD": "Lade die mobile App von Invity herunter und spare in Bitcoin",
+  "TR_COINMARKET_DCA_FEATURE_1_DESCRIPTION": "Ein sicherer und einfacher verwalteter DCA-Sparplan.",
+  "TR_COINMARKET_DCA_FEATURE_1_SUBHEADING": "Entwickelt von SatoshiLabs",
+  "TR_COINMARKET_DCA_FEATURE_2_DESCRIPTION": "Lass dir ohne zusätzliche Gebühren Mittel zur Selbstverwaltung auszahlen.",
+  "TR_COINMARKET_DCA_FEATURE_2_SUBHEADING": "Kostenlose Auszahlung",
+  "TR_COINMARKET_DCA_FEATURE_3_DESCRIPTION": "Eine schnelle, effiziente und benutzerfreundliche Oberfläche.",
+  "TR_COINMARKET_DCA_FEATURE_3_SUBHEADING": "Benutzerfreundlich",
+  "TR_COINMARKET_DCA_FEATURE_4_DESCRIPTION": "Überwache den Verlauf, die Beträge und die Häufigkeit deiner Investitionen.",
+  "TR_COINMARKET_DCA_FEATURE_4_SUBHEADING": "DCA-Übersicht",
+  "TR_COINMARKET_DCA_HEADING": "Spare in Bitcoin mit der Invity App",
+  "TR_COINMARKET_DEX_TOOLTIP": "Dezentrale Börse",
   "TR_COINMARKET_ENTER_AMOUNT_IN": "Betrag in {currency} eingeben",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_KYC_ALL": "Alle KYC-Optionen",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_NO_KYC": "KYC niemals erforderlich",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_ALL": "All CEX- und DEX-Angebote",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_DEX": "DEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FIXED_CEX": "CEX mit Festpreis",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FLOATING_CEX": "CEX mit variablem Preis",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING": "DEX",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING_TOOLTIP": "An einer dezentralen Börse (DEX) kann direkt auf der Blockchain mit Krypto gehandelt werden, ohne dass eine zentrale Behörde oder Vermittlung nötig ist.",
+  "TR_COINMARKET_EXCHANGE_FIXED_OFFERS_HEADING": "CEX mit Festpreis",
+  "TR_COINMARKET_EXCHANGE_FLOAT_OFFERS_HEADING": "CEX mit variablem Preis",
   "TR_COINMARKET_FEATURED_OFFERS_HEADING": "Aktuelle Angebote",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_BUY_LABEL": "Zahlung:",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_SELL_LABEL": "Empfangsmethode:",
   "TR_COINMARKET_FEES_INCLUDED": "Gebühren inbegriffen",
   "TR_COINMARKET_FEES_NOT_INCLUDED": "Gebühren nicht inbegriffen",
   "TR_COINMARKET_FEES_ON_WEBSITE": "Einige Gebühren sind nicht im angezeigten Preis inbegriffen. Du kannst den endgültigen Preis auf der Website des Anbieters überprüfen.",
@@ -518,24 +553,18 @@
   "TR_COINMARKET_KYC_NO_REFUND": "KYC in Ausnahmefällen angefragt. KYC zur Rückerstattung erforderlich. 👈",
   "TR_COINMARKET_KYC_POLICY": "KYC-Richtlinie",
   "TR_COINMARKET_KYC_POLICY_NEVER_REQUIRED": "KYC niemals erforderlich",
-  "TR_COINMARKET_KYC_YES_REFUND": "KYC in Ausnahmefällen angefragt. KYC zur Rückerstattung nicht erforderlich. 🤝",
+  "TR_COINMARKET_KYC_YES_REFUND": "KYC wird nur in Ausnahmefällen angefragt. Es ist zur Rückerstattung nicht erforderlich. 🤝",
   "TR_COINMARKET_LAST_TRANSACTIONS": "Letzte Transaktionen",
   "TR_COINMARKET_NETWORK_FEE": "Netzwerkgebühr",
   "TR_COINMARKET_NETWORK_TOKENS": "{networkName}-Token",
   "TR_COINMARKET_NO_CEX_PROVIDER_FOUND": "Kein CEX-Anbieter gefunden",
   "TR_COINMARKET_NO_DEX_PROVIDER_FOUND": "Kein DEX-Anbieter gefunden",
   "TR_COINMARKET_NO_METHODS_AVAILABLE": "Keine Methoden verfügbar",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "Automatische Aktualisierung in",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "Zurück zum Trade",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "Keine Angebote",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "Leider haben wir aufgrund eines Problems mit der Serverkonnektivität zur Zeit keine Angebote.",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "Leider haben wir im Moment keine Angebote. Aktualisiere die Seite oder ändern deine Anfrage.",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "Seite aktualisieren",
   "TR_COINMARKET_OFFERS_EMPTY": "Kein Angebot für deine Anfrage vorhanden. Bitte ändere das Land oder den Kaufbetrag.",
   "TR_COINMARKET_OFFERS_REFRESH": "Aktualisierung der Angebote in",
   "TR_COINMARKET_OFFERS_SELECT": "Auswählen",
   "TR_COINMARKET_OFFER_LOOKING": "Das beste Angebot wird gesucht",
-  "TR_COINMARKET_OFFER_NO_FOUND": "Keine Angebote für deine Anfrage verfügbar. Ändere den Betrag oder die Währung.",
+  "TR_COINMARKET_OFFER_NO_FOUND": "Keine Angebote für deine Anfrage verfügbar.",
   "TR_COINMARKET_ON_NETWORK_CHAIN": "Auf {networkName}-Chain",
   "TR_COINMARKET_OTHER_CURRENCIES": "Weitere Währungen",
   "TR_COINMARKET_PAYMENT_METHOD": "Zahlungsmethode",
@@ -544,9 +573,36 @@
   "TR_COINMARKET_RECEIVE_METHOD": "Empfangsmethode",
   "TR_COINMARKET_SELL": "Verkaufen",
   "TR_COINMARKET_SHOW_OFFERS": "Angebote vergleichen",
+  "TR_COINMARKET_SWAP": "Swap",
+  "TR_COINMARKET_SWAP_AMOUNT": "Swap-Betrag",
+  "TR_COINMARKET_SWAP_COUNTER": "{totalSwaps, plural, =0 {{totalSwaps} Swap} one {{totalSwaps} Swap} other {{totalSwaps} Swaps} }",
+  "TR_COINMARKET_SWAP_DEX_MODAL_CONFIRM": "Ich bin bereit zum Swap",
+  "TR_COINMARKET_SWAP_DEX_MODAL_FOR_YOUR_SAFETY": "Swap von {fromCrypto} zu {toCrypto} mit {provider}",
+  "TR_COINMARKET_SWAP_DEX_MODAL_LEGAL_HEADER": "Rechtlicher Hinweis",
+  "TR_COINMARKET_SWAP_DEX_MODAL_SECURITY_HEADER": "Sicherheit geht bei Trezor vor",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_1": "Ich möchte mit dem Kontrakt von {provider} Swaps für Kryptowährungen bei einer DEX (Decentralized Exchange, dezentrale Börse) durchführen.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_2": "Ich möchte für mein eigenes Konto Swaps für Kryptowährungen durchführen. Mir ist bewusst, dass die Richtlinien des Anbieters eine Identitätsüberprüfung erfordern können.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_3": "Mir ist bewusst, dass Krypto-Transaktionen endgültig sind und nicht rückgängig gemacht oder zurückerstattet werden können. Durch Betrug oder Fehler entstandene Verluste können möglicherweise nicht wiederhergestellt werden.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4": "Mir ist bewusst, dass Invity diesen Dienst nicht anbietet. Er unterliegt den Geschäftsbedingungen von {provider}.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_5": "Ich nutze diese Funktion nicht für Spekulation, Betrug oder jegliche Aktivitäten, die gegen die Nutzungsbedingungen von Invity oder des Anbieters oder gegen geltende Vorschriften verstoßen.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_6": "Mir ist bewusst, dass Kryptowährungen ein aufstrebendes Finanzinstrument sind und dass die Vorschriften je nach Region unterschiedlich sein können. Dadurch kann das Risiko von Betrug, Diebstahl oder Marktunsicherheit erhöht sein.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_VERIFIED_PARTNERS_HEADER": "Verifizierte Partner von Invity",
+  "TR_COINMARKET_SWAP_MODAL_CONFIRM": "Ich bin bereit zum Swap",
+  "TR_COINMARKET_SWAP_MODAL_FOR_YOUR_SAFETY": "Swap von {fromCrypto} zu {toCrypto} mit {provider}",
+  "TR_COINMARKET_SWAP_MODAL_LEGAL_HEADER": "Rechtlicher Hinweis",
+  "TR_COINMARKET_SWAP_MODAL_SECURITY_HEADER": "Sicherheit geht bei Trezor vor",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_1": "Ich bin hier, um Swaps für Kryptowährungen durchzuführen. Wenn ich aus einem anderen Grund auf diese Seite weitergeleitet wurde, kontaktiere ich den Trezor Support, bevor ich fortfahre. ",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_2": "Ich möchte für mein eigenes Konto Swaps für Kryptowährungen durchführen. Mir ist bewusst, dass die Richtlinien des Anbieters eine Identitätsüberprüfung erfordern können.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_3": "Mir ist bewusst, dass Krypto-Transaktionen endgültig sind und nicht rückgängig gemacht oder zurückerstattet werden können. Durch Betrug oder Fehler entstandene Verluste können möglicherweise nicht wiederhergestellt werden.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_4": "Mir ist bewusst, dass Invity diesen Dienst nicht anbietet. Er unterliegt den Geschäftsbedingungen von {provider}.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_5": "Ich nutze diese Funktion nicht für Spekulation, Betrug oder jegliche Aktivitäten, die gegen die Nutzungsbedingungen von Invity oder des Anbieters oder gegen geltende Vorschriften verstoßen.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_6": "Mir ist bewusst, dass Kryptowährungen ein aufstrebendes Finanzinstrument sind und dass die Vorschriften je nach Region unterschiedlich sein können. Dadurch kann das Risiko von Betrug, Diebstahl oder Marktunsicherheit erhöht sein.",
+  "TR_COINMARKET_SWAP_MODAL_VERIFIED_PARTNERS_HEADER": "Verifizierte Partner von Invity",
   "TR_COINMARKET_TOKEN_NETWORK": "{tokenName} im {networkName}-Netzwerk",
   "TR_COINMARKET_TRADE_FEE": "Trade-Gebühr",
+  "TR_COINMARKET_TRANS_ID": "Trans. ID:",
   "TR_COINMARKET_UNKNOWN_PROVIDER": "Unbekannter Anbieter",
+  "TR_COINMARKET_VIEW_DETAILS": "Details anzeigen",
   "TR_COINMARKET_YOUR_BEST_OFFER": "Dein bestes Angebot",
   "TR_COINMARKET_YOU_BUY": "Du kaufst",
   "TR_COINMARKET_YOU_GET": "Du erhältst",
@@ -571,6 +627,7 @@
   "TR_CONFIRMED_TX": "Bestätigt",
   "TR_CONFIRMING_TX": "Transaktion wird bestätigt",
   "TR_CONFIRM_ACTION_ON_YOUR": "Folge den Anweisungen auf deinem Trezor Bildschirm",
+  "TR_CONFIRM_ADDRESS": "Adresse bestätigen",
   "TR_CONFIRM_BEFORE_COPY": "Vor dem Kopieren auf Trezor bestätigen",
   "TR_CONFIRM_CONDITIONS": "Bestätige die Bedingungen, bevor du fortfährst.",
   "TR_CONFIRM_EMPTY_HIDDEN_WALLET_ON": "Bestätige das leere Passphrase Wallet auf dem Gerät „{deviceLabel}“.",
@@ -593,13 +650,13 @@
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_BUTTON": "Verwalten",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_DESCRIPTION": "Aktiviere den Dialog zur Eingabe der Passphrase beim Öffnen von Trezor Suite.",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_TITLE": "Verwendest du vorrangig eine Passphrase?",
-  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Verifiziere auf deinem Trezor, um die Empfängeradresse zu bestätigen. Es wird nicht empfohlen, ohne die Bestätigung fortzufahren.",
+  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Schließe die Verifizierung auf deinem Trezor ab, um die Empfängeradresse zu bestätigen. Es wird nicht empfohlen, ohne eine Bestätigung fortzufahren.",
   "TR_CONNECT_DEVICE_RECEIVE_PROMO_TITLE": "Empfängeradresse kann nicht verifiziert werden",
   "TR_CONNECT_DEVICE_SEND_PROMO_DESCRIPTION": "Verbinde deinen Trezor, um Coins zu senden.",
   "TR_CONNECT_DEVICE_SEND_PROMO_TITLE": "Dein Trezor ist nicht verbunden",
   "TR_CONNECT_TREZOR_TO_SEND_BUTTON": "Zum Senden Trezor verbinden",
   "TR_CONNECT_YOUR_DEVICE": "Deinen Trezor verbinden und entsperren",
-  "TR_CONTACT_SUPPORT": "Support kontaktieren",
+  "TR_CONTACT_SUPPORT": "Trezor Support kontaktieren",
   "TR_CONTACT_TREZOR_SUPPORT": "Trezor Support kontaktieren",
   "TR_CONTINUE": "Weiter",
   "TR_CONTINUE_ANYWAY": "Trotzdem fortfahren",
@@ -619,7 +676,7 @@
   "TR_COPY_ADDRESS_POLICY_ID": "Sende niemals Assets an eine Richtlinien-ID-Adresse.",
   "TR_COPY_AND_CLOSE": "Kopieren und schließen",
   "TR_COPY_SIGNED_MESSAGE": "Signierte Nachricht kopieren",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "Kopieren",
+  "TR_COPY_TO_CLIPBOARD": "Kopieren",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "Änderungsprotokoll konnte nicht abgerufen werden",
   "TR_COULD_NOT_RETRIEVE_DATA": "Daten konnten nicht abgerufen werden",
   "TR_COUNT_WALLETS": "{count} {count, plural, one {Wallet} other {Wallets}}",
@@ -653,6 +710,7 @@
   "TR_DASHBOARD_ASSET_FAILED": "Assets nicht ordnungsgemäß geladen",
   "TR_DASHBOARD_DISCOVERY_ERROR": "Entdeckungsfehler",
   "TR_DASHBOARD_DISCOVERY_ERROR_PARTIAL_DESC": "Konten wurden nicht ordnungsgemäß geladen {details}",
+  "TR_DATA": "Daten",
   "TR_DATABASE_UPGRADE_BLOCKED": "Datenbank-Upgrade wurde von einer anderen App-Instanz blockiert",
   "TR_DATA_ANALYTICS_CATEGORY_1": "Plattform",
   "TR_DATA_ANALYTICS_CATEGORY_1_ITEM_1": "OS, Trezor-Modell, Version usw.",
@@ -706,8 +764,13 @@
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT": "Du bist versehentlich im Bootloader-Modus?",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_BUTTON": "Verbinde das Gerät erneut, ohne dabei Tasten zu berühren.",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_TOUCH": "Verbinde das Gerät erneut, ohne den Bildschirm zu berühren.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED": "Dieses Gerät wird gerade anderweitig verwendet.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION": "Dieses Gerät wird möglicherweise gerade von der App {transportSessionOwner} verwendet. Du kannst bei Bedarf die Kontrolle über das Gerät übernehmen.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION_UNKNOWN_APP": "Dieses Gerät wird möglicherweise gerade von einer anderen App verwendet. Du kannst bei Bedarf die Kontrolle über das Gerät übernehmen.",
   "TR_DEVICE_CONNECTED_WRONG_STATE": "Gerät in falschem Zustand erkannt",
   "TR_DEVICE_DISCONNECTED_DURING_ACTION_DESCRIPTION": "Dein Trezor wurde während des Backup-Prozesses vom Netz getrennt. Wir empfehlen dir dringend, die Option „Werksreset“ in den Geräteeinstellungen zu verwenden, um deine Gerätedaten zu löschen und das Wallet-Backup zu wiederholen.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH": "Firmware-Hash-Prüfung fehlgeschlagen. Dein Trezor könnte eine Fälschung sein.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR": "Die Firmware-Hash-Prüfung konnte nicht durchgeführt werden. Dein Trezor könnte eine Fälschung sein.",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON": "Ausschalten",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON_DISABLED": "Einschalten",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION": "Die Prüfung der Firmware-Version ist eine sehr wichtige Sicherheitsfunktion. Wir empfehlen dringend, sie eingeschaltet zu lassen.",
@@ -726,6 +789,8 @@
   "TR_DEVICE_LABEL_IS_NOT_BACKED_UP": "Backup für Gerät „{deviceLabel}“ wurde nicht durchgeführt",
   "TR_DEVICE_LABEL_IS_NOT_CONNECTED": "Gerät „{deviceLabel}“ ist nicht verbunden",
   "TR_DEVICE_LABEL_IS_UNAVAILABLE": "Gerät „{deviceLabel}“ ist nicht verfügbar",
+  "TR_DEVICE_MAYBE_COMPROMISED_HEADING": "Verifizierung des Geräts war nicht erfolgreich",
+  "TR_DEVICE_MAYBE_COMPROMISED_TEXT": "Verbinde dein Gerät neu und wiederhole die Verifizierung. Wenn das Problem weiterhin besteht, kontaktiere den Trezor Support, um herauszufinden, was mit deinem Gerät los ist und was du als nächstes tun kannst.",
   "TR_DEVICE_NOT_CONNECTED": "Gerät nicht verbunden",
   "TR_DEVICE_NOT_INITIALIZED": "Trezor ist nicht eingerichtet",
   "TR_DEVICE_NOT_INITIALIZED_TEXT": "Wir begleiten dich durch den Prozess und sorgen dafür, dass du sofort loslegen kannst.",
@@ -788,7 +853,6 @@
   "TR_DOWNLOAD_LATEST_BRIDGE": "Aktuelle Bridge {version} herunterladen",
   "TR_DO_NOT_DISCONNECT_DEVICE": "Trenne dein Gerät nicht",
   "TR_DO_NOT_SHOW_AGAIN": "Nicht erneut anzeigen",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "Diesen Schritt überspringen?",
   "TR_DROPBOX": "Dropbox",
   "TR_DROPZONE": "Ziehe die Datei hierher oder klicke, um eine Datei auszuwählen.",
   "TR_DROPZONE_ERROR": "Import fehlgeschlagen: {error}",
@@ -809,13 +873,13 @@
   "TR_EARLY_ACCESS_ENABLE": "Teilnehmen",
   "TR_EARLY_ACCESS_ENABLED": "Early Access-Programm aktiviert",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM": "Teilnehmen",
-  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "Ich habe verstanden, dass ich damit Vorabversionen von Software testen kann, die Fehler enthalten können, die den normalen Betrieb von Suite beeinträchtigen.",
+  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "Ich habe verstanden, dass ich damit Vorabversionen von Software testen kann, die Fehler enthalten können, die den normalen Betrieb von Trezor Suite beeinträchtigen.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_DESCRIPTION": "Du kannst diese Funktion jederzeit deaktivieren.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TITLE": "Probiere die neuesten Produktfunktionen aus, bevor sie allgemein verfügbar sind.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TOOLTIP": "Aktiviere zuerst das Feld oben",
   "TR_EARLY_ACCESS_JOINED_DESCRIPTION": "Du kannst entweder jetzt oder beim nächsten Start nach Beta-Updates suchen.",
   "TR_EARLY_ACCESS_JOINED_TITLE": "Early Access-Programm aktiviert",
-  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "Um ein Downgrade auf die neueste stabile Version von Suite durchzuführen, klicke auf „Stabile Version herunterladen“ und installiere die App neu.",
+  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "Um ein Downgrade auf die neueste stabile Version von Trezor Suite durchzuführen, klicke auf „Stabile Version herunterladen“ und installiere die App neu.",
   "TR_EARLY_ACCESS_LEFT_TITLE": "Du hast das Early Access-Programm verlassen. Beta-Versionen werden nicht mehr angeboten.",
   "TR_EARLY_ACCESS_MENU": "Early Access-Programm",
   "TR_EARLY_ACCESS_REINSTALL": "Stabile Version herunterladen",
@@ -870,7 +934,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "Genehmige nur den Betrag, der für diesen Swap erforderlich ist. Du musst eine zusätzliche Gebühr zahlen, wenn du einen ähnlichen Swap erneut durchführen möchtest.",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "Vorherige Genehmigung widerrufen",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "Führe eine Transaktion durch, die die vorherige Genehmigung des Kontrakts mit {provider} entfernt.",
-  "TR_EXCHANGE_BUY": "Für",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Auf Trezor bestätigen und senden",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "Bestätigen und senden",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "Genehmigung erstellen",
@@ -892,8 +955,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "Deine Transaktion war erfolgreich.",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "Bestätigt",
   "TR_EXCHANGE_DEX": "Angebot einer dezentralen Börse",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "Die Gebühren für diesen Swap werden auf {approvalFee} ({approvalFeeFiat}) für die Genehmigung (falls erforderlich) und {swapFee} ({swapFeeFiat}) für den Swap geschätzt.",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "Du hast nicht genügend Assets für die Transaktionsgebühren. Reduziere den Tauschbetrag auf max. {symbol} {max}",
   "TR_EXCHANGE_EXTRA_FIELD": "{extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "{extraFieldName} ist ungültig",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "{extraFieldDescription}",
@@ -903,7 +964,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "Feste Preise zeigen dir genau an, wie viel du am Ende des Kaufs erhältst. Der Betrag ändert sich zwischen Auswahl des Preises und Abschluss der Transaktion nicht. Der angezeigte Betrag wird dir garantiert. Diese Preise sind in der Regel aber weniger großzügig, was bedeutet, dass du mit deinem Geld nicht so viel Krypto kaufen kannst.",
   "TR_EXCHANGE_FLOAT": "Angebot mit variablem Preis",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "Variable Preise bedeuten, dass sich der endgültige Betrag, den du erhältst, aufgrund von Marktschwankungen zwischen dem Zeitpunkt der Auswahl des Preises und dem Abschluss der Transaktion leicht ändern kann. Diese Preise sind in der Regel höher, was bedeutet, dass du am Ende mehr Krypto erhalten könntest.",
-  "TR_EXCHANGE_PROVIDER": "Anbieter",
   "TR_EXCHANGE_RATE": "Preis",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "Empfängerkonto ist außerhalb von Suite.",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "Dies ist die alphanumerische Adresse, die deine Coins empfängt.",
@@ -930,23 +990,16 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "Gib eine Zahl ein.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "Gib die gewünschte Slippage ein.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "Betrag des Swap-Angebots",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "Slippage-Zusammenfassung",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "Slippage-Toleranz",
-  "TR_EXCHANGE_TRANS_ID": "Trans. ID:",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "Konto ({symbol}) außerhalb von Suite verwenden",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "Empfängeradresse",
-  "TR_EXCHANGE_VIEW_DETAILS": "Details anzeigen",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE": "Automatische Updates für Trezor Suite",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION": "Trezor Suite lädt im Hintergrund automatisch die neueste Version herunter. Beim Neustart der App wird diese installiert. So bleibst du bei den neuesten Funktionen und Sicherheits-Patches immer auf dem Laufenden. Updates werden ausgeführt, ohne dass du deine Zustimmung erteilen musst.",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN": "BNB Smart Chain",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON": "Aktiviere die BNB Smart Chain ohne vergangene interne Transaktionen.",
   "TR_EXPERIMENTAL_FEATURES": "Experimentell",
   "TR_EXPERIMENTAL_FEATURES_ALLOW": "Experimentelle Funktionen",
   "TR_EXPERIMENTAL_FEATURES_WARNING": "Der langfristige Support dieser Funktionen ist von der Garantie ausgeschlossen.",
   "TR_EXPERIMENTAL_PASSWORD_MANAGER": "Dropbox-Passwörter migrieren",
-  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Trezor Password Manager ist eine Erweiterung der Trezor Suite, mit der Sie Ihr Trezor-Gerät anstelle eines Master-Passworts verwenden können.",
+  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Nutze diesen Dienst zum Abrufen von Passwörtern, die in Dropbox gespeichert und von Trezor geschützt werden. Entwickelt für ehemalige Benutzer der Chrome-Erweiterung von Trezor Password Manager.",
   "TR_EXPERIMENTAL_TOR_SNOWFLAKE": "Tor Snowflake",
-  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Tor Snowflake ist ein System für den Zugriff auf zensierte Websites und Apps.",
+  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Erhalte Zugriff auf zensierte Websites und Apps mit Tor Snowflake, einem System zur Umgehung von Einschränkungen.",
   "TR_EXPORT_AS": "Exportieren als {as}",
   "TR_EXPORT_FAIL": "Export fehlgeschlagen.",
   "TR_EXPORT_TO_FILE": "In Datei exportieren",
@@ -984,6 +1037,7 @@
   "TR_FIRMWARE_NEW_FW_DESCRIPTION": "Neue Firmware ist jetzt verfügbar. Aktualisiere jetzt dein Gerät.",
   "TR_FIRMWARE_REINSTALL_FW_DESCRIPTION": "Dein Gerät ist bereits auf die neueste Firmware aktualisiert. Du kannst die Firmware bei Bedarf neu installieren.",
   "TR_FIRMWARE_REVISION_CHECK_FAILED": "Firmware-Versionsprüfung fehlgeschlagen. Dein Trezor könnte eine Fälschung sein.",
+  "TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR": "Firmware-Versionsprüfung konnte nicht durchgeführt werden.",
   "TR_FIRMWARE_STATUS_INSTALLATION_COMPLETED": "Abgeschlossen",
   "TR_FIRMWARE_SUBHEADING_BITCOIN": "Leichte Firmware-Version unterstützt nur Bitcoin-Operationen.",
   "TR_FIRMWARE_SUBHEADING_NONE": "Dein Trezor wurde ohne Firmware geliefert. Installiere die neueste Firmware, um dein Gerät sicher verwenden zu können. Für reine Bitcoin-Benutzer empfehlen wir die Installation der <button>{bitcoinOnly} Firmware</button>.",
@@ -1021,7 +1075,7 @@
   "TR_GOT_IT_BUTTON": "Verstanden",
   "TR_GO_TO_ONBOARDING": "Einrichtung beginnen",
   "TR_GO_TO_SETTINGS": "Zu den Einstellungen",
-  "TR_GO_TO_SUITE": "Auf Suite zugreifen",
+  "TR_GO_TO_SUITE": "Zu Trezor Suite",
   "TR_GRAPH_LINEAR": "Linear",
   "TR_GRAPH_LOGARITHMIC": "Logarithmisch",
   "TR_GRAPH_MISSING_DATA": "XRP-, SOL- und alle Token-Beträge sind im Portfolioguthaben enthalten, werden aber derzeit in der Grafikansicht nicht unterstützt.",
@@ -1040,7 +1094,7 @@
   "TR_GUIDE_FORUM": "Trezor Forum",
   "TR_GUIDE_FORUM_LABEL": "Mit der Trezor Community verbinden",
   "TR_GUIDE_SUGGESTION_LABEL": "Wie machen wir uns?",
-  "TR_GUIDE_SUPPORT": "Support kontaktieren",
+  "TR_GUIDE_SUPPORT": "Trezor Support kontaktieren",
   "TR_GUIDE_SUPPORT_AND_FEEDBACK": "Support und Feedback",
   "TR_GUIDE_VIEW_HEADLINES_SUPPORT_FEEDBACK_SELECTION": "Support und Feedback",
   "TR_GUIDE_VIEW_HEADLINE_HELP_US_IMPROVE": "Hilf uns, uns zu verbessern",
@@ -1172,7 +1226,7 @@
   "TR_LOCAL_FILE_SYSTEM": "Lokales Dateisystem",
   "TR_LOG": "Anwendungsprotokoll",
   "TR_LOGIN_PROCEED": "Fortfahren",
-  "TR_LOG_DESCRIPTION": "Das Protokoll enthält alle nötigen technischen Informationen über Trezor Suite. Möglicherweise wird es beim Kontakt zum Trezor Support benötigt.",
+  "TR_LOG_DESCRIPTION": "Dieses Protokoll enthält wichtige technische Informationen zu Trezor Suite und wird möglicherweise bei der Kontaktaufnahme mit dem Trezor Support benötigt.",
   "TR_LOOKING_FOR_COINJOIN_ROUND": "Wartet auf eine Runde",
   "TR_LOW_ANONYMITY_WARNING": "<red>Sehr geringe Privatsphäre.</red> Wir empfehlen, mindestens 1 von 5 zu verwenden, da alles, was unter diesem Wert liegt, nicht privat ist.",
   "TR_LTC_ADDRESS_INFO": "Litecoin hat das Adressformat geändert. Weitere Informationen zur Konvertierung deiner Adresse findest du in unserem Blog. {TR_LEARN_MORE}",
@@ -1223,6 +1277,7 @@
   "TR_MY_PORTFOLIO": "Portfolio",
   "TR_NAV_ANONYMIZE": "Coins als privat kennzeichnen",
   "TR_NAV_BUY": "Kaufen",
+  "TR_NAV_DCA": "DCA",
   "TR_NAV_DETAILS": "Details",
   "TR_NAV_RECEIVE": "Empfangen",
   "TR_NAV_SELL": "Verkaufen",
@@ -1264,6 +1319,7 @@
   "TR_NETWORK_LITECOIN": "Litecoin",
   "TR_NETWORK_NAMECOIN": "Namecoin",
   "TR_NETWORK_NEM": "NEM",
+  "TR_NETWORK_OP": "Optimism",
   "TR_NETWORK_POLYGON": "Polygon PoS",
   "TR_NETWORK_SOLANA_DEVNET": "Solana Devnet",
   "TR_NETWORK_SOLANA_MAINNET": "Solana",
@@ -1276,9 +1332,10 @@
   "TR_NETWORK_ZCASH": "Zcash",
   "TR_NEW_FEE": "Neu",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "Es gibt eine neue Trezor Bridge.",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "Es gibt eine neue Trezor Firmware. Aktualisiere dein Gerät.",
   "TR_NEXT_UP": "Weiter",
   "TR_NONCE": "Nonce",
+  "TR_NON_ASCII_CHAR": "{label} (mit nicht empfohlenen „{char}“)",
+  "TR_NON_ASCII_CHARS": "{label} (mit nicht empfohlenen Zeichen)",
   "TR_NORMAL_ACCOUNTS": "Standardkonten",
   "TR_NORTH": "Norden",
   "TR_NOTHING_TO_ANONYMIZE": "Keine Assets zum Kennzeichnen als privat",
@@ -1296,16 +1353,12 @@
   "TR_NO_PASSPHRASE_WALLET": "Standard-Wallet",
   "TR_NO_SEARCH_RESULTS": "Keine Ergebnisse für dein Suchkriterium",
   "TR_NO_SPENDABLE_UTXOS": "Es gibt keine auszahlbaren UTXOs in deinem Konto.",
-  "TR_NO_TRANSPORT": "Kommunikation zwischen Browser und Gerät fehlgeschlagen",
+  "TR_NO_TRANSPORT": "Kommunikation zwischen deinem Browser und deinem Gerät fehlgeschlagen",
   "TR_NO_TRANSPORT_DESKTOP": "Kommunikation zwischen App und Gerät fehlgeschlagen",
   "TR_NUM_ACCOUNTS_FIAT_VALUE": "{accountsCount} {accountsCount, plural, one {Konto} other {Konten}} • {fiatValue}",
   "TR_N_MIN": "{n} min",
   "TR_N_TRANSACTIONS": "{value} {value, plural, one {Transaktion} other {Transaktionen}}",
   "TR_OFF": "aus",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "Der ausgewählte Betrag {amount} ist höher als das zulässige Maximum von {max}.",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "Der ausgewählte Betrag {amount} ist höher als das zulässige Maximum von {max}.",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "Der ausgewählte Betrag {amount} ist niedriger als das zulässige Minimum von {min}.",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "Der ausgewählte Betrag {amount} ist niedriger als das zulässige Minimum von {min}.",
   "TR_OFFICIAL_LANGUAGES": "Offiziell",
   "TR_OK": "OK",
   "TR_ON": "ein",
@@ -1333,7 +1386,7 @@
   "TR_ONBOARDING_DATA_COLLECTION_HEADING": "Anonyme Datenerfassung",
   "TR_ONBOARDING_DEVICE_CHECK": "Gerätesicherheitscheck",
   "TR_ONBOARDING_DEVICE_CHECK_1": "Mein <strong>Hologramm</strong> war unversehrt und nicht manipuliert.",
-  "TR_ONBOARDING_DEVICE_CHECK_2": "Mein Gerät wurde im offiziellen Trezor Shop oder bei einem vertrauenswürdigen Reseller gekauft.",
+  "TR_ONBOARDING_DEVICE_CHECK_2": "Mein Gerät wurde im <shop>offiziellen Trezor Shop</shop> oder bei einem <reseller>vertrauenswürdigen Reseller</reseller> gekauft.",
   "TR_ONBOARDING_DEVICE_CHECK_3": "Die Geräteverpackung war unversehrt und nicht manipuliert.",
   "TR_ONBOARDING_DEVICE_CHECK_4": "Die Firmware ist bereits auf dem verbundenen Trezor installiert. Fahre nur mit der Einrichtung fort, wenn du diesen Trezor bereits verwendet hast.",
   "TR_ONBOARDING_DOWNLOAD_DESKTOP_APP": "Desktop-App herunterladen",
@@ -1364,40 +1417,18 @@
   "TR_OTHER_INPUTS_AND_OUTPUTS": "Andere Ein- und Ausgaben",
   "TR_OUTGOING": "Ausgehend",
   "TR_OUTPUTS": "Ausgaben",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "Der Mindest- und Höchstbetrag, für den dieser Benutzer bereit ist, {symbol} zu verkaufen",
-  "TR_P2P_GET_STARTED_INTRO": "Du musst die Transaktion bei {providerName} starten – befolge alle Schritte sorgfältig.",
-  "TR_P2P_GET_STARTED_ITEM_1": "Wähle „Gehe zu {providerName}“ aus, um zur Website unseres Partners weitergeleitet zu werden.",
-  "TR_P2P_GET_STARTED_ITEM_3": "Sobald {providerName} nach einer Freigabeadresse fragt, kehre hierher zurück und fahre fort.",
-  "TR_P2P_GET_STARTED_ITEM_4": "Du hast es fast geschafft! Kopiere deine Adresse, füge sie in das Feld „Freigabeadresse“ bei {providerName} ein und schließe die Transaktion ab.",
-  "TR_P2P_GO_TO_PROVIDER": "Zu {providerName}",
-  "TR_P2P_INFO": "Bei der P2P-Technologie ({peerToPeer}) entfällt die KYC-Verifizierung auf der Käufer- und der Verkäuferseite. Alle Parteien sind durch ein sicheres {multisigEscrow} vor Betrug geschützt.",
-  "TR_P2P_MODAL_CONFIRM": "Ich bin bereit, zu kaufen",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "Kauf von {cryptocurrency} per Peer-to-Peer mit {provider}",
-  "TR_P2P_MODAL_LEGAL_HEADER": "Rechtlicher Hinweis",
-  "TR_P2P_MODAL_SECURITY_HEADER": "Sicherheit geht bei Trezor vor",
-  "TR_P2P_MODAL_TERMS_1": "Du bist hier, um Kryptowährung von einer anderen Person deiner Wahl per P2P-Technologie (Peer-to-Peer) ohne ID-Verifizierung zu kaufen. Wenn du aus einem anderen Grund auf diese Seite weitergeleitet wurdest, kontaktiere den Support, bevor du fortfährst.",
-  "TR_P2P_MODAL_TERMS_2": "Dir ist klar, dass Krypto-Transaktionen unwiderruflich sind und nicht zurückerstattet werden können. Daher können betrügerische oder versehentliche Verluste permanent sein.",
-  "TR_P2P_MODAL_TERMS_4": "Dir ist klar, dass Invity diesen Dienst nicht anbietet. Der Dienst unterliegt den Bedingungen von {provider}.",
-  "TR_P2P_MODAL_TERMS_5": "Du nutzt diese Funktion nicht für Glücksspiele, Betrug oder andere Verstöße gegen die Nutzungsbedingungen von Invity oder des Anbieters oder gegen geltende Vorschriften.",
-  "TR_P2P_MODAL_TERMS_6": "Dir ist klar, dass Kryptowährungen ein aufstrebendes Finanzinstrument sind und dass die Vorschriften in verschiedenen Ländern unterschiedlich sein können. Daher kannst du einem höheren Risiko von Betrug, Diebstahl oder Marktunsicherheit ausgesetzt sein.",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "Verifizierte Partner von Invity",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "Die Transaktion muss innerhalb dieser Frist abgeschlossen werden, gerechnet ab der Erstellung eines Kontrakts auf der Website von {providerName}.",
-  "TR_P2P_PRICE": "Preis für 1 {symbol}",
-  "TR_P2P_PRICE_TOOLTIP": "Von diesem Benutzer angebotener {symbol}-Preis.",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "Hallo, ich nutze {providerName}!",
-  "TR_P2P_USER_REPUTATION": "({rating}, {numberOfTrades})",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "Der ausgewählte Betrag {amount} ist höher als das zulässige Maximum von {maximum}.",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "Der ausgewählte Betrag {amount} ist niedriger als das zulässige Minimum von {minimum}.",
   "TR_PAGINATION_NEWER": "Neuer",
   "TR_PAGINATION_OLDER": "Älter",
   "TR_PASSPHRASE_CASE_SENSITIVE": "Hinweis: Bei der Passphrase wird zwischen Groß- und Kleinschreibung unterschieden.",
   "TR_PASSPHRASE_DESCRIPTION_ITEM1": "Zuerst ist es wichtig, die Funktionsweise einer Passphrase kennenzulernen.",
   "TR_PASSPHRASE_DESCRIPTION_ITEM2": "Eine Passphrase öffnet ein Wallet, welches von dieser Phrase geschützt wird.",
-  "TR_PASSPHRASE_DESCRIPTION_ITEM3": "Nicht einmal der Trezor Support kann es dir wiederbeschaffen.",
+  "TR_PASSPHRASE_DESCRIPTION_ITEM3": "Nicht einmal der Trezor Support kann es dir wiederbeschaffen",
   "TR_PASSPHRASE_HIDDEN_WALLET": "Passphrase Wallet",
   "TR_PASSPHRASE_MISMATCH": "Passphrase stimmt nicht überein",
   "TR_PASSPHRASE_MISMATCH_DESCRIPTION": "Die Passphrasen stimmen nicht überein. Bitte beginne aus Sicherheitsgründen erneut und gib sie richtig ein.",
   "TR_PASSPHRASE_MISMATCH_START_OVER": "Erneut beginnen",
+  "TR_PASSPHRASE_NON_ASCII_CHARS": "Wir empfehlen die Verwendung von <code>ABC</code>, <code>abc</code>, <code>123</code>, <code>Leerzeichen</code> oder <code>diesen Sonderzeichen</code>",
+  "TR_PASSPHRASE_NON_ASCII_CHARS_WARNING": "Die Verwendung nicht aufgelisteter Sonderzeichen ist ein Risiko für die zukünftige Kompatibilität",
   "TR_PASSPHRASE_TOO_LONG": "Passphrase überschreitet die zulässige Länge",
   "TR_PASSPHRASE_WALLET": "Passphrase Wallet Nr. {id}",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT": "So funktioniert eine Passphrase",
@@ -1439,15 +1470,30 @@
   "TR_PIN_SUBHEADING": "Eine starke PIN schützt deinen Trezor vor unbefugtem physischen Zugriff.",
   "TR_PLAY_IT_SAFE": "Gehen wir auf Nummer sicher",
   "TR_PLEASE_ALLOW_YOUR_CAMERA": "Aktiviere deine Kamera zum Scannen von QR-Codes.",
-  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Verbinde dein Gerät, um mit dem Verifizierungsprozess fortzufahren.",
+  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Verbinde deinen Trezor, um mit dem Verifizierungsprozess fortzufahren.",
   "TR_PLEASE_ENABLE_PASSPHRASE": "Aktiviere die Passphrase-Funktion, um mit dem Verifizierungsprozess fortzufahren.",
   "TR_POLICY_ID_ADDRESS": "Richtlinien-ID:",
   "TR_PRIMARY_FIAT": "Fiat-Währung",
   "TR_PRIVATE": "Privat",
   "TR_PRIVATE_DESCRIPTION": "Privatsphäre-Level mindestens {targetAnonymity}",
+  "TR_PROCEED_UNVERIFIED_ADDRESS": "Mit nicht geprüfter Adresse fortfahren",
   "TR_PROMO_BANNER_DASHBOARD": "<underline>Das komfortabelste</underline> <rest>Hardware Wallet zur sicheren Verwaltung deiner Krypto-Assets</rest>",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM": "Vor dem Scannen auf Trezor bestätigen",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM_EXPLANATION": "Bestätige zunächst die Empfängeradresse auf deinem Trezor Gerät, da dessen vertrauenswürdiges Display nicht gehackt werden kann.",
+  "TR_QUICK_ACTION_DEBUG_EAP_EXPERIMENTAL_ENABLED": "Aktiviert",
+  "TR_QUICK_ACTION_TOOLTIP_JUST_UPDATED": "Gerade aktualisiert ({currentVersion})",
+  "TR_QUICK_ACTION_TOOLTIP_RESTART_TO_UPDATE": "Zum Aktualisieren neu starten",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_DEVICE": "Trezor Gerät",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_SUITE": "Trezor Suite",
+  "TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE": "Update verfügbar ({newVersion})",
+  "TR_QUICK_ACTION_TOOLTIP_UP_TO_DATE": "Auf dem neuesten Stand ({currentVersion})",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED": "Trezor Suite hat ein neues Update heruntergeladen.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED": "Trezor Suite wurde aktualisiert.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE": "Trezor Suite Update jetzt verfügbar",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE": "Neu starten und aktualisieren",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE": "Update starten",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE": "Trezor Update jetzt verfügbar",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW": "Was gibt es Neues?",
   "TR_RANDOM_SEED_WORDS_DISCLAIMER": "Du wirst möglicherweise aufgefordert, einige Wörter einzugeben, die nicht Teil deines Wallet-Backups sind.",
   "TR_RANGE": "Bereich",
   "TR_READ_AND_UNDERSTOOD": "Ich habe die vorstehenden Angaben gelesen und verstanden",
@@ -1522,12 +1568,15 @@
   "TR_SEED_WORDS_ENTER_COMPUTER": "Gib die Wörter aus deinem Wallet-Backup in der auf dem Trezor angezeigten Reihenfolge ein.",
   "TR_SEED_WORDS_ENTER_TOUCHSCREEN": "Gib über das Touchscreen-Display alle Wörter in der richtigen Reihenfolge ein.",
   "TR_SEE_DETAILS": "Siehe Details",
+  "TR_SEE_IF_ISSUE_PERSISTS": "Prüfe, ob das Problem weiterhin besteht.",
   "TR_SELECTED": "{amount} ausgewählt",
   "TR_SELECT_COIN_FOR_SETTINGS": "Aktiven Coin auswählen, um Einstellungen zu ändern",
   "TR_SELECT_DEVICE": "Gerät auswählen",
+  "TR_SELECT_NAME_OR_ADDRESS": "Nach Name, Symbol, Netzwerk oder Kontraktadresse suchen",
   "TR_SELECT_NUMBER_OF_WORDS": "Wörteranzahl in deinem Wallet-Backup auswählen",
   "TR_SELECT_PASSPHRASE_SOURCE": "Wähle, wo die Passphrase auf „{deviceLabel}“ eingegeben werden muss.",
   "TR_SELECT_RECOVERY_METHOD": "Wiederherstellungsmethode auswählen",
+  "TR_SELECT_TOKEN": "Token auswählen",
   "TR_SELECT_TREZOR": "Trezor auswählen",
   "TR_SELECT_TREZOR_TO_CONTINUE": "Wähle deinen Trezor aus, um fortzufahren.",
   "TR_SELECT_TYPE": "Typ auswählen",
@@ -1558,11 +1607,11 @@
   "TR_SELL_MODAL_FOR_YOUR_SAFETY": "{cryptocurrency} mit {provider} verkaufen",
   "TR_SELL_MODAL_LEGAL_HEADER": "Rechtlicher Hinweis",
   "TR_SELL_MODAL_SECURITY_HEADER": "Sicherheit geht bei Trezor vor",
-  "TR_SELL_MODAL_TERMS_1": "Du bist hier, um Kryptowährung zu verkaufen. Wenn du aus einem anderen Grund auf diese Seite weitergeleitet wurdest, kontaktiere den Support, bevor du fortfährst.",
+  "TR_SELL_MODAL_TERMS_1": "Du bist hier, um Kryptowährung zu verkaufen. Wenn du aus einem anderen Grund auf diese Seite weitergeleitet wurdest, kontaktiere den Trezor Support, bevor du fortfährst.",
   "TR_SELL_MODAL_TERMS_2": "Du verkaufst Kryptowährung für dein eigenes Konto. Du erkennst an, dass die Richtlinien des Anbieters eine Identitätsüberprüfung erfordern können.",
   "TR_SELL_MODAL_TERMS_3": "Dir ist klar, dass Krypto-Transaktionen unwiderruflich sind und nicht zurückerstattet werden können. Daher können betrügerische oder versehentliche Verluste permanent sein.",
   "TR_SELL_MODAL_TERMS_4": "Dir ist klar, dass Invity diesen Dienst nicht anbietet. Der Dienst unterliegt den Bedingungen von {provider}.",
-  "TR_SELL_MODAL_TERMS_5": "Du nutzt diese Funktion nicht für Glücksspiele, Betrug oder andere Verstöße gegen die Nutzungsbedingungen von Invity oder des Anbieters oder gegen geltende Vorschriften.",
+  "TR_SELL_MODAL_TERMS_5": "Ich nutze diese Funktion nicht für Spekulation, Betrug oder jegliche Aktivitäten, die gegen die Nutzungsbedingungen von Invity oder des Anbieters oder gegen geltende Vorschriften verstoßen.",
   "TR_SELL_MODAL_TERMS_6": "Dir ist klar, dass Kryptowährungen ein aufstrebendes Finanzinstrument sind und dass die Vorschriften in verschiedenen Ländern unterschiedlich sein können. Daher kannst du einem höheren Risiko von Betrug, Diebstahl oder Marktunsicherheit ausgesetzt sein.",
   "TR_SELL_MODAL_VERIFIED_PARTNERS_HEADER": "Verifizierte Partner von Invity",
   "TR_SELL_REGISTER": "Registrieren",
@@ -1571,10 +1620,6 @@
   "TR_SELL_STATUS_ERROR": "Abgelehnt",
   "TR_SELL_STATUS_PENDING": "In Bearbeitung",
   "TR_SELL_STATUS_SUCCESS": "Bestätigt",
-  "TR_SELL_TRANS_ID": "Trans. ID:",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "Maximum liegt bei {maximum} {currency}",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "Minimum liegt bei {minimum} {currency}",
-  "TR_SELL_VIEW_DETAILS": "Details anzeigen",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "Ersparnisse",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "Miete",
   "TR_SENDING_SYMBOL": "{multiple, select, true {Mehrere Tokens} false {{symbol}} other {{symbol}}} werden gesendet",
@@ -1629,6 +1674,8 @@
   "TR_SHOW_LOG": "Protokoll anzeigen",
   "TR_SHOW_MORE": "Mehr anzeigen",
   "TR_SHOW_MORE_ADDRESSES": "Mehr ({count}) anzeigen",
+  "TR_SHOW_ON_TRAY": "Symbol in Symbolleiste anzeigen",
+  "TR_SHOW_ON_TRAY_DESCRIPTION": "Verfolge, ob Trezor Suite im Hintergrund läuft.",
   "TR_SHOW_UNVERIFIED_ADDRESS": "Nicht verifizierte Adresse anzeigen",
   "TR_SHOW_UNVERIFIED_XPUB": "Nicht verifizierten Public Key anzeigen",
   "TR_SIDEBAR_ADD_COIN": "Coin hinzufügen",
@@ -1641,7 +1688,9 @@
   "TR_SIZE": "Größe",
   "TR_SKIP": "Überspringen",
   "TR_SKIP_BACKUP": "Backup überspringen",
+  "TR_SKIP_BACKUP_DESCRIPTION": "Mit einem Wallet-Backup kannst du deine Assets wiederherstellen, wenn dein Trezor verloren geht, gestohlen oder beschädigt wird. Ohne ein Backup können deine Krypto-Assets dauerhaft verloren gehen.",
   "TR_SKIP_PIN": "PIN überspringen",
+  "TR_SKIP_PIN_DESCRIPTION": "Eine Geräte-PIN verhindert unbefugten Zugriff auf deinen Trezor. Ohne eine Geräte-PIN kann jeder, der Zugriff auf dein Gerät hat, auch auf deine Assets zugreifen.",
   "TR_SKIP_ROUNDS": "Runden überspringen",
   "TR_SKIP_ROUNDS_DESCRIPTION": "Wenn Runden übersprungen werden können, sind Zusammenhänge zwischen deinen Eingaben noch schwerer nachzuweisen. Das bedeutet, dass du die Herkunft der Assets weiter verschleiern kannst.",
   "TR_SKIP_ROUNDS_HEADING": "Trezor kann Runden überspringen",
@@ -1654,6 +1703,7 @@
   "TR_STAKE_ADDING_TO_POOL": "Zum Staking-Pool hinzufügen",
   "TR_STAKE_ANY_AMOUNT_ETH": "Stake einen Mindestbetrag von {amount} {symbol} und verdiene Belohnungen. Mit unserem aktuellen APY-Satz von {apyPercent} % verdienen auch deine Belohnungen mit!",
   "TR_STAKE_APY": "Jährliche Rendite in Prozent",
+  "TR_STAKE_APY_ABBR": "APY",
   "TR_STAKE_APY_DESC": "*Jährliche Rendite in Prozent",
   "TR_STAKE_AVAILABLE": "Verfügbar",
   "TR_STAKE_CAN_CLAIM_WARNING": "Du kannst bereits {amount} {symbol} beanspruchen. {br}Bitte erhebe einen Anspruch oder warte, bis ein neues Unstaking bearbeitet wird.",
@@ -1663,15 +1713,18 @@
   "TR_STAKE_CLAIM_AFTER_UNSTAKING": "Du kannst einen Anspruch erheben, sobald der Unstaking-Zeitraum beendet ist.",
   "TR_STAKE_CLAIM_IN_NEXT_BLOCK": "im nächsten Block",
   "TR_STAKE_CLAIM_PENDING": "Ausstehender Anspruch",
+  "TR_STAKE_CLAIM_UNSTAKED": "Nicht gestakete {symbol} beanspruchen",
   "TR_STAKE_CONFIRM_AND_STAKE": "Bestätigen & Staken",
   "TR_STAKE_CONFIRM_ENTRY_PERIOD": "Eingabezeitraum bestätigen",
   "TR_STAKE_CONSENT_TO_STAKING_WITH_EVERSTAKE": "Ich erkenne das Staking mit Everstake an und stimme diesem zu",
   "TR_STAKE_DAYS": "{count, plural, one {# Tag} other {# Tage}}",
   "TR_STAKE_DELEGATED": "Stake-Delegierung",
   "TR_STAKE_DEREGISTERED": "Deregistrierung einer Stake-Adresse",
+  "TR_STAKE_EARN_REWARDS_WEEKLY": "Wöchentlich Belohnungen verdienen",
   "TR_STAKE_ENTERING_POOL_MAY_TAKE": "Die Eingabe eines Staking-Pools kann bis zu {count, plural, one {# Tag} other {# Tage}} dauern",
+  "TR_STAKE_ENTER_THE_STAKING_POOL": "Staking-Pool beitreten",
   "TR_STAKE_ETH": "Staking von Ethereum",
-  "TR_STAKE_ETH_CARD_TITLE": "Die leichteste Art, {symbol} zu verdienen.",
+  "TR_STAKE_ETH_CARD_TITLE": "Die leichteste Art, {symbol} zu verdienen",
   "TR_STAKE_ETH_EARN_REPEAT": "Betreibe Staking. Verdiene Belohnungen. Und von vorn.",
   "TR_STAKE_ETH_EVERSTAKE": "Trezor & Everstake",
   "TR_STAKE_ETH_EVERSTAKE_DESC": "Everstake ist ein weltweit führender Anbieter von Staking-Technologie",
@@ -1682,17 +1735,21 @@
   "TR_STAKE_ETH_REWARDS_EARN": "Deine Belohnungen verdienen auch. Lasse sie weiter im Staking und sieh dabei zu, wie deine {symbol}-Belohnungen ansteigen.",
   "TR_STAKE_ETH_REWARDS_EARN_APY": "Deine {symbol}-Belohnungen profitieren auch vom APY-Satz. Lasse deine Assets weiter im Staking oder füge noch welche hinzu, um deine Belohnungen zu erhöhen.",
   "TR_STAKE_ETH_SEE_MONEY_DANCE": "Sieh zu, wie dein Geld sich vermehrt",
-  "TR_STAKE_ETH_SEE_MONEY_DANCE_DESC": "Verdiene {apyPercent} % APY*, indem du Ethereum-Staking mit Trezor betreibst.",
+  "TR_STAKE_ETH_SEE_MONEY_DANCE_DESC": "Verdiene {apyPercent} % <t>APY</t>, indem du Ethereum-Staking mit Trezor betreibst.",
   "TR_STAKE_ETH_WILL_BE_BLOCKED": "Deine {symbol} werden in diesem Zeitraum geblockt, und du kannst dies nicht rückgängig machen. <a>Mehr erfahren</a>",
   "TR_STAKE_EVERSTAKE_MANAGES": "Everstake hält und schützt deine {symbol} im Staking <t>mit ihren Smart Contracts, ihrer Infrastruktur und ihrer Technologie.</t>",
   "TR_STAKE_INSTANT": "Sofort",
   "TR_STAKE_INSTANTLY_UNSTAKED_WITH_DAYS": "Du hast „sofort“ {amount} {symbol} erhalten. {days, plural, =0 {} one {Der Restbetrag wird innerhalb von # Tag gezahlt.} other { Der Restbetrag wird innerhalb von # Tagen gezahlt}}",
+  "TR_STAKE_IN_ACCOUNT": "{symbol} auf Konto",
   "TR_STAKE_LEARN_MORE": "Mehr erfahren",
+  "TR_STAKE_LEAVE_STAKING_POOL": "Staking-Pool verlassen",
   "TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL": "Wir haben {amount} {symbol} ausgelassen, sodass du deine Abhebungsgebühren bezahlen kannst.",
+  "TR_STAKE_LEFT_SMALL_AMOUNT_FOR_WITHDRAWAL": "Wir haben einen kleinen Betrag an {symbol} ausgelassen, sodass du deine Abhebungsgebühren bezahlen kannst.",
   "TR_STAKE_MAX": "Max",
   "TR_STAKE_MAX_FEE_DESC": "Die maximale Gebühr ist die Netzwerk-Transaktionsgebühr, die du im Netzwerk bezahlen willst, um sicherzustellen, dass deine Transaktion durchgeführt wird.",
   "TR_STAKE_MAX_REWARD_DAYS": "Max. {count, plural, one {# Tag} other {# Tage}}",
   "TR_STAKE_MIN_AMOUNT_TOOLTIP": "Der Mindestbetrag für das Staking liegt bei {amount} {symbol}",
+  "TR_STAKE_MONTHLY": "Monatlich",
   "TR_STAKE_NEXT_PAYOUT": "Nächste Auszahlung der Belohnung",
   "TR_STAKE_NOT_ENOUGH_FUNDS": "Nicht genügend {symbol} zur Zahlung der Netzwerkgebühren",
   "TR_STAKE_ONLY_REWARDS": "Nur Belohnungen",
@@ -1704,6 +1761,8 @@
   "TR_STAKE_REGISTERED": "Registrierung einer Staking-Adresse",
   "TR_STAKE_RESTAKED_BADGE": "Restaking durchgeführt",
   "TR_STAKE_REWARDS": "Belohnungen",
+  "TR_STAKE_SIGN_TRANSACTION": "Transaktion signieren",
+  "TR_STAKE_SIGN_UNSTAKING_TRANSACTION": "Unstaking-Transaktion signieren",
   "TR_STAKE_STAKE": "Staking",
   "TR_STAKE_STAKED_AMOUNT": "Staking-Betrag",
   "TR_STAKE_STAKED_AND_EARNING": "Belohnungen aus Staking und Verdiensten",
@@ -1711,6 +1770,7 @@
   "TR_STAKE_STAKE_MORE": "Mehr Staking",
   "TR_STAKE_STAKING_IN_A_NUTSHELL": "Staking in Kürze",
   "TR_STAKE_STAKING_IS": "Beim Staking werden deine Ethereum-Assets vorübergehend gesperrt, um den Betrieb der Blockchain zu unterstützen. Im Gegenzug erhältst du zusätzliches Ethereum als Belohnung.",
+  "TR_STAKE_STAKING_PROCESS": "Staking-Prozess",
   "TR_STAKE_START_STAKING": "Staking beginnen",
   "TR_STAKE_TIME_TO_CLAIM": "Zeit für einen Anspruch",
   "TR_STAKE_TOTAL_PENDING": "Ausstehendes Staking insgesamt:",
@@ -1719,23 +1779,35 @@
   "TR_STAKE_UNSTAKED_AND_READY_TO_CLAIM": "Anspruchsberechtigung bei Unstaking",
   "TR_STAKE_UNSTAKE_TO_CLAIM": "Unstaking zur Erhebung eines Anspruchs",
   "TR_STAKE_UNSTAKING": "Unstaking",
+  "TR_STAKE_UNSTAKING_APPROXIMATE": "Ungefähre {symbol} sofort verfügbar",
+  "TR_STAKE_UNSTAKING_APPROXIMATE_DESCRIPTION": "Die Liquidität des Staking-Pools kann ein sofortiges Unstaking einiger Assets ermöglichen. Die restlichen Assets unterliegen dem Unstaking-Zeitraum.",
   "TR_STAKE_UNSTAKING_PERIOD": "Unstaking-Zeitraum",
+  "TR_STAKE_UNSTAKING_PROCESS": "Unstaking-Prozess",
   "TR_STAKE_UNSTAKING_TAKES": "Unstaking dauert derzeit {count, plural, one {# Tag} other {# Tage}}. Nach Ablauf kannst du deine Assets traden oder versenden.",
+  "TR_STAKE_WEEKLY": "Wöchentlich",
   "TR_STAKE_WHAT_IS_STAKING": "Was ist Staking?",
+  "TR_STAKE_YEARLY": "Jährlich",
   "TR_STAKE_YOUR_FUNDS_MAINTAINED": "Deine Assets im Staking werden von Everstake gehalten",
+  "TR_STAKING_AMOUNT_STAKED_INSTANTLY": "Staking für {amount} {symbol} sofort durchgeführt",
+  "TR_STAKING_AMOUNT_UNSTAKED_INSTANTLY": "Unstaking für {amount} {symbol} sofort durchgeführt",
+  "TR_STAKING_CONSOLIDATING_FUNDS": "Konsolidierung deiner {symbol} für dich",
   "TR_STAKING_DELEGATE": "Delegieren",
   "TR_STAKING_DEPOSIT": "Erstattungsfähiges Pfand",
   "TR_STAKING_DEPOSIT_FEE_DECRIPTION": "Die Einzahlungsgebühr beträgt {feeAmount} ADA und wird benötigt, um deine Adresse zu registrieren und mit dem Staking zu beginnen. Wenn du dein Staking von Cardano beendest, erhältst du eine Gebühr zurück.",
+  "TR_STAKING_ESTIMATED_GAINS": "Geschätzte Gewinne",
   "TR_STAKING_FEE": "Gebühr",
+  "TR_STAKING_GETTING_READY": "Deine {symbol} ist bereit für Einnahmen",
   "TR_STAKING_INSTANTLY_STAKED": "Für {amount} {symbol} wurde Staking durchgeführt. {days, plural, =0 {} one {Für die restlichen {symbol} wird Staking innerhalb von # Tag durchgeführt.} other { Für die restlichen {symbol} wird Staking innerhalb von # Tagen durchgeführt.}}",
   "TR_STAKING_IS_NOT_SUPPORTED": "Staking wird in diesem Netzwerk nicht unterstützt.",
   "TR_STAKING_NOT_ENOUGH_FUNDS": "Du hast nicht genügend Assets auf deinem Konto.",
+  "TR_STAKING_ONCE_YOU_CONFIRM": "Nach der Bestätigung",
   "TR_STAKING_ON_3RD_PARTY_DESCRIPTION": "Durch das Staking in einem Trezor Staking-Pool unterstützt du direkt Trezor und das Cardano-Ökosystem innerhalb von Trezor Suite.",
   "TR_STAKING_ON_3RD_PARTY_TITLE": "Du delegierst an einen Staking-Pool eines Drittanbieters",
   "TR_STAKING_POOL_OVERSATURATED_DESCRIPTION": "Der Staking-Pool, an den du delegierst, ist voll. Delegiere deinen Stake neu, um deine Staking-Belohnungen zu maximieren",
   "TR_STAKING_POOL_OVERSATURATED_TITLE": "Staking-Pool ist voll",
   "TR_STAKING_REDELEGATE": "Neu delegieren",
   "TR_STAKING_REWARDS": "Verfügbare Belohnungen",
+  "TR_STAKING_REWARDS_ARE_RESTAKED": "Für Belohnungen wird automatisch ein Restaking durchgeführt",
   "TR_STAKING_REWARDS_DESCRIPTION": "Beachte, dass es bis zu 20 Tage dauern kann, bis du deine Belohnung nach der ersten Registrierung und Delegierung erhältst. Nach Ablauf dieser Periode erhältst du deine Belohnung alle fünf Tage.",
   "TR_STAKING_REWARDS_TITLE": "Cardano-Staking ist aktiv",
   "TR_STAKING_STAKE_ADDRESS": "Deine Staking-Adresse",
@@ -1744,6 +1816,9 @@
   "TR_STAKING_TREZOR_POOL_FAIL": "Der Staking-Pool von Trezor konnte nicht erreicht werden, um an ihn zu delegieren.",
   "TR_STAKING_TX_PENDING": "Deine Transaktions-{txid} wurde erfolgreich an die Blockchain gesendet und wartet auf Bestätigung.",
   "TR_STAKING_WITHDRAW": "Auszahlen",
+  "TR_STAKING_YOUR_EARNINGS": "Für deine Einnahmen wird automatisch ein Restaking durchgeführt, sodass du <a>Zinseszinsen</a> verdienst.",
+  "TR_STAKING_YOUR_UNSTAKED_FUNDS": "Deine nicht gestaketen {symbol} sind bereit",
+  "TR_STAKING_YOU_ARE_HERE": "Dein aktueller Stand",
   "TR_STANDARD_WALLET_DESCRIPTION": "Keine Passphrase",
   "TR_START": "Starten",
   "TR_START_AGAIN": "Erneut starten",
@@ -1752,6 +1827,7 @@
   "TR_START_COINJOIN": "CoinJoin starten",
   "TR_START_RECOVERY": "Wiederherstellung starten",
   "TR_STEP": "Schritt {number}",
+  "TR_STEP_OF_TOTAL": "Schritt {index} von {total}",
   "TR_STILL_DONT_SEE_YOUR_TREZOR": "Du siehst deinen Trezor noch immer nicht?",
   "TR_STOP": "Stoppen",
   "TR_STOPPING": "Wird gestoppt",
@@ -1803,7 +1879,11 @@
   "TR_TOKENS_EMPTY": "Noch keine Token.",
   "TR_TOKENS_EMPTY_CHECK_HIDDEN": "Keine Tokens. Möglicherweise sind sie ausgeblendet.",
   "TR_TOKENS_SEARCH_TOOLTIP": "Suche nach Token, Symbol oder Kontraktadresse.",
+  "TR_TOKEN_NOT_FOUND": "Token nicht gefunden",
+  "TR_TOKEN_NOT_FOUND_ON_NETWORK": "Token auf dem {networkName} Netzwerk nicht gefunden.",
   "TR_TOKEN_TRANSFERS": "{standard} Token-Transfers",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH": "Versuche es mit einem anderen Suchbegriff.",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH_OR_SWITCH": "Versuche es mit einem anderen Suchbegriff oder wechsle auf ein anderes Netzwerk.",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR": "Nicht erkannte Token",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR_TOOLTIP": "Nicht erkannte Token können ein Risiko darstellen. Sei vorsichtig.",
   "TR_TOO_LONG": "Nachricht ist zu lang",
@@ -1815,18 +1895,24 @@
   "TR_TOR_CONFIG_SNOWFLAKE_UPDATE_LABEL": "Pfad aktualisieren",
   "TR_TOR_DESCRIPTION": "Leite den gesamten Datenverkehr von Suite über das Tor-Netzwerk, um Privatsphäre und Sicherheit zu erhöhen. Es kann einige Zeit dauern, bis Tor geladen ist und eine Verbindung herstellt.",
   "TR_TOR_DISABLE": "Tor deaktivieren",
+  "TR_TOR_DISABLED": "Deaktiviert",
   "TR_TOR_DISABLE_ONIONS_ONLY": "Benutzerdefinierte Nicht-Onion-Backends fehlen",
   "TR_TOR_DISABLE_ONIONS_ONLY_DESCRIPTION": "Füge benutzerdefinierte Nicht-Onion-Backend-Adressen hinzu, um dieses Verhalten zu vermeiden.",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_DESCRIPTION": "Du kannst Tor jetzt sicher deaktivieren.",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_TITLE": "Benutzerdefinierte Backends verwenden nicht mehr nur Onion-Adressen.",
   "TR_TOR_DISABLE_ONIONS_ONLY_RESOLVED": "Tor deaktivieren",
   "TR_TOR_DISABLE_ONIONS_ONLY_TITLE": "Das Deaktivieren von Tor setzt alle Onion-Backends auf Standard-Tor-Server zurück.",
+  "TR_TOR_DISABLING": "Deaktivierung läuft ...",
   "TR_TOR_ENABLE": "Tor aktivieren",
+  "TR_TOR_ENABLED": "Aktiviert",
   "TR_TOR_ENABLE_AND_CONFIRM": "Tor aktivieren und bestätigen",
   "TR_TOR_ENABLE_TITLE": "Tor aktivieren",
+  "TR_TOR_ENABLING": "Aktivierung läuft ...",
+  "TR_TOR_ERROR": "Fehler",
   "TR_TOR_IS_SLOW_MESSAGE": "Tor stellt eine Verbindung zum Netzwerk her.<br></br>Hab etwas Geduld.",
   "TR_TOR_KEEP_RUNNING": "Tor weiterhin ausführen",
   "TR_TOR_KEEP_RUNNING_FOR_COIN_JOIN_SUBTITLE": "Wähle „Tor weiterhin ausführen“, um fortzufahren, oder „Tor beenden“, um den CoinJoin-Prozess zu beenden.",
+  "TR_TOR_MISBEHAVING": "Fehlverhalten",
   "TR_TOR_REMOVE_ONION_AND_DISABLE": "Tor deaktivieren und zu Standard-Backends wechseln",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_LEAVE": "Verlassen",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_SUBTITLE": "Wähle „Tor aktivieren“, um fortzufahren, oder „Verlassen“, um den Prozess zu beenden.",
@@ -1841,11 +1927,7 @@
   "TR_TO_BTC": "In BTC",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "Um deine Labels konsistent und auf verschiedenen Geräten verfügbar zu machen, stelle eine Verbindung zu einem Cloud-Speicher-Provider her.",
   "TR_TO_SATOSHIS": "Zu Sats",
-  "TR_TRADE_BUYS": "kauft",
-  "TR_TRADE_ENTER_COIN": "Kryptoname oder -symbol eingeben ...",
-  "TR_TRADE_EXCHANGES": "tauscht",
   "TR_TRADE_REDIRECTING": "Wird umgeleitet ...",
-  "TR_TRADE_SELLS": "verkauft",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "Transaktionsverlauf nicht verfügbar",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "Tipp: Du kannst nach Transaktions-IDs, Adressen, Tokens, Labels, Beträgen und Datumsangaben suchen.",
   "TR_TRANSACTIONS_SEARCH_TIP_10": "Tipp: Für komplexeres Suchen kannst du die Operatoren AND (&) und OR (|) kombinieren. <strong>> {lastYear}-01-01 & < {lastYear}-01-31 | > {lastYear}-12-01 & < {lastYear}-12-31</strong> zeigt zum Beispiel alle Transaktionen im Januar oder Dezember {lastYear} an.",
@@ -1860,6 +1942,7 @@
   "TR_TRANSACTIONS_SEARCH_TOOLTIP": "Suche nach Transaktions-ID, Label oder Betrag oder verwende Operatoren wie < > | & = !=.",
   "TR_TRANSACTION_DETAILS": "Details",
   "TR_TREZOR_BRIDGE_RUNNING_VERSION": "Trezor Bridge läuft unter Version {version}",
+  "TR_TREZOR_CONNECT": "Trezor Connect",
   "TR_TREZOR_DEVICE_TUTORIAL_CANCELED_HEADING": "Tutorial abgebrochen",
   "TR_TREZOR_DEVICE_TUTORIAL_COMPLETED_HEADING": "Tutorial beendet",
   "TR_TREZOR_DEVICE_TUTORIAL_DESCRIPTION": "Lerne mithilfe eines kurzen Tutorials, wie du dein Gerät verwendest",
@@ -1867,32 +1950,40 @@
   "TR_TROUBLESHOOTING_CLOSE_TABS": "Schließe andere Registerkarten und Fenster, die deinen Trezor verwenden könnten.",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION": "Nachdem du andere Registerkarten und Fenster geschlossen hast, aktualisiere diese Seite.",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION_DESKTOP": "Nachdem du andere Browser-Registerkarten und -Fenster geschlossen hast, beende Trezor Suite und öffne die App wieder.",
-  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Notwendige Schritte, um Kommunikation zu ermöglichen",
+  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Versuche es mit diesen Schritten, um das Problem zu lösen.",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_DESCRIPTION": "<a>Statusseite von Trezor Bridge</a> besuchen",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_TITLE": "Stelle sicher, dass der Trezor Bridge-Prozess läuft",
-  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Verwende einen Chromium-basierten Browser, der eine direkte Kommunikation mit USB-Geräten ermöglicht",
+  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Derzeit ist die direkte Kommunikation mit USB-Geräten nur über Chromium-basierte Browser möglich.",
   "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_TITLE": "Versuche einen Browser mit WebUSB-Unterstützung zu verwenden",
   "TR_TROUBLESHOOTING_TIP_CABLE_DESCRIPTION": "Das Kabel muss vollständig eingesteckt sein. Bei einem über USB-C verbundenen Gerät sollte das Kabel einrasten.",
   "TR_TROUBLESHOOTING_TIP_CABLE_TITLE": "Verwende ein anderes Kabel",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_DESCRIPTION": "Mit installierter Trezor Bridge.",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_TITLE": "Verwende einen anderen Computer, wenn du kannst",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Nur für den Fall",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Starte deinen Computer neu",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Möglicherweise kannst du das Kommunikationsproblem zwischen deinem Browser und deinem Gerät mit einem Neustart deines Computers beheben.",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Computer neu starten",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_DESCRIPTION": "Starten Sie die <a>Trezor Suite</a> Desktop-Anwendung",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE": "Verwende die Suite-Desktop-Anwendung",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_DESCRIPTION": "<a>Klicke zum Umschalten</a> auf eine andere Bridge-Implementierung. Aktuelle Version: ({currentVersion})",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_TITLE": "Andere Version von Trezor Bridge verwenden",
   "TR_TROUBLESHOOTING_TIP_UDEV_INSTALL_DESCRIPTION": "Installiere <a>udev-Regeln</a>. Speichere sie vor dem Öffnen auf dem Desktop.",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_DESCRIPTION": "Wenn du deine Geräte-Firmware das letzte Mal im Jahr 2019 oder früher aktualisiert hast, folge bitte den Anweisungen in der <a>Wissensdatenbank</a>.",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_TITLE": "Du verwendest offenbar ein älteres Modell von Trezor.",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_DESCRIPTION": "Verbinde das Gerät direkt mit deinem Computer (ohne USB-Hub).",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_TITLE": "Verwende einen anderen USB-Anschluss",
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "Regeln automatisch installieren",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "Fehlende udev-Regeln",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "Unerwarteter Zustand: {error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "Dein Gerät ist ordnungsgemäß angeschlossen, aber dein Browser kann im Moment nicht damit kommunizieren. Du musst Trezor Bridge installieren.",
   "TR_TRY_AGAIN": "Wiederholen",
   "TR_TXID": "TX-ID",
   "TR_TXID_RBF": "Zu ersetzende Original-TX-ID",
   "TR_TX_CONFIRMATIONS": "{confirmationsCount}x",
   "TR_TX_CONFIRMED": "Transaktion bestätigt",
   "TR_TX_CONFIRMING": "Transaktion wird bestätigt",
+  "TR_TX_DATA_FUNCTION": "Funktion",
+  "TR_TX_DATA_INPUT_DATA": "Eingabedaten",
+  "TR_TX_DATA_METHOD": "Eingabedaten",
+  "TR_TX_DATA_METHOD_NAME": "Methodenname",
+  "TR_TX_DATA_PARAMS": "Parameter",
   "TR_TX_DEPOSIT": "Einzahlung",
   "TR_TX_FEE": "Gebühr",
   "TR_TX_TAB_AMOUNT": "Betrag",
@@ -1932,6 +2023,8 @@
   "TR_UPDATE_FIRMWARE_HOMESCREEN_LATER_TOOLTIP": "Firmware-Update erforderlich. Du kannst deinen Startbildschirm später auf der Einstellungsseite ändern",
   "TR_UPDATE_FIRMWARE_HOMESCREEN_TOOLTIP": "Aktualisiere deine Firmware, um deinen Startbildschirm zu ändern",
   "TR_UPDATE_MODAL_AVAILABLE_HEADING": "Update verfügbar",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES": "Automatische Updates aktivieren",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG": "Neu",
   "TR_UPDATE_MODAL_INSTALL_AND_RESTART": "Aktualisieren und neu starten",
   "TR_UPDATE_MODAL_INSTALL_NOW_OR_LATER": "Update jetzt installieren?",
   "TR_UPDATE_MODAL_NOT_NOW": "Nicht jetzt",
@@ -1939,6 +2032,9 @@
   "TR_UPDATE_MODAL_START_DOWNLOAD": "Herunterladen",
   "TR_UPDATE_MODAL_UPDATE_DOWNLOADED": "Update heruntergeladen",
   "TR_UPDATE_MODAL_UPDATE_ON_QUIT": "Update nach Beenden",
+  "TR_UPDATE_MODAL_WHATS_NEW": "Was gibt es Neues?",
+  "TR_UPDATE_MODAL_YOUR_VERSION": "Deine Version: v{version}",
+  "TR_UPGRADE_FIRMWARE_TO_DISCOVER_ACCOUNT_ERROR": "Aktualisiere deine Firmware, um auf dieses Konto zuzugreifen. Weitere Informationen erhältst du oben auf dem blauen Banner.",
   "TR_UP_TO": "bis zu",
   "TR_UP_TO_DATE": "Auf dem neuesten Stand",
   "TR_UP_TO_DAYS": "bis zu {count, plural, one {# Tag} other {# Tage}}",
@@ -1962,7 +2058,7 @@
   "TR_VERIFY_TREZOR_OWNERSHIP_CARD_2": "Keine Fotos und keine digitalen Kopien deines Wallet-Backups",
   "TR_VERIFY_TREZOR_OWNERSHIP_EXPLANATION": "Gib dein aktuelles Wallet-Backup auf deinem Trezor ein und bestätige damit, dass du der Eigentümer dieses Wallets bist.",
   "TR_VERSION": "Version {version}",
-  "TR_VERSION_HAS_BEEN_RELEASED": "Version {version} wurde veröffentlicht.",
+  "TR_VERSION_HAS_BEEN_RELEASED": "Version {version} wurde veröffentlicht!",
   "TR_VIEW": "Anzeigen",
   "TR_VIEW_ACCOUNT": "Konto anzeigen",
   "TR_VIEW_ALL": "Alle anzeigen",
@@ -1992,6 +2088,7 @@
   "TR_WALLET_SELECTION_ACCESS_HIDDEN_WALLET": "Zugriff auf Passphrase Wallet",
   "TR_WALLET_SELECTION_HIDDEN_WALLET": "Passphrase Wallet",
   "TR_WELCOME_TO_TREZOR_TEXT_WALLET_CREATION": "Erstelle ein neues Wallet oder stelle ein Wallet mit deinem Wallet-Backup wieder her.",
+  "TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE": "Wir arbeiten stets daran, deine Benutzererfahrung mit Trezor zu verbessern. Das gibt es Neues:",
   "TR_WEST": "Westen",
   "TR_WHAT_DATA_WE_COLLECT": "Welche Daten erfassen wir?",
   "TR_WHAT_IS_PASSPHRASE": "Erfahre mehr über den Unterschied",
@@ -2002,7 +2099,7 @@
   "TR_WIPE_DEVICE_CHECKBOX_2_TITLE": "Mir ist klar, dass ich ein Backup meines Wallet-Backups benötige, um den Zugang zu meinen Assets wiederherzustellen.",
   "TR_WIPE_DEVICE_TEXT": "Beim Zurücksetzen des Geräts werden alle Daten gelöscht. Setze dein Gerät nur zurück, wenn du dein Wallet-Backup hast, das den Zugang zu deinen Assets wiederherstellen kann.",
   "TR_WIPE_OR_UPDATE": "Gerät zurücksetzen oder Firmware aktualisieren",
-  "TR_WIPE_OR_UPDATE_DESCRIPTION": "Zu Geräteeinstellungen",
+  "TR_WIPE_OR_UPDATE_DESCRIPTION": "Gehe zu den Geräteeinstellungen.",
   "TR_WIPING_YOUR_DEVICE": "Beim Werksreset wird der Speicher des Geräts gelöscht, wobei alle Informationen, einschließlich des Wallet-Backups und der PIN, entfernt werden. Führe das Werksreset nur durch, wenn du dein Wallet-Backup hast, das zum Wiederherstellen des Zugangs zu deinen Assets erforderlich ist.",
   "TR_WORDS": "{count} Wörter",
   "TR_WORD_DOES_NOT_EXIST": "Das Wort „{word}“ befindet sich nicht in der BIP39-Wörterliste.",
diff --git a/packages/suite-data/files/translations/en.json b/packages/suite-data/files/translations/en.json
index 7f7434b395e..3f4d0afcac2 100644
--- a/packages/suite-data/files/translations/en.json
+++ b/packages/suite-data/files/translations/en.json
@@ -1,19 +1,20 @@
 {
   "AMOUNT": "Amount",
+  "AMOUNT_EXCEEDS_MAX": "The amount exceeds the maximum allowed value of {maxAmount}.",
   "AMOUNT_IS_BELOW_DUST": "Amount must be at least {dust}",
   "AMOUNT_IS_LESS_THAN_RESERVE": "Recipient account requires minimum reserve {reserve} XRP to activate",
   "AMOUNT_IS_MORE_THAN_RESERVE": "Amount is above the required unspendable reserve ({reserve} XRP)",
   "AMOUNT_IS_NOT_ENOUGH": "Not enough funds",
-  "AMOUNT_IS_NOT_INTEGER": "Amount is not an integer",
+  "AMOUNT_IS_NOT_INTEGER": "Amount isn't an integer",
   "AMOUNT_IS_NOT_IN_RANGE_DECIMALS": "Maximum {decimals} decimals allowed",
-  "AMOUNT_IS_NOT_SET": "Amount is not set",
+  "AMOUNT_IS_NOT_SET": "Amount isn't set",
   "AMOUNT_IS_TOO_LOW": "Amount is too low",
   "AMOUNT_NOT_ENOUGH_CURRENCY_FEE": "Not enough {symbol} to cover transaction fee",
   "AMOUNT_SEND_MAX": "Send max",
-  "BACKUP_BACKUP_ALREADY_FAILED_DESCRIPTION": "A previous attempt to backup this device failed. Device backup may be done only once.",
-  "BACKUP_BACKUP_ALREADY_FAILED_HEADING": "Backup failed",
-  "BACKUP_BACKUP_ALREADY_FINISHED_DESCRIPTION": "Connected device has already been backed up. You should have the wallet backup written down and hidden in a safe place.",
-  "BACKUP_BACKUP_ALREADY_FINISHED_HEADING": "Backup already finished",
+  "BACKUP_BACKUP_ALREADY_FAILED_DESCRIPTION": "A previous attempt to backup this device failed. Wallet backup may be done only once.",
+  "BACKUP_BACKUP_ALREADY_FAILED_HEADING": "Wallet backup failed",
+  "BACKUP_BACKUP_ALREADY_FINISHED_DESCRIPTION": "The connected device already has a wallet backup. You should have the wallet backup written down and hidden in a safe place.",
+  "BACKUP_BACKUP_ALREADY_FINISHED_HEADING": "Wallet backup already finished",
   "BROADCAST": "Broadcast",
   "BROADCAST_TOOLTIP": "Broadcast the transaction to the network.",
   "BROADCAST_TOOLTIP_DISABLED_LOCKTIME": "A transaction with a locktime set beyond the current block or timestamp will be rejected by the network.",
@@ -30,9 +31,9 @@
   "DATA_NOT_SET": "Data not set",
   "DATA_NOT_VALID_HEX": "Not a valid hex",
   "DESTINATION_TAG": "Destination tag",
-  "DESTINATION_TAG_IS_NOT_NUMBER": "Destination tag is not a number",
-  "DESTINATION_TAG_IS_NOT_VALID": "Destination tag is not valid",
-  "DESTINATION_TAG_NOT_SET": "Destination tag is not set",
+  "DESTINATION_TAG_IS_NOT_NUMBER": "Destination tag isn't a number",
+  "DESTINATION_TAG_IS_NOT_VALID": "Destination tag isn't valid",
+  "DESTINATION_TAG_NOT_SET": "Destination tag isn't set",
   "DESTINATION_TAG_TOOLTIP": "Destination tag is a unique code to identify the receiver of a transaction.",
   "DISCONNECT_DEVICE_DESCRIPTION": "Your device was wiped and no longer holds any private keys.",
   "DOWNLOAD_TRANSACTION": "Download as .txt",
@@ -58,7 +59,7 @@
   "IMAGE_VALIDATION_ERROR_INVALID_FORMAT_ONLY_JPG": "Invalid file selected. Must be .jpg",
   "IMAGE_VALIDATION_ERROR_INVALID_FORMAT_ONLY_PNG_JPG": "Invalid file selected. Must be .jpg or .png",
   "IMAGE_VALIDATION_ERROR_INVALID_SIZE_JPG": "Invalid size (Image must be less than 16KB)",
-  "IMAGE_VALIDATION_ERROR_PROGRESSIVE_JPG": "Progressive JPG image format is not supported.",
+  "IMAGE_VALIDATION_ERROR_PROGRESSIVE_JPG": "Progressive JPG image format isn't supported.",
   "IMAGE_VALIDATION_ERROR_UNEXPECTED_ALPHA": "Invalid image format. It must not contain transparencies.",
   "IMPORT_CSV": "Import",
   "INCLUDING_FEE": "Incl. fee",
@@ -66,8 +67,8 @@
   "LOCKTIME_ADD": "Add Locktime",
   "LOCKTIME_ADD_TOOLTIP": "Locktime sets the earliest time a transaction can be mined into a block.",
   "LOCKTIME_BLOCKHEIGHT": "Locktime blockheight",
-  "LOCKTIME_IS_NOT_INTEGER": "Locktime is not an integer",
-  "LOCKTIME_IS_NOT_SET": "Locktime not set",
+  "LOCKTIME_IS_NOT_INTEGER": "Locktime isn't an integer",
+  "LOCKTIME_IS_NOT_SET": "Locktime isn't set",
   "LOCKTIME_IS_TOO_BIG": "Timestamp is too big",
   "LOCKTIME_IS_TOO_LOW": "Locktime is too low",
   "LOCKTIME_SCHEDULE_SEND": "Locktime",
@@ -112,7 +113,7 @@
   "RECEIVE_ADDRESS_LIMIT_REACHED": "You've reached the maximum limit of 21 fresh, unused addresses",
   "RECEIVE_ADDRESS_REVEAL": "Show full address",
   "RECEIVE_ADDRESS_UNAVAILABLE": "Unavailable",
-  "RECEIVE_DESC_BITCOIN": "To receive any funds you need to get a fresh receive address. It is advised to always use a fresh address, as this prevents anyone else from tracking your transactions. You can reuse an address, but we recommend not doing so unless absolutely necessary.",
+  "RECEIVE_DESC_BITCOIN": "To receive any funds you need to get a fresh receive address. It's advised to always use a fresh address, as this prevents anyone else from tracking your transactions. You can reuse an address, but we recommend not doing so unless absolutely necessary.",
   "RECEIVE_DESC_ETHEREUM": "Use this address to receive tokens as well.",
   "RECEIVE_TABLE_ADDRESS": "Address",
   "RECEIVE_TABLE_NOT_USED": "Unused",
@@ -123,13 +124,13 @@
   "RECIPIENT_ADD": "Add Recipient",
   "RECIPIENT_ADDRESS": "Address",
   "RECIPIENT_CANNOT_SEND_TO_MYSELF": "Can't send to myself",
-  "RECIPIENT_IS_NOT_SET": "Address is not set",
-  "RECIPIENT_IS_NOT_VALID": "Address is not valid",
+  "RECIPIENT_IS_NOT_SET": "Address isn't set",
+  "RECIPIENT_IS_NOT_VALID": "Address isn't valid",
   "RECIPIENT_REQUIRES_UPDATE": "Taproot is not supported by your firmware version. Please update your device firmware.",
   "RECIPIENT_SCAN": "Scan",
   "REFRESH": "Refresh",
   "REMAINING_BALANCE_LESS_THAN_RENT": "After sending this amount, your account will have {remainingSolBalance} SOL remaining. A non-empty account must maintain a balance of more than {rent} SOL.",
-  "REVIEW_AND_SEND_TRANSACTION": "Review & Send",
+  "REVIEW_AND_SEND_TRANSACTION": "Review & send",
   "SEND_RAW": "Send raw",
   "SEND_RAW_TRANSACTION_TOOLTIP": "You can provide all the raw data for your transaction by yourself.",
   "SEND_TRANSACTION": "Send",
@@ -155,8 +156,8 @@
   "TOAST_AUTO_UPDATER_ERROR": "Auto updater error ({state})",
   "TOAST_AUTO_UPDATER_NEW_VERSION_FIRST_RUN": "New version ({version}) installed successfully",
   "TOAST_AUTO_UPDATER_NO_NEW": "No new updates available.",
-  "TOAST_BACKUP_FAILED": "Backup failed",
-  "TOAST_BACKUP_SUCCESS": "Backup successful",
+  "TOAST_BACKUP_FAILED": "Wallet backup failed",
+  "TOAST_BACKUP_SUCCESS": "Wallet backup successful",
   "TOAST_COIN_SCHEME_PROTOCOL": "{header}{body}",
   "TOAST_COIN_SCHEME_PROTOCOL_ACTION": "Autofill send form",
   "TOAST_COIN_SCHEME_PROTOCOL_HEADER": "Go to an account to send",
@@ -168,6 +169,7 @@
   "TOAST_PIN_CHANGED": "PIN changed successfully",
   "TOAST_QR_INCORRECT_ADDRESS": "QR code contains invalid address for this account",
   "TOAST_QR_INCORRECT_COIN_SCHEME_PROTOCOL": "QR code is defined for {coin} account",
+  "TOAST_QR_UNKNOWN_SCHEME_PROTOCOL": "Unknown protocol scheme: \"{scheme}\". Try again or enter the address manually.",
   "TOAST_RAW_TX_SENT": "Transaction sent. TXID: {txid}",
   "TOAST_SETTINGS_APPLIED": "Settings changed successfully",
   "TOAST_SIGN_MESSAGE_ERROR": "Message signing error: {error}",
@@ -193,7 +195,6 @@
   "TR_404_GO_TO_DASHBOARD": "Go to Dashboard",
   "TR_404_TITLE": "Error 404: Link not found",
   "TR_7D_CHANGE": "7d change",
-  "TR_ABORT": "Abort",
   "TR_ACCESS_HIDDEN_WALLET": "Access Passphrase wallet",
   "TR_ACCESS_STANDARD_WALLET": "Access standard wallet",
   "TR_ACCOUNT_DETAILS_HEADER": "Account details",
@@ -211,7 +212,7 @@
   "TR_ACCOUNT_EXCEPTION_DISCOVERY_EMPTY_DESC": "All coins are currently disabled. Please enable in Settings.",
   "TR_ACCOUNT_EXCEPTION_DISCOVERY_ERROR": "Account discovery error",
   "TR_ACCOUNT_EXCEPTION_NOT_ENABLED": "{networkName} not enabled in Settings.",
-  "TR_ACCOUNT_EXCEPTION_NOT_EXIST": "Account does not exist",
+  "TR_ACCOUNT_EXCEPTION_NOT_EXIST": "Account doesn't exist",
   "TR_ACCOUNT_IMPORTED_ANNOUNCEMENT": "A watch-only account is a public address you’ve imported into your wallet, allowing the wallet to watch for outputs but not spend them.",
   "TR_ACCOUNT_IS_EMPTY_DESCRIPTION": "Get started by receiving or buying {network}.",
   "TR_ACCOUNT_IS_EMPTY_TITLE": "No transactions... yet.",
@@ -260,6 +261,7 @@
   "TR_ACQUIRE_DEVICE_TITLE": "Another session is running",
   "TR_ACTIVATED_COINS": "Activated coins",
   "TR_ACTIVE": "active",
+  "TR_ADD": "Add",
   "TR_ADDRESSES": "Address",
   "TR_ADDRESSES_CHANGE": "Change addresses",
   "TR_ADDRESSES_FRESH": "Fresh addresses",
@@ -269,7 +271,7 @@
   "TR_ADDRESS_MODAL_CLIPBOARD": "Copy address",
   "TR_ADDRESS_MODAL_TITLE": "{networkName} receive address",
   "TR_ADDRESS_MODAL_TITLE_EXCHANGE": "{networkCurrencyName} receive address on {networkName} network",
-  "TR_ADDRESS_PHISHING_WARNING": "To prevent phishing attacks, you should verify the address on your Trezor. {claim}",
+  "TR_ADDRESS_PHISHING_WARNING": "To prevent phishing attacks, verify the receive address on your Trezor. {claim}",
   "TR_ADD_ACCOUNT": "Add account",
   "TR_ADD_HIDDEN_WALLET": "Passphrase wallet",
   "TR_ADD_NETWORK_ACCOUNT": "Add {network} account",
@@ -296,7 +298,9 @@
   "TR_ALLOW_ANALYTICS": "Data usage",
   "TR_ALLOW_ANALYTICS_DESCRIPTION": "All data is kept strictly anonymous. It's only used to improve the Trezor ecosystem.",
   "TR_ALLOW_AUTOMATIC_SUITE_UPDATES": "Automatic Trezor Suite updates",
-  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Trezor Suite automatically downloads the latest version in the background and installs it when restarting the app. This ensures you're always up-to-date with the latest features and security patches. Updates occur without requiring your permission.",
+  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Automatically download the latest version of Trezor Suite in the background and install it when restarting the app. This ensures you're always up-to-date with the latest features and security patches. Updates occur without requiring your permission.",
+  "TR_ALL_NETWORKS": "All networks ({networkCount})",
+  "TR_ALL_NETWORKS_TOOLTIP": "View tokens from all {networkCount} networks. Filter by the most popular networks.",
   "TR_ALL_TRANSACTIONS": "Transactions",
   "TR_AMOUNT_SENT": "Amount sent",
   "TR_AMOUNT_TOO_BIG_FOR_COINJOIN": "Not suitable for coinjoin - amount too high",
@@ -355,31 +359,29 @@
   "TR_BEFORE_ANY_FURTHER_ACTIONS": "Although unlikely, you may need to access your wallet backup in case of a firmware update issue.",
   "TR_BIP_SIG_FORMAT": "Trezor",
   "TR_BITCOIN_ONLY_UNAVAILABLE": "Before switching to {bitcoinOnly}, you need to upgrade your firmware to the latest version.",
-  "TR_BREAKING_ANONYMITY_CHECKBOX": "I understand I'm damaging my anonymity",
+  "TR_BREAKING_ANONYMITY_CHECKBOX": "I understand that I'm compromising my anonymity.",
   "TR_BRIDGE": "Trezor Bridge",
   "TR_BRIDGE_DEV_MODE_START": "Starting Trezor Bridge on port 21324",
   "TR_BRIDGE_DEV_MODE_STOP": "Starting Trezor Bridge on default port",
   "TR_BRIDGE_GO_TO_WALLET_DESCRIPTION": "Are you sure? Your device can only be used by one app at a time. If you're currently using another app with your Trezor device, finish that session first.",
   "TR_BRIDGE_NEEDED_DESCRIPTION": "Your browser isn't supported. For the best experience, download and run the Trezor Suite desktop app in the background, or use a supported Chromium-based browser that is compatible with WebUSB.",
   "TR_BRIDGE_REQUESTED_DESCRIPTION": "Another app requested Trezor Suite to connect with your Trezor device. Keep Trezor Suite running in the background and retry the action in the other app.",
+  "TR_BRIDGE_TIP_AUTOSTART": "Tip: Enable the auto-start feature and have Trezor Bridge always running in the background.",
   "TR_BTC_UNITS": "Bitcoin units",
   "TR_BUG": "Bug",
   "TR_BUMP_FEE": "Bump fee",
   "TR_BUMP_FEE_DISABLED_TOOLTIP": "To speed up your transactions, increase the fee on the oldest (by nonce) pending transaction in the queue. Transactions must be confirmed in order. <a>Learn more</a>",
   "TR_BUY": "Buy",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "Trade transactions",
   "TR_BUY_BUY": "Buy",
-  "TR_BUY_BUY_AGAIN": "Buy again",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Confirmed on Trezor",
-  "TR_BUY_CONFIRM_ON_TREZOR": "Confirm on Trezor",
   "TR_BUY_DETAIL_ERROR_BUTTON": "Back to Account",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "Go to provider support",
   "TR_BUY_DETAIL_ERROR_TEXT": "Sorry, your transaction failed or was rejected. Your payment method was not charged.",
   "TR_BUY_DETAIL_ERROR_TITLE": "The transaction failed",
   "TR_BUY_DETAIL_PENDING_SUPPORT": "Go to provider support",
   "TR_BUY_DETAIL_PENDING_TITLE": "Processing your transaction...",
-  "TR_BUY_DETAIL_SUBMITTED_GATE": "Go to payment gateway",
-  "TR_BUY_DETAIL_SUBMITTED_TEXT": "Click the button below to finish entering your details on the provider's site.",
+  "TR_BUY_DETAIL_SUBMITTED_GATE": "Proceed to pay",
+  "TR_BUY_DETAIL_SUBMITTED_TEXT": "Click to complete your details on the provider's site.",
   "TR_BUY_DETAIL_SUBMITTED_TITLE": "Waiting for your payment...",
   "TR_BUY_DETAIL_SUCCESS_BUTTON": "Back to Account",
   "TR_BUY_DETAIL_SUCCESS_TEXT": "Your transaction was approved; please wait for it to finish.",
@@ -388,7 +390,7 @@
   "TR_BUY_DETAIL_WAITING_FOR_USER_TEXT": "{providerName} needs some final details to finish this transaction. Visit their site to proceed.",
   "TR_BUY_DETAIL_WAITING_FOR_USER_TITLE": "Complete your transaction",
   "TR_BUY_FOOTER_TEXT_1": "Invity is a comparison tool that connects you to the best exchange providers. They only use location in order to show the most relevant offers.",
-  "TR_BUY_FOOTER_TEXT_2": "Invity does not see any of your payment or KYC information; you share this only with the exchange provider if you choose to finish the transaction.",
+  "TR_BUY_FOOTER_TEXT_2": "Invity doesn't see any of your payment or KYC information; you share this only with the exchange provider if you choose to finish the transaction.",
   "TR_BUY_GO_TO_PAYMENT": "Finish transaction",
   "TR_BUY_LEARN_MORE": "Learn more",
   "TR_BUY_MODAL_CONFIRM": "I’m ready to buy",
@@ -398,7 +400,7 @@
   "TR_BUY_MODAL_TERMS_1": "I’m here to buy cryptocurrencies. If I were directed to this site for any other reason, I'll contact {provider} support before proceeding.",
   "TR_BUY_MODAL_TERMS_2": "I’m using this feature to buy cryptocurrencies that'll be sent to my own account.",
   "TR_BUY_MODAL_TERMS_3": "I understand that cryptocurrency transactions are final and can't be reversed or refunded. Losses due to fraud or mistakes may not be recoverable.",
-  "TR_BUY_MODAL_TERMS_4": "I understand that Invity doesn't provide this service. It's governed by {provider}’s terms and conditions.",
+  "TR_BUY_MODAL_TERMS_4": "I understand that Invity doesn't provide this service. It's governed by {provider}’s Terms and Conditions.",
   "TR_BUY_MODAL_TERMS_5": "I'm not using this feature for gambling, fraud, or any activity that violates Invity’s or the provider's Terms of Service, or any applicable laws.",
   "TR_BUY_MODAL_TERMS_6": "I understand that cryptocurrencies are an emerging financial tool and that regulations can differ by region. This may increase the risk of fraud, theft, or market instability.",
   "TR_BUY_MODAL_VERIFIED_PARTNERS_HEADER": "Verified partners by Invity",
@@ -415,12 +417,10 @@
   "TR_BUY_STATUS_PENDING": "Pending",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "Pending",
   "TR_BUY_STATUS_SUCCESS": "Approved",
-  "TR_BUY_TRANS_ID": "Trans. ID:",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "Maximum is {maximum}",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "Maximum is {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "Minimum is {minimum}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "Minimum is {minimum} {currency}",
-  "TR_BUY_VIEW_DETAILS": "View details",
   "TR_BYTES": "bytes",
   "TR_CAMERA_NOT_RECOGNIZED": "The camera was not recognized.",
   "TR_CAMERA_PERMISSION_DENIED": "Permission to access the camera was denied.",
@@ -439,12 +439,12 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Trezor amount",
   "TR_CHAINED_TXS": "Chained transactions",
   "TR_CHANGELOG": "Changelog",
-  "TR_CHANGELOG_ON_GITHUB": "Changelog on GitHub",
   "TR_CHANGE_ADDRESS_TOOLTIP": "This is a change address created from a previous send.",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "You can change your firmware type in Settings anytime.",
   "TR_CHANGE_HOMESCREEN": "Change homescreen",
   "TR_CHANGE_PIN": "Change PIN",
   "TR_CHANGE_WIPE_CODE": "Change wipe code",
+  "TR_CHECKED_BALANCES_ON": "Checked balances on",
   "TR_CHECKING_YOUR_DEVICE": "Checking your device",
   "TR_CHECKSUM_CONVERSION_INFO": "Converted to checksum. <a>Learn more</a>",
   "TR_CHECK_DEVICE_ORIGIN_DESCRIPTION": "We'll verify the integrity of your Trezor device, ensuring its safety and confirming the authenticity of the chip.",
@@ -452,13 +452,12 @@
   "TR_CHECK_FINGERPRINT": "Check fingerprint",
   "TR_CHECK_FOR_DEVICES": "Find Trezor",
   "TR_CHECK_ORIGIN": "Check device",
-  "TR_CHECK_RECOVERY_SEED": "Check backup",
+  "TR_CHECK_RECOVERY_SEED": "Check wallet backup",
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "Perform a simulated recovery to verify your wallet backup.",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "Enter the words from your wallet backup here in the order displayed on your device. You may be asked to type some words that aren't part of your wallet backup as an additional security measure.",
   "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "Use the two-button pad to enter your wallet backup. By doing this, you're keeping all your sensitive info safe and sound, away from any shady or insecure computer or web browser.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "Your wallet backup is entered using the touchscreen. This avoids exposing any of your sensitive information to a potentially insecure computer or web browser.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "Your wallet backup is entered using the touchscreen. This avoids exposing any of your sensitive information to a potentially insecure computer or web browser.",
-  "TR_CHECK_SEED": "Check backup",
+  "TR_CHECK_RECOVERY_SEED_DESC_TOUCHSCREEN": "Your wallet backup is entered using the touchscreen. This avoids exposing any of your sensitive information to a potentially insecure computer or web browser.",
+  "TR_CHECK_SEED": "Check wallet backup",
   "TR_CHECK_YOUR_DEVICE": "Check your Trezor's screen",
   "TR_CHOOSE_RECOVERY_TYPE": "Choose recovery type",
   "TR_CHUNKED_ADDRESS": "Spaced",
@@ -511,7 +510,8 @@
   "TR_COINJOIN_TILE_3_TITLE": "Protected by your Trezor",
   "TR_COINJOIN_TRANSACTION_BATCH": "Coinjoin transactions",
   "TR_COINMARKET_BEST_RATE": "Best rate",
-  "TR_COINMARKET_BUY_AND_SELL": "Buy & sell",
+  "TR_COINMARKET_BUY_AND_SELL": "Buy & Sell",
+  "TR_COINMARKET_BUY_AND_SELL_COUNTER": "{totalBuys, plural, =0 {{totalBuys} buys} one {{totalBuys} buy} other {{totalBuys} buys} } • {totalSells, plural, =0 {{totalSells} sells} one {{totalSells} sell} other {{totalSells} sells} }",
   "TR_COINMARKET_CEX_TOOLTIP": "Centralized exchange",
   "TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY": "Change amount or currency.",
   "TR_COINMARKET_COMPARE_OFFERS": "Compare all offers",
@@ -553,19 +553,13 @@
   "TR_COINMARKET_KYC_NO_REFUND": "KYC requested in exceptional cases. KYC required for refunds. 👈",
   "TR_COINMARKET_KYC_POLICY": "KYC policy",
   "TR_COINMARKET_KYC_POLICY_NEVER_REQUIRED": "KYC never required",
-  "TR_COINMARKET_KYC_YES_REFUND": "KYC requested in exceptional cases. KYC not required for refunds. 🤝",
+  "TR_COINMARKET_KYC_YES_REFUND": "KYC is only requested in exceptional cases. It's not required for refunds. 🤝",
   "TR_COINMARKET_LAST_TRANSACTIONS": "Last transactions",
   "TR_COINMARKET_NETWORK_FEE": "Network fee",
   "TR_COINMARKET_NETWORK_TOKENS": "{networkName} tokens",
   "TR_COINMARKET_NO_CEX_PROVIDER_FOUND": "No CEX provider found",
   "TR_COINMARKET_NO_DEX_PROVIDER_FOUND": "No DEX provider found",
   "TR_COINMARKET_NO_METHODS_AVAILABLE": "No methods available",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "Auto-reloading in",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "Back to Trade",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "No offers",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "Sorry, we don't have any offers at the moment due to a server connectivity issue.",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "Sorry, we don't have any offers at the moment. Try to reload the page or change your query.",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "Reload page",
   "TR_COINMARKET_OFFERS_EMPTY": "No offers available for your request. Change country or buy amount.",
   "TR_COINMARKET_OFFERS_REFRESH": "Offers refresh in",
   "TR_COINMARKET_OFFERS_SELECT": "Select",
@@ -581,6 +575,7 @@
   "TR_COINMARKET_SHOW_OFFERS": "Compare offers",
   "TR_COINMARKET_SWAP": "Swap",
   "TR_COINMARKET_SWAP_AMOUNT": "Swap amount",
+  "TR_COINMARKET_SWAP_COUNTER": "{totalSwaps, plural, =0 {{totalSwaps} swaps} one {{totalSwaps} swap} other {{totalSwaps} swaps} }",
   "TR_COINMARKET_SWAP_DEX_MODAL_CONFIRM": "I’m ready to swap",
   "TR_COINMARKET_SWAP_DEX_MODAL_FOR_YOUR_SAFETY": "Swap {fromCrypto} to {toCrypto} with {provider}",
   "TR_COINMARKET_SWAP_DEX_MODAL_LEGAL_HEADER": "Legal notice",
@@ -588,7 +583,7 @@
   "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_1": "I want to swap cryptocurrencies using DEX (decentralized exchange) by using {provider}'s contract.",
   "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_2": "I want to swap cryptocurrencies for my own account. I understand that the provider's policies may require identity verification.",
   "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_3": "I understand that cryptocurrency transactions are final and can't be reversed or refunded. Losses due to fraud or mistakes may not be recoverable.",
-  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4": "I understand that Invity doesn't provide this service. It's governed by {provider}’s terms and conditions.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4": "I understand that Invity doesn't provide this service. It's governed by {provider}’s Terms and Conditions.",
   "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_5": "I'm not using this feature for gambling, fraud, or any activity that violates Invity’s or the provider's Terms of Service, or any applicable laws.",
   "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_6": "I understand that cryptocurrencies are an emerging financial tool and that regulations can differ by region. This may increase the risk of fraud, theft, or market instability.",
   "TR_COINMARKET_SWAP_DEX_MODAL_VERIFIED_PARTNERS_HEADER": "Verified partners by Invity",
@@ -599,13 +594,15 @@
   "TR_COINMARKET_SWAP_MODAL_TERMS_1": "I’m here to swap cryptocurrencies. If I were directed to this site for any other reason, I'll contact Trezor Support before proceeding. ",
   "TR_COINMARKET_SWAP_MODAL_TERMS_2": "I want to swap cryptocurrencies for my own account. I understand that the provider's policies may require identity verification.",
   "TR_COINMARKET_SWAP_MODAL_TERMS_3": "I understand that cryptocurrency transactions are final and can't be reversed or refunded. Losses due to fraud or mistakes may not be recoverable.",
-  "TR_COINMARKET_SWAP_MODAL_TERMS_4": "I understand that Invity doesn't provide this service. It's governed by {provider}’s terms and conditions.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_4": "I understand that Invity doesn't provide this service. It's governed by {provider}’s Terms and Conditions.",
   "TR_COINMARKET_SWAP_MODAL_TERMS_5": "I'm not using this feature for gambling, fraud, or any activity that violates Invity’s or the provider's Terms of Service, or any applicable laws.",
   "TR_COINMARKET_SWAP_MODAL_TERMS_6": "I understand that cryptocurrencies are an emerging financial tool and that regulations can differ by region. This may increase the risk of fraud, theft, or market instability.",
   "TR_COINMARKET_SWAP_MODAL_VERIFIED_PARTNERS_HEADER": "Verified partners by Invity",
   "TR_COINMARKET_TOKEN_NETWORK": "{tokenName} on {networkName} network",
   "TR_COINMARKET_TRADE_FEE": "Trade fee",
+  "TR_COINMARKET_TRANS_ID": "Trans. ID:",
   "TR_COINMARKET_UNKNOWN_PROVIDER": "Unknown provider",
+  "TR_COINMARKET_VIEW_DETAILS": "View details",
   "TR_COINMARKET_YOUR_BEST_OFFER": "Your best offer",
   "TR_COINMARKET_YOU_BUY": "You buy",
   "TR_COINMARKET_YOU_GET": "You get",
@@ -653,13 +650,13 @@
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_BUTTON": "Manage",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_DESCRIPTION": "Enable the passphrase entry dialog to open when you open Trezor Suite.",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_TITLE": "Do you primarily use a passphrase?",
-  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Verify on Trezor to confirm receive address. Continuing without confirming isn't recommended.",
+  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Verify on your Trezor to confirm the receive address. It's not recommended to continue without confirming.",
   "TR_CONNECT_DEVICE_RECEIVE_PROMO_TITLE": "Receive address can't be verified",
   "TR_CONNECT_DEVICE_SEND_PROMO_DESCRIPTION": "To send coins, connect your Trezor.",
   "TR_CONNECT_DEVICE_SEND_PROMO_TITLE": "Your Trezor isn't connected",
   "TR_CONNECT_TREZOR_TO_SEND_BUTTON": "Connect Trezor to Send",
   "TR_CONNECT_YOUR_DEVICE": "Connect & unlock your Trezor",
-  "TR_CONTACT_SUPPORT": "Contact support",
+  "TR_CONTACT_SUPPORT": "Contact Trezor Support",
   "TR_CONTACT_TREZOR_SUPPORT": "Contact Trezor Support",
   "TR_CONTINUE": "Continue",
   "TR_CONTINUE_ANYWAY": "Continue anyway",
@@ -679,7 +676,7 @@
   "TR_COPY_ADDRESS_POLICY_ID": "Never send funds to a policy ID address.",
   "TR_COPY_AND_CLOSE": "Copy & Close",
   "TR_COPY_SIGNED_MESSAGE": "Copy signed message",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "Copy",
+  "TR_COPY_TO_CLIPBOARD": "Copy",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "Could not retrieve the changelog",
   "TR_COULD_NOT_RETRIEVE_DATA": "Could not retrieve data",
   "TR_COUNT_WALLETS": "{count} {count, plural, one {wallet} other {wallets}}",
@@ -713,6 +710,7 @@
   "TR_DASHBOARD_ASSET_FAILED": "Asset not loaded correctly",
   "TR_DASHBOARD_DISCOVERY_ERROR": "Discovery error",
   "TR_DASHBOARD_DISCOVERY_ERROR_PARTIAL_DESC": "Accounts were not loaded properly {details}",
+  "TR_DATA": "Data",
   "TR_DATABASE_UPGRADE_BLOCKED": "Database upgrade blocked by another app instance",
   "TR_DATA_ANALYTICS_CATEGORY_1": "Platform",
   "TR_DATA_ANALYTICS_CATEGORY_1_ITEM_1": "OS, Trezor model, version etc.",
@@ -766,19 +764,24 @@
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT": "In bootloader by mistake?",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_BUTTON": "Reconnect the device without touching any buttons.",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_TOUCH": "Reconnect the device without touching the screen.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED": "This device is being used elsewhere.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION": "The app {transportSessionOwner} may currently be using this device. You can take control of the device if needed.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION_UNKNOWN_APP": "Another app may currently be using this device. You can take control of the device if needed.",
   "TR_DEVICE_CONNECTED_WRONG_STATE": "Device detected in incorrect state",
   "TR_DEVICE_DISCONNECTED_DURING_ACTION_DESCRIPTION": "Your Trezor was disconnected during the backup process. We strongly recommend that you use the factory reset option in Device settings to wipe your device and start the wallet backup process again.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH": "Firmware hash check failed. Your Trezor might be counterfeit.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR": "Firmware hash check couldn't be performed. Your Trezor might be counterfeit.",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON": "Turn off",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON_DISABLED": "Turn on",
-  "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION": "Firmware revision check is a crucial security feature. We strongly recommend keeping it turned on.",
-  "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION_DISABLED": "Firmware revision check is a crucial security feature. We strongly recommend keeping it turned on.",
+  "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION": "Firmware authenticity check is a crucial security feature. We strongly recommend keeping it turned on.",
+  "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION_DISABLED": "Firmware authenticity check is a crucial security feature. We strongly recommend keeping it turned on.",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_BUTTON": "Turn off",
-  "TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_1": "Turn off the firmware revision check only if you fully understand the risks and have a valid reason. If unsure, contact Trezor Support for help.",
+  "TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_1": "Turn off the firmware authenticity check only if you fully understand the risks and have a valid reason. If unsure, contact Trezor Support for help.",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_2": "Only turn off this feature if your device has successfully passed the check before. Using an unverified device could result in the loss of your funds.",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_3": "Trezor Support will never ask you to turn off the firmware revision check. This feature is designed to protect your security.",
-  "TR_DEVICE_FIRMWARE_REVISION_CHECK_TITLE": "Turn off firmware revision check",
-  "TR_DEVICE_FIRMWARE_REVISION_CHECK_TITLE_DISABLED": "Turn on firmware revision check",
-  "TR_DEVICE_FIRMWARE_REVISION_CHECK_UNABLE_TO_PERFORM": "Firmware revision check couldn't be performed. Go online to verify your firmware version.",
+  "TR_DEVICE_FIRMWARE_REVISION_CHECK_TITLE": "Turn off firmware authenticity check",
+  "TR_DEVICE_FIRMWARE_REVISION_CHECK_TITLE_DISABLED": "Turn on firmware authenticity check",
+  "TR_DEVICE_FIRMWARE_REVISION_CHECK_UNABLE_TO_PERFORM": "Firmware authenticity check couldn't be performed. Go online to verify your firmware version.",
   "TR_DEVICE_FW_UNKNOWN": "Unknown",
   "TR_DEVICE_IN_BOOTLOADER": "The device is in bootloader mode.",
   "TR_DEVICE_IN_RECOVERY_MODE": "Your device is in recovery mode.",
@@ -786,8 +789,10 @@
   "TR_DEVICE_LABEL_IS_NOT_BACKED_UP": "Device \"{deviceLabel}\" isn't backed up",
   "TR_DEVICE_LABEL_IS_NOT_CONNECTED": "Device \"{deviceLabel}\" isn't connected",
   "TR_DEVICE_LABEL_IS_UNAVAILABLE": "Device \"{deviceLabel}\" is unavailable",
+  "TR_DEVICE_MAYBE_COMPROMISED_HEADING": "Device verification unsuccessful",
+  "TR_DEVICE_MAYBE_COMPROMISED_TEXT": "Reconnect your device and try verifying again. If the issue continues, contact Trezor Support to figure out what's going on with your device and what to do next.",
   "TR_DEVICE_NOT_CONNECTED": "Device not connected",
-  "TR_DEVICE_NOT_INITIALIZED": "Trezor is not set up",
+  "TR_DEVICE_NOT_INITIALIZED": "Trezor isn't set up",
   "TR_DEVICE_NOT_INITIALIZED_TEXT": "We'll guide you through the process and get you started right away.",
   "TR_DEVICE_SECURITY": "Security",
   "TR_DEVICE_SETTINGS_AFTER_DELAY": "After delay",
@@ -848,7 +853,6 @@
   "TR_DOWNLOAD_LATEST_BRIDGE": "Download latest Bridge {version}",
   "TR_DO_NOT_DISCONNECT_DEVICE": "Don't disconnect your device",
   "TR_DO_NOT_SHOW_AGAIN": "Don't show again",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "Skip this step?",
   "TR_DROPBOX": "Dropbox",
   "TR_DROPZONE": "Drag and drop file here or click to select from files",
   "TR_DROPZONE_ERROR": "Import failed: {error}",
@@ -869,13 +873,13 @@
   "TR_EARLY_ACCESS_ENABLE": "Join",
   "TR_EARLY_ACCESS_ENABLED": "Early Access Program enabled",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM": "Join",
-  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "I understand this allows me to test pre-release software, which may contain errors that affect the normal operation of Suite.",
+  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "I understand this allows me to test pre-release software, which may contain errors that affect the normal operation of Trezor Suite.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_DESCRIPTION": "You can turn it off anytime.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TITLE": "Try out the latest product features before release to the general public.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TOOLTIP": "Check the field above first",
   "TR_EARLY_ACCESS_JOINED_DESCRIPTION": "You can either check for beta updates now or on the next launch.",
   "TR_EARLY_ACCESS_JOINED_TITLE": "Early Access Program enabled",
-  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "To downgrade to the latest stable release of Suite, please click \"Download stable\" and reinstall the app.",
+  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "To downgrade to the latest stable release of Trezor Suite, click \"Download stable\" and reinstall the app.",
   "TR_EARLY_ACCESS_LEFT_TITLE": "You've left the Early Access Program. Beta releases are no longer offered.",
   "TR_EARLY_ACCESS_MENU": "Early Access Program",
   "TR_EARLY_ACCESS_REINSTALL": "Download stable",
@@ -902,8 +906,8 @@
   "TR_ENTER_SEED_WORDS_ON_DEVICE": "The words are entered on the device for security reasons. Please enter the words in the correct order.",
   "TR_ENTER_WIPECODE": "Enter Wipe Code",
   "TR_ERROR": "Error",
-  "TR_ERROR_CARDANO_DELEGATE": "Amount is not enough",
-  "TR_ERROR_CARDANO_WITHDRAWAL": "Amount is not enough",
+  "TR_ERROR_CARDANO_DELEGATE": "Amount isn't enough",
+  "TR_ERROR_CARDANO_WITHDRAWAL": "Amount isn't enough",
   "TR_ETH_ADDRESS_CANT_VERIFY_HISTORY": "Unable to verify address history. Check that the address is correct.",
   "TR_ETH_ADDRESS_NOT_USED_NOT_CHECKSUMMED": "Address has no transaction history and isn't checksummed. Check that the address is correct.",
   "TR_EVM_EXPLANATION_DESCRIPTION": "It shares the same address style as Ethereum but has its own unique coins and tokens that can't be used on other networks.",
@@ -930,7 +934,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "Approve only the exact amount required for this swap. You will need to pay an additional fee if you want to make a similar swap again.",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "Revoke previous approval",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "Perform a transaction that will remove previous approval of contract with {provider}.",
-  "TR_EXCHANGE_BUY": "For",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Confirm on Trezor & send",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "Confirm & Send",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "Create approval",
@@ -952,8 +955,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "Your transaction was successful.",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "Approved",
   "TR_EXCHANGE_DEX": "Decentralized exchange offer",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "The fees to perform this swap are estimated at {approvalFee} ({approvalFeeFiat}) for approval (if required) and {swapFee} ({swapFeeFiat}) for the swap.",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "No funds remaining for the transaction fees. Please lower the exchange amount to max {symbol} {max}",
   "TR_EXCHANGE_EXTRA_FIELD": "{extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "{extraFieldName} is invalid",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "{extraFieldDescription}",
@@ -963,7 +964,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "Fixed rates show you exactly how much you'll end up with at the end of the exchange—the amount won't change between when you select the rate and when your transaction is complete. You're guaranteed the amount shown, but these rates are usually less generous, meaning your money won't buy as much crypto.",
   "TR_EXCHANGE_FLOAT": "Floating-rate offer",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "Floating rates mean that the final amount you'll get may change slightly due to fluctuations in the market between when you select the rate and when your transaction is complete. These rates are usually higher, meaning you could end up with more crypto in the end.",
-  "TR_EXCHANGE_PROVIDER": "Provider",
   "TR_EXCHANGE_RATE": "Price",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "Receive account is outside of Suite.",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "This is the specific alphanumeric address that will receive your coins.",
@@ -990,23 +990,16 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "Please enter a number.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "Enter your desired slippage.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "Swap offer amount",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "Slippage summary",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "Slippage tolerance",
-  "TR_EXCHANGE_TRANS_ID": "Trans. ID:",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "Use an account ({symbol}) that isn't in Suite",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "Receive address",
-  "TR_EXCHANGE_VIEW_DETAILS": "View details",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE": "Automatic Trezor Suite updates",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION": "Trezor Suite automatically downloads the latest version in the background and installs it when restarting the app. This ensures you're always up-to-date with the latest features and security patches. Updates occur without requiring your permission.",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN": "BNB Smart Chain",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON": "Enables the BNB Smart Chain network but without internal transaction data history.",
   "TR_EXPERIMENTAL_FEATURES": "Experimental",
   "TR_EXPERIMENTAL_FEATURES_ALLOW": "Experimental features",
   "TR_EXPERIMENTAL_FEATURES_WARNING": "For experienced users only. Use at your own risk. These features are in testing, may be unstable, and might not have long-term support.",
   "TR_EXPERIMENTAL_PASSWORD_MANAGER": "Migrate Dropbox passwords",
-  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "A utility for retrieving passwords stored on Dropbox and secured by Trezor. Designed for previous Chrome extension users of Trezor Password Manager.",
+  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Use this utility to retrieve passwords stored on Dropbox and secured by Trezor. Designed for former users of the Trezor Password Manager Chrome extension.",
   "TR_EXPERIMENTAL_TOR_SNOWFLAKE": "Tor Snowflake",
-  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Tor Snowflake is a system that allows access to censored websites and apps.",
+  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Access censored websites and apps using Tor Snowflake, a system designed to bypass restrictions.",
   "TR_EXPORT_AS": "Export as {as}",
   "TR_EXPORT_FAIL": "Export failed.",
   "TR_EXPORT_TO_FILE": "Export to file",
@@ -1043,8 +1036,8 @@
   "TR_FIRMWARE_LANGUAGE_FETCH_ERROR": "Translation download failed",
   "TR_FIRMWARE_NEW_FW_DESCRIPTION": "New firmware is now available. Update your device now.",
   "TR_FIRMWARE_REINSTALL_FW_DESCRIPTION": "Your device is already updated to the latest firmware. You may reinstall the firmware if needed.",
-  "TR_FIRMWARE_REVISION_CHECK_FAILED": "Firmware revision check failed. Your Trezor may be counterfeit.",
-  "TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR": "Couldn't perform firmware revision check.",
+  "TR_FIRMWARE_REVISION_CHECK_FAILED": "Firmware authenticity check failed. Your Trezor may be counterfeit.",
+  "TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR": "Couldn't perform firmware authenticity check.",
   "TR_FIRMWARE_STATUS_INSTALLATION_COMPLETED": "Completed",
   "TR_FIRMWARE_SUBHEADING_BITCOIN": "Lightweight firmware supporting only Bitcoin operations.",
   "TR_FIRMWARE_SUBHEADING_NONE": "Your Trezor is shipped without firmware. Install the latest firmware in order to use your device safely. For Bitcoin-only users, we recommend installing <button>{bitcoinOnly} firmware</button>.",
@@ -1082,7 +1075,7 @@
   "TR_GOT_IT_BUTTON": "Got it\n",
   "TR_GO_TO_ONBOARDING": "Begin setup",
   "TR_GO_TO_SETTINGS": "Go to settings",
-  "TR_GO_TO_SUITE": "Access Suite",
+  "TR_GO_TO_SUITE": "Go to Trezor Suite",
   "TR_GRAPH_LINEAR": "Linear",
   "TR_GRAPH_LOGARITHMIC": "Logarithmic",
   "TR_GRAPH_MISSING_DATA": "XRP, SOL, and all token amounts are in the portfolio balance but aren't currently supported in graph view.",
@@ -1101,7 +1094,7 @@
   "TR_GUIDE_FORUM": "Trezor Forum",
   "TR_GUIDE_FORUM_LABEL": "Connect with the Trezor community",
   "TR_GUIDE_SUGGESTION_LABEL": "How are we doing?",
-  "TR_GUIDE_SUPPORT": "Contact support",
+  "TR_GUIDE_SUPPORT": "Contact Trezor Support",
   "TR_GUIDE_SUPPORT_AND_FEEDBACK": "Support & Feedback",
   "TR_GUIDE_VIEW_HEADLINES_SUPPORT_FEEDBACK_SELECTION": "Support & Feedback",
   "TR_GUIDE_VIEW_HEADLINE_HELP_US_IMPROVE": "Help us improve",
@@ -1233,7 +1226,7 @@
   "TR_LOCAL_FILE_SYSTEM": "Local file system",
   "TR_LOG": "Application log",
   "TR_LOGIN_PROCEED": "Proceed",
-  "TR_LOG_DESCRIPTION": "The log contains all necessary technical information about Trezor Suite. It may be needed when connecting with Trezor Support.",
+  "TR_LOG_DESCRIPTION": "This log contains essential technical information about Trezor Suite and may be needed when contacting Trezor Support.",
   "TR_LOOKING_FOR_COINJOIN_ROUND": "Waiting for a round",
   "TR_LOW_ANONYMITY_WARNING": "<red>Very low privacy.</red> We recommend using at least 1 in 5, as anything below this threshold isn't private.",
   "TR_LTC_ADDRESS_INFO": "Litecoin changed the address format. Find more info about how to convert your address on our blog. {TR_LEARN_MORE}",
@@ -1326,6 +1319,7 @@
   "TR_NETWORK_LITECOIN": "Litecoin",
   "TR_NETWORK_NAMECOIN": "Namecoin",
   "TR_NETWORK_NEM": "NEM",
+  "TR_NETWORK_OP": "Optimism",
   "TR_NETWORK_POLYGON": "Polygon PoS",
   "TR_NETWORK_SOLANA_DEVNET": "Solana Devnet",
   "TR_NETWORK_SOLANA_MAINNET": "Solana",
@@ -1338,9 +1332,10 @@
   "TR_NETWORK_ZCASH": "Zcash",
   "TR_NEW_FEE": "New",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "New Trezor Bridge is available.",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "New Trezor firmware is available! Update your device now.",
   "TR_NEXT_UP": "Next",
   "TR_NONCE": "Nonce",
+  "TR_NON_ASCII_CHAR": "{label} (with non-recommended \"{char}\")",
+  "TR_NON_ASCII_CHARS": "{label} (with non-recommended characters)",
   "TR_NORMAL_ACCOUNTS": "Default accounts",
   "TR_NORTH": "North",
   "TR_NOTHING_TO_ANONYMIZE": "Nothing to make private",
@@ -1358,16 +1353,12 @@
   "TR_NO_PASSPHRASE_WALLET": "Standard wallet",
   "TR_NO_SEARCH_RESULTS": "No results for your search criterion",
   "TR_NO_SPENDABLE_UTXOS": "There are no spendable UTXOs in your account.",
-  "TR_NO_TRANSPORT": "Browser can't communicate with device",
+  "TR_NO_TRANSPORT": "Your browser can't communicate with your device",
   "TR_NO_TRANSPORT_DESKTOP": "App can't communicate with device",
   "TR_NUM_ACCOUNTS_FIAT_VALUE": "{accountsCount} {accountsCount, plural, one {account} other {accounts}} • {fiatValue}",
   "TR_N_MIN": "{n} min",
   "TR_N_TRANSACTIONS": "{value} {value, plural, one {transaction} other {transactions}}",
   "TR_OFF": "off",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "The chosen amount of {amount} is higher than the accepted maximum of {max}.",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "The chosen amount of {amount} is higher than the accepted maximum of {max}.",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "The chosen amount of {amount} is lower than the accepted minimum of {min}.",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "The chosen amount of {amount} is lower than the accepted minimum of {min}.",
   "TR_OFFICIAL_LANGUAGES": "Official",
   "TR_OK": "OK",
   "TR_ON": "on",
@@ -1426,40 +1417,18 @@
   "TR_OTHER_INPUTS_AND_OUTPUTS": "Other inputs and outputs",
   "TR_OUTGOING": "Outgoing",
   "TR_OUTPUTS": "Outputs",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "The minimum and maximum amount for which this user is willing to sell {symbol}.",
-  "TR_P2P_GET_STARTED_INTRO": "You need to initiate the transaction on {providerName} – make sure to follow the steps below carefully.",
-  "TR_P2P_GET_STARTED_ITEM_1": "Select “Go to {providerName}” to be redirected to our partner’s website.",
-  "TR_P2P_GET_STARTED_ITEM_3": "Once {providerName} asks you for a release address, return here and continue.",
-  "TR_P2P_GET_STARTED_ITEM_4": "Almost there! Reveal and copy your address, paste it into the “Release address” field back on {providerName}, and finalize the transaction.",
-  "TR_P2P_GO_TO_PROVIDER": "Go to {providerName}",
-  "TR_P2P_INFO": "With {peerToPeer} (P2P) technology, there is no KYC verification involved neither on the side of the buyer nor the seller. All parties are protected against fraud by secure {multisigEscrow}.",
-  "TR_P2P_MODAL_CONFIRM": "I’m ready to buy",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "Peer-to-Peer Buy {cryptocurrency} with {provider}",
-  "TR_P2P_MODAL_LEGAL_HEADER": "Legal notice",
-  "TR_P2P_MODAL_SECURITY_HEADER": "Security first with your Trezor",
-  "TR_P2P_MODAL_TERMS_1": "You’re here to buy cryptocurrency from another person you choose using Peer-to-Peer (P2P) technology without ID verification. If you were directed to this site for any other reason, please contact support before proceeding.",
-  "TR_P2P_MODAL_TERMS_2": "You understand that cryptocurrency transactions are irreversible and may not be refunded. Thus, fraudulent or accidental losses may be unrecoverable.",
-  "TR_P2P_MODAL_TERMS_4": "You understand that Invity does not provide this service. {provider}’s terms govern the service.",
-  "TR_P2P_MODAL_TERMS_5": "I'm not using this feature for gambling, fraud, or any activity that violates Invity’s or the provider's Terms of Service, or any applicable laws.",
-  "TR_P2P_MODAL_TERMS_6": "You understand that cryptocurrencies are an emerging financial tool and that regulations may vary in different jurisdictions. This may put you at a higher risk of fraud, theft, or market instability.",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "Verified partners by Invity",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "The transaction needs to be completed within this time limit, counting from creating a contract on the {providerName} site.",
-  "TR_P2P_PRICE": "Price for 1 {symbol}",
-  "TR_P2P_PRICE_TOOLTIP": "{symbol} price offered by this user.",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "Hey there, I’m using {providerName}!",
-  "TR_P2P_USER_REPUTATION": "({rating}, {numberOfTrades})",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "The chosen amount of {amount} is higher than the accepted maximum of {maximum}.",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "The chosen amount of {amount} is lower than the accepted minimum of {minimum}.",
   "TR_PAGINATION_NEWER": "Newer",
   "TR_PAGINATION_OLDER": "Older",
   "TR_PASSPHRASE_CASE_SENSITIVE": "Note: Passphrase is case-sensitive.",
   "TR_PASSPHRASE_DESCRIPTION_ITEM1": "It's important to first learn how a passphrase works",
   "TR_PASSPHRASE_DESCRIPTION_ITEM2": "A passphrase opens a wallet secured by that phrase",
-  "TR_PASSPHRASE_DESCRIPTION_ITEM3": "No one can recover it, not even Trezor support",
+  "TR_PASSPHRASE_DESCRIPTION_ITEM3": "No one can recover it, not even Trezor Support",
   "TR_PASSPHRASE_HIDDEN_WALLET": "Passphrase wallet",
   "TR_PASSPHRASE_MISMATCH": "Passphrase mismatch",
   "TR_PASSPHRASE_MISMATCH_DESCRIPTION": "The passphrases didn't match. For security, start over and enter them correctly.",
   "TR_PASSPHRASE_MISMATCH_START_OVER": "Start over",
+  "TR_PASSPHRASE_NON_ASCII_CHARS": "We recommend using <code>ABC</code>, <code>abc</code>, <code>123</code>, <code>spaces</code> or <code>these special characters</code>",
+  "TR_PASSPHRASE_NON_ASCII_CHARS_WARNING": "Use of unlisted special characters may impact future compatibility.",
   "TR_PASSPHRASE_TOO_LONG": "Passphrase length exceeds the allowed limit.",
   "TR_PASSPHRASE_WALLET": "Passphrase wallet #{id}",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT": "Learn how a passphrase works",
@@ -1501,7 +1470,7 @@
   "TR_PIN_SUBHEADING": "Using a strong PIN protects your Trezor from unauthorized physical access.",
   "TR_PLAY_IT_SAFE": "Let's play it safe",
   "TR_PLEASE_ALLOW_YOUR_CAMERA": "Please enable your camera to scan QR codes.",
-  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Please connect your device to continue with the verification process.",
+  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Connect your Trezor to continue with the verification process.",
   "TR_PLEASE_ENABLE_PASSPHRASE": "Please enable the passphrase feature to continue with the verification process.",
   "TR_POLICY_ID_ADDRESS": "Policy ID:",
   "TR_PRIMARY_FIAT": "Fiat currency",
@@ -1509,7 +1478,6 @@
   "TR_PRIVATE_DESCRIPTION": "Privacy at least {targetAnonymity}",
   "TR_PROCEED_UNVERIFIED_ADDRESS": "Proceed with unverified address",
   "TR_PROMO_BANNER_DASHBOARD": "<underline>The most convenient</underline> <rest>hardware wallet to securely manage your crypto</rest>",
-  "TR_QR_CODE": "QR code",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM": "Confirm on Trezor before scanning",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM_EXPLANATION": "Please confirm the receiving address on your Trezor device first, as its trusted display can't be hacked.",
   "TR_QUICK_ACTION_DEBUG_EAP_EXPERIMENTAL_ENABLED": "Enabled",
@@ -1519,6 +1487,13 @@
   "TR_QUICK_ACTION_TOOLTIP_TREZOR_SUITE": "Trezor Suite",
   "TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE": "Update available ({newVersion})",
   "TR_QUICK_ACTION_TOOLTIP_UP_TO_DATE": "Up to date ({currentVersion})",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED": "Trezor Suite downloaded a new update.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED": "Trezor Suite's been updated.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE": "Trezor Suite update now available",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE": "Restart & update",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE": "Start update",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE": "Trezor update now available",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW": "What’s new?",
   "TR_RANDOM_SEED_WORDS_DISCLAIMER": "You may be asked to type some words that aren't part of your wallet backup",
   "TR_RANGE": "range",
   "TR_READ_AND_UNDERSTOOD": "I've read and understood the above",
@@ -1570,7 +1545,7 @@
   "TR_SAFETY_CHECKS_MODAL_TITLE": "Safety checks",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL": "Prompt",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL_DESC": "Allow potentially unsafe actions, such as mismatching keys or allowing extreme fees, by manually approving them on your Trezor.",
-  "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "Do not change this unless you know what you're doing!",
+  "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "Only change this if you know what you're doing!",
   "TR_SAFETY_CHECKS_STRICT_LEVEL": "Strict",
   "TR_SAFETY_CHECKS_STRICT_LEVEL_DESC": "Full Trezor security.",
   "TR_SCAN_QR_CODE": "Scan QR code",
@@ -1580,10 +1555,10 @@
   "TR_SEARCH_TRANSACTIONS": "Search transactions",
   "TR_SEARCH_UTXOS": "Search for a specific address, transaction ID, or label",
   "TR_SECURITY_CHECKPOINT_GOT_SEED": "Do you have your wallet backup?",
-  "TR_SECURITY_CHECK_HOLOGRAM": "Please note that device packaging, including holograms and security seals, have been updated over time. You can verify packaging details <packaging>here</packaging>. Ensure that your device was purchased from either the official Trezor Shop or from one of <reseller>our trusted sellers</reseller>. Otherwise, there's a risk that your device might be a counterfeit. If you suspect that your device is not genuine, please  <support>contact Trezor support</support>.",
+  "TR_SECURITY_CHECK_HOLOGRAM": "Please note that device packaging, including holograms and security seals, have been updated over time. You can verify packaging details <packaging>here</packaging>. Ensure that your device was purchased from either the official Trezor Shop or from one of <reseller>our trusted sellers</reseller>. Otherwise, there's a risk that your device might be a counterfeit. If you suspect that your device is not genuine, please  <support>contact Trezor Support</support>.",
   "TR_SECURITY_FEATURES_COMPLETED_N": "Security ({n} of {m})",
-  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "Devices set up in seedless mode can't access Trezor Suite. This is to avoid irreversible coin loss, which happens when using an improperly set up device for the wrong purpose.",
-  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE": "Seedless setup is not supported by Trezor Suite",
+  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "Devices set up in seedless mode can't access Trezor Suite to prevent irreversible coin loss, which can occur if a device is used incorrectly.",
+  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE": "Seedless setup isn't supported in Trezor Suite",
   "TR_SEED_BACKUP_LENGTH": "Your wallet backup may contain 12, 18, or 24 words.",
   "TR_SEED_BACKUP_LENGTH_INCLUDING_SHAMIR": "Your wallet backup may contain 12, 18, 20, 24, or 33 words.",
   "TR_SEED_CHECK_FAIL_TITLE": "Wallet backup check failed",
@@ -1593,12 +1568,15 @@
   "TR_SEED_WORDS_ENTER_COMPUTER": "Enter the words from your wallet backup in the order displayed on your Trezor.",
   "TR_SEED_WORDS_ENTER_TOUCHSCREEN": "Using the touchscreen display, enter all the words in the correct order until completed.",
   "TR_SEE_DETAILS": "See details",
+  "TR_SEE_IF_ISSUE_PERSISTS": "See if issue persists.",
   "TR_SELECTED": "{amount} selected",
   "TR_SELECT_COIN_FOR_SETTINGS": "Select active coin to change settings",
   "TR_SELECT_DEVICE": "Select device",
+  "TR_SELECT_NAME_OR_ADDRESS": "Search by name, symbol, network, or contract address",
   "TR_SELECT_NUMBER_OF_WORDS": "Select the number of words in your wallet backup",
   "TR_SELECT_PASSPHRASE_SOURCE": "Select where to enter passphrase on \"{deviceLabel}\" .",
   "TR_SELECT_RECOVERY_METHOD": "Select recovery method",
+  "TR_SELECT_TOKEN": "Select a token",
   "TR_SELECT_TREZOR": "Select Trezor",
   "TR_SELECT_TREZOR_TO_CONTINUE": "Select your Trezor to continue.",
   "TR_SELECT_TYPE": "Select type",
@@ -1629,7 +1607,7 @@
   "TR_SELL_MODAL_FOR_YOUR_SAFETY": "Sell {cryptocurrency} with {provider}",
   "TR_SELL_MODAL_LEGAL_HEADER": "Legal notice",
   "TR_SELL_MODAL_SECURITY_HEADER": "Security first with your Trezor",
-  "TR_SELL_MODAL_TERMS_1": "You're here to sell cryptocurrency. If you were directed to this site for any other reason, please contact support before proceeding.",
+  "TR_SELL_MODAL_TERMS_1": "You're here to sell cryptocurrency. If you were directed to this site for any other reason, please contact Trezor Support before proceeding.",
   "TR_SELL_MODAL_TERMS_2": "You're selling cryptocurrency for your own account. You acknowledge that the provider's policies may require identity verification.",
   "TR_SELL_MODAL_TERMS_3": "You understand that cryptocurrency transactions are irreversible and may not be refunded. Thus, fraudulent or accidental losses may be unrecoverable.",
   "TR_SELL_MODAL_TERMS_4": "You understand that Invity does not provide this service. {provider}’s terms govern the service.",
@@ -1642,10 +1620,6 @@
   "TR_SELL_STATUS_ERROR": "Rejected",
   "TR_SELL_STATUS_PENDING": "Pending",
   "TR_SELL_STATUS_SUCCESS": "Approved",
-  "TR_SELL_TRANS_ID": "Trans. ID:",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "Maximum is {maximum} {currency}",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "Minimum is {minimum} {currency}",
-  "TR_SELL_VIEW_DETAILS": "View details",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "Savings",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "Rent",
   "TR_SENDING_SYMBOL": "Sending {multiple, select, true {multiple tokens} false {{symbol}} other {{symbol}}}",
@@ -1700,6 +1674,8 @@
   "TR_SHOW_LOG": "Show log",
   "TR_SHOW_MORE": "Show more",
   "TR_SHOW_MORE_ADDRESSES": "Show more ({count})",
+  "TR_SHOW_ON_TRAY": "Show icon in tray",
+  "TR_SHOW_ON_TRAY_DESCRIPTION": "Monitor if Trezor Suite is running in the background.",
   "TR_SHOW_UNVERIFIED_ADDRESS": "Show unverified address",
   "TR_SHOW_UNVERIFIED_XPUB": "Show unverified public key",
   "TR_SIDEBAR_ADD_COIN": "Add a coin",
@@ -1712,7 +1688,9 @@
   "TR_SIZE": "Size",
   "TR_SKIP": "Skip",
   "TR_SKIP_BACKUP": "Skip Backup",
+  "TR_SKIP_BACKUP_DESCRIPTION": "A wallet backup lets you recover your funds if your Trezor is lost, stolen, or damaged. Without a backup, you could lose access to your crypto permanently.",
   "TR_SKIP_PIN": "Skip PIN",
+  "TR_SKIP_PIN_DESCRIPTION": "A device PIN prevents unauthorized access to your Trezor. Without it, anyone with your device can access your funds.",
   "TR_SKIP_ROUNDS": "Round skipping",
   "TR_SKIP_ROUNDS_DESCRIPTION": "By allowing rounds to be skipped, you make it more difficult to prove any relation between your inputs. This means you can further obfuscate the origin of the funds.",
   "TR_SKIP_ROUNDS_HEADING": "Allow Trezor to skip rounds",
@@ -1725,6 +1703,7 @@
   "TR_STAKE_ADDING_TO_POOL": "Adding to staking pool",
   "TR_STAKE_ANY_AMOUNT_ETH": "Stake a minimum amount of {amount} {symbol} and start earning rewards. With our current APY rate of {apyPercent}%, your rewards earn too!",
   "TR_STAKE_APY": "Annual Percentage Yield",
+  "TR_STAKE_APY_ABBR": "APY",
   "TR_STAKE_APY_DESC": "*Annual Percentage Yield",
   "TR_STAKE_AVAILABLE": "Available",
   "TR_STAKE_CAN_CLAIM_WARNING": "You can already claim {amount} {symbol}. {br}Please claim or wait until new unstake is processed.",
@@ -1765,10 +1744,12 @@
   "TR_STAKE_LEARN_MORE": "Learn more",
   "TR_STAKE_LEAVE_STAKING_POOL": "Leave staking pool",
   "TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL": "We’ve left {amount} {symbol} out so you can pay for withdrawal fees.",
+  "TR_STAKE_LEFT_SMALL_AMOUNT_FOR_WITHDRAWAL": "We’ve left a small amount of {symbol} out so you can pay for withdrawal fees.",
   "TR_STAKE_MAX": "Max",
   "TR_STAKE_MAX_FEE_DESC": "Maximum fee is the network transaction fee that you’re willing to pay on the network to ensure your transaction gets processed.",
   "TR_STAKE_MAX_REWARD_DAYS": "Max {count, plural, one {# day} other {# days}}",
   "TR_STAKE_MIN_AMOUNT_TOOLTIP": "Minimum amount to stake is {amount} {symbol}",
+  "TR_STAKE_MONTHLY": "Monthly",
   "TR_STAKE_NEXT_PAYOUT": "Next reward payout",
   "TR_STAKE_NOT_ENOUGH_FUNDS": "Not enough {symbol} to pay network fees",
   "TR_STAKE_ONLY_REWARDS": "Only rewards",
@@ -1798,26 +1779,35 @@
   "TR_STAKE_UNSTAKED_AND_READY_TO_CLAIM": "Unstaked and ready to claim",
   "TR_STAKE_UNSTAKE_TO_CLAIM": "Unstake to claim",
   "TR_STAKE_UNSTAKING": "Unstaking",
+  "TR_STAKE_UNSTAKING_APPROXIMATE": "Approximate amount of {symbol} available instantly.",
+  "TR_STAKE_UNSTAKING_APPROXIMATE_DESCRIPTION": "The liquidity of the staking pool can allow for instant unstake of some funds. The remaining funds will follow the unstaking period.",
   "TR_STAKE_UNSTAKING_PERIOD": "Unstaking period",
   "TR_STAKE_UNSTAKING_PROCESS": "Unstaking process",
   "TR_STAKE_UNSTAKING_TAKES": "Unstaking currently takes {count, plural, one {# day} other {# days}}. Once completed, you can trade or send your funds.",
+  "TR_STAKE_WEEKLY": "Weekly",
   "TR_STAKE_WHAT_IS_STAKING": "What is staking?",
+  "TR_STAKE_YEARLY": "Yearly",
   "TR_STAKE_YOUR_FUNDS_MAINTAINED": "Your staked funds are maintained by Everstake",
   "TR_STAKING_AMOUNT_STAKED_INSTANTLY": "{amount} {symbol} staked instantly!",
   "TR_STAKING_AMOUNT_UNSTAKED_INSTANTLY": "{amount} {symbol} unstaked instantly!",
+  "TR_STAKING_CONSOLIDATING_FUNDS": "Consolidating your {symbol} for you",
   "TR_STAKING_DELEGATE": "Delegate",
   "TR_STAKING_DEPOSIT": "Refundable Deposit",
   "TR_STAKING_DEPOSIT_FEE_DECRIPTION": "The deposit fee is {feeAmount} ADA and is required to register your address to start staking. If you choose to unstake your Cardano you will get the deposit back.",
+  "TR_STAKING_ESTIMATED_GAINS": "Estimated gains",
   "TR_STAKING_FEE": "Fee",
+  "TR_STAKING_GETTING_READY": "Your {symbol} is getting ready to work",
   "TR_STAKING_INSTANTLY_STAKED": "You've instantly staked {amount} {symbol}. {days, plural, =0 {} one {The remaining {symbol} will be staked within # day.} other { The remaining {symbol} will be staked within # days}}",
   "TR_STAKING_IS_NOT_SUPPORTED": "Staking is not supported on this network.",
   "TR_STAKING_NOT_ENOUGH_FUNDS": "You don't have enough funds on your account.",
+  "TR_STAKING_ONCE_YOU_CONFIRM": "Once you confirm",
   "TR_STAKING_ON_3RD_PARTY_DESCRIPTION": "By staking on a Trezor stake pool you are directly supporting Trezor and the Cardano ecosystem within Trezor Suite.",
   "TR_STAKING_ON_3RD_PARTY_TITLE": "You are delegating on a third-party stake pool",
   "TR_STAKING_POOL_OVERSATURATED_DESCRIPTION": "The stake pool you are delegating on is oversaturated. Please redelegate your stake to maximize your staking rewards",
   "TR_STAKING_POOL_OVERSATURATED_TITLE": "Stake pool is oversaturated",
   "TR_STAKING_REDELEGATE": "Redelegate",
   "TR_STAKING_REWARDS": "Available Rewards",
+  "TR_STAKING_REWARDS_ARE_RESTAKED": "Rewards are automatically restaked",
   "TR_STAKING_REWARDS_DESCRIPTION": "Please note that it can take up to 20 days until you start receiving your rewards after initial stake registration and delegation. After this period is completed you will receive your reward every 5 days.",
   "TR_STAKING_REWARDS_TITLE": "Cardano Staking is Active",
   "TR_STAKING_STAKE_ADDRESS": "Your stake address",
@@ -1826,6 +1816,9 @@
   "TR_STAKING_TREZOR_POOL_FAIL": "Couldn't reach Trezor stake pool to delegate on.",
   "TR_STAKING_TX_PENDING": "Your transaction {txid} was successfully sent to the blockchain and is waiting for confirmation.",
   "TR_STAKING_WITHDRAW": "Withdraw",
+  "TR_STAKING_YOUR_EARNINGS": "Your earnings are automatically restaked, allowing you to earn <a>compound interest</a>.",
+  "TR_STAKING_YOUR_UNSTAKED_FUNDS": "Your unstaked {symbol} is ready",
+  "TR_STAKING_YOU_ARE_HERE": "You're here",
   "TR_STANDARD_WALLET_DESCRIPTION": "No passphrase",
   "TR_START": "Start",
   "TR_START_AGAIN": "Start again",
@@ -1834,6 +1827,7 @@
   "TR_START_COINJOIN": "Start coinjoin",
   "TR_START_RECOVERY": "Start recovery",
   "TR_STEP": "Step {number}",
+  "TR_STEP_OF_TOTAL": "Step {index} of {total}",
   "TR_STILL_DONT_SEE_YOUR_TREZOR": "Still don’t see your Trezor?",
   "TR_STOP": "Stop",
   "TR_STOPPING": "Stopping",
@@ -1842,7 +1836,7 @@
   "TR_SUITE_META_DESCRIPTION": "New desktop & browser app for Trezor hardware wallets. Trezor Suite brings significant improvements across our three key pillars of usability, security, and privacy.",
   "TR_SUITE_STORAGE": "App storage",
   "TR_SUITE_VERSION": "Trezor Suite version",
-  "TR_SWITCH_DEVICE": "Switch Device",
+  "TR_SWITCH_DEVICE": "Switch device",
   "TR_SWITCH_DEVICE_EJECT_CONFIRMATION_CANCEL_BUTTON": "Cancel",
   "TR_SWITCH_DEVICE_EJECT_CONFIRMATION_DESCRIPTION": "Your funds and transactions won’t be visible until you reconnect your device.",
   "TR_SWITCH_DEVICE_EJECT_CONFIRMATION_DISABLE_VIEW_ONLY_DESCRIPTION": "Your funds and transactions won't be visible until you reconnect your device.",
@@ -1885,7 +1879,11 @@
   "TR_TOKENS_EMPTY": "No tokens... yet.",
   "TR_TOKENS_EMPTY_CHECK_HIDDEN": "No tokens. They may be hidden.",
   "TR_TOKENS_SEARCH_TOOLTIP": "Search by token, symbol, or contract address.",
+  "TR_TOKEN_NOT_FOUND": "No token found",
+  "TR_TOKEN_NOT_FOUND_ON_NETWORK": "Token not found on the {networkName} network.",
   "TR_TOKEN_TRANSFERS": "{standard} Token Transfers",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH": "Try a different search.",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH_OR_SWITCH": "Try a different search or switch to another network.",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR": "Unrecognized tokens",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR_TOOLTIP": "Unrecognized tokens pose potential risks. Use caution.",
   "TR_TOO_LONG": "Message is too long",
@@ -1913,7 +1911,7 @@
   "TR_TOR_ERROR": "Error",
   "TR_TOR_IS_SLOW_MESSAGE": "Tor is connecting to the network.<br></br>Hang in there.",
   "TR_TOR_KEEP_RUNNING": "Keep running Tor",
-  "TR_TOR_KEEP_RUNNING_FOR_COIN_JOIN_SUBTITLE": "Please select 'Keep running Tor' to continue or 'Stop Tor' to quit the coinjoin process.",
+  "TR_TOR_KEEP_RUNNING_FOR_COIN_JOIN_SUBTITLE": "Please select \"Keep running Tor\" to continue or \"Stop Tor\" to quit the coinjoin process.",
   "TR_TOR_MISBEHAVING": "Misbehaving",
   "TR_TOR_REMOVE_ONION_AND_DISABLE": "Disable Tor and switch to default backends",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_LEAVE": "Leave",
@@ -1929,11 +1927,7 @@
   "TR_TO_BTC": "To BTC",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "To make your labels consistent and available on different devices, connect to a cloud storage provider.",
   "TR_TO_SATOSHIS": "To sats",
-  "TR_TRADE_BUYS": "buys",
-  "TR_TRADE_ENTER_COIN": "Enter crypto name or symbol...",
-  "TR_TRADE_EXCHANGES": "exchanges",
   "TR_TRADE_REDIRECTING": "Redirecting ...",
-  "TR_TRADE_SELLS": "sells",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "Transaction history not available",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "Tip: You can search for transaction IDs, addresses, tokens, labels, amounts, and dates.",
   "TR_TRANSACTIONS_SEARCH_TIP_10": "Tip: Combine AND (&) and OR (|) operators for more complex searches. For example <strong>> {lastYear}-01-01 & < {lastYear}-01-31 | > {lastYear}-12-01 & < {lastYear}-12-31</strong> will show all transactions in January or December {lastYear}.",
@@ -1948,6 +1942,7 @@
   "TR_TRANSACTIONS_SEARCH_TOOLTIP": "Search by transaction ID, label or amount or use operators such as < > | & = !=.",
   "TR_TRANSACTION_DETAILS": "Details",
   "TR_TREZOR_BRIDGE_RUNNING_VERSION": "Trezor Bridge running version {version}",
+  "TR_TREZOR_CONNECT": "Trezor Connect",
   "TR_TREZOR_DEVICE_TUTORIAL_CANCELED_HEADING": "Tutorial canceled",
   "TR_TREZOR_DEVICE_TUTORIAL_COMPLETED_HEADING": "Tutorial completed",
   "TR_TREZOR_DEVICE_TUTORIAL_DESCRIPTION": "Learn how to use your device with the help of a short tutorial",
@@ -1955,32 +1950,40 @@
   "TR_TROUBLESHOOTING_CLOSE_TABS": "Close other tabs and windows that might be using your Trezor",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION": "After closing other tabs and windows, try refreshing this page.",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION_DESKTOP": "After closing other browser tabs and windows, try quitting and reopening Trezor Suite.",
-  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Steps required to enable communication",
+  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Try these steps to solve this issue.",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_DESCRIPTION": "Visit <a>Trezor Bridge status page</a>",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_TITLE": "Ensure the Trezor Bridge process is running",
-  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Only Chromium-based browsers currently allow direct communication with USB devices",
+  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Only Chromium-based browsers currently allow direct communication with USB devices.",
   "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_TITLE": "Use a Chromium-based browser",
   "TR_TROUBLESHOOTING_TIP_CABLE_DESCRIPTION": "The cable must be fully inserted. In case of a USB-C connected device, the cable should click into place.",
   "TR_TROUBLESHOOTING_TIP_CABLE_TITLE": "Try a different cable",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_DESCRIPTION": "With Trezor Bridge installed.",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_TITLE": "Try using a different computer, if you can",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Just in case",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Try restarting your computer",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Restarting your computer may fix the communication issue between your browser and device.",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Restart your computer",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_DESCRIPTION": "Run the  <a>Trezor Suite</a> desktop app",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE": "Use the Trezor Suite desktop app",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_DESCRIPTION": "<a>Click to toggle</a> an alternative bridge implementation. Current version: ({currentVersion})",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_TITLE": "Use another version of Trezor Bridge",
   "TR_TROUBLESHOOTING_TIP_UDEV_INSTALL_DESCRIPTION": "Try installing <a>udev rules</a>. Make sure they are saved to the desktop before opening.",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_DESCRIPTION": "If you last updated your device firmware in 2019 or earlier, please follow the instructions in <a>the Knowledge Base</a>",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_TITLE": "It appears that you may be using an older Trezor model.",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_DESCRIPTION": "Connect it directly to your computer (without a USB hub).",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_TITLE": "Try a different USB port",
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "Install rules automatically",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "Missing udev rules",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "Unexpected state: {error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "Your device is connected properly, but your browser can't communicate with it at the moment. You need to install Trezor Bridge.",
   "TR_TRY_AGAIN": "Try again",
   "TR_TXID": "TX ID",
   "TR_TXID_RBF": "Original TX ID to be replaced",
   "TR_TX_CONFIRMATIONS": "{confirmationsCount}x",
   "TR_TX_CONFIRMED": "Transaction confirmed",
   "TR_TX_CONFIRMING": "Confirming transaction",
+  "TR_TX_DATA_FUNCTION": "Function",
+  "TR_TX_DATA_INPUT_DATA": "Input data",
+  "TR_TX_DATA_METHOD": "Input data",
+  "TR_TX_DATA_METHOD_NAME": "Method name",
+  "TR_TX_DATA_PARAMS": "Params",
   "TR_TX_DEPOSIT": "Deposit",
   "TR_TX_FEE": "Fee",
   "TR_TX_TAB_AMOUNT": "Amount",
@@ -2020,6 +2023,8 @@
   "TR_UPDATE_FIRMWARE_HOMESCREEN_LATER_TOOLTIP": "Firmware update required. You can change your homescreen in the settings page later",
   "TR_UPDATE_FIRMWARE_HOMESCREEN_TOOLTIP": "Update your firmware to change your homescreen",
   "TR_UPDATE_MODAL_AVAILABLE_HEADING": "Update available",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES": "Enable automatic updates",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG": "New",
   "TR_UPDATE_MODAL_INSTALL_AND_RESTART": "Update & restart",
   "TR_UPDATE_MODAL_INSTALL_NOW_OR_LATER": "Install update now?",
   "TR_UPDATE_MODAL_NOT_NOW": "Not now",
@@ -2027,6 +2032,9 @@
   "TR_UPDATE_MODAL_START_DOWNLOAD": "Download",
   "TR_UPDATE_MODAL_UPDATE_DOWNLOADED": "Update downloaded",
   "TR_UPDATE_MODAL_UPDATE_ON_QUIT": "Update on quit",
+  "TR_UPDATE_MODAL_WHATS_NEW": "What’s new?",
+  "TR_UPDATE_MODAL_YOUR_VERSION": "Your version: v{version}",
+  "TR_UPGRADE_FIRMWARE_TO_DISCOVER_ACCOUNT_ERROR": "Upgrade your firmware to access this account. See the blue banner above.",
   "TR_UP_TO": "up to",
   "TR_UP_TO_DATE": "Up to date",
   "TR_UP_TO_DAYS": "up to {count, plural, one {# day} other {# days}}",
@@ -2080,6 +2088,7 @@
   "TR_WALLET_SELECTION_ACCESS_HIDDEN_WALLET": "Access Passphrase wallet",
   "TR_WALLET_SELECTION_HIDDEN_WALLET": "Hidden wallet",
   "TR_WELCOME_TO_TREZOR_TEXT_WALLET_CREATION": "Create a new wallet or recover one using your wallet backup.",
+  "TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE": "We’re always striving to enhance your Trezor experience. Here’s what’s new:",
   "TR_WEST": "West",
   "TR_WHAT_DATA_WE_COLLECT": "What data do we collect?",
   "TR_WHAT_IS_PASSPHRASE": "Learn more about the difference",
diff --git a/packages/suite-data/files/translations/es.json b/packages/suite-data/files/translations/es.json
index 02887b2f154..9059706acff 100644
--- a/packages/suite-data/files/translations/es.json
+++ b/packages/suite-data/files/translations/es.json
@@ -1,5 +1,6 @@
 {
   "AMOUNT": "Importe",
+  "AMOUNT_EXCEEDS_MAX": "El importe excede el valor máximo permitido de {maxAmount}.",
   "AMOUNT_IS_BELOW_DUST": "El importe debe ser al menos {dust}",
   "AMOUNT_IS_LESS_THAN_RESERVE": "La cuenta del destinatario requiere una reserva mínima de {reserve} XRP para activarse.",
   "AMOUNT_IS_MORE_THAN_RESERVE": "El importe es superior a la reserva no utilizable requerida ({reserve} XRP).",
@@ -168,6 +169,7 @@
   "TOAST_PIN_CHANGED": "El PIN se ha cambiado correctamente.",
   "TOAST_QR_INCORRECT_ADDRESS": "El código QR contiene una dirección no válida para esta cuenta.",
   "TOAST_QR_INCORRECT_COIN_SCHEME_PROTOCOL": "El código QR está definido para la cuenta de {coin}.",
+  "TOAST_QR_UNKNOWN_SCHEME_PROTOCOL": "Esquema de protocolo desconocido: \"{scheme}\". Inténtalo de nuevo o introduce la dirección manualmente.",
   "TOAST_RAW_TX_SENT": "Transacción enviada. TXID: {txid}",
   "TOAST_SETTINGS_APPLIED": "La configuración se ha modificado correctamente.",
   "TOAST_SIGN_MESSAGE_ERROR": "Error al firmar el mensaje: {error}",
@@ -193,7 +195,6 @@
   "TR_404_GO_TO_DASHBOARD": "Ir al panel de control",
   "TR_404_TITLE": "Error 404: No se ha encontrado el enlace.",
   "TR_7D_CHANGE": "Cambio 7 días",
-  "TR_ABORT": "Abortar",
   "TR_ACCESS_HIDDEN_WALLET": "Acceder al monedero protegido por frase de contraseña",
   "TR_ACCESS_STANDARD_WALLET": "Acceder al monedero estándar",
   "TR_ACCOUNT_DETAILS_HEADER": "Detalles de la cuenta",
@@ -232,10 +233,16 @@
   "TR_ACCOUNT_TYPE_BIP86_DESC": "Taproot es un nuevo tipo de dirección que puede mejorar la privacidad y la eficiencia de la red. Ten en cuenta que es posible que algunos servicios aún no sean compatibles con las direcciones Taproot.",
   "TR_ACCOUNT_TYPE_BIP86_NAME": "Taproot",
   "TR_ACCOUNT_TYPE_BIP86_TECH": "BIP86, P2TR, Bech32m",
+  "TR_ACCOUNT_TYPE_CARDANO_DESC": "El método actual y comúnmente aceptado para generar y gestionar direcciones de Cardano garantiza la interoperabilidad, la seguridad y la gestión de todo tipo de tokens.",
   "TR_ACCOUNT_TYPE_COINJOIN": "CoinJoin",
+  "TR_ACCOUNT_TYPE_DEFAULT": "Predeterminado",
   "TR_ACCOUNT_TYPE_IMPORTED": "Importado",
   "TR_ACCOUNT_TYPE_LEDGER": "Ledger",
+  "TR_ACCOUNT_TYPE_LEDGER_DESC": "Las cuentas Ledger son compatibles con las rutas de derivación de Ledger Live, lo que permite una migración fluida de Ledger a Trezor.",
   "TR_ACCOUNT_TYPE_LEGACY": "Legacy",
+  "TR_ACCOUNT_TYPE_LEGACY_DESC": "Las cuentas Legacy son compatibles con las rutas de derivación de Ledger Legacy, lo que permite una migración fluida de Ledger a Trezor.",
+  "TR_ACCOUNT_TYPE_NORMAL_EVM_DESC": "El método actual y comúnmente aceptado para generar y gestionar direcciones de {value} garantiza la interoperabilidad, la seguridad y la gestión de todo tipo de tokens.",
+  "TR_ACCOUNT_TYPE_NORMAL_SOLANA_DESC": "El método actual y comúnmente aceptado para generar y gestionar direcciones de Solana garantiza la interoperabilidad, la seguridad y la gestión de tokens SOL y SPL.",
   "TR_ACCOUNT_TYPE_NO_CAPABILITY": "No compatible.",
   "TR_ACCOUNT_TYPE_NO_SUPPORT": "Este tipo de cuenta no es compatible con este modelo de Trezor.",
   "TR_ACCOUNT_TYPE_SEGWIT": "Legacy SegWit",
@@ -249,10 +256,12 @@
   "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_TECH": "BIP44, Base58",
   "TR_ACCOUNT_TYPE_TAPROOT": "Taproot",
   "TR_ACCOUNT_TYPE_UPDATE_REQUIRED": "Actualiza el firmware del dispositivo para habilitar este tipo de cuenta.",
+  "TR_ACCOUNT_TYPE_XRP_DESC": "XRP es una moneda digital con la que se pueden realizar pagos transfronterizos con rapidez y por poco precio sin recurrir a la minería tradicional, utilizando un libro contable de consenso para confirmar rápidamente las transacciones.",
   "TR_ACQUIRE_DEVICE": "Utilizar el Trezor aquí",
   "TR_ACQUIRE_DEVICE_TITLE": "Hay otra sesión en curso.",
   "TR_ACTIVATED_COINS": "Monedas activadas",
   "TR_ACTIVE": "activada",
+  "TR_ADD": "Añadir",
   "TR_ADDRESSES": "Dirección",
   "TR_ADDRESSES_CHANGE": "Cambiar direcciones",
   "TR_ADDRESSES_FRESH": "Nuevas direcciones",
@@ -262,7 +271,7 @@
   "TR_ADDRESS_MODAL_CLIPBOARD": "Copiar dirección",
   "TR_ADDRESS_MODAL_TITLE": "Dirección de destino de {networkName}",
   "TR_ADDRESS_MODAL_TITLE_EXCHANGE": "Dirección de destino de {networkCurrencyName} en la red {networkName}",
-  "TR_ADDRESS_PHISHING_WARNING": "Para evitar ataques de phishing, deberías verificar la dirección en tu Trezor. {claim}",
+  "TR_ADDRESS_PHISHING_WARNING": "Para evitar ataques de phishing, verifica la dirección de destino en tu Trezor. {claim}",
   "TR_ADD_ACCOUNT": "Añadir cuenta",
   "TR_ADD_HIDDEN_WALLET": "Monedero protegido por frase de contraseña",
   "TR_ADD_NETWORK_ACCOUNT": "Añadir cuenta {network}",
@@ -289,7 +298,9 @@
   "TR_ALLOW_ANALYTICS": "Uso de datos",
   "TR_ALLOW_ANALYTICS_DESCRIPTION": "Todos los datos se almacenan en el más estricto anonimato. Solo los usamos para mejorar el ecosistema Trezor.",
   "TR_ALLOW_AUTOMATIC_SUITE_UPDATES": "Actualizaciones automáticas de Trezor Suite",
-  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Trezor Suite descarga automáticamente la versión más reciente en segundo plano y la instala al reiniciar la aplicación. De este modo, siempre estarás al día de las últimas funciones y medidas de seguridad. Las actualizaciones se producen sin solicitar tu permiso.",
+  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Descarga automáticamente la versión más reciente de Trezor Suite en segundo plano e instálala al reiniciar la aplicación. De este modo, siempre estarás al día de las últimas funciones y medidas de seguridad. Las actualizaciones se producen sin solicitar tu permiso.",
+  "TR_ALL_NETWORKS": "Todas las redes ({networkCount})",
+  "TR_ALL_NETWORKS_TOOLTIP": "Ve los tokens de todas las {networkCount} redes. Filtra por las redes más populares.",
   "TR_ALL_TRANSACTIONS": "Transacciones",
   "TR_AMOUNT_SENT": "Importe enviado",
   "TR_AMOUNT_TOO_BIG_FOR_COINJOIN": "No es adecuado para CoinJoin. El importe es demasiado grande.",
@@ -355,13 +366,13 @@
   "TR_BRIDGE_GO_TO_WALLET_DESCRIPTION": "¿Seguro? Tu dispositivo solo se puede utilizar con una aplicación a la vez. Si estás utilizando otra aplicación con tu dispositivo Trezor, cierra primero esa sesión.",
   "TR_BRIDGE_NEEDED_DESCRIPTION": "Tu navegador no es compatible. Para disfrutar de la mejor experiencia, descarga y ejecuta la aplicación de escritorio Trezor Suite en segundo plano o utiliza un navegador compatible con WebUSB que se base en Chromium.",
   "TR_BRIDGE_REQUESTED_DESCRIPTION": "Otra aplicación ha solicitado Trezor Suite para conectarse con tu dispositivo Trezor. Mantén Trezor Suite ejecutándose en segundo plano y vuelve a intentarlo en la otra aplicación.",
+  "TR_BRIDGE_TIP_AUTOSTART": "Sugerencia: Activa la función de inicio automático y permite que Bridge se ejecute siempre en segundo plano.",
   "TR_BTC_UNITS": "Unidades de bitcoin",
   "TR_BUG": "Error",
   "TR_BUMP_FEE": "Aumentar comisión",
+  "TR_BUMP_FEE_DISABLED_TOOLTIP": "Para acelerar las transacciones, aumenta la comisión en la transacción pendiente más antigua (por nonce) de la cola. Las transacciones deben confirmarse en orden. <a>Más información</a>",
   "TR_BUY": "Comprar",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "Transacciones de trading",
   "TR_BUY_BUY": "Comprar",
-  "TR_BUY_BUY_AGAIN": "Comprar de nuevo",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Se ha confirmado en Trezor",
   "TR_BUY_DETAIL_ERROR_BUTTON": "Volver a Cuenta",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "Visitar la página de atención al cliente del proveedor",
@@ -386,12 +397,12 @@
   "TR_BUY_MODAL_FOR_YOUR_SAFETY": "Comprar {cryptocurrency} con {provider}",
   "TR_BUY_MODAL_LEGAL_HEADER": "Aviso legal",
   "TR_BUY_MODAL_SECURITY_HEADER": "La seguridad es lo primero con tu Trezor.",
-  "TR_BUY_MODAL_TERMS_1": "Estás aquí para comprar criptomonedas. Si has llegado a este sitio por cualquier otra razón, ponte en contacto con el servicio de atención al cliente {provider} antes de continuar.",
-  "TR_BUY_MODAL_TERMS_2": "Estás utilizando esta función para comprar fondos que se enviarán a una cuenta bajo tu control personal directo.",
-  "TR_BUY_MODAL_TERMS_3": "Las transacciones con criptomonedas son irreversibles y no se pueden reembolsar. Por lo tanto, podrías no recuperar las pérdidas, ya se deban a error o a tácticas fraudulentas.",
-  "TR_BUY_MODAL_TERMS_4": "Ten en cuenta Invity no proporciona este servicio, que en cambio se rige por los términos de {provider}.",
-  "TR_BUY_MODAL_TERMS_5": "No utilices esta función para apostar, cometer un fraude o infringir de cualquier otro modo los términos de servicio de Invity o del proveedor, ni cualquier normativa aplicable.",
-  "TR_BUY_MODAL_TERMS_6": "Ten presente que las criptomonedas son una herramienta financiera emergente y que las regulaciones pueden variar en distintas jurisdicciones, por lo que el mercado es más inestable y puedes exponerte a un mayor riesgo de fraude o robo.",
+  "TR_BUY_MODAL_TERMS_1": "Estoy aquí para comprar criptomonedas. Si hubiera llegado a este sitio por cualquier otra razón, me pondría en contacto con el servicio de atención al cliente de {provider} antes de continuar.",
+  "TR_BUY_MODAL_TERMS_2": "Estoy utilizando esta función para comprar criptomonedas y recibirlas en mi cuenta.",
+  "TR_BUY_MODAL_TERMS_3": "Entiendo que las transacciones con criptomonedas son definitivas y que no pueden deshacerse ni reembolsarse. Las pérdidas ocasionadas por fraude o por equivocaciones podrían no ser recuperables.",
+  "TR_BUY_MODAL_TERMS_4": "Entiendo que Invity no facilita este servicio. Está sujeto a los términos y condiciones de {provider}.",
+  "TR_BUY_MODAL_TERMS_5": "No voy a utilizar esta función para apostar, cometer fraude o llevar a cabo cualquier actividad que infrinja los términos de servicio de Invity o del proveedor ni cualquier normativa de aplicación.",
+  "TR_BUY_MODAL_TERMS_6": "Entiendo que las criptomonedas son un instrumento financiero emergente y que la normativa puede variar en función de la región, por lo que puede aumentar el riesgo de fraude, de robo o de inestabilidad del mercado.",
   "TR_BUY_MODAL_VERIFIED_PARTNERS_HEADER": "Socios verificados por Invity",
   "TR_BUY_NETWORK": "Comprar {network}",
   "TR_BUY_NOT_TRANSACTIONS": "Aún no hay transacciones.",
@@ -406,12 +417,10 @@
   "TR_BUY_STATUS_PENDING": "Pendiente",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "Pendiente",
   "TR_BUY_STATUS_SUCCESS": "Se ha aprobado",
-  "TR_BUY_TRANS_ID": "ID de transacción:",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "El máximo es {maximum}",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "El máximo es {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "El mínimo es {minimum}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "El mínimo es {minimum} {currency}",
-  "TR_BUY_VIEW_DETAILS": "Ver detalles",
   "TR_BYTES": "bytes",
   "TR_CAMERA_NOT_RECOGNIZED": "No se ha reconocido la cámara.",
   "TR_CAMERA_PERMISSION_DENIED": "Se ha denegado el permiso para acceder a la cámara.",
@@ -430,12 +439,12 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Importe de Trezor",
   "TR_CHAINED_TXS": "Transacciones encadenadas",
   "TR_CHANGELOG": "Registro de cambios",
-  "TR_CHANGELOG_ON_GITHUB": "Registro de cambios en GitHub",
   "TR_CHANGE_ADDRESS_TOOLTIP": "Se trata de una dirección de cambio creada a partir de un envío anterior.",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "Puedes cambiar el tipo de firmware en Configuración en cualquier momento.",
   "TR_CHANGE_HOMESCREEN": "Cambiar pantalla de inicio",
   "TR_CHANGE_PIN": "Cambiar PIN",
   "TR_CHANGE_WIPE_CODE": "Cambiar el código de borrar",
+  "TR_CHECKED_BALANCES_ON": "Saldos comprobados en",
   "TR_CHECKING_YOUR_DEVICE": "Comprobación del dispositivo",
   "TR_CHECKSUM_CONVERSION_INFO": "Convertido a suma de comprobación. <a>Más información</a>",
   "TR_CHECK_DEVICE_ORIGIN_DESCRIPTION": "Verificaremos la integridad de tu dispositivo Trezor, garantizando su seguridad y confirmando la autenticidad del chip.",
@@ -447,8 +456,7 @@
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "Realiza una recuperación simulada para verificar tu copia de seguridad del monedero.",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "Introduce aquí las palabras de la copia de seguridad del monedero en el orden en el que aparecen en tu dispositivo. Es posible que se te pida que escribas algunas palabras que no son parte de tu copia de seguridad del monedero como medida de seguridad adicional.",
   "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "Utiliza el teclado de 2 botones para introducir tu copia de seguridad del monedero. Así, tu información sensible se mantiene a salvo de navegadores o sistemas poco seguros.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "Tu copia de seguridad del monedero se introduce utilizando la pantalla táctil. Así se evita introducir cualquier información sensible en un navegador o un sistema potencialmente inseguro.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "Tu copia de seguridad del monedero se introduce utilizando la pantalla táctil. Así se evita introducir cualquier información sensible en un navegador o un sistema potencialmente inseguro.",
+  "TR_CHECK_RECOVERY_SEED_DESC_TOUCHSCREEN": "Tu copia de seguridad del monedero se introduce utilizando la pantalla táctil. Así se evita introducir cualquier información sensible en un navegador o un sistema potencialmente inseguro.",
   "TR_CHECK_SEED": "Revisar copia de seguridad",
   "TR_CHECK_YOUR_DEVICE": "Comprueba la pantalla de tu Trezor.",
   "TR_CHOOSE_RECOVERY_TYPE": "Selecciona el tipo de recuperación.",
@@ -502,10 +510,37 @@
   "TR_COINJOIN_TILE_3_TITLE": "Protegido por tu Trezor",
   "TR_COINJOIN_TRANSACTION_BATCH": "Transacciones CoinJoin",
   "TR_COINMARKET_BEST_RATE": "Mejor tipo de cambio",
+  "TR_COINMARKET_BUY_AND_SELL": "Comprar y vender",
+  "TR_COINMARKET_BUY_AND_SELL_COUNTER": "{totalBuys, plural, =0 {{totalBuys} compra} one {{totalBuys} compra} other {{totalBuys} compras} } • {totalSells, plural, =0 {{totalSells} venta} one {{totalSells} venta} other {{totalSells} ventas} }",
+  "TR_COINMARKET_CEX_TOOLTIP": "Exchange Centralizado",
+  "TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY": "Cambia el importe o la moneda.",
   "TR_COINMARKET_COMPARE_OFFERS": "Comparar todas las ofertas",
   "TR_COINMARKET_COUNTRY": "País de residencia",
+  "TR_COINMARKET_DCA_DOWNLOAD": "Descarga la aplicación móvil de Invity para empezar a ahorrar bitcoins",
+  "TR_COINMARKET_DCA_FEATURE_1_DESCRIPTION": "Un plan de ahorros de custodia seguro y simple basado en el coste medio de adquisición (DCA).",
+  "TR_COINMARKET_DCA_FEATURE_1_SUBHEADING": "Desarrollado por SatoshiLabs",
+  "TR_COINMARKET_DCA_FEATURE_2_DESCRIPTION": "Elige la autocustodia sin pagar comisiones adicionales.",
+  "TR_COINMARKET_DCA_FEATURE_2_SUBHEADING": "Retiros gratuitos",
+  "TR_COINMARKET_DCA_FEATURE_3_DESCRIPTION": "Una interfaz rápida, simplificada e intuitiva.",
+  "TR_COINMARKET_DCA_FEATURE_3_SUBHEADING": "Fácil de usar",
+  "TR_COINMARKET_DCA_FEATURE_4_DESCRIPTION": "Haz un seguimiento del historial, la cantidad y la frecuencia de las inversiones.",
+  "TR_COINMARKET_DCA_FEATURE_4_SUBHEADING": "Resumen del DCA",
+  "TR_COINMARKET_DCA_HEADING": "Ahorra bitcoins con la aplicación de Invity",
+  "TR_COINMARKET_DEX_TOOLTIP": "Exchanges descentralizados (DEX)",
   "TR_COINMARKET_ENTER_AMOUNT_IN": "Introduce el importe en {currency}",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_KYC_ALL": "Todas las opciones de KYC",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_NO_KYC": "Nunca se requiere la verificación KYC",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_ALL": "Todas las ofertas de exchange centralizados (CEX) y descentralizados (DEX)",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_DEX": "DEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FIXED_CEX": "CEX de interés fijo",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FLOATING_CEX": "CEX de interés flotante",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING": "DEX",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING_TOOLTIP": "Mediante un exchange descentralizado (DEX) puedes negociar con criptos directamente en la cadena de bloques sin necesidad de contar con una autoridad central o un intermediario.",
+  "TR_COINMARKET_EXCHANGE_FIXED_OFFERS_HEADING": "CEX de interés fijo",
+  "TR_COINMARKET_EXCHANGE_FLOAT_OFFERS_HEADING": "CEX de interés flotante",
   "TR_COINMARKET_FEATURED_OFFERS_HEADING": "Ofertas incluidas",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_BUY_LABEL": "Pago:",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_SELL_LABEL": "Método de recepción",
   "TR_COINMARKET_FEES_INCLUDED": "Comisiones incluidas",
   "TR_COINMARKET_FEES_NOT_INCLUDED": "Comisiones no incluidas",
   "TR_COINMARKET_FEES_ON_WEBSITE": "El precio indicado no incluye algunas comisiones. Podrás consultar el precio final en el sitio web del proveedor.",
@@ -518,24 +553,18 @@
   "TR_COINMARKET_KYC_NO_REFUND": "Se solicitará la verificación KYC en casos excepcionales. Se exige la verificación KYC para reembolsos. 👈",
   "TR_COINMARKET_KYC_POLICY": "Política de KYC",
   "TR_COINMARKET_KYC_POLICY_NEVER_REQUIRED": "Nunca se requiere la verificación KYC",
-  "TR_COINMARKET_KYC_YES_REFUND": "Se solicitará la verificación KYC en casos excepcionales. No se exige la verificación KYC para reembolsos. 🤝",
+  "TR_COINMARKET_KYC_YES_REFUND": "Solo se solicitará la verificación KYC en casos excepcionales. No se exige para reembolsos. 🤝",
   "TR_COINMARKET_LAST_TRANSACTIONS": "Últimas transacciones",
   "TR_COINMARKET_NETWORK_FEE": "Comisión de red",
   "TR_COINMARKET_NETWORK_TOKENS": "{networkName} tokens",
   "TR_COINMARKET_NO_CEX_PROVIDER_FOUND": "No se ha encontrado ningún proveedor de exchange centralizado (CEX)",
   "TR_COINMARKET_NO_DEX_PROVIDER_FOUND": "No se ha encontrado ningún proveedor de exchange descentralizado (DEX)",
   "TR_COINMARKET_NO_METHODS_AVAILABLE": "No hay métodos disponibles",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "Recarga automática en",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "Volver a la vista de trading",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "No hay ofertas",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "Lo sentimos, no tenemos ninguna oferta en este momento debido a problemas de conectividad con el servidor.",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "Lo sentimos, no tenemos ninguna oferta en este momento. Intenta recargar la página o cambiar tu consulta.",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "Recargar la página",
   "TR_COINMARKET_OFFERS_EMPTY": "No se han encontrado ofertas para tu solicitud. Cambia el país o el importe de la compra",
   "TR_COINMARKET_OFFERS_REFRESH": "La ofertas se actualizan en",
   "TR_COINMARKET_OFFERS_SELECT": "Seleccionar",
   "TR_COINMARKET_OFFER_LOOKING": "Buscando la mejor oferta para ti",
-  "TR_COINMARKET_OFFER_NO_FOUND": "No hay ofertas disponibles para tu solicitud. Cambia el importe o la moneda.",
+  "TR_COINMARKET_OFFER_NO_FOUND": "No hay ofertas disponibles para tu solicitud.",
   "TR_COINMARKET_ON_NETWORK_CHAIN": "En la cadena {networkName}",
   "TR_COINMARKET_OTHER_CURRENCIES": "Otras monedas",
   "TR_COINMARKET_PAYMENT_METHOD": "Método de pago",
@@ -544,9 +573,36 @@
   "TR_COINMARKET_RECEIVE_METHOD": "Método de recepción",
   "TR_COINMARKET_SELL": "Vender",
   "TR_COINMARKET_SHOW_OFFERS": "Comparar ofertas",
+  "TR_COINMARKET_SWAP": "Intercambio",
+  "TR_COINMARKET_SWAP_AMOUNT": "Cantidad del intercambio",
+  "TR_COINMARKET_SWAP_COUNTER": "{totalSwaps, plural, =0 {{totalSwaps} intercambio} one {{totalSwaps} intercambio} other {{totalSwaps} intercambios} }",
+  "TR_COINMARKET_SWAP_DEX_MODAL_CONFIRM": "Todo listo para el intercambio",
+  "TR_COINMARKET_SWAP_DEX_MODAL_FOR_YOUR_SAFETY": "Intercambiar {fromCrypto} por {toCrypto} con {provider}",
+  "TR_COINMARKET_SWAP_DEX_MODAL_LEGAL_HEADER": "Aviso legal",
+  "TR_COINMARKET_SWAP_DEX_MODAL_SECURITY_HEADER": "La seguridad es lo primero con tu Trezor.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_1": "Quiero intercambiar criptomonedas usando un exchange descentralizado (DEX) mediante el contrato de {provider}.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_2": "Quiero intercambiar criptomonedas para mi propia cuenta. Entiendo que las políticas del proveedor pueden requerir la verificación de identidad.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_3": "Entiendo que las transacciones con criptomonedas son definitivas y que no pueden deshacerse ni reembolsarse. Las pérdidas ocasionadas por fraude o por equivocaciones podrían no ser recuperables.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4": "Entiendo que Invity no facilita este servicio. Está sujeto a los términos y condiciones de {provider}.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_5": "No voy a utilizar esta función para apostar, cometer fraude o llevar a cabo cualquier actividad que infrinja los términos de servicio de Invity o del proveedor ni cualquier normativa de aplicación.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_6": "Entiendo que las criptomonedas son un instrumento financiero emergente y que la normativa puede variar en función de la región, por lo que puede aumentar el riesgo de fraude, de robo o de inestabilidad del mercado.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_VERIFIED_PARTNERS_HEADER": "Socios verificados por Invity",
+  "TR_COINMARKET_SWAP_MODAL_CONFIRM": "Todo listo para el intercambio",
+  "TR_COINMARKET_SWAP_MODAL_FOR_YOUR_SAFETY": "Intercambiar {fromCrypto} por {toCrypto} con {provider}",
+  "TR_COINMARKET_SWAP_MODAL_LEGAL_HEADER": "Aviso legal",
+  "TR_COINMARKET_SWAP_MODAL_SECURITY_HEADER": "La seguridad es lo primero con tu Trezor.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_1": "Estoy aquí para intercambiar criptomonedas. Si hubiera llegado a este sitio por cualquier otra razón, me pondría en contacto con el servicio de atención al cliente de Trezor antes de continuar. ",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_2": "Quiero intercambiar criptomonedas para mi propia cuenta. Entiendo que las políticas del proveedor pueden requerir la verificación de identidad.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_3": "Entiendo que las transacciones con criptomonedas son definitivas y que no pueden deshacerse ni reembolsarse. Las pérdidas ocasionadas por fraude o por equivocaciones podrían no ser recuperables.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_4": "Entiendo que Invity no facilita este servicio. Está sujeto a los términos y condiciones de {provider}.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_5": "No voy a utilizar esta función para apostar, cometer fraude o llevar a cabo cualquier actividad que infrinja los términos de servicio de Invity o del proveedor ni cualquier normativa de aplicación.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_6": "Entiendo que las criptomonedas son un instrumento financiero emergente y que la normativa puede variar en función de la región, por lo que puede aumentar el riesgo de fraude, de robo o de inestabilidad del mercado.",
+  "TR_COINMARKET_SWAP_MODAL_VERIFIED_PARTNERS_HEADER": "Socios verificados por Invity",
   "TR_COINMARKET_TOKEN_NETWORK": "{tokenName} en la red {networkName}",
   "TR_COINMARKET_TRADE_FEE": "Comisión por operación",
+  "TR_COINMARKET_TRANS_ID": "ID de transacción:",
   "TR_COINMARKET_UNKNOWN_PROVIDER": "Proveedor desconocido",
+  "TR_COINMARKET_VIEW_DETAILS": "Ver detalles",
   "TR_COINMARKET_YOUR_BEST_OFFER": "Tu mejor oferta",
   "TR_COINMARKET_YOU_BUY": "Compras",
   "TR_COINMARKET_YOU_GET": "Obtienes",
@@ -571,6 +627,7 @@
   "TR_CONFIRMED_TX": "Confirmado",
   "TR_CONFIRMING_TX": "Confirmando la transacción",
   "TR_CONFIRM_ACTION_ON_YOUR": "Sigue las instrucciones que aparecen en la pantalla de tu Trezor.",
+  "TR_CONFIRM_ADDRESS": "Confirmar dirección",
   "TR_CONFIRM_BEFORE_COPY": "Confirmar en Trezor antes de copiar",
   "TR_CONFIRM_CONDITIONS": "Confirma las condiciones antes de continuar.",
   "TR_CONFIRM_EMPTY_HIDDEN_WALLET_ON": "Confirmar el monedero protegido por frase de contraseña vacío en el dispositivo {deviceLabel}.",
@@ -593,13 +650,13 @@
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_BUTTON": "Gestionar",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_DESCRIPTION": "Activa el cuadro de diálogo para introducir la frase de contraseña al abrir Trezor Suite.",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_TITLE": "¿Utilizas principalmente una frase de contraseña?",
-  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Completa la verificación del Trezor para confirmar la dirección de destino. No se recomienda continuar sin confirmar.",
+  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Completa la verificación de tu Trezor para confirmar la dirección de destino. No es recomendable continuar sin confirmar.",
   "TR_CONNECT_DEVICE_RECEIVE_PROMO_TITLE": "No se puede verificar la dirección de destino",
   "TR_CONNECT_DEVICE_SEND_PROMO_DESCRIPTION": "Conecta tu Trezor para enviar monedas.",
   "TR_CONNECT_DEVICE_SEND_PROMO_TITLE": "Tu Trezor no está conectado",
   "TR_CONNECT_TREZOR_TO_SEND_BUTTON": "Conecta tu Trezor para hacer envíos",
   "TR_CONNECT_YOUR_DEVICE": "Conecta y desbloquea tu Trezor",
-  "TR_CONTACT_SUPPORT": "Ponte en contacto con el servicio de atención al cliente.",
+  "TR_CONTACT_SUPPORT": "Ponte en contacto con el servicio de atención al cliente de Trezor.",
   "TR_CONTACT_TREZOR_SUPPORT": "Ponte en contacto con el servicio de atención al cliente de Trezor.",
   "TR_CONTINUE": "Continuar",
   "TR_CONTINUE_ANYWAY": "Continuar de todos modos",
@@ -619,7 +676,7 @@
   "TR_COPY_ADDRESS_POLICY_ID": "Nunca envíes fondos a la dirección de un ID de política.",
   "TR_COPY_AND_CLOSE": "Copiar y cerrar",
   "TR_COPY_SIGNED_MESSAGE": "Copiar el mensaje firmado",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "Copiar",
+  "TR_COPY_TO_CLIPBOARD": "Copiar",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "No se ha podido recuperar el registro de cambios.",
   "TR_COULD_NOT_RETRIEVE_DATA": "No se han podido recuperar los datos.",
   "TR_COUNT_WALLETS": "{count} {count, plural, one {monedero} other {monederos}}",
@@ -653,6 +710,7 @@
   "TR_DASHBOARD_ASSET_FAILED": "El activo no se ha cargado correctamente.",
   "TR_DASHBOARD_DISCOVERY_ERROR": "Error de descubrimiento",
   "TR_DASHBOARD_DISCOVERY_ERROR_PARTIAL_DESC": "Las cuentas no se han cargado correctamente {details}.",
+  "TR_DATA": "Datos",
   "TR_DATABASE_UPGRADE_BLOCKED": "La actualización de la base de datos está bloqueada por otra instancia de la aplicación.",
   "TR_DATA_ANALYTICS_CATEGORY_1": "Plataforma",
   "TR_DATA_ANALYTICS_CATEGORY_1_ITEM_1": "SO, modelo de Trezor, versión, etc.",
@@ -706,8 +764,13 @@
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT": "¿Te has conectado en modo bootloader por error?",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_BUTTON": "Vuelve a conectar el dispositivo sin tocar ningún botón.",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_TOUCH": "Vuelve a conectar el dispositivo sin tocar la pantalla.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED": "Este dispositivo se está utilizando en otro lugar.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION": "Es posible que la aplicación {transportSessionOwner} esté utilizando este dispositivo actualmente. Puedes asumir el control del dispositivo si es necesario.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION_UNKNOWN_APP": "Es posible que otra aplicación esté utilizando este dispositivo actualmente. Puedes asumir el control del dispositivo si es necesario.",
   "TR_DEVICE_CONNECTED_WRONG_STATE": "El dispositivo se ha detectado en estado incorrecto.",
   "TR_DEVICE_DISCONNECTED_DURING_ACTION_DESCRIPTION": "Tu Trezor se desconectó durante el proceso de copia de seguridad. Te recomendamos encarecidamente que utilices la opción de restablecimiento de fábrica en Configuración del dispositivo para borrar todos los datos e inicies de nuevo la copia de seguridad.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH": "Error al comprobar el hash del firmware. Tu Trezor puede ser una falsificación.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR": "No se ha podido realizar la comprobación del hash del firmware. Tu Trezor puede ser una falsificación.",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON": "Desactivar",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON_DISABLED": "Activar",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION": "La comprobación de la revisión del firmware es una función de seguridad fundamental. Te recomendamos encarecidamente mantenerla activada.",
@@ -726,6 +789,8 @@
   "TR_DEVICE_LABEL_IS_NOT_BACKED_UP": "El dispositivo {deviceLabel} no tiene copia de seguridad.",
   "TR_DEVICE_LABEL_IS_NOT_CONNECTED": "El dispositivo {deviceLabel} no está conectado.",
   "TR_DEVICE_LABEL_IS_UNAVAILABLE": "El dispositivo {deviceLabel} no está disponible.",
+  "TR_DEVICE_MAYBE_COMPROMISED_HEADING": "La verificación del dispositivo ha fallado.",
+  "TR_DEVICE_MAYBE_COMPROMISED_TEXT": "Vuelve a conectar tu dispositivo y reintenta la verificación. Si el problema persiste, ponte en contacto con el servicio de atención al cliente de Trezor para averiguar qué está pasando y qué hacer a continuación.",
   "TR_DEVICE_NOT_CONNECTED": "El dispositivo no está conectado.",
   "TR_DEVICE_NOT_INITIALIZED": "El Trezor no está configurado.",
   "TR_DEVICE_NOT_INITIALIZED_TEXT": "Te guiaremos en el proceso para que empieces de inmediato.",
@@ -788,7 +853,6 @@
   "TR_DOWNLOAD_LATEST_BRIDGE": "Descargar la versión más reciente: Bridge {version}",
   "TR_DO_NOT_DISCONNECT_DEVICE": "No desconectes tu dispositivo.",
   "TR_DO_NOT_SHOW_AGAIN": "No mostrar de nuevo",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "¿Omitir este paso?",
   "TR_DROPBOX": "Dropbox",
   "TR_DROPZONE": "Arrastra y suelta el archivo aquí o haz clic para seleccionar el archivo.",
   "TR_DROPZONE_ERROR": "Se ha producido un error durante la importación: {error}",
@@ -809,13 +873,13 @@
   "TR_EARLY_ACCESS_ENABLE": "Unirse",
   "TR_EARLY_ACCESS_ENABLED": "Programa de acceso anticipado activado",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM": "Unirse",
-  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "Entiendo que así puedo probar software en fase de prelanzamiento, que puede contener errores que afecten al funcionamiento normal de Suite.",
+  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "Entiendo que así puedo probar software en fase de prelanzamiento, que puede contener errores que afecten al funcionamiento normal de Trezor Suite.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_DESCRIPTION": "Puedes desactivarlo en cualquier momento.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TITLE": "Prueba las últimas funciones del producto antes de que se lancen al público general.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TOOLTIP": "Comprueba primero el campo de arriba.",
   "TR_EARLY_ACCESS_JOINED_DESCRIPTION": "Puedes comprobar si hay actualizaciones beta ahora o en el próximo lanzamiento.",
   "TR_EARLY_ACCESS_JOINED_TITLE": "Programa de acceso anticipado activado",
-  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "Para volver a la última versión estable de Suite, haz clic en «Descargar versión estable» y vuelve a instalar la aplicación.",
+  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "Para volver a la última versión estable de Trezor Suite, haz clic en «Descargar versión estable» y vuelve a instalar la aplicación.",
   "TR_EARLY_ACCESS_LEFT_TITLE": "Has abandonado el programa de acceso anticipado. Ya no se te ofrecerán nuevas versiones beta.",
   "TR_EARLY_ACCESS_MENU": "Programa de acceso anticipado",
   "TR_EARLY_ACCESS_REINSTALL": "Descargar versión estable",
@@ -870,7 +934,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "Aprueba solo el importe exacto necesario para este intercambio. Tendrás que pagar una cuota adicional si quieres volver a realizar un intercambio similar.",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "Revocar la aprobación anterior",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "Realiza una transacción que eliminará la aprobación previa del contrato con {provider}.",
-  "TR_EXCHANGE_BUY": "Para",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Confirmar en Trezor y enviar",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "Confirmar y enviar",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "Crear aprobación",
@@ -892,8 +955,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "Tu transacción se ha completado correctamente.",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "Se ha aprobado",
   "TR_EXCHANGE_DEX": "Oferta de exchange descentralizado",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "Las comisiones para realizar este intercambio se estiman en {approvalFee} ({approvalFeeFiat}) para la aprobación (si se requiere) y {swapFee} ({swapFeeFiat}) para el intercambio.",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "No quedan fondos para las comisiones de transacción. Reduce el importe de intercambio a un máximo de {symbol} {max}",
   "TR_EXCHANGE_EXTRA_FIELD": "{extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "{extraFieldName} no es válido.",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "{extraFieldDescription}",
@@ -903,7 +964,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "Las comisiones fijas te muestran exactamente el importe que recibirás al final del intercambio, por lo que no cambiará entre que seleccionas la comisión y se completa la transacción. Se te garantiza el importe mostrado, pero a cambio de comisiones menos generosas, de modo que podrás comprar menos criptomonedas con el mismo dinero.",
   "TR_EXCHANGE_FLOAT": "Oferta de comisión variable",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "Las comisiones variables implican que el importe final que recibirás puede variar ligeramente por las fluctuaciones del mercado entre que seleccionas la comisión y se completa la transacción. Estas comisiones suelen ser más altas, de modo el importe final en criptomonedas podría ser superior.",
-  "TR_EXCHANGE_PROVIDER": "proveedor",
   "TR_EXCHANGE_RATE": "Precio",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "La cuenta de destino está fuera de Suite.",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "Esta es la dirección alfanumérica específica en la que recibirás tus monedas.",
@@ -930,23 +990,16 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "Introduce un número.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "Introduce el deslizamiento deseado.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "Importe de la oferta de intercambio",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "Resumen del deslizamiento",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "Tolerancia de deslizamiento",
-  "TR_EXCHANGE_TRANS_ID": "ID de transacción:",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "Utiliza una cuenta ({symbol}) que no esté en Suite.",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "Dirección de destino",
-  "TR_EXCHANGE_VIEW_DETAILS": "Ver detalles",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE": "Actualizaciones automáticas de Trezor Suite",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION": "Trezor Suite descarga automáticamente la versión más reciente en segundo plano y la instala al reiniciar la aplicación. De este modo, siempre estarás al día de las últimas funciones y medidas de seguridad. Las actualizaciones se producen sin solicitar tu permiso.",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN": "BNB Smart Chain",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON": "Activar la red BNB Smart Chain sin transacciones internas pasadas.",
   "TR_EXPERIMENTAL_FEATURES": "Experimental",
   "TR_EXPERIMENTAL_FEATURES_ALLOW": "Funciones experimentales",
   "TR_EXPERIMENTAL_FEATURES_WARNING": "Solo para usuarios con experiencia. Utilízala bajo tu propia responsabilidad. Estas funciones están en fase de prueba, pueden ser inestables y podrían dejar de recibir soporte a largo plazo.",
   "TR_EXPERIMENTAL_PASSWORD_MANAGER": "Migrar contraseñas de Dropbox",
-  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Una herramienta para recuperar contraseñas almacenadas en Dropbox y protegidas por Trezor. Diseñada para antiguos usuarios de la extensión de Chrome del gestor de contraseñas de Trezor.",
+  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Usa esta herramienta para recuperar contraseñas almacenadas en Dropbox y protegidas por Trezor. Diseñada para antiguos usuarios de la extensión de Chrome del gestor de contraseñas de Trezor.",
   "TR_EXPERIMENTAL_TOR_SNOWFLAKE": "Tor Snowflake",
-  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Tor Snowflake es un sistema que permite acceder a sitios web y aplicaciones censurados.",
+  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Accede a sitios web y aplicaciones censurados utilizando Tor Snowflake, un sistema diseñado para eludir restricciones.",
   "TR_EXPORT_AS": "Exportar como {as}",
   "TR_EXPORT_FAIL": "Se ha producido un error durante la exportación.",
   "TR_EXPORT_TO_FILE": "Exportar a archivo",
@@ -984,6 +1037,7 @@
   "TR_FIRMWARE_NEW_FW_DESCRIPTION": "El nuevo firmware ya está disponible. Actualiza tu dispositivo ahora.",
   "TR_FIRMWARE_REINSTALL_FW_DESCRIPTION": "Tu dispositivo ya está actualizado a la última versión del firmware. Puedes reinstalar el firmware si es necesario.",
   "TR_FIRMWARE_REVISION_CHECK_FAILED": "Error al comprobar la revisión del firmware. Tu Trezor puede ser una falsificación.",
+  "TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR": "No se pudo realizar la comprobación de firmware.",
   "TR_FIRMWARE_STATUS_INSTALLATION_COMPLETED": "Completado",
   "TR_FIRMWARE_SUBHEADING_BITCOIN": "Firmware ligero que solo admite operaciones con bitcoins.",
   "TR_FIRMWARE_SUBHEADING_NONE": "Tu Trezor se envía sin firmware. Instala el firmware más reciente para utilizar el dispositivo de forma segura. Si solo usas bitcoins, te recomendamos que instales el <button>{bitcoinOnly} firmware</button>.",
@@ -1021,7 +1075,7 @@
   "TR_GOT_IT_BUTTON": "Listo",
   "TR_GO_TO_ONBOARDING": "Comenzar la configuración",
   "TR_GO_TO_SETTINGS": "Ir a Configuración",
-  "TR_GO_TO_SUITE": "Acceder a Suite",
+  "TR_GO_TO_SUITE": "Ir a Trezor Suite",
   "TR_GRAPH_LINEAR": "Lineal",
   "TR_GRAPH_LOGARITHMIC": "Logarítmica",
   "TR_GRAPH_MISSING_DATA": "Los importes de tokens XRP y SOL, así como del resto de tokens, se incluyen en el saldo de la cartera, pero por ahora no se pueden visualizar en gráfico.",
@@ -1040,7 +1094,7 @@
   "TR_GUIDE_FORUM": "Foro de Trezor",
   "TR_GUIDE_FORUM_LABEL": "Conectar con la comunidad de Trezor",
   "TR_GUIDE_SUGGESTION_LABEL": "¿Qué te parece?",
-  "TR_GUIDE_SUPPORT": "Ponte en contacto con el servicio de atención al cliente.",
+  "TR_GUIDE_SUPPORT": "Ponte en contacto con el servicio de atención al cliente de Trezor.",
   "TR_GUIDE_SUPPORT_AND_FEEDBACK": "Atención al cliente y comentarios",
   "TR_GUIDE_VIEW_HEADLINES_SUPPORT_FEEDBACK_SELECTION": "Atención al cliente y comentarios",
   "TR_GUIDE_VIEW_HEADLINE_HELP_US_IMPROVE": "Ayúdanos a mejorar",
@@ -1172,7 +1226,7 @@
   "TR_LOCAL_FILE_SYSTEM": "Sistema de archivos local",
   "TR_LOG": "Registro de la aplicación",
   "TR_LOGIN_PROCEED": "Continuar",
-  "TR_LOG_DESCRIPTION": "El registro contiene toda la información técnica necesaria sobre Trezor Suite. Puede que te haga falta al contactar con el servicio de atención al cliente de Trezor.",
+  "TR_LOG_DESCRIPTION": "Este registro contiene información técnica esencial sobre Trezor Suite y puede ser necesaria al contactar con el servicio de atención al cliente de Trezor.",
   "TR_LOOKING_FOR_COINJOIN_ROUND": "Esperando una ronda",
   "TR_LOW_ANONYMITY_WARNING": "<red>Privacidad muy baja.</red> Recomendamos usar al menos 1 de cada 5, ya que por debajo de este umbral no hay privacidad.",
   "TR_LTC_ADDRESS_INFO": "Litecoin ha cambiado el formato de dirección. Visita nuestro blog para obtener más información sobre cómo convertir tu dirección. {TR_LEARN_MORE}",
@@ -1223,6 +1277,7 @@
   "TR_MY_PORTFOLIO": "Cartera",
   "TR_NAV_ANONYMIZE": "Anonimizar monedas",
   "TR_NAV_BUY": "Comprar",
+  "TR_NAV_DCA": "DCA",
   "TR_NAV_DETAILS": "Detalles",
   "TR_NAV_RECEIVE": "Recibir",
   "TR_NAV_SELL": "Vender",
@@ -1264,6 +1319,7 @@
   "TR_NETWORK_LITECOIN": "Litecoin",
   "TR_NETWORK_NAMECOIN": "Namecoin",
   "TR_NETWORK_NEM": "NEM",
+  "TR_NETWORK_OP": "Optimismo",
   "TR_NETWORK_POLYGON": "Polygon PoS",
   "TR_NETWORK_SOLANA_DEVNET": "Solana Devnet",
   "TR_NETWORK_SOLANA_MAINNET": "Solana",
@@ -1276,9 +1332,10 @@
   "TR_NETWORK_ZCASH": "Zcash",
   "TR_NEW_FEE": "Nuevo",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "Está disponible un nuevo Trezor Bridge.",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "Nuevo firmware de Trezor disponible. Actualiza tu dispositivo.",
   "TR_NEXT_UP": "Siguiente",
   "TR_NONCE": "Nonce",
+  "TR_NON_ASCII_CHAR": "{label} (con \"{char}\", no recomendado)",
+  "TR_NON_ASCII_CHARS": "{label} (con caracteres no recomendados)",
   "TR_NORMAL_ACCOUNTS": "Cuentas predeterminadas",
   "TR_NORTH": "Norte",
   "TR_NOTHING_TO_ANONYMIZE": "No hay nada que anonimizar.",
@@ -1296,16 +1353,12 @@
   "TR_NO_PASSPHRASE_WALLET": "Monedero estándar",
   "TR_NO_SEARCH_RESULTS": "No hay resultados para tu criterio de búsqueda.",
   "TR_NO_SPENDABLE_UTXOS": "No hay transacciones de salida que puedas gastar en tu cuenta.",
-  "TR_NO_TRANSPORT": "El navegador no puede comunicarse con el dispositivo",
+  "TR_NO_TRANSPORT": "Tu navegador no puede comunicarse con tu dispositivo.",
   "TR_NO_TRANSPORT_DESKTOP": "La aplicación no puede comunicarse con el dispositivo",
   "TR_NUM_ACCOUNTS_FIAT_VALUE": "{accountsCount} {accountsCount, plural, one {cuenta} other {cuentas}} • {fiatValue}",
   "TR_N_MIN": "{n} min.",
   "TR_N_TRANSACTIONS": "{value} {value, plural, one {transacción} other {transacciones}}",
   "TR_OFF": "apagado",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "El importe elegido de {amount} es superior al máximo aceptado de {max}.",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "El importe elegido de {amount} es superior al máximo aceptado de {max}.",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "El importe elegido de {amount} es inferior al mínimo aceptado de {min}.",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "El importe elegido de {amount} es inferior al mínimo aceptado de {min}.",
   "TR_OFFICIAL_LANGUAGES": "Oficial",
   "TR_OK": "OK",
   "TR_ON": "activado",
@@ -1333,7 +1386,7 @@
   "TR_ONBOARDING_DATA_COLLECTION_HEADING": "Recogida de datos anónimos",
   "TR_ONBOARDING_DEVICE_CHECK": "Comprobación de seguridad del dispositivo",
   "TR_ONBOARDING_DEVICE_CHECK_1": "Mi <strong>sello holográfico</strong> estaba intacto y no se había manipulado.",
-  "TR_ONBOARDING_DEVICE_CHECK_2": "Compré el dispositivo en la tienda oficial de Trezor o en un distribuidor de confianza.",
+  "TR_ONBOARDING_DEVICE_CHECK_2": "Compré el dispositivo en la <shop>tienda oficial de Trezor</shop> o en un <reseller>distribuidor de confianza</reseller>.",
   "TR_ONBOARDING_DEVICE_CHECK_3": "El paquete del dispositivo estaba intacto y no había sido manipulado.",
   "TR_ONBOARDING_DEVICE_CHECK_4": "Ya hay un firmware instalado en el Trezor conectado. Continua con la configuración solo si has utilizado este Trezor con anterioridad.",
   "TR_ONBOARDING_DOWNLOAD_DESKTOP_APP": "Descargar la aplicación de escritorio",
@@ -1364,30 +1417,6 @@
   "TR_OTHER_INPUTS_AND_OUTPUTS": "Otras entradas y salidas",
   "TR_OUTGOING": "Saliente",
   "TR_OUTPUTS": "Salidas",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "Los importes mínimo y máximo por los que este usuario está dispuesto a vender {symbol}.",
-  "TR_P2P_GET_STARTED_INTRO": "Necesitas iniciar la transacción en {providerName}. Sigue atentamente los siguientes pasos.",
-  "TR_P2P_GET_STARTED_ITEM_1": "Selecciona «Ir a {providerName}» para llegar al sitio web de nuestro socio.",
-  "TR_P2P_GET_STARTED_ITEM_3": "Cuando {providerName} te pida una dirección de envío, vuelve aquí y continúa.",
-  "TR_P2P_GET_STARTED_ITEM_4": "¡Ya casi está! Revela tu dirección y cópiala, pégala en el campo «Dirección de envío» en {providerName} y finaliza la transacción.",
-  "TR_P2P_GO_TO_PROVIDER": "Ir a {providerName}",
-  "TR_P2P_INFO": "Con la tecnología {peerToPeer} (P2P), ni el comprador ni el vendedor participan en un proceso de verificación KYC, ya que todas las partes están protegidas contra el fraude gracias a la seguridad del {multisigEscrow}.",
-  "TR_P2P_MODAL_CONFIRM": "Todo listo para comprar",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "Compra {cryptocurrency} en modo P2P con {provider}",
-  "TR_P2P_MODAL_LEGAL_HEADER": "Aviso legal",
-  "TR_P2P_MODAL_SECURITY_HEADER": "La seguridad es lo primero con tu Trezor.",
-  "TR_P2P_MODAL_TERMS_1": "Estás aquí para comprar criptomonedas de otra persona que elijas utilizando la tecnología Peer-to-Peer (P2P) sin verificación de ID. Si has llegado a este sitio por cualquier otra razón, ponte en contacto con el servicio de atención al cliente antes de continuar.",
-  "TR_P2P_MODAL_TERMS_2": "Las transacciones con criptomonedas son irreversibles y no se pueden reembolsar. Por lo tanto, podrías no recuperar las pérdidas, ya se deban a error o a tácticas fraudulentas.",
-  "TR_P2P_MODAL_TERMS_4": "Ten en cuenta Invity no proporciona este servicio, que en cambio se rige por los términos de {provider}.",
-  "TR_P2P_MODAL_TERMS_5": "No utilices esta función para apostar, cometer un fraude o infringir de cualquier otro modo los términos de servicio de Invity o del proveedor, ni cualquier normativa aplicable.",
-  "TR_P2P_MODAL_TERMS_6": "Ten presente que las criptomonedas son una herramienta financiera emergente y que las regulaciones pueden variar en distintas jurisdicciones, por lo que el mercado es más inestable y puedes exponerte a un mayor riesgo de fraude o robo.",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "Socios verificados por Invity",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "La transacción debe completarse dentro de este límite de tiempo, a contar desde la creación de un contrato en el sitio de {providerName}.",
-  "TR_P2P_PRICE": "Precio para 1 {symbol}",
-  "TR_P2P_PRICE_TOOLTIP": "Precio para {symbol} ofrecido por este usuario.",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "¡Hola! Estoy usando {providerName}.",
-  "TR_P2P_USER_REPUTATION": "({rating}, {numberOfTrades})",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "El importe elegido de {amount} es superior al máximo aceptado de {maximum}.",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "El importe elegido de {amount} es inferior al mínimo aceptado de {minimum}.",
   "TR_PAGINATION_NEWER": "Más reciente",
   "TR_PAGINATION_OLDER": "Más antiguo",
   "TR_PASSPHRASE_CASE_SENSITIVE": "Nota: La frase de contraseña distingue entre mayúsculas y minúsculas.",
@@ -1398,6 +1427,8 @@
   "TR_PASSPHRASE_MISMATCH": "La frase de contraseña no coincide",
   "TR_PASSPHRASE_MISMATCH_DESCRIPTION": "Las frases de contraseña no coinciden. Por motivos de seguridad, empieza de nuevo e introdúcelas correctamente.",
   "TR_PASSPHRASE_MISMATCH_START_OVER": "Empezar de nuevo",
+  "TR_PASSPHRASE_NON_ASCII_CHARS": "Recomendamos usar <code>ABC</code>, <code>abc</code>, <code>123</code>, <code>espacios</code> o <code>estos caracteres especiales</code>.",
+  "TR_PASSPHRASE_NON_ASCII_CHARS_WARNING": "El uso de caracteres especiales distintos a los enumerados pone en riesgo la compatibilidad futura.",
   "TR_PASSPHRASE_TOO_LONG": "La longitud de la frase de contraseña ha superado el límite permitido.",
   "TR_PASSPHRASE_WALLET": "Monedero protegido por frase de contraseña #{id}",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT": "Aprende cómo funciona una frase de contraseña",
@@ -1439,15 +1470,30 @@
   "TR_PIN_SUBHEADING": "Con un PIN fuerte, proteges tu Trezor del acceso físico no autorizado.",
   "TR_PLAY_IT_SAFE": "Vayamos a lo seguro",
   "TR_PLEASE_ALLOW_YOUR_CAMERA": "Da permiso a la cámara para escanear códigos QR.",
-  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Conecta tu dispositivo para continuar con el proceso de verificación.",
+  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Conecta tu Trezor para continuar con el proceso de verificación.",
   "TR_PLEASE_ENABLE_PASSPHRASE": "Activa la función de frase de contraseña para continuar con el proceso de verificación.",
   "TR_POLICY_ID_ADDRESS": "ID de política:",
   "TR_PRIMARY_FIAT": "Moneda fiduciaria",
   "TR_PRIVATE": "Privado",
   "TR_PRIVATE_DESCRIPTION": "Privacidad de al menos {targetAnonymity}",
+  "TR_PROCEED_UNVERIFIED_ADDRESS": "Continuar sin verificar la dirección",
   "TR_PROMO_BANNER_DASHBOARD": "<underline>El monedero físico más cómodo</underline> <rest>para gestionar tus cripto de forma segura</rest>",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM": "Confirma en Trezor antes de escanear.",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM_EXPLANATION": "Confirma primero la dirección de destino en tu dispositivo Trezor, ya que su pantalla no se puede hackear.",
+  "TR_QUICK_ACTION_DEBUG_EAP_EXPERIMENTAL_ENABLED": "Activado",
+  "TR_QUICK_ACTION_TOOLTIP_JUST_UPDATED": "Actualización reciente ({currentVersion})",
+  "TR_QUICK_ACTION_TOOLTIP_RESTART_TO_UPDATE": "Reinicia para actualizar",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_DEVICE": "Dispositivo Trezor",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_SUITE": "Trezor Suite",
+  "TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE": "Hay una actualización disponible ({newVersion})",
+  "TR_QUICK_ACTION_TOOLTIP_UP_TO_DATE": "Actualizado ({currentVersion})",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED": "Trezor Suite ha descargado una nueva actualización.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED": "Trezor Suite se ha actualizado.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE": "Hay una actualización de Trezor Suite disponible.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE": "Reiniciar y actualizar",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE": "Iniciar actualización",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE": "Hay una actualización de Trezor disponible.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW": "Novedades",
   "TR_RANDOM_SEED_WORDS_DISCLAIMER": "Es posible que se te pida que escribas algunas palabras que no son parte de tu copia de seguridad del monedero.",
   "TR_RANGE": "rango",
   "TR_READ_AND_UNDERSTOOD": "He leído y entendido lo anterior.",
@@ -1499,7 +1545,7 @@
   "TR_SAFETY_CHECKS_MODAL_TITLE": "Comprobaciones de seguridad",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL": "Preguntar",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL_DESC": "Puedes aprobar manualmente acciones potencialmente inseguras en tu Trezor, como la aplicación de comisiones extremas o la admisión de claves distintas entre sí.",
-  "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "No lo cambies salvo que tengas los conocimientos necesarios.",
+  "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "Cambia esto solo si tienes los conocimientos necesarios.",
   "TR_SAFETY_CHECKS_STRICT_LEVEL": "Estricto",
   "TR_SAFETY_CHECKS_STRICT_LEVEL_DESC": "Seguridad total de Trezor.",
   "TR_SCAN_QR_CODE": "Escanea el código QR",
@@ -1511,7 +1557,7 @@
   "TR_SECURITY_CHECKPOINT_GOT_SEED": "¿Tienes tu copia de seguridad del monedero?",
   "TR_SECURITY_CHECK_HOLOGRAM": "Ten en cuenta que el paquete del dispositivo, incluidos los hologramas y los sellos de seguridad, ha ido cambiando con el tiempo. Puedes verificar los detalles del paquete <packaging>aquí</packaging>. Asegúrate de haber adquirido tu dispositivo en la tienda oficial de Trezor o en uno de <reseller>nuestros vendedores de confianza</reseller>. De lo contrario, existe el riesgo de que tu dispositivo sea falso. Si sospechas que tu dispositivo no es original, <support>ponte en contacto con el servicio de atención al cliente de Trezor</support>.",
   "TR_SECURITY_FEATURES_COMPLETED_N": "Seguridad ({n} de {m})",
-  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "Los dispositivos que están configurados sin semilla no pueden acceder a Trezor Suite. Esta norma impide que pierdas monedas irreversiblemente, en caso de que el dispositivo esté mal configurado y se use erróneamente.",
+  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "Los dispositivos que están configurados sin semilla no pueden acceder a Trezor Suite para evitar que pierdas monedas irreversiblemente, lo que puede ocurrir si un dispositivo se usa incorrectamente.",
   "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE": "La configuración sin semilla no es compatible con Trezor Suite.",
   "TR_SEED_BACKUP_LENGTH": "Tu copia de seguridad del monedero puede contener 12, 18 o 24 palabras.",
   "TR_SEED_BACKUP_LENGTH_INCLUDING_SHAMIR": "Tu copia de seguridad del monedero puede contener 12, 18, 20, 24 o 33 palabras.",
@@ -1522,12 +1568,15 @@
   "TR_SEED_WORDS_ENTER_COMPUTER": "Introduce las palabras de tu copia de seguridad del monedero en el orden en el que aparecen en tu Trezor.",
   "TR_SEED_WORDS_ENTER_TOUCHSCREEN": "Utilizando la pantalla táctil, introduce todas las palabras en el orden correcto.",
   "TR_SEE_DETAILS": "Ver detalles",
+  "TR_SEE_IF_ISSUE_PERSISTS": "Comprueba si el problema persiste.",
   "TR_SELECTED": "{amount} seleccionado",
   "TR_SELECT_COIN_FOR_SETTINGS": "Selecciona una moneda activa para cambiar la configuración.",
   "TR_SELECT_DEVICE": "Seleccionar un dispositivo",
+  "TR_SELECT_NAME_OR_ADDRESS": "Búsqueda por nombre, símbolo, red o dirección del contrato.",
   "TR_SELECT_NUMBER_OF_WORDS": "Selecciona el número de palabras de la copia de seguridad del monedero.",
   "TR_SELECT_PASSPHRASE_SOURCE": "Selecciona dónde introducir la frase de contraseña para {deviceLabel}.",
   "TR_SELECT_RECOVERY_METHOD": "Seleccionar el método de recuperación",
+  "TR_SELECT_TOKEN": "Seleccionar un token",
   "TR_SELECT_TREZOR": "Selecciona Trezor",
   "TR_SELECT_TREZOR_TO_CONTINUE": "Selecciona tu Trezor para continuar.",
   "TR_SELECT_TYPE": "Selecciona el tipo",
@@ -1558,11 +1607,11 @@
   "TR_SELL_MODAL_FOR_YOUR_SAFETY": "Vender {cryptocurrency} con {provider}",
   "TR_SELL_MODAL_LEGAL_HEADER": "Aviso legal",
   "TR_SELL_MODAL_SECURITY_HEADER": "La seguridad es lo primero con tu Trezor.",
-  "TR_SELL_MODAL_TERMS_1": "Estás aquí para vender criptomonedas. Si has llegado a este sitio por cualquier otra razón, ponte en contacto con el servicio de atención al cliente antes de continuar.",
+  "TR_SELL_MODAL_TERMS_1": "Estás aquí para vender criptomonedas. Si has llegado a este sitio por cualquier otra razón, ponte en contacto con el servicio de atención al cliente de Trezor antes de continuar.",
   "TR_SELL_MODAL_TERMS_2": "Estás vendiendo criptomonedas por tu propia cuenta. Ten presente que las políticas del proveedor pueden requerir la verificación de identidad.",
   "TR_SELL_MODAL_TERMS_3": "Las transacciones con criptomonedas son irreversibles y no se pueden reembolsar. Por lo tanto, podrías no recuperar las pérdidas, ya se deban a error o a tácticas fraudulentas.",
   "TR_SELL_MODAL_TERMS_4": "Ten en cuenta Invity no proporciona este servicio, que en cambio se rige por los términos de {provider}.",
-  "TR_SELL_MODAL_TERMS_5": "No utilices esta función para apostar, cometer un fraude o infringir de cualquier otro modo los términos de servicio de Invity o del proveedor, ni cualquier normativa aplicable.",
+  "TR_SELL_MODAL_TERMS_5": "No voy a utilizar esta función para apostar, cometer fraude o llevar a cabo cualquier actividad que infrinja los términos de servicio de Invity o del proveedor ni cualquier normativa de aplicación.",
   "TR_SELL_MODAL_TERMS_6": "Ten presente que las criptomonedas son una herramienta financiera emergente y que las regulaciones pueden variar en distintas jurisdicciones, por lo que el mercado es más inestable y puedes exponerte a un mayor riesgo de fraude o robo.",
   "TR_SELL_MODAL_VERIFIED_PARTNERS_HEADER": "Socios verificados por Invity",
   "TR_SELL_REGISTER": "Registrarse",
@@ -1571,10 +1620,6 @@
   "TR_SELL_STATUS_ERROR": "Se ha rechazado",
   "TR_SELL_STATUS_PENDING": "Pendiente",
   "TR_SELL_STATUS_SUCCESS": "Se ha aprobado",
-  "TR_SELL_TRANS_ID": "ID de transacción:",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "El máximo es {maximum} {currency}",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "El mínimo es {minimum} {currency}",
-  "TR_SELL_VIEW_DETAILS": "Ver detalles",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "Ahorros",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "Alquiler",
   "TR_SENDING_SYMBOL": "Enviando {multiple, select, true {multiple tokens} false {{symbol}} other {{symbol}}}",
@@ -1629,6 +1674,8 @@
   "TR_SHOW_LOG": "Mostrar registro",
   "TR_SHOW_MORE": "Mostrar más",
   "TR_SHOW_MORE_ADDRESSES": "Mostrar más ({count})",
+  "TR_SHOW_ON_TRAY": "Mostrar icono en la bandeja",
+  "TR_SHOW_ON_TRAY_DESCRIPTION": "Monitoriza si Trezor Suite se ejecuta en segundo plano.",
   "TR_SHOW_UNVERIFIED_ADDRESS": "Mostrar dirección no verificada",
   "TR_SHOW_UNVERIFIED_XPUB": "Mostrar clave pública no verificada",
   "TR_SIDEBAR_ADD_COIN": "Añadir una moneda",
@@ -1641,7 +1688,9 @@
   "TR_SIZE": "Tamaño",
   "TR_SKIP": "Omitir",
   "TR_SKIP_BACKUP": "Omitir copia de seguridad",
+  "TR_SKIP_BACKUP_DESCRIPTION": "Una copia de seguridad del monedero te permite recuperar tus fondos si tu Trezor se pierde, se daña o te lo roban. Sin una copia de seguridad, podrías perder el acceso a tus cripto de manera permanente.",
   "TR_SKIP_PIN": "Omitir PIN",
+  "TR_SKIP_PIN_DESCRIPTION": "Un PIN de dispositivo evita el acceso no autorizado a tu Trezor. Sin esta medida, cualquier persona que tenga tu dispositivo puede acceder a tus fondos.",
   "TR_SKIP_ROUNDS": "Saltar rondas",
   "TR_SKIP_ROUNDS_DESCRIPTION": "Si te saltas rondas, dificultas aún más que se establezca ninguna relación entre tus entradas. Así puedes anonimizar más el origen de los fondos.",
   "TR_SKIP_ROUNDS_HEADING": "Permitir que Trezor se salte rondas",
@@ -1654,6 +1703,7 @@
   "TR_STAKE_ADDING_TO_POOL": "Añadiendo al staking pool",
   "TR_STAKE_ANY_AMOUNT_ETH": "Haz stake con un importe mínimo de {amount} {symbol} y empieza a ganar recompensas. A nuestra actual tasa de rendimiento porcentual anual (RPA) del {apyPercent}%, ¡tus recompensas también aportan!",
   "TR_STAKE_APY": "Rendimiento porcentual anual",
+  "TR_STAKE_APY_ABBR": "RPA",
   "TR_STAKE_APY_DESC": "* Rendimiento porcentual anual",
   "TR_STAKE_AVAILABLE": "Disponible",
   "TR_STAKE_CAN_CLAIM_WARNING": "Ya puedes reclamar {amount} {symbol}. {br}Reclama o espera hasta que se procese el nuevo unstake.",
@@ -1663,15 +1713,18 @@
   "TR_STAKE_CLAIM_AFTER_UNSTAKING": "Podrás reclamar una vez finalizado el periodo de unstaking.",
   "TR_STAKE_CLAIM_IN_NEXT_BLOCK": "en el siguiente bloque",
   "TR_STAKE_CLAIM_PENDING": "Reclamación pendiente",
+  "TR_STAKE_CLAIM_UNSTAKED": "Solicitar retirada de staking de {symbol}",
   "TR_STAKE_CONFIRM_AND_STAKE": "Confirmar y hacer stake",
   "TR_STAKE_CONFIRM_ENTRY_PERIOD": "Confirmar periodo de presentación",
   "TR_STAKE_CONSENT_TO_STAKING_WITH_EVERSTAKE": "Acepto y doy mi consentimiento para hacer staking con Everstake",
   "TR_STAKE_DAYS": "{count, plural, one {# day} other {# days}}",
   "TR_STAKE_DELEGATED": "Delegación de stake",
   "TR_STAKE_DEREGISTERED": "Cancelación del registro de una dirección de stake",
+  "TR_STAKE_EARN_REWARDS_WEEKLY": "Gana recompensas cada semana",
   "TR_STAKE_ENTERING_POOL_MAY_TAKE": "Entrar en el staking pool puede llevar hasta {count, plural, one {# day} other {# days}}",
+  "TR_STAKE_ENTER_THE_STAKING_POOL": "Entrar en el staking pool",
   "TR_STAKE_ETH": "Haz stake con Ethereum",
-  "TR_STAKE_ETH_CARD_TITLE": "La manera más fácil de ganar {symbol}.",
+  "TR_STAKE_ETH_CARD_TITLE": "La manera más fácil de ganar {symbol}",
   "TR_STAKE_ETH_EARN_REPEAT": "Haz staking. Gana recompensas. Repite el proceso.",
   "TR_STAKE_ETH_EVERSTAKE": "Trezor y Everstake",
   "TR_STAKE_ETH_EVERSTAKE_DESC": "Everstake es un proveedor y líder mundial de tecnología de staking",
@@ -1682,17 +1735,21 @@
   "TR_STAKE_ETH_REWARDS_EARN": "Tus recompensas también aportan. Mantenlas en stake y observa cómo se disparan tus recompensas de {symbol}.",
   "TR_STAKE_ETH_REWARDS_EARN_APY": "Tus recompensas de {symbol} también obtienen el rendimiento porcentual anual. Mantén tus fondos en stake o añade más para aumentar tus recompensas.",
   "TR_STAKE_ETH_SEE_MONEY_DANCE": "Verás el efecto de tu dinero",
-  "TR_STAKE_ETH_SEE_MONEY_DANCE_DESC": "Gana {apyPercent}% de RPA* haciendo staking de tu Ethereum con Trezor.",
+  "TR_STAKE_ETH_SEE_MONEY_DANCE_DESC": "Gana un {apyPercent}% de <t>RPA</t> haciendo staking de Ethereum con Trezor.",
   "TR_STAKE_ETH_WILL_BE_BLOCKED": "Tu {symbol} se bloqueará durante este periodo, y no podrás cancelarlo. <a>Más información</a>",
   "TR_STAKE_EVERSTAKE_MANAGES": "Everstake mantiene y protege tu {symbol} en stake <t>con su infraestructura, su tecnología y sus contratos inteligentes.</t>",
   "TR_STAKE_INSTANT": "Instantáneo",
   "TR_STAKE_INSTANTLY_UNSTAKED_WITH_DAYS": "Has recibido {amount} {symbol} \"al instante\". {days, plural, =0 {} one {El resto se pagará en # día.} other { El resto se pagará en # días.}}",
+  "TR_STAKE_IN_ACCOUNT": "{symbol} en cuenta",
   "TR_STAKE_LEARN_MORE": "Más información",
+  "TR_STAKE_LEAVE_STAKING_POOL": "Abandonar el staking pool",
   "TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL": "Hemos dejado {amount} {symbol} para que puedas pagar las comisiones de retirada.",
+  "TR_STAKE_LEFT_SMALL_AMOUNT_FOR_WITHDRAWAL": "Hemos dejado un pequeño importe de {symbol} para que puedas pagar las comisiones de retirada.",
   "TR_STAKE_MAX": "Máx.",
   "TR_STAKE_MAX_FEE_DESC": "La comisión máxima es la comisión de transacción de red que estás dispuesto a pagar en la red para garantizar que tu transacción se procese.",
   "TR_STAKE_MAX_REWARD_DAYS": "Máx. {count, plural, one {# day} other {# days}}",
   "TR_STAKE_MIN_AMOUNT_TOOLTIP": "El importe mínimo para el stake es {amount} {symbol}",
+  "TR_STAKE_MONTHLY": "Mensual",
   "TR_STAKE_NEXT_PAYOUT": "Próximo pago de recompensa",
   "TR_STAKE_NOT_ENOUGH_FUNDS": "No hay suficiente {symbol} para pagar las comisiones de red",
   "TR_STAKE_ONLY_REWARDS": "Solo recompensas",
@@ -1704,6 +1761,8 @@
   "TR_STAKE_REGISTERED": "Registro de una dirección de stake",
   "TR_STAKE_RESTAKED_BADGE": "En restake",
   "TR_STAKE_REWARDS": "Recompensas",
+  "TR_STAKE_SIGN_TRANSACTION": "Firmar transacción",
+  "TR_STAKE_SIGN_UNSTAKING_TRANSACTION": "Firmar transacción de retirada de staking",
   "TR_STAKE_STAKE": "Stake",
   "TR_STAKE_STAKED_AMOUNT": "Cantidad en stake",
   "TR_STAKE_STAKED_AND_EARNING": "En stake y obteniendo recompensas",
@@ -1711,6 +1770,7 @@
   "TR_STAKE_STAKE_MORE": "Añadir más al stake",
   "TR_STAKE_STAKING_IN_A_NUTSHELL": "Una breve descripción del staking",
   "TR_STAKE_STAKING_IS": "El staking implica bloquear temporalmente tus activos de Ethereum para apoyar el funcionamiento de la cadena de bloques. A cambio, ganarás más Ethereum como recompensa.",
+  "TR_STAKE_STAKING_PROCESS": "Proceso de staking",
   "TR_STAKE_START_STAKING": "Empieza a hacer staking",
   "TR_STAKE_TIME_TO_CLAIM": "Es el momento de reclamar",
   "TR_STAKE_TOTAL_PENDING": "Cantidad de stake pendiente:",
@@ -1719,23 +1779,35 @@
   "TR_STAKE_UNSTAKED_AND_READY_TO_CLAIM": "Sin stake y listo para reclamar",
   "TR_STAKE_UNSTAKE_TO_CLAIM": "Quita el stake para reclamar",
   "TR_STAKE_UNSTAKING": "Quitando el stake",
+  "TR_STAKE_UNSTAKING_APPROXIMATE": "Importe aproximado en {symbol} disponible de inmediato",
+  "TR_STAKE_UNSTAKING_APPROXIMATE_DESCRIPTION": "La liquidez del staking pool puede permitir el unstake instantáneo de algunos fondos. Los fondos restantes cumplirán el periodo para quitar el stake.",
   "TR_STAKE_UNSTAKING_PERIOD": "Periodo para quitar el stake",
+  "TR_STAKE_UNSTAKING_PROCESS": "Proceso de retirada de staking",
   "TR_STAKE_UNSTAKING_TAKES": "Quitar el stake lleva {count, plural, one {# day} other {# days}}. Una vez completado, puedes operar con él o enviar tus fondos.",
+  "TR_STAKE_WEEKLY": "Semanal",
   "TR_STAKE_WHAT_IS_STAKING": "¿Qué es hacer staking?",
+  "TR_STAKE_YEARLY": "Anual",
   "TR_STAKE_YOUR_FUNDS_MAINTAINED": "Everstake mantiene tus fondos en stake",
+  "TR_STAKING_AMOUNT_STAKED_INSTANTLY": "¡Has realizado staking de {amount} {symbol} al instante!",
+  "TR_STAKING_AMOUNT_UNSTAKED_INSTANTLY": "¡Has quitado el staking de {amount} {symbol} al instante!",
+  "TR_STAKING_CONSOLIDATING_FUNDS": "Consolidando tus {symbol} por ti",
   "TR_STAKING_DELEGATE": "Delegar",
   "TR_STAKING_DEPOSIT": "Depósito reembolsable",
   "TR_STAKING_DEPOSIT_FEE_DECRIPTION": "La comisión de depósito es de {feeAmount} ADA y es necesario registrar tu dirección para empezar con el staking. Si decides quitar tu staking de cardano recuperarás el depósito.",
+  "TR_STAKING_ESTIMATED_GAINS": "Ganancias estimadas",
   "TR_STAKING_FEE": "Comisión",
-  "TR_STAKING_INSTANTLY_STAKED": "Tu importe en stake al instante es de {amount} {symbol}. {days, plural, =0 {} one {El importe en {symbol} restante aparecerá en stake en # día.} other { El importe en {symbol} restante aparecerá en stake en # días.}}",
+  "TR_STAKING_GETTING_READY": "Tu {symbol} está casi a punto",
+  "TR_STAKING_INSTANTLY_STAKED": "Tu importe en stake al instante es de {amount} {symbol}. {days, plural, =0 {} one {El importe restante en {symbol} restante aparecerá en stake en # día.} other { El importe restante en {symbol} aparecerá en stake en # días.}}",
   "TR_STAKING_IS_NOT_SUPPORTED": "El staking no es compatible con esta red.",
   "TR_STAKING_NOT_ENOUGH_FUNDS": "No tienes suficientes fondos en tu cuenta.",
+  "TR_STAKING_ONCE_YOU_CONFIRM": "Una vez que confirmes",
   "TR_STAKING_ON_3RD_PARTY_DESCRIPTION": "Si haces staking en un stake pool de Trezor, apoyas directamente a Trezor y al ecosistema de Cardano dentro de Trezor Suite.",
   "TR_STAKING_ON_3RD_PARTY_TITLE": "Estás delegando en un stake pool de terceros.",
   "TR_STAKING_POOL_OVERSATURATED_DESCRIPTION": "El stake pool de delegación está saturado. Vuelve a delegar tu stake para maximizar tus recompensas de staking.",
   "TR_STAKING_POOL_OVERSATURATED_TITLE": "El stake pool está saturado.",
   "TR_STAKING_REDELEGATE": "Volver a delegar",
   "TR_STAKING_REWARDS": "Recompensas disponibles",
+  "TR_STAKING_REWARDS_ARE_RESTAKED": "Las recompensas se ponen en restake automáticamente",
   "TR_STAKING_REWARDS_DESCRIPTION": "Ten en cuenta que pueden pasar hasta 20 días para que empieces a recibir recompensas después del registro y la delegación iniciales de stake. Tras dicho período, recibirás tu recompensa cada 5 días.",
   "TR_STAKING_REWARDS_TITLE": "El staking de cardano está activado.",
   "TR_STAKING_STAKE_ADDRESS": "Tu dirección de stake",
@@ -1744,6 +1816,9 @@
   "TR_STAKING_TREZOR_POOL_FAIL": "No se ha podido conectar con el stake pool de Trezor para hacer una delegación.",
   "TR_STAKING_TX_PENDING": "Tu transacción {txid} se ha enviado correctamente a la cadena de bloques y está pendiente de confirmación.",
   "TR_STAKING_WITHDRAW": "Retirar",
+  "TR_STAKING_YOUR_EARNINGS": "Tus ganancias se ponen en restake automáticamente, lo que te permite ganar <a>intereses compuestos</a>.",
+  "TR_STAKING_YOUR_UNSTAKED_FUNDS": "Tu {symbol} en unstake está listo",
+  "TR_STAKING_YOU_ARE_HERE": "Estás aquí",
   "TR_STANDARD_WALLET_DESCRIPTION": "Sin frase de contraseña",
   "TR_START": "Comenzar",
   "TR_START_AGAIN": "Comenzar de nuevo",
@@ -1752,6 +1827,7 @@
   "TR_START_COINJOIN": "Iniciar CoinJoin",
   "TR_START_RECOVERY": "Iniciar recuperación",
   "TR_STEP": "Paso {number}",
+  "TR_STEP_OF_TOTAL": "Paso {index} de {total}",
   "TR_STILL_DONT_SEE_YOUR_TREZOR": "¿Todavía no ves tu Trezor?",
   "TR_STOP": "Detener",
   "TR_STOPPING": "Deteniendo",
@@ -1803,7 +1879,11 @@
   "TR_TOKENS_EMPTY": "Todavía no hay tokens...",
   "TR_TOKENS_EMPTY_CHECK_HIDDEN": "No hay tokens. Podrían estar ocultos.",
   "TR_TOKENS_SEARCH_TOOLTIP": "Búsqueda por token, símbolo o dirección del contrato.",
+  "TR_TOKEN_NOT_FOUND": "No se ha encontrado el token.",
+  "TR_TOKEN_NOT_FOUND_ON_NETWORK": "No se ha encontrado el token en la red {networkName}.",
   "TR_TOKEN_TRANSFERS": "Transferencias de tokens {standard}",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH": "Prueba con una búsqueda diferente.",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH_OR_SWITCH": "Prueba con una búsqueda diferente o cambia a otra red.",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR": "Tokens no reconocidos",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR_TOOLTIP": "Los tokens no reconocidos suponen posibles riesgos. Ten cuidado.",
   "TR_TOO_LONG": "El mensaje es demasiado largo.",
@@ -1815,18 +1895,24 @@
   "TR_TOR_CONFIG_SNOWFLAKE_UPDATE_LABEL": "Actualizar ruta",
   "TR_TOR_DESCRIPTION": "Dirige el tráfico de Trezor Suite a través de la red Tor para aumentar tu privacidad y tu seguridad. Tor puede tardar algún tiempo en cargar y establecer una conexión.",
   "TR_TOR_DISABLE": "Desactivar Tor",
+  "TR_TOR_DISABLED": "Desactivado",
   "TR_TOR_DISABLE_ONIONS_ONLY": "Faltan backends personalizados no .onion.",
   "TR_TOR_DISABLE_ONIONS_ONLY_DESCRIPTION": "Añade direcciones de backend personalizadas no .onion para evitar este comportamiento.",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_DESCRIPTION": "Ahora puedes desactivar Tor con seguridad.",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_TITLE": "Los backends personalizados ya no usan solo direcciones .onion.",
   "TR_TOR_DISABLE_ONIONS_ONLY_RESOLVED": "Desactivar Tor",
   "TR_TOR_DISABLE_ONIONS_ONLY_TITLE": "Si desactivas Tor ahora, se resetearán todos los backends .onion a los servidores Trezor predeterminados.",
+  "TR_TOR_DISABLING": "Desactivación",
   "TR_TOR_ENABLE": "Activar Tor",
+  "TR_TOR_ENABLED": "Activado",
   "TR_TOR_ENABLE_AND_CONFIRM": "Activar Tor y confirmar",
   "TR_TOR_ENABLE_TITLE": "Activar Tor",
+  "TR_TOR_ENABLING": "Activación",
+  "TR_TOR_ERROR": "Error",
   "TR_TOR_IS_SLOW_MESSAGE": "Tor se está conectando a la red.<br></br>Espera.",
   "TR_TOR_KEEP_RUNNING": "Seguir ejecutando Tor",
   "TR_TOR_KEEP_RUNNING_FOR_COIN_JOIN_SUBTITLE": "Selecciona «Seguir ejecutando Tor» para continuar o «Detener Tor» para salir del proceso de CoinJoin.",
+  "TR_TOR_MISBEHAVING": "Mal comportamiento",
   "TR_TOR_REMOVE_ONION_AND_DISABLE": "Desactivar Tor y cambiar a los backends predeterminados",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_LEAVE": "Abandonar",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_SUBTITLE": "Selecciona «Activar Tor» para continuar o «Salir» para abandonar el proceso.",
@@ -1841,11 +1927,7 @@
   "TR_TO_BTC": "A BTC",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "Para que tus etiquetas se mantengan y estén disponibles en diferentes dispositivos, conéctate al proveedor de almacenamiento en la nube.",
   "TR_TO_SATOSHIS": "A sats",
-  "TR_TRADE_BUYS": "compras",
-  "TR_TRADE_ENTER_COIN": "Introduce el nombre o el símbolo de la criptomoneda...",
-  "TR_TRADE_EXCHANGES": "intercambios",
   "TR_TRADE_REDIRECTING": "Redirigiendo...",
-  "TR_TRADE_SELLS": "ventas",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "El historial de transacciones no está disponible.",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "Sugerencia: Puedes buscar ID de transacción, direcciones, tokens, etiquetas, importes y fechas.",
   "TR_TRANSACTIONS_SEARCH_TIP_10": "Sugerencia: Combina los operadores AND (&) y OR (|) para hacer búsquedas más complejas. Por ejemplo, con <strong>> {lastYear}-01-01 & < {lastYear}-01-31 | > {lastYear}-12-01 & < {lastYear}-12-31</strong> verás todas las transacciones en enero o diciembre de {lastYear}.",
@@ -1860,6 +1942,7 @@
   "TR_TRANSACTIONS_SEARCH_TOOLTIP": "Busca por ID de transacción, etiqueta o cantidad, o usa operadores como < > | & = !=.",
   "TR_TRANSACTION_DETAILS": "Detalles",
   "TR_TREZOR_BRIDGE_RUNNING_VERSION": "Estás ejecutando la versión {version} de Trezor Bridge",
+  "TR_TREZOR_CONNECT": "Trezor Connect",
   "TR_TREZOR_DEVICE_TUTORIAL_CANCELED_HEADING": "Tutorial cancelado",
   "TR_TREZOR_DEVICE_TUTORIAL_COMPLETED_HEADING": "Tutorial completado",
   "TR_TREZOR_DEVICE_TUTORIAL_DESCRIPTION": "Aprende a utilizar tu dispositivo con la ayuda de un breve tutorial",
@@ -1867,32 +1950,40 @@
   "TR_TROUBLESHOOTING_CLOSE_TABS": "Cierra otras pestañas y ventanas que puedan estar utilizando tu Trezor.",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION": "Después de cerrar otras pestañas y ventanas, prueba a refrescar esta página.",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION_DESKTOP": "Después de cerrar otras pestañas y ventanas del navegador, prueba a salir de Trezor Suite y volver a abrirlo.",
-  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Pasos necesarios para permitir la comunicación",
+  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Prueba estos pasos para resolver este problema.",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_DESCRIPTION": "Visita <a>la página de estado de Trezor Bridge.</a>",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_TITLE": "Asegúrate de que el proceso Trezor Bridge se está ejecutando.",
-  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Solo los navegadores basados en Chromium permiten actualmente la comunicación directa con dispositivos USB",
+  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Solo los navegadores basados en Chromium permiten actualmente la comunicación directa con dispositivos USB.",
   "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_TITLE": "Utiliza un navegador basado en Chromium",
   "TR_TROUBLESHOOTING_TIP_CABLE_DESCRIPTION": "El cable debe estar completamente insertado. Si tienes un dispositivo USB-C conectado, el cable debe hacer clic al introducirlo.",
   "TR_TROUBLESHOOTING_TIP_CABLE_TITLE": "Prueba con un cable diferente.",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_DESCRIPTION": "Con Trezor Bridge instalado.",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_TITLE": "Si es posible, inténtalo con un ordenador diferente.",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Por si acaso.",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Prueba a reiniciar tu ordenador.",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Reiniciar tu ordenador puede solucionar el problema de comunicación entre tu navegador y tu dispositivo.",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Reiniciar tu ordenador",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_DESCRIPTION": "Ejecuta la aplicación de escritorio <a>Trezor Suite</a>",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE": "Utiliza la aplicación de escritorio Trezor Suite",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_DESCRIPTION": "<a>Haz clic para cambiar</a> a una implementación de Bridge alternativa. Versión actual: ({currentVersion})",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_TITLE": "Usar otra versión de Trezor Bridge",
   "TR_TROUBLESHOOTING_TIP_UDEV_INSTALL_DESCRIPTION": "Prueba a instalar las <a>reglas udev</a>. Asegúrate de guardarlas primero en el escritorio antes de abrirlas.",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_DESCRIPTION": "Si actualizaste el firmware de tu dispositivo por última vez en 2019 o antes, sigue las instrucciones de la <a>base de conocimientos</a>.",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_TITLE": "Parece que estás usando un modelo de Trezor antiguo.",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_DESCRIPTION": "Conéctalo directamente a tu ordenador (sin un concentrador USB).",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_TITLE": "Prueba un puerto USB diferente.",
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "Instalar las reglas automáticamente",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "Faltan las reglas udev.",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "Estado inesperado: {error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "Tu dispositivo está conectado correctamente, pero tu navegador no puede comunicarse con él en este momento. Debes instalar Trezor Bridge.",
   "TR_TRY_AGAIN": "Inténtalo de nuevo.",
   "TR_TXID": "TX ID",
   "TR_TXID_RBF": "Se debe sustituir el TX ID inicial",
   "TR_TX_CONFIRMATIONS": "{confirmationsCount}x",
   "TR_TX_CONFIRMED": "Transacción confirmada",
   "TR_TX_CONFIRMING": "Confirmando la transacción",
+  "TR_TX_DATA_FUNCTION": "Función",
+  "TR_TX_DATA_INPUT_DATA": "Introducir datos",
+  "TR_TX_DATA_METHOD": "Introducir datos",
+  "TR_TX_DATA_METHOD_NAME": "Nombre de método",
+  "TR_TX_DATA_PARAMS": "Parámetros",
   "TR_TX_DEPOSIT": "Depósito",
   "TR_TX_FEE": "Comisión",
   "TR_TX_TAB_AMOUNT": "Importe",
@@ -1932,6 +2023,8 @@
   "TR_UPDATE_FIRMWARE_HOMESCREEN_LATER_TOOLTIP": "Se requiere una actualización de firmware. Después puedes cambiar la pantalla de inicio desde Configuración.",
   "TR_UPDATE_FIRMWARE_HOMESCREEN_TOOLTIP": "Actualiza el firmware del dispositivo para cambiar la pantalla de inicio.",
   "TR_UPDATE_MODAL_AVAILABLE_HEADING": "Hay una actualización disponible.",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES": "Activar actualizaciones automáticas",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG": "Nuevo",
   "TR_UPDATE_MODAL_INSTALL_AND_RESTART": "Actualizar y reiniciar",
   "TR_UPDATE_MODAL_INSTALL_NOW_OR_LATER": "¿Instalar actualización ahora?",
   "TR_UPDATE_MODAL_NOT_NOW": "Ahora no",
@@ -1939,6 +2032,9 @@
   "TR_UPDATE_MODAL_START_DOWNLOAD": "Descargar",
   "TR_UPDATE_MODAL_UPDATE_DOWNLOADED": "Actualización descargada",
   "TR_UPDATE_MODAL_UPDATE_ON_QUIT": "Actualizar al salir",
+  "TR_UPDATE_MODAL_WHATS_NEW": "Novedades",
+  "TR_UPDATE_MODAL_YOUR_VERSION": "Tu versión: v{version}",
+  "TR_UPGRADE_FIRMWARE_TO_DISCOVER_ACCOUNT_ERROR": "Actualiza el firmware para tener acceso a esta cuenta. Consulta el banner azul de arriba.",
   "TR_UP_TO": "hasta",
   "TR_UP_TO_DATE": "Actualizado",
   "TR_UP_TO_DAYS": "hasta {count, plural, one {# day} other {# days}}",
@@ -1992,6 +2088,7 @@
   "TR_WALLET_SELECTION_ACCESS_HIDDEN_WALLET": "Acceder al monedero protegido por frase de contraseña",
   "TR_WALLET_SELECTION_HIDDEN_WALLET": "Monedero oculto",
   "TR_WELCOME_TO_TREZOR_TEXT_WALLET_CREATION": "Crear un nuevo monedero o restaurar uno con la copia de seguridad del monedero.",
+  "TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE": "Nos esforzamos continuamente por mejorar tu experiencia en Trezor. Estas son las novedades:",
   "TR_WEST": "Oeste",
   "TR_WHAT_DATA_WE_COLLECT": "¿Qué datos recopilamos?",
   "TR_WHAT_IS_PASSPHRASE": "Más información sobre la diferencia",
@@ -2002,7 +2099,7 @@
   "TR_WIPE_DEVICE_CHECKBOX_2_TITLE": "Entiendo que debo guardar una copia de seguridad de mi copia de seguridad del monedero para volver a tener acceso a mis fondos.",
   "TR_WIPE_DEVICE_TEXT": "Resetear el dispositivo elimina todos sus datos. Reinicia tu dispositivo solo si tienes una copia de seguridad de tu monedero, que puede restaurar el acceso a tus fondos.",
   "TR_WIPE_OR_UPDATE": "Resetear el dispositivo o actualizar el firmware",
-  "TR_WIPE_OR_UPDATE_DESCRIPTION": "Ir a Configuración del dispositivo",
+  "TR_WIPE_OR_UPDATE_DESCRIPTION": "Ve a la configuración del dispositivo.",
   "TR_WIPING_YOUR_DEVICE": "El restablecimiento de fábrica elimina toda la información de la memoria del dispositivo, incluyendo la copia de seguridad del monedero y el PIN. Realiza un restablecimiento de fábrica solo si tienes una copia de seguridad de tu monedero, ya que es necesaria para restaurar el acceso a tus fondos.",
   "TR_WORDS": "{count} palabras",
   "TR_WORD_DOES_NOT_EXIST": "La palabra «{word}» no existe en la lista de palabras BIP39.",
diff --git a/packages/suite-data/files/translations/fr.json b/packages/suite-data/files/translations/fr.json
index 709613f37f3..c386b5ae3e9 100644
--- a/packages/suite-data/files/translations/fr.json
+++ b/packages/suite-data/files/translations/fr.json
@@ -1,5 +1,6 @@
 {
   "AMOUNT": "Montant",
+  "AMOUNT_EXCEEDS_MAX": "Le montant dépasse la valeur maximale autorisée de {maxAmount}.",
   "AMOUNT_IS_BELOW_DUST": "Le montant doit être au minimum de {dust}",
   "AMOUNT_IS_LESS_THAN_RESERVE": "Le compte du destinataire nécessite une réserve minimale {reserve} de XRP pour être activé",
   "AMOUNT_IS_MORE_THAN_RESERVE": "Le montant est supérieur à la réserve non utilisable requise ({reserve} de XRP)",
@@ -66,7 +67,7 @@
   "LOCKTIME_ADD": "Ajouter un temps de verrouillage",
   "LOCKTIME_ADD_TOOLTIP": "Le temps de verrouillage définit le moment le plus précoce où une transaction peut être minée dans un bloc.",
   "LOCKTIME_BLOCKHEIGHT": "Temps de verrouillage hauteur de bloc",
-  "LOCKTIME_IS_NOT_INTEGER": "Le temps de verrouillage n’est pas un entier",
+  "LOCKTIME_IS_NOT_INTEGER": "Le temps de verrouillage n’est pas un nombre entier",
   "LOCKTIME_IS_NOT_SET": "Le temps de verrouillage n’est pas défini",
   "LOCKTIME_IS_TOO_BIG": "L’horodatage est trop grand",
   "LOCKTIME_IS_TOO_LOW": "Le temps de verrouillage est trop bas",
@@ -168,6 +169,7 @@
   "TOAST_PIN_CHANGED": "Le code PIN a été modifié avec succès",
   "TOAST_QR_INCORRECT_ADDRESS": "Le code QR contient une adresse non valide pour ce compte",
   "TOAST_QR_INCORRECT_COIN_SCHEME_PROTOCOL": "Le code QR est défini pour le compte {coin}",
+  "TOAST_QR_UNKNOWN_SCHEME_PROTOCOL": "Schéma de protocole inconnu : « {scheme} ». Réessayez ou saisissez l’adresse manuellement.",
   "TOAST_RAW_TX_SENT": "Transaction envoyée. TxID : {txid}",
   "TOAST_SETTINGS_APPLIED": "Paramètres modifiés avec succès",
   "TOAST_SIGN_MESSAGE_ERROR": "Erreur de signature du message : {error}",
@@ -193,7 +195,6 @@
   "TR_404_GO_TO_DASHBOARD": "Accéder au tableau de bord",
   "TR_404_TITLE": "Erreur 404 : lien introuvable",
   "TR_7D_CHANGE": "Variation 7 j",
-  "TR_ABORT": "Annuler",
   "TR_ACCESS_HIDDEN_WALLET": "Accéder au portefeuille protégé par une phrase secrète",
   "TR_ACCESS_STANDARD_WALLET": "Accéder au portefeuille standard",
   "TR_ACCOUNT_DETAILS_HEADER": "Détails du compte",
@@ -232,10 +233,16 @@
   "TR_ACCOUNT_TYPE_BIP86_DESC": "Taproot est un nouveau type d’adresse qui peut améliorer la confidentialité et l’efficacité du réseau. Notez que certains services ne prennent pas encore en charge les adresses Taproot.",
   "TR_ACCOUNT_TYPE_BIP86_NAME": "Taproot",
   "TR_ACCOUNT_TYPE_BIP86_TECH": "BIP86, P2TR, Bech32m",
+  "TR_ACCOUNT_TYPE_CARDANO_DESC": "La méthode actuelle et la plus répandue de génération et de gestion des adresses Cardano garantit l’interopérabilité, la sécurité et la prise en charge de tous les types de jetons.",
   "TR_ACCOUNT_TYPE_COINJOIN": "Coinjoin",
+  "TR_ACCOUNT_TYPE_DEFAULT": "Par défaut",
   "TR_ACCOUNT_TYPE_IMPORTED": "Importé",
   "TR_ACCOUNT_TYPE_LEDGER": "Ledger",
+  "TR_ACCOUNT_TYPE_LEDGER_DESC": "Les comptes Ledger sont compatibles avec les chemins de dérivation de Ledger Live, facilitant ainsi la migration de Ledger vers Trezor.",
   "TR_ACCOUNT_TYPE_LEGACY": "Legacy",
+  "TR_ACCOUNT_TYPE_LEGACY_DESC": "Les comptes Legacy sont compatibles avec les chemins de dérivation de Ledger Legacy, facilitant ainsi la migration de Ledger vers Trezor.",
+  "TR_ACCOUNT_TYPE_NORMAL_EVM_DESC": "La méthode actuelle et la plus répandue de génération et de gestion des adresses {value} garantit l’interopérabilité, la sécurité et la prise en charge de tous les types de jetons.",
+  "TR_ACCOUNT_TYPE_NORMAL_SOLANA_DESC": "La méthode actuelle et la plus répandue de génération et de gestion des adresses Solana garantit l’interopérabilité, la sécurité et la prise en charge des jetons SOL et SPL.",
   "TR_ACCOUNT_TYPE_NO_CAPABILITY": "Non pris en charge.",
   "TR_ACCOUNT_TYPE_NO_SUPPORT": "Ce type de compte n’est pas pris en charge sur ce modèle Trezor.",
   "TR_ACCOUNT_TYPE_SEGWIT": "Legacy SegWit",
@@ -249,10 +256,12 @@
   "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_TECH": "BIP44, Base58",
   "TR_ACCOUNT_TYPE_TAPROOT": "Taproot",
   "TR_ACCOUNT_TYPE_UPDATE_REQUIRED": "Veuillez mettre à jour le micrologiciel du dispositif pour activer ce type de compte.",
+  "TR_ACCOUNT_TYPE_XRP_DESC": "XRP est une cryptomonnaie qui permet des paiements transfrontaliers rapides et à faible coût sans dépendre du minage traditionnel et qui utilise un grand livre basé sur un mécanisme de consensus pour des confirmations de transactions rapides.",
   "TR_ACQUIRE_DEVICE": "Utiliser Trezor ici",
   "TR_ACQUIRE_DEVICE_TITLE": "Une autre session est en cours",
   "TR_ACTIVATED_COINS": "Coins activés",
   "TR_ACTIVE": "active",
+  "TR_ADD": "Ajouter",
   "TR_ADDRESSES": "Adresse",
   "TR_ADDRESSES_CHANGE": "Modifier les adresses",
   "TR_ADDRESSES_FRESH": "Nouvelles adresses",
@@ -262,7 +271,7 @@
   "TR_ADDRESS_MODAL_CLIPBOARD": "Copier l’adresse",
   "TR_ADDRESS_MODAL_TITLE": "{networkName} adresse de réception",
   "TR_ADDRESS_MODAL_TITLE_EXCHANGE": "{networkCurrencyName} adresse de réception sur le réseau {networkName}",
-  "TR_ADDRESS_PHISHING_WARNING": "Pour éviter les attaques par hameçonnage, vous devez vérifier l’adresse sur votre Trezor. {claim}",
+  "TR_ADDRESS_PHISHING_WARNING": "Pour éviter les attaques par hameçonnage, vérifiez l’adresse de réception sur votre Trezor. {claim}",
   "TR_ADD_ACCOUNT": "Ajouter un compte",
   "TR_ADD_HIDDEN_WALLET": "Portefeuille protégé par une phrase secrète",
   "TR_ADD_NETWORK_ACCOUNT": "Ajouter un compte {network}",
@@ -289,7 +298,9 @@
   "TR_ALLOW_ANALYTICS": "Utilisation des données",
   "TR_ALLOW_ANALYTICS_DESCRIPTION": "Toutes les données sont strictement anonymes. Permet uniquement d’améliorer l’écosystème Trezor.",
   "TR_ALLOW_AUTOMATIC_SUITE_UPDATES": "Mises à jour automatiques pour Trezor Suite",
-  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Trezor Suite télécharge automatiquement la dernière version en arrière-plan et l’installe lors du redémarrage de l’application. Vous bénéficiez ainsi en permanence de la mise à jour des dernières fonctionnalités et des correctifs de sécurité. Les mises à jour ont lieu sans nécessiter votre autorisation.",
+  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Téléchargez automatiquement la dernière version de Trezor Suite en arrière-plan et installez-la au redémarrage de l’application. Vous bénéficiez ainsi en permanence de la mise à jour des dernières fonctionnalités et des correctifs de sécurité. Les mises à jour ont lieu sans nécessiter votre autorisation.",
+  "TR_ALL_NETWORKS": "Tous les réseaux ({networkCount})",
+  "TR_ALL_NETWORKS_TOOLTIP": "Affichez les jetons de tous les réseaux {networkCount}. Filtrez par réseaux les plus populaires.",
   "TR_ALL_TRANSACTIONS": "Transactions",
   "TR_AMOUNT_SENT": "Montant envoyé",
   "TR_AMOUNT_TOO_BIG_FOR_COINJOIN": "Ne convient pas aux Coinjoin - montant trop élevé",
@@ -348,20 +359,20 @@
   "TR_BEFORE_ANY_FURTHER_ACTIONS": "Bien que cela soit peu probable, vous devrez peut-être accéder à votre sauvegarde du portefeuille en cas de problème de mise à jour du micrologiciel.",
   "TR_BIP_SIG_FORMAT": "Trezor",
   "TR_BITCOIN_ONLY_UNAVAILABLE": "Avant de passer à {bitcoinOnly}, vous devez installer la dernière version du micrologiciel.",
-  "TR_BREAKING_ANONYMITY_CHECKBOX": "Je comprends que je porte atteinte à mon anonymat",
+  "TR_BREAKING_ANONYMITY_CHECKBOX": "Je comprends que je porte atteinte à mon anonymat.",
   "TR_BRIDGE": "Trezor Bridge",
   "TR_BRIDGE_DEV_MODE_START": "Démarrage de Trezor Bridge sur le port 21324",
   "TR_BRIDGE_DEV_MODE_STOP": "Démarrage de Trezor Bridge sur le port par défaut",
   "TR_BRIDGE_GO_TO_WALLET_DESCRIPTION": "Êtes-vous sûr ? Votre dispositif peut uniquement être utilisé par une application à la fois. Si vous utilisez actuellement une autre application avec votre dispositif Trezor, terminez d’abord cette session.",
   "TR_BRIDGE_NEEDED_DESCRIPTION": "Votre navigateur n’est pas pris en charge. Pour bénéficier d’une expérience optimale, téléchargez et exécutez l’application de bureau Trezor Suite en arrière-plan, ou utilisez un navigateur basé sur Chromium compatible avec WebUSB.",
   "TR_BRIDGE_REQUESTED_DESCRIPTION": "Une autre application a demandé à Trezor Suite de se connecter à votre dispositif Trezor. Laissez Trezor Suite en cours d’exécution en arrière-plan et réessayez l’action dans l’autre application.",
+  "TR_BRIDGE_TIP_AUTOSTART": "Astuce : Activez la fonction de démarrage automatique pour que Bridge fonctionne toujours en arrière-plan.",
   "TR_BTC_UNITS": "Unités Bitcoin",
   "TR_BUG": "Bug",
   "TR_BUMP_FEE": "Frais de bump",
+  "TR_BUMP_FEE_DISABLED_TOOLTIP": "Pour accélérer vos transactions, majorez les frais de la transaction la plus ancienne en attente (par nonce) dans la file d’attente. Les transactions doivent être confirmées dans l’ordre. <a>En savoir plus</a>",
   "TR_BUY": "Acheter",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "Effectuer des transactions",
   "TR_BUY_BUY": "Acheter",
-  "TR_BUY_BUY_AGAIN": "Acheter à nouveau",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Confirmé sur Trezor",
   "TR_BUY_DETAIL_ERROR_BUTTON": "Retour au compte",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "Accéder à la page d’assistance du fournisseur",
@@ -386,12 +397,12 @@
   "TR_BUY_MODAL_FOR_YOUR_SAFETY": "Achetez {cryptocurrency} avec {provider}",
   "TR_BUY_MODAL_LEGAL_HEADER": "Mentions légales",
   "TR_BUY_MODAL_SECURITY_HEADER": "La sécurité avant tout avec votre Trezor",
-  "TR_BUY_MODAL_TERMS_1": "Vous êtes ici pour acheter des cryptomonnaies. Si vous avez été dirigé vers ce site pour toute autre raison, veuillez contacter l’assistance {provider} avant de poursuivre.",
-  "TR_BUY_MODAL_TERMS_2": "Vous utilisez cette fonctionnalité pour acheter des fonds qui seront envoyés à un compte sous votre contrôle personnel direct.",
-  "TR_BUY_MODAL_TERMS_3": "Vous comprenez que les transactions de cryptomonnaies sont irréversibles et ne peuvent être remboursées. Par conséquent, les fonds perdus de manière frauduleuse ou accidentelle peuvent être irrécupérables.",
-  "TR_BUY_MODAL_TERMS_4": "Vous comprenez qu’Invity ne fournit pas ce service. Les conditions de {provider} régissent le service.",
-  "TR_BUY_MODAL_TERMS_5": "Vous n’utilisez pas cette fonctionnalité à des fins de jeux d’argent, de fraude ou de toute autre violation des conditions de service d’Invity ou du fournisseur, ou de toute réglementation applicable.",
-  "TR_BUY_MODAL_TERMS_6": "Vous comprenez que les cryptomonnaies représentent un instrument financier émergent et que les réglementations peuvent varier d’une juridiction à l’autre. Cela peut vous exposer à un risque plus élevé de fraude, de vol ou d’instabilité du marché.",
+  "TR_BUY_MODAL_TERMS_1": "Je souhaite acheter des cryptomonnaies. Si je suis redirigé vers ce site pour toute autre raison, je dois contacter l’assistance {provider} avant de continuer.",
+  "TR_BUY_MODAL_TERMS_2": "J’utilise cette fonctionnalité pour acheter des cryptomonnaies qui seront transférées sur mon propre compte.",
+  "TR_BUY_MODAL_TERMS_3": "Je comprends que les transactions de cryptomonnaies sont définitives et ne peuvent être ni annulées ni remboursées. Les pertes dues à une fraude ou à une erreur peuvent être impossibles à récupérer.",
+  "TR_BUY_MODAL_TERMS_4": "Je comprends qu’Invity ne fournit pas ce service. Son fonctionnement est régi par les Conditions générales de {provider}.",
+  "TR_BUY_MODAL_TERMS_5": "Je n’utilise pas cette fonctionnalité à des fins de jeux d’argent, de fraude ou de toute autre activité qui violerait les conditions de service d’Invity ou du fournisseur, ou toute loi applicable.",
+  "TR_BUY_MODAL_TERMS_6": "Je comprends que les cryptomonnaies représentent un instrument financier émergent et que les réglementations peuvent varier d’une région à une autre. Cela peut augmenter le risque de fraude, de vol ou d’instabilité du marché.",
   "TR_BUY_MODAL_VERIFIED_PARTNERS_HEADER": "Partenaires vérifiés par Invity",
   "TR_BUY_NETWORK": "Acheter {network}",
   "TR_BUY_NOT_TRANSACTIONS": "Aucune transaction pour le moment.",
@@ -406,12 +417,10 @@
   "TR_BUY_STATUS_PENDING": "En attente",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "En attente",
   "TR_BUY_STATUS_SUCCESS": "Approuvé",
-  "TR_BUY_TRANS_ID": "Identifiant trans. :",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "Le maximum est {maximum}",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "Le maximum est {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "Le minimum est {minimum}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "Le minimum est {minimum} {currency}",
-  "TR_BUY_VIEW_DETAILS": "Afficher les détails",
   "TR_BYTES": "octets",
   "TR_CAMERA_NOT_RECOGNIZED": "La caméra n’a pas été reconnue.",
   "TR_CAMERA_PERMISSION_DENIED": "L’autorisation d’accéder à la caméra a été refusée.",
@@ -430,12 +439,12 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Montant du Trezor",
   "TR_CHAINED_TXS": "Transactions enchaînées",
   "TR_CHANGELOG": "Changelog",
-  "TR_CHANGELOG_ON_GITHUB": "Changelog sur GitHub",
   "TR_CHANGE_ADDRESS_TOOLTIP": "Il s’agit d’une adresse de modification créée à partir d’un envoi précédent.",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "Vous pouvez modifier votre type de micrologiciel à tout moment dans les paramètres.",
   "TR_CHANGE_HOMESCREEN": "Changer l’écran d’accueil",
   "TR_CHANGE_PIN": "Modifier le code PIN",
   "TR_CHANGE_WIPE_CODE": "Modifier le code d’effacement",
+  "TR_CHECKED_BALANCES_ON": "Soldes vérifiés sur",
   "TR_CHECKING_YOUR_DEVICE": "Vérification de votre dispositif",
   "TR_CHECKSUM_CONVERSION_INFO": "Converti en somme de contrôle. <a>En savoir plus</a>",
   "TR_CHECK_DEVICE_ORIGIN_DESCRIPTION": "Nous vérifierons l’intégrité de votre dispositif Trezor, afin d’assurer sa sécurité et de confirmer l’authenticité de la puce.",
@@ -447,8 +456,7 @@
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "Effectuez une simulation de récupération pour vérifier votre sauvegarde du portefeuille.",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "Saisissez les mots de votre sauvegarde du portefeuille dans l’ordre affiché sur votre dispositif. Il se peut qu’on vous demande de saisir certains mots qui ne font pas partie de votre sauvegarde du portefeuille, à titre de mesure de sécurité supplémentaire.",
   "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "Utilisez le pavé à 2 boutons pour saisir votre sauvegarde du portefeuille. Ce faisant, vous conservez toutes vos informations sensibles en toute sécurité, à l’écart de tout ordinateur ou navigateur Web louche ou non sécurisé.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "La saisie de votre sauvegarde du portefeuille s’effectue à l’aide de l’écran tactile. Vous évitez ainsi d’exposer vos informations sensibles à un ordinateur ou à un navigateur Web potentiellement non sécurisé.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "La saisie de votre sauvegarde du portefeuille s’effectue à l’aide de l’écran tactile. Vous évitez ainsi d’exposer vos informations sensibles à un ordinateur ou à un navigateur Web potentiellement non sécurisé.",
+  "TR_CHECK_RECOVERY_SEED_DESC_TOUCHSCREEN": "La saisie de votre sauvegarde du portefeuille s’effectue à l’aide de l’écran tactile. Vous évitez ainsi d’exposer vos informations sensibles à un ordinateur ou à un navigateur Web potentiellement non sécurisé.",
   "TR_CHECK_SEED": "Vérifier la sauvegarde",
   "TR_CHECK_YOUR_DEVICE": "Vérifiez votre écran Trezor",
   "TR_CHOOSE_RECOVERY_TYPE": "Choisir le type de récupération",
@@ -502,10 +510,37 @@
   "TR_COINJOIN_TILE_3_TITLE": "Protégé par votre Trezor",
   "TR_COINJOIN_TRANSACTION_BATCH": "Transactions Coinjoin",
   "TR_COINMARKET_BEST_RATE": "Meilleur taux",
+  "TR_COINMARKET_BUY_AND_SELL": "Acheter et vendre",
+  "TR_COINMARKET_BUY_AND_SELL_COUNTER": "{totalBuys, plural, =0 {{totalBuys} achat} one {{totalBuys} achat} other {{totalBuys} achats} } • {totalSells, plural, =0 {{totalSells} vente} one {{totalSells} vente} other {{totalSells} ventes} }",
+  "TR_COINMARKET_CEX_TOOLTIP": "Plateforme centralisée",
+  "TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY": "Changez le montant ou la devise.",
   "TR_COINMARKET_COMPARE_OFFERS": "Comparer toutes les offres",
   "TR_COINMARKET_COUNTRY": "Pays de résidence",
+  "TR_COINMARKET_DCA_DOWNLOAD": "Téléchargez l’application mobile Invity pour commencer à épargner en Bitcoins",
+  "TR_COINMARKET_DCA_FEATURE_1_DESCRIPTION": "Un plan d’épargne en DCA avec garde simple et sécurisé.",
+  "TR_COINMARKET_DCA_FEATURE_1_SUBHEADING": "Développé par SatoshiLabs",
+  "TR_COINMARKET_DCA_FEATURE_2_DESCRIPTION": "Effectuez des retraits vers un portefeuille en auto-garde sans frais supplémentaires.",
+  "TR_COINMARKET_DCA_FEATURE_2_SUBHEADING": "Retraits sans frais",
+  "TR_COINMARKET_DCA_FEATURE_3_DESCRIPTION": "Une interface rapide, rationalisée et conviviale.",
+  "TR_COINMARKET_DCA_FEATURE_3_SUBHEADING": "Facile à utiliser",
+  "TR_COINMARKET_DCA_FEATURE_4_DESCRIPTION": "Suivez l’historique, le montant et la fréquence de vos investissements.",
+  "TR_COINMARKET_DCA_FEATURE_4_SUBHEADING": "Aperçu du DCA",
+  "TR_COINMARKET_DCA_HEADING": "Épargner en Bitcoins avec l’application Invity",
+  "TR_COINMARKET_DEX_TOOLTIP": "Plateforme décentralisée",
   "TR_COINMARKET_ENTER_AMOUNT_IN": "Saisir un montant en {currency}",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_KYC_ALL": "Toutes les options KYC",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_NO_KYC": "KYC jamais requis",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_ALL": "Toutes les offres CEX & DEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_DEX": "DEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FIXED_CEX": "CEX à taux fixe",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FLOATING_CEX": "CEX à taux variable",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING": "DEX",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING_TOOLTIP": "Une plateforme d’échange décentralisée (DEX) vous permet d’échanger des cryptomonnaies directement sur la blockchain, sans qu’une autorité centrale ou un intermédiaire ne soit nécessaire.",
+  "TR_COINMARKET_EXCHANGE_FIXED_OFFERS_HEADING": "CEX à taux fixe",
+  "TR_COINMARKET_EXCHANGE_FLOAT_OFFERS_HEADING": "CEX à taux variable",
   "TR_COINMARKET_FEATURED_OFFERS_HEADING": "Offres spéciales",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_BUY_LABEL": "Paiement :",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_SELL_LABEL": "Méthode de réception :",
   "TR_COINMARKET_FEES_INCLUDED": "Frais inclus",
   "TR_COINMARKET_FEES_NOT_INCLUDED": "Frais non inclus",
   "TR_COINMARKET_FEES_ON_WEBSITE": "Certains frais ne sont pas inclus dans le prix affiché. Vous pourrez consulter le prix final sur le site Web du fournisseur.",
@@ -518,24 +553,18 @@
   "TR_COINMARKET_KYC_NO_REFUND": "KYC requis dans des cas exceptionnels. KYC requis pour les remboursements. 👈",
   "TR_COINMARKET_KYC_POLICY": "Politique en matière de KYC",
   "TR_COINMARKET_KYC_POLICY_NEVER_REQUIRED": "KYC jamais requis",
-  "TR_COINMARKET_KYC_YES_REFUND": "KYC requis dans des cas exceptionnels. KYC non requis pour les remboursements. 🤝",
+  "TR_COINMARKET_KYC_YES_REFUND": "KYC n’est requis que dans des cas exceptionnels. Il n’est pas requis pour les remboursements. 🤝",
   "TR_COINMARKET_LAST_TRANSACTIONS": "Dernières transactions",
   "TR_COINMARKET_NETWORK_FEE": "Frais de réseau",
   "TR_COINMARKET_NETWORK_TOKENS": "Jetons {networkName}",
   "TR_COINMARKET_NO_CEX_PROVIDER_FOUND": "Aucun fournisseur de plateforme centralisée trouvé",
   "TR_COINMARKET_NO_DEX_PROVIDER_FOUND": "Aucun fournisseur de plateforme décentralisée trouvé",
   "TR_COINMARKET_NO_METHODS_AVAILABLE": "Aucune méthode disponible",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "Rechargement automatique dans",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "Retour aux transactions",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "Aucune offre",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "Désolé, nous n’avons aucune offre pour le moment en raison d’un problème de connectivité du serveur.",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "Désolé, nous n’avons aucune offre pour le moment. Essayez de recharger la page ou de modifier votre requête.",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "Actualiser la page",
   "TR_COINMARKET_OFFERS_EMPTY": "Aucune offre ne correspond à votre demande. Veuillez changer de pays ou de montant d’achat.",
   "TR_COINMARKET_OFFERS_REFRESH": "Offres à actualiser dans",
   "TR_COINMARKET_OFFERS_SELECT": "Sélectionner",
   "TR_COINMARKET_OFFER_LOOKING": "Nous recherchons la meilleure offre pour vous",
-  "TR_COINMARKET_OFFER_NO_FOUND": "Aucune offre correspondant à votre demande n’est disponible. Changez le montant ou la devise.",
+  "TR_COINMARKET_OFFER_NO_FOUND": "Aucune offre correspondant à votre demande n’est disponible.",
   "TR_COINMARKET_ON_NETWORK_CHAIN": "Sur la chaîne du réseau {networkName}",
   "TR_COINMARKET_OTHER_CURRENCIES": "Autres devises",
   "TR_COINMARKET_PAYMENT_METHOD": "Méthode de paiement",
@@ -544,9 +573,36 @@
   "TR_COINMARKET_RECEIVE_METHOD": "Méthode de réception",
   "TR_COINMARKET_SELL": "Vendre",
   "TR_COINMARKET_SHOW_OFFERS": "Comparer les offres",
+  "TR_COINMARKET_SWAP": "Échange",
+  "TR_COINMARKET_SWAP_AMOUNT": "Montant de l’échange",
+  "TR_COINMARKET_SWAP_COUNTER": "{totalSwaps, plural, =0 {{totalSwaps} échange} one {{totalSwaps} échange} other {{totalSwaps} échanges} }",
+  "TR_COINMARKET_SWAP_DEX_MODAL_CONFIRM": "Je suis prêt à échanger",
+  "TR_COINMARKET_SWAP_DEX_MODAL_FOR_YOUR_SAFETY": "Échanger des actifs {fromCrypto} contre des actifs {toCrypto} sur {provider}",
+  "TR_COINMARKET_SWAP_DEX_MODAL_LEGAL_HEADER": "Mentions légales",
+  "TR_COINMARKET_SWAP_DEX_MODAL_SECURITY_HEADER": "La sécurité avant tout avec votre Trezor",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_1": "Je souhaite échanger des cryptomonnaies à l’aide d’une DEX (plateforme d’échange décentralisée) en utilisant le contrat de {provider}.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_2": "Je souhaite échanger des cryptomonnaies pour mon propre compte. Je comprends que les politiques du fournisseur peuvent nécessiter une vérification d’identité.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_3": "Je comprends que les transactions de cryptomonnaies sont définitives et ne peuvent être ni annulées ni remboursées. Les pertes dues à une fraude ou à une erreur peuvent être impossibles à récupérer.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4": "Je comprends qu’Invity ne fournit pas ce service. Son fonctionnement est régi par les Conditions générales de {provider}.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_5": "Je n’utilise pas cette fonctionnalité à des fins de jeux d’argent, de fraude ou de toute autre activité qui violerait les conditions de service d’Invity ou du fournisseur, ou toute loi applicable.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_6": "Je comprends que les cryptomonnaies représentent un instrument financier émergent et que les réglementations peuvent varier d’une région à une autre. Cela peut augmenter le risque de fraude, de vol ou d’instabilité du marché.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_VERIFIED_PARTNERS_HEADER": "Partenaires vérifiés par Invity",
+  "TR_COINMARKET_SWAP_MODAL_CONFIRM": "Je suis prêt à échanger",
+  "TR_COINMARKET_SWAP_MODAL_FOR_YOUR_SAFETY": "Échanger des actifs {fromCrypto} contre des actifs {toCrypto} sur {provider}",
+  "TR_COINMARKET_SWAP_MODAL_LEGAL_HEADER": "Mentions légales",
+  "TR_COINMARKET_SWAP_MODAL_SECURITY_HEADER": "La sécurité avant tout avec votre Trezor",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_1": "Je souhaite échanger des cryptomonnaies. Si je suis redirigé vers ce site pour toute autre raison, je dois contacter l’assistance Trezor avant de continuer. ",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_2": "Je souhaite échanger des cryptomonnaies pour mon propre compte. Je comprends que les politiques du fournisseur peuvent nécessiter une vérification d’identité.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_3": "Je comprends que les transactions de cryptomonnaies sont définitives et ne peuvent être ni annulées ni remboursées. Les pertes dues à une fraude ou à une erreur peuvent être impossibles à récupérer.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_4": "Je comprends qu’Invity ne fournit pas ce service. Son fonctionnement est régi par les Conditions générales de {provider}.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_5": "Je n’utilise pas cette fonctionnalité à des fins de jeux d’argent, de fraude ou de toute autre activité qui violerait les conditions de service d’Invity ou du fournisseur, ou toute loi applicable.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_6": "Je comprends que les cryptomonnaies représentent un instrument financier émergent et que les réglementations peuvent varier d’une région à une autre. Cela peut augmenter le risque de fraude, de vol ou d’instabilité du marché.",
+  "TR_COINMARKET_SWAP_MODAL_VERIFIED_PARTNERS_HEADER": "Partenaires vérifiés par Invity",
   "TR_COINMARKET_TOKEN_NETWORK": "{tokenName} sur le réseau {networkName}",
   "TR_COINMARKET_TRADE_FEE": "Frais de trading",
+  "TR_COINMARKET_TRANS_ID": "Identifiant trans. :",
   "TR_COINMARKET_UNKNOWN_PROVIDER": "Fournisseur inconnu",
+  "TR_COINMARKET_VIEW_DETAILS": "Afficher les détails",
   "TR_COINMARKET_YOUR_BEST_OFFER": "Votre meilleure offre",
   "TR_COINMARKET_YOU_BUY": "Vous achetez",
   "TR_COINMARKET_YOU_GET": "Vous obtenez",
@@ -571,6 +627,7 @@
   "TR_CONFIRMED_TX": "Confirmé",
   "TR_CONFIRMING_TX": "Confirmation de la transaction",
   "TR_CONFIRM_ACTION_ON_YOUR": "Suivez les instructions sur l’écran de votre Trezor",
+  "TR_CONFIRM_ADDRESS": "Confirmer l’adresse",
   "TR_CONFIRM_BEFORE_COPY": "Confirmez sur Trezor avant de copier",
   "TR_CONFIRM_CONDITIONS": "Confirmez les conditions avant de poursuivre.",
   "TR_CONFIRM_EMPTY_HIDDEN_WALLET_ON": "Confirmer que le portefeuille protégé par une phrase secrète est vide sur le dispositif « {deviceLabel} ».",
@@ -593,13 +650,13 @@
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_BUTTON": "Gérer",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_DESCRIPTION": "Activez la boîte de dialogue de saisie de la phrase secrète lorsque vous ouvrez Trezor Suite.",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_TITLE": "Utilisez-vous principalement une phrase secrète ?",
-  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Vérifiez sur Trezor pour confirmer l’adresse de réception. Il n’est pas recommandé de poursuivre sans confirmer.",
+  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Vérifiez votre Trezor pour confirmer l’adresse de réception. Il n’est pas recommandé de continuer sans avoir confirmé.",
   "TR_CONNECT_DEVICE_RECEIVE_PROMO_TITLE": "L’adresse de réception ne peut pas être vérifiée",
   "TR_CONNECT_DEVICE_SEND_PROMO_DESCRIPTION": "Pour envoyer des coins, connectez votre Trezor.",
   "TR_CONNECT_DEVICE_SEND_PROMO_TITLE": "Votre Trezor n’est pas connecté",
   "TR_CONNECT_TREZOR_TO_SEND_BUTTON": "Connecter Trezor pour envoyer",
   "TR_CONNECT_YOUR_DEVICE": "Connectez-vous et déverrouillez votre Trezor",
-  "TR_CONTACT_SUPPORT": "Contacter l’assistance",
+  "TR_CONTACT_SUPPORT": "Contacter l’assistance Trezor",
   "TR_CONTACT_TREZOR_SUPPORT": "Contacter l’assistance Trezor",
   "TR_CONTINUE": "Continuer",
   "TR_CONTINUE_ANYWAY": "Continuer quand même",
@@ -619,7 +676,7 @@
   "TR_COPY_ADDRESS_POLICY_ID": "N’envoyez jamais de fonds à une adresse relative à un identifiant de politique.",
   "TR_COPY_AND_CLOSE": "Copier et fermer",
   "TR_COPY_SIGNED_MESSAGE": "Copier le message signé",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "Copier",
+  "TR_COPY_TO_CLIPBOARD": "Copier",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "Impossible de récupérer le journal des modifications",
   "TR_COULD_NOT_RETRIEVE_DATA": "Impossible de récupérer les données",
   "TR_COUNT_WALLETS": "{count} {count, plural, one {portefeuille} other {portefeuilles}}",
@@ -653,6 +710,7 @@
   "TR_DASHBOARD_ASSET_FAILED": "L’actif n’a pas été chargé correctement",
   "TR_DASHBOARD_DISCOVERY_ERROR": "Erreur de découverte",
   "TR_DASHBOARD_DISCOVERY_ERROR_PARTIAL_DESC": "Les comptes n’ont pas été chargés correctement {details}",
+  "TR_DATA": "Données",
   "TR_DATABASE_UPGRADE_BLOCKED": "Mise à niveau de la base de données bloquée par une autre instance d’application",
   "TR_DATA_ANALYTICS_CATEGORY_1": "Plateforme",
   "TR_DATA_ANALYTICS_CATEGORY_1_ITEM_1": "Système d’exploitation, modèle Trezor, version, etc.",
@@ -706,8 +764,13 @@
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT": "En mode bootloader par erreur ?",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_BUTTON": "Reconnecter le dispositif sans toucher à aucun bouton.",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_TOUCH": "Reconnectez le dispositif sans toucher l’écran.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED": "Ce dispositif est utilisé ailleurs.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION": "L’application {transportSessionOwner} peut être en train d’utiliser ce dispositif. En cas de besoin, vous pouvez prendre le contrôle de ce dispositif.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION_UNKNOWN_APP": "Une autre application peut être en train d’utiliser ce dispositif. En cas de besoin, vous pouvez prendre le contrôle de ce dispositif.",
   "TR_DEVICE_CONNECTED_WRONG_STATE": "Dispositif détecté dans un état incorrect",
   "TR_DEVICE_DISCONNECTED_DURING_ACTION_DESCRIPTION": "Votre Trezor a été déconnecté pendant le processus de sauvegarde. Nous vous recommandons vivement d’utiliser l’option de réinitialisation aux paramètres d’usine dans les paramètres du dispositif pour effacer votre dispositif et recommencer le processus de sauvegarde du portefeuille.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH": "La vérification du hachage du micrologiciel a échoué. Votre Trezor est peut-être une contrefaçon.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR": "La vérification du hachage du micrologiciel n’a pas pu être effectuée. Votre Trezor est peut-être une contrefaçon.",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON": "Désactiver",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON_DISABLED": "Activer",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION": "La vérification de la révision du micrologiciel est une fonction de sécurité cruciale. Nous vous recommandons de l’activer en permanence.",
@@ -726,6 +789,8 @@
   "TR_DEVICE_LABEL_IS_NOT_BACKED_UP": "Le dispositif « {deviceLabel} » n’est pas sauvegardé",
   "TR_DEVICE_LABEL_IS_NOT_CONNECTED": "Le dispositif « {deviceLabel} » n’est pas connecté",
   "TR_DEVICE_LABEL_IS_UNAVAILABLE": "Le dispositif « {deviceLabel} » n’est pas disponible",
+  "TR_DEVICE_MAYBE_COMPROMISED_HEADING": "Échec de la vérification du dispositif",
+  "TR_DEVICE_MAYBE_COMPROMISED_TEXT": "Reconnectez votre dispositif et réessayez la vérification. Si le problème persiste, contactez l’assistance Trezor pour savoir ce qui se passe avec votre dispositif et ce qu’il faut faire ensuite.",
   "TR_DEVICE_NOT_CONNECTED": "Dispositif non connecté",
   "TR_DEVICE_NOT_INITIALIZED": "Trezor n’est pas configuré",
   "TR_DEVICE_NOT_INITIALIZED_TEXT": "Nous vous guiderons tout au long du processus et vous aiderons à démarrer immédiatement.",
@@ -788,7 +853,6 @@
   "TR_DOWNLOAD_LATEST_BRIDGE": "Télécharger le dernier Bridge {version}",
   "TR_DO_NOT_DISCONNECT_DEVICE": "Ne déconnectez pas votre dispositif",
   "TR_DO_NOT_SHOW_AGAIN": "Ne plus afficher",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "Passer cette étape ?",
   "TR_DROPBOX": "Dropbox",
   "TR_DROPZONE": "Glisser-déposer un fichier ici ou cliquer pour sélectionner des fichiers",
   "TR_DROPZONE_ERROR": "Échec de l’importation : {error}",
@@ -809,13 +873,13 @@
   "TR_EARLY_ACCESS_ENABLE": "Rejoindre",
   "TR_EARLY_ACCESS_ENABLED": "Programme Early Access activé",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM": "Rejoindre",
-  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "Je comprends que cela me permet de tester la version préliminaire du logiciel, qui peut contenir des erreurs qui affectent le fonctionnement normal de Suite.",
+  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "Je comprends que cela me permet de tester la version préliminaire du logiciel, qui peut contenir des erreurs qui affectent le fonctionnement normal de Trezor Suite.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_DESCRIPTION": "Vous pouvez le désactiver à tout moment.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TITLE": "Tester les dernières fonctionnalités du produit avant leur mise à disposition du grand public.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TOOLTIP": "Vérifiez d’abord le champ ci-dessus",
   "TR_EARLY_ACCESS_JOINED_DESCRIPTION": "Vous pouvez rechercher des mises à jour bêta dès maintenant ou lors du prochain lancement.",
   "TR_EARLY_ACCESS_JOINED_TITLE": "Programme Early Access activé",
-  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "Pour revenir à la dernière version stable de Suite, cliquez sur « Télécharger version stable » et réinstallez l’application.",
+  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "Pour revenir à la dernière version stable de Trezor Suite, cliquez sur « Télécharger version stable » et réinstallez l’application.",
   "TR_EARLY_ACCESS_LEFT_TITLE": "Vous avez quitté le programme Early Access. Les versions bêta ne sont plus proposées.",
   "TR_EARLY_ACCESS_MENU": "Programme Early Access",
   "TR_EARLY_ACCESS_REINSTALL": "Télécharger version stable",
@@ -842,8 +906,8 @@
   "TR_ENTER_SEED_WORDS_ON_DEVICE": "Les mots sont saisis sur le dispositif pour des raisons de sécurité. Veuillez saisir les mots dans le bon ordre.",
   "TR_ENTER_WIPECODE": "Saisir le code d’effacement",
   "TR_ERROR": "Erreur",
-  "TR_ERROR_CARDANO_DELEGATE": "Le montant est insuffisant",
-  "TR_ERROR_CARDANO_WITHDRAWAL": "Le montant est insuffisant",
+  "TR_ERROR_CARDANO_DELEGATE": "Le montant n’est pas suffisant",
+  "TR_ERROR_CARDANO_WITHDRAWAL": "Le montant n’est pas suffisant",
   "TR_ETH_ADDRESS_CANT_VERIFY_HISTORY": "Impossible de vérifier l’historique de l’adresse. Vérifiez que l’adresse est correcte.",
   "TR_ETH_ADDRESS_NOT_USED_NOT_CHECKSUMMED": "L’adresse n’est associée à aucun historique de transaction et n’est pas une adresse de somme de contrôle. Vérifiez que l’adresse est correcte.",
   "TR_EVM_EXPLANATION_DESCRIPTION": "Il partage le même style d’adresse qu’Ethereum, mais possède ses propres coins et jetons uniques qui ne peuvent pas être utilisés sur d’autres réseaux.",
@@ -870,7 +934,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "Approuvez uniquement le montant exact requis pour cet échange. Vous devrez payer des frais supplémentaires si vous souhaitez effectuer à nouveau un échange similaire.",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "Révoquer l’approbation précédente",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "Effectuer une transaction qui supprimera l’approbation préalable du contrat avec {provider}.",
-  "TR_EXCHANGE_BUY": "Pour",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Confirmer sur Trezor et envoyer",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "Confirmer et envoyer",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "Créer une approbation",
@@ -892,8 +955,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "La transaction a été effectuée avec succès.",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "Approuvé",
   "TR_EXCHANGE_DEX": "Offre d’échange décentralisé",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "Les frais d’exécution de ce swap sont estimés à {approvalFee} ({approvalFeeFiat}) pour approbation (si nécessaire) et {swapFee} ({swapFeeFiat}) pour l’échange.",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "Il ne reste plus de fonds pour les frais de transaction. Veuillez réduire le montant de l’échange à {max} {symbol} maximum.",
   "TR_EXCHANGE_EXTRA_FIELD": "{extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "{extraFieldName} n’est pas valide",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "{extraFieldDescription}",
@@ -903,7 +964,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "Les taux fixes vous indiquent exactement le montant que vous obtiendrez à la fin de l’échange : le montant ne variera pas entre le moment où vous sélectionnez le taux et celui où votre transaction est finalisée. Le montant indiqué vous est garanti, mais ces taux sont généralement moins avantageux, ce qui signifie que vous ne pourrez pas acheter autant de crypto avec les mêmes fonds.",
   "TR_EXCHANGE_FLOAT": "Offre à taux variable",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "Les taux variables signifient que le montant final obtenu peut légèrement varier en raison des fluctuations du marché entre le moment où vous sélectionnez le taux et le moment où votre transaction est finalisée. Ces taux sont généralement plus élevés, ce qui signifie que vous pourriez obtenir plus de crypto.",
-  "TR_EXCHANGE_PROVIDER": "Fournisseur",
   "TR_EXCHANGE_RATE": "Prix",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "Le compte de réception est en dehors de Suite.",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "Il s’agit de l’adresse alphanumérique spécifique qui recevra vos coins.",
@@ -930,23 +990,16 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "Veuillez saisir un nombre.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "Saisir le glissement souhaité.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "Montant de l’offre d’échange",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "Synthèse du glissement",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "Tolérance au glissement",
-  "TR_EXCHANGE_TRANS_ID": "Identifiant trans. :",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "Utiliser un compte ({symbol}) qui n’est pas dans Suite",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "Adresse de réception",
-  "TR_EXCHANGE_VIEW_DETAILS": "Afficher les détails",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE": "Mises à jour automatiques pour Trezor Suite",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION": "Trezor Suite télécharge automatiquement la dernière version en arrière-plan et l’installe lors du redémarrage de l’application. Vous bénéficiez ainsi en permanence de la mise à jour des dernières fonctionnalités et des correctifs de sécurité. Les mises à jour ont lieu sans nécessiter votre autorisation.",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN": "BNB Smart Chain",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON": "Activez la BNB Smart Chain sans transactions internes antérieures.",
   "TR_EXPERIMENTAL_FEATURES": "Expérimental",
   "TR_EXPERIMENTAL_FEATURES_ALLOW": "Fonctionnalités expérimentales",
   "TR_EXPERIMENTAL_FEATURES_WARNING": "Destiné uniquement aux utilisateurs expérimentés. Cette utilisation se fait à vos risques et périls. Ces fonctionnalités sont en cours de test, peuvent être instables et ne pas être prises en charge à long terme.",
   "TR_EXPERIMENTAL_PASSWORD_MANAGER": "Migration des mots de passe Dropbox",
-  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Un outil permettant de récupérer les mots de passe stockés sur Dropbox et sécurisés par Trezor. Conçu pour les anciens utilisateurs de l’extension Chrome du Gestionnaire de mots de passe Trezor.",
+  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Utilisez cet outil pour récupérer les mots de passe stockés sur Dropbox et sécurisés par Trezor. Conçu pour les anciens utilisateurs de l’extension Chrome du Gestionnaire de mots de passe Trezor.",
   "TR_EXPERIMENTAL_TOR_SNOWFLAKE": "Tor Snowflake",
-  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Tor Snowflake est un système qui permet d’accéder à des sites Web et à des applications soumis à la censure.",
+  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Accédez aux sites Web et applications censurés en utilisant Tor Snowflake, un système conçu pour contourner les restrictions.",
   "TR_EXPORT_AS": "Exporter en tant que {as}",
   "TR_EXPORT_FAIL": "L’exportation a échoué.",
   "TR_EXPORT_TO_FILE": "Exporter vers un fichier",
@@ -984,6 +1037,7 @@
   "TR_FIRMWARE_NEW_FW_DESCRIPTION": "Un nouveau micrologiciel est désormais disponible. Mettez votre dispositif à jour dès maintenant.",
   "TR_FIRMWARE_REINSTALL_FW_DESCRIPTION": "Le micrologiciel le plus récent est déjà installé sur votre dispositif. Vous pouvez réinstaller le micrologiciel si nécessaire.",
   "TR_FIRMWARE_REVISION_CHECK_FAILED": "La vérification de la révision du micrologiciel a échoué. Votre Trezor est peut-être une contrefaçon.",
+  "TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR": "La vérification de la révision du micrologiciel n’a pas pu être effectuée.",
   "TR_FIRMWARE_STATUS_INSTALLATION_COMPLETED": "Terminé",
   "TR_FIRMWARE_SUBHEADING_BITCOIN": "Micrologiciel léger prenant uniquement en charge les opérations en Bitcoin.",
   "TR_FIRMWARE_SUBHEADING_NONE": "Votre Trezor est livré sans micrologiciel. Installez la dernière version du micrologiciel pour utiliser votre dispositif en toute sécurité. Pour les utilisateurs de Bitcoin uniquement, nous recommandons d’installer <button>le micrologiciel {bitcoinOnly}</button>.",
@@ -1021,7 +1075,7 @@
   "TR_GOT_IT_BUTTON": "J’ai compris",
   "TR_GO_TO_ONBOARDING": "Commencer la configuration",
   "TR_GO_TO_SETTINGS": "Accéder aux paramètres",
-  "TR_GO_TO_SUITE": "Accéder à Suite",
+  "TR_GO_TO_SUITE": "Accéder à Trezor Suite",
   "TR_GRAPH_LINEAR": "Linéaire",
   "TR_GRAPH_LOGARITHMIC": "Logarithmique",
   "TR_GRAPH_MISSING_DATA": "Tous les montants de jetons XRP, SOL et autres sont inclus dans le solde du portefeuille, mais ne sont actuellement pas pris en charge dans le graphique.",
@@ -1040,7 +1094,7 @@
   "TR_GUIDE_FORUM": "Forum Trezor",
   "TR_GUIDE_FORUM_LABEL": "Rejoindre la communauté Trezor",
   "TR_GUIDE_SUGGESTION_LABEL": "Comment nous débrouillons-nous ?",
-  "TR_GUIDE_SUPPORT": "Contacter l’assistance",
+  "TR_GUIDE_SUPPORT": "Contacter l’assistance Trezor",
   "TR_GUIDE_SUPPORT_AND_FEEDBACK": "Assistance et commentaires",
   "TR_GUIDE_VIEW_HEADLINES_SUPPORT_FEEDBACK_SELECTION": "Assistance et commentaires",
   "TR_GUIDE_VIEW_HEADLINE_HELP_US_IMPROVE": "Aidez-nous à nous améliorer",
@@ -1172,7 +1226,7 @@
   "TR_LOCAL_FILE_SYSTEM": "Système de fichiers local",
   "TR_LOG": "Journal de bord de l’application",
   "TR_LOGIN_PROCEED": "Procéder",
-  "TR_LOG_DESCRIPTION": "Le journal contient toutes les informations techniques nécessaires sur Trezor Suite. Il peut s’avérer nécessaire lors de la connexion à l’assistance Trezor.",
+  "TR_LOG_DESCRIPTION": "Ce journal contient des informations techniques essentielles sur Trezor Suite et peut être requis si vous contactez l’assistance Trezor.",
   "TR_LOOKING_FOR_COINJOIN_ROUND": "En attente d’un tour",
   "TR_LOW_ANONYMITY_WARNING": "<red>Très faible niveau de confidentialité.</red> Nous vous recommandons d’utiliser un niveau d’au moins 1 sur 5, car tout ce qui est inférieur à ce seuil n’est pas confidentiel.",
   "TR_LTC_ADDRESS_INFO": "Litecoin a changé le format d’adresse. Vous trouverez plus d’informations sur la façon de convertir votre adresse sur notre blog. {TR_LEARN_MORE}",
@@ -1223,6 +1277,7 @@
   "TR_MY_PORTFOLIO": "Portfolio",
   "TR_NAV_ANONYMIZE": "Rendre les coins confidentiels",
   "TR_NAV_BUY": "Acheter",
+  "TR_NAV_DCA": "DCA",
   "TR_NAV_DETAILS": "Détails",
   "TR_NAV_RECEIVE": "Recevoir",
   "TR_NAV_SELL": "Vendre",
@@ -1264,6 +1319,7 @@
   "TR_NETWORK_LITECOIN": "Litecoin",
   "TR_NETWORK_NAMECOIN": "Namecoin",
   "TR_NETWORK_NEM": "NEM",
+  "TR_NETWORK_OP": "Optimism",
   "TR_NETWORK_POLYGON": "Polygone PoS",
   "TR_NETWORK_SOLANA_DEVNET": "Solana DevNet",
   "TR_NETWORK_SOLANA_MAINNET": "Solana",
@@ -1276,9 +1332,10 @@
   "TR_NETWORK_ZCASH": "Zcash",
   "TR_NEW_FEE": "Nouveau",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "Nouveau Trezor Bridge disponible.",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "Le nouveau micrologiciel Trezor est disponible ! Veuillez mettre\n          à jour votre dispositif.",
   "TR_NEXT_UP": "Suivant",
   "TR_NONCE": "Nonce",
+  "TR_NON_ASCII_CHAR": "{label} (avec le caractère non recommandé « {char} »)",
+  "TR_NON_ASCII_CHARS": "{label} (avec des caractères non recommandés)",
   "TR_NORMAL_ACCOUNTS": "Comptes par défaut",
   "TR_NORTH": "Nord",
   "TR_NOTHING_TO_ANONYMIZE": "Aucun élément à rendre confidentiel",
@@ -1296,16 +1353,12 @@
   "TR_NO_PASSPHRASE_WALLET": "Portefeuille standard",
   "TR_NO_SEARCH_RESULTS": "Aucun résultat pour votre critère de recherche",
   "TR_NO_SPENDABLE_UTXOS": "Il n’y a pas d’UTXO pouvant être dépensé dans votre compte.",
-  "TR_NO_TRANSPORT": "Le navigateur ne peut pas communiquer avec le dispositif",
+  "TR_NO_TRANSPORT": "Votre navigateur ne peut pas communiquer avec votre dispositif",
   "TR_NO_TRANSPORT_DESKTOP": "L’application ne peut pas communiquer avec le dispositif",
   "TR_NUM_ACCOUNTS_FIAT_VALUE": "{accountsCount} {accountsCount, plural, one {compte} other {comptes}} • {fiatValue}",
   "TR_N_MIN": "{n} min",
   "TR_N_TRANSACTIONS": "{value} {value, plural, one {transaction} other {transactions}}",
   "TR_OFF": "désactivé",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "Le montant choisi de {amount} est supérieur au maximum accepté de {max}.",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "Le montant choisi de {amount} est supérieur au maximum accepté de {max}.",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "Le montant choisi de {amount} est inférieur au minimum accepté de {min}.",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "Le montant choisi de {amount} est inférieur au minimum accepté de {min}.",
   "TR_OFFICIAL_LANGUAGES": "Officiel",
   "TR_OK": "OK",
   "TR_ON": "activé",
@@ -1333,7 +1386,7 @@
   "TR_ONBOARDING_DATA_COLLECTION_HEADING": "Collecte de données anonymes",
   "TR_ONBOARDING_DEVICE_CHECK": "Vérification de la sécurité du dispositif",
   "TR_ONBOARDING_DEVICE_CHECK_1": "Mon <strong>hologramme</strong> était intact et n’a pas été altéré.",
-  "TR_ONBOARDING_DEVICE_CHECK_2": "Mon dispositif a été acheté auprès de la boutique officielle Trezor Shop ou d’un revendeur de confiance.",
+  "TR_ONBOARDING_DEVICE_CHECK_2": "Mon dispositif a été acheté auprès de la <shop>boutique officielle Trezor Shop</shop> ou d’un <reseller>revendeur de confiance</reseller>.",
   "TR_ONBOARDING_DEVICE_CHECK_3": "L’emballage du dispositif était intact et n’a pas été altéré.",
   "TR_ONBOARDING_DEVICE_CHECK_4": "Le micrologiciel est déjà installé sur le Trezor connecté. Poursuivez la configuration uniquement si vous avez déjà utilisé ce Trezor.",
   "TR_ONBOARDING_DOWNLOAD_DESKTOP_APP": "Télécharger l’application de bureau",
@@ -1364,30 +1417,6 @@
   "TR_OTHER_INPUTS_AND_OUTPUTS": "Autres entrées et sorties",
   "TR_OUTGOING": "Sortant",
   "TR_OUTPUTS": "Sorties",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "Les montants minimum et maximum pour lesquels cet utilisateur est disposé à vendre {symbol}.",
-  "TR_P2P_GET_STARTED_INTRO": "Vous devez initier la transaction sur {providerName} - assurez-vous de suivre attentivement les étapes ci-dessous.",
-  "TR_P2P_GET_STARTED_ITEM_1": "Sélectionnez « Accéder à {providerName} » pour être redirigé vers le site Web de notre partenaire.",
-  "TR_P2P_GET_STARTED_ITEM_3": "Une fois que {providerName} vous demande une adresse de diffusion, revenez ici et continuez.",
-  "TR_P2P_GET_STARTED_ITEM_4": "Vous y êtes presque ! Révélez et copiez votre adresse, collez-la à nouveau dans le champ « Adresse de diffusion » sur {providerName}, et finalisez la transaction.",
-  "TR_P2P_GO_TO_PROVIDER": "Accéder à {providerName}",
-  "TR_P2P_INFO": "Avec la technologie {peerToPeer} (P2P), aucune vérification KYC n’est impliquée ni du côté de l’acheteur ni du côté du vendeur. Toutes les parties sont protégées contre la fraude par {multisigEscrow} sécurisées.",
-  "TR_P2P_MODAL_CONFIRM": "Je suis prêt à acheter",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "Acheter des {cryptocurrency} en pair à pair avec {provider}",
-  "TR_P2P_MODAL_LEGAL_HEADER": "Mentions légales",
-  "TR_P2P_MODAL_SECURITY_HEADER": "La sécurité avant tout avec votre Trezor",
-  "TR_P2P_MODAL_TERMS_1": "Vous êtes ici pour acheter des cryptomonnaies à une autre personne de votre choix en utilisant la technologie Peer-to-Peer (P2P) sans vérification d’identité. Si vous avez été dirigé vers ce site pour toute autre raison, veuillez contacter l’assistance avant de poursuivre.",
-  "TR_P2P_MODAL_TERMS_2": "Vous comprenez que les transactions de cryptomonnaies sont irréversibles et ne peuvent être remboursées. Par conséquent, les fonds perdus de manière frauduleuse ou accidentelle peuvent être irrécupérables.",
-  "TR_P2P_MODAL_TERMS_4": "Vous comprenez qu’Invity ne fournit pas ce service. Les conditions de {provider} régissent le service.",
-  "TR_P2P_MODAL_TERMS_5": "Vous n’utilisez pas cette fonctionnalité à des fins de jeux d’argent, de fraude ou de toute autre violation des conditions de service d’Invity ou du fournisseur, ou de toute réglementation applicable.",
-  "TR_P2P_MODAL_TERMS_6": "Vous comprenez que les cryptomonnaies représentent un instrument financier émergent et que les réglementations peuvent varier d’une juridiction à l’autre. Cela peut vous exposer à un risque plus élevé de fraude, de vol ou d’instabilité du marché.",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "Partenaires vérifiés par Invity",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "La transaction doit être effectuée dans ce délai, à compter de la création d’un contrat sur le site de {providerName}.",
-  "TR_P2P_PRICE": "Prix pour 1 {symbol}",
-  "TR_P2P_PRICE_TOOLTIP": "Prix en {symbol} proposé par cet utilisateur.",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "Bonjour, j’utilise {providerName} !",
-  "TR_P2P_USER_REPUTATION": "({rating}, {numberOfTrades})",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "Le montant choisi de {amount} est supérieur au maximum accepté de {maximum}.",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "Le montant choisi de {amount} est inférieur au minimum accepté de {minimum}.",
   "TR_PAGINATION_NEWER": "Plus récent",
   "TR_PAGINATION_OLDER": "Ancien",
   "TR_PASSPHRASE_CASE_SENSITIVE": "Remarque : la phrase secrète est sensible à la casse.",
@@ -1398,6 +1427,8 @@
   "TR_PASSPHRASE_MISMATCH": "Erreur de phrases secrètes",
   "TR_PASSPHRASE_MISMATCH_DESCRIPTION": "Les phrases secrètes ne sont pas identiques. Pour des raisons de sécurité, recommencez et saisissez-les correctement.",
   "TR_PASSPHRASE_MISMATCH_START_OVER": "Recommencer",
+  "TR_PASSPHRASE_NON_ASCII_CHARS": "Nous vous recommandons d’utiliser les caractères suivants : <code>ABC</code>, <code>abc</code>, <code>123</code>, <code>espaces</code> ou <code>ces caractères spéciaux</code>",
+  "TR_PASSPHRASE_NON_ASCII_CHARS_WARNING": "L’utilisation de caractères spéciaux non répertoriés risque de compromettre la compatibilité future",
   "TR_PASSPHRASE_TOO_LONG": "La longueur de la phrase secrète a dépassé la limite autorisée.",
   "TR_PASSPHRASE_WALLET": "Portefeuille protégé par une phrase secrète n° {id}",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT": "Découvrir comment fonctionne une phrase secrète",
@@ -1439,15 +1470,30 @@
   "TR_PIN_SUBHEADING": "L’utilisation d’un code PIN fort protège votre Trezor contre tout accès physique non autorisé.",
   "TR_PLAY_IT_SAFE": "Jouons la carte de la sécurité",
   "TR_PLEASE_ALLOW_YOUR_CAMERA": "Veuillez autoriser votre appareil photo à scanner un code QR.",
-  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Veuillez connecter votre dispositif pour continuer le processus de vérification.",
+  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Connectez votre Trezor pour continuer le processus de vérification.",
   "TR_PLEASE_ENABLE_PASSPHRASE": "Veuillez activer la fonctionnalité de phrase secrète pour continuer le processus de vérification.",
   "TR_POLICY_ID_ADDRESS": "Identifiant de politique :",
   "TR_PRIMARY_FIAT": "Devise Fiat",
   "TR_PRIVATE": "Confidentiel",
   "TR_PRIVATE_DESCRIPTION": "Confidentialité au moins au niveau {targetAnonymity}",
+  "TR_PROCEED_UNVERIFIED_ADDRESS": "Poursuivre avec une adresse non vérifiée",
   "TR_PROMO_BANNER_DASHBOARD": "<underline>Le portefeuille matériel le plus pratique</underline> <rest>pour gérer vos cryptomonnaies en toute sécurité</rest>",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM": "Confirmez sur Trezor avant de procéder à la numérisation",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM_EXPLANATION": "Veuillez tout d’abord confirmer l’adresse de réception sur votre dispositif Trezor, car son affichage fiable ne peut pas être piraté.",
+  "TR_QUICK_ACTION_DEBUG_EAP_EXPERIMENTAL_ENABLED": "Activé",
+  "TR_QUICK_ACTION_TOOLTIP_JUST_UPDATED": "Mise à jour terminée ({currentVersion})",
+  "TR_QUICK_ACTION_TOOLTIP_RESTART_TO_UPDATE": "Redémarrer pour mettre à jour",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_DEVICE": "Dispositif Trezor",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_SUITE": "Trezor Suite",
+  "TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE": "Mise à jour disponible ({newVersion})",
+  "TR_QUICK_ACTION_TOOLTIP_UP_TO_DATE": "À jour ({currentVersion})",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED": "Trezor Suite a téléchargé une nouvelle mise à jour.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED": "Trezor Suite a été mis à jour.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE": "Une mise à jour de Trezor Suite est désormais disponible",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE": "Redémarrer et mettre à jour",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE": "Lancer la mise à jour",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE": "Une mise à jour de Trezor est désormais disponible",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW": "Nouveautés",
   "TR_RANDOM_SEED_WORDS_DISCLAIMER": "Il se peut qu’on vous demande de saisir certains mots qui ne font pas partie de la sauvegarde de votre portefeuille",
   "TR_RANGE": "plage",
   "TR_READ_AND_UNDERSTOOD": "J’ai lu et compris ce qui précède",
@@ -1511,7 +1557,7 @@
   "TR_SECURITY_CHECKPOINT_GOT_SEED": "Avez-vous la sauvegarde de votre portefeuille ?",
   "TR_SECURITY_CHECK_HOLOGRAM": "Veuillez noter que l’emballage des dispositifs, y compris les hologrammes et les sceaux de sécurité, a été mis à jour au fil du temps. Vous pouvez vérifier les détails de l’emballage <packaging>ici</packaging>. Assurez-vous que votre dispositif a été acheté auprès de la boutique officielle Trezor Shop ou de l’un de <reseller>nos revendeurs de confiance</reseller>. Dans le cas contraire, il y a un risque que votre dispositif soit une contrefaçon. Si vous avez un doute sur l’authenticité de votre dispositif, veuillez <support>contacter l’assistance Trezor</support>.",
   "TR_SECURITY_FEATURES_COMPLETED_N": "Sécurité ({n} sur {m})",
-  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "Les dispositifs configurés en mode sans seed de récupération ne peuvent pas accéder à Trezor Suite. Ceci permet d’éviter la perte irréversible de coins, qui se produit lorsqu’un dispositif mal configuré est utilisé à des fins inappropriées.",
+  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "Les dispositifs configurés en mode sans seed de récupération ne peuvent pas accéder à Trezor Suite pour éviter la perte irréversible de coins, qui peut se produire si un dispositif est utilisé de manière incorrecte.",
   "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE": "La configuration sans seed de récupération n’est pas prise en charge par Trezor Suite",
   "TR_SEED_BACKUP_LENGTH": "Votre sauvegarde du portefeuille peut contenir 12, 18 ou 24 mots.",
   "TR_SEED_BACKUP_LENGTH_INCLUDING_SHAMIR": "Votre sauvegarde du portefeuille peut contenir 12, 18, 20, 24 ou 33 mots.",
@@ -1522,12 +1568,15 @@
   "TR_SEED_WORDS_ENTER_COMPUTER": "Entrez les mots de votre sauvegarde du portefeuille dans l’ordre affiché sur votre Trezor.",
   "TR_SEED_WORDS_ENTER_TOUCHSCREEN": "À l’aide de l’écran tactile, saisissez tous les mots dans le bon ordre jusqu’à ce que vous ayez terminé.",
   "TR_SEE_DETAILS": "Voir les détails",
+  "TR_SEE_IF_ISSUE_PERSISTS": "Vérifiez si le problème persiste.",
   "TR_SELECTED": "{amount} sélectionné",
   "TR_SELECT_COIN_FOR_SETTINGS": "Sélectionnez le coin actif pour modifier les paramètres",
   "TR_SELECT_DEVICE": "Sélectionner un dispositif",
+  "TR_SELECT_NAME_OR_ADDRESS": "Rechercher par nom, symbole, réseau ou adresse de contrat",
   "TR_SELECT_NUMBER_OF_WORDS": "Sélectionnez le nombre de mots dans votre sauvegarde du portefeuille",
   "TR_SELECT_PASSPHRASE_SOURCE": "Sélectionnez l’endroit où vous souhaitez entrer la phrase secrète en cliquant sur « {deviceLabel} ».",
   "TR_SELECT_RECOVERY_METHOD": "Sélectionner la méthode de récupération",
+  "TR_SELECT_TOKEN": "Sélectionner un jeton",
   "TR_SELECT_TREZOR": "Sélectionner Trezor",
   "TR_SELECT_TREZOR_TO_CONTINUE": "Sélectionnez votre Trezor pour continuer.",
   "TR_SELECT_TYPE": "Sélectionnez le type",
@@ -1558,11 +1607,11 @@
   "TR_SELL_MODAL_FOR_YOUR_SAFETY": "Vendez des {cryptocurrency} avec {provider}",
   "TR_SELL_MODAL_LEGAL_HEADER": "Mentions légales",
   "TR_SELL_MODAL_SECURITY_HEADER": "La sécurité avant tout avec votre Trezor",
-  "TR_SELL_MODAL_TERMS_1": "Vous êtes ici pour vendre des cryptomonnaies. Si vous avez été dirigé vers ce site pour toute autre raison, veuillez contacter l’assistance avant de poursuivre.",
+  "TR_SELL_MODAL_TERMS_1": "Vous êtes ici pour vendre des cryptomonnaies. Si vous avez été dirigé vers ce site pour toute autre raison, veuillez contacter l’assistance Trezor avant de poursuivre.",
   "TR_SELL_MODAL_TERMS_2": "Vous vendez des cryptomonnaies pour votre propre compte. Vous reconnaissez que les politiques du fournisseur peuvent nécessiter une vérification d’identité.",
   "TR_SELL_MODAL_TERMS_3": "Vous comprenez que les transactions de cryptomonnaies sont irréversibles et ne peuvent être remboursées. Par conséquent, les fonds perdus de manière frauduleuse ou accidentelle peuvent être irrécupérables.",
   "TR_SELL_MODAL_TERMS_4": "Vous comprenez qu’Invity ne fournit pas ce service. Les conditions de {provider} régissent le service.",
-  "TR_SELL_MODAL_TERMS_5": "Vous n’utilisez pas cette fonctionnalité à des fins de jeux d’argent, de fraude ou de toute autre violation des conditions de service d’Invity ou du fournisseur, ou de toute réglementation applicable.",
+  "TR_SELL_MODAL_TERMS_5": "Je n’utilise pas cette fonctionnalité à des fins de jeux d’argent, de fraude ou de toute autre activité qui violerait les conditions de service d’Invity ou du fournisseur, ou toute loi applicable.",
   "TR_SELL_MODAL_TERMS_6": "Vous comprenez que les cryptomonnaies représentent un instrument financier émergent et que les réglementations peuvent varier d’une juridiction à l’autre. Cela peut vous exposer à un risque plus élevé de fraude, de vol ou d’instabilité du marché.",
   "TR_SELL_MODAL_VERIFIED_PARTNERS_HEADER": "Partenaires vérifiés par Invity",
   "TR_SELL_REGISTER": "Inscription",
@@ -1571,10 +1620,6 @@
   "TR_SELL_STATUS_ERROR": "Rejeté",
   "TR_SELL_STATUS_PENDING": "En attente",
   "TR_SELL_STATUS_SUCCESS": "Approuvé",
-  "TR_SELL_TRANS_ID": "Identifiant trans. :",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "Le maximum est {maximum} {currency}",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "Le minimum est {minimum} {currency}",
-  "TR_SELL_VIEW_DETAILS": "Afficher les détails",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "Épargne",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "Location",
   "TR_SENDING_SYMBOL": "Envoi de {multiple, select, true {plusieurs jetons} false {{symbol}} other {{symbol}}}",
@@ -1629,6 +1674,8 @@
   "TR_SHOW_LOG": "Afficher le journal",
   "TR_SHOW_MORE": "Afficher plus",
   "TR_SHOW_MORE_ADDRESSES": "Afficher plus ({count})",
+  "TR_SHOW_ON_TRAY": "Afficher l’icône dans la barre d’état",
+  "TR_SHOW_ON_TRAY_DESCRIPTION": "Vérifiez si Trezor Suite fonctionne en arrière-plan.",
   "TR_SHOW_UNVERIFIED_ADDRESS": "Afficher l’adresse non vérifiée",
   "TR_SHOW_UNVERIFIED_XPUB": "Afficher la clé publique non vérifiée",
   "TR_SIDEBAR_ADD_COIN": "Ajouter un coin",
@@ -1641,7 +1688,9 @@
   "TR_SIZE": "Taille",
   "TR_SKIP": "Ignorer",
   "TR_SKIP_BACKUP": "Ignorer la sauvegarde",
+  "TR_SKIP_BACKUP_DESCRIPTION": "Une sauvegarde de portefeuille vous permet de récupérer vos fonds si votre Trezor est perdu, volé ou endommagé. Sans sauvegarde, vous pourriez perdre définitivement l’accès à vos cryptos.",
   "TR_SKIP_PIN": "Ignorer le code PIN",
+  "TR_SKIP_PIN_DESCRIPTION": "Un code PIN sur le dispositif empêche l’accès non autorisé à votre Trezor. Sans lui, toute personne possédant votre dispositif peut accéder à vos fonds.",
   "TR_SKIP_ROUNDS": "Tour ignoré",
   "TR_SKIP_ROUNDS_DESCRIPTION": "En permettant d’ignorer les tours, il est plus difficile de prouver une quelconque relation entre vos entrées. Cela signifie que vous pouvez encore mieux dissimuler l’origine des fonds.",
   "TR_SKIP_ROUNDS_HEADING": "Autoriser Trezor à ignorer des tours",
@@ -1654,6 +1703,7 @@
   "TR_STAKE_ADDING_TO_POOL": "Ajout au pool de staking",
   "TR_STAKE_ANY_AMOUNT_ETH": "Stakez un montant minimum de {amount} {symbol} et commencez à obtenir des récompenses. Avec notre taux APY actuel de {apyPercent} %, vos récompenses gagnent également !",
   "TR_STAKE_APY": "Rendement annuel en pourcentage (APY)",
+  "TR_STAKE_APY_ABBR": "APY",
   "TR_STAKE_APY_DESC": "* Rendement annuel en pourcentage (APY)",
   "TR_STAKE_AVAILABLE": "Disponible",
   "TR_STAKE_CAN_CLAIM_WARNING": "Vous pouvez déjà demander {amount} {symbol}. {br}Veuillez demander ou attendre le traitement d’un nouvel unstake.",
@@ -1663,15 +1713,18 @@
   "TR_STAKE_CLAIM_AFTER_UNSTAKING": "Vous pouvez faire une demande une fois la période d’unstaking terminée.",
   "TR_STAKE_CLAIM_IN_NEXT_BLOCK": "dans le bloc suivant",
   "TR_STAKE_CLAIM_PENDING": "Demande en cours",
+  "TR_STAKE_CLAIM_UNSTAKED": "Réclamer des actifs {symbol} unstakés",
   "TR_STAKE_CONFIRM_AND_STAKE": "Confirmer et staker",
   "TR_STAKE_CONFIRM_ENTRY_PERIOD": "Confirmez la période d’entrée",
   "TR_STAKE_CONSENT_TO_STAKING_WITH_EVERSTAKE": "Je reconnais et j’accepte de staker avec Everstake",
   "TR_STAKE_DAYS": "{count, plural, one {# jour} other {# jours}}",
   "TR_STAKE_DELEGATED": "Délégation du staking",
   "TR_STAKE_DEREGISTERED": "Annulation de l’enregistrement d’une adresse de staking",
+  "TR_STAKE_EARN_REWARDS_WEEKLY": "Gagnez des récompenses chaque semaine",
   "TR_STAKE_ENTERING_POOL_MAY_TAKE": "L’entrée dans le pool de staking peut prendre jusqu’à {count, plural, one {# jour} other {# jours}}",
+  "TR_STAKE_ENTER_THE_STAKING_POOL": "Entrer dans le pool de staking",
   "TR_STAKE_ETH": "Staker de l’Ethereum",
-  "TR_STAKE_ETH_CARD_TITLE": "Le moyen le plus simple de gagner des {symbol}.",
+  "TR_STAKE_ETH_CARD_TITLE": "Le moyen le plus simple de gagner des {symbol}",
   "TR_STAKE_ETH_EARN_REPEAT": "Stakez. Gagnez des récompenses. Recommencez.",
   "TR_STAKE_ETH_EVERSTAKE": "Trezor et Everstake",
   "TR_STAKE_ETH_EVERSTAKE_DESC": "Everstake est un leader et fournisseur mondial de technologie de staking",
@@ -1682,17 +1735,21 @@
   "TR_STAKE_ETH_REWARDS_EARN": "Vos récompenses aussi ont des récompenses. Continuez à les staker et voyez vos récompenses {symbol} affluer.",
   "TR_STAKE_ETH_REWARDS_EARN_APY": "Vos récompenses {symbol} bénéficient également du taux d’APY. Gardez vos fonds stakés ou ajoutez-en davantage pour augmenter vos récompenses.",
   "TR_STAKE_ETH_SEE_MONEY_DANCE": "Regardez votre argent se déchaîner",
-  "TR_STAKE_ETH_SEE_MONEY_DANCE_DESC": "Gagnez {apyPercent} % d’APY* en stakant votre Ethereum avec Trezor.",
+  "TR_STAKE_ETH_SEE_MONEY_DANCE_DESC": "Gagnez {apyPercent} % d’<t>APY</t> en stakant votre Ethereum avec Trezor.",
   "TR_STAKE_ETH_WILL_BE_BLOCKED": "Votre {symbol} sera bloqué pendant cette période et vous ne pourrez pas l’annuler. <a>En savoir plus</a>",
   "TR_STAKE_EVERSTAKE_MANAGES": "Everstake gère et protège votre {symbol} staké <t>grâce à son infrastructure, sa technologie et ses contrats intelligents.</t>",
   "TR_STAKE_INSTANT": "Instantané",
   "TR_STAKE_INSTANTLY_UNSTAKED_WITH_DAYS": "Vous recevrez {amount} {symbol} « instantanément ». {days, plural, =0 {} one {Le montant restant vous sera payé d’ici # jour.} other { Le montant restant vous sera payé d’ici # jours}}",
+  "TR_STAKE_IN_ACCOUNT": "{symbol} sur le compte",
   "TR_STAKE_LEARN_MORE": "En savoir plus",
+  "TR_STAKE_LEAVE_STAKING_POOL": "Quitter le pool de staking",
   "TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL": "Nous avons laissé {amount} {symbol} à votre disposition pour que vous puissiez payer vos frais de retrait.",
+  "TR_STAKE_LEFT_SMALL_AMOUNT_FOR_WITHDRAWAL": "Nous avons laissé une petite quantité d’actifs {symbol} à votre disposition pour que vous puissiez payer vos frais de retrait.",
   "TR_STAKE_MAX": "Max",
   "TR_STAKE_MAX_FEE_DESC": "Le tarif maximum correspond aux frais de transaction du réseau que vous êtes prêt à payer sur le réseau pour garantir le traitement de votre transaction.",
   "TR_STAKE_MAX_REWARD_DAYS": "{count, plural, one {# jour} other {# jours}} max.",
   "TR_STAKE_MIN_AMOUNT_TOOLTIP": "Le montant minimum à staker est de {amount} {symbol}",
+  "TR_STAKE_MONTHLY": "Mensuel",
   "TR_STAKE_NEXT_PAYOUT": "Prochain versement de récompenses",
   "TR_STAKE_NOT_ENOUGH_FUNDS": "{symbol} insuffisants pour payer les frais de réseau",
   "TR_STAKE_ONLY_REWARDS": "Uniquement des récompenses",
@@ -1704,6 +1761,8 @@
   "TR_STAKE_REGISTERED": "Enregistrement d’une adresse de staking",
   "TR_STAKE_RESTAKED_BADGE": "Restaké",
   "TR_STAKE_REWARDS": "Récompenses",
+  "TR_STAKE_SIGN_TRANSACTION": "Signer la transaction",
+  "TR_STAKE_SIGN_UNSTAKING_TRANSACTION": "Signer la transaction d’unstaking",
   "TR_STAKE_STAKE": "Staker",
   "TR_STAKE_STAKED_AMOUNT": "Montant staké",
   "TR_STAKE_STAKED_AND_EARNING": "Récompenses stakées et gains",
@@ -1711,6 +1770,7 @@
   "TR_STAKE_STAKE_MORE": "Staker davantage",
   "TR_STAKE_STAKING_IN_A_NUTSHELL": "Le staking en bref",
   "TR_STAKE_STAKING_IS": "Le staking consiste à verrouiller temporairement vos actifs Ethereum pour prendre en charge le fonctionnement de la blockchain. En guise de récompense, vous gagnerez un Ethereum supplémentaire.",
+  "TR_STAKE_STAKING_PROCESS": "Processus de staking",
   "TR_STAKE_START_STAKING": "Commencer à staker",
   "TR_STAKE_TIME_TO_CLAIM": "Délai de demande",
   "TR_STAKE_TOTAL_PENDING": "Total du staking en cours :",
@@ -1719,23 +1779,35 @@
   "TR_STAKE_UNSTAKED_AND_READY_TO_CLAIM": "Unstaké et prêt à être demandé",
   "TR_STAKE_UNSTAKE_TO_CLAIM": "Unstaker pour demander",
   "TR_STAKE_UNSTAKING": "Unstaking",
+  "TR_STAKE_UNSTAKING_APPROXIMATE": "Montant approximatif d’actifs {symbol} disponibles instantanément",
+  "TR_STAKE_UNSTAKING_APPROXIMATE_DESCRIPTION": "La liquidité du pool de staking peut permettre de débloquer instantanément certains fonds. Les fonds restants suivront la période d’unstaking.",
   "TR_STAKE_UNSTAKING_PERIOD": "Période d’unstaking",
+  "TR_STAKE_UNSTAKING_PROCESS": "Processus d’unstaking",
   "TR_STAKE_UNSTAKING_TAKES": "Actuellement, l’unskating prend {count, plural, one {# jour} other {# jours}}. Une fois l’opération terminée, vous pourrez l’échanger ou envoyer vos fonds.",
+  "TR_STAKE_WEEKLY": "Hebdomadaire",
   "TR_STAKE_WHAT_IS_STAKING": "Qu’est-ce que le staking ?",
+  "TR_STAKE_YEARLY": "Annuel",
   "TR_STAKE_YOUR_FUNDS_MAINTAINED": "Vos fonds stakés sont gérés par Everstake",
+  "TR_STAKING_AMOUNT_STAKED_INSTANTLY": "{amount} {symbol} staké(s) instantanément !",
+  "TR_STAKING_AMOUNT_UNSTAKED_INSTANTLY": "{amount} {symbol} unstaké(s) instantanément !",
+  "TR_STAKING_CONSOLIDATING_FUNDS": "Consolidation de vos {symbol} pour vous",
   "TR_STAKING_DELEGATE": "Déléguer",
   "TR_STAKING_DEPOSIT": "Dépôt remboursable",
   "TR_STAKING_DEPOSIT_FEE_DECRIPTION": "Les frais de dépôt sont de {feeAmount} ADA et sont nécessaires pour enregistrer votre adresse afin de commencer à staker. Si vous décidez d’unstaker votre Cardano, vous récupérerez le dépôt.",
+  "TR_STAKING_ESTIMATED_GAINS": "Gains estimés",
   "TR_STAKING_FEE": "Frais",
+  "TR_STAKING_GETTING_READY": "Vos {symbol} se préparent",
   "TR_STAKING_INSTANTLY_STAKED": "Vous avez staké {amount} {symbol} instantanément. {days, plural, =0 {} one {Les {symbol} restants seront stakés d’ici # jour.} other { Les {symbol} restants seront stakés d’ici # jours}}",
   "TR_STAKING_IS_NOT_SUPPORTED": "Le staking n’est pas pris en charge sur ce réseau.",
   "TR_STAKING_NOT_ENOUGH_FUNDS": "Vous n’avez pas assez de fonds sur votre compte.",
+  "TR_STAKING_ONCE_YOU_CONFIRM": "Une fois que vous confirmez",
   "TR_STAKING_ON_3RD_PARTY_DESCRIPTION": "En stakant dans un pool de staking de Trezor, vous soutenez directement l’écosystème Trezor et l’écosystème Cardano au sein de Trezor Suite.",
   "TR_STAKING_ON_3RD_PARTY_TITLE": "Vous déléguez dans un pool de staking tiers",
   "TR_STAKING_POOL_OVERSATURATED_DESCRIPTION": "Le pool de staking dans lequel vous déléguez est saturé. Veuillez déléguer à nouveau votre staking pour maximiser vos récompenses de staking",
   "TR_STAKING_POOL_OVERSATURATED_TITLE": "Le pool de staking est saturé",
   "TR_STAKING_REDELEGATE": "Déléguer à nouveau",
   "TR_STAKING_REWARDS": "Récompenses disponibles",
+  "TR_STAKING_REWARDS_ARE_RESTAKED": "Les récompenses sont automatiquement restakées",
   "TR_STAKING_REWARDS_DESCRIPTION": "Veuillez noter qu’il peut s’écouler jusqu’à 20 jours avant que vous ne receviez vos récompenses après l’enregistrement initial et la délégation du staking. Une fois cette période passée, vous recevrez votre récompense tous les 5 jours.",
   "TR_STAKING_REWARDS_TITLE": "Le staking du Cardano est actif",
   "TR_STAKING_STAKE_ADDRESS": "Votre adresse de staking",
@@ -1744,6 +1816,9 @@
   "TR_STAKING_TREZOR_POOL_FAIL": "Impossible d’atteindre le pool de staking de Trezor dans lequel déléguer.",
   "TR_STAKING_TX_PENDING": "Votre transaction {txid} a bien été envoyée à la blockchain et attend une confirmation.",
   "TR_STAKING_WITHDRAW": "Retirer",
+  "TR_STAKING_YOUR_EARNINGS": "Vos gains sont automatiquement restakés, ce qui vous permet de gagner des <a>intérêts composés</a>.",
+  "TR_STAKING_YOUR_UNSTAKED_FUNDS": "Vos {symbol} unstakés sont prêts",
+  "TR_STAKING_YOU_ARE_HERE": "Vous êtes là",
   "TR_STANDARD_WALLET_DESCRIPTION": "Aucune phrase secrète",
   "TR_START": "Début",
   "TR_START_AGAIN": "Redémarrer",
@@ -1752,6 +1827,7 @@
   "TR_START_COINJOIN": "Démarrer le Coinjoin",
   "TR_START_RECOVERY": "Démarrer la récupération",
   "TR_STEP": "Étape {number}",
+  "TR_STEP_OF_TOTAL": "Étape {index} sur {total}",
   "TR_STILL_DONT_SEE_YOUR_TREZOR": "Vous ne voyez toujours pas votre Trezor ?",
   "TR_STOP": "Arrêter",
   "TR_STOPPING": "Arrêt en cours",
@@ -1803,7 +1879,11 @@
   "TR_TOKENS_EMPTY": "Aucun jeton... pour l’instant.",
   "TR_TOKENS_EMPTY_CHECK_HIDDEN": "Aucun jeton. Les jetons peuvent être masqués.",
   "TR_TOKENS_SEARCH_TOOLTIP": "Rechercher par jeton, symbole ou adresse de contrat.",
+  "TR_TOKEN_NOT_FOUND": "Jeton introuvable",
+  "TR_TOKEN_NOT_FOUND_ON_NETWORK": "Jeton introuvable sur le réseau {networkName}.",
   "TR_TOKEN_TRANSFERS": "{standard} Transferts de jetons",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH": "Essayez une autre recherche.",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH_OR_SWITCH": "Essayez une autre recherche ou changez de réseau.",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR": "Jetons non reconnus",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR_TOOLTIP": "Les jetons non reconnus présentent des risques potentiels. Faites preuve de prudence.",
   "TR_TOO_LONG": "Le message est trop long",
@@ -1815,18 +1895,24 @@
   "TR_TOR_CONFIG_SNOWFLAKE_UPDATE_LABEL": "Mettre à jour le chemin d’accès",
   "TR_TOR_DESCRIPTION": "Acheminez l’ensemble du trafic de Trezor Suite via le réseau Tor, ce qui renforce votre confidentialité et votre sécurité. Le chargement de Tor et l’établissement d’une connexion peuvent prendre un certain temps.",
   "TR_TOR_DISABLE": "Désactiver Tor",
+  "TR_TOR_DISABLED": "Désactivé",
   "TR_TOR_DISABLE_ONIONS_ONLY": "Serveurs principaux personnalisés non onion manquants",
   "TR_TOR_DISABLE_ONIONS_ONLY_DESCRIPTION": "Veuillez ajouter des adresses de serveur principal personnalisé non-onion pour éviter ceci.",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_DESCRIPTION": "Vous pouvez maintenant désactiver Tor en toute sécurité.",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_TITLE": "Les serveurs principaux personnalisés n’utilisent plus uniquement des adresses onion.",
   "TR_TOR_DISABLE_ONIONS_ONLY_RESOLVED": "Désactiver Tor",
   "TR_TOR_DISABLE_ONIONS_ONLY_TITLE": "Désactiver Tor maintenant réinitialise tous les serveurs principaux Onion aux serveurs Trezor par défaut.",
+  "TR_TOR_DISABLING": "Désactivation",
   "TR_TOR_ENABLE": "Activer Tor",
+  "TR_TOR_ENABLED": "Activé",
   "TR_TOR_ENABLE_AND_CONFIRM": "Activer Tor et confirmer",
   "TR_TOR_ENABLE_TITLE": "Activer Tor",
+  "TR_TOR_ENABLING": "Activation",
+  "TR_TOR_ERROR": "Erreur",
   "TR_TOR_IS_SLOW_MESSAGE": "Tor se connecte au réseau.<br></br>Patientez.",
   "TR_TOR_KEEP_RUNNING": "Continuer à exécuter Tor",
   "TR_TOR_KEEP_RUNNING_FOR_COIN_JOIN_SUBTITLE": "Veuillez sélectionner « Continuer à exécuter Tor » pour continuer ou « Arrêter Tor » pour quitter le processus Coinjoin.",
+  "TR_TOR_MISBEHAVING": "Mauvais comportement",
   "TR_TOR_REMOVE_ONION_AND_DISABLE": "Désactiver Tor et basculer vers les serveurs principaux par défaut",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_LEAVE": "Quitter",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_SUBTITLE": "Sélectionnez « Activer Tor » pour continuer ou « Quitter » pour quitter le processus.",
@@ -1841,11 +1927,7 @@
   "TR_TO_BTC": "En BTC",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "Pour rendre vos étiquettes cohérentes et disponibles sur différents dispositifs, connectez-vous au fournisseur de services de stockage cloud.",
   "TR_TO_SATOSHIS": "En sats",
-  "TR_TRADE_BUYS": "achète",
-  "TR_TRADE_ENTER_COIN": "Saisissez le nom ou le symbole de la crypto…",
-  "TR_TRADE_EXCHANGES": "échange",
   "TR_TRADE_REDIRECTING": "Redirection...",
-  "TR_TRADE_SELLS": "vend",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "L’historique des transactions n’est pas disponible",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "Astuce : vous pouvez rechercher des ID de transaction, des adresses, des jetons, des étiquettes, des montants et des dates.",
   "TR_TRANSACTIONS_SEARCH_TIP_10": "Astuce : combinez les opérateurs AND (&) et OR (|) pour des recherches plus complexes. Par exemple, <strong>> {lastYear}-01-01 & < {lastYear}-01-31 | > {lastYear}-12-01 & < {lastYear}-12-31</strong> afficheront toutes les transactions effectuées en janvier ou décembre {lastYear}.",
@@ -1860,6 +1942,7 @@
   "TR_TRANSACTIONS_SEARCH_TOOLTIP": "Recherchez par identifiant de transaction, étiquette ou montant ou utilisez des opérateurs tels que < > | & = !=.",
   "TR_TRANSACTION_DETAILS": "Détails",
   "TR_TREZOR_BRIDGE_RUNNING_VERSION": "Version actuelle de Trezor Bridge : {version}",
+  "TR_TREZOR_CONNECT": "Trezor Connect",
   "TR_TREZOR_DEVICE_TUTORIAL_CANCELED_HEADING": "Tutoriel annulé",
   "TR_TREZOR_DEVICE_TUTORIAL_COMPLETED_HEADING": "Tutoriel terminé",
   "TR_TREZOR_DEVICE_TUTORIAL_DESCRIPTION": "Découvrez comment utiliser votre dispositif à l’aide d’un court tutoriel",
@@ -1867,32 +1950,40 @@
   "TR_TROUBLESHOOTING_CLOSE_TABS": "Fermer les autres onglets et fenêtres qui pourraient utiliser votre Trezor",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION": "Après la fermeture d’autres onglets et fenêtres, essayez de rafraîchir cette page.",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION_DESKTOP": "Après avoir fermé d’autres onglets et fenêtres du navigateur, essayez de quitter et de rouvrir l’application Trezor Suite.",
-  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Étapes requises pour permettre la communication",
+  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Essayez ces étapes pour résoudre le problème.",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_DESCRIPTION": "Consultez <a>la page d’état de Trezor Bridge</a>",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_TITLE": "Assurez-vous que le processus Trezor Bridge est en cours d’exécution",
-  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Seuls les navigateurs basés sur Chromium permettent actuellement une communication directe avec les dispositifs USB",
+  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Seuls les navigateurs basés sur Chromium permettent actuellement une communication directe avec les dispositifs USB.",
   "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_TITLE": "Utilisez un navigateur basé sur Chromium",
   "TR_TROUBLESHOOTING_TIP_CABLE_DESCRIPTION": "Le câble doit être complètement inséré. Dans le cas d’un dispositif connecté en USB-C, le câble doit « se clipser ».",
   "TR_TROUBLESHOOTING_TIP_CABLE_TITLE": "Essayez un autre câble",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_DESCRIPTION": "Avec Trezor Bridge installé.",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_TITLE": "Si possible, essayez d’utiliser un autre ordinateur",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Juste au cas où",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Essayez de redémarrer votre ordinateur",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Le redémarrage de votre ordinateur peut résoudre le problème de communication entre votre navigateur et votre dispositif.",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Redémarrez votre ordinateur",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_DESCRIPTION": "Lancez l’application de bureau <a>Trezor Suite</a>",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE": "Utilisez l’application de bureau Trezor Suite",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_DESCRIPTION": "<a>Cliquez pour accéder</a> à une autre implémentation du bridge. Version actuelle : ({currentVersion})",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_TITLE": "Utilisez une autre version de Trezor Bridge",
   "TR_TROUBLESHOOTING_TIP_UDEV_INSTALL_DESCRIPTION": "Essayez d’installer les <a>règles udev</a>. Assurez-vous d’abord de les enregistrer sur le bureau avant d’ouvrir.",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_DESCRIPTION": "Si la dernière mise à jour du micrologiciel de votre dispositif date de 2019 ou d’avant, veuillez suivre les instructions de la <a>base de connaissances</a>.",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_TITLE": "Il semble que vous utilisiez une ancienne version de Trezor.",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_DESCRIPTION": "Connectez-le directement à l’ordinateur (sans hub USB).",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_TITLE": "Essayez un port USB différent",
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "Installer les règles automatiquement",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "Règles udev manquantes",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "État inattendu : {error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "Votre dispositif est connecté correctement, mais votre navigateur ne peut pas communiquer avec celui-ci pour le moment. Vous devez installer Trezor Bridge.",
   "TR_TRY_AGAIN": "Réessayez",
   "TR_TXID": "TX ID",
   "TR_TXID_RBF": "Identifiant TX d’origine à remplacer",
   "TR_TX_CONFIRMATIONS": "{confirmationsCount}x",
   "TR_TX_CONFIRMED": "Transaction confirmée",
   "TR_TX_CONFIRMING": "Confirmation de la transaction",
+  "TR_TX_DATA_FUNCTION": "Fonction",
+  "TR_TX_DATA_INPUT_DATA": "Données d’entrée",
+  "TR_TX_DATA_METHOD": "Données d’entrée",
+  "TR_TX_DATA_METHOD_NAME": "Nom de la méthode",
+  "TR_TX_DATA_PARAMS": "Paramètres",
   "TR_TX_DEPOSIT": "Dépôt",
   "TR_TX_FEE": "Frais",
   "TR_TX_TAB_AMOUNT": "Montant",
@@ -1932,13 +2023,18 @@
   "TR_UPDATE_FIRMWARE_HOMESCREEN_LATER_TOOLTIP": "Mise à jour du micrologiciel requise. Vous pouvez modifier votre écran d’accueil ultérieurement dans la page des paramètres",
   "TR_UPDATE_FIRMWARE_HOMESCREEN_TOOLTIP": "Mettez à jour votre micrologiciel pour modifier votre écran d’accueil",
   "TR_UPDATE_MODAL_AVAILABLE_HEADING": "Mise à jour disponible",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES": "Activer les mises à jour automatiques",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG": "Nouveau",
   "TR_UPDATE_MODAL_INSTALL_AND_RESTART": "Mettre à jour et redémarrer",
   "TR_UPDATE_MODAL_INSTALL_NOW_OR_LATER": "Installer la mise à jour maintenant ?",
   "TR_UPDATE_MODAL_NOT_NOW": "Pas maintenant",
-  "TR_UPDATE_MODAL_RESTART_NEEDED": "Cela nécessite un redémarrage de Trezor Suite",
+  "TR_UPDATE_MODAL_RESTART_NEEDED": "Cela nécessite un redémarrage de Trezor Suite.",
   "TR_UPDATE_MODAL_START_DOWNLOAD": "Télécharger",
   "TR_UPDATE_MODAL_UPDATE_DOWNLOADED": "Mise à jour téléchargée",
   "TR_UPDATE_MODAL_UPDATE_ON_QUIT": "Mettre à jour lors de la fermeture",
+  "TR_UPDATE_MODAL_WHATS_NEW": "Nouveautés",
+  "TR_UPDATE_MODAL_YOUR_VERSION": "Votre version : v{version}",
+  "TR_UPGRADE_FIRMWARE_TO_DISCOVER_ACCOUNT_ERROR": "Mettez à jour votre micrologiciel pour accéder à ce compte. Voir la bannière bleue ci-dessus.",
   "TR_UP_TO": "jusqu’à",
   "TR_UP_TO_DATE": "À jour",
   "TR_UP_TO_DAYS": "jusqu’à {count, plural, one {# jour} other {# jours}}",
@@ -1992,6 +2088,7 @@
   "TR_WALLET_SELECTION_ACCESS_HIDDEN_WALLET": "Accéder au portefeuille protégé par une phrase secrète",
   "TR_WALLET_SELECTION_HIDDEN_WALLET": "Portefeuille masqué",
   "TR_WELCOME_TO_TREZOR_TEXT_WALLET_CREATION": "Créez un nouveau portefeuille ou récupérez-en un en utilisant votre sauvegarde du portefeuille.",
+  "TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE": "Nous nous efforçons toujours d’améliorer votre expérience Trezor. Découvrez les nouveautés :",
   "TR_WEST": "Ouest",
   "TR_WHAT_DATA_WE_COLLECT": "Quelles données recueillons-nous ?",
   "TR_WHAT_IS_PASSPHRASE": "En savoir plus sur la différence",
@@ -2002,7 +2099,7 @@
   "TR_WIPE_DEVICE_CHECKBOX_2_TITLE": "Je comprends que je dois avoir une sauvegarde de ma sauvegarde du portefeuille afin de retrouver l’accès à mes fonds",
   "TR_WIPE_DEVICE_TEXT": "La réinitialisation du dispositif supprime toutes ses données. Réinitialisez votre dispositif uniquement si vous disposez d’une sauvegarde de votre portefeuille, laquelle vous permet de restaurer l’accès à vos fonds.",
   "TR_WIPE_OR_UPDATE": "Réinitialiser le dispositif ou mettre à jour le micrologiciel",
-  "TR_WIPE_OR_UPDATE_DESCRIPTION": "Accéder aux paramètres du dispositif",
+  "TR_WIPE_OR_UPDATE_DESCRIPTION": "Accédez aux paramètres du dispositif.",
   "TR_WIPING_YOUR_DEVICE": "La réinitialisation aux paramètres d’usine efface la mémoire du dispositif et toutes les informations, y compris la sauvegarde du portefeuille et le code PIN. Procédez à une réinitialisation d’usine uniquement si vous disposez d’une sauvegarde de votre portefeuille, laquelle est nécessaire pour restaurer l’accès à vos fonds.",
   "TR_WORDS": "{count} mots",
   "TR_WORD_DOES_NOT_EXIST": "Le mot « {word} » n’existe pas dans la liste de mots BIP39.",
diff --git a/packages/suite-data/files/translations/hu.json b/packages/suite-data/files/translations/hu.json
index 4397cce8e98..e52fdd09966 100644
--- a/packages/suite-data/files/translations/hu.json
+++ b/packages/suite-data/files/translations/hu.json
@@ -193,7 +193,6 @@
   "TR_404_GO_TO_DASHBOARD": "Tovább az Irányítópultra",
   "TR_404_TITLE": "404-es hiba: Az oldal nem található",
   "TR_7D_CHANGE": "7 napos változás",
-  "TR_ABORT": "Megszakítás",
   "TR_ACCESS_HIDDEN_WALLET": "Hozzáférés rejtett tárcához",
   "TR_ACCESS_STANDARD_WALLET": "Hozzáférés a standard tárcához",
   "TR_ACCOUNT_DETAILS_HEADER": "Fiók részletei",
@@ -297,6 +296,8 @@
   "TR_ALLOW_ANALYTICS_DESCRIPTION": "Minden adatot szigorúan anonim módon kezelünk; csak a Trezor ökoszisztéma fejlesztésére használjuk őket.",
   "TR_ALLOW_AUTOMATIC_SUITE_UPDATES": "Automatikus Trezor Suite frissítések",
   "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "A Trezor Suite automatikusan letölti a legújabb verziót a háttérben, és az alkalmazás újraindításakor telepíti azt. Ez biztosítja, hogy mindig naprakész legyél a legújabb funkciókkal és biztonsági javításokkal. A frissítések az engedélyed nélkül történnek.",
+  "TR_ALL_NETWORKS": "Minden hálózat ({networkCount})",
+  "TR_ALL_NETWORKS_TOOLTIP": "Mind a(z) {networkCount} hálózat tokenjeinek megtekintése. A legnépszerűbb hálózatok alapján a jobb oldalon tudsz szűrni.",
   "TR_ALL_TRANSACTIONS": "Tranzakciók",
   "TR_AMOUNT_SENT": "Küldött összeg",
   "TR_AMOUNT_TOO_BIG_FOR_COINJOIN": "Nem elérhető a coinjoin számára - az összeg túl nagy.",
@@ -333,7 +334,7 @@
   "TR_BACKSPACE": "Visszatörlés",
   "TR_BACKUP": "Tárca biztonsági mentés",
   "TR_BACKUP_CHECKBOX_1_DESCRIPTION": "Győződj meg róla, hogy minden szót pontosan a megadott sorrendben jegyeztél fel. Gondoskodj róla, hogy a seed-ed ne legyen vizes, vagy elmosódott.",
-  "TR_BACKUP_CHECKBOX_1_TITLE": "Mielőtt pénzt küldesz a tárcára, ellenőrizd a biztonsági mentést az eszközbeállításokban.",
+  "TR_BACKUP_CHECKBOX_1_TITLE": "A tárca biztonsági mentése lehetővé teszi a pénzed visszaszerzését a Trezor elvesztése vagy sérülése esetén.",
   "TR_BACKUP_CHECKBOX_2_DESCRIPTION": "Ne mentsd a seededet a telefonodba vagy bármely egyéb meghackelhető eszközbe, ide értve a felhő alapú szolgáltatásokat is.",
   "TR_BACKUP_CHECKBOX_2_TITLE": "Semmi esetre se készíts fotót vagy digitális másolatot a biztonsági mentésedről.",
   "TR_BACKUP_CHECKBOX_3_DESCRIPTION": "Jól rejtsd el és használj megfelelő óvintézkedéseket, hogy rajtad kívül más ne láthassa a seededet.",
@@ -345,8 +346,8 @@
   "TR_BACKUP_RECOVERY_SEED": "Biztonsági mentés",
   "TR_BACKUP_RECOVERY_SEED_FAILED_DESC": "Sikertelen biztonsági mentés. Erősen ajánlott a biztonsági mentés készítése. A következő linken megismerheted hogyan hozható létre a tárca biztonsági mentése.",
   "TR_BACKUP_RECOVERY_SEED_FAILED_TITLE": "Tárca biztonsági mentés sikertelen",
-  "TR_BACKUP_SEED_IS_ULTIMATE": "Ha valaha is vissza kell állítanod a tárcádat, hogy hozzáférj a pénzedhez, akkor mindenképpen szükséged lesz a tárca biztonsági mentésére. Ne veszítsd vagy tüntesd el. Ha elveszett, elveszett. Senki, még a Trezor ügyfélszolgálat sem tud segíteni a visszaállításában. Légy felelősségteljes és gondoskodj róla, hogy a tárca biztonsági mentését biztonságosan tárold, és úgy kezeld, mintha az életed múlna rajta.",
-  "TR_BACKUP_SUBHEADING_1": "A tárca biztonsági mentése a Trezor által véletlenszerűen generált szavak listája. Fontos, hogy leírd és biztonságban tárold a biztonsági mentést, mert csak ennek segítségével állíthatod helyre a tárcádat és férhetsz hozzá a pénzedhez.",
+  "TR_BACKUP_SEED_IS_ULTIMATE": "Ha valaha is vissza kell állítanod a tárcádat, hogy hozzáférj a pénzedhez, akkor mindenképpen szükséged lesz a tárca biztonsági mentésére. Ne veszítsd vagy kótyavetyéld el. Ha elveszett, elveszett. Senki, még a Trezor ügyfélszolgálat sem tud segíteni a visszaállításában. Légy felelősségteljes és gondoskodj róla, hogy a tárca biztonsági mentését biztonságosan tárold, és úgy kezeld, mintha az életed múlna rajta.",
+  "TR_BACKUP_SUBHEADING_1": "A tárca biztonsági mentése a Trezorod által véletlenszerűen generált szavak listája. Fontos, hogy leírd és biztonságban tárold a biztonsági mentést, mert csak ennek segítségével állíthatod helyre a tárcádat és férhetsz hozzá a pénzedhez.",
   "TR_BACKUP_SUCCESSFUL": "Sikeres biztonsági mentés",
   "TR_BALANCE": "Egyenleg",
   "TR_BASIC_RECOVERY": "Normál helyreállítás",
@@ -365,10 +366,9 @@
   "TR_BTC_UNITS": "Bitcoin alapegység",
   "TR_BUG": "Hiba",
   "TR_BUMP_FEE": "Tranzakciós díj emelése",
+  "TR_BUMP_FEE_DISABLED_TOOLTIP": "A tranzakcióid gyorsítása érdekében növeld meg a sorban lévő (nonce szerint) legrégebbi függőben lévő tranzakció díját. A tranzakciókat sorrendben kell megerősíteni. <a>További információk</a>",
   "TR_BUY": "Vásárlás",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "Adásvételi tranzakciók",
   "TR_BUY_BUY": "Vásárlás",
-  "TR_BUY_BUY_AGAIN": "Vásárlás újra",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Jóváhagyva a Trezoron",
   "TR_BUY_DETAIL_ERROR_BUTTON": "Vissza a fiókhoz",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "Ugrás a szolgáltató ügyféltámogatási oldalára",
@@ -395,10 +395,10 @@
   "TR_BUY_MODAL_SECURITY_HEADER": "Első a biztonság a Trezorral",
   "TR_BUY_MODAL_TERMS_1": "Azért vagy itt, hogy kriptovalutát vásárolj. Ha más okból lettél erre az oldalra irányítva, kérlek lépj kapcsolatba a(z) {provider} ügyfélszolgálatával, mielőtt továbblépnél.",
   "TR_BUY_MODAL_TERMS_2": "Ezt a funkciót olyan pénzeszközök vásárlására használod, amelyek a közvetlen személyes felügyeleted alatt álló fiókba lesznek küldve.",
-  "TR_BUY_MODAL_TERMS_3": "Megértetted hogy a kriptovaluta tranzakciók visszafordíthatatlanok és nem téríthetők vissza. Emiatt a csalárd vagy véletlen veszteségek sem visszaszerezhetők.",
+  "TR_BUY_MODAL_TERMS_3": "Megértettem, hogy a kriptovaluta tranzakciók visszafordíthatatlanok és nem téríthetők vissza. Emiatt a csalárd vagy véletlen veszteségek sem visszaszerezhetők.",
   "TR_BUY_MODAL_TERMS_4": "Megértetted, hogy nem az Invity nyújtja a szolgáltatást. {provider} feltételei szabályozzák a szolgáltatást.",
   "TR_BUY_MODAL_TERMS_5": "Ezt a funkciót nem szerencsejátékra, sem csalásra, sem az Invity vagy a szolgáltató használati feltételeit, sem bármely más alkalmazható szabályozást sértve használod.",
-  "TR_BUY_MODAL_TERMS_6": "Megértetted, hogy a kriptovaluták elterjedőben lévő pénzügyi eszközök, amelyekre a törvényi rendelkezések bizonyos területeken csak korlátozottan vonatkoznak. Ezáltal az átverés, a lopás és a piaci instabilitás kockázatának nagyobb mértékben ki vagy téve.",
+  "TR_BUY_MODAL_TERMS_6": "Megértettem, hogy a kriptovaluták elterjedőben lévő pénzügyi eszközök, amelyekre a törvényi szabályozások földrajzi területenként eltérőek. Ezáltal az átverés, a lopás és a piaci instabilitás kockázatának nagyobb mértékben ki vagyok téve.",
   "TR_BUY_MODAL_VERIFIED_PARTNERS_HEADER": "Invity által ellenőrzött partnerek",
   "TR_BUY_NETWORK": "{network} vásárlása",
   "TR_BUY_NOT_TRANSACTIONS": "Még nincsenek tranzakciók.",
@@ -413,12 +413,10 @@
   "TR_BUY_STATUS_PENDING": "Függőben",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "Függőben",
   "TR_BUY_STATUS_SUCCESS": "Jóváhagyva",
-  "TR_BUY_TRANS_ID": "Tranzakció azonosító:",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "{maximum} a maximum",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "A maximális mennyiség {maximum}{currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "A minimális mennyiség {minimum}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "A minimális mennyiség {minimum}{currency}",
-  "TR_BUY_VIEW_DETAILS": "Részletek megtekintése",
   "TR_BYTES": "bájtok",
   "TR_CAMERA_NOT_RECOGNIZED": "A kamera nem lett felismerve.",
   "TR_CAMERA_PERMISSION_DENIED": "A kamerához való hozzáférés meg lett tagadva.",
@@ -437,7 +435,6 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Trezor Összeg",
   "TR_CHAINED_TXS": "Kapcsolt tranzakciók",
   "TR_CHANGELOG": "Változások naplója",
-  "TR_CHANGELOG_ON_GITHUB": "Változások naplója a GitHub-on",
   "TR_CHANGE_ADDRESS_TOOLTIP": "Ez egy korábbi küldésnél létrehozott visszajáró-cím.",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "A firmware típusa bármikor megváltoztatható a Beállításokban.",
   "TR_CHANGE_HOMESCREEN": "Kezdőképernyő módosítása",
@@ -454,8 +451,6 @@
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "A biztonsági mentés hitelesítése az eszköz szimulált helyreállításával.",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "Írd be a biztonsági mentés szavait az eszközödön látható sorrendben. A biztonság fokozása érdekében olyan szavakat is be kell majd írnod, amelyek a tárcád biztonsági mentésének nem részei.",
   "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "Használd a kétgombos billentyűzetet a biztonsági mentés bevitelére. Így minden érzékeny információ biztonságban marad, még kétes vagy nem biztonságos számítógép vagy webböngésző elől is.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "A tárca biztonsági mentése az érintőképernyőn keresztül kerül bevitelre. Így elkerülhető, hogy egy nem biztonságos számítógép vagy webböngésző hozzáférhessen ezekhez az érzékeny adatokhoz.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "A tárca biztonsági mentése az érintőképernyőn keresztül kerül bevitelre. Így elkerülhető, hogy egy nem biztonságos számítógép vagy webböngésző hozzáférhessen ezekhez az érzékeny adatokhoz.",
   "TR_CHECK_SEED": "Biztonsági mentés ellenőrzése",
   "TR_CHECK_YOUR_DEVICE": "Nézd a Trezor képernyőjét",
   "TR_CHOOSE_RECOVERY_TYPE": "Helyreállítási mód kiválasztása",
@@ -530,8 +525,12 @@
   "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_NO_KYC": "KYC soha nem szükséges",
   "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_ALL": "Minden CEX és DEX ajánlat",
   "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_DEX": "DEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FIXED_CEX": "Fix árfolyamú CEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FLOATING_CEX": "Változó árfolyamú CEX",
   "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING": "DEX",
-  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING_TOOLTIP": "Decentralizált váltó - kriptovaluták kereskedelme blokklánc tranzakciókon keresztül, központi közvetítő nélkül.",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING_TOOLTIP": "Egy decentralizált tőzsde (DEX) lehetővé teszi a kriptovaluták kereskedelmét közvetlenül a blokkláncon, központi közvetítő nélkül.",
+  "TR_COINMARKET_EXCHANGE_FIXED_OFFERS_HEADING": "Fix árfolyamú CEX",
+  "TR_COINMARKET_EXCHANGE_FLOAT_OFFERS_HEADING": "Változó árfolyamú CEX",
   "TR_COINMARKET_FEATURED_OFFERS_HEADING": "Kiemelt ajánlatok",
   "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_BUY_LABEL": "Fizetés:",
   "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_SELL_LABEL": "Vételi módszer:",
@@ -554,12 +553,6 @@
   "TR_COINMARKET_NO_CEX_PROVIDER_FOUND": "Nem található CEX szolgáltató",
   "TR_COINMARKET_NO_DEX_PROVIDER_FOUND": "Nem található DEX szolgáltató",
   "TR_COINMARKET_NO_METHODS_AVAILABLE": "Nincs elérhető módszer",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "Automatikus frissítés ekkor",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "Vissza az Adásvétel-hez",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "Nincsenek ajánlatok",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "Sajnos szerver kapcsolódási probléma miatt jelenleg nincs elérhető ajánlat.",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "Sajnos jelenleg nincs elérhető ajánlat. Próbáld meg frissíteni az oldalt vagy változtasd meg a lekérdezést.",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "Oldal frissítése",
   "TR_COINMARKET_OFFERS_EMPTY": "Nincs a kéréshez elérhető ajánlat. Módosítsd az országot vagy a vételi összeget.",
   "TR_COINMARKET_OFFERS_REFRESH": "Az ajánlatok frissülnek:",
   "TR_COINMARKET_OFFERS_SELECT": "Kiválaszt",
@@ -578,10 +571,24 @@
   "TR_COINMARKET_SWAP_DEX_MODAL_CONFIRM": "Készen állok a váltásra",
   "TR_COINMARKET_SWAP_DEX_MODAL_FOR_YOUR_SAFETY": "{fromCrypto} váltása {toCrypto}-ra/re {provider} szolgáltatóval",
   "TR_COINMARKET_SWAP_DEX_MODAL_LEGAL_HEADER": "Jogi nyilatkozat",
+  "TR_COINMARKET_SWAP_DEX_MODAL_SECURITY_HEADER": "Első a biztonság a Trezorral",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_1": "Kriptovalutákat akarok váltani DEX (decentralizált tőzsde) használatával {provider} szerződését használva.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_2": "Kriptovalutákat akarok váltani a saját fiókom részére. Megértettem, hogy a szolgáltató irányelvei megkövetelhetik a személyazonosság ellenőrzését.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_3": "Megértettem, hogy a kriptovaluta tranzakciók véglegesek, nem fordíthatók és nem téríthetők vissza. Emiatt a csalárd vagy véletlen veszteségek sem visszaszerezhetők.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4": "Megértettem, hogy nem az Invity nyújtja ezt a szolgáltatást. Ezt a(z) {provider} általános szerződési feltételei szabályozzák.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_5": "Ezt a funkciót nem szerencsejátékra, csalásra, vagy bármely más, az Invity vagy a szolgáltató használati feltételeit, vagy az irányadó törvényeket sértő módon használom.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_6": "Megértettem, hogy a kriptovaluták elterjedőben lévő pénzügyi eszközök, amelyekre a törvényi szabályozások földrajzi területenként eltérőek. Ezáltal az átverés, a lopás és a piaci instabilitás kockázatának nagyobb mértékben ki vagyok téve.",
   "TR_COINMARKET_SWAP_DEX_MODAL_VERIFIED_PARTNERS_HEADER": "Invity által ellenőrzött partnerek",
   "TR_COINMARKET_SWAP_MODAL_CONFIRM": "Készen állok a váltásra",
   "TR_COINMARKET_SWAP_MODAL_FOR_YOUR_SAFETY": "{fromCrypto} váltása {toCrypto}-ra/re {provider} szolgáltatóval",
   "TR_COINMARKET_SWAP_MODAL_LEGAL_HEADER": "Jogi nyilatkozat",
+  "TR_COINMARKET_SWAP_MODAL_SECURITY_HEADER": "Első a biztonság a Trezorral",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_1": "Azért vagyok itt, hogy kriptovalutát váltsak Ha más okból lettél erre az oldalra irányítva, kérlek lépj kapcsolatba a Trezor ügyfélszolgálatával mielőtt továbblépsz.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_2": "Saját magam részére akarok kriptovalutákat váltani. Megértettem, hogy a szolgáltató irányelvei megkövetelhetik a személyazonosság ellenőrzését.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_3": "Megértettem, hogy a kriptovaluta tranzakciók visszafordíthatatlanok és nem téríthetők vissza. Emiatt a csalárd vagy véletlen veszteségek sem visszaszerezhetők.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_4": "Megértettem, hogy nem az Invity nyújtja ezt a szolgáltatást. Ezt a(z) {provider} általános szerződési feltételei szabályozzák.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_5": "Ezt a funkciót nem szerencsejátékra, csalásra, vagy bármely más, az Invity vagy a szolgáltató használati feltételeit, vagy az irányadó törvényeket sértő módon használom.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_6": "Megértettem, hogy a kriptovaluták elterjedőben lévő pénzügyi eszközök, amelyekre a törvényi szabályozások földrajzi területenként eltérőek. Ezáltal az átverés, a lopás és a piaci instabilitás kockázatának nagyobb mértékben ki vagyok téve.",
   "TR_COINMARKET_SWAP_MODAL_VERIFIED_PARTNERS_HEADER": "Invity által ellenőrzött partnerek",
   "TR_COINMARKET_TOKEN_NETWORK": "{tokenName} a(z) {networkName} hálózaton",
   "TR_COINMARKET_TRADE_FEE": "Adásvételi díj",
@@ -659,7 +666,6 @@
   "TR_COPY_ADDRESS_POLICY_ID": "Soha ne küldj pénzt egy policy azonosító címre.",
   "TR_COPY_AND_CLOSE": "Másol & Bezár",
   "TR_COPY_SIGNED_MESSAGE": "Aláírt üzenet másolása",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "Másolás",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "Változásnapló lekérése sikertelen",
   "TR_COULD_NOT_RETRIEVE_DATA": "Adatok lekérése sikertelen",
   "TR_COUNT_WALLETS": "{count} {count, plural, one {tárca} other {tárca}}",
@@ -693,6 +699,7 @@
   "TR_DASHBOARD_ASSET_FAILED": "A pénzügyi eszköz nem lett helyesen betöltve",
   "TR_DASHBOARD_DISCOVERY_ERROR": "Felderítési hiba",
   "TR_DASHBOARD_DISCOVERY_ERROR_PARTIAL_DESC": "A fiókok nem lettek megfelelően betöltve {details}",
+  "TR_DATA": "Adat",
   "TR_DATABASE_UPGRADE_BLOCKED": "Az adatbázisfrissítést az alkalmazás egy másik futó példánya megakadályozta",
   "TR_DATA_ANALYTICS_CATEGORY_1": "Platform",
   "TR_DATA_ANALYTICS_CATEGORY_1_ITEM_1": "Operációs rendszer, Trezor modell, verzió, stb.",
@@ -748,6 +755,8 @@
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_TOUCH": "Csatlakoztasd újra az eszközt anélkül, hogy hozzáérnél a képernyőjéhez.",
   "TR_DEVICE_CONNECTED_WRONG_STATE": "Az eszköz helytelen állapotban észlelhető",
   "TR_DEVICE_DISCONNECTED_DURING_ACTION_DESCRIPTION": "A Trezorod leválasztódott a biztonsági mentés során. Erősen javasoljuk, hogy használd a gyári alaphelyzetbe állítást a Suite-ben az eszköz törléséhez, majd indítsd újra a tárca biztonsági mentésének folyamatát.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH": "A firmware hash-ellenőrzése sikertelen. Lehet, hogy a Trezorod hamisítvány.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR": "A firmware hash-ellenőrzést nem sikerült végrehajtani. Lehet, hogy a Trezorod hamisítvány.",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON": "Kikapcsolás",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON_DISABLED": "Bekapcsolás",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION": "A firmware revíziójának ellenőrzése kulcsfontosságú biztonsági funkció. Erősen javasoljuk a bekapcsolva tartását.",
@@ -828,7 +837,6 @@
   "TR_DOWNLOAD_LATEST_BRIDGE": "Legújabb Bridge {version} letöltése",
   "TR_DO_NOT_DISCONNECT_DEVICE": "Ne válaszd le az eszközt",
   "TR_DO_NOT_SHOW_AGAIN": "Ne jelenjen meg többet",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "Biztos, hogy kihagyod ezt a lépést?",
   "TR_DROPBOX": "Dropbox",
   "TR_DROPZONE": "Húzd és dobd ide a fájlt vagy kattints és válaszd ki a fájlok közül",
   "TR_DROPZONE_ERROR": "Importálási hiba: {error}",
@@ -910,7 +918,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "Csak a cseréhez szükséges pontos összeg jóváhagyása. Újabb tranzakciós díjat kell majd fizetned, ha újra hasonló cserét akarsz majd végrehajtani.",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "Korábbi jóváhagyás visszavonása",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "Egy olyan tranzakció végrehajtása, amely visszavonja a(z) {provider} szerződésének korábbi jóváhagyását.",
-  "TR_EXCHANGE_BUY": "Cserébe",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Jóváhagyás a Trezoron, majd küldés",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "Jóváhagyás és küldés",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "Jóváhagyás létrehozása",
@@ -932,8 +939,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "A tranzakció sikeres volt.",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "Jóváhagyva",
   "TR_EXCHANGE_DEX": "Decentralizált tőzsde ajánlata",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "A csere végrehajtásának becsült díja {symbol} {approvalFee} ({approvalFeeFiat}) a jóváhagyáshoz (amennyiben szükséges) és {symbol} {swapFee} ({swapFeeFiat}) a cseréért.",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "Nem maradt elegendő pénzeszköz a tranzakciós díjakra. Kérlek csökkentsd a mennyiséget erre az összegre: maximum {symbol}{max}",
   "TR_EXCHANGE_EXTRA_FIELD": "{extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "Érvénytelen {extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "{extraFieldDescription}",
@@ -943,7 +948,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "Amit látsz, az pontosan annyi, mint amennyit kapni fogsz a váltás végén – a látható összeg nem fog változni az árfolyam kiválasztása és a tranzakció befejezése közt. Garantáltan megkapod a mutatott összeget, de ezek az árfolyamok általában kevésbé nagyvonalúak, azaz a pénzed nem fog olyan sok kripto-t venni számodra.",
   "TR_EXCHANGE_FLOAT": "Lebegő-árfolyamos ajánlat",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "A lebegő árfolyam azt jelenti, hogy az árfolyam kiválasztásától a tranzakció végrehajtásáig eltelt idő alatt esetlegesen bekövetkező piaci árváltozás miatt a végső jóváírt mennyiség is változhat. Ezek az árfolyamok általában magasabbak, vagyis végül akár több kriptovalutát is kaphatsz.",
-  "TR_EXCHANGE_PROVIDER": "Szolgáltató",
   "TR_EXCHANGE_RATE": "Árfolyam",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "A fogadó fiók a Suite-on kívül található.",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "Erre az alfanumerikus címre fognak a coinjaid érkezni.",
@@ -960,7 +964,7 @@
   "TR_EXCHANGE_STATUS_KYC": "KYC",
   "TR_EXCHANGE_STATUS_SUCCESS": "Jóváhagyva",
   "TR_EXCHANGE_SWAP_DATA": "A csere tranzakciós adata",
-  "TR_EXCHANGE_SWAP_SEND_TO": "{provider} szerződése",
+  "TR_EXCHANGE_SWAP_SEND_TO": "{provider} szerződésének címe",
   "TR_EXCHANGE_SWAP_SLIPPAGE": "Csúszás",
   "TR_EXCHANGE_SWAP_SLIPPAGE_AMOUNT": "Maximum csúszás mértéke",
   "TR_EXCHANGE_SWAP_SLIPPAGE_CUSTOM": "Egyedi",
@@ -970,16 +974,9 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "Kérlek számot adj meg.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "Írd be a kívánt csúszást.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "Csereajánlat összege",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "Csúszás összesítve",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "Csúszási tolerancia",
-  "TR_EXCHANGE_TRANS_ID": "Tranzakció azonosító:",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "A Suite-ben nem szereplő {symbol} fiók használata",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "Fogadó cím",
-  "TR_EXCHANGE_VIEW_DETAILS": "Részletek megtekintése",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE": "Automatikus Trezor Suite frissítések",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION": "A Trezor Suite automatikusan letölti a legújabb verziót a háttérben, és az alkalmazás újraindításakor telepíti azt. Ez biztosítja, hogy mindig naprakész legyél a legújabb funkciókkal és biztonsági javításokkal. A frissítések az engedélyed nélkül történnek.",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN": "BNB Okoslánc",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON": "A BNB okoslánc engedélyezése korábbi belső tranzakciók nélkül.",
   "TR_EXPERIMENTAL_FEATURES": "Kísérleti funkciók",
   "TR_EXPERIMENTAL_FEATURES_ALLOW": "Kísérleti funkciók",
   "TR_EXPERIMENTAL_FEATURES_WARNING": "Csak tapasztalt felhasználóknak. Használat saját felelősségre. Ezek a funkciók tesztelés alatt állnak, instabilak lehetnek, és nem biztos, hogy hosszú távú támogatásban részesülnek.",
@@ -1024,6 +1021,7 @@
   "TR_FIRMWARE_NEW_FW_DESCRIPTION": "Új firmware verzió érhető el. Frissítsd az eszközt most.",
   "TR_FIRMWARE_REINSTALL_FW_DESCRIPTION": "Az eszköz már a legfrissebb firmware-t használja, de szükség esetén újra is telepíthető.",
   "TR_FIRMWARE_REVISION_CHECK_FAILED": "A firmware revízió ellenőrzése sikertelen volt. Lehet, hogy a Trezorod hamisítvány.",
+  "TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR": "Nem sikerült elvégezni a firmware revíziójának ellenőrzését.",
   "TR_FIRMWARE_STATUS_INSTALLATION_COMPLETED": "Befejezve",
   "TR_FIRMWARE_SUBHEADING_BITCOIN": "Kisebb méretű firmware, amely csak Bitcoin műveleteket támogat.",
   "TR_FIRMWARE_SUBHEADING_NONE": "A Trezorokat firmware nélkül szállítjuk. Az eszközöd készen áll arra, hogy megkapja a legújabb, teljes körű firmware-t a biztonságos használathoz. Ha csak Bitcoint használsz, telepítsd a <button>{{bitcoinOnly} firmware-t</button> .",
@@ -1271,7 +1269,7 @@
   "TR_NAV_SIGN_AND_VERIFY": "Aláír & Hitelesít",
   "TR_NAV_SIGN_VERIFY": "Üzenet aláírása és hitelesítése",
   "TR_NAV_SOON_BADGE": "Hamarosan",
-  "TR_NAV_STAKING": "Letétbe helyezés",
+  "TR_NAV_STAKING": "Stake-elés",
   "TR_NAV_TOKENS": "Tokenek",
   "TR_NAV_TRADE": "Kereskedés",
   "TR_NAV_TRANSACTIONS": "Áttekintés",
@@ -1305,6 +1303,7 @@
   "TR_NETWORK_LITECOIN": "Litecoin",
   "TR_NETWORK_NAMECOIN": "Namecoin",
   "TR_NETWORK_NEM": "NEM",
+  "TR_NETWORK_OP": "Optimism",
   "TR_NETWORK_POLYGON": "Polygon PoS",
   "TR_NETWORK_SOLANA_DEVNET": "Solana Devnet",
   "TR_NETWORK_SOLANA_MAINNET": "Solana",
@@ -1317,7 +1316,6 @@
   "TR_NETWORK_ZCASH": "Zcash",
   "TR_NEW_FEE": "Új",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "Új Trezor Bridge érhető el.",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "Új Trezor firmware áll rendelkezésre. Kérlek frissítsd az eszközöd.",
   "TR_NEXT_UP": "Következő",
   "TR_NONCE": "Nonce",
   "TR_NORMAL_ACCOUNTS": "Alapértelmezett fiókok",
@@ -1343,10 +1341,6 @@
   "TR_N_MIN": "{n} perc",
   "TR_N_TRANSACTIONS": "{value} {value, plural, one {tranzakció} other {tranzakció}}",
   "TR_OFF": "kikapcsolva",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "A megadott összeg ({amount}) magasabb, mint a megadható maximum összeg ({max}).",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "A megadott összeg ({amount}) magasabb, mint a megadható maximum összeg ({max}).",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "A megadott összeg ({amount}) magasabb, mint a megadható maximum összeg ({max}).",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "A megadott összeg ({amount}) magasabb, mint a megadható maximum összeg ({max}).",
   "TR_OFFICIAL_LANGUAGES": "Hivatalos",
   "TR_OK": "OK",
   "TR_ON": "bekapcsolva",
@@ -1405,30 +1399,6 @@
   "TR_OTHER_INPUTS_AND_OUTPUTS": "Egyéb be-, és kimenetek",
   "TR_OUTGOING": "Kimenő",
   "TR_OUTPUTS": "Kimenetek",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "A minimális és maximális összeg, amennyiért ez a felhasználó {symbol}-t ad el.",
-  "TR_P2P_GET_STARTED_INTRO": "A tranzakciók kezdeményezése a szolgáltató ({providerName}) oldalán történik – kövesd gondosan az alábbi lépéseket.",
-  "TR_P2P_GET_STARTED_ITEM_1": "A \"Go to {providerName}\" lehetőséget választva partnerünk weboldalára irányítunk át.",
-  "TR_P2P_GET_STARTED_ITEM_3": "Amint a(z) {providerName} bekéri a küldési címet, ide visszatérve tudsz továbblépni.",
-  "TR_P2P_GET_STARTED_ITEM_4": "Mindjárt készen vagyunk! Fedd fel és másold ki a címed, illeszd be a \"Release address\" (kiküldési cím) mezőbe a(z) {providerName} oldalán, és véglegesítsd a tranzakciót.",
-  "TR_P2P_GO_TO_PROVIDER": "Tovább ide: {providerName}",
-  "TR_P2P_INFO": "A {peerToPeer} (P2P) technológiával nincs KYC-ellenőrzés sem a vevő, sem az eladó oldalán. Minden fél védve van a csalással szemben biztonságos {multisigEscrow} által.",
-  "TR_P2P_MODAL_CONFIRM": "Készen állok a vásárlásra",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "{cryptocurrency} peer-to-peer vásárlása {provider} szolgáltatónál.",
-  "TR_P2P_MODAL_LEGAL_HEADER": "Jogi nyilatkozat",
-  "TR_P2P_MODAL_SECURITY_HEADER": "Első a biztonság a Trezorral",
-  "TR_P2P_MODAL_TERMS_1": "Azért vagy itt, hogy egy általad választott másik személytől személyeazonosság ellenőrzése nélküli Peer-to-Peer (P2P) technológia használatával  kriptovalutát vásárolj. Ha bármilyen más okból lettél erre az oldalra irányítva, kérjük lépj kapcsolatba az ügyfélszolgálattal, mielőtt továbblépsz.",
-  "TR_P2P_MODAL_TERMS_2": "Megértetted, hogy a kriptovaluta tranzakciók visszafordíthatatlanok és nem téríthetők vissza. Emiatt a csalárd vagy véletlen veszteségek sem visszaszerezhetők.",
-  "TR_P2P_MODAL_TERMS_4": "Megértetted, hogy nem az Invity nyújtja a szolgáltatást. {provider} feltételei szabályozzák a szolgáltatást.",
-  "TR_P2P_MODAL_TERMS_5": "Ezt a funkciót nem szerencsejátékra, sem csalásra, sem az Invity vagy a szolgáltató használati feltételeit, sem bármely más alkalmazható szabályozást sértve használod.",
-  "TR_P2P_MODAL_TERMS_6": "Megértetted, hogy a kriptovaluták elterjedőben lévő pénzügyi eszközök, amelyekre a törvényi rendelkezések bizonyos területeken csak korlátozottan vonatkoznak. Ezáltal az átverés, a lopás és a piaci instabilitás kockázatának nagyobb mértékben ki vagy téve.",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "Invity által ellenőrzött partnerek",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "A tranzakciót a {providerName} oldalon történő szerződéskötéstől számított, alábbi időkorláton belül kell lebonyolítani.",
-  "TR_P2P_PRICE": "1 {symbol} ára",
-  "TR_P2P_PRICE_TOOLTIP": "A felhasználó által kínált {symbol} árfolyam.",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "Szia, {providerName}-t használok!",
-  "TR_P2P_USER_REPUTATION": "({rating}, {numberOfTrades})",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "A kiválasztott összeg ({amount}) magasabb, mint az elfogadható maximum ({maximum}).",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "A kiválaszott összeg ({amount}) alacsonyabb, mint az elfogadható minimum összeg ({minimum}).",
   "TR_PAGINATION_NEWER": "Újabb",
   "TR_PAGINATION_OLDER": "Korábbi",
   "TR_PASSPHRASE_CASE_SENSITIVE": "Figyelem: A jelmondat esetében különbözőnek számítanak a kis-, és nagybetűk.",
@@ -1497,6 +1467,13 @@
   "TR_QUICK_ACTION_TOOLTIP_TREZOR_SUITE": "Trezor Suite",
   "TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE": "Elérhető frissítés ({newVersion})",
   "TR_QUICK_ACTION_TOOLTIP_UP_TO_DATE": "Naprakész ({currentVersion})",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED": "A Suite letöltött egy új Trezor frissítést!",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED": "Az alkalmazás frissült!",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE": "Alkalmazásfrissítés elérhető",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE": "Kattints az újraindításhoz és frissítéshez",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE": "Kattints a frissítés indításához",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE": "Trezor frissítés elérhető",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW": "Újdonságok",
   "TR_RANDOM_SEED_WORDS_DISCLAIMER": "Olyan szavakat is be kellhet írnod, amelyek nem részei a tárcád biztonsági mentésének.",
   "TR_RANGE": "Időszak",
   "TR_READ_AND_UNDERSTOOD": "Elolvastam és megértettem a fentieket",
@@ -1574,9 +1551,11 @@
   "TR_SELECTED": "{amount} kiválasztva",
   "TR_SELECT_COIN_FOR_SETTINGS": "Válaszd ki az aktív coint a beállítások módosításához",
   "TR_SELECT_DEVICE": "Eszköz kiválasztása",
+  "TR_SELECT_NAME_OR_ADDRESS": "Keresés név, szimbólum, hálózat vagy szerződéses cím alapján",
   "TR_SELECT_NUMBER_OF_WORDS": "Válaszd ki, hogy hány szóból áll a seeded",
   "TR_SELECT_PASSPHRASE_SOURCE": "Válaszd ki a(z) \"{deviceLabel}\" eszközön, hogy hol viszed be a jelmondatot.",
   "TR_SELECT_RECOVERY_METHOD": "Helyreállítási mód kiválasztása",
+  "TR_SELECT_TOKEN": "Token választása",
   "TR_SELECT_TREZOR": "Trezor kiválasztása",
   "TR_SELECT_TREZOR_TO_CONTINUE": "A folytatáshoz válasszd ki a Trezorodat.",
   "TR_SELECT_TYPE": "Típus kiválasztása",
@@ -1612,7 +1591,7 @@
   "TR_SELL_MODAL_TERMS_3": "Megértettem hogy a kriptovaluta tranzakciók visszafordíthatatlanok és nem téríthetők vissza. Emiatt a csalárd vagy véletlen veszteségek sem visszaszerezhetők.",
   "TR_SELL_MODAL_TERMS_4": "Megértettem, hogy nem az Invity nyújtja a szolgáltatást. {provider} feltételei szabályozzák a szolgáltatást.",
   "TR_SELL_MODAL_TERMS_5": "Ezt a funkciót nem szerencsejátékra, sem csalásra, sem az Invity vagy a szolgáltató használati feltételeit vagy az alkalmazandó szabályozásokat sértve használom.",
-  "TR_SELL_MODAL_TERMS_6": "Megértettem, hogy a kriptovaluták elterjedőben lévő pénzügyi eszközök és különböző joghatósági területeken a törvényi szabályozások eltérhetnek. Ezáltal az átverés, a lopás és a piaci instabilitás kockázatának nagyobb mértékben ki vagyok téve.",
+  "TR_SELL_MODAL_TERMS_6": "Megértetted, hogy a kriptovaluták elterjedőben lévő pénzügyi eszközök, amelyekre a törvényi szabályozások földrajzi területenként eltérőek. Ezáltal az átverés, a lopás és a piaci instabilitás kockázatának nagyobb mértékben ki vagyok téve.",
   "TR_SELL_MODAL_VERIFIED_PARTNERS_HEADER": "Invity által ellenőrzött partnerek",
   "TR_SELL_REGISTER": "Regisztráció",
   "TR_SELL_SEND_FROM": "Küldés innen",
@@ -1620,10 +1599,6 @@
   "TR_SELL_STATUS_ERROR": "Elutasítva",
   "TR_SELL_STATUS_PENDING": "Függőben",
   "TR_SELL_STATUS_SUCCESS": "Jóváhagyva",
-  "TR_SELL_TRANS_ID": "Tranzakció azonosító:",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "A maximális mennyiség {maximum}{currency}",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "A minimális mennyiség {minimum}{currency}",
-  "TR_SELL_VIEW_DETAILS": "Részletek megtekintése",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "Megtakarítások",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "Lakbér",
   "TR_SENDING_SYMBOL": "{multiple, select, true {többféle token} false {{symbol}} other {{symbol}}} küldése",
@@ -1690,7 +1665,9 @@
   "TR_SIZE": "Méret",
   "TR_SKIP": "Kihagyás",
   "TR_SKIP_BACKUP": "Biztonsági mentés kihagyása",
+  "TR_SKIP_BACKUP_DESCRIPTION": "A tárca biztonsági mentése lehetővé teszi a pénzedhez való hozzáférés visszaszerzését a Trezorod elvesztése, ellopása vagy sérülése esetén. A biztonsági mentés nélkül végérvényesen elvesztheted a kriptódhoz való hozzáférést.",
   "TR_SKIP_PIN": "PIN kód kihagyása",
+  "TR_SKIP_PIN_DESCRIPTION": "Az eszköz PIN-kódja megakadályozza a jogosulatlan hozzáférést a Trezorhoz. Nélküle, az eszköz birtokában bárki hozzáfér a pénzedhez.",
   "TR_SKIP_ROUNDS": "Fordulók kihagyása",
   "TR_SKIP_ROUNDS_DESCRIPTION": "Fordulók kihagyásának engedélyezésével tovább nehezedik a bemenetek és kimenetek közti kapcsolat bizonyítása. Ez azt jelenti, hogy a pénz eredetét még inkább el tudod homályosítani.",
   "TR_SKIP_ROUNDS_HEADING": "Fordulók kihagyásának engedélyezése a Trezor számára",
@@ -1712,13 +1689,16 @@
   "TR_STAKE_CLAIM_AFTER_UNSTAKING": "A stake feloldási időszak befejezését követően igényelhető",
   "TR_STAKE_CLAIM_IN_NEXT_BLOCK": "a következő blokkban",
   "TR_STAKE_CLAIM_PENDING": "Folyamatban lévő igénylés",
+  "TR_STAKE_CLAIM_UNSTAKED": "Stake-eletlen {symbol} igénylése",
   "TR_STAKE_CONFIRM_AND_STAKE": "Megerősítés & stake-elés",
   "TR_STAKE_CONFIRM_ENTRY_PERIOD": "Részvételi időszak megerősítése",
   "TR_STAKE_CONSENT_TO_STAKING_WITH_EVERSTAKE": "Tudomásul veszem és hozzájárulok az Everstake-en való stake-eléshez.",
   "TR_STAKE_DAYS": "{days} nap",
   "TR_STAKE_DELEGATED": "Stake delegálás",
   "TR_STAKE_DEREGISTERED": "Stake cím regisztrációjának törlése",
+  "TR_STAKE_EARN_REWARDS_WEEKLY": "Jutalmakat keresése hetente",
   "TR_STAKE_ENTERING_POOL_MAY_TAKE": "A staking pool-ba belépés akár {days} napig is tarthat",
+  "TR_STAKE_ENTER_THE_STAKING_POOL": "Belépés a staking pool-ba",
   "TR_STAKE_ETH": "Ethereum stake-elése",
   "TR_STAKE_ETH_CARD_TITLE": "{symbol} gyarapításának a legegyszerűbb módja.",
   "TR_STAKE_ETH_EARN_REPEAT": "Stake-elés. Jutalmak gyűjtése. Ismétlés.",
@@ -1736,7 +1716,9 @@
   "TR_STAKE_EVERSTAKE_MANAGES": "A stake-elt {symbol} coinodat az Everstake kezeli és védi az <t>okosszerződéseivel, infrastruktúrájával és technológiájával</t>.",
   "TR_STAKE_INSTANT": "Azonnali",
   "TR_STAKE_INSTANTLY_UNSTAKED_WITH_DAYS": "\"Azonnal\" megkaptál {amount} {symbol}-t. {days, plural, =0 {} one {A mardék # napon belül lesz kifizetve.} other {A maradék # napon belül lesz kifizetve.}}",
+  "TR_STAKE_IN_ACCOUNT": "{symbol} a számlán",
   "TR_STAKE_LEARN_MORE": "További információk",
+  "TR_STAKE_LEAVE_STAKING_POOL": "Staking pool elhagyása",
   "TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL": "A kiutalási díjak megfizetésére {amount} {symbol}-t kihagytunk.",
   "TR_STAKE_MAX": "Max",
   "TR_STAKE_MAX_FEE_DESC": "A maximális díj az a hálózati tranzakciós díj, amelyet még hajlandó vagy megfizetni a hálózaton azért, hogy a tranzakciód feldolgozásra kerüljön.",
@@ -1754,13 +1736,15 @@
   "TR_STAKE_RESTAKED_BADGE": "Újra stake-elve",
   "TR_STAKE_REWARDS": "Jutalmak",
   "TR_STAKE_SIGN_TRANSACTION": "Tranzakció aláírása",
+  "TR_STAKE_SIGN_UNSTAKING_TRANSACTION": "Stake feloldási tranzakció aláírása",
   "TR_STAKE_STAKE": "Stake",
   "TR_STAKE_STAKED_AMOUNT": "Stake-elt összeg",
   "TR_STAKE_STAKED_AND_EARNING": "Stake-elve & jutalmak szerzése",
   "TR_STAKE_STAKED_ETH_AMOUNT_LOCKED": "A(z) {symbol} stake-elt összege zárolva van és nem lehet kereskedni, vagy elküldeni.",
   "TR_STAKE_STAKE_MORE": "Több stake-elése",
   "TR_STAKE_STAKING_IN_A_NUTSHELL": "Stake-elés dióhéjban",
-  "TR_STAKE_STAKING_IS": "A stake-elés olyan, mint egy baráti gesztus, amikor ideiglenesen zárolod az Ethereum-jaid, hogy támogasd a blokklánc működését. Cserébe jutalomként {symbol} -t fogsz keresni!",
+  "TR_STAKE_STAKING_IS": "A stake-elés során ideiglenesen zárolod az Ethereum-jaid, hogy támogasd a blokklánc működését. Cserébe jutalomként {symbol} -t fogsz keresni!",
+  "TR_STAKE_STAKING_PROCESS": "Stake-elési folyamat",
   "TR_STAKE_START_STAKING": "Stake-elés megkezdése",
   "TR_STAKE_TIME_TO_CLAIM": "Idő az igénylésre",
   "TR_STAKE_TOTAL_PENDING": "Teljes stake függőben:",
@@ -1770,17 +1754,20 @@
   "TR_STAKE_UNSTAKE_TO_CLAIM": "Stake feloldása az igényléshez",
   "TR_STAKE_UNSTAKING": "Stake-elés feloldása",
   "TR_STAKE_UNSTAKING_PERIOD": "Stake feloldási időszak",
+  "TR_STAKE_UNSTAKING_PROCESS": "Stake feloldási folyamat",
   "TR_STAKE_UNSTAKING_TAKES": "A stake-elés feloldása általában nagyjából 3 napot vesz igénybe. Ezután kereskedhető és küldhető a pénzed.",
   "TR_STAKE_WHAT_IS_STAKING": "Mi az a stake-elés (\"sztékelés\")?",
   "TR_STAKE_YOUR_FUNDS_MAINTAINED": "A stake-elt pénzedet az <h>Everstake kezeli</h>",
+  "TR_STAKING_AMOUNT_STAKED_INSTANTLY": "{amount} {symbol} azonnal stake-elve!",
+  "TR_STAKING_AMOUNT_UNSTAKED_INSTANTLY": "{amount} {symbol} stake-elése azonnal feloldva!",
   "TR_STAKING_DELEGATE": "Delegálás",
   "TR_STAKING_DEPOSIT": "Visszatéríthető letét",
   "TR_STAKING_DEPOSIT_FEE_DECRIPTION": "A letéti díj {feeAmount} ADA, amely a címed stake-eléshez való regisztrációjához szükséges. Amikor úgy döntesz, hogy a Cardano stake-et feloldod, a letéti díjat visszakapod.",
   "TR_STAKING_FEE": "Tranzakciós díj",
   "TR_STAKING_INSTANTLY_STAKED": "Azonnal stake-elve lett {amount} {symbol}. {days, plural, =0 {} one {A maradék {symbol} # napon belül stake-elve lesz.} other {A maradék {symbol} # napon belül stake-elve lesz.}}",
-  "TR_STAKING_IS_NOT_SUPPORTED": "A letétbe helyezés ezen a hálózaton nem támogatott.",
+  "TR_STAKING_IS_NOT_SUPPORTED": "A stake-elés ezen a hálózaton nem támogatott.",
   "TR_STAKING_NOT_ENOUGH_FUNDS": "Nincs elég pénzeszköz a számlán.",
-  "TR_STAKING_ON_3RD_PARTY_DESCRIPTION": "A Trezor stake pooljában való stake-eléssel közvetlenül támogatod a Trezort és a Cardano ökoszisztémát a Trezor Suite-ból.",
+  "TR_STAKING_ON_3RD_PARTY_DESCRIPTION": "A Trezor stake pool-jában való stake-eléssel közvetlenül támogatod a Trezort és a Cardano ökoszisztémát a Trezor Suite-ból.",
   "TR_STAKING_ON_3RD_PARTY_TITLE": "Egy harmadik fél stake pooljára delegálsz",
   "TR_STAKING_POOL_OVERSATURATED_DESCRIPTION": "A stake pool, amelyre delegálsz, túltelített. Kérjük delegáld újra a stake-edet hogy maximalizáld a stake-elésért járó jutalmakat.",
   "TR_STAKING_POOL_OVERSATURATED_TITLE": "A stake pool túltelített",
@@ -1802,6 +1789,7 @@
   "TR_START_COINJOIN": "Coinjoin indítása",
   "TR_START_RECOVERY": "Helyreállítás indítása",
   "TR_STEP": "{number}. lépés",
+  "TR_STEP_OF_TOTAL": "Token választása",
   "TR_STILL_DONT_SEE_YOUR_TREZOR": "Még mindig nem látod a Trezorod?",
   "TR_STOP": "Megállítás",
   "TR_STOPPING": "Leállítás",
@@ -1853,7 +1841,11 @@
   "TR_TOKENS_EMPTY": "Nincsenek tokenek... még.",
   "TR_TOKENS_EMPTY_CHECK_HIDDEN": "Nincsenek tokenek. Lehet, hogy el vannak rejtve.",
   "TR_TOKENS_SEARCH_TOOLTIP": "Keresés a token neve, szimbóluma vagy szerződésének címe alapján.",
+  "TR_TOKEN_NOT_FOUND": "Token nem található",
+  "TR_TOKEN_NOT_FOUND_ON_NETWORK": "A token nem található {networkName} hálózaton.",
   "TR_TOKEN_TRANSFERS": "{standard} Token átutalások",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH": "Próbálj meg egy másik kersést.",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH_OR_SWITCH": "Próbálj meg egy másik keresést, vagy válts másik hálózatra.",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR": "Nem felismert tokenek",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR_TOOLTIP": "A fel nem ismert tokenek potenciális kockázatot jelentenek. Légy óvatos.",
   "TR_TOO_LONG": "Az üzenet túl hosszú",
@@ -1897,11 +1889,7 @@
   "TR_TO_BTC": "BTC-ben",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "Annak érdekében, hogy a címkék állandóak és elérhetőek legyenek különböző eszközökön, csatlakozz egy felhőalapú tárhelyszolgáltatóhoz.",
   "TR_TO_SATOSHIS": "sat-ban",
-  "TR_TRADE_BUYS": "vásárlás",
-  "TR_TRADE_ENTER_COIN": "Add meg a kriptó nevét vagy szimbólumát...",
-  "TR_TRADE_EXCHANGES": "átváltás",
   "TR_TRADE_REDIRECTING": "Átirányítás...",
-  "TR_TRADE_SELLS": "eladás",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "Tranzakciós történek nem érhető el",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "Tipp: Kereshetsz tranzakció azonosítókat, címeket, címkéket, összegeket és dátumokat.",
   "TR_TRANSACTIONS_SEARCH_TIP_10": "Tipp: Kombinálhatod az ÉS (&) és a VAGY (|) operátorokat bonyolultabb keresésekhez. Például <strong> 2022-01-01 & < 2022-01-31 | > 2022-12-01 & < 2022-12-31</strong> kulcsszó minden 2022 januári és 2022 decemberi tranzakciót eredményül hoz.",
@@ -1942,13 +1930,17 @@
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "Szabályok automatikus telepítése",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "Hiányzó udev szabályok",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "Váratlan állapot: {error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "Az eszközöd megfelelően van csatlakoztatva, de az internetböngésződ jelenleg még nem tud vele kommunikálni. Ehhez telepítened kell a Trezor Bridge programot.",
   "TR_TRY_AGAIN": "Próbáld újra",
   "TR_TXID": "TX ID",
   "TR_TXID_RBF": "Az eredeti, kicserélendő TX ID (tranzakció azonosító)",
   "TR_TX_CONFIRMATIONS": "{confirmationsCount}x",
   "TR_TX_CONFIRMED": "Tranzakció megerősítve",
   "TR_TX_CONFIRMING": "Tranzakció megerősítése",
+  "TR_TX_DATA_FUNCTION": "Függvény",
+  "TR_TX_DATA_INPUT_DATA": "Bemenő adat",
+  "TR_TX_DATA_METHOD": "Módszer",
+  "TR_TX_DATA_METHOD_NAME": "Módszer neve",
+  "TR_TX_DATA_PARAMS": "Paraméterek",
   "TR_TX_DEPOSIT": "Betét",
   "TR_TX_FEE": "Tranzakciós díj",
   "TR_TX_TAB_AMOUNT": "Összeg",
@@ -1988,6 +1980,8 @@
   "TR_UPDATE_FIRMWARE_HOMESCREEN_LATER_TOOLTIP": "Firmware frissítése szükséges. A kezdőképernyő később a beállítások oldalon módosítható",
   "TR_UPDATE_FIRMWARE_HOMESCREEN_TOOLTIP": "A kezdőképernyő megváltoztatásához frissíteni kell a firmwaret",
   "TR_UPDATE_MODAL_AVAILABLE_HEADING": "Frissítés érhető el",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES": "Automatikus frissítés engedélyezése",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG": "Új",
   "TR_UPDATE_MODAL_INSTALL_AND_RESTART": "Újraindítás és frissítés",
   "TR_UPDATE_MODAL_INSTALL_NOW_OR_LATER": "Szeretnéd a frissítést most telepíteni?",
   "TR_UPDATE_MODAL_NOT_NOW": "Később",
@@ -1995,6 +1989,9 @@
   "TR_UPDATE_MODAL_START_DOWNLOAD": "Frissítés indítása",
   "TR_UPDATE_MODAL_UPDATE_DOWNLOADED": "Frissítés letöltve",
   "TR_UPDATE_MODAL_UPDATE_ON_QUIT": "Frissítés kilépésnél",
+  "TR_UPDATE_MODAL_WHATS_NEW": "Újdonságok",
+  "TR_UPDATE_MODAL_YOUR_VERSION": "A te verziód: v{version}",
+  "TR_UPGRADE_FIRMWARE_TO_DISCOVER_ACCOUNT_ERROR": "Frissítsd a firmware-t ennek a fióknak az eléréséhez. Lásd a fenti kék bannert.",
   "TR_UP_TO": "akár",
   "TR_UP_TO_DATE": "Naprakész",
   "TR_UP_TO_DAYS": "akár {days} nap",
@@ -2048,6 +2045,7 @@
   "TR_WALLET_SELECTION_ACCESS_HIDDEN_WALLET": "Hozzáférés rejtett tárcához",
   "TR_WALLET_SELECTION_HIDDEN_WALLET": "Rejtett tárca",
   "TR_WELCOME_TO_TREZOR_TEXT_WALLET_CREATION": "Új tárca létrehozása vagy meglévő tárca visszaállítása tárca biztonsági mentésének használatával.",
+  "TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE": "Folyamatosan a Trezor-élmény javításán dolgozunk, a következők változtak:",
   "TR_WEST": "Nyugat",
   "TR_WHAT_DATA_WE_COLLECT": "Milyen adatokat gyűjtünk?",
   "TR_WHAT_IS_PASSPHRASE": "Tudj meg többet a különbségről",
diff --git a/packages/suite-data/files/translations/it.json b/packages/suite-data/files/translations/it.json
index baa72e8e21b..ddbedb69a5f 100644
--- a/packages/suite-data/files/translations/it.json
+++ b/packages/suite-data/files/translations/it.json
@@ -1,5 +1,6 @@
 {
   "AMOUNT": "Importo",
+  "AMOUNT_EXCEEDS_MAX": "L'importo supera il valore massimo consentito di {maxAmount}.",
   "AMOUNT_IS_BELOW_DUST": "L'importo deve essere almeno {dust}",
   "AMOUNT_IS_LESS_THAN_RESERVE": "Il conto del destinatario richiede una riserva minima di {reserve} XRP per l'attivazione",
   "AMOUNT_IS_MORE_THAN_RESERVE": "L'importo è superiore alla riserva non spendibile richiesta ({reserve} XRP)",
@@ -67,7 +68,7 @@
   "LOCKTIME_ADD_TOOLTIP": "Il tempo di blocco imposta il tempo minimo necessario per il mining di una transazione in un blocco.",
   "LOCKTIME_BLOCKHEIGHT": "Altezza del blocco per tempo di blocco",
   "LOCKTIME_IS_NOT_INTEGER": "Il tempo di blocco non è un numero intero",
-  "LOCKTIME_IS_NOT_SET": "Tempo di blocco non impostato",
+  "LOCKTIME_IS_NOT_SET": "Il tempo di blocco non è impostato",
   "LOCKTIME_IS_TOO_BIG": "Il timestamp è troppo grande",
   "LOCKTIME_IS_TOO_LOW": "Il tempo di blocco è troppo breve",
   "LOCKTIME_SCHEDULE_SEND": "Tempo di blocco",
@@ -112,7 +113,7 @@
   "RECEIVE_ADDRESS_LIMIT_REACHED": "Hai raggiunto il limite massimo di 21 indirizzi nuovi e inutilizzati",
   "RECEIVE_ADDRESS_REVEAL": "Mostra indirizzo completo",
   "RECEIVE_ADDRESS_UNAVAILABLE": "Non disponibile",
-  "RECEIVE_DESC_BITCOIN": "Per ricevere fondi, devi ottenere un indirizzo di ricezione nuovo. Ti consigliamo di utilizzare sempre un indirizzo nuovo per evitare che qualcuno possa tenere traccia delle tue transazioni. Benché sia possibile riutilizzare un indirizzo, ti sconsigliamo di farlo a meno che non sia assolutamente necessario.",
+  "RECEIVE_DESC_BITCOIN": "Per ricevere fondi, devi ottenere un indirizzo di ricezione nuovo. Ti consigliamo di utilizzare sempre un nuovo indirizzo per evitare che qualcuno possa tenere traccia delle tue transazioni. Benché sia possibile riutilizzare un indirizzo, ti sconsigliamo di farlo a meno che non sia assolutamente necessario.",
   "RECEIVE_DESC_ETHEREUM": "Utilizza questo indirizzo anche per ricevere i token.",
   "RECEIVE_TABLE_ADDRESS": "Indirizzo",
   "RECEIVE_TABLE_NOT_USED": "Non utilizzato",
@@ -168,6 +169,7 @@
   "TOAST_PIN_CHANGED": "PIN modificato correttamente",
   "TOAST_QR_INCORRECT_ADDRESS": "Il codice QR contiene un indirizzo non valido per questo conto",
   "TOAST_QR_INCORRECT_COIN_SCHEME_PROTOCOL": "Il codice QR è definito per il conto {coin}",
+  "TOAST_QR_UNKNOWN_SCHEME_PROTOCOL": "Schema protocollo sconosciuto: \"{scheme}\". Riprova o inserisci l'indirizzo manualmente.",
   "TOAST_RAW_TX_SENT": "Transazione inviata. TXID: {txid}",
   "TOAST_SETTINGS_APPLIED": "Impostazioni modificate correttamente",
   "TOAST_SIGN_MESSAGE_ERROR": "Errore di firma del messaggio: {error}",
@@ -193,7 +195,6 @@
   "TR_404_GO_TO_DASHBOARD": "Vai alla Dashboard",
   "TR_404_TITLE": "Errore 404: Collegamento non trovato",
   "TR_7D_CHANGE": "Modifica 7d",
-  "TR_ABORT": "Interrompi",
   "TR_ACCESS_HIDDEN_WALLET": "Accedi al wallet nascosto",
   "TR_ACCESS_STANDARD_WALLET": "Accedi al wallet standard",
   "TR_ACCOUNT_DETAILS_HEADER": "Dettagli conto",
@@ -232,10 +233,16 @@
   "TR_ACCOUNT_TYPE_BIP86_DESC": "Taproot è un nuovo tipo di indirizzo in grado di migliorare il livello di privacy e l'efficienza della rete. Alcuni servizi potrebbero non supportare ancora gli indirizzi Taproot.",
   "TR_ACCOUNT_TYPE_BIP86_NAME": "Taproot",
   "TR_ACCOUNT_TYPE_BIP86_TECH": "BIP86, P2TR, Bech32m",
+  "TR_ACCOUNT_TYPE_CARDANO_DESC": "Il metodo al momento in uso e più comunemente accettato per generare e gestire indirizzi Cardano garantisce l'interoperabilità, la sicurezza e il supporto di tutti i tipi di token.",
   "TR_ACCOUNT_TYPE_COINJOIN": "Coinjoin",
+  "TR_ACCOUNT_TYPE_DEFAULT": "Predefinito",
   "TR_ACCOUNT_TYPE_IMPORTED": "Importato",
   "TR_ACCOUNT_TYPE_LEDGER": "Ledger",
+  "TR_ACCOUNT_TYPE_LEDGER_DESC": "I conti Ledger sono compatibili con i percorsi di derivazione Ledger Live, per cui la migrazione da Ledger a Trezor risulta fluida.",
   "TR_ACCOUNT_TYPE_LEGACY": "Legacy",
+  "TR_ACCOUNT_TYPE_LEGACY_DESC": "I conti Legacy sono compatibili con i percorsi di derivazione Ledger Legacy, per cui la migrazione da Ledger a Trezor risulta fluida.",
+  "TR_ACCOUNT_TYPE_NORMAL_EVM_DESC": "Il metodo al momento in uso e più comunemente accettato per generare e gestire indirizzi {value} garantisce l'interoperabilità, la sicurezza e il supporto di tutti i tipi di token.",
+  "TR_ACCOUNT_TYPE_NORMAL_SOLANA_DESC": "Il metodo al momento in uso e più comunemente accettato per generare e gestire indirizzi Solana garantisce l'interoperabilità, la sicurezza e il supporto di token SOL e SPL.",
   "TR_ACCOUNT_TYPE_NO_CAPABILITY": "Non supportato.",
   "TR_ACCOUNT_TYPE_NO_SUPPORT": "Questo tipo di conto non è supportato su questo modello di Trezor.",
   "TR_ACCOUNT_TYPE_SEGWIT": "Legacy SegWit",
@@ -249,10 +256,12 @@
   "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_TECH": "BIP44, Base58",
   "TR_ACCOUNT_TYPE_TAPROOT": "Taproot",
   "TR_ACCOUNT_TYPE_UPDATE_REQUIRED": "Aggiorna il firmware del dispositivo per abilitare questo tipo di conto.",
+  "TR_ACCOUNT_TYPE_XRP_DESC": "XRP è una valuta digitale che consente pagamenti transfrontalieri rapidi ed economici senza dover ricorrere al mining tradizionale, grazie all'uso di un consensus ledger per la conferma rapida delle transazioni.",
   "TR_ACQUIRE_DEVICE": "Utilizza Trezor qui",
   "TR_ACQUIRE_DEVICE_TITLE": "Un'altra sessione è in esecuzione",
   "TR_ACTIVATED_COINS": "Coin attivati",
   "TR_ACTIVE": "attivo",
+  "TR_ADD": "Aggiungi",
   "TR_ADDRESSES": "Indirizzo",
   "TR_ADDRESSES_CHANGE": "Modifica indirizzi",
   "TR_ADDRESSES_FRESH": "Indirizzi nuovi",
@@ -262,7 +271,7 @@
   "TR_ADDRESS_MODAL_CLIPBOARD": "Copia indirizzo",
   "TR_ADDRESS_MODAL_TITLE": "Indirizzo di ricezione {networkName}",
   "TR_ADDRESS_MODAL_TITLE_EXCHANGE": "Indirizzo di ricezione {networkCurrencyName} sulla rete {networkName}",
-  "TR_ADDRESS_PHISHING_WARNING": "Per evitare attacchi di phishing, devi verificare l'indirizzo su Trezor. {claim}",
+  "TR_ADDRESS_PHISHING_WARNING": "Per evitare attacchi di phishing, verifica l'indirizzo di ricezione su Trezor. {claim}",
   "TR_ADD_ACCOUNT": "Aggiungi conto",
   "TR_ADD_HIDDEN_WALLET": "Aggiungi wallet nascosto",
   "TR_ADD_NETWORK_ACCOUNT": "Aggiungi conto {network}",
@@ -289,7 +298,9 @@
   "TR_ALLOW_ANALYTICS": "Utilizzo dei dati",
   "TR_ALLOW_ANALYTICS_DESCRIPTION": "Tutti i dati vengono mantenuti rigorosamente anonimi. Sono utilizzati solo per migliorare l'ecosistema di Trezor.",
   "TR_ALLOW_AUTOMATIC_SUITE_UPDATES": "Aggiornamenti automatici di Trezor Suite",
-  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Trezor Suite scarica automaticamente l'ultima versione in background e la installa al riavvio dell'applicazione. In questo modo si garantisce che funzionalità e patch di sicurezza siano sempre aggiornati. Gli aggiornamenti vengono installati senza richiedere l'autorizzazione dell'utente.",
+  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Scaricare automaticamente la versione più recente di Trezor Suite in background e installarla al riavvio dell'app. In questo modo si garantisce che le funzionalità e i patch di sicurezza siano sempre aggiornati. Gli aggiornamenti vengono installati senza richiedere l'autorizzazione dell'utente.",
+  "TR_ALL_NETWORKS": "Tutte le reti ({networkCount})",
+  "TR_ALL_NETWORKS_TOOLTIP": "Visualizza token da tutte le {networkCount} reti. Filtra in base alle reti più diffuse.",
   "TR_ALL_TRANSACTIONS": "Transazioni",
   "TR_AMOUNT_SENT": "Importo inviato",
   "TR_AMOUNT_TOO_BIG_FOR_COINJOIN": "Non idoneo per coinjoin - importo troppo elevato",
@@ -348,20 +359,20 @@
   "TR_BEFORE_ANY_FURTHER_ACTIONS": "Anche se improbabile, potresti dover accedere al back-up del wallet in caso di problemi con l'aggiornamento del firmware.",
   "TR_BIP_SIG_FORMAT": "Trezor",
   "TR_BITCOIN_ONLY_UNAVAILABLE": "Prima di passare a {bitcoinOnly}, devi aggiornare il firmware alla versione più recente.",
-  "TR_BREAKING_ANONYMITY_CHECKBOX": "Sono consapevole che sto compromettendo il mio anonimato",
+  "TR_BREAKING_ANONYMITY_CHECKBOX": "Sono consapevole che sto compromettendo il mio anonimato.",
   "TR_BRIDGE": "Trezor Bridge",
   "TR_BRIDGE_DEV_MODE_START": "Avvio di Trezor Bridge sulla porta 21324",
   "TR_BRIDGE_DEV_MODE_STOP": "Avvio di Trezor Bridge sulla porta predefinita",
   "TR_BRIDGE_GO_TO_WALLET_DESCRIPTION": "Vuoi continuare? Il tuo dispositivo può essere utilizzato solo da un'app alla volta. Se al momento stai utilizzando un'altra app con il tuo dispositivo Trezor, termina prima quella sessione.",
   "TR_BRIDGE_NEEDED_DESCRIPTION": "Il browser non è supportato. Per un'esperienza ottimale, scarica ed esegui l'app per desktop Trezor Suite in background oppure utilizza un browser basato su Chromium supportato e compatibile con WebUSB.",
   "TR_BRIDGE_REQUESTED_DESCRIPTION": "Un'altra app ha richiesto a Trezor Suite di connettersi al tuo dispositivo Trezor. Mantieni Trezor Suite in esecuzione in background e riprova l'azione nell'altra app.",
+  "TR_BRIDGE_TIP_AUTOSTART": "Suggerimento: Attiva la funzione di avvio automatico ed esegui sempre Bridge in background.",
   "TR_BTC_UNITS": "Unità Bitcoin",
   "TR_BUG": "Bug",
   "TR_BUMP_FEE": "Aumenta commissione",
+  "TR_BUMP_FEE_DISABLED_TOOLTIP": "Per accelerare le transazioni, aumenta la commissione della transazione meno recente in coda (in base al nonce). Le transazioni devono essere confermate in ordine. <a>Ulteriori informazioni</a>",
   "TR_BUY": "Acquista",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "Operazioni di trading",
   "TR_BUY_BUY": "Acquista",
-  "TR_BUY_BUY_AGAIN": "Acquista di nuovo",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Confermato su Trezor",
   "TR_BUY_DETAIL_ERROR_BUTTON": "Torna al conto",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "Vai all'assistenza del provider",
@@ -386,12 +397,12 @@
   "TR_BUY_MODAL_FOR_YOUR_SAFETY": "Acquista {cryptocurrency} con {provider}",
   "TR_BUY_MODAL_LEGAL_HEADER": "Nota legale",
   "TR_BUY_MODAL_SECURITY_HEADER": "La sicurezza è al primo posto con Trezor",
-  "TR_BUY_MODAL_TERMS_1": "Sei qui per acquistare criptovalute. Se sei stato indirizzato a questo sito per qualsiasi altro motivo, contatta l'assistenza di {provider} prima di continuare.",
-  "TR_BUY_MODAL_TERMS_2": "Utilizzi questa funzionalità per acquistare fondi che verranno inviati a un conto sotto il tuo controllo diretto.",
-  "TR_BUY_MODAL_TERMS_3": "Sei consapevole che le transazioni in criptovaluta sono irreversibili e che potrebbero non essere rimborsate. Pertanto, è possibile che eventuali perdite accidentali o causate da azioni fraudolente non siano recuperabili.",
-  "TR_BUY_MODAL_TERMS_4": "Sei consapevole che Invity non fornisce questo servizio. Il servizio è disciplinato dai termini di {provider}.",
-  "TR_BUY_MODAL_TERMS_5": "Non utilizzi questa funzionalità per il gioco d'azzardo, per attività fraudolente o per violare in alcun modo i Termini di servizio di Invity o del provider o qualsiasi normativa applicabile.",
-  "TR_BUY_MODAL_TERMS_6": "Sei consapevole che le criptovalute sono uno strumento finanziario emergente e che le normative possono variare a seconda della giurisdizione. Ciò potrebbe comportare un rischio maggiore di frodi, furti o instabilità del mercato.",
+  "TR_BUY_MODAL_TERMS_1": "Sono su questo sito per acquistare criptovalute. Se sono stato indirizzato a questo sito per qualsiasi altro motivo, contatterò l'assistenza di {provider} prima di continuare.",
+  "TR_BUY_MODAL_TERMS_2": "Utilizzerò questa funzione per acquistare criptovalute che saranno inviate sul mio conto.",
+  "TR_BUY_MODAL_TERMS_3": "Sono consapevole che le transazioni in criptovaluta sono definitive e non possono essere annullate o rimborsate. Le perdite causate da frodi o errori potrebbero non essere recuperate.",
+  "TR_BUY_MODAL_TERMS_4": "Sono consapevole che Invity non fornisce questo servizio. È soggetto a termini e condizioni di {provider}.",
+  "TR_BUY_MODAL_TERMS_5": "Non utilizzerò questa funzione per il gioco d'azzardo o per qualsiasi attività che violi i Termini di servizio di Invity o del provider o qualsiasi normativa applicabile.",
+  "TR_BUY_MODAL_TERMS_6": "Sono consapevole che le criptovalute sono uno strumento finanziario emergente e che le normative possono variare da regione a regione. Ciò potrebbe comportare un rischio maggiore di frodi, furti o instabilità del mercato.",
   "TR_BUY_MODAL_VERIFIED_PARTNERS_HEADER": "Partner verificati da Invity",
   "TR_BUY_NETWORK": "Acquista {network}",
   "TR_BUY_NOT_TRANSACTIONS": "Nessuna transazione per ora.",
@@ -406,12 +417,10 @@
   "TR_BUY_STATUS_PENDING": "In sospeso",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "In sospeso",
   "TR_BUY_STATUS_SUCCESS": "Approvata",
-  "TR_BUY_TRANS_ID": "ID trans.:",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "Il valore massimo è {maximum}",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "Il valore massimo è {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "Il valore minimo è {minimum}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "Il valore minimo è {minimum} {currency}",
-  "TR_BUY_VIEW_DETAILS": "Visualizza dettagli",
   "TR_BYTES": "byte",
   "TR_CAMERA_NOT_RECOGNIZED": "La fotocamera non è stata riconosciuta.",
   "TR_CAMERA_PERMISSION_DENIED": "L'autorizzazione per accedere alla fotocamera è stata negata.",
@@ -430,12 +439,12 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Importo Trezor",
   "TR_CHAINED_TXS": "Transazioni concatenate",
   "TR_CHANGELOG": "Changelog",
-  "TR_CHANGELOG_ON_GITHUB": "Changelog su GitHub",
   "TR_CHANGE_ADDRESS_TOOLTIP": "Questo è un indirizzo modificato creato da un invio precedente.",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "Puoi modificare il tipo di firmware nelle impostazioni in qualsiasi momento.",
   "TR_CHANGE_HOMESCREEN": "Modifica homescreen",
   "TR_CHANGE_PIN": "Modifica PIN",
   "TR_CHANGE_WIPE_CODE": "Modifica codice di eliminazione",
+  "TR_CHECKED_BALANCES_ON": "Saldo controllato attivo",
   "TR_CHECKING_YOUR_DEVICE": "Verifica del dispositivo in corso",
   "TR_CHECKSUM_CONVERSION_INFO": "Convertito in checksum. <a>Ulteriori informazioni</a>",
   "TR_CHECK_DEVICE_ORIGIN_DESCRIPTION": "Verificheremo l'integrità del tuo dispositivo Trezor, garantendone la sicurezza e confermando l'autenticità del chip.",
@@ -447,8 +456,7 @@
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "Simula un recupero per verificare la frase Seed di recupero.",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "Immetti qui le parole della frase Seed di recupero nell'ordine visualizzato sul dispositivo. È possibile che ti venga chiesto di digitare alcune parole che non fanno parte della frase Seed di recupero come ulteriore misura di sicurezza.",
   "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "Usa il tastierino a due pulsanti per immettere la frase Seed di recupero (back-up del wallet). In questo modo, puoi proteggere tutte le tue informazioni sensibili su un dispositivo non esposto ai rischi di sicurezza che caratterizzano i computer o i browser web.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "La frase Seed di recupero (back-up del wallet) viene immessa tramite touchscreen. In questo modo, si evita di esporre le informazioni sensibili ai rischi di sicurezza che derivano dall'uso di computer o browser web potenzialmente non sicuri.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "Il back-up del wallet viene immesso tramite touchscreen. In questo modo, si evita di esporre le informazioni sensibili ai rischi di sicurezza che derivano dall'uso di computer o browser web potenzialmente non sicuri.",
+  "TR_CHECK_RECOVERY_SEED_DESC_TOUCHSCREEN": "Il back-up del wallet viene immesso tramite touchscreen. In questo modo, si evita di esporre le informazioni sensibili ai rischi di sicurezza che derivano dall'uso di computer o browser web potenzialmente non sicuri.",
   "TR_CHECK_SEED": "Controlla back-up",
   "TR_CHECK_YOUR_DEVICE": "Controlla la schermata di Trezor",
   "TR_CHOOSE_RECOVERY_TYPE": "Scegli il tipo di recupero",
@@ -502,10 +510,37 @@
   "TR_COINJOIN_TILE_3_TITLE": "Protetto da Trezor",
   "TR_COINJOIN_TRANSACTION_BATCH": "Transazioni coinjoin",
   "TR_COINMARKET_BEST_RATE": "Miglior tasso",
+  "TR_COINMARKET_BUY_AND_SELL": "Acquista e vendi",
+  "TR_COINMARKET_BUY_AND_SELL_COUNTER": "{totalBuys, plural, =0 {{totalBuys} acquisto} one {{totalBuys} acquisto} other {{totalBuys} acquisti} } • {totalSells, plural, =0 {{totalSells} vendita} one {{totalSells} vendita} other {{totalSells} vendite} }",
+  "TR_COINMARKET_CEX_TOOLTIP": "Exchange centralizzato",
+  "TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY": "Modifica l'importo o la valuta.",
   "TR_COINMARKET_COMPARE_OFFERS": "Confronta tutte le offerte",
   "TR_COINMARKET_COUNTRY": "Paese di residenza",
+  "TR_COINMARKET_DCA_DOWNLOAD": "Scarica l'app mobile Invity per iniziare a risparmiare in bitcoin",
+  "TR_COINMARKET_DCA_FEATURE_1_DESCRIPTION": "Un piano di risparmio DCA per la custodia semplice e sicuro.",
+  "TR_COINMARKET_DCA_FEATURE_1_SUBHEADING": "Sviluppato da SatoshiLabs",
+  "TR_COINMARKET_DCA_FEATURE_2_DESCRIPTION": "Preleva per la custodia autonoma senza commissioni aggiuntive.",
+  "TR_COINMARKET_DCA_FEATURE_2_SUBHEADING": "Prelievi gratuiti",
+  "TR_COINMARKET_DCA_FEATURE_3_DESCRIPTION": "Un'interfaccia intuitiva, veloce e semplificata.",
+  "TR_COINMARKET_DCA_FEATURE_3_SUBHEADING": "Semplicità d'uso",
+  "TR_COINMARKET_DCA_FEATURE_4_DESCRIPTION": "Monitora la cronologia, gli importi e la frequenza dei tuoi investimenti.",
+  "TR_COINMARKET_DCA_FEATURE_4_SUBHEADING": "Panoramica di DCA",
+  "TR_COINMARKET_DCA_HEADING": "Risparmia in bitcoin con l'app Invity",
+  "TR_COINMARKET_DEX_TOOLTIP": "Exchange decentralizzato",
   "TR_COINMARKET_ENTER_AMOUNT_IN": "Immetti importo in {currency}",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_KYC_ALL": "Tutte le opzioni KYC",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_NO_KYC": "KYC mai richiesto",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_ALL": "Tutte le offerte CEX e DEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_DEX": "DEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FIXED_CEX": "CEX a tasso fisso",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FLOATING_CEX": "CEX a tasso variabile",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING": "DEX",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING_TOOLTIP": "Un Decentralized Exchange (DEX) consente di fare trading in cripto direttamente sulla blockchain senza bisogno di un'autorità o un intermediario centrali.",
+  "TR_COINMARKET_EXCHANGE_FIXED_OFFERS_HEADING": "CEX a tasso fisso",
+  "TR_COINMARKET_EXCHANGE_FLOAT_OFFERS_HEADING": "CEX a tasso variabile",
   "TR_COINMARKET_FEATURED_OFFERS_HEADING": "Offerte in primo piano",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_BUY_LABEL": "Pagamento:",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_SELL_LABEL": "Metodo di ricezione:",
   "TR_COINMARKET_FEES_INCLUDED": "Commissioni incluse",
   "TR_COINMARKET_FEES_NOT_INCLUDED": "Commissioni non incluse",
   "TR_COINMARKET_FEES_ON_WEBSITE": "Alcune commissioni non sono incluse nel prezzo visualizzato. Potrai rivedere il prezzo finale sul sito web del fornitore.",
@@ -518,24 +553,18 @@
   "TR_COINMARKET_KYC_NO_REFUND": "KYC richiesto in casi eccezionali. KYC richiesto per i rimborsi. 👈",
   "TR_COINMARKET_KYC_POLICY": "Politica KYC",
   "TR_COINMARKET_KYC_POLICY_NEVER_REQUIRED": "KYC mai richiesto",
-  "TR_COINMARKET_KYC_YES_REFUND": "KYC richiesto in casi eccezionali. KYC non richiesto per i rimborsi. 🤝",
+  "TR_COINMARKET_KYC_YES_REFUND": "Il KYC è richiesto solo in casi eccezionali. Non è richiesto per i rimborsi. 🤝",
   "TR_COINMARKET_LAST_TRANSACTIONS": "Ultime transazioni",
   "TR_COINMARKET_NETWORK_FEE": "Commissione di rete",
   "TR_COINMARKET_NETWORK_TOKENS": "{networkName} token",
   "TR_COINMARKET_NO_CEX_PROVIDER_FOUND": "Nessun provider CEX trovato",
   "TR_COINMARKET_NO_DEX_PROVIDER_FOUND": "Nessun provider DEX trovato",
   "TR_COINMARKET_NO_METHODS_AVAILABLE": "Nessun metodo disponibile",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "Ricaricamento automatico tra",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "Torna al trade",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "Nessuna offerta",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "Al momento non sono disponibili offerte a causa di un problema di connettività del server.",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "Al momento non sono disponibili offerte. Prova a ricaricare la pagina o a modificare la query.",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "Ricarica pagina",
   "TR_COINMARKET_OFFERS_EMPTY": "Nessuna offerta disponibile per la tua richiesta. Modifica il paese o l'importo di acquisto",
   "TR_COINMARKET_OFFERS_REFRESH": "Aggiornamento offerte tra",
   "TR_COINMARKET_OFFERS_SELECT": "Seleziona",
   "TR_COINMARKET_OFFER_LOOKING": "Ricerca della tua offerta migliore",
-  "TR_COINMARKET_OFFER_NO_FOUND": "Nessuna offerta disponibile per la tua richiesta. Modifica l'importo o la valuta.",
+  "TR_COINMARKET_OFFER_NO_FOUND": "Nessuna offerta disponibile per la tua richiesta.",
   "TR_COINMARKET_ON_NETWORK_CHAIN": "Sulla chain {networkName}",
   "TR_COINMARKET_OTHER_CURRENCIES": "Altre valute",
   "TR_COINMARKET_PAYMENT_METHOD": "Metodo di pagamento",
@@ -544,9 +573,36 @@
   "TR_COINMARKET_RECEIVE_METHOD": "Metodo di ricezione",
   "TR_COINMARKET_SELL": "Vendi",
   "TR_COINMARKET_SHOW_OFFERS": "Confronta le offerte",
+  "TR_COINMARKET_SWAP": "Scambia",
+  "TR_COINMARKET_SWAP_AMOUNT": "Importo di scambio",
+  "TR_COINMARKET_SWAP_COUNTER": "{totalSwaps, plural, =0 {{totalSwaps} cambio} one {{totalSwaps} cambio} other {{totalSwaps} cambi} }",
+  "TR_COINMARKET_SWAP_DEX_MODAL_CONFIRM": "Desidero scambiare",
+  "TR_COINMARKET_SWAP_DEX_MODAL_FOR_YOUR_SAFETY": "Scambia {fromCrypto} in {toCrypto} con {provider}",
+  "TR_COINMARKET_SWAP_DEX_MODAL_LEGAL_HEADER": "Nota legale",
+  "TR_COINMARKET_SWAP_DEX_MODAL_SECURITY_HEADER": "La sicurezza è al primo posto con Trezor",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_1": "Desidero scambiare criptovalute tramite DEX (Decentralized Exchange) utilizzando il contratto di {provider}.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_2": "Desidero scambiare criptovalute sul mio conto. Sono consapevole che le politiche del provider potrebbero richiedere la verifica dell'identità.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_3": "Sono consapevole che le transazioni in criptovaluta sono definitive e non possono essere annullate o rimborsate. Le perdite causate da frodi o errori potrebbero non essere recuperate.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4": "Sono consapevole che Invity non fornisce questo servizio. È soggetto a termini e condizioni di {provider}.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_5": "Non utilizzerò questa funzione per il gioco d'azzardo o per qualsiasi attività che violi i Termini di servizio di Invity o del provider o qualsiasi normativa applicabile.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_6": "Sono consapevole che le criptovalute sono uno strumento finanziario emergente e che le normative possono variare da regione a regione. Ciò potrebbe comportare un rischio maggiore di frodi, furti o instabilità del mercato.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_VERIFIED_PARTNERS_HEADER": "Partner verificati da Invity",
+  "TR_COINMARKET_SWAP_MODAL_CONFIRM": "Desidero scambiare",
+  "TR_COINMARKET_SWAP_MODAL_FOR_YOUR_SAFETY": "Scambia {fromCrypto} in {toCrypto} con {provider}",
+  "TR_COINMARKET_SWAP_MODAL_LEGAL_HEADER": "Nota legale",
+  "TR_COINMARKET_SWAP_MODAL_SECURITY_HEADER": "La sicurezza è al primo posto con Trezor",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_1": "Sono su questo sito per scambiare criptovalute. Se sono stato indirizzato a questo sito per qualsiasi altro motivo, contatterò l'assistenza di Trezor prima di continuare. ",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_2": "Desidero scambiare criptovalute sul mio conto. Sono consapevole che le politiche del provider potrebbero richiedere la verifica dell'identità.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_3": "Sono consapevole che le transazioni in criptovaluta sono definitive e non possono essere annullate o rimborsate. Le perdite causate da frodi o errori potrebbero non essere recuperate.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_4": "Sono consapevole che Invity non fornisce questo servizio. È soggetta ai Termini e condizioni di {provider}.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_5": "Non utilizzerò questa funzione per il gioco d'azzardo o per qualsiasi attività che violi i Termini di servizio di Invity o del provider o qualsiasi normativa applicabile.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_6": "Sono consapevole che le criptovalute sono uno strumento finanziario emergente e che le normative possono variare da regione a regione. Ciò potrebbe comportare un rischio maggiore di frodi, furti o instabilità del mercato.",
+  "TR_COINMARKET_SWAP_MODAL_VERIFIED_PARTNERS_HEADER": "Partner verificati da Invity",
   "TR_COINMARKET_TOKEN_NETWORK": "{tokenName} sulla rete {networkName}",
   "TR_COINMARKET_TRADE_FEE": "Commissione di trading",
+  "TR_COINMARKET_TRANS_ID": "Trans. ID:",
   "TR_COINMARKET_UNKNOWN_PROVIDER": "Provider sconosciuto",
+  "TR_COINMARKET_VIEW_DETAILS": "Visualizza dettagli",
   "TR_COINMARKET_YOUR_BEST_OFFER": "La tua offerta migliore",
   "TR_COINMARKET_YOU_BUY": "Compra",
   "TR_COINMARKET_YOU_GET": "Ricevi",
@@ -571,6 +627,7 @@
   "TR_CONFIRMED_TX": "Confermata",
   "TR_CONFIRMING_TX": "Conferma transazione in corso",
   "TR_CONFIRM_ACTION_ON_YOUR": "Segui le istruzioni visualizzate sullo schermo di Trezor",
+  "TR_CONFIRM_ADDRESS": "Conferma indirizzo",
   "TR_CONFIRM_BEFORE_COPY": "Conferma su Trezor prima di copiare",
   "TR_CONFIRM_CONDITIONS": "Conferma le condizioni prima di continuare.",
   "TR_CONFIRM_EMPTY_HIDDEN_WALLET_ON": "Conferma il wallet nascosto vuoto sul dispositivo \"{deviceLabel}\".",
@@ -593,13 +650,13 @@
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_BUTTON": "Gestisci",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_DESCRIPTION": "Abilita l'apertura della finestra di dialogo di immissione della passphrase all'apertura di Trezor Suite.",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_TITLE": "Utilizzi principalmente una passphrase?",
-  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Verifica su Trezor per confermare l'indirizzo di ricezione. Si sconsiglia di continuare senza confermare.",
+  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Verifica su Trezor per confermare l'indirizzo di ricezione. Si consiglia di non continuare senza confermare.",
   "TR_CONNECT_DEVICE_RECEIVE_PROMO_TITLE": "Impossibile verificare l'indirizzo di ricezione",
   "TR_CONNECT_DEVICE_SEND_PROMO_DESCRIPTION": "Per inviare coin, collega Trezor.",
   "TR_CONNECT_DEVICE_SEND_PROMO_TITLE": "Trezor non è connesso",
   "TR_CONNECT_TREZOR_TO_SEND_BUTTON": "Collega Trezor per inviare",
   "TR_CONNECT_YOUR_DEVICE": "Connetti e sblocca Trezor",
-  "TR_CONTACT_SUPPORT": "Contatta l'assistenza",
+  "TR_CONTACT_SUPPORT": "Contatta l'Assistenza di Trezor",
   "TR_CONTACT_TREZOR_SUPPORT": "Contatta l'Assistenza di Trezor",
   "TR_CONTINUE": "Continua",
   "TR_CONTINUE_ANYWAY": "Continua comunque",
@@ -619,7 +676,7 @@
   "TR_COPY_ADDRESS_POLICY_ID": "Non inviare mai fondi a un indirizzo ID policy.",
   "TR_COPY_AND_CLOSE": "Copia e chiudi",
   "TR_COPY_SIGNED_MESSAGE": "Copia messaggio firmato",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "Copia",
+  "TR_COPY_TO_CLIPBOARD": "Copia",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "Impossibile recuperare il changelog",
   "TR_COULD_NOT_RETRIEVE_DATA": "Impossibile recuperare i dati",
   "TR_COUNT_WALLETS": "{count} {count, plural, one {wallet} other {wallet}}",
@@ -630,7 +687,7 @@
   "TR_CREATE_SHARES": "Crea condivisioni su Trezor",
   "TR_CREATE_SHARES_CARD_1": "Prendi carta e penna e stampa <cardsLink>schede di back-up</cardsLink> o usa <keepLink>Trezor Keep Metal</keepLink>",
   "TR_CREATE_SHARES_CARD_2": "Non fare foto o copie digitali del back-up del wallet",
-  "TR_CREATE_SHARES_CARD_3": "Assicurati che non ci siano persone intorno",
+  "TR_CREATE_SHARES_CARD_3": "Assicurati di non avere persone attorno",
   "TR_CREATE_SHARES_EXAMPLE": "Esempio: 5 condivisioni totali, 3 richieste per recuperare il wallet",
   "TR_CREATE_SHARES_EXPLANATION": "Seleziona il numero totale di condivisioni, quindi scegli il numero minimo richiesto per recuperare Trezor.",
   "TR_CREATE_WALLET": "Crea nuovo wallet",
@@ -653,6 +710,7 @@
   "TR_DASHBOARD_ASSET_FAILED": "Asset non caricati correttamente",
   "TR_DASHBOARD_DISCOVERY_ERROR": "Errore di individuazione",
   "TR_DASHBOARD_DISCOVERY_ERROR_PARTIAL_DESC": "I conti non sono stati caricati correttamente {details}",
+  "TR_DATA": "Dati",
   "TR_DATABASE_UPGRADE_BLOCKED": "Aggiornamento del database bloccato da un'altra istanza dell'app",
   "TR_DATA_ANALYTICS_CATEGORY_1": "Piattaforma",
   "TR_DATA_ANALYTICS_CATEGORY_1_ITEM_1": "OS, modello di Trezor, versione, ecc.",
@@ -706,8 +764,13 @@
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT": "In bootloader per errore?",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_BUTTON": "Riconnetti il dispositivo senza toccare alcun pulsante.",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_TOUCH": "Riconnetti il dispositivo senza toccare lo schermo.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED": "Questo dispositivo è in uso altrove.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION": "Attualmente l'app {transportSessionOwner} potrebbe essere in uso su questo dispositivo. Se necessario, puoi assumere il controllo del dispositivo.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION_UNKNOWN_APP": "Attualmente un'altra app potrebbe essere in uso su questo dispositivo. Se necessario, puoi assumere il controllo del dispositivo.",
   "TR_DEVICE_CONNECTED_WRONG_STATE": "Rilevato stato non corretto del dispositivo",
   "TR_DEVICE_DISCONNECTED_DURING_ACTION_DESCRIPTION": "Trezor è stato disconnesso durante la procedura di back-up. Ti consigliamo di utilizzare l'opzione di ripristino delle impostazioni di fabbrica in Impostazioni dispositivo per eliminare il contenuto del dispositivo e riavviare la procedura di back-up.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH": "Impossibile eseguire il controllo dell'hash del firmware. Trezor potrebbe essere contraffatto.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR": "Non è stato possibile eseguire il controllo dell'hash del firmware. Trezor potrebbe essere contraffatto.",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON": "Disattiva",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON_DISABLED": "Attiva",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION": "Il controllo della revisione del firmware è una funzione di sicurezza fondamentale. Si consiglia vivamente di mantenerla attiva.",
@@ -726,6 +789,8 @@
   "TR_DEVICE_LABEL_IS_NOT_BACKED_UP": "Il back-up del dispositivo \"{deviceLabel}\" non è stato eseguito",
   "TR_DEVICE_LABEL_IS_NOT_CONNECTED": "Il dispositivo \"{deviceLabel}\" non è connesso",
   "TR_DEVICE_LABEL_IS_UNAVAILABLE": "Il dispositivo \"{deviceLabel}\" non è disponibile",
+  "TR_DEVICE_MAYBE_COMPROMISED_HEADING": "Verifica del dispositivo non riuscita",
+  "TR_DEVICE_MAYBE_COMPROMISED_TEXT": "Ricollega il dispositivo e prova a eseguire nuovamente la verifica. Se il problema persiste, contatta l'Assistenza di Trezor per capire cosa è successo al tuo dispositivo e i passi successivi da intraprendere.",
   "TR_DEVICE_NOT_CONNECTED": "Dispositivo non connesso",
   "TR_DEVICE_NOT_INITIALIZED": "Trezor non è configurato",
   "TR_DEVICE_NOT_INITIALIZED_TEXT": "Ti guideremo nella procedura e potrai iniziare a utilizzarlo subito.",
@@ -788,7 +853,6 @@
   "TR_DOWNLOAD_LATEST_BRIDGE": "Scarica la versione più recente di Bridge {version}",
   "TR_DO_NOT_DISCONNECT_DEVICE": "Non disconnettere il dispositivo",
   "TR_DO_NOT_SHOW_AGAIN": "Non mostrare più",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "Saltare questo passaggio?",
   "TR_DROPBOX": "Dropbox",
   "TR_DROPZONE": "Trascina e rilascia il file qui o clicca per selezionare un file",
   "TR_DROPZONE_ERROR": "Importazione non riuscita: {error}",
@@ -809,13 +873,13 @@
   "TR_EARLY_ACCESS_ENABLE": "Partecipa",
   "TR_EARLY_ACCESS_ENABLED": "Programma di accesso in anteprima abilitato",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM": "Partecipa al Programma",
-  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "Sono consapevole che il Programma mi consente di accedere a versioni non definitive del software, che potrebbero contenere errori suscettibili di influire sul normale funzionamento di Suite.",
+  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "Sono consapevole che il Programma mi consente di accedere a versioni non definitive del software, che potrebbero contenere errori suscettibili di influire sul normale funzionamento di Trezor Suite.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_DESCRIPTION": "Puoi disattivarlo in qualsiasi momento.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TITLE": "Prova le ultime funzionalità del prodotto prima del rilascio al pubblico.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TOOLTIP": "Cerca prima nel campo qui sopra",
   "TR_EARLY_ACCESS_JOINED_DESCRIPTION": "Puoi cercare gli aggiornamenti beta ora o al prossimo lancio.",
   "TR_EARLY_ACCESS_JOINED_TITLE": "Programma di accesso in anteprima abilitato",
-  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "Per eseguire il downgrade all'ultima versione stabile di Suite, clicca su \"Scarica stabile\" e reinstalla l'app.",
+  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "Per eseguire il downgrade all'ultima versione stabile di Trezor Suite, fai clic su \"Scarica stabile\" e reinstalla l'app.",
   "TR_EARLY_ACCESS_LEFT_TITLE": "Hai abbandonato il Programma di accesso in anteprima. Le versioni beta non sono più disponibili.",
   "TR_EARLY_ACCESS_MENU": "Programma di accesso in anteprima",
   "TR_EARLY_ACCESS_REINSTALL": "Scarica stabile",
@@ -842,8 +906,8 @@
   "TR_ENTER_SEED_WORDS_ON_DEVICE": "Le parole vengono immesse sul dispositivo per motivi di sicurezza. Immetti le parole nell'ordine corretto.",
   "TR_ENTER_WIPECODE": "Immetti codice di eliminazione",
   "TR_ERROR": "Errore",
-  "TR_ERROR_CARDANO_DELEGATE": "Importo insufficiente",
-  "TR_ERROR_CARDANO_WITHDRAWAL": "Importo insufficiente",
+  "TR_ERROR_CARDANO_DELEGATE": "L'importo non è sufficiente",
+  "TR_ERROR_CARDANO_WITHDRAWAL": "L'importo non è sufficiente",
   "TR_ETH_ADDRESS_CANT_VERIFY_HISTORY": "Impossibile verificare la cronologia degli indirizzi. Verifica che l'indirizzo sia corretto.",
   "TR_ETH_ADDRESS_NOT_USED_NOT_CHECKSUMMED": "L'indirizzo non ha una cronologia delle transazioni e non è sottoposto a checksum. Verifica che l'indirizzo sia corretto.",
   "TR_EVM_EXPLANATION_DESCRIPTION": "Ha lo stesso stile di indirizzo di Ethereum ma utilizza coin e token unici che non possono essere utilizzati su altre reti.",
@@ -870,7 +934,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "Approva solo l'importo esatto richiesto per questo scambio. Dovrai pagare una commissione aggiuntiva se desideri eseguire nuovamente uno swap simile.",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "Revoca approvazione precedente",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "Esegui una transazione che rimuoverà la precedente approvazione del contratto con {provider}.",
-  "TR_EXCHANGE_BUY": "Per",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Conferma su Trezor e invia",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "Conferma e invia",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "Crea approvazione",
@@ -892,8 +955,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "La transazione è andata a buon fine.",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "Approvata",
   "TR_EXCHANGE_DEX": "Offerta su exchange decentralizzato",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "Le commissioni per l'esecuzione di questo swap sono stimate a {approvalFee} ({approvalFeeFiat}) per l'approvazione (se richiesta) e a {swapFee} ({swapFeeFiat}) per lo swap.",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "Nessun fondo residuo per le commissioni di transazione. Riduci l'importo dello scambio a max {symbol} {max}",
   "TR_EXCHANGE_EXTRA_FIELD": "{extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "{extraFieldName} non è valido",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "{extraFieldDescription}",
@@ -903,7 +964,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "Con i tassi fissi, al termine dello scambio otterrai esattamente quello che vedi: l'importo resterà invariato da quando selezioni il tasso fino al completamento della transazione. Ti garantiamo l'importo indicato, ma questi tassi sono solitamente meno generosi, il che significa che potrai acquistare meno criptovalute con il tuo denaro.",
   "TR_EXCHANGE_FLOAT": "Offerta a tasso variabile",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "Con i tassi variabili, l'importo finale che otterrai potrebbe variare leggermente a causa delle fluttuazioni del mercato da quando selezioni il tasso fino al completamento della transazione. Questi tassi sono solitamente più elevati, il che significa che alla fine potresti ottenere più criptovalute.",
-  "TR_EXCHANGE_PROVIDER": "Provider",
   "TR_EXCHANGE_RATE": "Prezzo",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "Il conto di ricezione è esterno a Suite.",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "Questo è l'indirizzo alfanumerico specifico a cui saranno inviati i coin.",
@@ -930,23 +990,16 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "Immetti un numero.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "Immetti lo slippage desiderato.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "Importo dell'offerta swap",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "Riepilogo dello slippage",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "Tolleranza allo slippage",
-  "TR_EXCHANGE_TRANS_ID": "ID trans.:",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "Utilizza un conto ({symbol}) non presente in Suite",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "Indirizzo di ricezione",
-  "TR_EXCHANGE_VIEW_DETAILS": "Visualizza dettagli",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE": "Aggiornamenti automatici di Trezor Suite",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION": "Trezor Suite scarica automaticamente l'ultima versione in background e la installa al riavvio dell'applicazione. In questo modo si garantisce che le funzionalità e i patch di sicurezza siano sempre aggiornati. Gli aggiornamenti vengono installati senza richiedere l'autorizzazione dell'utente.",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN": "Smart Chain BNB",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON": "Attiva BNB Smart Chain senza transazioni interne storiche.",
   "TR_EXPERIMENTAL_FEATURES": "Sperimentale",
   "TR_EXPERIMENTAL_FEATURES_ALLOW": "Funzionalità sperimentali",
   "TR_EXPERIMENTAL_FEATURES_WARNING": "Solo per utenti esperti. L'utilizzo del presente servizio avviene a proprio rischio e pericolo. Queste funzioni sono in fase di test. Di conseguenza potrebbero risultare instabili e non essere supportate a lungo termine.",
   "TR_EXPERIMENTAL_PASSWORD_MANAGER": "Migrazione delle password Dropbox",
-  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Utility per recuperare le password memorizzate su Dropbox e protette da Trezor. Progettazione per i precedenti utenti dell'estensione Chrome di Trezor Password Manager.",
+  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Utilizza questa Utility per recuperare le password memorizzate su Dropbox e protette da Trezor. Progettato per gli utenti che utilizzavano l'estensione Trezor Password Manager per Chrome.",
   "TR_EXPERIMENTAL_TOR_SNOWFLAKE": "Tor Snowflake",
-  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Tor Snowflake è un sistema che consente l'accesso a siti web e applicazioni censurati.",
+  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Accedi a siti Web e app censurati utilizzando Tor Snowflake, un sistema progettato per evitare le restrizioni.",
   "TR_EXPORT_AS": "Esporta come {as}",
   "TR_EXPORT_FAIL": "Esportazione non riuscita.",
   "TR_EXPORT_TO_FILE": "Esporta su file",
@@ -984,6 +1037,7 @@
   "TR_FIRMWARE_NEW_FW_DESCRIPTION": "Il nuovo firmware è ora disponibile. Aggiorna subito il tuo dispositivo o scegli di farlo in un secondo momento.",
   "TR_FIRMWARE_REINSTALL_FW_DESCRIPTION": "Il dispositivo è già aggiornato all'ultima versione del firmware. Se necessario, puoi reinstallare il firmware.",
   "TR_FIRMWARE_REVISION_CHECK_FAILED": "Impossibile eseguire il controllo della revisione del firmware. Trezor potrebbe essere contraffatto.",
+  "TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR": "Non è stato possibile eseguire il controllo di revisione del firmware.",
   "TR_FIRMWARE_STATUS_INSTALLATION_COMPLETED": "Completata",
   "TR_FIRMWARE_SUBHEADING_BITCOIN": "Firmware leggero che supporta solo le operazioni Bitcoin.",
   "TR_FIRMWARE_SUBHEADING_NONE": "Trezor viene fornito senza firmware. Installa il firmware più recente per utilizzare il dispositivo in modo sicuro. Per gli utenti che utilizzano solo Bitcoin, si consiglia di installare il <button>firmware {bitcoinOnly}</button>.",
@@ -1021,7 +1075,7 @@
   "TR_GOT_IT_BUTTON": "Capito",
   "TR_GO_TO_ONBOARDING": "Avvia configurazione",
   "TR_GO_TO_SETTINGS": "Vai alle impostazioni",
-  "TR_GO_TO_SUITE": "Accedi a Suite",
+  "TR_GO_TO_SUITE": "Vai su Trezor Suite",
   "TR_GRAPH_LINEAR": "Lineare",
   "TR_GRAPH_LOGARITHMIC": "Logaritmico",
   "TR_GRAPH_MISSING_DATA": "XRP, Sol e gli importi di tutti i token sono inclusi nel saldo del wallet ma, al momento, non sono visualizzabili nella vista grafico.",
@@ -1040,7 +1094,7 @@
   "TR_GUIDE_FORUM": "Forum di Trezor",
   "TR_GUIDE_FORUM_LABEL": "Unisciti alla community di Trezor",
   "TR_GUIDE_SUGGESTION_LABEL": "Come andiamo?",
-  "TR_GUIDE_SUPPORT": "Contatta l'assistenza",
+  "TR_GUIDE_SUPPORT": "Contatta l'Assistenza di Trezor",
   "TR_GUIDE_SUPPORT_AND_FEEDBACK": "Assistenza e feedback",
   "TR_GUIDE_VIEW_HEADLINES_SUPPORT_FEEDBACK_SELECTION": "Assistenza e feedback",
   "TR_GUIDE_VIEW_HEADLINE_HELP_US_IMPROVE": "Aiutaci a migliorare",
@@ -1172,7 +1226,7 @@
   "TR_LOCAL_FILE_SYSTEM": "File system locale",
   "TR_LOG": "Log dell'applicazione",
   "TR_LOGIN_PROCEED": "Procedi",
-  "TR_LOG_DESCRIPTION": "Il log contiene tutte le informazioni tecniche necessarie su Trezor Suite. Può servire quando si contatta l'Assistenza di Trezor.",
+  "TR_LOG_DESCRIPTION": "Questo registro contiene informazioni tecniche essenziali su Trezor Suite e potrebbe essere necessario per contattare l'Assistenza di Trezor.",
   "TR_LOOKING_FOR_COINJOIN_ROUND": "In attesa di un round",
   "TR_LOW_ANONYMITY_WARNING": "<red>Privacy molto bassa.</red> Si raccomanda di impostare almeno il livello 1 su una scala da 1 a 5 poiché un valore inferiore a questa soglia non garantisce alcuna privacy.",
   "TR_LTC_ADDRESS_INFO": "Litecoin ha modificato il formato dell'indirizzo. Puoi trovare altre informazioni su come convertire il tuo indirizzo nel nostro blog. {TR_LEARN_MORE}",
@@ -1202,6 +1256,7 @@
   "TR_MULTI_SHARE_BACKUP_EXPLANATION_2": "Il back-up corrente ti consente comunque di recuperare i fondi. Conservalo in un luogo sicuro, separato dai back-up multi-condivisione.",
   "TR_MULTI_SHARE_BACKUP_GREAT": "Ottimo!",
   "TR_MULTI_SHARE_BACKUP_IN_PROGRESS": "Generazione di back-up multi-condivisione in corso",
+  "TR_MULTI_SHARE_BACKUP_IN_PROGRESS_DESCRIPTION": "Prima di continuare, è necessario terminare la generazione delle sue azioni di Backup multi-comparto. Segua le istruzioni sullo schermo del suo Trezor.",
   "TR_MULTI_SHARE_BACKUP_IN_PROGRESS_HEADING": "Eccoti! Riprendiamo da dove hai lasciato.",
   "TR_MULTI_SHARE_BACKUP_LOST_YOUR_BACKUP": "Hai perso il back-up del wallet?",
   "TR_MULTI_SHARE_BACKUP_LOST_YOUR_BACKUP_INFO_TEXT": "Potrebbero non essere disponibili opzioni per recuperare il wallet. Contatta l'assistenza di Trezor.",
@@ -1222,6 +1277,7 @@
   "TR_MY_PORTFOLIO": "Portfolio",
   "TR_NAV_ANONYMIZE": "Rendi privati i coin",
   "TR_NAV_BUY": "Acquista",
+  "TR_NAV_DCA": "DCA",
   "TR_NAV_DETAILS": "Dettagli",
   "TR_NAV_RECEIVE": "Ricevi",
   "TR_NAV_SELL": "Vendi",
@@ -1263,6 +1319,7 @@
   "TR_NETWORK_LITECOIN": "Litecoin",
   "TR_NETWORK_NAMECOIN": "Namecoin",
   "TR_NETWORK_NEM": "NEM",
+  "TR_NETWORK_OP": "Ottimismo",
   "TR_NETWORK_POLYGON": "Polygon PoS",
   "TR_NETWORK_SOLANA_DEVNET": "Solana Devnet",
   "TR_NETWORK_SOLANA_MAINNET": "Solana",
@@ -1275,9 +1332,10 @@
   "TR_NETWORK_ZCASH": "Zcash",
   "TR_NEW_FEE": "Nuovo",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "È disponibile un nuovo Trezor Bridge.",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "È disponibile un nuovo firmware Trezor! Aggiorna il tuo dispositivo.",
   "TR_NEXT_UP": "Avanti",
   "TR_NONCE": "Nonce",
+  "TR_NON_ASCII_CHAR": "{label} (con \"{char}\" non consigliato)",
+  "TR_NON_ASCII_CHARS": "{label} (con caratteri non consigliati)",
   "TR_NORMAL_ACCOUNTS": "Conti predefiniti",
   "TR_NORTH": "Nord",
   "TR_NOTHING_TO_ANONYMIZE": "Nulla da rendere privato",
@@ -1301,10 +1359,6 @@
   "TR_N_MIN": "{n} min",
   "TR_N_TRANSACTIONS": "{value} {value, plural, one {transazione} other {transazioni}}",
   "TR_OFF": "off",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "L'importo di {amount} selezionato è superiore al massimo accettato di {max}.",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "L'importo di {amount} selezionato è superiore al massimo accettato di {max}.",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "L'importo di {amount} selezionato è inferiore al minimo accettato di {min}.",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "L'importo di {amount} selezionato è inferiore al minimo accettato di {min}.",
   "TR_OFFICIAL_LANGUAGES": "Ufficiale",
   "TR_OK": "OK",
   "TR_ON": "on",
@@ -1332,7 +1386,7 @@
   "TR_ONBOARDING_DATA_COLLECTION_HEADING": "Raccolta dati anonimi",
   "TR_ONBOARDING_DEVICE_CHECK": "Controllo di sicurezza del dispositivo",
   "TR_ONBOARDING_DEVICE_CHECK_1": "Il mio <strong>ologramma</strong> era intatto e senza segni di manomissione.",
-  "TR_ONBOARDING_DEVICE_CHECK_2": "Il mio dispositivo è stato acquistato nel Trezor Shop ufficiale o presso un rivenditore di fiducia.",
+  "TR_ONBOARDING_DEVICE_CHECK_2": "Il mio dispositivo è stato acquistato nel <shop>Trezor Shop ufficiale</shop> o presso un <reseller>rivenditore di fiducia</reseller>.",
   "TR_ONBOARDING_DEVICE_CHECK_3": "La confezione del dispositivo era intatta e non manomessa.",
   "TR_ONBOARDING_DEVICE_CHECK_4": "Il firmware è già installato sul dispositivo Trezor connesso. Continuare con la configurazione solo se hai già utilizzato questo Trezor in precedenza.",
   "TR_ONBOARDING_DOWNLOAD_DESKTOP_APP": "Scarica l'app per desktop",
@@ -1363,40 +1417,18 @@
   "TR_OTHER_INPUTS_AND_OUTPUTS": "Altri input e output",
   "TR_OUTGOING": "In uscita",
   "TR_OUTPUTS": "Output",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "L'importo minimo e massimo per il quale l'utente è disposto a vendere {symbol}.",
-  "TR_P2P_GET_STARTED_INTRO": "Devi avviare la transazione su {providerName}: assicurati di attenerti alle istruzioni riportate di seguito.",
-  "TR_P2P_GET_STARTED_ITEM_1": "Seleziona \"Vai a {providerName}\" per essere reindirizzato al sito web del nostro partner.",
-  "TR_P2P_GET_STARTED_ITEM_3": "Quando {providerName} ti chiede di fornire un indirizzo di ricezione, torna qui e continua.",
-  "TR_P2P_GET_STARTED_ITEM_4": "Ci siamo quasi! Visualizza e copia il tuo indirizzo, incollalo nel campo \"Indirizzo di rilascio\" su {providerName} e finalizza la transazione.",
-  "TR_P2P_GO_TO_PROVIDER": "Vai a {providerName}",
-  "TR_P2P_INFO": "La tecnologia {peerToPeer} (P2P) non prevede alcuna verifica KYC né per l'acquirente né per il venditore. Tutte le parti sono protette contro le frodi con il servizio {multisigEscrow} sicuro.",
-  "TR_P2P_MODAL_CONFIRM": "Desidero acquistare",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "Acquisto peer-to-peer di {cryptocurrency} con {provider}",
-  "TR_P2P_MODAL_LEGAL_HEADER": "Nota legale",
-  "TR_P2P_MODAL_SECURITY_HEADER": "La sicurezza è al primo posto con Trezor",
-  "TR_P2P_MODAL_TERMS_1": "Sei qui per acquistare criptovaluta da un'altra persona utilizzando la tecnologia peer-to-peer (P2P) senza verifica dell'ID. Se sei stato indirizzato a questo sito per qualsiasi altro motivo, contatta l'assistenza prima di continuare.",
-  "TR_P2P_MODAL_TERMS_2": "Sei consapevole che le transazioni in criptovaluta sono irreversibili e che potrebbero non essere rimborsate. Pertanto, è possibile che eventuali perdite accidentali o causate da azioni fraudolente non siano recuperabili.",
-  "TR_P2P_MODAL_TERMS_4": "Sei consapevole che Invity non fornisce questo servizio. Il servizio è disciplinato dai termini di {provider}.",
-  "TR_P2P_MODAL_TERMS_5": "Non utilizzi questa funzionalità per il gioco d'azzardo, per attività fraudolente o per violare in alcun modo i Termini di servizio di Invity o del provider o qualsiasi normativa applicabile.",
-  "TR_P2P_MODAL_TERMS_6": "Sei consapevole che le criptovalute sono uno strumento finanziario emergente e che le normative possono variare a seconda della giurisdizione. Ciò potrebbe comportare un rischio maggiore di frodi, furti o instabilità del mercato.",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "Partner verificati da Invity",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "La transazione deve essere completata entro questo limite di tempo, a partire dalla creazione di un contratto sul sito {providerName}.",
-  "TR_P2P_PRICE": "Prezzo per 1 {symbol}",
-  "TR_P2P_PRICE_TOOLTIP": "Prezzo per {symbol} offerto da questo utente.",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "Ciao, sto usando {providerName}!",
-  "TR_P2P_USER_REPUTATION": "({rating}, {numberOfTrades})",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "L'importo di {amount} selezionato è superiore al massimo accettato di {maximum}.",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "L'importo di {amount} selezionato è inferiore al minimo accettato di {minimum}.",
   "TR_PAGINATION_NEWER": "Più recente",
   "TR_PAGINATION_OLDER": "Meno recente",
   "TR_PASSPHRASE_CASE_SENSITIVE": "Nota: la passphrase fa distinzione tra maiuscole e minuscole.",
   "TR_PASSPHRASE_DESCRIPTION_ITEM1": "È importante conoscere prima il funzionamento della passphrase",
   "TR_PASSPHRASE_DESCRIPTION_ITEM2": "Una passphrase apre un wallet protetto da quella frase",
-  "TR_PASSPHRASE_DESCRIPTION_ITEM3": "Nessuno può recuperarla, neanche l'assistenza di Trezor",
+  "TR_PASSPHRASE_DESCRIPTION_ITEM3": "Nessuno può recuperarla, neanche l'Assistenza di Trezor",
   "TR_PASSPHRASE_HIDDEN_WALLET": "Wallet nascosto",
   "TR_PASSPHRASE_MISMATCH": "Mancata corrispondenza delle passphrase",
   "TR_PASSPHRASE_MISMATCH_DESCRIPTION": "Le passphrase non corrispondono. Per motivi di sicurezza, ricomincia e inseriscile correttamente.",
   "TR_PASSPHRASE_MISMATCH_START_OVER": "Ricomincia",
+  "TR_PASSPHRASE_NON_ASCII_CHARS": "Si consiglia di utilizzare <code>ABC</code>, <code>abc</code>, <code>123</code>, <code>spazi</code> o <code>questi caratteri speciali</code>",
+  "TR_PASSPHRASE_NON_ASCII_CHARS_WARNING": "L'uso di caratteri speciali non presenti nell'elenco può mettere a rischio la compatibilità futura",
   "TR_PASSPHRASE_TOO_LONG": "La lunghezza della passphrase supera il limite consentito.",
   "TR_PASSPHRASE_WALLET": "Wallet nascosto n.{id}",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT": "Scopri come funziona una passphrase",
@@ -1438,15 +1470,30 @@
   "TR_PIN_SUBHEADING": "L'uso di un PIN efficace protegge Trezor da accessi fisici non autorizzati.",
   "TR_PLAY_IT_SAFE": "Non corriamo rischi",
   "TR_PLEASE_ALLOW_YOUR_CAMERA": "Abilita la fotocamera per eseguire la scansione dei codici QR.",
-  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Connetti il dispositivo per continuare con la procedura di verifica.",
+  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Collega Trezor per continuare con la procedura di verifica.",
   "TR_PLEASE_ENABLE_PASSPHRASE": "Abilita la funzionalità passphrase per continuare con la procedura di verifica.",
   "TR_POLICY_ID_ADDRESS": "ID criteri:",
   "TR_PRIMARY_FIAT": "Valuta tradizionale",
   "TR_PRIVATE": "Privato",
   "TR_PRIVATE_DESCRIPTION": "Livello di privacy minimo: {targetAnonymity}",
+  "TR_PROCEED_UNVERIFIED_ADDRESS": "Continua con l'indirizzo non verificato",
   "TR_PROMO_BANNER_DASHBOARD": "<underline>Il wallet hardware</underline> <rest>più conveniente per gestire le cripto in modo sicuro</rest>",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM": "Conferma su Trezor prima di eseguire la scansione",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM_EXPLANATION": "Conferma innanzitutto l'indirizzo di ricezione sul dispositivo Trezor, poiché il suo display sicuro non può essere violato.",
+  "TR_QUICK_ACTION_DEBUG_EAP_EXPERIMENTAL_ENABLED": "Abilitato",
+  "TR_QUICK_ACTION_TOOLTIP_JUST_UPDATED": "Aggiornato di recente ({currentVersion})",
+  "TR_QUICK_ACTION_TOOLTIP_RESTART_TO_UPDATE": "Riavvia per aggiornare",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_DEVICE": "Dispositivo Trezor",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_SUITE": "Trezor Suite",
+  "TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE": "Aggiornamento disponibile ({newVersion})",
+  "TR_QUICK_ACTION_TOOLTIP_UP_TO_DATE": "Aggiornato ({currentVersion})",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED": "Trezor Suite ha scaricato un nuovo aggiornamento.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED": "Trezor Suite è stata aggiornata.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE": "Aggiornamento di Trezor Suite ora disponibile",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE": "Riavvia e aggiorna",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE": "Avvia aggiornamento",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE": "Aggiornamento di Trezor ora disponibile",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW": "Novità",
   "TR_RANDOM_SEED_WORDS_DISCLAIMER": "È possibile che ti venga chiesto di digitare alcune parole che non fanno parte della frase Seed di recupero.",
   "TR_RANGE": "range",
   "TR_READ_AND_UNDERSTOOD": "Ho letto e compreso quanto sopra",
@@ -1498,7 +1545,7 @@
   "TR_SAFETY_CHECKS_MODAL_TITLE": "Controlli di sicurezza",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL": "Prompt",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL_DESC": "Puoi eseguire azioni potenzialmente pericolose, come la mancata corrispondenza delle chiavi o commissioni estreme, approvandole manualmente sul dispositivo Trezor.",
-  "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "Non modificare questa impostazione se non sai esattamente cosa stai facendo!",
+  "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "Modifica questa impostazione solo se sai esattamente cosa stai facendo!",
   "TR_SAFETY_CHECKS_STRICT_LEVEL": "Rigorosi",
   "TR_SAFETY_CHECKS_STRICT_LEVEL_DESC": "Sicurezza completa di Trezor.",
   "TR_SCAN_QR_CODE": "Esegui scansione codice QR",
@@ -1508,9 +1555,10 @@
   "TR_SEARCH_TRANSACTIONS": "Cerca transazioni",
   "TR_SEARCH_UTXOS": "Cerca un indirizzo, un ID transazione o un'etichetta specifici",
   "TR_SECURITY_CHECKPOINT_GOT_SEED": "Disponi del back-up del wallet?",
+  "TR_SECURITY_CHECK_HOLOGRAM": "La confezione del dispositivo, inclusi gli ologrammi e i sigilli di sicurezza, è stata aggiornata nel tempo. Puoi verificare i dettagli della confezione <packaging>qui</packaging>. Assicurati che il tuo dispositivo sia stato acquistato sul Trezor Shop ufficiale o presso uno dei <reseller>nostri rivenditori di fiducia<reseller>. In caso contrario, c'è il rischio che il dispositivo possa essere contraffatto. Se sospetti che il dispositivo non sia originale, <support>contatta l'Assistenza di Trezor</support>.",
   "TR_SECURITY_FEATURES_COMPLETED_N": "Sicurezza ({n} di {m})",
-  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "I dispositivi configurati in modalità seedless non possono accedere a Trezor Suite. Ciò impedisce di perdere coin in modo irreversibile nel caso si utilizzi un dispositivo non configurato correttamente per lo scopo sbagliato.",
-  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE": "La configurazione seedless non è supportata da Trezor Suite",
+  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "I dispositivi con configurazione seedless non possono accedere a Trezor Suite ed evitare la perdita irreversibile di coin, che può verificarsi se un dispositivo non viene utilizzato correttamente.",
+  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE": "La configurazione seedless non è supportata su Trezor Suite",
   "TR_SEED_BACKUP_LENGTH": "La frase Seed di recupero può contenere 12, 18 o 24 parole.",
   "TR_SEED_BACKUP_LENGTH_INCLUDING_SHAMIR": "La frase Seed di recupero può contenere 12, 18, 20, 24 o 33 parole.",
   "TR_SEED_CHECK_FAIL_TITLE": "Verifica della frase Seed di recupero non riuscita",
@@ -1520,12 +1568,15 @@
   "TR_SEED_WORDS_ENTER_COMPUTER": "Immetti le parole della frase Seed di recupero nell'ordine visualizzato su Trezor.",
   "TR_SEED_WORDS_ENTER_TOUCHSCREEN": "Utilizza lo schermo touchscreen per immettere tutte le parole nell'ordine corretto fino al completamento della frase.",
   "TR_SEE_DETAILS": "Visualizza dettagli",
+  "TR_SEE_IF_ISSUE_PERSISTS": "Verifica se il problema persiste.",
   "TR_SELECTED": "{amount} selezionati",
   "TR_SELECT_COIN_FOR_SETTINGS": "Seleziona il coin attivo per modificare le impostazioni",
   "TR_SELECT_DEVICE": "Seleziona il dispositivo",
+  "TR_SELECT_NAME_OR_ADDRESS": "Ricerca per nome, simbolo, rete o indirizzo di contratto",
   "TR_SELECT_NUMBER_OF_WORDS": "Seleziona il numero di parole nella frase Seed di recupero",
   "TR_SELECT_PASSPHRASE_SOURCE": "Seleziona dove inserire la passphrase in \"{deviceLabel}\".",
   "TR_SELECT_RECOVERY_METHOD": "Seleziona il metodo di recupero",
+  "TR_SELECT_TOKEN": "Seleziona un token",
   "TR_SELECT_TREZOR": "Seleziona Trezor",
   "TR_SELECT_TREZOR_TO_CONTINUE": "Seleziona Trezor per continuare.",
   "TR_SELECT_TYPE": "Seleziona il tipo",
@@ -1556,11 +1607,11 @@
   "TR_SELL_MODAL_FOR_YOUR_SAFETY": "Vendi {cryptocurrency} con {provider}",
   "TR_SELL_MODAL_LEGAL_HEADER": "Nota legale",
   "TR_SELL_MODAL_SECURITY_HEADER": "La sicurezza è al primo posto con Trezor",
-  "TR_SELL_MODAL_TERMS_1": "Sei qui per vendere criptovalute. Se sei stato indirizzato a questo sito per qualsiasi altro motivo, contatta l'assistenza prima di continuare.",
+  "TR_SELL_MODAL_TERMS_1": "Sei qui per vendere criptovalute. Se stai visitando questo sito per qualsiasi altro motivo, contatta l'Assistenza di Trezor prima di continuare.",
   "TR_SELL_MODAL_TERMS_2": "Stai vendendo criptovalute per tuo conto. Sei consapevole che le politiche del provider potrebbero richiedere la verifica dell'identità.",
   "TR_SELL_MODAL_TERMS_3": "Sei consapevole che le transazioni in criptovaluta sono irreversibili e che potrebbero non essere rimborsate. Pertanto, è possibile che eventuali perdite accidentali o causate da azioni fraudolente non siano recuperabili.",
   "TR_SELL_MODAL_TERMS_4": "Sei consapevole che Invity non fornisce questo servizio. Il servizio è disciplinato dai termini di {provider}.",
-  "TR_SELL_MODAL_TERMS_5": "Non utilizzi questa funzionalità per il gioco d'azzardo, per attività fraudolente o per violare in alcun modo i Termini di servizio di Invity o del provider o qualsiasi normativa applicabile.",
+  "TR_SELL_MODAL_TERMS_5": "Non utilizzerò questa funzione per il gioco d'azzardo o per qualsiasi attività che violi i Termini di servizio di Invity o del provider o qualsiasi normativa applicabile.",
   "TR_SELL_MODAL_TERMS_6": "Sei consapevole che le criptovalute sono uno strumento finanziario emergente e che le normative possono variare a seconda della giurisdizione. Ciò potrebbe comportare un rischio maggiore di frodi, furti o instabilità del mercato.",
   "TR_SELL_MODAL_VERIFIED_PARTNERS_HEADER": "Partner verificati da Invity",
   "TR_SELL_REGISTER": "Registra",
@@ -1569,10 +1620,6 @@
   "TR_SELL_STATUS_ERROR": "Rifiutata",
   "TR_SELL_STATUS_PENDING": "In sospeso",
   "TR_SELL_STATUS_SUCCESS": "Approvata",
-  "TR_SELL_TRANS_ID": "ID trans.:",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "Il valore massimo è {maximum} {currency}",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "Il valore minimo è {minimum} {currency}",
-  "TR_SELL_VIEW_DETAILS": "Visualizza dettagli",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "Risparmi",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "Noleggio",
   "TR_SENDING_SYMBOL": "Invio di {multiple, select, true {più token} false {{symbol}} other {{symbol}}}",
@@ -1627,6 +1674,8 @@
   "TR_SHOW_LOG": "Mostra log",
   "TR_SHOW_MORE": "Mostra altro",
   "TR_SHOW_MORE_ADDRESSES": "Mostra altri ({count})",
+  "TR_SHOW_ON_TRAY": "Mostra icona nella barra delle applicazioni",
+  "TR_SHOW_ON_TRAY_DESCRIPTION": "Controlla se Trezor Suite è in esecuzione in background.",
   "TR_SHOW_UNVERIFIED_ADDRESS": "Mostra indirizzo non verificato",
   "TR_SHOW_UNVERIFIED_XPUB": "Mostra chiave pubblica non verificata",
   "TR_SIDEBAR_ADD_COIN": "Aggiungi coin",
@@ -1639,7 +1688,9 @@
   "TR_SIZE": "Dimensioni",
   "TR_SKIP": "Ignora",
   "TR_SKIP_BACKUP": "Ignora back-up",
+  "TR_SKIP_BACKUP_DESCRIPTION": "Un back-up del wallet ti consente di recuperare i fondi in caso di smarrimento, furto o danneggiamento di Trezor. Senza un back-up, si potrebbe perdere permanente l'accesso alle crypto.",
   "TR_SKIP_PIN": "Ignora PIN",
+  "TR_SKIP_PIN_DESCRIPTION": "Un PIN del dispositivo impedisce l'accesso non autorizzato a Trezor. In sua assenza, chiunque abbia il tuo dispositivo potrà accedere ai tuoi fondi.",
   "TR_SKIP_ROUNDS": "Round saltato",
   "TR_SKIP_ROUNDS_DESCRIPTION": "La possibilità di saltare i round rende più difficile dimostrare una qualsiasi relazione tra i tuoi input. Ciò significa che puoi offuscare ulteriormente l'origine dei fondi.",
   "TR_SKIP_ROUNDS_HEADING": "Consenti a Trezor di saltare i round",
@@ -1652,6 +1703,7 @@
   "TR_STAKE_ADDING_TO_POOL": "Aggiunta al pool di staking",
   "TR_STAKE_ANY_AMOUNT_ETH": "Prevedi un importo minimo {amount} {symbol} in staking e inizia a guadagnare premi. Con il nostro attuale tasso APY del {apyPercent}%, anche i tuoi premi ne traggono vantaggio.",
   "TR_STAKE_APY": "Rendimento percentuale annuo",
+  "TR_STAKE_APY_ABBR": "APY",
   "TR_STAKE_APY_DESC": "*Rendimento percentuale annuo",
   "TR_STAKE_AVAILABLE": "Disponibile",
   "TR_STAKE_CAN_CLAIM_WARNING": "Puoi già richiedere {amount} {symbol}. {br}Richiedi o attendi l'elaborazione del nuovo unstaking.",
@@ -1661,15 +1713,18 @@
   "TR_STAKE_CLAIM_AFTER_UNSTAKING": "Puoi effettuare la richiesta al termine del periodo di unstaking.",
   "TR_STAKE_CLAIM_IN_NEXT_BLOCK": "nel blocco successivo",
   "TR_STAKE_CLAIM_PENDING": "Richiesta in sospeso",
+  "TR_STAKE_CLAIM_UNSTAKED": "Richiedi {symbol} non in staking",
   "TR_STAKE_CONFIRM_AND_STAKE": "Conferma e metti in staking",
   "TR_STAKE_CONFIRM_ENTRY_PERIOD": "Conferma periodo di immissione",
   "TR_STAKE_CONSENT_TO_STAKING_WITH_EVERSTAKE": "Accetto e acconsento a eseguire lo staking con Everstake",
   "TR_STAKE_DAYS": "{days} giorni",
   "TR_STAKE_DELEGATED": "Delega di staking",
   "TR_STAKE_DEREGISTERED": "Deregistrazione di un indirizzo di staking",
+  "TR_STAKE_EARN_REWARDS_WEEKLY": "Ricevi ricompense ogni settimana",
   "TR_STAKE_ENTERING_POOL_MAY_TAKE": "L'accesso al pool di staking potrebbe richiedere fino a {days} giorni",
+  "TR_STAKE_ENTER_THE_STAKING_POOL": "Entra nel pool di staking",
   "TR_STAKE_ETH": "Staking di Ethereum",
-  "TR_STAKE_ETH_CARD_TITLE": "Il modo più semplice per guadagnare {symbol}.",
+  "TR_STAKE_ETH_CARD_TITLE": "Il modo più semplice per guadagnare {symbol}",
   "TR_STAKE_ETH_EARN_REPEAT": "Metti in staking. Guadagna ricompense. Rimetti in staking.",
   "TR_STAKE_ETH_EVERSTAKE": "Trezor e Everstake",
   "TR_STAKE_ETH_EVERSTAKE_DESC": "Everstake è un leader globale e fornitore di tecnologia di staking",
@@ -1680,17 +1735,21 @@
   "TR_STAKE_ETH_REWARDS_EARN": "Guadagni anche sulle tue ricompense. Mantienile in staking e guarda crescere le tue ricompense in {symbol}.",
   "TR_STAKE_ETH_REWARDS_EARN_APY": "Il tasso APY si applica anche sulle tue ricompense in {symbol}. Mantieni in staking i tuoi fondi o aggiungine altri per incrementare le tue ricompense.",
   "TR_STAKE_ETH_SEE_MONEY_DANCE": "Guarda crescere il tuo denaro",
-  "TR_STAKE_ETH_SEE_MONEY_DANCE_DESC": "Guadagna un APY* del {apyPercent}% mettendo in staking il tuo Ethereum con Trezor.",
+  "TR_STAKE_ETH_SEE_MONEY_DANCE_DESC": "Guadagna un <t>APY</t> del {apyPercent}% mettendo in staking il tuo Ethereum con Trezor.",
   "TR_STAKE_ETH_WILL_BE_BLOCKED": "Il tuo {symbol} sarà bloccato durante questo periodo e non potrai annullare il blocco. <a>Ulteriori informazioni</a>",
   "TR_STAKE_EVERSTAKE_MANAGES": "Everstake gestisce e protegge il tuo {symbol} <t>in staking tramite i suoi contratti intelligenti, la sua infrastruttura e la sua tecnologia.</t>",
   "TR_STAKE_INSTANT": "Istantaneo",
   "TR_STAKE_INSTANTLY_UNSTAKED_WITH_DAYS": "Hai ricevuto {amount} {symbol} \"istantaneamente\". {days, plural, =0 {} one {Il residuo verrà pagato entro # giorno.} other { Il residuo verrà pagato entro # giorni}}",
+  "TR_STAKE_IN_ACCOUNT": "{symbol} nel conto",
   "TR_STAKE_LEARN_MORE": "Ulteriori informazioni",
+  "TR_STAKE_LEAVE_STAKING_POOL": "Abbandona il pool di staking",
   "TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL": "Non abbiamo incluso {amount} {symbol} per consentirti di pagare le commissioni di ritiro.",
+  "TR_STAKE_LEFT_SMALL_AMOUNT_FOR_WITHDRAWAL": "Abbiamo lasciato una piccola parte di {symbol}, così potrai pagare le spese di prelievo.",
   "TR_STAKE_MAX": "Max",
   "TR_STAKE_MAX_FEE_DESC": "La commissione massima è la commissione di transazione che sei disposto a pagare alla rete per assicurarti che la transazione venga elaborata.",
   "TR_STAKE_MAX_REWARD_DAYS": "Max. {count, plural, one {n. giorno} other {n. giorni}}",
   "TR_STAKE_MIN_AMOUNT_TOOLTIP": "L'importo minimo per lo staking è di {amount} {symbol}",
+  "TR_STAKE_MONTHLY": "Mensile",
   "TR_STAKE_NEXT_PAYOUT": "Prossimo pagamento della ricompensa",
   "TR_STAKE_NOT_ENOUGH_FUNDS": "{symbol} insufficiente per pagare le commissioni di rete",
   "TR_STAKE_ONLY_REWARDS": "Solo ricompense",
@@ -1702,6 +1761,8 @@
   "TR_STAKE_REGISTERED": "Registrazione di un indirizzo di staking",
   "TR_STAKE_RESTAKED_BADGE": "È stato effettuato nuovamente lo staking",
   "TR_STAKE_REWARDS": "Ricompense",
+  "TR_STAKE_SIGN_TRANSACTION": "Firma transazione",
+  "TR_STAKE_SIGN_UNSTAKING_TRANSACTION": "Firma la transazione di unstaking",
   "TR_STAKE_STAKE": "Metti in staking",
   "TR_STAKE_STAKED_AMOUNT": "Importo in staking",
   "TR_STAKE_STAKED_AND_EARNING": "Ricompense guadagnate e in staking",
@@ -1709,6 +1770,7 @@
   "TR_STAKE_STAKE_MORE": "Aumenta lo staking",
   "TR_STAKE_STAKING_IN_A_NUTSHELL": "Lo staking in breve",
   "TR_STAKE_STAKING_IS": "La procedura di staking è una sorta di gesto amichevole con cui blocchi temporaneamente i tuoi asset Ethereum per supportare il funzionamento della blockchain. Come meritata ricompensa, in cambio guadagnerai più {symbol}!",
+  "TR_STAKE_STAKING_PROCESS": "Processo di staking",
   "TR_STAKE_START_STAKING": "Inizia a fare staking",
   "TR_STAKE_TIME_TO_CLAIM": "Tempo per la richiesta",
   "TR_STAKE_TOTAL_PENDING": "Totale staking in sospeso:",
@@ -1717,23 +1779,35 @@
   "TR_STAKE_UNSTAKED_AND_READY_TO_CLAIM": "Non più in staking e richiedibili",
   "TR_STAKE_UNSTAKE_TO_CLAIM": "Esegui unstaking per richiedere",
   "TR_STAKE_UNSTAKING": "Unstaking",
+  "TR_STAKE_UNSTAKING_APPROXIMATE": "{symbol} disponibili subito approssimativamente",
+  "TR_STAKE_UNSTAKING_APPROXIMATE_DESCRIPTION": "La liquidità della staking pool può consentire l'unstaking immediato di alcuni fondi. I fondi rimanenti seguiranno il periodo di unstaking.",
   "TR_STAKE_UNSTAKING_PERIOD": "Periodo di unstaking",
+  "TR_STAKE_UNSTAKING_PROCESS": "Processo di unstaking",
   "TR_STAKE_UNSTAKING_TAKES": "L'unstaking solitamente richiede circa 3 giorni. Una volta completata l'operazione, puoi scambiarli o inviarli.",
+  "TR_STAKE_WEEKLY": "Settimanale",
   "TR_STAKE_WHAT_IS_STAKING": "Che cos'è lo staking?",
+  "TR_STAKE_YEARLY": "Annuale",
   "TR_STAKE_YOUR_FUNDS_MAINTAINED": "I tuoi fondi in staking sono gestiti da Everstake",
+  "TR_STAKING_AMOUNT_STAKED_INSTANTLY": "{amount} {symbol} messi subito in staking!",
+  "TR_STAKING_AMOUNT_UNSTAKED_INSTANTLY": "{amount} {symbol} rimossi subito dallo staking!",
+  "TR_STAKING_CONSOLIDATING_FUNDS": "Consolidamento di {symbol}",
   "TR_STAKING_DELEGATE": "Delegato",
   "TR_STAKING_DEPOSIT": "Deposito rimborsabile",
   "TR_STAKING_DEPOSIT_FEE_DECRIPTION": "La commissione di deposito è di {feeAmount} ADA ed è necessaria per registrare il tuo indirizzo e iniziare a fare staking. Se decidi di eseguire l'unstaking di Cardano, il deposito ti verrà restituito.",
+  "TR_STAKING_ESTIMATED_GAINS": "Guadagni stimati",
   "TR_STAKING_FEE": "Commissione",
+  "TR_STAKING_GETTING_READY": "I tuoi {symbol} sono pronti a generare reddito",
   "TR_STAKING_INSTANTLY_STAKED": "Hai messo in staking {amount} {symbol} istantaneamente. {days, plural, =0 {} one {Il residuo in {symbol} verrà messo in staking entro # giorno.} other { Il residuo in {symbol} verrà messo in staking entro # giorni}}",
   "TR_STAKING_IS_NOT_SUPPORTED": "Lo staking non è supportato su questa rete.",
   "TR_STAKING_NOT_ENOUGH_FUNDS": "Non disponi di fondi sufficienti sul tuo conto.",
+  "TR_STAKING_ONCE_YOU_CONFIRM": "Dopo aver confermato",
   "TR_STAKING_ON_3RD_PARTY_DESCRIPTION": "Eseguendo lo staking su un pool di staking di Trezor, sostieni direttamente l'ecosistema di Trezor e Cardano in Trezor Suite.",
   "TR_STAKING_ON_3RD_PARTY_TITLE": "Stai delegando a un pool di staking di terzi",
   "TR_STAKING_POOL_OVERSATURATED_DESCRIPTION": "Il pool di staking a cui stai delegando è sovrasaturo. Ridelega il tuo staking per massimizzare le ricompense per lo staking",
   "TR_STAKING_POOL_OVERSATURATED_TITLE": "Il pool di staking è sovrasaturo",
   "TR_STAKING_REDELEGATE": "Ridelega",
   "TR_STAKING_REWARDS": "Ricompense disponibili",
+  "TR_STAKING_REWARDS_ARE_RESTAKED": "I premi vengono automaticamente resi disponibili per lo staking",
   "TR_STAKING_REWARDS_DESCRIPTION": "Ti ricordiamo che potrebbero essere necessari fino a 20 giorni prima di iniziare a ricevere le ricompense dopo la registrazione e la delega di staking iniziale. Al termine di questo periodo, riceverai la tua ricompensa ogni 5 giorni.",
   "TR_STAKING_REWARDS_TITLE": "Lo staking di Cardano è attivo",
   "TR_STAKING_STAKE_ADDRESS": "Il tuo indirizzo di staking",
@@ -1742,6 +1816,9 @@
   "TR_STAKING_TREZOR_POOL_FAIL": "Non è stato possibile accedere al pool di staking di Trezor a cui delegare.",
   "TR_STAKING_TX_PENDING": "La transazione {txid} è stata inviata correttamente alla blockchain ed è in attesa di conferma.",
   "TR_STAKING_WITHDRAW": "Ritira",
+  "TR_STAKING_YOUR_EARNINGS": "I tuoi guadagni vengono automaticamente resi disponibili per lo staking, consentendoti di guadagnare un <a>interesse composto</a>.",
+  "TR_STAKING_YOUR_UNSTAKED_FUNDS": "I tuoi {symbol} su cui è stato eseguito l'unstaking sono pronti",
+  "TR_STAKING_YOU_ARE_HERE": "Sei qui",
   "TR_STANDARD_WALLET_DESCRIPTION": "Nessuna passphrase",
   "TR_START": "Avvia",
   "TR_START_AGAIN": "Riavvia",
@@ -1750,6 +1827,7 @@
   "TR_START_COINJOIN": "Avvia coinjoin",
   "TR_START_RECOVERY": "Avvia recupero",
   "TR_STEP": "Passaggio {number}",
+  "TR_STEP_OF_TOTAL": "Fase {index} di {total}",
   "TR_STILL_DONT_SEE_YOUR_TREZOR": "Non vedi ancora il tuo dispositivo Trezor?",
   "TR_STOP": "Arresta",
   "TR_STOPPING": "Arresto in corso",
@@ -1801,7 +1879,11 @@
   "TR_TOKENS_EMPTY": "Ancora nessun token.",
   "TR_TOKENS_EMPTY_CHECK_HIDDEN": "Token non presenti. Potrebbero essere nascosti.",
   "TR_TOKENS_SEARCH_TOOLTIP": "Ricerca per token, simbolo o indirizzo di contratto.",
+  "TR_TOKEN_NOT_FOUND": "Token non trovato",
+  "TR_TOKEN_NOT_FOUND_ON_NETWORK": "Token non trovato sulla rete {networkName}.",
   "TR_TOKEN_TRANSFERS": "Trasferimenti di token {standard}",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH": "Prova una ricerca diversa.",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH_OR_SWITCH": "Prova una ricerca diversa o passa a un'altra rete.",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR": "Token non riconosciuti",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR_TOOLTIP": "I token non riconosciuti comportano rischi potenziali. Fai attenzione.",
   "TR_TOO_LONG": "Il messaggio è troppo lungo",
@@ -1813,18 +1895,24 @@
   "TR_TOR_CONFIG_SNOWFLAKE_UPDATE_LABEL": "Aggiorna percorso",
   "TR_TOR_DESCRIPTION": "Indirizza tutto il traffico di Trezor Suite attraverso la rete Tor per ottenere maggiore privacy e sicurezza. Il caricamento e la connessione di Tor potrebbe richiedere del tempo.",
   "TR_TOR_DISABLE": "Disabilita Tor",
+  "TR_TOR_DISABLED": "Disabilitato",
   "TR_TOR_DISABLE_ONIONS_ONLY": "Back-end personalizzati non .onion mancanti",
   "TR_TOR_DISABLE_ONIONS_ONLY_DESCRIPTION": "Aggiungi gli indirizzi dei back-end personalizzati non .onion per evitare questo comportamento.",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_DESCRIPTION": "Ora puoi disabilitare Tor in tutta sicurezza.",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_TITLE": "I back-end personalizzati non utilizzano più solo gli indirizzi .onion.",
   "TR_TOR_DISABLE_ONIONS_ONLY_RESOLVED": "Disabilita Tor",
   "TR_TOR_DISABLE_ONIONS_ONLY_TITLE": "Disabilitando Tor, tutti i back-end .onion saranno reimpostati sui server Trezor predefiniti.",
+  "TR_TOR_DISABLING": "Disabilitazione in corso",
   "TR_TOR_ENABLE": "Abilita Tor",
+  "TR_TOR_ENABLED": "Abilitato",
   "TR_TOR_ENABLE_AND_CONFIRM": "Abilita Tor e conferma",
   "TR_TOR_ENABLE_TITLE": "Abilita Tor",
+  "TR_TOR_ENABLING": "Abilitazione in corso",
+  "TR_TOR_ERROR": "Errore",
   "TR_TOR_IS_SLOW_MESSAGE": "Tor si sta collegando alla rete.<br></br>Attendi.",
   "TR_TOR_KEEP_RUNNING": "Mantieni in esecuzione Tor",
   "TR_TOR_KEEP_RUNNING_FOR_COIN_JOIN_SUBTITLE": "Seleziona \"Mantieni in esecuzione Tor\" per continuare o \"Arresta Tor\" per uscire dal processo coinjoin.",
+  "TR_TOR_MISBEHAVING": "Comportarsi male",
   "TR_TOR_REMOVE_ONION_AND_DISABLE": "Disabilita Tor e passa ai back-end predefiniti",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_LEAVE": "Abbandona",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_SUBTITLE": "Seleziona \"Abilita Tor\" per continuare o \"Abbandona\" per uscire dal processo.",
@@ -1839,11 +1927,7 @@
   "TR_TO_BTC": "A BTC",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "Per rendere le etichette compatibili e disponibili su diversi dispositivi, effettua la connessione a un provider di archiviazione nel cloud.",
   "TR_TO_SATOSHIS": "A sat",
-  "TR_TRADE_BUYS": "acquisti",
-  "TR_TRADE_ENTER_COIN": "Inserisci il nome o il simbolo della cripto...",
-  "TR_TRADE_EXCHANGES": "exchange",
   "TR_TRADE_REDIRECTING": "Reindirizzamento in corso...",
-  "TR_TRADE_SELLS": "vendite",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "Cronologia transazioni non disponibile",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "Suggerimento: puoi cercare le transazioni per ID, indirizzi, token, etichette, importi e date.",
   "TR_TRANSACTIONS_SEARCH_TIP_10": "Suggerimento: per eseguire ricerche più complesse, combina gli operatori AND (&) e OR (|). Ad esempio, utilizzando <strong>> {lastYear}-01-01 & < {lastYear}-01-31 | > {lastYear}-12-01 & < {lastYear}-12-31</strong> verranno visualizzate tutte le transazioni di gennaio o dicembre {lastYear}.",
@@ -1858,6 +1942,7 @@
   "TR_TRANSACTIONS_SEARCH_TOOLTIP": "Cerca per ID transazione, etichetta o importo oppure utilizza gli operatori < > | & = !=.",
   "TR_TRANSACTION_DETAILS": "Dettagli",
   "TR_TREZOR_BRIDGE_RUNNING_VERSION": "Esecuzione della versione {version} di Trezor Bridge in corso",
+  "TR_TREZOR_CONNECT": "Trezor Connect",
   "TR_TREZOR_DEVICE_TUTORIAL_CANCELED_HEADING": "Tutorial annullato",
   "TR_TREZOR_DEVICE_TUTORIAL_COMPLETED_HEADING": "Tutorial completato",
   "TR_TREZOR_DEVICE_TUTORIAL_DESCRIPTION": "Impara a utilizzare il tuo dispositivo con l'aiuto di un breve tutorial",
@@ -1865,32 +1950,40 @@
   "TR_TROUBLESHOOTING_CLOSE_TABS": "Chiudi le altre schede e finestre dove Trezor potrebbe essere in uso",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION": "Dopo aver chiuso le altre schede e finestre, prova ad aggiornare questa pagina.",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION_DESKTOP": "Dopo aver chiuso le altre schede e finestre del browser, prova a uscire e a riaprire Trezor Suite.",
-  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Procedura richiesta per abilitare la comunicazione",
+  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Per risolvere il problema, procedi come segue.",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_DESCRIPTION": "Visita la <a>pagina di stato di Trezor Bridge</a>",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_TITLE": "Assicurati che il processo di Trezor Bridge sia in esecuzione",
-  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Solo i browser basati su Chromium attualmente consentono la comunicazione diretta con i dispositivi USB",
+  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Solo i browser basati su Chromium attualmente consentono la comunicazione diretta con i dispositivi USB.",
   "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_TITLE": "Utilizza un browser basato su Chromium",
   "TR_TROUBLESHOOTING_TIP_CABLE_DESCRIPTION": "Il cavo deve essere completamente inserito. Se il dispositivo è collegato tramite USB-C, il cavo deve scattare in posizione.",
   "TR_TROUBLESHOOTING_TIP_CABLE_TITLE": "Prova un altro cavo",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_DESCRIPTION": "Con Trezor Bridge installato.",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_TITLE": "Prova a utilizzare un altro computer, se possibile",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Non si sa mai",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Prova a riavviare il computer",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Il riavvio del computer potrebbe risolvere il problema di comunicazione tra il browser e il dispositivo.",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Riavvia il computer",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_DESCRIPTION": "Esegui l'app per desktop <a>Trezor Suite</a>",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE": "Utilizza l'app per desktop Trezor Suite",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_DESCRIPTION": "<a>Fai clic per passare</a> da un'implementazione di Bridge alternativa a un'altra. Versione corrente: ({currentVersion})",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_TITLE": "Utilizza un'altra versione di Trezor Bridge",
   "TR_TROUBLESHOOTING_TIP_UDEV_INSTALL_DESCRIPTION": "Prova a installare le <a>regole udev</a>. Assicurati che siano salvate sul desktop prima dell'apertura.",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_DESCRIPTION": "Se il firmware del dispositivo è stato aggiornato l'ultima volta alla versione 2019 o precedente, segui le istruzioni riportate nella <a>Knowledge Base</a>",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_TITLE": "Sembra che stai utilizzando un modello di Trezor precedente.",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_DESCRIPTION": "Connettilo direttamente al computer (senza un hub USB).",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_TITLE": "Prova un'altra porta USB",
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "Installa regole automaticamente",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "Regole udev mancanti",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "Stato imprevisto: {error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "Il dispositivo è connesso correttamente, ma al momento non è in grado di comunicare con il browser. Devi installare Trezor Bridge.",
   "TR_TRY_AGAIN": "Riprova",
   "TR_TXID": "ID TX",
   "TR_TXID_RBF": "ID TX originale da sostituire",
   "TR_TX_CONFIRMATIONS": "{confirmationsCount}x",
   "TR_TX_CONFIRMED": "Transazione confermata",
   "TR_TX_CONFIRMING": "Conferma transazione in corso",
+  "TR_TX_DATA_FUNCTION": "Funzione",
+  "TR_TX_DATA_INPUT_DATA": "Dati di input",
+  "TR_TX_DATA_METHOD": "Dati di input",
+  "TR_TX_DATA_METHOD_NAME": "Nome del metodo",
+  "TR_TX_DATA_PARAMS": "Parametri",
   "TR_TX_DEPOSIT": "Deposito",
   "TR_TX_FEE": "Commissione",
   "TR_TX_TAB_AMOUNT": "Importo",
@@ -1930,13 +2023,18 @@
   "TR_UPDATE_FIRMWARE_HOMESCREEN_LATER_TOOLTIP": "Aggiornamento firmware necessario. Puoi modificare la homescreen nelle impostazioni in un secondo momento",
   "TR_UPDATE_FIRMWARE_HOMESCREEN_TOOLTIP": "Aggiorna il firmware per modificare la homescreen",
   "TR_UPDATE_MODAL_AVAILABLE_HEADING": "Aggiornamento disponibile",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES": "Abilita gli aggiornamenti automatici",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG": "Nuovo",
   "TR_UPDATE_MODAL_INSTALL_AND_RESTART": "Riavvia e aggiorna",
   "TR_UPDATE_MODAL_INSTALL_NOW_OR_LATER": "Vuoi installare l'aggiornamento ora?",
   "TR_UPDATE_MODAL_NOT_NOW": "Non ora",
-  "TR_UPDATE_MODAL_RESTART_NEEDED": "Questa operazione riavvierà Trezor Suite",
+  "TR_UPDATE_MODAL_RESTART_NEEDED": "Questa operazione riavvierà Trezor Suite.",
   "TR_UPDATE_MODAL_START_DOWNLOAD": "Avvia aggiornamento",
   "TR_UPDATE_MODAL_UPDATE_DOWNLOADED": "Aggiornamento scaricato",
   "TR_UPDATE_MODAL_UPDATE_ON_QUIT": "Aggiorna quando esci",
+  "TR_UPDATE_MODAL_WHATS_NEW": "Novità",
+  "TR_UPDATE_MODAL_YOUR_VERSION": "La tua versione: v{version}",
+  "TR_UPGRADE_FIRMWARE_TO_DISCOVER_ACCOUNT_ERROR": "Aggiorna il firmware per accedere a questo conto. Vedi il banner blu sopra riportato.",
   "TR_UP_TO": "fino a",
   "TR_UP_TO_DATE": "Aggiornato",
   "TR_UP_TO_DAYS": "fino a {days} giorni",
@@ -1990,6 +2088,7 @@
   "TR_WALLET_SELECTION_ACCESS_HIDDEN_WALLET": "Accedi al wallet nascosto",
   "TR_WALLET_SELECTION_HIDDEN_WALLET": "Wallet nascosto",
   "TR_WELCOME_TO_TREZOR_TEXT_WALLET_CREATION": "Crea un nuovo wallet o recuperane uno da un back-up utilizzando la frase Seed di recupero.",
+  "TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE": "Ci impegniamo sempre a migliorare la tua esperienza con Trezor. Ecco le novità:",
   "TR_WEST": "Ovest",
   "TR_WHAT_DATA_WE_COLLECT": "Quali dati raccogliamo?",
   "TR_WHAT_IS_PASSPHRASE": "Scopri di più sulla differenza",
@@ -2000,7 +2099,7 @@
   "TR_WIPE_DEVICE_CHECKBOX_2_TITLE": "Sono consapevole che devo avere un back-up della mia frase Seed di recupero per poter accedere sempre ai miei fondi",
   "TR_WIPE_DEVICE_TEXT": "Il ripristino del dispositivo comporta l'eliminazione di tutti i dati. Ripristina il tuo dispositivo solo se disponi di un back-up offline sicuro della tua frase Seed di recupero che ti consenta di recuperare i fondi.",
   "TR_WIPE_OR_UPDATE": "Ripristina il dispositivo o aggiorna il firmware",
-  "TR_WIPE_OR_UPDATE_DESCRIPTION": "Vai alle impostazioni del dispositivo",
+  "TR_WIPE_OR_UPDATE_DESCRIPTION": "Vai alle impostazioni del dispositivo.",
   "TR_WIPING_YOUR_DEVICE": "Il ripristino delle impostazioni di fabbrica cancella tutte le informazioni presenti nella memoria del dispositivo, inclusi il PIN e la frase Seed di recupero. Esegui il ripristino delle impostazioni di fabbrica solo se disponi di un back-up offline sicuro della tua frase Seed di recupero che ti consenta di recuperare i fondi.",
   "TR_WORDS": "{count} parole",
   "TR_WORD_DOES_NOT_EXIST": "La parola \"{word}\" non esiste nell'elenco di parole bip39.",
diff --git a/packages/suite-data/files/translations/ja.json b/packages/suite-data/files/translations/ja.json
index 96d90908478..1e2af30b021 100644
--- a/packages/suite-data/files/translations/ja.json
+++ b/packages/suite-data/files/translations/ja.json
@@ -1,5 +1,6 @@
 {
   "AMOUNT": "金額",
+  "AMOUNT_EXCEEDS_MAX": "金額が最大許容値 {maxAmount} を超えています。",
   "AMOUNT_IS_BELOW_DUST": "金額はダストリミット ({dust}) 以上でなければいけません",
   "AMOUNT_IS_LESS_THAN_RESERVE": "受信者のアカウントを有効にするには最小準備金 {reserve} XRP以上の送金が必要です",
   "AMOUNT_IS_MORE_THAN_RESERVE": "金額が多すぎて支出不可の準備金 ({reserve} XRP) に抵触します",
@@ -168,6 +169,7 @@
   "TOAST_PIN_CHANGED": "PINが正常に変更されました",
   "TOAST_QR_INCORRECT_ADDRESS": "QRコードに無効なアドレスが含まれています",
   "TOAST_QR_INCORRECT_COIN_SCHEME_PROTOCOL": "QRコードは {coin} アカウント用に定義されています",
+  "TOAST_QR_UNKNOWN_SCHEME_PROTOCOL": "不明なプロトコルスキームです：\"{scheme}\"。再試行するか、アドレスを手動で入力してください。",
   "TOAST_RAW_TX_SENT": "取引を送信しました。TXID: {txid}",
   "TOAST_SETTINGS_APPLIED": "設定が正常に変更されました",
   "TOAST_SIGN_MESSAGE_ERROR": "メッセージに署名できませんでした: {error}",
@@ -193,7 +195,6 @@
   "TR_404_GO_TO_DASHBOARD": "ダッシュボードに移動",
   "TR_404_TITLE": "エラー404: リンクが見つかりません",
   "TR_7D_CHANGE": "7日間の変動",
-  "TR_ABORT": "中止",
   "TR_ACCESS_HIDDEN_WALLET": "パスフレーズウォレットにアクセス",
   "TR_ACCESS_STANDARD_WALLET": "標準ウォレットにアクセス",
   "TR_ACCOUNT_DETAILS_HEADER": "アカウントの詳細",
@@ -260,6 +261,7 @@
   "TR_ACQUIRE_DEVICE_TITLE": "別のセッションが実行中です",
   "TR_ACTIVATED_COINS": "有効化されたコイン",
   "TR_ACTIVE": "有効",
+  "TR_ADD": "追加",
   "TR_ADDRESSES": "アドレス",
   "TR_ADDRESSES_CHANGE": "アドレスの変更",
   "TR_ADDRESSES_FRESH": "新しいアドレス",
@@ -269,7 +271,7 @@
   "TR_ADDRESS_MODAL_CLIPBOARD": "アドレスをコピー",
   "TR_ADDRESS_MODAL_TITLE": "{networkName} 受信アドレス",
   "TR_ADDRESS_MODAL_TITLE_EXCHANGE": "{networkName} ネットワークの {networkCurrencyName} 受信アドレス",
-  "TR_ADDRESS_PHISHING_WARNING": "フィッシング攻撃を防ぐために、Trezorでアドレスを確認してください。 {claim}",
+  "TR_ADDRESS_PHISHING_WARNING": "フィッシング攻撃を防ぐために、Trezorで受信アドレスを確認してください。 {claim}",
   "TR_ADD_ACCOUNT": "アカウントを追加",
   "TR_ADD_HIDDEN_WALLET": "パスフレーズウォレット",
   "TR_ADD_NETWORK_ACCOUNT": "{network} のアカウントを追加",
@@ -296,7 +298,9 @@
   "TR_ALLOW_ANALYTICS": "データ使用量",
   "TR_ALLOW_ANALYTICS_DESCRIPTION": "すべてのデータは厳密に匿名のままです。Trezorエコシステムを改善するためにのみ使されます。",
   "TR_ALLOW_AUTOMATIC_SUITE_UPDATES": "Trezor Suiteの自動アップデート",
-  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Trezor Suiteはバックグラウンドで最新バージョンを自動的にダウンロードし、アプリの再起動時にインストールします。 これにより、最新の機能とセキュリティパッチで常に最新の状態に保つことができます。アップデートは許可を必要とせずに行われます。",
+  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "バックグラウンドで最新バージョンのTrezor Suiteを自動的にダウンロードし、アプリの再起動時にインストールします。 これにより、最新の機能とセキュリティパッチで常に最新の状態に保つことができます。アップデートは許可を必要とせずに行われます。",
+  "TR_ALL_NETWORKS": "全ネットワーク ({networkCount})",
+  "TR_ALL_NETWORKS_TOOLTIP": "全部で {networkCount} のネットワークからトークンを表示します。最も人気のあるネットワークでフィルタリングします。",
   "TR_ALL_TRANSACTIONS": "取引",
   "TR_AMOUNT_SENT": "送金額",
   "TR_AMOUNT_TOO_BIG_FOR_COINJOIN": "Coinjoin の利用は不適当です ー 金額が多すぎます",
@@ -355,21 +359,20 @@
   "TR_BEFORE_ANY_FURTHER_ACTIONS": "可能性は低いですが、ファームウェアのアップデートに問題が発生した場合、ウォレットのバックアップにアクセスすることが必要な場合があります。",
   "TR_BIP_SIG_FORMAT": "Trezor",
   "TR_BITCOIN_ONLY_UNAVAILABLE": "{bitcoinOnly} に変更する前に、ファームウェアを新しいバージョンにアップグレードする必要があります。",
-  "TR_BREAKING_ANONYMITY_CHECKBOX": "匿名性を低下させていることを理解しています",
+  "TR_BREAKING_ANONYMITY_CHECKBOX": "匿名性が損なわれていることを理解しています。",
   "TR_BRIDGE": "Trezor Bridge",
   "TR_BRIDGE_DEV_MODE_START": "ポート21324でTrezor Bridgeを開始しています",
   "TR_BRIDGE_DEV_MODE_STOP": "デフォルトポートでTrezor Bridgeを開始しています",
   "TR_BRIDGE_GO_TO_WALLET_DESCRIPTION": "本当ですか？デバイスは同時に1つのアプリによってのみ使用可能です。現在、Trezor デバイスを別のアプリで使用している場合は、まずそのセッションを終了してください。",
   "TR_BRIDGE_NEEDED_DESCRIPTION": "お使いのブラウザはサポートされていません。最高の体験を得るために、Trezor Suiteデスクトップアプリをダウンロードしてバックグラウンドで実行するか、WebUSBに対応したクロームベースのブラウザを使用してください。",
   "TR_BRIDGE_REQUESTED_DESCRIPTION": "別のアプリがTrezor SuiteにTrezorデバイスと接続するよう要求しました。Trezor Suiteをバックグラウンドで実行したまま、他のアプリで操作を再実行してください。",
+  "TR_BRIDGE_TIP_AUTOSTART": "ヒント: 自動起動機能を有効にすれば、Bridgeは常にバックグラウンドで実行されます。",
   "TR_BTC_UNITS": "Bitcoinの単位",
   "TR_BUG": "バグ",
   "TR_BUMP_FEE": "手数料を増額",
   "TR_BUMP_FEE_DISABLED_TOOLTIP": "取引を早めるには、キュー内の最も古い（nonceによる）保留中の取引の手数料を増やしてください。取引は順番に承認されねばなりません。<a>詳細はこちら</a>",
   "TR_BUY": " 購入",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "交換取引",
   "TR_BUY_BUY": " 購入",
-  "TR_BUY_BUY_AGAIN": "もう一度購入",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Trezorで確認済",
   "TR_BUY_DETAIL_ERROR_BUTTON": "アカウントに戻る",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "プロバイダサポートに移動",
@@ -396,7 +399,7 @@
   "TR_BUY_MODAL_SECURITY_HEADER": "Trezorでセキュリティを確保",
   "TR_BUY_MODAL_TERMS_1": "私は仮想通貨を購入するためにここにいます。他の理由でこのサイトに誘導された場合は、続行する前に {provider} のサポートに問い合わせます。",
   "TR_BUY_MODAL_TERMS_2": "私のアカウントに送金される仮想通貨を購入するために、この機能を使用しています。",
-  "TR_BUY_MODAL_TERMS_3": "仮想通貨取引は元に戻すことができず、返金できない場合があることを理解しています。 不正または偶発的な損失は回復できない場合があります。",
+  "TR_BUY_MODAL_TERMS_3": "仮想通貨の取引は最終的なものであり、取り消しや払い戻しができないことを理解しています。詐欺やミスによる損失は回復できない場合があります。",
   "TR_BUY_MODAL_TERMS_4": "Invity がこのサービスを提供していないことを理解しています。このサービスは {provider}の利用規約によって管理されています。",
   "TR_BUY_MODAL_TERMS_5": "ギャンブル、詐欺、あるいはInvity またはプロバイダーの利用規約、あるいは適用される規制に対する違反となるような目的のためにこの機能を使用していません。",
   "TR_BUY_MODAL_TERMS_6": "仮想通貨が新たな金融ツールであり、法域によって規制が異なる場合があることを理解しています。 これにより、詐欺、盗難、または市場の不安定性のリスクが高まる可能性があります。",
@@ -414,12 +417,10 @@
   "TR_BUY_STATUS_PENDING": "保留中",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "保留中",
   "TR_BUY_STATUS_SUCCESS": "承認済",
-  "TR_BUY_TRANS_ID": "取引 ID:",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "最大は {maximum} です",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "最大は {maximum} {currency} です",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "最小は {minimum} です",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "最小は {minimum} {currency} です",
-  "TR_BUY_VIEW_DETAILS": "詳細を表示",
   "TR_BYTES": "バイト",
   "TR_CAMERA_NOT_RECOGNIZED": "カメラが認識されませんでした。",
   "TR_CAMERA_PERMISSION_DENIED": "カメラへのアクセスが拒否されました。",
@@ -438,12 +439,12 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Trezorの金額",
   "TR_CHAINED_TXS": "連鎖取引",
   "TR_CHANGELOG": "変更履歴",
-  "TR_CHANGELOG_ON_GITHUB": "GitHubの変更履歴",
   "TR_CHANGE_ADDRESS_TOOLTIP": "これは以前の送金取引におけるお釣りのアドレスです。",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "ファームウェアの種類はいつでも設定で変更できます。",
   "TR_CHANGE_HOMESCREEN": "ホーム画面を変更",
   "TR_CHANGE_PIN": "PINを変更",
   "TR_CHANGE_WIPE_CODE": "ワイプコードを変更",
+  "TR_CHECKED_BALANCES_ON": "残高確認済み",
   "TR_CHECKING_YOUR_DEVICE": "デバイスをチェックしています",
   "TR_CHECKSUM_CONVERSION_INFO": "チェックサムに変換されました。<a>詳細はこちら</a>",
   "TR_CHECK_DEVICE_ORIGIN_DESCRIPTION": "Trezorデバイスの完全性を検証し、その安全性を担保し、チップの信頼性を確認します。",
@@ -455,8 +456,7 @@
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "あなたのウォレットのバックアップを確認するために復元のシミュレーションを実行します。",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "デバイスに表示される順序で、ウォレットのバックアップの単語をここに入力してください。追加のセキュリティ対策として、ウォレットのバックアップに含まれていない単語を入力するように求められる場合があります。",
   "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "ウォレットのバックアップをデバイスの２つのボタンを使って入力します。これにより、あなたの機密情報を潜在的に安全ではないコンピューターやウェブブラウザに渡さないようにしています。",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "ウォレットのバックアップをデバイスのタッチスクリーンを使って入力します。これにより、あなたの機密情報を潜在的に安全ではないコンピューターやウェブブラウザに渡さないようにしています。",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "ウォレットのバックアップをデバイスのタッチスクリーンを使って入力します。これにより、あなたの機密情報を潜在的に安全ではないコンピューターやウェブブラウザに渡さないようにしています。",
+  "TR_CHECK_RECOVERY_SEED_DESC_TOUCHSCREEN": "ウォレットのバックアップはタッチスクリーンを使用して入力されます。これにより、機密情報を安全でない可能性のあるコンピュータまたはWebブラウザに漏洩することを回避できます。",
   "TR_CHECK_SEED": "バックアップを確認",
   "TR_CHECK_YOUR_DEVICE": "Trezorの画面を確認",
   "TR_CHOOSE_RECOVERY_TYPE": "復元方法を選択",
@@ -511,6 +511,7 @@
   "TR_COINJOIN_TRANSACTION_BATCH": "Coinjoin の取引",
   "TR_COINMARKET_BEST_RATE": "ベストレート",
   "TR_COINMARKET_BUY_AND_SELL": "購入と売却",
+  "TR_COINMARKET_BUY_AND_SELL_COUNTER": "{totalBuys, plural, =0 {買い {totalBuys}} one {買い {totalBuys}} other {買い {totalBuys}} } • {totalSells, plural, =0 {売り {totalSells}} one {売り {totalSells}} other {売り {totalSells}} }",
   "TR_COINMARKET_CEX_TOOLTIP": "中央集権型取引所",
   "TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY": "金額または通貨を変更します。",
   "TR_COINMARKET_COMPARE_OFFERS": "すべてのオファーを比較",
@@ -527,6 +528,16 @@
   "TR_COINMARKET_DCA_HEADING": "InvityアプリでBitcoinを貯めよう",
   "TR_COINMARKET_DEX_TOOLTIP": "分散型取引所",
   "TR_COINMARKET_ENTER_AMOUNT_IN": "{currency} の額を入力してください",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_KYC_ALL": "すべてのKYCオプション",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_NO_KYC": "KYC は全く必要ありません",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_ALL": "CEXとDEXのすべてのオファー",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_DEX": "DEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FIXED_CEX": "固定レートのCEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FLOATING_CEX": "変動レートのCEX",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING": "DEX",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING_TOOLTIP": "分散型取引所（DEX）では、中央機関や仲介者を介さずに、ブロックチェーン上で仮想通貨を直接取引することができます。",
+  "TR_COINMARKET_EXCHANGE_FIXED_OFFERS_HEADING": "固定レートのCEX",
+  "TR_COINMARKET_EXCHANGE_FLOAT_OFFERS_HEADING": "変動レートのCEX",
   "TR_COINMARKET_FEATURED_OFFERS_HEADING": "注目のオファー",
   "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_BUY_LABEL": "支払い：",
   "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_SELL_LABEL": "受取り方法：",
@@ -542,19 +553,13 @@
   "TR_COINMARKET_KYC_NO_REFUND": "例外的なケースでKYCが要求されます。払い戻しにはKYCが必要です。👈",
   "TR_COINMARKET_KYC_POLICY": "KYCのポリシー",
   "TR_COINMARKET_KYC_POLICY_NEVER_REQUIRED": "KYC は全く必要ありません",
-  "TR_COINMARKET_KYC_YES_REFUND": "例外的なケースでKYCが要求されます。払い戻しにはKYCは不要です。👈",
+  "TR_COINMARKET_KYC_YES_REFUND": "KYCは例外的な場合にのみ要求されます。払い戻しには必要ありません。 🤝",
   "TR_COINMARKET_LAST_TRANSACTIONS": "最後の取引",
   "TR_COINMARKET_NETWORK_FEE": "ネットワーク手数料",
   "TR_COINMARKET_NETWORK_TOKENS": "{networkName} トークン",
   "TR_COINMARKET_NO_CEX_PROVIDER_FOUND": "CEXプロバイダーが見つかりません",
   "TR_COINMARKET_NO_DEX_PROVIDER_FOUND": "DEXプロバイダが見つかりません",
   "TR_COINMARKET_NO_METHODS_AVAILABLE": "利用可能なメソッドがありません",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "自動的にリロードされます: ",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "取引に戻る",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "オファーがありません",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "申し訳ありませんが、接続の問題により現時点ではオファーはありません。",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "申し訳ありませんが、現時点ではオファーはありません。 ページをリロードするか、クエリを変更してみてください。",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "ページをリロード",
   "TR_COINMARKET_OFFERS_EMPTY": "ご希望に沿ったオファーはありません。国または購入金額を変更してください。",
   "TR_COINMARKET_OFFERS_REFRESH": "オファーが更新されます",
   "TR_COINMARKET_OFFERS_SELECT": "選択",
@@ -570,6 +575,7 @@
   "TR_COINMARKET_SHOW_OFFERS": "オファーを比較",
   "TR_COINMARKET_SWAP": "スワップ",
   "TR_COINMARKET_SWAP_AMOUNT": "スワップ額",
+  "TR_COINMARKET_SWAP_COUNTER": "{totalSwaps, plural, =0 {{totalSwaps} スワップ} one {{totalSwaps} スワップ} other {{totalSwaps} スワップ} }",
   "TR_COINMARKET_SWAP_DEX_MODAL_CONFIRM": "スワップの準備完了",
   "TR_COINMARKET_SWAP_DEX_MODAL_FOR_YOUR_SAFETY": "{provider} で {fromCrypto} から {toCrypto} にスワップ",
   "TR_COINMARKET_SWAP_DEX_MODAL_LEGAL_HEADER": "法的通知",
@@ -585,7 +591,7 @@
   "TR_COINMARKET_SWAP_MODAL_FOR_YOUR_SAFETY": "{provider} で {fromCrypto} から {toCrypto} にスワップ",
   "TR_COINMARKET_SWAP_MODAL_LEGAL_HEADER": "法的通知",
   "TR_COINMARKET_SWAP_MODAL_SECURITY_HEADER": "Trezorでセキュリティを確保してください",
-  "TR_COINMARKET_SWAP_MODAL_TERMS_1": "仮想通貨をスワップするためにここにいます。他の理由でこのサイトに誘導された場合は、続行する前にサポートに問い合わせます。",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_1": "仮想通貨をスワップするためにここにいます。他の理由でこのサイトに誘導された場合は、続行する前にTrezor のサポートに問い合わせます。",
   "TR_COINMARKET_SWAP_MODAL_TERMS_2": "自分のアカウントでの仮想通貨のスワップを希望します。プロバイダのポリシーにより本人確認が必要な場合があることを認識しています。",
   "TR_COINMARKET_SWAP_MODAL_TERMS_3": "仮想通貨の取引は最終的なものであり、取り消しや払い戻しができないことを理解しています。詐欺やミスによる損失は回復できない場合があります。",
   "TR_COINMARKET_SWAP_MODAL_TERMS_4": "Invity がこのサービスを提供していないことを理解しています。このサービスは {provider}の利用規約によって管理されています。",
@@ -594,7 +600,9 @@
   "TR_COINMARKET_SWAP_MODAL_VERIFIED_PARTNERS_HEADER": "Invityによって認証されたパートナー",
   "TR_COINMARKET_TOKEN_NETWORK": "{networkName} ネットワークの {tokenName}",
   "TR_COINMARKET_TRADE_FEE": "取引手数料",
+  "TR_COINMARKET_TRANS_ID": "取引 ID: ",
   "TR_COINMARKET_UNKNOWN_PROVIDER": "不明なプロバイダー",
+  "TR_COINMARKET_VIEW_DETAILS": "詳細を表示",
   "TR_COINMARKET_YOUR_BEST_OFFER": "ベストオファー",
   "TR_COINMARKET_YOU_BUY": "購入する",
   "TR_COINMARKET_YOU_GET": "獲得する",
@@ -619,6 +627,7 @@
   "TR_CONFIRMED_TX": "承認済",
   "TR_CONFIRMING_TX": "取引を確認中",
   "TR_CONFIRM_ACTION_ON_YOUR": "Trezorの画面の指示に従ってください",
+  "TR_CONFIRM_ADDRESS": "アドレスを確認",
   "TR_CONFIRM_BEFORE_COPY": "コピーする前にTREZORで確認してください",
   "TR_CONFIRM_CONDITIONS": "続行する前に条件を確認してください。",
   "TR_CONFIRM_EMPTY_HIDDEN_WALLET_ON": "”{deviceLabel}” デバイスで空のパスフレーズウォレットを確認します。",
@@ -647,7 +656,7 @@
   "TR_CONNECT_DEVICE_SEND_PROMO_TITLE": "Trezorが接続されていません",
   "TR_CONNECT_TREZOR_TO_SEND_BUTTON": "送信するにはTrezorを接続してください",
   "TR_CONNECT_YOUR_DEVICE": "Trezorを接続してロックを解除する",
-  "TR_CONTACT_SUPPORT": "サポートに問い合わせる",
+  "TR_CONTACT_SUPPORT": "Trezorサポートに問い合わせ",
   "TR_CONTACT_TREZOR_SUPPORT": "Trezorサポートに連絡する",
   "TR_CONTINUE": "続ける",
   "TR_CONTINUE_ANYWAY": "とにかく続行する",
@@ -667,7 +676,7 @@
   "TR_COPY_ADDRESS_POLICY_ID": "ポリシーIDアドレスには資金を絶対に送らないでください。",
   "TR_COPY_AND_CLOSE": "コピーして閉じる",
   "TR_COPY_SIGNED_MESSAGE": "署名済のメッセージをコピー",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "コピー",
+  "TR_COPY_TO_CLIPBOARD": "コピー",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "更新履歴を取得できませんでした",
   "TR_COULD_NOT_RETRIEVE_DATA": "データを取得できませんでした",
   "TR_COUNT_WALLETS": "{count} ウォレット",
@@ -701,6 +710,7 @@
   "TR_DASHBOARD_ASSET_FAILED": "資産が正しく読み込まれていません",
   "TR_DASHBOARD_DISCOVERY_ERROR": "ディスカバリーエラー",
   "TR_DASHBOARD_DISCOVERY_ERROR_PARTIAL_DESC": "アカウントが正しく読み込まれませんでした {details}",
+  "TR_DATA": "データ",
   "TR_DATABASE_UPGRADE_BLOCKED": "他のアプリケーション・インスタンスによってデータベースのアップグレードがブロックされました",
   "TR_DATA_ANALYTICS_CATEGORY_1": "プラットフォーム",
   "TR_DATA_ANALYTICS_CATEGORY_1_ITEM_1": "OS、Trezorモデル、バージョンなど",
@@ -754,8 +764,13 @@
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT": "間違ってブートローダーモードになっているのですか？",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_BUTTON": "ボタンをタッチせずにデバイスを再接続してください。",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_TOUCH": "画面に触れずにデバイスを再接続してください。",
+  "TR_DEVICE_CONNECTED_UNACQUIRED": "このデバイスは他の場所で使用されています。",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION": "アプリ {transportSessionOwner} が現在このデバイスを使用している可能性があります。必要に応じてデバイスを制御することができます。",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION_UNKNOWN_APP": "別のアプリが現在このデバイスを使用している可能性があります。必要に応じてデバイスを制御することができます。",
   "TR_DEVICE_CONNECTED_WRONG_STATE": "不正な状態でデバイスが検出されました",
   "TR_DEVICE_DISCONNECTED_DURING_ACTION_DESCRIPTION": "Trezorはバックアップ処理中に切断されました。 デバイスの設定で工場出荷時の状態にリセットするオプションを使用してデバイスを消去し、ウォレットのバックアッププロセスを再開することを強くお勧めします。",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH": "ファームウェアのハッシュチェックに失敗しました。あなたのTrezorは偽造品かもしれません。",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR": "ファームウェアのハッシュチェックが実行できませんでした。あなたのTrezorは偽造品かもしれません。",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON": "オフにする",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON_DISABLED": "オンにする",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION": "ファームウェアのリビジョンチェックは重要なセキュリティ機能です。オンにしておくことを強く推奨します。",
@@ -774,6 +789,8 @@
   "TR_DEVICE_LABEL_IS_NOT_BACKED_UP": "デバイス \"{deviceLabel}\" はバックアップされていません",
   "TR_DEVICE_LABEL_IS_NOT_CONNECTED": "デバイス \"{deviceLabel}\" は接続されていません",
   "TR_DEVICE_LABEL_IS_UNAVAILABLE": "デバイス \"{deviceLabel}\" は利用できません",
+  "TR_DEVICE_MAYBE_COMPROMISED_HEADING": "デバイスの検証に失敗しました",
+  "TR_DEVICE_MAYBE_COMPROMISED_TEXT": "デバイスを再接続して、もう一度検証してください。 問題が解決しない場合は、Trezor Support に連絡して、デバイスで何が起こっているのか、次に何をすべきかを確認してください。",
   "TR_DEVICE_NOT_CONNECTED": "デバイスが接続されていません",
   "TR_DEVICE_NOT_INITIALIZED": "Trezorがセットアップされていません",
   "TR_DEVICE_NOT_INITIALIZED_TEXT": "あなたがすぐに開始できるようにプロセスをガイドします。",
@@ -836,7 +853,6 @@
   "TR_DOWNLOAD_LATEST_BRIDGE": "最新の Bridge {version} をダウンロード",
   "TR_DO_NOT_DISCONNECT_DEVICE": "デバイスを取り外さないでください",
   "TR_DO_NOT_SHOW_AGAIN": "今後表示しない",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "このステップをスキップしますか？",
   "TR_DROPBOX": "ドロップボックス",
   "TR_DROPZONE": "ここにファイルをドラッグ＆ドロップするか、クリックしてファイルを選択します",
   "TR_DROPZONE_ERROR": "インポートに失敗しました: {error}",
@@ -857,13 +873,13 @@
   "TR_EARLY_ACCESS_ENABLE": "参加",
   "TR_EARLY_ACCESS_ENABLED": "早期アクセスプログラムが有効になりました",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM": "参加する",
-  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "これにより、Suiteの通常の動作に影響を与えるエラーが含まれている可能性があるプレリリースソフトウェアをテストすることができることを理解しています。",
+  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "これにより、Trezor Suiteの通常の動作に影響を与えるエラーが含まれている可能性があるプレリリースソフトウェアをテストすることができることを理解しています。",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_DESCRIPTION": "いつでもオフにできます。",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TITLE": "一般に公開する前に最新の製品機能をお試しください。",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TOOLTIP": "上記のフィールドを最初に確認してください",
   "TR_EARLY_ACCESS_JOINED_DESCRIPTION": "ベータ版のアップデートを今すぐ確認するか、次回の起動時に確認できます。",
   "TR_EARLY_ACCESS_JOINED_TITLE": "早期アクセスプログラムが有効になっています",
-  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "最新の安定版Suiteにダウングレードするには、 \"安定版をダウンロード\" をクリックしてアプリを再インストールしてください。",
+  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "最新の安定版Trezor Suiteにダウングレードするには、 \"安定版をダウンロード\" をクリックしてアプリを再インストールしてください。",
   "TR_EARLY_ACCESS_LEFT_TITLE": "あなたは早期アクセスプログラムを終了しました。以降ベータリリースは提供されません。",
   "TR_EARLY_ACCESS_MENU": "早期アクセスプログラム",
   "TR_EARLY_ACCESS_REINSTALL": "安定版をダウンロード",
@@ -918,7 +934,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "このスワップに必要な正確な金額のみを承認します。 同様のスワップを再度行う場合は、追加の手数料を支払う必要があります。",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "以前の承認を取り消す",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "{provider} との以前のコントラクトの承認を削除する取引を実行します。",
-  "TR_EXCHANGE_BUY": "対象",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Trezorで確認して送信する",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "確認して送信",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "承認を作成",
@@ -940,8 +955,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "取引が成功しました。",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "承認済",
   "TR_EXCHANGE_DEX": "分散型取引所(DEX)のオファー",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "このスワップを実行する手数料は、承認用(必要な場合)に {approvalFee} ({approvalFeeFiat}) 、スワップ用に {swapFee} ({swapFeeFiat}) と見積もられています。",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "取引手数料用の残高がありません。交換する数量を {symbol} {max} まで下げてください。",
   "TR_EXCHANGE_EXTRA_FIELD": "{extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "{extraFieldName} は無効です",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "{extraFieldDescription}",
@@ -951,7 +964,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "固定レートの場合は取引の終了時にどのくらいの金額になるかを正確に表示します。一旦レートを選択すると、取引が完了するまで金額は変わりません。 表示される金額が保証されていますが、これらのレートは通常あまり寛大ではありません。つまり、最終的には得られるコインが少なめになります。",
   "TR_EXCHANGE_FLOAT": "変動レートのオファー",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "変動レートの場合、レートを選択した時点から取引が完了した時点までの市場の変動により、最終金額が若干変更される可能性があります。 一般的にこれらのレートは固定レートの場合より良いです。つまり、最終的にはより多くのコインを得ることができます。",
-  "TR_EXCHANGE_PROVIDER": "プロバイダー",
   "TR_EXCHANGE_RATE": "価格",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "受信アカウントは Suite 外です。",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "これはあなたのコインを受け取る特定の英数字のアドレスです。",
@@ -978,23 +990,16 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "数値を入力してください。",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "スリッページを入力してください。",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "スワップのオファー値",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "スリッページの概要",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "スリッページ許容値",
-  "TR_EXCHANGE_TRANS_ID": "取引 ID:",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "Suiteにないアカウント ({symbol}) を使用する",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "受信アドレス",
-  "TR_EXCHANGE_VIEW_DETAILS": "詳細を表示",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE": "Trezor Suiteの自動アップデート",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION": "Trezor Suiteはバックグラウンドで最新バージョンを自動的にダウンロードし、アプリの再起動時にインストールします。 これにより、最新の機能とセキュリティパッチで常に最新の状態に保つことができます。アップデートは許可を必要とせずに行われます。",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN": "BNBスマートチェーン",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON": "BNBスマートチェーンのネットワークを有効にしまが、内部取引の履歴はありません。",
   "TR_EXPERIMENTAL_FEATURES": "実験的な機能",
   "TR_EXPERIMENTAL_FEATURES_ALLOW": "実験的な機能",
   "TR_EXPERIMENTAL_FEATURES_WARNING": "上級者向けです。自己責任で使用してください。これらの機能はテスト中であり、不安定な場合があり、長期的なサポートがない可能性があります。",
   "TR_EXPERIMENTAL_PASSWORD_MANAGER": "Dropboxのパスワードを移行する",
-  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Dropboxに保存され、Trezorによって保護されたパスワードを取得するためのユーティリティで、Trezor Password ManagerのChrome拡張を使っているユーザー向けに設計されています。",
+  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "このユーティリティーを使用して、Dropboxに保存され、Trezorによって保護されたパスワードを取得します。Trezor Password ManagerのChrome拡張を使っていた以前のユーザー向けに設計されています。",
   "TR_EXPERIMENTAL_TOR_SNOWFLAKE": "Tor Snowflake",
-  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Tor Snowflakeは、検閲されたウェブサイトやアプリにアクセスできるようにするシステムです。",
+  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "制限を回避するために設計されたシステムである Tor Snowflake を使用して、検閲された Web サイトやアプリにアクセスします。",
   "TR_EXPORT_AS": "{as} としてエクスポート",
   "TR_EXPORT_FAIL": "エクスポートに失敗しました",
   "TR_EXPORT_TO_FILE": "ファイルにエクスポート",
@@ -1032,6 +1037,7 @@
   "TR_FIRMWARE_NEW_FW_DESCRIPTION": "新しいファームウェアが利用可能になりました。今すぐデバイスをアップデートしてください。",
   "TR_FIRMWARE_REINSTALL_FW_DESCRIPTION": "お使いのデバイスは既に最新のファームウェアに更新されています。必要に応じてファームウェアを再インストールすることができます。",
   "TR_FIRMWARE_REVISION_CHECK_FAILED": "ファームウェアのリビジョンチェックに失敗しました。このTrezorは偽造品かもしれません。",
+  "TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR": "ファームウェアのリビジョンチェックを実行できませんでした。",
   "TR_FIRMWARE_STATUS_INSTALLATION_COMPLETED": "完了しました",
   "TR_FIRMWARE_SUBHEADING_BITCOIN": "Bitcoinの操作のみをサポートする軽量ファームウェア。",
   "TR_FIRMWARE_SUBHEADING_NONE": "お客様のTrezorは、ファームウェアを搭載していない状態で出荷されています。デバイスを安全に使用するには、最新のファームウェアをインストールしてください。Bitcoinのみを使用する場合は、 <button>{bitcoinOnly} ファームウェア</button>をインストールすることをお勧めします。",
@@ -1069,7 +1075,7 @@
   "TR_GOT_IT_BUTTON": "了解",
   "TR_GO_TO_ONBOARDING": "セットアップを開始",
   "TR_GO_TO_SETTINGS": "設定に移動",
-  "TR_GO_TO_SUITE": "Suite にアクセス",
+  "TR_GO_TO_SUITE": "Trezor Suite に移動",
   "TR_GRAPH_LINEAR": "リニア",
   "TR_GRAPH_LOGARITHMIC": "対数",
   "TR_GRAPH_MISSING_DATA": "XRP、SOLなど全てのトークンはポートフォリオの残高に含まれていますが、グラフ表示は現在サポートされていません。",
@@ -1088,7 +1094,7 @@
   "TR_GUIDE_FORUM": "Trezor フォーラム",
   "TR_GUIDE_FORUM_LABEL": "Trezorコミュニティと繋がる",
   "TR_GUIDE_SUGGESTION_LABEL": "このアプリはいかがですか？",
-  "TR_GUIDE_SUPPORT": "サポートに問い合わせる",
+  "TR_GUIDE_SUPPORT": "Trezorサポートに問い合わせ",
   "TR_GUIDE_SUPPORT_AND_FEEDBACK": "サポートとフィードバック",
   "TR_GUIDE_VIEW_HEADLINES_SUPPORT_FEEDBACK_SELECTION": "サポートとフィードバック",
   "TR_GUIDE_VIEW_HEADLINE_HELP_US_IMPROVE": "改善にご協力ください",
@@ -1220,7 +1226,7 @@
   "TR_LOCAL_FILE_SYSTEM": "ローカルファイル システム",
   "TR_LOG": "アプリケーションのログ",
   "TR_LOGIN_PROCEED": "続行する",
-  "TR_LOG_DESCRIPTION": "ログには、Trezor Suite に関するすべての必要な技術情報が含まれています。Trezorサポートにコンタクトする際に必要となる場合があります。",
+  "TR_LOG_DESCRIPTION": "このログには、Trezor Suite に関する重要な技術情報が含まれており、Trezor サポートに連絡する際に必要となる場合があります。",
   "TR_LOOKING_FOR_COINJOIN_ROUND": "ラウンドを待っています",
   "TR_LOW_ANONYMITY_WARNING": "<red>匿名性が低すぎます。</red> 1 in 5 未満は匿名とはいえないので、それ以上を推奨します。",
   "TR_LTC_ADDRESS_INFO": "Litecoinはアドレスのフォーマットを変更しました。私たちのブログであなたのアドレスを変換する方法についての詳細をご覧ください。 {TR_LEARN_MORE}",
@@ -1313,6 +1319,7 @@
   "TR_NETWORK_LITECOIN": "Litecoin",
   "TR_NETWORK_NAMECOIN": "Namecoin",
   "TR_NETWORK_NEM": "NEM",
+  "TR_NETWORK_OP": "Optimism",
   "TR_NETWORK_POLYGON": "Polygon PoS",
   "TR_NETWORK_SOLANA_DEVNET": "Solana Devnet",
   "TR_NETWORK_SOLANA_MAINNET": "Solana",
@@ -1325,9 +1332,10 @@
   "TR_NETWORK_ZCASH": "Zcash",
   "TR_NEW_FEE": "新規",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "新しいTrezor Bridgeが利用可能です。",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "新しいTrezorファームウェアが利用可能です！今すぐアップデートしてください。",
   "TR_NEXT_UP": "次へ",
   "TR_NONCE": "Nonce",
+  "TR_NON_ASCII_CHAR": "{label} (非推奨の文字 \"{char}\" を含む）",
+  "TR_NON_ASCII_CHARS": "{label} (非推奨の文字を含む）",
   "TR_NORMAL_ACCOUNTS": "デフォルトのアカウント",
   "TR_NORTH": "北",
   "TR_NOTHING_TO_ANONYMIZE": "匿名化するものがありません",
@@ -1345,16 +1353,12 @@
   "TR_NO_PASSPHRASE_WALLET": "標準ウォレット",
   "TR_NO_SEARCH_RESULTS": "検索条件に該当する結果はありません",
   "TR_NO_SPENDABLE_UTXOS": "あなたのアカウントには、使用可能なUTXOがありません。",
-  "TR_NO_TRANSPORT": "ブラウザがデバイスと通信できません",
+  "TR_NO_TRANSPORT": "お使いのブラウザはデバイスと通信できません",
   "TR_NO_TRANSPORT_DESKTOP": "アプリがデバイスと通信できません",
   "TR_NUM_ACCOUNTS_FIAT_VALUE": "{accountsCount} アカウント: {fiatValue}",
   "TR_N_MIN": "{n} 分",
   "TR_N_TRANSACTIONS": "{value} 取引",
   "TR_OFF": "OFF",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "選択した金額 {amount} は許容される最大金額 {max} を超えています。",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "選択した金額 {amount} は許容される最大金額 {max} を超えています。",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "選択した金額 {amount} は許容される最小金額 {min} を下回っています。",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "選択した金額 {amount} は許容される最小金額 {min} を下回っています。",
   "TR_OFFICIAL_LANGUAGES": "オフィシャル",
   "TR_OK": "OK",
   "TR_ON": "ON",
@@ -1413,30 +1417,6 @@
   "TR_OTHER_INPUTS_AND_OUTPUTS": "その他の入力と出力",
   "TR_OUTGOING": "送信",
   "TR_OUTPUTS": "アウトプット",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "このユーザーが販売を希望する {symbol} の最低額と最高額。",
-  "TR_P2P_GET_STARTED_INTRO": "{providerName} で取引を開始する必要があります。 注意深く以下の手順に従ってください。",
-  "TR_P2P_GET_STARTED_ITEM_1": "\" {providerName} に移動\" を選択すると、弊社パートナーのサイトに移動します。",
-  "TR_P2P_GET_STARTED_ITEM_3": "{providerName} がリリースアドレスを要求したら、こちらに戻って続行してください。",
-  "TR_P2P_GET_STARTED_ITEM_4": "もう少しで完了です！ アドレスを表示、コピーして、 {providerName} の \"リリースアドレス\" 欄に貼り付けて、取引を確定してください。",
-  "TR_P2P_GO_TO_PROVIDER": "{providerName} に移動",
-  "TR_P2P_INFO": "{peerToPeer} (P2P)技術のおかげで、買い手側も売り手側もKYCの確認は必要ありません。すべての関係者は、安全な {multisigEscrow} によって詐欺から保護されています。",
-  "TR_P2P_MODAL_CONFIRM": "購入の準備完了",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "{provider} を使って、ピア・ツー・ピアで {cryptocurrency} を購入する",
-  "TR_P2P_MODAL_LEGAL_HEADER": "法的通知",
-  "TR_P2P_MODAL_SECURITY_HEADER": "Trezorでセキュリティを確保",
-  "TR_P2P_MODAL_TERMS_1": "あなたはピアツーピア(P2P)技術を使用して、選択した別の人からID認証なしで仮想通貨を購入するためにここにいます。 その他の理由でこのサイトに誘導された場合は、続行する前にサポートに問い合わせください。",
-  "TR_P2P_MODAL_TERMS_2": "仮想通貨取引は元に戻すことができず、返金できない場合があることを理解してください。 ですから、不正または偶発的な損失は回復できない場合があります。",
-  "TR_P2P_MODAL_TERMS_4": "Invityがこのサービスを提供していないことを理解してください。 {provider} の規約がサービスに適用されます。",
-  "TR_P2P_MODAL_TERMS_5": "ギャンブル、詐欺、あるいはInvity またはプロバイダーの利用規約、あるいは適用される規制に対する違反となるような目的のためにこの機能を使用していません。",
-  "TR_P2P_MODAL_TERMS_6": "仮想通貨が新たな金融ツールであり、法域によって規制が異なる場合があることを理解してください。 これにより、詐欺、盗難、または市場の不安定性のリスクが高まる可能性があります。",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "Invityによって認証されたパートナー",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "{providerName} サイトで契約を作成してから起算して、この時間制限内に取引を完了する必要があります。",
-  "TR_P2P_PRICE": "1 {symbol} の価格",
-  "TR_P2P_PRICE_TOOLTIP": "このユーザが提供する {symbol} の価格。",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "やあ、私は {providerName} を使っています！",
-  "TR_P2P_USER_REPUTATION": "({rating}, {numberOfTrades})",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "選択した金額 {amount} は許容される最大金額 {max} を超えています。",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "選択した金額 {amount} は許容される最小金額 {minimum} を下回っています。",
   "TR_PAGINATION_NEWER": "新しい",
   "TR_PAGINATION_OLDER": "古い",
   "TR_PASSPHRASE_CASE_SENSITIVE": "注意: パスフレーズは大文字と小文字を区別します。",
@@ -1447,6 +1427,8 @@
   "TR_PASSPHRASE_MISMATCH": "パスフレーズが一致しません",
   "TR_PASSPHRASE_MISMATCH_DESCRIPTION": "パスフレーズが一致しませんでした。安全のため最初からやり直して、正しく入力してください。",
   "TR_PASSPHRASE_MISMATCH_START_OVER": "最初からやり直す",
+  "TR_PASSPHRASE_NON_ASCII_CHARS": "<code>ABC</code>、<code>abc</code>、<code>123</code>、<code>スペース</code>、または<code>以下の特殊文字</code>を使用することをお勧めします。",
+  "TR_PASSPHRASE_NON_ASCII_CHARS_WARNING": "リストされていない特殊文字を使用すると、将来の互換性に問題を生じます",
   "TR_PASSPHRASE_TOO_LONG": "パスフレーズの長さが制限を超えています。",
   "TR_PASSPHRASE_WALLET": "パスフレーズウォレット #{id}",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT": "パスフレーズの仕組みを学ぶ",
@@ -1488,12 +1470,13 @@
   "TR_PIN_SUBHEADING": "強力なPINを使用することで、権限のない物理的なアクセスからTrezorを保護します。",
   "TR_PLAY_IT_SAFE": "安全に実行しましょう",
   "TR_PLEASE_ALLOW_YOUR_CAMERA": "QRコードをスキャンできるようにカメラを有効にしてください。",
-  "TR_PLEASE_CONNECT_YOUR_DEVICE": "検証プロセスを続行するには、デバイスを接続してください。",
+  "TR_PLEASE_CONNECT_YOUR_DEVICE": "検証プロセスを続行するには、Trezor を接続してください。",
   "TR_PLEASE_ENABLE_PASSPHRASE": "検証プロセスを続行するにはパスフレーズ機能を有効にしてください。",
   "TR_POLICY_ID_ADDRESS": "ポリシーID:",
   "TR_PRIMARY_FIAT": "法定通貨",
   "TR_PRIVATE": "プライベート",
   "TR_PRIVATE_DESCRIPTION": "{targetAnonymity} 以上の匿名性",
+  "TR_PROCEED_UNVERIFIED_ADDRESS": "アドレス未確認のまま進む",
   "TR_PROMO_BANNER_DASHBOARD": "<underline>最も便利な</underline> <rest>仮想通貨を安全に管理するハードウェアウォレット</rest>",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM": "スキャンする前にTrezorで確認してください",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM_EXPLANATION": "Trezor のディスプレイはハッキングできないので信頼できます。最初にTrezorのディスプレイで受信アドレスを確認してください。",
@@ -1504,6 +1487,13 @@
   "TR_QUICK_ACTION_TOOLTIP_TREZOR_SUITE": "Trezor Suite",
   "TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE": "更新可能です ({newVersion})",
   "TR_QUICK_ACTION_TOOLTIP_UP_TO_DATE": "最新版です ({currentVersion})",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED": "Trezor Suiteは新しいアップデートをダウンロードしました。",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED": "Trezor Suiteがアップデートされました。",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE": "Trezor Suiteのアップデートが利用可能です",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE": "再起動してアップデート",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE": "アップデートを開始",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE": "Trezorのアップデートが利用可能です",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW": "新着情報",
   "TR_RANDOM_SEED_WORDS_DISCLAIMER": " ウォレットのバックアップの一部ではない単語を入力するように求められることがあります。",
   "TR_RANGE": "範囲",
   "TR_READ_AND_UNDERSTOOD": "私は上記を読んで理解しました",
@@ -1555,7 +1545,7 @@
   "TR_SAFETY_CHECKS_MODAL_TITLE": "安全性チェック",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL": "通知",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL_DESC": "鍵の不一致や極端な手数料の許可などの安全でない可能性のあるアクションはTrezorで手動で承認してください。",
-  "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "あなたが何をしているかを知っていない限り、これを変更しないでください!",
+  "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "自分が何をしているか分かっている場合のみ、これを変更してください！",
   "TR_SAFETY_CHECKS_STRICT_LEVEL": "厳格",
   "TR_SAFETY_CHECKS_STRICT_LEVEL_DESC": "Trezorの完全なセキュリティ。",
   "TR_SCAN_QR_CODE": "QRコードを読み取る",
@@ -1567,7 +1557,7 @@
   "TR_SECURITY_CHECKPOINT_GOT_SEED": "ウォレットのバックアップはありますか？",
   "TR_SECURITY_CHECK_HOLOGRAM": "ホログラムやセキュリティーシールを含むデバイスのパッケージは時とともに変化していますのでご注意ください。パッケージの詳細は<packaging>こちら</packaging>でご確認いただけます。また、デバイスをTrezorショップ、あるいは<reseller>信頼できる代理店</reseller>から購入したことを確認してください。さもなければ、あなたが手にしているデバイスは偽造品である可能性があります。デバイスが純正品ではない疑いがある場合は、<support>Trezorサポート</support>にお問い合わせください。",
   "TR_SECURITY_FEATURES_COMPLETED_N": "セキュリティ: ({n} / {m})",
-  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "シードレスモードに設定されたデバイスはTrezor Suiteにアクセスできません。 これは、誤った目的のために不適切にセットアップされたデバイスが使用された場合に備えて、不可逆的なコインの損失を避けるためです。",
+  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "デバイスが不適切に使用された場合に起こり得る不可逆的なコインの損失を避けるため、シードレスモードに設定されたデバイスはTrezor Suiteにアクセスできません。",
   "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE": "シードレスセットアップはTrezor Suiteではサポートされていません",
   "TR_SEED_BACKUP_LENGTH": "あなたのウォレットのバックアップには12、18、または24個の単語が含まれています。",
   "TR_SEED_BACKUP_LENGTH_INCLUDING_SHAMIR": "あなたのウォレットのバックアップには12、18、20、24、または33の単語が含まれています。",
@@ -1578,12 +1568,15 @@
   "TR_SEED_WORDS_ENTER_COMPUTER": "Trezorに表示される順序で、ウォレットのバックアップの単語を入力してください。 ",
   "TR_SEED_WORDS_ENTER_TOUCHSCREEN": "タッチスクリーンディスプレイを使用して、すべての単語を正しい順序で最後まで入力します。",
   "TR_SEE_DETAILS": "詳細を表示",
+  "TR_SEE_IF_ISSUE_PERSISTS": "問題が解決しない場合は確認してください。",
   "TR_SELECTED": "{amount} を選択済",
   "TR_SELECT_COIN_FOR_SETTINGS": "設定を変更するコインを選択",
   "TR_SELECT_DEVICE": "デバイスを選択",
+  "TR_SELECT_NAME_OR_ADDRESS": "名前、シンボル、ネットワークまたはコントラクトアドレスで検索",
   "TR_SELECT_NUMBER_OF_WORDS": "ウォレットのバックアップの単語数を選択してください",
   "TR_SELECT_PASSPHRASE_SOURCE": "\"{deviceLabel}\" のパスフレーズを入力する場所を選択します。",
   "TR_SELECT_RECOVERY_METHOD": "復元方法を選択",
+  "TR_SELECT_TOKEN": "トークンを選択",
   "TR_SELECT_TREZOR": "Trezorを選択",
   "TR_SELECT_TREZOR_TO_CONTINUE": "続けるにはTrezorを選択してください。",
   "TR_SELECT_TYPE": "タイプを選択",
@@ -1614,11 +1607,11 @@
   "TR_SELL_MODAL_FOR_YOUR_SAFETY": "{provider} で {cryptocurrency} を売却する",
   "TR_SELL_MODAL_LEGAL_HEADER": "法的通知",
   "TR_SELL_MODAL_SECURITY_HEADER": "Trezorでセキュリティを確保",
-  "TR_SELL_MODAL_TERMS_1": "あなたは仮想通貨を売却するためにここにいます。他の理由でこのサイトに誘導された場合は、続行する前にサポートにお問い合わせください。",
+  "TR_SELL_MODAL_TERMS_1": "あなたは仮想通貨を売却するためにここにいます。他の理由でこのサイトに誘導された場合は、続行する前にTrezorのサポートに問い合わせてください。",
   "TR_SELL_MODAL_TERMS_2": "あなたは自分のアカウントのために仮想通貨を売却しています。プロバイダのポリシーにより本人確認が必要な場合があることを認めます。",
   "TR_SELL_MODAL_TERMS_3": "仮想通貨取引は元に戻すことができず、返金できない場合があることを理解してください。 ですから、不正または偶発的な損失は回復できない場合があります。",
   "TR_SELL_MODAL_TERMS_4": "Invityがこのサービスを提供していないことを理解してください。 {provider} の規約がサービスに適用されます。",
-  "TR_SELL_MODAL_TERMS_5": "ギャンブル、詐欺、あるいはInvity またはプロバイダーの利用規約、あるいは適用される規制に対する違反となるような目的のためにこの機能を使用しないでください。",
+  "TR_SELL_MODAL_TERMS_5": "ギャンブル、詐欺、あるいはInvity またはプロバイダーの利用規約、あるいは適用される規制に対する違反となるような目的のためにこの機能を使用していません。",
   "TR_SELL_MODAL_TERMS_6": "仮想通貨が新たな金融ツールであり、法域によって規制が異なる場合があることを理解してください。 これにより、詐欺、盗難、または市場の不安定性のリスクが高まる可能性があります。",
   "TR_SELL_MODAL_VERIFIED_PARTNERS_HEADER": "Invityによって認証されたパートナー",
   "TR_SELL_REGISTER": "登録",
@@ -1627,10 +1620,6 @@
   "TR_SELL_STATUS_ERROR": "拒否されました",
   "TR_SELL_STATUS_PENDING": "保留中",
   "TR_SELL_STATUS_SUCCESS": "承認済",
-  "TR_SELL_TRANS_ID": "取引 ID:",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "最大は {maximum} {currency} です",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "最小は {minimum} {currency} です",
-  "TR_SELL_VIEW_DETAILS": "詳細を表示",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "貯蓄",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "賃料",
   "TR_SENDING_SYMBOL": "{multiple, select, true {複数のトークン} false {{symbol}} other {{symbol}}}を送信中",
@@ -1685,6 +1674,8 @@
   "TR_SHOW_LOG": "ログを表示",
   "TR_SHOW_MORE": "もっと表示",
   "TR_SHOW_MORE_ADDRESSES": "さらに表示 ({count})",
+  "TR_SHOW_ON_TRAY": "トレイにアイコンを表示",
+  "TR_SHOW_ON_TRAY_DESCRIPTION": "Trezor Suiteがバックグラウンドで実行されているかどうかを監視します。",
   "TR_SHOW_UNVERIFIED_ADDRESS": "未検証のアドレスを表示",
   "TR_SHOW_UNVERIFIED_XPUB": "未検証の公開鍵を表示",
   "TR_SIDEBAR_ADD_COIN": "コインを追加",
@@ -1697,7 +1688,9 @@
   "TR_SIZE": "サイズ",
   "TR_SKIP": "スキップ",
   "TR_SKIP_BACKUP": "バックアップをスキップ",
+  "TR_SKIP_BACKUP_DESCRIPTION": "ウォレットのバックアップがあれば、Trezorを紛失、盗難、破損した場合に資金を回復することができます。バックアップがなければ、仮想通貨へのアクセスを永久に失う可能性があります。",
   "TR_SKIP_PIN": "PINをスキップ",
+  "TR_SKIP_PIN_DESCRIPTION": "デバイスのPIN は、Trezorへの不正アクセスを防止します。これがなければ、デバイスを持っている人なら誰でもあなたの資金にアクセスすることができてしまいます。",
   "TR_SKIP_ROUNDS": "ラウンドをスキップ",
   "TR_SKIP_ROUNDS_DESCRIPTION": "ラウンドをスキップできるようにすることで、入力間の関係を証明することがより困難になります。 つまり、資金の起源をさらに難読化することができます。",
   "TR_SKIP_ROUNDS_HEADING": "Trezorがラウンドをスキップすることを許可する",
@@ -1710,6 +1703,7 @@
   "TR_STAKE_ADDING_TO_POOL": "ステーキングプールに追加中",
   "TR_STAKE_ANY_AMOUNT_ETH": "少なくとも {amount} {symbol} をステークして、報酬を獲得しましょう。現在のAPYレートは {apyPercent}%で、報酬が得られます！",
   "TR_STAKE_APY": "年間利回り",
+  "TR_STAKE_APY_ABBR": "APY",
   "TR_STAKE_APY_DESC": "*年間利回り",
   "TR_STAKE_AVAILABLE": "利用可能です",
   "TR_STAKE_CAN_CLAIM_WARNING": "すでに {amount} {symbol}を請求することができます。 {br}請求するか、新しいステーク解除が処理されるまでお待ちください。",
@@ -1719,13 +1713,16 @@
   "TR_STAKE_CLAIM_AFTER_UNSTAKING": "ステーク解除期間に到達した時点で請求できます。",
   "TR_STAKE_CLAIM_IN_NEXT_BLOCK": "次のブロックで",
   "TR_STAKE_CLAIM_PENDING": "請求保留中",
+  "TR_STAKE_CLAIM_UNSTAKED": "ステークを解除した {symbol} を請求する",
   "TR_STAKE_CONFIRM_AND_STAKE": "確認してステークする",
   "TR_STAKE_CONFIRM_ENTRY_PERIOD": "エントリー期間の確認",
   "TR_STAKE_CONSENT_TO_STAKING_WITH_EVERSTAKE": "私は、Everstakeを利用してステーキングすることに同意します",
   "TR_STAKE_DAYS": "{count, plural, other {# 日}}",
   "TR_STAKE_DELEGATED": "ステークの委任",
   "TR_STAKE_DEREGISTERED": "ステークアドレスの登録解除",
+  "TR_STAKE_EARN_REWARDS_WEEKLY": "報酬を毎週獲得する",
   "TR_STAKE_ENTERING_POOL_MAY_TAKE": "ステーキングプールに入るには、最大 {count, plural, other {# 日}}かかります。",
+  "TR_STAKE_ENTER_THE_STAKING_POOL": "ステーキングプールに入る",
   "TR_STAKE_ETH": "Ethereumをステークする",
   "TR_STAKE_ETH_CARD_TITLE": "{symbol} を稼ぐ最も簡単な方法",
   "TR_STAKE_ETH_EARN_REPEAT": "ステークする。報酬を得る。繰り返す。",
@@ -1743,12 +1740,16 @@
   "TR_STAKE_EVERSTAKE_MANAGES": "Everstakeは、<t>スマートコントラクト、インフラストラクチャー、テクノロジーを駆使して</t>、お客様のステークされた {symbol} を管理・保護します。",
   "TR_STAKE_INSTANT": "インスタント",
   "TR_STAKE_INSTANTLY_UNSTAKED_WITH_DAYS": "あなたは {amount} {symbol} を \"インスタント \"で受け取りました。 {days, plural, =0 {} other { 残りは#日以内に支払われます}}.",
+  "TR_STAKE_IN_ACCOUNT": "アカウント中の {symbol} ",
   "TR_STAKE_LEARN_MORE": "もっと詳しく",
+  "TR_STAKE_LEAVE_STAKING_POOL": "ステーキングプールから出る",
   "TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL": "{amount} {symbol} を出金手数料のために残してあります。",
+  "TR_STAKE_LEFT_SMALL_AMOUNT_FOR_WITHDRAWAL": "引き出し手数料の支払いを可能にするために、少額の {symbol} を残してあります。",
   "TR_STAKE_MAX": "最大",
   "TR_STAKE_MAX_FEE_DESC": "最大手数料は、取引が処理されることを確実にするためにネットワーク上で支払う取引手数料です。",
   "TR_STAKE_MAX_REWARD_DAYS": "最大 {count, plural, other {# 日}}",
   "TR_STAKE_MIN_AMOUNT_TOOLTIP": "ステークの最小金額は {amount} {symbol} です",
+  "TR_STAKE_MONTHLY": "毎月",
   "TR_STAKE_NEXT_PAYOUT": "次の報酬支払い",
   "TR_STAKE_NOT_ENOUGH_FUNDS": "ネットワーク手数料を支払うのに {symbol} が足りません",
   "TR_STAKE_ONLY_REWARDS": "報酬のみ",
@@ -1760,6 +1761,8 @@
   "TR_STAKE_REGISTERED": "ステークアドレスの登録",
   "TR_STAKE_RESTAKED_BADGE": "再ステーク中",
   "TR_STAKE_REWARDS": "報酬",
+  "TR_STAKE_SIGN_TRANSACTION": "取引に署名する",
+  "TR_STAKE_SIGN_UNSTAKING_TRANSACTION": "ステーク解除の取引に署名する",
   "TR_STAKE_STAKE": "ステーク",
   "TR_STAKE_STAKED_AMOUNT": "ステーク額",
   "TR_STAKE_STAKED_AND_EARNING": "ステーク額と獲得した報酬",
@@ -1767,6 +1770,7 @@
   "TR_STAKE_STAKE_MORE": "さらにステークする",
   "TR_STAKE_STAKING_IN_A_NUTSHELL": "ステーキングの概要",
   "TR_STAKE_STAKING_IS": "ステーキングでは、ブロックチェーンの運営をサポートするために一時的にEthereumの資産をロックします。その見返りとして、報酬のEthereumを得ることができます！",
+  "TR_STAKE_STAKING_PROCESS": "ステークの手順",
   "TR_STAKE_START_STAKING": "ステーキングを開始",
   "TR_STAKE_TIME_TO_CLAIM": "請求の時期",
   "TR_STAKE_TOTAL_PENDING": "保留中のステーク合計:",
@@ -1775,23 +1779,35 @@
   "TR_STAKE_UNSTAKED_AND_READY_TO_CLAIM": "ステークが解除され、請求の準備ができています",
   "TR_STAKE_UNSTAKE_TO_CLAIM": "請求のためステークを解除",
   "TR_STAKE_UNSTAKING": "ステークを解除中",
+  "TR_STAKE_UNSTAKING_APPROXIMATE": "ある程度の {symbol} は即座に可能です",
+  "TR_STAKE_UNSTAKING_APPROXIMATE_DESCRIPTION": "ステーキングプールの流動性は、ある程度の資金の即時のステーク解除を可能にします。残りの資金はステーク解除期間に従います。",
   "TR_STAKE_UNSTAKING_PERIOD": "ステーク解除期間",
+  "TR_STAKE_UNSTAKING_PROCESS": "ステーク解除の手順",
   "TR_STAKE_UNSTAKING_TAKES": "現在、ステーキング解除には {count, plural, other {# 日}}かかります。完了後、資金で取引をしたり、送金できるようになります。",
+  "TR_STAKE_WEEKLY": "毎週",
   "TR_STAKE_WHAT_IS_STAKING": "ステーキングとは？",
+  "TR_STAKE_YEARLY": "毎年",
   "TR_STAKE_YOUR_FUNDS_MAINTAINED": "ステークされた資金はEverstakeによって管理されます",
+  "TR_STAKING_AMOUNT_STAKED_INSTANTLY": "{amount} {symbol} が簡単にステークされました！",
+  "TR_STAKING_AMOUNT_UNSTAKED_INSTANTLY": "{amount} {symbol} が簡単にステーク解除されました！",
+  "TR_STAKING_CONSOLIDATING_FUNDS": "あなたの {symbol} を統合しています",
   "TR_STAKING_DELEGATE": "委任",
   "TR_STAKING_DEPOSIT": "払戻し可能な保証金",
   "TR_STAKING_DEPOSIT_FEE_DECRIPTION": "入金手数料は {feeAmount} ADAで、ステーキングを開始するにはアドレスの登録が必要です。Cardanoのステーキングを解除すると保証金は返金されます。",
+  "TR_STAKING_ESTIMATED_GAINS": "推定利益",
   "TR_STAKING_FEE": "手数料",
+  "TR_STAKING_GETTING_READY": "{symbol} は作業の準備中です",
   "TR_STAKING_INSTANTLY_STAKED": "あなたは {amount} {symbol} をインスタントでステークしました。 {days, plural, =0 {} other { 残りの {symbol} は # 日以内にステークされます。}}",
   "TR_STAKING_IS_NOT_SUPPORTED": "このネットワークでは、ステーキングはサポートされていません。",
   "TR_STAKING_NOT_ENOUGH_FUNDS": "アカウントに充分な資金がありません。",
+  "TR_STAKING_ONCE_YOU_CONFIRM": "確認",
   "TR_STAKING_ON_3RD_PARTY_DESCRIPTION": "Trezorステークプールにステークすることによって、TrezorとCardanoエコシステムをTrezor Suiteから直接サポートすることができます。",
   "TR_STAKING_ON_3RD_PARTY_TITLE": "あなたはサードパーティのステークプールに委任しています",
   "TR_STAKING_POOL_OVERSATURATED_DESCRIPTION": "委任しているステークプールが飽和状態です。 ステーク報酬を最大化するために、ステークを再委任してください",
   "TR_STAKING_POOL_OVERSATURATED_TITLE": "ステークプールが飽和状態です",
   "TR_STAKING_REDELEGATE": "再委任",
   "TR_STAKING_REWARDS": "得られる報酬",
+  "TR_STAKING_REWARDS_ARE_RESTAKED": "報酬は自動的に再ステークされます",
   "TR_STAKING_REWARDS_DESCRIPTION": "最初のステークの登録と委任の後、報酬を受取り始めるまでに最大20日かかることに注意してください。 この期間が完了すると、5日ごとに報酬を受取れます。",
   "TR_STAKING_REWARDS_TITLE": "Cardanoのステーキングは有効です",
   "TR_STAKING_STAKE_ADDRESS": "あなたのステークアドレス",
@@ -1800,6 +1816,9 @@
   "TR_STAKING_TREZOR_POOL_FAIL": "Trezorステークプールにデリゲートすることができませんでした。",
   "TR_STAKING_TX_PENDING": "あなたの取引 {txid} は正常にブロックチェーンに送信され、承認を待っています。",
   "TR_STAKING_WITHDRAW": "出金",
+  "TR_STAKING_YOUR_EARNINGS": "収益は自動的に再ステークされ、 <a>複利</a>を得ることができます。",
+  "TR_STAKING_YOUR_UNSTAKED_FUNDS": "ステーク解除された {symbol} の準備ができました",
+  "TR_STAKING_YOU_ARE_HERE": "あなたはここにいます",
   "TR_STANDARD_WALLET_DESCRIPTION": "パスフレーズがありません",
   "TR_START": "開始",
   "TR_START_AGAIN": "再度開始",
@@ -1808,6 +1827,7 @@
   "TR_START_COINJOIN": "Coinjoinを開始",
   "TR_START_RECOVERY": "復元を開始",
   "TR_STEP": "ステップ {number}",
+  "TR_STEP_OF_TOTAL": "ステップ {index} / {total}",
   "TR_STILL_DONT_SEE_YOUR_TREZOR": "まだTrezorが表示されていませんか？",
   "TR_STOP": "停止",
   "TR_STOPPING": "停止中",
@@ -1859,7 +1879,11 @@
   "TR_TOKENS_EMPTY": "まだトークンがありません...",
   "TR_TOKENS_EMPTY_CHECK_HIDDEN": "トークンはありません。トークンは隠されている可能性があります。",
   "TR_TOKENS_SEARCH_TOOLTIP": "トークン、シンボルまたはコントラクトアドレスで検索します。",
+  "TR_TOKEN_NOT_FOUND": "トークンが見つかりません",
+  "TR_TOKEN_NOT_FOUND_ON_NETWORK": "{networkName} ネットワーク上にトークンが見つかりません。",
   "TR_TOKEN_TRANSFERS": "{standard} トークン転送",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH": "別の検索を試してください。",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH_OR_SWITCH": "別の検索を試すか、別のネットワークに切り替えてください。",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR": "認識できないトークン",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR_TOOLTIP": "認識できないトークンは潜在的なリスクをもたらす可能性があります。注意してください。",
   "TR_TOO_LONG": "メッセージが長すぎます",
@@ -1903,11 +1927,7 @@
   "TR_TO_BTC": "BTCに",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "ラベルを永続化し、異なるデバイスで利用できるようにするには、クラウドストレージプロバイダに接続します。",
   "TR_TO_SATOSHIS": "satsに",
-  "TR_TRADE_BUYS": "購入",
-  "TR_TRADE_ENTER_COIN": "仮想通貨名またはシンボルを入力してください...",
-  "TR_TRADE_EXCHANGES": "取引所",
   "TR_TRADE_REDIRECTING": "リダイレクト中...",
-  "TR_TRADE_SELLS": "売却",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "取引履歴が利用できません",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "ヒント: 取引ID、アドレス、トークン、ラベル、金額、日付を検索できます。",
   "TR_TRANSACTIONS_SEARCH_TIP_10": "ヒント: AND (&) と OR (|) 演算子を組み合わせることで、より複雑な検索を行うことができます。 例えば、 <strong>> {lastYear}-01-01 & < {lastYear}-01-31 | > {lastYear}-12-01 & < {lastYear}-12-31</strong> は{lastYear}年1月または{lastYear}年12月のすべての取引を表示します。",
@@ -1922,6 +1942,7 @@
   "TR_TRANSACTIONS_SEARCH_TOOLTIP": "取引ID、ラベル、または金額で検索するか、< > | & = != などの演算子を使用します。",
   "TR_TRANSACTION_DETAILS": "詳細",
   "TR_TREZOR_BRIDGE_RUNNING_VERSION": "実行中のTrezorブリッジのバージョン {version}",
+  "TR_TREZOR_CONNECT": "Trezor Connect",
   "TR_TREZOR_DEVICE_TUTORIAL_CANCELED_HEADING": "チュートリアルがキャンセルされました",
   "TR_TREZOR_DEVICE_TUTORIAL_COMPLETED_HEADING": "チュートリアルが完了しました",
   "TR_TREZOR_DEVICE_TUTORIAL_DESCRIPTION": "短いチュートリアルでデバイスの使い方を学びましょう",
@@ -1929,32 +1950,40 @@
   "TR_TROUBLESHOOTING_CLOSE_TABS": "Trezorを使用している可能性のある他のタブやウィンドウを閉じる",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION": "他のタブやウィンドウを閉じたら、このページをリフレッシュしてみてください。",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION_DESKTOP": "他のブラウザのタブとウィンドウを閉じた後、Trezor Suiteを終了して再度開いてみてください。",
-  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "通信を可能にするために必要なステップ",
+  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "この問題を解決するには、以下の手順を試しください。",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_DESCRIPTION": "<a>Trezor Bridgeのステータスページ</a> を確認してください",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_TITLE": "Trezor Bridgeのプロセスが起動していることを確認してください",
-  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "現在、クロームベースのブラウザだけがUSBデバイスとの直接通信を許可しています",
+  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "現在、クロームベースのブラウザだけがUSBデバイスとの直接通信を許可しています。",
   "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_TITLE": "クロームベースのブラウザを使用してください",
   "TR_TROUBLESHOOTING_TIP_CABLE_DESCRIPTION": "ケーブルは完全に挿入する必要があります。 USB-Cで接続するデバイスの場合、ケーブルは適切に \"クリック\" する必要があります。",
   "TR_TROUBLESHOOTING_TIP_CABLE_TITLE": "別のケーブルをお試しください",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_DESCRIPTION": "Trezor Bridgeがインストールされている必要があります。",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_TITLE": "可能であれば、別のコンピュータを使用してみてください",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "念のために",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "コンピューターを再起動してみてください",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "コンピュータを再起動すると、ブラウザとデバイス間の通信の問題が解決する場合があります。",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "コンピューターを再起動してください",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_DESCRIPTION": "<a>Trezor Suite</a> デスクトップアプリを実行",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE": "Trezor Suiteデスクトップアプリを使用する",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_DESCRIPTION": "クリックして他のブリッジの実装に切り替えます。現在のバージョン: ({currentVersion})",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_TITLE": "別のバージョンのTrezor Bridgeを使用する",
   "TR_TROUBLESHOOTING_TIP_UDEV_INSTALL_DESCRIPTION": "<a>udev rules</a>をインストールしてみてください。開く前にそれらをデスクトップに保存してください。",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_DESCRIPTION": "最後にデバイスのファームウェアを更新したのが2019年以前の場合は、<a>ナレッジベース</a>の指示に従ってください。",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_TITLE": "Trezorの旧モデルをお使いのようです。",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_DESCRIPTION": "USBハブではなく、コンピュータに直接接続してください。",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_TITLE": "別のUSBポートを試してください",
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "自動的にルールをインストール",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "udevルールがありません",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "予期しない状態: {error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "お使いのデバイスは正しく接続されていますが、ブラウザは現在それと通信できません。Trezor Bridgeをインストールする必要があります。",
   "TR_TRY_AGAIN": "もう一度試してください",
   "TR_TXID": "TX ID",
   "TR_TXID_RBF": "置換される前のTx ID",
   "TR_TX_CONFIRMATIONS": "{confirmationsCount}x",
   "TR_TX_CONFIRMED": "取引が確認されました",
   "TR_TX_CONFIRMING": "取引を確認中",
+  "TR_TX_DATA_FUNCTION": "機能",
+  "TR_TX_DATA_INPUT_DATA": "入力データ",
+  "TR_TX_DATA_METHOD": "入力データ",
+  "TR_TX_DATA_METHOD_NAME": "メソッド名",
+  "TR_TX_DATA_PARAMS": "パラメータ",
   "TR_TX_DEPOSIT": "入金",
   "TR_TX_FEE": "手数料",
   "TR_TX_TAB_AMOUNT": "金額",
@@ -1994,6 +2023,8 @@
   "TR_UPDATE_FIRMWARE_HOMESCREEN_LATER_TOOLTIP": "ファームウェアの更新が必要です。後ほど設定のページでホーム画面を変更することができます。",
   "TR_UPDATE_FIRMWARE_HOMESCREEN_TOOLTIP": "ホーム画面を変更するにはファームウェアを更新してください",
   "TR_UPDATE_MODAL_AVAILABLE_HEADING": "アップデートがあります",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES": "自動更新を有効にする",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG": "新規",
   "TR_UPDATE_MODAL_INSTALL_AND_RESTART": "アップデートして再起動",
   "TR_UPDATE_MODAL_INSTALL_NOW_OR_LATER": "今すぐアップデートをインストールしますか？",
   "TR_UPDATE_MODAL_NOT_NOW": "今はしない",
@@ -2001,6 +2032,9 @@
   "TR_UPDATE_MODAL_START_DOWNLOAD": "ダウンロード",
   "TR_UPDATE_MODAL_UPDATE_DOWNLOADED": "アップデートをダウンロードしました",
   "TR_UPDATE_MODAL_UPDATE_ON_QUIT": "終了時に更新する",
+  "TR_UPDATE_MODAL_WHATS_NEW": "新着情報",
+  "TR_UPDATE_MODAL_YOUR_VERSION": "現在のバージョン: v{version}",
+  "TR_UPGRADE_FIRMWARE_TO_DISCOVER_ACCOUNT_ERROR": "このアカウントにアクセスするにはファームウェアをアップグレードしてください。上の青いバナーを参照してください。",
   "TR_UP_TO": "最大",
   "TR_UP_TO_DATE": "最新です",
   "TR_UP_TO_DAYS": "最大 {count, plural, other {# 日}}",
@@ -2024,7 +2058,7 @@
   "TR_VERIFY_TREZOR_OWNERSHIP_CARD_2": "ウォレットのバックアップの写真を撮ったり、デジタルコピーをしないでください",
   "TR_VERIFY_TREZOR_OWNERSHIP_EXPLANATION": "現在のウォレットのバックアップをTrezorに入力することで、このウォレットを所有していることを確認してください。",
   "TR_VERSION": "バージョン: {version}",
-  "TR_VERSION_HAS_BEEN_RELEASED": "バージョン {version} がリリースされました！",
+  "TR_VERSION_HAS_BEEN_RELEASED": "v{version} がリリースされました！",
   "TR_VIEW": "表示",
   "TR_VIEW_ACCOUNT": "アカウントを表示",
   "TR_VIEW_ALL": "すべて表示",
@@ -2054,6 +2088,7 @@
   "TR_WALLET_SELECTION_ACCESS_HIDDEN_WALLET": "パスフレーズウォレットにアクセスする",
   "TR_WALLET_SELECTION_HIDDEN_WALLET": "隠しウォレット",
   "TR_WELCOME_TO_TREZOR_TEXT_WALLET_CREATION": "新しいウォレットを作成するか、ウォレットのバックアップを使って復元します。",
+  "TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE": "私たちはTrezorの体験を改善するために常に努力しています。新着情報です：",
   "TR_WEST": "西",
   "TR_WHAT_DATA_WE_COLLECT": "どのようなデータが収集されるのですか？",
   "TR_WHAT_IS_PASSPHRASE": "違いについて詳しく知る",
@@ -2064,7 +2099,7 @@
   "TR_WIPE_DEVICE_CHECKBOX_2_TITLE": "資金へのアクセスを回復するためには、ウォレットのバックアップが必要だと理解しています",
   "TR_WIPE_DEVICE_TEXT": "デバイスをリセットすると、そのデータはすべて削除されます。デバイスのリセットは、資金へのアクセスを回復するためのウォレットのバックアップがある場合にのみ行ってください。",
   "TR_WIPE_OR_UPDATE": "デバイスをリセットまたはファームウェアをアップデート",
-  "TR_WIPE_OR_UPDATE_DESCRIPTION": "デバイスの設定に移動",
+  "TR_WIPE_OR_UPDATE_DESCRIPTION": "デバイスの設定に移動します。",
   "TR_WIPING_YOUR_DEVICE": "ファクトリーリセットはデバイスメモリを消去し、ウォレットのバックアップとPINを含むすべての情報を削除します。 ファクトリーリセットは、資金へのアクセスの回復に必要なウォレットのバックアップがある場合にのみ行ってください。",
   "TR_WORDS": "{count} 単語",
   "TR_WORD_DOES_NOT_EXIST": "単語 \"{word}\" は BIP-39 の単語リストに存在しません。",
diff --git a/packages/suite-data/files/translations/ko.json b/packages/suite-data/files/translations/ko.json
index f29092526d5..73be3fb70be 100644
--- a/packages/suite-data/files/translations/ko.json
+++ b/packages/suite-data/files/translations/ko.json
@@ -198,9 +198,7 @@
   "TR_BUG": "버그",
   "TR_BUMP_FEE": "범프 수수료",
   "TR_BUY": "구매",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "거래 트랜잭션",
   "TR_BUY_BUY": "구매하기",
-  "TR_BUY_BUY_AGAIN": "다시 구매하기",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Trezor에서 확인됨",
   "TR_BUY_DETAIL_ERROR_BUTTON": "계정으로 돌아가기",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "제공업체 지원팀으로 이동",
diff --git a/packages/suite-data/files/translations/lol.json b/packages/suite-data/files/translations/lol.json
index 7e11884f86a..0cc12a714f4 100644
--- a/packages/suite-data/files/translations/lol.json
+++ b/packages/suite-data/files/translations/lol.json
@@ -1,5 +1,6 @@
 {
   "AMOUNT": "crwdns22287:0crwdne22287:0",
+  "AMOUNT_EXCEEDS_MAX": "crwdns36740:0{maxAmount}crwdne36740:0",
   "AMOUNT_IS_BELOW_DUST": "crwdns22291:0{dust}crwdne22291:0",
   "AMOUNT_IS_LESS_THAN_RESERVE": "crwdns22293:0{reserve}crwdne22293:0",
   "AMOUNT_IS_MORE_THAN_RESERVE": "crwdns22295:0{reserve}crwdne22295:0",
@@ -168,6 +169,7 @@
   "TOAST_PIN_CHANGED": "crwdns22653:0crwdne22653:0",
   "TOAST_QR_INCORRECT_ADDRESS": "crwdns28940:0crwdne28940:0",
   "TOAST_QR_INCORRECT_COIN_SCHEME_PROTOCOL": "crwdns28942:0{coin}crwdne28942:0",
+  "TOAST_QR_UNKNOWN_SCHEME_PROTOCOL": "crwdns36742:0{scheme}crwdne36742:0",
   "TOAST_RAW_TX_SENT": "crwdns22655:0{txid}crwdne22655:0",
   "TOAST_SETTINGS_APPLIED": "crwdns22657:0crwdne22657:0",
   "TOAST_SIGN_MESSAGE_ERROR": "crwdns22659:0{error}crwdne22659:0",
@@ -193,7 +195,6 @@
   "TR_404_GO_TO_DASHBOARD": "crwdns22687:0crwdne22687:0",
   "TR_404_TITLE": "crwdns22689:0crwdne22689:0",
   "TR_7D_CHANGE": "crwdns33426:0crwdne33426:0",
-  "TR_ABORT": "crwdns28944:0crwdne28944:0",
   "TR_ACCESS_HIDDEN_WALLET": "crwdns22691:0crwdne22691:0",
   "TR_ACCESS_STANDARD_WALLET": "crwdns22693:0crwdne22693:0",
   "TR_ACCOUNT_DETAILS_HEADER": "crwdns22695:0crwdne22695:0",
@@ -260,6 +261,7 @@
   "TR_ACQUIRE_DEVICE_TITLE": "crwdns22759:0crwdne22759:0",
   "TR_ACTIVATED_COINS": "crwdns35222:0crwdne35222:0",
   "TR_ACTIVE": "crwdns22765:0crwdne22765:0",
+  "TR_ADD": "crwdns36744:0crwdne36744:0",
   "TR_ADDRESSES": "crwdns35140:0crwdne35140:0",
   "TR_ADDRESSES_CHANGE": "crwdns35298:0crwdne35298:0",
   "TR_ADDRESSES_FRESH": "crwdns28383:0crwdne28383:0",
@@ -297,6 +299,8 @@
   "TR_ALLOW_ANALYTICS_DESCRIPTION": "crwdns22829:0crwdne22829:0",
   "TR_ALLOW_AUTOMATIC_SUITE_UPDATES": "crwdns36442:0crwdne36442:0",
   "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "crwdns36444:0crwdne36444:0",
+  "TR_ALL_NETWORKS": "crwdns36664:0{networkCount}crwdne36664:0",
+  "TR_ALL_NETWORKS_TOOLTIP": "crwdns36666:0{networkCount}crwdne36666:0",
   "TR_ALL_TRANSACTIONS": "crwdns22833:0crwdne22833:0",
   "TR_AMOUNT_SENT": "crwdns33169:0crwdne33169:0",
   "TR_AMOUNT_TOO_BIG_FOR_COINJOIN": "crwdns32719:0crwdne32719:0",
@@ -362,16 +366,14 @@
   "TR_BRIDGE_GO_TO_WALLET_DESCRIPTION": "crwdns35856:0crwdne35856:0",
   "TR_BRIDGE_NEEDED_DESCRIPTION": "crwdns35858:0crwdne35858:0",
   "TR_BRIDGE_REQUESTED_DESCRIPTION": "crwdns35860:0crwdne35860:0",
+  "TR_BRIDGE_TIP_AUTOSTART": "crwdns36746:0crwdne36746:0",
   "TR_BTC_UNITS": "crwdns29084:0crwdne29084:0",
   "TR_BUG": "crwdns22931:0crwdne22931:0",
   "TR_BUMP_FEE": "crwdns22933:0crwdne22933:0",
   "TR_BUMP_FEE_DISABLED_TOOLTIP": "crwdns36554:0crwdne36554:0",
   "TR_BUY": "crwdns22937:0crwdne22937:0",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "crwdns22939:0crwdne22939:0",
   "TR_BUY_BUY": "crwdns22943:0crwdne22943:0",
-  "TR_BUY_BUY_AGAIN": "crwdns22945:0crwdne22945:0",
   "TR_BUY_CONFIRMED_ON_TREZOR": "crwdns22949:0crwdne22949:0",
-  "TR_BUY_CONFIRM_ON_TREZOR": "crwdns36652:0crwdne36652:0",
   "TR_BUY_DETAIL_ERROR_BUTTON": "crwdns22953:0crwdne22953:0",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "crwdns22955:0crwdne22955:0",
   "TR_BUY_DETAIL_ERROR_TEXT": "crwdns22957:0crwdne22957:0",
@@ -415,12 +417,10 @@
   "TR_BUY_STATUS_PENDING": "crwdns23039:0crwdne23039:0",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "crwdns23041:0crwdne23041:0",
   "TR_BUY_STATUS_SUCCESS": "crwdns23043:0crwdne23043:0",
-  "TR_BUY_TRANS_ID": "crwdns23055:0crwdne23055:0",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "crwdns23061:0{maximum}crwdne23061:0",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "crwdns23063:0{maximum}crwdnd23063:0{currency}crwdne23063:0",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "crwdns23065:0{minimum}crwdne23065:0",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "crwdns23067:0{minimum}crwdnd23067:0{currency}crwdne23067:0",
-  "TR_BUY_VIEW_DETAILS": "crwdns23071:0crwdne23071:0",
   "TR_BYTES": "crwdns23073:0crwdne23073:0",
   "TR_CAMERA_NOT_RECOGNIZED": "crwdns23077:0crwdne23077:0",
   "TR_CAMERA_PERMISSION_DENIED": "crwdns23079:0crwdne23079:0",
@@ -439,12 +439,12 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "crwdns28930:0crwdne28930:0",
   "TR_CHAINED_TXS": "crwdns23083:0crwdne23083:0",
   "TR_CHANGELOG": "crwdns23087:0crwdne23087:0",
-  "TR_CHANGELOG_ON_GITHUB": "crwdns23089:0crwdne23089:0",
   "TR_CHANGE_ADDRESS_TOOLTIP": "crwdns32344:0crwdne32344:0",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "crwdns29092:0crwdne29092:0",
   "TR_CHANGE_HOMESCREEN": "crwdns23091:0crwdne23091:0",
   "TR_CHANGE_PIN": "crwdns23093:0crwdne23093:0",
   "TR_CHANGE_WIPE_CODE": "crwdns35210:0crwdne35210:0",
+  "TR_CHECKED_BALANCES_ON": "crwdns36748:0crwdne36748:0",
   "TR_CHECKING_YOUR_DEVICE": "crwdns33328:0crwdne33328:0",
   "TR_CHECKSUM_CONVERSION_INFO": "crwdns36158:0crwdne36158:0",
   "TR_CHECK_DEVICE_ORIGIN_DESCRIPTION": "crwdns33330:0crwdne33330:0",
@@ -456,8 +456,7 @@
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "crwdns23105:0crwdne23105:0",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "crwdns33253:0crwdne33253:0",
   "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "crwdns33255:0crwdne33255:0",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "crwdns33257:0crwdne33257:0",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "crwdns35494:0crwdne35494:0",
+  "TR_CHECK_RECOVERY_SEED_DESC_TOUCHSCREEN": "crwdns36750:0crwdne36750:0",
   "TR_CHECK_SEED": "crwdns23111:0crwdne23111:0",
   "TR_CHECK_YOUR_DEVICE": "crwdns23115:0crwdne23115:0",
   "TR_CHOOSE_RECOVERY_TYPE": "crwdns23121:0crwdne23121:0",
@@ -512,6 +511,7 @@
   "TR_COINJOIN_TRANSACTION_BATCH": "crwdns32634:0crwdne32634:0",
   "TR_COINMARKET_BEST_RATE": "crwdns36028:0crwdne36028:0",
   "TR_COINMARKET_BUY_AND_SELL": "crwdns36556:0crwdne36556:0",
+  "TR_COINMARKET_BUY_AND_SELL_COUNTER": "crwdns36752:0totalBuys={totalBuys}crwdnd36752:0totalBuys={totalBuys}crwdnd36752:0totalBuys={totalBuys}crwdnd36752:0totalBuys={totalBuys}crwdnd36752:0totalSells={totalSells}crwdnd36752:0totalSells={totalSells}crwdnd36752:0totalSells={totalSells}crwdnd36752:0totalSells={totalSells}crwdne36752:0",
   "TR_COINMARKET_CEX_TOOLTIP": "crwdns36446:0crwdne36446:0",
   "TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY": "crwdns36502:0crwdne36502:0",
   "TR_COINMARKET_COMPARE_OFFERS": "crwdns36032:0crwdne36032:0",
@@ -560,12 +560,6 @@
   "TR_COINMARKET_NO_CEX_PROVIDER_FOUND": "crwdns36078:0crwdne36078:0",
   "TR_COINMARKET_NO_DEX_PROVIDER_FOUND": "crwdns36080:0crwdne36080:0",
   "TR_COINMARKET_NO_METHODS_AVAILABLE": "crwdns36160:0crwdne36160:0",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "crwdns28459:0crwdne28459:0",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "crwdns28461:0crwdne28461:0",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "crwdns28463:0crwdne28463:0",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "crwdns28465:0crwdne28465:0",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "crwdns28467:0crwdne28467:0",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "crwdns28469:0crwdne28469:0",
   "TR_COINMARKET_OFFERS_EMPTY": "crwdns36082:0crwdne36082:0",
   "TR_COINMARKET_OFFERS_REFRESH": "crwdns36084:0crwdne36084:0",
   "TR_COINMARKET_OFFERS_SELECT": "crwdns36086:0crwdne36086:0",
@@ -581,6 +575,7 @@
   "TR_COINMARKET_SHOW_OFFERS": "crwdns36100:0crwdne36100:0",
   "TR_COINMARKET_SWAP": "crwdns36558:0crwdne36558:0",
   "TR_COINMARKET_SWAP_AMOUNT": "crwdns36560:0crwdne36560:0",
+  "TR_COINMARKET_SWAP_COUNTER": "crwdns36754:0totalSwaps={totalSwaps}crwdnd36754:0totalSwaps={totalSwaps}crwdnd36754:0totalSwaps={totalSwaps}crwdnd36754:0totalSwaps={totalSwaps}crwdne36754:0",
   "TR_COINMARKET_SWAP_DEX_MODAL_CONFIRM": "crwdns36562:0crwdne36562:0",
   "TR_COINMARKET_SWAP_DEX_MODAL_FOR_YOUR_SAFETY": "crwdns36564:0{fromCrypto}crwdnd36564:0{toCrypto}crwdnd36564:0{provider}crwdne36564:0",
   "TR_COINMARKET_SWAP_DEX_MODAL_LEGAL_HEADER": "crwdns36566:0crwdne36566:0",
@@ -605,7 +600,9 @@
   "TR_COINMARKET_SWAP_MODAL_VERIFIED_PARTNERS_HEADER": "crwdns36604:0crwdne36604:0",
   "TR_COINMARKET_TOKEN_NETWORK": "crwdns36102:0{tokenName}crwdnd36102:0{networkName}crwdne36102:0",
   "TR_COINMARKET_TRADE_FEE": "crwdns36104:0crwdne36104:0",
+  "TR_COINMARKET_TRANS_ID": "crwdns36756:0crwdne36756:0",
   "TR_COINMARKET_UNKNOWN_PROVIDER": "crwdns36162:0crwdne36162:0",
+  "TR_COINMARKET_VIEW_DETAILS": "crwdns36758:0crwdne36758:0",
   "TR_COINMARKET_YOUR_BEST_OFFER": "crwdns36106:0crwdne36106:0",
   "TR_COINMARKET_YOU_BUY": "crwdns36108:0crwdne36108:0",
   "TR_COINMARKET_YOU_GET": "crwdns36110:0crwdne36110:0",
@@ -679,7 +676,7 @@
   "TR_COPY_ADDRESS_POLICY_ID": "crwdns35832:0crwdne35832:0",
   "TR_COPY_AND_CLOSE": "crwdns28820:0crwdne28820:0",
   "TR_COPY_SIGNED_MESSAGE": "crwdns28822:0crwdne28822:0",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "crwdns23213:0crwdne23213:0",
+  "TR_COPY_TO_CLIPBOARD": "crwdns36810:0crwdne36810:0",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "crwdns23215:0crwdne23215:0",
   "TR_COULD_NOT_RETRIEVE_DATA": "crwdns23217:0crwdne23217:0",
   "TR_COUNT_WALLETS": "crwdns23221:0count={count}crwdnd23221:0count={count}crwdne23221:0",
@@ -713,6 +710,7 @@
   "TR_DASHBOARD_ASSET_FAILED": "crwdns23261:0crwdne23261:0",
   "TR_DASHBOARD_DISCOVERY_ERROR": "crwdns23263:0crwdne23263:0",
   "TR_DASHBOARD_DISCOVERY_ERROR_PARTIAL_DESC": "crwdns23267:0{details}crwdne23267:0",
+  "TR_DATA": "crwdns36684:0crwdne36684:0",
   "TR_DATABASE_UPGRADE_BLOCKED": "crwdns23271:0crwdne23271:0",
   "TR_DATA_ANALYTICS_CATEGORY_1": "crwdns23273:0crwdne23273:0",
   "TR_DATA_ANALYTICS_CATEGORY_1_ITEM_1": "crwdns23275:0crwdne23275:0",
@@ -766,8 +764,13 @@
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT": "crwdns28617:0crwdne28617:0",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_BUTTON": "crwdns22389:0crwdne22389:0",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_TOUCH": "crwdns28621:0crwdne28621:0",
+  "TR_DEVICE_CONNECTED_UNACQUIRED": "crwdns36760:0crwdne36760:0",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION": "crwdns36762:0{transportSessionOwner}crwdne36762:0",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION_UNKNOWN_APP": "crwdns36764:0crwdne36764:0",
   "TR_DEVICE_CONNECTED_WRONG_STATE": "crwdns23305:0crwdne23305:0",
   "TR_DEVICE_DISCONNECTED_DURING_ACTION_DESCRIPTION": "crwdns23309:0crwdne23309:0",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH": "crwdns36688:0crwdne36688:0",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR": "crwdns36690:0crwdne36690:0",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON": "crwdns36122:0crwdne36122:0",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON_DISABLED": "crwdns36124:0crwdne36124:0",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION": "crwdns36126:0crwdne36126:0",
@@ -786,6 +789,8 @@
   "TR_DEVICE_LABEL_IS_NOT_BACKED_UP": "crwdns23329:0{deviceLabel}crwdne23329:0",
   "TR_DEVICE_LABEL_IS_NOT_CONNECTED": "crwdns23331:0{deviceLabel}crwdne23331:0",
   "TR_DEVICE_LABEL_IS_UNAVAILABLE": "crwdns23333:0{deviceLabel}crwdne23333:0",
+  "TR_DEVICE_MAYBE_COMPROMISED_HEADING": "crwdns36766:0crwdne36766:0",
+  "TR_DEVICE_MAYBE_COMPROMISED_TEXT": "crwdns36768:0crwdne36768:0",
   "TR_DEVICE_NOT_CONNECTED": "crwdns23337:0crwdne23337:0",
   "TR_DEVICE_NOT_INITIALIZED": "crwdns23339:0crwdne23339:0",
   "TR_DEVICE_NOT_INITIALIZED_TEXT": "crwdns23341:0crwdne23341:0",
@@ -848,7 +853,6 @@
   "TR_DOWNLOAD_LATEST_BRIDGE": "crwdns23433:0{version}crwdne23433:0",
   "TR_DO_NOT_DISCONNECT_DEVICE": "crwdns32638:0crwdne32638:0",
   "TR_DO_NOT_SHOW_AGAIN": "crwdns35936:0crwdne35936:0",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "crwdns23437:0crwdne23437:0",
   "TR_DROPBOX": "crwdns23439:0crwdne23439:0",
   "TR_DROPZONE": "crwdns23441:0crwdne23441:0",
   "TR_DROPZONE_ERROR": "crwdns23443:0{error}crwdne23443:0",
@@ -930,7 +934,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "crwdns28537:0crwdne28537:0",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "crwdns28539:0crwdne28539:0",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "crwdns28541:0{provider}crwdne28541:0",
-  "TR_EXCHANGE_BUY": "crwdns23493:0crwdne23493:0",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "crwdns23501:0crwdne23501:0",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "crwdns23503:0crwdne23503:0",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "crwdns28543:0crwdne28543:0",
@@ -952,8 +955,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "crwdns23531:0crwdne23531:0",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "crwdns23533:0crwdne23533:0",
   "TR_EXCHANGE_DEX": "crwdns28547:0crwdne28547:0",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "crwdns28759:0{approvalFee}crwdnd28759:0{approvalFeeFiat}crwdnd28759:0{swapFee}crwdnd28759:0{swapFeeFiat}crwdne28759:0",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "crwdns28557:0{symbol}crwdnd28557:0{max}crwdne28557:0",
   "TR_EXCHANGE_EXTRA_FIELD": "crwdns23535:0{extraFieldName}crwdne23535:0",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "crwdns23537:0{extraFieldName}crwdne23537:0",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "crwdns23539:0{extraFieldDescription}crwdne23539:0",
@@ -963,7 +964,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "crwdns23551:0crwdne23551:0",
   "TR_EXCHANGE_FLOAT": "crwdns23553:0crwdne23553:0",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "crwdns23557:0crwdne23557:0",
-  "TR_EXCHANGE_PROVIDER": "crwdns23583:0crwdne23583:0",
   "TR_EXCHANGE_RATE": "crwdns23585:0crwdne23585:0",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "crwdns23591:0crwdne23591:0",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "crwdns23593:0crwdne23593:0",
@@ -990,16 +990,9 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "crwdns28579:0crwdne28579:0",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "crwdns28581:0crwdne28581:0",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "crwdns28583:0crwdne28583:0",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "crwdns28585:0crwdne28585:0",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "crwdns28587:0crwdne28587:0",
-  "TR_EXCHANGE_TRANS_ID": "crwdns23637:0crwdne23637:0",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "crwdns23639:0{symbol}crwdne23639:0",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "crwdns23647:0crwdne23647:0",
-  "TR_EXCHANGE_VIEW_DETAILS": "crwdns23649:0crwdne23649:0",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE": "crwdns36478:0crwdne36478:0",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION": "crwdns36480:0crwdne36480:0",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN": "crwdns36148:0crwdne36148:0",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON": "crwdns36150:0crwdne36150:0",
   "TR_EXPERIMENTAL_FEATURES": "crwdns28675:0crwdne28675:0",
   "TR_EXPERIMENTAL_FEATURES_ALLOW": "crwdns35842:0crwdne35842:0",
   "TR_EXPERIMENTAL_FEATURES_WARNING": "crwdns35846:0crwdne35846:0",
@@ -1326,6 +1319,7 @@
   "TR_NETWORK_LITECOIN": "crwdns24119:0crwdne24119:0",
   "TR_NETWORK_NAMECOIN": "crwdns24121:0crwdne24121:0",
   "TR_NETWORK_NEM": "crwdns24123:0crwdne24123:0",
+  "TR_NETWORK_OP": "crwdns36698:0crwdne36698:0",
   "TR_NETWORK_POLYGON": "crwdns35268:0crwdne35268:0",
   "TR_NETWORK_SOLANA_DEVNET": "crwdns35174:0crwdne35174:0",
   "TR_NETWORK_SOLANA_MAINNET": "crwdns35176:0crwdne35176:0",
@@ -1338,9 +1332,10 @@
   "TR_NETWORK_ZCASH": "crwdns24137:0crwdne24137:0",
   "TR_NEW_FEE": "crwdns24143:0crwdne24143:0",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "crwdns24145:0crwdne24145:0",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "crwdns24147:0crwdne24147:0",
   "TR_NEXT_UP": "crwdns35734:0crwdne35734:0",
   "TR_NONCE": "crwdns24149:0crwdne24149:0",
+  "TR_NON_ASCII_CHAR": "crwdns36812:0{label}crwdnd36812:0{char}crwdne36812:0",
+  "TR_NON_ASCII_CHARS": "crwdns36814:0{label}crwdne36814:0",
   "TR_NORMAL_ACCOUNTS": "crwdns32400:0crwdne32400:0",
   "TR_NORTH": "crwdns24151:0crwdne24151:0",
   "TR_NOTHING_TO_ANONYMIZE": "crwdns32769:0crwdne32769:0",
@@ -1364,10 +1359,6 @@
   "TR_N_MIN": "crwdns35736:0{n}crwdne35736:0",
   "TR_N_TRANSACTIONS": "crwdns24173:0value={value}crwdnd24173:0value={value}crwdne24173:0",
   "TR_OFF": "crwdns24175:0crwdne24175:0",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "crwdns24177:0{amount}crwdnd24177:0{max}crwdne24177:0",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "crwdns24179:0{amount}crwdnd24179:0{max}crwdne24179:0",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "crwdns24181:0{amount}crwdnd24181:0{min}crwdne24181:0",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "crwdns24183:0{amount}crwdnd24183:0{min}crwdne24183:0",
   "TR_OFFICIAL_LANGUAGES": "crwdns33305:0crwdne33305:0",
   "TR_OK": "crwdns32783:0crwdne32783:0",
   "TR_ON": "crwdns24189:0crwdne24189:0",
@@ -1426,30 +1417,6 @@
   "TR_OTHER_INPUTS_AND_OUTPUTS": "crwdns32644:0crwdne32644:0",
   "TR_OUTGOING": "crwdns24273:0crwdne24273:0",
   "TR_OUTPUTS": "crwdns24275:0crwdne24275:0",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "crwdns32412:0{symbol}crwdne32412:0",
-  "TR_P2P_GET_STARTED_INTRO": "crwdns32426:0{providerName}crwdne32426:0",
-  "TR_P2P_GET_STARTED_ITEM_1": "crwdns32428:0{providerName}crwdne32428:0",
-  "TR_P2P_GET_STARTED_ITEM_3": "crwdns32432:0{providerName}crwdne32432:0",
-  "TR_P2P_GET_STARTED_ITEM_4": "crwdns32434:0{providerName}crwdne32434:0",
-  "TR_P2P_GO_TO_PROVIDER": "crwdns32440:0{providerName}crwdne32440:0",
-  "TR_P2P_INFO": "crwdns32444:0{peerToPeer}crwdnd32444:0{multisigEscrow}crwdne32444:0",
-  "TR_P2P_MODAL_CONFIRM": "crwdns33059:0crwdne33059:0",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "crwdns33061:0{cryptocurrency}crwdnd33061:0{provider}crwdne33061:0",
-  "TR_P2P_MODAL_LEGAL_HEADER": "crwdns33063:0crwdne33063:0",
-  "TR_P2P_MODAL_SECURITY_HEADER": "crwdns33065:0crwdne33065:0",
-  "TR_P2P_MODAL_TERMS_1": "crwdns33067:0crwdne33067:0",
-  "TR_P2P_MODAL_TERMS_2": "crwdns33069:0crwdne33069:0",
-  "TR_P2P_MODAL_TERMS_4": "crwdns33071:0{provider}crwdne33071:0",
-  "TR_P2P_MODAL_TERMS_5": "crwdns33073:0crwdne33073:0",
-  "TR_P2P_MODAL_TERMS_6": "crwdns33075:0crwdne33075:0",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "crwdns33077:0crwdne33077:0",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "crwdns32474:0{providerName}crwdne32474:0",
-  "TR_P2P_PRICE": "crwdns32476:0{symbol}crwdne32476:0",
-  "TR_P2P_PRICE_TOOLTIP": "crwdns32478:0{symbol}crwdne32478:0",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "crwdns32500:0{providerName}crwdne32500:0",
-  "TR_P2P_USER_REPUTATION": "crwdns32506:0{rating}crwdnd32506:0{numberOfTrades}crwdne32506:0",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "crwdns32512:0{amount}crwdnd32512:0{maximum}crwdne32512:0",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "crwdns32514:0{amount}crwdnd32514:0{minimum}crwdne32514:0",
   "TR_PAGINATION_NEWER": "crwdns24279:0crwdne24279:0",
   "TR_PAGINATION_OLDER": "crwdns24281:0crwdne24281:0",
   "TR_PASSPHRASE_CASE_SENSITIVE": "crwdns28423:0crwdne28423:0",
@@ -1460,6 +1427,8 @@
   "TR_PASSPHRASE_MISMATCH": "crwdns35810:0crwdne35810:0",
   "TR_PASSPHRASE_MISMATCH_DESCRIPTION": "crwdns35812:0crwdne35812:0",
   "TR_PASSPHRASE_MISMATCH_START_OVER": "crwdns35814:0crwdne35814:0",
+  "TR_PASSPHRASE_NON_ASCII_CHARS": "crwdns36816:0crwdne36816:0",
+  "TR_PASSPHRASE_NON_ASCII_CHARS_WARNING": "crwdns36818:0crwdne36818:0",
   "TR_PASSPHRASE_TOO_LONG": "crwdns24297:0crwdne24297:0",
   "TR_PASSPHRASE_WALLET": "crwdns24299:0#{id}crwdne24299:0",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT": "crwdns35598:0crwdne35598:0",
@@ -1509,7 +1478,6 @@
   "TR_PRIVATE_DESCRIPTION": "crwdns32709:0{targetAnonymity}crwdne32709:0",
   "TR_PROCEED_UNVERIFIED_ADDRESS": "crwdns36632:0crwdne36632:0",
   "TR_PROMO_BANNER_DASHBOARD": "crwdns35802:0crwdne35802:0",
-  "TR_QR_CODE": "crwdns36654:0crwdne36654:0",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM": "crwdns35154:0crwdne35154:0",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM_EXPLANATION": "crwdns35216:0crwdne35216:0",
   "TR_QUICK_ACTION_DEBUG_EAP_EXPERIMENTAL_ENABLED": "crwdns36526:0crwdne36526:0",
@@ -1519,6 +1487,13 @@
   "TR_QUICK_ACTION_TOOLTIP_TREZOR_SUITE": "crwdns36534:0crwdne36534:0",
   "TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE": "crwdns36536:0{newVersion}crwdne36536:0",
   "TR_QUICK_ACTION_TOOLTIP_UP_TO_DATE": "crwdns36538:0{currentVersion}crwdne36538:0",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED": "crwdns36700:0crwdne36700:0",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED": "crwdns36702:0crwdne36702:0",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE": "crwdns36704:0crwdne36704:0",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE": "crwdns36706:0crwdne36706:0",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE": "crwdns36708:0crwdne36708:0",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE": "crwdns36710:0crwdne36710:0",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW": "crwdns36712:0crwdne36712:0",
   "TR_RANDOM_SEED_WORDS_DISCLAIMER": "crwdns24395:0crwdne24395:0",
   "TR_RANGE": "crwdns24397:0crwdne24397:0",
   "TR_READ_AND_UNDERSTOOD": "crwdns33446:0crwdne33446:0",
@@ -1593,12 +1568,15 @@
   "TR_SEED_WORDS_ENTER_COMPUTER": "crwdns24265:0crwdne24265:0",
   "TR_SEED_WORDS_ENTER_TOUCHSCREEN": "crwdns32913:0crwdne32913:0",
   "TR_SEE_DETAILS": "crwdns24539:0crwdne24539:0",
+  "TR_SEE_IF_ISSUE_PERSISTS": "crwdns36770:0crwdne36770:0",
   "TR_SELECTED": "crwdns32340:0{amount}crwdne32340:0",
   "TR_SELECT_COIN_FOR_SETTINGS": "crwdns28781:0crwdne28781:0",
   "TR_SELECT_DEVICE": "crwdns24545:0crwdne24545:0",
+  "TR_SELECT_NAME_OR_ADDRESS": "crwdns36668:0crwdne36668:0",
   "TR_SELECT_NUMBER_OF_WORDS": "crwdns24551:0crwdne24551:0",
   "TR_SELECT_PASSPHRASE_SOURCE": "crwdns24553:0{deviceLabel}crwdne24553:0",
   "TR_SELECT_RECOVERY_METHOD": "crwdns24555:0crwdne24555:0",
+  "TR_SELECT_TOKEN": "crwdns36670:0crwdne36670:0",
   "TR_SELECT_TREZOR": "crwdns35822:0crwdne35822:0",
   "TR_SELECT_TREZOR_TO_CONTINUE": "crwdns35824:0crwdne35824:0",
   "TR_SELECT_TYPE": "crwdns35272:0crwdne35272:0",
@@ -1642,10 +1620,6 @@
   "TR_SELL_STATUS_ERROR": "crwdns24639:0crwdne24639:0",
   "TR_SELL_STATUS_PENDING": "crwdns24641:0crwdne24641:0",
   "TR_SELL_STATUS_SUCCESS": "crwdns24643:0crwdne24643:0",
-  "TR_SELL_TRANS_ID": "crwdns24655:0crwdne24655:0",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "crwdns24661:0{maximum}crwdnd24661:0{currency}crwdne24661:0",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "crwdns24665:0{minimum}crwdnd24665:0{currency}crwdne24665:0",
-  "TR_SELL_VIEW_DETAILS": "crwdns24667:0crwdne24667:0",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "crwdns32915:0crwdne32915:0",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "crwdns32917:0crwdne32917:0",
   "TR_SENDING_SYMBOL": "crwdns28844:0multiple={multiple}crwdnd28844:0symbol={symbol}crwdnd28844:0symbol={symbol}crwdne28844:0",
@@ -1700,6 +1674,8 @@
   "TR_SHOW_LOG": "crwdns24717:0crwdne24717:0",
   "TR_SHOW_MORE": "crwdns24719:0crwdne24719:0",
   "TR_SHOW_MORE_ADDRESSES": "crwdns24721:0{count}crwdne24721:0",
+  "TR_SHOW_ON_TRAY": "crwdns36820:0crwdne36820:0",
+  "TR_SHOW_ON_TRAY_DESCRIPTION": "crwdns36822:0crwdne36822:0",
   "TR_SHOW_UNVERIFIED_ADDRESS": "crwdns24727:0crwdne24727:0",
   "TR_SHOW_UNVERIFIED_XPUB": "crwdns33225:0crwdne33225:0",
   "TR_SIDEBAR_ADD_COIN": "crwdns35280:0crwdne35280:0",
@@ -1712,7 +1688,9 @@
   "TR_SIZE": "crwdns24735:0crwdne24735:0",
   "TR_SKIP": "crwdns24737:0crwdne24737:0",
   "TR_SKIP_BACKUP": "crwdns24741:0crwdne24741:0",
+  "TR_SKIP_BACKUP_DESCRIPTION": "crwdns36716:0crwdne36716:0",
   "TR_SKIP_PIN": "crwdns24749:0crwdne24749:0",
+  "TR_SKIP_PIN_DESCRIPTION": "crwdns36718:0crwdne36718:0",
   "TR_SKIP_ROUNDS": "crwdns32536:0crwdne32536:0",
   "TR_SKIP_ROUNDS_DESCRIPTION": "crwdns32538:0crwdne32538:0",
   "TR_SKIP_ROUNDS_HEADING": "crwdns32540:0crwdne32540:0",
@@ -1725,6 +1703,7 @@
   "TR_STAKE_ADDING_TO_POOL": "crwdns35308:0crwdne35308:0",
   "TR_STAKE_ANY_AMOUNT_ETH": "crwdns35310:0{amount}crwdnd35310:0{symbol}crwdnd35310:0{apyPercent}crwdne35310:0",
   "TR_STAKE_APY": "crwdns35312:0crwdne35312:0",
+  "TR_STAKE_APY_ABBR": "crwdns36772:0crwdne36772:0",
   "TR_STAKE_APY_DESC": "crwdns35314:0crwdne35314:0",
   "TR_STAKE_AVAILABLE": "crwdns35316:0crwdne35316:0",
   "TR_STAKE_CAN_CLAIM_WARNING": "crwdns35318:0{amount}crwdnd35318:0{symbol}crwdnd35318:0{br}crwdne35318:0",
@@ -1765,10 +1744,12 @@
   "TR_STAKE_LEARN_MORE": "crwdns35370:0crwdne35370:0",
   "TR_STAKE_LEAVE_STAKING_POOL": "crwdns36642:0crwdne36642:0",
   "TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL": "crwdns35372:0{amount}crwdnd35372:0{symbol}crwdne35372:0",
+  "TR_STAKE_LEFT_SMALL_AMOUNT_FOR_WITHDRAWAL": "crwdns36774:0{symbol}crwdne36774:0",
   "TR_STAKE_MAX": "crwdns35374:0crwdne35374:0",
   "TR_STAKE_MAX_FEE_DESC": "crwdns35376:0crwdne35376:0",
   "TR_STAKE_MAX_REWARD_DAYS": "crwdns35512:0count={count}crwdne35512:0",
   "TR_STAKE_MIN_AMOUNT_TOOLTIP": "crwdns35378:0{amount}crwdnd35378:0{symbol}crwdne35378:0",
+  "TR_STAKE_MONTHLY": "crwdns36776:0crwdne36776:0",
   "TR_STAKE_NEXT_PAYOUT": "crwdns35380:0crwdne35380:0",
   "TR_STAKE_NOT_ENOUGH_FUNDS": "crwdns35382:0{symbol}crwdne35382:0",
   "TR_STAKE_ONLY_REWARDS": "crwdns35384:0crwdne35384:0",
@@ -1798,26 +1779,35 @@
   "TR_STAKE_UNSTAKED_AND_READY_TO_CLAIM": "crwdns35416:0crwdne35416:0",
   "TR_STAKE_UNSTAKE_TO_CLAIM": "crwdns35418:0crwdne35418:0",
   "TR_STAKE_UNSTAKING": "crwdns35420:0crwdne35420:0",
+  "TR_STAKE_UNSTAKING_APPROXIMATE": "crwdns36778:0{symbol}crwdne36778:0",
+  "TR_STAKE_UNSTAKING_APPROXIMATE_DESCRIPTION": "crwdns36780:0crwdne36780:0",
   "TR_STAKE_UNSTAKING_PERIOD": "crwdns35422:0crwdne35422:0",
   "TR_STAKE_UNSTAKING_PROCESS": "crwdns36650:0crwdne36650:0",
   "TR_STAKE_UNSTAKING_TAKES": "crwdns35424:0count={count}crwdne35424:0",
+  "TR_STAKE_WEEKLY": "crwdns36782:0crwdne36782:0",
   "TR_STAKE_WHAT_IS_STAKING": "crwdns35428:0crwdne35428:0",
+  "TR_STAKE_YEARLY": "crwdns36784:0crwdne36784:0",
   "TR_STAKE_YOUR_FUNDS_MAINTAINED": "crwdns35468:0crwdne35468:0",
   "TR_STAKING_AMOUNT_STAKED_INSTANTLY": "crwdns36658:0{amount}crwdnd36658:0{symbol}crwdne36658:0",
   "TR_STAKING_AMOUNT_UNSTAKED_INSTANTLY": "crwdns36660:0{amount}crwdnd36660:0{symbol}crwdne36660:0",
+  "TR_STAKING_CONSOLIDATING_FUNDS": "crwdns36786:0{symbol}crwdne36786:0",
   "TR_STAKING_DELEGATE": "crwdns28858:0crwdne28858:0",
   "TR_STAKING_DEPOSIT": "crwdns28860:0crwdne28860:0",
   "TR_STAKING_DEPOSIT_FEE_DECRIPTION": "crwdns28862:0{feeAmount}crwdne28862:0",
+  "TR_STAKING_ESTIMATED_GAINS": "crwdns36788:0crwdne36788:0",
   "TR_STAKING_FEE": "crwdns28864:0crwdne28864:0",
+  "TR_STAKING_GETTING_READY": "crwdns36790:0{symbol}crwdne36790:0",
   "TR_STAKING_INSTANTLY_STAKED": "crwdns36012:0amount={amount}crwdnd36012:0symbol={symbol}crwdnd36012:0days={days}crwdnd36012:0symbol={symbol}crwdnd36012:0symbol={symbol}crwdne36012:0",
   "TR_STAKING_IS_NOT_SUPPORTED": "crwdns28902:0crwdne28902:0",
   "TR_STAKING_NOT_ENOUGH_FUNDS": "crwdns28866:0crwdne28866:0",
+  "TR_STAKING_ONCE_YOU_CONFIRM": "crwdns36792:0crwdne36792:0",
   "TR_STAKING_ON_3RD_PARTY_DESCRIPTION": "crwdns28868:0crwdne28868:0",
   "TR_STAKING_ON_3RD_PARTY_TITLE": "crwdns28870:0crwdne28870:0",
   "TR_STAKING_POOL_OVERSATURATED_DESCRIPTION": "crwdns28872:0crwdne28872:0",
   "TR_STAKING_POOL_OVERSATURATED_TITLE": "crwdns28874:0crwdne28874:0",
   "TR_STAKING_REDELEGATE": "crwdns28876:0crwdne28876:0",
   "TR_STAKING_REWARDS": "crwdns28878:0crwdne28878:0",
+  "TR_STAKING_REWARDS_ARE_RESTAKED": "crwdns36794:0crwdne36794:0",
   "TR_STAKING_REWARDS_DESCRIPTION": "crwdns28880:0crwdne28880:0",
   "TR_STAKING_REWARDS_TITLE": "crwdns28882:0crwdne28882:0",
   "TR_STAKING_STAKE_ADDRESS": "crwdns28884:0crwdne28884:0",
@@ -1826,6 +1816,9 @@
   "TR_STAKING_TREZOR_POOL_FAIL": "crwdns28890:0crwdne28890:0",
   "TR_STAKING_TX_PENDING": "crwdns28892:0{txid}crwdne28892:0",
   "TR_STAKING_WITHDRAW": "crwdns28894:0crwdne28894:0",
+  "TR_STAKING_YOUR_EARNINGS": "crwdns36796:0crwdne36796:0",
+  "TR_STAKING_YOUR_UNSTAKED_FUNDS": "crwdns36798:0{symbol}crwdne36798:0",
+  "TR_STAKING_YOU_ARE_HERE": "crwdns36800:0crwdne36800:0",
   "TR_STANDARD_WALLET_DESCRIPTION": "crwdns24785:0crwdne24785:0",
   "TR_START": "crwdns24787:0crwdne24787:0",
   "TR_START_AGAIN": "crwdns24789:0crwdne24789:0",
@@ -1834,6 +1827,7 @@
   "TR_START_COINJOIN": "crwdns32953:0crwdne32953:0",
   "TR_START_RECOVERY": "crwdns24795:0crwdne24795:0",
   "TR_STEP": "crwdns32955:0{number}crwdne32955:0",
+  "TR_STEP_OF_TOTAL": "crwdns36672:0{index}crwdnd36672:0{total}crwdne36672:0",
   "TR_STILL_DONT_SEE_YOUR_TREZOR": "crwdns24801:0crwdne24801:0",
   "TR_STOP": "crwdns33249:0crwdne33249:0",
   "TR_STOPPING": "crwdns33267:0crwdne33267:0",
@@ -1885,7 +1879,11 @@
   "TR_TOKENS_EMPTY": "crwdns24935:0crwdne24935:0",
   "TR_TOKENS_EMPTY_CHECK_HIDDEN": "crwdns35772:0crwdne35772:0",
   "TR_TOKENS_SEARCH_TOOLTIP": "crwdns35826:0crwdne35826:0",
+  "TR_TOKEN_NOT_FOUND": "crwdns36674:0crwdne36674:0",
+  "TR_TOKEN_NOT_FOUND_ON_NETWORK": "crwdns36676:0{networkName}crwdne36676:0",
   "TR_TOKEN_TRANSFERS": "crwdns33183:0{standard}crwdne33183:0",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH": "crwdns36678:0crwdne36678:0",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH_OR_SWITCH": "crwdns36680:0crwdne36680:0",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR": "crwdns35284:0crwdne35284:0",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR_TOOLTIP": "crwdns35286:0crwdne35286:0",
   "TR_TOO_LONG": "crwdns28739:0crwdne28739:0",
@@ -1929,11 +1927,7 @@
   "TR_TO_BTC": "crwdns29088:0crwdne29088:0",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "crwdns24975:0crwdne24975:0",
   "TR_TO_SATOSHIS": "crwdns29090:0crwdne29090:0",
-  "TR_TRADE_BUYS": "crwdns24979:0crwdne24979:0",
-  "TR_TRADE_ENTER_COIN": "crwdns36488:0crwdne36488:0",
-  "TR_TRADE_EXCHANGES": "crwdns24981:0crwdne24981:0",
   "TR_TRADE_REDIRECTING": "crwdns24985:0crwdne24985:0",
-  "TR_TRADE_SELLS": "crwdns24989:0crwdne24989:0",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "crwdns24995:0crwdne24995:0",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "crwdns24997:0crwdne24997:0",
   "TR_TRANSACTIONS_SEARCH_TIP_10": "crwdns24999:0{lastYear}crwdnd24999:0{lastYear}crwdnd24999:0{lastYear}crwdnd24999:0{lastYear}crwdnd24999:0{lastYear}crwdne24999:0",
@@ -1948,6 +1942,7 @@
   "TR_TRANSACTIONS_SEARCH_TOOLTIP": "crwdns25017:0crwdne25017:0",
   "TR_TRANSACTION_DETAILS": "crwdns25019:0crwdne25019:0",
   "TR_TREZOR_BRIDGE_RUNNING_VERSION": "crwdns35874:0{version}crwdne35874:0",
+  "TR_TREZOR_CONNECT": "crwdns36824:0crwdne36824:0",
   "TR_TREZOR_DEVICE_TUTORIAL_CANCELED_HEADING": "crwdns33269:0crwdne33269:0",
   "TR_TREZOR_DEVICE_TUTORIAL_COMPLETED_HEADING": "crwdns33271:0crwdne33271:0",
   "TR_TREZOR_DEVICE_TUTORIAL_DESCRIPTION": "crwdns33273:0crwdne33273:0",
@@ -1968,19 +1963,27 @@
   "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "crwdns25057:0crwdne25057:0",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_DESCRIPTION": "crwdns35882:0crwdne35882:0",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE": "crwdns35884:0crwdne35884:0",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_DESCRIPTION": "crwdns36802:0{currentVersion}crwdne36802:0",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_TITLE": "crwdns36804:0crwdne36804:0",
   "TR_TROUBLESHOOTING_TIP_UDEV_INSTALL_DESCRIPTION": "crwdns25059:0crwdne25059:0",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_DESCRIPTION": "crwdns36806:0crwdne36806:0",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_TITLE": "crwdns36808:0crwdne36808:0",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_DESCRIPTION": "crwdns25061:0crwdne25061:0",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_TITLE": "crwdns25063:0crwdne25063:0",
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "crwdns28375:0crwdne28375:0",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "crwdns25065:0crwdne25065:0",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "crwdns25067:0{error}crwdne25067:0",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "crwdns25069:0crwdne25069:0",
   "TR_TRY_AGAIN": "crwdns25071:0crwdne25071:0",
   "TR_TXID": "crwdns25079:0crwdne25079:0",
   "TR_TXID_RBF": "crwdns35218:0crwdne35218:0",
   "TR_TX_CONFIRMATIONS": "crwdns25081:0{confirmationsCount}crwdne25081:0",
   "TR_TX_CONFIRMED": "crwdns35430:0crwdne35430:0",
   "TR_TX_CONFIRMING": "crwdns35446:0crwdne35446:0",
+  "TR_TX_DATA_FUNCTION": "crwdns36720:0crwdne36720:0",
+  "TR_TX_DATA_INPUT_DATA": "crwdns36722:0crwdne36722:0",
+  "TR_TX_DATA_METHOD": "crwdns36724:0crwdne36724:0",
+  "TR_TX_DATA_METHOD_NAME": "crwdns36726:0crwdne36726:0",
+  "TR_TX_DATA_PARAMS": "crwdns36728:0crwdne36728:0",
   "TR_TX_DEPOSIT": "crwdns29068:0crwdne29068:0",
   "TR_TX_FEE": "crwdns25085:0crwdne25085:0",
   "TR_TX_TAB_AMOUNT": "crwdns25089:0crwdne25089:0",
@@ -2020,6 +2023,8 @@
   "TR_UPDATE_FIRMWARE_HOMESCREEN_LATER_TOOLTIP": "crwdns33191:0crwdne33191:0",
   "TR_UPDATE_FIRMWARE_HOMESCREEN_TOOLTIP": "crwdns33167:0crwdne33167:0",
   "TR_UPDATE_MODAL_AVAILABLE_HEADING": "crwdns25133:0crwdne25133:0",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES": "crwdns36730:0crwdne36730:0",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG": "crwdns36732:0crwdne36732:0",
   "TR_UPDATE_MODAL_INSTALL_AND_RESTART": "crwdns25137:0crwdne25137:0",
   "TR_UPDATE_MODAL_INSTALL_NOW_OR_LATER": "crwdns25141:0crwdne25141:0",
   "TR_UPDATE_MODAL_NOT_NOW": "crwdns28445:0crwdne28445:0",
@@ -2027,6 +2032,9 @@
   "TR_UPDATE_MODAL_START_DOWNLOAD": "crwdns25147:0crwdne25147:0",
   "TR_UPDATE_MODAL_UPDATE_DOWNLOADED": "crwdns25149:0crwdne25149:0",
   "TR_UPDATE_MODAL_UPDATE_ON_QUIT": "crwdns32316:0crwdne32316:0",
+  "TR_UPDATE_MODAL_WHATS_NEW": "crwdns36734:0crwdne36734:0",
+  "TR_UPDATE_MODAL_YOUR_VERSION": "crwdns36736:0{version}crwdne36736:0",
+  "TR_UPGRADE_FIRMWARE_TO_DISCOVER_ACCOUNT_ERROR": "crwdns36662:0crwdne36662:0",
   "TR_UP_TO": "crwdns35432:0crwdne35432:0",
   "TR_UP_TO_DATE": "crwdns25153:0crwdne25153:0",
   "TR_UP_TO_DAYS": "crwdns35434:0count={count}crwdne35434:0",
@@ -2080,6 +2088,7 @@
   "TR_WALLET_SELECTION_ACCESS_HIDDEN_WALLET": "crwdns25205:0crwdne25205:0",
   "TR_WALLET_SELECTION_HIDDEN_WALLET": "crwdns25209:0crwdne25209:0",
   "TR_WELCOME_TO_TREZOR_TEXT_WALLET_CREATION": "crwdns25221:0crwdne25221:0",
+  "TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE": "crwdns36738:0crwdne36738:0",
   "TR_WEST": "crwdns25223:0crwdne25223:0",
   "TR_WHAT_DATA_WE_COLLECT": "crwdns25229:0crwdne25229:0",
   "TR_WHAT_IS_PASSPHRASE": "crwdns25233:0crwdne25233:0",
diff --git a/packages/suite-data/files/translations/nl.json b/packages/suite-data/files/translations/nl.json
index ef2c077d137..db48509c4e6 100644
--- a/packages/suite-data/files/translations/nl.json
+++ b/packages/suite-data/files/translations/nl.json
@@ -188,7 +188,6 @@
   "TR_404_GO_TO_DASHBOARD": "Ga nu naar Dashboard",
   "TR_404_TITLE": "Fout 404",
   "TR_7D_CHANGE": "7d verandering",
-  "TR_ABORT": "Breek af",
   "TR_ACCESS_HIDDEN_WALLET": "Toegang tot verborgen wallet",
   "TR_ACCESS_STANDARD_WALLET": "Toegang tot standaard wallet",
   "TR_ACCOUNT_DETAILS_HEADER": "Accountgegevens",
@@ -316,9 +315,7 @@
   "TR_BUG": "Fout",
   "TR_BUMP_FEE": "Transactiekosten verhogen",
   "TR_BUY": "Kopen",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "Rekening transacties",
   "TR_BUY_BUY": "kopen",
-  "TR_BUY_BUY_AGAIN": "Opnieuw kopen",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Bevestigd op trezor",
   "TR_BUY_DETAIL_ERROR_BUTTON": "Terug naar account",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "Open partner's ondersteuningssite",
@@ -357,12 +354,10 @@
   "TR_BUY_STATUS_PENDING": "Lopende",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "Lopende",
   "TR_BUY_STATUS_SUCCESS": "Goedgekeurd",
-  "TR_BUY_TRANS_ID": "Transport-ID:",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "Maximum is {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "Maximum is {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "Minimum is {minimum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "Minimum is {minimum} {currency}",
-  "TR_BUY_VIEW_DETAILS": "Details bekijken",
   "TR_BYTES": "bytes",
   "TR_CAMERA_NOT_RECOGNIZED": "De camera is niet herkend.",
   "TR_CAMERA_PERMISSION_DENIED": "Toegang tot de camera is geweigerd.",
@@ -380,7 +375,6 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Trezor-bedrag",
   "TR_CHAINED_TXS": "Ketting transacties",
   "TR_CHANGELOG": "Log van wijzigingen",
-  "TR_CHANGELOG_ON_GITHUB": "Overzicht aanpassingen op GitHub",
   "TR_CHANGE_HOMESCREEN": "Overzicht-scherm wijzigen",
   "TR_CHANGE_PIN": "Wijzigen",
   "TR_CHANGE_WIPE_CODE": "Wijzig wiscode",
@@ -407,8 +401,6 @@
   "TR_COINJOIN_PHASE_0_MESSAGE": "Inputs verzamelen",
   "TR_COINJOIN_PHASE_2_MESSAGE": "Uitvoer registreren",
   "TR_COINJOIN_STEP_1_TITLE": "Voeg bitcoin toe",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "Geen opties",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "Vernieuw pagina",
   "TR_COINS": "Munten",
   "TR_COIN_SETTINGS": "Munt instellingen",
   "TR_COLOR_SCHEME": "Kleurenschema",
@@ -445,7 +437,6 @@
   "TR_CONTRACT_TRANSACTION": "Contracttransactie",
   "TR_CONVERT_TO_LOWERCASE": "Zet om naar kleine letters",
   "TR_COPY_AND_CLOSE": "Kopieer & sluit",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "Kopiëren",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "Kon de changelog niet ophalen",
   "TR_COULD_NOT_RETRIEVE_DATA": "Kon gegevens niet ophalen",
   "TR_COUNT_WALLETS": "{count} {count, plural, one {portemonnee} other {portemonnees}}",
@@ -552,7 +543,6 @@
   "TR_DOWNLOADING": "Downloaden",
   "TR_DOWNLOAD_LATEST_BRIDGE": "Download laatste bridge {version}",
   "TR_DO_NOT_DISCONNECT_DEVICE": "Koppel je apparaat niet los",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "Wilt u deze stap echt overslaan?",
   "TR_DROPBOX": "Dropbox",
   "TR_DROPZONE": "Sleep het bestand hierheen of klik om bestanden te selecteren",
   "TR_DROPZONE_ERROR": "Importeren mislukt {error}",
@@ -587,7 +577,6 @@
   "TR_EXCHANGE_APPROVAL_TO_SWAP_BUTTON": "Ga door met omwisselen",
   "TR_EXCHANGE_APPROVAL_VALUE": "Goedkeuringswaarde",
   "TR_EXCHANGE_APPROVAL_VALUE_INFINITE": "Oneindige waarde",
-  "TR_EXCHANGE_BUY": "Voor",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Bevestigen bij Trezor & Verzenden",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "Bevestigen & Verzenden",
   "TR_EXCHANGE_CREATE_SUITE_ACCOUNT": "Maak een nieuw {symbol} account aan",
@@ -615,7 +604,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "Vast tarief biedt info",
   "TR_EXCHANGE_FLOAT": "Aanbieding zweeftarief",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "Zweefsnelheid biedt info",
-  "TR_EXCHANGE_PROVIDER": "dienstverlener",
   "TR_EXCHANGE_RATE": "Wisselkoers",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "Account ontvangen valt buiten het pak.",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "Dit is het specifieke alfanumerieke adres dat je munten zal ontvangen.",
@@ -633,10 +621,8 @@
   "TR_EXCHANGE_STATUS_SUCCESS": "Geslaagd",
   "TR_EXCHANGE_SWAP_SLIPPAGE_CUSTOM": "Aangepast",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "Voer een nummer in.",
-  "TR_EXCHANGE_TRANS_ID": "Transport-ID:",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "Een {symbol} -account zonder suite gebruiken",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "Adres ontvangen",
-  "TR_EXCHANGE_VIEW_DETAILS": "Details bekijken",
   "TR_EXPERIMENTAL_FEATURES": "Experimenteel",
   "TR_EXPERIMENTAL_FEATURES_ALLOW": "Experimentele functies",
   "TR_EXPERIMENTAL_TOR_SNOWFLAKE": "Tor snowflake",
@@ -823,10 +809,6 @@
   "TR_NUM_ACCOUNTS_FIAT_VALUE": "{accountsCount} {accountsCount, plural, one {account} other {accounts}} • {fiatValue}",
   "TR_N_TRANSACTIONS": "{value} {value, plural, one {Transactie} other {Transacties}}",
   "TR_OFF": "uit",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "Het gekozen bedrag van {currency} {amount} is hoger dan het maximaal geaccepteerde bedrag van {currency} {max}.",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "Het gekozen bedrag van {currency} {amount} is hoger dan het maximaal geaccepteerde bedrag van {currency} {max}.",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "Het gekozen bedrag van {currency} {amount} is lager dan het minimaal geaccepteerde bedrag van {currency} {max}.",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "Het gekozen bedrag van {currency} {amount} is lager dan het minimaal geaccepteerde bedrag van {currency} {max}.",
   "TR_ON": "aan",
   "TR_ONBOARDING_ADVANCED": "Geavanceerd",
   "TR_ONBOARDING_ALLOW_ANALYTICS": "Sta anoniem gegevens verzamelen toe",
@@ -877,7 +859,6 @@
   "TR_SELL_GO_TO_TRANSACTION": "Ga verder",
   "TR_SELL_STATUS_ERROR": "Geweigerd",
   "TR_SELL_STATUS_SUCCESS": "Goedgekeurd",
-  "TR_SELL_TRANS_ID": "Trans. ID:",
   "TR_SETTINGS": "Instellingen",
   "TR_SETTINGS_SAME_AS_SYSTEM": "Systeem",
   "TR_SETUP_WIPE_CODE": "Stel wiscode in",
@@ -898,7 +879,6 @@
   "TR_TOR_DISABLE": "Schakel Tor uit",
   "TR_TO_BTC": "Naar BTC",
   "TR_TO_SATOSHIS": "Naar sat",
-  "TR_TRADE_EXCHANGES": "exchanges",
   "TR_TRANSACTION_DETAILS": "Details",
   "TR_TROUBLESHOOTING_TIP_CABLE_TITLE": "Probeer een andere kabel",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_DESCRIPTION": "Met Trezor Bridge geïnstalleerd.",
diff --git a/packages/suite-data/files/translations/pl.json b/packages/suite-data/files/translations/pl.json
index 5cbe4dadc8d..1dca8a43339 100644
--- a/packages/suite-data/files/translations/pl.json
+++ b/packages/suite-data/files/translations/pl.json
@@ -153,7 +153,6 @@
   "TR_404_DESCRIPTION": "Kurza twarz! Przykro nam. Wygląda na to, że adres URL jest nieprawidłowy lub uszkodzony.",
   "TR_404_GO_TO_DASHBOARD": "Przejdź do pulpitu",
   "TR_404_TITLE": "Błąd 404: Nie znaleziono odnośnika",
-  "TR_ABORT": "Anuluj",
   "TR_ACCOUNT_DETAILS_HEADER": "Szczegóły konta",
   "TR_ACCOUNT_DETAILS_TYPE_HEADER": "Typ konta",
   "TR_ACCOUNT_DETAILS_XPUB": "Ostrożnie obchodź się ze swoim kluczem publicznym (xPUB). Gdy zostanie ujawniony, podmioty zewnętrzne uzyskają dostęp do całej Twojej historii transakcji.",
@@ -200,8 +199,5 @@
   "TR_NAV_ANONYMIZE": "Anonimizuj monety",
   "TR_NORMAL_ACCOUNTS": "Domyślne konta",
   "TR_NOT_PRIVATE": "Nieprywatne",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "Minimalna i maksymalna kwota, za jaką użytkownik może sprzedać {symbol}.",
-  "TR_P2P_GET_STARTED_INTRO": "Należy zainicjować transakcję na {providerName} – zastosuj się do poniższych kroków.",
-  "TR_P2P_GET_STARTED_ITEM_1": "Wybierz “Przejdź do {providerName}”, aby przejść na stronę internetową naszego partnera.",
   "TR_UPDATE_MODAL_NOT_NOW": "Nie teraz"
 }
diff --git a/packages/suite-data/files/translations/pt.json b/packages/suite-data/files/translations/pt.json
index 40ff6688a06..49d61ee82ad 100644
--- a/packages/suite-data/files/translations/pt.json
+++ b/packages/suite-data/files/translations/pt.json
@@ -1,12 +1,13 @@
 {
   "AMOUNT": "Valor",
+  "AMOUNT_EXCEEDS_MAX": "O valor excede o valor máximo permitido de {maxAmount}.",
   "AMOUNT_IS_BELOW_DUST": "O valor deve ser pelo menos {dust}",
   "AMOUNT_IS_LESS_THAN_RESERVE": "A conta receptora requer reserva mínima {reserve} XRP para ativar",
   "AMOUNT_IS_MORE_THAN_RESERVE": "O valor está acima da reserva inutilizável exigida ({reserve} XRP)",
   "AMOUNT_IS_NOT_ENOUGH": "Não há fundos suficientes",
-  "AMOUNT_IS_NOT_INTEGER": "A quantidade não é um número inteiro.",
+  "AMOUNT_IS_NOT_INTEGER": "O valor não é um número inteiro",
   "AMOUNT_IS_NOT_IN_RANGE_DECIMALS": "Máximo de {decimals} casas decimais permitido",
-  "AMOUNT_IS_NOT_SET": "Quantia não está definida",
+  "AMOUNT_IS_NOT_SET": "O valor não está definido",
   "AMOUNT_IS_TOO_LOW": "A quantidade é muito baixa.",
   "AMOUNT_NOT_ENOUGH_CURRENCY_FEE": "Não é suficiente {symbol} para cobrir a taxa de transação",
   "AMOUNT_SEND_MAX": "Enviar máx.",
@@ -31,8 +32,8 @@
   "DATA_NOT_VALID_HEX": "Hexadecimal inválido",
   "DESTINATION_TAG": "Tag de destino",
   "DESTINATION_TAG_IS_NOT_NUMBER": "A etiqueta de destino não é um número",
-  "DESTINATION_TAG_IS_NOT_VALID": "Etiqueta de destino inválida",
-  "DESTINATION_TAG_NOT_SET": "Etiqueta de destino não definida",
+  "DESTINATION_TAG_IS_NOT_VALID": "A etiqueta de destino é inválida",
+  "DESTINATION_TAG_NOT_SET": "A etiqueta de destino não está definida",
   "DESTINATION_TAG_TOOLTIP": "A etiqueta de destino é um código de identificação único que identifica o recebedor de uma transação.",
   "DISCONNECT_DEVICE_DESCRIPTION": "Seu dispositivo foi limpo e não tem mais chaves privadas.",
   "DOWNLOAD_TRANSACTION": "Baixar como .txt",
@@ -66,8 +67,8 @@
   "LOCKTIME_ADD": "Adicionar Locktime",
   "LOCKTIME_ADD_TOOLTIP": "O Locktime define quando uma transação pode ser minerada em um bloco.",
   "LOCKTIME_BLOCKHEIGHT": "Altura do bloco do Locktime",
-  "LOCKTIME_IS_NOT_INTEGER": "O Locktime não é um número inteiro",
-  "LOCKTIME_IS_NOT_SET": "Locktime não definido",
+  "LOCKTIME_IS_NOT_INTEGER": "O tempo de bloqueio não é um número inteiro",
+  "LOCKTIME_IS_NOT_SET": "O tempo de bloqueio não está definido",
   "LOCKTIME_IS_TOO_BIG": "O registro temporal é muito grande",
   "LOCKTIME_IS_TOO_LOW": "O Locktime é muito baixo",
   "LOCKTIME_SCHEDULE_SEND": "Tempo de bloqueio",
@@ -124,7 +125,7 @@
   "RECIPIENT_ADDRESS": "Endereço",
   "RECIPIENT_CANNOT_SEND_TO_MYSELF": "Não posso enviar para mim",
   "RECIPIENT_IS_NOT_SET": "O endereço não está definido",
-  "RECIPIENT_IS_NOT_VALID": "Endereço inválido",
+  "RECIPIENT_IS_NOT_VALID": "O endereço é inválido",
   "RECIPIENT_REQUIRES_UPDATE": "Taproot não é suportado pela sua versão de firmware. Por favor, atualize o firmware do seu dispositivo.",
   "RECIPIENT_SCAN": "Pesquisar",
   "REFRESH": "Atualizar",
@@ -168,6 +169,7 @@
   "TOAST_PIN_CHANGED": "PIN alterado com sucesso",
   "TOAST_QR_INCORRECT_ADDRESS": "O QR code contém um endereço inválido para esta conta",
   "TOAST_QR_INCORRECT_COIN_SCHEME_PROTOCOL": "O QR code está definido para a conta {coin}",
+  "TOAST_QR_UNKNOWN_SCHEME_PROTOCOL": "Esquema de protocolo desconhecido: \"{scheme}\". Tente novamente ou insira o endereço manualmente.",
   "TOAST_RAW_TX_SENT": "Transação enviada. TXID: {txid}",
   "TOAST_SETTINGS_APPLIED": "Configurações alteradas com sucesso",
   "TOAST_SIGN_MESSAGE_ERROR": "Erro de assinatura da mensagem: {error}",
@@ -193,7 +195,6 @@
   "TR_404_GO_TO_DASHBOARD": "Ir para o Painel",
   "TR_404_TITLE": "Erro 404: Não encontrado",
   "TR_7D_CHANGE": "Alteração 7d",
-  "TR_ABORT": "Abortar",
   "TR_ACCESS_HIDDEN_WALLET": "Acessar carteira oculta",
   "TR_ACCESS_STANDARD_WALLET": "Acessar a carteira padrão",
   "TR_ACCOUNT_DETAILS_HEADER": "Detalhes da conta",
@@ -232,10 +233,16 @@
   "TR_ACCOUNT_TYPE_BIP86_DESC": "Taproot é um novo tipo de endereço que pode melhorar a privacidade e a eficiência da rede. Alguns serviços ainda podem não suportar endereços Taproot.",
   "TR_ACCOUNT_TYPE_BIP86_NAME": "Taproot",
   "TR_ACCOUNT_TYPE_BIP86_TECH": "BIP86, P2TR, Bech32m",
+  "TR_ACCOUNT_TYPE_CARDANO_DESC": "O método atual e mais amplamente aceito de gerar e gerenciar endereços da Cardano garante interoperabilidade, segurança e suporte para todos os tipos de tokens.",
   "TR_ACCOUNT_TYPE_COINJOIN": "CoinJoin",
+  "TR_ACCOUNT_TYPE_DEFAULT": "Padrão",
   "TR_ACCOUNT_TYPE_IMPORTED": "Importado",
   "TR_ACCOUNT_TYPE_LEDGER": "Ledger",
+  "TR_ACCOUNT_TYPE_LEDGER_DESC": "As contas contábeis são compatíveis com os caminhos de derivação do Ledger Live, permitindo a migração tranquila da Ledger para a Trezor.",
   "TR_ACCOUNT_TYPE_LEGACY": "Legacy",
+  "TR_ACCOUNT_TYPE_LEGACY_DESC": "As contas Legacy são compatíveis com os caminhos de derivação do Ledger Legacy, permitindo a migração tranquila das contas contábeis para a Trezor.",
+  "TR_ACCOUNT_TYPE_NORMAL_EVM_DESC": "O método atual e mais amplamente aceito de gerar e gerenciar endereços da {value} garante interoperabilidade, segurança e suporte para todos os tipos de tokens.",
+  "TR_ACCOUNT_TYPE_NORMAL_SOLANA_DESC": "O método atual e mais amplamente aceito de gerar e gerenciar endereços da Solana garante interoperabilidade, segurança e suporte tokens SOL e SPL.",
   "TR_ACCOUNT_TYPE_NO_CAPABILITY": "Não suportado.",
   "TR_ACCOUNT_TYPE_NO_SUPPORT": "Este tipo de conta não é suportado neste modelo Trezor.",
   "TR_ACCOUNT_TYPE_SEGWIT": "Legacy SegWit",
@@ -249,10 +256,12 @@
   "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_TECH": "BIP44, Base58",
   "TR_ACCOUNT_TYPE_TAPROOT": "Taproot",
   "TR_ACCOUNT_TYPE_UPDATE_REQUIRED": "Atualize o firmware do dispositivo para habilitar este tipo de conta.",
+  "TR_ACCOUNT_TYPE_XRP_DESC": "O XRP é uma moeda digital que permite pagamentos internacionais, rápidos e de baixo custo sem depender de mineração tradicional, usando um livro razão de consenso para confirmações rápidas de transação.",
   "TR_ACQUIRE_DEVICE": "Use seu Trezor aqui",
   "TR_ACQUIRE_DEVICE_TITLE": "Há outra sessão em andamento",
   "TR_ACTIVATED_COINS": "Moedas ativadas",
   "TR_ACTIVE": "ativo",
+  "TR_ADD": "Adicionar",
   "TR_ADDRESSES": "Endereço",
   "TR_ADDRESSES_CHANGE": "Alterar endereços",
   "TR_ADDRESSES_FRESH": "Endereços novos",
@@ -262,7 +271,7 @@
   "TR_ADDRESS_MODAL_CLIPBOARD": "Copiar endereço",
   "TR_ADDRESS_MODAL_TITLE": "Endereço de recebimento {networkName}",
   "TR_ADDRESS_MODAL_TITLE_EXCHANGE": "Endereço de recebimento {networkCurrencyName} na rede {networkName}",
-  "TR_ADDRESS_PHISHING_WARNING": "Para evitar ataques de phishing, você deve verificar o endereço na sua Trezor. {claim}",
+  "TR_ADDRESS_PHISHING_WARNING": "Para evitar ataques de phishing, verifique o endereço de recebimento em seu Trezor. {claim}",
   "TR_ADD_ACCOUNT": "Adicionar conta",
   "TR_ADD_HIDDEN_WALLET": "Adicionar carteira oculta",
   "TR_ADD_NETWORK_ACCOUNT": "Adicionar conta {network}",
@@ -289,7 +298,9 @@
   "TR_ALLOW_ANALYTICS": "Utilização de dados",
   "TR_ALLOW_ANALYTICS_DESCRIPTION": "Todos os dados são mantidos estritamente anônimos e são usados apenas para melhorar o ecossistema Trezor.",
   "TR_ALLOW_AUTOMATIC_SUITE_UPDATES": "Atualizações automáticas do Trezor Suite",
-  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "O Trezor Suite baixa automaticamente a nova versão em segundo plano e a instala ao reiniciar o aplicativo. Isso garante que você esteja sempre atualizado com os recursos e patches de segurança mais recentes. As atualizações são feitas sem exigir sua permissão.",
+  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Baixe automaticamente a versão mais recente do Trezor Suite em segundo plano e instale-a ao reiniciar o aplicativo. Isso garante que você esteja sempre atualizado com os recursos e patches de segurança mais recentes. As atualizações são feitas sem exigir sua permissão.",
+  "TR_ALL_NETWORKS": "Todas as redes ({networkCount})",
+  "TR_ALL_NETWORKS_TOOLTIP": "Visualizar tokens de todas as {networkCount} redes. Filtrar pelas redes mais populares.",
   "TR_ALL_TRANSACTIONS": "Transações",
   "TR_AMOUNT_SENT": "Quantia enviada",
   "TR_AMOUNT_TOO_BIG_FOR_COINJOIN": "Não adequado para CoinJoin - quantidade alta demais",
@@ -348,20 +359,20 @@
   "TR_BEFORE_ANY_FURTHER_ACTIONS": "Embora improvável, pode ser necessário acessar o backup da sua carteira caso uma atualização de firmware dê problema.",
   "TR_BIP_SIG_FORMAT": "Trezor",
   "TR_BITCOIN_ONLY_UNAVAILABLE": "Antes de alternar para {bitcoinOnly}, precisamos atualizar seu firmware para uma versão mais recente.",
-  "TR_BREAKING_ANONYMITY_CHECKBOX": "Entendo que estou prejudicando meu anonimato",
+  "TR_BREAKING_ANONYMITY_CHECKBOX": "Entendo que estou comprometendo meu anonimato.",
   "TR_BRIDGE": "Trezor Bridge ",
   "TR_BRIDGE_DEV_MODE_START": "Iniciando Trezor Bridge na porta 21324",
   "TR_BRIDGE_DEV_MODE_STOP": "Iniciando Trezor Bridge na porta padrão",
   "TR_BRIDGE_GO_TO_WALLET_DESCRIPTION": "Tem certeza? Seu dispositivo só pode ser usado por um aplicativo por vez. Se estiver utilizando outro aplicativo com o seu dispositivo Trezor, termine a outra sessão primeiro.",
   "TR_BRIDGE_NEEDED_DESCRIPTION": "Seu navegador não é compatível. Para obter a melhor experiência, baixe e execute o aplicativo de desktop Trezor Suite em segundo plano ou use um navegador compatível com Chromium que aceite WebUSB.",
   "TR_BRIDGE_REQUESTED_DESCRIPTION": "Outro aplicativo solicitou que a Trezor Suite se conecte ao seu dispositivo Trezor. Mantenha o Trezor Suite em segundo plano e tente novamente em outro aplicativo.",
+  "TR_BRIDGE_TIP_AUTOSTART": "Dica: ativar o recurso de inicialização automática e ter o Bridge sempre rodando em segundo plano.",
   "TR_BTC_UNITS": "Unidades Bitcoin",
   "TR_BUG": "Bug",
   "TR_BUMP_FEE": "Aumentar taxa",
+  "TR_BUMP_FEE_DISABLED_TOOLTIP": "Para acelerar suas transações, aumente a taxa na transação pendente mais antiga (por Nonce) na fila. As transações devem ser confirmadas na ordem. <a>Saiba mais</a>",
   "TR_BUY": "Comprar",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "Transações de negociação",
   "TR_BUY_BUY": "Comprar",
-  "TR_BUY_BUY_AGAIN": "Comprar novamente",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Confirmado no Trezor",
   "TR_BUY_DETAIL_ERROR_BUTTON": "Voltar à conta",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "Ir para o suporte do fornecedor",
@@ -379,19 +390,19 @@
   "TR_BUY_DETAIL_WAITING_FOR_USER_TEXT": "{providerName} precisa de alguns detalhes finais para concluir esta transação. Visite o site deles para prosseguir.",
   "TR_BUY_DETAIL_WAITING_FOR_USER_TITLE": "Complete sua transação",
   "TR_BUY_FOOTER_TEXT_1": "O Invity é uma ferramenta de comparação que liga você às melhores exchanges fornecedoras. Eles só usam a localização para mostrar as ofertas mais relevantes.",
-  "TR_BUY_FOOTER_TEXT_2": "O Invity não vê suas informações de pagamento ou de KYC; você só as compartilha com a exchange fornecedora se optar por concluir a transação.",
+  "TR_BUY_FOOTER_TEXT_2": "A Invity não vê suas informações de pagamento ou de KYC; você só as compartilha com a exchange fornecedora se optar por concluir a transação.",
   "TR_BUY_GO_TO_PAYMENT": "Finalizar transação",
   "TR_BUY_LEARN_MORE": "Saiba mais",
   "TR_BUY_MODAL_CONFIRM": "Estou pronto(a) para comprar",
   "TR_BUY_MODAL_FOR_YOUR_SAFETY": "Comprar {cryptocurrency} com {provider}",
   "TR_BUY_MODAL_LEGAL_HEADER": "Aviso legal",
   "TR_BUY_MODAL_SECURITY_HEADER": "A Trezor prioriza sua segurança",
-  "TR_BUY_MODAL_TERMS_1": "Você está aqui para comprar criptomoedas. Se você chegou a este site por qualquer outro motivo, contate o suporte {provider} antes de prosseguir.",
-  "TR_BUY_MODAL_TERMS_2": "Você está usando este recurso para comprar fundos que irão para uma conta sob seu controle pessoal direto.",
-  "TR_BUY_MODAL_TERMS_3": "Você entende que transações de criptomoeda são irreversíveis e não permitem reembolso. Assim, perdas por fraudes ou acidentes podem ser irrecuperáveis.",
-  "TR_BUY_MODAL_TERMS_4": "Você entende que a Invity não oferece este serviço. O serviço é regido pelos termos de {provider}.",
-  "TR_BUY_MODAL_TERMS_5": "Você não está usando esse recurso para realizar aposta, fraude ou outra violação dos Termos de Serviço da Invity ou do fornecedor ou de quaisquer regulamentos aplicáveis.",
-  "TR_BUY_MODAL_TERMS_6": "Você entende que criptomoedas são uma ferramenta financeira emergente e que as regulamentações podem variar entre jurisdições. Isso pode acarretar em um maior risco de fraude, roubo ou instabilidade de mercado para você.",
+  "TR_BUY_MODAL_TERMS_1": "Estou aqui para comprar criptomoedas. Se eu for direcionado a este site por qualquer outro motivo, entrarei em contato com o suporte da {provider} antes de prosseguir.",
+  "TR_BUY_MODAL_TERMS_2": "Estou usando esse recurso para comprar criptomoedas que serão enviadas para minha própria conta.",
+  "TR_BUY_MODAL_TERMS_3": "Compreendo que as transações de criptomoedas são finais e não podem ser revertidas ou reembolsadas. Perdas devido a fraudes ou erros podem não ser recuperáveis.",
+  "TR_BUY_MODAL_TERMS_4": "Compreendo que a Invity não oferece este serviço. Ela é regida pelos Termos e Condições do {provider}.",
+  "TR_BUY_MODAL_TERMS_5": "Não estou usando esse recurso para realizar aposta, fraude ou qualquer outra atividade que viole os Termos de Serviço da Invity ou do fornecedor ou de quaisquer leis aplicáveis.",
+  "TR_BUY_MODAL_TERMS_6": "Compreendo que criptomoedas são uma ferramenta financeira emergente e que as regulamentações podem ser diferentes a depender da região. Isso pode aumentar o risco de fraude, roubo ou instabilidade de mercado.",
   "TR_BUY_MODAL_VERIFIED_PARTNERS_HEADER": "Parceiros verificados pela Invity",
   "TR_BUY_NETWORK": "Comprar {network}",
   "TR_BUY_NOT_TRANSACTIONS": "Nenhuma transação ainda.",
@@ -406,12 +417,10 @@
   "TR_BUY_STATUS_PENDING": "Pendente",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "Pendente",
   "TR_BUY_STATUS_SUCCESS": "Aprovado",
-  "TR_BUY_TRANS_ID": "ID. da trans:",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "O máximo é {maximum}",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "O máximo é {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "O mínimo é {minimum}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "O mínimo é {minimum} {currency}",
-  "TR_BUY_VIEW_DETAILS": "Ver detalhes",
   "TR_BYTES": "bytes",
   "TR_CAMERA_NOT_RECOGNIZED": "A câmera não foi reconhecida.",
   "TR_CAMERA_PERMISSION_DENIED": "A permissão para acessar a câmera foi negada.",
@@ -430,12 +439,12 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Valor na Trezor",
   "TR_CHAINED_TXS": "Transações em chain",
   "TR_CHANGELOG": "Changelog",
-  "TR_CHANGELOG_ON_GITHUB": "Changelog no GitHub",
   "TR_CHANGE_ADDRESS_TOOLTIP": "Este é um endereço de alteração criado a partir de um envio anterior.",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "Você pode alterar seu tipo de firmware em Configurações a qualquer momento.",
   "TR_CHANGE_HOMESCREEN": "Alterar tela inicial",
   "TR_CHANGE_PIN": "Alterar PIN",
   "TR_CHANGE_WIPE_CODE": "Alterar código de limpeza",
+  "TR_CHECKED_BALANCES_ON": "Saldos verificados em",
   "TR_CHECKING_YOUR_DEVICE": "Verificando seu dispositivo",
   "TR_CHECKSUM_CONVERSION_INFO": "Convertido para checksum. <a>Saiba mais</a>",
   "TR_CHECK_DEVICE_ORIGIN_DESCRIPTION": "Verificaremos a integridade do seu dispositivo Trezor, garantindo sua segurança e confirmando a autenticidade do chip.",
@@ -447,8 +456,7 @@
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "Realize uma recuperação simulada para verificar sua semente de recuperação.",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "Digite as palavras da sua semente de recuperação aqui na ordem exibida em seu dispositivo. Você pode precisar digitar algumas palavras que não fazem parte de sua semente de recuperação como uma medida de segurança adicional.",
   "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "Use o teclado com dois botões para digitar sua semente de recuperação (backup de carteira). Ao fazer isso, você estará mantendo todas as suas informações confidenciais em segurança, longe de qualquer computador ou navegador da web com suspeito ou inseguro.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "Sua semente de recuperação (backup de carteira) é inserida usando o touchscreen. Isso evita expor suas informações confidenciais a um computador ou navegador da web potencialmente inseguro.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "Sua seed de recuperação (backup da carteira) foi inserida usando os botões da sua Trezor. Isso evita expor qualquer uma das suas informações confidenciais a um computador potencialmente inseguro ou navegador da web.",
+  "TR_CHECK_RECOVERY_SEED_DESC_TOUCHSCREEN": "Seu backup de carteira é inserido usando o touchscreen. Isso evita expor suas informações confidenciais a um computador ou navegador da web potencialmente inseguro.",
   "TR_CHECK_SEED": "Verificar cópia de segurança",
   "TR_CHECK_YOUR_DEVICE": "Verifique a tela da sua Trezor",
   "TR_CHOOSE_RECOVERY_TYPE": "Escolha o tipo de recuperação",
@@ -502,10 +510,37 @@
   "TR_COINJOIN_TILE_3_TITLE": "Protegido pela sua Trezor",
   "TR_COINJOIN_TRANSACTION_BATCH": "Transação CoinJoin",
   "TR_COINMARKET_BEST_RATE": "Melhor taxa",
+  "TR_COINMARKET_BUY_AND_SELL": "Compra e venda",
+  "TR_COINMARKET_BUY_AND_SELL_COUNTER": "{totalBuys, plural, =0 {{totalBuys} compra} one {{totalBuys} compra} other {{totalBuys} compras} } • {totalSells, plural, =0 {{totalSells} venda} one {{totalSells} venda} other {{totalSells} vendas} }",
+  "TR_COINMARKET_CEX_TOOLTIP": "Corretoras centralizadas",
+  "TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY": "Alterar valor ou moeda.",
   "TR_COINMARKET_COMPARE_OFFERS": "Compare todas as ofertas",
   "TR_COINMARKET_COUNTRY": "País de residência",
+  "TR_COINMARKET_DCA_DOWNLOAD": "Baixe o aplicativo móvel Invity para começar a economizar em Bitcoin",
+  "TR_COINMARKET_DCA_FEATURE_1_DESCRIPTION": "Um plano de economia DCA seguro e simples.",
+  "TR_COINMARKET_DCA_FEATURE_1_SUBHEADING": "Desenvolvido pela SatoshiLabs",
+  "TR_COINMARKET_DCA_FEATURE_2_DESCRIPTION": "Retirar para a autocustódia sem taxas extras.",
+  "TR_COINMARKET_DCA_FEATURE_2_SUBHEADING": "Saques gratuitos",
+  "TR_COINMARKET_DCA_FEATURE_3_DESCRIPTION": "Uma interface rápida, simplificada e de fácil utilização.",
+  "TR_COINMARKET_DCA_FEATURE_3_SUBHEADING": "Fácil de usar",
+  "TR_COINMARKET_DCA_FEATURE_4_DESCRIPTION": "Monitore seu histórico de investimentos, quantidade e frequência.",
+  "TR_COINMARKET_DCA_FEATURE_4_SUBHEADING": "Visão geral do DCA",
+  "TR_COINMARKET_DCA_HEADING": "Economize em Bitcoin com o aplicativo Invity",
+  "TR_COINMARKET_DEX_TOOLTIP": "Exchanges decentralizadas",
   "TR_COINMARKET_ENTER_AMOUNT_IN": "Insira o valor em {currency}",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_KYC_ALL": "Todas as opções de KYC",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_NO_KYC": "KYC nunca é necessário",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_ALL": "Todas as ofertas CEX e DEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_DEX": "DEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FIXED_CEX": "CEX de taxa fixa",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FLOATING_CEX": "CEX de taxa flutuante",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING": "DEX",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING_TOOLTIP": "O câmbio descentralizado (DEX) permite que você negocie a criptomoeda diretamente no blockchain sem a necessidade de uma autoridade central ou intermediário.",
+  "TR_COINMARKET_EXCHANGE_FIXED_OFFERS_HEADING": "CEX de taxa fixa",
+  "TR_COINMARKET_EXCHANGE_FLOAT_OFFERS_HEADING": "CEX de taxa flutuante",
   "TR_COINMARKET_FEATURED_OFFERS_HEADING": "Ofertas em destaque",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_BUY_LABEL": "Pagamento:",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_SELL_LABEL": "Método de recepção:",
   "TR_COINMARKET_FEES_INCLUDED": "Taxas incluídas",
   "TR_COINMARKET_FEES_NOT_INCLUDED": "Taxas não incluídas",
   "TR_COINMARKET_FEES_ON_WEBSITE": "Certas taxas não estão incluídas no preço exibido. Você revisará o preço final no site do provedor.",
@@ -518,24 +553,18 @@
   "TR_COINMARKET_KYC_NO_REFUND": "KYC solicitado em casos excepcionais. KYC necessário para reembolsos. 👈",
   "TR_COINMARKET_KYC_POLICY": "Política de KYC",
   "TR_COINMARKET_KYC_POLICY_NEVER_REQUIRED": "KYC nunca é necessário",
-  "TR_COINMARKET_KYC_YES_REFUND": "KYC solicitado em casos excepcionais. KYC não necessário para reembolsos. 🤝",
+  "TR_COINMARKET_KYC_YES_REFUND": "O KYC só é solicitado em casos excepcionais. Não é necessário para reembolsos. 🤝",
   "TR_COINMARKET_LAST_TRANSACTIONS": "Últimas transações",
   "TR_COINMARKET_NETWORK_FEE": "Taxa de rede",
   "TR_COINMARKET_NETWORK_TOKENS": "Tokens {networkName}",
   "TR_COINMARKET_NO_CEX_PROVIDER_FOUND": "Nenhum provedor CEX encontrado",
   "TR_COINMARKET_NO_DEX_PROVIDER_FOUND": "Nenhum provedor DEX encontrado",
   "TR_COINMARKET_NO_METHODS_AVAILABLE": "Nenhum método disponível",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "Carregamento automático em",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "Voltar à negociação",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "Sem ofertas",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "Lamento, não temos nenhuma oferta no momento devido a um problema de conectividade do servidor.",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "Lamento, no momento não temos nenhuma oferta. Tente recarregar a página ou alterar sua consulta.",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "Recarregar página",
   "TR_COINMARKET_OFFERS_EMPTY": "Nenhuma oferta para seu pedido. Altere o país ou compre o valor",
   "TR_COINMARKET_OFFERS_REFRESH": "Ofertas atualizam em",
   "TR_COINMARKET_OFFERS_SELECT": "Selecione",
   "TR_COINMARKET_OFFER_LOOKING": "Buscando sua melhor oferta",
-  "TR_COINMARKET_OFFER_NO_FOUND": "Nenhuma oferta disponível para seu pedido. Alterar valor ou moeda.",
+  "TR_COINMARKET_OFFER_NO_FOUND": "Nenhuma oferta disponível para seu pedido.",
   "TR_COINMARKET_ON_NETWORK_CHAIN": "Na chain {networkName}",
   "TR_COINMARKET_OTHER_CURRENCIES": "Outras moedas",
   "TR_COINMARKET_PAYMENT_METHOD": "Método de pagamento",
@@ -544,9 +573,36 @@
   "TR_COINMARKET_RECEIVE_METHOD": "Método de recebimento",
   "TR_COINMARKET_SELL": "Vender",
   "TR_COINMARKET_SHOW_OFFERS": "Comparar ofertas",
+  "TR_COINMARKET_SWAP": "Swap",
+  "TR_COINMARKET_SWAP_AMOUNT": "Valor do swap",
+  "TR_COINMARKET_SWAP_COUNTER": "{totalSwaps, plural, =0 {{totalSwaps} troca} one {{totalSwaps} troca} other {{totalSwaps} trocas} }",
+  "TR_COINMARKET_SWAP_DEX_MODAL_CONFIRM": "Estou pronto(a) para fazer swap",
+  "TR_COINMARKET_SWAP_DEX_MODAL_FOR_YOUR_SAFETY": "Fazer swap de {fromCrypto} para {toCrypto} com {provider}",
+  "TR_COINMARKET_SWAP_DEX_MODAL_LEGAL_HEADER": "Aviso legal",
+  "TR_COINMARKET_SWAP_DEX_MODAL_SECURITY_HEADER": "A Trezor prioriza sua segurança",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_1": "Eu gostaria de fazer swap de criptomoedas com DEX (câmbio descentralizado) usando o contrato do {provider}.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_2": "Quero trocar criptomoedas para a minha própria conta. Compreendo que as políticas do fornecedor podem exigir verificação de identidade.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_3": "Compreendo que as transações de criptomoedas são finais e não podem ser revertidas ou reembolsadas. Perdas devido a fraudes ou erros podem não ser recuperáveis.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4": "Compreendo que a Invity não oferece este serviço. Ela é regida pelos Termos e Condições do {provider}.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_5": "Não estou usando esse recurso para realizar aposta, fraude ou qualquer outra atividade que viole os Termos de Serviço da Invity ou do fornecedor ou de quaisquer leis aplicáveis.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_6": "Compreendo que criptomoedas são uma ferramenta financeira emergente e que as regulamentações podem ser diferentes a depender da região. Isso pode aumentar o risco de fraude, roubo ou instabilidade de mercado.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_VERIFIED_PARTNERS_HEADER": "Parceiros verificados pela Invity",
+  "TR_COINMARKET_SWAP_MODAL_CONFIRM": "Estou pronto(a) para fazer swap",
+  "TR_COINMARKET_SWAP_MODAL_FOR_YOUR_SAFETY": "Fazer swap de {fromCrypto} para {toCrypto} com {provider}",
+  "TR_COINMARKET_SWAP_MODAL_LEGAL_HEADER": "Aviso legal",
+  "TR_COINMARKET_SWAP_MODAL_SECURITY_HEADER": "A Trezor prioriza sua segurança",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_1": "Estou aqui para trocar criptomoedas. Se eu for direcionado a este site por qualquer outro motivo, entrarei em contato com o suporte da Trezor antes de prosseguir. ",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_2": "Quero trocar criptomoedas para a minha própria conta. Compreendo que as políticas do fornecedor podem exigir verificação de identidade.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_3": "Compreendo que as transações de criptomoedas são finais e não podem ser revertidas ou reembolsadas. Perdas devido a fraudes ou erros podem não ser recuperáveis.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_4": "Compreendo que a Invity não oferece este serviço. Ela é regida pelos Termos e Condições do {provider}.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_5": "Não estou usando esse recurso para realizar aposta, fraude ou qualquer outra atividade que viole os Termos de Serviço da Invity ou do fornecedor ou de quaisquer leis aplicáveis.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_6": "Compreendo que criptomoedas são uma ferramenta financeira emergente e que as regulamentações podem ser diferentes a depender da região. Isso pode aumentar o risco de fraude, roubo ou instabilidade de mercado.",
+  "TR_COINMARKET_SWAP_MODAL_VERIFIED_PARTNERS_HEADER": "Parceiros verificados pela Invity",
   "TR_COINMARKET_TOKEN_NETWORK": "{tokenName} em {networkName} rede",
   "TR_COINMARKET_TRADE_FEE": "Taxa de comércio",
+  "TR_COINMARKET_TRANS_ID": "ID. da trans:",
   "TR_COINMARKET_UNKNOWN_PROVIDER": "Fornecedor desconhecido",
+  "TR_COINMARKET_VIEW_DETAILS": "Ver detalhes",
   "TR_COINMARKET_YOUR_BEST_OFFER": "Sua melhor oferta",
   "TR_COINMARKET_YOU_BUY": "Você compra",
   "TR_COINMARKET_YOU_GET": "Você recebe",
@@ -571,6 +627,7 @@
   "TR_CONFIRMED_TX": "Confirmado",
   "TR_CONFIRMING_TX": "Confirmando a transação",
   "TR_CONFIRM_ACTION_ON_YOUR": "Siga as instruções na tela da sua Trezor",
+  "TR_CONFIRM_ADDRESS": "Confirmar endereço",
   "TR_CONFIRM_BEFORE_COPY": "Confirme no Trezor antes de copiar",
   "TR_CONFIRM_CONDITIONS": "Confirme as condições antes de prosseguir.",
   "TR_CONFIRM_EMPTY_HIDDEN_WALLET_ON": "Confirmar carteira oculta vazia no dispositivo \"{deviceLabel}\".",
@@ -593,13 +650,13 @@
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_BUTTON": "Gerenciar",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_DESCRIPTION": "Ativar a exibição da caixa de diálogo de entrada de senha quando você abrir o Suite.",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_TITLE": "Você usa primeiro uma frase secreta?",
-  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Verifique no Trezor para confirmar o endereço de recebimento. Não é recomendável continuar sem confirmar.",
+  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Verifique no Trezor para confirmar o endereço de recebimento. Não é recomendável continuar sem confirmação.",
   "TR_CONNECT_DEVICE_RECEIVE_PROMO_TITLE": "O endereço de recebimento não pode ser verificado",
   "TR_CONNECT_DEVICE_SEND_PROMO_DESCRIPTION": "Para enviar moedas, conecte sua Trezor.",
   "TR_CONNECT_DEVICE_SEND_PROMO_TITLE": "Sua Trezor não está conectada",
   "TR_CONNECT_TREZOR_TO_SEND_BUTTON": "Conecte a Trezor para enviar",
   "TR_CONNECT_YOUR_DEVICE": "Conecte e desbloqueie sua Trezor",
-  "TR_CONTACT_SUPPORT": "Contatar o suporte",
+  "TR_CONTACT_SUPPORT": "Contatar o suporte da Trezor",
   "TR_CONTACT_TREZOR_SUPPORT": "Contatar o suporte da Trezor",
   "TR_CONTINUE": "Continuar",
   "TR_CONTINUE_ANYWAY": "Continuar mesmo assim",
@@ -619,7 +676,7 @@
   "TR_COPY_ADDRESS_POLICY_ID": "Nunca envie fundos para um endereço de ID de política.",
   "TR_COPY_AND_CLOSE": "Copiar e fechar",
   "TR_COPY_SIGNED_MESSAGE": "Copiar mensagem assinada",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "Copiar",
+  "TR_COPY_TO_CLIPBOARD": "Copiar",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "Não consegui recuperar o changelog",
   "TR_COULD_NOT_RETRIEVE_DATA": "Não consegui recuperar dados",
   "TR_COUNT_WALLETS": "{count} {count, plural, one {carteira} other {carteiras}}",
@@ -630,7 +687,7 @@
   "TR_CREATE_SHARES": "Crie cotas na Trezor",
   "TR_CREATE_SHARES_CARD_1": "Pegue a caneta e papel. Ou imprima <cardsLink>Cartões Trezor</cardsLink>ou use uma KriptoSteel",
   "TR_CREATE_SHARES_CARD_2": "Não tire fotos ou cópias digitais do backup",
-  "TR_CREATE_SHARES_CARD_3": "Certifique-se de que você está sozinho, sem curiosos espectadores",
+  "TR_CREATE_SHARES_CARD_3": "Certifique-se de que você esteja sozinho, sem curiosos espectadores",
   "TR_CREATE_SHARES_EXAMPLE": "ex: 5 compartilhamentos no total, pelo menos 3 compartilhamentos para recuperação",
   "TR_CREATE_SHARES_EXPLANATION": "Agora, você selecionará a quantidade de ações e o mínimo de ações necessárias para recuperar seu Trezor.",
   "TR_CREATE_WALLET": "Criar nova carteira",
@@ -653,6 +710,7 @@
   "TR_DASHBOARD_ASSET_FAILED": "Ativo não carregado corretamente",
   "TR_DASHBOARD_DISCOVERY_ERROR": "Erro de descoberta",
   "TR_DASHBOARD_DISCOVERY_ERROR_PARTIAL_DESC": "As contas não foram carregadas corretamente {details}",
+  "TR_DATA": "Dados",
   "TR_DATABASE_UPGRADE_BLOCKED": "Atualização da base de dados bloqueada por outra instância do aplicativo",
   "TR_DATA_ANALYTICS_CATEGORY_1": "Plataforma",
   "TR_DATA_ANALYTICS_CATEGORY_1_ITEM_1": "SO, modelo Trezor, versão, etc.",
@@ -706,8 +764,13 @@
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT": "No bootloader por engano?",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_BUTTON": "Reconecte o dispositivo sem tocar em nenhum botão.",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_TOUCH": "Reconecte o dispositivo sem tocar na tela.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED": "Esse dispositivo está sendo usado em outro local.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION": "O aplicativo {transportSessionOwner} pode estar usando este dispositivo no momento. Você pode assumir o controle do dispositivo, se necessário.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION_UNKNOWN_APP": "Outro aplicativo pode estar usando este dispositivo no momento. Você pode assumir o controle do dispositivo, se necessário.",
   "TR_DEVICE_CONNECTED_WRONG_STATE": "Dispositivo detectado em estado incorreto",
   "TR_DEVICE_DISCONNECTED_DURING_ACTION_DESCRIPTION": "Sua Trezor foi desconectada no processo de cópia de segurança. Recomendamos fortemente o uso da redefinição de fábrica nas configurações do dispositivo para limpá-lo e reiniciar o processo de cópia de segurança da carteira.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH": "Falha na verificação da hash de firmware. Seu Trezor pode ser falsificado.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR": "Não foi possível realizar a verificação da hash do firmware. Seu Trezor pode ser falsificado.",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON": "Desligar",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON_DISABLED": "Ligar",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION": "A verificação da revisão do firmware é um recurso de segurança crucial. Recomendamos fortemente mantê-la ativada.",
@@ -726,8 +789,10 @@
   "TR_DEVICE_LABEL_IS_NOT_BACKED_UP": "O dispositivo “{deviceLabel}” está sem cópia de segurança",
   "TR_DEVICE_LABEL_IS_NOT_CONNECTED": "O dispositivo “{deviceLabel}” está desconectado",
   "TR_DEVICE_LABEL_IS_UNAVAILABLE": "O dispositivo “{deviceLabel}” está indisponível",
+  "TR_DEVICE_MAYBE_COMPROMISED_HEADING": "Falha na verificação do dispositivo",
+  "TR_DEVICE_MAYBE_COMPROMISED_TEXT": "Reconecte o dispositivo e tente verificar novamente. Se o problema persistir, entre em contato com o Suporte da Trezor para descobrir o que está acontecendo com seu dispositivo e o que fazer a seguir.",
   "TR_DEVICE_NOT_CONNECTED": "Dispositivo desconectado",
-  "TR_DEVICE_NOT_INITIALIZED": "A Trezor não está configurada",
+  "TR_DEVICE_NOT_INITIALIZED": "O Trezor não está configurado",
   "TR_DEVICE_NOT_INITIALIZED_TEXT": "Vamos ajudar você no processo para começarmos agora mesmo.",
   "TR_DEVICE_SECURITY": "Segurança",
   "TR_DEVICE_SETTINGS_AFTER_DELAY": "Após o atraso",
@@ -788,7 +853,6 @@
   "TR_DOWNLOAD_LATEST_BRIDGE": "Fazer download do Bridge {version} mais recente",
   "TR_DO_NOT_DISCONNECT_DEVICE": "Não desconecte seu dispositivo",
   "TR_DO_NOT_SHOW_AGAIN": "Não mostrar novamente",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "Ignorar esta etapa?",
   "TR_DROPBOX": "Dropbox",
   "TR_DROPZONE": "Arraste e solte o arquivo aqui ou clique para selecionar entre arquivos",
   "TR_DROPZONE_ERROR": "Falha na importação: {error}",
@@ -809,13 +873,13 @@
   "TR_EARLY_ACCESS_ENABLE": "Junte-se",
   "TR_EARLY_ACCESS_ENABLED": "Programa de Acesso Antecipado ativado",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM": "Participar do Programa",
-  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "Entendo que isto me permite testar software de pré-lançamento, que pode conter erros que afetam o funcionamento normal do Suite.",
+  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "Entendo que isto me permite testar software de pré-lançamento, que pode conter erros que afetam o funcionamento normal do Trezor Suite.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_DESCRIPTION": "Você pode desativá-lo a qualquer momento.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TITLE": "Teste os mais recentes recursos do produto antes do lançamento ao público em geral.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TOOLTIP": "Verifique primeiro o campo acima",
   "TR_EARLY_ACCESS_JOINED_DESCRIPTION": "Você pode verificar por atualizações beta agora ou no próximo lançamento.",
   "TR_EARLY_ACCESS_JOINED_TITLE": "Programa de Acesso Antecipado ativado",
-  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "Para retornar à versão estável mais recente do Suite, clique em \"Download de versão estável\" e reinstale o aplicativo.",
+  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "Para retornar à versão estável mais recente do Trezor Suite, clique em \"Baixar versão estável\" e reinstale o aplicativo.",
   "TR_EARLY_ACCESS_LEFT_TITLE": "Você deixou o Programa de Acesso Antecipado. Lançamentos Beta não são mais oferecidos.",
   "TR_EARLY_ACCESS_MENU": "Programa de Acesso Antecipado (Beta)",
   "TR_EARLY_ACCESS_REINSTALL": "Download de versão estável",
@@ -842,8 +906,8 @@
   "TR_ENTER_SEED_WORDS_ON_DEVICE": "As palavras são sempre digitadas no dispositivo por razões de segurança. Digite todas as palavras na ordem correta.",
   "TR_ENTER_WIPECODE": "Insira o código de limpeza",
   "TR_ERROR": "Erro",
-  "TR_ERROR_CARDANO_DELEGATE": "Valor insuficiente",
-  "TR_ERROR_CARDANO_WITHDRAWAL": "Valor insuficiente",
+  "TR_ERROR_CARDANO_DELEGATE": "O valor não é suficiente",
+  "TR_ERROR_CARDANO_WITHDRAWAL": "O valor não é suficiente",
   "TR_ETH_ADDRESS_CANT_VERIFY_HISTORY": "Não foi possível verificar o histórico de endereços. Verifique se o endereço está correto.",
   "TR_ETH_ADDRESS_NOT_USED_NOT_CHECKSUMMED": "Endereço não tem histórico de transações e não passou por checksum. Verifique se o endereço está correto.",
   "TR_EVM_EXPLANATION_DESCRIPTION": "Ele compartilha o mesmo estilo de endereço que o Ethereum, mas tem moedas e tokens únicos próprios incompatíveis com outras redes.",
@@ -870,7 +934,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "Aprova apenas o valor exato necessário para este swap. Você precisará pagar uma taxa adicional se quiser fazer um swap similar novamente.",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "Revogar aprovação prévia",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "Realiza uma transação que removerá a aprovação prévia do contrato com {provider}.",
-  "TR_EXCHANGE_BUY": "Para",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Confirmar na Trezor e enviar",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "Confirmar e enviar",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "Criar aprovação",
@@ -892,8 +955,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "Sua transação foi bem sucedida.",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "Aprovado",
   "TR_EXCHANGE_DEX": "Oferta de exchange descentralizada",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "As taxas para este swap são estimadas em {approvalFee} ({approvalFeeFiat}) para aprovação (se necessário) e {swapFee} ({swapFeeFiat}) para o swap.",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "Não restam fundos para as taxas de transação. Reduza o valor da troca para no máximo {symbol} {max}",
   "TR_EXCHANGE_EXTRA_FIELD": "{extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "{extraFieldName} é inválido",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "{extraFieldDescription}",
@@ -903,7 +964,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "As taxas corrigidas mostram exatamente com quanto você vai ficar ao final da troca — o valor não mudará entre a seleção da taxa e a conclusão da transação. O valor exibido é garantido, mas essas taxas costumam ser menos generosas, fazendo com que seu dinheiro não compre tanta criptomoeda.",
   "TR_EXCHANGE_FLOAT": "Oferta de taxa flutuante",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "As taxas flutuantes significam que o valor final que você receberá pode mudar um pouco devido a flutuações no mercado entre a seleção da taxa e a conclusão da transação. Estas taxas são normalmente mais altas, fazendo com que você possa acabar com mais criptomoedas no final.",
-  "TR_EXCHANGE_PROVIDER": "Fornecedor",
   "TR_EXCHANGE_RATE": "Preço",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "A conta de recebimento está fora do Suite.",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "Este é o endereço alfanumérico específico que receberá suas moedas.",
@@ -930,23 +990,16 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "Insira um número.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "Introduza o slippage desejado.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "Valor da oferta de swap",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "Resumo do slippage",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "Tolerância de slippage",
-  "TR_EXCHANGE_TRANS_ID": "ID. da trans:",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "Use uma conta ({symbol}) que não esteja no Suite",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "Endereço de recebimento",
-  "TR_EXCHANGE_VIEW_DETAILS": "Ver detalhes",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE": "Atualizações automáticas do Trezor Suite",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION": "O Trezor Suite baixa automaticamente a nova versão em segundo plano e a instala ao reiniciar o aplicativo. Isso garante que você esteja sempre atualizado com os recursos e patches de segurança mais recentes. As atualizações são feitas sem exigir sua permissão.",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN": "BNB Smart Chain",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON": "Habilite a BNB Smart Chain sem transações internas históricas.",
   "TR_EXPERIMENTAL_FEATURES": "Experimental",
   "TR_EXPERIMENTAL_FEATURES_ALLOW": "Recursos experimentais",
   "TR_EXPERIMENTAL_FEATURES_WARNING": "Apenas para usuários experientes. Use por sua conta e risco. Estes recursos estão em teste, talvez estejam instáveis e podem não ter suporte a longo prazo.",
   "TR_EXPERIMENTAL_PASSWORD_MANAGER": "Migre senhas do Dropbox",
-  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Um utilitário para recuperar senhas armazenadas no Dropbox e protegidas pela Trezor. Projetado para usuários anteriores de extensão do Chrome do Trezor Password Manager.",
+  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Use este utilitário para recuperar senhas armazenadas no Dropbox e protegidas pela Trezor. Projetado para usuários antigos da extensão Trezor Password Manager Chrome.",
   "TR_EXPERIMENTAL_TOR_SNOWFLAKE": "Tor Snowflake",
-  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Tor Snowflake é um sistema que permite acesso a sites e aplicativos censurados.",
+  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Acesse sites e aplicativos censurados usando o Tor Snowflake, um sistema projetado para ignorar restrições.",
   "TR_EXPORT_AS": "Exportar como {as}",
   "TR_EXPORT_FAIL": "A exportação falhou.",
   "TR_EXPORT_TO_FILE": "Exportar para arquivo",
@@ -984,6 +1037,7 @@
   "TR_FIRMWARE_NEW_FW_DESCRIPTION": "O novo firmware já está disponível. Atualize seu dispositivo agora ou opte por fazê-lo mais tarde.",
   "TR_FIRMWARE_REINSTALL_FW_DESCRIPTION": "Seu dispositivo já está usando o firmware mais recente. Você pode reinstalar o firmware se necessário.",
   "TR_FIRMWARE_REVISION_CHECK_FAILED": "Falha na verificação da revisão do firmware. Sua Trezor pode ser uma falsificação.",
+  "TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR": "Não foi possível executar a verificação de revisão do firmware.",
   "TR_FIRMWARE_STATUS_INSTALLATION_COMPLETED": "Concluído",
   "TR_FIRMWARE_SUBHEADING_BITCOIN": "Firmware leve que suporta apenas operações Bitcoin.",
   "TR_FIRMWARE_SUBHEADING_NONE": "Sua Trezor foi enviada sem firmware. Instale o firmware mais recente e use seu dispositivo com segurança. Se você usa apenas o bitcoin, recomendamos instalar o <button>{bitcoinOnly} firmware</button>.",
@@ -1021,7 +1075,7 @@
   "TR_GOT_IT_BUTTON": "Entendido",
   "TR_GO_TO_ONBOARDING": "Iniciar configuração",
   "TR_GO_TO_SETTINGS": "Ir para configurações",
-  "TR_GO_TO_SUITE": "Acessar o Suite",
+  "TR_GO_TO_SUITE": "Vá para o Trezor Suite",
   "TR_GRAPH_LINEAR": "Linear",
   "TR_GRAPH_LOGARITHMIC": "Logarítmico",
   "TR_GRAPH_MISSING_DATA": "Transações de XRP, SOL e todas as quantias de token estão no saldo do portfólio, mas atualmente são incompatíveis com a exibição de gráfico.",
@@ -1040,7 +1094,7 @@
   "TR_GUIDE_FORUM": "Fórum Trezor",
   "TR_GUIDE_FORUM_LABEL": "Conecte-se com a comunidade Trezor",
   "TR_GUIDE_SUGGESTION_LABEL": "Como estamos indo?",
-  "TR_GUIDE_SUPPORT": "Contatar o suporte",
+  "TR_GUIDE_SUPPORT": "Contatar o suporte da Trezor",
   "TR_GUIDE_SUPPORT_AND_FEEDBACK": "Suporte e Comentários",
   "TR_GUIDE_VIEW_HEADLINES_SUPPORT_FEEDBACK_SELECTION": "Suporte e Comentários",
   "TR_GUIDE_VIEW_HEADLINE_HELP_US_IMPROVE": "Ajude-nos a melhorar",
@@ -1172,7 +1226,7 @@
   "TR_LOCAL_FILE_SYSTEM": "Sistema de arquivos locais",
   "TR_LOG": "Registro do aplicativo",
   "TR_LOGIN_PROCEED": "Proceder",
-  "TR_LOG_DESCRIPTION": "O registro contém todas as informações técnicas do Trezor Suite. Ele pode ser pedido pelo Suporte da Trezor para ajudar na resolução de problemas.",
+  "TR_LOG_DESCRIPTION": "Este log contém informações técnicas essenciais sobre o Trezor Suite e pode ser necessário ao entrar em contato com o suporte da Trezor.",
   "TR_LOOKING_FOR_COINJOIN_ROUND": "Aguardando uma rodada",
   "TR_LOW_ANONYMITY_WARNING": "<red>Privacidade muito baixa.</red> Recomendamos usar pelo menos 1 em 5, já que qualquer coisa abaixo deste limite não é privada.",
   "TR_LTC_ADDRESS_INFO": "A Litecoin mudou o formato dos endereços. Encontre mais informações sobre como converter seu endereço em nosso blog. {TR_LEARN_MORE}",
@@ -1223,6 +1277,7 @@
   "TR_MY_PORTFOLIO": "Portfólio",
   "TR_NAV_ANONYMIZE": "Tornar as moedas privadas",
   "TR_NAV_BUY": "Comprar",
+  "TR_NAV_DCA": "DCA",
   "TR_NAV_DETAILS": "Detalhes",
   "TR_NAV_RECEIVE": "Receber",
   "TR_NAV_SELL": "Vender",
@@ -1264,6 +1319,7 @@
   "TR_NETWORK_LITECOIN": "Litecoin",
   "TR_NETWORK_NAMECOIN": "Namecoin",
   "TR_NETWORK_NEM": "NEM",
+  "TR_NETWORK_OP": "Otimismo",
   "TR_NETWORK_POLYGON": "Polygon PoS",
   "TR_NETWORK_SOLANA_DEVNET": "Solana Devnet",
   "TR_NETWORK_SOLANA_MAINNET": "Solana",
@@ -1276,9 +1332,10 @@
   "TR_NETWORK_ZCASH": "Zcash",
   "TR_NEW_FEE": "Novo",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "O novo Trezor Bridge está disponível.",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "O novo firmware Trezor está disponível! Atualize seu dispositivo.",
   "TR_NEXT_UP": "Próximo",
   "TR_NONCE": "Nonce",
+  "TR_NON_ASCII_CHAR": "{label} (com \"{char}” não recomendado)",
+  "TR_NON_ASCII_CHARS": "{label} (com caracteres não recomendados)",
   "TR_NORMAL_ACCOUNTS": "Contas padrão",
   "TR_NORTH": "Norte",
   "TR_NOTHING_TO_ANONYMIZE": "Nada para tornar privado",
@@ -1296,16 +1353,12 @@
   "TR_NO_PASSPHRASE_WALLET": "Carteira padrão",
   "TR_NO_SEARCH_RESULTS": "Nenhum resultado para seu critério de pesquisa",
   "TR_NO_SPENDABLE_UTXOS": "Não há UTXOs para ser gastos em sua conta.",
-  "TR_NO_TRANSPORT": "Navegador não consegue se comunicar com o dispositivo",
+  "TR_NO_TRANSPORT": "Seu navegador não consegue se comunicar com o seu dispositivo",
   "TR_NO_TRANSPORT_DESKTOP": "Aplicativo não consegue se comunicar com o dispositivo",
   "TR_NUM_ACCOUNTS_FIAT_VALUE": "{accountsCount} {accountsCount, plural, one {conta} other {contas}} • {fiatValue}",
   "TR_N_MIN": "{n} min",
   "TR_N_TRANSACTIONS": "{value} {value, plural, one {transação} other {transações}}",
   "TR_OFF": "desativado",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "A quantidade escolhida de {amount} é maior que o máximo aceito de {max}.",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "A quantidade escolhida de {amount} é maior que o máximo aceito de {max}.",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "A quantidade escolhida de {amount} é menor que o mínimo aceito de {min}.",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "A quantidade escolhida de {amount} é menor que o mínimo aceito de {min}.",
   "TR_OFFICIAL_LANGUAGES": "Oficial",
   "TR_OK": "OK",
   "TR_ON": "ativado",
@@ -1333,7 +1386,7 @@
   "TR_ONBOARDING_DATA_COLLECTION_HEADING": "Coleta anônima de dados",
   "TR_ONBOARDING_DEVICE_CHECK": "Verificação de segurança do dispositivo",
   "TR_ONBOARDING_DEVICE_CHECK_1": "Meu <strong>holograma</strong> estava intacto e inalterado.",
-  "TR_ONBOARDING_DEVICE_CHECK_2": "Comprei meu dispositivo na loja oficial Trezor ou em um revendedor confiável.",
+  "TR_ONBOARDING_DEVICE_CHECK_2": "Comprei meu dispositivo na <shop>loja oficial Trezor</shop> ou com um <reseller>revendedor confiável</reseller>.",
   "TR_ONBOARDING_DEVICE_CHECK_3": "A embalagem não foi adulterada.",
   "TR_ONBOARDING_DEVICE_CHECK_4": "O firmware já está instalado no Trezor conectado. Só continue com a configuração se já tiver utilizado este Trezor antes.",
   "TR_ONBOARDING_DOWNLOAD_DESKTOP_APP": "Download do app para desktop",
@@ -1364,40 +1417,18 @@
   "TR_OTHER_INPUTS_AND_OUTPUTS": "Outras entradas e saídas",
   "TR_OUTGOING": "Saída",
   "TR_OUTPUTS": "Saídas",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "O valor mínimo e máximo pelo qual o usuário está disposto a vender {symbol}.",
-  "TR_P2P_GET_STARTED_INTRO": "Você precisa iniciar a transação em {providerName} – certifique-se de seguir os passos abaixo com atenção.",
-  "TR_P2P_GET_STARTED_ITEM_1": "Selecione \"Ir para {providerName}\" para ser redirecionado ao site do nosso parceiro.",
-  "TR_P2P_GET_STARTED_ITEM_3": "Quando {providerName} pedir um endereço de liberação, volte aqui e continue.",
-  "TR_P2P_GET_STARTED_ITEM_4": "Quase lá! Revele e copie seu endereço, coloque-o no campo \"Liberar endereço\" em {providerName} e finalize a transação.",
-  "TR_P2P_GO_TO_PROVIDER": "Ir para {providerName}",
-  "TR_P2P_INFO": "Com a tecnologia {peerToPeer} (P2P), não há verificação KYC envolvida, nem do comprador, nem do vendedor. Todas as partes estão protegidas contra fraudes através da segurança de {multisigEscrow}.",
-  "TR_P2P_MODAL_CONFIRM": "Estou pronto(a) para comprar",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "Comprar {cryptocurrency} peer-to-peer com {provider}",
-  "TR_P2P_MODAL_LEGAL_HEADER": "Aviso legal",
-  "TR_P2P_MODAL_SECURITY_HEADER": "A Trezor prioriza sua segurança",
-  "TR_P2P_MODAL_TERMS_1": "Você está aqui para comprar criptomoedas de uma pessoa à sua escolha usando a tecnologia peer-to-peer (P2P) sem verificação de identidade. Se você chegou a este site por qualquer outro motivo, contate o suporte antes de prosseguir.",
-  "TR_P2P_MODAL_TERMS_2": "Você entende que transações de criptomoeda são irreversíveis e não permitem reembolso. Assim, perdas por fraudes ou acidentes podem ser irrecuperáveis.",
-  "TR_P2P_MODAL_TERMS_4": "Você entende que a Invity não oferece este serviço. O serviço é regido pelos termos de {provider}.",
-  "TR_P2P_MODAL_TERMS_5": "Você não está usando esse recurso para realizar aposta, fraude ou outra violação dos Termos de Serviço da Invity ou do fornecedor ou de quaisquer regulamentos aplicáveis.",
-  "TR_P2P_MODAL_TERMS_6": "Você entende que criptomoedas são uma ferramenta financeira emergente e que as regulamentações podem variar entre jurisdições. Isso pode acarretar em um maior risco de fraude, roubo ou instabilidade de mercado para você.",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "Parceiros verificados pela Invity",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "A transação precisa ser concluída dentro deste prazo, contando a partir da criação de um contrato no site do {providerName}.",
-  "TR_P2P_PRICE": "Preço para 1 {symbol}",
-  "TR_P2P_PRICE_TOOLTIP": "{symbol} preço oferecido por este usuário.",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "Olá, estou usando {providerName}!",
-  "TR_P2P_USER_REPUTATION": "({rating}, {numberOfTrades})",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "A quantidade escolhida de {amount} é maior que o máximo aceito de {maximum}.",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "A quantidade escolhida de {amount} é menor que o mínimo aceito de {minimum}.",
   "TR_PAGINATION_NEWER": "Mais recentes",
   "TR_PAGINATION_OLDER": "Mais antigas",
   "TR_PASSPHRASE_CASE_SENSITIVE": "Observação: A senha é sensível a maiúsculas e minúsculas.",
   "TR_PASSPHRASE_DESCRIPTION_ITEM1": "Aprenda primeiro como a frase secreta funciona",
   "TR_PASSPHRASE_DESCRIPTION_ITEM2": "Uma frase secreta abre uma carteira protegida por essa frase",
-  "TR_PASSPHRASE_DESCRIPTION_ITEM3": "Ninguém pode recuperá-la, nem mesmo o suporte Trezor",
+  "TR_PASSPHRASE_DESCRIPTION_ITEM3": "Ninguém pode recuperá-lo, nem mesmo o suporte da Trezor",
   "TR_PASSPHRASE_HIDDEN_WALLET": "Carteira oculta",
   "TR_PASSPHRASE_MISMATCH": "Frase secreta incorreta",
   "TR_PASSPHRASE_MISMATCH_DESCRIPTION": "As frases secretas não se correspondem. Para segurança, comece novamente e insira as frases corretamente.",
   "TR_PASSPHRASE_MISMATCH_START_OVER": "Recomeçar",
+  "TR_PASSPHRASE_NON_ASCII_CHARS": "Recomendamos o uso de <code>ABC</code>, <code>abc</code>, <code>123</code>, <code>espaços</code> ou <code>esses caracteres especiais</code>",
+  "TR_PASSPHRASE_NON_ASCII_CHARS_WARNING": "O uso de caracteres especiais não listados arrisca a compatibilidade futura.",
   "TR_PASSPHRASE_TOO_LONG": "O comprimento da senha ultrapassa o limite.",
   "TR_PASSPHRASE_WALLET": "Carteira oculta #{id}",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT": "Saiba como funciona uma frase secreta",
@@ -1439,15 +1470,30 @@
   "TR_PIN_SUBHEADING": "Usar um PIN forte protege sua Trezor do acesso físico não autorizado.",
   "TR_PLAY_IT_SAFE": "Segurança em primeiro lugar",
   "TR_PLEASE_ALLOW_YOUR_CAMERA": "Habilite sua câmera para digitalizar QR codes.",
-  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Conecte seu dispositivo para continuar com o processo de verificação.",
+  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Conecte seu Trezor para continuar com o processo de verificação.",
   "TR_PLEASE_ENABLE_PASSPHRASE": "Habilite o recurso de senha para continuar com o processo de verificação.",
   "TR_POLICY_ID_ADDRESS": "ID da política:",
   "TR_PRIMARY_FIAT": "Moeda Fiduciária",
   "TR_PRIVATE": "Privado",
   "TR_PRIVATE_DESCRIPTION": "Privacidade pelo menos {targetAnonymity}",
+  "TR_PROCEED_UNVERIFIED_ADDRESS": "Continue com o endereço não verificado",
   "TR_PROMO_BANNER_DASHBOARD": "<underline>A mais conveniente</underline> <rest>carteira de hardware para gerenciar com segurança suas criptomoedas</rest>",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM": "Confirme no Trezor antes de copiar",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM_EXPLANATION": "Primeiro, confirme o endereço de recebimento na tela protegida contra invasões do seu dispositivo Trezor.",
+  "TR_QUICK_ACTION_DEBUG_EAP_EXPERIMENTAL_ENABLED": "Ativado",
+  "TR_QUICK_ACTION_TOOLTIP_JUST_UPDATED": "Recém-atualizado ({currentVersion})",
+  "TR_QUICK_ACTION_TOOLTIP_RESTART_TO_UPDATE": "Reinicie para atualizar",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_DEVICE": "Dispositivo Trezor",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_SUITE": "Trezor Suite",
+  "TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE": "Atualização disponível ({newVersion})",
+  "TR_QUICK_ACTION_TOOLTIP_UP_TO_DATE": "Até a data ({currentVersion})",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED": "O Trezor Suite fez o download de uma nova atualização.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED": "O Trezor Suite foi atualizado.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE": "Atualização do Trezor Suite já disponível.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE": "Reiniciar e atualizar",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE": "Iniciar atualização",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE": "Atualização do Trezor já está disponível.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW": "O que há de novo?",
   "TR_RANDOM_SEED_WORDS_DISCLAIMER": "Você pode precisar digitar algumas palavras que não fazem parte da sua semente de recuperação.",
   "TR_RANGE": "faixa",
   "TR_READ_AND_UNDERSTOOD": "Eu li e entendi o que foi dito acima",
@@ -1499,7 +1545,7 @@
   "TR_SAFETY_CHECKS_MODAL_TITLE": "Verificações de segurança",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL": "Prompt",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL_DESC": "Permite ações potencialmente inseguras, tais como chaves que não correspondem ou taxas extremas, aprovando-as manualmente na sua Trezor.",
-  "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "Não mude isto, a menos que saiba o que está fazendo!",
+  "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "Só mude isso se você souber o que está fazendo!",
   "TR_SAFETY_CHECKS_STRICT_LEVEL": "Estrito",
   "TR_SAFETY_CHECKS_STRICT_LEVEL_DESC": "Segurança total de Trezor.",
   "TR_SCAN_QR_CODE": "Digitalizar QR code",
@@ -1509,9 +1555,9 @@
   "TR_SEARCH_TRANSACTIONS": "Pesquisar transações",
   "TR_SEARCH_UTXOS": "Procure por um endereço específico, ID da transação ou rótulo",
   "TR_SECURITY_CHECKPOINT_GOT_SEED": "Você tem sua cópia de segurança?",
-  "TR_SECURITY_CHECK_HOLOGRAM": "Por favor, note que os pacotes do dispositivo, incluindo hologramas e selos de segurança, foram atualizados com o tempo. Você pode verificar os detalhes do embalagem <packaging>aqui</packaging>. Certifique-se de que seu dispositivo foi comprado da Loja oficial do Trezor ou de um de <reseller>nossos vendedores</reseller>confiáveis. Caso contrário, corre-se o risco de o seu dispositivo ser falso. Se você suspeitar que seu dispositivo não é verdadeiro, por favor <support>entre em contato com o suporte do Trezor</support>.",
+  "TR_SECURITY_CHECK_HOLOGRAM": "Observe que a embalagem do dispositivo, incluindo hologramas e selos de segurança, foi atualizada ao longo do tempo. Você pode verificar os detalhes da embalagem <packaging>aqui</packaging>. Certifique-se de que o seu dispositivo foi adquirido na loja oficial da Trezor ou em um dos nossos </reseller> vendedores de confiança<reseller>. Caso contrário, existe o risco de o seu dispositivo ser falsificado. Se suspeitar que o seu dispositivo não é genuíno, <support> entre em contato com o suporte Trezor</support>.",
   "TR_SECURITY_FEATURES_COMPLETED_N": "Segurança ({n} de {m})",
-  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "Dispositivos configurados no modo sem frase-semente não podem acessar a Trezor Suite. Isto é para evitar a perda irreversível de moedas, no caso de uma configuração inadequada ser usada para um propósito errado.",
+  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "Os dispositivos configurados no modo sem frase-semente não podem acessar o Trezor Suite para evitar perdas irreversíveis de moedas, o que pode ocorrer se um dispositivo for usado incorretamente.",
   "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE": "A configuração sem frase-semente não é suportada pelo Trezor Suite",
   "TR_SEED_BACKUP_LENGTH": "Sua frase-semente de recuperação pode conter 12, 18, ou 24 palavras.",
   "TR_SEED_BACKUP_LENGTH_INCLUDING_SHAMIR": "Sua frase-semente de recuperação pode conter 12, 18, 20, 24, ou 33 palavras.",
@@ -1522,12 +1568,15 @@
   "TR_SEED_WORDS_ENTER_COMPUTER": "Digite as palavras da sua frase-semente de recuperação na ordem apresentada no seu dispositivo.",
   "TR_SEED_WORDS_ENTER_TOUCHSCREEN": "Usando a tela touchscreen, digite todas as palavras na ordem correta até a conclusão.",
   "TR_SEE_DETAILS": "Ver detalhes",
+  "TR_SEE_IF_ISSUE_PERSISTS": "Veja se o problema persiste.",
   "TR_SELECTED": "{amount} selecionado",
   "TR_SELECT_COIN_FOR_SETTINGS": "Selecione a moeda ativa para alterar as configurações",
   "TR_SELECT_DEVICE": "Selecione o dispositivo",
+  "TR_SELECT_NAME_OR_ADDRESS": "Pesquise por nome, símbolo, rede, ou endereço de contrato.",
   "TR_SELECT_NUMBER_OF_WORDS": "Selecione o número de palavras na sua frase-semente de recuperação",
   "TR_SELECT_PASSPHRASE_SOURCE": "Selecione onde digitar a senha em \"{deviceLabel}\".",
   "TR_SELECT_RECOVERY_METHOD": "Selecione o método de recuperação",
+  "TR_SELECT_TOKEN": "Selecione um token.",
   "TR_SELECT_TREZOR": "Selecione Trezor",
   "TR_SELECT_TREZOR_TO_CONTINUE": "Selecione Trezor para continuar.",
   "TR_SELECT_TYPE": "Selecione o tipo",
@@ -1558,11 +1607,11 @@
   "TR_SELL_MODAL_FOR_YOUR_SAFETY": "Vender {cryptocurrency} com {provider}",
   "TR_SELL_MODAL_LEGAL_HEADER": "Aviso legal",
   "TR_SELL_MODAL_SECURITY_HEADER": "A Trezor prioriza sua segurança",
-  "TR_SELL_MODAL_TERMS_1": "Você está aqui para vender criptomoedas. Se você chegou a este site por qualquer outro motivo, contate o suporte antes de prosseguir.",
+  "TR_SELL_MODAL_TERMS_1": "Você está aqui para vender criptomoedas. Se você chegou a este site por qualquer outro motivo, contate o suporte da Trezor antes de prosseguir.",
   "TR_SELL_MODAL_TERMS_2": "Você está vendendo criptomoedas por conta própria. Você reconhece que as políticas do fornecedor podem exigir verificação de identidade.",
   "TR_SELL_MODAL_TERMS_3": "Você entende que transações de criptomoeda são irreversíveis e não permitem reembolso. Assim, perdas por fraudes ou acidentes podem ser irrecuperáveis.",
   "TR_SELL_MODAL_TERMS_4": "Você entende que a Invity não oferece este serviço. O serviço é regido pelos termos de {provider}.",
-  "TR_SELL_MODAL_TERMS_5": "Você não está usando esse recurso para realizar aposta, fraude ou outra violação dos Termos de Serviço da Invity ou do fornecedor ou de quaisquer regulamentos aplicáveis.",
+  "TR_SELL_MODAL_TERMS_5": "Não estou usando esse recurso para realizar aposta, fraude ou qualquer outra atividade que viole os Termos de Serviço da Invity ou do fornecedor ou de quaisquer leis aplicáveis.",
   "TR_SELL_MODAL_TERMS_6": "Você entende que criptomoedas são uma ferramenta financeira emergente e que as regulamentações podem variar entre jurisdições. Isso pode acarretar em um maior risco de fraude, roubo ou instabilidade de mercado para você.",
   "TR_SELL_MODAL_VERIFIED_PARTNERS_HEADER": "Parceiros verificados pela Invity",
   "TR_SELL_REGISTER": "Registrar",
@@ -1571,10 +1620,6 @@
   "TR_SELL_STATUS_ERROR": "Recusado",
   "TR_SELL_STATUS_PENDING": "Pendente",
   "TR_SELL_STATUS_SUCCESS": "Aprovado",
-  "TR_SELL_TRANS_ID": "ID. da trans:",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "O máximo é {maximum} {currency}",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "O mínimo é {minimum} {currency}",
-  "TR_SELL_VIEW_DETAILS": "Ver detalhes",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "Poupança",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "Aluguel",
   "TR_SENDING_SYMBOL": "Enviando {multiple, select, true {vários tokens} false {{symbol}} other {{symbol}}}",
@@ -1629,6 +1674,8 @@
   "TR_SHOW_LOG": "Mostrar registro",
   "TR_SHOW_MORE": "Mostrar mais",
   "TR_SHOW_MORE_ADDRESSES": "Mostrar mais ({count})",
+  "TR_SHOW_ON_TRAY": "Mostrar ícone na bandeja.",
+  "TR_SHOW_ON_TRAY_DESCRIPTION": "Monitore se o Trezor Suite está sendo executado em segundo plano.",
   "TR_SHOW_UNVERIFIED_ADDRESS": "Mostrar endereço não verificado",
   "TR_SHOW_UNVERIFIED_XPUB": "Mostrar chave pública não verificada",
   "TR_SIDEBAR_ADD_COIN": "Adicionar uma moeda",
@@ -1641,7 +1688,9 @@
   "TR_SIZE": "Tamanho",
   "TR_SKIP": "Pular",
   "TR_SKIP_BACKUP": "Pular cópia de segurança",
+  "TR_SKIP_BACKUP_DESCRIPTION": "Um backup da carteira permite que você recupere seus fundos se o seu Trezor for perdido, roubado ou danificado. Sem um backup, você pode perder o acesso à sua criptografia permanentemente.",
   "TR_SKIP_PIN": "Pular PIN",
+  "TR_SKIP_PIN_DESCRIPTION": "O PIN do dispositivo impede o acesso não autorizado ao seu Trezor. Sem ele, qualquer pessoa com seu dispositivo pode acessar seus fundos.",
   "TR_SKIP_ROUNDS": "Pulando rodada",
   "TR_SKIP_ROUNDS_DESCRIPTION": "Ao permitir que rodadas sejam puladas, você dificulta provar qualquer relação entre suas entradas. Isto possibilita ofuscar ainda mais a origem dos fundos.",
   "TR_SKIP_ROUNDS_HEADING": "Permitir que a Trezor pule rodadas",
@@ -1654,6 +1703,7 @@
   "TR_STAKE_ADDING_TO_POOL": "Adicionando ao pool de stake",
   "TR_STAKE_ANY_AMOUNT_ETH": "Aposte um valor mínimo de {amount} {symbol} e comece a ganhar recompensas. Com a nossa taxa APY atual de {apyPercent}%, suas recompensas ganham também!",
   "TR_STAKE_APY": "Rendimento percentual anual",
+  "TR_STAKE_APY_ABBR": "APY",
   "TR_STAKE_APY_DESC": "*Rendimento percentual anual",
   "TR_STAKE_AVAILABLE": "Disponível",
   "TR_STAKE_CAN_CLAIM_WARNING": "Você já pode resgatar {amount} {symbol}. {br}Resgate ou aguarde até a nova remoção de stake ser processada.",
@@ -1663,15 +1713,18 @@
   "TR_STAKE_CLAIM_AFTER_UNSTAKING": "Você pode resgatar após o período de remoção de stake estar concluído.",
   "TR_STAKE_CLAIM_IN_NEXT_BLOCK": "no próximo bloco",
   "TR_STAKE_CLAIM_PENDING": "Resgate pendente",
+  "TR_STAKE_CLAIM_UNSTAKED": "Reivindicação removida do stake {symbol}",
   "TR_STAKE_CONFIRM_AND_STAKE": "Confirmar e fazer stake",
   "TR_STAKE_CONFIRM_ENTRY_PERIOD": "Confirmar periodo de entrada",
   "TR_STAKE_CONSENT_TO_STAKING_WITH_EVERSTAKE": "Eu reconheço e consinto em fazer stake com Everstake",
   "TR_STAKE_DAYS": "{days} dias",
   "TR_STAKE_DELEGATED": "Delegação de stake",
   "TR_STAKE_DEREGISTERED": "Remoção de registro de um endereço de stake",
+  "TR_STAKE_EARN_REWARDS_WEEKLY": "Ganhe recompensas semanalmente",
   "TR_STAKE_ENTERING_POOL_MAY_TAKE": "Entrar no pool de stake pode levar até {days} dias",
+  "TR_STAKE_ENTER_THE_STAKING_POOL": "Entre no pool do stake",
   "TR_STAKE_ETH": "Fazer stake de Ethereum",
-  "TR_STAKE_ETH_CARD_TITLE": "A maneira mais fácil de ganhar {symbol}.",
+  "TR_STAKE_ETH_CARD_TITLE": "A maneira mais fácil de ganhar {symbol}",
   "TR_STAKE_ETH_EARN_REPEAT": "Faça stake. Ganhe recompensas. Repita.",
   "TR_STAKE_ETH_EVERSTAKE": "Trezor e Everstake",
   "TR_STAKE_ETH_EVERSTAKE_DESC": "A Everstake é líder global e fornecedora de tecnologia de staking",
@@ -1682,17 +1735,21 @@
   "TR_STAKE_ETH_REWARDS_EARN": "Suas recompensas também ganham recompensas. Mantenha-as em stake e veja suas recompensas de {symbol} voarem.",
   "TR_STAKE_ETH_REWARDS_EARN_APY": "Suas recompensas de {symbol} também ganham a taxa APY. Mantenha seus fundos em stake ou adicione mais para aumentar suas recompensas.",
   "TR_STAKE_ETH_SEE_MONEY_DANCE": "Veja seu dinheiro trabalhar",
-  "TR_STAKE_ETH_SEE_MONEY_DANCE_DESC": "Ganhe {apyPercent}% de APY* colocando seu Ethereum em Tezor.",
+  "TR_STAKE_ETH_SEE_MONEY_DANCE_DESC": "Ganhe {apyPercent}% de <t>APY</t> ao fazer stake do seu Ethereum com a Trezor.",
   "TR_STAKE_ETH_WILL_BE_BLOCKED": "Seu {symbol} será bloqueado durante esse periodo e você não poderá cancelar isso. <a>Saiba mais</a>",
   "TR_STAKE_EVERSTAKE_MANAGES": "A Everstake gerencia e protege seus {symbol} em stake <t>com smart contracts, infraestrutura e tecnologia.</t>",
   "TR_STAKE_INSTANT": "Instantâneo",
   "TR_STAKE_INSTANTLY_UNSTAKED_WITH_DAYS": "Você recebeu {amount} {symbol} “instantaneamente”. {days, plural, =0 {} one {O restante será pago dentro de # dia.} other { O restante será pago dentro de # dias}}",
+  "TR_STAKE_IN_ACCOUNT": "{symbol} na conta",
   "TR_STAKE_LEARN_MORE": "Saiba mais",
+  "TR_STAKE_LEAVE_STAKING_POOL": "Sair do pool do stake",
   "TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL": "Deixamos {amount} {symbol} de fora para que você possa pagar taxas de saque.",
+  "TR_STAKE_LEFT_SMALL_AMOUNT_FOR_WITHDRAWAL": "Deixamos uma pequena quantia de {symbol} para que você possa pagar as taxas de retirada.",
   "TR_STAKE_MAX": "Máx.",
   "TR_STAKE_MAX_FEE_DESC": "A taxa máxima é a taxa de transação que você se dispõe a pagar à rede para garantir o processamento de sua transação.",
   "TR_STAKE_MAX_REWARD_DAYS": "Máximo de {days} dias",
   "TR_STAKE_MIN_AMOUNT_TOOLTIP": "O valor mínimo para colocar em stake é {amount} {symbol}",
+  "TR_STAKE_MONTHLY": "Mensal",
   "TR_STAKE_NEXT_PAYOUT": "Pagamento da próxima recompensa",
   "TR_STAKE_NOT_ENOUGH_FUNDS": "Não há {symbol} suficiente para pagar as taxas da rede",
   "TR_STAKE_ONLY_REWARDS": "Somente recompensas",
@@ -1704,6 +1761,8 @@
   "TR_STAKE_REGISTERED": "Registro de um endereço de stake",
   "TR_STAKE_RESTAKED_BADGE": "Apostado novamente",
   "TR_STAKE_REWARDS": "Recompensas",
+  "TR_STAKE_SIGN_TRANSACTION": "Assinar transação",
+  "TR_STAKE_SIGN_UNSTAKING_TRANSACTION": "Assinar a transação de remoção do stake",
   "TR_STAKE_STAKE": "Stake",
   "TR_STAKE_STAKED_AMOUNT": "Valor em stake",
   "TR_STAKE_STAKED_AND_EARNING": "Em stake e ganhando recompensas",
@@ -1711,6 +1770,7 @@
   "TR_STAKE_STAKE_MORE": "Fazer mais stake",
   "TR_STAKE_STAKING_IN_A_NUTSHELL": "Stake em poucas palavras",
   "TR_STAKE_STAKING_IS": "O stake é como um gesto amigável, no qual você bloqueia temporariamente seus ativos Ethereum para apoiar à operação da blockchain. Como recompensa, você acaba ganhando mais {symbol} em troca!",
+  "TR_STAKE_STAKING_PROCESS": "Processo para inclusão no stake",
   "TR_STAKE_START_STAKING": "Comece a fazer stake",
   "TR_STAKE_TIME_TO_CLAIM": "É hora de resgatar",
   "TR_STAKE_TOTAL_PENDING": "Total em stake pendente:",
@@ -1719,23 +1779,35 @@
   "TR_STAKE_UNSTAKED_AND_READY_TO_CLAIM": "Removido do stake e pronto para resgate",
   "TR_STAKE_UNSTAKE_TO_CLAIM": "Remover do stake para resgatar",
   "TR_STAKE_UNSTAKING": "Removendo do stake",
+  "TR_STAKE_UNSTAKING_APPROXIMATE": "Aproximadamente {symbol} disponível instantaneamente",
+  "TR_STAKE_UNSTAKING_APPROXIMATE_DESCRIPTION": "A liquidez do pool do stake pode permitir o desbloqueio imediato de alguns fundos. Os fundos restantes seguirão o período de remoção de stake.",
   "TR_STAKE_UNSTAKING_PERIOD": "Período de remoção de stake",
+  "TR_STAKE_UNSTAKING_PROCESS": "Processo para sair do stake",
   "TR_STAKE_UNSTAKING_TAKES": "A remoção do stake costuma levar cerca de 3 dias. Depois da conclusão, você pode trocar ou enviar os fundos.",
+  "TR_STAKE_WEEKLY": "Semanal",
   "TR_STAKE_WHAT_IS_STAKING": "O que é stake?",
+  "TR_STAKE_YEARLY": "Anual",
   "TR_STAKE_YOUR_FUNDS_MAINTAINED": "Seus fundos em stake são mantidos pela Everstake",
+  "TR_STAKING_AMOUNT_STAKED_INSTANTLY": "{amount} {symbol} incluído no stake instantaneamente!",
+  "TR_STAKING_AMOUNT_UNSTAKED_INSTANTLY": "{amount} {symbol} removido do stake instantaneamente!",
+  "TR_STAKING_CONSOLIDATING_FUNDS": "Consolidando o seu {symbol} para você",
   "TR_STAKING_DELEGATE": "Delegar",
   "TR_STAKING_DEPOSIT": "Depósito reembolsável",
   "TR_STAKING_DEPOSIT_FEE_DECRIPTION": "A taxa de depósito é de {feeAmount} ADA e é necessário registrar seu endereço para começar a fazer stake. Se você optar por remover seu Cardano do stake, receberá o depósito de volta.",
+  "TR_STAKING_ESTIMATED_GAINS": "Ganhos estimados",
   "TR_STAKING_FEE": "Taxa",
-  "TR_STAKING_INSTANTLY_STAKED": "Você instantaneamente apostou {amount} {symbol}. {days, plural, =0 {} one {O restante {symbol} é apostado dentro de # dias.} other { O restante {symbol} é apostado no prazo de # dias}}",
+  "TR_STAKING_GETTING_READY": "O seu {symbol} se preparando para o trabalho",
+  "TR_STAKING_INSTANTLY_STAKED": "Você instantaneamente apostou {amount} {symbol}. {days, plural, =0 {} one {O {symbol} restante será incluído em stake dentro de # dias.} other { O {symbol} restante será incluído em stake dentro de # dias}}",
   "TR_STAKING_IS_NOT_SUPPORTED": "O stake não é suportado nesta rede.",
   "TR_STAKING_NOT_ENOUGH_FUNDS": "Você não tem fundos suficientes na sua conta.",
+  "TR_STAKING_ONCE_YOU_CONFIRM": "Depois de confirmar,",
   "TR_STAKING_ON_3RD_PARTY_DESCRIPTION": "Ao realizar stake no pool de stake da Trezor, você apoia diretamente a Trezor e o ecossistema Cardano no Trezor Suite.",
   "TR_STAKING_ON_3RD_PARTY_TITLE": "Você está delegando em um pool de stake de terceiros",
   "TR_STAKING_POOL_OVERSATURATED_DESCRIPTION": "O stake em que você está delegando está super saturado. Delegue novamente seu stake para maximizar suas recompensas de stake",
   "TR_STAKING_POOL_OVERSATURATED_TITLE": "O pool de stake está super saturado",
   "TR_STAKING_REDELEGATE": "Delegar novamente",
   "TR_STAKING_REWARDS": "Recompensas disponíveis",
+  "TR_STAKING_REWARDS_ARE_RESTAKED": "as recompensas são automaticamente apostadas novamente",
   "TR_STAKING_REWARDS_DESCRIPTION": "Observe que pode levar até 20 dias para começar a receber suas recompensas após o registro inicial do stake e delegação. Após esse período, você receberá sua recompensa a cada 5 dias.",
   "TR_STAKING_REWARDS_TITLE": "Stake de Cardano está ativo",
   "TR_STAKING_STAKE_ADDRESS": "O endereço do seu stake",
@@ -1744,6 +1816,9 @@
   "TR_STAKING_TREZOR_POOL_FAIL": "Não foi possível acessar o pool de stake do Trezor para delegar.",
   "TR_STAKING_TX_PENDING": "Sua transação {txid} foi enviada com sucesso para a blockchain e está aguardando confirmação.",
   "TR_STAKING_WITHDRAW": "Retirada",
+  "TR_STAKING_YOUR_EARNINGS": "Seus ganhos são automaticamente apostados novamente, permitindo que você ganhe <a>juros compostos</a>.",
+  "TR_STAKING_YOUR_UNSTAKED_FUNDS": "Seu {symbol} removido do stake está pronto",
+  "TR_STAKING_YOU_ARE_HERE": "Você está aqui",
   "TR_STANDARD_WALLET_DESCRIPTION": "Sem senha",
   "TR_START": "Começar",
   "TR_START_AGAIN": "Começar de novo",
@@ -1752,6 +1827,7 @@
   "TR_START_COINJOIN": "Iniciar CoinJoin",
   "TR_START_RECOVERY": "Iniciar recuperação",
   "TR_STEP": "Etapa {number}",
+  "TR_STEP_OF_TOTAL": "Etapa {index} de {total}",
   "TR_STILL_DONT_SEE_YOUR_TREZOR": "Ainda não visualiza sua Trezor?",
   "TR_STOP": "Parar",
   "TR_STOPPING": "Parando",
@@ -1803,7 +1879,11 @@
   "TR_TOKENS_EMPTY": "Sem tokens... ainda.",
   "TR_TOKENS_EMPTY_CHECK_HIDDEN": "Nenhum tokens. Eles podem estar ocultos.",
   "TR_TOKENS_SEARCH_TOOLTIP": "Pesquise por token, símbolo ou endereço de contrato.",
+  "TR_TOKEN_NOT_FOUND": "Token não encontrado",
+  "TR_TOKEN_NOT_FOUND_ON_NETWORK": "Token não encontrado na rede {networkName}.",
   "TR_TOKEN_TRANSFERS": "Transferências de token {standard}",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH": "Experimente uma pesquisa diferente.",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH_OR_SWITCH": "Tente uma pesquisa diferente ou mude para outra rede.",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR": "Tokens não reconhecidos",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR_TOOLTIP": "Tokens não reconhecidos representam riscos potenciais. Tenha cuidado.",
   "TR_TOO_LONG": "A mensagem é muito longa",
@@ -1815,18 +1895,24 @@
   "TR_TOR_CONFIG_SNOWFLAKE_UPDATE_LABEL": "Atualizar caminho",
   "TR_TOR_DESCRIPTION": "Roteie todo o tráfego do Suite pela rede Tor e aumente sua privacidade e segurança. Pode levar algum tempo até que o Tor carregue e estabeleça uma conexão.",
   "TR_TOR_DISABLE": "Desabilitar Tor",
+  "TR_TOR_DISABLED": "Desativado",
   "TR_TOR_DISABLE_ONIONS_ONLY": "Backends personalizados não onion ausentes",
   "TR_TOR_DISABLE_ONIONS_ONLY_DESCRIPTION": "Adicione endereços de backend personalizados não onion para evitar este comportamento.",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_DESCRIPTION": "Você pode desativar o Tor em segurança agora.",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_TITLE": "Backends personalizados não estão mais usando apenas endereços onion.",
   "TR_TOR_DISABLE_ONIONS_ONLY_RESOLVED": "Desabilitar Tor",
   "TR_TOR_DISABLE_ONIONS_ONLY_TITLE": "Desativar o Tor agora irá redefinir todos os Onion de backends para os servidores padrão da Trezor.",
+  "TR_TOR_DISABLING": "Desativando",
   "TR_TOR_ENABLE": "Habilitar Tor",
+  "TR_TOR_ENABLED": "Ativado",
   "TR_TOR_ENABLE_AND_CONFIRM": "Habilitar Tor e confirmar",
   "TR_TOR_ENABLE_TITLE": "Habilitar Tor",
+  "TR_TOR_ENABLING": "Ativando",
+  "TR_TOR_ERROR": "Erro",
   "TR_TOR_IS_SLOW_MESSAGE": "O Tor está se conectando à rede.<br></br>Aguarde um momento.",
   "TR_TOR_KEEP_RUNNING": "Continuar executando o Tor",
   "TR_TOR_KEEP_RUNNING_FOR_COIN_JOIN_SUBTITLE": "Selecione \"Continuar executando o Tor\" para continuar ou \"Parar Tor\" para sair do processo de CoinJoin.",
+  "TR_TOR_MISBEHAVING": "Comportamento inadequado",
   "TR_TOR_REMOVE_ONION_AND_DISABLE": "Desativar o Tor e alternar para os backends predefinidos",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_LEAVE": "Sair",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_SUBTITLE": "Selecione \"Ativar Tor\" para continuar ou \"Sair do processo\" para deixar o processo.",
@@ -1841,11 +1927,7 @@
   "TR_TO_BTC": "Para BTC",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "Para tornar seus rótulos persistentes e disponíveis em diferentes dispositivos, conecte-se ao provedor de armazenamento em nuvem.",
   "TR_TO_SATOSHIS": "Para sat",
-  "TR_TRADE_BUYS": "compras",
-  "TR_TRADE_ENTER_COIN": "Insira o nome ou símbolo da criptomoeda...",
-  "TR_TRADE_EXCHANGES": "trocas",
   "TR_TRADE_REDIRECTING": "Redirecionando...",
-  "TR_TRADE_SELLS": "vendas",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "Histórico de transações não disponível",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "Dica: Você pode buscar IDs de transação, endereços, tokens, rótulos, valores e datas.",
   "TR_TRANSACTIONS_SEARCH_TIP_10": "Dica: Você pode combinar operadores E (&) e OU (|) para pesquisas mais complexas. Por exemplo, <strong>> {lastYear}-01-01 & < {lastYear}-01-31 | > {lastYear}-12-01 & < {lastYear}-12-31</strong> exibirá todas as transações em janeiro ou dezembro de {lastYear}.",
@@ -1860,6 +1942,7 @@
   "TR_TRANSACTIONS_SEARCH_TOOLTIP": "Pesquise por ID de transação, rótulo ou quantidade ou use operadores como < > | & = !=.",
   "TR_TRANSACTION_DETAILS": "Detalhes",
   "TR_TREZOR_BRIDGE_RUNNING_VERSION": "Versão em execução de Trezor Bridge {version}",
+  "TR_TREZOR_CONNECT": "O Trezor está conectado",
   "TR_TREZOR_DEVICE_TUTORIAL_CANCELED_HEADING": "Tutorial cancelado",
   "TR_TREZOR_DEVICE_TUTORIAL_COMPLETED_HEADING": "Tutorial concluído",
   "TR_TREZOR_DEVICE_TUTORIAL_DESCRIPTION": "Aprenda a usar seu dispositivo com a ajuda de um breve tutorial",
@@ -1867,32 +1950,40 @@
   "TR_TROUBLESHOOTING_CLOSE_TABS": "Feche outras abas e janelas que possam estar usando sua Trezor",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION": "Após fechar outras abas e janelas, tente atualizar esta página.",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION_DESKTOP": "Depois de fechar outras abas e janelas do navegador, tente sair e reabrir o aplicativo Trezor Suite.",
-  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Etapas necessárias para ativar comunicação",
+  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Tente estas etapas para solucionar esse problema.",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_DESCRIPTION": "Visite a <a>página de status Trezor Bridge</a>",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_TITLE": "Certifique-se de que o processo da Trezor Bridge está sendo executado",
-  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Hoje, só navegadores baseados em Chromium permitem comunicação direta com dispositivos USB",
+  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Hoje, só navegadores baseados em Chromium permitem comunicação direta com dispositivos USB.",
   "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_TITLE": "Use um navegador baseado em Chromium",
   "TR_TROUBLESHOOTING_TIP_CABLE_DESCRIPTION": "O cabo deve estar totalmente inserido. No caso de um dispositivo conectado a USB-C, o cabo deve ser encaixado.",
   "TR_TROUBLESHOOTING_TIP_CABLE_TITLE": "Experimente um cabo diferente",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_DESCRIPTION": "Com a Trezor Bridge instalada.",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_TITLE": "Tente usar um computador diferente, se você puder",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Apenas para garantir",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Tente reiniciar o seu computador",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Reiniciar o computador pode corrigir o problema de comunicação entre o navegador e o dispositivo.",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Reinicie o seu computador",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_DESCRIPTION": "Execute aplicativo de desktop <a>Trezor Suite</a>",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE": "Use o aplicativo de desktop Trezor Suite",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_DESCRIPTION": "<a>Clique para alternar</a> uma implementação de ponte alternativa. Versão atual: ({currentVersion})",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_TITLE": "Use outra versão da Trezor Bridge",
   "TR_TROUBLESHOOTING_TIP_UDEV_INSTALL_DESCRIPTION": "Tente instalar <a>regras de udev</a>. Certifique-se de salvá-las primeiro na área de trabalho antes de abrir.",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_DESCRIPTION": "Se tiver atualizado o firmware do seu dispositivo pela última vez em 2019 ou antes, siga as instruções da <a>Base de conhecimento</a>",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_TITLE": "Parece que você pode estar usando um modelo Trezor mais antigo.",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_DESCRIPTION": "Conecte-o diretamente ao seu computador (sem um hub USB).",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_TITLE": "Tente uma porta USB diferente",
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "Instalar regras automaticamente",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "Regras de udev ausentes",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "Um estado inesperado: {error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "Seu dispositivo está conectado corretamente, mas seu navegador não pode se comunicar com ele no momento. Você precisará instalar a Trezor Bridge.",
   "TR_TRY_AGAIN": "Tente novamente",
   "TR_TXID": "ID do TX",
   "TR_TXID_RBF": "ID original do TX a ser substituído",
   "TR_TX_CONFIRMATIONS": "{confirmationsCount}x",
   "TR_TX_CONFIRMED": "Transação confirmada",
   "TR_TX_CONFIRMING": "Confirmando a transação",
+  "TR_TX_DATA_FUNCTION": "Função",
+  "TR_TX_DATA_INPUT_DATA": "Dados de entrada",
+  "TR_TX_DATA_METHOD": "Dados de entrada",
+  "TR_TX_DATA_METHOD_NAME": "Nome do método",
+  "TR_TX_DATA_PARAMS": "Parâmetros",
   "TR_TX_DEPOSIT": "Depósito",
   "TR_TX_FEE": "Taxa",
   "TR_TX_TAB_AMOUNT": "Quantia",
@@ -1932,13 +2023,18 @@
   "TR_UPDATE_FIRMWARE_HOMESCREEN_LATER_TOOLTIP": "Atualização de firmware necessária. Você pode alterar sua tela inicial na página de configurações mais tarde",
   "TR_UPDATE_FIRMWARE_HOMESCREEN_TOOLTIP": "Atualize seu firmware para alterar sua tela inicial",
   "TR_UPDATE_MODAL_AVAILABLE_HEADING": "Atualização disponível",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES": "Ativar atualizações automáticas",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG": "Novo",
   "TR_UPDATE_MODAL_INSTALL_AND_RESTART": "Reiniciar e atualizar",
   "TR_UPDATE_MODAL_INSTALL_NOW_OR_LATER": "Gostaria de instalar a atualização agora?",
   "TR_UPDATE_MODAL_NOT_NOW": "Agora não",
-  "TR_UPDATE_MODAL_RESTART_NEEDED": "Isto reinicializará o Trezor Suite",
+  "TR_UPDATE_MODAL_RESTART_NEEDED": "Isto reinicializará o Trezor Suite.",
   "TR_UPDATE_MODAL_START_DOWNLOAD": "Iniciar atualização",
   "TR_UPDATE_MODAL_UPDATE_DOWNLOADED": "Atualização baixada",
   "TR_UPDATE_MODAL_UPDATE_ON_QUIT": "Atualizar ao sair",
+  "TR_UPDATE_MODAL_WHATS_NEW": "O que há de novo?",
+  "TR_UPDATE_MODAL_YOUR_VERSION": "Sua versão: v{version}",
+  "TR_UPGRADE_FIRMWARE_TO_DISCOVER_ACCOUNT_ERROR": "Atualize seu firmware para acessar esta conta. Veja o banner azul acima.",
   "TR_UP_TO": "até",
   "TR_UP_TO_DATE": "Até a data",
   "TR_UP_TO_DAYS": "até {days} dias",
@@ -1992,6 +2088,7 @@
   "TR_WALLET_SELECTION_ACCESS_HIDDEN_WALLET": "Acessar carteira oculta",
   "TR_WALLET_SELECTION_HIDDEN_WALLET": "Carteira oculta",
   "TR_WELCOME_TO_TREZOR_TEXT_WALLET_CREATION": "Crie uma nova carteira ou restaure-a usando sua semente de recuperação.",
+  "TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE": "Estamos sempre nos esforçando para melhorar sua experiência com a Trezor. Aqui estão as novidades:",
   "TR_WEST": "Oeste",
   "TR_WHAT_DATA_WE_COLLECT": "Que dados recolhemos?",
   "TR_WHAT_IS_PASSPHRASE": "Saiba mais sobre a diferença",
@@ -2002,7 +2099,7 @@
   "TR_WIPE_DEVICE_CHECKBOX_2_TITLE": "Entendo que devo ter uma cópia de segurança da minha semente de recuperação para manter acesso aos meus fundos",
   "TR_WIPE_DEVICE_TEXT": "A redefinição do dispositivo remove todos os seus dados. Redefina seu dispositivo apenas se você tiver uma cópia off-line da sua semente de recuperação, que lhe permitirá reaver seus fundos. ",
   "TR_WIPE_OR_UPDATE": "Redefinir dispositivo ou atualizar firmware",
-  "TR_WIPE_OR_UPDATE_DESCRIPTION": "Ir para Configurações do dispositivo",
+  "TR_WIPE_OR_UPDATE_DESCRIPTION": "Ir para Configurações do dispositivo.",
   "TR_WIPING_YOUR_DEVICE": "A redefinição de fábrica limpa a memória do dispositivo, apagando todas as informações, incluindo a semente de recuperação e o PIN. Somente execute uma redefinição de fábrica se você tiver uma cópia off-line segura da sua semente de recuperação, que lhe permitirá reaver seus fundos. ",
   "TR_WORDS": "{count} palavras",
   "TR_WORD_DOES_NOT_EXIST": "A palavra \"{word}\" não existe na lista de palavras bip39.",
diff --git a/packages/suite-data/files/translations/ro.json b/packages/suite-data/files/translations/ro.json
index e6f69fd0449..c3cf445db10 100644
--- a/packages/suite-data/files/translations/ro.json
+++ b/packages/suite-data/files/translations/ro.json
@@ -162,7 +162,6 @@
   "TR_404_DESCRIPTION": "Ei bine… ceva este stricat. Vă rugăm să mergeți la tabloul de bord.",
   "TR_404_GO_TO_DASHBOARD": "Mergeți la tabloul de bord acum!",
   "TR_404_TITLE": "Eroare 404",
-  "TR_ABORT": "Anuleaza",
   "TR_ACCESS_HIDDEN_WALLET": "Accesați portofelul ascuns",
   "TR_ACCESS_STANDARD_WALLET": "Accesați portofelul standard",
   "TR_ACCOUNT_DETAILS_HEADER": "Detaliile contului",
@@ -282,9 +281,7 @@
   "TR_BUG": "Bug",
   "TR_BUMP_FEE": "Comision de trimitere",
   "TR_BUY": "Cumpărați",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "Tranzacții cont",
   "TR_BUY_BUY": "cumpărați",
-  "TR_BUY_BUY_AGAIN": "Cumpărați încă o dată",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Confirmat pe trezor",
   "TR_BUY_DETAIL_ERROR_BUTTON": "Înapoi la cont",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "Deschideți site-ul de asistență al partenerului",
@@ -318,12 +315,10 @@
   "TR_BUY_STATUS_PENDING": "În aşteptare",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "În aşteptare",
   "TR_BUY_STATUS_SUCCESS": "Aprobat",
-  "TR_BUY_TRANS_ID": "ID Trans.:",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "Maximul este {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "Maximul este {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "Minimul este {minimum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "Minimul este {minimum} {currency}",
-  "TR_BUY_VIEW_DETAILS": "Vizualizare detalii",
   "TR_BYTES": "octeți",
   "TR_CAMERA_NOT_RECOGNIZED": "Camera nu a fost recunoscută.",
   "TR_CAMERA_PERMISSION_DENIED": "Permisiunea de a accesa camera a fost refuzată.",
@@ -336,7 +331,6 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Valoare Trezor",
   "TR_CHAINED_TXS": "Tranzacții înlănțuite",
   "TR_CHANGELOG": "Jurnal de modificări",
-  "TR_CHANGELOG_ON_GITHUB": "Jurnal de modificări pe GitHub",
   "TR_CHANGE_HOMESCREEN": "Schimbați ecranul de pornire",
   "TR_CHANGE_PIN": "Schimbare PIN",
   "TR_CHECK_FINGERPRINT": "Verificați amprenta digitală",
@@ -353,12 +347,6 @@
   "TR_COINJOIN_PHASE_4_MESSAGE": "Se încheie runda",
   "TR_COINJOIN_ROUND_COUNTDOWN_OVERTIME": "un moment",
   "TR_COINJOIN_TRANSACTION_BATCH": "Tranzacții CoinJoin",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "Încărcare automată în",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "Înapoi la Comerț",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "Nicio ofertă",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "Ne pare rău, nu avem nicio ofertă în acest moment din cauza unei probleme de conectivitate a serverului.",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "Ne pare rău, nu avem nicio ofertă în acest moment. Încercați să reîncărcați pagina sau să vă schimbați interogarea.",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "Reîncărcați pagina",
   "TR_COINS": "Monede",
   "TR_COIN_SETTINGS": "Setări monedă",
   "TR_COLOR_SCHEME": "Paletă de culori",
@@ -384,7 +372,6 @@
   "TR_CONTINUE_TO_PIN": "Continuați către PIN",
   "TR_COPY_AND_CLOSE": "Copiază și închide",
   "TR_COPY_SIGNED_MESSAGE": "Copiază mesajul semnat",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "Copiaţi",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "Nu s-a putut prelua jurnalul modificărilor",
   "TR_COULD_NOT_RETRIEVE_DATA": "Nu s-au putut prelua datele",
   "TR_COUNT_WALLETS": "{count} {count, plural, one {portofel} other {portofele}}",
@@ -476,7 +463,6 @@
   "TR_DOWNLOAD": "Descărcați",
   "TR_DOWNLOADING": "Se descarcă",
   "TR_DOWNLOAD_LATEST_BRIDGE": "Descărcați cea mai recentă versiune Bridge {version}",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "Chiar doriți să săriți peste acest pas?",
   "TR_DROPBOX": "Dropbox",
   "TR_DROPZONE": "Trageți și plasați fișierul aici sau faceți clic pentru a selecta din fișiere",
   "TR_DROPZONE_ERROR": "Importarea a eșuat {error}",
@@ -531,7 +517,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "Aprobați doar suma exactă necesară pentru acest schimb. Va trebui să plătiți o taxă suplimentară dacă doriți să faceți din nou un schimb similar.",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "Revocă aprobarea anterioară",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "Efectuați o tranzacție care va elimina aprobarea anterioară a contractului cu {provider}.",
-  "TR_EXCHANGE_BUY": "Pentru",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Confirmați pe Trezor și trimiteți",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "Confirmați și trimiteți",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "Creați aprobarea",
@@ -553,8 +538,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "Tranzacția s-a încheiat cu succes.",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "Schimbul a avut succes",
   "TR_EXCHANGE_DEX": "Oferta de schimb descentralizată",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "Comisioanele pentru efectuarea acestui schimb sunt estimate la {approvalFee} {approvalFeeFiat}  pentru aprobare (dacă este necesar) și {swapFee} {swapFeeFiat} pentru schimb.",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "Nu au rămas fonduri pentru taxele de tranzacție. Vă rugăm să reduceți suma de schimb la maxim {symbol} {max}",
   "TR_EXCHANGE_EXTRA_FIELD": "{extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "{extraFieldName} nu este valid",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "{extraFieldName} este un alt mod de a identifica tranzacția pe care o veți primi; ajută bursa să se asigure că depozitul corect ajunge în contul corect. Unele valute folosesc, de asemenea, termenii \"memo\", \"message\" sau \"payment ID\". {extraFieldDescription}",
@@ -564,7 +547,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "Informații privind ofertele cu rată fixă TODO",
   "TR_EXCHANGE_FLOAT": "Oferta cu rată flotantă",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "Informații privind ofertele cu rată flotantă TODO",
-  "TR_EXCHANGE_PROVIDER": "furnizor",
   "TR_EXCHANGE_RATE": "Rata de schimb",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "Contul de primire este în afara Suite.",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "Aceasta este adresa alfanumerică specifică care va primi monedele.",
@@ -585,10 +567,8 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_CUSTOM": "Particularizată",
   "TR_EXCHANGE_SWAP_SLIPPAGE_MINIMUM": "Suma minimă primită",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "Vă rugăm să introduceți un număr.",
-  "TR_EXCHANGE_TRANS_ID": "ID Trans.:",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "Folosiți un cont non-suite de {symbol}",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "Adresa de primire",
-  "TR_EXCHANGE_VIEW_DETAILS": "Vizualizare detalii",
   "TR_EXPORT_AS": "Exportați ca {as}",
   "TR_EXPORT_FAIL": "Exportare eșuată.",
   "TR_EXPORT_TO_FILE": "Exportați în fișier",
@@ -777,7 +757,6 @@
   "TR_NETWORK_ZCASH": "Zcash",
   "TR_NEW_FEE": "Nou",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "Noul Trezor Bridge este disponibil.",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "Firmware Trezor nou este disponibil! Vă rugăm să vă actualizați dispozitivul.",
   "TR_NONCE": "Nonce",
   "TR_NORTH": "Nord",
   "TR_NOTIFICATIONS": "Notificări",
@@ -789,10 +768,6 @@
   "TR_NUM_ACCOUNTS_FIAT_VALUE": "{accountsCount} {accountsCount, plural, one {cont} few {conturi} other {de conturi}} • {fiatValue}",
   "TR_N_TRANSACTIONS": "{value} {value, plural, one {tranzacţie} few {tranzacţii} other {de tranzacţii}}",
   "TR_OFF": "dezactivat",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "Suma aleasă de {amount} {currency} este mai mare decât maximul acceptat de {max} {currency}.",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "Suma aleasă de {amount} {currency} este mai mare decât maximul acceptat de {max} {currency}.",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "Suma aleasă de {amount} {currency} este mai mică decât minimul acceptat de {min} {currency}.",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "Suma aleasă de {amount} {currency} este mai mică decât minimul acceptat de {min} {currency}.",
   "TR_OK": "OK",
   "TR_ON": "activat",
   "TR_ONBOARDING_ADVANCED": "Avansat",
@@ -1010,7 +985,6 @@
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "Instalează automat regulile",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "Lipsesc regulile udev",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "Stare neașteptată: {error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "Dispozitivul este conectat corect, dar browserul de internet nu poate comunica în acest moment. Va trebui să instalați Trezor Bridge.",
   "TR_TRY_AGAIN": "Încercați din nou",
   "TR_TXID": "TX ID",
   "TR_TX_CONFIRMATIONS": "{confirmationsCount}x",
diff --git a/packages/suite-data/files/translations/ru.json b/packages/suite-data/files/translations/ru.json
index 67f19d921e8..db80d779be1 100644
--- a/packages/suite-data/files/translations/ru.json
+++ b/packages/suite-data/files/translations/ru.json
@@ -128,6 +128,7 @@
   "RECIPIENT_REQUIRES_UPDATE": "Taproot не поддерживается вашей версией прошивки. Пожалуйста, обновите прошивку вашего устройства.",
   "RECIPIENT_SCAN": "Сканировать",
   "REFRESH": "Обновить",
+  "REMAINING_BALANCE_LESS_THAN_RENT": "После отправки этой суммы на Вашем счету останется {remainingSolBalance} SOL. Непустой счет должен поддерживать баланс более {rent} SOL.",
   "REVIEW_AND_SEND_TRANSACTION": "Проверить и отправить",
   "SEND_RAW": "Отправить необработанную",
   "SEND_RAW_TRANSACTION_TOOLTIP": "Вы можете сами внести все исходные данные для вашей транзакции.",
@@ -162,6 +163,7 @@
   "TOAST_COPY_TO_CLIPBOARD": "Скопировано в буфер обмена",
   "TOAST_DEVICE_WIPED": "Устройство успешно стерто",
   "TOAST_DISCOVERY_ERROR": "Ошибка обнаружения учетной записи: {error}",
+  "TOAST_ESTIMATED_FEE_ERROR": "Оценка комиссии из сети не удалась. Использование резервного значения.",
   "TOAST_GENERIC_ERROR": "Ошибка: {error}",
   "TOAST_PIN_CHANGED": "PIN-код был изменен\n",
   "TOAST_QR_INCORRECT_ADDRESS": "QR-код содержит неверный адрес для этой учетной записи",
@@ -171,11 +173,14 @@
   "TOAST_SIGN_MESSAGE_ERROR": "Ошибка подписи сообщения: {error}",
   "TOAST_SIGN_MESSAGE_SUCCESS": "Сообщение было подписано",
   "TOAST_SIGN_TX_ERROR": "Ошибка подписи транзакции: {error}",
+  "TOAST_SUCCESSFUL_CLAIM": "{symbol} получено успешно",
   "TOAST_TX_BUTTON": "Подробнее",
   "TOAST_TX_CLAIMED": "",
   "TOAST_TX_CONFIRMED": "Транзакция {amount} на {account} успешно подтверждена",
   "TOAST_TX_RECEIVED": "{amount} получено на {account}",
   "TOAST_TX_SENT": "{amount} отправлено с {account}",
+  "TOAST_TX_STAKED": "{amount} состаковано с {account}",
+  "TOAST_TX_UNSTAKED": "{amount} отстаковано",
   "TOAST_VERIFY_ADDRESS_ERROR": "Ошибка проверки адреса: {error}",
   "TOAST_VERIFY_MESSAGE_ERROR": "Ошибка проверки сообщения: {error}",
   "TOAST_VERIFY_MESSAGE_SUCCESS": "Проверка сообщения успешна",
@@ -188,7 +193,6 @@
   "TR_404_GO_TO_DASHBOARD": "Перейдите на Инфопанель",
   "TR_404_TITLE": "Ошибка 404: Ссылка не найдена",
   "TR_7D_CHANGE": "Смена 7d",
-  "TR_ABORT": "Прервать",
   "TR_ACCESS_HIDDEN_WALLET": "Войти в скрытый кошелек",
   "TR_ACCESS_STANDARD_WALLET": "Войти в стандартный кошелек",
   "TR_ACCOUNT_DETAILS_HEADER": "Account details",
@@ -227,8 +231,19 @@
   "TR_ACCOUNT_TYPE_BIP86_DESC": "Taproot - это новый тип учетной записи, который может повысить конфиденциальность и эффективность сети. Некоторые службы могут пока не поддерживать адреса формата Taproot.",
   "TR_ACCOUNT_TYPE_BIP86_NAME": "Taproot",
   "TR_ACCOUNT_TYPE_BIP86_TECH": "BIP86, P2TR, Bech32m",
+  "TR_ACCOUNT_TYPE_CARDANO_DESC": "Текущий и наиболее широко распространенный метод генерации и управления адресами Cardano обеспечивает совместимость, безопасность и поддержку всех типов токенов.",
+  "TR_ACCOUNT_TYPE_COINJOIN": "Coinjoin",
+  "TR_ACCOUNT_TYPE_DEFAULT": "По-умолчанию",
+  "TR_ACCOUNT_TYPE_IMPORTED": "Импортирован",
+  "TR_ACCOUNT_TYPE_LEDGER": "Ledger",
+  "TR_ACCOUNT_TYPE_LEDGER_DESC": "Счета Ledger совместимы с путями деривации Ledger Live, что обеспечивает плавный переход от Ledger к Trezor.",
+  "TR_ACCOUNT_TYPE_LEGACY": "Устаревший",
+  "TR_ACCOUNT_TYPE_LEGACY_DESC": "Устаревшие счета совместимы с путями деривации Ledger Legacy, что обеспечивает плавный переход от Ledger к Trezor.",
+  "TR_ACCOUNT_TYPE_NORMAL_EVM_DESC": "Текущий и наиболее широко распространенный метод генерации и управления адресами {value} обеспечивает совместимость, безопасность и поддержку всех типов токенов.",
+  "TR_ACCOUNT_TYPE_NORMAL_SOLANA_DESC": "Текущий и наиболее широко распространенный метод генерации и управления адресами Solana обеспечивает совместимость, безопасность и поддержку токенов SOL и SPL.",
   "TR_ACCOUNT_TYPE_NO_CAPABILITY": "Не поддерживается.",
   "TR_ACCOUNT_TYPE_NO_SUPPORT": "Этот тип учетной записи не поддерживается на этой модели Trezor.",
+  "TR_ACCOUNT_TYPE_SEGWIT": "Legacy SegWit",
   "TR_ACCOUNT_TYPE_SHELLEY": "Shelley",
   "TR_ACCOUNT_TYPE_SHELLEY_DESC": "Адреса эпохи Shelley представили новый тип кошелька, который может поддерживать делегирование stake и получение вознаграждений.",
   "TR_ACCOUNT_TYPE_SLIP25_DESC": "Что такое счет coinjoin?",
@@ -237,18 +252,22 @@
   "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_DESC": "Bip44Change аккаунт",
   "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_NAME": "Bip44Change",
   "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_TECH": "BIP44, Base58",
+  "TR_ACCOUNT_TYPE_TAPROOT": "Taproot",
   "TR_ACCOUNT_TYPE_UPDATE_REQUIRED": "Пожалуйста, обновите прошивку устройства, чтобы включить этот тип счета.",
+  "TR_ACCOUNT_TYPE_XRP_DESC": "XRP - это цифровая валюта, которая позволяет осуществлять быстрые и недорогие трансграничные платежи, не прибегая к традиционному майнингу, используя консенсусную бухгалтерскую книгу для быстрого подтверждения транзакций.",
   "TR_ACQUIRE_DEVICE": "Использовать Trezor здесь",
   "TR_ACQUIRE_DEVICE_TITLE": "Запущена другая сессия ",
   "TR_ACTIVATED_COINS": "Активируйте криптовалюты",
   "TR_ACTIVE": "активированных",
   "TR_ADDRESSES": "Адрес",
+  "TR_ADDRESSES_CHANGE": "Изменить адреса",
   "TR_ADDRESSES_FRESH": "Свежие адреса",
   "TR_ADDRESSES_USED": "Используемые адреса",
   "TR_ADDRESS_DISPLAY": "Отображение адреса",
   "TR_ADDRESS_DISPLAY_DESCRIPTION": "Отображать адрес с пробелами (bc1w etes ... v54d 8d) или без (bc1wetes...v54d8d).",
   "TR_ADDRESS_MODAL_CLIPBOARD": "Копировать адрес",
   "TR_ADDRESS_MODAL_TITLE": "{networkName} адрес для получения",
+  "TR_ADDRESS_MODAL_TITLE_EXCHANGE": "{networkCurrencyName} получает адрес в сети {networkName} ",
   "TR_ADDRESS_PHISHING_WARNING": "Чтобы предотвратить фишинговые атаки, Вам следует проверить адрес, указанный на Вашем Trezor. {claim}",
   "TR_ADD_ACCOUNT": "Добавить счёт",
   "TR_ADD_HIDDEN_WALLET": "Добавить скрытый кошелёк",
@@ -275,6 +294,10 @@
   "TR_ALL": "Все",
   "TR_ALLOW_ANALYTICS": "Данные об использовании",
   "TR_ALLOW_ANALYTICS_DESCRIPTION": "Все данные остаются строго анонимными; они используются только для улучшения экосистемы Trezor.",
+  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES": "Автоматические обновления Trezor Suite",
+  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Trezor Suite автоматически загружает последнюю версию в фоновом режиме и устанавливает ее при перезапуске приложения. Это гарантирует, что Вы всегда будете в курсе последних функций и исправлений безопасности. Обновления происходят без Вашего разрешения.",
+  "TR_ALL_NETWORKS": "Все сети ({networkCount})",
+  "TR_ALL_NETWORKS_TOOLTIP": "Просмотрите токены из всех {networkCount} сетей. Фильтруйте по наиболее популярным сетям справа.",
   "TR_ALL_TRANSACTIONS": "Транзакции",
   "TR_AMOUNT_SENT": "Отправленная сумма",
   "TR_AMOUNT_TOO_BIG_FOR_COINJOIN": "Не подходит для CoinJoin - слишком высокая сумма",
@@ -296,6 +319,8 @@
   "TR_AUTH_CONFIRM_FAILED_RETRY": "Повторить",
   "TR_AUTH_CONFIRM_FAILED_TITLE": "Неправильная кодовая фраза",
   "TR_AUTOSTOP_COINJOIN_ENABLED": "Coinjoin будет остановлен после этого раунда",
+  "TR_AUTO_START": "Запускать Trezor Suite автоматически",
+  "TR_AUTO_START_DESCRIPTION": "Запускать Trezor Suite в фоновом режиме, когда Вы входите в компьютер.",
   "TR_AUTO_STOP_TOOLTIP": "Coinjoin находится в стадии подписания. Нажмите, чтобы остановить его после этого раунда.",
   "TR_AVAILABLE_NOW_FOR": "Доступно сейчас для",
   "TR_AVOID_USING_DEVICE": "Не используйте это устройство и не переводите на него средства.",
@@ -332,15 +357,17 @@
   "TR_BIP_SIG_FORMAT": "Trezor",
   "TR_BITCOIN_ONLY_UNAVAILABLE": "Прежде чем Вы сможете перейти на прошивку только для Bitcoin, нам необходимо обновить Вашу прошивку до более новой версии.",
   "TR_BREAKING_ANONYMITY_CHECKBOX": "Я понимаю, что нарушаю свою анонимность",
+  "TR_BRIDGE": "Trezor Bridge",
   "TR_BRIDGE_DEV_MODE_START": "Запуск Trezor Bridge на порту 21324",
   "TR_BRIDGE_DEV_MODE_STOP": "Запуск Trezor Bridge на порту по умолчанию",
+  "TR_BRIDGE_GO_TO_WALLET_DESCRIPTION": "Вы уверены? Ваше устройство может одновременно использоваться только одним приложением. Если в данный момент Вы используете другое приложение на устройстве Trezor, сначала завершите эту сессию.",
+  "TR_BRIDGE_NEEDED_DESCRIPTION": "Ваш браузер не поддерживается. Для получения наилучших впечатлений загрузите и запустите в фоновом режиме настольное приложение Trezor Suite или используйте поддерживаемый браузер на базе Chromium, совместимый с WebUSB.",
+  "TR_BRIDGE_REQUESTED_DESCRIPTION": "Другое приложение запросило Trezor Suite для соединения с Вашим устройством Trezor. Продолжайте работу Trezor Suite в фоновом режиме и повторите действие в другом приложении.",
   "TR_BTC_UNITS": "Единицы Bitcoin",
   "TR_BUG": "Что-то не работает?",
   "TR_BUMP_FEE": "Повысить комиссию",
   "TR_BUY": "Купить",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "Сделки",
   "TR_BUY_BUY": "Купите",
-  "TR_BUY_BUY_AGAIN": "Купить снова",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Подтверждено на Trezor",
   "TR_BUY_DETAIL_ERROR_BUTTON": "Назад к счету",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "Перейти к поддержке провайдера",
@@ -385,12 +412,10 @@
   "TR_BUY_STATUS_PENDING": "В ожидании",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "В ожидании",
   "TR_BUY_STATUS_SUCCESS": "Одобрено",
-  "TR_BUY_TRANS_ID": "Транс. ID:",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "Максимум - {maximum}",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "Максимум составляет {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "Минимум - {minimum}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "Минимум составляет {minimum} {currency}",
-  "TR_BUY_VIEW_DETAILS": "Посмотреть детали",
   "TR_BYTES": "байтов",
   "TR_CAMERA_NOT_RECOGNIZED": "Камера не была обнаружена.",
   "TR_CAMERA_PERMISSION_DENIED": "Разрешение на доступ к камере было отклонено.",
@@ -409,13 +434,13 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Сумма Трезор",
   "TR_CHAINED_TXS": "Цепные транзакции",
   "TR_CHANGELOG": "Список изменений",
-  "TR_CHANGELOG_ON_GITHUB": "Список изменений на GitHub",
   "TR_CHANGE_ADDRESS_TOOLTIP": "Этот адрес был создан как неизрасходованный остаток (\"change\") предыдущей транзакции.",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "Тип прошивки в любое время можно изменить в Настройках.",
   "TR_CHANGE_HOMESCREEN": "Поменять заставку",
   "TR_CHANGE_PIN": "Изменить PIN",
   "TR_CHANGE_WIPE_CODE": "Изменение кода очистки",
   "TR_CHECKING_YOUR_DEVICE": "Проверка устройства",
+  "TR_CHECKSUM_CONVERSION_INFO": "Преобразовано в контрольную сумму. <a>Подробнее</a>",
   "TR_CHECK_DEVICE_ORIGIN_DESCRIPTION": "Мы проверим целостность Вашего устройства Trezor, обеспечим его сохранность и подтвердим подлинность чипа.",
   "TR_CHECK_DEVICE_ORIGIN_TITLE": "Проверить устройство",
   "TR_CHECK_FINGERPRINT": "Проверьте fingerprint ",
@@ -425,8 +450,6 @@
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "Выполните пробное восстановление для проверки резервной копии.",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "Введите слова из Вашей резервной копии в том порядке, в котором они отображаются на Вашем устройстве. В качестве дополнительной меры безопасности Вам может быть предложено ввести несколько слов, которые не являются частью резервной копии.",
   "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "Ваша фраза восстановления (резервная копия кошелька) вводится с помощью кнопок Trezor Model R. Это позволяет избежать раскрытия любой конфиденциальной информации на потенциально небезопасном компьютере или веб-браузере.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "Ваша фраза восстановления (резервная копия кошелька) вводится с помощью кнопок Trezor Model R. Это позволяет избежать раскрытия любой конфиденциальной информации на потенциально небезопасном компьютере или веб-браузере.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "Ваша фраза восстановления (резервная копия кошелька) вводится с помощью кнопок Trezor Model R. Это позволяет избежать раскрытия любой конфиденциальной информации на потенциально небезопасном компьютере или веб-браузере.",
   "TR_CHECK_SEED": "Проверить резервную копию",
   "TR_CHECK_YOUR_DEVICE": "Посмотрите на экран своего Trezor",
   "TR_CHOOSE_RECOVERY_TYPE": "Выберите тип восстановления",
@@ -479,12 +502,76 @@
   "TR_COINJOIN_TILE_3_DESCRIPTION": "Ваш биткоин всегда находится под Вашим контролем",
   "TR_COINJOIN_TILE_3_TITLE": "Защищено вашим Trezor",
   "TR_COINJOIN_TRANSACTION_BATCH": "Транзакции coinjoin",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "Автоматическое обновление через",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "Назад к Торговле",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "Нет предложений",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "Извините, в данный момент у нас нет предложений из-за проблем с подключением к серверу.",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "Извините, в настоящее время у нас нет предложений. Попробуйте перезагрузить страницу или изменить запрос.",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "Обновить предложения",
+  "TR_COINMARKET_BEST_RATE": "Лучший курс",
+  "TR_COINMARKET_BUY_AND_SELL": "Купить и продать",
+  "TR_COINMARKET_CEX_TOOLTIP": "Централизованный обмен",
+  "TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY": "Изменить сумму или валюту.",
+  "TR_COINMARKET_COMPARE_OFFERS": "Сравнить все предложения",
+  "TR_COINMARKET_COUNTRY": "Страна резиденции",
+  "TR_COINMARKET_DCA_DOWNLOAD": "Скачайте мобильное приложение Invity, чтобы начать экономить в биткойнах",
+  "TR_COINMARKET_DCA_FEATURE_1_DESCRIPTION": "Безопасный и простой кастодиальный  сберегательный план DCA.",
+  "TR_COINMARKET_DCA_FEATURE_1_SUBHEADING": "Разработано SatoshiLabs",
+  "TR_COINMARKET_DCA_FEATURE_2_DESCRIPTION": "Вывод на собственный кастодий без дополнительных комиссий.",
+  "TR_COINMARKET_DCA_FEATURE_2_SUBHEADING": "Бесплатное снятие",
+  "TR_COINMARKET_DCA_FEATURE_3_DESCRIPTION": "Быстрый, оптимизированный, удобный интерфейс.",
+  "TR_COINMARKET_DCA_FEATURE_3_SUBHEADING": "Простота использования",
+  "TR_COINMARKET_DCA_FEATURE_4_DESCRIPTION": "Отслеживайте историю Ваших инвестиций, их количество и частоту.",
+  "TR_COINMARKET_DCA_FEATURE_4_SUBHEADING": "Обзор DCA",
+  "TR_COINMARKET_DCA_HEADING": "Экономьте в биткойнах с помощью приложения Invity",
+  "TR_COINMARKET_DEX_TOOLTIP": "Децентрализованный обмен",
+  "TR_COINMARKET_ENTER_AMOUNT_IN": "Введите сумму в {currency}",
+  "TR_COINMARKET_NETWORK_TOKENS": "",
+  "TR_COINMARKET_NO_CEX_PROVIDER_FOUND": "",
+  "TR_COINMARKET_NO_DEX_PROVIDER_FOUND": "",
+  "TR_COINMARKET_NO_METHODS_AVAILABLE": "",
+  "TR_COINMARKET_OFFERS_EMPTY": "",
+  "TR_COINMARKET_OFFERS_REFRESH": "",
+  "TR_COINMARKET_OFFERS_SELECT": "",
+  "TR_COINMARKET_OFFER_LOOKING": "",
+  "TR_COINMARKET_OFFER_NO_FOUND": "",
+  "TR_COINMARKET_ON_NETWORK_CHAIN": "",
+  "TR_COINMARKET_OTHER_CURRENCIES": "",
+  "TR_COINMARKET_PAYMENT_METHOD": "",
+  "TR_COINMARKET_POPULAR_CURRENCIES": "",
+  "TR_COINMARKET_RATE": "",
+  "TR_COINMARKET_RECEIVE_METHOD": "",
+  "TR_COINMARKET_SELL": "",
+  "TR_COINMARKET_SHOW_OFFERS": "",
+  "TR_COINMARKET_SWAP": "",
+  "TR_COINMARKET_SWAP_AMOUNT": "",
+  "TR_COINMARKET_SWAP_DEX_MODAL_CONFIRM": "",
+  "TR_COINMARKET_SWAP_DEX_MODAL_FOR_YOUR_SAFETY": "",
+  "TR_COINMARKET_SWAP_DEX_MODAL_LEGAL_HEADER": "Правовая информация",
+  "TR_COINMARKET_SWAP_DEX_MODAL_SECURITY_HEADER": "Безопасность прежде всего с Вашим Trezor",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_1": "Я хочу обменивать криптовалюты на DEX (децентрализованная биржа), используя контракт {provider}.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_2": "Я хочу обменивать криптовалюты на свой собственный счет. Я понимаю, что политика провайдера может потребовать проверки личности.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_3": "Я понимаю, что транзакции с криптовалютой являются окончательными и не могут быть отменены или возвращены. Потери из-за мошенничества или ошибок могут быть невозможны.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4": "Я понимаю, что Invity не предоставляет эту услугу. Она регулируется правилами и условиями сайта {provider}.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_5": "Я не использую эту функцию для азартных игр, мошенничества или любой деятельности, нарушающей Условия предоставления услуг Invity или провайдера, а также любые применимые законы.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_6": "Я понимаю, что криптовалюты - это развивающийся финансовый инструмент и что нормативные акты могут отличаться в зависимости от региона. Это может увеличить риск мошенничества, кражи или нестабильности рынка.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_VERIFIED_PARTNERS_HEADER": "Проверенные партнеры Invity",
+  "TR_COINMARKET_SWAP_MODAL_CONFIRM": "Я готов обменивать",
+  "TR_COINMARKET_SWAP_MODAL_FOR_YOUR_SAFETY": "Поменять {fromCrypto} на {toCrypto} с помощью {provider}",
+  "TR_COINMARKET_SWAP_MODAL_LEGAL_HEADER": "Правовая информация",
+  "TR_COINMARKET_SWAP_MODAL_SECURITY_HEADER": "Безопасность прежде всего с Вашим Trezor",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_1": "Я здесь для того, чтобы обменивать криптовалюты. Если меня направили на этот сайт по какой-либо другой причине, я свяжусь со службой поддержки Trezor, прежде чем продолжить.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_2": "Я хочу обменивать криптовалюты на свой собственный счет. Я понимаю, что политика провайдера может потребовать проверки личности.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_3": "Я понимаю, что транзакции с криптовалютой являются окончательными и не могут быть отменены или возвращены. Потери из-за мошенничества или ошибок могут быть невозможны.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_4": "Я понимаю, что Invity не предоставляет эту услугу. Она регулируется правилами и условиями сайта {provider}.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_5": "Я не использую эту функцию для азартных игр, мошенничества или любой деятельности, нарушающей Условия предоставления услуг Invity или провайдера, а также любые применимые законы.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_6": "Я понимаю, что криптовалюты - это развивающийся финансовый инструмент и что нормативные акты могут отличаться в зависимости от региона. Это может увеличить риск мошенничества, кражи или нестабильности рынка.",
+  "TR_COINMARKET_SWAP_MODAL_VERIFIED_PARTNERS_HEADER": "Проверенные партнеры Invity",
+  "TR_COINMARKET_TOKEN_NETWORK": "{tokenName} в сети {networkName}",
+  "TR_COINMARKET_TRADE_FEE": "Коммиссии торгов",
+  "TR_COINMARKET_UNKNOWN_PROVIDER": "Неизвестный провайдер",
+  "TR_COINMARKET_YOUR_BEST_OFFER": "Ваше лучшее предложение",
+  "TR_COINMARKET_YOU_BUY": "Вы покупаете",
+  "TR_COINMARKET_YOU_GET": "Вы получаете",
+  "TR_COINMARKET_YOU_PAY": "Вы заплатите",
+  "TR_COINMARKET_YOU_RECEIVE": "Вы получите",
+  "TR_COINMARKET_YOU_SELL": "Вы продаете",
+  "TR_COINMARKET_YOU_WILL_GET": "Вы получите",
+  "TR_COINMARKET_YOU_WILL_PAY": "Вы заплатите",
   "TR_COINS": "Монеты",
   "TR_COIN_CONTROL": "Coin control",
   "TR_COIN_CONTROL_TOOLTIP": "Coin control позволяет вручную выбирать UTXO, которые будут использоваться в качестве входов для транзакции.",
@@ -501,6 +588,7 @@
   "TR_CONFIRMED_TX": "Подтверждено",
   "TR_CONFIRMING_TX": "Подтверждение транзакции",
   "TR_CONFIRM_ACTION_ON_YOUR": "Следуйте инструкциям на экране Вашего Trezor",
+  "TR_CONFIRM_ADDRESS": "Подтвердить адрес",
   "TR_CONFIRM_BEFORE_COPY": "Подтвердить Trezor перед копированием",
   "TR_CONFIRM_CONDITIONS": "Подтвердите условия, прежде чем продолжить.",
   "TR_CONFIRM_EMPTY_HIDDEN_WALLET_ON": "Подтвердите пустой Скрытый кошелек на \"{deviceLabel}\" устройстве.",
@@ -512,13 +600,22 @@
   "TR_CONFIRM_ON_TREZOR": "Подтвердите на Trezor",
   "TR_CONFIRM_PASSPHRASE": "Подтверждение кодовой фразы",
   "TR_CONFIRM_PASSPHRASE_SOURCE": "Подтверждение пустой кодовой фразы скрытого кошелька на устройстве \"{deviceLabel}\".",
+  "TR_CONFIRM_PASSPHRASE_WITHOUT_ADVICE_DESCRIPTION": "Введите свою кодовую фразу для авторизации этого действия.",
   "TR_CONGRATS": "Поздравляем!",
   "TR_CONNECT": "Подключиться",
   "TR_CONNECTED": "Подключён",
   "TR_CONNECTED_DIFFERENT_DEVICE": "Подключено другое устройство?",
   "TR_CONNECTED_TO_PROVIDER": "Подключено к {provider} как {user}",
   "TR_CONNECTED_TO_PROVIDER_LOCALLY": "Сохраняем метки локально ",
+  "TR_CONNECTION_LOST": "Соединение потеряно",
+  "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_BUTTON": "Управление",
+  "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_DESCRIPTION": "Включите появления диалога ввода парольной фразы при открытии Trezor Suite.",
+  "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_TITLE": "Используете ли Вы в основном парольную фразу?",
   "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Проверьте на Trezor, чтобы подтвердить адрес получения. Продолжать без подтверждения не рекомендуется.",
+  "TR_CONNECT_DEVICE_RECEIVE_PROMO_TITLE": "Адрес получения не может быть проверен",
+  "TR_CONNECT_DEVICE_SEND_PROMO_DESCRIPTION": "Чтобы отправить монеты, подключите Ваш Trezor.",
+  "TR_CONNECT_DEVICE_SEND_PROMO_TITLE": "Ваш Trezor не подключен",
+  "TR_CONNECT_TREZOR_TO_SEND_BUTTON": "Подключите Trezor для отправки",
   "TR_CONNECT_YOUR_DEVICE": "Подключите ваш Trezor",
   "TR_CONTACT_SUPPORT": "Обратиться в поддержку",
   "TR_CONTACT_TREZOR_SUPPORT": "Обратитесь в службу поддержки Trezor",
@@ -528,14 +625,18 @@
   "TR_CONTINUE_ONLY_WITH_SEED_DESCRIPTION": "Сбрасывая устройство, помните: даже поддержка Trezor не поможет вам восстановить ваши средства без фразы восстановления. В случае если у вас есть несколько фраз восстановления, убедитесь, что держите наготове фразу именно для сбрасываемого в данный момент устройства Trezor.",
   "TR_CONTINUE_ONLY_WITH_SEED_DESCRIPTION_2": "在继续之前， <button>，在设置</button>中检查您的备份。这是检查和验证恢复种子的简单方法。",
   "TR_CONTINUE_ON_TREZOR": "Продолжите на Trezor",
+  "TR_CONTINUE_TO_BACKUP": "Продолжите для создания резервной копии",
   "TR_CONTINUE_TO_PIN": "Настроить и PIN-код",
   "TR_CONTRACT": "Контракт",
+  "TR_CONTRACT_ADDRESS": "Адрес договора:",
   "TR_CONTRACT_TRANSACTION": "Контрактная транзакция",
   "TR_CONVERT_TO_CHECKSUM_ADDRESS": "Преобразовать в адрес контрольной суммы",
   "TR_CONVERT_TO_LOWERCASE": "Преобразовать в строчные буквы",
+  "TR_COPY_ADDRESS_CONTRACT": "Никогда не отправляйте средства на контрактный адрес.",
+  "TR_COPY_ADDRESS_FINGERPRINT": "Никогда не отправляйте средства на адрес отпечатка.",
+  "TR_COPY_ADDRESS_POLICY_ID": "Никогда не пересылайте средства на адрес идентификатора политики.",
   "TR_COPY_AND_CLOSE": "Скопировать и закрыть",
   "TR_COPY_SIGNED_MESSAGE": "Копировать подписанное сообщение",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "Копировать",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "Не удалось загрузить список изменений",
   "TR_COULD_NOT_RETRIEVE_DATA": "Не удалось загрузить данные",
   "TR_COUNT_WALLETS": "{count} {count, plural, one {кошелёк} few {кошелька} many {кошельков} other {кошельков}}",
@@ -667,7 +768,6 @@
   "TR_DOWNLOADING": "Загрузка",
   "TR_DOWNLOAD_LATEST_BRIDGE": "Скачать последнюю версию Bridge {version}",
   "TR_DO_NOT_DISCONNECT_DEVICE": "Не отключайте свое устройство",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "Вы уверены, что хотите пропустить этот шаг?",
   "TR_DROPBOX": "Dropbox",
   "TR_DROPZONE": "Перетащите сюда файл или нажмите для выбора из файлов",
   "TR_DROPZONE_ERROR": "Импорт не удался: {error}",
@@ -745,7 +845,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "Одобрите только точную сумму, необходимую для данного обмена. Вам нужно будет заплатить дополнительную комиссию, если Вы захотите совершить подобный обмен еще раз.",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "Отменить предыдущее разрешение",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "Выполнит операцию, которая удалит предыдущее одобрение контракта с {provider}.",
-  "TR_EXCHANGE_BUY": "Для",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Подтвердить на Trezor и отправить",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "Проверка и отправка",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "Создать разрешение",
@@ -767,8 +866,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "Ваша транзакция прошла успешно.",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "Одобрено",
   "TR_EXCHANGE_DEX": "Предложение децентрализованной биржи",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "Комиссия за выполнение этого обмена оценивается в {approvalFee} ({approvalFeeFiat}) на утверждение (если требуется) и {swapFee} ({swapFeeFiat}) на замену.",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "Не осталось средств для оплаты комиссии за транзакцию. Пожалуйста, уменьшите сумму обмена максимального до {symbol} {max}",
   "TR_EXCHANGE_EXTRA_FIELD": "{extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "{extraFieldName} является недействительным",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "{extraFieldDescription}",
@@ -778,7 +875,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "Фиксированные курсы показывают Вам точную сумму, которую Вы получите в конце обмена - сумма не изменится с момента выбора курса до завершения транзакции. Вам гарантирована указанная сумма, но эти ставки обычно менее щедрые, а значит, за свои деньги не купишь столько криптовалют.",
   "TR_EXCHANGE_FLOAT": "Предложение с плавающей ставкой",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "Плавающие ставки означают, что конечная сумма, которую Вы получите, может немного измениться из-за колебаний на рынке в период между моментом выбора ставки и моментом завершения транзакции. Эти ставки обычно выше, что означает, что в конечном итоге Вы можете получить больше криптовалюты.",
-  "TR_EXCHANGE_PROVIDER": "Провайдер",
   "TR_EXCHANGE_RATE": "Цена",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "Счет получения находится за пределами Suite.",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "Это конкретный буквенно-цифровой адрес, на который поступит ваша криптовалюта.",
@@ -805,13 +901,14 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "Пожалуйста, введите номер.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "Введите желаемое отклонение от курса",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "Сумма предложения обмена",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "Итоги отклонения от курса",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "Допустимость отклонения от курса",
-  "TR_EXCHANGE_TRANS_ID": "ID транзакции:",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "Используйте учетную запись ({symbol}), которой нет в Suite",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "Адрес получения",
-  "TR_EXCHANGE_VIEW_DETAILS": "Посмотреть детали",
   "TR_EXPERIMENTAL_FEATURES": "Экспериментальные функции",
+  "TR_EXPERIMENTAL_PASSWORD_MANAGER": "",
+  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "",
+  "TR_EXPERIMENTAL_TOR_SNOWFLAKE": "",
+  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "",
   "TR_EXPORT_AS": "Экспортировать как {as}",
   "TR_EXPORT_FAIL": "Экспорт не удался.",
   "TR_EXPORT_TO_FILE": "Экспорт в файл",
@@ -837,12 +934,15 @@
   "TR_FIAT_RATES_NOT_AVAILABLE": "Нет данных",
   "TR_FIAT_RATES_NOT_AVAILABLE_TOOLTIP": "В настоящее время фиатные тарифы не доступны.",
   "TR_FINAL_HEADING": "Настройка завершена!",
+  "TR_FINGERPRINT_ADDRESS": "",
   "TR_FIRMWARE": "Прошивка",
   "TR_FIRMWARE_CHECK_AUTHENTICITY_SUCCESS": "Прошивка аутентичная",
   "TR_FIRMWARE_HASH_MISMATCH": "На Вашем Trezor установлена неофициальная прошивка. Пожалуйста, немедленно свяжитесь с help@trezor.io.",
   "TR_FIRMWARE_INSTALLED_TEXT": "На этом устройстве установлена прошивка {version} ({type}).",
   "TR_FIRMWARE_IS_POTENTIALLY_RISKY": "Обновление прошивки - потенциально рискованная операция. Если что-то пойдет не так (повреждение кабеля и т.д.), устройство может оказаться в стертом состоянии, что приведет к временной потере доступа ко всем вашим монетам, пока вы не восстановите хранилище из резервной копии.",
   "TR_FIRMWARE_IS_UP_TO_DATE": "Прошивка готова",
+  "TR_FIRMWARE_LANGUAGE_CHANGED": "",
+  "TR_FIRMWARE_LANGUAGE_FETCH_ERROR": "",
   "TR_FIRMWARE_NEW_FW_DESCRIPTION": "Доступна новая версия прошивки. Вы можете либо обновить устройство сейчас, либо продолжить и обновить его позже.",
   "TR_FIRMWARE_REINSTALL_FW_DESCRIPTION": "Ваше устройство уже обновлено до последней версии прошивки. При необходимости Вы можете переустановить прошивку.",
   "TR_FIRMWARE_STATUS_INSTALLATION_COMPLETED": "Завершена",
@@ -1097,7 +1197,6 @@
   "TR_NETWORK_ZCASH": "Zcash",
   "TR_NEW_FEE": "Новый",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "Доступен новый Trezor Bridge",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "Доступна новая прошивка Trezor! Пожалуйста, обновите свое устройство.",
   "TR_NONCE": "Нонс",
   "TR_NORMAL_ACCOUNTS": "Счета по умолчанию",
   "TR_NORTH": "Север",
@@ -1118,10 +1217,6 @@
   "TR_NUM_ACCOUNTS_FIAT_VALUE": "{accountsCount} {accountsCount, plural, one {счёт} few {счёта} many {счетов} other {счетов}} • {fiatValue}",
   "TR_N_TRANSACTIONS": "{value} {value, plural, one {транзакция} 0 {транзакций} few {транзакции} many {транзакций} other {транзакции4}}",
   "TR_OFF": "выкл",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "Выбранная сумма {amount} больше, чем принятый максимум {max}.",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "Выбранная сумма {amount} больше, чем допустимый максимум {max}.",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "Выбранная сумма {amount} меньше, чем принятый минимум {min}.",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "Выбранная сумма {amount} меньше, чем принятый минимум {min}.",
   "TR_OFFICIAL_LANGUAGES": "Официальные",
   "TR_OK": "OK",
   "TR_ON": "вкл",
@@ -1154,30 +1249,6 @@
   "TR_OTHER_INPUTS_AND_OUTPUTS": "Другие входы и выходы",
   "TR_OUTGOING": "Исходящие",
   "TR_OUTPUTS": "Выходы",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "Минимальная и максимальная сумма, за которую этот пользователь готов продать {symbol}.",
-  "TR_P2P_GET_STARTED_INTRO": "Вам необходимо инициировать транзакцию на сайте {providerName} - внимательно выполните следующие шаги.",
-  "TR_P2P_GET_STARTED_ITEM_1": "Выберите «Перейти на сайт {providerName}» для перенаправления на сайт наших партнеров.",
-  "TR_P2P_GET_STARTED_ITEM_3": "Как только {providerName} попросит у вас «release address», вернитесь сюда и продолжите.",
-  "TR_P2P_GET_STARTED_ITEM_4": "Почти готово! Откройте и скопируйте свой адрес, вставьте его в поле «release address» на сайте {providerName} и завершите транзакцию.",
-  "TR_P2P_GO_TO_PROVIDER": "Перейти на сайт {providerName}",
-  "TR_P2P_INFO": "При использовании технологии {peerToPeer} (P2P) нет необходимости в проверке KYC ни со стороны покупателя, ни со стороны продавца. Все стороны защищены от мошенничества надежным {multisigEscrow}.",
-  "TR_P2P_MODAL_CONFIRM": "Я готов купить",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "Одноранговая покупка {cryptocurrency} с {provider}",
-  "TR_P2P_MODAL_LEGAL_HEADER": "Юридическое уведомление",
-  "TR_P2P_MODAL_SECURITY_HEADER": "Безопасность прежде всего с Вашим Trezor",
-  "TR_P2P_MODAL_TERMS_1": "Вы находитесь здесь, чтобы купить криптовалюту у другого выбранного Вами человека, используя технологию Peer-to-Peer (P2P) без проверки ID. Если Вы попали на этот сайт по какой-либо другой причине, пожалуйста, свяжитесь со службой поддержки, прежде чем продолжить.",
-  "TR_P2P_MODAL_TERMS_2": "Вы понимаете, что операции с криптовалютой необратимы и не подлежат возврату. Таким образом, мошеннические или случайные потери могут быть невозместимы.",
-  "TR_P2P_MODAL_TERMS_4": "Вы понимаете, что Invity не предоставляет эту услугу. Условия компании {provider} регулируют данную услугу.",
-  "TR_P2P_MODAL_TERMS_5": "Вы не используете эту функцию для азартных игр, мошенничества или любого другого нарушения Условий предоставления услуг Invity или провайдера, а также любых применимых нормативных актов.",
-  "TR_P2P_MODAL_TERMS_6": "Вы понимаете, что криптовалюты являются развивающимся финансовым инструментом и что в разных юрисдикциях могут действовать разные нормативные акты. Это может подвергнуть Вас повышенному риску мошенничества, кражи или нестабильности рынка.",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "Проверенные партнеры компании Invity",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "Сделка должна быть завершена в течение этого срока, считая с момента создания контракта на сайте {providerName} .",
-  "TR_P2P_PRICE": "Цена за 1 {symbol}",
-  "TR_P2P_PRICE_TOOLTIP": "{symbol} цена, предложенная этим пользователем.",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "Привет, я использую {providerName}!",
-  "TR_P2P_USER_REPUTATION": "({rating}, {numberOfTrades})",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "Выбранная сумма {amount} выше, чем допустимый максимум {maximum}.",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "Выбранное количество {amount} меньше допустимого минимума {minimum}.",
   "TR_PAGINATION_NEWER": "Новее",
   "TR_PAGINATION_OLDER": "Старше",
   "TR_PASSPHRASE_CASE_SENSITIVE": "Примечание: Кодовая фраза чувствительна к регистру.",
@@ -1332,10 +1403,6 @@
   "TR_SELL_STATUS_ERROR": "Отклонено",
   "TR_SELL_STATUS_PENDING": "В ожидании",
   "TR_SELL_STATUS_SUCCESS": "Одобрено",
-  "TR_SELL_TRANS_ID": "ID транзакции:",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "Максимум составляет {maximum} {currency}",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "Минимум составляет {minimum} {currency}",
-  "TR_SELL_VIEW_DETAILS": "Посмотреть детали",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "Сбережения",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "Аренда",
   "TR_SENDING_SYMBOL": "Отправка {multiple, select, true {нескольких токенов} false {{symbol}} other {{symbol}}}",
@@ -1514,10 +1581,7 @@
   "TR_TO_BTC": "В BTC",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "Чтобы Ваши метки синхронизировались и были доступны на разных устройствах, подключитесь к сервису облачного хранилища.",
   "TR_TO_SATOSHIS": "В sat",
-  "TR_TRADE_BUYS": "покупки",
-  "TR_TRADE_EXCHANGES": "обмены",
   "TR_TRADE_REDIRECTING": "Перенаправление ...",
-  "TR_TRADE_SELLS": "продажи",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "История транзакций недоступна",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "Совет: Вы можете искать среди ID транзакций, адресов, меток, сумм и дат.",
   "TR_TRANSACTIONS_SEARCH_TIP_10": "Совет: Для более сложного поиска можно комбинировать операторы AND (&) и OR (|). Например, <strong>>> 2020-01-01 & < 2020-01-31 | > 2020-12-01 & < 2020-12-31</strong> покажет все транзакции за январь 2020 года или декабрь 2020 года.",
@@ -1552,7 +1616,6 @@
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "Установить правила автоматически",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "Отсутствуют правила udev",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "Неожиданное состояние: {error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "Ваше устройство подключено правильно, но в данный момент Ваш интернет-браузер не может установить с ним связь. Вам необходимо установить Trezor Bridge.",
   "TR_TRY_AGAIN": "Ввести другую кодовую фразу",
   "TR_TXID": "TX ID",
   "TR_TX_CONFIRMATIONS": "{confirmationsCount}х",
diff --git a/packages/suite-data/files/translations/sk.json b/packages/suite-data/files/translations/sk.json
index a6d4b2e4e52..36c83cfcf21 100644
--- a/packages/suite-data/files/translations/sk.json
+++ b/packages/suite-data/files/translations/sk.json
@@ -191,7 +191,6 @@
   "TR_404_GO_TO_DASHBOARD": "Prejsť na ovládací panel",
   "TR_404_TITLE": "Chyba 404: Odkaz nebol nájdený",
   "TR_7D_CHANGE": "7d change",
-  "TR_ABORT": "Abort",
   "TR_ACCESS_HIDDEN_WALLET": "Prístup k skrytej peňaženke",
   "TR_ACCESS_STANDARD_WALLET": "Prístup k štandardnej peňaženke",
   "TR_ACCOUNT_DETAILS_HEADER": "Podrobnosti o účte",
@@ -343,9 +342,7 @@
   "TR_BUG": "Bug",
   "TR_BUMP_FEE": "Bump fee",
   "TR_BUY": "Kúpiť",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "Obchodné transakcie",
   "TR_BUY_BUY": "Kúpiť",
-  "TR_BUY_BUY_AGAIN": "Kúpiť znova",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Potvrdené na Trezor",
   "TR_BUY_DETAIL_ERROR_BUTTON": "Späť do účtu",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "Prejsť na podporu poskytovateľa",
@@ -390,12 +387,10 @@
   "TR_BUY_STATUS_PENDING": "Pending",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "Pending",
   "TR_BUY_STATUS_SUCCESS": "Approved",
-  "TR_BUY_TRANS_ID": "Trans. ID:",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "Maximum is {maximum}",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "Maximum is {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "Minimum is {minimum}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "Minimum is {minimum} {currency}",
-  "TR_BUY_VIEW_DETAILS": "View details",
   "TR_BYTES": "bytes",
   "TR_CAMERA_NOT_RECOGNIZED": "The camera was not recognized.",
   "TR_CAMERA_PERMISSION_DENIED": "Permission to access the camera was denied.",
@@ -414,7 +409,6 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Trezor amount",
   "TR_CHAINED_TXS": "Chained transactions",
   "TR_CHANGELOG": "Changelog",
-  "TR_CHANGELOG_ON_GITHUB": "Changelog on GitHub",
   "TR_CHANGE_ADDRESS_TOOLTIP": "This is a change address created from a previous send.",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "You can change your firmware type in Settings anytime.",
   "TR_CHANGE_HOMESCREEN": "Change homescreen",
@@ -430,8 +424,6 @@
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "Perform a simulated recovery to verify your wallet backup.",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "Enter the words from your wallet backup here in the order displayed on your device. You may be asked to type some words that aren't part of your wallet backup as an additional security measure.",
   "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "Use the two-button pad to enter your wallet backup. By doing this, you're keeping all your sensitive info safe and sound, away from any shady or insecure computer or web browser.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "Your wallet backup is entered using the touchscreen. This avoids exposing any of your sensitive information to a potentially insecure computer or web browser.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "Your wallet backup is entered using the touchscreen. This avoids exposing any of your sensitive information to a potentially insecure computer or web browser.",
   "TR_CHECK_SEED": "Check backup",
   "TR_CHECK_YOUR_DEVICE": "Check your Trezor's screen",
   "TR_CHOOSE_RECOVERY_TYPE": "Choose recovery type",
@@ -484,12 +476,6 @@
   "TR_COINJOIN_TILE_3_DESCRIPTION": "Your bitcoin is always under your control",
   "TR_COINJOIN_TILE_3_TITLE": "Protected by your Trezor",
   "TR_COINJOIN_TRANSACTION_BATCH": "Coinjoin transactions",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "Auto-reloading in",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "Back to Trade",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "Žiadne ponuky",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "Je nám ľúto, ale momentálne nemáme žiadne ponuky z dôvodu problémov s pripojením k serveru.",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "Je nám ľúto, ale momentálne nemáme žiadne ponuky. Skúste znovu načítať stránku alebo zmeňte svoj požiadavok.",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "Obnoviť stránku",
   "TR_COINS": "Crypto",
   "TR_COIN_CONTROL": "Coin control",
   "TR_COIN_CONTROL_TOOLTIP": "Coin control enables manual selection of UTXOs to be used as inputs for a transaction.",
@@ -553,7 +539,6 @@
   "TR_COPY_ADDRESS_POLICY_ID": "Never send funds to a policy ID address.",
   "TR_COPY_AND_CLOSE": "Kopírovať a zavrieť",
   "TR_COPY_SIGNED_MESSAGE": "Skopírovať podpísanú správu",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "Skopírovať",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "Nepodarilo sa načítať zoznam zmien",
   "TR_COULD_NOT_RETRIEVE_DATA": "Nepodarilo sa načítať údaje",
   "TR_COUNT_WALLETS": "{count} {count, plural, one {wallet} other {wallets}}",
@@ -709,7 +694,6 @@
   "TR_DOWNLOADING": "Downloading",
   "TR_DOWNLOAD_LATEST_BRIDGE": "Download latest Bridge {version}",
   "TR_DO_NOT_DISCONNECT_DEVICE": "Don't disconnect your device",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "Do you really want to skip this step?",
   "TR_DROPBOX": "Dropbox",
   "TR_DROPZONE": "Drag and drop file here or click to select from files",
   "TR_DROPZONE_ERROR": "Import failed: {error}",
@@ -789,7 +773,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "Approve only the exact amount required for this swap. You will need to pay an additional fee if you want to make a similar swap again.",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "Zrušenie predchádzajúceho schválenia",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "Perform a transaction that will remove previous approval of contract with {provider}.",
-  "TR_EXCHANGE_BUY": "For",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Confirm on Trezor & send",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "Confirm & Send",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "Vytvoriť schválenie",
@@ -811,8 +794,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "Vaša transakcia bola úspešná.",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "Approved",
   "TR_EXCHANGE_DEX": "Decentralized exchange offer",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "The fees to perform this swap are estimated at {approvalFee} ({approvalFeeFiat}) for approval (if required) and {swapFee} ({swapFeeFiat}) for the swap.",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "No funds remaining for the transaction fees. Please lower the exchange amount to max {symbol} {max}",
   "TR_EXCHANGE_EXTRA_FIELD": "{extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "{extraFieldName} je neplatný",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "{extraFieldDescription}",
@@ -822,7 +803,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "Fixed rates show you exactly how much you'll end up with at the end of the exchange—the amount won't change between when you select the rate and when your transaction is complete. You're guaranteed the amount shown, but these rates are usually less generous, meaning your money won't buy as much crypto.",
   "TR_EXCHANGE_FLOAT": "Ponuka s pohyblivou sadzbou",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "Floating rates mean that the final amount you'll get may change slightly due to fluctuations in the market between when you select the rate and when your transaction is complete. These rates are usually higher, meaning you could end up with more crypto in the end.",
-  "TR_EXCHANGE_PROVIDER": "Poskytovateľ",
   "TR_EXCHANGE_RATE": "Cena",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "Receive account is outside of Suite.",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "This is the specific alphanumeric address that will receive your coins.",
@@ -849,12 +829,9 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "Zadajte číslo.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "Zadajte požadovaný sklz.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "Swap offer amount",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "Prehľad sklzu",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "Tolerancia sklzu",
-  "TR_EXCHANGE_TRANS_ID": "Trans. ID:",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "Use an account ({symbol}) that isn't in Suite",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "Adresa príjemcu",
-  "TR_EXCHANGE_VIEW_DETAILS": "Zobraziť podrobnosti",
   "TR_EXPERIMENTAL_FEATURES": "Experimentálne funkcie",
   "TR_EXPERIMENTAL_FEATURES_ALLOW": "Allow experimental features",
   "TR_EXPERIMENTAL_FEATURES_WARNING": "There is no guarantee of long-term support of these features.",
@@ -1181,7 +1158,6 @@
   "TR_NETWORK_ZCASH": "Zcash",
   "TR_NEW_FEE": "Nový",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "New Trezor Bridge is available.",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "Nový firmvér Trezor je k dispozícii! Aktualizujte svoje zariadenie.",
   "TR_NEXT_UP": "Next",
   "TR_NONCE": "Nonce",
   "TR_NORMAL_ACCOUNTS": "Default accounts",
@@ -1205,10 +1181,6 @@
   "TR_N_MIN": "{n} min",
   "TR_N_TRANSACTIONS": "{value} {value, plural, one {transaction} other {transactions}}",
   "TR_OFF": "off",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "Zvolená suma {currency} {amount} je vyššia ako akceptované maximum {currency} {max}.",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "Zvolená suma {currency} {amount} je vyššia ako akceptované maximum {currency} {max}.",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "Zvolená suma {currency} {amount} je nižšia ako akceptované minimum {currency} {min}.",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "Zvolená suma {currency} {amount} je nižšia ako akceptované minimum {currency} {min}.",
   "TR_OFFICIAL_LANGUAGES": "Official",
   "TR_OK": "OK",
   "TR_ON": "on",
@@ -1265,30 +1237,6 @@
   "TR_OTHER_INPUTS_AND_OUTPUTS": "Other inputs and outputs",
   "TR_OUTGOING": "Outgoing",
   "TR_OUTPUTS": "Outputs",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "The minimum and maximum amount for which this user is willing to sell {symbol}.",
-  "TR_P2P_GET_STARTED_INTRO": "You need to initiate the transaction on {providerName} – make sure to follow the steps below carefully.",
-  "TR_P2P_GET_STARTED_ITEM_1": "Select “Go to {providerName}” to be redirected to our partner’s website.",
-  "TR_P2P_GET_STARTED_ITEM_3": "Once {providerName} asks you for a release address, return here and continue.",
-  "TR_P2P_GET_STARTED_ITEM_4": "Almost there! Reveal and copy your address, paste it into the “Release address” field back on {providerName}, and finalize the transaction.",
-  "TR_P2P_GO_TO_PROVIDER": "Go to {providerName}",
-  "TR_P2P_INFO": "With {peerToPeer} (P2P) technology, there is no KYC verification involved neither on the side of the buyer nor the seller. All parties are protected against fraud by secure {multisigEscrow}.",
-  "TR_P2P_MODAL_CONFIRM": "I’m ready to buy",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "Peer-to-Peer Buy {cryptocurrency} with {provider}",
-  "TR_P2P_MODAL_LEGAL_HEADER": "Legal notice",
-  "TR_P2P_MODAL_SECURITY_HEADER": "Security first with your Trezor",
-  "TR_P2P_MODAL_TERMS_1": "You’re here to buy cryptocurrency from another person you choose using Peer-to-Peer (P2P) technology without ID verification. If you were directed to this site for any other reason, please contact support before proceeding.",
-  "TR_P2P_MODAL_TERMS_2": "You understand that cryptocurrency transactions are irreversible and may not be refunded. Thus, fraudulent or accidental losses may be unrecoverable.",
-  "TR_P2P_MODAL_TERMS_4": "You understand that Invity does not provide this service. {provider}’s terms govern the service.",
-  "TR_P2P_MODAL_TERMS_5": "You're not using this feature for gambling, fraud or any other violation of either Invity’s or the provider's Terms of service, or of any applicable regulations.",
-  "TR_P2P_MODAL_TERMS_6": "You understand that cryptocurrencies are an emerging financial tool and that regulations may vary in different jurisdictions. This may put you at a higher risk of fraud, theft, or market instability.",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "Verified partners by Invity",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "The transaction needs to be completed within this time limit, counting from creating a contract on the {providerName} site.",
-  "TR_P2P_PRICE": "Price for 1 {symbol}",
-  "TR_P2P_PRICE_TOOLTIP": "{symbol} price offered by this user.",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "Hey there, I’m using {providerName}!",
-  "TR_P2P_USER_REPUTATION": "({rating}, {numberOfTrades})",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "The chosen amount of {amount} is higher than the accepted maximum of {maximum}.",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "The chosen amount of {amount} is lower than the accepted minimum of {minimum}.",
   "TR_PAGINATION_NEWER": "Newer",
   "TR_PAGINATION_OLDER": "Older",
   "TR_PASSPHRASE_CASE_SENSITIVE": "Note: Passphrase is case-sensitive.",
@@ -1470,10 +1418,6 @@
   "TR_SELL_STATUS_ERROR": "Rejected",
   "TR_SELL_STATUS_PENDING": "Pending",
   "TR_SELL_STATUS_SUCCESS": "Approved",
-  "TR_SELL_TRANS_ID": "Trans. ID:",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "Maximum is {maximum} {currency}",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "Minimum is {minimum} {currency}",
-  "TR_SELL_VIEW_DETAILS": "View details",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "Savings",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "Rent",
   "TR_SENDING_SYMBOL": "Sending {multiple, select, true {multiple tokens} false {{symbol}} other {{symbol}}}",
@@ -1732,10 +1676,7 @@
   "TR_TO_BTC": "To BTC",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "To make your labels consistent and available on different devices, connect to a cloud storage provider.",
   "TR_TO_SATOSHIS": "To sats",
-  "TR_TRADE_BUYS": "buys",
-  "TR_TRADE_EXCHANGES": "exchanges",
   "TR_TRADE_REDIRECTING": "Presmerovanie ...",
-  "TR_TRADE_SELLS": "predáva",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "História transakcií nie je k dispozícii",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "Tip: Môžete vyhľadávať ID transakcií, adresy, štítky, sumy a dátumy.",
   "TR_TRANSACTIONS_SEARCH_TIP_10": "Tip: Combine AND (&) and OR (|) operators for more complex searches. For example <strong>> {lastYear}-01-01 & < {lastYear}-01-31 | > {lastYear}-12-01 & < {lastYear}-12-31</strong> will show all transactions in January or December {lastYear}.",
@@ -1770,7 +1711,6 @@
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "Automatická inštalácia pravidiel",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "Chýbajúce pravidlá udev",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "Neočakávaný stav: {error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "Vaše zariadenie je správne pripojené, ale váš internetový prehliadač s ním momentálne nemôže komunikovať. Budete musieť nainštalovať most Trezor Bridge.",
   "TR_TRY_AGAIN": "Skúste to znova",
   "TR_TXID": "ID TX",
   "TR_TXID_RBF": "Original TX ID to be replaced",
diff --git a/packages/suite-data/files/translations/tr.json b/packages/suite-data/files/translations/tr.json
index 4b2487e3a4a..8bb0683c922 100644
--- a/packages/suite-data/files/translations/tr.json
+++ b/packages/suite-data/files/translations/tr.json
@@ -1,10 +1,11 @@
 {
   "AMOUNT": "Tutar",
+  "AMOUNT_EXCEEDS_MAX": "Tutar, izin verilen maksimum değer olan {maxAmount}'i aşıyor.",
   "AMOUNT_IS_BELOW_DUST": "Tutar en az {dust} olmalıdır",
   "AMOUNT_IS_LESS_THAN_RESERVE": "Alıcı hesabının etkinleştirilmesi için minimum {reserve} XRP rezervi gerekir",
   "AMOUNT_IS_MORE_THAN_RESERVE": "Tutar, zorunlu harcanamaz rezervin ({reserve} XRP) üzerindedir",
   "AMOUNT_IS_NOT_ENOUGH": "Yeterli fon yok",
-  "AMOUNT_IS_NOT_INTEGER": "Tutar bir tam sayı değil",
+  "AMOUNT_IS_NOT_INTEGER": "Tutar bir tamsayı değil",
   "AMOUNT_IS_NOT_IN_RANGE_DECIMALS": "Maksimum {decimals} ondalık sayıya izin verilir",
   "AMOUNT_IS_NOT_SET": "Tutar ayarlanmamış",
   "AMOUNT_IS_TOO_LOW": "Tutar çok düşük",
@@ -66,8 +67,8 @@
   "LOCKTIME_ADD": "Kilit süresi ekle",
   "LOCKTIME_ADD_TOOLTIP": "Kilit süresi, bir işlemin bir bloğa çıkarılabileceği en erken zamanı belirler.",
   "LOCKTIME_BLOCKHEIGHT": "Kilit süresi blok yüksekliği",
-  "LOCKTIME_IS_NOT_INTEGER": "Kilit süresi bir tam sayı değil",
-  "LOCKTIME_IS_NOT_SET": "Kilit süresi ayarlanmamış",
+  "LOCKTIME_IS_NOT_INTEGER": "Kilitli kalma süresi bir tamsayı değil",
+  "LOCKTIME_IS_NOT_SET": "Kilitli kalma süresi ayarlanmamış",
   "LOCKTIME_IS_TOO_BIG": "Zaman damgası çok büyük",
   "LOCKTIME_IS_TOO_LOW": "Kilit süresi çok düşük",
   "LOCKTIME_SCHEDULE_SEND": "Kilit süresi",
@@ -129,7 +130,7 @@
   "RECIPIENT_SCAN": "Tarama",
   "REFRESH": "Yinele",
   "REMAINING_BALANCE_LESS_THAN_RENT": "Bu tutarı gönderdikten sonra hesabınızda {remainingSolBalance} SOL kalacaktır. Boş olmayan bir hesapta {rent} SOL tutarından yüksek bir bakiye tutulmalıdır.",
-  "REVIEW_AND_SEND_TRANSACTION": "İncele ve Gönder",
+  "REVIEW_AND_SEND_TRANSACTION": "İncele ve gönder",
   "SEND_RAW": "Ham gönder",
   "SEND_RAW_TRANSACTION_TOOLTIP": "İşleminiz için tüm ham verileri kendiniz sağlayabilirsiniz.",
   "SEND_TRANSACTION": "Gönder",
@@ -168,6 +169,7 @@
   "TOAST_PIN_CHANGED": "PIN kodu başarıyla değiştirildi",
   "TOAST_QR_INCORRECT_ADDRESS": "QR kodu bu hesap için geçersiz adres içeriyor",
   "TOAST_QR_INCORRECT_COIN_SCHEME_PROTOCOL": "{coin} hesabı için QR kodu tanımlandı",
+  "TOAST_QR_UNKNOWN_SCHEME_PROTOCOL": "Bilinmeyen protokol şeması: \"{scheme}\". Tekrar deneyin veya adresi manuel olarak girin.",
   "TOAST_RAW_TX_SENT": "İşlem gönderildi. İşlem kimliği: {txid}",
   "TOAST_SETTINGS_APPLIED": "Ayarlar başarıyla değiştirildi",
   "TOAST_SIGN_MESSAGE_ERROR": "Mesaj imzalama hatası: {error}",
@@ -193,7 +195,6 @@
   "TR_404_GO_TO_DASHBOARD": "Panoya git",
   "TR_404_TITLE": "Hata 404: Bağlantı bulunamadı",
   "TR_7D_CHANGE": "7d değişikliği",
-  "TR_ABORT": "Durdur",
   "TR_ACCESS_HIDDEN_WALLET": "Gizli cüzdana eriş",
   "TR_ACCESS_STANDARD_WALLET": "Standart cüzdana eriş",
   "TR_ACCOUNT_DETAILS_HEADER": "Hesap ayrıntıları",
@@ -232,10 +233,16 @@
   "TR_ACCOUNT_TYPE_BIP86_DESC": "Taproot, gizliliği ve ağ verimliliğini artırabilen yeni bir adres türüdür. Bazı hizmetlerin henüz Taproot adreslerini desteklemeyebileceğini unutmayın.",
   "TR_ACCOUNT_TYPE_BIP86_NAME": "Taproot",
   "TR_ACCOUNT_TYPE_BIP86_TECH": "BIP86, P2TR, Bech32m",
+  "TR_ACCOUNT_TYPE_CARDANO_DESC": "Cardano adreslerini oluşturmanın ve yönetmenin mevcut ve en yaygın kabul gören yöntemi, birlikte çalışabilirlik, güvenlik ve tüm token türleri için destek sağlar.",
   "TR_ACCOUNT_TYPE_COINJOIN": "Coinjoin",
+  "TR_ACCOUNT_TYPE_DEFAULT": "Varsayılan",
   "TR_ACCOUNT_TYPE_IMPORTED": "İçe aktarıldı",
   "TR_ACCOUNT_TYPE_LEDGER": "Defter",
+  "TR_ACCOUNT_TYPE_LEDGER_DESC": "Defter (Ledger) hesapları, Ledger'dan Trezor'a sorunsuz geçişe olanak tanıyan Ledger Live türetme yollarıyla uyumludur.",
   "TR_ACCOUNT_TYPE_LEGACY": "Legacy",
+  "TR_ACCOUNT_TYPE_LEGACY_DESC": "Eski (Legacy) hesaplar, Ledger'dan Trezor'a sorunsuz geçişe olanak tanıyan Ledger Legacy türetme yollarıyla uyumludur.",
+  "TR_ACCOUNT_TYPE_NORMAL_EVM_DESC": "{value} adreslerini oluşturmanın ve yönetmenin mevcut ve en yaygın kabul gören yöntemi, birlikte çalışabilirlik, güvenlik ve tüm token türleri için destek sağlar.",
+  "TR_ACCOUNT_TYPE_NORMAL_SOLANA_DESC": "Solana adreslerini oluşturmanın ve yönetmenin mevcut ve en yaygın kabul gören yöntemi, birlikte çalışabilirlik, güvenlik ve SOL ve SPL token'ları için destek sağlar.",
   "TR_ACCOUNT_TYPE_NO_CAPABILITY": "Desteklenmiyor.",
   "TR_ACCOUNT_TYPE_NO_SUPPORT": "Bu hesap türü bu Trezor modelinde desteklenmiyor.",
   "TR_ACCOUNT_TYPE_SEGWIT": "Legacy SegWit",
@@ -249,10 +256,12 @@
   "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_TECH": "BIP44, Base58",
   "TR_ACCOUNT_TYPE_TAPROOT": "Taproot",
   "TR_ACCOUNT_TYPE_UPDATE_REQUIRED": "Bu Hesap Türünü etkinleştirmek için lütfen cihaz bellenimini güncelleyin.",
+  "TR_ACCOUNT_TYPE_XRP_DESC": "XRP, hızlı işlem onayları için bir mutabakat defteri kullanarak geleneksel madenciliğe ihtiyaç duymadan hızlı, düşük maliyetli sınır ötesi ödemeler sağlayan bir dijital para birimidir.",
   "TR_ACQUIRE_DEVICE": "Trezor'u burada kullanın",
   "TR_ACQUIRE_DEVICE_TITLE": "Başka bir oturum çalışıyor",
   "TR_ACTIVATED_COINS": "Coin'ler etkinleştirildi",
   "TR_ACTIVE": "etkin",
+  "TR_ADD": "Ekle",
   "TR_ADDRESSES": "Adres",
   "TR_ADDRESSES_CHANGE": "Adresleri değiştir",
   "TR_ADDRESSES_FRESH": "Yeni adresler",
@@ -262,7 +271,7 @@
   "TR_ADDRESS_MODAL_CLIPBOARD": "Adresi kopyala",
   "TR_ADDRESS_MODAL_TITLE": "{networkName} alma adresi",
   "TR_ADDRESS_MODAL_TITLE_EXCHANGE": "{networkName} ağı üzerinden {networkCurrencyName} alma adresi",
-  "TR_ADDRESS_PHISHING_WARNING": "Kimlik avı saldırılarını önlemek için Trezor'unuzdaki adresi doğrulamalısınız. {claim}",
+  "TR_ADDRESS_PHISHING_WARNING": "Kimlik avı saldırılarını önlemek için Trezor'unuzdaki alma adresini doğrulayın. {claim}",
   "TR_ADD_ACCOUNT": "Hesap ekle",
   "TR_ADD_HIDDEN_WALLET": "Gizli cüzdan ekle",
   "TR_ADD_NETWORK_ACCOUNT": "{network} hesabı ekle",
@@ -289,7 +298,9 @@
   "TR_ALLOW_ANALYTICS": "Veri kullanımı",
   "TR_ALLOW_ANALYTICS_DESCRIPTION": "Tüm veriler kesinlikle anonim tutulur. Yalnızca Trezor Ecosystem'i geliştirmek için kullanılır.",
   "TR_ALLOW_AUTOMATIC_SUITE_UPDATES": "Otomatik Trezor Suite güncellemeleri",
-  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Trezor Suite, en son sürümü arka planda otomatik olarak indirir ve uygulama yeniden başlatılırken yükler. Bu sayede en son özellikler ve güvenlik yamalarıyla her zaman güncel kalırsınız. Güncellemeler izniniz istenmeden gerçekleşir.",
+  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Trezor Suite'in en son sürümünü arka planda otomatik olarak indirin ve uygulamayı yeniden başlatırken yükleyin. Bu sayede en son özellikler ve güvenlik yamalarıyla her zaman güncel kalırsınız. Güncellemeler izniniz istenmeden gerçekleşir.",
+  "TR_ALL_NETWORKS": "Tüm ağlar ({networkCount})",
+  "TR_ALL_NETWORKS_TOOLTIP": "Tüm {networkCount} ağlarındaki token'ları görüntüleyin. En popüler ağlara göre filtreleyin.",
   "TR_ALL_TRANSACTIONS": "İşlemler",
   "TR_AMOUNT_SENT": "Tutar gönderildi",
   "TR_AMOUNT_TOO_BIG_FOR_COINJOIN": "Coinjoin için uygun değil - tutar çok yüksek",
@@ -348,20 +359,20 @@
   "TR_BEFORE_ANY_FURTHER_ACTIONS": "Pek olası olmasa da, bir bellenim güncelleme sorunu olması durumunda cüzdan yedeklemenize erişmeniz gerekebilir.",
   "TR_BIP_SIG_FORMAT": "Trezor",
   "TR_BITCOIN_ONLY_UNAVAILABLE": "{bitcoinOnly}'ye geçmeden önce belleniminizi en son sürüme yükseltmeniz gerekir.",
-  "TR_BREAKING_ANONYMITY_CHECKBOX": "Anonimliğime zarar vereceğimi anlıyorum",
+  "TR_BREAKING_ANONYMITY_CHECKBOX": "Anonimliğime zarar vereceğimi anlıyorum.",
   "TR_BRIDGE": "Trezor Bridge",
   "TR_BRIDGE_DEV_MODE_START": "Trezor Bridge, 21324 numaralı bağlantı noktasında başlatılıyor",
   "TR_BRIDGE_DEV_MODE_STOP": "Trezor Bridge, varsayılan bağlantı noktasında başlatılıyor",
   "TR_BRIDGE_GO_TO_WALLET_DESCRIPTION": "Emin misiniz? Cihazınız aynı anda yalnızca bir uygulama tarafından kullanılabilir. Trezor cihazınızla şu anda başka bir uygulama kullanıyorsanız öncelikle o oturumu sonlandırın.",
   "TR_BRIDGE_NEEDED_DESCRIPTION": "Tarayıcınız desteklenmiyor. En iyi deneyim için Trezor Suite masaüstü uygulamasını arka planda indirip çalıştırın veya WebUSB ile uyumlu, desteklenen bir Chromium tabanlı tarayıcı kullanın.",
   "TR_BRIDGE_REQUESTED_DESCRIPTION": "Başka bir uygulama, Trezor Suite'ten Trezor cihazınıza bağlanmayı talep etti. Trezor Suite'i arka planda açık tutun ve diğer uygulamada işlemi tekrar deneyin.",
+  "TR_BRIDGE_TIP_AUTOSTART": "İpucu: Otomatik başlatma özelliğini etkinleştirin ve Bridge'in her zaman arka planda çalışmasını sağlayın.",
   "TR_BTC_UNITS": "Bitcoin birimleri",
   "TR_BUG": "Hata",
   "TR_BUMP_FEE": "Ücreti artır",
+  "TR_BUMP_FEE_DISABLED_TOOLTIP": "İşlemlerinizi hızlandırmak için kuyrukta bekleyen en eski (nonce'a göre) işlemin ücretini artırın. İşlemler sırayla onaylanmalıdır. <a>Daha fazla bilgi edinin</a>",
   "TR_BUY": "Satın al",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "Alım-satım işlemleri",
   "TR_BUY_BUY": "Satın al",
-  "TR_BUY_BUY_AGAIN": "Tekrar satın al",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Trezor'da onaylandı",
   "TR_BUY_DETAIL_ERROR_BUTTON": "Hesaba geri dön",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "Sağlayıcı destek bölümüne git",
@@ -389,7 +400,7 @@
   "TR_BUY_MODAL_TERMS_1": "Kripto para satın almak için buradasınız. Bu siteye başka bir nedenle yönlendirildiyseniz devam etmeden önce lütfen {provider} destek ekibiyle iletişime geçin.",
   "TR_BUY_MODAL_TERMS_2": "Bu özelliği, doğrudan kişisel kontrolünüz altındaki bir hesaba gönderilecek fonları satın almak için kullanıyorsunuz.",
   "TR_BUY_MODAL_TERMS_3": "Kripto para işlemlerinin geri dönüşü olmadığını ve iade edilemeyeceğini anlıyorsunuz. Bu nedenle, hileli veya kazara oluşan kayıplar telafi edilemez olabilir.",
-  "TR_BUY_MODAL_TERMS_4": "Invity'nin bu hizmeti sağlamadığını anlıyorsunuz. Hizmet, {provider} şartlarına göre yönetilir.",
+  "TR_BUY_MODAL_TERMS_4": "Invity'nin bu hizmeti sağlamadığını anlıyorum. {provider} Hüküm ve Koşullarına tabidir.",
   "TR_BUY_MODAL_TERMS_5": "Bu özelliği kumar, dolandırıcılık veya Invity'nin veya sağlayıcının hizmet şartlarını ya da geçerli düzenlemeleri ihlal etmek için kullanmayacaksınız.",
   "TR_BUY_MODAL_TERMS_6": "Kripto paraların gelişmekte olan bir finansal araç olduğunu ve düzenlemelerin farklı yargı bölgelerinde değişiklik gösterebileceğini anlıyorsunuz. Bu durum sizi daha yüksek dolandırıcılık, hırsızlık veya piyasa istikrarsızlığı riskiyle karşı karşıya bırakabilir.",
   "TR_BUY_MODAL_VERIFIED_PARTNERS_HEADER": "Invity tarafından doğrulanmış iş ortakları",
@@ -406,12 +417,10 @@
   "TR_BUY_STATUS_PENDING": "Beklemede",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "Beklemede",
   "TR_BUY_STATUS_SUCCESS": "Onaylandı",
-  "TR_BUY_TRANS_ID": "İşlem Kimliği:",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "Maksimum {maximum}",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "Maksimum {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "Minimum {minimum}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "Minimum {minimum} {currency}",
-  "TR_BUY_VIEW_DETAILS": "Ayrıntıları görüntüle",
   "TR_BYTES": "bayt",
   "TR_CAMERA_NOT_RECOGNIZED": "Kamera tanınmadı.",
   "TR_CAMERA_PERMISSION_DENIED": "Kameraya erişim izni reddedildi.",
@@ -430,12 +439,12 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Trezor tutarı",
   "TR_CHAINED_TXS": "Zincir işlemler",
   "TR_CHANGELOG": "Değişiklik Günlüğü",
-  "TR_CHANGELOG_ON_GITHUB": "GitHub'da Değişiklik Günlüğü",
   "TR_CHANGE_ADDRESS_TOOLTIP": "Bu, önceki bir gönderimden oluşturulan bir değişiklik adresidir.",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "Bellenim türünüzü istediğiniz zaman Ayarlar'dan değiştirebilirsiniz.",
   "TR_CHANGE_HOMESCREEN": "Ana ekranı değiştir",
   "TR_CHANGE_PIN": "PIN kodunu değiştir",
   "TR_CHANGE_WIPE_CODE": "Silme kodunu değiştir",
+  "TR_CHECKED_BALANCES_ON": "Kontrol edilen bakiyeler",
   "TR_CHECKING_YOUR_DEVICE": "Cihazınız kontrol ediliyor",
   "TR_CHECKSUM_CONVERSION_INFO": "Sağlama toplamına dönüştürüldü. <a>Daha fazla bilgi edinin</a>",
   "TR_CHECK_DEVICE_ORIGIN_DESCRIPTION": "Trezor cihazınızın bütünlüğünü doğrulayarak güvenliğini sağlar ve çipin orijinalliğini onaylarız.",
@@ -447,8 +456,7 @@
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "Kurtarma parolanızı doğrulamak için simüle edilmiş bir kurtarma gerçekleştirin.",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "Kurtarma parolanızdaki kelimeleri cihazınızda görüntülenen sırayla buraya girin. Ek bir güvenlik önlemi olarak kurtarma parolanızın parçası olmayan bazı kelimeleri yazmanız istenebilir.",
   "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "Kurtarma parolanızı (cüzdan yedeklemesi) girmek için iki düğmeli pedi kullanın. Bunu yaparak, tüm hassas bilgilerinizi güvende ve sağlam bir şekilde tutar, herhangi bir şüpheli veya güvenilir olmayan bilgisayar veya web tarayıcısından uzak tutarsınız.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "Kurtarma parolanız (cüzdan yedeklemesi) dokunmatik ekran kullanılarak girilir. Bu, hassas bilgilerinizin potansiyel olarak güvenilir olmayan bir bilgisayara veya web tarayıcısına maruz kalmasını önler.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "Cüzdan yedeklemeniz dokunmatik ekran kullanılarak girilir. Bu, hassas bilgilerinizin potansiyel olarak güvenilir olmayan bir bilgisayara veya web tarayıcısına maruz kalmasını önler.",
+  "TR_CHECK_RECOVERY_SEED_DESC_TOUCHSCREEN": "Cüzdan yedeklemeniz dokunmatik ekran kullanılarak girilir. Bu, hassas bilgilerinizin potansiyel olarak güvenilir olmayan bir bilgisayara veya web tarayıcısına maruz kalmasını önler.",
   "TR_CHECK_SEED": "Yedeklemeyi kontrol et",
   "TR_CHECK_YOUR_DEVICE": "Trezor ekranınızı kontrol edin",
   "TR_CHOOSE_RECOVERY_TYPE": "Kurtarma türünü seçin",
@@ -502,10 +510,37 @@
   "TR_COINJOIN_TILE_3_TITLE": "Trezor'unuz tarafından korunuyor",
   "TR_COINJOIN_TRANSACTION_BATCH": "Coinjoin işlemleri",
   "TR_COINMARKET_BEST_RATE": "En iyi oran",
+  "TR_COINMARKET_BUY_AND_SELL": "Al-Sat",
+  "TR_COINMARKET_BUY_AND_SELL_COUNTER": "{totalBuys, plural, =0 {{totalBuys} alış} one {{totalBuys} alış} other {{totalBuys} alış} } • {totalSells, plural, =0 {{totalSells} satış} one {{totalSells} satış} other {{totalSells} satış} }",
+  "TR_COINMARKET_CEX_TOOLTIP": "Merkezi takas",
+  "TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY": "Tutarı veya para birimini değiştirin.",
   "TR_COINMARKET_COMPARE_OFFERS": "Tüm teklifleri karşılaştır",
   "TR_COINMARKET_COUNTRY": "İkamet edilen ülke",
+  "TR_COINMARKET_DCA_DOWNLOAD": "Bitcoin ile tasarruf etmeye başlamak için Invity mobil uygulamasını indirin",
+  "TR_COINMARKET_DCA_FEATURE_1_DESCRIPTION": "Güvenli ve basit bir gözetim DCA tasarruf planıdır.",
+  "TR_COINMARKET_DCA_FEATURE_1_SUBHEADING": "SatoshiLabs tarafından geliştirilmiştir",
+  "TR_COINMARKET_DCA_FEATURE_2_DESCRIPTION": "Ekstra ücret ödemeden kendi kendine gözetim için para çekin.",
+  "TR_COINMARKET_DCA_FEATURE_2_SUBHEADING": "Ücretsiz para çekme",
+  "TR_COINMARKET_DCA_FEATURE_3_DESCRIPTION": "Hızlı, basit, kullanıcı dostu bir arayüz.",
+  "TR_COINMARKET_DCA_FEATURE_3_SUBHEADING": "Kullanımı kolay",
+  "TR_COINMARKET_DCA_FEATURE_4_DESCRIPTION": "Yatırım geçmişinizi, tutarını ve sıklığını izleyin.",
+  "TR_COINMARKET_DCA_FEATURE_4_SUBHEADING": "DCA'ya Genel Bakış",
+  "TR_COINMARKET_DCA_HEADING": "Invity uygulaması ile Bitcoin ile tasarruf edin",
+  "TR_COINMARKET_DEX_TOOLTIP": "Merkeziyetsiz takas",
   "TR_COINMARKET_ENTER_AMOUNT_IN": "Tutarı {currency} cinsinden gir",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_KYC_ALL": "Tüm KYC seçenekleri",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_NO_KYC": "KYC hiçbir zaman gerekli değildir",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_ALL": "Tüm CEX ve DEX teklifleri",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_DEX": "DEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FIXED_CEX": "Sabit oranlı CEX",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FLOATING_CEX": "Değişken oranlı CEX",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING": "DEX",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING_TOOLTIP": "Merkeziyetsiz bir borsa (DEX), merkezi bir otoriteye veya aracıya ihtiyaç duymadan doğrudan blok zinciri üzerinde kripto alım satımı yapmanızı sağlar.",
+  "TR_COINMARKET_EXCHANGE_FIXED_OFFERS_HEADING": "Sabit oranlı CEX",
+  "TR_COINMARKET_EXCHANGE_FLOAT_OFFERS_HEADING": "Değişken oranlı CEX",
   "TR_COINMARKET_FEATURED_OFFERS_HEADING": "Öne çıkan teklifler",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_BUY_LABEL": "Ödeme:",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_SELL_LABEL": "Alma yöntemi",
   "TR_COINMARKET_FEES_INCLUDED": "Ücretler dahil",
   "TR_COINMARKET_FEES_NOT_INCLUDED": "Ücretler dahil değil",
   "TR_COINMARKET_FEES_ON_WEBSITE": "Gösterilen fiyata bazı ücretler dahil değildir. Son fiyatı sağlayıcının web sitesinde gözden geçirebileceksiniz.",
@@ -518,19 +553,13 @@
   "TR_COINMARKET_KYC_NO_REFUND": "İstisna durumlarında KYC talep edilir. Para iadeleri için KYC gereklidir. 👈",
   "TR_COINMARKET_KYC_POLICY": "KYC politikası",
   "TR_COINMARKET_KYC_POLICY_NEVER_REQUIRED": "KYC hiçbir zaman gerekli değildir",
-  "TR_COINMARKET_KYC_YES_REFUND": "İstisna durumlarında KYC talep edilir. Para iadeleri için KYC gerekli değildir. 🤝",
+  "TR_COINMARKET_KYC_YES_REFUND": "Yalnızca istisnai durumlarda KYC talep edilir. Para iadeleri için KYC gerekli değildir. 🤝",
   "TR_COINMARKET_LAST_TRANSACTIONS": "Son işlemler",
   "TR_COINMARKET_NETWORK_FEE": "Ağ ücreti",
   "TR_COINMARKET_NETWORK_TOKENS": "{networkName} token'ları",
   "TR_COINMARKET_NO_CEX_PROVIDER_FOUND": "CEX sağlayıcısı bulunamadı",
   "TR_COINMARKET_NO_DEX_PROVIDER_FOUND": "DEX sağlayıcısı bulunamadı",
   "TR_COINMARKET_NO_METHODS_AVAILABLE": "Yöntem mevcut değil",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "Otomatik yeniden yükleme:",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "Alım-satım işlemine geri dön",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "Teklif yok",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "Üzgünüz, sunucu bağlantı sorunu nedeniyle şu anda herhangi bir teklifimiz bulunmamaktadır.",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "Üzgünüz, şu anda herhangi bir teklifimiz bulunmamaktadır. Sayfayı yeniden yüklemeyi veya sorunuzu değiştirmeyi deneyin.",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "Sayfayı yeniden yükle",
   "TR_COINMARKET_OFFERS_EMPTY": "Talebiniz için teklif yok. Lütfen ülkeyi veya satın alınan tutarı değiştirin",
   "TR_COINMARKET_OFFERS_REFRESH": "Şunlarda teklifleri yenileme:",
   "TR_COINMARKET_OFFERS_SELECT": "Seç",
@@ -544,9 +573,36 @@
   "TR_COINMARKET_RECEIVE_METHOD": "Alma yöntemi",
   "TR_COINMARKET_SELL": "Sat",
   "TR_COINMARKET_SHOW_OFFERS": "Teklifleri karşılaştır",
+  "TR_COINMARKET_SWAP": "Takas",
+  "TR_COINMARKET_SWAP_AMOUNT": "Takas tutarı",
+  "TR_COINMARKET_SWAP_COUNTER": "{totalSwaps, plural, =0 {{totalSwaps} takas} one {{totalSwaps} takas} other {{totalSwaps} takas} }",
+  "TR_COINMARKET_SWAP_DEX_MODAL_CONFIRM": "Takas yapmaya hazırım",
+  "TR_COINMARKET_SWAP_DEX_MODAL_FOR_YOUR_SAFETY": "{provider} ile {fromCrypto} para biriminden {toCrypto} para birimine takas yap",
+  "TR_COINMARKET_SWAP_DEX_MODAL_LEGAL_HEADER": "Yasal uyarı",
+  "TR_COINMARKET_SWAP_DEX_MODAL_SECURITY_HEADER": "Trezor'unuzla önce güvenlik",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_1": "{provider}'nın sözleşmesini kullanarak DEX (merkeziyetsiz borsa) kullanarak kripto para takası yapmak istiyorum.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_2": "Kendi hesabım için kripto para takası yapmak istiyorum. Sağlayıcının politikalarının kimlik doğrulaması gerektirebileceğini anlıyorum.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_3": "Kripto para işlemlerinin nihai olduğunu ve geri alınamayacağını veya iade edilemeyeceğini anlıyorum. Dolandırıcılık veya hatalardan kaynaklanan kayıplar telafi edilemeyebilir.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4": "Invity'nin bu hizmeti sağlamadığını anlıyorum. {provider} Hüküm ve Koşullarına tabidir.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_5": "Bu özelliği kumar, dolandırıcılık veya Invity'nin veya sağlayıcının Hizmet Şartlarını veya geçerli yasaları ihlal eden herhangi bir faaliyet için kullanmayacağım.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_6": "Kripto paraların gelişmekte olan bir finansal araç olduğunu ve düzenlemelerin bölgeye göre farklılık gösterebileceğini anlıyorum. Bu durum dolandırıcılık, hırsızlık veya piyasa istikrarsızlığı riskini artırabilir.",
+  "TR_COINMARKET_SWAP_DEX_MODAL_VERIFIED_PARTNERS_HEADER": "Invity tarafından doğrulanmış iş ortakları",
+  "TR_COINMARKET_SWAP_MODAL_CONFIRM": "Takas yapmaya hazırım",
+  "TR_COINMARKET_SWAP_MODAL_FOR_YOUR_SAFETY": "{provider} ile {fromCrypto} para biriminden {toCrypto} para birimine takas yap",
+  "TR_COINMARKET_SWAP_MODAL_LEGAL_HEADER": "Yasal uyarı",
+  "TR_COINMARKET_SWAP_MODAL_SECURITY_HEADER": "Trezor'unuzla önce güvenlik",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_1": "Kripto para takası yapmak için buradayım. Bu siteye başka bir nedenle yönlendirildiysem devam etmeden önce Trezor Support ile iletişime geçeceğim. ",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_2": "Kendi hesabım için kripto para takası yapmak istiyorum. Sağlayıcının politikalarının kimlik doğrulaması gerektirebileceğini anlıyorum.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_3": "Kripto para işlemlerinin nihai olduğunu ve geri alınamayacağını veya iade edilemeyeceğini anlıyorum. Dolandırıcılık veya hatalardan kaynaklanan kayıplar telafi edilemeyebilir.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_4": "Invity'nin bu hizmeti sağlamadığını anlıyorum. {provider} Hüküm ve Koşullarına tabidir.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_5": "Bu özelliği kumar, dolandırıcılık veya Invity'nin veya sağlayıcının Hizmet Şartlarını veya geçerli yasaları ihlal eden herhangi bir faaliyet için kullanmayacağım.",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_6": "Kripto paraların gelişmekte olan bir finansal araç olduğunu ve düzenlemelerin bölgeye göre farklılık gösterebileceğini anlıyorum. Bu durum dolandırıcılık, hırsızlık veya piyasa istikrarsızlığı riskini artırabilir.",
+  "TR_COINMARKET_SWAP_MODAL_VERIFIED_PARTNERS_HEADER": "Invity tarafından doğrulanmış iş ortakları",
   "TR_COINMARKET_TOKEN_NETWORK": "{networkName} ağında {tokenName} token'ı",
   "TR_COINMARKET_TRADE_FEE": "Alım satım ücreti",
+  "TR_COINMARKET_TRANS_ID": "İşlem Kimliği:",
   "TR_COINMARKET_UNKNOWN_PROVIDER": "Bilinmeyen sağlayıcı",
+  "TR_COINMARKET_VIEW_DETAILS": "Ayrıntıları görüntüle",
   "TR_COINMARKET_YOUR_BEST_OFFER": "En iyi teklifiniz",
   "TR_COINMARKET_YOU_BUY": "Satın alacağınız tutar:",
   "TR_COINMARKET_YOU_GET": "Alacağınız tutar:",
@@ -571,6 +627,7 @@
   "TR_CONFIRMED_TX": "Onaylandı",
   "TR_CONFIRMING_TX": "İşlem onaylanıyor",
   "TR_CONFIRM_ACTION_ON_YOUR": "Trezor ekranınızdaki talimatları izleyin",
+  "TR_CONFIRM_ADDRESS": "Adresi onayla",
   "TR_CONFIRM_BEFORE_COPY": "Kopyalamadan önce Trezor'da onaylayın",
   "TR_CONFIRM_CONDITIONS": "Devam etmeden önce koşulları onaylayın.",
   "TR_CONFIRM_EMPTY_HIDDEN_WALLET_ON": "\"{deviceLabel}\" cihazında boş Gizli cüzdanı onaylayın.",
@@ -593,13 +650,13 @@
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_BUTTON": "Yönet",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_DESCRIPTION": "Trezor Suite'i açtığınızda parola girişi iletişim kutusunun açılmasını etkinleştirin.",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_TITLE": "Öncelikle bir parola kullanıyor musunuz?",
-  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Alma adresini onaylamak için Trezor'da doğrulayın. Onaylamadan devam etmeniz önerilmez.",
+  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "Alma adresini onaylamak için Trezor'unuzda doğrulayın. Onaylamadan devam etmeniz tavsiye edilmez.",
   "TR_CONNECT_DEVICE_RECEIVE_PROMO_TITLE": "Alma adresi doğrulanamıyor",
   "TR_CONNECT_DEVICE_SEND_PROMO_DESCRIPTION": "Coin göndermek için Trezor'unuzu bağlayın.",
   "TR_CONNECT_DEVICE_SEND_PROMO_TITLE": "Trezor'unuz bağlı değil",
   "TR_CONNECT_TREZOR_TO_SEND_BUTTON": "Göndermek için Trezor'u Bağlayın",
   "TR_CONNECT_YOUR_DEVICE": "Trezor'unuzu bağlayın ve kilidini açın",
-  "TR_CONTACT_SUPPORT": "Destek ekibiyle iletişime geçin",
+  "TR_CONTACT_SUPPORT": "Trezor Support ile iletişime geçin",
   "TR_CONTACT_TREZOR_SUPPORT": "Trezor Support ile iletişime geçin",
   "TR_CONTINUE": "Devam",
   "TR_CONTINUE_ANYWAY": "Yine de devam et",
@@ -619,7 +676,7 @@
   "TR_COPY_ADDRESS_POLICY_ID": "Asla bir politika kimliği adresine fon göndermeyin.",
   "TR_COPY_AND_CLOSE": "Kopyala ve Kapat",
   "TR_COPY_SIGNED_MESSAGE": "İmzalanan mesajı kopyala",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "Kopyala",
+  "TR_COPY_TO_CLIPBOARD": "Kopyala",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "Değişiklik günlüğü alınamadı",
   "TR_COULD_NOT_RETRIEVE_DATA": "Veriler alınamadı",
   "TR_COUNT_WALLETS": "{count} {count, plural, one {cüzdan} other {cüzdanlar}}",
@@ -653,6 +710,7 @@
   "TR_DASHBOARD_ASSET_FAILED": "Varlık doğru yüklenmedi",
   "TR_DASHBOARD_DISCOVERY_ERROR": "Bulma hatası",
   "TR_DASHBOARD_DISCOVERY_ERROR_PARTIAL_DESC": "Hesaplar düzgün yüklenmedi {details}",
+  "TR_DATA": "Veri",
   "TR_DATABASE_UPGRADE_BLOCKED": "Veri tabanı yükseltmesi başka bir uygulama örneği tarafından engellendi",
   "TR_DATA_ANALYTICS_CATEGORY_1": "Platform",
   "TR_DATA_ANALYTICS_CATEGORY_1_ITEM_1": "İşletim sistemi, Trezor modeli, sürümü vb.",
@@ -706,8 +764,13 @@
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT": "Yanlışlıkla önyükleyici modunda mı?",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_BUTTON": "Herhangi bir düğmeye dokunmadan cihazı yeniden bağlayın.",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_TOUCH": "Ekrana dokunmadan cihazı yeniden bağlayın.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED": "Bu cihaz başka bir yerde kullanılıyor.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION": "Bu cihazı şu anda {transportSessionOwner} uygulaması kullanıyor olabilir. Gerekirse cihazın kontrolünü ele alabilirsiniz.",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION_UNKNOWN_APP": "Bu cihazı şu anda başka bir uygulama kullanıyor olabilir. Gerekirse cihazın kontrolünü ele alabilirsiniz.",
   "TR_DEVICE_CONNECTED_WRONG_STATE": "Cihaz yanlış durumda algılandı",
   "TR_DEVICE_DISCONNECTED_DURING_ACTION_DESCRIPTION": "Yedekleme işlemi sırasında Trezor'unuzun bağlantısı kesildi. Cihazınızı silmek ve cüzdan yedekleme işlemini tekrar başlatmak için Cihaz ayarlarındaki fabrika ayarlarına sıfırlama seçeneğini kullanmanızı önemle tavsiye ederiz.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH": "Ürün yazılımı karma kontrolü başarısız oldu. Trezor'unuz sahte olabilir.",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR": "Ürün yazılımı karma kontrolü gerçekleştirilemedi. Trezor'unuz sahte olabilir.",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON": "Kapat",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON_DISABLED": "Aç",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION": "Ürün yazılımı revizyonu kontrolü, önemli bir güvenlik özelliğidir. Bunu açık tutmanızı önemle tavsiye ederiz.",
@@ -726,8 +789,10 @@
   "TR_DEVICE_LABEL_IS_NOT_BACKED_UP": "\"{deviceLabel}\" cihazı yedeklenmedi",
   "TR_DEVICE_LABEL_IS_NOT_CONNECTED": "\"{deviceLabel}\" cihazı bağlı değil",
   "TR_DEVICE_LABEL_IS_UNAVAILABLE": "\"{deviceLabel}\" cihazı kullanılamıyor",
+  "TR_DEVICE_MAYBE_COMPROMISED_HEADING": "Cihaz doğrulaması başarısız",
+  "TR_DEVICE_MAYBE_COMPROMISED_TEXT": "Cihazınızı yeniden bağlayın ve tekrar doğrulamayı deneyin. Sorun devam ederse cihazınızda neler olduğunu ve bundan sonra ne yapmanız gerektiğini öğrenmek için Trezor Support ile iletişime geçin.",
   "TR_DEVICE_NOT_CONNECTED": "Cihaz bağlı değil",
-  "TR_DEVICE_NOT_INITIALIZED": "Trezor kurulmadı",
+  "TR_DEVICE_NOT_INITIALIZED": "Trezor ayarlanmamış",
   "TR_DEVICE_NOT_INITIALIZED_TEXT": "Süreç boyunca size rehberlik edeceğiz ve hemen başlamanızı sağlayacağız.",
   "TR_DEVICE_SECURITY": "Güvenlik",
   "TR_DEVICE_SETTINGS_AFTER_DELAY": "Bekleme süresi",
@@ -788,7 +853,6 @@
   "TR_DOWNLOAD_LATEST_BRIDGE": "En son Bridge sürümünü ({version}) indir",
   "TR_DO_NOT_DISCONNECT_DEVICE": "Cihazınızın bağlantısını kesmeyin",
   "TR_DO_NOT_SHOW_AGAIN": "Bir daha gösterme",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "Bu adım atlansın mı?",
   "TR_DROPBOX": "Dropbox",
   "TR_DROPZONE": "Dosyayı buraya sürükleyip bırakın veya dosyalardan seçmek için tıklayın",
   "TR_DROPZONE_ERROR": "İçe aktarma başarısız: {error}",
@@ -809,13 +873,13 @@
   "TR_EARLY_ACCESS_ENABLE": "Katıl",
   "TR_EARLY_ACCESS_ENABLED": "Erken Erişim Programı etkinleştirildi",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM": "Programa katıl",
-  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "Bunun, Suite'in normal çalışmasını etkileyebilecek hatalar içerebilen ön sürüm yazılımı test etmemi sağladığını anlıyorum.",
+  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "Bunun, Trezor Suite'in normal çalışmasını etkileyebilecek hatalar içerebilen ön sürüm yazılımı test etmemi sağladığını anlıyorum.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_DESCRIPTION": "İstediğiniz zaman kapatabilirsiniz.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TITLE": "Genel kullanıma sunulmadan önce en son ürün özelliklerini deneyin.",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TOOLTIP": "Önce yukarıdaki alanı kontrol edin",
   "TR_EARLY_ACCESS_JOINED_DESCRIPTION": "Beta güncellemelerini şimdi veya bir sonraki sürümde kontrol edebilirsiniz.",
   "TR_EARLY_ACCESS_JOINED_TITLE": "Erken Erişim Programı etkinleştirildi",
-  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "Suite'in en son kararlı sürümüne geçmek için lütfen \"Kararlı sürümü indir\" seçeneğine tıklayın ve uygulamayı yeniden yükleyin.",
+  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "Trezor Suite'in en son kararlı sürümüne geçmek için \"Kararlı sürümü indir\" seçeneğine tıklayın ve uygulamayı yeniden yükleyin.",
   "TR_EARLY_ACCESS_LEFT_TITLE": "Erken Erişim Programından ayrıldınız. Beta sürümler artık sunulmamaktadır.",
   "TR_EARLY_ACCESS_MENU": "Erken Erişim Programı",
   "TR_EARLY_ACCESS_REINSTALL": "Kararlı sürümü indir",
@@ -870,7 +934,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "Yalnızca bu takas için gereken tam tutarı onaylayın. Benzer bir takası tekrar yapmak isterseniz ek bir ücret ödemeniz gerekir.",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "Önceki onayı iptal et",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "{provider} ile yapılan sözleşmenin önceki onayını kaldıracak bir işlem gerçekleştirin.",
-  "TR_EXCHANGE_BUY": "Şunun için:",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Trezor'da onayla ve gönder",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "Onayla ve Gönder",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "Onay oluştur",
@@ -892,8 +955,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "İşleminiz başarılı oldu.",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "Onaylandı",
   "TR_EXCHANGE_DEX": "Merkeziyetsiz borsa arzı",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "Bu takası gerçekleştirme ücretleri onay için {approvalFee} ({approvalFeeFiat}) (gerekirse), takas için ise {swapFee} ({swapFeeFiat}) olarak tahmin edilmektedir.",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "İşlem ücretleri için fon kalmadı. Lütfen takas tutarını maksimum {max} {symbol} tutarına düşürün",
   "TR_EXCHANGE_EXTRA_FIELD": "{extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "{extraFieldName} geçersizdir",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "{extraFieldDescription}",
@@ -903,7 +964,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "Sabit oranlar, takasın sonunda elinize tam olarak ne kadar geçeceğini gösterir; oranı seçtiğiniz zaman ile işleminizin tamamlandığı zaman arasında tutar değişmez. Gösterilen tutar size garanti edilir ancak bu oranlar genellikle daha az cömerttir, yani paranız çok fazla kripto satın almaz.",
   "TR_EXCHANGE_FLOAT": "Değişken oranlı teklif",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "Değişken oranlar, oranı seçtiğiniz zaman ile işleminizin tamamlandığı zaman arasında piyasadaki dalgalanmalar nedeniyle alacağınız nihai tutarın biraz değişebileceği anlamına gelir. Bu oranlar genellikle daha yüksektir, yani sonuçta daha fazla kripto elde edebilirsiniz.",
-  "TR_EXCHANGE_PROVIDER": "Sağlayıcı",
   "TR_EXCHANGE_RATE": "Fiyat",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "Alma hesabı Suite dışında.",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "Bu, coin'lerinizin alınacağı belirli alfasayısal adrestir.",
@@ -930,23 +990,16 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "Lütfen bir sayı girin.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "İstediğiniz kayma değerini girin.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "Takas teklif tutarı",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "Kayma özeti",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "Kayma toleransı",
-  "TR_EXCHANGE_TRANS_ID": "İşlem Kimliği:",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "Suite'te olmayan bir hesap ({symbol}) kullanın",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "Alma adresi",
-  "TR_EXCHANGE_VIEW_DETAILS": "Ayrıntıları görüntüle",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE": "Otomatik Trezor Suite güncellemeleri",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION": "Trezor Suite, en son sürümü arka planda otomatik olarak indirir ve uygulama yeniden başlatılırken yükler. Bu sayede en son özellikler ve güvenlik yamalarıyla her zaman güncel kalırsınız. Güncellemeler izniniz istenmeden gerçekleşir.",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN": "BNB Smart Chain",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON": "Geçmiş dahili işlemler olmadan BNB Smart Chain'i etkinleştirin.",
   "TR_EXPERIMENTAL_FEATURES": "Deneysel",
   "TR_EXPERIMENTAL_FEATURES_ALLOW": "Deneysel özellikler",
   "TR_EXPERIMENTAL_FEATURES_WARNING": "Yalnızca deneyimli kullanıcılara yöneliktir. Riski üstlenerek kullanın. Bu özellikler test aşamasında olup istikrarsız olabilir ve bunlar için uzun vadede destek sunulmayabilir.",
   "TR_EXPERIMENTAL_PASSWORD_MANAGER": "Dropbox şifrelerini taşı",
-  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Dropbox üzerinde saklanan ve Trezor tarafından güvence altına alınan şifreleri almaya yönelik bir yardımcı program. Trezor Password Manager'ın eski Chrome uzantısının kullanıcıları için tasarlanmıştır.",
+  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "Dropbox'ta saklanan ve Trezor tarafından güvence altına alınan şifreleri almak için bu yardımcı programı kullanın. Trezor Password Manager Chrome uzantısının eski kullanıcıları için tasarlanmıştır.",
   "TR_EXPERIMENTAL_TOR_SNOWFLAKE": "Tor Snowflake",
-  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Tor Snowflake, sansürlü web sitelerine ve uygulamalara erişim sağlayan bir sistemdir.",
+  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Kısıtlamaları aşmak için tasarlanmış bir sistem olan Tor Snowflake'i kullanarak sansürlü web sitelerine ve uygulamalara erişin.",
   "TR_EXPORT_AS": "{as} olarak dışa aktar ",
   "TR_EXPORT_FAIL": "Dışa aktarma başarısız.",
   "TR_EXPORT_TO_FILE": "Dosyaya aktar",
@@ -984,6 +1037,7 @@
   "TR_FIRMWARE_NEW_FW_DESCRIPTION": "Yeni bellenim şimdi mevcut. Cihazınızı şimdi güncelleyin veya daha sonra yapmayı seçin.",
   "TR_FIRMWARE_REINSTALL_FW_DESCRIPTION": "Cihazınız zaten en son bellenime güncellenmiştir. Gerekirse bellenimi yeniden yükleyebilirsiniz.",
   "TR_FIRMWARE_REVISION_CHECK_FAILED": "Ürün yazılımı revizyonu kontrolü başarısız oldu. Trezor'unuz sahte olabilir.",
+  "TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR": "Bellenim revizyonu kontrolü gerçekleştirilemedi.",
   "TR_FIRMWARE_STATUS_INSTALLATION_COMPLETED": "Tamamlandı",
   "TR_FIRMWARE_SUBHEADING_BITCOIN": "Yalnızca Bitcoin işlemlerini destekleyen hafif bellenim.",
   "TR_FIRMWARE_SUBHEADING_NONE": "Trezor'unuz bellenimi olmadan gönderilir. Cihazınızı güvenle kullanabilmek için en son bellenimi yükleyin. Bitcoin-only kullanıcılarının, <button>{bitcoinOnly} bellenimi</button> yüklemelerini öneririz.",
@@ -1021,7 +1075,7 @@
   "TR_GOT_IT_BUTTON": "Anladım",
   "TR_GO_TO_ONBOARDING": "Kuruluma başla",
   "TR_GO_TO_SETTINGS": "Ayarlara git",
-  "TR_GO_TO_SUITE": "Suite'e eriş",
+  "TR_GO_TO_SUITE": "Trezor Suite'e gidin",
   "TR_GRAPH_LINEAR": "Doğrusal",
   "TR_GRAPH_LOGARITHMIC": "Logaritmik",
   "TR_GRAPH_MISSING_DATA": "XRP, SOL ve tüm token tutarları portföy bakiyesinde yer alır ancak şu anda grafik görünümünde desteklenmemektedir.",
@@ -1040,7 +1094,7 @@
   "TR_GUIDE_FORUM": "Trezor Forumu",
   "TR_GUIDE_FORUM_LABEL": "Trezor topluluğu ile bağlantı kurun",
   "TR_GUIDE_SUGGESTION_LABEL": "Ne durumdayız?",
-  "TR_GUIDE_SUPPORT": "Destek ekibiyle iletişime geçin",
+  "TR_GUIDE_SUPPORT": "Trezor Support ile iletişime geçin",
   "TR_GUIDE_SUPPORT_AND_FEEDBACK": "Destek ve Geri Bildirim",
   "TR_GUIDE_VIEW_HEADLINES_SUPPORT_FEEDBACK_SELECTION": "Destek ve Geri Bildirim",
   "TR_GUIDE_VIEW_HEADLINE_HELP_US_IMPROVE": "İyileştirmemize yardımcı olun",
@@ -1172,7 +1226,7 @@
   "TR_LOCAL_FILE_SYSTEM": "Yerel dosya sistemi",
   "TR_LOG": "Uygulama günlüğü",
   "TR_LOGIN_PROCEED": "Devam et",
-  "TR_LOG_DESCRIPTION": "Günlük, Trezor Suite hakkında gerekli tüm teknik bilgileri içerir. Trezor Support ile bağlantı kurarken gerekli olabilir.",
+  "TR_LOG_DESCRIPTION": "Bu günlük, Trezor Suite hakkında önemli teknik bilgiler içerir ve Trezor Support ile iletişime geçerken gerekli olabilir.",
   "TR_LOOKING_FOR_COINJOIN_ROUND": "Tur bekleniyor",
   "TR_LOW_ANONYMITY_WARNING": "<red>Çok düşük gizlilik.</red> Bu eşiğin altındaki herhangi bir şey gizli olmadığından, en az 5'te 1'i kullanmanızı öneririz.",
   "TR_LTC_ADDRESS_INFO": "Litecoin adres biçimini değiştirdi. Adresinizi nasıl dönüştüreceğiniz hakkında daha fazla bilgiyi blogumuzda bulabilirsiniz. {TR_LEARN_MORE}",
@@ -1202,6 +1256,7 @@
   "TR_MULTI_SHARE_BACKUP_EXPLANATION_2": "Mevcut yedeklemeniz hâlâ fonlarınızı kurtarmanıza izin verir. Çok Paylaşımlı Yedekleme paylaşımlarınızdan ayrı olarak, güvenli ve emniyetli bir yerde saklayın.",
   "TR_MULTI_SHARE_BACKUP_GREAT": "Harika!",
   "TR_MULTI_SHARE_BACKUP_IN_PROGRESS": "Çok Paylaşımlı Yedekleme oluşturma işlemi devam ediyor",
+  "TR_MULTI_SHARE_BACKUP_IN_PROGRESS_DESCRIPTION": "Devam etmeden önce Çoklu Paylaşım Yedekleme paylaşımlarınızı oluşturmayı bitirmeniz gerekir. Trezor'unuzun ekranındaki talimatları izleyin.",
   "TR_MULTI_SHARE_BACKUP_IN_PROGRESS_HEADING": "Tekrar hoş geldiniz! Kaldığınız yerden devam edelim.",
   "TR_MULTI_SHARE_BACKUP_LOST_YOUR_BACKUP": "Cüzdan yedeklemenizi mi kaybettiniz?",
   "TR_MULTI_SHARE_BACKUP_LOST_YOUR_BACKUP_INFO_TEXT": "Cüzdanınızı kurtarmak için hiçbir seçenek olmayabilir. Trezor Support ile iletişime geçin.",
@@ -1222,6 +1277,7 @@
   "TR_MY_PORTFOLIO": "Portföy",
   "TR_NAV_ANONYMIZE": "Coin'leri özel yap",
   "TR_NAV_BUY": "Satın al",
+  "TR_NAV_DCA": "DCA",
   "TR_NAV_DETAILS": "Ayrıntılar",
   "TR_NAV_RECEIVE": "Al",
   "TR_NAV_SELL": "Sat",
@@ -1263,6 +1319,7 @@
   "TR_NETWORK_LITECOIN": "Litecoin",
   "TR_NETWORK_NAMECOIN": "Namecoin",
   "TR_NETWORK_NEM": "NEM",
+  "TR_NETWORK_OP": "Optimizm",
   "TR_NETWORK_POLYGON": "Polygon PoS",
   "TR_NETWORK_SOLANA_DEVNET": "Solana Devnet",
   "TR_NETWORK_SOLANA_MAINNET": "Solana",
@@ -1275,9 +1332,10 @@
   "TR_NETWORK_ZCASH": "Zcash",
   "TR_NEW_FEE": "Yeni",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "Yeni Trezor Bridge mevcut.",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "Yeni Trezor bellenimi mevcut! Lütfen cihazınızı güncelleyin.",
   "TR_NEXT_UP": "Sonraki",
   "TR_NONCE": "Nonce",
+  "TR_NON_ASCII_CHAR": "{label} (tavsiye edilmeyen \"{char}\" ile)",
+  "TR_NON_ASCII_CHARS": "{label} (tavsiye edilmeyen karakterlerle)",
   "TR_NORMAL_ACCOUNTS": "Varsayılan hesaplar",
   "TR_NORTH": "Kuzey",
   "TR_NOTHING_TO_ANONYMIZE": "Özel yapılacak bir şey yok",
@@ -1295,16 +1353,12 @@
   "TR_NO_PASSPHRASE_WALLET": "Standart cüzdan",
   "TR_NO_SEARCH_RESULTS": "Arama kriteriniz için sonuç yok",
   "TR_NO_SPENDABLE_UTXOS": "Hesabınızda harcanabilir UTXO bulunmamaktadır.",
-  "TR_NO_TRANSPORT": "Tarayıcı, cihaz ile iletişim kuramıyor",
+  "TR_NO_TRANSPORT": "Tarayıcınız, cihazınız ile iletişim kuramıyor",
   "TR_NO_TRANSPORT_DESKTOP": "Uygulama, cihaz ile iletişim kuramıyor",
   "TR_NUM_ACCOUNTS_FIAT_VALUE": "{accountsCount} {accountsCount, plural, one {hesap} other {hesaplar}} • {fiatValue}",
   "TR_N_MIN": "{n} min.",
   "TR_N_TRANSACTIONS": "{value} {value, plural, one {işlem} other {işlemler}}",
   "TR_OFF": "kapalı",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "Seçilen {amount} tutarı, kabul edilen maksimum değer olan {max} değerinden yüksektir.",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "Seçilen {amount} tutarı, kabul edilen maksimum değer olan {max} değerinden yüksektir.",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "Seçilen {amount} tutarı, kabul edilen minimum değer olan {min} değerinden düşüktür.",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "Seçilen {amount} tutarı, kabul edilen minimum değer olan {min} değerinden düşüktür.",
   "TR_OFFICIAL_LANGUAGES": "Resmi",
   "TR_OK": "Tamam",
   "TR_ON": "açık",
@@ -1363,40 +1417,18 @@
   "TR_OTHER_INPUTS_AND_OUTPUTS": "Diğer girdi ve çıktılar",
   "TR_OUTGOING": "Giden",
   "TR_OUTPUTS": "Çıktılar",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "Bu kullanıcının {symbol} satmaya istekli olduğu minimum ve maksimum tutar.",
-  "TR_P2P_GET_STARTED_INTRO": "İşlemi şurada başlatmanız gerekir: {providerName}. Aşağıdaki adımları dikkatlice izlediğinizden emin olun.",
-  "TR_P2P_GET_STARTED_ITEM_1": "İş ortağımızın web sitesine yönlendirilmek için \"Şuraya git: {providerName}\" öğesini seçin.",
-  "TR_P2P_GET_STARTED_ITEM_3": "{providerName} sizden bir çıkış adresi istediğinde, buraya geri dönün ve devam edin.",
-  "TR_P2P_GET_STARTED_ITEM_4": "Neredeyse bitti! Adresinizi açın ve kopyalayın, {providerName}'daki \"Çıkış adresi\" alanına yapıştırın ve işlemi tamamlayın.",
-  "TR_P2P_GO_TO_PROVIDER": "Şuraya git: {providerName}",
-  "TR_P2P_INFO": "{peerToPeer} (P2P) teknolojisiyle ne alıcı ne de satıcı tarafında herhangi bir KYC doğrulaması söz konusu değildir. Tüm taraflar güvenli {multisigEscrow} ile dolandırıcılığa karşı korunur.",
-  "TR_P2P_MODAL_CONFIRM": "Satın almaya hazırım",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "{provider} ile Eşler Arası {cryptocurrency} Satın Alma",
-  "TR_P2P_MODAL_LEGAL_HEADER": "Yasal uyarı",
-  "TR_P2P_MODAL_SECURITY_HEADER": "Trezor'unuzla önce güvenlik",
-  "TR_P2P_MODAL_TERMS_1": "Kimlik doğrulaması olmadan Eşler Arası (P2P) teknolojisini kullanarak seçtiğiniz başka bir kişiden kripto para satın almak için buradasınız. Bu siteye başka bir nedenle yönlendirildiyseniz devam etmeden önce lütfen destek ekibiyle iletişime geçin.",
-  "TR_P2P_MODAL_TERMS_2": "Kripto para işlemlerinin geri dönüşü olmadığını ve iade edilemeyeceğini anlıyorsunuz. Bu nedenle, hileli veya kazara oluşan kayıplar telafi edilemez olabilir.",
-  "TR_P2P_MODAL_TERMS_4": "Invity'nin bu hizmeti sağlamadığını anlıyorsunuz. Hizmet, {provider} şartlarına göre yönetilir.",
-  "TR_P2P_MODAL_TERMS_5": "Bu özelliği kumar, dolandırıcılık veya Invity'nin veya sağlayıcının hizmet şartlarını ya da geçerli düzenlemeleri ihlal etmek için kullanmayacaksınız.",
-  "TR_P2P_MODAL_TERMS_6": "Kripto paraların gelişmekte olan bir finansal araç olduğunu ve düzenlemelerin farklı yargı bölgelerinde değişiklik gösterebileceğini anlıyorsunuz. Bu durum sizi daha yüksek dolandırıcılık, hırsızlık veya piyasa istikrarsızlığı riskiyle karşı karşıya bırakabilir.",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "Invity tarafından doğrulanmış iş ortakları",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "İşlemin, {providerName} sitesinde bir sözleşme oluşturulmasından itibaren sayılan bu süre içinde tamamlanması gerekir.",
-  "TR_P2P_PRICE": "1 {symbol} için fiyat",
-  "TR_P2P_PRICE_TOOLTIP": "Bu kullanıcı tarafından sunulan {symbol} fiyatı.",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "Merhaba, ben {providerName} kullanıyorum!",
-  "TR_P2P_USER_REPUTATION": "({rating}, {numberOfTrades})",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "Seçilen {amount} tutarı, kabul edilen maksimum değer olan {maximum} değerinden yüksektir.",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "Seçilen {amount} tutarı, kabul edilen minimum değer olan {minimum} değerinden düşüktür.",
   "TR_PAGINATION_NEWER": "Daha yeni",
   "TR_PAGINATION_OLDER": "Daha eski",
   "TR_PASSPHRASE_CASE_SENSITIVE": "Not: Parola büyük/küçük harfe duyarlıdır.",
   "TR_PASSPHRASE_DESCRIPTION_ITEM1": "Öncelikle bir parolanın nasıl çalıştığını öğrenmek önemlidir",
   "TR_PASSPHRASE_DESCRIPTION_ITEM2": "Bir parola, bu kelime grubu ile korunan bir cüzdanı açar",
-  "TR_PASSPHRASE_DESCRIPTION_ITEM3": "Trezor support dahil hiç kimse onu kurtaramaz",
+  "TR_PASSPHRASE_DESCRIPTION_ITEM3": "Trezor Support dahil hiç kimse onu kurtaramaz",
   "TR_PASSPHRASE_HIDDEN_WALLET": "Gizli cüzdan",
   "TR_PASSPHRASE_MISMATCH": "Parola uyumsuzluğu",
   "TR_PASSPHRASE_MISMATCH_DESCRIPTION": "Parolalar birbiriyle uyumlu değil. Güvenlik için baştan başlayın ve doğru şekilde girin.",
   "TR_PASSPHRASE_MISMATCH_START_OVER": "Baştan başla",
+  "TR_PASSPHRASE_NON_ASCII_CHARS": "<code>ABC</code>, <code>abc</code>, <code>123</code>, <code>boşluk</code> veya <code>bu özel karakterleri</code> kullanmanızı öneririz",
+  "TR_PASSPHRASE_NON_ASCII_CHARS_WARNING": "Listelenmemiş özel karakterlerin kullanılması gelecekteki uyumluluğu riske atar",
   "TR_PASSPHRASE_TOO_LONG": "Parola uzunluğu izin verilen sınırı aşıyor.",
   "TR_PASSPHRASE_WALLET": "Gizli cüzdan #{id}",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT": "Parolanın nasıl çalıştığını öğrenin",
@@ -1438,15 +1470,30 @@
   "TR_PIN_SUBHEADING": "Güçlü bir PIN kodu kullanmak Trezor'unuzu yetkisiz fiziksel erişime karşı korur.",
   "TR_PLAY_IT_SAFE": "Güvende olalım",
   "TR_PLEASE_ALLOW_YOUR_CAMERA": "Lütfen QR kodlarını taramak için kameranızı etkinleştirin.",
-  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Doğrulama işlemine devam etmek için lütfen cihazınızı bağlayın.",
+  "TR_PLEASE_CONNECT_YOUR_DEVICE": "Doğrulama işlemine devam etmek için Trezor'unuzu bağlayın.",
   "TR_PLEASE_ENABLE_PASSPHRASE": "Doğrulama işlemine devam etmek için lütfen parola özelliğini etkinleştirin.",
   "TR_POLICY_ID_ADDRESS": "Politika kimliği:",
   "TR_PRIMARY_FIAT": "Fiat para birimi",
   "TR_PRIVATE": "Özel",
   "TR_PRIVATE_DESCRIPTION": "En azından {targetAnonymity} gizliliği",
+  "TR_PROCEED_UNVERIFIED_ADDRESS": "Doğrulanmamış adresle devam et",
   "TR_PROMO_BANNER_DASHBOARD": "<rest>Kriptonuzu güvenli bir şekilde yönetmek için <underline>en kullanışlı</underline> donanım cüzdanı<rest>",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM": "Taramadan önce Trezor'da onaylayın",
   "TR_QR_RECEIVE_ADDRESS_CONFIRM_EXPLANATION": "Güvenilir ekranı ele geçirilemeyeceğinden, lütfen önce Trezor cihazınızdaki alma adresini onaylayın.",
+  "TR_QUICK_ACTION_DEBUG_EAP_EXPERIMENTAL_ENABLED": "Etkin",
+  "TR_QUICK_ACTION_TOOLTIP_JUST_UPDATED": "Az önce güncellendi ({currentVersion})",
+  "TR_QUICK_ACTION_TOOLTIP_RESTART_TO_UPDATE": "Güncellemek için yeniden başlat",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_DEVICE": "Trezor cihazı",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_SUITE": "Trezor Suite",
+  "TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE": "Güncelleme mevcut ({newVersion})",
+  "TR_QUICK_ACTION_TOOLTIP_UP_TO_DATE": "Güncel ({currentVersion})",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED": "Trezor Suite yeni bir güncelleme indirdi.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED": "Trezor Suite güncellendi.",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE": "Trezor Suite güncellemesi şimdi mevcut",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE": "Yeniden başlat ve güncelle",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE": "Güncellemeyi başlat",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE": "Trezor güncellemesi şimdi mevcut",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW": "Yenilikler",
   "TR_RANDOM_SEED_WORDS_DISCLAIMER": "Kurtarma parolanızın bir parçası olmayan bazı kelimeler yazmanız istenebilir.",
   "TR_RANGE": "aralık",
   "TR_READ_AND_UNDERSTOOD": "Yukarıdakileri okudum ve anladım",
@@ -1498,7 +1545,7 @@
   "TR_SAFETY_CHECKS_MODAL_TITLE": "Güvenlik kontrolleri",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL": "İstem",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL_DESC": "Trezor'unuzda manuel olarak onaylayarak anahtarları uyumsuz hale getirmek veya aşırı ücretlere izin vermek gibi potansiyel olarak güvenli olmayan eylemlere izin verin.",
-  "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "Ne yaptığınızı bilmiyorsanız bunu değiştirmeyin!",
+  "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "Bunu sadece ne yaptığınızı biliyorsanız değiştirin!",
   "TR_SAFETY_CHECKS_STRICT_LEVEL": "Sıkı",
   "TR_SAFETY_CHECKS_STRICT_LEVEL_DESC": "Tam Trezor güvenliği.",
   "TR_SCAN_QR_CODE": "QR kodunu tara",
@@ -1508,9 +1555,10 @@
   "TR_SEARCH_TRANSACTIONS": "İşlem ara",
   "TR_SEARCH_UTXOS": "Belirli bir adresi, işlem kimliğini veya etiketi arayın",
   "TR_SECURITY_CHECKPOINT_GOT_SEED": "Cüzdan yedeklemeniz var mı?",
+  "TR_SECURITY_CHECK_HOLOGRAM": "Hologramlar ve güvenlik mühürleri de dahil olmak üzere cihaz ambalajlarının zaman içinde güncellendiğini lütfen unutmayın. Ambalaj ayrıntılarını <packaging>buradan</packaging> doğrulayabilirsiniz. Cihazınızın resmi Trezor Shop'dan veya <reseller>güvenilir satıcılarımızdan</reseller> birinden satın alındığından emin olun. Aksi takdirde, cihazınızın sahte olma riski vardır. Cihazınızın orijinal olmadığından şüpheleniyorsanız lütfen <destek>Trezor Support</support> ile iletişime geçin.",
   "TR_SECURITY_FEATURES_COMPLETED_N": "Güvenlik ({n}/{m})",
-  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "Parolasız modda ayarlanmış cihazlar Trezor Suite'e erişemez. Bunun amacı, yanlış amaçla yanlış ayarlanmış bir cihaz kullanıldığında meydana gelen, geri dönüşü olmayan coin kaybını önlemektir.",
-  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE": "Parolasız kurulum Trezor Suite tarafından desteklenmez",
+  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "Parolasız modda ayarlanmış cihazlar, bir cihazın yanlış kullanılması durumunda oluşabilecek geri dönüşü olmayan coin kaybını önlemek için Trezor Suite'e erişemez.",
+  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE": "Parolasız kurulum Trezor Suite'te desteklenmez",
   "TR_SEED_BACKUP_LENGTH": "Kurtarma parolanız 12, 18 veya 24 kelime içerebilir.",
   "TR_SEED_BACKUP_LENGTH_INCLUDING_SHAMIR": "Kurtarma parolanız 12, 18, 20, 24 veya 33 kelime içerebilir.",
   "TR_SEED_CHECK_FAIL_TITLE": "Kurtarma parolası kontrolü başarısız",
@@ -1520,12 +1568,15 @@
   "TR_SEED_WORDS_ENTER_COMPUTER": "Kurtarma parolanızdaki kelimeleri Trezor'unuzda görüntülenen sırayla girin.",
   "TR_SEED_WORDS_ENTER_TOUCHSCREEN": "Dokunmatik ekranı kullanarak, tamamlanıncaya kadar tüm kelimeleri doğru sırada girin.",
   "TR_SEE_DETAILS": "Ayrıntıları gör",
+  "TR_SEE_IF_ISSUE_PERSISTS": "Sorunun devam edip etmediğine bakın.",
   "TR_SELECTED": "{amount} seçildi",
   "TR_SELECT_COIN_FOR_SETTINGS": "Ayarları değiştirmek için etkin coin'i seçin",
   "TR_SELECT_DEVICE": "Cihaz seç",
+  "TR_SELECT_NAME_OR_ADDRESS": "Ad, sembol, ağ veya sözleşme adresine göre arama yapın",
   "TR_SELECT_NUMBER_OF_WORDS": "Kurtarma parolanızdaki kelime sayısını seçin",
   "TR_SELECT_PASSPHRASE_SOURCE": "\"{deviceLabel}\" üzerinde parolanın girileceği yeri seçin.",
   "TR_SELECT_RECOVERY_METHOD": "Kurtarma yöntemi seç",
+  "TR_SELECT_TOKEN": "Token seçin",
   "TR_SELECT_TREZOR": "Trezor'u seç",
   "TR_SELECT_TREZOR_TO_CONTINUE": "Devam etmek için Trezor'unuzu seçin.",
   "TR_SELECT_TYPE": "Tür seç",
@@ -1556,7 +1607,7 @@
   "TR_SELL_MODAL_FOR_YOUR_SAFETY": "{provider} ile {cryptocurrency} sat",
   "TR_SELL_MODAL_LEGAL_HEADER": "Yasal uyarı",
   "TR_SELL_MODAL_SECURITY_HEADER": "Trezor'unuzla önce güvenlik",
-  "TR_SELL_MODAL_TERMS_1": "Kripto para satmak için buradasınız. Bu siteye başka bir nedenle yönlendirildiyseniz devam etmeden önce lütfen destek ekibiyle iletişime geçin.",
+  "TR_SELL_MODAL_TERMS_1": "Kripto para satmak için buradasınız. Bu siteye başka bir nedenle yönlendirildiyseniz devam etmeden önce lütfen Trezor Support ile iletişime geçin.",
   "TR_SELL_MODAL_TERMS_2": "Kendi hesabınız için kripto para satıyorsunuz. Sağlayıcının politikalarının kimlik doğrulaması gerektirebileceğini kabul edersiniz.",
   "TR_SELL_MODAL_TERMS_3": "Kripto para işlemlerinin geri dönüşü olmadığını ve iade edilemeyeceğini anlıyorsunuz. Bu nedenle, hileli veya kazara oluşan kayıplar telafi edilemez olabilir.",
   "TR_SELL_MODAL_TERMS_4": "Invity'nin bu hizmeti sağlamadığını anlıyorsunuz. Hizmet, {provider} şartlarına göre yönetilir.",
@@ -1569,10 +1620,6 @@
   "TR_SELL_STATUS_ERROR": "Reddedildi",
   "TR_SELL_STATUS_PENDING": "Beklemede",
   "TR_SELL_STATUS_SUCCESS": "Onaylandı",
-  "TR_SELL_TRANS_ID": "İşlem Kimliği:",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "Maksimum {maximum} {currency}",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "Minimum {minimum} {currency}",
-  "TR_SELL_VIEW_DETAILS": "Ayrıntıları görüntüle",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "Tasarruflar",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "Kirala",
   "TR_SENDING_SYMBOL": "{multiple, select, true {Birden fazla token} false {{symbol}} other {{symbol}}} gönderiliyor",
@@ -1627,6 +1674,8 @@
   "TR_SHOW_LOG": "Günlüğü göster",
   "TR_SHOW_MORE": "Daha fazla göster",
   "TR_SHOW_MORE_ADDRESSES": "Daha fazla göster ({count})",
+  "TR_SHOW_ON_TRAY": "Simgeyi tepside göster",
+  "TR_SHOW_ON_TRAY_DESCRIPTION": "Trezor Suite'in arka planda çalışıp çalışmadığını izleyin.",
   "TR_SHOW_UNVERIFIED_ADDRESS": "Doğrulanmamış adresi göster",
   "TR_SHOW_UNVERIFIED_XPUB": "Doğrulanmamış genel anahtarı göster",
   "TR_SIDEBAR_ADD_COIN": "Coin ekle",
@@ -1639,7 +1688,9 @@
   "TR_SIZE": "Boyut",
   "TR_SKIP": "Atla",
   "TR_SKIP_BACKUP": "Yedeklemeyi atla",
+  "TR_SKIP_BACKUP_DESCRIPTION": "Bir cüzdan yedekleme, Trezor'unuzun kaybolması, çalınması veya zarar görmesi durumunda fonlarınızı kurtarmanızı sağlar. Bir yedekleme olmazsa kripto paranıza erişimi kalıcı olarak kaybedebilirsiniz.",
   "TR_SKIP_PIN": "PIN kodunu atla",
+  "TR_SKIP_PIN_DESCRIPTION": "Bir cihaz PIN'i, Trezor'unuza yetkisiz erişimi önler. Bu olmadan, cihazınıza sahip olan herkes fonlarınıza erişebilir.",
   "TR_SKIP_ROUNDS": "Tur atlanıyor",
   "TR_SKIP_ROUNDS_DESCRIPTION": "Turların atlanmasına izin vererek, girdileriniz arasındaki herhangi bir ilişkiyi kanıtlamayı daha zor hale getirirsiniz. Bu, fonların kaynağını daha da gizleyebileceğiniz anlamına gelir.",
   "TR_SKIP_ROUNDS_HEADING": "Trezor'un turları atlamasına izin ver",
@@ -1652,6 +1703,7 @@
   "TR_STAKE_ADDING_TO_POOL": "Stake havuzuna ekleniyor",
   "TR_STAKE_ANY_AMOUNT_ETH": "En az {amount} {symbol} tutarını stake edin ve ödüller kazanmaya başlayın. Mevcut %{apyPercent} APY oranımızla ödülleriniz de kazandırıyor!",
   "TR_STAKE_APY": "Yıllık Getiri Yüzdesi",
+  "TR_STAKE_APY_ABBR": "APY",
   "TR_STAKE_APY_DESC": "*Yıllık Getiri Yüzdesi",
   "TR_STAKE_AVAILABLE": "Mevcut",
   "TR_STAKE_CAN_CLAIM_WARNING": "Şimdiden {amount} {symbol} talep edebilirsiniz. {br}Lütfen talepte bulunun ya da yeni unstake etme işlemi gerçekleştirilene kadar bekleyin.",
@@ -1661,13 +1713,16 @@
   "TR_STAKE_CLAIM_AFTER_UNSTAKING": "Unstake etme süresi tamamlandığında talepte bulunabilirsiniz.",
   "TR_STAKE_CLAIM_IN_NEXT_BLOCK": "sonraki blokta",
   "TR_STAKE_CLAIM_PENDING": "Talep beklemede",
+  "TR_STAKE_CLAIM_UNSTAKED": "Unstake edilen {symbol} paraları talep et",
   "TR_STAKE_CONFIRM_AND_STAKE": "Onayla ve stake et",
   "TR_STAKE_CONFIRM_ENTRY_PERIOD": "Giriş süresini onayla",
   "TR_STAKE_CONSENT_TO_STAKING_WITH_EVERSTAKE": "Everstake ile stake etmeyi kabul ediyorum ve onaylıyorum",
   "TR_STAKE_DAYS": "{days} gün",
   "TR_STAKE_DELEGATED": "Stake delegasyonu",
   "TR_STAKE_DEREGISTERED": "Bir stake adresinin kaydının silinmesi",
+  "TR_STAKE_EARN_REWARDS_WEEKLY": "Haftalık ödüller kazanın",
   "TR_STAKE_ENTERING_POOL_MAY_TAKE": "Stake havuzuna girmek {days} gün kadar sürebilir",
+  "TR_STAKE_ENTER_THE_STAKING_POOL": "Stake havuzuna gir",
   "TR_STAKE_ETH": "Ethereum stake et",
   "TR_STAKE_ETH_CARD_TITLE": "{symbol} kazanmanın en kolay yolu.",
   "TR_STAKE_ETH_EARN_REPEAT": "Stake edin. Ödüller kazanın. Tekrarlayın.",
@@ -1685,12 +1740,16 @@
   "TR_STAKE_EVERSTAKE_MANAGES": "Everstake, <t>akıllı sözleşmeleri, altyapısı ve teknolojisi</t> ile stake edilmiş {symbol} tutarınızı yönetir ve korur.",
   "TR_STAKE_INSTANT": "Anında",
   "TR_STAKE_INSTANTLY_UNSTAKED_WITH_DAYS": "{amount} {symbol} tutarını \"Anında\" aldınız. {days, plural, =0 {} one {Tutarın geri kalanı # gün içinde ödenecektir.} other { Tutarın geri kalanı # gün içinde ödenecektir}}",
+  "TR_STAKE_IN_ACCOUNT": "{symbol} hesapta",
   "TR_STAKE_LEARN_MORE": "Daha fazla bilgi edinin",
+  "TR_STAKE_LEAVE_STAKING_POOL": "Stake havuzundan çık",
   "TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL": "Para çekme ücretlerini ödeyebilmeniz için {amount} {symbol} tutarını dışarıda bıraktık.",
+  "TR_STAKE_LEFT_SMALL_AMOUNT_FOR_WITHDRAWAL": "Para çekme ücretlerini ödeyebilmeniz için {symbol} gibi küçük bir tutarı dışarıda bıraktık.",
   "TR_STAKE_MAX": "Maks.",
   "TR_STAKE_MAX_FEE_DESC": "Maksimum ücret, işleminizin gerçekleştirildiğinden emin olmak için ağ üzerinden ödeme yapmak istediğiniz ağ işlem ücretidir.",
   "TR_STAKE_MAX_REWARD_DAYS": "Maks. {count, plural, one { gün #} other { gün #}}",
   "TR_STAKE_MIN_AMOUNT_TOOLTIP": "Stake edilecek minimum tutar {amount} {symbol}",
+  "TR_STAKE_MONTHLY": "Her ay",
   "TR_STAKE_NEXT_PAYOUT": "Bir sonraki ödül ödemesi",
   "TR_STAKE_NOT_ENOUGH_FUNDS": "Ağ ücretlerini ödemek için yeterli {symbol} yok",
   "TR_STAKE_ONLY_REWARDS": "Yalnızca ödüller",
@@ -1702,6 +1761,8 @@
   "TR_STAKE_REGISTERED": "Bir stake adresinin kaydedilmesi",
   "TR_STAKE_RESTAKED_BADGE": "Yeniden stake edildi",
   "TR_STAKE_REWARDS": "Ödüller",
+  "TR_STAKE_SIGN_TRANSACTION": "İşlemi imzala",
+  "TR_STAKE_SIGN_UNSTAKING_TRANSACTION": "Unstake etme işlemini imzala",
   "TR_STAKE_STAKE": "Stake et",
   "TR_STAKE_STAKED_AMOUNT": "Tutar stake edildi",
   "TR_STAKE_STAKED_AND_EARNING": "Stake edildi ve ödüller kazanılıyor",
@@ -1709,6 +1770,7 @@
   "TR_STAKE_STAKE_MORE": "Daha fazla stake et",
   "TR_STAKE_STAKING_IN_A_NUTSHELL": "Özetle Stake Etme",
   "TR_STAKE_STAKING_IS": "Stake etmek, blok zincirinin çalışmasını desteklemek için Ethereum varlıklarınızı geçici olarak kilitlediğiniz dostane bir jest gibidir. Tatlı bir ödül olarak, karşılığında daha fazla {symbol} kazanacaksınız!",
+  "TR_STAKE_STAKING_PROCESS": "Stake etme süreci",
   "TR_STAKE_START_STAKING": "Stake etmeye başla",
   "TR_STAKE_TIME_TO_CLAIM": "Talep etme zamanı",
   "TR_STAKE_TOTAL_PENDING": "Toplam stake beklemede:",
@@ -1717,23 +1779,35 @@
   "TR_STAKE_UNSTAKED_AND_READY_TO_CLAIM": "Unstake edildi ve talep etmeye hazır",
   "TR_STAKE_UNSTAKE_TO_CLAIM": "Talep etmek için unstake et",
   "TR_STAKE_UNSTAKING": "Unstake ediliyor",
+  "TR_STAKE_UNSTAKING_APPROXIMATE": "Anında kullanılabilir yaklaşık {symbol} miktarı",
+  "TR_STAKE_UNSTAKING_APPROXIMATE_DESCRIPTION": "Stake havuzunun likiditesi bazı fonların anında unstake edilmesine olanak tanıyabilir. Kalan fonlar unstake etme dönemini takip edecektir.",
   "TR_STAKE_UNSTAKING_PERIOD": "Unstake etme süresi",
+  "TR_STAKE_UNSTAKING_PROCESS": "Unstake etme süreci",
   "TR_STAKE_UNSTAKING_TAKES": "Unstake etme işlemi genellikle yaklaşık 3 gün sürer. İşlem tamamlandıktan sonra takas edebilir veya gönderebilirsiniz.",
+  "TR_STAKE_WEEKLY": "Her hafta",
   "TR_STAKE_WHAT_IS_STAKING": "Stake etme nedir?",
+  "TR_STAKE_YEARLY": "Her yıl",
   "TR_STAKE_YOUR_FUNDS_MAINTAINED": "Stake edilen fonlarınız Everstake tarafından korunur",
+  "TR_STAKING_AMOUNT_STAKED_INSTANTLY": "{amount} {symbol} anında stake edildi!",
+  "TR_STAKING_AMOUNT_UNSTAKED_INSTANTLY": "{amount} {symbol} anında unstake edildi!",
+  "TR_STAKING_CONSOLIDATING_FUNDS": "{symbol} sizin için konsolide ediliyor",
   "TR_STAKING_DELEGATE": "Delege et",
   "TR_STAKING_DEPOSIT": "İade edilebilir Depozito",
   "TR_STAKING_DEPOSIT_FEE_DECRIPTION": "Depozito ücreti {feeAmount} ADA'dır ve stake etmeye başlamak için adresinizi kaydetmeniz gerekir. Cardano'nuzu unstake etmeyi seçerseniz depozitoyu geri alırsınız.",
+  "TR_STAKING_ESTIMATED_GAINS": "Tahmini kazanç",
   "TR_STAKING_FEE": "Ücret",
+  "TR_STAKING_GETTING_READY": "{symbol} çalışmaya hazırlanıyor",
   "TR_STAKING_INSTANTLY_STAKED": "{amount} {symbol} tutarını anında stake ettiniz. {days, plural, =0 {} one {Geri kalan {symbol} tutarı # gün içinde stake edilecektir.} other { Geri kalan {symbol} tutarı # gün içinde stake edilecektir}}",
   "TR_STAKING_IS_NOT_SUPPORTED": "Stake etme bu ağda desteklenmiyor.",
   "TR_STAKING_NOT_ENOUGH_FUNDS": "Hesabınızda yeterli fon yok.",
+  "TR_STAKING_ONCE_YOU_CONFIRM": "Onayladıktan sonra",
   "TR_STAKING_ON_3RD_PARTY_DESCRIPTION": "Bir Trezor stake havuzunda stake ederek Trezor'u ve Trezor Suite içindeki Cardano ekosistemini doğrudan desteklemiş olursunuz.",
   "TR_STAKING_ON_3RD_PARTY_TITLE": "Bir üçüncü taraf stake havuzunda delegasyon yapıyorsunuz",
   "TR_STAKING_POOL_OVERSATURATED_DESCRIPTION": "Delege ettiğiniz stake havuzu aşırı doymuş durumda. Lütfen stake ödüllerinizi en üst düzeye çıkarmak için stakenizi yeniden delege edin",
   "TR_STAKING_POOL_OVERSATURATED_TITLE": "Stake havuzu aşırı doymuş durumda",
   "TR_STAKING_REDELEGATE": "Yeniden delege et",
   "TR_STAKING_REWARDS": "Mevcut Ödüller",
+  "TR_STAKING_REWARDS_ARE_RESTAKED": "Ödüller otomatik olarak yeniden stake edilir",
   "TR_STAKING_REWARDS_DESCRIPTION": "İlk stake kaydı ve delegasyonundan sonra ödüllerinizi almaya başlamanızın 20 güne kadar sürebileceğini lütfen unutmayın. Bu süre tamamlandıktan sonra ödülünüzü her 5 günde bir alacaksınız.",
   "TR_STAKING_REWARDS_TITLE": "Cardano Staking Etkin",
   "TR_STAKING_STAKE_ADDRESS": "Stake adresiniz",
@@ -1742,6 +1816,9 @@
   "TR_STAKING_TREZOR_POOL_FAIL": "Delegasyon yapılacak Trezor stake havuzuna ulaşılamadı.",
   "TR_STAKING_TX_PENDING": "İşleminiz ({txid}) blok zincirine başarıyla gönderildi ve onay bekleniyor.",
   "TR_STAKING_WITHDRAW": "Çek",
+  "TR_STAKING_YOUR_EARNINGS": "Kazançlarınız otomatik olarak yeniden stake edilir ve <a>bileşik faiz</a> kazanmanıza olanak tanır.",
+  "TR_STAKING_YOUR_UNSTAKED_FUNDS": "Unstake edilen {symbol} hazır",
+  "TR_STAKING_YOU_ARE_HERE": "Buradasınız",
   "TR_STANDARD_WALLET_DESCRIPTION": "Parola yok",
   "TR_START": "Başlat",
   "TR_START_AGAIN": "Tekrar başlat",
@@ -1750,6 +1827,7 @@
   "TR_START_COINJOIN": "Coinjoin'i başlat",
   "TR_START_RECOVERY": "Kurtarmayı başlat",
   "TR_STEP": "Adım {number}",
+  "TR_STEP_OF_TOTAL": "Adım {index} / {total}",
   "TR_STILL_DONT_SEE_YOUR_TREZOR": "Trezor'unuzu hala göremiyor musunuz?",
   "TR_STOP": "Durdur",
   "TR_STOPPING": "Durduruluyor",
@@ -1758,7 +1836,7 @@
   "TR_SUITE_META_DESCRIPTION": "Trezor donanım cüzdanları için yeni masaüstü ve tarayıcı uygulaması. Trezor Suite, üç temel unsurumuz olan kullanılabilirlik, güvenlik ve gizlilik konularında önemli iyileştirmeler sunar.",
   "TR_SUITE_STORAGE": "Uygulama depolama",
   "TR_SUITE_VERSION": "Trezor Suite sürümü",
-  "TR_SWITCH_DEVICE": "Cihazı değiştir",
+  "TR_SWITCH_DEVICE": "Cihazı değiştirin",
   "TR_SWITCH_DEVICE_EJECT_CONFIRMATION_CANCEL_BUTTON": "İptal et",
   "TR_SWITCH_DEVICE_EJECT_CONFIRMATION_DESCRIPTION": "Cihazınızı yeniden bağlayana kadar fonlarınız ve işlemleriniz görünmez.",
   "TR_SWITCH_DEVICE_EJECT_CONFIRMATION_DISABLE_VIEW_ONLY_DESCRIPTION": "Cihazınızı yeniden bağlayana kadar fonlarınız ve işlemleriniz görünmez.",
@@ -1801,7 +1879,11 @@
   "TR_TOKENS_EMPTY": "Token yok... henüz.",
   "TR_TOKENS_EMPTY_CHECK_HIDDEN": "Token yok. Gizli olabilirler.",
   "TR_TOKENS_SEARCH_TOOLTIP": "Token, sembol veya sözleşme adresine göre arama yapın.",
+  "TR_TOKEN_NOT_FOUND": "Token bulunamadı",
+  "TR_TOKEN_NOT_FOUND_ON_NETWORK": "{networkName} ağında token bulunamadı.",
   "TR_TOKEN_TRANSFERS": "{standard} Token Transferleri",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH": "Farklı bir arama deneyin.",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH_OR_SWITCH": "Farklı bir arama deneyin veya başka bir ağa geçin.",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR": "Tanınmayan token'lar",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR_TOOLTIP": "Tanınmayan token'lar potansiyel risk oluşturur. Dikkatli kullanın.",
   "TR_TOO_LONG": "Mesaj çok uzun",
@@ -1813,18 +1895,24 @@
   "TR_TOR_CONFIG_SNOWFLAKE_UPDATE_LABEL": "Yolu güncelle",
   "TR_TOR_DESCRIPTION": "Trezor Suite'in tüm trafiğini Tor ağı üzerinden yönlendirerek gizliliğinizi ve güvenliğinizi artırın. Tor'un yüklenmesi ve bağlantı kurulması biraz zaman alabilir.",
   "TR_TOR_DISABLE": "Tor'u devre dışı bırak",
+  "TR_TOR_DISABLED": "Devre dışı",
   "TR_TOR_DISABLE_ONIONS_ONLY": "Onion olmayan özel arka uçlar eksik",
   "TR_TOR_DISABLE_ONIONS_ONLY_DESCRIPTION": "Bu davranışı önlemek için lütfen onion olmayan özel arka uç adresleri ekleyin.",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_DESCRIPTION": "Tor'u şimdi güvenle devre dışı bırakabilirsiniz.",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_TITLE": "Özel arka uçlar artık yalnızca onion adreslerini kullanmıyor.",
   "TR_TOR_DISABLE_ONIONS_ONLY_RESOLVED": "Tor'u devre dışı bırak",
   "TR_TOR_DISABLE_ONIONS_ONLY_TITLE": "Tor'u şimdi devre dışı bırakmak, tüm Onion arka uçlarını varsayılan Trezor sunucularına sıfırlayacaktır.",
+  "TR_TOR_DISABLING": "Devre dışı bırakılıyor",
   "TR_TOR_ENABLE": "Tor'u etkinleştir",
+  "TR_TOR_ENABLED": "Etkin",
   "TR_TOR_ENABLE_AND_CONFIRM": "Tor'u etkinleştir ve onayla",
   "TR_TOR_ENABLE_TITLE": "Tor'u etkinleştir",
+  "TR_TOR_ENABLING": "Etkinleştiriliyor",
+  "TR_TOR_ERROR": "Hata",
   "TR_TOR_IS_SLOW_MESSAGE": "Tor ağa bağlanıyor.<br></br>Biraz daha bekleyin.",
   "TR_TOR_KEEP_RUNNING": "Tor'u çalıştırmaya devam et",
   "TR_TOR_KEEP_RUNNING_FOR_COIN_JOIN_SUBTITLE": "Lütfen devam etmek için \"Tor'u çalıştırmaya devam et\" veya coinjoin işleminden çıkmak için \"Tor'u durdur\" öğesini seçin.",
+  "TR_TOR_MISBEHAVING": "Uygunsuz davranma",
   "TR_TOR_REMOVE_ONION_AND_DISABLE": "Tor'u devre dışı bırak ve varsayılan arka uçlara geç",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_LEAVE": "Ayrıl",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_SUBTITLE": "Lütfen devam etmek için \"Tor'u Etkinleştir\" veya işlemden çıkmak için \"Ayrıl\" öğesini seçin.",
@@ -1839,11 +1927,7 @@
   "TR_TO_BTC": "BTC'ye",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "Etiketlerinizi tutarlı ve farklı cihazlarda kullanılabilir hale getirmek için bir bulut depolama sağlayıcısına bağlanın.",
   "TR_TO_SATOSHIS": "Sat'a",
-  "TR_TRADE_BUYS": "satın alır",
-  "TR_TRADE_ENTER_COIN": "Kripto adı veya sembolünü girin...",
-  "TR_TRADE_EXCHANGES": "takas işlemi yapar",
   "TR_TRADE_REDIRECTING": "Yeniden yönlendiriliyor...",
-  "TR_TRADE_SELLS": "satar",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "İşlem geçmişi mevcut değil",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "İpucu: İşlem kimliklerini, adresleri, token'ları, etiketleri, tutarları ve tarihleri arayabilirsiniz.",
   "TR_TRANSACTIONS_SEARCH_TIP_10": "İpucu: Daha karmaşık aramalar için AND (&) ve OR (|) işleçlerini birleştirin. Örneğin, <strong>> {lastYear}-01-01 & < {lastYear}-01-31 | > {lastYear}-12-01 & < {lastYear}-12-31</strong>, {lastYear} Ocak veya Aralık ayındaki tüm işlemleri gösterecektir.",
@@ -1858,6 +1942,7 @@
   "TR_TRANSACTIONS_SEARCH_TOOLTIP": "İşlem kimliği, etiket veya tutara göre arama yapın veya < > | & = != gibi işleçleri kullanın.",
   "TR_TRANSACTION_DETAILS": "Ayrıntılar",
   "TR_TREZOR_BRIDGE_RUNNING_VERSION": "Trezor Bridge {version} sürümünü çalıştırıyor",
+  "TR_TREZOR_CONNECT": "Trezor Connect",
   "TR_TREZOR_DEVICE_TUTORIAL_CANCELED_HEADING": "Eğitim iptal edildi",
   "TR_TREZOR_DEVICE_TUTORIAL_COMPLETED_HEADING": "Eğitim tamamlandı",
   "TR_TREZOR_DEVICE_TUTORIAL_DESCRIPTION": "Kısa bir eğitim yardımıyla cihazınızı nasıl kullanacağınızı öğrenin",
@@ -1865,32 +1950,40 @@
   "TR_TROUBLESHOOTING_CLOSE_TABS": "Trezor'unuzu kullanıyor olabilecek diğer sekmeleri ve pencereleri kapatın",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION": "Diğer sekmeleri ve pencereleri kapattıktan sonra bu sayfayı yenilemeyi deneyin.",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION_DESKTOP": "Diğer tarayıcı sekmelerini ve pencerelerini kapattıktan sonra Trezor Suite'ten çıkmayı ve yeniden açmayı deneyin.",
-  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "İletişimi etkinleştirmek için gereken adımlar",
+  "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "Bu sorunu çözmek için aşağıdaki adımları deneyin.",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_DESCRIPTION": " <a>Trezor Bridge durum sayfası</a>nı ziyaret edin",
   "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_TITLE": "Trezor Bridge işleminin çalıştığından emin olun",
-  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Şu anda yalnızca Chromium tabanlı tarayıcılar USB cihazlarıyla doğrudan iletişime izin verir",
+  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "Şu anda yalnızca Chromium tabanlı tarayıcılar USB cihazlarıyla doğrudan iletişime izin verir.",
   "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_TITLE": "Chromium tabanlı bir tarayıcı kullanın",
   "TR_TROUBLESHOOTING_TIP_CABLE_DESCRIPTION": "Kablo tamamen takılı olmalıdır. USB-C bağlantılı bir cihaz olması durumunda, kablo yerine oturmalıdır.",
   "TR_TROUBLESHOOTING_TIP_CABLE_TITLE": "Farklı bir kablo deneyin",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_DESCRIPTION": "Trezor Bridge yüklü olarak.",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_TITLE": "Mümkünse farklı bir bilgisayar kullanmayı deneyin",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Her ihtimale karşı",
-  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Bilgisayarınızı yeniden başlatmayı deneyin",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "Bilgisayarınızı yeniden başlatmak tarayıcınız ve cihazınız arasındaki iletişim sorununu çözebilir.",
+  "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "Bilgisayarınızı yeniden başlatın",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_DESCRIPTION": "<a>Trezor Suite</a> masaüstü uygulamasını çalıştır",
   "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE": "Trezor Suite masaüstü uygulamasını kullan",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_DESCRIPTION": "Alternatif bir bridge uygulamasına <a>değiştirmek için tıklayın</a>. Mevcut sürüm: ({currentVersion})",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_TITLE": "Trezor Bridge'in başka bir sürümünü kullanın",
   "TR_TROUBLESHOOTING_TIP_UDEV_INSTALL_DESCRIPTION": " <a>Udev kuralları</a>nı yüklemeyi deneyin. Açmadan önce masaüstüne kaydedildiğinden emin olun.",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_DESCRIPTION": "Cihazınızın ürün yazılımını en son 2019'da veya daha önce güncellediyseniz lütfen <a>Bilgi Bankası</a>ndaki talimatları izleyin",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_TITLE": "Eski bir Trezor modeli kullanıyor olabilirsiniz.",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_DESCRIPTION": "Doğrudan bilgisayarınıza bağlayın (USB hub olmadan).",
   "TR_TROUBLESHOOTING_TIP_USB_PORT_TITLE": "Farklı bir USB bağlantı noktası deneyin",
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "Kuralları otomatik olarak yükle",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "Eksik udev kuralları",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "Beklenmeyen durum: {error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "Cihazınız düzgün bir şekilde bağlandı ancak tarayıcınız şu anda onunla iletişim kuramıyor. Trezor Bridge'i yüklemeniz gerekiyor.",
   "TR_TRY_AGAIN": "Tekrar deneyin",
   "TR_TXID": "İşlem kimliği",
   "TR_TXID_RBF": "Değiştirilecek orijinal işlem kimliği",
   "TR_TX_CONFIRMATIONS": "{confirmationsCount}x",
   "TR_TX_CONFIRMED": "İşlem onaylandı",
   "TR_TX_CONFIRMING": "İşlem onaylanıyor",
+  "TR_TX_DATA_FUNCTION": "Fonksiyon",
+  "TR_TX_DATA_INPUT_DATA": "Giriş verisi",
+  "TR_TX_DATA_METHOD": "Giriş verisi",
+  "TR_TX_DATA_METHOD_NAME": "Yöntem adı",
+  "TR_TX_DATA_PARAMS": "Parametreler",
   "TR_TX_DEPOSIT": "Depozito",
   "TR_TX_FEE": "Ücret",
   "TR_TX_TAB_AMOUNT": "Tutar",
@@ -1930,6 +2023,8 @@
   "TR_UPDATE_FIRMWARE_HOMESCREEN_LATER_TOOLTIP": "Bellenim güncellemesi gerekli. Ana ekranınızı daha sonra ayarlar sayfasından değiştirebilirsiniz",
   "TR_UPDATE_FIRMWARE_HOMESCREEN_TOOLTIP": "Ana ekranınızı değiştirmek için belleniminizi güncelleyin",
   "TR_UPDATE_MODAL_AVAILABLE_HEADING": "Güncelleme mevcut",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES": "Otomatik güncellemeleri etkinleştir",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG": "Yeni",
   "TR_UPDATE_MODAL_INSTALL_AND_RESTART": "Yeniden başlat ve güncelle",
   "TR_UPDATE_MODAL_INSTALL_NOW_OR_LATER": "Güncellemeyi şimdi yüklemek ister misiniz?",
   "TR_UPDATE_MODAL_NOT_NOW": "Şimdi değil",
@@ -1937,6 +2032,9 @@
   "TR_UPDATE_MODAL_START_DOWNLOAD": "Güncellemeyi başlat",
   "TR_UPDATE_MODAL_UPDATE_DOWNLOADED": "Güncelleme indirildi",
   "TR_UPDATE_MODAL_UPDATE_ON_QUIT": "Çıkarken güncelle",
+  "TR_UPDATE_MODAL_WHATS_NEW": "Yenilikler",
+  "TR_UPDATE_MODAL_YOUR_VERSION": "Sürümünüz: v{version}",
+  "TR_UPGRADE_FIRMWARE_TO_DISCOVER_ACCOUNT_ERROR": "Bu hesaba erişmek için belleniminizi yükseltin. Yukarıdaki mavi başlığa bakın.",
   "TR_UP_TO": "şuna kadar:",
   "TR_UP_TO_DATE": "Güncel",
   "TR_UP_TO_DAYS": "{days} güne kadar",
@@ -1990,6 +2088,7 @@
   "TR_WALLET_SELECTION_ACCESS_HIDDEN_WALLET": "Gizli cüzdana eriş",
   "TR_WALLET_SELECTION_HIDDEN_WALLET": "Gizli cüzdan",
   "TR_WELCOME_TO_TREZOR_TEXT_WALLET_CREATION": "Yeni bir cüzdan oluşturun veya kurtarma parolanızı kullanarak bir yedeklemeden bir cüzdan kurtarın.",
+  "TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE": "Trezor deneyiminizi iyileştirmek için sürekli çalışıyoruz. Yenilikler şunlardır:",
   "TR_WEST": "Batı",
   "TR_WHAT_DATA_WE_COLLECT": "Hangi verileri topluyoruz?",
   "TR_WHAT_IS_PASSPHRASE": "Fark hakkında daha fazla bilgi edinin",
diff --git a/packages/suite-data/files/translations/uk.json b/packages/suite-data/files/translations/uk.json
index 52e75337c0a..16f2649709b 100644
--- a/packages/suite-data/files/translations/uk.json
+++ b/packages/suite-data/files/translations/uk.json
@@ -191,7 +191,6 @@
   "TR_404_GO_TO_DASHBOARD": "Перейти на головну",
   "TR_404_TITLE": "Помилка 404: Посилання не знайдено",
   "TR_7D_CHANGE": "Протягом 7 днів ",
-  "TR_ABORT": "Скасувати",
   "TR_ACCESS_HIDDEN_WALLET": "Увійти в прихований гаманець",
   "TR_ACCESS_STANDARD_WALLET": "Увійти в стандартний гаманець",
   "TR_ACCOUNT_DETAILS_HEADER": "Деталі рахунка",
@@ -209,7 +208,7 @@
   "TR_ACCOUNT_EXCEPTION_DISCOVERY_EMPTY_DESC": "Всі монети зараз відключені. Будь ласка, додайте новий аккаунт або ввімкніть монети в налаштуваннях.",
   "TR_ACCOUNT_EXCEPTION_DISCOVERY_ERROR": "Помилка виявлення аккаунту",
   "TR_ACCOUNT_EXCEPTION_NOT_ENABLED": "{networkName} вимкнено в налаштуваннях.",
-  "TR_ACCOUNT_EXCEPTION_NOT_EXIST": "Аккаунт не існує",
+  "TR_ACCOUNT_EXCEPTION_NOT_EXIST": "Рахунка не існує",
   "TR_ACCOUNT_IMPORTED_ANNOUNCEMENT": "Рахунок тільки для спостереження є публічною адресою, яку ви імпортували в ваш гаманець, що дозволяє гаманцю дивитися на виходи (outputs), але не витрачати їх.",
   "TR_ACCOUNT_IS_EMPTY_DESCRIPTION": "Почніть з отримання транзакцій або купівлі {network}.",
   "TR_ACCOUNT_IS_EMPTY_TITLE": "Ще немає транзакцій.",
@@ -343,9 +342,7 @@
   "TR_BUG": "Баг",
   "TR_BUMP_FEE": "Змінити комісію",
   "TR_BUY": "Купити",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "Торговельні операції",
   "TR_BUY_BUY": "Купити",
-  "TR_BUY_BUY_AGAIN": "Купити знову",
   "TR_BUY_CONFIRMED_ON_TREZOR": "Підтверджено на Trezor",
   "TR_BUY_DETAIL_ERROR_BUTTON": "Повернутися до рахунка",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "Перейти до служби підтримки провайдера",
@@ -390,12 +387,10 @@
   "TR_BUY_STATUS_PENDING": "В очікуванні",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "В очікуванні",
   "TR_BUY_STATUS_SUCCESS": "Схвалено",
-  "TR_BUY_TRANS_ID": "ID транзакції:",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "Максимум - {maximum}",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "Максимум становить - {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "Мінімум - {minimum}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "Мінімум становить - {maximum} {currency}",
-  "TR_BUY_VIEW_DETAILS": "Переглянути деталі",
   "TR_BYTES": "байтів",
   "TR_CAMERA_NOT_RECOGNIZED": "Камера не розпізнана.",
   "TR_CAMERA_PERMISSION_DENIED": "У доступі до камери було відмовлено.",
@@ -414,7 +409,6 @@
   "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Сума Trezor",
   "TR_CHAINED_TXS": "Ланцюгові транзакції",
   "TR_CHANGELOG": "Список змін",
-  "TR_CHANGELOG_ON_GITHUB": "Список змін на GitHub",
   "TR_CHANGE_ADDRESS_TOOLTIP": "Ця адреса була створена як невитрачений залишок (\"change\") попередньої транзакції.",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "Ви можете змінити тип прошивки в налаштуваннях в будь-який час.",
   "TR_CHANGE_HOMESCREEN": "Змінити заставку",
@@ -430,8 +424,6 @@
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "Виконайте симуляцію відновлення, щоб перевірити вашу мнемонічну фразу.",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "Введіть слова з резервної копії гаманця в тому порядку, в якому вони відображаються на вашому пристрої. Можливо, вас попросять ввести деякі слова, які не входять до резервної копії гаманця, як додатковий захід безпеки.",
   "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "Ваша фраза відновлення (резервна копія гаманця) вводиться за допомогою кнопок Trezor Model T. Це дає змогу уникнути розкриття будь-якої конфіденційної інформації на потенційно небезпечному комп'ютері або веб-браузері.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "Резервна копія вашого гаманця вводиться за допомогою сенсорного екрана. Це дозволяє уникнути потрапляння вашої конфіденційної інформації до потенційно небезпечного комп'ютера або веб-браузера.",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "Резервна копія вашого гаманця вводиться за допомогою сенсорного екрана. Це дозволяє уникнути потрапляння вашої конфіденційної інформації до потенційно небезпечного комп'ютера або веб-браузера.",
   "TR_CHECK_SEED": "Перевірити резервну копію",
   "TR_CHECK_YOUR_DEVICE": "Перевірте екран свого Trezor",
   "TR_CHOOSE_RECOVERY_TYPE": "Виберіть тип відновлення",
@@ -484,12 +476,6 @@
   "TR_COINJOIN_TILE_3_DESCRIPTION": "Ваш Bitcoin завжди знаходиться під Вашим контролем",
   "TR_COINJOIN_TILE_3_TITLE": "Protected by your Trezor",
   "TR_COINJOIN_TRANSACTION_BATCH": "Транзакції coinjoin",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "Автоматичне перезавантаження через",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "Повернутися до транзакції",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "Немає пропозицій",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "На жаль, на даний момент у нас немає пропозицій через проблеми з підключенням до сервера.",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "На жаль, у нас немає для Вас жодної пропозиції на даний момент. Спробуйте перезавантажити сторінку або змінити ваш запит.",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "Перезавантажити сторінку",
   "TR_COINS": "Криптовалюта",
   "TR_COIN_CONTROL": "Coin Control",
   "TR_COIN_CONTROL_TOOLTIP": "Coin control дає змогу вручну обирати UTXO, які будуть використовуватися як входи для транзакції.",
@@ -553,7 +539,6 @@
   "TR_COPY_ADDRESS_POLICY_ID": "Ніколи не надсилайте активи на ідентифікаційну адресу полісу.",
   "TR_COPY_AND_CLOSE": "Копіювати та Закрити",
   "TR_COPY_SIGNED_MESSAGE": "Копіювати підписане повідомлення",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "Копіювати",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "Не вдалося отримати список змін",
   "TR_COULD_NOT_RETRIEVE_DATA": "Не вдалося отримати дані",
   "TR_COUNT_WALLETS": "{count} {count, plural, one {гаманець} few {гаманців} many {гаманців} other {гаманці}}",
@@ -709,7 +694,6 @@
   "TR_DOWNLOADING": "Завантаження",
   "TR_DOWNLOAD_LATEST_BRIDGE": "Завантажити останню версію Bridge {version}",
   "TR_DO_NOT_DISCONNECT_DEVICE": "Не вимикайте свій пристрій",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "Ви дійсно хочете пропустити цей крок?",
   "TR_DROPBOX": "Dropbox",
   "TR_DROPZONE": "Перетягніть файл сюди або клацніть, щоб вибрати з файлів",
   "TR_DROPZONE_ERROR": "Помилка імпорту: {error}",
@@ -789,7 +773,6 @@
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "Схваліть тільки точну суму, необхідну для цього обміну. Вам потрібно буде заплатити додаткову комісію, якщо ви захочете здійснити подібний обмін ще раз.",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "Скасувати попередній дозвіл",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "Виконає операцію, яка видалить попереднє схвалення контракту з {provider}.",
-  "TR_EXCHANGE_BUY": "Для",
   "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "Підтвердити на Trezor і відправити",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "Підтвердити та відправити",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "Створити схвалення",
@@ -811,8 +794,6 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "Ваша транзакція пройшла успішно.",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "Схвалено",
   "TR_EXCHANGE_DEX": "Пропозиція децентралізованої біржі",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "Комісія за виконання цього обміну оцінюється в {approvalFee} ({approvalFeeFiat}) на затвердження (якщо потрібно) і {swapFee} ({swapFeeFiat}) на заміну.",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "Немає коштів для оплати комісії за транзакцію. Будь ласка, знизьте суму обміну до максимальної: {symbol} {max}",
   "TR_EXCHANGE_EXTRA_FIELD": "",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "{extraFieldName} є недійсним",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "",
@@ -822,7 +803,6 @@
   "TR_EXCHANGE_FIXED_OFFERS_INFO": "Фіксовані курси показують, скільки саме ви отримаєте в кінці обміну - сума не зміниться з моменту вибору курсу до завершення транзакції. Ви гарантовано отримаєте вказану суму, але ці курси зазвичай менш вигідні, що означає, що на ці кошти ви не купите стільки криптовалюти, скільки планували.",
   "TR_EXCHANGE_FLOAT": "Пропозиція з плаваючою ставкою",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "Плаваючі курси означають, що кінцева сума, яку ви отримаєте, може дещо змінитися через коливання на ринку між моментом вибору курсу і завершенням транзакції. Ці курси зазвичай вищі, а це означає, що в результаті ви можете отримати більше криптовалюти.",
-  "TR_EXCHANGE_PROVIDER": "Провайдер",
   "TR_EXCHANGE_RATE": "Ціна",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "Рахунок отримувача знаходиться поза межами Suite.",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "Це конкретна буквено-цифрова адреса, на яку надійдуть ваші монети.",
@@ -849,12 +829,9 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "Будь ласка, введіть номер.",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "Введіть бажане відхилення від курсу",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "Сума пропозиції свопу",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "Підсумки відхилення від курсу",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "Допустимість відхилення від курсу",
-  "TR_EXCHANGE_TRANS_ID": "ID транзакції:",
   "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "Використовуйте обліковий запис ({symbol}), якого немає в Suite",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "Адреса отримувача",
-  "TR_EXCHANGE_VIEW_DETAILS": "Переглянути деталі",
   "TR_EXPERIMENTAL_FEATURES": "Експериментальні функції",
   "TR_EXPERIMENTAL_FEATURES_ALLOW": "Дозволити експериментальні функції",
   "TR_EXPERIMENTAL_FEATURES_WARNING": "Довготривала підтримка цих функцій не гарантується.",
@@ -1181,7 +1158,6 @@
   "TR_NETWORK_ZCASH": "Zcash",
   "TR_NEW_FEE": "Новий",
   "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "Доступний новий Trezor Bridge.",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "Доступна нова прошивка Trezor! Будь ласка, оновіть свій пристрій.",
   "TR_NEXT_UP": "Далі",
   "TR_NONCE": "Nonce",
   "TR_NORMAL_ACCOUNTS": "Рахунок за замовчуванням",
@@ -1205,10 +1181,6 @@
   "TR_N_MIN": "{n} min",
   "TR_N_TRANSACTIONS": "{value} {value, plural, one {транзакція} few {транзакції} many {транзакції} other {транзакції}}",
   "TR_OFF": "вимк",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "Обрана сума {amount} більша, ніж допустимий максимум {max}.",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "Обрана сума {amount} більша, ніж допустимий максимум {max}.",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "Обрана сума {amount} є меншою, ніж прийнятний мінімум {min}.",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "Обрана сума {amount} менша, ніж прийнятий мінімум {min}.",
   "TR_OFFICIAL_LANGUAGES": "Офіційний",
   "TR_OK": "OK",
   "TR_ON": "увімк.",
@@ -1265,30 +1237,6 @@
   "TR_OTHER_INPUTS_AND_OUTPUTS": "Інші вхідні та вихідні дані",
   "TR_OUTGOING": "Вихідні",
   "TR_OUTPUTS": "Виходи",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "Мінімальна і максимальна сума, за яку цей користувач готовий продати {symbol}.",
-  "TR_P2P_GET_STARTED_INTRO": "Вам необхідно ініціювати транзакцію на сайті {providerName} - уважно виконайте наступні кроки.",
-  "TR_P2P_GET_STARTED_ITEM_1": "Виберіть \"Перейти на сайт {providerName}\" для перенаправлення на сайт наших партнерів.",
-  "TR_P2P_GET_STARTED_ITEM_3": "Щойно {providerName} попросить у вас \"release address\", поверніться сюди і продовжуйте.",
-  "TR_P2P_GET_STARTED_ITEM_4": "Майже готово! Відкрийте та скопіюйте свою адресу, вставте її в поле \"release address\" на сайті {providerName} і завершіть транзакцію.",
-  "TR_P2P_GO_TO_PROVIDER": "Перейти на сайт {providerName}",
-  "TR_P2P_INFO": "При використанні технології {peerToPeer} (P2P) немає необхідності в перевірці KYC ні з боку покупця, ні з боку продавця. Усі сторони захищені від шахрайства надійним {multisigEscrow}.",
-  "TR_P2P_MODAL_CONFIRM": "Я готовий купити",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "P2P покупка {cryptocurrency} с {provider}",
-  "TR_P2P_MODAL_LEGAL_HEADER": "Юридичне повідомлення",
-  "TR_P2P_MODAL_SECURITY_HEADER": "Безпека перш за все з Вашим Trezor",
-  "TR_P2P_MODAL_TERMS_1": "Ви тут, щоб купити криптовалюту у іншої особи, яку ви обрали, використовуючи технологію Peer-to-Peer (P2P) без перевірки особи. Якщо ви потрапили на цей сайт з будь-якої іншої причини, зверніться до служби підтримки, перш ніж продовжити.",
-  "TR_P2P_MODAL_TERMS_2": "Ви розумієте, що операції з криптовалютою незворотні і не підлягають поверненню. Таким чином, шахрайські або випадкові втрати можуть бути непоправними.",
-  "TR_P2P_MODAL_TERMS_4": "Ви розумієте, що Invity не надає цю послугу. Умови компанії {provider} регулюють цю послугу.",
-  "TR_P2P_MODAL_TERMS_5": "Ви не використовуєте цю функцію для азартних ігор, шахрайства або будь-якого іншого порушення Умов надання послуг Invity або провайдера, а також будь-яких застосовних нормативних актів.",
-  "TR_P2P_MODAL_TERMS_6": "Ви розумієте, що криптовалюти є фінансовим інструментом, який розвивається, і що в різних юрисдикціях можуть діяти різні нормативні акти. Це може піддати Вас підвищеному ризику шахрайства, крадіжки або нестабільності ринку.",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "Перевірені партнери від Invity",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "Угода має бути завершена протягом цього терміну, рахуючи з моменту створення контракту на сайті {providerName} .",
-  "TR_P2P_PRICE": "Ціна за 1 {symbol}",
-  "TR_P2P_PRICE_TOOLTIP": "{symbol} ціна, запропонована цим користувачем.",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "Привіт, я використовую {providerName}!",
-  "TR_P2P_USER_REPUTATION": "({rating}, {numberOfTrades})",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "Обрана сума {amount} вища, ніж допустимий максимум {maximum}.",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "Обрана кількість {amount} менше допустимого мінімуму {minimum}.",
   "TR_PAGINATION_NEWER": "Новіші",
   "TR_PAGINATION_OLDER": "Старіші",
   "TR_PASSPHRASE_CASE_SENSITIVE": "Увага: кодову фразу потрібно вводити з урахуванням регістра.",
@@ -1470,10 +1418,6 @@
   "TR_SELL_STATUS_ERROR": "Відхилено",
   "TR_SELL_STATUS_PENDING": "В очікуванні",
   "TR_SELL_STATUS_SUCCESS": "Схвалено",
-  "TR_SELL_TRANS_ID": "ID транзакції:",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "Максимум становить - {maximum} {currency}",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "Мінімум становить - {maximum} {currency}",
-  "TR_SELL_VIEW_DETAILS": "Переглянути деталі",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "Заощадження",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "Оренда",
   "TR_SENDING_SYMBOL": "Надсилання {multiple, select, true {декількох токенів} false {{symbol}} other {{symbol}}}",
@@ -1732,10 +1676,7 @@
   "TR_TO_BTC": "В BTC",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "Щоб зробити ваші мітки узгодженими та доступними на різних пристроях, під’єднайтеся до постачальника хмарного сховища.",
   "TR_TO_SATOSHIS": "В sat",
-  "TR_TRADE_BUYS": "покупки",
-  "TR_TRADE_EXCHANGES": "обміни",
   "TR_TRADE_REDIRECTING": "Перенаправлення...",
-  "TR_TRADE_SELLS": "продажі",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "Історія транзакцій недоступна",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "Порада: Ви можете шукати ID транзакцій, адрес, мітки, суми та дат.",
   "TR_TRANSACTIONS_SEARCH_TIP_10": "Порада: Для складнішого пошуку можна комбінувати оператори AND (&) та OR (|). Наприклад, <strong>>> 2020-01-01 & < 2020-01-31 | > 2020-12-01 & < 2020-12-31</strong> покаже всі транзакції за січень 2020 року або грудень 2020 року.",
@@ -1770,7 +1711,6 @@
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "Встановлення правил автоматично",
   "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "Відсутні правила udev",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "Неочікуваний стан: {error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "Ваш пристрій підключено належним чином, але інтернет-браузер не може встановити з ним зв'язок. Вам потрібно встановити Trezor Bridge.",
   "TR_TRY_AGAIN": "Спробуйте ще раз",
   "TR_TXID": "TX ID",
   "TR_TXID_RBF": "Оригінальний TX ID потрібно замінити",
diff --git a/packages/suite-data/files/translations/zh.json b/packages/suite-data/files/translations/zh.json
index c9aba071cee..b9d063e0268 100644
--- a/packages/suite-data/files/translations/zh.json
+++ b/packages/suite-data/files/translations/zh.json
@@ -1,8 +1,9 @@
 {
   "AMOUNT": "金额",
+  "AMOUNT_EXCEEDS_MAX": "该金额超出了 {maxAmount} 的最大允许值。",
   "AMOUNT_IS_BELOW_DUST": "金额必须至少为 {dust}",
   "AMOUNT_IS_LESS_THAN_RESERVE": "接收账户需要最低保留 {reserve} XRP 才能激活",
-  "AMOUNT_IS_MORE_THAN_RESERVE": "金额超过规定的不可动用储备金（{reserve} XRP）。",
+  "AMOUNT_IS_MORE_THAN_RESERVE": "金额超过规定的不可动用储备金 ({reserve} XRP)。",
   "AMOUNT_IS_NOT_ENOUGH": "资金不足",
   "AMOUNT_IS_NOT_INTEGER": "金额不是整数",
   "AMOUNT_IS_NOT_IN_RANGE_DECIMALS": "最多允许 {decimals} 位小数",
@@ -15,105 +16,105 @@
   "BACKUP_BACKUP_ALREADY_FINISHED_DESCRIPTION": "连接的设备已备份。你应该把恢复种子写下来，藏在安全的地方。",
   "BACKUP_BACKUP_ALREADY_FINISHED_HEADING": "备份已完成",
   "BROADCAST": "广播",
-  "BROADCAST_TOOLTIP": "向网络广播该交易。",
-  "BROADCAST_TOOLTIP_DISABLED_LOCKTIME": "锁定时间设置超过当前区块或时间戳的交易将被网络拒绝。",
+  "BROADCAST_TOOLTIP": "向网络广播此交易。",
+  "BROADCAST_TOOLTIP_DISABLED_LOCKTIME": "时间锁设置超过当前区块或时间戳的交易将被网络拒绝。",
   "COPY_TRANSACTION_TO_CLIPBOARD": "复制原始交易",
-  "CUSTOM_FEE_IS_NOT_INTEGER": "输入一个整数",
-  "CUSTOM_FEE_IS_NOT_SET": "输入你希望的费用",
-  "CUSTOM_FEE_LIMIT_BELOW_RECOMMENDED": "Gas费率限额太低",
+  "CUSTOM_FEE_IS_NOT_INTEGER": "请输入一个整数",
+  "CUSTOM_FEE_IS_NOT_SET": "请输入您愿意使用的费率来完整此交易",
+  "CUSTOM_FEE_LIMIT_BELOW_RECOMMENDED": "燃料费上限太低",
   "CUSTOM_FEE_LIMIT_USE_RECOMMENDED": "使用推荐值",
-  "CUSTOM_FEE_NOT_IN_RANGE": "输入介于 {minFee} 和 {maxFee} 之间的费率",
+  "CUSTOM_FEE_NOT_IN_RANGE": "请输入介于 {minFee} 和 {maxFee} 之间的费率",
   "DATA_ETH": "数据",
   "DATA_ETH_ADD": "添加数据",
   "DATA_ETH_ADD_TOOLTIP": "以太坊交易的交易数据。",
   "DATA_HEX_TOO_BIG": "超出数据限制",
-  "DATA_NOT_SET": "数据未设置",
+  "DATA_NOT_SET": "未设置数据",
   "DATA_NOT_VALID_HEX": "不是有效的十六进制值",
   "DESTINATION_TAG": "目的地标签",
   "DESTINATION_TAG_IS_NOT_NUMBER": "目的地标签不是一个数字",
-  "DESTINATION_TAG_IS_NOT_VALID": "目的地标签是无效的",
-  "DESTINATION_TAG_NOT_SET": "目的地标签未设置",
-  "DESTINATION_TAG_TOOLTIP": "目的地标签是一个独特的识别码、用于识别交易的收款者。",
-  "DISCONNECT_DEVICE_DESCRIPTION": "您的设备被擦除，不再拥有任何私钥。",
+  "DESTINATION_TAG_IS_NOT_VALID": "目的地标签无效",
+  "DESTINATION_TAG_NOT_SET": "未设置目的地标签",
+  "DESTINATION_TAG_TOOLTIP": "目的地标签是一个独特的识别码，用于识别交易的接收者。",
+  "DISCONNECT_DEVICE_DESCRIPTION": "您的设备数据已被清除，不再拥有任何私钥。",
   "DOWNLOAD_TRANSACTION": "下载为 .txt",
   "ESTIMATED_TIME": "预计时间",
   "EVENT_DEVICE_CONNECT": "设备 {label} 已连接",
   "EVENT_DEVICE_CONNECT_UNACQUIRED": "{label} 已连接",
-  "EVENT_WALLET_CREATED": "新钱包已创建",
-  "EXPECTED_FEE": "预计费用",
-  "FAILED_TO_DISABLE_TOR": "禁用Tor失败",
-  "FAILED_TO_ENABLE_TOR": "启用Tor失败",
+  "EVENT_WALLET_CREATED": "已成功添加钱包",
+  "EXPECTED_FEE": "预计矿工费",
+  "FAILED_TO_DISABLE_TOR": "禁用 Tor 已失败",
+  "FAILED_TO_ENABLE_TOR": "启用 Tor 已失败",
   "FEE": "矿工费",
   "FEE_LEVEL_CUSTOM": "自定义",
   "FEE_LEVEL_HIGH": "高",
   "FEE_LEVEL_LOW": "低",
-  "FEE_LEVEL_NORMAL": "正常",
-  "FIRMWARE_CONNECT_IN_NORMAL_MODEL_NO_BUTTON": "连接USB数据线时请不要按住任何按钮。",
-  "FIRMWARE_USER_HAS_SEED_CHECKBOX_DESC": "是的、我有备份！",
-  "FIRMWARE_USER_TAKES_RESPONSIBILITY_CHECKBOX_DESC": "我接受风险",
+  "FEE_LEVEL_NORMAL": "普通",
+  "FIRMWARE_CONNECT_IN_NORMAL_MODEL_NO_BUTTON": "连接 USB 数据线时请不要按住任何按钮。",
+  "FIRMWARE_USER_HAS_SEED_CHECKBOX_DESC": "是的，我已有备份！",
+  "FIRMWARE_USER_TAKES_RESPONSIBILITY_CHECKBOX_DESC": "我愿意承担这些风险",
   "FW_CAPABILITY_CONNECT_OUTDATED": "需要更新应用程序",
-  "FW_CAPABILITY_UPDATE_REQUIRED": "需要更新",
-  "IMAGE_VALIDATION_ERROR_INVALID_COLOR_COMBINATION": "无效的图像颜色。图像只能包含黑白 (而不是灰度)。",
+  "FW_CAPABILITY_UPDATE_REQUIRED": "需要更新设备固件",
+  "IMAGE_VALIDATION_ERROR_INVALID_COLOR_COMBINATION": "无效的图像颜色。只能包含黑白 (非灰度)。",
   "IMAGE_VALIDATION_ERROR_INVALID_DIMENSIONS": "无效的尺寸 (图像必须是 {width} x {height} px)。",
   "IMAGE_VALIDATION_ERROR_INVALID_FORMAT_ONLY_JPG": "选择的文件是无效的。必须是 .jpg",
   "IMAGE_VALIDATION_ERROR_INVALID_FORMAT_ONLY_PNG_JPG": "选择的文件是无效的。必须是 .jpg 或 .png",
-  "IMAGE_VALIDATION_ERROR_INVALID_SIZE_JPG": "无效的大小 (图像必须小于16KB)。",
-  "IMAGE_VALIDATION_ERROR_PROGRESSIVE_JPG": "不支持逐行JPG图像格式。\n",
-  "IMAGE_VALIDATION_ERROR_UNEXPECTED_ALPHA": "无效的图像格式。它必须不包含透明度。",
+  "IMAGE_VALIDATION_ERROR_INVALID_SIZE_JPG": "无效的尺寸 (图像必须小于 16 KB)。",
+  "IMAGE_VALIDATION_ERROR_PROGRESSIVE_JPG": "不支持逐行 JPG 图像格式。\n",
+  "IMAGE_VALIDATION_ERROR_UNEXPECTED_ALPHA": "无效的图像格式。不能包含透明度。",
   "IMPORT_CSV": "导入",
   "INCLUDING_FEE": "包含矿工费",
   "LABELING_ACCOUNT": "{networkName} #{index}",
-  "LOCKTIME_ADD": "添加锁定期",
-  "LOCKTIME_ADD_TOOLTIP": "锁定期设定了交易被挖掘到区块的最早时间。",
-  "LOCKTIME_BLOCKHEIGHT": "锁定期的区块高度",
-  "LOCKTIME_IS_NOT_INTEGER": "锁定期不是一个整数",
-  "LOCKTIME_IS_NOT_SET": "未设置锁定期",
+  "LOCKTIME_ADD": "添加时间锁",
+  "LOCKTIME_ADD_TOOLTIP": "时间锁设定了最早交易可以被挖掘到区块的时间。",
+  "LOCKTIME_BLOCKHEIGHT": "时间锁的区块高度",
+  "LOCKTIME_IS_NOT_INTEGER": "时间锁不是一个整数",
+  "LOCKTIME_IS_NOT_SET": "时间锁未设置",
   "LOCKTIME_IS_TOO_BIG": "时间戳太大",
-  "LOCKTIME_IS_TOO_LOW": "锁定期太低",
-  "LOCKTIME_SCHEDULE_SEND": "锁定期",
-  "LOCKTIME_TIMESTAMP": "锁定期的时间戳",
-  "LOG_DESCRIPTION": "该日志包含有关Trezor Suite的重要技术信息、联系Trezor客服时可能需要这些信息。",
-  "LOG_INCLUDE_BALANCE_DESCRIPTION": "启用此选项会在应用程序日志中包含余额、交易ID、设备标签、设备ID和公共地址等敏感信息。如果问题与此无关、请禁用该选项。",
-  "LOG_INCLUDE_BALANCE_TITLE": "包含敏感数据",
+  "LOCKTIME_IS_TOO_LOW": "时间锁太短",
+  "LOCKTIME_SCHEDULE_SEND": "时间锁",
+  "LOCKTIME_TIMESTAMP": "时间锁的时间戳",
+  "LOG_DESCRIPTION": "该日志包含了有关 Trezor Suite 的重要技术信息，联系 Trezor 客服时可能需要这些信息。",
+  "LOG_INCLUDE_BALANCE_DESCRIPTION": "启用此选项会在应用程序日志中包含余额、交易ID、设备标签、设备ID和公共地址等敏感信息。如果问题与此无关，请禁用该选项。",
+  "LOG_INCLUDE_BALANCE_TITLE": "包含钱包余额的敏感数据",
   "MAX_FEE": "矿工费率最大值",
-  "METADATA_MODAL_DESCRIPTION": "选择如何同步您的标签。您的数据由Trezor加密。",
+  "METADATA_MODAL_DESCRIPTION": "选择如何同步您的标签。您的数据由 Trezor 设备加密。",
   "METADATA_MODAL_HEADING": "保存标签",
-  "METADATA_PROVIDER_AUTH_ERROR": "与云存储提供商 {provider} 同步标签失败。用户已注销。",
-  "METADATA_PROVIDER_NOT_FOUND_ERROR": "无法在云提供商中找到元数据。",
-  "METADATA_PROVIDER_UNEXPECTED_ERROR": "与云存储提供商 {provider} 同步标签失败。用户已注销。",
-  "MODAL_ADD_ACCOUNT_COINJOIN_DESKTOP_ONLY": "混币账户仅适用于Trezor Suite桌面应用程序。",
-  "MODAL_ADD_ACCOUNT_COINJOIN_LIMIT_EXCEEDED": "每个钱包只能拥有一个混币账户。",
-  "MODAL_ADD_ACCOUNT_COINJOIN_NO_SUPPORT": "请更新您的固件以使用混币功能",
-  "MODAL_ADD_ACCOUNT_COINJOIN_UPDATE_REQUIRED": "请更新您的固件以启用混币器。",
-  "MODAL_ADD_ACCOUNT_LIMIT_EXCEEDED": "已创建的账户数已达到允许的上限。",
+  "METADATA_PROVIDER_AUTH_ERROR": "无法与云存储提供商 {provider} 同步标签。用户已注销。",
+  "METADATA_PROVIDER_NOT_FOUND_ERROR": "无法在云存储提供商中找到元数据。",
+  "METADATA_PROVIDER_UNEXPECTED_ERROR": "无法与云存储提供商 {provider} 同步标签。用户已注销。",
+  "MODAL_ADD_ACCOUNT_COINJOIN_DESKTOP_ONLY": "CoinJoin 混币器账户仅适用于 Trezor Suite。",
+  "MODAL_ADD_ACCOUNT_COINJOIN_LIMIT_EXCEEDED": "每个钱包只能拥有一个 CoinJoin 混币器账户。",
+  "MODAL_ADD_ACCOUNT_COINJOIN_NO_SUPPORT": "请更新您的设备固件以使用 CoinJoin 混币器",
+  "MODAL_ADD_ACCOUNT_COINJOIN_UPDATE_REQUIRED": "请更新您的设备固件以启用 CoinJoin 混币器功能。",
+  "MODAL_ADD_ACCOUNT_LIMIT_EXCEEDED": "已达到账户创建数量的上限。",
   "MODAL_ADD_ACCOUNT_NO_ACCOUNT": "账户搜索错误",
   "MODAL_ADD_ACCOUNT_NO_EMPTY_ACCOUNT": "没有可用的空帐户。",
   "MODAL_ADD_ACCOUNT_PREVIOUS_EMPTY": "上一个帐户是空的",
   "NEXT_PAGE": "下一页",
-  "NOTIFICATIONS_ALL_TITLE": "所有活动",
-  "NOTIFICATIONS_EMPTY_DESC": "一旦有重要的通知、您将在这里看到它们。",
+  "NOTIFICATIONS_ALL_TITLE": "所有动态",
+  "NOTIFICATIONS_EMPTY_DESC": "您将在这里看到所有的重要通知。",
   "NOTIFICATIONS_EMPTY_TITLE": "还没有通知",
   "NOTIFICATIONS_IMPORTANT_TITLE": "通知",
   "NOTIFICATIONS_SEEN_TITLE": "全部已读",
   "NOTIFICATIONS_TITLE": "通知",
-  "NOTIFICATIONS_UNSEEN_TITLE": "{count} 未读",
-  "ONBOARDING_UNEXPECTED_DEVICE_DIFFERENT_HEADING": "您正在使用一个不同的Trezor设备",
-  "ONBOARDING_UNEXPECTED_DEVICE_DIFFERENT_P1": "这不是您一直使用的那个Trezor设备。请重新连接正确的那个。",
-  "ONBOARDING_UNEXPECTED_DEVICE_DIFFERENT_P2": "如果您想使用该设备、请重新开始。",
-  "OP_RETURN": "OP RETURN",
-  "OP_RETURN_ADD": "添加OP Return",
-  "OP_RETURN_TOOLTIP": "用于将交易输出标记为无效的脚本操作码。由于带有 OP_RETURN 的输出都会被证明是无法花费的，OP_RETURN 的输出可以用来烧毁比特币。",
+  "NOTIFICATIONS_UNSEEN_TITLE": "{count} 个未读",
+  "ONBOARDING_UNEXPECTED_DEVICE_DIFFERENT_HEADING": "您正在使用一台不同的 Trezor 设备",
+  "ONBOARDING_UNEXPECTED_DEVICE_DIFFERENT_P1": "这不是您以往使用的那台 Trezor 设备。请重新连接正确的设备。",
+  "ONBOARDING_UNEXPECTED_DEVICE_DIFFERENT_P2": "如果您想使用该设备，请重新开始。",
+  "OP_RETURN": "OP_RETURN",
+  "OP_RETURN_ADD": "添加 OP_RETURN",
+  "OP_RETURN_TOOLTIP": "OP_RETURN 可用于数字资产所有权证明，有时也用于传递发送交易所需的附加信息。",
   "RAW_TRANSACTION": "原始交易",
   "RAW_TX_NOT_SET": "交易未设置",
-  "RBF": "交易费用替代",
+  "RBF": "费用替代",
   "RECEIVE_ADDRESS": "地址",
-  "RECEIVE_ADDRESS_COINJOIN_DISALLOW": "要为混币账户创建其他地址、您必须确保已在初始地址收到比特币。",
+  "RECEIVE_ADDRESS_COINJOIN_DISALLOW": "要为 CoinJoin 混币器账户创建其他地址，您必须确保已在初始地址收到比特币。",
   "RECEIVE_ADDRESS_FRESH": "新地址",
-  "RECEIVE_ADDRESS_LIMIT_REACHED": "您已经达到21个未使用过的地址上限",
+  "RECEIVE_ADDRESS_LIMIT_REACHED": "您已经达到 21 个未使用过的地址上限",
   "RECEIVE_ADDRESS_REVEAL": "显示完整地址",
-  "RECEIVE_ADDRESS_UNAVAILABLE": "无法使用",
-  "RECEIVE_DESC_BITCOIN": "要接收任何资金、您需要获得一个未使用过的接收地址。我们建议始终使用新的地址、因为这可以防止其他人追踪您的交易。当然您也可以重复使用一个地址、但我们建议除非绝对必要、否则不要这样做。",
-  "RECEIVE_DESC_ETHEREUM": "也可使用此地址接收代币。",
+  "RECEIVE_ADDRESS_UNAVAILABLE": "无法提供",
+  "RECEIVE_DESC_BITCOIN": "要接收任何资金，您需要获得一个未使用过的接收地址。我们建议始终使用新的地址，因为这可以防止其他人追踪您的交易。当然您也可以重复使用一个地址，但我们建议除非绝对必要，否则不要这样做。\n",
+  "RECEIVE_DESC_ETHEREUM": "也可使用此地址来接收代币。",
   "RECEIVE_TABLE_ADDRESS": "地址",
   "RECEIVE_TABLE_NOT_USED": "未使用",
   "RECEIVE_TABLE_RECEIVED": "总共接收",
@@ -128,21 +129,21 @@
   "RECIPIENT_REQUIRES_UPDATE": "您的固件版本不支持主根地址。请更新您的设备固件。",
   "RECIPIENT_SCAN": "扫描",
   "REFRESH": "刷新",
-  "REMAINING_BALANCE_LESS_THAN_RENT": "发送此金额后、您的账户将有 {remainingSolBalance} SOL的余额。非空账户的余额必须超过 {rent} SOL。",
+  "REMAINING_BALANCE_LESS_THAN_RENT": "发送此金额后，您的账户将有 {remainingSolBalance} SOL 的余额。非空账户的余额必须超过 {rent} SOL。",
   "REVIEW_AND_SEND_TRANSACTION": "审核并发送",
   "SEND_RAW": "发送原始",
   "SEND_RAW_TRANSACTION_TOOLTIP": "您可以自行提供交易的所有原始数据。",
   "SEND_TRANSACTION": "发送",
-  "SETTINGS_ADV_COIN_BLOCKBOOK_DESCRIPTION": "Trezor Suite使用Blockbook作为钱包的后端。您也可以使用您自己的自定义区块簿。",
-  "SETTINGS_ADV_COIN_BLOCKFROST_DESCRIPTION": "Trezor Suite使用Blockfrost websocket-link作为钱包的后端。",
-  "SETTINGS_ADV_COIN_CONN_INFO_BLOCK_HASH": "区块哈希: {hash}",
-  "SETTINGS_ADV_COIN_CONN_INFO_BLOCK_HEIGHT": "区块高度: {height}",
+  "SETTINGS_ADV_COIN_BLOCKBOOK_DESCRIPTION": "Trezor Suite 使用 Blockbook 作为钱包的后端。您也可以使用您自己的自定义区块簿。",
+  "SETTINGS_ADV_COIN_BLOCKFROST_DESCRIPTION": "Trezor Suite 使用 Blockfrost websocket 连接作为钱包的后端。",
+  "SETTINGS_ADV_COIN_CONN_INFO_BLOCK_HASH": "区块哈希：{hash}",
+  "SETTINGS_ADV_COIN_CONN_INFO_BLOCK_HEIGHT": "区块高度：{height}",
   "SETTINGS_ADV_COIN_CONN_INFO_NO_CONNECTED": "未连接到后端。请尝试重新连接设备。另外、请检查您的互联网连接或自定义后端的网址。",
   "SETTINGS_ADV_COIN_CONN_INFO_TITLE": "连接信息",
   "SETTINGS_ADV_COIN_CONN_INFO_URL": "当前已连接到 {url}",
   "SETTINGS_ADV_COIN_CONN_INFO_VERSION": "后端版本：{version}",
-  "SETTINGS_ADV_COIN_URL_INPUT_PLACEHOLDER": "例如: {url}",
-  "SETTINGS_UPDATE_AVAILABLE": "获取最新版本",
+  "SETTINGS_ADV_COIN_URL_INPUT_PLACEHOLDER": "例如：{url}",
+  "SETTINGS_UPDATE_AVAILABLE": "获取最新的版本",
   "SETTINGS_UPDATE_CHECK": "检查更新",
   "SETTINGS_UPDATE_CHECKING": "正在检查...",
   "SETTINGS_UPDATE_DOWNLOADING": "正在下载...",
@@ -151,7 +152,7 @@
   "TOAST_ACQUIRE_ERROR": "获取错误 {error}",
   "TOAST_AUTH_CONFIRM_ERROR": "密码短语确认错误：{error}",
   "TOAST_AUTH_CONFIRM_ERROR_DEFAULT": "无效的密码短语",
-  "TOAST_AUTH_FAILED": "授权错误: {error}",
+  "TOAST_AUTH_FAILED": "授权错误：{error}",
   "TOAST_AUTO_UPDATER_ERROR": "自动程序更新错误 ({state})",
   "TOAST_AUTO_UPDATER_NEW_VERSION_FIRST_RUN": "新版本 ({version}) 已成功安装。",
   "TOAST_AUTO_UPDATER_NO_NEW": "没有新的更新",
@@ -161,18 +162,19 @@
   "TOAST_COIN_SCHEME_PROTOCOL_ACTION": "自动填充发送表单",
   "TOAST_COIN_SCHEME_PROTOCOL_HEADER": "前往一个帐户去发送",
   "TOAST_COPY_TO_CLIPBOARD": "已复制到剪贴板",
-  "TOAST_DEVICE_WIPED": "设备擦除成功",
-  "TOAST_DISCOVERY_ERROR": "账户发现错误: {error}",
+  "TOAST_DEVICE_WIPED": "设备数据自毁成功",
+  "TOAST_DISCOVERY_ERROR": "账户发现错误：{error}",
   "TOAST_ESTIMATED_FEE_ERROR": "网络矿工费用估算失败。将使用备用值。",
   "TOAST_GENERIC_ERROR": "错误：{error}",
   "TOAST_PIN_CHANGED": "PIN码修改成功。",
   "TOAST_QR_INCORRECT_ADDRESS": "二维码包含该账户的无效地址",
   "TOAST_QR_INCORRECT_COIN_SCHEME_PROTOCOL": "二维码是为 {coin} 账户定义的",
+  "TOAST_QR_UNKNOWN_SCHEME_PROTOCOL": "未知协议方案：\"{scheme}\"。请重试或手动输入地址。",
   "TOAST_RAW_TX_SENT": "交易已发送。交易ID: {txid}",
   "TOAST_SETTINGS_APPLIED": "设置修改成功",
-  "TOAST_SIGN_MESSAGE_ERROR": "留言签署出错: {error}",
+  "TOAST_SIGN_MESSAGE_ERROR": "留言签署出错：{error}",
   "TOAST_SIGN_MESSAGE_SUCCESS": "留言签署成功",
-  "TOAST_SIGN_TX_ERROR": "交易签署出错: {error}",
+  "TOAST_SIGN_TX_ERROR": "交易签署出错：{error}",
   "TOAST_SUCCESSFUL_CLAIM": "成功认领 {symbol} ",
   "TOAST_TX_BUTTON": "查看详情",
   "TOAST_TX_CLAIMED": "已认领 {amount} ",
@@ -181,104 +183,104 @@
   "TOAST_TX_SENT": "从 {account} 发送出 {amount}",
   "TOAST_TX_STAKED": "从 {account} 质押 {amount}",
   "TOAST_TX_UNSTAKED": "已解除质押 {amount} ",
-  "TOAST_VERIFY_ADDRESS_ERROR": "地址验证出错: {error}",
-  "TOAST_VERIFY_MESSAGE_ERROR": "消息验证出错: {error}",
+  "TOAST_VERIFY_ADDRESS_ERROR": "地址验证出错：{error}",
+  "TOAST_VERIFY_MESSAGE_ERROR": "消息验证出错：{error}",
   "TOAST_VERIFY_MESSAGE_SUCCESS": "消息验证成功",
-  "TOAST_VERIFY_XPUB_ERROR": "公钥验证出错: {error}",
+  "TOAST_VERIFY_XPUB_ERROR": "公钥验证出错：{error}",
   "TOAST_WIPE_CODE_CHANGED": "成功修改自毁PIN码",
   "TOAST_WIPE_CODE_REMOVED": "成功删除自毁PIN码",
   "TOKEN_BALANCE": "余额: {balance}",
   "TOTAL_SENT": "总共发送出",
-  "TR_404_DESCRIPTION": "哎呀！看起来像一个错误的网址或不完整链接。o",
+  "TR_404_DESCRIPTION": "哎呀！看起来像一个错误的网址或不完整链接。",
   "TR_404_GO_TO_DASHBOARD": "前往控制面板",
-  "TR_404_TITLE": "错误 404：未找到链接",
-  "TR_7D_CHANGE": "一星期的变化\n",
-  "TR_ABORT": "终止",
-  "TR_ACCESS_HIDDEN_WALLET": "进入隐藏钱包",
+  "TR_404_TITLE": "错误 404: 未找到链接",
+  "TR_7D_CHANGE": "7天的变化\n",
+  "TR_ACCESS_HIDDEN_WALLET": "访问隐藏钱包",
   "TR_ACCESS_STANDARD_WALLET": "访问标准钱包",
   "TR_ACCOUNT_DETAILS_HEADER": "账户详情",
-  "TR_ACCOUNT_DETAILS_PATH_DESC": "派生路径是在分层确定性钱包的组织结构中浏览和生成特定密钥的一种方法。",
+  "TR_ACCOUNT_DETAILS_PATH_DESC": "派生路径是在 “分层确定性” 钱包的组织结构中浏览和生成特定密钥的一种方法。",
   "TR_ACCOUNT_DETAILS_PATH_HEADER": "派生路径",
   "TR_ACCOUNT_DETAILS_TYPE_HEADER": "账户类型",
-  "TR_ACCOUNT_DETAILS_XPUB": "谨慎地处理您的账户扩展公钥 (XPUB)。一旦暴露、第三方将能够看到您的整个交易历史。",
+  "TR_ACCOUNT_DETAILS_XPUB": "谨慎地处理您的账户扩展公钥。一旦暴露，第三方将能够看到您的整个交易历史。",
   "TR_ACCOUNT_DETAILS_XPUB_BUTTON": "显示扩展公钥",
   "TR_ACCOUNT_DETAILS_XPUB_HEADER": "扩展公钥 (XPUB)",
   "TR_ACCOUNT_ENABLE_PASSPHRASE": "启用密码短语",
   "TR_ACCOUNT_EXCEPTION_AUTH_ERROR": "授权错误",
-  "TR_ACCOUNT_EXCEPTION_AUTH_ERROR_DESC": "此设备的授权进程失败。请点击“重试”或重新连接您的Trezor设备。",
+  "TR_ACCOUNT_EXCEPTION_AUTH_ERROR_DESC": "此设备的授权进程失败。请点击 “重试” 或重新连接您的 Trezor 设备。",
   "TR_ACCOUNT_EXCEPTION_DISCOVERY_DESCRIPTION": "我们无法发现您的帐户。",
   "TR_ACCOUNT_EXCEPTION_DISCOVERY_EMPTY": "在设置中禁用所有的加密货币。",
-  "TR_ACCOUNT_EXCEPTION_DISCOVERY_EMPTY_DESC": "目前所有加密货币均已被禁用。请在“设置”中启用。",
+  "TR_ACCOUNT_EXCEPTION_DISCOVERY_EMPTY_DESC": "目前所有加密货币均已被禁用。请在 “设置” 中启用。",
   "TR_ACCOUNT_EXCEPTION_DISCOVERY_ERROR": "账户发现错误",
   "TR_ACCOUNT_EXCEPTION_NOT_ENABLED": "{networkName} 未在设置中启用。",
   "TR_ACCOUNT_EXCEPTION_NOT_EXIST": "账户不存在",
-  "TR_ACCOUNT_IMPORTED_ANNOUNCEMENT": "观察钱包是个已经导入到您的钱包中的公共地址、允许钱包监视加密货币输出、但无权发送它们。",
+  "TR_ACCOUNT_IMPORTED_ANNOUNCEMENT": "“仅供查看” 账户是个已经导入到您的钱包中的公共地址，允许钱包监视加密货币输出，但无权发送它们。",
   "TR_ACCOUNT_IS_EMPTY_DESCRIPTION": "从接收或购买 {network} 开始。",
   "TR_ACCOUNT_IS_EMPTY_TITLE": "还没有交易记录...",
-  "TR_ACCOUNT_NO_ACCOUNTS": "没有账号",
-  "TR_ACCOUNT_OUT_OF_SYNC": "正在进行帐户同步、请稍等...",
+  "TR_ACCOUNT_NO_ACCOUNTS": "没有账户",
+  "TR_ACCOUNT_OUT_OF_SYNC": "正在进行帐户同步，请稍等...",
   "TR_ACCOUNT_PASSPHRASE_DISABLED": "更改密码短语的设置来使用该设备",
   "TR_ACCOUNT_SEARCH_NO_RESULTS": "没有结果",
   "TR_ACCOUNT_TYPE": "帐户类型",
-  "TR_ACCOUNT_TYPE_BIP44_DESC": "遗留或支付公钥哈希地址使用更简单的交易格式、但可能会导致更高的交易费用、并且缺乏新地址类型中的效率和功能。",
-  "TR_ACCOUNT_TYPE_BIP44_NAME": "遗留",
+  "TR_ACCOUNT_TYPE_BIP44_DESC": "传统钱包地址使用较为简单的交易格式，但可能需要支付更高的矿工费，而且缺乏新型钱包地址类型的效率和功能。",
+  "TR_ACCOUNT_TYPE_BIP44_NAME": "传统",
   "TR_ACCOUNT_TYPE_BIP44_TECH": "BIP44, P2PKH, Base58",
-  "TR_ACCOUNT_TYPE_BIP49_DESC": "嵌套隔离见证地址得到广泛的支持、比遗留地址更高效 (节省矿工费)、并且与遗留和原生隔离见证地址兼容",
+  "TR_ACCOUNT_TYPE_BIP49_DESC": "嵌套隔离见证钱包地址得到普遍支持，比传统钱包地址更高效 (节省矿工费)、并且与传统和原生隔离见证钱包地址兼容。",
   "TR_ACCOUNT_TYPE_BIP49_NAME": "嵌套隔离见证",
   "TR_ACCOUNT_TYPE_BIP49_TECH": "BIP49, P2SH-P2WPKH, Base58",
-  "TR_ACCOUNT_TYPE_BIP84_DESC": "原生隔离见证是Trezor Suite的默认地址类型。它可以减少交易规模、提高交易容量、增强可扩展性、同时降低矿工费用、但可能无法与某些旧服务一起使用。",
+  "TR_ACCOUNT_TYPE_BIP84_DESC": "原生隔离见证是 Trezor Suite 的默认钱包地址类型。它可以减少交易数据体积、提高容量、增强可扩展性、同时降低矿工费用，但可能无法与某些传统服务一起使用。",
   "TR_ACCOUNT_TYPE_BIP84_NAME": "原生隔离见证",
   "TR_ACCOUNT_TYPE_BIP84_TECH": "BIP84, P2WPKH, Bech32",
-  "TR_ACCOUNT_TYPE_BIP86_DESC": "主根是目前最新的地址类型、可以增强隐私和网络效率。请注意、某些服务可能尚不支持主根地址。",
+  "TR_ACCOUNT_TYPE_BIP86_DESC": "主根是一个能够增强隐私和网络效率的新钱包地址类型。注意某些服务可能尚不支持主根地址。",
   "TR_ACCOUNT_TYPE_BIP86_NAME": "主根",
   "TR_ACCOUNT_TYPE_BIP86_TECH": "BIP86, P2TR, Bech32m",
   "TR_ACCOUNT_TYPE_CARDANO_DESC": "当前最广泛接受的生成和管理卡达尔诺地址的方法可确保互操作性、安全性以及对所有类型代币的支持。",
-  "TR_ACCOUNT_TYPE_COINJOIN": "混币",
+  "TR_ACCOUNT_TYPE_COINJOIN": "CoinJoin 混币器",
   "TR_ACCOUNT_TYPE_DEFAULT": "默认",
   "TR_ACCOUNT_TYPE_IMPORTED": "已导入",
   "TR_ACCOUNT_TYPE_LEDGER": "Ledger",
-  "TR_ACCOUNT_TYPE_LEDGER_DESC": "Ledger账户与Ledger Live派生路径兼容、可顺利从Ledger迁移到Trezor。",
-  "TR_ACCOUNT_TYPE_LEGACY": "遗留",
-  "TR_ACCOUNT_TYPE_LEGACY_DESC": "遗留账户与Ledger传统衍生路径兼容、可从Ledger顺利迁移到Trezor。",
+  "TR_ACCOUNT_TYPE_LEDGER_DESC": "Ledger 账户与 Ledger Live 派生路径兼容，可从 Ledger 顺利迁移到 Trezor。",
+  "TR_ACCOUNT_TYPE_LEGACY": "传统",
+  "TR_ACCOUNT_TYPE_LEGACY_DESC": "传统账户与传统 Ledger 派生路径兼容，可从 Ledger 顺利迁移到 Trezor。",
   "TR_ACCOUNT_TYPE_NORMAL_EVM_DESC": "当前最广为接受的生成和管理 {value} 地址的方法可确保互操作性、安全性并支持所有类型的代币。",
-  "TR_ACCOUNT_TYPE_NORMAL_SOLANA_DESC": "当前最广为接受的生成和管理Solana地址的方法可确保互操作性、安全性以及对SOL和SPL代币的支持。",
+  "TR_ACCOUNT_TYPE_NORMAL_SOLANA_DESC": "当前最广为接受的生成和管理 Solana 地址的方法可确保互操作性、安全性以及对 SOL 和 SPL 代币的支持。",
   "TR_ACCOUNT_TYPE_NO_CAPABILITY": "不支持。",
-  "TR_ACCOUNT_TYPE_NO_SUPPORT": "该Trezor型号不支持此账户类型。",
+  "TR_ACCOUNT_TYPE_NO_SUPPORT": "该 Trezor 型号不支持此账户类型。",
   "TR_ACCOUNT_TYPE_SEGWIT": "嵌套隔离见证",
   "TR_ACCOUNT_TYPE_SHELLEY": "雪莱",
   "TR_ACCOUNT_TYPE_SHELLEY_DESC": "雪莱时代的地址引入了一种新型钱包、可以支持权益委托和赚取奖励。",
-  "TR_ACCOUNT_TYPE_SLIP25_DESC": "2024年6月1日、混币功能被停用。您的混币帐户和资金仍然可以使用、但您将无法发起新一轮的混币请求。",
-  "TR_ACCOUNT_TYPE_SLIP25_NAME": "混币",
+  "TR_ACCOUNT_TYPE_SLIP25_DESC": "2024 年 6 月 1 日，CoinJoin 混币器功能被停用。您的混币帐户和资金仍然可以使用，但您将无法发起新一回合的混币请求。",
+  "TR_ACCOUNT_TYPE_SLIP25_NAME": "CoinJoin 混币器",
   "TR_ACCOUNT_TYPE_SLIP25_TECH": "SLIP25、P2TR、Bech32m",
-  "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_DESC": "Bip44修改账户",
-  "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_NAME": "Bip44修改",
-  "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_TECH": "BIP44、Base58",
+  "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_DESC": "BIP44找零账户",
+  "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_NAME": "BIP44找零",
+  "TR_ACCOUNT_TYPE_SOLANA_BIP44_CHANGE_TECH": "BIP44, Base58",
   "TR_ACCOUNT_TYPE_TAPROOT": "主根",
   "TR_ACCOUNT_TYPE_UPDATE_REQUIRED": "请您更新设备固件以启用此账户类型。",
-  "TR_ACCOUNT_TYPE_XRP_DESC": "瑞波币 (XRP) 是一种加密货币、无需依赖传统的挖矿技术、利用共识分类账即可实现快速、低成本的跨境支付、从而快速确认交易。",
-  "TR_ACQUIRE_DEVICE": "在此处使用Trezor",
+  "TR_ACCOUNT_TYPE_XRP_DESC": "瑞波币 (XRP) 是一种加密货币，无需依赖传统的挖矿技术，利用共识分类账即可实现快速、低成本的跨境支付，从而快速确认交易。",
+  "TR_ACQUIRE_DEVICE": "在此处使用 Trezor",
   "TR_ACQUIRE_DEVICE_TITLE": "另一个会话正在运行",
   "TR_ACTIVATED_COINS": "已激活的加密货币",
   "TR_ACTIVE": "激活",
+  "TR_ADD": "添加",
   "TR_ADDRESSES": "地址",
   "TR_ADDRESSES_CHANGE": "找零地址",
-  "TR_ADDRESSES_FRESH": "新的地址",
-  "TR_ADDRESSES_USED": "用过的地址",
+  "TR_ADDRESSES_FRESH": "新地址",
+  "TR_ADDRESSES_USED": "使用过的地址",
   "TR_ADDRESS_DISPLAY": "显示地址",
-  "TR_ADDRESS_DISPLAY_DESCRIPTION": "显示连续地址 (bc1wetes...v54d8d) 或间隔地址 (bc1w etes ... v54d 8d)。",
+  "TR_ADDRESS_DISPLAY_DESCRIPTION": "显示连续式地址 (bc1wetes...v54d8d) 或间隔式地址 (bc1w etes ... v54d 8d)。",
   "TR_ADDRESS_MODAL_CLIPBOARD": "复制地址",
   "TR_ADDRESS_MODAL_TITLE": "{networkName} 接收地址",
   "TR_ADDRESS_MODAL_TITLE_EXCHANGE": "{networkCurrencyName} 接受地址在 {networkName} 网络",
-  "TR_ADDRESS_PHISHING_WARNING": "为了防止网络钓鱼攻击、您应该验证您的Trezor设备上的地址。 {claim}",
+  "TR_ADDRESS_PHISHING_WARNING": "为了防止网络钓鱼攻击，您应该验证您的 Trezor 设备上的地址。 {claim}",
   "TR_ADD_ACCOUNT": "添加帐户",
-  "TR_ADD_HIDDEN_WALLET": "添加隐藏钱包",
+  "TR_ADD_HIDDEN_WALLET": "隐藏钱包",
   "TR_ADD_NETWORK_ACCOUNT": "添加 {network} 账户",
   "TR_ADD_NEW_BLOCKBOOK_BACKEND": "添加新的",
   "TR_ADD_TOKEN_ADDRESS_DUPLICATE": "代币地址已被添加",
   "TR_ADD_TOKEN_ADDRESS_NOT_VALID": "无效地址",
   "TR_ADD_TOKEN_LABEL": "代币地址",
   "TR_ADD_TOKEN_SUBMIT": "添加代币",
-  "TR_ADD_TOKEN_TITLE": "添加ERC20代币",
+  "TR_ADD_TOKEN_TITLE": "添加 ERC20 代币",
   "TR_ADD_TOKEN_TOAST_ERROR": "操作失败：{error}",
   "TR_ADD_TOKEN_TOAST_SUCCESS": "已添加代币",
   "TR_ADD_TOKEN_TOKEN_NOT_VALID": "这看起来不像一个有效的代币",
@@ -286,92 +288,92 @@
   "TR_ADVANCED": "危险区域",
   "TR_ADVANCED_RECOVERY": "高级恢复",
   "TR_ADVANCED_RECOVERY_NOT_SURE": "不知道高级钱包恢复方法是如何运作的？",
-  "TR_ADVANCED_RECOVERY_OPTION": "使用Trezor设备拼写和输入恢复种子的每个助记词。",
-  "TR_ADVANCED_RECOVERY_TEXT": "根据字母在Trezor屏幕上的位置、使用下面的键盘拼写钱包备份的每个单词。",
+  "TR_ADVANCED_RECOVERY_OPTION": "使用 Trezor 设备拼写和输入恢复种子的每个助记词。",
+  "TR_ADVANCED_RECOVERY_TEXT": "根据字母在 Trezor 屏幕上的位置，使用下面的键盘拼写钱包备份的每个单词。",
   "TR_AFFECTED_TXS": "此操作将从内存池中删除以下交易",
   "TR_AFFECTED_TXS_HEADER": "链式的交易是从初始交易的输出所创建的",
   "TR_AFFECTED_TXS_OTHERS": "从其它账户创建的交易",
   "TR_AFFECTED_TXS_OWN": "您的交易记录",
   "TR_ALL": "全部",
   "TR_ALLOW_ANALYTICS": "用户使用数据",
-  "TR_ALLOW_ANALYTICS_DESCRIPTION": "所有用户使用数据都是严格匿名的; 我们只用它来改善Trezor的生态系统。",
-  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES": "自动更新Trezor Suite",
-  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Trezor Suite会在后台自动下载最新版本、并在重启应用程序时安装。这可确保您始终使用最新功能和安全补丁。更新无需经过您的许可。",
+  "TR_ALLOW_ANALYTICS_DESCRIPTION": "所有用户使用数据都是严格匿名的；我们只用它来改善 Trezor 的生态系统。",
+  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES": "自动更新 Trezor Suite",
+  "TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION": "Trezor Suite 将在后台自动下载最新版本、并在重启应用程序时安装。这可确保您始终使用最新功能和安全补丁。更新无需经过您的许可。",
+  "TR_ALL_NETWORKS": "所有网络",
+  "TR_ALL_NETWORKS_TOOLTIP": "查看所有 {networkCount} 网络上的代币。使用右侧的按钮按照热门网络进行筛选。",
   "TR_ALL_TRANSACTIONS": "所有交易",
   "TR_AMOUNT_SENT": "已发送的金额",
-  "TR_AMOUNT_TOO_BIG_FOR_COINJOIN": "无法用于混币 — 金额太大",
-  "TR_AMOUNT_TOO_SMALL_FOR_COINJOIN": "无法用于混币 — 金额太小",
+  "TR_AMOUNT_TOO_BIG_FOR_COINJOIN": "无法用于 CoinJoin 混币器 —— 金额太大",
+  "TR_AMOUNT_TOO_SMALL_FOR_COINJOIN": "无法用于 CoinJoin 混币器 —— 金额太小",
   "TR_ANALYZE_IN_BLOCKBOOK": "在Trezor Blockbook中进行分析",
-  "TR_ANALYZE_IN_BLOCKBOOK_DESC": "查看Trezor Blockbook中的输入和输出、因为它可能更容易分析。",
+  "TR_ANALYZE_IN_BLOCKBOOK_DESC": "查看 Trezor Blockbook 中的输入和输出、因为它可能更容易分析。",
   "TR_ANALYZE_IN_BLOCKBOOK_OPEN": "打开",
-  "TR_ANONYMITY_SET_ERROR": "计算匿名性时发生错误。 请稍后再试",
-  "TR_ANONYMIZATION_OPTION_1": "加强比特币的隐私性",
-  "TR_ANONYMIZATION_OPTION_2": "在<button>货币控制</button>中选择“未消费交易输出”",
-  "TR_ANONYMIZATION_OPTION_3": "减少匿名程度",
-  "TR_ANONYMIZATION_PAUSED": "混币已暂停",
+  "TR_ANONYMITY_SET_ERROR": "计算您的匿名性时出错。 请稍后再试",
+  "TR_ANONYMIZATION_OPTION_1": "匿名化更多比特币",
+  "TR_ANONYMIZATION_OPTION_2": "在<button>币控制</button>中选择 “未消费交易输出”",
+  "TR_ANONYMIZATION_OPTION_3": "降低匿名程度",
+  "TR_ANONYMIZATION_PAUSED": "CoinJoin 混币器已被暂停",
   "TR_ANONYMIZING": "运行中",
   "TR_APP": "应用",
   "TR_APPLICATION": "应用程序",
-  "TR_ASCII_ONLY": "只允许使用ASCII字符",
+  "TR_ASCII_ONLY": "只允许使用 ASCII 字符",
   "TR_ASSETS": "加密货币",
-  "TR_AUTHENTICATE_DEVICE_DESCRIPTION": "我们只是想确保您的Trezor是正版的。",
+  "TR_AUTHENTICATE_DEVICE_DESCRIPTION": "我们只是想确保您的 Trezor 是正版的。",
   "TR_AUTH_CONFIRM_FAILED_RETRY": "重试",
   "TR_AUTH_CONFIRM_FAILED_TITLE": "错误的密码短语",
-  "TR_AUTOSTOP_COINJOIN_ENABLED": "本回合结束后、将停止混币",
-  "TR_AUTO_START": "自动打开Trezor Suite",
-  "TR_AUTO_START_DESCRIPTION": "在登陆电脑时、自动在后台打开Trezor Suite",
-  "TR_AUTO_STOP_TOOLTIP": "混币正处于签署阶段。点击即可在本轮结束后停止。",
+  "TR_AUTOSTOP_COINJOIN_ENABLED": "本回合结束后，将停止 CoinJoin 混币器",
+  "TR_AUTO_START": "自动打开 Trezor Suite",
+  "TR_AUTO_START_DESCRIPTION": "在登陆电脑时、自动在后台打开 Trezor Suite",
+  "TR_AUTO_STOP_TOOLTIP": "CoinJoin 混币器正处于签署阶段。点击即可在本轮结束后停止。",
   "TR_AVAILABLE_NOW_FOR": "现可供",
   "TR_AVOID_USING_DEVICE": "避免使用该设备或向其发送任何资金。",
   "TR_BACK": "后退",
   "TR_BACKENDS": "后端",
   "TR_BACKEND_CUSTOM_SERVERS": "自定义 {type} 服务器",
-  "TR_BACKEND_DEFAULT_SERVERS": "Trezor服务器 (默认)",
-  "TR_BACKEND_DISCONNECTED": "后端断开连接",
+  "TR_BACKEND_DEFAULT_SERVERS": "Trezor 服务器 (默认)",
+  "TR_BACKEND_DISCONNECTED": "后端已断开连接",
   "TR_BACKEND_RECONNECTING": "在 {time} 秒内重新连接...",
   "TR_BACKGROUND_DOWNLOAD": "在后台进行下载",
   "TR_BACKSPACE": "退格",
   "TR_BACKUP": "钱包备份",
-  "TR_BACKUP_CHECKBOX_1_DESCRIPTION": "确保按照Trezor设备屏幕上所给的顺序写下每个助记词。妥善保管钱包备份卡片。",
-  "TR_BACKUP_CHECKBOX_1_TITLE": "您的钱包助记词备份可让您在Trezor设备丢失或损坏的情况下恢复资金。",
-  "TR_BACKUP_CHECKBOX_2_DESCRIPTION": "不要把您的钱包助记词备份保存在您的手机或任何可能被黑的联网的电子设备上、包括云储存服务。",
+  "TR_BACKUP_CHECKBOX_1_DESCRIPTION": "确保按照 Trezor 设备屏幕上所给的顺序写下每个助记词。妥善保管钱包备份卡片。",
+  "TR_BACKUP_CHECKBOX_1_TITLE": "您的钱包助记词备份可让您在 Trezor 设备丢失或损坏的情况下恢复资金。",
+  "TR_BACKUP_CHECKBOX_2_DESCRIPTION": "不要把您的钱包助记词备份保存在您的手机或任何可能被黑的联网的电子设备上，包括云储存服务。",
   "TR_BACKUP_CHECKBOX_2_TITLE": "切勿拍摄钱包助记词备份或将其存储在任何数字媒体",
   "TR_BACKUP_CHECKBOX_3_DESCRIPTION": "将钱包助记词备份藏好、并使用适当的物理访问控制、以确保您是唯一能够看到您的钱包助记词的人。",
-  "TR_BACKUP_CHECKBOX_3_TITLE": "将您的钱包助记词备份安全的存储、切勿与任何人共享。",
+  "TR_BACKUP_CHECKBOX_3_TITLE": "将您的钱包助记词备份安全的存储，切勿与任何人共享。",
   "TR_BACKUP_CREATED": "钱包备份完成",
   "TR_BACKUP_FAILED": "备份失败",
   "TR_BACKUP_FINISHED_BUTTON": "继续到PIN码",
-  "TR_BACKUP_FINISHED_TEXT": "如果您已写下了您的钱包助记词备份、那么您的Trezor设备即将准备就绪。不要丢失您的备份、否则您将无法恢复您的资金。",
+  "TR_BACKUP_FINISHED_TEXT": "如果您已写下了您的钱包助记词备份，那么您的 Trezor 设备即将准备就绪。不要丢失您的备份，否则您将无法恢复您的资金。",
   "TR_BACKUP_RECOVERY_SEED": "备份",
   "TR_BACKUP_RECOVERY_SEED_FAILED_DESC": "备份过程失败了。强烈建议您备份您的钱包。请关注链接以了解如何创建钱包备份。",
   "TR_BACKUP_RECOVERY_SEED_FAILED_TITLE": "备份失败",
-  "TR_BACKUP_SEED_IS_ULTIMATE": "Trezor设备生成的助记词是您的钱包钥匙。 如果你丢失了它、它就永远消失了、没有其他办法可以还原丢失的钱包钥匙。",
-  "TR_BACKUP_SUBHEADING_1": "您的Trezor将生成您需要写下的单词列表。此信息是保护您的Trezor的最重要部分、它是您的Trezor和与此相关的所有钱包的唯一脱机备份。",
+  "TR_BACKUP_SEED_IS_ULTIMATE": "Trezor 设备生成的助记词是您的钱包钥匙。 如果你丢失了它，它就永远消失了，没有其他办法可以还原丢失的钱包钥匙。",
+  "TR_BACKUP_SUBHEADING_1": "您的 Trezor 将生成您需要写下的单词列表。此信息是保护您的 Trezor 的最重要部分、它是您的 Trezor 和与此相关的所有钱包的唯一脱机备份。",
   "TR_BACKUP_SUCCESSFUL": "备份成功",
   "TR_BALANCE": "余额",
   "TR_BASIC_RECOVERY": "标准恢复",
   "TR_BASIC_RECOVERY_OPTION": "请在您的电脑上逐字逐句地输入您的钱包助记词备份。",
-  "TR_BCH_ADDRESS_INFO": "比特币现金 (BCH) 将其地址的格式改为cashaddr。在我们的博客上可以找到更多关于如何转换地址的信息。 {TR_LEARN_MORE}",
+  "TR_BCH_ADDRESS_INFO": "比特现金 (BCH) 将其地址的格式改为 cashaddr。在我们的博客上可以找到更多关于如何转换地址的信息。 {TR_LEARN_MORE}",
   "TR_BEFORE_ANY_FURTHER_ACTIONS": "虽然可能性不大、但如果在固件更新时出现问题、可能需要使用您的钱包助记词备份来恢复您的资金。",
   "TR_BIP_SIG_FORMAT": "Trezor",
-  "TR_BITCOIN_ONLY_UNAVAILABLE": "在当您切换到 {bitcoinOnly} 之前、需要将您的Trezor设备固件升级到最新版本。",
+  "TR_BITCOIN_ONLY_UNAVAILABLE": "在当您切换到 {bitcoinOnly} 之前，需要将您的 Trezor 设备固件升级到最新版本。",
   "TR_BREAKING_ANONYMITY_CHECKBOX": "我理解我正在破坏我的匿名性",
-  "TR_BRIDGE": "Trezor网桥",
-  "TR_BRIDGE_DEV_MODE_START": "在21324端口启动Trezor网桥",
-  "TR_BRIDGE_DEV_MODE_STOP": "在默认端口启动Trezor网桥",
-  "TR_BRIDGE_GO_TO_WALLET_DESCRIPTION": "您确定吗？您的设备一次只能被一个应用程序所使用。如果您正在用 Trezor设备使用其他应用程序、请先结束该会议。",
-  "TR_BRIDGE_NEEDED_DESCRIPTION": "您的浏览器不被支持。为获得最佳体验、请下载并在后台运行Trezor Suite 桌面应用程序、或使用与WebUSB兼容的Chromium浏览器。",
-  "TR_BRIDGE_REQUESTED_DESCRIPTION": "另一个应用程序请求了Trezor Suite与您的Trezor设备连接。保持Trezor Suit在后台运行、然后在另外的应用程序中重新尝试操作。",
+  "TR_BRIDGE": "Trezor 网桥",
+  "TR_BRIDGE_DEV_MODE_START": "在 21324 端口启动 Trezor 网桥",
+  "TR_BRIDGE_DEV_MODE_STOP": "在默认端口启动 Trezor 网桥",
+  "TR_BRIDGE_GO_TO_WALLET_DESCRIPTION": "您确定吗？您的设备只能被一个应用程序所使用。如果您正在用 Trezor 设备使用其他应用程序，请先结束该会议。",
+  "TR_BRIDGE_NEEDED_DESCRIPTION": "您的浏览器不被支持。为获得最佳体验，请下载并在后台运行 Trezor Suite 桌面应用程序，或使用与 WebUSB 兼容的 Chromium 浏览器。",
+  "TR_BRIDGE_REQUESTED_DESCRIPTION": "另一个应用程序请求了 Trezor Suite 与您的 Trezor 设备连接。保持 Trezor Suite 在后台运行，然后在另外的应用程序中重新尝试操作。",
+  "TR_BRIDGE_TIP_AUTOSTART": "提示：启用自动启动功能，让网桥始终在后台运行。",
   "TR_BTC_UNITS": "比特币单位",
   "TR_BUG": "程序错误",
   "TR_BUMP_FEE": "追加矿工费",
   "TR_BUMP_FEE_DISABLED_TOOLTIP": "为加快您的交易速度、请追加队列中最早的待处理交易的矿工费。交易必须按顺序确认。",
   "TR_BUY": "购买",
-  "TR_BUY_ACCOUNT_TRANSACTIONS": "交易记录",
   "TR_BUY_BUY": "购买",
-  "TR_BUY_BUY_AGAIN": "再次购买",
-  "TR_BUY_CONFIRMED_ON_TREZOR": "已在Trezor设备上确认",
-  "TR_BUY_CONFIRM_ON_TREZOR": "在Trezor设备上确认",
+  "TR_BUY_CONFIRMED_ON_TREZOR": "已在 Trezor 设备上确认",
   "TR_BUY_DETAIL_ERROR_BUTTON": "返回账户",
   "TR_BUY_DETAIL_ERROR_SUPPORT": "前往供应商客服",
   "TR_BUY_DETAIL_ERROR_TEXT": "对不起、您的交易失败了或被拒绝。您的付款方式没有被扣除费用。",
@@ -387,27 +389,27 @@
   "TR_BUY_DETAIL_WAITING_FOR_USER_GATE": "前往供应商的网站",
   "TR_BUY_DETAIL_WAITING_FOR_USER_TEXT": "{providerName} 需要一些最后的细节来完成这项交易。请访问他们的网站以继续。",
   "TR_BUY_DETAIL_WAITING_FOR_USER_TITLE": "完成您的交易",
-  "TR_BUY_FOOTER_TEXT_1": "Invity是一个比较工具、将您与最优惠的交易供应商联系起来。他们只使用您提供的所在地、以显示最相关的报价。",
-  "TR_BUY_FOOTER_TEXT_2": "Invity不会看到您的任何付款或实名认证信息; 您只在选择完成交易时与交易供应商分享这些信息。",
+  "TR_BUY_FOOTER_TEXT_1": "Invity 是一个比较工具，将您与最优惠的交易供应商联系起来。他们只使用您提供的所在地、以显示最相关的报价。",
+  "TR_BUY_FOOTER_TEXT_2": "Invity 不会看到您的任何付款或实名认证信息；您只在选择完成交易时与交易供应商分享这些信息。",
   "TR_BUY_GO_TO_PAYMENT": "完成交易",
   "TR_BUY_LEARN_MORE": "了解更多",
   "TR_BUY_MODAL_CONFIRM": "我准备购买",
   "TR_BUY_MODAL_FOR_YOUR_SAFETY": "通过 {provider} 购买 {cryptocurrency}",
   "TR_BUY_MODAL_LEGAL_HEADER": "法律声明",
-  "TR_BUY_MODAL_SECURITY_HEADER": "Trezor一直把安全放在第一位",
+  "TR_BUY_MODAL_SECURITY_HEADER": "Trezor 一直把安全放在第一位",
   "TR_BUY_MODAL_TERMS_1": "我来这里是为了购买加密货币。如果我因其他原因被引导到此网站、我会在继续操作之前联系 {provider} 的客服。",
   "TR_BUY_MODAL_TERMS_2": "我正在使用此功能购买将发送到我自己账户的加密货币。",
   "TR_BUY_MODAL_TERMS_3": "我理解加密货币交易是最终交易、无法撤销或退款。因欺诈或错误造成的损失可能无法挽回。",
-  "TR_BUY_MODAL_TERMS_4": "我理解Invity不提供此项服务。它是受 {provider} 的条款和条件约束。",
-  "TR_BUY_MODAL_TERMS_5": "我不会使用此功能进行赌博、欺诈或任何违反Invity或提供商的服务条款或任何适用法律的活动。",
+  "TR_BUY_MODAL_TERMS_4": "我理解 Invity 不提供此项服务。它是受 {provider} 的条款和条件约束。",
+  "TR_BUY_MODAL_TERMS_5": "我不会使用此功能进行赌博、欺诈或任何违反 Invity 或提供商的服务条款或任何适用法律的活动。",
   "TR_BUY_MODAL_TERMS_6": "我理解加密货币是一种新兴的金融工具、不同地区的监管规定可能有所不同。这可能会增加欺诈、盗窃或市场不稳定的风险。",
-  "TR_BUY_MODAL_VERIFIED_PARTNERS_HEADER": "经Invity验证的合作伙伴",
+  "TR_BUY_MODAL_VERIFIED_PARTNERS_HEADER": "已经过 Invity 认证的合作伙伴",
   "TR_BUY_NETWORK": "购买 {network}",
   "TR_BUY_NOT_TRANSACTIONS": "还没有交易记录。",
   "TR_BUY_PROVIDED_BY_INVITY": "供应商为",
   "TR_BUY_PROVIDER": "供应商",
   "TR_BUY_RECEIVE_ACCOUNT_QUESTION_TOOLTIP": "这是您钱包里的账户、一旦交易完成、您会在这里找到您的币。",
-  "TR_BUY_RECEIVE_ADDRESS_QUESTION_TOOLTIP": "这是将接收您的币的专用字母和数字地址。请在您的Trezor设备上验证此地址。",
+  "TR_BUY_RECEIVE_ADDRESS_QUESTION_TOOLTIP": "这是将接收您的币的专用字母和数字地址。请在您的 Trezor 设备上验证此地址。",
   "TR_BUY_RECEIVING_ACCOUNT": "接收账户",
   "TR_BUY_RECEIVING_ADDRESS": "接收地址",
   "TR_BUY_STATUS_ACTION_REQUIRED": "需要进行操作",
@@ -415,139 +417,137 @@
   "TR_BUY_STATUS_PENDING": "待定的",
   "TR_BUY_STATUS_PENDING_GO_TO_GATEWAY": "待定的",
   "TR_BUY_STATUS_SUCCESS": "已批准",
-  "TR_BUY_TRANS_ID": "交易ID：",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO": "最大值为 {maximum} ",
   "TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT": "最大值为 {maximum} {currency}",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO": "最小值为 {minimum} ",
   "TR_BUY_VALIDATION_ERROR_MINIMUM_FIAT": "最小值为 {minimum} {currency}",
-  "TR_BUY_VIEW_DETAILS": "查看详细信息",
   "TR_BYTES": "字节",
   "TR_CAMERA_NOT_RECOGNIZED": "无法识别摄像头。",
   "TR_CAMERA_PERMISSION_DENIED": "访问摄像头的权限被拒绝。",
   "TR_CANCEL": "取消",
   "TR_CANCELLED": "已取消",
-  "TR_CANCEL_COINJOIN": "取消混币",
-  "TR_CANCEL_COINJOIN_NO": "否、继续",
-  "TR_CANCEL_COINJOIN_QUESTION": "确认想取消该混币任务吗？",
-  "TR_CANCEL_COINJOIN_YES": "是的、取消",
-  "TR_CANDIDATE_TRANSACTION": "混币候选人",
-  "TR_CANDIDATE_TRANSACTION_DESCRIPTION": "您已签名、等待其他人",
-  "TR_CANDIDATE_TRANSACTION_EXPLANATION": "您已经签署了交易、但仍需要所有参与者的签名。除非每个人都签名、否则我们无法保证交易的处理。",
+  "TR_CANCEL_COINJOIN": "取消 CoinJoin 混币器",
+  "TR_CANCEL_COINJOIN_NO": "不，继续",
+  "TR_CANCEL_COINJOIN_QUESTION": "确认想取消该 CoinJoin 混币任务吗？",
+  "TR_CANCEL_COINJOIN_YES": "是的，取消",
+  "TR_CANDIDATE_TRANSACTION": "CoinJoin 混币器候选人",
+  "TR_CANDIDATE_TRANSACTION_DESCRIPTION": "您已签名，正在等待其他参与者",
+  "TR_CANDIDATE_TRANSACTION_EXPLANATION": "您已经签署了交易，但仍需要所有参与者的签名。除非大家都签署，否则我们无法保证交易的处理。",
   "TR_CANDIDATE_TRANSACTION_HEADER": "候选交易",
   "TR_CARDANO_FINGERPRINT_HEADLINE": "指纹",
-  "TR_CARDANO_LEDGER_ACCOUNTS": "Ledger账户",
-  "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Trezor金额",
+  "TR_CARDANO_LEDGER_ACCOUNTS": "Ledger 账户",
+  "TR_CARDANO_TREZOR_AMOUNT_HEADLINE": "Trezor 金额",
   "TR_CHAINED_TXS": "链式交易",
   "TR_CHANGELOG": "更新日志",
-  "TR_CHANGELOG_ON_GITHUB": "GitHub上的更新日志",
   "TR_CHANGE_ADDRESS_TOOLTIP": "这是从上次发送创建的找零地址。",
   "TR_CHANGE_FIRMWARE_TYPE_ANYTIME": "您可以随时在设置中更改您的固件类型。",
   "TR_CHANGE_HOMESCREEN": "更改主屏幕图片",
-  "TR_CHANGE_PIN": "",
+  "TR_CHANGE_PIN": "修改PIN码",
   "TR_CHANGE_WIPE_CODE": "修改自毁PIN码",
+  "TR_CHECKED_BALANCES_ON": "已核对的余额在",
   "TR_CHECKING_YOUR_DEVICE": "检查您的设备",
   "TR_CHECKSUM_CONVERSION_INFO": "已转换为校验和。<a>了解更多</a>",
-  "TR_CHECK_DEVICE_ORIGIN_DESCRIPTION": "我们将验证Trezor设备的完整性、确保其安全性并确认芯片的真实性。",
+  "TR_CHECK_DEVICE_ORIGIN_DESCRIPTION": "我们将验证 Trezor 设备的完整性，确保其安全性并确认芯片的真实性。",
   "TR_CHECK_DEVICE_ORIGIN_TITLE": "检查设备",
   "TR_CHECK_FINGERPRINT": "检查设备指纹",
-  "TR_CHECK_FOR_DEVICES": "寻找Trezor设备",
+  "TR_CHECK_FOR_DEVICES": "寻找 Trezor 设备",
   "TR_CHECK_ORIGIN": "检查设备",
   "TR_CHECK_RECOVERY_SEED": "检查备份",
   "TR_CHECK_RECOVERY_SEED_DESCRIPTION": "执行模拟恢复以检查您的钱包助记词备份。",
   "TR_CHECK_RECOVERY_SEED_DESC_T1B1": "在此按照设备上显示的顺序输入恢复种子中的单词。作为额外的安全措施、您可能会被要求输入一些不属于恢复您的钱包的助记词。",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "使用2个按钮键盘输入您的恢复钱包助记词备份。 通过这样做、您将保持所有敏感信息的安全性和声音、远离任何阴影或不安全的计算机或网络浏览器。",
-  "TR_CHECK_RECOVERY_SEED_DESC_T2T1": "您的钱包助记词备份是用触摸屏输入的。 这将避免您的敏感信息暴露在可能不安全的计算机或网络浏览器中。",
-  "TR_CHECK_RECOVERY_SEED_DESC_T3T1": "您的钱包助记词备份是用触摸屏输入的。 这将避免您的敏感信息暴露在可能不安全的计算机或网络浏览器中。",
+  "TR_CHECK_RECOVERY_SEED_DESC_T2B1": "使用 2 个按钮键盘输入您的恢复钱包助记词备份。 通过这样做，您将保持所有敏感信息的安全性和声音，远离任何阴影或不安全的计算机或网络浏览器。",
+  "TR_CHECK_RECOVERY_SEED_DESC_TOUCHSCREEN": "您的钱包助记词备份是通过触摸屏输入的。这样可以避免将您的任何敏感信息暴露给可能不安全的电脑或网络浏览器。",
   "TR_CHECK_SEED": "检查钱包助记词备份",
-  "TR_CHECK_YOUR_DEVICE": "检查您的Trezor屏幕",
+  "TR_CHECK_YOUR_DEVICE": "检查您的 Trezor 屏幕",
   "TR_CHOOSE_RECOVERY_TYPE": "选择恢复类型",
-  "TR_CHUNKED_ADDRESS": "空格",
-  "TR_CLAIM_FROM_EVERSTAKE": "向Everstake认领 {symbol}?",
+  "TR_CHUNKED_ADDRESS": "间隔式",
+  "TR_CLAIM_FROM_EVERSTAKE": "从 Everstake 认领 {symbol}?",
   "TR_CLEAR_ALL": "全部清除",
   "TR_CLEAR_STORAGE": "重置应用程序",
   "TR_CLEAR_STORAGE_DESCRIPTION": "重置应用程序将其恢复到默认设置; 这是任何故障排除的首选的第一步。在这个过程结束时、该应用程序将自行重新启动。",
   "TR_CLOSE": "关闭",
-  "TR_COINJOIN_ACCOUNTS": "混币账户",
+  "TR_COINJOIN_ACCOUNTS": "CoinJoin 混币器账户",
   "TR_COINJOIN_ACCOUNT_RESCAN_ACTION": "重新扫描账户",
-  "TR_COINJOIN_ACCOUNT_RESCAN_DESCRIPTION": "如果您的交易历史记录不正确、您可以完全重新扫描您的帐户、无需优化。 在这种情况下、需要的时间会比平时更长。",
+  "TR_COINJOIN_ACCOUNT_RESCAN_DESCRIPTION": "如果交易历史记录不正确，可以在不进行优化的情况下重新扫描账户。这可能需要比平时更长的时间。",
   "TR_COINJOIN_ACCOUNT_RESCAN_TITLE": "重新扫描账户",
   "TR_COINJOIN_ANONYMITY_LEVEL_SETUP_DESCRIPTION": "显示与您的资源无法区分的人数。",
-  "TR_COINJOIN_ANONYMITY_LEVEL_SETUP_TITLE": "所需的隐私级别",
-  "TR_COINJOIN_CEX_WARNING": "如果您使用混币、交易所可能不会为您服务。",
+  "TR_COINJOIN_ANONYMITY_LEVEL_SETUP_TITLE": "想要的匿名程度",
+  "TR_COINJOIN_CEX_WARNING": "如果您使用 CoinJoin 混币器，交易所可能不会为您服务。",
   "TR_COINJOIN_COMPLETED": "已成功的完成混币！",
-  "TR_COINJOIN_COMPLETED_DESCRIPTION": "所有资金已成功匿名化",
+  "TR_COINJOIN_COMPLETED_DESCRIPTION": "您的所有资金已成功被 Coinjoin 混合",
   "TR_COINJOIN_DISCOVERY_BLOCK_FETCHING": "获取区块筛选器",
   "TR_COINJOIN_DISCOVERY_BLOCK_PROGRESS": "{current} 在扫描的 {total} 个区块中",
-  "TR_COINJOIN_DISCOVERY_MEMPOOL_FETCHING": "获取内存池过滤器",
-  "TR_COINJOIN_DISCOVERY_MEMPOOL_PROGRESS": "{current} 在 {total} 所分析的交易中",
-  "TR_COINJOIN_ENDED": "混币结束",
-  "TR_COINJOIN_EXPLANATION_TITLE": "它是如何工作的",
-  "TR_COINJOIN_INTERRUPTED_ERROR": "混币因外部错误而被中止",
+  "TR_COINJOIN_DISCOVERY_MEMPOOL_FETCHING": "正在获取内存池过滤器",
+  "TR_COINJOIN_DISCOVERY_MEMPOOL_PROGRESS": "{current} / {total}  的交易已进过分析",
+  "TR_COINJOIN_ENDED": "CoinJoin 混币器已结束运行",
+  "TR_COINJOIN_EXPLANATION_TITLE": "工作原理说明",
+  "TR_COINJOIN_INTERRUPTED_ERROR": "CoinJoin 混币器因外部错误而被中止",
   "TR_COINJOIN_LOGS_ACTION": "查找日志",
   "TR_COINJOIN_LOGS_DESCRIPTION": "打开包含日志文件的文件夹。",
-  "TR_COINJOIN_LOGS_TITLE": "混币调试日志",
+  "TR_COINJOIN_LOGS_TITLE": "CoinJoin 混币器调试日志",
   "TR_COINJOIN_PHASE_0_MESSAGE": "收集输入",
   "TR_COINJOIN_PHASE_1_MESSAGE": "正在建立连接",
   "TR_COINJOIN_PHASE_2_MESSAGE": "注册输出",
-  "TR_COINJOIN_PHASE_3_MESSAGE": "签名交易",
-  "TR_COINJOIN_PHASE_4_MESSAGE": "该回合结束",
+  "TR_COINJOIN_PHASE_3_MESSAGE": "签署交易",
+  "TR_COINJOIN_PHASE_4_MESSAGE": "正在结束该回合",
   "TR_COINJOIN_RECEIVE_WARNING_TITLE": "您应该知道",
   "TR_COINJOIN_ROUND_COUNTDOWN_OVERTIME": "片刻",
-  "TR_COINJOIN_ROUND_COUNTDOWN_PLURAL": "下一笔交易签名从 {value} 开始",
-  "TR_COINJOIN_RUNNING": "混币器正在运行",
-  "TR_COINJOIN_SESSION_COUNTDOWN_PLURAL": "{firstValue, plural, other {剩余: }} {value}",
-  "TR_COINJOIN_SETUP": "您的比特币将与其他人的比特币进行混合、以保护隐私。",
-  "TR_COINJOIN_SETUP_HEADING": "混币设置",
-  "TR_COINJOIN_STEP_1_DESCRIPTION": "给自己发送一些比特币、以进行隐私化。",
+  "TR_COINJOIN_ROUND_COUNTDOWN_PLURAL": "下一笔交易签名开始于 {value}",
+  "TR_COINJOIN_RUNNING": "CoinJoin 混币器正在运行中",
+  "TR_COINJOIN_SESSION_COUNTDOWN_PLURAL": "{firstValue, plural, other {剩余：}} {value}",
+  "TR_COINJOIN_SETUP": "您的比特币将与其他用户的比特币进行混合，以实现匿名性。",
+  "TR_COINJOIN_SETUP_HEADING": "CoinJoin 混币器设置",
+  "TR_COINJOIN_STEP_1_DESCRIPTION": "给自己发送一些比特币，以进行匿名化。",
   "TR_COINJOIN_STEP_1_TITLE": "添加比特币",
-  "TR_COINJOIN_STEP_2_DESCRIPTION": "点击按钮并在Trezor设备上确认。",
-  "TR_COINJOIN_STEP_3_DESCRIPTION": "您的钱币将与其他人的钱币混合、以保护隐私。",
+  "TR_COINJOIN_STEP_2_DESCRIPTION": "点击按钮并在 Trezor 设备上确认。",
+  "TR_COINJOIN_STEP_3_DESCRIPTION": "您的比特币将与其他用户的比特币进行混合，以实现匿名性。",
   "TR_COINJOIN_STEP_3_TITLE": "等待魔法的到来",
-  "TR_COINJOIN_TILE_1_DESCRIPTION": "您可以锁定您的笔记本电脑和Trezor设备",
+  "TR_COINJOIN_TILE_1_DESCRIPTION": "您可以锁定您的电脑和 Trezor 设备",
   "TR_COINJOIN_TILE_1_TITLE": "需要几个小时",
-  "TR_COINJOIN_TILE_2_DESCRIPTION": "您可以安全地暂停混币",
+  "TR_COINJOIN_TILE_2_DESCRIPTION": "您可以安全地暂停 CoinJoin 混币器",
   "TR_COINJOIN_TILE_2_TITLE": "连接后即可使用",
   "TR_COINJOIN_TILE_3_DESCRIPTION": "您的比特币始终由您掌控",
-  "TR_COINJOIN_TILE_3_TITLE": "由您的Trezor设备所保护",
-  "TR_COINJOIN_TRANSACTION_BATCH": "混币交易",
+  "TR_COINJOIN_TILE_3_TITLE": "由您的 Trezor 设备所保护",
+  "TR_COINJOIN_TRANSACTION_BATCH": "CoinJoin 混币器交易",
   "TR_COINMARKET_BEST_RATE": "最优惠的报价",
   "TR_COINMARKET_BUY_AND_SELL": "买入和卖出",
+  "TR_COINMARKET_BUY_AND_SELL_COUNTER": "{totalBuys, plural, =0 {{totalBuys} 次买入} other {{totalBuys} 次买入} } • {totalSells, plural, =0 {{totalSells} 次卖出} other {{totalSells} 次卖出} }",
   "TR_COINMARKET_CEX_TOOLTIP": "中心化加密货币交易所",
   "TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY": "跟换金额或币种",
   "TR_COINMARKET_COMPARE_OFFERS": "对比所有的报价",
   "TR_COINMARKET_COUNTRY": "居住地国家",
-  "TR_COINMARKET_DCA_DOWNLOAD": "下载Invity的APP、开始囤比特币",
+  "TR_COINMARKET_DCA_DOWNLOAD": "下载 Invity 的应用程序，开始囤比特币",
   "TR_COINMARKET_DCA_FEATURE_1_DESCRIPTION": "一个即安全又简单的平均成本法托管储蓄计划。",
-  "TR_COINMARKET_DCA_FEATURE_1_SUBHEADING": "由SatoshiLabs所开发的",
+  "TR_COINMARKET_DCA_FEATURE_1_SUBHEADING": "由 SatoshiLabs 所开发的",
   "TR_COINMARKET_DCA_FEATURE_2_DESCRIPTION": "提取到自己管理的钱包无需额外的费用",
   "TR_COINMARKET_DCA_FEATURE_2_SUBHEADING": "免费提取",
   "TR_COINMARKET_DCA_FEATURE_3_DESCRIPTION": "一个快速、简洁、用户友好的界面。",
   "TR_COINMARKET_DCA_FEATURE_3_SUBHEADING": "操作简单",
   "TR_COINMARKET_DCA_FEATURE_4_DESCRIPTION": "观察您的投资历史、金额与频率",
   "TR_COINMARKET_DCA_FEATURE_4_SUBHEADING": "平均成本计算概况",
-  "TR_COINMARKET_DCA_HEADING": "使用Invity的APP来帮您囤比特币",
+  "TR_COINMARKET_DCA_HEADING": "使用 Invity 的应用程序来帮您囤比特币",
   "TR_COINMARKET_DEX_TOOLTIP": "去中心化加密货币交易所",
   "TR_COINMARKET_ENTER_AMOUNT_IN": "输入金额 {currency}",
   "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_KYC_ALL": "所有实名认证选择",
   "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_NO_KYC": "永不要求实名认证",
   "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_ALL": "所有中心化与去中心化交易所的报价",
   "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_DEX": "去中心化交易所",
-  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FIXED_CEX": "固定利率的中心化交易所",
-  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FLOATING_CEX": "浮动利率的中心化交易所",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FIXED_CEX": "固定汇率的中心化交易所",
+  "TR_COINMARKET_EXCHANGE_COMPARATOR_FILTER_RATE_FLOATING_CEX": "浮动汇率的中心化交易所",
   "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING": "去中心化交易所",
-  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING_TOOLTIP": "去中心化交易所 —— 通过区块链交易进行加密货币交易、无需中心化中介。",
-  "TR_COINMARKET_EXCHANGE_FIXED_OFFERS_HEADING": "固定利率的中心化交易所",
-  "TR_COINMARKET_EXCHANGE_FLOAT_OFFERS_HEADING": "浮动利率的中心化交易所",
-  "TR_COINMARKET_FEATURED_OFFERS_HEADING": "精选的报价",
+  "TR_COINMARKET_EXCHANGE_DEX_OFFERS_HEADING_TOOLTIP": "去中心化交易所允许您直接在区块链上交易加密货币，无需中央机构或中介。",
+  "TR_COINMARKET_EXCHANGE_FIXED_OFFERS_HEADING": "固定汇率的中心化交易所",
+  "TR_COINMARKET_EXCHANGE_FLOAT_OFFERS_HEADING": "浮动汇率的中心化交易所",
+  "TR_COINMARKET_FEATURED_OFFERS_HEADING": "精选报价",
   "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_BUY_LABEL": "支付: ",
-  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_SELL_LABEL": "接收方式: ",
+  "TR_COINMARKET_FEATURED_OFFER_PAYMENT_METHOD_SELL_LABEL": "接收方式：",
   "TR_COINMARKET_FEES_INCLUDED": "已包括矿工费",
-  "TR_COINMARKET_FEES_NOT_INCLUDED": "没有包括矿工费",
+  "TR_COINMARKET_FEES_NOT_INCLUDED": "并不包括矿工费",
   "TR_COINMARKET_FEES_ON_WEBSITE": "有些费用并没有包括在显示的价格; 最终的价格会在供应商网站上显示。",
-  "TR_COINMARKET_FIX_RATE": "固定的价格",
-  "TR_COINMARKET_FIX_RATE_DESCRIPTION": "通过支付更高的费用、将您的利率锁定至15分钟。",
-  "TR_COINMARKET_FLOATING_RATE": "浮动价格",
-  "TR_COINMARKET_FLOATING_RATE_DESCRIPTION": "获得一个估算价格可能会随着实时市场变化而调整。",
+  "TR_COINMARKET_FIX_RATE": "固定汇率",
+  "TR_COINMARKET_FIX_RATE_DESCRIPTION": "通过支付更高的费用，将您的汇率锁定至 15 分钟。",
+  "TR_COINMARKET_FLOATING_RATE": "浮动汇率",
+  "TR_COINMARKET_FLOATING_RATE_DESCRIPTION": "获得一个可以根据实时市场变化进行调整的估计汇率。",
   "TR_COINMARKET_KYC_DEX": "从不需要实名认证。去中心化加密货币交易所兑换要么成功、要么失败。👍",
   "TR_COINMARKET_KYC_NO_KYC": "从不需要实名认证。特殊情况自动退款。👍",
   "TR_COINMARKET_KYC_NO_REFUND": "特殊情况下需要实名认证。退款需要实名认证。👈",
@@ -556,72 +556,69 @@
   "TR_COINMARKET_KYC_YES_REFUND": "特殊情况下需要实名认证。退款无需实名认证。🤝",
   "TR_COINMARKET_LAST_TRANSACTIONS": "最近的交易",
   "TR_COINMARKET_NETWORK_FEE": "网络矿工费",
-  "TR_COINMARKET_NETWORK_TOKENS": "{networkName} 代币",
+  "TR_COINMARKET_NETWORK_TOKENS": "{networkName} 的代币",
   "TR_COINMARKET_NO_CEX_PROVIDER_FOUND": "未找到中心化加密货币交易所的供应商",
-  "TR_COINMARKET_NO_DEX_PROVIDER_FOUND": "未找到中心化加密货币交易所的供应商",
+  "TR_COINMARKET_NO_DEX_PROVIDER_FOUND": "未找到去中心化交易所的供应商",
   "TR_COINMARKET_NO_METHODS_AVAILABLE": "没有可用的方法",
-  "TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN": "自动重新加载于",
-  "TR_COINMARKET_NO_OFFERS_BACK_BUTTON": "回到交易",
-  "TR_COINMARKET_NO_OFFERS_HEADER": "没有报价",
-  "TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE": "抱歉、由于服务器连接问题、我们目前没有任何报价。",
-  "TR_COINMARKET_NO_OFFERS_MESSAGE": "抱歉、我们目前没有任何报价。请尝试重新加载页面或修改您的查询。",
-  "TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON": "重新加载页面",
   "TR_COINMARKET_OFFERS_EMPTY": "没有符合您要求的报价。更改国家或购买金额。",
   "TR_COINMARKET_OFFERS_REFRESH": "报价刷新在",
   "TR_COINMARKET_OFFERS_SELECT": "选择",
   "TR_COINMARKET_OFFER_LOOKING": "正在帮您寻找最优惠的报价",
   "TR_COINMARKET_OFFER_NO_FOUND": "暂无适合您所要求的报价。",
-  "TR_COINMARKET_ON_NETWORK_CHAIN": "在 {networkName} 链",
+  "TR_COINMARKET_ON_NETWORK_CHAIN": "在 {networkName} 链上",
   "TR_COINMARKET_OTHER_CURRENCIES": "其他货币",
   "TR_COINMARKET_PAYMENT_METHOD": "支付方式",
-  "TR_COINMARKET_POPULAR_CURRENCIES": "热门加密货币",
-  "TR_COINMARKET_RATE": "利率",
+  "TR_COINMARKET_POPULAR_CURRENCIES": "热门货币",
+  "TR_COINMARKET_RATE": "汇率",
   "TR_COINMARKET_RECEIVE_METHOD": "接收方法",
   "TR_COINMARKET_SELL": "卖出",
   "TR_COINMARKET_SHOW_OFFERS": "比较报价",
   "TR_COINMARKET_SWAP": "兑换",
   "TR_COINMARKET_SWAP_AMOUNT": "兑换金额",
-  "TR_COINMARKET_SWAP_DEX_MODAL_CONFIRM": "我已经准备好兑换了",
+  "TR_COINMARKET_SWAP_COUNTER": "{totalSwaps, plural, =0 {{totalSwaps} 次兑换} other {{totalSwaps} 次兑换} }",
+  "TR_COINMARKET_SWAP_DEX_MODAL_CONFIRM": "我已经准备好兑换",
   "TR_COINMARKET_SWAP_DEX_MODAL_FOR_YOUR_SAFETY": "使用 {provider} 来兑换 {fromCrypto} 到 {toCrypto}",
   "TR_COINMARKET_SWAP_DEX_MODAL_LEGAL_HEADER": "法律声明",
-  "TR_COINMARKET_SWAP_DEX_MODAL_SECURITY_HEADER": "Trezor一直把安全放在第一位",
+  "TR_COINMARKET_SWAP_DEX_MODAL_SECURITY_HEADER": "Trezor 一直把安全放在第一位",
   "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_1": "我想使用 {provider} 去中心化交易所的智能合约来兑换加密货币。",
   "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_2": "我想为自己的账户兑换加密货币。我知道提供商的政策可能要求实名认证。",
   "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_3": "我知道加密货币交易是最终交易、不能撤销或退款。因欺诈或错误操作所造成的损失可能无法追回。",
-  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4": "我知道Invity不提供此项服务。它受 {provider} 的条款和条件管辖。",
+  "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4": "我知道 Invity 不提供此项服务。它受 {provider} 的条款和条件管辖。",
   "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_5": "我不会将此功能用于赌博、欺诈或任何违反Invity或供应商服务条款或任何适用法律的活动。",
   "TR_COINMARKET_SWAP_DEX_MODAL_TERMS_6": "我知道加密货币是一种新兴的金融工具、不同地区的法规可能有所不同。这可能会增加欺诈、盗窃或市场不稳定的风险。",
-  "TR_COINMARKET_SWAP_DEX_MODAL_VERIFIED_PARTNERS_HEADER": "经Invity认证的合作伙伴",
-  "TR_COINMARKET_SWAP_MODAL_CONFIRM": "我已经准备好了兑换",
+  "TR_COINMARKET_SWAP_DEX_MODAL_VERIFIED_PARTNERS_HEADER": "已经过 Invity 认证的合作伙伴",
+  "TR_COINMARKET_SWAP_MODAL_CONFIRM": "我已经准备好兑换",
   "TR_COINMARKET_SWAP_MODAL_FOR_YOUR_SAFETY": "使用 {provider} 来兑换 {fromCrypto} 到 {toCrypto}",
   "TR_COINMARKET_SWAP_MODAL_LEGAL_HEADER": "法律声明",
-  "TR_COINMARKET_SWAP_MODAL_SECURITY_HEADER": "Trezor一直把安全放在第一位",
-  "TR_COINMARKET_SWAP_MODAL_TERMS_1": "我是来兑换加密货币的。如果我是出于其他原因被引导到这个网站、我会在继续之前联系Trezor的客服。",
+  "TR_COINMARKET_SWAP_MODAL_SECURITY_HEADER": "Trezor 一直把安全放在第一位",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_1": "我是来兑换加密货币的。如果我是出于其他原因被引导到这个网站，我会在继续之前联系 Trezor 的客服。",
   "TR_COINMARKET_SWAP_MODAL_TERMS_2": "我想为自己的账户兑换加密货币。我了解提供商的政策可能要求实名认证。",
   "TR_COINMARKET_SWAP_MODAL_TERMS_3": "我知道加密货币交易是最终交易、不能撤销或退款。因欺诈或错误造成的损失可能无法追回。",
-  "TR_COINMARKET_SWAP_MODAL_TERMS_4": "我知道Invity不提供此项服务。它受 {provider} 的条款和条件管辖。",
-  "TR_COINMARKET_SWAP_MODAL_TERMS_5": "我不会将此功能用于赌博、欺诈或任何违反Invity或供应商服务条款或任何适用法律的活动。",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_4": "我知道 Invity 不提供此项服务。它受 {provider} 的条款和条件管辖。",
+  "TR_COINMARKET_SWAP_MODAL_TERMS_5": "我不会将此功能用于赌博、欺诈或任何违反 Invity 或供应商服务条款或任何适用法律的活动。",
   "TR_COINMARKET_SWAP_MODAL_TERMS_6": "我知道加密货币是一种新兴的金融工具、不同地区的法规可能有所不同。这可能会增加欺诈、盗窃或市场不稳定的风险。",
-  "TR_COINMARKET_SWAP_MODAL_VERIFIED_PARTNERS_HEADER": "经Invity验证的合作伙伴",
+  "TR_COINMARKET_SWAP_MODAL_VERIFIED_PARTNERS_HEADER": "已经过 Invity 认证的合作伙伴",
   "TR_COINMARKET_TOKEN_NETWORK": "{tokenName} 在 {networkName} 网络",
   "TR_COINMARKET_TRADE_FEE": "交易费",
-  "TR_COINMARKET_UNKNOWN_PROVIDER": "佚名供应商",
-  "TR_COINMARKET_YOUR_BEST_OFFER": "您最优惠的报价",
-  "TR_COINMARKET_YOU_BUY": "您将购买",
-  "TR_COINMARKET_YOU_GET": "您将获得",
+  "TR_COINMARKET_TRANS_ID": "交易ID: ",
+  "TR_COINMARKET_UNKNOWN_PROVIDER": "未知提供商",
+  "TR_COINMARKET_VIEW_DETAILS": "查看详情",
+  "TR_COINMARKET_YOUR_BEST_OFFER": "您的最优惠报价",
+  "TR_COINMARKET_YOU_BUY": "您购买",
+  "TR_COINMARKET_YOU_GET": "您获得",
   "TR_COINMARKET_YOU_PAY": "您支付",
   "TR_COINMARKET_YOU_RECEIVE": "您收到",
-  "TR_COINMARKET_YOU_SELL": "您将卖出",
+  "TR_COINMARKET_YOU_SELL": "您卖出",
   "TR_COINMARKET_YOU_WILL_GET": "您将获得",
   "TR_COINMARKET_YOU_WILL_PAY": "您将支付",
   "TR_COINS": "加密货币",
-  "TR_COIN_CONTROL": "货币控制",
-  "TR_COIN_CONTROL_TOOLTIP": "硬币控制使得手动选择未消费的交易输出可以用作交易的输入。",
+  "TR_COIN_CONTROL": "币控制",
+  "TR_COIN_CONTROL_TOOLTIP": "“币控制” 功能可手动选择用作交易输入的 “未消费交易输出”。",
   "TR_COIN_DISCOVERY_LOADER_DESCRIPTION": "检查隐藏钱包的余额和交易情况",
-  "TR_COIN_SETTINGS": "货币设置",
-  "TR_COLOR_SCHEME": "配色方案",
-  "TR_COLOR_SCHEME_DARK": "黑夜模式",
-  "TR_COLOR_SCHEME_DESCRIPTION": "您可以选择应用程序是使用黑暗元素在浅色背景上、还是使用黑暗背景下的浅色元素。",
+  "TR_COIN_SETTINGS": "加密货币设置",
+  "TR_COLOR_SCHEME": "颜色主题",
+  "TR_COLOR_SCHEME_DARK": "深色",
+  "TR_COLOR_SCHEME_DESCRIPTION": "您可以选择应用程序是使用深色元素在浅色背景上、还是使用深色背景下的浅色元素。",
   "TR_COLOR_SCHEME_LIGHT": "浅色",
   "TR_COMMUNITY_LANGUAGES": "社区",
   "TR_COMPATIBILITY_SIG_FORMAT": "Electrum",
@@ -629,49 +626,49 @@
   "TR_CONFIRM": "确认",
   "TR_CONFIRMED_TX": "已确认",
   "TR_CONFIRMING_TX": "确认交易",
-  "TR_CONFIRM_ACTION_ON_YOUR": "按照您的Trezor设备屏幕上的指示操作",
+  "TR_CONFIRM_ACTION_ON_YOUR": "请按照您的 Trezor 设备屏幕上的指示来操作",
   "TR_CONFIRM_ADDRESS": "确认地址",
-  "TR_CONFIRM_BEFORE_COPY": "复制前在Trezor设备上确认",
-  "TR_CONFIRM_CONDITIONS": "在继续之前确认条款。",
-  "TR_CONFIRM_EMPTY_HIDDEN_WALLET_ON": "确认在 \"{deviceLabel}\" 设备上的隐藏钱包为空。",
-  "TR_CONFIRM_EVM_EXPLANATION_RECEIVE_DESCRIPTION_ETH": "请您确保只通过以太坊网络接收加密货币。如果加密货币或代币被发送到以太坊网络之外 (如Polygon或Avalanche)、您可能无法访问它们。",
+  "TR_CONFIRM_BEFORE_COPY": "复制之前，请在 Trezor 设备上确认",
+  "TR_CONFIRM_CONDITIONS": "请在继续之前确认条款。",
+  "TR_CONFIRM_EMPTY_HIDDEN_WALLET_ON": "请确认在 \"{deviceLabel}\" 设备上的密码短语钱包为空。",
+  "TR_CONFIRM_EVM_EXPLANATION_RECEIVE_DESCRIPTION_ETH": "请您确保只通过以太坊网络接收加密货币。如果加密货币或代币被发送到以太坊网络之外 (如 Polygon 或 Avalanche 网络)，您可能无法访问它们。",
   "TR_CONFIRM_EVM_EXPLANATION_RECEIVE_DESCRIPTION_OTHER": "请您确保只通过 {network} 网络接收加密货币。如果加密货币币或代币被发送 {network} 网络之外、您可能无法访问它们。",
   "TR_CONFIRM_EVM_EXPLANATION_RECEIVE_TITLE": "通过 {network} 网络接收",
   "TR_CONFIRM_EVM_EXPLANATION_SEND_DESCRIPTION": "请您确保只通过 {network} 网络发送加密货币。如果在 {network} 网络之外发送加密货币或代币、接收方可能无法访问它们。",
   "TR_CONFIRM_EVM_EXPLANATION_SEND_TITLE": "通过 {network} 网络发送",
-  "TR_CONFIRM_ON_TREZOR": "在Trezor设备上确认",
-  "TR_CONFIRM_PASSPHRASE": "确认 密码短语",
-  "TR_CONFIRM_PASSPHRASE_SOURCE": "确认在 \"{deviceLabel}\" 设备上的空隐藏钱包 密码短语来源。",
-  "TR_CONFIRM_PASSPHRASE_WITHOUT_ADVICE_DESCRIPTION": "输入您的密码以授权此操作。",
+  "TR_CONFIRM_ON_TREZOR": "请在 Trezor 设备上确认",
+  "TR_CONFIRM_PASSPHRASE": "请确认密码短语",
+  "TR_CONFIRM_PASSPHRASE_SOURCE": "请在 \"{deviceLabel}\" 设备上确认隐藏钱包的密码短语源。",
+  "TR_CONFIRM_PASSPHRASE_WITHOUT_ADVICE_DESCRIPTION": "输入您的密码短语以授权此操作。",
   "TR_CONGRATS": "恭喜！",
   "TR_CONNECT": "连接",
   "TR_CONNECTED": "已连接",
   "TR_CONNECTED_DIFFERENT_DEVICE": "已连接了其一个设备吗？",
   "TR_CONNECTED_TO_PROVIDER": "以 {user} 的身份连接到 {provider}",
   "TR_CONNECTED_TO_PROVIDER_LOCALLY": "本地保存标签",
-  "TR_CONNECTION_LOST": "连接丢失",
+  "TR_CONNECTION_LOST": "连接中断",
   "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_BUTTON": "管理",
-  "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_DESCRIPTION": "启用密码短语输入对话框、以便在打开Trezor Suite时打开。",
-  "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_TITLE": "您是否主要使用密码？",
-  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "在Trezor设备上验证以确认接收地址。不建议在未确认的情况下继续操作。",
+  "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_DESCRIPTION": "启用密码短语输入对话框，以便在启动 Trezor Suite 时打开。",
+  "TR_CONNECT_DEVICE_PASSPHRASE_BANNER_TITLE": "您是否主要使用密码短语？",
+  "TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION": "请在 Trezor 设备上验证以确认接收地址。不建议在未确认的情况下继续操作。",
   "TR_CONNECT_DEVICE_RECEIVE_PROMO_TITLE": "无法验证接收地址",
-  "TR_CONNECT_DEVICE_SEND_PROMO_DESCRIPTION": "若要发送加密货币、请连接您的Trezor设备。",
-  "TR_CONNECT_DEVICE_SEND_PROMO_TITLE": "您的Trezor设备未连接",
-  "TR_CONNECT_TREZOR_TO_SEND_BUTTON": "若要发送加密货币、请连接您的Trezor设备。",
-  "TR_CONNECT_YOUR_DEVICE": "连接并解锁您的Trezor设备",
-  "TR_CONTACT_SUPPORT": "联系客服",
-  "TR_CONTACT_TREZOR_SUPPORT": "联系Trezor客服",
+  "TR_CONNECT_DEVICE_SEND_PROMO_DESCRIPTION": "若要发送加密货币，请连接您的 Trezor 设备。",
+  "TR_CONNECT_DEVICE_SEND_PROMO_TITLE": "您的 Trezor 设备未连接",
+  "TR_CONNECT_TREZOR_TO_SEND_BUTTON": "连接您的 Trezor 设备以发送",
+  "TR_CONNECT_YOUR_DEVICE": "请连接并解锁您的 Trezor 设备",
+  "TR_CONTACT_SUPPORT": "联系 Trezor 客服",
+  "TR_CONTACT_TREZOR_SUPPORT": "联系 Trezor 客服",
   "TR_CONTINUE": "继续",
   "TR_CONTINUE_ANYWAY": "仍然继续",
   "TR_CONTINUE_ONLY_WITH_SEED": "仅当您有钱包助记词备份时才继续",
-  "TR_CONTINUE_ONLY_WITH_SEED_DESCRIPTION": "如果您没有恢复种子、甚至Trezor Support 也不能帮助您恢复您的资金，如果您的设备被重置。 如果您有多个恢复种子、请确保您有正确的一个准备好并易于恢复此特定的Trezor设备。",
-  "TR_CONTINUE_ONLY_WITH_SEED_DESCRIPTION_2": "在继续之前、 <button>、在设置</button>中检查您的备份。这是检查和验证恢复种子的简单方法。",
-  "TR_CONTINUE_ON_TREZOR": "在Trezor设备上继续",
+  "TR_CONTINUE_ONLY_WITH_SEED_DESCRIPTION": "如果您没有恢复种子，甚至 Trezor Support 也不能帮助您恢复您的资金，如果您的设备被重置。 如果您有多个恢复种子，请确保您有正确的一个准备好并易于恢复此特定的 Trezor 设备。",
+  "TR_CONTINUE_ONLY_WITH_SEED_DESCRIPTION_2": "在继续之前，<button>在设置中检查您的钱包备份</button>。这是检查和验证钱包助记词备份的简单方法。",
+  "TR_CONTINUE_ON_TREZOR": "在 Trezor 设备上继续",
   "TR_CONTINUE_TO_BACKUP": "继续备份",
   "TR_CONTINUE_TO_PIN": "创建PIN码",
-  "TR_CONTRACT": "智能合约",
-  "TR_CONTRACT_ADDRESS": "合约地址: ",
-  "TR_CONTRACT_TRANSACTION": "智能合约交易",
+  "TR_CONTRACT": "合约",
+  "TR_CONTRACT_ADDRESS": "合约地址：",
+  "TR_CONTRACT_TRANSACTION": "合约交易",
   "TR_CONVERT_TO_CHECKSUM_ADDRESS": "转换为校验地址",
   "TR_CONVERT_TO_LOWERCASE": "转换为小写",
   "TR_COPY_ADDRESS_CONTRACT": "切勿向合约地址汇款。",
@@ -679,24 +676,24 @@
   "TR_COPY_ADDRESS_POLICY_ID": "切勿向政策ID地址汇款。",
   "TR_COPY_AND_CLOSE": "复制并关闭",
   "TR_COPY_SIGNED_MESSAGE": "复制签署的留言",
-  "TR_COPY_TO_CLIPBOARD_TX_ID": "复制",
+  "TR_COPY_TO_CLIPBOARD": "复制",
   "TR_COULD_NOT_RETRIEVE_CHANGELOG": "无法获取更新日志",
   "TR_COULD_NOT_RETRIEVE_DATA": "无法获取数据",
-  "TR_COUNT_WALLETS": "{count} {count, plural, one {钱包} other {钱包}}",
+  "TR_COUNT_WALLETS": "{count} {count, plural, other {个钱包}}",
   "TR_CREATE_BACKUP": "创建备份",
-  "TR_CREATE_MULTI_SHARE_BACKUP": "创建多共享备份",
-  "TR_CREATE_MULTI_SHARE_BACKUP_CREATED": "已创建了多共享备份",
-  "TR_CREATE_MULTI_SHARE_BACKUP_CREATED_INFO_TEXT": "您已经在增强安全性方面迈出了重要一步。现在、请选择值得信赖的个人或安全地点来存储您的多共享备份份额。",
-  "TR_CREATE_SHARES": "在Trezor设备上创建多共享备份份额",
-  "TR_CREATE_SHARES_CARD_1": "拿上纸和笔、记录在 <cardsLink> 备份卡片</cardsLink>、或使用 <keepLink>Trezor Keep Metal</keepLink>。",
-  "TR_CREATE_SHARES_CARD_2": "不要拍照或制作您的钱包备份的数码备份",
-  "TR_CREATE_SHARES_CARD_3": "确保只有您自己一人、没有好奇的旁观者",
-  "TR_CREATE_SHARES_EXAMPLE": "例如: 共有5份备份份额、找回您的钱包需要任意3份",
-  "TR_CREATE_SHARES_EXPLANATION": "选择总份额数、然后选择恢复Trezor所需的最小份额数。",
+  "TR_CREATE_MULTI_SHARE_BACKUP": "创建秘密共享备份",
+  "TR_CREATE_MULTI_SHARE_BACKUP_CREATED": "已创建了秘密共享备份",
+  "TR_CREATE_MULTI_SHARE_BACKUP_CREATED_INFO_TEXT": "您已经在增强安全性方面迈出了重要一步。现在、请选择值得信赖的个人或安全地点来存储您的秘密共享份额。",
+  "TR_CREATE_SHARES": "在 Trezor 设备上创建秘密共享份额",
+  "TR_CREATE_SHARES_CARD_1": "拿上纸和笔，记录在 <cardsLink> 备份卡片</cardsLink>、或使用 <keepLink>Trezor Keep Metal</keepLink>。",
+  "TR_CREATE_SHARES_CARD_2": "不要拍照或制作钱包备份的数码副本",
+  "TR_CREATE_SHARES_CARD_3": "确保只有您自己一人，周边没有旁观的闲人",
+  "TR_CREATE_SHARES_EXAMPLE": "例如：共有 5 份秘密共享份额，找回您的钱包需要其中任意的 3 份",
+  "TR_CREATE_SHARES_EXPLANATION": "选择总份额数，然后选择恢复钱包所需的最小份额数。",
   "TR_CREATE_WALLET": "创建新钱包",
-  "TR_CREATE_WALLET_DEFAULT_OPTION_DISABLED_TOOLTIP": "更新您的Trezor设备固件以启用单份备份功能。",
+  "TR_CREATE_WALLET_DEFAULT_OPTION_DISABLED_TOOLTIP": "更新您的 Trezor 设备固件以启用单份备份功能。",
   "TR_CREATE_WALLET_DEFAULT_OPTION_TOOLTIP": "建议选择简洁、灵活的设置。",
-  "TR_CURRENT_FEE": "当前",
+  "TR_CURRENT_FEE": "当前的费率",
   "TR_CUSTOM": "自定义",
   "TR_CUSTOM_BACKEND": "自定义后端",
   "TR_CUSTOM_BACKEND_BACKEND_ALREADY_ADDED": "后端已添加",
@@ -713,12 +710,13 @@
   "TR_DASHBOARD_ASSET_FAILED": "资产未正确加载",
   "TR_DASHBOARD_DISCOVERY_ERROR": "发现错误",
   "TR_DASHBOARD_DISCOVERY_ERROR_PARTIAL_DESC": "帐户未正确加载 {details}",
+  "TR_DATA": "数据",
   "TR_DATABASE_UPGRADE_BLOCKED": "数据库升级被另一个应用程序实例阻止",
   "TR_DATA_ANALYTICS_CATEGORY_1": "平台",
-  "TR_DATA_ANALYTICS_CATEGORY_1_ITEM_1": "操作系统，Trezor型号，版本等。",
-  "TR_DATA_ANALYTICS_CATEGORY_2": "使用数据",
-  "TR_DATA_ANALYTICS_CATEGORY_2_ITEM_1": "您如何使用Suite",
-  "TR_DATA_ANALYTICS_CATEGORY_3": "受众",
+  "TR_DATA_ANALYTICS_CATEGORY_1_ITEM_1": "操作系统、Trezor 设备型号、Suite 版本等。",
+  "TR_DATA_ANALYTICS_CATEGORY_2": "用户使用数据",
+  "TR_DATA_ANALYTICS_CATEGORY_2_ITEM_1": "您如何使用 Suite",
+  "TR_DATA_ANALYTICS_CATEGORY_3": "观众",
   "TR_DATA_ANALYTICS_CATEGORY_3_ITEM_1": "语言、用户数量等。",
   "TR_DATE_DAY_LONG": "1天",
   "TR_DATE_DAY_SHORT": "1天",
@@ -736,180 +734,186 @@
   "TR_DEFAULT_WALLET_LOADING_PASSPHRASE": "密码短语",
   "TR_DEFAULT_WALLET_LOADING_STANDARD": "标准",
   "TR_DELIVERY": "交付时间",
-  "TR_DESKTOP_APP_PROMO_GET": "获取桌面版",
-  "TR_DESKTOP_APP_PROMO_HEADING": "充分利用Trezor Suite",
-  "TR_DESKTOP_APP_PROMO_TEXT": "直接在桌面上轻松的进行加密货币管理",
+  "TR_DESKTOP_APP_PROMO_GET": "获取桌面应用程序",
+  "TR_DESKTOP_APP_PROMO_HEADING": "充分利用 Trezor Suite",
+  "TR_DESKTOP_APP_PROMO_TEXT": "直接在电脑上轻松地进行加密货币管理",
   "TR_DETAIL": "详情",
   "TR_DEVICE": "设备",
   "TR_DEVICE_AUTHENTICITY_ERROR": "我们无法验证您的设备的真实性",
   "TR_DEVICE_AUTHENTICITY_ITEM_1": "此检查是确保设备的可靠性、完整性和安全使用必须执行的步骤。",
-  "TR_DEVICE_AUTHENTICITY_ITEM_2": "这可以确认您的硬件钱包内的芯片是正品并且来自Trezor。",
-  "TR_DEVICE_AUTHENTICITY_ITEM_3": "一旦您的设备通过了健康检查、您就可以放心地使用Trezor了。",
+  "TR_DEVICE_AUTHENTICITY_ITEM_2": "这可以确认您的硬件钱包内的芯片是正品并且来自 Trezor。",
+  "TR_DEVICE_AUTHENTICITY_ITEM_3": "一旦您的设备通过了健康检查、您就可以放心地使用 Trezor 了。",
   "TR_DEVICE_AUTHENTICITY_OPT_OUT_BUTTON": "关闭",
   "TR_DEVICE_AUTHENTICITY_OPT_OUT_BUTTON_DISABLED": "开启",
-  "TR_DEVICE_AUTHENTICITY_OPT_OUT_DESCRIPTION": "设备检查是一项重要的安全功能、可确保您的安全、避免使用假冒或受损设备。我们不建议将其关闭。",
-  "TR_DEVICE_AUTHENTICITY_OPT_OUT_DESCRIPTION_DISABLED": "设备检查是一项重要的安全功能、可确保您的安全、避免使用假冒或受损设备。我们强烈建议打开它。",
+  "TR_DEVICE_AUTHENTICITY_OPT_OUT_DESCRIPTION": "设备检查是一项重要的安全功能，可确保您的安全，避免使用假冒或受损设备。我们不建议将其关闭。",
+  "TR_DEVICE_AUTHENTICITY_OPT_OUT_DESCRIPTION_DISABLED": "设备检查是一项重要的安全功能，可确保您的安全，避免使用假冒或受损设备。我们强烈建议开启它。",
   "TR_DEVICE_AUTHENTICITY_OPT_OUT_MODAL_BUTTON": "关闭",
-  "TR_DEVICE_AUTHENTICITY_OPT_OUT_MODAL_CHECKBOX_TITLE": "我已阅读并理解上述内容",
-  "TR_DEVICE_AUTHENTICITY_OPT_OUT_MODAL_DESCRIPTION_1": "只有在完全清楚自己在做什么并有明确理由的情况下、才能关闭设备检查。如果您不确定、请联系Trezor客服寻求帮助。",
+  "TR_DEVICE_AUTHENTICITY_OPT_OUT_MODAL_CHECKBOX_TITLE": "我已阅读并理解上述的内容",
+  "TR_DEVICE_AUTHENTICITY_OPT_OUT_MODAL_DESCRIPTION_1": "只有在完全清楚自己在做什么并有明确理由的情况下，才能关闭设备检查。如果您不确定，请联系 Trezor 客服寻求帮助。",
   "TR_DEVICE_AUTHENTICITY_OPT_OUT_MODAL_DESCRIPTION_2": "除非您的设备事先已成功通过检查、否则不要关闭此功能。使用未经验证的设备可能会导致资金损失。",
-  "TR_DEVICE_AUTHENTICITY_OPT_OUT_MODAL_DESCRIPTION_3": "Trezor客服绝不会要求您关闭设备检查功能。该功能旨在确保您的安全。",
-  "TR_DEVICE_AUTHENTICITY_OPT_OUT_TITLE": "禁用设备检查",
-  "TR_DEVICE_AUTHENTICITY_OPT_OUT_TITLE_DISABLED": "启用设备检查",
+  "TR_DEVICE_AUTHENTICITY_OPT_OUT_MODAL_DESCRIPTION_3": "Trezor 客服绝不会要求您关闭设备检查功能。该功能旨在确保您的安全。",
+  "TR_DEVICE_AUTHENTICITY_OPT_OUT_TITLE": "禁用设备检查功能",
+  "TR_DEVICE_AUTHENTICITY_OPT_OUT_TITLE_DISABLED": "启用设备检查功能",
   "TR_DEVICE_AUTHENTICITY_SUCCESS": "设备真实性检查通过。",
   "TR_DEVICE_AUTHENTICITY_SUCCESS_DESCRIPTION": "您的 {deviceName} 已准备就绪！",
   "TR_DEVICE_COMPROMISED_HEADING": "您的设备可能不安全",
-  "TR_DEVICE_COMPROMISED_TEXT": "请联系Trezor客服、了解您的设备出现了什么问题、以及下一步该怎么做。",
-  "TR_DEVICE_COMPROMISED_TEXT_SOFT": "在您开始使用之前、我们希望确保您的设备处于最佳状态。请联系Trezor客服、了解下一步操作。",
+  "TR_DEVICE_COMPROMISED_TEXT": "请联系 Trezor 客服，了解您的设备出现了什么问题，以及下一步该怎么做。",
+  "TR_DEVICE_COMPROMISED_TEXT_SOFT": "在您开始使用之前，我们希望确保您的设备处于最佳状态。请联系 Trezor 客服、了解下一步操作。",
   "TR_DEVICE_CONNECTED": "设备已连接",
   "TR_DEVICE_CONNECTED_BOOTLOADER": "设备已连接到加载引导程序",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT": "不小心进入了加载引导模式？",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_BUTTON": "连接电缆时不要按住任何按钮。",
   "TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_TOUCH": "在不接触屏幕的情况下重新连接设备。",
+  "TR_DEVICE_CONNECTED_UNACQUIRED": "此设备正在其他地方使用。",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION": "应用程序 {transportSessionOwner} 当前可能正在使用该设备。如有需要，您可以控制该设备。",
+  "TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION_UNKNOWN_APP": "当前可能有其他应用程序正在使用该设备。如有需要，您可以控制该设备。",
   "TR_DEVICE_CONNECTED_WRONG_STATE": "检测到设备处于不正确的状态",
-  "TR_DEVICE_DISCONNECTED_DURING_ACTION_DESCRIPTION": "您的Trezor设备在备份过程中断开连接。我们强烈建议您使用设备设置中的恢复出厂设置选项来清除设备数据并重新启动钱包备份过程。",
+  "TR_DEVICE_DISCONNECTED_DURING_ACTION_DESCRIPTION": "您的 Trezor 设备在备份过程中断开连接。我们强烈建议您使用设备设置中的恢复出厂设置选项来清除设备数据并重新启动钱包备份过程。",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH": "固件哈希检查失败。您的 Trezor 设备可能是假冒产品。",
+  "TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR": "无法进行固件哈希检查。您的 Trezor 设备可能是假冒产品。",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON": "关闭",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON_DISABLED": "开启",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION": "固件修订检查是一项至关重要的安全功能。我们强烈建议保持开启状态。",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION_DISABLED": "固件修订检查是一项至关重要的安全功能。我们强烈建议保持开启状态。",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_BUTTON": "关闭",
-  "TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_1": "只有在完全了解风险并有正当理由的情况下、才能关闭固件版本检查。如果不确定、请联系Trezor支持部门寻求帮助。",
-  "TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_2": "只有当您的Trezor设备之前已成功通过检查时、才可关闭此功能。使用未经验证的设备可能会导致资金损失。",
-  "TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_3": "Trezor客服绝不会要求您关闭固件版本检查。该功能旨在保护您的安全。",
+  "TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_1": "只有在完全了解风险并有正当理由的情况下，才能关闭固件版本检查。如果不确定，请联系 Trezor 客服寻求帮助。",
+  "TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_2": "只有当您的 Trezor 设备之前已成功通过检查时，才可关闭此功能。使用未经验证的设备可能会导致资金损失。",
+  "TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_3": "Trezor 客服绝不会要求您关闭固件版本检查。该功能旨在保护您的安全。",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_TITLE": "关闭固件修订检查功能",
   "TR_DEVICE_FIRMWARE_REVISION_CHECK_TITLE_DISABLED": "开启固件修订检查功能",
-  "TR_DEVICE_FIRMWARE_REVISION_CHECK_UNABLE_TO_PERFORM": "无法进行固件版本检查。请上网验证您的Trezor设备的固件版本。",
+  "TR_DEVICE_FIRMWARE_REVISION_CHECK_UNABLE_TO_PERFORM": "无法进行固件版本检查。请上网验证您的 Trezor 设备的固件版本。",
   "TR_DEVICE_FW_UNKNOWN": "未知",
-  "TR_DEVICE_IN_BOOTLOADER": "设备处于引导加载模式。",
-  "TR_DEVICE_IN_RECOVERY_MODE": "您的设备处于恢复模式。",
+  "TR_DEVICE_IN_BOOTLOADER": "设备处于引导加载器模式。",
+  "TR_DEVICE_IN_RECOVERY_MODE": "您的设备已进入恢复模式。",
   "TR_DEVICE_IN_RECOVERY_MODE_DESC": "该设备处于恢复模式。点击按钮、继续。",
   "TR_DEVICE_LABEL_IS_NOT_BACKED_UP": "设备 \"{deviceLabel}\" 未备份",
   "TR_DEVICE_LABEL_IS_NOT_CONNECTED": "设备 \"{deviceLabel}\" 未连接",
   "TR_DEVICE_LABEL_IS_UNAVAILABLE": "设备 \"{deviceLabel}\" 不可用",
+  "TR_DEVICE_MAYBE_COMPROMISED_HEADING": "设备验证失败",
+  "TR_DEVICE_MAYBE_COMPROMISED_TEXT": "请重新连接设备并尝试再次验证。如果问题仍然存在，请联系 Trezor 客服，了解设备出现了什么问题以及下一步该怎么做。",
   "TR_DEVICE_NOT_CONNECTED": "设备未连接",
-  "TR_DEVICE_NOT_INITIALIZED": "Trezor设备未设置",
+  "TR_DEVICE_NOT_INITIALIZED": "Trezor 设备尚未设置",
   "TR_DEVICE_NOT_INITIALIZED_TEXT": "我们将指导您完成整个流程、并让您立即开始使用。",
   "TR_DEVICE_SECURITY": "安全",
   "TR_DEVICE_SETTINGS_AFTER_DELAY": "延迟后",
   "TR_DEVICE_SETTINGS_AUTO_LOCK": "自动锁定设备时间",
-  "TR_DEVICE_SETTINGS_AUTO_LOCK_SUBHEADING": "设备自动锁定的之前的时长。",
+  "TR_DEVICE_SETTINGS_AUTO_LOCK_SUBHEADING": "设置设备自动锁定前的时间。",
   "TR_DEVICE_SETTINGS_BRIGHTNESS_BUTTON": "调节亮度",
   "TR_DEVICE_SETTINGS_BRIGHTNESS_DESC": "启用设备显示屏亮度自定义功能",
   "TR_DEVICE_SETTINGS_BRIGHTNESS_TITLE": "显示亮度",
   "TR_DEVICE_SETTINGS_BUTTON_WIPE_DEVICE": "恢复出厂设置",
-  "TR_DEVICE_SETTINGS_CHANGE_PIN_DESC": "如果您的PIN码已被泄露或您因任何原因想要更改它、您可以在此处进行更改。",
+  "TR_DEVICE_SETTINGS_CHANGE_PIN_DESC": "如果您的PIN码已经被泄漏或您想要修改它，您可以在这里进行。",
   "TR_DEVICE_SETTINGS_CHANGE_PIN_TITLE": "修改PIN码",
   "TR_DEVICE_SETTINGS_CUSTOM_FIRMWARE_BUTTON": "安装固件",
-  "TR_DEVICE_SETTINGS_CUSTOM_FIRMWARE_DESCRIPTION": "您可以在Trezor设备上安装自定义固件、但这样做会清除其数据内存、可能导致其无法使用。除非您真的知道您在做什么、否则永远不要使用该功能！",
+  "TR_DEVICE_SETTINGS_CUSTOM_FIRMWARE_DESCRIPTION": "您可以在 Trezor 设备上安装自定义固件，但这样做会清除其数据内存，可能导致其无法使用。除非您真的知道您在做什么，否则永远不要使用该功能！",
   "TR_DEVICE_SETTINGS_CUSTOM_FIRMWARE_TITLE": "安装自定义固件",
-  "TR_DEVICE_SETTINGS_DEFAULT_WALLET_LOADING_DESC": "将 “标准” 或 “隐藏” 设为Trezor Suite启动时的默认钱包选项。选择 “隐藏”会在打开应用程序时显示密码短语输入框。",
-  "TR_DEVICE_SETTINGS_DEFAULT_WALLET_LOADING_TITLE": "启动时要打开的钱包类型",
+  "TR_DEVICE_SETTINGS_DEFAULT_WALLET_LOADING_DESC": "将 “标准” 或 “隐藏” 设为 Trezor Suite 启动时的默认钱包选项。选择 “隐藏” 会在打开应用程序时显示密码短语输入框。",
+  "TR_DEVICE_SETTINGS_DEFAULT_WALLET_LOADING_TITLE": "启动时打开的钱包类型",
   "TR_DEVICE_SETTINGS_DEVICE_EDIT_LABEL": "编辑名称",
   "TR_DEVICE_SETTINGS_DEVICE_LABEL": "设备名称",
-  "TR_DEVICE_SETTINGS_DISPLAY_ROTATION": "旋转显示屏",
+  "TR_DEVICE_SETTINGS_DISPLAY_ROTATION": "显示屏旋转方向",
   "TR_DEVICE_SETTINGS_ENABLE_VIEW_ONLY_CHANGE_BUTTON": "修改",
-  "TR_DEVICE_SETTINGS_ENABLE_VIEW_ONLY_DESC": "连接Trezor设备来移动或交易加密货币。",
-  "TR_DEVICE_SETTINGS_ENABLE_VIEW_ONLY_TITLE": "启用 “仅限查看” 功能、即使Trezor设备已断开连接、仍可在应用程序中查看您的余额",
+  "TR_DEVICE_SETTINGS_ENABLE_VIEW_ONLY_DESC": "连接 Trezor 设备来移动或交易加密货币。",
+  "TR_DEVICE_SETTINGS_ENABLE_VIEW_ONLY_TITLE": "启用 “仅供查看” 功能、即使 Trezor 设备已断开连接、仍可在应用程序中查看您的余额",
   "TR_DEVICE_SETTINGS_HAPTIC_FEEDBACK_DESC": "为设备互动开启触觉反馈功能",
   "TR_DEVICE_SETTINGS_HAPTIC_FEEDBACK_TITLE": "触觉反馈",
   "TR_DEVICE_SETTINGS_HOMESCREEN_EDITOR": "主屏幕编辑器",
-  "TR_DEVICE_SETTINGS_HOMESCREEN_IMAGE_SETTINGS_BW_128x64": "支持PNG或JPG、128 x 64px、只使用黑白 (而不是灰度)。",
-  "TR_DEVICE_SETTINGS_HOMESCREEN_IMAGE_SETTINGS_COLOR_240x240": "支持JPG、240 x 240px、最大允许大小为16KB。",
+  "TR_DEVICE_SETTINGS_HOMESCREEN_IMAGE_SETTINGS_BW_128x64": "支持 PNG 或 JPG，128 x 64 px，只使用黑白 (而不是灰度)。",
+  "TR_DEVICE_SETTINGS_HOMESCREEN_IMAGE_SETTINGS_COLOR_240x240": "支持 JPG，240 x 240 px，最大允许大小为 16 KB。",
   "TR_DEVICE_SETTINGS_HOMESCREEN_SELECT_FROM_GALLERY": "从图库中选择",
   "TR_DEVICE_SETTINGS_HOMESCREEN_TITLE": "主屏幕",
   "TR_DEVICE_SETTINGS_HOMESCREEN_UPLOAD_IMAGE": "上传图像",
-  "TR_DEVICE_SETTINGS_PASSPHRASE_DESC": "密码短语会将自定义短语 (如单词、句子或字符串) 添加到您现有的钱包备份中、从而创建密码短语钱包。每个密码短语钱包都有自己的密码短语。您的标准钱包无需密码短语即可访问。不要忘记您的密码短语。与常规密码不同、密码短语无法恢复。如果您丢失了密码短语、您的资金将永久丢失。",
+  "TR_DEVICE_SETTINGS_PASSPHRASE_DESC": "密码短语会将自定义短语 (如单词、句子或字符串) 添加到您现有的钱包备份中，从而创建隐藏钱包。每个隐藏钱包都有自己的密码短语。您的标准钱包无需密码短语即可访问。不要忘记您的密码短语。与常规密码不同，密码短语无法恢复。如果您丢失了密码短语，您的资金将永久丢失。",
   "TR_DEVICE_SETTINGS_PASSPHRASE_TITLE": "密码短语",
-  "TR_DEVICE_SETTINGS_PIN_PROTECTION_DESC": "设置一个强大的PIN码是确保设备安全、防止未经授权的物理访问和保护资金的最佳方法之一。",
-  "TR_DEVICE_SETTINGS_PIN_PROTECTION_TITLE": "PIN 码",
+  "TR_DEVICE_SETTINGS_PIN_PROTECTION_DESC": "设置一个较长的PIN码是确保设备安全，防止未经授权的物理访问和保护资金的最佳方法之一。",
+  "TR_DEVICE_SETTINGS_PIN_PROTECTION_TITLE": "PIN码",
   "TR_DEVICE_SETTINGS_SAFETY_CHECKS_BUTTON": "编辑",
   "TR_DEVICE_SETTINGS_SAFETY_CHECKS_DESC": "安全检查可防止您执行非标准交易。如果需要执行此类交易、可以暂时禁用安全检查。",
   "TR_DEVICE_SETTINGS_SAFETY_CHECKS_TITLE": "安全检查",
   "TR_DEVICE_SETTINGS_WALLET_LOADING": "正在加载钱包",
-  "TR_DEVICE_SETTINGS_WIPE_CODE_DESC": "自毁PIN码是一项高级功能、它是一串用户预先选择的数字、一旦输入、就会触发删除Trezor设备上存储的钱包备份数据。",
+  "TR_DEVICE_SETTINGS_WIPE_CODE_DESC": "“自毁PIN码” 是一项高级功能，它是一串用户预先选择的数字，一旦输入，就会触发删除 Trezor 设备上存储的钱包数据。",
   "TR_DEVICE_SETTINGS_WIPE_CODE_TITLE": "设置自毁PIN码",
-  "TR_DISABLED_ANONYMITY_CHANGE_MESSAGE": "运行混币时禁止编辑。",
-  "TR_DISABLED_SWITCH_TOOLTIP": "连接并解锁设备以进行编辑",
+  "TR_DISABLED_ANONYMITY_CHANGE_MESSAGE": "运行 CoinJoin 混币器时禁止编辑。",
+  "TR_DISABLED_SWITCH_TOOLTIP": "请连接并解锁设备以进行编辑",
   "TR_DISABLE_AUTOSTOP_COINJOIN": "不要停止",
-  "TR_DISABLE_WEBUSB_TRY_BRIDGE": "禁用WebUSB并使用网桥",
-  "TR_DISABLING_TOR": "正在禁用Tor",
+  "TR_DISABLE_WEBUSB_TRY_BRIDGE": "禁用 WebUSB 并使用网桥",
+  "TR_DISABLING_TOR": "正在禁用 Tor",
   "TR_DISCONNECT": "断开连接",
   "TR_DISCONNECTED": "已断开连接",
   "TR_DISCONNECT_DEVICE": "断开设备与电脑的连接。",
-  "TR_DISCONNECT_YOUR_DEVICE": "断开您的Trezor设备连接",
+  "TR_DISCONNECT_YOUR_DEVICE": "断开您的 Trezor 设备连接",
   "TR_DISCOVERY_NEW_COINS": "激活加密货币",
   "TR_DISCOVERY_NEW_COINS_TEXT": "激活加密货币后看不到账户？",
-  "TR_DISCREET": "谨慎",
-  "TR_DISMISS": "解散",
+  "TR_DISCREET": "隐秘",
+  "TR_DISMISS": "略过",
   "TR_DONT_HAVE_BACKUP": "我没有钱包助记词备份",
   "TR_DONT_SKIP": "不要跳过",
   "TR_DOWNLOAD": "下载",
   "TR_DOWNLOADING": "正在下载",
   "TR_DOWNLOAD_LATEST_BRIDGE": "下载最新的网桥 {version}",
-  "TR_DO_NOT_DISCONNECT_DEVICE": "不要断开您的Trezor设备连接",
+  "TR_DO_NOT_DISCONNECT_DEVICE": "不要断开您的 Trezor 设备连接",
   "TR_DO_NOT_SHOW_AGAIN": "不再显示",
-  "TR_DO_YOU_REALLY_WANT_TO_SKIP": "您真的想要跳过这个步骤吗？",
   "TR_DROPBOX": "Dropbox",
-  "TR_DROPZONE": "拖放文件到此处、或者点击从文件中选择",
-  "TR_DROPZONE_ERROR": "导入失败: {error}",
+  "TR_DROPZONE": "拖放文件到此处，或者点击从文件中选择",
+  "TR_DROPZONE_ERROR": "导入失败：{error}",
   "TR_DROPZONE_ERROR_EMPTY": "未选择文件",
   "TR_DROPZONE_ERROR_FILETYPE": "文件类型不正确",
   "TR_DROP_IMAGE": "拖放图像",
-  "TR_DRY_RUN_CHECK_ITEM_DESCRIPTION": "请注意、该测试与正常钱包恢复过程完全相同。您只能相信Trezor屏幕上显示的信息和说明。",
-  "TR_DRY_RUN_CHECK_ITEM_TITLE": "我知道这只是模拟检查、不会影响到我的设备",
-  "TR_DUST": "无法使用的输出 (灰尘)",
+  "TR_DRY_RUN_CHECK_ITEM_DESCRIPTION": "请注意，该测试与正常钱包恢复过程完全相同。您只能相信 Trezor 屏幕上显示的信息和说明。",
+  "TR_DRY_RUN_CHECK_ITEM_TITLE": "我知道这只是模拟检查，它不会影响到我的设备",
+  "TR_DUST": "无法使用的输出 (灰尘 —— “未消费交易输出” 的金额低于矿工费)",
   "TR_DUST_DESCRIPTION": "这些输出很可能低于所需支付的费用。",
   "TR_EARLY_ACCESS": "抢先体验计划",
   "TR_EARLY_ACCESS_CHECK_UPDATE": "立即检查更新",
-  "TR_EARLY_ACCESS_DESCRIPTION": "在我们向所有Trezor用户发布最新产品功能之前、加入来测试这些功能。",
+  "TR_EARLY_ACCESS_DESCRIPTION": "在我们向所有 Trezor 用户发布最新产品功能之前、加入来测试这些功能。",
   "TR_EARLY_ACCESS_DESCRIPTION_ENABLED": "如果您不再想抢先体验新功能、请点击离开。",
   "TR_EARLY_ACCESS_DISABLE": "离开",
-  "TR_EARLY_ACCESS_DISABLE_CONFIRM_DESCRIPTION": "点击“离开”将停止寻找测试版",
+  "TR_EARLY_ACCESS_DISABLE_CONFIRM_DESCRIPTION": "点击 “离开” 将停止寻找测试版本",
   "TR_EARLY_ACCESS_DISABLE_CONFIRM_TITLE": "您确定要退出抢先体验计划吗？",
   "TR_EARLY_ACCESS_ENABLE": "加入",
   "TR_EARLY_ACCESS_ENABLED": "启用抢先体验计划",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM": "加入",
-  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "我知道这允许我测试预发布的软件、它可能包含影响Trezor Suite正常运行的缺陷。",
+  "TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK": "我知道这允许我测试预发布的软件，它可能包含影响 Trezor Suite 正常运行的缺陷。",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_DESCRIPTION": "您可以随时关闭它。",
   "TR_EARLY_ACCESS_ENABLE_CONFIRM_TITLE": "在向公众发布之前体验最新的产品功能。",
-  "TR_EARLY_ACCESS_ENABLE_CONFIRM_TOOLTIP": "首请先检查上面的字段",
+  "TR_EARLY_ACCESS_ENABLE_CONFIRM_TOOLTIP": "首先请检查上面的字段",
   "TR_EARLY_ACCESS_JOINED_DESCRIPTION": "您可以现在或在下次发布时查看测试版更新。",
   "TR_EARLY_ACCESS_JOINED_TITLE": "已启用抢先体验计划！",
-  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "要降级到最新的Trezor Suite稳定版，请点击“下载稳定版”并重新安装应用程序。",
+  "TR_EARLY_ACCESS_LEFT_DESCRIPTION": "要降级到最新的 Trezor Suite 稳定版本，请点击 “下载稳定版本” 并重新安装应用程序。",
   "TR_EARLY_ACCESS_LEFT_TITLE": "您已经离开了抢先体验计划。不再提供测试版。",
   "TR_EARLY_ACCESS_MENU": "抢先体验计划",
-  "TR_EARLY_ACCESS_REINSTALL": "下载稳定版",
+  "TR_EARLY_ACCESS_REINSTALL": "下载稳定版本",
   "TR_EARLY_ACCESS_SKIP_CHECK": "在下次启动时检查",
   "TR_EARLY_ACCESS_SKIP_REINSTALL": "关闭",
   "TR_EARLY_ACCESS_STAY_IN": "留在",
   "TR_EAST": "东",
   "TR_EJECT_HEADING": "弹出",
   "TR_EMPTY_ACCOUNT_TITLE": "没有资金",
-  "TR_EMPTY_COINJOIN_ACCOUNT_SUBTITLE": "接收一些资金并开始混币。",
-  "TR_ENABLE_AUTOSTOP_COINJOIN": "本回合结束后将停止混币",
+  "TR_EMPTY_COINJOIN_ACCOUNT_SUBTITLE": "接收一些比特币并开始使用 CoinJoin 混币器。",
+  "TR_ENABLE_AUTOSTOP_COINJOIN": "本回合结束后将停止 CoinJoin 混币器",
   "TR_ENABLE_MORE_COINS": "启用更多的加密货币",
   "TR_ENABLE_NETWORK_BUTTON": "查找我的 {networkName} 帐户",
-  "TR_ENABLING_TOR": "正在启用Tor",
-  "TR_ENABLING_TOR_FAILED": "启用Tor失败",
+  "TR_ENABLING_TOR": "正在启用 Tor",
+  "TR_ENABLING_TOR_FAILED": "启用 Tor 已失败",
   "TR_ENTERED_PIN_NOT_CORRECT": "\"{deviceLabel}\" 的PIN码不正确",
-  "TR_ENTER_ALL_WORDS_IN_CORRECT": "按照正确顺序输入所有单词",
-  "TR_ENTER_EXISTING_BACKUP": "在Trezor设备上输入当前钱包的助记词备份",
+  "TR_ENTER_ALL_WORDS_IN_CORRECT": "请按照正确顺序输入所有单词",
+  "TR_ENTER_EXISTING_BACKUP": "在 Trezor 设备上输入当前钱包的助记词备份",
   "TR_ENTER_PASSPHRASE": "输入密码短语",
-  "TR_ENTER_PASSPHRASE_ON_DEVICE": "在Trezor设备上输入密码短语",
-  "TR_ENTER_PASSPHRASE_ON_DEVICE_LABEL": "在 {deviceLabel} 上输入密码短语",
-  "TR_ENTER_PIN": "输入PIN码",
-  "TR_ENTER_SEED_WORDS_INSTRUCTION": "在此按照Trezor设备上显示的顺序输入您钱包助记词备份中的单词。",
-  "TR_ENTER_SEED_WORDS_ON_DEVICE": "出于安全考虑、钱包助记词将在Trezor设备上输入。请按正确顺序输入单词。",
+  "TR_ENTER_PASSPHRASE_ON_DEVICE": "在 Trezor 设备上输入密码短语",
+  "TR_ENTER_PASSPHRASE_ON_DEVICE_LABEL": "请在 {deviceLabel} 上输入密码短语",
+  "TR_ENTER_PIN": "请输入PIN码",
+  "TR_ENTER_SEED_WORDS_INSTRUCTION": "请在此按照 Trezor 设备上显示的顺序输入您钱包助记词备份中的单词。",
+  "TR_ENTER_SEED_WORDS_ON_DEVICE": "出于安全考虑，钱包助记词将在 Trezor 设备上输入。请按正确顺序输入单词。",
   "TR_ENTER_WIPECODE": "输入自毁PIN码",
   "TR_ERROR": "错误",
   "TR_ERROR_CARDANO_DELEGATE": "账户余额不足",
   "TR_ERROR_CARDANO_WITHDRAWAL": "账户余额不足",
   "TR_ETH_ADDRESS_CANT_VERIFY_HISTORY": "无法验证地址历史记录。检查地址是否正确。",
-  "TR_ETH_ADDRESS_NOT_USED_NOT_CHECKSUMMED": "地址没有交易历史记录、也没有校验和。检查地址是否正确。",
-  "TR_EVM_EXPLANATION_DESCRIPTION": "它与以太坊共享相同的地址样式、但有自己独特的加密货币和代币、不能在其他网络上使用。",
-  "TR_EVM_EXPLANATION_EXCHANGE_DESCRIPTION": "您在 {network} 网络上选择了{coin}、但您似乎没有任何 {networkSymbol} 。您是想在其他网络上选择 {coin} 吗？",
-  "TR_EVM_EXPLANATION_RECEIVE_DESCRIPTION": "此接收地址仅用于 {network} 以及该网络上的代币。如果有人从 {network} 网络之外向您发送加密货币、您可能无法收到它们。",
-  "TR_EVM_EXPLANATION_SEND_DESCRIPTION": "仅通过 {network} 网络发送。该地址必须在{network} 网络上、才能接收已发送的加密货币。",
+  "TR_ETH_ADDRESS_NOT_USED_NOT_CHECKSUMMED": "地址没有交易历史记录，也没有校验和。检查地址是否正确。",
+  "TR_EVM_EXPLANATION_DESCRIPTION": "它与以太坊共享相同的地址样式，但有自己独特的加密货币和代币，不能在其他网络上使用。",
+  "TR_EVM_EXPLANATION_EXCHANGE_DESCRIPTION": "您在 {network} 网络上选择了{coin}，但您似乎没有任何 {networkSymbol} 。您是想在其他网络上选择 {coin} 吗？",
+  "TR_EVM_EXPLANATION_RECEIVE_DESCRIPTION": "此接收地址仅用于 {network} 以及该网络上的代币。如果有人从 {network} 网络之外向您发送加密货币，您可能无法收到它们。",
+  "TR_EVM_EXPLANATION_SEND_DESCRIPTION": "仅通过 {network} 网络发送。该地址必须在 {network} 网络上、才能接收已发送的加密货币。",
   "TR_EVM_EXPLANATION_SEND_MODAL_DESCRIPTION": "您只能将 {network} 的代币发送到<b> {network} 网络上的接收地址</b>，否则您的代币<b>可能会丢失</b>。",
   "TR_EVM_EXPLANATION_TITLE": "{network} 是其自身的网络",
   "TR_EXCEEDS_MAX": "超出最大长度",
@@ -918,20 +922,19 @@
   "TR_EXCHANGE_APPROVAL_FAILED": "批准交易失败了。",
   "TR_EXCHANGE_APPROVAL_NOT_REQUIRED": "{send} 无需批准交易。",
   "TR_EXCHANGE_APPROVAL_PREAPPROVED": "合约已被批准。",
-  "TR_EXCHANGE_APPROVAL_PROCEED": "继续兑换、无需批准交易。",
+  "TR_EXCHANGE_APPROVAL_PROCEED": "继续兑换，无需批准交易。",
   "TR_EXCHANGE_APPROVAL_SEND_TO": "{send} 合约",
   "TR_EXCHANGE_APPROVAL_SUCCESS": "批准交易已确认。",
   "TR_EXCHANGE_APPROVAL_TO_SWAP_BUTTON": "继续兑换",
   "TR_EXCHANGE_APPROVAL_TXID": "批准交易ID",
   "TR_EXCHANGE_APPROVAL_VALUE": "批准价值",
   "TR_EXCHANGE_APPROVAL_VALUE_INFINITE": "无限价值",
-  "TR_EXCHANGE_APPROVAL_VALUE_INFINITE_INFO": "创建一个单一的批准交易、简化 {send} 与 {provider} 的多次交易。这样可以节省费用、但万一 {provider} 的合同有缺陷、您的资金就会面临风险。",
-  "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL": "{value} {send} 的必备值",
+  "TR_EXCHANGE_APPROVAL_VALUE_INFINITE_INFO": "创建一个单一的批准交易，简化 {send} 与 {provider} 的多次交易。这样可以节省费用，但万一 {provider} 的合同有缺陷，您的资金就会面临风险。",
+  "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL": "{value} {send} 的必要值",
   "TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO": "只批准此兑换所需的确切金额。 如果你想再次进行类似的兑换、你需要支付额外的费用。",
   "TR_EXCHANGE_APPROVAL_VALUE_ZERO": "撤销先前的批准",
-  "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "执行一项交易、将移除先前与 {provider} 的合同批准。",
-  "TR_EXCHANGE_BUY": "对于",
-  "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "在Trezor设备上确认并发送",
+  "TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO": "执行一项交易，取消之前与 {provider} 的合同批准。",
+  "TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND": "请在 Trezor 设备上确认并发送",
   "TR_EXCHANGE_CONFIRM_SEND_STEP": "确认并发送",
   "TR_EXCHANGE_CREATE_APPROVAL_STEP": "创建批准",
   "TR_EXCHANGE_CREATE_SUITE_ACCOUNT": "创建一个新的 {symbol} 帐户",
@@ -939,12 +942,12 @@
   "TR_EXCHANGE_DETAIL_CONVERTING_TITLE": "转换中",
   "TR_EXCHANGE_DETAIL_ERROR_BUTTON": "返回账户",
   "TR_EXCHANGE_DETAIL_ERROR_SUPPORT": "打开合作伙伴的客服网站",
-  "TR_EXCHANGE_DETAIL_ERROR_TEXT": "抱歉、您的交易失败或被拒绝。您的加密货币尚未被兑换。",
-  "TR_EXCHANGE_DETAIL_ERROR_TITLE": "交易失败",
+  "TR_EXCHANGE_DETAIL_ERROR_TEXT": "抱歉，您的交易失败或被拒绝。您的加密货币尚未被兑换。",
+  "TR_EXCHANGE_DETAIL_ERROR_TITLE": "交易失败了",
   "TR_EXCHANGE_DETAIL_KYC_BUTTON": "返回账户",
   "TR_EXCHANGE_DETAIL_KYC_INFO_LINK": "前往提供商了解实名认证的详情",
   "TR_EXCHANGE_DETAIL_KYC_SUPPORT": "前往提供商的客服",
-  "TR_EXCHANGE_DETAIL_KYC_TEXT": "提供商已将这笔交易标为“可疑”交易; 您可能需要完成他们的实名认证流程才能完成交易。 请联系提供商的客服以继续。",
+  "TR_EXCHANGE_DETAIL_KYC_TEXT": "提供商已将这笔交易标为 “可疑” 交易; 您可能需要完成他们的实名认证流程才能完成交易。 请联系提供商的客服以继续。",
   "TR_EXCHANGE_DETAIL_KYC_TITLE": "实名认证请求",
   "TR_EXCHANGE_DETAIL_SENDING_SUPPORT": "前往提供商的客服",
   "TR_EXCHANGE_DETAIL_SENDING_TITLE": "待定的",
@@ -952,20 +955,17 @@
   "TR_EXCHANGE_DETAIL_SUCCESS_TEXT": "您的交易已成功。",
   "TR_EXCHANGE_DETAIL_SUCCESS_TITLE": "已批准",
   "TR_EXCHANGE_DEX": "去中心化交易所报价",
-  "TR_EXCHANGE_DEX_OFFER_FEE_INFO": "进行这项兑换的批准费用估算为: {approvalFee} ({approvalFeeFiat})。兑换费用估算为: {swapFee} ({swapFeeFiat})。",
-  "TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES": "没有剩余资金支付此交易费用。请将兑换金额降至最大值 {symbol} {max}",
   "TR_EXCHANGE_EXTRA_FIELD": "{extraFieldName}",
   "TR_EXCHANGE_EXTRA_FIELD_INVALID": "{extraFieldName} 是无效的",
   "TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP": "{extraFieldDescription}",
   "TR_EXCHANGE_EXTRA_FIELD_REQUIRED": "{extraFieldName} 是必需的",
-  "TR_EXCHANGE_FEES_INFO": "包括所有费用; 交易费估算为 {feeAmount} ({feeAmountFiat})。",
+  "TR_EXCHANGE_FEES_INFO": "包括所有费用；交易费估算为 {feeAmount} ({feeAmountFiat})。",
   "TR_EXCHANGE_FIXED": "固定汇率报价",
-  "TR_EXCHANGE_FIXED_OFFERS_INFO": "固定汇率会准确地显示您在交易结束时会得到多少金额 —— 从您选择的汇率到交易完成之间的金额不会发生变化。可以保证您得到所显示的金额、但固定汇率通常比浮动汇率低、这意味着您的钱买不到那么多加密货币。",
+  "TR_EXCHANGE_FIXED_OFFERS_INFO": "固定汇率会准确地显示您在交易结束时会得到的金额 —— 从您选择的汇率到交易完成之间的金额不会发生变化。可以保证您得到所显示的金额，但固定汇率通常比浮动汇率低，这意味着您的钱买不到那么多加密货币。",
   "TR_EXCHANGE_FLOAT": "浮动汇率报价",
   "TR_EXCHANGE_FLOAT_OFFERS_INFO": "浮动汇率意味着，从您选择的汇率到您的交易完成，由于市场的波动，您将得到的最终金额可能会略有变化。浮动汇率通常比固定汇率高，意味着你最终可能得到更多的加密货币。",
-  "TR_EXCHANGE_PROVIDER": "供应商",
   "TR_EXCHANGE_RATE": "价格",
-  "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "接收账户是在Suite之外。",
+  "TR_EXCHANGE_RECEIVE_NON_SUITE_ACCOUNT_QUESTION_TOOLTIP": "接收账户是在 Suite 之外。",
   "TR_EXCHANGE_RECEIVE_NON_SUITE_ADDRESS_QUESTION_TOOLTIP": "这是将收到您的加密货币的具体字母数字地址。",
   "TR_EXCHANGE_RECEIVING_ADDRESS": "接收地址",
   "TR_EXCHANGE_RECEIVING_ADDRESS_INFO": "您的地址是您将收到您的 {symbol} 的地址。",
@@ -984,36 +984,29 @@
   "TR_EXCHANGE_SWAP_SLIPPAGE": "滑点",
   "TR_EXCHANGE_SWAP_SLIPPAGE_AMOUNT": "滑点最大值",
   "TR_EXCHANGE_SWAP_SLIPPAGE_CUSTOM": "自定义",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_INFO": "汇率不断变化、所以您在这个报价中接受的金额和最终在区块链上确认的金额可能不同; 这就是滑点。滑点容忍度设定了您可能因滑点而损失的交易比例; 换句话说、您设定了您最终愿意接受的最低金额。如果滑点容忍度太高、您可能会收到比报价少得多的金额。如果滑点容忍度太低、您的交易可能会失败 (逆转)、但您仍将支付交易费。",
+  "TR_EXCHANGE_SWAP_SLIPPAGE_INFO": "汇率不断变化，所以您在这个报价中接受的金额和最终在区块链上确认的金额可能不同；这就是滑点。滑点容忍度设定了您可能因滑点而损失的交易比例；换句话说，您设定了您最终愿意接受的最低金额。如果滑点容忍度太高，您可能会收到比报价少得多的金额。如果滑点容忍度太低，您的交易可能会失败（逆转），但您仍将支付交易费。",
   "TR_EXCHANGE_SWAP_SLIPPAGE_MINIMUM": "最低接收金额",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_IN_RANGE": "滑点必须在0.01% — 50%的范围内",
+  "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_IN_RANGE": "滑点必须在 0.01% - 50% 的范围内",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_NUMBER": "请输入一个数字。",
   "TR_EXCHANGE_SWAP_SLIPPAGE_NOT_SET": "输入你想要的滑点。",
   "TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED": "兑换报价金额",
-  "TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY": "滑点总结",
   "TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE": "滑点容忍度",
-  "TR_EXCHANGE_TRANS_ID": "交易ID: ",
-  "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "使用一个不在Suite中的账户 {symbol}",
+  "TR_EXCHANGE_USE_NON_SUITE_ACCOUNT": "使用一个不在 Suite 中的账户 {symbol}",
   "TR_EXCHANGE_VERIFY_ADDRESS_STEP": "接收地址",
-  "TR_EXCHANGE_VIEW_DETAILS": "查看详情",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE": "自动更新Trezor Suite",
-  "TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION": "Trezor Suite会在后台自动下载最新版本、并在重启应用程序时安装。这可确保您始终使用最新功能和安全补丁。更新无需经过您的许可。",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN": "币安智能链",
-  "TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON": "启用币安智能链网络、但无内部交易数据历史记录。",
   "TR_EXPERIMENTAL_FEATURES": "实验性",
-  "TR_EXPERIMENTAL_FEATURES_ALLOW": "实验功能",
-  "TR_EXPERIMENTAL_FEATURES_WARNING": "仅供有经验的用户使用。使用风险自负。这些功能正在测试中、可能不稳定、也可能得不到长期支持。",
-  "TR_EXPERIMENTAL_PASSWORD_MANAGER": "迁移Dropbox密码",
-  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "该工具用于找回存储在Dropbox中并由Trezor保护的密码。专为Trezor密码管理器的Chrome浏览器扩展用户设计。",
-  "TR_EXPERIMENTAL_TOR_SNOWFLAKE": "Tor Snowflake",
-  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Tor Snowflake是一个允许访问被墙的网站和应用程序的系统。",
+  "TR_EXPERIMENTAL_FEATURES_ALLOW": "实验性功能",
+  "TR_EXPERIMENTAL_FEATURES_WARNING": "仅供有经验的用户使用。使用风险自负。这些功能正在测试中，可能不稳定，也可能得不到长期支持。",
+  "TR_EXPERIMENTAL_PASSWORD_MANAGER": "迁移 Dropbox 密码",
+  "TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION": "该工具用于找回存储在 Dropbox 中并由 Trezor 保护的密码。专为 Trezor 密码管理器的 Chrome 浏览器扩展用户设计。",
+  "TR_EXPERIMENTAL_TOR_SNOWFLAKE": "Tor Snowflake 插件 ",
+  "TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION": "Tor Snowflake 是一个允许访问被 “防火长城” 所墙的网站和应用程序的插件。",
   "TR_EXPORT_AS": "导出为 {as}",
   "TR_EXPORT_FAIL": "导出失败。",
   "TR_EXPORT_TO_FILE": "导出到文件",
   "TR_FAILED": "失败",
-  "TR_FAILED_BACKUP": "备份失败。请清除您的Trezor设备数据并重新开始设置过程。",
+  "TR_FAILED_BACKUP": "备份失败。请清除您的 Trezor 设备数据并重新开始设置过程。",
   "TR_FAILED_TRANSACTION": "失败的交易",
-  "TR_FEEDBACK_ANALYTICS_ITEM_APP": "Trezor Suite版本",
+  "TR_FEEDBACK_ANALYTICS_ITEM_APP": "Trezor Suite 版本",
   "TR_FEEDBACK_ANALYTICS_ITEM_BROWSER": "浏览器",
   "TR_FEEDBACK_ANALYTICS_ITEM_FW": "设备固件版本",
   "TR_FEEDBACK_ANALYTICS_ITEM_OS": "操作系统",
@@ -1026,120 +1019,120 @@
   "TR_FEEDBACK_CATEGORY_SETTINGS": "设置",
   "TR_FEEDBACK_CATEGORY_TRADE": "交易",
   "TR_FEE_RATE": "矿工费率",
-  "TR_FEE_RATE_CHANGED": "为了完成交易、矿工费率已更改。",
-  "TR_FEE_ROUNDING_BASEFEE_WARNING": "已提高 {feeRate} 的矿工费率、以支付内存池内的链式交易",
-  "TR_FEE_ROUNDING_DEFAULT_WARNING": "由于费用的四舍五入、矿工费率已提高至{feeRate}。",
+  "TR_FEE_RATE_CHANGED": "为了完成交易，矿工费率已更改。",
+  "TR_FEE_ROUNDING_BASEFEE_WARNING": "已提高 {feeRate} 的矿工费率，以支付内存池内的链式交易",
+  "TR_FEE_ROUNDING_DEFAULT_WARNING": "由于费用的四舍五入，矿工费率已提高至 {feeRate}。",
   "TR_FIAT_RATES_NOT_AVAILABLE": "没有法定货币汇率。",
   "TR_FIAT_RATES_NOT_AVAILABLE_TOOLTIP": "目前尚无法定货币汇率。",
   "TR_FINAL_HEADING": "设置完成！",
   "TR_FINGERPRINT_ADDRESS": "指纹: ",
-  "TR_FIRMWARE": "固件版本",
+  "TR_FIRMWARE": "固件",
   "TR_FIRMWARE_CHECK_AUTHENTICITY_SUCCESS": "固件为正品",
-  "TR_FIRMWARE_HASH_MISMATCH": "您的Trezor设备正在运行非官方固件。请立即联系help@trezor.io。",
+  "TR_FIRMWARE_HASH_MISMATCH": "您的 Trezor 设备正在运行非官方固件。请立即联系 help@trezor.io。",
   "TR_FIRMWARE_INSTALLED_TEXT": "该设备已安装了 {type}{version} 的固件。",
-  "TR_FIRMWARE_IS_POTENTIALLY_RISKY": "更新固件存在潜在风险。如果出现任何问题 (如使用有损坏的USB数据线)、设备的数据可能会被清除、这也意味着您必须使用钱包助记词备份来恢复钱包。",
+  "TR_FIRMWARE_IS_POTENTIALLY_RISKY": "更新固件存在潜在风险。如果出现任何问题 (如使用有问题的 USB 数据线)，设备的数据可能会被清除，这也意味着您必须使用钱包助记词备份来恢复钱包。",
   "TR_FIRMWARE_IS_UP_TO_DATE": "固件准备就绪",
   "TR_FIRMWARE_LANGUAGE_CHANGED": "已成功修改设备语言",
   "TR_FIRMWARE_LANGUAGE_FETCH_ERROR": "翻译文件下载失败",
   "TR_FIRMWARE_NEW_FW_DESCRIPTION": "新固件现已发布。立即更新您的设备。",
-  "TR_FIRMWARE_REINSTALL_FW_DESCRIPTION": "您的设备已经更新到最新的固件。如果需要、您可以重新安装固件。",
-  "TR_FIRMWARE_REVISION_CHECK_FAILED": "固件修订检查失败。您的Trezor设备可能是假冒产品。",
+  "TR_FIRMWARE_REINSTALL_FW_DESCRIPTION": "您的设备已经更新到最新的固件。如果需要，您可以重新安装固件。",
+  "TR_FIRMWARE_REVISION_CHECK_FAILED": "固件修订检查失败。您的 Trezor 设备可能是假冒产品。",
   "TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR": "无法进行固件修订检查。",
   "TR_FIRMWARE_STATUS_INSTALLATION_COMPLETED": "已完成",
   "TR_FIRMWARE_SUBHEADING_BITCOIN": "仅支持比特币操作的轻量级固件。",
-  "TR_FIRMWARE_SUBHEADING_NONE": "您的Trezor设备出厂时未安装固件。请安装最新固件、以便安全使用该设备。对于仅使用比特币的用户、我们建议安装<button>{bitcoinOnly} 固件</button>。",
-  "TR_FIRMWARE_SUBHEADING_NONE_BITCOIN_ONLY_DEVICE": "您的设备已准备好安装最新固件、以便安全使用。对于比特币爱好者、我们提供了仅适用于比特币的固件。",
-  "TR_FIRMWARE_SUBHEADING_UNKNOWN": "您的Trezor设备出厂时未安装固件。请安装最新固件、以便安全使用该设备。对于仅使用比特币的用户、我们建议安装<button>{bitcoinOnly} 固件</button>。",
-  "TR_FIRMWARE_SUBHEADING_UNKNOWN_BITCOIN_ONLY_DEVICE": "仅支持比特币操作的轻量级固件。",
+  "TR_FIRMWARE_SUBHEADING_NONE": "您的 Trezor 设备出厂时未安装固件。请安装最新固件，以便安全使用该设备。对于仅使用比特币的用户，我们建议安装<button>{bitcoinOnly} 固件</button>。",
+  "TR_FIRMWARE_SUBHEADING_NONE_BITCOIN_ONLY_DEVICE": "您的设备已准备好安装最新固件，以便安全使用。对于比特币爱好者，我们提供了仅适用于比特币的固件。",
+  "TR_FIRMWARE_SUBHEADING_UNKNOWN": "您的 Trezor 设备出厂时未安装固件。请安装最新固件，以便安全使用该设备。对于仅使用比特币的用户，我们建议安装<button>{bitcoinOnly} 固件</button>。",
+  "TR_FIRMWARE_SUBHEADING_UNKNOWN_BITCOIN_ONLY_DEVICE": "一个轻量级的固件支持于仅限比特币的操作。",
   "TR_FIRMWARE_SWITCH_WARNING_1": "切换固件会<b>清除所有设备数据</b>、包括钱包、密钥和账户。",
-  "TR_FIRMWARE_SWITCH_WARNING_2": "要重新访问您的加密货币、您必须<b>使用钱包助记词备份来恢复您的钱包</b>。确保您的钱包助记词备份可访问且清晰可辨。",
-  "TR_FIRMWARE_SWITCH_WARNING_3": "如果您没有您的钱包助记词备份、您无法恢复您的加密货币！",
+  "TR_FIRMWARE_SWITCH_WARNING_2": "要重新访问您的加密货币，您必须<b>使用钱包助记词备份来恢复您的钱包</b>。确保您的钱包助记词备份可访问且清晰可辨。",
+  "TR_FIRMWARE_SWITCH_WARNING_3": "如果您没有您的钱包助记词备份，您将无法恢复您的加密货币！",
   "TR_FIRMWARE_TYPE": "类型",
   "TR_FIRMWARE_TYPE_BITCOIN_ONLY": "仅限比特币",
   "TR_FIRMWARE_TYPE_REGULAR": "通用",
   "TR_FIRMWARE_UPDATE_REQUIRED_EXPLAINED": "您的设备有不再被支持的固件。您需要更新它。",
-  "TR_FIRMWARE_VALIDATION_T1_V2": "您需要先升级到引导程序1.8.0版本",
+  "TR_FIRMWARE_VALIDATION_T1_V2": "您需要先升级到引导加载程序 1.8.0",
   "TR_FIRMWARE_VALIDATION_TOO_OLD": "您的设备固件版本太低",
   "TR_FIRMWARE_VALIDATION_UNMATCHING_DEVICE": "固件与您的设备不匹配",
   "TR_FIRMWARE_VALIDATION_UNRECOGNIZED_FORMAT": "固件镜像类型无法识别",
-  "TR_FIRMWARE_VERSION": "版本 ",
-  "TR_FIRST_SEEN": "首次出现",
-  "TR_FOLLOW_INSTRUCTIONS_ON_DEVICE": "检查您的Trezor设备的屏幕",
+  "TR_FIRMWARE_VERSION": "版本",
+  "TR_FIRST_SEEN": "首次出现于",
+  "TR_FOLLOW_INSTRUCTIONS_ON_DEVICE": "检查您的 Trezor 设备的屏幕",
   "TR_FORMAT": "格式",
-  "TR_FORMAT_TOOLTIP": "<FormatDescription> <span>Trezor</span> — 根据BIP137的标准签名格式 </FormatDescription> <FormatDescription> <span>Electrum</span> — 兼容签名格式 </FormatDescription>",
+  "TR_FORMAT_TOOLTIP": "<FormatDescription> <span>Trezor</span> —— 根据 BIP137 的标准签名格式 </FormatDescription> <FormatDescription> <span>Electrum</span> —— 兼容签名格式 </FormatDescription>",
   "TR_FOR_EASIER_AND_SAFER_INPUT": "请将二维码对准电脑摄像头。",
   "TR_FRACTION_BUTTONS_ALL": "全部",
   "TR_FROM": "从",
-  "TR_FW_INSTALLATION_FAILED": "安装失败",
-  "TR_GAS_LIMIT": "Gas限额",
-  "TR_GAS_PRICE": "Gas价格",
-  "TR_GAS_USED": "使用的Gas",
-  "TR_GATHERING_INFO": "获取信息、请稍等...",
+  "TR_FW_INSTALLATION_FAILED": "安装失败了",
+  "TR_GAS_LIMIT": "燃料费上限",
+  "TR_GAS_PRICE": "燃料费",
+  "TR_GAS_USED": "已使用的燃料费",
+  "TR_GATHERING_INFO": "正在获取信息，请稍等...",
   "TR_GENERAL": "应用程序",
-  "TR_GENERIC_ERROR_TITLE": "哎呀！出了错！",
+  "TR_GENERIC_ERROR_TITLE": "哎呀！出错了！",
   "TR_GOOGLE_DRIVE": "谷歌云端硬盘",
-  "TR_GOT_IT": "明白了！",
+  "TR_GOT_IT": "知道了！",
   "TR_GOT_IT_BUTTON": "明白",
   "TR_GO_TO_ONBOARDING": "开始设置",
   "TR_GO_TO_SETTINGS": "前往设置",
-  "TR_GO_TO_SUITE": "访问Suite",
+  "TR_GO_TO_SUITE": "访问 Suite",
   "TR_GRAPH_LINEAR": "线性",
   "TR_GRAPH_LOGARITHMIC": "对数",
-  "TR_GRAPH_MISSING_DATA": "XRP、SOL和所有代币金额都在投资组合余额中、但目前在图表视图中不支持。",
+  "TR_GRAPH_MISSING_DATA": "XRP、SOL 和所有代币金额都在投资组合余额中，但目前在图表视图中不支持。",
   "TR_GRAPH_VIEW": "图表视图",
   "TR_GUIDE_ARTICLES": "文章",
-  "TR_GUIDE_BUG_LABEL": "出什么问题了吗？",
+  "TR_GUIDE_BUG_LABEL": "有什么不对吗？",
   "TR_GUIDE_DASHBOARD": "控制面板",
-  "TR_GUIDE_FEEDBACK_BUG_TEXT_HEADLINE": "有什么问题?",
+  "TR_GUIDE_FEEDBACK_BUG_TEXT_HEADLINE": "有什么问题吗？",
   "TR_GUIDE_FEEDBACK_CATEGORY_HEADLINE": "应用程序中的位置",
   "TR_GUIDE_FEEDBACK_ERROR": "服务器出现错误。请稍后再试。",
-  "TR_GUIDE_FEEDBACK_RATING_HEADLINE": "喜欢使用Suite吗？",
+  "TR_GUIDE_FEEDBACK_RATING_HEADLINE": "喜欢使用 Suite 吗？",
   "TR_GUIDE_FEEDBACK_SEND_REPORT": "提交",
-  "TR_GUIDE_FEEDBACK_SENT": "信息已发送。谢谢！",
+  "TR_GUIDE_FEEDBACK_SENT": "留言已发送。谢谢！",
   "TR_GUIDE_FEEDBACK_SUGGESTION_TEXT_HEADLINE": "我们该如何改进？",
-  "TR_GUIDE_FEEDBACK_SYSTEM_INFO_NOTICE": "您的基本系统信息将被匿名共享",
-  "TR_GUIDE_FORUM": "Trezor论坛",
-  "TR_GUIDE_FORUM_LABEL": "与Trezor社区互动",
-  "TR_GUIDE_SUGGESTION_LABEL": "我们做得怎样？",
+  "TR_GUIDE_FEEDBACK_SYSTEM_INFO_NOTICE": "您的基本系统信息将被匿名分享",
+  "TR_GUIDE_FORUM": "Trezor 论坛",
+  "TR_GUIDE_FORUM_LABEL": "与 Trezor 社区互动",
+  "TR_GUIDE_SUGGESTION_LABEL": "我们做的怎么样?",
   "TR_GUIDE_SUPPORT": "联系客服",
-  "TR_GUIDE_SUPPORT_AND_FEEDBACK": "帮助与反馈",
-  "TR_GUIDE_VIEW_HEADLINES_SUPPORT_FEEDBACK_SELECTION": "帮助与反馈",
+  "TR_GUIDE_SUPPORT_AND_FEEDBACK": "支持与反馈",
+  "TR_GUIDE_VIEW_HEADLINES_SUPPORT_FEEDBACK_SELECTION": "支持与反馈",
   "TR_GUIDE_VIEW_HEADLINE_HELP_US_IMPROVE": "帮助我们改进",
-  "TR_GUIDE_VIEW_HEADLINE_LEARN_AND_DISCOVER": "Suite使用指南",
-  "TR_GUIDE_VIEW_HEADLINE_NEED_HELP": "需要帮助？",
+  "TR_GUIDE_VIEW_HEADLINE_LEARN_AND_DISCOVER": "Suite 使用指南",
+  "TR_GUIDE_VIEW_HEADLINE_NEED_HELP": "需要帮助吗？",
   "TR_GUIDE_VIEW_HEADLINE_REPORT_BUG": "报告一个软件缺陷",
-  "TR_GUIDE_VIEW_HEADLINE_SUGGEST": "反馈意见",
-  "TR_HELP": "帮助",
+  "TR_GUIDE_VIEW_HEADLINE_SUGGEST": "用户反馈",
+  "TR_HELP": "技术支持",
   "TR_HEX_FORMAT": "十六进制格式",
-  "TR_HIDDEN": "隐蔽",
-  "TR_HIDDEN_TOKENS": "已隐蔽的代币",
-  "TR_HIDDEN_TOKENS_EMPTY": "您没持有已隐蔽的代币",
-  "TR_HIDDEN_WALLET_DESCRIPTION": "需要密码短语",
-  "TR_HIDDEN_WALLET_TOOLTIP": "密码短语在您的钱包助记词备份中添加了一个自定义短语 (例如、一个单词、句子或一串字符)。这将创建一个隐藏钱包; 每个隐藏钱包可以使用自己的密码短语。您的标准钱包仍然可以在没有密码短语的情况下访问。",
+  "TR_HIDDEN": "已隐藏",
+  "TR_HIDDEN_TOKENS": "已隐藏的代币",
+  "TR_HIDDEN_TOKENS_EMPTY": "您没有被隐藏的代币",
+  "TR_HIDDEN_WALLET_DESCRIPTION": "需要提供密码短语",
+  "TR_HIDDEN_WALLET_TOOLTIP": "密码短语在您的钱包助记词备份中添加了一个自定义的短语 (例如，一个单词、句子或一串字符)。这将创建一个隐藏钱包；每个隐藏钱包可以使用自己的密码短语。您的标准钱包仍然可以在没有密码短语的情况下访问。",
   "TR_HIDE_BALANCES": "隐藏余额",
   "TR_HIDE_GRAPH": "隐藏图表",
-  "TR_HIDE_TOKEN": "隐藏代币",
-  "TR_HOLOGRAM_STEP_HEADING": "验证您的封条",
-  "TR_HOLOGRAM_STEP_SUBHEADING": "确保保护您的设备的全息密封条是完整的。",
-  "TR_HOLOGRAM_T2B1_NEW_SEAL": "Trezor Safe 3的全息印章于2024年4月更新。在此日期之后生产的设备采用了更新后的封条、如图片底部所示。不过、较早生产的设备可能仍带有原来的安全印章。",
+  "TR_HIDE_TOKEN": "隐藏此代币",
+  "TR_HOLOGRAM_STEP_HEADING": "请核对设备的全息密封条",
+  "TR_HOLOGRAM_STEP_SUBHEADING": "请确保设备的全息密封封条完好无损。",
+  "TR_HOLOGRAM_T2B1_NEW_SEAL": "Trezor Safe 3 的全息密封条于 2024 年 4 月更新。在此日期之后生产的设备采用了新版的密封条，如图片底部所示。不过，较早生产的设备可能仍带有原版的全息密封条。",
   "TR_HOMESCREEN_GALLERY": "主屏幕图库",
   "TR_HOW_PIN_WORKS": "更多关于您的PIN码的信息",
-  "TR_IF_YOUR_DEVICE_IS_EVER_LOST": "如果您的Trezor设备丢失或损坏、您的资金将不可逆转地丢失。",
-  "TR_IMPORTANT": "重要！",
+  "TR_IF_YOUR_DEVICE_IS_EVER_LOST": "如果您的 Trezor 设备遗失或损坏，您的资金将不可逆转地丢失。",
+  "TR_IMPORTANT": "重要事项！",
   "TR_IMPORT_CSV_FROM_FILE": "从文件导入",
-  "TR_IMPORT_CSV_FROM_TEXT": "以文本形式导入",
+  "TR_IMPORT_CSV_FROM_TEXT": "作为文本形式导入",
   "TR_IMPORT_CSV_MODAL_DELIMITER_CUSTOM": "自定义分隔符",
   "TR_IMPORT_CSV_MODAL_DELIMITER_DEFAULT": "自动检测分隔符",
-  "TR_IMPORT_CSV_MODAL_HIDE_EXAMPLE": "隐藏实例",
-  "TR_IMPORT_CSV_MODAL_SHOW_EXAMPLE": "显示CSV示例",
-  "TR_IMPORT_CSV_MODAL_TITLE": "从CSV导入地址",
+  "TR_IMPORT_CSV_MODAL_HIDE_EXAMPLE": "隐藏示例",
+  "TR_IMPORT_CSV_MODAL_SHOW_EXAMPLE": "显示 CSV 示例",
+  "TR_IMPORT_CSV_MODAL_TITLE": "从 CSV 导入地址",
   "TR_INACTIVE_COINS": "尚未激活",
   "TR_INCLUDING_FEE": "包括矿工费\n",
   "TR_INCLUDING_TOKENS": "包括代币",
-  "TR_INCLUDING_TOKENS_AND_STAKING": "包括代币和质押",
-  "TR_INCOMING": "传入",
-  "TR_INCREASED_FEE": "新的交易费",
-  "TR_INCREASE_FEE_BY": "增加您的交易费",
+  "TR_INCLUDING_TOKENS_AND_STAKING": "包括其代币与质押",
+  "TR_INCOMING": "接收到",
+  "TR_INCREASED_FEE": "新的矿工费",
+  "TR_INCREASE_FEE_BY": "追加您的矿工费",
   "TR_INPUTS": "输入",
   "TR_INPUTS_OUTPUTS": "输入、输出",
   "TR_INSTALL": "安装固件",
@@ -1150,18 +1143,18 @@
   "TR_INSTALL_FW_DISABLED_MULTIPLE_DEVICES": "不允许在连接多个设备的情况下安装固件。",
   "TR_INSTALL_LATEST_FW": "安装最新的固件",
   "TR_INSTALL_REGULAR": "安装 {regular} 固件",
-  "TR_INSTANT_STAKING": "立刻质押",
-  "TR_INSTANT_UNSTAKING": "立刻解除质押",
+  "TR_INSTANT_STAKING": "已即时质押",
+  "TR_INSTANT_UNSTAKING": "已即时解除质押",
   "TR_INTERNAL_TRANSACTIONS": "内部转账",
-  "TR_IN_PENDING_TRANSACTION": "待处理交易中",
-  "TR_I_AM_IN_SAFE_PRIVATE_OR": "您在一个安全的私人空间里、或在一个远离摄像头的公共空间里。",
-  "TR_I_HAVE_DOUBTS": "我有疑问",
+  "TR_IN_PENDING_TRANSACTION": "在待处理的交易中",
+  "TR_I_AM_IN_SAFE_PRIVATE_OR": "你在一个安全的私人空间或远离摄像头的公共空间",
+  "TR_I_HAVE_DOUBTS": "我有疑虑",
   "TR_I_HAVE_ENOUGH_TIME_TO_DO": "你有足够的时间来备份你的钱包助记词",
-  "TR_I_HAVE_NOT_USED_IT": "不、我未使用过",
+  "TR_I_HAVE_NOT_USED_IT": "不，我未使用过",
   "TR_I_UNDERSTAND_PASSPHRASE": "我知道密码短语是无法找回的。",
   "TR_I_UNDERSTAND_SEED_IS_IMPORTANT": "钱包备份安全是自己的责任",
-  "TR_JOINT_TRANSACTION": "混币交易",
-  "TR_JOINT_TRANSACTION_TARGET": "{inMy}/{in} 的输入、{outMy}/{out} 的输出",
+  "TR_JOINT_TRANSACTION": "CoinJoin 混币器交易",
+  "TR_JOINT_TRANSACTION_TARGET": "{inMy} / {in} 的输入，{outMy} / {out} 的输出",
   "TR_KEEP_RUNNING_IN_BACKGROUND": "保持在后台运行",
   "TR_LABELING": "标签功能",
   "TR_LABELING_ADD_ACCOUNT": "重命名",
@@ -1169,14 +1162,14 @@
   "TR_LABELING_ADD_LABEL": "添加标签",
   "TR_LABELING_ADD_OUTPUT": "添加标签",
   "TR_LABELING_ADD_WALLET": "重命名",
-  "TR_LABELING_EDITED_LABEL": "已改名",
+  "TR_LABELING_EDITED_LABEL": "已重命名",
   "TR_LABELING_EDIT_ACCOUNT": "重命名",
   "TR_LABELING_EDIT_ADDRESS": "编辑标签",
   "TR_LABELING_EDIT_LABEL": "编辑标签",
   "TR_LABELING_EDIT_OUTPUT": "编辑标签",
   "TR_LABELING_EDIT_WALLET": "编辑标签",
   "TR_LABELING_ENABLED": "标签功能",
-  "TR_LABELING_FEATURE_ALLOWS": "重新命名钱包、账户和地址。标签通过与Dropbox或谷歌云储存同步。",
+  "TR_LABELING_FEATURE_ALLOWS": "重新命名钱包、账户和地址。标签通过与 Dropbox 或谷歌云储存同步。",
   "TR_LABELING_NOT_SYNCED": "标签未同步",
   "TR_LABELING_REMOVE_ACCOUNT": "移除标签",
   "TR_LABELING_REMOVE_ADDRESS": "移除标签",
@@ -1184,48 +1177,48 @@
   "TR_LABELING_REMOVE_OUTPUT": "移除标签",
   "TR_LABELING_REMOVE_WALLET": "移除标签",
   "TR_LABEL_ERROR_CHARACTERS": "不支持的字符",
-  "TR_LABEL_ERROR_LENGTH": "不得超过 {length} 个字符",
-  "TR_LABEL_REQUIREMENTS": "名称不得超过 {length} 个字符、且只能包含英文字母。",
+  "TR_LABEL_ERROR_LENGTH": "不能超过 {length} 个字符",
+  "TR_LABEL_REQUIREMENTS": "名称不能超过 {length} 个字符，且只能包含英文字母。",
   "TR_LANGUAGE": "语言",
-  "TR_LANGUAGE_CREDITS": "查看制作人员名单",
-  "TR_LANGUAGE_DESCRIPTION": "衷心感谢Trezor社区在翻译过程中提供的帮助。如有需要、您可以随时参考官方语言。",
+  "TR_LANGUAGE_CREDITS": "查看社区翻译志愿者名单",
+  "TR_LANGUAGE_DESCRIPTION": "衷心感谢 Trezor 社区在翻译过程中提供的帮助。如有需要，您可以随时参考官方语言。",
   "TR_LAST_UPDATE": "价格已更新 {value}",
   "TR_LEARN": "学习",
   "TR_LEARN_ADVANCED_RECOVERY": "学习如何输入字母",
   "TR_LEARN_MORE": "了解更多",
   "TR_LEFT": "左",
-  "TR_LEGACY_ACCOUNTS": "遗留账户",
+  "TR_LEGACY_ACCOUNTS": "传统账户",
   "TR_LEGACY_SEGWIT_ACCOUNTS": "嵌套隔离见证帐户",
   "TR_LETS_CHECK_YOUR_DEVICE": "让我们检查您的设备",
   "TR_LOADING": "正在加载...",
   "TR_LOADING_ACCOUNTS": "正在加载账户...",
   "TR_LOADING_ACCOUNTS_DESCRIPTION": "您可以在账户加载后更改这些设置。",
-  "TR_LOADING_FACT_0": "您的混币账户未被自动检测到。如果您没有启用该钱包的只读模式、则需要在重新连接Trezor设备后手动重新添加账户。",
-  "TR_LOADING_FACT_1": "Trezor Model One 是全球首款硬件钱包、于2014年7月29日发布。后续的 Trezor Model T 于2018年推出。",
-  "TR_LOADING_FACT_11": "“隐私不是秘密\"。—— 埃里克·休斯",
-  "TR_LOADING_FACT_12": "就像现金一样、你不会把你的全部净资产都放在口袋里、你会随身携带钱、以备不时之需 —— 中本聪",
-  "TR_LOADING_FACT_13": "“隐私不是秘密\"。—— 埃里克·休斯",
+  "TR_LOADING_FACT_0": "您的 CoinJoin 混币器账户未被自动检测到。如果您没有启用该钱包的 “仅供查看” 模式，则需要在重新连接 Trezor 设备后手动重新添加账户。",
+  "TR_LOADING_FACT_1": "Trezor Model One 是全球首款硬件钱包，于2014 年 7 月 29 日发布。后续的 Trezor Model T 于 2018 年推出。",
+  "TR_LOADING_FACT_11": "“隐私不是秘密”。—— 埃里克·休斯",
+  "TR_LOADING_FACT_12": "就像现金一样，你不会把你的全部净资产都放在口袋里，你会随身携带钱，以备不时之需 —— 中本聪",
+  "TR_LOADING_FACT_13": "“隐私不是秘密”。—— 埃里克·休斯",
   "TR_LOADING_FACT_14": "隐私是有选择地向世界展示自己的能力 —— 埃里克·休斯",
   "TR_LOADING_FACT_15": "隐私是有选择地向世界展示自己的能力 —— 埃里克·休斯",
-  "TR_LOADING_FACT_16": "混币账户使用主根地址",
-  "TR_LOADING_FACT_17": "2021年9月、萨尔瓦多成为第一个接受比特币为法定货币的国家。",
-  "TR_LOADING_FACT_18": "Laszlo Hanyecz首次进行了商业比特币交易。他用一万枚比特币买了2个披萨。",
-  "TR_LOADING_FACT_19": "最后一个比特币应该在2140年左右被挖出来。",
-  "TR_LOADING_FACT_2": "您的混币账户未被自动检测到。如果您没有启用该钱包的只读模式、则需要在重新连接Trezor设备后手动重新添加账户。",
-  "TR_LOADING_FACT_20": "人称“吓人辣妹”的梅尔-B (Mel B) 是第一位接受比特币支付单曲的主流音乐人。",
+  "TR_LOADING_FACT_16": "CoinJoin 混币器账户使用主根地址",
+  "TR_LOADING_FACT_17": "2021 年 9 月，萨尔瓦多成为第一个接受比特币为法定货币的国家。",
+  "TR_LOADING_FACT_18": "Laszlo Hanyecz 首次进行了商业比特币交易。他用一万枚比特币买了 2 个披萨。",
+  "TR_LOADING_FACT_19": "最后一个比特币应该在 2140 年左右被挖出来。",
+  "TR_LOADING_FACT_2": "您的 CoinJoin 混币器账户未被自动检测到。如果您没有启用该钱包的 “仅供查看” 模式，则需要在重新连接 Trezor 设备后手动重新添加账户。",
+  "TR_LOADING_FACT_20": "人称 “吓人辣妹” 的梅尔-B (Mel B) 是第一位接受比特币支付单曲的主流音乐人。",
   "TR_LOADING_FACT_21": "比特币交易以区块为单位。这些区块在区块链上按时间顺序排列。",
-  "TR_LOADING_FACT_22": "所谓的“减半”、是指开采比特币的奖励每四年减半一次。一开始、挖一个区块可以获得50比特币、而到2020年、挖一个区块可以获得6.25比特币",
-  "TR_LOADING_FACT_23": "比特币的最大上限为2100万个。",
-  "TR_LOADING_FACT_24": "“隐私不仅仅是我有权享有的东西、它是绝对的先决条件\"。—— 马龙·白兰度",
-  "TR_LOADING_FACT_25": "2011年2月、比特币首次达到与美元平价的水平",
-  "TR_LOADING_FACT_26": "Slush Pool是历史最悠久的比特币矿池、也是第一个公开的比特币矿池。如今、它由Braiins Pool运营。",
-  "TR_LOADING_FACT_3": "为了保护您的隐私、Suite不会记住您的混币账户、除非您明确选择记住钱包。",
-  "TR_LOADING_FACT_4": "约有20%的比特币因用户丢失私钥而丢失在钱包中。这相当于大约367万枚比特币。",
-  "TR_LOADING_FACT_5": "2013年10月29日、第一台比特币自动取款机在加拿大温哥华的一家咖啡店里诞生。到2022年、全球共有超过3.8万台比特币自动取款机。",
-  "TR_LOADING_FACT_6": "比特币是在2008年金融危机之后由一个化名为中本聪的匿名者 (甚至是一群人) 创建的。",
+  "TR_LOADING_FACT_22": "所谓的 “减半”、是指开采比特币的奖励每四年减半一次。一开始，挖一个区块可以获得 50 枚比特币，而到 2020 年，挖一个区块可以获得 6.25 枚比特币",
+  "TR_LOADING_FACT_23": "比特币的最大上限为 2100 万枚。",
+  "TR_LOADING_FACT_24": "“隐私不仅仅是我有权享有的东西、它是绝对的先决条件”。—— 马龙·白兰度",
+  "TR_LOADING_FACT_25": "2011 年 2 月，比特币首次达到与美元平价的水平",
+  "TR_LOADING_FACT_26": "Slush Pool 是历史最悠久的比特币矿池，也是第一个公开的比特币矿池。如今，它由 Braiins Pool 运营。",
+  "TR_LOADING_FACT_3": "除非您明确选择记住钱包，否则 Suite 不会记住您的 CoinJoin 混币器帐户以保护您的隐私。",
+  "TR_LOADING_FACT_4": "约有 20% 的比特币因用户丢失私钥而丢失在钱包中。这相当于大约 367 万枚比特币。",
+  "TR_LOADING_FACT_5": "2013 年 10 月 29 日，第一台比特币自动取款机在加拿大温哥华的一家咖啡店里诞生。到2022年，全球共有超过 3.8 万台比特币自动取款机。",
+  "TR_LOADING_FACT_6": "比特币是在 2008 年金融危机之后由一个化名为中本聪的匿名者 (甚至是一群人) 创建的。",
   "TR_LOADING_FACT_7": "一个比特币相当于1亿个聪。",
-  "TR_LOADING_FACT_8": "2022年、只有不到2%的人口拥有比特币。",
-  "TR_LOADING_FACT_9": "“隐私不仅仅是我有权享有的东西、它是绝对的先决条件\"。—— 马龙·白兰度",
+  "TR_LOADING_FACT_8": "在2022 年，只有不到 2% 的人口拥有比特币。",
+  "TR_LOADING_FACT_9": "“隐私不仅仅是我有权享有的东西，它是绝对的先决条件”。—— 马龙·白兰度",
   "TR_LOADING_FACT_TITLE": "您知道吗？",
   "TR_LOADING_FUNDS": "正在加载资金...",
   "TR_LOADING_TRANSACTION_DETAILS": "正在加载交易详情...",
@@ -1233,7 +1226,7 @@
   "TR_LOCAL_FILE_SYSTEM": "本地文件系统",
   "TR_LOG": "应用程序日志",
   "TR_LOGIN_PROCEED": "继续操作",
-  "TR_LOG_DESCRIPTION": "日志包含Trezor Suite的所有必要技术信息。在与Trezor客服连接时可能需要使用。",
+  "TR_LOG_DESCRIPTION": "日志包含 Trezor Suite 的所有必要技术信息。在与 Trezor 客服连接时可能需要使用。",
   "TR_LOOKING_FOR_COINJOIN_ROUND": "正在寻找下一回合。",
   "TR_LOW_ANONYMITY_WARNING": "<red>匿名性极低。</red> 我们建议至少使用五分之一、因为低于此值的任何内容都不具有匿名性。",
   "TR_LTC_ADDRESS_INFO": "莱特币 (LTC) 改变了地址的格式。在我们的博客上找到更多关于如何转换地址的信息。 {TR_LEARN_MORE}",
@@ -1243,15 +1236,15 @@
   "TR_MAX_MINING_FEE": "最大值挖矿费",
   "TR_MAYBE_LATER": "以后再说",
   "TR_MESSAGE": "留言",
-  "TR_MINED_TIME": "出矿时间",
+  "TR_MINED_TIME": "区块挖出时间",
   "TR_MINING_FEE_NOTE": "挖矿费可能更低。选定的费用是最大值。",
   "TR_MISSING_TO_FEE": "没有足够的资金来支付交易费",
   "TR_MISSING_TO_INPUT": "您的输入缺少 {amount} (不包括手续费)",
   "TR_MOBILE_APP_PROMO_TEXT": "具备更多安全功能",
   "TR_MOBILE_APP_PROMO_TEXT_FOOTER": "使用 <b>Trezor Suite Lite</b> 在手机上同步并跟踪",
   "TR_MORE_ROUNDS_NEEDED": "还需要几个回合",
-  "TR_MORE_ROUNDS_NEEDED_DESCRIPTION": "我们无法在预留回合内达到您所需的匿名级别。请再运行一回合的混币。您无需支付两次的服务费。",
-  "TR_MULTI_SHARE_BACKUP": "多共享助记词备份",
+  "TR_MORE_ROUNDS_NEEDED_DESCRIPTION": "我们无法在预留回合内达到您所需的匿名程度。请再运行一回合的混币。您无需支付两次的服务费。",
+  "TR_MULTI_SHARE_BACKUP": "秘密共享备份",
   "TR_MULTI_SHARE_BACKUP_BACKUPS": "我的助记词备份",
   "TR_MULTI_SHARE_BACKUP_CALLOUT_1": "它是如何运作的？",
   "TR_MULTI_SHARE_BACKUP_CALLOUT_2": "那我当前的钱包备份怎么办？",
@@ -1260,26 +1253,26 @@
   "TR_MULTI_SHARE_BACKUP_CHECKBOX_2": "我当前的助记词备份仍然能够恢复我的钱包",
   "TR_MULTI_SHARE_BACKUP_DESCRIPTION": "生成多个20个单词的助记词份额来恢复您的钱包。要重新获得钱包使用权、您需要您所设置的最低助记词份额数。",
   "TR_MULTI_SHARE_BACKUP_EXPLANATION_1": "生成多个20个单词的助记词份额来恢复您的钱包。要重新获得钱包使用权、您需要您所设置的最低助记词份额数。",
-  "TR_MULTI_SHARE_BACKUP_EXPLANATION_2": "您当前的助记词备份仍允许您恢复您的钱包。将其存储在一个安全可靠的地方、与您其他的多共享备份份额分开。",
+  "TR_MULTI_SHARE_BACKUP_EXPLANATION_2": "您当前的助记词备份仍允许您恢复您的钱包。将其存储在一个安全可靠的地方，与您其他的秘密共享份额分开放。",
   "TR_MULTI_SHARE_BACKUP_GREAT": "太好了！",
-  "TR_MULTI_SHARE_BACKUP_IN_PROGRESS": "多共享备份生成正在进行中",
-  "TR_MULTI_SHARE_BACKUP_IN_PROGRESS_DESCRIPTION": "在继续之前、有必要先完成多共享助记词备份份额的生成。请按照Trezor屏幕上的说明操作。",
+  "TR_MULTI_SHARE_BACKUP_IN_PROGRESS": "正在生成秘密共享备份",
+  "TR_MULTI_SHARE_BACKUP_IN_PROGRESS_DESCRIPTION": "在继续之前，有必要先完成秘密共享份额的生成。请按照 Trezor 屏幕上的说明操作。",
   "TR_MULTI_SHARE_BACKUP_IN_PROGRESS_HEADING": "欢迎回来！让我们继续你刚才的话题。",
   "TR_MULTI_SHARE_BACKUP_LOST_YOUR_BACKUP": "丢失了您的钱包备份？",
-  "TR_MULTI_SHARE_BACKUP_LOST_YOUR_BACKUP_INFO_TEXT": "可能无法恢复钱包。请联系Trezor客服。",
-  "TR_MULTI_SHARE_BACKUP_LOST_YOUR_TREZOR": "丢了您的Trezor设备？",
+  "TR_MULTI_SHARE_BACKUP_LOST_YOUR_BACKUP_INFO_TEXT": "可能无法恢复钱包。请联系 Trezor 客服。",
+  "TR_MULTI_SHARE_BACKUP_LOST_YOUR_TREZOR": "丢了您的 Trezor 设备？",
   "TR_MULTI_SHARE_BACKUP_LOST_YOUR_TREZOR_INFO_TEXT": "使用您的助记词备份来恢复对您的钱包的访问权。",
   "TR_MULTI_SHARE_BACKUP_SUCCESS_LEFT": "我先前的备份",
   "TR_MULTI_SHARE_BACKUP_SUCCESS_LEFT_LINE1": "依然能找回您的钱包",
   "TR_MULTI_SHARE_BACKUP_SUCCESS_LEFT_LINE2": "请您安全存放、与新钱包的备份分开",
-  "TR_MULTI_SHARE_BACKUP_SUCCESS_RIGHT": "我新的多共享备份",
+  "TR_MULTI_SHARE_BACKUP_SUCCESS_RIGHT": "我新的秘密共享备份",
   "TR_MULTI_SHARE_BACKUP_SUCCESS_RIGHT_LINE1": "用您设定的最低备份份额来找回您的钱包",
-  "TR_MULTI_SHARE_BACKUP_SUCCESS_RIGHT_LINE2": "与您信任的人共享或存储在安全和不同的地理位置",
+  "TR_MULTI_SHARE_BACKUP_SUCCESS_RIGHT_LINE2": "与受信任的个人分享或存储在安全、分开的位置",
   "TR_MULTI_SHARE_BACKUP_SUCCESS_WHY_IS_BACKUP_IMPORTANT": "为什么您的钱包的助记词备份是至关重要的？",
   "TR_MULTI_SHARE_TIPS_ON_STORING_BACKUP": "存储钱包助记词备份的小窍门",
   "TR_MY_ACCOUNTS": "我的账户",
   "TR_MY_ASSETS": "资产",
-  "TR_MY_COINS": "我的硬币",
+  "TR_MY_COINS": "隐私",
   "TR_MY_INPUTS_AND_OUTPUTS": "我的输入和输出",
   "TR_MY_PORTFOLIO": "资产组合",
   "TR_NAV_ANONYMIZE": "匿名化加密货币",
@@ -1296,59 +1289,61 @@
   "TR_NAV_TOKENS": "代币",
   "TR_NAV_TRADE": "兑换",
   "TR_NAV_TRANSACTIONS": "概览",
-  "TR_NEEDS_ATTENTION_BOOTLOADER": "Trezor设备处于加载引导模式。",
+  "TR_NEEDS_ATTENTION_BOOTLOADER": "Trezor 设备处于加载引导模式。",
   "TR_NEEDS_ATTENTION_FIRMWARE_REQUIRED": "需要固件更新。",
-  "TR_NEEDS_ATTENTION_INITIALIZE": "Trezor设备尚未设置。",
-  "TR_NEEDS_ATTENTION_SEEDLESS": "Trezor设备未备份过。",
-  "TR_NEEDS_ATTENTION_UNACQUIRED": "Trezor设备已在另一个窗口使用。",
-  "TR_NEEDS_ATTENTION_UNAVAILABLE": "Trezor设备无法使用。",
-  "TR_NEEDS_ATTENTION_UNREADABLE": "Trezor设备无法读取。",
-  "TR_NEEDS_ATTENTION_USED_IN_OTHER_WINDOW": "Trezor设备已使用。",
-  "TR_NEEDS_ATTENTION_WAS_USED_IN_OTHER_WINDOW": "Trezor设备已使用。",
-  "TR_NETWORK_BITCOIN": "比特币 (BTC)",
-  "TR_NETWORK_BITCOIN_CASH": "比特币现金 (BCH)",
-  "TR_NETWORK_BITCOIN_GOLD": "比特币黄金 (BTG)",
+  "TR_NEEDS_ATTENTION_INITIALIZE": "Trezor 设备尚未设置。",
+  "TR_NEEDS_ATTENTION_SEEDLESS": "Trezor 设备未备份过。",
+  "TR_NEEDS_ATTENTION_UNACQUIRED": "Trezor 设备已在另一个窗口使用。",
+  "TR_NEEDS_ATTENTION_UNAVAILABLE": "Trezor 设备无法使用。",
+  "TR_NEEDS_ATTENTION_UNREADABLE": "Trezor 设备无法读取。",
+  "TR_NEEDS_ATTENTION_USED_IN_OTHER_WINDOW": "Trezor 设备已使用。",
+  "TR_NEEDS_ATTENTION_WAS_USED_IN_OTHER_WINDOW": "Trezor 设备已使用。",
+  "TR_NETWORK_BITCOIN": "比特币",
+  "TR_NETWORK_BITCOIN_CASH": "比特现金",
+  "TR_NETWORK_BITCOIN_GOLD": "比特黄金",
   "TR_NETWORK_BITCOIN_REGTEST": "比特币回归测试代币",
   "TR_NETWORK_BITCOIN_TESTNET": "比特币测试代币",
-  "TR_NETWORK_BNB": "币安智能链 (BNB)",
-  "TR_NETWORK_CARDANO": "卡达尔诺 (ADA)",
+  "TR_NETWORK_BNB": "币安智能链",
+  "TR_NETWORK_CARDANO": "卡达尔诺",
   "TR_NETWORK_CARDANO_TESTNET": "卡达尔诺测试代币",
-  "TR_NETWORK_COINJOIN_BITCOIN": "混币",
-  "TR_NETWORK_COINJOIN_BITCOIN_REGTEST": "混币器回归测试代币\n",
-  "TR_NETWORK_COINJOIN_BITCOIN_TESTNET": "混币器测试代币",
-  "TR_NETWORK_DASH": "达世币 (DASH)",
-  "TR_NETWORK_DIGIBYTE": "极特币 (DGB)",
-  "TR_NETWORK_DOGECOIN": "狗狗币 (DOGE)",
-  "TR_NETWORK_ETHEREUM": "以太坊 (ETH)",
-  "TR_NETWORK_ETHEREUM_CLASSIC": "以太坊经典 (ETC)",
-  "TR_NETWORK_ETHEREUM_HOLESKY": "以太坊Holesky测试代币",
-  "TR_NETWORK_ETHEREUM_SEPOLIA": "以太坊Sepolia测试代币",
-  "TR_NETWORK_LITECOIN": "莱特币 (LTC)",
-  "TR_NETWORK_NAMECOIN": "域名币 (NMC)",
-  "TR_NETWORK_NEM": "新经币 (XEM)",
-  "TR_NETWORK_POLYGON": "Polygon权益证明链 (POL)",
-  "TR_NETWORK_SOLANA_DEVNET": "Solana开发网络",
-  "TR_NETWORK_SOLANA_MAINNET": "Solana (SOL)",
-  "TR_NETWORK_STELLAR": "恒星币 (XLM)",
-  "TR_NETWORK_TEZOS": "Tezos（XTZ）",
+  "TR_NETWORK_COINJOIN_BITCOIN": "CoinJoin 混币器",
+  "TR_NETWORK_COINJOIN_BITCOIN_REGTEST": "CoinJoin 混币器回归测试代币\n",
+  "TR_NETWORK_COINJOIN_BITCOIN_TESTNET": "CoinJoin 混币器测试网代币",
+  "TR_NETWORK_DASH": "达世币",
+  "TR_NETWORK_DIGIBYTE": "极特币",
+  "TR_NETWORK_DOGECOIN": "狗狗币",
+  "TR_NETWORK_ETHEREUM": "以太坊",
+  "TR_NETWORK_ETHEREUM_CLASSIC": "以太经典",
+  "TR_NETWORK_ETHEREUM_HOLESKY": "以太坊 Holesky 测试代币",
+  "TR_NETWORK_ETHEREUM_SEPOLIA": "以太坊 Sepolia 测试代币",
+  "TR_NETWORK_LITECOIN": "莱特币",
+  "TR_NETWORK_NAMECOIN": "域名币",
+  "TR_NETWORK_NEM": "新经币",
+  "TR_NETWORK_OP": "Optimism",
+  "TR_NETWORK_POLYGON": "Polygon 权益证明链",
+  "TR_NETWORK_SOLANA_DEVNET": "Solana 开发网络",
+  "TR_NETWORK_SOLANA_MAINNET": "Solana",
+  "TR_NETWORK_STELLAR": "恒星币",
+  "TR_NETWORK_TEZOS": "Tezos",
   "TR_NETWORK_UNKNOWN": "未知",
-  "TR_NETWORK_VERTCOIN": "绿币 (VTC)",
-  "TR_NETWORK_XRP": "瑞波币 (XRP)",
+  "TR_NETWORK_VERTCOIN": "绿币",
+  "TR_NETWORK_XRP": "瑞波币",
   "TR_NETWORK_XRP_TESTNET": "瑞波币测试代币",
-  "TR_NETWORK_ZCASH": "大零币 (ZEC)",
-  "TR_NEW_FEE": "新",
-  "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "新的Trezor网桥可供使用。",
-  "TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT": "新的Trezor固件已发布！请立即更新您的设备。",
+  "TR_NETWORK_ZCASH": "大零币",
+  "TR_NEW_FEE": "新的费率",
+  "TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE": "新的 Trezor 网桥可供使用。",
   "TR_NEXT_UP": "接下来",
   "TR_NONCE": "随机数",
+  "TR_NON_ASCII_CHAR": "{label} (带有非不推荐的 \"{char}\"）",
+  "TR_NON_ASCII_CHARS": "{label} (带有不推荐的字符）",
   "TR_NORMAL_ACCOUNTS": "默认账户",
   "TR_NORTH": "北",
   "TR_NOTHING_TO_ANONYMIZE": "无需匿名化",
-  "TR_NOTIFICATIONS": "活动",
+  "TR_NOTIFICATIONS": "动态",
   "TR_NOT_ENOUGH_ANONYMIZED_FUNDS": "没有足够具有隐私性的资产",
-  "TR_NOT_ENOUGH_ANONYMIZED_FUNDS_RBF_WARNING": "具有隐私性的比特币不足。您可以提高您的比特币隐私性或者降低隐私级别。",
+  "TR_NOT_ENOUGH_ANONYMIZED_FUNDS_RBF_WARNING": "具有隐私性的比特币不足。您可以提高您的比特币匿名性或者降低匿名程度。",
   "TR_NOT_ENOUGH_ANONYMIZED_FUNDS_TOOLTIP": "您可以: ",
-  "TR_NOT_ENOUGH_ANONYMIZED_FUNDS_WARNING": "具有隐私性的比特币不足。您可以提高您的比特币隐私性、在“货币控制”中手动选择“消费的交易输出”(UTXOs)、或者降低隐私级别。",
+  "TR_NOT_ENOUGH_ANONYMIZED_FUNDS_WARNING": "具有隐私性的比特币不足。您可以提高您的比特币匿名性、在 “币控制” 中手动选择 “未消费交易输出”、或者降低匿名程度。",
   "TR_NOT_ENOUGH_SELECTED": "没有选择足够的资金",
   "TR_NOT_PRIVATE": "不具有隐私性的",
   "TR_NOT_PRIVATE_DESCRIPTION": "匿名性低于 {targetAnonymity}",
@@ -1357,127 +1352,101 @@
   "TR_NO_FIRMWARE_EXPLAINED": "您需要安装固件后才能使用您的设备。",
   "TR_NO_PASSPHRASE_WALLET": "标准钱包",
   "TR_NO_SEARCH_RESULTS": "没有符合您搜索标准的结果",
-  "TR_NO_SPENDABLE_UTXOS": "您的帐户里没有可使用的未消费的交易输出。",
+  "TR_NO_SPENDABLE_UTXOS": "您的帐户里没有可使用的”未消费交易输出”。",
   "TR_NO_TRANSPORT": "浏览器无法与设备进行通信",
   "TR_NO_TRANSPORT_DESKTOP": "应用程序无法与设备进行通信",
-  "TR_NUM_ACCOUNTS_FIAT_VALUE": "{accountsCount} {accountsCount, plural, one {account} other {accounts}} • {fiatValue}",
+  "TR_NUM_ACCOUNTS_FIAT_VALUE": "{accountsCount} {accountsCount, plural, other {个账户}} • {fiatValue}",
   "TR_N_MIN": "{n} 最小值",
-  "TR_N_TRANSACTIONS": "{value} {value, plural, one {transaction} other {transactions}}",
+  "TR_N_TRANSACTIONS": "{value} {value, plural, other {笔交易}}",
   "TR_OFF": "关闭",
-  "TR_OFFER_ERROR_MAXIMUM_CRYPTO": "选择的 {amount} 金额高于 {max} 的最大值。",
-  "TR_OFFER_ERROR_MAXIMUM_FIAT": "选择的 {amount} 金额高于 {max} 的最大值。",
-  "TR_OFFER_ERROR_MINIMUM_CRYPTO": "所选的 {amount} 金额低于所接受的最小值 {min}。",
-  "TR_OFFER_ERROR_MINIMUM_FIAT": "所选的 {amount} 金额低于所接受的最小值 {min}。",
   "TR_OFFICIAL_LANGUAGES": "官方",
   "TR_OK": "确定",
   "TR_ON": "开机",
   "TR_ONBOARDING_ADVANCED": "高级",
   "TR_ONBOARDING_ALLOW_ANALYTICS": "允许匿名数据收集",
   "TR_ONBOARDING_BACKUP_CATEGORY_20_WORD_BACKUPS": "20个单词的助记词备份类型",
-  "TR_ONBOARDING_BACKUP_LEGACY_WARNING": "这不能直接升级为多共享备份。为实现无缝升级、请使用默认的单份备份。",
+  "TR_ONBOARDING_BACKUP_LEGACY_WARNING": "这不能直接升级为秘密共享备份。为实现无缝升级，请使用默认的单份备份。",
   "TR_ONBOARDING_BACKUP_OLDER_BACKUP_TYPES_SHORT": "旧版备份类型",
-  "TR_ONBOARDING_BACKUP_SHAMIR_WARNING": "这种备份类型允许<strong>未来升级</strong>、但它包含20个单词、所以<strong>无法完全记录</strong>在随设备包装的12个单词的助记词纸卡上。<strong>请您把它们按编号顺序写在耐用的纸张上、不要用数码方式存储。</strong>",
-  "TR_ONBOARDING_BACKUP_SUBHEADING": "您的钱包备份是由Trezor设备生成的单词列表组成。请准确记下并妥善保存。这是找回您的钱包的唯一方法。",
+  "TR_ONBOARDING_BACKUP_SHAMIR_WARNING": "这种备份类型允许<strong>未来升级</strong>、但它包含 20 个单词、所以<strong>无法完全记录</strong>在随设备包装的 12 个单词的助记词纸卡上。<strong>请您把它们按编号顺序写在耐用的纸张上、不要用数码方式存储。</strong>",
+  "TR_ONBOARDING_BACKUP_SUBHEADING": "您的钱包备份是由 Trezor 设备生成的单词列表组成。请准确记下并妥善保存。这是找回您的钱包的唯一方法。",
   "TR_ONBOARDING_BACKUP_TYPE": "备份类型",
-  "TR_ONBOARDING_BACKUP_TYPE_12_DEFAULT_TOOLTIP": "对于Trezor设备、建议使用默认选项。",
+  "TR_ONBOARDING_BACKUP_TYPE_12_DEFAULT_TOOLTIP": "对于 Trezor 设备、建议使用默认选项。",
   "TR_ONBOARDING_BACKUP_TYPE_12_WORDS_DEFAULT_NOTE": "生成一组12个单词的助记词、适合写在设备的钱包备份卡上。",
   "TR_ONBOARDING_BACKUP_TYPE_ADVANCED": "高级",
   "TR_ONBOARDING_BACKUP_TYPE_DEFAULT": "默认",
-  "TR_ONBOARDING_BACKUP_TYPE_UPGRADABLE_TO_MULTI": "可升级至多共享备份",
-  "TR_ONBOARDING_CANNOT_SELECT_SEED_TYPE": "Trezor设备将为您创建一个新钱包。",
+  "TR_ONBOARDING_BACKUP_TYPE_UPGRADABLE_TO_MULTI": "可升级至秘密共享备份",
+  "TR_ONBOARDING_CANNOT_SELECT_SEED_TYPE": "Trezor 设备将为您创建一个新钱包。",
   "TR_ONBOARDING_CLICK_TO_CONFIRM": "点击确认您理解下面的说明",
   "TR_ONBOARDING_COINS_STEP": "激活币种",
-  "TR_ONBOARDING_COINS_STEP_DESCRIPTION": "选择要在Trezor Suite中显示的加密货币类型。您可以随时更改此设置。",
-  "TR_ONBOARDING_COINS_STEP_DESCRIPTION_BITCOIN_ONLY": "选择是否要在Trezor Suite中显示比特币。您可以随时更改此设置。",
+  "TR_ONBOARDING_COINS_STEP_DESCRIPTION": "选择要在 Trezor Suite 中显示的加密货币类型。您可以随时更改此设置。",
+  "TR_ONBOARDING_COINS_STEP_DESCRIPTION_BITCOIN_ONLY": "选择是否要在 Trezor Suite 中显示比特币。您可以随时更改此设置。",
   "TR_ONBOARDING_CREATE_NEW_WALLET": "创建一个新的钱包",
   "TR_ONBOARDING_CURRENT_VERSION": "当前版本",
   "TR_ONBOARDING_DATA_COLLECTION_DESCRIPTION": "所有收集到的数据都是匿名的、用于提高产品性能和开发。更多信息请参见<analytics>技术文档</analytics>和<tos>条款与条件</tos>。",
   "TR_ONBOARDING_DATA_COLLECTION_HEADING": "匿名数据收集",
   "TR_ONBOARDING_DEVICE_CHECK": "设备安全性检查",
   "TR_ONBOARDING_DEVICE_CHECK_1": "我的 <strong>全息图</strong> 完好无损、没有被篡改的痕迹。",
-  "TR_ONBOARDING_DEVICE_CHECK_2": "我的设备是从<shop>Trezor官方商店</shop>或</shop>值得信赖的经销商</reseller>处购买的。",
+  "TR_ONBOARDING_DEVICE_CHECK_2": "我的设备是从<shop>Trezor 官方商店</shop>或</shop>值得信赖的经销商</reseller>处购买的。",
   "TR_ONBOARDING_DEVICE_CHECK_3": "设备包装完好无损、没有被篡改的痕迹。",
-  "TR_ONBOARDING_DEVICE_CHECK_4": "已在连接的Trezor设备上安装完固件。只有在使用过该Trezor的情况下才能继续设置。",
+  "TR_ONBOARDING_DEVICE_CHECK_4": "已在连接的 Trezor 设备上安装完固件。只有在使用过该 Trezor 的情况下才能继续设置。",
   "TR_ONBOARDING_DOWNLOAD_DESKTOP_APP": "下载桌面应用程序",
   "TR_ONBOARDING_FINAL_CHANGE_HOMESCREEN": "更改主屏幕",
-  "TR_ONBOARDING_NEW_FW_DESCRIPTION": "有新的固件版本可用。立即更新设备或在完成设备设置后在Trezor Suite中进行更新。",
+  "TR_ONBOARDING_NEW_FW_DESCRIPTION": "有新的固件版本可用。立即更新设备或在完成设备设置后在 Trezor Suite 中进行更新。",
   "TR_ONBOARDING_NEW_VERSION": "最新版本",
   "TR_ONBOARDING_SEED_TYPE_12_WORDS": "12个单词的助记词备份",
   "TR_ONBOARDING_SEED_TYPE_24_WORDS": "24个单词的助记词备份",
-  "TR_ONBOARDING_SEED_TYPE_ADVANCED": "多共享备份",
+  "TR_ONBOARDING_SEED_TYPE_ADVANCED": "秘密共享备份",
   "TR_ONBOARDING_SEED_TYPE_ADVANCED_DESCRIPTION": "生成多个20个单词的助记词备份份额来恢复您的钱包。设置最低恢复份额数量、然后将份额分发给受信任的人或安全地隐藏起来。需要时、收集所需数量的备份份额、重新获得钱包访问权限。",
   "TR_ONBOARDING_SEED_TYPE_SINGLE_SEED": "单份备份",
-  "TR_ONBOARDING_SEED_TYPE_SINGLE_SEED_DESCRIPTION": "生成一组包含20个单词的助记词备份、用于恢复钱包。该备份类型可随时升级为多共享备份。",
+  "TR_ONBOARDING_SEED_TYPE_SINGLE_SEED_DESCRIPTION": "生成一组包含 20 个英文单词的助记词，用于恢复钱包。该备份类型可随时升级为秘密共享备份。",
   "TR_ONBOARDING_SELECTED_DEFAULT_BACKUP_TYPE": "我们已根据您的设备为您的钱包选择了<primary>默认备份类型</primary>。",
   "TR_ONBOARDING_SELECTED_OPTIMAL_BACKUP_TYPE": "我们已为您的钱包选择了<primary>最佳备份类型</primary>。",
   "TR_ONBOARDING_SELECT_SEED_TYPE_CONFIRM": "创建钱包",
   "TR_ONBOARDING_STEP_WALLET": "钱包",
-  "TR_ONBOARDING_TREZOR_WILL_DISPLAY_BACKUP": "Trezor设备将显示您的钱包备份。请准确记下并妥善保管。这是找回钱包的唯一方法。",
+  "TR_ONBOARDING_TREZOR_WILL_DISPLAY_BACKUP": "Trezor 设备将显示您的钱包备份。请准确记下并妥善保管。这是找回钱包的唯一方法。",
   "TR_ONBOARDING_TROUBLESHOOTING_FAILED": "还是没有用？",
-  "TR_ONBOARDING_WILL_CREATE_BACKUP_TYPE": "Trezor设备将根据<br></br>所选的钱包备份类型创建钱包。",
+  "TR_ONBOARDING_WILL_CREATE_BACKUP_TYPE": "Trezor 设备将根据<br></br>所选的钱包备份类型创建钱包。",
   "TR_ONCE_YOU_BEGIN_THIS_PROCESS": "这个过程只需要几分钟、但一旦开始、您就不能暂停或重新开始。",
-  "TR_ONION_BACKEND_TOR_NEEDED": "您为您的后端使用了洋葱地址。要使用洋葱地址、你需要有访问Tor网络的权限。",
+  "TR_ONION_BACKEND_TOR_NEEDED": "您使用了一个洋葱地址作为您的后端。要使用洋葱地址，您需要访问 Tor 网络。",
   "TR_ONION_LINKS_DESCRIPTION": "启用该设置后、所有 trezor.io 的链接将以 .onion 链接的形式打开。",
   "TR_ONION_LINKS_TITLE": "将 trezor.io 链接用 .onion 链接打开",
-  "TR_OPEN_TREZOR_SUITE_DESKTOP": "打开Trezor Suite桌面应用程序",
+  "TR_OPEN_TREZOR_SUITE_DESKTOP": "打开 Trezor Suite 桌面应用程序",
   "TR_ORDER_NOW": "立即订购",
-  "TR_ORIGINAL_ADDRESS": "持续的",
+  "TR_ORIGINAL_ADDRESS": "连续式",
   "TR_OTHER_COINS_USE_DEFAULT_BACKEND": "其他币种使用其默认的后端",
   "TR_OTHER_INPUTS_AND_OUTPUTS": "其他输入和输出",
-  "TR_OUTGOING": "传出",
+  "TR_OUTGOING": "发送出",
   "TR_OUTPUTS": "输出",
-  "TR_P2P_AMOUNT_RANGE_TOOLTIP": "该用户愿意出售 {symbol} 的最低和最高的价格。",
-  "TR_P2P_GET_STARTED_INTRO": "您需要在 {providerName} 上启动交易——确保仔细遵循下面的步骤。",
-  "TR_P2P_GET_STARTED_ITEM_1": "选择 “前往 {providerName}”、转到我们合作伙伴的网站。",
-  "TR_P2P_GET_STARTED_ITEM_3": "一旦 {providerName} 请求您的发布地址、返回此处并继续。",
-  "TR_P2P_GET_STARTED_ITEM_4": "差不多了！显示并复制您的地址、粘贴到 {providerName} 上的 “发布地址 ”字段、然后完成交易。",
-  "TR_P2P_GO_TO_PROVIDER": "前往 {providerName}",
-  "TR_P2P_INFO": "有了 {peerToPeer} (P2P) 技术、买卖双方都无需进行实名认证。通过安全的多重签名托管 {multisigEscrow}、所有各方都能免受欺诈。",
-  "TR_P2P_MODAL_CONFIRM": "我准备购买了",
-  "TR_P2P_MODAL_FOR_YOUR_SAFETY": "点对点购买 {provider} 的 {cryptocurrency} ",
-  "TR_P2P_MODAL_LEGAL_HEADER": "法律声明",
-  "TR_P2P_MODAL_SECURITY_HEADER": "Trezor一直把安全放在第一位",
-  "TR_P2P_MODAL_TERMS_1": "您在此使用点对点 (P2P) 技术向您选择的另一人购买加密货币、无需身份验证。如果您是因其他原因被引导至本网站、请在继续操作前联系技术支持。",
-  "TR_P2P_MODAL_TERMS_2": "您需要明白加密货币交易是不可逆的、是无法退还的。因此、欺诈性或意外损失是无法恢复的。",
-  "TR_P2P_MODAL_TERMS_4": "您理解Invity不提供此服务。{provider} 的条款管辖该服务。",
-  "TR_P2P_MODAL_TERMS_5": "您不得将此功能用于赌博、欺诈或任何其他违反Invity或供应商服务条款或任何适用法规的行为。",
-  "TR_P2P_MODAL_TERMS_6": "您明白加密货币是一种新兴的金融工具、不同司法管辖区的法规可能有所不同。这可能会使您面临更高的欺诈、盗窃或市场不稳定风险。",
-  "TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER": "经过Invity验证的合作伙伴",
-  "TR_P2P_PAYMENT_WINDOW_TOOLTIP": "交易需要在此时间限制内完成、从创建一个 {providerName} 站点的合同。",
-  "TR_P2P_PRICE": "1 {symbol} 的价格",
-  "TR_P2P_PRICE_TOOLTIP": "此用户提供的 {symbol} 价格。",
-  "TR_P2P_TITLE_NOT_AVAILABLE": "你好、我正在使用 {providerName}！",
-  "TR_P2P_USER_REPUTATION": "({rating}、{numberOfTrades})",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM": "选择的 {amount} 金额高于接受的 {maximum} 上限。",
-  "TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM": "选择的金额 {amount} 低于接受的最小值 {minimum}。",
   "TR_PAGINATION_NEWER": "较新的",
   "TR_PAGINATION_OLDER": "较旧的",
-  "TR_PASSPHRASE_CASE_SENSITIVE": "注意: 密码短语是区分大小写的。",
+  "TR_PASSPHRASE_CASE_SENSITIVE": "注意：密码短语是区分大小写的。",
   "TR_PASSPHRASE_DESCRIPTION_ITEM1": "首先了解密码短语的工作原理是非常重要",
-  "TR_PASSPHRASE_DESCRIPTION_ITEM2": "通过密码短语打开由该密码短语保护的钱包",
-  "TR_PASSPHRASE_DESCRIPTION_ITEM3": "没人能恢复它、即使是Trezor客服也不行",
+  "TR_PASSPHRASE_DESCRIPTION_ITEM2": "通过密码短语打开由该密码短语保护的隐藏钱包",
+  "TR_PASSPHRASE_DESCRIPTION_ITEM3": "没人能恢复它，即使是 Trezor 客服也不行",
   "TR_PASSPHRASE_HIDDEN_WALLET": "隐藏钱包",
   "TR_PASSPHRASE_MISMATCH": "密码不匹配",
-  "TR_PASSPHRASE_MISMATCH_DESCRIPTION": "密码不匹配。为了安全起见、请重新开始并正确输入。",
-  "TR_PASSPHRASE_MISMATCH_START_OVER": "从头再来",
-  "TR_PASSPHRASE_TOO_LONG": "密码短语的长度已经超过了允许的限制。",
+  "TR_PASSPHRASE_MISMATCH_DESCRIPTION": "密码不匹配。为了安全起见，请重新开始并正确输入。",
+  "TR_PASSPHRASE_MISMATCH_START_OVER": "重新开始",
+  "TR_PASSPHRASE_NON_ASCII_CHARS": "我们建议使用 <code>ABC</code>, <code>abc</code>, <code>123</code>, <code>空格</code>或<code>这些特殊字符</code>",
+  "TR_PASSPHRASE_NON_ASCII_CHARS_WARNING": "使用未列出的特殊字符会给未来的兼容性带来风险",
+  "TR_PASSPHRASE_TOO_LONG": "密码短语长度已超出允许的限制（50个字节）。",
   "TR_PASSPHRASE_WALLET": "隐藏钱包 #{id}",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT": "了解密码短语的工作原理",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT_LINK": "去",
-  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_OPEN_UNUSED_WALLET_BUTTON": "是、打开",
+  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_OPEN_UNUSED_WALLET_BUTTON": "是的，打开",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_OPEN_UNUSED_WALLET_DESCRIPTION": "这个钱包是空的、从未使用过。你想打开它吗？",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_OPEN_WITH_FUNDS_BUTTON": "重试",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_OPEN_WITH_FUNDS_DESCRIPTION": "期待一个带有资金的隐藏钱包？",
-  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_TITLE": "此密码钱包是空的",
-  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP2_BUTTON": "知道了、继续",
-  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP2_ITEM1_DESCRIPTION": "将密码短语写在纸上、远离任何电子设备 (云端、USB、互联网、电话)。",
-  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP2_ITEM2_DESCRIPTION": "将其存放在安全的地方、与钱包备份和Trezor设备分开。",
-  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP2_ITEM3_DESCRIPTION": "切勿与任何人分享、即使是Trezor客服也不行。",
+  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_TITLE": "此隐藏钱包是空的",
+  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP2_BUTTON": "明白了，继续",
+  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP2_ITEM1_DESCRIPTION": "将密码短语写在纸上，远离任何电子设备 (云存储、U盘、互联网、手机)。",
+  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP2_ITEM2_DESCRIPTION": "请将其存放在安全的地方，与钱包备份和 Trezor 设备分开存放。",
+  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP2_ITEM3_DESCRIPTION": "切勿与任何人分享，即使是 Trezor 客服也不行。",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP2_TITLE": "密码短语最佳实践",
-  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP2_WARNING": "没有人能恢复它、即使是Trezor客服也不行。",
+  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP2_WARNING": "没有人能恢复它，即使是 Trezor 客服也没办法。",
   "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP3_TITLE": "确认密码短语",
-  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP3_WARNING": "写在纸上、远离任何电子设备、并将其存放在安全的地方。没有人能恢复它、即使是Trezor客服。",
-  "TR_PASSWORD_MANAGER": "迁移Dropbox密码",
+  "TR_PASSPHRASE_WALLET_CONFIRMATION_STEP3_WARNING": "写在纸上，远离任何电子设备，并将其存放在安全的地方。没有人能恢复它，即使是 Trezor 客服也不行。",
+  "TR_PASSWORD_MANAGER": "迁移 Dropbox 密码",
   "TR_PAUSED": "已暂停",
   "TR_PAYMENT_METHOD_ACH": "自动转账",
   "TR_PAYMENT_METHOD_BANKTRANSFER": "银行转帐",
@@ -1488,66 +1457,72 @@
   "TR_PAYMENT_METHOD_TEN31SEPA": "TEN31 SEPA",
   "TR_PAYMENT_METHOD_UNKNOWN": "未知",
   "TR_PAYMENT_METHOD_WORLDPAYCREDIT": "Worldpay Credit",
-  "TR_PENDING_TX_HEADING": "待定的 {count, plural, other {交易}}",
+  "TR_PENDING_TX_HEADING": "待办中 {count, plural, one {transaction} other {transactions}}",
   "TR_PERSONALIZATION": "自定义",
   "TR_PIN": "PIN码",
   "TR_PIN_HEADING_FIRST": "设置新的PIN码",
   "TR_PIN_HEADING_INITIAL": "设置PIN码",
   "TR_PIN_HEADING_REPEAT": "重复PIN码",
   "TR_PIN_HEADING_SUCCESS": "PIN码已设置",
-  "TR_PIN_MATRIX_DISPLAYED_ON_TREZOR": "这些数字已显示在您的Trezor设备上",
+  "TR_PIN_MATRIX_DISPLAYED_ON_TREZOR": "这些数字已显示在您的 Trezor 设备上",
   "TR_PIN_MISMATCH_HEADING": "PIN码不匹配！",
-  "TR_PIN_SET_SUCCESS": "写下您的PIN码并妥善保管、与您的恢复种子分开存放。当您需要访问您的资金时、用它来解锁您的Trezor设备。",
-  "TR_PIN_SUBHEADING": "使用较长的PIN码可以保护您的Trezor设备免受未经授权的物理访问。",
+  "TR_PIN_SET_SUCCESS": "请写下您的PIN码并妥善保管。需要访问您的资金时，用它来解锁您的 Trezor 设备。",
+  "TR_PIN_SUBHEADING": "使用较长的PIN码可以保护您的 Trezor 设备免受未经授权的物理访问。",
   "TR_PLAY_IT_SAFE": "让我们稳妥行事",
   "TR_PLEASE_ALLOW_YOUR_CAMERA": "请允许您的摄像头被使用来扫描二维码。",
-  "TR_PLEASE_CONNECT_YOUR_DEVICE": "请连接您的Trezor设备以继续验证过程。",
+  "TR_PLEASE_CONNECT_YOUR_DEVICE": "请连接您的 Trezor 设备以继续验证过程。",
   "TR_PLEASE_ENABLE_PASSPHRASE": "请启用密码短语功能以继续验证过程。",
   "TR_POLICY_ID_ADDRESS": "政策ID: ",
   "TR_PRIMARY_FIAT": "法定货币",
-  "TR_PRIVATE": "私人的",
-  "TR_PRIVATE_DESCRIPTION": "隐私性至少 {targetAnonymity}",
+  "TR_PRIVATE": "具有隐私性的",
+  "TR_PRIVATE_DESCRIPTION": "匿名性至少 {targetAnonymity}",
   "TR_PROCEED_UNVERIFIED_ADDRESS": "使用未经验证的地址",
   "TR_PROMO_BANNER_DASHBOARD": "<underline>最便利的</underline> <rest>硬件钱包来管理您的加密货币</rest>",
-  "TR_QR_CODE": "二维码",
-  "TR_QR_RECEIVE_ADDRESS_CONFIRM": "扫描二维码前先请在Trezor设备上确认",
-  "TR_QR_RECEIVE_ADDRESS_CONFIRM_EXPLANATION": "请先在Trezor设备上确认接收地址、因为它的显示屏是权威性的、无法被黑客或病毒篡改。",
+  "TR_QR_RECEIVE_ADDRESS_CONFIRM": "扫描二维码之前先请在 Trezor 设备上确认",
+  "TR_QR_RECEIVE_ADDRESS_CONFIRM_EXPLANATION": "请先在 Trezor 设备上确认接收地址、因为它的显示屏是权威性的、无法被黑客或病毒篡改。",
   "TR_QUICK_ACTION_DEBUG_EAP_EXPERIMENTAL_ENABLED": "已启用",
   "TR_QUICK_ACTION_TOOLTIP_JUST_UPDATED": "刚刚更新 {currentVersion}",
   "TR_QUICK_ACTION_TOOLTIP_RESTART_TO_UPDATE": "重新启动以更新",
-  "TR_QUICK_ACTION_TOOLTIP_TREZOR_DEVICE": "Trezor设备",
+  "TR_QUICK_ACTION_TOOLTIP_TREZOR_DEVICE": "Trezor 设备",
   "TR_QUICK_ACTION_TOOLTIP_TREZOR_SUITE": "Trezor Suite",
   "TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE": "可提供的更新 {newVersion}",
   "TR_QUICK_ACTION_TOOLTIP_UP_TO_DATE": "您已使用最新的版本{currentVersion}",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED": "Suite 已下载了新的 Trezor 更新！",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED": "应用程序已更新！",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE": "应用程序更新可用",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE": "点击重新启动并更新",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE": "点击开始更新",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE": "有 Trezor 更新可用",
+  "TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW": "有什么新变化？",
   "TR_RANDOM_SEED_WORDS_DISCLAIMER": "您可能会被要求输入一些不属于您的钱包助记词备份的单词。",
   "TR_RANGE": "时间范围",
   "TR_READ_AND_UNDERSTOOD": "我已经阅读并理解了上述内容",
-  "TR_REBOOT_INTO_BOOTLOADER": "更新Trezor设备固件",
+  "TR_REBOOT_INTO_BOOTLOADER": "更新 Trezor 设备固件",
   "TR_RECEIVE": "接收",
   "TR_RECEIVED": "已接收",
   "TR_RECEIVED_SYMBOL": "已收到 {multiple, select, true {多个代币} false {{symbol}} other {{symbol}}}",
   "TR_RECEIVE_ADDRESS": "接收地址",
-  "TR_RECEIVE_ADDRESS_MATCH": "接收地址是否匹配？",
+  "TR_RECEIVE_ADDRESS_MATCH": "接收地址是否一致？",
   "TR_RECEIVE_ADDRESS_SECURITY_CHECK_FAILED": "您的设备可能不安全。请勿向其发送资金。",
   "TR_RECEIVE_NETWORK": "接收 {network}",
   "TR_RECEIVING_SYMBOL": "接收{multiple, select, true {多个代币} false {{symbol}} other {{symbol}}}",
   "TR_RECIPIENT_ADDRESS": "接收人地址",
   "TR_RECIPIENT_ADDRESS_MATCH": "接收地址是否匹配？",
   "TR_RECOMMENDED": "推荐的",
-  "TR_RECONNECT_DEVICE_DESCRIPTION": "如果关闭标签页并刷新此页面没有帮助、请尝试重新连接您的Trezor设备。",
-  "TR_RECONNECT_DEVICE_DESCRIPTION_DESKTOP": "如果关闭标签页并重新打开Trezor Suite应用程序没有帮助、请尝试重新连接您的Trezor设备。",
-  "TR_RECONNECT_HEADER": "重新连接您的Trezor设备",
-  "TR_RECONNECT_IN_BOOTLOADER": "在加载引导模式下重新连接您的Trezor设备",
+  "TR_RECONNECT_DEVICE_DESCRIPTION": "如果关闭标签页并刷新此页面没有帮助、请尝试重新连接您的 Trezor 设备。",
+  "TR_RECONNECT_DEVICE_DESCRIPTION_DESKTOP": "如果关闭标签页并重新打开 Trezor Suite 应用程序没有帮助、请尝试重新连接您的 Trezor 设备。",
+  "TR_RECONNECT_HEADER": "重新连接您的 Trezor 设备",
+  "TR_RECONNECT_IN_BOOTLOADER": "在加载引导模式下重新连接您的 Trezor 设备",
   "TR_RECONNECT_IN_BOOTLOADER_SUCCESS": "设备现在已经准备就绪",
   "TR_RECONNECT_IN_NORMAL": "重新连接您的设备",
-  "TR_RECONNECT_YOUR_DEVICE": "重新连接您的Trezor设备",
-  "TR_RECOVERY_ERROR": "设备恢复失败：{error}",
+  "TR_RECONNECT_YOUR_DEVICE": "重新连接您的 Trezor 设备",
+  "TR_RECOVERY_ERROR": "设备恢复失败: {error}",
   "TR_RECOVERY_FAILED": "恢复失败",
-  "TR_RECOVERY_MATRIX_DISPLAYED_ON_TREZOR": "这些字母显示在您的Trezor设备上",
-  "TR_RECOVERY_TYPES_DESCRIPTION": "这两种方法都是安全的; 高级恢复让您在Trezor设备上输入钱包助记词、只不过需要稍微长一些时间。",
-  "TR_RECOVER_SUBHEADING_BUTTONS": "整个恢复钱包的过程在Trezor设备上通过按钮输入完成。",
+  "TR_RECOVERY_MATRIX_DISPLAYED_ON_TREZOR": "这些字母显示在您的 Trezor 设备上",
+  "TR_RECOVERY_TYPES_DESCRIPTION": "这两种方法都是安全的; 高级恢复让您在 Trezor 设备上输入钱包助记词、只不过需要稍微长一些时间。",
+  "TR_RECOVER_SUBHEADING_BUTTONS": "整个恢复钱包的过程在 Trezor 设备上通过按钮输入完成。",
   "TR_RECOVER_SUBHEADING_COMPUTER": "如果您想恢复一个现有的钱包、您可以用您的钱包助记词备份来进行。选择您的钱包助记词的单词数量。",
-  "TR_RECOVER_SUBHEADING_TOUCH": "使用Trezor Model T、整个钱包恢复过程是在设备的触摸屏上完成的。",
+  "TR_RECOVER_SUBHEADING_TOUCH": "使用 Trezor Model T、整个钱包恢复过程是在设备的触摸屏上完成的。",
   "TR_RECOVER_YOUR_WALLET_FROM": "使用助记词恢复钱包",
   "TR_REDUCE_FROM": "从 {value} 减少",
   "TR_REMEMBER_WALLET_DESCRIPTION": "它仍可私下加载、但加载速度更快、并可保存自定义设置。",
@@ -1564,12 +1539,12 @@
   "TR_RETRYING_DOT_DOT": "重试中...",
   "TR_REVEAL_ADDRESS": "显示地址",
   "TR_REWARDS_WITHDRAWAL": "提取奖励",
-  "TR_RUNNING_MULTIPLE_INSTANCES": "您似乎正在运行多个应用实例。 如果您在其他窗口或标签页中使用Trezor Suite、请关闭它们并刷新应用程序。",
+  "TR_RUNNING_MULTIPLE_INSTANCES": "您似乎正在运行多个应用实例。 如果您在其他窗口或标签页中使用 Trezor Suite、请关闭它们并刷新应用程序。",
   "TR_SAFETY_CHECKS_BANNER_CHANGE": "设置",
   "TR_SAFETY_CHECKS_DISABLED_WARNING": "安全检查已禁用。",
   "TR_SAFETY_CHECKS_MODAL_TITLE": "安全检查",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL": "提示",
-  "TR_SAFETY_CHECKS_PROMPT_LEVEL_DESC": "允许潜在不安全的行为、例如通过在Trezor设备上手动批准不匹配的代币密钥或极端的费率。",
+  "TR_SAFETY_CHECKS_PROMPT_LEVEL_DESC": "允许潜在不安全的行为、例如通过在 Trezor 设备上手动批准不匹配的代币密钥或极端的费率。",
   "TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING": "除非您知道您在做什么、否则不要改变这个！",
   "TR_SAFETY_CHECKS_STRICT_LEVEL": "严格",
   "TR_SAFETY_CHECKS_STRICT_LEVEL_DESC": "全面设备安全。",
@@ -1580,27 +1555,30 @@
   "TR_SEARCH_TRANSACTIONS": "搜索交易",
   "TR_SEARCH_UTXOS": "搜索具体地址，交易ID或标签",
   "TR_SECURITY_CHECKPOINT_GOT_SEED": "您有自己钱包助记词的备份吗？",
-  "TR_SECURITY_CHECK_HOLOGRAM": "请注意、设备包装 (包括全息图和安全封条) 已随着时间的推移而更新。您可以在<packaging>此处</packaging>验证包装细节。确保您的设备是从Trezor官方商店或我们<reseller>信任的卖家</reseller>处购买的。否则，您的设备有可能是假冒产品。如果您怀疑您的设备不是正品、请<support>联系Trezor客服</support>。",
+  "TR_SECURITY_CHECK_HOLOGRAM": "请注意、设备包装 (包括全息图和安全封条) 已随着时间的推移而更新。您可以在<packaging>此处</packaging>验证包装细节。确保您的设备是从 Trezor 官方商店或我们<reseller>信任的卖家</reseller>处购买的。否则，您的设备有可能是假冒产品。如果您怀疑您的设备不是正品、请<support>联系 Trezor 客服</support>。",
   "TR_SECURITY_FEATURES_COMPLETED_N": "安全 ({n} / {m})",
-  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "被设置为无种子模式的设备不能访问Trezor Suite。这是为了避免灾难性的加密货币损失、以防不适当设置的设备被用于错误的目的。",
-  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE": "Trezor Suite不支持无种子模式设置",
+  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION": "被设置为无种子模式的设备不能访问 Trezor Suite。这是为了避免灾难性的加密货币损失、以防不适当设置的设备被用于错误的目的。",
+  "TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE": "Trezor Suite 不支持无种子模式设置",
   "TR_SEED_BACKUP_LENGTH": "您的钱包助记词可能包含12，18个或24个单词。",
-  "TR_SEED_BACKUP_LENGTH_INCLUDING_SHAMIR": "您的钱包助记词可能包含12，18，20，24或33个单词。",
+  "TR_SEED_BACKUP_LENGTH_INCLUDING_SHAMIR": "您的钱包助记词可能包含 12，18，20，24 或 33 个单词。",
   "TR_SEED_CHECK_FAIL_TITLE": "恢复钱包助记词备份检查失败！",
   "TR_SEED_CHECK_SUCCESS_DESC": "您的钱包助记词是有效的、并且刚刚被成功检查。请妥善保管它并且把它藏在您能找到的地方。",
   "TR_SEED_CHECK_SUCCESS_TITLE": "钱包助记词备份已成功通过检查！",
   "TR_SEED_WORDS_ENTER_BUTTONS": "使用设备上的按钮、按照设备显示的顺序输入钱包助记词中的单词。",
-  "TR_SEED_WORDS_ENTER_COMPUTER": "按照Trezor设备上显示的顺序输入钱包助记词备份中的单词。",
+  "TR_SEED_WORDS_ENTER_COMPUTER": "按照 Trezor 设备上显示的顺序输入钱包助记词备份中的单词。",
   "TR_SEED_WORDS_ENTER_TOUCHSCREEN": "使用触摸屏、按正确顺序输入所有单词、直到完成。",
   "TR_SEE_DETAILS": "查看详情",
+  "TR_SEE_IF_ISSUE_PERSISTS": "查看问题是否仍然存在。",
   "TR_SELECTED": " 已选择 {amount} ",
   "TR_SELECT_COIN_FOR_SETTINGS": "选择活跃的加密货币来更改设置",
   "TR_SELECT_DEVICE": "选择设备",
+  "TR_SELECT_NAME_OR_ADDRESS": "通过名称、符号、网络或合约地址来进行搜索",
   "TR_SELECT_NUMBER_OF_WORDS": "选择您钱包助记词备份中的单词数",
   "TR_SELECT_PASSPHRASE_SOURCE": "在 “{deviceLabel}” 里选择输入密码短语的地方。",
   "TR_SELECT_RECOVERY_METHOD": "选择恢复钱包的方式",
-  "TR_SELECT_TREZOR": "选择Trezor设备",
-  "TR_SELECT_TREZOR_TO_CONTINUE": "选择您的Trezor设备以继续。",
+  "TR_SELECT_TOKEN": "选择一个代币",
+  "TR_SELECT_TREZOR": "选择 Trezor 设备",
+  "TR_SELECT_TREZOR_TO_CONTINUE": "选择您的 Trezor 设备以继续。",
   "TR_SELECT_TYPE": "选择类型",
   "TR_SELL_ADD_BANK_ACCOUNT": "添加银行账户",
   "TR_SELL_BANK_ACCOUNT": "您的银行账户",
@@ -1608,7 +1586,7 @@
   "TR_SELL_BANK_ACCOUNT_STEP": "银行账户",
   "TR_SELL_BANK_ACCOUNT_TOOLTIP": "您在提供商注册的银行账户",
   "TR_SELL_BANK_ACCOUNT_VERIFIED": "已验证",
-  "TR_SELL_CONFIRM_ON_TREZOR_SEND": "在Trezor设备上确认并发送",
+  "TR_SELL_CONFIRM_ON_TREZOR_SEND": "请在 Trezor 设备上确认并发送",
   "TR_SELL_CONFIRM_SEND_STEP": "确认并发送",
   "TR_SELL_DETAIL_ERROR_BUTTON": "返回账户",
   "TR_SELL_DETAIL_ERROR_SUPPORT": "打开合作伙伴的客服网站",
@@ -1628,24 +1606,20 @@
   "TR_SELL_MODAL_CONFIRM": "我已准备出售",
   "TR_SELL_MODAL_FOR_YOUR_SAFETY": "通过 {provider} 出售 {cryptocurrency}",
   "TR_SELL_MODAL_LEGAL_HEADER": "法律声明",
-  "TR_SELL_MODAL_SECURITY_HEADER": "Trezor一直把安全放在第一位",
+  "TR_SELL_MODAL_SECURITY_HEADER": "Trezor 一直把安全放在第一位",
   "TR_SELL_MODAL_TERMS_1": "您是来出售加密货币的。如果您是因其他原因被引导至本网站、请在继续操作前联系客服。",
   "TR_SELL_MODAL_TERMS_2": "您正在为自己的账户出售加密货币。您承认提供商的政策可能要求验证身份。",
-  "TR_SELL_MODAL_TERMS_3": "您需要理解加密货币交易是不可逆的、是无法退还的。因此、欺诈性或意外损失也是无法恢复的。",
-  "TR_SELL_MODAL_TERMS_4": "您理解Invity不提供此服务。{provider} 的条款管辖该服务。",
-  "TR_SELL_MODAL_TERMS_5": "您不得将此功能用于赌博、欺诈或任何其他违反Invity或供应商服务条款或任何适用法规的行为。",
-  "TR_SELL_MODAL_TERMS_6": "您了解加密货币是一种新兴的金融工具、不同司法管辖区的法规可能有所不同。这可能会使您面临更高的欺诈、盗窃或市场不稳定的风险。",
-  "TR_SELL_MODAL_VERIFIED_PARTNERS_HEADER": "经过Invity验证的合作伙伴",
+  "TR_SELL_MODAL_TERMS_3": "您需要知道加密货币交易是不可逆的、是无法退还的。因此、欺诈性或意外损失也是无法恢复的。",
+  "TR_SELL_MODAL_TERMS_4": "您知道 Invity 不提供此服务。{provider} 的条款管辖该服务。",
+  "TR_SELL_MODAL_TERMS_5": "您不得将此功能用于赌博、欺诈或任何其他违反 Invity 或供应商服务条款或任何适用法规的行为。",
+  "TR_SELL_MODAL_TERMS_6": "您知道加密货币是一种新兴的金融工具、不同司法管辖区的法规可能有所不同。这可能会使您面临更高的欺诈、盗窃或市场不稳定的风险。",
+  "TR_SELL_MODAL_VERIFIED_PARTNERS_HEADER": "已经过 Invity 认证的合作伙伴",
   "TR_SELL_REGISTER": "注册",
   "TR_SELL_SEND_FROM": "发送自",
   "TR_SELL_SEND_TO": "发送至 {providerName} 的地址",
   "TR_SELL_STATUS_ERROR": "已拒绝",
   "TR_SELL_STATUS_PENDING": "待定的",
   "TR_SELL_STATUS_SUCCESS": "已批准",
-  "TR_SELL_TRANS_ID": "交易ID: ",
-  "TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT": "最大值为 {maximum} {currency}",
-  "TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT": "最小值为 {minimum} {currency}",
-  "TR_SELL_VIEW_DETAILS": "查看详情",
   "TR_SENDFORM_LABELING_EXAMPLE_1": "储蓄",
   "TR_SENDFORM_LABELING_EXAMPLE_2": "租",
   "TR_SENDING_SYMBOL": "发送{multiple, select, true {多个代币} false {{symbol}} other {{symbol}}}",
@@ -1659,10 +1633,10 @@
   "TR_SENT_TO_SELF": "发送给自己",
   "TR_SERVICE_FEE": "一次性服务费",
   "TR_SERVICE_FEE_NOTE": "注意: 您也在支付挖矿费",
-  "TR_SESSION_ERROR_PHASE_AFFILIATE_SERVERS_OFFLINE": "混币服务暂时不可用",
+  "TR_SESSION_ERROR_PHASE_AFFILIATE_SERVERS_OFFLINE": "CoinJoin 混币器服务暂时不可用",
   "TR_SESSION_ERROR_PHASE_BLOCKED_UTXOS": "比特币尚未准备好。请稍候重试。",
-  "TR_SESSION_ERROR_PHASE_CRITICAL_ERROR": "严重错误、正在停止混币",
-  "TR_SESSION_ERROR_PHASE_MISSING_UTXOS": "寻找可用的比特币",
+  "TR_SESSION_ERROR_PHASE_CRITICAL_ERROR": "严重错误！正在停止 CoinJoin 混币器",
+  "TR_SESSION_ERROR_PHASE_MISSING_UTXOS": "寻找可使用的”未消费交易输出”",
   "TR_SESSION_ERROR_PHASE_REGISTRATION_FAILED": "验证失败、重试",
   "TR_SESSION_ERROR_PHASE_RETRYING_PAIRING": "正在重试配对",
   "TR_SESSION_ERROR_PHASE_SKIPPING_ROUND": "跳过回合",
@@ -1689,7 +1663,7 @@
   "TR_SETTINGS_DEVICE_BANNER_TITLE_REMEMBERED": "连接设备以便更改设备设置",
   "TR_SETTINGS_DEVICE_BANNER_TITLE_UNAVAILABLE": "检测到的设备状态不正确",
   "TR_SETTINGS_SAME_AS_SYSTEM": "系统",
-  "TR_SETUP_MY_TREZOR": "设置我的Trezor设备",
+  "TR_SETUP_MY_TREZOR": "设置我的 Trezor 设备",
   "TR_SETUP_WIPE_CODE": "设置自毁PIN码",
   "TR_SET_PIN": "设置PIN码",
   "TR_SHOW_BALANCES": "显示余额",
@@ -1700,6 +1674,8 @@
   "TR_SHOW_LOG": "显示日志",
   "TR_SHOW_MORE": "显示更多",
   "TR_SHOW_MORE_ADDRESSES": "显示更多 ({count})",
+  "TR_SHOW_ON_TRAY": "在系统托盘中显示图标",
+  "TR_SHOW_ON_TRAY_DESCRIPTION": "监控 Trezor Suite 是否正在后台运行。",
   "TR_SHOW_UNVERIFIED_ADDRESS": "显示未验证的地址",
   "TR_SHOW_UNVERIFIED_XPUB": "显示未验证的扩展公钥",
   "TR_SIDEBAR_ADD_COIN": "添加加密货币",
@@ -1712,12 +1688,14 @@
   "TR_SIZE": "大小",
   "TR_SKIP": "跳过",
   "TR_SKIP_BACKUP": "跳过备份",
+  "TR_SKIP_BACKUP_DESCRIPTION": "如果您的 Trezor 设备丢失、被盗或损坏、钱包助记词备份可让您恢复资金。如果没有备份、您可能会永远失去对加密货币的访问权限。",
   "TR_SKIP_PIN": "跳过PIN码",
+  "TR_SKIP_PIN_DESCRIPTION": "设备PIN码可防止他人未经授权访问您的 Trezor 设备。如果不设置设备PIN码、任何拥有您设备的人都可以访问您的资金。",
   "TR_SKIP_ROUNDS": "跳过这一轮",
   "TR_SKIP_ROUNDS_DESCRIPTION": "允许跳过混币回合、使得别人更难证明输入之间的任何关系。 这意味着您可以进一步混淆资金的来源。",
-  "TR_SKIP_ROUNDS_HEADING": "允许Trezor跳过混币回合",
+  "TR_SKIP_ROUNDS_HEADING": "允许 Trezor 跳过混币回合",
   "TR_SKIP_UPDATE": "跳过更新",
-  "TR_SOLANA_DEVNET_SHORTCUT_WARNING": "由于网络限制、DSOL会在Trezor设备上显示SOL。如果需要验证交易网络，请查看Devnet探索工具上提供的blockhash。",
+  "TR_SOLANA_DEVNET_SHORTCUT_WARNING": "由于网络限制、DSOL 会在 Trezor 设备上显示 SOL。如果需要验证交易网络，请查看 Devnet 探索工具上提供的 blockhash。",
   "TR_SOLANA_TX_CONFIRMATION_MAY_TAKE_UP_TO_1_MIN": "交易确认可能需要<nowrap>1分钟</nowrap>。",
   "TR_SOLVE_ISSUE": "刷新",
   "TR_SOUTH": "南",
@@ -1725,6 +1703,7 @@
   "TR_STAKE_ADDING_TO_POOL": "添加到质押矿池",
   "TR_STAKE_ANY_AMOUNT_ETH": "最低的质押金额为 {amount} {symbol} 并开始赚取奖励。我们目前的年利率为{apyPercent}%、您赚取的奖励也能赚！",
   "TR_STAKE_APY": "年利率",
+  "TR_STAKE_APY_ABBR": "年利率",
   "TR_STAKE_APY_DESC": "*年利率",
   "TR_STAKE_AVAILABLE": "可选",
   "TR_STAKE_CAN_CLAIM_WARNING": "您已可以认领 {amount} {symbol}。{br}请认领或等待、直到新的解除质押处理完毕。",
@@ -1737,18 +1716,18 @@
   "TR_STAKE_CLAIM_UNSTAKED": "认领解除质押的 {symbol}",
   "TR_STAKE_CONFIRM_AND_STAKE": "确认并质押",
   "TR_STAKE_CONFIRM_ENTRY_PERIOD": "确认参与期限",
-  "TR_STAKE_CONSENT_TO_STAKING_WITH_EVERSTAKE": "我知道并同意使用Everstake进行质押",
+  "TR_STAKE_CONSENT_TO_STAKING_WITH_EVERSTAKE": "我知道并同意使用 Everstake 进行质押",
   "TR_STAKE_DAYS": "{count, plural, other {#天}}",
   "TR_STAKE_DELEGATED": "委托质押",
   "TR_STAKE_DEREGISTERED": "撤销质押地址的注册",
-  "TR_STAKE_EARN_REWARDS_WEEKLY": "每周赚取奖励",
+  "TR_STAKE_EARN_REWARDS_WEEKLY": "每星期赚取奖励",
   "TR_STAKE_ENTERING_POOL_MAY_TAKE": "进入质押矿池可能最多需要{count, plural, other {#天}}。",
   "TR_STAKE_ENTER_THE_STAKING_POOL": "参与此质押矿池",
   "TR_STAKE_ETH": "质押以太坊",
   "TR_STAKE_ETH_CARD_TITLE": "赚取 {symbol} 最简单的方法",
   "TR_STAKE_ETH_EARN_REPEAT": "质押。获得奖励。重复。",
-  "TR_STAKE_ETH_EVERSTAKE": "Trezor和Everstake",
-  "TR_STAKE_ETH_EVERSTAKE_DESC": "Everstake是质押技术里的国际领导者和供应商",
+  "TR_STAKE_ETH_EVERSTAKE": "Trezor 和 Everstake",
+  "TR_STAKE_ETH_EVERSTAKE_DESC": "Everstake 是质押技术里的国际领导者和供应商",
   "TR_STAKE_ETH_LOCK_FUNDS": "灵活锁定资金",
   "TR_STAKE_ETH_LOCK_FUNDS_DESC": "质押会锁定您的资金、但您可以随时选择解除质押。",
   "TR_STAKE_ETH_MAXIMIZE_REWARDS": "最大化您的奖励",
@@ -1756,23 +1735,25 @@
   "TR_STAKE_ETH_REWARDS_EARN": "您的奖励也可以赚。继续质押、看着您的 {symbol} 奖励飙升。",
   "TR_STAKE_ETH_REWARDS_EARN_APY": "您的 {symbol} 奖励也可赚取年利率。保留您的资金或增加资金以提高奖励。",
   "TR_STAKE_ETH_SEE_MONEY_DANCE": "看着您的钱舞动",
-  "TR_STAKE_ETH_SEE_MONEY_DANCE_DESC": "使用Trezor设备来为您的以太坊进行质押、赚取 {apyPercent}% <t>年利率</t> 。",
+  "TR_STAKE_ETH_SEE_MONEY_DANCE_DESC": "使用 Trezor 设备来为您的以太坊进行质押、赚取 {apyPercent}% <t>年利率</t> 。",
   "TR_STAKE_ETH_WILL_BE_BLOCKED": "在此期间、您的 {symbol} 将被封锁、并且您无法取消此操作。<a>了解更多</a>",
-  "TR_STAKE_EVERSTAKE_MANAGES": "Everstake<t>利用其智能合约、基础设施与技术</t>来维护和保护您质押的 {symbol} 。",
+  "TR_STAKE_EVERSTAKE_MANAGES": "Everstake <t>利用其智能合约、基础设施与技术</t>来维护和保护您质押的 {symbol} 。",
   "TR_STAKE_INSTANT": "立刻",
   "TR_STAKE_INSTANTLY_UNSTAKED_WITH_DAYS": "您立刻收到了{amount} {symbol}{days, plural, =0 {} other {、其余的将在#天内支付完毕}}",
-  "TR_STAKE_IN_ACCOUNT": "{symbol} 在账号",
+  "TR_STAKE_IN_ACCOUNT": "{symbol} 在账户",
   "TR_STAKE_LEARN_MORE": "了解更多",
   "TR_STAKE_LEAVE_STAKING_POOL": "离开质押矿池",
   "TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL": "我们未填写 {amount} {symbol}、以便您支付提款手续费用。",
+  "TR_STAKE_LEFT_SMALL_AMOUNT_FOR_WITHDRAWAL": "我们预留了少量的 {symbol}，以便您支付提款费用。",
   "TR_STAKE_MAX": "最多",
   "TR_STAKE_MAX_FEE_DESC": "最高费率是您为了确保您的交易能得到处理而愿意支付的网络交易费用。",
   "TR_STAKE_MAX_REWARD_DAYS": "最多{count, plural, other {#天}}",
   "TR_STAKE_MIN_AMOUNT_TOOLTIP": "最少质押金额为 {amount} {symbol}",
+  "TR_STAKE_MONTHLY": "每月",
   "TR_STAKE_NEXT_PAYOUT": "下一次奖励支付",
   "TR_STAKE_NOT_ENOUGH_FUNDS": "没有足够的 {symbol} 来支付网络交易费用",
   "TR_STAKE_ONLY_REWARDS": "只有奖励",
-  "TR_STAKE_ON_EVERSTAKE": "在Everstake上质押 {symbol}？",
+  "TR_STAKE_ON_EVERSTAKE": "在 Everstake 上质押 {symbol}？",
   "TR_STAKE_OTHER_AMOUNT": "其他金额",
   "TR_STAKE_PAID_FROM_BALANCE": "从您的余额中支付",
   "TR_STAKE_PROVIDED_BY": "供应商为",
@@ -1793,61 +1774,74 @@
   "TR_STAKE_START_STAKING": "开始质押",
   "TR_STAKE_TIME_TO_CLAIM": "认领奖励时间",
   "TR_STAKE_TOTAL_PENDING": "总共待处理的质押: ",
-  "TR_STAKE_TREZOR_NO_LIABILITY": "在质押时、您的资金安全责任将从您的Trezor设备转移到Everstake。",
+  "TR_STAKE_TREZOR_NO_LIABILITY": "在质押时、您的资金安全责任将从您的 Trezor 设备转移到 Everstake。",
   "TR_STAKE_UNSTAKE": "解除质押",
   "TR_STAKE_UNSTAKED_AND_READY_TO_CLAIM": "解除质押、随时可认领",
   "TR_STAKE_UNSTAKE_TO_CLAIM": "解除质押来认领",
   "TR_STAKE_UNSTAKING": "解除质押",
+  "TR_STAKE_UNSTAKING_APPROXIMATE": "大约即是可用的 {symbol}",
+  "TR_STAKE_UNSTAKING_APPROXIMATE_DESCRIPTION": "质押矿池的流动性允许即时解除部分资金的质押。其余资金将跟随在解除质押期之后。",
   "TR_STAKE_UNSTAKING_PERIOD": "解除质押期",
   "TR_STAKE_UNSTAKING_PROCESS": "解除质押过程",
   "TR_STAKE_UNSTAKING_TAKES": "解除质押目前需要{count, plural, other {#天}}。一旦完成、您就可以进行交易或发送您的资产。",
+  "TR_STAKE_WEEKLY": "每星期",
   "TR_STAKE_WHAT_IS_STAKING": "什么是质押？",
-  "TR_STAKE_YOUR_FUNDS_MAINTAINED": "您的质押资金由Everstake维护",
+  "TR_STAKE_YEARLY": "每年",
+  "TR_STAKE_YOUR_FUNDS_MAINTAINED": "您的质押资金由 Everstake 维护",
   "TR_STAKING_AMOUNT_STAKED_INSTANTLY": "已立刻质押 {amount}{symbol}",
   "TR_STAKING_AMOUNT_UNSTAKED_INSTANTLY": "已立刻解除质押 {amount}{symbol}！",
+  "TR_STAKING_CONSOLIDATING_FUNDS": "正在为您合并您的 {symbol}",
   "TR_STAKING_DELEGATE": "委托",
   "TR_STAKING_DEPOSIT": "可退还的押金",
-  "TR_STAKING_DEPOSIT_FEE_DECRIPTION": "押金费用为 {feeAmount} ADA并需要注册您的地址才能开始押质押。如果您选择解除质押您的艾达币、您将获得押金返还。",
+  "TR_STAKING_DEPOSIT_FEE_DECRIPTION": "押金费用为 {feeAmount} ADA、并需要注册您的地址才能开始押质押。如果您选择解除质押您的艾达币、您将获得押金返还。",
+  "TR_STAKING_ESTIMATED_GAINS": "预计收益",
   "TR_STAKING_FEE": "质押费用",
+  "TR_STAKING_GETTING_READY": "您的 {symbol} 正在准备开始工作",
   "TR_STAKING_INSTANTLY_STAKED": "您已立刻质押了{amount} {symbol}{days, plural, =0 {} other {、剩余的{symbol}将在#天内质押。}}",
   "TR_STAKING_IS_NOT_SUPPORTED": "该网络不支持质押。",
   "TR_STAKING_NOT_ENOUGH_FUNDS": "您的账户上没有足够的资金。",
-  "TR_STAKING_ON_3RD_PARTY_DESCRIPTION": "通过在Trezor的质押矿池进行质押、您直接支持Trezor和Trezor Suite的卡尔达诺生态系统。",
+  "TR_STAKING_ONCE_YOU_CONFIRM": "一旦您确认",
+  "TR_STAKING_ON_3RD_PARTY_DESCRIPTION": "通过在 Trezor 的质押矿池进行质押、您直接支持 Trezor 和 Trezor Suite 的卡尔达诺生态系统。",
   "TR_STAKING_ON_3RD_PARTY_TITLE": "您正在委托第三方的质押矿池",
   "TR_STAKING_POOL_OVERSATURATED_DESCRIPTION": "您正在委托的质押矿池已过度饱和。请重新委托其他质押矿池、以最大限度地增加您的质押奖励",
   "TR_STAKING_POOL_OVERSATURATED_TITLE": "质押矿池已过度饱和",
   "TR_STAKING_REDELEGATE": "重新委托",
   "TR_STAKING_REWARDS": "可用的奖励",
+  "TR_STAKING_REWARDS_ARE_RESTAKED": "奖励会自动被再质押",
   "TR_STAKING_REWARDS_DESCRIPTION": "请注意、在您最初注册和授权后、最多需要20天时间才能开始认领奖励。 在此时间段结束后、您将每5天收到奖励。",
   "TR_STAKING_REWARDS_TITLE": "卡尔达诺质押已激活",
   "TR_STAKING_STAKE_ADDRESS": "您的质押地址",
   "TR_STAKING_STAKE_DESCRIPTION": "质押卡尔达诺是赚取艾达币质押奖励的好方法、是持有卡尔达诺的一种被动收入形式。{br}通过质押您的艾达币、您积极支持卡尔达诺网络、并为网络的稳定做出贡献。",
   "TR_STAKING_STAKE_TITLE": "卡尔达诺质押未激活",
-  "TR_STAKING_TREZOR_POOL_FAIL": "无法连接到Trezor的质押矿池以进行委托。",
+  "TR_STAKING_TREZOR_POOL_FAIL": "无法连接到 Trezor 的质押矿池以进行委托。",
   "TR_STAKING_TX_PENDING": "您的交易 {txid} 已成功发送到区块链并等待确认。",
   "TR_STAKING_WITHDRAW": "提取",
+  "TR_STAKING_YOUR_EARNINGS": "您的收益将自动再质押，让您赚取<a>复利</a>。",
+  "TR_STAKING_YOUR_UNSTAKED_FUNDS": "您的已被解除质押的 {symbol} 已准备就绪",
+  "TR_STAKING_YOU_ARE_HERE": "您在这里",
   "TR_STANDARD_WALLET_DESCRIPTION": "无密码短语",
   "TR_START": "开始",
   "TR_START_AGAIN": "重新开始",
   "TR_START_BACKUP": "开始备份",
   "TR_START_CHECK": "开始",
-  "TR_START_COINJOIN": "开始混币\n",
+  "TR_START_COINJOIN": "开始 CoinJoin 混币器\n",
   "TR_START_RECOVERY": "开始恢复",
   "TR_STEP": "步骤 {number}",
-  "TR_STILL_DONT_SEE_YOUR_TREZOR": "仍然看不到您的Trezor设备？",
+  "TR_STEP_OF_TOTAL": "步骤: {index} / {total} ",
+  "TR_STILL_DONT_SEE_YOUR_TREZOR": "仍然看不见您的 Trezor 设备？",
   "TR_STOP": "停止",
   "TR_STOPPING": "正在停止",
   "TR_STORAGE_CLEARED": "缓存清理完成",
   "TR_SUGGESTION": "用户反馈",
-  "TR_SUITE_META_DESCRIPTION": "新的桌面和浏览器应用程序配合Trezor硬件钱包。Trezor Suite在我们的三个关键支柱、即可用性、安全性和隐私性方面带来了巨大改进。",
+  "TR_SUITE_META_DESCRIPTION": "用于 Trezor 硬件钱包的全新桌面和浏览器应用程序。Trezor Suite 在可用性、安全性和隐私性三大支柱方面都有重大改进。",
   "TR_SUITE_STORAGE": "应用存储",
-  "TR_SUITE_VERSION": "Trezor Suite版本",
+  "TR_SUITE_VERSION": "Trezor Suite 版本",
   "TR_SWITCH_DEVICE": "切换设备",
   "TR_SWITCH_DEVICE_EJECT_CONFIRMATION_CANCEL_BUTTON": "取消",
   "TR_SWITCH_DEVICE_EJECT_CONFIRMATION_DESCRIPTION": "在重新连接设备之前、您的资金和交易将无法显示。",
   "TR_SWITCH_DEVICE_EJECT_CONFIRMATION_DISABLE_VIEW_ONLY_DESCRIPTION": "在重新连接设备之前、您的资金和交易将无法显示。",
   "TR_SWITCH_DEVICE_EJECT_CONFIRMATION_DISABLE_VIEW_ONLY_PRIMARY_BUTTON": "禁用和弹出",
-  "TR_SWITCH_DEVICE_EJECT_CONFIRMATION_DISABLE_VIEW_ONLY_TITLE": "禁用只供查看功能将弹出该钱包",
+  "TR_SWITCH_DEVICE_EJECT_CONFIRMATION_DISABLE_VIEW_ONLY_TITLE": "禁用 “仅供查看” 功能将弹出该钱包",
   "TR_SWITCH_DEVICE_EJECT_CONFIRMATION_PRIMARY_BUTTON": "弹出",
   "TR_SWITCH_DEVICE_EJECT_CONFIRMATION_TITLE": "弹出此钱包？",
   "TR_SWITCH_FIRMWARE": "切换固件",
@@ -1856,26 +1850,26 @@
   "TR_SWITCH_FIRMWARE_TO": "将固件切换到 {firmwareType}",
   "TR_SWITCH_TO_BITCOIN_ONLY": "切换到 {bitcoinOnly}",
   "TR_SWITCH_TO_BITCOIN_ONLY_DESCRIPTION": "{bitcoinOnly} 固件仅适用于比特币交易。如果您想访问和管理所有的加密货币、只需使用钱包助记词备份将设备固件切换回 {regular} 即可。",
-  "TR_SWITCH_TO_BOOTLOADER_HOLD_BOTH_BUTTONS": "连接USB数据线时长按两个按钮不放。",
-  "TR_SWITCH_TO_BOOTLOADER_HOLD_LEFT_BUTTON": "连接USB数据线时长按左侧按钮不放。",
-  "TR_SWITCH_TO_BOOTLOADER_SWIPE_YOUR_FINGERS": "在连接USB数据线时、用手指在触摸屏上滑动。",
+  "TR_SWITCH_TO_BOOTLOADER_HOLD_BOTH_BUTTONS": "连接 USB 数据线时长按两个按钮不放。",
+  "TR_SWITCH_TO_BOOTLOADER_HOLD_LEFT_BUTTON": "连接 USB 数据线时长按左侧按钮不放。",
+  "TR_SWITCH_TO_BOOTLOADER_SWIPE_YOUR_FINGERS": "在连接 USB 数据线时、用手指在触摸屏上滑动。",
   "TR_SWITCH_TO_REGULAR": "切换到 {regular}",
   "TR_SWITCH_TO_REGULAR_DESCRIPTION": "{regular} 固件允许您的设备访问和管理所有的加密货币。{bitcoinOnly} 固件仅适用于比特币交易。您可以使用钱包助记词备份随时更改设备固件。",
   "TR_TAKES_N_MINUTES": "大约需要15分钟",
-  "TR_TAKE_ME_BACK_TO_WALLET": "带我回到Suite",
+  "TR_TAKE_ME_BACK_TO_WALLET": "带我回到 Suite",
   "TR_TAPROOT_ACCOUNTS": "主根账户",
   "TR_TAPROOT_BANNER_POINT_1": "仅限小写字母: 降低任何审查错误的机会",
   "TR_TAPROOT_BANNER_POINT_2": "提高所有比特币交易的隐私性",
   "TR_TAPROOT_BANNER_TITLE": "主根账户",
-  "TR_TERMS_AND_PRIVACY_CONFIRMATION": "我同意 <trezor>Trezor Suite的条款</trezor> 和 <coordinator> “简洁非交互式零知识证明”协调员的条款</coordinator>",
+  "TR_TERMS_AND_PRIVACY_CONFIRMATION": "我同意 <trezor>Trezor Suite 的条款</trezor> 和 <coordinator> “简洁非交互式零知识证明” 协调员的条款</coordinator>",
   "TR_TERMS_OF_USE_INVITY": "使用条款",
   "TR_TESTNET_COINS": "测试网代币",
   "TR_TESTNET_COINS_DESCRIPTION": "这些加密货币只用于测试、不具备任何价值。",
   "TR_TESTNET_COINS_LABEL": "测试网代币",
-  "TR_THESE_WONT_ALLOW_YOU_UPGRADE": "生成一组12或24个助记词、用于恢复钱包。传统备份方案无法轻松地升级为多共享备份。<a>了解更多</a>",
-  "TR_THESE_WONT_ALLOW_YOU_UPGRADE_HEADER": "安全又可靠、但不易升级到多共享备份",
+  "TR_THESE_WONT_ALLOW_YOU_UPGRADE": "生成一组 12 或 24 个英文单词的助记词，用于恢复钱包。该传统备份方案无法轻松地升级为秘密共享备份。<a>了解更多</a>",
+  "TR_THESE_WONT_ALLOW_YOU_UPGRADE_HEADER": "安全又可靠，但不易升级到秘密共享备份",
   "TR_THE_PIN_LAYOUT_IS_DISPLAYED": "检查您的 <b>{deviceLabel}</b> 屏幕上的虚拟键盘布局。",
-  "TR_THIS_HIDDEN_WALLET_IS_EMPTY_SOURCE": "这个隐藏钱包是空的。为了确保您进入了正确的隐藏钱包、请在Trezor设备上再次输入您的密码短语。",
+  "TR_THIS_HIDDEN_WALLET_IS_EMPTY_SOURCE": "这个隐藏钱包是空的。为了确保您进入了正确的隐藏钱包、请在 Trezor 设备上再次输入您的密码短语。",
   "TR_THIS_INSTANCE_IS_BLOCKING": "这个实例阻碍着数据库的升级",
   "TR_TIMER_PAST_DEADLINE": "即将完成...",
   "TR_TO": "到",
@@ -1885,159 +1879,173 @@
   "TR_TOKENS_EMPTY": "还没有代币...",
   "TR_TOKENS_EMPTY_CHECK_HIDDEN": "没有代币。它们可以已被隐藏。",
   "TR_TOKENS_SEARCH_TOOLTIP": "按代币、符号或合约地址搜索。",
+  "TR_TOKEN_NOT_FOUND": "未能找到此代币",
+  "TR_TOKEN_NOT_FOUND_ON_NETWORK": "未能在 {networkName} 网络上找到此代币",
   "TR_TOKEN_TRANSFERS": "{standard} 代币转让",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH": "请尝试不同的搜索。",
+  "TR_TOKEN_TRY_DIFFERENT_SEARCH_OR_SWITCH": "请尝试不同的搜索或切换到另一个网络。",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR": "未识别的代币",
   "TR_TOKEN_UNRECOGNIZED_BY_TREZOR_TOOLTIP": "未识别的代币会带来潜在的风险。谨慎使用。",
   "TR_TOO_LONG": "留言太长",
-  "TR_TOR": "洋葱路由 (Tor)",
-  "TR_TOR_CONFIG_SNOWFLAKE_DESCRIPTION": "输入您系统中Tor Snowflake二进制文件的路径。更改前请确保Tor已被禁用。",
-  "TR_TOR_CONFIG_SNOWFLAKE_DISABLE_LABEL": "禁用Tor Snowflake",
+  "TR_TOR": "洋葱路由网络 (Tor)",
+  "TR_TOR_CONFIG_SNOWFLAKE_DESCRIPTION": "输入您系统中 Tor Snowflake 二进制文件的路径。更改前请确保 Tor 已被禁用。",
+  "TR_TOR_CONFIG_SNOWFLAKE_DISABLE_LABEL": "禁用 Tor Snowflake",
   "TR_TOR_CONFIG_SNOWFLAKE_ERROR_PATH": "必须是一个有效的完整路径。",
-  "TR_TOR_CONFIG_SNOWFLAKE_TITLE": "Tor Snowflake二进制路径",
+  "TR_TOR_CONFIG_SNOWFLAKE_TITLE": "Tor Snowflake 二进制路径",
   "TR_TOR_CONFIG_SNOWFLAKE_UPDATE_LABEL": "更新路径",
-  "TR_TOR_DESCRIPTION": "启用这个功能将使Suite的所有流量通过Tor网络。所有对Trezor基础设施的请求都将指向我们的Tor服务、增加您的隐私和安全。",
-  "TR_TOR_DISABLE": "禁用Tor",
+  "TR_TOR_DESCRIPTION": "通过 Tor 路由所有 Trezor Suite 的流量，从而增强您的匿名性。 Tor 可能需要一段时间才能加载并建立连接。",
+  "TR_TOR_DISABLE": "禁用 Tor",
   "TR_TOR_DISABLED": "禁用",
-  "TR_TOR_DISABLE_ONIONS_ONLY": "缺少非onion自定义后端",
-  "TR_TOR_DISABLE_ONIONS_ONLY_DESCRIPTION": "请添加非onion的自定义后端地址、以防止这种行为。",
-  "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_DESCRIPTION": "您现在可以安全地禁用Tor。",
+  "TR_TOR_DISABLE_ONIONS_ONLY": "缺少非 .onion 自定义后端",
+  "TR_TOR_DISABLE_ONIONS_ONLY_DESCRIPTION": "请添加非 .onion 的自定义后端地址、以防止这种行为。",
+  "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_DESCRIPTION": "您现在可以安全地禁用 Tor。",
   "TR_TOR_DISABLE_ONIONS_ONLY_NO_MORE_TITLE": "自定义后端不再仅使用 .onion 地址。",
-  "TR_TOR_DISABLE_ONIONS_ONLY_RESOLVED": "禁用Tor",
-  "TR_TOR_DISABLE_ONIONS_ONLY_TITLE": "禁用Tor现在将会将所有.onion 的后端重置为默认的Trezor服务器。",
+  "TR_TOR_DISABLE_ONIONS_ONLY_RESOLVED": "禁用 Tor",
+  "TR_TOR_DISABLE_ONIONS_ONLY_TITLE": "现在禁用 Tor 会将所有洋葱地址后端重置为默认的 Trezor 服务器。",
   "TR_TOR_DISABLING": "禁用",
-  "TR_TOR_ENABLE": "启用Tor",
+  "TR_TOR_ENABLE": "启用 Tor",
   "TR_TOR_ENABLED": "已启用",
-  "TR_TOR_ENABLE_AND_CONFIRM": "启用Tor并确认",
-  "TR_TOR_ENABLE_TITLE": "启用Tor",
-  "TR_TOR_ENABLING": "启用着",
+  "TR_TOR_ENABLE_AND_CONFIRM": "启用 Tor 并确认",
+  "TR_TOR_ENABLE_TITLE": "启用 Tor",
+  "TR_TOR_ENABLING": "正在启用中",
   "TR_TOR_ERROR": "错误",
-  "TR_TOR_IS_SLOW_MESSAGE": "Tor正在连接网络。<br></br>稍等片刻。",
-  "TR_TOR_KEEP_RUNNING": "继续运行Tor",
-  "TR_TOR_KEEP_RUNNING_FOR_COIN_JOIN_SUBTITLE": "请选择 “继续运行Tor” 继续或 “停止Tor” 退出混币进程。",
+  "TR_TOR_IS_SLOW_MESSAGE": "Tor 正在连接中。<br></br>稍等片刻。",
+  "TR_TOR_KEEP_RUNNING": "继续运行 Tor",
+  "TR_TOR_KEEP_RUNNING_FOR_COIN_JOIN_SUBTITLE": "请选择 “继续运行 Tor” 以继续或 “停止运行 Tor” 以退出 CoinJoin 混币进程。",
   "TR_TOR_MISBEHAVING": "发生故障",
-  "TR_TOR_REMOVE_ONION_AND_DISABLE": "禁用Tor并切换到默认后端",
+  "TR_TOR_REMOVE_ONION_AND_DISABLE": "禁用 Tor 并切换到默认后端",
   "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_LEAVE": "离开",
-  "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_SUBTITLE": "请选择 “启用Tor” 继续、或 “离开” 退出进程。",
-  "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_TITLE": "运行混币功能时、必须启用 <b>Tor</b> 以保持私密性。",
-  "TR_TOR_STOP": "停止Tor",
-  "TR_TOR_TITLE": "洋葱路由 (Tor)",
+  "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_SUBTITLE": "请选择 “启用 Tor” 以继续，或 “离开” 以退出进程。",
+  "TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_TITLE": "在运行 CoinJoin 混币器功能时，必须启用 <b>Tor</b> 以保持隐私。",
+  "TR_TOR_STOP": "停止运行 Tor",
+  "TR_TOR_TITLE": "洋葱路由网络 (Tor)",
   "TR_TOTAL": "总计",
   "TR_TOTAL_AMOUNT": "总金额",
   "TR_TO_ACCESS_OTHER_WALLETS": "连接您的设备以添加其他钱包",
   "TR_TO_ADD_NEW_ACCOUNT_PLEASE_CONNECT": "连接您的设备以添加新帐户。",
   "TR_TO_ADD_NEW_ACCOUNT_WAIT_FOR_DISCOVERY": "帐户仍在加载。请等待添加新帐户。",
-  "TR_TO_BTC": "到BTC",
+  "TR_TO_BTC": "到 BTC",
   "TR_TO_MAKE_YOUR_LABELS_PERSISTENT": "要使您的标签在不同的设备上持久可用、请连接到云存储提供商。",
   "TR_TO_SATOSHIS": "到聪",
-  "TR_TRADE_BUYS": "购买",
-  "TR_TRADE_ENTER_COIN": "输入加密货币名称或符号...",
-  "TR_TRADE_EXCHANGES": "交易",
   "TR_TRADE_REDIRECTING": "重定向...",
-  "TR_TRADE_SELLS": "卖出",
   "TR_TRANSACTIONS_NOT_AVAILABLE": "交易记录不可用",
   "TR_TRANSACTIONS_SEARCH_TIP_1": "提示：您可以搜索交易ID、地址、标签、数量和日期。",
-  "TR_TRANSACTIONS_SEARCH_TIP_10": "提示：您可以合并AND（&）和 OR（|）操作符号来进行更复杂的搜索。 例如，<strong>>{lastYear}-01-01 & < {lastYear}-01-31 | > {lastYear}-12-01 & < {lastYear}-12-31</strong> 将显示{lastYear}年所有1月或12月的交易。",
+  "TR_TRANSACTIONS_SEARCH_TIP_10": "提示：您可以 合并 AND (&) 和 OR (|) 操作符号来进行更复杂的搜索。 例如，<strong>>{lastYear}-01-01 & < {lastYear}-01-31 | > {lastYear}-12-01 & < {lastYear}-12-31</strong> 将显示{lastYear}年所有1月或12月的交易。",
   "TR_TRANSACTIONS_SEARCH_TIP_2": "提示：您可以在数量搜索中使用大于 (>) 和小于 (<) 的符号。 例如、 <strong> 1</strong> 将显示所有金额为1或更高的交易。",
   "TR_TRANSACTIONS_SEARCH_TIP_3": "提示：您可以使用等于（=）符号搜索准确数量。例如 <strong>= 0.01</strong> 将只显示金额为0.01的交易。",
   "TR_TRANSACTIONS_SEARCH_TIP_4": "提示：您可以通过同时使用感叹号和等号 (!=) 来排除一个金额。例如 <strong>!= -0.01</strong> 将显示所有的交易、除了金额为 -0.01的交易。",
   "TR_TRANSACTIONS_SEARCH_TIP_5": "提示：日期可以使用 <strong>YYYY-MM-DD</strong> 的格式进行搜索。例如 <strong>{lastYear}-12-14</strong> 将显示{lastYear}年12月14日的所有交易。",
   "TR_TRANSACTIONS_SEARCH_TIP_6": "提示：在日期搜索中、您可以使用大于 (>) 或小于 (<) 的符号。 例如、 <strong>>{lastYear}-12-01<strong> 将显示{lastYear}年12月1日及其后的所有交易。",
   "TR_TRANSACTIONS_SEARCH_TIP_7": "提示：您可以通过使用叹号和等号 (!=) 来排除一个日期。例如 <strong>!= {lastYear}-12-14</strong> 将显示除{lastYear}年12月14日以外的所有交易。",
-  "TR_TRANSACTIONS_SEARCH_TIP_8": "提示：您可以通过用OR运算符 (|) 分组来显示与多个搜索中至少一个匹配的结果。例如 <strong>{lastYear}-11-30 | {lastYear}-12-01</strong> 将显示所有发生在{lastYear}年11月30日或12月1日的交易。",
+  "TR_TRANSACTIONS_SEARCH_TIP_8": "提示：您可以通过用 OR 运算符 (|) 分组来显示与多个搜索中至少一个匹配的结果。例如 <strong>{lastYear}-11-30 | {lastYear}-12-01</strong> 将显示所有发生在{lastYear}年11月30日或12月1日的交易。",
   "TR_TRANSACTIONS_SEARCH_TIP_9": "提示：您可以通过使用 AND (&) 操作号分组显示匹配多次搜索的结果。 例如， <strong>> {lastYear}-12-01 & < {lastYear}-12-31 & > 0</strong> 将显示{lastYear}年12月所有的入账交易 (金额高于0)。",
   "TR_TRANSACTIONS_SEARCH_TOOLTIP": "按交易ID、标签或金额搜索、或使用操作符、如 < > | & = !=。",
   "TR_TRANSACTION_DETAILS": "详细内容",
-  "TR_TREZOR_BRIDGE_RUNNING_VERSION": "Trezor网桥运行版本 {version}",
+  "TR_TREZOR_BRIDGE_RUNNING_VERSION": "Trezor 网桥运行版本 {version}",
+  "TR_TREZOR_CONNECT": "Trezor Connect",
   "TR_TREZOR_DEVICE_TUTORIAL_CANCELED_HEADING": "教程已取消",
   "TR_TREZOR_DEVICE_TUTORIAL_COMPLETED_HEADING": "教程已完成",
   "TR_TREZOR_DEVICE_TUTORIAL_DESCRIPTION": "在简短教程的帮助下学习如何使用设备",
-  "TR_TREZOR_DEVICE_TUTORIAL_HEADING": "了解您的Trezor设备",
-  "TR_TROUBLESHOOTING_CLOSE_TABS": "关闭可能使用您的Trezor设备的其他标签页和窗口",
+  "TR_TREZOR_DEVICE_TUTORIAL_HEADING": "了解您的 Trezor 设备",
+  "TR_TROUBLESHOOTING_CLOSE_TABS": "关闭可能使用您的 Trezor 设备的其他标签页和窗口",
   "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION": "关闭其他标签页和窗口后、尝试刷新此页面。",
-  "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION_DESKTOP": "关闭其他浏览器标签和窗口后、尝试退出并重新打开Trezor Suite应用程序。",
+  "TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION_DESKTOP": "关闭其他浏览器标签和窗口后、尝试退出并重新打开 Trezor Suite 应用程序。",
   "TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED": "实现通讯交流的必要步骤",
-  "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_DESCRIPTION": "访问 <a>Trezor网桥状态页面</a>",
-  "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_TITLE": "确保Trezor网桥进程正在运行",
-  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "目前只有基于Chromium的浏览器允许与USB设备直接通信",
-  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_TITLE": "请使用基于Chromium的浏览器",
-  "TR_TROUBLESHOOTING_TIP_CABLE_DESCRIPTION": "数据线必须完全插入接口。如果连接的是USB-C设备、USB数据线插口应卡入到位。",
-  "TR_TROUBLESHOOTING_TIP_CABLE_TITLE": "尝试一个不同的USB数据线",
-  "TR_TROUBLESHOOTING_TIP_COMPUTER_DESCRIPTION": "安装了Trezor网桥后。",
+  "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_DESCRIPTION": "访问 <a>Trezor 网桥状态页面</a>",
+  "TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_TITLE": "确保 Trezor 网桥进程正在运行",
+  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION": "目前只有基于 Chromium 的浏览器允许与 USB 设备直接通信",
+  "TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_TITLE": "请使用基于 Chromium 的浏览器",
+  "TR_TROUBLESHOOTING_TIP_CABLE_DESCRIPTION": "数据线必须完全插入接口。如果连接的是 USB-C 设备、USB 数据线插口应卡入到位。",
+  "TR_TROUBLESHOOTING_TIP_CABLE_TITLE": "尝试一个不同的 USB 数据线",
+  "TR_TROUBLESHOOTING_TIP_COMPUTER_DESCRIPTION": "安装了 Trezor 网桥后。",
   "TR_TROUBLESHOOTING_TIP_COMPUTER_TITLE": "如果可以的话，尝试使用另一台电脑",
   "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION": "以防万一",
   "TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE": "尝试重启您的计算机",
-  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_DESCRIPTION": "运行<a>Trezor Suite</a>电脑应用程序",
-  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE": "使用Trezor Suite电脑应用程序",
-  "TR_TROUBLESHOOTING_TIP_UDEV_INSTALL_DESCRIPTION": "试试安装 <a>udev规则</a>。确保在打开之前先把它们保存到桌面上。",
-  "TR_TROUBLESHOOTING_TIP_USB_PORT_DESCRIPTION": "直接连接到电脑上 (不要使用USB集线器)。",
-  "TR_TROUBLESHOOTING_TIP_USB_PORT_TITLE": "尝试不同的USB接口",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_DESCRIPTION": "运行 <a>Trezor Suite</a> 电脑应用程序",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE": "使用 Trezor Suite 电脑应用程序",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_DESCRIPTION": "<a>点击以切换</a>至另一种网桥实施方案。当前版本：({currentVersion})",
+  "TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_TITLE": "使用另一个版本的 Trezor 网桥",
+  "TR_TROUBLESHOOTING_TIP_UDEV_INSTALL_DESCRIPTION": "尝试安装 <a>udev 规则</a>。确保在打开之前先把它们保存到桌面上。",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_DESCRIPTION": "如果您上次更新设备固件是在 2019 年或更早，请按照<a>知识库</a>中的说明进行操作",
+  "TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_TITLE": "看来你可能正在使用较老的 Trezor 型号。",
+  "TR_TROUBLESHOOTING_TIP_USB_PORT_DESCRIPTION": "直接连接到电脑上 (不要使用 USB 集线器)。",
+  "TR_TROUBLESHOOTING_TIP_USB_PORT_TITLE": "尝试一个不同的 USB 接口",
   "TR_TROUBLESHOOTING_UDEV_INSTALL_TITLE": "自动安装规则",
-  "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "缺少udev规则",
+  "TR_TROUBLESHOOTING_UNREADABLE_UDEV": "缺少 udev 规则",
   "TR_TROUBLESHOOTING_UNREADABLE_UNKNOWN": "意外状态：{error}",
-  "TR_TROUBLESHOOTING_UNREADABLE_WEBUSB": "您的设备已正常连接、但您的互联网浏览器目前无法与之通信。您将需要安装Trezor网桥。",
   "TR_TRY_AGAIN": "再试一次",
   "TR_TXID": "交易ID",
   "TR_TXID_RBF": "待替换的原始交易ID",
   "TR_TX_CONFIRMATIONS": "{confirmationsCount}x",
   "TR_TX_CONFIRMED": "交易已确认",
   "TR_TX_CONFIRMING": "正在确认的交易",
+  "TR_TX_DATA_FUNCTION": "功能",
+  "TR_TX_DATA_INPUT_DATA": "输入数据",
+  "TR_TX_DATA_METHOD": "方法",
+  "TR_TX_DATA_METHOD_NAME": "方法名称",
+  "TR_TX_DATA_PARAMS": "参数",
   "TR_TX_DEPOSIT": "存款",
   "TR_TX_FEE": "发送费用",
   "TR_TX_TAB_AMOUNT": "金额",
   "TR_TX_WITHDRAWAL": "提款",
-  "TR_UDEV_DOWNLOAD_DESC": "在某些情况下、Linux用户需要安装udev规则才能使用Trezor设备。请安装一下安装包并重新连接您的设备。",
-  "TR_UDEV_DOWNLOAD_MANUAL": "手动设置 (高级)",
-  "TR_UDEV_DOWNLOAD_TITLE": "下载udev规则",
+  "TR_UDEV_DOWNLOAD_DESC": "在某些情况下，Linux 用户需要安装 udev 规则才能使用 Trezor 设备。请安装一下安装包并重新连接您的设备。",
+  "TR_UDEV_DOWNLOAD_MANUAL": "手动配置（高级）",
+  "TR_UDEV_DOWNLOAD_TITLE": "下载 udev 规则",
   "TR_UNACQUIRED": "无法识别的设备",
-  "TR_UNAVAILABLE_COINJOIN_ACCOUNT_OUT_OF_SYNC": "不可用。账户同步中、请稍候。",
-  "TR_UNAVAILABLE_COINJOIN_AMOUNTS_TOO_SMALL": "金额太小、无法使用混币功能",
+  "TR_UNAVAILABLE_COINJOIN_ACCOUNT_OUT_OF_SYNC": "不可用。账户同步中，请稍候。",
+  "TR_UNAVAILABLE_COINJOIN_AMOUNTS_TOO_SMALL": "金额太小，无法使用 CoinJoin 混币器功能",
   "TR_UNAVAILABLE_COINJOIN_COORDINATOR": "没有协调员。",
-  "TR_UNAVAILABLE_COINJOIN_DEVICE_DISCONNECTED": "不可用。关联设备已断开连接。",
-  "TR_UNAVAILABLE_COINJOIN_NO_ANONYMITY_SET": "在未设置币隐私级别的情况下、无法启动混币。",
+  "TR_UNAVAILABLE_COINJOIN_DEVICE_DISCONNECTED": "不可用。相关设备已断开连接。",
+  "TR_UNAVAILABLE_COINJOIN_NO_ANONYMITY_SET": "在未设置币隐私级别的情况下，无法启动 CoinJoin 混币器。",
   "TR_UNAVAILABLE_COINJOIN_NO_INTERNET": "不可用。没有网络连接。",
-  "TR_UNAVAILABLE_COINJOIN_TOR_DISABLE_TOOLTIP": "不可用。Tor已被禁用。",
+  "TR_UNAVAILABLE_COINJOIN_TOR_DISABLE_TOOLTIP": "不可用。Tor 已被禁用。",
   "TR_UNAVAILABLE_WHILE_LOADING": "加载时不可用",
   "TR_UNCONFIRMED_TX": "未确认",
   "TR_UNDISCOVERED_WALLET": "点击以发现钱包",
   "TR_UNECO_COINJOIN_AGREE": "我明白了",
-  "TR_UNECO_COINJOIN_EXPLANATION": "如果您的账户余额低于建议的最低限额 ({crypto})、混币可能不划算。请按 <b>取消</b> 返回并添加更多资金、或按 <b>我明白了</b> 继续进行混币。",
-  "TR_UNECO_COINJOIN_RECEIVE_WARNING": "您可以向该账户接收资金、并像使用其他账户一样使用该账户。请注意、混币连接功能将于2024年6月1日停止使用。",
-  "TR_UNECO_COINJOIN_TITLE": "不经济的混币",
-  "TR_UNECO_COINJOIN_WARNING": "使用低于{isAccountWithRate, select, true {(~{fiat})} false {} other {}}的{crypto}来进行混币是不建议的",
+  "TR_UNECO_COINJOIN_EXPLANATION": "如果您的账户余额低于建议的最低限额 ({crypto})，使用CoinJoin 混币器可能不划算。请按 <b>取消</b> 返回并添加更多资金或按 <b>我明白了</b> 来继续进行 CoinJoin 混币器。",
+  "TR_UNECO_COINJOIN_RECEIVE_WARNING": "您可以向该账户接收资金，并像使用其他账户一样使用该账户。请注意，CoinJoin 混币器功能将于 2024 年 6 月 1 日停止使用。",
+  "TR_UNECO_COINJOIN_TITLE": "不划算的 CoinJoin 混币器使用",
+  "TR_UNECO_COINJOIN_WARNING": "使用低于 {isAccountWithRate, select, true {(~{fiat})} false {} other {}} 的 {crypto} 来使用CoinJoin 混币器是不建议的",
   "TR_UNHIDE": "取消隐藏",
-  "TR_UNHIDE_TOKEN": "解除隐藏代币",
-  "TR_UNHIDE_TOKEN_TEXT": "这个代币似乎很可疑、可能是个骗局。",
-  "TR_UNHIDE_TOKEN_TITLE": "解除隐藏此代币？",
+  "TR_UNHIDE_TOKEN": "不再隐藏此代币",
+  "TR_UNHIDE_TOKEN_TEXT": "这个代币似乎很可疑，可能是个骗局。",
+  "TR_UNHIDE_TOKEN_TITLE": "不再隐藏此代币？",
   "TR_UNKNOWN_CONFIRMATION_TIME": "未知",
   "TR_UNKNOWN_DEVICE": "未知设备",
   "TR_UNKNOWN_ERROR_SEE_CONSOLE": "未知错误。详情请查看控制台日志。",
   "TR_UNKNOWN_TRANSACTION": "未知交易",
-  "TR_UNSTAKE_FROM_EVERSTAKE": "从Everstake解除质押 {symbol}？",
+  "TR_UNSTAKE_FROM_EVERSTAKE": "从 Everstake 解除质押 {symbol}？",
   "TR_UNSUPPORTED_ADDRESS_FORMAT": "不支持的地址格式。",
-  "TR_UNSUPPORTED_COINS": "在较新的Trezor设备所支持",
-  "TR_UNSUPPORTED_COINS_DESCRIPTION": "Trezor Safe系列和Trezor Model T支持这些加密货币。",
+  "TR_UNSUPPORTED_COINS": "在较新的 Trezor 设备所支持",
+  "TR_UNSUPPORTED_COINS_DESCRIPTION": "Trezor Safe 系列和 Trezor Model T 支持这些加密货币。",
   "TR_UPDATE_AVAILABLE": "有可用更新",
   "TR_UPDATE_FIRMWARE_HOMESCREEN_LATER_TOOLTIP": "需要固件更新。您可以稍后在设置页面更改您的主屏幕",
   "TR_UPDATE_FIRMWARE_HOMESCREEN_TOOLTIP": "更新您的固件以更改您的主屏幕",
   "TR_UPDATE_MODAL_AVAILABLE_HEADING": "有可用更新",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES": "启用自动更新功能",
+  "TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG": "新的",
   "TR_UPDATE_MODAL_INSTALL_AND_RESTART": "重启并更新",
   "TR_UPDATE_MODAL_INSTALL_NOW_OR_LATER": "您想现在安装更新吗？",
   "TR_UPDATE_MODAL_NOT_NOW": "暂不",
-  "TR_UPDATE_MODAL_RESTART_NEEDED": "这将重启Trezor Suite。",
+  "TR_UPDATE_MODAL_RESTART_NEEDED": "这将重启 Trezor Suite。",
   "TR_UPDATE_MODAL_START_DOWNLOAD": "下载",
   "TR_UPDATE_MODAL_UPDATE_DOWNLOADED": "已下载更新",
   "TR_UPDATE_MODAL_UPDATE_ON_QUIT": "退出时更新",
+  "TR_UPDATE_MODAL_WHATS_NEW": "有什么新变化",
+  "TR_UPDATE_MODAL_YOUR_VERSION": "您的版本：v{version}",
+  "TR_UPGRADE_FIRMWARE_TO_DISCOVER_ACCOUNT_ERROR": "升级固件以发现此帐户。(见上面的蓝色横幅)。",
   "TR_UP_TO": "以至",
   "TR_UP_TO_DATE": "已同步",
-  "TR_UP_TO_DAYS": "最多{count, plural, other {#天}}",
+  "TR_UP_TO_DAYS": "最多 {count, plural, other {# 天}}",
   "TR_URL_IN_TOKEN": "切勿访问代币名称或符号中的网址、它们通常是骗局。",
-  "TR_USED_TREZOR_BEFORE": "您曾使用过当前这个Trezor设备吗？",
+  "TR_USED_TREZOR_BEFORE": "您曾使用过当前这个 Trezor 设备吗？",
   "TR_USE_CHAT": "点击下方并使用下一页的 <b>聊天</b> 选项。",
   "TR_USE_DEFAULT_BACKENDS": "使用默认的后端",
   "TR_UTXO_LONG_BANNED_IN_COINJOIN": "被协调员拒绝",
-  "TR_UTXO_REGISTERED_IN_COINJOIN": "已注册于混币器",
-  "TR_UTXO_REGISTERED_IN_COINJOIN_RBF_WARNING": "您的硬币正在使用中。请先关闭混币功能。",
-  "TR_UTXO_SHORT_BANNED_IN_COINJOIN": "暂时禁止加入混币器",
+  "TR_UTXO_REGISTERED_IN_COINJOIN": "已注册于 CoinJoin 混币器",
+  "TR_UTXO_REGISTERED_IN_COINJOIN_RBF_WARNING": "您的 ”未消费交易输出” 正在被使用。请先关闭 CoinJoin 混币器功能。",
+  "TR_UTXO_SHORT_BANNED_IN_COINJOIN": "暂时禁止加入 CoinJoin 混币器",
   "TR_VALIDATION": "正在验证固件",
   "TR_VALUES": "余额",
   "TR_VERIFIED": "已验证",
@@ -2045,10 +2053,10 @@
   "TR_VERIFYING_PIN": "验证中...",
   "TR_VERIFYING_SIGNATURE": "验证签名",
   "TR_VERIFY_MESSAGE": "验证留言",
-  "TR_VERIFY_TREZOR_OWNERSHIP": "验证您是否拥有这台Trezor设备",
+  "TR_VERIFY_TREZOR_OWNERSHIP": "验证您是否拥有这台 Trezor 设备",
   "TR_VERIFY_TREZOR_OWNERSHIP_CARD_1": "获取您当前的钱包备份",
   "TR_VERIFY_TREZOR_OWNERSHIP_CARD_2": "不要拍照或制作钱包备份的数码备份",
-  "TR_VERIFY_TREZOR_OWNERSHIP_EXPLANATION": "在Trezor设备上输入您当前的钱包助记词备份，确认您拥有该钱包。",
+  "TR_VERIFY_TREZOR_OWNERSHIP_EXPLANATION": "请在 Trezor 设备上输入您当前的钱包助记词备份，确认您拥有该钱包。",
   "TR_VERSION": "版本 {version}",
   "TR_VERSION_HAS_BEEN_RELEASED": "版本 {version} 已发布！",
   "TR_VIEW": "查看",
@@ -2056,20 +2064,20 @@
   "TR_VIEW_ALL": "查看全部",
   "TR_VIEW_ALL_TRANSACTION": "查看所有交易",
   "TR_VIEW_IN_EXPLORER": "在区块链浏览器中查看",
-  "TR_VIEW_ONLY": "仅供查看",
-  "TR_VIEW_ONLY_CALL_TO_ACTION": "<primary>断开Trezor设备连接后</primary>启用仅限查看功能检查余额",
-  "TR_VIEW_ONLY_DISABLED": "已禁用仅供查看功能",
-  "TR_VIEW_ONLY_ENABLED": "已启用仅供查看功能",
-  "TR_VIEW_ONLY_EXPLANATION": "要发送或交易加密货币、<secondLine>只需重新连接设备即可</secondLine>",
-  "TR_VIEW_ONLY_PROMO_NOT_NOW": "略过",
+  "TR_VIEW_ONLY": "“仅供查看” 功能",
+  "TR_VIEW_ONLY_CALL_TO_ACTION": "<primary>在断开 Trezor 设备连接之后</primary>启用 “仅供查看” 功能检查余额",
+  "TR_VIEW_ONLY_DISABLED": "已禁用 “仅供查看” 功能",
+  "TR_VIEW_ONLY_ENABLED": "已启用 “仅供查看” 功能",
+  "TR_VIEW_ONLY_EXPLANATION": "要发送或交易加密货币，<secondLine>只需重新连接设备即可</secondLine>",
+  "TR_VIEW_ONLY_PROMO_NOT_NOW": "暂不",
   "TR_VIEW_ONLY_PROMO_YES": "启用",
-  "TR_VIEW_ONLY_RADIOS_DISABLED_DESCRIPTION": "Trezor设备断开连接后、应用程序中的余额和交易<strong>不可见</strong>。",
+  "TR_VIEW_ONLY_RADIOS_DISABLED_DESCRIPTION": "Trezor 设备断开连接后，应用程序中的余额和交易<strong>不可见</strong>。",
   "TR_VIEW_ONLY_RADIOS_DISABLED_TITLE": "已禁用",
-  "TR_VIEW_ONLY_RADIOS_ENABLED_DESCRIPTION": "Trezor设备断开连接后、应用程序中的余额和交易<strong>仍然可见</strong>。",
+  "TR_VIEW_ONLY_RADIOS_ENABLED_DESCRIPTION": "Trezor 设备断开连接后，应用程序中的余额和交易<strong>仍然可见</strong>。",
   "TR_VIEW_ONLY_RADIOS_ENABLED_TITLE": "启用",
-  "TR_VIEW_ONLY_SEND_COINS_INFO": "您始终需要连接您的Trezor设备才能移动您的加密货币。",
-  "TR_VIEW_ONLY_TOOLTIP_DESCRIPTION": "在此修改仅供查看和访问密码短语。",
-  "TR_WAIT_FOR_REBOOT": "正在重启Trezor设备",
+  "TR_VIEW_ONLY_SEND_COINS_INFO": "您始终需要连接您的 Trezor 设备才能移动您的加密货币。",
+  "TR_VIEW_ONLY_TOOLTIP_DESCRIPTION": "在此修改 “仅供查看” 功能与访问密码短语。",
+  "TR_WAIT_FOR_REBOOT": "正在重启 Trezor 设备",
   "TR_WALLET": "账户",
   "TR_WALLET_DUPLICATE_DESC": "您要添加的隐藏钱包已被发现。",
   "TR_WALLET_DUPLICATE_RETRY": "尝试不同的密码短语",
@@ -2080,6 +2088,7 @@
   "TR_WALLET_SELECTION_ACCESS_HIDDEN_WALLET": "访问隐藏钱包",
   "TR_WALLET_SELECTION_HIDDEN_WALLET": "隐藏钱包",
   "TR_WELCOME_TO_TREZOR_TEXT_WALLET_CREATION": "创建一个新的钱包或从备份中恢复一个钱包。",
+  "TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE": "我们一直在努力改善您的 Trezor 用户体验、以下是已发生的变化: ",
   "TR_WEST": "西",
   "TR_WHAT_DATA_WE_COLLECT": "我们会收集哪些数据？",
   "TR_WHAT_IS_PASSPHRASE": "了解更多区别",
@@ -2093,35 +2102,35 @@
   "TR_WIPE_OR_UPDATE_DESCRIPTION": "前往设备设置",
   "TR_WIPING_YOUR_DEVICE": "出厂重置会清除设备内存、删除所有信息、包括钱包备份和PIN码。只有在有钱包助记词备份的情况下才能执行出厂重置、因为钱包助记词是恢复资金访问权限所必需的。",
   "TR_WORDS": "{count} 单词",
-  "TR_WORD_DOES_NOT_EXIST": "单词 “{word}” 不存在于BIP39词表中。",
+  "TR_WORD_DOES_NOT_EXIST": "单词 “{word}” 不存在于 BIP39 词表中。",
   "TR_WRONG_PIN_ENTERED": "输入了错误的PIN码",
   "TR_XPUB": "公钥 (扩展公钥)",
   "TR_XPUB_MATCH": "公钥 (扩展公钥) 是否匹配？",
   "TR_XPUB_MODAL_CLIPBOARD": "复制公钥",
   "TR_XPUB_MODAL_TITLE": "{networkName} 账户 {accountIndex} 的扩展公钥 (XPUB)。",
   "TR_XPUB_MODAL_TITLE_METADATA": "{accountLabel} 的扩展公钥 (XPUB)",
-  "TR_XPUB_PHISHING_WARNING": "为防止网络钓鱼攻击、应验证Trezor设备上的公钥。{claim}",
+  "TR_XPUB_PHISHING_WARNING": "为防止网络钓鱼攻击、应验证 Trezor 设备上的公钥。{claim}",
   "TR_XRP_RESERVE_INFO": "瑞波币地址要求有 {minBalance} 的最低余额，才能激活和维护瑞波币账户。",
   "TR_YES_CONTINUE": "是的、继续",
-  "TR_YES_SETUP_MY_TREZOR": "是的、设置我的Trezor设备",
+  "TR_YES_SETUP_MY_TREZOR": "是的、设置我的 Trezor 设备",
   "TR_YOUR_CURRENT_FIRMWARE_UNKNOWN": "在引导程序模式下使用设备时、无法检测到当前的固件版本",
   "TR_YOUR_CURRENT_VERSION": "目前正在运行的版本 {version}",
   "TR_YOUR_DEVICE_IS_SEEDLESS": "您的设备处于无种子模式、不能与此钱包一起使用。",
-  "TR_YOUR_FIRMWARE_TYPE": "目前的固件类型是 {version}",
-  "TR_YOUR_FIRMWARE_VERSION": "目前的固件版本是 {version}",
-  "TR_YOUR_LABELING_IS_SYNCED": "您的标签已与云存储提供商同步。您的数据是安全的、只有您的Trezor设备才能解密它们。",
-  "TR_YOUR_LABELING_IS_SYNCED_LOCALLY": "标签在您的机器上本地保存。",
-  "TR_YOUR_NEW_VERSION": "有新的版本可用！",
+  "TR_YOUR_FIRMWARE_TYPE": "您当前的固件类型是 {version}",
+  "TR_YOUR_FIRMWARE_VERSION": "您当前的固件版本是 {version}",
+  "TR_YOUR_LABELING_IS_SYNCED": "您的标签已与云存储提供商同步。您的数据是安全的、只有您的 Trezor 设备才能解密它们。",
+  "TR_YOUR_LABELING_IS_SYNCED_LOCALLY": "您的标签已在本地保存到您的电脑。",
+  "TR_YOUR_NEW_VERSION": "版本 {version} 可用。",
   "TR_YOUR_NEW_VERSION_IS_DOWNLOADING": "版本 {version} 正在下载。",
   "TR_YOUR_NEW_VERSION_IS_READY": "版本 {version} 已完成下载并准备好安装。",
-  "TR_YOUR_TREZOR_IS_NOT_BACKED_UP": "您的Trezor钱包尚未进行备份。",
+  "TR_YOUR_TREZOR_IS_NOT_BACKED_UP": "您的 Trezor 钱包尚未进行备份。",
   "TR_YOUR_WALLET_IS_ALMOST_READY_DESCRIPTION": "干得好！现在让我们创建一个钱包备份。您的助记词备份是恢复钱包访问权限的唯一途径。",
-  "TR_YOUR_WALLET_IS_READY_WHAT": "您的钱包已准备就绪、可以开始使用了！",
+  "TR_YOUR_WALLET_IS_READY_WHAT": "您的钱包已准备就绪！",
   "TR_YOUR_WALLET_SUCCESSFULLY_CREATED": "已成功创建钱包",
   "TR_YOU_HAVE_CONNECTED": "您已经连接了",
   "TR_YOU_SHOULD_ANONYMIZE": "您应该将他们匿名化",
   "TR_YOU_WERE_DISCONNECTED_DOT": "您已断开连接。",
   "TR_ZERO_PHISHING_BANNER": "请谨慎操作。这可能是欺诈性交易。 <a>在此阅读更多信息。</a>",
   "TR_ZERO_PHISHING_TOOLTIP": "地址中毒攻击警报！此交易看起来可疑。 <a>了解更多信息。</a>",
-  "ZERO_BALANCE_TOKENS": "零余额代币"
+  "ZERO_BALANCE_TOKENS": "零余额的代币"
 }
diff --git a/packages/suite-data/files/videos/device/trezor_t3w1_hologram.webm b/packages/suite-data/files/videos/device/trezor_t3w1_hologram.webm
new file mode 100644
index 00000000000..a04ac74bf2b
Binary files /dev/null and b/packages/suite-data/files/videos/device/trezor_t3w1_hologram.webm differ
diff --git a/packages/suite-data/files/videos/device/trezor_t3w1_rotate_color_1.webm b/packages/suite-data/files/videos/device/trezor_t3w1_rotate_color_1.webm
new file mode 100644
index 00000000000..4027868adaf
Binary files /dev/null and b/packages/suite-data/files/videos/device/trezor_t3w1_rotate_color_1.webm differ
diff --git a/packages/suite-data/files/videos/device/trezor_t3w1_rotate_color_2.webm b/packages/suite-data/files/videos/device/trezor_t3w1_rotate_color_2.webm
new file mode 100644
index 00000000000..4027868adaf
Binary files /dev/null and b/packages/suite-data/files/videos/device/trezor_t3w1_rotate_color_2.webm differ
diff --git a/packages/suite-data/files/videos/device/trezor_t3w1_rotate_color_3.webm b/packages/suite-data/files/videos/device/trezor_t3w1_rotate_color_3.webm
new file mode 100644
index 00000000000..4027868adaf
Binary files /dev/null and b/packages/suite-data/files/videos/device/trezor_t3w1_rotate_color_3.webm differ
diff --git a/packages/suite-data/files/videos/device/trezor_t3w1_success.webm b/packages/suite-data/files/videos/device/trezor_t3w1_success.webm
new file mode 100644
index 00000000000..aa1810af85e
Binary files /dev/null and b/packages/suite-data/files/videos/device/trezor_t3w1_success.webm differ
diff --git a/packages/suite-data/files/videos/lottie/trezor_t3w1_connect.json b/packages/suite-data/files/videos/lottie/trezor_t3w1_connect.json
new file mode 100644
index 00000000000..1efd0760b7a
--- /dev/null
+++ b/packages/suite-data/files/videos/lottie/trezor_t3w1_connect.json
@@ -0,0 +1,123 @@
+{
+  "nm": "Comp 1",
+  "ddd": 0,
+  "h": 800,
+  "w": 800,
+  "meta": { "g": "LottieFiles AE 0.1.21" },
+  "layers": [
+    {
+      "ty": 3,
+      "nm": "Null 1",
+      "sr": 1,
+      "st": 0,
+      "op": 250,
+      "ip": 0,
+      "hd": false,
+      "ddd": 0,
+      "bm": 0,
+      "hasMask": false,
+      "ao": 0,
+      "ks": {
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
+        "s": { "a": 0, "k": [151, 151, 100], "ix": 6 },
+        "sk": { "a": 0, "k": 0 },
+        "p": { "a": 0, "k": [284, 286, 0], "ix": 2 },
+        "r": { "a": 0, "k": -45, "ix": 10 },
+        "sa": { "a": 0, "k": 0 },
+        "o": { "a": 0, "k": 0, "ix": 11 }
+      },
+      "ef": [],
+      "ind": 1
+    },
+    {
+      "ty": 2,
+      "nm": "T3W1.png",
+      "sr": 1,
+      "st": 0,
+      "op": 250,
+      "ip": 0,
+      "hd": false,
+      "cl": "png",
+      "ddd": 0,
+      "bm": 0,
+      "hasMask": false,
+      "ao": 0,
+      "ks": {
+        "a": { "a": 0, "k": [205, 325, 0], "ix": 1 },
+        "s": { "a": 0, "k": [72.871, 72.871, 100], "ix": 6 },
+        "sk": { "a": 0, "k": 0 },
+        "p": { "a": 0, "k": [0, -120, 0], "ix": 2 },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "sa": { "a": 0, "k": 0 },
+        "o": { "a": 0, "k": 100, "ix": 11 }
+      },
+      "ef": [],
+      "refId": "t3t1",
+      "ind": 2,
+      "parent": 1
+    },
+    {
+      "ty": 2,
+      "nm": "cable.png",
+      "sr": 1,
+      "st": 0,
+      "op": 250,
+      "ip": 0,
+      "hd": false,
+      "cl": "png",
+      "ddd": 0,
+      "bm": 0,
+      "hasMask": false,
+      "ao": 0,
+      "ks": {
+        "a": { "a": 0, "k": [53, 343.5, 0], "ix": 1 },
+        "s": { "a": 0, "k": [72.871, 72.871, 100], "ix": 6 },
+        "sk": { "a": 0, "k": 0 },
+        "p": {
+          "a": 1,
+          "k": [
+            {
+              "o": { "x": 0.167, "y": 0.167 },
+              "i": { "x": 0.667, "y": 1 },
+              "s": [0, 427, 0],
+              "t": 13,
+              "ti": [0, 19.833, 0],
+              "to": [0, -19.833, 0]
+            },
+            { "s": [0, 308, 0], "t": 25 }
+          ],
+          "ix": 2
+        },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "sa": { "a": 0, "k": 0 },
+        "o": { "a": 0, "k": 100, "ix": 11 }
+      },
+      "ef": [],
+      "refId": "cable",
+      "ind": 3,
+      "parent": 1
+    }
+  ],
+  "v": "5.5.7",
+  "fr": 25,
+  "op": 50,
+  "ip": 0,
+  "assets": [
+    {
+      "id": "t3w1",
+      "u": "",
+      "e": 1,
+      "w": 410,
+      "h": 650,
+      "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZoAAAKKCAYAAAAEOJ1lAAAAAXNSR0IB2cksfwAAAAlwSFlzAAALEwAACxMBAJqcGAABKmNJREFUeJzsvfuWHsdtL1o9FkntdSySyl6WHTvZL8C/EvluWY6zX4QPd55DXuvs3OM4TmLnnviSi21JHFJeK5JIifOdqa5GFQr1Awr9zXw5c2YBtjhf1wVAVXfjB6Cqu5cUFBQUFBR0Qlr+v1YgKCgoKOh2UwBNUFBQUNBJKYAmKCgoKOikFEATFBQUFHRSCqAJCgoKCjopBdAEBQUFBZ2UAmiCgoKCgk5KATRBQUFBQSelAJqgoKCgoJNSAE1QUFBQ0EkpgCYoKCgo6KQUQBMUFBQUdFIKoAkKCgoKOikF0AQFBQUFnZQCaIKCgoKCTkoBNEFBQUFBJ6UAmqCgoKCgk1IATVBQUFDQSSmAJigoKCjopBRAExQUFBR0UgqgCQoKCgo6KQXQBAUFBQWdlAJogoKCgoJOSgE0QUFBQUEnpQCaoKCgoKCTUgBNUFBQUNBJKYAmKCgoKOikFEATFBQUFHRSCqAJCgoKCjopBdAEBQUFBZ2UAmiCgoKCgk5KATRBQUFBQSelAJqgoKCgoJNSAE1QUFBQ0EkpgCYoKCgo6KQUQBMUFBQUdFIKoAkKCgoKOikF0AQFBQUFnZQCaIKCgoKCTkoBNEFBQUFBJ6UAmqCgoKCgk1IATVBQUFDQSSmAJigoKCjopBRAExQUFBR0UgqgCQoKCgo6KQXQBAUFBQWdlAJogoKCgoJOSgE0QUFBQUEnpQCaoKCgoKCTUgBNUFBQUNBJKYAmKCgoKOikFEATFBQUFHRSCqAJCgoKCjopBdAEBQUFBZ2UAmiCgoKCgk5KATRBQUFBQSelAJqgoKCgoJNSAE1QUFBQ0EkpgCYoKCgo6KQUQBMUFBQUdFIKoAkKCgoKOikF0AQFBQUFnZQCaIKCgoKCTkoBNEFBQUFBJ6UAmqCgoKCgk1IATVBQUFDQSSmAJigoKCjopBRAExQUFBR0UgqgCQoKCgo6KQXQBAUFBQWdlAJogoKCgoJOSgE0QUFBQUEnpQCaoKCgoKCTUgBNUFBQUNBJKYAmKCgoKOikFEATFBQUFHRSCqAJCgoKCjopBdAEBQUFBZ2UAmiCgoKCgk5KATRBQUFBQSelAJqgoKCgoJNSAE1QUFBQ0EkpgCYoKCgo6KQUQBMUFBQUdFIKoAkKCgoKOikF0AQFBQUFnZQCaIKCgoKCTkoBNEFBQUFBJ6UAmqCgoKCgk1IATVBQUFDQSSmAJigoKCjopBRAExQUFBR0UgqgCQoKCgo6KQXQBAUFBQWdlAJogoKCgoJOSgE0QUFBQUEnpQCaoKCgoKCTUgBNUFBQUNBJKYAmKCgoKOikFEATFBQUFHRSCqAJCgoKCjopBdAEBQUFBZ2UAmiCgoKCgk5KATRBQUFBQSelAJqgoKCgoJNSAE1QUFBQ0EkpgCYoKCgo6KQUQBMUFBQUdFIKoAkKCgoKOikF0AQFBQUFnZQCaIKCgoKCTkoBNEFBQUFBJ6UAmhtGd+7cOeS/y7Kkw+EwNljy/5e1/uLiorbJx/m/TLks/3d2dlaPEfH2knLRAq4O0ov+0m8PyTHxY00X4m/J4Dq0vzSGsR+Sy+u031J3jXf9vSmi6c511uRyPjM9l3Jx9Dquf8+GcqTDrIz4a+Ne2kFps85X6wPHQe0Fb/r7ox/9KGzULaA4iTeMpkCzEQENP6abFQEA54eMN5JlgUkGsVx+cXHobAdvq4GQHBvXhwMAlz0a38v6hEGrtlCMItIHHXfl+echdfrlOahyNweAj4na8XOD5MkymltumKWR7uoMcOQ6oL5qn62NBDF+nOdftu95bJOGzp8CrgE0t5PiJN4wykCjGfj1xhanTPOyLZDiEQk38NQ3A5g0/MT/QF5q6vmXuouUFGNb/qZhBBJMZtFXPWagOurH+zRdkWFDkQ153wfQtm+3RQuiT+WZSr0ERCsa8oDeHtBw8VMAQQcqBpqbfCt6U0GF6T4AzVYXQHM7KE7iDaM1oqlph0I92KSurpWXsrPNuCIDukZAi4SqRprxpchprD8rknOaLht50kUCJEhtychF/i4efeE5i0w0WagNiuL2tNeMpjy2Un6eCAOBZm/gfRGSZsBVvQBfFM1IPTrQAEAky+U8aAAXQHM7KE7iDSMe0WSSRroeb4so1noJihBkaouv49TyiwO8Mrz8qQ6V6VHSKEvymUUh3nUXPmdam/qbRU41guFBnZgnZDjR2K1owxzDoY88LDDTeA59GE9P5DQDiNZUGSPJGwBs+5cB149//OOwUbeA4iTeMJJAIwkZcI3kTV6aHzpDyw0glksWtQGTBgxW1IHaW+PZE6VYZBlzqw0Bi7xFNJkE2KgNzZuMdjz6qfpuIHdW0E/tpwGN1RY5NhJoVBm83fYbATeXrYFyvmB//Ld/GzbqFlCcxBtGHGg6Y7uuRJffPIIh4jestYh+WNlc1JUSGSVYRlCLjsZUWja8ALSWLVriRQ5A0UgaLU+9DirNOB7IsCKeiuGXIGJFNN4IpCtPqaYReaTA01locR7qkSqjQaYZ1VgAIuVQGyXFpwGh1O1vA2huBcVJvGGkRTQobXSxGm2czuJZHQQY2s4zK82FSLZB6TXJG3CptqX1PWwZlrkOox4Lt1WdgbygbdsATCzDOYtCBqBJBAwgOhBlg55aVJP7ny2JNiCgtlWfmoKSEcQ2PxoAbI1UgLHqtcgG1m/6GW3yBP7t3wXQ3AaKk3jDKAON19jTxgBpuFD/IXJJJe3iWS+xiMu0opMhVbalRiid1xvMZav264LSUp08o49VjviqQDCp40CjlVOffm3IlteBylrYt6U0FIpitAhG9lGjHAEYAw+phxgH5EUwfVkXEc3toDiJN4xWoGGbgPvUlH/Rv+VZRiCxdlvx8ou8XRk89DimzJjRLA3qMXpolAzMy7ybrQPBzha6CK0zIX2lntSOtnJTmbUJAR0jQzkDBy5fEi872yKXcj0kaPQRL2y8RX8AIiqPpU9p0Q5DXob4zKOa1EVHaP0mgOZ2UJzEG0b0wKYkbgTRzqW9kYhnhxYCNVSnGXapdz1OtA07DWPiOqBIzIqa2m8GsMsyXOQcmPaumXRlLIqgNBm6obz8Z5EYMuByTJYMDax4VKJGhrQutHB+AhhAOg4DDGu36QSjn0sd/vbv/i5s1C2gOIk3jGiN5uJwGNZYNKCpRprZ12IozhKPaBIzOHLNhO8m0yKflSfz2qmeohaKEDpFkjAy1ZkegVMSipQ0Y7pnZ5oFXp5+6DcCXeShI4IRirLRARtmkiYNP6VI2ytoVLDhkYXUh8m0xgDTaFDfScTF+EREczsoTuINIy2iyaQtHA+eOW0GUCIRbhgbWCw84wUX1mdRB6em1+B8m/ogklHRHrIiE60cRkaAn7UWZqW3Zuk5maryjGcWGXnKZjy1iEqC19I6sbIROJehzwiUf/f3fx826hZQnMQbRhxotAX1TOh5lmrsUm8e5ToGXoDP5QVUJHjxYy1d1hF4kFGSBA8ENK61KIW3HLelgzeiKRUpMVNqAtksFcbrNKDyRjtToDHSWmoZ6MP1nclH0VOfNuv5s716tfzvA2huBcVJvGF09+7dLUvURwNoMZ0MP4GOXNNAhpR+80VwnpaSXjcRAjWNpGzeVr7OBvVD422N0rrF16OXBEooVwCHNT5PVCTncAAFJk8++0L9LYDUHgyFvw/0BH7q0lcYCGqJ0YZFIOjaknISW7syAEfy5hd+AM3toDiJN4z2ps5kPQIa1F6ux8h+iGd/XMyItc6BQA4BjRbNEIjy/lVealHbOOZUay3PG5E3JWXVochrrUfR0CH1D1rKyIIcfDpeelicRSVqG+LFDDvmVVv3QNMqAW8BIpR+FdHY7Nzko7//h38IG3ULKE7iDaPyHE25h6VnyxfPreiDl0mDLss4P0Q6CHGgKb+lEZH6zmTN9OSkjb3JbWtLOJW3SDvpjmLU1BOQQ1HL+vtsM9B167nOb+AvDTSBqYgypjqXA5xKS6nj17cf69Q+Rr21QQKNNyKa20FxEm8Y5dQZMtCVtoX+fPPyLcKeRXVplOU6DzLeaOfZ2H79t0upyL4W8PFy2RbtTLN0QbK86zBW9LK3XYsY0gAsGg+cjhoNs2mcN+FL/6NGJjISUUET/WV90dx1O8hahS5HrNdQ1FdlXf779/8QQHMbKE7iDaPywOYWI4A1Bgp3alyx2A9harvMLMPb2vC1orG9FqnIiEzqkQFOfrStVySxx2D6dBsCIal7/XAYGK83stIeNJXzZYE7Ghd/ENdqy/laYDCLzGQKDG2BTgK8+Ni648YI8Ld01HnIKKcDsxSps9tCcRJvGNEraCTA9FQsMTLaXSvFeOE1kfVfNSqh/tSPbybo+fTrDd2mAzYuCTSe9Ser3ho32s0ly3B0RPMy8tWikHK8SjDBB/HSNgFYYIDGC59nsaKgJQ0ARO28AFLbDyjG9AfjkFFSrdnK/iGA5lZQnMQbRq+88spBAsHMsFIbK0pgQQIEL+n987UFLe2lfTIgkSznWouVHqNyLTrxpslke1WvGnXgPdoICDRee4GGqTBEDqgvinosOV35JsOKrDoAAeCgRUcdn8P24PAi6qkNksfaBdDcDoqTeMNo3XW27UTKNKazlmIDxUP/RLN1C9mu8V//7YyXtsZipq+Yfe7bpUFhOTbOc8kgBoCT70aTYCTbItIAy9Oeji0gQ8cc5Lv+ckfZDn6DQR/aNBCYgZAGiD0Y9Sm6kSdJHeWupWeKDHHNSJD9x3/8x7BRt4DiJN4w4tubeVTRKBu+tmYhDbA03vIZG49BllGG1Y6iqNz87GyMKrSIh8u3dNLWYaz0GBqLp24WOcp2HWBtkdAsskJG33IIUPQy6MINNYqYVuUO7GhhANdHbn0aLA2ANku1WX81sEIRHNUF0NwOipN4w4jedZYSPcEvaLMN5NVn0rYRZ8rvueJgJTcHNCOgyGOk7WzzRD6Sjyy3Nilo6TEpCwNFmTAPiHTRXBEEU0lWf67fWM916nlSRMDLh8irNaz1dH4LMBhRDOur8bRkyTEOQCa2Wve8eLgiwWwELN4mgOZ2UJzEG0YU0WgL2ERojaQZ4GY7kJds0Wgkyet1rMsAQCAwzB9pW53vSYQyAFUT3/U5hqqM1F/4MwDx1skXk8p2EDy6dm3zgQVwGm/Zpjfi+u40BCq6jsu0H5aPec7GFkBzOyhO4g0jCTTVCFenkcqKUdK3GPfrI9LIzHaetb7j2o4ljwxa/q+AC/Lyi6nX0kQ9P98OMXVLOLfeiiwNTDxRkMVzjCr6VOhMBzrvi3Kbyt1lGr8GCEsF+yFFVtvo49IiEeKvAhYr72TyiGcZ2+Z///Gf/ils1C2gOIk3jO7eLW8G8KxNrGsvqZxEK9KQ1O0u2wwy/9galytfGTMCTUroMkLRDT/mZVxe1acDiYKyFi+pG+fJ64a+i2bGRx6StBebVsO7LAO4dG1Te9eZCjTir7aeZf2Whh7x94Desp2PBbxvrYENAw0x9zClJtpKnSOiuR0UJ/GGUf0ejXg2Br04U9JskbwYqoshPWPxHGSk8aKRGw+0jnwnXQWThI2kFp1JmZbxtQg9a8IqzXSd1Fcbxx4gHH9vWi54/UmCWCePhbASpCwdUUoMHZ9RyOoYM++vPd9TAIwasnNz+b9//KcAmttAcRJvGNHbm+lBx6sYVAlMKFVmsbF2j1lGH+ld/1bj2NI4mqFGO+UsnZFh18BPmxMuW+PddBv3mPN2/Bs/NTgz5KMUk+TNMZBHgPyYxi6jiP5aSKv+6k42OSYBXghUeNSDxoG3Po9j5nz/KVJnt4LiJN4w0t7erO34kvX0mxtyueuHEzKqM/m830wnLsfiq/XjfTU9vaBb2jZwkIba4oc99WWYU09filZQGytNhoAF81dArAnvjL/59miFvwSPMQrq58bLX/4OoLkdFCfxhlH/4bP131o3M8jUxpNemy2wa5sAfFuKR/1GnuMuKE51bUh4wRYIeQAHGTUv0KDUk8VfRhWqHqVgqNOiFVs+gSluIyMJS/Y2Cmrd1bX+AlAYPzRGFMmovwNobg3FSbxhREAzpozs7c71eLMLWmpLtve045QBgK8XfeYzn0kXh4saNWnrKRIQvFFLz48njvp+9Fubs1EnMsr28z4zYGmVqe4KlERbvC1w7uUQw7F+IeNOz61sA6HNHB5AUiOhTbiW1uJ9zrbXymD9Nf7LcG2itBo//ud//uewUbeA4iTeMJKfcs4kjTZ/OzGVlf+aXZBpltlGASSTUnByx5cEBe2448M2A3Cy5PPjGgFtfGaevrZxwhOJNdmDnZ32H4wsA34L1Obggz3+khrtyyB/0MaUM2nrSYG1OcCbE7SxczD953/5l7BRt4DiJN4w0p6j4cZz3IHWP9XPb2a0PZmeJveseaAIhOtT385M6RSDLHkoNScBg8aD9CFbxrdpc6CY7fhC45PjR2ChAg79u7TPLMyiI2/kUWWLXWeyrQRFbd0E9Z9FO50eBtho4+I6oTUi+h0Rze2gOIk3jPLbm+m3B2ioHZF3AV6SFZXM1nx4+6pn2mIhkrVFI7xN5W2sw8jjbl5ySqryWf/V9SyhkAkOnYzU0lESLEgf/gogT+TUgT17FiWlthLCIyH+IsqFtSGDP4AeBxKQQt26Jn7bjwDT6tUFfX6+zHRYZbjp146RbNQngOZ2UJzEG0YZaDyGMJM02LJOI94nr7Fo6xoodSRTUtraEUoToY0Ie6McGeFwHhTZSMCZrW9ZICt1QeNCunuOEeghXTUZ0rhr47AiqVkbsy+VzaIhAkHqxNtOtjz/S6TObgXFSbxhxD98lmlcM8EGCH2IDBmxoT7/J4AG9ZdGn0dWkqe2yUBSxy+1ixGBmASpPWDFeWoA1vjg3XBeUNHKvSmn2QYEq07yrWMtB60+9c/i8L4I6DQ5jd8W1WxyYHvqM4toxO8AmttBcRJvGCGgmXm23i9sEr9Sxx423CyPBTK8bCZTM/ych2cjQVFtWXe1aePhfZHu8lUGs4hmD6BYQOGJKtwgVQpNubAfl8PmYU/EogIHB7QulTbX1QIyma7713/917BRt4DiJN4wotRZBzYpbVtXmyFri+Ltvh68/KVfoJcRCZVZpEUs3PtH4CLLNOCC6bHSSNcvz8OFLs8EDu7OawTmDTfzR5Ay0vDyngFcvTqWPnV2Bt5HhnlzBEo1xcWnqXxnSAeDITorhays6YjGZo0xgOZ2UJzEG0bamwEkeUEDGtttsR6tO3j57E3VIaBRx0U6grUYyUdrIwKZ6Xi4jg38GohraSU091Nw4AadpZ7ovNRyAJ6arqi9N/WF6jRem/owakE6QgBi/XFU0+oDaG4HxUm8YQQf2CyhzPr3sBl4lAKSJKOERWnvSR1p/TwAJesKQPRGHMo4pLr1dbagj6iTmVJdJ5AbGjTdB15MHwtoNH5mykiJCjV+FlBQuQ9gSuziijLo30XXTf7W0mqz6C4imttFcRJvGPFdZ/kvXwtBxqalsZBHjncwaQaatgBL/hpJr7e17RfUJRgdHens2ACQq3PKB8mbgaYNOmKzADkBaTSeGnDvin4AXxJb4qL+ORSLx1DWGPVytnIZZcgNBBJIZnJn8ro+2+9//clPwkbdAoqTeMMIrtFwg7WlV5DBtYywNAD2zquxHRmUqsvm3dNxXhNAoMjTezwlMwOxwqSlmLRxaeOEbQU/U7CyRVq+lHOmh1ZnOQJWHyRDGuqhflnMNuuazrIM9d6oY9Z+2MLMwtmZjJ8E0NwKipN4w4i/GSBTSXvxp93HZ0q0V9JYXq7mvVsg0IzjetS1kUCjEX/IkuiCpQM9INmUTcNrbbxRVsfm0NvYany17+tshrvo1d7KgBwDb8SitfPykpFFV6dEtVIuiv4IKPI8SzCSug3yUuqcIpQ60+aAdPnpT38aNuoWUJzEG0ZyMwBOFzWj2erbzp7O4G9GEfHB3v9okGfGn4BwFh1p8vlrcqxITc7JkBKj3wMAtR17Gk9Nt9lYELh0Brg0SpKk/AZq4/y3tmOkRfUQhNDDkA5dNL5aXxiVlIIObEwdlLWfiGhuB8VJvGEkI5pMmhHkZa3uDIBQTxeTDQXSk5ZyKFW2bkzYPu5lrZ/w7bbW+gwy1CjakWk4zosyM94022yTATK0SD7iLf9agA0N+hZqzcDBMuBU7uUB+6165P+fDRZD8tB4SuC1ZPPxBNDcDoqTeMPIWqOhFI9m1Ln3rG0Q4IQ2DcwAzk6p9e21nV38UwNceRkVzRbxedsmu0wB2n6NdOZkvbvM2qXmWWuZ922RjCZbk2GBSIssluFuN/tVgLE3EQxAw+soSgHtUbSF9IrU2e2gOIk3jF65jGjWdIOyWE801vVvcJbGTxpeuY7DQUIaNk8ExHWyNgDw8vVv6t9ArPGWY+J6ofacT/nJ+1JCZw4MfCceH4cHUKy6FrUkNb1Vx7CBsAo0AESoHTfysu00ytn6zoBMpsbQWPo+S0uTbeNfFB0DaG4HxUm8YURvby6Lr+3pbhR9WNRHC0u3BdeKYDRgo7Z8PWYWAXDivOVYJJjI9pIksM02E0hgmc5hduTP7GeErEgRtbd4SOLRXhsrH0sSdXNw6+ZbAZsBlBR9LbktimEyNr4QxJjMMTpa0k9+Gqmz20BxEm8Y8c8EaJ8DQMYYGT4tfaQZSRkFyFSOd92jo0Pbjj0DDq6TtR7D+810KtHcYRjLnnF4wF1LjZX+ZS5XfRO76cggpwRBF/FCxx6g0dJvJlgMkVOCEc4UkLZ+si2MeoSMiGhuB8VJvGH0mbxGk0ZDRwTTTxYQdJat92w9wMH78CiGyAKzYuQvut9cdy1q8gAbxShWBMb5yDShZ0FfthVTqbZHv/s29rM4pSzrvAwPnU7TXfR7A/gz2k4uQKZFN/0WZMRXS4N1cwojmWW49hrIorWfBnDU8qc/C6C5DRQn8YYRvb1ZIy2K4fVUJkHFihyoTHt2BBm6Mb1j66YtqFu7sdSoazNa8guibh02C+uNXHQvvn0UzexDFh3wkmVNb3qhpd5P8kB6WsBejb8xbisdtmc8SN5aR+s0tCGCgVcAze2gOIk3jDLQoCfsEWh4UkkoCkGkAcnIkwzFuEkA9ZkZfo9eXhCRtNowUe3dPVbLylDFvI92GaWorPUbPg6pg1z7moKYOJbOAmxLUU4pKOXsNz9WQSOxh4kXVM94K3zqv6w/B7YAmttBcRJvGOU1mn59JA0ec12/SMgI6mscXV/FgNOx1bbpQVqk1LnsxBO8O632FXUe0owzr+M0S4tZpM3NVqsFAH1/Sk05NgzMgEpLM1m8JGnrNPRbA5qxba0d2o48lpoO43zU6ErU/+xnPwsbdQsoTuINo8985jMHebNJA6G9U0yCkTTMHBg047cnfUTttTbHGH8Eeh2gsfUGnkbLD49WQ6foIefqmDlA40THqM6KpjRent9anZYulRGujFKG3WLs7wH08eg5K6NjCW4BNLeD4iTeMOK7zqZpncNhWOznfa1dZXSsfY5ZpsXQszRtvaP33FFUJcejAUGRvS7zd+20NOFsV5pGVmoJUh+w1UJy7tG5weNt0dAs0oF1Na2UCsBaUY8yLi/QUJ3nYU8tGkJRkQk0ouznP/952KhbQHESbxjt2QyA6jjJHVyzelmHeM4Mf88kDQ9jSuMrwQLx9ow1k/YA5wxwJb+h/eV/ZwBAZQrNE9VYesl6M4JJ/YOuVDYDBMRbtkVpssKbHBsNKEpbJBuBjHZN8L8BNLeD4iTeMEIRjdw1xeuoTHr1sq9lxPnzOtLT93j72i41ZECsV8NYIEbl1iK6nAfL22+fwp5vNrD01eZLS8+tZext3JwP728BEQIdnu6S25VnkY6V3tLqYRuxS2LGY1nYLFSwLL8DaG4XxUm8YcSBBtFBbHlt5Z5Fb5j/MUFIizqkXGSksf5je00Pbmwl2PKdWdbGBslbGyfooN4cFiDuiWq8ZRZo6GXrvy5QlwBXenaMeh228gpqxrqOlKeWS6BR2qExSHCayZA8+FhnqcN1vvi80CxMosTaVrk8+KaJIoMrgduaWQeUUj+wH9SH7+UR9PLly/yF0/Rf//Vf6bd/+7fTq6++WvusD/tdHC7/f5Hu3bv38sHDh4//6A//8P/GowuguXGkpc6kYaAXU1KZpNnCM+eTieftrSiolrFdY7PFc834z3SelfO6AUjIELK+8pkbi1C0guo8wKKBtOzf8VxSNTaziETTcdanlNHXSM+Gtia/1CInT8Qkt0CjiPGoKCr1wGLxIPBF71cb2jNDrRnubly8vQSrrYGMNPsxjFvFES9EWhsOgr1/2dClS7+yVHemTz/9NP30Jz9J//Xhhz3QpObg5f/u3r338jd+4zce/8Ef/J8Amv+/0Cuv3FlPt+bNc/JEDshIc55tR1e5KNGNqkUVM4M9tNmMpxaFaLukUHrKir62gwo0KELSdEWGD/cp6zOztazSpu/JU5UD380YngFd90Y6xG9pJqd68MOGbRHV8PbjmJZu95+mUz+kZdp/BnBLK6x1ZY5Krewn+67tO72WLoo42+olMKZVRv+JBNW4A0BGIKi259ccCxM90RBR7VudFbH+ingAp5IDzW/91m+n//E/Xu0YZMctA9O9DDT/838+/j//5/85Dmh+77u/9+jp+fn3Pvrwo8+9ZLl1Uv3FixfpV+/+Kr389GUboOL5UfrWaqMZNjQJI/+er3wxodwSbEUN2tuKm1G2b3rvYjZfr0AXIVrPoLSRlrKSRtkCB6hzvTj7cmmE1TEu21ZjIF8bJ2pXproHwD28Wl3x2AdAEB4qNzSCYwJihnmYGRF0bU8NjzgXUhfr2vFuDND4oEhFG9OePpbe/AueHoDtjDiPmLrfCfKE42HAU/vSLzDvULdOsNKepavg81A9Gg7jGMbAo6rhnVP9TwgyW//OVlz+9zIDzU9/uqbOMtDkiIarkO1T3iH66r17Lx++/vDxHx6bOvvud7/76MmTJ9/76KOPPoeM3ieffJJ+9atfrchHBkZ+VpgUWoUZRk7zMnlbCSoz46MZRpnKQJ70DBCRV76OtVi1QZf+uAHXbO0DkQaUW21Cl5MHrLWxSp0QwHfttsFBAFEiLOsa6dJ8S/9cB9JrBoaWk4HAWtMb9W8y1n+HuenmdhuHxsdjtKlM03PGT9YNf4GOUqZHFgQx8j55+SbPmhsPcGn6m3qxttXgC/Dq0lG8H/2i9ga4cX7oGIJV/XecM4v47sSVCIw4QG+sD8yxy39fvvw0f3iurtHcy0BDbA6HFWQO2xrNb7z+G4//4A//4Dig+f1LoHn/Emg+/PDDz6Eb7cWLT9K77xag4Td5f7PX0UFjym8QucBblZyAABzYBHBmxlTaa9u4j3Jt77v/dgwybtY4a0RzOFSjfmB9tfH1x70Osp02DsnTchAkzcalUTc/ZKCUdprOGpDIelVusm9q7dr2Xqey/XBNMmBtbchWH2/wLb28gKW2IyWVPipgKP0Q76GejCU30k4gGvQBfDoQOCQGign2RYCKeCP5WvlMTyKXndw6ok+fZ7veAc29e11fAppX77368vWrrNG8/fbbj549ffq9Dy8jmqZ0y013EQ0xXMa0QLlR2qA0D7a1L0PvFGU3JEqtWZ6oh5C+9NLFmcc/k4uMEOYn0E3h6Rkb1XkW+aWRkym9Yw2zv54bzgMJMRdPuf6S5HXBtzKjB1T3AF+91obX65RxWBGF5IMiMY+x4feh1VY7R5ZuHnCx+nHDjdpK3Xg/eb61trV+k2UZ3mOBD+36arpu/KsDQG0BoPB5UdJ7SD/EYzgWWbKqNVUrmRWdevuT7frPfvazBjR373WAxIHm4cPXH//hHx0Z0bz99luXQPPBO5dA8wbyCk2gyb83I2eDih5heOos0kAC9UdgoKXPVDBNvcEp5e3asWRbUYTmLcsyzss2nuWCQiDJ+87muu+PF8c95w0Z3U4HNomtO7Upsq102KhrIy/IaNcgd3I8ICH7sFbrWNA5sYwvlMe9aWOcXiBBMjWjP7RLqYu2Z2Pp+Gg8FR7lWqGOE/23lNJCQLHo466A0oFGbVRlSjCRMkluB1zt9unbwLImyNwcQPfM1pODg32tt7OV/+VrNP/rt/9Xunvvbnd9Hvj25gcPHv/xH//xkamz3/+9R++/f26kzl6kd999dwCaouhl+4PIDyb9hpc3L/1GfXTP2EcWAGlvJHZyTkNEcpBh6Xjhz4wxMsQubSZtO3nM05IRYx2K4q1b53P2GWhNz5k3RhHgsgDLwop0w47ba6Q5SR3QlIZmf31cLUJBsiyAqSbIAAJUpkYIbBweAJJllsF3gRjT4wDaNINPRjfBeZ8BpCZT8pIANQQ7ClBS+/ENDra+3bEzFYiok516wJ8RB5oP8/bm3/rtCjREL19eJFqjuX///uM/+ZM/ORZofv8SaN7/3iWifQ4pKCMaSk1UZQn5hKCZ90dpCeSRWd51bVs6jHyd3jb3UOkEzSMj5g0APnJO6sWSUznbNkEermvgYs3JsPAH5KFyBAJyrhEfTRc0Zu1Y6yN11eYQzlO+ds7ETkPapKLw5yk1qAtdC2KONF01gzqcMzEPmazPOljGfi9AafXy9ywaomNt3UHbBda3aeXVwKJ2kh8HpPp3A20wpoX9owGtNk4IcNTTAJ+BFw2N8xsUsQFBzmkHIp1JGoEK8trakwOXmeQHNvMazYf0HM29Vyuf3I5vBnjttfuP//RPjwSadddZBprLiKYNXF+jkUBDhG5OBBwej162teRoBkryLOCWEvtHlSvldXK2c1QM2uiFkEHl+qM5sOZEGw/XZ0ayn3QO0HmwAUtfL9BIm1sEHDOwhjyrNzjy5zwsI6pdh5w1mg8ENIMeLHXT894HJFRugYzVX3rZ8v706AHBSgGdVt/Lm8mgskHf7S/Uy0hjmeMBukl+Ekz4/a/dDyoQT5wATJsMkHqjg2UoVzkNditf3xcENB/l52h+C2wGuFj75Odo1tTZnxyZOvvf//v3H7337ntiM0AjmTrLytHrUXojfljzeaZhUMr48egJr6Vdu1x7ccDPmkjPVfKXhk0aN48h94LTXkKG6AI8r4IMRf1N3h+bT95HyksJG2TtnFj9tfFsR6tnpF0foy7lOkNAqI2n6nrWPD4ZQXjPMRqnprc1P8OcTqJaCwQ8xkpezxIgPHxmANCVp97THozzdqzxRscIYLRx1jZbdIQiEcKHQYYiZ+u1FfXOApoP7lAM580RCXW8WWpoiIJSSmORADwe9iX2exkdn1yStzfnV9B89NFHFWj4GMpzNCWief3h64//6I//6MgHNn/vO4+ePClrNHXQbLDaGs3MuMyMsUbo5mgebOoMCLrwZ0YEgRzva7XVZGnGMh/z18h0MljagFRAoqoM6jsZm+wrjaE1Ju+c0riW7Vv1M8CBfOBY+k8mV77UHnRDkdBekOf6k2NjGV3U96p19Zhd49CwHgESVG4ZuQEURVvL0bDkcz5TINvaamCl8ZAL6x2fgVdv+JvsJXUGXrZRIqcF6dmBBatdWF9yoIdxdMv6Fey4sy1psDs8egEAyteTaHszpc5QRLMCTY5oHj44fo3m7be//ejp02ff+2jdDEDzsXkFl4q8eF7eDMCBhk9itS1sclVFdoKPBQIpNaPjNXSaHpoc6W2iiALpCyMNYxyIvAYTgdswDnZxeeRy3jPHod0Irb+WLlvrS6O1j4yMedt+/PTkfzvfs8gEga5G3ZzRPQC8U48cdJ0MfRSj1RZ1mxEbAWA0gpKPDTa9LHKC9kZL3rqF/ePpDw33wE9JeSWKalg/+leAEP0+pBFoKj90zJdDgB6yL4GKjIo819eMdysr/3bXzyJsAop0MtB8kjcD/KSLaDitQLOmzu6uqbOjgea7v/fdR0/On6ybAVA0YUU0yGDz9BXRzOuc3ZhWqqvKLQWdHojQSypRNCLle6On3jseowgU/fB6FD3I8WpkARxqp817P3/l6pR6tLGNaxljumvpAEIbGwRJlScGdn4s5xWN1UueczLz+rUydL3mMmvDAO836tanU1BqTh6j+0vqawGFPOa6mYDUKpqDux1r8iEPVifB6pDw+ZNy+joANExhJAPqZs2RAC+rn6RpPdOJ95ER+6fbrrMKNMObAcoazd1LoHn48OHx25vzu87On5wLoCGvIO86u4xofvVu92aA2eBnbWapNc0IW7KQMbd5t2tsBjScTC8k82ReOkqtaWOxykme9Z0Xki895d7Qtk0exxhcqeeMjzTubTw9OKHzRrz5ehv6vLUlb3YNGCNNdDNqQNLpzYzSel0RC0W2NGaWUzTm1Ud+A4guzTDKa0gDEylXyqi/hT7TDQEToFmd0uKFdPVWKmthoCT58roBjjhWLP1Otia/tsCgOwBQ6+up7/TlKTaPk6Lc35KXn8oaTffAJoto1gA/RzSXzO/dubu+6+xooHn7O28/enr+9HsffvjR54ab67JnDq1o15kcuPW1Qw8hL5MbCeStWZ6tJWe8wMv5R8Zc6uLjZy+YS511I1yAPi+ccx7eSMuSJ+fSM1ZEGshrsnkbZJy5fjwaRuBM9bP3pnlAZwYkfT8clWlzo72dIDPp3tqsGAhkoFVgr8Z51EMCEedrjV0DB56iamWpPxagwduoqR/UXy3fgGSpcAoNdv1N19FMN8f9OxxPgBaVV7Bmcznj0+6bNABXJ+9wGOupz6GlTKmGgCav0XwpRzR3++doeOrs9ddff/xHf3TkZoDvfOc7j87z25u3XWedu3nZNUc0OXWWtzlrobyWJqI6mozugmc5xUFh5Wbmk1xkop1JxAPz4p79Vcg2OOQr1cbtYh8igrNUAX4bgMW7MzZGyI0iD83oqkA2shf9ylg9kYPVxhOxcj7yOqO/Ml0rgQoBpJeaoV+PeM12enujjQy9FQF25dWAzo0WaqM5Z1Y0gyKCNsLt38XQZxJ18Ht3ZtC5fYDAYJRJfbTIwZwzFE0p0YcJnDICgW3FHLFojIDxsKW71LHK+eRyCXfAfZZtz8XFS/b2Zn17893LiOZKmwG+851vP3ry5OkKNJv0Yuy2E50BhoCmnqRs3C96ANFuXuSVckNhGVXcRhjxThb162WP7XrDhKIn3s5rkJBHrfXngAcN8naxdMZxcwQsjxSNRRtHF9UwB0M7h+V37zAROFI/DgQdf0Tshuhl6HpQuRa9eKNpzkeNtDqnqx+f5GOBZT3eeHoi0V6/fs6t9lod0l+NWni9EC7nvo8+yj8cVGoJMNKtGeij6KOt40ga0n8iElPHTv8qoAoB1dADnucD3dwTkNBk1mNqzBznw+i+c8e0+/Bavj9fNqBRd50drmEzQN51dn7OgEYo+MmLT4ZdZ/KCHVMo3f0JPWhRsCUEk7pnnfhYHqpFHkDz9MdRydK18fAhL0Ubq/admrV/2uCWOQTo5pfU9B9lz0C1Akj+LbFeem6CrwSF2YYMS6c+OhvfTq3x4oAiDcshwYyDSjNAVMuARyv1yyQ/w4HH4gOfUl6ka+2qY5DaaZXO4HRswOCq4JX4OaKonvFpSg99O2BjVC9B1n9pDFQ91PGwfgjUpJ4IlAeZ2wwf6LcCZiSzOxcsA4RsoJUharKTmLiSOquvoLG2N2/vOrtCRJNTZ0/WNZrhJsxAo7xUU8uRy3TGHmPG26Ac9zCwHUAj+8E+dLNNvFOUCvGCjOTh1g0Qb0frFpqBlX81g8/Hxc9z5SUeOJzph8bMvz7JeVvja/WHgnRL304DNz4HcmzDecxlsw0XiV93mz5Afy/4zNpoHjOMKlSgsXVDQGP1G8upzDKyqQMBbpStMVtgNZOl9hPZAtRnkA3SaYPePTy09oa+Uid9XBsoN2276GQGNHIMVKIBDWVc8loxAc2Vdp3ld52999578KWa+df6PZr38q6zTwZWKLLQborStn8gb6wHyguvygIwL2lA6eXb98FetaYr4jUYyhLadXxm4IxuyFnkh87LqEuCqTF5Tqx5nO2Ws1KcXuOc3zCb2LVl3LeDDK4vAiJN5jF11QCBNCDiwR2CmQwP2MlyTf6mKTS+KgBtY0PXYwUapDfVMXlaxIEcCBXMwLghOCiAYO58c6S+VngQn4fuODDe8hkYTY9RBm1yQDIEH9AovzTzZz9rX9i8J9/efDhcz5sB8q6z8yfn73xUPxNwlriVy0Dz3nv9czSkgDYAy6OECir1yEv18BnCStGvtdNPkGace5LAuXk03LFBvQ74myk6tYuSp7+WBUdXnrGQDhJwvYZ2np7qryOrLwIvri83EON1pwM9IjkuKUMHY52fBsBkEDznxgIJD6hoelkyazslpafJneoKohVp0DXnqOmUGg/lt+zb/m4t6bxxoKMGh3GdRNu8MOpYrjt5nns9l+ZTWHMFyHNu1TIWUA1twHnOQJMf2MwRDdoMwD8TkL9H88fHA823L4HmKXsFTTMQ+WLIAEMPbKKblJ/kceF3qbvCrJSFdTOXC3f7fHIa328mdSEAkbvRqE0mLWUk5co0ICcVKJhxKXyAwd1uRJl35R/v0i42Pmd0LOcRGWh6FY4EbC3q0Yy71IPPVZdyowiDXdwzQOG85FzLsWrUAJR2iM0j7yFi3gyRem0uLcWqGQ5trD2bTWYeo2F8yYG1xq1GGU6jtT6zw8Y6OB5Mj6SMufu9tbNASdNVylifs+GgUIGsufbWmseyOWoHIN96Zmg9J4LP8IR/Gvki4JL6cEA7iH6Sj+c6G2QIwAcarHLXzQA/+2kFmrt1e3NpUV+qeWWgWTcDnNc1Gjnxn1Dq7JNPh4cR5aCh8AVHE4VPmQd5gc9SVqNsnJKzeLaychFaH26r/LZ/pM5c3ti/5DnRPPB+GnCh+ZpR/QRD7s/WQ6rM7SJE6SXtvCLdUfpsMNppPG+ozAKecR5wxNzuLd+WYkQSQJE+1vVpzYfWRyszPddJ+Qxo5LwOx+Vg4OEFDpSSQtcUnzMNqGqpNODihpiBmwqKHY8lVdW5sebpKgXMVKDzzJmWMqPNA1LHSiyEWWS9bTDy0PL25p//7Ofr25vpOZrK77qBJr9U8+OPP/4c+iAYbW/mD2xa6YXeu23ePDIkCGgk33FyfDd9z2jzRo7pS9GHo70Woc2Mzqycz2k3LAevvUbXijo0j1fqYjkhnogEyUHtpB5eQLHOpbnZgRm9mX58Dq222Oikds2lxMxGv/i7tjmMhkjyReez/Ny5NZfpZepvGHYNiGU9/1tMnq6PlN2BpDDgla/St9bJNJrBs5eN66RMCCzatbC1bdElzUjfstu6LHkKr5KuyWzzK9B8KUc0d7p+tOvs1VdfvdoazbffeuvR+dOnK9Cgm7VGNGKNhi5UrvQwODYofwTQ6tADeMRfM+pSj7VOej4GsHmiqeGmTWP429KIfH2lv7a1CIfqUJlFHhBB7bRzQ3USrLZebFw4spF6mWDAb4TNk3SDh2JsDxSCwjp9zc/yvCVo7wF7L9DI8mH+NmOqzfOMj6cOydWAQ0vtePmj32pdKTDHtP7vbNkugM3wguinB/IxvdbL3eaCpc5MJ2Ew+JsK1IpAbDJHcmyjPBpfStLSd4Ck8M4fPluB5sMP0xe/9MUMKF09B5or7Tr7znfefvTk/Sfr92iqeqwHj2g6puwi5GUodTLeDD0ic4+9n8w8iYcOvCWvvR47oia/ShnGydtJXbgeSJ/mifR+SLGDPQ8ympI/0mc2bk+0YQEo5rfdkBsfmceu5WIL81LvYqyj1FMbVz/naVuL8Z9z7VqbHc94Iv1QvdofpGZ67AXOgYi+psac/gVGTu2DAEQaUcM7H4y1ML5Vq5lMAyTpWLZFW35ncpDMIYU1gJYclw5Eg87G+SgpTKq0+dUasjeOiCkPI29v/vnPf65uBuAv1Xzw4OHxX9hc12jy92gy0JADwBRagSa/VPMlBpqiMDe+KnjWftwAU+TiN3SjfM6X2jU5Z51hlPz4Bcp1QCkkjzHKx3w7L3nVWr8ZcKLx7k1joWPNGdAACwGp1FfKk3PB2/BxDZEq+3AZ6oPmhF9PvMxyDiyHR8rooxryUHE7pJucGzaKyssy/Oh8W/cAate134Y+Ayepg9YGXReobfu5tH+X5oR1L9ikf51GnNfB+l6BUTchi5yoYf619BQ/Bo5DpUNLx2s8Bp1ylzMbuMz+SQDvBph5M8DPLoGG3t58927+8Fm7Z7u3N18CzZ8cCzTfLkDDtjf3RigDzXvvvTdENEXX0VjxE4J3d5VZIyPE+XC+sxSW5Kv36T1w3tcyqtqxDrAtrZEO43oK0hMZD94OzY8GUpwfuqE0QoDKZaIxeqIQDYwQD8RH51eDwM6w6NFdO/8z4ObHUreBbz7VfbCdJHBJOTbgoDkoQuSakWmglrSvvSEfHZcynnBK8FqDIAccWaSf5Km119qtLoT6/Io9H/VY6OqZG8gjMT40bTWjx0BEOgH15zIep8ani2rBeBFYc1pTZx3Q3B0CgQo0Dx8e/2aAb7/91qOnT56uQEOfRybaCzS8H6+XxD1CeSItQJDGQNZZBkIa997ojFuQpQFGoKB52Zy/BoDIA+a/Uepp7zxLGox/fl/dMgf2PurpgVsDmnoTGAAi5Vht2rmg6wdHm7oDsf7L6uqdKvTswYKfT+mpSoLgJTxby7Gw+KE61Qt2GEEtGtfGImVa8nl/Dgbdb6OslDfj6F3QxzKbMe/sMew3GuRhjhS9et0TGbiU1DZNmc6OdfyrEkIHjmHlqKX10jiGjSc65x3QfOm30p27d7prJP+3vuvszp1119nREQ3f3iwnIwtZn6MBqTPksVrhP0fePQZyDlpMjzRkXJQ+/bkjI0SEDIY0xij6k2TVdfovzQedpWhkX6/BRfOI+w/XtWN8cj6xLNnPaj/KJE9X1i+Dvt242I2rzZeUPQN1aKTZzYzGItcLLJDQnKu+HTlIq3bMpuHtvWPEWrTqjtmrfdC548/azPSTdQiYdMAopdLQIpme30iGLKvzNhhpst3j3JhALXS39CD5XZSj1I/lTL/Jdmbp6OT/MtDkzwRkoPniF79U3wxAxN91lj8TcPRmgG9/+63upZoQaMBmgBlZN7CWVtH6zoy6ZUSRXlIuMjyZrHeBeeXxcfdlxUBLoLFIAoIGq5Zn3zwtAxDoghey9bHgeeZ1Vh/rXG2tIZARH+noWM6JbMP5jFHP2G8PeY2wVW61Q3MLjSA75335eJ6lvO4BaXIUtwenNaM56MLaqWAzGXcXTQ3pJMy/41DvMQYYQv+xL5ZjLeB34xGpMijHAJ2hXJtrETWj8jaC/p56uT1HU4Dmi5eA8mqdkvWeojcD3L23fibgT//0T48DmrcugSZ/+Kx7joZ5Z5988ml9BQ26Qfkk8JtYC80l0NQ5OegPLTZeZaJG72zjywcrTy7wKK1Iw0uWp75sN/iBtdU86qEf05zGLOs9hnX03MtOLa19SmP0iWRY4+b90PUw0xcBOzc01gfbtEgOtZ85PBbf3lHp7S2ej74Nv9ZRaopxg7bcY5hn4Gi9Q03OuWwzGMtmv9S21bArhrdGFAcJHj1jBDgI1Gp7zgvU83ILfOp4NBkUlQjAOnR9abcga98hnwAaIxVW65kwlCq0roOLNXX2b5dAsz2w2X1hswHN3e3DZ1f6TEB+YJM+fJZ3NtSBXyr74pMXdY3G8k41gzn9/HBVsp2k4VU2k3w/6eQ1XKjPzAuWdcjDlzcp/z0DNc0wWMCNdWn3gJZGQ/preXAuexiHtJ5JN8jTqGW7gdGWVNg+4TnzOA/wfGxOAQK0Ye6Uhzot0EfzQgbrUELbMgeTa1jzhuUcyEjB4sHnHJ07PicWAGk6Wbu0eqOM2w33RCkEvDYuBpBAfhNg8R5bfDbNKhhIsNH6WP27cfGoJtEjB0wGTKst65sBcursMtBIX/rSl9graLaMy/o9motte/ODx3/2Z392pV1nDWiEMrQZ4GVOnTGjUZk7QEQavJnR9Hhjsg8n7abiBtWKzEpb6PioY59FF61+PYKgpMma8c0k03wzkJkBJHfFsIEqjbRoRSMEwEg/K7rlvCTIanOrOULWtazND8PGvn1qN9vIC19PUh8NMFBb9Be1K3y2L7kKxeU50ICOU92CXFNDbXBuUOHta2GrUw26SBN5wcnUAQDZoRsnG5/SVuXFHIqpPrwdjGQwn1Gn0VnT5oPWaDLQ5M0A917974pohEI5ksnfo8kKkXCp+Mxb9Xh30kAiXqPnauTugZem89aNgBXp7GnvAZSqu7i4Nd7IQGhvY96rBzLQyDuuxlfx8i25s0gL6SVpCpgOXVAUSHz3ODxINzSmKqN6nmspNLAaTzQ/qM5yUjSj29qv/6ptO15bB56ZsPTX+GTiz9JoeiODn0T5FKSFzh0vI9JQwQG15Xoh8DDm0qJeh4WpizMCxFPez9m+511nK9AMqbM+onn9unadaRFN3gxgAQ2nYz1+xEd/0eQ2CYp3ux7XCcc5bjUdlHpDpI2n/KboTr/pNZJyJWh4I0crdTQ8+Ejul+gv9ZkBOupf+vXvthsAdPsEOKrTeHJ9NF2tdBoy8vIYzZ/8hIJ1XimSsuYJG5RiHaRPwceAnDJt3FN5Hm/YY9QnfHgfj/5D3/LD5D+UbX1MoKm6MMO8/WONaQ5Y5bxXS6DovrQCXUeNhwAQupUbWI68Z0RA82//9m/1ORq5RsMf2LwS0Lz11rcePX36rEY0pAARB5pc3q25AMNFCqo3MlPIG730o1lWlC3ie0/E4316QMRLs9TGnpQS4iu9ak80yeXs+ebN3khM6sQvhgFILo+zl3qxheKNn+6UaLrw9qMOPS+e6iJWkDfwNCXAonmYAaYkzWBbEYkEHOs6tQFhsqmg/iEj3Izo8Gp8hxOl6cKNKDcfcuxT4474SaBhdQOfra431L09mYJw7Sv6pXZJoQdHpc4dsYvVPNdCZle+rcd47FsGmv/4j//oPhPQqUOpszvlgc0//bMjd51961vfevTs2TOYOsu/5YfPZhFLuSkuUm9nsGGcpU6gUVhdB75AnaoseTNKQ8RTFuv3UuBktRO4K3rLayQ7jA4TWO+2WdSH5k43dGVuvMZQiwKsSGvmJODzu/47BRZvqk2T7wWrok2f9tsLuhYhQPQaUQSgyPBLOZJXi7pBP5bqsgBPHldjCsZiAY02fo/Mdtw8gwFcGHgM/TYj3o1iYfVwnM1wq2MFRl8CahI6aVuku3OogEnTK43129R096AYaykv6qxA8+//nj68jGjyZoDhw2dbVJOB5sEl0PzZsUDzVn578/m5/vZm8WYA782+ClY8trVseypblvd8SkvUxvK0LZ4WjxnISUPLy20q4GsbwPXfgW81UpsxlBEL6d0b0OJJcYCtFUrKicryf2rKaCkejjVu06g5QE+rl32RMfaWafylDjOgJzC39W1zofG1gBnpx/l7DLqWvoLHSzNiqP9MnhV5NQM6gpTGXxsTU7cDgYEPD2eN/lI/CFSov1ZO/0oAAmBD89H3xyAzRk/bORLZgU7+oT360ea9HH368mX69y11hoCmPrC5PUdz9K6zt76dd509gQ9sZqLnaDLgaBeBvIlnhlj20Yy6rJ95y5YhG/umYflaGiUr4kJ95M1vGd0Z75lcpO/MSFUeh/HClHKGcdFIgNc7AJrClwwQul7QWGaOgGa8ixfXe/6a8yPLzjJAg3zwOP9+AJkRByXZxTqnGjBZRnsd4xkZGrKnmEdvALcIuXWaypM8OqNu8JF6eUDSAomZjl7ehX8z9AikalZD0UEdNwEiS+POQLfqsM3ywWjHe/BTnpdE/j1HNB9+OAGabXvzn//5sW8GyLvOnnzv448uI5rUey75oqSIRgMaTpox9BgS/WbFGSlp2PkJlIZPGibrJvWObREXheVFI4OLfg/8LdlCNw2AOx0UfRHvNk/tvtDG6DHmSG+Np9ZGu2Y8+lgRjXU9eCIhr0OBwJm3kXrMHAfJX9ZLEIS8NySAPMgTFveXZgDRPFK5PY4NZJkMbTxSPgIvmMribYSc1m+UL/U3gZZFEJJ/nUcEFHRvrnTox3BoZVUWu48bnx5sBtuY8G60vG6aIxoVaF5ebG8GoNTZkRFNXqOh1FntsLRc8Ao0714CzaefdIYHGTdvGsND5JXK/DGvJ54WaHjrPEDRgRTzmMF5n45tJstqh+ZD8kFpNQ0AbBq3kGvG9Big4TxQu55HvfMGvhZoa7Lkk/HlnsZj0MCKAw0ankwlkYx+LbC3XR5P1qrzAJQs04x818aQ42mj6stkz9qrYLPx6MsrigKZbf4h+Ex+I4Ab9AY8O7hbWJvDgdkRoZsxJ5Z989jbHK38+7/9+/aFTQto7l1xM0Beo8kRjQU04O3NlmeODBHnzdvN0j7rTWm8yZgbGXnDzow312nm8UrdtXGt5ZveUj/eYPamA43/ADTbRSr1rVtn8/ZEXr6ANy9I/Q3nwBMJljZr7/n5nfC2zmF/7nsnYG3Hnk3h1w8R/DibodcApGydkcjrTKmLuYCHynM7962+GFavsZ7J9egiDTv6Zgoylrv4gjoLnJCBx/oa7Th/8HtYK9HmlIMGHMcYaXSRUdpA0risjgaabAtY6gztOuMv1bzSmwHyu87O33/yvY82oJHK9V/Y7Ld7og+WaUbAmgRuCNDJQIYd6aqBBdrmaxkXb8qHe6nL1o62f1eveVlg7nTQdWPiidSQftp4ZikyqZM03HK8GDS3+1Ck5iwAn0UMHBS1MaH3hXFeWqQj9Zd3yLVEZkvZ0n3VKF+LFGx99q318N/cSUD9uD4oTQZ5Mw/QGo9WJvlwHgjEqvYaOBAfAfa1Xb2W/WA3yGXX1dI6tUxIlTU5/yyr09EGQuX/S7Udy+Z8dPOtpVyW8vbm/6A1mu3tzXxMHGju37//+M+vukazbm/elsf54F68eFGBBhke+g0FGx4iamMZVmSIJD9kWLhHi+RrOs+MgWWIrX5Slgaia73wmng7CS7D3G03i2XI0ZgyWQYctR/5c9TBoCi3ke/RD41HzsPsHHvTfVp/rpMGZOPodT6eNtoceY02LCdD5ey7B2hQmRVRaO0tsNOAZpAFjLylj+SrRTDqeLixZym82dim40jtmppufwb6EkAdNvueXy2WI5pu19mhrc0R0NC7zo4GmrfffvvR+++/X3adEUjWgS3pkww079lAI4+96ZVuAqy2k0GgdNKSdKDRdGnUR26IZpGDDbKlLu/+sTxyyccLkDOPW5sTdE41/jCCSKleoB7A95Dl0Ojg0G5HzXHIN4/2GQgPWSCFo4TZGs8+wGANhnujzvWwrxLztcAAlaO+7lSSlLWNwdLFAqTeCOs6aCBiAsihBwd+fRMPvlZbuS/A6agGJQkb29O4dqSDiRxLV8aCBbo30zamTbPV/ny6AU1+BU35TMC9zuByoMkRzfe///2rAw0yUp/m1Fl+qeb2CppMluHXDJhWR+Wq8ktLn2iRSbmpRp00I9XJO4zbAk2DCzxx+ZvLkK+01/pI/YtI25BZ3vgesPGAmgeA1mPlRuNyLTCc9ZM6WcZbM/IewBvaMOfF4qODDvdFqaSfKzluxBMZWNTeui7RdSP5euV42mpAhse6/quOp5Ztja35WlrBIM+rkyoXAIAEtkOy+e2arzVFDRyZTZ8Zz9KWbA3xOVvf3kyvoMmfCbh75w5rl6+NBjT5FTRHbwbIHz5TX6p5KSnvNrsEom4zADIU2gVteepj6qdXV0tvDHJLJa4DBtLykDUwk+1qHbMfMyNa+yc6ifa2ZDTHUAdhxGbyR7nkvI1zlf9SKs0Com58QrfqzE0MqmXEvWAhx0XX0zFRS884DXkwDeA9kQ5qD9ssWkzSDNDYYHvmBVyPs/tJM4Ra2xkPWYbu1dGw1pYdAKhRwkTXZRmjIq7PQZZpfBUe9li2cyS3KBs8rHKph2b76rlvBaBNAZp1e3OXOmtgxD989vD1h8d/+Oxb3/rm+uEztBkgK5o3A0ig2UUAiTXPlgye/D0V4TDSs3aojr9YsemoG39Z7wIdBZARaQYCzSe/MVFkp93Aso8WRWj9OG80vx5+1jyhOZkZGW2X3d4IaWwD0EfRQz6Ip4115lFP5aTx3JpGa4exbr/Xf5069PexBKeFNeARABlQyxCXujaxUi9eNgXF4mkNYNOnshbJfhh/J+MgwEXIGNorPDmfOsId/bhsPtfZvq2bAdZ3nWWg+aL64bP8HM39q6zRfPOb31hfqvnxx3mNZtyemDcDrEDzyae1TjMM/Gbs6oXX5b3J9nn1o9GSF83aTpw0jTfnZ+mnjUGdC4WGVE9KXapGM4yIRzte/zXbWaAhQRMRPgdYrqWrJUPKq+2YUZpFvceSBtCI7wwUNL5tTH30Jw0SmlfssM09bVSOPGW+ztPVKyAm7znqd6hd7QVw2N8Csk0n6blLY9zrw8BDsRVW+04PKUccW2PMtH4SAaTjLUdF44X01cpJDgGN9gqaXJ/b5ned3X9whTWab33rG4/Oc0Tz0cef6yZ5i0QywLz3/vZmgFLpusGk0Z+lXtAJsrwx2/Pk3hSOppBeM091BnptvKnr3z3cSfJYpCf120OaIeTjs9rWCCb1F0o/1gOLNO2tw1I3LY0k661xkeda/ARsVCWv2fWmtfOSnIdZG60O/x5tlUdHzTh6+HDjZgEIlLWjrsqaLJpLUBu8egAImmxut1pZPz8ITAZeqw6VYzeOQQduSpQxSFmzrEZXtt2wxzoVJaQpu84K0OQPn30x3b0Emmr9Lv95ebEBzRbRfP/YiOZbb32rfmGTlOGDzimz9hyNIkAxwHuMpzQKHp6asbPaaGRHLu36sDx/TRcNmDW9rPmynl26Km/JA7XXxkf3EWqzh2bgRMfyBq1ttwd79uiA+GnjlY6K1k6WI1lozKy0s0mNfxklL7OubY8hsoy2J1oq5UVn2YaMFuKtXauaI4HGsbSDKq87rn/pPtaBaOTNwIcz2X5r/dvzOon1Z4CkgGbrv/27iOOUeodV6NHxI4eby+8FrO0+BUBDlGXw79E8fPDw8Z/9+bGvoHnrm5dA87S+vTkrfsYU5w9sypNkeYmjEqMHYxlD6SloqRFpJOSbh5HR5DftBH+a/su4QwulMoivNAYakJHO0pP1evoeY6fqUbUc2/G2+a/+ETrsIIwR63g+LeNsAen6BunJeeNzQ/pzXtb1i8a3x1ng14rlMO3VAYGw/G31V9sv5fzIp9RtGQ0INTCZyT7bvtWiRTUc1DUeFnBgfWoLmCo0+fdMmLyWseD9qv6iXtosRBxsVBvJ5ENAVGwsP86psf/MazQgddYBzZ1t19mfX2EzQE6dfbw+sDle1Blg6KWa1sQgmqVWJD/NeGppBU/kU8rWf7uTP0utNA+ZTSDIk/IipLdHP0meuUJtNZ52WmvZrkv/molmIFVgcIDmrK0mf3Z9zXSz+urzUUyrG2Sd53oKCDvKUJ3l3HEDrOkyi264sbb4WHp3QAAMqcVDRiGDbpsAJAPpD0GMjLiRepvxhTyJNgPXlS1i5yE5skt9FBSfZ2qq6JgPXr4sEU1+jmYFmrvtzQAyornSA5tb6uydjz766I1+0EVNDjSaoZt9yVF60YS0tcww+MNgRFspW97wyHhZHnPfZq01eXj05OQFmj0GWpZ5ABS1RXpq8r1pMaTL6Dzsn1ueOpD6ekFlDzBoutPN3M5ZSjyadafSgBPTyWLerXXeavlS+ujAMgc1WT7jYxnqY/jxYw/Y9Lr0UYTK19KfHbucANkftmnjqOc0NUCwZEK9eF/NpjBg7OelB5ovbq+gqVia6IHNDDR3Xr7++utXeNfZW2/VV9AgZbvNAIqHR9uArYiBt/cYf62fLFcNJdstIw33Xo9YNUhDqoGncO20FtJHA0DpmSDdhvEjPsox/UVpRzsaGo+1cXO5SH9rLjwRB38nGnI0NKBBL8a0xqrJ90Z4XR0DF+ta5n3kePY4PJaxrL+ZxXMDAUszlD+6EXTpgMaxMR/4sAhgaRbc1teQOwUHAWZeebPxUJnMKmnUr/ls/zhl87o1dfaf/7nuOiOg4cTfDJDf3nx0RPONb+TtzU/b25uXPkzLHz57nwGNZURsA16msRs88OI0mkUCJFt6lFN+AiyoX+M33700AxVvG43n1GClOZhYxnY2NktPb5u9vDz6QH4c7Vkff0pu5WiWr9+B365l+eaHqhtYk6rtumuuX/SXOqPrQMpDfYvMwfaYBla7LmywKmOwdBr6tI4uo0r1vB/Xme5XTWaVAfqr+pHZl3qC1NzsvOwFk2nZodcLOSlL6zjw4vzy9cu3N6O3N6+pszt31wc2j45ovv71rz169uyDdy6BRqTOCtFnAvI2uDTcsNyLSeJmtHdbUf+zM1mGaQZwuA/XzWdoEF8NbJozpwOLdQNz3rPoBXnmWKe+3pMilKT19Z3TOXFv1NsLjqXaAhuU0RhmEYTVbq8jMavTZG9Hmq0Y+GnHe9tRnZxzdH+sZYc0pqmYE2kZzmW7iRb+bSCBkH7Qw8cdSCT+MbceNGbzNgNFJF+bPwI9HSjGDQYjD9xG1U049rmMIpqcOvvN/K4zBjR0/RegubNGNEd/YfNrX/vaow8++KBGNEVpWiDOQPOifo8GGUnqMzOmqJ3VlrfXvNixrwrgbo98pg/i1QxnWmfbY9CteTgGFHm5N2Lg/a2LdQ+IcBmzlJPF19KJ90dppOox7tR7kJFZXPjHwD1m6zqWZAHO0borxxUcmGytHeKB7pXBoJbC1nm7L44BCZdurULo2mo1UNkboahjPEZvc0xALyATpe9WEuk0vEliWV9BwzcD3O2AJv93sX6F895VH9j8xje+Xt4MkHedLZTrbBcPvRmAv1STtOD519FzGz2xmQGceX+orYc/52l5qJwH0qcYn2LANOMu+w39VyFpSNfN9EZ145jHHWQaoNFNeBBjyaR9JkDyIDomFcfrpfFC/WSK5FiQQvogR8ijkzYmqeMMxHG9fv9oBsqqJ2d2Ni+z6GGdC/as0jBWWnQ2jPD4sCRztgVYwP5CL3n9ddf4gfEURplsHd3TrZMhr9PnbBiHxqPWewBViQa94FYjTEMX4pgfyPxPADQULdFmgPIKmisBzTcePT0/7951liewnCMMNHr6ZBslUgLcfJYhGmSgtZTSYdDL651bHiaSLcdpGSkVZAB/rb9GdDFaYDWTpwHumJ5iNyHg7wF3q98MEI+NiuT4Zs5GbSM2B5jnQqQiuOe+NypFemsR+sz730rVvt4oBpXz55EsMOCyyKmhssGAbwPl18RMlz31yDHtQEbjweqHZ1VEXw0QPHquuhFAMzuHeKr8lLFAHdh1Wl5Bk1NnH7XPBFCzzQm9ns0A+V1n59sDmynVhzVpAuoazQY00lunMotmRk9rK9tbN4ll2C1+rWIeZewxINNxph6S9wKNBepWv7WX4xxYukAPXkS4SA46f3vTchY/rpPUs7Wl/GaCXuPMCUCyZPSzR1dkBC3ygIFVrgF91SX1BgP1vwpY8b9y3jw8JWipcjpgGNcyfJFXFQjlccAZeNNzLiowLN1EQz2YfL4VOtF4mPyOz4GQROHfbtT1U87/+Yuy6yyv0bxKQLP5W/wzAffvP3j8F39xZETz1lvfqp8J4AqRN6W9vVnziMsuHGlGFcWUi0vyPmwTV+Zwnn6TvKz6XoaPNOO7v6zME/dqqrmu1+rcaO8x2F6w6foAL2sWaVAbPzjTNQf415sHy5DyeDvt+rJ1wdEPT9/tGZslR+qD7qnhmk6Tm9rgxXnOIhJUpvFU25cCFy9eZulnRSsmcBi614iB6dvqyf4AoAG8PdGFxUsr88y97FvsylbSDyeViOYi/eIX4/Zmfv1nm37nzp31gc2/+Iu/OPJ7NJdA874AmnrhX/7OHz57/7331+/SeDw3TrO0inXDaoYUeUGDLuJO1KKvGdiMcjlA2NHWMNbtRHvAAc2zFVVsDdTdanKMlidZdWMj9YBz/s2/W6OlgCgc1wzqzEGQ49oDGnIOuF7j9ba2VHlKXvzYQ57rUbbbAzQzg2tF/n0ZfufascelrPBlEroBaYbaC3gesBmMODseopNlbGPJJEuxtEqTL9JV9pXnQeNRgaXKTDU64TaIdMkg8otf/KLsOvvN36ypMwk09IXNo4Emv+vsSX4zwIftzQCrElsqid4MwLc3a4aQni+YGVPeRzM6/eylwaOuVUKWB7xmnqg0ApZh9nvsXO/eVByTYkIgS/OZ6YxvFxU0TYsxC2wZJHnBcm/TC2hN7yLyGKNt6aUBzaYBAJo+craA3qOf5ZlbjgRv5ylD9RYg9vVkiRxGFICU6VkvIBLgPEoBNOKj0Rz5uHdnaQAzaVdBo5YLUNwBtPU3T9umVlTHpALd9pt7SFwWS9n1OrSEgNSvAs1HH6cv5pdq3sURTd7evKbOfnAk0HwzfybgydP2CppLA7XQRFz+ffHJi5o6Q0ZAM8q8nedmRcZVyuqHpEc0nhtYEvdiOwPJ01kGWTeyFenI35nyOtnFDiD0ttk7J7LfvC/dlhMdNsdB44uM2Sw65uSJuPc6CHvkS7IiuJl+ppF2Ao52PKvzGlHkXKzlpTKVe2p0fLgRtwCgN+7NSnsjHHy8cZb6UlvZnuk35S2jIGNsXBcOIPB8CL5sJnrwM6KlXofLa+kSRP6zps4y0NxLPHNT12julM8EHL1G841vfG3d3rx+j6Yk7ro5rh8+Y2s0CFyQodC8bm3gsxQNetpa85pnHjjij8Y2IzR2WeZJ7/B2HiO0R0ei/HBs7mJFS9q585xHCzy53oiuYsgt4v1n0fNuAE5pWzD1L+YjvVC5xm/m2Ml2szJU3um2kKfct51FOYj3TH5fz6LN6sn3DsoMaAbgA7+7CKYUwLTaQemvjUv2QYAGwWcDm1lqzdKtybAApzwsT28GKO86K7vOZKaCgOa1+689/sEPfnDsrrOv511nlxHNx2+sUddZj/KfXALNewxo5OeNvYZgz03ebqZ2LrRop6TqsC6zm98T+cg0TG3Lw19gYK9iwDhphgVHebmezcckGpulmFC5F+Q80YrFj9rNjC4HRcQXAQ39nUVDCHTRuHOZ9nLXbnxL8Vrp0kFgjmn/2wFQGTS+7BpBc6Z630658N4BbQdDvCyYd1Nit25SL/kOM+v6scCN66vdQ0ifnger637250cDlkE3th7Dj2X7vJuY1mjyZoBXX73X3Uv8pZoPHjw8PqLJn3I+Pz8vQJPkBJc3A/CIBt10x3id8z7t5tKMkHZDWGCjeenHRjB6OwLK6wGePXoiIJ7pjeqRkZZ1s5sLGV+P/lYUMtPd6jNNO21es2bcpfPjGQ9WOtUMheeamkUDU3HAQDJfSTVcVlQw8BPgiuVzqboRtoyzNp49xxyw1p+TtR4JKnv0ZD2HlDEai3ZdDfoYEZ7at05/aZvfDPDLX/5i/fBZiWheTXRhZj14RLPuOjt2jSZ/j6a8vfnjbnsz/aXnaGiNpr8hdDCYkbw4R6+3O58qeKCToqWCkLxjQFIsRdhNFU/pKvMllZB1NH8JXNSabA8Q8f4aMEk9+LEVSczImjcNaI6R08bWX3+y/lg5MNKZkGlANodm3k6ro/t9bKcZvb3HnjJpwJEuqG5hRhPxR/UIaGY6dUCzlc/AqtSfrTFJEteMJrMrYxchP6bfB9HfBOUe3yvJXWevvvpqrbtWoMlrNOfnz8S7ztpFRrvO0BoNJ69HZqVReNnMI8X997/2hs7APDU19t1jxKARrt4zat8iIqnPLDqSF6Kmb8cHfLVSAnJpWP0dla/szx+Y23udSKPOPwcwI+854sYakXY9SqDh9zLu03so7mtoWcyb2NJNq9f6cwOOAAwbaLD11gE2fDakDtPtv1JnYUjtqKGOpAcQAUoW0HV9nXVoe3GrS928ckCzdKBy1waAjV+9t/IyCKXOnj9Pv/mFL3RvBsi0As1l+7uv3Hn54OEVnqP5et4MgIBmMw7ygU0UPVjRSacIMFyatw+NXPIAByacMulBBvHxppuOioycPOS8cPK0t1Ji/LcF8JIPdwgs/lIfjbeUPz3PB89eQF3ObAycvCmyGdBUQEL8ZmgHxiH5WgZviNA2eS5A6DuOOCPaWHM1jWzqb7zNHP22nnXR5EJwBX152Z6tzV0/AsJagfvP9IHg0w28wucgS5NTI5pLoPniZUSTtzfz+4F/j+bBlbY3f/Prj548edoBDb9oOdDMPCc6tgYm28x47gGyNr9SH+xJYqPGPTrbMKKx7ElLSQ+j8t6sghe40AYNuoikvpyg0VNCbO85praeefH01fSw5nmW/vLqJGXtuW4teSjltneOUF8PaKC6mTFHdSUzq0dNfP41p7Fd6sIgN4uaeORc+4qUUpvPVDtLXoPRHgBFgNXWHoLP0rXq+Nkg3fryV8rIs67xknoiUp0QZTNAXuj/Zd7ezIEmtQ0IBDTrmwHu33/8g7/8y+M/E/Ds2bPvPd/edSZvUA/QYKEtXYLazwzG0Ha7aLzGQdPTA1qa50vEXyzo8Yjtcfk8c8vQWxEB6ueJQmRfS7ZlQImsN0K36218zZAEC2S0jo1GBkBkNxgaQzmkZ0Jk3QhC1nXh0Z217uQNRn8dI7XDcqYSnCDliQxg/Xb/To00Bwc6HrtUAOjAZSvD8g9be8OIz0CC8Z+1pTKk07RuFjl5wAZ4WehcUUTzPKfOwJsBOqB58OD47c35w2dPnz5751LQG9xoahGNbIP+aoM3DRkDErk1D/XxpLssmZrB9Bh0qkPeiEUIEOhYlvUXV7v7VJ3YhWWBjDqWRU/rWJ43927ROL18tHZW3R6A9wDrVcgbXczGZZ0z2R71O5BBFe1MWjaQPYzbtLtIwmIhDHDVpy3qqbxmZcUoNydAkzmUcYcFyEdzDn+LCArpurSD8mdIaZHjvR3VdlsfAahTAOeO/IFQnLFQ55RbrTz+fjPA3Uug4T271NlV3nW27TobtjcT8c0Ae27OPZGDJCvtws+9l+RFugeABk4AAJHRRrxmc+LxgDlfZPR7uaO+xxpYKzLQ9EVyZkDWt4X3y1F6WuM+Rg4CPIuPPDd7z0Npv3Lo+CmtoR5an8Yb6y9BTfKaGUVNBysqMCOGhRlyT3tWtitqYb89sqz5RbxM2QIEJZBpcjTeWlkGkV/+4pfp4+cb0ND3aJYW8dRdZw+v8BzNN/IraN4v25v5iaC/L17kiKb/wiYyXNaNZBl2onn9+m9XtycNp9WjtjpANB26ehGBaWP3jPkqXrYGeFyWBnYzINHq9wKQpveQpkrtwkVe53ANXhzU9+Fdh04YWMSusy0iIJ01vfc6bBzAkGOB+lBbrwGueqVDNeIzj59koPfqWecA6UR+tmW0PQbdKuP969iE3LV+mrpKncGHINI6q3pbQIajGKU9G0N/neaKfixC0PoKml/+8pfDSzWJri2iydubnzx5+s6loDfWAPWshFc0Hv4KmhlgaDfBdaYo0A3vi0bs9hbIXDXdI2XM5FjHFljNAFiVvyw1RNTO8d6oSAPY3dcC3UWGHDdfNs7SZ7xvpc7Hgr8FzJz/nMcZBBkiy7h6gcanTzkRElQ42KJjryzVGM8M+o7j8lOJLpTF8kFP1tcCYGqntR/41ja1tzIGecGmYrNF6k3lv51Hap5B5Fe/+lV9BQ3+wuY1AM1Xv/qVR8+ePnvn4+fP38hNzzagKfqI7c3iRt1jOGektZ8Zd02+xcOKzKy+qJ/Xo9ciCe+4vVGcFsWgfjOjJz1w7zn1zG/zKMu1pp9jT5q05Jrl+gKSK0mL/KqRmPTT+Jcy9r4uo502/3uvLeRIeYFmVkd0xj9ffEh1nWDty8LQnhePT+3rbRZFuaIJAC6yjg1BlzUBZfkKm67N9s/SdkC0Nv10uOR6HIRuLoAXhXhwoBkimksWF5f3VT4feTPAw4evP/7+94/8wuabb7756Ne//vW6GSArdlaVKcinffiMab8OSjOkNEAviKCbxAM0st3eaMei2Q3vkUE3In9wEYHHnshhD5gvzGKjHnsNHr+O90Q41zGXml5SxlXOfeG19lblHbZJWFI/B7P0FpovL6houlplFm8ERPx6RO9Cq7+FMRu97VbvNaQm0GwGGjlOpM/CgdDg3fBnviFgSf09Q+ClRTFI58ZrGfRT5wTxm/XZ5uEg2iytQW2bpzA7aCrQpAJE1wI0X/nKlx998MEH73z88fM36kSwXjl19uTJEx1okEBpQPkOiTpIfQ1harAZWemEXVEDXVBOPZAum0apsSQ9CI+vB/ikfO98WYbeY+g8QIh0yj/Lm6OPSzvyG04CiRXBSON/1chhRuia9s6pHV1KU8fmOdk3ODLKjSs2elKGptcuoznxrrlBHI1kkWMBAvVdlO8wzceSpqDInbUEQAM9i8MjJjX6mOlF8hztrXGNlWWNZgY0tL05A83xmwHySzWfnH/v44/zFzbHEPiTvBngib5G03T2GVAEAkSz9Mw8zWKnuY4hmoo90QPUqXpcI7h28q7J6HH5ljwpW/bhfLwpPpwiGyMp7mFquuVyvi5gtZOeq1aP++P70RsNSLA49jzCdJcSVXiATQOadV6Z9z814pMxeYEE1WllVO4FtO6Yok0gF0YiyZ9G6wGjd6K9ICbtrGdc1vVUZRiexziPix3RbKmzCjQPLoHmB0cCzdfyczTnT9cHNhFqds/RJNtYrLrtSPVYHqnXsFmyZvrM9Fz/JnYh7uBVeKy9tmus7R7ak+7S27aty3sdAO6YHSf7eskVPTJj2/c97ViuM9Xn5SnPqTRypbzdjXStNe9X15UDqgXMPqBpbwafAUlXzgyJx0vXwMbr4fP+e6IwXt5HK0CX0nj4Pa2rv5ulmQGxGaVQW0ozJpn262WvazS//FXd3tx9j+ZQIpqX62aAK0Y022aA7338/Hn3rjNSMQOMuUYzoZmnCRU+AoAQD65DX9cbpz1RlaYfkt23aQvDnnSfR05pQzyVyiPn+yrtij4Tj3676fc6JnRz7CXp6EneKKKherTJQOPj0sVIXyL+ujwyI+WvBk4aL63MW1f8qNGbl/14qrNnklqqfqIjGhuK/DQQKXVXM+ZaJLQ66KD9wBP8rmXVUxh5cTldf5bGkxewukWbnN8tS5C/R5MjGv5mgGYDaY2GUmcPr7Lr7KuPnj3L7zprQMMn5JNPPq3P0agC2EVAHg5ectZJXkhalKTdTMd6rJ4oS2vH5aKbyyNvVj6rs2g0phj0UbSAUzhrxyPBZrwm5BxykEcfEqM+1nxMAe6QujTUcI3levIEgRGVuu4leY1z3to4PLIsfjgawTwQP62eHUDA0VJ59Tf1nehiya4GF7SHYMJkamBTgbG2bdeuBUC1L5dhyNPur3ZM/ca0ntYHjYe3PbDy/B8Hmry9+RJQuvNHHz67c/eVl/fvP3j8w2PfdfaVLaJ5/twPNCMA7AcWiyyjjQDpOmTJm3QvX23DwzFUfVTmCXpfj38d8hFPa36u4zxw4uPWwAb14fog/XXDSX8PFYiQ0eV8rHPh0dMLUmjtZJYm1aidOzr290Xt6u+FNtI0np2eLHLZG2lpkYxnTUkbkxYR8QGobYC82jZN1nkoqiqNWv0QjaT+eKKLVmcC/hbxZLvybl6jWV+q+cV0997d2qYCzeXfO6+88vKzn33t8V//9V8dCTRfuwSa82fdGk0PNPr25mOMMuWXXdc1nQQHT8tbuK5oR5bNDOweA4zaauPyeNXSOG6laY9DUM+veF8Vyf5vJwME+ghgdPJmIDGbfzTv1vzPIt2luql0idsPElt6orqrGiXP+wY9Rljqtn4qPrWxU90sgpJytbbaX3ntmEDE12OELAgwhu1xAVUpMMFzWSpUp24BptM7tQt/lkqrQHNI7767bQb44m+me3fvsevy0O06u3///uMf/vCHx6bOvpxfqnkZ0bwYIposSFuj4RignYz5+oKSRmKpHITKeww9kRcQZn1UmezGGYpUwPQZ/mMjhlk/LVU5668tzB+rF58FzXud0dTz74VAz9NjwAkUuI4efWQd5+uNJjRe/LU3g17gupw5J7zNoF81eDovNK/SKHd8WcSj8toM51SeAImh7TYGS3etnxmtTMDFM09IR62/OjbmILQNELXTwGONaN59t71U8+7drk0Govy557v57c0PHx7/9uavXkY0+cNnNXW2vs6g3ZU5otGeozmFd9su9n3et9SJkxWVHCPnGO/3KkQXhBcIPKmdq+h0LPDx/qSHyhcYSNTfG11owEW/rQX/TlfmNMzmEOk0T0EO9qCCiT96XpiaO7YkTxw82MeYAzTnM12kkfXKQ+1UsFTkWcChOZ08GhvAYuOtg0Lqx6roosmFPPlcG5sj+Ljk9mZ5f+R1HPpMwF8eu0bz9a9/9dH5+dPupZr8BOU1midP9F1no3fq83ZRdELHY1TRgwGSgaIqzZChm38Gmha/WVsrErOMdk1jOMYm+5Fh4mO+KjjsTRkio0n1pOceuTPSQMcLQirfNLmJBL9Me4Dem+7yZw2cqWniw24vfqdNQWEiBNXPNnnIyGEECNJSyCLvnc3T2fbdIBmJSL7WeDTnbqE53hl5dAA3SX9Z+kBbhiJ1sHasAc0XMtCIL2wetu3Nd+7eLamzoz98dgk0+TkavuuME63RZFS7TrIMCLoJZd3M6A+GphTCtMVxBrg9xyLl7zHKnrF5+h0zhgbiGiBQxmIDDmqd/7lIkyvr+vQ8FaE0nayDKdVSMTW0e3Qo5AcIiyyA0O4ni5fmFK5/lLcDI0DwRD8z/eVfec+j6AlGHOvF3VQsIIfH0o1EBUA9Gto1Ri6DS2bNB9lpzMmgiE3W5//mqbNtjeaVOy/vP7zGXWdkXUjRLnVGlmcnIQM6D+uz5zM+L4EuJNV4kYekGP09YDPKsp+LQfpa5VcxwtzLsr6745GBbsg6R6VBLUd9LV5YYBo8UQ/xaEmLCPrzTpfvQTUo1EaeaxlV83o0V3Pd5ym1ri4d6hqGlQa07gfNO7bOEY8SLB1d0dnKqr2J2qMb1GnBz5nMohZqZ0UgHFRlPXdWYV+rzogmYMTRGk/5IUL9Ox23C50DTX7V2Oc//4V0754ONA8eXiF1lh/YfLp+ynmMaPLv6951BhVUPK0ZoJhGnO2UWstKRWc8PN4cN65XIcsI8RQZL7sOouuK0mmItzYX0hDJOUVte8ZpcvVN+gviYEFAX6MtFHlw3StrHWioj9RnZmgRDwQkVllXL1xUSyfe1+M4zYz64EuSYZd9gIG0ZFC5t702VxL8rD4yakFtUR/LebAjmUSIp/JDPBKpOAFBRBqvg9GmXWeXQPPyZXrv3ffS8xfPhw+f5XHzzwTk1NnxQPO1r15GNE+HD5+RsP5Tzn0qhSvkpav03UM2b3kqRjKBiF28Lq9d0W1muPYA+QwsZn15W3RhetOcx8zHTCepg+bVe4HAK1vy0qKHPdGJ1m42777rsVzXM+NY+DW75onK9gKKVm7NiWZY5djRh9Ygj1Lg0rFeT6yPOg7AV+VXgRo7N0guklfa9Tzs8ZUWDaDpMul5ZBDhQHMnr9EwPhcvL9b3ndH3aI7edfaVr3750QfPPihAk9U4609wBhi564wGkVJ7U/E4UB+IIG9xFrnMbgZ0Aw9efOon5spbdtMMuqThUK+RTqe0sPFc/i+fdK8h9Rh9Pj/oo1byt3ZDyWdtDi38UHlaukkv3TM+dN7dxtrQj8/RnrnnPDhPa17VKOeaaI+h7+ddXz+yvXy8ZkJk1TU7szas6TF5Xi0jL2Wg7EHXBy3QT8AKAs9Wpr4Kximb6od+zIBIcEWAginPxyXQvPdefQXNsEazAU15jubB4x/+8Og1mi9fRjQffO/j/MDmBjTsMth2nc0+E+DLkWCj0ZtoD0Dt8fRZp6PXl/47oi40JgRG2s0lz0BpZhsqFFnN5tYyjGhcGplpqUMCb1lo4yn8U6I1vKsaf9SGj8VLGjBYUY+UMQLN2sLU0aundyx7IhUEKlPDDICGyj1AOAUaZW2p51Fawv6T44EXAqcmBOpv8dJ2iRHfAyhTIxvRngPR+vHzy7nRgCa3O2yps1deeeUyonl4BaD5yiXQXEY0eTOA9GplRNNFCJsHq100fIK8qbK+vgEQiky8UY1HbkfCYu8FmmO8X68cK1cvQcmKCGa6aV43l4f00CJRqZt3rHIe0Rgbv1aH9IeAljAvpIvU3epvAQ6UTYNjMnq5Czy3VvSj1XvTfzNQ2VPO+a8vczz0KdY9kY5Lz02OFT17QNNqr53nHsi4RmAMPCoRnSBQkU3UQEgBXEmtXdkM8N577+oRTd7evD1H8/ASaP7yakDzbN3ejE6m9cAmcec7YuSAbI8dPzEsdTgmotCMoGYQZ7L2As6srzV2Xu8FLNkeGjU18OxBnfOcyYPcwHiO4YMiOtSfZO6RK+fCMkrmnAJddD5lPMc4LxZpY/eApqWLZkQRqGn9acfcCK5tJ53GS5Mj9Vj/Sy0vwo30HnDkUYVtoFtEoAMNgUmqvGZpufJTAdT6rx9orHKat7JG8+76rjNze/NVU2f5OZrz989LRJP6icr/WV/YHC4EsM6Bbs7ZxY08UK3djKRnr92Qs3TEXpCRQCJTVIj4/Mm5tbwn7YWb1hx5+FuExueRyb3zw5YOoxtIM/B9YTIAomyfPcYhmIMEjrQtfto1p837LCpChpfOvXWNHXue5cOVxwCN1ka7nq250mSdFfRWdZtFbBIc1r/bdabNlxlJIJAAwOcZGyxj/Dwya3271RKlFktE06fO+Nzz7c2v3X/t8V/91ZEv1VzfdXY+fo+G/uYvbD45vwSay8iGT9YpPP+bRGX8+maHGVnpkz0G/br7H8NblSm8Nc+nBjxyCYCO6euVbUdSukNyVUJRmjdi8vH382hjbDp5ZXuABtWZ0c8Bb0jRZK13aHXy8atgeB80x179SF61gey3h486Bjkepa8LLMXFNehIG7hY3cuXF+vb+XNAse46Y58JyLQCzZY6WyOavzrypZpffvN3Hz374IN3nj9/8UZTnk5CSZ2dn5+viuz1mr0kecyimb38uBc6Hvn4ZZq9qp+f56sAwjSak0ZdTYmNfCtPZx/SwzuWY8atpVeRZyr7yH6e6ADJ08CK0ykcB8RL01fTAZHnvtR5Lfp1vGivv9zhkSO5AjCI1jEsZCRHHh7wIPYoCoDgwaPXpW/vHddo5BuIzCISVF/KkT6HNMyOAoZcDp3XDDT5FWP0PZpXXrnDWXRrNPk5mqMjmi9/Ob+9+emaOpMnOf+mNZr8Vzu5s/z2MbQHwGR6jPe/Kmhpso4hNCY65mkK3k5PcZULTDNOx4IK16nyo5tvJ59dxO5tHtGgCKDXUzgRNBfG9k55vYzGtGNp8kBlmvfJz6ks26O/RxdEFgirHjM45zNZQ70BTqh9/ZRA0p2HPUDDz3eVweZ36EfnxACDxmcbnzInR4HTdtHPAKnTXfRFOpbfCyssQJKfk8xA84Uv5NQZiGjW1NkrL+8/eHD8ZwLefPPNRx988Oyd5x8/f4MmjF94CGimtPSvfpF0yvRPU+FqAKOB56l0RyDpydPv4buXuCG3biSLvw6UsmHqorRZtGHKOjROTT/spWtG/brTWAhoOKnn+aC/FDK/wh0hohYNoc8JWECj6Qb1TW0KrXPn4YWcRqm3qmtp0DkpCGikLI3PoCcy5ArAwbERXwITBEQyBWaAFeQvdEdtDlubQwc0Xxg2A+S5yxHN3Tt3r/YKmrzr7DKieefjS6BBk07fo6GXalrRjOdiVcFnU/QqhlHqoN1wM10HQyQufI326u5dR+DAQ3L2ksdga/xhX7koXxpOxyP5y+uC+Gh6oH7yt2zHgcaThqp80njzIHnWWLVx6obU9w49ycMaU39PsMxQwvM49jEMqGF4tSh76tkrQKORBSJcj17G+q+prybbasMBqsplQuscsGN5M8l5n+nlAUo4hxVonlwCTXl78907d7omWfb6HM1nXnn52v37V/vCZn578/OPnn+OdiJw5bS3N1vAod3s6MawUiMe8gNAlVi9Z8vgefgfE900TzVNzsxcnjdauM4oTJXJxmOdbw9P4pHEZgwPUCGeKP0i9Zzpg+Qfe/45aYAm5dFv9Jp9rOv6r2ncpR7XVVfTXjvehbbXkFY5osrr/cNzCKKM0rZIGyONrVwZi3dMM+e8RiCibAYkvI1sT5Q/03z+5Mnw9mYefed1nDt3Xlk3A/zV0ZsBvvxmfWCTWvOMKv/C5jA5It1xHTSLfE7ZF6WrZsZSeogWDd60YmEs47cnwuIykUfNdUG8vBFXOejHoo2B5HGZpW1Kk0t1a1uEedYwtOhFm7cZSFvRQx0b02uYg0NLg3kjapLDN6LMQNQDfsgZtHRINDrDsGtyBIdqM/YY3msDJxW0UveKm1lfy8HT9PJES117BKSlQfdbf6anckmbYYcOWd7stX6P5gtfWD98RuX0l94MkLc3//Vf/fVxQPO7v/s7j37961+LXWftgpCpMyjAafS8QODl56FjwEfeDJ6oTdbNdqj1fkohiTvSGFMZ/zsbFwKDA3luQ+OmwFXSdMfQntReJnTTygigN8K9Q9eAu5WjMUueHUiwU0gAuGmTmhM89u/lHwcUVT82uCXh68EyirLdLNDea8CtdnuAwitXc6D2gtAYMdTSroxPtwc4NdBRx5MaAJr8DMdr5ixmoMlrNJ///OfTvbsb0LDn+daIhoDmr48EmrJGwz7lzCYiC6HtzTyi6S/mPvc9M8B7AWRP2H8d4CRfZHkUB2d/LWVk9bXSQIjnsWmzvf18gNybMdOIKzpJ3l7dMvAjj1yTgYy/BCuklxp1Hg5D+qMxSOpd2p3vrVmn01ahXXN7z703GtpTr12be6IY7pZJGyXLeP/+3BROCyGEA8x6fqQJpoXAHvAyd7kZMpHcmU6drDTOG3uQJuX3BTagad+joXm7YO86u7+u0RwJNF//xtcfvf/e++V7NMs4CS/yA5tP8GaA66Y9gHHdemRe8j1ve/sPF85STronp742B570Vck9T4oV1Yxrq9+3K4x0MvuzlOxsTmbeGqqXoFb4lluSR0AJ6IDGs2lSjX0Bmebt9nJGvcf6ERBnkddszBpZesmyYf4X3zM1e6IgaX+stKqUoQGaJVMa31kkpelMc8PfUuDVd5eeic2EMcd7nHMCGr7rjO6Ji4uXDWheuwSavzkSaL729a89On/yBH6PJhNtb77uTzlf1zMZewEnG7Czy/+hp9j5Qqu2xqAZyZlBpvaks7fPjB+KBuTU9npzH0fXDfcVtJRdK5YhtqKvGemprHlksodnKW9RgT2etXfXnmhmtLUIFJ+THvhkf0lFLSzPY3T2np+9UY1Wrhlube5Qfw3UtIwBPD6wzxCUCpe+ct7rMbsJrU0L4/gPFBKN42MGA8oVZZ0sYWz49Zfte/nC5ufVd52tazSXQPM3xwLNV7/y5UfnT5+tnwlAJ1iu0XhSHDPifa8zMrF4lbq0hopS/+tIL5HYxgYbdC9f0nneuPf+NYD08JtFALIsA3NJSenG6tgoxJtCk+dwlk7cwxelgzUgRmlAjb+cGxTRyfUdNA4pj0dEKBrT5sGOtlgktXG25kNbmJa8pTOkGXSpJye5A4+36aKM2o7ClqKnqmNhAPlqsrQ6ODbSJOuxyI+4jR64xavTQ1mn6a5JDlZLSSmfn+ftzS/gczTlFTQX6c7dq74Z4CtvljWaj/s3A9Df+vZm9q4zOYCrEo1/D83A4aq6WdGLRz7pMGwKYNeRN2oiXqjd1EBQ+sa4+YfUkXPNwCoj3TxpGe08mSmi7R80pF1ArZB3nGO/qt1wY8M1lgloHuMcXMd96X0zgTdy4SAl22nj1MAHgQmf01KNvXfkTEPZYE2l74NlaHzbpTDKHuxKE5CqlGUxgWQ+nk7x2m4Fmifn6xc2NaB5mT/lfOfO+oXNo98MgIGm5ZvpezTozQDDBX1N6TAPXTWFInl5PfkmG1/wnFC5TJd1HiPyig86SKD2WOY8LaJ5hrNowDISnGfXLo+pu2fGC8eaTxxt9Du9sKc/jk8b4945a/3LeGTkgUga2Zm+x4PfcRH7OM8Y2DsnRekr+Y569fcy4iWNu+RVjomXAIFD/4VOzk+bf2rrBVMXILXCoR/zC1nZVrosYKwY6HoZ2ChzXvQuy5w6o085k4z89on1U86v3FlfQXPF52ja92ik15AVyKFV/tKmZsiuSt4bQUsd7OWFDNFVvF8s5FK3sxap0U2K0g+afm5RYF5SwnOz1VRHAs2nN9VU68/YQFNLq3kimmMjNjlWpDtrmTxAxg2mFmkgeZysBypngCfbW+XW2KXuM7DzkNXOdEA3I+/pjxy3WaTgac9fvWOBlUevvj6ltqSC22j6Dm0qQwROOJKZyVs2BbVIKhMBTd3efO9ed63xNZoHK9AcmTp7883fffRBfmDzxYvxMwGXCn7y6SfpyftP1r/XboyPoA4cnOH9PgHpSjyvAl7SGyYiflr6Tt5k6HgGFpJG44ijR4+X7QIrpxFFbSzDs9sh6VKbxK/vc5XxWQZRjkuOSbYZIw4MMBpAU5SCrjlNtlZvZRi8vG2D307MDGgk0EmuQ/9JSmph/2hRCzfmOn82BiFTj0hapOOPrCoXfe6XVHfEFqDJEc0bNXWGgOZK25tz6uzZ0w+GzQB0sug5Gpk608No3TDeBLqOiGxP1ITkWUbukIQxE2s6NAbJp835xmijfQa+9DWNcsOdrl7Ty5KN+nD2HiPKjy0QkKAh9UBvz9YAnMryf7QZgpM0FAg4pQ5aFCPlq9cvMKiSvxapatcRqYQiDUS7op40polgO4dxJcOKxqHxQPokcZ6lPezllV57QFTqo+kl73tNZ677IbV54GOR16LkVzYDFPv++Tdy6uxOrctUgeYzG9Acu+uMXkHDgYZ7J59+8ml6/8n4ZoCZZ+Ztc+10xYjkKJFXBFQrvTJ6sp6HDtd/IY+9uoxGUTfWFs0igENTvLbvQWJu4KzIzgJDzfvtsz+z88L17qMgS2euS9WRebvHpt66sYsBIcMsCdV5Ips95bAt+0SAl69XLzTnXueIt+35FjPfrteUpAEyAcXQV+1bKozjpVPBkpNB5OnT8/V5yTfeeKPbDED17V1nV4loMtA8LV/YlAPM/6GXalppC6qXN9xNpesGQy8YsA5DWKzx0G4GHDX55t5K6+CIAr9deOYxa3yRPlKmrU9PyPDK+tOcc598TRdPf2uOa/tSYcrkja3diJbOyFvX9PLwt0BtD4DtiY68epLhbhhiRyRj/6RGGJhHk0G/yuYZPw9ZrunKgYY/R0PX3RrRXP5eX0Hz2muP/+Zv/ubY1NmXy9ubO6BpxiQDTAYa63s0MohoJ3BJ5Inq6YF9YHRd6TjNOOzlf5UAymOgriNSmsmxAEDzqHVPGJ9PlNKy+Mh2kiyw4Xy1lBuKPGT05AVKVcZmnbSxe/W22s7AV75SyQJ3rV7TSc6h51o9yztkFskL7zjbE1VNowbg0PX1GHQ90ZQ2t8jQ811ksE8p7G4kuNVa3GhkaT3gwulwcUhPnzWgubN9JoBA7eX6ZoDDGtF89hJofnQs0OTNAHnX2fPn42aAPIGffvpyfQWNfHvzMXQdIHFdQOMTlqYoMvMwZ32JkNHgNwJvu8dId/0XmRryGX/SZ0+6VI5jBhhyDq00ETKMvB8CSi2y8Yxl1tZylixQQtTarf928rcWXbnNU4+stWsP6YKMqRW5W3NK1zQ9X+aJSmZRn6dMGmK0AUDec9ZY+NxsvZNkuGyRCbp+fJFU6i4sTySj3bsaoJWI5ml6cRlIfIG/GWADXr4Z4LOffe3xj3/8oyPf3rwBzQsGNFyp+sBmBzT6iyO1Gx61gcpanqo4l5oHLsss/VBKqLbLeWz5hDXQ4TqBz8NvbxR4nB7rv6Y3i87VnjSZttFhL8hQuQY6Fj8u00rbSRmeMc/0H+vaedUdmGIyuaG3nB3P/YCesNfIc16nXj6LHo7qL8tBNOIx5Np4rMjEc2zqavEphaKsB8RZH3m9azoQCOZo5VlOna2bAd4oz9Gwc9Q+5XznEmg++/hHxwLNV77ylUfn5+fvPH/+8RuEvhJo6O3Ng6aDkVn/HQaJbsTrNM4DKZHIzCtNSd6kY9kenvJFfd6b2fLOM3m8eE5Svz2pG8tpMJ0CIQede89vVIfGNCPPnMzmGh1LkkYS6a71m+nt9e755X+gBz2o7WH8zHX3N9kGw2O0ud61bEl1O63Gx2uwh+ggtWhFAwGP8S3O5VpRnUzUloy0lto7ZmwomipSLKBpZ+s4sCsvzbwMNFY7v24GuHevXTsHBjR37lwtdZaB5jJ0qrvOJNGbAfJaDbqJEO3yap10HeBUeSiRUaaZAeJldVzsoryqnrNIkHTUDI7HuKN+yMJY81LqS8c9oIh0aO1ym7PaNi9CVmdGGCrebxZpIJJGVo5R0xe10eYcydOOrbaecq4TqvP2m1272ji8XrvsM4CGARQzA27xaRWp29Wmnb8ZP2u8ch3G02+P7Bm/Wd865qWkzj7IQJN3nX3h8+OnnC8jnrxOk19B83/liOZHR0Y0edcZ+h5N2rwfimgIaFbh24k54LmsbSwjc10gNItSNudjyoMIeznLwOOwCeDAZYX7KMU0M5JIlzKcltKzZGiEjOsMoJB+jdda4n77tQcwkTzrmrHmqxeQUlKmyZqX/YCmP+Aqde/KxdZmrhuVHeOI9KptXq4iQ8qxzpnmZHDv3AMSVvkqI7H5mbT18Ku/jc0SM6BB9m/hc2vJF53VNzyzdrhfbQx1UA301i4DTY5o8htg8rvO7ihAkyOaK729eX3X2TkAmo040FD9zFvzknVyj+GnyZiBWJE1Xzgdb7jaoqvXLkILmGf6dDc3uChRO3IWpO6cRq+WIgsb/CwHQUtTcBCy9Cht2lxp8y/lacAm5eRyfA2vvabXoBdspBGeOTRaX0+/GYDb/cdzvsdpku20edf6yPvCsgczvuga0drMwHAGUN367TYId8SSNqux9ODpAV8vaM8Ah+Zh3QwAgCbrld9zlm3/K3deefng/oPjn6NZd509fVY+5byMJ+fY79HsiVS0G/eq0U7hQ/bWt5CLeRynB5dNwOEBPkuPYwBA3shDtDnZAqtFX5osC6g08sw/b+uJipDemvct9ee8jwFXBBKjvvo757SxIr175yJtWRvffFqg6r1Oj73HtfIZP2l0+fxo8+WRZetI97B+7ZSfGNxqm9ZQ12O7H+t1JPrsBRptTCWiOVxGNE/h92hyfbb7ZddZjmiukDp7883fya+gmQPNpy+rMTrGUM5SRZ3C7OJXUzCGV2/pQPxn4HEgDyWNBmZPZOIxUr1+lOE10iaTVN3Mi7a8b8mvS+mUH0DnyiVpRlrqpnnrViqHy0GgPZ4nX0SgyUHgZM25HMcMBGU5XddWWnQ2Z7MxjudefwDXQ1dtt7fcauMBEs1wD33BTT6PKmoCYbCj9bdiPFr0odu1AaQ2OwD1ZzqNDEvH/ExTjlgodTb98NlnXzt+15n2HA1dgLQZIL+KRu5+kBetBSJ1ftlEW+2J/3iT9MYMy/IZ4Fl/yUMzJl4ZWmTh8biHSOGQpgZJG4vHuFtAoAPA3PBJfvw8o/ZaP6njbOyoHB1r57QbXykcdJSkAYQ1f2u9ABv6wJzlKAwcFk87rCvX0e0sMSs786Sh7HSYrr9IXS3DX8ez3XTaFm7bSI9g4dFv7L/+q+vaGsF7X7Y9AN00EEUyeL8c0XzwQQMaenszUff25pw6O3aNRgea8ltub6bBey96jyeK+lggMPd2DtUOaMbD4uuNPrzenNZfkmVg94Jird+2t3pAAvHweLkagFIf7DDY5G3LP0cwGxuSYQFBjTCXcR72GHGPbJKnAbUVpVpgz7+CaunC+c4cCe/4rlpOoC5rrMiF2ye6Ls7OFsCl9RsBq3+1/gDCpbCTqwF1cwwPQ5+OH6XLduxgrTLMLdAjyPA2Wcaz7YHNEtHcS9sUDA9s5u/R/M2xazS/87u/kz8T8M4lor2BlMxAkxeL8l/C02NAYI9h1iOSNl+F3//L3ptAa5Jc5YHxv/29eq/2tbu61EK9oK7etFpIA8dIbJKZI4th2A4CoYNZZsYMw6LBMAw2yDBjM8Icj63BGDOWJQQDA8gCBiMsOMaMGSPUElpKS2vrVnerq+rt+/pP3syMzFjuvXEjMvN//yvVlfrVe5kRN25EZt7vfjciI0eUUv4DL4niqWPcccn5EMvB9FT2qPpiSdMhPHvQWmkdrsSwldC11teLj9rl0Td23fS3RjhnKgEGyb1pX6/aGcUwHFMPZSNlr8veKIByy5W1rWcHBAMh7t6VPMOu06OYB6mrdLacTZ4uZThrJNvBOW2ctdTX1gQtyibaPqWqTzUjQFMwkBJgTH0Oow2BTQywuAI2LC8vG6mzSVWPoco31Kw/E3AifdXZCzOgyRhNPkeDGQ2TQdgXNrFIw+yUxHFwDrgpW5AymBDYUFtVeOWLE3i7yGBR0aPU4SAdqm4uLjXkti/SjdjmBh2YA+RscRot7VcGLtpOg3J47hhJmQb2sLsAWZxXlh1YXzXzUQoHf6xtipVQThErLwF+DmhM28mAwLHNrR91jzrnsHuGAwNKFzZeEj0xDtxkSnZBVWQMAqzCPEY9lx549e3kOGd/CGyqv/VzpmobAGiqFzaZOZo2gCZPnRUDqasUIwiLAOYX5r2dATigkUgoJaRvoFA5aTuuXs4ZSuzz2ikqseU5Z4Hd1NHC3JjSPvPOChfvwTHYChZhujq1c1c94OsW2pBthSTEYDF9FFuw7aQBwm67dDwB5439TdlmnLDuNZ7V0notxpmgM3wtQruY++dD7MW2356zxBw9DmJ2kMS1RZ3DgAg7Lu1bKHh069f95lJyfpBs/Vnedzmj2d3Jv0dDffhsdHQ0/0xA8u7NL3jBI1eXl1cMoKkvRr9cQ21tQROJMNxNGYq8Q3UpZ8DZ4ZaTprW49l1xqS8WFaeIxCbLDiZS5hyJ25YHUkUB7zwHSCkA4faB1lfflGSqp6+sLUVSWIdroxR4zHqh8afYDNVWzPUM2YuNHfdsmVF+LEOmzknLS3xEHTTT+uu/7QQchpBYXQk74frgXm+JvmrctdVkn8J2VEBDrDrTL2wC0MALm8mbar7g0UeuLmVAkzXkAE0hWOqsGhzk4XXfbA5F+NjNYJfJf/KOqrQj18REmdTD7LIR6+FS/sXk0hFuu26dFODC9ITaocS8biF7Qm1gDgZ1TkxwggUXITDwH0aVMyHpbgnkcTOFhuTJXedLOWJq7ELXBhMO4ELgnmpDaNxCQRpXR2pnExAS6ezpf3B/oZ97VTp0Shd1D1R+DWEl2HhgczVYf/K2NGEubXNBUTx2vcI+DTTnYdUZkTorgAZ2b/5IauosA5oljNEUooHG21RTCW40B4hEdTA1ZB17dYi0Dcl5ECpqpMGssAllAWU6BWuWciAx0SXWP4mj9seuvm85wK7SQ4hzN+tixzjnJ7lX0PEwQIKzxRV388SigvJAi9PH3SeY7WYd9/e6nrHYwGXEhH2YrWa7kvHA+iUpx+tACUJQRyOw6SlrUYHI55SOV/tBc8yaAKHLMKj7o2rLTLu6Oo2gDQMa7h6syvaNb/MA0KyslF/YPJcBzaSFGOannGfnZhsATbEzQLUFjV7FowXen1lYXKgYDeVgQ9dR4iRDNF0fD6VSMAfk6sD0wn/6fQXM4WP6y8roIGPgUusNO3TtyLmolhoDs6367+o+s/RyekLgIAEW7JgIBAKOTgq+NDDoMZGnpVKcNSXRoNjrWew7lr1WOpC+UnaHyvKMBQ9EqECKsoE+huvX7+SEHD/lt1xgsHQz4GMd69ejrpfgo06/KKwUYq+uE+oHZq8oKIX+ZP5uJQMaczGAWb5iNCOj+8dPHG+wM8CLX+jtdWYaC4sBXKDBouBQeisqakVSLThDMC6+k+pw2wo5DkxvbF+ocqFdDDgAdPuA/W2WCwGyC3x+ezW4xYxTyF7OkVN94c5x1xO3DXNKur9Mmg65r6h7Da3PXNPwtWou+Njn1lQBEgU0GtQErZSgbQdtlF4uqqf6QP5tAKnpu0J63WDP27uMaNs9rsG8er5LJoU9DxIwxXwjNV6V3uKPoG7sPIDIynIGNHsaaApG0yv7ZKbOTsBigCZb0CwuLpObapqps7rDeuD0iPgpMlfoqMdPhWDlqPSRVce56ULpAqrNOLCx52nCrKKdRQxUnzjhIkjMGXNgQwEHxwBD57F2Xd1SW6i/MeHukdR6zcCjuA5uxB3SyTGOJCuE7YWCkvIoGuDwdfDzGNCEwIFjJoaFZUpJZpevs66LsRGa0dDCgqzxd69umNSL1T0wGA21BQ28SwOfcm70wibsDOB/JqC+KcydAerOFFol9FdL6HyorB1xF0ZI9dn14x1eCCDd+kG7jPHjyksiTSoy5sFaVREo57CVbscqozvgi9Sp+ePaN3TLhbr3SHZiRJ+p6TBqkYBZQjo+7lvgwbaZcthYUABPMTyvneImUeYzZ7blthGyPSymU0bqOpkO7vmkjulucUzFTahIWI3EDqmdIR1u+k6koyjsKrZSZxcuXMyAZty6pgXQ7MPx8jMBicubX/ySFz+4uLDw3q0tHmiw3Zutm9dpyEwbUWxHCj7Vw9Ur50KMKIZ2GPhLaF57BgvS56m0kAQQJIyG0h1KR0lYmTnuWDDg2smlbzyb3IucK1Ce444Vrm9WU26Z0lei16Wv/wmzGRnAVBVwWwT6KKDR5yrTEXYoYxY1WHN2mM5WAlwYKHHPnnZ+7r0oEZJtRAKZhImYvYphDrl9jF/jdIjKO8EdB1A0oHJzQrVAORNois8E1KuHDzI2s39QMpom79G85KUvvrowX3xhUxtpGri7u6cyIMpzePiDX1wu90YLOnhDR+gm8oDGrKsUupZcksYqjinLfqwcDSRF/yUpMFcXBbyunpCDwepyZTBgotrCblhsvEwAwtrwO+oHCpydeL9U1aiETbcloesiOS+5zubYcyAs7RvWbmwaji9Xu20MdMy/pfbGHvecK1a2VwIfEjVJwCrFLvf3GHAK6dK/RzE7h0mvrparzi6cVxPjE1UZPUcDJAM+fNZoU82XvORFV+czoLEWAxgRCKTMgNG4W9CA8E4i/6v4XSOkIzEOmpKQo8IeWKtsUQGN8N12KCcdYgI60uzXysg+hxhGaAxCDo50bMxiCifAimKimJMJO2ndXr05KtW/YOTsMFZKD3c8pkwo4MLK6N9j2+NtseL18h6UA64kiMFswZ6z0DPItY2ctJ5Xri4ONIgnKocqBVg4Jx+ypwmQiUFF2+mlfIujcDkqoDl/zt4ZIDunP3wGQNNwC5pHq8UAZvSh/zU31cQeolAkGXKOlqGYfiMFZJbB2ggBl+2Qq6NBvdI+YfaYG39KgFWSQqJsCToE4yGTOFRXL9UWFYBQ+rAyHLC67YcicyoIMF0vJyHnrm3QD6P5hMWyBir1yAUyuL1567SdhG3eGHnt2Uylr6OACPCLYwGhbWv4+l2wkpDeJBaCzPVZZfr+dlKhNgvscOxk0pY1o1ktX9isGY0WOA+LAcbGGr6w+YIMaJYIoIFGivdoFjNm4zMaSjRL0Hq0wXRni1ocq+CBqR7fUMSEgaTUkXHgZZaVAHKMTr/jqvIpUmdE9U9e3n8fiLURKRObwuICCIrFtdUOdl6LV65HLxMOtlsxXTnDiu4jAwxtSm1XFc5Y5yR1Yxw49lzZzrz44eZTdDRP6Q2J6SOpe8cDDsumuLZ1nS7YTg408MImsalmATT75aaaDd6jKYBmydkZoKbakDozGU3l2AorSKftdi4U5WDROfW3f86+dqFoG7tJJQ+0JCqnzkuAhnOYXIRKsY8QQ+DE12lHtqYtXJuxxylgj2VQnITa5epx9risAtMtZyp6JgErU5wRAQ4CMjH3BsaWJOLW8xwdAc4SoKF8DX7vONtE9ZQFOxInzdvG73zt/h3TntdmcSBYLmSzO0buC5ummLs3nzxxMn2O5tEXPArfo7EYjWlc8YXNhZzRYMabwNMzjrkRsCsh5hEjXHSLlZU4s+qcG6D14lKHlB1uexwgmudj0kvUA0mdcyUUDHi6q3SAQbkYnRKHKwGbFNCoyynPVhcMOH2xwQpniypNkb4M2po4zjd0naPVEwFi1Tizeot7pimnjTEj9/mgfIDkb/O49N5wnzv3X86X1GV1UI2wE6XQRVESsIbUmfkejdkf9zMBH/5w4qoz2IJmcWGRBBpYdVa8R+MwGoYRpDhWt4x3I/T71kBiESLXBv2glIBogIirl2qLEzeak4AKNQ50GzyTwCQWaLgxkNR1jxnWZ+f9aJAaK6xNbhybOEbTDu4eL87nf5FtmjZT904cMPK6SDEDpoBuUkVEm9g9o3/n6kj0ph5zbTGPucyh75zD7gV3uy59vKijNflhlwsyRZleuWhKoazFAxCjXG5Lb4Rcbs0diwKaExnQpH8m4NGrS0v+HI0WK3XmdM7tBO4wNRIjN5pz88c4dgvwiPcRKJ3mOS10PW2oHwHLou26vHkuxFRMoW506u/gtdHOiug3Lf5u1SGHEor2KBZJr4BrP9qPBScM8Py6+M7eiDIvhRRzTxy2SJ4tsyyhxHltwfe1IYC2z9Pv0GGBFub4rTrVcmA7C4kxGs5Oj80QE/WxwMkdY8Ebzh1kQLO2KvzwWZM5mhfAh88Wyd2bY4DGFT6i5Z0lpgctazgl7DxnAwUCtu11PEKxplA/sT5w0TKlJ+rhJdrF7A+1YRQ20qO1M0gBGqoMXc+NC9OEu15tOG6OgbHlFf6gFrdoe6BLgWKTsaUCQir7welJPY9F/CEWYdrolSn9iqc3ACwSGyVAYIIRx1SwsZUCja6vGU0NNOX2R9n/YHmz+eGz5FVnjz766NXl5ZLRgOoRu7he3hzaGaA+lv8kO1YX9AEiJoVEMZVQ+iTk3FFbnTaRE16P2X5YEXvxSHAghtlMRdUs69GtefX0WV5CkbxpQxOnLb1GbUhTkAk5nlA6Dfvbj/Djro2tLwwiUkBswrDCgGM/ByFbUo6HnmmuvpsqM8daB+B18GtTsljw8f+uwxC9E7RbRtYPVekx+2UCzfh4ATT6HHz4DMAGPhNw/GSD1FkBNPWqM2tiMOvPbsZoMsaDfo+GkpAztDuvj9G7CnMg4qbNQkCjy3HtYP1AyzgpHpcKc2CIjQf1sGJgwEfmdlm7vO14Yhwt50Sx68DpEUf6HQIN24Z2GPUBhY0pVj+KJcbaJSjPP2dxQgNYfH3T1lCd1PPY8ybRVwAJlPOdt+lXMOfu3ioaeCh73YDM1YvpKI7Z/qXy0z3fN4VA0zxvA824NYbFFzaLLWhOnDiZ/sJmPkcDy5t3dqzdm/W/+ns01qaaDaQAe/uNb9PUHjJodV37JbkQq+GOcyxBClRSZ0mJhB3Uv+c1yPKh46nlkIpoKsfUm1sacHpmmSa6dPDI9SeFIbU1jm04+C7bibUjvt3aEetnW9eTti85Zh7nnC4HnBJm4+qR2CcFTlt//tPqT9UmNbdTV0TaqPW5fVhbW8uB5lwGNOYXNuFcMUfTz1/YPHnyZPpeZ488+ki+vHnHAJqqw/1yC5rFclNNIm/ZhnDOyBxgLN2mWZgdYddu2Y8w65seAxfMwWE2uro5kPLGzGVDAlDiHCZqswHInM1SSXG+Pg+Ii5JDuqR2u/piIv6m7KoNJtCWLW1J6D4P3v+R7UiPU+dTgC2oo3y+SBtdBhLQZ/m3ooClJ/TNLdJOfUw7Pkc00LiLAczUGczRNAKaRx99JF91BkCDUTj3hc2Q1NlE57jQ2XGMw3Q12A1NAUToGGYTZZcrMdF5DIhRYy2OyJE0HmVTE2EddEw6TeEgErpPouyJPEelSwYlVMQskbYYGcX2HS0WWxE0as9BKVXNHUoBgn7W7TtJykKo8roNju2w+ooCXtmQLT3rF/xFT8yniftYR9tqNQMa8PMm0GjdwGb6/RYWA0DqDL5HwwGN/h6NvqFcKbI61e2CDgY2CHU9YwBc3U4azOpYwMljFyOUTuNoNWZLLNCEypgiAkdnVQrLqpQx7r1+dakw2yT9ah5dG4FDoVDMdNqzoZ5gbYv5uRLD2iR12ggQYqVJm6Hnl6tnShQQYemlXv0MhNqEtszJf4qZY/U4G2nAokL0QrB3djD96DmDyVRly2Ng7/r6Wv6+5IXzF9T4xHjVDxBzeTPsdfbRj340dQuaF1xdWoTPBGyfg85wQOOicy30IJlpquoyuwxUELmlRK9mPfJGMFJYUjAoitB6qf6EHEcIzDg9WH9RoHFZjqbkmE6CqmO2S8UONur7hkpjDkKSWVA5nvp+yMvmv8aDdqg96zhF/wQiv8ed68DcJyFdpmABnbRuTBkssmf1lWOKlmfGW8JwzGCQAqHQeGB1ORvs9lV9b6q6O3qM1kpGAy9sFt+j6QBoXvhC+MLmAg40WVt7+/vV92jcTmHOwRSOPXDHvQ4InXZMubzNKsKPcwAh9kA9SHU/i1axsaP+bpL6CkXmbUTIFEhybelgK1aHFnOppyndsrBcizKvX/tiL4oZJHuhmDx2Th8Doepwx3wdfhxb1+MXCqUCFqqrOFGyATsQDemQtEWBLxbIW8EhwkxCH5WjyYGq+re2js/RgJhAA9+j+VDyFjQZo1kwtqBx14rDIgDvU84Kz92GUg8cy8DKu/pdoW5mzrGaN497I2G6MJFGZFIA5voUlnB428RZSRyzNEpuoiemD+aIpDhKVncAtNuUkG0cKHRrl0fa0HGWZCo0gITbNMcd951NwAYbS8dMi/FQfgnzeViZaqxUzS4oO6nXJno9fZYHG1JvT6fO1muggfdojKIV0IyO5p9y/shHU1/Y1MubEaAp3qMpXtjUQMNF6jESotCYc/BAoky9uOexlVaFGNuCKFXzGeSh8e3VtXDh3uD1dfFAG5M+8oEeBx6OFbl2YeclAMGVlerh6ksYJPY3dzwERJh9WmRs0nfKEklhXpLxSxWbieN9im3DZfdMSaPNdhmNPh8EGkInBzSl5TzjYACGKov9LbW3/ruwzgUanTrT5fMvbMJ7NGXqrMHOAPny5vdmQHNeuUCj7FVn2gCOnWDHJIwkNFCYjphUnJR5hGw3AQcbC8pxh8bHFYkDjHV8KYxBakcoxSexL2RjitD2+4AsbTumHEi885UzmFj9qUIBvBY2LSbIGlj3cnlpXEYgySKwfqSn0MUAIbDARKdtOaaQl4MPH9YxMWt3pavftxi5axdqLxFgY4yqOJ7/RIGmVxbIWWn+wmbxPZq52bk3fPRa4hzNww8/dHVlZSUDmp3zplH6X/0eDby46XaYYyOhB8Yta/6twxcJawo9eFwEbF4gTB9qd3VBtZm4E3ZBCLM55CjCEXgdWda68p+0/YE+hgVnTFR7lD0pgBJr/yAd8VBIKn1iVbYLvhIdsdF5tA4HcDB/lspotNggWTwzEoC0y9jOyQIdZIFBNf7GI8rZqcfKS52pOjDQqbNR2IJm7ngGNImM5pH8PZql9+4gQANGmHM0roFYJBty7JjjdIVjSWgHmXIeCKo+vcqKsb38iwSXEMPTY5tHCUT9WAfK26qI43KgoNpm7URucuoece2XtBM7TnxZ4Q7LDYWzw3JIhl8J3e8p9rY7duntSnRLnHIFKAbAStiIlMGEjrNtlZFoqC0KAAoVMuCT2F8SmMKs4mTVBgCN+x6NPlcDzej+iRMn0lNnL3rRi64uzM//yRbxKef9vf1qCxpvIMonQzeApaBMXb3yhsBooXJ0eE6JoN+ss+g5RLlff9NGnuKpPafEXqxcMN3Rc7eK98GAYnehB5hy9iGx9Gv6xpTlmFeKdOEU3XJ5+iN7iPQ9AdIV4IRs5IKxQdnQVd3U9kLncebiB4Mh3TFAwx6r/It+ZHqVPSntxDIsdzwwHVhgLAOasRJoEj8TAB8+W5hfsHZvzg3KPXsvA5rdDGgWUaDRxoQic+ohDg0emlZzO0cMHqXbf5j5CN+9gCHmVrVTIKNIJE6uuCbKSY0EbCfeg6GdmtYnYz1tOx8xwwuYh90zZpBjpzXqxSDYuAQwNkmw+zMWaCQpJlck70WRdVOB2GEbccGDro6DhhmEul6OYtBeXeJvpVUivk60ysso4zKLvl2wWDcWw+AIe7HjOoPjEghTNjY2ir3Ozp0jlzcXjOZkOtAUW9CUuzfnQKMXAxTGhFJnegBEnRZG/xRzoAR7SKl28nLOA0cynOIk0XZKCsrfqkM/UEoRtgrHmmyxRWbQFrB0zR5i7BiUDRww1C9+9q1jbX3SedBspE2RgKmEEUj1Shy+2wZ33A568p9oeQl4UTZwtmN2GLVze6RAA59y/mjq8uZHHnm4/B7NTrW82Yz29/ftnQHM1FMISDhWURkXYAyU1G0p5aa2KNvMNt1jrj2pwjEwrI+6PUkqT8p8sDp06rGshzg7TLftDFUV8aWk5roAzTbBsE3n7N7jlHOKal8Q67RxP6P1y0i8CwDjglE3GyEldZSDxtJNlC1SoClNI5kKlRITgar9w2FLfgBtnqOQQKfOwkBzPH1ngIcBaMxNNeGbDMa9o5c3Uy9suh1yzxedz4+gdNjVYQJIaNypG4BjWJJ0XEikDIoC3oJVKa+DkpQj1yZmZ6iPTcYkjm21N/E+GEZUzptFrbBrf46FZtt4YBC6Z1LaThnv2DbzNphgKOSEJU7aAqbCCVX1YpiMpJyUiUmZVQwrw8pwrC8Hmv19dT4DGv0ejZbWgOYhWN68vIJuqgk3857JaATROnYOW79uRiUmnSTnPBJy0r6N9RRHr/zDmqEgHqikaBPRR0VqtG4zYrNfLG3L2bbhGMO2tLu6q82+u3pigJzXW0wcdAmGYfv4XZUl9V3KxD0j2HFO4p7pMHtJBote7Z3sgFe3a9wTDDOIBxqtrxmoYDaZKTM3fWaNOwDNxkaxGODc+WJTTWPOqz1GkwENpM52dnbR3Zv1HM0+zNF4EXj+E2EjdCorlOrybuCEXDUGeiEKy0WjggyF1z7WriRVF1OXsy7FSbYdjUv1Y8djbJGUjeqb8aAdFfH7R9+13jOF9DclsOuKaXLpK8l57nh50mI3WL1Qis2tg/lEr44DcNSYa8DTP7HgWGKT2Y75+4YGGmNnAC3mC5uNPhNQp85geTO+e/OiseqM6wzpLHr28l2OktcDoQdGPm+A6uNSDFUzzaNPzokq3URhEF+uFGmfY20M6T4MXZT+tnR3DaBttN/MRvn3YGKvW5xdcd+lqdJluY+Q22pG6m45KePg2nKdN5aFkKS2Ys5Jt6oJHXf9HUYezLpQbnNzM7gYYGx0bH92bvYN165dS10MoFedbZ+D7RKq5c2lodYcTaWNTgkVv3vkxytf/21jNAZC4chen5dHxS6L0Xa7tnDtSqM+ycONRkBG5IlFPF2AkURC4E4JdV90ZWsbDj4lssfa0Lqa2MLZddhg6t+bxb8Nh65UoqrH0g4Q8cLUPSZqChlTnm3gwENdHyvw7PnHqba8to367kHs+eT6v7mxmU+RnD17Ft3rTO/ePDvbBGhgefNCBjQloxkZsTvsMhqq49qJBFNVJU0123D1StJdWHlMMKpYnlF+agEHPUk7sUIBKpvC6xX2cWbYjPDwHE+qHLbDNKUNkGlFjGcmVQ6rL5J2TbfAF+U/FVCVMp6BFNBhz/eUNd9MgY801UYBjVmHAzpMfxQ7ypra2NRzNOfUGOx1Zpw3geZ4k92b4cNn8MImLAaAv6tN4ErBgEYCAKFybrRunSMcLlaOatsXnPWwNcROL82pt+NUfXDUEsN4YgBbakuKDBZo0q8bSJXyYVQctemesLM/HKnHnLYvBkhTGA52vGdkeEJ1Y9NrkmPaT4bK9mpjzRKgIWc0sEt/vuoMS53tH6jRsdFyr7PExQDwwuai+ZmAXs8yCABmaWmp2r2Zk1CqSos0heCmkLBBlurAbOmCrdTt5n/hdvbcLWcQm5C0GddepaOP7gWgQgsGYtKMlGDpx5DE3BdGrag2qHb99qR644OW1qQj5IoL2vD63QcI5vWhV6HZ9ysFTLUuGej4W8lI6mGMRVKH+zt0zmqrryzfiQFOsRhgX507R6fORkdG92fn5t7wsY81SZ1lQKMZjYuOsOrM/EwA1ilu7qCmxPEOpRmDCevGHH2sjZRu0yNYujTIOFvUUGm9UJ/d1Btuf6FPzmLCwITV0WmNWJE4qVRGNciUUYyz5dKjnTtsAVixc0AhFtdgzKX9134KynJpKglDi05NRTh+6vkM6ZKADc5SkLpOKs30T2AXLAbQL2yaq86gXP49mv3yMwEZo7mWymhgZ4Al84VNx8gQowkBDVVeqsvVF/cg8k8ECTZlFCCtJ9HbNC3VyAFV/eomrWVGjk2BZrCps/hr1WLLKiXl2Zk1RL9tR009T/hxCeC4YBEKZkrNRTltoLKj+NCzRtpR7gvG1fF8k2EVV56b4Jekv7ixNLMnIPqbYtxcd2V/CTQAKMVigAllBrmtAc0LXgCps+UqdcYBjZemUT4IuMcsQyJuglQdqXa01ba0TtOxsnXkPwXlDiHV06o0T5kltUrcL+QxTeMHbFMXdWLFZRBdtGmOsyjpJWAsZUEWNLjj9d829GA+k/M/HBih9pTNhRgX2fdM70YGNAAm8B5NBihWnQJoYDFAw88ElB8++5Otre1zgIQY0Lhb0JgXrZ1UiZ0qMlNIGqxTIn4OGN2bT0rXQ2WlTqmpSF5kHTQ74KSpLTEpFWk7IeeTkgKStG/pTUhjUee6uN72MxJOQ1EZCTeQw/oT00/sPHXOlJi0l7R8fS35T6BYY+Cwp0qXUtV+khI7TTZU+bSikKgfmtEAmJhzNOb5/fw9mqZb0Dz0YAY0q/mnnPWKM9MoatVZzDb46VIMO5+yaRbVUQAkqdud4JG7TlHpMcl/c0GtemFLH0kfn8MGqqbXl6vf5dyNxCHL9NDzJFgbofPSduyTKgiEnE7SjkS9IHTAK9tkk0ptYedjjxlnyzK43dUy6fJRj9GP+TAJo8G8igRoWvlMwIMPXr26urqWA42HjNm/8AnnxSX/PRqzQ0G2wUTfqSwhfE42Oe3etOa/gxQJE4oBxWGStuwcZGrKaVm58yldXoMm/cSeJ9cJt8n67MLK8zakA6eAJgGAsMxFuLwGAfzTHVxd9wXS0DxNfbD0hX16Toaby+GOpZYB2dzUq87qnQHqgKVvzNHMpb+wefXBB66urqy9d2fH/pSzFkC6paVy1ZkzUFp4kJA9K00BxyurbPQObYMfaj8/X95RbbErSrCxlY53SO9hARPeNs7c0nQNTtq+1q6T6wLEUhhcjPPm6nM6pGk1V7gsh0RPyrlgOiwSJCT95EDJ7av2cZivMD//4gbUm84cjan34AD+2y93BmiwvPnBhzNGs7T63m0HaPS/xfJmWAywg3bQNNz9vYlIIvyY9rp0DnRBFeVH3ZtJp8kOSw7boX+xy6Hcs4coDbJplUhBUQI0GNCKAMqIrim2ZfrZ6rzuPZISNYUCn8puX0XdnnID8IzRbG3mjMZdDABiAk3GaL4zYzTvIPtPnQC5+uDVB1ZXVv8kYyznLYNKegmNLC0tq52dbR8pywGVAo30nCx6L4ZMnL5DUmRcmZCuLh5aLBpr2k60rdadGEbKQ3NgCFUeCsfs2CXRE5fK0imf4ZE2AKIdSf8QGnYuxOgolkEFxDE6MFs4tmT7zPoegXr5cmfixgFwA6ABQgGpMxdoqtTZ6Cgsb/7Oax9LBJqHH37ogfI9GiR1Vnxhc3kZgGbHH8Be/YY7eXH6in2rv9ZZAkdgNVUTZ+JSxlSR2GhKsr2BdN9t6UbaAvmjJG0HDE3Tbk1EmnoDqXyXgZZNWFFsSk5yLL825eIrKWCZ/XPTZq7o92jOn7+gRkdHrHP1HE0ONN+RMZpfI/tHnQB55JFHHoCdAbZ3ttE5GjBAA43ZONVBjtkk3cxI5Joqg4y+Y9pqyrBuNTnMNM8wpZiGyRaQlHmewQvNatygnnPakr5KQMLVI5nD4Y6754JptED7IBzQ6NTZaM5o5r7jYx/7WBrQPPzwww8sLy3BHM0F12CIqKGR5ZUVtb29HTVnIAOaOjUjYRvuuVvREZvLk3uHwGZaSfW0GBzclu7Fd6p0Mqwp+KVO/qeAXAyzoc6lAE4Mq0kBGk6XazNnvz6ugeZCBjQjHtDUX9jMgOb1GdC8k7SHM/ahhx68H17Y3N7eueQhY/b7QUabsvNqa2uL7GSTlVwxNy2mb9jBJoXZyOaoupdhi6jblOGZVzhckThSLCp27wvp3BHWnk6dc/W7AhpdjtKfClYhtuSWQXU4e5RpwbbKMX13aI7InXkF354DzYUL1fY1WhxGkw40Dz549XnwwubOzs6VfIHciN15nTqjgKaNOQ9TzAvuXpQYh611hcoV7ckD8Pi+2t/Q4OpKd2wedhl226k9rVxpyu5I50ihnHMjtpGqStWB3a+UntB8DAYk5LxuhxFAeBzKeeIGLCd13oZjeRyAYG147fVUdb9jtmNAo69Zv98So7l69epzVldXYTHAc+FvE9E4oJFKKCXGg0J94WMdVzRbKv/twj0WtnSl/dYRLMgYNGh1PQ/h9qcpEAxKQu3JwAY5XwJLN6vp7NS8uJYA8MTpsR4f0mDpL3esMAaIAR7GOikdpkDqDARSZybRANGbao6Pj+9lQPOt165d+y2yL3Q38zmayxmQwM4A98LfPnU6IFNnsWkvCdBwtM+Nrlh20CI4pTKrNgRvzyW/XbfXtXTXn1RxJ1mHmaGlisS5DwLQasfZBdgUEpNGc//m0lBuGSmjCabWDBbi1sFYJtWGHlOKncIx7duB0bjMql51NrZ7/Pjxb8yA5t+ihqsA0Dz66COXlpaW/33W2POr1Fm5JFk7AAAajXqFwp6yl93izCP1IU1zdrazasdhduMAY1J7knItWKTa6Kdko89bRVKuTVKa7RDEtFOaZjwMiR2z1PmWUBkvECXmUKg6VLtSQItJ49Xn8p85kYCFXvD7hQvn7TbgfL/6TMD27Ozsaz/+8Y//O1In2VomDz/48PmVtZV/v7W5+SC0XjGaitLaQMM9YINwjMOS/x+MHekfE2vSZvvgOnyM5SjJoNN5KfZgbISL8pssHojVoSU0hlSKCilpteuNH8JGwu33WOZRKUZSgdHzQqp+GqEtHGhKXw6ps4M8dbY1MzPztz7xiU+8l9NLyqOPPHJmeXnljzc2Nx6FRtxPOUOjq6uran19XZxKIAfLyHumO8+w03LpX6weii5HM7MywsfGQ6KrKzAbFrDuQrC+xTjqYUiVuQ6UWqkVAz6HMReEpXwrV4ACU3zqLDQ3VJ60lAs4i8gO189IWAZ3XspMzNVoKWk7U8A/bW1u5QQDtqCxfLUqPhEArCcDmo1jMzNf9/FPfOLPyD5xDT3y8CMnV1ZX/mhjY+MlGkjcAQSgge9Kkw1EOE5TL6eLm5sIOQPKwcfaOzgRgKeOMLpgBvpBvAVkkNc2ta02GErwGXDOJ7fZYBUYtbLMjJgpk0zQEYFJQHBWxW/rIul6aK4lBVBCdtHzMUx75YBSq87g2HmYoykMqMrmiwGy/yYnJtYyRvPVH//4x/8CNV4FxurBqw/OZSDyh9l/L88Lj/QsxITG1tbW8v+qiSd9vt+R44sSw0kzDnPQ4CJ9sGOj7dg+uCtUJDq6GKuUaDWFXUhWR5mTpHghZUWMlA18Wif+nHbATbNkKaDCjQe2ygn73dPhZDCkzt49FpqMl4v2FfGMBdfWKz9SFqejmMdR+aCnsiBzjEgdvbKc0uSh6LsL+gA0wGhgMYCpWy8EgHcpJyYnV+bmjr/q2rWPvo+0jzP+6gNXj21sbv5BBjRfAYa4X9l0gaZCx44mfuOcnJ2z7Iq9fDFNcoMMH+OLk2GaWA8J64CJF/ao/QPTbQiDDPW7dphaeJDnnTIKMD18KUIb6cQQC9DdolRyDMQt46a4QqyFtBnxRe5KYSw44oIeABrYTBM21dS5E70UBIAG/puamlo8fvz4Kz/ykY98gLaNkUcefnh6dW393Rvra6/ql0ZzQDNMgkVZg2ivaZkupZ32w6m820KL5UQC+Ze2WVFK2TbakbShxSvnZEY4W7jzKeJmb2rdddaGb45nR5ytbNrOZTvGSl+3nBhonIwP/Alv/udAMz6uzp09q0zWp4EG0mcZ0NzMGE0GNB/+ENkfsqeZvPCFL5pYWVl519ra6teZ6RXTWFgIAPM0qRdY5vwI58akw/RF1pESxWhAhj5CZ/s5GBkkE2gyv6Hrd9XuYQcLEmn7WjUBI30exGcZ+U/0nK+DZ1aVGCyHYlwxEqzjOWg7VcXZLQGamLkcN7h2dxNx713Tp2O6AERsRmOLBpqZ6elnj83OfWUGNNfI/pA9zeSlL33p2OLC4u+sra99PSiExk2EBJPXMzYjAZo2fGX6Qz6cUfgwOq2uAcXt8zCOgVTMB7tpH8hxF8w6a4fdxXVLmk9SQZODZV1w4u3wnbkkNeSWRx0ulaI0y7D67RR+jA68vE63FX/Z8zF6LNx6hQ0e0CtzjkZZAwnHYekyLG8ezxjN2YzRuOO8t7dXAM3MzNOzBdB8guwf2XMFQPPy0YWF67+ZsZbXaaBxGQ2sOIN3abqPdu19wXT7URpailjbco5BPRg6t8hu2nSUwyahaDaUO29rPDAnGKs/GfxFIIU9TxBQFjbGgJjbV2rc8xZIekLbTM2LYAsCQnMosew3HEib7AUPbFEd1fNcnjNxrUrPldcn+2+kh08JuEwqtg/ablO3ZjSTk5PqzJkzVvlqMUBW5tjMzBOzc3Nf+eEPf/jTpH6yZQW7Nz80srm5+WsZ0HxzxWh0Pk8V47OxsS4GGuwBEzv2skEZyPgXmspNUqtWunK8VpsGaMQAnMRGUl8AqI7SZPltSRRnwUAbKSasrjTl1qhNZTuxLuZqQnMtVkmuYM9fvCAddy8tFsuOAsysqGOPZg00UxnQnPbqaEYzNzf3mWOzx77yQ3/9oc+R+ummYY7mhb0MRN6WsZZvB6WQNhvpjdTbKGT/hzmarhmNCTTF391OWQwqwjfbiW0zVP5WZCm3pRvh5hHcMlKGE6ezvRdG+yU7aKKXk0YMCAEarg4XCEsD++r36v3B4i9JHQ5owC7ABJDZ2dlPHj9x/JUfeOwDnyf1coa+7GUv683Pz//LDEzeWAGN8elPsHpzYyPfwXnQUbC1lK9r5OlAJA9iEzlKQNMEcFPl0JkbpKV69efOJVGzOTZdryxzU6p+fj9iHiag343qY/pG3S9trYjD2gvXo69lba+/VY2k3fIPdMED1g4GXtJ2IDUGczRTU1Pq9GkcaODf2bnZa8fnjr/qgx/84DOkXrbVTO655563Zozm+0ygKVrK/p/VpoAmlN5p6lDMCzaME/2HKU3GtjtHPxzXaVgA+NCBzpA2bDGBBweWbgIrckECMveY1EfHqTuJusT5kHrqwS1GgTsHcBLw8Dc7tsEI0yEFmhMnTnxobm7uqx577LHrpA2shSoHml/c3Nz8gd2dHTUyOuoZBRtqLi0txV/EAfmdGMdym2UcXfHnB4prmTLmXYCAeW+RkXvEDShZDSaZe2kypxHDQLD5Gy2Sulg53TamS2NCDGPExGfbufag7U1SbNCezhzFzMXElnXH1b0+ADQ7md+ngGYXUmfZvydPnnz/3OzcV7//sfcvkO2TlpVyz/Pu+UebW1s/uruzrXolo9EDDnbBpmuLS4uHGp0dhgNv4oxuA04z6YoNtDWRHIpU27CBTGlFjk2oPQk74QCH1e8sSuDaDwGrlrbmekx99HUromUqdSURtlyvZy2A4uoF2+spZc4QmXs+enr6xaTEfgYkO7u7anp6Wp06dUqZ7MBkNBnQ/H/H545/7V+9/6+WmeZ5yYDmzZvbWz+xk1GoERdosvPbGQAtLCwMCGjwrfGpmyHWod8GgC9u6ZLRutF3F/MHdl1ZX1h7tNNpCOwS9kXXLfvRV8G9w0J9NqaWo2ygRTavFjofy1w04+HscHWSQFqc1LVUBQnZP3u7e2o3A5pjx45Beswqor+uCXLixPH/eGx27tUfeOyxNbIPZO9Kueeee394e2vrH29tb/XMORpt+M7ObgY08yE1rThxk0lJwSZef7yONgGqLdD8ohYdeMXMWHdqSFiapbAqTGgElNIUGEjTVJupQ2J3PFOT6HTKNLhfmrzYGWI12NkYYDKPc9fPTaEByMB/x48fh5Vl+TFzMcre/l5uWwZCfzgxMfnaj3zkIzukTaS1pdx3733fk4HMP9/c3Bx1gaagT/tqfv5m8Bq15Sib6unCYQ9oumkg0vU81WHIME28tyneM9cQWMPpqfpOjx1Pd74oVkdKSrAZCyv+5VWYTz6dRjPLYylHbG7RbIJaFB0CLirtGAIpF2hOnDiZsZoZSycwGkidQdFTp07/1sz0zLc89oHH9umeB+S+++7/pq2tzbdnQDMOIDM6OmpMiEGD++rGjRsi+tc10AxD1G8yrlvRuQ2juNe9/jV+kpo6FmWPufReKBzAk/aUvr+tuSXevrSx7LY9fszMVLvpcNsCLX+hgC7nA5D+vUmqLYYRcf3F76ViME1Wo4EGFgLAggCzSzXQ9GD+5pdPHz/9vf/pL/8TedMHR/v+++//2q2trd/eWN+YyRnNaJ0b1J0AoIF8XehitCGSybnBy63EaYYYJK01tIq8e4fW/oB0bTe1Mi9kg6SeWW4wjCX/2SidJm1TAjQyttfkWzf4S6jmYyAFqep35EKaQAMrzsCvwz5nsN+ZyfLgOADNaIYHp06d+bmPfezaj7N94k6C3Hfvfa/Y3t5+1/rG+hnNaFyjbt68mSOfaWT76Sl7J9JW9LeAD8PAor5YROLAUKfgPFBtOHTOFslSYnrVWP6z+rurSXhp3Sar26SLAFKua2yKt+5PmDliIEbZ6DKH8qgo5Wa9/G7oK38xqTnatqdVzIbsNB92nTTQ9PsHGdCczwHF1FMDzag6dfr0D37s2rVfZG1jLc/k3nvvfcHO9s5vZ0Bztws0umFYdQYv9hzFKNKU26BRyzCxgpjIEyTG+WP1KR122fS5LK4d36Gmr9hKEf0MxKaZMICMYjYChuovIjCdpW433BSmW//u6g/1BfMZ4SmEXHsScITAQaqntoW+Rpo8AKNxgWp/fy8HmwwP+hnQvD4DmnewfeFOgtx3333P39ra+vWNjY2HYZ+z0bFRr8zK8ora2NzolNFwchsgbovp6FLvw/zhLSryZQQOWHLetHVYxASa8kiQARS/l0G4MrKbAkdd6WFWbWHX1tZdnOeuS8r1ErEuhHmg5RBpj6EoZS4a4ECR1INETsBo4Fs0+c7NRj+hDrAZ+C873z995szXX/voR/+A7Qt3EuT+++57zubW1r/KgOaV0AA07Mr6Onxlcz2kqnW51QGmSdQsb2OwEXMX0u4kdP4zmRWZerCiIqASrh4LOVXJ/UPr0IYMBxhiztNPWVFAlv9sBPz8ta+glbUDq8cVkwCRZBGWKTpdp+txdfWuAPAOjVtOA8342Pj+qdOnXnbt2rX3sbayPcnkS++//+Lm5uY/X9/YeB00NlpuQ2PKxsamWl1dCam6LbeldUmNYKVlBi3tzB+lzV9Iy4Kkjm21GixX0sweCmBcJiJhMu0xTBt0ZGDhXy+LSfXid30OlfWBxo5uYD4cgGbu2KyanZsr62hi06/maMbHx3dOnT79QMZoPsX2kzsJ8tDVh06trq3+/Nr62huhu5A6MzsCv8NW0vCpAFjy1oVUg5P/6I7BVJ8/aEG6YluHyeIG3bZs4rb95cmHKVx/JIsMurKDuu5N7JEsiAilrmLYm18n/JpEzDyVW9bWj7EXOOD2yz8Wcz+7vpkT/U4kNscExwBoTp48WSxtds4ByOzvH6iJifHlixcv3vHYY49tsHaFDH/owYdmVlZXf3ptbfWHdeoMo1GwsabekuC23Ja2hMoimUHHYYKK6wRSwZiazA7NX3QhnFOvhd72JHVi3rNDhbsdMxGP1UWBsjiZ5OhLK5QPIExpokw+lpY2fDwoRhYzB+SBa0YaYNNM2OMMvrBpntPbz8B/k1NTH5+Znn7+448/zt70wVF48IEHx1bX134sA5qf0akze5+d4uUdABpAwDYudOhc1xLOe8YTK2Ha/bY40k4qSbbC5zCYYuzqLplSpfSLnK6zDM9n4I67Snn1fF3UvElqf2LTWW0sAKCYCM8kZWCKMjYiduDSYNi1q8epgCMMPGLmcPQxDSSwEADeoTHb7x/01f5BkTqbmZl5z+c///mvIRvQOkMFHr7/4d7K9srfWVtb+yX4G1viDAYA0KQtcTbxOlDyENNGt2WIpCFqD1tqDXfYvBNrw5FrkTxXliMuDTQdGTcvEl5VRi/ppsaBWtHGB6+2Lr5dX2fM3I8lPXlCntbpA0mMDi69jIGb3pn57Nkzmb8fs+4PzWjg35ljM7/85BNPfk/QpqDVmdx7zz2vWVpe/n2gU/BNGhdoQODjZ/BtmmF4gIfNkXQpsRO/t+XWkKb3eNvPSBBoAswCBAMXPV8jqR9yxhxrMc/79shWk9H9tHedj0lpSdr126F9AnaNXN1AJnR26mzGaEbybcfqMdBsB44dO3bsp5544omfDlsmkEcefvhLvvDss49nKNfTqTPXuIzx5P8Nk4O/zYBswScpm0kXE9HxNtSrYWLtCDvBwQP5MARKbdkgYRhsGaWqj5fFpvrw59+ZWzLYcQwbCpWnJJzO6lX/oCU0OFjt66xQryrCPZehY/C7fofm9Okz5TkbaGAzZTicMZpveeJzT/wG22klBJoXv/jFx576/FPXd3Z3ZnTqzDUW2Az2SedUuQ0St0UqOuoFGaSD7gKEYqJnqlyMA2wyT0rNx5gAou2zHb+fLudsMMtgbInSwTGU4nh5/fqK3ATVtDnpWtvUzD5ugFyvOiYYF13XY2/yccXGxfwXpkFgEUDxwTNbihVn+znhODY7+xWf/cxn/gxtxLFMJHfcccfHs8bvo4AGDFtcPNwvbQ5SUicgpWWGSYY5PTcsYzkIBsCVM8EWJEZHLNigzr/aixDfCp9mGDhAYEKBGpYu4xYqUH2kQI1Ks5nlsH6ERFqeK5eShtPHsfHQfwOjmZmZyb9F4wpsTQNAkzGeg9m5uS/59Kc+9blgH0IFtNx5551/sLW19WowBFt5Bo3Dnme35ba0JdaDkLAAYBhAqJENTJ/9yXkktQPVjRVoIJIgSIuO+mttfOpHMikfWlEmDdRMiWU4lM2UfkxXUU6fo+3069msQwIUMSvHzFsGm4+praByczWj0R88M8cDfteMZmJiciE7f+Xxxz8Z3BYmAmgu/9LW1ubfgTr6XZoiiikGGhoHoLmd7hpuaSsl2eVkcpc6qTRPVyJlCyEg4FZykfMUqn7AzQlzi3E4ZayUklGoX5W223AVSR29118jbcSmD6s0V+GwU5gYCXRGCo1iMrY+3XHqvGxZfZPzXDn3u0juPAw2Bvq4flkTWI05Dvo7NPDv5NTUY8dmZl/6+OOf2AvaJ+pFJnfdddebNjc3/37/oD+dM5pR+0ubB/sHamFxgd8dwE8hstKF87k999OOiAhG4jLkRjlxVBee8qjLYBO9Om8ua6PJPElTPVUZx1HahWoH3SMAITQZHorEXSAxgTCmX3j5et4Hs5eau+HaqM4jrC/0O34Ov4+K83YdCVMx7TfbkQYnmB5Kp3lOg4l+WdMUOAfZK6g7PT39tjvuuOMNf/mXfxl0qOIn4cqVK387A5q3ZpTp4mi5xNk0EAyAORowkGzstpPvTIYhTdREQimVeH3mPCz/Yh6dBmoB7GoiQdgp6G8AsE2gCT3RmJNrY16RS5tJU1bUObdbtg/Br5HJ4DTzMZ2+JP3GAQv2N9UfTCSMiYrMsXmVGNAKta3JwslTJ9XE+EReVpfXQAOGHTt27EeefPLJt7CNGj0Ryb33PO/qyurab2SNXM0XBMCeZ8pGV707QBM56g6TEzM1MTIyRKCbyDxEqgW5eqnDi7k3zAgYhHJ81gNnLQEK6Zf3yz1v2hPr5DknHnMZKWDA9IX6YvbHOmf4yRB7wRmWtsLXQTEYrFx5VLmptlAqjWJ9XDmur674QGWCIr8EGj9VDzhatxd6cbTQW27/r06eOKnGxuuXNeFfmJspv1OzMzs7+w1PPPHE7we6WVkmkuc//0tPZIzl/97e3nkVAI2555nOBa6urqqNjQ3xQN+KEo5SvvgklCYx0zlYysd8zwGkq3GNuXapAZEMWPKfIju0Tl0Wm3Ph69kOGHP8Wqj0VzIQESJ19uVRlqGYfTTPcf2TgImkT+n3aewnn6UAFbYJzgOQwEaasBggX/RlpBb15wFGR0fnM0bzNZ/73OfeL+uRUK5evTq+sLDwK1tbW68HYwBo3JVnADIANl/MDhbLJQ+rxObJu7Mj/5n/3qRNbTPmSGKYgxQM2h4eafrJZMaUDZL0EmdHyjxAXl5RaS5/2XNlXSSjs6XWy10/HDxqi00d/t+4UMBLtceLmyaTfA7avv6S1HNxmGaGIAAkGYjkK85M0YymYDzjnzs+N/fKT336U5/m+2VaK5AMaHpLS0s/noHJmzXQ6Idai17iPOwO9jClCwcV1344fz6otg9Dv8QBxAAwFR3TUT5+/WMck+3QbH2Vo5fO6xDnTFtCtkn6JE0lcvZyNpng6wYtFNi5+jUjVA6rwxy4N+4Im2nOwHv6//4ZgU6sDNYv1x8AkMDHzqanp626+tw+fIdmYuIDGeN55eOPP74o7IlcLt9553dubG7+KtQbRfY8g4mimzdvHolo/lYT6ZhjkTHlLI+axIB4CuCnROF16qZZgIHZ60bf9knlPd0pQEy1S811hPSR7ZY/nICbbJdKb2FLvr37u9er5p5sqZKOzjE6leY+S+55t16MhFJgYfYSD0Z6w0xqxVn9Ds3EH83MzLz2s5/97FawERULNJcvv2pzc+PdB+USZ++zzlm/b87fzA25DTSFxDm/9AioCbjHAo3VJ+EMdBMmxdfFDQhG031FLwUW2jEMkjKOsdeCKg//6RVK0iCHl/qaek6717NhwHpWinvA7R/l7Kl5KK4uNQZ4n+hv9cjETwd6JQRsk0vtUWX0rs3nzp2r/LtuYx+AplzaPDU5+ZbjJ07/yMc//lGR44h6au66664HNzc3/zgDkgujI6PG1zZr1IcvbQ7LLs63xRYJ6A2jM8Uk1jk2LZdavmsxU0XmxDg1R5GXEoIMF4BI50FCbUvLY2ksrC6mgyoXmu8x27Pql0EKnlKjAUnKMFLYdgiMpKynnOhXZ8+e9cZeLwQYGRnZztjOdz399NPvFNsnLQjyvOd9ycW1tfX3bm9vP1+vPLMXBPTV1ua2Wl5J31yzeFCSqnYi1AM1TM6mTQnn4+v0RBdty8Ah/1n9TTsROu0heQgl9mlb2PEKOJqY+ZKQfVVZxxmGUi2cY2YZgDJ4SOSzwqWbXDu4+RJKbwiQuPOSa0LVQzrhMDBe3PtFBlaSxQNl/fKxcMdSz8HoPc6qnQXgXPn+TLnH2ccmJia+LQOax4KdMVoXy/O/9PlTGYi8Y2Nj4xvAsPGx8WqHAC2352m+iESYNotSWT6nklvHfhjdydn6by5V5J9rNpeCG6qqcZIwgVSbgkBipp8CaSbMueFzGvZ8hssITH2ubSgAGilNs7yE/VD63d+5uvFMyHDgju2VTl2qoU/kQKa6Dj3+XRlqPOB3ABEQABlY3mzqL17U3MnLTE1NvjMDmh988snPXxfbLi0I8uIXv7h3/fr1H1hdXf0n0K+c0YyOeAbPz8/rl3pi1BfSgfM6LEm9sdoC6fpBTnOebaSn2khNSaL6NpwxW083Iqgbm6LknLCkvrSOW1YLZUcMA8LKeWUcJ0g69dIHcExK1h9NJsJjSUlsCjJkB2V/jFBpMn2PhvSbAYSGKPg9X7Y8OqpOnDzpzb8DwMDL+Pn8zNTU35uamviFz33uyW2xzdKCWu6553lfsri49MGs4Vm98mwkp2O9shNKra/D+zRr7UeGQjnqWNVJVJ0obYBe0wcsygbi4vuOPW17Ga6ud90QWyTzC2a52JQPVV/qhCinG5tu88r07JVePkty2RFqBXnNzHQqlo7DUp4Y+/JaRIDOPE6l/lyGIwXMsB34GKSkgl0bAGhgSXOeNnN0wLnyq5v96emZlz/zzNN/IW5EJfjj+++/d3JhYekvskYfrYDG/OJm9s/uzm6+Hc3BQZ9MXxxVaSPK70JulfHNJZBqcotKHKhVx8pLmyl0OxVn/a389AfFRGphVg8ZcyiYfdwcQyybcPtAjQXVNqafaqM4zjtxt6xyUmXYfAxni3bAChnPUD+kbIYrR9Su7DHvHUN5o2CYZDXIvV39rVTFyjE9ACYAMjBHo/sAp/X+ZuVCgeXZ2dl7n3jiiRtR9sYU1nLx0sV/trGx8d/kK8/cDTbBsP16g82j5Pzait6/2Poc3aZSXgqlSboM74OM18ZOusYGGpxOfx6jMJnSnsLKXKcvsS00DlQkXzk3fRwBENd+l8XY4C9jANh9gIEdd5372vA+xrY4wbfAcW2WMlmiCY/scTqk+s0x0MvUT58+rcbHx60xy9Nmuzu5X8/O/eWpU6de9slPfpLZph/vQrTccccd35oBza/B7/p9mqJz9YjcXuY8nHJUgPAogL7LetAy5b8S8HD/DjObuv02QJKrUxMPem7HPG7b3vPq4eDgLw4IAbU1HsoAOWG6VspUZOBDb13j9guzQ7KaM6SHs506rsEE/DgAjTveOm2WWbk3MTHxK9ev3/g+UcNmW7EVQK7cddc9G5ubH8ro1JQGGnffMwAZAJtDd2pDMmFjRlggVFqgKEtHkrpuW7a4doVsMIXrQ5xBipzLwHLP1O+mOhUYqzbnnrT4jtCyyHNWXB/c4xToUHMe5kevJM4JS+9Irm8IJLE+afvMN/hDjhxjQkEQUfij74JXZWtf10tPt+nyHNCYf5sMTLdutUd0wut7gdrmAYUFBZge+A9SY7C/GaTOXNvhHPw30huZn5ic+JFnn332/0SVMZL0pN1///1TS0tLf7K1tfUyABigWtinnZczoNk/YumzYRYKFIZNBsJG+voxoh9MMkWihM6XARIrdVW2ybWHtSOJ0ikd3DwGBciUHaF2OMfpsxfjnBOhpzho117OjuK8nzIL6RGnynrU1jVh4dpOeV4ogDdKKCwt6ekpSwGjATaTMRbrbL+v52d21ejo2F9PTU3B+zMfiTJWNYj1L1269LMbGxs/lhnfA6Cp9j0rHzrI+cFOzhkY3QYaRtpM73SfKgpHrO20o9g9r4pCyptMl84peOeIlEUIJKpzqpzwbTIcRI4NSzFRdnrOH3H0HMCGUnSmYADjCgcQpo7yD/QdH6+c8oHBG5e+z0rsgY0DZqoseq5qG0sX4kyqKdAIa1T2mHXhd/DVcOTM2XP5d7JMgXOQNitTa783PT39bU899dRqZOPpQHPnnXd+eQY0v5cZchxSZ3pBgLkj0WYGMpA+czt3WwYnboRHOZfDvj6Sh01URvUVt54nlNLRwgEWxyylTiPk7DkH5Dm5Ht7j0JyATre4fXJBSpoGcsu47UmAkjpW65elzYpKqk7POaklCVCa7aFnCNChWCTXTmoA5zNPPuBxdcPf+UuYk5P5+zOmgE7ISO1m/2V+vj85OfmTN27c+Idi48x2UiqBXL58+UoGNO/Z29u7TwPNKKTPjI7AJBK8vKk7JJFBRuVN2w7lgFNsaCrujSZqSzKP1XLejkvJYGW583WZCCdU1ct/esd5oAnfQxJ2xTlYzw7TaQpsdXWFUogxDisU+cemD7Fz+rpgDAyzrVaDtNtTVfDBpdZihGdreiVaYY9texh8mgENHzhiQOMuazZt0vMzWbntycmpb7l+/dnfFRtntpNSCeTuu++eXltb+53MiK/V79IUrKZWCwbDdjQ5NQvmQlRZp1V/1qngDGG47E8BNbdOV6xHonfQgUeIBeBpljq9ZQoGOOEgJP+pNaD3kpQ9oG0jk/BseQHLxGyoz9ngj6WNzH5I0mZYMOUKx7pCqTIfKPOfnn5sHNxzcjArmZMBik0Eux7UtQRGc/bsGfiYWT1GsO1MOT+zC/MzI6M3pqamXvWFL3zhQ0n2pFTScvbs2Z/Y3dn5md5Irzc6aqTPjA4tLy8H52msG1oSXXv1Zc49Jq3R1Ll14SCxaCw0rlRuNmRjKPIeNjFTK56ZRs7ejZophxUeVyLd0df/xM2DmOdxRtE3onb73Y1wes1cduuAYhl608yGZj6mSFga5YBDjt8XrSfMBkKMwRxv7Dkh7ehx2+nUz5ypjwJX116KUXJ+TpodMG3XbGYcljWfOZvPz2gdedoMXtQs52fGx8f+36np6dc8/dTTy7hSXhp5jvMXLrw2M+TtsB0NpM/q92l0f3r5MmdYFNB1ZHqUpA2WEd2mKm//CFCmIupBiQjgqpRS8UcKcMakOiW/c/W5NrTgzhL/BID3t9Zh1i8K0rp71QAatU2AMTXTaSD3mMlmKIctceo8+DiBlJFi5Jy6CyxU6okDEMxOCbuijnNML0U4VgP6IQsFQAOfbNafbTbbh3PAaCAjNTEx8fPjk+M/9oWnv7CfZEtSD0q54447vnR7e/vtmTEv0u/TuF/dBGOB1QzLLgFSR5uun8nNC17IMkVfcInTj2Frpu7Ua0L3kx9fDBCoOlUbQpYb4/hN4dIn1N+YYEAWYgaY7bHC9Sd0nTHHZtpZ/56X9tqwbbDTZEpX8SJzKROj2EcI4HDhUnJlCZvtMXq8NpGUF6cnBGrcvWT+zV1b7n6q9GcgcsrYDcDUq7edyY5tzszMvPSZZ575MKkwII1c7pUrV+YyxvLTW1tbP6i/TwMGmwIGA6O5VXcJcHO5R62LnnOucvj5EdWE1UjGI4ZNSM5zjtMsQ52j9IQAwr0PfDCVpTpD4Mg55xDAWGDRc1M/dkot1I5bXuusmJMxF8SBQT3G4XQYxWi0qRKwSRFJkEGVDd1DoXEXp8Miy4C/htQYLOA6c+aMxwZhuxnYdgaAZmJi8s+npia/4umnn47adsayKbUiyCte8Yrepz71+Gs3NzZ/p59pGhut02fmzaHTZ0cJaAYNILgT66DdADsQpauc8odxXS0gMB0cEimG9JSFjfc46offBxFJGgzLr8cBj5T1hIAhlIbxgaB2+BSAY2OBMQUK+GjA0b+bDraHHPMFs804idwffhrMBFBPBwOErg123+s6IcAKsRzzuES4sjptNj09o06cOO71W682g9+npqZ+4saNGz8rbhizpUllkDsvXz67vr72yQwBT+bpM9gloAe7BNQ3FRi8tLSs4C3TYQWbWAdLK1LkqA7CKVePUCJIYePQTYqthQUXhSKFsS46qrcj7lD5prZy/deCOWuqrBvB+4wl/w1lHRSrk6Sj7DK1k6Yduw/Wob5SjEX3yTujr1f+wqxUH9ZHH3RSJIb5hHRgIK3Px+qjBHSeOnVKjY9PWM8PzMlsb2/rlzThs80v+8IXvvCB+N4YdjSpDHLp0qXe7s7On+zs7n5F1ql8lwBgNeaAg+Hw2YBhmafpRPrKe1PdK9IB0DTVmTsj+CUBHGPalkTw3HleuWzsXZEyjLaum45uKXZUORWlnLSWywR8R0/aiUQcfApLNu8RYno+6LnsgGI9SplOnwK9UF9snRhzSUuFYccpthZicUF7ev5CZy4gonRjAj4ZWM25c2ezMvX2YXnaLDsHK4Xh9wxkPjg9Pf3SJ598cifYGGdHk8pa7rjjjjdubm7+fAYkpwBkYL8cc4jACaytramNjY2iUexhbssYgXTJLChn4ZfLfxKOTcZGWmEFjYGq3TkWsgzBQCQgY9YppH6hzo+60xZdtJVy5NJcXpkqJVSnlzA9WheVWuIYDZcyxBwt1x+3T1S6DUu1SViXVNg0G2Ona2s9/mYdcxk6b6cU0Ck7JEJdkzIlpk4iuwFABgq2ncmAaD/z5W+8cePG20SNcXY0VQDynOc8554MSH49o1v56rMMBfMO1p3sZ1QM0meLRaMds5pU50lRVpEjbAAYfkUVvDIpN12K8Iwm/yljEmWZpOEI9JVKEZnjjzteF2iK/lDtaD1sSg5xxqSzQFYhhpyepwPpK66rcIIYM6JYEZa2ocAnBoBpJ48v4fbL1X1vmqriJAQSdeo2vn5KGbecxD9xQDM3N6eOzRyz7kG9txmATUYanpmanPyqLzz77EfJBoTSioe6evVq7+b8zZ/f3Nj8IdA4MT5RLXM2V5/AdjSQ97MGri0jWhTXQcVEFfZDlAg0qE1xE9IxOuNSYPlPL01CVW+UEkN0cVG1X0FV9x4FANS/VNuh6yvR5zmLUlkoTcS1YQoVLGnGZg6Q1FmLwAVhl6FUkslKzTISacJquLY8+5i+hPSSfVY44GLMTcoKXYFT7iaZGmSg/OkzZ/KXNU3RbAbKZIThjyZnjv2XTz3xuUZps9y+pgq0XLp06au2tjbfvbe3P6WXOZudh99XV1bV5tZma47yi1YYdOYZSLsAJTnXpM0YoA45XaoOVq7NcQrbkP9UZsqOAxoONN02w47Mf2+kAL6+UgLfbbJCv182ILtMMY21+Dsi1ODZ985jusy2LRvtH2yfOXt9m3k7Qm31PZvs1G7KvQp1wD+fPn3GCTv6OcjAXPrIyEh/YmLix65fv/6PopQT0pq3v3z58qXt7e0/3traegDYjP5GTZ0egE7s5rs5u6ymbdE3X2wTcZG9LKVWiJ0SkEb5IaeSIqH6IdswjItNp0jtkDloPi0Taj92PKPKM4zK1OdKqKzE2WF6QmyNsycEWhLQwHSadUOROxbtu/U4wPWdtpyZhPRL6/s2CdlY4UCsFXbGSeVmGUK2HJ+bU9PlJpq6P3q1GfybkYXPjYyOftP8zZv/WWZgwPw2lIDc/ZznjO3u7f2D1dXVH4dO6S1p8kaMi6Nf3jSP30pSXcyevxdS0/6m6kiNelCnpAaT6uTSDObfphPBGEEhdNCBReRmH2MBUTsziZOiROq0bX06qs/PIJG/qs77TCPupUcO6FL7zTvd2pGmAjN3XVwdcjvNMefKxUvcmMmDaigPfhmWNQMhMJ+j4pPN2/lYZWzm/8jO/L2F+ZtLyZ0wbW1DiZYrV648uLa2+r7M4EnYZFOnz/JGypG4Ffc+y50V/JLYHWkUPijh875hlkWlU0JtprA3LkoHqZxMSax9AMt/RrEIt+2QDVos56MjVH3M8FmxjIWLrrH0lVuXdGpIsOTaZ+noKyvaxgHTBbWebiop3aTbVZbO8u9+ddGDY2oGK9LUm6krLh0mB/PkMSEEyk5PT+efBTDL60UAZdpMTU5OffPWwf5vrdy8mbwbgGVTG0q0nD17tpcZ+e4MTP4WGK/fqSkaKi46pM30OzX58QE61X5JPaX7ZoHgN2j6vmPStFlIj1SoiMd8qFJST9Lypl/l6seMC6bDlMoeVYOLxDFYbTvOK+k6lI6XZyhuVGz/jY9n3yvJteGCABaV846tbkkKgpRQwMeVDwGpdU2NdCXebqivuG70fJnGCqXwGrG8olCQRZrnuCwAsBgAGfOTzVAG/LJ+dyY79/mJ8YkHnvnCM9Ff0iT70pYiLRcuXPi+za3Nt/YPCopmf4Na5YO2tr5uvVMzqChe2k7lnJXyRijsWJ0H0s01VQ+8/S4HbYecWWDnOWpNOllGqAc16LgZfaakpPhIMSJyyi7KccWkyzibQmkwN+1H1acclqFJUYDh1qtZVM8D4rouPrFePBPxThvrj2tbbIoN65fZh1CaTA6UbjBg6tHvzfgBAgeQ3HH8vA322JhZxx0Q1GXg3RlY1gyspVSQawY2A/9l5eHdmXdO9ia/46kbT6Xn/ty+tKVIy5W7rlxcX1/72M7u7omCgk3WjfWKd2uAzSwuLpYfRCNouCNNIl6JfvNcDPBhwGNebPQlQ+PvvByKAng0zOnCInJ6PGvnZv8uSQf5ixtYWwL2UuPltxuO8rBrQTkkSVoiZAt2zh0TqUMWRexO+1R7MXqpdkL2SvtgntM6JX2VRO6hQAHV0dcumwcCzO5YcT80h9nKHY8BI3crHmwcTp48kYHNtKcT2Ez+bZrx8aez/77/+vXr/za6s4y0DjSPPvpo75lnnvlnm5ub3wf6gdHkq8+ch3IFPoi2vV0YEXBSrUnA+aJVAoyDdDbUy3hOlJ3CVuRl8p/J40m24bK0RMEcnRvh69+5yJSzLQQ4Iafo2itx0BQQYQBh69UdCNtBtY2VC/WVsz0GfEJlap30NaWYFGG1wpiG5HxoPKT2yPXEi6cb6Q4Ogjb7gf8gqIe0GezUDP7YLA9pM1htBscyf/3bWbk3ZkCT9IEzsi9tKtNy5cpdL1ldXfuD3d3dszBPoz8dYN6I0DFY6ixxtiGnioEB9YBIGEvM+XBUlpeyznNthBid2yeqXhMQC5ULsUtunCXn2rAZdbK9nnfDm9dHAho6iKAiR9cery7hbEOgUWpU7iNLRf2SCJqKhqn+1/bX26yE7lW/fd0PG3jqMpgOOfhgQYWMoYVAqx1pF5hwm81rp0EFmjw2M6Nm52a98jptlgHMXuarv+vmzZtvb8lAy9LW5a677prd2Nj47Z2d7a8eGSneqXE/iAYIC+mzJu/UUE4rFMlzLIVui68jAQgtVCROff6X04+30yv18HY2YSxNWRc/Xv5y28pmZTxezjVBwZjoCzcO2N9ap89qtDX+i3RuHdceKZvi2UE9IjigherK013cMUow3TSjq9A3WD5GXJasJUZPatuIJuUGnsk6CWzEgCZfBDB3XI1P2N8LM3dqzvz0p7PyXzc/P//JNIN4U1uXu+++u7e+vv4/7Wxv//2Dfn8E2ykARG+0mR9NBBtOpJGwztmmmiAFAQkDwMqFgbN2erWDpoGmakPghF07TABAy+AqRfqx8xQr4NrXFzQ054O//EY7R7e+W5ZjzxR4YYI6YH0OmffD7DadK3V/SYDG1OUzEQv22X4YR1HWYo1VcdKq44QYjJ30vaOPpTr3dtlIWlv0PcQHG7CkGRYBuPex/u4MyMTExDuy899948aNrXZ70xHQgFy4cOFv7OzuvmNvd/d5gKp6rqYWeEGoWOqMLQpoQ8RAo/xIOqYNEC4dxJ037cSieSqSEkXgoaXcJYuibl7ruMJVmc7MtS9m/FHzCIDVeuE/uHdcW826WF+0Duk5DCxoh4UwGyNKl7AVKN8jyrgBQjhNlZfyAYthCRzI+23ggFuVRRiKpcNYHeUCjQeObr8DumNEArZVu6XlLuhR9wMHjm2J6z/c5xWWNMOKM1OgPLAZWAQwNjq2nbGdr8lA5j90Yl8XSkEuXbp4IuvA/7y5ufVDMAgANEDfXKcG8zTbyKIATqho3dQb4+BC+sh6Ki56D6WtQikcSRvY8eqZLA56EannGBUeOcXYHmOnRFAwrTulzIjOBCiuzSA7ssZKt+NH+Lb0yjK8Y3aPccyIKk+V8SxiGFpK3aDUkVJEFb5fceNTnXVbQRme0EKFAXaXktKWOY76d3h5HlabudMXxU4AO3mwNjEx/h/Hxyde9eyzzzbeQBO1qwulIPBBtEz5q1bX1v4w6+yoXhTgPtCQOoMUmmVUB+wmKEh0L6xGRPr+yrMUoMml509iR9nIMK2yAeudIS7y9XQr/ibCnINlkzHuISDyI3A8WpTqqP5GUmgmwPSccaGcXlFIeQMiZaaUfaF+hhynlKHUfdMdcY/jjj/UnuR86JphdUM24OciGUavftdo0CIFGo4Fwu8z0zN52sy9L/XnAKDyxOTET8zPzzf6XDNrY1eKQZ7znOdMZIzlA1lnnq/TZy6qwiQUbEkDnc4N6ukbId408uFvKNWjzkbHRUkJkMTYyYETxzRCoObqsCJxVY++6ehiWQzvmOtWJOPBpXZMoZgJV8ZlQLQen/laYyC4bblrZNrH9Y1iYhwDCKa4CGZL20SnjqRsiepfUZcGeIwFOppQRkn3hTSIBJlOGaFQgswu+3ck+/f06dMKFmWZwaT+ima57Hk1++/RhYWFT3diqAo+Fs3lzJkz/zQDke9R8Jmacksa+yHuq83NrRxsKqMYZx6DIdhzjzENvx3XgcvblYIJ79B4B4q14QKdq0cKCFIb6/M4CHG2xrTh9qMszKRlsO12fEdVn/MdGm0nDbhmvdC15dml0xshcIZYiO2ci7Lu/IjbZhhsfFtZ9oYsC8f6KmVoWBuUTdQxCRBwwB9bF1tGLhnTWNH14IX5/CuaVvSo1N7+nt6puT82Nv47k5MT33L9+vXd6Iak9nSlWMvFixdfkSHnr2bM5V5gNfrzAZUBPZjQ3Vfz8wsyp5PnWmR7jYUibq6+toNjJl5ZZQ+odk6YCSm2UamPmFRRTPv90gvX7IaPMmk9+U/U1pB9bhRNRap12TAYuHZT17OyA3WQNAOQgi5lC9Y3rC/ccQx4qnNFYdQGLrVk67XHmeo/dc/abSqvDFc+5Lxd3akMSyJhdmWVLv+V2dEEZPJWsrrHj59Q09NT1lgAi8lXm8GWMyMja6OjY69bWlr84+iGYmzqUjnI5cuXJzY3N9+asZo3QifNzwfkBpSDsry8bC0KEDtCRT/YukwK2Ej1S9rTD3aqHaH2tKQCilVe4TcFykzKwi7jsxxFQB9qg1bIOi9/K/z6vG4Zd2ahlIrvmPiPTbl1qIg5llXSTobf1r9NNiAthwNbz7mMNMDqdiTXhzqW6pg5/UgpRQK4kVXoAtTstmj98FXNjKhUOwFY1zz73/7efj5VAdMWGZP5i5HR8dfcvHF9sTOD1QCABuTcuXOv297e+vX+QX9iFP36JuwUsJOnz2KXOlOOJpZFsOmO8gdlVjCa7etbsxnT0m3FAGv1t+Hxpe1TDMbUbR7jmAtmI2qHayfx3oj9sIW/p0IxKW+86uZF7MIu1yvLKOUucjDrolF5wIlSx5PL9PD5Bykb4YQDV4wJV/8WBRBd+QnCFpqBuedD+45hdsrakAsH9FKA4vph6pmbnVMzx2asc/1+xmZgtdl2Pifen5yc/N75+flfju5IpAwEaC5cuHBnxlb+n729vYd0+sxdFAADA0ADrMZ1XBIQcXWB1DevDpC7YRV1m/j8QNVmxQCch6bMl0vb4R4KHkgNR6h4R+JGaLg+ynnWKYKuAJUr4z+AhrMhx4cKThRZ103fYKvNLCucscJtDQsG7IEaius/53jbs7VvHqyjN7swATT8qr04u2jQcNuI0S1lVmKgIQIBiX44B/5Vf9zMFFjSDGmz/N2ZsbHPTk1NveDZZ59t5eNmnAwEaC5fvjy6tbn5lq3t7R8w02fwuxlt66XO9oMUBhZOUqL36DaUHQX3eiPKvZnNvnCpl1SRsDUtVjkD/NpMsaXaapbxbFVmX7ivZtLOgUrBmX/XzFPXwe2ubCQmuV2Xhjlv1OZeqZMBEm2fvp9c/ZL+u+2ngouEVTknSEAJ2cwDjYR50Kkvqg2puCxNUjagUdW22r9TDF7rhZcz4SVNNwDSOwHsZ0AzMTn5rxcXF98g610zGQjQgFy8eP7c5ubWtYOD/hlzUYB5gff3D9TSEr//GetQy3+5TnXt1PX53I6IPvhOLP9ZRTZYWTbdh6QotF4LZwLnuH7QttOOlE9R0NF6qL9YG5JIuGK9daNkG5IUWKyYjiBFv9Sp5foKpeR50waqHbqszZpS2U8IbDzWgICWtifkjJva1KW47dJ2lMzHTMuP9PJ9zdydAPRXNHf3dqEWpM2+fH5+/s+77Ym2ckBy5syZXtbRd2aU7RuzARnV6TPtRnVECOkzWN+dGxcJCFT6KqV+fsFUuZLMiWgpxxoLAG59t0xsX0KRqNQe3446DYmBnqsfB5r8pwigXXDFxp1LU0gctdiBVI4Md6S4Paoqyzk8yh4KKNOdniTSl6uqntkObGmfFbRfd9BthJ5p9z6BJc3wguboyKgVxEAArxcBZL73w+PjEy+fn7/Z2lc02T4MohEt58+ff/X29vYvZYBzl5k+MwUGAXZ1lkbTrmBRW1RKiKnLOQKqjGVYD3HeAifKsYAQa4plEpgOVx8V1WJRGCcmg+LqUX2hH+I6/YXZqctg7A3V5rRN/q47RejA2qGuvVsvbCftwDmwdXV25eClgUI7zjkMZqYNIZul50lyJZTG7Lisr/c1g9/1qyTAZvSWM5nsZkDzvcvLy7+abm2kbYNqCOTOO++c3tjY+BdZh78dBgCARk9W5eyh18/vD1jqXAyI/95EKCJGHaaqO0qWETIAU4cbpWOOufi9LhcCEcwW22HqHsnspMpIgIbSGQQQZYy31m/pwFN0MXZSgCcaT52uMgyNcfAUEHJ2YGCJ3QuVrn75wW8WLG0h2V2/zhhwdkYDTuD9FeOgUsiClxSwCtX1xr0oLNJLBQFcvZgx6pJFad3gV8+cOa2KeeK6bwAye3swP7MHx66NT0x81eLCwtOdGIPZN6iGtGSD8Ld3dnZ/IxsUb6cAPVhbW9tqdXWlOkYJy3ocBkGlqkzHHXZS+KZ8HGiIbFW+4zSPcedi26h6EmBLFHuRAFIYOOyIEwNSyimbQjEoLwBQdqCB1Zc44DC7sJlUdb7Xq3ssZmV4H/lzeGDmBicoS0VAw26j7lvY+dbthVhlKKUXx2Qp3SHbY77qWdVAx+uwBT4HAIzGjOagX3oRQLETwNhbMsbzpmefffZgUHYNHGguXLh4cXt7690Zur4Y/SgaXPCDvlpcWFT7B/v1YWE6hROp43YjbkqP/t200WQ7WNSe4tDcdqoHozTWt4XahsV3hK6T139q50NNVLt1qn/1QWNMMHGdsN/HdlM0ri0cQNnH/L9DqSisDaMQes0ohxrnXMsmQk6wvlBindVFJk/TTtx1+JalCKNsO/Ln7omuJa4vYeDlyoMfnZs7Di9hlv0tyhSLALbzz7Jk8pmM9bxhZWWlk88BcJYOVJ773OeOrq6u/mgGNj8HzXtzNb3iQdEfRcsPBVhACBgkIo3WU8uSwNLDJ74pXa4O7HyoDJd+8s4ZzDDEbkzgS2Fwdj/wN//Na26CApf6CqWJMB2hQALTI9GPAbXrXFLZjtipOUDD15OxDlPMgCemboi56cU5LjuTOnJJsDDswtldLWl2nj9Im21nQHOwfwC+9ld6IyP/49Li4vxA7R5kY1ouXbp0anNz8337+/tf4u5/ZuYUYa4GFgeYx0EkDjVGUEekmg2OyDETzlGTDwyApCmzmOgcsx2r57IP1g4CoFRtFjrAIbZo/m32FWdwPsuUR4y2k5SwlbwNbVCihN76NsuJ5kewuhWNUKL0DwXkIZYgTrPlQ83ZUV+LJizXPabtHkbQibUJ7ocTJ0/kK85M6cOnmnd2cn+aqdudmBj/suzH+9eefXagHT4UoLnvvvt68zdv/uLO7u7fhQHNWQ2kz5yH2VzqjKWDQlLdREoZDhJzSjozwL+jE2qeS8lhKRL9t1nWOOE9fCwzQo5x6ZlQGsNkip7+ykHVqTiXhdAMwR5/LH3n2kWBQ0wqJN4h+oyKt9W3E0vJIZah9bjUXBxgIi2aTlY41xDvjKsnTlDOKdOj06nudSF1iNpy71+iVhMgQp7jLgR8KOzSXLybmDec25wvad7eVvsHB/3R0bG/Hhsb/bKFhYXNzg1y5FCABuTcuXMv2d7e/vP+QX98ZLT4Vo3lpLPfYYDq/c+E5pZOMCZlQ0U1MWzJdcpYfQ5stPPggIjqhyQ1RLdr2lTb4Ovw8+k2W8DnuLA+S+x0+2ra4Ua35Jv5DAPEQJljja4dEpCjHVTAMaLOqaVvrDh1zOdFVl/m1GOCgJS6ocABP4czo/z3gz7hXsyNQdMAYxCMaXZ2Vs3MzHjHYfUu/JfZsD4+PvFzi4sL/7BTQwg5NKC5fPny+MbGxm9mg/Bacv+z7OKvra9FvcDJsZLivM9ovLoMffEdJ/UZgPynZ7euo/RyTyK6D4Fefdp3knSdvj5hOTLO8YccL5XmwnSxNlnt+aBtRrmU7rxYWRYDNbOePI3p9LFXpq0IMOPGj0tdFrdLmlN2U5YhhsI5Po5NpTpL8v5k0n9xdpjg1yvLpYEc1sYwptZMAb8JbKZ6VaS8p/QLmpA2y3zsfx4fG/+2hcWFTx2GjYcGNCDnz59/5dbm5u9kl/A4DFK+KGCkZ623hyV5S0vFnm8hoJGmlbj6PEjRiw9cYJEyJzMd5YKOV0bx512Hx7KInr1pH8eczHaoVCCeWuIYHOOcEQDGxkKmk4rAw9+2wXTGAC82TmYffOCXs7VwvwlB2ZJMQiCAlU1tB6RJG22Ag8nyKf2DBCGqLWAy+aeaDYFy4DsBaLLf+1kg/1MZGL35s5/97KEg5qECzYUL509vbW3/foa8L8tf4Bwfy7dNsB/ivlpYWEQXBXjiIEAIOPzq8Uum3fq6njRlFAIRrIyUtVERNA4IJTMr/V3YodnpMS4KrMG0rmTb0Ld8H8ew3P5Q7XlO35lkd3VY9lsgzKeKJMCDAVDOPHoq6PRlDJA6JktzUe1K2upK2mqL6gdIJ0DhATl9DdoCQ2AzMPWQS8lo9b5mwGayMovZ+dcsLCz8RaPGmth5WA2D3H333b3l5aUf3dvb/9lsMEYrVuM8XOvr62pzc1MMHKHI0y2H1QOR6tBlqXOm2O3V96ULDBQ7wNoyHWldtkaNXs/VEV5YYdrEOX78nB2Za31mmk87c2pOjX4Aa3Di7CDTNcTDzd0H7nmzjGkrxj44PU1TOyF210yKa2jr8hmXVM/gBG/Pvh4KKVPfV4MEVEzE7DSTifFxdfLUKedov9xuJn9BE6Ylfm9iYvJbrl9/dr0Dc0VyqEADcubM2Yf293ffvr9/8LC7LY0WGDRYFAD/gmBOgRL0PJGmkkalZh4cu3F9p+Q7bdsJ4RPtrh2ufu5GpB0s/Wlpagyk5aQO3C8bdkaWo1CGW2DYYqxopuEyOoqJStkWdp4qI09L5Rq4UoHzYaH6EjPWofSWVA+li8oehNpuKvG65dcjnJargwB4b8Zc0gzlddoM/svKbE9PT3/9jRs3Ov1Uc0gOHWguXbo4lVG878/Q9y3wN4BMRQNLgQEFVgP/FQeK6LFeYRufMmuLtZjnXSfu6S3tJMFE+RcETfX07PkVV1DnboBjVcZwqlQ6yu8jdk5bj0vQuXpsDNfBOXmJg6ceXjmbCtvC9rUXXtAgYRBVX3UJjF0FHKEsJadbweuGwU4uqaDQNE3otyvUo1MRbYrRND8eRUHwkwA0+h1ELc7Hzf702LG5r33mmad22jU2Tg4daEAysLlnY2PjwxnNmxzpFUADiwK0wKDDwC0vLauD/kF1jBL7YasxKJQGcvX65fOfHivR5zzihLEhwTmrXKncevCNmzyU4sH6iTulmnVheihGJY3AST0a7JQiwTOU1vLTPH7qjqtPjxm+YAAbP7++qmww69Gszi7DCde+BPQkwKrTgBSbo+phtsYASBMWklI3GWgYPYNIvUEbsAhgZuaYHdxm/4PPNAPIQNos86U/tLS09AudGiOQoQAakDOnT//mzu7uN2QDOEJ96hm2paGWOiel0JDzIQBIdepYGSzFVv4W1MHqKZVhUbDZlgnAFUs0lHgMyGvft9UtzwGU2w+3HZ6dOPZ75926tgPBrjGlJ5SSYVMdEZEvl44LjYUbAMW2IbBOSRywbYM/5qZ93EaeZrloSyV99K5L81RjiqRuzgk+ElaawVSDKQAu2/CC5v4+MJ2nMqB5eH5+fqEte1NlaIDm3Llz37Szs/OL2UBdpL5Vk7Oa5WUGNPqlA8KdiDxNVkfIdBlJKk0GNBTjcetTEWUK4EnSSDGg6jnbHp7ei01TYcI6dsU7O1eHthOzJdROWQplPW1JDDBw6S5J3bwmC2jNAFN6rq224urIgbRrtiKRY8eO5Ts1m2kzsAsABoAm+/0g86E/lx3+ycxnHrrBQwM0d9x117Gt9fV3ZGDyWr0oAHYMcL9hUX+rJuwUqYiVYi6SqNVtw61nSXnvxjhvrkys0+YZDR/1kmUYx4yVC6WdXDsJZZUzt/pERcTGUmY6pcFH23Lb/NbdIIVqE9cvs8s/rzzdfPn0fnab3nLToCk6JeAvaAdho50CjdMe5Z/g79OnT1sgA8eAzRiLAD6fsZlXLSwsfKIbY+NkaIAG5Oy5s9+8u7P79mzAxvKlzuMZ2PTsiS5IncEKNBAqyuYcOMlm+vqfcFQrAQhXB1cm160UG1lzdWlb+LkKT49hBMWeLJsDDxzJmMp2JNErx7pCLIMvYwNVWjtpZVkdyDXQ1pZHLXtFAQ/SjpTJti1S5pTKimLLtXHd2pJQcKsFVpkdP3HcC2L1FzQBcMZGx35tYnLiO27cuLHvKTgEGSqgOX/h/B0Z0LwnQ+QHgM2Mj42Xm8QZD1m/pxYWF/AXOE1vbYgbFfA3lx2R2tFw3VCsA+bSdlaE3lPkG/tUOrDWUdruvJzISu2RrTHoKWU5PHw8BO8hubqRKLE+hZTXY9AnggDlXHKkXKUDsd/TV6bTMBtTomwJgElsC/Unxk4saIp16hRrlIl8PoR6bkIOeRApx8P4+Bn4Q5ibAbAxx8V8QTMrszI+Pv7tGZt590CNY2SogObChQujGYD8t9vbW/8ELr9+p8Zdvgcvb8LCAC0cs+EcdijVhN18aCqOiIxdcLPAANODPEypaT5bj/ad9IoriaOhIi6yTE+WZuO2nOHF33Eary9jONL2MDDMzwojUn1OS4xN3H2QIpLAiAvIjArlmATmxAYksUBjSlMmFVs2RuCbMwA0PT3epe0Wmxkbe9vY+PiPzN+8eaN1AxJlqIAG5NKdd57bWFv90P7+wQUTaMybAQYT9j/TrMZbMVUK5/Ax5yhhPWiqioi2XVto4DOIhaoZje+MaLbFrRLjHIYkrUedM+3Bxs9lG7Iom452KSbgv0CL22qRXyFrwtrH+yIFPV+XW866T5youQ2n6NsWBodYlmTEGuhzZrZtlkkVKQukmIsE+KWBRFcgA3rnZmfV1PS0l2LVczPZ7/2Jycn/anxs7F3Xr18f2KeaQzJ0QANy+vSpN+/s7P4EAAy2LQ0MrN6WRgvl2DHhwMN0+uYxCa3m0mIxZb2+qBp8XIdJtRMCOqwc56Ap0Oba9sFS9wZpxaxjvMPBsa9w1I23YdqWwiaov3VUL3HKdT9sJy8Fkrwsszw4FFxImZdvb926a3eKc41hdqlpvlBZDICoa+toUVK/0AbwwJJmeEET9oM0PbdeaQYBeOYvr01MTLzo5s2bA//mDCdDCTTnzp174c7O9p8dHPRn9CcE9K7O/SLszNEb0mcVq1H0Q0o5GH2DUZEo/hBgN5c8NUOlwlx7tV12mqZKRHn6XNvMh0cCgFKnjbFDrG23jSiHEphjigV0ChTjHIB8XsFvXykMTKTg2HZ0nAI01P0S0yZIU5BoazwGncrjBMUwr0xPzRybUTPTM8axop5mM9kfW2Pj4/90aWnpTR2bHC1DCTT3PPe5o4srK+/c2dn5r2E0x539z2DQAb03NjYsVqPPUSkyt5wWuhy9BxmVfqNEYodpD1WX6pc0VUPVpf+mAYSr5/e3BslQ6kaaBtGpLt4R8qk4swzVn5jr7NlYCg/sSmCjrC2KlcaCZCwYtaUvjV2RhcMePKiCZu0xwNh0/MD/nTp1Kp9GMO9F/c2Z8gXND03PTL/++rPXP5jcUEcylEADcvbs2f8iG8DfzQb1DJY+g9929/aqFzhdkX7TRJ/jnBWlK+RIXP1+OdzBee0T7dQ6C1U9pEzRCs8QTFtsvTJHQLE0CSPxwYD+HLRbP8RUKDA2JQTqWLkmaaI0ZyMBijTGhetRjK5m7bQCJA6ApDCuKMAilajgULTRDuiAlzPhJc1qLrp8RvS+ZlngDd+cefPcqbmffvIzT+4lN9aRDC3QXLx0cXpra+u39vf2XtPrFS9wjo2NVvdXr7zZljKgyWmjop0ECOoIle+c8zLFAbFjws55Tg7Jp4fe4zDL8auyMMDiWIL/hEgeCGkZiQ5Kj4SRihmPCs8LyRxA2KOkRuim/qpsVCSePk8gAVWRBRHj6D5SKQDhs8u2VhWG24yxtS0B36e3mzGDRvhPs5nMlvkMaL5uYWHhfZ0blCBDCzQgZ86c/q69vX3YlmaO+lYNvMAJKTRIpbmCRb6uuFEx9vBJ0k1uu/F0uXY2pm31ufyIkjoW0q5CsWUnWRZhX/qcbR+fGhnUA+kK3i7PIu16vfJvIxBROkhJB9OQnW2l59oU7p2RgV5f4/YPXUMQLtBIavQQBJgMbKDp7nK+D0uaCzYDvvHfTExMfP+NGzcO7ZsznAw10Jw/d+7e3b29X9nb2/3ykZECaNwXOPf3D9Ta6mo+4Fo4ZuMKBkKh6EWSMgs/AHT6CbPFrRdKU1HOiwNPur6fzqIAmeqv2SZVlhPJuPLXggNyWheVfpOkBc12qEjcd2Bx81XF+aolsh+cNAUKsn4UM8srlN1v16l31j+nDIicodEpSrMO+DtYaZYviDKAptpuZg8WAajtzDe+Znl5+b1RHRugDDXQXL58eXRne/t1m9tb/1f2Zw+W9Y2Pw26lPcvhAauBFWghR6gFS6O5x8uK3k0vcfDYOy0hp1zZYebzHJuNwta7NiKH70RDrl1YfUkaS9Qnps1Y4dMYeUuo7ZY95Rhjfcf6kW5PHBMeNjEDuiKjF5dCSg0qUoQdV+N54eqrQJm2RByoZr9OTZovaKrqvtVzM5A2Gx0dfdfU1NTrMjYztDfWUAMNyIULF85nQPKBDMEv6c02YdDNiwWDDUCza7EaGyMwJxoSiePEhabarkM062AmtfkAs6AqKO+eo1JrvA5kfohJyzjaqjFydVX2WBfeYQdFwSCTkTjUVMBoD2jimE+XEmK0MSy0K5GykpiUZart4ZRfAeyazegPQeo68K/+sFm/2KX5OzM28/YkYwYkQw80IKdPn/6lbGDfmF2EfLNN+E/f3PqibW1v5ym08qDXsRgHwdLg4oR9LCEythmGshyolAmI28LqClaixUT5shRPON1E65BOyCvV1AGHWEh69Jv+FjybGlTlS66RabLw2PBjnsoCYyT2+tGBXLieFq+96BRgmrh9zTfPzICmp9svz+t9zeDf3kjvUyOjYy9aXlxc7tzABnIkgOb8+XN/Y3t751ezgX1+9QmBcv8zfYMcHOyrxcWlalGANJfupYmcFV6mUHnoXqAMGSFLV51VtuY/0XNBOwX2iGx2UoOx6RS/TG6xrV/Qh5g2uC2CQswu7EzDiwtKRfQiDGFqh3agUhAuWCAHdoNMIbUhFAC3yV7asClFTpw4UXxt2LgmOm0GQJMd3RmfmPi7i4uL/6JxYx3LkQCaixfPT2/v7P5Cxmq+Fz4boFeggZgXARjNdnYBXFagz2vBmIkpsSkmic6ylLIdQpkKqnKvSmEOI5R+kjiH+IePToVxczzm2HORZWhepy2gCdcNs4zUKNnQQNQNA0RQc1LE340tkraO0hxVqsTu6oyNCfg3AJr8Mym9WidME+j5mSzY/mQGRK9eWFj4VNt9aFuOBNCAnD175lUZir+rf9A/Njo6ln+rppqrKX3v7u6OWoVtafaMTwhUTtx28BQzSI6OispsGUw/VU6XxSbxOd3UPIM0ZcIymbwRRb6Nb9ZvMp4h4eZSsHNs2kkAzoc9/9H1vIEksAodi2+bn8fUtnQhTfQP6l44Dp8CmJryjhubZ6rRsbH//djMzH//zDPPDM3mmZQcGaC5dOniie2t7d/d2d39m8X+Z5A+K7alsVhNBjSwCs08roVzvN5KMTOtVRQKRO/xICMBCKq+m+rTe8CRKUE0BRRatICnCpWg3+FxkeX/MUcWetglabGmDkM6vyFzavratG8n2hoSGEntNB+pW52ZHJYAmzl54mS+vyOIvjbAZvQigMwHPp2V+9bFxcX/cJi2SuXIAA3IpTsuvXpjfeP3Dg4ORqgXOOFCrKysNMi5++WpVAP30KVG1LERuds+7zD8nZilDCulXNtOUpLao9qOs0WS6kpLNbF29OInnRt9fCvQnjRl2GmULxiTgTNO0bjx/gCEslm/oFlIkZKBsnpfM/h9bGz8f8v0/NTS0uJQvqDpypECmitX7pxYXd340wzRv0x/QsDcbBOk3z9Qq6tr+QVxpc1UiCQ1FEpRYfW9ej18ojiGUaUKN9fijqV0TOMco4wVxIChlIXQ1yVvSUmAZjjmI+IAOfa8pI1bV5AUvOD+5sbU3G7GFP2CJrCZrP7OxMTkSxcW5odu80xKjhTQgJw9e/ZNGYj8r/C7/oSAK/BthlW91NkQLpWGlWPnKhTPDCjmFAYI510RI1WFMR2uL5L+hphRcSz/KaiLl6tus15VCNWDjUXQgZVFinRQny3OO80w25MAXpeMLkVCgQB1P6YGZaGU6zBIe9elfVYLbAY20HSfbZ02O4BdmkdHH5uamn3pjRvPDN3mmZQcOaC54447zm5vbX1gZ3f3TrgYADTmp571RVx2NtsECU4gG++WhCITcQSPPMDm32R5ZWTuUQesS9G2SFNjTZiCJMWn8ZLT1RbLlMzdVHYYfsKdt8BAo6prlKN0N+lPGywVu6dTdRwFaXqvx5Tzz9NzbDH6wY/pTwHociA5yOxlbGY3ZzM3M7bzw0tLS28TNTYkcuSA5ty5c9lV6L85Yy1v6ucLL8asFzi16G1pQDBnWJUvPboPLmaEy6dU2pZQjlfb12a6gpuL4tupz0uiYGlqUXJ+kCJjM3kJka5B9qtpe8NwHWKBRG7z8KT99AuaIKaPcrabeU8WXL9xYWHh84dpa6wcOaABuXTp4pdubm79u+wCXNHpM5PVFJNn9QucZlSNzStwaQPzOCXcXIa2JzTXEJ6zCbMCU49bzh0DvA3ZtjTS8cBszc8ZdK1ppJ3KLGPbkZWLc1oxzjOUJo3RyVQOvjjKVz8cQHLHR2SLKJU3OBCCYHl2djYHm/5B33o+YL4ZwCaT/czXff+xY8f+5VNPPTUc6CiUIwk0d91111jGVt6aDf53w9/UCjT4+iZ8QsAFjdDchTSvTR2jGJQEIEJRMWcT1pfyJJOG48VqT+vJp0Li0hTY3FJ89Gnr19J1yk1aBqkkWjGlpY00p+TadCXDwHxyO5qsxLMUDW5eaWpqKgca1zcVuwDs5jufZH7u8bGx8a9ZXFz4zECMalGOJNCAnD175mv29vb/TUYnz7vb0mjHDmwGljqX0UAu7oXU5THBnGOoDlaXOyYRDKwkv6fawZ9HVtoQ8xlsG5QzsB5uLqJseSIWaVfP27QC0i1J1868mZOW7OWWvt8bJbGMZlgAUQvYY26eCaIDTv2CJvyRnf+ZDJB++plnntk/JFOT5cgCzfkL50/t7e795N7u7v8Ad+7oKICNvwJtfX09ZzamSKJr6l9MsIlgU6dTWvGT+IQDFUbHXU+2g1DjUR1jbG3LjkE7irg2u025DJuj5ESD9aCYwVEUSP0fnzuuRkbN9H/xrS29eWbGZj4zOTn1ihs3rj9zaIY2kCMLNFeuXOltbGy8PLsQf5o9dGMjI7ACbcKLbIB2wqIAoJ4gGAiIUl2l8wyt4sGcMRXxa0HnMZDj0vNYv0LnJUwoRkJpxxj9bY0HZ5c0AJCkutpIxSWlSIdQjpq9IIMD8oIvQ8oMUmfudlN6EUAmOxnQ/Kvl5eXvH4BRnciRBRoQ+DBaBiLv2d/f/5vZnz1zUYC+wQ8O+mprq5irMY9rCc7ZaICxbr6eccp3SFW6vK/dU7wDl84DUQ9yE2cnS4XZUTurq6gcZZurozCAnn+Q65SxDRE77DGT59y5luwIi5RZYeXMY7yeYQeTtoCjCz05myk/BWD6If0pAFhplvm0v5qYmHj9/Pz8tcaNH5IcaaABOXv27H+Xof4/yC7MafNbNebNv7+/p5aX8W1pYlJkZnkq1yyf9JfX40BHChaxemN0cSyvqAu/6dmOW8sZSVKqTZhimhNvPs4xzPOozUU1eWbaFnhBc2pqOvcl5nNkbDcDHzb7x5OTkz95/fr13bDG4ZQjDzQXLlw6v7Oz9a8zsPk6d1GAKbAowPwCJyV4asROq9jnUC2Keu8mNM/hlu33wy+PcnVjy7jMzWVkjgbFp5vK/hpMpPPJ7ESgl5Rpe56rOxECjajYIJhX93LYrAarB37q5MmTSBbmoFoEkB27mbGeVy8tLb2vsfGHKEceaEDOnj3zHdlF+aWDg/4UBTZbW9v5wgDYC80Uk6G4W6SEb6rmK2jcD63V0b9tY3FO5hxT8//y/rT7pchQW02i864XSBw9ub1QIU7CacPU/sLGmXrzTBNkqu1mst8zX/aO0dHR715cXNxKamRI5JYAmvPnz13e3d17a3Zxvl5vtoltSgeLAmAfNHdOhhNu8tcFgFgH32S+pomQ+oLzClhKpV3HJZkfajs6HcjEe29w72Tw0v7yYrSVQwKcYZ8v0gI+Cj5sNlp+6iRn/JnpB/sH+VYze/v5djOrGRC9/Pr16x8+ZHMbyy0BNBcvXhzNooBXZyDyruwGG9G7BbiAQm226Qo2bwPSZJWQlmYPQNipN3nAZXWHd54lRmJTi7dKpB7sx9AAYrochWuFvaCpV5rBf+V2M+/Mynz7UfiwWUhuCaABuXLlymwGIp/ILtAluGAANPYnBIp16TBXAxfRFRpMnN2UkfKS9EzTzQ1x2+zzpmB2DWJiN+ycQ0CFj3fbtjYJHtqWw54/aNuOYZeUBRltZxTm5uAFTTsYNj8FkLXXHxsb+8bMX/12aw0fotwyQANy/vz5H9/Z2fnxDEiO6c02Qcx5EGA1a6tr0Tszuw4URB79y1lAyk1NpZe0pDns9lNinC1tPszcIgxTulzV1Jb+W83532r9SRGYl3E/BQCiV5qVL2i+Z2Rk5DXLy8tH5lMAnNxSQHPp0qUHtre33ra3u/eiXjlXUy0KKFMCcJOvLK/kOdBUiZ9g7jjd5KQ7pEtTpamyVnL6raRk0sfxKKXBht2+oybDNG8DtsDcjD2H3MsXKWk2k8lG5rtef6uwGZBbCmjuvvvukdXVlf9ld3fvR+Hv4r0aABq7m/DyprstjZZBpB+SbnzGx4aXKQdUdz6vY9VQdkeES6RLoc4Xi/WkS5bjAeuw0y1dib2oAySuj3mNlH5GBh63SloQfBJ8c8YVYDN6fiYLjj+YlfvqjM3cOAQTO5FbCmhAzp0792AWGfzxwf7+hV651NmjqAf7OasBiooJ9wDFPlz4Kqr6wY5tw9ZHs41ahyLLuDpTnCllZ4xQQNI2WA4WUI+GpF77ruy4lQX6WLygOWUdLxYBAJvJ5473R0ZG37SysvyWQzGyI7nlgOb/b+9MwCWpqjwfW+bL93hVVEFtr6CKWimWKgRKsCiWhhkRlClk0VZBhRJp22Y+h1YctUeke1C71Wn9WlpQu1twaYeW8WvHRgfp7gHns52xlR79+rOZGUSgKF5tuW+xZGTGnBMRN/NmZOR7uURmRGSeX31ZL5fIyJuR997/Pfece+6GDetPwjU1hlG7FafNWLgzX5Hxb6VSFXTdCU33G1yNykHrDQoY1hrp57PjSFgh4O5ZhVGtoQiTuJY77mCAEkaatQcptawZN93MP8Hr78rn878IqZgjYeKEBllY2HB2tVp9BtrSrMT5avjGhT8shjq3NkZbJiPxgIxqVB6WGPWWpaB7B+0NGUf8P3/4hZrdzx083uvo/Y79vn85+j3/IJ/RL4P5BkcfLr98SPfIi2CD1gwGAXjhIs0wA/37JFn5Yi6bjm26GT8mUmhWr14tQeX6Fvx4N+NjlgONB3/UcqUsGLqxrG8gqCmZoXwQPTmye2kx/nPxTQEJxGm/3OePr5MZhsA20BqmDGR9BE4YwQHY/2DyTLsfcmfOsRwsC4BrzWSVRGJ3LpuN5VYASzGRQoOsX7/uak3Tn7AaliRKoq+vxtB1oVKtdvXV9MPQls8Q62yWPbfPSHPw8i7vNB7uWrSLT/8RfkGXp/s5RnXeAc8kjHIxb08lCE0UBxuwjLO83UKaW1sBWHVZUR4p5AvvHkuBxszECs1pp50+q6rVx02zdhVWKW/+M/zBcY+aalUVNC34NEL9Tpkh/XSoNNINh2BCxsdTlmA+RIiy0RkLWLoZb/5F/O1w3YyJ1owoPCsrid8q5PM/CqmYI2VihQZZu3bNWw2j9hdgsczZ02eK7OYjbjVSHFEUCoXAP3upabJxhB0Hef7ux412Iar3fVGYyloSUWxrUDQQGA/91a3xKydaMuif8dK+QFN6SJLk90NfFOvkmd2YaKFZWNiwUteN74CYXIWVsW0Bp41T6VBo3IVSIwmT7dcH5BcSHe1pm1HS25QQMo7vsrQ/rff0OWGaCvH43Xujl9/e75hxXQPsb1auxAWa7T5ilm4GxQbKkoW+CbMA/GTkBQqJCRea9WLNrH+wZtTuh0qV5EOdEVbZcPEm3vqN5lraasF7g6/ZsN+9ZDmG76iC9HEMG1AxLOOKZBp3xBTRSZyEMpWaAWvGkzwT/mGWZiY0iqI8jpkAcrlcPsSijpSJFhpk3bq154C18rBp1i/Gx3571eCPjXvVoBmLFSKYitxfJzTIZ/KdeJCLJ70BA72Vzf/7jmtBYCBh6HgnoDJ2m+ZzgvoGESgStSiyVL1zrJmVgiJjuhk3olNwrBmWBQDQk8nkNSAyPxxboUNg4oVm7dq1SctqHDSM2hfxMVYMvwg0XLxZLlf6O3kvocAjChceVccdp9Fi2AxieUbJRzfJROHazczMCCtWrGh7DsvEb2wGYvR4IpG4AYSmM6X8BDHxQoMsLKw7VVWNf4Efdl3LV4MCILbFs+MWAjjKaE6t9el8Hl3l7i+x5TCOd8R571Ij6GiPrsNYJ9ELvfoTolbu+BLUJm/913e0ZjALAIqN/fluk2KRZvZWJTACTiSTB/L5/PeHLGDkmQqh2bhxo6gb+oNmzTwID2dwXQ3ubOfnq8GEm36MIkig9/dGu2MfJePoeMPu3MP+/KCJ1/cZTdvCfGYYacZnJMG/aMU4kWaWJcvS0yBEB9LpdJ9TKfFjKoQG2bBh/ZW6rv+ZWa/vkETvFgKCXdewEmAEWmsB57g6+OFHXuOKQhv3OhGk3wWbvF+o2/vHudhzWJYvQ/iLNYkWeK3RN8N2+WXXnflmnAWaQhVevw36m/8SamHHxNQIzc6dO6V8Lne/bhgfgYei5GZ29oakLmXVhMVgq+P5LNGjd8J3C8FGlp+KC4Olgxe896cduha9k0wm7R00eTewj2/mSVlWbioU8hNvzSBTIzTIurXrrqjVjL+uNxqn8EEBfCNivpog0tIMxugXQY6TIBZ79na+/o4h4kccflccwGK6mZmZVIfQGDVDMGu2D1iVZfmeVOrkh44ffznaXyggpkpoNm5cmDUM4xuGUbsJH/sl20SW2hjNYZRTFb11wEE4vHvttAf9nKA7hqF8YBHJKhBIGHbb+0e7norSH/UHWjMYBMAvoWj3zdjbND8Jg9zfyuVyL4VY1LEyVUKDbFi//gLN0P+hUW/MehdwMphV467a9T3PsClmgmysYTb8YD+7W6c5mfvCDEyAIfNLDySiNt0ZNdqvD/YnGACAYsP3G/y6GbzOiUTiJrB6/uuRI0fCmjYZO1MnNMiaNac+ZtRqb8JRLhMbHqwMaNX4Jtv0aeQDLbZsG2H30KDdz+1cmS4s/94eSrPc/jHdizWi9TwBWiBTJ0TLMOwgifAHI81w2gyDjfielQUAuL6Z51OJ1J50Lr3UlMnEMZVCs379+tcZhv54o2El2Loar+WClaNcLjvx7iMm+OkUYhIJ6nceWX0b0eLkOMBHmvHgdWIbmwFF6Gs+WSwWPxVKIUNkOoVm3fo506w9bdbrF2EFsbd8FkWB997xOdBGzeSsFncsoyCskWF9UNG+TsRSxPG3w8Cik09e1REAwCfPhH7mJ4lE8h25XPa58EoaDlMpNMiaNWtuMGrGX0KnOGcLjeu8a1k2GI7orKsZ57qRIKY0wm6ocVqjQsQffs1UGLQizWbsx3y9RksGgwCABlgzHwCL5/PZbHZqfDOMqRWaDRs2rNZ17dsgJlcxq0ZGsfGMpLv6aohYuIqHSccTBRGMSjmI7qDAYBCAV+w81sxzIDTXwcB16qwZZGqFZvv27WI+n7vHNOufhIasdEu2iSOSUqkU2LqaIOfZkUlPz8KXAxll9oNeMgoQ0SZwN5F9QrzTvc7Mg8jMpFId9YVfoAmWzOfg9uF0Om0EWLrYMLVCg6xbt/YMqARfqNXM6/Axm0LjxQZ9DZVyRdB1va9zB5K7bIzO1cGyDwR/jkGPnzTi8/2DinwcD0HkI+SbJTr/MUOz39YjLKRZlqTnkzMzF2Uymdyw5Y8rUy00CwsLCctqvEnXjW/UG3UJndh+Vo2hG0KlWmlaNXGzSojgiI8AEMOz/Pot9M1gWLOXmlmzswBgXYE+5bOrVq2659ChQ1NbcaZaaJDNmzetqFbVn4OJuw0rBUu22b7gCiPQevfVkIAET5Q6+CiVZSniUs7RE7w30V14aYc0i4LY1pMy30zD8c1UZSXx6nw+92ygBYgZUy80yNp1a/9D3TQ/bJr1edynRpJkT7jz6CPQqFMgukF1I5pgAMDs7Gzbb8Mnz4QHDSWReMhMpd5XOXZs6iLNeEhoBHsB5yaoGF81TfMqfMxbNXwmXwwKcEMVA2cSraClXEyT0nlOyveYdvoNkcY+4uSTT3Z8M1Zr1VgdrBkYtDqRZqL4MgjN1blc7v+OptTxgYQG2LRpk6iq1YNmzfxiw7IS3XKgochguPM4sgV46a9Di0PgMUHEE943ww8Q8WbWQWTMOt63oA/5c0WW78rmcrWQixw6JDQu69at2w4WzQ9ARLYzX41fDrRKpf8INMYwUVmTkz2ACBOqG176H5Rhv4C+Gcnepdd5jk2ZsRs8n5Zl5WChUHg8+DLHDxIal7PP3ivm8offrmvGI41Gw45VbNuF0wXnXnEKzbJwynXUl48sk6AZV0dLHXon47gmo/6MbpFmtjXjTpnZA1VJ/qSsyJ/I5XLR2kUxJEhoODZv2byqUir/2DTrZ+Njv8zOGFGC62pwEyOCIKYLXP6A+8209QuY08xNnon9gyiIKojMfug/fgFCQ6MNgYSmg/Xr1t1t1GqfY2tmfNfVGIad2bnbFsa9MsymUlHLJ0Yj+KCZRmt2vN8Zq2u/KdIw0qxlzVjNYBe2QBPbAAjME6eccsobXnrppWn7AbtCQuNh06ZNa1S1+s9g1Wxwd8PzzRZQKpWF2hIRaJ37xkSvzvUmDvFa+T3pkKCHB/YDqzBDs9Se5R37CSY0cMwR6DN+p1AofCfEokYOEhofNmxY/x7DqP0pVB4FRUWRlY6tWdFMLqOvZuBPCVN8oil8kwgJw6QggiUzI5w0N9exnQgTGXdg+jX4ze8sFos0t85BQuPDxo0bF0BIvge3C/ysGhbKiNNn9sKsAYh7VmEiXlC9GQ6cQsdpM1lW2qbbWJQZCg1c48PQT9xRKpWeDK+k0YSExoetW7dKqqZ+vGYYH66Zpohbs/LrauzlWRbz1VTsZ3rbjXn4xj6MX4cYjKhc39GWo3crNyrXY5x4180g2A/gmhlmzcBrXwKh+QgIzdQmz+wGCU0XFhYWdtXr5ld1o/YawXHwOVYNt3vksFYNg9bIEER0wanz+RXzGLLc7DGxD7AaLNIMQ5oFDfqHvdAf/Eu4pY0mJDRdOO2001KmWXsX+mpgtGJfJ2+2ALyrabqdLYA6f4KYPLC9oyWDOc3E7r6ZBrz2tCwr1xaLhanPAuAHCc0SnH766at0Tfunmlnb6oQtepNttrIFjCoHGjHtxCdwYxKt7WYWAFFq6y1ZQJCbjuoYWDN3l0qlR8MqZ9QhoVmGjQsL79YN/QGoUCm8XE5QAL7SunRsF06+kQXZ6Lr5ZZBJaNhR6aCiUg4iOqBvBq0Zns5IM+lryeTMXZlMphxSMSMPCc0ygFVzqqHr36+Z5sVYqZivpok74CwWi3bFC5JJ6vgmbeHoJP02wzKya4GnDLGHwnZuZ2gGawZ9Mux7snQzbqRZSVHkGwuF4t+HV9LoQ0KzDOecc46YzWY/BpXqY2AqOznQ0KphYiM6SqOpmqCq6hg7n/hMqcSNXpKfktAEy6iuZ7/p//nypFKzwhzuNyNYbTMIbL8ZN/nu34FF85v5fIEizZaAhKYHTt90+m6zZn5F07SLWMX1y4GGQQHkqyGI+IPte8WKFfZfXgAbVqMZ0gz9gJpIJN6Qz+efDq+k8YCEpge2bNmSMOvmO6uV6p/VG3WMb+66Xw2GOw9GtCyUSRix03cg/Fm+raFfBv0zPJ2+GeXbpVLxzcuejCCh6ZUztm49tVouP2OatTMaDavTVyMEt66GIIjwYFkA8C+D+WZYpBlaM0oicV0hn38qxKLGBhKaPljYsOFBo2bcYZr1pN/0GTK4VbP0KItGtgQxWti0uG8WAN6agb+yovxdIpE4kM1mtRCLHBtIaPpg67btZ1Qr5W/ohn6Z5bVquAgZFJpx+WpIgAgiOPzWzbAMzWxjM2hzR8CaeQNYMz8Pt7TxgYSmD3btOk8uldL36Lr+CbNmynj1gvfVEAQRBtiOZ2ZmbIvGa82YbL8ZJ8nut0Bobs9ls2qIxY0VJDR9smnTaTsNvfakUattwdENv90zH0o5inU1BBEkLWs4WoEoYeG3e6bXNwNtPQ3HvSOfzz8RYlFjBwlNn+zYukOu6tV7waq5zw1xxJXBQquxOpe0ZuJ+NWWa1iKImGBnAUjNNpPmMuqcNZNIJv9YlpU/yGTSpZCKGUtIaAZg27Zt89VK5Zearm+2rO4RaBX01VAEGkFEHrZuBvMZipzUeKwZNZVK7Umn08+HWtgYQkIzIKdt3PhREJr73aR6nds9uxUUE26SVUMQ0YZFmnmnEVmqGaAGYvTYqlWr3nHo0KFGSMWMLSQ0A7J1y5Yzq6r6M8MwVrAcaCg0vNjgPhXVqkrZAggiwjSzAIA1w0+btVsz4ouyrLynUCjQ7pkDQEIzIOeee65YLBb+vappH4cRj2I1BNdXI7SJjWnWhVKpOPJMzmQ1jY64X9+gyx/36+HF8c041ozlY81YVsNSlMT98/Pz9y8uLlKEzwCQ0AzB5s2bztR1429g1HOmO4fbYdUgFIFGENEEE+TOr3SsmSbQfBv1hrt7pj1bcRSsnuvBmvlpeCWNNyQ0Q7B9+3ZJVav3Q4X8SK1mNnfh9IJTZ5hwEyutl0kbHRLDQ3ViPOB1xpxmqVmwZiyxuZ8h2waApZJSFOVBuP1uNpulOfABIaEZks2bN59n1mp/run6RSgkWHl9I9DcXTixMlMfMipoPQjRO7huBn0zbAaC/WXhzHiDYxYTyeTF2UzmlTDLGndIaIZk165diq6pb6mq2tdhBCTae1SgGc6NjrAC4+iIZQsIYrQ6UTtseubGCWLUMGvG9s14LMiWb8YSZmZSf5TLZT8SYlEnAhKaANi2bcsqXav9SDf0c6CCit2sGpw+g2OcjnUCBIIg4koymbSDALztFGclON/MkWRy5opsNvOrkIo5MZDQBMQZZ5xxn6ZpH4RKehILd0baI9BMoVQq2c/5+WsIghg92P5wG4BkItnWA/IZmoG6oiifh8cfKJfLNCocEhKagNi2bdsaXde+rOvGjSzCzC8wAH01uq7bQkRiQxDjJ5FI2L4ZL0xk3ByGv4Djrs3lckdDKOLEQUITEGDRiA2r8baaYfwFiE3K2YGvM7Mz89WwyCKaQhsdFL1FeME6gYkzUWzawcWZjm9GFEQTrJnPJJKJe9PpdD2Ugk4YJDQBsmXLllPNWu27qqbtxwrrlwMNK3S1ogqarpFVM+Xw2b6J8YC+GRQaL8w3g9YMiMw/wiDxXfl8/pchFHEioVoeMNu377iiWi3/LVg1yTpaNZ4caAhWZrRqmEUz2Ki7eygvjeSjB/4cpCnhggM79M2gNeONdESRMetgzcBTiWTyndCGvpnL5ciaCQiq+gGze/d5yWIx93hVVa+um3W7w7d9NdwOnFjBdU0XVFW1Kz9LzDkYtHaEIHoBk2ZiSDM/8GOBObjGzQ3iOQTH7U0DIRZ14iChGQHbt2+/RlWr/03TdJFtjsasDN7awNQ07D5NoRHEcgw+qMJ2h1s0K7LSsWaLZQGAYzRoq5+BdvmxAApLcJDQjIDzzjtPKRYK3wWr5vUsczO/jQATHHwNo9CGt2oIgugGtjWcLvPzzVgWWjOub0ZWfphIJm7NZrOUBSBgSGhGxI4dOy8Eq+YHmqatYYEBLOEmb9nguhpm1ZDYEETw4IwC+mbQmvGumzHNmp1hHdpjTZHldxeKxa+FV9LJhYRmROzceeaMrqsPwWjpdhAb+zp3RqA5TkjMGICNoUa7cRJE4NiJM1OzHcEYOLBjWQDA4vmxoig3gTVzLJxSTjYkNCNk27atbzBr5lerqroGY/QlqXMLAQQj0JiPhqwagggOHNytmJ8XZEVpC/1jGZrtdTOiUE8mZ+6Epx/J5XIUWTMCSGhGyDnnnjOr69rdlXL1k4ah2yY6ZozlYQk30VeDr2HFp8CAyYDCzMPHsWZSHdusNzALANwa9rqZxPclWbohn8/TlMKIIKEZIeeff74IArJVU9Wfabq+Gp3/kmddDeuM1Koq1EynnpNVQxDDg9PRGADQ1uZw3ZqbBQDbGTxvwnG3FovFb4Vb2smGhGbE7NmzR6xWq19SVRV9NQk2wpWw4rPKj7H8UOkLhULTqonzSJhWvC/NUteHrl0wNDc1s7dodtausazpLKcZRpzJsvJUMpm8LpPJqCEXeaKhGj0Gdp119m5VrTwCVsteO14fnhPtwACxzUGJ02f4OoqQSVYNQQwMWjMrV6yEdtY+fYn3WQAAiFE2kUjcnM/nnw6vpNMBCc0YWFhYEGfnZn9XU9VPa5ou44jKbwqtDqOsSrVq/ygoNHG2aiYJsjLiBf5WuNfMzMyM/di2Ziwn5UzLmrGwDX4brJm3Z7NZLeQiTzzUesbEzp07tsFI6juVSnVPDRdxupujtRzGzqpn3EJA0zQKdyaIAcHFmSedNO+uW3Oes3MKNizbD+paM4vQxt5bLBa/G25ppwMSmjGxZ8/ZiqbV7imXy58Aq0ZyR1QdxzUamHCzAkIj2UJDRg1B9I7XmkH4BdEsqlNJJL4MQvN7+VwuE1ZZpwkSmjGya9eulKap/72qqpfUDMdaaRMb17BBiwen0DClOVo4BEEsDwoKS5wpiVJbTjMUFyYy6JuBtnVxLpd7PsTiThUkNGNm27Ztv61p2hdAQCQ+NQ0PDsDK5ZJ9v2E1hEad1tUQRDeYxYLtCHfOTCiJpsiw7MzcFs2mJEt/MpOc+VAmk6GImzFBQjNmduzYMQ+V/n9WKpXdfMLNNnARp5twE8Odw/DV9LrYMAhHeZyc7bSvTHRhWzTzuQTxL9ue2Q3CeV5REq8rFPK/Dru80wQ1mRAAsTkAQvLNSrU6j0n9RNFj1bjZ0DE1jf0QHhsGBQYQRDf4Tc28AyQWzgyNqiFJ8h8mk8l7wZoh7+cYIaEJgR07zpwFg/7rpUr5Zk11IitZZmcG3sWUNY5VIwu6boRVXIKIPKnUjDA7O9f2nL1kABNnYqRZvYGzA8/IsvyOfD7/bEjFnFpIaELirLPO2qOq6tMgJKdgQ8BVy/wUGjP9q9WKk8YcXjMp3JkgOsB2Mw/WjMzlEWTtB60ZO6UTPFASidtAaB7N5XLUkMYMCU2I7Nix45vlcvltuqHDiMtqy+7M/qIfp+pGoLHtZgmCaIGhzBjSjDjNxmk7fDgztKejYNGcWygUsuGVdHohoQmRc845+ywQkZ9UKtWVzOHPT6GxURmGOKPIsEzPBEE44MJmDADwDtBYOLObODMnSfLHSqXin4ZZ1mmGhCZEwKJRoBH8SaVSeQ+Iiew2io4ILGw0GBjAItDIqiGiQBSiBfnEmU5ZnMVobK8Zt4zfkyTpt0ul0uFQCzvFkNCEzO7du89U1eoTlaqK2wnYzzXFhmWmAVR4DRsOzkPrGqVmIqLPqIUIfTMrV67sGJxhVma2DQCggtXzVhAZSjUTIiQ0IbP7/POlmqZ+XNf0DxWLRcmdT+5MuAmNBn01OB+Nf8mqIaYZlmoGfZfeTc0c34yTvgnE6HuKkrw1n88WQizu1ENCEwHOPvvsi81a7UuFUul8XKjp5EGzNxNoHoONCZNtoq8Gp9A0smqIKSYBbcBOnClx1r/gZNJgvhmgoCiJGxVl7uls9gitmwkREpoIsGf3nkSjbt5SqpQfqeJOm7Wa7eRE+BX6zFfDcqCRVUPElWGm1fysGW/iTPe4r0E7OlgoFKihhAwJTUQ4//wLV1QrpZ+WK+VdmqZ3bYgoQuivQScoyxxAENMETh9j/benmPEJdzCGNxbODJRBZC4vFos/D7e0BEJCEyFe9arz7iqXK/dD41ht1kxBkqWOdBr4g5VKJSEBozkUnaDDnacll1cUIqaiTJSvDwYA+Fn8bYkzJelz0E4+JAgCTZlFgGjWpCnlwgsvXFOtVj8HlsrbbYe/1bDTnfNgw2KLOHFkh74a2omTmBZwugxzmnnhtwEAkfmFoig35PP5F8dfQsIPEpqIce7u3Qcq5fKj1Up1zqgZvhFo2JjgGDvUGe+zLNAEMYkwKxutGPTNKFyqGed1q7luRpTEuiIrn0qlUvceP36cfDMRgYQmYrxq70WzRrX8AFg1d2BCTXeE1nydTRU0w51hhIebpBHEpMMvzuSxE2fiFDJGa8ry92VJfm+hWDgUQhGJLpDQRJDdu8/bbZrGU9lsdo13z5rWnLQlgNVjT0Cz5IEEManIuA3A/HzTN8PgE2dC20Br5s1g8fxNNpc1Qyoq4QMJTUS54IIL/hMIzQdK5bJQx4wAPs5PbGBo1czOpgRV1SjcmQiNYYIHennvHFgzMzOpjh6rXjftLACuNfNTsHguTafTNOqKGCQ0EeXyyy8/LZvJ/HMun1+tqlW2ytl+DYM6catalnCTCQ8t4iQmEVycOb9iRcfzfOJMaBtHYTD2vmKx+FgIRSSWgYQmwpx/4YXvKRXyD5RK5QQKCgqNd+SHIuOEOycEQ6dtBIjJY35+3t4500vTmhHsQIEvzc3N3XXs2LH6uMtHLA8JTYTZ++q9azVV/WsQmkthpOamppGaC9VsOwbuqFXVHtXhTpyqSlYNMTlgODNGmvllNEehqdft3IBHQGhugDbyjyEVk1gGEpoIs2/fPlFVq/+uWlU/ncvlEuiT8Vo1LOEmRqjhdraYwoasGmISwLqNa2YwnNkvcSYKjTul/BWweO6CNkKjrIhCQhNxLrlk3zrD0D91Ip25vVKu2HPSXrFBf03NqAm4zcAMiA1aNbSIk4g7s3YAwIx9n6/vjsjUYUCFkWbS/xFF+bJyuZgJq5zE8pDQRJyrr75aKpWK+9PpzN+Wy+UUc/jza2sQexEnWDU4+muuKyCIHvCN+uL2QgoDjLJE34x350w+nxnctyRZ+qgiK3+Yz+dpZBVhSGhiwP7Lr5QLueOPl4rla0BsRDfKpqNzwDU3KEQ4r626m6hNM3wHGuXcXXFllNeULc7kLXOWFQMHUe5n/xoE6ZJisXh8JIUgAoNaXkx49d69V1aqlS/ncvmdKCZ+Wz4jmNEZRYg1SIKIG7Y1s2K+meePiU3LN2MHllXhuHeVSqW/Cq+kRK+Q0MSE/fv3S2Cl3FcqFT9aKBQlDHfGBtkSm9Ze6eirmZ2bs8Oel/LVBDE7QpYCESRsrxk+nJktUnYizeosLdMTcHszWDO0V0YMoB4iRuzbt+8ssGa+k06nd5XLFXtvdG9KDpQP3M+GTa/RIk4iTqDAsHBmfgDDhzMDx6Fu/1uw3mlxZkwgoYkRl+zbl7AE66PZTPbeXD4vok9GkmRBEts33bDDnctlITWbEioVSrhJxAPcvnx2dk5IJpIdPRPLzoyWDQyuHgah+TD5ZuIDCU3MuGLfFalKrfLUiePH95UrFXuEJ8tSx45lhqHDrWaHh9JOnEQcmE2lhBm4ebdn5iPN4LUCCM2FIDK/DrOsRH+Q0MSQS/fvf3c6k/liLpeTWWoaBmuk2Cgx4SZORaDlw/ZRJ4gognUYw5mduizaYyZ+50y8wWMDROYxRVFug7pPqWZiBAlNDNl/ySWrq2r1x5lM9iy0VtyRXsce6hh1xsKdu+3ESc788RLy8pRIgrU2OZO0Q5qd+tv8r23nTKinz8uKcmexUHgqxOISA0B1Pqa85jUXX1kslb6dy+VPUcFy4Z2nvHDYW0LDaBB346TAACJq4ECHz2fmTTXDsjPjXjNg7bwfjn0gk8nQ4syYQUITUy6/7LL5cqXy9UKhgHujN62aJqIzUqybzk6cdnZnQ2dROxMJWWfxoxnOrCQcFyPnn2FWuZtM9jlRkq4rFYvPhVtiYhCoVcaY/fsvuaZSrvzl8RPHT8WQZu/EDOt0NVWz962ZSSXt0GfKgzY8JGrBgNaMPWXmY82gJeP6Fi1Zlu6UJPkrMLCiyhtDqKXEmH991b+a0wz9g0ePHv19XJzpFxjAsjvjVgL2rw033LeGIMJmqXxmXAAAhj3/j9nZuatPnDhBFTemkNDEnMsuvWxNVa0+m86k15RL5bYpNOevY+Vgo0UxSs3MCIa7x7ovnjDpSSBM64MsH3/YlBlaNN5r1AoAcHwzsqxcVywWfxBicYkhoRYQc6688kqx3qj/x2wmezeM+OYxlBlh1gzfiDEYAOe8WdJNmkIjwgDrI5sy8z7PBwAADbDQ/0pRlDvy+TxliY0xJDQTwJW/8Rs7SuXywyA0l5XAqsHUNH5Cg/dZVme8z0SJIMZJIqHYGQDYNC9fTxuuX6bu5DM7Cs/dWC6X/1fIRSaGhIRmQrji8stfD2Lz6NGjR1eyNTNtO3Ha/zlp1lFs+JTrtLqDGBe4gBgtGa8v0U6aCQMkjJJ0d4jVJFm6XRKlx4rF4uSGSk4J1LtMCK997etW183aA4dfOXxLoVAQvYEBCBMeOzjAFRsu7ToxpYzLj2Sv/j9pXpAV2XfaltvQDNMqfQv+HARrhpL1TQAkNBPE9QeuPyNfyP/oyJHF07PZHFvo5qbz4BdyWoIJr1UrToqa5XbkjIZDu3+rKxrlHpxQyx+wkYsRZriRWdP5L7QngmUBAG7SzDRuaJbP538VXAmIMIlvKyR8eeMb33hjLpv9zOFXXtkOlk1zuwBUGtawWeflpKhR7awBjTpOo+GaBQoQIIJFwgizk+YEhS3KFJyBD4PtM+MKKybNvBPqLm0BMEGQ0Ewgb7r5ppuOHjv28OHDh1cWCkVnoyhZEsSW0jSPZfnQ2NbQGCBA0WhEUNYUZhZHx78Cg5lun8MsGfi8miiJXwAb/IPFYpGywE4QJDQTyG3vvD2lq5WDhxdf+dRLh15ewRJvypIsMLtG5BIX4mgSfTr4VwbBMclvQwyIk9hVtOtZAsQF0/7zm/PxU2ZtIgP/JFl8GI74fRCZQ6EUnhgZJDQTyh13vFcpFdMP/vqFF+5cXFwUKpVKR5oPhA99NkBsdLBoUGywM2Db5hLEcmA9YsEnFtSZRDJpLw4WfaLLGFxWZnzvMbB+Ls3l8s+PvfDEyCGhmWAO3nYwVSoXv/Dyy4ffuXhkUSkUC87IkW/89n+tDgDFBafPcErN7gAwDNrdr52m1AgeJi68gKD1gpvtofXM9y5eS4YFn+CgBsToGfj7oWwu9/fj/QbEuCChmXBuveWWLfl8/sHjJ0687tChQ/ZGaQifnsYLyzVV80lVw7LqshsxHfBpjdi0Ky8w6IPBCEYUmqbV7GYQ5+sJ7/iHYy049mdw+z24/8NMJtM99JGINSQ0U8Bbf/MtZxm12md/9avnXp/JZp09ahqW3WH4OXzZHDvC5tH5Pdud90kty8iNaPNaPb0Ikdfp3M0J3fG8Jdhl7OqwdjWUva/5V7CanV/b8+z87nkFtolcWxkELlS8s2zs+3rPx07EfBHeEzefZ4j8hwntx7PysUOX+f4dT3e5vs2N8zz7GjXrgr2gsn2AIYGoJJWELTIYbLIUlmsVsyhItGTgA54Ci/kgnPcQDIZo1DLBkNBMCQdvu+2UcqXy+WPHjx9YXFxciXvY4BSZM/3BqsHS1cG2dBp1OxSadRqYKsTidvj0o+vzwvDB1MudI4jPiAteH0g/tN5n2YMQHhQGdkOLBW9syqyzDO2hy+zcnBWD7zXgvY/CsfdkMtkTAxWYiBUkNFPELbfcIjfq9ZsKhcKnjxw5uuVE+oQdJICpPyTRv+PgaevIOIsB6WbNtKbZmq/wZ2xWQGsZueD3kHdG2ULbczwdCahd66RlebTK4Zesmn+u32TWyx3PPrtpNbgl8TdAWjLJfGnt5+ro0duO4S3TbuVrS1PktWY4Hwxv7TUtNu783USOBZTg6ygyYP0U4cCHQMzuy+ayerfrREwWJDRTxtve9laMcd5ZLlfen8lm3nLs2LGVbC8bZCnLxA9vMEH8GG4JvLv7o3ufnU9oTZFZS4joMqrEVtALPtNtbce0q2pXAV4Ov3P52YN+osI/xwYXLGIRLWYQmLokyS/C83fD7elMJlPuu4BEbCGhmVJuvvGGk6CL/J1sNvOB4ydOrE+n0/ZUGhduGnYRI8VS01J8iHgvz/fDoAsnu5W31zIxoWyJXUtyup3bYn6cpsBItv9GVmQTzvcUPP9ZqGtP9P1liNhDQjPlXH/dv7lY0/X7wLq5Jp8vyOVKGQRHd4IF8ICuFo5n22hhtL6QYfwPbecRli8n38l2KwsyTHn8fBkDn8s9oa+wuNOM/Lf2C77oEEnuHd7r0R4s4pyb+WEQRVYEJaEIyUQCnYA/s+r1P6rV6z+AwQztSzGlkNBMOddee60oWdJqOSHdVqlUXlsuly8ulcunwl9RU1U7SwCbAvGGrUadYcRpOQuml/O2RaIJSwvcuBNoDnxt3KlAvxB3FuIMtxOSKP4YXvkG1J2nFxcX0wEWnYgh0e8tiLGAO3XOpWbWm2bjGqNWe4uua5eWSuWVlWpFwBQ2uKbGERzHkvHu8740YtMVwYcAd8PvGG/oMP/6cp003xl6j+ulPMtitWyGbudphTtbTeuja2fPmTvsPU370eOU9/surdN4oxyE7i2eWSb8+9zP9Q/ssJpTrK6THxdq6vD4/8Exf2w1rCdfPvzykS6fRkwZJDREBwcOHBBLxdIG6EiuNAzjtbqhX69p2inValXCNDUY0uyEN+OWu422iLNBndAMthhwKdqmdZaZglq2820d2H6yHjrxfkWq97J0XyPkL5oW9z6f8zOh6nptLffrexbsOGdpi0BDUcEcZoq9OBNsYVHKi6L0giBa/wDH/mcYkPzvQ4cOaf5fjJhWSGiIrly6/1IZOphVoiS+2jSMS8DSuahRb2xuWI2Tzbp5smmacyA0cr1eF9kWvBgqbXeGrNNjnTEfXGB54rB4i4A9t2znbXnf0Py/zfrxOX/zeU9Zmv1we2/dKuNSFgInUP6+Eu5t7rnYR3mtFlZaPnLN+7GdeM0VfL/UfjT/BVva1HrcDGNmv5nYTFkkybKlyHIR7udkSVqEA9FyeRZuv4T3vgC/+mG4X3rhhRfiGn5IjBASGqIn9u7dC/2OmATlWdkQhNVgxawHy+Z06FZPkyV5E4jNBni8BZ5fC4fPYT/HVthjx4VCY+dNQ+sHDrAaFuvt7F4fOzVuCsxyO2t3tkhk0zaYsoRf+CGwTAUCp20Sd4zFC4nTuTcfOp8hsneKbhnsj8FnuLUrTY96M3S43aRxvmOz8M5xDSyuU2ZmLjS1BJ9GQwLsQefywJHu20XP+hfuPR1ax87VvN/8pp6W3fSptZz6zn8Nq+Vuc31v8OY6HFOBA0rwVAEGDy/C0T+HNz4Dzy/C7bhhmuqLL75IKb6Jnvj/oTLjT6VpdMoAAAAASUVORK5CYII="
+    },
+    {
+      "id": "cable",
+      "u": "",
+      "e": 1,
+      "w": 106,
+      "h": 667,
+      "p": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGoAAAKbCAYAAAAdcB8CAAAAAXNSR0IB2cksfwAAAAlwSFlzAAALEwAACxMBAJqcGAAAZWNJREFUeJztvV+odUl2H1a1z7nfn56eGUsTeQarR8JgEdsKChkh4rwFggIO5MnoIRDyYIJNiHEeZBD2i0VegvPugI3zpkAeAolegsDSkBgmKCFvfpItyYNG4xnc6h71dPf3796zy6f+rL+1qnbt+323zz7cvbq/e87Zu3bt2rVqrfVbq1bVPrqdroKOl27ATmO0M+pKaGfUldDOqCuhnVFXQjujroR2Rl0J7Yy6EtoZdSW0M+pKaGfUldDOqCuhnVFXQvdi1K//+q8fDtP0n/y5P/fBf/zv/qW/+OVvfP3r/tmzZ+F4c/TTNDnvvfOs/Hz+l4+EdM6FcP5mUy4lv2Nd5Vo8m34GcS+g0Pju1Sed4HXL+wZ1jdU+OBbbk/7Nwd3d3bmXL166H/zgB+Ff/ot/8dEffe97/+dXvvrl//9Xf/VXZ/PhO7SaUX/nV//Ov//s6dP/8Zd/+T/95Z/92Z/1H370ofv2t3/Hffe733Wfffqpu729TeWe3Ny4w+FwbnRmU/k/90V54sl79nDUV4nRnrpinvPDw3HWn+lYCDXbxXG8MfyAe3js2Hif+BHbBMMoXwJtyRTKYIv/Qf1p8BWWTednvrl54p49e+6+9u/8pPvmN7/pfuEXfsH9pb/8F93v/d7v/b1vf/vb/8ev/drf/e/+wT/4H36wpt9XMeq//dt/66c++fST/+Uv/Nxf+PkPvvmBe/Hyhft/f/f/c7/5m7/pPv744/PoeeFevnqZyj598tS9//6X6AFZZ3qvx3MoHULH5zODvRr3wMz8fcZrgIlRmuN1cTTHSyc/IRPigcQAg8lUZ2FEPlsGBTDbq2tzGRhIxzODnr/3PDP73I7333/fvffee+6f//P3031+6Zd+yZ0H9s35kl/59NNPvvpf/82/+Z//k3/0j96M9v0qRr387MWvffjhh3/5t37rt1In/vy/9/PuF3/xW+5b3/oP3MuXL93nLz5Pon57d+tev35dnh4+Ao1CD53kxGjloxQIRnfNXCygynjW8eW4AyYY96NK8CTywJEgmnf3dOk0eXeYDu541iRPnmRtcro7uY/+5E+i6nPf+c533Pe+9z33z/6v//vM0Pd++YOf/uZ/db7sn9gPVdMwo37lV37l8Kc/+tFf++ijj3xkyj/8n/7hWWqeuG984xvuJ7/2tdRJ8ffTp0+T+M/z7D744KfPx6c0wqfDebTPp/Tgh2LHgguo6pI0nE7loSfROUkmzgWTqvTE0Fgu1XGu38dr4rHzvX0pz7mSJDAeitec2xbPQTsinc5tqyQ4X5jbktoUEjOSdEbJLefn87/43LG+N7dvzibgc/fZ55/les/PFOl7f/w99/lnn6cB/erVK//8+fO/9jf+y7/xP//j3/jHLXN9P0a9//z5k+//8Ac/9eNPPnGv37xJHRFv/Nnnnzv/h3/o3pRjQPGBnj57mh7+EJkERjYy6jChJMSOikyNJzwwiNkP6KvI1lhHtnsBzx0Ss9DyFJWXrz/NZLMDipTDe8ROjPXBwIBy3PakdpzriQPucDyk7xVQOTPt+fP33C9+61tRWjLz0uDJ10dQMZ2ms7QdU/lPz7b8K5999o33v/F+7P/bd8qoF68/969fvfbx4eODzKc5dXQED9jZpbNiX8QRGkcP2A94KERIwARlNxxDjC2gUG6TJYTZKE0STEj1KVEd6GeO3xxKL6hTcT1jZvz+6qzq08AI0b7m5wgFOSWAEvJgjMfiAHn95rUH4DVCw4z66le/7D788GNCSmgXdMkA0IBJhIS9XON7DrO9Oh7AjoSqPFTTYpJqErZDsKJASDomBwUMGW7zaoADTzSlc3OYyzW+jMVsnUFVo3syx0H+qt9uRsOMur0lNCVb6rDDaAQ6OWQHqOpshuXJuNcV9kCGZjI0S1VQMxDKwiBgz8Lrg/OJCYdJgBocnCHbRwA6sQ9TdWe1eDzbtVEaZtTrz15SowP4NU6KFLM7fSZxqC79IiyBB+mBPessPbLrOwRn9T56PFx6Ae01BheoZzEolLZIpmAOSj3mSgEsIcNK/929vus+A6dhRj19/jwZ89xwIPWwDGkJ29RQT8IPFUTqUxwVI5wQI1wjVWpjADg1toQNDZlZSTXUXKP7azmNjMhSAs0AJ5jqp3ZG0BQBxhoaZtRNRHDcAXQSIUGDrdHeUk+mqskXIMQmp5+Ynj/lNZaNaRHYDt4SrI87XcX5DUyl21EQl1GenxKoArQnketcJIxMw3QzVXW1aJhRd2dUE2YJXemT0NWSSuoRMhQkk4GGHmmfaS3J8KFn0poPtoeZ1BjImIIeWy3KPuHknjx9b7iN4zbq9ZsksrxBJCn37yROWtnA4F5EdUZIaug6vBw6mGwsaI9mFYY9g/JwOGKvBMCmmt0pktFyPQwaZtRXvvIV98MPP6waZlENtQ2lxGNorBxHDSueQ5FfJWBNXw0awbQG2k4FRlCdAqcYGMLoC7fZKXh7M9zGYUbFQMjpbADNCQqNrFQvNbvB7MwajVFFgZmrdyPFFmn1ztvVvmsJZRX/D82cK8HmoomiyoO6X75+OdymcUadshftTT4xn8HVCI9UCIOubrSrA4EJhLb5OJ9eKDe6t60a9aPYSez8UOJ9CfUB4AIVKKIhgfonlg/jbR1HfdOxRCRaqqI9GWiRPdWRzsg6QUOyjlE1mV9b92uq6+Y14OQru6yjKKW8uI+KX2bklyMUyNBBGmbU569elUbJ0afhskUECnp3sH0uAQSroa1BA6knwfZVUqbQHIgGRDpU+6AMb0Hqi6IFgDFR2OYAUH5OUyCzewCH91WMkqeRkFlVB2dcpSJ4TJQ/lKUegUyJYeEYNNgDoxGLjcQD+f3ET3goZrfYc3IJQjfBY2OpjPekjUrbb+9Og21aA895pHegn2D+KDCG9iLd7EImAaRmQPVxp7gVSgqsKt6ecWbJ5oA9RHVWgRz6RIienN+QYDhXcXOZOzsczqbk9ACq7/333nOf/PjH6XtT33vmkzhptfIgk+EaHr/jTDE7lTvYxVinKvxy3A9ql+0dgzMgS4QEXaXH+WDkOlfUDj6VA1vm3JvT8Ez8CjARMb8xAJrJJep3cEytlVGHqlyV7I38INRg7Ug2r2PfDBdu4Dq4v81ej80qT1QKijkxD32Q++zZ8dlQ2yMNMyqG5EGMhZ+hIgAkTYTU9Lncbu2UAsvs3uNZSBKB1ay2A6dmrdW1IyrSROuOHwxyQAEcdxlIpHjg+djTh5jmePXqc5z/102kEWojNzhnO5JYoqqXwZAa2TWYBPdvk0x+qTXsqB2TIMMVh5fH/cpRBzoeECrcAhOABmiFw+vc4Xg0dP16Eg5whdslg6RDQB1DGoXrsRq+E/Vg/TJxlvD6AvKB5wMSumWhlFIY5qb0zEOfhhn1paT6Jroh9iFBQDGaKqiuGpV1I4OyuSswZubo4b28qJwLohmZamZV9ggdZ3WJPF2dqm0Vd34105nzIp6Pakp5Fg8xFR9SOteM/gBHeJQ3INraJOwA8fTc5pBq81VlpPs9GyT6xrxNGusJiF0B11B9az5EqSAobtbSl9s6l3bNJV3Nz+MSPT4f9fKlYUaC0VEMGTXa0eoAAYFdp4JY1peuRN+Kq0aW+uwdi08G5SsbanalieKPn2J9zokElxiEnQMffPRk73/1/cGbrZ2Kn2VuO8Dr3AjQ16RrVjmZTGtl9VPbG9EpQvoc63Mr29YZA6oliZbtkoMAj4KtDfKY+M7UKL9nvC4mi47SMKM+fVmcXSenmKlR0ABSh6siAYIJUF8DlQkXocYjHMKTdFvAhd/Y07VVOWFss9rCwxQaEkxGDZ2HcwgeHd54KEYoXr94ANT3+edvkh8F2mGGYCQLrZC/sKDfO1SzVtunwDRUsWOGnhVpXY4xqz5a3U8CGFYjY0RRsOQ3pi6YBQKUihVADKnXmAI+SsOMOqR88lBSevmIgufjwi1HaZvqzqrAIfN1uH3hiHcowsCdbfRpbGa1/DwptTRIUGoDDRCwS2gffGZsSuf2uT/v5geInn/pS++5H338MUJbU2JYr42pPQWsixnQYI6r1XwuP7k1IYld1RBpGRi+r9w75E7gY7KSWCdlE+14/vkg8PzZsyPaB65GvBxmwzZK2n9KLpFnJelcQSqLJcqRDPV4mI0QdBD+2ZgtJfXGfScxmByXcgIf2p7D/FTMU785PEDOxI9+9GPV7PxFetihUl0tQh3vAo5OUbEiEBzoWIqlEUTntXOHVqBFR0zOnbss+dYzVSp6ljYMJD211VNb4d4p0WV8OmqcUdN0dOjs4oMyeJy/YfmhDnBySILKY7iEn3awDrhGnJb0sQuxTXanj1L3iXyu38oXQakFbTAHs2yPxmN9r1+jHyWe9S0fXMiBaZeotMkQx5B3qVQXEwPJBxwUhPDsDuPt63YpukuergJgEehqqGMuWbNPn44v+Byf5nh246Yfq+YGLRX11EKVX8Bdksq+GKAYtaI9IriUgNR5TzYFjsMfDo+dcw0mFbBi3APDT1x9IiMABaZld+lYZAquJYbwUQEUr149wPooMtTkRzk8woZ/R7dwn7OG1eNqoNtKK+4I9yw/7OiDbgsbOIHQIr9HKolQXzI2sW2uF4wnZoUZw02jtCKl+ZT9KA5DwXkAQOAAIKjnZDCa+idY3DKpp12xikC3DOoabCY0i4GS9t28OGK20suSVcQGoiiOggAYNornxucNxxn1tT/zZ9I+Ehy5cOKjSY5mjtKk8zpGgZjQuEiDjlbbOKE/JtoLoV2PV/bAB4Kb8tucZyqggWdfpXXIUQWOR5DWpDSfCpgwkiA7D6NHI3de7RLqai4m7EYkjOtVpgZDNMjK+ihfW8TmJB9TexYa5X5XTOyDheBrJ19X2KhDju8ZoZMwcPP2eZkCxgmZGqis5Nwgk7SKDYz3zMTCb0iorHy2umIBuXmWkcW0eCTtDjCHaiZiiVZkIR3SVgEugDoo9gb0cAhChcjR3/cbpGQUBjDmCSPuAV2tYBYaKboGW6ehPLgB2Byyr8GQauchON1vCgCOeZ5JBd48wDTH7e0LTILX/o/rtxEbivC4Is4kCT7SX8ETiNUFg08txo1KnmNRBLiU7sdTvahmKangsuhEHtQYgdIVJvcAKw6de+JOp5nDJnXeo+HMbe5D9YqYeuIxMx4K4jDLAoz52ILNW0l8GgMHh2Mdz8lzaAEq1Jf2koYAv+pB9pn4/PNPHeRWD4U+QjA7s1ncuZIHCEfanS32mmA0HrHvMLMHjAIguEa15Ys0hzRvl5xftjTn2bMHSMCMKw7/5MOPqcXYeD7E5LEVoax8nXMi41QL7nqU95aq0KqRO9RM3GmlR/nNfLU8/sg/A9BxFx5gPsr7Y1n53Z+9FWjHECmp343re41YI6LmHYSj0GjBfagGTknzBHpe2EEpo/Qc63uQfSb8mfvTgaB0YpiGmOzZceR1OnfJYlRTCeUvVz6rczOMyAM/VtdnMxQAYBUGKzA8rWQRtpZNz5eLHkT1xfWmOCnoyC+gljOfgoWT6BmXR7CFJsV5Qhn4wPkaKwIOqLDhm4k1rsyxWAAo0kfSCS15SQ3k7vE4YD5NqDbaqmfvPwCjcs5gu6MDNJRHy0UHNq71DmYeBjBZI6RTYLUPFKYxTKdyQn01uCBwy6+pGScboPPt+W+a3PQlCBvKlnI+795yO45CVzDKo7xXEhP6TCQypCqMMYgcTnZUd3xpSw/giMO+LUm83ox2GYhoDDrwn0LZqw8WsvHHwInE849phfsyntJ8+7I0RDzDYi/zMMw6W8Jp+Tout1XUwTdcP2okd9HalQ/gD89sU1LRM12TpGrKOiYy8cWLF/3KGI07vIeM+gRjSOHjR35mtcI3fdVe6rtEXbVKwuM4o8tYyKAzNFznXMDzcOgNp/gqR14PRM9BRUM5oYGwC8OqjauGGRX37Zn8x2XIkreOX8DOWPDct1SGZFZWCdlo6X7vrb0aIuH7yfu3Zo+h+dx3CnRZ9SSR5pnq4gCHL3rIqHlyt6cHiEz8xE982X3/+xASYXokOEdpu3XjM1+tzhUGxEHEQwZ3eRFacYj1NYSyMvjO9v1oHHWYxX0k62K4X4mIT8U2pb35nHNiz49QouflmtPtA6yK/+STjyjyC41Wfa07zUJc3F6JkTpg/FDiXMB2kOPmnLO6m7VLB0r5sSYF/YPUJY3E0qKZoTo3lXwJnudINaXVm+PB8xWq7/AE4SdpDrYe3BrZpYzVMSA5AMs5a1qdV0wG6n2ov76r9p1I5cBoHk1nY8pL1M9tFi+PgsbaiY608+y5Y6yPNvBfomFGvTlNeT4qtYhABCUc8nmcHsTiD2Z/l53NR7Fz4OzWNfX9Nc0+YhaDhuoKBt7YnFS9woS6w5et8hxuW5qheqkf+ytL49OH2F3s1atXWfVBVMB4ODJdzOcwRi50D51iur6q14u/ti0ZAxfm0IGGIDdqiRQL0Fpq0wN4CPAjM3WiDXhgcMxla+01tOqVD728AWwtgM+OeuFgMV010M+2mltPWsXKewchPezOsiHe6AsAVQiu5E1hY3uA8IfjjfvkT/90uN3jDm+JY4nkDK5twNhYTzVav+fRB60M2xmtw2SqZXZPZW8c0+TsKBg6McLyNDtLDYMIxcFT1SwGOLHXTYzQuI169absbVSajMaUxo8vW2jJWdF+vTKp3mHIhaoHNaq2WGvUY9swhGbJXtCAABQIZfgVbB8n436mzWPaJBSIDjHSFKhNW25nRqVNKsP4hn3Hv/pX/7O/9cMf/uuf/PjjH7lXL18mb/nN7W36nLP35uMo+Ke/809vPvjgp28+/fSzBC3jHaJPIHLZwIiWp4fRQ9PzwTQUHDZT/BDq9Nj5ViiK20GeRJMvpWvxs9gSpqQzW8BMOUKG0CaO9OJAiq8cenJTVgsyMPXH3/9+2ooolH4Bmx4pvZ+kbE4f63jx8sXXP/38x3/vr/xHf2WOdT17/tz9we//fvjhD3/oj8fjGRE+Te/7+OpXv+J+6qf+7B+eJSr87fMw+7m56FA+knkEOM7v/6t/9V1sBC9DHSivbydM3s/WWFvIaf+Ml2b92CQ+VwRwoNfG+OzPz50aO5F4mFHcH/zBH1TtgnZMsMV2+n6I7/L4xhlF//3ZnyXtMLvbN2/S2wjQBSr1xl3Injx98tvHmLUJvg5ObjUauXRcgCCrh5ShFarM9nEled6VnfvAzZwjyWpVKRhs6eq6Yd7DQGXqz/PB2fHTvPhIX6byxh3YbxZPBbiHd0eKS3psz9sZ7UaPA5NUGJvboFYYR5eF9o47rlgBXsvraN1DXc0LSScdHeraz2qGzkJBX/DJ2seLgio/8gJgPJc6jD9k/bAcOtEI5SoL7I05yTZ4XxHh6HQ8tINHVPi1rGLByF57MGIhno/9LUCFmFQP3lykXAtZtoLDxIeYpncEA4c3EIZdGtYemaO74SjyB4Zzln2pVY4XnxCeoe/99lUkjap5L+ta1DgqMMzZwW2dV34XTa9AmbkWDhS4fP3RaWlgzBJnlNoQdbJnZShZDBBLxVgqVjNNSB3rAAcDKVR93CA5qttzURJ6m67AxB7Sgdqm60Kpt342qhM0yojqjvbrCGqINxNHhfdV4rslOTwCwxEg7xwRLce6HI42q8GSaZS4DzVDe6WjXBNXuSl/gXWYURhtUHW9Vpm6H5zTcqHqII0gn1czXmqLCF6OXN9759lF9d21c1o3RD88e6BOT9aMt2yEnO/i59epParHvI9RF++0cmVT8gFYVHU43sfiBA0AOlTqhOvC2Uad5kbnOnN4JA97Jr9ALx/pPbxmpmb4KIrj9+L1rSV+P7PTWRl5nrUBHHT+WwMHA21ioNbZfUMX51njo1BNTbznHb3+rW6Afug2kY8hJNkECRYDRpwtdYX31f1a5Vr3rX/LaxhkchhKtPqDG240sIY6F8fyPY4QHEQDZzqUXF968Q/UQk/vv+3IJwbZo966H1dX1qKx3qCr6+mXw+iEaq24F4KhjH6ykz8x8ySZyJFhjA8evfKGe76uhfz0w7QkyxqtGqD01I9oYkNd1eX6g4Pu2yzSulD+NtwS3QNsqOfz3tt9zbULlvMZTNBesf32WZ0nOiK04HtbylplWo5sSzpbg6W2i7XD3CJ9jVGgea0s5zhMw2OV6xSCKAeR9vgeegwhVcCm00AtAfyBltRcy17wBV/Wveh3fsrF6EHjXAtAsAZKBhijPrCyvsVA3mZHzyeepRVX1YMr+lEkas7ksH4gS03l69s6k1KoFvylgfuTf9am2mdz4uFMlYlmsEZdGmJJF0j5oC2tksJOzMzA2t8C9bPUsRyU8ozwJvFj7sTZkE37wdlRfPjl0d08Vc4ztRbakcYlVGlJ6wiAIYfYGoQe/mdl7XbQZVo9BSxARbLtgcBr0LoQpK8gwCOmNIVacvSDcPQEI1uCAbsjWvajqeY6aqtHo6iypbYbtcL/1bXtduTroKPzdemvw78IJryD4GwLEMWpqCNwrisRjuUCGIFSOYq59+cpIbGhLu8P2e9HPbvLP1vXpjJ2JKCC5RUAcpCyrdQl4yb0ZSiQH9qbIhNTczQpm9SxY5wZlsT0OqdFLfd2LYN1u3rQX1/nWBu4r1kJflsROHSZwE/FCh2TOD2XFTDml1WfL1KC8K/2k3q0NBJtpvHHt+trl6B6R5nVamPr2czjrBNJgYXCBXW9Y21PkhH/lM1UfAEK6XtA5Ef31J+5kmPe7QrCsUVvDnQAt03wm5+zHp6OK5XwwCqxJ+lL0QduM9H2sMVpABt4FYGf8K4qC0LFEzM1CAK+TeV1hUdsCB8ZjZG2zIA+WbE8y37dCzR4OQ3SureuZzk+ad1fqny7PfLeHFiwmrDtAMx42wK08fyZo+e65o4dEm3xEvWNUo8x95UmCZ9tRGnRqOvQvOgegq/7K7HJkw0DJrnSt3OeiqfdRMQcFKs0IOOXHV2LqdJJlv6X9RBvS6NMKmfNMFPvOnG0hXiaV9aDHShNHbG0MrxBVH2wOYWA3qxDcwfPFZPgN24IzNSYJss+6WtaqHBUUkfKLklbK4xl1uWcUE2LVwS4Cq6nmQpo11R2b+NPEU+lqXjS6wErDFSz+YDadxpFhva5+l73laqR65b8xdFUuWB9VwLDGagX3oUSqeX2zjnKvcg/aXL2CJv4LoHitRsBYm2L6qR93oqeR4J04TXEbdjbqlcY3BVL1QHrSQXohjoKs/ROOMDoqPWOkLwSOMNMUDXuW6XBMtkJkmYszck2tDx8IK1uh2jB7tiXNKIpHK0t1ldPxvIzWbKksPDoBOz0fMzGS47edcFZqhyv71BLoqpOB3eh0w92lLoy1+loa9BYbbKCuzI+aLeHIgug5Ci9ASMSrK+DU/UZfRPrjCDjmMRuBmhY3zg1Ljiz4bKB7LfyAOvO6xPex0TGoSndljqCjjMXlCqbC8DGUqtBXEOgizOQM8l8ADiVBmH9DLqf4Pjd3Sknt+AElsL2dLv6IeWoM8Yw79BSdys6APW1OkmX4zQiyXivRpEhZ7vh1NZqXBUQgT1vlhPP4GVOCgZl/cQ6jt0zGJWQaGujbzyDMWJ6gEEft+rTEQ3rYcU1BmeW1HfTXWB9nsuog1Z9whVh/aSti/Jb+TXxZFJ9vuI6PKD9kPo3SY0rAUf50EsGv2vcPXV2VmtZha0KprrxwdA9H3QZ6nVLsVZHC6con4/1cKhtaP5e8s6PN3kqHjORhMMqb839Hb6QDVWg8kEsKVodVwtqVLKBZK2zgvtwajnqb0OA/GCQQ6dL30r1XymDEVzRF+3AMHzmhWzqZOUaMzTT9OoNVaRHyNoOakYsqkE0hjh5Wev4cmQDyjpjEPUJpzZCXrTO/bp8Pp42QEzIL12Ri61Vx6Z/QXVLQ51VxzqhoSWC0SljhMvMfhtJGWOybY/rgs6wHOogqEEAkZ4WZHCaClOPsBVZZor9AABJUeCY6uPlxHWsvC6ry1dSyr+vdFD1NWDbnHfVuYcjyRTsN+EnOpw4BJ04i7bJafmjU0zIFVs+Rz2iAE6nlfEUJBQ3aoWBLHW1ZPS7qNDVTMLrHO39cB/SUl2lfVPBys2BFliCyIOysOhCtBpASwQUubOLDVK1ATdZO/A4bFtAOlYa+J7O11CbN67p7HSo1FRFo/XAGAU0Gq2KQQXASQ+8XHApmAKNcQCssT0NU+GLMjj6iZbM44MK9JaPVA0W9zV8GKNDMKTSRGbtUZ87qQYS0HlWezic7/lIFWIzB5GrpIUQ7xLJOxQdJm7q8w2Ey8P78AjZmQCxqSpeSe0p9Dq0iww7T9Wvs26XvmcVJWgM70qiB90GkrIOoGmdMO5Bwd0iZLjVKV5U2hen4ueTuAMfIUktnuqFwDo8FFwfkbXCRry+JdKCU8N/LViktlsDh7dtpL08JlcK9NuMZbUJUVEWwrmqhlLmjNqPJEP1w4CUgf61Hq6q+j6O7QLZ0tRnfruu+jlWgwyCcbJfKs3jBbMg4pNsvKV5DHgOR3CGtzlngga0Pt5CbppZ93V+uWtQn+tf20KcLfTZ+j1KPJQm6nNFtQZAn5FVk4BNoH6DUR+UOeLIRN0nCy+piTXnlkawPm+ClGJ7ljrUMsiaRkHQUpn800asKAhCC5FgZLcnz+7ioET/KbcvTcVj2CKwmhfIjJ01/CH9gK3OwYa9c7VpqHTXekwJFNpxSihXujsbaZd9V0P9ebpKNcaBbUqbhpV95UM5BSDKgx8FyEI3kP8G57ZVBqDlor/C+sKG8G3kNCKRFfKz1Gajfl22inAIeE/+T1VxMFRhZIBX9/YkVexC/J7vmes6jqgQ2HcPqNoFy3IMGw/cOq4hdg/m8/MVghLX3c/ecKqd83qA8g4HS4OD1RgV+hD6sSldrC4f90c8hlCHN6x+FWpppXay/BxLOvgx3unpkzmIvZSu3qDgzqRVdmlwlCPVryy3VqdBxbykM80Ets1ibJSouJmf83WcqW6oZ6NFSbz1gE7esxXW4d9biKyum5g2Cipa7RT1qkHDd/Dkqp9cyLp9RksdrInyzuo3Ubxqc6SUgOmcYlJT/9N7J2Df1y5CWgAG94XB6VpnC3UrRucaDLeuhfpdqF0MKjv2WlYJt9PfCpZrjGJ3ma/z+sSN2LFW0glXU2nUZbzJGlI/bGtkm2hSPGxhhH4MpVp7flKb2L2N+wdr6Ks2WLFIuj4zgcdTudqD3a+BjdRv2Y9Nuee8MjkKpMG2IuSyMaUTKzVH6KvnfFZ1GZ3Vg/hWm3p+lwQK/Hif2U0b3iBULkLLsL4BICGOU1viH8o9L5ie+Fh2vGe/KWGQpjnajeNggOrQ1HKqNaCw6uXHuL8i2qGi1Poedtt1I52JxnquhEnSQGEL4w2Txgrwk2KD8Xiais8qS8B9bIXU2/0maTWHDGfinV910L4GjrV+96MGwRzpI23VVEmtqhcjCKOsApUnUCDdK9U55zo5LMHvIUBKszVNwBvWVlloJDuob9Q36j7rghRY5ZEhzHa0XIW1di0XGWxL+sNSGRinhCAITEftTfA8qwxCMVg2OMGMVttH+m1tJ9v3WctQeZ1kBqxqD50y3dYANAQu6MYKNccdZWQSCKVsPTbcI5z3BZ4HGfJpqT7ZDp3Qr27XUCvjHXG/a5bLjuVxVHXmk7IeV+y2htj5olLKM0l2KNlpP3O2Ir5qizqWtiqtGs/ut4SyuNhqGF5D81xyhLgEr2HsqDMr7zUg7ZWbANapd43DF2FWUtcayE4i71AYG/87msm4DUdPtr3NxNwW1RgfKj4pDYHX3VeC7iOxy4Ow9pEC+96EJNyGlD0mWEhDjEZhMzHKhCKYgAYmYFLHckMrUY2lKmoEVSOhdN1cM9aE0wsdreH7mmuXypmgqnRqUAMNy7oa4ZIKA4FijCmqNKu/cl25fu6064g14o24x5yr0UbXkgSJAtsdMyKtrIkOBs59AcmIlC2h3nxj9tVCv6ycfU9fiR9OHno5tGGoA+ILKaW5GCveIs4YeUOogqEYBdv5cwk56/pALarrNUv1AIJbtrNLjOydRz3E7BZmHPfcLIwW8fXx2DBhF+PXo2S07JA6fsWgo8EgC5SMOLXVM9zDZ4LPSh3OwUm9fx83we7xdFSpL96m9OytKrkGUnUIH6potCMkWpQiVXPMJZWOcqLXojIRvRiF/yvq1+QLROMpzVKSGjZVgCWp+r2nQYz3gGuhAFVmP4u4xotjAnmnvp7LDG/DhvBGUzM45LRXW/Q6ueW33AexDRNHadV9aia1SPqOuROq0sBAlBJb+7hSpMdEfs2RZe4V8wPG0WKYzJmwGGOpoREJeSunVhvEt7iPtG/1nhY8MABgS18L/pBjp+M5SGHAK7JoNtsFGittXwAHQEUA2pidvak7qQTjKQ1VbjFxJGQDHn/Fk8r59F3A8FYE8FvXHUxZsm1k4CkABbh5drVQwbIuX1S28+xFX8rfahL3t/hv4PxIyrx+CPiuH3ip3++HJOX190F8ODhIrMw69aIIwQ6vkZ59r5gqEV9keUTpRU5ZjhDdoQ4N1TbHOl9JVkNd1Ya8TS17x+83HDnplKmkhApUg026KKpNuVDdx+j1WIlGee6v7IVUkJEBo1MjvfSpdEdCZeIa9rCWTbEm9Hin3EeNrXEDutEJCN10pEneswCLKgrgiAkgEbzfoB0G7zhFHol0Ma2H+bFev3G4a41Urc/XqMc1xAeQhV6hTNU27+pB2Gkjty/8QI0myUHiuMPsowIsgHnIxHKfIy8gGiGQKDw4ITrzAVrDoqE262J1TkbroVqIsiWRlnPuCijyqk79LNW1TioDH6zB5+m5y7XmkwfxYZaJtz/SC1SUOLIbTlOdSiWatADFE4pkO4K1yFxNaDbc7tC1do2P8uq6KGWz/SwRZkundIGgb4BZ4AYxoYtZSLDRL2dqGkiwaVXrTtlZo9EEa32reJruOAUURsGBuPcKUKGNuVmeYf0WGBLFFWKDrkvJJmlrNhrU3J/Sv/n9ubYKRhF7AOZjuGmV+QAFxxNAyBwA8MDfha6esklrGDZatjVouHTnvpO2tOfDVcccGH22PpBMCIIBANAwB9zqC53fpzUZW/eZl93gnahEPu05g+RDgMOrH5pHK2RZee6+/gs+5CADu3aG/bajAj30BB9sPirwrtVc82gTva4IigbF00Bf0hvZ8ptubI3L21qruxmPw6f3beMu2sCOrd12dKmDWwSRl9GBuFhX/pLfHwWqjg9MQ7+JetFYsd/CB6OzIaG+SedRt0dcCxlZEH78Gil9SwxYcmRbRP7KIBPY71oaRQm4QxEgY1mssF+IXnjrqnMZY4NdTO+POrAGkS7mFTQdv4Y9uC9ouG+8bum6uvMcgqKl9momyWNcJpbDZ6IdBdzk/iU0jW4Dk6lDfnWe5KwmQHEZAdkPAeVaKq8aYaysBQTyGtfJbM99iKtnIf2eFuX1B4hOM6PjklWEFKHfPLtWbAMUREVF802iLrhf2lixemFykCgQ0B+FOZgXp2gEKLTiYrJbwN7J65ZQGg/n6IFiAR+4dlmKNSiaCiMCQDyHwMBEgl6Uw8iHcmFmYxu4SGlP2bYfQVkxZhE5mMQN+feeTbBUXto6VRl8kbfN7q9Tg+netmZoMZtrjV5bTcI6dVIq4kEECqDeuHTl1trapwzZdOwIF0N9Dh7I8L05xAyuPcqt4y2mVceDYVMcqRJRblg11lKm22uOZiHWtFoEpVOPVqECZP1cwuCZqGhDs2REkT6TRJnjkDm7ouMZs3QeGlcxLVjeYqJQVUanWrZsCcFR+erpzHp5eQ8+EB111AUcofESrfsboShQh6XSWfcBQ5gzJGB6R6rBs0LOq7Z2GqEfWNiFfhXUMOgII+bHO1s/9IjvU7W7ZCdZ17WqIrSoyjuQ2R78CQIggL0Kpf204pDKc6xwBHXXbmXdac7xkdhXKeJhlgw3IlcrGWQZoPSo8ucme2pGqyhZB3wypAgXBDm8+PRJGf42h53sI65qAaAk1ecqTtqU20MPq1ccru0siG85VYdmpnaI+bHePdf4ZDVqVC4Fa6f5DMa94cKlXgF/jhA2qbzE/BQEjg5vOcHDONYDTpM3z2kYPUotG5brtFWp9V2UKQ2yJHfptz7WUuVN4nqvIL5qIUHgwGjJZiL0TdcfeflR775CYIO0doRrWookaAkdJe4j6cECUlMxrjCC7BOpOrBX1UTo+b/J0R7z9Lyy2RJYOXhXfKUlGwZW7oUU2Aga8ZV6tOgky0a+c+LqtXVMMtF2DcT1jmJ8QKkfzOeIfST1JKHxIlEQyihjdfBhvLO0MyCzpmoyogL6Ae3HCPeS4LclDiyqtoYWOuVgYKl+ucQpRzxkA+Lv/Oq8Iq4UBC5yGKwKwekD4ZZlCEbLY9aDrFGD90F174Ks2/rihZrOtvK71qiBUIADvwb6/TSzNwkAr4IDHtUN8QVO9vyYyrEzmLOmQ63YoMU8OZIH6l+JgnRguTWAunfXYEI/g9FGQKIpuYWcMN++yEnnVgc1zVHvpa9ynxGPRnsA9fGWo/+iXRfjGblDrQO4ZpuYa5cFTEJrF+qsYXSWi9+JiS6dZwJAUjatao90aCwACa5Ttc9j+TbWYy4CB0NqzFBW4yGtdlhITj9nr05dxhfkBvhOw286J2pw5MDKQUdbGtRuRQ4tncHE6TTL8Kvlg1SP4cyOa9kjrf56MLt3bOla3YZWO/kAHPGvqvpbAh1PBek/CaktoMgzhon6DFUY21OSW/oxaFAJ4gGKQeWqgneA9cCtcj3SLoFVrz5m1SvUkmsPqFEKs8wXkX3jHEUkiFV8cFQwnKlaLJNPuhCyJitZSOKpRKPI7rFGcZTobOnR0FaP4BYjR5Fhq4Nbkv4uEecJB08NxTU8r6YwYvcBrwIdqwpBu4v0lZRmNZevrxnsMNlBARncLlM3bqmcto33UV+t9rfOWUg238fJuCpXr44AhZ4knOCIB0+IVCWvJt4nLru5OR5zUBaLWIaYqUbeOS211ILpLeISyH/r76BFLKYsqdIRENK6phWlYU2yQRMgTlBAujCHjuwq615pi52Zgwlf+0hV46F6ZZz59xbU5GV7qsv63lskh5F8ZYusepaOL7kSon38C/iYTlp9DRy4yqvMhcYCpczd6Q7W8LYbpJ+/uA0oAdoWAFLR8Dhm+8Tp7hast+6vR3ULqJDUtaVAtLEDatq+Uw9tygwtaZekzPGBzm1QHGyTvnfRIFGYhB9lN5BdpzqtMtgIeSzn1zCs5v0a+RYdidLXj95jvKw8NmQDwZo4xib8IZmHqQd8QDJ0GJ/7aDZ1AVq7EvOrjhuV8fMjKI5LklQz6yB0i5ZBDbWHl+c2VJTLB/MQDQFVH2RONYdCUVWQNgb+klCRrrxKNwQ7XUxnOZgjvCFZ1gMvMsnJOtb6Na179kiDEFuSl+9V2IhJ/ojfzGtJkoKjIktynaPnVe65q6QlN7rv4yypka7qYi58Fy7HOvLQ7d6rvp51oZcbz7evcc7q7dwPzebjdUXvqIJ2H/UeB9p11AzgVfGAqFYZQlKWmORbI6xmcEs1ESSm+wnAUYyy1U54Gn5uiXoSGXMYRN0Iv+sZ3Xzn5k36kh8gRQJWHJpzK86Ei+nGhtOp4Td8R13f4NQodCbbyIww73Bf37tdzwjVUFuc9b6SJA3LF+2qGnDwXfuOKTKB3rF+ANaKpYdDQ9qCuoMGvH4OjwOmVNRUE5b0WeoZNUAHMOG9mm1mWiSwHAnUHNkCcWa1pNnUNpwf8TQmYIqL+35FpSo7dotVsmgwaz2/ElQwxNuyn3jcAlAtydbtBNsW1Z9wXRxKIE98aacry2RMdNjLb25O0mLr6qWIlaGsRwXcSCMn80HV+WZEollDbW/MTjUAUKsNSyTuYzC9eokKjjKylV691cvrOlzuWw1osptFuNsX6ccETI2CoFArsYR3nsk0BjJGogW5oEPwgh3FSajBmppocdCxhTp6vlYovo+fpFrHKCtW6ISUYz/DAa8YCf3oOGz3ODCO4iFKKdE4C2f0Or40Tuhtdk1vxFuSy393majuP9xedY+lY5Fglwkd+8RbwCAVqrE4w16qQ9TGTg6oVDcDSMeMJPhzWh5Brda5XRJdgANGMmjRP1phj6y2cH1vX9MYKF7eH9pqLwD34lOaAquck7YTvgbHoHlAFcvRMzxoiljgDphYZxuK96xIuW+XeowQsLbB0Fq9rvOLrDag72xIoHV/akfNxIBor5TnkqJtEUCOQLO7mSGEIKkJkNIMLa7bKxptdYYUVapBh2ack4vAlqhpGzrq00KNdRntkOajlv/VotQO3+8X1/GhLBQIQdj8aiJKj4FWxgXxVVAWfwfps/AH4Cs5eEhG3Fg+HtbZszGk4sdBwaLPJFph1cukYMFJNcFS+STswJNbeH1qxjcbpVyqgIyMGGt3KDm8YMSAq3Cz3AiZxKE3nlpnV9o+DJZZON+tl7VzybG2wlN4rAGeSknWULxYHJAZ48q+ewIiBZ9nzOE98My8b3Z4GRwlXGjbjLWRBbqhddTrwXOvunl9lgpbsnkjDrsEQz5Dc4WW9ZXS7srjU1lVz+F6G5nm9cVyIZsnm9J7yLUEGqJ6lBVVWxGS1j1G7IxGopUzb/U+NGFWqNa1O7oZk0GXg9pUq+r8XJOfjE2rXD0qeZG+ehkx6TaNRhWaoR6BCGVbW+W77dHAAzsg/5NomfULt0Ot24ec0izgOdbE6yq3nNLrXSFVGeuwG+7hPbxZZQk1XR4kb8DYfX7V3uXwkvbHerQkdWvaZVTOOgfcFc9+p0IOAbZXRXj96jCpQFkY+uMUNwQB7M7b44yKdKK+vgiYxR+2pQoCGzncP7JIozrOTECfeE41a4S5w6S1i4jl1Si3gDXjnJQ+CinZAoixvupBcHCoTgzyYhGZMCIPzQ5SvckN+pKKa/lWvOka/KwlC+5jqIhLlO8AFfjbkCp8ViVEOkSWkX9OwiyMyqLMY1e8Uk0WtLXKLKk1XZ+WlNb919BaQNQOc7nsvkAHNg2QrfGs0vXAq8umVYgxZyJPc9Dp+4xCe1RJ6eg5prqeNRstakZYUsfv03OMRwBNGpiTradQMzB/S6c06/IgeZEZuHc83bm4s6GEkBzYyreH4tQK+XMEMnerKrpa2yBRrgFGejYQyvD6LDWef7Kkyc4zCNQHIA2eo8IgxawAg1lb42delzZn1CdWHQ7QWiPdGrWjagnsA0SX34Uq651vSaXzI1qncAc/fH0a6i3QPDEDzlWmJEsdvt5VA4YlFMbLjTDNGtkjEnEJ4vYof4XwUiiDv948JXeBEqER4nbJNAuB9plwxUBWc1EDDmi3DUtlldVtIUmEO2+hPle1O19g1mu7HPQXvlXuTItYEb7DGAdpEUccs1+TRwRGdZceRDz0ghoozDCNegvBQ92o8ztQeEEKNfRfE21vl50QKMBj0icDFMHJ8xlvt9vq5EAgcHUqEgUnnFzbMaKKeoOmdW5UvfWAg3V8CRT06qqOGRoGTqAPBFoO+h8ABwRaRSTdOQzpFC2mHxIlWQ3iuM46SZTeKax+iEp9lvvWSS160NS/l4HEWukZkShdthk5gfLeLpP6okzwQXndOYH9rdqK81LW4CDQArPCuQ0u79wCowFDGjhSAlbvmVhbDwYM0c8O14HeFp3RoBHp0W2wjtUQm6IgevLTcrDb0RWP7gIADI+iIoSt+Ry4Fkp6t9Uz5H8lMgE+QsE0DZGXFcANW5EJalW8QNY54vS+a9KMeBugBCvV03fHER+WKJ82y7S9lHbbBiuUKYsd3nbo7EZzkFDGFlOHIOoe9DPEl1nj7gMS4BFajvp9fC3NJK0tuESyFtT1leM8/U0zRSGQRJMasNSHDiRKmO22RBn6WFccpzp6AVl++aj6s5gGunuJHy3kpsv0mI1aitlh0vVmjYtaia4L9LPqNxAcl1+iQnDY1q1a1Vm0ZKR5GXIgc1vG0OVgdL5zTev82khJJLJIdZ25QM2sXpt5SQ7Tk3PtC6NcCWWYo6AMWxRFNXESK+ztrmKpE9Eio/xahliE1y1ZdkajTNL+jq4D1FXrnFb72jkGgQW+OAghNWqVn05Lgo20ug+onM9eGesh0/kRtaKu0e0zAUWQtrPZlgYTeveFYyLawhgGcL1nVo4EKB1BdA4/jQbgA7MG9AajZV+WyrZsy9tA/K7EeAULKjcDIg4BJWoNYNHmQzwnd4CxrVxLlWkOFD1DFcmL7dnY8pxmWTjp1bElX0mPQH3P+9iVql3dgs6U3LXeQ5IWuF0xbFUbQn4OfDGoI5gOSPzImRPAuFeNk6Ocd2A5UD2BbEhg8H+cRhhwX79rLYOltad+6IKV0pm5q3MlIfQdaTQtzKdK81G0Bsf2ikU7hW5nkhGgRLbcUvfWUlQxeoCk/0HXNXzEiuBeOiFmlEK2Cw4+mrAPW6lGfBnMwDTLn4J60Vai5Pm8xQ6vi1fK7lpeCsw7iaseo6ELduv+pHU8b3s7xDXiT2niURvHPriZsK8pSI5lKgXW6XxkgUmIlaeX0pjmB8EEH6E1NA4zreWh6qntwD7orPpG+iHELeU5Q81qu2UDhVxpF9nR3ZxmuKzLiECI37Va59fid8UsunVgvKdBwIO95RCapGNMqsyJlVAPv6nt4whVA/bH9dVZ5UMoTllhHO8bA8e1tU4LLMi3kwZzIOj7NNvHR/093DyoQ6jA/MNsQ/x29JO2RVIV1m6EPXqs363rRkkbXvKllq4zmLuirUskXxS9MECdkYXE7VNRRZY2gTJTfhmlR8nRkFGrJ13GCi3VEF4BD9aA6gaO+yseoWzd+DYDNL1LVJiepJgAMPZFwQ6Bo8qZdnLgZcsB9eSjEKjN28BBCInjBI79VeOXIgvgFwTQ38onqirmnQG2RQUel5zbyokcoN6zmDYWWo3CBCrHiJYY+hnvVwQj+U18MIp9qVg/ZDDBYWBfPbS6qvarRCV1ixcIR1vjhnrA6M9II2/Mbtmi0VBY+s6iOrJQrwK6FzdzldZgZY56WSeVoMpE/ahy5CW1DeAPNMasSvUa57kutyRIq963sUWtNuZBBGiPOht1hWI2qkxtKkA8y3EYWLqnYvljnZjedwYlDG53CPk3RhDTQCmWU8x/6+/6QXq/dft6UrMkTfi8zksrq56pRrn9oSoGoHG+Xs2R74rFayb0fRXlVmBtqlV0DgoHQpz3QYg9Eu3vSGrveo3E+E+fC5n1QX9UICw+r28PMHSNSr8kRmmI3rZGdcPFQ3gM2DevgwfTpXo5FWtoCRxwDRKTRnj+w33Juho0DpgLr5/PS/tWt0GCqrzicKaRDP8sQ7yIqgwV1ILz3XpWkAmjO/ZJ2rNlsCEHonMQQVhyD3DezHsBFvC/SiTbdaV3c8BrTutOg1a93Qhv2YN3pd5a9qkd/rl/3TzWl329DjGJAWAFqIMwxEgfZKYeKY6n9WjRk65+YG6H5Ag17JMVWXjHTBoBAO+UlCOPh2G2oNwTJWlyWFYjwHxMPgeeKfdJjBJ3AiTtpBbTsNjqF+6HtRxj0669JS0yyS2jLe0HLsX6MiOoYnhyYBJrHfg0kglG/TECQeliHu8DxVPOxFQ2uIDcc+j0gExbRkSAULinzc9b5XvhqBEpqKMdRpmBOuC+vI14saH9TmoHG8faQfzzeHOIotNZlbgKjhg8C7sO7nM8HA8u7+gYqi10uGsgAHpDIqwAZK8j6BhPpGxHs/mo7g0G26/rRztMssqqNpCfxAY4lvMEJtDkUxuIWTR3J33a8juqvtvbux+c7k7Pwqk4u/N8/giedwx7aBxj5di5HnIG1Aj3AbzjuvOmM/3Z8+dNfY+6d5YAgxiddAP8LpiYD7C6pCZqOf/l+MvzYP7o7u6UDh4PhzTZF9+dkcocfNV8X9qSOu78J5aNRWb2sjC4vXR7XHl9kXe3t7cfRnj+X8x3d0dYRBXZdK5kCpnMTmEPme+fpSF4drIwm+kQ/BK+9KUvffn58+f/++vXr3/u3Ah3d3dXvUOxR+QHeVzWyj/1v8O5Q7H9E8Fj+JcWnJdnBAbHNp1Od+nTpc4+uJubm//nk08++W9Ot7evSwPcuaPcyeX9jRKSc1PRDnkSMPbrARZRh8wgSAeIzx4PhnP7YhvvblM/+PO/kBav3RzTu6POhV4df/t3fvtfL/bMO6Y//zM/85WPf/zJbWzYaTpVErGk1jij8F95W8zx/GDw5pg4jzOx1ebSLhAaA0blMvkYMHea8pn4+1z3i69/7et/9N0//u7rj3708QP1TqYfn//7Nx/+G/f75fexW/qB6DTf5g3MDIivCXS0cBoVo5LUWJJ0loK4mQYvDwSGHep31ByXD8lrQDKfPH3yTvpgLV2EUe5uRqQEJGwYQmBbmnjnxe+JIZ4xy5fPw1Rdg3UVVIbnjWbqQRHR8fH45N34FSvpMoy6eeL8qzf4U4ZTfJlFrUc1Mrd0bLYvU4G2dD7aIW27OOUoAUdqJciKHgakdSmpOlf87ObJO/aex+gijDp6X410/F5gmBktcVICOFPyv+xqcPWn78Er44ygQCmczD+kfTvXd3ZnLkEXYVQ08tQXnBEsj0BLmWM2Ke0PlA0+R3qHg7JT3P4Y6g+Oo4pVWL1yyH30Xu7ecW+M0WVUX+lg8gmL/+XLQmQVUIVPC3ZrZiWk532F9BYBCwaAWOTAOWxnqcPf3V3ERF0KTNylzjRthyKO7IA5lq+EZbycXzMZFQKD4778lpOB+SSUgZ8+ujwXocswKs7noDXoM4yYdEiqjTPKcnizJGDPYh08IlEFahXq44EYwfCE+uo32H0RdCHUd3PurJf5uydmQTwS0BgxQNoffi5VofwgpODoZSeG7cGpCCFtDtWxphg1ePNmfIu6d0mXARNe+jBcxRQ3VEmLr6XGQHIQDBVSgJ+wsoQkxrRbPPDFriu/w6OSqPnNm2qGkzok2wpiiGRODxh4z6WrMjAMjudDdlxRoU7GuDgGbm9P933st6LLqD5nqCnsSBkRB2kaYRR6QUxKkYwZRF0PTLNoZoFkdYDjg9NlGPXkiQsvXuJPqZpqv0dHF3ozxNL94mrRSNY3K3BM9Wln2AfvH5FEQaK9POhURzLA0JAkUI303eN1rJbxdjHnF+riFJmdpiYuQJdhlOpIgfqYaeHhIquO3Kk0S2zdA7f4WWhHa/ZYiJiL0n0ZJXQZMJH+Amhw2BeZMbkMf+GjZZsCTNY51uGM0xzdldvhR2WugmaHPMnv+/TpzapnfVd0OTCRHRil1qhTOIgQ18H0hCUjyh+S19oxPDwV2qxi1/heKOoh6YKoj6E4bVe0nyQQQsP/ce2MJ3njxrWKSY1wVri9e0xBWRcjBlPQ8BfPseNpOrwLyVmdyvm1nOLmtew6qz6wlWGeLyJSF2HUE0/hNfR5uKpSEjXmQ9kSJDu706hi1DSYEPX5OLXyiCYOY6zPWQxQVn6JMZqWyy6c70hgchV8ekfGcHveJV1mhtd5VGf8X1BRiVbHUpioQTZibzrKJoxgt8c2xuj5k0cEzyOong40Czv7GkzkTxuas4JSnYFEIuRXM7YN1lq6LJVFdZxtaEqa8Y8Inh+e3DgMtsbwkLGOuEJ+iuhYfS5LTjylIt0NEWwBc3S244CZskQ9fUzpYocnUvWlBMgGMyxJs8pFEvE8be96DQJEZ0XThXqeauZ/QXShqXgnJgGdodqWmLJEOvpgBM+7BHFGHvs7nCVqPr1ZvvgB6DIhpKz7g7Q/MMlR7x+hSTBApZXdZ+2VufJDLUCINeZ0gMeULnaTdL6XqI9mdyPVAQUmdZaqY+WArOWh5Ar0d6YVgwj/ndX2Y8rre3J8ev77WTOEVM2AKK5hh+vrBgmlBW6l8uArCXPLLsND02XAxHQjfajJ5xV5fKVfoaXY3VI0okdi1VeDUC3ngeHv7h5RckuY78T70iNxldSK9fRhOqvfslNFanpOr45MkLqEKkI4Hh+RRMVRmacxama9y0CajNMtFm7WQW7EundBvku6jOpjyInr/9ZCbOda0kR1IEFeXuPeTWlaoNxO5w+Hy4jURRh1UxilfSjJJNvzkdDcMbRYjgES7I18QBAKRfI28N/8stvbR2Sj0pbDBZJjIEhJFGeJnmrgxNfdQv4FJ/7LCxH01flcoSyPAyc5vIdwczM9omkOrus7o7m6TKtD53CRNETfqwCu16yTxIcEReUBPYTyFgBwxp1/VDbq9sUrkXnCbVQ5QKqss/AaZnF1pKKycZ463ilk2Y5+FKkP4O/maOCbN6/v+dRvR5eB535Baho2otWpo3E8Kzcd63by+5xypeQ0Sh4Aj2ma49h6WIwVPAhBBlP6XsWoqAxuPMWbg+UvYqIuFJTlG+IrDdXbD2Qk4GqeBU1XSUe7LivJJavVR5SFFETKFWE1vgpw1Q4ujqsy6lRkQ4LwbVDBz8DSnChOs9p4MU97PKKgbEmzR05YL+0DFdQiAec5GxqxXc2kGpbz0FVUkeZ6Yn/wj45R3ltGHWjp9XgjEmddQ7PBjvSsV22ARQz8HvH7ZcxTogtNc9B3VFuutgtZfdWvRtCEnawjDpxw6ROP0HtmfzgMZ3U5GBQ+s66DWB+SLuPwTqRiUHIMJOFLfAhtVsv4YyiJTz0ahRzbnEqVJFCnQkvYJpDGRwQm3Ax6flm9DQELHe+z5q3yCXbchuqpnkDHcRu89Ccutn5EOROObyrIoG865nj+JElUi+qteNplh8M/GUvkN6RRS6JMhSdP3hur4x3TZaLnz5/EDekyVaOXsco7slO9CT9BNhBfZjZFIWjQgGouajO14RGli8VdJYkdKgHF1eiqF+9bCro2r2PHWsHeNFBmiJ5nk3XzmGZ4PfBiAPH25oda5dFoOYe93pvsNScqHVd9DuzbhTDfxZJb6nkjJN0Toq9aYR8vy0z1bzXD1W+ggUCLMgzeP6JFArev48ryrPt7iou2Z8u/m9JkSUsRLLN+y80yplDgnhSqijjoEa2Kdzf1K+Ks31rtWZstaqpg+DjQE3VrB3zCicnH5PBqR9eRTahifh42b19mUkXaSe5NXClQwW7p+NcLrQy9HKPwyblD6dpSxH+P+0OqHHrEjvu7VZFQ/fCgqd3NhWDfZWJ9bsJO7CkSyIFYelXDYgatTldi4TwdSrJvEwqv4nzU6SK672Kr4lskoDjvUYOEqlL2y8uCEINt3bV3UrThPlH7d0EX27kF3wJXjlFHV8jYVIf8GGazsmuqrtfTGLy8yJ0w4E0oAV+P7xv5wukyy26O1DfaNul+sDqmlW/OOz/HCRsRd6Z2fb64qYp57nnSfOERhZAcbutmx+5oYqGe9hgd0dm+TfwA2SYdOjJAh5zdLYNorgfSF0WXYdQpp2JZxPtBT8c3mWRIThUmMpzrVo47vnUH12EV0HH+Pt89ommON7fxYSkywbtqRGqaCZa8TDys0Z5iqGc6TQSYgFnsbCj3ef78+dhDvmO6DDy/eSLUm3YugUbsE09y0XYJu5/CDuVT30djDQIpYKMgMfT2Muj8Um8ScAjtKNnEdmxxCr7h6Ao0mCR0qiROxAxb8b8BivXf3T2irUodV/Mlu0fYBqeM+UK8T8JytuGium1rX1ntIkD9FfyfJv/kyWU2Q7qswxtA/xvqxHBo2rar1mW+7EUbr4DXprY2C1EBC6pVS3AI6UXgjUY8KF1mmsOdXDcP3LWZYtko/A7XOq7uSm5SZBrcksF0XgcyzMu0a0mPSPXdHG/KuqM2rfGZsLwjGG3mVxR7x20Yz5NIa3QdCw1yZoX8IsnT6RExyk+hjhP1yvPOZbB5XXYSQHanY0uiHG8VBfgD2rfXrx7T0lAWPe9q/GKnMLcuUOK/joyLdOXeVEhPknWAIjq4bOezOKX//Pljmop/w6azlb0QNHBIqDus8u2BWQhGm878f/rs6VvXfR+6zCKBuOym9AGXkF6EnJMAEEyKlqYzWqAFfCy+YRa/Blowuzk8qkzZOcOy9F2zQaQRN+wYvh2gY6NMqTKmnTz7Uq/ogDYQvPdLKOiB6DKo7+ZYZkvrc0ML2CynVUF9MwhbHDd4XXhf/BwbRTR3NrtHBCbSy7LuC891TA6nJCDS1N/vr8pOarQDbBRPY46tefnyEak+TBhxXDrG4HolTSp+N8QkHS1fGDXc17q5eUR7yvK4JiWuyJhR0z6pSHel6pQdsnZzqX0nUpN15IqO5zKPyOGdHcBzBf3gaMdOGeE3NVsrj3MkhytDMPm9lrwa4jAwMXkfwiN65UNyeJn6S6Qi1/lQzbAq24g7zkYXiqiGa0fQ1VUuZsTy20P80LnLpMpeLgHTMekItYXqS5XhDzVQ3iJTGgx2zIXgRx/V7mLeKdTXUGfpu8VFuKzjR5WL0x8/yZeGiWu9HcTF6XdH/ErtutDQvowfNam5IUVy6kImuOgAbeULMUc6L0AbNCkNZ7iyWY8peh4JfJ6RdGX9W0S6FQrUk4V6lha+G3dyArL78naDEpkg1HcZ2kRKczdfYgXpOSZ9vPddXwSMgTW8gH2Ox0fkR82KNd5J/4WP/Bbya9knvSDaLMekkG+iyJlluHbpyCk8JjAxe7QluP+rp2MjS2sWV3CwY+k+CsaDoqv3oCUVKAZJScJZDn49DF3obTdHOVCV1OjNonqkVVkvyyjdyoLsOMVBpSGXj28IkhZfT4/Ij4pBWeyqpPeUqqtVziJh3t7kKgRnukos6QVK8MCuRSFmIT2maY64nZDpu6zMoygXOccYzLObUjlV/6Lv5WjAQMgJ6olNPjymaY43aeMnZTsUMZNlnOtFxuk3zM5OTGIjtXLX7dld4ZeFEUY/BF1mKj45jWXkm7O57eUtVgQBjnA32SoPqo2nN/MKeCAXJAqLlcSa29tHtH3Bq1d37hS3rgmA9ugcuJfaVoCE0dS4lEjs0gBbDFhSJ21QM5Ie8A/NmkUJnby7uXlEuzR/9tlnr84ff/9smn8CR+753zznNx1OB/8fvn795q/HPZNiulZaQGagC1RvbKoDXskX3/8Br+bT//D68gfu4afp9bNnz/77m+PxwzlM8S3WiTmxnpvD0R0PN3901gYX2bDvIoz63d/93Tif/b+1zv/MNz94cf7463dnNRPfzR4ZpoFGBcsLk47HI34Cs/Bdiuw6+JznU1qhEZl1lpbbV69e/a//8nvf+8N3/MhvTZsIIWmKHcydUCtCwaXIkqb0r/yeUn1O1If7m3uPeeaHKDXHTXbJNhkV1YxTqkozy1JpnGFamrTqA0ZBJixc9+TJZWJ5S7RJRqWXKOM8URuOmwwoHd5jZCpXYMJUyqfvU3yjzSa7ZJuMCuJN18oxLigxflQMURIkzjvJqFJzmsrgdRxvLrOv+RJtklFTBAJTtjGn8lKweaaIQC0hwBiyU5qJeK1jk4qGnWuvi7osbZJRMZP2UFDb8dyZ0T3mHR+pUmNFwjQsn4qkIXkWki3fUz1FxR4Ol9nwY4m2yaiEvg6JWSlgXV4FDmTZm/SK2NTRCkSofImWvYtpzvHam+abeC5Lm2TU8ez9pw4/j+5DOKT5K4tR+jeqvbRysJ56b0XpECkmKL9L1DCdOyxkP+jgQnmlIMBonXCpVSFGz70TzCqFxDV0mE1ebpQ2yajz6PbQyWmLUMs2wZSG46rQYay3RRWTXFZ7aduD6XLv2V2iTTLqcDwEYgiptUg8oKo7FdMeLIlxjTkwF4T0TRfagH6JNsmoNI3KVRmjVSOeSZ15ukRlhRrdJWqcZkf7D/HIBJ+m146rIHYeVyca4AKvB9t3wby9Jdoko1Ksj3LH8DgHE5wSMwKV5e/ToIvZzC7pSAeLAVLYKoaQ9sjEOKFtYmCh2mVFMUzMxHq5OYguD9PzmGnL7nPYbdQ43d7dVXnOIAgwJV6jNygHtq0QF6zyXfhV3ov3AvNQ1ZZok4zyZem5zEvPxqllXyoQYACRnglikrdJQ7VRRnmInGbbModq4hCol2KG+6bzBdgN4AHVTNNhk1HZbTJqKn7UUjnf37zeO4+qEqjKlC0DAc+vXJjwRdEmGRVOC+tkedKlU/YqG7L8leWVD+mz4NrJhBemTTLqDJWDCMI66MOAiJDOaRaUOJIijQrxOO4lUY7tDu84BSclqjfGsw/FAnzAJwPt4TWWJJa6dtW3gmLU3KK2D9VfaN3ag6JKQXM187ZCm2RUEx7YCbDj5VTsrwodQQR+g7RNRkVfRndYUJIzwjTl4CbSsUNWb/x92h3eNWRs8ACrKoaWzgCHoDZ1DV8YoK/cGTVOk58qQM3jfXq9rVef1feKscQpCCPhvac91jdMwdwIvW3o9QqaKnau1aRShU6802WbRmqTjPJTR5ruVWH7cDFTuMPRjvpWkIr6LDLJTAHDi/UBugb3oMLFu/dr7xdBm2SUW9tlYtUgTbE7/JDoQWzZo+J+ebX29miTjDo0QnN8R5eWiqqnEpWJUnBdMi1NsbxN0x+MNsmoUDZ9sFK7sF+5jySWlhafyDVME/hNpX6d2LnP8K6gOcX6jJFdIB0mWTqa8UW4vQAGRGhJ7BST325woZfZLNImGSUkx5ilrTKGVDTczIRtnCOJ0p/bok0yKqo+6tD2zK5eTqO/SZJ5FDHgPmnYH/aJw5UEq+DrTmu/XQDAgFU+p4XhSU9zU/z6dNd9fdQ4ZRvljYhfn1rzuBpaoF1DIFKuDPbg2AJtklE5CWm5w0y4riYMU5TDAhhKuujYHpkYp+EogTFZaDFFJ83y1GZ0gLNU7eujVlDPl5GytjApBcG8ycjxq2prRII3Qptk1Dyfgu7XxW38Cs8qNTixLeKCnsFVtYUdTKyiYEiKhda5feKrNqgAlYPfVc2eQEg8t6c0ryDvD2rgU0oX5TlI6dHLbBycL2jBzpQ1klsu8z7kRdoko0I4yS70tdIz5uqbCS3t+ziV1+ed32N943S2E1WmPiW1tG1IHa0wQks9xsWMwvm0SZHaJKPiYuvmGwRg/U11vA7IQnJm9WoiT8ZK5mKk35tEE5tklPO1ZhMpXs6VqQwZp7OkJa1291N9ikXf8fokUZvk0zYZFebZHNYhEIOASZQ8adfFVxm24g6wvirATTZIm2RUNugwV+TYZ8cp7fm+/JxSgWTHCuN31DdOAZe/s5BcjqLW0XOvPqvKnEiDMOerOFDZpkBtk1HODqMahepS1rHuS1fSRStvfAHaJKO8ev9FBRwKWctn6s3njRswVRg/ZphJPNNpo5zaJKMSNTKF0ilHGgotTENq4nG9bQ6Fmwp/Zo93CRfagH6JtsmoU+jOcySBMFbDN/MliJtOZDfFOmY1WbhL1AqKW1obuwgE5ejCZ3PFey6gEUkhACaQJZvrORz2nVuG6eDlHkhLpCPo4lz542FuCpkqKsBjW90PaZOMCuX1dNbbA1a9ugj+M2bpq7IlPLVPc6yg03xSoZ2arP2RaqJJdgAg6OSChIniEf3tjBqmGBi1Q0i1jcJrDFkBCQLQwRdflwBszax9Ids4Tf6AuWKjmQwQfAUy43rCsdUhDb9ZxBdpk4yC13ytzlplRqgKwmJOBQeB5JH5nCbrpn3ZzRoiZKYT+i1qoT60Sa3wEY/tlRnereYibZJRmN21MCMLZCb+q0RMQhMqa1Y4u3te3yq6vcvvQIR8hkg9aG5OwYMfxqPnvn3NVhcHAG2SUdmPCiKVa2UN9DEx1biwR0XaEOS0w/NhOhyPYUjntYjl8YnDzhvfhZjd/54PTJtklMNRTTZK+1BC1XEpCXClr8tyCdVwMFe0WYS+SUbN4VTmc21qMolRtT1cPtioFOIX4/HFL5o2yijIM8nobZWhl9FWecD0gusiW6RNMirLATAndBFfRSqDTINtdHi55wvOsHP77mL3Ib0tqUmGOpO5f/SueOd07I/dp5TfX6Kygg7pXbh+LCsIsUFtt3T8D45p4pGNrfpTm2RUpIwm+tJkLbFZSmbpUtiX3aymQDjb0ZfOaKc5DTFjK04qhlVrq6Om3ac5xim+G74OkBqgQrhPtMc5TL/DWmBC6eXNNrimSvm4YVd9q+jmJr65s9gnjuKMFR6ReIRc2Budn+4Mh1YI6lYzJjbKqBzmAxkYvKSzNood7NKehbSSpCDRNytj1trP3K6UrmxGH5KN2qZMbZRRxCo5EWhAa2csUssXSmrtP6FoR30ryHORGlBXFlnzTVVZZp8g0WXepznGaT6d8peBAKleGd/duSUo1aYl6nztPsO7hqZqNYxJevfLSE3JyWcRnme+tdPPtkbbZJQBDqzALO4jIaaUlMR4Dtkp7hewTnZNCG6r/Noko2a2AIAvBrCIZx5ZbwwQDm45Kt7vgWXg5zY5tUlGnVha8YgLyl+Ckq5R0XKKQkGkApjLplI2ms8HtElGPXlyU6xIg0lqXVSLUL1BTYJJuiyFoLZIm2RUfFcGJDTbM7IDc1QjlBaycTgedtW3huI7DuG7mde3FIkQEfK2EwxSG9PT9IYjW6NtMmpJYjqnezathu6BhLPMJh+Oe6xvmOa7u9pBGiUxl9jOO48UWDmYTd5DSCtoPquidYlHjVCR8q2sNDO294hz+1T8OvJpqsGee6rK6lXwmmk84ZLZNs5Q7hDvErWC/N1cBcpbKWNV8JU7wOUPQe/t5u0t0SYZNfMV0oVG1ke1SJ67TlZtklHTdBDdCa9tGAEY1UK2uoBxjUOXbX8Z5QoKsJ226NQxI8+Zo6fmW9Ad8mCg3BZpk4yajgevE1vGqeENF1uF+RiNaat5375gBYVWNPwtqrQiFMZA2OH5CkpvEoj0Fn221eUz96VNMmqC2T3msNaThpRAaU7ocg2oC2HiLE0UwtzXLlErKJQ3TYeSnmx3Xu5t78VPBys4JCmoLyYbNxswF7RJRs3zzJPwzDJeixMLA9U7jIX8XmQH+RJkA8VbQ9OxHZ4P0zSNvY3N9pPU5B8wkx9jYSS6LJfZqm3bJKNSt3E/SusnWIjWyenDmdxOmrPeRdND3RukbTIKcu8wpUGmdS2P+sb5OvelOrxHJlZQ6EawGxt78JQxOBRKgKOzcl7XvSdgriDdraCiYNoiBS00sxgUB7WXo+fG68hLmpgrwAIYlt92s0cmxkkhbP2+XJlTbrpIyCSLJOOkWt1zz1fQ3Z39Didr1UbLXPXzX8iT4iPC77nn60irn6pDV0a4KWXZ1dPzxeah+tslapzigmfaK0Iyie8hUZGetlJ6kW+7I97QxkHINgVqm4yKFNQnfc+cMHdo9vITcskX39UB9UTVN+3pYsPkXeP1dQH/GPAcnCIKD2G6WGIWvZOqSfeeA3t42iSjpkYSCgUo6rOUowcHgoN0vcy84MwrefR8TxdbR6fT3EQLFEj1Cv3pQGwp7/pT87PjK0f4lduiTTLqeHMYyirS66K6ORHpC4sRegLpcgPgPSg7TMlGjS6rcZRomSISoT+drnfG1EzadxdbQXoD3mqGV+IGk1prefXe6CBRsB54Dqe3bf6D0CYZNU3ae1JkulDthWjWRr98qzisIwKK/T284+RjGIc5UiProvjhvI1BfdxKsJDSGpz1grEt0CYZFXjquRFwNa9x0v5giEE4u30mpLw+t4eQhqm1qTW6Q8ZZDcPTSyhhEnCbQrKKNsmo2MttR6p1XHrJo4FbShfLl++obwX5iCZYx/fW7zan5pfKVNP8W33PTaZNMurcq4FFfZq7XuZJ2kEjVhElTESbaKHALdE2GUX7FwgSUxyGT2SVT4GiSTm5DP0FFsxtr/e4PG2SUecR7huxV+cg5GMN/IZ/pSXPUpUe/uwhpHFKM7yhBQjaqklITI8MFRksf2BDtElGOVdykBVZKcj6fD6+0Nnm6ZznvoeQVlBjOsoQJi+lo5qUWiA1URiyx7tJ2iSjRnu6fvkkoDeVU47fG7fB4imzb3VrvwjaJKPSXkgKkQfxhchEfirDiJxYyFf3ZbZY2TS/Xdy3SUZF/cM7kA14QdVmIM3IuUYPFHwNGPS1Z4q3QhtllOwtnIVVElXtvqKsG6lCK8dCGzw1KDZGm2TUfJqDmCdqlJMTgFDS49SIJR32DmMe6zjs6WLj5GFjokgsRaxaxyvsE18MwL6VaCttu9NmXgKB+/YF4yT2JvfGVDwj+/XjbUhggQ++d9K+NHQF+elgcmV04yrtXlFBR3ZOTAnT19O8O7zDFEpn9bbSFkkpBnWnPgBzeFogkCD8voZ3Hc2n2YPKi2S95caajljKjxAoEf84nne2US9qo4yC6V0eJy39WKk/zo/U3yUsFKDjO8gPd0BwtKJxf1f8CprKLs0CRFuTiE7mUZjzVHqLF3MuqhTVN90QbZJRGXmN5jxwqeG5SFiZrpz/oHpiNMTtkYlVBHKhyQYV0g8iq6bsk6tZjyqTLeLe6qsfNsmoPCc0GkGvpQBeRMkzikYkJTNrt1HjpHdqWUOG6Fg7ttj3xT+bo00yar5To5otA63AhLqWA4k6arFNJozQJhkVc8+rNUts5Tqn4QyxCPYm9l06XRg6OuzbF4zTpCIEPE1sTd5dc5F1hnf0O7DMpn2RwDjd3d7Vr4p3NuqD4/i+Qy8Z1AzOiijFGXi4IsWNdd6Xpk0yigewR7qtguLctzKm1823YJfox+m0B2WHaYLcc0UIJgLA8nyc1uLaEsRfrWfloPNXQuz79a2hOfQ7zNsM8b6WrnzcnjTESUV2fp+PWkFvM6h7+ehLuep555adUcMk4kcrmTaWJ0FldebtzqgVNEeMzOzPCJkAQR1vMRGRuXP7fn1rCKD2mu1u6tUaRiRdEeUNhvzG65R7vjNqmHDGfM2Ug85BZ/B86PIycbgzagUFtqNKtaJQkUjOxGLBhoVwjTFHBdJ12G3UCiqaKyj1Z8f6aqDQejllE1SkP35PbllLlK2qI+UDsb7hKG2LdkYNk96raOXF9+7rKLx3p7v7XfzAtElGNWXGWyffnQTEmg6HPfd8mPQ+5z1qmhSVFQtLa7yvdSOfYNw3qF9Bp7s77Msl286X28D7ptJxBzsyB8wHpJhrMPyuMjm57y62llTu3SBZ6z0mZEotTRBG8mUycaOgb5uMygmYMKtL1GQaqjidK6G2Mbe4wNKa4zXHm5u3avtD0SYZlQc2zL4W6kgW38y+TkFqi0jiL8vtizfbY30ryMr/fhDLAdP3eI+Ye77D8zUk0sCX7JR2hPXuzYu3YtXP+wzvCppyX0OXkcFvLGQzIQQP/tVLcKAkFcnfj8dtdsk2WzXbkaLuNtklTmeu0XV2RD5v3yiZ1X8b3OVom4x6i3BDa40ujyzJ1R/rHOxL0SYZJfMmOzxbyOPjrx4Kxvn6vnv0fB15H2CVRi9abierGJlGjpgpobyUIO9GAcgXT5tkVHpXvOpgi3rzTEuvgYWBAImx+P6onVHjFAyUNrRhoipv1atz2iU6XB+y+qJok4xK4QK2K/OazlvM3bPKs4ynHfWtoGii0u4tZanNkjTZ7zts+U78PiXbiXLTZOL7hmiTjJqLFGnW9Bze1p59+nr87oy6opmadhs1TvNDLVLqJVR49bkt2iSjPIsKrXt1wwLS49rQa6kqGbO7jRqnU3q3Wqjz83oLPLyrfKV0vLVgwITv9vLTLdAmGTWHOff1O+gzbr9asUAsu8f61tHN8ZjHuso6wtHe2pDKWDhVbwyitt9Rpbc6F79JRqX072JDzD5tdKb1/kKsxxnqTu9noeKGW6JNMurudDKSx41XsRpkRh+KeDYZJq5/i4Y/IG2SUccDi7gFett0i0mtnVlotTtoUbkxiNiuG2OL7+453iVtklFz7lHs1KXIRDdsZB5m/lQCLTQEpn3TqnEKPlBCkacgbZKK1l4TAiTkD2ulYaUai/8E8D7s+0yMk963yMMWOwtT8fjZEy6MwBoRenXfLdEmGTVNJBn3nXboSVEpAF+KVBUXe19xuIJmMvIjISR77qkGBlCrfgMBSNpWoXmkTTLKTz5PPlSaSHnAXWoEYFnqc/4ZyL4tqNdL0iYZFRztR47HMK/PKG9M27f2lcifxHLPVCAgzC3SNhnVeF9ytY12/MIiGOZWOpHBk9yylG9SRfYLbNQuUcPkIW5XgQlSfUbgm2aDuXo0DFWE4NbEYQjjivWLpk0yKig74pw9uyu2IjWCtOk6ES+EjektgS1SNc+b1H2bZFTMW0gWo2cvhNBIKC6YxKt15OA2RNL5je6suElGHQ8HzDeB7jRnJBagu5Y0gQPtCvfF1mtoPp3oRV846TcW2YYY+VICpnntvjR0HcVN4kUW0gKD9P6w3KVtTigqmwcM2tdHrSB82VZBcqv83EJ8+r0VXa8AShhPpvmiaZOMCsCgOrPPONYgPpEr/ConUKC+Ztrz+lZQkxf3VUuMOy0mlWOnPbllnOTCmMFrmC2y3nTjOLgwwoAtSL8V2iSj7qN+qslAfq5CEvb1vYnJS9MmGRXfFf/W47pIjd4y2yzKpG2H52sIwjjWLEXDP7qP30QE0H7PQlpFxydlm5tQS4I1c2vP4NKHnsrAeiCQq17QvEXaJKN8kMxoljOSVzRxIEFyU+93TnNT2+TUJhlVjMr9ruwyzV6czRPdQ9ij5ytodpaRMvP74Ken3y1m2dCbOdZ5/muTVmqTjIKuqub8WqsNRUGawreW1XRV2wI6vCRtklGR7j2sfZ37wN8llSs3UpQcO7dB2iij5v6kOI8IKdQXv2t/md7YVt5l6KGcR0he0ib2qfg1NBv7usogN38zaK2uIEklJ78wSZkmlsJcprzKH4y276hvnKyXbfGJw3oJqN25wiI1UsnAnsF0yrS/NXScossTAgu0OuncspJujbKiV41bUYxs1/ap+BUU8/AIbROCq1GfzSRzzz6201hVRRK9rVqnTJtkVIibjxtBAotZZkhpDSTwzOadr5/3t4aOU4C9k0PNiBGyklso+8jJASBn4t1G96ffKKPuyjqOhZWGpbSr9Vmt/KAUIcZQEj3pmlRu96PGacZe7EcK7HdBYYi1c4dYvRwIXojc9miTjPIrnBmOBidwZh2xqpW+DNMcTpXZ3xq6gta8yEQvCe29ypV/5h+uMKss58k+wf0b/oC0SUalF0IOBEetdVH8eE1F8lSMyXtyqPcEzBVEdmahXBNs0PHMGFBncCwn0Mj1VmGrc4aJNsmoGFXVWxG0CG2N6GR5oLU5sD4fdtW3jmKsT60RMDvWqTJ0vbdtUvN+fJpym2K1SUYdJt9NF1u7dbZfKCem6LfJp20yKgdOMzV3ahG5eC1/KhVML2DuhvLisJj8Or/gC6ZNMipubpjDQPEXMYMDhEWV5guzPJMUHi4SdWSJEvNXG6NNMsofaesWrrbwfCuHXP8Ws8DqHmwFPQyC++S8f1G0SUY5t/BOjtaUBQqPnovPf7zz1Tla04uVv0W7H462yai00URj9Xrbl21Xx2dxXbGBapUigYldooYpbiHAwLijXb8C2p4qKiHUHuTpyWyjoVSwfdOqFYT9DOsOWZLk+OVYx2iuXhwA0z4VP053aZa1P82BAKCzycfSZMf9C3/xtElGecgE6u3WolTf/ZfdkJ0K+1T8OjpOWf0YaROJeDYR0BoWWRlNcmnO9miTjJrjS4sxZU9PSTAJMpwm+xVFTvR/U/LCOlv4RdImGRWXhi51F5+h5WS/oqgqZApOvHJubEF3adoko05neN7sLdbJPD2560eplYllt+4cpWfZtnkCcZsJfptk1CFuWuUaAVk13d4EE4bUaFWpVx3WZbZDm2QUrqrQE72BRRkaytEzFKcT/+FY6+3X8c+8bwgyTnNZFQ/IDpmiohKRrA3nW8ygdVJ0jOoqQGKbArVNRnWlJhADI9lT8XV9Or5nk1+VAfVF0iYZVftPpAN1VH1o1hZqUbP3fHISAMn+MsoVdDrNISjjhKhNO7qtfSboUpZ3QczitW8VQHDaJKM8/A+/eRRB2ak+k4Kr1olW98ovTmnlCG6FNskogOC9IAGH5W1mZfvlIf2sUQR8Me92Rq2iADvUU0oDSRSD6MudWlBc8LjXeanftmux7h1MjNN0OHht+SnZpRwaSXl2hBAXUV8ZANtk00YZ5Z2rAm58XTVk/VngQtYjoxd4nCVc8kTPeHzfqnQFBSMwqqclpKNaU2ZCX5KCjny0q7s4bZJReZ1T+80z4i04zVrs6AS/3srH3ary2ySjInXjByNLRnvzT6Eygez7rvqGKZSokK3q6tBSa0dM7nNxeO71ag/2a5eoFXTwh0op6fje2kXRYlse13aptkqbZFRQoC/+mLldUjyiTalc1dsj81SA+NLX3eEdp3/2ne/8xvnjNy7dji3RJhm1U007o66EdkZdCe2MuhLaGXUltDPqSmhn1JXQzqgroZ1RV0I7o66EdkZdCe2MuhLaGXUltDPqSmhn1JXQzqgroZ1RV0I7o66EdkZdCe2MuhLaGXUltDPqSmhn1JXQzqgroZ1RV0I7o66EdkZdCe2MuhLaGXUltDPqSmhn1JXQzqgroZ1RV0I7o66EdkZdCe2MuhLaGXUltDPqSmhn1JXQzqgroZ1RV0I7o66EdkZdCe2MuhLaGXUltDPqSmhn1JXQzqgroZ1RV0I7o66EdkZdCe2MuhLaGXUltDPqSmhn1JXQzqgroZ1RV0I7o66EdkZdCe2MuhLaGXUltDPqSmhn1JXQzqgroZ1RV0L/FhmljgmSwgj7AAAAAElFTkSuQmCC"
+    }
+  ]
+}
diff --git a/packages/suite-data/package.json b/packages/suite-data/package.json
index 507656adff6..7a8bdfd98c1 100644
--- a/packages/suite-data/package.json
+++ b/packages/suite-data/package.json
@@ -14,7 +14,6 @@
         "browser-detection": "webpack --config ./browser-detection.webpack.ts",
         "guide-pull-content": "yarn tsx ./src/guide/index.ts",
         "update-coinjoin-middleware": "./files/bin/coinjoin/update.sh",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "type-check": "yarn g:tsc --build tsconfig.json"
     },
     "dependencies": {
@@ -27,6 +26,7 @@
     },
     "devDependencies": {
         "@mobily/ts-belt": "^3.13.1",
+        "@trezor/eslint": "workspace:*",
         "@types/fs-extra": "^11.0.4",
         "autoprefixer": "^10.4.17",
         "babel-loader": "^9.1.3",
@@ -40,7 +40,7 @@
         "simple-git": "^3.26.0",
         "style-loader": "^3.3.4",
         "tsx": "^4.16.3",
-        "webpack": "^5.94.0",
+        "webpack": "^5.96.1",
         "webpack-cli": "^5.1.4"
     },
     "nx": {
diff --git a/packages/suite-data/src/browser-detection/index.ts b/packages/suite-data/src/browser-detection/index.ts
index 02de2f9d483..429d8aaa1cb 100644
--- a/packages/suite-data/src/browser-detection/index.ts
+++ b/packages/suite-data/src/browser-detection/index.ts
@@ -196,8 +196,8 @@ window.addEventListener('load', () => {
 
         // browser-detection styles are removed because they should not be available and used in app
         // styles.css gets id="browser-detection-style" on its <style> tag due to "style-loader" configuration in webpack
-        const style = document.getElementById('browser-detection-style');
-        style?.parentNode?.removeChild(style);
+        const style2 = document.getElementById('browser-detection-style');
+        style2?.parentNode?.removeChild(style2);
 
         const appDiv = document.createElement('div');
         appDiv.id = 'app';
diff --git a/packages/suite-data/src/guide/parser.ts b/packages/suite-data/src/guide/parser.ts
index 3762ce66821..a0c92cdb900 100644
--- a/packages/suite-data/src/guide/parser.ts
+++ b/packages/suite-data/src/guide/parser.ts
@@ -1,9 +1,10 @@
 import { join } from 'path';
 import * as fs from 'fs-extra';
 
+import type { GuideNode, GuideCategory } from '@suite-common/suite-types';
+
 import { GITBOOK_ASSETS_DIR_PREFIX } from './constants';
 import { transformImagesMarkdown } from './transformer';
-import type { GuideNode, GuideCategory } from '@suite-common/suite-types';
 
 /** @returns true if given path is a directory. */
 const isDirectory = (path: string): boolean => fs.lstatSync(path).isDirectory();
@@ -74,7 +75,7 @@ export class Parser {
                 .match(/^# (.+$)/m)![1]!
                 .replace(/[\\]/g, '')
                 .trim();
-        } catch (e) {
+        } catch {
             throw new Error(`Could not parse title from ${path}.`);
         }
     }
@@ -210,12 +211,12 @@ export class Parser {
                 // Take all locales except the english one
                 .filter(locale => locale !== 'en')
                 // and merge them together.
-                .reduce((englishIndex, locale) => {
+                .reduce((englishIndex2, locale) => {
                     // Parse the locale's version of the content.
                     const otherIndex = this.parseTree(join(this.source, locale), locale);
 
                     // Merge it into the english index.
-                    return this.zip(englishIndex, otherIndex);
+                    return this.zip(englishIndex2, otherIndex);
                 }, englishIndex)
         );
     }
diff --git a/packages/suite-data/src/translations/backport-en.ts b/packages/suite-data/src/translations/backport-en.ts
index b7d5b33cbdb..7979e9eaae6 100644
--- a/packages/suite-data/src/translations/backport-en.ts
+++ b/packages/suite-data/src/translations/backport-en.ts
@@ -15,7 +15,6 @@ import fs from 'fs';
 import path from 'path';
 
 // See comment in list-duplicates.ts
-// eslint-disable-next-line import/no-extraneous-dependencies
 import messages from '@trezor/suite/src/support/messages';
 
 const packagesRoot = path.join(__dirname, '../../../');
diff --git a/packages/suite-data/src/translations/list-duplicates.ts b/packages/suite-data/src/translations/list-duplicates.ts
index f38cfc83d1a..a2ffd2968cd 100644
--- a/packages/suite-data/src/translations/list-duplicates.ts
+++ b/packages/suite-data/src/translations/list-duplicates.ts
@@ -2,7 +2,6 @@
 // this is causing module cyclic dependency!!! it will work since this dep is not specified
 // in package.json or refs, and also these files must be excluded from TS check
 // TODO: intl or scripts should have dedicated package on that could both suite-data and suite depends
-// eslint-disable-next-line import/no-extraneous-dependencies
 import messages from '@trezor/suite/src/support/messages';
 
 type Message = {
diff --git a/packages/suite-data/src/translations/list-unused.ts b/packages/suite-data/src/translations/list-unused.ts
index 6488ea8df10..93862d72a9f 100644
--- a/packages/suite-data/src/translations/list-unused.ts
+++ b/packages/suite-data/src/translations/list-unused.ts
@@ -3,12 +3,12 @@ import path from 'path';
 import fs from 'fs';
 
 // See comment in list-duplicates.ts
-// eslint-disable-next-line import/no-extraneous-dependencies
 import messages from '@trezor/suite/src/support/messages';
 
 console.log('unused messages: ');
 
 const rootDir = path.join(__dirname, '..', '..', '..', '..');
+
 function execLocal(cmd: string) {
     return execSync(cmd, {
         encoding: 'utf-8',
@@ -60,7 +60,7 @@ for (const message in messages) {
 
         try {
             execLocal(cmd);
-        } catch (err) {
+        } catch {
             unused.push(message);
         }
     }
diff --git a/packages/suite-data/tsconfig.json b/packages/suite-data/tsconfig.json
index 73d74790b8e..d982af2f37c 100644
--- a/packages/suite-data/tsconfig.json
+++ b/packages/suite-data/tsconfig.json
@@ -15,6 +15,7 @@
         { "path": "../connect" },
         { "path": "../env-utils" },
         { "path": "../urls" },
-        { "path": "../utils" }
+        { "path": "../utils" },
+        { "path": "../eslint" }
     ]
 }
diff --git a/packages/suite-desktop-api/package.json b/packages/suite-desktop-api/package.json
index b065ca76887..285bf8f1145 100644
--- a/packages/suite-desktop-api/package.json
+++ b/packages/suite-desktop-api/package.json
@@ -14,11 +14,10 @@
     "main": "./src/main.ts",
     "browser": "./src/renderer.ts",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*{.ts,.tsx}'",
         "test:unit": "yarn g:jest --verbose -c jest.config.js",
         "type-check": "yarn g:tsc --build tsconfig.json"
     },
     "dependencies": {
-        "electron": "32.1.2"
+        "electron": "33.1.0"
     }
 }
diff --git a/packages/suite-desktop-api/src/__tests__/api.test.ts b/packages/suite-desktop-api/src/__tests__/api.test.ts
index 181c67fae7e..c41cb66123d 100644
--- a/packages/suite-desktop-api/src/__tests__/api.test.ts
+++ b/packages/suite-desktop-api/src/__tests__/api.test.ts
@@ -11,21 +11,23 @@ describe('DesktopApi', () => {
     });
 
     describe('Events', () => {
-        it('DesktopApi.on omits event param', done => {
-            api.on('tor/status', state => {
-                expect(state).toBe(true);
-                done();
-            });
-            ipcRenderer.emit('tor/status', new Event('ipc'), true); // Event param should be omitted
-        });
-
-        it('DesktopApi.once omits event param', done => {
-            api.once('tor/status', state => {
-                expect(state).toBe(true);
-                done();
-            });
-            ipcRenderer.emit('tor/status', new Event('ipc'), true); // Event param should be omitted
-        });
+        it('DesktopApi.on omits event param', () =>
+            new Promise<void>(done => {
+                api.on('tor/status', state => {
+                    expect(state).toBe(true);
+                    done();
+                });
+                ipcRenderer.emit('tor/status', new Event('ipc'), true); // Event param should be omitted
+            }));
+
+        it('DesktopApi.once omits event param', () =>
+            new Promise<void>(done => {
+                api.once('tor/status', state => {
+                    expect(state).toBe(true);
+                    done();
+                });
+                ipcRenderer.emit('tor/status', new Event('ipc'), true); // Event param should be omitted
+            }));
 
         it('DesktopApi.removeAllListener', () => {
             const spy = jest.fn();
diff --git a/packages/suite-desktop-api/src/__tests__/ipcRenderer.ts b/packages/suite-desktop-api/src/__tests__/ipcRenderer.ts
index 4e7378355ca..16e27430450 100644
--- a/packages/suite-desktop-api/src/__tests__/ipcRenderer.ts
+++ b/packages/suite-desktop-api/src/__tests__/ipcRenderer.ts
@@ -1,7 +1,8 @@
 import { EventEmitter } from 'events';
-import { StrictIpcRenderer } from '../ipc';
 import type { IpcRendererEvent } from 'electron';
 
+import { StrictIpcRenderer } from '../ipc';
+
 class IpcRendererMock extends EventEmitter implements StrictIpcRenderer<any, IpcRendererEvent> {
     send(..._args: any[]) {}
     invoke(...args: any[]) {
diff --git a/packages/suite-desktop-api/src/__tests__/renderer.test.ts b/packages/suite-desktop-api/src/__tests__/renderer.test.ts
index de7515cfb5e..2cb68ebd4f3 100644
--- a/packages/suite-desktop-api/src/__tests__/renderer.test.ts
+++ b/packages/suite-desktop-api/src/__tests__/renderer.test.ts
@@ -3,7 +3,7 @@ import { factory } from '../factory';
 import { ipcRenderer } from './ipcRenderer';
 
 describe('Renderer', () => {
-    it('api is not defined', () => {
+    it('api is not defined', async () => {
         const spyError = jest.spyOn(console, 'error').mockImplementation();
         expect(desktopApi.available).toBe(false);
         desktopApi.on('protocol/open', () => {});
@@ -11,7 +11,7 @@ describe('Renderer', () => {
         desktopApi.removeAllListeners('protocol/open');
         desktopApi.clearStore();
         expect(spyError).toHaveBeenCalledTimes(4);
-        expect(desktopApi.metadataRead({ file: 'foo.txt' })).rejects.toThrow();
+        await expect(desktopApi.metadataRead({ file: 'foo.txt' })).rejects.toThrow();
     });
 
     it('api is defined', () => {
diff --git a/packages/suite-desktop-api/src/api.ts b/packages/suite-desktop-api/src/api.ts
index c7790d54c8f..4e8974cc5d8 100644
--- a/packages/suite-desktop-api/src/api.ts
+++ b/packages/suite-desktop-api/src/api.ts
@@ -15,6 +15,7 @@ import {
     Status,
     BridgeSettings,
     TorSettings,
+    TraySettings,
 } from './messages';
 
 // Event messages from renderer to main process
@@ -30,6 +31,7 @@ export interface MainChannels {
     'tor/get-status': void;
     'update/allow-prerelease': boolean;
     'update/set-automatic-update-enabled': boolean;
+    'update/set-auto-install-on-app-quit': void;
     'update/cancel': void;
     'update/check': boolean | undefined;
     'update/download': void;
@@ -53,6 +55,7 @@ export interface RendererChannels {
     'update/downloaded': UpdateInfo;
     'update/allow-prerelease': boolean;
     'update/set-automatic-update-enabled': boolean;
+    'update/set-auto-install-on-app-quit': void;
 
     // tor
     'tor/status': TorStatusEvent;
@@ -66,6 +69,8 @@ export interface RendererChannels {
     'bridge/status': Status;
     'bridge/settings': BridgeSettings;
 
+    'tray/settings': TraySettings;
+
     'handshake/event': HandshakeEvent;
 }
 
@@ -91,6 +96,9 @@ export interface InvokeChannels {
     'user-data/clear': () => InvokeResult;
     'user-data/open': (directory?: string) => InvokeResult;
     'udev/install': () => InvokeResult;
+    'app/auto-start/is-enabled': () => InvokeResult<boolean>;
+    'tray/change-settings': (payload: TraySettings) => InvokeResult;
+    'tray/get-settings': () => InvokeResult<TraySettings>;
 }
 
 type DesktopApiListener = ListenerMethod<RendererChannels>;
@@ -109,6 +117,7 @@ export interface DesktopApi {
     appFocus: DesktopApiSend<'app/focus'>;
     appHide: DesktopApiSend<'app/hide'>;
     appAutoStart: DesktopApiSend<'app/auto-start'>;
+    getAppAutoStartIsEnabled: DesktopApiInvoke<'app/auto-start/is-enabled'>;
     // Auto-updater
     checkForUpdates: DesktopApiSend<'update/check'>;
     downloadUpdate: DesktopApiSend<'update/download'>;
@@ -116,6 +125,7 @@ export interface DesktopApi {
     cancelUpdate: DesktopApiSend<'update/cancel'>;
     allowPrerelease: DesktopApiSend<'update/allow-prerelease'>;
     setAutomaticUpdateEnabled: DesktopApiSend<'update/set-automatic-update-enabled'>;
+    setAutoInstallOnAppQuit: DesktopApiSend<'update/set-auto-install-on-app-quit'>;
     // Theme
     themeChange: DesktopApiSend<'theme/change'>;
     // Handshake
@@ -148,4 +158,7 @@ export interface DesktopApi {
     toggleBridge: DesktopApiInvoke<'bridge/toggle'>;
     changeBridgeSettings: DesktopApiInvoke<'bridge/change-settings'>;
     getBridgeSettings: DesktopApiInvoke<'bridge/get-settings'>;
+    // Tray
+    changeTraySettings: DesktopApiInvoke<'tray/change-settings'>;
+    getTraySettings: DesktopApiInvoke<'tray/get-settings'>;
 }
diff --git a/packages/suite-desktop-api/src/factory.ts b/packages/suite-desktop-api/src/factory.ts
index 85431726018..4c04d51e30f 100644
--- a/packages/suite-desktop-api/src/factory.ts
+++ b/packages/suite-desktop-api/src/factory.ts
@@ -1,4 +1,5 @@
 import type { IpcRendererEvent } from 'electron';
+
 import { DesktopApi, RendererChannels } from './api';
 import { StrictIpcRenderer } from './ipc';
 import * as validation from './validation';
@@ -47,6 +48,7 @@ export const factory = <R extends StrictIpcRenderer<any, IpcRendererEvent>>(
         appFocus: () => ipcRenderer.send('app/focus'),
         appHide: () => ipcRenderer.send('app/hide'),
         appAutoStart: (enabled: boolean) => ipcRenderer.send('app/auto-start', enabled),
+        getAppAutoStartIsEnabled: () => ipcRenderer.invoke('app/auto-start/is-enabled'),
 
         // Auto-updater
         checkForUpdates: isManual => {
@@ -65,6 +67,9 @@ export const factory = <R extends StrictIpcRenderer<any, IpcRendererEvent>>(
                 ipcRenderer.send('update/set-automatic-update-enabled', value);
             }
         },
+        setAutoInstallOnAppQuit: () => {
+            ipcRenderer.send('update/set-auto-install-on-app-quit');
+        },
 
         // Theme
         themeChange: theme => {
@@ -162,5 +167,15 @@ export const factory = <R extends StrictIpcRenderer<any, IpcRendererEvent>>(
         },
 
         getBridgeSettings: () => ipcRenderer.invoke('bridge/get-settings'),
+
+        // Tray
+        changeTraySettings: payload => {
+            if (validation.isObject({ showOnTray: 'boolean' }, payload)) {
+                return ipcRenderer.invoke('tray/change-settings', payload);
+            }
+
+            return Promise.resolve({ success: false, error: 'invalid params' });
+        },
+        getTraySettings: () => ipcRenderer.invoke('tray/get-settings'),
     };
 };
diff --git a/packages/suite-desktop-api/src/messages.ts b/packages/suite-desktop-api/src/messages.ts
index 5fe9d784930..2e14ffd1fa3 100644
--- a/packages/suite-desktop-api/src/messages.ts
+++ b/packages/suite-desktop-api/src/messages.ts
@@ -57,6 +57,10 @@ export type TorSettings = {
     snowflakeBinaryPath: string;
 };
 
+export type TraySettings = {
+    showOnTray: boolean;
+};
+
 export type HandshakeElectron = {
     protocol?: string;
     desktopUpdate?: {
diff --git a/packages/suite-desktop-api/src/validation.ts b/packages/suite-desktop-api/src/validation.ts
index dabf0021390..095115c4fe3 100644
--- a/packages/suite-desktop-api/src/validation.ts
+++ b/packages/suite-desktop-api/src/validation.ts
@@ -35,6 +35,7 @@ const validChannels: Array<keyof RendererChannels> = [
     'update/downloaded',
     'update/allow-prerelease',
     'update/set-automatic-update-enabled',
+    'update/set-auto-install-on-app-quit',
     'tor/status',
     'tor/bootstrap',
     'tor/settings',
@@ -42,5 +43,6 @@ const validChannels: Array<keyof RendererChannels> = [
     'handshake/event',
     'bridge/status',
     'bridge/settings',
+    'tray/settings',
 ];
 export const isValidChannel = (channel: any) => validChannels.includes(channel);
diff --git a/packages/suite-desktop-core/e2e/support/pageActions/dashboardActions.ts b/packages/suite-desktop-core/e2e/support/pageActions/dashboardActions.ts
index fd08fcad4ef..c8244982048 100644
--- a/packages/suite-desktop-core/e2e/support/pageActions/dashboardActions.ts
+++ b/packages/suite-desktop-core/e2e/support/pageActions/dashboardActions.ts
@@ -5,8 +5,16 @@ import { NetworkSymbol } from '@suite-common/wallet-config';
 import { waitForDataTestSelector } from '../common';
 
 class DashboardActions {
+    optionallyDismissFwHashCheckError(window: Page) {
+        // dismiss the error modal only if it appears (handle it async in parallel, not necessary to block the rest of the flow)
+        window
+            .$('[data-testid="@device-compromised/back-button"]')
+            .then(dismissFwHashCheckButton => dismissFwHashCheckButton?.click());
+    }
+
     async passThroughInitialRun(window: Page) {
         await waitForDataTestSelector(window, '@welcome/title');
+        this.optionallyDismissFwHashCheckError(window);
         await window.getByTestId('@analytics/continue-button').click();
         await window.getByTestId('@onboarding/exit-app-button').click();
 
diff --git a/packages/suite-desktop-core/e2e/support/regtest.ts b/packages/suite-desktop-core/e2e/support/regtest.ts
index 6e659613ce2..ba8f4cbcb13 100644
--- a/packages/suite-desktop-core/e2e/support/regtest.ts
+++ b/packages/suite-desktop-core/e2e/support/regtest.ts
@@ -16,31 +16,30 @@ export const generateBlock = () =>
         method: 'GET',
     });
 
-export const waitForCoinjoinBackend = () =>
-    new Promise<void>(async (resolve, reject) => {
-        const limit = 60;
-        const error = '';
+export const waitForCoinjoinBackend = async () => {
+    const limit = 60;
+    const error = '';
 
-        console.log('waiting for coinjoin backend');
+    console.log('waiting for coinjoin backend');
 
-        for (let i = 0; i < limit; i++) {
-            if (i === limit - 1) {
-                console.log(`waiting for coinjoin backend: ${error}\n`);
-            }
+    for (let i = 0; i < limit; i++) {
+        if (i === limit - 1) {
+            console.log(`waiting for coinjoin backend: ${error}\n`);
+        }
 
-            await new Promise(resolve => setTimeout(() => resolve(undefined), 1000));
+        await new Promise(resolve => setTimeout(() => resolve(undefined), 1000));
 
-            try {
-                const res = await fetch('http://localhost:19121/');
-                if (res.status === 200) {
-                    console.log('coinjoin backend is online');
+        try {
+            const res = await fetch('http://localhost:19121/');
+            if (res.status === 200) {
+                console.log('coinjoin backend is online');
 
-                    return resolve();
-                }
-            } catch {
-                process.stdout.write('.');
+                return;
             }
+        } catch {
+            process.stdout.write('.');
         }
+    }
 
-        reject(error);
-    });
+    throw error;
+};
diff --git a/packages/suite-desktop-core/e2e/tests/general/eap-modal.test.ts b/packages/suite-desktop-core/e2e/tests/general/eap-modal.test.ts
index 33e0b1830f9..deefaf68a45 100644
--- a/packages/suite-desktop-core/e2e/tests/general/eap-modal.test.ts
+++ b/packages/suite-desktop-core/e2e/tests/general/eap-modal.test.ts
@@ -8,6 +8,7 @@ import {
 import { launchSuite } from '../../support/common';
 import { onTopBar } from '../../support/pageActions/topBarActions';
 import { onSettingsPage } from '../../support/pageActions/settingsActions';
+import { onDashboardPage } from '../../support/pageActions/dashboardActions';
 
 let electronApp: ElectronApplication;
 let window: Page;
@@ -32,6 +33,7 @@ testPlaywright.afterAll(() => {
 testPlaywright('Join early access button', async () => {
     const buttonText = 'Leave';
 
+    onDashboardPage.optionallyDismissFwHashCheckError(window);
     await onTopBar.openSettings(window);
     await onSettingsPage.goToDesiredSettingsPlace(window, 'general');
     await onSettingsPage.joinEarlyAccessProgram(window);
diff --git a/packages/suite-desktop-core/e2e/tests/general/suite-guide.test.ts b/packages/suite-desktop-core/e2e/tests/general/suite-guide.test.ts
index d58eddcc6d0..12d1d317047 100644
--- a/packages/suite-desktop-core/e2e/tests/general/suite-guide.test.ts
+++ b/packages/suite-desktop-core/e2e/tests/general/suite-guide.test.ts
@@ -7,6 +7,7 @@ import {
 
 import { launchSuite } from '../../support/common';
 import { onSuiteGuidePage } from '../../support/pageActions/suiteGuideActions';
+import { onDashboardPage } from '../../support/pageActions/dashboardActions';
 
 let electronApp: ElectronApplication;
 let window: Page;
@@ -35,6 +36,7 @@ testPlaywright('Send a bug report', async () => {
         desiredLocation: 'Account',
         reportText: 'Henlo this is testy test writing hangry test user report',
     };
+    onDashboardPage.optionallyDismissFwHashCheckError(window);
 
     await onSuiteGuidePage.openSidePanel(window);
     await onSuiteGuidePage.openFeedback(window);
diff --git a/packages/suite-desktop-core/eslint.config.mjs b/packages/suite-desktop-core/eslint.config.mjs
new file mode 100644
index 00000000000..37bf4650401
--- /dev/null
+++ b/packages/suite-desktop-core/eslint.config.mjs
@@ -0,0 +1,20 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/webpack/**',
+                        '**/src/**', // Todo: reconsider, this whole package is probably just "dev"
+                        '**/scripts/**', // Todo: reconsider, this whole package is probably just "dev"
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/suite-desktop-core/package.json b/packages/suite-desktop-core/package.json
index 30da69f55cb..1ea3ef72f15 100644
--- a/packages/suite-desktop-core/package.json
+++ b/packages/suite-desktop-core/package.json
@@ -8,7 +8,6 @@
     "main": "src/app.ts",
     "scripts": {
         "build:core": "yarn g:rimraf dist && TS_NODE_PROJECT=\"tsconfig.json\" yarn webpack --config ./webpack/core.webpack.config.ts",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "type-check": "yarn g:tsc --build tsconfig.json",
         "test:unit": "yarn g:jest",
         "test:e2e": "yarn xvfb-maybe -- playwright test --config=./e2e/playwright.config.ts"
@@ -25,6 +24,7 @@
         "@trezor/connect": "workspace:*",
         "@trezor/connect-common": "workspace:*",
         "@trezor/env-utils": "workspace:*",
+        "@trezor/eslint": "workspace:*",
         "@trezor/ipc-proxy": "workspace:*",
         "@trezor/node-utils": "workspace:*",
         "@trezor/request-manager": "workspace:*",
@@ -35,7 +35,7 @@
         "chalk": "^4.1.2",
         "electron-localshortcut": "^3.2.1",
         "electron-store": "8.2.0",
-        "electron-updater": "6.3.4",
+        "electron-updater": "6.3.9",
         "openpgp": "^5.11.2",
         "systeminformation": "^5.23.5"
     },
@@ -50,11 +50,11 @@
         "@trezor/trezor-user-env-link": "workspace:*",
         "@trezor/type-utils": "workspace:*",
         "@types/electron-localshortcut": "^3.1.3",
-        "electron": "32.1.2",
+        "electron": "33.1.0",
         "fs-extra": "^11.2.0",
         "glob": "^10.3.10",
         "terser-webpack-plugin": "^5.3.9",
-        "webpack": "^5.94.0",
+        "webpack": "^5.96.1",
         "xvfb-maybe": "^0.2.1"
     }
 }
diff --git a/packages/suite-desktop-core/scripts/notarize.ts b/packages/suite-desktop-core/scripts/notarize.ts
index 6edf13dfe79..3a6f2cdc2d1 100644
--- a/packages/suite-desktop-core/scripts/notarize.ts
+++ b/packages/suite-desktop-core/scripts/notarize.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable no-console */
 
 const { notarize } = require('@electron/notarize');
diff --git a/packages/suite-desktop-core/src/app.ts b/packages/suite-desktop-core/src/app.ts
index 49009a7d19c..bdba56b1342 100644
--- a/packages/suite-desktop-core/src/app.ts
+++ b/packages/suite-desktop-core/src/app.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-use-before-define */
 import path from 'path';
 import { app, BrowserWindow } from 'electron';
 
@@ -16,13 +15,13 @@ import { getBuildInfo, getComputerInfo } from './libs/info';
 import { restartApp, processStatePatch } from './libs/app-utils';
 import { clearAppCache, initUserData } from './libs/user-data';
 import { initSentry } from './libs/sentry';
-import { initModules, mainThreadEmitter } from './modules';
+import { initModules, initBackgroundModules, mainThreadEmitter } from './modules';
 import { init as initTorModule } from './modules/tor';
-import { init as initBridgeModule, initUi as initBridgeUi } from './modules/bridge';
 import { createInterceptor } from './libs/request-interceptor';
 import { hangDetect } from './hang-detect';
 import { Logger } from './libs/logger';
 import { MainWindowProxy } from './libs/main-window-proxy';
+import { isAutoStartEnabled } from './modules/auto-start';
 
 // @ts-expect-error using internal electron API to set suite version in dev mode correctly
 if (isDevEnv) app.setVersion(process.env.VERSION);
@@ -129,16 +128,29 @@ const init = async () => {
         restartApp();
     });
 
+    // Electron 32 has a bug with Worker due to Chromium changes
+    // https://github.com/electron/electron/issues/43556
+    app.commandLine.appendSwitch('disable-features', 'PlzDedicatedWorker');
+
     await app.whenReady();
 
     // Load bridge module first, it is required in both UI and daemon mode
-    const { onLoad: loadBridgeModule, onQuit: quitBridgeModule } = initBridgeModule({ store });
-    await loadBridgeModule();
+    const interceptor = createInterceptor();
+    const mainWindowProxy = new MainWindowProxy();
+    const { loadModules: loadBackgroundModules, quitModules: quitBackgroundModules } =
+        initBackgroundModules({
+            mainWindowProxy,
+            store,
+            interceptor,
+            mainThreadEmitter,
+        });
+    await loadBackgroundModules(undefined);
 
     // Daemon mode with no UI
     const { wasOpenedAtLogin } = app.getLoginItemSettings();
     const daemon = app.commandLine.hasSwitch('bridge-daemon') || wasOpenedAtLogin;
-    if (daemon) {
+    const daemonShowUI = app.commandLine.hasSwitch('bridge-daemon-show-ui'); // show UI immediately even in daemon mode
+    if (daemon && !daemonShowUI) {
         logger.info('main', 'App is hidden, starting bridge only');
         app.dock?.hide(); // hide dock icon on macOS
         const waitForFullStart = createDeferred<void>();
@@ -148,25 +160,25 @@ const init = async () => {
             app.dock?.show();
             waitForFullStart.resolve();
         };
+        const openURL = (event: Electron.Event, url: string) => {
+            // Handle deeplink in daemon mode
+            event.preventDefault();
+            logger.warn('main', 'Custom protocol URL detected, initializing UI');
+            global.customProtocolUrl = url;
+            handleFullStart();
+        };
         app.on('second-instance', handleFullStart);
         app.on('activate', handleFullStart);
+        app.on('open-url', openURL);
+        mainThreadEmitter.on('app/show', handleFullStart);
         await waitForFullStart.promise;
         app.off('second-instance', handleFullStart);
         app.off('activate', handleFullStart);
+        app.off('open-url', openURL);
+        mainThreadEmitter.off('app/show', handleFullStart);
     }
 
-    await initUi({ store, daemon, quitBridgeModule });
-};
-
-const initUi = async ({
-    store,
-    daemon,
-    quitBridgeModule,
-}: {
-    store: Store;
-    daemon: boolean;
-    quitBridgeModule: () => Promise<void>;
-}) => {
+    // UI is opening
     const buildInfo = getBuildInfo();
     logger.info('build', buildInfo);
 
@@ -176,25 +188,15 @@ const initUi = async ({
     const winBounds = store.getWinBounds();
     logger.debug('init', `Create Browser Window (${winBounds.width}x${winBounds.height})`);
 
-    const mainWindowProxy = new MainWindowProxy();
-
     // init modules
-    const interceptor = createInterceptor();
     const { loadModules, quitModules } = initModules({
         mainWindowProxy,
         store,
         interceptor,
         mainThreadEmitter,
     });
-    // TODO: each module probably should have 2 exports - one to be initiated in the main layer and one to be initiated in UI layer?
-    initBridgeUi({
-        mainWindowProxy,
-        store,
-        interceptor,
-        mainThreadEmitter,
-    });
 
-    app.on('second-instance', () => {
+    const reactivateWindow = () => {
         // Someone tried to run a second instance, we should focus our window.
         logger.info('main', 'Second instance detected, focusing main window');
         let mainWindow = mainWindowProxy.getInstance();
@@ -209,7 +211,13 @@ const initUi = async ({
         if (!mainWindow.isVisible()) mainWindow.show();
         if (mainWindow.isMinimized()) mainWindow.restore();
         mainWindow.focus();
-    });
+    };
+    app.on('second-instance', reactivateWindow);
+    mainThreadEmitter.on('app/show', reactivateWindow);
+    // restore window after click on the macOS Dock icon
+    if (process.platform === 'darwin') {
+        app.on('activate', reactivateWindow);
+    }
 
     // create handler for handshake/load-modules
     const loadModulesResponse = (clientData: HandshakeClient) =>
@@ -246,15 +254,21 @@ const initUi = async ({
     });
 
     let readyToQuit = false;
+    let stoppingDaemon = false;
+    mainThreadEmitter.on('app/fully-quit', () => {
+        stoppingDaemon = true;
+    });
     app.on('before-quit', async event => {
         if (readyToQuit) return;
 
         const mainWindow = mainWindowProxy.getInstance();
         const windowExists =
             mainWindow && !mainWindow.isDestroyed() && mainWindow.isClosable() && !app.isHidden();
+        const autoStartCurrentlyEnabled = isAutoStartEnabled();
         logger.info('main', `Before quit, window exists: ${windowExists}`);
         if (
-            daemon &&
+            !stoppingDaemon &&
+            autoStartCurrentlyEnabled &&
             (!isMacOs() || windowExists) // On Mac the window closing and app quitting are different
         ) {
             // Prevent quitting app when in daemon mode, unless the UI is already closed
@@ -271,7 +285,7 @@ const initUi = async ({
 
         await Promise.race([
             // await quitting all registered modules
-            Promise.allSettled([quitModules(), quitTorModule(), quitBridgeModule()]),
+            Promise.allSettled([quitModules(), quitTorModule(), quitBackgroundModules()]),
             // or timeout after 5s
             createTimeoutPromise(5000),
         ]);
diff --git a/packages/suite-desktop-core/src/index.d.ts b/packages/suite-desktop-core/src/index.d.ts
index 1bf2960a272..3c39c93cfb3 100644
--- a/packages/suite-desktop-core/src/index.d.ts
+++ b/packages/suite-desktop-core/src/index.d.ts
@@ -118,3 +118,7 @@ declare type BridgeSettings = {
      */
     newBridgeRollout?: number;
 };
+
+declare type TraySettings = {
+    showOnTray: boolean;
+};
diff --git a/packages/suite-desktop-core/src/libs/app-utils.ts b/packages/suite-desktop-core/src/libs/app-utils.ts
index 9f87a4fe324..b985c4f231a 100644
--- a/packages/suite-desktop-core/src/libs/app-utils.ts
+++ b/packages/suite-desktop-core/src/libs/app-utils.ts
@@ -1,21 +1,29 @@
-import { app } from 'electron';
-
 import { mergeDeepObject } from '@trezor/utils';
 
+import { app } from '../typed-electron';
+
 export const restartApp = () => {
     const { logger } = global;
 
     logger.info('app', `Relaunching app with ${process.argv.slice(1).join(', ')} arguments.`);
 
-    const options: Electron.RelaunchOptions = { args: process.argv };
+    const options: Electron.RelaunchOptions = { args: process.argv ?? [] };
     if (process.env.APPIMAGE) {
         options.execPath = process.env.APPIMAGE;
-        options.args = options.args ?? [];
-        options.args.unshift('--appimage-extract-and-run');
+        options.args?.unshift('--appimage-extract-and-run');
+    }
+
+    // If in daemon/autostart mode, add a flag to show the UI right after restart
+    if (app.getLoginItemSettings().openAtLogin) {
+        options.args?.push('--bridge-daemon');
+    }
+    if (options.args?.includes('--bridge-daemon')) {
+        options.args?.push('--bridge-daemon-show-ui');
+        // In daemon mode, first quit call only hides the app
+        app.quit();
     }
 
-    app.removeAllListeners('before-quit');
-    app.relaunch();
+    app.relaunch(options);
     app.quit();
 };
 
diff --git a/packages/suite-desktop-core/src/libs/main-window-proxy.ts b/packages/suite-desktop-core/src/libs/main-window-proxy.ts
index 3c134a3dd6c..a6feee0e234 100644
--- a/packages/suite-desktop-core/src/libs/main-window-proxy.ts
+++ b/packages/suite-desktop-core/src/libs/main-window-proxy.ts
@@ -24,6 +24,10 @@ export class MainWindowProxy extends TypedEmitter<MainWindowProxyEvents> {
     }
 
     getInstance() {
+        if (this.instance?.isDestroyed()) {
+            this.destroyInstance();
+        }
+
         return this.instance;
     }
 }
diff --git a/packages/suite-desktop-core/src/libs/processes/BaseProcess.ts b/packages/suite-desktop-core/src/libs/processes/BaseProcess.ts
index b39672bd698..4110a22a2d5 100644
--- a/packages/suite-desktop-core/src/libs/processes/BaseProcess.ts
+++ b/packages/suite-desktop-core/src/libs/processes/BaseProcess.ts
@@ -157,6 +157,7 @@ export abstract class BaseProcess {
             // When running without `autoRestart` the responsibility of restarting it is in the module
             // that started the process, so if it fails an error is thrown to let the module knows something
             // went wrong.
+            // eslint-disable-next-line prefer-const
             let resolveTimeout: ReturnType<typeof setTimeout> | undefined;
             const spawnErrorHandler = (message: any) => {
                 // This error handler will be triggered if there is an error during spawn of the process,
diff --git a/packages/suite-desktop-core/src/libs/store.ts b/packages/suite-desktop-core/src/libs/store.ts
index 341020a6a72..f8a5cd9e02d 100644
--- a/packages/suite-desktop-core/src/libs/store.ts
+++ b/packages/suite-desktop-core/src/libs/store.ts
@@ -14,6 +14,7 @@ export class Store {
         themeSettings: SuiteThemeVariant;
         torSettings: TorSettings;
         bridgeSettings: BridgeSettings;
+        traySettings: TraySettings;
     }>;
 
     private constructor() {
@@ -86,6 +87,16 @@ export class Store {
         this.store.set('bridgeSettings', bridgeSettings);
     }
 
+    public getTraySettings() {
+        return this.store.get('traySettings', {
+            showOnTray: false,
+        });
+    }
+
+    public setTraySettings(traySettings: TraySettings) {
+        this.store.set('traySettings', traySettings);
+    }
+
     /** Deletes all items from the store. */
     public clear() {
         this.store.clear();
diff --git a/packages/suite-desktop-core/src/libs/thread-proxy.ts b/packages/suite-desktop-core/src/libs/thread-proxy.ts
index 84311c2f278..8f0d834df59 100644
--- a/packages/suite-desktop-core/src/libs/thread-proxy.ts
+++ b/packages/suite-desktop-core/src/libs/thread-proxy.ts
@@ -52,7 +52,7 @@ export class ThreadProxy<_Target extends object> {
         if (this.utility) throw new Error('Process already running');
         const utilityPath = path.join(THREADS_DIR_PATH, `${this.settings.name}.js`);
         const utility = utilityProcess.fork(utilityPath);
-        await new Promise((resolve, reject) => {
+        await new Promise<void>((resolve, reject) => {
             utility.once('spawn', resolve);
             utility.once('exit', reject);
         });
diff --git a/packages/suite-desktop-core/src/modules/auto-start.ts b/packages/suite-desktop-core/src/modules/auto-start.ts
index 585fc45cd0d..295d0ebfcba 100644
--- a/packages/suite-desktop-core/src/modules/auto-start.ts
+++ b/packages/suite-desktop-core/src/modules/auto-start.ts
@@ -5,13 +5,26 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 
+import { validateIpcMessage } from '@trezor/ipc-proxy';
+
 import { app, ipcMain } from '../typed-electron';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 export const SERVICE_NAME = 'auto-start';
 
 // Linux autostart desktop file
+const getLinuxExecutable = () => {
+    if (process.env.container) {
+        return 'flatpak run io.trezor.suite';
+    }
+    if (process.env.APPIMAGE) {
+        return `"${process.env.APPIMAGE}"`;
+    }
+
+    return `"${process.execPath}"`;
+};
+
 const LINUX_AUTOSTART_DIR = '.config/autostart/';
 const LINUX_AUTOSTART_FILE = 'Trezor-Suite.desktop';
 const LINUX_DESKTOP = `[Desktop Entry]
@@ -19,11 +32,24 @@ Type=Application
 Version=1.0
 Name=Trezor Suite
 Comment=Trezor Suite startup script
-Exec="${process.env.APPIMAGE || process.execPath}" --bridge-daemon
+Exec=${getLinuxExecutable()} --bridge-daemon
 StartupNotify=false
 Terminal=false
 `;
 
+export const isAutoStartEnabled = () => {
+    if (process.platform === 'linux') {
+        return fs.existsSync(path.join(os.homedir(), LINUX_AUTOSTART_DIR, LINUX_AUTOSTART_FILE));
+    } else if (process.platform === 'win32') {
+        return (
+            app.getLoginItemSettings().openAtLogin ||
+            app.getLoginItemSettings().executableWillLaunchAtLogin
+        );
+    } else {
+        return app.getLoginItemSettings().openAtLogin;
+    }
+};
+
 const linuxAutoStart = (enabled: boolean) => {
     if (enabled) {
         fs.mkdirSync(path.join(os.homedir(), LINUX_AUTOSTART_DIR), { recursive: true });
@@ -33,11 +59,13 @@ const linuxAutoStart = (enabled: boolean) => {
         );
         fs.chmodSync(path.join(os.homedir(), LINUX_AUTOSTART_DIR, LINUX_AUTOSTART_FILE), 0o755);
     } else {
-        fs.unlinkSync(path.join(os.homedir(), LINUX_AUTOSTART_DIR, LINUX_AUTOSTART_FILE));
+        if (isAutoStartEnabled()) {
+            fs.unlinkSync(path.join(os.homedir(), LINUX_AUTOSTART_DIR, LINUX_AUTOSTART_FILE));
+        }
     }
 };
 
-export const init: Module = () => {
+export const init: ModuleInit = () => {
     const { logger } = global;
 
     ipcMain.on('app/auto-start', (_, enabled: boolean) => {
@@ -55,18 +83,18 @@ export const init: Module = () => {
         }
     });
 
+    ipcMain.handle('app/auto-start/is-enabled', ipcEvent => {
+        validateIpcMessage(ipcEvent);
+        const result = isAutoStartEnabled();
+
+        return { success: true, payload: result };
+    });
+
     return {
         onLoad: () => {
             // Update autostart file on Linux, since the AppImage might have been moved
-            if (process.platform === 'linux') {
-                const autostartFile = path.join(
-                    os.homedir(),
-                    LINUX_AUTOSTART_DIR,
-                    LINUX_AUTOSTART_FILE,
-                );
-                if (fs.existsSync(autostartFile)) {
-                    linuxAutoStart(true);
-                }
+            if (process.platform === 'linux' && isAutoStartEnabled()) {
+                linuxAutoStart(true);
             }
         },
     };
diff --git a/packages/suite-desktop-core/src/modules/auto-updater.ts b/packages/suite-desktop-core/src/modules/auto-updater.ts
index e14dcf8e787..fc86a64347e 100644
--- a/packages/suite-desktop-core/src/modules/auto-updater.ts
+++ b/packages/suite-desktop-core/src/modules/auto-updater.ts
@@ -15,7 +15,7 @@ import { app, ipcMain } from '../typed-electron';
 import { b2t } from '../libs/utils';
 import { verifySignature } from '../libs/update-checker';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 const defaultFeedURL = {
     // This should correspond with the value in electron-builder-config.js file.
@@ -31,7 +31,7 @@ const updaterURL = app.commandLine.getSwitchValue('updater-url');
 
 export const SERVICE_NAME = 'auto-updater';
 
-export const init: Module = ({ mainWindowProxy, store }) => {
+export const init: ModuleInit = ({ mainWindowProxy, store }) => {
     const { logger } = global;
     if (!isFeatureFlagEnabled('DESKTOP_AUTO_UPDATER') && !enableUpdater) {
         logger.info(SERVICE_NAME, 'Disabled via feature flag');
@@ -208,16 +208,29 @@ export const init: Module = ({ mainWindowProxy, store }) => {
 
     ipcMain.on('update/download', startDownload);
 
+    ipcMain.on('update/set-auto-install-on-app-quit', () => {
+        // If the update is triggered manually by the button in the app, we want to force update,
+        // because it may have been disabled by the user switch the automatic update off. But because the user deliberately
+        // clicked the "Update on quit" button, we want to install it.
+        autoUpdater.autoInstallOnAppQuit = true;
+    });
+
     ipcMain.on('update/install', () => {
         logger.info(SERVICE_NAME, 'Restart and update request');
 
         setImmediate(() => {
             // Removing listeners & closing window (https://github.com/electron-userland/electron-builder/issues/1604)
             app.removeAllListeners('window-all-closed');
+            if (process.platform === 'linux') {
+                // On Linux there were some issues with re-opening the app, due to a possible race condition where the old app was not fully closed yet.
+                // This resolves the issue by removing the handlers and closing the app immediately.
+                app.removeAllListeners('before-quit');
+                app.removeAllListeners('second-instance');
+            }
             mainWindowProxy.getInstance()?.removeAllListeners('close');
             mainWindowProxy.getInstance()?.close();
 
-            // Silent install on Windows to match on "Update on quit" and MacOS behavior
+            // Silent installation on Windows to match on "Update on quit" and macOS behavior
             autoUpdater.quitAndInstall(true, true);
         });
     });
@@ -262,7 +275,7 @@ export const init: Module = ({ mainWindowProxy, store }) => {
             // In case
             //      1) the auto-update was enabled
             //      2) update is probably already downloaded
-            //      3) user wants do disable auto-update and PREVENT the downloaded update from installing
+            //      3) user wants to disable auto-update and PREVENT the downloaded update from installing
             //
             // We have to disable auto update so it won't get installed.
             autoUpdater.autoInstallOnAppQuit = false;
diff --git a/packages/suite-desktop-core/src/modules/bridge.ts b/packages/suite-desktop-core/src/modules/bridge.ts
index 196b2394a9a..5b642b6ef33 100644
--- a/packages/suite-desktop-core/src/modules/bridge.ts
+++ b/packages/suite-desktop-core/src/modules/bridge.ts
@@ -5,6 +5,7 @@ import { TrezordNode } from '@trezor/transport-bridge';
 import { isDevEnv } from '@suite-common/suite-utils';
 import { validateIpcMessage } from '@trezor/ipc-proxy';
 import { scheduleAction } from '@trezor/utils';
+import { InvokeResult } from '@trezor/suite-desktop-api';
 
 import { app, ipcMain } from '../typed-electron';
 import { BridgeProcess } from '../libs/processes/BridgeProcess';
@@ -96,7 +97,7 @@ const shouldUseLegacyBridge = (store: Dependencies['store']) => {
         const newBridgeRollout = Math.round(Math.random() * 100) / 100;
         store.setBridgeSettings({ ...store.getBridgeSettings(), newBridgeRollout });
     }
-    const newBridgeRollout = store.getBridgeSettings().newBridgeRollout || 0;
+    const newBridgeRollout = store.getBridgeSettings().newBridgeRollout || 0.01;
     // note that this variable is duplicated with UI
     const NEW_BRIDGE_ROLLOUT_THRESHOLD = 0;
     const legacyBridgeReasonRollout = newBridgeRollout >= NEW_BRIDGE_ROLLOUT_THRESHOLD;
@@ -131,12 +132,7 @@ const loadBridge = async (store: Dependencies['store']) => {
     }
 };
 
-type BridgeModule = ({ store }: Pick<Dependencies, 'store'>) => {
-    onLoad: () => void;
-    onQuit: () => Promise<void>;
-};
-
-export const init: BridgeModule = ({ store }) => {
+export const initBackground = ({ store }: Pick<Dependencies, 'store'>) => {
     let loaded = false;
 
     const onLoad = () => {
@@ -156,7 +152,7 @@ export const init: BridgeModule = ({ store }) => {
     return { onLoad, onQuit };
 };
 
-export const initUi = ({ store, mainWindowProxy }: Dependencies) => {
+export const init = ({ store, mainWindowProxy, mainThreadEmitter }: Dependencies) => {
     ipcMain.handle(
         'bridge/change-settings',
         async (ipcEvent, payload: { doNotStartOnStartup: boolean; legacy?: boolean }) => {
@@ -207,13 +203,12 @@ export const initUi = ({ store, mainWindowProxy }: Dependencies) => {
         logger.info('bridge', `Toggling bridge. Status: ${JSON.stringify(status)}`);
 
         mainWindowProxy.getInstance()?.webContents.send('bridge/status', status);
+        mainThreadEmitter.emit('module/bridge/status', status);
 
         return status;
     };
 
-    ipcMain.handle('bridge/toggle', async ipcEvent => {
-        validateIpcMessage(ipcEvent);
-
+    const toggleBridge = async (): Promise<InvokeResult> => {
         const status = await handleBridgeStatus();
         try {
             if (status.service) {
@@ -228,6 +223,11 @@ export const initUi = ({ store, mainWindowProxy }: Dependencies) => {
         } finally {
             handleBridgeStatus();
         }
+    };
+    ipcMain.handle('bridge/toggle', async ipcEvent => {
+        validateIpcMessage(ipcEvent);
+
+        return await toggleBridge();
     });
 
     ipcMain.handle('bridge/get-status', async ipcEvent => {
diff --git a/packages/suite-desktop-core/src/modules/coinjoin.ts b/packages/suite-desktop-core/src/modules/coinjoin.ts
index 73cfe1d4eb7..3394974cd96 100644
--- a/packages/suite-desktop-core/src/modules/coinjoin.ts
+++ b/packages/suite-desktop-core/src/modules/coinjoin.ts
@@ -16,14 +16,14 @@ import { CoinjoinProcess } from '../libs/processes/CoinjoinProcess';
 import { PowerSaveBlocker } from '../libs/power-save-blocker';
 import { ThreadProxy } from '../libs/thread-proxy';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 export const SERVICE_NAME = '@trezor/coinjoin';
 
 const CLIENT_CHANNEL = 'CoinjoinClient';
 const BACKEND_CHANNEL = 'CoinjoinBackend';
 
-export const init: Module = ({ mainWindowProxy, store, mainThreadEmitter }) => {
+export const init: ModuleInit = ({ mainWindowProxy, store, mainThreadEmitter }) => {
     const { logger } = global;
 
     const backends: ThreadProxy<CoinjoinBackend>[] = [];
diff --git a/packages/suite-desktop-core/src/modules/crash-recover.ts b/packages/suite-desktop-core/src/modules/crash-recover.ts
index 91e365e2174..8d87f15ecf8 100644
--- a/packages/suite-desktop-core/src/modules/crash-recover.ts
+++ b/packages/suite-desktop-core/src/modules/crash-recover.ts
@@ -2,7 +2,7 @@ import { app, dialog } from 'electron';
 
 import { restartApp } from '../libs/app-utils';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 // Reasons for prompting a restart
 const unexpectedReasons = [
@@ -13,7 +13,7 @@ const unexpectedReasons = [
 
 export const SERVICE_NAME = 'crash-recover';
 
-export const init: Module = ({ mainWindowProxy }) => {
+export const init: ModuleInit = ({ mainWindowProxy }) => {
     // Check if the renderer process got unexpectedly terminated
     mainWindowProxy.on('init', mainWindow => {
         mainWindow.webContents.on('render-process-gone', (_, { reason }) => {
diff --git a/packages/suite-desktop-core/src/modules/csp.ts b/packages/suite-desktop-core/src/modules/csp.ts
index ffacdab312e..1ead5abc1c3 100644
--- a/packages/suite-desktop-core/src/modules/csp.ts
+++ b/packages/suite-desktop-core/src/modules/csp.ts
@@ -6,11 +6,11 @@ import { session } from 'electron';
 
 import * as config from '../config';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 export const SERVICE_NAME = 'csp';
 
-export const init: Module = () => {
+export const init: ModuleInit = () => {
     const { logger } = global;
 
     session.defaultSession.webRequest.onHeadersReceived((details, callback) => {
diff --git a/packages/suite-desktop-core/src/modules/custom-protocols.ts b/packages/suite-desktop-core/src/modules/custom-protocols.ts
index 4d2a98faef6..867497f0d73 100644
--- a/packages/suite-desktop-core/src/modules/custom-protocols.ts
+++ b/packages/suite-desktop-core/src/modules/custom-protocols.ts
@@ -5,11 +5,11 @@ import { app } from 'electron';
 
 import { isValidProtocol } from '../libs/protocol';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 export const SERVICE_NAME = 'custom-protocols';
 
-export const init: Module = ({ mainWindowProxy }) => {
+export const init: ModuleInit = ({ mainWindowProxy }) => {
     const { logger } = global;
 
     const protocols = process.env.PROTOCOLS as unknown as string[];
@@ -86,6 +86,7 @@ export const init: Module = ({ mainWindowProxy }) => {
 
     // App is launched via custom protocol (macOS)
     if (global.customProtocolUrl) {
+        logger.debug(SERVICE_NAME, 'App is initially launched via custom protocol (macOS)');
         if (isValidProtocol(global.customProtocolUrl, protocols)) {
             return { onLoad: firstRunOnly(global.customProtocolUrl) };
         }
diff --git a/packages/suite-desktop-core/src/modules/dev-tools.ts b/packages/suite-desktop-core/src/modules/dev-tools.ts
index e50f363b522..904a1a57052 100644
--- a/packages/suite-desktop-core/src/modules/dev-tools.ts
+++ b/packages/suite-desktop-core/src/modules/dev-tools.ts
@@ -5,13 +5,13 @@ import { app } from 'electron';
 
 import { isDevEnv } from '@suite-common/suite-utils';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 const openDevToolsFlag = app.commandLine.hasSwitch('open-devtools');
 
 export const SERVICE_NAME = 'dev-tools';
 
-export const init: Module = ({ mainWindowProxy }) => {
+export const init: ModuleInit = ({ mainWindowProxy }) => {
     if (isDevEnv || openDevToolsFlag) {
         mainWindowProxy.getInstance()?.webContents.openDevTools();
     }
diff --git a/packages/suite-desktop-core/src/modules/event-logging/app.ts b/packages/suite-desktop-core/src/modules/event-logging/app.ts
index 60cfb7577af..875f39950b5 100644
--- a/packages/suite-desktop-core/src/modules/event-logging/app.ts
+++ b/packages/suite-desktop-core/src/modules/event-logging/app.ts
@@ -1,10 +1,10 @@
 import { app } from 'electron';
 
-import type { Module } from '../index';
+import type { ModuleInit } from '../index';
 
 export const SERVICE_NAME = 'app';
 
-export const init: Module = () => {
+export const init: ModuleInit = () => {
     const { logger } = global;
 
     app.on('ready', () => {
diff --git a/packages/suite-desktop-core/src/modules/event-logging/contents.ts b/packages/suite-desktop-core/src/modules/event-logging/contents.ts
index 571707c78fa..205b75da528 100644
--- a/packages/suite-desktop-core/src/modules/event-logging/contents.ts
+++ b/packages/suite-desktop-core/src/modules/event-logging/contents.ts
@@ -1,12 +1,12 @@
 import { app } from 'electron';
 
-import type { Module } from '../index';
+import type { ModuleInit } from '../index';
 
 const logUI = app.commandLine.hasSwitch('log-ui');
 
 export const SERVICE_NAME = 'content';
 
-export const init: Module = ({ mainWindowProxy }) => {
+export const init: ModuleInit = ({ mainWindowProxy }) => {
     const { logger } = global;
 
     mainWindowProxy.on('init', mainWindow => {
diff --git a/packages/suite-desktop-core/src/modules/event-logging/index.ts b/packages/suite-desktop-core/src/modules/event-logging/index.ts
index 689323856b1..a18492727db 100644
--- a/packages/suite-desktop-core/src/modules/event-logging/index.ts
+++ b/packages/suite-desktop-core/src/modules/event-logging/index.ts
@@ -1,9 +1,9 @@
 import { ipcMain } from '../../typed-electron';
-import type { Module } from '../index';
+import type { ModuleInit } from '../index';
 
 export const SERVICE_NAME = 'event-logging';
 
-export const init: Module = () => {
+export const init: ModuleInit = () => {
     const { logger } = global;
 
     ipcMain.on('logger/config', (_, { level, options }) => {
diff --git a/packages/suite-desktop-core/src/modules/event-logging/process.ts b/packages/suite-desktop-core/src/modules/event-logging/process.ts
index f711215209e..927424dc29b 100644
--- a/packages/suite-desktop-core/src/modules/event-logging/process.ts
+++ b/packages/suite-desktop-core/src/modules/event-logging/process.ts
@@ -1,8 +1,8 @@
-import type { Module } from '../index';
+import type { ModuleInit } from '../index';
 
 export const SERVICE_NAME = 'event-logging/process';
 
-export const init: Module = () => {
+export const init: ModuleInit = () => {
     const { logger } = global;
 
     process.on('uncaughtException', e => {
diff --git a/packages/suite-desktop-core/src/modules/external-links.ts b/packages/suite-desktop-core/src/modules/external-links.ts
index 129eed4289b..f612d1676f0 100644
--- a/packages/suite-desktop-core/src/modules/external-links.ts
+++ b/packages/suite-desktop-core/src/modules/external-links.ts
@@ -6,11 +6,11 @@ import { HandlerDetails } from 'electron/main';
 
 import * as config from '../config';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 export const SERVICE_NAME = 'external-links';
 
-export const init: Module = ({ mainWindowProxy, store }) => {
+export const init: ModuleInit = ({ mainWindowProxy, store }) => {
     const { logger } = global;
 
     mainWindowProxy.on('init', mainWindow => {
diff --git a/packages/suite-desktop-core/src/modules/file-protocol.ts b/packages/suite-desktop-core/src/modules/file-protocol.ts
index 37353b2b33f..8c0ab6ba28c 100644
--- a/packages/suite-desktop-core/src/modules/file-protocol.ts
+++ b/packages/suite-desktop-core/src/modules/file-protocol.ts
@@ -6,11 +6,11 @@ import { session } from 'electron';
 
 import { FILE_PROTOCOL, APP_SRC } from '../libs/constants';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 export const SERVICE_NAME = 'file-protocol';
 
-export const init: Module = ({ mainWindowProxy }) => {
+export const init: ModuleInit = ({ mainWindowProxy }) => {
     // Point to the right directory for file protocol requests
     session.defaultSession.protocol.interceptFileProtocol(FILE_PROTOCOL, (request, callback) => {
         let url = request.url.substring(FILE_PROTOCOL.length + 1);
diff --git a/packages/suite-desktop-core/src/modules/http-receiver.ts b/packages/suite-desktop-core/src/modules/http-receiver.ts
index 10eba4cb413..b89c3955cc8 100644
--- a/packages/suite-desktop-core/src/modules/http-receiver.ts
+++ b/packages/suite-desktop-core/src/modules/http-receiver.ts
@@ -6,11 +6,11 @@ import { validateIpcMessage } from '@trezor/ipc-proxy';
 import { app, ipcMain } from '../typed-electron';
 import { createHttpReceiver } from '../libs/http-receiver';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 export const SERVICE_NAME = 'http-receiver';
 
-export const init: Module = ({ mainWindowProxy }) => {
+export const init: ModuleInit = ({ mainWindowProxy }) => {
     const { logger } = global;
     let httpReceiver: ReturnType<typeof createHttpReceiver> | null = null;
 
diff --git a/packages/suite-desktop-core/src/modules/index.ts b/packages/suite-desktop-core/src/modules/index.ts
index 3661caaf4c9..36df71b3497 100644
--- a/packages/suite-desktop-core/src/modules/index.ts
+++ b/packages/suite-desktop-core/src/modules/index.ts
@@ -1,10 +1,10 @@
 import path from 'path';
 
-import { isNotUndefined } from '@trezor/utils';
-import { TypedEmitter } from '@trezor/utils';
+import { isNotUndefined, TypedEmitter } from '@trezor/utils';
 import { InterceptedEvent } from '@trezor/request-manager';
 import { isDevEnv } from '@suite-common/suite-utils';
 import type { HandshakeClient, TorStatus } from '@trezor/suite-desktop-api';
+import type { DeviceEvent } from '@trezor/connect';
 
 import type { Store } from '../libs/store';
 import * as eventLogging from './event-logging';
@@ -32,10 +32,12 @@ import * as coinjoin from './coinjoin';
 import * as csp from './csp';
 import * as fileProtocol from './file-protocol';
 import * as autoStart from './auto-start';
+import * as tray from './tray';
+import * as bridge from './bridge';
 import { MainWindowProxy } from '../libs/main-window-proxy';
 
 // General modules (both dev & prod)
-const MODULES = [
+const MODULES: Module[] = [
     // Event Logging
     eventLogging,
     eventLoggingProcess,
@@ -61,15 +63,26 @@ const MODULES = [
     requestInterceptor,
     coinjoin,
     autoStart,
+    bridge,
     // Modules used only in dev/prod mode
     ...(isDevEnv ? [] : [csp, fileProtocol]),
 ];
 
+const MODULES_BACKGROUND: ModuleBackground[] = [bridge, trezorConnect, tray];
+
 // define events internally sent between modules
 interface MainThreadMessages {
     'module/request-interceptor': InterceptedEvent;
     'module/reset-tor-circuits': Extract<InterceptedEvent, { type: 'CIRCUIT_MISBEHAVING' }>;
     'module/tor-status-update': TorStatus;
+    'module/trezor-connect/device-event': DeviceEvent;
+    'module/bridge/toggle': void;
+    'module/bridge/status': {
+        service: boolean;
+        process: boolean;
+    };
+    'app/fully-quit': void;
+    'app/show': void;
 }
 export const mainThreadEmitter = new TypedEmitter<MainThreadMessages>();
 export type MainThreadEmitter = typeof mainThreadEmitter;
@@ -85,24 +98,38 @@ type ModuleLoad = (payload: HandshakeClient) => any | Promise<any>;
 
 type ModuleQuit = () => void | Promise<void>;
 
-type ModuleInit = (
-    dependencies: Dependencies,
-) => { onLoad?: ModuleLoad; onQuit?: ModuleQuit } | void;
+type ModuleInterface = {
+    onLoad: ModuleLoad;
+    onQuit?: ModuleQuit;
+} | void;
 
-export type Module = ModuleInit;
+export type ModuleInit = (dependencies: Dependencies) => ModuleInterface;
 
-export const initModules = (dependencies: Dependencies) => {
+export type ModuleInitBackground = (dependencies: Dependencies) => ModuleInterface;
+
+export type Module = { SERVICE_NAME: string; init: ModuleInit };
+export type ModuleBackground = { SERVICE_NAME: string; initBackground: ModuleInitBackground };
+
+const initModulesInner = <
+    B extends boolean,
+    T extends ModuleBackground[] | Module[] = B extends true ? ModuleBackground[] : Module[],
+>(
+    dependencies: Omit<Dependencies, 'mainWindowProxy'> & { mainWindowProxy?: MainWindowProxy },
+    background: B,
+    modules: T,
+) => {
     const { logger } = global;
 
     logger.info('modules', `Initializing ${MODULES.length} modules`);
 
-    const modulesToLoad: [(typeof MODULES)[number], ModuleLoad][] = [];
-    const modulesToQuit: [(typeof MODULES)[number], ModuleQuit][] = [];
+    const modulesToLoad: [Module | ModuleBackground, ModuleLoad][] = [];
+    const modulesToQuit: [Module | ModuleBackground, ModuleQuit][] = [];
 
-    MODULES.forEach(moduleToInit => {
+    modules.forEach(moduleToInit => {
         logger.debug('modules', `Initializing ${moduleToInit.SERVICE_NAME}`);
         try {
-            const initModule: Module = moduleToInit.init;
+            // @ts-expect-error
+            const initModule = background ? moduleToInit.initBackground : moduleToInit.init;
             const { onLoad, onQuit } = initModule(dependencies) ?? {};
             if (onLoad) modulesToLoad.push([moduleToInit, onLoad]);
             if (onQuit) modulesToQuit.push([moduleToInit, onQuit]);
@@ -126,7 +153,7 @@ export const initModules = (dependencies: Dependencies) => {
                     const payload = await onLoad(handshake);
                     logger.debug('modules', `Loaded ${moduleName}`);
                     dependencies.mainWindowProxy
-                        .getInstance()
+                        ?.getInstance()
                         ?.webContents.send('handshake/event', {
                             type: 'progress',
                             message: `${moduleName} loaded`,
@@ -140,7 +167,7 @@ export const initModules = (dependencies: Dependencies) => {
                 } catch (err) {
                     logger.error('modules', `Couldn't load ${moduleName} (${err?.toString()})`);
                     dependencies.mainWindowProxy
-                        .getInstance()
+                        ?.getInstance()
                         ?.webContents.send('handshake/event', {
                             type: 'error',
                             message: `${moduleToLoad} error`,
@@ -151,21 +178,7 @@ export const initModules = (dependencies: Dependencies) => {
                     );
                 }
             }),
-        )
-            .then(results => Object.fromEntries(results.filter(isNotUndefined)))
-            .then(
-                ({
-                    [customProtocols.SERVICE_NAME]: protocol,
-                    [autoUpdater.SERVICE_NAME]: desktopUpdate,
-                    [userData.SERVICE_NAME]: { dir: userDir },
-                    [httpReceiverModule.SERVICE_NAME]: { url: httpReceiver },
-                }) => ({
-                    protocol,
-                    desktopUpdate,
-                    paths: { userDir, binDir: path.join(global.resourcesPath, 'bin') },
-                    urls: { httpReceiver },
-                }),
-            );
+        ).then(results => Object.fromEntries(results.filter(isNotUndefined)));
     };
 
     const quitModules = () =>
@@ -178,3 +191,31 @@ export const initModules = (dependencies: Dependencies) => {
 
     return { loadModules, quitModules };
 };
+
+export const initModules = (dependencies: Dependencies) => {
+    const { loadModules: loadModulesInner, quitModules } = initModulesInner(
+        dependencies,
+        false,
+        MODULES,
+    );
+
+    const loadModules = (handshake: HandshakeClient) =>
+        loadModulesInner(handshake).then(
+            ({
+                [customProtocols.SERVICE_NAME]: protocol,
+                [autoUpdater.SERVICE_NAME]: desktopUpdate,
+                [userData.SERVICE_NAME]: { dir: userDir },
+                [httpReceiverModule.SERVICE_NAME]: { url: httpReceiver },
+            }) => ({
+                protocol,
+                desktopUpdate,
+                paths: { userDir, binDir: path.join(global.resourcesPath, 'bin') },
+                urls: { httpReceiver },
+            }),
+        );
+
+    return { loadModules, quitModules };
+};
+
+export const initBackgroundModules = (dependencies: Dependencies) =>
+    initModulesInner(dependencies, true, MODULES_BACKGROUND);
diff --git a/packages/suite-desktop-core/src/modules/menu.ts b/packages/suite-desktop-core/src/modules/menu.ts
index b6d77c43242..6efc07fed19 100644
--- a/packages/suite-desktop-core/src/modules/menu.ts
+++ b/packages/suite-desktop-core/src/modules/menu.ts
@@ -3,11 +3,11 @@ import { Menu } from 'electron';
 import { buildMainMenu, inputMenu, selectionMenu } from '../libs/menu';
 import { b2t } from '../libs/utils';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 export const SERVICE_NAME = 'menu';
 
-export const init: Module = ({ mainWindowProxy }) => {
+export const init: ModuleInit = ({ mainWindowProxy }) => {
     const { logger } = global;
 
     Menu.setApplicationMenu(buildMainMenu());
diff --git a/packages/suite-desktop-core/src/modules/metadata.ts b/packages/suite-desktop-core/src/modules/metadata.ts
index c4757616c3b..359abfbb219 100644
--- a/packages/suite-desktop-core/src/modules/metadata.ts
+++ b/packages/suite-desktop-core/src/modules/metadata.ts
@@ -6,13 +6,13 @@ import { validateIpcMessage } from '@trezor/ipc-proxy';
 import { ipcMain } from '../typed-electron';
 import { save, read, readDir, rename } from '../libs/user-data';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 const DATA_DIR = '/metadata';
 
 export const SERVICE_NAME = 'metadata';
 
-export const init: Module = () => {
+export const init: ModuleInit = () => {
     const { logger } = global;
 
     ipcMain.handle('metadata/write', async (ipcEvent, message) => {
diff --git a/packages/suite-desktop-core/src/modules/request-filter.ts b/packages/suite-desktop-core/src/modules/request-filter.ts
index 0f1b6568761..93da9d43c9f 100644
--- a/packages/suite-desktop-core/src/modules/request-filter.ts
+++ b/packages/suite-desktop-core/src/modules/request-filter.ts
@@ -5,11 +5,11 @@ import { captureMessage } from '@sentry/electron';
 
 import { allowedDomains } from '../config';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 export const SERVICE_NAME = 'request-filter';
 
-export const init: Module = ({ interceptor }) => {
+export const init: ModuleInit = ({ interceptor }) => {
     const { logger } = global;
 
     const resourceTypeFilter = ['xhr']; // What resource types we want to filter
diff --git a/packages/suite-desktop-core/src/modules/request-interceptor.ts b/packages/suite-desktop-core/src/modules/request-interceptor.ts
index 71bfb2abfee..31af28b6a18 100644
--- a/packages/suite-desktop-core/src/modules/request-interceptor.ts
+++ b/packages/suite-desktop-core/src/modules/request-interceptor.ts
@@ -11,11 +11,11 @@ import { createInterceptor, InterceptedEvent } from '@trezor/request-manager';
 import { isDevEnv } from '@suite-common/suite-utils';
 import { TorStatus } from '@trezor/suite-desktop-api';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 export const SERVICE_NAME = 'request-interceptor';
 
-export const init: Module = ({ mainWindowProxy, store, mainThreadEmitter }) => {
+export const init: ModuleInit = ({ mainWindowProxy, store, mainThreadEmitter }) => {
     const { logger } = global;
 
     const requestInterceptorEventHandler = (event: InterceptedEvent) => {
diff --git a/packages/suite-desktop-core/src/modules/shortcuts.ts b/packages/suite-desktop-core/src/modules/shortcuts.ts
index 744a928c121..0900d27c5ca 100644
--- a/packages/suite-desktop-core/src/modules/shortcuts.ts
+++ b/packages/suite-desktop-core/src/modules/shortcuts.ts
@@ -2,11 +2,11 @@ import electronLocalshortcut from 'electron-localshortcut';
 
 import { restartApp } from '../libs/app-utils';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 export const SERVICE_NAME = 'shortcuts';
 
-export const init: Module = ({ mainWindowProxy }) => {
+export const init: ModuleInit = ({ mainWindowProxy }) => {
     const { logger } = global;
 
     mainWindowProxy.on('init', mainWindow => {
diff --git a/packages/suite-desktop-core/src/modules/store.ts b/packages/suite-desktop-core/src/modules/store.ts
index 91b09dc919d..6166d15d214 100644
--- a/packages/suite-desktop-core/src/modules/store.ts
+++ b/packages/suite-desktop-core/src/modules/store.ts
@@ -1,10 +1,10 @@
 import { ipcMain } from '../typed-electron';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 export const SERVICE_NAME = 'store';
 
-export const init: Module = ({ store }) => {
+export const init: ModuleInit = ({ store }) => {
     const { logger } = global;
 
     ipcMain.on('store/clear', () => {
diff --git a/packages/suite-desktop-core/src/modules/theme.ts b/packages/suite-desktop-core/src/modules/theme.ts
index d95e12c6143..2790cc8ff58 100644
--- a/packages/suite-desktop-core/src/modules/theme.ts
+++ b/packages/suite-desktop-core/src/modules/theme.ts
@@ -5,7 +5,7 @@ import { SuiteThemeVariant } from '@trezor/suite-desktop-api';
 import { Store } from '../libs/store';
 import { ipcMain } from '../typed-electron';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 const setThemeManually = (theme: SuiteThemeVariant, store: Store) => {
     const { logger } = global;
@@ -18,7 +18,7 @@ const setThemeManually = (theme: SuiteThemeVariant, store: Store) => {
 
 export const SERVICE_NAME = 'theme';
 
-export const init: Module = () => {
+export const init: ModuleInit = () => {
     const { logger } = global;
 
     const store = Store.getStore();
diff --git a/packages/suite-desktop-core/src/modules/tray.ts b/packages/suite-desktop-core/src/modules/tray.ts
new file mode 100644
index 00000000000..f7d1cee32db
--- /dev/null
+++ b/packages/suite-desktop-core/src/modules/tray.ts
@@ -0,0 +1,166 @@
+/**
+ * Tray icon handler
+ */
+import path from 'path';
+import { Menu, Tray } from 'electron';
+
+import { DEVICE, DeviceEvent } from '@trezor/connect';
+import { Status, TraySettings } from '@trezor/suite-desktop-api/src/messages';
+import { validateIpcMessage } from '@trezor/ipc-proxy';
+
+import { app, ipcMain } from '../typed-electron';
+
+import { mainThreadEmitter, ModuleInitBackground } from './index';
+
+export const SERVICE_NAME = 'tray';
+
+export const initBackground: ModuleInitBackground = ({ store, mainWindowProxy }) => {
+    const { logger } = global;
+    const initialSettings = store.getTraySettings();
+
+    const state = {
+        visible: initialSettings.showOnTray,
+        bridgeStatus: true,
+        devices: 0,
+    };
+    let tray: Tray | undefined;
+
+    const getPlatformIcon = () => {
+        switch (process.platform) {
+            case 'win32':
+                return 'trayWin.ico';
+            case 'darwin':
+                return 'trayMacTemplate.png';
+            default:
+                return 'trayLin.png';
+        }
+    };
+
+    const renderTray = () => {
+        if (!state.visible) {
+            logger.debug(SERVICE_NAME, 'Destroying tray');
+            tray?.destroy();
+            tray = undefined;
+
+            return;
+        }
+        if (!tray) {
+            logger.debug(SERVICE_NAME, 'Creating tray');
+            const iconPath = path.resolve(
+                global.resourcesPath,
+                'images/favicons/',
+                getPlatformIcon(),
+            );
+            tray = new Tray(iconPath);
+            tray.setToolTip('Trezor Suite');
+        }
+        const contextMenu = Menu.buildFromTemplate([
+            {
+                label: state.bridgeStatus
+                    ? '🟢  Trezor Bridge is running'
+                    : '🔴  Trezor Bridge not running',
+                click: () => mainThreadEmitter.emit('module/bridge/toggle'),
+            },
+            // TODO: we can add this back when connect is initialized independently of the Suite app window
+            /*{
+                label:
+                    state.devices > 0
+                        ? `🟢  Devices connected: ${state.devices}`
+                        : '🔴  No device connected',
+            },*/
+            {
+                type: 'separator',
+            },
+            {
+                label: 'Launch Trezor Suite',
+                click: () => mainThreadEmitter.emit('app/show'),
+            },
+            {
+                label: 'Hide icon from tray',
+                click: () => {
+                    store.setTraySettings({
+                        ...store.getTraySettings(),
+                        showOnTray: false,
+                    });
+                    mainWindowProxy
+                        .getInstance()
+                        ?.webContents.send('tray/settings', store.getTraySettings());
+                    state.visible = false;
+                    renderTray();
+                },
+            },
+            {
+                label: 'Stop Trezor Bridge and Quit',
+                click: () => {
+                    mainThreadEmitter.emit('app/fully-quit');
+                    app.quit();
+                },
+            },
+        ]);
+        tray.setContextMenu(contextMenu);
+        // Windows left click to show context menu
+        if (process.platform === 'win32') {
+            tray.on('click', () => {
+                tray?.popUpContextMenu();
+            });
+        }
+    };
+
+    // Listeners for events that affect state
+    mainThreadEmitter.on('module/trezor-connect/device-event', (event: DeviceEvent) => {
+        if (event.type === DEVICE.CONNECT) {
+            state.devices += 1;
+            tray?.displayBalloon({
+                iconType: 'info',
+                title: 'Trezor Suite',
+                content: `Device ${event.payload.name} connected`,
+            });
+        } else if (event.type === DEVICE.DISCONNECT && state.devices > 0) {
+            state.devices -= 1;
+            tray?.displayBalloon({
+                iconType: 'info',
+                title: 'Trezor Suite',
+                content: `Device ${event.payload.name} disconnected`,
+            });
+        }
+        renderTray();
+    });
+    mainThreadEmitter.on('module/bridge/status', (status: Status) => {
+        logger.debug(SERVICE_NAME, 'Bridge status ' + status);
+        state.bridgeStatus = status.process;
+        renderTray();
+    });
+
+    ipcMain.handle('tray/change-settings', (ipcEvent, updatedSettings: TraySettings) => {
+        validateIpcMessage(ipcEvent);
+
+        try {
+            store.setTraySettings({
+                ...store.getTraySettings(),
+                ...updatedSettings,
+            });
+            state.visible = updatedSettings.showOnTray;
+            renderTray();
+
+            return { success: true };
+        } catch (error) {
+            return { success: false, error };
+        }
+    });
+
+    ipcMain.handle('tray/get-settings', ipcEvent => {
+        validateIpcMessage(ipcEvent);
+
+        try {
+            return { success: true, payload: store.getTraySettings() };
+        } catch (error) {
+            return { success: false, error };
+        }
+    });
+
+    return {
+        onLoad: () => {
+            renderTray();
+        },
+    };
+};
diff --git a/packages/suite-desktop-core/src/modules/trezor-connect.ts b/packages/suite-desktop-core/src/modules/trezor-connect.ts
index 960eb53b6ea..13fd7e99143 100644
--- a/packages/suite-desktop-core/src/modules/trezor-connect.ts
+++ b/packages/suite-desktop-core/src/modules/trezor-connect.ts
@@ -1,13 +1,13 @@
 import { ipcMain } from 'electron';
 
-import TrezorConnect from '@trezor/connect';
+import TrezorConnect, { DEVICE_EVENT } from '@trezor/connect';
 import { createIpcProxyHandler, IpcProxyHandlerOptions } from '@trezor/ipc-proxy';
 
-import type { Module } from './index';
+import { Dependencies, mainThreadEmitter, ModuleInitBackground, ModuleInit } from './index';
 
 export const SERVICE_NAME = '@trezor/connect';
 
-export const init: Module = ({ store }) => {
+export const initBackground: ModuleInitBackground = ({ store }: Pick<Dependencies, 'store'>) => {
     const { logger } = global;
     logger.info(SERVICE_NAME, `Starting service`);
 
@@ -49,8 +49,9 @@ export const init: Module = ({ store }) => {
     const unregisterProxy = createIpcProxyHandler(ipcMain, 'TrezorConnect', ipcProxyOptions);
 
     const onLoad = () => {
-        // reset previous instance, possible left over after renderer refresh (F5)
-        TrezorConnect.dispose();
+        TrezorConnect.on(DEVICE_EVENT, event => {
+            mainThreadEmitter.emit('module/trezor-connect/device-event', event);
+        });
     };
 
     const onQuit = () => {
@@ -60,3 +61,12 @@ export const init: Module = ({ store }) => {
 
     return { onLoad, onQuit };
 };
+
+export const init: ModuleInit = () => {
+    const onLoad = () => {
+        // reset previous instance, possible left over after renderer refresh (F5)
+        TrezorConnect.dispose();
+    };
+
+    return { onLoad };
+};
diff --git a/packages/suite-desktop-core/src/modules/udev-install.ts b/packages/suite-desktop-core/src/modules/udev-install.ts
index de0e1aef7c4..c4435fbfc9e 100644
--- a/packages/suite-desktop-core/src/modules/udev-install.ts
+++ b/packages/suite-desktop-core/src/modules/udev-install.ts
@@ -7,13 +7,13 @@ import { checkFileExists } from '@trezor/node-utils';
 
 import { app, ipcMain } from '../typed-electron';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 const FILE_NAME = '51-trezor.rules';
 
 export const SERVICE_NAME = 'udev';
 
-export const init: Module = () => {
+export const init: ModuleInit = () => {
     ipcMain.handle('udev/install', async ipcEvent => {
         validateIpcMessage(ipcEvent);
 
diff --git a/packages/suite-desktop-core/src/modules/user-data.ts b/packages/suite-desktop-core/src/modules/user-data.ts
index 18bd80011aa..36f6b3dafca 100644
--- a/packages/suite-desktop-core/src/modules/user-data.ts
+++ b/packages/suite-desktop-core/src/modules/user-data.ts
@@ -3,11 +3,11 @@ import { validateIpcMessage } from '@trezor/ipc-proxy';
 import * as userData from '../libs/user-data';
 import { ipcMain } from '../typed-electron';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 export const SERVICE_NAME = 'user-data';
 
-export const init: Module = () => {
+export const init: ModuleInit = () => {
     const { logger } = global;
 
     ipcMain.handle('user-data/clear', ipcEvent => {
diff --git a/packages/suite-desktop-core/src/modules/window-controls.ts b/packages/suite-desktop-core/src/modules/window-controls.ts
index 9b24c36f33f..e9149d0b50a 100644
--- a/packages/suite-desktop-core/src/modules/window-controls.ts
+++ b/packages/suite-desktop-core/src/modules/window-controls.ts
@@ -3,11 +3,11 @@
  */
 import { app, ipcMain } from '../typed-electron';
 
-import type { Module } from './index';
+import type { ModuleInit } from './index';
 
 export const SERVICE_NAME = 'window-control';
 
-export const init: Module = ({ mainWindowProxy }) => {
+export const init: ModuleInit = ({ mainWindowProxy }) => {
     const { logger } = global;
 
     mainWindowProxy.on('init', mainWindow => {
@@ -16,11 +16,6 @@ export const init: Module = ({ mainWindowProxy }) => {
             // it is common for applications and their context menu to stay active until the user quits explicitly
             // with Cmd + Q or right-click > Quit from the context menu.
 
-            // restore window after click on the Dock icon
-            app.on('activate', () => {
-                logger.info(SERVICE_NAME, 'Showing main window on activate');
-                mainWindow.show();
-            });
             // hide window to the Dock
             // this event listener will be removed by app.on('before-quit')
             mainWindow.on('close', event => {
diff --git a/packages/suite-desktop-core/tsconfig.json b/packages/suite-desktop-core/tsconfig.json
index 4d1536f4fcd..2c09ec5b0b6 100644
--- a/packages/suite-desktop-core/tsconfig.json
+++ b/packages/suite-desktop-core/tsconfig.json
@@ -27,6 +27,7 @@
         { "path": "../connect" },
         { "path": "../connect-common" },
         { "path": "../env-utils" },
+        { "path": "../eslint" },
         { "path": "../ipc-proxy" },
         { "path": "../node-utils" },
         { "path": "../request-manager" },
diff --git a/packages/suite-desktop-ui/package.json b/packages/suite-desktop-ui/package.json
index 4314ebe24a7..cee0a0640cd 100644
--- a/packages/suite-desktop-ui/package.json
+++ b/packages/suite-desktop-ui/package.json
@@ -8,7 +8,6 @@
     "scripts": {
         "type-check": "yarn g:tsc --build tsconfig.json",
         "type-check:watch": "yarn type-check -- --watch",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "lint:styles": "npx stylelint './src/**/*{.ts,.tsx}' --cache --config ../../.stylelintrc"
     },
     "dependencies": {
@@ -36,6 +35,7 @@
         "@types/react": "18.2.79",
         "@types/react-dom": "18.2.19",
         "stylelint": "^16.2.1",
-        "stylelint-config-standard": "^36.0.0"
+        "stylelint-config-standard": "^36.0.0",
+        "typescript-styled-plugin": "^0.18.3"
     }
 }
diff --git a/packages/suite-desktop-ui/src/support/DesktopUpdater.tsx b/packages/suite-desktop-ui/src/support/DesktopUpdater.tsx
index 29e97868ea1..90c2511f0d9 100644
--- a/packages/suite-desktop-ui/src/support/DesktopUpdater.tsx
+++ b/packages/suite-desktop-ui/src/support/DesktopUpdater.tsx
@@ -18,13 +18,13 @@ import {
 import { UpdateState } from 'src/reducers/suite/desktopUpdateReducer';
 import { ModalContextProvider } from 'src/support/suite/ModalContext';
 import { getAppUpdatePayload } from 'src/utils/suite/analytics';
-import { selectRouteName } from 'src/reducers/suite/routerReducer';
 
 import { Available } from './DesktopUpdater/Available';
 import { Downloading } from './DesktopUpdater/Downloading';
 import { Ready } from './DesktopUpdater/Ready';
 import { EarlyAccessEnable } from './DesktopUpdater/EarlyAccessEnable';
 import { EarlyAccessDisable } from './DesktopUpdater/EarlyAccessDisable';
+import { JustUpdated } from './DesktopUpdater/JustUpdated';
 
 interface DesktopUpdaterProps {
     children: ReactNode;
@@ -33,11 +33,8 @@ interface DesktopUpdaterProps {
 export const DesktopUpdater = ({ children }: DesktopUpdaterProps) => {
     const dispatch = useDispatch();
     const { desktopUpdate } = useSelector(state => state);
-    const routeName = useSelector(selectRouteName);
 
-    // Closing a modal opened by auto updater outside of device settings might confuse some users,
-    // especially on app start if closing it unexpectedly by clicking outside.
-    const isSettingsRoute = routeName === 'settings-index';
+    const desktopUpdateState = desktopUpdate.state;
 
     useEffect(() => {
         desktopApi.on('update/allow-prerelease', params => dispatch(allowPrerelease(params)));
@@ -90,49 +87,34 @@ export const DesktopUpdater = ({ children }: DesktopUpdaterProps) => {
         }
 
         // Non visible states
-        if ([UpdateState.Checking, UpdateState.NotAvailable].includes(desktopUpdate.state)) {
+        if ([UpdateState.Checking, UpdateState.NotAvailable].includes(desktopUpdateState)) {
             return false;
         }
 
-        const isEarlyAccessState = [
+        const isHackyModalOpen = [
             UpdateState.EarlyAccessDisable,
             UpdateState.EarlyAccessEnable,
-        ].includes(desktopUpdate.state);
+            UpdateState.JustUpdated,
+        ].includes(desktopUpdateState);
 
         // Enable to setup Early Access even after updater error (when desktopUpdate.latest is undefined).
-        if (!isEarlyAccessState && !desktopUpdate.latest) {
-            return false;
-        }
-
-        return true;
-    }, [desktopUpdate.modalVisibility, desktopUpdate.state, desktopUpdate.latest]);
-
-    const getUpdateModal = () => {
-        switch (desktopUpdate.state) {
-            case UpdateState.EarlyAccessEnable:
-                return <EarlyAccessEnable hideWindow={hideWindow} />;
-            case UpdateState.EarlyAccessDisable:
-                return <EarlyAccessDisable hideWindow={hideWindow} />;
-            case UpdateState.Available:
-                return (
-                    <Available
-                        hideWindow={hideWindow}
-                        latest={desktopUpdate.latest}
-                        isCancelable={isSettingsRoute}
-                    />
-                );
-            case UpdateState.Downloading:
-                return <Downloading hideWindow={hideWindow} progress={desktopUpdate.progress} />;
-            case UpdateState.Ready:
-                return <Ready hideWindow={hideWindow} isCancelable={isSettingsRoute} />;
-            default:
-                return null;
-        }
+        return isHackyModalOpen || desktopUpdate.latest !== undefined;
+    }, [desktopUpdate.modalVisibility, desktopUpdateState, desktopUpdate.latest]);
+
+    const updateModalMap: Record<UpdateState, JSX.Element | null> = {
+        'early-access-disable': <EarlyAccessDisable hideWindow={hideWindow} />,
+        'early-access-enable': <EarlyAccessEnable hideWindow={hideWindow} />,
+        'just-updated': <JustUpdated onCancel={hideWindow} />,
+        'not-available': null,
+        available: <Available onCancel={hideWindow} latest={desktopUpdate.latest} />,
+        checking: null,
+        downloading: <Downloading hideWindow={hideWindow} progress={desktopUpdate.progress} />,
+        ready: <Ready hideWindow={hideWindow} />,
     };
 
     return (
         <>
-            {isVisible && getUpdateModal()}
+            {isVisible && updateModalMap[desktopUpdateState]}
             <ModalContextProvider isDisabled={isVisible}>{children}</ModalContextProvider>
         </>
     );
diff --git a/packages/suite-desktop-ui/src/support/DesktopUpdater/Available.tsx b/packages/suite-desktop-ui/src/support/DesktopUpdater/Available.tsx
index f720c81dc87..8837ab00e8e 100644
--- a/packages/suite-desktop-ui/src/support/DesktopUpdater/Available.tsx
+++ b/packages/suite-desktop-ui/src/support/DesktopUpdater/Available.tsx
@@ -1,119 +1,131 @@
 import styled from 'styled-components';
 
-import { Button, H2, Link, Markdown } from '@trezor/components';
+import {
+    Card,
+    Checkbox,
+    Column,
+    Icon,
+    Markdown,
+    NewModal,
+    Paragraph,
+    Row,
+    Text,
+} from '@trezor/components';
 import { desktopApi, UpdateInfo } from '@trezor/suite-desktop-api';
-import { borders } from '@trezor/theme';
+import { borders, spacings, spacingsPx } from '@trezor/theme';
 
-import { Translation, Modal } from 'src/components/suite';
-import { useDispatch } from 'src/hooks/suite';
-import { getReleaseUrl } from 'src/services/github';
+import { FormattedDate, Translation } from 'src/components/suite';
+import { useDispatch, useSelector } from 'src/hooks/suite';
 import { download } from 'src/actions/suite/desktopUpdateActions';
+import { selectSuiteFlags } from 'src/reducers/suite/suiteReducer';
+import { setFlag } from 'src/actions/suite/suiteActions';
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const GreenH2 = styled(H2)`
-    text-align: left;
-    color: ${({ theme }) => theme.legacy.TYPE_GREEN};
-`;
-
-const ChangelogWrapper = styled.div`
-    margin: 20px 0;
-    background: ${({ theme }) => theme.legacy.BG_GREY};
-    border-radius: ${borders.radii.xs};
-    max-height: 400px;
-    overflow-y: auto;
-    padding: 16px 20px;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledLink = styled(Link)`
-    align-self: start;
-`;
+import { Changelog } from './changelogComponents';
+import { getVersionName } from './getVersionName';
 
-const StyledModal = styled(Modal)`
-    ${Modal.BottomBar} {
-        > * {
-            flex: 1;
-        }
-    }
+const GreenTag = styled.div`
+    display: flex;
+    align-items: center;
+    gap: ${spacingsPx.xxs};
+    border-radius: ${borders.radii.full};
+    background-color: ${({ theme }) => theme.backgroundPrimarySubtleOnElevation0};
+    padding: ${spacingsPx.xxxs} ${spacingsPx.xs};
 `;
 
-interface VersionNameProps {
-    latestVersion?: string;
-    prerelease: boolean;
-}
-
-const getVersionName = ({ latestVersion, prerelease }: VersionNameProps): string => {
-    if (!latestVersion) {
-        // fallback for undefined version
-        return '';
-    }
-    if (!prerelease) {
-        // regular case
-        return latestVersion;
-    }
-    if (!latestVersion.includes('-')) {
-        // add beta label for pre-releases, but prevent versions like '21.10.1-alpha-beta'
-        return `${latestVersion}-beta`;
-    }
-
-    // fallback for pre-release versions already including some pre-release components
-    return latestVersion;
-};
+const NewTag = () => (
+    <GreenTag>
+        <Icon name="sparkleFilled" variant="primary" size="small" />
+        <Text variant="primary">
+            <Translation id="TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG" />
+        </Text>
+    </GreenTag>
+);
 
 interface AvailableProps {
-    hideWindow: () => void;
-    isCancelable: boolean;
-    latest?: UpdateInfo;
+    onCancel: () => void;
+    latest: UpdateInfo | undefined;
 }
 
-export const Available = ({ hideWindow, isCancelable, latest }: AvailableProps) => {
+export const Available = ({ onCancel, latest }: AvailableProps) => {
     const dispatch = useDispatch();
+    const { enableAutoupdateOnNextRun } = useSelector(selectSuiteFlags);
 
     const downloadUpdate = () => {
         dispatch(download());
         desktopApi.downloadUpdate();
     };
 
+    const suiteCurrentVersion = process.env.VERSION || '';
+    const suiteNewVersion = getVersionName({
+        latestVersion: latest?.version,
+        prerelease: !!latest?.prerelease,
+    });
+
+    const handleToggleAutoUpdateClick = () =>
+        dispatch(setFlag('enableAutoupdateOnNextRun', !enableAutoupdateOnNextRun));
+
     return (
-        <StyledModal
+        <NewModal
             heading={<Translation id="TR_UPDATE_MODAL_AVAILABLE_HEADING" />}
-            isCancelable={isCancelable}
-            onCancel={hideWindow}
-            bottomBarComponents={
+            description={
+                <Translation
+                    id="TR_UPDATE_MODAL_YOUR_VERSION"
+                    values={{ version: suiteCurrentVersion }}
+                />
+            }
+            onCancel={onCancel}
+            bottomContent={
                 <>
-                    <Button onClick={hideWindow} variant="tertiary">
-                        <Translation id="TR_UPDATE_MODAL_NOT_NOW" />
-                    </Button>
-                    <Button onClick={downloadUpdate} variant="primary">
+                    <NewModal.Button onClick={downloadUpdate}>
                         <Translation id="TR_UPDATE_MODAL_START_DOWNLOAD" />
-                    </Button>
+                    </NewModal.Button>
+                    <NewModal.Button onClick={onCancel} variant="tertiary">
+                        <Translation id="TR_UPDATE_MODAL_NOT_NOW" />
+                    </NewModal.Button>
                 </>
             }
         >
-            <GreenH2>
-                <Translation
-                    id="TR_VERSION_HAS_BEEN_RELEASED"
-                    values={{
-                        version: getVersionName({
-                            latestVersion: latest?.version,
-                            prerelease: !!latest?.prerelease,
-                        }),
-                    }}
-                />
-            </GreenH2>
+            <Column gap={spacings.xs} alignItems="start">
+                <div>
+                    <Paragraph typographyStyle="highlight" variant="primary">
+                        <Translation
+                            id="TR_VERSION_HAS_BEEN_RELEASED"
+                            values={{ version: suiteNewVersion }}
+                        />
+                    </Paragraph>
+                    <Paragraph typographyStyle="hint" variant="tertiary">
+                        <Translation id="TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE" />
+                    </Paragraph>
+                </div>
+
+                <Changelog>
+                    {latest?.changelog ? (
+                        <Markdown>{latest?.changelog}</Markdown>
+                    ) : (
+                        <Translation id="TR_COULD_NOT_RETRIEVE_CHANGELOG" />
+                    )}
+                </Changelog>
+
+                <Row justifyContent="end" width="100%">
+                    {latest?.releaseDate && (
+                        <Text variant="tertiary">
+                            <FormattedDate value={latest.releaseDate} date month="long" />
+                        </Text>
+                    )}
+                </Row>
 
-            <ChangelogWrapper>
-                {latest?.changelog ? (
-                    <Markdown>{latest?.changelog}</Markdown>
-                ) : (
-                    <Translation id="TR_COULD_NOT_RETRIEVE_CHANGELOG" />
-                )}
-            </ChangelogWrapper>
-            <StyledLink variant="nostyle" href={getReleaseUrl(latest?.version ?? '')}>
-                <Button variant="tertiary" icon="github">
-                    <Translation id="TR_CHANGELOG_ON_GITHUB" />
-                </Button>
-            </StyledLink>
-        </StyledModal>
+                <Card>
+                    <Row justifyContent="start" gap={spacings.xs}>
+                        <Checkbox
+                            isChecked={enableAutoupdateOnNextRun}
+                            onClick={handleToggleAutoUpdateClick}
+                        >
+                            <Translation id="TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES" />
+                        </Checkbox>
+                        <NewTag />
+                    </Row>
+                </Card>
+            </Column>
+        </NewModal>
     );
 };
diff --git a/packages/suite-desktop-ui/src/support/DesktopUpdater/Downloading.tsx b/packages/suite-desktop-ui/src/support/DesktopUpdater/Downloading.tsx
index f7e1fb5d3f6..475e61bfc52 100644
--- a/packages/suite-desktop-ui/src/support/DesktopUpdater/Downloading.tsx
+++ b/packages/suite-desktop-ui/src/support/DesktopUpdater/Downloading.tsx
@@ -4,15 +4,10 @@ import styled from 'styled-components';
 
 import { UpdateProgress } from '@trezor/suite-desktop-api';
 import { bytesToHumanReadable } from '@trezor/utils';
-import { Button, H2, ProgressBar, variables } from '@trezor/components';
+import { H2, NewModal, ProgressBar, variables, Row, Column } from '@trezor/components';
+import { spacings } from '@trezor/theme';
 
-import { Translation, Modal } from 'src/components/suite';
-
-import { Row } from './styles';
-
-const DownloadWrapper = styled(Row)`
-    margin-top: 16px;
-`;
+import { Translation } from 'src/components/suite';
 
 const DownloadProgress = styled.span`
     font-size: 20px;
@@ -34,11 +29,6 @@ const Text = styled(H2)`
     font-weight: ${variables.FONT_WEIGHT.MEDIUM};
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledProgressBar = styled(ProgressBar)`
-    margin-top: 16px;
-`;
-
 interface DownloadingProps {
     hideWindow: () => void;
     progress?: UpdateProgress;
@@ -56,42 +46,37 @@ export const Downloading = ({ hideWindow, progress }: DownloadingProps) => {
     }, [step]);
 
     return (
-        <Modal
-            headerComponent={
-                <Button
-                    size="small"
-                    variant="tertiary"
-                    icon="x"
-                    iconAlignment="right"
-                    onClick={hideWindow}
-                >
+        <NewModal
+            bottomContent={
+                <NewModal.Button variant="tertiary" onClick={hideWindow}>
                     <Translation id="TR_BACKGROUND_DOWNLOAD" />
-                </Button>
+                </NewModal.Button>
             }
-            onCancel={hideWindow}
         >
-            <DownloadWrapper>
-                {progress?.verifying ? (
-                    <Text>
-                        <Translation id="TR_VERIFYING_SIGNATURE" />
-                        {ellipsisArray.filter((_, k) => k < step)}
-                    </Text>
-                ) : (
-                    <>
+            <Column alignItems="start" gap={spacings.md}>
+                <Row margin={{ top: spacings.md }} justifyContent="space-between" width="100%">
+                    {progress?.verifying ? (
                         <Text>
-                            <Translation id="TR_DOWNLOADING" />
+                            <Translation id="TR_VERIFYING_SIGNATURE" />
+                            {ellipsisArray.filter((_, k) => k < step)}
                         </Text>
-                        <DownloadProgress>
-                            <ReceivedData>
-                                {bytesToHumanReadable(progress?.transferred || 0)}
-                            </ReceivedData>
-                            /<TotalData>{bytesToHumanReadable(progress?.total || 0)}</TotalData>
-                        </DownloadProgress>
-                    </>
-                )}
-            </DownloadWrapper>
-
-            <StyledProgressBar value={progress?.percent || 0} />
-        </Modal>
+                    ) : (
+                        <>
+                            <Text>
+                                <Translation id="TR_DOWNLOADING" />
+                            </Text>
+                            <DownloadProgress>
+                                <ReceivedData>
+                                    {bytesToHumanReadable(progress?.transferred || 0)}
+                                </ReceivedData>
+                                /<TotalData>{bytesToHumanReadable(progress?.total || 0)}</TotalData>
+                            </DownloadProgress>
+                        </>
+                    )}
+                </Row>
+
+                <ProgressBar value={progress?.percent || 0} />
+            </Column>
+        </NewModal>
     );
 };
diff --git a/packages/suite-desktop-ui/src/support/DesktopUpdater/EarlyAccessDisable.tsx b/packages/suite-desktop-ui/src/support/DesktopUpdater/EarlyAccessDisable.tsx
index 3b28a1dafa8..ff9e210d07b 100644
--- a/packages/suite-desktop-ui/src/support/DesktopUpdater/EarlyAccessDisable.tsx
+++ b/packages/suite-desktop-ui/src/support/DesktopUpdater/EarlyAccessDisable.tsx
@@ -1,33 +1,21 @@
 import { useCallback, useState } from 'react';
 
-import styled from 'styled-components';
+import { useTheme } from 'styled-components';
 
 import { SUITE_URL } from '@trezor/urls';
 import { analytics, EventType } from '@trezor/suite-analytics';
 import { desktopApi } from '@trezor/suite-desktop-api';
-import { Button, Image } from '@trezor/components';
+import {
+    Button,
+    Column,
+    NewModal,
+    Paragraph,
+    IconCircleColors,
+    IconCircle,
+} from '@trezor/components';
+import { spacings } from '@trezor/theme';
 
-import { Translation, Modal, TrezorLink } from 'src/components/suite';
-import { DialogModal } from 'src/components/suite/modals/Modal/DialogRenderer';
-
-import { ImageWrapper, Description, Title } from './styles';
-
-export const Link = styled(TrezorLink)`
-    width: 100%;
-`;
-
-const StyledModal = styled(Modal)`
-    ${Modal.BottomBar} {
-        > * {
-            flex: 1;
-        }
-    }
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const LinkButton = styled(Button)`
-    width: 100%;
-`;
+import { Translation, TrezorLink } from 'src/components/suite';
 
 interface EarlyAccessDisableProps {
     hideWindow: () => void;
@@ -36,6 +24,8 @@ interface EarlyAccessDisableProps {
 export const EarlyAccessDisable = ({ hideWindow }: EarlyAccessDisableProps) => {
     const [enabled, setEnabled] = useState(true);
 
+    const theme = useTheme();
+
     const allowPrerelease = useCallback(() => {
         analytics.report({
             type: EventType.SettingsGeneralEarlyAccess,
@@ -47,9 +37,21 @@ export const EarlyAccessDisable = ({ hideWindow }: EarlyAccessDisableProps) => {
         setEnabled(false);
     }, []);
 
+    const purpleModalColorBranding: IconCircleColors = {
+        foreground: theme.iconAlertPurple,
+        background: theme.backgroundAlertPurpleSubtleOnElevationNegative,
+    };
+
+    const eapIconComponent = (
+        <IconCircle name="eap" iconColor={purpleModalColorBranding} size={40} />
+    );
+
     return enabled ? (
-        <StyledModal
-            bottomBarComponents={
+        <NewModal
+            iconComponent={eapIconComponent}
+            onCancel={hideWindow}
+            heading={<Translation id="TR_EARLY_ACCESS" />}
+            bottomContent={
                 <>
                     <Button onClick={allowPrerelease}>
                         <Translation id="TR_EARLY_ACCESS_DISABLE" />
@@ -60,33 +62,41 @@ export const EarlyAccessDisable = ({ hideWindow }: EarlyAccessDisableProps) => {
                 </>
             }
         >
-            <ImageWrapper>
-                <Image width={60} height={60} image="EARLY_ACCESS_DISABLE" />
-            </ImageWrapper>
-            <Title>
-                <Translation id="TR_EARLY_ACCESS_DISABLE_CONFIRM_TITLE" />
-            </Title>
-            <Description>
-                <Translation id="TR_EARLY_ACCESS_DISABLE_CONFIRM_DESCRIPTION" />
-            </Description>
-        </StyledModal>
+            <Column gap={spacings.xs} alignItems="start">
+                <Paragraph typographyStyle="highlight">
+                    <Translation id="TR_EARLY_ACCESS_DISABLE_CONFIRM_TITLE" />
+                </Paragraph>
+                <Paragraph variant="tertiary">
+                    <Translation id="TR_EARLY_ACCESS_DISABLE_CONFIRM_DESCRIPTION" />
+                </Paragraph>
+            </Column>
+        </NewModal>
     ) : (
-        <DialogModal
-            icon="check"
-            bodyHeading={<Translation id="TR_EARLY_ACCESS_LEFT_TITLE" />}
-            body={<Translation id="TR_EARLY_ACCESS_LEFT_DESCRIPTION" />}
-            bottomBarComponents={
+        <NewModal
+            iconComponent={eapIconComponent}
+            onCancel={hideWindow}
+            heading={<Translation id="TR_EARLY_ACCESS" />}
+            bottomContent={
                 <>
-                    <Link variant="nostyle" href={SUITE_URL}>
-                        <LinkButton icon="arrowUpRight" iconAlignment="right">
+                    <TrezorLink variant="nostyle" href={SUITE_URL}>
+                        <Button icon="arrowUpRight" iconAlignment="right" variant="primary">
                             <Translation id="TR_EARLY_ACCESS_REINSTALL" />
-                        </LinkButton>
-                    </Link>
+                        </Button>
+                    </TrezorLink>
                     <Button onClick={hideWindow} variant="tertiary">
                         <Translation id="TR_EARLY_ACCESS_SKIP_REINSTALL" />
                     </Button>
                 </>
             }
-        />
+        >
+            <Column gap={spacings.xs} alignItems="start">
+                <Paragraph typographyStyle="highlight">
+                    <Translation id="TR_EARLY_ACCESS_LEFT_TITLE" />
+                </Paragraph>
+                <Paragraph variant="tertiary">
+                    <Translation id="TR_EARLY_ACCESS_LEFT_DESCRIPTION" />
+                </Paragraph>
+            </Column>
+        </NewModal>
     );
 };
diff --git a/packages/suite-desktop-ui/src/support/DesktopUpdater/EarlyAccessEnable.tsx b/packages/suite-desktop-ui/src/support/DesktopUpdater/EarlyAccessEnable.tsx
index 84afcef66ee..2d1c861e34e 100644
--- a/packages/suite-desktop-ui/src/support/DesktopUpdater/EarlyAccessEnable.tsx
+++ b/packages/suite-desktop-ui/src/support/DesktopUpdater/EarlyAccessEnable.tsx
@@ -1,33 +1,22 @@
 import { useCallback, useState } from 'react';
 
-import styled from 'styled-components';
+import { useTheme } from 'styled-components';
 
 import { analytics, EventType } from '@trezor/suite-analytics';
 import { desktopApi } from '@trezor/suite-desktop-api';
-import { Button, Paragraph, Tooltip, Image } from '@trezor/components';
+import {
+    Button,
+    Paragraph,
+    Tooltip,
+    NewModal,
+    Card,
+    Column,
+    IconCircleColors,
+    IconCircle,
+} from '@trezor/components';
+import { spacings } from '@trezor/theme';
 
-import { CheckItem, Translation, Modal } from 'src/components/suite';
-import { DialogModal } from 'src/components/suite/modals/Modal/DialogRenderer';
-
-import { Description, Divider } from './styles';
-
-const DescriptionWrapper = styled.div`
-    display: flex;
-`;
-
-const DescriptionTextWrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    justify-content: space-around;
-    margin-left: 20px;
-    text-align: left;
-`;
-
-// Checkbox has 80% max-width by default but it's nicer full width here.
-const Checkbox = styled(CheckItem)`
-    max-width: 100%;
-`;
+import { CheckItem, Translation } from 'src/components/suite';
 
 interface EarlyAccessEnableProps {
     hideWindow: () => void;
@@ -37,6 +26,8 @@ export const EarlyAccessEnable = ({ hideWindow }: EarlyAccessEnableProps) => {
     const [understood, setUnderstood] = useState(false);
     const [enabled, setEnabled] = useState(false);
 
+    const theme = useTheme();
+
     const allowPrerelease = useCallback(() => {
         analytics.report({
             type: EventType.SettingsGeneralEarlyAccess,
@@ -50,12 +41,21 @@ export const EarlyAccessEnable = ({ hideWindow }: EarlyAccessEnableProps) => {
 
     const checkForUpdates = useCallback(() => desktopApi.checkForUpdates(true), []);
 
+    const purpleModalColorBranding: IconCircleColors = {
+        foreground: theme.iconAlertPurple,
+        background: theme.backgroundAlertPurpleSubtleOnElevationNegative,
+    };
+
+    const eapIconComponent = (
+        <IconCircle name="eap" iconColor={purpleModalColorBranding} size={40} />
+    );
+
     return enabled ? (
-        <DialogModal
-            icon="check"
-            bodyHeading={<Translation id="TR_EARLY_ACCESS_JOINED_TITLE" />}
-            body={<Translation id="TR_EARLY_ACCESS_JOINED_DESCRIPTION" />}
-            bottomBarComponents={
+        <NewModal
+            iconComponent={eapIconComponent}
+            heading={<Translation id="TR_EARLY_ACCESS_JOINED_TITLE" />}
+            onCancel={hideWindow}
+            bottomContent={
                 <>
                     <Button onClick={checkForUpdates}>
                         <Translation id="TR_EARLY_ACCESS_CHECK_UPDATE" />
@@ -69,13 +69,15 @@ export const EarlyAccessEnable = ({ hideWindow }: EarlyAccessEnableProps) => {
                     </Button>
                 </>
             }
-        />
+        >
+            <Translation id="TR_EARLY_ACCESS_JOINED_DESCRIPTION" />
+        </NewModal>
     ) : (
-        <Modal
+        <NewModal
+            iconComponent={eapIconComponent}
             heading={<Translation id="TR_EARLY_ACCESS" />}
-            isCancelable
             onCancel={hideWindow}
-            bottomBarComponents={
+            bottomContent={
                 <Tooltip
                     maxWidth={285}
                     content={
@@ -83,6 +85,7 @@ export const EarlyAccessEnable = ({ hideWindow }: EarlyAccessEnableProps) => {
                     }
                 >
                     <Button
+                        variant="primary"
                         onClick={allowPrerelease}
                         isDisabled={!understood}
                         data-testid="@settings/early-access-confirm-button"
@@ -92,29 +95,24 @@ export const EarlyAccessEnable = ({ hideWindow }: EarlyAccessEnableProps) => {
                 </Tooltip>
             }
         >
-            <DescriptionWrapper>
-                <Image width={60} height={60} image="EARLY_ACCESS" />
-                <DescriptionTextWrapper>
-                    <Paragraph typographyStyle="highlight">
-                        <Translation id="TR_EARLY_ACCESS_ENABLE_CONFIRM_TITLE" />
-                    </Paragraph>
-                    <Description>
-                        <Translation id="TR_EARLY_ACCESS_ENABLE_CONFIRM_DESCRIPTION" />
-                    </Description>
-                </DescriptionTextWrapper>
-            </DescriptionWrapper>
-            <Divider />
-            <Checkbox
-                data-testid="@settings/early-access-confirm-check"
-                title={
-                    <Paragraph typographyStyle="highlight">
-                        <Translation id="TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK" />
-                    </Paragraph>
-                }
-                description=""
-                isChecked={understood}
-                onClick={() => setUnderstood(!understood)}
-            />
-        </Modal>
+            <Column gap={spacings.xs} alignItems="start">
+                <Paragraph typographyStyle="highlight">
+                    <Translation id="TR_EARLY_ACCESS_ENABLE_CONFIRM_TITLE" />
+                </Paragraph>
+                <Paragraph variant="tertiary">
+                    <Translation id="TR_EARLY_ACCESS_ENABLE_CONFIRM_DESCRIPTION" />
+                </Paragraph>
+
+                <Card>
+                    <CheckItem
+                        data-testid="@settings/early-access-confirm-check"
+                        title={<Translation id="TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK" />}
+                        description=""
+                        isChecked={understood}
+                        onClick={() => setUnderstood(!understood)}
+                    />
+                </Card>
+            </Column>
+        </NewModal>
     );
 };
diff --git a/packages/suite-desktop-ui/src/support/DesktopUpdater/JustUpdated.tsx b/packages/suite-desktop-ui/src/support/DesktopUpdater/JustUpdated.tsx
new file mode 100644
index 00000000000..7aeaf5f0af0
--- /dev/null
+++ b/packages/suite-desktop-ui/src/support/DesktopUpdater/JustUpdated.tsx
@@ -0,0 +1,70 @@
+import { useState, useCallback, useEffect } from 'react';
+
+import { Column, Markdown, NewModal, Paragraph } from '@trezor/components';
+import { desktopApi } from '@trezor/suite-desktop-api';
+import { spacings } from '@trezor/theme';
+
+import { Translation } from 'src/components/suite';
+import { useDispatch } from 'src/hooks/suite';
+import { download } from 'src/actions/suite/desktopUpdateActions';
+
+import { Changelog } from './changelogComponents';
+
+interface AvailableProps {
+    onCancel: () => void;
+}
+
+export const JustUpdated = ({ onCancel }: AvailableProps) => {
+    const [changelog, setChangelog] = useState<string | null>(null);
+
+    const dispatch = useDispatch();
+
+    const downloadUpdate = () => {
+        dispatch(download());
+        desktopApi.downloadUpdate();
+    };
+
+    const suiteCurrentVersion = process.env.VERSION || '';
+
+    const getReleaseNotes = useCallback(async () => {
+        const releaseNotesPath = process.env.ASSET_PREFIX + '/release-notes.md';
+        const result = await (await fetch(releaseNotesPath)).text();
+        setChangelog(result);
+    }, []);
+
+    useEffect(() => {
+        getReleaseNotes();
+    }, [getReleaseNotes]);
+
+    return (
+        <NewModal
+            heading={
+                <Paragraph typographyStyle="titleSmall" variant="primary">
+                    <Translation
+                        id="TR_VERSION_HAS_BEEN_RELEASED"
+                        values={{ version: suiteCurrentVersion }}
+                    />
+                </Paragraph>
+            }
+            description={<Translation id="TR_UPDATE_MODAL_WHATS_NEW" />}
+            onCancel={onCancel}
+            bottomContent={
+                <>
+                    <NewModal.Button onClick={downloadUpdate} variant="primary">
+                        <Translation id="TR_GOT_IT" />
+                    </NewModal.Button>
+                </>
+            }
+        >
+            <Column gap={spacings.xs} alignItems="start">
+                <Changelog>
+                    {changelog !== null ? (
+                        <Markdown>{changelog}</Markdown>
+                    ) : (
+                        <Translation id="TR_COULD_NOT_RETRIEVE_CHANGELOG" />
+                    )}
+                </Changelog>
+            </Column>
+        </NewModal>
+    );
+};
diff --git a/packages/suite-desktop-ui/src/support/DesktopUpdater/Ready.tsx b/packages/suite-desktop-ui/src/support/DesktopUpdater/Ready.tsx
index 071a4fea8f4..7f2d0a92a8c 100644
--- a/packages/suite-desktop-ui/src/support/DesktopUpdater/Ready.tsx
+++ b/packages/suite-desktop-ui/src/support/DesktopUpdater/Ready.tsx
@@ -1,61 +1,44 @@
-import styled from 'styled-components';
+import { Button, NewModal, Paragraph, Row } from '@trezor/components';
+import { spacings } from '@trezor/theme';
 
-import { Button, H2, variables } from '@trezor/components';
-
-import { Translation, Modal } from 'src/components/suite';
+import { Translation } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite';
 import { installUpdate } from 'src/actions/suite/desktopUpdateActions';
 
-const Description = styled.span`
-    font-size: ${variables.FONT_SIZE.SMALL};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
-
-const StyledModal = styled(Modal)`
-    ${Modal.BottomBar} {
-        > * {
-            flex: 1;
-        }
-    }
-`;
-
 interface ReadyProps {
     hideWindow: () => void;
-    isCancelable: boolean;
 }
 
-export const Ready = ({ hideWindow, isCancelable }: ReadyProps) => {
+export const Ready = ({ hideWindow }: ReadyProps) => {
     const dispatch = useDispatch();
 
-    const install = () => dispatch(installUpdate({ shouldInstallOnQuit: false }));
+    const install = () => dispatch(installUpdate({ installNow: true }));
     const installOnQuit = () => {
-        dispatch(installUpdate({ shouldInstallOnQuit: true }));
+        dispatch(installUpdate({ installNow: false }));
         hideWindow();
     };
 
     return (
-        <StyledModal
+        <NewModal
             heading={<Translation id="TR_UPDATE_MODAL_UPDATE_DOWNLOADED" />}
-            isCancelable={isCancelable}
             onCancel={installOnQuit}
-            bottomBarComponents={
-                <>
+            bottomContent={
+                <Row gap={spacings.xs}>
                     <Button onClick={installOnQuit} variant="tertiary">
                         <Translation id="TR_UPDATE_MODAL_UPDATE_ON_QUIT" />
                     </Button>
                     <Button onClick={install} variant="primary">
                         <Translation id="TR_UPDATE_MODAL_INSTALL_AND_RESTART" />
                     </Button>
-                </>
+                </Row>
             }
         >
-            <H2>
+            <Paragraph typographyStyle="highlight" variant="primary">
                 <Translation id="TR_UPDATE_MODAL_INSTALL_NOW_OR_LATER" />
-            </H2>
-            <Description>
+            </Paragraph>
+            <Paragraph>
                 <Translation id="TR_UPDATE_MODAL_RESTART_NEEDED" />
-            </Description>
-        </StyledModal>
+            </Paragraph>
+        </NewModal>
     );
 };
diff --git a/packages/suite-desktop-ui/src/support/DesktopUpdater/changelogComponents.tsx b/packages/suite-desktop-ui/src/support/DesktopUpdater/changelogComponents.tsx
new file mode 100644
index 00000000000..ecc7a2be2b8
--- /dev/null
+++ b/packages/suite-desktop-ui/src/support/DesktopUpdater/changelogComponents.tsx
@@ -0,0 +1,20 @@
+import { ReactNode } from 'react';
+
+import styled from 'styled-components';
+
+import { borders, Elevation, mapElevationToBackground, spacingsPx } from '@trezor/theme';
+import { useElevation } from '@trezor/components';
+
+const ChangelogWrapper = styled.div<{ $elevation: Elevation }>`
+    background-color: ${({ theme, $elevation }) => mapElevationToBackground({ theme, $elevation })};
+    border-radius: ${borders.radii.md};
+    max-height: 400px;
+    overflow-y: auto;
+    padding: ${spacingsPx.md} ${spacingsPx.xl};
+`;
+
+export const Changelog = ({ children }: { children: ReactNode }) => {
+    const { elevation } = useElevation();
+
+    return <ChangelogWrapper $elevation={elevation}>{children}</ChangelogWrapper>;
+};
diff --git a/packages/suite-desktop-ui/src/support/DesktopUpdater/getVersionName.ts b/packages/suite-desktop-ui/src/support/DesktopUpdater/getVersionName.ts
new file mode 100644
index 00000000000..9f8e672d3af
--- /dev/null
+++ b/packages/suite-desktop-ui/src/support/DesktopUpdater/getVersionName.ts
@@ -0,0 +1,20 @@
+interface VersionNameProps {
+    latestVersion?: string;
+    prerelease: boolean;
+}
+
+export const getVersionName = ({ latestVersion, prerelease }: VersionNameProps): string => {
+    if (latestVersion === undefined) {
+        return '';
+    }
+
+    if (prerelease !== undefined) {
+        return latestVersion;
+    }
+
+    if (!latestVersion.includes('-')) {
+        return `${latestVersion}-beta`;
+    }
+
+    return latestVersion;
+};
diff --git a/packages/suite-desktop-ui/src/support/DesktopUpdater/styles.ts b/packages/suite-desktop-ui/src/support/DesktopUpdater/styles.ts
deleted file mode 100644
index 77dfb237be0..00000000000
--- a/packages/suite-desktop-ui/src/support/DesktopUpdater/styles.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import styled from 'styled-components';
-
-import { H2, Paragraph, variables } from '@trezor/components';
-
-export const Row = styled.div`
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-`;
-
-export const LeftCol = styled.div`
-    display: flex;
-    flex: 1 1 calc(100% - 40px);
-`;
-
-export const RightCol = styled.div`
-    display: flex;
-    margin-left: 40px;
-    max-width: 280px;
-    flex: 1 1 100%;
-`;
-
-export const Divider = styled.div`
-    width: 100%;
-    height: 1px;
-    margin: 30px 0;
-    background: ${({ theme }) => theme.legacy.STROKE_GREY};
-`;
-
-export const ImageWrapper = styled.div`
-    top: 50px;
-    left: 0;
-    right: 0;
-`;
-
-export const ButtonWrapper = styled.div`
-    display: flex;
-    justify-content: center;
-    padding-top: 24px;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-export const Title = styled(H2)`
-    padding-top: 24px;
-    padding-bottom: 12px;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-export const Description = styled(Paragraph)`
-    font-size: ${variables.FONT_SIZE.SMALL};
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
diff --git a/packages/suite-desktop-ui/src/support/Router.tsx b/packages/suite-desktop-ui/src/support/Router.tsx
index 0d9e03278d6..4f954558a95 100644
--- a/packages/suite-desktop-ui/src/support/Router.tsx
+++ b/packages/suite-desktop-ui/src/support/Router.tsx
@@ -9,31 +9,30 @@ import Notification from 'src/views/suite/notifications';
 import { Transactions } from 'src/views/wallet/transactions/Transactions';
 import { Receive } from 'src/views/wallet/receive/Receive';
 import WalletDetails from 'src/views/wallet/details';
-import { Coins } from 'src/views/wallet/tokens/coins';
-import { HiddenTokens } from 'src/views/wallet/tokens/hidden-tokens';
 import WalletSend from 'src/views/wallet/send';
 import { WalletStaking } from 'src/views/wallet/staking/WalletStaking';
 import WalletSignVerify from 'src/views/wallet/sign-verify';
 import WalletAnonymize from 'src/views/wallet/anonymize';
-import WalletCoinmarketBuy from 'src/views/wallet/coinmarket/buy';
-import WalletCoinmarketBuyDetail from 'src/views/wallet/coinmarket/buy/detail';
-import WalletCoinmarketBuyOffers from 'src/views/wallet/coinmarket/buy/offers';
+import { CoinmarketBuyForm } from 'src/views/wallet/coinmarket/buy/CoinmarketBuyForm';
+import { CoinmarketBuyDetail } from 'src/views/wallet/coinmarket/buy/CoinmarketBuyDetail';
+import { CoinmarketBuyOffers } from 'src/views/wallet/coinmarket/buy/CoinmarketBuyOffers';
 import { CoinmarketBuyConfirm } from 'src/views/wallet/coinmarket/buy/CoinmarketBuyConfirm';
-import { CoinmarketSellForm } from 'src/views/wallet/coinmarket/sell_new/CoinmarketSellForm';
-import WalletCoinmarketSellDetail from 'src/views/wallet/coinmarket/sell_new/detail';
-import { CoinmarketSellOffers } from 'src/views/wallet/coinmarket/sell_new/CoinmarketSellOffers';
-import { CoinmarketSellConfirm } from 'src/views/wallet/coinmarket/sell_new/CoinmarketSellConfirm';
-import { CoinmarketExchangeForm } from 'src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeForm';
-import WalletCoinmarketExchangeDetail from 'src/views/wallet/coinmarket/exchange_new/detail';
-import { CoinmarketExchangeOffers } from 'src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeOffers';
-import { CoinmarketExchangeConfirm } from 'src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeConfirm';
-import WalletCoinmarketDCA from 'src/views/wallet/coinmarket/DCA';
-import WalletCoinmarketRedirect from 'src/views/wallet/coinmarket/redirect';
-import WalletCoinmarketTransactions from 'src/views/wallet/coinmarket/transactions';
+import { CoinmarketSellForm } from 'src/views/wallet/coinmarket/sell/CoinmarketSellForm';
+import { CoinmarketSellDetail } from 'src/views/wallet/coinmarket/sell/CoinmarketSellDetail';
+import { CoinmarketSellOffers } from 'src/views/wallet/coinmarket/sell/CoinmarketSellOffers';
+import { CoinmarketSellConfirm } from 'src/views/wallet/coinmarket/sell/CoinmarketSellConfirm';
+import { CoinmarketExchangeForm } from 'src/views/wallet/coinmarket/exchange/CoinmarketExchangeForm';
+import { CoinmarketExchangeDetail } from 'src/views/wallet/coinmarket/exchange/CoinmarketExchangeDetail';
+import { CoinmarketExchangeOffers } from 'src/views/wallet/coinmarket/exchange/CoinmarketExchangeOffers';
+import { CoinmarketExchangeConfirm } from 'src/views/wallet/coinmarket/exchange/CoinmarketExchangeConfirm';
+import { CoinmarketDCALanding } from 'src/views/wallet/coinmarket/DCA/CoinmarketDCALanding';
+import { CoinmarketRedirect } from 'src/views/wallet/coinmarket/redirect/CoinmarketRedirect';
+import { CoinmarketTransactions } from 'src/views/wallet/coinmarket/transactions/CoinmarketTransactions';
 import { SettingsGeneral } from 'src/views/settings/SettingsGeneral/SettingsGeneral';
 import { SettingsCoins } from 'src/views/settings/SettingsCoins/SettingsCoins';
 import { SettingsDebug } from 'src/views/settings/SettingsDebug/SettingsDebug';
 import { SettingsDevice } from 'src/views/settings/SettingsDevice/SettingsDevice';
+import { Tokens } from 'src/views/wallet/tokens';
 import PasswordManager from 'src/views/password-manager';
 
 const components: { [key: string]: ComponentType<any> } = {
@@ -43,28 +42,26 @@ const components: { [key: string]: ComponentType<any> } = {
     'wallet-index': Transactions,
     'wallet-receive': Receive,
     'wallet-details': WalletDetails,
-    'wallet-tokens-coins': Coins,
-    'wallet-tokens-hidden': HiddenTokens,
     'wallet-send': WalletSend,
     'wallet-staking': WalletStaking,
     'wallet-sign-verify': WalletSignVerify,
     'wallet-anonymize': WalletAnonymize,
-
-    'wallet-coinmarket-buy': WalletCoinmarketBuy,
-    'wallet-coinmarket-buy-detail': WalletCoinmarketBuyDetail,
-    'wallet-coinmarket-buy-offers': WalletCoinmarketBuyOffers,
+    'wallet-tokens': Tokens,
+    'wallet-coinmarket-buy': CoinmarketBuyForm,
+    'wallet-coinmarket-buy-detail': CoinmarketBuyDetail,
+    'wallet-coinmarket-buy-offers': CoinmarketBuyOffers,
     'wallet-coinmarket-buy-confirm': CoinmarketBuyConfirm,
     'wallet-coinmarket-sell': CoinmarketSellForm,
-    'wallet-coinmarket-sell-detail': WalletCoinmarketSellDetail,
+    'wallet-coinmarket-sell-detail': CoinmarketSellDetail,
     'wallet-coinmarket-sell-offers': CoinmarketSellOffers,
-    'wallet-coinmarket-exchange': CoinmarketExchangeForm,
     'wallet-coinmarket-sell-confirm': CoinmarketSellConfirm,
-    'wallet-coinmarket-exchange-detail': WalletCoinmarketExchangeDetail,
+    'wallet-coinmarket-exchange': CoinmarketExchangeForm,
+    'wallet-coinmarket-exchange-detail': CoinmarketExchangeDetail,
     'wallet-coinmarket-exchange-offers': CoinmarketExchangeOffers,
     'wallet-coinmarket-exchange-confirm': CoinmarketExchangeConfirm,
-    'wallet-coinmarket-dca': WalletCoinmarketDCA,
-    'wallet-coinmarket-redirect': WalletCoinmarketRedirect,
-    'wallet-coinmarket-transactions': WalletCoinmarketTransactions,
+    'wallet-coinmarket-dca': CoinmarketDCALanding,
+    'wallet-coinmarket-redirect': CoinmarketRedirect,
+    'wallet-coinmarket-transactions': CoinmarketTransactions,
 
     'password-manager-index': PasswordManager,
 
diff --git a/packages/suite-desktop-ui/styled.d.ts b/packages/suite-desktop-ui/styled.d.ts
new file mode 100644
index 00000000000..743c8b46f0a
--- /dev/null
+++ b/packages/suite-desktop-ui/styled.d.ts
@@ -0,0 +1,8 @@
+// import original module declarations
+import 'styled-components';
+import { SuiteThemeColors } from '@trezor/components';
+import { BoxShadows, Colors } from '@trezor/theme';
+
+declare module 'styled-components' {
+    export interface DefaultTheme extends SuiteThemeColors, Colors, BoxShadows {}
+}
diff --git a/packages/suite-desktop/electron-builder-config.js b/packages/suite-desktop/electron-builder-config.js
index 15b7a6563ac..6bef8993e1f 100644
--- a/packages/suite-desktop/electron-builder-config.js
+++ b/packages/suite-desktop/electron-builder-config.js
@@ -38,6 +38,10 @@ module.exports = {
             from: 'build/static/images/desktop/512x512.png',
             to: 'images/desktop/512x512.png',
         },
+        {
+            from: 'build/static/images/favicons',
+            to: 'images/favicons',
+        },
         {
             from: 'build/static/bin/firmware',
             to: 'bin/firmware',
diff --git a/packages/suite-desktop/package.json b/packages/suite-desktop/package.json
index 6b482e8955e..0c63376b088 100644
--- a/packages/suite-desktop/package.json
+++ b/packages/suite-desktop/package.json
@@ -19,20 +19,19 @@
         "build:app:electron": "yarn electron-builder --config electron-builder-config.js",
         "build:linux": "yarn clean && yarn build:ui && yarn build:app && yarn build:app:electron --publish never --linux --x64 --arm64",
         "build:mac": "yarn clean && yarn build:ui && yarn build:app && yarn build:app:electron --publish never --mac --x64 --arm64",
-        "build:win": "yarn clean && yarn build:ui && yarn build:app && yarn build:app:electron --publish never --win --x64",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'"
+        "build:win": "yarn clean && yarn build:ui && yarn build:app && yarn build:app:electron --publish never --win --x64"
     },
     "dependencies": {
         "blake-hash": "^2.0.0",
         "electron-localshortcut": "^3.2.1",
         "electron-store": "8.2.0",
-        "electron-updater": "6.3.4",
+        "electron-updater": "6.3.9",
         "usb": "^2.14.0"
     },
     "devDependencies": {
         "@electron/notarize": "2.5.0",
-        "electron": "32.1.2",
-        "electron-builder": "25.0.5",
+        "electron": "33.1.0",
+        "electron-builder": "25.1.8",
         "glob": "^10.3.10"
     }
 }
diff --git a/packages/suite-desktop/releaseNotes/release-notes.md b/packages/suite-desktop/releaseNotes/release-notes.md
index 51954c3970d..6a7e614385a 100644
--- a/packages/suite-desktop/releaseNotes/release-notes.md
+++ b/packages/suite-desktop/releaseNotes/release-notes.md
@@ -1,11 +1,13 @@
+### 🚀 New features
+
+-   Opt in to auto-updates to automatically download and install the latest updates, with a one-click restart to apply.
+-   BNB Smart Chain is now supported.
+
 ### 🎨 Improvements
 
--   The Exchange feature in the Trade section has been redesigned for easier use and improved deal offers.
--   Expanded the number of available tokens for buy, sell, and exchange (2000+ tokens).
--   Status icons in the bottom left menu have been updated for better clarity.
--   Some modal windows have been redesigned for better consistency with the app.
--   Improved discovery and clear identification of non-standard account types.
+-   Buy/Sell and Swap are now accessible directly from the main dashboard for quicker access.
+-   Removed BIP-69 sorting to shuffle inputs and reduce fingerprinting, enhancing privacy.
 
 ### 🔧 Bug fixes
 
--   Various small improvements and bug fixes.
+-   Minor fixes, usability enhancements, and performance improvements.
diff --git a/packages/suite-storage/eslint.config.mjs b/packages/suite-storage/eslint.config.mjs
new file mode 100644
index 00000000000..a7d70b6dca7
--- /dev/null
+++ b/packages/suite-storage/eslint.config.mjs
@@ -0,0 +1,11 @@
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'import/no-default-export': 'off',
+            '@typescript-eslint/no-shadow': 'off', // Todo: shall be fixed
+        },
+    },
+];
diff --git a/packages/suite-storage/package.json b/packages/suite-storage/package.json
index d9ef10c9d6f..ac9537402f6 100644
--- a/packages/suite-storage/package.json
+++ b/packages/suite-storage/package.json
@@ -10,7 +10,6 @@
     "license": "SEE LICENSE IN LICENSE.md",
     "description": "trezor suite storage",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "type-check": "yarn g:tsc --build tsconfig.json",
         "type-check:watch": "yarn type-check -- --watch"
     },
@@ -19,6 +18,7 @@
     "browser": "./src/web/index.ts",
     "dependencies": {
         "@trezor/env-utils": "workspace:*",
+        "@trezor/eslint": "workspace:*",
         "@trezor/utils": "workspace:*",
         "broadcast-channel": "^7.0.0",
         "idb": "^8.0.0"
diff --git a/packages/suite-storage/src/native/index.ts b/packages/suite-storage/src/native/index.ts
index 6cf170be1c8..99f803780ff 100644
--- a/packages/suite-storage/src/native/index.ts
+++ b/packages/suite-storage/src/native/index.ts
@@ -7,6 +7,7 @@ import {
     IDBPDatabase,
     IDBPTransaction,
 } from 'idb';
+
 import { StorageMessageEvent } from './types';
 
 export type OnUpgradeFunc<TDBStructure> = (
diff --git a/packages/suite-storage/src/web/index.ts b/packages/suite-storage/src/web/index.ts
index 7fb56c31f6c..59dce9af61e 100644
--- a/packages/suite-storage/src/web/index.ts
+++ b/packages/suite-storage/src/web/index.ts
@@ -11,6 +11,7 @@ import {
     deleteDB,
 } from 'idb';
 import { BroadcastChannel } from 'broadcast-channel';
+
 import { isFirefox } from '@trezor/env-utils';
 import { createLazy } from '@trezor/utils';
 
diff --git a/packages/suite-storage/tsconfig.json b/packages/suite-storage/tsconfig.json
index 1c6db14a535..f7434c2f17a 100644
--- a/packages/suite-storage/tsconfig.json
+++ b/packages/suite-storage/tsconfig.json
@@ -4,6 +4,7 @@
     "include": [".", "**/*.json"],
     "references": [
         { "path": "../env-utils" },
+        { "path": "../eslint" },
         { "path": "../utils" }
     ]
 }
diff --git a/packages/suite-web/e2e/cypress.config.ts b/packages/suite-web/e2e/cypress.config.ts
index 42b20e8706d..6f93011f2d6 100644
--- a/packages/suite-web/e2e/cypress.config.ts
+++ b/packages/suite-web/e2e/cypress.config.ts
@@ -1,14 +1,12 @@
 import { defineConfig } from 'cypress';
-
 import fs from 'fs';
 import path from 'path';
 import { addMatchImageSnapshotPlugin } from 'cypress-image-snapshot/plugin';
+
 import { BridgeTransport } from '@trezor/transport';
 import * as messages from '@trezor/protobuf/src/messages';
-
 import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
 import * as metadataUtils from '@trezor/suite/src/utils/suite/metadata';
-
 import {
     TrezorBridgeMock,
     DropboxMock,
@@ -158,7 +156,7 @@ export default defineConfig({
                     return null;
                 },
                 stealBridgeSession: async () => {
-                    const bridge = new BridgeTransport({ messages });
+                    const bridge = new BridgeTransport({ messages, id: 'foo-bar' });
                     await bridge.init();
                     const enumerateRes = await bridge.enumerate();
                     if (!enumerateRes.success) return null;
@@ -178,7 +176,7 @@ export default defineConfig({
                     return Promise.resolve(true);
                 },
                 readDir: dir => fs.readdirSync(dir, { encoding: 'utf-8' }),
-                readFile: path => fs.readFileSync(path, { encoding: 'utf-8' }),
+                readFile: path2 => fs.readFileSync(path2, { encoding: 'utf-8' }),
                 rmDir: (opts: {
                     recursive: fs.RmDirOptions['recursive'];
                     dir: string;
diff --git a/packages/suite-web/e2e/run_tests.ts b/packages/suite-web/e2e/run_tests.ts
index 05a22837623..69610f8d2f6 100644
--- a/packages/suite-web/e2e/run_tests.ts
+++ b/packages/suite-web/e2e/run_tests.ts
@@ -7,6 +7,7 @@ import child_process from 'child_process';
 import yargs from 'yargs/yargs';
 import path from 'path';
 import fs from 'fs';
+
 import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
 
 import cypressConfig from './cypress.config';
@@ -17,12 +18,12 @@ const { argv } = yargs(process.argv.slice(2)).options({
     group: { type: 'string' },
 });
 
-const getGrepCommand = (word = '', args = '-rlIw', path = TEST_DIR) =>
+const getGrepCommand = (word = '', args = '-rlIw', path2 = TEST_DIR) =>
     // -r, recursive search on subdirectories
     // -I, ignore binary
     // -l, only names of files to stdout/return
     // -w, expression is searched for as a word
-    [args, word, path];
+    [args, word, path2];
 
 /**
  * get value of labels, for example there is
@@ -30,8 +31,8 @@ const getGrepCommand = (word = '', args = '-rlIw', path = TEST_DIR) =>
  * grepForValue('@retry', './tests/backup.test.ts');
  * will return 3
  */
-const grepForValue = (word: string, path: string) => {
-    const command = getGrepCommand(word, '-rIw', path);
+const grepForValue = (word: string, path2: string) => {
+    const command = getGrepCommand(word, '-rIw', path2);
     const res = child_process.spawnSync('grep', command, {
         encoding: 'utf-8',
     });
diff --git a/packages/suite-web/e2e/stubs/metadata.ts b/packages/suite-web/e2e/stubs/metadata.ts
index 35210ab18eb..4824b6d0e23 100644
--- a/packages/suite-web/e2e/stubs/metadata.ts
+++ b/packages/suite-web/e2e/stubs/metadata.ts
@@ -16,7 +16,7 @@ export const rerouteMetadataToMockProvider = (
     let url;
     try {
         url = new URL(uri);
-    } catch (_err) {
+    } catch {
         // catching absolute next.js urls which throw in URL constructor
         return fetch(uri, options);
     }
diff --git a/packages/suite-web/e2e/support/commands.ts b/packages/suite-web/e2e/support/commands.ts
index 41106db2a1c..b2dee02b11e 100644
--- a/packages/suite-web/e2e/support/commands.ts
+++ b/packages/suite-web/e2e/support/commands.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-namespace */
-/* eslint-disable @typescript-eslint/no-var-requires */
+
+import { SuiteAnalyticsEvent } from '@trezor/suite-analytics';
 
 import {
     onboardingShouldLoad,
@@ -12,6 +13,7 @@ import { resetDb } from './utils/test-env';
 import {
     toggleDeviceMenu,
     enableDebugMode,
+    disableFirmwareHashCheck,
     toggleDebugModeInSettings,
     passThroughInitialRun,
     passThroughAuthenticityCheck,
@@ -26,9 +28,9 @@ import {
     enterPinOnBlindMatrix,
     addHiddenWallet,
     changeViewOnlyState,
+    clearInput,
 } from './utils/shortcuts';
 import { interceptInvityApi } from './utils/intercept-invity-api';
-import { SuiteAnalyticsEvent } from '@trezor/suite-analytics';
 import { EventPayload, Requests } from './types';
 
 const command = require('cypress-image-snapshot/command');
@@ -96,9 +98,15 @@ afterEach(() => {
     cy.task('stopMockedBridge');
 });
 
+const step = (description: string, block: () => void) => {
+    cy.log(description);
+    block();
+};
+
 declare global {
     namespace Cypress {
         interface Chainable<Subject> {
+            step: typeof step;
             getTestElement: typeof getTestElement;
             hoverTestElement: typeof hoverTestElement;
             prefixedVisit: typeof prefixedVisit;
@@ -113,6 +121,7 @@ declare global {
             discoveryMightAppearAndShouldFinish: () => Chainable<Subject>;
             toggleDeviceMenu: () => Chainable<Subject>;
             enableDebugMode: () => Chainable<Subject>;
+            disableFirmwareHashCheck: () => Chainable<Subject>;
             toggleDebugModeInSettings: () => Chainable<Subject>;
             text: () => Chainable<Subject>;
             passThroughInitialRun: (
@@ -142,6 +151,7 @@ declare global {
                 walletIndex: number,
                 desiredState: 'enabled' | 'disabled',
             ) => Chainable<Subject>;
+            clearInput: (elementSelector: string) => Chainable<Subject>;
         }
     }
 }
@@ -157,6 +167,7 @@ if (Cypress.env('SNAPSHOT')) {
     });
 }
 
+Cypress.Commands.add('step', step);
 Cypress.Commands.add('prefixedVisit', prefixedVisit);
 Cypress.Commands.add('safeReload', safeReload);
 Cypress.Commands.add('resetDb', { prevSubject: false }, resetDb);
@@ -174,6 +185,7 @@ Cypress.Commands.add('hoverTestElement', hoverTestElement);
 // various shortcuts
 Cypress.Commands.add('toggleDeviceMenu', toggleDeviceMenu);
 Cypress.Commands.add('enableDebugMode', enableDebugMode);
+Cypress.Commands.add('disableFirmwareHashCheck', disableFirmwareHashCheck);
 Cypress.Commands.add('toggleDebugModeInSettings', toggleDebugModeInSettings);
 Cypress.Commands.add('passThroughInitialRun', passThroughInitialRun);
 Cypress.Commands.add('passThroughAuthenticityCheck', passThroughAuthenticityCheck);
@@ -193,3 +205,4 @@ Cypress.Commands.add('findAnalyticsEventByType', findAnalyticsEventByType);
 Cypress.Commands.add('enterPinOnBlindMatrix', enterPinOnBlindMatrix);
 Cypress.Commands.add('addHiddenWallet', addHiddenWallet);
 Cypress.Commands.add('changeViewOnlyState', changeViewOnlyState);
+Cypress.Commands.add('clearInput', clearInput);
diff --git a/packages/suite-web/e2e/support/constants/languageMap.ts b/packages/suite-web/e2e/support/constants/languageMap.ts
new file mode 100644
index 00000000000..c7022f0d4bb
--- /dev/null
+++ b/packages/suite-web/e2e/support/constants/languageMap.ts
@@ -0,0 +1,3 @@
+export const languageMap = {
+    es: 'Español',
+};
diff --git a/packages/suite-web/e2e/support/enums/currency.ts b/packages/suite-web/e2e/support/enums/currency.ts
new file mode 100644
index 00000000000..a73f60bbf3a
--- /dev/null
+++ b/packages/suite-web/e2e/support/enums/currency.ts
@@ -0,0 +1,4 @@
+export enum Currency {
+    EUR = 'eur',
+    USD = 'usd',
+}
diff --git a/packages/suite-web/e2e/support/enums/language.ts b/packages/suite-web/e2e/support/enums/language.ts
new file mode 100644
index 00000000000..d0b728ced29
--- /dev/null
+++ b/packages/suite-web/e2e/support/enums/language.ts
@@ -0,0 +1,3 @@
+export enum Language {
+    Spanish = 'es',
+}
diff --git a/packages/suite-web/e2e/support/enums/metadataProvider.ts b/packages/suite-web/e2e/support/enums/metadataProvider.ts
new file mode 100644
index 00000000000..7f9669c06cc
--- /dev/null
+++ b/packages/suite-web/e2e/support/enums/metadataProvider.ts
@@ -0,0 +1,4 @@
+export enum MetadataProvider {
+    Dropbox = 'dropbox',
+    Google = 'google',
+}
diff --git a/packages/suite-web/e2e/support/enums/seedType.ts b/packages/suite-web/e2e/support/enums/seedType.ts
new file mode 100644
index 00000000000..9d201fe50dd
--- /dev/null
+++ b/packages/suite-web/e2e/support/enums/seedType.ts
@@ -0,0 +1,4 @@
+export enum SeedType {
+    Default = 'single',
+    Advanced = 'shamir-advanced',
+}
diff --git a/packages/suite-web/e2e/support/enums/theme.ts b/packages/suite-web/e2e/support/enums/theme.ts
new file mode 100644
index 00000000000..ce1a27c226a
--- /dev/null
+++ b/packages/suite-web/e2e/support/enums/theme.ts
@@ -0,0 +1,5 @@
+export enum Theme {
+    System = 'system',
+    Dark = 'dark',
+    Light = 'light',
+}
diff --git a/packages/suite-web/e2e/support/pageObjects/accountsObject.ts b/packages/suite-web/e2e/support/pageObjects/accountsObject.ts
index 34e5c0a1dda..c394f2b26d7 100644
--- a/packages/suite-web/e2e/support/pageObjects/accountsObject.ts
+++ b/packages/suite-web/e2e/support/pageObjects/accountsObject.ts
@@ -7,11 +7,13 @@ class AccountsPage {
         cy.getTestElement('@account-menu/arrow').click({ multiple: true });
     }
 
+    openBtcAccount(index: number) {
+        cy.getTestElement(`@account-menu/btc/normal/${index}`).click();
+    }
+
     applyCoinFilter(coin: NetworkSymbol) {
-        cy.getTestElement(`@account-menu/filter/${coin}`)
-            .click()
-            .invoke('attr', 'data-test-activated')
-            .should('eq', 'true');
+        cy.getTestElement(`@account-menu/filter/${coin}`).as('account').click();
+        cy.get('@account').invoke('attr', 'data-test-activated').should('eq', 'true');
     }
 
     openAddAccountsModal() {
@@ -48,13 +50,13 @@ class AccountsPage {
     }
 
     accountsPaginationCheck() {
+        cy.getTestElement('@wallet/accounts/pagination/5').click();
         cy.getTestElement('@wallet/accounts/pagination/5')
-            .click()
             .invoke('attr', 'data-test-activated')
             .should('eq', 'true');
 
+        cy.getTestElement('@wallet/accounts/pagination/3').click();
         cy.getTestElement('@wallet/accounts/pagination/3')
-            .click()
             .invoke('attr', 'data-test-activated')
             .should('eq', 'true');
     }
@@ -88,7 +90,7 @@ class AccountsPage {
 
     exportDesiredTransactionType(typeOfExport: string) {
         cy.getTestElement('@wallet/accounts/export-transactions/dropdown').click({
-            scrollBehavior: false,
+            scrollBehavior: 'center',
         });
         cy.getTestElement(`@wallet/accounts/export-transactions/${typeOfExport}`)
             .should('be.visible')
diff --git a/packages/suite-web/e2e/support/pageObjects/analyticsObject.ts b/packages/suite-web/e2e/support/pageObjects/analyticsObject.ts
new file mode 100644
index 00000000000..4d65c5ffde6
--- /dev/null
+++ b/packages/suite-web/e2e/support/pageObjects/analyticsObject.ts
@@ -0,0 +1,9 @@
+/// <reference types="cypress" />
+
+class AnalyticsPage {
+    continue() {
+        cy.getTestElement('@analytics/continue-button').click();
+    }
+}
+
+export const onAnalyticsPage = new AnalyticsPage();
diff --git a/packages/suite-web/e2e/support/pageObjects/connectDeviceObject.ts b/packages/suite-web/e2e/support/pageObjects/connectDeviceObject.ts
new file mode 100644
index 00000000000..1d028201812
--- /dev/null
+++ b/packages/suite-web/e2e/support/pageObjects/connectDeviceObject.ts
@@ -0,0 +1,9 @@
+/// <reference types="cypress" />
+
+class ConnectDevicePrompt {
+    waitForConnectDevicePrompt() {
+        cy.getTestElement('@connect-device-prompt', { timeout: 20000 }).should('be.visible');
+    }
+}
+
+export const onConnectDevicePrompt = new ConnectDevicePrompt();
diff --git a/packages/suite-web/e2e/support/pageObjects/deviceCompromisedObject.ts b/packages/suite-web/e2e/support/pageObjects/deviceCompromisedObject.ts
new file mode 100644
index 00000000000..4150ef9bede
--- /dev/null
+++ b/packages/suite-web/e2e/support/pageObjects/deviceCompromisedObject.ts
@@ -0,0 +1,9 @@
+/// <reference types="cypress" />
+
+class DeviceCompromisedModal {
+    ignoreDeviceCompromisedWarning() {
+        cy.getTestElement('@device-compromised/back-button').should('be.visible').click();
+    }
+}
+
+export const onDeviceCompromisedModal = new DeviceCompromisedModal();
diff --git a/packages/suite-web/e2e/support/pageObjects/menuObject.ts b/packages/suite-web/e2e/support/pageObjects/menuObject.ts
new file mode 100644
index 00000000000..b6af4289547
--- /dev/null
+++ b/packages/suite-web/e2e/support/pageObjects/menuObject.ts
@@ -0,0 +1,9 @@
+/// <reference types="cypress" />
+
+class Menu {
+    openSwitchDevice(): void {
+        cy.getTestElement('@menu/switch-device').click();
+    }
+}
+
+export const onMenu = new Menu();
diff --git a/packages/suite-web/e2e/support/pageObjects/modalObject.ts b/packages/suite-web/e2e/support/pageObjects/modalObject.ts
new file mode 100644
index 00000000000..6221687cb96
--- /dev/null
+++ b/packages/suite-web/e2e/support/pageObjects/modalObject.ts
@@ -0,0 +1,9 @@
+/// <reference types="cypress" />
+
+class Modal {
+    close(): void {
+        cy.getTestElement('@modal/close-button').should('be.visible').click();
+    }
+}
+
+export const onModal = new Modal();
diff --git a/packages/suite-web/e2e/support/pageObjects/multiShareBackupObject.ts b/packages/suite-web/e2e/support/pageObjects/multiShareBackupObject.ts
new file mode 100644
index 00000000000..821974d3ad5
--- /dev/null
+++ b/packages/suite-web/e2e/support/pageObjects/multiShareBackupObject.ts
@@ -0,0 +1,16 @@
+/// <reference types="cypress" />
+
+class MultiShareBackupModal {
+    createMultiShareBackup(): void {
+        cy.getTestElement('@multi-share-backup/checkbox/1').click();
+        cy.getTestElement('@multi-share-backup/checkbox/2').click();
+        cy.getTestElement('@multi-share-backup/1st-info/submit-button').click();
+        cy.getTestElement('@multi-share-backup/2nd-info/submit-button').click();
+    }
+
+    finalizeMultiShareBackup(): void {
+        cy.getTestElement('@multi-share-backup/done/got-it-button').should('be.visible').click();
+    }
+}
+
+export const onMultiShareBackupModal = new MultiShareBackupModal();
diff --git a/packages/suite-web/e2e/support/pageObjects/onboardingObject.ts b/packages/suite-web/e2e/support/pageObjects/onboardingObject.ts
new file mode 100644
index 00000000000..0df29a2c079
--- /dev/null
+++ b/packages/suite-web/e2e/support/pageObjects/onboardingObject.ts
@@ -0,0 +1,75 @@
+/// <reference types="cypress" />
+
+import { SeedType } from '../enums/seedType';
+
+class OnboardingPage {
+    waitForConfirmationOnDevice() {
+        cy.getTestElement('@onboarding/confirm-on-device').should('be.visible');
+    }
+
+    createWallet() {
+        cy.getTestElement('@onboarding/path-create-button').click();
+    }
+
+    selectSeedType(seedType: SeedType) {
+        cy.getTestElement('@onboarding/select-seed-type-open-dialog').click();
+        cy.getTestElement(`@onboarding/select-seed-type-${seedType}`).click();
+        cy.getTestElement('@onboarding/select-seed-type-confirm').click();
+    }
+
+    createBackup() {
+        cy.getTestElement('@onboarding/create-backup-button').click();
+    }
+
+    recoverWallet() {
+        cy.getTestElement('@onboarding/path-recovery-button').click();
+    }
+
+    continueRecovery() {
+        cy.getTestElement('@onboarding/recovery/continue-button').click();
+    }
+
+    continueCoins() {
+        cy.getTestElement('@onboarding/coins/continue-button').click();
+    }
+
+    startRecovery() {
+        cy.getTestElement('@onboarding/recovery/start-button').click();
+    }
+
+    retryRecovery() {
+        cy.getTestElement('@onboarding/recovery/retry-button').click();
+    }
+
+    continueFirmware() {
+        cy.getTestElement('@firmware/continue-button').click();
+    }
+
+    skipFirmware() {
+        cy.getTestElement('@firmware/skip-button').click();
+    }
+
+    setPin() {
+        cy.getTestElement('@onboarding/set-pin-button').click();
+    }
+
+    continuePin() {
+        cy.getTestElement('@onboarding/pin/continue-button').should('be.visible').click();
+    }
+
+    skipPin() {
+        cy.getTestElement('@onboarding/skip-button').click();
+        cy.getTestElement('@onboarding/skip-button-confirm').click();
+    }
+
+    skipTutorial() {
+        cy.getTestElement('@tutorial/skip-button').click();
+        cy.getTestElement('@tutorial/continue-button').click();
+    }
+
+    checkOnboardingSuccess() {
+        cy.getTestElement('@onboarding/final').should('be.visible').contains('Setup complete!');
+    }
+}
+
+export const onOnboardingPage = new OnboardingPage();
diff --git a/packages/suite-web/e2e/support/pageObjects/recoverObject.ts b/packages/suite-web/e2e/support/pageObjects/recoverObject.ts
new file mode 100644
index 00000000000..d5049e3f4e1
--- /dev/null
+++ b/packages/suite-web/e2e/support/pageObjects/recoverObject.ts
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+
+class RecoverPage {
+    selectWordCount(number: number) {
+        cy.getTestElement(`@recover/select-count/${number}`).click();
+    }
+
+    selectBasicRecovery() {
+        cy.getTestElement('@recover/select-type/basic').click();
+    }
+}
+
+export const onRecoverPage = new RecoverPage();
diff --git a/packages/suite-web/e2e/support/pageObjects/settingsCryptoObject.ts b/packages/suite-web/e2e/support/pageObjects/settings/settingsCryptoObject.ts
similarity index 56%
rename from packages/suite-web/e2e/support/pageObjects/settingsCryptoObject.ts
rename to packages/suite-web/e2e/support/pageObjects/settings/settingsCryptoObject.ts
index 8556d014fe3..67617bbada1 100644
--- a/packages/suite-web/e2e/support/pageObjects/settingsCryptoObject.ts
+++ b/packages/suite-web/e2e/support/pageObjects/settings/settingsCryptoObject.ts
@@ -4,10 +4,8 @@ import { NetworkSymbol } from '@suite-common/wallet-config';
 
 class SettingsCrypto {
     activateCoin(coin: NetworkSymbol) {
-        cy.getTestElement(`@settings/wallet/network/${coin}`)
-            .click()
-            .invoke('attr', 'data-active')
-            .should('be.eq', 'true');
+        cy.getTestElement(`@settings/wallet/network/${coin}`).as('selectedCoin').click();
+        cy.get('@selectedCoin').invoke('attr', 'data-active').should('be.eq', 'true');
     }
 }
 
diff --git a/packages/suite-web/e2e/support/pageObjects/settings/settingsDeviceObject.ts b/packages/suite-web/e2e/support/pageObjects/settings/settingsDeviceObject.ts
new file mode 100644
index 00000000000..47d79f815d2
--- /dev/null
+++ b/packages/suite-web/e2e/support/pageObjects/settings/settingsDeviceObject.ts
@@ -0,0 +1,24 @@
+/// <reference types="cypress" />
+
+class SettingsDevicePage {
+    openCreateMultiShareBackup(): void {
+        cy.getTestElement('@settings/device/create-multi-share-backup-button')
+            .should('be.visible')
+            .click();
+        cy.getTestElement('@multi-share-backup/1st-info/submit-button').should('be.visible');
+    }
+
+    togglePinSwitch(): void {
+        cy.getTestElement('@settings/device/pin-switch').should('be.visible').wait(500).click();
+    }
+
+    togglePassphraseSwitch(): void {
+        cy.getTestElement('@settings/device/passphrase-switch')
+            .as('passphraseSwitch')
+            .scrollIntoView();
+
+        cy.get('@passphraseSwitch').should('be.visible').click();
+    }
+}
+
+export const onSettingsDevicePage = new SettingsDevicePage();
diff --git a/packages/suite-web/e2e/support/pageObjects/settings/settingsGeneralObject.ts b/packages/suite-web/e2e/support/pageObjects/settings/settingsGeneralObject.ts
new file mode 100644
index 00000000000..98b1b3b7e4a
--- /dev/null
+++ b/packages/suite-web/e2e/support/pageObjects/settings/settingsGeneralObject.ts
@@ -0,0 +1,37 @@
+/// <reference types="cypress" />
+
+import { Currency } from '../../enums/currency';
+import { Language } from '../../enums/language';
+import { languageMap } from '../../constants/languageMap';
+import { Theme } from '../../enums/theme';
+
+class SettingsGeneral {
+    changeFiatCurrency(currency: Currency) {
+        cy.getTestElement('@settings/fiat-select/input')
+            .should('be.visible')
+            .click({ scrollBehavior: 'bottom' });
+        cy.getTestElement(`@settings/fiat-select/option/${currency}`).click();
+    }
+
+    changeTheme(theme: Theme) {
+        cy.getTestElement('@theme/color-scheme-select/input')
+            .should('be.visible')
+            .click({ scrollBehavior: 'bottom' });
+        cy.getTestElement(`@theme/color-scheme-select/option/${theme}`).click();
+        cy.getTestElement('@theme/color-scheme-select/input').should(
+            'contain',
+            Cypress._.capitalize(theme),
+        );
+    }
+
+    changeLanguage(language: Language) {
+        cy.getTestElement('@settings/language-select/input').click({ scrollBehavior: 'bottom' });
+        cy.getTestElement(`@settings/language-select/option/${language}`).click({ force: true });
+        cy.getTestElement('@settings/language-select/input').should(
+            'contain',
+            languageMap[language],
+        );
+    }
+}
+
+export const onSettingGeneralPage = new SettingsGeneral();
diff --git a/packages/suite-web/e2e/support/pageObjects/settings/settingsMenuObject.ts b/packages/suite-web/e2e/support/pageObjects/settings/settingsMenuObject.ts
new file mode 100644
index 00000000000..0244bd17a20
--- /dev/null
+++ b/packages/suite-web/e2e/support/pageObjects/settings/settingsMenuObject.ts
@@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+
+class SettingsMenu {
+    openDeviceSettings(): void {
+        cy.getTestElement('@settings/menu/device').should('be.visible').click();
+    }
+
+    openWalletSettings(): void {
+        cy.getTestElement('@settings/menu/wallet').should('be.visible').click();
+    }
+}
+
+export const onSettingsMenu = new SettingsMenu();
diff --git a/packages/suite-web/e2e/support/pageObjects/switchDeviceObject.ts b/packages/suite-web/e2e/support/pageObjects/switchDeviceObject.ts
new file mode 100644
index 00000000000..3afbf47cf14
--- /dev/null
+++ b/packages/suite-web/e2e/support/pageObjects/switchDeviceObject.ts
@@ -0,0 +1,43 @@
+/// <reference types="cypress" />
+
+class SwitchDevice {
+    private readonly walletSelectorBeginPart = '[data-testid^="@metadata/walletLabel/"]';
+
+    openDevice(index: number) {
+        cy.getTestElement(`@switch-device/wallet-on-index/${index}`).click();
+    }
+
+    getLabel(index: number): Cypress.Chainable<JQuery<HTMLElement>> {
+        return cy.get(`${this.walletSelectorBeginPart}[data-testid$=":${index + 1}"]`);
+    }
+
+    clickAddLabel(index: number) {
+        cy.wait(2000); // TODO fix waiting for animation
+        this.hoverOverWallet(index);
+        cy.get(
+            `${this.walletSelectorBeginPart}[data-testid$=":${index + 1}/add-label-button"]`,
+        ).click();
+    }
+
+    clickEditLabel(index: number) {
+        cy.wait(2000); // TODO fix waiting for animation
+        this.hoverOverWallet(index);
+        cy.get(
+            `${this.walletSelectorBeginPart}[data-testid$=":${index + 1}/edit-label-button"]`,
+        ).click();
+    }
+
+    typeLabel(label: string) {
+        cy.getTestElement('@metadata/input').as('metadataInput').clear();
+        cy.get('@metadataInput').type(label);
+        cy.get('@metadataInput').type('{enter}');
+    }
+
+    private hoverOverWallet(index: number) {
+        cy.get(
+            `${this.walletSelectorBeginPart}[data-testid$=":${index + 1}/hover-container"]`,
+        ).realHover();
+    }
+}
+
+export const onSwitchDeviceModal = new SwitchDevice();
diff --git a/packages/suite-web/e2e/support/pageObjects/wordInputObject.ts b/packages/suite-web/e2e/support/pageObjects/wordInputObject.ts
new file mode 100644
index 00000000000..7210dbf593a
--- /dev/null
+++ b/packages/suite-web/e2e/support/pageObjects/wordInputObject.ts
@@ -0,0 +1,10 @@
+/// <reference types="cypress" />
+
+class WordInputPage {
+    inputWord(word: string) {
+        cy.getTestElement('@word-input-select/input').type(word);
+        cy.getTestElement(`@word-input-select/option/${word}`).click();
+    }
+}
+
+export const onWordInputPage = new WordInputPage();
diff --git a/packages/suite-web/e2e/support/utils/shortcuts.ts b/packages/suite-web/e2e/support/utils/shortcuts.ts
index e35065afddc..7290d11599d 100644
--- a/packages/suite-web/e2e/support/utils/shortcuts.ts
+++ b/packages/suite-web/e2e/support/utils/shortcuts.ts
@@ -1,6 +1,9 @@
 import { SuiteAnalyticsEvent } from '@trezor/suite-analytics';
 import { urlSearchParams } from '@trezor/suite/src/utils/suite/metadata';
+import { SUITE as SuiteActions } from '@trezor/suite/src/actions/suite/constants';
+
 import { EventPayload, Requests } from '../types';
+import { onNavBar } from '../pageObjects/topBarObject';
 
 /**
  * Shortcut to click device menu
@@ -8,10 +11,9 @@ import { EventPayload, Requests } from '../types';
 export const toggleDeviceMenu = () => cy.getTestElement('@menu/switch-device').click();
 
 export const passThroughInitialRun = ({ viewOnly = true } = {}) => {
-    cy.getTestElement('@analytics/continue-button', { timeout: 30_000 })
-        .click()
-        .getTestElement('@onboarding/exit-app-button')
-        .click();
+    cy.disableFirmwareHashCheck();
+    cy.getTestElement('@analytics/continue-button', { timeout: 30_000 }).click();
+    cy.getTestElement('@onboarding/exit-app-button').click();
     if (viewOnly) {
         cy.getTestElement('@onboarding/viewOnly/enable').click();
     } else {
@@ -59,6 +61,7 @@ export const passThroughBackupShamir = (shares: number, threshold: number) => {
     cy.log('Create Shamir backup on device');
     cy.getTestElement('@backup/start-button').click();
     cy.getTestElement('@onboarding/confirm-on-device');
+    cy.wait(1000); // It seems that there is a race condition and the next task fails sometimes, because it hits the homescreen instead of the expected one
     cy.task('readAndConfirmShamirMnemonicEmu', { shares, threshold });
 
     cy.getTestElement('@backup/close-button').click();
@@ -83,7 +86,21 @@ export const passThroughSetPin = () => {
 
 export const enableDebugMode = () => {
     cy.window().then(window => {
-        window.store.dispatch({ type: '@suite/set-debug-mode', payload: { showDebugMenu: true } });
+        window.store.dispatch({
+            type: SuiteActions.SET_DEBUG_MODE,
+            payload: { showDebugMenu: true },
+        });
+    });
+};
+
+export const disableFirmwareHashCheck = () => {
+    // window.store may not be ready at this point, we need to wait for app to load
+    cy.getTestElement('@welcome-layout/body');
+    cy.window().then(window => {
+        window.store.dispatch({
+            type: SuiteActions.DEVICE_FIRMWARE_HASH_CHECK,
+            payload: { isDisabled: true },
+        });
     });
 };
 
@@ -95,7 +112,7 @@ export const toggleDebugModeInSettings = () => {
 };
 
 export const enableRegtestAndGetCoins = ({ payments = [] }) => {
-    cy.getTestElement('@suite/menu/settings').click();
+    onNavBar.openSettings();
     cy.getTestElement('@settings/menu/wallet').click();
 
     cy.toggleDebugModeInSettings();
@@ -195,3 +212,33 @@ export const changeViewOnlyState = (walletIndex: number, desiredState: 'enabled'
         }
     });
 };
+
+export const clearInput = (elementSelector: string) => {
+    cy.getTestElement(elementSelector).then(element => {
+        // get number of characters in the input
+        const charCount = element.attr('value')?.length ?? 0;
+        cy.getTestElement(elementSelector).type('{rightArrow}'.repeat(charCount));
+        for (let i = 0; i < charCount; i++) {
+            cy.getTestElement(elementSelector).type('{backspace}');
+        }
+    });
+};
+
+export const forceLightMode = {
+    onBeforeLoad(win: Window): void {
+        const matchMediaStub = cy.stub().callsFake(query => {
+            return {
+                matches: query === '(prefers-color-scheme: light)',
+                media: query,
+                onchange: null,
+                addListener: cy.stub(),
+                removeListener: cy.stub(),
+                addEventListener: cy.stub(),
+                removeEventListener: cy.stub(),
+                dispatchEvent: cy.stub(),
+            };
+        });
+
+        cy.stub(win, 'matchMedia').callsFake(matchMediaStub);
+    },
+};
diff --git a/packages/suite-web/e2e/tests/analytics/events.test.ts b/packages/suite-web/e2e/tests/analytics/events.test.ts
index 0f26d38eb69..e7d55f7c943 100644
--- a/packages/suite-web/e2e/tests/analytics/events.test.ts
+++ b/packages/suite-web/e2e/tests/analytics/events.test.ts
@@ -3,7 +3,10 @@
 // @retry=2
 
 import { EventType } from '@trezor/suite-analytics';
+
 import { ExtractByEventType, Requests } from '../../support/types';
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+import { forceLightMode } from '../../support/utils/shortcuts';
 
 let requests: Requests;
 
@@ -18,9 +21,10 @@ describe('Analytics Events', () => {
 
     it('reports transport-type, suite-ready and device-connect/device-disconnect events when analytics is initialized and enabled', () => {
         cy.prefixedVisit('/');
+        cy.disableFirmwareHashCheck();
 
         // go to settings and enable analytics (makes analytics enabled and initialized)
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@analytics/toggle-switch').click({ force: true });
         cy.getTestElement('@settings/menu/close').click();
 
@@ -84,7 +88,7 @@ describe('Analytics Events', () => {
         cy.wrap(requests).its(3).should('have.property', 'c_type', EventType.DeviceDisconnect);
     });
 
-    it.only('reports suite-ready after enabling analytics on app initial run', () => {
+    it('reports suite-ready after enabling analytics on app initial run', () => {
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu', {
             needs_backup: false,
@@ -93,10 +97,14 @@ describe('Analytics Events', () => {
 
         cy.interceptDataTrezorIo(requests);
 
-        cy.prefixedVisit('/');
+        cy.prefixedVisit('/', forceLightMode);
+        cy.disableFirmwareHashCheck();
+        // The next step is to press Settings Icon, and that can be done from DeviceCompromised modal as well as from a normal scren.
+        // But it can happen that Cypress tries to click it immediately, but fails, because the app is rerendering right now (modal is disappearing)
+        cy.wait(500);
 
         // change few settings to see if it is different from default values in suite-ready
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
 
         // change language
         cy.getTestElement('@settings/language-select/input').click();
@@ -221,5 +229,3 @@ describe('Analytics Events', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/analytics/toggle.test.ts b/packages/suite-web/e2e/tests/analytics/toggle.test.ts
index 8b782576386..12ffc12e00f 100644
--- a/packages/suite-web/e2e/tests/analytics/toggle.test.ts
+++ b/packages/suite-web/e2e/tests/analytics/toggle.test.ts
@@ -4,6 +4,8 @@
 import { EventType } from '@trezor/suite-analytics';
 import { urlSearchParams } from '@trezor/suite/src/utils/suite/metadata';
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 type Requests = ReturnType<typeof urlSearchParams>[];
 let requests: Requests;
 const instance = new RegExp(/^[A-Za-z0-9]{10,10}$/);
@@ -14,16 +16,16 @@ describe('Analytics Toggle - Enablement and Disablement', () => {
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu');
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
 
         requests = [];
-    });
-
-    it('should respect disabled analytics in onboarding with following enabling in settings', () => {
         cy.interceptDataTrezorIo(requests).as('data-fetch');
 
         cy.prefixedVisit('/');
+        cy.disableFirmwareHashCheck();
+    });
 
+    it('should respect disabled analytics in onboarding with following enabling in settings', () => {
         // pass through onboarding with disabled analytics
         cy.getTestElement('@analytics/toggle-switch').find('input').should('be.checked');
         cy.getTestElement('@analytics/toggle-switch').click({ force: true });
@@ -56,7 +58,7 @@ describe('Analytics Toggle - Enablement and Disablement', () => {
         cy.safeReload();
 
         // go to settings, analytics should not enabled and no additional analytics requests should be fired
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@analytics/toggle-switch').find('input').should('not.be.checked');
         cy.wrap(requests).should('have.length', 1);
 
@@ -114,10 +116,6 @@ describe('Analytics Toggle - Enablement and Disablement', () => {
     });
 
     it('should respect enabled analytics in onboarding with following disabling in settings', () => {
-        cy.interceptDataTrezorIo(requests).as('data-fetch');
-
-        cy.prefixedVisit('/');
-
         // pass through onboarding with enabled analytics
         cy.getTestElement('@analytics/toggle-switch').find('input').should('be.checked');
         cy.getTestElement('@analytics/continue-button').click();
@@ -136,7 +134,7 @@ describe('Analytics Toggle - Enablement and Disablement', () => {
         cy.getTestElement('@onboarding/exit-app-button').click();
 
         // go to settings, analytics should be enabled
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@analytics/toggle-switch').find('input').should('be.checked');
 
         // disable analytics
@@ -163,5 +161,3 @@ describe('Analytics Toggle - Enablement and Disablement', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/backup/t2t1-fail.test.ts b/packages/suite-web/e2e/tests/backup/t2t1-fail.test.ts
index 27aa4cb6df2..636ca378a06 100644
--- a/packages/suite-web/e2e/tests/backup/t2t1-fail.test.ts
+++ b/packages/suite-web/e2e/tests/backup/t2t1-fail.test.ts
@@ -1,4 +1,5 @@
 import { EventType } from '@trezor/suite-analytics';
+
 import { ExtractByEventType, Requests } from '../../support/types';
 
 // @group_device-management
@@ -11,7 +12,7 @@ describe('Backup fail', () => {
         cy.task('startEmu', { wipe: true, model: 'T2T1' });
         cy.task('setupEmu', { needs_backup: true });
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
 
@@ -52,5 +53,3 @@ describe('Backup fail', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/backup/t2t1-misc.test.ts b/packages/suite-web/e2e/tests/backup/t2t1-misc.test.ts
index 6acba3a63a9..23eb09ef164 100644
--- a/packages/suite-web/e2e/tests/backup/t2t1-misc.test.ts
+++ b/packages/suite-web/e2e/tests/backup/t2t1-misc.test.ts
@@ -7,9 +7,10 @@ describe('Backup misc', () => {
         cy.task('setupEmu', { needs_backup: true });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport(1920, 1080).resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
+        cy.discoveryShouldFinish();
     });
 
     it('Backup should reset if modal is closed', () => {
@@ -37,10 +38,13 @@ describe('Backup misc', () => {
         cy.getTestElement('@backup/check-item/has-enough-time').click();
         cy.task('stopEmu');
         cy.getTestElement('@backup/no-device', { timeout: 20000 });
-        cy.task('stopBridge');
+
+        cy.wait(2000);
+
         // latest (2.3.1 at the time of writing this) has default behavior needs_backup false
-        cy.task('startEmu', { wipe: true });
+        cy.task('startEmu', { wipe: true, model: 'T2T1' });
         cy.task('setupEmu');
+
         // noticed that it failed here times: 1
         cy.getTestElement('@backup/already-finished-message');
     });
@@ -64,5 +68,3 @@ describe('Backup misc', () => {
         cy.getTestElement('@backup/no-device');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/backup/t2t1-success.test.ts b/packages/suite-web/e2e/tests/backup/t2t1-success.test.ts
index db6ec80a92a..df63e5243e0 100644
--- a/packages/suite-web/e2e/tests/backup/t2t1-success.test.ts
+++ b/packages/suite-web/e2e/tests/backup/t2t1-success.test.ts
@@ -1,4 +1,5 @@
 import { EventType } from '@trezor/suite-analytics';
+
 import { ExtractByEventType, Requests } from '../../support/types';
 
 // @group_device-management
@@ -15,7 +16,7 @@ describe('Backup success', () => {
         });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
 
@@ -64,5 +65,3 @@ describe('Backup success', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/backup/t3t1-create-addtional-share.test.ts b/packages/suite-web/e2e/tests/backup/t3t1-create-addtional-share.test.ts
new file mode 100644
index 00000000000..f6af6ab9fb4
--- /dev/null
+++ b/packages/suite-web/e2e/tests/backup/t3t1-create-addtional-share.test.ts
@@ -0,0 +1,63 @@
+// @group_device-management
+// @retry=2
+
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+import { onSettingsMenu } from '../../support/pageObjects/settings/settingsMenuObject';
+import { onSettingsDevicePage } from '../../support/pageObjects/settings/settingsDeviceObject';
+import { onMultiShareBackupModal } from '../../support/pageObjects/multiShareBackupObject';
+
+const mnemonic =
+    'academic again academic academic academic academic academic academic academic academic academic academic academic academic academic academic academic pecan provide remember';
+describe('Backup success', () => {
+    beforeEach(() => {
+        cy.task('startEmu', { wipe: true, model: 'T3T1', version: '2.8.1' });
+        cy.task('setupEmu', {
+            needs_backup: false,
+            mnemonic,
+        });
+        cy.task('startBridge');
+
+        cy.viewport('macbook-15').resetDb();
+        cy.prefixedVisit('/');
+    });
+
+    it('Successful backup happy path', () => {
+        // Arrange
+        cy.getTestElement('@analytics/continue-button', { timeout: 40000 }).click();
+        cy.getTestElement('@onboarding/exit-app-button').click();
+        cy.passThroughAuthenticityCheck();
+        cy.getTestElement('@onboarding/viewOnly/enable').click();
+        cy.getTestElement('@viewOnlyTooltip/gotIt', { timeout: 15000 })
+            .should('be.visible')
+            .click();
+
+        // Act
+        // navigate to device settings page
+        onNavBar.openSettings();
+        onSettingsMenu.openDeviceSettings();
+        onSettingsDevicePage.openCreateMultiShareBackup();
+        onMultiShareBackupModal.createMultiShareBackup();
+
+        // [device screen] check your backup?
+        cy.task('swipeEmu', 'up');
+
+        // [device screen] select the number of words in your backup
+        cy.task('inputEmu', '20');
+
+        // [device screen] backup instructions
+        cy.task('swipeEmu', 'up');
+        for (const word of mnemonic.split(' ')) {
+            // [device screen] enter next word
+            cy.task('inputEmu', word);
+        }
+
+        // [device screen] create additional backup?
+        cy.wait(1000); // without this timeout, backup on device simply disappears, it stinks
+        cy.task('swipeEmu', 'up');
+
+        cy.task('readAndConfirmShamirMnemonicEmu', { shares: 3, threshold: 2 });
+
+        // Assert
+        onMultiShareBackupModal.finalizeMultiShareBackup();
+    });
+});
diff --git a/packages/suite-web/e2e/tests/browser/android.test.ts b/packages/suite-web/e2e/tests/browser/android.test.ts
index 0c04346b63f..d54cb510771 100644
--- a/packages/suite-web/e2e/tests/browser/android.test.ts
+++ b/packages/suite-web/e2e/tests/browser/android.test.ts
@@ -30,5 +30,3 @@ describe('Android with non-chrome browser', () => {
         cy.getTestElement('@welcome/title');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/browser/ios.test.ts b/packages/suite-web/e2e/tests/browser/ios.test.ts
index 429fb2ffc0d..2e359d77526 100644
--- a/packages/suite-web/e2e/tests/browser/ios.test.ts
+++ b/packages/suite-web/e2e/tests/browser/ios.test.ts
@@ -21,5 +21,3 @@ describe('iPhone with chrome browser ', () => {
         cy.get('html').should('not.contain.text', 'Continue at my own risk');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/browser/outdated-chrome.test.ts b/packages/suite-web/e2e/tests/browser/outdated-chrome.test.ts
index 5921ce1ed1d..ee6155bef5a 100644
--- a/packages/suite-web/e2e/tests/browser/outdated-chrome.test.ts
+++ b/packages/suite-web/e2e/tests/browser/outdated-chrome.test.ts
@@ -6,7 +6,7 @@
 
 describe('Windows 7 with outdated chrome ', () => {
     before(() => {
-        cy.viewport(1440, 2560);
+        cy.viewport('macbook-13');
         cy.resetDb();
     });
 
@@ -32,5 +32,3 @@ describe('Windows 7 with outdated chrome ', () => {
         cy.getTestElement('@welcome/title');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/browser/outdated-firefox.test.ts b/packages/suite-web/e2e/tests/browser/outdated-firefox.test.ts
index 9d66f956582..fb4bda3c1e5 100644
--- a/packages/suite-web/e2e/tests/browser/outdated-firefox.test.ts
+++ b/packages/suite-web/e2e/tests/browser/outdated-firefox.test.ts
@@ -6,7 +6,7 @@
 
 describe('Ubuntu with outdated firefox ', () => {
     before(() => {
-        cy.viewport(1440, 2560);
+        cy.viewport('macbook-13');
         cy.resetDb();
     });
 
@@ -32,5 +32,3 @@ describe('Ubuntu with outdated firefox ', () => {
         cy.getTestElement('@welcome/title');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/browser/safari.test.ts b/packages/suite-web/e2e/tests/browser/safari.test.ts
index 8ed93ac6249..731742ad48d 100644
--- a/packages/suite-web/e2e/tests/browser/safari.test.ts
+++ b/packages/suite-web/e2e/tests/browser/safari.test.ts
@@ -6,7 +6,7 @@
 
 describe('Safari on MacOS 14 ', () => {
     before(() => {
-        cy.viewport(1440, 2560);
+        cy.viewport('macbook-13');
         cy.resetDb();
     });
 
@@ -31,5 +31,3 @@ describe('Safari on MacOS 14 ', () => {
         cy.getTestElement('@welcome/title');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/coinmarket/buy.test.ts b/packages/suite-web/e2e/tests/coinmarket/buy.test.ts
index 61f5a9e8f2e..af03dc5ae2b 100644
--- a/packages/suite-web/e2e/tests/coinmarket/buy.test.ts
+++ b/packages/suite-web/e2e/tests/coinmarket/buy.test.ts
@@ -61,7 +61,6 @@ function setupAndAssertBuy(selectOffer: () => void) {
     cy.getTestElement('@coinmarket/detail/success').invoke('text').should('be.equal', 'Approved');
 
     // Goes back, then on the Last transactions page after verifies the transaction is listed
-    cy.getTestElement('@account-subpage/back').click();
     cy.getTestElement('@coinmarket/menu/wallet-coinmarket-transactions').click();
 
     // Verifies fiat amount
@@ -153,8 +152,8 @@ describe('Coinmarket buy', () => {
                         // Test provider
                         cy.wrap($el)
                             .find('[data-testid="@coinmarket/offers/quote/provider"]')
-                            .then($el => {
-                                const text = $el.text();
+                            .then($el2 => {
+                                const text = $el2.text();
 
                                 expect(exchangeProvider).to.include(text);
                             });
@@ -197,5 +196,3 @@ describe('Coinmarket buy', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/coinmarket/exchange.test.ts b/packages/suite-web/e2e/tests/coinmarket/exchange.test.ts
index 9fa15ecda01..97c1ab06e30 100644
--- a/packages/suite-web/e2e/tests/coinmarket/exchange.test.ts
+++ b/packages/suite-web/e2e/tests/coinmarket/exchange.test.ts
@@ -1,5 +1,7 @@
 // @group_coinmarket
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 describe.skip('Coinmarket exchange', () => {
     beforeEach(() => {
         cy.task('startEmu', { wipe: true });
@@ -25,7 +27,7 @@ describe.skip('Coinmarket exchange', () => {
         });
 
         // Enables ETH account
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
         cy.getTestElement('@settings/wallet/network/eth').click();
         // cy.getTestElement('@settings/menu/close').click();
@@ -73,7 +75,8 @@ describe.skip('Coinmarket exchange', () => {
 
         // Custom fee setup
         cy.getTestElement('select-bar/custom').click();
-        cy.getTestElement('feePerUnit').clear().type('1');
+        cy.getTestElement('feePerUnit').clear();
+        cy.getTestElement('feePerUnit').type('1');
         cy.getTestElement('@coinmarket/exchange/compare-button').click();
 
         // Verifies the offers displayed match the mock
@@ -201,5 +204,3 @@ describe.skip('Coinmarket exchange', () => {
         cy.getTestElement('@coinmarket/exchange/payment/back-to-account').click();
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/dashboard/assets.test.ts b/packages/suite-web/e2e/tests/dashboard/assets.test.ts
index 40a6a3b38d1..d3760702813 100644
--- a/packages/suite-web/e2e/tests/dashboard/assets.test.ts
+++ b/packages/suite-web/e2e/tests/dashboard/assets.test.ts
@@ -2,11 +2,13 @@
 // @retry=2
 
 import { EventType } from '@trezor/suite-analytics';
+
 import { ExtractByEventType, Requests } from '../../support/types';
+import { onNavBar } from '../../support/pageObjects/topBarObject';
 
 let requests: Requests;
 
-describe('Assets', () => {
+describe.skip('Assets', () => {
     beforeEach(() => {
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu', {
@@ -20,14 +22,14 @@ describe('Assets', () => {
         cy.interceptDataTrezorIo(requests);
     });
 
-    it.skip('checks that BTC and ETH accounts are available', () => {
+    it('checks that BTC and ETH accounts are available', () => {
         cy.prefixedVisit('/');
 
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
 
         // enable ethereum
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
         cy.getTestElement('@settings/wallet/network/eth').click();
         cy.getTestElement('@suite/menu/suite-index').click();
@@ -47,32 +49,30 @@ describe('Assets', () => {
         cy.findAnalyticsEventByType<ExtractByEventType<EventType.AccountsStatus>>(
             requests,
             EventType.AccountsStatus,
-        ).then(accountsStatusEvent => {
-            expect(parseInt(accountsStatusEvent.btc_normal.toString(), 10)).to.not.equal(NaN);
-            expect(parseInt(accountsStatusEvent.btc_taproot.toString(), 10)).to.not.equal(NaN);
-            expect(parseInt(accountsStatusEvent.btc_segwit.toString(), 10)).to.not.equal(NaN);
-            expect(parseInt(accountsStatusEvent.btc_legacy.toString(), 10)).to.not.equal(NaN);
+        ).then(() => {
+            // expect(parseInt(accountsStatusEvent.btc_normal.toString(), 10)).to.not.equal(NaN);
+            // expect(parseInt(accountsStatusEvent.btc_taproot.toString(), 10)).to.not.equal(NaN);
+            // expect(parseInt(accountsStatusEvent.btc_segwit.toString(), 10)).to.not.equal(NaN);
+            // expect(parseInt(accountsStatusEvent.btc_legacy.toString(), 10)).to.not.equal(NaN);
             // expect(parseInt(accountsStatusEvent.eth_normal.toString(), 10)).to.not.equal(NaN);
         });
 
-        cy.findAnalyticsEventByType<ExtractByEventType<EventType.AccountsNonZeroBalance>>(
-            requests,
-            EventType.AccountsNonZeroBalance,
-        ).then(accountsNonZeroBalanceEvent => {
-            // 0x73d0385F4d8E00C5e6504C6030F47BF6212736A8 has token and nobody will be able to move it without ETH
-            expect(parseInt(accountsNonZeroBalanceEvent.eth_normal.toString(), 10)).to.not.equal(
-                NaN,
-            );
-        });
+        // cy.findAnalyticsEventByType<ExtractByEventType<EventType.AccountsNonZeroBalance>>(
+        //     requests,
+        //     EventType.AccountsNonZeroBalance,
+        // ).then(accountsNonZeroBalanceEvent => {
+        //     // 0x73d0385F4d8E00C5e6504C6030F47BF6212736A8 has token and nobody will be able to move it without ETH
+        //     expect(parseInt(accountsNonZeroBalanceEvent.eth_normal.toString(), 10)).to.not.equal(
+        //         NaN,
+        //     );
+        // });
 
-        cy.findAnalyticsEventByType<ExtractByEventType<EventType.AccountsTokensStatus>>(
-            requests,
-            EventType.AccountsTokensStatus,
-        ).then(accountsTokensStatusEvent => {
-            // 0x73d0385F4d8E00C5e6504C6030F47BF6212736A8 has token and nobody will be able to move it without ETH
-            expect(parseInt(accountsTokensStatusEvent.eth.toString(), 10)).to.not.equal(NaN);
-        });
+        // cy.findAnalyticsEventByType<ExtractByEventType<EventType.AccountsTokensStatus>>(
+        //     requests,
+        //     EventType.AccountsTokensStatus,
+        // ).then(accountsTokensStatusEvent => {
+        //     // 0x73d0385F4d8E00C5e6504C6030F47BF6212736A8 has token and nobody will be able to move it without ETH
+        //     expect(parseInt(accountsTokensStatusEvent.eth.toString(), 10)).to.not.equal(NaN);
+        // });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/dashboard/dashboard.test.ts b/packages/suite-web/e2e/tests/dashboard/dashboard.test.ts
index e4653e26566..775b415f080 100644
--- a/packages/suite-web/e2e/tests/dashboard/dashboard.test.ts
+++ b/packages/suite-web/e2e/tests/dashboard/dashboard.test.ts
@@ -9,7 +9,7 @@ describe('Dashboard', () => {
         });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.interceptInvityApi();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
@@ -39,5 +39,3 @@ describe('Dashboard', () => {
     // QA todo: test for graph
     // QA todo: dashboard appearance for seed with tx history vs seed without tx history
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/dashboard/discreet-mode.test.ts b/packages/suite-web/e2e/tests/dashboard/discreet-mode.test.ts
index 59e93d949ce..7f88d021a3b 100644
--- a/packages/suite-web/e2e/tests/dashboard/discreet-mode.test.ts
+++ b/packages/suite-web/e2e/tests/dashboard/discreet-mode.test.ts
@@ -2,6 +2,7 @@
 // @retry=2
 
 import { EventType } from '@trezor/suite-analytics';
+
 import { ExtractByEventType, Requests } from '../../support/types';
 
 let requests: Requests;
@@ -12,7 +13,7 @@ describe('Dashboard', () => {
         cy.task('setupEmu');
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
 
@@ -51,5 +52,3 @@ describe('Dashboard', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/firmware/firmware.test.ts b/packages/suite-web/e2e/tests/firmware/firmware.test.ts
index b847811b9bd..59a686c33c2 100644
--- a/packages/suite-web/e2e/tests/firmware/firmware.test.ts
+++ b/packages/suite-web/e2e/tests/firmware/firmware.test.ts
@@ -4,7 +4,7 @@
 describe('Firmware', () => {
     beforeEach(() => {
         // use portrait mode monitor to prevent scrolling in settings
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
     });
 
     it(`Firmware 2.5.2 outdated notification banner should open firmware update modal`, () => {
@@ -13,10 +13,7 @@ describe('Firmware', () => {
         cy.task('startBridge');
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
-        cy.getTestElement('@suite-layout/body').matchImageSnapshot('outdated-notification-banner', {
-            clip: { x: 0, y: 0, height: 100, width: 1080 },
-        });
-        cy.getTestElement('@notification/update-firmware/button').click();
+        cy.getTestElement('@notification/update-notification-banner').click();
 
         // initial screen
         cy.getTestElement('@firmware/install-button').click();
@@ -62,5 +59,3 @@ describe('Firmware', () => {
         // );
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/metadata/account-metadata.test.ts b/packages/suite-web/e2e/tests/metadata/account-metadata.test.ts
index b68a08e2da8..b3277a4c9af 100644
--- a/packages/suite-web/e2e/tests/metadata/account-metadata.test.ts
+++ b/packages/suite-web/e2e/tests/metadata/account-metadata.test.ts
@@ -24,6 +24,7 @@ Hovering over fields that may be labeled shows "add label" button upon which is
             },
         });
 
+        cy.disableFirmwareHashCheck();
         cy.getTestElement('@analytics/continue-button');
         cy.task('startBridge');
 
@@ -71,24 +72,27 @@ Hovering over fields that may be labeled shows "add label" button upon which is
         cy.getTestElement("@metadata/accountLabel/m/84'/0'/0'/edit-label-button").click({
             force: true,
         });
-        cy.getTestElement('@metadata/input')
-            .clear()
-            .type('bcash is true bitcoin{esc}', { timeout: 20 });
+        cy.getTestElement('@metadata/input').clear();
+        cy.getTestElement('@metadata/input').type('bcash is true bitcoin{esc}', { timeout: 20 });
         cy.getTestElement('@account-menu/btc/normal/0/label').should('contain', 'even cooler');
 
         cy.log('Check that accounts search reflects also metadata');
-        cy.getTestElement('@account-menu/search-input').first().click().type('even cooler');
+        cy.getTestElement('@account-menu/search-input').first().as('searchInput').click();
+        cy.get('@searchInput').type('even cooler');
         cy.getTestElement('@account-menu/btc/normal/0').should('be.visible');
-        cy.getTestElement('@account-menu/search-input').click().type('something retarded');
+        cy.get('@searchInput').click();
+        cy.get('@searchInput').type('something retarded');
         cy.getTestElement('@account-menu/btc/normal/0').should('not.exist');
-        cy.getTestElement('@account-menu/search-input').click().clear();
+        cy.get('@searchInput').click();
+        cy.get('@searchInput').clear();
 
         cy.log('We can also remove metadata by clearing input');
         cy.wait(50);
         cy.getTestElement("@metadata/accountLabel/m/84'/0'/0'/edit-label-button").click({
             force: true,
         });
-        cy.getTestElement('@metadata/input').clear().type('{enter}');
+        cy.getTestElement('@metadata/input').clear();
+        cy.getTestElement('@metadata/input').type('{enter}');
 
         cy.getTestElement('@account-menu/btc/normal/0/label').should('contain', 'Bitcoin');
 
@@ -121,5 +125,3 @@ Hovering over fields that may be labeled shows "add label" button upon which is
         );
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/metadata/address-metadata.test.ts b/packages/suite-web/e2e/tests/metadata/address-metadata.test.ts
index 1ccd42a6aa2..7a131280d84 100644
--- a/packages/suite-web/e2e/tests/metadata/address-metadata.test.ts
+++ b/packages/suite-web/e2e/tests/metadata/address-metadata.test.ts
@@ -9,7 +9,7 @@ const metadataEl = '@metadata/addressLabel/bc1q7e6qu5smalrpgqrx9k2gnf0hgjyref5p3
 
 describe('Metadata - address labeling', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
     });
 
     it(provider, () => {
@@ -40,5 +40,3 @@ describe('Metadata - address labeling', () => {
         cy.getTestElement('@metadata/input').type(' meoew meow{enter}');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/metadata/dropbox-api-errors.test.ts b/packages/suite-web/e2e/tests/metadata/dropbox-api-errors.test.ts
index bce207b28b6..9f5a33a12a4 100644
--- a/packages/suite-web/e2e/tests/metadata/dropbox-api-errors.test.ts
+++ b/packages/suite-web/e2e/tests/metadata/dropbox-api-errors.test.ts
@@ -2,10 +2,11 @@
 // @retry=2
 
 import { rerouteMetadataToMockProvider, stubOpen } from '../../stubs/metadata';
+import { onNavBar } from '../../support/pageObjects/topBarObject';
 
 describe('Dropbox api errors', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
     });
 
     it('Malformed token', () => {
@@ -35,7 +36,7 @@ describe('Dropbox api errors', () => {
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
 
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/metadata-switch').click({ force: true });
 
         cy.passThroughInitMetadata('dropbox');
@@ -95,7 +96,7 @@ describe('Dropbox api errors', () => {
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
 
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/metadata-switch').click({ force: true });
 
         cy.passThroughInitMetadata('dropbox');
@@ -170,7 +171,7 @@ describe('Dropbox api errors', () => {
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
 
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/metadata-switch').click({ force: true });
 
         cy.passThroughInitMetadata('dropbox');
@@ -188,5 +189,3 @@ describe('Dropbox api errors', () => {
 
     // todo: add more possible errors
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/metadata/google-api-errors.test.ts b/packages/suite-web/e2e/tests/metadata/google-api-errors.test.ts
index e2ea12813d9..0915bff107d 100644
--- a/packages/suite-web/e2e/tests/metadata/google-api-errors.test.ts
+++ b/packages/suite-web/e2e/tests/metadata/google-api-errors.test.ts
@@ -7,7 +7,7 @@ const provider = 'google';
 
 describe('Google api errors', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu', { mnemonic: 'mnemonic_all' });
         cy.task('startBridge');
@@ -67,5 +67,3 @@ describe('Google api errors', () => {
     // todo: add more possible errors
     // https://developers.google.com/drive/api/v3/handle-errors
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/metadata/interval-fetching.test.ts b/packages/suite-web/e2e/tests/metadata/interval-fetching.test.ts
index e1092c21cd2..ab2bed01130 100644
--- a/packages/suite-web/e2e/tests/metadata/interval-fetching.test.ts
+++ b/packages/suite-web/e2e/tests/metadata/interval-fetching.test.ts
@@ -22,7 +22,7 @@ const fixtures = [
 
 describe('Metadata - suite is watching cloud provider and syncs periodically', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
     });
     fixtures.forEach(f => {
         it(`${f.provider}-${f.desc}`, () => {
@@ -50,11 +50,10 @@ describe('Metadata - suite is watching cloud provider and syncs periodically', (
                     cy.stub(win, 'fetch').callsFake(rerouteMetadataToMockProvider);
                 },
             });
+            cy.disableFirmwareHashCheck();
             cy.tick(1000);
-            cy.getTestElement('@analytics/continue-button', { timeout: 30_000 })
-                .click()
-                .getTestElement('@onboarding/exit-app-button')
-                .click();
+            cy.getTestElement('@analytics/continue-button', { timeout: 30_000 }).click();
+            cy.getTestElement('@onboarding/exit-app-button').click();
             cy.getTestElement('@onboarding/viewOnly/enable').click();
             cy.log(
                 'Wait for discovery to finish. There is "add label" button, but no actual metadata appeared',
@@ -91,5 +90,3 @@ describe('Metadata - suite is watching cloud provider and syncs periodically', (
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/metadata/metadata-lifecycle.test.ts b/packages/suite-web/e2e/tests/metadata/metadata-lifecycle.test.ts
index c89c41c48cb..d66a202611e 100644
--- a/packages/suite-web/e2e/tests/metadata/metadata-lifecycle.test.ts
+++ b/packages/suite-web/e2e/tests/metadata/metadata-lifecycle.test.ts
@@ -1,6 +1,8 @@
 // @group_metadata
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 describe('Metadata - cancel metadata on device', () => {
     beforeEach(() => {
         cy.viewport('macbook-15').resetDb();
@@ -20,7 +22,7 @@ describe('Metadata - cancel metadata on device', () => {
         cy.prefixedVisit('/');
         cy.passThroughInitialRun({ viewOnly: false });
         cy.discoveryShouldFinish();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/metadata-switch').within(() => {
             cy.get('input').should('not.be.checked');
         });
@@ -108,5 +110,3 @@ describe('Metadata - cancel metadata on device', () => {
         cy.task('pressNo');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/metadata/output-labeling.test.ts b/packages/suite-web/e2e/tests/metadata/output-labeling.test.ts
index 26f0287018d..c1b6f5077b5 100644
--- a/packages/suite-web/e2e/tests/metadata/output-labeling.test.ts
+++ b/packages/suite-web/e2e/tests/metadata/output-labeling.test.ts
@@ -8,7 +8,7 @@ const providers = ['google'] as const;
 
 describe('Metadata - Output labeling', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.task('rmDir', { dir: Cypress.config('downloadsFolder'), recursive: true, force: true });
     });
 
@@ -74,14 +74,16 @@ describe('Metadata - Output labeling', () => {
 
             // test that buttons work as well - submit button
             cy.getTestElement(`${sentToMyselfEl}/dropdown/edit-label`).click({ force: true });
-            cy.getTestElement('@metadata/input').clear().type('submitted by button');
+            cy.getTestElement('@metadata/input').clear();
+            cy.getTestElement('@metadata/input').type('submitted by button');
             cy.getTestElement('@metadata/submit').click({ force: true });
             cy.getTestElement(`${sentToMyselfEl}`).should('contain', 'submitted by button');
 
             // test that buttons work as well - cancel button
             cy.getTestElement(`${sentToMyselfEl}`).click({ force: true });
             cy.getTestElement(`${sentToMyselfEl}/dropdown/edit-label`).click({ force: true });
-            cy.getTestElement('@metadata/input').clear().type('write something that wont be saved');
+            cy.getTestElement('@metadata/input').clear();
+            cy.getTestElement('@metadata/input').type('write something that wont be saved');
             cy.getTestElement('@metadata/cancel').click({ force: true });
             cy.getTestElement(`${sentToMyselfEl}`).should('contain', 'submitted by button');
 
@@ -109,5 +111,3 @@ describe('Metadata - Output labeling', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/metadata/remembered-device.test.ts b/packages/suite-web/e2e/tests/metadata/remembered-device.test.ts
index 7ede4d1deb6..1b5599e78ff 100644
--- a/packages/suite-web/e2e/tests/metadata/remembered-device.test.ts
+++ b/packages/suite-web/e2e/tests/metadata/remembered-device.test.ts
@@ -2,6 +2,7 @@
 // @retry=2
 
 import { rerouteMetadataToMockProvider, stubOpen } from '../../stubs/metadata';
+import { onNavBar } from '../../support/pageObjects/topBarObject';
 
 const providers = [
     {
@@ -22,12 +23,11 @@ describe(
     () => {
         beforeEach(() => {
             // use portrait mode monitor to prevent scrolling in settings
-            cy.viewport(1440, 2560).resetDb();
+            cy.viewport('macbook-13').resetDb();
         });
 
-        //TODO: this test case will require substantial refactoring as the "remember wallet" has been changed with the view-only mode
         providers.forEach(f => {
-            it.skip(f.provider, () => {
+            it(f.provider, () => {
                 // prepare test
                 cy.task('stopBridge');
                 cy.task('startEmu', { wipe: true });
@@ -63,7 +63,7 @@ describe(
                 cy.getTestElement('@account-menu/btc/normal/0/label').should('contain', 'Bitcoin');
 
                 cy.log('Go to settings and enable metadata');
-                cy.getTestElement('@suite/menu/settings').click();
+                onNavBar.openSettings();
                 cy.getTestElement('@settings/metadata-switch').click({ force: true });
                 cy.passThroughInitMetadata(f.provider);
 
@@ -80,7 +80,7 @@ describe(
                 cy.log(
                     "Now go back to settings, disconnect provider and check that we don't see metadata in app",
                 );
-                cy.getTestElement('@suite/menu/settings').click();
+                onNavBar.openSettings();
                 cy.getTestElement('@settings/metadata/disconnect-provider-button').click();
                 cy.getTestElement('@settings/metadata/connect-provider-button');
                 cy.getTestElement('@account-menu/btc/normal/0').click();
@@ -102,7 +102,7 @@ describe(
                 );
 
                 // device not saved, disable metadata
-                cy.getTestElement('@suite/menu/settings').click();
+                onNavBar.openSettings();
                 cy.getTestElement('@settings/metadata-switch').click({ force: true });
                 cy.getTestElement('@account-menu/btc/normal/0').click();
                 cy.getTestElement('@account-menu/btc/normal/0/label').should(
@@ -120,18 +120,17 @@ describe(
 
                 // device saved, disconnect provider
                 cy.getTestElement('@menu/switch-device').click();
-                cy.getTestElement('@switch-device/wallet-on-index/0/toggle-remember-switch').click({
-                    force: true,
-                });
                 cy.getTestElement('@switch-device/wallet-on-index/0').click();
                 cy.task('stopEmu');
 
                 cy.log('Device is saved, when disconnected, user still can edit labels');
-                cy.getTestElement("@metadata/accountLabel/m/84'/0'/0'/edit-label-button").click();
+                cy.getTestElement("@metadata/accountLabel/m/84'/0'/0'/edit-label-button").click({
+                    force: true,
+                });
                 cy.getTestElement('@metadata/input').type(' edited for remembered{enter}');
 
                 cy.log('Now again, lets try disconnecting provider');
-                cy.getTestElement('@suite/menu/settings').click();
+                onNavBar.openSettings();
                 cy.getTestElement('@settings/metadata/disconnect-provider-button').click();
                 cy.getTestElement('@account-menu/btc/normal/0').click();
                 cy.log('Disconnecting removes labels');
@@ -149,7 +148,7 @@ describe(
                 cy.getTestElement('@metadata/input').type('mnau{enter}');
 
                 //  device saved, disable metadata
-                cy.getTestElement('@suite/menu/settings').click();
+                onNavBar.openSettings();
                 cy.getTestElement('@settings/metadata-switch').click({ force: true });
                 cy.getTestElement('@account-menu/btc/normal/0').click();
                 cy.log(
@@ -162,5 +161,3 @@ describe(
         });
     },
 );
-
-export {};
diff --git a/packages/suite-web/e2e/tests/metadata/switching-providers.test.ts b/packages/suite-web/e2e/tests/metadata/switching-providers.test.ts
index 8e939d77faf..182038b5bea 100644
--- a/packages/suite-web/e2e/tests/metadata/switching-providers.test.ts
+++ b/packages/suite-web/e2e/tests/metadata/switching-providers.test.ts
@@ -2,11 +2,12 @@
 // @retry=2
 
 import { rerouteMetadataToMockProvider, stubOpen } from '../../stubs/metadata';
+import { onNavBar } from '../../support/pageObjects/topBarObject';
 
 describe(`Metadata - switching between cloud providers`, () => {
     beforeEach(() => {
         // use portrait mode monitor to prevent scrolling in settings
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
     });
 
     it('Start with one and switch to another', () => {
@@ -37,7 +38,7 @@ describe(`Metadata - switching between cloud providers`, () => {
         cy.getTestElement('@metadata/input').type('dropbox label {enter}');
         cy.getTestElement('@account-menu/btc/normal/0/label').should('contain', 'dropbox label');
 
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/metadata/disconnect-provider-button').click();
         cy.getTestElement('@settings/metadata/connect-provider-button').should('be.visible');
 
@@ -58,5 +59,3 @@ describe(`Metadata - switching between cloud providers`, () => {
         cy.getTestElement('@account-menu/btc/normal/0/label').should('contain', 'google label');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/metadata/wallet-metadata.test.ts b/packages/suite-web/e2e/tests/metadata/wallet-metadata.test.ts
index a991c3ee3f3..76210114956 100644
--- a/packages/suite-web/e2e/tests/metadata/wallet-metadata.test.ts
+++ b/packages/suite-web/e2e/tests/metadata/wallet-metadata.test.ts
@@ -2,153 +2,152 @@
 // @retry=2
 
 import { rerouteMetadataToMockProvider, stubOpen } from '../../stubs/metadata';
+import { MetadataProvider } from '../../support/enums/metadataProvider';
+import { onAccountsPage } from '../../support/pageObjects/accountsObject';
+import { onMenu } from '../../support/pageObjects/menuObject';
+import { onSwitchDeviceModal } from '../../support/pageObjects/switchDeviceObject';
 
 const firmwares = ['2.3.0', '2-main'] as const;
-const provider = 'dropbox';
-
-// state corresponding to all seed
-const standardWalletState = 'mvbu1Gdy8SUjTenqerxUaZyYjmveZvt33q@355C817510C0EABF2F147145:1';
-// state corresponding to "wallet for drugs"
-const firstHiddenWalletState = 'myBrmyzvN5Wa4oeYrL7t8EYU1Ch5Q6vp47@355C817510C0EABF2F147145:2';
-// state corresponding to "C"
-const secondHiddenWalletState = 'mkx2Uqi3fmLHh8AHpQvAErTM3MZpzrmFr2@355C817510C0EABF2F147145:3';
-describe.skip('Metadata - wallet labeling', () => {
+
+const standardWalletIndex = 0;
+const hiddenWalletIndex = 1;
+
+function openApp(): void {
+    cy.prefixedVisit('/', {
+        onBeforeLoad: (win: Window) => {
+            cy.stub(win, 'open').callsFake(stubOpen(win));
+            cy.stub(win, 'fetch').callsFake(rerouteMetadataToMockProvider);
+        },
+    });
+}
+
+function handleLabelingOnDevice(action: 'pressYes' | 'pressNo'): void {
+    cy.getConfirmActionOnDeviceModal();
+    cy.wait(501);
+    cy.task(action);
+}
+
+function checkStateNotificationsForErrors(): void {
+    cy.window()
+        .its('store')
+        .invoke('getState')
+        .then(state => {
+            console.log(state);
+            const errors = state.notifications.filter((n: { type: string }) => n.type === 'error');
+
+            return expect(errors).to.be.empty;
+        });
+}
+
+describe('Metadata - wallet labeling', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
+        cy.task('startEmu', { wipe: true });
+        cy.task('setupEmu', {
+            mnemonic: 'mnemonic_all',
+            passphrase_protection: true,
+        });
+        cy.task('startBridge');
+        cy.task('metadataStartProvider', MetadataProvider.Dropbox);
+
+        openApp();
+
+        cy.passThroughInitialRun();
+        cy.discoveryShouldFinish();
     });
 
     firmwares.forEach(firmware => {
-        it(firmware, () => {
-            // prepare test
-            cy.task('startEmu', { wipe: true });
-            cy.task('setupEmu', {
-                mnemonic: 'mnemonic_all',
-                passphrase_protection: true,
-            });
-            cy.task('startBridge');
-            cy.task('metadataStartProvider', provider);
-
-            cy.prefixedVisit('/', {
-                onBeforeLoad: (win: Window) => {
-                    cy.stub(win, 'open').callsFake(stubOpen(win));
-                    cy.stub(win, 'fetch').callsFake(rerouteMetadataToMockProvider);
-                },
-            });
+        describe(firmware, () => {
+            it('persists wallet labels', () => {
+                cy.step('Setup standard wallet with label and edit it', () => {
+                    onAccountsPage.openBtcAccount(1);
+                    onMenu.openSwitchDevice();
+
+                    onSwitchDeviceModal.clickAddLabel(standardWalletIndex);
+                    cy.passThroughInitMetadata(MetadataProvider.Dropbox);
+                    onSwitchDeviceModal.typeLabel('label for standard wallet');
+
+                    onSwitchDeviceModal.clickEditLabel(standardWalletIndex);
+                    onSwitchDeviceModal.typeLabel('wallet for drugs');
+                });
 
-            cy.passThroughInitialRun();
-            cy.discoveryShouldFinish();
+                cy.step('Add hidden wallet and enable labeling', () => {
+                    cy.addHiddenWallet('abc');
+                    onMenu.openSwitchDevice();
+                    handleLabelingOnDevice('pressYes');
+                    onSwitchDeviceModal.clickAddLabel(hiddenWalletIndex);
+                    onSwitchDeviceModal.typeLabel('wallet not for drugs');
+                });
 
-            cy.getTestElement('@account-menu/btc/normal/0').click();
+                cy.step('Verify wallet labels', () => {
+                    onSwitchDeviceModal
+                        .getLabel(standardWalletIndex)
+                        .should('contain', 'wallet for drugs');
 
-            cy.getTestElement('@menu/switch-device').click();
-            cy.getTestElement(
-                `@metadata/walletLabel/${standardWalletState}/add-label-button`,
-            ).click({
-                force: true,
-            });
-            cy.passThroughInitMetadata(provider);
-            cy.getTestElement('@metadata/input').type('label for standard wallet{enter}');
-
-            cy.wait(2001);
-            cy.getTestElement(
-                `@metadata/walletLabel/${standardWalletState}/edit-label-button`,
-            ).click({
-                force: true,
-            });
-            cy.getTestElement('@metadata/input').clear().type('wallet for drugs{enter}');
-
-            cy.addHiddenWallet('abc');
-
-            cy.log(
-                'discovering new passphrase -> new deviceState -> we need new metadata master key',
-            );
-            // cy.getConfirmActionOnDeviceModal();
-            // cy.task('pressYes');
-            // cy.getConfirmActionOnDeviceModal();
-            // cy.wait(501);
-            // cy.task('pressYes');
-            cy.getTestElement('@menu/switch-device').click();
-            // cy.getConfirmActionOnDeviceModal();
-
-            cy.wait(501);
-            cy.task('pressYes');
-            cy.getTestElement(`@metadata/walletLabel/${standardWalletState}`).should(
-                'contain',
-                'wallet for drugs',
-            );
-
-            // focus lock? :(
-            cy.getTestElement(
-                `@metadata/walletLabel/${firstHiddenWalletState}/add-label-button`,
-            ).click({
-                force: true,
-            });
-            cy.getTestElement('@metadata/input').type('wallet not for drugs{enter}');
-            cy.getTestElement(`@metadata/walletLabel/${firstHiddenWalletState}`).should(
-                'contain',
-                'wallet not for drugs',
-            );
-
-            // remember wallet, reload app, and observe that labels were loaded
-            // https://github.com/trezor/trezor-suite/pull/9560
-            // cy.getTestElement('@switch-device/wallet-on-index/1/toggle-remember-switch').click({
-            //     force: true,
-            // });
-            cy.changeViewOnlyState(1, 'enabled');
-
-            cy.wait(1000); // wait for changes to db
-            cy.prefixedVisit('/', {
-                onBeforeLoad: (win: Window) => {
-                    cy.stub(win, 'open').callsFake(stubOpen(win));
-                    cy.stub(win, 'fetch').callsFake(rerouteMetadataToMockProvider);
-                },
+                    onSwitchDeviceModal
+                        .getLabel(hiddenWalletIndex)
+                        .should('contain', 'wallet not for drugs');
+                });
+
+                cy.step('Remember wallet and reload app,', () => {
+                    cy.changeViewOnlyState(1, 'enabled');
+
+                    cy.wait(1000); // wait for changes to db
+                    openApp();
+                });
+
+                cy.step('Verify wallet labels after reload', () => {
+                    onMenu.openSwitchDevice();
+                    onSwitchDeviceModal
+                        .getLabel(standardWalletIndex)
+                        .should('contain', 'wallet for drugs');
+
+                    onSwitchDeviceModal
+                        .getLabel(hiddenWalletIndex)
+                        .should('contain', 'wallet not for drugs');
+                });
+
+                checkStateNotificationsForErrors();
             });
-            cy.getTestElement('@menu/switch-device').click();
-            cy.getTestElement(`@metadata/walletLabel/${standardWalletState}`).should(
-                'contain',
-                'wallet for drugs',
-            );
-            cy.getTestElement(`@metadata/walletLabel/${firstHiddenWalletState}`).should(
-                'contain',
-                'wallet not for drugs',
-            );
-
-            // add another passphrase wallet C, have selected passphrase wallet A, try to enable
-            // labeling for wallet C
-            cy.addHiddenWallet('C');
-            cy.getConfirmActionOnDeviceModal();
-            cy.task('pressYes');
-            cy.getConfirmActionOnDeviceModal();
-            cy.task('pressYes');
-            cy.getTestElement('@menu/switch-device').click();
-            cy.getConfirmActionOnDeviceModal();
-            cy.task('pressNo'); // labeling was not enabled at this moment
-            // select previous wallet
-            cy.getTestElement('@switch-device/wallet-on-index/1').click();
-            cy.getTestElement('@menu/switch-device').click();
-            cy.hoverTestElement(`@metadata/walletLabel/${secondHiddenWalletState}/hover-container`);
-            cy.getTestElement(
-                `@metadata/walletLabel/${secondHiddenWalletState}/add-label-button`,
-            ).click();
-            cy.getConfirmActionOnDeviceModal();
-            cy.task('pressYes'); // only now labeling was enabled
-            cy.getTestElement('@metadata/input').type(
-                'still works, metadata enabled for currently not selected device{enter}',
-            );
-
-            cy.window()
-                .its('store')
-                .invoke('getState')
-                .then(state => {
-                    console.log(state);
-                    const errors = state.notifications.filter(
-                        (n: { type: string }) => n.type === 'error',
+
+            it('labels can be enabled and edited when different wallet is open', () => {
+                cy.step('Setup standard wallet with label and edit it', () => {
+                    onAccountsPage.openBtcAccount(1);
+                    onMenu.openSwitchDevice();
+
+                    onSwitchDeviceModal.clickAddLabel(standardWalletIndex);
+                    cy.passThroughInitMetadata(MetadataProvider.Dropbox);
+                    onSwitchDeviceModal.typeLabel('label for standard wallet');
+                });
+
+                cy.step('Add passphrase wallet C and switch back to first wallet', () => {
+                    cy.addHiddenWallet('C');
+                    onMenu.openSwitchDevice();
+                    handleLabelingOnDevice('pressNo');
+                    onSwitchDeviceModal.openDevice(standardWalletIndex);
+                });
+
+                cy.step('Enable labeling for wallet C', () => {
+                    onMenu.openSwitchDevice();
+                    onSwitchDeviceModal.clickAddLabel(hiddenWalletIndex);
+
+                    handleLabelingOnDevice('pressYes');
+                    onSwitchDeviceModal.typeLabel(
+                        'still works, metadata enabled for currently not selected device',
                     );
+                });
 
-                    return expect(errors).to.be.empty;
+                cy.step('Verify wallet label', () => {
+                    onSwitchDeviceModal
+                        .getLabel(hiddenWalletIndex)
+                        .should(
+                            'contain',
+                            'still works, metadata enabled for currently not selected device',
+                        );
                 });
+
+                checkStateNotificationsForErrors();
+            });
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/onboarding/analytics-consent.test.ts b/packages/suite-web/e2e/tests/onboarding/analytics-consent.test.ts
index 9148fb25de8..4799d927cbe 100644
--- a/packages/suite-web/e2e/tests/onboarding/analytics-consent.test.ts
+++ b/packages/suite-web/e2e/tests/onboarding/analytics-consent.test.ts
@@ -10,7 +10,7 @@ const acceptAnalyticsConsentOnInitializedDevice = () => {
 describe('Onboarding - analytics consent', () => {
     beforeEach(() => {
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
     });
 
     it('analytics consent appears on any route that is visited initially. this time /accounts', () => {
@@ -19,6 +19,7 @@ describe('Onboarding - analytics consent', () => {
             needs_backup: false,
         });
         cy.prefixedVisit('/accounts');
+        cy.disableFirmwareHashCheck();
 
         acceptAnalyticsConsentOnInitializedDevice();
 
@@ -28,5 +29,3 @@ describe('Onboarding - analytics consent', () => {
         cy.getTestElement('@wallet/menu/wallet-send');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/onboarding/firmware-update.test.ts b/packages/suite-web/e2e/tests/onboarding/firmware-update.test.ts
index ec729c47869..ffd4d2054ca 100644
--- a/packages/suite-web/e2e/tests/onboarding/firmware-update.test.ts
+++ b/packages/suite-web/e2e/tests/onboarding/firmware-update.test.ts
@@ -63,7 +63,7 @@ describe.skip('fw update from empty device bootloader 2.0.3 to firmware 2.5.1',
         cy.prefixedVisit('/');
     });
 
-    it.skip('firmware update error', () => {
+    it('firmware update error', () => {
         cy.getTestElement('@analytics/continue-button').click();
 
         // hook into redux actions to bypass firmware hash check
@@ -100,5 +100,3 @@ describe.skip('fw update from empty device bootloader 2.0.3 to firmware 2.5.1',
         }).click();
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/onboarding/t1b1-recovery-basic.test.ts b/packages/suite-web/e2e/tests/onboarding/t1b1-recovery-basic.test.ts
deleted file mode 100644
index b47b095d54c..00000000000
--- a/packages/suite-web/e2e/tests/onboarding/t1b1-recovery-basic.test.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// @group_device-management
-// @retry=2
-
-// todo: this started to fail mysteriously after merging new base image. Skipping it for now and will investigate.
-describe.skip('Onboarding - recover wallet T1B1', () => {
-    before(() => {
-        cy.task('startEmu', { model: 'T1B1', version: '1-latest', wipe: true });
-        cy.task('startBridge');
-
-        cy.viewport(1440, 2560).resetDb();
-        cy.prefixedVisit('/');
-        cy.task('startEmu', { wipe: true });
-        cy.getTestElement('@analytics/continue-button').click();
-        cy.getTestElement('@analytics/continue-button').click();
-        cy.onboardingShouldLoad();
-        // common steps - navigation through onboarding
-        cy.getTestElement('@onboarding/begin-button').click();
-        cy.getTestElement('@onboarding/path-recovery-button').click();
-        cy.getTestElement('@onboarding/path-used-button').click();
-        cy.getTestElement('@onboarding/pair-device-step').click();
-    });
-
-    it('Incomplete run of basic recovery', () => {
-        cy.getTestElement('@onboarding/button-continue').click();
-        cy.getTestElement('@firmware/continue-button').click();
-        cy.getTestElement('@recover/select-count/24').click();
-        cy.getTestElement('@recover/select-type/basic').click();
-
-        // trezord error, try wait
-        cy.wait(2000);
-        cy.task('pressYes');
-
-        cy.getTestElement('@word-input-select/input').type('all');
-        cy.getTestElement('@word-input-select/option/all').click();
-
-        for (let i = 0; i < 23; i++) {
-            cy.getTestElement('@word-input-select/input').type('all{enter}');
-        }
-
-        cy.getTestElement('@onboarding/recovery/continue-button').click();
-        cy.getTestElement('@onboarding/skip-button').click();
-        cy.getTestElement('@onboarding/final');
-    });
-});
-
-export {};
diff --git a/packages/suite-web/e2e/tests/onboarding/t1b1-create-wallet.test.ts b/packages/suite-web/e2e/tests/onboarding/t1b1/t1b1-create-wallet.test.ts
similarity index 93%
rename from packages/suite-web/e2e/tests/onboarding/t1b1-create-wallet.test.ts
rename to packages/suite-web/e2e/tests/onboarding/t1b1/t1b1-create-wallet.test.ts
index d9ca51ba5c3..0b8a097f911 100644
--- a/packages/suite-web/e2e/tests/onboarding/t1b1-create-wallet.test.ts
+++ b/packages/suite-web/e2e/tests/onboarding/t1b1/t1b1-create-wallet.test.ts
@@ -3,21 +3,22 @@
 
 describe('Onboarding - create wallet', () => {
     beforeEach(() => {
+        cy.task('startEmu', { model: 'T1B1', version: '1-latest', wipe: true });
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport(1920, 1080).resetDb();
         cy.prefixedVisit('/');
+        cy.disableFirmwareHashCheck();
     });
 
     // todo: skipping for it is too flaky..
     // after calling "resetDevice" we almost always receive "device disconnected during action" which is error sent by bridge.
-    it.skip('Success (basic)', () => {
-        cy.task('startEmu', { model: 'T1B1', version: '1-latest', wipe: true });
+    it('Success (basic)', () => {
         cy.getTestElement('@analytics/continue-button').click();
         cy.getTestElement('@analytics/continue-button').click();
         cy.getTestElement('@firmware/continue-button').click();
 
         cy.getTestElement('@onboarding/path-create-button').click();
-        cy.getTestElement('@onboarding/only-backup-option-button').click();
+        // cy.getTestElement('@onboarding/only-backup-option-button').click();
         cy.getTestElement('@onboarding/confirm-on-device').should('be.visible');
         cy.task('pressYes');
 
@@ -68,5 +69,3 @@ describe('Onboarding - create wallet', () => {
         cy.getTestElement('@pin/input/1');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/onboarding/t1b1-recovery-advanced.test.ts b/packages/suite-web/e2e/tests/onboarding/t1b1/t1b1-recovery-advanced.test.ts
similarity index 95%
rename from packages/suite-web/e2e/tests/onboarding/t1b1-recovery-advanced.test.ts
rename to packages/suite-web/e2e/tests/onboarding/t1b1/t1b1-recovery-advanced.test.ts
index fd259a4f132..626dc4c3d5a 100644
--- a/packages/suite-web/e2e/tests/onboarding/t1b1-recovery-advanced.test.ts
+++ b/packages/suite-web/e2e/tests/onboarding/t1b1/t1b1-recovery-advanced.test.ts
@@ -6,8 +6,9 @@ describe('Onboarding - recover wallet T1B1', () => {
         cy.task('startEmu', { model: 'T1B1', version: '1-latest', wipe: true });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
+        cy.disableFirmwareHashCheck();
     });
 
     it('Incomplete run of advanced recovery', () => {
@@ -46,5 +47,3 @@ describe('Onboarding - recover wallet T1B1', () => {
         // todo: finish reading from device. needs support in trezor-user-env
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/onboarding/t1b1/t1b1-recovery-fail.test.ts b/packages/suite-web/e2e/tests/onboarding/t1b1/t1b1-recovery-fail.test.ts
new file mode 100644
index 00000000000..3179cacbeb6
--- /dev/null
+++ b/packages/suite-web/e2e/tests/onboarding/t1b1/t1b1-recovery-fail.test.ts
@@ -0,0 +1,49 @@
+// @group_device-management
+// @retry=2
+
+import { onOnboardingPage } from '../../../support/pageObjects/onboardingObject';
+import { onAnalyticsPage } from '../../../support/pageObjects/analyticsObject';
+import { onRecoverPage } from '../../../support/pageObjects/recoverObject';
+import { onConnectDevicePrompt } from '../../../support/pageObjects/connectDeviceObject';
+
+describe('Onboarding - recover wallet T1B1', () => {
+    beforeEach(() => {
+        cy.task('startBridge');
+        cy.task('startEmu', { model: 'T1B1', version: '1-latest', wipe: true });
+        cy.viewport('macbook-13').resetDb();
+        cy.prefixedVisit('/');
+        cy.disableFirmwareHashCheck();
+
+        cy.step('Go through analytics', () => {
+            onAnalyticsPage.continue();
+            onAnalyticsPage.continue();
+        });
+    });
+
+    it('Device disconnected during recovery offers retry', () => {
+        cy.step('Start wallet recovery process and confirm on device', () => {
+            onOnboardingPage.continueFirmware();
+            onOnboardingPage.recoverWallet();
+            onRecoverPage.selectWordCount(24);
+            onRecoverPage.selectBasicRecovery();
+            onOnboardingPage.waitForConfirmationOnDevice();
+            cy.wait(1000);
+            cy.task('pressYes');
+            cy.wait(1000);
+        });
+
+        cy.step('Disconnect device', () => {
+            cy.task('stopEmu');
+            cy.wait(500);
+            onConnectDevicePrompt.waitForConnectDevicePrompt();
+            cy.task('startEmu', { model: 'T1B1', version: '1-latest', wipe: false });
+        });
+
+        cy.step('Check that you can retry', () => {
+            onOnboardingPage.retryRecovery();
+            onRecoverPage.selectWordCount(24);
+            onRecoverPage.selectBasicRecovery();
+            onOnboardingPage.waitForConfirmationOnDevice();
+        });
+    });
+});
diff --git a/packages/suite-web/e2e/tests/onboarding/t1b1/t1b1-recovery-success.test.ts b/packages/suite-web/e2e/tests/onboarding/t1b1/t1b1-recovery-success.test.ts
new file mode 100644
index 00000000000..ae8934877d1
--- /dev/null
+++ b/packages/suite-web/e2e/tests/onboarding/t1b1/t1b1-recovery-success.test.ts
@@ -0,0 +1,80 @@
+// @group_device-management
+// @retry=2
+
+import { onOnboardingPage } from '../../../support/pageObjects/onboardingObject';
+import { onWordInputPage } from '../../../support/pageObjects/wordInputObject';
+import { onAnalyticsPage } from '../../../support/pageObjects/analyticsObject';
+import { onRecoverPage } from '../../../support/pageObjects/recoverObject';
+
+const mnemonic = [
+    'nasty',
+    'answer',
+    'gentle',
+    'inform',
+    'unaware',
+    'abandon',
+    'regret',
+    'supreme',
+    'dragon',
+    'gravity',
+    'behind',
+    'lava',
+    'dose',
+    'pilot',
+    'garden',
+    'into',
+    'dynamic',
+    'outer',
+    'hard',
+    'speed',
+    'luxury',
+    'run',
+    'truly',
+    'armed',
+];
+
+describe('Onboarding - recover wallet T1B1', () => {
+    beforeEach(() => {
+        cy.task('startBridge');
+        cy.task('startEmu', { model: 'T1B1', version: '1-latest', wipe: true });
+        cy.viewport('macbook-13').resetDb();
+        cy.prefixedVisit('/');
+        cy.disableFirmwareHashCheck();
+
+        cy.step('Go through analytics', () => {
+            onAnalyticsPage.continue();
+            onAnalyticsPage.continue();
+        });
+    });
+
+    it('Successfully recovers wallet from mnemonic', () => {
+        cy.step('Start wallet recovery process and confirm on device', () => {
+            onOnboardingPage.continueFirmware();
+            onOnboardingPage.recoverWallet();
+            onRecoverPage.selectWordCount(24);
+            onRecoverPage.selectBasicRecovery();
+            onOnboardingPage.waitForConfirmationOnDevice();
+            cy.wait(2000);
+            cy.task('pressYes');
+        });
+
+        cy.step('Input mnemonic', () => {
+            for (let i = 0; i < 24; i++) {
+                cy.task('getDebugState').then(state => {
+                    // @ts-expect-error
+                    const position = state.recovery_word_pos - 1;
+                    onWordInputPage.inputWord(mnemonic[position]);
+                });
+
+                cy.wait(500);
+            }
+        });
+
+        cy.step('Finalize recovery, skip pin and check success', () => {
+            onOnboardingPage.continueRecovery();
+            onOnboardingPage.skipPin();
+            onOnboardingPage.continueCoins();
+            onOnboardingPage.checkOnboardingSuccess();
+        });
+    });
+});
diff --git a/packages/suite-web/e2e/tests/onboarding/t2t1-recovery-fail.test.ts b/packages/suite-web/e2e/tests/onboarding/t2t1-recovery-fail.test.ts
deleted file mode 100644
index 426f1d47995..00000000000
--- a/packages/suite-web/e2e/tests/onboarding/t2t1-recovery-fail.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-// @group_device-management
-// @retry=2
-
-describe('Onboarding - recover wallet T2T1', () => {
-    beforeEach(() => {
-        cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
-        cy.prefixedVisit('/');
-        // note: this is an example of test that can not be parametrized to be both integration (isolated) test and e2e test.
-        // the problem is that it always needs to run the newest possible emulator. If this was pinned to use emulator which is currently
-        // in production, and we locally bumped emulator version, we would get into a screen saying "update your firmware" and the test would fail.
-        cy.task('startEmu', { wipe: true, model: 'T2T1', version: '2-main' });
-
-        // Disable revision check. On emulator '2-main' it wont pass as it is unreleased version
-        cy.getTestElement('@device-compromised').should('be.visible');
-        cy.getTestElement('@suite/menu/settings').click();
-        cy.getTestElement('@settings/menu/device').click();
-        cy.getTestElement('@settings/device/open-firmware-revision-check-modal-button').click();
-        cy.getTestElement('@device-firmware-revision/checkbox').click();
-        cy.getTestElement('@device-firmware-revision/opt-out-button').click();
-        cy.getTestElement('@settings/menu/close').click();
-
-        // Continue with test
-        cy.getTestElement('@analytics/continue-button').click();
-        cy.getTestElement('@analytics/continue-button').click();
-
-        cy.getTestElement('@firmware/continue-button').click();
-
-        cy.getTestElement('@onboarding/path-recovery-button').click();
-    });
-
-    it('Device disconnected during action', () => {
-        cy.getTestElement('@onboarding/confirm-on-device');
-        cy.task('pressYes');
-        cy.wait(501);
-        cy.task('stopEmu');
-        cy.getTestElement('@connect-device-prompt', { timeout: 20000 });
-        cy.task('startEmu', { wipe: false });
-        cy.log(
-            'If device disconnected during call, error page with retry button should appear. Also note, that unlike with T1B1, retry button initiates recoveryDevice call immediately',
-        );
-        cy.getTestElement('@onboarding/recovery/start-button', { timeout: 10000 }).click();
-        cy.getTestElement('@onboarding/confirm-on-device');
-    });
-});
-
-export {};
diff --git a/packages/suite-web/e2e/tests/onboarding/t2t1-recovery-success.test.ts b/packages/suite-web/e2e/tests/onboarding/t2t1-recovery-success.test.ts
deleted file mode 100644
index 37489ee6455..00000000000
--- a/packages/suite-web/e2e/tests/onboarding/t2t1-recovery-success.test.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// @group_device-management
-// @retry=2
-
-describe('Onboarding - recover wallet T2T1', () => {
-    beforeEach(() => {
-        cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
-        cy.prefixedVisit('/');
-
-        cy.task('startEmu', { wipe: true, model: 'T2T1', version: '2.5.3' });
-        cy.getTestElement('@analytics/continue-button').click();
-        cy.getTestElement('@analytics/continue-button').click();
-
-        cy.getTestElement('@firmware/skip-button').click();
-
-        cy.getTestElement('@onboarding/path-recovery-button').click();
-    });
-
-    it('Success', () => {
-        cy.getTestElement('@onboarding/recovery/start-button').click();
-        cy.getTestElement('@onboarding/confirm-on-device').should('be.visible');
-        cy.task('pressYes');
-        cy.wait(1000);
-        cy.task('pressYes');
-        cy.wait(1000);
-        cy.task('selectNumOfWordsEmu', 12);
-        cy.wait(1000);
-        cy.task('pressYes');
-        cy.wait(1000);
-
-        for (let i = 0; i < 12; i++) {
-            cy.task('inputEmu', 'all');
-        }
-
-        // pressing the final Continue button
-        cy.wait(1500);
-        cy.task('pressYes');
-
-        // pin is tested in create path, so here we test 'skipping' path instead
-        cy.getTestElement('@onboarding/recovery/continue-button').click();
-        cy.getTestElement('@onboarding/skip-button').click();
-        cy.getTestElement('@onboarding/skip-button-confirm').click();
-    });
-});
-
-export {};
diff --git a/packages/suite-web/e2e/tests/onboarding/t2t1-create-wallet.test.ts b/packages/suite-web/e2e/tests/onboarding/t2t1/t2t1-create-wallet.test.ts
similarity index 90%
rename from packages/suite-web/e2e/tests/onboarding/t2t1-create-wallet.test.ts
rename to packages/suite-web/e2e/tests/onboarding/t2t1/t2t1-create-wallet.test.ts
index 98a47283ee1..0da3ec306c4 100644
--- a/packages/suite-web/e2e/tests/onboarding/t2t1-create-wallet.test.ts
+++ b/packages/suite-web/e2e/tests/onboarding/t2t1/t2t1-create-wallet.test.ts
@@ -4,16 +4,17 @@
 describe('Onboarding - create wallet', () => {
     beforeEach(() => {
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
+        cy.disableFirmwareHashCheck();
     });
 
-    // TODO: shamir process has changed somewhat, test needs to be adjusted. Skipping for now.
-    it.skip('Success (Shamir backup)', () => {
+    it('Success (Shamir backup)', () => {
         // note: this is an example of test that can not be parametrized to be both integration (isolated) test and e2e test.
         // the problem is that it always needs to run the newest possible emulator. If this was pinned to use emulator which is currently
         // in production, and we locally bumped emulator version, we would get into a screen saying "update your firmware" and the test would fail.
-        cy.task('startEmu', { wipe: true, model: 'T2T1', version: '2-main' });
+        cy.task('startEmu', { wipe: true, model: 'T2T1', version: '2-latest' });
+
         cy.getTestElement('@analytics/continue-button').click();
         cy.getTestElement('@analytics/continue-button').click();
         cy.getTestElement('@firmware/continue-button').click();
@@ -42,5 +43,3 @@ describe('Onboarding - create wallet', () => {
         cy.getTestElement('@onboarding/pin/continue-button');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/onboarding/t2t1/t2t1-recovery-fail.test.ts b/packages/suite-web/e2e/tests/onboarding/t2t1/t2t1-recovery-fail.test.ts
new file mode 100644
index 00000000000..2a87fab655d
--- /dev/null
+++ b/packages/suite-web/e2e/tests/onboarding/t2t1/t2t1-recovery-fail.test.ts
@@ -0,0 +1,47 @@
+// @group_device-management
+// @retry=2
+
+import { onAnalyticsPage } from '../../../support/pageObjects/analyticsObject';
+import { onConnectDevicePrompt } from '../../../support/pageObjects/connectDeviceObject';
+import { onOnboardingPage } from '../../../support/pageObjects/onboardingObject';
+
+describe('Onboarding - recover wallet T2T1', () => {
+    beforeEach(() => {
+        cy.task('startBridge');
+        cy.viewport('macbook-13').resetDb();
+        cy.prefixedVisit('/');
+        cy.disableFirmwareHashCheck();
+        // note: this is an example of test that can not be parametrized to be both integration (isolated) test and e2e test.
+        // the problem is that it always needs to run the newest possible emulator. If this was pinned to use emulator which is currently
+        // in production, and we locally bumped emulator version, we would get into a screen saying "update your firmware" and the test would fail.
+        cy.task('startEmu', { wipe: true, model: 'T2T1', version: '2-latest' });
+
+        cy.step('Go through analytics', () => {
+            onAnalyticsPage.continue();
+            onAnalyticsPage.continue();
+        });
+    });
+
+    it('Device disconnected during recovery offers retry', () => {
+        cy.step('Start wallet recovery process and confirm on device', () => {
+            onOnboardingPage.continueFirmware();
+            onOnboardingPage.recoverWallet();
+            onOnboardingPage.startRecovery();
+
+            onOnboardingPage.waitForConfirmationOnDevice();
+        });
+
+        cy.step('Disconnect device', () => {
+            cy.wait(1000);
+            cy.task('stopEmu');
+            cy.wait(500);
+            onConnectDevicePrompt.waitForConnectDevicePrompt();
+            cy.task('startEmu', { model: 'T2T1', version: '2-latest', wipe: false });
+        });
+
+        cy.step('Check that you can retry', () => {
+            onOnboardingPage.retryRecovery();
+            onOnboardingPage.waitForConfirmationOnDevice();
+        });
+    });
+});
diff --git a/packages/suite-web/e2e/tests/onboarding/t2t1-recovery-persistence.test.ts b/packages/suite-web/e2e/tests/onboarding/t2t1/t2t1-recovery-persistence.test.ts
similarity index 98%
rename from packages/suite-web/e2e/tests/onboarding/t2t1-recovery-persistence.test.ts
rename to packages/suite-web/e2e/tests/onboarding/t2t1/t2t1-recovery-persistence.test.ts
index 75c46821874..bcdc64fd259 100644
--- a/packages/suite-web/e2e/tests/onboarding/t2t1-recovery-persistence.test.ts
+++ b/packages/suite-web/e2e/tests/onboarding/t2t1/t2t1-recovery-persistence.test.ts
@@ -51,7 +51,7 @@ describe('Onboarding - T2T1 in recovery mode', () => {
         cy.task('startBridge');
         cy.task('startEmu', { wipe: true, model: 'T2T1', version: '2.5.3' });
         cy.resetDb();
-        cy.viewport(1440, 2560);
+        cy.viewport('macbook-13');
         cy.prefixedVisit('/');
         cy.getTestElement('@analytics/continue-button').click();
         cy.getTestElement('@analytics/continue-button').click();
@@ -138,5 +138,3 @@ describe('Onboarding - T2T1 in recovery mode', () => {
         cy.getTestElement('@onboarding/skip-button').click();
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/onboarding/t2t1/t2t1-recovery-success.test.ts b/packages/suite-web/e2e/tests/onboarding/t2t1/t2t1-recovery-success.test.ts
new file mode 100644
index 00000000000..3b06aec9b3b
--- /dev/null
+++ b/packages/suite-web/e2e/tests/onboarding/t2t1/t2t1-recovery-success.test.ts
@@ -0,0 +1,60 @@
+// @group_device-management
+// @retry=2
+
+import { onAnalyticsPage } from '../../../support/pageObjects/analyticsObject';
+import { onOnboardingPage } from '../../../support/pageObjects/onboardingObject';
+
+describe('Onboarding - recover wallet T2T1', () => {
+    beforeEach(() => {
+        cy.task('startBridge');
+        cy.task('startEmu', { wipe: true, model: 'T2T1', version: '2.5.3' });
+        cy.viewport('macbook-13').resetDb();
+        cy.prefixedVisit('/');
+
+        cy.step('Go through analytics', () => {
+            onAnalyticsPage.continue();
+            onAnalyticsPage.continue();
+        });
+    });
+
+    it('Successfully recovers wallet from mnemonic', () => {
+        cy.step('Start wallet recovery process and confirm on device', () => {
+            onOnboardingPage.skipFirmware();
+            onOnboardingPage.recoverWallet();
+            onOnboardingPage.startRecovery();
+
+            onOnboardingPage.waitForConfirmationOnDevice();
+            cy.wait(1000);
+            cy.task('pressYes');
+
+            onOnboardingPage.waitForConfirmationOnDevice();
+            cy.wait(1000);
+            cy.task('pressYes');
+
+            cy.wait(1000);
+            cy.task('selectNumOfWordsEmu', 12);
+
+            cy.wait(1000);
+            cy.task('pressYes');
+        });
+
+        cy.step('Input mnemonic', () => {
+            cy.wait(1000);
+            for (let i = 0; i < 12; i++) {
+                cy.task('inputEmu', 'all');
+            }
+        });
+
+        cy.step('Confirm recovery success', () => {
+            cy.wait(1000);
+            cy.task('pressYes');
+        });
+
+        cy.step('Finalize recovery, skip pin and check success', () => {
+            onOnboardingPage.continueRecovery();
+            onOnboardingPage.skipPin();
+            onOnboardingPage.continueCoins();
+            onOnboardingPage.checkOnboardingSuccess();
+        });
+    });
+});
diff --git a/packages/suite-web/e2e/tests/onboarding/t3t1/t3t1-create-wallet.test.ts b/packages/suite-web/e2e/tests/onboarding/t3t1/t3t1-create-wallet.test.ts
new file mode 100644
index 00000000000..3577acf65f7
--- /dev/null
+++ b/packages/suite-web/e2e/tests/onboarding/t3t1/t3t1-create-wallet.test.ts
@@ -0,0 +1,69 @@
+// @group_device-management
+// @retry=2
+
+import { SeedType } from '../../../support/enums/seedType';
+import { onAnalyticsPage } from '../../../support/pageObjects/analyticsObject';
+import { onOnboardingPage } from '../../../support/pageObjects/onboardingObject';
+import { getConfirmActionOnDeviceModal } from '../../../support/utils/selectors';
+
+function acceptTos(): void {
+    onOnboardingPage.waitForConfirmationOnDevice();
+    cy.task('pressYes');
+}
+
+function confirmWalletCreated(): void {
+    onOnboardingPage.waitForConfirmationOnDevice();
+    cy.task('pressYes');
+}
+
+describe('Onboarding - create wallet', () => {
+    beforeEach(() => {
+        cy.task('startBridge');
+        cy.viewport('macbook-13').resetDb();
+        cy.prefixedVisit('/');
+        cy.disableFirmwareHashCheck();
+        cy.task('startEmu', { wipe: true, model: 'T3T1', version: '2-latest' });
+
+        cy.step('Go through analytics', () => {
+            onAnalyticsPage.continue();
+            onAnalyticsPage.continue();
+        });
+    });
+
+    it('Success (Shamir backup)', () => {
+        cy.step('Go through Device onboarding step', () => {
+            onOnboardingPage.skipFirmware();
+            cy.passThroughAuthenticityCheck();
+
+            cy.wait(500);
+            onOnboardingPage.skipTutorial();
+        });
+
+        cy.step('Create wallet with shamir backup', () => {
+            onOnboardingPage.createWallet();
+            onOnboardingPage.selectSeedType(SeedType.Advanced);
+
+            acceptTos();
+            confirmWalletCreated();
+
+            onOnboardingPage.createBackup();
+
+            const shares = 3;
+            const threshold = 2;
+            cy.passThroughBackupShamir(shares, threshold);
+        });
+
+        cy.step('Set pin', () => {
+            onOnboardingPage.setPin();
+            onOnboardingPage.waitForConfirmationOnDevice();
+            cy.task('pressYes');
+            cy.task('inputEmu', '12');
+            cy.task('inputEmu', '12');
+
+            getConfirmActionOnDeviceModal();
+            cy.task('pressYes');
+
+            onOnboardingPage.continuePin();
+        });
+    });
+});
diff --git a/packages/suite-web/e2e/tests/onboarding/transport.test.ts b/packages/suite-web/e2e/tests/onboarding/transport.test.ts
index 5acacbed160..8014c5ca1dd 100644
--- a/packages/suite-web/e2e/tests/onboarding/transport.test.ts
+++ b/packages/suite-web/e2e/tests/onboarding/transport.test.ts
@@ -3,7 +3,7 @@
 
 describe('Onboarding - transport webusb/bridge', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
     });
 
@@ -13,5 +13,3 @@ describe('Onboarding - transport webusb/bridge', () => {
         cy.getTestElement('@connect-device-prompt/no-device-detected').click();
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/recovery/t1b1-dry-run.test.ts b/packages/suite-web/e2e/tests/recovery/t1b1-dry-run.test.ts
index 561b1a51943..91f3bed4249 100644
--- a/packages/suite-web/e2e/tests/recovery/t1b1-dry-run.test.ts
+++ b/packages/suite-web/e2e/tests/recovery/t1b1-dry-run.test.ts
@@ -24,5 +24,3 @@ describe.skip('Recovery - dry run', () => {
         // todo: elaborate more, seems like finally T1B1 tests are stable so it would make finally sense to finish this
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/recovery/t2t1-dry-run-persistence.test.ts b/packages/suite-web/e2e/tests/recovery/t2t1-dry-run-persistence.test.ts
index 411d32d9622..410b744e5c3 100644
--- a/packages/suite-web/e2e/tests/recovery/t2t1-dry-run-persistence.test.ts
+++ b/packages/suite-web/e2e/tests/recovery/t2t1-dry-run-persistence.test.ts
@@ -1,6 +1,8 @@
 // @group_device-management
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 describe('Recovery - dry run', () => {
     beforeEach(() => {
         cy.task('startEmu', { wipe: true });
@@ -14,7 +16,7 @@ describe('Recovery - dry run', () => {
     it.skip('Communication between device and application is automatically established whenever app detects device in recovery mode', () => {
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/device').click();
 
         cy.getTestElement('@settings/device/check-seed-button').click();
@@ -59,5 +61,3 @@ describe('Recovery - dry run', () => {
         cy.getTestElement('@recovery/success-title');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/settings/application-log.test.ts b/packages/suite-web/e2e/tests/settings/application-log.test.ts
index 3bc09e52bb3..ef6f9799256 100644
--- a/packages/suite-web/e2e/tests/settings/application-log.test.ts
+++ b/packages/suite-web/e2e/tests/settings/application-log.test.ts
@@ -1,18 +1,20 @@
 // @group_settings
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 describe('ApplicationLog', () => {
     beforeEach(() => {
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu');
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
     });
 
     it('there is a button in application setting that opens modal with application logs', () => {
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/general').click({
             scrollBehavior: false,
         });
@@ -28,5 +30,3 @@ describe('ApplicationLog', () => {
         // todo: check it really exports something;
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/settings/autodetect.test.ts b/packages/suite-web/e2e/tests/settings/autodetect.test.ts
index 93a3312f358..98269c1f0db 100644
--- a/packages/suite-web/e2e/tests/settings/autodetect.test.ts
+++ b/packages/suite-web/e2e/tests/settings/autodetect.test.ts
@@ -3,7 +3,7 @@
 
 describe('Language and theme detection', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
     });
 
     // TODO: [low prio] extend the test to work even when the user has dark settings
@@ -32,5 +32,3 @@ describe('Language and theme detection', () => {
         cy.get('body').should('have.css', 'background-color', 'rgb(23, 23, 23)');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/settings/coins.test.ts b/packages/suite-web/e2e/tests/settings/coins.test.ts
index 730255abcfd..84827cc992a 100644
--- a/packages/suite-web/e2e/tests/settings/coins.test.ts
+++ b/packages/suite-web/e2e/tests/settings/coins.test.ts
@@ -2,7 +2,9 @@
 // @retry=2
 
 import { EventType } from '@trezor/suite-analytics';
+
 import { ExtractByEventType, Requests } from '../../support/types';
+import { onNavBar } from '../../support/pageObjects/topBarObject';
 
 let requests: Requests;
 
@@ -11,7 +13,7 @@ describe('Coin Settings', () => {
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu');
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
 
@@ -43,7 +45,7 @@ describe('Coin Settings', () => {
             // 'dsol', FIXME: disabled till available in trezor-user-env
         ];
 
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
 
         // only btc is selected by default;
@@ -63,7 +65,7 @@ describe('Coin Settings', () => {
         });
 
         // // this helps with unstable click to btc
-        cy.contains('span', 'Got it!').should('be.visible').click();
+        cy.contains('span', 'Got it!').should('be.visible').click({ scrollBehavior: 'bottom' });
         cy.wait(500);
         // disable Bitcoin
         cy.getTestElement('@settings/wallet/network/btc').click();
@@ -78,7 +80,7 @@ describe('Coin Settings', () => {
         // check that there is no assets grid
         cy.get('[class^="AssetsView__Grid"] > [class^="Card"]').should('not.exist');
 
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
         // just do some clicking on switches and check result
         ['btc', ...defaultUnchecked].forEach(network => {
@@ -129,5 +131,3 @@ describe('Coin Settings', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/settings/custom-firmware.test.ts b/packages/suite-web/e2e/tests/settings/custom-firmware.test.ts
index 61e0bb5eb10..b4cb42ab939 100644
--- a/packages/suite-web/e2e/tests/settings/custom-firmware.test.ts
+++ b/packages/suite-web/e2e/tests/settings/custom-firmware.test.ts
@@ -1,13 +1,17 @@
 // @group_settings
+
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 // @retry=2
 describe('Install custom firmware', () => {
     beforeEach(() => {
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu');
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport(1920, 1080).resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
+        cy.discoveryShouldFinish();
     });
 
     /*
@@ -16,13 +20,14 @@ describe('Install custom firmware', () => {
      * 3. Select the custom firmware
      * 4. Complete the FW instalation on the device
      */
-    it.skip('go to device settings and check if custom FW modal appears', () => {
+    //TODO: skipped due to #13926
+    it('go to device settings and check if custom FW modal appears', () => {
         //
         // Test preparation
         //
         const testBinFile = 'trezor-2.5.1.bin';
 
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/device').click();
         cy.getTestElement('@settings/device/check-seed-button').should('be.visible');
 
@@ -57,5 +62,3 @@ describe('Install custom firmware', () => {
         cy.getTestElement('@firmware/reconnect-device').should('be.visible');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/settings/general.test.ts b/packages/suite-web/e2e/tests/settings/general.test.ts
index d33fac33a7f..644cc5ef681 100644
--- a/packages/suite-web/e2e/tests/settings/general.test.ts
+++ b/packages/suite-web/e2e/tests/settings/general.test.ts
@@ -3,7 +3,13 @@
 // @retry=2
 
 import { EventType } from '@trezor/suite-analytics';
+
 import { ExtractByEventType, Requests } from '../../support/types';
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+import { onSettingGeneralPage } from '../../support/pageObjects/settings/settingsGeneralObject';
+import { Currency } from '../../support/enums/currency';
+import { Language } from '../../support/enums/language';
+import { Theme } from '../../support/enums/theme';
 
 let requests: Requests;
 
@@ -12,8 +18,7 @@ describe('General settings', () => {
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu', { needs_backup: false });
         cy.task('startBridge');
-        // use portrait mode monitor to prevent scrolling in settings
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
@@ -27,7 +32,7 @@ describe('General settings', () => {
         cy.getTestElement('@dashboard/index').should('contain', '$0.00');
 
         // go to settings
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
 
         // close desktop banner
         cy.getTestElement('@banner/install-desktop-suite/close-button').click({
@@ -35,8 +40,7 @@ describe('General settings', () => {
         });
 
         // change fiat
-        cy.getTestElement('@settings/fiat-select/input').click({ scrollBehavior: false });
-        cy.getTestElement('@settings/fiat-select/option/eur').click({ force: true });
+        onSettingGeneralPage.changeFiatCurrency(Currency.EUR);
 
         cy.findAnalyticsEventByType<ExtractByEventType<EventType.SettingsGeneralChangeFiat>>(
             requests,
@@ -50,12 +54,10 @@ describe('General settings', () => {
         cy.getTestElement('@dashboard/index').should('contain', '€0.00');
 
         // go to settings
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
 
         // change dark mode
-        cy.getTestElement('@theme/color-scheme-select/input').click();
-        cy.getTestElement('@theme/color-scheme-select/option/dark').click({ force: true });
-        cy.getTestElement('@theme/color-scheme-select/input').should('contain', 'Dark');
+        onSettingGeneralPage.changeTheme(Theme.Dark);
 
         cy.findAnalyticsEventByType<ExtractByEventType<EventType.SettingsGeneralChangeTheme>>(
             requests,
@@ -73,9 +75,7 @@ describe('General settings', () => {
         cy.contains('Current version');
 
         // change language
-        cy.getTestElement('@settings/language-select/input').click({ scrollBehavior: 'bottom' });
-        cy.getTestElement('@settings/language-select/option/es').click({ force: true });
-        cy.getTestElement('@settings/language-select/input').should('contain', 'Español');
+        onSettingGeneralPage.changeLanguage(Language.Spanish);
 
         cy.findAnalyticsEventByType<ExtractByEventType<EventType.SettingsGeneralChangeLanguage>>(
             requests,
@@ -106,5 +106,3 @@ describe('General settings', () => {
         // cy.getTestElement('@onboarding/welcome', { timeout: 20000 }).should('be.visible');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/settings/notification-toast.test.ts b/packages/suite-web/e2e/tests/settings/notification-toast.test.ts
index d69f26cc548..b60863338c8 100644
--- a/packages/suite-web/e2e/tests/settings/notification-toast.test.ts
+++ b/packages/suite-web/e2e/tests/settings/notification-toast.test.ts
@@ -1,12 +1,16 @@
 // @group_suite
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+import { onSettingsMenu } from '../../support/pageObjects/settings/settingsMenuObject';
+import { onSettingsDevicePage } from '../../support/pageObjects/settings/settingsDeviceObject';
+
 describe('Check notification toast', () => {
     beforeEach(() => {
         cy.task('startBridge');
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu', { needs_backup: false });
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
     });
@@ -24,13 +28,11 @@ describe('Check notification toast', () => {
      */
     it('Check notification toast', () => {
         cy.log('turn on passphrase protection');
-        cy.getTestElement('@suite/menu/settings').click();
-        cy.getTestElement('@settings/menu/device').click();
+        onNavBar.openSettings();
+        onSettingsMenu.openDeviceSettings();
         cy.getTestElement('@settings/device/safety-checks-button').should('be.enabled');
-        cy.getTestElement('@settings/device/passphrase-switch')
-            .should('be.visible')
-            .click({ force: true })
-            .getConfirmActionOnDeviceModal();
+        onSettingsDevicePage.togglePassphraseSwitch();
+        cy.getConfirmActionOnDeviceModal();
         cy.task('pressYes');
         cy.getConfirmActionOnDeviceModal().should('not.exist');
         //
@@ -39,5 +41,3 @@ describe('Check notification toast', () => {
         cy.getTestElement('@toast/settings-applied').should('be.visible');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/settings/safety-checks.test.ts b/packages/suite-web/e2e/tests/settings/safety-checks.test.ts
index 87e6ac70486..7bd3817344f 100644
--- a/packages/suite-web/e2e/tests/settings/safety-checks.test.ts
+++ b/packages/suite-web/e2e/tests/settings/safety-checks.test.ts
@@ -1,15 +1,17 @@
 // @group_settings
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 describe('Safety Checks Settings', () => {
     beforeEach(() => {
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu');
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/device').click();
     });
 
@@ -54,23 +56,20 @@ describe('Safety Checks Settings', () => {
         });
         // Don't assume the device is set to any particular value.
         // Just switch to the one that is not currently checked.
-        cy.get('[data-testid*="@radio-button"][data-checked="false"]')
-            .click()
-            .then(b => {
-                const targetValue = b.attr('data-testid');
-                console.log(`Changing safety_checks to ${targetValue})`);
-                cy.getTestElement('@safety-checks-apply').click();
-                cy.getTestElement('@prompts/confirm-on-device');
-                cy.task('pressYes');
+        cy.get('[data-testid*="@radio-button"][data-checked="false"]').click();
+        cy.get('[data-testid*="@radio-button"][data-checked="true"]').then(b => {
+            const targetValue = b.attr('data-testid');
+            console.log(`Changing safety_checks to ${targetValue})`);
+            cy.getTestElement('@safety-checks-apply').click();
+            cy.getTestElement('@prompts/confirm-on-device');
+            cy.task('pressYes');
 
-                cy.getTestElement('@settings/device/safety-checks-button').click({
-                    scrollBehavior: 'bottom',
-                });
-                cy.get(`[data-testid="${targetValue}"]`)
-                    .invoke('attr', 'data-checked')
-                    .should('eq', 'true');
+            cy.getTestElement('@settings/device/safety-checks-button').click({
+                scrollBehavior: 'bottom',
             });
+            cy.get(`[data-testid="${targetValue}"]`)
+                .invoke('attr', 'data-checked')
+                .should('eq', 'true');
+        });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/settings/t1b1-device-settings.test.ts b/packages/suite-web/e2e/tests/settings/t1b1-device-settings.test.ts
index 1e95aad6a40..03d23ef6b22 100644
--- a/packages/suite-web/e2e/tests/settings/t1b1-device-settings.test.ts
+++ b/packages/suite-web/e2e/tests/settings/t1b1-device-settings.test.ts
@@ -1,24 +1,30 @@
 // @group_settings
 // @retry=2
 
+import { onSettingsDevicePage } from '../../support/pageObjects/settings/settingsDeviceObject';
+import { onSettingsMenu } from '../../support/pageObjects/settings/settingsMenuObject';
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 // TODO: t1 tests are flaky in CI. I suspect it is something in bridge/udp layer. So next step is implementing
 // udp transport in suite and trying to enable this test again.
-describe.skip('T1B1 - Device settings', () => {
+describe('T1B1 - Device settings', () => {
     beforeEach(() => {
         cy.task('startEmu', { model: 'T1B1', version: '1-latest', wipe: true });
         cy.task('setupEmu', { needs_backup: false });
         cy.task('startBridge');
+        cy.viewport('macbook-13').resetDb();
+        cy.prefixedVisit('/');
+        cy.passThroughInitialRun();
     });
     afterEach(() => {
         cy.task('stopEmu');
     });
 
     it('enable pin', () => {
-        cy.viewport(1440, 2560).resetDb();
-        cy.prefixedVisit('/settings/device');
-        cy.passThroughInitialRun();
+        onNavBar.openSettings();
+        onSettingsMenu.openDeviceSettings();
+        onSettingsDevicePage.togglePinSwitch();
 
-        cy.getTestElement('@settings/device/pin-switch').click({ force: true });
         cy.getTestElement('@prompts/confirm-on-device');
         cy.task('pressYes');
 
@@ -32,11 +38,10 @@ describe.skip('T1B1 - Device settings', () => {
     });
 
     it('pin mismatch', () => {
-        cy.viewport(1440, 2560).resetDb();
-        cy.prefixedVisit('/settings/device');
-        cy.passThroughInitialRun();
+        onNavBar.openSettings();
+        onSettingsMenu.openDeviceSettings();
+        onSettingsDevicePage.togglePinSwitch();
 
-        cy.getTestElement('@settings/device/pin-switch').click({ force: true });
         cy.getTestElement('@prompts/confirm-on-device');
         cy.task('pressYes');
         cy.getTestElement('@pin/input/1').click();
@@ -65,9 +70,10 @@ describe.skip('T1B1 - Device settings', () => {
         // Test preparation
         //
 
-        cy.viewport(1440, 2560).resetDb();
-        cy.prefixedVisit('/settings/device');
+        cy.viewport('macbook-13').resetDb();
+        cy.visit('/');
         cy.passThroughInitialRun();
+        cy.discoveryShouldFinish();
 
         cy.getTestElement('@settings/device/homescreen').scrollIntoView();
         cy.getTestElement('@settings/device/homescreen-gallery').click();
@@ -87,5 +93,3 @@ describe.skip('T1B1 - Device settings', () => {
     // TODO: keyboard handling
     // TODO: set auto-lock (needs pin)
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/settings/t2b1-device-settings.test.ts b/packages/suite-web/e2e/tests/settings/t2b1-device-settings.test.ts
index 99a6d20b1f6..98486109a6a 100644
--- a/packages/suite-web/e2e/tests/settings/t2b1-device-settings.test.ts
+++ b/packages/suite-web/e2e/tests/settings/t2b1-device-settings.test.ts
@@ -1,6 +1,8 @@
 // @group_settings
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 // TODOS:
 // - focus this test on testing what is different from T2T1: (background image, display rotation)
 // - implement these differences in suite in the first place. both suite and T2B1 will happily accept
@@ -15,7 +17,7 @@ describe('T2B1 - Device settings', () => {
     };
 
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
     });
 
     /*
@@ -41,17 +43,16 @@ describe('T2B1 - Device settings', () => {
 
         // pass through initial run and device auth check
         cy.prefixedVisit('/');
-        cy.getTestElement('@analytics/continue-button', { timeout: 40000 })
-            .click()
-            .getTestElement('@onboarding/exit-app-button')
-            .click();
+        cy.disableFirmwareHashCheck();
+        cy.getTestElement('@analytics/continue-button', { timeout: 40000 }).click();
+        cy.getTestElement('@onboarding/exit-app-button').click();
         cy.passThroughAuthenticityCheck();
         cy.getTestElement('@onboarding/viewOnly/enable').click();
         cy.getTestElement('@viewOnlyTooltip/gotIt', { timeout: 15000 })
             .should('be.visible')
             .click();
         // navigate to device settings page
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/device').click();
 
         //
@@ -67,7 +68,8 @@ describe('T2B1 - Device settings', () => {
 
         // change device's name
         cy.log(`-> Filling in ${newDeviceName} as new trezor's name.`);
-        cy.getTestElement('@settings/device/label-input').clear().type(newDeviceName);
+        cy.getTestElement('@settings/device/label-input').clear();
+        cy.getTestElement('@settings/device/label-input').type(newDeviceName);
         cy.getTestElement(editNameBtn).should('be.enabled');
         cy.getTestElement(editNameBtn).click();
         cy.getConfirmActionOnDeviceModal();
@@ -97,17 +99,16 @@ describe('T2B1 - Device settings', () => {
 
         // pass through initial run and device auth check
         cy.prefixedVisit('/');
-        cy.getTestElement('@analytics/continue-button', { timeout: 40000 })
-            .click()
-            .getTestElement('@onboarding/exit-app-button')
-            .click();
+        cy.disableFirmwareHashCheck();
+        cy.getTestElement('@analytics/continue-button', { timeout: 40000 }).click();
+        cy.getTestElement('@onboarding/exit-app-button').click();
         cy.passThroughAuthenticityCheck();
         cy.getTestElement('@onboarding/viewOnly/enable').click();
         cy.getTestElement('@viewOnlyTooltip/gotIt', { timeout: 15000 })
             .should('be.visible')
             .click();
         // navigate to device settings page
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/device').click();
 
         cy.getTestElement('@settings/device/check-seed-button').should('be.enabled');
@@ -123,17 +124,16 @@ describe('T2B1 - Device settings', () => {
 
         // pass through initial run and device auth check
         cy.prefixedVisit('/');
-        cy.getTestElement('@analytics/continue-button', { timeout: 40000 })
-            .click()
-            .getTestElement('@onboarding/exit-app-button')
-            .click();
+        cy.disableFirmwareHashCheck();
+        cy.getTestElement('@analytics/continue-button', { timeout: 40000 }).click();
+        cy.getTestElement('@onboarding/exit-app-button').click();
         cy.passThroughAuthenticityCheck();
         cy.getTestElement('@onboarding/viewOnly/enable').click();
         cy.getTestElement('@viewOnlyTooltip/gotIt', { timeout: 15000 })
             .should('be.visible')
             .click();
         // navigate to device settings page
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/device').click();
 
         cy.getTestElement('@settings/device/open-wipe-modal-button').click();
@@ -143,5 +143,3 @@ describe('T2B1 - Device settings', () => {
         cy.task('pressYes');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/settings/t2t1-device-settings.test.ts b/packages/suite-web/e2e/tests/settings/t2t1-device-settings.test.ts
index 31f310254ea..3e90329339b 100644
--- a/packages/suite-web/e2e/tests/settings/t2t1-device-settings.test.ts
+++ b/packages/suite-web/e2e/tests/settings/t2t1-device-settings.test.ts
@@ -1,9 +1,11 @@
 // @group_settings
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 describe('T2T1 - Device settings', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport(1920, 1080).resetDb();
         cy.task('startBridge');
     });
     // TODO: cypress open: seems like entering urls (/settings/device) directly does not work anymore?
@@ -29,7 +31,7 @@ describe('T2T1 - Device settings', () => {
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         // navigate to device settings page
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/device').click();
 
         //
@@ -45,7 +47,8 @@ describe('T2T1 - Device settings', () => {
 
         // change device's name
         cy.log(`-> Filling in ${newDeviceName} as new trezor's name.`);
-        cy.getTestElement('@settings/device/label-input').clear().type(newDeviceName);
+        cy.getTestElement('@settings/device/label-input').clear();
+        cy.getTestElement('@settings/device/label-input').type(newDeviceName);
         cy.getTestElement(editNameBtn).should('be.enabled');
         cy.getTestElement(editNameBtn).click();
         cy.getConfirmActionOnDeviceModal();
@@ -58,9 +61,8 @@ describe('T2T1 - Device settings', () => {
 
         // change display rotation
         cy.log('change display rotation');
-        cy.getTestElement('@settings/device/rotation-button/90')
-            .click()
-            .getConfirmActionOnDeviceModal();
+        cy.getTestElement('select-bar/90').click();
+        cy.getConfirmActionOnDeviceModal();
         cy.task('pressYes');
         cy.getConfirmActionOnDeviceModal().should('not.exist');
     });
@@ -71,7 +73,7 @@ describe('T2T1 - Device settings', () => {
 
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/device').click();
 
         cy.log('Try to change device homescreen');
@@ -82,12 +84,13 @@ describe('T2T1 - Device settings', () => {
     });
 
     it('able to change homescreen in firmware >= 2.5.4', () => {
-        cy.task('startEmu', { wipe: true, model: 'T2T1', version: '2-main' });
+        cy.task('startEmu', { wipe: true, model: 'T2T1', version: '2-latest' });
         cy.task('setupEmu');
 
         cy.prefixedVisit('/');
+
         cy.passThroughInitialRun();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/device').click();
 
         cy.log('Try to change device homescreen');
@@ -97,14 +100,14 @@ describe('T2T1 - Device settings', () => {
         cy.get('#original_t2t1').should('exist');
     });
 
-    it.only('backup in settings', () => {
+    it('backup in settings', () => {
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu', { needs_backup: false });
 
         // navigate to device settings page
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/device').click();
 
         cy.getTestElement('@settings/device/check-seed-button', { timeout: 10_000 }).should(
@@ -122,7 +125,7 @@ describe('T2T1 - Device settings', () => {
         // navigate to device settings page
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/device').click();
 
         cy.getTestElement('@settings/device/open-wipe-modal-button').click();
@@ -135,5 +138,3 @@ describe('T2T1 - Device settings', () => {
     // TODO: upload custom image
     // TODO: set auto-lock (needs pin)
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/settings/without-device.test.ts b/packages/suite-web/e2e/tests/settings/without-device.test.ts
index a3fecd130e7..66d604d538c 100644
--- a/packages/suite-web/e2e/tests/settings/without-device.test.ts
+++ b/packages/suite-web/e2e/tests/settings/without-device.test.ts
@@ -7,7 +7,7 @@ describe('Settings changes persist when device disconnected', () => {
         cy.task('setupEmu', { passphrase_protection: false });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
@@ -36,5 +36,3 @@ describe('Settings changes persist when device disconnected', () => {
         cy.location('pathname').should('match', /\/accounts\/send$/);
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/bridge.test.ts b/packages/suite-web/e2e/tests/suite/bridge.test.ts
index 7babc802c79..b9a225902a5 100644
--- a/packages/suite-web/e2e/tests/suite/bridge.test.ts
+++ b/packages/suite-web/e2e/tests/suite/bridge.test.ts
@@ -3,7 +3,7 @@
 
 describe('Bridge page', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
     });
 
     it('/bridge', () => {
@@ -20,5 +20,3 @@ describe('Bridge page', () => {
         cy.getTestElement('@connect-device-prompt');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/bug-report-form.test.ts b/packages/suite-web/e2e/tests/suite/bug-report-form.test.ts
index a2631a9cb1e..369f253f66c 100644
--- a/packages/suite-web/e2e/tests/suite/bug-report-form.test.ts
+++ b/packages/suite-web/e2e/tests/suite/bug-report-form.test.ts
@@ -9,7 +9,7 @@ describe('Stories of bug report forms', () => {
         cy.task('setupEmu', { mnemonic: 'mnemonic_all' });
 
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
     });
 
@@ -47,5 +47,3 @@ describe('Stories of bug report forms', () => {
         cy.getTestElement('@toast/user-feedback-send-success').should('be.visible');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/database-migration.test.ts b/packages/suite-web/e2e/tests/suite/database-migration.test.ts
index 1cef06538d8..4bfd8e6eb47 100644
--- a/packages/suite-web/e2e/tests/suite/database-migration.test.ts
+++ b/packages/suite-web/e2e/tests/suite/database-migration.test.ts
@@ -31,7 +31,7 @@ describe('Database migration', () => {
         // this test can be run only in sldev so we ignore baseUrl env variable
         const baseUrl = 'https://dev.suite.sldev.cz/suite-web';
         const workaroundBtcAddressInputSelector = 'outputs.0.address';
-        cy.viewport(1440, 2560);
+        cy.viewport('macbook-13').resetDb();
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu', {
             passphrase_protection: true,
@@ -48,12 +48,9 @@ describe('Database migration', () => {
 
         cy.visit(`${baseUrl}/${from}`);
         // naming of data-tests has been changed in current version so we need to use the old ones
-        cy.get('[data-test="@onboarding/continue-button"]', { timeout: 40000 })
-            .click()
-            .get('[data-test="@onboarding/exit-app-button"]')
-            .click()
-            .get('[data-test="@suite/loading"]')
-            .should('not.exist');
+        cy.get('[data-test="@onboarding/continue-button"]', { timeout: 40000 }).click();
+        cy.get('[data-test="@onboarding/exit-app-button"]').click();
+        cy.get('[data-test="@suite/loading"]').should('not.exist');
         cy.get('[data-test="@passphrase-type/standard"]').click();
         cy.get('[data-test="@wallet/discovery-progress-bar"]', { timeout: 45_000 });
         cy.get('[data-test="@wallet/discovery-progress-bar"]', { timeout: 45_000 }).should(
@@ -93,10 +90,13 @@ describe('Database migration', () => {
         cy.get('[data-test="@wallet/menu/wallet-send"]').click();
         cy.get('[data-test="outputs[0].address"]').should('be.visible').type(testData.btcAddress);
         cy.wait(500); // wait has to be for a state save to happen
-        cy.get('[data-test="@wallet/menu/close-button"]').last().click();
+        cy.get('[data-test="@wallet/menu/close-button"]')
+            .last()
+            .click({ scrollBehavior: 'bottom' });
 
         // check and store address of first btc tx
-        cy.get('[data-test^="@metadata/outputLabel"] > span').should('be.visible');
+        cy.get('[data-test^="@metadata/outputLabel"] > span').first().scrollIntoView();
+        cy.get('[data-test^="@metadata/outputLabel"] > span').first().should('be.visible');
         cy.get('[data-test^="@metadata/outputLabel"] > span')
             .first()
             .invoke('text')
@@ -105,7 +105,8 @@ describe('Database migration', () => {
         cy.get('[data-test="@menu/switch-device"]').click();
         cy.contains('[data-test^="@switch-device/wallet-on-index"]', 'Hidden wallet #1')
             .find('[data-test*="toggle-remember-switch"]')
-            .click()
+            .click();
+        cy.contains('[data-test^="@switch-device/wallet-on-index"]', 'Hidden wallet #1')
             .find('input')
             .should('be.checked');
         cy.task('stopEmu');
@@ -125,6 +126,7 @@ describe('Database migration', () => {
 
         cy.getTestElement('@switch-device/cancel-button').click();
 
+        cy.get('[data-testid^="@metadata/outputLabel"]').first().scrollIntoView();
         cy.get('[data-testid^="@metadata/outputLabel"]').first().should('be.visible');
 
         // TODO: cypress alias is empty for unknown reason, refactor this test to playwright
@@ -145,9 +147,11 @@ describe('Database migration', () => {
 
         // device not connected warning modal
         cy.getTestElement('@modal');
-        cy.getTestElement('@modal/close-button').click().should('not.exist');
+        cy.getTestElement('@modal/close-button').click();
+        cy.getTestElement('@modal/close-button').should('not.exist');
 
         cy.task('startEmu');
+        cy.disableFirmwareHashCheck(); // only applicable for the `to` version, not the older `from` version
         cy.getTestElement('@deviceStatus-connected').should('be.visible');
         cy.getTestElement('@account-subpage/back').last().click();
 
@@ -163,5 +167,3 @@ describe('Database migration', () => {
         cy.get('body').should('have.css', 'background-color', 'rgb(23, 23, 23)');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/guide.test.ts b/packages/suite-web/e2e/tests/suite/guide.test.ts
index 1760da795ec..7d8d4808581 100644
--- a/packages/suite-web/e2e/tests/suite/guide.test.ts
+++ b/packages/suite-web/e2e/tests/suite/guide.test.ts
@@ -1,9 +1,11 @@
 // @group_suite
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 describe('Test Guide', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.task('startBridge');
     });
@@ -39,7 +41,7 @@ describe('Test Guide', () => {
         cy.getTestElement('@toast/user-feedback-send-success').should('be.visible');
 
         // Guide over modal
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/show-log-button').click();
         cy.getTestElement('@guide/button-close').click();
         cy.getTestElement('@guide/button-open').click();
@@ -54,6 +56,7 @@ describe('Test Guide', () => {
 
     it('In onboarding with device', () => {
         cy.task('startEmu', { wipe: true });
+        cy.disableFirmwareHashCheck();
         cy.getTestElement('@analytics/continue-button').click();
         cy.getTestElement('@analytics/continue-button').click();
         cy.getTestElement('@guide/button-open').click();
@@ -65,5 +68,3 @@ describe('Test Guide', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/initial-run.test.ts b/packages/suite-web/e2e/tests/suite/initial-run.test.ts
index 507f6f30f80..f553fb0ae82 100644
--- a/packages/suite-web/e2e/tests/suite/initial-run.test.ts
+++ b/packages/suite-web/e2e/tests/suite/initial-run.test.ts
@@ -3,7 +3,7 @@
 
 describe('Suite initial run', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu');
         cy.task('startBridge');
@@ -11,6 +11,7 @@ describe('Suite initial run', () => {
 
     it('Until user passed through initial run, it will be there after reload', () => {
         cy.prefixedVisit('/');
+        cy.disableFirmwareHashCheck();
         cy.getTestElement('@analytics/toggle-switch').should('be.visible');
         cy.safeReload();
         // analytics screen is there until user confirms his choice
@@ -23,6 +24,7 @@ describe('Suite initial run', () => {
 
     it('Once user passed trough, skips initial run and shows connect-device modal', () => {
         cy.prefixedVisit('/');
+        cy.disableFirmwareHashCheck();
         cy.getTestElement('@analytics/continue-button').click();
         cy.getTestElement('@onboarding/exit-app-button').click();
         cy.getTestElement('@onboarding/viewOnly/enable').click();
@@ -34,5 +36,3 @@ describe('Suite initial run', () => {
         cy.getTestElement('@menu/switch-device').should('contain.text', 'Connected');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/passphrase-cancel.test.ts b/packages/suite-web/e2e/tests/suite/passphrase-cancel.test.ts
index 61021d3cb52..a13a6db01ab 100644
--- a/packages/suite-web/e2e/tests/suite/passphrase-cancel.test.ts
+++ b/packages/suite-web/e2e/tests/suite/passphrase-cancel.test.ts
@@ -2,14 +2,13 @@
 // @retry=2
 
 const testedVersions = [
-    // Todo: fix latest version to return proper revision hash (it reports possibly FAKE device now)
     { version: '2-latest', model: 'T2T1' },
-    { version: '1.11.2', model: 'T1B1' },
+    { version: '1-latest', model: 'T1B1' },
 ];
 
 describe('Passphrase cancel', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
     });
 
     testedVersions.forEach(version => {
@@ -36,5 +35,3 @@ describe('Passphrase cancel', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/passphrase-cardano.test.ts b/packages/suite-web/e2e/tests/suite/passphrase-cardano.test.ts
index db32b394d61..6df59fa2c95 100644
--- a/packages/suite-web/e2e/tests/suite/passphrase-cardano.test.ts
+++ b/packages/suite-web/e2e/tests/suite/passphrase-cardano.test.ts
@@ -1,6 +1,8 @@
 // @group_passphrase
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 const correctPassphraseAddr =
     'addr1qx3ufjpwcx30ee73a7r29surauze6yt0jvr7c3rnahw0hnppg7qp5xvslcfucsqqayrtjhm4u66x';
 
@@ -13,7 +15,7 @@ describe('Passphrase with cardano', () => {
         });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         // cy.visit('/');
         cy.passThroughInitialRun();
@@ -23,7 +25,7 @@ describe('Passphrase with cardano', () => {
     it('verify cardano address behind passphrase.', () => {
         const passphrase = 'secret passphrase A';
         // enable cardano in settings
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
         cy.getTestElement('@settings/wallet/network/ada').click();
 
@@ -90,5 +92,3 @@ describe('Passphrase with cardano', () => {
         cy.getTestElement('@toast/verify-address-error');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/passphrase-disabled.test.ts b/packages/suite-web/e2e/tests/suite/passphrase-disabled.test.ts
index 19e9efdf77a..6b11632f3af 100644
--- a/packages/suite-web/e2e/tests/suite/passphrase-disabled.test.ts
+++ b/packages/suite-web/e2e/tests/suite/passphrase-disabled.test.ts
@@ -68,5 +68,3 @@ describe.skip('Suite switch wallet modal', () => {
         cy.getTestElement('@menu/switch-device').click();
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/passphrase-duplicate.test.ts b/packages/suite-web/e2e/tests/suite/passphrase-duplicate.test.ts
index 73657100fad..8721688fe53 100644
--- a/packages/suite-web/e2e/tests/suite/passphrase-duplicate.test.ts
+++ b/packages/suite-web/e2e/tests/suite/passphrase-duplicate.test.ts
@@ -9,7 +9,7 @@ describe('Passphrase', () => {
 
         cy.task('applySettings', { passphrase_always_on_device: false });
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
@@ -43,5 +43,3 @@ describe('Passphrase', () => {
         // QA todo: continue to discovered wallet
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/passphrase-input.test.ts b/packages/suite-web/e2e/tests/suite/passphrase-input.test.ts
index d67cfba605f..cd1252ab6b3 100644
--- a/packages/suite-web/e2e/tests/suite/passphrase-input.test.ts
+++ b/packages/suite-web/e2e/tests/suite/passphrase-input.test.ts
@@ -9,13 +9,20 @@ describe('Passphrase', () => {
         cy.task('setupEmu', { mnemonic: 'mnemonic_all' });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport(1980, 1080).resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
+        cy.discoveryShouldFinish();
     });
 
     // TODO: there is a problem with clearing our password input element -> cypress deletes only last char with {selectAll}{backspace} and totally ignores .clear() command
-    it.skip('just test passphrase input', () => {
+    it('just test passphrase input', () => {
+        // enable passphrase on device
+        cy.getTestElement('@suite/menu/settings').click();
+        cy.getTestElement('@settings/menu/device').click();
+        cy.getTestElement('@settings/device/passphrase-switch').click();
+        cy.task('pressYes');
+
         cy.getTestElement('@menu/switch-device').click();
         cy.getTestElement('@switch-device/add-hidden-wallet-button').click();
         cy.task('pressYes');
@@ -37,9 +44,9 @@ describe('Passphrase', () => {
         cy.getTestElement('@passphrase/input').should('have.value', 'ab12ef');
 
         // toggle hidden/visible keeps caret position
-        // cy.getTestElement('@passphrase/input').clear();
-        cy.getTestElement('@passphrase/input').type('{selectall}');
-        cy.getTestElement('@passphrase/input').type('1');
+        cy.getTestElement('@passphrase/input').click();
+        cy.clearInput('@passphrase/input');
+        cy.getTestElement('@passphrase/input').should('be.empty').type('1');
         cy.getTestElement('@passphrase/input').type('{backspace}');
         cy.getTestElement('@passphrase/input').type('123{leftarrow}');
         cy.getTestElement('@passphrase/show-toggle').click();
@@ -52,21 +59,20 @@ describe('Passphrase', () => {
         cy.getTestElement('@passphrase/input').should('have.value', '12abc3xyz');
 
         // when selectionStart===0 (looking at you nullish coalescing)
-        cy.getTestElement('@passphrase/input')
-            .clear()
-            .type('123{leftarrow}{leftarrow}{leftarrow}abc');
+        cy.clearInput('@passphrase/input');
+        cy.getTestElement('@passphrase/input').type('123{leftarrow}{leftarrow}{leftarrow}abc');
         cy.getTestElement('@passphrase/input').should('have.value', 'abc123');
-        cy.getTestElement('@passphrase/input')
-            .clear()
-            .type('123{leftarrow}{leftarrow}{leftarrow}{backspace}{del}');
+        cy.clearInput('@passphrase/input');
+        cy.getTestElement('@passphrase/input').type(
+            '123{leftarrow}{leftarrow}{leftarrow}{backspace}{del}',
+        );
         cy.getTestElement('@passphrase/input').should('have.value', '23');
 
         // todo: make sure that setting caret position via mouse click works as well could not make it, click does not move caret using cypress?
-        // cy.getTestElement('@passphrase/input').clear().type('123456');
-        // cy.getTestElement('@passphrase/input').trigger('click', 40, 25);
+        cy.clearInput('@passphrase/input');
+        cy.getTestElement('@passphrase/input').type('123456');
+        cy.getTestElement('@passphrase/input').trigger('click', 40, 25);
 
         // todo: select part of test + copy/paste
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/passphrase-numbering.test.ts b/packages/suite-web/e2e/tests/suite/passphrase-numbering.test.ts
index 042c2664740..a8da2d6187a 100644
--- a/packages/suite-web/e2e/tests/suite/passphrase-numbering.test.ts
+++ b/packages/suite-web/e2e/tests/suite/passphrase-numbering.test.ts
@@ -8,7 +8,7 @@ describe('Passphrase numbering', () => {
         cy.task('startBridge');
         cy.task('applySettings', { passphrase_always_on_device: false });
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
@@ -66,5 +66,3 @@ describe('Passphrase numbering', () => {
 
     // TODO: add coverage for different wallet names displaying in the device switcher component
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/passphrase-reconnection.test.ts b/packages/suite-web/e2e/tests/suite/passphrase-reconnection.test.ts
new file mode 100644
index 00000000000..4e70d504644
--- /dev/null
+++ b/packages/suite-web/e2e/tests/suite/passphrase-reconnection.test.ts
@@ -0,0 +1,115 @@
+// @group_passphrase
+// @retry=2
+import { Requests } from '../../support/types';
+
+let requests: Requests;
+
+const abcAddr = 'bc1qpyfvfvm52zx7gek86ajj5pkkne3h385ada8r2y';
+
+describe('Passphrase reconnection', () => {
+    beforeEach(() => {
+        // note that versions before 2.3.1 don't have passphrase caching, this means that returning
+        // back to passphrase that was used before in the session would require to type the passphrase again
+        cy.task('startEmu', { wipe: true });
+        cy.task('setupEmu', {
+            mnemonic: 'mnemonic_all',
+            passphrase_protection: true,
+        });
+        cy.task('startBridge');
+
+        cy.viewport('macbook-13').resetDb();
+        cy.prefixedVisit('/');
+        cy.passThroughInitialRun();
+        cy.discoveryShouldFinish();
+
+        requests = [];
+    });
+
+    it('add 1st hidden wallet (abc) -> succeed -> check 1st address -> disconnect device -> reconnect device -> go back to 1st hidden wallet -> check confirm passphrase appears. ', () => {
+        cy.log('passphrase abc for the first time');
+        // add 1st hidden wallet
+        cy.getTestElement('@menu/switch-device').click();
+        cy.addHiddenWallet('abc');
+
+        cy.interceptDataTrezorIo(requests);
+
+        // go to wallet
+        cy.getTestElement('@account-menu/btc/normal/0').click();
+        // go to receive
+        cy.getTestElement('@wallet/menu/wallet-receive').click({ timeout: 10000 });
+        // click reveal address
+        cy.getTestElement('@wallet/receive/reveal-address-button').click();
+        cy.getTestElement('@device-display/chunked-text')
+            .find('[data-testid*="chunk"]')
+            .then(chunks => {
+                let fullAddress = '';
+                // @ts-expect-error
+                chunks.each((i, el) => {
+                    fullAddress += Cypress.$(el).text();
+                });
+
+                return fullAddress;
+            })
+            .should('contain', abcAddr);
+        cy.task('pressYes');
+        cy.getTestElement('@metadata/copy-address-button')
+            .should('exist')
+            .should('not.be.disabled');
+        // close modal
+        cy.getTestElement('@modal/close-button').click();
+
+        cy.log('disconnect and reconnect device');
+        cy.task('stopEmu');
+        cy.task('startEmu', { wipe: false });
+
+        cy.log('passphrase abc again. now it is cached in device');
+        // now go back to the 1st wallet
+        cy.getTestElement('@menu/switch-device').click();
+        cy.getTestElement('@switch-device/wallet-on-index/1').click();
+        // go to receive
+        cy.wait(1000);
+        cy.getTestElement('@wallet/menu/wallet-receive').click({ timeout: 10000 });
+        // reveal 0 address again
+        // no address should be in table yet
+        cy.getTestElement('@wallet/receive/used-address/0').should('not.exist');
+        cy.getTestElement('@wallet/receive/reveal-address-button').should('not.be.disabled');
+        cy.getTestElement('@wallet/receive/reveal-address-button').click();
+
+        // re-enter pasphrase
+        cy.getTestElement('@passphrase/input', { timeout: 10000 }).type('abc');
+        cy.getTestElement('@passphrase/hidden/submit-button').click();
+        cy.task('pressYes');
+        cy.task('pressYes');
+
+        // should display confirm passphrase modal
+        cy.getTestElement('@device-display/chunked-text')
+            .find('[data-testid*="chunk"]')
+            .then(chunks => {
+                let fullAddress = '';
+                // @ts-expect-error
+                chunks.each((i, el) => {
+                    fullAddress += Cypress.$(el).text();
+                });
+
+                return fullAddress;
+            })
+            .should('contain', abcAddr);
+        cy.task('pressYes');
+        cy.getTestElement('@metadata/copy-address-button')
+            .should('exist')
+            .should('not.be.disabled');
+        // close modal
+        cy.getTestElement('@modal/close-button').click();
+
+        // should display again
+        cy.getTestElement('@wallet/receive/reveal-address-button').should('not.be.disabled');
+        cy.getTestElement('@wallet/receive/reveal-address-button').click();
+        cy.getTestElement('@device-display/chunked-text').should('be.visible');
+        cy.task('pressYes');
+        cy.getTestElement('@metadata/copy-address-button')
+            .should('exist')
+            .should('not.be.disabled');
+        // close modal
+        cy.getTestElement('@modal/close-button').click();
+    });
+});
diff --git a/packages/suite-web/e2e/tests/suite/passphrase.test.ts b/packages/suite-web/e2e/tests/suite/passphrase.test.ts
index e19a419b361..68d127f90e6 100644
--- a/packages/suite-web/e2e/tests/suite/passphrase.test.ts
+++ b/packages/suite-web/e2e/tests/suite/passphrase.test.ts
@@ -1,6 +1,7 @@
 // @group_passphrase
 // @retry=2
 import { EventType } from '@trezor/suite-analytics';
+
 import { ExtractByEventType, Requests } from '../../support/types';
 
 let requests: Requests;
@@ -19,7 +20,7 @@ describe('Passphrase', () => {
         });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
@@ -165,5 +166,3 @@ describe('Passphrase', () => {
         cy.task('pressYes');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/safety-checks-warning.test.ts b/packages/suite-web/e2e/tests/suite/safety-checks-warning.test.ts
index ca486aed430..60866218c4e 100644
--- a/packages/suite-web/e2e/tests/suite/safety-checks-warning.test.ts
+++ b/packages/suite-web/e2e/tests/suite/safety-checks-warning.test.ts
@@ -1,20 +1,24 @@
 // group:ghatest
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 // @retry=2
 
 // TODO: enable this test once https://github.com/trezor/trezor-user-env/issues/54
 // is resolved
+// eslint-disable-next-line jest/no-commented-out-tests
 // describe('safety_checks Warning For PromptAlways', () => {
 //     beforeEach(() => {
 //         cy.task('startEmu', {  wipe: true });
 //         cy.task('setupEmu');
 //         cy.task('startBridge');
-//         cy.viewport(1440, 2560).resetDb();
+//         cy.viewport('macbook-13').resetDb();
 //         cy.prefixedVisit('/settings/device/');
 //         cy.passThroughInitialRun();
 //         // TODO: set safety_checks to `PromptAlways`
 //     });
 
+// eslint-disable-next-line jest/no-commented-out-tests
 //     it('Non-dismissible warning appears', () => {
 //         cy.getTestElement('@banner/safety-checks/button');
 //         cy.getTestElement('@banner/safety-checks/dismiss').should('not.exist');
@@ -26,12 +30,12 @@ describe('safety_checks Warning For PromptTemporarily', () => {
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu');
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         // Start in the device settings to easily open safety_checks setting modal.
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/device').click();
 
         // Set safety_checks to `PromptTemporarily'.
@@ -100,5 +104,3 @@ describe('safety_checks Warning For PromptTemporarily', () => {
         cy.getTestElement('@banner/safety-checks/button');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/tooltip.test.ts b/packages/suite-web/e2e/tests/suite/tooltip.test.ts
index e9bbe539d85..beaa133772a 100644
--- a/packages/suite-web/e2e/tests/suite/tooltip.test.ts
+++ b/packages/suite-web/e2e/tests/suite/tooltip.test.ts
@@ -24,7 +24,6 @@ describe.skip('Test tooltip links', () => {
     });
 });
 
-export {};
 // TODO: review this test if it's indeed obsolete
 describe.skip('Test tooltip conditional rendering', () => {
     beforeEach(() => {
@@ -43,22 +42,16 @@ describe.skip('Test tooltip conditional rendering', () => {
         cy.getTestElement('@switch-device/wallet-on-index/0/toggle-remember-switch').click({
             force: true,
         });
-        cy.getTestElement('@switch-device/add-hidden-wallet-button')
-            .trigger('mouseenter')
-            .getTestElement('@tooltip')
-            .should('not.exist');
+        cy.getTestElement('@switch-device/add-hidden-wallet-button').trigger('mouseenter');
+        cy.getTestElement('@tooltip').should('not.exist');
 
         // Tooltip should render if device is disconnected
         cy.task('stopEmu');
         cy.task('stopBridge');
-        cy.getTestElement('@deviceStatus-disconnected', { timeout: 20000 })
-            .getTestElement('@switch-device/add-hidden-wallet-button')
-            .trigger('mouseenter', {
-                force: true,
-            })
-            .getTestElement('@tooltip')
-            .should('exist');
+        cy.getTestElement('@deviceStatus-disconnected', { timeout: 20000 });
+        cy.getTestElement('@switch-device/add-hidden-wallet-button').trigger('mouseenter', {
+            force: true,
+        });
+        cy.getTestElement('@tooltip').should('exist');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/unacquired-device.test.ts b/packages/suite-web/e2e/tests/suite/unacquired-device.test.ts
index ca545a324de..07afd5e8877 100644
--- a/packages/suite-web/e2e/tests/suite/unacquired-device.test.ts
+++ b/packages/suite-web/e2e/tests/suite/unacquired-device.test.ts
@@ -3,33 +3,29 @@
 
 describe('unacquired device', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport(1920, 1080).resetDb();
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu', { passphrase_protection: true, pin_protection: false });
         cy.task('startBridge');
-    });
-
-    it.skip('someone steals session, device status turns inactive', () => {
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
-        // cy.getTestElement('@deviceStatus-connected').click();
-        // cy.getTestElement('@passphrase-type/standard').click();
-        // cy.discoveryShouldFinish();
+        cy.discoveryShouldFinish();
+    });
 
+    it('someone steals session, device status turns inactive', () => {
         // simulate stolen session from another window. device receives indicative button
         cy.task('stealBridgeSession');
         cy.getTestElement('@menu/switch-device').click();
-        cy.getTestElement('@switch-device/1/solve-issue-button').click();
+        cy.getTestElement('@switch-device/solve-issue-button').click();
         cy.getTestElement('@deviceStatus-connected');
 
         // when user reloads app while device is acquired, suite will not try to acquire device so that it
         // does not interferes with somebody else's session
         cy.task('stealBridgeSession');
-        cy.getTestElement('@switch-device/1/solve-issue-button');
+        cy.getTestElement('@switch-device/solve-issue-button');
         cy.reload();
-        cy.getTestElement('@device-acquire').click();
-        cy.getTestElement('@passphrase-type/standard').click();
-        cy.discoveryShouldFinish();
+        cy.getTestElement('@menu/switch-device').click();
+        cy.getTestElement('@switch-device/solve-issue-button').click();
     });
 
     // todo:
@@ -38,5 +34,3 @@ describe('unacquired device', () => {
     // - also firmware update, maybe standalone backup/recovery might have custom implementation  that might be worth revisiting
     // - device state is incorrect is wrong copy!!!
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/suite/version-page.test.ts b/packages/suite-web/e2e/tests/suite/version-page.test.ts
index 3d3ec77d163..bef4d1bca08 100644
--- a/packages/suite-web/e2e/tests/suite/version-page.test.ts
+++ b/packages/suite-web/e2e/tests/suite/version-page.test.ts
@@ -4,7 +4,7 @@ import { getSuiteVersion } from '@trezor/env-utils';
 
 describe('There is a hidden route (not accessible in UI)', () => {
     beforeEach(() => {
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
     });
 
     it('/version', () => {
@@ -15,5 +15,3 @@ describe('There is a hidden route (not accessible in UI)', () => {
         cy.getTestElement('@modal/version').screenshot('version-modal');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/add-account-types.test.ts b/packages/suite-web/e2e/tests/wallet/add-account-types.test.ts
index f962e24c5dc..5652423fa67 100644
--- a/packages/suite-web/e2e/tests/wallet/add-account-types.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/add-account-types.test.ts
@@ -1,11 +1,12 @@
 // @group_wallet
 // @retry=2
 
-import { onAccountsPage } from '../../support/pageObjects/accountsObject';
-import { onSettingsCryptoPage } from '../../support/pageObjects/settingsCryptoObject';
-import { onNavBar } from '../../support/pageObjects/topBarObject';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { EventType } from '@trezor/suite-analytics';
+
+import { onAccountsPage } from '../../support/pageObjects/accountsObject';
+import { onSettingsCryptoPage } from '../../support/pageObjects/settings/settingsCryptoObject';
+import { onNavBar } from '../../support/pageObjects/topBarObject';
 import { ExtractByEventType, Requests } from '../../support/types';
 
 let requests: Requests;
@@ -34,13 +35,13 @@ describe('Account types suite', () => {
         });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
 
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
 
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
         fixtures
             .filter(({ coin }) => coin !== 'btc')
@@ -89,8 +90,8 @@ describe('Account types suite', () => {
                         cy.getTestElement(`@account-menu/${type}/group`)
                             .children()
                             .not(`[data-testid="@account-menu/account-item-skeleton"]`)
-                            .then(specificAccounts => {
-                                const numberOfAccounts2 = specificAccounts.length;
+                            .then(specificAccounts2 => {
+                                const numberOfAccounts2 = specificAccounts2.length;
                                 expect(numberOfAccounts2).to.be.equal(numberOfAccounts1 + 1);
                             });
                     });
@@ -111,14 +112,14 @@ describe('Account types suite', () => {
      * 7. Get the number of accounts again
      * 8. Verify that the current number is equal to previous number + 1
      */
-    it.skip('Add-account-types-non-BTC-coins', () => {
+    it('Add-account-types-non-BTC-coins', () => {
         //
         // Test execution
         //
         const coins: NetworkSymbol[] = ['ada', 'eth'];
 
         // activate the coin
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
         coins.forEach((coin: NetworkSymbol) => {
             onSettingsCryptoPage.activateCoin(coin);
@@ -128,30 +129,29 @@ describe('Account types suite', () => {
         onNavBar.openDefaultAcccount();
         cy.discoveryShouldFinish();
         // cardano
-
         coins.forEach((coin: NetworkSymbol) => {
             onAccountsPage.applyCoinFilter(coin);
             // get the element containing all accounts
-            cy.get(`[type="normal"] [data-testid*="@account-menu/${coin}/normal"]`).then(
-                currentAccounts => {
-                    const numberOfAccounts1 = currentAccounts.length;
-
-                    cy.getTestElement('@account-menu/add-account').should('be.visible').click();
-                    cy.getTestElement('@modal').should('be.visible');
-                    cy.get(`[data-testid="@settings/wallet/network/${coin}"]`)
-                        .should('be.visible')
-                        .click();
-                    cy.getTestElement('@add-account').click();
-                    cy.discoveryShouldFinish();
-
-                    cy.get(`[type="normal"] [data-testid*="@account-menu/${coin}/normal"]`).then(
-                        newAccounts => {
-                            const numberOfAccounts2 = newAccounts.length;
-                            expect(numberOfAccounts2).to.be.equal(numberOfAccounts1 + 1);
-                        },
-                    );
-                },
-            );
+            cy.get(
+                `[data-testid="@account-menu/normal/group"] > [data-testid*="@account-menu/${coin}/normal"]`,
+            ).then(currentAccounts => {
+                const numberOfAccounts1 = currentAccounts.length;
+
+                cy.getTestElement('@account-menu/add-account').should('be.visible').click();
+                cy.getTestElement('@modal').should('be.visible');
+                cy.get(`[data-testid="@settings/wallet/network/${coin}"]`)
+                    .should('be.visible')
+                    .click();
+                cy.getTestElement('@add-account').click();
+                cy.discoveryShouldFinish();
+
+                cy.get(
+                    `[data-testid="@account-menu/normal/group"] > [data-testid*="@account-menu/${coin}/normal"]`,
+                ).then(newAccounts => {
+                    const numberOfAccounts2 = newAccounts.length;
+                    expect(numberOfAccounts2).to.be.equal(numberOfAccounts1 + 1);
+                });
+            });
         });
 
         cy.findAnalyticsEventByType<ExtractByEventType<EventType.AccountsNewAccount>>(
@@ -164,5 +164,3 @@ describe('Account types suite', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/cardano.test.ts b/packages/suite-web/e2e/tests/wallet/cardano.test.ts
index a962c09948a..73af80f7e88 100644
--- a/packages/suite-web/e2e/tests/wallet/cardano.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/cardano.test.ts
@@ -1,6 +1,10 @@
 // @group_wallet
 // @retry=2
 
+import { onModal } from '../../support/pageObjects/modalObject';
+import { onSettingsMenu } from '../../support/pageObjects/settings/settingsMenuObject';
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 describe('Cardano', () => {
     beforeEach(() => {
         cy.task('startEmu', { wipe: true });
@@ -12,12 +16,15 @@ describe('Cardano', () => {
         });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
-        cy.prefixedVisit('/settings/coins');
+        cy.viewport('macbook-13').resetDb();
+        cy.prefixedVisit('/');
         cy.passThroughInitialRun();
+        cy.discoveryShouldFinish();
+        onNavBar.openSettings();
+        onSettingsMenu.openWalletSettings();
     });
 
-    it.skip('Basic cardano walkthrough', () => {
+    it('Basic cardano walkthrough', () => {
         // go to coin settings and enable cardano
         cy.getTestElement('@settings/wallet/network/tada').click();
 
@@ -29,9 +36,8 @@ describe('Cardano', () => {
 
         // go to cardano account #1
         cy.getTestElement('@suite/menu/suite-index').click();
-        cy.getTestElement('@suite/menu/wallet-index').click();
-        cy.getTestElement('@account-menu/tada/normal/0').click();
         cy.discoveryShouldFinish();
+        cy.getTestElement('@account-menu/tada/normal/0').click();
 
         // go to cardano account #1 - account details
         cy.getTestElement('@wallet/menu/wallet-details').click();
@@ -41,12 +47,7 @@ describe('Cardano', () => {
         cy.getTestElement('@wallets/details/show-xpub-button').click();
         // todo: matchImageSnapshot producing diff not obvious why.
         cy.getTestElement('@modal').screenshot('cardano-show-xpub');
-        cy.get('body').type('{esc}');
-
-        // todo: enable staking - cardano lib problem
-        // go to cardano account #1 - staking
-        // cy.getTestElement('@wallet/menu/wallet-staking').click();
-        // cy.getTestElement('@app').matchImageSnapshot();
+        onModal.close();
 
         //  go to cardano account #1 - send
         cy.getTestElement('@wallet/menu/wallet-send').click();
@@ -57,15 +58,16 @@ describe('Cardano', () => {
         cy.getTestElement('@wallet/receive/reveal-address-button').click();
         cy.getTestElement('@modal').matchImageSnapshot('cardano-receive');
         cy.task('pressYes');
+        cy.wait(501);
         cy.getTestElement('@modal/close-button').click();
         cy.getTestElement('@account-subpage/back').last().click();
 
         // go to cardano account #1 - staking
-        cy.getTestElement('@wallet/menu/wallet-tokens-coins').click();
+        cy.getTestElement('@wallet/menu/staking').click();
         cy.getTestElement('@app').matchImageSnapshot('cardano-tokens');
 
         // lets 'hack' routing
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
         cy.getTestElement('@settings/wallet/network/tada').click();
         cy.go('back');
@@ -73,5 +75,3 @@ describe('Cardano', () => {
         cy.getTestElement('@app').matchImageSnapshot('staking-not-enabled');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/check-coins-xpub.test.ts b/packages/suite-web/e2e/tests/wallet/check-coins-xpub.test.ts
index 097caa7a83a..def19b1f335 100644
--- a/packages/suite-web/e2e/tests/wallet/check-coins-xpub.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/check-coins-xpub.test.ts
@@ -2,6 +2,7 @@
 // @retry=2
 
 import { NetworkSymbol } from '@suite-common/wallet-config';
+
 import { onAccountsPage } from '../../support/pageObjects/accountsObject';
 
 describe('Check coins XPUB', () => {
@@ -13,7 +14,7 @@ describe('Check coins XPUB', () => {
         });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/accounts');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
@@ -54,5 +55,3 @@ describe('Check coins XPUB', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/coin-balance.test.ts b/packages/suite-web/e2e/tests/wallet/coin-balance.test.ts
index bb774dd6d7e..320a4c5619e 100644
--- a/packages/suite-web/e2e/tests/wallet/coin-balance.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/coin-balance.test.ts
@@ -15,7 +15,7 @@ describe('Dashboard with regtest', () => {
             address: ADDRESS_INDEX_1,
             btc_amount: 1,
         });
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
     });
@@ -45,5 +45,3 @@ describe('Dashboard with regtest', () => {
             });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/custom-blockbook-discovery.test.ts b/packages/suite-web/e2e/tests/wallet/custom-blockbook-discovery.test.ts
index ba4182eb569..a58ccb81702 100644
--- a/packages/suite-web/e2e/tests/wallet/custom-blockbook-discovery.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/custom-blockbook-discovery.test.ts
@@ -1,6 +1,8 @@
 // @group_wallet
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 describe('Custom-blockbook-discovery', () => {
     beforeEach(() => {
         cy.task('startEmu', { wipe: true });
@@ -10,7 +12,7 @@ describe('Custom-blockbook-discovery', () => {
         });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
@@ -32,7 +34,7 @@ describe('Custom-blockbook-discovery', () => {
         // Test preparation
         //
         const customBTCblockbook = 'https://btc1.trezor.io';
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
 
         //
@@ -67,7 +69,7 @@ describe('Custom-blockbook-discovery', () => {
         // Test preparation
         //
         const customBTCblockbook = 'https://ltc1.trezor.io';
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
         //
         // Test execution
@@ -75,8 +77,8 @@ describe('Custom-blockbook-discovery', () => {
         cy.getTestElement('@settings/wallet/network/btc').click();
         cy.getTestElement('@settings/wallet/network/ltc', { timeout: 30000 })
             .should('exist')
-            .click()
-            .trigger('mouseover');
+            .click();
+        cy.getTestElement('@settings/wallet/network/ltc').trigger('mouseover');
         cy.getTestElement('@settings/wallet/network/ltc/advance').click();
         cy.getTestElement('@modal').should('exist');
         cy.getTestElement('@settings/advance/select-type/input').click();
@@ -93,5 +95,3 @@ describe('Custom-blockbook-discovery', () => {
         cy.getTestElement('@dashboard/graph').should('exist');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/discovery.test.ts b/packages/suite-web/e2e/tests/wallet/discovery.test.ts
index 2d91b2e3766..b260558bfdc 100644
--- a/packages/suite-web/e2e/tests/wallet/discovery.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/discovery.test.ts
@@ -1,6 +1,8 @@
 // @group_wallet
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 // discovery should end within this time frame
 const DISCOVERY_LIMIT = 1000 * 60 * 2;
 
@@ -24,11 +26,11 @@ describe('Discovery', () => {
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu');
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
     });
 
@@ -47,5 +49,3 @@ describe('Discovery', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/export-transactions.test.ts b/packages/suite-web/e2e/tests/wallet/export-transactions.test.ts
index 28f215e7e2e..5159a39681c 100644
--- a/packages/suite-web/e2e/tests/wallet/export-transactions.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/export-transactions.test.ts
@@ -2,8 +2,9 @@
 // @retry=2
 
 import { NetworkSymbol } from '@suite-common/wallet-config';
+
 import { onAccountsPage } from '../../support/pageObjects/accountsObject';
-import { onSettingsCryptoPage } from '../../support/pageObjects/settingsCryptoObject';
+import { onSettingsCryptoPage } from '../../support/pageObjects/settings/settingsCryptoObject';
 
 const downloadsFolder = Cypress.config('downloadsFolder');
 const coins: NetworkSymbol[] = ['btc', 'ltc', 'eth', 'ada'];
@@ -17,7 +18,7 @@ describe('Export transactions', () => {
                 'alcohol woman abuse must during monitor noble actual mixed trade anger aisle',
         });
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.getTestElement('@account-menu/btc/normal/0').click();
@@ -73,5 +74,3 @@ describe('Export transactions', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/import-btc-csv.test.ts b/packages/suite-web/e2e/tests/wallet/import-btc-csv.test.ts
index 13cb82b92c7..3b9d2c504b8 100644
--- a/packages/suite-web/e2e/tests/wallet/import-btc-csv.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/import-btc-csv.test.ts
@@ -10,7 +10,7 @@ describe('Import a BTC csv file', () => {
         cy.task('startBridge');
         cy.task('metadataStartProvider', 'dropbox');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/', {
             onBeforeLoad: (win: Window) => {
                 cy.stub(win, 'open').callsFake(stubOpen(win));
@@ -75,5 +75,3 @@ describe('Import a BTC csv file', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/look-up-an-account.test.ts b/packages/suite-web/e2e/tests/wallet/look-up-an-account.test.ts
index 0026b4a1e11..c7fe17aa27b 100644
--- a/packages/suite-web/e2e/tests/wallet/look-up-an-account.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/look-up-an-account.test.ts
@@ -1,6 +1,8 @@
 // @group_wallet
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 describe('Look up a BTC account', () => {
     beforeEach(() => {
         cy.task('startEmu', { wipe: true });
@@ -10,11 +12,11 @@ describe('Look up a BTC account', () => {
         });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
     });
 
@@ -44,5 +46,3 @@ describe('Look up a BTC account', () => {
         cy.getTestElement('@account-menu/ltc/normal/0').should('not.exist');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/overview-and-transactions.test.ts b/packages/suite-web/e2e/tests/wallet/overview-and-transactions.test.ts
index 1eb7f7e4228..73e85138c8c 100644
--- a/packages/suite-web/e2e/tests/wallet/overview-and-transactions.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/overview-and-transactions.test.ts
@@ -51,5 +51,3 @@ describe('Overview and transactions check', () => {
         onAccountsPage.accountsPaginationCheck();
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/pending-transactions.test.ts b/packages/suite-web/e2e/tests/wallet/pending-transactions.test.ts
index 94a82bf643b..c080a899f1b 100644
--- a/packages/suite-web/e2e/tests/wallet/pending-transactions.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/pending-transactions.test.ts
@@ -1,6 +1,8 @@
 // @group_wallet
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 describe('Use regtest to test pending transactions', () => {
     const ADDRESS_ACCOUNT_1_INDEX_1 = 'bcrt1qkvwu9g3k2pdxewfqr7syz89r3gj557l374sg5v';
     const ADDRESS_ACCOUNT_2_INDEX_1 = 'bcrt1q7r9yvcdgcl6wmtta58yxf29a8kc96jkyyk8fsw';
@@ -10,11 +12,11 @@ describe('Use regtest to test pending transactions', () => {
         cy.task('startEmu', { wipe: true });
         cy.task('setupEmu', { mnemonic: 'mnemonic_all' });
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
         cy.toggleDebugModeInSettings();
         cy.getTestElement('@settings/wallet/network/btc').click({ force: true });
@@ -128,5 +130,3 @@ describe('Use regtest to test pending transactions', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/send-form-doge.test.ts b/packages/suite-web/e2e/tests/wallet/send-form-doge.test.ts
index 60ced4b2beb..6eccc473cc6 100644
--- a/packages/suite-web/e2e/tests/wallet/send-form-doge.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/send-form-doge.test.ts
@@ -1,6 +1,8 @@
 // @group_wallet
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 describe('Doge send form with mocked blockbook', () => {
     beforeEach(() => {
         cy.task('startEmu', { wipe: true });
@@ -11,11 +13,11 @@ describe('Doge send form with mocked blockbook', () => {
         });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
     });
 
@@ -39,8 +41,8 @@ describe('Doge send form with mocked blockbook', () => {
             cy.getTestElement('@settings/wallet/network/btc').click();
             cy.getTestElement('@settings/wallet/network/doge', { timeout: 30000 })
                 .should('exist')
-                .click()
-                .trigger('mouseover');
+                .click();
+            cy.getTestElement('@settings/wallet/network/doge').trigger('mouseover');
             cy.getTestElement('@settings/wallet/network/doge/advance').click();
             cy.getTestElement('@modal').should('exist');
             cy.getTestElement('@settings/advance/select-type/input').click();
@@ -65,5 +67,3 @@ describe('Doge send form with mocked blockbook', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/send-form-ltc.test.ts b/packages/suite-web/e2e/tests/wallet/send-form-ltc.test.ts
index f4fe15b4197..b65334370fb 100644
--- a/packages/suite-web/e2e/tests/wallet/send-form-ltc.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/send-form-ltc.test.ts
@@ -1,6 +1,8 @@
 // @group_wallet
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 describe('LTC send form with mocked blockbook', () => {
     beforeEach(() => {
         cy.task('startEmu', { wipe: true });
@@ -10,11 +12,11 @@ describe('LTC send form with mocked blockbook', () => {
         });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
     });
 
@@ -38,8 +40,8 @@ describe('LTC send form with mocked blockbook', () => {
                 cy.getTestElement('@settings/wallet/network/btc').click();
                 cy.getTestElement('@settings/wallet/network/ltc', { timeout: 30000 })
                     .should('exist')
-                    .click()
-                    .trigger('mouseover');
+                    .click();
+                cy.getTestElement('@settings/wallet/network/ltc').trigger('mouseover');
                 cy.getTestElement('@settings/wallet/network/ltc/advance').click();
                 cy.getTestElement('@modal').should('exist');
                 cy.getTestElement('@settings/advance/select-type/input').click();
@@ -64,5 +66,3 @@ describe('LTC send form with mocked blockbook', () => {
         );
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/send-form-regtest.test.ts b/packages/suite-web/e2e/tests/wallet/send-form-regtest.test.ts
index 3be8f08b1d9..93ad427af41 100644
--- a/packages/suite-web/e2e/tests/wallet/send-form-regtest.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/send-form-regtest.test.ts
@@ -11,7 +11,7 @@ describe('Send form for bitcoin', () => {
             mnemonic: 'mnemonic_all',
         });
         cy.task('startBridge');
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
@@ -30,7 +30,7 @@ describe('Send form for bitcoin', () => {
         cy.wait(100); // wait until is the form interactive
     });
 
-    it.skip('add and remove output in send form, toggle form options, input data', () => {
+    it('add and remove output in send form, toggle form options, input data', () => {
         // test adding and removing outputs
         cy.getTestElement('outputs.0.amount').type('0.3');
         cy.getTestElement('add-output').click();
@@ -46,7 +46,7 @@ describe('Send form for bitcoin', () => {
         // add locktime
         cy.getTestElement('add-locktime-button').click();
 
-        cy.getTestElement('locktime-input').type('100');
+        cy.getTestElement('locktime-input').type('1000');
 
         // assert final state of form using screenshot
         cy.getTestElement('@wallet/send/outputs-and-options').matchImageSnapshot('bitcoin-send');
@@ -57,7 +57,7 @@ describe('Send form for bitcoin', () => {
         cy.task('pressYes');
         cy.task('pressYes');
 
-        // broadcast is off due to locktime, so we do not see '@modal/send'
+        // broadcast is off due to locktime, so we do not see '@modal/send', this is also affected by the current number of mined blocks thus I increased locktime number to 1000
         cy.getTestElement('@send/copy-raw-transaction');
     });
 
@@ -100,5 +100,3 @@ describe('Send form for bitcoin', () => {
         );
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/sign-and-verify-eth.test.ts b/packages/suite-web/e2e/tests/wallet/sign-and-verify-eth.test.ts
index b7ead13935c..32cb0d8ae5c 100644
--- a/packages/suite-web/e2e/tests/wallet/sign-and-verify-eth.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/sign-and-verify-eth.test.ts
@@ -1,6 +1,8 @@
 // @group_wallet
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 const MESSAGE_SIGN = 'hello world';
 const SIGNATURE_SIGN =
     '0a172eaac00636dbc124c170e5afa7665cdeed65b59449ee1bbb6e57b1cfbf7971a1c88b48cacd17ec585918cd849c36a016e99ecfd757b947c732e7470b9b3d1b';
@@ -15,11 +17,11 @@ describe('Sign and verify ETH', () => {
         });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
 
         //
@@ -81,5 +83,3 @@ describe('Sign and verify ETH', () => {
         cy.getTestElement('@toast/verify-message-success');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/sign-and-verify.test.ts b/packages/suite-web/e2e/tests/wallet/sign-and-verify.test.ts
index c227abf7b05..05e7a6e1feb 100644
--- a/packages/suite-web/e2e/tests/wallet/sign-and-verify.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/sign-and-verify.test.ts
@@ -15,7 +15,7 @@ describe('Sign and verify', () => {
         cy.task('setupEmu', { mnemonic: 'mnemonic_all' });
         cy.task('startBridge');
 
-        cy.viewport(1440, 2560).resetDb();
+        cy.viewport('macbook-13').resetDb();
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
 
@@ -75,5 +75,3 @@ describe('Sign and verify', () => {
         cy.getTestElement('@toast/verify-message-success');
     });
 });
-
-export {};
diff --git a/packages/suite-web/e2e/tests/wallet/staking.test.ts b/packages/suite-web/e2e/tests/wallet/staking.test.ts
index 2aa2de6d65b..5bc8eb73a89 100644
--- a/packages/suite-web/e2e/tests/wallet/staking.test.ts
+++ b/packages/suite-web/e2e/tests/wallet/staking.test.ts
@@ -1,6 +1,8 @@
 // @group_wallet
 // @retry=2
 
+import { onNavBar } from '../../support/pageObjects/topBarObject';
+
 describe('ETH staking', () => {
     beforeEach(() => {
         cy.task('startEmu', { wipe: true });
@@ -14,7 +16,7 @@ describe('ETH staking', () => {
         cy.prefixedVisit('/');
         cy.passThroughInitialRun();
         cy.discoveryShouldFinish();
-        cy.getTestElement('@suite/menu/settings').click();
+        onNavBar.openSettings();
         cy.getTestElement('@settings/menu/wallet').click();
     });
 
@@ -31,8 +33,9 @@ describe('ETH staking', () => {
             cy.getTestElement('@settings/wallet/network/btc').click();
             cy.getTestElement('@settings/wallet/network/eth', { timeout: 30000 })
                 .should('exist')
-                .click()
-                .trigger('mouseover');
+                .click();
+            cy.getTestElement('@settings/wallet/network/eth').trigger('mouseover');
+
             cy.getTestElement('@settings/wallet/network/eth/advance').click();
             cy.getTestElement('@modal').should('exist');
             cy.getTestElement('@settings/advance/select-type/input').click();
@@ -73,5 +76,3 @@ describe('ETH staking', () => {
         });
     });
 });
-
-export {};
diff --git a/packages/suite-web/eslint.config.mjs b/packages/suite-web/eslint.config.mjs
new file mode 100644
index 00000000000..66312417952
--- /dev/null
+++ b/packages/suite-web/eslint.config.mjs
@@ -0,0 +1,16 @@
+import pluginCypress from 'eslint-plugin-cypress/flat';
+
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    pluginCypress.configs.recommended,
+    {
+        rules: {
+            'jest/valid-expect': 'off', // because of cypress tests
+            'import/no-default-export': 'off', // Todo: fix and solve
+            'no-console': 'off', // It's used in cypress tests
+            'cypress/no-unnecessary-waiting': 'off', // A lot of arbitrary waiting is needed in Cypress tests
+        },
+    },
+];
diff --git a/packages/suite-web/package.json b/packages/suite-web/package.json
index a460d372205..8fe7dec10a7 100644
--- a/packages/suite-web/package.json
+++ b/packages/suite-web/package.json
@@ -5,7 +5,6 @@
     "scripts": {
         "type-check": "yarn g:tsc --build tsconfig.json",
         "type-check:watch": "yarn type-check -- --watch",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "lint:styles": "npx stylelint './src/**/*{.ts,.tsx}' --cache --config ../../.stylelintrc",
         "dev": "yarn rimraf ./build && yarn workspace @trezor/suite-build run dev:web",
         "analyze": "ANALYZE=true yarn build",
@@ -35,6 +34,7 @@
         "@trezor/connect": "workspace:*",
         "@trezor/e2e-utils": "workspace:*",
         "@trezor/env-utils": "workspace:*",
+        "@trezor/eslint": "workspace:*",
         "@trezor/protobuf": "workspace:*",
         "@trezor/suite-analytics": "workspace:*",
         "@trezor/transport": "workspace:*",
@@ -48,11 +48,12 @@
         "cypress": "^13.6.4",
         "cypress-file-upload": "^5.0.8",
         "cypress-image-snapshot": "^4.0.1",
+        "eslint-plugin-cypress": "^4.1.0",
         "rimraf": "^6.0.1",
         "stylelint": "^16.2.1",
         "stylelint-config-standard": "^36.0.0",
         "tsx": "^4.16.3",
-        "webpack": "^5.94.0",
+        "webpack": "^5.96.1",
         "ws": "^8.18.0",
         "yargs": "17.7.2"
     }
diff --git a/packages/suite-web/src/Main.tsx b/packages/suite-web/src/Main.tsx
index 3edcda628c4..0d32c8955dd 100644
--- a/packages/suite-web/src/Main.tsx
+++ b/packages/suite-web/src/Main.tsx
@@ -1,12 +1,15 @@
-import { createRoot } from 'react-dom/client';
 import { Provider as ReduxProvider } from 'react-redux';
 import { Router as RouterProvider } from 'react-router-dom';
+import { HelmetProvider } from 'react-helmet-async';
+
+import { createRoot } from 'react-dom/client';
 import { init as initSentry } from '@sentry/browser';
 
-import { initStore } from 'src/reducers/store';
-import { preloadStore } from 'src/support/suite/preloadStore';
 import { SENTRY_CONFIG } from '@suite-common/sentry';
+import { FormatterProvider } from '@suite-common/formatters';
 
+import { initStore } from 'src/reducers/store';
+import { preloadStore } from 'src/support/suite/preloadStore';
 import { Metadata, Preloader, ToastContainer } from 'src/components/suite';
 import { ConnectedIntlProvider } from 'src/support/suite/ConnectedIntlProvider';
 import Resize from 'src/support/suite/Resize';
@@ -24,8 +27,6 @@ import { ModalContextProvider } from 'src/support/suite/ModalContext';
 
 import AppRouter from './support/Router';
 import { useCypress } from './support/useCypress';
-import { FormatterProvider } from '@suite-common/formatters';
-import { HelmetProvider } from 'react-helmet-async';
 
 const Main = () => {
     useCypress();
diff --git a/packages/suite-web/src/support/Router.tsx b/packages/suite-web/src/support/Router.tsx
index ac639009619..5e09600f4b3 100644
--- a/packages/suite-web/src/support/Router.tsx
+++ b/packages/suite-web/src/support/Router.tsx
@@ -1,9 +1,10 @@
 import { lazy, memo, Suspense, LazyExoticComponent, ComponentType } from 'react';
 import { Switch, Route } from 'react-router-dom';
 
+import { PageName } from '@suite-common/suite-types';
+
 import routes from 'src/constants/suite/routes';
 import { BundleLoader } from 'src/components/suite';
-import { PageName } from '@suite-common/suite-types';
 
 const components: Record<PageName, LazyExoticComponent<ComponentType<any>>> = {
     'suite-index': lazy(() =>
@@ -29,12 +30,7 @@ const components: Record<PageName, LazyExoticComponent<ComponentType<any>>> = {
     'wallet-details': lazy(
         () => import(/* webpackChunkName: "wallet" */ 'src/views/wallet/details'),
     ),
-    'wallet-tokens-coins': lazy(
-        () => import(/* webpackChunkName: "wallet" */ 'src/views/wallet/tokens/coins'),
-    ),
-    'wallet-tokens-hidden': lazy(
-        () => import(/* webpackChunkName: "wallet" */ 'src/views/wallet/tokens/hidden-tokens'),
-    ),
+    'wallet-tokens': lazy(() => import(/* webpackChunkName: "wallet" */ 'src/views/wallet/tokens')),
     'wallet-send': lazy(() => import(/* webpackChunkName: "wallet" */ 'src/views/wallet/send')),
     'wallet-staking': lazy(() =>
         import(/* webpackChunkName: "wallet" */ 'src/views/wallet/staking/WalletStaking').then(
@@ -49,14 +45,20 @@ const components: Record<PageName, LazyExoticComponent<ComponentType<any>>> = {
     ),
 
     // coinmarket
-    'wallet-coinmarket-buy': lazy(
-        () => import(/* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/buy'),
+    'wallet-coinmarket-buy': lazy(() =>
+        import(
+            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/buy/CoinmarketBuyForm'
+        ).then(({ CoinmarketBuyForm }) => ({ default: CoinmarketBuyForm })),
     ),
-    'wallet-coinmarket-buy-detail': lazy(
-        () => import(/* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/buy/detail'),
+    'wallet-coinmarket-buy-detail': lazy(() =>
+        import(
+            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/buy/CoinmarketBuyDetail'
+        ).then(({ CoinmarketBuyDetail }) => ({ default: CoinmarketBuyDetail })),
     ),
-    'wallet-coinmarket-buy-offers': lazy(
-        () => import(/* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/buy/offers'),
+    'wallet-coinmarket-buy-offers': lazy(() =>
+        import(
+            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/buy/CoinmarketBuyOffers'
+        ).then(({ CoinmarketBuyOffers }) => ({ default: CoinmarketBuyOffers })),
     ),
     'wallet-coinmarket-buy-confirm': lazy(() =>
         import(
@@ -65,55 +67,58 @@ const components: Record<PageName, LazyExoticComponent<ComponentType<any>>> = {
     ),
     'wallet-coinmarket-sell': lazy(() =>
         import(
-            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/sell_new/CoinmarketSellForm'
+            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/sell/CoinmarketSellForm'
         ).then(({ CoinmarketSellForm }) => ({ default: CoinmarketSellForm })),
     ),
-    'wallet-coinmarket-sell-detail': lazy(
-        () =>
-            import(
-                /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/sell_new/detail'
-            ),
+    'wallet-coinmarket-sell-detail': lazy(() =>
+        import(
+            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/sell/CoinmarketSellDetail'
+        ).then(({ CoinmarketSellDetail }) => ({ default: CoinmarketSellDetail })),
     ),
     'wallet-coinmarket-sell-offers': lazy(() =>
         import(
-            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/sell_new/CoinmarketSellOffers'
+            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/sell/CoinmarketSellOffers'
         ).then(({ CoinmarketSellOffers }) => ({ default: CoinmarketSellOffers })),
     ),
     'wallet-coinmarket-sell-confirm': lazy(() =>
         import(
-            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/sell_new/CoinmarketSellConfirm'
+            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/sell/CoinmarketSellConfirm'
         ).then(({ CoinmarketSellConfirm }) => ({ default: CoinmarketSellConfirm })),
     ),
     'wallet-coinmarket-exchange': lazy(() =>
         import(
-            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeForm'
+            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/exchange/CoinmarketExchangeForm'
         ).then(({ CoinmarketExchangeForm }) => ({ default: CoinmarketExchangeForm })),
     ),
-    'wallet-coinmarket-exchange-detail': lazy(
-        () =>
-            import(
-                /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/exchange_new/detail'
-            ),
+    'wallet-coinmarket-exchange-detail': lazy(() =>
+        import(
+            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/exchange/CoinmarketExchangeDetail'
+        ).then(({ CoinmarketExchangeDetail }) => ({ default: CoinmarketExchangeDetail })),
     ),
     'wallet-coinmarket-exchange-offers': lazy(() =>
         import(
-            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeOffers'
+            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/exchange/CoinmarketExchangeOffers'
         ).then(({ CoinmarketExchangeOffers }) => ({ default: CoinmarketExchangeOffers })),
     ),
     'wallet-coinmarket-exchange-confirm': lazy(() =>
         import(
-            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeConfirm'
+            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/exchange/CoinmarketExchangeConfirm'
         ).then(({ CoinmarketExchangeConfirm }) => ({ default: CoinmarketExchangeConfirm })),
     ),
-    'wallet-coinmarket-dca': lazy(
-        () => import(/* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/DCA'),
+    'wallet-coinmarket-dca': lazy(() =>
+        import(
+            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/DCA/CoinmarketDCALanding'
+        ).then(({ CoinmarketDCALanding }) => ({ default: CoinmarketDCALanding })),
     ),
-    'wallet-coinmarket-redirect': lazy(
-        () => import(/* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/redirect'),
+    'wallet-coinmarket-redirect': lazy(() =>
+        import(
+            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/redirect/CoinmarketRedirect'
+        ).then(({ CoinmarketRedirect }) => ({ default: CoinmarketRedirect })),
     ),
-    'wallet-coinmarket-transactions': lazy(
-        () =>
-            import(/* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/transactions'),
+    'wallet-coinmarket-transactions': lazy(() =>
+        import(
+            /* webpackChunkName: "coinmarket" */ 'src/views/wallet/coinmarket/transactions/CoinmarketTransactions'
+        ).then(({ CoinmarketTransactions }) => ({ default: CoinmarketTransactions })),
     ),
 
     // password-manager
diff --git a/packages/suite-web/src/support/useCypress.ts b/packages/suite-web/src/support/useCypress.ts
index 504deccd289..f350a472f15 100644
--- a/packages/suite-web/src/support/useCypress.ts
+++ b/packages/suite-web/src/support/useCypress.ts
@@ -1,7 +1,8 @@
 import { useEffect } from 'react';
-import TrezorConnect from '@trezor/connect';
 import { useStore } from 'react-redux';
 
+import TrezorConnect from '@trezor/connect';
+
 /**
  * Utility for running tests in Cypress.
  * Used to augment window object with redux store and TrezorConnect instance to make it accessible in tests
diff --git a/packages/suite-web/tsconfig.json b/packages/suite-web/tsconfig.json
index 853bf2ae107..b0713b02bcc 100644
--- a/packages/suite-web/tsconfig.json
+++ b/packages/suite-web/tsconfig.json
@@ -24,6 +24,7 @@
         },
         { "path": "../e2e-utils" },
         { "path": "../env-utils" },
+        { "path": "../eslint" },
         { "path": "../protobuf" },
         { "path": "../suite-analytics" },
         { "path": "../transport" },
diff --git a/packages/suite/.eslintrc.js b/packages/suite/.eslintrc.js
deleted file mode 100644
index b6bc898b654..00000000000
--- a/packages/suite/.eslintrc.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-    rules: {
-        'react/style-prop-object': ['error', { allow: ['FormattedNumber'] }],
-    },
-};
diff --git a/packages/suite/eslint.config.mjs b/packages/suite/eslint.config.mjs
new file mode 100644
index 00000000000..ac5334b936c
--- /dev/null
+++ b/packages/suite/eslint.config.mjs
@@ -0,0 +1,28 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'react/style-prop-object': [
+                'error',
+                {
+                    allow: ['FormattedNumber'],
+                },
+            ],
+            'no-restricted-syntax': 'off', // Todo: this should be fixed in codebase and this line removed
+            'import/no-default-export': 'off', // Todo: shall be solved one day, usually its legacy Components
+            'no-console': 'off', // Todo: we use it a lot, shall be disabled more granulary I think
+            '@typescript-eslint/no-shadow': 'off', // Todo: shall be fixed
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/src/support/tests/**',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/suite/jest.setup.js b/packages/suite/jest.setup.js
index 5211b0f566a..56a6f8ce2d9 100644
--- a/packages/suite/jest.setup.js
+++ b/packages/suite/jest.setup.js
@@ -1,3 +1,7 @@
+const { TextEncoder, TextDecoder } = require('util');
+
+Object.assign(global, { TextDecoder, TextEncoder });
+
 // Fixes issues with Buffer instanceof Uint8Array checks relevant for Solana tests.
 // See: https://github.com/solana-labs/solana-pay/issues/106#issuecomment-1713217913
 const originalHasInstance = Uint8Array[Symbol.hasInstance];
diff --git a/packages/suite/package.json b/packages/suite/package.json
index 77bea05f7dd..20e98a7d3b7 100644
--- a/packages/suite/package.json
+++ b/packages/suite/package.json
@@ -1,11 +1,10 @@
 {
     "name": "@trezor/suite",
-    "suiteVersion": "24.11.0",
+    "suiteVersion": "24.12.0",
     "version": "1.0.0",
     "private": true,
     "scripts": {
         "lint": "yarn lint:styles && yarn lint:js",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "lint:styles": "npx stylelint './src/**/*{.ts,.tsx}' --cache --config ../../.stylelintrc",
         "translations:format": "yarn g:prettier --write \"../suite-data/files/translations/*\"",
         "translations:extract": "formatjs extract src/support/messages.ts --format simple > ../suite-data/files/translations/master.json",
@@ -19,15 +18,15 @@
         "test-unit:watch": "yarn g:jest -o --watch"
     },
     "dependencies": {
-        "@everstake/wallet-sdk": "^0.3.49",
+        "@everstake/wallet-sdk": "^0.3.66",
         "@floating-ui/react": "^0.26.9",
         "@formatjs/intl": "2.10.0",
-        "@hookform/resolvers": "3.9.0",
+        "@hookform/resolvers": "3.9.1",
         "@mobily/ts-belt": "^3.13.1",
         "@reduxjs/toolkit": "1.9.5",
         "@sentry/core": "^7.100.1",
         "@solana/buffer-layout": "^4.0.1",
-        "@solana/web3.js": "^1.95.0",
+        "@solana/web3.js": "^1.95.4",
         "@suite-common/analytics": "workspace:*",
         "@suite-common/assets": "workspace:*",
         "@suite-common/connect-init": "workspace:*",
@@ -63,6 +62,7 @@
         "@trezor/coinjoin": "workspace:*",
         "@trezor/components": "workspace:*",
         "@trezor/connect": "workspace:*",
+        "@trezor/connect-web": "workspace:*",
         "@trezor/crypto-utils": "workspace:*",
         "@trezor/device-utils": "workspace:*",
         "@trezor/dom-utils": "workspace:*",
@@ -91,13 +91,12 @@
         "pako": "^2.1.0",
         "pdfmake": "^0.2.9",
         "polished": "^4.3.1",
-        "proxy-memoize": "2.0.2",
         "qrcode.react": "^3.1.0",
         "react": "18.2.0",
         "react-dom": "18.2.0",
         "react-focus-lock": "^2.9.7",
         "react-helmet-async": "^2.0.4",
-        "react-hook-form": "^7.53.0",
+        "react-hook-form": "^7.53.1",
         "react-intl": "^6.6.8",
         "react-qr-reader": "^2.2.1",
         "react-redux": "8.0.7",
@@ -113,7 +112,7 @@
         "redux-thunk": "^2.4.2",
         "semver": "^7.6.3",
         "styled-components": "^6.1.8",
-        "uuid": "^10.0.0",
+        "uuid": "^11.0.2",
         "web3-utils": "^4.3.1",
         "zxcvbn": "^4.4.2"
     },
@@ -122,6 +121,7 @@
         "@formatjs/cli": "^6.2.7",
         "@testing-library/react": "14.2.1",
         "@testing-library/user-event": "14.5.2",
+        "@trezor/eslint": "workspace:*",
         "@types/file-saver": "^2.0.6",
         "@types/invity-api": "^1.1.1",
         "@types/jws": "^3.2.10",
@@ -137,7 +137,6 @@
         "@types/redux-mock-store": "^1.0.6",
         "@types/semver": "^7.5.8",
         "@types/ua-parser-js": "^0.7.39",
-        "@types/uuid": "^10.0.0",
         "@types/zxcvbn": "^4.4.4",
         "jest-canvas-mock": "^2.5.2",
         "jest-watch-typeahead": "2.2.2",
diff --git a/packages/suite/src/actions/backup/__tests__/backupActions.test.ts b/packages/suite/src/actions/backup/__tests__/backupActions.test.ts
index 1cda432723a..6d2ab13d334 100644
--- a/packages/suite/src/actions/backup/__tests__/backupActions.test.ts
+++ b/packages/suite/src/actions/backup/__tests__/backupActions.test.ts
@@ -9,7 +9,7 @@ import { SUITE } from 'src/actions/suite/constants';
 import { BACKUP } from 'src/actions/backup/constants';
 import * as backupActions from 'src/actions/backup/backupActions';
 
-export const getInitialState = (override: any) => {
+const getInitialState = (override: any) => {
     const defaults = {
         suite: {
             locks: [3],
diff --git a/packages/suite/src/actions/firmware/__fixtures__/firmwareActions.ts b/packages/suite/src/actions/firmware/__fixtures__/firmwareActions.ts
index 306e2664d2c..8ea0d8e2962 100644
--- a/packages/suite/src/actions/firmware/__fixtures__/firmwareActions.ts
+++ b/packages/suite/src/actions/firmware/__fixtures__/firmwareActions.ts
@@ -52,7 +52,9 @@ export const actions = [
                 { type: firmwareActions.setStatus.type, payload: 'started' },
                 { type: firmwareActions.setTargetType.type, payload: FirmwareType.Regular },
                 { type: firmwareActions.cacheDevice.type, payload: bootloaderDevice },
+                { type: firmwareActions.clearInvalidHash.type, payload: 'device-id' },
                 { type: firmwareActions.setStatus.type, payload: 'done' },
+                { type: firmwareActions.setFirmwareUpdateError.type, payload: undefined },
             ],
             state: { firmware: { status: 'done' } },
         },
@@ -78,7 +80,9 @@ export const actions = [
                 { type: firmwareActions.setStatus.type, payload: 'started' },
                 { type: firmwareActions.setTargetType.type, payload: FirmwareType.BitcoinOnly },
                 { type: firmwareActions.cacheDevice.type, payload: bootloaderDevice },
+                { type: firmwareActions.clearInvalidHash.type, payload: 'device-id' },
                 { type: firmwareActions.setStatus.type, payload: 'done' },
+                { type: firmwareActions.setFirmwareUpdateError.type, payload: undefined },
             ],
             state: { firmware: { status: 'done' } },
         },
@@ -107,7 +111,9 @@ export const actions = [
                     type: firmwareActions.cacheDevice.type,
                     payload: bootloaderDeviceNeedsIntermediary,
                 },
+                { type: firmwareActions.clearInvalidHash.type, payload: 'device-id' },
                 { type: firmwareActions.setStatus.type, payload: 'done' },
+                { type: firmwareActions.setFirmwareUpdateError.type, payload: undefined },
             ],
             state: { firmware: { status: 'done' } },
         },
@@ -136,7 +142,9 @@ export const actions = [
                     type: firmwareActions.cacheDevice.type,
                     payload: bootloaderDeviceNoIntermediaryT1,
                 },
+                { type: firmwareActions.clearInvalidHash.type, payload: 'device-id' },
                 { type: firmwareActions.setStatus.type, payload: 'done' },
+                { type: firmwareActions.setFirmwareUpdateError.type, payload: undefined },
             ],
             state: { firmware: { status: 'done' } },
         },
@@ -178,7 +186,7 @@ export const actions = [
                 { type: firmwareActions.setTargetType.type, payload: FirmwareType.Regular },
                 { type: firmwareActions.cacheDevice.type, payload: bootloaderDevice },
                 { type: firmwareActions.setStatus.type, payload: 'error' },
-                { type: firmwareActions.setError.type, payload: 'foo' },
+                { type: firmwareActions.setFirmwareUpdateError.type, payload: 'foo' },
             ],
         },
     },
@@ -206,7 +214,10 @@ export const actions = [
                 { type: firmwareActions.setTargetType.type, payload: FirmwareType.Regular },
                 { type: firmwareActions.cacheDevice.type, payload: bootloaderDevice },
                 { type: firmwareActions.setStatus.type, payload: 'error' },
-                { type: firmwareActions.setError.type, payload: 'Firmware install failed' },
+                {
+                    type: firmwareActions.setFirmwareUpdateError.type,
+                    payload: 'Firmware install failed',
+                },
             ],
         },
     },
diff --git a/packages/suite/src/actions/firmware/__tests__/firmwareActions.test.ts b/packages/suite/src/actions/firmware/__tests__/firmwareActions.test.ts
index d7fd8f13e2b..f62312f636f 100644
--- a/packages/suite/src/actions/firmware/__tests__/firmwareActions.test.ts
+++ b/packages/suite/src/actions/firmware/__tests__/firmwareActions.test.ts
@@ -20,7 +20,7 @@ interface InitialState {
 
 jest.doMock('@trezor/suite-analytics', () => testMocks.getAnalytics());
 
-export const getInitialState = (override?: InitialState): any => {
+const getInitialState = (override?: InitialState): any => {
     const suite = override ? override.suite : undefined;
     const device = override ? override.device : undefined;
 
diff --git a/packages/suite/src/actions/onboarding/__tests__/onboardingActions.test.ts b/packages/suite/src/actions/onboarding/__tests__/onboardingActions.test.ts
index 1b1456057f5..8db3ce3e8e3 100644
--- a/packages/suite/src/actions/onboarding/__tests__/onboardingActions.test.ts
+++ b/packages/suite/src/actions/onboarding/__tests__/onboardingActions.test.ts
@@ -1,12 +1,11 @@
 import { configureStore } from 'src/support/tests/configureStore';
-
 import onboardingReducer from 'src/reducers/onboarding/onboardingReducer';
 import suiteReducer from 'src/reducers/suite/suiteReducer';
 import recoveryReducer from 'src/reducers/recovery/recoveryReducer';
-import fixtures from '../__fixtures__/onboardingActions';
-
 import { Action } from 'src/types/suite';
 
+import fixtures from '../__fixtures__/onboardingActions';
+
 // todo fighting with typescript here. How to keep string literal being exported from fixtures and not converted
 // to string? if exported as const, it makes all properties readonly and thus not assignable to reducer which
 // expects mutable properties;
@@ -18,7 +17,7 @@ import { Action } from 'src/types/suite';
 //     suite?: SuiteState;
 // }
 
-export const getInitialState = (custom?: any) => {
+const getInitialState = (custom?: any) => {
     const suite = custom ? custom.suite : undefined;
     const onboarding = custom ? custom.onboarding : undefined;
 
diff --git a/packages/suite/src/actions/recovery/__tests__/recoveryActions.test.ts b/packages/suite/src/actions/recovery/__tests__/recoveryActions.test.ts
index 73d1fd10f96..73835958164 100644
--- a/packages/suite/src/actions/recovery/__tests__/recoveryActions.test.ts
+++ b/packages/suite/src/actions/recovery/__tests__/recoveryActions.test.ts
@@ -5,7 +5,7 @@ import recoveryReducer from 'src/reducers/recovery/recoveryReducer';
 import { Action } from 'src/types/suite';
 import * as recoveryActions from 'src/actions/recovery/recoveryActions';
 
-export const getInitialState = (custom?: any): any => ({
+const getInitialState = (custom?: any): any => ({
     suite: {
         flags: {},
         locks: [],
diff --git a/packages/suite/src/actions/recovery/recoveryActions.ts b/packages/suite/src/actions/recovery/recoveryActions.ts
index 991ae26435d..9f93542f60b 100644
--- a/packages/suite/src/actions/recovery/recoveryActions.ts
+++ b/packages/suite/src/actions/recovery/recoveryActions.ts
@@ -8,6 +8,7 @@ import * as routerActions from 'src/actions/suite/routerActions';
 import { Dispatch, GetState } from 'src/types/suite';
 import { WordCount } from 'src/types/recovery';
 import { DEFAULT_PASSPHRASE_PROTECTION } from 'src/constants/suite/device';
+
 import { isRecoveryInProgress } from '../../utils/device/isRecoveryInProgress';
 
 export type SeedInputStatus =
@@ -21,7 +22,7 @@ export type SeedInputStatus =
 export type RecoveryAction =
     | { type: typeof RECOVERY.SET_WORDS_COUNT; payload: WordCount }
     | { type: typeof RECOVERY.SET_ADVANCED_RECOVERY; payload: boolean }
-    | { type: typeof RECOVERY.SET_ERROR; payload: string }
+    | { type: typeof RECOVERY.SET_ERROR; payload: string | undefined }
     | { type: typeof RECOVERY.SET_STATUS; payload: SeedInputStatus }
     | { type: typeof RECOVERY.RESET_REDUCER };
 
@@ -35,7 +36,7 @@ const setAdvancedRecovery = (value: boolean): RecoveryAction => ({
     payload: value,
 });
 
-const setError = (payload: string): RecoveryAction => ({
+const setError = (payload: string | undefined): RecoveryAction => ({
     type: RECOVERY.SET_ERROR,
     payload,
 });
@@ -59,7 +60,7 @@ const checkSeed = () => async (dispatch: Dispatch, getState: GetState) => {
 
     if (!device?.features) return;
 
-    dispatch(setError(''));
+    dispatch(setError(undefined));
 
     if (device.features.internal_model === DeviceModelInternal.T1B1) {
         dispatch(setStatus('waiting-for-confirmation'));
@@ -100,7 +101,7 @@ const recoverDevice = () => async (dispatch: Dispatch, getState: GetState) => {
     if (!device?.features) {
         return;
     }
-    dispatch(setError(''));
+    dispatch(setError(undefined));
 
     if (device.features.internal_model === DeviceModelInternal.T1B1) {
         dispatch(setStatus('waiting-for-confirmation'));
diff --git a/packages/suite/src/actions/settings/__fixtures__/deviceSettings.ts b/packages/suite/src/actions/settings/__fixtures__/deviceSettings.ts
index 38b70d533bd..159b6ce2095 100644
--- a/packages/suite/src/actions/settings/__fixtures__/deviceSettings.ts
+++ b/packages/suite/src/actions/settings/__fixtures__/deviceSettings.ts
@@ -1,3 +1,5 @@
+import assert from 'assert';
+
 import { testMocks } from '@suite-common/test-utils';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import {
@@ -5,14 +7,13 @@ import {
     deviceActions,
     prepareDeviceReducer,
 } from '@suite-common/wallet-core';
-import suiteReducer from 'src/reducers/suite/suiteReducer';
+import { TrezorDevice } from '@suite-common/suite-types';
+import { Response } from '@trezor/connect';
 
+import suiteReducer from 'src/reducers/suite/suiteReducer';
 import { extraDependencies } from 'src/support/extraDependencies';
 
 import * as deviceSettingsActions from '../deviceSettingsActions';
-import { TrezorDevice } from '@suite-common/suite-types';
-import { Response } from '@trezor/connect';
-import assert from 'assert';
 
 const { getSuiteDevice } = testMocks;
 
@@ -154,7 +155,7 @@ const fixture: Feature[] = [
                             connected: true,
                             available: false,
                             instance: 1,
-                            state: '1stTestnetAddress@device_1_id:0',
+                            state: { staticSessionId: '1stTestnetAddress@device_1_id:0' },
                             features: { ...deviceChange.features, device_id: 'device-id' },
                         },
                         settings: SUITE_SETTINGS,
@@ -169,7 +170,7 @@ const fixture: Feature[] = [
                             connected: true,
                             available: false,
                             instance: 2,
-                            state: '1stTestnetAddress@device_2_id:0',
+                            state: { staticSessionId: '1stTestnetAddress@device_2_id:0' },
                             features: { ...deviceChange.features, device_id: 'device-id' },
                         },
                         settings: SUITE_SETTINGS,
@@ -197,7 +198,7 @@ const fixture: Feature[] = [
                             connected: true,
                             available: true,
                             instance: 1,
-                            state: '1stTestnetAddress@device_1_id:0',
+                            state: { staticSessionId: '1stTestnetAddress@device_1_id:0' },
                             features: { ...deviceChange.features, device_id: 'new-device-id' },
                         },
                         settings: SUITE_SETTINGS,
@@ -212,7 +213,7 @@ const fixture: Feature[] = [
                             connected: true,
                             available: true,
                             instance: 2,
-                            state: '1stTestnetAddress@device_2_id:0',
+                            state: { staticSessionId: '1stTestnetAddress@device_2_id:0' },
                             features: { ...deviceChange.features, device_id: 'new-device-id' },
                         },
                         settings: SUITE_SETTINGS,
diff --git a/packages/suite/src/actions/settings/__fixtures__/walletSettings.ts b/packages/suite/src/actions/settings/__fixtures__/walletSettings.ts
index dd8cbf55380..6afaea12dfd 100644
--- a/packages/suite/src/actions/settings/__fixtures__/walletSettings.ts
+++ b/packages/suite/src/actions/settings/__fixtures__/walletSettings.ts
@@ -46,7 +46,7 @@ export default [
         initialState: { enabledNetworks: [] },
         action: () => walletSettingsActions.changeNetworks(['ltc', 'eth']),
         result: {
-            enabledNetworks: ['ltc', 'eth'],
+            enabledNetworks: ['eth', 'ltc'],
         },
     },
     {
diff --git a/packages/suite/src/actions/settings/__tests__/deviceSettingsActions.test.ts b/packages/suite/src/actions/settings/__tests__/deviceSettingsActions.test.ts
index 418feb72c17..c899af8e2f3 100644
--- a/packages/suite/src/actions/settings/__tests__/deviceSettingsActions.test.ts
+++ b/packages/suite/src/actions/settings/__tests__/deviceSettingsActions.test.ts
@@ -16,7 +16,7 @@ jest.doMock('@trezor/suite-analytics', () => testMocks.getAnalytics());
 
 const DEVICE = getSuiteDevice({ path: '1', connected: true });
 
-export const getInitialState = (state: Partial<DeviceSettingsFixtureState> = {}) => ({
+const getInitialState = (state: Partial<DeviceSettingsFixtureState> = {}) => ({
     suite: {
         ...suiteReducer(undefined, { type: '@suite/init' }),
     },
diff --git a/packages/suite/src/actions/settings/__tests__/walletSettingsActions.test.ts b/packages/suite/src/actions/settings/__tests__/walletSettingsActions.test.ts
index 7166d0a8c5b..54c672f6644 100644
--- a/packages/suite/src/actions/settings/__tests__/walletSettingsActions.test.ts
+++ b/packages/suite/src/actions/settings/__tests__/walletSettingsActions.test.ts
@@ -3,9 +3,10 @@ import { testMocks } from '@suite-common/test-utils';
 import { configureStore } from 'src/support/tests/configureStore';
 import settingsReducer from 'src/reducers/wallet/settingsReducer';
 import suiteReducer from 'src/reducers/suite/suiteReducer';
+
 import fixtures from '../__fixtures__/walletSettings';
 
-export const getInitialState = (settings?: any) => ({
+const getInitialState = (settings?: any) => ({
     suite: { ...suiteReducer(undefined, { type: 'foo' } as any) },
     wallet: {
         settings: {
diff --git a/packages/suite/src/actions/settings/deviceSettingsActions.ts b/packages/suite/src/actions/settings/deviceSettingsActions.ts
index 38abe426527..fd9e7a22fc9 100644
--- a/packages/suite/src/actions/settings/deviceSettingsActions.ts
+++ b/packages/suite/src/actions/settings/deviceSettingsActions.ts
@@ -8,12 +8,13 @@ import * as deviceUtils from '@suite-common/suite-utils';
 import TrezorConnect, { ERRORS } from '@trezor/connect';
 import { analytics, EventType } from '@trezor/suite-analytics';
 import { notificationsActions } from '@suite-common/toast-notifications';
+import { createThunk } from '@suite-common/redux-utils';
 
 import * as modalActions from 'src/actions/suite/modalActions';
 import * as routerActions from 'src/actions/suite/routerActions';
 import { Dispatch, GetState } from 'src/types/suite';
 import * as DEVICE from 'src/constants/suite/device';
-import { createThunk } from '@suite-common/redux-utils';
+
 import { selectSuiteSettings } from '../../reducers/suite/suiteReducer';
 
 export const applySettings =
diff --git a/packages/suite/src/actions/settings/walletSettingsActions.ts b/packages/suite/src/actions/settings/walletSettingsActions.ts
index 7629af34b78..f3000ecedac 100644
--- a/packages/suite/src/actions/settings/walletSettingsActions.ts
+++ b/packages/suite/src/actions/settings/walletSettingsActions.ts
@@ -1,13 +1,14 @@
-import * as suiteActions from 'src/actions/suite/suiteActions';
-import { Dispatch, GetState } from 'src/types/suite';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 import { createAction } from '@reduxjs/toolkit';
 
+import { NetworkSymbol } from '@suite-common/wallet-config';
 import { UNIT_ABBREVIATIONS } from '@suite-common/suite-constants';
 import { FeeLevel, PROTO } from '@trezor/connect';
 import { analytics, EventType } from '@trezor/suite-analytics';
 import { FiatCurrencyCode } from '@suite-common/suite-config';
 
+import { Dispatch, GetState } from 'src/types/suite';
+import * as suiteActions from 'src/actions/suite/suiteActions';
+
 import { WALLET_SETTINGS } from './constants';
 
 export const setLocalCurrency = createAction(
diff --git a/packages/suite/src/actions/suite/__fixtures__/metadataActions.ts b/packages/suite/src/actions/suite/__fixtures__/metadataActions.ts
index 2432055497f..f913b01116e 100644
--- a/packages/suite/src/actions/suite/__fixtures__/metadataActions.ts
+++ b/packages/suite/src/actions/suite/__fixtures__/metadataActions.ts
@@ -4,8 +4,10 @@ import { deviceActions } from '@suite-common/wallet-core';
 import { METADATA, METADATA_LABELING } from 'src/actions/suite/constants/';
 
 import * as metadataLabelingActions from '../metadataLabelingActions';
+import * as metadataProviderActions from '../metadataProviderActions';
+import * as metadataActions from '../metadataActions';
 
-const { getSuiteDevice } = testMocks;
+const { getSuiteDevice, getWalletAccount } = testMocks;
 
 type Fixture<T extends (...a: any) => any> = {
     description: string;
@@ -60,7 +62,11 @@ const setDeviceMetadataKey: Fixture<(typeof metadataLabelingActions)['setDeviceM
             metadata: {
                 enabled: true,
             },
-            device: { state: '1stTestnetAddress@device_id:0', connected: true, metadata: {} },
+            device: {
+                state: { staticSessionId: '1stTestnetAddress@device_id:0' },
+                connected: true,
+                metadata: {},
+            },
         },
         result: [
             {
@@ -88,54 +94,55 @@ const setDeviceMetadataKey: Fixture<(typeof metadataLabelingActions)['setDeviceM
                             key: '20c8bf0701213cdcf4c2f56fd0096c1772322d42fb9c4d0ddf6bb122d713d2f3',
                         },
                     },
-                    state: '1stTestnetAddress@device_id:0',
+                    state: { staticSessionId: '1stTestnetAddress@device_id:0' },
                 },
             },
         ],
     },
 ];
 
-const setAccountMetadataKey = [
-    {
-        description: `Account m/49'/0'/0'`,
-        initialState: {
-            device: {
-                state: 'a',
-                metadata: {
-                    1: {
-                        key: '20c8bf0701213cdcf4c2f56fd0096c1772322d42fb9c4d0ddf6bb122d713d2f3',
+const setAccountMetadataKey: Fixture<(typeof metadataLabelingActions)['setAccountMetadataKey']>[] =
+    [
+        {
+            description: `Account m/49'/0'/0'`,
+            initialState: {
+                device: {
+                    state: { staticSessionId: '1stTestnetAddress@device_id:0' },
+                    metadata: {
+                        1: {
+                            key: '20c8bf0701213cdcf4c2f56fd0096c1772322d42fb9c4d0ddf6bb122d713d2f3',
+                        },
                     },
                 },
             },
-        },
-        params: [
-            {
+            params: [
+                getWalletAccount({
+                    metadata: {
+                        key: 'xpub6CVKsQYXc9awxgV1tWbG4foDvdcnieK2JkbpPEBKB5WwAPKBZ1mstLbKVB4ov7QzxzjaxNK6EfmNY5Jsk2cG26EVcEkycGW4tchT2dyUhrx',
+                    },
+                    deviceState: '1stTestnetAddress@device_id:0',
+                }),
+            ],
+            result: {
                 metadata: {
-                    key: 'xpub6CVKsQYXc9awxgV1tWbG4foDvdcnieK2JkbpPEBKB5WwAPKBZ1mstLbKVB4ov7QzxzjaxNK6EfmNY5Jsk2cG26EVcEkycGW4tchT2dyUhrx',
-                },
-                deviceState: 'a',
-            },
-        ],
-        result: {
-            metadata: {
-                1: {
-                    fileName:
-                        '828652b66f2e6f919fbb7fe4c9609d4891ed531c6fac4c28441e53ebe577ac85.mtdt',
-                    aesKey: '9bc3736f0b45cd681854a724b5bba67b9da1e50bc9983fd2dd56e53e74b75480',
+                    1: {
+                        fileName:
+                            '828652b66f2e6f919fbb7fe4c9609d4891ed531c6fac4c28441e53ebe577ac85.mtdt',
+                        aesKey: '9bc3736f0b45cd681854a724b5bba67b9da1e50bc9983fd2dd56e53e74b75480',
+                    },
                 },
             },
         },
-    },
-];
+    ];
 
-const addDeviceMetadata = [
+const addDeviceMetadata: Fixture<(typeof metadataLabelingActions)['addDeviceMetadata']>[] = [
     {
         description: `Without device`,
         initialState: {
             metadata: { selectedProvider: { type: 'dropbox', key: 'A' }, providers: [] },
             device: { state: undefined },
         },
-        params: { type: 'walletLabel', deviceState: '1stTestnetAddress@device_id:0' },
+        params: [{ type: 'walletLabel', entityKey: '1stTestnetAddress@device_id:0' }],
         result: undefined,
     },
     {
@@ -154,16 +161,18 @@ const addDeviceMetadata = [
                 },
             },
         },
-        params: {
-            type: 'walletLabel',
-            deviceState: '1stTestnetAddress@device_id:0',
-            value: 'Custom label',
-        },
+        params: [
+            {
+                type: 'walletLabel',
+                entityKey: '1stTestnetAddress@device_id:0',
+                value: 'Custom label',
+            },
+        ],
         result: {},
     },
 ];
 
-const addAccountMetadata = [
+const addAccountMetadata: Fixture<(typeof metadataLabelingActions)['addAccountMetadata']>[] = [
     {
         description: `Without provider`,
         initialState: {
@@ -171,7 +180,15 @@ const addAccountMetadata = [
                 providers: [],
             },
         },
-        params: {},
+        params: [
+            {
+                type: 'outputLabel',
+                entityKey: 'account',
+                txid: 'TXID',
+                outputIndex: 0,
+                value: 'Foo',
+            },
+        ],
         result: undefined,
     },
     {
@@ -182,7 +199,15 @@ const addAccountMetadata = [
                 providers: [{ type: 'dropbox', data: {}, clientId: 'clientId' }],
             },
         },
-        params: {},
+        params: [
+            {
+                type: 'outputLabel',
+                entityKey: 'account',
+                txid: 'TXID',
+                outputIndex: 0,
+                value: 'Foo',
+            },
+        ],
         result: undefined,
     },
     {
@@ -209,6 +234,7 @@ const addAccountMetadata = [
             },
             accounts: [
                 {
+                    key: 'account',
                     metadata: {
                         [METADATA_LABELING.ENCRYPTION_VERSION]: {
                             aesKey: '9bc3736f0b45cd681854a724b5bba67b9da1e50bc9983fd2dd56e53e74b75480',
@@ -218,12 +244,15 @@ const addAccountMetadata = [
                 },
             ],
         },
-        params: {
-            type: 'outputLabel',
-            txid: 'TXID',
-            outputIndex: 0,
-            value: 'Foo',
-        },
+        params: [
+            {
+                type: 'outputLabel',
+                entityKey: 'account',
+                txid: 'TXID',
+                outputIndex: 0,
+                value: 'Foo',
+            },
+        ],
         result: [
             {
                 type: '@metadata/set-data',
@@ -272,6 +301,7 @@ const addAccountMetadata = [
             },
             accounts: [
                 {
+                    key: 'account',
                     metadata: {
                         1: {
                             aesKey: '9bc3736f0b45cd681854a724b5bba67b9da1e50bc9983fd2dd56e53e74b75480',
@@ -281,12 +311,15 @@ const addAccountMetadata = [
                 },
             ],
         },
-        params: {
-            type: 'outputLabel',
-            txid: 'TXID',
-            outputIndex: 0,
-            value: '', // empty string removes value
-        },
+        params: [
+            {
+                type: 'outputLabel',
+                entityKey: 'account',
+                txid: 'TXID',
+                outputIndex: 0,
+                value: '', // empty string removes value
+            },
+        ],
         result: [
             {
                 payload: {
@@ -303,13 +336,13 @@ const addAccountMetadata = [
     },
 ];
 
-const connectProvider = [
+const connectProvider: Fixture<(typeof metadataProviderActions)['connectProvider']>[] = [
     {
         description: 'Dropbox',
         initialState: {
             metadata: undefined,
         },
-        params: { type: 'dropbox' },
+        params: [{ type: 'dropbox' }],
         result: [
             {
                 type: '@metadata/add-provider',
@@ -335,7 +368,7 @@ const connectProvider = [
     // todo: singleton (instance) behavior
 ];
 
-const addMetadata = [
+const addMetadata: Fixture<(typeof metadataLabelingActions)['addMetadata']>[] = [
     {
         description: 'does not need update',
         initialState: {
@@ -358,12 +391,14 @@ const addMetadata = [
                 metadata: {},
             },
         },
-        params: {
-            accountKey: 'account-key',
-            defaultValue: "m/84'/0'/0'",
-            type: 'accountLabel',
-            value: undefined,
-        },
+        params: [
+            {
+                entityKey: 'account-key',
+                defaultValue: "m/84'/0'/0'",
+                type: 'accountLabel',
+                value: undefined,
+            },
+        ],
         result: [],
     },
     {
@@ -388,22 +423,25 @@ const addMetadata = [
                 metadata: {},
             },
         },
-        params: {
-            accountKey: 'account-key',
-            defaultValue: "m/84'/0'/0'",
-            type: 'accountLabel',
-            value: 'my label', // see store setup in tests
-        },
+        params: [
+            {
+                entityKey: 'account-key',
+                defaultValue: "m/84'/0'/0'",
+                type: 'accountLabel',
+                value: 'my label', // see store setup in tests
+            },
+        ],
         result: [],
     },
 ];
 
-export const enableMetadata = [
+export const enableMetadata: Fixture<(typeof metadataActions)['enableMetadata']>[] = [
     {
         description: 'enable metadata',
         initialState: {
             metadata: { enabled: true, providers: [] },
         },
+        params: [],
         result: [
             {
                 type: METADATA.ENABLE,
@@ -412,7 +450,7 @@ export const enableMetadata = [
     },
 ];
 
-export const disableMetadata = [
+export const disableMetadata: Fixture<(typeof metadataActions)['disableMetadata']>[] = [
     {
         description: 'disable metadata',
         initialState: {
@@ -421,6 +459,7 @@ export const disableMetadata = [
                 state: undefined,
             },
         },
+        params: [],
         result: [
             {
                 type: METADATA.DISABLE,
@@ -429,19 +468,20 @@ export const disableMetadata = [
     },
 ];
 
-const init = [
+const init: Fixture<(typeof metadataLabelingActions)['init']>[] = [
     {
         description: 'device without state',
         initialState: {
             device: { state: undefined },
         },
+        params: [false],
         result: [],
     },
     {
         description: 'metadata already enabled',
         initialState: {
             device: {
-                state: '1stTestnetAddress@device_id:0',
+                state: { staticSessionId: '1stTestnetAddress@device_id:0' },
                 connected: true,
                 metadata: {
                     1: {
@@ -458,6 +498,7 @@ const init = [
                 providers: [],
             },
         },
+        params: [false],
         result: [
             { type: '@metadata/set-initiating', payload: true },
             {
@@ -486,7 +527,11 @@ const init = [
     {
         description: 'metadata not enabled',
         initialState: {
-            device: { state: '1stTestnetAddress@device_id:0', connected: true, metadata: {} },
+            device: {
+                state: { staticSessionId: '1stTestnetAddress@device_id:0' },
+                connected: true,
+                metadata: {},
+            },
             metadata: {
                 enabled: false,
                 providers: [],
@@ -494,6 +539,7 @@ const init = [
             },
             suite: { online: true },
         },
+        params: [false],
         result: [
             { type: '@metadata/set-initiating', payload: true },
             { type: '@metadata/enable' },
@@ -514,7 +560,7 @@ const init = [
             {
                 type: deviceActions.updateSelectedDevice.type,
                 payload: {
-                    state: '1stTestnetAddress@device_id:0',
+                    state: { staticSessionId: '1stTestnetAddress@device_id:0' },
                     connected: true,
                     metadata: {
                         1: {
@@ -551,7 +597,7 @@ const init = [
     },
 ];
 
-const disposeMetadata = [
+const disposeMetadata: Fixture<(typeof metadataActions)['disposeMetadata']>[] = [
     {
         description: '',
         initialState: {
@@ -593,7 +639,7 @@ const disposeMetadata = [
     },
 ];
 
-const disposeMetadataKeys = [
+const disposeMetadataKeys: Fixture<(typeof metadataActions)['disposeMetadataKeys']>[] = [
     {
         description: 'keys',
         initialState: {
diff --git a/packages/suite/src/actions/suite/__fixtures__/routerActions.ts b/packages/suite/src/actions/suite/__fixtures__/routerActions.ts
index 912d9ec5a44..f9adbc6fa2d 100644
--- a/packages/suite/src/actions/suite/__fixtures__/routerActions.ts
+++ b/packages/suite/src/actions/suite/__fixtures__/routerActions.ts
@@ -41,18 +41,14 @@ export const onBeforePopState = [
     {
         description: `router locked`,
         state: {
-            suite: {
-                locks: [1],
-            },
+            suite: { locks: { router: 1 } },
         },
         result: false,
     },
     {
         description: `device locked`,
         state: {
-            suite: {
-                locks: [3],
-            },
+            suite: { locks: { ui: 1 } },
         },
         result: false,
     },
@@ -88,9 +84,7 @@ export const goto = [
     {
         description: `ui locked`,
         state: {
-            suite: {
-                locks: [3],
-            },
+            suite: { locks: { ui: 1 } },
         },
         url: 'wallet-index',
     },
@@ -118,9 +112,7 @@ export const initialRedirection = [
     {
         description: `router locked`,
         state: {
-            suite: {
-                locks: [1],
-            },
+            suite: { locks: { router: 1 } },
         },
         app: 'start',
     },
diff --git a/packages/suite/src/actions/suite/__fixtures__/suiteActions.ts b/packages/suite/src/actions/suite/__fixtures__/suiteActions.ts
index 47f10d4f0d8..e8507210b2a 100644
--- a/packages/suite/src/actions/suite/__fixtures__/suiteActions.ts
+++ b/packages/suite/src/actions/suite/__fixtures__/suiteActions.ts
@@ -73,38 +73,17 @@ const reducerActions = [
     {
         description: `lockUI (true/false)`,
         actions: [suiteActions.lockUI(true), suiteActions.lockUI(false)],
-        result: [
-            {
-                locks: [SUITE.LOCK_TYPE.UI],
-            },
-            {
-                locks: [],
-            },
-        ],
+        result: [{ locks: { ui: 1 } }, { locks: { ui: 0 } }],
     },
     {
         description: `lockDevice (true/false)`,
         actions: [suiteActions.lockDevice(true), suiteActions.lockDevice(false)],
-        result: [
-            {
-                locks: [SUITE.LOCK_TYPE.DEVICE],
-            },
-            {
-                locks: [],
-            },
-        ],
+        result: [{ locks: { device: 1 } }, { locks: { device: 0 } }],
     },
     {
         description: `lockRouter (true/false)`,
         actions: [suiteActions.lockRouter(true), suiteActions.lockRouter(false)],
-        result: [
-            {
-                locks: [SUITE.LOCK_TYPE.ROUTER],
-            },
-            {
-                locks: [],
-            },
-        ],
+        result: [{ locks: { router: 1 } }, { locks: { router: 0 } }],
     },
     {
         description: `updateOnlineStatus (true/false)`,
@@ -206,18 +185,10 @@ const reducerActions = [
             },
         ],
         result: [
-            {
-                locks: [SUITE.LOCK_TYPE.DEVICE],
-            },
-            {
-                locks: [],
-            },
-            {
-                locks: [SUITE.LOCK_TYPE.DEVICE],
-            },
-            {
-                locks: [],
-            },
+            { locks: { device: 1 } },
+            { locks: { device: 0 } },
+            { locks: { device: 1 } },
+            { locks: { device: 0 } },
         ],
     },
 ];
@@ -247,6 +218,7 @@ const initialRun = [
                 isDashboardPassphraseBannerVisible: true,
                 showCopyAddressModal: true,
                 showUnhideTokenModal: true,
+                enableAutoupdateOnNextRun: false,
             },
         },
     },
diff --git a/packages/suite/src/actions/suite/__tests__/analyticsActions.test.ts b/packages/suite/src/actions/suite/__tests__/analyticsActions.test.ts
index 8f8104e1f36..50ebd37c650 100644
--- a/packages/suite/src/actions/suite/__tests__/analyticsActions.test.ts
+++ b/packages/suite/src/actions/suite/__tests__/analyticsActions.test.ts
@@ -1,9 +1,9 @@
+import { prepareAnalyticsReducer, analyticsActions } from '@suite-common/analytics';
+
 import { extraDependencies } from 'src/support/extraDependencies';
 import { configureStore } from 'src/support/tests/configureStore';
 import { init } from 'src/actions/suite/analyticsActions';
 
-import { prepareAnalyticsReducer, analyticsActions } from '@suite-common/analytics';
-
 const analyticsReducer = prepareAnalyticsReducer(extraDependencies);
 
 type AnalyticsState = ReturnType<typeof analyticsReducer>;
@@ -12,7 +12,7 @@ type InitialState = {
     analytics: Partial<AnalyticsState>;
 };
 
-export const getInitialState = (state?: InitialState) => ({
+const getInitialState = (state?: InitialState) => ({
     analytics: {
         ...analyticsReducer(undefined, { type: 'foo' } as any),
         ...state?.analytics,
diff --git a/packages/suite/src/actions/suite/__tests__/initAction.test.ts b/packages/suite/src/actions/suite/__tests__/initAction.test.ts
index 9f024da2a3b..f17265543d8 100644
--- a/packages/suite/src/actions/suite/__tests__/initAction.test.ts
+++ b/packages/suite/src/actions/suite/__tests__/initAction.test.ts
@@ -260,7 +260,6 @@ describe('Suite init action', () => {
             const store = initStore(getInitialState(options.initialRun));
 
             if (options?.initialPath) {
-                // eslint-disable-next-line @typescript-eslint/no-var-requires
                 require('src/support/history').default.location.pathname = options.initialPath;
             }
 
diff --git a/packages/suite/src/actions/suite/__tests__/metadataActions.test.ts b/packages/suite/src/actions/suite/__tests__/metadataActions.test.ts
index e96f95bcffc..9f9f6fe3f79 100644
--- a/packages/suite/src/actions/suite/__tests__/metadataActions.test.ts
+++ b/packages/suite/src/actions/suite/__tests__/metadataActions.test.ts
@@ -46,14 +46,14 @@ interface InitialState {
     suite: Partial<SuiteState>;
 }
 
-export const getInitialState = (state?: InitialState) => {
+const getInitialState = (state?: InitialState) => {
     const metadata = state ? state.metadata : undefined;
     const suite = state ? state.suite : {};
 
     const device = state
         ? state.device
         : {
-              state: '1stTestnetAddress@device_id:0',
+              state: { staticSessionId: '1stTestnetAddress@device_id:0' },
               connected: true,
               metadata: { status: 'disabled' },
           };
@@ -172,10 +172,8 @@ describe('Metadata Actions', () => {
 
     fixtures.setAccountMetadataKey.forEach(f => {
         it(`setAccountMetadataKey - ${f.description}`, async () => {
-            // @ts-expect-error
             const store = initStore(getInitialState(f.initialState));
             const account = await store.dispatch(
-                // @ts-expect-error Account is not complete
                 metadataLabelingActions.setAccountMetadataKey(...f.params),
             );
             expect(account).toMatchObject(f.result);
@@ -184,10 +182,8 @@ describe('Metadata Actions', () => {
 
     fixtures.addDeviceMetadata.forEach(f => {
         it(`addDeviceMetadata - ${f.description}`, async () => {
-            // @ts-expect-error
             const store = initStore(getInitialState(f.initialState));
-            // @ts-expect-error, params
-            await store.dispatch(metadataLabelingActions.addDeviceMetadata(f.params));
+            await store.dispatch(metadataLabelingActions.addDeviceMetadata(...f.params));
             if (!f.result) {
                 expect(store.getActions().length).toEqual(0);
             }
@@ -196,10 +192,8 @@ describe('Metadata Actions', () => {
 
     fixtures.addAccountMetadata.forEach(f => {
         it(`addAccountMetadata - ${f.description}`, async () => {
-            // @ts-expect-error
             const store = initStore(getInitialState(f.initialState));
-            // @ts-expect-error, params
-            await store.dispatch(metadataLabelingActions.addAccountMetadata(f.params));
+            await store.dispatch(metadataLabelingActions.addAccountMetadata(...f.params));
 
             const result = store.getActions();
             if (!f.result) {
@@ -212,10 +206,8 @@ describe('Metadata Actions', () => {
 
     fixtures.connectProvider.forEach(f => {
         it(`connectProvider - ${f.description}`, async () => {
-            // @ts-expect-error
             const store = initStore(getInitialState(f.initialState));
-            // @ts-expect-error, params
-            const result = await store.dispatch(metadataProviderActions.connectProvider(f.params));
+            await store.dispatch(metadataProviderActions.connectProvider(...f.params));
 
             if (!f.result) {
                 expect(store.getActions().length).toEqual(0);
@@ -227,11 +219,9 @@ describe('Metadata Actions', () => {
 
     fixtures.addMetadata.forEach(f => {
         it(`add metadata - ${f.description}`, async () => {
-            // @ts-expect-error
             const store = initStore(getInitialState(f.initialState));
 
-            // @ts-expect-error, params
-            const result = await store.dispatch(metadataLabelingActions.addMetadata(f.params));
+            await store.dispatch(metadataLabelingActions.addMetadata(...f.params));
 
             if (!f.result) {
                 expect(store.getActions().length).toEqual(0);
@@ -243,10 +233,8 @@ describe('Metadata Actions', () => {
 
     fixtures.enableMetadata.forEach(f => {
         it(`enableMetadata - ${f.description}`, async () => {
-            // @ts-expect-error
             const store = initStore(getInitialState(f.initialState));
-            // @ts-expect-error, params
-            const result = await store.dispatch(metadataActions.enableMetadata());
+            await store.dispatch(metadataActions.enableMetadata());
             if (!f.result) {
                 expect(store.getActions().length).toEqual(0);
             } else {
@@ -257,10 +245,8 @@ describe('Metadata Actions', () => {
 
     fixtures.disableMetadata.forEach(f => {
         it(`disableMetadata - ${f.description}`, async () => {
-            // @ts-expect-error
             const store = initStore(getInitialState(f.initialState));
-            // @ts-expect-error, params
-            const result = await store.dispatch(metadataActions.disableMetadata());
+            await store.dispatch(metadataActions.disableMetadata());
             if (!f.result) {
                 expect(store.getActions().length).toEqual(0);
             } else {
@@ -271,9 +257,8 @@ describe('Metadata Actions', () => {
 
     fixtures.init.forEach(f => {
         it(`initMetadata - ${f.description}`, async () => {
-            // @ts-expect-error
             const store = initStore(getInitialState(f.initialState));
-            await store.dispatch(metadataLabelingActions.init(false));
+            await store.dispatch(metadataLabelingActions.init(...f.params));
             if (!f.result) {
                 expect(store.getActions().length).toEqual(0);
             } else {
@@ -284,7 +269,6 @@ describe('Metadata Actions', () => {
 
     fixtures.disposeMetadata.forEach(f => {
         it(`disposeMetadata - ${f.description}`, async () => {
-            // @ts-expect-error
             const store = initStore(getInitialState(f.initialState));
             await store.dispatch(metadataActions.disposeMetadata(...f.params));
             if (f.result) {
@@ -295,7 +279,6 @@ describe('Metadata Actions', () => {
 
     fixtures.disposeMetadataKeys.forEach(f => {
         it(`disposeMetadataKeys - ${f.description}`, async () => {
-            // @ts-expect-error
             const store = initStore(getInitialState(f.initialState));
             await store.dispatch(metadataActions.disposeMetadataKeys(...f.params));
             if (f.result) {
diff --git a/packages/suite/src/actions/suite/__tests__/protocolActions.test.ts b/packages/suite/src/actions/suite/__tests__/protocolActions.test.ts
index 56b9c8040df..48673ffac5a 100644
--- a/packages/suite/src/actions/suite/__tests__/protocolActions.test.ts
+++ b/packages/suite/src/actions/suite/__tests__/protocolActions.test.ts
@@ -1,15 +1,15 @@
 import { testMocks } from '@suite-common/test-utils';
+import { NETWORK_TO_PROTOCOLS } from '@suite-common/suite-constants';
 
 import { configureStore } from 'src/support/tests/configureStore';
 import protocolReducer, { State as ProtocolState } from 'src/reducers/suite/protocolReducer';
-import { PROTOCOL_SCHEME } from 'src/constants/suite/protocol';
 
 import * as protocolActions from '../protocolActions';
 import * as protocolConstants from '../constants/protocolConstants';
 
 jest.doMock('@trezor/suite-analytics', () => testMocks.getAnalytics());
 
-export const getInitialState = (state?: ProtocolState) => ({
+const getInitialState = (state?: ProtocolState) => ({
     protocol: {
         ...protocolReducer(undefined, { type: 'foo' } as any),
         ...state,
@@ -40,7 +40,7 @@ describe('Protocol actions', () => {
         const store = initStore(
             getInitialState({
                 sendForm: {
-                    scheme: PROTOCOL_SCHEME.BITCOIN,
+                    scheme: NETWORK_TO_PROTOCOLS.btc[0],
                     address: '12345abcde',
                     amount: 1.02,
                     shouldFill: false,
@@ -62,7 +62,7 @@ describe('Protocol actions', () => {
         const store = initStore(
             getInitialState({
                 sendForm: {
-                    scheme: PROTOCOL_SCHEME.BITCOIN,
+                    scheme: NETWORK_TO_PROTOCOLS.btc[0],
                     address: '12345abcde',
                     amount: undefined,
                     shouldFill: false,
@@ -89,7 +89,7 @@ describe('Protocol actions', () => {
 
         expect(store.getActions().length).toBe(2);
         expect(store.getActions()[0].type).toBe(protocolConstants.SAVE_COIN_PROTOCOL);
-        expect(store.getActions()[0].payload.scheme).toBe(PROTOCOL_SCHEME.BITCOIN);
+        expect(store.getActions()[0].payload.scheme).toBe(NETWORK_TO_PROTOCOLS.btc[0]);
         expect(store.getActions()[0].payload.address).toBe('12345abcde');
         expect(store.getActions()[0].payload.amount).toBe(1.02);
     });
@@ -101,7 +101,7 @@ describe('Protocol actions', () => {
 
         expect(store.getActions().length).toBe(2);
         expect(store.getActions()[0].type).toBe(protocolConstants.SAVE_COIN_PROTOCOL);
-        expect(store.getActions()[0].payload.scheme).toBe(PROTOCOL_SCHEME.BITCOIN);
+        expect(store.getActions()[0].payload.scheme).toBe(NETWORK_TO_PROTOCOLS.btc[0]);
         expect(store.getActions()[0].payload.address).toBe('12345abcde');
         expect(store.getActions()[0].payload.amount).toBe(undefined);
     });
diff --git a/packages/suite/src/actions/suite/__tests__/resizeActions.test.ts b/packages/suite/src/actions/suite/__tests__/resizeActions.test.ts
index 65e1a1b7b12..31a7ab79640 100644
--- a/packages/suite/src/actions/suite/__tests__/resizeActions.test.ts
+++ b/packages/suite/src/actions/suite/__tests__/resizeActions.test.ts
@@ -1,9 +1,8 @@
 import { configureStore } from 'src/support/tests/configureStore';
-
 import resizeReducer, { State as ResizeState } from 'src/reducers/suite/resizeReducer';
 import * as resizeActions from 'src/actions/suite/resizeActions';
 
-export const getInitialState = (state?: ResizeState) => ({
+const getInitialState = (state?: ResizeState) => ({
     resize: {
         ...resizeReducer(undefined, { type: 'foo' } as any),
         ...state,
diff --git a/packages/suite/src/actions/suite/__tests__/routerActions.test.ts b/packages/suite/src/actions/suite/__tests__/routerActions.test.ts
index 46d65e32ae5..2e9212ba304 100644
--- a/packages/suite/src/actions/suite/__tests__/routerActions.test.ts
+++ b/packages/suite/src/actions/suite/__tests__/routerActions.test.ts
@@ -1,15 +1,15 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
 import { configureStore } from 'src/support/tests/configureStore';
-
 import suiteReducer from 'src/reducers/suite/suiteReducer';
 import routerReducer from 'src/reducers/suite/routerReducer';
 import modalReducer from 'src/reducers/suite/modalReducer';
+import { AppState } from 'src/reducers/store';
+
 import * as fixtures from '../__fixtures__/routerActions';
 import * as routerActions from '../routerActions';
-import { AppState } from 'src/reducers/store';
 
 type SuiteState = ReturnType<typeof suiteReducer>;
 type RouterState = ReturnType<typeof routerReducer>;
+
 interface InitialState {
     suite?: Partial<SuiteState>;
     router?: Exclude<RouterState, 'app|url|pathname'>;
@@ -70,7 +70,7 @@ describe('Suite Actions', () => {
     });
     fixtures.onBeforePopState.forEach(f => {
         it(`onBeforePopState: ${f.description}`, () => {
-            const state = getInitialState(f.state as InitialState);
+            const state = getInitialState(f.state as unknown as InitialState);
             const store = initStore(state);
             const result = store.dispatch(routerActions.onBeforePopState());
             expect(result).toEqual(f.result);
@@ -106,10 +106,8 @@ describe('Suite Actions', () => {
 
     it(`onLocationChange with lock`, () => {
         const state = getInitialState({
-            suite: {
-                locks: [1],
-            },
-        });
+            suite: { locks: { router: 1 } },
+        } as InitialState);
         const store = initStore(state);
         store.dispatch(routerActions.onLocationChange('/'));
         expect(store.getActions().length).toEqual(0);
diff --git a/packages/suite/src/actions/suite/__tests__/storageActions.test.ts b/packages/suite/src/actions/suite/__tests__/storageActions.test.ts
index 4eb382bb3a7..8046962dcb1 100644
--- a/packages/suite/src/actions/suite/__tests__/storageActions.test.ts
+++ b/packages/suite/src/actions/suite/__tests__/storageActions.test.ts
@@ -10,6 +10,7 @@ import {
     transactionsActions,
     createDiscoveryThunk,
     deviceActions,
+    prepareSendFormReducer,
 } from '@suite-common/wallet-core';
 import * as discoveryActions from '@suite-common/wallet-core';
 import { getAccountTransactions, getAccountIdentifier } from '@suite-common/wallet-utils';
@@ -18,12 +19,11 @@ import * as walletSettingsActions from 'src/actions/settings/walletSettingsActio
 import { accountsReducer, fiatRatesReducer, transactionsReducer } from 'src/reducers/wallet';
 import walletSettingsReducer from 'src/reducers/wallet/settingsReducer';
 import suiteReducer from 'src/reducers/suite/suiteReducer';
-import { prepareSendFormReducer } from '@suite-common/wallet-core';
 import graphReducer from 'src/reducers/wallet/graphReducer';
 import storageMiddleware from 'src/middlewares/wallet/storageMiddleware';
 import { coinjoinReducer } from 'src/reducers/wallet/coinjoinReducer';
 import { configureStore } from 'src/support/tests/configureStore';
-import { AppState } from 'src/types/suite';
+import { AcquiredDevice, AppState } from 'src/types/suite';
 import { SETTINGS } from 'src/config/suite';
 import { preloadStore } from 'src/support/suite/preloadStore';
 import { extraDependencies } from 'src/support/extraDependencies';
@@ -65,28 +65,28 @@ const devNotRemembered = getSuiteDevice({
 });
 
 const acc1 = getWalletAccount({
-    deviceState: dev1.state,
+    deviceState: dev1.state?.staticSessionId,
     symbol: 'btc',
     descriptor: 'desc1',
-    key: `desc1-btc-${dev1.state}`,
+    key: `desc1-btc-${dev1.state?.staticSessionId}`,
     networkType: 'bitcoin',
 });
 const acc2 = getWalletAccount({
-    deviceState: dev2.state,
+    deviceState: dev2.state?.staticSessionId,
     symbol: 'btc',
     descriptor: 'desc2',
-    key: `desc2-btc-${dev2.state}`,
+    key: `desc2-btc-${dev2.state?.staticSessionId}`,
     networkType: 'bitcoin',
 });
 
 const tx1 = getWalletTransaction({
-    deviceState: dev1.state,
+    deviceState: dev1.state?.staticSessionId,
     txid: 'txid1',
     descriptor: 'desc1',
     symbol: 'btc',
 });
 const tx2 = getWalletTransaction({
-    deviceState: dev2.state,
+    deviceState: dev2.state?.staticSessionId,
     txid: 'txid2',
     descriptor: 'desc2',
     symbol: 'btc',
@@ -108,7 +108,7 @@ type PartialState = Pick<AppState, 'suite' | 'device'> & {
     >;
 };
 
-export const getInitialState = (prevState?: Partial<PartialState>, action?: any) => ({
+const getInitialState = (prevState?: Partial<PartialState>, action?: any) => ({
     suite: suiteReducer(
         prevState ? prevState.suite : undefined,
         action || ({ type: 'foo' } as any),
@@ -254,11 +254,21 @@ describe('Storage actions', () => {
         updateStore(store);
 
         // create discovery objects
-        store.dispatch(createDiscoveryThunk({ deviceState: dev1.state!, device: dev1 }));
-        store.dispatch(createDiscoveryThunk({ deviceState: dev2.state!, device: dev2 }));
         store.dispatch(
             createDiscoveryThunk({
-                deviceState: dev2Instance1.state!,
+                deviceState: dev1.state!.staticSessionId!,
+                device: dev1,
+            }),
+        );
+        store.dispatch(
+            createDiscoveryThunk({
+                deviceState: dev2.state!.staticSessionId!,
+                device: dev2,
+            }),
+        );
+        store.dispatch(
+            createDiscoveryThunk({
+                deviceState: dev2Instance1.state!.staticSessionId!,
                 device: dev2Instance1,
             }),
         );
@@ -275,7 +285,7 @@ describe('Storage actions', () => {
         // update discovery object
         store.dispatch(
             discoveryActions.updateDiscovery({
-                deviceState: dev2.state!,
+                deviceState: dev2.state!.staticSessionId!,
                 networks: ['btc', 'ltc'],
             }),
         );
@@ -292,15 +302,20 @@ describe('Storage actions', () => {
         const storedDiscovery = load1.wallet.discovery;
         // all 3 discoveries saved
         expect(storedDiscovery.length).toEqual(3);
-        expect(storedDiscovery.find((d: any) => d.deviceState === dev1.state!)).toBeTruthy();
-        expect(storedDiscovery.find((d: any) => d.deviceState === dev2.state!)).toBeTruthy();
         expect(
-            storedDiscovery.find((d: any) => d.deviceState === dev2Instance1.state!),
+            storedDiscovery.find(d => d.deviceState === dev1.state?.staticSessionId),
+        ).toBeTruthy();
+        expect(
+            storedDiscovery.find(d => d.deviceState === dev2.state?.staticSessionId),
+        ).toBeTruthy();
+        expect(
+            storedDiscovery.find(d => d.deviceState === dev2Instance1.state?.staticSessionId),
         ).toBeTruthy();
 
         // discovery updated synced
         expect(
-            storedDiscovery.find((d: any) => d.deviceState === dev2.state)?.networks,
+            storedDiscovery.find((d: any) => d.deviceState === dev2.state?.staticSessionId)
+                ?.networks,
         ).toStrictEqual(['btc', 'ltc']);
 
         // stored txs
@@ -355,7 +370,7 @@ describe('Storage actions', () => {
         expect(load2.wallet.send.drafts).toEqual({});
         // acc1 deleted
         expect(load2.wallet.accounts.length).toEqual(1);
-        expect(load2.wallet.accounts[0].deviceState).toEqual(dev2.state);
+        expect(load2.wallet.accounts[0].deviceState).toEqual(dev2.state?.staticSessionId);
         // forget device dev1 along with its instances
         await store.dispatch(storageActions.rememberDevice(dev2, false));
         await store.dispatch(storageActions.rememberDevice(dev2Instance1, false));
@@ -424,7 +439,7 @@ describe('Storage actions', () => {
         // Change device label inside a reducer
         await store.dispatch(
             deviceActions.updateSelectedDevice({
-                ...dev1Connected,
+                ...(dev1Connected as AcquiredDevice),
                 label: 'New Label',
             }),
         );
@@ -435,7 +450,7 @@ describe('Storage actions', () => {
 
     it('should store graph data with the device and remove it on ACCOUNT.REMOVE (triggered by disabling the coin)', async () => {
         const accLtc = getWalletAccount({
-            deviceState: dev1.state,
+            deviceState: dev1.state!.staticSessionId!,
             symbol: 'ltc',
             descriptor: 'desc2',
             key: `desc2-ltc-${dev1.state}`,
diff --git a/packages/suite/src/actions/suite/__tests__/trezorConnectActions.test.ts b/packages/suite/src/actions/suite/__tests__/trezorConnectActions.test.ts
index a32f352ff52..6a050a461ac 100644
--- a/packages/suite/src/actions/suite/__tests__/trezorConnectActions.test.ts
+++ b/packages/suite/src/actions/suite/__tests__/trezorConnectActions.test.ts
@@ -12,7 +12,7 @@ const deviceReducer = prepareDeviceReducer(extraDependencies);
 
 type SuiteState = ReturnType<typeof suiteReducer>;
 type DevicesState = ReturnType<typeof deviceReducer>;
-export const getInitialState = (suite?: Partial<SuiteState>, device?: Partial<DevicesState>) => ({
+const getInitialState = (suite?: Partial<SuiteState>, device?: Partial<DevicesState>) => ({
     suite: {
         ...suiteReducer(undefined, { type: 'foo' } as any),
         ...suite,
diff --git a/packages/suite/src/actions/suite/analyticsActions.ts b/packages/suite/src/actions/suite/analyticsActions.ts
index 222a4423b6a..066fd4ad3b7 100644
--- a/packages/suite/src/actions/suite/analyticsActions.ts
+++ b/packages/suite/src/actions/suite/analyticsActions.ts
@@ -3,10 +3,7 @@
  * @docs docs/misc/analytics.md
  */
 
-import { allowSentryReport, setSentryUser } from 'src/utils/suite/sentry';
 import { getEnvironment, getCommitHash, isCodesignBuild } from '@trezor/env-utils';
-import type { Dispatch, GetState } from 'src/types/suite';
-
 import {
     analyticsActions,
     selectHasUserAllowedTracking,
@@ -17,6 +14,9 @@ import {
 import { getTrackingRandomId } from '@trezor/analytics';
 import { analytics, EventType } from '@trezor/suite-analytics';
 
+import type { Dispatch, GetState } from 'src/types/suite';
+import { allowSentryReport, setSentryUser } from 'src/utils/suite/sentry';
+
 export const enableAnalyticsThunk = () => (dispatch: Dispatch) => {
     analytics.report({ type: EventType.SettingsAnalytics, payload: { value: true } });
     allowSentryReport(true);
diff --git a/packages/suite/src/actions/suite/constants/desktopUpdateConstants.ts b/packages/suite/src/actions/suite/constants/desktopUpdateConstants.ts
index 40aeb19c508..95b67d5e6cc 100644
--- a/packages/suite/src/actions/suite/constants/desktopUpdateConstants.ts
+++ b/packages/suite/src/actions/suite/constants/desktopUpdateConstants.ts
@@ -4,6 +4,7 @@ export const NOT_AVAILABLE = '@desktop-update/not-available';
 export const DOWNLOAD = '@desktop-update/download';
 export const DOWNLOADING = '@desktop-update/downloading';
 export const READY = '@desktop-update/ready';
+export const OPEN_JUST_UPDATED_CHANGELOG = '@desktop-update/just-updated';
 export const MODAL_VISIBILITY = '@desktop-update/modal-visibility';
 export const OPEN_EARLY_ACCESS_ENABLE = '@desktop-update/open-early-access-enable';
 export const OPEN_EARLY_ACCESS_DISABLE = '@desktop-update/open-early-access-disable';
diff --git a/packages/suite/src/actions/suite/constants/suiteConstants.ts b/packages/suite/src/actions/suite/constants/suiteConstants.ts
index 2de6cbea80e..c1d2a865368 100644
--- a/packages/suite/src/actions/suite/constants/suiteConstants.ts
+++ b/packages/suite/src/actions/suite/constants/suiteConstants.ts
@@ -21,18 +21,17 @@ export const COINJOIN_RECEIVE_WARNING = '@suite/coinjoin-receive-warning';
 export const DESKTOP_SUITE_PROMO = '@suite/desktop-suite-promo';
 export const DEVICE_AUTHENTICITY_OPT_OUT = '@suite/device-authenticity-opt-out';
 export const DEVICE_FIRMWARE_REVISION_CHECK = '@suite/firmware-revision-opt-out-check';
+export const DEVICE_FIRMWARE_HASH_CHECK = '@suite/firmware-hash-opt-out-check';
 export const EVM_CONFIRM_EXPLANATION_MODAL = '@suite/evm-confirm-explanation-modal';
 export const EVM_CLOSE_EXPLANATION_BANNER = '@suite/evm-close-explanation-banner';
 export const LOCK_UI = '@suite/lock-ui';
 export const LOCK_DEVICE = '@suite/lock-device';
 export const LOCK_ROUTER = '@suite/lock-router';
 export const LOCK_TYPE = {
-    NONE: 0,
-    ROUTER: 1, // restricted route changes, all other actions are possible
-    DEVICE: 2, // restricted device call (TrezorConnect)
-    UI: 3, // restricted most of the UI actions (buttons, keyboard etc.)
+    ROUTER: 'router', // restricted route changes, all other actions are possible
+    DEVICE: 'device', // restricted device call (TrezorConnect)
+    UI: 'ui', // restricted most of the UI actions (buttons, keyboard etc.)
 } as const;
 export const REQUEST_DEVICE_RECONNECT = '@suite/request-device-reconnect';
 export const SET_EXPERIMENTAL_FEATURES = '@suite/set-experimental-features';
 export const SET_SIDEBAR_WIDTH = '@suite/set-sidebar-width';
-export const SET_AUTO_START = '@suite/set-auto-start';
diff --git a/packages/suite/src/actions/suite/desktopUpdateActions.ts b/packages/suite/src/actions/suite/desktopUpdateActions.ts
index 4814ce974fb..3db2bbfeb93 100644
--- a/packages/suite/src/actions/suite/desktopUpdateActions.ts
+++ b/packages/suite/src/actions/suite/desktopUpdateActions.ts
@@ -1,13 +1,12 @@
 import { analytics, AppUpdateEventStatus, EventType } from '@trezor/suite-analytics';
+import { desktopApi, UpdateInfo, UpdateProgress } from '@trezor/suite-desktop-api';
+import { notificationsActions } from '@suite-common/toast-notifications';
 
 import { DESKTOP_UPDATE } from 'src/actions/suite/constants';
 import { Dispatch, GetState } from 'src/types/suite';
 import { UpdateState, UpdateModalVisibility } from 'src/reducers/suite/desktopUpdateReducer';
 import { getAppUpdatePayload } from 'src/utils/suite/analytics';
 
-import { desktopApi, UpdateInfo, UpdateProgress } from '@trezor/suite-desktop-api';
-import { notificationsActions } from '@suite-common/toast-notifications';
-
 export type DesktopUpdateAction =
     | { type: typeof DESKTOP_UPDATE.CHECKING }
     | { type: typeof DESKTOP_UPDATE.AVAILABLE; payload: UpdateInfo }
@@ -19,7 +18,8 @@ export type DesktopUpdateAction =
     | { type: typeof DESKTOP_UPDATE.OPEN_EARLY_ACCESS_ENABLE }
     | { type: typeof DESKTOP_UPDATE.OPEN_EARLY_ACCESS_DISABLE }
     | { type: typeof DESKTOP_UPDATE.ALLOW_PRERELEASE; payload: boolean }
-    | { type: typeof DESKTOP_UPDATE.SET_AUTOMATIC_UPDATES; payload: { isEnabled: boolean } };
+    | { type: typeof DESKTOP_UPDATE.SET_AUTOMATIC_UPDATES; payload: { isEnabled: boolean } }
+    | { type: typeof DESKTOP_UPDATE.OPEN_JUST_UPDATED_CHANGELOG };
 
 export const checking = (): DesktopUpdateAction => ({ type: DESKTOP_UPDATE.CHECKING });
 
@@ -65,6 +65,10 @@ export const downloading = (progress: UpdateProgress): DesktopUpdateAction => ({
     payload: progress,
 });
 
+export const openJustUpdatedChangelog = (): DesktopUpdateAction => ({
+    type: DESKTOP_UPDATE.OPEN_JUST_UPDATED_CHANGELOG,
+});
+
 export const ready = (info: UpdateInfo) => (dispatch: Dispatch, getState: GetState) => {
     const { latest, allowPrerelease } = getState().desktopUpdate;
 
@@ -82,14 +86,14 @@ export const ready = (info: UpdateInfo) => (dispatch: Dispatch, getState: GetSta
 };
 
 export const installUpdate =
-    ({ shouldInstallOnQuit }: { shouldInstallOnQuit: boolean }) =>
+    ({ installNow }: { installNow: boolean }) =>
     (_: Dispatch, getState: GetState) => {
         const { desktopUpdate } = getState();
 
         const payload = getAppUpdatePayload(
-            shouldInstallOnQuit
-                ? AppUpdateEventStatus.InstallOnQuit
-                : AppUpdateEventStatus.InstallAndRestart,
+            installNow
+                ? AppUpdateEventStatus.InstallAndRestart
+                : AppUpdateEventStatus.InstallOnQuit,
             desktopUpdate.allowPrerelease,
             desktopUpdate.latest,
         );
@@ -99,8 +103,12 @@ export const installUpdate =
         });
 
         // auto-updater is by default configured to update on quit 'autoUpdater.autoInstallOnAppQuit = true'
-        if (!shouldInstallOnQuit) {
+        if (installNow) {
             desktopApi.installUpdate();
+        } else {
+            // To make sure, the update is installed on quit as it may have been disabled
+            // by switching off the auto-update (silent-update)
+            desktopApi.setAutoInstallOnAppQuit();
         }
     };
 
diff --git a/packages/suite/src/actions/suite/guideActions.ts b/packages/suite/src/actions/suite/guideActions.ts
index 7f714683ec3..86730ea9534 100644
--- a/packages/suite/src/actions/suite/guideActions.ts
+++ b/packages/suite/src/actions/suite/guideActions.ts
@@ -1,5 +1,4 @@
 import { analytics, EventType } from '@trezor/suite-analytics';
-
 import type {
     ActiveView,
     Feedback,
@@ -11,6 +10,7 @@ import { notificationsActions } from '@suite-common/toast-notifications';
 import { isCodesignBuild } from '@trezor/env-utils';
 
 import { Dispatch } from 'src/types/suite';
+
 import { GUIDE } from './constants';
 
 export type GuideAction =
diff --git a/packages/suite/src/actions/suite/initAction.ts b/packages/suite/src/actions/suite/initAction.ts
index dfe3d19630d..4afb3b83757 100644
--- a/packages/suite/src/actions/suite/initAction.ts
+++ b/packages/suite/src/actions/suite/initAction.ts
@@ -8,6 +8,8 @@ import {
     updateMissingTxFiatRatesThunk,
 } from '@suite-common/wallet-core';
 import { periodicCheckTokenDefinitionsThunk } from '@suite-common/token-definitions';
+import { desktopApi } from '@trezor/suite-desktop-api';
+import { isDesktop } from '@trezor/env-utils';
 
 import * as routerActions from 'src/actions/suite/routerActions';
 import * as analyticsActions from 'src/actions/suite/analyticsActions';
@@ -16,13 +18,14 @@ import * as languageActions from 'src/actions/settings/languageActions';
 import type { Dispatch, GetState } from 'src/types/suite';
 
 import { SUITE } from './constants';
-import { onSuiteReady } from './suiteActions';
+import { onSuiteReady, setFlag } from './suiteActions';
 
 export const init = () => async (dispatch: Dispatch, getState: GetState) => {
     const {
         suite: {
             settings: { language },
             lifecycle: { status },
+            flags: { enableAutoupdateOnNextRun },
         },
         wallet: {
             settings: { localCurrency },
@@ -35,7 +38,15 @@ export const init = () => async (dispatch: Dispatch, getState: GetState) => {
 
     dispatch(initDevices());
 
-    // right after storage is loaded, we might start:
+    /**
+     * ----------------------------------------------
+     * Right after storage is loaded, we might start:
+     * ----------------------------------------------
+     *
+     * Todo: This is good place to be refactored into separate functions.
+     *       Those number-comments are very strong indicator that this code
+     *       has many responsibilities and should be split into smaller parts.
+     */
 
     // 1. init analytics
     dispatch(analyticsActions.init());
@@ -46,10 +57,16 @@ export const init = () => async (dispatch: Dispatch, getState: GetState) => {
     // 3. fetch message system config
     dispatch(initMessageSystemThunk());
 
-    // 4. redirecting user into welcome screen (if needed)
+    // 4. turn on auto updates if needed
+    if (isDesktop() && enableAutoupdateOnNextRun) {
+        dispatch(setFlag('enableAutoupdateOnNextRun', false));
+        desktopApi.setAutomaticUpdateEnabled(true);
+    }
+
+    // 5. redirecting user into welcome screen (if needed)
     dispatch(routerActions.initialRedirection());
 
-    // 5. init connect (could throw an error,
+    // 6. init connect (could throw an error,
     // then the error is caught in <ErrorBoundary /> in Main.tsx
     try {
         // it is necessary to unwrap the result here because init calls async thunk from redux-toolkit which is always resolved
@@ -60,15 +77,15 @@ export const init = () => async (dispatch: Dispatch, getState: GetState) => {
         throw err;
     }
 
-    // 6. init backends
+    // 7. init backends
     await dispatch(initBlockchainThunk())
         .unwrap()
         .catch(err => console.error(err));
 
-    // 7. fetch token definitions (has to be fetched before fiat rates)
+    // 8. fetch token definitions (has to be fetched before fiat rates)
     await dispatch(periodicCheckTokenDefinitionsThunk());
 
-    // 8. init periodic fetching of fiat rates
+    // 9. init periodic fetching of fiat rates
     await dispatch(
         periodicFetchFiatRatesThunk({
             rateType: 'current',
@@ -82,20 +99,20 @@ export const init = () => async (dispatch: Dispatch, getState: GetState) => {
         }),
     );
 
-    // 9. fetch rates for transactions with missing rates
+    // 10. fetch rates for transactions with missing rates
     await dispatch(updateMissingTxFiatRatesThunk({ localCurrency }));
 
-    // 10. dispatch initial location change
+    // 11. dispatch initial location change
     dispatch(routerActions.init());
 
-    // 11. fetch metadata. metadata is not saved together with other data in storage.
+    // 12. fetch metadata. metadata is not saved together with other data in storage.
     // historically it was saved in indexedDB together with devices and accounts and we did not need to load them
     // immediately after suite start.
     dispatch(metadataLabelingActions.fetchAndSaveMetadataForAllDevices());
 
-    // 12. start fetching staking data if needed, does need to be waited
+    // 13. start fetching staking data if needed, does need to be waited
     dispatch(periodicCheckStakeDataThunk());
 
-    // 13. backend connected, suite is ready to use
+    // 14. backend connected, suite is ready to use
     dispatch(onSuiteReady());
 };
diff --git a/packages/suite/src/actions/suite/metadataActions.ts b/packages/suite/src/actions/suite/metadataActions.ts
index f5a8d7fa36a..453df45bedc 100644
--- a/packages/suite/src/actions/suite/metadataActions.ts
+++ b/packages/suite/src/actions/suite/metadataActions.ts
@@ -1,6 +1,8 @@
 import { createAction } from '@reduxjs/toolkit';
 
 import { selectDevices } from '@suite-common/wallet-core';
+import { Account } from '@suite-common/wallet-types';
+import { StaticSessionId } from '@trezor/connect';
 
 import { METADATA, METADATA_LABELING } from 'src/actions/suite/constants';
 import { Dispatch, GetState } from 'src/types/suite';
@@ -14,9 +16,7 @@ import {
 } from 'src/types/suite/metadata';
 import * as metadataUtils from 'src/utils/suite/metadata';
 import { selectSelectedProviderForLabels } from 'src/reducers/suite/metadataReducer';
-import { Account } from '@suite-common/wallet-types';
 import type { AbstractMetadataProvider, PasswordManagerState } from 'src/types/suite/metadata';
-import { StaticSessionId } from '@trezor/connect';
 
 export type MetadataAction =
     | { type: typeof METADATA.ENABLE }
@@ -101,7 +101,7 @@ export const disposeMetadataKeys = () => (dispatch: Dispatch, getState: GetState
             dispatch({
                 type: METADATA.SET_DEVICE_METADATA,
                 payload: {
-                    deviceState: device.state,
+                    deviceState: device.state.staticSessionId,
                     metadata: {},
                 },
             });
diff --git a/packages/suite/src/actions/suite/metadataLabelingActions.ts b/packages/suite/src/actions/suite/metadataLabelingActions.ts
index bcb1dd64876..a46740a0607 100644
--- a/packages/suite/src/actions/suite/metadataLabelingActions.ts
+++ b/packages/suite/src/actions/suite/metadataLabelingActions.ts
@@ -1,7 +1,10 @@
-import TrezorConnect from '@trezor/connect';
+import TrezorConnect, { StaticSessionId } from '@trezor/connect';
 import { cloneObject } from '@trezor/utils';
-
-import { selectDevices, selectDevice, selectDeviceByState } from '@suite-common/wallet-core';
+import {
+    selectDevices,
+    selectDevice,
+    selectDeviceByStaticSessionId,
+} from '@suite-common/wallet-core';
 
 import { METADATA, METADATA_LABELING } from 'src/actions/suite/constants';
 import { Dispatch, GetState, TrezorDevice } from 'src/types/suite';
@@ -26,7 +29,7 @@ import * as metadataActions from './metadataActions';
 import * as metadataProviderActions from './metadataProviderActions';
 
 export const getLabelableEntities =
-    (deviceState: string) => (_dispatch: Dispatch, getState: GetState) =>
+    (deviceState: StaticSessionId) => (_dispatch: Dispatch, getState: GetState) =>
         selectLabelableEntities(getState(), deviceState);
 
 type LabelableEntity = ReturnType<ReturnType<typeof getLabelableEntities>>[number];
@@ -100,7 +103,7 @@ const fetchMetadata =
 export const setAccountMetadataKey =
     (account: Account, encryptionVersion = METADATA_LABELING.ENCRYPTION_VERSION) =>
     (dispatch: Dispatch, getState: GetState) => {
-        const device = selectDeviceByState(getState(), account.deviceState);
+        const device = selectDeviceByStaticSessionId(getState(), account.deviceState);
         const deviceMetaKey = device?.metadata[encryptionVersion]?.key;
 
         if (!deviceMetaKey) {
@@ -142,7 +145,9 @@ const syncMetadataKeys =
             return;
         }
         const targetAccounts = getState().wallet.accounts.filter(
-            acc => !acc.metadata[encryptionVersion]?.fileName && acc.deviceState === device.state,
+            acc =>
+                !acc.metadata[encryptionVersion]?.fileName &&
+                acc.deviceState === device.state?.staticSessionId,
         );
 
         targetAccounts.forEach(account => {
@@ -154,20 +159,24 @@ const syncMetadataKeys =
     };
 
 export const fetchAndSaveMetadata =
-    (deviceStateArg?: string) => async (dispatch: Dispatch, getState: GetState) => {
+    (deviceStateArg?: StaticSessionId) => async (dispatch: Dispatch, getState: GetState) => {
         const provider = selectSelectedProviderForLabels(getState());
         if (!provider) return;
 
         let device = deviceStateArg
-            ? selectDeviceByState(getState(), deviceStateArg)
+            ? selectDeviceByStaticSessionId(getState(), deviceStateArg)
             : selectDevice(getState());
 
-        if (!device?.state || !device?.metadata?.[METADATA_LABELING.ENCRYPTION_VERSION]) return;
+        if (
+            !device?.state?.staticSessionId ||
+            !device?.metadata?.[METADATA_LABELING.ENCRYPTION_VERSION]
+        )
+            return;
 
         const fetchIntervalTrackingId = metadataUtils.getFetchTrackingId(
             'labels',
             provider.clientId,
-            device.state,
+            device.state.staticSessionId,
         );
 
         const providerInstance = dispatch(
@@ -186,9 +195,13 @@ export const fetchAndSaveMetadata =
             const response = await providerInstance.getProviderDetails();
 
             device = deviceStateArg
-                ? selectDeviceByState(getState(), deviceStateArg)
+                ? selectDeviceByStaticSessionId(getState(), deviceStateArg)
                 : selectDevice(getState());
-            if (!device?.state || !device?.metadata?.[METADATA_LABELING.ENCRYPTION_VERSION]) return;
+            if (
+                !device?.state?.staticSessionId ||
+                !device?.metadata?.[METADATA_LABELING.ENCRYPTION_VERSION]
+            )
+                return;
 
             dispatch(syncMetadataKeys(device));
 
@@ -214,7 +227,7 @@ export const fetchAndSaveMetadata =
                 return;
             }
 
-            const labelableEntities = dispatch(getLabelableEntities(device.state));
+            const labelableEntities = dispatch(getLabelableEntities(device.state.staticSessionId));
             const promises = labelableEntities.map(entity =>
                 dispatch(fetchMetadata({ provider, entity })).then(result => {
                     if (result) {
@@ -257,8 +270,12 @@ export const fetchAndSaveMetadataForAllDevices = () => (dispatch: Dispatch, getS
     }
     const devices = selectDevices(getState());
     devices.forEach(device => {
-        if (!device.state || !device.metadata[METADATA_LABELING.ENCRYPTION_VERSION]) return;
-        dispatch(fetchAndSaveMetadata(device.state));
+        if (
+            !device.state?.staticSessionId ||
+            !device.metadata[METADATA_LABELING.ENCRYPTION_VERSION]
+        )
+            return;
+        dispatch(fetchAndSaveMetadata(device.state.staticSessionId));
     });
 };
 
@@ -266,7 +283,7 @@ export const addDeviceMetadata =
     (payload: Extract<MetadataAddPayload, { type: 'walletLabel' }>) =>
     (dispatch: Dispatch, getState: GetState) => {
         const devices = selectDevices(getState());
-        const device = devices.find(d => d.state === payload.entityKey);
+        const device = devices.find(d => d.state?.staticSessionId === payload.entityKey);
         const provider = selectSelectedProviderForLabels(getState());
 
         if (!provider)
@@ -443,7 +460,7 @@ export const addAccountMetadata =
 export const setDeviceMetadataKey =
     (device: TrezorDevice, encryptionVersion = METADATA_LABELING.ENCRYPTION_VERSION) =>
     async (dispatch: Dispatch, getState: GetState) => {
-        if (!device.state || !device.connected) return;
+        if (!device.state?.staticSessionId || !device.connected) return;
 
         const result = await TrezorConnect.cipherKeyValue({
             device: {
@@ -462,7 +479,7 @@ export const setDeviceMetadataKey =
                 });
             }
 
-            const [stateAddress] = device.state.split('@'); // address@device_id:instance
+            const [stateAddress] = device.state.staticSessionId.split('@'); // address@device_id:instance
             const metaKey = metadataUtils.deriveMetadataKey(result.payload.value, stateAddress);
             const fileName = metadataUtils.deriveFilenameForLabeling(metaKey, encryptionVersion);
             const aesKey = metadataUtils.deriveAesKey(metaKey);
@@ -470,7 +487,7 @@ export const setDeviceMetadataKey =
             dispatch({
                 type: METADATA.SET_DEVICE_METADATA,
                 payload: {
-                    deviceState: device.state,
+                    deviceState: device.state?.staticSessionId,
                     metadata: {
                         ...device.metadata,
                         [encryptionVersion]: {
@@ -539,26 +556,27 @@ export const addMetadata =
  * tries to add new label.
  */
 export const init =
-    (force: boolean, deviceState?: string) => async (dispatch: Dispatch, getState: GetState) => {
-        let device = deviceState
-            ? selectDeviceByState(getState(), deviceState)
+    (force: boolean, deviceStateArg?: StaticSessionId) =>
+    async (dispatch: Dispatch, getState: GetState) => {
+        let device = deviceStateArg
+            ? selectDeviceByStaticSessionId(getState(), deviceStateArg)
             : selectDevice(getState());
 
-        if (!device?.state) {
+        if (!device?.state?.staticSessionId) {
             return false;
         }
 
-        if (!force && getState().metadata.error?.[device.state]) {
+        if (!force && getState().metadata.error?.[device.state.staticSessionId]) {
             return false;
         }
 
         dispatch({ type: METADATA.SET_INITIATING, payload: true });
-        if (getState().metadata.error?.[device.state]) {
+        if (getState().metadata.error?.[device.state.staticSessionId]) {
             // remove error note about failed migration potentially set in a previous run
             dispatch({
                 type: METADATA.SET_ERROR_FOR_DEVICE,
                 payload: {
-                    deviceState: device.state,
+                    deviceState: device.state!.staticSessionId,
                     failed: false,
                 },
             });
@@ -579,7 +597,7 @@ export const init =
                 dispatch({
                     type: METADATA.SET_ERROR_FOR_DEVICE,
                     payload: {
-                        deviceState: device.state!,
+                        deviceState: device.state!.staticSessionId,
                         failed: true,
                     },
                 });
@@ -591,8 +609,8 @@ export const init =
         // 3. we have master key. use it to derive account keys
         dispatch(syncMetadataKeys(device, METADATA_LABELING.ENCRYPTION_VERSION));
 
-        device = deviceState
-            ? selectDeviceByState(getState(), deviceState)
+        device = deviceStateArg
+            ? selectDeviceByStaticSessionId(getState(), deviceStateArg)
             : selectDevice(getState());
 
         if (!device) return false;
@@ -611,7 +629,7 @@ export const init =
         // todo: 5. migration
 
         // 6. fetch metadata
-        await dispatch(fetchAndSaveMetadata(device.state));
+        await dispatch(fetchAndSaveMetadata(device.state?.staticSessionId));
 
         // now we may allow user to edit labels. everything is ready, local data is synced with provider
         if (getState().metadata.initiating) {
@@ -619,18 +637,18 @@ export const init =
         }
 
         const selectedProvider = selectSelectedProviderForLabels(getState());
-        device = deviceState
-            ? selectDeviceByState(getState(), deviceState)
+        device = deviceStateArg
+            ? selectDeviceByStaticSessionId(getState(), deviceStateArg)
             : selectDevice(getState());
 
-        if (!device?.state || !selectedProvider) {
+        if (!device?.state?.staticSessionId || !selectedProvider) {
             return true;
         }
 
         const fetchIntervalTrackingId = metadataUtils.getFetchTrackingId(
             'labels',
             selectedProvider.clientId,
-            device.state,
+            device.state.staticSessionId,
         );
 
         // 7. if interval for watching provider is not set, create it
@@ -639,10 +657,10 @@ export const init =
             // user is editing label and at that very moment update arrives. updates to specific entities should be probably discarded in such case?
             metadataProviderActions.fetchIntervals[fetchIntervalTrackingId] = setInterval(() => {
                 const device = selectDevice(getState());
-                if (!getState().suite.online || !device?.state) {
+                if (!getState().suite.online || !device?.state?.staticSessionId) {
                     return;
                 }
-                dispatch(fetchAndSaveMetadata(device.state));
+                dispatch(fetchAndSaveMetadata(device.state.staticSessionId));
             }, 60_000);
         }
 
diff --git a/packages/suite/src/actions/suite/metadataPasswordsActions.ts b/packages/suite/src/actions/suite/metadataPasswordsActions.ts
index d3dfdebb248..d025e3b6126 100644
--- a/packages/suite/src/actions/suite/metadataPasswordsActions.ts
+++ b/packages/suite/src/actions/suite/metadataPasswordsActions.ts
@@ -12,7 +12,6 @@ import { selectSelectedProviderForPasswords } from 'src/reducers/suite/metadataR
 
 import * as metadataActions from './metadataActions';
 import * as metadataProviderActions from './metadataProviderActions';
-
 import type { FetchIntervalTrackingId } from './metadataProviderActions';
 
 export const fetchPasswords =
@@ -86,7 +85,7 @@ export const init = () => async (dispatch: Dispatch, getState: GetState) => {
     dispatch({
         type: METADATA.SET_DEVICE_METADATA_PASSWORDS,
         payload: {
-            deviceState: device.state,
+            deviceState: device.state.staticSessionId,
             metadata: {
                 ...device.passwords,
                 [1]: {
@@ -127,7 +126,7 @@ export const init = () => async (dispatch: Dispatch, getState: GetState) => {
         dispatch({
             type: METADATA.SET_DEVICE_METADATA_PASSWORDS,
             payload: {
-                deviceState: device.state,
+                deviceState: device.state.staticSessionId,
                 metadata: {
                     ...device.passwords,
                     [1]: {
@@ -163,14 +162,14 @@ export const init = () => async (dispatch: Dispatch, getState: GetState) => {
 
     device = selectDevice(getState());
     const selectedProvider = selectSelectedProviderForPasswords(getState());
-    if (!selectedProvider || !device?.state) {
+    if (!selectedProvider || !device?.state?.staticSessionId) {
         // ts, should not happen
         return;
     }
     const fetchIntervalTrackingId: FetchIntervalTrackingId = metadataUtils.getFetchTrackingId(
         'passwords',
         selectedProvider.clientId,
-        device.state,
+        device.state.staticSessionId,
     );
 
     if (device?.state && !metadataProviderActions.fetchIntervals[fetchIntervalTrackingId]) {
diff --git a/packages/suite/src/actions/suite/metadataProviderActions.ts b/packages/suite/src/actions/suite/metadataProviderActions.ts
index e6f7bf0ead0..1dac615e0d2 100644
--- a/packages/suite/src/actions/suite/metadataProviderActions.ts
+++ b/packages/suite/src/actions/suite/metadataProviderActions.ts
@@ -1,6 +1,7 @@
 import { analytics, EventType } from '@trezor/suite-analytics';
 import { createDeferred } from '@trezor/utils';
 import { notificationsActions } from '@suite-common/toast-notifications';
+import { Device } from '@trezor/connect';
 
 import { METADATA, METADATA_PROVIDER } from 'src/actions/suite/constants';
 import { Dispatch, GetState } from 'src/types/suite';
@@ -17,10 +18,9 @@ import * as modalActions from 'src/actions/suite/modalActions';
 import DropboxProvider from 'src/services/suite/metadata/DropboxProvider';
 import GoogleProvider from 'src/services/suite/metadata/GoogleProvider';
 import FileSystemProvider from 'src/services/suite/metadata/FileSystemProvider';
-import { InMemoryTestProvider } from '../../services/suite/metadata/InMemoryTestProvider';
 
+import { InMemoryTestProvider } from '../../services/suite/metadata/InMemoryTestProvider';
 import * as metadataActions from './metadataActions';
-import { Device } from '@trezor/connect';
 
 export type MetadataAction = {
     type: typeof METADATA.SET_SELECTED_PROVIDER;
diff --git a/packages/suite/src/actions/suite/modalActions.ts b/packages/suite/src/actions/suite/modalActions.ts
index 7087202f975..61c74cf77ed 100644
--- a/packages/suite/src/actions/suite/modalActions.ts
+++ b/packages/suite/src/actions/suite/modalActions.ts
@@ -84,7 +84,7 @@ export const openDeferredModal =
         });
         try {
             return dfd.promise;
-        } catch (error) {
+        } catch {
             // do nothing, return void
         }
     };
diff --git a/packages/suite/src/actions/suite/protocolActions.ts b/packages/suite/src/actions/suite/protocolActions.ts
index 496280d884c..9d1dc3c6421 100644
--- a/packages/suite/src/actions/suite/protocolActions.ts
+++ b/packages/suite/src/actions/suite/protocolActions.ts
@@ -1,11 +1,14 @@
-import { PROTOCOL } from './constants';
-import { getProtocolInfo, isPaymentRequestProtocolScheme } from 'src/utils/suite/protocol';
+import { Protocol } from '@suite-common/suite-constants';
+import { getNetworkSymbolForProtocol } from '@suite-common/suite-utils';
+import { notificationsActions } from '@suite-common/toast-notifications';
+import { SUITE_BRIDGE_DEEPLINK } from '@trezor/urls';
+
+import { CoinProtocolInfo, getProtocolInfo } from 'src/utils/suite/protocol';
 import type { Dispatch } from 'src/types/suite';
-import type { PROTOCOL_SCHEME } from 'src/constants/suite/protocol';
 import type { SendFormState } from 'src/reducers/suite/protocolReducer';
-import { notificationsActions } from '@suite-common/toast-notifications';
 import * as routerActions from 'src/actions/suite/routerActions';
-import { SUITE_BRIDGE_DEEPLINK } from '@trezor/urls';
+
+import { PROTOCOL } from './constants';
 
 export type ProtocolAction =
     | {
@@ -23,11 +26,7 @@ export const fillSendForm = (shouldFill: boolean): ProtocolAction => ({
     payload: shouldFill,
 });
 
-const saveCoinProtocol = (
-    scheme: PROTOCOL_SCHEME,
-    address: string,
-    amount?: number,
-): ProtocolAction => ({
+const saveCoinProtocol = (scheme: Protocol, address: string, amount?: number): ProtocolAction => ({
     type: PROTOCOL.SAVE_COIN_PROTOCOL,
     payload: { scheme, address, amount },
 });
@@ -35,8 +34,8 @@ const saveCoinProtocol = (
 export const handleProtocolRequest = (uri: string) => (dispatch: Dispatch) => {
     const protocol = getProtocolInfo(uri);
 
-    if (protocol && isPaymentRequestProtocolScheme(protocol.scheme)) {
-        const { scheme, amount, address } = protocol;
+    if (protocol && !('error' in protocol) && getNetworkSymbolForProtocol(protocol.scheme)) {
+        const { scheme, amount, address } = protocol as CoinProtocolInfo;
 
         dispatch(saveCoinProtocol(scheme, address, amount));
         dispatch(
diff --git a/packages/suite/src/actions/suite/routerActions.ts b/packages/suite/src/actions/suite/routerActions.ts
index 2623af3dd0a..75f06533dd3 100644
--- a/packages/suite/src/actions/suite/routerActions.ts
+++ b/packages/suite/src/actions/suite/routerActions.ts
@@ -4,7 +4,7 @@
 import { Route } from '@suite-common/suite-types';
 
 import * as suiteActions from 'src/actions/suite/suiteActions';
-import { SUITE, ROUTER } from 'src/actions/suite/constants';
+import { ROUTER } from 'src/actions/suite/constants';
 import { RouterAppWithParams, SettingsBackRoute } from 'src/constants/suite/routes';
 import {
     getAppWithParams,
@@ -18,6 +18,7 @@ import {
 import { Dispatch, GetState } from 'src/types/suite';
 import history from 'src/support/history';
 import type { AnchorType } from 'src/constants/suite/anchors';
+import { selectIsRouterLocked, selectIsRouterOrUiLocked } from 'src/reducers/suite/suiteReducer';
 
 export type RouterAction =
     | {
@@ -40,8 +41,7 @@ export type RouterAction =
  * Called from ./support/RouterHandler
  */
 export const onBeforePopState = () => (_dispatch: Dispatch, getState: GetState) => {
-    const { locks } = getState().suite;
-    const isLocked = locks.includes(SUITE.LOCK_TYPE.ROUTER) || locks.includes(SUITE.LOCK_TYPE.UI);
+    const isLocked = selectIsRouterOrUiLocked(getState());
     const hasActionModal = getState().modal.context !== '@modal/context-none';
 
     return !isLocked && !hasActionModal;
@@ -108,8 +108,8 @@ export const goto =
     (dispatch: Dispatch, getState: GetState) => {
         const { params, preserveParams, anchor } = options;
 
-        const { suite, router } = getState();
-        const hasRouterLock = suite.locks.includes(SUITE.LOCK_TYPE.ROUTER);
+        const state = getState();
+        const hasRouterLock = selectIsRouterLocked(state);
 
         if (hasRouterLock) {
             dispatch(suiteActions.lockRouter(false));
@@ -120,7 +120,7 @@ export const goto =
 
         const urlBase = getPrefixedURL(getRoute(routeName, params));
 
-        if (urlBase === router.url) {
+        if (urlBase === state.router.url) {
             // if location is same, but anchor is set (e.g. click on tor icon when in app settings), let's propagate it to redux state
             if (anchor) {
                 // postpone propagation to allow clearing anchor in redux state by click listener
diff --git a/packages/suite/src/actions/suite/storageActions.ts b/packages/suite/src/actions/suite/storageActions.ts
index b83f9859602..04d67b5a7a6 100644
--- a/packages/suite/src/actions/suite/storageActions.ts
+++ b/packages/suite/src/actions/suite/storageActions.ts
@@ -1,13 +1,16 @@
 import { FieldValues } from 'react-hook-form';
 
 import { cloneObject } from '@trezor/utils';
-
 import { Discovery, FormDraftKeyPrefix } from '@suite-common/wallet-types';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { selectHistoricRatesByTransactions, getFormDraftKey } from '@suite-common/wallet-utils';
 import { FormDraftPrefixKeyValues } from '@suite-common/wallet-constants';
 import { isDeviceAcquired } from '@suite-common/suite-utils';
 import { selectDevices, deviceActions } from '@suite-common/wallet-core';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+import type { FormState, RatesByTimestamps } from '@suite-common/wallet-types';
+import { MetadataState } from '@suite-common/metadata-types';
+import { DefinitionType, TokenManagementAction } from '@suite-common/token-definitions';
 
 import { db } from 'src/storage';
 import {
@@ -17,8 +20,6 @@ import {
 } from 'src/utils/suite/storage';
 import type { AppState, Dispatch, GetState, TrezorDevice } from 'src/types/suite';
 import type { Account } from 'src/types/wallet';
-import { NetworkSymbol } from '@suite-common/wallet-config';
-import type { FormState, RatesByTimestamps } from '@suite-common/wallet-types';
 import type { Trade } from 'src/types/wallet/coinmarketCommonTypes';
 import type { PreloadStoreAction } from 'src/support/suite/preloadStore';
 import { GraphData } from 'src/types/wallet/graph';
@@ -26,8 +27,6 @@ import { deviceGraphDataFilterFn } from 'src/utils/wallet/graph';
 import { selectCoinjoinAccountByKey } from 'src/reducers/wallet/coinjoinReducer';
 
 import { STORAGE } from './constants';
-import { MetadataState } from '@suite-common/metadata-types';
-import { DefinitionType, TokenManagementAction } from '@suite-common/token-definitions';
 import { selectSuiteSettings } from '../../reducers/suite/suiteReducer';
 
 export type StorageAction = NonNullable<PreloadStoreAction>;
@@ -135,9 +134,14 @@ const removeAccountFormDraft = async (prefix: FormDraftKeyPrefix, accountKey: st
 
 export const saveDevice = async (device: TrezorDevice, forceRemember?: true) => {
     if (!(await db.isAccessible())) return;
-    if (!isDeviceAcquired(device) || !device.state) return;
+    if (!isDeviceAcquired(device) || !device.state?.staticSessionId) return;
 
-    return db.addItem('devices', serializeDevice(device, forceRemember), device.state, true);
+    return db.addItem(
+        'devices',
+        serializeDevice(device, forceRemember),
+        device.state.staticSessionId,
+        true,
+    );
 };
 
 const removeAccount = async (account: Account) => {
@@ -184,16 +188,17 @@ export const removeAccountWithDependencies = (getState: GetState) => (account: A
 
 export const forgetDevice = (device: TrezorDevice) => async (_: Dispatch, getState: GetState) => {
     if (!(await db.isAccessible())) return;
-    if (!device.state) return;
+    if (!device.state?.staticSessionId) return;
+    const { staticSessionId } = device.state;
 
-    const accounts = getState().wallet.accounts.filter(a => a.deviceState === device.state);
+    const accounts = getState().wallet.accounts.filter(a => a.deviceState === staticSessionId);
 
     return Promise.all([
-        db.removeItemByPK('devices', device.state),
-        db.removeItemByPK('discovery', device.state),
-        db.removeItemByIndex('accounts', 'deviceState', device.state),
-        db.removeItemByIndex('txs', 'deviceState', device.state),
-        db.removeItemByIndex('graph', 'deviceState', device.state),
+        db.removeItemByPK('devices', staticSessionId),
+        db.removeItemByPK('discovery', staticSessionId),
+        db.removeItemByIndex('accounts', 'deviceState', staticSessionId),
+        db.removeItemByIndex('txs', 'deviceState', staticSessionId),
+        db.removeItemByIndex('graph', 'deviceState', staticSessionId),
         ...accounts.map(removeAccountWithDependencies(getState)),
     ]);
 };
@@ -250,7 +255,7 @@ export const rememberDevice =
     (device: TrezorDevice, remember: boolean, forcedRemember?: true) =>
     async (dispatch: Dispatch, getState: GetState) => {
         if (!(await db.isAccessible())) return;
-        if (!isDeviceAcquired(device) || !device.state) return;
+        if (!isDeviceAcquired(device) || !device.state?.staticSessionId) return;
         if (!remember) {
             // eslint-disable-next-line @typescript-eslint/no-use-before-define
             dispatch(forgetDeviceMetadataError(device));
@@ -259,10 +264,14 @@ export const rememberDevice =
         }
 
         const { wallet } = getState();
-        const accounts = wallet.accounts.filter(a => a.deviceState === device.state);
-        const graphData = wallet.graph.data.filter(d => deviceGraphDataFilterFn(d, device.state));
+        const accounts = wallet.accounts.filter(
+            a => a.deviceState === device.state?.staticSessionId,
+        );
+        const graphData = wallet.graph.data.filter(d =>
+            deviceGraphDataFilterFn(d, device.state?.staticSessionId),
+        );
         const discovery = wallet.discovery
-            .filter(d => d.deviceState === device.state)
+            .filter(d => d.deviceState === device.state?.staticSessionId)
             .map(serializeDiscovery);
         const historicRates = wallet.fiat.historic;
 
@@ -412,7 +421,7 @@ export const saveDeviceMetadataError =
         if (!(await db.isAccessible())) return;
 
         const { metadata } = getState();
-        if (device.state && metadata?.error?.[device.state]) {
+        if (device.state?.staticSessionId && metadata?.error?.[device.state.staticSessionId]) {
             const { error } = metadata;
             await saveMetadata({ error });
         }
@@ -423,9 +432,9 @@ export const forgetDeviceMetadataError =
         if (!(await db.isAccessible())) return;
 
         const { metadata } = getState();
-        if (device.state && metadata?.error) {
+        if (device.state?.staticSessionId && metadata?.error) {
             const next = cloneObject(metadata.error);
-            delete next[device.state];
+            delete next[device.state.staticSessionId];
             saveMetadata({ error: next });
         }
     };
diff --git a/packages/suite/src/actions/suite/suiteActions.ts b/packages/suite/src/actions/suite/suiteActions.ts
index 0029007bc4b..787efda20b7 100644
--- a/packages/suite/src/actions/suite/suiteActions.ts
+++ b/packages/suite/src/actions/suite/suiteActions.ts
@@ -40,6 +40,7 @@ export type SuiteAction =
     | { type: typeof SUITE.COINJOIN_RECEIVE_WARNING; payload: boolean }
     | { type: typeof SUITE.DEVICE_AUTHENTICITY_OPT_OUT; payload: boolean }
     | { type: typeof SUITE.DEVICE_FIRMWARE_REVISION_CHECK; payload: { isDisabled: boolean } }
+    | { type: typeof SUITE.DEVICE_FIRMWARE_HASH_CHECK; payload: { isDisabled: boolean } }
     | { type: typeof SUITE.COINJOIN_RECEIVE_WARNING; payload: boolean }
     | { type: typeof SUITE.LOCK_UI; payload: boolean }
     | ReturnType<typeof lockDevice>
@@ -85,7 +86,6 @@ export type SuiteAction =
       }
     | { type: typeof deviceActions.requestDeviceReconnect.type }
     | { type: typeof SUITE.SET_SIDEBAR_WIDTH; payload: { width: number } }
-    | { type: typeof SUITE.SET_AUTO_START; enabled?: boolean }
     | {
           type: typeof SUITE.SET_EXPERIMENTAL_FEATURES;
           payload: {
@@ -301,7 +301,7 @@ export const deviceAuthenticityOptOut = (payload: boolean) => (dispatch: Dispatc
     });
 };
 
-export const checkFirmwareRevision =
+export const toggleCheckFirmwareAuthenticity =
     ({ isDisabled }: { isDisabled: boolean }) =>
     (dispatch: Dispatch) => {
         dispatch(notificationsActions.addToast({ type: 'settings-applied' }));
@@ -310,6 +310,10 @@ export const checkFirmwareRevision =
             type: SUITE.DEVICE_FIRMWARE_REVISION_CHECK,
             payload: { isDisabled },
         });
+        dispatch({
+            type: SUITE.DEVICE_FIRMWARE_HASH_CHECK,
+            payload: { isDisabled },
+        });
     };
 
 /**
@@ -362,14 +366,3 @@ export const lockRouter = (payload: boolean): SuiteAction => ({
     type: SUITE.LOCK_ROUTER,
     payload,
 });
-
-/**
- * Set auto start for Suite
- * @param enabled {boolean} - true if Suite should start automatically
- * @returns {SuiteAction}
- */
-export const setAutoStart = (enabled: boolean) => (dispatch: Dispatch) => {
-    desktopApi.appAutoStart(enabled);
-
-    dispatch({ type: SUITE.SET_AUTO_START, enabled });
-};
diff --git a/packages/suite/src/actions/wallet/__fixtures__/blockchainActions.ts b/packages/suite/src/actions/wallet/__fixtures__/blockchainActions.ts
index 1aca4c90469..e544600da36 100644
--- a/packages/suite/src/actions/wallet/__fixtures__/blockchainActions.ts
+++ b/packages/suite/src/actions/wallet/__fixtures__/blockchainActions.ts
@@ -1,4 +1,4 @@
-import { analyzeTransactionsFixtures as analyzeTransactions } from '@suite-common/wallet-utils';
+import { analyzeTransactions } from '@suite-common/wallet-utils/src/__fixtures__/transactionUtils';
 import { blockchainActions, transactionsActions, accountsActions } from '@suite-common/wallet-core';
 import { notificationsActions } from '@suite-common/toast-notifications';
 
diff --git a/packages/suite/src/actions/wallet/__fixtures__/coinjoinAccountActions.ts b/packages/suite/src/actions/wallet/__fixtures__/coinjoinAccountActions.ts
index e7bb0de6411..f47bb195269 100644
--- a/packages/suite/src/actions/wallet/__fixtures__/coinjoinAccountActions.ts
+++ b/packages/suite/src/actions/wallet/__fixtures__/coinjoinAccountActions.ts
@@ -1,5 +1,6 @@
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { accountsActions } from '@suite-common/wallet-core';
+
 import { Account } from 'src/types/wallet';
 import * as COINJOIN from 'src/actions/wallet/constants/coinjoinConstants';
 
diff --git a/packages/suite/src/actions/wallet/__fixtures__/coinjoinClientActions.ts b/packages/suite/src/actions/wallet/__fixtures__/coinjoinClientActions.ts
index 7371e26df39..5098810f2b2 100644
--- a/packages/suite/src/actions/wallet/__fixtures__/coinjoinClientActions.ts
+++ b/packages/suite/src/actions/wallet/__fixtures__/coinjoinClientActions.ts
@@ -100,7 +100,10 @@ export const onCoinjoinRoundChanged = [
         connect: undefined,
         state: {
             device: {
-                devices: [DEVICE, { ...DEVICE, state: 'device-state-2', id: '2' }],
+                devices: [
+                    DEVICE,
+                    { ...DEVICE, state: { staticSessionId: 'device-state-2' }, id: '2' },
+                ],
             },
             accounts: [
                 { key: 'a', deviceState: '1stTestnetAddress@device_id:0' },
@@ -343,12 +346,16 @@ export const getOwnershipProof = [
             device: {
                 devices: [
                     DEVICE,
-                    { ...DEVICE, state: 'device-state-2' },
-                    { ...DEVICE, state: 'device-2-state', id: '2' },
+                    { ...DEVICE, state: { staticSessionId: 'device-state-2' } },
+                    { ...DEVICE, state: { staticSessionId: 'device-2-state' }, id: '2' },
                 ],
             },
             accounts: [
-                { key: 'account-A', deviceState: '1stTestnetAddress@device_id:0', utxo: [] },
+                {
+                    key: 'account-A',
+                    deviceState: '1stTestnetAddress@device_id:0',
+                    utxo: [],
+                },
                 { key: 'account-B', deviceState: 'device-state-2', utxo: [] },
                 { key: 'account-C', deviceState: 'device-2-state', utxo: [] },
             ],
@@ -410,10 +417,14 @@ export const getOwnershipProof = [
         ],
         state: {
             device: {
-                devices: [DEVICE, { ...DEVICE, state: 'device-state-2' }],
+                devices: [DEVICE, { ...DEVICE, state: { staticSessionId: 'device-state-2' } }],
             },
             accounts: [
-                { key: 'account-A', deviceState: '1stTestnetAddress@device_id:0', utxo: [] },
+                {
+                    key: 'account-A',
+                    deviceState: '1stTestnetAddress@device_id:0',
+                    utxo: [],
+                },
                 { key: 'account-B', deviceState: 'device-state-2', utxo: [] },
             ],
             coinjoin: {
@@ -453,16 +464,25 @@ export const getOwnershipProof = [
         connect: [],
         state: {
             suite: {
-                locks: [2],
+                locks: { device: 1 },
             },
             devices: [
                 DEVICE,
-                { ...DEVICE, state: 'device-state-2' },
-                { ...DEVICE, state: 'device-2-state', id: '2', connected: false },
-                { ...DEVICE, state: 'device-3-state', id: '3' },
+                { ...DEVICE, state: { staticSessionId: 'device-state-2' } },
+                {
+                    ...DEVICE,
+                    state: { staticSessionId: 'device-2-state' },
+                    id: '2',
+                    connected: false,
+                },
+                { ...DEVICE, state: { staticSessionId: 'device-3-state' }, id: '3' },
             ],
             accounts: [
-                { key: 'account-A', deviceState: '1stTestnetAddress@device_id:0', utxo: [] },
+                {
+                    key: 'account-A',
+                    deviceState: '1stTestnetAddress@device_id:0',
+                    utxo: [],
+                },
                 { key: 'account-B', deviceState: 'device-state-2', utxo: [] },
                 { key: 'account-C', deviceState: 'device-2-state', utxo: [] },
             ],
@@ -535,8 +555,8 @@ export const signCoinjoinTx = [
             device: {
                 devices: [
                     DEVICE,
-                    { ...DEVICE, state: 'device-state-2' },
-                    { ...DEVICE, state: 'device-2-state', id: '2' },
+                    { ...DEVICE, state: { staticSessionId: 'device-state-2' } },
+                    { ...DEVICE, state: { staticSessionId: 'device-2-state' }, id: '2' },
                 ],
             },
             accounts: [
@@ -843,8 +863,13 @@ export const signCoinjoinTx = [
             device: {
                 devices: [
                     DEVICE,
-                    { ...DEVICE, state: 'device-state-2' },
-                    { ...DEVICE, state: 'device-2-state', id: '2', connected: false },
+                    { ...DEVICE, state: { staticSessionId: 'device-state-2' } },
+                    {
+                        ...DEVICE,
+                        state: { staticSessionId: 'device-2-state' },
+                        id: '2',
+                        connected: false,
+                    },
                 ],
             },
             accounts: [
@@ -952,7 +977,7 @@ export const signCoinjoinTx = [
             trezorConnectCalledWith: [
                 {
                     device: {
-                        state: 'device-state-2',
+                        state: { staticSessionId: 'device-state-2' },
                     },
                     inputs: [
                         { script_type: 'EXTERNAL' }, // account-A
diff --git a/packages/suite/src/actions/wallet/__fixtures__/discoveryActions.ts b/packages/suite/src/actions/wallet/__fixtures__/discoveryActions.ts
index de03940432b..3e4c431c0e9 100644
--- a/packages/suite/src/actions/wallet/__fixtures__/discoveryActions.ts
+++ b/packages/suite/src/actions/wallet/__fixtures__/discoveryActions.ts
@@ -60,6 +60,12 @@ export const fixtures = [
                     symbol: 'test',
                     accountType: 'legacy',
                 },
+                {
+                    error: 'Runtime discovery error',
+                    index: 3,
+                    symbol: 'regtest',
+                    accountType: 'legacy',
+                },
             ],
         },
     },
diff --git a/packages/suite/src/actions/wallet/__fixtures__/mockCoinjoinService.ts b/packages/suite/src/actions/wallet/__fixtures__/mockCoinjoinService.ts
index 41b14bc5b98..85937678064 100644
--- a/packages/suite/src/actions/wallet/__fixtures__/mockCoinjoinService.ts
+++ b/packages/suite/src/actions/wallet/__fixtures__/mockCoinjoinService.ts
@@ -1,5 +1,7 @@
 import { EventEmitter } from 'events';
 
+import { NetworkSymbol } from '@suite-common/wallet-config';
+
 export const mockCoinjoinService = () => {
     const allowed = ['btc', 'test'];
     const clients: Record<string, any> = {}; // @trezor/coinjoin CoinjoinClient
@@ -65,7 +67,7 @@ export const mockCoinjoinService = () => {
         CoinjoinService: {
             getInstance: jest.fn((symbol: string) => clients[symbol]),
             getInstances: jest.fn(() => Object.values(clients)),
-            createInstance: jest.fn(({ network }: { network: string }) => {
+            createInstance: jest.fn(({ network }: { network: NetworkSymbol }) => {
                 if (!allowed.includes(network)) throw new Error('Client not supported');
                 if (clients[network]) return clients[network];
                 const instance = getMockedInstance(network);
diff --git a/packages/suite/src/actions/wallet/__fixtures__/moveLabelsForRbf/moveLabelsForRbfMetadataState.fixture.ts b/packages/suite/src/actions/wallet/__fixtures__/moveLabelsForRbf/moveLabelsForRbfMetadataState.fixture.ts
index c1569557cdd..de9bead12bd 100644
--- a/packages/suite/src/actions/wallet/__fixtures__/moveLabelsForRbf/moveLabelsForRbfMetadataState.fixture.ts
+++ b/packages/suite/src/actions/wallet/__fixtures__/moveLabelsForRbf/moveLabelsForRbfMetadataState.fixture.ts
@@ -1,4 +1,5 @@
 import { MetadataState } from '@suite-common/metadata-types';
+
 import {
     originalTransactionSpendAccount,
     chainSpendingReceivedCoins,
diff --git a/packages/suite/src/actions/wallet/__fixtures__/moveLabelsForRbf/moveLabelsForRbfTransactions.fixture.ts b/packages/suite/src/actions/wallet/__fixtures__/moveLabelsForRbf/moveLabelsForRbfTransactions.fixture.ts
index 90ef5cf22a8..6eeae1c9e02 100644
--- a/packages/suite/src/actions/wallet/__fixtures__/moveLabelsForRbf/moveLabelsForRbfTransactions.fixture.ts
+++ b/packages/suite/src/actions/wallet/__fixtures__/moveLabelsForRbf/moveLabelsForRbfTransactions.fixture.ts
@@ -1,5 +1,6 @@
 import { TransactionsRootState } from '@suite-common/wallet-core';
 import { WalletAccountTransaction } from '@suite-common/wallet-types';
+
 import { accountReceivingCoins, accountSpendingCoins } from './moveLabelsForRbfAccounts.fixture';
 
 export const originalTransactionSpendAccount: WalletAccountTransaction = {
diff --git a/packages/suite/src/actions/wallet/__fixtures__/receiveActions.ts b/packages/suite/src/actions/wallet/__fixtures__/receiveActions.ts
index 7cb2e22b43e..66f74976dbb 100644
--- a/packages/suite/src/actions/wallet/__fixtures__/receiveActions.ts
+++ b/packages/suite/src/actions/wallet/__fixtures__/receiveActions.ts
@@ -1,12 +1,12 @@
 import { connectInitThunk } from '@suite-common/connect-init';
 import { testMocks } from '@suite-common/test-utils';
 import { notificationsActions } from '@suite-common/toast-notifications';
+import { confirmAddressOnDeviceThunk } from '@suite-common/wallet-core';
 
 import * as receiveActions from 'src/actions/wallet/receiveActions';
 import { MODAL, SUITE } from 'src/actions/suite/constants';
 
 import { RECEIVE } from '../constants';
-import { confirmAddressOnDeviceThunk } from '@suite-common/wallet-core';
 
 const PATH = "m/49'/0'/0'/0/0";
 const ADDRESS = 'AddRe5s';
diff --git a/packages/suite/src/actions/wallet/__tests__/blockchainActions.test.ts b/packages/suite/src/actions/wallet/__tests__/blockchainActions.test.ts
index 5ef99c827f0..95ac2fff3e2 100644
--- a/packages/suite/src/actions/wallet/__tests__/blockchainActions.test.ts
+++ b/packages/suite/src/actions/wallet/__tests__/blockchainActions.test.ts
@@ -10,11 +10,11 @@ import {
     preloadFeeInfoThunk,
     setCustomBackendThunk,
     updateFeeInfoThunk,
+    feesReducer,
 } from '@suite-common/wallet-core';
 
 import { configureStore, filterThunkActionTypes } from 'src/support/tests/configureStore';
 import { accountsReducer, transactionsReducer, blockchainReducer } from 'src/reducers/wallet';
-import { feesReducer } from '@suite-common/wallet-core';
 
 import * as fixtures from '../__fixtures__/blockchainActions';
 
@@ -31,7 +31,7 @@ interface Args {
     transactions?: TransactionsState['transactions'];
 }
 
-export const getInitialState = (
+const getInitialState = (
     { accounts, transactions, blockchain, fees }: Args = {},
     action: any = { type: 'initial' },
 ) => ({
@@ -207,7 +207,7 @@ describe('Blockchain Actions', () => {
                 },
                 fees: {
                     // @ts-expect-error partial params
-                    btc: { blockHeight: 100 },
+                    btc: { blockHeight: 100, levels: [] },
                 },
             }),
         );
diff --git a/packages/suite/src/actions/wallet/__tests__/cardanoStakingActions.test.ts b/packages/suite/src/actions/wallet/__tests__/cardanoStakingActions.test.ts
index fc66de6269a..faea584433b 100644
--- a/packages/suite/src/actions/wallet/__tests__/cardanoStakingActions.test.ts
+++ b/packages/suite/src/actions/wallet/__tests__/cardanoStakingActions.test.ts
@@ -1,13 +1,15 @@
+import { getUnixTime } from 'date-fns';
+
 import { testMocks } from '@suite-common/test-utils';
-import { configureStore } from 'src/support/tests/configureStore';
+import { BlockchainBlock } from '@trezor/connect';
 
+import { configureStore } from 'src/support/tests/configureStore';
 import cardanoStakingReducer from 'src/reducers/wallet/cardanoStakingReducer';
 import * as cardanoStakingActions from 'src/actions/wallet/cardanoStakingActions';
-import { CARDANO_STAKING } from '../constants';
 import { WalletAccountTransaction } from 'src/types/wallet';
-import { BlockchainBlock } from '@trezor/connect';
 import { transactionsReducer } from 'src/reducers/wallet';
-import { getUnixTime } from 'date-fns';
+
+import { CARDANO_STAKING } from '../constants';
 
 const { getSuiteDevice } = testMocks;
 const cardanoAccount = testMocks.getWalletAccount({
diff --git a/packages/suite/src/actions/wallet/__tests__/coinjoinClientActions.test.ts b/packages/suite/src/actions/wallet/__tests__/coinjoinClientActions.test.ts
index 343c754a060..56d4b8e98a2 100644
--- a/packages/suite/src/actions/wallet/__tests__/coinjoinClientActions.test.ts
+++ b/packages/suite/src/actions/wallet/__tests__/coinjoinClientActions.test.ts
@@ -36,10 +36,8 @@ const messageSystemReducer = prepareMessageSystemReducer(extraDependencies);
 const rootReducer = combineReducers({
     suite: createReducer(
         {
-            locks: [],
-            settings: {
-                debug: {},
-            },
+            locks: {},
+            settings: { debug: {} },
         },
         () => ({}),
     ),
@@ -234,6 +232,7 @@ describe('coinjoinClientActions', () => {
         spy.mockClear();
 
         // for coverage, init same instance multiple times without waiting
+        // eslint-disable-next-line jest/valid-expect-in-promise
         store.dispatch(initCoinjoinService('test')).then(cli3 => {
             expect(cli3?.client.settings.network).toEqual('test');
         });
@@ -400,7 +399,11 @@ describe('coinjoinClientActions', () => {
     it('stopCoinjoinSession with error from Trezor', async () => {
         const store = initStore({
             accounts: [
-                { key: 'account-A', symbol: 'btc', deviceState: '1stTestnetAddress@device_id:0' },
+                {
+                    key: 'account-A',
+                    symbol: 'btc',
+                    deviceState: '1stTestnetAddress@device_id:0',
+                },
             ],
         } as any);
 
@@ -418,7 +421,10 @@ describe('coinjoinClientActions', () => {
     it('stopCoinjoinSession but not cancel authorization', async () => {
         const store = initStore({
             device: {
-                devices: [fixtures.DEVICE, { ...fixtures.DEVICE, state: 'device-state-2' }],
+                devices: [
+                    fixtures.DEVICE,
+                    { ...fixtures.DEVICE, state: { staticSessionId: 'device-state-2' } },
+                ],
             },
             accounts: [
                 {
diff --git a/packages/suite/src/actions/wallet/__tests__/coinmarketBuyActions.test.ts b/packages/suite/src/actions/wallet/__tests__/coinmarketBuyActions.test.ts
index 635ff884668..ca4e4683d0f 100644
--- a/packages/suite/src/actions/wallet/__tests__/coinmarketBuyActions.test.ts
+++ b/packages/suite/src/actions/wallet/__tests__/coinmarketBuyActions.test.ts
@@ -1,12 +1,12 @@
-import { configureStore } from 'src/support/tests/configureStore';
+import { BuyTrade, BuyTradeQuoteRequest, CryptoId } from 'invity-api';
 
-import coinmarketReducer from 'src/reducers/wallet/coinmarketReducer';
+import { configureStore } from 'src/support/tests/configureStore';
+import { coinmarketReducer } from 'src/reducers/wallet/coinmarketReducer';
+import invityAPI from 'src/services/suite/invityAPI';
 
 import * as coinmarketBuyActions from '../coinmarketBuyActions';
-import invityAPI from 'src/services/suite/invityAPI';
-import { BuyTrade, BuyTradeQuoteRequest, CryptoId } from 'invity-api';
 
-export const getInitialState = () => ({
+const getInitialState = () => ({
     wallet: {
         coinmarket: coinmarketReducer(undefined, { type: 'foo' } as any),
     },
@@ -55,7 +55,7 @@ const setFetchMock = (mock: any) => {
 describe('Coinmarket Buy Actions', () => {
     invityAPI.createInvityAPIKey('mock');
 
-    it('load and saveBuyInfo', () => {
+    it('load and saveBuyInfo', async () => {
         const buyList = {
             country: 'CZ',
             suggestedFiatCurrency: 'CZK',
@@ -93,7 +93,7 @@ describe('Coinmarket Buy Actions', () => {
 
         const store = initStore(getInitialState());
 
-        coinmarketBuyActions.loadBuyInfo().then(buyInfo => {
+        await coinmarketBuyActions.loadBuyInfo().then(buyInfo => {
             store.dispatch(coinmarketBuyActions.saveBuyInfo(buyInfo));
             expect(store.getState().wallet.coinmarket.buy.buyInfo).toEqual({
                 buyInfo: {
diff --git a/packages/suite/src/actions/wallet/__tests__/coinmarketExchangeActions.test.ts b/packages/suite/src/actions/wallet/__tests__/coinmarketExchangeActions.test.ts
index ee90499d172..b8d466dc2f6 100644
--- a/packages/suite/src/actions/wallet/__tests__/coinmarketExchangeActions.test.ts
+++ b/packages/suite/src/actions/wallet/__tests__/coinmarketExchangeActions.test.ts
@@ -1,12 +1,12 @@
-import { configureStore } from 'src/support/tests/configureStore';
+import { CryptoId, ExchangeTrade, ExchangeTradeQuoteRequest } from 'invity-api';
 
-import coinmarketReducer from 'src/reducers/wallet/coinmarketReducer';
+import { configureStore } from 'src/support/tests/configureStore';
+import { coinmarketReducer } from 'src/reducers/wallet/coinmarketReducer';
+import invityAPI from 'src/services/suite/invityAPI';
 
 import * as coinmarketExchangeActions from '../coinmarketExchangeActions';
-import invityAPI from 'src/services/suite/invityAPI';
-import { CryptoId, ExchangeTrade, ExchangeTradeQuoteRequest } from 'invity-api';
 
-export const getInitialState = () => ({
+const getInitialState = () => ({
     wallet: {
         coinmarket: coinmarketReducer(undefined, { type: 'foo' } as any),
     },
@@ -105,7 +105,7 @@ describe('Coinmarket Exchange Actions', () => {
 
         const store = initStore(getInitialState());
 
-        coinmarketExchangeActions.loadExchangeInfo().then(exchangeInfo => {
+        return coinmarketExchangeActions.loadExchangeInfo().then(exchangeInfo => {
             store.dispatch(coinmarketExchangeActions.saveExchangeInfo(exchangeInfo));
             expect(store.getState().wallet.coinmarket.exchange.exchangeInfo).toEqual({
                 exchangeList,
diff --git a/packages/suite/src/actions/wallet/__tests__/discoveryActions.test.ts b/packages/suite/src/actions/wallet/__tests__/discoveryActions.test.ts
index a109decacea..4e6c3d03d9a 100644
--- a/packages/suite/src/actions/wallet/__tests__/discoveryActions.test.ts
+++ b/packages/suite/src/actions/wallet/__tests__/discoveryActions.test.ts
@@ -18,6 +18,7 @@ import { notificationsActions } from '@suite-common/toast-notifications';
 import { DiscoveryStatus } from '@suite-common/wallet-constants';
 import * as discoveryActions from '@suite-common/wallet-core';
 import TrezorConnect, { ERRORS } from '@trezor/connect';
+import { BITCOIN_ONLY_NETWORKS } from '@suite-common/suite-constants';
 
 import { configureStore, filterThunkActionTypes } from 'src/support/tests/configureStore';
 import walletSettingsReducer from 'src/reducers/wallet/settingsReducer';
@@ -171,7 +172,7 @@ const setTrezorConnectFixtures = (input?: FixtureInput) => {
 };
 
 const SUITE_DEVICE = getSuiteDevice({ state: '1stTestnetAddress@device_id:0', connected: true });
-export const getInitialState = (device = SUITE_DEVICE) => ({
+const getInitialState = (device = SUITE_DEVICE) => ({
     device: {
         devices: [device],
         selectedDevice: device,
@@ -182,7 +183,7 @@ export const getInitialState = (device = SUITE_DEVICE) => ({
         accounts: accountsReducer(undefined, { type: 'foo' } as any),
         settings: walletSettingsReducer(undefined, {
             type: walletSettingsActions.changeNetworks.type,
-            payload: ['btc', 'test'],
+            payload: BITCOIN_ONLY_NETWORKS,
         }),
     },
 });
@@ -436,25 +437,26 @@ describe('Discovery Actions', () => {
         expect(store.getState().wallet.discovery.length).toEqual(0);
     });
 
-    it('Start/stop', done => {
-        const f = new Promise<any>(resolve => {
-            setTimeout(() => resolve(paramsError('discovery_interrupted')), 100);
-        });
-        // set fixtures in @trezor/connect
-        setTrezorConnectFixtures(f);
-        const store = initStore();
-        store.dispatch(
-            createDiscoveryThunk({
-                deviceState: '1stTestnetAddress@device_id:0',
-                device: SUITE_DEVICE,
-            }),
-        );
-        store.dispatch(startDiscoveryThunk()).then(() => {
-            const action = filterThunkActionTypes(store.getActions()).pop();
-            done(expect(action?.type).toEqual(discoveryActions.stopDiscovery.type));
-        });
-        store.dispatch(stopDiscoveryThunk());
-    });
+    it('Start/stop', () =>
+        new Promise<void>(done => {
+            const f = new Promise<any>(resolve => {
+                setTimeout(() => resolve(paramsError('discovery_interrupted')), 100);
+            });
+            // set fixtures in @trezor/connect
+            setTrezorConnectFixtures(f);
+            const store = initStore();
+            store.dispatch(
+                createDiscoveryThunk({
+                    deviceState: '1stTestnetAddress@device_id:0',
+                    device: SUITE_DEVICE,
+                }),
+            );
+            store.dispatch(startDiscoveryThunk()).then(() => {
+                const action = filterThunkActionTypes(store.getActions()).pop();
+                done(expect(action?.type).toEqual(discoveryActions.stopDiscovery.type));
+            });
+            store.dispatch(stopDiscoveryThunk());
+        }));
 
     it('Stop discovery without device (discovery not exists)', async () => {
         const state = {
diff --git a/packages/suite/src/actions/wallet/__tests__/formDraftActions.test.ts b/packages/suite/src/actions/wallet/__tests__/formDraftActions.test.ts
index 31b8ba8207f..501f20050eb 100644
--- a/packages/suite/src/actions/wallet/__tests__/formDraftActions.test.ts
+++ b/packages/suite/src/actions/wallet/__tests__/formDraftActions.test.ts
@@ -1,9 +1,9 @@
 import { configureStore } from 'src/support/tests/configureStore';
-
 import formDraftReducer, { FormDraftState } from 'src/reducers/wallet/formDraftReducer';
+
 import * as formDraftActions from '../formDraftActions';
 
-export const getInitialState = (state?: FormDraftState) => ({
+const getInitialState = (state?: FormDraftState) => ({
     wallet: {
         formDrafts: formDraftReducer(state, { type: 'foo' } as any),
     },
diff --git a/packages/suite/src/actions/wallet/__tests__/moveLabelsForRbfActions.test.ts b/packages/suite/src/actions/wallet/__tests__/moveLabelsForRbfActions.test.ts
index b7b4f0fcb7f..6ac89d536f4 100644
--- a/packages/suite/src/actions/wallet/__tests__/moveLabelsForRbfActions.test.ts
+++ b/packages/suite/src/actions/wallet/__tests__/moveLabelsForRbfActions.test.ts
@@ -1,6 +1,8 @@
 import { combineReducers } from '@reduxjs/toolkit';
-import { accountsReducer, transactionsReducer } from '../../../reducers/wallet';
+
 import { configureMockStore, initPreloadedState } from '@suite-common/test-utils';
+
+import { accountsReducer, transactionsReducer } from '../../../reducers/wallet';
 import { findLabelsToBeMovedOrDeleted, moveLabelsForRbfAction } from '../moveLabelsForRbfActions';
 import {
     accountReceivingCoins,
diff --git a/packages/suite/src/actions/wallet/__tests__/receiveActions.test.ts b/packages/suite/src/actions/wallet/__tests__/receiveActions.test.ts
index 591a383b20a..bb008ac20b1 100644
--- a/packages/suite/src/actions/wallet/__tests__/receiveActions.test.ts
+++ b/packages/suite/src/actions/wallet/__tests__/receiveActions.test.ts
@@ -1,6 +1,8 @@
 import { connectInitThunk } from '@suite-common/connect-init';
 import { testMocks } from '@suite-common/test-utils';
 import { prepareDeviceReducer } from '@suite-common/wallet-core';
+import { AccountKey } from '@suite-common/wallet-types';
+import { NetworkSymbol, NetworkType } from '@suite-common/wallet-config';
 
 import { configureStore } from 'src/support/tests/configureStore';
 import receiveReducer from 'src/reducers/wallet/receiveReducer';
@@ -10,8 +12,6 @@ import * as receiveActions from 'src/actions/wallet/receiveActions';
 import { extraDependencies } from 'src/support/extraDependencies';
 
 import fixtures from '../__fixtures__/receiveActions';
-import { AccountKey } from '@suite-common/wallet-types';
-import { NetworkSymbol, NetworkType } from '@suite-common/wallet-config';
 
 const { getSuiteDevice } = testMocks;
 
@@ -86,7 +86,7 @@ interface InitialState {
     modal: ModalState;
 }
 
-export const getInitialState = (state: Partial<InitialState> | undefined) => ({
+const getInitialState = (state: Partial<InitialState> | undefined) => ({
     suite: {
         ...suiteReducer(undefined, { type: 'foo' } as any),
         ...state?.suite,
diff --git a/packages/suite/src/actions/wallet/__tests__/selectedAccountActions.test.ts b/packages/suite/src/actions/wallet/__tests__/selectedAccountActions.test.ts
index b646976e7ee..8d647a2a4ba 100644
--- a/packages/suite/src/actions/wallet/__tests__/selectedAccountActions.test.ts
+++ b/packages/suite/src/actions/wallet/__tests__/selectedAccountActions.test.ts
@@ -1,11 +1,10 @@
 import { configureStore } from 'src/support/tests/configureStore';
-
 import selectedAccountReducer from 'src/reducers/wallet/selectedAccountReducer';
 
 import { syncSelectedAccount } from '../selectedAccountActions';
 import fixtures from '../__fixtures__/selectedAccountActions';
 
-export const getInitialState = (_settings?: any) => ({
+const getInitialState = (_settings?: any) => ({
     wallet: {
         selectedAccount: {
             ...selectedAccountReducer(undefined, { type: 'foo' } as any),
diff --git a/packages/suite/src/actions/wallet/__tests__/signVerifyActions.test.ts b/packages/suite/src/actions/wallet/__tests__/signVerifyActions.test.ts
index 15a3cdccf2c..6d353991fef 100644
--- a/packages/suite/src/actions/wallet/__tests__/signVerifyActions.test.ts
+++ b/packages/suite/src/actions/wallet/__tests__/signVerifyActions.test.ts
@@ -1,6 +1,6 @@
 import { testMocks } from '@suite-common/test-utils';
-import { showAddress, sign, verify } from 'src/actions/wallet/signVerifyActions';
 
+import { showAddress, sign, verify } from 'src/actions/wallet/signVerifyActions';
 import { configureStore } from 'src/support/tests/configureStore';
 
 const PATH = 'PATH';
diff --git a/packages/suite/src/actions/wallet/__tests__/transactionActions.test.ts b/packages/suite/src/actions/wallet/__tests__/transactionActions.test.ts
index 5f84694b24e..df765092bbd 100644
--- a/packages/suite/src/actions/wallet/__tests__/transactionActions.test.ts
+++ b/packages/suite/src/actions/wallet/__tests__/transactionActions.test.ts
@@ -1,14 +1,16 @@
-import { transactionsReducer } from 'src/reducers/wallet';
+import { configureStore } from '@reduxjs/toolkit';
+
 import { getAccountTransactions } from '@suite-common/wallet-utils';
 import {
     transactionsActions,
     transactionsInitialState,
     TransactionsState,
 } from '@suite-common/wallet-core';
-import { configureStore } from '@reduxjs/toolkit';
 import { getTxsPerPage } from '@suite-common/suite-utils';
 import { testMocks } from '@suite-common/test-utils';
 
+import { transactionsReducer } from 'src/reducers/wallet';
+
 const { getWalletTransaction } = testMocks;
 
 const initStore = (transactionsState?: TransactionsState) =>
diff --git a/packages/suite/src/actions/wallet/addWalletThunk.ts b/packages/suite/src/actions/wallet/addWalletThunk.ts
index 405973d6bd4..4a51f6039bc 100644
--- a/packages/suite/src/actions/wallet/addWalletThunk.ts
+++ b/packages/suite/src/actions/wallet/addWalletThunk.ts
@@ -9,9 +9,11 @@ import {
     selectDevices,
 } from '@suite-common/wallet-core';
 import { WalletType } from '@suite-common/wallet-types';
-import { goto } from '../suite/routerActions';
+
 import { getBackgroundRoute } from 'src/utils/suite/router';
 
+import { goto } from '../suite/routerActions';
+
 export const redirectAfterWalletSelectedThunk = createThunk<void, void, void>(
     `${DEVICE_MODULE_PREFIX}/redirectAfterWalletSelectedThunk`,
     async (_, { dispatch }) => {
diff --git a/packages/suite/src/actions/wallet/cardanoStakingActions.ts b/packages/suite/src/actions/wallet/cardanoStakingActions.ts
index 9bfc6a64dc7..2eb4b13990d 100644
--- a/packages/suite/src/actions/wallet/cardanoStakingActions.ts
+++ b/packages/suite/src/actions/wallet/cardanoStakingActions.ts
@@ -1,15 +1,17 @@
+import { getUnixTime } from 'date-fns';
+
 import { BlockchainBlock } from '@trezor/connect';
 import { CARDANO_STAKE_POOL_PREVIEW_URL, CARDANO_STAKE_POOL_MAINNET_URL } from '@trezor/urls';
-import { CARDANO_STAKING } from 'src/actions/wallet/constants';
-import { PendingStakeTx, PoolsResponse, CardanoNetwork } from 'src/types/wallet/cardanoStaking';
-import { Account, WalletAccountTransaction } from 'src/types/wallet';
-import { Dispatch, GetState } from 'src/types/suite';
-import { getUnixTime } from 'date-fns';
 import { isPending, getAccountTransactions } from '@suite-common/wallet-utils';
 import { CARDANO_DEFAULT_TTL_OFFSET } from '@suite-common/wallet-constants';
 import { transactionsActions } from '@suite-common/wallet-core';
 import { getNetworkOptional } from '@suite-common/wallet-config';
 
+import { CARDANO_STAKING } from 'src/actions/wallet/constants';
+import { PendingStakeTx, PoolsResponse, CardanoNetwork } from 'src/types/wallet/cardanoStaking';
+import { Account, WalletAccountTransaction } from 'src/types/wallet';
+import { Dispatch, GetState } from 'src/types/suite';
+
 export type CardanoStakingAction =
     | { type: typeof CARDANO_STAKING.ADD_PENDING_STAKE_TX; pendingStakeTx: PendingStakeTx }
     | { type: typeof CARDANO_STAKING.REMOVE_PENDING_STAKE_TX; accountKey: string }
@@ -130,7 +132,7 @@ export const fetchTrezorPools = (network: 'ADA' | 'tADA') => async (dispatch: Di
             trezorPools: responseJson as PoolsResponse,
             network: cardanoNetwork,
         });
-    } catch (err) {
+    } catch {
         dispatch({
             type: CARDANO_STAKING.SET_FETCH_ERROR,
             error: true,
diff --git a/packages/suite/src/actions/wallet/coinjoinAccountActions.ts b/packages/suite/src/actions/wallet/coinjoinAccountActions.ts
index fea276455a1..bcb290189ce 100644
--- a/packages/suite/src/actions/wallet/coinjoinAccountActions.ts
+++ b/packages/suite/src/actions/wallet/coinjoinAccountActions.ts
@@ -12,7 +12,11 @@ import {
     selectDevice,
     selectDevices,
 } from '@suite-common/wallet-core';
-import { getAccountTransactions, sortByBIP44AddressIndex } from '@suite-common/wallet-utils';
+import {
+    getAccountTransactions,
+    sortByBIP44AddressIndex,
+    substituteBip43Path,
+} from '@suite-common/wallet-utils';
 
 import { CoinjoinService, COORDINATOR_FEE_RATE_MULTIPLIER } from 'src/services/coinjoin';
 import { getAccountProgressHandle, getRegisterAccountParams } from 'src/utils/wallet/coinjoinUtils';
@@ -35,13 +39,12 @@ import {
     selectSessionByAccountKey,
     selectWeightedAnonymityByAccountKey,
 } from 'src/reducers/wallet/coinjoinReducer';
-import { SUITE } from 'src/actions/suite/constants';
 import { openModal } from 'src/actions/suite/modalActions';
+import { selectIsDeviceLocked } from 'src/reducers/suite/suiteReducer';
 
 import * as coinjoinClientActions from './coinjoinClientActions';
 import { goto } from '../suite/routerActions';
 import * as COINJOIN from './constants/coinjoinConstants';
-import { selectLocks } from '../../reducers/suite/suiteReducer';
 
 export const coinjoinAccountUpdateAnonymity = (accountKey: string, targetAnonymity: number) =>
     ({
@@ -116,6 +119,7 @@ const coinjoinAccountAuthorizeFailed = (accountKey: string, error: string) =>
         },
     }) as const;
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const coinjoinAccountUnregister = (accountKey: string) =>
     ({
         type: COINJOIN.ACCOUNT_UNREGISTER,
@@ -326,16 +330,16 @@ const coinjoinAccountAddTransactions =
     };
 
 /**
-Action called from coinjoinMiddleware as reaction to prepending tx creation.
-Prepending tx could be created either as result of successful CoinjoinRound (not broadcasted by suite)
-or as result of sendFormActions > addFakePendingTxThunk (broadcasted by suite)
-in both cases Account should:
-- exclude spent utxo
-- mark addresses as used
-- recalculate anonymity
-- recalculate balance
-Prepending txs have deadline (blockHeight) when they should be removed from UI.
-In case of adding a coinjoin transaction, log anonymity gain.
+ Action called from coinjoinMiddleware as reaction to prepending tx creation.
+ Prepending tx could be created either as result of successful CoinjoinRound (not broadcasted by suite)
+ or as result of sendFormActions > addFakePendingTxThunk (broadcasted by suite)
+ in both cases Account should:
+ - exclude spent utxo
+ - mark addresses as used
+ - recalculate anonymity
+ - recalculate balance
+ Prepending txs have deadline (blockHeight) when they should be removed from UI.
+ In case of adding a coinjoin transaction, log anonymity gain.
  */
 export const updatePendingAccountInfo =
     (accountKey: string) => async (dispatch: Dispatch, getState: GetState) => {
@@ -578,7 +582,7 @@ export const createCoinjoinAccount =
             return;
         }
 
-        const path = account.bip43Path.replace('i', '0');
+        const path = substituteBip43Path(account.bip43Path);
 
         // get coinjoin account xpub
         const publicKey = await TrezorConnect.getPublicKey({
@@ -600,7 +604,7 @@ export const createCoinjoinAccount =
         // create empty account
         const coinjoinAccount = dispatch(
             accountsActions.createAccount({
-                deviceState: device!.state!,
+                deviceState: device!.state!.staticSessionId!,
                 discoveryItem: {
                     index: 0,
                     path,
@@ -760,7 +764,7 @@ export const startCoinjoinSession =
 export const restoreCoinjoinSession =
     (accountKey: string) => async (dispatch: Dispatch, getState: GetState) => {
         // TODO: check if device is connected, passphrase is authorized...
-        const locks = selectLocks(getState());
+        const isDeviceLocked = selectIsDeviceLocked(getState());
         const device = selectDevice(getState());
         const account = selectAccountByKey(getState(), accountKey);
 
@@ -781,7 +785,7 @@ export const restoreCoinjoinSession =
             return errorToast('Device disconnected');
         }
 
-        if (locks.includes(SUITE.LOCK_TYPE.DEVICE)) {
+        if (isDeviceLocked) {
             return errorToast('Device locked');
         }
 
@@ -887,7 +891,7 @@ export const stopCoinjoinSessionByDeviceId =
         const disconnectedDevices = devices.filter(d => d.id === deviceID && d.remember);
         const affectedAccounts = disconnectedDevices.flatMap(d =>
             state.wallet.accounts.filter(
-                a => a.accountType === 'coinjoin' && a.deviceState === d.state,
+                a => a.accountType === 'coinjoin' && a.deviceState === d.state?.staticSessionId,
             ),
         );
 
diff --git a/packages/suite/src/actions/wallet/coinjoinClientActions.ts b/packages/suite/src/actions/wallet/coinjoinClientActions.ts
index c3b4b3ec03f..d4cdfd943cf 100644
--- a/packages/suite/src/actions/wallet/coinjoinClientActions.ts
+++ b/packages/suite/src/actions/wallet/coinjoinClientActions.ts
@@ -13,9 +13,10 @@ import { arrayDistinct, arrayToDictionary, promiseAllSequence } from '@trezor/ut
 import { getOsName } from '@trezor/env-utils';
 import { selectAccountByKey, selectDevices } from '@suite-common/wallet-core';
 import { getUtxoOutpoint } from '@suite-common/wallet-utils';
-import { Account } from '@suite-common/wallet-types';
+import { Account, AddressDisplayOptions } from '@suite-common/wallet-types';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { getDeviceInstances } from '@suite-common/suite-utils';
+import { Feature, selectIsFeatureDisabled } from '@suite-common/message-system';
 
 import {
     prepareCoinjoinTransaction,
@@ -26,19 +27,15 @@ import { CoinjoinService, getCoinjoinConfig } from 'src/services/coinjoin';
 import { Dispatch, GetState } from 'src/types/suite';
 import { CoinjoinAccount, EndRoundState, CoinjoinDebugSettings } from 'src/types/wallet/coinjoin';
 import { onCancel as closeModal, openModal } from 'src/actions/suite/modalActions';
-import { SUITE } from 'src/actions/suite/constants';
 import {
     selectRoundsNeededByAccountKey,
     selectRoundsLeftByAccountKey,
     selectRoundsDurationInHours,
     selectCoinjoinAccounts,
 } from 'src/reducers/wallet/coinjoinReducer';
+import { selectAddressDisplayType, selectIsDeviceLocked } from 'src/reducers/suite/suiteReducer';
 
 import * as COINJOIN from './constants/coinjoinConstants';
-import { AddressDisplayOptions } from '@suite-common/wallet-types';
-
-import { selectAddressDisplayType } from 'src/reducers/suite/suiteReducer';
-import { Feature, selectIsFeatureDisabled } from '@suite-common/message-system';
 
 const clientEnable = (symbol: Account['symbol']) =>
     ({
@@ -230,7 +227,7 @@ export const setBusyScreen =
         // collect unique physical devices (by device.id)
         const uniquePhysicalDevices = uniqueDeviceStates.reduce(
             (result, state) => {
-                const device = devices.find(d => d.connected && d.state === state);
+                const device = devices.find(d => d.connected && d.state?.staticSessionId === state);
                 if (device && !result.find(d => d.id === device.id)) {
                     return result.concat(device);
                 }
@@ -306,7 +303,9 @@ export const stopCoinjoinSession =
         client?.unregisterAccount(account.key);
 
         // cancelCoinjoinAuthorization should be called only if there is no other registered coinjoin account
-        const device = selectDevices(state).find(d => d.state === account.deviceState);
+        const device = selectDevices(state).find(
+            d => d.state?.staticSessionId === account.deviceState,
+        );
         let shouldCancelAuthorization = device?.connected;
         if (device) {
             // find all instances of this physical device
@@ -318,7 +317,7 @@ export const stopCoinjoinSession =
                     a =>
                         a.accountType === 'coinjoin' &&
                         a.key !== accountKey &&
-                        a.deviceState === d.state,
+                        a.deviceState === d.state?.staticSessionId,
                 ),
             );
             // find coinjoin account with session
@@ -449,11 +448,12 @@ const coinjoinResponseError = (utxos: CoinjoinRequestEvent['inputs'], error: str
 const getOwnershipProof =
     (request: Extract<CoinjoinRequestEvent, { type: 'ownership' }>) =>
     async (_dispatch: Dispatch, getState: GetState) => {
+        const state = getState();
         const {
-            suite: { locks },
             wallet: { coinjoin, accounts },
-        } = getState();
-        const devices = selectDevices(getState());
+        } = state;
+        const devices = selectDevices(state);
+        const isDeviceLocked = selectIsDeviceLocked(state);
 
         // prepare empty response object
         const response: CoinjoinResponseEvent = {
@@ -487,14 +487,14 @@ const getOwnershipProof =
                 return [];
             }
 
-            const device = devices.find(d => d.state === realAccount.deviceState);
+            const device = devices.find(d => d.state?.staticSessionId === realAccount.deviceState);
             if (!device?.connected) {
                 response.inputs.push(...coinjoinResponseError(utxos, 'Device disconnected'));
 
                 return [];
             }
 
-            if (locks.includes(SUITE.LOCK_TYPE.DEVICE)) {
+            if (isDeviceLocked) {
                 response.inputs.push(...coinjoinResponseError(utxos, 'Device locked'));
 
                 return [];
@@ -604,7 +604,7 @@ const signCoinjoinTx =
                 return [];
             }
 
-            const device = devices.find(d => d.state === realAccount.deviceState);
+            const device = devices.find(d => d.state?.staticSessionId === realAccount.deviceState);
             if (!device?.connected) {
                 response.inputs.push(...coinjoinResponseError(utxos, 'Device disconnected'));
 
diff --git a/packages/suite/src/actions/wallet/coinmarket/__fixtures__/coinmarketCommonActions/store.ts b/packages/suite/src/actions/wallet/coinmarket/__fixtures__/coinmarketCommonActions/store.ts
index 0804b520b23..24141d67298 100644
--- a/packages/suite/src/actions/wallet/coinmarket/__fixtures__/coinmarketCommonActions/store.ts
+++ b/packages/suite/src/actions/wallet/coinmarket/__fixtures__/coinmarketCommonActions/store.ts
@@ -1,5 +1,5 @@
 import { Account } from 'src/types/wallet';
-import coinmarketReducer from 'src/reducers/wallet/coinmarketReducer';
+import { coinmarketReducer } from 'src/reducers/wallet/coinmarketReducer';
 import selectedAccountReducer from 'src/reducers/wallet/selectedAccountReducer';
 import { transactionsReducer } from 'src/reducers/wallet';
 
diff --git a/packages/suite/src/actions/wallet/coinmarket/__fixtures__/coinmarketCommonActions/verifyAddress.ts b/packages/suite/src/actions/wallet/coinmarket/__fixtures__/coinmarketCommonActions/verifyAddress.ts
index 37111525168..2c040bacafc 100644
--- a/packages/suite/src/actions/wallet/coinmarket/__fixtures__/coinmarketCommonActions/verifyAddress.ts
+++ b/packages/suite/src/actions/wallet/coinmarket/__fixtures__/coinmarketCommonActions/verifyAddress.ts
@@ -1,10 +1,13 @@
 import { testMocks } from '@suite-common/test-utils';
+import { AddressDisplayOptions } from '@suite-common/wallet-types';
 
 import { MODAL } from 'src/actions/suite/constants';
 import { COINMARKET_BUY, COINMARKET_EXCHANGE } from 'src/actions/wallet/constants';
-import { AddressDisplayOptions } from '@suite-common/wallet-types';
-
-import { BTC_ACCOUNT, ETH_ACCOUNT, XRP_ACCOUNT } from './accounts';
+import {
+    BTC_ACCOUNT,
+    ETH_ACCOUNT,
+    XRP_ACCOUNT,
+} from 'src/actions/wallet/coinmarket/__fixtures__/coinmarketCommonActions/accounts';
 
 const { getSuiteDevice } = testMocks;
 const UNAVAILABLE_DEVICE = getSuiteDevice({ available: false });
diff --git a/packages/suite/src/actions/wallet/coinmarket/__tests__/coinmarketCommonActions.test.ts b/packages/suite/src/actions/wallet/coinmarket/__tests__/coinmarketCommonActions.test.ts
index 67c2f1ba8a0..9fa3912867d 100644
--- a/packages/suite/src/actions/wallet/coinmarket/__tests__/coinmarketCommonActions.test.ts
+++ b/packages/suite/src/actions/wallet/coinmarket/__tests__/coinmarketCommonActions.test.ts
@@ -1,17 +1,17 @@
-import { configureStore } from 'src/support/tests/configureStore';
+import { State as DeviceState } from '@suite-common/wallet-core';
+import type { DeepPartial } from '@trezor/type-utils';
 
-import coinmarketReducer, { ComposedTransactionInfo } from 'src/reducers/wallet/coinmarketReducer';
+import { configureStore } from 'src/support/tests/configureStore';
+import { coinmarketReducer, ComposedTransactionInfo } from 'src/reducers/wallet/coinmarketReducer';
 import selectedAccountReducer from 'src/reducers/wallet/selectedAccountReducer';
-import * as coinmarketCommonActions from '../coinmarketCommonActions';
-import { DEFAULT_STORE } from '../__fixtures__/coinmarketCommonActions/store';
+import { transactionsReducer, accountsReducer } from 'src/reducers/wallet';
+import { SuiteState } from 'src/reducers/suite/suiteReducer';
+import { DEFAULT_STORE } from 'src/actions/wallet/coinmarket/__fixtures__/coinmarketCommonActions/store';
 import {
     VERIFY_BUY_ADDRESS_FIXTURES,
     VERIFY_EXCHANGE_ADDRESS_FIXTURES,
-} from '../__fixtures__/coinmarketCommonActions/verifyAddress';
-import { transactionsReducer, accountsReducer } from 'src/reducers/wallet';
-import { State as DeviceState } from '@suite-common/wallet-core';
-import { SuiteState } from 'src/reducers/suite/suiteReducer';
-import type { DeepPartial } from '@trezor/type-utils';
+} from 'src/actions/wallet/coinmarket/__fixtures__/coinmarketCommonActions/verifyAddress';
+import * as coinmarketCommonActions from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
 
 interface InitialState {
     device?: DeepPartial<DeviceState>;
@@ -24,7 +24,7 @@ interface InitialState {
     };
 }
 
-export const getInitialState = (initial: InitialState) => ({
+const getInitialState = (initial: InitialState) => ({
     ...DEFAULT_STORE,
     ...initial,
     wallet: {
diff --git a/packages/suite/src/actions/wallet/coinmarket/coinmarketCommonActions.ts b/packages/suite/src/actions/wallet/coinmarket/coinmarketCommonActions.ts
index 1b4d4a11b40..384e97cc2ba 100644
--- a/packages/suite/src/actions/wallet/coinmarket/coinmarketCommonActions.ts
+++ b/packages/suite/src/actions/wallet/coinmarket/coinmarketCommonActions.ts
@@ -1,19 +1,22 @@
+import { CryptoId } from 'invity-api';
+
 import { isDesktop } from '@trezor/env-utils';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { PROTO } from '@trezor/connect';
 import {
-    amountToSatoshi,
+    amountToSmallestUnit,
     formatAmount,
     getAccountDecimals,
     hasNetworkFeatures,
     parseFormDraftKey,
 } from '@suite-common/wallet-utils';
-import { Output } from '@suite-common/wallet-types/src';
+import { Output, AddressDisplayOptions } from '@suite-common/wallet-types/src';
 import {
     confirmAddressOnDeviceThunk,
     selectDevice,
     toggleRememberDevice,
 } from '@suite-common/wallet-core';
+
 import { GetState, Dispatch } from 'src/types/suite';
 import * as modalActions from 'src/actions/suite/modalActions';
 import { getUnusedAddressFromAccount } from 'src/utils/wallet/coinmarket/coinmarketUtils';
@@ -21,10 +24,13 @@ import { Account } from 'src/types/wallet';
 import { ComposedTransactionInfo } from 'src/reducers/wallet/coinmarketReducer';
 import { submitRequestForm as envSubmitRequestForm } from 'src/utils/suite/env';
 import * as formDraftActions from 'src/actions/wallet/formDraftActions';
-import { COINMARKET_BUY, COINMARKET_EXCHANGE, COINMARKET_COMMON } from '../constants';
-import { AddressDisplayOptions } from '@suite-common/wallet-types';
 import { selectAddressDisplayType } from 'src/reducers/suite/suiteReducer';
-import { CryptoId } from 'invity-api';
+import {
+    COINMARKET_BUY,
+    COINMARKET_COMMON,
+    COINMARKET_EXCHANGE,
+} from 'src/actions/wallet/constants';
+import { CoinmarketTradeType } from 'src/types/coinmarket/coinmarket';
 
 export type CoinmarketCommonAction =
     | {
@@ -46,6 +52,10 @@ export type CoinmarketCommonAction =
     | {
           type: typeof COINMARKET_COMMON.SET_MODAL_ACCOUNT;
           modalAccount: Account | undefined;
+      }
+    | {
+          type: typeof COINMARKET_COMMON.SET_COINMARKET_ACTIVE_SECTION;
+          activeSection: CoinmarketTradeType;
       };
 
 type FormState = {
@@ -65,6 +75,11 @@ export const setCoinmarketModalAccount = (
     modalAccount,
 });
 
+export const setActiveSection = (activeSection: CoinmarketTradeType): CoinmarketCommonAction => ({
+    type: COINMARKET_COMMON.SET_COINMARKET_ACTIVE_SECTION,
+    activeSection,
+});
+
 export const verifyAddress =
     (
         account: Account,
@@ -191,7 +206,7 @@ export const convertDrafts = () => (dispatch: Dispatch, getState: GetState) => {
 
         if (draft) {
             const areSatsSelected = settings.bitcoinAmountUnit === PROTO.AmountUnit.SATOSHI;
-            const conversion = areSatsSelected ? amountToSatoshi : formatAmount;
+            const conversion = areSatsSelected ? amountToSmallestUnit : formatAmount;
             const decimals = getAccountDecimals(relatedAccount.symbol)!;
 
             if (draft.cryptoInput) {
diff --git a/packages/suite/src/actions/wallet/coinmarketBuyActions.ts b/packages/suite/src/actions/wallet/coinmarketBuyActions.ts
index 74449e4ed76..3d5dedf304a 100644
--- a/packages/suite/src/actions/wallet/coinmarketBuyActions.ts
+++ b/packages/suite/src/actions/wallet/coinmarketBuyActions.ts
@@ -1,4 +1,3 @@
-import { Account } from 'src/types/wallet';
 import {
     BuyListResponse,
     BuyProviderInfo,
@@ -7,14 +6,17 @@ import {
     CryptoId,
     FiatCurrencyCode,
 } from 'invity-api';
+
+import { Account } from 'src/types/wallet';
 import invityAPI from 'src/services/suite/invityAPI';
-import { COINMARKET_BUY, COINMARKET_COMMON } from './constants';
 import { Dispatch } from 'src/types/suite';
 import regional from 'src/constants/wallet/coinmarket/regional';
 import * as modalActions from 'src/actions/suite/modalActions';
 import { verifyAddress as verifyBuyAddress } from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
 import { CoinmarketFiatCurrenciesProps } from 'src/types/coinmarket/coinmarket';
 
+import { COINMARKET_BUY, COINMARKET_COMMON } from './constants';
+
 export interface BuyInfo {
     buyInfo: Omit<BuyListResponse, 'defaultAmountsOfFiatCurrencies'> & {
         defaultAmountsOfFiatCurrencies: CoinmarketFiatCurrenciesProps;
diff --git a/packages/suite/src/actions/wallet/coinmarketExchangeActions.ts b/packages/suite/src/actions/wallet/coinmarketExchangeActions.ts
index 6ad38d612af..d6aa7c9122c 100644
--- a/packages/suite/src/actions/wallet/coinmarketExchangeActions.ts
+++ b/packages/suite/src/actions/wallet/coinmarketExchangeActions.ts
@@ -1,5 +1,3 @@
-import { Account } from 'src/types/wallet';
-import { Dispatch } from 'src/types/suite';
 import {
     ExchangeListResponse,
     ExchangeProviderInfo,
@@ -7,11 +5,15 @@ import {
     ExchangeTrade,
     CryptoId,
 } from 'invity-api';
+
+import { Account } from 'src/types/wallet';
+import { Dispatch } from 'src/types/suite';
 import invityAPI from 'src/services/suite/invityAPI';
-import { COINMARKET_EXCHANGE, COINMARKET_COMMON } from './constants';
 import * as modalActions from 'src/actions/suite/modalActions';
 import { verifyAddress as verifyExchangeAddress } from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
 
+import { COINMARKET_EXCHANGE, COINMARKET_COMMON } from './constants';
+
 export interface ExchangeInfo {
     exchangeList?: ExchangeListResponse;
     providerInfos: { [name: string]: ExchangeProviderInfo };
@@ -35,7 +37,6 @@ export type CoinmarketExchangeAction =
           type: typeof COINMARKET_EXCHANGE.SAVE_QUOTE;
           quote: ExchangeTrade | undefined;
       }
-    | { type: typeof COINMARKET_EXCHANGE.CLEAR_QUOTES }
     | { type: typeof COINMARKET_EXCHANGE.SET_COINMARKET_ACCOUNT; account: Account | undefined }
     | {
           type: typeof COINMARKET_COMMON.SAVE_TRADE;
@@ -141,10 +142,6 @@ export const saveSelectedQuote = (quote: ExchangeTrade | undefined): CoinmarketE
     quote,
 });
 
-export const clearQuotes = (): CoinmarketExchangeAction => ({
-    type: COINMARKET_EXCHANGE.CLEAR_QUOTES,
-});
-
 export const verifyAddress = (account: Account, address?: string, path?: string) =>
     verifyExchangeAddress(account, address, path, COINMARKET_EXCHANGE.VERIFY_ADDRESS);
 
diff --git a/packages/suite/src/actions/wallet/coinmarketInfoActions.ts b/packages/suite/src/actions/wallet/coinmarketInfoActions.ts
index 702052fa4e8..cd5da5d503c 100644
--- a/packages/suite/src/actions/wallet/coinmarketInfoActions.ts
+++ b/packages/suite/src/actions/wallet/coinmarketInfoActions.ts
@@ -1,4 +1,5 @@
 import { InfoResponse } from 'invity-api';
+
 import { COINMARKET_INFO } from 'src/actions/wallet/constants';
 import { CoinmarketPaymentMethodListProps } from 'src/types/coinmarket/coinmarket';
 
diff --git a/packages/suite/src/actions/wallet/coinmarketSellActions.ts b/packages/suite/src/actions/wallet/coinmarketSellActions.ts
index 60191a1d8ba..ea62010e220 100644
--- a/packages/suite/src/actions/wallet/coinmarketSellActions.ts
+++ b/packages/suite/src/actions/wallet/coinmarketSellActions.ts
@@ -1,4 +1,3 @@
-import { Account } from 'src/types/wallet';
 import {
     CryptoId,
     SellFiatTrade,
@@ -6,9 +5,12 @@ import {
     SellListResponse,
     SellProviderInfo,
 } from 'invity-api';
+
+import { Account } from 'src/types/wallet';
 import { Dispatch } from 'src/types/suite';
 import * as modalActions from 'src/actions/suite/modalActions';
 import invityAPI from 'src/services/suite/invityAPI';
+
 import { COINMARKET_COMMON, COINMARKET_SELL } from './constants';
 
 export interface SellInfo {
@@ -32,7 +34,6 @@ export type CoinmarketSellAction =
           type: typeof COINMARKET_SELL.SAVE_QUOTE;
           quote: SellFiatTrade | undefined;
       }
-    | { type: typeof COINMARKET_SELL.CLEAR_QUOTES }
     | {
           type: typeof COINMARKET_COMMON.SAVE_TRADE;
           date: string;
@@ -117,10 +118,6 @@ export const saveSelectedQuote = (quote: SellFiatTrade | undefined): CoinmarketS
     quote,
 });
 
-export const clearQuotes = (): CoinmarketSellAction => ({
-    type: COINMARKET_SELL.CLEAR_QUOTES,
-});
-
 export const setIsFromRedirect = (isFromRedirect: boolean): CoinmarketSellAction => ({
     type: COINMARKET_SELL.SET_IS_FROM_REDIRECT,
     isFromRedirect,
diff --git a/packages/suite/src/actions/wallet/constants/coinmarketCommonConstants.ts b/packages/suite/src/actions/wallet/constants/coinmarketCommonConstants.ts
index 36557c7eb91..6fc3e8ee3e5 100644
--- a/packages/suite/src/actions/wallet/constants/coinmarketCommonConstants.ts
+++ b/packages/suite/src/actions/wallet/constants/coinmarketCommonConstants.ts
@@ -4,3 +4,4 @@ export const LOAD_DATA = '@coinmarket-common/load_data';
 export const SET_LOADING = '@coinmarket-common/set_loading';
 export const SET_MODAL_CRYPTO_CURRENCY = '@coinmarket-common/set_modal_crypto_currency';
 export const SET_MODAL_ACCOUNT = '@coinmarket-common/set_modal_account';
+export const SET_COINMARKET_ACTIVE_SECTION = '@coinmarket-common/set_coinmarket_active_section';
diff --git a/packages/suite/src/actions/wallet/exportTransactionsActions.ts b/packages/suite/src/actions/wallet/exportTransactionsActions.ts
index 5613adc20b0..4518db29e77 100644
--- a/packages/suite/src/actions/wallet/exportTransactionsActions.ts
+++ b/packages/suite/src/actions/wallet/exportTransactionsActions.ts
@@ -8,6 +8,7 @@ import {
 } from '@suite-common/wallet-core';
 import { Account, ExportFileType } from '@suite-common/wallet-types';
 import { advancedSearchTransactions, getAccountTransactions } from '@suite-common/wallet-utils';
+
 import { formatData, getExportedFileName } from 'src/utils/wallet/exportTransactionsUtils';
 
 export const exportTransactionsThunk = createThunk(
@@ -38,10 +39,8 @@ export const exportTransactionsThunk = createThunk(
         // TODO: this is not nice (copy-paste)
         // metadata reducer is still not part of trezor-common and I can not import it
         // here. so either followup, or maybe when I have a moment I'll refactor it  before merging this
-        // eslint-disable-next-line no-restricted-syntax
         const provider = getState().metadata?.providers.find(
             // @ts-expect-error
-            // eslint-disable-next-line no-restricted-syntax
             p => p.clientId === getState().metadata.selectedProvider.labels,
         );
         const metadataKeys = account?.metadata[1];
diff --git a/packages/suite/src/actions/wallet/formDraftActions.ts b/packages/suite/src/actions/wallet/formDraftActions.ts
index c58cb085a44..3d22da1e63e 100644
--- a/packages/suite/src/actions/wallet/formDraftActions.ts
+++ b/packages/suite/src/actions/wallet/formDraftActions.ts
@@ -1,10 +1,12 @@
 import { FieldValues } from 'react-hook-form';
 
-import { Dispatch, GetState } from 'src/types/suite';
 import { getFormDraftKey } from '@suite-common/wallet-utils';
-import { FORM_DRAFT } from './constants';
 import type { FormDraftKeyPrefix } from '@suite-common/wallet-types';
 
+import { Dispatch, GetState } from 'src/types/suite';
+
+import { FORM_DRAFT } from './constants';
+
 export type FormDraftAction =
     | {
           type: typeof FORM_DRAFT.STORE_DRAFT;
diff --git a/packages/suite/src/actions/wallet/graphActions.ts b/packages/suite/src/actions/wallet/graphActions.ts
index 2bed0660ed8..a58052b6088 100644
--- a/packages/suite/src/actions/wallet/graphActions.ts
+++ b/packages/suite/src/actions/wallet/graphActions.ts
@@ -1,10 +1,19 @@
 import { isWithinInterval, fromUnixTime } from 'date-fns';
-import { Dispatch, GetState } from 'src/types/suite';
-import { Account } from 'src/types/wallet';
 
 import { tryGetAccountIdentity, isTrezorConnectBackendType } from '@suite-common/wallet-utils';
+import TrezorConnect, { StaticSessionId } from '@trezor/connect';
+import { selectIsElectrumBackendSelected } from '@suite-common/wallet-core';
 
-import TrezorConnect from '@trezor/connect';
+import { Dispatch, GetState } from 'src/types/suite';
+import { Account } from 'src/types/wallet';
+import { GraphData, GraphRange, GraphScale } from 'src/types/wallet/graph';
+import {
+    ensureHistoryRates,
+    enhanceBlockchainAccountHistory,
+    accountGraphDataFilterFn,
+    deviceGraphDataFilterFn,
+} from 'src/utils/wallet/graph';
+import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
 
 import {
     ACCOUNT_GRAPH_SUCCESS,
@@ -15,15 +24,6 @@ import {
     SET_SELECTED_RANGE,
     SET_SELECTED_VIEW,
 } from './constants/graphConstants';
-import { GraphData, GraphRange, GraphScale } from 'src/types/wallet/graph';
-import {
-    ensureHistoryRates,
-    enhanceBlockchainAccountHistory,
-    accountGraphDataFilterFn,
-    deviceGraphDataFilterFn,
-} from 'src/utils/wallet/graph';
-import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
-import { selectIsElectrumBackendSelected } from '@suite-common/wallet-core';
 
 export type GraphAction =
     | {
@@ -177,7 +177,7 @@ export const updateGraphData =
     };
 
 export const getGraphDataForInterval =
-    (options: { account?: Account; deviceState?: string }) =>
+    (options: { account?: Account; deviceState?: StaticSessionId }) =>
     (_dispatch: Dispatch, getState: GetState) => {
         const { graph } = getState().wallet;
         const { selectedRange } = graph;
diff --git a/packages/suite/src/actions/wallet/moveLabelsForRbfActions.ts b/packages/suite/src/actions/wallet/moveLabelsForRbfActions.ts
index 17e5aba9fad..fd3c16db986 100644
--- a/packages/suite/src/actions/wallet/moveLabelsForRbfActions.ts
+++ b/packages/suite/src/actions/wallet/moveLabelsForRbfActions.ts
@@ -1,9 +1,10 @@
-import { selectLabelingDataForAccount } from 'src/reducers/suite/metadataReducer';
 import { findChainedTransactions, findTransactions } from '@suite-common/wallet-utils';
-import { Dispatch, GetState } from 'src/types/suite';
-import * as metadataLabelingActions from 'src/actions/suite/metadataLabelingActions';
 import { AccountLabels, AccountOutputLabels } from '@suite-common/metadata-types';
 import { AccountKey, WalletAccountTransaction } from '@suite-common/wallet-types';
+
+import { selectLabelingDataForAccount } from 'src/reducers/suite/metadataReducer';
+import { Dispatch, GetState } from 'src/types/suite';
+import * as metadataLabelingActions from 'src/actions/suite/metadataLabelingActions';
 import { RbfLabelsToBeUpdated } from 'src/types/wallet/sendForm';
 
 type DeleteAllOutputLabelsParams = {
diff --git a/packages/suite/src/actions/wallet/receiveActions.ts b/packages/suite/src/actions/wallet/receiveActions.ts
index 9f3f5d4f544..34e70d93995 100644
--- a/packages/suite/src/actions/wallet/receiveActions.ts
+++ b/packages/suite/src/actions/wallet/receiveActions.ts
@@ -1,12 +1,11 @@
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { UserContextPayload } from '@suite-common/suite-types';
 import { confirmAddressOnDeviceThunk, selectDevice } from '@suite-common/wallet-core';
+import { AddressDisplayOptions } from '@suite-common/wallet-types';
 
 import { RECEIVE } from 'src/actions/wallet/constants';
 import * as modalActions from 'src/actions/suite/modalActions';
 import { GetState, Dispatch } from 'src/types/suite';
-import { AddressDisplayOptions } from '@suite-common/wallet-types';
-
 import { selectAddressDisplayType } from 'src/reducers/suite/suiteReducer';
 
 export type ReceiveAction =
diff --git a/packages/suite/src/actions/wallet/selectedAccountActions.ts b/packages/suite/src/actions/wallet/selectedAccountActions.ts
index 22e4746bba3..c2ac66de29b 100644
--- a/packages/suite/src/actions/wallet/selectedAccountActions.ts
+++ b/packages/suite/src/actions/wallet/selectedAccountActions.ts
@@ -93,7 +93,7 @@ const getAccountState = (state: AppState): SelectedAccountStatus => {
     }
 
     // get selected account
-    const account = getSelectedAccount(device.state, state.wallet.accounts, params);
+    const account = getSelectedAccount(device.state.staticSessionId, state.wallet.accounts, params);
 
     // account does exist
     if (account && account.visible) {
diff --git a/packages/suite/src/actions/wallet/send/sendFormThunks.ts b/packages/suite/src/actions/wallet/send/sendFormThunks.ts
index ebf8998086a..f7d80adc09b 100644
--- a/packages/suite/src/actions/wallet/send/sendFormThunks.ts
+++ b/packages/suite/src/actions/wallet/send/sendFormThunks.ts
@@ -16,7 +16,7 @@ import {
     selectSendFormDrafts,
     signTransactionThunk,
     sendFormActions,
-    selectSendFormDraftByAccountKey,
+    selectSendFormDraftByKey,
 } from '@suite-common/wallet-core';
 import { isCardanoTx, isRbfTransaction } from '@suite-common/wallet-utils';
 import { MetadataAddPayload } from '@suite-common/metadata-types';
@@ -26,12 +26,13 @@ import {
     selectSelectedAccountKey,
     selectIsSelectedAccountLoaded,
 } from 'src/reducers/wallet/selectedAccountReducer';
-import { findLabelsToBeMovedOrDeleted, moveLabelsForRbfAction } from '../moveLabelsForRbfActions';
 import { selectMetadata } from 'src/reducers/suite/metadataReducer';
 import * as metadataLabelingActions from 'src/actions/suite/metadataLabelingActions';
 import * as modalActions from 'src/actions/suite/modalActions';
 import { RbfLabelsToBeUpdated } from 'src/types/wallet/sendForm';
 
+import { findLabelsToBeMovedOrDeleted, moveLabelsForRbfAction } from '../moveLabelsForRbfActions';
+
 export const MODULE_PREFIX = '@send';
 
 export const saveSendFormDraftThunk = createThunk(
@@ -140,7 +141,7 @@ const applySendFormMetadataLabelsThunk = createThunk(
 
         if (!metadata.enabled) return;
 
-        const formDraft = selectSendFormDraftByAccountKey(getState(), selectedAccount.key);
+        const formDraft = selectSendFormDraftByKey(getState(), selectedAccount.key);
 
         const outputsPermutation = isCardanoTx(selectedAccount, precomposedTransaction)
             ? precomposedTransaction?.outputs.map((_o, i) => i) // cardano preserves order of outputs
diff --git a/packages/suite/src/actions/wallet/signVerifyActions.ts b/packages/suite/src/actions/wallet/signVerifyActions.ts
index a45a769c094..2eac4dd33ae 100644
--- a/packages/suite/src/actions/wallet/signVerifyActions.ts
+++ b/packages/suite/src/actions/wallet/signVerifyActions.ts
@@ -1,14 +1,13 @@
 import TrezorConnect, { Unsuccessful, Success } from '@trezor/connect';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { selectDevice } from '@suite-common/wallet-core';
+import { AddressDisplayOptions } from '@suite-common/wallet-types';
 
 import type { Dispatch, GetState, TrezorDevice } from 'src/types/suite';
 import type { Account } from 'src/types/wallet';
+import { selectAddressDisplayType } from 'src/reducers/suite/suiteReducer';
 
 import { SIGN_VERIFY } from './constants';
-import { AddressDisplayOptions } from '@suite-common/wallet-types';
-
-import { selectAddressDisplayType } from 'src/reducers/suite/suiteReducer';
 
 export type SignVerifyAction =
     | { type: typeof SIGN_VERIFY.SIGN_SUCCESS; signSignature: string }
diff --git a/packages/suite/src/actions/wallet/stake/stakeFormEthereumActions.ts b/packages/suite/src/actions/wallet/stake/stakeFormEthereumActions.ts
index 661ec78dc13..c351be1772e 100644
--- a/packages/suite/src/actions/wallet/stake/stakeFormEthereumActions.ts
+++ b/packages/suite/src/actions/wallet/stake/stakeFormEthereumActions.ts
@@ -1,6 +1,6 @@
-import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { toWei } from 'web3-utils';
 
+import { BigNumber } from '@trezor/utils/src/bigNumber';
 import TrezorConnect, { FeeLevel } from '@trezor/connect';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import {
@@ -18,22 +18,25 @@ import {
     PrecomposedTransaction,
     PrecomposedTransactionFinal,
     ExternalOutput,
+    AddressDisplayOptions,
 } from '@suite-common/wallet-types';
-import { selectDevice } from '@suite-common/wallet-core';
+import {
+    MIN_ETH_AMOUNT_FOR_STAKING,
+    MIN_ETH_BALANCE_FOR_STAKING,
+    MIN_ETH_FOR_WITHDRAWALS,
+    UNSTAKE_INTERCHANGES,
+} from '@suite-common/wallet-constants';
+import { selectDevice, ComposeActionContext } from '@suite-common/wallet-core';
+import { NetworkSymbol } from '@suite-common/wallet-config';
 
 import { Dispatch, GetState } from 'src/types/suite';
 import { selectAddressDisplayType } from 'src/reducers/suite/suiteReducer';
-import { AddressDisplayOptions } from '@suite-common/wallet-types';
-
 import {
     getStakeTxGasLimit,
     prepareClaimEthTx,
     prepareStakeEthTx,
     prepareUnstakeEthTx,
 } from 'src/utils/suite/stake';
-import { MIN_ETH_FOR_WITHDRAWALS } from 'src/constants/suite/ethStaking';
-import { NetworkSymbol } from '@suite-common/wallet-config';
-import { ComposeActionContext } from '@suite-common/wallet-core';
 
 const calculate = (
     availableBalance: string,
@@ -42,28 +45,33 @@ const calculate = (
     compareWithAmount = true,
     symbol: NetworkSymbol,
 ): PrecomposedTransaction => {
-    const feeInSatoshi = calculateEthFee(
-        toWei(feeLevel.feePerUnit, 'gwei'),
-        feeLevel.feeLimit || '0',
-    );
+    const feeInWei = calculateEthFee(toWei(feeLevel.feePerUnit, 'gwei'), feeLevel.feeLimit || '0');
 
     let amount: string;
     let max: string | undefined;
 
     if (output.type === 'send-max' || output.type === 'send-max-noaddress') {
-        max = new BigNumber(calculateMax(availableBalance, feeInSatoshi))
-            .minus(toWei(MIN_ETH_FOR_WITHDRAWALS.toString(), 'ether'))
-            .toString();
+        const minEthBalanceForStakingWei = toWei(MIN_ETH_BALANCE_FOR_STAKING.toString(), 'ether');
+        const minAmountWithFeeWei = new BigNumber(minEthBalanceForStakingWei).plus(feeInWei);
+
+        if (new BigNumber(availableBalance).lt(minAmountWithFeeWei)) {
+            max = toWei(MIN_ETH_AMOUNT_FOR_STAKING.toString(), 'ether');
+        } else {
+            max = new BigNumber(calculateMax(availableBalance, feeInWei))
+                .minus(toWei(MIN_ETH_FOR_WITHDRAWALS.toString(), 'ether'))
+                .toString();
+        }
+
         amount = max;
     } else {
         amount = output.amount;
     }
 
     // total ETH spent (amount + fee), in ERC20 only fee
-    const totalSpent = new BigNumber(calculateTotal(amount, feeInSatoshi));
+    const totalSpent = new BigNumber(calculateTotal(amount, feeInWei));
 
     if (
-        new BigNumber(feeInSatoshi).gt(availableBalance) ||
+        new BigNumber(feeInWei).gt(availableBalance) ||
         (compareWithAmount && totalSpent.isGreaterThan(availableBalance))
     ) {
         const error = 'TR_STAKE_NOT_ENOUGH_FUNDS';
@@ -80,7 +88,7 @@ const calculate = (
         type: 'nonfinal' as const,
         totalSpent: totalSpent.toString(),
         max,
-        fee: feeInSatoshi,
+        fee: feeInWei,
         feePerByte: feeLevel.feePerUnit,
         feeLimit: feeLevel.feeLimit,
         bytes: 0, // TODO: calculate
@@ -241,7 +249,7 @@ export const signTransaction =
                 gasPrice: transactionInfo.feePerByte,
                 nonce,
                 chainId: network.chainId,
-                interchanges: 0,
+                interchanges: UNSTAKE_INTERCHANGES,
             });
         }
         if (ethereumStakeType === 'claim') {
diff --git a/packages/suite/src/actions/wallet/stakeActions.ts b/packages/suite/src/actions/wallet/stakeActions.ts
index fff7a40d6be..af0a0640b14 100644
--- a/packages/suite/src/actions/wallet/stakeActions.ts
+++ b/packages/suite/src/actions/wallet/stakeActions.ts
@@ -1,5 +1,4 @@
 import { BigNumber } from '@trezor/utils/src/bigNumber';
-
 import TrezorConnect from '@trezor/connect';
 import {
     selectDevice,
@@ -14,12 +13,11 @@ import {
     isRbfTransaction,
     tryGetAccountIdentity,
 } from '@suite-common/wallet-utils';
-
 import { StakeFormState, PrecomposedTransactionFinal, StakeType } from '@suite-common/wallet-types';
 
-import * as modalActions from '../suite/modalActions';
 import { Dispatch, GetState } from 'src/types/suite';
 
+import * as modalActions from '../suite/modalActions';
 import * as stakeFormEthereumActions from './stake/stakeFormEthereumActions';
 import { openModal } from '../suite/modalActions';
 
diff --git a/packages/suite/src/actions/wallet/tokenActions.ts b/packages/suite/src/actions/wallet/tokenActions.ts
index 18299fa783b..62879e3a62b 100644
--- a/packages/suite/src/actions/wallet/tokenActions.ts
+++ b/packages/suite/src/actions/wallet/tokenActions.ts
@@ -1,12 +1,13 @@
 import { TokenInfo } from '@trezor/connect';
-import { Account } from 'src/types/wallet';
-import { Dispatch } from 'src/types/suite';
 import * as accountUtils from '@suite-common/wallet-utils';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { accountsActions, updateFiatRatesThunk } from '@suite-common/wallet-core';
 import { Timestamp, TokenAddress } from '@suite-common/wallet-types';
 import { FiatCurrencyCode } from '@suite-common/suite-config';
 
+import { Dispatch } from 'src/types/suite';
+import { Account } from 'src/types/wallet';
+
 export const addToken =
     (account: Account, tokenInfo: TokenInfo[], localCurrency: FiatCurrencyCode) =>
     (dispatch: Dispatch) => {
diff --git a/packages/suite/src/components/backup/AfterBackupCheckboxes.tsx b/packages/suite/src/components/backup/AfterBackupCheckboxes.tsx
index 0b1d6e3b755..5f43007379f 100644
--- a/packages/suite/src/components/backup/AfterBackupCheckboxes.tsx
+++ b/packages/suite/src/components/backup/AfterBackupCheckboxes.tsx
@@ -1,44 +1,41 @@
-import styled from 'styled-components';
+import { spacings } from '@trezor/theme';
+import { Card, Column } from '@trezor/components';
+
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { CheckItem, Translation } from 'src/components/suite';
 import { ConfirmKey, toggleCheckboxByKey } from 'src/actions/backup/backupActions';
-import { spacings } from '@trezor/theme';
-
-const CheckboxWrapper = styled.div`
-    margin-top: 38px;
-    gap: ${spacings.xs};
-`;
 
 export const AfterBackupCheckboxes = () => {
     const backup = useSelector(state => state.backup);
-
     const dispatch = useDispatch();
 
     const isChecked = (key: ConfirmKey) => backup.userConfirmed.includes(key);
 
     return (
-        <CheckboxWrapper>
-            <CheckItem
-                data-testid="@backup/check-item/wrote-seed-properly"
-                onClick={() => dispatch(toggleCheckboxByKey('wrote-seed-properly'))}
-                title={<Translation id="TR_BACKUP_CHECKBOX_1_TITLE" />}
-                description={<Translation id="TR_BACKUP_CHECKBOX_1_DESCRIPTION" />}
-                isChecked={isChecked('wrote-seed-properly')}
-            />
-            <CheckItem
-                data-testid="@backup/check-item/made-no-digital-copy"
-                onClick={() => dispatch(toggleCheckboxByKey('made-no-digital-copy'))}
-                title={<Translation id="TR_BACKUP_CHECKBOX_2_TITLE" />}
-                description={<Translation id="TR_BACKUP_CHECKBOX_2_DESCRIPTION" />}
-                isChecked={isChecked('made-no-digital-copy')}
-            />
-            <CheckItem
-                data-testid="@backup/check-item/will-hide-seed"
-                onClick={() => dispatch(toggleCheckboxByKey('will-hide-seed'))}
-                title={<Translation id="TR_BACKUP_CHECKBOX_3_TITLE" />}
-                description={<Translation id="TR_BACKUP_CHECKBOX_3_DESCRIPTION" />}
-                isChecked={isChecked('will-hide-seed')}
-            />
-        </CheckboxWrapper>
+        <Card>
+            <Column alignItems="stretch" gap={spacings.xl}>
+                <CheckItem
+                    data-testid="@backup/check-item/wrote-seed-properly"
+                    onClick={() => dispatch(toggleCheckboxByKey('wrote-seed-properly'))}
+                    title={<Translation id="TR_BACKUP_CHECKBOX_1_TITLE" />}
+                    description={<Translation id="TR_BACKUP_CHECKBOX_1_DESCRIPTION" />}
+                    isChecked={isChecked('wrote-seed-properly')}
+                />
+                <CheckItem
+                    data-testid="@backup/check-item/made-no-digital-copy"
+                    onClick={() => dispatch(toggleCheckboxByKey('made-no-digital-copy'))}
+                    title={<Translation id="TR_BACKUP_CHECKBOX_2_TITLE" />}
+                    description={<Translation id="TR_BACKUP_CHECKBOX_2_DESCRIPTION" />}
+                    isChecked={isChecked('made-no-digital-copy')}
+                />
+                <CheckItem
+                    data-testid="@backup/check-item/will-hide-seed"
+                    onClick={() => dispatch(toggleCheckboxByKey('will-hide-seed'))}
+                    title={<Translation id="TR_BACKUP_CHECKBOX_3_TITLE" />}
+                    description={<Translation id="TR_BACKUP_CHECKBOX_3_DESCRIPTION" />}
+                    isChecked={isChecked('will-hide-seed')}
+                />
+            </Column>
+        </Card>
     );
 };
diff --git a/packages/suite/src/components/backup/BackupSeedCard.tsx b/packages/suite/src/components/backup/BackupSeedCard.tsx
index c585b0c9412..84a505a4f34 100644
--- a/packages/suite/src/components/backup/BackupSeedCard.tsx
+++ b/packages/suite/src/components/backup/BackupSeedCard.tsx
@@ -1,5 +1,7 @@
 import { ReactNode, SyntheticEvent } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
 import { variables, Checkbox, Card, Icon, IconName } from '@trezor/components';
 import { spacingsPx, typography } from '@trezor/theme';
 
@@ -105,7 +107,7 @@ export const BackupSeedCard = ({
     };
 
     return (
-        <Container forceElevation={2} $checked={isChecked} data-testid={dataTest}>
+        <Container $checked={isChecked} data-testid={dataTest}>
             <Content>
                 <IconWrapper>
                     <Icon name={icon} color={theme.iconDefault} />
diff --git a/packages/suite/src/components/backup/BackupSeedCards.tsx b/packages/suite/src/components/backup/BackupSeedCards.tsx
index 1099a079594..5b8e7e05069 100644
--- a/packages/suite/src/components/backup/BackupSeedCards.tsx
+++ b/packages/suite/src/components/backup/BackupSeedCards.tsx
@@ -1,9 +1,11 @@
 import styled from 'styled-components';
 
+import { variables } from '@trezor/components';
+
 import { ConfirmKey, toggleCheckboxByKey } from 'src/actions/backup/backupActions';
 import { Translation } from 'src/components/suite/Translation';
-import { variables } from '@trezor/components';
 import { useSelector, useDispatch } from 'src/hooks/suite';
+
 import { BackupSeedCard } from './BackupSeedCard';
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/components/backup/PreBackupCheckboxes.tsx b/packages/suite/src/components/backup/PreBackupCheckboxes.tsx
index 60513a1448a..58859f487cf 100644
--- a/packages/suite/src/components/backup/PreBackupCheckboxes.tsx
+++ b/packages/suite/src/components/backup/PreBackupCheckboxes.tsx
@@ -1,49 +1,41 @@
-import styled from 'styled-components';
+import { Card, Column } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { CheckItem, Translation } from 'src/components/suite';
 import { ConfirmKey, toggleCheckboxByKey } from 'src/actions/backup/backupActions';
-import { variables } from '@trezor/components';
-import { spacings } from '@trezor/theme';
-
-const CheckboxWrapper = styled.div`
-    margin-top: 38px;
-    gap: ${spacings.xs};
-
-    @media only screen and (max-width: ${variables.SCREEN_SIZE.SM}) {
-        max-width: 100%;
-    }
-`;
 
 export const PreBackupCheckboxes = () => {
     const backup = useSelector(state => state.backup);
-
     const dispatch = useDispatch();
 
     const isChecked = (key: ConfirmKey) => backup.userConfirmed.includes(key);
 
     return (
-        <CheckboxWrapper>
-            <CheckItem
-                data-testid="@backup/check-item/has-enough-time"
-                onClick={() => dispatch(toggleCheckboxByKey('has-enough-time'))}
-                title={<Translation id="TR_I_HAVE_ENOUGH_TIME_TO_DO" />}
-                description={<Translation id="TR_ONCE_YOU_BEGIN_THIS_PROCESS" />}
-                isChecked={isChecked('has-enough-time')}
-            />
-            <CheckItem
-                data-testid="@backup/check-item/is-in-private"
-                onClick={() => dispatch(toggleCheckboxByKey('is-in-private'))}
-                title={<Translation id="TR_I_AM_IN_SAFE_PRIVATE_OR" />}
-                description={<Translation id="TR_MAKE_SURE_NO_ONE_CAN_PEEK" />}
-                isChecked={isChecked('is-in-private')}
-            />
-            <CheckItem
-                data-testid="@backup/check-item/understands-what-seed-is"
-                onClick={() => dispatch(toggleCheckboxByKey('understands-what-seed-is'))}
-                title={<Translation id="TR_I_UNDERSTAND_SEED_IS_IMPORTANT" />}
-                description={<Translation id="TR_BACKUP_SEED_IS_ULTIMATE" />}
-                isChecked={isChecked('understands-what-seed-is')}
-            />
-        </CheckboxWrapper>
+        <Card>
+            <Column alignItems="stretch" gap={spacings.xl}>
+                <CheckItem
+                    data-testid="@backup/check-item/has-enough-time"
+                    onClick={() => dispatch(toggleCheckboxByKey('has-enough-time'))}
+                    title={<Translation id="TR_I_HAVE_ENOUGH_TIME_TO_DO" />}
+                    description={<Translation id="TR_ONCE_YOU_BEGIN_THIS_PROCESS" />}
+                    isChecked={isChecked('has-enough-time')}
+                />
+                <CheckItem
+                    data-testid="@backup/check-item/is-in-private"
+                    onClick={() => dispatch(toggleCheckboxByKey('is-in-private'))}
+                    title={<Translation id="TR_I_AM_IN_SAFE_PRIVATE_OR" />}
+                    description={<Translation id="TR_MAKE_SURE_NO_ONE_CAN_PEEK" />}
+                    isChecked={isChecked('is-in-private')}
+                />
+                <CheckItem
+                    data-testid="@backup/check-item/understands-what-seed-is"
+                    onClick={() => dispatch(toggleCheckboxByKey('understands-what-seed-is'))}
+                    title={<Translation id="TR_I_UNDERSTAND_SEED_IS_IMPORTANT" />}
+                    description={<Translation id="TR_BACKUP_SEED_IS_ULTIMATE" />}
+                    isChecked={isChecked('understands-what-seed-is')}
+                />
+            </Column>
+        </Card>
     );
 };
diff --git a/packages/suite/src/components/dashboard/DashboardSection.tsx b/packages/suite/src/components/dashboard/DashboardSection.tsx
index b61741ae248..4057e9f589f 100644
--- a/packages/suite/src/components/dashboard/DashboardSection.tsx
+++ b/packages/suite/src/components/dashboard/DashboardSection.tsx
@@ -1,5 +1,7 @@
 import { Ref, forwardRef, ReactElement, HTMLAttributes } from 'react';
+
 import styled from 'styled-components';
+
 import { H3 } from '@trezor/components';
 
 const Wrapper = styled.section`
diff --git a/packages/suite/src/components/firmware/Buttons/FirmwareButtonsRow.tsx b/packages/suite/src/components/firmware/Buttons/FirmwareButtonsRow.tsx
index 76e5036e5d2..4ce97813349 100644
--- a/packages/suite/src/components/firmware/Buttons/FirmwareButtonsRow.tsx
+++ b/packages/suite/src/components/firmware/Buttons/FirmwareButtonsRow.tsx
@@ -1,9 +1,10 @@
 import styled from 'styled-components';
 
-import { FirmwareCloseButton } from './FirmwareCloseButton';
 import { spacingsPx } from '@trezor/theme';
 import { breakpointMediaQueries } from '@trezor/styles';
 
+import { FirmwareCloseButton } from './FirmwareCloseButton';
+
 const Row = styled.div`
     display: flex;
     gap: ${spacingsPx.lg};
diff --git a/packages/suite/src/components/firmware/Buttons/FirmwareCloseButton.tsx b/packages/suite/src/components/firmware/Buttons/FirmwareCloseButton.tsx
index 716d04b8c61..a13359bc188 100644
--- a/packages/suite/src/components/firmware/Buttons/FirmwareCloseButton.tsx
+++ b/packages/suite/src/components/firmware/Buttons/FirmwareCloseButton.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import { Button, ButtonProps } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 
 export const FirmwareCloseButton = (props: Omit<ButtonProps, 'children'>) => (
diff --git a/packages/suite/src/components/firmware/Buttons/FirmwareContinueButton.tsx b/packages/suite/src/components/firmware/Buttons/FirmwareContinueButton.tsx
index 10c3df4998a..5096c722ca0 100644
--- a/packages/suite/src/components/firmware/Buttons/FirmwareContinueButton.tsx
+++ b/packages/suite/src/components/firmware/Buttons/FirmwareContinueButton.tsx
@@ -1,6 +1,9 @@
 import React from 'react';
+
 import styled from 'styled-components';
+
 import { Button, ButtonProps } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
diff --git a/packages/suite/src/components/firmware/Buttons/FirmwareInstallButton.tsx b/packages/suite/src/components/firmware/Buttons/FirmwareInstallButton.tsx
index 15c67471a69..1bc17b4b813 100644
--- a/packages/suite/src/components/firmware/Buttons/FirmwareInstallButton.tsx
+++ b/packages/suite/src/components/firmware/Buttons/FirmwareInstallButton.tsx
@@ -1,4 +1,5 @@
 import { Button, ButtonProps, Tooltip } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useTranslation } from 'src/hooks/suite';
 
diff --git a/packages/suite/src/components/firmware/Buttons/FirmwareRetryButton.tsx b/packages/suite/src/components/firmware/Buttons/FirmwareRetryButton.tsx
index 2262a180e8c..49c100ab877 100644
--- a/packages/suite/src/components/firmware/Buttons/FirmwareRetryButton.tsx
+++ b/packages/suite/src/components/firmware/Buttons/FirmwareRetryButton.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import { Button, ButtonProps } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 
 export const FirmwareRetryButton = (props: Omit<ButtonProps, 'children'>) => (
diff --git a/packages/suite/src/components/firmware/CheckSeedStep.tsx b/packages/suite/src/components/firmware/CheckSeedStep.tsx
index de22dc6239b..494d29bf1f9 100644
--- a/packages/suite/src/components/firmware/CheckSeedStep.tsx
+++ b/packages/suite/src/components/firmware/CheckSeedStep.tsx
@@ -1,17 +1,20 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
 
 import { Button, Checkbox, variables } from '@trezor/components';
 import { spacingsPx } from '@trezor/theme';
 import { selectDeviceLabelOrName } from '@suite-common/wallet-core';
+
 import { useDevice, useDispatch, useSelector } from 'src/hooks/suite';
 import { Translation } from 'src/components/suite';
 import { OnboardingStepBox } from 'src/components/onboarding';
-import { FirmwareButtonsRow } from './Buttons/FirmwareButtonsRow';
-import { FirmwareSwitchWarning } from './FirmwareSwitchWarning';
 import { goto } from 'src/actions/suite/routerActions';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
 
+import { FirmwareButtonsRow } from './Buttons/FirmwareButtonsRow';
+import { FirmwareSwitchWarning } from './FirmwareSwitchWarning';
+
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledCheckbox = styled(Checkbox)`
     margin: ${spacingsPx.md} 0;
@@ -39,12 +42,12 @@ const StyledSwitchWarning = styled(FirmwareSwitchWarning)`
 `;
 
 type CheckSeedStepProps = {
+    deviceWillBeWiped: boolean;
     onClose?: () => void;
     onSuccess: () => void;
-    willBeWiped?: boolean;
 };
 
-export const CheckSeedStep = ({ onClose, onSuccess, willBeWiped }: CheckSeedStepProps) => {
+export const CheckSeedStep = ({ deviceWillBeWiped, onClose, onSuccess }: CheckSeedStepProps) => {
     const deviceLabel = useSelector(selectDeviceLabelOrName);
     const dispatch = useDispatch();
     const { device } = useDevice();
@@ -60,7 +63,7 @@ export const CheckSeedStep = ({ onClose, onSuccess, willBeWiped }: CheckSeedStep
             <Translation id="TR_DEVICE_LABEL_IS_NOT_BACKED_UP" values={{ deviceLabel }} />
         );
 
-        if (willBeWiped) {
+        if (deviceWillBeWiped) {
             const goToDeviceSettingsAnchor = (anchor: SettingsAnchor) =>
                 dispatch(goto('settings-device', { anchor }));
             const goToCreateBackup = () =>
@@ -126,20 +129,22 @@ export const CheckSeedStep = ({ onClose, onSuccess, willBeWiped }: CheckSeedStep
             heading={heading}
             description={description}
             innerActions={
-                <FirmwareButtonsRow withCancelButton={willBeWiped} onClose={onClose}>
+                <FirmwareButtonsRow withCancelButton={deviceWillBeWiped} onClose={onClose}>
                     <Button
                         onClick={onSuccess}
                         data-testid="@firmware/confirm-seed-button"
                         isDisabled={!device?.connected || !isChecked}
                     >
-                        <Translation id={willBeWiped ? 'TR_WIPE_AND_REINSTALL' : 'TR_CONTINUE'} />
+                        <Translation
+                            id={deviceWillBeWiped ? 'TR_WIPE_AND_REINSTALL' : 'TR_CONTINUE'}
+                        />
                     </Button>
                 </FirmwareButtonsRow>
             }
             disableConfirmWrapper
             nested
         >
-            {willBeWiped && (
+            {deviceWillBeWiped && (
                 <StyledSwitchWarning>
                     <Translation id="TR_FIRMWARE_SWITCH_WARNING_3" />
                 </StyledSwitchWarning>
diff --git a/packages/suite/src/components/firmware/Fingerprint.tsx b/packages/suite/src/components/firmware/Fingerprint.tsx
index f31c0731e80..6c95c65aab2 100644
--- a/packages/suite/src/components/firmware/Fingerprint.tsx
+++ b/packages/suite/src/components/firmware/Fingerprint.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { TrezorDevice } from 'src/types/suite';
 import { getFormattedFingerprint } from 'src/utils/firmware';
 
diff --git a/packages/suite/src/components/firmware/FirmwareInitial.tsx b/packages/suite/src/components/firmware/FirmwareInitial.tsx
index bdb60b586d2..ffdeac9c2ba 100644
--- a/packages/suite/src/components/firmware/FirmwareInitial.tsx
+++ b/packages/suite/src/components/firmware/FirmwareInitial.tsx
@@ -1,4 +1,5 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
 
 import { ExtendedMessageDescriptor } from '@suite-common/intl-types';
@@ -8,14 +9,15 @@ import { AcquiredDevice } from '@suite-common/suite-types';
 import { getFirmwareVersion, isBitcoinOnlyDevice } from '@trezor/device-utils';
 import { FirmwareType } from '@trezor/connect';
 import { selectDevices } from '@suite-common/wallet-core';
+import { spacingsPx } from '@trezor/theme';
 
 import { OnboardingStepBox, OnboardingButtonSkip } from 'src/components/onboarding';
-import { PrerequisitesGuide, Translation } from '../suite';
 import { useDevice, useFirmware, useOnboarding, useSelector } from 'src/hooks/suite';
 import { FirmwareInstallButton, FirmwareOffer } from 'src/components/firmware';
+
+import { PrerequisitesGuide, Translation } from '../suite';
 import { FirmwareButtonsRow } from './Buttons/FirmwareButtonsRow';
 import { FirmwareSwitchWarning } from './FirmwareSwitchWarning';
-import { spacingsPx } from '@trezor/theme';
 
 const Description = styled.div`
     align-items: center;
@@ -110,23 +112,23 @@ const getNoFirmwareInstalledSubheading = (device: AcquiredDevice) => {
 };
 
 interface FirmwareInitialProps {
+    shouldSwitchFirmwareType?: boolean;
     // This component is shared between Onboarding flow and standalone fw update modal with few minor UI changes
     // If it is set to true, then you know it is being rendered in standalone fw update modal
     standaloneFwUpdate?: boolean;
-    shouldSwitchFirmwareType?: boolean;
     onClose?: () => void;
-    willBeWiped?: boolean;
 }
 
 export const FirmwareInitial = ({
+    shouldSwitchFirmwareType = false,
     standaloneFwUpdate = false,
-    shouldSwitchFirmwareType,
     onClose,
-    willBeWiped,
 }: FirmwareInitialProps) => {
     const [bitcoinOnlyOffer, setBitcoinOnlyOffer] = useState(false);
     const { device } = useDevice();
-    const { firmwareUpdate, getTargetFirmwareType, setStatus } = useFirmware();
+    const { deviceWillBeWiped, firmwareUpdate, setStatus, targetFirmwareType } = useFirmware({
+        shouldSwitchFirmwareType,
+    });
     const { goToNextStep, updateAnalytics } = useOnboarding();
     const devices = useSelector(selectDevices);
 
@@ -142,9 +144,7 @@ export const FirmwareInitial = ({
 
     let content;
 
-    const targetType = bitcoinOnlyOffer
-        ? FirmwareType.BitcoinOnly
-        : getTargetFirmwareType(!!shouldSwitchFirmwareType);
+    const targetType = bitcoinOnlyOffer ? FirmwareType.BitcoinOnly : targetFirmwareType;
     // Bitcoin-only firmware is only available on T2T1 from v2.0.8 - older devices must first upgrade to 2.1.1 which does not have a Bitcoin-only variant
     const isBitcoinOnlyAvailable = !!device.firmwareRelease?.release.url_bitcoinonly;
     const currentFwVersion = getFirmwareVersion(device);
@@ -301,7 +301,7 @@ export const FirmwareInitial = ({
             ),
             body: (
                 <>
-                    {willBeWiped && (
+                    {deviceWillBeWiped && (
                         <WarningListWrapper>
                             <Important>
                                 <Translation id="TR_IMPORTANT" />
@@ -324,14 +324,14 @@ export const FirmwareInitial = ({
                 </>
             ),
             innerActions: (
-                <FirmwareButtonsRow withCancelButton={willBeWiped} onClose={onClose}>
+                <FirmwareButtonsRow withCancelButton={deviceWillBeWiped} onClose={onClose}>
                     <FirmwareInstallButton
                         onClick={() =>
                             shouldCheckSeed ? setStatus('check-seed') : installFirmware(targetType)
                         }
                         multipleDevicesConnected={multipleDevicesConnected}
                     >
-                        <Translation id={willBeWiped ? 'TR_CONTINUE' : 'TR_INSTALL'} />
+                        <Translation id={deviceWillBeWiped ? 'TR_CONTINUE' : 'TR_INSTALL'} />
                     </FirmwareInstallButton>
                 </FirmwareButtonsRow>
             ),
diff --git a/packages/suite/src/components/firmware/FirmwareInstallation.tsx b/packages/suite/src/components/firmware/FirmwareInstallation.tsx
index 30253aa0b0b..bb6232c3b38 100644
--- a/packages/suite/src/components/firmware/FirmwareInstallation.tsx
+++ b/packages/suite/src/components/firmware/FirmwareInstallation.tsx
@@ -1,5 +1,8 @@
+import styled from 'styled-components';
+
 import { Button } from '@trezor/components';
 import { UI } from '@trezor/connect';
+import { spacingsPx } from '@trezor/theme';
 
 import { Translation, WebUsbButton } from 'src/components/suite';
 import { useFirmware } from 'src/hooks/suite';
@@ -8,8 +11,6 @@ import { OnboardingStepBox } from 'src/components/onboarding';
 import { TrezorDevice } from 'src/types/suite';
 import { selectIsActionAbortable } from 'src/reducers/suite/suiteReducer';
 import { useSelector } from 'src/hooks/suite/useSelector';
-import styled from 'styled-components';
-import { spacingsPx } from '@trezor/theme';
 
 const SelectDevice = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/firmware/FirmwareOffer.tsx b/packages/suite/src/components/firmware/FirmwareOffer.tsx
index 074199e4f65..351c7c92bcc 100644
--- a/packages/suite/src/components/firmware/FirmwareOffer.tsx
+++ b/packages/suite/src/components/firmware/FirmwareOffer.tsx
@@ -8,11 +8,11 @@ import {
 import { Icon, Markdown, Tooltip, variables } from '@trezor/components';
 import { getFirmwareVersion } from '@trezor/device-utils';
 import { FirmwareType } from '@trezor/connect';
+import { spacingsPx } from '@trezor/theme';
 
 import { Translation, TrezorLink } from 'src/components/suite';
 import { useFirmware, useTranslation, useSelector } from 'src/hooks/suite';
 import { getSuiteFirmwareTypeString } from 'src/utils/firmware';
-import { spacingsPx } from '@trezor/theme';
 
 const FwVersionWrapper = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/firmware/FirmwareProgressBar.tsx b/packages/suite/src/components/firmware/FirmwareProgressBar.tsx
index c8319520b73..e27f541b66e 100644
--- a/packages/suite/src/components/firmware/FirmwareProgressBar.tsx
+++ b/packages/suite/src/components/firmware/FirmwareProgressBar.tsx
@@ -1,6 +1,8 @@
-import { Icon, ProgressBar, variables } from '@trezor/components';
 import styled, { useTheme } from 'styled-components';
+
+import { Icon, ProgressBar, variables } from '@trezor/components';
 import { borders, spacingsPx } from '@trezor/theme';
+
 import { useFirmware } from 'src/hooks/suite';
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/components/firmware/FirmwareUpdateHashCheckError.tsx b/packages/suite/src/components/firmware/FirmwareUpdateHashCheckError.tsx
new file mode 100644
index 00000000000..14e2ebb6263
--- /dev/null
+++ b/packages/suite/src/components/firmware/FirmwareUpdateHashCheckError.tsx
@@ -0,0 +1,22 @@
+import { INVALID_HASH_ERROR } from '@suite-common/wallet-core';
+
+import { OnboardingStepBox } from '../onboarding';
+import { Translation } from '../suite';
+
+type FirmwareUpdateHashCheckErrorProps = {
+    error?: string;
+};
+
+export const FirmwareUpdateHashCheckError = ({ error }: FirmwareUpdateHashCheckErrorProps) => (
+    <OnboardingStepBox
+        image="UNI_ERROR"
+        heading={<Translation id="TR_FIRMWARE_HASH_MISMATCH" />}
+        description={
+            // if invalid hash, the firmware is clearly counterfeit. Other error may be transient, so display additional info to help resolve it
+            !!error && error !== INVALID_HASH_ERROR ? (
+                <Translation id="TOAST_GENERIC_ERROR" values={{ error }} />
+            ) : null
+        }
+        nested
+    />
+);
diff --git a/packages/suite/src/components/firmware/ReconnectDevicePrompt.tsx b/packages/suite/src/components/firmware/ReconnectDevicePrompt.tsx
index 5cef9b478d2..afbc8a49c81 100644
--- a/packages/suite/src/components/firmware/ReconnectDevicePrompt.tsx
+++ b/packages/suite/src/components/firmware/ReconnectDevicePrompt.tsx
@@ -1,136 +1,16 @@
-import { ReactNode } from 'react';
-import styled, { css } from 'styled-components';
 import * as semver from 'semver';
 
 import { getFirmwareVersion } from '@trezor/device-utils';
-import { H2, Button, variables, DeviceAnimation } from '@trezor/components';
+import { H2, DeviceAnimation, NewModal, Paragraph, List, Column } from '@trezor/components';
 import { DEVICE, Device, DeviceModelInternal, UI } from '@trezor/connect';
-import { Modal, Translation, WebUsbButton } from 'src/components/suite';
-import { DeviceConfirmImage } from 'src/components/suite/DeviceConfirmImage';
-import { useDevice, useFirmware, useSelector } from 'src/hooks/suite';
-import { AbortButton } from 'src/components/suite/modals/AbortButton';
 import { ConfirmOnDevice } from '@trezor/product-components';
 import { TranslationKey } from '@suite-common/intl-types';
 import { spacings } from '@trezor/theme';
 import { selectDeviceLabelOrName } from '@suite-common/wallet-core';
 
-const StyledModal = styled(Modal)`
-    width: 600px;
-
-    ${Modal.Body} {
-        padding: 38px 22px 6px;
-    }
-`;
-
-const Wrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: space-around;
-
-    ${variables.SCREEN_QUERY.MOBILE} {
-        flex-direction: column;
-    }
-`;
-
-const Content = styled.div`
-    display: flex;
-    flex-direction: column;
-    padding: 10px 14px;
-    margin-left: 24px;
-`;
-
-const BulletPointWrapper = styled.div`
-    display: flex;
-    align-items: center;
-
-    & + & {
-        margin-top: 24px;
-    }
-`;
-
-const BulletPointNumber = styled.div<{ $active?: boolean }>`
-    display: flex;
-    flex: 0 0 auto;
-    width: 28px;
-    height: 28px;
-    border-radius: 50%;
-    justify-content: center;
-    align-items: center;
-    margin-right: 14px;
-    font-size: ${variables.FONT_SIZE.SMALL};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-    background: ${({ theme }) => theme.legacy.BG_GREY};
-    font-variant-numeric: tabular-nums;
-
-    ${({ $active, theme }) =>
-        $active &&
-        css`
-            color: ${theme.legacy.TYPE_GREEN};
-            background: ${theme.legacy.BG_LIGHT_GREEN};
-        `}
-`;
-
-const BulletPointText = styled.span<{ $active?: boolean }>`
-    font-size: ${variables.FONT_SIZE.NORMAL};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    color: ${({ theme, $active }) =>
-        $active ? theme.legacy.TYPE_GREEN : theme.legacy.TYPE_LIGHT_GREY};
-    text-align: left;
-`;
-
-const CenteredPointText = styled(BulletPointText)`
-    text-align: center;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledDeviceAnimation = styled(DeviceAnimation)`
-    flex: 0 0 220px;
-    width: 220px;
-    height: 220px;
-
-    ${variables.SCREEN_QUERY.MOBILE} {
-        align-self: center;
-    }
-`;
-
-const StyledConfirmImage = styled(DeviceConfirmImage)`
-    flex: 0 0 200px;
-    width: 200px;
-    height: 200px;
-`;
-
-const StyledWebUsbButton = styled(WebUsbButton)`
-    margin-top: 24px;
-`;
-
-const StyledAbortButton = styled(AbortButton)`
-    position: absolute;
-    top: 12px;
-    right: 12px;
-`;
-
-interface ReconnectStepProps {
-    order?: number;
-    active: boolean;
-    children: ReactNode;
-    'data-testid'?: string;
-}
-
-const ReconnectStep = ({
-    order,
-    active,
-    'data-testid': dataTest,
-    children,
-}: ReconnectStepProps) => (
-    <BulletPointWrapper>
-        {order && <BulletPointNumber $active={active}>{order}</BulletPointNumber>}
-
-        <BulletPointText $active={active} data-testid={active ? dataTest : undefined}>
-            {children}
-        </BulletPointText>
-    </BulletPointWrapper>
-);
+import { useDevice, useFirmware, useSelector } from 'src/hooks/suite';
+import { DeviceConfirmImage } from 'src/components/suite/DeviceConfirmImage';
+import { Translation, WebUsbButton } from 'src/components/suite';
 
 const RebootDeviceGraphics = ({
     device,
@@ -140,7 +20,7 @@ const RebootDeviceGraphics = ({
     isManualRebootRequired: boolean;
 }) => {
     if (!isManualRebootRequired) {
-        return device ? <StyledConfirmImage device={device} /> : null;
+        return device ? <DeviceConfirmImage device={device} /> : null;
     }
 
     const deviceModelInternal = device?.features?.internal_model;
@@ -164,7 +44,7 @@ const RebootDeviceGraphics = ({
     };
 
     return (
-        <StyledDeviceAnimation
+        <DeviceAnimation
             type={getRebootType()}
             height="220px"
             width="220px"
@@ -255,80 +135,88 @@ export const ReconnectDevicePrompt = ({ onClose, onSuccess }: ReconnectDevicePro
             [DeviceModelInternal.T2B1]: 'TR_SWITCH_TO_BOOTLOADER_HOLD_LEFT_BUTTON',
             [DeviceModelInternal.T3B1]: 'TR_SWITCH_TO_BOOTLOADER_HOLD_LEFT_BUTTON',
             [DeviceModelInternal.T3T1]: 'TR_SWITCH_TO_BOOTLOADER_SWIPE_YOUR_FINGERS',
+            [DeviceModelInternal.T3W1]: 'TR_SWITCH_TO_BOOTLOADER_SWIPE_YOUR_FINGERS',
         };
 
         return switchToBootloaderMap[deviceModelFromEvent];
     };
 
     return (
-        <StyledModal
-            modalPrompt={
-                !isManualRebootRequired && (
-                    <ConfirmOnDevice
-                        title={<Translation id="TR_CONFIRM_ON_TREZOR" />}
-                        deviceModelInternal={deviceModelInternal}
-                        deviceUnitColor={device?.features?.unit_color}
-                        isConfirmed={uiEvent?.type !== 'button'}
-                    />
-                )
-            }
-        >
-            {isAbortable && <StyledAbortButton onAbort={onClose} />}
-
-            <Wrapper data-testid="@firmware/reconnect-device">
+        <NewModal.Backdrop onClick={isAbortable ? onClose : undefined}>
+            {!isManualRebootRequired && !isRebootDone && (
+                <ConfirmOnDevice
+                    title={<Translation id="TR_CONFIRM_ON_TREZOR" />}
+                    deviceModelInternal={deviceModelInternal}
+                    deviceUnitColor={device?.features?.unit_color}
+                    isConfirmed={uiEvent?.type !== 'button'}
+                />
+            )}
+            <NewModal.ModalBase
+                onCancel={isAbortable ? onClose : undefined}
+                data-testid="@firmware/reconnect-device"
+                size="tiny"
+                bottomContent={
+                    isRebootDone && (
+                        <NewModal.Button onClick={onSuccess} data-testid="@firmware/install-button">
+                            <Translation id="TR_INSTALL" />
+                        </NewModal.Button>
+                    )
+                }
+            >
                 {!isRebootDone && (
-                    <RebootDeviceGraphics
-                        device={uiEvent?.payload.device}
-                        isManualRebootRequired={isManualRebootRequired}
-                    />
+                    <Column margin={{ bottom: spacings.md }}>
+                        <RebootDeviceGraphics
+                            device={uiEvent?.payload.device}
+                            isManualRebootRequired={isManualRebootRequired}
+                        />
+                    </Column>
                 )}
-
-                <Content>
-                    <H2 margin={{ bottom: spacings.md }} align="center">
-                        <Translation id={getHeading()} />
-                    </H2>
-
-                    {!isRebootDone ? (
-                        <>
-                            {isManualRebootRequired ? (
-                                <>
-                                    {/* First step asks for disconnecting a device */}
-                                    <ReconnectStep
-                                        order={1}
-                                        active={rebootPhase !== 'disconnected'}
-                                        data-testid="@firmware/disconnect-message"
+                <H2 align="center">
+                    <Translation id={getHeading()} />
+                </H2>
+                {!isRebootDone && (
+                    <Column alignItems="stretch" gap={spacings.lg}>
+                        {isManualRebootRequired ? (
+                            <List isOrdered margin={{ top: spacings.md }}>
+                                {/* First step asks for disconnecting a device */}
+                                <List.Item data-testid="@firmware/disconnect-message">
+                                    <Paragraph
+                                        variant={
+                                            rebootPhase !== 'disconnected' ? 'primary' : 'default'
+                                        }
                                     >
                                         <Translation id="TR_DISCONNECT_YOUR_DEVICE" />
-                                    </ReconnectStep>
-
-                                    {/* Second step reconnect in bootloader */}
-                                    <ReconnectStep
-                                        order={2}
-                                        active={rebootPhase === 'disconnected'}
-                                        data-testid="@firmware/connect-in-bootloader-message"
+                                    </Paragraph>
+                                </List.Item>
+
+                                {/* Second step reconnect in bootloader */}
+                                <List.Item data-testid="@firmware/connect-in-bootloader-message">
+                                    <Paragraph
+                                        variant={
+                                            rebootPhase === 'disconnected' ? 'primary' : 'default'
+                                        }
                                     >
                                         <Translation id={getSecondStep()} />
-                                    </ReconnectStep>
-                                </>
-                            ) : (
-                                <CenteredPointText>
-                                    <Translation
-                                        id="TR_CONFIRM_ACTION_ON_YOUR"
-                                        values={{ deviceLabel }}
-                                    />
-                                </CenteredPointText>
-                            )}
-                            {showWebUsbButton && <StyledWebUsbButton />}
-                        </>
-                    ) : (
-                        <>
-                            <Button onClick={onSuccess} data-testid="@firmware/install-button">
-                                <Translation id="TR_INSTALL" />
-                            </Button>
-                        </>
-                    )}
-                </Content>
-            </Wrapper>
-        </StyledModal>
+                                    </Paragraph>
+                                </List.Item>
+                            </List>
+                        ) : (
+                            <Paragraph
+                                typographyStyle="hint"
+                                variant="tertiary"
+                                align="center"
+                                margin={{ top: spacings.xs }}
+                            >
+                                <Translation
+                                    id="TR_CONFIRM_ACTION_ON_YOUR"
+                                    values={{ deviceLabel }}
+                                />
+                            </Paragraph>
+                        )}
+                        {showWebUsbButton && <WebUsbButton />}
+                    </Column>
+                )}
+            </NewModal.ModalBase>
+        </NewModal.Backdrop>
     );
 };
diff --git a/packages/suite/src/components/firmware/SelectCustomFirmware.tsx b/packages/suite/src/components/firmware/SelectCustomFirmware.tsx
index 4cd4b9e15ed..38bc670263e 100644
--- a/packages/suite/src/components/firmware/SelectCustomFirmware.tsx
+++ b/packages/suite/src/components/firmware/SelectCustomFirmware.tsx
@@ -1,4 +1,5 @@
 import { Dispatch, SetStateAction } from 'react';
+
 import styled from 'styled-components';
 
 import { Button } from '@trezor/components';
diff --git a/packages/suite/src/components/firmware/index.tsx b/packages/suite/src/components/firmware/index.tsx
index 600af529273..55b0feb603c 100644
--- a/packages/suite/src/components/firmware/index.tsx
+++ b/packages/suite/src/components/firmware/index.tsx
@@ -10,3 +10,4 @@ export { FirmwareRetryButton } from './Buttons/FirmwareRetryButton';
 export { FirmwareCloseButton } from './Buttons/FirmwareCloseButton';
 export { FirmwareContinueButton } from './Buttons/FirmwareContinueButton';
 export { FirmwareInstallButton } from './Buttons/FirmwareInstallButton';
+export { FirmwareUpdateHashCheckError } from './FirmwareUpdateHashCheckError';
diff --git a/packages/suite/src/components/guide/Feedback.tsx b/packages/suite/src/components/guide/Feedback.tsx
index a0e3b8e59c9..01bb8166c6f 100644
--- a/packages/suite/src/components/guide/Feedback.tsx
+++ b/packages/suite/src/components/guide/Feedback.tsx
@@ -1,13 +1,10 @@
 import { useState, useCallback, ReactNode, ChangeEvent } from 'react';
+
 import styled, { css } from 'styled-components';
+
 import { analytics, EventType } from '@trezor/suite-analytics';
 import { getFirmwareVersion } from '@trezor/device-utils';
-
-import { Translation } from 'src/components/suite';
 import { Textarea, Select, variables, Button, CollapsibleBox } from '@trezor/components';
-import { useDevice, useDispatch, useSelector } from 'src/hooks/suite';
-import { sendFeedback, setView } from 'src/actions/suite/guideActions';
-import { GuideViewWrapper, GuideHeader, GuideContent } from 'src/components/guide';
 import { Rating, FeedbackCategory, FeedbackType, UserData } from '@suite-common/suite-types';
 import {
     getEnvironment,
@@ -20,6 +17,11 @@ import {
 } from '@trezor/env-utils';
 import { spacingsPx } from '@trezor/theme';
 
+import { Translation } from 'src/components/suite';
+import { useDevice, useDispatch, useSelector } from 'src/hooks/suite';
+import { sendFeedback, setView } from 'src/actions/suite/guideActions';
+import { GuideViewWrapper, GuideHeader, GuideContent } from 'src/components/guide';
+
 const Headline = styled.div`
     font-size: ${variables.FONT_SIZE.TINY};
     font-weight: ${variables.FONT_WEIGHT.DEMI_BOLD};
diff --git a/packages/suite/src/components/guide/Guide.tsx b/packages/suite/src/components/guide/Guide.tsx
index 3f128b3fbc2..7636ec73778 100644
--- a/packages/suite/src/components/guide/Guide.tsx
+++ b/packages/suite/src/components/guide/Guide.tsx
@@ -1,7 +1,11 @@
 import { useState } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
 import { analytics, EventType } from '@trezor/suite-analytics';
 import { spacingsPx, typography, zIndices } from '@trezor/theme';
+import { Column, Divider, Icon } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { setView } from 'src/actions/suite/guideActions';
 import { useDispatch, useSelector } from 'src/hooks/suite';
@@ -12,7 +16,6 @@ import {
     GuideCategories,
     GuideSearch,
 } from 'src/components/guide';
-import { Column, Divider, Icon } from '@trezor/components';
 
 const FeedbackLinkWrapper = styled.div`
     padding: ${spacingsPx.md};
diff --git a/packages/suite/src/components/guide/GuideArticle.tsx b/packages/suite/src/components/guide/GuideArticle.tsx
index 8b91eb2ba99..07d1e47f2fe 100644
--- a/packages/suite/src/components/guide/GuideArticle.tsx
+++ b/packages/suite/src/components/guide/GuideArticle.tsx
@@ -1,11 +1,12 @@
 import styled from 'styled-components';
 
+import { spacingsPx } from '@trezor/theme';
+
 import { useSelector } from 'src/hooks/suite';
 import { GuideHeader, GuideContent, GuideViewWrapper, GuideMarkdown } from 'src/components/guide';
 import { Translation } from 'src/components/suite';
 import { useGuideLoadArticle } from 'src/hooks/guide';
 import { selectLanguage } from 'src/reducers/suite/suiteReducer';
-import { spacingsPx } from '@trezor/theme';
 
 const ArticleWrapper = styled.div`
     padding-bottom: ${spacingsPx.xxl};
diff --git a/packages/suite/src/components/guide/GuideButton.tsx b/packages/suite/src/components/guide/GuideButton.tsx
index f2fe52fc22e..c6c04abacff 100644
--- a/packages/suite/src/components/guide/GuideButton.tsx
+++ b/packages/suite/src/components/guide/GuideButton.tsx
@@ -1,9 +1,11 @@
+import { FreeFocusInside } from 'react-focus-lock';
+
 import styled from 'styled-components';
 
 import { Icon, useElevation } from '@trezor/components';
 import { Elevation, mapElevationToBackground, mapElevationToBorder, zIndices } from '@trezor/theme';
+
 import { useGuide } from 'src/hooks/guide';
-import { FreeFocusInside } from 'react-focus-lock';
 
 const Wrapper = styled.button<{ $isGuideOpen: boolean; $elevation: Elevation }>`
     display: flex;
diff --git a/packages/suite/src/components/guide/GuideCategories.tsx b/packages/suite/src/components/guide/GuideCategories.tsx
index ee47cbca51f..cb1a1e2dcf0 100644
--- a/packages/suite/src/components/guide/GuideCategories.tsx
+++ b/packages/suite/src/components/guide/GuideCategories.tsx
@@ -1,8 +1,10 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
 
 import { variables } from '@trezor/components';
 import { GuideCategory } from '@suite-common/suite-types';
+
 import { GuideNode } from 'src/components/guide';
 
 const Section = styled.section`
diff --git a/packages/suite/src/components/guide/GuideCategory.tsx b/packages/suite/src/components/guide/GuideCategory.tsx
index 1801db0543d..ed040e3c6ae 100644
--- a/packages/suite/src/components/guide/GuideCategory.tsx
+++ b/packages/suite/src/components/guide/GuideCategory.tsx
@@ -1,6 +1,7 @@
 import styled from 'styled-components';
 
 import { variables } from '@trezor/components';
+
 import {
     GuideHeader,
     GuideContent,
diff --git a/packages/suite/src/components/guide/GuideContent.tsx b/packages/suite/src/components/guide/GuideContent.tsx
index 70794a3c5a2..3392bd1fda2 100644
--- a/packages/suite/src/components/guide/GuideContent.tsx
+++ b/packages/suite/src/components/guide/GuideContent.tsx
@@ -1,5 +1,7 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { spacingsPx } from '@trezor/theme';
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/components/guide/GuideHeader.tsx b/packages/suite/src/components/guide/GuideHeader.tsx
index 12a40ab9d60..79ea11ffac4 100644
--- a/packages/suite/src/components/guide/GuideHeader.tsx
+++ b/packages/suite/src/components/guide/GuideHeader.tsx
@@ -1,13 +1,15 @@
 import { useContext } from 'react';
+
 import styled, { css } from 'styled-components';
 import { transparentize } from 'polished';
+
 import { analytics, EventType } from '@trezor/suite-analytics';
+import { IconButton, variables } from '@trezor/components';
+import { typography, zIndices } from '@trezor/theme';
 
 import { close } from 'src/actions/suite/guideActions';
 import { useDispatch } from 'src/hooks/suite';
-import { IconButton, variables } from '@trezor/components';
 import { HeaderBreadcrumb, ContentScrolledContext } from 'src/components/guide';
-import { typography, zIndices } from '@trezor/theme';
 
 const HeaderWrapper = styled.div<{ $noLabel?: boolean; $isScrolled: boolean }>`
     display: flex;
diff --git a/packages/suite/src/components/guide/GuideHint.tsx b/packages/suite/src/components/guide/GuideHint.tsx
index 718e300740f..2ac7e6472f5 100644
--- a/packages/suite/src/components/guide/GuideHint.tsx
+++ b/packages/suite/src/components/guide/GuideHint.tsx
@@ -1,4 +1,5 @@
 import { Children, BlockquoteHTMLAttributes, cloneElement, isValidElement } from 'react';
+
 import styled from 'styled-components';
 
 import { Banner } from '@trezor/components';
diff --git a/packages/suite/src/components/guide/GuideMarkdown.tsx b/packages/suite/src/components/guide/GuideMarkdown.tsx
index b44a417ff13..333009a02ce 100644
--- a/packages/suite/src/components/guide/GuideMarkdown.tsx
+++ b/packages/suite/src/components/guide/GuideMarkdown.tsx
@@ -1,6 +1,9 @@
 import { useEffect, useRef } from 'react';
+
 import { Markdown } from '@trezor/components';
+
 import { useGuideOpenNode } from 'src/hooks/guide';
+
 import { GuideHint } from './GuideHint';
 import { TrezorLink } from '../suite';
 
diff --git a/packages/suite/src/components/guide/GuideNode.tsx b/packages/suite/src/components/guide/GuideNode.tsx
index 5025b4fc82d..e8483c31c93 100644
--- a/packages/suite/src/components/guide/GuideNode.tsx
+++ b/packages/suite/src/components/guide/GuideNode.tsx
@@ -1,14 +1,16 @@
 import { ReactNode } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
 import { analytics, EventType } from '@trezor/suite-analytics';
 import { resolveStaticPath } from '@suite-common/suite-utils';
-
 import { Icon, variables } from '@trezor/components';
+import { GuideNode as GuideNodeType } from '@suite-common/suite-types';
+import { borders, spacings } from '@trezor/theme';
+
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { openNode } from 'src/actions/suite/guideActions';
-import { GuideNode as GuideNodeType } from '@suite-common/suite-types';
 import { getNodeTitle } from 'src/utils/suite/guide';
-import { borders, spacings } from '@trezor/theme';
 import { selectLanguage } from 'src/reducers/suite/suiteReducer';
 
 const NodeButton = styled.button`
diff --git a/packages/suite/src/components/guide/GuideRouter.tsx b/packages/suite/src/components/guide/GuideRouter.tsx
index faccbed45f0..b748d7c0e70 100644
--- a/packages/suite/src/components/guide/GuideRouter.tsx
+++ b/packages/suite/src/components/guide/GuideRouter.tsx
@@ -1,9 +1,12 @@
+import { FreeFocusInside } from 'react-focus-lock';
+
 import styled, { css, keyframes } from 'styled-components';
 import { AnimatePresence, motion } from 'framer-motion';
-import { FreeFocusInside } from 'react-focus-lock';
 
 import { variables, Backdrop } from '@trezor/components';
 import { useOnce } from '@trezor/react-utils';
+import { zIndices } from '@trezor/theme';
+
 import { useSelector } from 'src/hooks/suite';
 import {
     SupportFeedbackSelection,
@@ -13,7 +16,6 @@ import {
     Feedback,
 } from 'src/components/guide';
 import { useGuide, GUIDE_ANIMATION_DURATION_MS } from 'src/hooks/guide';
-import { zIndices } from '@trezor/theme';
 
 const fullHeightStyle = css`
     position: absolute;
diff --git a/packages/suite/src/components/guide/GuideSearch.tsx b/packages/suite/src/components/guide/GuideSearch.tsx
index c7bea547f47..cde56565947 100644
--- a/packages/suite/src/components/guide/GuideSearch.tsx
+++ b/packages/suite/src/components/guide/GuideSearch.tsx
@@ -1,14 +1,16 @@
 import { useState, useEffect } from 'react';
+
 import styled from 'styled-components';
+
 import { Icon, Input, Spinner, variables } from '@trezor/components';
+import type { GuideCategory } from '@suite-common/suite-types';
+import { spacingsPx } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import { useTranslation } from 'src/hooks/suite';
 import { GuideNode } from 'src/components/guide';
 import { useGuideSearch } from 'src/hooks/guide';
 
-import type { GuideCategory } from '@suite-common/suite-types';
-import { spacingsPx } from '@trezor/theme';
-
 const Wrapper = styled.div`
     margin-bottom: ${spacingsPx.xs};
 `;
diff --git a/packages/suite/src/components/guide/GuideViewWrapper.tsx b/packages/suite/src/components/guide/GuideViewWrapper.tsx
index a73a099cbf9..dd3c2839f5d 100644
--- a/packages/suite/src/components/guide/GuideViewWrapper.tsx
+++ b/packages/suite/src/components/guide/GuideViewWrapper.tsx
@@ -1,5 +1,7 @@
 import { createContext, useCallback, useState, ReactNode, UIEventHandler } from 'react';
+
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/components/guide/HeaderBreadcrumb.tsx b/packages/suite/src/components/guide/HeaderBreadcrumb.tsx
index af68d428aa3..ade4f6acd67 100644
--- a/packages/suite/src/components/guide/HeaderBreadcrumb.tsx
+++ b/packages/suite/src/components/guide/HeaderBreadcrumb.tsx
@@ -1,16 +1,16 @@
 import styled from 'styled-components';
 import { darken } from 'polished';
+
 import { analytics, EventType } from '@trezor/suite-analytics';
+import { variables } from '@trezor/components';
+import type { GuideCategory } from '@suite-common/suite-types';
 
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { openNode, setView } from 'src/actions/suite/guideActions';
-import { variables } from '@trezor/components';
 import { Translation } from 'src/components/suite';
 // importing directly, otherwise unit tests fail, seems to be a styled-components issue
 import { TrezorLink } from 'src/components/suite/TrezorLink';
 import { findAncestorNodes, getNodeTitle } from 'src/utils/suite/guide';
-
-import type { GuideCategory } from '@suite-common/suite-types';
 import { selectLanguage } from 'src/reducers/suite/suiteReducer';
 
 const BreadcrumbWrapper = styled.span`
diff --git a/packages/suite/src/components/guide/OpenGuideFromTooltip.tsx b/packages/suite/src/components/guide/OpenGuideFromTooltip.tsx
index 9c07ae849a1..03eebc2f149 100644
--- a/packages/suite/src/components/guide/OpenGuideFromTooltip.tsx
+++ b/packages/suite/src/components/guide/OpenGuideFromTooltip.tsx
@@ -1,11 +1,13 @@
 import { MouseEvent } from 'react';
+
 import styled, { useTheme } from 'styled-components';
 import { transparentize } from 'polished';
 
 import { borders, spacingsPx, typography } from '@trezor/theme';
+import { Icon } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useGuideOpenNode } from 'src/hooks/guide';
-import { Icon } from '@trezor/components';
 
 const OpenGuideLink = styled.span`
     display: flex;
diff --git a/packages/suite/src/components/guide/SupportFeedbackSelection.tsx b/packages/suite/src/components/guide/SupportFeedbackSelection.tsx
index 00e0ca87e45..4f3abe17aca 100644
--- a/packages/suite/src/components/guide/SupportFeedbackSelection.tsx
+++ b/packages/suite/src/components/guide/SupportFeedbackSelection.tsx
@@ -7,13 +7,13 @@ import { Icon, Link, variables } from '@trezor/components';
 import { isDesktop } from '@trezor/env-utils';
 import { getFirmwareVersion } from '@trezor/device-utils';
 import { selectDevice } from '@suite-common/wallet-core';
+import { borders } from '@trezor/theme';
 
 import { Translation } from 'src/components/suite';
 import { setView } from 'src/actions/suite/guideActions';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { GuideViewWrapper, GuideHeader, GuideContent } from 'src/components/guide';
 import { UpdateState } from 'src/reducers/suite/desktopUpdateReducer';
-import { borders } from '@trezor/theme';
 
 const Section = styled.div`
     & + & {
diff --git a/packages/suite/src/components/onboarding/Buttons/OnboardingButtonBack.tsx b/packages/suite/src/components/onboarding/Buttons/OnboardingButtonBack.tsx
index d0cce6dc6ad..88e5ed3a1de 100644
--- a/packages/suite/src/components/onboarding/Buttons/OnboardingButtonBack.tsx
+++ b/packages/suite/src/components/onboarding/Buttons/OnboardingButtonBack.tsx
@@ -1,4 +1,5 @@
 import { Button, ButtonProps } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 
 export const OnboardingButtonBack = (props: Omit<ButtonProps, 'children'>) => (
diff --git a/packages/suite/src/components/onboarding/Buttons/OnboardingButtonCta.tsx b/packages/suite/src/components/onboarding/Buttons/OnboardingButtonCta.tsx
index 9a5e5ea68b4..e0889c411f5 100644
--- a/packages/suite/src/components/onboarding/Buttons/OnboardingButtonCta.tsx
+++ b/packages/suite/src/components/onboarding/Buttons/OnboardingButtonCta.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { Button, ButtonProps } from '@trezor/components';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
diff --git a/packages/suite/src/components/onboarding/Buttons/OnboardingButtonSkip.tsx b/packages/suite/src/components/onboarding/Buttons/OnboardingButtonSkip.tsx
index 5750beeaf4f..881b646a7d0 100644
--- a/packages/suite/src/components/onboarding/Buttons/OnboardingButtonSkip.tsx
+++ b/packages/suite/src/components/onboarding/Buttons/OnboardingButtonSkip.tsx
@@ -1,5 +1,7 @@
 import { HtmlHTMLAttributes } from 'react';
+
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
 
 const StyledSpan = styled.span`
diff --git a/packages/suite/src/components/onboarding/CollapsibleOnboardingCard.tsx b/packages/suite/src/components/onboarding/CollapsibleOnboardingCard.tsx
index 9fd0058a807..ed544405b8c 100644
--- a/packages/suite/src/components/onboarding/CollapsibleOnboardingCard.tsx
+++ b/packages/suite/src/components/onboarding/CollapsibleOnboardingCard.tsx
@@ -1,6 +1,8 @@
 import { ReactNode, HTMLAttributes } from 'react';
+
 import styled, { css } from 'styled-components';
 import { motion } from 'framer-motion';
+
 import { Elevation, borders, mapElevationToBackground, zIndices, spacings } from '@trezor/theme';
 import {
     ElevationUp,
@@ -242,7 +244,7 @@ export const CollapsibleOnboardingCard = ({
 
                             {heading && (
                                 <H2
-                                    margin={{ bottom: !!description ? spacings.sm : spacings.xxl }}
+                                    margin={{ bottom: description ? spacings.sm : spacings.xxl }}
                                     align="center"
                                 >
                                     {heading}
diff --git a/packages/suite/src/components/onboarding/Hologram.tsx b/packages/suite/src/components/onboarding/Hologram.tsx
index ab2cdd10e3b..1ef72695976 100644
--- a/packages/suite/src/components/onboarding/Hologram.tsx
+++ b/packages/suite/src/components/onboarding/Hologram.tsx
@@ -1,15 +1,16 @@
+import { useRef } from 'react';
+
 import styled from 'styled-components';
 
 import { selectDevice } from '@suite-common/wallet-core';
 import { getPackagingUrl } from '@suite-common/suite-utils';
 import { DeviceAnimation, Banner, variables } from '@trezor/components';
 import { TREZOR_RESELLERS_URL, TREZOR_SUPPORT_URL } from '@trezor/urls';
+import { typography } from '@trezor/theme';
+import { DeviceModelInternal } from '@trezor/connect';
 
 import { Translation, TrezorLink } from 'src/components/suite';
-import { useRef } from 'react';
 import { useSelector } from 'src/hooks/suite';
-import { typography } from '@trezor/theme';
-import { DeviceModelInternal } from '@trezor/connect';
 
 const HologramSubHeading = styled.span`
     font-size: ${variables.FONT_SIZE.SMALL};
diff --git a/packages/suite/src/components/onboarding/OnboardingLayout.tsx b/packages/suite/src/components/onboarding/OnboardingLayout.tsx
index 67b5b929ab2..aa50c4f8f0b 100644
--- a/packages/suite/src/components/onboarding/OnboardingLayout.tsx
+++ b/packages/suite/src/components/onboarding/OnboardingLayout.tsx
@@ -1,19 +1,22 @@
 import { useMemo, ReactNode } from 'react';
+
 import styled from 'styled-components';
 
 import { Button, variables } from '@trezor/components';
 import { TrezorLogo } from '@trezor/product-components';
 import { TREZOR_SUPPORT_URL } from '@trezor/urls';
+import { selectBannerMessage } from '@suite-common/message-system';
+import { spacingsPx, zIndices } from '@trezor/theme';
+
 import { TrezorLink, Translation } from 'src/components/suite';
 import { OnboardingProgressBar } from 'src/components/onboarding';
 import { useSelector, useOnboarding } from 'src/hooks/suite';
 import { MAX_ONBOARDING_WIDTH } from 'src/constants/suite/layout';
 import steps from 'src/config/onboarding/steps';
 import { GuideButton, GuideRouter } from 'src/components/guide';
-import { selectBannerMessage } from '@suite-common/message-system';
 import { MessageSystemBanner } from 'src/components/suite/banners';
 import { ModalContextProvider } from 'src/support/suite/ModalContext';
-import { spacingsPx, zIndices } from '@trezor/theme';
+
 import { TrafficLightOffset } from '../suite/TrafficLightOffset';
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/components/onboarding/OnboardingOption.tsx b/packages/suite/src/components/onboarding/OnboardingOption.tsx
index 40d69739865..f73377d27d9 100644
--- a/packages/suite/src/components/onboarding/OnboardingOption.tsx
+++ b/packages/suite/src/components/onboarding/OnboardingOption.tsx
@@ -1,5 +1,7 @@
 import { ReactNode, HTMLAttributes } from 'react';
+
 import styled, { css } from 'styled-components';
+
 import { Icon, IconName, useElevation, variables } from '@trezor/components';
 import {
     Elevation,
diff --git a/packages/suite/src/components/onboarding/OnboardingProgressBar.tsx b/packages/suite/src/components/onboarding/OnboardingProgressBar.tsx
index 900ae75b2ce..c264037019e 100644
--- a/packages/suite/src/components/onboarding/OnboardingProgressBar.tsx
+++ b/packages/suite/src/components/onboarding/OnboardingProgressBar.tsx
@@ -1,5 +1,7 @@
 import { ReactNode, Fragment } from 'react';
+
 import styled, { css, useTheme } from 'styled-components';
+
 import { Icon, variables } from '@trezor/components';
 import { spacingsPx, typography } from '@trezor/theme';
 
diff --git a/packages/suite/src/components/onboarding/OnboardingStepBox.tsx b/packages/suite/src/components/onboarding/OnboardingStepBox.tsx
index 0aa0b0beaf7..5bd74ba2668 100644
--- a/packages/suite/src/components/onboarding/OnboardingStepBox.tsx
+++ b/packages/suite/src/components/onboarding/OnboardingStepBox.tsx
@@ -1,17 +1,21 @@
 import { ReactNode } from 'react';
+import { useIntl } from 'react-intl';
+
 import styled from 'styled-components';
+
 import TrezorConnect from '@trezor/connect';
 import { Backdrop } from '@trezor/components';
+import { TrezorDevice } from '@suite-common/suite-types';
+import { spacingsPx, zIndices } from '@trezor/theme';
+import { ConfirmOnDevice } from '@trezor/product-components';
+
 import { Translation } from 'src/components/suite';
-import { useIntl } from 'react-intl';
 import messages from 'src/support/messages';
+
 import {
     CollapsibleOnboardingCard,
     CollapsibleOnboardingCardProps,
 } from './CollapsibleOnboardingCard';
-import { TrezorDevice } from '@suite-common/suite-types';
-import { spacingsPx, zIndices } from '@trezor/theme';
-import { ConfirmOnDevice } from '@trezor/product-components';
 
 const WrapperWrapper = styled.div`
     z-index: ${zIndices.onboardingForeground};
diff --git a/packages/suite/src/components/onboarding/SkipStepConfirmation.tsx b/packages/suite/src/components/onboarding/SkipStepConfirmation.tsx
index 62a5b49f835..86b33aacf10 100644
--- a/packages/suite/src/components/onboarding/SkipStepConfirmation.tsx
+++ b/packages/suite/src/components/onboarding/SkipStepConfirmation.tsx
@@ -1,30 +1,49 @@
+import { ReactNode } from 'react';
+
+import { NewModal } from '@trezor/components';
+
 import * as STEP from 'src/constants/onboarding/steps';
 import { AnyStepId } from 'src/types/onboarding';
-import { NewModal } from '@trezor/components';
 import { Translation } from 'src/components/suite';
 import { useOnboarding } from 'src/hooks/suite';
 
-interface SkipStepConfirmationProps {
+type SkipStepConfirmationProps = {
     onCancel: () => void;
-}
+};
 
-export const SkipStepConfirmation = ({ onCancel }: SkipStepConfirmationProps) => {
-    const { activeStepId, goToNextStep } = useOnboarding();
+type SkipModalContent = {
+    heading?: ReactNode;
+    secondaryButtonText?: ReactNode;
+    body?: ReactNode;
+    nextStep?: AnyStepId;
+};
 
-    let text;
-    let nextStep: AnyStepId;
+const getModalContent = (activeStepId: AnyStepId): SkipModalContent => {
     switch (activeStepId) {
         case STEP.ID_SECURITY_STEP:
         case STEP.ID_BACKUP_STEP:
-            text = <Translation id="TR_SKIP_BACKUP" />;
-            nextStep = STEP.ID_SET_PIN_STEP;
-            break;
+            return {
+                heading: <Translation id="TR_SKIP_BACKUP" />,
+                secondaryButtonText: <Translation id="TR_SKIP_BACKUP" />,
+                body: <Translation id="TR_SKIP_BACKUP_DESCRIPTION" />,
+                nextStep: STEP.ID_SET_PIN_STEP,
+            };
         case STEP.ID_SET_PIN_STEP:
-            text = <Translation id="TR_SKIP_PIN" />;
-            break;
+            return {
+                heading: <Translation id="TR_SKIP_PIN" />,
+                secondaryButtonText: <Translation id="TR_SKIP_PIN" />,
+                body: <Translation id="TR_SKIP_PIN_DESCRIPTION" />,
+            };
         default:
-            throw new Error(`Unexpected step to skip: ${activeStepId}`);
+            return {};
     }
+};
+
+export const SkipStepConfirmation = ({ onCancel }: SkipStepConfirmationProps) => {
+    const { activeStepId, goToNextStep } = useOnboarding();
+    const { heading, secondaryButtonText, body, nextStep } = getModalContent(activeStepId);
+
+    if (!heading) return;
 
     const handleSkipStepConfirm = () => {
         goToNextStep(nextStep);
@@ -32,7 +51,7 @@ export const SkipStepConfirmation = ({ onCancel }: SkipStepConfirmationProps) =>
 
     return (
         <NewModal
-            heading={text}
+            heading={heading}
             onCancel={onCancel}
             size="small"
             bottomContent={
@@ -45,12 +64,12 @@ export const SkipStepConfirmation = ({ onCancel }: SkipStepConfirmationProps) =>
                         data-testid="@onboarding/skip-button-confirm"
                         onClick={handleSkipStepConfirm}
                     >
-                        {text}
+                        {secondaryButtonText}
                     </NewModal.Button>
                 </>
             }
         >
-            <Translation id="TR_DO_YOU_REALLY_WANT_TO_SKIP" />
+            {body}
         </NewModal>
     );
 };
diff --git a/packages/suite/src/components/onboarding/index.ts b/packages/suite/src/components/onboarding/index.ts
index 32f74581ed9..1c2f868ddbe 100644
--- a/packages/suite/src/components/onboarding/index.ts
+++ b/packages/suite/src/components/onboarding/index.ts
@@ -1,9 +1,7 @@
 import { OnboardingOption, OptionsWrapper, OptionsDivider } from './OnboardingOption';
-
 import { OnboardingButtonCta } from './Buttons/OnboardingButtonCta';
 import { OnboardingButtonBack } from './Buttons/OnboardingButtonBack';
 import { OnboardingButtonSkip } from './Buttons/OnboardingButtonSkip';
-
 import { OnboardingLayout } from './OnboardingLayout';
 import { Hologram } from './Hologram';
 import { OnboardingStepBox, type OnboardingStepBoxProps } from './OnboardingStepBox';
diff --git a/packages/suite/src/components/settings/DeviceBanner.tsx b/packages/suite/src/components/settings/DeviceBanner.tsx
index ca093e4d4fc..5b3ef7c8fb6 100644
--- a/packages/suite/src/components/settings/DeviceBanner.tsx
+++ b/packages/suite/src/components/settings/DeviceBanner.tsx
@@ -1,11 +1,13 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { Card, LottieAnimation, Paragraph, Row, variables, Text } from '@trezor/components';
+import { spacings } from '@trezor/theme';
 
 import { useDevice, useSelector } from 'src/hooks/suite';
 import { isWebUsb } from 'src/utils/suite/transport';
 import { WebUsbButton } from 'src/components/suite/WebUsbButton';
-import { spacings } from '@trezor/theme';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledLottieAnimation = styled(LottieAnimation)`
@@ -62,13 +64,12 @@ export const DeviceBanner = ({ title, description }: DeviceBannerProps) => {
                     loop
                 />
                 <Column>
-                    <Title typographyStyle="highlight">
-                        {title}{' '}
+                    <Row justifyContent="space-between">
+                        <Title typographyStyle="highlight">{title}</Title>
                         {!description && isWebUsbTransport && !device?.connected && (
                             <WebUsbButton />
                         )}
-                    </Title>
-
+                    </Row>
                     {description && <Text color="textSubdued">{description}</Text>}
                 </Column>
             </Row>
diff --git a/packages/suite/src/components/settings/SettingsLayout.tsx b/packages/suite/src/components/settings/SettingsLayout.tsx
index 2b4169c657b..a4e1788ede1 100644
--- a/packages/suite/src/components/settings/SettingsLayout.tsx
+++ b/packages/suite/src/components/settings/SettingsLayout.tsx
@@ -1,4 +1,5 @@
 import { ReactNode, useMemo } from 'react';
+
 import { useDiscovery, useDispatch, useLayout, useSelector } from 'src/hooks/suite';
 import { SettingsLoading } from 'src/views/settings/SettingsLoader';
 import {
diff --git a/packages/suite/src/components/settings/SettingsSection.tsx b/packages/suite/src/components/settings/SettingsSection.tsx
index 71755c19a57..68684f25675 100644
--- a/packages/suite/src/components/settings/SettingsSection.tsx
+++ b/packages/suite/src/components/settings/SettingsSection.tsx
@@ -1,5 +1,7 @@
 import { ReactNode, ReactElement } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
 import { Paragraph, IconName, Icon, H3, Card, Column } from '@trezor/components';
 import { spacings, spacingsPx } from '@trezor/theme';
 import { breakpointMediaQueries } from '@trezor/styles';
diff --git a/packages/suite/src/components/suite/AccountLabel.tsx b/packages/suite/src/components/suite/AccountLabel.tsx
index f587e23a3fa..cbe0a4f48c2 100644
--- a/packages/suite/src/components/suite/AccountLabel.tsx
+++ b/packages/suite/src/components/suite/AccountLabel.tsx
@@ -1,12 +1,12 @@
 import styled from 'styled-components';
-import { getTitleForNetwork, getTitleForCoinjoinAccount } from '@suite-common/wallet-utils';
+
 import { BadgeSize, Row, TOOLTIP_DELAY_LONG, TruncateWithTooltip } from '@trezor/components';
-import { useCallback } from 'react';
-import { useTranslation } from '../../hooks/suite';
 import { spacings } from '@trezor/theme';
-import { AccountType, NetworkSymbol } from '@suite-common/wallet-config';
+import { AccountType, NetworkSymbol, Bip43Path, NetworkType } from '@suite-common/wallet-config';
+
+import { useDefaultAccountLabel } from 'src/hooks/suite';
+
 import { AccountTypeBadge } from './AccountTypeBadge';
-import { Bip43Path, NetworkType } from '@suite-common/wallet-config';
 
 const TabularNums = styled.span`
     font-variant-numeric: tabular-nums;
@@ -14,7 +14,7 @@ const TabularNums = styled.span`
     overflow: hidden;
 `;
 
-export interface AccountLabelProps {
+interface AccountLabelProps {
     accountLabel?: string;
     accountType: AccountType;
     symbol: NetworkSymbol;
@@ -25,36 +25,6 @@ export interface AccountLabelProps {
     networkType?: NetworkType;
 }
 
-export const useAccountLabel = () => {
-    const { translationString } = useTranslation();
-
-    const defaultAccountLabelString = useCallback(
-        ({
-            accountType,
-            symbol,
-            index = 0,
-        }: {
-            accountType: AccountType;
-            symbol: NetworkSymbol;
-            index?: number;
-        }) => {
-            if (accountType === 'coinjoin') {
-                return translationString(getTitleForCoinjoinAccount(symbol));
-            }
-
-            return translationString('LABELING_ACCOUNT', {
-                networkName: translationString(getTitleForNetwork(symbol)), // Bitcoin, Ethereum, ...
-                index: index + 1, // This is the number which shows after hash, e.g. Ethereum #3
-            });
-        },
-        [translationString],
-    );
-
-    return {
-        defaultAccountLabelString,
-    };
-};
-
 export const AccountLabel = ({
     accountLabel,
     accountType = 'normal',
@@ -63,32 +33,18 @@ export const AccountLabel = ({
     showAccountTypeBadge,
     accountTypeBadgeSize = 'medium',
     symbol,
-    index = 0,
+    index,
 }: AccountLabelProps) => {
-    const { defaultAccountLabelString } = useAccountLabel();
-
-    if (accountLabel) {
-        return (
-            <TruncateWithTooltip delayShow={TOOLTIP_DELAY_LONG}>
-                <Row gap={spacings.sm}>
-                    <TabularNums>{accountLabel}</TabularNums>
-                    {showAccountTypeBadge && (
-                        <AccountTypeBadge
-                            accountType={accountType}
-                            size={accountTypeBadgeSize}
-                            path={path}
-                            networkType={networkType}
-                        />
-                    )}
-                </Row>
-            </TruncateWithTooltip>
-        );
-    }
+    const { getDefaultAccountLabel } = useDefaultAccountLabel();
 
     return (
         <TruncateWithTooltip delayShow={TOOLTIP_DELAY_LONG}>
             <Row gap={spacings.sm}>
-                {defaultAccountLabelString({ accountType, symbol, index })}
+                {accountLabel ? (
+                    <TabularNums>{accountLabel}</TabularNums>
+                ) : (
+                    getDefaultAccountLabel({ accountType, symbol, index })
+                )}
                 {showAccountTypeBadge && (
                     <AccountTypeBadge
                         accountType={accountType}
diff --git a/packages/suite/src/components/suite/AccountTypeBadge.tsx b/packages/suite/src/components/suite/AccountTypeBadge.tsx
index 3a822cc3b78..1f84ba86562 100644
--- a/packages/suite/src/components/suite/AccountTypeBadge.tsx
+++ b/packages/suite/src/components/suite/AccountTypeBadge.tsx
@@ -1,8 +1,9 @@
 import { Badge, BadgeSize } from '@trezor/components';
-import { Translation } from './Translation';
 import { getAccountTypeName } from '@suite-common/wallet-utils';
 import { AccountType, Bip43Path, NetworkType } from '@suite-common/wallet-config';
 
+import { Translation } from './Translation';
+
 type AccountTypeBadgeProps = {
     accountType?: AccountType;
     path?: Bip43Path;
diff --git a/packages/suite/src/components/suite/AmountUnitSwitchWrapper.tsx b/packages/suite/src/components/suite/AmountUnitSwitchWrapper.tsx
index 5f38dd15719..69581e68bb9 100644
--- a/packages/suite/src/components/suite/AmountUnitSwitchWrapper.tsx
+++ b/packages/suite/src/components/suite/AmountUnitSwitchWrapper.tsx
@@ -1,11 +1,15 @@
 import { MouseEvent, ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { TOOLTIP_DELAY_NONE, TOOLTIP_DELAY_NORMAL, Tooltip } from '@trezor/components';
-import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
 import { NetworkSymbol } from '@suite-common/wallet-config';
-import { Translation } from './Translation';
 import { mediaQueries } from '@trezor/styles';
 
+import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
+
+import { Translation } from './Translation';
+
 const Container = styled.div`
     position: relative;
     display: flex;
diff --git a/packages/suite/src/components/suite/AppNavigation/AppNavigationTooltip.tsx b/packages/suite/src/components/suite/AppNavigation/AppNavigationTooltip.tsx
index 0316a0d162e..21c41ebeaca 100644
--- a/packages/suite/src/components/suite/AppNavigation/AppNavigationTooltip.tsx
+++ b/packages/suite/src/components/suite/AppNavigation/AppNavigationTooltip.tsx
@@ -1,8 +1,9 @@
 import { ReactNode } from 'react';
 
+import { Tooltip } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite';
-import { Tooltip } from '@trezor/components';
 
 interface AppNavigationTooltipProps {
     children: ReactNode;
diff --git a/packages/suite/src/components/suite/ChangeDeviceLabel.tsx b/packages/suite/src/components/suite/ChangeDeviceLabel.tsx
index a773df1d086..ba0582c1b98 100644
--- a/packages/suite/src/components/suite/ChangeDeviceLabel.tsx
+++ b/packages/suite/src/components/suite/ChangeDeviceLabel.tsx
@@ -1,17 +1,19 @@
 import { useState, ChangeEventHandler } from 'react';
-import { analytics, EventType } from '@trezor/suite-analytics';
+
 import styled from 'styled-components';
 
+import { analytics, EventType } from '@trezor/suite-analytics';
 import { Button, Input } from '@trezor/components';
-import { Translation } from 'src/components/suite';
-import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
-import { applySettings } from 'src/actions/settings/deviceSettingsActions';
-import { MAX_LABEL_LENGTH } from 'src/constants/suite/device';
 import { isAscii } from '@trezor/utils';
 import { spacingsPx } from '@trezor/theme';
 import { breakpointMediaQueries } from '@trezor/styles';
 import { selectDeviceLabel, selectDeviceName } from '@suite-common/wallet-core';
 
+import { Translation } from 'src/components/suite';
+import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
+import { applySettings } from 'src/actions/settings/deviceSettingsActions';
+import { MAX_LABEL_LENGTH } from 'src/constants/suite/device';
+
 const Container = styled.div<{ $isVertical?: boolean }>`
     display: flex;
     flex-direction: ${({ $isVertical }) => ($isVertical ? 'column' : 'row')};
diff --git a/packages/suite/src/components/suite/CheckItem.tsx b/packages/suite/src/components/suite/CheckItem.tsx
index d47477f3c54..8280cbab275 100644
--- a/packages/suite/src/components/suite/CheckItem.tsx
+++ b/packages/suite/src/components/suite/CheckItem.tsx
@@ -1,32 +1,6 @@
 import { ReactNode } from 'react';
-import styled from 'styled-components';
 
-import { Checkbox, variables } from '@trezor/components';
-
-const { FONT_SIZE } = variables;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledCheckbox = styled(Checkbox)`
-    padding-left: 0;
-    align-items: flex-start;
-
-    & + & {
-        margin-top: 16px;
-    }
-`;
-
-const CheckboxRight = styled.div`
-    text-align: left;
-`;
-
-const CheckboxTitle = styled.div`
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-const CheckboxText = styled.div`
-    font-size: ${FONT_SIZE.SMALL};
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
+import { Checkbox, Paragraph, Column } from '@trezor/components';
 
 interface CheckItemProps {
     title: ReactNode;
@@ -44,11 +18,15 @@ export const CheckItem = ({
     onClick,
     ...rest
 }: CheckItemProps) => (
-    <StyledCheckbox isChecked={isChecked} onClick={onClick} {...rest}>
-        <CheckboxRight>
-            <CheckboxTitle>{title}</CheckboxTitle>
-            {description && <CheckboxText>{description}</CheckboxText>}
+    <Checkbox isChecked={isChecked} onClick={onClick} {...rest}>
+        <Column alignItems="flex-start">
+            <Paragraph>{title}</Paragraph>
+            {description && (
+                <Paragraph variant="tertiary" typographyStyle="hint">
+                    {description}
+                </Paragraph>
+            )}
             {link && link}
-        </CheckboxRight>
-    </StyledCheckbox>
+        </Column>
+    </Checkbox>
 );
diff --git a/packages/suite/src/components/suite/CoinGroup/CoinGroup.tsx b/packages/suite/src/components/suite/CoinGroup/CoinGroup.tsx
index dbbae737c75..7efd47c2d3a 100644
--- a/packages/suite/src/components/suite/CoinGroup/CoinGroup.tsx
+++ b/packages/suite/src/components/suite/CoinGroup/CoinGroup.tsx
@@ -1,31 +1,35 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
 
+import { Network, NetworkSymbol } from '@suite-common/wallet-config';
+
 import { useDispatch } from 'src/hooks/suite';
+import { changeCoinVisibility } from 'src/actions/settings/walletSettingsActions';
 import { openModal } from 'src/actions/suite/modalActions';
 import { CoinList } from 'src/components/suite';
-import { Network, NetworkSymbol } from '@suite-common/wallet-config';
 
 import { CoinGroupHeader } from './CoinGroupHeader';
+import { CoinListProps } from '../CoinList/CoinList';
 
 const CoinGroupWrapper = styled.div`
     width: 100%;
 `;
 
-interface CoinGroupProps {
+type CoinGroupProps = {
     networks: Network[];
     enabledNetworks?: NetworkSymbol[];
-    className?: string;
-    onToggle: (symbol: NetworkSymbol, toggled: boolean) => void;
-}
+};
 
-export const CoinGroup = ({ onToggle, networks, enabledNetworks, className }: CoinGroupProps) => {
+export const CoinGroup = ({ networks, enabledNetworks }: CoinGroupProps) => {
     const [settingsMode, setSettingsMode] = useState(false);
 
     const dispatch = useDispatch();
 
     const isAtLeastOneActive = networks.some(({ symbol }) => enabledNetworks?.includes(symbol));
 
+    const onToggle: CoinListProps['onToggle'] = (symbol, shouldBeVisible) =>
+        dispatch(changeCoinVisibility(symbol, shouldBeVisible));
     const onSettings = (symbol: NetworkSymbol) => {
         setSettingsMode(false);
         dispatch(
@@ -38,7 +42,7 @@ export const CoinGroup = ({ onToggle, networks, enabledNetworks, className }: Co
     const toggleSettingsMode = () => setSettingsMode(value => !value);
 
     return (
-        <CoinGroupWrapper className={className}>
+        <CoinGroupWrapper>
             <CoinGroupHeader
                 isAtLeastOneActive={isAtLeastOneActive}
                 settingsMode={settingsMode}
diff --git a/packages/suite/src/components/suite/CoinGroup/CoinGroupHeader.tsx b/packages/suite/src/components/suite/CoinGroup/CoinGroupHeader.tsx
index f88f5b30ca7..98b345d4ded 100644
--- a/packages/suite/src/components/suite/CoinGroup/CoinGroupHeader.tsx
+++ b/packages/suite/src/components/suite/CoinGroup/CoinGroupHeader.tsx
@@ -1,6 +1,8 @@
 import { transparentize } from 'polished';
 import styled, { css } from 'styled-components';
+
 import { Icon, variables } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/components/suite/CoinList/Coin.tsx b/packages/suite/src/components/suite/CoinList/Coin.tsx
index 6af07736a08..bef1a6c126a 100644
--- a/packages/suite/src/components/suite/CoinList/Coin.tsx
+++ b/packages/suite/src/components/suite/CoinList/Coin.tsx
@@ -1,13 +1,16 @@
 import { MouseEvent } from 'react';
+
 import { transparentize } from 'polished';
 import styled, { css, useTheme } from 'styled-components';
+
 import { variables, Icon } from '@trezor/components';
-import { Translation } from 'src/components/suite';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { typography } from '@trezor/theme';
 import { TranslationKey } from '@suite-common/intl-types';
 import { CoinLogo } from '@trezor/product-components';
 
+import { Translation } from 'src/components/suite';
+
 const SettingsWrapper = styled.div<{
     $toggled: boolean;
     onClick: ((e: MouseEvent) => void) | undefined;
diff --git a/packages/suite/src/components/suite/CoinList/CoinList.tsx b/packages/suite/src/components/suite/CoinList/CoinList.tsx
index 86a8128c73c..4efa7a15d97 100644
--- a/packages/suite/src/components/suite/CoinList/CoinList.tsx
+++ b/packages/suite/src/components/suite/CoinList/CoinList.tsx
@@ -4,13 +4,13 @@ import { getCoinUnavailabilityMessage } from '@suite-common/suite-utils';
 import { Tooltip } from '@trezor/components';
 import { getFirmwareVersion, isDeviceInBootloaderMode } from '@trezor/device-utils';
 import { versionUtils } from '@trezor/utils';
+import { Network, NetworkSymbol } from '@suite-common/wallet-config';
 
 import { Translation } from 'src/components/suite';
 import { useDevice, useDiscovery, useSelector } from 'src/hooks/suite';
-import { Network, NetworkSymbol } from '@suite-common/wallet-config';
+import { getCoinLabel } from 'src/utils/suite/getCoinLabel';
 
 import { Coin } from './Coin';
-import { getCoinLabel } from 'src/utils/suite/getCoinLabel';
 
 const Wrapper = styled.div`
     width: 100%;
@@ -19,13 +19,13 @@ const Wrapper = styled.div`
     gap: 16px 12px;
 `;
 
-interface CoinListProps {
+export type CoinListProps = {
     networks: Network[];
     enabledNetworks?: NetworkSymbol[];
     settingsMode?: boolean;
     onSettings?: (symbol: NetworkSymbol) => void;
     onToggle: (symbol: NetworkSymbol, toggled: boolean) => void;
-}
+};
 
 export const CoinList = ({
     networks,
diff --git a/packages/suite/src/components/suite/ConnectDevicePrompt.tsx b/packages/suite/src/components/suite/ConnectDevicePrompt.tsx
index 84bf16bc735..70c7ac7acbb 100644
--- a/packages/suite/src/components/suite/ConnectDevicePrompt.tsx
+++ b/packages/suite/src/components/suite/ConnectDevicePrompt.tsx
@@ -1,8 +1,8 @@
 import styled, { useTheme } from 'styled-components';
+import { motion } from 'framer-motion';
 
 import {
     variables,
-    Button,
     motionEasing,
     LottieAnimation,
     useElevation,
@@ -10,12 +10,11 @@ import {
     Icon,
 } from '@trezor/components';
 import { isDesktop } from '@trezor/env-utils';
+import { Elevation, mapElevationToBackground, mapElevationToBorder } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
-import { useDevice, useDispatch } from 'src/hooks/suite';
-import { goto } from 'src/actions/suite/routerActions';
+import { useDevice } from 'src/hooks/suite';
 import type { PrerequisiteType } from 'src/types/suite';
-import { motion } from 'framer-motion';
-import { Elevation, mapElevationToBackground, mapElevationToBorder } from '@trezor/theme';
 
 const Wrapper = styled(motion.div)<{ $elevation: Elevation }>`
     display: flex;
@@ -28,7 +27,6 @@ const Wrapper = styled(motion.div)<{ $elevation: Elevation }>`
     border: 1px solid ${mapElevationToBorder};
     align-items: center;
     box-shadow: ${({ theme }) => theme.boxShadowElevated};
-    margin-bottom: 60px;
 `;
 
 const ImageWrapper = styled.div`
@@ -76,6 +74,8 @@ const getMessageId = ({
             return isDesktop() ? 'TR_NO_TRANSPORT_DESKTOP' : 'TR_NO_TRANSPORT';
         case 'device-bootloader':
             return 'TR_DEVICE_CONNECTED_BOOTLOADER';
+        case 'device-unacquired':
+            return 'TR_DEVICE_CONNECTED_UNACQUIRED';
         default: {
             if (connected) {
                 return !showWarning ? 'TR_DEVICE_CONNECTED' : 'TR_DEVICE_CONNECTED_WRONG_STATE';
@@ -129,15 +129,9 @@ export const ConnectDevicePrompt = ({
     prerequisite,
     connected,
     showWarning,
-    allowSwitchDevice,
 }: ConnectDevicePromptProps) => {
-    const dispatch = useDispatch();
-
     const { elevation } = useElevation();
 
-    const handleSwitchDeviceClick = () =>
-        dispatch(goto('suite-switch-device', { params: { cancelable: true } }));
-
     return (
         <Wrapper
             $elevation={elevation}
@@ -151,12 +145,6 @@ export const ConnectDevicePrompt = ({
 
                 <Text>
                     <Translation id={getMessageId({ connected, showWarning, prerequisite })} />
-
-                    {allowSwitchDevice && (
-                        <Button variant="tertiary" onClick={handleSwitchDeviceClick}>
-                            <Translation id="TR_SWITCH_DEVICE" />
-                        </Button>
-                    )}
                 </Text>
             </ElevationUp>
         </Wrapper>
diff --git a/packages/suite/src/components/suite/CountdownTimer.tsx b/packages/suite/src/components/suite/CountdownTimer.tsx
index 6f46690b8e6..1967741247d 100644
--- a/packages/suite/src/components/suite/CountdownTimer.tsx
+++ b/packages/suite/src/components/suite/CountdownTimer.tsx
@@ -1,9 +1,13 @@
-import styled from 'styled-components';
 import { FormattedNumber } from 'react-intl';
-import { Translation } from './Translation';
+
+import styled from 'styled-components';
+
 import { TranslationKey } from '@suite-common/intl-types';
+
 import { useCountdownTimer } from 'src/hooks/suite';
 
+import { Translation } from './Translation';
+
 const UnitWrapper = styled.span`
     font-variant-numeric: tabular-nums;
 `;
diff --git a/packages/suite/src/components/suite/DeviceAuthenticationExplainer.tsx b/packages/suite/src/components/suite/DeviceAuthenticationExplainer.tsx
index 2910cf06a7d..0064216452c 100644
--- a/packages/suite/src/components/suite/DeviceAuthenticationExplainer.tsx
+++ b/packages/suite/src/components/suite/DeviceAuthenticationExplainer.tsx
@@ -1,9 +1,9 @@
 import styled, { css } from 'styled-components';
 
 import { Icon, IconName, variables } from '@trezor/components';
+import { TranslationKey } from '@suite-common/intl-types';
 
 import { Translation } from 'src/components/suite';
-import { TranslationKey } from '@suite-common/intl-types';
 
 const Item = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/suite/DeviceConfirmImage.tsx b/packages/suite/src/components/suite/DeviceConfirmImage.tsx
index 1cf9a94d0a6..a7a52822ea2 100644
--- a/packages/suite/src/components/suite/DeviceConfirmImage.tsx
+++ b/packages/suite/src/components/suite/DeviceConfirmImage.tsx
@@ -1,8 +1,9 @@
+import { TrezorDevice } from '@suite-common/suite-types';
 import { Image, ImageProps } from '@trezor/components';
 import { Device } from '@trezor/connect';
 
 interface DeviceConfirmImageProps extends Omit<ImageProps, 'image'> {
-    device: Device;
+    device: Device | TrezorDevice;
 }
 
 export const DeviceConfirmImage = ({ device, ...rest }: DeviceConfirmImageProps) => {
diff --git a/packages/suite/src/components/suite/DeviceDisplay/DeviceDisplay.tsx b/packages/suite/src/components/suite/DeviceDisplay/DeviceDisplay.tsx
index 3713200ca41..05e82cbbaf9 100644
--- a/packages/suite/src/components/suite/DeviceDisplay/DeviceDisplay.tsx
+++ b/packages/suite/src/components/suite/DeviceDisplay/DeviceDisplay.tsx
@@ -1,13 +1,16 @@
-import styled from 'styled-components';
 import { ReactNode } from 'react';
 
-import { useSelector } from 'src/hooks/suite/useSelector';
+import styled from 'styled-components';
+
 import { selectDeviceInternalModel } from '@suite-common/wallet-core';
 import { DeviceModelInternal } from '@trezor/connect';
+
+import { useSelector } from 'src/hooks/suite/useSelector';
+import { DisplayMode } from 'src/types/suite';
+
 import { DisplayChunks } from './DisplayChunks';
 import { DisplayPaginatedText } from './DisplayPaginatedText';
 import { DisplaySinglePageWrapText } from './DisplaySinglePageWrapText';
-import { DisplayMode } from 'src/types/suite';
 
 const Display = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/suite/DeviceDisplay/DisplayChunks.tsx b/packages/suite/src/components/suite/DeviceDisplay/DisplayChunks.tsx
index ccfa29eeec3..b49afb8afd7 100644
--- a/packages/suite/src/components/suite/DeviceDisplay/DisplayChunks.tsx
+++ b/packages/suite/src/components/suite/DeviceDisplay/DisplayChunks.tsx
@@ -1,8 +1,11 @@
 import styled from 'styled-components';
-import { DeviceDisplayText } from './DeviceDisplayText';
+
 import { splitStringEveryNCharacters } from '@trezor/utils';
+
 import { handleOnCopy } from 'src/utils/suite/deviceDisplay';
 
+import { DeviceDisplayText } from './DeviceDisplayText';
+
 const Row = styled.div<{ $isAlignedRight?: boolean }>`
     display: flex;
     align-items: center;
diff --git a/packages/suite/src/components/suite/DeviceDisplay/DisplayPageSeparator.tsx b/packages/suite/src/components/suite/DeviceDisplay/DisplayPageSeparator.tsx
index 0c100251e2d..d2d0fdd7bd0 100644
--- a/packages/suite/src/components/suite/DeviceDisplay/DisplayPageSeparator.tsx
+++ b/packages/suite/src/components/suite/DeviceDisplay/DisplayPageSeparator.tsx
@@ -1,7 +1,9 @@
 import styled from 'styled-components';
-import { Translation } from '../Translation';
+
 import { typography } from '@trezor/theme';
 
+import { Translation } from '../Translation';
+
 const SEPARATOR_LINE_HEIGHT = 32;
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/components/suite/DeviceDisplay/DisplayPaginatedText.tsx b/packages/suite/src/components/suite/DeviceDisplay/DisplayPaginatedText.tsx
index 85272ca54ee..eedf007e7bf 100644
--- a/packages/suite/src/components/suite/DeviceDisplay/DisplayPaginatedText.tsx
+++ b/packages/suite/src/components/suite/DeviceDisplay/DisplayPaginatedText.tsx
@@ -1,12 +1,13 @@
 import styled from 'styled-components';
 
 import { DeviceModelInternal } from '@trezor/connect';
+import { Icon, IconName, IconProps } from '@trezor/components';
+
+import { handleOnCopy } from 'src/utils/suite/deviceDisplay';
 
 import { ResultRow, parseTextToPagesAndLines } from './parseTextToPagesAndLines';
 import { DeviceDisplayText } from './DeviceDisplayText';
 import { DisplayPageSeparator } from './DisplayPageSeparator';
-import { handleOnCopy } from 'src/utils/suite/deviceDisplay';
-import { Icon, IconName } from '@trezor/components';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledNextIcon = styled(Icon)<{ $isPixelType: boolean }>`
@@ -55,7 +56,7 @@ const Row = ({
     const iconNextName: IconName = isPixelType ? 'addressPixelNext' : 'addressNext';
     const iconContinuesName: IconName = isPixelType ? 'addressPixelContinues' : 'addressContinues';
 
-    const iconConfig = {
+    const iconConfig: Pick<IconProps, 'color' | 'size'> = {
         size: isPixelType ? 10 : 20,
         color: isPixelType ? '#ffffff' : '#959596',
     };
diff --git a/packages/suite/src/components/suite/DeviceDisplay/DisplaySinglePageWrapText.tsx b/packages/suite/src/components/suite/DeviceDisplay/DisplaySinglePageWrapText.tsx
index ac0fb52f0fb..96e2f0c3d44 100644
--- a/packages/suite/src/components/suite/DeviceDisplay/DisplaySinglePageWrapText.tsx
+++ b/packages/suite/src/components/suite/DeviceDisplay/DisplaySinglePageWrapText.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { DeviceDisplayText } from './DeviceDisplayText';
 
 const TextWrapper = styled.div<{ $isPixelType: boolean }>`
diff --git a/packages/suite/src/components/suite/DeviceDisplay/__tests__/DeviceDisplay.test.tsx b/packages/suite/src/components/suite/DeviceDisplay/__tests__/DeviceDisplay.test.tsx
index 5cbe9c2e72e..c5bd163a430 100644
--- a/packages/suite/src/components/suite/DeviceDisplay/__tests__/DeviceDisplay.test.tsx
+++ b/packages/suite/src/components/suite/DeviceDisplay/__tests__/DeviceDisplay.test.tsx
@@ -1,17 +1,18 @@
-import { DisplayMode } from '../../../../types/suite';
-import { DeviceDisplay } from '../DeviceDisplay';
-import { renderWithProviders } from '../../../../support/tests/hooksHelper';
 import { configureMockStore } from '@suite-common/test-utils';
 import { prepareDeviceReducer } from '@suite-common/wallet-core';
-import { extraDependencies } from '../../../../support/extraDependencies';
 import { DeviceModelInternal } from '@trezor/connect';
 import { DeepPartial } from '@trezor/type-utils';
+
+import { DisplayMode } from '../../../../types/suite';
+import { DeviceDisplay } from '../DeviceDisplay';
+import { renderWithProviders } from '../../../../support/tests/hooksHelper';
+import { extraDependencies } from '../../../../support/extraDependencies';
 import suiteReducer from '../../../../reducers/suite/suiteReducer';
 
-export const deviceReducer = prepareDeviceReducer(extraDependencies);
+const _deviceReducer = prepareDeviceReducer(extraDependencies);
 
-export type State = {
-    device: DeepPartial<ReturnType<typeof deviceReducer>>;
+type State = {
+    device: DeepPartial<ReturnType<typeof _deviceReducer>>;
     suite: DeepPartial<ReturnType<typeof suiteReducer>>;
 };
 
diff --git a/packages/suite/src/components/suite/DeviceDisplay/__tests__/parseTextToPagesAndLines.test.ts b/packages/suite/src/components/suite/DeviceDisplay/__tests__/parseTextToPagesAndLines.test.ts
index 07007d9babb..45988eac512 100644
--- a/packages/suite/src/components/suite/DeviceDisplay/__tests__/parseTextToPagesAndLines.test.ts
+++ b/packages/suite/src/components/suite/DeviceDisplay/__tests__/parseTextToPagesAndLines.test.ts
@@ -1,4 +1,5 @@
 import { DeviceModelInternal } from '@trezor/connect';
+
 import {
     ParseTextToLinesParams,
     ParseTextToLinesResult,
diff --git a/packages/suite/src/components/suite/DeviceDisplay/parseTextToPagesAndLines.ts b/packages/suite/src/components/suite/DeviceDisplay/parseTextToPagesAndLines.ts
index 7f882db4802..b21ca10bf7c 100644
--- a/packages/suite/src/components/suite/DeviceDisplay/parseTextToPagesAndLines.ts
+++ b/packages/suite/src/components/suite/DeviceDisplay/parseTextToPagesAndLines.ts
@@ -78,7 +78,7 @@ export const parseTextToPagesAndLines = ({
 
     let pageIndex = 0;
     let remaining = text;
-    let pages: ResultPage[] = [];
+    const pages: ResultPage[] = [];
 
     while (remaining.length > 0) {
         const isFirstPage = pageIndex === 0;
diff --git a/packages/suite/src/components/suite/DeviceMatrixExplanation.tsx b/packages/suite/src/components/suite/DeviceMatrixExplanation.tsx
index 19206df20b9..a6ee0bcf7e7 100644
--- a/packages/suite/src/components/suite/DeviceMatrixExplanation.tsx
+++ b/packages/suite/src/components/suite/DeviceMatrixExplanation.tsx
@@ -1,9 +1,12 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { Icon, IconName, IconProps, Image, variables } from '@trezor/components';
-import { useGuide } from 'src/hooks/guide';
 import { DeviceModelInternal } from '@trezor/connect';
 
+import { useGuide } from 'src/hooks/guide';
+
 const Wrapper = styled.div<{ $isGuideOpen?: boolean }>`
     display: flex;
     flex-direction: column;
diff --git a/packages/suite/src/components/suite/DropZone.tsx b/packages/suite/src/components/suite/DropZone.tsx
index 5acb62bacee..31f3b87a0fb 100644
--- a/packages/suite/src/components/suite/DropZone.tsx
+++ b/packages/suite/src/components/suite/DropZone.tsx
@@ -1,9 +1,12 @@
 import { useRef, useCallback, useMemo, useState, MouseEvent, DragEvent, ChangeEvent } from 'react';
+
 import styled from 'styled-components';
+
 import { Icon, IconName, Paragraph } from '@trezor/components';
+import { borders, spacings } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import type { ExtendedMessageDescriptor } from 'src/types/suite';
-import { borders, spacings } from '@trezor/theme';
 
 interface DropZoneProps {
     // 'accept' attribute for underlying HTML file input
diff --git a/packages/suite/src/components/suite/Error.tsx b/packages/suite/src/components/suite/Error.tsx
index cf56148e0e3..e621b9e03c5 100644
--- a/packages/suite/src/components/suite/Error.tsx
+++ b/packages/suite/src/components/suite/Error.tsx
@@ -1,5 +1,7 @@
 import styled from 'styled-components';
+
 import { H2, Paragraph, Button, variables } from '@trezor/components';
+
 import { db } from 'src/storage';
 import { reloadApp } from 'src/utils/suite/reload';
 
diff --git a/packages/suite/src/components/suite/FiatValue.tsx b/packages/suite/src/components/suite/FiatValue.tsx
index b1c2d9f6b8f..e11c5b164e9 100644
--- a/packages/suite/src/components/suite/FiatValue.tsx
+++ b/packages/suite/src/components/suite/FiatValue.tsx
@@ -1,18 +1,22 @@
 import { ReactElement } from 'react';
+
 import styled from 'styled-components';
-import { HiddenPlaceholder } from 'src/components/suite';
-import { useFormatters } from '@suite-common/formatters';
 import type { FormatNumberOptions } from '@formatjs/intl';
+
+import { useFormatters } from '@suite-common/formatters';
+import { SkeletonRectangle } from '@trezor/components';
+import { selectIsSpecificCoinDefinitionKnown } from '@suite-common/token-definitions';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+import { TokenAddress } from '@suite-common/wallet-types';
+
+import { useLoadingSkeleton, useSelector } from 'src/hooks/suite';
 import {
     useFiatFromCryptoValue,
     useFiatFromCryptoValueParams,
 } from 'src/hooks/suite/useFiatFromCryptoValue';
+import { HiddenPlaceholder } from 'src/components/suite';
+
 import { HiddenPlaceholderProps } from './HiddenPlaceholder';
-import { useLoadingSkeleton, useSelector } from 'src/hooks/suite';
-import { SkeletonRectangle } from '@trezor/components';
-import { selectIsSpecificCoinDefinitionKnown } from '@suite-common/token-definitions';
-import { NetworkSymbol } from '@suite-common/wallet-config';
-import { TokenAddress } from '@suite-common/wallet-types';
 
 const StyledHiddenPlaceholder = styled((props: HiddenPlaceholderProps) => (
     <HiddenPlaceholder {...props} />
diff --git a/packages/suite/src/components/suite/FormFractionButtons.tsx b/packages/suite/src/components/suite/FormFractionButtons.tsx
index 3b8294ee2f4..5a565888fed 100644
--- a/packages/suite/src/components/suite/FormFractionButtons.tsx
+++ b/packages/suite/src/components/suite/FormFractionButtons.tsx
@@ -1,13 +1,12 @@
 import styled from 'styled-components';
-import { Translation } from 'src/components/suite';
+
 import { Button, Tooltip } from '@trezor/components';
 import { BigNumber } from '@trezor/utils/src/bigNumber';
-import {
-    MIN_ETH_AMOUNT_FOR_STAKING,
-    MIN_ETH_BALANCE_FOR_STAKING,
-} from 'src/constants/suite/ethStaking';
+import { MIN_ETH_AMOUNT_FOR_STAKING } from '@suite-common/wallet-constants';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 
+import { Translation } from 'src/components/suite';
+
 const Flex = styled.div`
     display: flex;
     gap: 4px;
@@ -50,22 +49,23 @@ export const FormFractionButtons = ({
     const is25PercentDisabled = isDisabled || isFractionButtonDisabled(4);
     const is50PercentDisabled = isDisabled || isFractionButtonDisabled(2);
     const isMaxDisabled =
-        isDisabled || new BigNumber(totalAmount || '0').lt(MIN_ETH_BALANCE_FOR_STAKING);
+        isDisabled || new BigNumber(totalAmount || '0').lt(MIN_ETH_AMOUNT_FOR_STAKING);
 
     return (
         <Flex>
             <Tooltip
                 content={
-                    <Translation
-                        id="TR_STAKE_MIN_AMOUNT_TOOLTIP"
-                        values={{
-                            amount: MIN_ETH_AMOUNT_FOR_STAKING.toString(),
-                            symbol: symbol.toUpperCase(),
-                        }}
-                    />
+                    is10PercentDisabled && (
+                        <Translation
+                            id="TR_STAKE_MIN_AMOUNT_TOOLTIP"
+                            values={{
+                                amount: MIN_ETH_AMOUNT_FOR_STAKING.toString(),
+                                symbol: symbol.toUpperCase(),
+                            }}
+                        />
+                    )
                 }
                 cursor="pointer"
-                disabled={!is10PercentDisabled}
             >
                 <TinyButton isDisabled={is10PercentDisabled} onClick={() => setRatioAmount(10)}>
                     10%
@@ -73,16 +73,17 @@ export const FormFractionButtons = ({
             </Tooltip>
             <Tooltip
                 content={
-                    <Translation
-                        id="TR_STAKE_MIN_AMOUNT_TOOLTIP"
-                        values={{
-                            amount: MIN_ETH_AMOUNT_FOR_STAKING.toString(),
-                            symbol: symbol.toUpperCase(),
-                        }}
-                    />
+                    is25PercentDisabled && (
+                        <Translation
+                            id="TR_STAKE_MIN_AMOUNT_TOOLTIP"
+                            values={{
+                                amount: MIN_ETH_AMOUNT_FOR_STAKING.toString(),
+                                symbol: symbol.toUpperCase(),
+                            }}
+                        />
+                    )
                 }
                 cursor="pointer"
-                disabled={!is25PercentDisabled}
             >
                 <TinyButton isDisabled={is25PercentDisabled} onClick={() => setRatioAmount(4)}>
                     25%
@@ -90,16 +91,17 @@ export const FormFractionButtons = ({
             </Tooltip>
             <Tooltip
                 content={
-                    <Translation
-                        id="TR_STAKE_MIN_AMOUNT_TOOLTIP"
-                        values={{
-                            amount: MIN_ETH_AMOUNT_FOR_STAKING.toString(),
-                            symbol: symbol.toUpperCase(),
-                        }}
-                    />
+                    is50PercentDisabled && (
+                        <Translation
+                            id="TR_STAKE_MIN_AMOUNT_TOOLTIP"
+                            values={{
+                                amount: MIN_ETH_AMOUNT_FOR_STAKING.toString(),
+                                symbol: symbol.toUpperCase(),
+                            }}
+                        />
+                    )
                 }
                 cursor="pointer"
-                disabled={!is50PercentDisabled}
             >
                 <TinyButton isDisabled={is50PercentDisabled} onClick={() => setRatioAmount(2)}>
                     50%
@@ -107,16 +109,17 @@ export const FormFractionButtons = ({
             </Tooltip>
             <Tooltip
                 content={
-                    <Translation
-                        id="TR_STAKE_MIN_AMOUNT_TOOLTIP"
-                        values={{
-                            amount: MIN_ETH_AMOUNT_FOR_STAKING.toString(),
-                            symbol: symbol.toUpperCase(),
-                        }}
-                    />
+                    isMaxDisabled && (
+                        <Translation
+                            id="TR_STAKE_MIN_AMOUNT_TOOLTIP"
+                            values={{
+                                amount: MIN_ETH_AMOUNT_FOR_STAKING.toString(),
+                                symbol: symbol.toUpperCase(),
+                            }}
+                        />
+                    )
                 }
                 cursor="pointer"
-                disabled={!is50PercentDisabled}
             >
                 <TinyButton isDisabled={isDisabled || isMaxDisabled} onClick={setMax}>
                     <Translation id="TR_STAKE_MAX" />
diff --git a/packages/suite/src/components/suite/FormattedCryptoAmount.tsx b/packages/suite/src/components/suite/FormattedCryptoAmount.tsx
index 779953111af..ba12cf3f3cb 100644
--- a/packages/suite/src/components/suite/FormattedCryptoAmount.tsx
+++ b/packages/suite/src/components/suite/FormattedCryptoAmount.tsx
@@ -1,16 +1,17 @@
 import styled from 'styled-components';
-import { HiddenPlaceholder, Sign } from 'src/components/suite';
-import { getNetworkOptional, NetworkSymbol } from '@suite-common/wallet-config';
-import { useSelector } from 'src/hooks/suite';
-import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
 
+import { getNetworkOptional, NetworkSymbol } from '@suite-common/wallet-config';
 import { SignValue } from '@suite-common/suite-types';
 import {
     formatCoinBalance,
     localizeNumber,
-    networkAmountToSatoshi,
+    networkAmountToSmallestUnit,
 } from '@suite-common/wallet-utils';
 import { isSignValuePositive } from '@suite-common/formatters';
+
+import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
+import { useSelector } from 'src/hooks/suite';
+import { HiddenPlaceholder, Sign } from 'src/components/suite';
 import { selectLanguage } from 'src/reducers/suite/suiteReducer';
 import { BlurUrls } from 'src/views/wallet/tokens/common/BlurUrls';
 
@@ -68,7 +69,10 @@ export const FormattedCryptoAmount = ({
 
     // convert to satoshis if needed
     if (isSatoshis) {
-        formattedValue = networkAmountToSatoshi(String(value), lowerCaseSymbol as NetworkSymbol);
+        formattedValue = networkAmountToSmallestUnit(
+            String(value),
+            lowerCaseSymbol as NetworkSymbol,
+        );
 
         formattedSymbol = isTestnet ? `sat ${symbol?.toUpperCase()}` : 'sat';
     }
diff --git a/packages/suite/src/components/suite/FormattedDateWithBullet.tsx b/packages/suite/src/components/suite/FormattedDateWithBullet.tsx
index aee1eeefdcf..5e60e967aad 100644
--- a/packages/suite/src/components/suite/FormattedDateWithBullet.tsx
+++ b/packages/suite/src/components/suite/FormattedDateWithBullet.tsx
@@ -5,13 +5,10 @@ import { FormattedDate, FormattedDateProps } from './FormattedDate';
 const Bullet = styled.span`
     margin-left: 0.5ch;
     margin-right: 0.5ch;
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
 `;
 
 const HourWrapper = styled.div<{ $timeLightColor?: boolean }>`
     display: inline-flex;
-    color: ${({ theme, $timeLightColor }) =>
-        $timeLightColor ? theme.legacy.TYPE_LIGHT_GREY : 'inherit'};
 `;
 
 const Timestamp = styled.span`
diff --git a/packages/suite/src/components/suite/FormattedNftAmount.tsx b/packages/suite/src/components/suite/FormattedNftAmount.tsx
index 4388c714ebf..771592ca1ef 100644
--- a/packages/suite/src/components/suite/FormattedNftAmount.tsx
+++ b/packages/suite/src/components/suite/FormattedNftAmount.tsx
@@ -3,12 +3,12 @@ import styled from 'styled-components';
 import { SignValue } from '@suite-common/suite-types';
 import { getNftTokenId } from '@suite-common/wallet-utils';
 import { TokenTransfer } from '@trezor/connect';
+import { variables } from '@trezor/components';
 
 import { HiddenPlaceholder, Sign } from 'src/components/suite';
 // importing directly, otherwise unit tests fail, seems to be a styled-components issue
 import { TrezorLink } from 'src/components/suite/TrezorLink';
 import { useSelector } from 'src/hooks/suite/useSelector';
-import { variables } from '@trezor/components';
 
 const Container = styled.div`
     max-width: 100%;
diff --git a/packages/suite/src/components/suite/HiddenPlaceholder.tsx b/packages/suite/src/components/suite/HiddenPlaceholder.tsx
index 19e5733eb25..5a62a264d31 100644
--- a/packages/suite/src/components/suite/HiddenPlaceholder.tsx
+++ b/packages/suite/src/components/suite/HiddenPlaceholder.tsx
@@ -1,14 +1,16 @@
 import { ReactNode, useLayoutEffect, useRef, useState } from 'react';
+
 import styled, { css } from 'styled-components';
+
+import { RedactNumbersContext } from '@suite-common/wallet-utils';
+
 import { useSelector } from 'src/hooks/suite';
 import { selectIsDiscreteModeActive } from 'src/reducers/wallet/settingsReducer';
-import { RedactNumbersContext } from '@suite-common/wallet-utils';
 
 type WrapperProps = {
     $intensity: number;
     $discreetMode: boolean;
     $minWidth?: number;
-    $disableKeepingWidth?: boolean;
 };
 
 const Wrapper = styled.span<WrapperProps>`
@@ -26,9 +28,8 @@ const Wrapper = styled.span<WrapperProps>`
             }
         `}
 
-    ${({ $minWidth, $disableKeepingWidth }: WrapperProps) =>
+    ${({ $minWidth }: WrapperProps) =>
         !!$minWidth &&
-        !$disableKeepingWidth &&
         css`
             display: inline-block;
             min-width: ${$minWidth}px;
@@ -95,14 +96,15 @@ export const HiddenPlaceholder = ({
         setWrapperMinWidth(undefined);
     };
 
+    const shouldEnforceMinWidth = discreetMode && !disableKeepingWidth;
+
     return (
         <Wrapper
             onMouseEnter={onMouseEnter}
             onMouseLeave={onMouseLeave}
             $discreetMode={discreetMode}
             $intensity={enforceIntensity !== undefined ? enforceIntensity : automaticIntensity}
-            $disableKeepingWidth={disableKeepingWidth}
-            $minWidth={wrapperMinWidth}
+            $minWidth={shouldEnforceMinWidth ? wrapperMinWidth : undefined}
             className={className}
             ref={ref}
             data-testid={dataTestId}
diff --git a/packages/suite/src/components/suite/HomescreenGallery.tsx b/packages/suite/src/components/suite/HomescreenGallery.tsx
index eba9da540a0..f5b3c5bc31c 100644
--- a/packages/suite/src/components/suite/HomescreenGallery.tsx
+++ b/packages/suite/src/components/suite/HomescreenGallery.tsx
@@ -1,13 +1,13 @@
 import styled from 'styled-components';
-import { resolveStaticPath } from '@suite-common/suite-utils';
+
+import { getNarrowedDeviceModelInternal, resolveStaticPath } from '@suite-common/suite-utils';
+import { DeviceModelInternal } from '@trezor/connect';
+import { hasBitcoinOnlyFirmware } from '@trezor/device-utils';
 
 import { getHomescreens } from 'src/constants/suite/homescreens';
 import { applySettings } from 'src/actions/settings/deviceSettingsActions';
 import { imagePathToHex } from 'src/utils/suite/homescreen';
 import { useDevice, useDispatch } from 'src/hooks/suite';
-import { DeviceModelInternal } from '@trezor/connect';
-
-import { hasBitcoinOnlyFirmware } from '@trezor/device-utils';
 
 type HomescreensType = ReturnType<typeof getHomescreens>;
 type AnyImageName = HomescreensType[keyof HomescreensType][number];
@@ -53,7 +53,7 @@ export const HomescreenGallery = ({ onConfirm }: HomescreenGalleryProps) => {
         // original image is the default image already available in device, set it by empty string
         const isOriginalImage =
             image ===
-            `original_${(deviceModelInternal === DeviceModelInternal.T2B1 ? DeviceModelInternal.T3B1 : deviceModelInternal).toLowerCase()}`;
+            `original_${getNarrowedDeviceModelInternal(deviceModelInternal).toLowerCase()}`;
 
         const hex = isOriginalImage ? '' : await imagePathToHex(imagePath, deviceModelInternal);
 
diff --git a/packages/suite/src/components/suite/HoverAnimation.tsx b/packages/suite/src/components/suite/HoverAnimation.tsx
index 4f593a02cb0..e4d1b79e166 100644
--- a/packages/suite/src/components/suite/HoverAnimation.tsx
+++ b/packages/suite/src/components/suite/HoverAnimation.tsx
@@ -1,5 +1,7 @@
 import { ReactNode } from 'react';
+
 import styled, { css } from 'styled-components';
+
 import { borders } from '@trezor/theme';
 
 const Wrapper = styled.div<{ $size?: string; $isHoverable?: boolean }>`
diff --git a/packages/suite/src/components/suite/InstructionStep.tsx b/packages/suite/src/components/suite/InstructionStep.tsx
index 34fc9698330..36c4476d417 100644
--- a/packages/suite/src/components/suite/InstructionStep.tsx
+++ b/packages/suite/src/components/suite/InstructionStep.tsx
@@ -1,5 +1,7 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
 
 const Container = styled.div`
diff --git a/packages/suite/src/components/suite/LearnMoreButton.tsx b/packages/suite/src/components/suite/LearnMoreButton.tsx
index b385c653f98..43caa0b64e1 100644
--- a/packages/suite/src/components/suite/LearnMoreButton.tsx
+++ b/packages/suite/src/components/suite/LearnMoreButton.tsx
@@ -1,9 +1,10 @@
 import { ReactNode } from 'react';
 
 import { Button, ButtonProps } from '@trezor/components';
+import { Url } from '@trezor/urls';
 
 import { Translation } from 'src/components/suite';
-import { Url } from '@trezor/urls';
+
 import { useExternalLink } from '../../hooks/suite';
 
 interface LearnMoreButtonProps extends Omit<ButtonProps, 'children'> {
diff --git a/packages/suite/src/components/suite/Loading.tsx b/packages/suite/src/components/suite/Loading.tsx
index d1705b10005..2b237e01254 100644
--- a/packages/suite/src/components/suite/Loading.tsx
+++ b/packages/suite/src/components/suite/Loading.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { Spinner } from '@trezor/components';
 
 const LoaderWrapper = styled.div`
diff --git a/packages/suite/src/components/suite/Metadata.tsx b/packages/suite/src/components/suite/Metadata.tsx
index 333b593a183..85b1a43a0f0 100644
--- a/packages/suite/src/components/suite/Metadata.tsx
+++ b/packages/suite/src/components/suite/Metadata.tsx
@@ -1,6 +1,8 @@
-import { SUITE_URL } from '@trezor/urls';
 import { Helmet } from 'react-helmet-async';
 import { useIntl } from 'react-intl';
+
+import { SUITE_URL } from '@trezor/urls';
+
 import messages from 'src/support/messages';
 
 type MetadataProps = {
diff --git a/packages/suite/src/components/suite/NotificationCard.tsx b/packages/suite/src/components/suite/NotificationCard.tsx
index 1f5daef2324..5e6cb4001ca 100644
--- a/packages/suite/src/components/suite/NotificationCard.tsx
+++ b/packages/suite/src/components/suite/NotificationCard.tsx
@@ -1,4 +1,5 @@
 import { ReactNode } from 'react';
+
 import styled, { DefaultTheme, useTheme } from 'styled-components';
 
 import {
@@ -12,9 +13,10 @@ import {
     Icon,
 } from '@trezor/components';
 import { Elevation, borders, spacingsPx, typography } from '@trezor/theme';
-import { TrezorLink } from './TrezorLink';
 import { UIVariant } from '@trezor/components/src/config/types';
 
+import { TrezorLink } from './TrezorLink';
+
 // TODO: move to components
 
 type ButtonType = ButtonProps & { href?: string };
diff --git a/packages/suite/src/components/suite/NumberInput.tsx b/packages/suite/src/components/suite/NumberInput.tsx
index b44df569929..5e0ad5bb033 100644
--- a/packages/suite/src/components/suite/NumberInput.tsx
+++ b/packages/suite/src/components/suite/NumberInput.tsx
@@ -7,15 +7,15 @@ import {
     ClipboardEvent,
     FormEvent,
 } from 'react';
-
 import { Control, FieldValues, useController, UseControllerProps } from 'react-hook-form';
-import { BigNumber } from '@trezor/utils/src/bigNumber';
 
+import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { Input, InputProps } from '@trezor/components';
 import { localizeNumber } from '@suite-common/wallet-utils';
+import { getLocaleSeparators } from '@trezor/utils';
+
 import { Locale } from 'src/config/suite/languages';
 import { useSelector } from 'src/hooks/suite';
-import { getLocaleSeparators } from '@trezor/utils';
 import { selectLanguage } from 'src/reducers/suite/suiteReducer';
 
 const isValidDecimalString = (value: string) => /^([^.]*)\.[^.]+$/.test(value);
@@ -64,13 +64,15 @@ const cleanValueString = (value: string, locale: Locale) => {
 
 const DECIMAL_SEPARATORS = [',', '.'];
 
-export interface NumberInputProps<TFieldValues extends FieldValues>
-    extends Omit<InputProps, 'defaultValue' | 'name' | 'onChange'>,
-        Omit<UseControllerProps<TFieldValues>, 'rules'> {
-    decimalScale?: number;
-    onChange?: (value: string) => void;
-    rules?: UseControllerProps['rules'];
-}
+export type NumberInputProps<TFieldValues extends FieldValues> = Omit<
+    InputProps,
+    'defaultValue' | 'name' | 'onChange'
+> &
+    Omit<UseControllerProps<TFieldValues>, 'rules'> & {
+        decimalScale?: number;
+        onChange?: (value: string) => void;
+        rules?: UseControllerProps['rules'];
+    };
 
 export const NumberInput = <TFieldValues extends FieldValues>({
     name,
diff --git a/packages/suite/src/components/suite/PinMatrix/PinInput/InputPin.tsx b/packages/suite/src/components/suite/PinMatrix/PinInput/InputPin.tsx
index d2b09b649e3..53c7e459188 100644
--- a/packages/suite/src/components/suite/PinMatrix/PinInput/InputPin.tsx
+++ b/packages/suite/src/components/suite/PinMatrix/PinInput/InputPin.tsx
@@ -1,5 +1,7 @@
 import { MouseEvent } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
 import { variables, Icon, Input } from '@trezor/components';
 import { spacingsPx } from '@trezor/theme';
 
diff --git a/packages/suite/src/components/suite/PinMatrix/PinInput/PinInput.tsx b/packages/suite/src/components/suite/PinMatrix/PinInput/PinInput.tsx
index 4bfb6f551d2..6617b7a7e42 100644
--- a/packages/suite/src/components/suite/PinMatrix/PinInput/PinInput.tsx
+++ b/packages/suite/src/components/suite/PinMatrix/PinInput/PinInput.tsx
@@ -1,10 +1,13 @@
 import { useCallback, useEffect, useState } from 'react';
+
 import styled, { css } from 'styled-components';
 
 import { formInputsMaxLength } from '@suite-common/validators';
 import { Button, KEYBOARD_CODE, PinButton } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { usePin } from 'src/hooks/suite/usePinModal';
+
 import { InputPin } from './InputPin';
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/components/suite/PinMatrix/PinMatrix.tsx b/packages/suite/src/components/suite/PinMatrix/PinMatrix.tsx
index 525ed9f6a9f..38a4dafeecc 100644
--- a/packages/suite/src/components/suite/PinMatrix/PinMatrix.tsx
+++ b/packages/suite/src/components/suite/PinMatrix/PinMatrix.tsx
@@ -1,12 +1,16 @@
 import { useState, useEffect } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
 import { DeviceModelInternal } from '@trezor/connect';
 import { HELP_CENTER_PIN_URL } from '@trezor/urls';
 import { variables } from '@trezor/components';
+
 import { DeviceMatrixExplanation, Translation, TrezorLink } from 'src/components/suite';
 import { TrezorDevice } from 'src/types/suite';
 import { onPinSubmit } from 'src/actions/suite/modalActions';
 import { useDispatch } from 'src/hooks/suite';
+
 import { PinInput } from './PinInput/PinInput';
 
 export const PIN_MATRIX_MAX_WIDTH = '316px';
diff --git a/packages/suite/src/components/suite/Preloader/InitialLoading.tsx b/packages/suite/src/components/suite/Preloader/InitialLoading.tsx
index 64698f7d734..3ee1e5aaadc 100644
--- a/packages/suite/src/components/suite/Preloader/InitialLoading.tsx
+++ b/packages/suite/src/components/suite/Preloader/InitialLoading.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
+
 import styled from 'styled-components';
 
 import { Loading } from 'src/components/suite';
diff --git a/packages/suite/src/components/suite/Preloader/Preloader.tsx b/packages/suite/src/components/suite/Preloader/Preloader.tsx
index 476884eb5e9..235ff32a8a2 100644
--- a/packages/suite/src/components/suite/Preloader/Preloader.tsx
+++ b/packages/suite/src/components/suite/Preloader/Preloader.tsx
@@ -1,4 +1,9 @@
-import { FC, useEffect } from 'react';
+import { FC, useEffect, PropsWithChildren } from 'react';
+
+import {
+    selectDevice,
+    selectIsFirmwareAuthenticityCheckDismissed,
+} from '@suite-common/wallet-core';
 
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { Onboarding } from 'src/views/onboarding';
@@ -6,25 +11,25 @@ import { ErrorPage } from 'src/views/suite/ErrorPage';
 import { useGuideKeyboard } from 'src/hooks/guide';
 import { init } from 'src/actions/suite/initAction';
 import type { AppState } from 'src/types/suite';
-import { SuiteLayout } from '../layouts/SuiteLayout/SuiteLayout';
-import { InitialLoading } from './InitialLoading';
-import { DatabaseUpgradeModal } from './DatabaseUpgradeModal';
 import {
     selectPrerequisite,
     selectIsLoggedOut,
     selectSuiteFlags,
-    selectIsFirmwareRevisionCheckEnabledAndFailed,
+    selectIsFirmwareAuthenticityCheckEnabledAndFailed,
 } from 'src/reducers/suite/suiteReducer';
 import { SuiteStart } from 'src/views/start/SuiteStart';
+import { ViewOnlyPromo } from 'src/views/view-only/ViewOnlyPromo';
+
+import { SuiteLayout } from '../layouts/SuiteLayout/SuiteLayout';
+import { InitialLoading } from './InitialLoading';
+import { DatabaseUpgradeModal } from './DatabaseUpgradeModal';
 import { PrerequisitesGuide } from '../PrerequisitesGuide/PrerequisitesGuide';
 import { LoggedOutLayout } from '../layouts/LoggedOutLayout';
 import { WelcomeLayout } from '../layouts/WelcomeLayout/WelcomeLayout';
-import { ViewOnlyPromo } from 'src/views/view-only/ViewOnlyPromo';
-import { selectDevice, selectIsFirmwareRevisionCheckDismissed } from '@suite-common/wallet-core';
 import { DeviceCompromised } from '../SecurityCheck/DeviceCompromised';
 import { RouterAppWithParams } from '../../../constants/suite/routes';
 
-const ROUTES_TO_SKIP_REVISION_CHECK: RouterAppWithParams['app'][] = [
+const ROUTES_TO_SKIP_FIRMWARE_CHECK: RouterAppWithParams['app'][] = [
     'settings',
     'firmware',
     'firmware-type',
@@ -42,13 +47,9 @@ const getFullscreenApp = (route: AppState['router']['route']): FC | undefined =>
     }
 };
 
-interface PreloaderProps {
-    children: React.ReactNode;
-}
-
 // Preloader is a top level wrapper used in _app.tsx.
 // Decides which content should be displayed basing on route and prerequisites.
-export const Preloader = ({ children }: PreloaderProps) => {
+export const Preloader = ({ children }: PropsWithChildren) => {
     const lifecycle = useSelector(state => state.suite.lifecycle);
     const transport = useSelector(state => state.suite.transport);
     const router = useSelector(state => state.router);
@@ -56,8 +57,10 @@ export const Preloader = ({ children }: PreloaderProps) => {
     const isLoggedOut = useSelector(selectIsLoggedOut);
     const selectedDevice = useSelector(selectDevice);
     const { initialRun, viewOnlyPromoClosed } = useSelector(selectSuiteFlags);
-    const isRevisionCheckFailed = useSelector(selectIsFirmwareRevisionCheckEnabledAndFailed);
-    const isFirmwareRevisionCheckDismissed = useSelector(selectIsFirmwareRevisionCheckDismissed);
+    const isFirmwareCheckFailed = useSelector(selectIsFirmwareAuthenticityCheckEnabledAndFailed);
+    const isFirmwareAuthenticityCheckDismissed = useSelector(
+        selectIsFirmwareAuthenticityCheckDismissed,
+    );
 
     const dispatch = useDispatch();
 
@@ -83,9 +86,9 @@ export const Preloader = ({ children }: PreloaderProps) => {
 
     if (
         (router.route?.app === undefined ||
-            !ROUTES_TO_SKIP_REVISION_CHECK.includes(router.route?.app)) &&
-        !isFirmwareRevisionCheckDismissed &&
-        isRevisionCheckFailed
+            !ROUTES_TO_SKIP_FIRMWARE_CHECK.includes(router.route?.app)) &&
+        !isFirmwareAuthenticityCheckDismissed &&
+        isFirmwareCheckFailed
     ) {
         return <DeviceCompromised />;
     }
diff --git a/packages/suite/src/components/suite/Preloader/__tests__/Preloader.test.tsx b/packages/suite/src/components/suite/Preloader/__tests__/Preloader.test.tsx
index 1561665e937..6704decb8e0 100644
--- a/packages/suite/src/components/suite/Preloader/__tests__/Preloader.test.tsx
+++ b/packages/suite/src/components/suite/Preloader/__tests__/Preloader.test.tsx
@@ -1,11 +1,11 @@
 import * as envUtils from '@trezor/env-utils';
+import { DeepPartial } from '@trezor/type-utils';
 
 import { configureStore } from 'src/support/tests/configureStore';
 import { renderWithProviders, findByTestId } from 'src/support/tests/hooksHelper';
 
 import { Preloader } from '../Preloader';
 import { AppState } from '../../../../reducers/store';
-import { DeepPartial } from '@trezor/type-utils';
 
 // render only Translation.id in data-test attribute
 jest.mock('src/components/suite/Translation', () => ({
@@ -20,6 +20,18 @@ jest.mock('cross-fetch', () => ({
     default: () => Promise.resolve({ ok: false }),
 }));
 
+// mock desktopApi
+jest.mock('@trezor/suite-desktop-api', () => ({
+    __esModule: true,
+    desktopApi: {
+        getBridgeStatus: () =>
+            Promise.resolve({ success: true, payload: { service: true, process: true } }),
+        getBridgeSettings: () => Promise.resolve({ success: true, payload: { enabled: true } }),
+        on: (_event: string, _cb: any) => {},
+        removeAllListeners: (_event: string) => {},
+    },
+}));
+
 // jest.mock('@firmware-components/ReconnectDevicePrompt', () => ({
 //     __esModule: true, // export as module
 //     default: ({ children }: any) => <div data-testid="box">{children}</div>,
@@ -40,7 +52,7 @@ jest.mock('cross-fetch', () => ({
 //     default: () => ['ref', { height: 0 }],
 // }));
 
-export const getInitialState = ({ suite, router, device }: any = {}) => ({
+const getInitialState = ({ suite, router, device }: any = {}) => ({
     suite: {
         lifecycle: {
             status: 'ready',
@@ -189,7 +201,10 @@ describe('Preloader component', () => {
 
     it('Unacquired device', () => {
         const device: DeepPartial<AppState['device']> = {
-            selectedDevice: { type: 'unacquired' },
+            selectedDevice: {
+                transportSessionOwner: 'foo',
+                type: 'unacquired',
+            },
         };
 
         const store = initStore(
@@ -210,7 +225,11 @@ describe('Preloader component', () => {
 
     it('Unreadable device: webusb HID', () => {
         const device: DeepPartial<AppState['device']> = {
-            selectedDevice: { type: 'unreadable', error: 'LIBUSB_ERROR_ACCESS' },
+            selectedDevice: {
+                type: 'unreadable',
+                error: 'unable to open device',
+                transportDescriptorType: 0,
+            },
         };
 
         const store = initStore(
@@ -224,7 +243,7 @@ describe('Preloader component', () => {
         const { unmount } = renderWithProviders(store, <Index app={store.getState().router.app} />);
 
         expect(findByTestId('@connect-device-prompt')).not.toBeNull();
-        expect(findByTestId('@connect-device-prompt/unreadable-hid')).not.toBeNull();
+        expect(findByTestId('@connect-device-prompt/unreadable-unknown')).not.toBeNull();
 
         unmount();
     });
@@ -233,7 +252,10 @@ describe('Preloader component', () => {
         jest.spyOn(envUtils, 'isLinux').mockImplementation(() => true);
 
         const device: DeepPartial<AppState['device']> = {
-            selectedDevice: { type: 'unreadable', error: 'LIBUSB_ERROR_ACCESS' },
+            selectedDevice: {
+                type: 'unreadable',
+                error: 'LIBUSB_ERROR_ACCESS',
+            },
         };
 
         const store = initStore(
@@ -256,7 +278,10 @@ describe('Preloader component', () => {
         jest.spyOn(envUtils, 'isLinux').mockImplementation(() => false);
 
         const device: DeepPartial<AppState['device']> = {
-            selectedDevice: { type: 'unreadable', error: 'LIBUSB_ERROR_ACCESS' },
+            selectedDevice: {
+                type: 'unreadable',
+                error: 'LIBUSB_ERROR_ACCESS',
+            },
         };
 
         const store = initStore(
@@ -277,7 +302,10 @@ describe('Preloader component', () => {
 
     it('Unreadable device: unknown error', () => {
         const device: DeepPartial<AppState['device']> = {
-            selectedDevice: { type: 'unreadable', error: 'Unexpected error' },
+            selectedDevice: {
+                type: 'unreadable',
+                error: 'Unexpected error',
+            },
         };
 
         const store = initStore(
@@ -298,7 +326,10 @@ describe('Preloader component', () => {
 
     it('Unknown device (should never happen)', () => {
         const device: DeepPartial<AppState['device']> = {
-            selectedDevice: { features: undefined },
+            selectedDevice: {
+                transportSessionOwner: 'foo',
+                features: undefined,
+            },
         };
 
         const store = initStore(
@@ -319,7 +350,10 @@ describe('Preloader component', () => {
 
     it('Seedless device', () => {
         const device: DeepPartial<AppState['device']> = {
-            selectedDevice: { mode: 'seedless', features: {} },
+            selectedDevice: {
+                mode: 'seedless',
+                features: {},
+            },
         };
 
         const store = initStore(
@@ -365,7 +399,10 @@ describe('Preloader component', () => {
 
     it('Not initialized device', () => {
         const device: DeepPartial<AppState['device']> = {
-            selectedDevice: { mode: 'initialize', features: {} },
+            selectedDevice: {
+                mode: 'initialize',
+                features: {},
+            },
         };
 
         const store = initStore(
@@ -387,7 +424,10 @@ describe('Preloader component', () => {
 
     it('Bootloader device with installed firmware', () => {
         const device: DeepPartial<AppState['device']> = {
-            selectedDevice: { mode: 'bootloader', features: { firmware_present: true } },
+            selectedDevice: {
+                mode: 'bootloader',
+                features: { firmware_present: true },
+            },
         };
 
         const store = initStore(
@@ -409,7 +449,10 @@ describe('Preloader component', () => {
 
     it('Bootloader device without firmware', () => {
         const device: DeepPartial<AppState['device']> = {
-            selectedDevice: { mode: 'bootloader', features: { firmware_present: false } },
+            selectedDevice: {
+                mode: 'bootloader',
+                features: { firmware_present: false },
+            },
         };
 
         const store = initStore(
@@ -431,7 +474,10 @@ describe('Preloader component', () => {
 
     it('Required FW update device', () => {
         const device: DeepPartial<AppState['device']> = {
-            selectedDevice: { firmware: 'required', features: {} },
+            selectedDevice: {
+                firmware: 'required',
+                features: {},
+            },
         };
 
         const store = initStore(
diff --git a/packages/suite/src/components/suite/PrerequisitesGuide/DeviceAcquire.tsx b/packages/suite/src/components/suite/PrerequisitesGuide/DeviceAcquire.tsx
index dec9539e4dd..5d1e53be6bb 100644
--- a/packages/suite/src/components/suite/PrerequisitesGuide/DeviceAcquire.tsx
+++ b/packages/suite/src/components/suite/PrerequisitesGuide/DeviceAcquire.tsx
@@ -6,9 +6,10 @@ import { isDesktop } from '@trezor/env-utils';
 
 import { Translation, TroubleshootingTips } from 'src/components/suite';
 import { useDevice, useDispatch } from 'src/hooks/suite';
+import { TROUBLESHOOTING_TIP_RECONNECT } from 'src/components/suite/troubleshooting/tips';
 
 export const DeviceAcquire = () => {
-    const { isLocked } = useDevice();
+    const { isLocked, device } = useDevice();
     const dispatch = useDispatch();
 
     const isDeviceLocked = isLocked();
@@ -26,31 +27,34 @@ export const DeviceAcquire = () => {
 
     const tips = [
         {
-            key: 'device-acquire',
-            heading: <Translation id="TR_TROUBLESHOOTING_CLOSE_TABS" />,
-            description: (
+            key: 'device-used-elsewhere',
+            heading: <Translation id="TR_DEVICE_CONNECTED_UNACQUIRED" />,
+            description: device?.transportSessionOwner ? (
                 <Translation
-                    id={
-                        isDesktop()
-                            ? 'TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION_DESKTOP'
-                            : 'TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION'
-                    }
+                    id="TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION"
+                    values={{
+                        transportSessionOwner: device.transportSessionOwner,
+                    }}
                 />
+            ) : (
+                // legacy bridge does not share transportSessionOwner information
+                <Translation id="TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION_UNKNOWN_APP" />
             ),
         },
         {
-            key: 'device-reconnect',
-            heading: <Translation id="TR_RECONNECT_YOUR_DEVICE" />,
+            key: 'device-acquire',
+            heading: <Translation id="TR_TROUBLESHOOTING_CLOSE_TABS" />,
             description: (
                 <Translation
                     id={
                         isDesktop()
-                            ? 'TR_RECONNECT_DEVICE_DESCRIPTION_DESKTOP'
-                            : 'TR_RECONNECT_DEVICE_DESCRIPTION'
+                            ? 'TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION_DESKTOP'
+                            : 'TR_TROUBLESHOOTING_CLOSE_TABS_DESCRIPTION'
                     }
                 />
             ),
         },
+        TROUBLESHOOTING_TIP_RECONNECT,
     ];
 
     return (
diff --git a/packages/suite/src/components/suite/PrerequisitesGuide/DeviceInitialize.tsx b/packages/suite/src/components/suite/PrerequisitesGuide/DeviceInitialize.tsx
index a9a34b71a6d..1d96e2cc70b 100644
--- a/packages/suite/src/components/suite/PrerequisitesGuide/DeviceInitialize.tsx
+++ b/packages/suite/src/components/suite/PrerequisitesGuide/DeviceInitialize.tsx
@@ -1,5 +1,7 @@
 import { MouseEvent } from 'react';
+
 import { Button } from '@trezor/components';
+
 import { Translation, TroubleshootingTips } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
diff --git a/packages/suite/src/components/suite/PrerequisitesGuide/DeviceNoFirmware.tsx b/packages/suite/src/components/suite/PrerequisitesGuide/DeviceNoFirmware.tsx
index 23a02c05101..a0ec44ad5a6 100644
--- a/packages/suite/src/components/suite/PrerequisitesGuide/DeviceNoFirmware.tsx
+++ b/packages/suite/src/components/suite/PrerequisitesGuide/DeviceNoFirmware.tsx
@@ -1,4 +1,5 @@
 import { MouseEventHandler } from 'react';
+
 import { Button } from '@trezor/components';
 
 import { Translation, TroubleshootingTips } from 'src/components/suite';
diff --git a/packages/suite/src/components/suite/PrerequisitesGuide/DeviceRecoveryMode.tsx b/packages/suite/src/components/suite/PrerequisitesGuide/DeviceRecoveryMode.tsx
index 9d5e01a1d95..b059028093c 100644
--- a/packages/suite/src/components/suite/PrerequisitesGuide/DeviceRecoveryMode.tsx
+++ b/packages/suite/src/components/suite/PrerequisitesGuide/DeviceRecoveryMode.tsx
@@ -1,5 +1,7 @@
 import { MouseEventHandler } from 'react';
+
 import { Button } from '@trezor/components';
+
 import { Translation, TroubleshootingTips } from 'src/components/suite';
 import { rerun } from 'src/actions/recovery/recoveryActions';
 import { useDevice, useDispatch, useSelector } from 'src/hooks/suite';
diff --git a/packages/suite/src/components/suite/PrerequisitesGuide/DeviceUnreadable.tsx b/packages/suite/src/components/suite/PrerequisitesGuide/DeviceUnreadable.tsx
index 6bdfddd9b84..f406ab225de 100644
--- a/packages/suite/src/components/suite/PrerequisitesGuide/DeviceUnreadable.tsx
+++ b/packages/suite/src/components/suite/PrerequisitesGuide/DeviceUnreadable.tsx
@@ -1,17 +1,20 @@
 import { useState, MouseEvent } from 'react';
+
 import { Button } from '@trezor/components';
 import { desktopApi } from '@trezor/suite-desktop-api';
 import { isDesktop, isLinux } from '@trezor/env-utils';
+import { notificationsActions } from '@suite-common/toast-notifications';
+import { selectDevice } from '@suite-common/wallet-core';
+
 import { Translation, TroubleshootingTips, UdevDownload } from 'src/components/suite';
 import {
-    TROUBLESHOOTING_TIP_BRIDGE_STATUS,
     TROUBLESHOOTING_TIP_SUITE_DESKTOP,
-    TROUBLESHOOTING_TIP_CABLE,
-    TROUBLESHOOTING_TIP_USB,
     TROUBLESHOOTING_TIP_DIFFERENT_COMPUTER,
+    TROUBLESHOOTING_TIP_UNREADABLE_HID,
+    TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE,
+    TROUBLESHOOTING_TIP_RECONNECT,
 } from 'src/components/suite/troubleshooting/tips';
-import { useDispatch } from 'src/hooks/suite';
-import { notificationsActions } from '@suite-common/toast-notifications';
+import { useSelector, useDispatch } from 'src/hooks/suite';
 import type { TrezorDevice } from 'src/types/suite';
 
 // linux web
@@ -99,28 +102,49 @@ const UdevDesktop = () => {
 
 interface DeviceUnreadableProps {
     device?: TrezorDevice; // this should be actually UnreadableDevice, but it is not worth type casting
-    isWebUsbTransport: boolean;
 }
 
-// We don't really know what happened, show some generic help and provide link to contact a support
-export const DeviceUnreadable = ({ device, isWebUsbTransport }: DeviceUnreadableProps) => {
-    if (isWebUsbTransport) {
-        // only install bridge will help (webusb + HID device)
-        return (
-            <TroubleshootingTips
-                label={<Translation id="TR_TROUBLESHOOTING_UNREADABLE_WEBUSB" />}
-                items={[TROUBLESHOOTING_TIP_BRIDGE_STATUS, TROUBLESHOOTING_TIP_SUITE_DESKTOP]}
-                offerWebUsb
-                data-testid="@connect-device-prompt/unreadable-hid"
-            />
-        );
-    }
+/**
+ * Device was detected but @trezor/connect was not able to communicate with it. Reasons could be:
+ * - initial read from device (GetFeatures) failed because of some de-synchronization or clash with another application
+ * - device can't be communicated with using currently used transport (eg. hid / node bridge + webusb)
+ * - missing udev rule on linux
+ */
+export const DeviceUnreadable = ({ device }: DeviceUnreadableProps) => {
+    const selectedDevice = useSelector(selectDevice);
 
     // this error is dispatched by trezord when udev rules are missing
     if (isLinux() && device?.error === 'LIBUSB_ERROR_ACCESS') {
         return <> {isDesktop() ? <UdevDesktop /> : <UdevWeb />}</>;
     }
 
+    // generic troubleshooting tips
+    const items = [
+        // closing other apps and reloading should be the first step. Either we might have made a bug and let two apps to talk
+        // to device at the same time or there might be another application in the wild not really playing according to our rules
+        TROUBLESHOOTING_TIP_RECONNECT,
+        // if on web - try installing desktop. this takes you to using bridge which should be more powerful than WebUSB
+        TROUBLESHOOTING_TIP_SUITE_DESKTOP,
+        // unfortunately we have seen reports that even old bridge might not be enough for some Windows users. So the only chance
+        // is using another computer, or maybe it would be better to say another OS
+        TROUBLESHOOTING_TIP_DIFFERENT_COMPUTER,
+    ];
+
+    // only for unreadable HID devices
+    if (
+        // model 1 hid normal mode
+        selectedDevice?.transportDescriptorType === 0 ||
+        // model 1 webusb or hid bootloader mode
+        selectedDevice?.transportDescriptorType === 2
+    ) {
+        // If even this did not work, go to support or knowledge base
+        // 'If the last time you updated your device firmware was in 2019 and earlier please follow instructions in <a>the knowledge base</a>',
+        items.push(TROUBLESHOOTING_TIP_UNREADABLE_HID);
+        // you might have a very old device which is no longer supported current bridge
+        // if on desktop - try toggling between the 2 bridges we have available
+        items.push(TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE);
+    }
+
     return (
         <TroubleshootingTips
             label={
@@ -129,12 +153,7 @@ export const DeviceUnreadable = ({ device, isWebUsbTransport }: DeviceUnreadable
                     values={{ error: device?.error }}
                 />
             }
-            items={[
-                TROUBLESHOOTING_TIP_CABLE,
-                TROUBLESHOOTING_TIP_USB,
-                TROUBLESHOOTING_TIP_DIFFERENT_COMPUTER,
-            ]}
-            offerWebUsb={isWebUsbTransport}
+            items={items}
             data-testid="@connect-device-prompt/unreadable-unknown"
         />
     );
diff --git a/packages/suite/src/components/suite/PrerequisitesGuide/DeviceUpdateRequired.tsx b/packages/suite/src/components/suite/PrerequisitesGuide/DeviceUpdateRequired.tsx
index d2a079630b4..166a2405940 100644
--- a/packages/suite/src/components/suite/PrerequisitesGuide/DeviceUpdateRequired.tsx
+++ b/packages/suite/src/components/suite/PrerequisitesGuide/DeviceUpdateRequired.tsx
@@ -1,4 +1,5 @@
 import { MouseEventHandler } from 'react';
+
 import { Button } from '@trezor/components';
 
 import { Translation, TroubleshootingTips } from 'src/components/suite';
diff --git a/packages/suite/src/components/suite/PrerequisitesGuide/PrerequisitesGuide.tsx b/packages/suite/src/components/suite/PrerequisitesGuide/PrerequisitesGuide.tsx
index 799e663cd56..93e33acedf2 100644
--- a/packages/suite/src/components/suite/PrerequisitesGuide/PrerequisitesGuide.tsx
+++ b/packages/suite/src/components/suite/PrerequisitesGuide/PrerequisitesGuide.tsx
@@ -4,12 +4,14 @@ import styled from 'styled-components';
 import { motion } from 'framer-motion';
 
 import { getStatus, deviceNeedsAttention } from '@suite-common/suite-utils';
-import { motionEasing } from '@trezor/components';
-import { selectDevicesCount, selectDevice } from '@suite-common/wallet-core';
+import { Button, motionEasing } from '@trezor/components';
+import { selectDevices, selectDevice } from '@suite-common/wallet-core';
 
-import { ConnectDevicePrompt } from 'src/components/suite';
+import { ConnectDevicePrompt, Translation } from 'src/components/suite';
 import { isWebUsb } from 'src/utils/suite/transport';
-import { useSelector } from 'src/hooks/suite';
+import { useDispatch, useSelector } from 'src/hooks/suite';
+import { selectPrerequisite } from 'src/reducers/suite/suiteReducer';
+import { goto } from 'src/actions/suite/routerActions';
 
 import { Transport } from './Transport';
 import { DeviceConnect } from './DeviceConnect';
@@ -23,7 +25,6 @@ import { DeviceBootloader } from './DeviceBootloader';
 import { DeviceNoFirmware } from './DeviceNoFirmware';
 import { DeviceUpdateRequired } from './DeviceUpdateRequired';
 import { DeviceDisconnectRequired } from './DeviceDisconnectRequired';
-import { selectPrerequisite } from 'src/reducers/suite/suiteReducer';
 import { MultiShareBackupInProgress } from './MultiShareBackupInProgress';
 
 const Wrapper = styled.div`
@@ -35,6 +36,11 @@ const Wrapper = styled.div`
 
 const TipsContainer = styled(motion.div)`
     display: flex;
+    margin-top: 60px;
+`;
+
+const ButtonWrapper = styled.div`
+    margin-top: 30px;
 `;
 
 interface PrerequisitesGuideProps {
@@ -42,8 +48,10 @@ interface PrerequisitesGuideProps {
 }
 
 export const PrerequisitesGuide = ({ allowSwitchDevice }: PrerequisitesGuideProps) => {
+    const dispatch = useDispatch();
     const device = useSelector(selectDevice);
-    const devices = useSelector(selectDevicesCount);
+    const devices = useSelector(selectDevices);
+    const connectedDevicesCount = devices.filter(d => d.connected === true).length;
     const transport = useSelector(state => state.suite.transport);
     const prerequisite = useSelector(selectPrerequisite);
 
@@ -61,9 +69,7 @@ export const PrerequisitesGuide = ({ allowSwitchDevice }: PrerequisitesGuideProp
                 case 'device-unacquired':
                     return <DeviceAcquire />;
                 case 'device-unreadable':
-                    return (
-                        <DeviceUnreadable device={device} isWebUsbTransport={isWebUsbTransport} />
-                    );
+                    return <DeviceUnreadable device={device} />;
                 case 'device-unknown':
                     return <DeviceUnknown />;
                 case 'device-seedless':
@@ -88,6 +94,9 @@ export const PrerequisitesGuide = ({ allowSwitchDevice }: PrerequisitesGuideProp
         [prerequisite, isWebUsbTransport, device],
     );
 
+    const handleSwitchDeviceClick = () =>
+        dispatch(goto('suite-switch-device', { params: { cancelable: true } }));
+
     return (
         <Wrapper>
             <ConnectDevicePrompt
@@ -96,10 +105,17 @@ export const PrerequisitesGuide = ({ allowSwitchDevice }: PrerequisitesGuideProp
                     !!(device && deviceNeedsAttention(getStatus(device))) ||
                     prerequisite === 'transport-bridge'
                 }
-                allowSwitchDevice={allowSwitchDevice && devices > 1}
                 prerequisite={prerequisite}
             />
 
+            {allowSwitchDevice && connectedDevicesCount > 1 && (
+                <ButtonWrapper>
+                    <Button variant="tertiary" onClick={handleSwitchDeviceClick}>
+                        <Translation id="TR_SWITCH_DEVICE" />
+                    </Button>
+                </ButtonWrapper>
+            )}
+
             <TipsContainer
                 initial={{ opacity: 0 }}
                 animate={{ opacity: 1 }}
diff --git a/packages/suite/src/components/suite/PrerequisitesGuide/Transport.tsx b/packages/suite/src/components/suite/PrerequisitesGuide/Transport.tsx
index c88fc3d95ed..204b67aba78 100644
--- a/packages/suite/src/components/suite/PrerequisitesGuide/Transport.tsx
+++ b/packages/suite/src/components/suite/PrerequisitesGuide/Transport.tsx
@@ -5,19 +5,23 @@ import {
     TROUBLESHOOTING_TIP_WEBUSB_ENVIRONMENT,
 } from 'src/components/suite/troubleshooting/tips';
 
-export const Transport = () => (
-    // No transport layer (bridge/webUSB) is available
-    // On web it makes sense to
-    // - offer downloading Trezor Suite desktop, or
-    // - use a browser that supports WebUSB
-    // Desktop app should have Bridge transport layer available as it is built-in, if it is not available we fucked up something.
-    <TroubleshootingTips
-        label={<Translation id="TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED" />}
-        items={[
-            TROUBLESHOOTING_TIP_WEBUSB_ENVIRONMENT,
-            TROUBLESHOOTING_TIP_SUITE_DESKTOP,
-            TROUBLESHOOTING_TIP_RESTART_COMPUTER,
-        ]}
-        data-testid="@connect-device-prompt/bridge-not-running"
-    />
-);
+export const Transport = () => {
+    const items = [
+        TROUBLESHOOTING_TIP_WEBUSB_ENVIRONMENT,
+        TROUBLESHOOTING_TIP_SUITE_DESKTOP,
+        TROUBLESHOOTING_TIP_RESTART_COMPUTER,
+    ];
+
+    return (
+        // No transport layer (bridge/webUSB) is available
+        // On web it makes sense to
+        // - offer downloading Trezor Suite desktop, or
+        // - use a browser that supports WebUSB
+        // Desktop app should have Bridge transport layer available as it is built-in, if it is not available we fucked up something.
+        <TroubleshootingTips
+            label={<Translation id="TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED" />}
+            items={items}
+            data-testid="@connect-device-prompt/bridge-not-running"
+        />
+    );
+};
diff --git a/packages/suite/src/components/suite/QrCode.tsx b/packages/suite/src/components/suite/QrCode.tsx
index 35c1e83ffdc..1e36a30755e 100644
--- a/packages/suite/src/components/suite/QrCode.tsx
+++ b/packages/suite/src/components/suite/QrCode.tsx
@@ -2,6 +2,8 @@ import { QRCodeSVG } from 'qrcode.react';
 import styled from 'styled-components';
 
 import { Icon, Tooltip, variables, intermediaryTheme } from '@trezor/components';
+import { CSSColor } from '@trezor/theme';
+
 import { Translation } from './Translation';
 
 export const QRCODE_SIZE = 384;
@@ -49,8 +51,8 @@ interface QrCodeProps {
     value: string;
     className?: string;
     showMessage?: boolean;
-    bgColor?: string;
-    fgColor?: string;
+    bgColor?: CSSColor;
+    fgColor?: CSSColor;
 }
 
 export const QrCode = ({ value, className, bgColor, fgColor, showMessage }: QrCodeProps) => (
diff --git a/packages/suite/src/components/suite/QuestionTooltip.tsx b/packages/suite/src/components/suite/QuestionTooltip.tsx
index b2e40b141bd..ab4ccc58c93 100644
--- a/packages/suite/src/components/suite/QuestionTooltip.tsx
+++ b/packages/suite/src/components/suite/QuestionTooltip.tsx
@@ -1,5 +1,7 @@
 import styled from 'styled-components';
+
 import { Tooltip, H3 } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { ExtendedMessageDescriptor } from 'src/types/suite';
 
diff --git a/packages/suite/src/components/suite/ReadMoreLink.tsx b/packages/suite/src/components/suite/ReadMoreLink.tsx
index 3e188a95b59..7f3c04bc961 100644
--- a/packages/suite/src/components/suite/ReadMoreLink.tsx
+++ b/packages/suite/src/components/suite/ReadMoreLink.tsx
@@ -1,4 +1,5 @@
 import * as URLS from '@trezor/urls';
+
 import { Translation, TrezorLink } from 'src/components/suite';
 import { ExtendedMessageDescriptor } from 'src/types/suite';
 
diff --git a/packages/suite/src/components/suite/SecurityCheck/DeviceCompromised.tsx b/packages/suite/src/components/suite/SecurityCheck/DeviceCompromised.tsx
index eb3611d69a8..aa07f5bade0 100644
--- a/packages/suite/src/components/suite/SecurityCheck/DeviceCompromised.tsx
+++ b/packages/suite/src/components/suite/SecurityCheck/DeviceCompromised.tsx
@@ -1,14 +1,31 @@
 import { useEffect } from 'react';
 
+import { deviceActions } from '@suite-common/wallet-core';
 import { Card } from '@trezor/components';
 import { getFirmwareVersion } from '@trezor/device-utils';
-import { isDeviceAcquired } from '@suite-common/suite-utils';
+import { TREZOR_SUPPORT_FW_REVISION_CHECK_FAILED_URL } from '@trezor/urls';
 
 import { WelcomeLayout } from 'src/components/suite';
-import { useDevice, useDispatch } from 'src/hooks/suite';
+import { useDevice, useDispatch, useSelector } from 'src/hooks/suite';
 import { captureSentryMessage, withSentryScope } from 'src/utils/suite/sentry';
-import { SecurityCheckFail } from '../SecurityCheck/SecurityCheckFail';
-import { deviceActions } from '@suite-common/wallet-core';
+import {
+    selectFirmwareHashCheckError,
+    selectFirmwareRevisionCheckError,
+} from 'src/reducers/suite/suiteReducer';
+
+import { SecurityCheckFail, SecurityCheckFailProps } from './SecurityCheckFail';
+import { softFailureChecklistItems } from './checklistItems';
+
+const reportCheckFail = (checkType: 'revision' | 'hash', contextData: any) => {
+    withSentryScope(scope => {
+        scope.setLevel('error');
+        scope.setTag('deviceAuthenticityError', `firmware ${checkType} check failed`);
+        captureSentryMessage(
+            `Firmware ${checkType} check failed! ${JSON.stringify(contextData)}`,
+            scope,
+        );
+    });
+};
 
 export const DeviceCompromised = () => {
     const dispatch = useDispatch();
@@ -17,35 +34,40 @@ export const DeviceCompromised = () => {
     const revision = device?.features?.revision;
     const version = getFirmwareVersion(device);
     const vendor = device?.features?.fw_vendor;
-    const authenticityError =
-        isDeviceAcquired(device) && device.authenticityChecks?.firmwareRevision?.success === false
-            ? device.authenticityChecks.firmwareRevision?.error
-            : undefined;
+
+    const revisionCheckError = useSelector(selectFirmwareRevisionCheckError);
+    const hashCheckError = useSelector(selectFirmwareHashCheckError);
 
     const goToSuite = () => {
         // Condition to satisfy TypeScript, device.id is always defined at this point.
         if (device?.id) {
-            dispatch(deviceActions.dismissFirmwareRevisionCheck(device.id));
+            dispatch(deviceActions.dismissFirmwareAuthenticityCheck(device.id));
         }
     };
 
     useEffect(() => {
-        const contextData = { revision, version, vendor, authenticityError };
-
-        withSentryScope(scope => {
-            scope.setLevel('error');
-            scope.setTag('deviceAuthenticityError', 'firmware revision check failed');
-            captureSentryMessage(
-                `Firmware revision check failed! ${JSON.stringify(contextData)}`,
-                scope,
-            );
-        });
-    }, [authenticityError, revision, vendor, version]);
+        const commonData = { revision, version, vendor };
+        if (revisionCheckError) reportCheckFail('revision', { ...commonData, revisionCheckError });
+        if (hashCheckError) reportCheckFail('hash', { ...commonData, hashCheckError });
+    }, [revisionCheckError, hashCheckError, revision, vendor, version]);
+
+    const isSoftFailure = revisionCheckError === null && hashCheckError === 'other-error';
+    const softFailureSecurityCheckFailProps: Partial<SecurityCheckFailProps> = isSoftFailure
+        ? {
+              heading: 'TR_DEVICE_MAYBE_COMPROMISED_HEADING',
+              text: 'TR_DEVICE_MAYBE_COMPROMISED_TEXT',
+              checklistItems: softFailureChecklistItems,
+          }
+        : {};
 
     return (
         <WelcomeLayout>
             <Card data-testid="@device-compromised">
-                <SecurityCheckFail goBack={goToSuite} />
+                <SecurityCheckFail
+                    goBack={goToSuite}
+                    supportUrl={TREZOR_SUPPORT_FW_REVISION_CHECK_FAILED_URL}
+                    {...softFailureSecurityCheckFailProps}
+                />
             </Card>
         </WelcomeLayout>
     );
diff --git a/packages/suite/src/components/suite/SecurityCheck/SecurityCheckFail.tsx b/packages/suite/src/components/suite/SecurityCheck/SecurityCheckFail.tsx
index d6069d5f90b..8b1e1fc8b2a 100644
--- a/packages/suite/src/components/suite/SecurityCheck/SecurityCheckFail.tsx
+++ b/packages/suite/src/components/suite/SecurityCheck/SecurityCheckFail.tsx
@@ -3,11 +3,14 @@ import styled from 'styled-components';
 import { TranslationKey } from '@suite-common/intl-types';
 import { Button, Divider, H2, Row, Text } from '@trezor/components';
 import { spacings, spacingsPx } from '@trezor/theme';
-import { TREZOR_SUPPORT_FW_CHECK_FAILED, Url } from '@trezor/urls';
+import { Url } from '@trezor/urls';
 
 import { Translation } from 'src/components/suite';
-import { SecurityChecklist } from '../../../views/onboarding/steps/SecurityCheck/SecurityChecklist';
+import { SecurityChecklist } from 'src/views/onboarding/steps/SecurityCheck/SecurityChecklist';
+import { SecurityChecklistItem } from 'src/views/onboarding/steps/SecurityCheck/types';
+
 import { SecurityCheckLayout } from './SecurityCheckLayout';
+import { hardFailureChecklistItems } from './checklistItems';
 
 const TopSection = styled.div`
     margin-top: ${spacingsPx.xs};
@@ -19,33 +22,20 @@ const Flex = styled.div`
     flex: 1;
 `;
 
-const checklistItems = [
-    {
-        icon: 'plugs',
-        content: <Translation id="TR_DISCONNECT_DEVICE" />,
-    },
-    {
-        icon: 'hand',
-        content: <Translation id="TR_AVOID_USING_DEVICE" />,
-    },
-    {
-        icon: 'chat',
-        content: <Translation id="TR_USE_CHAT" values={{ b: chunks => <b>{chunks}</b> }} />,
-    },
-] as const;
-
-interface SecurityCheckFailProps {
+export type SecurityCheckFailProps = {
     goBack?: () => void;
     heading?: TranslationKey;
     text?: TranslationKey;
-    supportUrl?: Url;
-}
+    supportUrl: Url;
+    checklistItems?: SecurityChecklistItem[];
+};
 
 export const SecurityCheckFail = ({
     goBack,
     heading = 'TR_DEVICE_COMPROMISED_HEADING',
     text = 'TR_DEVICE_COMPROMISED_TEXT',
-    supportUrl = TREZOR_SUPPORT_FW_CHECK_FAILED,
+    supportUrl,
+    checklistItems = hardFailureChecklistItems,
 }: SecurityCheckFailProps) => {
     const chatUrl = `${supportUrl}#open-chat`;
 
@@ -63,7 +53,12 @@ export const SecurityCheckFail = ({
             <SecurityChecklist items={checklistItems} />
             <Row flexWrap="wrap" gap={spacings.xl} width="100%">
                 {goBack && (
-                    <Button variant="tertiary" onClick={goBack} size="large">
+                    <Button
+                        variant="tertiary"
+                        onClick={goBack}
+                        size="large"
+                        data-testid="@device-compromised/back-button"
+                    >
                         <Translation id="TR_BACK" />
                     </Button>
                 )}
diff --git a/packages/suite/src/components/suite/SecurityCheck/checklistItems.tsx b/packages/suite/src/components/suite/SecurityCheck/checklistItems.tsx
new file mode 100644
index 00000000000..8a102333646
--- /dev/null
+++ b/packages/suite/src/components/suite/SecurityCheck/checklistItems.tsx
@@ -0,0 +1,33 @@
+import { SecurityChecklistItem } from 'src/views/onboarding/steps/SecurityCheck/types';
+
+import { Translation } from '../Translation';
+
+export const hardFailureChecklistItems: SecurityChecklistItem[] = [
+    {
+        icon: 'plugs',
+        content: <Translation id="TR_DISCONNECT_DEVICE" />,
+    },
+    {
+        icon: 'hand',
+        content: <Translation id="TR_AVOID_USING_DEVICE" />,
+    },
+    {
+        icon: 'chat',
+        content: <Translation id="TR_USE_CHAT" values={{ b: chunks => <b>{chunks}</b> }} />,
+    },
+];
+
+export const softFailureChecklistItems: SecurityChecklistItem[] = [
+    {
+        icon: 'plugs',
+        content: <Translation id="TR_RECONNECT_YOUR_DEVICE" />,
+    },
+    {
+        icon: 'eye',
+        content: <Translation id="TR_SEE_IF_ISSUE_PERSISTS" />,
+    },
+    {
+        icon: 'chat',
+        content: <Translation id="TR_USE_CHAT" values={{ b: chunks => <b>{chunks}</b> }} />,
+    },
+];
diff --git a/packages/suite/src/components/suite/Sign.tsx b/packages/suite/src/components/suite/Sign.tsx
index 7e5259942fa..3355380e982 100644
--- a/packages/suite/src/components/suite/Sign.tsx
+++ b/packages/suite/src/components/suite/Sign.tsx
@@ -1,4 +1,5 @@
 import styled, { useTheme } from 'styled-components';
+
 import { SignValue } from '@suite-common/suite-types';
 import { isSignValuePositive } from '@suite-common/formatters';
 
diff --git a/packages/suite/src/components/suite/StakeAmountWrapper.tsx b/packages/suite/src/components/suite/StakeAmountWrapper.tsx
index 1dcb76b5443..42637b68fdc 100644
--- a/packages/suite/src/components/suite/StakeAmountWrapper.tsx
+++ b/packages/suite/src/components/suite/StakeAmountWrapper.tsx
@@ -1,11 +1,15 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { Tooltip, TOOLTIP_DELAY_NONE, TOOLTIP_DELAY_NORMAL } from '@trezor/components';
 import { mediaQueries } from '@trezor/styles';
-import { Translation } from './Translation';
+
 import { goto } from 'src/actions/suite/routerActions';
 import { useDispatch } from 'src/hooks/suite';
 
+import { Translation } from './Translation';
+
 const Container = styled.div`
     position: relative;
     display: flex;
diff --git a/packages/suite/src/components/suite/StakingFeature.tsx b/packages/suite/src/components/suite/StakingFeature.tsx
index 6761bba37f7..cc420a7713f 100644
--- a/packages/suite/src/components/suite/StakingFeature.tsx
+++ b/packages/suite/src/components/suite/StakingFeature.tsx
@@ -1,17 +1,17 @@
 import { ReactNode } from 'react';
-import { H3, Paragraph } from '@trezor/components';
-import { IconBorderedWrapper } from 'src/components/suite';
+
+import { H3, Paragraph, IconCircle, IconName } from '@trezor/components';
 import { spacings } from '@trezor/theme';
 
 interface StakingFeatureProps {
-    icon: ReactNode;
+    icon: IconName;
     title: ReactNode;
     description: ReactNode;
 }
 
 export const StakingFeature = ({ icon, title, description }: StakingFeatureProps) => (
     <section>
-        <IconBorderedWrapper>{icon}</IconBorderedWrapper>
+        <IconCircle name={icon} variant="primary" size="extraLarge" />
         <H3 margin={{ top: spacings.md }}>{title}</H3>
         <Paragraph variant="tertiary">{description}</Paragraph>
     </section>
diff --git a/packages/suite/src/components/suite/StakingProcess/InfoRow.tsx b/packages/suite/src/components/suite/StakingProcess/InfoRow.tsx
new file mode 100644
index 00000000000..6f7ecd6ff5c
--- /dev/null
+++ b/packages/suite/src/components/suite/StakingProcess/InfoRow.tsx
@@ -0,0 +1,33 @@
+import { Badge, Column, List, Paragraph, Row } from '@trezor/components';
+
+import { Subheading } from './Subheading';
+import { RowContent, RowSubheading } from './types';
+
+interface InfoRowProps {
+    heading: React.ReactNode;
+    subheading: RowSubheading;
+    content: RowContent;
+    isExpanded?: boolean;
+}
+
+export const InfoRow = ({ heading, subheading, content, isExpanded = false }: InfoRowProps) => {
+    const displayContent = content.isBadge ? (
+        <Badge size="tiny">{content.text}</Badge>
+    ) : (
+        <Paragraph variant="tertiary" typographyStyle="hint">
+            {content.text}
+        </Paragraph>
+    );
+
+    return (
+        <List.Item>
+            <Row justifyContent="space-between">
+                <Column alignItems="normal">
+                    {heading}
+                    <Subheading isExpanded={isExpanded} subheading={subheading} />
+                </Column>
+                {displayContent}
+            </Row>
+        </List.Item>
+    );
+};
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/StakingInfo.tsx b/packages/suite/src/components/suite/StakingProcess/StakingInfo.tsx
similarity index 53%
rename from packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/StakingInfo.tsx
rename to packages/suite/src/components/suite/StakingProcess/StakingInfo.tsx
index 2ef76ac4b70..4c83cdab32b 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/StakingInfo.tsx
+++ b/packages/suite/src/components/suite/StakingProcess/StakingInfo.tsx
@@ -1,25 +1,32 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+
 import {
     selectAccountStakeTransactions,
     selectValidatorsQueue,
     TransactionsRootState,
     StakeRootState,
     selectPoolStatsApyData,
+    AccountsRootState,
 } from '@suite-common/wallet-core';
-import { useSelector } from 'react-redux';
+
 import { Translation } from 'src/components/suite';
 import { getDaysToAddToPool } from 'src/utils/suite/stake';
+import { CoinjoinRootState } from 'src/reducers/wallet/coinjoinReducer';
+
 import { InfoRow } from './InfoRow';
-import { Account } from 'src/types/wallet';
 
 interface StakingInfoProps {
-    account?: Account;
+    isExpanded?: boolean;
 }
 
-export const StakingInfo = ({ account }: StakingInfoProps) => {
+export const StakingInfo = ({ isExpanded }: StakingInfoProps) => {
+    const { account } = useSelector((state: CoinjoinRootState) => state.wallet.selectedAccount);
+
     const { data } =
         useSelector((state: StakeRootState) => selectValidatorsQueue(state, account?.symbol)) || {};
 
-    const stakeTxs = useSelector((state: TransactionsRootState) =>
+    const stakeTxs = useSelector((state: TransactionsRootState & AccountsRootState) =>
         selectAccountStakeTransactions(state, account?.key ?? ''),
     );
 
@@ -33,11 +40,20 @@ export const StakingInfo = ({ account }: StakingInfoProps) => {
 
     const infoRows = [
         {
-            label: <Translation id="TR_STAKE_SIGN_TRANSACTION" />,
+            heading: <Translation id="TR_STAKE_SIGN_TRANSACTION" />,
+            subheading: { isCurrentStep: true },
             content: { text: <Translation id="TR_COINMARKET_NETWORK_FEE" />, isBadge: true },
         },
         {
-            label: <Translation id="TR_STAKE_ENTER_THE_STAKING_POOL" />,
+            heading: <Translation id="TR_STAKE_ENTER_THE_STAKING_POOL" />,
+            subheading: {
+                text: (
+                    <Translation
+                        id="TR_STAKING_GETTING_READY"
+                        values={{ symbol: account.symbol.toUpperCase() }}
+                    />
+                ),
+            },
             content: {
                 text: (
                     <>
@@ -47,15 +63,16 @@ export const StakingInfo = ({ account }: StakingInfoProps) => {
             },
         },
         {
-            label: <Translation id="TR_STAKE_EARN_REWARDS_WEEKLY" />,
+            heading: <Translation id="TR_STAKE_EARN_REWARDS_WEEKLY" />,
+            subheading: { text: <Translation id="TR_STAKING_REWARDS_ARE_RESTAKED" /> },
             content: { text: `~${ethApy}% p.a.` },
         },
     ];
 
     return (
         <>
-            {infoRows.map(({ label, content }, index) => (
-                <InfoRow key={index} label={label} content={content} />
+            {infoRows.map(({ heading, content, subheading }, index) => (
+                <InfoRow key={index} {...{ heading, subheading, content, isExpanded }} />
             ))}
         </>
     );
diff --git a/packages/suite/src/components/suite/StakingProcess/Subheading.tsx b/packages/suite/src/components/suite/StakingProcess/Subheading.tsx
new file mode 100644
index 00000000000..0ebca05a2b9
--- /dev/null
+++ b/packages/suite/src/components/suite/StakingProcess/Subheading.tsx
@@ -0,0 +1,27 @@
+import { Icon, Paragraph, Row } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
+import { Translation } from '../Translation';
+import { RowSubheading } from './types';
+
+interface SubheadingProps {
+    subheading: RowSubheading;
+    isExpanded?: boolean;
+}
+
+export const Subheading = ({ isExpanded, subheading }: SubheadingProps) => {
+    if (!isExpanded || !subheading) return null;
+
+    return subheading.isCurrentStep ? (
+        <Row gap={spacings.xxs}>
+            <Icon name="mapPinFilled" variant="warning" size="medium" />
+            <Paragraph variant="warning" typographyStyle="hint">
+                <Translation id="TR_STAKING_YOU_ARE_HERE" />
+            </Paragraph>
+        </Row>
+    ) : (
+        <Paragraph variant="tertiary" typographyStyle="hint">
+            {subheading.text}
+        </Paragraph>
+    );
+};
diff --git a/packages/suite/src/components/suite/StakingProcess/UnstakingInfo.tsx b/packages/suite/src/components/suite/StakingProcess/UnstakingInfo.tsx
new file mode 100644
index 00000000000..6c1a45ae4ea
--- /dev/null
+++ b/packages/suite/src/components/suite/StakingProcess/UnstakingInfo.tsx
@@ -0,0 +1,91 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+
+import {
+    selectAccountUnstakeTransactions,
+    selectValidatorsQueue,
+    TransactionsRootState,
+    StakeRootState,
+    AccountsRootState,
+} from '@suite-common/wallet-core';
+
+import { Translation } from 'src/components/suite';
+import { getDaysToUnstake } from 'src/utils/suite/stake';
+import { CoinjoinRootState } from 'src/reducers/wallet/coinjoinReducer';
+
+import { InfoRow } from './InfoRow';
+
+interface UnstakingInfoProps {
+    isExpanded?: boolean;
+}
+
+export const UnstakingInfo = ({ isExpanded }: UnstakingInfoProps) => {
+    const { account } = useSelector((state: CoinjoinRootState) => state.wallet.selectedAccount);
+
+    const { data } =
+        useSelector((state: StakeRootState) => selectValidatorsQueue(state, account?.symbol)) || {};
+
+    const unstakeTxs = useSelector((state: TransactionsRootState & AccountsRootState) =>
+        selectAccountUnstakeTransactions(state, account?.key ?? ''),
+    );
+
+    if (!account) return null;
+
+    const daysToUnstake = getDaysToUnstake(unstakeTxs, data);
+    const accountSymbol = account.symbol.toUpperCase();
+
+    const infoRows = [
+        {
+            heading: <Translation id="TR_STAKE_SIGN_UNSTAKING_TRANSACTION" />,
+            subheading: { isCurrentStep: true },
+            content: {
+                text: <Translation id="TR_COINMARKET_NETWORK_FEE" />,
+                isBadge: true,
+            },
+        },
+        {
+            heading: <Translation id="TR_STAKE_LEAVE_STAKING_POOL" />,
+            subheading: {
+                text: (
+                    <Translation
+                        id="TR_STAKING_CONSOLIDATING_FUNDS"
+                        values={{ symbol: accountSymbol }}
+                    />
+                ),
+            },
+            content: {
+                text: <Translation id="TR_STAKE_DAYS" values={{ count: daysToUnstake }} />,
+            },
+        },
+        {
+            heading: (
+                <Translation id="TR_STAKE_CLAIM_UNSTAKED" values={{ symbol: accountSymbol }} />
+            ),
+            subheading: {
+                text: (
+                    <Translation
+                        id="TR_STAKING_YOUR_UNSTAKED_FUNDS"
+                        values={{ symbol: accountSymbol }}
+                    />
+                ),
+            },
+            content: {
+                text: <Translation id="TR_COINMARKET_NETWORK_FEE" />,
+                isBadge: true,
+            },
+        },
+        {
+            heading: <Translation id="TR_STAKE_IN_ACCOUNT" values={{ symbol: accountSymbol }} />,
+            subheading: null,
+            content: { text: null },
+        },
+    ];
+
+    return (
+        <>
+            {infoRows.map(({ heading, content, subheading }, index) => (
+                <InfoRow key={index} {...{ heading, subheading, content, isExpanded }} />
+            ))}
+        </>
+    );
+};
diff --git a/packages/suite/src/components/suite/StakingProcess/types.ts b/packages/suite/src/components/suite/StakingProcess/types.ts
new file mode 100644
index 00000000000..379fc40f18d
--- /dev/null
+++ b/packages/suite/src/components/suite/StakingProcess/types.ts
@@ -0,0 +1,9 @@
+export type RowSubheading = {
+    text?: React.ReactNode;
+    isCurrentStep?: boolean;
+} | null;
+
+export type RowContent = {
+    isBadge?: boolean;
+    text?: React.ReactNode;
+};
diff --git a/packages/suite/src/components/suite/StatusLight.tsx b/packages/suite/src/components/suite/StatusLight.tsx
index 14839cb2a29..54c9fa625d1 100644
--- a/packages/suite/src/components/suite/StatusLight.tsx
+++ b/packages/suite/src/components/suite/StatusLight.tsx
@@ -1,6 +1,7 @@
+import styled, { DefaultTheme } from 'styled-components';
+
 import { UIVariant } from '@trezor/components/src/config/types';
 import { CSSColor, Color } from '@trezor/theme';
-import styled, { DefaultTheme } from 'styled-components';
 
 type StatusLightVariant = Extract<UIVariant, 'primary' | 'warning' | 'destructive'>;
 
diff --git a/packages/suite/src/components/suite/Ticker/LastUpdateTooltip.tsx b/packages/suite/src/components/suite/Ticker/LastUpdateTooltip.tsx
index c56391f0505..99291d926df 100644
--- a/packages/suite/src/components/suite/Ticker/LastUpdateTooltip.tsx
+++ b/packages/suite/src/components/suite/Ticker/LastUpdateTooltip.tsx
@@ -1,10 +1,13 @@
-import { Translation } from 'src/components/suite';
-import styled from 'styled-components';
-import { Tooltip } from '@trezor/components';
 import { FormattedRelativeTime } from 'react-intl';
 import { ReactNode } from 'react';
+
+import styled from 'styled-components';
 import { differenceInMinutes } from 'date-fns';
 
+import { Tooltip } from '@trezor/components';
+
+import { Translation } from 'src/components/suite';
+
 const LastUpdate = styled.div`
     text-transform: none;
 `;
diff --git a/packages/suite/src/components/suite/Ticker/NoRatesTooltip.tsx b/packages/suite/src/components/suite/Ticker/NoRatesTooltip.tsx
index fd5c8155900..1b443f035b3 100644
--- a/packages/suite/src/components/suite/Ticker/NoRatesTooltip.tsx
+++ b/packages/suite/src/components/suite/Ticker/NoRatesTooltip.tsx
@@ -1,8 +1,11 @@
-import { Translation, TooltipSymbol } from 'src/components/suite';
 import styled, { useTheme } from 'styled-components';
-import { TranslationKey } from '../Translation';
+
 import { typography } from '@trezor/theme';
 
+import { Translation, TooltipSymbol } from 'src/components/suite';
+
+import { TranslationKey } from '../Translation';
+
 const NoRatesMessage = styled.div`
     ${typography.label};
     display: flex;
diff --git a/packages/suite/src/components/suite/Ticker/PriceTicker.tsx b/packages/suite/src/components/suite/Ticker/PriceTicker.tsx
index 50923f3755c..ea244a8cf22 100644
--- a/packages/suite/src/components/suite/Ticker/PriceTicker.tsx
+++ b/packages/suite/src/components/suite/Ticker/PriceTicker.tsx
@@ -1,10 +1,12 @@
 import styled from 'styled-components';
 
+import { typography } from '@trezor/theme';
+import { TokenAddress } from '@suite-common/wallet-types';
+
 import { FiatValue } from 'src/components/suite';
+
 import { NoRatesTooltip } from './NoRatesTooltip';
-import { typography } from '@trezor/theme';
 import { LastUpdateTooltip } from './LastUpdateTooltip';
-import { TokenAddress } from '@suite-common/wallet-types';
 
 const FiatRateWrapper = styled.span`
     ${typography.callout}
diff --git a/packages/suite/src/components/suite/Ticker/TrendTicker.tsx b/packages/suite/src/components/suite/Ticker/TrendTicker.tsx
index bfdf14c0f2d..e196ff808d9 100644
--- a/packages/suite/src/components/suite/Ticker/TrendTicker.tsx
+++ b/packages/suite/src/components/suite/Ticker/TrendTicker.tsx
@@ -11,6 +11,7 @@ import { FiatValue } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
 import { selectLanguage } from 'src/reducers/suite/suiteReducer';
+
 import { NoRatesTooltip } from './NoRatesTooltip';
 
 const PercentageWrapper = styled.div<{ $isRateGoingUp: boolean }>`
diff --git a/packages/suite/src/components/suite/TooltipSymbol.tsx b/packages/suite/src/components/suite/TooltipSymbol.tsx
index 331a48141c4..719d2dec381 100644
--- a/packages/suite/src/components/suite/TooltipSymbol.tsx
+++ b/packages/suite/src/components/suite/TooltipSymbol.tsx
@@ -1,6 +1,9 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { Icon, IconName, Tooltip } from '@trezor/components';
+import { CSSColor } from '@trezor/theme';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const InlineTooltip = styled(Tooltip)`
@@ -11,7 +14,7 @@ const InlineTooltip = styled(Tooltip)`
 type TooltipSymbolProps = {
     content: ReactNode;
     icon?: IconName;
-    iconColor?: string;
+    iconColor?: CSSColor;
     className?: string;
 };
 
diff --git a/packages/suite/src/components/suite/TorLoader/TorLoader.tsx b/packages/suite/src/components/suite/TorLoader/TorLoader.tsx
index 545451f8e42..4b12b1b1903 100644
--- a/packages/suite/src/components/suite/TorLoader/TorLoader.tsx
+++ b/packages/suite/src/components/suite/TorLoader/TorLoader.tsx
@@ -1,14 +1,15 @@
 import { useState, useEffect, ComponentType } from 'react';
 
 import styled from 'styled-components';
-import { TorStatus } from 'src/types/suite';
 
+import { Button, ModalProps } from '@trezor/components';
+
+import { TorStatus } from 'src/types/suite';
 import { Translation } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { selectTorState } from 'src/reducers/suite/suiteReducer';
 import { toggleTor, updateTorStatus } from 'src/actions/suite/suiteActions';
 
-import { Button, ModalProps } from '@trezor/components';
 import { TorProgressBar } from './TorProgressBar';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
diff --git a/packages/suite/src/components/suite/TorLoader/TorProgressBar.tsx b/packages/suite/src/components/suite/TorLoader/TorProgressBar.tsx
index 50b7ec4a0e3..179ac4b8d8f 100644
--- a/packages/suite/src/components/suite/TorLoader/TorProgressBar.tsx
+++ b/packages/suite/src/components/suite/TorLoader/TorProgressBar.tsx
@@ -1,9 +1,9 @@
 import styled from 'styled-components';
 
 import { Button, ProgressBar, Icon, variables } from '@trezor/components';
+import { borders } from '@trezor/theme';
 
 import { Translation } from 'src/components/suite';
-import { borders } from '@trezor/theme';
 
 const IconWrapper = styled.div`
     width: 120px;
diff --git a/packages/suite/src/components/suite/TrafficLightOffset.tsx b/packages/suite/src/components/suite/TrafficLightOffset.tsx
index 42e398f1a59..92f9356b0f1 100644
--- a/packages/suite/src/components/suite/TrafficLightOffset.tsx
+++ b/packages/suite/src/components/suite/TrafficLightOffset.tsx
@@ -1,7 +1,9 @@
-import { isDesktop, isMacOs } from '@trezor/env-utils';
 import React from 'react';
+
 import styled from 'styled-components';
 
+import { isDesktop, isMacOs } from '@trezor/env-utils';
+
 type Props = {
     children?: React.ReactNode;
     offset?: number;
diff --git a/packages/suite/src/components/suite/TrezorLink.tsx b/packages/suite/src/components/suite/TrezorLink.tsx
index 5554a240efa..41bfdfa616b 100644
--- a/packages/suite/src/components/suite/TrezorLink.tsx
+++ b/packages/suite/src/components/suite/TrezorLink.tsx
@@ -1,4 +1,5 @@
 import { Link, LinkProps } from '@trezor/components';
+
 import { useExternalLink } from 'src/hooks/suite';
 
 export const TrezorLink = (props: LinkProps) => {
diff --git a/packages/suite/src/components/suite/UdevDownload.tsx b/packages/suite/src/components/suite/UdevDownload.tsx
index a383ad52053..b6c05a8499c 100644
--- a/packages/suite/src/components/suite/UdevDownload.tsx
+++ b/packages/suite/src/components/suite/UdevDownload.tsx
@@ -1,9 +1,13 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
+
 import { DATA_URL, HELP_CENTER_UDEV_URL } from '@trezor/urls';
-import { Translation } from 'src/components/suite';
 import { variables, Button, Select, Link, Spinner } from '@trezor/components';
+
+import { Translation } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite';
+
 import { LearnMoreButton } from './LearnMoreButton';
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/components/suite/UnstakingTxAmount.tsx b/packages/suite/src/components/suite/UnstakingTxAmount.tsx
index 6012b597d63..c84fdf0ebe0 100644
--- a/packages/suite/src/components/suite/UnstakingTxAmount.tsx
+++ b/packages/suite/src/components/suite/UnstakingTxAmount.tsx
@@ -1,8 +1,12 @@
 import React from 'react';
-import { isUnstakeTx } from '@suite-common/suite-utils';
+
 import { WalletAccountTransaction } from '@suite-common/wallet-types';
-import { formatNetworkAmount } from '@suite-common/wallet-utils';
-import { getUnstakingAmount } from 'src/utils/suite/stake';
+import {
+    formatNetworkAmount,
+    isUnstakeTx,
+    getUnstakeAmountByEthereumDataHex,
+} from '@suite-common/wallet-utils';
+
 import { FormattedCryptoAmount } from './FormattedCryptoAmount';
 
 interface UnstakingTxAmountProps {
@@ -15,7 +19,7 @@ export const UnstakingTxAmount = ({ transaction }: UnstakingTxAmountProps) => {
 
     if (!isUnstakeTx(txSignature)) return null;
 
-    const amount = getUnstakingAmount(ethereumSpecific?.data);
+    const amount = getUnstakeAmountByEthereumDataHex(ethereumSpecific?.data);
 
     if (!amount) return null;
 
diff --git a/packages/suite/src/components/suite/WebUsbButton.tsx b/packages/suite/src/components/suite/WebUsbButton.tsx
index bf28a943565..dd65fe3ac91 100644
--- a/packages/suite/src/components/suite/WebUsbButton.tsx
+++ b/packages/suite/src/components/suite/WebUsbButton.tsx
@@ -1,5 +1,7 @@
 import TrezorConnect from '@trezor/connect';
+import type TrezorConnectWeb from '@trezor/connect-web';
 import { ButtonProps, Button, IconButton, Tooltip } from '@trezor/components';
+
 import { Translation, TranslationKey } from './Translation';
 
 interface WebUsbButtonProps extends Omit<ButtonProps, 'children' | 'icon'> {
@@ -9,7 +11,7 @@ interface WebUsbButtonProps extends Omit<ButtonProps, 'children' | 'icon'> {
 
 const handleClick = (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     e.stopPropagation();
-    TrezorConnect.requestWebUSBDevice();
+    (TrezorConnect as typeof TrezorConnectWeb).requestWebUSBDevice();
 };
 
 export const WebUsbButton = ({
diff --git a/packages/suite/src/components/suite/WordInput.tsx b/packages/suite/src/components/suite/WordInput.tsx
index c8ebdf1e69a..0285d25bccd 100644
--- a/packages/suite/src/components/suite/WordInput.tsx
+++ b/packages/suite/src/components/suite/WordInput.tsx
@@ -1,14 +1,17 @@
 import { useEffect, useRef, memo, Children, ReactElement } from 'react';
 import { FixedSizeList as List } from 'react-window';
 import { MenuListProps, SelectInstance, createFilter } from 'react-select';
+import { useKeyPress } from 'react-use';
+
 import styled from 'styled-components';
+
 import { Select, variables } from '@trezor/components';
 import { bip39 } from '@trezor/crypto-utils';
-import { useTranslation } from 'src/hooks/suite/useTranslation';
-import { useKeyPress } from 'react-use';
 import TrezorConnect, { UI } from '@trezor/connect';
 import { createTimeoutPromise } from '@trezor/utils';
 
+import { useTranslation } from 'src/hooks/suite/useTranslation';
+
 const options = bip39.map(item => ({ label: item, value: item }));
 
 const SelectWrapper = styled.div`
@@ -68,6 +71,7 @@ export const WordInput = memo(() => {
     return (
         <SelectWrapper>
             <Select
+                // eslint-disable-next-line jsx-a11y/no-autofocus
                 autoFocus
                 isSearchable
                 isClearable={false}
diff --git a/packages/suite/src/components/suite/WordInputAdvanced.tsx b/packages/suite/src/components/suite/WordInputAdvanced.tsx
index 24b6391837b..04d249577ff 100644
--- a/packages/suite/src/components/suite/WordInputAdvanced.tsx
+++ b/packages/suite/src/components/suite/WordInputAdvanced.tsx
@@ -1,11 +1,14 @@
 import { useEffect, useCallback } from 'react';
+
 import styled from 'styled-components';
+
 import { HELP_CENTER_ADVANCED_RECOVERY_URL } from '@trezor/urls';
 import { Button, PinButton, KEYBOARD_CODE } from '@trezor/components';
-import { Translation, TrezorLink, DeviceMatrixExplanation } from 'src/components/suite';
 import { createTimeoutPromise } from '@trezor/utils';
 import TrezorConnect, { DeviceModelInternal, UI } from '@trezor/connect';
 
+import { Translation, TrezorLink, DeviceMatrixExplanation } from 'src/components/suite';
+
 const Wrapper = styled.div`
     display: flex;
     height: 100%;
diff --git a/packages/suite/src/components/suite/__tests__/NumberInput.test.tsx b/packages/suite/src/components/suite/__tests__/NumberInput.test.tsx
index c7cf503cd9c..0c8870d3a76 100644
--- a/packages/suite/src/components/suite/__tests__/NumberInput.test.tsx
+++ b/packages/suite/src/components/suite/__tests__/NumberInput.test.tsx
@@ -1,13 +1,17 @@
-import { render } from '@testing-library/react';
 import { Provider } from 'react-redux';
+import { useForm } from 'react-hook-form';
+
+import { render } from '@testing-library/react';
 import { Store } from 'redux';
 import userEvent from '@testing-library/user-event';
-import { useForm } from 'react-hook-form';
-import suiteReducer, { SuiteState } from 'src/reducers/suite/suiteReducer';
+
 import { configureMockStore } from '@suite-common/test-utils';
+
+import suiteReducer, { SuiteState } from 'src/reducers/suite/suiteReducer';
 import { ThemeProvider } from 'src/support/suite/ThemeProvider';
 import { Locale } from 'src/config/suite/languages';
-import { NumberInput } from '..';
+
+import { NumberInput } from '../NumberInput';
 
 const onChangeMock = jest.fn();
 
diff --git a/packages/suite/src/components/suite/__tests__/Translation.test.tsx b/packages/suite/src/components/suite/__tests__/Translation.test.tsx
index ebb796060ee..a10da772870 100644
--- a/packages/suite/src/components/suite/__tests__/Translation.test.tsx
+++ b/packages/suite/src/components/suite/__tests__/Translation.test.tsx
@@ -1,4 +1,5 @@
 import createComponentWithIntl from 'src/support/tests/IntlHelper';
+
 import { Translation } from '../Translation';
 
 const messages = {
diff --git a/packages/suite/src/components/suite/banners/MessageSystemBanner.tsx b/packages/suite/src/components/suite/banners/MessageSystemBanner.tsx
index b65a2b8e7c8..5658d4e39cc 100644
--- a/packages/suite/src/components/suite/banners/MessageSystemBanner.tsx
+++ b/packages/suite/src/components/suite/banners/MessageSystemBanner.tsx
@@ -1,12 +1,13 @@
 import { useMemo } from 'react';
-import { goto } from 'src/actions/suite/routerActions';
+
 import { messageSystemActions } from '@suite-common/message-system';
 import { Message } from '@suite-common/suite-types';
+import { Row, Banner as WarningComponent, Banner } from '@trezor/components';
+
+import { goto } from 'src/actions/suite/routerActions';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { getTorUrlIfAvailable } from 'src/utils/suite/tor';
-
 import { selectLanguage, selectTorState } from 'src/reducers/suite/suiteReducer';
-import { Row, Banner as WarningComponent, Banner } from '@trezor/components';
 
 type MessageSystemBannerProps = {
     message: Message;
diff --git a/packages/suite/src/components/suite/banners/SuiteBanners/FailedBackupBanner.tsx b/packages/suite/src/components/suite/banners/SuiteBanners/FailedBackupBanner.tsx
index e4b54e044d7..371ee225593 100644
--- a/packages/suite/src/components/suite/banners/SuiteBanners/FailedBackupBanner.tsx
+++ b/packages/suite/src/components/suite/banners/SuiteBanners/FailedBackupBanner.tsx
@@ -1,7 +1,8 @@
+import { Banner } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { goto } from 'src/actions/suite/routerActions';
 import { useDispatch } from 'src/hooks/suite';
-import { Banner } from '@trezor/components';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
 
 export const FailedBackup = () => {
diff --git a/packages/suite/src/components/suite/banners/SuiteBanners/FirmwareHashMismatchBanner.tsx b/packages/suite/src/components/suite/banners/SuiteBanners/FirmwareHashMismatchBanner.tsx
index 117cb026534..66f1cf3712b 100644
--- a/packages/suite/src/components/suite/banners/SuiteBanners/FirmwareHashMismatchBanner.tsx
+++ b/packages/suite/src/components/suite/banners/SuiteBanners/FirmwareHashMismatchBanner.tsx
@@ -1,6 +1,7 @@
-import { Translation } from 'src/components/suite';
 import { Banner } from '@trezor/components';
 
+import { Translation } from 'src/components/suite';
+
 export const FirmwareHashMismatch = () => (
     <Banner icon variant="destructive">
         <Translation id="TR_FIRMWARE_HASH_MISMATCH" />
diff --git a/packages/suite/src/components/suite/banners/SuiteBanners/FirmwareRevisionCheckBanner.tsx b/packages/suite/src/components/suite/banners/SuiteBanners/FirmwareRevisionCheckBanner.tsx
index 35cc6efd521..25c9570faa7 100644
--- a/packages/suite/src/components/suite/banners/SuiteBanners/FirmwareRevisionCheckBanner.tsx
+++ b/packages/suite/src/components/suite/banners/SuiteBanners/FirmwareRevisionCheckBanner.tsx
@@ -1,32 +1,54 @@
 import { TranslationKey } from '@suite-common/intl-types';
-import { isDeviceAcquired } from '@suite-common/suite-utils';
-import { selectDevice } from '@suite-common/wallet-core';
 import { Banner } from '@trezor/components';
-import { FirmwareRevisionCheckError } from '@trezor/connect';
+import { FirmwareHashCheckError, FirmwareRevisionCheckError } from '@trezor/connect';
 import { HELP_CENTER_FIRMWARE_REVISION_CHECK } from '@trezor/urls';
+import { isArrayMember } from '@trezor/utils';
 
 import { Translation, TrezorLink } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite';
+import {
+    selectFirmwareHashCheckError,
+    selectFirmwareRevisionCheckError,
+} from 'src/reducers/suite/suiteReducer';
+import { skippedHashCheckErrors } from 'src/constants/suite/firmware';
 
-const messages: Record<FirmwareRevisionCheckError, TranslationKey> = {
+const revisionCheckMessages: Record<FirmwareRevisionCheckError, TranslationKey> = {
     'cannot-perform-check-offline': 'TR_DEVICE_FIRMWARE_REVISION_CHECK_UNABLE_TO_PERFORM',
     'other-error': 'TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR',
     'revision-mismatch': 'TR_FIRMWARE_REVISION_CHECK_FAILED',
     'firmware-version-unknown': 'TR_FIRMWARE_REVISION_CHECK_FAILED',
 };
 
-export const FirmwareRevisionCheckBanner = () => {
-    const device = useSelector(selectDevice);
+type SkippedHashCheckMessage = (typeof skippedHashCheckErrors)[number];
+
+const hashCheckMessages: Record<
+    Exclude<FirmwareHashCheckError, SkippedHashCheckMessage>,
+    TranslationKey
+> = {
+    'hash-mismatch': 'TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH',
+    'other-error': 'TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR',
+};
 
-    if (
-        !isDeviceAcquired(device) ||
-        device.authenticityChecks?.firmwareRevision?.success !== false
-    ) {
-        return null;
+const useAuthenticityCheckMessage = (): TranslationKey | null => {
+    const firmwareRevisionError = useSelector(selectFirmwareRevisionCheckError);
+    const firmwareHashError = useSelector(selectFirmwareHashCheckError);
+
+    if (firmwareRevisionError) {
+        return revisionCheckMessages[firmwareRevisionError];
+    }
+    if (firmwareHashError && !isArrayMember(firmwareHashError, skippedHashCheckErrors)) {
+        return hashCheckMessages[firmwareHashError];
     }
 
-    const wasOffline =
-        device.authenticityChecks.firmwareRevision.error === 'cannot-perform-check-offline';
+    return null;
+};
+
+export const FirmwareRevisionCheckBanner = () => {
+    const firmwareRevisionError = useSelector(selectFirmwareRevisionCheckError);
+    const wasOffline = firmwareRevisionError === 'cannot-perform-check-offline';
+
+    const message = useAuthenticityCheckMessage();
+    if (message === null) return null;
 
     return (
         <Banner
@@ -42,7 +64,7 @@ export const FirmwareRevisionCheckBanner = () => {
                 )
             }
         >
-            <Translation id={messages[device.authenticityChecks.firmwareRevision.error]} />
+            <Translation id={message} />
         </Banner>
     );
 };
diff --git a/packages/suite/src/components/suite/banners/SuiteBanners/NoBackupBanner.tsx b/packages/suite/src/components/suite/banners/SuiteBanners/NoBackupBanner.tsx
index d1e4f325069..7057c4f5eb2 100644
--- a/packages/suite/src/components/suite/banners/SuiteBanners/NoBackupBanner.tsx
+++ b/packages/suite/src/components/suite/banners/SuiteBanners/NoBackupBanner.tsx
@@ -1,7 +1,8 @@
+import { Banner } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { goto } from 'src/actions/suite/routerActions';
 import { useDispatch, useTranslation } from 'src/hooks/suite';
-import { Banner } from '@trezor/components';
 
 export const NoBackup = () => {
     const dispatch = useDispatch();
diff --git a/packages/suite/src/components/suite/banners/SuiteBanners/NoConnectionBanner.tsx b/packages/suite/src/components/suite/banners/SuiteBanners/NoConnectionBanner.tsx
index 1ec6e9209f6..541f23983a0 100644
--- a/packages/suite/src/components/suite/banners/SuiteBanners/NoConnectionBanner.tsx
+++ b/packages/suite/src/components/suite/banners/SuiteBanners/NoConnectionBanner.tsx
@@ -1,6 +1,7 @@
-import { Translation } from 'src/components/suite';
 import { Banner } from '@trezor/components';
 
+import { Translation } from 'src/components/suite';
+
 export const NoConnectionBanner = () => (
     <Banner icon variant="destructive">
         <Translation id="TR_YOU_WERE_DISCONNECTED_DOT" />
diff --git a/packages/suite/src/components/suite/banners/SuiteBanners/SafetyChecksBanner.tsx b/packages/suite/src/components/suite/banners/SuiteBanners/SafetyChecksBanner.tsx
index 26be76c1aad..9fdaebd1d5b 100644
--- a/packages/suite/src/components/suite/banners/SuiteBanners/SafetyChecksBanner.tsx
+++ b/packages/suite/src/components/suite/banners/SuiteBanners/SafetyChecksBanner.tsx
@@ -1,8 +1,9 @@
+import { Row, Banner as WarningComponent, Banner } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
-import { Row, Banner as WarningComponent, Banner } from '@trezor/components';
 
 interface SafetyChecksBannerProps {
     onDismiss?: () => void;
diff --git a/packages/suite/src/components/suite/banners/SuiteBanners/SuiteBanners.tsx b/packages/suite/src/components/suite/banners/SuiteBanners/SuiteBanners.tsx
index 60f3e8caea1..f69a07db1b4 100644
--- a/packages/suite/src/components/suite/banners/SuiteBanners/SuiteBanners.tsx
+++ b/packages/suite/src/components/suite/banners/SuiteBanners/SuiteBanners.tsx
@@ -1,19 +1,25 @@
 import { useState, useEffect } from 'react';
+
 import styled from 'styled-components';
 
 import { selectBannerMessage } from '@suite-common/message-system';
-import { isDeviceAcquired } from '@suite-common/suite-utils';
 import { selectDevice } from '@suite-common/wallet-core';
+import { isArrayMember } from '@trezor/utils';
 import { isDesktop } from '@trezor/env-utils';
 import { spacingsPx } from '@trezor/theme';
 
 import { isTranslationMode } from 'src/utils/suite/l10n';
 import { useSelector } from 'src/hooks/suite';
 import { MAX_CONTENT_WIDTH } from 'src/constants/suite/layout';
+import { skippedHashCheckErrors } from 'src/constants/suite/firmware';
+import {
+    selectFirmwareHashCheckError,
+    selectFirmwareRevisionCheckError,
+} from 'src/reducers/suite/suiteReducer';
+
 import { MessageSystemBanner } from '../MessageSystemBanner';
 import { NoConnectionBanner } from './NoConnectionBanner';
 import { UpdateBridge } from './UpdateBridgeBanner';
-import { UpdateFirmware } from './UpdateFirmwareBanner';
 import { NoBackup } from './NoBackupBanner';
 import { FailedBackup } from './FailedBackupBanner';
 import { SafetyChecksBanner } from './SafetyChecksBanner';
@@ -36,7 +42,8 @@ export const SuiteBanners = () => {
     const isOnline = useSelector(state => state.suite.online);
     const firmwareHashInvalid = useSelector(state => state.firmware.firmwareHashInvalid);
     const bannerMessage = useSelector(selectBannerMessage);
-    const { isFirmwareRevisionCheckDisabled } = useSelector(state => state.suite.settings);
+    const firmwareRevisionError = useSelector(selectFirmwareRevisionCheckError);
+    const firmwareHashError = useSelector(selectFirmwareHashCheckError);
 
     // The dismissal doesn't need to outlive the session. Use local state.
     const [safetyChecksDismissed, setSafetyChecksDismissed] = useState(false);
@@ -58,15 +65,15 @@ export const SuiteBanners = () => {
 
     let banner = null;
     let priority = 0;
+    // this handles firmware hash being invalid after a firmware update, not the regular firmware hash check
     if (device?.id && firmwareHashInvalid.includes(device.id)) {
         banner = <FirmwareHashMismatch />;
         priority = 92;
-    } else if (
-        !isFirmwareRevisionCheckDisabled &&
-        isDeviceAcquired(device) &&
-        device.authenticityChecks !== undefined &&
-        device.authenticityChecks.firmwareRevision !== null && // check was performed
-        device.authenticityChecks.firmwareRevision.success === false
+    }
+    // the regular firmware hash check, and revision id check, either of them may fail
+    else if (
+        firmwareRevisionError ||
+        (firmwareHashError && !isArrayMember(firmwareHashError, skippedHashCheckErrors))
     ) {
         banner = <FirmwareRevisionCheckBanner />;
         priority = 91;
@@ -92,14 +99,6 @@ export const SuiteBanners = () => {
     } else if (showUpdateBridge()) {
         banner = <UpdateBridge />;
         priority = 30;
-    } else if (
-        device?.connected &&
-        isDeviceAcquired(device) &&
-        device.mode !== 'bootloader' &&
-        ['outdated'].includes(device.firmware)
-    ) {
-        banner = <UpdateFirmware />;
-        priority = 10;
     }
 
     // message system banners should always be visible in the app even if app body is blurred
diff --git a/packages/suite/src/components/suite/banners/SuiteBanners/TranslationModeBanner.tsx b/packages/suite/src/components/suite/banners/SuiteBanners/TranslationModeBanner.tsx
index 4f25737742b..ddd44771981 100644
--- a/packages/suite/src/components/suite/banners/SuiteBanners/TranslationModeBanner.tsx
+++ b/packages/suite/src/components/suite/banners/SuiteBanners/TranslationModeBanner.tsx
@@ -1,6 +1,7 @@
-import { setTranslationMode } from 'src/utils/suite/l10n';
 import { Banner } from '@trezor/components';
 
+import { setTranslationMode } from 'src/utils/suite/l10n';
+
 export const TranslationMode = () => (
     <Banner
         icon
diff --git a/packages/suite/src/components/suite/banners/SuiteBanners/UpdateBridgeBanner.tsx b/packages/suite/src/components/suite/banners/SuiteBanners/UpdateBridgeBanner.tsx
index 21e28647a26..2d62ac6f692 100644
--- a/packages/suite/src/components/suite/banners/SuiteBanners/UpdateBridgeBanner.tsx
+++ b/packages/suite/src/components/suite/banners/SuiteBanners/UpdateBridgeBanner.tsx
@@ -1,7 +1,8 @@
+import { Banner } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { goto } from 'src/actions/suite/routerActions';
 import { useDispatch } from 'src/hooks/suite';
-import { Banner } from '@trezor/components';
 
 export const UpdateBridge = () => {
     const dispatch = useDispatch();
diff --git a/packages/suite/src/components/suite/banners/SuiteBanners/UpdateFirmwareBanner.tsx b/packages/suite/src/components/suite/banners/SuiteBanners/UpdateFirmwareBanner.tsx
deleted file mode 100644
index 74449b4ffe8..00000000000
--- a/packages/suite/src/components/suite/banners/SuiteBanners/UpdateFirmwareBanner.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Translation } from 'src/components/suite';
-import { goto } from 'src/actions/suite/routerActions';
-import { useDispatch } from 'src/hooks/suite';
-import { Banner } from '@trezor/components';
-
-export const UpdateFirmware = () => {
-    const dispatch = useDispatch();
-
-    return (
-        <Banner
-            icon
-            variant="info"
-            rightContent={
-                <Banner.Button
-                    onClick={() => dispatch(goto('firmware-index'))}
-                    data-testid="@notification/update-firmware/button"
-                >
-                    <Translation id="TR_SHOW_DETAILS" />
-                </Banner.Button>
-            }
-        >
-            <Translation id="TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT" />
-        </Banner>
-    );
-};
diff --git a/packages/suite/src/components/suite/graph/GraphRangeSelector.tsx b/packages/suite/src/components/suite/graph/GraphRangeSelector.tsx
index 20a7ac78388..5847a244763 100644
--- a/packages/suite/src/components/suite/graph/GraphRangeSelector.tsx
+++ b/packages/suite/src/components/suite/graph/GraphRangeSelector.tsx
@@ -1,8 +1,6 @@
 import { useState, useRef } from 'react';
 
 import styled, { css } from 'styled-components';
-import { Translation } from 'src/components/suite';
-import { useGraph, useLocales } from 'src/hooks/suite';
 import {
     startOfDay,
     startOfToday,
@@ -14,6 +12,9 @@ import {
 } from 'date-fns';
 
 import { variables, Dropdown, DropdownRef, Timerange, intermediaryTheme } from '@trezor/components';
+
+import { Translation } from 'src/components/suite';
+import { useGraph, useLocales } from 'src/hooks/suite';
 import { GraphRange } from 'src/types/wallet/graph';
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/components/suite/graph/GraphScaleDropdownItem.tsx b/packages/suite/src/components/suite/graph/GraphScaleDropdownItem.tsx
index 11a62d8cf4a..b387f43993c 100644
--- a/packages/suite/src/components/suite/graph/GraphScaleDropdownItem.tsx
+++ b/packages/suite/src/components/suite/graph/GraphScaleDropdownItem.tsx
@@ -1,7 +1,7 @@
+import { SelectBar, SelectBarProps } from '@trezor/components';
+
 import { useGraph } from 'src/hooks/suite';
 import { Translation } from 'src/components/suite';
-
-import { SelectBar, SelectBarProps } from '@trezor/components';
 import { GraphScale } from 'src/types/wallet/graph';
 
 export const GraphScaleDropdownItem = (props: Omit<SelectBarProps<GraphScale>, 'options'>) => {
diff --git a/packages/suite/src/components/suite/graph/GraphSkeleton.tsx b/packages/suite/src/components/suite/graph/GraphSkeleton.tsx
index d1f75832d28..c03a2614397 100644
--- a/packages/suite/src/components/suite/graph/GraphSkeleton.tsx
+++ b/packages/suite/src/components/suite/graph/GraphSkeleton.tsx
@@ -1,4 +1,5 @@
 import { ComponentProps } from 'react';
+
 import styled from 'styled-components';
 
 import { SkeletonRectangle, SkeletonSpread, SkeletonStack, variables } from '@trezor/components';
diff --git a/packages/suite/src/components/suite/graph/TransactionsGraph/GraphTooltipAccount.tsx b/packages/suite/src/components/suite/graph/TransactionsGraph/GraphTooltipAccount.tsx
index 7c120192182..f44b18ac21a 100644
--- a/packages/suite/src/components/suite/graph/TransactionsGraph/GraphTooltipAccount.tsx
+++ b/packages/suite/src/components/suite/graph/TransactionsGraph/GraphTooltipAccount.tsx
@@ -1,14 +1,15 @@
 import styled from 'styled-components';
 import { TooltipProps } from 'recharts';
-import { FormattedCryptoAmount } from 'src/components/suite/FormattedCryptoAmount';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 
+import { NetworkSymbol } from '@suite-common/wallet-config';
 import { Formatters, useFormatters } from '@suite-common/formatters';
+import { SignOperator } from '@suite-common/suite-types';
+
+import { FormattedCryptoAmount } from 'src/components/suite/FormattedCryptoAmount';
+import { CommonAggregatedHistory, GraphRange } from 'src/types/wallet/graph';
 
 import type { CryptoGraphProps } from './TransactionsGraph';
 import { GraphTooltipBase } from './GraphTooltipBase';
-import { CommonAggregatedHistory, GraphRange } from 'src/types/wallet/graph';
-import { SignOperator } from '@suite-common/suite-types';
 
 const StyledCryptoAmount = styled(FormattedCryptoAmount)`
     margin-right: 2px;
diff --git a/packages/suite/src/components/suite/graph/TransactionsGraph/GraphTooltipBase.tsx b/packages/suite/src/components/suite/graph/TransactionsGraph/GraphTooltipBase.tsx
index 7ddf7779e04..88837f7daa9 100644
--- a/packages/suite/src/components/suite/graph/TransactionsGraph/GraphTooltipBase.tsx
+++ b/packages/suite/src/components/suite/graph/TransactionsGraph/GraphTooltipBase.tsx
@@ -1,4 +1,5 @@
 import { useEffect } from 'react';
+
 import styled from 'styled-components';
 import { TooltipProps } from 'recharts';
 
diff --git a/packages/suite/src/components/suite/graph/TransactionsGraph/GraphXAxisTick.tsx b/packages/suite/src/components/suite/graph/TransactionsGraph/GraphXAxisTick.tsx
index 93912bde74c..f59e6d2e6d6 100644
--- a/packages/suite/src/components/suite/graph/TransactionsGraph/GraphXAxisTick.tsx
+++ b/packages/suite/src/components/suite/graph/TransactionsGraph/GraphXAxisTick.tsx
@@ -1,7 +1,8 @@
-import { useTheme } from 'styled-components';
 import { FormattedDate } from 'react-intl';
 
+import { useTheme } from 'styled-components';
 import { differenceInMonths } from 'date-fns';
+
 import { GraphRange } from 'src/types/wallet/graph';
 
 const getFormattedDate = (range: GraphRange, date: Date) => {
diff --git a/packages/suite/src/components/suite/graph/TransactionsGraph/GraphYAxisTick.tsx b/packages/suite/src/components/suite/graph/TransactionsGraph/GraphYAxisTick.tsx
index b56a28949da..d2288abde5b 100644
--- a/packages/suite/src/components/suite/graph/TransactionsGraph/GraphYAxisTick.tsx
+++ b/packages/suite/src/components/suite/graph/TransactionsGraph/GraphYAxisTick.tsx
@@ -1,9 +1,12 @@
-import { useTheme } from 'styled-components';
 import { useRef, useLayoutEffect } from 'react';
-import { FormattedCryptoAmount } from 'src/components/suite';
+
+import { useTheme } from 'styled-components';
+
 import { useFormatters } from '@suite-common/formatters';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 
+import { FormattedCryptoAmount } from 'src/components/suite';
+
 interface CommonProps {
     setWidth: (n: number) => void;
     [k: string]: any;
diff --git a/packages/suite/src/components/suite/labeling/AccountLabeling.tsx b/packages/suite/src/components/suite/labeling/AccountLabeling.tsx
index e12ed00f8ff..568bbe84984 100644
--- a/packages/suite/src/components/suite/labeling/AccountLabeling.tsx
+++ b/packages/suite/src/components/suite/labeling/AccountLabeling.tsx
@@ -1,6 +1,7 @@
 import { findAccountDevice } from '@suite-common/wallet-utils';
 import { isSelectedDevice } from '@suite-common/suite-utils';
 import { selectDevices, selectDevice } from '@suite-common/wallet-core';
+import { BadgeProps } from '@trezor/components';
 
 import { AccountLabel } from 'src/components/suite';
 import { Account as WalletAccount } from 'src/types/wallet';
@@ -8,7 +9,6 @@ import { useSelector } from 'src/hooks/suite';
 import { selectLabelingDataForAccount } from 'src/reducers/suite/metadataReducer';
 
 import { WalletLabeling } from './WalletLabeling';
-import { BadgeProps } from '@trezor/components';
 
 interface AccountProps {
     account: WalletAccount | WalletAccount[];
@@ -44,7 +44,7 @@ export const AccountLabeling = ({
         />
     );
 
-    if (device && !accounts.find(a => a.deviceState === device.state)) {
+    if (device && !accounts.find(a => a.deviceState === device.state?.staticSessionId)) {
         // account is not associated with selected device, add wallet label
         const accountDevice = findAccountDevice(accounts[0], devices);
         if (accountDevice) {
diff --git a/packages/suite/src/components/suite/labeling/AddressLabeling.tsx b/packages/suite/src/components/suite/labeling/AddressLabeling.tsx
index 66160ef5cdc..00995d8a25d 100644
--- a/packages/suite/src/components/suite/labeling/AddressLabeling.tsx
+++ b/packages/suite/src/components/suite/labeling/AddressLabeling.tsx
@@ -1,7 +1,9 @@
 import { findAccountsByAddress } from '@suite-common/wallet-utils';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+
 import { useSelector } from 'src/hooks/suite';
+
 import { AccountLabeling } from './AccountLabeling';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 
 type AddressLabelingProps = {
     networkSymbol: NetworkSymbol;
diff --git a/packages/suite/src/components/suite/labeling/MetadataLabeling/MetadataLabeling.tsx b/packages/suite/src/components/suite/labeling/MetadataLabeling/MetadataLabeling.tsx
index 26463ce959b..543e0986e37 100644
--- a/packages/suite/src/components/suite/labeling/MetadataLabeling/MetadataLabeling.tsx
+++ b/packages/suite/src/components/suite/labeling/MetadataLabeling/MetadataLabeling.tsx
@@ -1,19 +1,23 @@
 import { useEffect, useState, useMemo, useRef } from 'react';
+
 import styled from 'styled-components';
 
 import { Button, DropdownMenuItemProps, Row } from '@trezor/components';
+import type { Timeout } from '@trezor/type-utils';
+import { StaticSessionId } from '@trezor/connect';
+
 import { useDiscovery, useDispatch, useSelector } from 'src/hooks/suite';
 import { addMetadata, init, setEditing } from 'src/actions/suite/metadataLabelingActions';
 import { MetadataAddPayload } from 'src/types/suite/metadata';
 import { Translation } from 'src/components/suite';
-import { Props, ExtendedProps } from './definitions';
-import { withEditable } from './withEditable';
-import { withDropdown } from './withDropdown';
 import {
     selectIsLabelingAvailableForEntity,
     selectIsLabelingInitPossible,
 } from 'src/reducers/suite/metadataReducer';
-import type { Timeout } from '@trezor/type-utils';
+
+import { Props, ExtendedProps } from './definitions';
+import { withEditable } from './withEditable';
+import { withDropdown } from './withDropdown';
 import { AccountTypeBadge } from '../../AccountTypeBadge';
 
 const LabelValue = styled.div`
@@ -301,7 +305,8 @@ export const MetadataLabeling = ({
     }, [payload.defaultValue, timeout]);
 
     const isLabelingInitPossible = useSelector(selectIsLabelingInitPossible);
-    const deviceState = payload.type === 'walletLabel' ? payload.entityKey : undefined;
+    const deviceState =
+        payload.type === 'walletLabel' ? (payload.entityKey as StaticSessionId) : undefined;
     const isLabelingAvailable = useSelector(state =>
         selectIsLabelingAvailableForEntity(state, payload.entityKey, deviceState),
     );
diff --git a/packages/suite/src/components/suite/labeling/MetadataLabeling/definitions.ts b/packages/suite/src/components/suite/labeling/MetadataLabeling/definitions.ts
index 4296fe205a4..a01776c289b 100644
--- a/packages/suite/src/components/suite/labeling/MetadataLabeling/definitions.ts
+++ b/packages/suite/src/components/suite/labeling/MetadataLabeling/definitions.ts
@@ -1,13 +1,14 @@
 import { ReactNode } from 'react';
+
 import { DropdownMenuItemProps } from '@trezor/components';
+import { AccountType, Bip43Path, NetworkType } from '@suite-common/wallet-config';
+
 import { MetadataAddPayload } from 'src/types/suite/metadata';
-import { AccountType } from '@suite-common/wallet-config';
-import { NetworkType } from '@suite-common/wallet-config';
 
 export interface Props {
     accountType?: AccountType;
     networkType?: NetworkType;
-    path?: string;
+    path?: Bip43Path;
     defaultVisibleValue?: ReactNode;
     defaultEditableValue?: string;
     payload: MetadataAddPayload;
diff --git a/packages/suite/src/components/suite/labeling/MetadataLabeling/withDropdown.tsx b/packages/suite/src/components/suite/labeling/MetadataLabeling/withDropdown.tsx
index 2b55c810a50..105f203d17e 100644
--- a/packages/suite/src/components/suite/labeling/MetadataLabeling/withDropdown.tsx
+++ b/packages/suite/src/components/suite/labeling/MetadataLabeling/withDropdown.tsx
@@ -1,10 +1,12 @@
 import { FC } from 'react';
+
 import styled from 'styled-components';
 
 import { Dropdown } from '@trezor/components';
-import { ExtendedProps } from './definitions';
 import { RequiredKey } from '@trezor/type-utils';
 
+import { ExtendedProps } from './definitions';
+
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledDropdown = styled(Dropdown)`
     display: flex;
diff --git a/packages/suite/src/components/suite/labeling/MetadataLabeling/withEditable.tsx b/packages/suite/src/components/suite/labeling/MetadataLabeling/withEditable.tsx
index afd3e8e8607..69a306d0a91 100644
--- a/packages/suite/src/components/suite/labeling/MetadataLabeling/withEditable.tsx
+++ b/packages/suite/src/components/suite/labeling/MetadataLabeling/withEditable.tsx
@@ -8,8 +8,8 @@ import {
 } from 'react';
 
 import styled, { useTheme } from 'styled-components';
-import { Icon } from '@trezor/components';
-import { AutoScalingInput } from '@trezor/components/src/components/AutoScalingInput/AutoScalingInput';
+
+import { Icon, AutoScalingInput } from '@trezor/components';
 
 const IconWrapper = styled.div<{ $bgColor: string }>`
     display: flex;
diff --git a/packages/suite/src/components/suite/labeling/WalletLabeling.tsx b/packages/suite/src/components/suite/labeling/WalletLabeling.tsx
index 5c477995b88..b25cc817790 100644
--- a/packages/suite/src/components/suite/labeling/WalletLabeling.tsx
+++ b/packages/suite/src/components/suite/labeling/WalletLabeling.tsx
@@ -1,10 +1,13 @@
+import { useCallback } from 'react';
+
+import styled from 'styled-components';
+
+import { selectDeviceLabelOrName } from '@suite-common/wallet-core';
+
 import { TrezorDevice } from 'src/types/suite';
 import { useTranslation } from 'src/hooks/suite/useTranslation';
 import { useSelector } from 'src/hooks/suite/useSelector';
 import { selectLabelingDataForWallet } from 'src/reducers/suite/metadataReducer';
-import { useCallback } from 'react';
-import styled from 'styled-components';
-import { selectDeviceLabelOrName } from '@suite-common/wallet-core';
 
 interface WalletLabellingProps {
     device: TrezorDevice;
diff --git a/packages/suite/src/components/suite/layouts/LoggedOutLayout.tsx b/packages/suite/src/components/suite/layouts/LoggedOutLayout.tsx
index 9f7e51c1ee5..0a84a0979cd 100644
--- a/packages/suite/src/components/suite/layouts/LoggedOutLayout.tsx
+++ b/packages/suite/src/components/suite/layouts/LoggedOutLayout.tsx
@@ -1,10 +1,14 @@
 import { ReactNode, useRef, useState } from 'react';
+
+import { ElevationContext, ElevationUp } from '@trezor/components';
+
 import { LayoutContext, LayoutContextPayload } from 'src/support/suite/LayoutContext';
 import { ModalContextProvider } from 'src/support/suite/ModalContext';
 import { useResetScrollOnUrl } from 'src/hooks/suite/useResetScrollOnUrl';
 import { GuideButton, GuideRouter } from 'src/components/guide';
 import { useLayoutSize } from 'src/hooks/suite';
 import { useClearAnchorHighlightOnClick } from 'src/hooks/suite/useClearAnchorHighlightOnClick';
+
 import { Metadata } from '../Metadata';
 import { ModalSwitcher } from '../modals/ModalSwitcher/ModalSwitcher';
 import {
@@ -15,7 +19,6 @@ import {
     PageWrapper,
     Wrapper,
 } from './SuiteLayout/SuiteLayout';
-import { ElevationContext, ElevationUp } from '@trezor/components';
 import { TrafficLightOffset } from '../TrafficLightOffset';
 
 interface LoggedOutLayout {
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/CoinjoinBars/CoinjoinBars.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/CoinjoinBars/CoinjoinBars.tsx
index c461eaadff8..2707a1c6e55 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/CoinjoinBars/CoinjoinBars.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/CoinjoinBars/CoinjoinBars.tsx
@@ -1,7 +1,9 @@
 import { useMemo } from 'react';
-import { CoinjoinStatusBar } from './CoinjoinStatusBar';
+
 import { useSelector } from 'src/hooks/suite';
 
+import { CoinjoinStatusBar } from './CoinjoinStatusBar';
+
 export const CoinjoinBars = () => {
     const coinjoinAccounts = useSelector(state => state.wallet.coinjoin.accounts);
 
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/CoinjoinBars/CoinjoinStatusBar.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/CoinjoinBars/CoinjoinStatusBar.tsx
index 12dbefe0e6b..ab41e9ee1b6 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/CoinjoinBars/CoinjoinStatusBar.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/CoinjoinBars/CoinjoinStatusBar.tsx
@@ -95,8 +95,10 @@ export const CoinjoinStatusBar = ({ accountKey, session, isSingle }: CoinjoinSta
 
     const { symbol, index, accountType, deviceState } = relatedAccount;
 
-    const relatedDevice = devices.find(device => device.state === relatedAccount?.deviceState);
-    const isOnSelectedDevice = selectedDevice?.state === deviceState;
+    const relatedDevice = devices.find(
+        device => device.state?.staticSessionId === relatedAccount?.deviceState,
+    );
+    const isOnSelectedDevice = selectedDevice?.state?.staticSessionId === deviceState;
 
     if (!relatedDevice) {
         return null;
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/DeviceSelector.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/DeviceSelector.tsx
index dc4886b62e1..998a9f1bdea 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/DeviceSelector.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/DeviceSelector.tsx
@@ -1,15 +1,19 @@
 import { useState, useEffect, useRef } from 'react';
+
 import styled, { css } from 'styled-components';
+
 import { selectDevicesCount, selectDevice } from '@suite-common/wallet-core';
 import type { Timeout } from '@trezor/type-utils';
+import { borders, spacingsPx } from '@trezor/theme';
+import { focusStyleTransition, getFocusShadowStyle } from '@trezor/components/src/utils/utils';
+import { Icon } from '@trezor/components';
+
 import { SHAKE } from 'src/support/suite/styles/animations';
 import { goto } from 'src/actions/suite/routerActions';
 import { useDispatch, useSelector } from 'src/hooks/suite';
-import { borders, spacingsPx } from '@trezor/theme';
-import { focusStyleTransition, getFocusShadowStyle } from '@trezor/components/src/utils/utils';
-import { SidebarDeviceStatus } from './SidebarDeviceStatus';
 import { ViewOnlyTooltip } from 'src/views/view-only/ViewOnlyTooltip';
-import { Icon } from '@trezor/components';
+
+import { SidebarDeviceStatus } from './SidebarDeviceStatus';
 
 const CaretContainer = styled.div`
     background: transparent;
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/DeviceStatus.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/DeviceStatus.tsx
index c84130f111d..ff6618ce9b5 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/DeviceStatus.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/DeviceStatus.tsx
@@ -1,13 +1,16 @@
+import { MouseEventHandler } from 'react';
+
 import styled from 'styled-components';
 
 import { DeviceModelInternal } from '@trezor/connect';
-import { DeviceDetail } from 'src/views/suite/SwitchDevice/DeviceItem/DeviceDetail';
-import { MouseEventHandler } from 'react';
-import { TrezorDevice } from 'src/types/suite';
-import { spacingsPx } from '@trezor/theme';
+import { spacings } from '@trezor/theme';
+import { Row } from '@trezor/components';
 import { RotateDeviceImage } from '@trezor/product-components';
-import { DeviceStatusText } from 'src/views/suite/SwitchDevice/DeviceItem/DeviceStatusText';
 import { selectDeviceLabelOrNameById } from '@suite-common/wallet-core';
+
+import { DeviceStatusText } from 'src/views/suite/SwitchDevice/DeviceItem/DeviceStatusText';
+import { TrezorDevice } from 'src/types/suite';
+import { DeviceDetail } from 'src/views/suite/SwitchDevice/DeviceItem/DeviceDetail';
 import { useSelector } from 'src/hooks/suite';
 
 type DeviceStatusProps = {
@@ -18,24 +21,10 @@ type DeviceStatusProps = {
     forceConnectionInfo?: boolean;
 };
 
-const Container = styled.div`
-    display: flex;
-    gap: ${spacingsPx.md};
-    flex: 1;
-    align-items: center;
-`;
-
 const DeviceWrapper = styled.div<{ $isLowerOpacity: boolean }>`
     display: flex;
-    opacity: ${({ $isLowerOpacity }) => $isLowerOpacity && 0.4};
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledRotateDeviceImage = styled(RotateDeviceImage)`
     width: 24px;
-
-    /* do not apply the darkening filter in dark mode on device images */
-    filter: none;
+    opacity: ${({ $isLowerOpacity }) => $isLowerOpacity && 0.4};
 `;
 
 export const DeviceStatus = ({
@@ -48,9 +37,9 @@ export const DeviceStatus = ({
     const deviceLabel = useSelector(state => selectDeviceLabelOrNameById(state, device?.id));
 
     return (
-        <Container>
+        <Row flex="1" gap={spacings.md}>
             <DeviceWrapper $isLowerOpacity={deviceNeedsRefresh}>
-                <StyledRotateDeviceImage
+                <RotateDeviceImage
                     deviceModel={deviceModel}
                     deviceColor={device?.features?.unit_color}
                     animationHeight="34px"
@@ -67,6 +56,6 @@ export const DeviceStatus = ({
                     />
                 </DeviceDetail>
             )}
-        </Container>
+        </Row>
     );
 };
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/SidebarDeviceStatus.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/SidebarDeviceStatus.tsx
index ef6b70e100c..99e28147351 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/SidebarDeviceStatus.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/DeviceSelector/SidebarDeviceStatus.tsx
@@ -1,7 +1,10 @@
 import { MouseEventHandler } from 'react';
+
 import { acquireDevice, selectDevice, selectDevices } from '@suite-common/wallet-core';
 import * as deviceUtils from '@suite-common/suite-utils';
+
 import { TrezorDevice } from 'src/types/suite';
+
 import { useDispatch, useSelector } from '../../../../../hooks/suite';
 import { DeviceStatus } from './DeviceStatus';
 
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileActionItem.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileActionItem.tsx
index e8e917b5a9f..e412e0bae12 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileActionItem.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileActionItem.tsx
@@ -1,5 +1,7 @@
 import { useMemo, ReactNode, HTMLAttributes } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
 import { Icon, IconName, variables } from '@trezor/components';
 import { FADE_IN } from '@trezor/components/src/config/animations';
 
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileMenu.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileMenu.tsx
index d909a14b102..22d31307d99 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileMenu.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileMenu.tsx
@@ -1,8 +1,10 @@
 import { useState } from 'react';
+
 import styled, { useTheme } from 'styled-components';
 
 import { zIndices } from '@trezor/theme';
 import { Icon, variables } from '@trezor/components';
+
 import { DeviceSelector } from '../DeviceSelector/DeviceSelector';
 import { MobileNavigation } from './MobileNavigation';
 import { MobileMenuActions } from './MobileMenuActions';
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileMenuActions.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileMenuActions.tsx
index 74779218350..f0397fae8c0 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileMenuActions.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileMenuActions.tsx
@@ -10,10 +10,10 @@ import { Translation } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { useGuide } from 'src/hooks/guide/useGuide';
 import { selectIsDiscreteModeActive } from 'src/reducers/wallet/settingsReducer';
+import { selectRouteName } from 'src/reducers/suite/routerReducer';
 
 import { MobileActionItem } from './MobileActionItem';
 import { useEnabledBackends } from '../utils';
-import { selectRouteName } from 'src/reducers/suite/routerReducer';
 
 const MobileWrapper = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileNavigation.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileNavigation.tsx
index 9e258fb9aec..2d9cb0aebbf 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileNavigation.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/MobileMenu/MobileNavigation.tsx
@@ -1,13 +1,14 @@
 import { transparentize } from 'polished';
 import styled, { css } from 'styled-components';
 
-import { findRouteByName } from 'src/utils/suite/router';
 import { variables } from '@trezor/components';
+import { typography } from '@trezor/theme';
+
+import { findRouteByName } from 'src/utils/suite/router';
 import { HoverAnimation, Translation } from 'src/components/suite';
 import { MAIN_MENU_ITEMS } from 'src/constants/suite/menu';
 import { useAccountSearch, useSelector, useDispatch } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
-import { typography } from '@trezor/theme';
 
 interface ComponentProps {
     isActive: boolean;
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/HeaderActionButton.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/HeaderActionButton.tsx
new file mode 100644
index 00000000000..40473d1228b
--- /dev/null
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/HeaderActionButton.tsx
@@ -0,0 +1,25 @@
+import { Button, ButtonProps, IconButton, IconButtonProps } from '@trezor/components';
+
+import { useSelector } from 'src/hooks/suite';
+
+export const HeaderActionButton = ({
+    icon,
+    onClick,
+    'data-testid': dataTestId,
+    variant,
+    size,
+    isDisabled,
+    children,
+}: Pick<ButtonProps, 'onClick' | 'data-testid' | 'variant' | 'size' | 'isDisabled' | 'children'> &
+    Pick<IconButtonProps, 'icon'>) => {
+    const layoutSize = useSelector(state => state.resize.size);
+
+    const isMobileLayout = layoutSize === 'TINY';
+    const commonProps = { icon, onClick, 'data-testid': dataTestId, variant, size, isDisabled };
+
+    return isMobileLayout ? (
+        <IconButton {...commonProps} />
+    ) : (
+        <Button {...commonProps}>{children}</Button>
+    );
+};
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/HeaderActions.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/HeaderActions.tsx
index 68c78e2d85c..e10ba724bba 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/HeaderActions.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/HeaderActions.tsx
@@ -1,24 +1,18 @@
 import styled from 'styled-components';
+
 import { EventType, analytics } from '@trezor/suite-analytics';
-import {
-    Button,
-    ButtonGroup,
-    ButtonProps,
-    Dropdown,
-    DropdownMenuItemProps,
-    IconButton,
-    IconButtonProps,
-    IconName,
-    variables,
-} from '@trezor/components';
+import { ButtonGroup, Dropdown, DropdownMenuItemProps, IconName } from '@trezor/components';
 import { spacingsPx } from '@trezor/theme';
 import { hasNetworkFeatures } from '@suite-common/wallet-utils';
+
 import { WalletParams } from 'src/types/wallet';
 import { Translation } from 'src/components/suite/Translation';
 import { useDevice, useDispatch, useSelector } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
 import { AppNavigationTooltip } from 'src/components/suite/AppNavigation/AppNavigationTooltip';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
+import { TradeActions } from 'src/components/suite/layouts/SuiteLayout/PageHeader/TradeActions';
+import { HeaderActionButton } from 'src/components/suite/layouts/SuiteLayout/PageHeader/HeaderActionButton';
 
 const Container = styled.div`
     display: flex;
@@ -26,13 +20,6 @@ const Container = styled.div`
     gap: ${spacingsPx.xxs};
 `;
 
-// instant without computing the layout
-const ShowOnLargeDesktopWrapper = styled.div`
-    ${variables.SCREEN_QUERY.BELOW_DESKTOP} {
-        display: none;
-    }
-`;
-
 type ActionItem = {
     id: string;
     icon?: IconName;
@@ -42,28 +29,6 @@ type ActionItem = {
     isHidden?: boolean;
 };
 
-const ButtonComponent = ({
-    icon,
-    onClick,
-    'data-testid': dataTestId,
-    variant,
-    size,
-    isDisabled,
-    children,
-}: Pick<ButtonProps, 'onClick' | 'data-testid' | 'variant' | 'size' | 'isDisabled' | 'children'> &
-    Pick<IconButtonProps, 'icon'>) => {
-    const layoutSize = useSelector(state => state.resize.size);
-
-    const isMobileLayout = layoutSize === 'TINY';
-    const commonProps = { icon, onClick, 'data-testid': dataTestId, variant, size, isDisabled };
-
-    return isMobileLayout ? (
-        <IconButton {...commonProps} />
-    ) : (
-        <Button {...commonProps}>{children}</Button>
-    );
-};
-
 export const HeaderActions = () => {
     const account = useSelector(selectSelectedAccount);
     const routerParams = useSelector(state => state.router.params) as WalletParams;
@@ -141,43 +106,12 @@ export const HeaderActions = () => {
             )}
 
             {isCoinmarketAvailable && (
-                <AppNavigationTooltip>
-                    <ShowOnLargeDesktopWrapper>
-                        <ButtonComponent
-                            icon="currencyCircleDollar"
-                            onClick={() => {
-                                goToWithAnalytics('wallet-coinmarket-buy', {
-                                    preserveParams: true,
-                                });
-                            }}
-                            data-testid="@wallet/menu/wallet-coinmarket-buy"
-                            variant="tertiary"
-                            size="small"
-                            isDisabled={isAccountLoading}
-                        >
-                            <Translation id="TR_COINMARKET_BUY_AND_SELL" />
-                        </ButtonComponent>
-                    </ShowOnLargeDesktopWrapper>
-                    <ButtonComponent
-                        icon="arrowsLeftRight"
-                        onClick={() => {
-                            goToWithAnalytics('wallet-coinmarket-exchange', {
-                                preserveParams: true,
-                            });
-                        }}
-                        data-testid="@wallet/menu/wallet-coinmarket-exchange"
-                        variant="tertiary"
-                        size="small"
-                        isDisabled={isAccountLoading}
-                    >
-                        <Translation id="TR_COINMARKET_SWAP" />
-                    </ButtonComponent>
-                </AppNavigationTooltip>
+                <TradeActions selectedAccount={selectedAccount} hideBuyAndSellBelowDesktop />
             )}
 
             <AppNavigationTooltip>
                 <ButtonGroup size="small" isDisabled={isAccountLoading}>
-                    <ButtonComponent
+                    <HeaderActionButton
                         key="wallet-send"
                         icon="send"
                         onClick={() => {
@@ -187,9 +121,9 @@ export const HeaderActions = () => {
                         variant={isDeviceConnected ? 'primary' : 'tertiary'}
                     >
                         <Translation id="TR_NAV_SEND" />
-                    </ButtonComponent>
+                    </HeaderActionButton>
 
-                    <ButtonComponent
+                    <HeaderActionButton
                         key="wallet-receive"
                         icon="receive"
                         onClick={() => {
@@ -199,7 +133,7 @@ export const HeaderActions = () => {
                         variant={isDeviceConnected ? 'primary' : 'tertiary'}
                     >
                         <Translation id="TR_NAV_RECEIVE" />
-                    </ButtonComponent>
+                    </HeaderActionButton>
                 </ButtonGroup>
             </AppNavigationTooltip>
         </Container>
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageHeader.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageHeader.tsx
index ec20253b11a..ed17cffffd1 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageHeader.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageHeader.tsx
@@ -1,11 +1,15 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
 
 import { Route } from '@suite-common/suite-types';
 import { spacingsPx, zIndices } from '@trezor/theme';
+
 import { useSelector } from 'src/hooks/suite';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
-import { selectIsAccountTabPage } from 'src/reducers/suite/routerReducer';
+import { selectIsAccountTabPage, selectRouteName } from 'src/reducers/suite/routerReducer';
+import { TradeActions } from 'src/components/suite/layouts/SuiteLayout/PageHeader/TradeActions';
+
 import { HeaderActions } from './HeaderActions';
 import { PageName } from './PageNames/PageName';
 
@@ -36,13 +40,17 @@ export const PageHeader = ({ backRoute, children }: PageHeaderProps) => {
     const selectedAccount = useSelector(selectSelectedAccount);
     // TODO subpages + tabs could be in some router config? this approach feels a bit fragile
     const isAccountTabPage = useSelector(selectIsAccountTabPage);
+    const routeName = useSelector(selectRouteName);
 
-    return children ? (
-        <Container>{children}</Container>
+    // handle moment when children are not rendered yet in the Trade section
+    const isTradeSection = routeName?.includes('wallet-coinmarket');
+
+    return isTradeSection || children ? (
+        <Container>{children ?? null}</Container>
     ) : (
         <Container>
             <PageName backRoute={backRoute} />
-
+            {routeName === 'suite-index' && <TradeActions />}
             {!!selectedAccount && isAccountTabPage && <HeaderActions />}
         </Container>
     );
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/AccountName/AccountDetails.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/AccountName/AccountDetails.tsx
index a34d757bc77..bcd487fa5b0 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/AccountName/AccountDetails.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/AccountName/AccountDetails.tsx
@@ -1,9 +1,13 @@
 import { useState, useEffect } from 'react';
+
 import styled, { keyframes } from 'styled-components';
+
 import { Account } from '@suite-common/wallet-types';
-import { spacingsPx } from '@trezor/theme';
+import { spacingsPx, zIndices, typography } from '@trezor/theme';
 import { H2 } from '@trezor/components';
-import { typography } from '@trezor/theme';
+import { CoinLogo } from '@trezor/product-components';
+import { isTestnet } from '@suite-common/wallet-utils';
+
 import {
     MetadataLabeling,
     AccountLabel,
@@ -11,10 +15,8 @@ import {
     FiatValue,
     AmountUnitSwitchWrapper,
 } from 'src/components/suite';
-import { useAccountLabel } from 'src/components/suite/AccountLabel';
-import { useSelector } from 'src/hooks/suite';
+import { useDefaultAccountLabel, useSelector } from 'src/hooks/suite';
 import { selectLabelingDataForSelectedAccount } from 'src/reducers/suite/metadataReducer';
-import { CoinLogo } from '@trezor/product-components';
 
 const rotateIn = keyframes`
     from {
@@ -74,6 +76,12 @@ const CryptoBalance = styled.div`
     gap: ${spacingsPx.xxs};
 `;
 
+// so that "to sats" button does not hide symbol and fiat
+const ForegroundWrapper = styled.div`
+    z-index: ${zIndices.base + 1};
+    display: flex;
+`;
+
 interface AccountDetailsProps {
     selectedAccount: Account;
     isBalanceShown: boolean;
@@ -83,7 +91,7 @@ export const AccountDetails = ({ selectedAccount, isBalanceShown }: AccountDetai
     const [shouldAnimate, setShouldAnimate] = useState(false);
     const [hasMounted, setHasMounted] = useState(false);
     const selectedAccountLabels = useSelector(selectLabelingDataForSelectedAccount);
-    const { defaultAccountLabelString } = useAccountLabel();
+    const { getDefaultAccountLabel } = useDefaultAccountLabel();
     const { symbol, key, path, index, accountType, formattedBalance } = selectedAccount;
 
     useEffect(() => {
@@ -121,21 +129,26 @@ export const AccountDetails = ({ selectedAccount, isBalanceShown }: AccountDetai
                         defaultValue: path,
                         value: selectedAccountLabels.accountLabel,
                     }}
-                    defaultEditableValue={defaultAccountLabelString({ accountType, symbol, index })}
+                    defaultEditableValue={getDefaultAccountLabel({ accountType, symbol, index })}
                     updateFlag={isBalanceShown}
                 />
             </AccountHeading>
             {isBalanceShown && (
                 <AccountBalance>
                     <CryptoBalance>
-                        <CoinLogo size={16} symbol={symbol} />
+                        <ForegroundWrapper>
+                            <CoinLogo size={16} symbol={symbol} />
+                        </ForegroundWrapper>
                         <AmountUnitSwitchWrapper symbol={symbol}>
                             <FormattedCryptoAmount value={formattedBalance} symbol={symbol} />
                         </AmountUnitSwitchWrapper>
                     </CryptoBalance>
-                    <span>
-                        ≈ <FiatValue amount={formattedBalance} symbol={symbol} />
-                    </span>
+                    {!isTestnet(symbol) && (
+                        <ForegroundWrapper>
+                            ≈&nbsp;
+                            <FiatValue amount={formattedBalance} symbol={symbol} />
+                        </ForegroundWrapper>
+                    )}
                 </AccountBalance>
             )}
         </DetailsContainer>
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/AccountName/AccountName.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/AccountName/AccountName.tsx
index c81529afaa9..bea86202091 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/AccountName/AccountName.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/AccountName/AccountName.tsx
@@ -1,7 +1,10 @@
 import { useEffect, useState } from 'react';
+
 import { spacings } from '@trezor/theme';
 import { Account } from '@suite-common/wallet-types';
+
 import { ACCOUNT_INFO_HEIGHT } from 'src/components/wallet/WalletLayout/AccountTopPanel/AccountTopPanel';
+
 import { AccountDetails } from './AccountDetails';
 import { SCROLL_WRAPPER_ID } from '../../../SuiteLayout';
 
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/AccountName/AccountSubpageName.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/AccountName/AccountSubpageName.tsx
index 1454512628a..57b82b335ba 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/AccountName/AccountSubpageName.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/AccountName/AccountSubpageName.tsx
@@ -1,11 +1,14 @@
 import styled from 'styled-components';
+
 import { IconButton } from '@trezor/components';
 import { Account } from '@suite-common/wallet-types';
 import { spacingsPx } from '@trezor/theme';
+import { Route } from '@suite-common/suite-types';
+
 import { useDispatch } from 'src/hooks/suite';
-import { AccountDetails } from './AccountDetails';
 import { goto } from 'src/actions/suite/routerActions';
-import { Route } from '@suite-common/suite-types';
+
+import { AccountDetails } from './AccountDetails';
 
 const Container = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/BasicName.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/BasicName.tsx
index 38af0ff431c..15b93699918 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/BasicName.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/BasicName.tsx
@@ -1,6 +1,8 @@
 import styled from 'styled-components';
+
 import { H2 } from '@trezor/components';
 import { TranslationKey } from '@suite-common/intl-types';
+
 import { Translation } from 'src/components/suite';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/PageName.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/PageName.tsx
index fb49d8a5add..d1d60c89f99 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/PageName.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/PageName.tsx
@@ -1,4 +1,5 @@
 import { Route } from '@suite-common/suite-types';
+
 import { useSelector } from 'src/hooks/suite';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 import { selectIsAccountTabPage } from 'src/reducers/suite/routerReducer';
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/SettingsName.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/SettingsName.tsx
index 5fdcb1d4915..6a9cc4d8825 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/SettingsName.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/SettingsName.tsx
@@ -1,13 +1,17 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
+
 import { desktopApi } from '@trezor/suite-desktop-api';
 import { IconButton } from '@trezor/components';
 import { spacingsPx } from '@trezor/theme';
+
 import { setDebugMode } from 'src/actions/suite/suiteActions';
 import { Translation } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { selectIsDebugModeActive, selectIsLoggedOut } from 'src/reducers/suite/suiteReducer';
 import { goto } from 'src/actions/suite/routerActions';
+
 import { HeaderHeading } from './BasicName';
 
 const Container = styled.div`
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/TradeActions.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/TradeActions.tsx
new file mode 100644
index 00000000000..aedea0a871f
--- /dev/null
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/PageHeader/TradeActions.tsx
@@ -0,0 +1,100 @@
+import styled, { css } from 'styled-components';
+
+import { Row, variables } from '@trezor/components';
+import { hasBitcoinOnlyFirmware } from '@trezor/device-utils';
+import { analytics, EventType } from '@trezor/suite-analytics';
+import { selectDevice } from '@suite-common/wallet-core';
+import { spacings } from '@trezor/theme';
+import { SelectedAccountStatus } from '@suite-common/wallet-types';
+
+import { goto } from 'src/actions/suite/routerActions';
+import { AppNavigationTooltip } from 'src/components/suite/AppNavigation/AppNavigationTooltip';
+import { Translation } from 'src/components/suite/Translation';
+import { useDispatch, useSelector } from 'src/hooks/suite';
+import { HeaderActionButton } from 'src/components/suite/layouts/SuiteLayout/PageHeader/HeaderActionButton';
+import { selectIsAccountTabPage, selectRouteName } from 'src/reducers/suite/routerReducer';
+
+// instant without computing the layout
+const ShowOnLargeDesktopWrapper = styled.div<{ $isActive?: boolean }>`
+    ${({ $isActive }) =>
+        $isActive &&
+        css`
+            ${variables.SCREEN_QUERY.BELOW_DESKTOP} {
+                display: none;
+            }
+        `}
+`;
+interface TradeActionsProps {
+    selectedAccount?: SelectedAccountStatus;
+    hideBuyAndSellBelowDesktop?: boolean;
+}
+
+export const TradeActions = ({
+    selectedAccount,
+    hideBuyAndSellBelowDesktop,
+}: TradeActionsProps) => {
+    const dispatch = useDispatch();
+    const account = selectedAccount?.account;
+    const device = useSelector(selectDevice);
+    const isAccountTabPage = useSelector(selectIsAccountTabPage);
+    const currentRouteName = useSelector(selectRouteName);
+
+    const goToWithAnalytics = (...[routeName, options]: Parameters<typeof goto>) => {
+        if (currentRouteName === 'suite-index') {
+            analytics.report({
+                type: EventType.DashboardActions,
+                payload: { type: routeName },
+            });
+        }
+
+        if (isAccountTabPage && account?.symbol) {
+            analytics.report({
+                type: EventType.AccountsActions,
+                payload: { symbol: account?.symbol, action: routeName },
+            });
+        }
+
+        dispatch(goto(routeName, options));
+    };
+
+    const isAccountLoading = selectedAccount ? selectedAccount.status === 'loading' : false;
+
+    return (
+        <Row gap={spacings.xxs}>
+            <AppNavigationTooltip>
+                <ShowOnLargeDesktopWrapper $isActive={hideBuyAndSellBelowDesktop}>
+                    <HeaderActionButton
+                        icon="currencyCircleDollar"
+                        onClick={() => {
+                            goToWithAnalytics('wallet-coinmarket-buy', {
+                                preserveParams: true,
+                            });
+                        }}
+                        data-testid="@wallet/menu/wallet-coinmarket-buy"
+                        variant="tertiary"
+                        size="small"
+                        isDisabled={isAccountLoading}
+                    >
+                        <Translation id="TR_COINMARKET_BUY_AND_SELL" />
+                    </HeaderActionButton>
+                </ShowOnLargeDesktopWrapper>
+                {!hasBitcoinOnlyFirmware(device) && (
+                    <HeaderActionButton
+                        icon="arrowsLeftRight"
+                        onClick={() => {
+                            goToWithAnalytics('wallet-coinmarket-exchange', {
+                                preserveParams: true,
+                            });
+                        }}
+                        data-testid="@wallet/menu/wallet-coinmarket-exchange"
+                        variant="tertiary"
+                        size="small"
+                        isDisabled={isAccountLoading}
+                    >
+                        <Translation id="TR_COINMARKET_SWAP" />
+                    </HeaderActionButton>
+                )}
+            </AppNavigationTooltip>
+        </Row>
+    );
+};
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/Navigation.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/Navigation.tsx
index dc81baea00d..9c6bcde8168 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/Navigation.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/Navigation.tsx
@@ -1,11 +1,15 @@
 import { FC } from 'react';
+
 import styled from 'styled-components';
+
 import { spacingsPx } from '@trezor/theme';
-import { NavigationItem, NavigationItemProps } from './NavigationItem';
-import { NotificationDropdown } from './NotificationDropdown';
+
 import { useSelector } from 'src/hooks/suite';
 import { selectHasExperimentalFeature } from 'src/reducers/suite/suiteReducer';
 
+import { NavigationItem, NavigationItemProps } from './NavigationItem';
+import { NotificationDropdown } from './NotificationDropdown';
+
 const Nav = styled.nav`
     display: flex;
     flex-direction: column;
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/NavigationItem.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/NavigationItem.tsx
index 066a29acd24..194f3487e16 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/NavigationItem.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/NavigationItem.tsx
@@ -1,22 +1,30 @@
+import { MouseEvent } from 'react';
+
 import styled, { css, useTheme } from 'styled-components';
 
 import { ExtendedMessageDescriptor, TranslationKey } from '@suite-common/intl-types';
-import { Elevation, borders, mapElevationToBackground, spacingsPx } from '@trezor/theme';
+import {
+    Elevation,
+    borders,
+    mapElevationToBackground,
+    spacingsPx,
+    TypographyStyle,
+} from '@trezor/theme';
 import { getFocusShadowStyle } from '@trezor/components/src/utils/utils';
-import { Translation } from 'src/components/suite/Translation';
 import { Route } from '@suite-common/suite-types';
+import { Icon, IconName, IconSize, useElevation, Paragraph } from '@trezor/components';
+
+import { Translation } from 'src/components/suite/Translation';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
-import { MouseEvent } from 'react';
 import { selectRouteName } from 'src/reducers/suite/routerReducer';
-import { Icon, IconName, IconSize, useElevation } from '@trezor/components';
 
 export const NavigationItemBase = styled.div.attrs(() => ({
     tabIndex: 0,
 }))`
     display: flex;
+    flex-direction: row;
     align-items: center;
-    gap: ${spacingsPx.md};
     padding: ${spacingsPx.xs};
     border-radius: ${borders.radii.sm};
     color: ${({ theme }) => theme.textSubdued};
@@ -31,7 +39,10 @@ export const NavigationItemBase = styled.div.attrs(() => ({
 const Container = styled(NavigationItemBase)<{
     $elevation: Elevation;
     $isActive?: boolean;
+    $isRounded?: boolean;
+    $typographyStyle?: TypographyStyle;
 }>`
+    gap: ${({ $typographyStyle }) => ($typographyStyle === 'hint' ? spacingsPx.xs : spacingsPx.md)};
     ${({ theme, $isActive }) =>
         $isActive
             ? css<{ $elevation: Elevation }>`
@@ -52,10 +63,12 @@ const Container = styled(NavigationItemBase)<{
                       }
                   }
               `}
-`;
-
-const Count = styled.div`
-    color: ${({ theme }) => theme.textSubdued};
+    ${({ $isRounded }) =>
+        $isRounded &&
+        css`
+            border-radius: ${borders.radii.full};
+            padding: ${spacingsPx.xs} ${spacingsPx.md};
+        `}
 `;
 
 export interface NavigationItemProps {
@@ -70,6 +83,8 @@ export interface NavigationItemProps {
     values?: ExtendedMessageDescriptor['values'];
     iconSize?: IconSize;
     itemsCount?: number;
+    isRounded?: boolean;
+    typographyStyle?: TypographyStyle;
 }
 
 export const NavigationItem = ({
@@ -84,6 +99,8 @@ export const NavigationItem = ({
     preserveParams,
     iconSize = 'large',
     itemsCount,
+    isRounded = false,
+    typographyStyle = 'body',
 }: NavigationItemProps) => {
     const activeRoute = useSelector(selectRouteName);
     const { elevation } = useElevation();
@@ -109,10 +126,18 @@ export const NavigationItem = ({
             className={className}
             tabIndex={0}
             $elevation={elevation}
+            $isRounded={isRounded}
+            $typographyStyle={typographyStyle}
         >
             <Icon name={icon} size={iconSize} color={theme.iconSubdued} pointerEvents="none" />
-            <Translation id={nameId} values={values} />
-            {itemsCount && <Count>{itemsCount}</Count>}
+            <Paragraph typographyStyle={typographyStyle}>
+                <Translation id={nameId} values={values} />
+            </Paragraph>
+            {itemsCount && (
+                <Paragraph variant="tertiary" typographyStyle={typographyStyle}>
+                    {itemsCount}
+                </Paragraph>
+            )}
         </Container>
     );
 };
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/NotificationDropdown.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/NotificationDropdown.tsx
index bbf2988d770..97b5b75f7b3 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/NotificationDropdown.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/NotificationDropdown.tsx
@@ -1,11 +1,15 @@
 import { useRef, useCallback } from 'react';
+
 import styled, { css } from 'styled-components';
+
 import { breakpointMediaQueries } from '@trezor/styles';
 import { DropdownRef, Dropdown } from '@trezor/components';
 import { analytics, EventType } from '@trezor/suite-analytics';
 import { notificationsActions } from '@suite-common/toast-notifications';
+
 import { Notifications } from 'src/components/suite/notifications';
 import { useDispatch } from 'src/hooks/suite';
+
 import { NavigationItem, NavigationItemProps } from './NavigationItem';
 
 const NotificationsWrapper = styled.div`
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/CustomBackend.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/CustomBackend.tsx
index a7bdcd5cbd2..9dec46e258d 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/CustomBackend.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/CustomBackend.tsx
@@ -1,7 +1,9 @@
 import { useTheme } from 'styled-components';
+
+import { ComponentWithSubIcon, Icon, iconSizes } from '@trezor/components';
+
 import { useTranslation } from '../../../../../../hooks/suite';
 import { useEnabledBackends } from '../../utils';
-import { ComponentWithSubIcon, Icon, iconSizes } from '@trezor/components';
 import { NavBackends } from './NavBackends';
 import { QuickActionButton } from './QuickActionButton';
 
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/DebugAndExperimental.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/DebugAndExperimental.tsx
index 1fb83af383a..d9715a6e11a 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/DebugAndExperimental.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/DebugAndExperimental.tsx
@@ -1,11 +1,14 @@
+import styled from 'styled-components';
+
 import { Column, getIconSize, Icon, iconSizes } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
+
 import { QuickActionButton } from './QuickActionButton';
-import styled from 'styled-components';
 import { TooltipRow } from './TooltipRow';
-import { spacings } from '@trezor/theme';
 import { Translation } from '../../../../Translation';
 
 type DebugAndExperimentalTooltipProps = {
@@ -19,7 +22,7 @@ const DebugAndExperimentalTooltip = ({
     isEapEnabled,
     isExperimental,
 }: DebugAndExperimentalTooltipProps) => (
-    <Column gap={spacings.md} alignItems="start">
+    <Column gap={spacings.md} alignItems="start" margin={{ right: spacings.xxs }}>
         {isExperimental && (
             <TooltipRow
                 circleIconName="check"
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/HideBalances.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/HideBalances.tsx
index 721e1e08032..923b9d115e3 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/HideBalances.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/HideBalances.tsx
@@ -1,4 +1,5 @@
 import { Icon, iconSizes } from '@trezor/components';
+
 import { setDiscreetMode } from '../../../../../../actions/settings/walletSettingsActions';
 import { useDispatch, useSelector, useTranslation } from '../../../../../../hooks/suite';
 import { selectIsDiscreteModeActive } from '../../../../../../reducers/wallet/settingsReducer';
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/NavBackends.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/NavBackends.tsx
index 34ef8fcb7d4..dc40b0feaea 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/NavBackends.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/NavBackends.tsx
@@ -1,15 +1,17 @@
 import React, { ReactNode, useRef, useState } from 'react';
+
 import styled from 'styled-components';
 
 import { Dropdown, DropdownRef } from '@trezor/components';
+import { BlockchainState } from '@suite-common/wallet-core';
+import { spacingsPx, typography } from '@trezor/theme';
+import { CoinLogo } from '@trezor/product-components';
+
 import { Translation, StatusLight } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
-import { BlockchainState } from '@suite-common/wallet-core';
 import type { CustomBackend } from 'src/types/wallet';
 import { openModal } from 'src/actions/suite/modalActions';
-import { spacingsPx, typography } from '@trezor/theme';
-import { CoinLogo } from '@trezor/product-components';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledDropdown = styled(Dropdown)`
@@ -81,6 +83,17 @@ type NavBackendsProps = {
     children: ReactNode;
 };
 
+/**
+ * The must be div so Dropdown works. Its mess, Dropdown shall be reworked.
+ *
+ * The issue here is that `Dropdown` component expects child with `isDisabled` prop,
+ * as it passes this props via `cloneElement()`.
+ */
+// @ts-expect-error `isDisabled` is needed here despite not being used
+const WrapperDiv = ({ children, isDisabled }: { isDisabled?: boolean; children: ReactNode }) => (
+    <div>{children}</div>
+);
+
 export const NavBackends = ({ customBackends, children }: NavBackendsProps) => {
     const [open, setOpen] = useState(false);
     const dropdownRef = useRef<DropdownRef>();
@@ -133,8 +146,8 @@ export const NavBackends = ({ customBackends, children }: NavBackendsProps) => {
             }}
             items={items}
         >
-            {/* The must be div so Dropdown works. Its mess, Dropdown shall be reworked.*/}
-            <div>{children}</div>
+            {/* The must be div so Dropdown works. Its mess, Dropdown shall be reworked. */}
+            <WrapperDiv>{children}</WrapperDiv>
         </StyledDropdown>
     );
 };
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/QuickActionButton.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/QuickActionButton.tsx
index 68ada7d9318..5ee6b62005a 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/QuickActionButton.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/QuickActionButton.tsx
@@ -1,7 +1,9 @@
 import React, { ReactNode } from 'react';
-import { Tooltip } from '@trezor/components';
+
 import styled from 'styled-components';
 
+import { Tooltip } from '@trezor/components';
+
 const Container = styled.div`
     height: 44px;
     flex: 1;
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/QuickActions.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/QuickActions.tsx
index 24c3f6fac82..687faf8847c 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/QuickActions.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/QuickActions.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { spacingsPx } from '@trezor/theme';
 
 import { Tor } from './Tor';
@@ -20,9 +21,13 @@ const ActionsContainer = styled.div`
     }
 `;
 
-export const QuickActions = () => (
+type QuickActionsProps = {
+    showUpdateBannerNotification: boolean;
+};
+
+export const QuickActions = ({ showUpdateBannerNotification }: QuickActionsProps) => (
     <ActionsContainer>
-        <UpdateStatusActionBarIcon />
+        <UpdateStatusActionBarIcon showUpdateBannerNotification={showUpdateBannerNotification} />
         <DebugAndExperimental />
         <CustomBackend />
         <Tor />
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/TooltipRow.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/TooltipRow.tsx
index 59368f44afd..0d0ced88f10 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/TooltipRow.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/TooltipRow.tsx
@@ -1,4 +1,7 @@
+import { ReactNode } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
 import {
     Column,
     Row,
@@ -9,7 +12,6 @@ import {
     IconVariant,
     IconName,
 } from '@trezor/components';
-import { ReactNode } from 'react';
 import { borders, spacings, spacingsPx } from '@trezor/theme';
 
 type IconCircleWrapperProps = {
@@ -31,12 +33,17 @@ const IconCircleWrapper = styled.div<IconCircleWrapperProps>`
     padding: ${spacingsPx.xxxs};
 `;
 
+const Pointer = styled.div`
+    cursor: ${({ onClick }) => (onClick ? 'pointer' : undefined)};
+`;
+
 type UpdateRowProps = {
     children: ReactNode;
     leftItem: ReactNode;
     header: ReactNode;
     variant: IconVariant;
     circleIconName: IconName;
+    onClick?: () => void;
 };
 
 export const TooltipRow = ({
@@ -45,25 +52,28 @@ export const TooltipRow = ({
     header,
     variant,
     circleIconName,
+    onClick,
 }: UpdateRowProps) => {
     const theme = useTheme();
 
     return (
-        <Row gap={spacings.sm}>
-            {leftItem}
-            <Column alignItems="start">
-                <Text>{header}</Text>
-                <Row gap={spacings.xxs}>
-                    <IconCircleWrapper $variant={variant}>
-                        <Icon
-                            name={circleIconName}
-                            color={theme.iconDefaultInverted}
-                            size={iconSizes.extraSmall}
-                        />
-                    </IconCircleWrapper>
-                    <Text variant={variant}>{children}</Text>
-                </Row>
-            </Column>
-        </Row>
+        <Pointer onClick={onClick}>
+            <Row gap={spacings.sm} onClick={onClick}>
+                {leftItem}
+                <Column alignItems="start">
+                    <Text>{header}</Text>
+                    <Row gap={spacings.xxs}>
+                        <IconCircleWrapper $variant={variant}>
+                            <Icon
+                                name={circleIconName}
+                                color={theme.iconDefaultInverted}
+                                size={iconSizes.extraSmall}
+                            />
+                        </IconCircleWrapper>
+                        <Text variant={variant}>{children}</Text>
+                    </Row>
+                </Column>
+            </Row>
+        </Pointer>
     );
 };
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Tor.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Tor.tsx
index 113b4e2f2fa..240147c0351 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Tor.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Tor.tsx
@@ -1,7 +1,5 @@
-import { goto } from 'src/actions/suite/routerActions';
-import { SettingsAnchor } from 'src/constants/suite/anchors';
-import { useDispatch, useSelector } from 'src/hooks/suite';
-import { selectTorState } from '../../../../../../reducers/suite/suiteReducer';
+import { useTheme } from 'styled-components';
+
 import { isDesktop } from '@trezor/env-utils';
 import {
     Column,
@@ -11,10 +9,15 @@ import {
     iconSizes,
     IconVariant,
 } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
+import { goto } from 'src/actions/suite/routerActions';
+import { SettingsAnchor } from 'src/constants/suite/anchors';
+import { useDispatch, useSelector } from 'src/hooks/suite';
 import { TorStatus } from 'src/types/suite';
-import { useTheme } from 'styled-components';
+
+import { selectTorState } from '../../../../../../reducers/suite/suiteReducer';
 import { QuickActionButton } from './QuickActionButton';
-import { spacings } from '@trezor/theme';
 import { TooltipRow } from './TooltipRow';
 import { Translation, TranslationKey } from '../../../../Translation';
 
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateIconGroup.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateIconGroup.tsx
index 1d639468b24..f57fe1054c0 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateIconGroup.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateIconGroup.tsx
@@ -1,5 +1,7 @@
-import { spacingsPx } from '@trezor/theme';
 import styled, { css } from 'styled-components';
+
+import { spacingsPx } from '@trezor/theme';
+
 import { mapVariantToIconBackground, UpdateVariant } from './updateQuickActionTypes';
 
 type UpdateIconGroupProps = {
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateNotificationBanner.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateNotificationBanner.tsx
new file mode 100644
index 00000000000..dc8e83bc05b
--- /dev/null
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateNotificationBanner.tsx
@@ -0,0 +1,136 @@
+import { MouseEvent } from 'react';
+
+import styled from 'styled-components';
+
+import { Column, ElevationContext, Icon, Row, Text } from '@trezor/components';
+import { borders, Elevation, mapElevationToBackground, spacingsPx } from '@trezor/theme';
+
+import {
+    UpdateStatus,
+    UpdateStatusSuite,
+    UpdateStatusDevice,
+    mapSuiteUpdateToClick,
+    mapDeviceUpdateToClick,
+} from './updateQuickActionTypes';
+import { Translation, TranslationKey } from '../../../../../Translation';
+import { useDispatch } from '../../../../../../../hooks/suite';
+
+type ContainerProps = { $elevation: Elevation };
+
+const Container = styled.div<ContainerProps>`
+    margin: ${spacingsPx.md};
+    display: flex;
+    flex-direction: column;
+    padding: ${spacingsPx.xs} ${spacingsPx.sm};
+    background: ${mapElevationToBackground};
+    border-radius: ${borders.radii.sm};
+    box-shadow: ${({ theme }) => theme.boxShadowElevated};
+    cursor: ${({ onClick }) => (onClick !== undefined ? 'pointer' : undefined)};
+`;
+
+const CloseIconBackground = styled.div`
+    width: 36px;
+    height: 36px;
+
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-color: ${({ theme }) => theme.backgroundSurfaceElevation2};
+    border-radius: ${borders.radii.full};
+    cursor: ${({ onClick }) => (onClick !== undefined ? 'pointer' : undefined)};
+`;
+
+type UpdateNotificationBannerProps = {
+    updateStatusDevice: UpdateStatusDevice;
+    updateStatusSuite: UpdateStatusSuite;
+    onClose: () => void;
+};
+
+const mapDeviceUpdateStatusToTranslation: Record<UpdateStatusDevice, TranslationKey | null> = {
+    disconnected: null,
+    'up-to-date': null,
+    'update-available': 'TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE',
+};
+
+const mapSuiteUpdateStatusToHeaderTranslation: Record<UpdateStatusSuite, TranslationKey | null> = {
+    'update-downloaded-auto-restart-to-update':
+        'TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED',
+    'update-downloaded-manual': 'TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED',
+    'just-updated': 'TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED',
+    'up-to-date': null,
+    'update-available': 'TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE',
+};
+
+const mapSuiteUpdateStatusToCallToActionTranslation: Record<UpdateStatus, TranslationKey | null> = {
+    disconnected: null,
+    'just-updated': 'TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW',
+    'up-to-date': null,
+    'update-available': 'TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE',
+    'update-downloaded-auto-restart-to-update':
+        'TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE',
+    'update-downloaded-manual': 'TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE',
+};
+
+export const UpdateNotificationBanner = ({
+    updateStatusDevice,
+    updateStatusSuite,
+    onClose,
+}: UpdateNotificationBannerProps) => {
+    const dispatch = useDispatch();
+
+    const translationHeader =
+        updateStatusSuite !== 'up-to-date' // Update suite first, because it will contain the newest firmware
+            ? mapSuiteUpdateStatusToHeaderTranslation[updateStatusSuite]
+            : mapDeviceUpdateStatusToTranslation[updateStatusDevice];
+
+    const translationCallToAction =
+        mapSuiteUpdateStatusToCallToActionTranslation[
+            updateStatusSuite !== 'up-to-date' ? updateStatusSuite : updateStatusDevice
+        ];
+
+    if (translationHeader === null || translationCallToAction === null) {
+        return null;
+    }
+
+    const handleOnClick = () => {
+        const onClick =
+            updateStatusSuite !== 'up-to-date'
+                ? mapSuiteUpdateToClick[updateStatusSuite]
+                : mapDeviceUpdateToClick[updateStatusDevice];
+
+        if (onClick !== null) {
+            onClick({ dispatch });
+            onClose();
+        }
+    };
+
+    const handleOnClose = (e: MouseEvent<HTMLDivElement>) => {
+        // Click on whole banner has onClick, so prevent the activation when closing the modal
+        e.stopPropagation();
+        onClose();
+    };
+
+    return (
+        <ElevationContext baseElevation={1}>
+            <Container
+                $elevation={1}
+                onClick={handleOnClick}
+                data-testid="@notification/update-notification-banner"
+            >
+                <Row justifyContent="stretch">
+                    <Column flex="1" alignItems="start">
+                        <Text>
+                            <Translation id={translationHeader} />
+                        </Text>
+                        <Text variant="primary">
+                            <Translation id={translationCallToAction} />
+                        </Text>
+                    </Column>
+                    <CloseIconBackground onClick={handleOnClose}>
+                        <Icon name="x" size="medium" />
+                    </CloseIconBackground>
+                </Row>
+            </Container>
+        </ElevationContext>
+    );
+};
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateStatusActionBarIcon.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateStatusActionBarIcon.tsx
index 6059101dd33..5b4d4a63d13 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateStatusActionBarIcon.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateStatusActionBarIcon.tsx
@@ -1,22 +1,25 @@
+import { useDispatch } from 'react-redux';
+
 import styled, { css, DefaultTheme, useTheme } from 'styled-components';
-import { useDevice } from '../../../../../../../hooks/suite';
+
 import { ComponentWithSubIcon, getIconSize, Icon, IconSize, iconSizes } from '@trezor/components';
+import { borders, Color, CSSColor } from '@trezor/theme';
+import { isDesktop } from '@trezor/env-utils';
+import { mapTrezorModelToIcon } from '@trezor/product-components';
+
+import { useDevice } from '../../../../../../../hooks/suite';
 import { QuickActionButton } from '../QuickActionButton';
 import { UpdateIconGroup } from './UpdateIconGroup';
-import { borders, Color, CSSColor } from '@trezor/theme';
 import { useUpdateStatus } from './useUpdateStatus';
 import { UpdateTooltip } from './UpdateTooltip';
 import {
+    mapDeviceUpdateToClick,
+    mapSuiteUpdateToClick,
     mapUpdateStatusToIcon,
     mapUpdateStatusToVariant,
     UpdateStatus,
     UpdateVariant,
 } from './updateQuickActionTypes';
-import { isDesktop } from '@trezor/env-utils';
-import { useDispatch } from 'react-redux';
-import { goto } from 'src/actions/suite/routerActions';
-import { SettingsAnchor } from '../../../../../../../constants/suite/anchors';
-import { mapTrezorModelToIcon } from '@trezor/product-components';
 
 type MapArgs = {
     $variant: UpdateVariant;
@@ -139,10 +142,17 @@ const SuiteUpdateIcon = ({ iconSize, updateStatus, variant }: SuiteUpdateIconPro
     );
 };
 
-export const UpdateStatusActionBarIcon = () => {
+type UpdateStatusActionBarIconProps = {
+    showUpdateBannerNotification: boolean;
+};
+
+export const UpdateStatusActionBarIcon = ({
+    showUpdateBannerNotification,
+}: UpdateStatusActionBarIconProps) => {
     const theme = useTheme();
 
     const { updateStatus, updateStatusDevice, updateStatusSuite } = useUpdateStatus();
+
     const { device } = useDevice();
     const dispatch = useDispatch();
 
@@ -156,47 +166,54 @@ export const UpdateStatusActionBarIcon = () => {
         return null;
     }
 
-    const handleOnClick = () => {
-        if (updateStatusSuite === 'update-available') {
-            dispatch(goto('settings-index', { anchor: SettingsAnchor.VersionWithUpdate }));
-        } else if (updateStatusDevice === 'update-available') {
-            dispatch(goto('settings-device', { anchor: SettingsAnchor.FirmwareVersion }));
+    const suiteOnClick = () => mapSuiteUpdateToClick[updateStatusSuite]?.({ dispatch });
+    const deviceOnClick = () => mapDeviceUpdateToClick[updateStatusDevice]?.({ dispatch });
+
+    const handleClick = () => {
+        if (updateStatusSuite !== 'up-to-date') {
+            suiteOnClick();
+        } else if (updateStatusDevice !== 'up-to-date') {
+            deviceOnClick();
         }
     };
 
     return (
-        <QuickActionButton
-            tooltip={
-                <UpdateTooltip
-                    updateStatusDevice={updateStatusDevice}
-                    updateStatusSuite={updateStatusSuite}
-                />
-            }
-            onClick={handleOnClick}
-        >
-            <ComponentWithSubIcon
-                variant={variant}
-                subIconProps={{
-                    name: updateSubIcon,
-                    color: theme.iconDefaultInverted,
-                    size: iconSizes.extraSmall,
-                }}
+        <div>
+            <QuickActionButton
+                tooltip={
+                    !showUpdateBannerNotification && (
+                        <UpdateTooltip
+                            updateStatusDevice={updateStatusDevice}
+                            updateStatusSuite={updateStatusSuite}
+                        />
+                    )
+                }
+                onClick={handleClick}
             >
-                <UpdateIconGroup $variant={variant}>
-                    <DeviceUpdateIcon
-                        iconSize={iconSize}
-                        updateStatus={updateStatusDevice}
-                        variant={variant}
-                    />
-                    {isDesktopSuite && (
-                        <SuiteUpdateIcon
+                <ComponentWithSubIcon
+                    variant={variant}
+                    subIconProps={{
+                        name: updateSubIcon,
+                        color: theme.iconDefaultInverted,
+                        size: iconSizes.extraSmall,
+                    }}
+                >
+                    <UpdateIconGroup $variant={variant}>
+                        <DeviceUpdateIcon
                             iconSize={iconSize}
                             updateStatus={updateStatusDevice}
                             variant={variant}
                         />
-                    )}
-                </UpdateIconGroup>
-            </ComponentWithSubIcon>
-        </QuickActionButton>
+                        {isDesktopSuite && (
+                            <SuiteUpdateIcon
+                                iconSize={iconSize}
+                                updateStatus={updateStatusDevice}
+                                variant={variant}
+                            />
+                        )}
+                    </UpdateIconGroup>
+                </ComponentWithSubIcon>
+            </QuickActionButton>
+        </div>
     );
 };
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateTooltip.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateTooltip.tsx
index 98b281c9e1a..c5c1d127416 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateTooltip.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/UpdateTooltip.tsx
@@ -1,17 +1,21 @@
 import styled, { useTheme } from 'styled-components';
-import { useDevice, useSelector } from '../../../../../../../hooks/suite';
+
 import { Column, getIconSize, Icon, IconSize, iconSizes } from '@trezor/components';
-import {
-    mapUpdateStatusToIcon,
-    mapUpdateStatusToVariant,
-    UpdateStatus,
-} from './updateQuickActionTypes';
-import { Translation } from '../../../../../Translation';
 import { spacings } from '@trezor/theme';
 import { TranslationKey } from '@suite-common/intl-types';
 import { getFirmwareVersion } from '@trezor/device-utils';
 import { isDesktop } from '@trezor/env-utils';
 import { mapTrezorModelToIcon } from '@trezor/product-components';
+
+import { Translation } from '../../../../../Translation';
+import {
+    mapUpdateStatusToIcon,
+    mapUpdateStatusToVariant,
+    UpdateStatus,
+    UpdateStatusSuite,
+    UpdateStatusDevice,
+} from './updateQuickActionTypes';
+import { useDevice, useSelector } from '../../../../../../../hooks/suite';
 import { TooltipRow } from '../TooltipRow';
 
 const SuiteIconRectangle = styled.div<{ $size: IconSize }>`
@@ -27,17 +31,20 @@ const SuiteIconRectangle = styled.div<{ $size: IconSize }>`
 `;
 
 const mapUpdateStatusToTranslation: Record<UpdateStatus, TranslationKey> = {
+    disconnected: 'TR_QUICK_ACTION_TOOLTIP_DEVICE_DISCONNECTED',
+    'update-downloaded-manual': 'TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE',
+    'update-downloaded-auto-restart-to-update': 'TR_QUICK_ACTION_TOOLTIP_RESTART_TO_UPDATE',
     'up-to-date': 'TR_QUICK_ACTION_TOOLTIP_UP_TO_DATE',
     'update-available': 'TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE',
-    'restart-to-update': 'TR_QUICK_ACTION_TOOLTIP_RESTART_TO_UPDATE',
     'just-updated': 'TR_QUICK_ACTION_TOOLTIP_JUST_UPDATED',
 };
 
 type DeviceRowProps = {
-    updateStatus: UpdateStatus;
+    updateStatus: UpdateStatusDevice;
+    onClick?: () => void;
 };
 
-const DeviceRow = ({ updateStatus }: DeviceRowProps) => {
+const DeviceRow = ({ updateStatus, onClick }: DeviceRowProps) => {
     const { device } = useDevice();
 
     if (device?.features === undefined) {
@@ -49,6 +56,7 @@ const DeviceRow = ({ updateStatus }: DeviceRowProps) => {
 
     return (
         <TooltipRow
+            onClick={onClick}
             leftItem={
                 <Icon
                     name={mapTrezorModelToIcon[device.features.internal_model]}
@@ -71,10 +79,11 @@ const DeviceRow = ({ updateStatus }: DeviceRowProps) => {
 };
 
 type SuiteRowProps = {
-    updateStatus: UpdateStatus;
+    updateStatus: UpdateStatusSuite;
+    onClick?: () => void;
 };
 
-const SuiteRow = ({ updateStatus }: SuiteRowProps) => {
+const SuiteRow = ({ updateStatus, onClick }: SuiteRowProps) => {
     const theme = useTheme();
 
     const { desktopUpdate } = useSelector(state => state);
@@ -84,6 +93,7 @@ const SuiteRow = ({ updateStatus }: SuiteRowProps) => {
 
     return (
         <TooltipRow
+            onClick={onClick}
             leftItem={
                 <SuiteIconRectangle $size="medium">
                     <Icon name="trezor" size={iconSizes.small} color={theme.iconDefaultInverted} />
@@ -102,8 +112,8 @@ const SuiteRow = ({ updateStatus }: SuiteRowProps) => {
 };
 
 type UpdateTooltipProps = {
-    updateStatusDevice: UpdateStatus;
-    updateStatusSuite: UpdateStatus;
+    updateStatusDevice: UpdateStatusDevice;
+    updateStatusSuite: UpdateStatusSuite;
 };
 
 export const UpdateTooltip = ({ updateStatusDevice, updateStatusSuite }: UpdateTooltipProps) => {
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/updateQuickActionTypes.ts b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/updateQuickActionTypes.ts
index 558d41c0b10..afca04ac4c2 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/updateQuickActionTypes.ts
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/updateQuickActionTypes.ts
@@ -1,27 +1,66 @@
+import { DefaultTheme } from 'styled-components';
+
 import { IconName } from '@trezor/components';
 import { UIVariant } from '@trezor/components/src/config/types';
 import { Color, CSSColor } from '@trezor/theme';
-import { DefaultTheme } from 'styled-components';
+
+import { goto } from '../../../../../../../actions/suite/routerActions';
+import {
+    installUpdate,
+    openJustUpdatedChangelog,
+    setUpdateModalVisibility,
+} from '../../../../../../../actions/suite/desktopUpdateActions';
+import { Dispatch } from '../../../../../../../types/suite';
 
 export const updateVariants = ['tertiary', 'info', 'purple'] as const;
 export type UpdateVariant = Extract<UIVariant, (typeof updateVariants)[number]> | 'purple';
 
-export type UpdateStatus = 'up-to-date' | 'update-available' | 'restart-to-update' | 'just-updated';
+export type UpdateStatusDevice = 'up-to-date' | 'update-available' | 'disconnected';
+
+export type UpdateStatusSuite =
+    | 'up-to-date'
+    | 'update-available'
+    | 'update-downloaded-manual'
+    | 'update-downloaded-auto-restart-to-update'
+    | 'just-updated';
+
+export type UpdateStatus = UpdateStatusDevice | UpdateStatusSuite;
 
 export const mapUpdateStatusToIcon: Record<UpdateStatus, IconName> = {
+    disconnected: 'plugs', // Todo: better icon
+    'update-downloaded-manual': 'arrowDown',
+    'update-downloaded-auto-restart-to-update': 'arrowsClockwiseFilled',
     'up-to-date': 'check',
     'update-available': 'arrowDown',
-    'restart-to-update': 'arrowsClockwiseFilled',
     'just-updated': 'check',
 };
 
 export const mapUpdateStatusToVariant: Record<UpdateStatus, UpdateVariant> = {
+    disconnected: 'tertiary',
+    'update-downloaded-manual': 'info',
+    'update-downloaded-auto-restart-to-update': 'info',
     'up-to-date': 'tertiary',
     'update-available': 'info',
-    'restart-to-update': 'info',
     'just-updated': 'purple',
 };
 
+type OnClickCallbackCallback = ((params: { dispatch: Dispatch }) => void) | null;
+
+export const mapDeviceUpdateToClick: Record<UpdateStatusDevice, OnClickCallbackCallback> = {
+    disconnected: null,
+    'up-to-date': null,
+    'update-available': ({ dispatch }) => dispatch(goto('firmware-index')),
+};
+
+export const mapSuiteUpdateToClick: Record<UpdateStatusSuite, OnClickCallbackCallback> = {
+    'up-to-date': null,
+    'update-downloaded-auto-restart-to-update': ({ dispatch }) =>
+        dispatch(installUpdate({ installNow: true })),
+    'update-downloaded-manual': ({ dispatch }) => dispatch(setUpdateModalVisibility('maximized')),
+    'just-updated': ({ dispatch }) => dispatch(openJustUpdatedChangelog()),
+    'update-available': ({ dispatch }) => dispatch(setUpdateModalVisibility('maximized')),
+};
+
 type MapArgs = {
     $variant: UpdateVariant;
     theme: DefaultTheme;
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/useUpdateStatus.ts b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/useUpdateStatus.ts
index dfe89855fdb..6890df37460 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/useUpdateStatus.ts
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/QuickActions/Update/useUpdateStatus.ts
@@ -3,47 +3,100 @@ import {
     DesktopUpdateState,
     UpdateState,
 } from '../../../../../../../reducers/suite/desktopUpdateReducer';
-import { UpdateStatus } from './updateQuickActionTypes';
+import { UpdateStatus, UpdateStatusSuite, UpdateStatusDevice } from './updateQuickActionTypes';
 
 type UpdateStatusData = {
     updateStatus: UpdateStatus;
-    updateStatusDevice: UpdateStatus;
-    updateStatusSuite: UpdateStatus;
+    updateStatusDevice: UpdateStatusDevice;
+    updateStatusSuite: UpdateStatusSuite;
 };
 
-const getSuiteUpdateStatus = ({ desktopUpdate }: { desktopUpdate: DesktopUpdateState }) => {
+type GetSuiteUpdateStatusArgs = {
+    desktopUpdate: DesktopUpdateState;
+};
+
+const getSuiteUpdateStatus = ({ desktopUpdate }: GetSuiteUpdateStatusArgs): UpdateStatusSuite => {
     const isSuiteJustUpdated = desktopUpdate.firstRunAfterUpdate;
 
-    const isSuiteOutdated = [UpdateState.Available, UpdateState.Downloading].includes(
-        desktopUpdate.state,
-    );
+    if (isSuiteJustUpdated && !desktopUpdate.justUpdatedInteractedWith) {
+        return 'just-updated';
+    }
+
+    // We don't show update-availability in case of auto-updates until the update is downloaded
+    if (desktopUpdate.isAutomaticUpdateEnabled && desktopUpdate.state === UpdateState.Ready) {
+        return 'update-downloaded-auto-restart-to-update';
+    }
+
+    if (!desktopUpdate.isAutomaticUpdateEnabled) {
+        const isUpdateAvailable = [UpdateState.Available, UpdateState.Downloading].includes(
+            desktopUpdate.state,
+        );
+        if (isUpdateAvailable) {
+            return 'update-available';
+        }
+
+        if (desktopUpdate.state === UpdateState.Ready) {
+            return 'update-downloaded-manual';
+        }
+    }
 
-    const isSuiteRestartRequired = desktopUpdate.state === UpdateState.Ready;
+    return 'up-to-date';
+};
+
+type GetDeviceStatusParams = {
+    isDeviceDisconnected: boolean;
+    isSuiteUpdateInProgress: boolean;
+    isFirmwareOutdated: boolean;
+};
 
-    if (isSuiteRestartRequired) {
-        return 'restart-to-update';
+const getDeviceStatus = ({
+    isDeviceDisconnected,
+    isSuiteUpdateInProgress,
+    isFirmwareOutdated,
+}: GetDeviceStatusParams): UpdateStatusDevice => {
+    if (isDeviceDisconnected) {
+        return 'disconnected';
     }
 
-    if (isSuiteOutdated) {
+    if (isFirmwareOutdated && !isSuiteUpdateInProgress) {
         return 'update-available';
     }
 
-    return isSuiteJustUpdated ? 'just-updated' : 'up-to-date';
+    return 'up-to-date';
 };
 
 export const useUpdateStatus = (): UpdateStatusData => {
     const { device } = useDevice();
     const { desktopUpdate } = useSelector(state => state);
 
+    const isDeviceDisconnected = device?.connected !== true;
     const isFirmwareOutdated = device?.firmware === 'outdated';
 
+    // If firmware is outdated and suite update download/check is in progress,
+    // we suppress the Firmware notification as it can be there just for a second and then
+    // it will be replaced with Suite update notification
+    const isSuiteUpdateInProgress = [UpdateState.Downloading, UpdateState.Checking].includes(
+        desktopUpdate.state,
+    );
+
+    const updateStatusSuite = getSuiteUpdateStatus({ desktopUpdate });
+
+    const updateStatusDevice = getDeviceStatus({
+        isDeviceDisconnected,
+        isSuiteUpdateInProgress,
+        isFirmwareOutdated,
+    });
+
     const common: Omit<UpdateStatusData, 'updateStatus'> = {
-        updateStatusDevice: isFirmwareOutdated ? 'update-available' : 'up-to-date',
-        updateStatusSuite: getSuiteUpdateStatus({ desktopUpdate }),
+        updateStatusDevice,
+        updateStatusSuite,
     };
 
-    if (common.updateStatusSuite === 'restart-to-update') {
-        return { updateStatus: 'restart-to-update', ...common };
+    if (
+        common.updateStatusSuite === 'update-downloaded-auto-restart-to-update' ||
+        common.updateStatusSuite === 'update-downloaded-manual'
+    ) {
+        return { updateStatus: common.updateStatusSuite, ...common };
     }
 
     if (
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/Sidebar.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/Sidebar.tsx
index 9233d704a85..b66acdf41bb 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/Sidebar.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/Sidebar/Sidebar.tsx
@@ -1,14 +1,20 @@
-import React from 'react';
+import React, { useState } from 'react';
+
 import styled from 'styled-components';
-import { DeviceSelector } from '../DeviceSelector/DeviceSelector';
-import { Navigation } from './Navigation';
-import { AccountsMenu } from 'src/components/wallet/WalletLayout/AccountsMenu/AccountsMenu';
-import { QuickActions } from './QuickActions/QuickActions';
+
 import { ElevationUp, ResizableBox, useElevation } from '@trezor/components';
 import { Elevation, mapElevationToBackground, mapElevationToBorder, zIndices } from '@trezor/theme';
+
+import { AccountsMenu } from 'src/components/wallet/WalletLayout/AccountsMenu/AccountsMenu';
 import { useActions, useSelector } from 'src/hooks/suite';
 import * as suiteActions from 'src/actions/suite/suiteActions';
+
+import { QuickActions } from './QuickActions/QuickActions';
+import { Navigation } from './Navigation';
+import { DeviceSelector } from '../DeviceSelector/DeviceSelector';
 import { TrafficLightOffset } from '../../../TrafficLightOffset';
+import { UpdateNotificationBanner } from './QuickActions/Update/UpdateNotificationBanner';
+import { useUpdateStatus } from './QuickActions/Update/useUpdateStatus';
 
 const Container = styled.nav<{ $elevation: Elevation }>`
     display: flex;
@@ -29,13 +35,30 @@ const Content = styled.div`
 `;
 
 export const Sidebar = () => {
+    const [closedNotificationDevice, setClosedNotificationDevice] = useState(false);
+    const [closedNotificationSuite, setClosedNotificationSuite] = useState(false);
+
     const { elevation } = useElevation();
+    const { updateStatusDevice, updateStatusSuite } = useUpdateStatus();
 
     const sidebarWidth = useSelector(state => state.suite.settings.sidebarWidth);
     const { setSidebarWidth } = useActions({
         setSidebarWidth: (width: number) => suiteActions.setSidebarWidth({ width }),
     });
 
+    const onNotificationBannerClosed = () => {
+        if (updateStatusSuite !== 'up-to-date') {
+            setClosedNotificationSuite(true);
+        }
+        if (updateStatusDevice !== 'up-to-date') {
+            setClosedNotificationDevice(true);
+        }
+    };
+
+    const showUpdateBannerNotification =
+        (updateStatusSuite !== 'up-to-date' && !closedNotificationSuite) ||
+        (!['up-to-date', 'disconnected'].includes(updateStatusDevice) && !closedNotificationDevice);
+
     return (
         <Wrapper>
             <ResizableBox
@@ -54,7 +77,18 @@ export const Sidebar = () => {
                                 <DeviceSelector />
                                 <Navigation />
                                 <AccountsMenu />
-                                <QuickActions />
+
+                                {showUpdateBannerNotification && (
+                                    <UpdateNotificationBanner
+                                        updateStatusDevice={updateStatusDevice}
+                                        updateStatusSuite={updateStatusSuite}
+                                        onClose={onNotificationBannerClosed}
+                                    />
+                                )}
+
+                                <QuickActions
+                                    showUpdateBannerNotification={showUpdateBannerNotification}
+                                />
                             </Content>
                         </TrafficLightOffset>
                     </ElevationUp>
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/SubpageNavigation.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/SubpageNavigation.tsx
index def22331241..c224ea429c4 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/SubpageNavigation.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/SubpageNavigation.tsx
@@ -1,14 +1,17 @@
 import styled from 'styled-components';
 import { LayoutGroup, motion } from 'framer-motion';
+
 import { spacingsPx, zIndices } from '@trezor/theme';
 import { motionEasing, variables } from '@trezor/components';
+import { Route } from '@suite-common/suite-types';
+
 import { useSelector } from 'src/hooks/suite';
 import { selectRouteName } from 'src/reducers/suite/routerReducer';
 import { SUBPAGE_NAV_HEIGHT } from 'src/constants/suite/layout';
 import { selectIsLoggedOut } from 'src/reducers/suite/suiteReducer';
+
 import { HoverAnimation } from '../../HoverAnimation';
 import { AppNavigationTooltip } from '../../AppNavigation/AppNavigationTooltip';
-import { Route } from '@suite-common/suite-types';
 
 const Container = styled.div<{ $isFullWidth: boolean }>`
     position: sticky;
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/SuiteLayout.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/SuiteLayout.tsx
index 1af352ac6d8..bc24b5b84f7 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/SuiteLayout.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/SuiteLayout.tsx
@@ -1,4 +1,5 @@
 import { useRef, useState, ReactNode } from 'react';
+
 import styled from 'styled-components';
 
 import {
@@ -9,6 +10,7 @@ import {
     variables,
 } from '@trezor/components';
 import { spacingsPx } from '@trezor/theme';
+
 import { SuiteBanners } from 'src/components/suite/banners';
 import { Metadata } from 'src/components/suite';
 import { GuideRouter, GuideButton } from 'src/components/guide';
@@ -19,12 +21,13 @@ import { LayoutContext, LayoutContextPayload } from 'src/support/suite/LayoutCon
 import { useResetScrollOnUrl } from 'src/hooks/suite/useResetScrollOnUrl';
 import { useClearAnchorHighlightOnClick } from 'src/hooks/suite/useClearAnchorHighlightOnClick';
 import { ModalContextProvider } from 'src/support/suite/ModalContext';
+import { MobileAccountsMenu } from 'src/components/wallet/WalletLayout/AccountsMenu/MobileAccountsMenu';
+import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
+
 import { ModalSwitcher } from '../../modals/ModalSwitcher/ModalSwitcher';
 import { MobileMenu } from './MobileMenu/MobileMenu';
 import { Sidebar } from './Sidebar/Sidebar';
 import { CoinjoinBars } from './CoinjoinBars/CoinjoinBars';
-import { MobileAccountsMenu } from 'src/components/wallet/WalletLayout/AccountsMenu/MobileAccountsMenu';
-import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 import { useAppShortcuts } from './useAppShortcuts';
 
 export const SCROLL_WRAPPER_ID = 'layout-scroll';
@@ -94,10 +97,7 @@ export const MainBar = styled.div`
     flex: 1;
     flex-direction: column;
     align-items: center;
-
-    ${variables.SCREEN_QUERY.BELOW_LAPTOP} {
-        overflow-x: hidden;
-    }
+    overflow-x: hidden;
 `;
 
 interface SuiteLayoutProps {
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/useAppShortcuts.tsx b/packages/suite/src/components/suite/layouts/SuiteLayout/useAppShortcuts.tsx
index 92fb0072db3..1395f04012e 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/useAppShortcuts.tsx
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/useAppShortcuts.tsx
@@ -1,9 +1,11 @@
-import { selectDevice } from '@suite-common/wallet-core';
 import { useEvent } from 'react-use';
+
+import { selectDevice } from '@suite-common/wallet-core';
+import { KEYBOARD_CODE } from '@trezor/components';
+
 import { closeModalApp, goto } from 'src/actions/suite/routerActions';
 import { addWalletThunk } from 'src/actions/wallet/addWalletThunk';
 import { useDispatch, useSelector } from 'src/hooks/suite';
-import { KEYBOARD_CODE } from '@trezor/components';
 
 export const useAppShortcuts = () => {
     const selectedDevice = useSelector(selectDevice);
diff --git a/packages/suite/src/components/suite/layouts/SuiteLayout/utils.ts b/packages/suite/src/components/suite/layouts/SuiteLayout/utils.ts
index 0305f076eeb..3631a67c839 100644
--- a/packages/suite/src/components/suite/layouts/SuiteLayout/utils.ts
+++ b/packages/suite/src/components/suite/layouts/SuiteLayout/utils.ts
@@ -1,8 +1,9 @@
 import { useCustomBackends } from 'src/hooks/settings/backends';
 import { useSelector } from 'src/hooks/suite';
+import { selectEnabledNetworks } from 'src/reducers/wallet/settingsReducer';
 
 export const useEnabledBackends = () => {
-    const enabledNetworks = useSelector(state => state.wallet.settings.enabledNetworks);
+    const enabledNetworks = useSelector(selectEnabledNetworks);
     const customBackends = useCustomBackends();
 
     return customBackends.filter(backend => enabledNetworks.includes(backend.coin));
diff --git a/packages/suite/src/components/suite/layouts/WelcomeLayout/NavSettings.tsx b/packages/suite/src/components/suite/layouts/WelcomeLayout/NavSettings.tsx
index a157ffeb581..af81685d8fd 100644
--- a/packages/suite/src/components/suite/layouts/WelcomeLayout/NavSettings.tsx
+++ b/packages/suite/src/components/suite/layouts/WelcomeLayout/NavSettings.tsx
@@ -1,4 +1,5 @@
 import { IconButton } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
diff --git a/packages/suite/src/components/suite/layouts/WelcomeLayout/WelcomeLayout.tsx b/packages/suite/src/components/suite/layouts/WelcomeLayout/WelcomeLayout.tsx
index 66e0998ae04..eda98dc40db 100644
--- a/packages/suite/src/components/suite/layouts/WelcomeLayout/WelcomeLayout.tsx
+++ b/packages/suite/src/components/suite/layouts/WelcomeLayout/WelcomeLayout.tsx
@@ -1,4 +1,5 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
 import { AnimatePresence, motion } from 'framer-motion';
 
@@ -13,22 +14,24 @@ import {
     Column,
 } from '@trezor/components';
 import { useOnce } from '@trezor/react-utils';
+import { selectBannerMessage } from '@suite-common/message-system';
+import { isWeb } from '@trezor/env-utils';
+import { TREZOR_URL, SUITE_URL } from '@trezor/urls';
+import { resolveStaticPath } from '@suite-common/suite-utils';
+import { Elevation, mapElevationToBackground, spacingsPx } from '@trezor/theme';
+import { TrezorLogo } from '@trezor/product-components';
+
 import { Translation } from 'src/components/suite';
 // importing directly, otherwise unit tests fail, seems to be a styled-components issue
 import { TrezorLink } from 'src/components/suite/TrezorLink';
 import { useSelector } from 'src/hooks/suite';
-import { selectBannerMessage } from '@suite-common/message-system';
 import { MessageSystemBanner } from 'src/components/suite/banners';
-import { isWeb } from '@trezor/env-utils';
-import { TREZOR_URL, SUITE_URL } from '@trezor/urls';
-import { resolveStaticPath } from '@suite-common/suite-utils';
 import { GuideButton, GuideRouter } from 'src/components/guide';
 import { useGuide } from 'src/hooks/guide';
 import { MAX_ONBOARDING_WIDTH } from 'src/constants/suite/layout';
+
 import { NavSettings } from './NavSettings';
-import { Elevation, mapElevationToBackground, spacingsPx } from '@trezor/theme';
 import { TrafficLightOffset } from '../../TrafficLightOffset';
-import { TrezorLogo } from '@trezor/product-components';
 
 const MessageContainer = styled.div`
     margin: ${spacingsPx.xxs} ${spacingsPx.xs} ${spacingsPx.xs};
@@ -209,9 +212,11 @@ export const WelcomeLayout = ({ children }: WelcomeLayoutProps) => {
         <ElevationContext baseElevation={-1}>
             <TrafficLightOffset isVisible={Boolean(bannerMessage)}>
                 <Wrapper>
-                    <MessageContainer>
-                        {bannerMessage && <MessageSystemBanner message={bannerMessage} />}
-                    </MessageContainer>
+                    {bannerMessage && (
+                        <MessageContainer>
+                            <MessageSystemBanner message={bannerMessage} />
+                        </MessageContainer>
+                    )}
 
                     <Body data-testid="@welcome-layout/body">
                         <ElevationDown>
diff --git a/packages/suite/src/components/suite/modals/AbortButton.tsx b/packages/suite/src/components/suite/modals/AbortButton.tsx
deleted file mode 100644
index c18d31b3249..00000000000
--- a/packages/suite/src/components/suite/modals/AbortButton.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import styled, { css, useTheme } from 'styled-components';
-
-import { Icon, variables } from '@trezor/components';
-import { useSelector } from 'src/hooks/suite/useSelector';
-import { selectIsActionAbortable } from 'src/reducers/suite/suiteReducer';
-import { Translation } from '..';
-import { mediaQueries } from '@trezor/styles';
-import { borders, typography } from '@trezor/theme';
-
-const collapsedStyle = css`
-    width: 32px;
-
-    span {
-        opacity: 0;
-    }
-`;
-
-const expandedStyle = css`
-    width: 90px;
-
-    span {
-        opacity: 1;
-    }
-`;
-
-const AbortContainer = styled.div`
-    position: relative;
-    height: 32px;
-    border-radius: ${borders.radii.lg};
-    background: ${({ theme }) => theme.backgroundTertiaryDefaultOnElevation1};
-    color: ${({ theme }) => theme.textSubdued};
-    overflow: hidden;
-    ${typography.hint};
-    transition: width 0.15s ease-in-out;
-    cursor: pointer;
-    display: flex;
-    align-items: center;
-
-    span {
-        position: absolute;
-        right: 12px;
-        width: max-content;
-        text-transform: uppercase;
-        transition: opacity 0.25s ease-out;
-    }
-
-    ${variables.SCREEN_QUERY.BELOW_LAPTOP} {
-        ${expandedStyle}
-    }
-
-    /* Linting error because of a complex interpolation */
-
-    ${/* sc-selector */ mediaQueries.hover} {
-        ${/* sc-block */ collapsedStyle}
-        &:hover {
-            ${/* sc-block */ expandedStyle}
-        }
-    }
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const CloseIcon = styled(Icon)`
-    position: absolute;
-    left: 0;
-    top: 0;
-    padding: 15.5px;
-    border-radius: ${borders.radii.lg};
-    background: ${({ theme }) => theme.backgroundTertiaryDefaultOnElevation1};
-`;
-
-interface AbortButtonProps {
-    onAbort: () => void;
-    className?: string;
-}
-
-export const AbortButton = ({ onAbort, className }: AbortButtonProps) => {
-    const theme = useTheme();
-
-    // checks compatability for use in other places
-    const isActionAbortable = useSelector(selectIsActionAbortable);
-
-    if (!isActionAbortable) {
-        return null;
-    }
-
-    return (
-        <AbortContainer
-            key="@modal/close-button" // passed in array
-            data-testid="@modal/close-button"
-            onClick={onAbort}
-            className={className}
-        >
-            <Translation id="TR_ABORT" />
-            <CloseIcon size={18} color={theme.iconSubdued} name="close" />
-        </AbortContainer>
-    );
-};
diff --git a/packages/suite/src/components/suite/modals/ConfirmEvmExplanationModal.tsx b/packages/suite/src/components/suite/modals/ConfirmEvmExplanationModal.tsx
index 778ce9b0d9b..b95487436bb 100644
--- a/packages/suite/src/components/suite/modals/ConfirmEvmExplanationModal.tsx
+++ b/packages/suite/src/components/suite/modals/ConfirmEvmExplanationModal.tsx
@@ -1,91 +1,32 @@
-import styled, { css } from 'styled-components';
+import styled from 'styled-components';
 
-import { Translation, Modal } from 'src/components/suite';
-import { useDispatch, useSelector } from 'src/hooks/suite';
-import { Button, H3, Image, variables } from '@trezor/components';
-import { onCancel } from 'src/actions/suite/modalActions';
+import { Image, NewModal, Paragraph } from '@trezor/components';
 import { Account } from '@suite-common/wallet-types';
 import { networks } from '@suite-common/wallet-config';
-import { TranslationKey } from 'src/components/suite/Translation';
-import { SUITE } from 'src/actions/suite/constants';
-import { spacingsPx } from '@trezor/theme';
+import { spacings } from '@trezor/theme';
 import { CoinLogo } from '@trezor/product-components';
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledImage = styled(Image)`
-    width: 100%;
-    height: 100%;
-    align-self: center;
-`;
-
-const StyledModal = styled(Modal)`
-    width: 390px;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledButton = styled(Button)`
-    flex-grow: 1;
-    margin-top: ${spacingsPx.xxl};
-`;
-
-const Content = styled.div`
-    display: flex;
-    flex-direction: column;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const Title = styled(H3)`
-    margin-bottom: ${spacingsPx.xs};
-    text-align: left;
-`;
-
-const Description = styled.span`
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-    font-size: ${variables.FONT_SIZE.SMALL};
-    font-weight: 500;
-    line-height: 20px;
-    text-align: left;
-`;
+import { Translation } from 'src/components/suite';
+import { useDispatch, useSelector } from 'src/hooks/suite';
+import { onCancel } from 'src/actions/suite/modalActions';
+import { TranslationKey } from 'src/components/suite/Translation';
+import { SUITE } from 'src/actions/suite/constants';
 
 const ImageWrapper = styled.div`
     position: relative;
-    margin-bottom: ${spacingsPx.xxl};
+    width: 97.5%;
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const ImageCoinLogoCommon = styled(CoinLogo)`
+const CoinLogoLeft = styled.div<{ $isETH: boolean }>`
     position: absolute;
-    width: auto;
-
-    div {
-        width: 100%;
-        height: 100%;
-    }
-
-    svg {
-        width: 100%;
-        height: 100%;
-    }
-`;
-
-const ImageCoinLogoLeft = styled(ImageCoinLogoCommon)`
-    top: 17%;
-    left: 3.5%;
-    height: 52%;
-
-    ${({ symbol }) =>
-        symbol === 'eth' &&
-        css`
-            top: 15.6%;
-            left: 4.8%;
-            height: 51%;
-        `}
+    top: 20%;
+    left: ${({ $isETH }) => ($isETH ? '6.75%' : '5.5%')};
 `;
 
-const ImageCoinLogoRight = styled(ImageCoinLogoCommon)`
-    top: 31%;
-    right: 3.5%;
-    height: 52%;
+const CoinLogoRight = styled.div`
+    position: absolute;
+    top: 34%;
+    right: 5.5%;
 `;
 
 export interface ConfirmNetworkExplanationModalProps {
@@ -141,39 +82,48 @@ export const ConfirmEvmExplanationModal = ({
     };
 
     return (
-        <StyledModal headerComponent={null}>
-            <Content>
-                <ImageWrapper>
-                    <StyledImage
-                        image={
-                            account.symbol === 'eth'
-                                ? 'CONFIRM_EVM_EXPLANATION_ETH'
-                                : 'CONFIRM_EVM_EXPLANATION_OTHER'
-                        }
-                    />
-                    <ImageCoinLogoLeft symbol={account.symbol} />
-                    {account.symbol !== 'eth' && <ImageCoinLogoRight symbol="eth" />}
-                </ImageWrapper>
-                <Title>
-                    <Translation
-                        id={titleTranslationsIds[route]}
-                        values={{
-                            network: network.name,
-                        }}
-                    />
-                </Title>
-                <Description>
-                    <Translation
-                        id={descriptionTranslationsIds[route]}
-                        values={{
-                            network: network.name,
-                        }}
-                    />
-                </Description>
-                <StyledButton variant="primary" onClick={close}>
+        <NewModal
+            bottomContent={
+                <NewModal.Button onClick={close}>
                     <Translation id="TR_CONFIRM" />
-                </StyledButton>
-            </Content>
-        </StyledModal>
+                </NewModal.Button>
+            }
+            size="small"
+            heading={
+                <Translation
+                    id={titleTranslationsIds[route]}
+                    values={{
+                        network: network.name,
+                    }}
+                />
+            }
+        >
+            <ImageWrapper>
+                <Image
+                    image={
+                        account.symbol === 'eth'
+                            ? 'CONFIRM_EVM_EXPLANATION_ETH'
+                            : 'CONFIRM_EVM_EXPLANATION_OTHER'
+                    }
+                    width="100%"
+                />
+                <CoinLogoLeft $isETH={account.symbol === 'eth'}>
+                    <CoinLogo size={80} symbol={account.symbol} />
+                </CoinLogoLeft>
+                {account.symbol !== 'eth' && (
+                    <CoinLogoRight>
+                        <CoinLogo size={80} symbol="eth" />
+                    </CoinLogoRight>
+                )}
+            </ImageWrapper>
+            <Paragraph variant="tertiary" typographyStyle="hint" margin={{ top: spacings.xl }}>
+                <Translation
+                    id={descriptionTranslationsIds[route]}
+                    values={{
+                        network: network.name,
+                    }}
+                />
+            </Paragraph>
+        </NewModal>
     );
 };
diff --git a/packages/suite/src/components/suite/modals/Modal/DefaultRenderer.tsx b/packages/suite/src/components/suite/modals/Modal/DefaultRenderer.tsx
index 4a450e33f71..387b8b94196 100644
--- a/packages/suite/src/components/suite/modals/Modal/DefaultRenderer.tsx
+++ b/packages/suite/src/components/suite/modals/Modal/DefaultRenderer.tsx
@@ -1,9 +1,12 @@
 import { ReactPortal } from 'react';
 import { createPortal } from 'react-dom';
+
 import { Modal, ModalProps, Icon, intermediaryTheme } from '@trezor/components';
+
 import { useGuide } from 'src/hooks/guide';
 import { useLayoutSize } from 'src/hooks/suite/useLayoutSize';
 import { useModalTarget } from 'src/support/suite/ModalContext';
+
 import { ModalEnvironment } from '../ModalEnvironment';
 
 /**
diff --git a/packages/suite/src/components/suite/modals/Modal/DialogRenderer.tsx b/packages/suite/src/components/suite/modals/Modal/DialogRenderer.tsx
index d7b7367f2c2..043638a9229 100644
--- a/packages/suite/src/components/suite/modals/Modal/DialogRenderer.tsx
+++ b/packages/suite/src/components/suite/modals/Modal/DialogRenderer.tsx
@@ -1,7 +1,10 @@
-import { DialogModal as BaseDialogModal, DialogModalProps } from '@trezor/components';
 import { ReactPortal } from 'react';
 import { createPortal } from 'react-dom';
+
+import { DialogModal as BaseDialogModal, DialogModalProps } from '@trezor/components';
+
 import { useModalTarget } from 'src/support/suite/ModalContext';
+
 import { ModalEnvironment } from '../ModalEnvironment';
 import { ModalProps, Modal } from './Modal';
 
diff --git a/packages/suite/src/components/suite/modals/Modal/Modal.tsx b/packages/suite/src/components/suite/modals/Modal/Modal.tsx
index 50c12435053..6aff6f9f55b 100644
--- a/packages/suite/src/components/suite/modals/Modal/Modal.tsx
+++ b/packages/suite/src/components/suite/modals/Modal/Modal.tsx
@@ -1,5 +1,7 @@
 import { ComponentType } from 'react';
+
 import { Modal as TrezorModal, ModalProps as TrezorModalProps } from '@trezor/components';
+
 import { DefaultRenderer } from './DefaultRenderer';
 
 export type ModalProps = TrezorModalProps & {
diff --git a/packages/suite/src/components/suite/modals/ModalEnvironment.tsx b/packages/suite/src/components/suite/modals/ModalEnvironment.tsx
index cdb952c751c..fec2e767aa4 100644
--- a/packages/suite/src/components/suite/modals/ModalEnvironment.tsx
+++ b/packages/suite/src/components/suite/modals/ModalEnvironment.tsx
@@ -1,5 +1,6 @@
 import { ReactNode } from 'react';
 import FocusLock from 'react-focus-lock';
+
 import { Backdrop, ModalAlignment } from '@trezor/components';
 
 type ModalEnvironmentProps = {
@@ -13,6 +14,7 @@ export const ModalEnvironment = ({
     children,
     alignment,
 }: ModalEnvironmentProps) => (
+    // eslint-disable-next-line jsx-a11y/no-autofocus
     <FocusLock autoFocus={false}>
         <Backdrop onClick={onClickBackdrop} alignment={alignment}>
             {children}
diff --git a/packages/suite/src/components/suite/modals/ModalSwitcher/DiscoveryLoader.tsx b/packages/suite/src/components/suite/modals/ModalSwitcher/DiscoveryLoader.tsx
index ac4400080e0..642adb33a3e 100644
--- a/packages/suite/src/components/suite/modals/ModalSwitcher/DiscoveryLoader.tsx
+++ b/packages/suite/src/components/suite/modals/ModalSwitcher/DiscoveryLoader.tsx
@@ -1,30 +1,29 @@
-import { H3, Spinner, NewModal, Column } from '@trezor/components';
+import { H3, Spinner, Column } from '@trezor/components';
+import { selectDevice } from '@suite-common/wallet-core';
+import { spacings } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import { CardWithDevice } from 'src/views/suite/SwitchDevice/CardWithDevice';
 import { SwitchDeviceModal } from 'src/views/suite/SwitchDevice/SwitchDeviceModal';
 import { useSelector } from 'src/hooks/suite';
-import { selectDevice } from '@suite-common/wallet-core';
-import { spacings } from '@trezor/theme';
 
 export const DiscoveryLoader = () => {
     const device = useSelector(selectDevice);
     if (!device) return null;
 
     return (
-        <NewModal.Backdrop alignment={{ x: 'left', y: 'top' }} padding={5}>
-            <SwitchDeviceModal data-testid="@discovery/loader">
-                <CardWithDevice device={device} isFullHeaderVisible={false}>
-                    <Column
-                        justifyContent="center"
-                        margin={{ top: spacings.xxxl, bottom: spacings.xl }}
-                    >
-                        <Spinner size={80} isGrey={false} />
-                        <H3 align="center" margin={{ top: spacings.xxxxl }}>
-                            <Translation id="TR_COIN_DISCOVERY_LOADER_DESCRIPTION" />
-                        </H3>
-                    </Column>
-                </CardWithDevice>
-            </SwitchDeviceModal>
-        </NewModal.Backdrop>
+        <SwitchDeviceModal data-testid="@discovery/loader">
+            <CardWithDevice device={device} isFullHeaderVisible={false}>
+                <Column
+                    justifyContent="center"
+                    margin={{ top: spacings.xxxl, bottom: spacings.xl }}
+                >
+                    <Spinner size={80} isGrey={false} />
+                    <H3 align="center" margin={{ top: spacings.xxxxl }}>
+                        <Translation id="TR_COIN_DISCOVERY_LOADER_DESCRIPTION" />
+                    </H3>
+                </Column>
+            </CardWithDevice>
+        </SwitchDeviceModal>
     );
 };
diff --git a/packages/suite/src/components/suite/modals/ModalSwitcher/ForegroundAppModal.tsx b/packages/suite/src/components/suite/modals/ModalSwitcher/ForegroundAppModal.tsx
index 3a422142ceb..a1410e0dcb3 100644
--- a/packages/suite/src/components/suite/modals/ModalSwitcher/ForegroundAppModal.tsx
+++ b/packages/suite/src/components/suite/modals/ModalSwitcher/ForegroundAppModal.tsx
@@ -1,3 +1,5 @@
+import { FunctionComponent } from 'react';
+
 import { FirmwareUpdate } from 'src/views/firmware/FirmwareUpdate';
 import { FirmwareCustom } from 'src/views/firmware/FirmwareCustom';
 import { Recovery } from 'src/views/recovery';
@@ -9,10 +11,10 @@ import { UdevRules } from 'src/views/suite/udev';
 import { Version } from 'src/views/suite/version';
 import { SwitchDevice } from 'src/views/suite/SwitchDevice/SwitchDevice';
 import type { ForegroundAppRoute } from 'src/types/suite';
-import { FunctionComponent } from 'react';
-import { MultiShareBackupModal } from '../ReduxModal/UserContextModal/MultiShareBackupModal/MultiShareBackupModal';
 import { BridgeRequested } from 'src/views/suite/bridge-requested';
 
+import { MultiShareBackupModal } from '../ReduxModal/UserContextModal/MultiShareBackupModal/MultiShareBackupModal';
+
 // would not work if defined directly in the switch
 const FirmwareType = () => <FirmwareUpdate shouldSwitchFirmwareType />;
 
diff --git a/packages/suite/src/components/suite/modals/ModalSwitcher/ModalSwitcher.tsx b/packages/suite/src/components/suite/modals/ModalSwitcher/ModalSwitcher.tsx
index 840952b9e0e..be17cf14e3e 100644
--- a/packages/suite/src/components/suite/modals/ModalSwitcher/ModalSwitcher.tsx
+++ b/packages/suite/src/components/suite/modals/ModalSwitcher/ModalSwitcher.tsx
@@ -1,4 +1,5 @@
 import { usePreferredModal } from 'src/hooks/suite/usePreferredModal';
+
 import { ReduxModal } from '../ReduxModal/ReduxModal';
 import { ForegroundAppModal } from './ForegroundAppModal';
 import { DiscoveryLoader } from './DiscoveryLoader';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/ConfirmAddressModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/ConfirmAddressModal.tsx
index ad0cfd45a9a..642078cf3a8 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/ConfirmAddressModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/ConfirmAddressModal.tsx
@@ -1,4 +1,5 @@
 import { useCallback } from 'react';
+
 import { showAddress } from 'src/actions/wallet/receiveActions';
 import { Translation } from 'src/components/suite';
 import {
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/ConfirmValueModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/ConfirmValueModal.tsx
index 48e78a0b828..076227fbcd8 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/ConfirmValueModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/ConfirmValueModal.tsx
@@ -13,18 +13,20 @@ import {
 } from '@trezor/components';
 import { copyToClipboard } from '@trezor/dom-utils';
 import { selectDevice, selectDeviceLabelOrName } from '@suite-common/wallet-core';
+import { Account } from '@suite-common/wallet-types';
+import { palette, spacings } from '@trezor/theme';
+import { getNetworkFeatures } from '@suite-common/wallet-config';
+import { ConfirmOnDevice } from '@trezor/product-components';
+
 import { selectIsActionAbortable } from 'src/reducers/suite/suiteReducer';
 import { QrCode } from 'src/components/suite/QrCode';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { Translation } from 'src/components/suite';
 import { MODAL } from 'src/actions/suite/constants';
 import { DisplayMode, ThunkAction } from 'src/types/suite';
+
 import { TransactionReviewStepIndicator } from '../TransactionReviewModal/TransactionReviewOutputList/TransactionReviewStepIndicator';
 import { TransactionReviewOutputElement } from '../TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputElement';
-import { Account } from '@suite-common/wallet-types';
-import { palette, spacings } from '@trezor/theme';
-import { getNetworkFeatures } from '@suite-common/wallet-config';
-import { ConfirmOnDevice } from '@trezor/product-components';
 
 export interface ConfirmValueModalProps extends Pick<NewModalProps, 'onCancel' | 'heading'> {
     account: Account;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/DeviceDisconnected.tsx b/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/DeviceDisconnected.tsx
index cd51299d28f..fcfb3f256dd 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/DeviceDisconnected.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/ConfirmValueModal/DeviceDisconnected.tsx
@@ -1,9 +1,10 @@
 import styled from 'styled-components';
 
 import { Paragraph, Image, variables } from '@trezor/components';
-import { Translation } from 'src/components/suite';
 import { borders } from '@trezor/theme';
 
+import { Translation } from 'src/components/suite';
+
 const Wrapper = styled.div`
     display: flex;
     text-align: left;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/ConfirmXpubModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/ConfirmXpubModal.tsx
index 0533d6bf25d..1cd75690bb5 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/ConfirmXpubModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/ConfirmXpubModal.tsx
@@ -1,11 +1,12 @@
 import { Translation } from 'src/components/suite';
-import { ConfirmValueModal, ConfirmValueModalProps } from './ConfirmValueModal/ConfirmValueModal';
 import { showXpub } from 'src/actions/wallet/publicKeyActions';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 import { selectLabelingDataForSelectedAccount } from 'src/reducers/suite/metadataReducer';
 import { useSelector } from 'src/hooks/suite';
 import { DisplayMode } from 'src/types/suite';
 
+import { ConfirmValueModal, ConfirmValueModalProps } from './ConfirmValueModal/ConfirmValueModal';
+
 export const ConfirmXpubModal = (
     props: Pick<ConfirmValueModalProps, 'isConfirmed' | 'onCancel'>,
 ) => {
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/CopyAddressModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/CopyAddressModal.tsx
index 0f0680549c3..22c88220ec2 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/CopyAddressModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/CopyAddressModal.tsx
@@ -1,12 +1,13 @@
+import { useState } from 'react';
+
 import { copyToClipboard } from '@trezor/dom-utils';
 import { notificationsActions } from '@suite-common/toast-notifications';
-
-import { Translation } from 'src/components/suite';
-import { useDispatch } from 'src/hooks/suite/useDispatch';
 import { H2, Card, Paragraph, NewModal, Checkbox } from '@trezor/components';
 import { AddressType } from '@suite-common/wallet-types';
 import { spacings } from '@trezor/theme';
-import { useState } from 'react';
+
+import { useDispatch } from 'src/hooks/suite/useDispatch';
+import { Translation } from 'src/components/suite';
 import { setFlag } from 'src/actions/suite/suiteActions';
 
 const getAddressTypeText = (addressType: AddressType) => {
@@ -46,12 +47,12 @@ export const CopyAddressModal = ({ address, onCancel, addressType }: CopyAddress
     return (
         <NewModal
             onCancel={onCancel}
-            icon="warning"
+            iconName="warning"
             variant="warning"
             bottomContent={
                 <>
                     <NewModal.Button onClick={onCopyAddress}>
-                        <Translation id="TR_UNHIDE" />
+                        <Translation id="TR_COPY_TO_CLIPBOARD" />
                     </NewModal.Button>
                     <NewModal.Button variant="tertiary" onClick={onCancel}>
                         <Translation id="TR_CANCEL" />
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceConfirmationModal/NoBackupModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceConfirmationModal/NoBackupModal.tsx
index d53f2b3a4a8..dcb4989647e 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceConfirmationModal/NoBackupModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceConfirmationModal/NoBackupModal.tsx
@@ -1,10 +1,11 @@
+import { NewModal, Paragraph, H2 } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { onReceiveConfirmation } from 'src/actions/suite/modalActions';
 import { goto } from 'src/actions/suite/routerActions';
 import { Translation } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite/useDispatch';
-import { NewModal, Paragraph, H2 } from '@trezor/components';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
-import { spacings } from '@trezor/theme';
 
 export const NoBackupModal = () => {
     const dispatch = useDispatch();
@@ -19,7 +20,7 @@ export const NoBackupModal = () => {
     return (
         <NewModal
             onCancel={close}
-            icon="warning"
+            iconName="warning"
             variant="warning"
             size="small"
             bottomContent={
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/ConfirmActionModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/ConfirmActionModal.tsx
index 12a11c35444..1a83d6c6f21 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/ConfirmActionModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/ConfirmActionModal.tsx
@@ -1,13 +1,15 @@
-import styled from 'styled-components';
 import { useIntl } from 'react-intl';
 
+import styled from 'styled-components';
+
 import TrezorConnect from '@trezor/connect';
 import { H2, NewModal } from '@trezor/components';
 import { ConfirmOnDevice } from '@trezor/product-components';
+import { spacings } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite/Translation';
 import { DeviceConfirmImage } from 'src/components/suite';
 import { TrezorDevice } from 'src/types/suite';
-import { spacings } from '@trezor/theme';
 import messages from 'src/support/messages';
 
 const ImageWrapper = styled.div`
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/ConfirmFingerprintModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/ConfirmFingerprintModal.tsx
index 8c2b356bc7d..3fdc5ded1ed 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/ConfirmFingerprintModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/ConfirmFingerprintModal.tsx
@@ -1,8 +1,10 @@
 import styled from 'styled-components';
+
+import { ConfirmOnDevice } from '@trezor/product-components';
+
 import { Translation, Modal, ModalProps } from 'src/components/suite';
 import { TrezorDevice } from 'src/types/suite';
 import { Fingerprint } from 'src/components/firmware';
-import { ConfirmOnDevice } from '@trezor/product-components';
 
 const StyledModal = styled(Modal)`
     width: 360px;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/DeviceContextModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/DeviceContextModal.tsx
index 4dce0b1c5b9..7ae08c00a0e 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/DeviceContextModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/DeviceContextModal.tsx
@@ -2,6 +2,7 @@ import { useIntl } from 'react-intl';
 
 import TrezorConnect, { UI } from '@trezor/connect';
 import { selectDevice } from '@suite-common/wallet-core';
+
 import messages from 'src/support/messages';
 import { MODAL } from 'src/actions/suite/constants';
 import { useSelector } from 'src/hooks/suite';
@@ -9,7 +10,6 @@ import {
     PinModal,
     PinInvalidModal,
     PassphraseModal,
-    PassphraseSourceModal,
     PassphraseOnDeviceModal,
     ConfirmActionModal,
     ConfirmFingerprintModal,
@@ -19,6 +19,7 @@ import {
     ConfirmAddressModal,
     ConfirmXpubModal,
 } from 'src/components/suite/modals';
+
 import type { ReduxModalProps } from '../ReduxModal';
 
 /** Modals requested by Device from `trezor-connect` */
@@ -52,8 +53,6 @@ export const DeviceContextModal = ({
             return <WordAdvancedModal count={6} renderer={renderer} />;
         case 'WordRequestType_Matrix9':
             return <WordAdvancedModal count={9} renderer={renderer} />;
-        case 'ButtonRequest_PassphraseType':
-            return <PassphraseSourceModal device={device} />;
         // T2T1 firmware
         case UI.REQUEST_PASSPHRASE_ON_DEVICE:
         case 'ButtonRequest_PassphraseEntry':
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/DevicePromptModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/DevicePromptModal.tsx
deleted file mode 100644
index 526bf4a48fa..00000000000
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/DevicePromptModal.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { ComponentType, ReactNode } from 'react';
-import { createPortal } from 'react-dom';
-import { useIntl } from 'react-intl';
-import styled from 'styled-components';
-
-import TrezorConnect from '@trezor/connect';
-import { Modal as TrezorModal, ModalProps as TrezorModalProps } from '@trezor/components';
-import { Translation } from 'src/components/suite';
-import { selectIsActionAbortable } from 'src/reducers/suite/suiteReducer';
-import { useSelector } from 'src/hooks/suite/useSelector';
-import messages from 'src/support/messages';
-import { useDevice } from 'src/hooks/suite';
-import { useModalTarget } from 'src/support/suite/ModalContext';
-import { ModalEnvironment } from '../../ModalEnvironment';
-import { Modal } from '../../Modal/Modal';
-import { ConfirmOnDevice } from '@trezor/product-components';
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledTrezorModal = styled(TrezorModal)`
-    ${Modal.Header} {
-        padding: 24px 24px 0;
-    }
-
-    ${Modal.Body} {
-        margin-top: ${({ headerComponent }) => !headerComponent && '60px'};
-        padding: 24px;
-    }
-`;
-
-export interface DevicePromptModalProps {
-    isPillShown?: boolean;
-    isConfirmed?: boolean;
-    pillTitle?: string;
-    renderer?: ComponentType<TrezorModalProps>;
-    isAbortable?: boolean;
-    onAbort?: () => void;
-    className?: string;
-    children?: ReactNode;
-    'data-testid'?: string;
-}
-
-const DevicePromptModalRenderer = ({
-    isPillShown = true,
-    isConfirmed,
-    pillTitle,
-    isAbortable = true,
-    onAbort,
-    ...rest
-}: DevicePromptModalProps) => {
-    const { device } = useDevice();
-    const modalTarget = useModalTarget();
-
-    // duplicated because headerComponent should receive undefined if isAbortable === false
-    const isActionAbortable = useSelector(selectIsActionAbortable) || isAbortable;
-
-    const intl = useIntl();
-
-    if (!onAbort) {
-        onAbort = () => TrezorConnect.cancel(intl.formatMessage(messages.TR_CANCELLED));
-    }
-
-    if (!modalTarget) return null;
-
-    const deviceModelInternal = device?.features?.internal_model;
-
-    const modalComponent = (
-        <ModalEnvironment>
-            <StyledTrezorModal
-                modalPrompt={
-                    isPillShown && (
-                        <ConfirmOnDevice
-                            title={pillTitle || <Translation id="TR_CONFIRM_ON_TREZOR" />}
-                            deviceModelInternal={deviceModelInternal}
-                            deviceUnitColor={device?.features?.unit_color}
-                            isConfirmed={isConfirmed}
-                            onCancel={isActionAbortable ? onAbort : undefined}
-                        />
-                    )
-                }
-                {...rest}
-            />
-        </ModalEnvironment>
-    );
-
-    return createPortal(modalComponent, modalTarget);
-};
-
-export const DevicePromptModal = (props: DevicePromptModalProps) => (
-    <Modal {...props} renderer={props.renderer || DevicePromptModalRenderer} />
-);
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseModal.tsx
index a5509ae47ca..703bea9e817 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseModal.tsx
@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 
-import { Paragraph, NewModal, Column, H3, List, Icon } from '@trezor/components';
+import { Paragraph, Column, H3, List, Icon } from '@trezor/components';
 import {
     selectIsDiscoveryAuthConfirmationRequired,
     onPassphraseSubmit,
@@ -10,15 +10,17 @@ import TrezorConnect from '@trezor/connect';
 import { spacings } from '@trezor/theme';
 import { HELP_CENTER_PASSPHRASE_URL } from '@trezor/urls';
 import { PassphraseTypeCard } from '@trezor/product-components';
+
 import { useSelector, useDispatch } from 'src/hooks/suite';
 import { Translation } from 'src/components/suite';
 import type { TrezorDevice } from 'src/types/suite';
 import { OpenGuideFromTooltip } from 'src/components/guide';
 import { CardWithDevice } from 'src/views/suite/SwitchDevice/CardWithDevice';
-import { PassphraseWalletConfirmation } from './PassphraseWalletConfirmation';
 import { SwitchDeviceModal } from 'src/views/suite/SwitchDevice/SwitchDeviceModal';
 import { TrezorLink } from 'src/components/suite/TrezorLink';
 
+import { PassphraseWalletConfirmation } from './PassphraseWalletConfirmation';
+
 interface PassphraseModalProps {
     device: TrezorDevice;
 }
@@ -76,107 +78,93 @@ export const PassphraseModal = ({ device }: PassphraseModalProps) => {
     }
 
     return (
-        <NewModal.Backdrop
-            onClick={onEnterPassphraseDialogCancel}
-            alignment={{ x: 'left', y: 'top' }}
-            padding={5}
-        >
-            <SwitchDeviceModal isAnimationEnabled onCancel={onEnterPassphraseDialogCancel}>
-                {hasDeviceState ? (
-                    // "view-only" is active, device is reconnected and you fired an action that needs passphrase (e.g. add coin, show receive address)
-                    <CardWithDevice
-                        onCancel={onEnterPassphraseDialogCancel}
-                        device={device}
-                        isFullHeaderVisible
-                        icon="x"
-                    >
-                        <Column
-                            gap={spacings.sm}
-                            margin={{ top: spacings.xxs }}
-                            alignItems="stretch"
-                        >
-                            <H3>
-                                <Translation id="TR_CONFIRM_PASSPHRASE" />
-                            </H3>
-                            <Paragraph>
-                                <Translation id="TR_CONFIRM_PASSPHRASE_WITHOUT_ADVICE_DESCRIPTION" />
-                            </Paragraph>
-                            <PassphraseTypeCard
-                                submitLabel={<Translation id="TR_CONFIRM" />}
-                                type="hidden"
-                                singleColModal
-                                offerPassphraseOnDevice={onDeviceOffer}
-                                onSubmit={onSubmit}
-                                deviceModel={deviceModel ?? undefined}
-                                learnMoreTooltipOnClick={
-                                    <OpenGuideFromTooltip
-                                        data-testid="@tooltip/guideAnchor"
-                                        id="/1_initialize-and-secure-your-trezor/6_passphrase.md"
-                                    />
-                                }
-                            />
-                        </Column>
-                    </CardWithDevice>
-                ) : (
-                    // first step of adding passphrase wallet from switch device modal
-                    <CardWithDevice
-                        onCancel={onEnterPassphraseDialogCancel}
-                        device={device}
-                        onBackButtonClick={onEnterPassphraseDialogBack}
-                        isFullHeaderVisible
-                    >
-                        <Column
-                            gap={spacings.sm}
-                            margin={{ top: spacings.xxs }}
-                            alignItems="stretch"
-                        >
-                            <H3>
-                                <Translation id="TR_PASSPHRASE_HIDDEN_WALLET" />
-                            </H3>
-                            <List gap={spacings.sm} bulletGap={spacings.md} typographyStyle="hint">
-                                <List.Item bulletComponent={<Icon name="info" size={16} />}>
-                                    <Translation
-                                        id="TR_PASSPHRASE_DESCRIPTION_ITEM1"
-                                        values={{
-                                            a: chunks => (
-                                                <TrezorLink
-                                                    target="_blank"
-                                                    variant="underline"
-                                                    href={HELP_CENTER_PASSPHRASE_URL}
-                                                >
-                                                    {chunks}
-                                                </TrezorLink>
-                                            ),
-                                        }}
-                                    />
-                                </List.Item>
-                                <List.Item bulletComponent={<Icon name="asterisk" size={16} />}>
-                                    <Translation id="TR_PASSPHRASE_DESCRIPTION_ITEM2" />
-                                </List.Item>
-                                <List.Item
-                                    bulletComponent={<Icon name="warningTriangle" size={16} />}
-                                >
-                                    <Translation id="TR_PASSPHRASE_DESCRIPTION_ITEM3" />
-                                </List.Item>
-                            </List>
-                            <PassphraseTypeCard
-                                submitLabel={<Translation id="TR_ACCESS_HIDDEN_WALLET" />}
-                                type="hidden"
-                                singleColModal
-                                offerPassphraseOnDevice={onDeviceOffer}
-                                onSubmit={onSubmit}
-                                deviceModel={deviceModel ?? undefined}
-                                learnMoreTooltipOnClick={
-                                    <OpenGuideFromTooltip
-                                        data-testid="@tooltip/guideAnchor"
-                                        id="/1_initialize-and-secure-your-trezor/6_passphrase.md"
-                                    />
-                                }
-                            />
-                        </Column>
-                    </CardWithDevice>
-                )}
-            </SwitchDeviceModal>
-        </NewModal.Backdrop>
+        <SwitchDeviceModal isAnimationEnabled onCancel={onEnterPassphraseDialogCancel}>
+            {hasDeviceState ? (
+                // "view-only" is active, device is reconnected and you fired an action that needs passphrase (e.g. add coin, show receive address)
+                <CardWithDevice
+                    onCancel={onEnterPassphraseDialogCancel}
+                    device={device}
+                    isFullHeaderVisible
+                    icon="x"
+                >
+                    <Column gap={spacings.sm} margin={{ top: spacings.xxs }} alignItems="stretch">
+                        <H3>
+                            <Translation id="TR_CONFIRM_PASSPHRASE" />
+                        </H3>
+                        <Paragraph>
+                            <Translation id="TR_CONFIRM_PASSPHRASE_WITHOUT_ADVICE_DESCRIPTION" />
+                        </Paragraph>
+                        <PassphraseTypeCard
+                            submitLabel={<Translation id="TR_CONFIRM" />}
+                            type="hidden"
+                            singleColModal
+                            offerPassphraseOnDevice={onDeviceOffer}
+                            onSubmit={onSubmit}
+                            deviceModel={deviceModel ?? undefined}
+                            deviceBackup={device.features?.backup_type}
+                            learnMoreTooltipOnClick={
+                                <OpenGuideFromTooltip
+                                    data-testid="@tooltip/guideAnchor"
+                                    id="/1_initialize-and-secure-your-trezor/6_passphrase.md"
+                                />
+                            }
+                        />
+                    </Column>
+                </CardWithDevice>
+            ) : (
+                // first step of adding passphrase wallet from switch device modal
+                <CardWithDevice
+                    onCancel={onEnterPassphraseDialogCancel}
+                    device={device}
+                    onBackButtonClick={onEnterPassphraseDialogBack}
+                    isFullHeaderVisible
+                >
+                    <Column gap={spacings.sm} margin={{ top: spacings.xxs }} alignItems="stretch">
+                        <H3>
+                            <Translation id="TR_PASSPHRASE_HIDDEN_WALLET" />
+                        </H3>
+                        <List gap={spacings.sm} bulletGap={spacings.md} typographyStyle="hint">
+                            <List.Item bulletComponent={<Icon name="info" size={16} />}>
+                                <Translation
+                                    id="TR_PASSPHRASE_DESCRIPTION_ITEM1"
+                                    values={{
+                                        a: chunks => (
+                                            <TrezorLink
+                                                target="_blank"
+                                                variant="underline"
+                                                href={HELP_CENTER_PASSPHRASE_URL}
+                                            >
+                                                {chunks}
+                                            </TrezorLink>
+                                        ),
+                                    }}
+                                />
+                            </List.Item>
+                            <List.Item bulletComponent={<Icon name="asterisk" size={16} />}>
+                                <Translation id="TR_PASSPHRASE_DESCRIPTION_ITEM2" />
+                            </List.Item>
+                            <List.Item bulletComponent={<Icon name="warningTriangle" size={16} />}>
+                                <Translation id="TR_PASSPHRASE_DESCRIPTION_ITEM3" />
+                            </List.Item>
+                        </List>
+                        <PassphraseTypeCard
+                            submitLabel={<Translation id="TR_ACCESS_HIDDEN_WALLET" />}
+                            type="hidden"
+                            singleColModal
+                            offerPassphraseOnDevice={onDeviceOffer}
+                            onSubmit={onSubmit}
+                            deviceModel={deviceModel ?? undefined}
+                            deviceBackup={device.features?.backup_type}
+                            learnMoreTooltipOnClick={
+                                <OpenGuideFromTooltip
+                                    data-testid="@tooltip/guideAnchor"
+                                    id="/1_initialize-and-secure-your-trezor/6_passphrase.md"
+                                />
+                            }
+                        />
+                    </Column>
+                </CardWithDevice>
+            )}
+        </SwitchDeviceModal>
     );
 };
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseOnDeviceModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseOnDeviceModal.tsx
index c66bc862992..e73673c53b2 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseOnDeviceModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseOnDeviceModal.tsx
@@ -1,6 +1,7 @@
-import styled from 'styled-components';
 import { useIntl } from 'react-intl';
 
+import styled from 'styled-components';
+
 import { H2, NewModal, Paragraph } from '@trezor/components';
 import { ConfirmOnDevice } from '@trezor/product-components';
 import {
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseSourceModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseSourceModal.tsx
deleted file mode 100644
index 96bd86dc4ee..00000000000
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseSourceModal.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import styled from 'styled-components';
-
-import { H2, variables } from '@trezor/components';
-import {
-    selectDeviceLabelOrName,
-    selectIsDiscoveryAuthConfirmationRequired,
-} from '@suite-common/wallet-core';
-
-import { Translation } from 'src/components/suite/Translation';
-import { DeviceConfirmImage } from 'src/components/suite';
-import { useSelector } from 'src/hooks/suite';
-import type { TrezorDevice } from 'src/types/suite';
-import { DevicePromptModal } from './DevicePromptModal';
-
-const StyledDevicePromptModal = styled(DevicePromptModal)`
-    width: 360px;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledH2 = styled(H2)`
-    margin-top: 12px;
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-interface PassphraseSourceModalProps {
-    device: TrezorDevice;
-}
-
-/**
- * Modal used with T2T1 with legacy firmware as result of 'ButtonRequest_PassphraseType' where passphrase source is requested on device
- * @param {PassphraseSourceModalProps}
- */
-export const PassphraseSourceModal = ({ device }: PassphraseSourceModalProps) => {
-    const authConfirmation =
-        useSelector(selectIsDiscoveryAuthConfirmationRequired) || device.authConfirm;
-    const deviceLabel = useSelector(selectDeviceLabelOrName);
-
-    return (
-        <StyledDevicePromptModal
-            isPillShown={!authConfirmation}
-            data-testid={
-                authConfirmation ? '@modal/confirm-empty-hidden-wallet' : '@modal/passphrase-source'
-            }
-        >
-            <DeviceConfirmImage device={device} />
-
-            <StyledH2>
-                <Translation
-                    id={
-                        authConfirmation
-                            ? 'TR_CONFIRM_PASSPHRASE_SOURCE'
-                            : 'TR_SELECT_PASSPHRASE_SOURCE'
-                    }
-                    values={{ deviceLabel }}
-                />
-            </StyledH2>
-        </StyledDevicePromptModal>
-    );
-};
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmation.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmation.tsx
index e27a3bf1038..e4761045849 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmation.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmation.tsx
@@ -1,17 +1,20 @@
-import { TrezorDevice } from '@suite-common/suite-types';
 import { Dispatch, SetStateAction, useState } from 'react';
+
+import { TrezorDevice } from '@suite-common/suite-types';
+
 import { CardWithDevice } from 'src/views/suite/SwitchDevice/CardWithDevice';
 import { SwitchDeviceModal } from 'src/views/suite/SwitchDevice/SwitchDeviceModal';
+
 import { PassphraseWalletConfirmationStep1 } from './PassphraseWalletConfirmationStep1';
 import { PassphraseWalletConfirmationStep2 } from './PassphraseWalletConfirmationStep2';
 import { PassphraseWalletConfirmationStep3 } from './PassphraseWalletConfirmationStep3';
 import { ContentType } from './types';
-import { NewModal } from '@trezor/components';
 
 type PassphraseWalletConfirmationContentProps = {
     onSubmit: (value: string, passphraseOnDevice?: boolean) => void;
     onDeviceOffer: boolean;
     onRetry: () => void;
+    onCancel: () => void;
     contentType: ContentType;
     setContentType: Dispatch<SetStateAction<ContentType>>;
 };
@@ -20,6 +23,7 @@ const PassphraseWalletConfirmationContent = ({
     onSubmit,
     onDeviceOffer,
     onRetry,
+    onCancel,
     contentType,
     setContentType,
 }: PassphraseWalletConfirmationContentProps): React.JSX.Element => {
@@ -29,6 +33,7 @@ const PassphraseWalletConfirmationContent = ({
                 <PassphraseWalletConfirmationStep1
                     setContentType={setContentType}
                     onRetry={onRetry}
+                    onCancel={onCancel}
                 />
             );
         case 'step2':
@@ -71,23 +76,22 @@ export const PassphraseWalletConfirmation = ({
     };
 
     return (
-        <NewModal.Backdrop onClick={onCancel} alignment={{ x: 'left', y: 'top' }} padding={5}>
-            <SwitchDeviceModal onCancel={onCancel}>
-                <CardWithDevice
+        <SwitchDeviceModal onCancel={onCancel}>
+            <CardWithDevice
+                onCancel={onCancel}
+                device={device}
+                onBackButtonClick={handleBackButtonClick}
+                isFullHeaderVisible
+            >
+                <PassphraseWalletConfirmationContent
+                    onSubmit={onSubmit}
+                    onDeviceOffer={onDeviceOffer}
+                    contentType={contentType}
+                    setContentType={setContentType}
+                    onRetry={onRetry}
                     onCancel={onCancel}
-                    device={device}
-                    onBackButtonClick={handleBackButtonClick}
-                    isFullHeaderVisible
-                >
-                    <PassphraseWalletConfirmationContent
-                        onSubmit={onSubmit}
-                        onDeviceOffer={onDeviceOffer}
-                        contentType={contentType}
-                        setContentType={setContentType}
-                        onRetry={onRetry}
-                    />
-                </CardWithDevice>
-            </SwitchDeviceModal>
-        </NewModal.Backdrop>
+                />
+            </CardWithDevice>
+        </SwitchDeviceModal>
     );
 };
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep1.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep1.tsx
index b272be19b29..5826a9b82c6 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep1.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep1.tsx
@@ -1,78 +1,124 @@
-import { Column, Card, Row, Button, Text, H3, Paragraph } from '@trezor/components';
+import { Dispatch } from 'react';
+
+import { spacings } from '@trezor/theme';
+import { Column, Card, Row, Button, H3, Paragraph } from '@trezor/components';
 import { HELP_CENTER_PASSPHRASE_URL } from '@trezor/urls';
+import { CoinLogo } from '@trezor/product-components';
+
 import { Translation } from 'src/components/suite/Translation';
 import { TrezorLink } from 'src/components/suite/TrezorLink';
+import { useDispatch, useSelector } from 'src/hooks/suite';
+import { goto } from 'src/actions/suite/routerActions';
+import { onCancel as onCancelModal } from 'src/actions/suite/modalActions';
+import { useNetworkSupport } from 'src/hooks/settings/useNetworkSupport';
+import { selectEnabledNetworks } from 'src/reducers/wallet/settingsReducer';
+
 import { ContentType } from './types';
-import { Dispatch } from 'react';
-import { spacings } from '@trezor/theme';
 
 type PassphraseWalletConfirmationStep1Props = {
     setContentType: Dispatch<React.SetStateAction<ContentType>>;
     onRetry: () => void;
+    onCancel: () => void;
     'data-testid'?: string;
 };
 
 export const PassphraseWalletConfirmationStep1 = ({
     setContentType,
     onRetry,
+    onCancel,
     'data-testid': dataTest,
-}: PassphraseWalletConfirmationStep1Props) => (
-    <Column gap={spacings.sm} margin={{ top: spacings.xxs }} alignItems="stretch">
-        <H3>
-            <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_TITLE" />
-        </H3>
-        <Card
-            paddingType="small"
-            label={
-                <Row
-                    justifyContent="space-between"
-                    margin={{ top: spacings.xxxs, bottom: spacings.xxs }}
-                >
-                    <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT" />
-                    <TrezorLink type="hint" variant="nostyle" href={HELP_CENTER_PASSPHRASE_URL}>
-                        <Button
-                            size="tiny"
-                            variant="info"
-                            iconAlignment="right"
-                            icon="arrowUpRight"
-                            data-testid={dataTest}
-                        >
-                            <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT_LINK" />
-                        </Button>
-                    </TrezorLink>
-                </Row>
-            }
-        >
-            <Column gap={spacings.sm}>
-                <Paragraph typographyStyle="highlight">
-                    <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_OPEN_UNUSED_WALLET_DESCRIPTION" />
-                </Paragraph>
-                <Button
-                    isFullWidth
-                    variant="primary"
-                    onClick={() => {
-                        setContentType('step2');
-                    }}
-                    data-testid="@passphrase-confirmation/step1-open-unused-wallet-button"
-                >
-                    <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_OPEN_UNUSED_WALLET_BUTTON" />
-                </Button>
-            </Column>
-        </Card>
-        <Card paddingType="small">
-            <Column gap={spacings.md}>
-                <Text typographyStyle="highlight">
-                    <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_OPEN_WITH_FUNDS_DESCRIPTION" />
-                </Text>
-                <Button
-                    isFullWidth
-                    variant="tertiary"
-                    onClick={onRetry}
-                    data-testid="@passphrase-confirmation/step1-retry-button"
-                >
-                    <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_OPEN_WITH_FUNDS_BUTTON" />
-                </Button>
-            </Column>
-        </Card>
-    </Column>
-);
+}: PassphraseWalletConfirmationStep1Props) => {
+    const { supportedMainnets } = useNetworkSupport();
+    const enabledNetworks = useSelector(selectEnabledNetworks);
+    const dispatch = useDispatch();
+
+    const areAllNetworksEnabled = supportedMainnets.every(network =>
+        enabledNetworks.includes(network.symbol),
+    );
+
+    return (
+        <Column gap={spacings.sm} margin={{ top: spacings.xxs }} alignItems="stretch">
+            <H3>
+                <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_TITLE" />
+            </H3>
+            <Card
+                paddingType="small"
+                label={
+                    <Row
+                        justifyContent="space-between"
+                        margin={{ top: spacings.xxxs, bottom: spacings.xxs }}
+                    >
+                        <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT" />
+                        <TrezorLink type="hint" variant="nostyle" href={HELP_CENTER_PASSPHRASE_URL}>
+                            <Button
+                                size="tiny"
+                                variant="info"
+                                iconAlignment="right"
+                                icon="arrowUpRight"
+                                data-testid={dataTest}
+                            >
+                                <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_HINT_LINK" />
+                            </Button>
+                        </TrezorLink>
+                    </Row>
+                }
+            >
+                <Column gap={spacings.sm}>
+                    <Paragraph typographyStyle="highlight">
+                        <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_OPEN_UNUSED_WALLET_DESCRIPTION" />
+                    </Paragraph>
+                    <Button
+                        isFullWidth
+                        variant="primary"
+                        onClick={() => {
+                            setContentType('step2');
+                        }}
+                        data-testid="@passphrase-confirmation/step1-open-unused-wallet-button"
+                    >
+                        <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_OPEN_UNUSED_WALLET_BUTTON" />
+                    </Button>
+                </Column>
+            </Card>
+            <Card paddingType="small">
+                <Column gap={spacings.xxxs} alignItems="flex-start">
+                    <Paragraph typographyStyle="highlight">
+                        <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_OPEN_WITH_FUNDS_DESCRIPTION" />
+                    </Paragraph>
+                    {!areAllNetworksEnabled && (
+                        <Row gap={spacings.xs} flexWrap="wrap">
+                            <Paragraph variant="tertiary" typographyStyle="hint">
+                                <Translation id="TR_CHECKED_BALANCES_ON" />:
+                            </Paragraph>
+                            <Row gap={spacings.xxs} flexWrap="wrap">
+                                {enabledNetworks.map(network => (
+                                    <CoinLogo key={network} symbol={network} size={16} />
+                                ))}
+                            </Row>
+                            <Button
+                                variant="tertiary"
+                                icon="plus"
+                                size="tiny"
+                                onClick={() => {
+                                    onCancel();
+                                    dispatch(onCancelModal());
+                                    dispatch(goto('settings-coins'));
+                                }}
+                            >
+                                <Translation id="TR_ADD" />
+                            </Button>
+                        </Row>
+                    )}
+                    <Button
+                        isFullWidth
+                        variant="tertiary"
+                        onClick={onRetry}
+                        margin={{ top: spacings.md }}
+                        data-testid="@passphrase-confirmation/step1-retry-button"
+                    >
+                        <Translation id="TR_PASSPHRASE_WALLET_CONFIRMATION_STEP1_OPEN_WITH_FUNDS_BUTTON" />
+                    </Button>
+                </Column>
+            </Card>
+        </Column>
+    );
+};
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep2.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep2.tsx
index 8b9a34b4602..84006102d63 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep2.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep2.tsx
@@ -1,8 +1,11 @@
+import { Dispatch } from 'react';
+
 import { Button, Text, Banner, Card, Icon, H3, Column, List } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite/Translation';
+
 import { ContentType } from './types';
-import { Dispatch } from 'react';
-import { spacings } from '@trezor/theme';
 
 type PassphraseWalletConfirmationStep2Props = {
     setContentType: Dispatch<React.SetStateAction<ContentType>>;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep3.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep3.tsx
index b2676230094..9310dc69f55 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep3.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PassphraseWalletConfirmationStep3.tsx
@@ -1,10 +1,11 @@
 import { Banner, Column, H3 } from '@trezor/components';
+import { PassphraseTypeCard } from '@trezor/product-components';
 import { spacings } from '@trezor/theme';
+import { selectDeviceModel, selectDeviceFeatures } from '@suite-common/wallet-core';
+
 import { Translation } from 'src/components/suite/Translation';
 import { OpenGuideFromTooltip } from 'src/components/guide';
-import { selectDeviceModel } from '@suite-common/wallet-core';
 import { useSelector } from 'src/hooks/suite';
-import { PassphraseTypeCard } from '../../../../../../../product-components/src/components/PassphraseTypeCard/PassphraseTypeCard';
 
 type PassphraseWalletConfirmationStep3Props = {
     onDeviceOffer: boolean;
@@ -16,6 +17,7 @@ export const PassphraseWalletConfirmationStep3 = ({
     onSubmit,
 }: PassphraseWalletConfirmationStep3Props) => {
     const deviceModel = useSelector(selectDeviceModel);
+    const deviceFeatures = useSelector(selectDeviceFeatures);
 
     return (
         <Column gap={spacings.sm} margin={{ top: spacings.xxs }} alignItems="stretch">
@@ -32,6 +34,7 @@ export const PassphraseWalletConfirmationStep3 = ({
                 onSubmit={onSubmit}
                 singleColModal
                 deviceModel={deviceModel ?? undefined}
+                deviceBackup={deviceFeatures?.backup_type}
                 learnMoreTooltipOnClick={
                     <OpenGuideFromTooltip
                         data-testid="@tooltip/guideAnchor"
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PinInvalidModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PinInvalidModal.tsx
index 6c3a50d8c47..e034f3806f0 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PinInvalidModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PinInvalidModal.tsx
@@ -2,6 +2,7 @@ import styled from 'styled-components';
 
 import { selectDeviceLabelOrName } from '@suite-common/wallet-core';
 import { Paragraph } from '@trezor/components';
+
 import { Translation } from 'src/components/suite/Translation';
 import { DeviceConfirmImage, Modal, ModalProps } from 'src/components/suite';
 import { TrezorDevice } from 'src/types/suite';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PinModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PinModal.tsx
index e4bf5bd6d96..2efa9c811b3 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PinModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/PinModal.tsx
@@ -1,7 +1,8 @@
-import TrezorConnect from '@trezor/connect';
 import styled from 'styled-components';
 
+import TrezorConnect from '@trezor/connect';
 import { selectDeviceLabelOrName } from '@suite-common/wallet-core';
+
 import { Modal, ModalProps, PinMatrix, Translation } from 'src/components/suite';
 import { PIN_MATRIX_MAX_WIDTH } from 'src/components/suite/PinMatrix/PinMatrix';
 import { usePin } from 'src/hooks/suite/usePinModal';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/WordAdvancedModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/WordAdvancedModal.tsx
index 6b24cd48f1a..5ba6017d01a 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/WordAdvancedModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/WordAdvancedModal.tsx
@@ -1,7 +1,11 @@
+import { useIntl } from 'react-intl';
+
 import styled from 'styled-components';
+
 import TrezorConnect from '@trezor/connect';
 import { Paragraph } from '@trezor/components';
 import { HELP_CENTER_ADVANCED_RECOVERY_URL } from '@trezor/urls';
+
 import {
     Translation,
     WordInputAdvanced,
@@ -9,7 +13,6 @@ import {
     Modal,
     ModalProps,
 } from 'src/components/suite';
-import { useIntl } from 'react-intl';
 import messages from 'src/support/messages';
 
 const ContentWrapper = styled.div`
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/WordModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/WordModal.tsx
index a0ea07f7c11..41a6cc7e43e 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/WordModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/DeviceContextModal/WordModal.tsx
@@ -1,7 +1,10 @@
+import { useIntl } from 'react-intl';
+
+import styled from 'styled-components';
+
 import TrezorConnect from '@trezor/connect';
+
 import { Translation, WordInput, Modal, ModalProps } from 'src/components/suite';
-import styled from 'styled-components';
-import { useIntl } from 'react-intl';
 import messages from 'src/support/messages';
 
 const StyledModal = styled(Modal)`
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/ReduxModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/ReduxModal.tsx
index a8a7d52cc52..debac0d4ce0 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/ReduxModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/ReduxModal.tsx
@@ -1,5 +1,6 @@
 import { MODAL } from 'src/actions/suite/constants';
 import type { AppState } from 'src/types/suite';
+
 import type { ModalProps } from '../Modal/Modal';
 import { DeviceContextModal } from './DeviceContextModal/DeviceContextModal';
 import { DeviceConfirmationModal } from './DeviceConfirmationModal/DeviceConfirmationModal';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewEvmExplanation.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewEvmExplanation.tsx
index 641730b86d7..02077fb292d 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewEvmExplanation.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewEvmExplanation.tsx
@@ -1,10 +1,11 @@
 import { Banner } from '@trezor/components';
-import { Translation } from 'src/components/suite';
-import { Account } from 'src/types/wallet';
 import { networks } from '@suite-common/wallet-config';
 import { spacings } from '@trezor/theme';
 import { StakeType } from '@suite-common/wallet-types';
 
+import { Account } from 'src/types/wallet';
+import { Translation } from 'src/components/suite';
+
 type TransactionReviewEvmExplanationProps = {
     account: Account;
     ethereumStakeType: StakeType | null;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModal.tsx
index 658a0262801..8cea753405d 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModal.tsx
@@ -1,10 +1,10 @@
 import { UserContextPayload } from '@suite-common/suite-types';
-import { selectStake } from '@suite-common/wallet-core';
+import { selectStake, cancelSignSendFormTransactionThunk } from '@suite-common/wallet-core';
+
 import { cancelSignTx as cancelSignStakingTx } from 'src/actions/wallet/stakeActions';
-import { TransactionReviewModalContent } from './TransactionReviewModalContent';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 
-import { cancelSignSendFormTransactionThunk } from '@suite-common/wallet-core';
+import { TransactionReviewModalContent } from './TransactionReviewModalContent';
 
 // This modal is opened either in Device (button request) or User (push tx) context
 // contexts are distinguished by `type` prop
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx
index 590f070281f..48a20baf901 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewModalContent.tsx
@@ -1,29 +1,36 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
 import { Deferred } from '@trezor/utils';
 import {
     DeviceRootState,
     selectDevice,
-    selectSendFormDraftByAccountKey,
+    selectSendFormDraftByKey,
     selectSendFormReviewButtonRequestsCount,
     selectStakePrecomposedForm,
     StakeState,
+    SendState,
 } from '@suite-common/wallet-core';
 import { FormState, StakeFormState } from '@suite-common/wallet-types';
-import { constructTransactionReviewOutputs, isRbfTransaction } from '@suite-common/wallet-utils';
-import { SendState } from '@suite-common/wallet-core';
+import {
+    constructTransactionReviewOutputs,
+    isRbfTransaction,
+    getTxStakeNameByDataHex,
+} from '@suite-common/wallet-utils';
+import { ConfirmOnDevice } from '@trezor/product-components';
+import { networks } from '@suite-common/wallet-config';
+
 import { useSelector } from 'src/hooks/suite';
 import { selectIsActionAbortable } from 'src/reducers/suite/suiteReducer';
 import { getTransactionReviewModalActionText } from 'src/utils/suite/transactionReview';
 import { Modal, Translation } from 'src/components/suite';
+import { selectAccountIncludingChosenInCoinmarket } from 'src/reducers/wallet/selectedAccountReducer';
+
 import { TransactionReviewSummary } from './TransactionReviewSummary';
 import { TransactionReviewOutputList } from './TransactionReviewOutputList/TransactionReviewOutputList';
 import { TransactionReviewEvmExplanation } from './TransactionReviewEvmExplanation';
-import { getTxStakeNameByDataHex } from '@suite-common/suite-utils';
-import { ConfirmOnDevice } from '@trezor/product-components';
-import { networks } from '@suite-common/wallet-config';
-import { selectAccountIncludingChosenInCoinmarket } from 'src/reducers/wallet/selectedAccountReducer';
 
 const StyledModal = styled(Modal)`
     ${Modal.Body} {
@@ -69,7 +76,7 @@ export const TransactionReviewModalContent = ({
     const precomposedForm = useSelector(state =>
         isStakeState(txInfoState)
             ? selectStakePrecomposedForm(state)
-            : selectSendFormDraftByAccountKey(state, account?.key),
+            : selectSendFormDraftByKey(state, account?.key),
     );
 
     const isRbfAction = precomposedTx !== undefined && isRbfTransaction(precomposedTx);
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewDetails.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewDetails.tsx
index 546f9669abc..ef47c1ed585 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewDetails.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewDetails.tsx
@@ -1,10 +1,11 @@
 import styled, { useTheme } from 'styled-components';
 
-import { Translation } from 'src/components/suite';
 import { variables, Card, Icon } from '@trezor/components';
 import { GeneralPrecomposedTransactionFinal } from '@suite-common/wallet-types';
 import { borders, typography, zIndices } from '@trezor/theme';
 
+import { Translation } from 'src/components/suite';
+
 const TransactionDetailsWrapper = styled.div`
     display: flex;
     flex-direction: column;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutput.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutput.tsx
index 19473de8905..505776af8be 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutput.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutput.tsx
@@ -1,10 +1,16 @@
 import { ReactNode, forwardRef } from 'react';
+
 import { BigNumber } from '@trezor/utils/src/bigNumber';
-import { Translation } from 'src/components/suite';
 import { formatNetworkAmount, formatAmount, isTestnet } from '@suite-common/wallet-utils';
 import { BTC_LOCKTIME_VALUE } from '@suite-common/wallet-constants';
 import { NetworkSymbol } from '@suite-common/wallet-config';
-import { ReviewOutput } from '@suite-common/wallet-types';
+import { ReviewOutput, StakeType } from '@suite-common/wallet-types';
+import { TranslationKey } from '@suite-common/intl-types';
+
+import type { Account } from 'src/types/wallet';
+import { useDisplayMode, useTranslation } from 'src/hooks/suite';
+import { Translation } from 'src/components/suite';
+
 import {
     TransactionReviewStepIndicator,
     TransactionReviewStepIndicatorProps,
@@ -13,10 +19,6 @@ import {
     TransactionReviewOutputElement,
     OutputElementLine,
 } from './TransactionReviewOutputElement';
-import type { Account } from 'src/types/wallet';
-import { StakeType } from '@suite-common/wallet-types';
-import { useDisplayMode, useTranslation } from 'src/hooks/suite';
-import { TranslationKey } from '@suite-common/intl-types';
 
 const getFeeLabel = (networkType: Account['networkType']) => {
     switch (networkType) {
@@ -57,7 +59,8 @@ export type TransactionReviewOutputProps = {
 
 export const TransactionReviewOutput = forwardRef<HTMLDivElement, TransactionReviewOutputProps>(
     (props, ref) => {
-        const { type, state, label, value, symbol, token, account, ethereumStakeType } = props;
+        const { type, state, label, value, symbol, token, account, ethereumStakeType, isRbf } =
+            props;
         let outputLabel: ReactNode = label;
         const { networkType } = account;
         const { translationString } = useTranslation();
@@ -157,6 +160,11 @@ export const TransactionReviewOutput = forwardRef<HTMLDivElement, TransactionRev
         } else if (['data', 'address'].includes(type) && ethereumStakeType) {
             const displayModeStringsMap = getDisplayModeStringsMap();
 
+            // prevents double label when bumping stake type txs
+            if (type === 'address' && isRbf) {
+                return null;
+            }
+
             outputLines = [
                 {
                     id: 'data',
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputElement.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputElement.tsx
index 81738a99a78..ab6a1bbb3c5 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputElement.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputElement.tsx
@@ -1,17 +1,20 @@
 import { forwardRef, ReactNode } from 'react';
+
 import styled from 'styled-components';
 
 import { variables } from '@trezor/components';
-import { FiatValue, FormattedCryptoAmount, Translation } from 'src/components/suite';
-import { Account } from 'src/types/wallet';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { TokenInfo } from '@trezor/connect';
-import { amountToSatoshi } from '@suite-common/wallet-utils';
-import { TransactionReviewStepIndicatorProps } from './TransactionReviewStepIndicator';
+import { amountToSmallestUnit } from '@suite-common/wallet-utils';
 import { zIndices } from '@trezor/theme';
-import { DeviceDisplay } from '../../../../DeviceDisplay/DeviceDisplay';
+
+import { Account } from 'src/types/wallet';
+import { FiatValue, FormattedCryptoAmount, Translation } from 'src/components/suite';
 import { DisplayMode } from 'src/types/suite';
 
+import { TransactionReviewStepIndicatorProps } from './TransactionReviewStepIndicator';
+import { DeviceDisplay } from '../../../../DeviceDisplay/DeviceDisplay';
+
 const TYPES_TO_BE_DISPLAYED_IN_SCREEN_BOX = ['address', 'regular_legacy', 'data', 'opreturn'];
 
 const OutputWrapper = styled.div`
@@ -171,12 +174,13 @@ export const TransactionReviewOutputElement = forwardRef<
         const network = account?.networkType;
         const cardanoFingerprint = getFingerprint(account?.tokens, token?.symbol);
         const isActive = state === 'active';
-        const hasMultipleLines = lines.length > 1;
+
+        const showMultiIndicator = lines.length > 1;
 
         return (
             <OutputWrapper ref={ref}>
-                <OutputLeft $isCentered={hasMultipleLines}>
-                    {hasMultipleLines ? (
+                <OutputLeft $isCentered={showMultiIndicator}>
+                    {showMultiIndicator ? (
                         <MultiIndicatorWrapper $linesCount={lines.length - 1}>
                             {indicator}
                         </MultiIndicatorWrapper>
@@ -245,7 +249,7 @@ export const TransactionReviewOutputElement = forwardRef<
                                         <Translation id="TR_CARDANO_TREZOR_AMOUNT_HEADLINE" />
                                     </OutputHeadline>
                                     <OutputValue>
-                                        {amountToSatoshi(line.value, token.decimals)}
+                                        {amountToSmallestUnit(line.value, token.decimals)}
                                     </OutputValue>
                                 </CardanoTrezorAmountWrapper>
                             )}
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputList.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputList.tsx
index 294c6e66a8b..604881c1712 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputList.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewOutputList.tsx
@@ -1,22 +1,24 @@
 import { useEffect, useRef } from 'react';
+
 import styled from 'styled-components';
 
 import { analytics, EventType } from '@trezor/suite-analytics';
 import { Button, variables, Banner } from '@trezor/components';
-import { Translation } from 'src/components/suite';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { TranslationKey } from '@suite-common/intl-types';
 import { copyToClipboard, download } from '@trezor/dom-utils';
-import { useDispatch } from 'src/hooks/suite';
-import { TransactionReviewDetails } from './TransactionReviewDetails';
-import { TransactionReviewOutput } from './TransactionReviewOutput';
-import type { Account } from 'src/types/wallet';
 import type { FormState, GeneralPrecomposedTransactionFinal } from '@suite-common/wallet-types';
 import { getTransactionReviewOutputState } from '@suite-common/wallet-utils';
-import { TransactionReviewTotalOutput } from './TransactionReviewTotalOutput';
-import { ReviewOutput } from '@suite-common/wallet-types';
+import { ReviewOutput, StakeFormState, StakeType } from '@suite-common/wallet-types';
 import { spacingsPx } from '@trezor/theme';
-import { StakeFormState, StakeType } from '@suite-common/wallet-types';
+
+import type { Account } from 'src/types/wallet';
+import { useDispatch } from 'src/hooks/suite';
+import { Translation } from 'src/components/suite';
+
+import { TransactionReviewTotalOutput } from './TransactionReviewTotalOutput';
+import { TransactionReviewOutput } from './TransactionReviewOutput';
+import { TransactionReviewDetails } from './TransactionReviewDetails';
 
 const Content = styled.div`
     display: flex;
@@ -235,6 +237,8 @@ export const TransactionReviewOutputList = ({
                                 outputs={outputs}
                                 buttonRequestsCount={buttonRequestsCount}
                                 precomposedTx={precomposedTx}
+                                ethereumStakeType={ethereumStakeType}
+                                isRbfAction={isRbfAction}
                             />
                         )}
                     </RightTopInner>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewStepIndicator.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewStepIndicator.tsx
index 471c2e8fb72..dd7163e9a48 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewStepIndicator.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewStepIndicator.tsx
@@ -1,4 +1,5 @@
 import styled, { useTheme } from 'styled-components';
+
 import { Icon } from '@trezor/components';
 
 const IndicatorWrapper = styled.div`
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewTotalOutput.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewTotalOutput.tsx
index 877bf46e1a4..2e9c18ed4d1 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewTotalOutput.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewOutputList/TransactionReviewTotalOutput.tsx
@@ -1,16 +1,21 @@
 import { forwardRef } from 'react';
-import { BigNumber } from '@trezor/utils/src/bigNumber';
 
-import { formatAmount, formatNetworkAmount, isTestnet } from '@suite-common/wallet-utils';
-import { selectDevice } from '@suite-common/wallet-core';
-import { TrezorDevice } from 'src/types/suite';
-import { Translation } from 'src/components/suite/Translation';
-import { useSelector } from 'src/hooks/suite/useSelector';
+import { BigNumber } from '@trezor/utils/src/bigNumber';
 import {
+    formatAmount,
+    formatNetworkAmount,
+    isTestnet,
     getTransactionReviewOutputState,
     getIsUpdatedSendFlow,
     getIsUpdatedEthereumSendFlow,
 } from '@suite-common/wallet-utils';
+import { selectDevice } from '@suite-common/wallet-core';
+import { StakeType } from '@suite-common/wallet-types';
+
+import { TrezorDevice } from 'src/types/suite';
+import { Translation } from 'src/components/suite/Translation';
+import { useSelector } from 'src/hooks/suite/useSelector';
+
 import { TransactionReviewStepIndicator } from './TransactionReviewStepIndicator';
 import {
     TransactionReviewOutputElement,
@@ -33,7 +38,7 @@ const StepIndicator = ({ signedTx, outputs, buttonRequestsCount }: StepIndicator
 
 type TransactionReviewTotalOutputProps = Omit<
     TransactionReviewOutputListProps,
-    'precomposedForm' | 'decision' | 'detailsOpen' | 'isRbfAction' | 'actionText'
+    'precomposedForm' | 'decision' | 'detailsOpen' | 'actionText'
 >;
 
 const getLines = (
@@ -41,6 +46,8 @@ const getLines = (
     networkType: TransactionReviewOutputListProps['account']['networkType'],
     symbol: TransactionReviewOutputListProps['account']['symbol'],
     precomposedTx: TransactionReviewOutputListProps['precomposedTx'],
+    isRbfAction?: boolean,
+    ethereumStakeType?: StakeType,
 ): Array<OutputElementLine> => {
     const isUpdatedSendFlow = getIsUpdatedSendFlow(device);
     const isUpdatedEthereumSendFlow = getIsUpdatedEthereumSendFlow(device, networkType);
@@ -63,20 +70,21 @@ const getLines = (
         .toString();
 
     if (isUpdatedEthereumSendFlow) {
-        return [
-            {
-                id: 'amount', // In updated ethereum send flow there is no total amount shown, only amount without fee
-                label: <Translation id="AMOUNT" />,
-                value: tokenInfo
-                    ? formatAmount(precomposedTx.totalSpent, tokenInfo.decimals)
-                    : formatNetworkAmount(amountWithoutFee, symbol),
-            },
-            {
-                id: 'fee',
-                label: <Translation id="MAX_FEE" />,
-                value: formatNetworkAmount(precomposedTx.fee, symbol),
-            },
-        ];
+        const isUnknownStakingClaimValue = isRbfAction && ethereumStakeType === 'claim';
+        const amountLine = {
+            id: 'amount', // In updated ethereum send flow there is no total amount shown, only amount without fee
+            label: <Translation id="AMOUNT" />,
+            value: tokenInfo
+                ? formatAmount(precomposedTx.totalSpent, tokenInfo.decimals)
+                : formatNetworkAmount(amountWithoutFee, symbol),
+        };
+        const feeLine = {
+            id: 'fee',
+            label: <Translation id="MAX_FEE" />,
+            value: formatNetworkAmount(precomposedTx.fee, symbol),
+        };
+
+        return isUnknownStakingClaimValue ? [feeLine] : [amountLine, feeLine];
     }
     if (isUpdatedSendFlow) {
         return [
@@ -110,33 +118,53 @@ const getLines = (
 export const TransactionReviewTotalOutput = forwardRef<
     HTMLDivElement,
     TransactionReviewTotalOutputProps
->(({ account, signedTx, outputs, buttonRequestsCount, precomposedTx }, ref) => {
-    const device = useSelector(selectDevice);
+>(
+    (
+        {
+            account,
+            signedTx,
+            outputs,
+            buttonRequestsCount,
+            precomposedTx,
+            ethereumStakeType,
+            isRbfAction,
+        },
+        ref,
+    ) => {
+        const device = useSelector(selectDevice);
 
-    if (!device) {
-        return null;
-    }
+        if (!device) {
+            return null;
+        }
+
+        const { symbol, networkType } = account;
+
+        const lines = getLines(
+            device,
+            networkType,
+            symbol,
+            precomposedTx,
+            isRbfAction,
+            ethereumStakeType,
+        );
 
-    const { symbol, networkType } = account;
-
-    const lines = getLines(device, networkType, symbol, precomposedTx);
-
-    return (
-        <TransactionReviewOutputElement
-            account={account}
-            indicator={
-                <StepIndicator
-                    signedTx={signedTx}
-                    outputs={outputs}
-                    buttonRequestsCount={buttonRequestsCount}
-                />
-            }
-            lines={lines}
-            cryptoSymbol={symbol}
-            fiatSymbol={symbol}
-            fiatVisible={!isTestnet(symbol)}
-            ref={ref}
-            token={precomposedTx?.token}
-        />
-    );
-});
+        return (
+            <TransactionReviewOutputElement
+                account={account}
+                indicator={
+                    <StepIndicator
+                        signedTx={signedTx}
+                        outputs={outputs}
+                        buttonRequestsCount={buttonRequestsCount}
+                    />
+                }
+                lines={lines}
+                cryptoSymbol={symbol}
+                fiatSymbol={symbol}
+                fiatVisible={!isTestnet(symbol)}
+                ref={ref}
+                token={precomposedTx?.token}
+            />
+        );
+    },
+);
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewSummary.tsx b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewSummary.tsx
index a33e50089f6..097f68341af 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewSummary.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/TransactionReviewModal/TransactionReviewSummary.tsx
@@ -1,18 +1,19 @@
 import styled, { useTheme } from 'styled-components';
+
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { getFeeUnits, formatNetworkAmount, formatAmount, getFee } from '@suite-common/wallet-utils';
 import { Icon, variables } from '@trezor/components';
 import { formatDuration } from '@suite-common/suite-utils';
 import { borders, spacingsPx, typography } from '@trezor/theme';
 import { TranslationKey } from '@suite-common/intl-types';
+import { Network, NetworkType } from '@suite-common/wallet-config';
+import { GeneralPrecomposedTransactionFinal, StakeType } from '@suite-common/wallet-types';
+import { CoinLogo } from '@trezor/product-components';
+
 import { Translation, FormattedCryptoAmount, AccountLabel } from 'src/components/suite';
 import { Account } from 'src/types/wallet';
-import { Network } from '@suite-common/wallet-config';
-import { GeneralPrecomposedTransactionFinal, StakeType } from '@suite-common/wallet-types';
 import { useSelector } from 'src/hooks/suite/useSelector';
 import { selectLabelingDataForSelectedAccount } from 'src/reducers/suite/metadataReducer';
-import { NetworkType } from '@suite-common/wallet-config';
-import { CoinLogo } from '@trezor/product-components';
 
 const Wrapper = styled.div`
     padding: 20px 15px 12px;
@@ -243,6 +244,8 @@ export const TransactionReviewSummary = ({
     const isFeeCustom = drafts[currentAccountKey]?.selectedFee === 'custom';
     const isComposedFeeRateDifferent = isFeeCustom && formFeeRate !== fee;
 
+    const isZeroAmount = amount === '0'; // bump claim tx and trade approve has 0 value
+
     return (
         <Wrapper>
             <SummaryHead>
@@ -255,13 +258,15 @@ export const TransactionReviewSummary = ({
 
                 <Headline>
                     <Translation id={actionText} />
-                    <HeadlineAmount>
-                        <FormattedCryptoAmount
-                            disableHiddenPlaceholder
-                            value={amount}
-                            symbol={tx.token?.symbol ?? symbol}
-                        />
-                    </HeadlineAmount>
+                    {!isZeroAmount && (
+                        <HeadlineAmount>
+                            <FormattedCryptoAmount
+                                disableHiddenPlaceholder
+                                value={amount}
+                                symbol={tx.token?.symbol ?? symbol}
+                            />
+                        </HeadlineAmount>
+                    )}
                 </Headline>
 
                 <AccountWrapper>
@@ -293,7 +298,7 @@ export const TransactionReviewSummary = ({
                 {!!tx.feeLimit && network.networkType !== 'solana' && (
                     <LeftDetailsRow>
                         <ReviewLeftDetailsLineLeft>
-                            <Icon size={12} color={theme.iconSubdued} name="gas" />
+                            <Icon size={12} color={theme.iconSubdued} name="receipt" />
                             <Translation id="TR_GAS_LIMIT" />
                         </ReviewLeftDetailsLineLeft>
 
@@ -304,7 +309,7 @@ export const TransactionReviewSummary = ({
                 )}
                 <LeftDetailsRow>
                     <ReviewLeftDetailsLineLeft>
-                        <Icon size={12} color={theme.iconSubdued} name="gas" />
+                        <Icon size={12} color={theme.iconSubdued} name="receipt" />
                         <Translation
                             id={feeLabelTranslationIdByNetworkTypeMap[network.networkType]}
                         />
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UnhideTokenModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UnhideTokenModal.tsx
index be890961f19..8f3d5ecd172 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UnhideTokenModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UnhideTokenModal.tsx
@@ -1,15 +1,17 @@
-import { Translation } from 'src/components/suite';
-import { useDispatch } from 'src/hooks/suite/useDispatch';
+import { useState } from 'react';
+
 import { H2, Paragraph, Card, Checkbox, NewModal } from '@trezor/components';
 import {
     DefinitionType,
     tokenDefinitionsActions,
     TokenManagementAction,
 } from '@suite-common/token-definitions';
+import { spacings } from '@trezor/theme';
+
+import { Translation } from 'src/components/suite';
+import { useDispatch } from 'src/hooks/suite/useDispatch';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 import { useSelector } from 'src/hooks/suite';
-import { useState } from 'react';
-import { spacings } from '@trezor/theme';
 import { setFlag } from 'src/actions/suite/suiteActions';
 
 interface UnhideTokenModalProps {
@@ -43,7 +45,7 @@ export const UnhideTokenModal = ({ address, onCancel }: UnhideTokenModalProps) =
     return (
         <NewModal
             onCancel={onCancel}
-            icon="warning"
+            iconName="warning"
             variant="warning"
             bottomContent={
                 <>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AccountTypeSelect/AccountTypeDescription.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AccountTypeSelect/AccountTypeDescription.tsx
index ff789a2c338..632fe960428 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AccountTypeSelect/AccountTypeDescription.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AccountTypeSelect/AccountTypeDescription.tsx
@@ -1,21 +1,19 @@
-import { Paragraph } from '@trezor/components';
-import { Bip43Path } from '@suite-common/wallet-config';
-import { Translation } from 'src/components/suite';
+import { Paragraph, Column } from '@trezor/components';
+import { Bip43PathTemplate, AccountType, NetworkType } from '@suite-common/wallet-config';
 import {
     getAccountTypeDesc,
     getAccountTypeUrl,
     getTitleForNetwork,
 } from '@suite-common/wallet-utils';
-import { LearnMoreButton } from 'src/components/suite/LearnMoreButton';
-import { AccountType } from '@suite-common/wallet-config';
-import { NetworkType } from '@suite-common/wallet-config';
-import { useTranslation } from 'src/hooks/suite';
-import { Column } from '@trezor/components';
 import { spacings } from '@trezor/theme';
 import { Account } from '@suite-common/wallet-types';
 
+import { Translation } from 'src/components/suite';
+import { LearnMoreButton } from 'src/components/suite/LearnMoreButton';
+import { useTranslation } from 'src/hooks/suite';
+
 interface AccountTypeDescriptionProps {
-    bip43Path: Bip43Path;
+    bip43Path: Bip43PathTemplate;
     accountType?: AccountType;
     symbol?: Account['symbol'];
     networkType?: NetworkType;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AccountTypeSelect/AccountTypeSelect.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AccountTypeSelect/AccountTypeSelect.tsx
index 0010667ad81..7a2caf35f7a 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AccountTypeSelect/AccountTypeSelect.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AccountTypeSelect/AccountTypeSelect.tsx
@@ -1,11 +1,14 @@
 import styled from 'styled-components';
+
 import { Column, Select } from '@trezor/components';
-import { Translation } from 'src/components/suite/Translation';
 import { getAccountTypeName, getAccountTypeTech } from '@suite-common/wallet-utils';
-import { AccountTypeDescription } from './AccountTypeDescription';
 import { NetworkAccount, NetworkSymbol, NetworkType } from '@suite-common/wallet-config';
 import { spacings, typography } from '@trezor/theme';
 
+import { Translation } from 'src/components/suite/Translation';
+
+import { AccountTypeDescription } from './AccountTypeDescription';
+
 const LabelWrapper = styled.div`
     display: flex;
     align-items: baseline;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountButton/AddAccountButton.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountButton/AddAccountButton.tsx
index edeae875d3d..6f021f478ba 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountButton/AddAccountButton.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountButton/AddAccountButton.tsx
@@ -3,10 +3,12 @@ import { useCallback } from 'react';
 import { analytics, EventType } from '@trezor/suite-analytics';
 import { UnavailableCapability } from '@trezor/connect';
 import { selectDevice } from '@suite-common/wallet-core';
-import { Account } from 'src/types/wallet';
 import { Network, NetworkAccount } from '@suite-common/wallet-config';
+
+import { Account } from 'src/types/wallet';
 import { Translation } from 'src/components/suite';
 import { useAccountSearch, useSelector } from 'src/hooks/suite';
+
 import { AddCoinjoinAccountButton } from './AddCoinjoinAccountButton';
 import { AddButton } from './AddButton';
 
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountButton/AddButton.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountButton/AddButton.tsx
index 23b990ffcb8..64a40b715b6 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountButton/AddButton.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountButton/AddButton.tsx
@@ -1,8 +1,10 @@
 import { ReactNode } from 'react';
+
 import { ButtonProps, Tooltip, NewModal } from '@trezor/components';
-import { Translation } from 'src/components/suite';
 import { Network } from '@suite-common/wallet-config';
 
+import { Translation } from 'src/components/suite';
+
 interface AddButtonProps extends Omit<ButtonProps, 'children'> {
     disabledMessage: ReactNode;
     networkName: Network['name'];
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountButton/AddCoinjoinAccountButton.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountButton/AddCoinjoinAccountButton.tsx
index cce8de98dd6..28d53bf7284 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountButton/AddCoinjoinAccountButton.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountButton/AddCoinjoinAccountButton.tsx
@@ -6,6 +6,7 @@ import { isDesktop } from '@trezor/env-utils';
 import { isDevEnv } from '@suite-common/suite-utils';
 import { RequestEnableTorResponse } from '@suite-common/suite-config';
 import { selectDevice } from '@suite-common/wallet-core';
+import { Network, NetworkAccount, NetworkSymbol } from '@suite-common/wallet-config';
 
 import { Translation } from 'src/components/suite';
 import { useSelector, useDispatch } from 'src/hooks/suite';
@@ -13,7 +14,6 @@ import { createCoinjoinAccount } from 'src/actions/wallet/coinjoinAccountActions
 import { toggleTor } from 'src/actions/suite/suiteActions';
 import { openDeferredModal, openModal } from 'src/actions/suite/modalActions';
 import { Account } from 'src/types/wallet';
-import { Network, NetworkAccount, NetworkSymbol } from '@suite-common/wallet-config';
 import { selectTorState } from 'src/reducers/suite/suiteReducer';
 
 import { AddButton } from './AddButton';
@@ -64,7 +64,7 @@ export const AddCoinjoinAccountButton = ({ network, selectedAccount }: AddCoinjo
 
     const coinjoinAccounts = accounts.filter(
         a =>
-            a.deviceState === device?.state &&
+            a.deviceState === device?.state?.staticSessionId &&
             a.symbol === network.symbol &&
             a.accountType === selectedAccount.accountType,
     );
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountModal.tsx
index b538f4550e7..84db86ee6d1 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AddAccountModal.tsx
@@ -1,17 +1,15 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
 
-import {
-    accountsActions,
-    selectDeviceSupportedNetworks,
-    selectDeviceModel,
-} from '@suite-common/wallet-core';
+import { accountsActions, selectDeviceModel } from '@suite-common/wallet-core';
 import { arrayPartition } from '@trezor/utils';
 import { hasBitcoinOnlyFirmware } from '@trezor/device-utils';
 import { networks, Network, NetworkSymbol, NetworkAccount } from '@suite-common/wallet-config';
 import { CollapsibleBox, NewModal, Tooltip } from '@trezor/components';
-import { FirmwareType } from '@trezor/connect';
 import { spacings, spacingsPx } from '@trezor/theme';
+import { DeviceModelInternal } from '@trezor/connect';
+
 import { Translation, CoinList } from 'src/components/suite';
 import { Account } from 'src/types/wallet';
 import { TrezorDevice } from 'src/types/suite';
@@ -19,12 +17,13 @@ import { useSelector, useDispatch } from 'src/hooks/suite';
 import { changeCoinVisibility } from 'src/actions/settings/walletSettingsActions';
 import { goto } from 'src/actions/suite/routerActions';
 import { selectIsPublic } from 'src/reducers/wallet/coinjoinReducer';
-import { useEnabledNetworks } from 'src/hooks/settings/useEnabledNetworks';
+import { useNetworkSupport } from 'src/hooks/settings/useNetworkSupport';
+import { selectIsDebugModeActive } from 'src/reducers/suite/suiteReducer';
+import { selectEnabledNetworks } from 'src/reducers/wallet/settingsReducer';
+
 import { AccountTypeSelect } from './AccountTypeSelect/AccountTypeSelect';
 import { SelectNetwork } from './SelectNetwork';
 import { AddAccountButton } from './AddAccountButton/AddAccountButton';
-import { DeviceModelInternal } from '@trezor/connect';
-import { selectIsDebugModeActive } from 'src/reducers/suite/suiteReducer';
 
 const NetworksWrapper = styled.div`
     display: flex;
@@ -50,25 +49,17 @@ export const AddAccountModal = ({
     isBackClickDisabled,
 }: AddAccountProps) => {
     const accounts = useSelector(state => state.wallet.accounts);
-    const supportedNetworkSymbols = useSelector(selectDeviceSupportedNetworks);
     const app = useSelector(state => state.router.app);
     const isDebug = useSelector(selectIsDebugModeActive);
     const isCoinjoinPublic = useSelector(selectIsPublic);
     const deviceModel = useSelector(selectDeviceModel);
+    const enabledNetworkSymbols = useSelector(selectEnabledNetworks);
     const dispatch = useDispatch();
 
-    const { mainnets, testnets, enabledNetworks: enabledNetworkSymbols } = useEnabledNetworks();
-
-    const getNetworks = (networksToFilterFrom: Network[], getUnsupported = false) =>
-        networksToFilterFrom.filter(
-            ({ symbol }) => getUnsupported !== supportedNetworkSymbols.includes(symbol),
-        );
+    const { supportedMainnets, unsupportedMainnets, supportedTestnets } = useNetworkSupport();
 
-    const supportedMainnets = getNetworks(mainnets);
-    const supportedTestnets = getNetworks(testnets);
-    const unsupportedNetworks = getNetworks(mainnets, true);
     const supportedNetworks = [...supportedMainnets, ...supportedTestnets];
-    const allTestnetNetworksDisabled = supportedTestnets.some(network =>
+    const allTestnetNetworksDisabled = !supportedTestnets.some(network =>
         enabledNetworkSymbols.includes(network.symbol),
     );
     const isBitcoinOnlyFirmware = hasBitcoinOnlyFirmware(device);
@@ -78,9 +69,7 @@ export const AddAccountModal = ({
     const preselectedNetwork = symbol && supportedNetworks.find(n => n.symbol === symbol);
     // or in case of only btc is enabled on bitcoin-only firmware
     const bitcoinOnlyDefaultNetworkSelection =
-        device.firmwareType === FirmwareType.BitcoinOnly &&
-        supportedMainnets.length === 1 &&
-        allTestnetNetworksDisabled
+        isBitcoinOnlyFirmware && supportedMainnets.length === 1 && allTestnetNetworksDisabled
             ? networks.btc
             : undefined;
 
@@ -104,7 +93,7 @@ export const AddAccountModal = ({
     const emptyAccounts = selectedNetwork
         ? accounts.filter(
               a =>
-                  a.deviceState === device.state &&
+                  a.deviceState === device.state?.staticSessionId &&
                   a.symbol === selectedNetwork.symbol &&
                   a.accountType === currentType &&
                   a.empty,
@@ -255,7 +244,7 @@ export const AddAccountModal = ({
                                   />
                               </CollapsibleBox>
                           )}
-                          {!!isBitcoinOnlyFirmware && deviceModel === DeviceModelInternal.T1B1 && (
+                          {!isBitcoinOnlyFirmware && deviceModel === DeviceModelInternal.T1B1 && (
                               <CollapsibleBox
                                   heading={
                                       <Tooltip
@@ -272,7 +261,7 @@ export const AddAccountModal = ({
                               >
                                   <CoinList
                                       onToggle={selectNetwork}
-                                      networks={unsupportedNetworks}
+                                      networks={unsupportedMainnets}
                                       enabledNetworks={selectedNetworks}
                                   />
                               </CollapsibleBox>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddTokenModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddTokenModal.tsx
index 7cf9fde30e9..38e2d5eda27 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddTokenModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddTokenModal.tsx
@@ -1,13 +1,14 @@
 import { useCallback, useEffect, useState, ChangeEvent } from 'react';
+
 import TrezorConnect, { TokenInfo } from '@trezor/connect';
 import { analytics, EventType } from '@trezor/suite-analytics';
-
 import { Input, Button } from '@trezor/components';
+import { tryGetAccountIdentity, isAddressValid } from '@suite-common/wallet-utils';
+
 import { addToken } from 'src/actions/wallet/tokenActions';
 import { Modal } from 'src/components/suite';
 import { Translation } from 'src/components/suite/Translation';
 import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
-import { tryGetAccountIdentity, isAddressValid } from '@suite-common/wallet-utils';
 import { Account } from 'src/types/wallet';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/AdvancedCoinSettingsModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/AdvancedCoinSettingsModal.tsx
index 619c5594a4e..e6d481a44b8 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/AdvancedCoinSettingsModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/AdvancedCoinSettingsModal.tsx
@@ -1,11 +1,14 @@
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
-import { Modal, Translation } from 'src/components/suite';
 import { networks, NetworkSymbol } from '@suite-common/wallet-config';
-import { CustomBackends } from './CustomBackends/CustomBackends';
+import { CoinLogo } from '@trezor/product-components';
+
+import { Modal, Translation } from 'src/components/suite';
 import { getCoinLabel } from 'src/utils/suite/getCoinLabel';
 import { useSelector } from 'src/hooks/suite';
-import { CoinLogo } from '@trezor/product-components';
+
+import { CustomBackends } from './CustomBackends/CustomBackends';
 
 const Section = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/BackendInput.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/BackendInput.tsx
index 6c4a25052c5..2322144cd89 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/BackendInput.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/BackendInput.tsx
@@ -1,4 +1,5 @@
 import { Input, Spinner, Tooltip } from '@trezor/components';
+
 import { Translation, StatusLight } from 'src/components/suite';
 
 const ActiveStatus = (
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/BackendTypeSelect.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/BackendTypeSelect.tsx
index 8e21f3e9098..d03c0fa3fb2 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/BackendTypeSelect.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/BackendTypeSelect.tsx
@@ -1,11 +1,12 @@
 import { useMemo } from 'react';
+
 import styled from 'styled-components';
 
 import { Select } from '@trezor/components';
-import { Translation } from 'src/components/suite';
 import { isDesktop } from '@trezor/env-utils';
-
 import { Network } from '@suite-common/wallet-config';
+
+import { Translation } from 'src/components/suite';
 import type { BackendOption } from 'src/hooks/settings/backends';
 
 const Capitalize = styled.span`
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/ConnectionInfo.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/ConnectionInfo.tsx
index e49f8324784..3543b4ebdad 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/ConnectionInfo.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/ConnectionInfo.tsx
@@ -1,8 +1,10 @@
 import styled from 'styled-components';
+
 import { Paragraph } from '@trezor/components';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+
 import { useSelector } from 'src/hooks/suite';
 import { Translation } from 'src/components/suite/Translation';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const Wrapper = styled(Paragraph)`
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/CustomBackends.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/CustomBackends.tsx
index be770a2075e..192fb4be57d 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/CustomBackends.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/CustomBackends.tsx
@@ -1,18 +1,21 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
 
 import { Input, Button, H3, CollapsibleBox } from '@trezor/components';
+import { Network } from '@suite-common/wallet-config';
+import { spacings } from '@trezor/theme';
+
 import { Translation, TooltipSymbol } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { toggleTor } from 'src/actions/suite/suiteActions';
 import { useDefaultUrls, useBackendsForm } from 'src/hooks/settings/backends';
+import { selectTorState } from 'src/reducers/suite/suiteReducer';
+
 import ConnectionInfo from './ConnectionInfo';
 import { BackendInput } from './BackendInput';
 import { BackendTypeSelect } from './BackendTypeSelect';
 import { TorModal, TorResult } from './TorModal';
-import { Network } from '@suite-common/wallet-config';
-import { selectTorState } from 'src/reducers/suite/suiteReducer';
-import { spacings } from '@trezor/theme';
 
 const Wrapper = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/TorModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/TorModal.tsx
index 61a47dfa928..416052bb980 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/TorModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AdvancedCoinSettingsModal/CustomBackends/TorModal.tsx
@@ -1,7 +1,9 @@
 import styled from 'styled-components';
+
 import { Button, Paragraph } from '@trezor/components';
-import { Modal, Translation } from 'src/components/suite';
 import { isDesktop } from '@trezor/env-utils';
+
+import { Modal, Translation } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite/useSelector';
 import { getIsTorLoading } from 'src/utils/suite/tor';
 
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ApplicationLogModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ApplicationLogModal.tsx
index aa777df045a..20b63bba831 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ApplicationLogModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ApplicationLogModal.tsx
@@ -1,4 +1,5 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
 
 import { selectLogs } from '@suite-common/logger';
@@ -14,11 +15,11 @@ import {
     variables,
     useScrollShadow,
 } from '@trezor/components';
+import { spacings, spacingsPx } from '@trezor/theme';
 
 import { Translation } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite';
 import { getApplicationInfo, getApplicationLog, prettifyLog } from 'src/utils/suite/logsUtils';
-import { spacings, spacingsPx } from '@trezor/theme';
 
 const ScrollContainer = styled.div`
     overflow: auto;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AuthenticateDeviceFailModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AuthenticateDeviceFailModal.tsx
index 99cc74c7142..9788bc9483a 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AuthenticateDeviceFailModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AuthenticateDeviceFailModal.tsx
@@ -1,7 +1,9 @@
 import styled from 'styled-components';
 
+import { TREZOR_SUPPORT_DEVICE_AUTHENTICATION_FAILED_URL } from '@trezor/urls';
+
 import { Modal } from 'src/components/suite';
-import { SecurityCheckFail } from '../../../SecurityCheck/SecurityCheckFail';
+import { SecurityCheckFail } from 'src/components/suite/SecurityCheck/SecurityCheckFail';
 
 const StyledModal = styled(Modal)`
     text-align: left;
@@ -9,6 +11,6 @@ const StyledModal = styled(Modal)`
 
 export const AuthenticateDeviceFailModal = () => (
     <StyledModal>
-        <SecurityCheckFail />
+        <SecurityCheckFail supportUrl={TREZOR_SUPPORT_DEVICE_AUTHENTICATION_FAILED_URL} />
     </StyledModal>
 );
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AuthenticateDeviceModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AuthenticateDeviceModal.tsx
index 5028f5b2d8c..0dc5ece3a7b 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AuthenticateDeviceModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AuthenticateDeviceModal.tsx
@@ -1,13 +1,21 @@
 import { useState } from 'react';
 
 import { checkDeviceAuthenticityThunk } from '@suite-common/device-authenticity';
-import { Button } from '@trezor/components';
+import { NewModal, List, IconName, Paragraph, Icon } from '@trezor/components';
+import { selectSelectedDeviceAuthenticity } from '@suite-common/wallet-core';
+import { TranslationKey } from '@suite-common/intl-types';
+import { spacings } from '@trezor/theme';
 
 import { onCancel, openModal } from 'src/actions/suite/modalActions';
-import { DeviceAuthenticationExplainer, Modal, Translation } from 'src/components/suite';
+import { Translation } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { selectIsDebugModeActive } from 'src/reducers/suite/suiteReducer';
-import { selectSelectedDeviceAuthenticity } from '@suite-common/wallet-core';
+
+const items: Array<{ icon: IconName; text: TranslationKey }> = [
+    { icon: 'shieldCheck', text: 'TR_DEVICE_AUTHENTICITY_ITEM_1' },
+    { icon: 'chip', text: 'TR_DEVICE_AUTHENTICITY_ITEM_2' },
+    { icon: 'checklist', text: 'TR_DEVICE_AUTHENTICITY_ITEM_3' },
+];
 
 export const AuthenticateDeviceModal = () => {
     const [isLoading, setIsLoading] = useState(false);
@@ -30,17 +38,40 @@ export const AuthenticateDeviceModal = () => {
     const handleClose = () => dispatch(onCancel());
 
     return (
-        <Modal
-            isCancelable
+        <NewModal
             onCancel={handleClose}
             heading={<Translation id="TR_LETS_CHECK_YOUR_DEVICE" />}
-            bottomBarComponents={
-                <Button onClick={handleClick} isDisabled={isLoading} isLoading={isLoading}>
-                    <Translation id="TR_START_CHECK" />
-                </Button>
+            bottomContent={
+                <>
+                    <NewModal.Button
+                        onClick={handleClick}
+                        isDisabled={isLoading}
+                        isLoading={isLoading}
+                    >
+                        <Translation id="TR_START_CHECK" />
+                    </NewModal.Button>
+                    <NewModal.Button variant="tertiary" onClick={handleClose}>
+                        <Translation id="TR_CANCEL" />
+                    </NewModal.Button>
+                </>
             }
         >
-            <DeviceAuthenticationExplainer />
-        </Modal>
+            <List
+                gap={spacings.xl}
+                bulletGap={spacings.xl}
+                margin={{ top: spacings.xs, bottom: spacings.sm }}
+            >
+                {items.map(({ icon, text }) => (
+                    <List.Item
+                        key={icon}
+                        bulletComponent={<Icon name={icon} size="extraLarge" variant="primary" />}
+                    >
+                        <Paragraph variant="tertiary">
+                            <Translation id={text} />
+                        </Paragraph>
+                    </List.Item>
+                ))}
+            </List>
+        </NewModal>
     );
 };
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CancelCoinjoinModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CancelCoinjoinModal.tsx
index ea9e8d7de46..0add1860480 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CancelCoinjoinModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CancelCoinjoinModal.tsx
@@ -1,5 +1,7 @@
 import styled from 'styled-components';
+
 import { Button } from '@trezor/components';
+
 import { useSelector } from 'src/hooks/suite/useSelector';
 import { Modal, Translation } from 'src/components/suite';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimEthForm.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimEthForm.tsx
index 7444cdd335d..af99701b6b7 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimEthForm.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimEthForm.tsx
@@ -1,16 +1,20 @@
 import { useEffect } from 'react';
+
 import styled from 'styled-components';
+
 import { Button, Paragraph, Tooltip, Banner } from '@trezor/components';
+import { spacingsPx } from '@trezor/theme';
+import { getAccountEverstakeStakingPool } from '@suite-common/wallet-utils';
+
 import { Translation, FiatValue, FormattedCryptoAmount } from 'src/components/suite';
 import { useDevice, useSelector } from 'src/hooks/suite';
 import { useClaimEthFormContext } from 'src/hooks/wallet/useClaimEthForm';
 import { CRYPTO_INPUT } from 'src/types/wallet/stakeForms';
-import { spacingsPx } from '@trezor/theme';
-import ClaimFees from './Fees';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
-import { getAccountEverstakeStakingPool } from '@suite-common/wallet-utils';
 import { useMessageSystemStaking } from 'src/hooks/suite/useMessageSystemStaking';
 
+import ClaimFees from './Fees';
+
 const AmountInfo = styled.div`
     display: flex;
     justify-content: space-between;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimModal.tsx
index 035b069e14d..ce45d30c33a 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimModal.tsx
@@ -1,6 +1,8 @@
 import styled from 'styled-components';
+
 import { useSelector } from 'src/hooks/suite';
 import { Modal, Translation } from 'src/components/suite';
+
 import { ClaimModalContent } from './ClaimModalContent';
 
 const StyledModal = styled(Modal)`
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimModalContent.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimModalContent.tsx
index 4505fdfbca5..14b23016c5d 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimModalContent.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/ClaimModalContent.tsx
@@ -1,5 +1,7 @@
 import { SelectedAccountLoaded } from '@suite-common/wallet-types';
+
 import { ClaimEthFormContext, useClaimEthForm } from 'src/hooks/wallet/useClaimEthForm';
+
 import { ClaimEthForm } from './ClaimEthForm';
 
 interface ClaimModalContentProps {
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/Fees.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/Fees.tsx
index b6406676b65..760f7319b75 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/Fees.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ClaimModal/Fees.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { Fees } from 'src/components/wallet/Fees/Fees';
 import { useClaimEthFormContext } from 'src/hooks/wallet/useClaimEthForm';
 import { Translation } from 'src/components/suite';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CoinjoinSuccessModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CoinjoinSuccessModal.tsx
index 837af051e7a..e3c3f5409d9 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CoinjoinSuccessModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CoinjoinSuccessModal.tsx
@@ -1,10 +1,11 @@
 import styled from 'styled-components';
-import { useDispatch } from 'src/hooks/suite';
 import { transparentize } from 'polished';
 
 import { Button, Icon, variables } from '@trezor/components';
 import { selectAccountByKey } from '@suite-common/wallet-core';
 import { WalletParams } from '@suite-common/wallet-types';
+
+import { useDispatch } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
 import { useSelector } from 'src/hooks/suite/useSelector';
 import { selectRouterParams } from 'src/reducers/suite/routerReducer';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CoinmarketTermsModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CoinmarketTermsModal.tsx
index 4c0dbf8d86e..059589648f7 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CoinmarketTermsModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CoinmarketTermsModal.tsx
@@ -1,33 +1,14 @@
-import { Button, Column, Text, Icon, Row, Paragraph } from '@trezor/components';
-import { Modal, Translation } from 'src/components/suite';
-import styled from 'styled-components';
-import type { Deferred } from '@trezor/utils';
 import { CryptoId } from 'invity-api';
-import { useDevice } from 'src/hooks/suite';
-import { spacings, spacingsPx } from '@trezor/theme';
-import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
-
-const ContentWrapper = styled.div`
-    text-align: left;
-`;
 
-const IconWrapper = styled.div<{ $backgroundColor: string }>`
-    border-radius: 50%;
-    padding: ${spacingsPx.lg};
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-right: ${spacingsPx.xl};
-    background-color: ${({ $backgroundColor }) => $backgroundColor};
-`;
+import { Column, IconCircle, Paragraph, NewModal, List, H4 } from '@trezor/components';
+import type { Deferred } from '@trezor/utils';
+import { spacings } from '@trezor/theme';
 
-const FooterContent = styled.div`
-    display: flex;
-    flex: 1;
-    place-content: center space-between;
-`;
+import { Translation } from 'src/components/suite';
+import { useDevice } from 'src/hooks/suite';
+import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
 
-export type CoinmarketTermsModalProps = {
+type CoinmarketTermsModalProps = {
     decision: Deferred<boolean>;
     onCancel: () => void;
     type: 'BUY' | 'SELL' | 'COINMARKET_SWAP' | 'COINMARKET_SWAP_DEX';
@@ -36,6 +17,7 @@ export type CoinmarketTermsModalProps = {
     toCryptoCurrency?: CryptoId;
     fromCryptoCurrency?: CryptoId;
 };
+
 export const CoinmarketTermsModal = ({
     decision,
     onCancel,
@@ -49,19 +31,14 @@ export const CoinmarketTermsModal = ({
     const lowercaseType = type.toLowerCase();
     const { device } = useDevice();
     const { cryptoIdToCoinSymbol } = useCoinmarketInfo();
+    const iconProps = { variant: 'primary' as const, size: 'large' as const, hasBorder: false };
 
     if (!device?.features) {
         return null;
     }
 
-    type PProps = { children: React.ReactNode };
-    const P = ({ children }: PProps) => (
-        <Paragraph margin={{ top: spacings.sm }}>{children}</Paragraph>
-    );
-
     return (
-        <Modal
-            isCancelable
+        <NewModal
             onCancel={onCancel}
             heading={
                 <Translation
@@ -80,82 +57,76 @@ export const CoinmarketTermsModal = ({
                     }}
                 />
             }
-            bottomBarComponents={
-                <FooterContent>
-                    <Button
-                        data-testid={`@coinmarket/${lowercaseType}/offers/buy-terms-confirm-button`}
-                        onClick={() => {
-                            decision.resolve(true);
-                            onCancel();
-                        }}
-                    >
-                        <Translation id={`TR_${type}_MODAL_CONFIRM`} />
-                    </Button>
-                </FooterContent>
+            bottomContent={
+                <NewModal.Button
+                    data-testid={`@coinmarket/${lowercaseType}/offers/buy-terms-confirm-button`}
+                    onClick={() => {
+                        decision.resolve(true);
+                        onCancel();
+                    }}
+                >
+                    <Translation id={`TR_${type}_MODAL_CONFIRM`} />
+                </NewModal.Button>
             }
         >
-            <Column gap={spacings.lg}>
-                <Row alignItems="center">
-                    <IconWrapper $backgroundColor="#e5f3ee">
-                        <Icon
-                            size={24}
+            <List
+                gap={spacings.xxl}
+                bulletGap={spacings.xl}
+                margin={{ top: spacings.xs, bottom: spacings.xs, left: spacings.xs }}
+            >
+                <List.Item
+                    bulletComponent={
+                        <IconCircle
                             name={`trezor${device.features.internal_model}`}
-                            color="#00854d"
+                            {...iconProps}
                         />
-                    </IconWrapper>
-
-                    <ContentWrapper>
-                        <Text typographyStyle="highlight" margin={{ top: spacings.sm }}>
+                    }
+                >
+                    <Column gap={spacings.xxs} alignItems="flex-start">
+                        <H4>
                             <Translation id={`TR_${type}_MODAL_SECURITY_HEADER`} />
-                        </Text>
-                        <P>
+                        </H4>
+                        <Paragraph>
                             <Translation
                                 id={`TR_${type}_MODAL_TERMS_1`}
                                 values={{ provider: providerName }}
                             />
-                        </P>
-                        <P>
+                        </Paragraph>
+                        <Paragraph>
                             <Translation id={`TR_${type}_MODAL_TERMS_2`} />
-                        </P>
-                        <P>
+                        </Paragraph>
+                        <Paragraph>
                             <Translation id={`TR_${type}_MODAL_TERMS_3`} />
-                        </P>
-                    </ContentWrapper>
-                </Row>
-                <Row alignItems="center">
-                    <IconWrapper $backgroundColor="#e8f3fa">
-                        <Icon size={24} name="checkActive" color="#1d88c5" />
-                    </IconWrapper>
-
-                    <ContentWrapper>
-                        <Text typographyStyle="highlight" margin={{ top: spacings.sm }}>
+                        </Paragraph>
+                    </Column>
+                </List.Item>
+                <List.Item bulletComponent={<IconCircle name="check" {...iconProps} />}>
+                    <Column gap={spacings.xxs} alignItems="flex-start">
+                        <H4>
                             <Translation id={`TR_${type}_MODAL_VERIFIED_PARTNERS_HEADER`} />
-                        </Text>
-                        <P>
+                        </H4>
+                        <Paragraph>
                             <Translation
                                 id={`TR_${type}_MODAL_TERMS_4`}
                                 values={{ provider: providerName }}
                             />
-                        </P>
-                    </ContentWrapper>
-                </Row>
-                <Row alignItems="center">
-                    <IconWrapper $backgroundColor="#f9f4e6">
-                        <Icon size={24} name="pencil" color="#c19009" />
-                    </IconWrapper>
-                    <ContentWrapper>
-                        <Text typographyStyle="highlight">
+                        </Paragraph>
+                    </Column>
+                </List.Item>
+                <List.Item bulletComponent={<IconCircle name="pencil" {...iconProps} />}>
+                    <Column gap={spacings.xxs} alignItems="flex-start">
+                        <H4>
                             <Translation id={`TR_${type}_MODAL_LEGAL_HEADER`} />
-                        </Text>
-                        <P>
+                        </H4>
+                        <Paragraph>
                             <Translation id={`TR_${type}_MODAL_TERMS_5`} />
-                        </P>
-                        <P>
+                        </Paragraph>
+                        <Paragraph>
                             <Translation id={`TR_${type}_MODAL_TERMS_6`} />
-                        </P>
-                    </ContentWrapper>
-                </Row>
-            </Column>
-        </Modal>
+                        </Paragraph>
+                    </Column>
+                </List.Item>
+            </List>
+        </NewModal>
     );
 };
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedAddressModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedAddressModal.tsx
index ae6a4a04483..0251ea62dff 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedAddressModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedAddressModal.tsx
@@ -1,6 +1,7 @@
 import { useCallback } from 'react';
 
 import { openAddressModal, showAddress } from 'src/actions/wallet/receiveActions';
+
 import { ConfirmUnverifiedModal } from './ConfirmUnverifiedModal';
 
 interface ConfirmUnverifiedAddressModalProps {
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedModal.tsx
index 68329556a60..d0cda63bad4 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedModal.tsx
@@ -1,12 +1,14 @@
+import { useEffect } from 'react';
+
+import { Button, H3, NewModal, Paragraph } from '@trezor/components';
+import { selectDeviceLabelOrName } from '@suite-common/wallet-core';
+
 import { Translation } from 'src/components/suite';
 import { TranslationKey } from 'src/components/suite/Translation';
 import { useDevice, useDispatch, useSelector } from 'src/hooks/suite';
 import { Dispatch, GetState } from 'src/types/suite';
-import { Button, H3, NewModal, Paragraph } from '@trezor/components';
 import { onCancel } from 'src/actions/suite/modalActions';
-import { selectDeviceLabelOrName } from '@suite-common/wallet-core';
 import { applySettings } from 'src/actions/settings/deviceSettingsActions';
-import { useEffect } from 'react';
 
 interface ConfirmUnverifiedModalProps {
     action: {
@@ -64,7 +66,7 @@ export const ConfirmUnverifiedModal = ({
         <NewModal
             variant="warning"
             size="small"
-            icon="shieldWarning"
+            iconName="shieldWarning"
             onCancel={handleClose}
             bottomContent={
                 <>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedProceedModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedProceedModal.tsx
index 07f6d76fb9c..87bd02a247c 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedProceedModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedProceedModal.tsx
@@ -1,7 +1,8 @@
-import { ConfirmUnverifiedModal } from './ConfirmUnverifiedModal';
 import { COINMARKET_BUY } from 'src/actions/wallet/constants';
 import { Dispatch } from 'src/types/suite';
 
+import { ConfirmUnverifiedModal } from './ConfirmUnverifiedModal';
+
 interface ConfirmUnverifiedProceedModalProps {
     value: string;
 }
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedXpubModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedXpubModal.tsx
index 2ac4149b6b5..900f9aa0a57 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedXpubModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ConfirmUnverifiedXpubModal.tsx
@@ -1,8 +1,9 @@
 import { useCallback } from 'react';
 
-import { ConfirmUnverifiedModal } from './ConfirmUnverifiedModal';
 import { openXpubModal, showXpub } from 'src/actions/wallet/publicKeyActions';
 
+import { ConfirmUnverifiedModal } from './ConfirmUnverifiedModal';
+
 export const ConfirmUnverifiedXpubModal = () => {
     const event = useCallback(() => openXpubModal(), []);
     const verifyProcess = useCallback(() => showXpub(), []);
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CriticalCoinjoinPhaseModal/AutoStopButton.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CriticalCoinjoinPhaseModal/AutoStopButton.tsx
index 2ebd19e43da..057a998e77f 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CriticalCoinjoinPhaseModal/AutoStopButton.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CriticalCoinjoinPhaseModal/AutoStopButton.tsx
@@ -1,13 +1,16 @@
 import { useState } from 'react';
+
 import styled, { css, useTheme } from 'styled-components';
+
 import { Icon, IconName } from '@trezor/components';
 import { TranslationKey } from '@suite-common/intl-types';
+import { borders, typography } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite/useSelector';
 import { selectIsSessionAutostopped } from 'src/reducers/wallet/coinjoinReducer';
 import { useDispatch } from 'src/hooks/suite/useDispatch';
 import { toggleAutostopCoinjoin } from 'src/actions/wallet/coinjoinAccountActions';
-import { borders, typography } from '@trezor/theme';
 
 const TRANSITION_CONFIG = '0.1s ease';
 
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CriticalCoinjoinPhaseModal/CoinjoinPhaseProgress.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CriticalCoinjoinPhaseModal/CoinjoinPhaseProgress.tsx
index 3643217e56e..4ff1b5509d1 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CriticalCoinjoinPhaseModal/CoinjoinPhaseProgress.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CriticalCoinjoinPhaseModal/CoinjoinPhaseProgress.tsx
@@ -1,11 +1,13 @@
 import styled, { useTheme } from 'styled-components';
-import { CoinjoinSession, SessionPhase } from 'src/types/wallet/coinjoin';
+
 import { Spinner, Icon } from '@trezor/components';
+import { RoundPhase } from '@trezor/coinjoin';
+import { spacingsPx, typography } from '@trezor/theme';
+
+import { CoinjoinSession, SessionPhase } from 'src/types/wallet/coinjoin';
 import { SESSION_PHASE_MESSAGES } from 'src/constants/suite/coinjoin';
 import { Translation } from 'src/components/suite/Translation';
 import { CountdownTimer } from 'src/components/suite/CountdownTimer';
-import { RoundPhase } from '@trezor/coinjoin';
-import { spacingsPx, typography } from '@trezor/theme';
 
 const Container = styled.div`
     padding: ${spacingsPx.xxl} ${spacingsPx.xxxl} 0;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CriticalCoinjoinPhaseModal/CriticalCoinjoinPhaseModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CriticalCoinjoinPhaseModal/CriticalCoinjoinPhaseModal.tsx
index 10e7030c2d4..6781a3896c4 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CriticalCoinjoinPhaseModal/CriticalCoinjoinPhaseModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/CriticalCoinjoinPhaseModal/CriticalCoinjoinPhaseModal.tsx
@@ -1,13 +1,16 @@
 import styled from 'styled-components';
+
 import { variables, Image } from '@trezor/components';
+import { spacingsPx, typography } from '@trezor/theme';
+
 import { Modal, Translation } from 'src/components/suite';
 import { useSelector, useDevice } from 'src/hooks/suite';
 import { selectCoinjoinAccountByKey } from 'src/reducers/wallet/coinjoinReducer';
-import { CoinjoinPhaseProgress } from './CoinjoinPhaseProgress';
 import { ROUND_PHASE_MESSAGES } from 'src/constants/suite/coinjoin';
 import { useCoinjoinSessionPhase } from 'src/hooks/coinjoin';
+
+import { CoinjoinPhaseProgress } from './CoinjoinPhaseProgress';
 import { AutoStopButton } from './AutoStopButton';
-import { spacingsPx, typography } from '@trezor/theme';
 
 const StyledModal = styled(Modal)`
     width: 520px;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DeviceAuthenticityOptOutModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DeviceAuthenticityOptOutModal.tsx
index 416690d4e96..f2fd15d65d2 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DeviceAuthenticityOptOutModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DeviceAuthenticityOptOutModal.tsx
@@ -1,10 +1,11 @@
 import { useState } from 'react';
 
 import { Column, NewModal, Card, Banner, H3, Paragraph } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { Translation, CheckItem } from 'src/components/suite';
 import { deviceAuthenticityOptOut } from 'src/actions/suite/suiteActions';
 import { useDispatch } from 'src/hooks/suite';
-import { spacings } from '@trezor/theme';
 
 type DeviceAuthenticityOptOutModalProps = {
     onCancel: () => void;
@@ -22,7 +23,7 @@ export const DeviceAuthenticityOptOutModal = ({ onCancel }: DeviceAuthenticityOp
     return (
         <NewModal
             onCancel={onCancel}
-            icon="shieldWarning"
+            iconName="shieldWarning"
             size="small"
             bottomContent={
                 <>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DisableTorModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DisableTorModal.tsx
index 264bcfdee71..86e5ac1a37b 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DisableTorModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/DisableTorModal.tsx
@@ -1,17 +1,19 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
 
 import { Button, H3, Paragraph, variables } from '@trezor/components';
 import { getTitleForNetwork } from '@suite-common/wallet-utils';
 import { UserContextPayload } from '@suite-common/suite-types';
 import { blockchainActions } from '@suite-common/wallet-core';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+import { CoinLogo } from '@trezor/product-components';
+
 import { Modal, Translation } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite';
 import { isOnionUrl } from 'src/utils/suite/tor';
 import { useCustomBackends } from 'src/hooks/settings/backends';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 import { AdvancedCoinSettingsModal } from 'src/components/suite/modals';
-import { CoinLogo } from '@trezor/product-components';
 
 const BackendRowWrapper = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/FirmwareRevisionOptOutModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/FirmwareRevisionOptOutModal.tsx
index 12a7d52d806..aaac59499de 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/FirmwareRevisionOptOutModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/FirmwareRevisionOptOutModal.tsx
@@ -1,10 +1,11 @@
 import { useState } from 'react';
 
 import { Column, NewModal, Banner, Card, H3, Paragraph } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { Translation, CheckItem } from 'src/components/suite';
-import { checkFirmwareRevision } from 'src/actions/suite/suiteActions';
+import { toggleCheckFirmwareAuthenticity } from 'src/actions/suite/suiteActions';
 import { useDispatch } from 'src/hooks/suite';
-import { spacings } from '@trezor/theme';
 
 type DeviceAuthenticityOptOutModalProps = {
     onCancel: () => void;
@@ -15,14 +16,14 @@ export const FirmwareRevisionOptOutModal = ({ onCancel }: DeviceAuthenticityOptO
     const dispatch = useDispatch();
 
     const handleTurningOffRevisionCheck = () => {
-        dispatch(checkFirmwareRevision({ isDisabled: true }));
+        dispatch(toggleCheckFirmwareAuthenticity({ isDisabled: true }));
         onCancel();
     };
 
     return (
         <NewModal
             onCancel={onCancel}
-            icon="shieldWarning"
+            iconName="shieldWarning"
             size="small"
             bottomContent={
                 <>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/DelimiterForm.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/DelimiterForm.tsx
index 73f40710b43..74361ba357b 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/DelimiterForm.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/DelimiterForm.tsx
@@ -1,6 +1,9 @@
 import { useState, useRef, useEffect } from 'react';
+
 import styled from 'styled-components';
+
 import { Switch, Input, variables } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/ExampleCSV.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/ExampleCSV.tsx
index 9c7be63c7be..de8f11fdd34 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/ExampleCSV.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/ExampleCSV.tsx
@@ -1,11 +1,14 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
 import { motion, AnimatePresence } from 'framer-motion';
+
 import { Paragraph, Icon, motionAnimation } from '@trezor/components';
+import { borders, spacingsPx, typography } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import { useSelector, useTranslation } from 'src/hooks/suite';
 import { selectIsLabelingAvailable } from 'src/reducers/suite/metadataReducer';
-import { borders, spacingsPx, typography } from '@trezor/theme';
 
 const Wrapper = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/ImportTransactionModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/ImportTransactionModal.tsx
index a9a385fac52..a616945e2ba 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/ImportTransactionModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/ImportTransactionModal.tsx
@@ -1,11 +1,14 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
 
 import { UserContextPayload } from '@suite-common/suite-types';
 import { parseCSV } from '@suite-common/wallet-utils';
+
 import { Translation, Modal } from 'src/components/suite';
 import type { ExtendedMessageDescriptor } from 'src/types/suite';
 import { DropZone } from 'src/components/suite/DropZone';
+
 import { DelimiterForm } from './DelimiterForm';
 import { ExampleCSV } from './ExampleCSV';
 import { TabSelection, TabId } from './TabSelection';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/InputCSV.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/InputCSV.tsx
index 47d55a34a81..4f657d3308e 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/InputCSV.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/InputCSV.tsx
@@ -1,5 +1,7 @@
 import { useRef } from 'react';
+
 import styled from 'styled-components';
+
 import { Textarea, Button } from '@trezor/components';
 
 import { Translation } from 'src/components/suite';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/TabSelection.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/TabSelection.tsx
index f01e9a69fe3..7d1099cdbf7 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/TabSelection.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/ImportTransactionModal/TabSelection.tsx
@@ -1,8 +1,11 @@
 import { Dispatch, SetStateAction } from 'react';
+
 import styled from 'styled-components';
-import { Translation } from 'src/components/suite';
+
 import { variables } from '@trezor/components';
 
+import { Translation } from 'src/components/suite';
+
 const TabSelector = styled.div`
     width: 100%;
     text-align: left;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MetadataProviderModal/MetadataProviderModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MetadataProviderModal/MetadataProviderModal.tsx
index ca502290700..08d9a4a18ba 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MetadataProviderModal/MetadataProviderModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MetadataProviderModal/MetadataProviderModal.tsx
@@ -1,13 +1,15 @@
 import { useState } from 'react';
+
 import { Button, NewModal, Row, Paragraph } from '@trezor/components';
+import type { Deferred } from '@trezor/utils';
+import { isFeatureFlagEnabled } from '@suite-common/suite-utils';
+import { spacings } from '@trezor/theme';
 
 import { Translation } from 'src/components/suite/index';
 import { useDispatch } from 'src/hooks/suite';
 import { connectProvider } from 'src/actions/suite/metadataProviderActions';
-import type { Deferred } from '@trezor/utils';
 import { MetadataProviderType } from 'src/types/suite/metadata';
-import { isFeatureFlagEnabled } from '@suite-common/suite-utils';
-import { spacings } from '@trezor/theme';
+
 import { DropboxLogo } from './DropboxLogo';
 import { GoogleDriveLogo } from './GoogleDriveLogo';
 
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MoreRoundsNeededModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MoreRoundsNeededModal.tsx
index 9f3fa23802c..68e27f135ca 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MoreRoundsNeededModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MoreRoundsNeededModal.tsx
@@ -1,6 +1,8 @@
 import styled, { useTheme } from 'styled-components';
-import { useDispatch } from 'src/hooks/suite';
+
 import { Button, Icon, variables } from '@trezor/components';
+
+import { useDispatch } from 'src/hooks/suite';
 import { onCancel as closeModal } from 'src/actions/suite/modalActions';
 import { Modal, Translation } from 'src/components/suite';
 
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/BackupInstructionsCard.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/BackupInstructionsCard.tsx
index 7f14a9b9f99..00ee7c35312 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/BackupInstructionsCard.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/BackupInstructionsCard.tsx
@@ -1,4 +1,5 @@
 import { ReactNode } from 'react';
+
 import styled, { css } from 'styled-components';
 
 import { Card, Icon, IconName } from '@trezor/components';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/BackupInstructionsStep.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/BackupInstructionsStep.tsx
index 822486030d0..1d0d9baaef2 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/BackupInstructionsStep.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/BackupInstructionsStep.tsx
@@ -1,4 +1,5 @@
 import { ReactNode } from 'react';
+
 import styled, { css } from 'styled-components';
 
 import { TranslationKey } from '@suite-common/intl-types';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/MultiShareBackupModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/MultiShareBackupModal.tsx
index e8d1f4f6af6..d912143274f 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/MultiShareBackupModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/MultiShareBackupModal.tsx
@@ -1,24 +1,25 @@
 import { useState } from 'react';
-import { selectDevice } from '@suite-common/wallet-core';
 
+import { selectDevice } from '@suite-common/wallet-core';
 import { Button, ModalProps } from '@trezor/components';
 import {
     HELP_CENTER_KEEPING_SEED_SAFE_URL,
     TREZOR_SUPPORT_RECOVERY_ISSUES_URL,
     HELP_CENTER_UPGRADING_TO_MULTI_SHARE_URL,
 } from '@trezor/urls';
+import TrezorConnect, { PROTO } from '@trezor/connect';
+import { EventType, analytics } from '@trezor/suite-analytics';
 
 import { useSelector } from 'src/hooks/suite';
 import { Modal, Translation } from 'src/components/suite';
 import { LearnMoreButton } from 'src/components/suite/LearnMoreButton';
+
 import { MultiShareBackupStep1FirstInfo } from './MultiShareBackupStep1FirstInfo';
 import { MultiShareBackupStep2SecondInfo } from './MultiShareBackupStep2SecondInfo';
-import TrezorConnect, { PROTO } from '@trezor/connect';
 import { MultiShareBackupStep5Done } from './MultiShareBackupStep5Done';
 import { isAdditionalShamirBackupInProgress } from '../../../../../../utils/device/isRecoveryInProgress';
 import { MultiShareBackupStep3VerifyOwnership } from './MultiShareBackupStep3VerifyOwnership';
 import { MultiShareBackupStep4BackupSeed } from './MultiShareBackupStep4BackupSeed';
-import { EventType, analytics } from '@trezor/suite-analytics';
 
 type Steps = 'first-info' | 'second-info' | 'verify-ownership' | 'backup-seed' | 'done';
 
@@ -70,7 +71,7 @@ export const MultiShareBackupModal = ({ onCancel }: MultiShareBackupModalProps)
 
     const getStepConfig = (): StepConfig => {
         switch (step) {
-            case 'first-info':
+            case 'first-info': {
                 const goToStepNextStep = () => {
                     setIsSubmitted(true);
                     if (isChecked1 && isChecked2) {
@@ -91,7 +92,10 @@ export const MultiShareBackupModal = ({ onCancel }: MultiShareBackupModalProps)
                     ),
                     bottomBarComponents: (
                         <>
-                            <Button onClick={goToStepNextStep}>
+                            <Button
+                                onClick={goToStepNextStep}
+                                data-testid="@multi-share-backup/1st-info/submit-button"
+                            >
                                 <Translation id="TR_CREATE_MULTI_SHARE_BACKUP" />
                             </Button>
                             <LearnMoreButton
@@ -104,8 +108,9 @@ export const MultiShareBackupModal = ({ onCancel }: MultiShareBackupModalProps)
                     isCancelable: true,
                     hasBackdropCancel: true,
                 };
+            }
 
-            case 'second-info':
+            case 'second-info': {
                 const enterBackup = async () => {
                     setStep('verify-ownership');
 
@@ -142,7 +147,10 @@ export const MultiShareBackupModal = ({ onCancel }: MultiShareBackupModalProps)
                     children: <MultiShareBackupStep2SecondInfo />,
                     bottomBarComponents: (
                         <>
-                            <Button onClick={enterBackup}>
+                            <Button
+                                onClick={enterBackup}
+                                data-testid="@multi-share-backup/2nd-info/submit-button"
+                            >
                                 <Translation id="TR_ENTER_EXISTING_BACKUP" />
                             </Button>
                             <LearnMoreButton url={TREZOR_SUPPORT_RECOVERY_ISSUES_URL} size="medium">
@@ -154,6 +162,7 @@ export const MultiShareBackupModal = ({ onCancel }: MultiShareBackupModalProps)
                     isCancelable: true,
                     hasBackdropCancel: true,
                 };
+            }
 
             case 'verify-ownership':
                 return {
@@ -179,7 +188,10 @@ export const MultiShareBackupModal = ({ onCancel }: MultiShareBackupModalProps)
                     children: <MultiShareBackupStep5Done />,
                     bottomBarComponents: (
                         <>
-                            <Button onClick={handleCancel}>
+                            <Button
+                                onClick={handleCancel}
+                                data-testid="@multi-share-backup/done/got-it-button"
+                            >
                                 <Translation id="TR_GOT_IT_BUTTON" />
                             </Button>
                             <LearnMoreButton url={HELP_CENTER_KEEPING_SEED_SAFE_URL} size="medium">
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/MultiShareBackupStep1FirstInfo.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/MultiShareBackupStep1FirstInfo.tsx
index f9c98970b43..e3ab51099c2 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/MultiShareBackupStep1FirstInfo.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/MultiShareBackupStep1FirstInfo.tsx
@@ -1,10 +1,12 @@
 import { Dispatch, SetStateAction } from 'react';
+
 import styled from 'styled-components';
 
 import { Checkbox, Image, Paragraph } from '@trezor/components';
 import { spacingsPx } from '@trezor/theme';
 
 import { Translation } from 'src/components/suite';
+
 import { Body, Section } from './multiShareModalLayout';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
@@ -60,6 +62,7 @@ export const MultiShareBackupStep1FirstInfo = ({
                         isChecked={isChecked1}
                         onClick={toggleCheckbox1}
                         variant={checkboxVariant1}
+                        data-testid="@multi-share-backup/checkbox/1"
                     >
                         <Translation id="TR_MULTI_SHARE_BACKUP_CHECKBOX_1" />
                     </Checkbox>
@@ -67,6 +70,7 @@ export const MultiShareBackupStep1FirstInfo = ({
                         isChecked={isChecked2}
                         onClick={toggleCheckbox2}
                         variant={checkboxVariant2}
+                        data-testid="@multi-share-backup/checkbox/2"
                     >
                         <Translation id="TR_MULTI_SHARE_BACKUP_CHECKBOX_2" />
                     </Checkbox>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/MultiShareBackupStep5Done.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/MultiShareBackupStep5Done.tsx
index 27a084f6f39..281dc4efc29 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/MultiShareBackupStep5Done.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/MultiShareBackupStep5Done.tsx
@@ -1,11 +1,14 @@
+import { ReactNode } from 'react';
+
+import styled from 'styled-components';
+
 import { Card, Row, Column, Text, Icon } from '@trezor/components';
+import { borders, spacings, spacingsPx } from '@trezor/theme';
+import { TranslationKey } from '@suite-common/intl-types';
 
 import { Translation } from 'src/components/suite';
+
 import { Body, Section } from './multiShareModalLayout';
-import { borders, spacings, spacingsPx } from '@trezor/theme';
-import { ReactNode } from 'react';
-import { TranslationKey } from '@suite-common/intl-types';
-import styled from 'styled-components';
 
 const GradientCallout = styled.div`
     background-image: linear-gradient(
@@ -69,7 +72,7 @@ export const MultiShareBackupStep5Done = () => (
             </Text>
             <Row gap={spacings.lg} alignItems="stretch">
                 <Callout
-                    header="TR_MULTI_SHARE_BACKUP_SUCCESS_LEFT_HEADER"
+                    header="TR_MULTI_SHARE_BACKUP_SUCCESS_LEFT"
                     items={[
                         <>
                             <Icon name="coins" />
@@ -82,7 +85,7 @@ export const MultiShareBackupStep5Done = () => (
                     ]}
                 />
                 <Callout
-                    header="TR_MULTI_SHARE_BACKUP_SUCCESS_RIGHT_HEADER"
+                    header="TR_MULTI_SHARE_BACKUP_SUCCESS_RIGHT"
                     items={[
                         <>
                             <Icon name="coins" />
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/instructionSteps.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/instructionSteps.tsx
index 062b5375fa2..917e52bc47d 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/instructionSteps.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/instructionSteps.tsx
@@ -1,11 +1,11 @@
-import { Row } from '@trezor/components';
 import styled from 'styled-components';
 
-import { Image, Text } from '@trezor/components';
+import { Row, Image, Text } from '@trezor/components';
 import { borders, spacings, spacingsPx } from '@trezor/theme';
 import { ESHOP_KEEP_METAL_SINGLE_SHARE_URL, HELP_CENTER_SEED_CARD_URL } from '@trezor/urls';
 
 import { Translation, TrezorLink } from 'src/components/suite';
+
 import { BackupInstructionsCard } from './BackupInstructionsCard';
 import { BackupInstructionsStepProps } from './BackupInstructionsStep';
 
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/multiShareModalLayout.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/multiShareModalLayout.tsx
index 9cf32071099..2d4719259da 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/multiShareModalLayout.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/MultiShareBackupModal/multiShareModalLayout.tsx
@@ -1,6 +1,7 @@
+import { ReactNode } from 'react';
+
 import { Column } from '@trezor/components';
 import { spacings } from '@trezor/theme';
-import { ReactNode } from 'react';
 
 export const Body = ({ children }: { children: ReactNode }) => (
     <Column gap={spacings.lg} alignItems="start">
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseDuplicateModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseDuplicateModal.tsx
index 0969cd8e621..fa905b01333 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseDuplicateModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseDuplicateModal.tsx
@@ -1,12 +1,12 @@
 import { Button, Column, H3, Text } from '@trezor/components';
-
 import { authorizeDeviceThunk, switchDuplicatedDevice } from '@suite-common/wallet-core';
+import { spacings } from '@trezor/theme';
 
 import { Translation } from 'src/components/suite';
 import { useDevice, useDispatch } from 'src/hooks/suite';
 import { TrezorDevice } from 'src/types/suite';
-import { SwitchDeviceRenderer } from 'src/views/suite/SwitchDevice/SwitchDeviceRenderer';
 import { CardWithDevice } from 'src/views/suite/SwitchDevice/CardWithDevice';
+import { SwitchDeviceModal } from 'src/views/suite/SwitchDevice/SwitchDeviceModal';
 
 type PassphraseDuplicateModalProps = {
     device: TrezorDevice;
@@ -23,34 +23,35 @@ export const PassphraseDuplicateModal = ({ device, duplicate }: PassphraseDuplic
     const handleAuthorizeDevice = () => dispatch(authorizeDeviceThunk());
 
     return (
-        <SwitchDeviceRenderer isCancelable={false}>
+        <SwitchDeviceModal>
             <CardWithDevice device={device} isFullHeaderVisible={false}>
-                <H3 margin={{ top: 12 }} data-testid="@passphrase-duplicate-header">
-                    <Translation id="TR_WALLET_DUPLICATE_TITLE" />
-                </H3>
-                <Text color="textSubdued">
-                    <Translation id="TR_WALLET_DUPLICATE_DESC" />
-                </Text>
-
-                <Column gap={8} margin={{ top: 20 }}>
-                    <Button
-                        variant="primary"
-                        onClick={handleSwitchDevice}
-                        isDisabled={isDeviceLocked}
-                        isFullWidth
-                    >
-                        <Translation id="TR_WALLET_DUPLICATE_SWITCH" />
-                    </Button>
-                    <Button
-                        variant="tertiary"
-                        onClick={handleAuthorizeDevice}
-                        isDisabled={isDeviceLocked}
-                        isFullWidth
-                    >
-                        <Translation id="TR_WALLET_DUPLICATE_RETRY" />
-                    </Button>
+                <Column gap={spacings.xs} margin={{ top: spacings.xxs }} alignItems="stretch">
+                    <H3 data-testid="@passphrase-duplicate-header">
+                        <Translation id="TR_WALLET_DUPLICATE_TITLE" />
+                    </H3>
+                    <Text variant="tertiary">
+                        <Translation id="TR_WALLET_DUPLICATE_DESC" />
+                    </Text>
+                    <Column gap={spacings.xs} margin={{ top: spacings.lg }}>
+                        <Button
+                            variant="primary"
+                            onClick={handleSwitchDevice}
+                            isDisabled={isDeviceLocked}
+                            isFullWidth
+                        >
+                            <Translation id="TR_WALLET_DUPLICATE_SWITCH" />
+                        </Button>
+                        <Button
+                            variant="tertiary"
+                            onClick={handleAuthorizeDevice}
+                            isDisabled={isDeviceLocked}
+                            isFullWidth
+                        >
+                            <Translation id="TR_WALLET_DUPLICATE_RETRY" />
+                        </Button>
+                    </Column>
                 </Column>
             </CardWithDevice>
-        </SwitchDeviceRenderer>
+        </SwitchDeviceModal>
     );
 };
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseMismatchModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseMismatchModal.tsx
index 3fe72dea61e..c09273e6559 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseMismatchModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PassphraseMismatchModal.tsx
@@ -1,15 +1,17 @@
 import { Button, H3, Column, Text } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+import { passwordMismatchResetThunk } from '@suite-common/wallet-core';
+import { WalletType } from '@suite-common/wallet-types';
 
 import { useDevice, useDispatch } from 'src/hooks/suite';
-import { SwitchDeviceRenderer } from 'src/views/suite/SwitchDevice/SwitchDeviceRenderer';
 import { CardWithDevice } from 'src/views/suite/SwitchDevice/CardWithDevice';
-import { Translation } from '../../../Translation';
-import { passwordMismatchResetThunk } from '@suite-common/wallet-core';
 import {
     addWalletThunk,
     redirectAfterWalletSelectedThunk,
 } from 'src/actions/wallet/addWalletThunk';
-import { WalletType } from '@suite-common/wallet-types';
+import { SwitchDeviceModal } from 'src/views/suite/SwitchDevice/SwitchDeviceModal';
+
+import { Translation } from '../../../Translation';
 
 export const PassphraseMismatchModal = ({ onCancel }: { onCancel: () => void }) => {
     const { isLocked, device: selectDevice } = useDevice();
@@ -29,17 +31,20 @@ export const PassphraseMismatchModal = ({ onCancel }: { onCancel: () => void })
     };
 
     return (
-        <SwitchDeviceRenderer isCancelable={false} data-testid="@passphrase-mismatch">
+        <SwitchDeviceModal data-testid="@passphrase-mismatch">
             <CardWithDevice device={selectDevice} isFullHeaderVisible={false}>
-                <Column gap={8} margin={{ bottom: 32 }} alignItems="center">
-                    <H3 margin={{ top: 12 }}>
+                <Column
+                    gap={spacings.xs}
+                    margin={{ top: spacings.xxs, bottom: spacings.lg }}
+                    alignItems="stretch"
+                >
+                    <H3>
                         <Translation id="TR_PASSPHRASE_MISMATCH" />
                     </H3>
                     <Text variant="tertiary">
                         <Translation id="TR_PASSPHRASE_MISMATCH_DESCRIPTION" />
                     </Text>
                 </Column>
-
                 <Button
                     variant="primary"
                     onClick={onStartOver}
@@ -50,6 +55,6 @@ export const PassphraseMismatchModal = ({ onCancel }: { onCancel: () => void })
                     <Translation id="TR_PASSPHRASE_MISMATCH_START_OVER" />
                 </Button>
             </CardWithDevice>
-        </SwitchDeviceRenderer>
+        </SwitchDeviceModal>
     );
 };
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PinMismatchModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PinMismatchModal.tsx
index 3bbc9353164..ab636e11977 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PinMismatchModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/PinMismatchModal.tsx
@@ -1,5 +1,7 @@
 import styled from 'styled-components';
+
 import { Button, Image } from '@trezor/components';
+
 import { Translation, Modal, ModalProps } from 'src/components/suite';
 import { changePin } from 'src/actions/settings/deviceSettingsActions';
 import { useDispatch } from 'src/hooks/suite';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/QrScannerModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/QrScannerModal.tsx
index 41b3977c20d..66b5bc015ab 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/QrScannerModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/QrScannerModal.tsx
@@ -1,4 +1,5 @@
 import { lazy, Suspense, useState } from 'react';
+
 import styled from 'styled-components';
 
 import { UserContextPayload } from '@suite-common/suite-types';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/SafetyChecksModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/SafetyChecksModal.tsx
index 3dc206cfd12..dc5ca558ab6 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/SafetyChecksModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/SafetyChecksModal.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { useDevice, useDispatch } from 'src/hooks/suite';
+
 import {
     Radio,
     Paragraph,
@@ -10,9 +10,11 @@ import {
     Card,
     Text,
 } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
+import { useDevice, useDispatch } from 'src/hooks/suite';
 import { Translation } from 'src/components/suite';
 import { applySettings } from 'src/actions/settings/deviceSettingsActions';
-import { spacings } from '@trezor/theme';
 
 /**
  * A Modal that allows user to set the `safety_checks` feature of connected Trezor.
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/InfoRow.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/InfoRow.tsx
deleted file mode 100644
index 0b0f722083a..00000000000
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/InfoRow.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Badge, Paragraph, Row, List } from '@trezor/components';
-
-interface InfoRowProps {
-    label: React.ReactNode;
-    content: {
-        isBadge?: boolean;
-        text: React.ReactNode;
-    };
-}
-
-export const InfoRow = ({ label, content }: InfoRowProps) => {
-    const displayContent = content?.isBadge ? (
-        <Badge size="tiny">{content.text}</Badge>
-    ) : (
-        <Paragraph variant="tertiary" typographyStyle="hint">
-            {content.text}
-        </Paragraph>
-    );
-
-    return (
-        <List.Item>
-            <Row justifyContent="space-between">
-                {label}
-                {displayContent}
-            </Row>
-        </List.Item>
-    );
-};
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/StakeEthInANutshellModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/StakeEthInANutshellModal.tsx
index 2cc515760ef..36cefc901ab 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/StakeEthInANutshellModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/StakeEthInANutshellModal.tsx
@@ -1,3 +1,5 @@
+import React from 'react';
+
 import {
     Icon,
     IconName,
@@ -11,16 +13,17 @@ import {
     Divider,
     CollapsibleBox,
 } from '@trezor/components';
-import { Translation } from 'src/components/suite';
 import { TranslationKey } from '@suite-common/intl-types';
+import { spacings } from '@trezor/theme';
+import { selectValidatorsQueueData } from '@suite-common/wallet-core';
+
+import { Translation } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { openModal } from 'src/actions/suite/modalActions';
-import { spacings } from '@trezor/theme';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 import { getUnstakingPeriodInDays } from 'src/utils/suite/stake';
-import { selectValidatorsQueueData } from '@suite-common/wallet-core';
-import { StakingInfo } from './StakingInfo';
-import { UnstakingInfo } from './UnstakingInfo';
+import { StakingInfo } from 'src/components/suite/StakingProcess/StakingInfo';
+import { UnstakingInfo } from 'src/components/suite/StakingProcess/UnstakingInfo';
 
 interface StakingDetails {
     id: number;
@@ -68,7 +71,7 @@ export const StakeEthInANutshellModal = ({ onCancel }: StakeEthInANutshellModalP
         {
             heading: <Translation id="TR_STAKE_STAKING_PROCESS" />,
             badge: <Translation id="TR_TX_FEE" />,
-            content: <StakingInfo account={account} />,
+            content: <StakingInfo />,
         },
         {
             heading: <Translation id="TR_STAKE_UNSTAKING_PROCESS" />,
@@ -78,7 +81,7 @@ export const StakeEthInANutshellModal = ({ onCancel }: StakeEthInANutshellModalP
                     <Translation id="TR_TX_FEE" />
                 </>
             ),
-            content: <UnstakingInfo account={account} />,
+            content: <UnstakingInfo />,
         },
     ];
 
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/UnstakingInfo.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/UnstakingInfo.tsx
deleted file mode 100644
index 3d834e86252..00000000000
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeEthInANutshellModal/UnstakingInfo.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import {
-    selectAccountUnstakeTransactions,
-    selectValidatorsQueue,
-    TransactionsRootState,
-    StakeRootState,
-} from '@suite-common/wallet-core';
-import { Translation } from 'src/components/suite';
-import { InfoRow } from './InfoRow';
-import { useSelector } from 'react-redux';
-import { getDaysToUnstake } from 'src/utils/suite/stake';
-import { Account } from 'src/types/wallet';
-
-interface StakingInfoProps {
-    account?: Account;
-}
-export const UnstakingInfo = ({ account }: StakingInfoProps) => {
-    const { data } =
-        useSelector((state: StakeRootState) => selectValidatorsQueue(state, account?.symbol)) || {};
-
-    const unstakeTxs = useSelector((state: TransactionsRootState) =>
-        selectAccountUnstakeTransactions(state, account?.key ?? ''),
-    );
-
-    if (!account) return null;
-
-    const daysToUnstake = getDaysToUnstake(unstakeTxs, data);
-
-    const infoRows = [
-        {
-            label: <Translation id="TR_STAKE_SIGN_UNSTAKING_TRANSACTION" />,
-            content: {
-                text: <Translation id="TR_COINMARKET_NETWORK_FEE" />,
-                isBadge: true,
-            },
-        },
-        {
-            label: <Translation id="TR_STAKE_LEAVE_STAKING_POOL" />,
-            content: {
-                text: <Translation id="TR_STAKE_DAYS" values={{ count: daysToUnstake }} />,
-            },
-        },
-        {
-            label: (
-                <Translation
-                    id="TR_STAKE_CLAIM_UNSTAKED"
-                    values={{ symbol: account?.symbol.toUpperCase() }}
-                />
-            ),
-            content: {
-                text: <Translation id="TR_COINMARKET_NETWORK_FEE" />,
-                isBadge: true,
-            },
-        },
-        {
-            label: (
-                <Translation
-                    id="TR_STAKE_IN_ACCOUNT"
-                    values={{ symbol: account?.symbol.toUpperCase() }}
-                />
-            ),
-            content: { text: null },
-        },
-    ];
-
-    return (
-        <>
-            {infoRows.map(({ label, content }, index) => (
-                <InfoRow key={index} label={label} content={content} />
-            ))}
-        </>
-    );
-};
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/AvailableBalance.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/AvailableBalance.tsx
index 757935ea0c9..a5c12dc458d 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/AvailableBalance.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/AvailableBalance.tsx
@@ -1,6 +1,8 @@
 import React from 'react';
-import { Paragraph, Column, Text } from '@trezor/components';
+
+import { Row, Text, InfoRow } from '@trezor/components';
 import { NetworkSymbol } from '@suite-common/wallet-config';
+
 import { Translation, FormattedCryptoAmount, FiatValue } from 'src/components/suite';
 
 interface AvailableBalanceProps {
@@ -9,17 +11,18 @@ interface AvailableBalanceProps {
 }
 
 export const AvailableBalance = ({ formattedBalance, symbol }: AvailableBalanceProps) => (
-    <Column alignItems="flex-start">
-        <Text typographyStyle="highlight">
-            <Translation id="AMOUNT" />
-        </Text>
-
-        <Paragraph variant="tertiary">
-            <Translation id="TR_STAKE_AVAILABLE" />{' '}
+    <InfoRow label={<Translation id="TR_STAKE_AVAILABLE" />}>
+        <Row justifyContent="space-between">
             <FormattedCryptoAmount value={formattedBalance} symbol={symbol} />{' '}
             <FiatValue amount={formattedBalance} symbol={symbol} showApproximationIndicator>
-                {({ value }) => (value ? <span>{value}</span> : null)}
+                {({ value }) =>
+                    value ? (
+                        <Text typographyStyle="label" variant="tertiary">
+                            {value}
+                        </Text>
+                    ) : null
+                }
             </FiatValue>
-        </Paragraph>
-    </Column>
+        </Row>
+    </InfoRow>
 );
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/ConfirmStakeEthModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/ConfirmStakeEthModal.tsx
index dbbc196ee24..ee2d773325d 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/ConfirmStakeEthModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/ConfirmStakeEthModal.tsx
@@ -1,12 +1,14 @@
 import { useState } from 'react';
+
 import { Checkbox, NewModal, Column, Banner, Card } from '@trezor/components';
 import { spacings } from '@trezor/theme';
+import { selectValidatorsQueueData } from '@suite-common/wallet-core';
+import { HELP_CENTER_ETH_STAKING } from '@trezor/urls';
+
 import { Translation, TrezorLink } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { openModal } from 'src/actions/suite/modalActions';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
-import { selectValidatorsQueueData } from '@suite-common/wallet-core';
-import { HELP_CENTER_ETH_STAKING } from '@trezor/urls';
 import { getDaysToAddToPoolInitial } from 'src/utils/suite/stake';
 
 interface ConfirmStakeEthModalProps {
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/Inputs.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/Inputs.tsx
index 577138eca07..940c855b284 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/Inputs.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/Inputs.tsx
@@ -1,8 +1,10 @@
-import styled from 'styled-components';
-import { Icon, Banner, Column, Text } from '@trezor/components';
+import { Icon, Banner, Column, Text, Button } from '@trezor/components';
 import { getInputState } from '@suite-common/wallet-utils';
 import { useFormatters } from '@suite-common/formatters';
 import { formInputsMaxLength } from '@suite-common/validators';
+import { MIN_ETH_FOR_WITHDRAWALS } from '@suite-common/wallet-constants';
+import { spacings } from '@trezor/theme';
+
 import { NumberInput, Translation } from 'src/components/suite';
 import { useTranslation } from 'src/hooks/suite';
 import { useStakeEthFormContext } from 'src/hooks/wallet/useStakeEthForm';
@@ -13,13 +15,8 @@ import {
     validateReserveOrBalance,
 } from 'src/utils/suite/validation';
 import { FIAT_INPUT, CRYPTO_INPUT } from 'src/types/wallet/stakeForms';
-import { MIN_ETH_FOR_WITHDRAWALS } from 'src/constants/suite/ethStaking';
-import { spacings, spacingsPx } from '@trezor/theme';
-
-const IconWrapper = styled.div`
-    transform: rotate(90deg);
-    margin-bottom: ${spacingsPx.xl};
-`;
+import { validateStakingMax } from 'src/utils/suite/stake';
+import { FormFractionButtons } from 'src/components/suite/FormFractionButtons';
 
 export const Inputs = () => {
     const { translationString } = useTranslation();
@@ -29,18 +26,24 @@ export const Inputs = () => {
         control,
         account,
         network,
-        formState: { errors },
+        formState: { errors, isDirty },
         amountLimits,
         onCryptoAmountChange,
         onFiatAmountChange,
         localCurrency,
         isAmountForWithdrawalWarningShown,
+        isLessAmountForWithdrawalWarningShown,
         isAdviceForWithdrawalWarningShown,
         currentRate,
+        setRatioAmount,
+        setMax,
+        watch,
+        clearForm,
     } = useStakeEthFormContext();
 
     const cryptoError = errors.cryptoInput;
     const fiatError = errors.fiatInput;
+    const hasValues = Boolean(watch(FIAT_INPUT) || watch(CRYPTO_INPUT));
 
     const fiatInputRules = {
         validate: {
@@ -53,6 +56,7 @@ export const Inputs = () => {
         required: translationString('AMOUNT_IS_NOT_SET'),
         validate: {
             min: validateMin(translationString),
+            max: validateStakingMax(translationString),
             decimals: validateDecimals(translationString, { decimals: network.decimals }),
             reserveOrBalance: validateReserveOrBalance(translationString, {
                 account,
@@ -64,10 +68,29 @@ export const Inputs = () => {
         },
     };
 
+    const shouldShowAmountForWithdrawalWarning =
+        isLessAmountForWithdrawalWarningShown || isAmountForWithdrawalWarningShown;
+
     return (
-        <Column>
+        <Column alignItems="normal" gap={spacings.sm}>
             <NumberInput
                 name={CRYPTO_INPUT}
+                labelLeft={
+                    <FormFractionButtons
+                        setRatioAmount={setRatioAmount}
+                        setMax={setMax}
+                        symbol={account.symbol}
+                        totalAmount={account.formattedBalance}
+                        decimals={network.decimals}
+                    />
+                }
+                labelRight={
+                    (isDirty || hasValues) && (
+                        <Button type="button" variant="tertiary" size="tiny" onClick={clearForm}>
+                            <Translation id="TR_CLEAR_ALL" />
+                        </Button>
+                    )
+                }
                 control={control}
                 rules={cryptoInputRules}
                 maxLength={formInputsMaxLength.amount}
@@ -81,10 +104,7 @@ export const Inputs = () => {
 
             {currentRate?.rate && (
                 <>
-                    <IconWrapper>
-                        <Icon name="transfer" size={16} />
-                    </IconWrapper>
-
+                    <Icon name="arrowsDownUp" size={20} variant="tertiary" />
                     <NumberInput
                         name={FIAT_INPUT}
                         control={control}
@@ -100,10 +120,14 @@ export const Inputs = () => {
                 </>
             )}
 
-            {isAmountForWithdrawalWarningShown && (
-                <Banner variant="info" margin={{ top: spacings.md }}>
+            {shouldShowAmountForWithdrawalWarning && (
+                <Banner variant="info">
                     <Translation
-                        id="TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL"
+                        id={
+                            isLessAmountForWithdrawalWarningShown
+                                ? 'TR_STAKE_LEFT_SMALL_AMOUNT_FOR_WITHDRAWAL'
+                                : 'TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL'
+                        }
                         values={{
                             amount: MIN_ETH_FOR_WITHDRAWALS.toString(),
                             symbol: account.symbol.toUpperCase(),
@@ -111,8 +135,9 @@ export const Inputs = () => {
                     />
                 </Banner>
             )}
+
             {isAdviceForWithdrawalWarningShown && (
-                <Banner variant="info" margin={{ top: spacings.md }}>
+                <Banner variant="info">
                     <Translation
                         id="TR_STAKE_RECOMMENDED_AMOUNT_FOR_WITHDRAWALS"
                         values={{
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeButton.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeButton.tsx
index 24a4cf6774e..30779454531 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeButton.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeButton.tsx
@@ -1,4 +1,5 @@
 import { Tooltip, NewModal } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useStakeEthFormContext } from 'src/hooks/wallet/useStakeEthForm';
 import { useDevice } from 'src/hooks/suite';
@@ -25,7 +26,6 @@ export const StakeButton = () => {
     return (
         <Tooltip content={stakingMessageContent}>
             <NewModal.Button
-                isFullWidth
                 isDisabled={isDisabled || isStakingDisabled}
                 isLoading={isComposing || isSubmitting}
                 onClick={handleSubmit(onSubmit)}
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeEthForm.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeEthForm.tsx
index bad02bf89c8..4efa96378d4 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeEthForm.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeEthForm.tsx
@@ -1,10 +1,10 @@
-import { Button, Column, Row } from '@trezor/components';
+import { Column, Card } from '@trezor/components';
 import { spacings } from '@trezor/theme';
-import { Translation } from 'src/components/suite';
+
 import { useStakeEthFormContext } from 'src/hooks/wallet/useStakeEthForm';
-import { FormFractionButtons } from 'src/components/suite/FormFractionButtons';
-import { StakeFees } from './StakeFees';
-import { CRYPTO_INPUT, FIAT_INPUT } from 'src/types/wallet/stakeForms';
+import { Translation } from 'src/components/suite';
+import { Fees } from 'src/components/wallet/Fees/Fees';
+
 import { Inputs } from './Inputs';
 import { ConfirmStakeEthModal } from './ConfirmStakeEthModal';
 import { AvailableBalance } from './AvailableBalance';
@@ -12,20 +12,21 @@ import { AvailableBalance } from './AvailableBalance';
 export const StakeEthForm = () => {
     const {
         account,
-        network,
-        formState: { isDirty },
-        setRatioAmount,
-        setMax,
-        watch,
-        clearForm,
         isConfirmModalOpen,
         closeConfirmModal,
         signTx,
         isLoading,
+        formState: { errors },
+        register,
+        control,
+        setValue,
+        getValues,
+        changeFeeLevel,
+        feeInfo,
+        composedLevels,
     } = useStakeEthFormContext();
 
     const { formattedBalance, symbol } = account;
-    const hasValues = Boolean(watch(FIAT_INPUT) || watch(CRYPTO_INPUT));
 
     return (
         <>
@@ -37,28 +38,26 @@ export const StakeEthForm = () => {
                 />
             )}
 
-            <Column gap={spacings.md} alignItems="stretch">
+            <Column gap={spacings.xxl} alignItems="stretch" margin={{ bottom: spacings.lg }}>
                 <AvailableBalance formattedBalance={formattedBalance} symbol={symbol} />
 
-                <Row justifyContent="space-between">
-                    <FormFractionButtons
-                        setRatioAmount={setRatioAmount}
-                        setMax={setMax}
-                        symbol={symbol}
-                        totalAmount={account.formattedBalance}
-                        decimals={network.decimals}
-                    />
-
-                    {(isDirty || hasValues) && (
-                        <Button type="button" variant="tertiary" size="tiny" onClick={clearForm}>
-                            <Translation id="TR_CLEAR_ALL" />
-                        </Button>
-                    )}
-                </Row>
-
                 <Inputs />
 
-                <StakeFees />
+                <Card paddingType="small" margin={{ top: spacings.xs }}>
+                    <Fees
+                        control={control}
+                        errors={errors}
+                        register={register}
+                        feeInfo={feeInfo}
+                        setValue={setValue}
+                        getValues={getValues}
+                        account={account}
+                        composedLevels={composedLevels}
+                        changeFeeLevel={changeFeeLevel}
+                        helperText={<Translation id="TR_STAKE_PAID_FROM_BALANCE" />}
+                        showFeeWhilePending={false}
+                    />
+                </Card>
             </Column>
         </>
     );
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeFees.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeFees.tsx
deleted file mode 100644
index 909768adc8a..00000000000
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeEthForm/StakeFees.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Fees } from 'src/components/wallet/Fees/Fees';
-import { useStakeEthFormContext } from 'src/hooks/wallet/useStakeEthForm';
-import { Translation } from 'src/components/suite';
-
-export const StakeFees = () => {
-    const {
-        formState: { errors },
-        register,
-        control,
-        setValue,
-        getValues,
-        account,
-        changeFeeLevel,
-        feeInfo,
-        composedLevels,
-    } = useStakeEthFormContext();
-
-    return (
-        <Fees
-            control={control}
-            errors={errors}
-            register={register}
-            feeInfo={feeInfo}
-            setValue={setValue}
-            getValues={getValues}
-            account={account}
-            composedLevels={composedLevels}
-            changeFeeLevel={changeFeeLevel}
-            helperText={<Translation id="TR_STAKE_PAID_FROM_BALANCE" />}
-            showFeeWhilePending={false}
-        />
-    );
-};
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeModal.tsx
index b2e10455894..01f910f0056 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakeModal.tsx
@@ -1,10 +1,14 @@
-import { NewModal } from '@trezor/components';
+import { Grid, NewModal, useMediaQuery, variables } from '@trezor/components';
 import { SelectedAccountLoaded } from '@suite-common/wallet-types';
+import { spacings } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite';
 import { StakeEthFormContext, useStakeEthForm } from 'src/hooks/wallet/useStakeEthForm';
+
 import { StakeEthForm } from './StakeEthForm/StakeEthForm';
 import { StakeButton } from './StakeEthForm/StakeButton';
+import { StakingInfoCards } from './StakingInfoCards/StakingInfoCards';
 
 interface StakeModalModalProps {
     onCancel?: () => void;
@@ -15,6 +19,7 @@ export const StakeModal = ({ onCancel }: StakeModalModalProps) => {
         state => state.wallet.selectedAccount,
     ) as SelectedAccountLoaded;
     const stakeEthContextValues = useStakeEthForm({ selectedAccount });
+    const isBelowTablet = useMediaQuery(`(max-width: ${variables.SCREEN_SIZE.MD})`);
 
     const { account, status } = selectedAccount;
     // it shouldn't be possible to open this modal without having selected account
@@ -23,12 +28,15 @@ export const StakeModal = ({ onCancel }: StakeModalModalProps) => {
     return (
         <StakeEthFormContext.Provider value={stakeEthContextValues}>
             <NewModal
-                size="tiny"
+                size="huge"
                 heading={<Translation id="TR_STAKE_ETH" />}
                 onCancel={onCancel}
                 bottomContent={<StakeButton />}
             >
-                <StakeEthForm />
+                <Grid columns={isBelowTablet ? 1 : 2} gap={spacings.xxl}>
+                    <StakeEthForm />
+                    <StakingInfoCards />
+                </Grid>
             </NewModal>
         </StakeEthFormContext.Provider>
     );
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakingInfoCards/EstimatedGains.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakingInfoCards/EstimatedGains.tsx
new file mode 100644
index 00000000000..f5fb7e2612e
--- /dev/null
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakingInfoCards/EstimatedGains.tsx
@@ -0,0 +1,84 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+
+import { selectPoolStatsApyData, StakeRootState } from '@suite-common/wallet-core';
+import { Column, Grid, Image, Paragraph, Text } from '@trezor/components';
+import { negativeSpacings, spacings } from '@trezor/theme';
+import { HELP_CENTER_ETH_STAKING } from '@trezor/urls';
+
+import { Translation } from 'src/components/suite/Translation';
+import { useStakeEthFormContext } from 'src/hooks/wallet/useStakeEthForm';
+import { CRYPTO_INPUT } from 'src/types/wallet/stakeForms';
+import { FiatValue, FormattedCryptoAmount, TrezorLink } from 'src/components/suite';
+import { calculateGains } from 'src/utils/suite/stake';
+
+export const EstimatedGains = () => {
+    const { account, getValues, formState } = useStakeEthFormContext();
+
+    const value = getValues(CRYPTO_INPUT);
+    const hasInvalidFormState =
+        Object.keys(formState.errors).length > 0 &&
+        formState.errors[CRYPTO_INPUT]?.type !== 'reserveOrBalance'; // provide gains calculation even if the user has not enough balance
+
+    const cryptoInput = hasInvalidFormState || !value ? '0' : value;
+
+    const ethApy = useSelector((state: StakeRootState) =>
+        selectPoolStatsApyData(state, account?.symbol),
+    );
+
+    const gains = [
+        {
+            label: <Translation id="TR_STAKE_WEEKLY" />,
+            value: calculateGains(cryptoInput, ethApy, 52),
+        },
+        {
+            label: <Translation id="TR_STAKE_MONTHLY" />,
+            value: calculateGains(cryptoInput, ethApy, 12),
+        },
+        {
+            label: <Translation id="TR_STAKE_YEARLY" />,
+            value: calculateGains(cryptoInput, ethApy, 1),
+        },
+    ];
+
+    return (
+        <Column alignItems="normal" gap={spacings.lg}>
+            <Column alignItems="normal">
+                <Paragraph variant="primary" typographyStyle="titleMedium">
+                    {ethApy}%
+                </Paragraph>
+                <Paragraph
+                    typographyStyle="hint"
+                    variant="tertiary"
+                    margin={{ bottom: negativeSpacings.xxxxl }}
+                >
+                    <Translation id="TR_STAKE_APY_ABBR" />
+                </Paragraph>
+                <Image image="GAINS_GRAPH" width="100%" />
+            </Column>
+            <Column gap={spacings.sm} alignItems="normal" hasDivider>
+                {gains.map(({ label, value }, index) => (
+                    <Grid key={index} columns={3}>
+                        <Paragraph variant="tertiary">{label}</Paragraph>
+                        <Text variant="primary">
+                            <FormattedCryptoAmount value={value} symbol={account.symbol} />
+                        </Text>
+                        <Paragraph align="right">
+                            <FiatValue amount={value} symbol={account.symbol} />
+                        </Paragraph>
+                    </Grid>
+                ))}
+            </Column>
+            <Paragraph variant="tertiary">
+                <Translation
+                    id="TR_STAKING_YOUR_EARNINGS"
+                    values={{
+                        a: chunks => (
+                            <TrezorLink href={HELP_CENTER_ETH_STAKING}>{chunks}</TrezorLink>
+                        ),
+                    }}
+                />
+            </Paragraph>
+        </Column>
+    );
+};
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakingInfoCards/StakingInfoCards.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakingInfoCards/StakingInfoCards.tsx
new file mode 100644
index 00000000000..38eb1449c6d
--- /dev/null
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/StakeModal/StakingInfoCards/StakingInfoCards.tsx
@@ -0,0 +1,39 @@
+import { CollapsibleBox, Column, H3, List } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
+import { Translation } from 'src/components/suite/Translation';
+import { StakingInfo } from 'src/components/suite/StakingProcess/StakingInfo';
+
+import { EstimatedGains } from './EstimatedGains';
+
+export const StakingInfoCards = () => {
+    const cards = [
+        {
+            heading: <Translation id="TR_STAKING_ONCE_YOU_CONFIRM" />,
+            content: <StakingInfo isExpanded />,
+            defaultIsOpen: true,
+        },
+        {
+            heading: <Translation id="TR_STAKING_ESTIMATED_GAINS" />,
+            content: <EstimatedGains />,
+            defaultIsOpen: false,
+        },
+    ];
+
+    return (
+        <Column alignItems="stretch" gap={spacings.lg} margin={{ bottom: spacings.lg }}>
+            {cards.map((card, index) => (
+                <CollapsibleBox
+                    heading={<H3 typographyStyle="highlight">{card.heading}</H3>}
+                    key={index}
+                    hasDivider={false}
+                    defaultIsOpen={card.defaultIsOpen}
+                >
+                    <List isOrdered bulletGap={spacings.sm} gap={spacings.md}>
+                        {card.content}
+                    </List>
+                </CollapsibleBox>
+            ))}
+        </Column>
+    );
+};
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/AdvancedTxDetails.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/AdvancedTxDetails.tsx
index 45e8797b7f8..4495c7705a4 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/AdvancedTxDetails.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/AdvancedTxDetails.tsx
@@ -1,14 +1,19 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
-import { Translation } from 'src/components/suite';
+
 import { useElevation, variables } from '@trezor/components';
 import { isTestnet } from '@suite-common/wallet-utils';
 import { WalletAccountTransaction, ChainedTransactions } from '@suite-common/wallet-types';
 import { AccountType, Network } from '@suite-common/wallet-config';
+import { Elevation, mapElevationToBorder, spacingsPx } from '@trezor/theme';
+
+import { Translation } from 'src/components/suite';
+
 import { AmountDetails } from './AmountDetails';
 import { IODetails } from './IODetails/IODetails';
 import { ChainedTxs } from '../ChainedTxs';
-import { Elevation, mapElevationToBorder, spacingsPx } from '@trezor/theme';
+import { Data } from './Data';
 
 const Wrapper = styled.div`
     padding: 0 ${spacingsPx.xl} ${spacingsPx.sm};
@@ -46,7 +51,7 @@ const TabButton = styled.button<{ $selected: boolean; $elevation: Elevation }>`
     }
 `;
 
-export type TabID = 'amount' | 'io' | 'chained';
+export type TabID = 'amount' | 'io' | 'chained' | 'data';
 
 interface AdvancedTxDetailsProps {
     defaultTab?: TabID;
@@ -80,10 +85,12 @@ export const AdvancedTxDetails = ({
             <ChainedTxs
                 txs={chainedTxs}
                 explorerUrl={explorerUrl}
-                network={network}
                 accountType={accountType}
+                network={network}
             />
         );
+    } else if (selectedTab === 'data') {
+        content = <Data tx={tx} />;
     }
     const { elevation } = useElevation();
 
@@ -117,6 +124,16 @@ export const AdvancedTxDetails = ({
                         <Translation id="TR_CHAINED_TXS" />
                     </TabButton>
                 )}
+
+                {network.networkType === 'ethereum' && tx.ethereumSpecific && (
+                    <TabButton
+                        $elevation={elevation}
+                        $selected={selectedTab === 'data'}
+                        onClick={() => setSelectedTab('data')}
+                    >
+                        <Translation id="TR_DATA" />
+                    </TabButton>
+                )}
             </TabSelector>
 
             {content}
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/AmountDetails.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/AmountDetails.tsx
index bbb376860b4..6acfeaf6af0 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/AmountDetails.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/AmountDetails.tsx
@@ -1,8 +1,6 @@
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
-import { Translation, FormattedCryptoAmount, FiatValue, FormattedDate } from 'src/components/suite';
-import { AmountRow } from './AmountRow';
-import { WalletAccountTransaction } from 'src/types/wallet';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import {
     formatAmount,
@@ -14,17 +12,22 @@ import {
     isNftTokenTransfer,
     isTxFeePaid,
     roundTimestampToNearestPastHour,
+    isStakeTypeTx,
 } from '@suite-common/wallet-utils';
 import { BigNumber } from '@trezor/utils/src/bigNumber';
-import { FormattedNftAmount } from 'src/components/suite/FormattedNftAmount';
-import { useSelector } from 'src/hooks/suite';
-import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
 import {
     selectHistoricFiatRates,
     selectHistoricFiatRatesByTimestamp,
 } from '@suite-common/wallet-core';
 import { Timestamp, TokenAddress } from '@suite-common/wallet-types';
-import { isStakeTypeTx } from '@suite-common/suite-utils';
+
+import { FormattedNftAmount } from 'src/components/suite/FormattedNftAmount';
+import { useSelector } from 'src/hooks/suite';
+import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
+import { WalletAccountTransaction } from 'src/types/wallet';
+import { Translation, FormattedCryptoAmount, FiatValue, FormattedDate } from 'src/components/suite';
+
+import { AmountRow } from './AmountRow';
 
 const MainContainer = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/AmountRow.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/AmountRow.tsx
index 7d825a8f74c..7e40cd37400 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/AmountRow.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/AmountRow.tsx
@@ -1,4 +1,5 @@
 import { ReactNode } from 'react';
+
 import styled, { css } from 'styled-components';
 
 const rightAlignedStyles = css`
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/Data.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/Data.tsx
new file mode 100644
index 00000000000..e5e4c8fa0fa
--- /dev/null
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/Data.tsx
@@ -0,0 +1,66 @@
+import styled from 'styled-components';
+
+import { WalletAccountTransaction } from '@suite-common/wallet-types';
+import { Paragraph, Row } from '@trezor/components';
+import { palette, spacingsPx } from '@trezor/theme';
+import { TranslationKey } from '@suite-common/intl-types';
+
+import { Translation } from 'src/components/suite';
+
+const Container = styled.div`
+    display: grid;
+    grid-template-columns: 130px 3fr;
+    gap: ${spacingsPx.md};
+    margin-top: ${spacingsPx.xxl};
+`;
+
+const ParagraphWrapper = styled.div`
+    white-space: pre-wrap;
+    overflow-wrap: anywhere;
+`;
+
+interface DataRowProps {
+    translationId: TranslationKey;
+    content: string;
+}
+
+const DataRow = ({ translationId, content }: DataRowProps) => (
+    <>
+        <Row alignItems="flex-start">
+            <Paragraph typographyStyle="callout" color={palette.lightGray700}>
+                <Translation id={translationId} />
+            </Paragraph>
+        </Row>
+        <Row>
+            <ParagraphWrapper>
+                <Paragraph typographyStyle="hint">{content}</Paragraph>
+            </ParagraphWrapper>
+        </Row>
+    </>
+);
+
+interface DataProps {
+    tx: WalletAccountTransaction;
+}
+
+export const Data = ({ tx }: DataProps) => {
+    const { data, parsedData } = tx.ethereumSpecific || {};
+    const { function: fn, methodId, name, params } = parsedData || {};
+
+    return (
+        <Container>
+            {methodId && name && (
+                <DataRow translationId="TR_TX_DATA_METHOD_NAME" content={`${name} (${methodId})`} />
+            )}
+            {methodId && !name && <DataRow translationId="TR_TX_DATA_METHOD" content={methodId} />}
+            {fn && <DataRow translationId="TR_TX_DATA_FUNCTION" content={fn} />}
+            {params && (
+                <DataRow
+                    translationId="TR_TX_DATA_PARAMS"
+                    content={JSON.stringify(params, undefined, 2)}
+                />
+            )}
+            {data && <DataRow translationId="TR_TX_DATA_INPUT_DATA" content={data} />}
+        </Container>
+    );
+};
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/AnalyzeInExplorerBanner.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/AnalyzeInExplorerBanner.tsx
index 40480539305..a741793f422 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/AnalyzeInExplorerBanner.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/AnalyzeInExplorerBanner.tsx
@@ -1,12 +1,13 @@
 import styled from 'styled-components';
 
 import { variables } from '@trezor/components';
-import { NotificationCard, Translation } from 'src/components/suite';
-import { useSelector } from 'src/hooks/suite';
 import { typography } from '@trezor/theme';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { selectBlockchainExplorerBySymbol } from '@suite-common/wallet-core';
 
+import { useSelector } from 'src/hooks/suite';
+import { NotificationCard, Translation } from 'src/components/suite';
+
 const TextWrapper = styled.div`
     display: flex;
     text-align: start;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/IODetails.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/IODetails.tsx
index d6274dafee3..749ff18c6ee 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/IODetails.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/AdvancedTxDetails/IODetails/IODetails.tsx
@@ -1,18 +1,21 @@
 import { ReactElement, ReactNode } from 'react';
+
 import styled, { css, useTheme } from 'styled-components';
 
 import { spacingsPx, spacings, typography } from '@trezor/theme';
 import { WalletAccountTransaction } from '@suite-common/wallet-types';
 import { formatAmount, formatNetworkAmount, isNftTokenTransfer } from '@suite-common/wallet-utils';
-import { FormattedCryptoAmount, Translation } from 'src/components/suite';
-import { useSelector } from 'src/hooks/suite/useSelector';
 import { AnonymitySet, TokenTransfer } from '@trezor/blockchain-link';
 import { Icon, CollapsibleBox, Divider } from '@trezor/components';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+
+import { FormattedCryptoAmount, Translation } from 'src/components/suite';
+import { useSelector } from 'src/hooks/suite/useSelector';
 import { UtxoAnonymity } from 'src/components/wallet';
-import { AnalyzeInExplorerBanner } from './AnalyzeInExplorerBanner';
 import { FormattedNftAmount } from 'src/components/suite/FormattedNftAmount';
+
+import { AnalyzeInExplorerBanner } from './AnalyzeInExplorerBanner';
 import { IOAddress } from '../../IOAddress';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 
 export const blurFix = css`
     margin-left: -10px;
@@ -126,9 +129,6 @@ const IOGridRow = ({
                 explorerUrlQueryString={network?.explorer.queryString}
                 shouldAllowCopy={!isPhishingTransaction}
             />
-
-            <br />
-
             <AmountRow>
                 {anonymity && <UtxoAnonymity anonymity={anonymity} />}
                 {value && (
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/BasicTxDetails.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/BasicTxDetails.tsx
index 54c4c1bf034..d228dab9c46 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/BasicTxDetails.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/BasicTxDetails.tsx
@@ -1,12 +1,9 @@
 import styled, { useTheme } from 'styled-components';
+import { fromWei } from 'web3-utils';
+
 import { Icon, variables, H3, useElevation } from '@trezor/components';
-import { Translation, FormattedDateWithBullet } from 'src/components/suite';
-import { WalletAccountTransaction } from 'src/types/wallet';
 import { Network } from '@suite-common/wallet-config';
 import { getTxIcon, isPending, getFeeUnits, getFeeRate } from '@suite-common/wallet-utils';
-import { TransactionHeader } from 'src/components/wallet/TransactionItem/TransactionHeader';
-import { fromWei } from 'web3-utils';
-import { IOAddress } from './IOAddress';
 import {
     Elevation,
     borders,
@@ -18,6 +15,12 @@ import {
 } from '@trezor/theme';
 import { CoinLogo } from '@trezor/product-components';
 
+import { Translation, FormattedDateWithBullet } from 'src/components/suite';
+import { WalletAccountTransaction } from 'src/types/wallet';
+import { TransactionHeader } from 'src/components/wallet/TransactionItem/TransactionHeader';
+
+import { IOAddress } from './IOAddress';
+
 const Wrapper = styled.div<{ $elevation: Elevation }>`
     background: ${mapElevationToBackground};
     padding: ${spacingsPx.lg};
@@ -26,7 +29,7 @@ const Wrapper = styled.div<{ $elevation: Elevation }>`
 
 const Confirmations = styled.div`
     display: flex;
-    color: ${({ theme }) => theme.textSubdued};
+    color: ${({ theme }) => theme.textDefault};
     ${typography.hint}
 `;
 
@@ -82,12 +85,6 @@ const Value = styled.div`
     text-overflow: ellipsis;
     font-variant-numeric: tabular-nums;
 `;
-
-const TxidValue = styled.div`
-    color: ${({ theme }) => theme.textDefault};
-    ${typography.label}
-`;
-
 const IconWrapper = styled.div<{ $elevation: Elevation }>`
     background-color: ${mapElevationToBorder};
     border-radius: ${borders.radii.full};
@@ -145,18 +142,13 @@ const ConfirmationStatus = styled.div<{ $confirmed: boolean; $tiny?: boolean }>`
 const Circle = styled.div`
     margin-left: ${spacingsPx.xxs};
     margin-right: ${spacingsPx.xxs};
-    color: ${({ theme }) => theme.textSubdued};
+    color: ${({ theme }) => theme.textDefault};
 `;
 
 const Timestamp = styled.span`
     white-space: nowrap;
 `;
 
-const IconPlaceholder = styled.span`
-    min-width: 10px;
-    margin-right: ${spacingsPx.xs};
-`;
-
 interface BasicTxDetailsProps {
     tx: WalletAccountTransaction;
     network: Network;
@@ -229,7 +221,12 @@ export const BasicTxDetails = ({
             <Grid>
                 {/* MINED TIME */}
                 <Title>
-                    <Icon name="calendar" size={10} margin={{ right: spacings.xs }} />
+                    <Icon
+                        name="calendar"
+                        size={15}
+                        margin={{ right: spacings.xs }}
+                        variant="tertiary"
+                    />
                     {isConfirmed ? (
                         <Translation id="TR_MINED_TIME" />
                     ) : (
@@ -252,23 +249,31 @@ export const BasicTxDetails = ({
 
                 {/* TX ID */}
                 <Title>
-                    <Icon name="biometric" size={10} margin={{ right: spacings.xs }} />
+                    <Icon
+                        name="biometric"
+                        size={15}
+                        margin={{ right: spacings.xs }}
+                        variant="tertiary"
+                    />
                     <Translation id="TR_TXID" />
                 </Title>
 
-                <TxidValue>
-                    <IOAddress
-                        txAddress={tx.txid}
-                        explorerUrl={explorerUrl}
-                        explorerUrlQueryString={explorerUrlQueryString}
-                    />
-                </TxidValue>
+                <IOAddress
+                    txAddress={tx.txid}
+                    explorerUrl={explorerUrl}
+                    explorerUrlQueryString={explorerUrlQueryString}
+                />
 
                 {network.networkType === 'bitcoin' && (
                     <>
                         {/* Fee level */}
                         <Title>
-                            <Icon margin={{ right: spacings.xs }} name="gas" size={10} />
+                            <Icon
+                                margin={{ right: spacings.xs }}
+                                name="receipt"
+                                size={15}
+                                variant="tertiary"
+                            />
                             <Translation id="TR_FEE_RATE" />
                         </Title>
 
@@ -287,13 +292,23 @@ export const BasicTxDetails = ({
                 {tx.ethereumSpecific && (
                     <>
                         <Title>
-                            <Icon name="gas" size={10} margin={{ right: spacings.xs }} />
+                            <Icon
+                                name="receipt"
+                                size={15}
+                                margin={{ right: spacings.xs }}
+                                variant="tertiary"
+                            />
                             <Translation id="TR_GAS_LIMIT" />
                         </Title>
                         <Value>{tx.ethereumSpecific.gasLimit}</Value>
 
                         <Title>
-                            <Icon name="gas" size={10} margin={{ right: spacings.xs }} />
+                            <Icon
+                                name="receipt"
+                                size={15}
+                                margin={{ right: spacings.xs }}
+                                variant="tertiary"
+                            />
                             <Translation id="TR_GAS_USED" />
                         </Title>
                         <Value>
@@ -305,7 +320,12 @@ export const BasicTxDetails = ({
                         </Value>
 
                         <Title>
-                            <Icon name="gas" size={10} margin={{ right: spacings.xs }} />
+                            <Icon
+                                name="receipt"
+                                size={15}
+                                margin={{ right: spacings.xs }}
+                                variant="tertiary"
+                            />
                             <Translation id="TR_GAS_PRICE" />
                         </Title>
                         <Value>{`${fromWei(tx.ethereumSpecific?.gasPrice ?? '0', 'gwei')} ${getFeeUnits(
@@ -313,7 +333,12 @@ export const BasicTxDetails = ({
                         )}`}</Value>
 
                         <Title>
-                            <IconPlaceholder>#</IconPlaceholder>
+                            <Icon
+                                name="hash"
+                                size={15}
+                                margin={{ right: spacings.xs }}
+                                variant="tertiary"
+                            />
                             <Translation id="TR_NONCE" />
                         </Title>
                         <Value>{tx.ethereumSpecific?.nonce}</Value>
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChainedTxs.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChainedTxs.tsx
index 9dcaa4c5877..ce866c50484 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChainedTxs.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChainedTxs.tsx
@@ -2,10 +2,11 @@ import styled from 'styled-components';
 
 import { variables } from '@trezor/components';
 import { ChainedTransactions } from '@suite-common/wallet-types';
+import { AccountType, Network } from '@suite-common/wallet-config';
 
 import { TrezorLink, Translation } from 'src/components/suite';
 import { TransactionItem } from 'src/components/wallet/TransactionItem/TransactionItem';
-import { AccountType, Network } from '@suite-common/wallet-config';
+
 import { AffectedTransactionItem } from './ChangeFee/AffectedTransactionItem';
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/AffectedTransactionItem.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/AffectedTransactionItem.tsx
index c997985ccec..2f84d55b040 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/AffectedTransactionItem.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/AffectedTransactionItem.tsx
@@ -1,9 +1,11 @@
 import styled, { useTheme } from 'styled-components';
+
 import { Icon, variables } from '@trezor/components';
 import { WalletAccountTransaction } from '@suite-common/wallet-types';
+import { truncateMiddle } from '@trezor/utils';
+
 import { FormattedDate } from 'src/components/suite';
 import { useLayoutSize } from 'src/hooks/suite/useLayoutSize';
-import { truncateMiddle } from '@trezor/utils';
 
 const TxRow = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/AffectedTransactions.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/AffectedTransactions.tsx
index ed3952b1239..7925d4a7167 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/AffectedTransactions.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/AffectedTransactions.tsx
@@ -1,7 +1,10 @@
 import styled from 'styled-components';
+
 import { Button } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useRbfContext } from 'src/hooks/wallet/useRbfForm';
+
 import { GreyCard } from './GreyCard';
 import { WarnHeader } from './WarnHeader';
 import { AffectedTransactionItem } from './AffectedTransactionItem';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/ChangeFee.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/ChangeFee.tsx
index acf08d76e88..b8ee5a4144f 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/ChangeFee.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/ChangeFee.tsx
@@ -1,16 +1,20 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
+import { formatNetworkAmount, getFeeUnits } from '@suite-common/wallet-utils';
+import { WalletAccountTransaction } from '@suite-common/wallet-types';
+import { borders } from '@trezor/theme';
+
 import { Translation, FiatValue, FormattedCryptoAmount } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite';
 import { useRbf, RbfContext, UseRbfProps } from 'src/hooks/wallet/useRbfForm';
-import { formatNetworkAmount, getFeeUnits } from '@suite-common/wallet-utils';
-import { WalletAccountTransaction } from '@suite-common/wallet-types';
+
 import { RbfFees } from './RbfFees';
 import { AffectedTransactions } from './AffectedTransactions';
 import { DecreasedOutputs } from './DecreasedOutputs';
 import { ReplaceTxButton } from './ReplaceTxButton';
-import { borders } from '@trezor/theme';
 
 const Wrapper = styled.div`
     margin: 12px 0;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/DecreasedOutputs.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/DecreasedOutputs.tsx
index 6013bcf9559..f67534611ac 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/DecreasedOutputs.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/DecreasedOutputs.tsx
@@ -1,14 +1,18 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
 import { AnimatePresence, motion } from 'framer-motion';
+
 import { Icon, variables, Radio, motionAnimation } from '@trezor/components';
+import { formatNetworkAmount } from '@suite-common/wallet-utils';
+import { spacings } from '@trezor/theme';
+
 import { FormattedCryptoAmount, HiddenPlaceholder } from 'src/components/suite';
 import { Translation, TranslationKey } from 'src/components/suite/Translation';
-import { formatNetworkAmount } from '@suite-common/wallet-utils';
 import { useRbfContext } from 'src/hooks/wallet/useRbfForm';
+
 import { GreyCard } from './GreyCard';
 import { WarnHeader } from './WarnHeader';
-import { spacings } from '@trezor/theme';
 
 const OutputsWrapper = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/GreyCard.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/GreyCard.tsx
index 99747bc2ca9..6f9870587ef 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/GreyCard.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/GreyCard.tsx
@@ -1,5 +1,7 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { Card, Column } from '@trezor/components';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/ReplaceTxButton.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/ReplaceTxButton.tsx
index c3616d46955..66e70faf50b 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/ReplaceTxButton.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/ReplaceTxButton.tsx
@@ -1,5 +1,7 @@
 import styled from 'styled-components';
+
 import { Button } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useDevice } from 'src/hooks/suite';
 import { useRbfContext } from 'src/hooks/wallet/useRbfForm';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/WarnHeader.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/WarnHeader.tsx
index ae798138e56..4effaf18ad0 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/WarnHeader.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/WarnHeader.tsx
@@ -1,5 +1,7 @@
 import { ReactNode, HTMLAttributes } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
 import { Icon, variables } from '@trezor/components';
 
 const Header = styled.div`
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/IOAddress.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/IOAddress.tsx
index 12551fbcad5..8e6d225e76c 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/IOAddress.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/IOAddress.tsx
@@ -1,9 +1,12 @@
-import { HiddenPlaceholder } from 'src/components/suite/HiddenPlaceholder';
-import { Icon, Link } from '@trezor/components';
 import { useState } from 'react';
-import { copyToClipboard } from '@trezor/dom-utils';
+
 import styled, { css, useTheme } from 'styled-components';
 
+import { Icon, Link, Paragraph } from '@trezor/components';
+import { copyToClipboard } from '@trezor/dom-utils';
+
+import { HiddenPlaceholder } from 'src/components/suite/HiddenPlaceholder';
+
 const IconWrapper = styled.div`
     display: none;
     padding: 1px;
@@ -34,7 +37,6 @@ const TextOverflowContainer = styled.div<{ $shouldAllowCopy?: boolean }>`
     align-items: center;
     max-width: 100%;
     overflow: hidden;
-    color: ${({ theme }) => theme.textSubdued};
     cursor: ${({ $shouldAllowCopy }) => ($shouldAllowCopy ? 'pointer' : 'cursor')};
     user-select: none;
 
@@ -95,42 +97,44 @@ export const IOAddress = ({
 
     // HiddenPlaceholder disableKeepingWidth: it isn't needed (no numbers to redact), but inline-block disrupts overflow behavior
     return (
-        <HiddenPlaceholder disableKeepingWidth>
-            <TextOverflowContainer
-                onMouseLeave={() => setIsClicked(false)}
-                data-testid="@tx-detail/txid-value"
-                id={txAddress}
-                $shouldAllowCopy={shouldAllowCopy}
-            >
-                {txAddress.length <= 5 ? (
-                    <SpanTextEnd onClick={copy}>{txAddress}</SpanTextEnd>
-                ) : (
-                    <>
-                        <SpanTextStart onClick={copy}>{txAddress.slice(0, -4)}</SpanTextStart>
-                        <SpanTextEnd onClick={copy}>{txAddress.slice(-4)}</SpanTextEnd>
-                    </>
-                )}
-                {shouldAllowCopy ? (
-                    <IconWrapper onClick={copy}>
-                        <Icon
-                            name={isClicked ? 'check' : 'copy'}
-                            size={12}
-                            color={theme.iconOnPrimary}
-                        />
-                    </IconWrapper>
-                ) : null}
-                {explorerUrl ? (
-                    <IconWrapper>
-                        <Link
-                            type="label"
-                            variant="nostyle"
-                            href={`${explorerUrl}${txAddress}${explorerUrlQueryString}`}
-                        >
-                            <Icon name="arrowUpRight" size={12} color={theme.iconOnPrimary} />
-                        </Link>
-                    </IconWrapper>
-                ) : null}
-            </TextOverflowContainer>
-        </HiddenPlaceholder>
+        <Paragraph typographyStyle="label" variant="default">
+            <HiddenPlaceholder disableKeepingWidth>
+                <TextOverflowContainer
+                    onMouseLeave={() => setIsClicked(false)}
+                    data-testid="@tx-detail/txid-value"
+                    id={txAddress}
+                    $shouldAllowCopy={shouldAllowCopy}
+                >
+                    {txAddress.length <= 5 ? (
+                        <SpanTextEnd onClick={copy}>{txAddress}</SpanTextEnd>
+                    ) : (
+                        <>
+                            <SpanTextStart onClick={copy}>{txAddress.slice(0, -4)}</SpanTextStart>
+                            <SpanTextEnd onClick={copy}>{txAddress.slice(-4)}</SpanTextEnd>
+                        </>
+                    )}
+                    {shouldAllowCopy ? (
+                        <IconWrapper onClick={copy}>
+                            <Icon
+                                name={isClicked ? 'check' : 'copy'}
+                                size={12}
+                                color={theme.iconOnPrimary}
+                            />
+                        </IconWrapper>
+                    ) : null}
+                    {explorerUrl ? (
+                        <IconWrapper>
+                            <Link
+                                type="label"
+                                variant="nostyle"
+                                href={`${explorerUrl}${txAddress}${explorerUrlQueryString}`}
+                            >
+                                <Icon name="arrowUpRight" size={12} color={theme.iconOnPrimary} />
+                            </Link>
+                        </IconWrapper>
+                    ) : null}
+                </TextOverflowContainer>
+            </HiddenPlaceholder>
+        </Paragraph>
     );
 };
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/TxDetailModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/TxDetailModal.tsx
index dbbc246ac82..97b3b123c28 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/TxDetailModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/TxDetailModal.tsx
@@ -1,22 +1,26 @@
 import { useState, useMemo } from 'react';
+
 import styled from 'styled-components';
+
 import { Button, NewModal } from '@trezor/components';
 import { HELP_CENTER_ZERO_VALUE_ATTACKS } from '@trezor/urls';
 import { isPending, findChainedTransactions, getAccountKey } from '@suite-common/wallet-utils';
 import { getNetwork } from '@suite-common/wallet-config';
-import { useSelector } from 'src/hooks/suite';
 import {
     selectAccountByKey,
     selectTransactionConfirmations,
     selectAllPendingTransactions,
     selectIsPhishingTransaction,
 } from '@suite-common/wallet-core';
+import { borders, spacingsPx, typography } from '@trezor/theme';
+
+import { useSelector } from 'src/hooks/suite';
 import { Translation, TrezorLink } from 'src/components/suite';
 import { Account, WalletAccountTransaction } from 'src/types/wallet';
+
 import { BasicTxDetails } from './BasicTxDetails';
 import { AdvancedTxDetails, TabID } from './AdvancedTxDetails/AdvancedTxDetails';
 import { ChangeFee } from './ChangeFee/ChangeFee';
-import { borders, spacingsPx, typography } from '@trezor/theme';
 
 const PhishingBanner = styled.div`
     margin-bottom: ${spacingsPx.xs};
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnecoCoinjoinModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnecoCoinjoinModal.tsx
index f7a3db439e5..88a66fefaef 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnecoCoinjoinModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnecoCoinjoinModal.tsx
@@ -3,11 +3,12 @@ import { transparentize } from 'polished';
 
 import { selectIsAccountWithRatesByKey } from '@suite-common/wallet-core';
 import { Button, variables } from '@trezor/components';
+import { formatAmount, getAccountDecimals } from '@suite-common/wallet-utils';
+
 import { FiatValue, FormattedCryptoAmount, Modal, Translation } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite/useDispatch';
 import { onCancel } from 'src/actions/suite/modalActions';
 import { goto } from 'src/actions/suite/routerActions';
-import { formatAmount, getAccountDecimals } from '@suite-common/wallet-utils';
 import { UNECONOMICAL_COINJOIN_THRESHOLD } from 'src/services/coinjoin';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 import { useSelector } from 'src/hooks/suite/useSelector';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/EverstakeModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/EverstakeModal.tsx
index 3d3624eb9ea..5a8db6bacc0 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/EverstakeModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/EverstakeModal.tsx
@@ -1,9 +1,11 @@
+import { useState } from 'react';
+
 import { Checkbox, NewModal, Column, Banner, Card } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { openModal } from 'src/actions/suite/modalActions';
-import { spacings } from '@trezor/theme';
-import { useState } from 'react';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 
 interface EverstakeModalProps {
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Fees.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Fees.tsx
index cd73e323f54..309587eb3ff 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Fees.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Fees.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { Fees } from 'src/components/wallet/Fees/Fees';
 import { useUnstakeEthFormContext } from 'src/hooks/wallet/useUnstakeEthForm';
 import { Translation } from 'src/components/suite';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Inputs.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Inputs.tsx
index 23b4e14d148..fd8721c0341 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Inputs.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Inputs.tsx
@@ -1,32 +1,15 @@
-import styled from 'styled-components';
-import { Icon } from '@trezor/components';
+import { Icon, Text, Row } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+import { formInputsMaxLength } from '@suite-common/validators';
+import { useFormatters } from '@suite-common/formatters';
+import { getInputState, getNonComposeErrorMessage } from '@suite-common/wallet-utils';
+
 import { NumberInput } from 'src/components/suite';
 import { CRYPTO_INPUT, FIAT_INPUT } from 'src/types/wallet/stakeForms';
-import { formInputsMaxLength } from '@suite-common/validators';
 import { useSelector, useTranslation } from 'src/hooks/suite';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
-import { variables } from '@trezor/components/src/config';
 import { validateDecimals, validateLimitsBigNum, validateMin } from 'src/utils/suite/validation';
 import { useUnstakeEthFormContext } from 'src/hooks/wallet/useUnstakeEthForm';
-import { useFormatters } from '@suite-common/formatters';
-import { getInputState, getNonComposeErrorMessage } from '@suite-common/wallet-utils';
-
-const HStack = styled.div`
-    display: flex;
-    gap: 14px;
-`;
-
-const IconWrapper = styled.div`
-    height: 48px;
-    display: flex;
-    align-items: center;
-`;
-
-const InputAddon = styled.span`
-    text-transform: uppercase;
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
 
 export const Inputs = () => {
     const { translationString } = useTranslation();
@@ -67,13 +50,13 @@ export const Inputs = () => {
     };
 
     return (
-        <HStack>
+        <Row gap={spacings.md} alignItems="flex-start">
             <NumberInput
                 name={CRYPTO_INPUT}
                 control={control}
                 rules={cryptoInputRules}
                 maxLength={formInputsMaxLength.amount}
-                innerAddon={<InputAddon>{symbol}</InputAddon>}
+                innerAddon={<Text variant="tertiary">{symbol?.toUpperCase()}</Text>}
                 bottomText={getNonComposeErrorMessage(errors[CRYPTO_INPUT])}
                 inputState={getInputState(cryptoError || fiatError)}
                 onChange={value => {
@@ -83,17 +66,13 @@ export const Inputs = () => {
 
             {currentRate?.rate && (
                 <>
-                    <IconWrapper>
-                        {/* TODO: Add new transfer icon. Export from Figma isn't handled as is it should by the strokes to fills online converter */}
-                        <Icon name="transfer" size={16} />
-                    </IconWrapper>
-
+                    <Icon name="arrowsLeftRight" size={20} margin={{ top: spacings.md }} />
                     <NumberInput
                         name={FIAT_INPUT}
                         control={control}
                         rules={fiatInputRules}
                         maxLength={formInputsMaxLength.fiat}
-                        innerAddon={<InputAddon>{localCurrency}</InputAddon>}
+                        innerAddon={<Text variant="tertiary">{localCurrency?.toUpperCase()}</Text>}
                         bottomText={getNonComposeErrorMessage(errors[FIAT_INPUT])}
                         inputState={getInputState(fiatError || cryptoError)}
                         onChange={value => {
@@ -102,6 +81,6 @@ export const Inputs = () => {
                     />
                 </>
             )}
-        </HStack>
+        </Row>
     );
 };
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Options.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Options.tsx
index 2e5969fc126..70a5b137fc5 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Options.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/Options.tsx
@@ -1,76 +1,66 @@
-import { useState } from 'react';
+import React from 'react';
+
 import styled from 'styled-components';
-import { FiatValue, FormattedCryptoAmount, Translation } from 'src/components/suite';
-import { Paragraph, Radio } from '@trezor/components';
-import { spacingsPx } from '@trezor/theme';
-import { Inputs } from './Inputs';
+
+import { Radio, Column, Row, Text } from '@trezor/components';
+import { spacings } from '@trezor/theme';
 import { NetworkSymbol } from '@suite-common/wallet-config';
-import { useSelector } from 'src/hooks/suite';
-import { useUnstakeEthFormContext } from 'src/hooks/wallet/useUnstakeEthForm';
-import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { getAccountEverstakeStakingPool } from '@suite-common/wallet-utils';
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const GreyP = styled(Paragraph)`
-    color: ${({ theme }) => theme.textSubdued};
-`;
-
-const RadioWrapper = styled.div`
-    & > div {
-        align-items: center;
-
-        & > div:nth-of-type(2) {
-            padding: 14px 0;
-            margin-left: ${spacingsPx.xxs};
-            border-bottom: 1px solid ${({ theme }) => theme.borderElevation2};
-            flex: 1 0 auto;
-        }
-    }
-`;
-
-const RadioWrapperLast = styled(RadioWrapper)`
-    & > div > div:nth-of-type(2) {
-        border-bottom: none;
-    }
-`;
-
-const RadioButtonLabelContent = styled.div`
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex: 1 0 auto;
-`;
-
-const RadioButtonLabelTxt = styled.div`
-    color: ${({ theme }) => theme.textDefault};
-`;
-
-const TxtRight = styled.div`
-    text-align: right;
-`;
+import { FiatValue, FormattedCryptoAmount, Translation } from 'src/components/suite';
+import { useSelector } from 'src/hooks/suite';
+import { useUnstakeEthFormContext } from 'src/hooks/wallet/useUnstakeEthForm';
+import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
+import type { TranslationKey } from 'src/components/suite/Translation';
 
-const GreenTxt = styled.span`
-    color: ${({ theme }) => theme.textPrimaryDefault};
-`;
+import { Inputs } from './Inputs';
 
 const InputsWrapper = styled.div<{ $isShown: boolean }>`
-    width: 100%;
-    margin-bottom: ${spacingsPx.sm};
     display: ${({ $isShown }) => ($isShown ? 'block' : 'none')};
 `;
 
-type UnstakeOptions = 'all' | 'rewards' | 'other';
+type RadioContentProps = {
+    label: TranslationKey;
+    cryptoAmount: string;
+    rewardAmount?: string;
+    fiatValueComponent?: React.ReactNode;
+    symbol: NetworkSymbol;
+};
 
-interface OptionsProps {
+const RadioContent = ({
+    label,
+    cryptoAmount,
+    rewardAmount,
+    fiatValueComponent,
+    symbol,
+}: RadioContentProps) => (
+    <Row flex="1" justifyContent="space-between" gap={spacings.sm}>
+        <Translation id={label} />
+        <Column alignItems="flex-end">
+            <Text variant="tertiary" typographyStyle="hint">
+                <FormattedCryptoAmount value={cryptoAmount} symbol={symbol} />
+            </Text>
+            <Text typographyStyle="hint">
+                {fiatValueComponent}
+                {rewardAmount && (
+                    <Text variant="primary">
+                        <FiatValue amount={rewardAmount} symbol={symbol} />
+                    </Text>
+                )}
+            </Text>
+        </Column>
+    </Row>
+);
+
+type OptionsProps = {
     symbol: NetworkSymbol;
-}
+};
 
 export const Options = ({ symbol }: OptionsProps) => {
     const selectedAccount = useSelector(selectSelectedAccount);
+    const { unstakeOption, setUnstakeOption } = useUnstakeEthFormContext();
 
-    const [unstakeOption, setUnstakeOption] = useState<UnstakeOptions>('all');
     const isRewardsSelected = unstakeOption === 'rewards';
     const isAllSelected = unstakeOption === 'all';
     const isOtherAmountSelected = unstakeOption === 'other';
@@ -83,9 +73,9 @@ export const Options = ({ symbol }: OptionsProps) => {
     } = getAccountEverstakeStakingPool(selectedAccount) ?? {};
 
     return (
-        <div>
-            {new BigNumber(restakedReward).gt(0) && (
-                <RadioWrapper>
+        <Column alignItems="stretch" gap={spacings.sm}>
+            <Column alignItems="stretch" gap={spacings.md} hasDivider>
+                {new BigNumber(restakedReward).gt(0) && (
                     <Radio
                         isChecked={isRewardsSelected}
                         onClick={async () => {
@@ -94,28 +84,17 @@ export const Options = ({ symbol }: OptionsProps) => {
                             setUnstakeOption('rewards');
                             await onOptionChange(restakedReward);
                         }}
+                        verticalAlignment="center"
                     >
-                        <RadioButtonLabelContent>
-                            <RadioButtonLabelTxt>
-                                <Translation id="TR_STAKE_ONLY_REWARDS" />
-                            </RadioButtonLabelTxt>
-
-                            <TxtRight>
-                                <GreyP>
-                                    <FormattedCryptoAmount value={restakedReward} symbol={symbol} />
-                                </GreyP>
-                                <Paragraph>
-                                    <GreenTxt>
-                                        <FiatValue amount={restakedReward} symbol={symbol} />
-                                    </GreenTxt>
-                                </Paragraph>
-                            </TxtRight>
-                        </RadioButtonLabelContent>
+                        <RadioContent
+                            label="TR_STAKE_ONLY_REWARDS"
+                            cryptoAmount={restakedReward}
+                            rewardAmount={restakedReward}
+                            symbol={symbol}
+                        />
                     </Radio>
-                </RadioWrapper>
-            )}
+                )}
 
-            <RadioWrapper>
                 <Radio
                     isChecked={isAllSelected}
                     onClick={async () => {
@@ -124,33 +103,21 @@ export const Options = ({ symbol }: OptionsProps) => {
                         setUnstakeOption('all');
                         await onOptionChange(autocompoundBalance);
                     }}
+                    verticalAlignment="center"
                 >
-                    <RadioButtonLabelContent>
-                        <RadioButtonLabelTxt>
-                            <Translation id="TR_ALL" />
-                        </RadioButtonLabelTxt>
-
-                        <TxtRight>
-                            <GreyP>
-                                <FormattedCryptoAmount
-                                    value={autocompoundBalance}
-                                    symbol={symbol}
-                                />
-                            </GreyP>
-                            <Paragraph>
-                                <FiatValue amount={depositedBalance} symbol={symbol}>
-                                    {({ value }) => value && <span>{value} + </span>}
-                                </FiatValue>
-                                <GreenTxt>
-                                    <FiatValue amount={restakedReward} symbol={symbol} />
-                                </GreenTxt>
-                            </Paragraph>
-                        </TxtRight>
-                    </RadioButtonLabelContent>
+                    <RadioContent
+                        label="TR_ALL"
+                        cryptoAmount={autocompoundBalance}
+                        rewardAmount={restakedReward}
+                        fiatValueComponent={
+                            <FiatValue amount={depositedBalance} symbol={symbol}>
+                                {({ value }) => value && <span>{value} + </span>}
+                            </FiatValue>
+                        }
+                        symbol={symbol}
+                    />
                 </Radio>
-            </RadioWrapper>
 
-            <RadioWrapperLast>
                 <Radio
                     isChecked={isOtherAmountSelected}
                     onClick={() => {
@@ -158,40 +125,31 @@ export const Options = ({ symbol }: OptionsProps) => {
 
                         setUnstakeOption('other');
                     }}
+                    verticalAlignment="center"
                 >
-                    <RadioButtonLabelContent>
-                        <RadioButtonLabelTxt>
-                            <Translation id="TR_STAKE_OTHER_AMOUNT" />
-                        </RadioButtonLabelTxt>
-
-                        <TxtRight>
-                            <GreyP>
-                                <FormattedCryptoAmount
-                                    value={autocompoundBalance}
-                                    symbol={symbol}
-                                />
-                            </GreyP>
-                            <Paragraph>
-                                <FiatValue amount={autocompoundBalance} symbol={symbol}>
-                                    {({ value }) =>
-                                        value && (
-                                            <>
-                                                {' '}
-                                                <Translation id="TR_UP_TO" /> {value}
-                                            </>
-                                        )
-                                    }
-                                </FiatValue>
-                            </Paragraph>
-                        </TxtRight>
-                    </RadioButtonLabelContent>
+                    <RadioContent
+                        label="TR_STAKE_OTHER_AMOUNT"
+                        cryptoAmount={autocompoundBalance}
+                        symbol={symbol}
+                        fiatValueComponent={
+                            <FiatValue amount={autocompoundBalance} symbol={symbol}>
+                                {({ value }) =>
+                                    value && (
+                                        <>
+                                            <Translation id="TR_UP_TO" /> {value}
+                                        </>
+                                    )
+                                }
+                            </FiatValue>
+                        }
+                    />
                 </Radio>
-            </RadioWrapperLast>
+            </Column>
 
             {/* CSS display property is used, as conditional rendering resets form state */}
             <InputsWrapper $isShown={isOtherAmountSelected}>
                 <Inputs />
             </InputsWrapper>
-        </div>
+        </Column>
     );
 };
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/UnstakeButton.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/UnstakeButton.tsx
new file mode 100644
index 00000000000..cc1ef2a9596
--- /dev/null
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/UnstakeButton.tsx
@@ -0,0 +1,41 @@
+import { Tooltip, Button } from '@trezor/components';
+
+import { Translation } from 'src/components/suite';
+import { useDevice } from 'src/hooks/suite';
+import { CRYPTO_INPUT, FIAT_INPUT } from 'src/types/wallet/stakeForms';
+import { useMessageSystemStaking } from 'src/hooks/suite/useMessageSystemStaking';
+import { useUnstakeEthFormContext } from 'src/hooks/wallet/useUnstakeEthForm';
+
+export const UnstakeButton = () => {
+    const { device, isLocked } = useDevice();
+    const { isUnstakingDisabled, unstakingMessageContent } = useMessageSystemStaking();
+
+    const {
+        isComposing,
+        formState: { isSubmitting, errors },
+        handleSubmit,
+        watch,
+        signTx,
+    } = useUnstakeEthFormContext();
+
+    const hasValues = Boolean(watch(FIAT_INPUT) || watch(CRYPTO_INPUT));
+    // used instead of formState.isValid, which is sometimes returning false even if there are no errors
+    const formIsValid = Object.keys(errors).length === 0;
+
+    const isDisabled =
+        !(formIsValid && hasValues) || isSubmitting || isLocked() || !device?.available;
+
+    return (
+        <Tooltip content={unstakingMessageContent}>
+            <Button
+                type="submit"
+                isDisabled={isDisabled || isUnstakingDisabled}
+                isLoading={isComposing || isSubmitting}
+                onClick={handleSubmit(signTx)}
+                icon={isUnstakingDisabled ? 'info' : undefined}
+            >
+                <Translation id="TR_STAKE_UNSTAKE" />
+            </Button>
+        </Tooltip>
+    );
+};
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/UnstakeEthForm.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/UnstakeEthForm.tsx
index 3605ef6ccf2..a73791d9b18 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/UnstakeEthForm.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/UnstakeEthForm.tsx
@@ -1,64 +1,36 @@
-import styled from 'styled-components';
-import { Button, Divider, Paragraph, Tooltip, Banner } from '@trezor/components';
-import { spacingsPx } from '@trezor/theme';
+import { InfoRow, Tooltip, Banner, Column, Card } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+import { selectValidatorsQueueData } from '@suite-common/wallet-core';
+import { getAccountEverstakeStakingPool } from '@suite-common/wallet-utils';
+import { BigNumber } from '@trezor/utils/src/bigNumber';
+
 import { Translation } from 'src/components/suite';
-import { useDevice, useSelector } from 'src/hooks/suite';
+import { useSelector } from 'src/hooks/suite';
+import { Fees } from 'src/components/wallet/Fees/Fees';
 import { useUnstakeEthFormContext } from 'src/hooks/wallet/useUnstakeEthForm';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 import { CRYPTO_INPUT, FIAT_INPUT } from 'src/types/wallet/stakeForms';
-import { Options } from './Options';
 import { getUnstakingPeriodInDays } from 'src/utils/suite/stake';
-import UnstakeFees from './Fees';
-import { selectValidatorsQueueData } from '@suite-common/wallet-core';
-import { getAccountEverstakeStakingPool } from '@suite-common/wallet-utils';
-import { useMessageSystemStaking } from 'src/hooks/suite/useMessageSystemStaking';
+import { ApproximateInstantEthAmount } from 'src/views/wallet/staking/components/EthStakingDashboard/components/ApproximateInstantEthAmount';
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const GreyP = styled(Paragraph)`
-    color: ${({ theme }) => theme.textSubdued};
-`;
-
-const DividerWrapper = styled.div`
-    & > div {
-        background: ${({ theme }) => theme.borderElevation2};
-        width: calc(100% + ${spacingsPx.xxl});
-        margin: 0 -${spacingsPx.md} ${spacingsPx.lg} -${spacingsPx.md};
-    }
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledWarning = styled(Banner)`
-    justify-content: flex-start;
-`;
-
-const WarningsWrapper = styled.div`
-    margin-bottom: ${spacingsPx.sm};
-    display: flex;
-    flex-direction: column;
-    gap: ${spacingsPx.md};
-`;
-
-const UpToDaysWrapper = styled.div`
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-top: 16px;
-    padding: ${spacingsPx.lg} 0 ${spacingsPx.md};
-    border-top: 1px solid ${({ theme }) => theme.borderElevation2};
-`;
+import { Options } from './Options';
 
 export const UnstakeEthForm = () => {
-    const { device, isLocked } = useDevice();
     const selectedAccount = useSelector(selectSelectedAccount);
-    const { isUnstakingDisabled, unstakingMessageContent } = useMessageSystemStaking();
 
     const {
         account,
-        isComposing,
-        formState: { isSubmitting, errors },
+        formState: { errors },
         handleSubmit,
-        watch,
         signTx,
+        approximatedInstantEthAmount,
+        register,
+        control,
+        setValue,
+        getValues,
+        changeFeeLevel,
+        feeInfo,
+        composedLevels,
     } = useUnstakeEthFormContext();
 
     const { symbol } = account;
@@ -67,70 +39,92 @@ export const UnstakeEthForm = () => {
         selectValidatorsQueueData(state, account?.symbol),
     );
     const unstakingPeriod = getUnstakingPeriodInDays(validatorWithdrawTime);
-    const hasValues = Boolean(watch(FIAT_INPUT) || watch(CRYPTO_INPUT));
-    // used instead of formState.isValid, which is sometimes returning false even if there are no errors
-    const formIsValid = Object.keys(errors).length === 0;
-
     const { canClaim = false, claimableAmount = '0' } =
         getAccountEverstakeStakingPool(selectedAccount) ?? {};
-    const isDisabled =
-        !(formIsValid && hasValues) || isSubmitting || isLocked() || !device?.available;
 
     const inputError = errors[CRYPTO_INPUT] || errors[FIAT_INPUT];
     const showError = inputError && inputError.type === 'compose';
+    const shouldShowInstantUnstakeEthAmount =
+        approximatedInstantEthAmount && BigNumber(approximatedInstantEthAmount).gt(0);
 
     return (
         <form onSubmit={handleSubmit(signTx)}>
-            {canClaim && (
-                <StyledWarning variant="info">
+            <Column alignItems="stretch" gap={spacings.xxl} margin={{ bottom: spacings.lg }}>
+                {canClaim && (
+                    <Banner variant="info">
+                        <Translation
+                            id="TR_STAKE_CAN_CLAIM_WARNING"
+                            values={{
+                                amount: claimableAmount,
+                                symbol: symbol.toUpperCase(),
+                                br: <br />,
+                            }}
+                        />
+                    </Banner>
+                )}
+
+                <Column alignItems="stretch" gap={spacings.lg}>
+                    <Options symbol={symbol} />
+                    {showError && <Banner variant="destructive">{inputError?.message}</Banner>}
+                </Column>
+
+                <Card paddingType="small" margin={{ vertical: spacings.xs }}>
+                    <Fees
+                        control={control}
+                        errors={errors}
+                        register={register}
+                        feeInfo={feeInfo}
+                        setValue={setValue}
+                        getValues={getValues}
+                        account={account}
+                        composedLevels={composedLevels}
+                        changeFeeLevel={changeFeeLevel}
+                        helperText={<Translation id="TR_STAKE_PAID_FROM_BALANCE" />}
+                        showFeeWhilePending={false}
+                    />
+                </Card>
+
+                <InfoRow
+                    label={<Translation id="TR_STAKE_UNSTAKING_PERIOD" />}
+                    labelTypographyStyle="body"
+                    direction="row"
+                >
                     <Translation
-                        id="TR_STAKE_CAN_CLAIM_WARNING"
+                        id="TR_UP_TO_DAYS"
                         values={{
-                            amount: claimableAmount,
-                            symbol: symbol.toUpperCase(),
-                            br: <br />,
+                            count: unstakingPeriod,
                         }}
                     />
-                </StyledWarning>
-            )}
-
-            <Options symbol={symbol} />
-
-            <WarningsWrapper>
-                {showError && (
-                    <StyledWarning variant="destructive">{inputError?.message}</StyledWarning>
+                </InfoRow>
+
+                {shouldShowInstantUnstakeEthAmount && (
+                    <InfoRow
+                        label={
+                            <Tooltip
+                                maxWidth={328}
+                                content={
+                                    <Translation id="TR_STAKE_UNSTAKING_APPROXIMATE_DESCRIPTION" />
+                                }
+                                hasIcon
+                            >
+                                <Translation
+                                    id="TR_STAKE_UNSTAKING_APPROXIMATE"
+                                    values={{
+                                        symbol: symbol.toUpperCase(),
+                                    }}
+                                />
+                            </Tooltip>
+                        }
+                        labelTypographyStyle="body"
+                        direction="row"
+                    >
+                        <ApproximateInstantEthAmount
+                            value={approximatedInstantEthAmount}
+                            symbol={symbol.toUpperCase()}
+                        />
+                    </InfoRow>
                 )}
-            </WarningsWrapper>
-
-            <DividerWrapper>
-                <Divider />
-            </DividerWrapper>
-
-            <UnstakeFees />
-
-            <UpToDaysWrapper>
-                <GreyP>
-                    <Translation id="TR_STAKE_UNSTAKING_PERIOD" />
-                </GreyP>
-                <Translation
-                    id="TR_UP_TO_DAYS"
-                    values={{
-                        count: unstakingPeriod,
-                    }}
-                />
-            </UpToDaysWrapper>
-            <Tooltip content={unstakingMessageContent}>
-                <Button
-                    type="submit"
-                    isFullWidth
-                    isDisabled={isDisabled || isUnstakingDisabled}
-                    isLoading={isComposing || isSubmitting}
-                    onClick={handleSubmit(signTx)}
-                    icon={isUnstakingDisabled ? 'info' : undefined}
-                >
-                    <Translation id="TR_STAKE_UNSTAKE" />
-                </Button>
-            </Tooltip>
+            </Column>
         </form>
     );
 };
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeModal.tsx
index 62df631d8f4..44b79ec0542 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeModal.tsx
@@ -1,32 +1,67 @@
-import styled from 'styled-components';
+import {
+    CollapsibleBox,
+    Column,
+    Grid,
+    H3,
+    List,
+    NewModal,
+    useMediaQuery,
+    variables,
+} from '@trezor/components';
+import { spacings } from '@trezor/theme';
+import { SelectedAccountLoaded } from '@suite-common/wallet-types';
+
 import { useSelector } from 'src/hooks/suite';
-import { Modal, Translation } from 'src/components/suite';
-import { UnstakeModalContent } from './UnstakeModalContent';
+import { Translation } from 'src/components/suite';
+import { UnstakingInfo } from 'src/components/suite/StakingProcess/UnstakingInfo';
+import { UnstakeEthFormContext, useUnstakeEthForm } from 'src/hooks/wallet/useUnstakeEthForm';
 
-const StyledModal = styled(Modal)`
-    width: 512px;
-    text-align: left;
-`;
+import { UnstakeButton } from './UnstakeEthForm/UnstakeButton';
+import { UnstakeEthForm } from './UnstakeEthForm/UnstakeEthForm';
 
 interface UnstakeModalModalProps {
     onCancel?: () => void;
 }
 
 export const UnstakeModal = ({ onCancel }: UnstakeModalModalProps) => {
-    const selectedAccount = useSelector(state => state.wallet.selectedAccount);
+    const selectedAccount = useSelector(
+        state => state.wallet.selectedAccount,
+    ) as SelectedAccountLoaded;
+    const unstakeEthContextValues = useUnstakeEthForm({ selectedAccount });
+    const isBelowTablet = useMediaQuery(`(max-width: ${variables.SCREEN_SIZE.MD})`);
 
     const { account, status } = selectedAccount;
     // it shouldn't be possible to open this modal without having selected account
     if (!account || status !== 'loaded') return null;
 
     return (
-        <StyledModal
-            isCancelable
-            heading={<Translation id="TR_STAKE_UNSTAKE" />}
-            subheading={<Translation id="TR_STAKE_CLAIM_AFTER_UNSTAKING" />}
-            onCancel={onCancel}
-        >
-            <UnstakeModalContent selectedAccount={selectedAccount} />
-        </StyledModal>
+        <UnstakeEthFormContext.Provider value={unstakeEthContextValues}>
+            <NewModal
+                size="huge"
+                heading={<Translation id="TR_STAKE_UNSTAKE" />}
+                description={<Translation id="TR_STAKE_CLAIM_AFTER_UNSTAKING" />}
+                onCancel={onCancel}
+                bottomContent={<UnstakeButton />}
+            >
+                <Grid columns={isBelowTablet ? 1 : 2} gap={spacings.xxl}>
+                    <UnstakeEthForm />
+                    <Column alignItems="stretch" gap={spacings.lg}>
+                        <CollapsibleBox
+                            heading={
+                                <H3 typographyStyle="highlight">
+                                    <Translation id="TR_STAKE_UNSTAKING_PROCESS" />
+                                </H3>
+                            }
+                            hasDivider={false}
+                            defaultIsOpen
+                        >
+                            <List isOrdered bulletGap={spacings.sm} gap={spacings.md}>
+                                <UnstakingInfo isExpanded />
+                            </List>
+                        </CollapsibleBox>
+                    </Column>
+                </Grid>
+            </NewModal>
+        </UnstakeEthFormContext.Provider>
     );
 };
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeModalContent.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeModalContent.tsx
deleted file mode 100644
index 4201fd114dc..00000000000
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeModalContent.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { UnstakeEthFormContext, useUnstakeEthForm } from 'src/hooks/wallet/useUnstakeEthForm';
-import { SelectedAccountLoaded } from '@suite-common/wallet-types';
-import { UnstakeEthForm } from './UnstakeEthForm/UnstakeEthForm';
-
-interface UnstakeModalContentProps {
-    selectedAccount: SelectedAccountLoaded;
-}
-
-export const UnstakeModalContent = ({ selectedAccount }: UnstakeModalContentProps) => {
-    const unstakeEthContextValues = useUnstakeEthForm({ selectedAccount });
-
-    return (
-        <UnstakeEthFormContext.Provider value={unstakeEthContextValues}>
-            <UnstakeEthForm />
-        </UnstakeEthFormContext.Provider>
-    );
-};
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UserContextModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UserContextModal.tsx
index 4d757eb60bc..7295accb954 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UserContextModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/UserContextModal.tsx
@@ -1,3 +1,5 @@
+import { CryptoId } from 'invity-api';
+
 import { onCancel as onCancelAction } from 'src/actions/suite/modalActions';
 import { MODAL } from 'src/actions/suite/constants';
 import { useDispatch } from 'src/hooks/suite';
@@ -42,8 +44,8 @@ import {
     ConfirmUnverifiedProceedModal,
 } from 'src/components/suite/modals';
 import type { AcquiredDevice } from 'src/types/suite';
+
 import type { ReduxModalProps } from '../ReduxModal';
-import { CryptoId } from 'invity-api';
 import { EverstakeModal } from './UnstakeModal/EverstakeModal';
 import { PassphraseMismatchModal } from './PassphraseMismatchModal';
 import { FirmwareRevisionOptOutModal } from './FirmwareRevisionOptOutModal';
diff --git a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/WipeDeviceModal.tsx b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/WipeDeviceModal.tsx
index f80559b7073..02671cd3864 100644
--- a/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/WipeDeviceModal.tsx
+++ b/packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/WipeDeviceModal.tsx
@@ -1,9 +1,11 @@
 import { useState } from 'react';
+
 import { NewModal, Card, Column, H3, Paragraph } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { Translation, CheckItem } from 'src/components/suite';
 import { wipeDevice } from 'src/actions/settings/deviceSettingsActions';
 import { useDevice, useDispatch } from 'src/hooks/suite';
-import { spacings } from '@trezor/theme';
 
 type WipeDeviceModalProps = {
     onCancel: () => void;
@@ -23,7 +25,7 @@ export const WipeDeviceModal = ({ onCancel }: WipeDeviceModalProps) => {
         <NewModal
             onCancel={onCancel}
             variant="destructive"
-            icon="shieldWarning"
+            iconName="shieldWarning"
             size="small"
             bottomContent={
                 <>
diff --git a/packages/suite/src/components/suite/modals/index.tsx b/packages/suite/src/components/suite/modals/index.tsx
index 48d18ddb940..ec560a00949 100644
--- a/packages/suite/src/components/suite/modals/index.tsx
+++ b/packages/suite/src/components/suite/modals/index.tsx
@@ -2,7 +2,6 @@ export { PinModal } from './ReduxModal/DeviceContextModal/PinModal';
 export { PinInvalidModal } from './ReduxModal/DeviceContextModal/PinInvalidModal';
 export { PinMismatchModal } from './ReduxModal/UserContextModal/PinMismatchModal';
 export { PassphraseModal } from './ReduxModal/DeviceContextModal/PassphraseModal';
-export { PassphraseSourceModal } from './ReduxModal/DeviceContextModal/PassphraseSourceModal';
 export { PassphraseOnDeviceModal } from './ReduxModal/DeviceContextModal/PassphraseOnDeviceModal';
 export { PassphraseDuplicateModal } from './ReduxModal/UserContextModal/PassphraseDuplicateModal';
 export { ConfirmActionModal } from './ReduxModal/DeviceContextModal/ConfirmActionModal';
diff --git a/packages/suite/src/components/suite/notifications/NotificationRenderer/CoinProtocolRenderer.tsx b/packages/suite/src/components/suite/notifications/NotificationRenderer/CoinProtocolRenderer.tsx
index 5a555071c3d..4c224974b92 100644
--- a/packages/suite/src/components/suite/notifications/NotificationRenderer/CoinProtocolRenderer.tsx
+++ b/packages/suite/src/components/suite/notifications/NotificationRenderer/CoinProtocolRenderer.tsx
@@ -1,15 +1,17 @@
 import { useRouteMatch } from 'react-router-dom';
+
 import styled from 'styled-components';
 
 import { CoinLogo } from '@trezor/product-components';
 import { capitalizeFirstLetter } from '@trezor/utils';
+import { getNetworkSymbolForProtocol } from '@suite-common/suite-utils';
+import { NetworkSymbol } from '@suite-common/wallet-config';
 
 import { fillSendForm, resetProtocol } from 'src/actions/suite/protocolActions';
 import { Translation } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
-import { PROTOCOL_TO_NETWORK } from 'src/constants/suite/protocol';
 import type { NotificationRendererProps } from 'src/components/suite';
-import { NetworkSymbol } from '@suite-common/wallet-config';
+
 import { ConditionalActionRenderer } from './ConditionalActionRenderer';
 
 const Row = styled.span`
@@ -30,7 +32,10 @@ export const CoinProtocolRenderer = ({
     notification,
 }: NotificationRendererProps<'coin-scheme-protocol'>) => {
     const dispatch = useDispatch();
-    const allowed = useActionAllowed('/accounts/send', PROTOCOL_TO_NETWORK[notification.scheme]);
+    const allowed = useActionAllowed(
+        '/accounts/send',
+        getNetworkSymbolForProtocol(notification.scheme),
+    );
 
     const onAction = () => dispatch(fillSendForm(true));
     const onCancel = () => dispatch(resetProtocol);
@@ -53,7 +58,7 @@ export const CoinProtocolRenderer = ({
             actionAllowed={allowed}
             onAction={onAction}
             onCancel={onCancel}
-            icon={getIcon(PROTOCOL_TO_NETWORK[notification.scheme])}
+            icon={getIcon(getNetworkSymbolForProtocol(notification.scheme))}
         />
     );
 };
diff --git a/packages/suite/src/components/suite/notifications/NotificationRenderer/ConditionalActionRenderer.tsx b/packages/suite/src/components/suite/notifications/NotificationRenderer/ConditionalActionRenderer.tsx
index 183fd6a24ec..ed48fb92f5f 100644
--- a/packages/suite/src/components/suite/notifications/NotificationRenderer/ConditionalActionRenderer.tsx
+++ b/packages/suite/src/components/suite/notifications/NotificationRenderer/ConditionalActionRenderer.tsx
@@ -1,7 +1,9 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
 
 import { variables } from '@trezor/components';
+
 import type { ExtendedMessageDescriptor } from 'src/types/suite';
 import type { NotificationRendererProps } from 'src/components/suite';
 
diff --git a/packages/suite/src/components/suite/notifications/NotificationRenderer/NotificationRenderer.tsx b/packages/suite/src/components/suite/notifications/NotificationRenderer/NotificationRenderer.tsx
index 5f2e25e88b6..365d1b59540 100644
--- a/packages/suite/src/components/suite/notifications/NotificationRenderer/NotificationRenderer.tsx
+++ b/packages/suite/src/components/suite/notifications/NotificationRenderer/NotificationRenderer.tsx
@@ -7,6 +7,7 @@ import { DEVICE } from '@trezor/connect';
 
 import { NotificationViewProps } from 'src/components/suite';
 import type { ExtendedMessageDescriptor } from 'src/types/suite';
+
 import { ActionRenderer } from './ActionRenderer';
 import { TransactionRenderer } from './TransactionRenderer';
 import { CoinProtocolRenderer } from './CoinProtocolRenderer';
@@ -161,6 +162,11 @@ export const NotificationRenderer = ({
             return error(render, notification, 'TOAST_QR_INCORRECT_COIN_SCHEME_PROTOCOL', {
                 coin: notification.coin,
             });
+        case 'qr-unknown-scheme-protocol':
+            return error(render, notification, 'TOAST_QR_UNKNOWN_SCHEME_PROTOCOL', {
+                scheme: notification.scheme,
+                error: notification.error,
+            });
         case 'tor-toggle-error':
             return error(render, notification, notification.error);
         case 'tor-is-slow':
diff --git a/packages/suite/src/components/suite/notifications/NotificationRenderer/TransactionRenderer.tsx b/packages/suite/src/components/suite/notifications/NotificationRenderer/TransactionRenderer.tsx
index a2804f34b9e..740ea0e67b5 100644
--- a/packages/suite/src/components/suite/notifications/NotificationRenderer/TransactionRenderer.tsx
+++ b/packages/suite/src/components/suite/notifications/NotificationRenderer/TransactionRenderer.tsx
@@ -13,6 +13,7 @@ import {
     getAccountTransactions,
     findTransaction,
     getConfirmations,
+    isStakeTypeTx,
 } from '@suite-common/wallet-utils';
 
 import {
@@ -24,7 +25,6 @@ import {
 import { goto } from 'src/actions/suite/routerActions';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { getTxAnchor } from 'src/utils/suite/anchor';
-import { isStakeTypeTx } from '@suite-common/suite-utils';
 
 type TransactionRendererProps = NotificationViewProps &
     NotificationRendererProps<
diff --git a/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationGroup.tsx b/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationGroup.tsx
index 0c796aa6257..df7f2edde53 100644
--- a/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationGroup.tsx
+++ b/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationGroup.tsx
@@ -1,9 +1,11 @@
 import styled from 'styled-components';
 
 import { variables, Paragraph } from '@trezor/components';
+
 import { AppState } from 'src/types/suite';
 import { Translation } from 'src/components/suite';
 import { getSeenAndUnseenNotifications } from 'src/utils/suite/notification';
+
 import { NotificationList } from './NotificationList/NotificationList';
 
 const SectionHeadline = styled.div`
diff --git a/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationList.tsx b/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationList.tsx
index 4c04af52d84..018e23df37a 100644
--- a/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationList.tsx
+++ b/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationList.tsx
@@ -1,9 +1,10 @@
 import styled from 'styled-components';
 
 import { NotificationRenderer } from 'src/components/suite';
-import { NotificationView } from './NotificationView';
 import type { AppState } from 'src/types/suite';
 
+import { NotificationView } from './NotificationView';
+
 const Wrapper = styled.div`
     display: flex;
     flex: 1;
diff --git a/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationView.tsx b/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationView.tsx
index 703da68c10c..8a2b65397c4 100644
--- a/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationView.tsx
+++ b/packages/suite/src/components/suite/notifications/Notifications/NotificationGroup/NotificationList/NotificationView.tsx
@@ -2,6 +2,7 @@ import styled from 'styled-components';
 
 import type { NotificationEntry } from '@suite-common/toast-notifications';
 import { Button, Icon, ButtonProps, Paragraph, IconName } from '@trezor/components';
+
 import { Translation, FormattedDateWithBullet } from 'src/components/suite';
 import { getNotificationIcon } from 'src/utils/suite/notification';
 import { useLayoutSize } from 'src/hooks/suite';
diff --git a/packages/suite/src/components/suite/notifications/Notifications/Notifications.tsx b/packages/suite/src/components/suite/notifications/Notifications/Notifications.tsx
index 36724213ffc..158bf2a30e9 100644
--- a/packages/suite/src/components/suite/notifications/Notifications/Notifications.tsx
+++ b/packages/suite/src/components/suite/notifications/Notifications/Notifications.tsx
@@ -1,9 +1,13 @@
-import { useSelector } from 'src/hooks/suite';
-import { Icon, variables } from '@trezor/components';
 import { useState } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
+import { Icon, variables } from '@trezor/components';
+
+import { useSelector } from 'src/hooks/suite';
 import { Translation } from 'src/components/suite';
 import { SETTINGS } from 'src/config/suite';
+
 import { NotificationGroup } from './NotificationGroup/NotificationGroup';
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/components/suite/notifications/ToastContainer.tsx b/packages/suite/src/components/suite/notifications/ToastContainer.tsx
index d5c2b815ede..d3a001ab955 100644
--- a/packages/suite/src/components/suite/notifications/ToastContainer.tsx
+++ b/packages/suite/src/components/suite/notifications/ToastContainer.tsx
@@ -1,6 +1,7 @@
-import styled from 'styled-components';
 import { ToastContainer as BaseToastContainer, Slide } from 'react-toastify';
 
+import styled from 'styled-components';
+
 import { borders, zIndices } from '@trezor/theme';
 
 // A set of required styles copied from 'react-toastify/dist/ReactToastify.css'
diff --git a/packages/suite/src/components/suite/notifications/ToastNotification.tsx b/packages/suite/src/components/suite/notifications/ToastNotification.tsx
index 57c80c4fed0..eb948b0c211 100644
--- a/packages/suite/src/components/suite/notifications/ToastNotification.tsx
+++ b/packages/suite/src/components/suite/notifications/ToastNotification.tsx
@@ -1,12 +1,16 @@
 import { useLayoutEffect, useRef, useState } from 'react';
+
 import styled, { css, useTheme } from 'styled-components';
+
 import { Button, Icon, variables } from '@trezor/components';
-import { NotificationRenderer, NotificationViewProps, Translation } from 'src/components/suite';
 import { notificationsActions, NotificationEntry } from '@suite-common/toast-notifications';
+import { spacings } from '@trezor/theme';
+
+import { NotificationRenderer, NotificationViewProps, Translation } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite';
 import { getNotificationIcon, getVariantColor } from 'src/utils/suite/notification';
+
 import { ToastNotificationVariant } from '../../../types/suite';
-import { spacings } from '@trezor/theme';
 
 const Wrapper = styled.div<{ $variant: ToastNotificationVariant; $isTall: boolean }>`
     display: flex;
diff --git a/packages/suite/src/components/suite/section/SectionItem.tsx b/packages/suite/src/components/suite/section/SectionItem.tsx
index 746baf99f23..30bc92a1a02 100644
--- a/packages/suite/src/components/suite/section/SectionItem.tsx
+++ b/packages/suite/src/components/suite/section/SectionItem.tsx
@@ -1,8 +1,10 @@
 import { forwardRef, HTMLAttributes } from 'react';
+
 import styled from 'styled-components';
 
 import { borders, spacingsPx } from '@trezor/theme';
 import { variables } from '@trezor/components';
+
 import { anchorOutlineStyles } from 'src/utils/suite/anchor';
 import { SUBPAGE_NAV_HEIGHT } from 'src/constants/suite/layout';
 
diff --git a/packages/suite/src/components/suite/section/TextColumn.tsx b/packages/suite/src/components/suite/section/TextColumn.tsx
index 5041deb73a3..55af93f4eaf 100644
--- a/packages/suite/src/components/suite/section/TextColumn.tsx
+++ b/packages/suite/src/components/suite/section/TextColumn.tsx
@@ -1,4 +1,5 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
 
 import { variables } from '@trezor/components';
diff --git a/packages/suite/src/components/suite/section/sectionStyles.tsx b/packages/suite/src/components/suite/section/sectionStyles.tsx
index eef1a184d07..59036d45380 100644
--- a/packages/suite/src/components/suite/section/sectionStyles.tsx
+++ b/packages/suite/src/components/suite/section/sectionStyles.tsx
@@ -1,4 +1,5 @@
 import styled, { css } from 'styled-components';
+
 import { Select, variables, Button, SelectProps, ButtonProps } from '@trezor/components';
 
 const { SCREEN_SIZE } = variables;
diff --git a/packages/suite/src/components/suite/styled.ts b/packages/suite/src/components/suite/styled.ts
index 50f818da30e..0f1ed45cfe4 100644
--- a/packages/suite/src/components/suite/styled.ts
+++ b/packages/suite/src/components/suite/styled.ts
@@ -1,16 +1,5 @@
 import styled from 'styled-components';
 
-export const IconBorderedWrapper = styled.div`
-    border: 9px solid ${({ theme }) => theme.backgroundPrimarySubtleOnElevation0};
-    background: ${({ theme }) => theme.backgroundPrimarySubtleOnElevation1};
-    width: 80px;
-    height: 80px;
-    border-radius: 50%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-`;
-
 export const Divider = styled.div`
     display: flex;
     margin-bottom: 64px;
diff --git a/packages/suite/src/components/suite/troubleshooting/TroubleshootingTips.tsx b/packages/suite/src/components/suite/troubleshooting/TroubleshootingTips.tsx
index 3e80d805992..4ba64920a12 100644
--- a/packages/suite/src/components/suite/troubleshooting/TroubleshootingTips.tsx
+++ b/packages/suite/src/components/suite/troubleshooting/TroubleshootingTips.tsx
@@ -1,12 +1,16 @@
 import { useMemo, ReactNode } from 'react';
+
 import styled from 'styled-components';
-import { Translation, TrezorLink } from 'src/components/suite';
+
 import { variables, Button, CollapsibleBox, useElevation } from '@trezor/components';
 import { TREZOR_SUPPORT_DEVICE_URL } from '@trezor/urls';
 import TrezorConnect from '@trezor/connect';
+import type TrezorConnectWeb from '@trezor/connect-web';
 import { isAndroid } from '@trezor/env-utils';
 import { Elevation, mapElevationToBorder } from '@trezor/theme';
 
+import { Translation, TrezorLink } from 'src/components/suite';
+
 const ItemLabel = styled.span`
     color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
     font-size: ${variables.FONT_SIZE.SMALL};
@@ -134,7 +138,7 @@ export const TroubleshootingTips = ({
                 <StyledButton
                     variant="tertiary"
                     data-testid="@onboarding/try-bridge-button"
-                    onClick={() => TrezorConnect.disableWebUSB()}
+                    onClick={() => (TrezorConnect as typeof TrezorConnectWeb).disableWebUSB()}
                 >
                     <Translation id="TR_DISABLE_WEBUSB_TRY_BRIDGE" />
                 </StyledButton>
diff --git a/packages/suite/src/components/suite/troubleshooting/tips/BridgeTip.tsx b/packages/suite/src/components/suite/troubleshooting/tips/BridgeTip.tsx
index 662718c2968..0e3180a70ee 100644
--- a/packages/suite/src/components/suite/troubleshooting/tips/BridgeTip.tsx
+++ b/packages/suite/src/components/suite/troubleshooting/tips/BridgeTip.tsx
@@ -5,14 +5,16 @@ import { typography } from '@trezor/theme';
 import { TrezorLink } from 'src/components/suite';
 import { Translation } from 'src/components/suite/Translation';
 import { useOpenSuiteDesktop } from 'src/hooks/suite/useOpenSuiteDesktop';
+import { useBridgeDesktopApi } from 'src/hooks/suite/useBridgeDesktopApi';
+import { useSelector } from 'src/hooks/suite';
 
-const Wrapper = styled.div`
+export const Wrapper = styled.div`
     a {
         ${typography.hint};
     }
 `;
 
-export const BridgeInstall = () => {
+export const SuiteDesktopTip = () => {
     const handleClick = useOpenSuiteDesktop();
 
     return (
@@ -45,3 +47,34 @@ export const BridgeStatus = () => (
         />
     </Wrapper>
 );
+
+export const BridgeToggle = () => {
+    const { changeBridgeSettings, bridgeSettings } = useBridgeDesktopApi();
+    const transport = useSelector(state => state.suite.transport);
+
+    if (!bridgeSettings) return null;
+
+    return (
+        <Wrapper>
+            <Translation
+                id="TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_DESCRIPTION"
+                values={{
+                    currentVersion: transport?.version,
+                    a: chunks => (
+                        <TrezorLink
+                            variant="underline"
+                            onClick={() => {
+                                changeBridgeSettings({
+                                    ...bridgeSettings,
+                                    legacy: !bridgeSettings?.legacy,
+                                });
+                            }}
+                        >
+                            {chunks}
+                        </TrezorLink>
+                    ),
+                }}
+            />
+        </Wrapper>
+    );
+};
diff --git a/packages/suite/src/components/suite/troubleshooting/tips/UdevDescription.tsx b/packages/suite/src/components/suite/troubleshooting/tips/UdevDescription.tsx
index 6bbcbe8151a..7009d1f3084 100644
--- a/packages/suite/src/components/suite/troubleshooting/tips/UdevDescription.tsx
+++ b/packages/suite/src/components/suite/troubleshooting/tips/UdevDescription.tsx
@@ -1,9 +1,11 @@
+import styled from 'styled-components';
+
+import { typography } from '@trezor/theme';
+
 import { TrezorLink } from 'src/components/suite';
 import { Translation } from 'src/components/suite/Translation';
 import { useDispatch } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
-import { typography } from '@trezor/theme';
-import styled from 'styled-components';
 
 const Wrapper = styled.div`
     a {
diff --git a/packages/suite/src/components/suite/troubleshooting/tips/index.tsx b/packages/suite/src/components/suite/troubleshooting/tips/index.tsx
index ed9872d153c..81b2fe20555 100644
--- a/packages/suite/src/components/suite/troubleshooting/tips/index.tsx
+++ b/packages/suite/src/components/suite/troubleshooting/tips/index.tsx
@@ -1,9 +1,10 @@
-import { isWeb, isLinux, isAndroid } from '@trezor/env-utils';
+import { isWeb, isDesktop, isLinux, isAndroid } from '@trezor/env-utils';
+import { TREZOR_SUPPORT_DEVICE_URL } from '@trezor/urls';
 
+import { TrezorLink } from 'src/components/suite';
 import { Translation } from 'src/components/suite/Translation';
-import { isWebUsb } from 'src/utils/suite/transport';
 
-import { BridgeStatus, BridgeInstall } from './BridgeTip';
+import { BridgeStatus, SuiteDesktopTip, BridgeToggle, Wrapper } from './BridgeTip';
 import { UdevDescription } from './UdevDescription';
 
 export const TROUBLESHOOTING_TIP_BRIDGE_STATUS = {
@@ -17,16 +18,42 @@ export const TROUBLESHOOTING_TIP_WEBUSB_ENVIRONMENT = {
     key: 'webusb-environment',
     heading: <Translation id="TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_TITLE" />,
     description: <Translation id="TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION" />,
-    hide: isWebUsb() || !isWeb(),
+    hide: !isWeb(),
+};
+
+export const TROUBLESHOOTING_TIP_UNREADABLE_HID = {
+    key: 'unreadable-hid',
+    heading: <Translation id="TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_TITLE" />,
+    description: (
+        <Wrapper>
+            <Translation
+                id="TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_DESCRIPTION"
+                values={{
+                    a: chunks => (
+                        <TrezorLink variant="underline" href={TREZOR_SUPPORT_DEVICE_URL}>
+                            {chunks}
+                        </TrezorLink>
+                    ),
+                }}
+            />
+        </Wrapper>
+    ),
 };
 
 export const TROUBLESHOOTING_TIP_SUITE_DESKTOP = {
     key: 'suite-desktop',
     heading: <Translation id="TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE" />,
-    description: <BridgeInstall />,
+    description: <SuiteDesktopTip />,
     hide: !isWeb(),
 };
 
+export const TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE = {
+    key: 'suite-desktop',
+    heading: <Translation id="TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_TITLE" />,
+    description: <BridgeToggle />,
+    hide: isWeb() || isAndroid(),
+};
+
 export const TROUBLESHOOTING_TIP_CABLE = {
     key: 'cable',
     heading: <Translation id="TR_TROUBLESHOOTING_TIP_CABLE_TITLE" />,
@@ -58,3 +85,17 @@ export const TROUBLESHOOTING_TIP_UDEV = {
     description: <UdevDescription />,
     hide: !isLinux(),
 };
+
+export const TROUBLESHOOTING_TIP_RECONNECT = {
+    key: 'device-reconnect',
+    heading: <Translation id="TR_RECONNECT_YOUR_DEVICE" />,
+    description: (
+        <Translation
+            id={
+                isDesktop()
+                    ? 'TR_RECONNECT_DEVICE_DESCRIPTION_DESKTOP'
+                    : 'TR_RECONNECT_DEVICE_DESCRIPTION'
+            }
+        />
+    ),
+};
diff --git a/packages/suite/src/components/wallet/AccountExceptionLayout.tsx b/packages/suite/src/components/wallet/AccountExceptionLayout.tsx
index 495bd9347e3..654f958b42c 100644
--- a/packages/suite/src/components/wallet/AccountExceptionLayout.tsx
+++ b/packages/suite/src/components/wallet/AccountExceptionLayout.tsx
@@ -1,86 +1,51 @@
-import { ReactText } from 'react';
-import styled from 'styled-components';
+import React, { ReactNode } from 'react';
+
 import {
-    variables,
     H2,
     Button,
     Card,
     ButtonProps,
-    Image,
-    ImageProps,
     Column,
+    Row,
+    Paragraph,
+    Divider,
+    IconName,
+    IconCircle,
+    IconCircleVariant,
 } from '@trezor/components';
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const Title = styled(H2)`
-    text-align: center;
-    font-weight: 600;
-    margin-bottom: 16px;
-`;
-
-const Description = styled.span`
-    font-size: ${variables.FONT_SIZE.NORMAL};
-    font-weight: 500;
-    text-align: center;
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledImage = styled(Image)`
-    width: auto;
-    height: 80px;
-    margin-top: 60px;
-    margin-bottom: 28px;
-`;
-
-const Actions = styled.div`
-    display: flex;
-    justify-content: center;
-    width: 100%;
-    margin-bottom: 20px;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const ActionButton = styled(Button)`
-    min-width: 160px;
-
-    & + & {
-        margin-left: 20px;
-    }
-`;
-
-const Divider = styled.div`
-    width: 100%;
-    height: 1px;
-    background: ${({ theme }) => theme.legacy.STROKE_GREY};
-    margin: 30px 0 36px;
-`;
+import { spacings } from '@trezor/theme';
 
 interface AccountExceptionLayoutProps {
-    title: JSX.Element | string;
-    description?: JSX.Element | string;
-    image?: Extract<ImageProps, { image: any }>['image'];
-    imageComponent?: JSX.Element;
-    actions?: ({ key: ReactText } & ButtonProps)[];
-    actionComponent?: JSX.Element;
+    title: ReactNode;
+    description?: ReactNode;
+    iconName?: IconName;
+    iconVariant?: IconCircleVariant;
+    actions?: ({ key: string } & ButtonProps)[];
 }
 
 export const AccountExceptionLayout = (props: AccountExceptionLayoutProps) => (
-    <Card width="100%">
-        <Column alignItems="center">
-            {props.image && <StyledImage image={props.image} />}
-            {props.imageComponent && props.imageComponent}
-            <Title>{props.title}</Title>
-            <Description>{props.description}</Description>
-            {(props.actionComponent || (props.actions && props.actions.length > 0)) && (
+    <Card>
+        <Column>
+            {props.iconName && props.iconVariant && (
+                <IconCircle
+                    name={props.iconName}
+                    variant={props.iconVariant}
+                    size="extraLarge"
+                    margin={{ top: spacings.xxl, bottom: spacings.xl }}
+                />
+            )}
+            <H2>{props.title}</H2>
+            <Paragraph variant="tertiary" typographyStyle="hint" margin={{ top: spacings.xs }}>
+                {props.description}
+            </Paragraph>
+            {props.actions && (
                 <>
-                    <Divider />
-                    <Actions>
+                    <Divider margin={{ top: spacings.xxl, bottom: spacings.xxl }} />
+                    <Row justifyContent="center" gap={spacings.md} margin={{ bottom: spacings.md }}>
                         {props.actions?.map(action => (
-                            <ActionButton {...action} key={action.key} />
+                            <Button minWidth={160} {...action} key={action.key} />
                         ))}
-                        {props.actionComponent && props.actionComponent}
-                    </Actions>
+                    </Row>
                 </>
             )}
         </Column>
diff --git a/packages/suite/src/components/wallet/AnimationWrapper.tsx b/packages/suite/src/components/wallet/AnimationWrapper.tsx
index b12f610fc18..e0ffcae3751 100644
--- a/packages/suite/src/components/wallet/AnimationWrapper.tsx
+++ b/packages/suite/src/components/wallet/AnimationWrapper.tsx
@@ -1,4 +1,5 @@
 import { ReactNode, ReactText } from 'react';
+
 import { AnimatePresence, motion } from 'framer-motion';
 
 interface AnimationWrapperProps {
diff --git a/packages/suite/src/components/wallet/CoinjoinAccountDiscoveryProgress/CoinjoinAccountDiscoveryProgress.tsx b/packages/suite/src/components/wallet/CoinjoinAccountDiscoveryProgress/CoinjoinAccountDiscoveryProgress.tsx
index 26e2e692b84..f295a9a905a 100644
--- a/packages/suite/src/components/wallet/CoinjoinAccountDiscoveryProgress/CoinjoinAccountDiscoveryProgress.tsx
+++ b/packages/suite/src/components/wallet/CoinjoinAccountDiscoveryProgress/CoinjoinAccountDiscoveryProgress.tsx
@@ -1,4 +1,5 @@
 import { useMemo } from 'react';
+
 import styled, { useTheme } from 'styled-components';
 
 import {
@@ -11,12 +12,14 @@ import {
     variables,
 } from '@trezor/components';
 import { localizeNumber } from '@suite-common/wallet-utils';
+import { spacings } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import { useCoinjoinAccountLoadingProgress } from 'src/hooks/coinjoin';
-import { RotatingFacts } from './RotatingFacts';
 import { useSelector } from 'src/hooks/suite';
 import { selectLanguage } from 'src/reducers/suite/suiteReducer';
-import { spacings } from '@trezor/theme';
+
+import { RotatingFacts } from './RotatingFacts';
 
 const Subheader = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/wallet/CoinjoinAccountDiscoveryProgress/RotatingFacts.tsx b/packages/suite/src/components/wallet/CoinjoinAccountDiscoveryProgress/RotatingFacts.tsx
index dd6db8d9e50..3258cd2992b 100644
--- a/packages/suite/src/components/wallet/CoinjoinAccountDiscoveryProgress/RotatingFacts.tsx
+++ b/packages/suite/src/components/wallet/CoinjoinAccountDiscoveryProgress/RotatingFacts.tsx
@@ -1,7 +1,10 @@
 import { useEffect, useState } from 'react';
+
 import styled from 'styled-components';
 import { AnimatePresence, motion } from 'framer-motion';
+
 import { motionEasing, variables } from '@trezor/components';
+
 import { Translation, TranslationKey } from 'src/components/suite/Translation';
 
 const Fact = styled(motion.p)`
diff --git a/packages/suite/src/components/wallet/DiscoveryProgress.tsx b/packages/suite/src/components/wallet/DiscoveryProgress.tsx
index f089f5b7cfb..0123aca49a2 100644
--- a/packages/suite/src/components/wallet/DiscoveryProgress.tsx
+++ b/packages/suite/src/components/wallet/DiscoveryProgress.tsx
@@ -1,9 +1,10 @@
 import styled from 'styled-components';
 
-import { useDiscovery } from 'src/hooks/suite';
 import { ProgressBar } from '@trezor/components';
 import { zIndices } from '@trezor/theme';
 
+import { useDiscovery } from 'src/hooks/suite';
+
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledProgressBar = styled(ProgressBar)`
     height: 0;
diff --git a/packages/suite/src/components/wallet/EvmExplanationBox.tsx b/packages/suite/src/components/wallet/EvmExplanationBox.tsx
index 5ef8a992c2c..eb51155a74b 100644
--- a/packages/suite/src/components/wallet/EvmExplanationBox.tsx
+++ b/packages/suite/src/components/wallet/EvmExplanationBox.tsx
@@ -1,8 +1,10 @@
+import { HTMLAttributes, ReactNode, forwardRef } from 'react';
+
+import styled, { css } from 'styled-components';
+
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { Card, CardProps, useElevation, variables } from '@trezor/components';
 import { Elevation, mapElevationToBackground } from '@trezor/theme';
-import { HTMLAttributes, ReactNode, forwardRef } from 'react';
-import styled, { css } from 'styled-components';
 import { CoinLogo } from '@trezor/product-components';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
diff --git a/packages/suite/src/components/wallet/Fees/CustomFee.tsx b/packages/suite/src/components/wallet/Fees/CustomFee.tsx
index 82b382737df..fad956e1dfa 100644
--- a/packages/suite/src/components/wallet/Fees/CustomFee.tsx
+++ b/packages/suite/src/components/wallet/Fees/CustomFee.tsx
@@ -1,5 +1,3 @@
-import { BigNumber } from '@trezor/utils/src/bigNumber';
-import styled, { useTheme } from 'styled-components';
 import {
     Control,
     FieldErrors,
@@ -9,42 +7,22 @@ import {
     UseFormReturn,
     UseFormSetValue,
 } from 'react-hook-form';
-import { Note, Banner, motionEasing, variables, Icon } from '@trezor/components';
-import { Translation } from 'src/components/suite';
-import { NumberInput } from 'src/components/suite/NumberInput';
+
+import { BigNumber } from '@trezor/utils/src/bigNumber';
+import { Note, Banner, variables, Grid, Column, useMediaQuery, Text } from '@trezor/components';
 import { getInputState, getFeeUnits, isInteger } from '@suite-common/wallet-utils';
-import { FeeInfo } from '@suite-common/wallet-types';
-import { FormState } from '@suite-common/wallet-types';
+import { FeeInfo, FormState } from '@suite-common/wallet-types';
 import { NetworkType } from '@suite-common/wallet-config';
-import { useTranslation } from 'src/hooks/suite';
-import { InputError } from '../InputError';
-import { validateDecimals } from 'src/utils/suite/validation';
-import { motion } from 'framer-motion';
-import { BottomText } from '@trezor/components/src/components/form/BottomText';
-import { spacings, spacingsPx } from '@trezor/theme';
+import { spacings } from '@trezor/theme';
 import { HELP_CENTER_TRANSACTION_FEES_URL } from '@trezor/urls';
-import { LearnMoreButton } from 'src/components/suite/LearnMoreButton';
-import { getInputStateTextColor } from '@trezor/components';
 
-const Wrapper = styled.div`
-    display: flex;
-    width: 100%;
-    gap: ${spacingsPx.xs};
-
-    ${variables.SCREEN_QUERY.BELOW_LAPTOP} {
-        flex-direction: column;
-    }
-`;
-
-const Units = styled.div`
-    font-size: ${variables.FONT_SIZE.TINY};
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
+import { validateDecimals } from 'src/utils/suite/validation';
+import { useTranslation } from 'src/hooks/suite';
+import { NumberInput } from 'src/components/suite/NumberInput';
+import { Translation } from 'src/components/suite';
+import { LearnMoreButton } from 'src/components/suite/LearnMoreButton';
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledNote = styled(Note)`
-    text-align: left;
-`;
+import { InputError } from '../InputError';
 
 const FEE_PER_UNIT = 'feePerUnit';
 const FEE_LIMIT = 'feeLimit';
@@ -71,7 +49,7 @@ export const CustomFee = <TFieldValues extends FormState>({
     ...props
 }: CustomFeeProps<TFieldValues>) => {
     const { translationString } = useTranslation();
-    const theme = useTheme();
+    const isBelowLaptop = useMediaQuery(`(max-width: ${variables.SCREEN_SIZE.LG})`);
 
     // Type assertion allowing to make the component reusable, see https://stackoverflow.com/a/73624072.
     const { getValues, setValue } = props as unknown as UseFormReturn<FormState>;
@@ -161,20 +139,10 @@ export const CustomFee = <TFieldValues extends FormState>({
         feeLimitError?.type === 'feeLimit' ? feeLimitValidationProps : undefined;
 
     return (
-        <motion.div
-            initial={{ opacity: 0, height: 0, marginTop: 0 }}
-            animate={{ opacity: 1, height: 'auto', marginTop: spacingsPx.sm }}
-            exit={{ opacity: 0, height: 0, marginTop: 0 }}
-            transition={{
-                opacity: { duration: 0.15, ease: motionEasing.transition },
-                height: { duration: 0.2, ease: motionEasing.transition },
-                marginTop: { duration: 0.25, ease: motionEasing.transition },
-            }}
-        >
+        <Column gap={spacings.xs} alignItems="stretch">
             <Banner
                 icon
                 variant="warning"
-                margin={{ bottom: spacings.xs }}
                 rightContent={
                     <LearnMoreButton
                         textWrap={false}
@@ -185,7 +153,7 @@ export const CustomFee = <TFieldValues extends FormState>({
             >
                 <Translation id="TR_CUSTOM_FEE_WARNING" />
             </Banner>
-            <Wrapper>
+            <Grid gap={spacings.xs} columns={useFeeLimit && !isBelowLaptop ? 2 : 1}>
                 {useFeeLimit ? (
                     <NumberInput
                         control={control}
@@ -194,6 +162,15 @@ export const CustomFee = <TFieldValues extends FormState>({
                         name={FEE_LIMIT}
                         data-testid={FEE_LIMIT}
                         onChange={changeFeeLimit}
+                        hasBottomPadding={false}
+                        bottomText={
+                            feeLimitError?.message ? (
+                                <InputError
+                                    message={feeLimitError?.message}
+                                    button={validationButtonProps}
+                                />
+                            ) : null
+                        }
                         rules={feeLimitRules}
                     />
                 ) : (
@@ -203,34 +180,19 @@ export const CustomFee = <TFieldValues extends FormState>({
                     control={control}
                     label={useFeeLimit ? <Translation id="TR_GAS_PRICE" /> : undefined}
                     inputState={getInputState(feePerUnitError)}
-                    innerAddon={<Units>{feeUnits}</Units>}
+                    innerAddon={
+                        <Text variant="tertiary" typographyStyle="label">
+                            {feeUnits}
+                        </Text>
+                    }
                     name={FEE_PER_UNIT}
                     data-testid={FEE_PER_UNIT}
                     rules={feeRules}
+                    hasBottomPadding={false}
                     bottomText={feePerUnitError?.message || null}
                 />
-            </Wrapper>
-            {useFeeLimit && feeLimitError?.message ? (
-                <div style={{ marginTop: '-1.5rem' }}>
-                    <BottomText
-                        inputState="error"
-                        iconComponent={
-                            <Icon
-                                name="warningCircle"
-                                size="medium"
-                                color={getInputStateTextColor('error', theme)}
-                            />
-                        }
-                    >
-                        <InputError
-                            message={feeLimitError?.message}
-                            button={validationButtonProps}
-                        />
-                    </BottomText>
-                </div>
-            ) : null}
-
-            {feeDifferenceWarning && <StyledNote>{feeDifferenceWarning}</StyledNote>}
-        </motion.div>
+            </Grid>
+            {feeDifferenceWarning && <Note>{feeDifferenceWarning}</Note>}
+        </Column>
     );
 };
diff --git a/packages/suite/src/components/wallet/Fees/FeeDetails.tsx b/packages/suite/src/components/wallet/Fees/FeeDetails.tsx
index 0fe3e2e9cde..201b3a43e54 100644
--- a/packages/suite/src/components/wallet/Fees/FeeDetails.tsx
+++ b/packages/suite/src/components/wallet/Fees/FeeDetails.tsx
@@ -1,37 +1,20 @@
-import styled from 'styled-components';
-import { spacingsPx, typography } from '@trezor/theme';
+import React, { useState, useEffect } from 'react';
+
+import { spacings } from '@trezor/theme';
+import { Row, Text } from '@trezor/components';
 import { FeeLevel } from '@trezor/connect';
-import { Translation } from 'src/components/suite';
 import { getFeeUnits } from '@suite-common/wallet-utils';
 import { formatDuration } from '@suite-common/suite-utils';
 import { NetworkType } from '@suite-common/wallet-config';
-
-import { useState, useEffect } from 'react';
 import {
     PrecomposedTransaction,
     PrecomposedTransactionCardano,
     FeeInfo,
 } from '@suite-common/wallet-types';
 
-const Wrapper = styled.div`
-    display: inline-flex;
-    align-items: baseline;
-    gap: ${spacingsPx.sm};
-    ${typography.hint}
-`;
-
-const Label = styled.span`
-    color: ${({ theme }) => theme.textSubdued};
-    padding-right: ${spacingsPx.xxs};
-`;
-
-// set min-width to prevent jumping when changing amount, width to fit 6 digits
-const FeeItem = styled.span`
-    min-width: 42px;
-    display: inline-block;
-`;
-
-interface DetailsProps {
+import { Translation } from 'src/components/suite/Translation';
+
+type DetailsProps = {
     networkType: NetworkType;
     selectedLevel: FeeLevel;
     // fields below are validated as false-positives, eslint claims that they are not used...
@@ -41,7 +24,19 @@ interface DetailsProps {
     transactionInfo?: PrecomposedTransaction | PrecomposedTransactionCardano;
 
     showFee: boolean;
-}
+};
+
+type ItemProps = {
+    label: React.ReactNode;
+    children: React.ReactNode;
+};
+
+const Item = ({ label, children }: ItemProps) => (
+    <Row gap={spacings.xxs}>
+        <Text variant="tertiary">{label}:</Text>
+        {children}
+    </Row>
+);
 
 const BitcoinDetails = ({
     networkType,
@@ -49,35 +44,25 @@ const BitcoinDetails = ({
     selectedLevel,
     transactionInfo,
     showFee,
-}: DetailsProps) => (
-    <Wrapper>
-        {showFee && (
+}: DetailsProps) => {
+    const hasInfo = transactionInfo && transactionInfo.type !== 'error';
+
+    return (
+        showFee && (
             <>
-                <span>
-                    <Label>
-                        <Translation id="ESTIMATED_TIME" />:
-                    </Label>
+                <Item label={<Translation id="ESTIMATED_TIME" />}>
                     {formatDuration(feeInfo.blockTime * selectedLevel.blocks * 60)}
-                </span>
-
-                <span>
-                    <Label>
-                        <Translation id="TR_FEE_RATE" />:
-                    </Label>
-                    {`${
-                        transactionInfo && transactionInfo.type !== 'error'
-                            ? transactionInfo.feePerByte
-                            : selectedLevel.feePerUnit
-                    } ${getFeeUnits(networkType)}`}
-                </span>
-
-                {transactionInfo && transactionInfo.type !== 'error' && (
-                    <span>({transactionInfo.bytes} B)</span>
-                )}
+                </Item>
+
+                <Item label={<Translation id="TR_FEE_RATE" />}>
+                    {hasInfo ? transactionInfo.feePerByte : selectedLevel.feePerUnit}{' '}
+                    {getFeeUnits(networkType)}
+                    {hasInfo ? ` (${transactionInfo.bytes} B)` : ''}
+                </Item>
             </>
-        )}
-    </Wrapper>
-);
+        )
+    );
+};
 
 const EthereumDetails = ({
     networkType,
@@ -106,41 +91,31 @@ const EthereumDetails = ({
         : lastKnownFeePerByte || selectedLevel.feePerUnit;
 
     return (
-        <Wrapper>
-            {showFee && (
-                <>
-                    <span>
-                        <Label>
-                            <Translation id="TR_GAS_LIMIT" />:
-                        </Label>
-                        <FeeItem>{gasLimit}</FeeItem>
-                    </span>
-
-                    <span>
-                        <Label>
-                            <Translation id="TR_GAS_PRICE" />:
-                        </Label>
-                        <FeeItem>
-                            {gasPrice} {getFeeUnits(networkType)}
-                        </FeeItem>
-                    </span>
-                </>
-            )}
-        </Wrapper>
+        showFee && (
+            <>
+                <Item label={<Translation id="TR_GAS_LIMIT" />}>{gasLimit}</Item>
+
+                <Item label={<Translation id="TR_GAS_PRICE" />}>
+                    {gasPrice} {getFeeUnits(networkType)}
+                </Item>
+            </>
+        )
     );
 };
 
-const RippleDetails = ({ networkType, selectedLevel, showFee }: DetailsProps) => (
-    <Wrapper>
-        {showFee && <span>{`${selectedLevel.feePerUnit}: ${getFeeUnits(networkType)}`}</span>}
-    </Wrapper>
-);
+const RippleDetails = ({ networkType, selectedLevel, showFee }: DetailsProps) =>
+    showFee && <Item label={selectedLevel.feePerUnit}>{getFeeUnits(networkType)}</Item>;
 
 export const FeeDetails = (props: DetailsProps) => {
     const { networkType } = props;
-    if (networkType === 'bitcoin') return <BitcoinDetails {...props} />;
-    if (networkType === 'ethereum') return <EthereumDetails {...props} />;
-    if (networkType === 'ripple') return <RippleDetails {...props} />;
 
-    return null;
+    return (
+        <Text as="div" typographyStyle="hint">
+            <Row gap={spacings.md}>
+                {networkType === 'bitcoin' && <BitcoinDetails {...props} />}
+                {networkType === 'ethereum' && <EthereumDetails {...props} />}
+                {networkType === 'ripple' && <RippleDetails {...props} />}
+            </Row>
+        </Text>
+    );
 };
diff --git a/packages/suite/src/components/wallet/Fees/Fees.tsx b/packages/suite/src/components/wallet/Fees/Fees.tsx
index 86eacf1a6f3..5595fabc378 100644
--- a/packages/suite/src/components/wallet/Fees/Fees.tsx
+++ b/packages/suite/src/components/wallet/Fees/Fees.tsx
@@ -1,5 +1,3 @@
-import styled from 'styled-components';
-import { FeeLevel } from '@trezor/connect';
 import {
     Control,
     FieldErrors,
@@ -8,82 +6,38 @@ import {
     UseFormReturn,
     UseFormSetValue,
 } from 'react-hook-form';
-import { Icon, Paragraph, SelectBar, Tooltip, motionEasing, variables } from '@trezor/components';
-import { FormState } from '@suite-common/wallet-types';
-import { spacingsPx, typography } from '@trezor/theme';
-import { FiatValue, FormattedCryptoAmount, Translation } from 'src/components/suite';
-import { formatNetworkAmount } from '@suite-common/wallet-utils';
-import { Account } from 'src/types/wallet';
-import { ExtendedMessageDescriptor } from 'src/types/suite';
+
+import { AnimatePresence, motion } from 'framer-motion';
+
+import { FeeLevel } from '@trezor/connect';
+import {
+    Banner,
+    SelectBar,
+    Tooltip,
+    Column,
+    Note,
+    motionEasing,
+    InfoRow,
+    Row,
+    Text,
+} from '@trezor/components';
 import {
+    FormState,
     FeeInfo,
     PrecomposedLevels,
     PrecomposedLevelsCardano,
     PrecomposedTransactionFinal,
 } from '@suite-common/wallet-types';
-import { CustomFee } from './CustomFee';
-import { FeeDetails } from './FeeDetails';
-import { AnimatePresence, motion } from 'framer-motion';
+import { spacings } from '@trezor/theme';
+import { formatNetworkAmount } from '@suite-common/wallet-utils';
 import { TranslationKey } from '@suite-common/intl-types';
 
-const Container = styled.div`
-    overflow: hidden; /* prevent scrollbar when custom fee is opened */
-    width: 100%;
-`;
-
-const FiatAmount = styled(FiatValue)`
-    color: ${({ theme }) => theme.textSubdued};
-`;
-
-const FeeInfoRow = styled.div`
-    display: flex;
-    justify-content: space-between;
-    align-items: start;
-    width: 100%;
-    min-height: 52px; /* reserve space for fiat/crypto amounts */
-`;
-
-const FeeAmount = styled.div`
-    display: flex;
-    flex-direction: column;
-    align-items: flex-end;
-    justify-content: center;
-    gap: ${spacingsPx.xxs};
-`;
-
-const FeeError = styled.div`
-    width: 100%;
-    padding-top: ${spacingsPx.xxs};
-    color: ${({ theme }) => theme.textAlertRed};
-    ${typography.label}
-    text-align: right;
-`;
-
-const Label = styled.div`
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    gap: ${spacingsPx.xxs};
-`;
-
-const HeadingWrapper = styled.div`
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-    align-items: center;
-    gap: ${spacingsPx.xxs};
-    text-transform: capitalize;
-`;
-
-const StyledSelectBar = styled(SelectBar<FeeLevel['label']>)`
-    margin-top: ${spacingsPx.lg};
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const HelperTextWrapper = styled(Paragraph)`
-    color: ${({ theme }) => theme.textSubdued};
-    font-size: ${variables.FONT_SIZE.SMALL};
-`;
+import { FiatValue, FormattedCryptoAmount, Translation } from 'src/components/suite';
+import { Account } from 'src/types/wallet';
+import { ExtendedMessageDescriptor } from 'src/types/suite';
+
+import { CustomFee } from './CustomFee';
+import { FeeDetails } from './FeeDetails';
 
 const FEE_LEVELS_TRANSLATIONS: Record<FeeLevel['label'], TranslationKey> = {
     custom: 'FEE_LEVEL_CUSTOM',
@@ -142,94 +96,119 @@ export const Fees = <TFieldValues extends FormState>({
     // Solana has only `normal` fee level, so we do not display any feeOptions since there is nothing to choose from
     const feeOptions = networkType === 'solana' ? [] : buildFeeOptions(feeInfo.levels);
 
-    return (
-        <Container>
-            <FeeInfoRow>
-                <Label>
-                    <HeadingWrapper>
-                        <Translation
-                            id={label || (networkType === 'ethereum' ? 'MAX_FEE' : 'FEE')}
-                        />
-                        {networkType === 'ethereum' && (
-                            <Tooltip
-                                maxWidth={328}
-                                content={<Translation id="TR_STAKE_MAX_FEE_DESC" />}
-                            >
-                                {/* TODO: Add new info icon. Export from Figma isn't handled as is it should by the strokes to fills online converter */}
-                                <Icon name="info" size={14} />
-                            </Tooltip>
-                        )}
-                    </HeadingWrapper>
-                    {helperText && <HelperTextWrapper>{helperText}</HelperTextWrapper>}
-                </Label>
+    const showNormalFee = showFeeWhilePending || transactionInfo?.type === 'final';
+    const shouldAnimateNormalFee = showNormalFee && !isCustomLevel;
 
+    return (
+        <Column alignItems="stretch" gap={spacings.xs}>
+            <InfoRow
+                direction="row"
+                labelTypographyStyle="body"
+                label={
+                    networkType === 'ethereum' ? (
+                        <Tooltip
+                            maxWidth={328}
+                            hasIcon
+                            content={<Translation id="TR_STAKE_MAX_FEE_DESC" />}
+                        >
+                            <Translation id={label ?? 'MAX_FEE'} />
+                        </Tooltip>
+                    ) : (
+                        <Translation id={label ?? 'FEE'} />
+                    )
+                }
+            >
                 {transactionInfo !== undefined && transactionInfo.type !== 'error' && (
-                    <FeeAmount>
+                    <Row gap={spacings.md} alignItems="baseline">
                         <FormattedCryptoAmount
                             disableHiddenPlaceholder
                             value={formatNetworkAmount(transactionInfo.fee, symbol)}
                             symbol={symbol}
                         />
-
-                        <FiatAmount
-                            disableHiddenPlaceholder
-                            amount={formatNetworkAmount(transactionInfo.fee, symbol)}
-                            symbol={symbol}
-                        />
-                    </FeeAmount>
+                        <Text variant="tertiary" typographyStyle="label">
+                            <FiatValue
+                                disableHiddenPlaceholder
+                                amount={formatNetworkAmount(transactionInfo.fee, symbol)}
+                                symbol={symbol}
+                                showApproximationIndicator
+                            />
+                        </Text>
+                    </Row>
                 )}
-            </FeeInfoRow>
+            </InfoRow>
 
             {feeOptions.length > 0 && (
-                <StyledSelectBar
-                    selectedOption={selectedOption}
-                    options={feeOptions}
-                    onChange={changeFeeLevel}
-                    isFullWidth
-                />
-            )}
-
-            <AnimatePresence>
-                {!isCustomLevel && (
-                    <motion.div
-                        initial={{ opacity: 0, height: 0, marginTop: 0 }}
-                        animate={{ opacity: 1, height: 'auto', marginTop: 20 }}
-                        exit={{ opacity: 0, height: 0, marginTop: 0 }}
-                        transition={{
-                            opacity: { duration: 0.15, ease: motionEasing.transition },
-                            height: { duration: 0.2, ease: motionEasing.transition },
-                            marginTop: { duration: 0.25, ease: motionEasing.transition },
-                        }}
-                    >
-                        <FeeDetails
-                            networkType={networkType}
-                            feeInfo={feeInfo}
-                            selectedLevel={selectedLevel}
-                            transactionInfo={transactionInfo}
-                            showFee={showFeeWhilePending || transactionInfo?.type === 'final'}
-                        />
-                    </motion.div>
-                )}
-            </AnimatePresence>
-            <AnimatePresence>
-                {isCustomLevel && (
-                    <CustomFee
-                        control={control}
-                        networkType={networkType}
-                        feeInfo={feeInfo}
-                        errors={errors}
-                        register={register}
-                        getValues={getValues}
-                        setValue={setValue}
-                        changeFeeLimit={changeFeeLimit}
-                        composedFeePerByte={
-                            (transactionInfo as PrecomposedTransactionFinal)?.feePerByte
-                        }
+                <>
+                    <SelectBar
+                        selectedOption={selectedOption}
+                        options={feeOptions}
+                        onChange={changeFeeLevel}
+                        isFullWidth
+                        margin={{ top: spacings.sm }}
                     />
-                )}
-            </AnimatePresence>
+                    <AnimatePresence>
+                        {shouldAnimateNormalFee && (
+                            <motion.div
+                                animate={shouldAnimateNormalFee ? 'open' : 'closed'}
+                                variants={{
+                                    open: { opacity: 1, height: 'auto', marginTop: 0 },
+                                    closed: { opacity: 0, height: 0, marginTop: 0 },
+                                }}
+                                transition={{
+                                    opacity: { duration: 0.15, ease: motionEasing.transition },
+                                    height: { duration: 0.2, ease: motionEasing.transition },
+                                    marginTop: { duration: 0.25, ease: motionEasing.transition },
+                                }}
+                            >
+                                <FeeDetails
+                                    networkType={networkType}
+                                    feeInfo={feeInfo}
+                                    selectedLevel={selectedLevel}
+                                    transactionInfo={transactionInfo}
+                                    showFee={showNormalFee}
+                                />
+                            </motion.div>
+                        )}
+                    </AnimatePresence>
+
+                    <AnimatePresence>
+                        {isCustomLevel && (
+                            <motion.div
+                                initial={{ opacity: 0, height: 0, marginTop: 0 }}
+                                animate={{ opacity: 1, height: 'auto', marginTop: 0 }}
+                                exit={{ opacity: 0, height: 0, marginTop: 0 }}
+                                transition={{
+                                    opacity: { duration: 0.15, ease: motionEasing.transition },
+                                    height: { duration: 0.2, ease: motionEasing.transition },
+                                    marginTop: { duration: 0.25, ease: motionEasing.transition },
+                                }}
+                            >
+                                <CustomFee
+                                    control={control}
+                                    networkType={networkType}
+                                    feeInfo={feeInfo}
+                                    errors={errors}
+                                    register={register}
+                                    getValues={getValues}
+                                    setValue={setValue}
+                                    changeFeeLimit={changeFeeLimit}
+                                    composedFeePerByte={
+                                        (transactionInfo as PrecomposedTransactionFinal)?.feePerByte
+                                    }
+                                />
+                            </motion.div>
+                        )}
+                    </AnimatePresence>
 
-            {error && <FeeError>{error.message}</FeeError>}
-        </Container>
+                    {error && (
+                        <Banner icon margin={{ top: spacings.sm }} variant="destructive">
+                            {error.message}
+                        </Banner>
+                    )}
+
+                    {helperText && <Note margin={{ top: spacings.md }}>{helperText}</Note>}
+                </>
+            )}
+        </Column>
     );
 };
diff --git a/packages/suite/src/components/wallet/FiatHeader.tsx b/packages/suite/src/components/wallet/FiatHeader.tsx
index 73032f1f2db..40bd6c75a1b 100644
--- a/packages/suite/src/components/wallet/FiatHeader.tsx
+++ b/packages/suite/src/components/wallet/FiatHeader.tsx
@@ -1,12 +1,14 @@
+import { PropsWithChildren } from 'react';
+
+import styled from 'styled-components';
+
 import { useFormatters } from '@suite-common/formatters';
 import { typography } from '@trezor/theme';
 import { useShouldRedactNumbers } from '@suite-common/wallet-utils';
-import { HiddenPlaceholder } from 'src/components/suite';
-import { RedactNumericalValue } from 'src/components/suite';
+
+import { HiddenPlaceholder, RedactNumericalValue } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite';
 import { selectLanguage } from 'src/reducers/suite/suiteReducer';
-import { PropsWithChildren } from 'react';
-import styled from 'styled-components';
 
 const ValueWrapper = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/wallet/InputError.tsx b/packages/suite/src/components/wallet/InputError.tsx
index 424f3b5dbb9..3d0c1e71729 100644
--- a/packages/suite/src/components/wallet/InputError.tsx
+++ b/packages/suite/src/components/wallet/InputError.tsx
@@ -1,27 +1,10 @@
 import { MouseEventHandler } from 'react';
-import styled from 'styled-components';
 
-import { Button } from '@trezor/components';
-import { LearnMoreButton } from '../suite/LearnMoreButton';
+import { Button, Paragraph, Row } from '@trezor/components';
 import { Url } from '@trezor/urls';
-import { spacingsPx } from '@trezor/theme';
-
-const Wrapper = styled.div`
-    display: flex;
-    align-items: center;
-    gap: ${spacingsPx.xs};
-`;
+import { spacings } from '@trezor/theme';
 
-const ButtonWrapper = styled.div`
-    position: absolute;
-    top: 4px;
-    right: 16px;
-`;
-
-const ContentWrapper = styled.div`
-    flex-grow: 1;
-    padding-right: 150px;
-`;
+import { LearnMoreButton } from '../suite/LearnMoreButton';
 
 type ButtonProps = { onClick: MouseEventHandler<HTMLButtonElement>; text: string };
 type LinkProps = { url: Url };
@@ -32,17 +15,15 @@ export type InputErrorProps = {
 };
 
 export const InputError = ({ button, message }: InputErrorProps) => (
-    <Wrapper>
-        <ContentWrapper>{message}</ContentWrapper>
+    <Row gap={spacings.xs} justifyContent="space-between" flex="1">
+        <Paragraph>{message}</Paragraph>
         {button &&
             ('url' in button ? (
                 <LearnMoreButton url={button.url} />
             ) : (
-                <ButtonWrapper>
-                    <Button size="tiny" variant="tertiary" onClick={button.onClick}>
-                        {button.text}
-                    </Button>
-                </ButtonWrapper>
+                <Button size="tiny" variant="tertiary" onClick={button.onClick} textWrap={false}>
+                    {button.text}
+                </Button>
             ))}
-    </Wrapper>
+    </Row>
 );
diff --git a/packages/suite/src/components/wallet/Pagination.tsx b/packages/suite/src/components/wallet/Pagination.tsx
index 920bc952e40..8251f75be71 100644
--- a/packages/suite/src/components/wallet/Pagination.tsx
+++ b/packages/suite/src/components/wallet/Pagination.tsx
@@ -1,8 +1,11 @@
 import { useMemo } from 'react';
-import { Translation } from 'src/components/suite';
+
 import styled, { css } from 'styled-components';
+
 import { borders, spacingsPx, typography } from '@trezor/theme';
 
+import { Translation } from 'src/components/suite';
+
 const Wrapper = styled.div`
     display: flex;
     justify-content: center;
@@ -99,7 +102,7 @@ export const Pagination = ({
                     <PageItem
                         key={i}
                         data-testid={`@wallet/accounts/pagination/${i}`}
-                        data-test-activated={i === currentPage ?? 'true'}
+                        data-test-activated={i === currentPage}
                         onClick={() => onPageSelected(i)}
                         $isActive={i === currentPage}
                     >
diff --git a/packages/suite/src/components/wallet/SearchAction.tsx b/packages/suite/src/components/wallet/SearchAction.tsx
index 99a1ffa89c6..d5c55fd5472 100644
--- a/packages/suite/src/components/wallet/SearchAction.tsx
+++ b/packages/suite/src/components/wallet/SearchAction.tsx
@@ -1,16 +1,13 @@
 import { useCallback, useRef, Dispatch, SetStateAction, KeyboardEvent } from 'react';
-import styled, { css, useTheme } from 'styled-components';
-import { Input, Icon, KEYBOARD_CODE, motionEasing } from '@trezor/components';
+
+import styled, { css } from 'styled-components';
+
+import { Input, Icon, KEYBOARD_CODE, motionEasing, Row } from '@trezor/components';
 import { borders, spacingsPx } from '@trezor/theme';
+import { TranslationKey } from '@suite-common/intl-types';
 
 import { useTranslation } from 'src/hooks/suite/useTranslation';
 import { TooltipSymbol, Translation } from 'src/components/suite';
-import { TranslationKey } from '@suite-common/intl-types';
-
-const Container = styled.div`
-    display: flex;
-    align-items: center;
-`;
 
 const TRANSITION_DURATION = 0.26;
 const easingValues = motionEasing.transition.join(', '); // TODO: add to motionEasing
@@ -36,12 +33,27 @@ const StyledInput = styled(Input)<{ $isExpanded: boolean }>`
     overflow: hidden;
     border-radius: ${borders.radii.full};
 
+    cursor: ${({ $isExpanded }) => (!$isExpanded ? 'pointer' : undefined)};
+
     input {
         height: ${INPUT_WIDTH};
         border: none;
+        cursor: ${({ $isExpanded }) => (!$isExpanded ? 'pointer' : undefined)};
     }
 `;
 
+const SearchIconContainer = styled.div`
+    cursor: pointer;
+    height: ${INPUT_WIDTH};
+    width: ${INPUT_WIDTH};
+    background-color: transparent;
+    border-radius: ${borders.radii.full};
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-left: -${spacingsPx.sm};
+`;
+
 export interface SearchProps {
     tooltipText: TranslationKey;
     placeholder: TranslationKey;
@@ -63,7 +75,6 @@ export const SearchAction = ({
     onSearch,
     'data-testid': dataTest,
 }: SearchProps) => {
-    const theme = useTheme();
     const inputRef = useRef<HTMLInputElement | null>(null);
     const { translationString } = useTranslation();
 
@@ -90,7 +101,7 @@ export const SearchAction = ({
     );
 
     return (
-        <Container>
+        <Row alignItems="center">
             <StyledTooltipSymbol
                 content={<Translation id={tooltipText} />}
                 $isExpanded={isExpanded || searchQuery !== ''}
@@ -102,16 +113,13 @@ export const SearchAction = ({
                 size="small"
                 innerRef={inputRef}
                 innerAddon={
-                    <Icon
-                        name="search"
-                        cursorPointer
-                        size={16}
-                        color={theme.iconDefault}
-                        onClick={!isExpanded ? openAndSelect : undefined}
-                    />
+                    <SearchIconContainer onClick={!isExpanded ? openAndSelect : undefined}>
+                        <Icon name="search" cursorPointer size="medium" variant="default" />
+                    </SearchIconContainer>
                 }
                 placeholder={isExpanded ? translationString(placeholder) : undefined}
                 onChange={e => onSearch(e.target.value)}
+                onClick={!isExpanded ? openAndSelect : undefined}
                 onBlur={onBlur}
                 onKeyDown={onKeyDown}
                 value={searchQuery}
@@ -120,6 +128,6 @@ export const SearchAction = ({
                 showClearButton="always"
                 onClear={() => setSearch('')}
             />
-        </Container>
+        </Row>
     );
 };
diff --git a/packages/suite/src/components/wallet/TokenIconSetWrapper.tsx b/packages/suite/src/components/wallet/TokenIconSetWrapper.tsx
new file mode 100644
index 00000000000..70fae7b43d0
--- /dev/null
+++ b/packages/suite/src/components/wallet/TokenIconSetWrapper.tsx
@@ -0,0 +1,61 @@
+import { selectCoinDefinitions } from '@suite-common/token-definitions';
+import { TokenIconSet } from '@trezor/product-components';
+import { selectCurrentFiatRates } from '@suite-common/wallet-core';
+import { Account } from '@suite-common/wallet-types';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+import { BigNumber } from '@trezor/utils';
+
+import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
+import { useSelector } from 'src/hooks/suite';
+import {
+    enhanceTokensWithRates,
+    getTokens,
+    sortTokensWithRates,
+    TokensWithRates,
+} from 'src/utils/wallet/tokenUtils';
+
+type TokenIconSetWrapperProps = {
+    accounts: Account[];
+    network: NetworkSymbol;
+};
+
+export const TokenIconSetWrapper = ({ accounts, network }: TokenIconSetWrapperProps) => {
+    const localCurrency = useSelector(selectLocalCurrency);
+    const fiatRates = useSelector(selectCurrentFiatRates);
+    const coinDefinitions = useSelector(state => selectCoinDefinitions(state, network));
+
+    const allTokensWithRates = accounts.flatMap(account =>
+        enhanceTokensWithRates(account.tokens, localCurrency, network, fiatRates),
+    );
+
+    if (!allTokensWithRates.length) return null;
+
+    const tokens = getTokens(allTokensWithRates, network, coinDefinitions)
+        .shownWithBalance as TokensWithRates[];
+
+    const aggregatedTokens = Object.values(
+        tokens.reduce((acc: Record<string, TokensWithRates>, token) => {
+            const { contract, balance, fiatValue } = token;
+
+            if (!acc[contract]) {
+                acc[contract] = {
+                    ...token,
+                    balance: balance ?? '0',
+                    fiatValue: fiatValue ?? BigNumber(0),
+                };
+            } else {
+                const existingBalance = parseFloat(acc[contract].balance ?? '0');
+                const newBalance = existingBalance + parseFloat(balance ?? '0');
+                acc[contract].balance = newBalance.toString();
+
+                acc[contract].fiatValue = acc[contract].fiatValue.plus(fiatValue);
+            }
+
+            return acc;
+        }, {}),
+    );
+
+    const sortedAggregatedTokens = aggregatedTokens.sort(sortTokensWithRates);
+
+    return <TokenIconSet network={network} tokens={sortedAggregatedTokens} />;
+};
diff --git a/packages/suite/src/components/wallet/TransactionItem/CoinjoinBatchItem.tsx b/packages/suite/src/components/wallet/TransactionItem/CoinjoinBatchItem.tsx
index e05683d36c1..d0482809f4e 100644
--- a/packages/suite/src/components/wallet/TransactionItem/CoinjoinBatchItem.tsx
+++ b/packages/suite/src/components/wallet/TransactionItem/CoinjoinBatchItem.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
-import { BigNumber } from '@trezor/utils/src/bigNumber';
 
+import { BigNumber } from '@trezor/utils/src/bigNumber';
 import {
     formatNetworkAmount,
     getFiatRateKey,
@@ -11,6 +11,10 @@ import {
 } from '@suite-common/wallet-utils';
 import { useFormatters } from '@suite-common/formatters';
 import { CollapsibleBox } from '@trezor/components';
+import { borders } from '@trezor/theme';
+import { FiatCurrencyCode } from '@suite-common/suite-config';
+import { selectHistoricFiatRates } from '@suite-common/wallet-core';
+import { Timestamp } from '@suite-common/wallet-types';
 
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { openModal } from 'src/actions/suite/modalActions';
@@ -29,10 +33,6 @@ import {
     TimestampWrapper,
     TxTypeIconWrapper,
 } from './CommonComponents';
-import { borders } from '@trezor/theme';
-import { FiatCurrencyCode } from '@suite-common/suite-config';
-import { selectHistoricFiatRates } from '@suite-common/wallet-core';
-import { Timestamp } from '@suite-common/wallet-types';
 
 const CryptoAmount = styled(StyledFormattedCryptoAmount)`
     width: unset;
diff --git a/packages/suite/src/components/wallet/TransactionItem/CommonComponents.tsx b/packages/suite/src/components/wallet/TransactionItem/CommonComponents.tsx
index ca57b3b6421..f48d9f748c8 100644
--- a/packages/suite/src/components/wallet/TransactionItem/CommonComponents.tsx
+++ b/packages/suite/src/components/wallet/TransactionItem/CommonComponents.tsx
@@ -1,6 +1,9 @@
 import styled, { css } from 'styled-components';
+
 import { variables } from '@trezor/components';
+
 import { FormattedCryptoAmount, FormattedNftAmount, HiddenPlaceholder } from 'src/components/suite';
+
 import { MIN_ROW_HEIGHT } from './TransactionTargetLayout';
 
 export const TxTypeIconWrapper = styled.div`
diff --git a/packages/suite/src/components/wallet/TransactionItem/InstantStakeBadge.tsx b/packages/suite/src/components/wallet/TransactionItem/InstantStakeBadge.tsx
index fb530237b88..1698f9e9051 100644
--- a/packages/suite/src/components/wallet/TransactionItem/InstantStakeBadge.tsx
+++ b/packages/suite/src/components/wallet/TransactionItem/InstantStakeBadge.tsx
@@ -1,16 +1,18 @@
-import { Translation, FormattedCryptoAmount } from 'src/components/suite';
-import { WalletAccountTransaction } from 'src/types/wallet';
-import { StakeType } from '@suite-common/wallet-types/src/stake';
+import { useSelector } from 'react-redux';
+import { memo } from 'react';
 
-import { Badge, Icon } from '@trezor/components';
 import styled from 'styled-components';
+
+import { StakeType } from '@suite-common/wallet-types';
+import { Badge, Icon } from '@trezor/components';
 import { isNetworkSymbol, NetworkSymbol } from '@suite-common/wallet-config';
 import { formatNetworkAmount } from '@suite-common/wallet-utils';
-import { useSelector } from 'react-redux';
+import { spacings, spacingsPx } from '@trezor/theme';
+
+import { Translation, FormattedCryptoAmount } from 'src/components/suite';
+import { WalletAccountTransaction } from 'src/types/wallet';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 import { getInstantStakeType } from 'src/utils/suite/stake';
-import { memo } from 'react';
-import { spacings, spacingsPx } from '@trezor/theme';
 
 const Wrapper = styled.div`
     display: flex;
@@ -21,9 +23,9 @@ const Wrapper = styled.div`
 const getTranslationId = (instantStakeType: StakeType) => {
     switch (instantStakeType) {
         case 'stake':
-            return 'TR_STAKING_INSTANT_STAKING';
+            return 'TR_INSTANT_STAKING';
         case 'unstake':
-            return 'TR_STAKING_INSTANT_UNSTAKING';
+            return 'TR_INSTANT_UNSTAKING';
         default:
             return null; // there is no badge for claiming
     }
diff --git a/packages/suite/src/components/wallet/TransactionItem/TransactionHeader.tsx b/packages/suite/src/components/wallet/TransactionItem/TransactionHeader.tsx
index dbffe665ccd..2d328ff98d8 100644
--- a/packages/suite/src/components/wallet/TransactionItem/TransactionHeader.tsx
+++ b/packages/suite/src/components/wallet/TransactionItem/TransactionHeader.tsx
@@ -1,9 +1,9 @@
+import { getTxHeaderSymbol, isSupportedEthStakingNetworkSymbol } from '@suite-common/wallet-utils';
+import { AccountTransaction } from '@trezor/connect';
+
 import { Translation } from 'src/components/suite';
-import { getTxHeaderSymbol } from '@suite-common/wallet-utils';
 import { WalletAccountTransaction } from 'src/types/wallet';
-import { AccountTransaction } from '@trezor/connect';
 import { UnstakingTxAmount } from 'src/components/suite/UnstakingTxAmount';
-import { isSupportedEthStakingNetworkSymbol } from '@suite-common/wallet-core';
 
 interface TransactionHeaderProps {
     transaction: WalletAccountTransaction;
diff --git a/packages/suite/src/components/wallet/TransactionItem/TransactionHeading.tsx b/packages/suite/src/components/wallet/TransactionItem/TransactionHeading.tsx
index 1707ecd9a66..73019478a7d 100644
--- a/packages/suite/src/components/wallet/TransactionItem/TransactionHeading.tsx
+++ b/packages/suite/src/components/wallet/TransactionItem/TransactionHeading.tsx
@@ -1,26 +1,30 @@
 import { useState } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
 import { variables, Icon } from '@trezor/components';
 import { HELP_CENTER_ZERO_VALUE_ATTACKS } from '@trezor/urls';
-import {
-    FormattedCryptoAmount,
-    TooltipSymbol,
-    Translation,
-    TrezorLink,
-} from 'src/components/suite';
 import {
     formatNetworkAmount,
     getTargetAmount,
     getTxHeaderSymbol,
     getTxOperation,
+    isSupportedEthStakingNetworkSymbol,
 } from '@suite-common/wallet-utils';
-import { TransactionHeader } from './TransactionHeader';
-import { WalletAccountTransaction } from 'src/types/wallet';
 import { BigNumber } from '@trezor/utils/src/bigNumber';
-import { BlurWrapper } from './TransactionItemBlurWrapper';
 import { spacingsPx } from '@trezor/theme';
+
+import {
+    FormattedCryptoAmount,
+    TooltipSymbol,
+    Translation,
+    TrezorLink,
+} from 'src/components/suite';
+import { WalletAccountTransaction } from 'src/types/wallet';
+
+import { TransactionHeader } from './TransactionHeader';
+import { BlurWrapper } from './TransactionItemBlurWrapper';
 import { InstantStakeBadge } from './InstantStakeBadge';
-import { isSupportedEthStakingNetworkSymbol } from '@suite-common/wallet-core';
 
 const Wrapper = styled.span`
     display: flex;
diff --git a/packages/suite/src/components/wallet/TransactionItem/TransactionItem.tsx b/packages/suite/src/components/wallet/TransactionItem/TransactionItem.tsx
index 59e30b16f86..4f1fd64a176 100644
--- a/packages/suite/src/components/wallet/TransactionItem/TransactionItem.tsx
+++ b/packages/suite/src/components/wallet/TransactionItem/TransactionItem.tsx
@@ -1,15 +1,32 @@
 import { memo, useMemo, useState } from 'react';
+
 import styled, { css } from 'styled-components';
 import { AnimatePresence } from 'framer-motion';
+
 import { selectIsPhishingTransaction } from '@suite-common/wallet-core';
-import { variables, Button, Card, Link } from '@trezor/components';
+import { variables, Button, Card, Link, Tooltip } from '@trezor/components';
+import {
+    formatNetworkAmount,
+    isTestnet,
+    isTxFeePaid,
+    isStakeTypeTx,
+} from '@suite-common/wallet-utils';
+import { AccountType, Network } from '@suite-common/wallet-config';
+import { HELP_CENTER_REPLACE_BY_FEE } from '@trezor/urls';
+
 import { Translation } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { openModal } from 'src/actions/suite/modalActions';
-import { formatNetworkAmount, isTestnet, isTxFeePaid } from '@suite-common/wallet-utils';
 import { AccountLabels } from 'src/types/suite/metadata';
 import { WalletAccountTransaction } from 'src/types/wallet';
-import { AccountType, Network } from '@suite-common/wallet-config';
+import { useAnchor } from 'src/hooks/suite/useAnchor';
+import { AccountTransactionBaseAnchor } from 'src/constants/suite/anchors';
+import { anchorOutlineStyles } from 'src/utils/suite/anchor';
+import { TransactionTimestamp } from 'src/components/wallet/TransactionTimestamp';
+import { SUBPAGE_NAV_HEIGHT } from 'src/constants/suite/layout';
+import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
+import { getInstantStakeType } from 'src/utils/suite/stake';
+
 import { TransactionTypeIcon } from './TransactionTypeIcon';
 import { TransactionHeading } from './TransactionHeading';
 import {
@@ -26,17 +43,7 @@ import {
     TimestampWrapper,
     TxTypeIconWrapper,
 } from './CommonComponents';
-import { useAnchor } from 'src/hooks/suite/useAnchor';
-import { AccountTransactionBaseAnchor } from 'src/constants/suite/anchors';
-import { anchorOutlineStyles } from 'src/utils/suite/anchor';
-import { TransactionTimestamp } from 'src/components/wallet/TransactionTimestamp';
-import { SUBPAGE_NAV_HEIGHT } from 'src/constants/suite/layout';
 import { BlurWrapper } from './TransactionItemBlurWrapper';
-import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
-import { getInstantStakeType } from 'src/utils/suite/stake';
-import { isStakeTypeTx } from '@suite-common/suite-utils';
-import { Tooltip } from '@trezor/components';
-import { HELP_CENTER_REPLACE_BY_FEE } from '@trezor/urls';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const Wrapper = styled(Card)<{
diff --git a/packages/suite/src/components/wallet/TransactionItem/TransactionRow.tsx b/packages/suite/src/components/wallet/TransactionItem/TransactionRow.tsx
index e518b77fca0..2cc8e4df9b7 100644
--- a/packages/suite/src/components/wallet/TransactionItem/TransactionRow.tsx
+++ b/packages/suite/src/components/wallet/TransactionItem/TransactionRow.tsx
@@ -1,20 +1,22 @@
 import { BigNumber } from '@trezor/utils/src/bigNumber';
-import { FiatValue, Translation } from 'src/components/suite';
 import {
     formatCardanoWithdrawal,
     formatCardanoDeposit,
     formatNetworkAmount,
     getFiatRateKey,
 } from '@suite-common/wallet-utils';
+import { SignOperator } from '@suite-common/suite-types';
+import { Timestamp } from '@suite-common/wallet-types';
+import { selectHistoricFiatRatesByTimestamp } from '@suite-common/wallet-core';
+
+import { FiatValue, Translation } from 'src/components/suite';
 import { WalletAccountTransaction } from 'src/types/wallet';
-import { TransactionTargetLayout } from './TransactionTargetLayout';
 import { ExtendedMessageDescriptor } from 'src/types/suite';
-import { SignOperator } from '@suite-common/suite-types';
-import { StyledFormattedCryptoAmount } from './CommonComponents';
 import { useSelector } from 'src/hooks/suite';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
-import { Timestamp } from '@suite-common/wallet-types';
-import { selectHistoricFiatRatesByTimestamp } from '@suite-common/wallet-core';
+
+import { TransactionTargetLayout } from './TransactionTargetLayout';
+import { StyledFormattedCryptoAmount } from './CommonComponents';
 
 export const CustomRow = ({
     transaction,
diff --git a/packages/suite/src/components/wallet/TransactionItem/TransactionTarget/TargetAddressLabel.tsx b/packages/suite/src/components/wallet/TransactionItem/TransactionTarget/TargetAddressLabel.tsx
index 92ecee957e1..018af01b24d 100644
--- a/packages/suite/src/components/wallet/TransactionItem/TransactionTarget/TargetAddressLabel.tsx
+++ b/packages/suite/src/components/wallet/TransactionItem/TransactionTarget/TargetAddressLabel.tsx
@@ -1,9 +1,11 @@
 import styled from 'styled-components';
-import { WalletAccountTransaction } from 'src/types/wallet';
+
 import { ArrayElement } from '@trezor/type-utils';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+
+import { WalletAccountTransaction } from 'src/types/wallet';
 import { Translation, AddressLabeling } from 'src/components/suite';
 import { AccountLabels } from 'src/types/suite/metadata';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 
 const TruncatedSpan = styled.span<{ $isBlurred?: boolean }>`
     overflow: hidden;
diff --git a/packages/suite/src/components/wallet/TransactionItem/TransactionTarget/TokenTransferAddressLabel.tsx b/packages/suite/src/components/wallet/TransactionItem/TransactionTarget/TokenTransferAddressLabel.tsx
index a3d1aaf6a7a..283c30e66d8 100644
--- a/packages/suite/src/components/wallet/TransactionItem/TransactionTarget/TokenTransferAddressLabel.tsx
+++ b/packages/suite/src/components/wallet/TransactionItem/TransactionTarget/TokenTransferAddressLabel.tsx
@@ -1,8 +1,10 @@
 import { ArrayElement } from '@trezor/type-utils';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+
 import { Translation, AddressLabeling } from 'src/components/suite';
 import { WalletAccountTransaction } from 'src/types/wallet';
+
 import { BlurWrapper } from '../TransactionItemBlurWrapper';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 
 interface TokenTransferAddressLabelProps {
     networkSymbol: NetworkSymbol;
diff --git a/packages/suite/src/components/wallet/TransactionItem/TransactionTarget/TransactionTarget.tsx b/packages/suite/src/components/wallet/TransactionItem/TransactionTarget/TransactionTarget.tsx
index bc59078ec99..9d5e79e7256 100644
--- a/packages/suite/src/components/wallet/TransactionItem/TransactionTarget/TransactionTarget.tsx
+++ b/packages/suite/src/components/wallet/TransactionItem/TransactionTarget/TransactionTarget.tsx
@@ -10,17 +10,19 @@ import {
 } from '@suite-common/wallet-utils';
 import { copyToClipboard } from '@trezor/dom-utils';
 import { ArrayElement } from '@trezor/type-utils';
+import { selectHistoricFiatRatesByTimestamp } from '@suite-common/wallet-core';
+import { Timestamp, TokenAddress } from '@suite-common/wallet-types';
+
 import { FiatValue, Translation, MetadataLabeling, AddressLabeling } from 'src/components/suite';
 import { WalletAccountTransaction } from 'src/types/wallet';
 import { useDispatch, useSelector } from 'src/hooks/suite';
+import { AccountLabels } from 'src/types/suite/metadata';
+import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
+
 import { TokenTransferAddressLabel } from './TokenTransferAddressLabel';
 import { TargetAddressLabel } from './TargetAddressLabel';
-import { AccountLabels } from 'src/types/suite/metadata';
 import { TransactionTargetLayout } from '../TransactionTargetLayout';
 import { StyledFormattedCryptoAmount, StyledFormattedNftAmount } from '../CommonComponents';
-import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
-import { selectHistoricFiatRatesByTimestamp } from '@suite-common/wallet-core';
-import { Timestamp, TokenAddress } from '@suite-common/wallet-types';
 
 interface BaseTransfer {
     singleRowLayout?: boolean;
diff --git a/packages/suite/src/components/wallet/TransactionItem/TransactionTargetLayout.tsx b/packages/suite/src/components/wallet/TransactionItem/TransactionTargetLayout.tsx
index ed4067887e0..c8985ea2a65 100644
--- a/packages/suite/src/components/wallet/TransactionItem/TransactionTargetLayout.tsx
+++ b/packages/suite/src/components/wallet/TransactionItem/TransactionTargetLayout.tsx
@@ -1,10 +1,13 @@
 import { ReactNode } from 'react';
+
 import styled, { css } from 'styled-components';
 import { motion } from 'framer-motion';
-import { HiddenPlaceholder } from 'src/components/suite';
+
 import { motionAnimation } from '@trezor/components';
 import { borders, spacingsPx, typography } from '@trezor/theme';
 
+import { HiddenPlaceholder } from 'src/components/suite';
+
 export const MIN_ROW_HEIGHT = '23px';
 
 const FiatAmount = styled.span`
diff --git a/packages/suite/src/components/wallet/TransactionItem/TransactionTypeIcon.tsx b/packages/suite/src/components/wallet/TransactionItem/TransactionTypeIcon.tsx
index c7e634b2118..74d66ea5fef 100644
--- a/packages/suite/src/components/wallet/TransactionItem/TransactionTypeIcon.tsx
+++ b/packages/suite/src/components/wallet/TransactionItem/TransactionTypeIcon.tsx
@@ -1,8 +1,10 @@
 import styled, { useTheme } from 'styled-components';
-import { WalletAccountTransaction } from 'src/types/wallet';
+
 import { Icon, IconProps } from '@trezor/components';
 import { getTxIcon } from '@suite-common/wallet-utils';
 
+import { WalletAccountTransaction } from 'src/types/wallet';
+
 const IconsWrapper = styled.div<{ $isJoint: boolean }>`
     position: relative;
     width: 24px;
diff --git a/packages/suite/src/components/wallet/TransactionTimestamp.tsx b/packages/suite/src/components/wallet/TransactionTimestamp.tsx
index 1c402b02b0b..76471397c3e 100644
--- a/packages/suite/src/components/wallet/TransactionTimestamp.tsx
+++ b/packages/suite/src/components/wallet/TransactionTimestamp.tsx
@@ -1,7 +1,9 @@
 import styled from 'styled-components';
+
+import { spacingsPx, typography } from '@trezor/theme';
+
 import { FormattedDate } from 'src/components/suite';
 import { WalletAccountTransaction } from 'src/types/wallet';
-import { spacingsPx, typography } from '@trezor/theme';
 
 const TimestampLink = styled.div`
     display: block;
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/AccountBanners.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/AccountBanners.tsx
index 830bd91fbc2..32faa5babea 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/AccountBanners.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/AccountBanners.tsx
@@ -1,6 +1,12 @@
 import styled from 'styled-components';
 
+import { spacingsPx } from '@trezor/theme';
+import { Context } from '@suite-common/message-system';
+import { isSupportedEthStakingNetworkSymbol } from '@suite-common/wallet-utils';
+
 import { Account } from 'src/types/wallet';
+import { useSelector } from 'src/hooks/suite';
+
 import { AuthConfirmFailed } from './AuthConfirmFailed';
 import { BackendDisconnected } from './BackendDisconnected';
 import { DeviceUnavailable } from './DeviceUnavailable';
@@ -10,12 +16,8 @@ import { AccountOutOfSync } from './AccountOutOfSync';
 import { TorDisconnected } from './TorDisconnected';
 import { ContextMessage } from './ContextMessage';
 import { StakeEthBanner } from './StakeEthBanner';
-import { spacingsPx } from '@trezor/theme';
 import { EvmExplanationBanner } from './EvmExplanationBanner';
 import { TaprootBanner } from './TaprootBanner';
-import { Context } from '@suite-common/message-system';
-import { useSelector } from 'src/hooks/suite';
-import { isSupportedEthStakingNetworkSymbol } from '@suite-common/wallet-core';
 
 const BannersWrapper = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/BackendDisconnected.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/BackendDisconnected.tsx
index e02ba198950..5c77737124d 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/BackendDisconnected.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/BackendDisconnected.tsx
@@ -1,7 +1,8 @@
-import { NotificationCard, Translation } from 'src/components/suite';
-import { useSelector } from 'src/hooks/suite';
 import { tryGetAccountIdentity, isTrezorConnectBackendType } from '@suite-common/wallet-utils';
 import type { NetworkSymbol } from '@suite-common/wallet-config';
+
+import { NotificationCard, Translation } from 'src/components/suite';
+import { useSelector } from 'src/hooks/suite';
 import { useBackendReconnection } from 'src/hooks/settings/backends';
 
 const DisconnectedNotification = ({
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/BannerPoints.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/BannerPoints.tsx
index ecc4cfb937c..145dcc413d7 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/BannerPoints.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/BannerPoints.tsx
@@ -1,5 +1,7 @@
 import React, { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { typography } from '@trezor/theme';
 
 interface BannerPointsProps {
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/CloseableBanner.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/CloseableBanner.tsx
index c1c725a65ab..1b4900e600b 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/CloseableBanner.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/CloseableBanner.tsx
@@ -1,8 +1,10 @@
-import { Text, Banner, BannerProps, Column } from '@trezor/components';
-import { Translation } from 'src/components/suite';
 import { ReactNode } from 'react';
+
+import { Text, Banner, BannerProps, Column } from '@trezor/components';
 import { spacings } from '@trezor/theme/src';
 
+import { Translation } from 'src/components/suite';
+
 interface Props {
     onClose: () => void;
     variant: BannerProps['variant'];
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/ContextMessage.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/ContextMessage.tsx
index a2af012d55a..d8f439eed47 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/ContextMessage.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/ContextMessage.tsx
@@ -1,9 +1,11 @@
-import { NotificationCard } from 'src/components/suite';
+import styled from 'styled-components';
+
 import { Link } from '@trezor/components';
-import { useSelector } from 'src/hooks/suite';
 import { selectContextMessageContent, Context } from '@suite-common/message-system';
+
+import { NotificationCard } from 'src/components/suite';
+import { useSelector } from 'src/hooks/suite';
 import { selectLanguage } from 'src/reducers/suite/suiteReducer';
-import styled from 'styled-components';
 
 type ContextMessageProps = {
     context: (typeof Context)[keyof typeof Context];
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/EvmExplanationBanner.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/EvmExplanationBanner.tsx
index 998539cde9f..7f211191a70 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/EvmExplanationBanner.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/EvmExplanationBanner.tsx
@@ -1,10 +1,12 @@
-import { Translation } from 'src/components/suite';
-import { CloseableBanner } from './CloseableBanner';
-import { Account } from 'src/types/wallet';
 import { networks } from '@suite-common/wallet-config';
+
+import { Account } from 'src/types/wallet';
+import { Translation } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite/useSelector';
 import { useDispatch } from 'src/hooks/suite/useDispatch';
 import { SUITE } from 'src/actions/suite/constants';
+
+import { CloseableBanner } from './CloseableBanner';
 import { BannerPoints } from './BannerPoints';
 
 interface EvmExplanationBannerProps {
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/StakeEthBanner.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/StakeEthBanner.tsx
index d1ece68828e..520df0f05d7 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/StakeEthBanner.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/StakeEthBanner.tsx
@@ -1,15 +1,18 @@
+import { useTheme } from 'styled-components';
+
 import { Button, Text, IconButton, Row, Banner, Column } from '@trezor/components';
 import { spacings } from '@trezor/theme';
+import { Account } from '@suite-common/wallet-types';
+import { selectPoolStatsApyData } from '@suite-common/wallet-core';
+import { MIN_ETH_AMOUNT_FOR_STAKING } from '@suite-common/wallet-constants';
+import { isSupportedEthStakingNetworkSymbol } from '@suite-common/wallet-utils';
+
 import { Translation } from 'src/components/suite';
 import { goto } from 'src/actions/suite/routerActions';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { setFlag } from 'src/actions/suite/suiteActions';
+
 import { selectSuiteFlags } from '../../../../reducers/suite/suiteReducer';
-import { Account } from '@suite-common/wallet-types';
-import { selectPoolStatsApyData } from '@suite-common/wallet-core';
-import { isSupportedEthStakingNetworkSymbol } from '@suite-common/wallet-core';
-import { MIN_ETH_AMOUNT_FOR_STAKING } from 'src/constants/suite/ethStaking';
-import { useTheme } from 'styled-components';
 
 interface StakeEthBannerProps {
     account: Account;
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/TaprootBanner.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/TaprootBanner.tsx
index 77815e61799..e4084ba554a 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/TaprootBanner.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/TaprootBanner.tsx
@@ -1,12 +1,15 @@
+import styled from 'styled-components';
+
+import { getBip43Type } from '@suite-common/wallet-utils';
+
 import { Translation } from 'src/components/suite';
-import { CloseableBanner } from './CloseableBanner';
 import { useSelector } from 'src/hooks/suite/useSelector';
 import { useDispatch } from 'src/hooks/suite/useDispatch';
 import { setFlag } from 'src/actions/suite/suiteActions';
-import { getBip43Type } from '@suite-common/wallet-utils';
 import { Account } from 'src/types/wallet';
+
+import { CloseableBanner } from './CloseableBanner';
 import { BannerPoints } from './BannerPoints';
-import styled from 'styled-components';
 import { selectSuiteFlags } from '../../../../reducers/suite/suiteReducer';
 
 interface TaprootBannerProps {
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/XRPReserve.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/XRPReserve.tsx
index 63a90395b23..be8c888fee6 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountBanners/XRPReserve.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountBanners/XRPReserve.tsx
@@ -1,9 +1,10 @@
 import { BigNumber } from '@trezor/utils/src/bigNumber';
-import { NotificationCard, Translation } from 'src/components/suite';
 import { formatNetworkAmount } from '@suite-common/wallet-utils';
-import type { Account } from 'src/types/wallet/index';
 import { HELP_CENTER_XRP_URL } from '@trezor/urls';
 
+import { NotificationCard, Translation } from 'src/components/suite';
+import type { Account } from 'src/types/wallet/index';
+
 interface XRPReserveProps {
     account: Account | undefined;
 }
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountException.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountException.tsx
index d0ae7f87555..4927086eb9c 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountException.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountException.tsx
@@ -1,5 +1,4 @@
-import styled from 'styled-components';
-import { H2 } from '@trezor/components';
+import { H2, Column } from '@trezor/components';
 import { SelectedAccountException } from '@suite-common/wallet-types';
 
 import { AuthFailed } from './AuthFailed';
@@ -9,20 +8,6 @@ import { AccountNotEnabled } from './AccountNotEnabled';
 import { AccountNotLoaded } from './AccountNotLoaded';
 import { AccountNotExists } from './AccountNotExists';
 
-const Wrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    height: 100%;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const Title = styled(H2)`
-    display: flex;
-    text-align: center;
-    color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
-`;
-
 const getExceptionPage = (
     loader: SelectedAccountException['loader'],
     network: SelectedAccountException['network'],
@@ -53,12 +38,12 @@ export const AccountException = ({ loader, network }: AccountExceptionProps) =>
     const page = getExceptionPage(loader, network);
 
     if (page) {
-        return <Wrapper>{page}</Wrapper>;
+        return <Column height="100%">{page}</Column>;
     }
 
     return (
-        <Wrapper>
-            <Title>Exception {loader} not implemented</Title>
-        </Wrapper>
+        <Column height="100%">
+            <H2 align="center">Exception {loader} not implemented</H2>
+        </Column>
     );
 };
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountNotEnabled.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountNotEnabled.tsx
index 493589886ca..6caf9898d53 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountNotEnabled.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountNotEnabled.tsx
@@ -1,6 +1,7 @@
+import { Network } from '@suite-common/wallet-config';
+
 import { changeCoinVisibility } from 'src/actions/settings/walletSettingsActions';
 import { useDevice, useDispatch } from 'src/hooks/suite';
-import { Network } from '@suite-common/wallet-config';
 import { Translation } from 'src/components/suite';
 import { AccountExceptionLayout } from 'src/components/wallet';
 
@@ -26,7 +27,8 @@ export const AccountNotEnabled = ({ network }: AccountNotEnabledProps) => {
                     values={{ networkName: network.name }}
                 />
             }
-            image="CLOUDY"
+            iconName="warning"
+            iconVariant="warning"
             actions={[
                 {
                     icon: 'plus',
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountNotExists.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountNotExists.tsx
index 4661cf8813f..be5ae1ef34d 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountNotExists.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountNotExists.tsx
@@ -8,6 +8,7 @@ import { AccountExceptionLayout } from 'src/components/wallet';
 export const AccountNotExists = () => (
     <AccountExceptionLayout
         title={<Translation id="TR_ACCOUNT_EXCEPTION_NOT_EXIST" />}
-        image="CLOUDY"
+        iconName="cloud"
+        iconVariant="tertiary"
     />
 );
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountNotLoaded.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountNotLoaded.tsx
index 29c27f07e70..ca1eb23c806 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountNotLoaded.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountException/AccountNotLoaded.tsx
@@ -20,7 +20,8 @@ export const AccountNotLoaded = () => {
         <AccountExceptionLayout
             title={<Translation id="TR_ACCOUNT_EXCEPTION_DISCOVERY_ERROR" />}
             description={<Translation id="TR_ACCOUNT_EXCEPTION_DISCOVERY_DESCRIPTION" />}
-            image="CLOUDY"
+            iconName="warning"
+            iconVariant="warning"
             actions={[
                 {
                     key: '1',
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountException/AuthFailed.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountException/AuthFailed.tsx
index b5432c9d3d4..55386dc7d9f 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountException/AuthFailed.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountException/AuthFailed.tsx
@@ -14,7 +14,8 @@ export const AuthFailed = () => {
         <AccountExceptionLayout
             title={<Translation id="TR_ACCOUNT_EXCEPTION_AUTH_ERROR" />}
             description={<Translation id="TR_ACCOUNT_EXCEPTION_AUTH_ERROR_DESC" />}
-            image="UNI_ERROR"
+            iconName="warning"
+            iconVariant="warning"
             actions={[
                 {
                     key: '1',
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountException/DiscoveryEmpty.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountException/DiscoveryEmpty.tsx
index 1643ea5cf9d..9fb3102ba22 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountException/DiscoveryEmpty.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountException/DiscoveryEmpty.tsx
@@ -19,7 +19,8 @@ export const DiscoveryEmpty = () => {
     return (
         <AccountExceptionLayout
             title={<Translation id="TR_ACCOUNT_EXCEPTION_DISCOVERY_EMPTY" />}
-            image="CLOUDY"
+            iconName="cloud"
+            iconVariant="info"
             description={<Translation id="TR_ACCOUNT_EXCEPTION_DISCOVERY_EMPTY_DESC" />}
             actions={[
                 {
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountException/DiscoveryFailed.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountException/DiscoveryFailed.tsx
index 61d0f8f3b00..f7f830167ca 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountException/DiscoveryFailed.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountException/DiscoveryFailed.tsx
@@ -18,7 +18,8 @@ export const DiscoveryFailed = () => {
         <AccountExceptionLayout
             title={<Translation id="TR_ACCOUNT_EXCEPTION_DISCOVERY_ERROR" />}
             description={discovery && discovery.error ? discovery.error : undefined}
-            image="UNI_ERROR"
+            iconName="warning"
+            iconVariant="warning"
             actions={[
                 {
                     key: '1',
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountTopPanel/AccountNavigation.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountTopPanel/AccountNavigation.tsx
index e55e1ca9bef..9a61238f7b9 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountTopPanel/AccountNavigation.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountTopPanel/AccountNavigation.tsx
@@ -1,17 +1,18 @@
+import { hasNetworkFeatures } from '@suite-common/wallet-utils';
+import { getNetworkOptional } from '@suite-common/wallet-config';
+import { EventType, analytics } from '@trezor/suite-analytics';
+
 import { WalletParams } from 'src/types/wallet';
 import { Translation } from 'src/components/suite/Translation';
 import { useDispatch, useSelector } from 'src/hooks/suite';
-import { hasNetworkFeatures } from '@suite-common/wallet-utils';
-import { getNetworkOptional } from '@suite-common/wallet-config';
 import { goto } from 'src/actions/suite/routerActions';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
-import { EventType, analytics } from '@trezor/suite-analytics';
 import { NavigationItem, SubpageNavigation } from 'src/components/suite/layouts/SuiteLayout';
 
 export const ACCOUNT_TABS = [
     'wallet-index',
     'wallet-details',
-    'wallet-tokens-coins',
+    'wallet-tokens',
     'wallet-tokens-hidden',
     'wallet-staking',
 ];
@@ -44,13 +45,14 @@ export const AccountNavigation = () => {
             isHidden: false,
         },
         {
-            id: 'wallet-tokens-coins',
+            id: 'wallet-tokens',
             callback: () => {
-                goToWithAnalytics('wallet-tokens-coins', { preserveParams: true });
+                goToWithAnalytics('wallet-tokens', { preserveParams: true });
             },
             title: <Translation id="TR_NAV_TOKENS" />,
             isHidden: !['cardano', 'ethereum', 'solana'].includes(networkType),
-            activeRoutes: ['wallet-tokens-coins', 'wallet-tokens-hidden'],
+            activeRoutes: ['wallet-tokens', 'wallet-tokens-hidden'],
+            'data-testid': '@wallet/menu/wallet-tokens',
         },
         {
             id: 'wallet-staking',
@@ -59,6 +61,7 @@ export const AccountNavigation = () => {
             },
             title: <Translation id="TR_NAV_STAKING" />,
             isHidden: !hasNetworkFeatures(account, 'staking'),
+            'data-testid': '@wallet/menu/staking',
         },
         {
             id: 'wallet-details',
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountTopPanel/AccountTopPanel.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountTopPanel/AccountTopPanel.tsx
index 3ba89671d61..2816ae1afe2 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountTopPanel/AccountTopPanel.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountTopPanel/AccountTopPanel.tsx
@@ -1,16 +1,17 @@
-import styled from 'styled-components';
 import { forwardRef } from 'react';
 
+import styled from 'styled-components';
+
 import { spacingsPx } from '@trezor/theme';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { SkeletonCircle, SkeletonRectangle } from '@trezor/components';
+import { CoinLogo } from '@trezor/product-components';
 
 import { FormattedCryptoAmount, AmountUnitSwitchWrapper } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite';
 import { FiatHeader } from 'src/components/wallet/FiatHeader';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
 import { useFiatFromCryptoValue } from 'src/hooks/suite/useFiatFromCryptoValue';
-import { CoinLogo } from '@trezor/product-components';
 
 export const ACCOUNT_INFO_HEIGHT = 80;
 
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountGroup.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountGroup.tsx
index d4e289c070f..4aa1242f81b 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountGroup.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountGroup.tsx
@@ -1,10 +1,14 @@
 import { useState, ReactNode } from 'react';
+
 import styled from 'styled-components';
-import { Translation } from 'src/components/suite';
+
 import { Icon, Column } from '@trezor/components';
+import { spacingsPx, spacings, typography } from '@trezor/theme';
+
+import { Translation } from 'src/components/suite';
 import { Account } from 'src/types/wallet';
+
 import { AnimationWrapper } from '../../AnimationWrapper';
-import { spacingsPx, spacings, typography } from '@trezor/theme';
 
 const ICON_SIZE = 18;
 
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItem.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItem.tsx
index 2cac32210af..9366e2dae47 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItem.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItem.tsx
@@ -1,8 +1,9 @@
 import { forwardRef, Ref } from 'react';
+
 import styled from 'styled-components';
 
 import { isTestnet } from '@suite-common/wallet-utils';
-import { borders, spacings, spacingsPx, typography } from '@trezor/theme';
+import { spacings, spacingsPx, typography } from '@trezor/theme';
 import {
     Icon,
     Column,
@@ -11,6 +12,8 @@ import {
     TOOLTIP_DELAY_LONG,
     TruncateWithTooltip,
 } from '@trezor/components';
+import { useFormatters } from '@suite-common/formatters';
+import { CoinLogo } from '@trezor/product-components';
 
 import {
     AccountLabel,
@@ -23,9 +26,8 @@ import { useDispatch, useLoadingSkeleton, useSelector } from 'src/hooks/suite';
 import { Account, AccountItemType } from 'src/types/wallet';
 import { goto } from 'src/actions/suite/routerActions';
 import { NavigationItemBase } from 'src/components/suite/layouts/SuiteLayout/Sidebar/NavigationItem';
-import { useFormatters } from '@suite-common/formatters';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
-import { CoinLogo } from '@trezor/product-components';
+import { TokenIconSetWrapper } from 'src/components/wallet/TokenIconSetWrapper';
 
 const ICON_SIZE = 24;
 
@@ -51,18 +53,6 @@ export const Left = styled.div`
     position: relative;
 `;
 
-const TokensBadge = styled.div`
-    ${typography.label};
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 0 ${spacingsPx.xxs};
-    min-width: ${ICON_SIZE}px;
-    height: ${ICON_SIZE}px;
-    border-radius: ${borders.radii.full};
-    background: ${({ theme }) => theme.borderDashed};
-`;
-
 const AccountLabelContainer = styled.div`
     flex: 1;
     min-width: 60px;
@@ -98,7 +88,6 @@ export const AccountItem = forwardRef(
             formattedBalance,
             customFiatValue,
             isGroup,
-            tokens,
             dataTestKey,
             onClick,
         }: AccountItemProps,
@@ -125,7 +114,7 @@ export const AccountItem = forwardRef(
                 case 'staking':
                     return 'wallet-staking';
                 case 'tokens':
-                    return 'wallet-tokens-coins';
+                    return 'wallet-tokens';
             }
         };
 
@@ -140,7 +129,7 @@ export const AccountItem = forwardRef(
                 case 'staking':
                     return <Icon name="piggyBankFilled" variant="tertiary" />;
                 case 'tokens':
-                    return <TokensBadge>{tokens?.length}</TokensBadge>;
+                    return <TokenIconSetWrapper accounts={[account]} network={account.symbol} />;
             }
         };
 
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItemSkeleton.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItemSkeleton.tsx
index 90939ad6f97..b2f3e9e4890 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItemSkeleton.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItemSkeleton.tsx
@@ -1,7 +1,8 @@
-import { useLoadingSkeleton } from 'src/hooks/suite';
 import { SkeletonCircle, SkeletonRectangle, Row, Column } from '@trezor/components';
 import { spacings } from '@trezor/theme';
 
+import { useLoadingSkeleton } from 'src/hooks/suite';
+
 export const AccountItemSkeleton = () => {
     const { shouldAnimate } = useLoadingSkeleton();
 
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItemsGroup.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItemsGroup.tsx
index 04055881caa..a6a2d65e5d1 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItemsGroup.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountItemsGroup.tsx
@@ -1,13 +1,19 @@
 import styled from 'styled-components';
-import { AccountItem } from './AccountItem';
-import { Account } from 'src/types/wallet';
+
 import { borders, spacingsPx, spacings } from '@trezor/theme';
-import { useSelector } from 'src/hooks/suite';
 import { selectCurrentFiatRates } from '@suite-common/wallet-core';
-import { getAccountTotalStakingBalance, getTokensFiatBalance } from '@suite-common/wallet-utils';
+import {
+    getAccountTotalStakingBalance,
+    getAccountTokensFiatBalance,
+} from '@suite-common/wallet-utils';
+import { Column } from '@trezor/components';
+
+import { Account } from 'src/types/wallet';
+import { useSelector } from 'src/hooks/suite';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
 import { selectRouteName } from 'src/reducers/suite/routerReducer';
-import { Column } from '@trezor/components';
+
+import { AccountItem } from './AccountItem';
 
 const Section = styled.div<{ $selected?: boolean }>`
     display: flex;
@@ -24,7 +30,7 @@ const Section = styled.div<{ $selected?: boolean }>`
         content: '';
         position: absolute;
         top: 24px;
-        bottom: 24px;
+        bottom: 28px;
         left: 24px;
         border-left: 2px dotted ${({ theme }) => theme.borderDashed};
     }
@@ -53,9 +59,9 @@ export const AccountItemsGroup = ({
     const localCurrency = useSelector(selectLocalCurrency);
     const rates = useSelector(selectCurrentFiatRates);
 
-    const tokensFiatBalance = getTokensFiatBalance(account, localCurrency, rates, tokens);
+    const tokensFiatBalance = getAccountTokensFiatBalance(account, localCurrency, rates, tokens);
 
-    const tokensRoutes = ['wallet-tokens-coins', 'wallet-tokens-hidden'];
+    const tokensRoutes = ['wallet-tokens', 'wallet-tokens-hidden'];
 
     return (
         <Section $selected={selected}>
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountSearchBox.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountSearchBox.tsx
index bf065a16337..7b66770d038 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountSearchBox.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountSearchBox.tsx
@@ -1,10 +1,11 @@
 import styled, { useTheme } from 'styled-components';
 
 import { Icon, Input } from '@trezor/components';
+import { borders } from '@trezor/theme';
 import { selectDevice } from '@suite-common/wallet-core';
 
 import { useSelector, useAccountSearch, useTranslation } from 'src/hooks/suite';
-import { borders } from '@trezor/theme';
+import { selectEnabledNetworks } from 'src/reducers/wallet/settingsReducer';
 
 const InputWrapper = styled.div<{ $showCoinFilter: boolean }>`
     flex: 1;
@@ -26,7 +27,7 @@ export const AccountSearchBox = () => {
     const theme = useTheme();
     const { translationString } = useTranslation();
     const { setCoinFilter, searchString, setSearchString } = useAccountSearch();
-    const enabledNetworks = useSelector(state => state.wallet.settings.enabledNetworks);
+    const enabledNetworks = useSelector(selectEnabledNetworks);
     const device = useSelector(selectDevice);
 
     const unavailableCapabilities = device?.unavailableCapabilities ?? {};
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AcccountSection.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountSection.tsx
similarity index 92%
rename from packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AcccountSection.tsx
rename to packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountSection.tsx
index 0b1b4a751ad..81b260f0514 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AcccountSection.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountSection.tsx
@@ -1,14 +1,14 @@
 import { Account } from '@suite-common/wallet-types';
-import { AccountItemsGroup } from './AccountItemsGroup';
-import { AccountItem } from './AccountItem';
-import { useSelector } from 'src/hooks/suite';
 import { selectCoinDefinitions } from '@suite-common/token-definitions';
-import {
-    isSupportedEthStakingNetworkSymbol,
-    selectAccountHasStaked,
-} from '@suite-common/wallet-core';
+import { selectAccountHasStaked } from '@suite-common/wallet-core';
+import { isSupportedEthStakingNetworkSymbol } from '@suite-common/wallet-utils';
+
+import { useSelector } from 'src/hooks/suite';
 import { getTokens } from 'src/utils/wallet/tokenUtils';
 
+import { AccountItem } from './AccountItem';
+import { AccountItemsGroup } from './AccountItemsGroup';
+
 interface AccountSectionProps {
     account: Account;
     selected: boolean;
@@ -33,7 +33,7 @@ export const AccountSection = ({
     } = account;
 
     const coinDefinitions = useSelector(state => selectCoinDefinitions(state, symbol));
-    const hasStaked = useSelector(state => selectAccountHasStaked(state, account));
+    const hasStaked = useSelector(state => selectAccountHasStaked(state, account.key));
 
     const isStakeShown = isSupportedEthStakingNetworkSymbol(symbol) && hasStaked;
 
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsList.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsList.tsx
index 90c64eab183..3e8e04e2e54 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsList.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsList.tsx
@@ -1,15 +1,22 @@
 import { sortByCoin, getFailedAccounts, accountSearchFn } from '@suite-common/wallet-utils';
 import { Account } from '@suite-common/wallet-types';
-import { useAccountSearch, useDiscovery, useSelector } from 'src/hooks/suite';
-import { selectDevice } from '@suite-common/wallet-core';
+import { selectAccounts, selectDevice } from '@suite-common/wallet-core';
+import { spacings } from '@trezor/theme';
+import { Column } from '@trezor/components';
+
+import {
+    useAccountSearch,
+    useDiscovery,
+    useSelector,
+    useDefaultAccountLabel,
+} from 'src/hooks/suite';
 import { selectAccountLabels } from 'src/reducers/suite/metadataReducer';
 import { Translation } from 'src/components/suite';
+
 import { AccountItemSkeleton } from './AccountItemSkeleton';
 import { AccountGroup } from './AccountGroup';
 import { AccountsMenuNotice } from './AccountsMenuNotice';
-import { spacings } from '@trezor/theme';
-import { Column } from '@trezor/components';
-import { AccountSection } from './AcccountSection';
+import { AccountSection } from './AccountSection';
 
 interface AccountListProps {
     onItemClick?: () => void;
@@ -17,10 +24,11 @@ interface AccountListProps {
 
 export const AccountsList = ({ onItemClick }: AccountListProps) => {
     const device = useSelector(selectDevice);
-    const accounts = useSelector(state => state.wallet.accounts);
+    const accounts = useSelector(selectAccounts);
     const selectedAccount = useSelector(state => state.wallet.selectedAccount);
     const coinjoinIsPreloading = useSelector(state => state.wallet.coinjoin.isPreloading);
     const accountLabels = useSelector(selectAccountLabels);
+    const { getDefaultAccountLabel } = useDefaultAccountLabel();
 
     const { discovery, getDiscoveryStatus } = useDiscovery();
     const { coinFilter, searchString } = useAccountSearch();
@@ -34,10 +42,19 @@ export const AccountsList = ({ onItemClick }: AccountListProps) => {
 
     const failed = getFailedAccounts(discovery);
 
-    const list = sortByCoin(accounts.filter(a => a.deviceState === device.state).concat(failed));
+    const list = sortByCoin(
+        accounts.filter(a => a.deviceState === device.state?.staticSessionId).concat(failed),
+    );
     const filteredAccounts =
         searchString || coinFilter
-            ? list.filter(a => accountSearchFn(a, searchString, coinFilter, accountLabels[a.key]))
+            ? list.filter(account => {
+                  const { key, accountType, symbol, index } = account;
+                  const accountLabel = Object.prototype.hasOwnProperty.call(accountLabels, key)
+                      ? accountLabels[key]
+                      : getDefaultAccountLabel({ accountType, symbol, index });
+
+                  return accountSearchFn(account, searchString, coinFilter, accountLabel);
+              })
             : list;
 
     const filterAccountsByType = (type: Account['accountType']) =>
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsMenu.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsMenu.tsx
index 2a4482439dc..45495cf51cd 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsMenu.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsMenu.tsx
@@ -1,19 +1,21 @@
 import React from 'react';
+
 import styled from 'styled-components';
 
 import { spacings, spacingsPx, zIndices } from '@trezor/theme';
 import { selectDevice } from '@suite-common/wallet-core';
+import { getFailedAccounts, sortByCoin } from '@suite-common/wallet-utils';
+import { useScrollShadow, Row } from '@trezor/components';
 
 import { useDiscovery, useSelector } from 'src/hooks/suite';
+import { Translation } from 'src/components/suite';
+
 import { AccountSearchBox } from './AccountSearchBox';
 import { AddAccountButton } from './AddAccountButton';
 import { CoinsFilter } from './CoinsFilter';
 import { AccountsList } from './AccountsList';
-import { Translation } from 'src/components/suite';
 import { AccountsMenuNotice } from './AccountsMenuNotice';
-import { getFailedAccounts, sortByCoin } from '@suite-common/wallet-utils';
 import { RefreshAfterDiscoveryNeeded } from './RefreshAfterDiscoveryNeeded';
-import { useScrollShadow, Row } from '@trezor/components';
 
 const Wrapper = styled.div`
     display: flex;
@@ -53,7 +55,9 @@ export const AccountsMenu = () => {
     }
 
     const failed = getFailedAccounts(discovery);
-    const list = sortByCoin(accounts.filter(a => a.deviceState === device.state).concat(failed));
+    const list = sortByCoin(
+        accounts.filter(a => a.deviceState === device.state?.staticSessionId).concat(failed),
+    );
     const isEmpty = list.length === 0;
 
     return (
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsMenuNotice.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsMenuNotice.tsx
index 6ced7d8627c..7ad65a76623 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsMenuNotice.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AccountsMenuNotice.tsx
@@ -1,6 +1,7 @@
-import { spacingsPx, typography } from '@trezor/theme';
 import styled from 'styled-components';
 
+import { spacingsPx, typography } from '@trezor/theme';
+
 export const AccountsMenuNotice = styled.div`
     display: flex;
     justify-content: center;
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AddAccountButton.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AddAccountButton.tsx
index 67b7d4ae24b..a94e437244f 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AddAccountButton.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/AddAccountButton.tsx
@@ -1,11 +1,11 @@
+import { Tooltip, ButtonProps, IconButton, Button } from '@trezor/components';
+import { DiscoveryStatus } from '@suite-common/wallet-constants';
+
 import { Translation } from 'src/components/suite';
 import { TrezorDevice } from 'src/types/suite';
 import { useDiscovery, useDispatch } from 'src/hooks/suite';
 import { openModal } from 'src/actions/suite/modalActions';
 
-import { Tooltip, ButtonProps, IconButton, Button } from '@trezor/components';
-import { DiscoveryStatus } from '@suite-common/wallet-constants';
-
 const getExplanationMessage = (device: TrezorDevice | undefined, discoveryIsRunning: boolean) => {
     let message;
     if (device && !device.connected) {
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/CoinsFilter.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/CoinsFilter.tsx
index 620ad65de60..487952ac648 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/CoinsFilter.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/CoinsFilter.tsx
@@ -1,12 +1,13 @@
 import styled from 'styled-components';
+import { motion, AnimatePresence, MotionProps } from 'framer-motion';
 
+import { selectDevice } from '@suite-common/wallet-core';
 import { TOOLTIP_DELAY_NORMAL, Tooltip, motionEasing } from '@trezor/components';
-import { motion, AnimatePresence, MotionProps } from 'framer-motion';
+import { CoinLogo } from '@trezor/product-components';
 import { borders, spacingsPx } from '@trezor/theme';
-import { selectDevice } from '@suite-common/wallet-core';
 
 import { useSelector, useAccountSearch } from 'src/hooks/suite';
-import { CoinLogo } from '@trezor/product-components';
+import { selectEnabledNetworks } from 'src/reducers/wallet/settingsReducer';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledCoinLogo = styled(CoinLogo)<{ $isSelected?: boolean }>`
@@ -42,7 +43,7 @@ const Container = styled.div`
 
 export const CoinsFilter = () => {
     const { coinFilter, setCoinFilter } = useAccountSearch();
-    const enabledNetworks = useSelector(state => state.wallet.settings.enabledNetworks);
+    const enabledNetworks = useSelector(selectEnabledNetworks);
     const device = useSelector(selectDevice);
 
     const unavailableCapabilities = device?.unavailableCapabilities ?? {};
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/MobileAccountsMenu.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/MobileAccountsMenu.tsx
index e458725deee..36bb4423953 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/MobileAccountsMenu.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/MobileAccountsMenu.tsx
@@ -1,10 +1,14 @@
 import { useState } from 'react';
+
 import styled, { css, useTheme } from 'styled-components';
+
 import { H2, variables, Icon } from '@trezor/components';
 import { zIndices, spacingsPx } from '@trezor/theme';
 import { selectDevice } from '@suite-common/wallet-core';
+
 import { Translation } from 'src/components/suite';
 import { useDiscovery, useSelector } from 'src/hooks/suite';
+
 import { AccountSearchBox } from './AccountSearchBox';
 import { AddAccountButton } from './AddAccountButton';
 import { CoinsFilter } from './CoinsFilter';
diff --git a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/RefreshAfterDiscoveryNeeded.tsx b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/RefreshAfterDiscoveryNeeded.tsx
index 0db9cfaa59e..ad60503dd40 100644
--- a/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/RefreshAfterDiscoveryNeeded.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/AccountsMenu/RefreshAfterDiscoveryNeeded.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+
 import styled from 'styled-components';
 import { AnimatePresence, MotionProps, motion } from 'framer-motion';
 
@@ -7,8 +8,8 @@ import { spacingsPx, typography } from '@trezor/theme';
 import { selectDevice, startDiscoveryThunk } from '@suite-common/wallet-core';
 
 import { useRediscoveryNeeded, useDispatch, useSelector } from 'src/hooks/suite';
-
 import { Translation } from 'src/components/suite';
+
 import { AccountsMenuNotice } from './AccountsMenuNotice';
 
 const DiscoveryButtonContainer = styled(motion.div)`
diff --git a/packages/suite/src/components/wallet/WalletLayout/CoinjoinAccountDiscovery/CoinjoinAccountDiscovery.tsx b/packages/suite/src/components/wallet/WalletLayout/CoinjoinAccountDiscovery/CoinjoinAccountDiscovery.tsx
index 696154a93bc..f8c3f0cb6ce 100644
--- a/packages/suite/src/components/wallet/WalletLayout/CoinjoinAccountDiscovery/CoinjoinAccountDiscovery.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/CoinjoinAccountDiscovery/CoinjoinAccountDiscovery.tsx
@@ -6,6 +6,7 @@ import { isDeviceRemembered } from '@suite-common/suite-utils';
 import { useDispatch, useDevice } from 'src/hooks/suite';
 import { TrezorDevice } from 'src/types/suite';
 import { CoinjoinAccountDiscoveryProgress } from 'src/components/wallet';
+
 import { RememberWallet } from './RememberWallet';
 
 export const CoinjoinAccountDiscovery = () => {
diff --git a/packages/suite/src/components/wallet/WalletLayout/CoinjoinAccountDiscovery/RememberWallet.tsx b/packages/suite/src/components/wallet/WalletLayout/CoinjoinAccountDiscovery/RememberWallet.tsx
index ace43bde614..ec0fc90e211 100644
--- a/packages/suite/src/components/wallet/WalletLayout/CoinjoinAccountDiscovery/RememberWallet.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/CoinjoinAccountDiscovery/RememberWallet.tsx
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
 import { spacings, spacingsPx } from '@trezor/theme';
-
 import { Card, Image, Note, Paragraph, Row, Switch } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
diff --git a/packages/suite/src/components/wallet/WalletLayout/WalletLayout.tsx b/packages/suite/src/components/wallet/WalletLayout/WalletLayout.tsx
index f6be2f0db27..22892c02cda 100644
--- a/packages/suite/src/components/wallet/WalletLayout/WalletLayout.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/WalletLayout.tsx
@@ -1,7 +1,9 @@
 import { ReactNode, useCallback } from 'react';
+
 import styled from 'styled-components';
 
 import { SkeletonRectangle } from '@trezor/components';
+
 import { AppState, ExtendedMessageDescriptor } from 'src/types/suite';
 import { useTranslation, useLayout } from 'src/hooks/suite';
 import { PageHeader } from 'src/components/suite/layouts/SuiteLayout';
diff --git a/packages/suite/src/components/wallet/WalletLayout/WalletSubpageHeading.tsx b/packages/suite/src/components/wallet/WalletLayout/WalletSubpageHeading.tsx
index 40146396d5a..c7bf383426e 100644
--- a/packages/suite/src/components/wallet/WalletLayout/WalletSubpageHeading.tsx
+++ b/packages/suite/src/components/wallet/WalletLayout/WalletSubpageHeading.tsx
@@ -1,9 +1,12 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { H2 } from '@trezor/components';
+import { spacingsPx } from '@trezor/theme';
+
 import type { ExtendedMessageDescriptor } from 'src/types/suite';
 import { Translation } from 'src/components/suite';
-import { spacingsPx } from '@trezor/theme';
 
 const HeaderWrapper = styled.div`
     display: flex;
diff --git a/packages/suite/src/components/wallet/hocs/index.tsx b/packages/suite/src/components/wallet/hocs/index.tsx
deleted file mode 100644
index c049aee224c..00000000000
--- a/packages/suite/src/components/wallet/hocs/index.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export { withSelectedAccountLoaded } from './withSelectedAccountLoaded';
-export type { WithSelectedAccountLoadedProps } from './withSelectedAccountLoaded';
diff --git a/packages/suite/src/components/wallet/hocs/withSelectedAccountLoaded.tsx b/packages/suite/src/components/wallet/hocs/withSelectedAccountLoaded.tsx
deleted file mode 100644
index 759a50e9d78..00000000000
--- a/packages/suite/src/components/wallet/hocs/withSelectedAccountLoaded.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { ComponentType } from 'react';
-import { WalletLayout } from 'src/components/wallet';
-import { useSelector } from 'src/hooks/suite';
-import type { ExtendedMessageDescriptor } from 'src/types/suite';
-import type { SelectedAccountLoaded } from '@suite-common/wallet-types';
-
-export interface WithSelectedAccountLoadedProps {
-    selectedAccount: SelectedAccountLoaded;
-}
-
-export interface WithSelectedAccountLoadedOptions {
-    title: ExtendedMessageDescriptor['id'];
-}
-
-export const withSelectedAccountLoaded = (
-    WrappedComponent: ComponentType<WithSelectedAccountLoadedProps>,
-    options: WithSelectedAccountLoadedOptions,
-) => {
-    const { title } = options;
-    const displayName = WrappedComponent.displayName || WrappedComponent.name || 'Component';
-    const Component = () => {
-        const selectedAccount = useSelector(state => state.wallet.selectedAccount);
-
-        if (selectedAccount.status !== 'loaded') {
-            return <WalletLayout title={title} isSubpage account={selectedAccount} />;
-        }
-
-        return <WrappedComponent selectedAccount={selectedAccount} />;
-    };
-    Component.displayName = `withSelectedAccountLoaded(${displayName})`;
-
-    return Component;
-};
diff --git a/packages/suite/src/components/wallet/index.tsx b/packages/suite/src/components/wallet/index.tsx
index f9090dc396b..58f1cf981f6 100644
--- a/packages/suite/src/components/wallet/index.tsx
+++ b/packages/suite/src/components/wallet/index.tsx
@@ -6,15 +6,12 @@ import { DiscoveryProgress } from './DiscoveryProgress';
 import { UtxoAnonymity } from './UtxoAnonymity';
 import { Pagination } from './Pagination';
 import { TransactionTimestamp } from './TransactionTimestamp';
-import { withSelectedAccountLoaded } from './hocs';
-import type { WithSelectedAccountLoadedProps } from './hocs';
 import { CoinjoinAccountDiscoveryProgress } from './CoinjoinAccountDiscoveryProgress/CoinjoinAccountDiscoveryProgress';
 
 export {
     WalletLayout,
     WalletSubpageHeading,
     DiscoveryProgress,
-    withSelectedAccountLoaded,
     InputError,
     AccountExceptionLayout,
     UtxoAnonymity,
@@ -22,5 +19,3 @@ export {
     TransactionTimestamp,
     CoinjoinAccountDiscoveryProgress,
 };
-
-export type { WithSelectedAccountLoadedProps };
diff --git a/packages/suite/src/config/onboarding/steps.ts b/packages/suite/src/config/onboarding/steps.ts
index 2867f6c5071..aef8a9bb053 100644
--- a/packages/suite/src/config/onboarding/steps.ts
+++ b/packages/suite/src/config/onboarding/steps.ts
@@ -1,6 +1,7 @@
+import { DeviceModelInternal } from '@trezor/connect';
+
 import type { Step } from 'src/types/onboarding';
 import * as STEP from 'src/constants/onboarding/steps';
-import { DeviceModelInternal } from '@trezor/connect';
 
 const commonPrerequisites: Step['prerequisites'] = [
     'transport-bridge',
@@ -40,6 +41,7 @@ const steps: Step[] = [
             DeviceModelInternal.T2B1,
             DeviceModelInternal.T3B1,
             DeviceModelInternal.T3T1,
+            DeviceModelInternal.T3W1,
         ],
         prerequisites: [...commonPrerequisites, 'device-recovery-mode', 'device-different'],
     },
@@ -50,6 +52,7 @@ const steps: Step[] = [
             DeviceModelInternal.T2B1,
             DeviceModelInternal.T3B1,
             { model: DeviceModelInternal.T3T1, minFwVersion: '2.8.0' },
+            DeviceModelInternal.T3W1,
         ],
         prerequisites: [...commonPrerequisites, 'device-recovery-mode', 'device-different'],
     },
diff --git a/packages/suite/src/constants/suite/device.ts b/packages/suite/src/constants/suite/device.ts
index 3fab592d270..79017b2c761 100644
--- a/packages/suite/src/constants/suite/device.ts
+++ b/packages/suite/src/constants/suite/device.ts
@@ -10,6 +10,7 @@ export const DEFAULT_STRENGTH: Record<DeviceModelInternal, number> = {
     [DeviceModelInternal.T2B1]: 128,
     [DeviceModelInternal.T3B1]: 128,
     [DeviceModelInternal.T3T1]: 128,
+    [DeviceModelInternal.T3W1]: 128,
 };
 
 export const MAX_ROWS_PER_PAGE: Record<DeviceModelInternal, number> = {
@@ -18,6 +19,7 @@ export const MAX_ROWS_PER_PAGE: Record<DeviceModelInternal, number> = {
     [DeviceModelInternal.T2B1]: 4,
     [DeviceModelInternal.T3B1]: 4,
     [DeviceModelInternal.T3T1]: 7,
+    [DeviceModelInternal.T3W1]: 7, // TODO T3W1
 };
 
 export const MAX_CHARACTERS_ON_ROW: Record<DeviceModelInternal, number> = {
@@ -26,6 +28,7 @@ export const MAX_CHARACTERS_ON_ROW: Record<DeviceModelInternal, number> = {
     [DeviceModelInternal.T2B1]: 18,
     [DeviceModelInternal.T3B1]: 18,
     [DeviceModelInternal.T3T1]: 18,
+    [DeviceModelInternal.T3W1]: 18, // TODO T3W1
 };
 
 export const CHARACTER_OFFSET_FOR_CONTINUES_ARROW: Record<DeviceModelInternal, number> = {
@@ -34,6 +37,7 @@ export const CHARACTER_OFFSET_FOR_CONTINUES_ARROW: Record<DeviceModelInternal, n
     [DeviceModelInternal.T2B1]: 2,
     [DeviceModelInternal.T3B1]: 2,
     [DeviceModelInternal.T3T1]: 4,
+    [DeviceModelInternal.T3W1]: 4, // TODO T3W1
 };
 
 export const CHARACTER_OFFSET_FOR_NEXT_ARROW: Record<DeviceModelInternal, number> = {
@@ -42,6 +46,7 @@ export const CHARACTER_OFFSET_FOR_NEXT_ARROW: Record<DeviceModelInternal, number
     [DeviceModelInternal.T2B1]: 2,
     [DeviceModelInternal.T3B1]: 2,
     [DeviceModelInternal.T3T1]: 4,
+    [DeviceModelInternal.T3W1]: 4, // TODO T3W1
 };
 
 export const SUPPORTS_DEVICE_AUTHENTICITY_CHECK: Record<DeviceModelInternal, boolean> = {
@@ -50,6 +55,7 @@ export const SUPPORTS_DEVICE_AUTHENTICITY_CHECK: Record<DeviceModelInternal, boo
     [DeviceModelInternal.T2B1]: true,
     [DeviceModelInternal.T3B1]: true,
     [DeviceModelInternal.T3T1]: true,
+    [DeviceModelInternal.T3W1]: true,
 };
 
 export const HAS_MONOCHROME_SCREEN: Record<DeviceModelInternal, boolean> = {
@@ -58,4 +64,5 @@ export const HAS_MONOCHROME_SCREEN: Record<DeviceModelInternal, boolean> = {
     [DeviceModelInternal.T2B1]: true,
     [DeviceModelInternal.T3B1]: true,
     [DeviceModelInternal.T3T1]: false,
+    [DeviceModelInternal.T3W1]: false,
 };
diff --git a/packages/suite/src/constants/suite/ethStaking.ts b/packages/suite/src/constants/suite/ethStaking.ts
deleted file mode 100644
index a679fa6a457..00000000000
--- a/packages/suite/src/constants/suite/ethStaking.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { BigNumber } from '@trezor/utils/src/bigNumber';
-
-export const MIN_ETH_AMOUNT_FOR_STAKING = new BigNumber(0.1);
-export const MIN_ETH_FOR_WITHDRAWALS = new BigNumber(0.03);
-export const MIN_ETH_BALANCE_FOR_STAKING = MIN_ETH_AMOUNT_FOR_STAKING.plus(MIN_ETH_FOR_WITHDRAWALS);
-
-export const BACKUP_REWARD_PAYOUT_DAYS = 7;
diff --git a/packages/suite/src/constants/suite/experimental.ts b/packages/suite/src/constants/suite/experimental.ts
index fc2c5d59b39..174d16dcdbb 100644
--- a/packages/suite/src/constants/suite/experimental.ts
+++ b/packages/suite/src/constants/suite/experimental.ts
@@ -1,15 +1,10 @@
 import { TranslationKey } from '@suite-common/intl-types';
-import { EXPERIMENTAL_PASSWORD_MANAGER_KB_URL, TOR_SNOWFLAKE_KB_URL, Url } from '@trezor/urls';
-
-import { isDesktop } from '@trezor/env-utils';
 import { desktopApi } from '@trezor/suite-desktop-api';
+import { EXPERIMENTAL_PASSWORD_MANAGER_KB_URL, TOR_SNOWFLAKE_PROJECT_URL, Url } from '@trezor/urls';
+
 import { Dispatch } from '../../types/suite';
 
-export type ExperimentalFeature =
-    | 'password-manager'
-    | 'bnb-smart-chain'
-    | 'tor-snowflake'
-    | 'automatic-update';
+export type ExperimentalFeature = 'password-manager' | 'tor-snowflake';
 
 export type ExperimentalFeatureConfig = {
     title: TranslationKey;
@@ -25,21 +20,20 @@ export const EXPERIMENTAL_FEATURES: Record<ExperimentalFeature, ExperimentalFeat
         description: 'TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION',
         knowledgeBaseUrl: EXPERIMENTAL_PASSWORD_MANAGER_KB_URL,
     },
-    'automatic-update': {
-        title: 'TR_EXPERIMENTAL_AUTOMATIC_UPDATE',
-        description: 'TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION',
-        isDisabled: () => !isDesktop(),
-        onToggle: ({ newValue }) => {
-            desktopApi.setAutomaticUpdateEnabled(newValue);
-        },
-    },
-    'bnb-smart-chain': {
-        title: 'TR_EXPERIMENTAL_BNB_SMART_CHAIN',
-        description: 'TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON',
-    },
     'tor-snowflake': {
         title: 'TR_EXPERIMENTAL_TOR_SNOWFLAKE',
         description: 'TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION',
-        knowledgeBaseUrl: TOR_SNOWFLAKE_KB_URL,
+        knowledgeBaseUrl: TOR_SNOWFLAKE_PROJECT_URL,
+        onToggle: async ({ newValue }) => {
+            if (!newValue) {
+                const result = await desktopApi.getTorSettings();
+                if (result.success && result.payload.snowflakeBinaryPath !== '') {
+                    await desktopApi.changeTorSettings({
+                        ...result.payload,
+                        snowflakeBinaryPath: '',
+                    });
+                }
+            }
+        },
     },
 };
diff --git a/packages/suite/src/constants/suite/firmware.ts b/packages/suite/src/constants/suite/firmware.ts
new file mode 100644
index 00000000000..0f4e7fcadfa
--- /dev/null
+++ b/packages/suite/src/constants/suite/firmware.ts
@@ -0,0 +1,13 @@
+import { FirmwareHashCheckError, FirmwareRevisionCheckError } from '@trezor/connect';
+
+export const skippedRevisionCheckErrors = [
+    'cannot-perform-check-offline',
+    'other-error',
+] satisfies FirmwareRevisionCheckError[];
+
+export const skippedHashCheckErrors = [
+    'check-skipped',
+    'check-unsupported',
+    // this could be serious, but it's also caught by revision check, which handles edge-cases better, so it's skipped here
+    'unknown-release',
+] satisfies FirmwareHashCheckError[];
diff --git a/packages/suite/src/constants/suite/homescreens.ts b/packages/suite/src/constants/suite/homescreens.ts
index f27d87bdcf1..e59e74234dc 100644
--- a/packages/suite/src/constants/suite/homescreens.ts
+++ b/packages/suite/src/constants/suite/homescreens.ts
@@ -73,4 +73,11 @@ export const getHomescreens = (isBitcoinOnlyFirmware: boolean) => ({
         'solid',
         'smile-2',
     ],
+    [DeviceModelInternal.T3W1]: [
+        isBitcoinOnlyFirmware ? 'orange' : 'green',
+        'gradient',
+        isBitcoinOnlyFirmware ? 'green' : 'orange',
+        'solid',
+        'smile-2',
+    ], // TODO T3W1
 });
diff --git a/packages/suite/src/constants/suite/protocol.ts b/packages/suite/src/constants/suite/protocol.ts
deleted file mode 100644
index d54643ba091..00000000000
--- a/packages/suite/src/constants/suite/protocol.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { NetworkSymbol } from '@suite-common/wallet-config';
-
-export enum PROTOCOL_SCHEME {
-    BITCOIN = 'bitcoin',
-    LITECOIN = 'litecoin',
-    BITCOIN_CASH = 'bitcoincash',
-    BITCOIN_GOLD = 'bitcoingold',
-    DASH = 'dash',
-    DIGIBYTE = 'digibyte',
-    DOGECOIN = 'dogecoin',
-    NAMECOIN = 'namecoin',
-    VERTCOIN = 'vertcoin',
-    ZCASH = 'zcash',
-    // only bitcoin-like coins are supported in uri handler, others are required for QR code scan
-    ETHEREUM = 'ethereum',
-    ETHEREUM_CLASSIC = 'ethclassic',
-    XRP = 'ripple',
-    CARDANO = 'cardano',
-}
-
-export const PROTOCOL_TO_NETWORK: Partial<{
-    [key in PROTOCOL_SCHEME]: NetworkSymbol;
-}> = {
-    [PROTOCOL_SCHEME.BITCOIN]: 'btc',
-    [PROTOCOL_SCHEME.LITECOIN]: 'ltc',
-    [PROTOCOL_SCHEME.BITCOIN_CASH]: 'bch',
-    [PROTOCOL_SCHEME.BITCOIN_GOLD]: 'btg',
-    [PROTOCOL_SCHEME.DASH]: 'dash',
-    [PROTOCOL_SCHEME.DIGIBYTE]: 'dgb',
-    [PROTOCOL_SCHEME.DOGECOIN]: 'doge',
-    [PROTOCOL_SCHEME.NAMECOIN]: 'nmc',
-    [PROTOCOL_SCHEME.VERTCOIN]: 'vtc',
-    [PROTOCOL_SCHEME.ZCASH]: 'zec',
-    [PROTOCOL_SCHEME.ETHEREUM]: 'eth',
-    [PROTOCOL_SCHEME.ETHEREUM_CLASSIC]: 'etc',
-    [PROTOCOL_SCHEME.XRP]: 'xrp',
-    [PROTOCOL_SCHEME.CARDANO]: 'ada',
-};
diff --git a/packages/suite/src/constants/suite/routes.ts b/packages/suite/src/constants/suite/routes.ts
index 93e30ecd33a..eae5e34551c 100644
--- a/packages/suite/src/constants/suite/routes.ts
+++ b/packages/suite/src/constants/suite/routes.ts
@@ -1,8 +1,8 @@
 import { ArrayElement } from '@trezor/type-utils';
 import { Route } from '@suite-common/suite-types';
 import { routes } from '@suite-common/suite-config';
-
 import { AccountType, NetworkSymbol } from '@suite-common/wallet-config';
+
 import { RouteParams } from 'src/utils/suite/router';
 
 export type SettingsBackRoute = {
diff --git a/packages/suite/src/constants/wallet/coinmarket/metadata.ts b/packages/suite/src/constants/wallet/coinmarket/metadata.ts
index fa5e4ee3142..937f4f70aae 100644
--- a/packages/suite/src/constants/wallet/coinmarket/metadata.ts
+++ b/packages/suite/src/constants/wallet/coinmarket/metadata.ts
@@ -1,2 +1,2 @@
-export const InvityAPIReloadDataAfterMs = 10 * 60 * 1000; // 10 minutes
-export const InvityAPIReloadQuotesAfterSeconds = 30;
+export const INVITY_API_RELOAD_DATA_AFTER_MS = 10 * 60 * 1000; // 10 minutes
+export const INVITY_API_RELOAD_QUOTES_AFTER_SECONDS = 30;
diff --git a/packages/suite/src/constants/wallet/coinmarket/regional.ts b/packages/suite/src/constants/wallet/coinmarket/regional.ts
index 9094785a2c2..d39d4d5df9a 100644
--- a/packages/suite/src/constants/wallet/coinmarket/regional.ts
+++ b/packages/suite/src/constants/wallet/coinmarket/regional.ts
@@ -1,3 +1,5 @@
+import { isArrayMember } from '@trezor/utils';
+
 class Regional {
     unknownCountry = 'unknown';
 
@@ -302,8 +304,8 @@ class Regional {
         'SK',
     ] as const;
 
-    isInEEA(country: string) {
-        return this.EEACountryCodes.includes(country as EEACountryCodes);
+    isInEEA(country: string): country is EEACountryCodes {
+        return isArrayMember(country, this.EEACountryCodes);
     }
 }
 
diff --git a/packages/suite/src/hooks/coinjoin/useCoinjoinAccountLoadingProgress.ts b/packages/suite/src/hooks/coinjoin/useCoinjoinAccountLoadingProgress.ts
index ce93b09aa31..224fd616801 100644
--- a/packages/suite/src/hooks/coinjoin/useCoinjoinAccountLoadingProgress.ts
+++ b/packages/suite/src/hooks/coinjoin/useCoinjoinAccountLoadingProgress.ts
@@ -1,4 +1,5 @@
 import { useEffect, useReducer } from 'react';
+
 import { ScanProgressInfo } from '@trezor/coinjoin';
 
 import { CoinjoinService } from 'src/services/coinjoin';
diff --git a/packages/suite/src/hooks/coinjoin/useCoinjoinSessionBlockers.ts b/packages/suite/src/hooks/coinjoin/useCoinjoinSessionBlockers.ts
index df2d447e5c9..3adac5b8a7b 100644
--- a/packages/suite/src/hooks/coinjoin/useCoinjoinSessionBlockers.ts
+++ b/packages/suite/src/hooks/coinjoin/useCoinjoinSessionBlockers.ts
@@ -1,7 +1,7 @@
-import { useSelector, useTranslation } from 'src/hooks/suite';
 import { Feature, selectFeatureMessageContent } from '@suite-common/message-system';
-import { selectLanguage } from 'src/reducers/suite/suiteReducer';
 
+import { useSelector, useTranslation } from 'src/hooks/suite';
+import { selectLanguage } from 'src/reducers/suite/suiteReducer';
 import { selectCoinjoinSessionBlockerByAccountKey } from 'src/reducers/wallet/coinjoinReducer';
 
 export const useCoinjoinSessionBlockers = (
diff --git a/packages/suite/src/hooks/coinjoin/useCoinjoinSessionPhase.ts b/packages/suite/src/hooks/coinjoin/useCoinjoinSessionPhase.ts
index 248001c28c0..859abe9e2d3 100644
--- a/packages/suite/src/hooks/coinjoin/useCoinjoinSessionPhase.ts
+++ b/packages/suite/src/hooks/coinjoin/useCoinjoinSessionPhase.ts
@@ -1,4 +1,5 @@
 import { useEffect, useState, useCallback } from 'react';
+
 import { SESSION_PHASE_TRANSITION_DELAY } from 'src/constants/suite/coinjoin';
 import { useSelector } from 'src/hooks/suite/useSelector';
 import { selectSessionByAccountKey } from 'src/reducers/wallet/coinjoinReducer';
diff --git a/packages/suite/src/hooks/guide/useGuide.ts b/packages/suite/src/hooks/guide/useGuide.ts
index 4d5cf64bf81..840b2d2cfca 100644
--- a/packages/suite/src/hooks/guide/useGuide.ts
+++ b/packages/suite/src/hooks/guide/useGuide.ts
@@ -1,6 +1,8 @@
 import { useMemo } from 'react';
+
 import { useDispatch, useSelector, useLayoutSize } from 'src/hooks/suite';
 import { close, open } from 'src/actions/suite/guideActions';
+
 import { usePreferredModal } from '../suite/usePreferredModal';
 
 export const GUIDE_ANIMATION_DURATION_MS = 300;
diff --git a/packages/suite/src/hooks/guide/useGuideKeyboard.ts b/packages/suite/src/hooks/guide/useGuideKeyboard.ts
index 3aafa38c586..0669651f789 100644
--- a/packages/suite/src/hooks/guide/useGuideKeyboard.ts
+++ b/packages/suite/src/hooks/guide/useGuideKeyboard.ts
@@ -1,6 +1,7 @@
 import { useCallback, useEffect } from 'react';
 
 import { KEYBOARD_CODE } from '@trezor/components';
+
 import { useGuide } from 'src/hooks/guide';
 
 export const useGuideKeyboard = () => {
diff --git a/packages/suite/src/hooks/guide/useGuideLoadArticle.ts b/packages/suite/src/hooks/guide/useGuideLoadArticle.ts
index 4583211e45a..29bd237765b 100644
--- a/packages/suite/src/hooks/guide/useGuideLoadArticle.ts
+++ b/packages/suite/src/hooks/guide/useGuideLoadArticle.ts
@@ -1,5 +1,7 @@
 import { useState, useEffect } from 'react';
+
 import type { GuideNode } from '@suite-common/suite-types';
+
 import type { Locale } from 'src/config/suite/languages';
 
 export const loadPageMarkdownFile = async (id: string, language = 'en'): Promise<string> => {
diff --git a/packages/suite/src/hooks/guide/useGuideSearch.ts b/packages/suite/src/hooks/guide/useGuideSearch.ts
index 3e6b7817328..913215ee606 100644
--- a/packages/suite/src/hooks/guide/useGuideSearch.ts
+++ b/packages/suite/src/hooks/guide/useGuideSearch.ts
@@ -1,5 +1,7 @@
 import { useState, useEffect, useMemo } from 'react';
+
 import { GuideCategory, GuideArticle } from '@suite-common/suite-types';
+
 import { loadPageMarkdownFile } from 'src/hooks/guide/useGuideLoadArticle';
 
 const SEARCH_DELAY = 300;
diff --git a/packages/suite/src/hooks/settings/backends/useBackendReconnection.ts b/packages/suite/src/hooks/settings/backends/useBackendReconnection.ts
index f1291c74012..2b42aff8c9b 100644
--- a/packages/suite/src/hooks/settings/backends/useBackendReconnection.ts
+++ b/packages/suite/src/hooks/settings/backends/useBackendReconnection.ts
@@ -1,9 +1,9 @@
 import { useState, useEffect } from 'react';
 
 import { reconnectBlockchainThunk } from '@suite-common/wallet-core';
+import { NetworkSymbol } from '@suite-common/wallet-config';
 
 import { useDispatch } from 'src/hooks/suite';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 
 export const useBackendReconnection = (
     coin: NetworkSymbol,
diff --git a/packages/suite/src/hooks/settings/backends/useBackendsForm.ts b/packages/suite/src/hooks/settings/backends/useBackendsForm.ts
index e0bc29befa6..97fee4a3d5d 100644
--- a/packages/suite/src/hooks/settings/backends/useBackendsForm.ts
+++ b/packages/suite/src/hooks/settings/backends/useBackendsForm.ts
@@ -1,15 +1,16 @@
 import { useState } from 'react';
 import { useForm } from 'react-hook-form';
-import { analytics, EventType } from '@trezor/suite-analytics';
 
-import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
+import { analytics, EventType } from '@trezor/suite-analytics';
 import { isUrl } from '@trezor/utils';
-import { isOnionUrl } from 'src/utils/suite/tor';
 import { blockchainActions } from '@suite-common/wallet-core';
 import { isElectrumUrl } from '@suite-common/wallet-utils';
 import { NetworkSymbol, BackendType } from '@suite-common/wallet-config';
 import { BackendSettings } from '@suite-common/wallet-types';
 
+import { isOnionUrl } from 'src/utils/suite/tor';
+import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
+
 export type BackendOption = BackendType | 'default';
 
 type BackendsFormData = {
diff --git a/packages/suite/src/hooks/settings/backends/useCustomBackends.ts b/packages/suite/src/hooks/settings/backends/useCustomBackends.ts
index 9497f22a23b..ff3a458d3c8 100644
--- a/packages/suite/src/hooks/settings/backends/useCustomBackends.ts
+++ b/packages/suite/src/hooks/settings/backends/useCustomBackends.ts
@@ -1,6 +1,7 @@
-import { useSelector } from 'src/hooks/suite';
 import { getCustomBackends } from '@suite-common/wallet-utils';
 
+import { useSelector } from 'src/hooks/suite';
+
 export const useCustomBackends = () => {
     const blockchains = useSelector(state => state.wallet.blockchain);
 
diff --git a/packages/suite/src/hooks/settings/backends/useDefaultUrls.ts b/packages/suite/src/hooks/settings/backends/useDefaultUrls.ts
index fece359e1c3..6d0856c6ab7 100644
--- a/packages/suite/src/hooks/settings/backends/useDefaultUrls.ts
+++ b/packages/suite/src/hooks/settings/backends/useDefaultUrls.ts
@@ -1,4 +1,5 @@
 import { useState, useEffect } from 'react';
+
 import TrezorConnect, { BlockchainLink } from '@trezor/connect';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 
diff --git a/packages/suite/src/hooks/settings/useEnabledNetworks.ts b/packages/suite/src/hooks/settings/useEnabledNetworks.ts
deleted file mode 100644
index 128612beb49..00000000000
--- a/packages/suite/src/hooks/settings/useEnabledNetworks.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Network, NetworkSymbol, getMainnets, getTestnets } from '@suite-common/wallet-config';
-import { changeCoinVisibility } from 'src/actions/settings/walletSettingsActions';
-import { useActions, useSelector } from 'src/hooks/suite';
-
-import {
-    selectHasExperimentalFeature,
-    selectIsDebugModeActive,
-} from 'src/reducers/suite/suiteReducer';
-
-type EnabledNetworks = {
-    mainnets: Network[];
-    testnets: Network[];
-    enabledNetworks: NetworkSymbol[];
-    setEnabled: (symbol: NetworkSymbol, enabled: boolean) => void;
-};
-
-export const useEnabledNetworks = (): EnabledNetworks => {
-    const enabledNetworks = useSelector(state => state.wallet.settings.enabledNetworks);
-    const isDebug = useSelector(selectIsDebugModeActive);
-    const bnbExperimentalFeature = useSelector(selectHasExperimentalFeature('bnb-smart-chain'));
-
-    const mainnets = getMainnets(isDebug, bnbExperimentalFeature);
-
-    const testnets = getTestnets(isDebug);
-
-    const { setEnabled } = useActions({
-        setEnabled: changeCoinVisibility,
-    });
-
-    return {
-        mainnets,
-        testnets,
-        enabledNetworks,
-        setEnabled,
-    };
-};
diff --git a/packages/suite/src/hooks/settings/useNetworkSupport.ts b/packages/suite/src/hooks/settings/useNetworkSupport.ts
new file mode 100644
index 00000000000..c5373d6a13e
--- /dev/null
+++ b/packages/suite/src/hooks/settings/useNetworkSupport.ts
@@ -0,0 +1,26 @@
+import { Network, getMainnets, getTestnets } from '@suite-common/wallet-config';
+import { selectDeviceSupportedNetworks } from '@suite-common/wallet-core';
+import { arrayPartition } from '@trezor/utils';
+
+import { useSelector } from 'src/hooks/suite';
+import { selectIsDebugModeActive } from 'src/reducers/suite/suiteReducer';
+
+export const useNetworkSupport = () => {
+    const isDebug = useSelector(selectIsDebugModeActive);
+    const deviceSupportedNetworkSymbols = useSelector(selectDeviceSupportedNetworks);
+
+    const mainnets = getMainnets(isDebug);
+    const testnets = getTestnets(isDebug);
+
+    const isNetworkSupported = (network: Network) =>
+        deviceSupportedNetworkSymbols.includes(network.symbol);
+
+    const [supportedMainnets, unsupportedMainnets] = arrayPartition(mainnets, isNetworkSupported);
+    const supportedTestnets = testnets.filter(isNetworkSupported);
+
+    return {
+        supportedMainnets,
+        unsupportedMainnets,
+        supportedTestnets,
+    };
+};
diff --git a/packages/suite/src/hooks/suite/__fixtures__/useFilteredModal.ts b/packages/suite/src/hooks/suite/__fixtures__/useFilteredModal.ts
index 5b81f1f6af5..8791c619296 100644
--- a/packages/suite/src/hooks/suite/__fixtures__/useFilteredModal.ts
+++ b/packages/suite/src/hooks/suite/__fixtures__/useFilteredModal.ts
@@ -1,4 +1,5 @@
 import { MODAL } from 'src/actions/suite/constants';
+
 import { useFilteredModal } from '../useFilteredModal';
 
 export const filters: Parameters<typeof useFilteredModal>[] = [
diff --git a/packages/suite/src/hooks/suite/__tests__/useCountdownTimer.test.tsx b/packages/suite/src/hooks/suite/__tests__/useCountdownTimer.test.tsx
index fad4f83cfb8..aaeb4d5910a 100644
--- a/packages/suite/src/hooks/suite/__tests__/useCountdownTimer.test.tsx
+++ b/packages/suite/src/hooks/suite/__tests__/useCountdownTimer.test.tsx
@@ -1,4 +1,5 @@
 import { act, render } from '@testing-library/react';
+
 import { fixtures } from 'src/hooks/suite/__fixtures__/useCountdownTimer';
 import { useCountdownTimer } from 'src/hooks/suite/useCountdownTimer';
 
diff --git a/packages/suite/src/hooks/suite/__tests__/useDiscovery.test.tsx b/packages/suite/src/hooks/suite/__tests__/useDiscovery.test.tsx
index 37f28b4d9b3..82243cb45e5 100644
--- a/packages/suite/src/hooks/suite/__tests__/useDiscovery.test.tsx
+++ b/packages/suite/src/hooks/suite/__tests__/useDiscovery.test.tsx
@@ -14,7 +14,7 @@ import { actions } from '../__fixtures__/useDiscovery';
 const discoveryReducer = prepareDiscoveryReducer(extraDependencies);
 const deviceReducer = prepareDeviceReducer(extraDependencies);
 
-export const getInitialState = (action: any = { type: 'initial' }) => ({
+const getInitialState = (action: any = { type: 'initial' }) => ({
     wallet: {
         discovery: discoveryReducer(undefined, action),
     },
diff --git a/packages/suite/src/hooks/suite/__tests__/useFilteredModal.test.tsx b/packages/suite/src/hooks/suite/__tests__/useFilteredModal.test.tsx
index 1c8495927bb..1c47a0454dc 100644
--- a/packages/suite/src/hooks/suite/__tests__/useFilteredModal.test.tsx
+++ b/packages/suite/src/hooks/suite/__tests__/useFilteredModal.test.tsx
@@ -1,9 +1,12 @@
 import { Provider } from 'react-redux';
-import { configureStore } from 'src/support/tests/configureStore';
+
 import { render } from '@testing-library/react';
+
+import { configureStore } from 'src/support/tests/configureStore';
+import type { State as ModalState } from 'src/reducers/suite/modalReducer';
+
 import { useFilteredModal } from '../useFilteredModal';
 import { filters, fixtures } from '../__fixtures__/useFilteredModal';
-import type { State as ModalState } from 'src/reducers/suite/modalReducer';
 
 const mockStore = configureStore<{ modal: ModalState }, any>();
 
diff --git a/packages/suite/src/hooks/suite/__tests__/usePinModal.test.ts b/packages/suite/src/hooks/suite/__tests__/usePinModal.test.ts
index 28277c38115..cf8e657c440 100644
--- a/packages/suite/src/hooks/suite/__tests__/usePinModal.test.ts
+++ b/packages/suite/src/hooks/suite/__tests__/usePinModal.test.ts
@@ -1,4 +1,5 @@
 import { ButtonRequest } from '@suite-common/suite-types';
+
 import { usePinWithoutSelector } from '../usePinModal';
 
 describe('usePinWithoutSelector', () => {
diff --git a/packages/suite/src/hooks/suite/index.ts b/packages/suite/src/hooks/suite/index.ts
index 0ac089692d7..5aa871ce27e 100644
--- a/packages/suite/src/hooks/suite/index.ts
+++ b/packages/suite/src/hooks/suite/index.ts
@@ -22,6 +22,7 @@ export { useDispatch } from './useDispatch';
 export { usePasswords } from './usePasswords';
 export { useDebugLanguageShortcut } from './useDebugLanguageShortcut';
 export { useDisplayMode } from './useDisplayMode';
+export { useDefaultAccountLabel } from './useDefaultAccountLabel';
 
 // replaced in suite-native
 export { useLocales } from 'src/hooks/suite/useLocales';
diff --git a/packages/suite/src/hooks/suite/useActions.ts b/packages/suite/src/hooks/suite/useActions.ts
index 83f37accfd4..ad345304fe2 100644
--- a/packages/suite/src/hooks/suite/useActions.ts
+++ b/packages/suite/src/hooks/suite/useActions.ts
@@ -1,6 +1,8 @@
 import { useMemo, useRef } from 'react';
-import { ActionCreatorsMapObject, bindActionCreators } from 'redux';
 import { useDispatch } from 'react-redux';
+
+import { ActionCreatorsMapObject, bindActionCreators } from 'redux';
+
 import type { Action, ThunkAction } from 'src/types/suite';
 
 /**
diff --git a/packages/suite/src/hooks/suite/useAnonymityStatus.ts b/packages/suite/src/hooks/suite/useAnonymityStatus.ts
index 78db85de42a..f72f92a9ac0 100644
--- a/packages/suite/src/hooks/suite/useAnonymityStatus.ts
+++ b/packages/suite/src/hooks/suite/useAnonymityStatus.ts
@@ -1,7 +1,8 @@
-import { useSelector } from './useSelector';
 import { AnonymityStatus } from 'src/constants/suite/coinjoin';
 import { selectCurrentTargetAnonymity } from 'src/reducers/wallet/coinjoinReducer';
 
+import { useSelector } from './useSelector';
+
 const getAnonymityStatus = (targetAnonymity: number) => {
     if (targetAnonymity < AnonymityStatus.Bad) {
         return AnonymityStatus.Bad;
diff --git a/packages/suite/src/hooks/suite/useBridgeDesktopApi.ts b/packages/suite/src/hooks/suite/useBridgeDesktopApi.ts
new file mode 100644
index 00000000000..aa9a7401690
--- /dev/null
+++ b/packages/suite/src/hooks/suite/useBridgeDesktopApi.ts
@@ -0,0 +1,55 @@
+import { useEffect, useState } from 'react';
+
+import { desktopApi } from '@trezor/suite-desktop-api';
+import { BridgeSettings } from '@trezor/suite-desktop-api/src/messages';
+
+interface Process {
+    service: boolean;
+    process: boolean;
+}
+
+export const useBridgeDesktopApi = () => {
+    const [bridgeProcess, setBridgeProcess] = useState<Process>({ service: false, process: false });
+    const [bridgeSettings, setBridgeSettings] = useState<BridgeSettings | null>(null);
+    const [bridgeDesktopApiError, setBridgeDesktopApiError] = useState<string | null>(null);
+
+    useEffect(() => {
+        desktopApi.getBridgeStatus().then(result => {
+            if (result.success) {
+                setBridgeProcess(result.payload);
+            }
+        });
+
+        desktopApi.on('bridge/status', (status: Process) => {
+            setBridgeProcess(status);
+        });
+
+        desktopApi.getBridgeSettings().then(result => {
+            if (result.success) {
+                setBridgeSettings(result.payload);
+            } else {
+                setBridgeDesktopApiError(result.error);
+            }
+        });
+
+        desktopApi.on('bridge/settings', (settings: BridgeSettings) => {
+            setBridgeSettings(settings);
+        });
+
+        return () => {
+            desktopApi.removeAllListeners('bridge/status');
+            desktopApi.removeAllListeners('bridge/settings');
+        };
+    }, []);
+
+    const changeBridgeSettings = (settings: BridgeSettings) => {
+        desktopApi.changeBridgeSettings(settings);
+    };
+
+    return {
+        bridgeSettings,
+        bridgeProcess,
+        changeBridgeSettings,
+        bridgeDesktopApiError,
+    };
+};
diff --git a/packages/suite/src/hooks/suite/useClearAnchorHighlightOnClick.ts b/packages/suite/src/hooks/suite/useClearAnchorHighlightOnClick.ts
index 26272d6148d..be42489a6af 100644
--- a/packages/suite/src/hooks/suite/useClearAnchorHighlightOnClick.ts
+++ b/packages/suite/src/hooks/suite/useClearAnchorHighlightOnClick.ts
@@ -1,7 +1,9 @@
 import { RefObject, useEffect } from 'react';
+
+import { onAnchorChange } from 'src/actions/suite/routerActions';
+
 import { useDispatch } from './useDispatch';
 import { useSelector } from './useSelector';
-import { onAnchorChange } from 'src/actions/suite/routerActions';
 
 export const useClearAnchorHighlightOnClick = (elementRef: RefObject<HTMLElement>) => {
     const anchor = useSelector(state => state.router.anchor);
diff --git a/packages/suite/src/hooks/suite/useCountdownTimer.ts b/packages/suite/src/hooks/suite/useCountdownTimer.ts
index 9a992028feb..92791519e5c 100644
--- a/packages/suite/src/hooks/suite/useCountdownTimer.ts
+++ b/packages/suite/src/hooks/suite/useCountdownTimer.ts
@@ -1,4 +1,5 @@
 import { useEffect, useState, useCallback } from 'react';
+
 import intervalToDuration from 'date-fns/intervalToDuration';
 
 export const useCountdownTimer = (deadline: number) => {
diff --git a/packages/suite/src/hooks/suite/useDebugLanguageShortcut.ts b/packages/suite/src/hooks/suite/useDebugLanguageShortcut.ts
index ccf7489e691..063a7f602cd 100644
--- a/packages/suite/src/hooks/suite/useDebugLanguageShortcut.ts
+++ b/packages/suite/src/hooks/suite/useDebugLanguageShortcut.ts
@@ -1,13 +1,15 @@
 import { useCallback, useEffect } from 'react';
 
 import { KEYBOARD_CODE } from '@trezor/components';
-import { useSelector } from './useSelector';
-import { useDispatch } from './useDispatch';
+
 import { setLanguage } from 'src/actions/settings/languageActions';
 import LANGUAGES, { Locale } from 'src/config/suite/languages';
 import { setAutodetect } from 'src/actions/suite/suiteActions';
 import { selectIsDebugModeActive, selectLanguage } from 'src/reducers/suite/suiteReducer';
 
+import { useDispatch } from './useDispatch';
+import { useSelector } from './useSelector';
+
 const languages: { value: Locale; label: string }[] = Object.entries(LANGUAGES)
     .filter(lang => ['official', 'community'].includes(lang[1].type || ''))
     .map(([value, { name }]) => ({ value: value as Locale, label: name }));
diff --git a/packages/suite/src/hooks/suite/useDefaultAccountLabel.ts b/packages/suite/src/hooks/suite/useDefaultAccountLabel.ts
new file mode 100644
index 00000000000..dc7f7a4bf6d
--- /dev/null
+++ b/packages/suite/src/hooks/suite/useDefaultAccountLabel.ts
@@ -0,0 +1,36 @@
+import { useCallback } from 'react';
+
+import { getTitleForNetwork, getTitleForCoinjoinAccount } from '@suite-common/wallet-utils';
+import { AccountType, NetworkSymbol } from '@suite-common/wallet-config';
+
+import { useTranslation } from './useTranslation';
+
+export interface GetDefaultAccountLabelParams {
+    accountType: AccountType;
+    symbol: NetworkSymbol;
+    index?: number;
+}
+
+export const useDefaultAccountLabel = () => {
+    const { translationString } = useTranslation();
+
+    const getDefaultAccountLabel = useCallback(
+        ({ accountType, symbol, index = 0 }: GetDefaultAccountLabelParams): string => {
+            if (accountType === 'coinjoin') {
+                return translationString(getTitleForCoinjoinAccount(symbol));
+            }
+
+            const displayedAccountNumber = index + 1;
+
+            return translationString('LABELING_ACCOUNT', {
+                networkName: translationString(getTitleForNetwork(symbol)), // Bitcoin, Ethereum, ...
+                index: displayedAccountNumber,
+            });
+        },
+        [translationString],
+    );
+
+    return {
+        getDefaultAccountLabel,
+    };
+};
diff --git a/packages/suite/src/hooks/suite/useDevice.ts b/packages/suite/src/hooks/suite/useDevice.ts
index 13deda0b3b8..79aaa0dfc50 100644
--- a/packages/suite/src/hooks/suite/useDevice.ts
+++ b/packages/suite/src/hooks/suite/useDevice.ts
@@ -1,11 +1,11 @@
 import { useCallback } from 'react';
 
 import { selectDevice } from '@suite-common/wallet-core';
+import { TrezorDevice } from '@suite-common/suite-types';
 
-import { SUITE } from 'src/actions/suite/constants';
+import { selectIsDeviceOrUiLocked } from 'src/reducers/suite/suiteReducer';
 
 import { useSelector } from './useSelector';
-import { TrezorDevice } from '@suite-common/suite-types';
 
 type Result = {
     device?: TrezorDevice;
@@ -14,17 +14,16 @@ type Result = {
 
 export const useDevice = (): Result => {
     const device = useSelector(selectDevice);
-    const locks = useSelector(state => state.suite.locks);
+    const isDeviceOrUiLocked = useSelector(selectIsDeviceOrUiLocked);
 
     const isLocked = useCallback(
         (ignoreDisconnectedDevice = false) => {
             if (!device?.connected && !ignoreDisconnectedDevice) return true;
-            if (locks.includes(SUITE.LOCK_TYPE.DEVICE) || locks.includes(SUITE.LOCK_TYPE.UI))
-                return true;
+            if (isDeviceOrUiLocked) return true;
 
             return false;
         },
-        [device, locks],
+        [device, isDeviceOrUiLocked],
     );
 
     return {
diff --git a/packages/suite/src/hooks/suite/useDispatch.ts b/packages/suite/src/hooks/suite/useDispatch.ts
index 412ad303306..ec7a510cfae 100644
--- a/packages/suite/src/hooks/suite/useDispatch.ts
+++ b/packages/suite/src/hooks/suite/useDispatch.ts
@@ -1,5 +1,7 @@
 import { useDispatch as useReduxDispatch } from 'react-redux';
+
 import { ThunkDispatch } from 'redux-thunk';
+
 import { Action, AppState } from 'src/types/suite';
 
 export const useDispatch: () => ThunkDispatch<AppState, any, Action> = useReduxDispatch;
diff --git a/packages/suite/src/hooks/suite/useDisplayMode.ts b/packages/suite/src/hooks/suite/useDisplayMode.ts
index 4302572ee6e..eb591836333 100644
--- a/packages/suite/src/hooks/suite/useDisplayMode.ts
+++ b/packages/suite/src/hooks/suite/useDisplayMode.ts
@@ -1,12 +1,12 @@
 import { selectDeviceUnavailableCapabilities } from '@suite-common/wallet-core';
-import { AddressDisplayOptions } from '@suite-common/wallet-types';
+import { AddressDisplayOptions, StakeType, ReviewOutput } from '@suite-common/wallet-types';
 
 import { selectAddressDisplayType } from 'src/reducers/suite/suiteReducer';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
-import { useSelector } from './useSelector';
-import { StakeType, ReviewOutput } from '@suite-common/wallet-types';
 import { DisplayMode } from 'src/types/suite';
 
+import { useSelector } from './useSelector';
+
 type UseDisplayModeProps = {
     type: ReviewOutput['type'];
     ethereumStakeType?: StakeType;
diff --git a/packages/suite/src/hooks/suite/useExternalLink.ts b/packages/suite/src/hooks/suite/useExternalLink.ts
index 50ac59dd115..e19c8b26912 100644
--- a/packages/suite/src/hooks/suite/useExternalLink.ts
+++ b/packages/suite/src/hooks/suite/useExternalLink.ts
@@ -1,4 +1,5 @@
 import { useMemo } from 'react';
+
 import { useSelector } from 'src/hooks/suite';
 import { getTorUrlIfAvailable } from 'src/utils/suite/tor';
 import { selectTorState } from 'src/reducers/suite/suiteReducer';
diff --git a/packages/suite/src/hooks/suite/useFiatFromCryptoValue.ts b/packages/suite/src/hooks/suite/useFiatFromCryptoValue.ts
index 20d2a0feb06..5cc6d29d321 100644
--- a/packages/suite/src/hooks/suite/useFiatFromCryptoValue.ts
+++ b/packages/suite/src/hooks/suite/useFiatFromCryptoValue.ts
@@ -1,12 +1,12 @@
-import { useSelector } from 'src/hooks/suite';
-
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { getFiatRateKey, toFiatCurrency } from '@suite-common/wallet-utils';
-import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
 import { selectFiatRatesByFiatRateKey } from '@suite-common/wallet-core';
 import { TokenAddress } from '@suite-common/wallet-types';
 import { TokenTransfer } from '@trezor/blockchain-link-types';
 
+import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
+import { useSelector } from 'src/hooks/suite';
+
 interface CommonOwnProps {
     amount: string;
     symbol: NetworkSymbol | TokenTransfer['symbol'];
diff --git a/packages/suite/src/hooks/suite/useFirmware.ts b/packages/suite/src/hooks/suite/useFirmware.ts
index 462af45fadf..edd8dec1eb0 100644
--- a/packages/suite/src/hooks/suite/useFirmware.ts
+++ b/packages/suite/src/hooks/suite/useFirmware.ts
@@ -2,7 +2,7 @@ import { useDispatch } from 'react-redux';
 
 import { FirmwareStatus } from '@suite-common/suite-types';
 import { firmwareUpdate, selectFirmware, firmwareActions } from '@suite-common/wallet-core';
-import { DEVICE, FirmwareType, UI } from '@trezor/connect';
+import { DEVICE, DeviceModelInternal, FirmwareType, UI } from '@trezor/connect';
 import { hasBitcoinOnlyFirmware, isBitcoinOnlyDevice } from '@trezor/device-utils';
 
 import { useSelector, useDevice, useTranslation } from 'src/hooks/suite';
@@ -16,7 +16,15 @@ There are three firmware update flows, depending on current firmware version:
 - reboot_and_upgrade: a device with firmware version >= 2.6.3 can reboot and upgrade in one step (not supported for reinstallation and downgrading)
 */
 
-export const useFirmware = () => {
+type UseFirmwareParams =
+    | {
+          shouldSwitchFirmwareType?: boolean;
+      }
+    | undefined;
+
+export const useFirmware = (
+    { shouldSwitchFirmwareType }: UseFirmwareParams = { shouldSwitchFirmwareType: false },
+) => {
     const { translationString } = useTranslation();
     const dispatch = useDispatch();
     const firmware = useSelector(selectFirmware);
@@ -48,13 +56,33 @@ export const useFirmware = () => {
         modal.context === MODAL.CONTEXT_DEVICE &&
         modal.windowType === 'ButtonRequest_FirmwareCheck';
 
-    const isCurrentlyBitcoinOnly = hasBitcoinOnlyFirmware(originalDevice);
+    const deviceModelInternal = originalDevice?.features?.internal_model;
+    // Device may be wiped during firmware type switch because Universal and Bitcoin-only firmware have different vendor headers,
+    // except T1B1 and T2T1. There may be some false negatives here during custom installation.
+    // TODO: Determine this in Connect.
+    const deviceWillBeWiped =
+        !!shouldSwitchFirmwareType &&
+        deviceModelInternal !== undefined &&
+        ![DeviceModelInternal.T1B1, DeviceModelInternal.T2T1].includes(deviceModelInternal);
 
     const confirmOnDevice =
-        (firmware.uiEvent?.type === UI.FIRMWARE_RECONNECT &&
-            firmware.uiEvent.payload.method !== 'wait') ||
+        // Show the confirmation pill before starting the installation using the "wait" or "manual" method,
+        // after ReconnectDevicePrompt is closed and user selects the option to install firmware while in bootloader.
+        // Also in case the device is PIN-locked at the start of the process.
         (firmware.uiEvent?.type === DEVICE.BUTTON &&
-            firmware.uiEvent.payload.code === 'ButtonRequest_FirmwareUpdate');
+            firmware.uiEvent.payload.code !== undefined &&
+            ['ButtonRequest_FirmwareUpdate', 'ButtonRequest_PinEntry'].includes(
+                firmware.uiEvent.payload.code,
+            )) ||
+        // Show the confirmation pill right after ReconnectDevicePrompt is closed while using the "wait" or "manual" method,
+        // before user selects the option to install firmware while in bootloader
+        // When a PIN-protected device reconnects to normal mode after installation, PIN is requested and the pill is shown.
+        // There is a false positive in case such device is wiped (including PIN) during custom installation.
+        (firmware.uiEvent?.type === UI.FIRMWARE_RECONNECT &&
+            (firmware.uiEvent.payload.target === 'bootloader' ||
+                (firmware.uiEvent.payload.target === 'normal' &&
+                    originalDevice?.features?.pin_protection &&
+                    !deviceWillBeWiped)));
 
     const showConfirmationPill =
         !showReconnectPrompt &&
@@ -98,7 +126,8 @@ export const useFirmware = () => {
         return { operation: null, progress: 0 };
     };
 
-    const getTargetFirmwareType = (shouldSwitchFirmwareType: boolean) => {
+    const getTargetFirmwareType = () => {
+        const isCurrentlyBitcoinOnly = hasBitcoinOnlyFirmware(originalDevice);
         const isBitcoinOnlyAvailable = !!originalDevice?.firmwareRelease?.release.url_bitcoinonly;
 
         return (isCurrentlyBitcoinOnly && !shouldSwitchFirmwareType) ||
@@ -110,6 +139,8 @@ export const useFirmware = () => {
             : FirmwareType.Regular;
     };
 
+    const targetFirmwareType = getTargetFirmwareType();
+
     return {
         ...firmware,
         ...getUpdateStatus(),
@@ -121,9 +152,11 @@ export const useFirmware = () => {
         resetReducer: () => dispatch(firmwareActions.resetReducer()),
         isWebUSB: isWebUsb(transport),
         showFingerprintCheck,
-        getTargetFirmwareType,
+        targetFirmwareType,
         showManualReconnectPrompt,
         confirmOnDevice,
+        shouldSwitchFirmwareType,
+        deviceWillBeWiped,
         showReconnectPrompt,
         showConfirmationPill,
     };
diff --git a/packages/suite/src/hooks/suite/useFormattersConfig.ts b/packages/suite/src/hooks/suite/useFormattersConfig.ts
index b1a79606e8a..9ed1a2a81eb 100644
--- a/packages/suite/src/hooks/suite/useFormattersConfig.ts
+++ b/packages/suite/src/hooks/suite/useFormattersConfig.ts
@@ -1,6 +1,7 @@
+import { FormatterProviderConfig } from '@suite-common/formatters';
+
 import { useSelector } from 'src/hooks/suite/useSelector';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
-import { FormatterProviderConfig } from '@suite-common/formatters';
 import { selectLanguage } from 'src/reducers/suite/suiteReducer';
 
 export const useFormattersConfig = (): FormatterProviderConfig => {
diff --git a/packages/suite/src/hooks/suite/useLocales.ts b/packages/suite/src/hooks/suite/useLocales.ts
index 087c46e35f8..0a1bc3c4b50 100644
--- a/packages/suite/src/hooks/suite/useLocales.ts
+++ b/packages/suite/src/hooks/suite/useLocales.ts
@@ -17,7 +17,7 @@ export const useLocales = () => {
             let dateLocale;
             try {
                 dateLocale = await import(`date-fns/locale/${lang}/index`);
-            } catch (error) {
+            } catch {
                 dateLocale = await import(`date-fns/locale/en-US/index`);
 
                 console.warn(
diff --git a/packages/suite/src/hooks/suite/useMessageSystemStaking.ts b/packages/suite/src/hooks/suite/useMessageSystemStaking.ts
index f90da71c216..e7ab840b4e8 100644
--- a/packages/suite/src/hooks/suite/useMessageSystemStaking.ts
+++ b/packages/suite/src/hooks/suite/useMessageSystemStaking.ts
@@ -3,7 +3,9 @@ import {
     Feature,
     selectFeatureMessageContent,
 } from '@suite-common/message-system';
+
 import { selectLanguage } from 'src/reducers/suite/suiteReducer';
+
 import { useSelector } from './useSelector';
 
 export const useMessageSystemStaking = () => {
diff --git a/packages/suite/src/hooks/suite/useOnboarding.ts b/packages/suite/src/hooks/suite/useOnboarding.ts
index b4b39942d65..ccb699ea8eb 100644
--- a/packages/suite/src/hooks/suite/useOnboarding.ts
+++ b/packages/suite/src/hooks/suite/useOnboarding.ts
@@ -1,4 +1,5 @@
 import { UI } from '@trezor/connect';
+
 import * as onboardingActions from 'src/actions/onboarding/onboardingActions';
 import * as routerActions from 'src/actions/suite/routerActions';
 import * as recoveryActions from 'src/actions/recovery/recoveryActions';
diff --git a/packages/suite/src/hooks/suite/useOpenSuiteDesktop.ts b/packages/suite/src/hooks/suite/useOpenSuiteDesktop.ts
index bd6c14a573a..8075c23e508 100644
--- a/packages/suite/src/hooks/suite/useOpenSuiteDesktop.ts
+++ b/packages/suite/src/hooks/suite/useOpenSuiteDesktop.ts
@@ -1,6 +1,8 @@
 import TrezorConnect from '@trezor/connect';
+import type TrezorConnectWeb from '@trezor/connect-web';
 import { useWindowFocus } from '@trezor/react-utils';
 import { SUITE_BRIDGE_DEEPLINK, SUITE_URL } from '@trezor/urls';
+
 import { isWebUsb } from 'src/utils/suite/transport';
 import { useSelector } from 'src/hooks/suite';
 
@@ -9,7 +11,7 @@ export const useOpenSuiteDesktop = () => {
     const windowFocused = useWindowFocus();
     const handleOpenSuite = () => {
         if (isWebUsb(transport)) {
-            TrezorConnect.disableWebUSB();
+            (TrezorConnect as typeof TrezorConnectWeb).disableWebUSB();
         }
 
         location.href = SUITE_BRIDGE_DEEPLINK;
diff --git a/packages/suite/src/hooks/suite/usePasswords.ts b/packages/suite/src/hooks/suite/usePasswords.ts
index 2593eaed7f0..ddcd353aa0e 100644
--- a/packages/suite/src/hooks/suite/usePasswords.ts
+++ b/packages/suite/src/hooks/suite/usePasswords.ts
@@ -5,7 +5,6 @@ import { selectDevice } from '@suite-common/wallet-core';
 import { useSelector, useDispatch } from 'src/hooks/suite';
 import * as metadataProviderActions from 'src/actions/suite/metadataProviderActions';
 import * as metadataPasswordsActions from 'src/actions/suite/metadataPasswordsActions';
-
 import type { PasswordEntry } from 'src/types/suite/metadata';
 import {
     selectPasswordManagerState,
diff --git a/packages/suite/src/hooks/suite/usePinModal.ts b/packages/suite/src/hooks/suite/usePinModal.ts
index 6d671de7e56..e7c38dd4faa 100644
--- a/packages/suite/src/hooks/suite/usePinModal.ts
+++ b/packages/suite/src/hooks/suite/usePinModal.ts
@@ -1,5 +1,6 @@
 import { ButtonRequest } from '@suite-common/suite-types';
 import { selectDeviceButtonRequests } from '@suite-common/wallet-core';
+
 import { useSelector } from 'src/hooks/suite';
 
 const NEW_PIN_REQUEST_TYPES = ['PinMatrixRequestType_NewFirst', 'PinMatrixRequestType_NewSecond'];
diff --git a/packages/suite/src/hooks/suite/useRediscoveryNeeded.ts b/packages/suite/src/hooks/suite/useRediscoveryNeeded.ts
index 9e406fa2535..564b6131f11 100644
--- a/packages/suite/src/hooks/suite/useRediscoveryNeeded.ts
+++ b/packages/suite/src/hooks/suite/useRediscoveryNeeded.ts
@@ -1,7 +1,9 @@
 import { useEffect, useState } from 'react';
-import { useDiscovery, useSelector } from 'src/hooks/suite';
+
 import { selectDeviceDiscovery } from '@suite-common/wallet-core';
 
+import { useDiscovery, useSelector } from 'src/hooks/suite';
+
 export const useRediscoveryNeeded = () => {
     const [isRediscoveryNeeded, setIsRediscoveryNeeded] = useState(false);
 
diff --git a/packages/suite/src/hooks/suite/useResetScrollOnUrl.ts b/packages/suite/src/hooks/suite/useResetScrollOnUrl.ts
index 7b5c3f22395..5de3e74c371 100644
--- a/packages/suite/src/hooks/suite/useResetScrollOnUrl.ts
+++ b/packages/suite/src/hooks/suite/useResetScrollOnUrl.ts
@@ -1,4 +1,5 @@
 import { useLayoutEffect, useRef } from 'react';
+
 import { useSelector } from './useSelector';
 
 export const useResetScrollOnUrl = () => {
diff --git a/packages/suite/src/hooks/suite/useSelector.ts b/packages/suite/src/hooks/suite/useSelector.ts
index 892581c7d76..0449578a3d8 100644
--- a/packages/suite/src/hooks/suite/useSelector.ts
+++ b/packages/suite/src/hooks/suite/useSelector.ts
@@ -1,6 +1,7 @@
-import { AppState } from 'src/types/suite';
 import { useSelector as useReduxSelector, shallowEqual, TypedUseSelectorHook } from 'react-redux';
 
+import { AppState } from 'src/types/suite';
+
 /**
  * Properly typed useSelector hook, use this one instead of directly importing it from react-redux.
  * https://react-redux.js.org/using-react-redux/static-typing#typing-the-useselector-hook
diff --git a/packages/suite/src/hooks/suite/useTranslation.ts b/packages/suite/src/hooks/suite/useTranslation.ts
index d85183a09d1..9e008ba85e9 100644
--- a/packages/suite/src/hooks/suite/useTranslation.ts
+++ b/packages/suite/src/hooks/suite/useTranslation.ts
@@ -1,8 +1,10 @@
 import { useCallback } from 'react';
 import { useIntl } from 'react-intl';
+
+import { PrimitiveType } from '@trezor/type-utils';
+
 import messages from 'src/support/messages';
 import { ExtendedMessageDescriptor } from 'src/types/suite';
-import { PrimitiveType } from '@trezor/type-utils';
 
 export type TranslationFunction = (
     id: ExtendedMessageDescriptor['id'],
diff --git a/packages/suite/src/hooks/wallet/__fixtures__/useSendForm.ts b/packages/suite/src/hooks/wallet/__fixtures__/useSendForm.ts
index da33b6aaa41..4004cecde7f 100644
--- a/packages/suite/src/hooks/wallet/__fixtures__/useSendForm.ts
+++ b/packages/suite/src/hooks/wallet/__fixtures__/useSendForm.ts
@@ -2,12 +2,11 @@ import { combineReducers, createReducer } from '@reduxjs/toolkit';
 
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { DEFAULT_PAYMENT, DEFAULT_VALUES } from '@suite-common/wallet-constants';
-import { accountsActions } from '@suite-common/wallet-core';
+import { accountsActions, prepareSendFormReducer } from '@suite-common/wallet-core';
 import { PROTO } from '@trezor/connect';
 import { testMocks } from '@suite-common/test-utils';
-import { extraDependencies } from 'src/support/extraDependencies';
 
-import { prepareSendFormReducer } from '@suite-common/wallet-core';
+import { extraDependencies } from 'src/support/extraDependencies';
 
 const sendFormReducer = prepareSendFormReducer(extraDependencies);
 
diff --git a/packages/suite/src/hooks/wallet/__tests__/useExcludedUtxos.test.tsx b/packages/suite/src/hooks/wallet/__tests__/useExcludedUtxos.test.tsx
index b76ce8efc09..f8d81230ae0 100644
--- a/packages/suite/src/hooks/wallet/__tests__/useExcludedUtxos.test.tsx
+++ b/packages/suite/src/hooks/wallet/__tests__/useExcludedUtxos.test.tsx
@@ -1,9 +1,12 @@
 import { useRef, useState, useEffect } from 'react';
+
 import { render, screen } from '@testing-library/react';
+
 import { testMocks } from '@suite-common/test-utils';
-import { useExcludedUtxos } from '../form/useExcludedUtxos';
 import * as walletUtils from '@suite-common/wallet-utils';
 
+import { useExcludedUtxos } from '../form/useExcludedUtxos';
+
 type Props = Parameters<typeof useExcludedUtxos>[0];
 
 const ACCOUNT = testMocks.getWalletAccount({
diff --git a/packages/suite/src/hooks/wallet/__tests__/useRbfForm.test.tsx b/packages/suite/src/hooks/wallet/__tests__/useRbfForm.test.tsx
index b58804f238f..907d61b7841 100644
--- a/packages/suite/src/hooks/wallet/__tests__/useRbfForm.test.tsx
+++ b/packages/suite/src/hooks/wallet/__tests__/useRbfForm.test.tsx
@@ -1,7 +1,8 @@
-import TrezorConnect from '@trezor/connect';
 import { screen } from '@testing-library/react';
+
+import TrezorConnect from '@trezor/connect';
 import { configureMockStore, initPreloadedState } from '@suite-common/test-utils';
-import * as fixtures from '../__fixtures__/useRbfForm';
+
 import {
     renderWithProviders,
     waitForLoader,
@@ -9,6 +10,8 @@ import {
     findByTestId,
 } from 'src/support/tests/hooksHelper';
 import { ChangeFee } from 'src/components/suite/modals/ReduxModal/UserContextModal/TxDetailModal/ChangeFee/ChangeFee';
+
+import * as fixtures from '../__fixtures__/useRbfForm';
 import { useRbfContext } from '../useRbfForm';
 
 // do not mock
diff --git a/packages/suite/src/hooks/wallet/__tests__/useSendForm.test.tsx b/packages/suite/src/hooks/wallet/__tests__/useSendForm.test.tsx
index e01fd2b3b59..c6f4893962f 100644
--- a/packages/suite/src/hooks/wallet/__tests__/useSendForm.test.tsx
+++ b/packages/suite/src/hooks/wallet/__tests__/useSendForm.test.tsx
@@ -1,8 +1,11 @@
 import { useState, useEffect } from 'react';
 import { DeepPartial } from 'react-hook-form';
 
+import { act, waitFor } from '@testing-library/react';
+
 import { configureMockStore, initPreloadedState, testMocks } from '@suite-common/test-utils';
 import { PROTO } from '@trezor/connect';
+import { FormState } from '@suite-common/wallet-types';
 
 import { filterThunkActionTypes } from 'src/support/tests/configureStore';
 import {
@@ -12,13 +15,11 @@ import {
     UserAction,
     actionSequence,
 } from 'src/support/tests/hooksHelper';
-import { FormState } from '@suite-common/wallet-types';
 import SendIndex from 'src/views/wallet/send';
+import { SendContextValues } from 'src/types/wallet/sendForm';
 
 import * as fixtures from '../__fixtures__/useSendForm';
 import { useSendFormContext } from '../useSendForm';
-import { act, waitFor } from '@testing-library/react';
-import { SendContextValues } from 'src/types/wallet/sendForm';
 
 const TEST_TIMEOUT = 30000;
 
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketAccount.ts b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketAccount.ts
index 1bbf57cc19c..928faa546a4 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketAccount.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketAccount.ts
@@ -1,7 +1,9 @@
+import { useState } from 'react';
+
 import { selectAccounts, selectDevice } from '@suite-common/wallet-core';
 import { Account, SelectedAccountLoaded } from '@suite-common/wallet-types';
 import { isTestnet } from '@suite-common/wallet-utils';
-import { useState } from 'react';
+
 import { useSelector } from 'src/hooks/suite';
 import {
     coinmarketGetSortedAccounts,
@@ -37,7 +39,7 @@ export const useCoinmarketAccount = ({
             const defaultSymbol = mapTestnetSymbol(selectedAccount.account.symbol);
             const accountsSorted = coinmarketGetSortedAccounts({
                 accounts,
-                deviceState: device?.state,
+                deviceState: device?.state?.staticSessionId,
             });
 
             const accountNotInTestnet = accountsSorted.find(a => a.symbol === defaultSymbol);
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketBuildAccountGroups.ts b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketBuildAccountGroups.ts
new file mode 100644
index 00000000000..3600a712e29
--- /dev/null
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketBuildAccountGroups.ts
@@ -0,0 +1,49 @@
+import { useMemo } from 'react';
+
+import { selectAccounts, selectDevice } from '@suite-common/wallet-core';
+
+import { useDefaultAccountLabel, useSelector } from 'src/hooks/suite';
+import { selectAccountLabels } from 'src/reducers/suite/metadataReducer';
+import {
+    CoinmarketAccountsOptionsGroupProps,
+    CoinmarketTradeSellExchangeType,
+} from 'src/types/coinmarket/coinmarket';
+import { coinmarketBuildAccountOptions } from 'src/utils/wallet/coinmarket/coinmarketUtils';
+
+export const useCoinmarketBuildAccountGroups = (
+    type: CoinmarketTradeSellExchangeType,
+): CoinmarketAccountsOptionsGroupProps[] => {
+    const accounts = useSelector(selectAccounts);
+    const accountLabels = useSelector(selectAccountLabels);
+    const device = useSelector(selectDevice);
+    const { getDefaultAccountLabel } = useDefaultAccountLabel();
+    const { tokenDefinitions } = useSelector(state => state);
+    const supportedSymbols = useSelector(state =>
+        type === 'sell'
+            ? state.wallet.coinmarket.sell.sellInfo?.supportedCryptoCurrencies
+            : state.wallet.coinmarket.exchange.exchangeInfo?.sellSymbols,
+    );
+
+    const groups = useMemo(
+        () =>
+            coinmarketBuildAccountOptions({
+                accounts,
+                deviceState: device?.state?.staticSessionId,
+                accountLabels,
+                tokenDefinitions,
+                supportedCryptoIds: supportedSymbols,
+                getDefaultAccountLabel,
+            }),
+
+        [
+            accounts,
+            device?.state?.staticSessionId,
+            accountLabels,
+            tokenDefinitions,
+            supportedSymbols,
+            getDefaultAccountLabel,
+        ],
+    );
+
+    return groups;
+};
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketComposeTransaction.ts b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketComposeTransaction.ts
index 2b9cd2fba0a..99f97a2ce9d 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketComposeTransaction.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketComposeTransaction.ts
@@ -1,9 +1,11 @@
+import { useEffect, useMemo, useState } from 'react';
+import { UseFormReturn } from 'react-hook-form';
+
 import { COMPOSE_ERROR_TYPES } from '@suite-common/wallet-constants';
 import { selectAccounts, selectDevice } from '@suite-common/wallet-core';
 import { AddressDisplayOptions } from '@suite-common/wallet-types';
 import { getFeeLevels } from '@suite-common/wallet-utils';
-import { useEffect, useMemo, useState } from 'react';
-import { UseFormReturn } from 'react-hook-form';
+
 import { saveComposedTransactionInfo } from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
 import { FORM_OUTPUT_ADDRESS, FORM_OUTPUT_AMOUNT } from 'src/constants/wallet/coinmarket/form';
 import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
@@ -20,7 +22,7 @@ import {
 } from 'src/types/coinmarket/coinmarketForm';
 import { getComposeAddressPlaceholder } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 
-// shareable sub-hook used in useCoinmarketSellForm & useCoinmarketExchangeForm
+// shareable sub-hook used in useCoinmarketSellForm & useCoinmarketExchangeForm
 export const useCoinmarketComposeTransaction = <T extends CoinmarketSellExchangeFormProps>({
     account,
     network,
@@ -52,6 +54,7 @@ export const useCoinmarketComposeTransaction = <T extends CoinmarketSellExchange
         composeRequest,
         composedLevels,
         onFeeLevelChange,
+        setComposedLevels,
     } = useCompose({
         ...methods,
         state,
@@ -121,10 +124,7 @@ export const useCoinmarketComposeTransaction = <T extends CoinmarketSellExchange
             });
         }
 
-        if (
-            composed.type === 'final' ||
-            (composed.type === 'nonfinal' && account.symbol === 'ada')
-        ) {
+        if (composed.type === 'final' || composed.type === 'nonfinal') {
             if (typeof setMaxOutputId === 'number' && composed.max) {
                 setValue(FORM_OUTPUT_AMOUNT, composed.max, {
                     shouldValidate: true,
@@ -155,5 +155,6 @@ export const useCoinmarketComposeTransaction = <T extends CoinmarketSellExchange
         feeInfo,
         changeFeeLevel,
         composeRequest,
+        setComposedLevels,
     };
 };
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketCurrencySwitcher.ts b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketCurrencySwitcher.ts
index 3e372d75fb3..8ac2203b02c 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketCurrencySwitcher.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketCurrencySwitcher.ts
@@ -1,13 +1,16 @@
+import { UseFormReturn, useWatch } from 'react-hook-form';
+
 import { Network } from '@suite-common/wallet-config';
 import { Account } from '@suite-common/wallet-types';
-import { amountToSatoshi, formatAmount } from '@suite-common/wallet-utils';
+import { amountToSmallestUnit, formatAmount } from '@suite-common/wallet-utils';
 import { useDidUpdate } from '@trezor/react-utils';
-import { UseFormReturn, useWatch } from 'react-hook-form';
+
 import {
     FORM_CRYPTO_INPUT,
     FORM_FIAT_INPUT,
     FORM_OUTPUT_AMOUNT,
     FORM_OUTPUT_FIAT,
+    FORM_SEND_CRYPTO_CURRENCY_SELECT,
 } from 'src/constants/wallet/coinmarket/form';
 import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
 import {
@@ -17,7 +20,7 @@ import {
 import { SendContextValues } from 'src/types/wallet/sendForm';
 import {
     coinmarketGetRoundedFiatAmount,
-    getNetworkDecimals,
+    getCoinmarketNetworkDecimals,
 } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 
 interface CoinmarketUseCurrencySwitcherProps<T extends CoinmarketAllFormProps> {
@@ -48,15 +51,19 @@ export const useCoinmarketCurrencySwitcher = <T extends CoinmarketAllFormProps>(
     const { setValue, getValues, control } =
         methods as unknown as UseFormReturn<CoinmarketAllFormProps>;
     const { shouldSendInSats } = useBitcoinAmountUnit(account.symbol);
-    const networkDecimals = getNetworkDecimals(network?.decimals);
     const cryptoInputValue = useWatch({ control, name: inputNames.cryptoInput });
+    const sendCryptoSelect = getValues(FORM_SEND_CRYPTO_CURRENCY_SELECT);
+    const networkDecimals = getCoinmarketNetworkDecimals({
+        sendCryptoSelect,
+        network,
+    });
 
     const toggleAmountInCrypto = () => {
         const { amountInCrypto } = getValues();
 
         if (!amountInCrypto) {
             const amount = shouldSendInSats
-                ? amountToSatoshi(quoteCryptoAmount ?? '', networkDecimals)
+                ? amountToSmallestUnit(quoteCryptoAmount ?? '', networkDecimals)
                 : quoteCryptoAmount;
 
             setValue(inputNames.cryptoInput, amount === '-1' ? '' : amount);
@@ -73,7 +80,7 @@ export const useCoinmarketCurrencySwitcher = <T extends CoinmarketAllFormProps>(
     };
 
     useDidUpdate(() => {
-        const conversion = shouldSendInSats ? amountToSatoshi : formatAmount;
+        const conversion = shouldSendInSats ? amountToSmallestUnit : formatAmount;
 
         if (!cryptoInputValue) {
             return;
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketFiatValues.tsx b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketFiatValues.tsx
index a2b309efd86..398e57fe724 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketFiatValues.tsx
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketFiatValues.tsx
@@ -1,22 +1,24 @@
+import { useCallback, useEffect } from 'react';
+
+import { FiatCurrencyCode } from 'invity-api';
+
 import { networks, NetworkSymbol } from '@suite-common/wallet-config';
 import { selectFiatRatesByFiatRateKey, updateFiatRatesThunk } from '@suite-common/wallet-core';
 import { FiatRatesResult, Rate, Timestamp, TokenAddress } from '@suite-common/wallet-types';
-import { amountToSatoshi, getFiatRateKey, toFiatCurrency } from '@suite-common/wallet-utils';
-import { CryptoId, FiatCurrencyCode } from 'invity-api';
-import { useCallback, useEffect } from 'react';
+import { amountToSmallestUnit, getFiatRateKey, toFiatCurrency } from '@suite-common/wallet-utils';
+
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
+import { CoinmarketAccountOptionsGroupOptionProps } from 'src/types/coinmarket/coinmarket';
 import {
     cryptoIdToNetworkSymbol,
     mapTestnetSymbol,
-    getNetworkDecimals,
+    getCoinmarketNetworkDecimals,
 } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 
 interface CoinmarketBalanceProps {
-    cryptoSymbol: CryptoId | undefined;
-    tokenAddress?: string | null;
-    accountBalance?: string;
+    sendCryptoSelect?: CoinmarketAccountOptionsGroupOptionProps;
     fiatCurrency?: FiatCurrencyCode;
 }
 
@@ -32,17 +34,17 @@ interface CoinmarketBalanceReturnProps {
 }
 
 export const useCoinmarketFiatValues = ({
-    accountBalance,
-    cryptoSymbol,
-    tokenAddress,
+    sendCryptoSelect,
     fiatCurrency,
 }: CoinmarketBalanceProps): CoinmarketBalanceReturnProps | null => {
     const dispatch = useDispatch();
     const defaultCryptoSymbol = 'btc';
-    const networkSymbol = cryptoSymbol
-        ? cryptoIdToNetworkSymbol(cryptoSymbol) ?? defaultCryptoSymbol
+    const networkSymbol = sendCryptoSelect
+        ? cryptoIdToNetworkSymbol(sendCryptoSelect.value) ?? defaultCryptoSymbol
         : defaultCryptoSymbol;
-    const tokenAddressTyped = tokenAddress as TokenAddress | undefined;
+    const tokenAddressTyped = (sendCryptoSelect?.contractAddress ?? undefined) as
+        | TokenAddress
+        | undefined;
     const symbolForFiat = mapTestnetSymbol(networkSymbol);
     const localCurrency = useSelector(selectLocalCurrency);
     const fiatRateKey = getFiatRateKey(
@@ -51,6 +53,7 @@ export const useCoinmarketFiatValues = ({
         tokenAddressTyped,
     );
     const fiatRate = useSelector(state => selectFiatRatesByFiatRateKey(state, fiatRateKey));
+    const balance = sendCryptoSelect?.balance;
 
     const network = networks[networkSymbol];
     const { shouldSendInSats } = useBitcoinAmountUnit(networkSymbol);
@@ -86,21 +89,22 @@ export const useCoinmarketFiatValues = ({
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
-    if (!accountBalance || !fiatCurrency) return null;
+    if (!balance || !fiatCurrency) return null;
 
-    const decimals = getNetworkDecimals(network?.decimals);
-    const formattedBalance = shouldSendInSats
-        ? amountToSatoshi(accountBalance, decimals)
-        : accountBalance;
-    const fiatValue = toFiatCurrency(accountBalance, fiatRate?.rate, 2);
+    const decimals = getCoinmarketNetworkDecimals({
+        sendCryptoSelect,
+        network,
+    });
+    const formattedBalance = shouldSendInSats ? amountToSmallestUnit(balance, decimals) : balance;
+    const fiatValue = toFiatCurrency(balance, fiatRate?.rate, 2);
 
     return {
         fiatValue,
         fiatRate,
-        accountBalance,
+        accountBalance: balance,
         formattedBalance,
         networkSymbol,
-        networkDecimals: network.decimals,
+        networkDecimals: decimals,
         tokenAddress: tokenAddressTyped,
         fiatRatesUpdater,
     };
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketFormActions.ts b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketFormActions.ts
index cb14a7ef6de..5838ab3271b 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketFormActions.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketFormActions.ts
@@ -1,17 +1,19 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { UseFormReturn, useWatch } from 'react-hook-form';
+import { useDebounce } from 'react-use';
+
+import { FiatCurrencyCode } from 'invity-api';
+
 import { isChanged } from '@suite-common/suite-utils';
 import { selectAccounts, selectDevice } from '@suite-common/wallet-core';
 import {
-    amountToSatoshi,
+    amountToSmallestUnit,
     formatAmount,
     fromFiatCurrency,
-    isEthereumAccountSymbol,
     isZero,
 } from '@suite-common/wallet-utils';
 import { BigNumber } from '@trezor/utils';
-import { FiatCurrencyCode } from 'invity-api';
-import { useCallback, useEffect, useRef, useState } from 'react';
-import { UseFormReturn, useWatch } from 'react-hook-form';
-import { useDebounce } from 'react-use';
+
 import {
     FORM_CRYPTO_TOKEN,
     FORM_OUTPUT_ADDRESS,
@@ -37,12 +39,12 @@ import {
 import {
     coinmarketGetSortedAccounts,
     cryptoIdToNetworkSymbol,
-    getNetworkDecimals,
+    getCoinmarketNetworkDecimals,
 } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import { coinmarketGetExchangeReceiveCryptoId } from 'src/utils/wallet/coinmarket/exchangeUtils';
 
 /**
- * shareable sub-hook used in useCoinmarketSellForm & useCoinmarketExchangeForm
+ * shareable sub-hook used in useCoinmarketSellForm & useCoinmarketExchangeForm
  * managing effects on input changes
  * @return functions and values to handle form inputs and update fee levels
  */
@@ -57,6 +59,7 @@ export const useCoinmarketFormActions = <T extends CoinmarketSellExchangeFormPro
     changeFeeLevel,
     composeRequest,
     setAccountOnChange,
+    setComposedLevels,
 }: CoinmarketUseFormActionsProps<T>): CoinmarketUseFormActionsReturnProps => {
     const { symbol } = account;
     const { shouldSendInSats } = useBitcoinAmountUnit(symbol);
@@ -64,29 +67,28 @@ export const useCoinmarketFormActions = <T extends CoinmarketSellExchangeFormPro
     const device = useSelector(selectDevice);
     const accountsSorted = coinmarketGetSortedAccounts({
         accounts,
-        deviceState: device?.state,
+        deviceState: device?.state?.staticSessionId,
     });
     const [isUsedFractionButton, setIsUsedFractionButton] = useState(false);
     const { buildDefaultCryptoOption } = useCoinmarketInfo();
 
     const { getValues, setValue, clearErrors, handleSubmit, control } =
         methods as unknown as UseFormReturn<CoinmarketSellExchangeFormProps>;
-    const { outputs, sendCryptoSelect, setMaxOutputId } = getValues();
+    const { outputs, sendCryptoSelect } = getValues();
     const values = useWatch<CoinmarketSellExchangeFormProps>({ control });
     const previousValues = useRef<typeof values | null>(isNotFormPage ? draftUpdated : null);
     const tokenAddress = outputs?.[0]?.token;
-    const cryptoAmount = outputs?.[0]?.amount;
     const tokenData = account.tokens?.find(t => t.contract === tokenAddress);
     const isBalanceZero = tokenData
         ? isZero(tokenData.balance || '0')
         : isZero(account.formattedBalance);
     const coinmarketFiatValues = useCoinmarketFiatValues({
-        accountBalance: account.formattedBalance,
-        cryptoSymbol: sendCryptoSelect?.value,
-        tokenAddress,
+        sendCryptoSelect,
         fiatCurrency: getValues().outputs?.[0]?.currency?.value as FiatCurrencyCode,
     });
-    const networkDecimals = getNetworkDecimals(coinmarketFiatValues?.networkDecimals);
+    const networkDecimals = getCoinmarketNetworkDecimals({
+        sendCryptoSelect,
+    });
 
     // on manual change of crypto amount, set fiat amount
     const onFiatCurrencyChange = async (value: FiatCurrencyCode) => {
@@ -131,38 +133,13 @@ export const useCoinmarketFormActions = <T extends CoinmarketSellExchangeFormPro
 
             const formattedCryptoAmount =
                 cryptoAmount && shouldSendInSats
-                    ? amountToSatoshi(cryptoAmount, networkDecimals)
+                    ? amountToSmallestUnit(cryptoAmount, networkDecimals)
                     : cryptoAmount ?? '';
             setValue(FORM_OUTPUT_AMOUNT, formattedCryptoAmount, { shouldValidate: true });
         },
         [getValues, coinmarketFiatValues, networkDecimals, shouldSendInSats, setValue],
     );
 
-    const calculateFiatAmountFromCrypto = useCallback(
-        (cryptoAmount: string) => {
-            if (!coinmarketFiatValues) return;
-
-            const rate = coinmarketFiatValues.fiatRate;
-            const formattedAmount = new BigNumber(
-                shouldSendInSats ? formatAmount(cryptoAmount, networkDecimals) : cryptoAmount,
-            );
-
-            if (
-                rate?.rate &&
-                formattedAmount &&
-                !formattedAmount.isNaN() &&
-                formattedAmount.gt(0) // formatAmount() returns '-1' on error
-            ) {
-                const fiatValueBigNumber = formattedAmount.multipliedBy(rate.rate);
-
-                setValue(FORM_OUTPUT_FIAT, fiatValueBigNumber.toFixed(2), {
-                    shouldValidate: true,
-                });
-            }
-        },
-        [coinmarketFiatValues, networkDecimals, setValue, shouldSendInSats],
-    );
-
     const setExchangeReceiveCrypto = (selected: CoinmarketAccountOptionsGroupOptionProps) => {
         if (type !== 'exchange') return;
 
@@ -198,12 +175,11 @@ export const useCoinmarketFormActions = <T extends CoinmarketSellExchangeFormPro
         setValue(FORM_OUTPUT_AMOUNT, '');
         setValue(FORM_CRYPTO_TOKEN, selected?.contractAddress ?? null);
 
-        if (networkSymbol && isEthereumAccountSymbol(networkSymbol)) {
+        if (account.networkType === 'ethereum') {
             // set token address for ERC20 transaction to estimate the fees more precisely
             setValue(FORM_OUTPUT_ADDRESS, selected?.contractAddress ?? '');
         }
-
-        if (networkSymbol === 'sol') {
+        if (account.networkType === 'solana' && !selected?.contractAddress) {
             setValue(FORM_OUTPUT_ADDRESS, selected?.descriptor ?? '');
         }
 
@@ -211,6 +187,7 @@ export const useCoinmarketFormActions = <T extends CoinmarketSellExchangeFormPro
         setValue(FORM_OUTPUT_AMOUNT, '');
         setValue(FORM_OUTPUT_FIAT, '');
         setAmountLimits(undefined);
+        setComposedLevels(undefined);
 
         await coinmarketFiatValues?.fiatRatesUpdater(
             getValues(FORM_OUTPUT_CURRENCY)?.value as FiatCurrencyCode,
@@ -233,14 +210,12 @@ export const useCoinmarketFormActions = <T extends CoinmarketSellExchangeFormPro
                   .decimalPlaces(networkDecimals)
                   .toString();
         const cryptoInputValue = shouldSendInSats
-            ? amountToSatoshi(amount, networkDecimals)
+            ? amountToSmallestUnit(amount, networkDecimals)
             : amount;
         clearErrors([FORM_OUTPUT_FIAT, FORM_OUTPUT_AMOUNT]);
         setValue(FORM_OUTPUT_AMOUNT, cryptoInputValue, { shouldDirty: true });
         setValue(FORM_OUTPUT_MAX, undefined, { shouldDirty: true });
         setIsUsedFractionButton(true);
-
-        calculateFiatAmountFromCrypto(cryptoInputValue);
     };
 
     const setAllAmount = () => {
@@ -253,15 +228,6 @@ export const useCoinmarketFormActions = <T extends CoinmarketSellExchangeFormPro
         composeRequest(FORM_OUTPUT_AMOUNT);
     };
 
-    // update fiat amount in compute all crypto from the account
-    useEffect(() => {
-        if (cryptoAmount && typeof setMaxOutputId !== 'undefined') {
-            calculateFiatAmountFromCrypto(cryptoAmount);
-        }
-        // compute only if cryptoAmount and setMaxOutputId will changed
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [cryptoAmount, setMaxOutputId]);
-
     // call change handler on every change of text inputs with debounce
     useDebounce(
         () => {
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketInitializer.ts b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketInitializer.ts
new file mode 100644
index 00000000000..bd7d86fac3c
--- /dev/null
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketInitializer.ts
@@ -0,0 +1,46 @@
+import { useState } from 'react';
+
+import { useTimer } from '@trezor/react-utils';
+
+import { INVITY_API_RELOAD_QUOTES_AFTER_SECONDS } from 'src/constants/wallet/coinmarket/metadata';
+import { useDevice } from 'src/hooks/suite';
+import { useServerEnvironment } from 'src/hooks/wallet/coinmarket/useServerEnviroment';
+import {
+    UseCoinmarketCommonProps,
+    UseCoinmarketCommonReturnProps,
+} from 'src/types/coinmarket/coinmarket';
+
+export const useCoinmarketInitializer = ({
+    type,
+    selectedAccount,
+}: UseCoinmarketCommonProps): UseCoinmarketCommonReturnProps => {
+    const timer = useTimer();
+    const { account } = selectedAccount;
+    const { isLocked, device } = useDevice();
+    const [callInProgress, setCallInProgress] = useState<boolean>(
+        type !== 'buy' ? isLocked() : false,
+    );
+
+    const checkQuotesTimer = (callback: () => Promise<void>) => {
+        if (!timer.isLoading && !timer.isStopped) {
+            if (timer.resetCount >= 40) {
+                timer.stop();
+            }
+
+            if (timer.timeSpend.seconds === INVITY_API_RELOAD_QUOTES_AFTER_SECONDS) {
+                callback();
+            }
+        }
+    };
+
+    useServerEnvironment();
+
+    return {
+        callInProgress,
+        account,
+        timer,
+        device,
+        setCallInProgress,
+        checkQuotesTimer,
+    };
+};
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketModalCrypto.ts b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketModalCrypto.ts
index 96e4c0f7df1..7065f874382 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketModalCrypto.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/common/useCoinmarketModalCrypto.ts
@@ -1,5 +1,7 @@
-import { CryptoId } from 'invity-api';
 import { useEffect } from 'react';
+
+import { CryptoId } from 'invity-api';
+
 import { SET_MODAL_CRYPTO_CURRENCY } from 'src/actions/wallet/constants/coinmarketCommonConstants';
 import { useDispatch } from 'src/hooks/suite';
 
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketBuyForm.tsx b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketBuyForm.tsx
index 7a01fd64c8f..5670533d584 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketBuyForm.tsx
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketBuyForm.tsx
@@ -1,10 +1,17 @@
 import { useCallback, useState, useEffect, useRef } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
+
 import useDebounce from 'react-use/lib/useDebounce';
 import type { BuyTrade, BuyTradeQuoteRequest, CryptoId } from 'invity-api';
+
 import { isChanged } from '@suite-common/suite-utils';
 import { formatAmount } from '@suite-common/wallet-utils';
-import { useActions, useDispatch, useSelector } from 'src/hooks/suite';
+import { notificationsActions } from '@suite-common/toast-notifications';
+import { isDesktop } from '@trezor/env-utils';
+import { networks } from '@suite-common/wallet-config';
+import { analytics, EventType } from '@trezor/suite-analytics';
+
+import { useDispatch, useSelector } from 'src/hooks/suite';
 import invityAPI from 'src/services/suite/invityAPI';
 import {
     createQuoteLink,
@@ -13,27 +20,22 @@ import {
 } from 'src/utils/wallet/coinmarket/buyUtils';
 import { useFormDraft } from 'src/hooks/wallet/useFormDraft';
 import { AmountLimits } from 'src/types/wallet/coinmarketCommonTypes';
-import { useCoinmarketBuyFormDefaultValues } from './useCoinmarketBuyFormDefaultValues';
 import { CoinmarketTradeBuyType, UseCoinmarketFormProps } from 'src/types/coinmarket/coinmarket';
 import {
     addIdsToQuotes,
+    coinmarketGetSuccessQuotes,
     cryptoIdToNetwork,
     filterQuotesAccordingTags,
+    getCoinmarketNetworkDecimals,
 } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import {
     CoinmarketBuyFormContextProps,
     CoinmarketBuyFormProps,
 } from 'src/types/coinmarket/coinmarketForm';
-import {
-    getFilteredSuccessQuotes,
-    useCoinmarketCommonOffers,
-} from '../offers/useCoinmarketCommonOffers';
 import * as coinmarketInfoActions from 'src/actions/wallet/coinmarketInfoActions';
 import * as coinmarketCommonActions from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
 import * as coinmarketBuyActions from 'src/actions/wallet/coinmarketBuyActions';
 import * as routerActions from 'src/actions/suite/routerActions';
-import { notificationsActions } from '@suite-common/toast-notifications';
-import { isDesktop } from '@trezor/env-utils';
 import useCoinmarketPaymentMethod from 'src/hooks/wallet/coinmarket/form/useCoinmarketPaymentMethod';
 import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
 import { useCoinmarketNavigation } from 'src/hooks/wallet/useCoinmarketNavigation';
@@ -47,10 +49,11 @@ import { useCoinmarketLoadData } from 'src/hooks/wallet/coinmarket/useCoinmarket
 import { useCoinmarketCurrencySwitcher } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketCurrencySwitcher';
 import { useCoinmarketModalCrypto } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketModalCrypto';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
-import { networks } from '@suite-common/wallet-config';
-import { analytics, EventType } from '@trezor/suite-analytics';
+import { useCoinmarketBuyFormDefaultValues } from 'src/hooks/wallet/coinmarket/form/useCoinmarketBuyFormDefaultValues';
+
+import { useCoinmarketInitializer } from './common/useCoinmarketInitializer';
 
-const useCoinmarketBuyForm = ({
+export const useCoinmarketBuyForm = ({
     selectedAccount,
     pageType = 'form',
 }: UseCoinmarketFormProps): CoinmarketBuyFormContextProps => {
@@ -61,38 +64,9 @@ const useCoinmarketBuyForm = ({
         useSelector(state => state.wallet.coinmarket.buy);
     const { cryptoIdToCoinSymbol } = useCoinmarketInfo();
     const { callInProgress, account, timer, device, setCallInProgress, checkQuotesTimer } =
-        useCoinmarketCommonOffers({ selectedAccount, type });
+        useCoinmarketInitializer({ selectedAccount, type });
     const { paymentMethods, getPaymentMethods, getQuotesByPaymentMethod } =
         useCoinmarketPaymentMethod<CoinmarketTradeBuyType>();
-    const {
-        saveTrade,
-        saveQuotes,
-        saveSelectedQuote,
-        setIsFromRedirect,
-        openCoinmarketBuyConfirmModal,
-        addNotification,
-        saveTransactionDetailId,
-        verifyAddress,
-        submitRequestForm,
-        goto,
-        savePaymentMethods,
-        saveQuoteRequest,
-        saveCachedAccountInfo,
-    } = useActions({
-        saveTrade: coinmarketBuyActions.saveTrade,
-        saveQuotes: coinmarketBuyActions.saveQuotes,
-        saveSelectedQuote: coinmarketBuyActions.saveSelectedQuote,
-        setIsFromRedirect: coinmarketBuyActions.setIsFromRedirect,
-        openCoinmarketBuyConfirmModal: coinmarketBuyActions.openCoinmarketBuyConfirmModal,
-        addNotification: notificationsActions.addToast,
-        saveTransactionDetailId: coinmarketBuyActions.saveTransactionDetailId,
-        submitRequestForm: coinmarketCommonActions.submitRequestForm,
-        verifyAddress: coinmarketBuyActions.verifyAddress,
-        goto: routerActions.goto,
-        savePaymentMethods: coinmarketInfoActions.savePaymentMethods,
-        saveQuoteRequest: coinmarketBuyActions.saveQuoteRequest,
-        saveCachedAccountInfo: coinmarketBuyActions.saveCachedAccountInfo,
-    });
     const { navigateToBuyForm, navigateToBuyOffers, navigateToBuyConfirm } =
         useCoinmarketNavigation(account);
 
@@ -209,10 +183,9 @@ const useCoinmarketBuyForm = ({
             countrySelect,
             amountInCrypto,
         } = methods.getValues();
+        const decimals = getCoinmarketNetworkDecimals({ network });
         const cryptoStringAmount =
-            cryptoInput && shouldSendInSats
-                ? formatAmount(cryptoInput, network.decimals)
-                : cryptoInput;
+            cryptoInput && shouldSendInSats ? formatAmount(cryptoInput, decimals) : cryptoInput;
 
         const request = {
             wantCrypto: amountInCrypto,
@@ -226,7 +199,7 @@ const useCoinmarketBuyForm = ({
         };
 
         return request;
-    }, [methods, network.decimals, shouldSendInSats, quotesRequest]);
+    }, [methods, network, shouldSendInSats, quotesRequest]);
 
     const handleChange = useCallback(
         async (offLoading?: boolean) => {
@@ -235,54 +208,51 @@ const useCoinmarketBuyForm = ({
             const quoteRequest = getQuoteRequestData();
             const allQuotes = await getQuotesRequest(quoteRequest, offLoading);
 
-            if (Array.isArray(allQuotes)) {
-                if (allQuotes.length === 0) {
-                    timer.stop();
-
-                    return;
-                }
+            if (!Array.isArray(allQuotes) || allQuotes.length === 0) {
+                timer.stop();
+                setInnerQuotes([]);
+                setIsSubmittingHelper(false);
 
-                // processed quotes and without alternative quotes
-                const quotesDefault = filterQuotesAccordingTags<CoinmarketTradeBuyType>(
-                    addIdsToQuotes<CoinmarketTradeBuyType>(allQuotes, 'buy'),
-                );
-                // without errors
-                const quotesSuccess =
-                    getFilteredSuccessQuotes<CoinmarketTradeBuyType>(quotesDefault) ?? [];
-
-                const bestQuote = quotesSuccess?.[0];
-                const bestQuotePaymentMethod = bestQuote?.paymentMethod;
-                const bestQuotePaymentMethodName =
-                    bestQuote?.paymentMethodName ?? bestQuotePaymentMethod;
-                const paymentMethodSelected = values.paymentMethod?.value;
-                const paymentMethodsFromQuotes = getPaymentMethods(quotesSuccess);
-                const isSelectedPaymentMethodAvailable =
-                    paymentMethodsFromQuotes.find(item => item.value === paymentMethodSelected) !==
-                    undefined;
-                const limits = getAmountLimits(quoteRequest, quotesDefault); // from all quotes except alternative
-                if (limits && quoteRequest.wantCrypto) {
-                    limits.currency =
-                        cryptoIdToCoinSymbol(quoteRequest.receiveCurrency) ?? limits.currency;
-                }
+                return;
+            }
 
-                setInnerQuotes(quotesSuccess);
-                dispatch(saveQuotes(quotesSuccess));
-                dispatch(saveQuoteRequest(quoteRequest));
-                dispatch(savePaymentMethods(paymentMethodsFromQuotes));
-                setAmountLimits(limits);
-
-                if (!paymentMethodSelected || !isSelectedPaymentMethodAvailable) {
-                    setValue(FORM_PAYMENT_METHOD_SELECT, {
-                        value: bestQuotePaymentMethod ?? '',
-                        label: bestQuotePaymentMethodName ?? '',
-                    });
-                }
+            // processed quotes and without alternative quotes
+            const quotesDefault = filterQuotesAccordingTags<CoinmarketTradeBuyType>(
+                addIdsToQuotes<CoinmarketTradeBuyType>(allQuotes, 'buy'),
+            );
+            // without errors
+            const quotesSuccess =
+                coinmarketGetSuccessQuotes<CoinmarketTradeBuyType>(quotesDefault) ?? [];
+
+            const bestQuote = quotesSuccess?.[0];
+            const bestQuotePaymentMethod = bestQuote?.paymentMethod;
+            const bestQuotePaymentMethodName =
+                bestQuote?.paymentMethodName ?? bestQuotePaymentMethod;
+            const paymentMethodSelected = values.paymentMethod?.value;
+            const paymentMethodsFromQuotes = getPaymentMethods(quotesSuccess);
+            const isSelectedPaymentMethodAvailable =
+                paymentMethodsFromQuotes.find(item => item.value === paymentMethodSelected) !==
+                undefined;
+            const limits = getAmountLimits(quoteRequest, quotesDefault); // from all quotes except alternative
+            if (limits && quoteRequest.wantCrypto) {
+                limits.currency =
+                    cryptoIdToCoinSymbol(quoteRequest.receiveCurrency) ?? limits.currency;
+            }
 
-                setIsSubmittingHelper(false);
-            } else {
-                setInnerQuotes([]);
+            setInnerQuotes(quotesSuccess);
+            dispatch(coinmarketBuyActions.saveQuotes(quotesSuccess));
+            dispatch(coinmarketBuyActions.saveQuoteRequest(quoteRequest));
+            dispatch(coinmarketInfoActions.savePaymentMethods(paymentMethodsFromQuotes));
+            setAmountLimits(limits);
+
+            if (!paymentMethodSelected || !isSelectedPaymentMethodAvailable) {
+                setValue(FORM_PAYMENT_METHOD_SELECT, {
+                    value: bestQuotePaymentMethod ?? '',
+                    label: bestQuotePaymentMethodName ?? '',
+                });
             }
 
+            setIsSubmittingHelper(false);
             timer.reset();
         },
         [
@@ -293,9 +263,6 @@ const useCoinmarketBuyForm = ({
             getQuotesRequest,
             getPaymentMethods,
             dispatch,
-            saveQuotes,
-            saveQuoteRequest,
-            savePaymentMethods,
             setValue,
         ],
     );
@@ -303,17 +270,26 @@ const useCoinmarketBuyForm = ({
     const goToOffers = async () => {
         await handleChange();
 
-        dispatch(saveCachedAccountInfo(account.symbol, account.index, account.accountType));
+        dispatch(
+            coinmarketBuyActions.saveCachedAccountInfo(
+                account.symbol,
+                account.index,
+                account.accountType,
+            ),
+        );
         navigateToBuyOffers();
     };
 
     const selectQuote = async (quote: BuyTrade) => {
         const provider = buyInfo && quote.exchange ? buyInfo.providerInfos[quote.exchange] : null;
         if (quotesRequest) {
-            const result = await openCoinmarketBuyConfirmModal(
-                provider?.companyName,
-                cryptoIdToCoinSymbol(quote.receiveCurrency!),
+            const result = await dispatch(
+                coinmarketBuyActions.openCoinmarketBuyConfirmModal(
+                    provider?.companyName,
+                    cryptoIdToCoinSymbol(quote.receiveCurrency!),
+                ),
             );
+
             if (result) {
                 // empty quoteId means the partner requests login first, requestTrade to get login screen
                 if (!quote.quoteId) {
@@ -321,7 +297,9 @@ const useCoinmarketBuyForm = ({
                     const response = await invityAPI.doBuyTrade({ trade: quote, returnUrl });
                     if (response) {
                         if (response.trade.status === 'LOGIN_REQUEST' && response.tradeForm) {
-                            submitRequestForm(response.tradeForm.form);
+                            dispatch(
+                                coinmarketCommonActions.submitRequestForm(response.tradeForm.form),
+                            );
                         } else {
                             const errorMessage = `[doBuyTrade] ${response.trade.status} ${response.trade.error}`;
                             console.log(errorMessage);
@@ -329,13 +307,15 @@ const useCoinmarketBuyForm = ({
                     } else {
                         const errorMessage = 'No response from the server';
                         console.log(`[doBuyTrade] ${errorMessage}`);
-                        addNotification({
-                            type: 'error',
-                            error: errorMessage,
-                        });
+                        dispatch(
+                            notificationsActions.addToast({
+                                type: 'error',
+                                error: errorMessage,
+                            }),
+                        );
                     }
                 } else {
-                    saveSelectedQuote(quote);
+                    dispatch(coinmarketBuyActions.saveSelectedQuote(quote));
 
                     timer.stop();
 
@@ -364,23 +344,33 @@ const useCoinmarketBuyForm = ({
         });
 
         if (!response || !response.trade || !response.trade.paymentId) {
-            addNotification({
-                type: 'error',
-                error: 'No response from the server',
-            });
+            dispatch(
+                notificationsActions.addToast({
+                    type: 'error',
+                    error: 'No response from the server',
+                }),
+            );
         } else if (response.trade.error) {
-            addNotification({
-                type: 'error',
-                error: response.trade.error,
-            });
+            dispatch(
+                notificationsActions.addToast({
+                    type: 'error',
+                    error: response.trade.error,
+                }),
+            );
         } else {
-            saveTrade(response.trade, account, new Date().toISOString());
+            dispatch(
+                coinmarketBuyActions.saveTrade(response.trade, account, new Date().toISOString()),
+            );
             if (response.tradeForm) {
-                submitRequestForm(response.tradeForm.form);
+                dispatch(coinmarketCommonActions.submitRequestForm(response.tradeForm.form));
             }
             if (isDesktop()) {
-                saveTransactionDetailId(response.trade.paymentId);
-                goto('wallet-coinmarket-buy-detail', { params: selectedAccount.params });
+                dispatch(coinmarketBuyActions.saveTransactionDetailId(response.trade.paymentId));
+                dispatch(
+                    routerActions.goto('wallet-coinmarket-buy-detail', {
+                        params: selectedAccount.params,
+                    }),
+                );
             }
         }
         setCallInProgress(false);
@@ -451,7 +441,7 @@ const useCoinmarketBuyForm = ({
         }
 
         if (isFromRedirect && quotesRequest) {
-            setIsFromRedirect(false);
+            dispatch(coinmarketBuyActions.setIsFromRedirect(false));
         }
 
         checkQuotesTimer(handleChange);
@@ -525,10 +515,8 @@ const useCoinmarketBuyForm = ({
         selectQuote,
         confirmTrade,
         goToOffers,
-        verifyAddress,
+        verifyAddress: coinmarketBuyActions.verifyAddress,
         removeDraft,
         setAmountLimits,
     };
 };
-
-export default useCoinmarketBuyForm;
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketBuyFormDefaultValues.tsx b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketBuyFormDefaultValues.tsx
index 7fc190bf0d4..e4cd467e4f2 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketBuyFormDefaultValues.tsx
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketBuyFormDefaultValues.tsx
@@ -1,5 +1,10 @@
-import { BuyInfo } from 'src/actions/wallet/coinmarketBuyActions';
 import { useMemo } from 'react';
+
+import { FiatCurrencyCode, CryptoId } from 'invity-api';
+
+import { networks } from '@suite-common/wallet-config';
+
+import { BuyInfo } from 'src/actions/wallet/coinmarketBuyActions';
 import { Account } from 'src/types/wallet';
 import { buildFiatOption, getDefaultCountry } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import { CoinmarketBuyFormDefaultValuesProps } from 'src/types/coinmarket/coinmarketForm';
@@ -8,9 +13,7 @@ import {
     FORM_DEFAULT_FIAT_CURRENCY,
     FORM_DEFAULT_PAYMENT_METHOD,
 } from 'src/constants/wallet/coinmarket/form';
-import { FiatCurrencyCode, CryptoId } from 'invity-api';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
-import { networks } from '@suite-common/wallet-config';
 
 export const useCoinmarketBuyFormDefaultValues = (
     accountSymbol: Account['symbol'],
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm.tsx b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm.tsx
index dd31f7ad968..be5e6f78624 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm.tsx
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm.tsx
@@ -1,4 +1,5 @@
 import { createContext, useContext } from 'react';
+
 import { CoinmarketTradeType } from 'src/types/coinmarket/coinmarket';
 import { CoinmarketFormContextValues } from 'src/types/coinmarket/coinmarketForm';
 
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeForm.ts b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeForm.ts
index e28566e5be9..41202612810 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeForm.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeForm.ts
@@ -1,5 +1,6 @@
 import { useCallback, useState, useEffect, useRef, useMemo } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
+
 import type {
     CryptoId,
     ExchangeTrade,
@@ -7,13 +8,21 @@ import type {
     FiatCurrencyCode,
 } from 'invity-api';
 import useDebounce from 'react-use/lib/useDebounce';
-import { amountToSatoshi, formatAmount, toFiatCurrency } from '@suite-common/wallet-utils';
+
+import { amountToSmallestUnit, formatAmount, toFiatCurrency } from '@suite-common/wallet-utils';
 import { isChanged } from '@suite-common/suite-utils';
-import { useActions, useDispatch, useSelector } from 'src/hooks/suite';
+import { Account } from '@suite-common/wallet-types';
+import { notificationsActions } from '@suite-common/toast-notifications';
+import { networks } from '@suite-common/wallet-config';
+import { analytics, EventType } from '@trezor/suite-analytics';
+
+import { useDispatch, useSelector } from 'src/hooks/suite';
 import invityAPI from 'src/services/suite/invityAPI';
 import { saveQuoteRequest, saveQuotes } from 'src/actions/wallet/coinmarketExchangeActions';
 import {
     addIdsToQuotes,
+    coinmarketGetSuccessQuotes,
+    getCoinmarketNetworkDecimals,
     getUnusedAddressFromAccount,
 } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import {
@@ -26,7 +35,6 @@ import { useFormDraft } from 'src/hooks/wallet/useFormDraft';
 import { useCoinmarketNavigation } from 'src/hooks/wallet/useCoinmarketNavigation';
 import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
 import { CryptoAmountLimits } from 'src/types/wallet/coinmarketCommonTypes';
-import { Account } from '@suite-common/wallet-types';
 import {
     CoinmarketTradeExchangeType,
     UseCoinmarketFormProps,
@@ -34,6 +42,7 @@ import {
 import {
     CoinmarketExchangeFormContextProps,
     CoinmarketExchangeFormProps,
+    CoinmarketExchangeStepType,
 } from 'src/types/coinmarket/coinmarketForm';
 import {
     FORM_EXCHANGE_CEX,
@@ -43,26 +52,19 @@ import {
     FORM_EXCHANGE_TYPE,
 } from 'src/constants/wallet/coinmarket/form';
 import { useCoinmarketExchangeFormDefaultValues } from 'src/hooks/wallet/coinmarket/form/useCoinmarketExchangeFormDefaultValues';
-import {
-    getFilteredSuccessQuotes,
-    useCoinmarketCommonOffers,
-} from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
 import * as coinmarketExchangeActions from 'src/actions/wallet/coinmarketExchangeActions';
 import * as coinmarketCommonActions from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
-import { notificationsActions } from '@suite-common/toast-notifications';
 import { useCoinmarketRecomposeAndSign } from 'src/hooks/wallet/useCoinmarketRecomposeAndSign';
 import { useCoinmarketLoadData } from 'src/hooks/wallet/coinmarket/useCoinmarketLoadData';
 import { useCoinmarketComposeTransaction } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketComposeTransaction';
 import { useCoinmarketFormActions } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketFormActions';
 import { useCoinmarketCurrencySwitcher } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketCurrencySwitcher';
-import { useCoinmarketFiatValues } from './common/useCoinmarketFiatValues';
-import { CoinmarketExchangeStepType } from 'src/types/coinmarket/coinmarketOffers';
 import { useCoinmarketModalCrypto } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketModalCrypto';
-import { networks } from '@suite-common/wallet-config';
 import { useCoinmarketAccount } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketAccount';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
-import { analytics, EventType } from '@trezor/suite-analytics';
-import { setCoinmarketModalAccount } from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
+import { useCoinmarketFiatValues } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketFiatValues';
+
+import { useCoinmarketInitializer } from './common/useCoinmarketInitializer';
 
 export const useCoinmarketExchangeForm = ({
     selectedAccount,
@@ -87,7 +89,7 @@ export const useCoinmarketExchangeForm = ({
         isNotFormPage,
     });
     const { callInProgress, timer, device, setCallInProgress, checkQuotesTimer } =
-        useCoinmarketCommonOffers({ selectedAccount, type });
+        useCoinmarketInitializer({ selectedAccount, type });
     const { buildDefaultCryptoOption } = useCoinmarketInfo();
 
     const dispatch = useDispatch();
@@ -96,7 +98,7 @@ export const useCoinmarketExchangeForm = ({
     const [amountLimits, setAmountLimits] = useState<CryptoAmountLimits | undefined>(undefined);
 
     const [innerQuotes, setInnerQuotes] = useState<ExchangeTrade[] | undefined>(
-        getFilteredSuccessQuotes<CoinmarketTradeExchangeType>(quotes),
+        coinmarketGetSuccessQuotes<CoinmarketTradeExchangeType>(quotes),
     );
     const [receiveAccount, setReceiveAccount] = useState<Account | undefined>();
 
@@ -112,26 +114,6 @@ export const useCoinmarketExchangeForm = ({
         navigateToExchangeConfirm,
     } = useCoinmarketNavigation(account);
 
-    const {
-        saveTrade,
-        openCoinmarketExchangeConfirmModal,
-        saveTransactionId,
-        addNotification,
-        verifyAddress,
-        saveSelectedQuote,
-        setCoinmarketExchangeAccount,
-    } = useActions({
-        saveTrade: coinmarketExchangeActions.saveTrade,
-        openCoinmarketExchangeConfirmModal:
-            coinmarketExchangeActions.openCoinmarketExchangeConfirmModal,
-        saveTransactionId: coinmarketExchangeActions.saveTransactionId,
-        addNotification: notificationsActions.addToast,
-        verifyAddress: coinmarketExchangeActions.verifyAddress,
-        saveSelectedQuote: coinmarketExchangeActions.saveSelectedQuote,
-        setCoinmarketExchangeAccount: coinmarketExchangeActions.setCoinmarketExchangeAccount,
-        setCoinmarketModalAccount: coinmarketCommonActions.setCoinmarketModalAccount,
-    });
-
     const { symbol } = account;
     const { shouldSendInSats } = useBitcoinAmountUnit(symbol);
     const network = networks[account.symbol];
@@ -166,12 +148,10 @@ export const useCoinmarketExchangeForm = ({
     });
     const { reset, register, getValues, setValue, formState, control } = methods;
     const values = useWatch<CoinmarketExchangeFormProps>({ control });
-    const { rateType, exchangeType } = getValues();
+    const { rateType, exchangeType, sendCryptoSelect } = getValues();
     const output = values.outputs?.[0];
     const fiatValues = useCoinmarketFiatValues({
-        accountBalance: account.formattedBalance,
-        cryptoSymbol: values?.sendCryptoSelect?.value as CryptoId,
-        tokenAddress: output?.token,
+        sendCryptoSelect,
         fiatCurrency: output?.currency?.value as FiatCurrencyCode,
     });
     const fiatOfBestScoredQuote = innerQuotes?.[0]?.sendStringAmount
@@ -194,14 +174,21 @@ export const useCoinmarketExchangeForm = ({
         [rateType, innerQuotes, exchangeInfo],
     );
     const dexQuotes = useMemo(() => innerQuotes?.filter(q => q.isDex), [innerQuotes]);
+    const decimals = getCoinmarketNetworkDecimals({ sendCryptoSelect, network });
 
-    const { isComposing, composedLevels, feeInfo, changeFeeLevel, composeRequest } =
-        useCoinmarketComposeTransaction<CoinmarketExchangeFormProps>({
-            account,
-            network,
-            values: values as CoinmarketExchangeFormProps,
-            methods,
-        });
+    const {
+        isComposing,
+        composedLevels,
+        feeInfo,
+        changeFeeLevel,
+        setComposedLevels,
+        composeRequest,
+    } = useCoinmarketComposeTransaction<CoinmarketExchangeFormProps>({
+        account,
+        network,
+        values: values as CoinmarketExchangeFormProps,
+        methods,
+    });
 
     const { toggleAmountInCrypto } = useCoinmarketCurrencySwitcher({
         account,
@@ -235,7 +222,7 @@ export const useCoinmarketExchangeForm = ({
         const unformattedOutputAmount = outputs[0].amount ?? '';
         const sendStringAmount =
             unformattedOutputAmount && shouldSendInSats
-                ? formatAmount(unformattedOutputAmount, network.decimals)
+                ? formatAmount(unformattedOutputAmount, decimals)
                 : unformattedOutputAmount;
 
         if (
@@ -255,7 +242,7 @@ export const useCoinmarketExchangeForm = ({
         };
 
         return request;
-    }, [getValues, network.decimals, shouldSendInSats]);
+    }, [getValues, decimals, shouldSendInSats]);
 
     const handleChange = useCallback(
         async (offLoading?: boolean) => {
@@ -325,8 +312,9 @@ export const useCoinmarketExchangeForm = ({
         setAmountLimits,
         changeFeeLevel,
         composeRequest,
+        setComposedLevels,
         setAccountOnChange: newAccount => {
-            dispatch(setCoinmarketExchangeAccount(newAccount));
+            dispatch(coinmarketExchangeActions.setCoinmarketExchangeAccount(newAccount));
             setAccount(newAccount);
         },
     });
@@ -337,14 +325,16 @@ export const useCoinmarketExchangeForm = ({
                 ? exchangeInfo?.providerInfos[quote.exchange]
                 : null;
         if (quotesRequest) {
-            const result = await openCoinmarketExchangeConfirmModal(
-                provider?.companyName,
-                quote.isDex,
-                quote.send,
-                quote.receive,
+            const result = await dispatch(
+                coinmarketExchangeActions.openCoinmarketExchangeConfirmModal(
+                    provider?.companyName,
+                    quote.isDex,
+                    quote.send,
+                    quote.receive,
+                ),
             );
             if (result) {
-                saveSelectedQuote(quote);
+                dispatch(coinmarketExchangeActions.saveSelectedQuote(quote));
 
                 navigateToExchangeConfirm();
                 timer.stop();
@@ -380,27 +370,31 @@ export const useCoinmarketExchangeForm = ({
         });
 
         if (!response) {
-            addNotification({
-                type: 'error',
-                error: 'No response from the server',
-            });
+            dispatch(
+                notificationsActions.addToast({
+                    type: 'error',
+                    error: 'No response from the server',
+                }),
+            );
         } else if (
             response.error ||
             !response.status ||
             !response.orderId ||
             response.status === 'ERROR'
         ) {
-            addNotification({
-                type: 'error',
-                error: response.error || 'Error response from the server',
-            });
-            saveSelectedQuote(response);
+            dispatch(
+                notificationsActions.addToast({
+                    type: 'error',
+                    error: response.error || 'Error response from the server',
+                }),
+            );
+            dispatch(coinmarketExchangeActions.saveSelectedQuote(response));
         } else if (response.status === 'APPROVAL_REQ' || response.status === 'APPROVAL_PENDING') {
-            saveSelectedQuote(response);
+            dispatch(coinmarketExchangeActions.saveSelectedQuote(response));
             setExchangeStep('SEND_APPROVAL_TRANSACTION');
             ok = true;
         } else if (response.status === 'CONFIRM') {
-            saveSelectedQuote(response);
+            dispatch(coinmarketExchangeActions.saveSelectedQuote(response));
             if (response.isDex) {
                 if (exchangeStep === 'RECEIVING_ADDRESS' || trade.approvalType === 'ZERO') {
                     setExchangeStep('SEND_APPROVAL_TRANSACTION');
@@ -413,8 +407,14 @@ export const useCoinmarketExchangeForm = ({
             ok = true;
         } else {
             // CONFIRMING, SUCCESS
-            saveTrade(response, account, new Date().toISOString());
-            saveTransactionId(response.orderId);
+            dispatch(
+                coinmarketExchangeActions.saveTrade(
+                    response,
+                    selectedAccount.account,
+                    new Date().toISOString(),
+                ),
+            );
+            dispatch(coinmarketExchangeActions.saveTransactionId(response.orderId));
             ok = true;
             navigateToExchangeDetail();
         }
@@ -432,15 +432,16 @@ export const useCoinmarketExchangeForm = ({
             // after discussion with 1inch, adjust the gas limit by the factor of 1.25
             // swap can use different swap paths when mining tx than when estimating tx
             // the geth gas estimate may be too low
-            const result = await recomposeAndSign(
+            const result = await recomposeAndSign({
                 account,
-                selectedQuote.dexTx.to,
-                selectedQuote.dexTx.value,
-                selectedQuote.partnerPaymentExtraId,
-                selectedQuote.dexTx.data,
-                true,
-                selectedQuote.status === 'CONFIRM' ? '1.25' : undefined,
-            );
+                address: selectedQuote.dexTx.to,
+                amount: selectedQuote.dexTx.value,
+                destinationTag: selectedQuote.partnerPaymentExtraId,
+                ethereumDataHex: selectedQuote.dexTx.data,
+                recalcCustomLimit: true,
+                ethereumAdjustGasLimit: selectedQuote.status === 'CONFIRM' ? '1.25' : undefined,
+                setMaxOutputId: values.setMaxOutputId,
+            });
 
             // in case of not success, recomposeAndSign shows notification
             if (result?.success) {
@@ -449,7 +450,13 @@ export const useCoinmarketExchangeForm = ({
                 if (selectedQuote.status === 'CONFIRM' && selectedQuote.approvalType !== 'ZERO') {
                     quote.receiveTxHash = txid;
                     quote.status = 'CONFIRMING';
-                    saveTrade(quote, account, new Date().toISOString());
+                    dispatch(
+                        coinmarketExchangeActions.saveTrade(
+                            quote,
+                            selectedAccount.account,
+                            new Date().toISOString(),
+                        ),
+                    );
                     confirmTrade(quote.receiveAddress || '', undefined, quote);
                 } else {
                     quote.approvalSendTxHash = txid;
@@ -458,15 +465,17 @@ export const useCoinmarketExchangeForm = ({
                 }
             }
         } else {
-            addNotification({
-                type: 'error',
-                error: 'Cannot send transaction, missing data',
-            });
+            dispatch(
+                notificationsActions.addToast({
+                    type: 'error',
+                    error: 'Cannot send transaction, missing data',
+                }),
+            );
         }
     };
 
     const sendTransaction = async () => {
-        dispatch(setCoinmarketModalAccount(account));
+        dispatch(coinmarketCommonActions.setCoinmarketModalAccount(account));
 
         if (selectedQuote?.isDex) {
             sendDexTransaction();
@@ -480,29 +489,34 @@ export const useCoinmarketExchangeForm = ({
             selectedQuote.sendStringAmount
         ) {
             const sendStringAmount = shouldSendInSats
-                ? amountToSatoshi(selectedQuote.sendStringAmount, network.decimals)
+                ? amountToSmallestUnit(selectedQuote.sendStringAmount, decimals)
                 : selectedQuote.sendStringAmount;
-            const result = await recomposeAndSign(
+            const result = await recomposeAndSign({
                 account,
-                selectedQuote.sendAddress,
-                sendStringAmount,
-                selectedQuote.partnerPaymentExtraId,
-                undefined,
-                undefined,
-                undefined,
-                ['broadcast'],
-            );
+                address: selectedQuote.sendAddress,
+                amount: sendStringAmount,
+                destinationTag: selectedQuote.partnerPaymentExtraId,
+                setMaxOutputId: values.setMaxOutputId,
+            });
             // in case of not success, recomposeAndSign shows notification
             if (result?.success) {
-                saveTrade(selectedQuote, account, new Date().toISOString());
-                saveTransactionId(selectedQuote.orderId);
+                dispatch(
+                    coinmarketExchangeActions.saveTrade(
+                        selectedQuote,
+                        selectedAccount.account,
+                        new Date().toISOString(),
+                    ),
+                );
+                dispatch(coinmarketExchangeActions.saveTransactionId(selectedQuote.orderId));
                 navigateToExchangeDetail();
             }
         } else {
-            addNotification({
-                type: 'error',
-                error: 'Cannot send transaction, missing data',
-            });
+            dispatch(
+                notificationsActions.addToast({
+                    type: 'error',
+                    error: 'Cannot send transaction, missing data',
+                }),
+            );
         }
     };
 
@@ -649,7 +663,7 @@ export const useCoinmarketExchangeForm = ({
         goToOffers,
         setExchangeStep,
         sendTransaction,
-        verifyAddress,
+        verifyAddress: coinmarketExchangeActions.verifyAddress,
         selectQuote,
         confirmTrade,
     };
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeFormDefaultValues.ts b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeFormDefaultValues.ts
index ef8f16ea89c..9398dcef900 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeFormDefaultValues.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeFormDefaultValues.ts
@@ -1,5 +1,8 @@
 import { useMemo } from 'react';
+
 import { DEFAULT_PAYMENT, DEFAULT_VALUES } from '@suite-common/wallet-constants';
+import { FormState, Output } from '@suite-common/wallet-types';
+
 import {
     buildFiatOption,
     cryptoIdToNetworkSymbol,
@@ -14,8 +17,6 @@ import {
     RateType,
     RateTypeFilter,
 } from 'src/types/coinmarket/coinmarketForm';
-import { FormState, Output } from '@suite-common/wallet-types';
-import { useCoinmarketBuildAccountGroups } from 'src/hooks/wallet/coinmarket/form/useCoinmarketSellFormDefaultValues';
 import {
     EXCHANGE_COMPARATOR_KYC_FILTER,
     EXCHANGE_COMPARATOR_KYC_FILTER_ALL,
@@ -28,6 +29,7 @@ import {
 } from 'src/constants/wallet/coinmarket/form';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
 import { coinmarketGetExchangeReceiveCryptoId } from 'src/utils/wallet/coinmarket/exchangeUtils';
+import { useCoinmarketBuildAccountGroups } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketBuildAccountGroups';
 
 export const useCoinmarketExchangeFormDefaultValues = (
     account: Account,
@@ -36,7 +38,10 @@ export const useCoinmarketExchangeFormDefaultValues = (
     const localCurrency = useSelector(selectLocalCurrency);
     const defaultCurrency = useMemo(() => buildFiatOption(localCurrency), [localCurrency]);
     const cryptoGroups = useCoinmarketBuildAccountGroups('exchange');
-    const cryptoOptions = cryptoGroups.flatMap(group => group.options);
+    const cryptoOptions = useMemo(
+        () => cryptoGroups.flatMap(group => group.options),
+        [cryptoGroups],
+    );
     const defaultSendCryptoSelect = useMemo(
         () =>
             cryptoOptions.find(
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeWatchSendApproval.ts b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeWatchSendApproval.ts
index 3ba3a4faae6..e10bf181a8d 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeWatchSendApproval.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeWatchSendApproval.ts
@@ -1,6 +1,8 @@
-import { ExchangeTrade } from 'invity-api';
 import { useEffect, useState } from 'react';
 import { useTimeoutFn, useUnmount } from 'react-use';
+
+import { ExchangeTrade } from 'invity-api';
+
 import { useDispatch } from 'src/hooks/suite';
 import invityAPI from 'src/services/suite/invityAPI';
 import { CoinmarketTradeExchangeType } from 'src/types/coinmarket/coinmarket';
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketPaymentMethod.tsx b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketPaymentMethod.tsx
index 4c24b871836..a0d68313300 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketPaymentMethod.tsx
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketPaymentMethod.tsx
@@ -1,4 +1,5 @@
 import { useCallback } from 'react';
+
 import { useSelector } from 'src/hooks/suite';
 import {
     CoinmarketPaymentMethodListProps,
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketSellForm.ts b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketSellForm.ts
index 5ab742e8d8c..46d329ade91 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketSellForm.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketSellForm.ts
@@ -1,14 +1,22 @@
 import { useCallback, useState, useEffect, useRef } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
+
 import type { BankAccount, CryptoId, SellFiatTrade, SellFiatTradeQuoteRequest } from 'invity-api';
 import useDebounce from 'react-use/lib/useDebounce';
-import { amountToSatoshi, formatAmount } from '@suite-common/wallet-utils';
+
+import { amountToSmallestUnit, formatAmount } from '@suite-common/wallet-utils';
 import { isChanged } from '@suite-common/suite-utils';
+import { notificationsActions } from '@suite-common/toast-notifications';
+import { networks } from '@suite-common/wallet-config';
+import { analytics, EventType } from '@trezor/suite-analytics';
+
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import invityAPI from 'src/services/suite/invityAPI';
 import {
     addIdsToQuotes,
+    coinmarketGetSuccessQuotes,
     filterQuotesAccordingTags,
+    getCoinmarketNetworkDecimals,
     getUnusedAddressFromAccount,
 } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import { createQuoteLink, getAmountLimits } from 'src/utils/wallet/coinmarket/sellUtils';
@@ -17,10 +25,15 @@ import { useCoinmarketNavigation } from 'src/hooks/wallet/useCoinmarketNavigatio
 import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
 import { AmountLimits, TradeSell } from 'src/types/wallet/coinmarketCommonTypes';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
-import { CoinmarketTradeSellType, UseCoinmarketFormProps } from 'src/types/coinmarket/coinmarket';
+import {
+    CoinmarketAccountOptionsGroupOptionProps,
+    CoinmarketTradeSellType,
+    UseCoinmarketFormProps,
+} from 'src/types/coinmarket/coinmarket';
 import {
     CoinmarketSellFormContextProps,
     CoinmarketSellFormProps,
+    CoinmarketSellStepType,
 } from 'src/types/coinmarket/coinmarketForm';
 import { useCoinmarketSellFormDefaultValues } from 'src/hooks/wallet/coinmarket/form/useCoinmarketSellFormDefaultValues';
 import useCoinmarketPaymentMethod from 'src/hooks/wallet/coinmarket/form/useCoinmarketPaymentMethod';
@@ -30,25 +43,19 @@ import {
     FORM_OUTPUT_FIAT,
     FORM_PAYMENT_METHOD_SELECT,
 } from 'src/constants/wallet/coinmarket/form';
-import {
-    getFilteredSuccessQuotes,
-    useCoinmarketCommonOffers,
-} from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
 import { useCoinmarketRecomposeAndSign } from 'src/hooks/wallet/useCoinmarketRecomposeAndSign';
-import { notificationsActions } from '@suite-common/toast-notifications';
 import * as coinmarketSellActions from 'src/actions/wallet/coinmarketSellActions';
 import * as routerActions from 'src/actions/suite/routerActions';
 import * as coinmarketCommonActions from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
 import * as coinmarketInfoActions from 'src/actions/wallet/coinmarketInfoActions';
-import { CoinmarketSellStepType } from 'src/types/coinmarket/coinmarketOffers';
 import { useCoinmarketFormActions } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketFormActions';
 import { useCoinmarketLoadData } from 'src/hooks/wallet/coinmarket/useCoinmarketLoadData';
 import { useCoinmarketComposeTransaction } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketComposeTransaction';
 import { useCoinmarketCurrencySwitcher } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketCurrencySwitcher';
-import { networks } from '@suite-common/wallet-config';
 import { useCoinmarketAccount } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketAccount';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
-import { analytics, EventType } from '@trezor/suite-analytics';
+
+import { useCoinmarketInitializer } from './common/useCoinmarketInitializer';
 
 export const useCoinmarketSellForm = ({
     selectedAccount,
@@ -74,7 +81,7 @@ export const useCoinmarketSellForm = ({
         isNotFormPage,
     });
     const { callInProgress, timer, device, setCallInProgress, checkQuotesTimer } =
-        useCoinmarketCommonOffers({ selectedAccount, type });
+        useCoinmarketInitializer({ selectedAccount, type });
     const { paymentMethods, getPaymentMethods, getQuotesByPaymentMethod } =
         useCoinmarketPaymentMethod<CoinmarketTradeSellType>();
     const {
@@ -98,7 +105,7 @@ export const useCoinmarketSellForm = ({
     const [amountLimits, setAmountLimits] = useState<AmountLimits | undefined>(undefined);
     const [sellStep, setSellStep] = useState<CoinmarketSellStepType>('BANK_ACCOUNT');
     const [innerQuotes, setInnerQuotes] = useState<SellFiatTrade[] | undefined>(
-        getFilteredSuccessQuotes<CoinmarketTradeSellType>(quotes),
+        coinmarketGetSuccessQuotes<CoinmarketTradeSellType>(quotes),
     );
     const [isSubmittingHelper, setIsSubmittingHelper] = useState(false);
     const abortControllerRef = useRef<AbortController | null>(null);
@@ -154,14 +161,26 @@ export const useCoinmarketSellForm = ({
         innerQuotes,
         values?.paymentMethod?.value ?? '',
     );
+    const decimals = getCoinmarketNetworkDecimals({
+        sendCryptoSelect: values.sendCryptoSelect as
+            | CoinmarketAccountOptionsGroupOptionProps
+            | undefined,
+        network,
+    });
 
-    const { isComposing, composedLevels, feeInfo, changeFeeLevel, composeRequest } =
-        useCoinmarketComposeTransaction<CoinmarketSellFormProps>({
-            account,
-            network,
-            values: values as CoinmarketSellFormProps,
-            methods,
-        });
+    const {
+        isComposing,
+        composedLevels,
+        feeInfo,
+        changeFeeLevel,
+        setComposedLevels,
+        composeRequest,
+    } = useCoinmarketComposeTransaction<CoinmarketSellFormProps>({
+        account,
+        network,
+        values: values as CoinmarketSellFormProps,
+        methods,
+    });
 
     const { toggleAmountInCrypto } = useCoinmarketCurrencySwitcher<CoinmarketSellFormProps>({
         account,
@@ -194,7 +213,7 @@ export const useCoinmarketSellForm = ({
         const unformattedOutputAmount = outputs[0].amount ?? '';
         const cryptoStringAmount =
             unformattedOutputAmount && shouldSendInSats
-                ? formatAmount(unformattedOutputAmount, network.decimals)
+                ? formatAmount(unformattedOutputAmount, decimals)
                 : unformattedOutputAmount;
         const currencySelect = outputs[0].currency ?? '';
         const request: SellFiatTradeQuoteRequest = {
@@ -215,7 +234,7 @@ export const useCoinmarketSellForm = ({
         }
 
         return request;
-    }, [methods, network.decimals, shouldSendInSats]);
+    }, [methods, decimals, shouldSendInSats]);
 
     const handleChange = useCallback(
         async (offLoading?: boolean) => {
@@ -246,7 +265,7 @@ export const useCoinmarketSellForm = ({
                 );
                 // without errors
                 const quotesSuccess =
-                    getFilteredSuccessQuotes<CoinmarketTradeSellType>(quotesDefault) ?? [];
+                    coinmarketGetSuccessQuotes<CoinmarketTradeSellType>(quotesDefault) ?? [];
 
                 const bestQuote = quotesSuccess?.[0];
                 const bestQuotePaymentMethod = bestQuote?.paymentMethod;
@@ -307,6 +326,7 @@ export const useCoinmarketSellForm = ({
         setAmountLimits,
         changeFeeLevel,
         composeRequest,
+        setComposedLevels,
         setAccountOnChange: newAccount => {
             dispatch(coinmarketSellActions.setCoinmarketSellAccount(newAccount));
             setAccount(newAccount);
@@ -357,7 +377,7 @@ export const useCoinmarketSellForm = ({
                     dispatch(
                         coinmarketSellActions.saveTrade(
                             response.trade,
-                            account,
+                            selectedAccount.account,
                             new Date().toISOString(),
                         ),
                     );
@@ -370,6 +390,7 @@ export const useCoinmarketSellForm = ({
 
                 return undefined;
             }
+            setCallInProgress(false);
 
             return response.trade;
         }
@@ -464,16 +485,17 @@ export const useCoinmarketSellForm = ({
             selectedQuote.cryptoStringAmount
         ) {
             const cryptoStringAmount = shouldSendInSats
-                ? amountToSatoshi(selectedQuote.cryptoStringAmount, network.decimals)
+                ? amountToSmallestUnit(selectedQuote.cryptoStringAmount, decimals)
                 : selectedQuote.cryptoStringAmount;
             const destinationPaymentExtraId =
                 selectedQuote.destinationPaymentExtraId || trade?.data?.destinationPaymentExtraId;
-            const result = await recomposeAndSign(
+            const result = await recomposeAndSign({
                 account,
-                destinationAddress,
-                cryptoStringAmount,
-                destinationPaymentExtraId,
-            );
+                address: destinationAddress,
+                amount: cryptoStringAmount,
+                destinationTag: destinationPaymentExtraId,
+                setMaxOutputId: values.setMaxOutputId,
+            });
             if (result?.success) {
                 // send txid to the server as confirmation
                 const { txid } = result.payload;
@@ -501,15 +523,19 @@ export const useCoinmarketSellForm = ({
                 }
 
                 dispatch(
-                    coinmarketSellActions.saveTrade(response, account, new Date().toISOString()),
+                    coinmarketSellActions.saveTrade(
+                        response,
+                        selectedAccount.account,
+                        new Date().toISOString(),
+                    ),
                 );
                 dispatch(coinmarketSellActions.saveTransactionId(selectedQuote.orderId));
                 dispatch(
                     routerActions.goto('wallet-coinmarket-sell-detail', {
                         params: {
-                            symbol: account.symbol,
-                            accountIndex: account.index,
-                            accountType: account.accountType,
+                            symbol: selectedAccount.account.symbol,
+                            accountIndex: selectedAccount.account.index,
+                            accountType: selectedAccount.account.accountType,
                         },
                     }),
                 );
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketSellFormDefaultValues.ts b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketSellFormDefaultValues.ts
index fa6f825739e..afe3543873a 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketSellFormDefaultValues.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketSellFormDefaultValues.ts
@@ -1,65 +1,22 @@
 import { useMemo } from 'react';
-import { SellInfo } from 'src/actions/wallet/coinmarketSellActions';
+
 import { DEFAULT_PAYMENT, DEFAULT_VALUES } from '@suite-common/wallet-constants';
+import { FormState, Output } from '@suite-common/wallet-types';
+
+import { SellInfo } from 'src/actions/wallet/coinmarketSellActions';
 import {
     buildFiatOption,
-    coinmarketBuildAccountOptions,
     cryptoIdToNetworkSymbol,
     getDefaultCountry,
 } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import { Account } from 'src/types/wallet';
-import {
-    CoinmarketAccountsOptionsGroupProps,
-    CoinmarketPaymentMethodListProps,
-    CoinmarketTradeSellExchangeType,
-} from 'src/types/coinmarket/coinmarket';
+import { CoinmarketPaymentMethodListProps } from 'src/types/coinmarket/coinmarket';
 import { CoinmarketSellFormDefaultValuesProps } from 'src/types/coinmarket/coinmarketForm';
-import { FormState, Output } from '@suite-common/wallet-types';
-import { selectAccountLabels } from 'src/reducers/suite/metadataReducer';
-import { useSelector } from 'src/hooks/suite';
-import { selectAccounts, selectDevice } from '@suite-common/wallet-core';
-import { useAccountLabel } from 'src/components/suite/AccountLabel';
 import {
     FORM_DEFAULT_FIAT_CURRENCY,
     FORM_DEFAULT_PAYMENT_METHOD,
 } from 'src/constants/wallet/coinmarket/form';
-
-export const useCoinmarketBuildAccountGroups = (
-    type: CoinmarketTradeSellExchangeType,
-): CoinmarketAccountsOptionsGroupProps[] => {
-    const accounts = useSelector(selectAccounts);
-    const accountLabels = useSelector(selectAccountLabels);
-    const device = useSelector(selectDevice);
-    const { defaultAccountLabelString } = useAccountLabel();
-    const { tokenDefinitions } = useSelector(state => state);
-    const supportedSymbols = useSelector(state =>
-        type === 'sell'
-            ? state.wallet.coinmarket.sell.sellInfo?.supportedCryptoCurrencies
-            : state.wallet.coinmarket.exchange.exchangeInfo?.sellSymbols,
-    );
-
-    const groups = useMemo(
-        () =>
-            coinmarketBuildAccountOptions({
-                accounts,
-                deviceState: device?.state,
-                accountLabels,
-                tokenDefinitions,
-                supportedCryptoIds: supportedSymbols,
-                defaultAccountLabelString,
-            }),
-        [
-            accounts,
-            supportedSymbols,
-            accountLabels,
-            device,
-            tokenDefinitions,
-            defaultAccountLabelString,
-        ],
-    );
-
-    return groups;
-};
+import { useCoinmarketBuildAccountGroups } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketBuildAccountGroups';
 
 export const useCoinmarketSellFormDefaultValues = (
     account: Account,
@@ -67,17 +24,21 @@ export const useCoinmarketSellFormDefaultValues = (
 ): CoinmarketSellFormDefaultValuesProps => {
     const country = sellInfo?.sellList?.country;
     const cryptoGroups = useCoinmarketBuildAccountGroups('sell');
-    const cryptoOptions = cryptoGroups.flatMap(group => group.options);
+    const cryptoOptions = useMemo(
+        () => cryptoGroups.flatMap(group => group.options),
+        [cryptoGroups],
+    );
     const defaultSendCryptoSelect = useMemo(
         () =>
             cryptoOptions.find(
                 option =>
                     option.descriptor === account.descriptor &&
-                    cryptoIdToNetworkSymbol(option.value) === account.symbol,
+                    account.symbol === cryptoIdToNetworkSymbol(option.value),
             ),
         [account.descriptor, account.symbol, cryptoOptions],
     );
     const defaultCountry = useMemo(() => getDefaultCountry(country), [country]);
+
     const defaultPaymentMethod: CoinmarketPaymentMethodListProps = useMemo(
         () => ({
             value: FORM_DEFAULT_PAYMENT_METHOD,
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketVerifyAccount.tsx b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketVerifyAccount.tsx
index 92939c67b54..d5ddf2cfd37 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketVerifyAccount.tsx
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketVerifyAccount.tsx
@@ -1,11 +1,15 @@
-import { Network, networksCollection } from '@suite-common/wallet-config';
-import { selectDevice } from '@suite-common/wallet-core';
 import { useEffect, useMemo, useState } from 'react';
 import { useForm } from 'react-hook-form';
+
+import { Network, networksCollection } from '@suite-common/wallet-config';
+import { selectDevice } from '@suite-common/wallet-core';
+import { Account } from '@suite-common/wallet-types';
+import { TrezorDevice } from '@suite-common/suite-types';
+import { filterReceiveAccounts } from '@suite-common/wallet-utils';
+
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { selectIsDebugModeActive } from 'src/reducers/suite/suiteReducer';
 import { openModal } from 'src/actions/suite/modalActions';
-import { Account } from '@suite-common/wallet-types';
 import {
     cryptoIdToNetworkSymbol,
     getUnusedAddressFromAccount,
@@ -21,8 +25,6 @@ import {
     CoinmarketVerifyFormProps,
 } from 'src/types/coinmarket/coinmarketVerify';
 import { useAccountAddressDictionary } from 'src/hooks/wallet/useAccounts';
-import { TrezorDevice } from '@suite-common/suite-types';
-import { filterReceiveAccounts } from '@suite-common/wallet-utils';
 
 const getSelectAccountOptions = (
     suiteReceiveAccounts: Account[] | undefined,
@@ -82,7 +84,7 @@ const getSuiteReceiveAccounts = ({
 
         return filterReceiveAccounts({
             accounts,
-            deviceState: device?.state,
+            deviceState: device?.state?.staticSessionId,
             receiveNetwork,
             isDebug,
             receiveNetworks,
diff --git a/packages/suite/src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers.ts b/packages/suite/src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers.ts
deleted file mode 100644
index be214d1f0f9..00000000000
--- a/packages/suite/src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { useTimer } from '@trezor/react-utils';
-import { useDevice } from 'src/hooks/suite';
-import { InvityAPIReloadQuotesAfterSeconds } from 'src/constants/wallet/coinmarket/metadata';
-import { createContext, useContext, useState } from 'react';
-import {
-    CoinmarketTradeBuyType,
-    CoinmarketTradeDetailMapProps,
-    CoinmarketTradeExchangeType,
-    CoinmarketTradeSellType,
-    CoinmarketTradeType,
-    UseCoinmarketCommonProps,
-    UseCoinmarketCommonReturnProps,
-} from 'src/types/coinmarket/coinmarket';
-import {
-    CoinmarketOffersContextValues,
-    CoinmarketOffersMapProps,
-} from 'src/types/coinmarket/coinmarketOffers';
-import { useServerEnvironment } from 'src/hooks/wallet/coinmarket/useServerEnviroment';
-
-export const isCoinmarketBuyOffers = (
-    offersContext: CoinmarketOffersMapProps[keyof CoinmarketOffersMapProps],
-): offersContext is CoinmarketOffersMapProps[CoinmarketTradeBuyType] =>
-    offersContext.type === 'buy';
-
-export const isCoinmarketSellOffers = (
-    offersContext: CoinmarketOffersMapProps[keyof CoinmarketOffersMapProps],
-): offersContext is CoinmarketOffersMapProps[CoinmarketTradeSellType] =>
-    offersContext.type === 'sell';
-
-export const isCoinmarketExchangeOffers = (
-    offersContext: CoinmarketOffersMapProps[keyof CoinmarketOffersMapProps],
-): offersContext is CoinmarketOffersMapProps[CoinmarketTradeExchangeType] =>
-    offersContext.type === 'exchange';
-
-export const getFilteredSuccessQuotes = <T extends CoinmarketTradeType>(
-    quotes: CoinmarketTradeDetailMapProps[T][] | undefined,
-) => (quotes ? quotes.filter(q => q.error === undefined) : undefined);
-
-export const useCoinmarketCommonOffers = ({
-    type,
-    selectedAccount,
-}: UseCoinmarketCommonProps): UseCoinmarketCommonReturnProps => {
-    const timer = useTimer();
-    const { account } = selectedAccount;
-    const { isLocked, device } = useDevice();
-    const [callInProgress, setCallInProgress] = useState<boolean>(
-        type !== 'buy' ? isLocked() : false,
-    );
-
-    const checkQuotesTimer = (callback: () => Promise<void>) => {
-        if (!timer.isLoading && !timer.isStopped) {
-            if (timer.resetCount >= 40) {
-                timer.stop();
-            }
-
-            if (timer.timeSpend.seconds === InvityAPIReloadQuotesAfterSeconds) {
-                callback();
-            }
-        }
-    };
-
-    useServerEnvironment();
-
-    return {
-        callInProgress,
-        account,
-        timer,
-        device,
-        setCallInProgress,
-        checkQuotesTimer,
-    };
-};
-
-export const CoinmarketOffersContext =
-    createContext<CoinmarketOffersContextValues<CoinmarketTradeType> | null>(null);
-
-CoinmarketOffersContext.displayName = 'CoinmarketOffersContext';
-
-export const useCoinmarketOffersContext = <T extends CoinmarketTradeType>() => {
-    const context = useContext(CoinmarketOffersContext);
-    if (context === null) throw Error('CoinmarketOffersContext used without Context');
-
-    return context as CoinmarketOffersContextValues<T>;
-};
diff --git a/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketDetail.ts b/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketDetail.ts
index 0a458303247..4a94878978c 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketDetail.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketDetail.ts
@@ -1,12 +1,12 @@
-import { useSelector } from 'src/hooks/suite';
 import { createContext, useContext } from 'react';
+
+import { useSelector } from 'src/hooks/suite';
 import {
     CoinmarketDetailContextValues,
     CoinmarketGetDetailDataOutputProps,
     CoinmarketUseDetailOutputProps,
     CoinmarketUseDetailProps,
 } from 'src/types/coinmarket/coinmarketDetail';
-import { useCoinmarketWatchTrade } from './useCoinmarketWatchTrade';
 import { Trade, TradeBuy } from 'src/types/wallet/coinmarketCommonTypes';
 import {
     CoinmarketGetDetailDataProps,
@@ -16,8 +16,9 @@ import {
     CoinmarketTradeMapProps,
     CoinmarketTradeType,
 } from 'src/types/coinmarket/coinmarket';
-import { useServerEnvironment } from './useServerEnviroment';
 import { useCoinmarketLoadData } from 'src/hooks/wallet/coinmarket/useCoinmarketLoadData';
+import { useServerEnvironment } from 'src/hooks/wallet/coinmarket/useServerEnviroment';
+import { useCoinmarketWatchTrade } from 'src/hooks/wallet/coinmarket/useCoinmarketWatchTrade';
 
 const isBuyTrade = (trade: Trade): trade is TradeBuy => trade.tradeType === 'buy';
 
diff --git a/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketInfo.ts b/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketInfo.ts
index b64b44078ca..ba3c5cb92cb 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketInfo.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketInfo.ts
@@ -1,8 +1,11 @@
-import { getNetworkByCoingeckoNativeId, networks } from '@suite-common/wallet-config';
-import { CoinInfo, CryptoId } from 'invity-api';
 import { useCallback } from 'react';
-import { useSelector } from 'src/hooks/suite/useSelector';
+
+import { CoinInfo, CryptoId } from 'invity-api';
+
+import { getNetworkByCoingeckoNativeId, networks } from '@suite-common/wallet-config';
 import addressValidator from '@trezor/address-validator';
+
+import { useSelector } from 'src/hooks/suite/useSelector';
 import {
     CoinmarketCryptoSelectItemProps,
     CoinmarketCryptoSelectOptionProps,
diff --git a/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketLoadData.ts b/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketLoadData.ts
index e0b031d75ef..9894e9df2a5 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketLoadData.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketLoadData.ts
@@ -1,4 +1,5 @@
 import { useEffect } from 'react';
+
 import { loadInvityData } from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
 import { useDispatch } from 'src/hooks/suite';
 
diff --git a/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketWatchTrade.ts b/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketWatchTrade.ts
index e03485d21fe..0f0b0ace089 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketWatchTrade.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/useCoinmarketWatchTrade.ts
@@ -1,12 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { useTimeoutFn, useUnmount } from 'react-use';
-import { Trade, TradeType } from 'src/types/wallet/coinmarketCommonTypes';
-import { useFormDraft } from '../useFormDraft';
-import invityAPI from 'src/services/suite/invityAPI';
-import { saveTrade as saveBuyTrade } from 'src/actions/wallet/coinmarketBuyActions';
-import { saveTrade as saveExchangeTrade } from 'src/actions/wallet/coinmarketExchangeActions';
-import { saveTrade as saveSellTrade } from 'src/actions/wallet/coinmarketSellActions';
+
 import {
     BuyTradeFinalStatus,
     ExchangeTradeFinalStatus,
@@ -15,12 +10,19 @@ import {
     WatchExchangeTradeResponse,
     WatchSellTradeResponse,
 } from 'invity-api';
+
+import { Trade, TradeType } from 'src/types/wallet/coinmarketCommonTypes';
+import invityAPI from 'src/services/suite/invityAPI';
+import { saveTrade as saveBuyTrade } from 'src/actions/wallet/coinmarketBuyActions';
+import { saveTrade as saveExchangeTrade } from 'src/actions/wallet/coinmarketExchangeActions';
+import { saveTrade as saveSellTrade } from 'src/actions/wallet/coinmarketSellActions';
 import {
     CoinmarketTradeStatusType,
     CoinmarketTradeType,
     CoinmarketUseWatchTradeProps,
     CoinmarketWatchTradeProps,
 } from 'src/types/coinmarket/coinmarket';
+import { useFormDraft } from 'src/hooks/wallet/useFormDraft';
 
 export const tradeFinalStatuses: Record<TradeType, CoinmarketTradeStatusType[]> = {
     buy: ['SUCCESS', 'ERROR', 'BLOCKED'] satisfies BuyTradeFinalStatus[],
diff --git a/packages/suite/src/hooks/wallet/form/useCoinjoinRegisteredUtxos.ts b/packages/suite/src/hooks/wallet/form/useCoinjoinRegisteredUtxos.ts
index 9b6239715ba..b2e2e550bbf 100644
--- a/packages/suite/src/hooks/wallet/form/useCoinjoinRegisteredUtxos.ts
+++ b/packages/suite/src/hooks/wallet/form/useCoinjoinRegisteredUtxos.ts
@@ -1,4 +1,5 @@
 import { useMemo } from 'react';
+
 import { AccountUtxo } from '@trezor/connect';
 import { getUtxoOutpoint } from '@suite-common/wallet-utils';
 import { Account } from '@suite-common/wallet-types';
diff --git a/packages/suite/src/hooks/wallet/form/useCoinjoinUnavailableUtxos.ts b/packages/suite/src/hooks/wallet/form/useCoinjoinUnavailableUtxos.ts
index 1ca9edc0fff..2277d512d6d 100644
--- a/packages/suite/src/hooks/wallet/form/useCoinjoinUnavailableUtxos.ts
+++ b/packages/suite/src/hooks/wallet/form/useCoinjoinUnavailableUtxos.ts
@@ -1,9 +1,10 @@
 import { useMemo } from 'react';
+
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { AccountUtxo } from '@trezor/connect';
-
 import { getUtxoOutpoint } from '@suite-common/wallet-utils';
 import { Account } from '@suite-common/wallet-types';
+
 import { useSelector, useTranslation } from 'src/hooks/suite';
 import { WabiSabiProtocolErrorCode } from 'src/types/wallet/coinjoin';
 import {
diff --git a/packages/suite/src/hooks/wallet/form/useCompose.ts b/packages/suite/src/hooks/wallet/form/useCompose.ts
index cb857a22068..bd3b4fa89c8 100644
--- a/packages/suite/src/hooks/wallet/form/useCompose.ts
+++ b/packages/suite/src/hooks/wallet/form/useCompose.ts
@@ -1,11 +1,10 @@
 import { useEffect, useRef, useCallback, useState } from 'react';
 import { FieldPath, UseFormReturn } from 'react-hook-form';
+
 import { isFulfilled } from '@reduxjs/toolkit';
 
 import { FeeLevel } from '@trezor/connect';
 import { useDebounce } from '@trezor/react-utils';
-import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
-import { signAndPushSendFormTransactionThunk } from 'src/actions/wallet/send/sendFormThunks';
 import {
     ComposeActionContext,
     composeSendFormTransactionFeeLevelsThunk,
@@ -19,7 +18,11 @@ import {
     PrecomposedLevelsCardano,
 } from '@suite-common/wallet-types';
 import { COMPOSE_ERROR_TYPES } from '@suite-common/wallet-constants';
+
+import { signAndPushSendFormTransactionThunk } from 'src/actions/wallet/send/sendFormThunks';
+import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
+
 import { SendContextValues, UseSendFormState } from '../../../types/wallet/sendForm';
 
 const DEFAULT_FIELD = 'outputs.0.amount';
@@ -259,6 +262,7 @@ export const useCompose = <TFieldValues extends FormState>({
         composeRequest,
         composedLevels,
         onFeeLevelChange,
+        setComposedLevels,
         signTransaction: sign,
     };
 };
diff --git a/packages/suite/src/hooks/wallet/form/useFees.ts b/packages/suite/src/hooks/wallet/form/useFees.ts
index 6d383b454d2..7d942fcb4eb 100644
--- a/packages/suite/src/hooks/wallet/form/useFees.ts
+++ b/packages/suite/src/hooks/wallet/form/useFees.ts
@@ -1,14 +1,17 @@
 import { useEffect, useRef } from 'react';
 import { FieldPath, UseFormReturn } from 'react-hook-form';
+
 import { FeeLevel } from '@trezor/connect';
-import { setLastUsedFeeLevel } from 'src/actions/settings/walletSettingsActions';
-import { useDispatch } from 'src/hooks/suite';
 import {
     FeeInfo,
     FormState,
     PrecomposedLevels,
     PrecomposedLevelsCardano,
 } from '@suite-common/wallet-types';
+
+import { setLastUsedFeeLevel } from 'src/actions/settings/walletSettingsActions';
+import { useDispatch } from 'src/hooks/suite';
+
 import { SendContextValues } from '../../../types/wallet/sendForm';
 
 interface Props<TFieldValues extends FormState> extends UseFormReturn<TFieldValues> {
diff --git a/packages/suite/src/hooks/wallet/form/useStakeCompose.ts b/packages/suite/src/hooks/wallet/form/useStakeCompose.ts
index 7c909d5bdfa..2b6469edee8 100644
--- a/packages/suite/src/hooks/wallet/form/useStakeCompose.ts
+++ b/packages/suite/src/hooks/wallet/form/useStakeCompose.ts
@@ -2,8 +2,6 @@ import { useEffect, useRef, useCallback, useState } from 'react';
 import { FieldPath, UseFormReturn } from 'react-hook-form';
 
 import { useDebounce } from '@trezor/react-utils';
-import { useDispatch, useTranslation } from 'src/hooks/suite';
-import { composeTransaction } from 'src/actions/wallet/stakeActions';
 import { findComposeErrors } from '@suite-common/wallet-utils';
 import {
     StakeFormState,
@@ -14,6 +12,9 @@ import { COMPOSE_ERROR_TYPES } from '@suite-common/wallet-constants';
 import { FeeLevel } from '@trezor/connect';
 import { ComposeActionContext, StakeContextValues } from '@suite-common/wallet-core';
 
+import { composeTransaction } from 'src/actions/wallet/stakeActions';
+import { useDispatch, useTranslation } from 'src/hooks/suite';
+
 const DEFAULT_FIELD = 'outputs.0.amount';
 
 interface Props<TFieldValues extends StakeFormState> extends UseFormReturn<TFieldValues> {
diff --git a/packages/suite/src/hooks/wallet/form/useUtxoSelection.ts b/packages/suite/src/hooks/wallet/form/useUtxoSelection.ts
index c8e39b62485..acc2940e200 100644
--- a/packages/suite/src/hooks/wallet/form/useUtxoSelection.ts
+++ b/packages/suite/src/hooks/wallet/form/useUtxoSelection.ts
@@ -4,6 +4,7 @@ import { UseFormReturn } from 'react-hook-form';
 import { ExcludedUtxos, FormState } from '@suite-common/wallet-types';
 import type { AccountUtxo, PROTO } from '@trezor/connect';
 import { getUtxoOutpoint, isSameUtxo } from '@suite-common/wallet-utils';
+
 import { useCoinjoinRegisteredUtxos } from './useCoinjoinRegisteredUtxos';
 import {
     SendContextValues,
diff --git a/packages/suite/src/hooks/wallet/sign-verify/useCopySignedMessage.ts b/packages/suite/src/hooks/wallet/sign-verify/useCopySignedMessage.ts
index 5b1c387536d..64b108211cd 100644
--- a/packages/suite/src/hooks/wallet/sign-verify/useCopySignedMessage.ts
+++ b/packages/suite/src/hooks/wallet/sign-verify/useCopySignedMessage.ts
@@ -1,7 +1,8 @@
 import { copyToClipboard } from '@trezor/dom-utils';
-import { useDispatch } from 'src/hooks/suite';
 import { notificationsActions } from '@suite-common/toast-notifications';
 
+import { useDispatch } from 'src/hooks/suite';
+
 type SignedMessageData = {
     message?: string;
     address?: string;
diff --git a/packages/suite/src/hooks/wallet/sign-verify/useSignAddressOptions.ts b/packages/suite/src/hooks/wallet/sign-verify/useSignAddressOptions.ts
index e5b1d718ee8..b92587485c9 100644
--- a/packages/suite/src/hooks/wallet/sign-verify/useSignAddressOptions.ts
+++ b/packages/suite/src/hooks/wallet/sign-verify/useSignAddressOptions.ts
@@ -1,4 +1,5 @@
 import { useMemo } from 'react';
+
 import { useTranslation } from 'src/hooks/suite';
 import type { Account } from 'src/types/wallet';
 import type { ExtendedMessageDescriptor } from 'src/types/suite';
diff --git a/packages/suite/src/hooks/wallet/sign-verify/useSignVerifyForm.ts b/packages/suite/src/hooks/wallet/sign-verify/useSignVerifyForm.ts
index e3f9f8f91f5..e2273f8f2db 100644
--- a/packages/suite/src/hooks/wallet/sign-verify/useSignVerifyForm.ts
+++ b/packages/suite/src/hooks/wallet/sign-verify/useSignVerifyForm.ts
@@ -1,11 +1,13 @@
 import { useEffect } from 'react';
 import { useForm, useController } from 'react-hook-form';
+
+import { yupResolver } from '@hookform/resolvers/yup';
+
 import { yup } from '@suite-common/validators';
 import { isAddressValid } from '@suite-common/wallet-utils';
-import { yupResolver } from '@hookform/resolvers/yup';
+import { NetworkSymbol } from '@suite-common/wallet-config';
 
 import type { Account } from 'src/types/wallet';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 
 export const MAX_LENGTH_MESSAGE = 1024;
 export const MAX_LENGTH_SIGNATURE = 255;
diff --git a/packages/suite/src/hooks/wallet/useBitcoinAmountUnit.ts b/packages/suite/src/hooks/wallet/useBitcoinAmountUnit.ts
index edd0cdaaf7b..94d895b54a8 100644
--- a/packages/suite/src/hooks/wallet/useBitcoinAmountUnit.ts
+++ b/packages/suite/src/hooks/wallet/useBitcoinAmountUnit.ts
@@ -1,10 +1,10 @@
 import { PROTO } from '@trezor/connect';
 import { selectDeviceUnavailableCapabilities } from '@suite-common/wallet-core';
+import { getNetworkOptional, NetworkSymbol } from '@suite-common/wallet-config';
 
 import { useSelector } from 'src/hooks/suite/useSelector';
 import { useActions } from 'src/hooks/suite/useActions';
 import * as walletSettingsActions from 'src/actions/settings/walletSettingsActions';
-import { getNetworkOptional, NetworkSymbol } from '@suite-common/wallet-config';
 
 export const useBitcoinAmountUnit = (symbol?: NetworkSymbol) => {
     const bitcoinAmountUnit = useSelector(state => state.wallet.settings.bitcoinAmountUnit);
diff --git a/packages/suite/src/hooks/wallet/useCardanoStaking.ts b/packages/suite/src/hooks/wallet/useCardanoStaking.ts
index 6c94c855fc8..eab7c248a0c 100644
--- a/packages/suite/src/hooks/wallet/useCardanoStaking.ts
+++ b/packages/suite/src/hooks/wallet/useCardanoStaking.ts
@@ -17,14 +17,14 @@ import trezorConnect, { PROTO } from '@trezor/connect';
 import { addFakePendingCardanoTxThunk, selectDevice } from '@suite-common/wallet-core';
 
 import { ActionAvailability, CardanoStaking } from 'src/types/wallet/cardanoStaking';
-import { SUITE } from 'src/actions/suite/constants';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { setPendingStakeTx } from 'src/actions/wallet/cardanoStakingActions';
 import { AppState } from 'src/types/suite';
+import { selectIsDeviceLocked } from 'src/reducers/suite/suiteReducer';
 
 const getDeviceAvailability = (
     device: AppState['device']['selectedDevice'],
-    locks: AppState['suite']['locks'],
+    isDeviceLocked: boolean,
 ) => {
     // Handle all external cases where it is not possible to make delegate or withdrawal action
     if (!device?.connected) {
@@ -33,7 +33,7 @@ const getDeviceAvailability = (
             reason: 'DEVICE_DISCONNECTED',
         } as const;
     }
-    if (locks.includes(SUITE.LOCK_TYPE.DEVICE)) {
+    if (isDeviceLocked) {
         return {
             status: false,
             reason: 'DEVICE_LOCK',
@@ -63,7 +63,7 @@ export const useCardanoStaking = (): CardanoStaking => {
     }
 
     const device = useSelector(selectDevice);
-    const locks = useSelector(state => state.suite.locks);
+    const isDeviceLocked = useSelector(selectIsDeviceLocked);
     const cardanoStaking = useSelector(state => state.wallet.cardanoStaking);
     const dispatch = useDispatch();
 
@@ -295,7 +295,7 @@ export const useCardanoStaking = (): CardanoStaking => {
         fee,
         loading,
         pendingStakeTx,
-        deviceAvailable: getDeviceAvailability(device, locks),
+        deviceAvailable: getDeviceAvailability(device, isDeviceLocked),
         delegatingAvailable,
         withdrawingAvailable,
         registeredPoolId,
diff --git a/packages/suite/src/hooks/wallet/useClaimEthForm.ts b/packages/suite/src/hooks/wallet/useClaimEthForm.ts
index 9b466a513af..646afd34292 100644
--- a/packages/suite/src/hooks/wallet/useClaimEthForm.ts
+++ b/packages/suite/src/hooks/wallet/useClaimEthForm.ts
@@ -1,21 +1,21 @@
 import { createContext, useCallback, useContext, useEffect, useMemo } from 'react';
 import { useForm } from 'react-hook-form';
 
+import { selectNetwork } from '@everstake/wallet-sdk/ethereum';
+
 import { getFeeLevels } from '@suite-common/wallet-utils';
+import { PrecomposedTransactionFinal } from '@suite-common/wallet-types';
 
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { CRYPTO_INPUT, OUTPUT_AMOUNT, UseStakeFormsProps } from 'src/types/wallet/stakeForms';
-
-import { useStakeCompose } from './form/useStakeCompose';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
-
 import { signTransaction } from 'src/actions/wallet/stakeActions';
-import { PrecomposedTransactionFinal } from '@suite-common/wallet-types';
 import { getEthNetworkForWalletSdk, getStakeFormsDefaultValues } from 'src/utils/suite/stake';
-import { selectNetwork } from '@everstake/wallet-sdk/ethereum';
-import { useFees } from './form/useFees';
 import { ClaimContextValues, ClaimFormState } from 'src/types/wallet/claimForm';
 
+import { useFees } from './form/useFees';
+import { useStakeCompose } from './form/useStakeCompose';
+
 export const ClaimEthFormContext = createContext<ClaimContextValues | null>(null);
 ClaimEthFormContext.displayName = 'ClaimEthFormContext';
 
diff --git a/packages/suite/src/hooks/wallet/useCoinmarketNavigation.ts b/packages/suite/src/hooks/wallet/useCoinmarketNavigation.ts
index ab0bfe4b2a6..072e0513d9b 100644
--- a/packages/suite/src/hooks/wallet/useCoinmarketNavigation.ts
+++ b/packages/suite/src/hooks/wallet/useCoinmarketNavigation.ts
@@ -1,4 +1,5 @@
 import { useCallback } from 'react';
+
 import { Account } from 'src/types/wallet';
 import { goto } from 'src/actions/suite/routerActions';
 import { useDispatch } from 'src/hooks/suite';
diff --git a/packages/suite/src/hooks/wallet/useCoinmarketRecomposeAndSign.ts b/packages/suite/src/hooks/wallet/useCoinmarketRecomposeAndSign.ts
index 26040474c33..b18174da3b5 100644
--- a/packages/suite/src/hooks/wallet/useCoinmarketRecomposeAndSign.ts
+++ b/packages/suite/src/hooks/wallet/useCoinmarketRecomposeAndSign.ts
@@ -1,6 +1,4 @@
 import { useCallback } from 'react';
-import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
-import { signAndPushSendFormTransactionThunk } from 'src/actions/wallet/send/sendFormThunks';
 
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { DEFAULT_VALUES, DEFAULT_PAYMENT } from '@suite-common/wallet-constants';
@@ -10,6 +8,21 @@ import { networks } from '@suite-common/wallet-config';
 import type { Account, FormOptions } from '@suite-common/wallet-types';
 import { composeSendFormTransactionFeeLevelsThunk } from '@suite-common/wallet-core';
 
+import { signAndPushSendFormTransactionThunk } from 'src/actions/wallet/send/sendFormThunks';
+import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
+
+interface CoinmarketRecomposeAndSignProps {
+    account: Account;
+    address: string;
+    amount: string;
+    destinationTag?: string;
+    ethereumDataHex?: string;
+    recalcCustomLimit?: boolean;
+    ethereumAdjustGasLimit?: string;
+    setMaxOutputId?: number | undefined;
+    options?: FormOptions[];
+}
+
 export const useCoinmarketRecomposeAndSign = () => {
     const { translationString } = useTranslation();
     const { composed, selectedFee } = useSelector(
@@ -19,16 +32,17 @@ export const useCoinmarketRecomposeAndSign = () => {
     const dispatch = useDispatch();
 
     const recomposeAndSign = useCallback(
-        async (
-            account: Account,
-            address: string,
-            amount: string,
-            destinationTag?: string,
-            ethereumDataHex?: string,
-            recalcCustomLimit?: boolean,
-            ethereumAdjustGasLimit?: string,
-            options: FormOptions[] = ['broadcast'],
-        ) => {
+        async ({
+            account,
+            address,
+            amount,
+            destinationTag,
+            ethereumDataHex,
+            recalcCustomLimit,
+            ethereumAdjustGasLimit,
+            options = ['broadcast'],
+            setMaxOutputId,
+        }: CoinmarketRecomposeAndSignProps) => {
             const network = networks[account.symbol];
 
             if (!composed) {
@@ -53,6 +67,7 @@ export const useCoinmarketRecomposeAndSign = () => {
                         token: ethereumDataHex ? null : composed.token?.contract || null, // if we pass ethereumDataHex, do not use the token, the details are in the ethereumDataHex
                     },
                 ],
+                setMaxOutputId,
                 selectedFee,
                 feePerUnit: composed.feePerByte,
                 feeLimit: composed.feeLimit || '',
diff --git a/packages/suite/src/hooks/wallet/useCoinmarketRedirect.ts b/packages/suite/src/hooks/wallet/useCoinmarketRedirect.ts
index c620413a949..5cecfd9e454 100644
--- a/packages/suite/src/hooks/wallet/useCoinmarketRedirect.ts
+++ b/packages/suite/src/hooks/wallet/useCoinmarketRedirect.ts
@@ -1,13 +1,15 @@
-import { Account } from 'src/types/wallet';
 import { BuyTradeQuoteRequest, CryptoId, SellFiatTradeQuoteRequest } from 'invity-api';
+
+import { FeeLevel } from '@trezor/connect';
+
+import { Account } from 'src/types/wallet';
 import { useDispatch } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
 import * as coinmarketBuyActions from 'src/actions/wallet/coinmarketBuyActions';
 import * as coinmarketSellActions from 'src/actions/wallet/coinmarketSellActions';
 import { saveComposedTransactionInfo } from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
-import { FeeLevel } from '@trezor/connect';
 
-export interface OfferRedirectParams {
+interface OfferRedirectParams {
     symbol: Account['symbol'];
     index: Account['index'];
     accountType: Account['accountType'];
@@ -18,7 +20,7 @@ export interface OfferRedirectParams {
     country: string;
 }
 
-export interface SellOfferRedirectParams {
+interface SellOfferRedirectParams {
     symbol: Account['symbol'];
     index: Account['index'];
     accountType: Account['accountType'];
@@ -33,7 +35,7 @@ export interface SellOfferRedirectParams {
     feeLimit?: string;
 }
 
-export interface DetailRedirectParams {
+interface DetailRedirectParams {
     symbol: Account['symbol'];
     index: Account['index'];
     accountType: Account['accountType'];
diff --git a/packages/suite/src/hooks/wallet/useFormDraft.ts b/packages/suite/src/hooks/wallet/useFormDraft.ts
index b84c40a6f2d..b6f7da3f385 100644
--- a/packages/suite/src/hooks/wallet/useFormDraft.ts
+++ b/packages/suite/src/hooks/wallet/useFormDraft.ts
@@ -1,7 +1,8 @@
 import { FieldValues } from 'react-hook-form';
 
-import { useActions } from 'src/hooks/suite';
 import { FormDraftKeyPrefix } from '@suite-common/wallet-types';
+
+import { useActions } from 'src/hooks/suite';
 import * as formDraftActions from 'src/actions/wallet/formDraftActions';
 
 export const useFormDraft = <T extends FieldValues>(keyPrefix: FormDraftKeyPrefix) =>
diff --git a/packages/suite/src/hooks/wallet/useRbfForm.ts b/packages/suite/src/hooks/wallet/useRbfForm.ts
index 03f476a95c4..752a827c0aa 100644
--- a/packages/suite/src/hooks/wallet/useRbfForm.ts
+++ b/packages/suite/src/hooks/wallet/useRbfForm.ts
@@ -1,8 +1,9 @@
-import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { createContext, useContext, useState, useEffect, useMemo } from 'react';
 import { useForm } from 'react-hook-form';
+
 import { fromWei } from 'web3-utils';
-import { useSelector } from 'src/hooks/suite';
+
+import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { DEFAULT_PAYMENT, DEFAULT_OPRETURN, DEFAULT_VALUES } from '@suite-common/wallet-constants';
 import { getFeeLevels } from '@suite-common/wallet-utils';
 import {
@@ -10,12 +11,16 @@ import {
     Account,
     RbfTransactionParams,
     ChainedTransactions,
+    FormState,
+    FeeInfo,
 } from '@suite-common/wallet-types';
-import { FormState, FeeInfo } from '@suite-common/wallet-types';
-import { useFees } from './form/useFees';
-import { useCompose } from './form/useCompose';
+
+import { useSelector } from 'src/hooks/suite';
 import { selectCurrentTargetAnonymity } from 'src/reducers/wallet/coinjoinReducer';
 import { useCoinjoinRegisteredUtxos } from 'src/hooks/wallet/form/useCoinjoinRegisteredUtxos';
+
+import { useCompose } from './form/useCompose';
+import { useFees } from './form/useFees';
 import { useBitcoinAmountUnit } from './useBitcoinAmountUnit';
 
 export type UseRbfProps = {
diff --git a/packages/suite/src/hooks/wallet/useSendForm.ts b/packages/suite/src/hooks/wallet/useSendForm.ts
index 114e6bfc7d7..4e87f43c383 100644
--- a/packages/suite/src/hooks/wallet/useSendForm.ts
+++ b/packages/suite/src/hooks/wallet/useSendForm.ts
@@ -1,7 +1,19 @@
 import { createContext, useContext, useCallback, useState, useEffect, useRef } from 'react';
 import { useForm, useFieldArray } from 'react-hook-form';
-import { useSelector, useDispatch } from 'src/hooks/suite';
+
 import { useDidUpdate } from '@trezor/react-utils';
+import { FormState } from '@suite-common/wallet-types';
+import {
+    getFeeLevels,
+    getDefaultValues,
+    amountToSmallestUnit,
+    formatAmount,
+} from '@suite-common/wallet-utils';
+import { getNetworkSymbolForProtocol } from '@suite-common/suite-utils';
+import { selectCurrentFiatRates } from '@suite-common/wallet-core';
+import { FiatCurrencyCode } from '@suite-common/suite-config';
+
+import { useSelector, useDispatch } from 'src/hooks/suite';
 import {
     getSendFormDraftThunk,
     removeSendFormDraftThunk,
@@ -15,25 +27,16 @@ import {
 import { goto } from 'src/actions/suite/routerActions';
 import { fillSendForm } from 'src/actions/suite/protocolActions';
 import { AppState } from 'src/types/suite';
-import { FormState } from '@suite-common/wallet-types';
-import {
-    getFeeLevels,
-    getDefaultValues,
-    amountToSatoshi,
-    formatAmount,
-} from '@suite-common/wallet-utils';
+import { SendContextValues, UseSendFormState } from 'src/types/wallet/sendForm';
+
 import { useSendFormOutputs } from './useSendFormOutputs';
 import { useSendFormFields } from './useSendFormFields';
 import { useSendFormCompose } from './useSendFormCompose';
 import { useSendFormImport } from './useSendFormImport';
 import { useFees } from './form/useFees';
-import { PROTOCOL_TO_NETWORK } from 'src/constants/suite/protocol';
 import { useBitcoinAmountUnit } from './useBitcoinAmountUnit';
 import { useUtxoSelection } from './form/useUtxoSelection';
 import { useExcludedUtxos } from './form/useExcludedUtxos';
-import { selectCurrentFiatRates } from '@suite-common/wallet-core';
-import { FiatCurrencyCode } from '@suite-common/suite-config';
-import { SendContextValues, UseSendFormState } from 'src/types/wallet/sendForm';
 
 export const SendContext = createContext<SendContextValues | null>(null);
 SendContext.displayName = 'SendContext';
@@ -279,7 +282,8 @@ export const useSendForm = (props: UseSendFormProps): SendContextValues => {
         if (
             protocol.sendForm.shouldFill &&
             protocol.sendForm.scheme &&
-            props.selectedAccount.network.symbol === PROTOCOL_TO_NETWORK[protocol.sendForm.scheme]
+            props.selectedAccount.network.symbol ===
+                getNetworkSymbolForProtocol(protocol.sendForm.scheme)
         ) {
             // for now we always fill only first output
             const outputIndex = 0;
@@ -288,7 +292,7 @@ export const useSendForm = (props: UseSendFormProps): SendContextValues => {
                 const protocolAmount = protocol.sendForm.amount.toString();
 
                 const formattedAmount = shouldSendInSats
-                    ? amountToSatoshi(protocolAmount, state.network.decimals)
+                    ? amountToSmallestUnit(protocolAmount, state.network.decimals)
                     : protocolAmount;
 
                 sendFormUtils.setAmount(outputIndex, formattedAmount);
@@ -354,7 +358,7 @@ export const useSendForm = (props: UseSendFormProps): SendContextValues => {
     useDidUpdate(() => {
         const { outputs } = getValues();
 
-        const conversionToUse = shouldSendInSats ? amountToSatoshi : formatAmount;
+        const conversionToUse = shouldSendInSats ? amountToSmallestUnit : formatAmount;
 
         outputs.forEach((output, index) => {
             if (!output.amount) {
diff --git a/packages/suite/src/hooks/wallet/useSendFormCompose.ts b/packages/suite/src/hooks/wallet/useSendFormCompose.ts
index 9c644f6b6d6..50aebd96db5 100644
--- a/packages/suite/src/hooks/wallet/useSendFormCompose.ts
+++ b/packages/suite/src/hooks/wallet/useSendFormCompose.ts
@@ -1,5 +1,8 @@
 import { useState, useRef, useEffect, useCallback, Dispatch, SetStateAction } from 'react';
 import { FieldPath, UseFormReturn } from 'react-hook-form';
+import { useDispatch } from 'react-redux';
+
+import { isFulfilled } from '@reduxjs/toolkit';
 
 import {
     FormState,
@@ -14,13 +17,12 @@ import { isChanged } from '@suite-common/suite-utils';
 import { findComposeErrors } from '@suite-common/wallet-utils';
 import { FeeLevel } from '@trezor/connect';
 import { COMPOSE_ERROR_TYPES } from '@suite-common/wallet-constants';
+import { composeSendFormTransactionFeeLevelsThunk } from '@suite-common/wallet-core';
 
 import { TranslationKey } from 'src/components/suite/Translation';
-import { useDispatch } from 'react-redux';
-import { composeSendFormTransactionFeeLevelsThunk } from '@suite-common/wallet-core';
-import { useTranslation } from '../suite';
 import { SendContextValues, UseSendFormState } from 'src/types/wallet/sendForm';
-import { isFulfilled } from '@reduxjs/toolkit';
+
+import { useTranslation } from '../suite';
 
 type Props = UseFormReturn<FormState> & {
     state: UseSendFormState;
diff --git a/packages/suite/src/hooks/wallet/useSendFormFields.ts b/packages/suite/src/hooks/wallet/useSendFormFields.ts
index e94ce51d3e3..07d033dedf1 100644
--- a/packages/suite/src/hooks/wallet/useSendFormFields.ts
+++ b/packages/suite/src/hooks/wallet/useSendFormFields.ts
@@ -1,12 +1,14 @@
 import { useCallback } from 'react';
 import { FieldPath, UseFormReturn } from 'react-hook-form';
+
 import { formatNetworkAmount, getFiatRateKey, toFiatCurrency } from '@suite-common/wallet-utils';
-import { FormState, FormOptions, TokenAddress } from '@suite-common/wallet-types';
-import { useBitcoinAmountUnit } from './useBitcoinAmountUnit';
-import { Rate } from '@suite-common/wallet-types';
-import { SendContextValues, UseSendFormState } from 'src/types/wallet/sendForm';
+import { FormState, FormOptions, TokenAddress, Rate } from '@suite-common/wallet-types';
 import { FiatCurrencyCode } from '@suite-common/suite-config';
 import { selectCurrentFiatRates } from '@suite-common/wallet-core';
+
+import { SendContextValues, UseSendFormState } from 'src/types/wallet/sendForm';
+
+import { useBitcoinAmountUnit } from './useBitcoinAmountUnit';
 import { useSelector } from '../suite';
 
 type Props = UseFormReturn<FormState> & {
diff --git a/packages/suite/src/hooks/wallet/useSendFormImport.ts b/packages/suite/src/hooks/wallet/useSendFormImport.ts
index 416a2c575f7..2953a032b9d 100644
--- a/packages/suite/src/hooks/wallet/useSendFormImport.ts
+++ b/packages/suite/src/hooks/wallet/useSendFormImport.ts
@@ -1,12 +1,9 @@
 import { useState, useEffect } from 'react';
 
-import { importSendFormRequestThunk } from 'src/actions/wallet/send/sendFormThunks';
-import { useDispatch } from 'src/hooks/suite';
-import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
 import { DEFAULT_PAYMENT } from '@suite-common/wallet-constants';
 import { FiatCurrencyCode, fiatCurrencies } from '@suite-common/suite-config';
 import {
-    amountToSatoshi,
+    amountToSmallestUnit,
     formatAmount,
     fromFiatCurrency,
     getFiatRateKey,
@@ -15,6 +12,10 @@ import {
 import { Output, Timestamp, FiatRatesResult, Rate, FiatRates } from '@suite-common/wallet-types';
 import { updateFiatRatesThunk } from '@suite-common/wallet-core';
 import { NetworkSymbol } from '@suite-common/wallet-config';
+
+import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
+import { useDispatch } from 'src/hooks/suite';
+import { importSendFormRequestThunk } from 'src/actions/wallet/send/sendFormThunks';
 import { UseSendFormState } from 'src/types/wallet/sendForm';
 
 type useSendFormImportProps = {
@@ -40,7 +41,7 @@ export const useSendFormImport = ({
         const result = await dispatch(importSendFormRequestThunk()).unwrap();
         if (!result || result.length < 1) return; // cancelled
 
-        let rates: { currency: string; rate?: number }[] = [];
+        const rates: { currency: string; rate?: number }[] = [];
         const currencies = result.map(it => it.currency.toLowerCase());
         const uniqueCurrencies = [...new Set(currencies)];
 
@@ -97,7 +98,7 @@ export const useSendFormImport = ({
                     const cryptoAmount = item.amount || '';
                     if (shouldSendInSats) {
                         // try to convert to satoshis
-                        output.amount = amountToSatoshi(cryptoAmount, network.decimals);
+                        output.amount = amountToSmallestUnit(cryptoAmount, network.decimals);
                     } else {
                         output.amount = cryptoAmount;
                     }
@@ -126,7 +127,7 @@ export const useSendFormImport = ({
                     const cryptoValue = fromFiatCurrency(output.fiat, network.decimals, itemRate);
                     const cryptoAmount =
                         cryptoValue && shouldSendInSats
-                            ? amountToSatoshi(cryptoValue, network.decimals)
+                            ? amountToSmallestUnit(cryptoValue, network.decimals)
                             : cryptoValue ?? '';
 
                     output.amount = cryptoAmount;
diff --git a/packages/suite/src/hooks/wallet/useSendFormOutputs.ts b/packages/suite/src/hooks/wallet/useSendFormOutputs.ts
index 9dd712a942a..9225c0762de 100644
--- a/packages/suite/src/hooks/wallet/useSendFormOutputs.ts
+++ b/packages/suite/src/hooks/wallet/useSendFormOutputs.ts
@@ -1,7 +1,9 @@
 import { useCallback, useEffect } from 'react';
 import { useFieldArray, UseFormReturn } from 'react-hook-form';
+
 import { FormState } from '@suite-common/wallet-types';
 import { DEFAULT_PAYMENT, DEFAULT_OPRETURN } from '@suite-common/wallet-constants';
+
 import { SendContextValues, UseSendFormState } from 'src/types/wallet/sendForm';
 
 type Props = UseFormReturn<FormState> & {
diff --git a/packages/suite/src/hooks/wallet/useStakeEthForm.ts b/packages/suite/src/hooks/wallet/useStakeEthForm.ts
index 7a5f96cdfe3..67eeadf6682 100644
--- a/packages/suite/src/hooks/wallet/useStakeEthForm.ts
+++ b/packages/suite/src/hooks/wallet/useStakeEthForm.ts
@@ -1,9 +1,11 @@
 import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
 
-import { BigNumber } from '@trezor/utils/src/bigNumber';
 import useDebounce from 'react-use/lib/useDebounce';
+import { fromWei } from 'web3-utils';
+import { selectNetwork } from '@everstake/wallet-sdk/ethereum';
 
+import { BigNumber } from '@trezor/utils/src/bigNumber';
 import {
     fromFiatCurrency,
     getFeeLevels,
@@ -11,6 +13,17 @@ import {
     toFiatCurrency,
 } from '@suite-common/wallet-utils';
 import { isChanged } from '@suite-common/suite-utils';
+import { PrecomposedTransactionFinal, StakeFormState } from '@suite-common/wallet-types';
+import {
+    AmountLimitsString,
+    StakeContextValues,
+    selectFiatRatesByFiatRateKey,
+} from '@suite-common/wallet-core';
+import {
+    MIN_ETH_AMOUNT_FOR_STAKING,
+    MIN_ETH_BALANCE_FOR_STAKING,
+    MIN_ETH_FOR_WITHDRAWALS,
+} from '@suite-common/wallet-constants';
 
 import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
 import { saveComposedTransactionInfo } from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
@@ -20,25 +33,12 @@ import {
     CRYPTO_INPUT,
     OUTPUT_AMOUNT,
 } from 'src/types/wallet/stakeForms';
-import { useFormDraft } from './useFormDraft';
-
-import { fromWei } from 'web3-utils';
-import { useStakeCompose } from './form/useStakeCompose';
-import {
-    MIN_ETH_AMOUNT_FOR_STAKING,
-    MIN_ETH_FOR_WITHDRAWALS,
-} from 'src/constants/suite/ethStaking';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
-
 import { signTransaction } from 'src/actions/wallet/stakeActions';
-import { PrecomposedTransactionFinal, StakeFormState } from '@suite-common/wallet-types';
 import { getEthNetworkForWalletSdk, getStakeFormsDefaultValues } from 'src/utils/suite/stake';
-import {
-    AmountLimitsString,
-    StakeContextValues,
-    selectFiatRatesByFiatRateKey,
-} from '@suite-common/wallet-core';
-import { selectNetwork } from '@everstake/wallet-sdk/ethereum';
+
+import { useStakeCompose } from './form/useStakeCompose';
+import { useFormDraft } from './useFormDraft';
 import { useFees } from './form/useFees';
 
 export const StakeEthFormContext = createContext<StakeContextValues | null>(null);
@@ -171,6 +171,8 @@ export const useStakeEthForm = ({ selectedAccount }: UseStakeFormsProps): StakeC
 
     const [isAmountForWithdrawalWarningShown, setIsAmountForWithdrawalWarningShown] =
         useState(false);
+    const [isLessAmountForWithdrawalWarningShown, setIsLessAmountForWithdrawalWarningShown] =
+        useState(false);
     const [isAdviceForWithdrawalWarningShown, setIsAdviceForWithdrawalWarningShown] =
         useState(false);
 
@@ -182,6 +184,12 @@ export const useStakeEthForm = ({ selectedAccount }: UseStakeFormsProps): StakeC
             : new BigNumber('0');
     }, [composedLevels, selectedFee]);
 
+    const clearWithdrawalWarnings = useCallback(() => {
+        setIsAmountForWithdrawalWarningShown(false);
+        setIsLessAmountForWithdrawalWarningShown(false);
+        setIsAdviceForWithdrawalWarningShown(false);
+    }, []);
+
     const shouldShowAdvice = useCallback(
         (amount: string, formattedBalance: string) => {
             const cryptoValue = new BigNumber(amount);
@@ -201,8 +209,7 @@ export const useStakeEthForm = ({ selectedAccount }: UseStakeFormsProps): StakeC
 
     const onCryptoAmountChange = useCallback(
         async (amount: string) => {
-            setIsAmountForWithdrawalWarningShown(false);
-            setIsAdviceForWithdrawalWarningShown(false);
+            clearWithdrawalWarnings();
 
             if (currentRate) {
                 const fiatValue = toFiatCurrency(amount, currentRate?.rate);
@@ -215,14 +222,20 @@ export const useStakeEthForm = ({ selectedAccount }: UseStakeFormsProps): StakeC
 
             shouldShowAdvice(amount, account.formattedBalance);
         },
-        [account.formattedBalance, composeRequest, currentRate, setValue, shouldShowAdvice],
+        [
+            account.formattedBalance,
+            composeRequest,
+            currentRate,
+            setValue,
+            shouldShowAdvice,
+            clearWithdrawalWarnings,
+        ],
     );
 
     const onFiatAmountChange = useCallback(
         async (amount: string) => {
             setValue('setMaxOutputId', undefined, { shouldDirty: true });
-            setIsAmountForWithdrawalWarningShown(false);
-            setIsAdviceForWithdrawalWarningShown(false);
+            clearWithdrawalWarnings();
             if (!currentRate) return;
 
             const cryptoValue = fromFiatCurrency(amount, network.decimals, currentRate?.rate);
@@ -241,6 +254,7 @@ export const useStakeEthForm = ({ selectedAccount }: UseStakeFormsProps): StakeC
             network.decimals,
             setValue,
             shouldShowAdvice,
+            clearWithdrawalWarnings,
         ],
     );
 
@@ -248,8 +262,7 @@ export const useStakeEthForm = ({ selectedAccount }: UseStakeFormsProps): StakeC
         async (divisor: number) => {
             setValue('setMaxOutputId', undefined, { shouldDirty: true });
             clearErrors([FIAT_INPUT, CRYPTO_INPUT]);
-            setIsAmountForWithdrawalWarningShown(false);
-            setIsAdviceForWithdrawalWarningShown(false);
+            clearWithdrawalWarnings();
 
             const amount = new BigNumber(account.formattedBalance)
                 .dividedBy(divisor)
@@ -259,28 +272,45 @@ export const useStakeEthForm = ({ selectedAccount }: UseStakeFormsProps): StakeC
             setValue(CRYPTO_INPUT, amount, { shouldDirty: true, shouldValidate: true });
             await onCryptoAmountChange(amount);
         },
-        [account.formattedBalance, clearErrors, network.decimals, onCryptoAmountChange, setValue],
+        [
+            account.formattedBalance,
+            clearErrors,
+            network.decimals,
+            onCryptoAmountChange,
+            setValue,
+            clearWithdrawalWarnings,
+        ],
     );
 
     const setMax = useCallback(async () => {
         setIsAdviceForWithdrawalWarningShown(false);
         setValue('setMaxOutputId', 0, { shouldDirty: true });
         clearErrors([FIAT_INPUT, CRYPTO_INPUT]);
-        const amount = new BigNumber(account.formattedBalance)
-            .minus(MIN_ETH_FOR_WITHDRAWALS)
-            .toString();
+
+        const amount = new BigNumber(account.formattedBalance).toString();
+
+        if (amount < MIN_ETH_BALANCE_FOR_STAKING.toString()) {
+            setIsLessAmountForWithdrawalWarningShown(true);
+        }
+
         setValue(OUTPUT_AMOUNT, amount || '', { shouldDirty: true });
         await composeRequest(CRYPTO_INPUT);
         setIsAmountForWithdrawalWarningShown(true);
     }, [account.formattedBalance, clearErrors, composeRequest, setValue]);
 
+    useEffect(() => {
+        if (formState.errors[CRYPTO_INPUT]) {
+            setIsAmountForWithdrawalWarningShown(false);
+            setIsLessAmountForWithdrawalWarningShown(false);
+        }
+    }, [formState]);
+
     const clearForm = useCallback(async () => {
         removeDraft(account.key);
         reset(defaultValues);
         await composeRequest(CRYPTO_INPUT);
-        setIsAdviceForWithdrawalWarningShown(false);
-        setIsAmountForWithdrawalWarningShown(false);
-    }, [account.key, composeRequest, defaultValues, removeDraft, reset]);
+        clearWithdrawalWarnings();
+    }, [account.key, composeRequest, defaultValues, removeDraft, reset, clearWithdrawalWarnings]);
 
     const { translationString } = useTranslation();
     useEffect(() => {
@@ -366,6 +396,7 @@ export const useStakeEthForm = ({ selectedAccount }: UseStakeFormsProps): StakeC
         setMax,
         setRatioAmount,
         isAmountForWithdrawalWarningShown,
+        isLessAmountForWithdrawalWarningShown,
         isAdviceForWithdrawalWarningShown,
         selectedFee,
         feeInfo,
diff --git a/packages/suite/src/hooks/wallet/useUnstakeEthForm.ts b/packages/suite/src/hooks/wallet/useUnstakeEthForm.ts
index e84de39818c..6f28c52e048 100644
--- a/packages/suite/src/hooks/wallet/useUnstakeEthForm.ts
+++ b/packages/suite/src/hooks/wallet/useUnstakeEthForm.ts
@@ -1,6 +1,9 @@
-import { createContext, useCallback, useContext, useEffect, useMemo } from 'react';
+import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
 
+import useDebounce from 'react-use/lib/useDebounce';
+import { selectNetwork } from '@everstake/wallet-sdk/ethereum';
+
 import {
     fromFiatCurrency,
     getAccountAutocompoundBalance,
@@ -8,6 +11,14 @@ import {
     getFiatRateKey,
     toFiatCurrency,
 } from '@suite-common/wallet-utils';
+import { PrecomposedTransactionFinal } from '@suite-common/wallet-types';
+import { isChanged } from '@suite-common/suite-utils';
+import {
+    AmountLimitsString,
+    selectFiatRatesByFiatRateKey,
+    UnstakeContextValues as UnstakeContextValuesBase,
+    UnstakeFormState,
+} from '@suite-common/wallet-core';
 
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import {
@@ -16,27 +27,25 @@ import {
     OUTPUT_AMOUNT,
     UseStakeFormsProps,
 } from 'src/types/wallet/stakeForms';
-
-import { useStakeCompose } from './form/useStakeCompose';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
-
 import { signTransaction } from 'src/actions/wallet/stakeActions';
-import { PrecomposedTransactionFinal } from '@suite-common/wallet-types';
-import { getEthNetworkForWalletSdk, getStakeFormsDefaultValues } from 'src/utils/suite/stake';
-import { useFormDraft } from './useFormDraft';
-import useDebounce from 'react-use/lib/useDebounce';
-import { isChanged } from '@suite-common/suite-utils';
 import {
-    AmountLimitsString,
-    selectFiatRatesByFiatRateKey,
-    UnstakeContextValues as UnstakeContextValuesBase,
-    UnstakeFormState,
-} from '@suite-common/wallet-core';
-import { selectNetwork } from '@everstake/wallet-sdk/ethereum';
+    getEthNetworkForWalletSdk,
+    getStakeFormsDefaultValues,
+    simulateUnstake,
+} from 'src/utils/suite/stake';
+
+import { useStakeCompose } from './form/useStakeCompose';
+import { useFormDraft } from './useFormDraft';
 import { useFees } from './form/useFees';
 
+type UnstakeOptions = 'all' | 'rewards' | 'other';
+
 type UnstakeContextValues = UnstakeContextValuesBase & {
     amountLimits: AmountLimitsString;
+    approximatedInstantEthAmount?: string | null;
+    unstakeOption: UnstakeOptions;
+    setUnstakeOption: (option: UnstakeOptions) => void;
 };
 
 export const UnstakeEthFormContext = createContext<UnstakeContextValues | null>(null);
@@ -46,6 +55,10 @@ export const useUnstakeEthForm = ({
     selectedAccount,
 }: UseStakeFormsProps): UnstakeContextValues => {
     const dispatch = useDispatch();
+    const [approximatedInstantEthAmount, setApproximatedInstantEthAmount] = useState<string | null>(
+        null,
+    );
+    const [unstakeOption, setUnstakeOption] = useState<UnstakeOptions>('all');
 
     const { account, network } = selectedAccount;
     const { symbol } = account;
@@ -102,6 +115,27 @@ export const useUnstakeEthForm = ({
 
     const values = useWatch<UnstakeFormState>({ control });
 
+    useEffect(() => {
+        const { cryptoInput } = values;
+
+        if (!cryptoInput || Object.keys(formState.errors).length) {
+            setApproximatedInstantEthAmount(null);
+
+            return;
+        }
+
+        const simulateUnstakeAmount = async () => {
+            const approximatedEthAmount = await simulateUnstake({
+                amount: cryptoInput,
+                from: account.descriptor,
+                symbol: account.symbol,
+            });
+            setApproximatedInstantEthAmount(approximatedEthAmount);
+        };
+
+        simulateUnstakeAmount();
+    }, [account.symbol, account.descriptor, formState.errors, values]);
+
     useEffect(() => {
         if (!isChanged(defaultValues, values)) {
             removeDraft(account.key);
@@ -247,6 +281,9 @@ export const useUnstakeEthForm = ({
         currentRate,
         feeInfo,
         changeFeeLevel,
+        approximatedInstantEthAmount,
+        unstakeOption,
+        setUnstakeOption,
     };
 };
 
diff --git a/packages/suite/src/middlewares/backup/backupMiddleware.ts b/packages/suite/src/middlewares/backup/backupMiddleware.ts
index d74084fb51b..2176d66ce38 100644
--- a/packages/suite/src/middlewares/backup/backupMiddleware.ts
+++ b/packages/suite/src/middlewares/backup/backupMiddleware.ts
@@ -1,4 +1,5 @@
 import { MiddlewareAPI } from 'redux';
+
 import { SUITE } from 'src/actions/suite/constants';
 import * as backupActions from 'src/actions/backup/backupActions';
 import { AppState, Action, Dispatch } from 'src/types/suite';
diff --git a/packages/suite/src/middlewares/onboarding/__tests__/onboardingMiddleware.test.ts b/packages/suite/src/middlewares/onboarding/__tests__/onboardingMiddleware.test.ts
index 4599ab4e989..1fcb39809e8 100644
--- a/packages/suite/src/middlewares/onboarding/__tests__/onboardingMiddleware.test.ts
+++ b/packages/suite/src/middlewares/onboarding/__tests__/onboardingMiddleware.test.ts
@@ -1,7 +1,5 @@
 import { configureStore } from 'src/support/tests/configureStore';
-
 import { SUITE } from 'src/actions/suite/constants';
-
 import routerReducer from 'src/reducers/suite/routerReducer';
 import suiteReducer from 'src/reducers/suite/suiteReducer';
 import modalReducer from 'src/reducers/suite/modalReducer';
diff --git a/packages/suite/src/middlewares/recovery/recoveryMiddleware.ts b/packages/suite/src/middlewares/recovery/recoveryMiddleware.ts
index 6435f23b621..841bee40327 100644
--- a/packages/suite/src/middlewares/recovery/recoveryMiddleware.ts
+++ b/packages/suite/src/middlewares/recovery/recoveryMiddleware.ts
@@ -7,6 +7,7 @@ import { SUITE } from 'src/actions/suite/constants';
 import * as recoveryActions from 'src/actions/recovery/recoveryActions';
 import * as onboardingActions from 'src/actions/onboarding/onboardingActions';
 import { AppState, Action, Dispatch } from 'src/types/suite';
+
 import { isRecoveryInProgress } from '../../utils/device/isRecoveryInProgress';
 
 const recovery =
diff --git a/packages/suite/src/middlewares/suite/__tests__/buttonRequestMiddleware.test.ts b/packages/suite/src/middlewares/suite/__tests__/buttonRequestMiddleware.test.ts
index 2e96841d611..4b138b177ca 100644
--- a/packages/suite/src/middlewares/suite/__tests__/buttonRequestMiddleware.test.ts
+++ b/packages/suite/src/middlewares/suite/__tests__/buttonRequestMiddleware.test.ts
@@ -16,7 +16,7 @@ const { getSuiteDevice } = testMocks;
 
 const device = getSuiteDevice();
 
-export const getInitialState = () => ({
+const getInitialState = () => ({
     router: routerReducer(undefined, { type: 'foo' } as any),
     suite: {
         ...suiteReducer(undefined, { type: 'foo' } as any),
diff --git a/packages/suite/src/middlewares/suite/__tests__/messageSystemMiddleware.test.ts b/packages/suite/src/middlewares/suite/__tests__/messageSystemMiddleware.test.ts
index 673abb25635..026f1c6ec1a 100644
--- a/packages/suite/src/middlewares/suite/__tests__/messageSystemMiddleware.test.ts
+++ b/packages/suite/src/middlewares/suite/__tests__/messageSystemMiddleware.test.ts
@@ -20,7 +20,7 @@ type WalletsState = ReturnType<typeof WalletReducers>;
 type MessageSystemState = ReturnType<typeof messageSystemReducer>;
 type SuiteState = ReturnType<typeof suiteReducer>;
 
-export const getInitialState = (
+const getInitialState = (
     messageSystem?: Partial<MessageSystemState>,
     wallet?: Partial<WalletsState>,
     suite?: Partial<SuiteState>,
diff --git a/packages/suite/src/middlewares/suite/__tests__/protocolMiddleware.test.ts b/packages/suite/src/middlewares/suite/__tests__/protocolMiddleware.test.ts
index a59680b0109..281f464d6d1 100644
--- a/packages/suite/src/middlewares/suite/__tests__/protocolMiddleware.test.ts
+++ b/packages/suite/src/middlewares/suite/__tests__/protocolMiddleware.test.ts
@@ -1,20 +1,21 @@
-import { configureStore } from 'src/support/tests/configureStore';
-
-import { PROTOCOL } from 'src/actions/suite/constants';
-import protocolMiddleware from '../protocolMiddleware';
-import protocolReducer from 'src/reducers/suite/protocolReducer';
 import {
     NotificationEntry,
     notificationsActions,
     notificationsReducer,
 } from '@suite-common/toast-notifications';
 
+import { configureStore } from 'src/support/tests/configureStore';
+import { PROTOCOL } from 'src/actions/suite/constants';
+import protocolReducer from 'src/reducers/suite/protocolReducer';
+
+import protocolMiddleware from '../protocolMiddleware';
+
 const middlewares = [protocolMiddleware];
 
 type ProtocolState = ReturnType<typeof protocolReducer>;
 type NotificationsState = ReturnType<typeof notificationsReducer>;
 
-export const getInitialState = (
+const getInitialState = (
     notifications: Partial<NotificationsState>,
     protocol?: Partial<ProtocolState>,
 ) => ({
diff --git a/packages/suite/src/middlewares/suite/__tests__/redirectMiddleware.test.ts b/packages/suite/src/middlewares/suite/__tests__/redirectMiddleware.test.ts
index 31b0bee52cc..ccee94254e3 100644
--- a/packages/suite/src/middlewares/suite/__tests__/redirectMiddleware.test.ts
+++ b/packages/suite/src/middlewares/suite/__tests__/redirectMiddleware.test.ts
@@ -14,7 +14,7 @@ import redirectMiddleware from 'src/middlewares/suite/redirectMiddleware';
 import { Action } from 'src/types/suite';
 import { extraDependencies } from 'src/support/extraDependencies';
 
-const { getSuiteDevice } = testMocks;
+const { getSuiteDevice, getConnectDevice } = testMocks;
 
 jest.mock('src/actions/suite/storageActions', () => ({ __esModule: true }));
 
@@ -88,7 +88,7 @@ describe('redirectMiddleware', () => {
             const action: ReturnType<typeof deviceActions.connectDevice> = {
                 type: DEVICE.CONNECT,
                 payload: {
-                    device: getSuiteDevice({ mode: 'initialize' }),
+                    device: getConnectDevice({ mode: 'initialize' }),
                     settings: { defaultWalletLoading: 'standard' },
                 },
             };
@@ -103,7 +103,7 @@ describe('redirectMiddleware', () => {
             const action: ReturnType<typeof deviceActions.connectDevice> = {
                 type: DEVICE.CONNECT,
                 payload: {
-                    device: getSuiteDevice({ mode: 'normal', firmware: 'required' }),
+                    device: getConnectDevice({ mode: 'normal', firmware: 'required' }),
                     settings: { defaultWalletLoading: 'standard' },
                 },
             };
@@ -141,6 +141,7 @@ describe('redirectMiddleware', () => {
                             params: ['symbol', 'accountIndex', 'accountType'],
                             isForegroundApp: undefined,
                             isFullscreenApp: undefined,
+                            isNestedRoute: undefined,
                             exact: true,
                         },
                     },
diff --git a/packages/suite/src/middlewares/suite/__tests__/suiteMiddleware.test.ts b/packages/suite/src/middlewares/suite/__tests__/suiteMiddleware.test.ts
index 681758862cc..e2a6e879e75 100644
--- a/packages/suite/src/middlewares/suite/__tests__/suiteMiddleware.test.ts
+++ b/packages/suite/src/middlewares/suite/__tests__/suiteMiddleware.test.ts
@@ -118,6 +118,7 @@ describe('suite middleware', () => {
                         app: 'onboarding',
                         isForegroundApp: true,
                         isFullscreenApp: true,
+                        isNestedRoute: undefined,
                         params: undefined,
                         exact: undefined,
                     },
@@ -136,6 +137,7 @@ describe('suite middleware', () => {
                     app: 'onboarding',
                     isForegroundApp: true,
                     isFullscreenApp: true,
+                    isNestedRoute: undefined,
                     params: undefined,
                     exact: undefined,
                 },
diff --git a/packages/suite/src/middlewares/suite/analyticsMiddleware.ts b/packages/suite/src/middlewares/suite/analyticsMiddleware.ts
index bd9f40be4b3..dced6b06ee9 100644
--- a/packages/suite/src/middlewares/suite/analyticsMiddleware.ts
+++ b/packages/suite/src/middlewares/suite/analyticsMiddleware.ts
@@ -1,6 +1,6 @@
 import { MiddlewareAPI } from 'redux';
-import { BigNumber } from '@trezor/utils/src/bigNumber';
 
+import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { getPhysicalDeviceCount } from '@suite-common/suite-utils';
 import {
     discoveryActions,
@@ -18,6 +18,7 @@ import {
     hasBitcoinOnlyFirmware,
     isDeviceInBootloaderMode,
 } from '@trezor/device-utils';
+import { Account } from '@suite-common/wallet-types';
 
 import { SUITE, ROUTER } from 'src/actions/suite/constants';
 import { COINJOIN } from 'src/actions/wallet/constants';
@@ -32,7 +33,6 @@ import {
     selectCoinjoinAccountByKey,
 } from 'src/reducers/wallet/coinjoinReducer';
 import { updateLastAnonymityReportTimestamp } from 'src/actions/wallet/coinjoinAccountActions';
-import { Account } from '@suite-common/wallet-types';
 
 /*
     In analytics middleware we may intercept actions we would like to log. For example:
diff --git a/packages/suite/src/middlewares/suite/buttonRequestMiddleware.ts b/packages/suite/src/middlewares/suite/buttonRequestMiddleware.ts
index ee151e43107..6af41a6a32a 100644
--- a/packages/suite/src/middlewares/suite/buttonRequestMiddleware.ts
+++ b/packages/suite/src/middlewares/suite/buttonRequestMiddleware.ts
@@ -2,11 +2,11 @@ import { MiddlewareAPI } from 'redux';
 
 import { selectDevice, deviceActions } from '@suite-common/wallet-core';
 import TrezorConnect, { UI } from '@trezor/connect';
+import { checkDeviceAuthenticityThunk } from '@suite-common/device-authenticity';
 
 import { SUITE } from 'src/actions/suite/constants';
 import { AppState, Action, Dispatch } from 'src/types/suite';
 import { ONBOARDING } from 'src/actions/onboarding/constants';
-import { checkDeviceAuthenticityThunk } from '@suite-common/device-authenticity';
 
 const buttonRequest =
     (api: MiddlewareAPI<Dispatch, AppState>) =>
diff --git a/packages/suite/src/middlewares/suite/logsMiddleware.ts b/packages/suite/src/middlewares/suite/logsMiddleware.ts
index 6704b12d392..80db722cae4 100644
--- a/packages/suite/src/middlewares/suite/logsMiddleware.ts
+++ b/packages/suite/src/middlewares/suite/logsMiddleware.ts
@@ -1,4 +1,5 @@
 import { MiddlewareAPI } from 'redux';
+
 import { authorizeDeviceThunk, deviceActions, discoveryActions } from '@suite-common/wallet-core';
 import { addLog } from '@suite-common/logger';
 import { TRANSPORT, DEVICE } from '@trezor/connect';
diff --git a/packages/suite/src/middlewares/suite/protocolMiddleware.ts b/packages/suite/src/middlewares/suite/protocolMiddleware.ts
index 753c89c27c3..e9818ca2c6c 100644
--- a/packages/suite/src/middlewares/suite/protocolMiddleware.ts
+++ b/packages/suite/src/middlewares/suite/protocolMiddleware.ts
@@ -1,8 +1,8 @@
 import { MiddlewareAPI } from 'redux';
 
 import { notificationsActions, ToastPayload } from '@suite-common/toast-notifications';
-import { PROTOCOL } from 'src/actions/suite/constants';
 
+import { PROTOCOL } from 'src/actions/suite/constants';
 import type { AppState, Action, Dispatch } from 'src/types/suite';
 
 // close custom protocol notification of given type
diff --git a/packages/suite/src/middlewares/suite/redirectMiddleware.ts b/packages/suite/src/middlewares/suite/redirectMiddleware.ts
index 805c9459b56..906013a01d4 100644
--- a/packages/suite/src/middlewares/suite/redirectMiddleware.ts
+++ b/packages/suite/src/middlewares/suite/redirectMiddleware.ts
@@ -2,9 +2,9 @@ import { MiddlewareAPI } from 'redux';
 
 import { selectDevice, selectDevices, deviceActions } from '@suite-common/wallet-core';
 
-import { SUITE } from 'src/actions/suite/constants';
 import * as routerActions from 'src/actions/suite/routerActions';
 import { AppState, Action, Dispatch, TrezorDevice } from 'src/types/suite';
+import { selectIsRouterLocked } from 'src/reducers/suite/suiteReducer';
 
 const handleDeviceRedirect = (dispatch: Dispatch, state: AppState, device?: TrezorDevice) => {
     // no device, no redirect
@@ -49,9 +49,9 @@ const redirect =
     (api: MiddlewareAPI<Dispatch, AppState>) =>
     (next: Dispatch) =>
     (action: Action): Action => {
-        const { locks } = api.getState().suite;
+        const isRouterLocked = selectIsRouterLocked(api.getState());
 
-        if (locks.includes(SUITE.LOCK_TYPE.ROUTER)) {
+        if (isRouterLocked) {
             next(action);
             // router is locked, no redirect except for switch-device modal app
             if (
diff --git a/packages/suite/src/middlewares/suite/routerMiddleware.ts b/packages/suite/src/middlewares/suite/routerMiddleware.ts
index 05f2940cba2..6e25c1d2bb0 100644
--- a/packages/suite/src/middlewares/suite/routerMiddleware.ts
+++ b/packages/suite/src/middlewares/suite/routerMiddleware.ts
@@ -1,6 +1,6 @@
 import { MiddlewareAPI } from 'redux';
-import { ROUTER } from 'src/actions/suite/constants';
 
+import { ROUTER } from 'src/actions/suite/constants';
 import { AppState, Action, Dispatch } from 'src/types/suite';
 
 const router = (api: MiddlewareAPI<Dispatch, AppState>) => (next: Dispatch) => (action: Action) => {
diff --git a/packages/suite/src/middlewares/suite/toastMiddleware.ts b/packages/suite/src/middlewares/suite/toastMiddleware.ts
index cb8515dca5c..a7244623eb1 100644
--- a/packages/suite/src/middlewares/suite/toastMiddleware.ts
+++ b/packages/suite/src/middlewares/suite/toastMiddleware.ts
@@ -1,7 +1,9 @@
-import { MiddlewareAPI } from 'redux';
 import { toast } from 'react-toastify';
 
+import { MiddlewareAPI } from 'redux';
+
 import { notificationsActions } from '@suite-common/toast-notifications';
+
 import { renderToast } from 'src/components/suite';
 import { Action, AppState, Dispatch } from 'src/types/suite';
 
diff --git a/packages/suite/src/middlewares/wallet/__fixtures__/coinjoinMiddleware.ts b/packages/suite/src/middlewares/wallet/__fixtures__/coinjoinMiddleware.ts
index badac752674..8e6b238a5f0 100644
--- a/packages/suite/src/middlewares/wallet/__fixtures__/coinjoinMiddleware.ts
+++ b/packages/suite/src/middlewares/wallet/__fixtures__/coinjoinMiddleware.ts
@@ -2,15 +2,14 @@ import { accountsActions } from '@suite-common/wallet-core';
 import { SelectedAccountLoaded } from '@suite-common/wallet-types';
 import { AnonymitySet } from '@trezor/blockchain-link';
 import { DEVICE, StaticSessionId } from '@trezor/connect';
+import { NetworkSymbol } from '@suite-common/wallet-config';
 
 import { SuiteState } from 'src/reducers/suite/suiteReducer';
-import { AcquiredDevice } from 'src/types/suite';
 import { ROUTER, SUITE } from 'src/actions/suite/constants';
 import { COINJOIN } from 'src/actions/wallet/constants';
 import { CoinjoinState } from 'src/reducers/wallet/coinjoinReducer';
 import { CoinjoinAccount, CoinjoinSession } from 'src/types/wallet/coinjoin';
 import { Account } from 'src/types/wallet';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 import { RouterState } from 'src/reducers/suite/routerReducer';
 
 const DEVICE_A = {
@@ -18,10 +17,14 @@ const DEVICE_A = {
     connected: true,
     id: 'device-A-id',
     remember: true,
-    state: '1stTestnet@device_A_id:0' as StaticSessionId,
+    state: { staticSessionId: '1stTestnet@device_A_id:0' },
     type: 'acquired',
-} as AcquiredDevice;
-const DEVICE_B = { ...DEVICE_A, id: 'device-B-id', state: '1stTestnet@device_B_id:0' };
+};
+const DEVICE_B = {
+    ...DEVICE_A,
+    id: 'device-B-id',
+    state: { staticSessionId: '1stTestnet@device_B_id:0' },
+};
 
 const ACCOUNT_A = {
     accountType: 'coinjoin',
diff --git a/packages/suite/src/middlewares/wallet/__fixtures__/walletMiddleware.ts b/packages/suite/src/middlewares/wallet/__fixtures__/walletMiddleware.ts
index f657616bfaa..da041fd9474 100644
--- a/packages/suite/src/middlewares/wallet/__fixtures__/walletMiddleware.ts
+++ b/packages/suite/src/middlewares/wallet/__fixtures__/walletMiddleware.ts
@@ -1,11 +1,14 @@
 import { PROTO } from '@trezor/connect';
-import { Account } from '@suite-common/wallet-types';
-import { FormState as SendFormState, Output } from '@suite-common/wallet-types';
+import { Account, FormState as SendFormState, Output } from '@suite-common/wallet-types';
+import {
+    accountsActions,
+    sendFormActions,
+    convertSendFormDraftsBtcAmountUnitsThunk,
+} from '@suite-common/wallet-core';
+
 import { WALLET_SETTINGS } from 'src/actions/settings/constants';
 import { RouterState } from 'src/reducers/suite/routerReducer';
 import { State as SelectedAccountState } from 'src/reducers/wallet/selectedAccountReducer';
-import { accountsActions, sendFormActions } from '@suite-common/wallet-core';
-import { convertSendFormDraftsBtcAmountUnitsThunk } from '@suite-common/wallet-core';
 
 export const blockchainSubscription = [
     {
diff --git a/packages/suite/src/middlewares/wallet/__tests__/coinmarketMiddleware.test.ts b/packages/suite/src/middlewares/wallet/__tests__/coinmarketMiddleware.test.ts
index 89f4afff081..e4d82fa9f47 100644
--- a/packages/suite/src/middlewares/wallet/__tests__/coinmarketMiddleware.test.ts
+++ b/packages/suite/src/middlewares/wallet/__tests__/coinmarketMiddleware.test.ts
@@ -1,8 +1,9 @@
-import { configureStore } from 'src/support/tests/configureStore';
+import { UI } from '@trezor/connect';
 
-import coinmarketReducer, { initialState } from 'src/reducers/wallet/coinmarketReducer';
+import { configureStore } from 'src/support/tests/configureStore';
+import { coinmarketReducer, initialState } from 'src/reducers/wallet/coinmarketReducer';
 import selectedAccountReducer from 'src/reducers/wallet/selectedAccountReducer';
-import coinmarketMiddleware from 'src/middlewares/wallet/coinmarketMiddleware';
+import { coinmarketMiddleware } from 'src/middlewares/wallet/coinmarketMiddleware';
 import { Action } from 'src/types/suite';
 import { COINMARKET_COMMON } from 'src/actions/wallet/constants';
 import invityAPI from 'src/services/suite/invityAPI';
@@ -11,7 +12,6 @@ import { accounts } from 'src/reducers/wallet/__fixtures__/transactionConstants'
 import routerReducer, { RouterState } from 'src/reducers/suite/routerReducer';
 import modalReducer, { State as ModalState } from 'src/reducers/suite/modalReducer';
 import { MODAL, ROUTER } from 'src/actions/suite/constants';
-import { UI } from '@trezor/connect';
 
 jest.mock('src/services/suite/invityAPI');
 invityAPI.setInvityServersEnvironment = () => {};
@@ -22,7 +22,7 @@ invityAPI.getInfo = () =>
         platforms: {},
     });
 
-export const ACCOUNT = {
+const ACCOUNT = {
     descriptor: 'btc-descriptor',
 };
 
@@ -45,6 +45,7 @@ const COINMARKET_EXCHANGE_ROUTE = {
 type CoinmarketState = ReturnType<typeof coinmarketReducer>;
 type SelectedAccountState = ReturnType<typeof selectedAccountReducer>;
 type SuiteState = ReturnType<typeof suiteReducer>;
+
 interface Args {
     coinmarket?: CoinmarketState;
     selectedAccount?: SelectedAccountState;
@@ -53,7 +54,7 @@ interface Args {
     modal?: ModalState;
 }
 
-export const getInitialState = ({ coinmarket, selectedAccount }: Args = {}) => ({
+const getInitialState = ({ coinmarket, selectedAccount }: Args = {}) => ({
     wallet: {
         coinmarket:
             coinmarket ||
@@ -322,4 +323,24 @@ describe('coinmarketMiddleware', () => {
         expect(store.getState().wallet.coinmarket.sell.coinmarketAccount).toBe(accounts[0]);
         expect(store.getState().wallet.coinmarket.exchange.coinmarketAccount).toEqual(undefined);
     });
+
+    it('Test of setting activeSection after changing route', () => {
+        const store = initStore(
+            getInitialState({
+                coinmarket: {
+                    ...initialState,
+                },
+            }),
+        );
+
+        // go to coinmarket
+        store.dispatch({
+            type: ROUTER.LOCATION_CHANGE,
+            payload: {
+                ...COINMARKET_EXCHANGE_ROUTE,
+            },
+        });
+
+        expect(store.getState().wallet.coinmarket.activeSection).toBe('exchange');
+    });
 });
diff --git a/packages/suite/src/middlewares/wallet/__tests__/walletMiddleware.test.ts b/packages/suite/src/middlewares/wallet/__tests__/walletMiddleware.test.ts
index 458b3ee025d..e95e72312d6 100644
--- a/packages/suite/src/middlewares/wallet/__tests__/walletMiddleware.test.ts
+++ b/packages/suite/src/middlewares/wallet/__tests__/walletMiddleware.test.ts
@@ -1,5 +1,9 @@
 import { testMocks } from '@suite-common/test-utils';
-import { prepareBlockchainMiddleware } from '@suite-common/wallet-core';
+import {
+    prepareBlockchainMiddleware,
+    prepareSendFormReducer,
+    SendState,
+} from '@suite-common/wallet-core';
 
 import walletSettingsReducer from 'src/reducers/wallet/settingsReducer';
 import walletMiddleware from 'src/middlewares/wallet/walletMiddleware';
@@ -8,7 +12,6 @@ import { configureStore } from 'src/support/tests/configureStore';
 import selectedAccountReducer, {
     State as SelectedAccountState,
 } from 'src/reducers/wallet/selectedAccountReducer';
-import { prepareSendFormReducer, SendState } from '@suite-common/wallet-core';
 import formDraftReducer from 'src/reducers/wallet/formDraftReducer';
 import { RouterState } from 'src/reducers/suite/routerReducer';
 import { Action } from 'src/types/suite';
@@ -24,6 +27,7 @@ const TrezorConnect = testMocks.getTrezorConnectMock();
 
 type AccountsState = ReturnType<typeof accountsReducer>;
 type SettingsState = ReturnType<typeof walletSettingsReducer>;
+
 interface Args {
     router?: Partial<RouterState>;
     accounts?: AccountsState;
@@ -32,13 +36,7 @@ interface Args {
     send?: Partial<SendState>;
 }
 
-export const getInitialState = ({
-    router,
-    accounts,
-    settings,
-    selectedAccount,
-    send,
-}: Args = {}) => ({
+const getInitialState = ({ router, accounts, settings, selectedAccount, send }: Args = {}) => ({
     router: {
         app: 'wallet',
         ...router,
diff --git a/packages/suite/src/middlewares/wallet/coinjoinMiddleware.ts b/packages/suite/src/middlewares/wallet/coinjoinMiddleware.ts
index 511f07d0ff2..fb4705cc2e6 100644
--- a/packages/suite/src/middlewares/wallet/coinjoinMiddleware.ts
+++ b/packages/suite/src/middlewares/wallet/coinjoinMiddleware.ts
@@ -38,7 +38,7 @@ import {
     selectIsAccountWithSessionInCriticalPhaseByAccountKey,
     selectCoinjoinSessionBlockerByAccountKey,
 } from 'src/reducers/wallet/coinjoinReducer';
-import { selectTorState } from 'src/reducers/suite/suiteReducer';
+import { selectIsDeviceOrUiLocked, selectTorState } from 'src/reducers/suite/suiteReducer';
 
 export const coinjoinMiddleware =
     (api: MiddlewareAPI<Dispatch, AppState>) =>
@@ -205,8 +205,8 @@ export const coinjoinMiddleware =
         // Device may be locked by another connect call, so check on LOCK_DEVICE action as well.
         if (action.type === ROUTER.LOCATION_CHANGE || action.type === SUITE.LOCK_DEVICE) {
             const state = api.getState();
-            const { locks } = state.suite;
-            if (!locks.includes(SUITE.LOCK_TYPE.DEVICE) && !locks.includes(SUITE.LOCK_TYPE.UI)) {
+            const isDeviceOrUiLocked = selectIsDeviceOrUiLocked(state);
+            if (!isDeviceOrUiLocked) {
                 const previousRoute = state.router.settingsBackRoute.name;
                 if (previousRoute === 'wallet-send') {
                     api.dispatch(coinjoinAccountActions.restorePausedCoinjoinSessions());
diff --git a/packages/suite/src/middlewares/wallet/coinmarketMiddleware.ts b/packages/suite/src/middlewares/wallet/coinmarketMiddleware.ts
index 680ae08516f..c67b8d13e9b 100644
--- a/packages/suite/src/middlewares/wallet/coinmarketMiddleware.ts
+++ b/packages/suite/src/middlewares/wallet/coinmarketMiddleware.ts
@@ -1,17 +1,19 @@
 import { MiddlewareAPI } from 'redux';
+
+import { UI } from '@trezor/connect';
+
 import { AppState, Action, Dispatch } from 'src/types/suite';
 import { COINMARKET_COMMON } from 'src/actions/wallet/constants';
-import { InvityAPIReloadDataAfterMs } from 'src/constants/wallet/coinmarket/metadata';
+import { INVITY_API_RELOAD_DATA_AFTER_MS } from 'src/constants/wallet/coinmarket/metadata';
 import invityAPI from 'src/services/suite/invityAPI';
 import * as coinmarketCommonActions from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
 import * as coinmarketInfoAction from 'src/actions/wallet/coinmarketInfoActions';
 import * as coinmarketBuyActions from 'src/actions/wallet/coinmarketBuyActions';
 import * as coinmarketExchangeActions from 'src/actions/wallet/coinmarketExchangeActions';
 import * as coinmarketSellActions from 'src/actions/wallet/coinmarketSellActions';
-import { UI } from '@trezor/connect';
 import { ROUTER, MODAL } from 'src/actions/suite/constants';
 
-const coinmarketMiddleware =
+export const coinmarketMiddleware =
     (api: MiddlewareAPI<Dispatch, AppState>) =>
     (next: Dispatch) =>
     (action: Action): Action => {
@@ -34,7 +36,7 @@ const coinmarketMiddleware =
                 account &&
                 !isLoading &&
                 (isDifferentAccount ||
-                    lastLoadedTimestamp + InvityAPIReloadDataAfterMs < Date.now())
+                    lastLoadedTimestamp + INVITY_API_RELOAD_DATA_AFTER_MS < Date.now())
             ) {
                 api.dispatch(coinmarketCommonActions.setLoading(true));
 
@@ -119,8 +121,10 @@ const coinmarketMiddleware =
         const exchangeCoinmarketAccount = newState.wallet.coinmarket.exchange.coinmarketAccount;
 
         if (action.type === ROUTER.LOCATION_CHANGE) {
-            const isSell = newState.router.route?.name === 'wallet-coinmarket-sell';
-            const isExchange = newState.router.route?.name === 'wallet-coinmarket-exchange';
+            const routeName = newState.router.route?.name;
+            const isBuy = routeName === 'wallet-coinmarket-buy';
+            const isSell = routeName === 'wallet-coinmarket-sell';
+            const isExchange = routeName === 'wallet-coinmarket-exchange';
 
             // clean coinmarketAccount in sell
             if (isSell && sellCoinmarketAccount) {
@@ -131,9 +135,20 @@ const coinmarketMiddleware =
             if (isExchange && exchangeCoinmarketAccount) {
                 api.dispatch(coinmarketExchangeActions.setCoinmarketExchangeAccount(undefined));
             }
+
+            if (isBuy) {
+                api.dispatch(coinmarketCommonActions.setActiveSection('buy'));
+            }
+
+            if (isSell) {
+                api.dispatch(coinmarketCommonActions.setActiveSection('sell'));
+            }
+
+            if (isExchange) {
+                console.log('coinmarketMiddleware ROUTER.LOCATION_CHANGE');
+                api.dispatch(coinmarketCommonActions.setActiveSection('exchange'));
+            }
         }
 
         return action;
     };
-
-export default coinmarketMiddleware;
diff --git a/packages/suite/src/middlewares/wallet/discoveryMiddleware.ts b/packages/suite/src/middlewares/wallet/discoveryMiddleware.ts
index 695b24e8926..5058b730fa0 100644
--- a/packages/suite/src/middlewares/wallet/discoveryMiddleware.ts
+++ b/packages/suite/src/middlewares/wallet/discoveryMiddleware.ts
@@ -19,6 +19,7 @@ import { createMiddlewareWithExtraDeps } from '@suite-common/redux-utils';
 import { SUITE, ROUTER, MODAL } from 'src/actions/suite/constants';
 import * as walletSettingsActions from 'src/actions/settings/walletSettingsActions';
 import { getApp } from 'src/utils/suite/router';
+import { selectIsDeviceLocked } from 'src/reducers/suite/suiteReducer';
 
 export const prepareDiscoveryMiddleware = createMiddlewareWithExtraDeps(
     async (action, { dispatch, next, getState }) => {
@@ -29,8 +30,11 @@ export const prepareDiscoveryMiddleware = createMiddlewareWithExtraDeps(
             prevDiscovery.status > DiscoveryStatus.IDLE &&
             prevDiscovery.status < DiscoveryStatus.STOPPING;
 
-        if (deviceActions.forgetDevice.match(action) && action.payload.device.state) {
-            dispatch(discoveryActions.removeDiscovery(action.payload.device.state));
+        if (
+            deviceActions.forgetDevice.match(action) &&
+            action.payload.device.state?.staticSessionId
+        ) {
+            dispatch(discoveryActions.removeDiscovery(action.payload.device.state.staticSessionId));
         }
 
         // do not close user context modals during discovery
@@ -71,13 +75,13 @@ export const prepareDiscoveryMiddleware = createMiddlewareWithExtraDeps(
             return action;
 
         let authorizationIntent = false;
-        const { locks } = nextState.suite;
         const device = selectDevice(nextState);
+        const isDeviceLocked = selectIsDeviceLocked(nextState);
         // 1. selected device is acquired but doesn't have a state
         if (
             isDeviceAcquired(device) &&
-            !device.state &&
-            !locks.includes(SUITE.LOCK_TYPE.DEVICE) &&
+            !device.state?.staticSessionId &&
+            !isDeviceLocked &&
             (deviceActions.selectDevice.match(action) || action.type === SUITE.APP_CHANGED)
         ) {
             authorizationIntent = true;
@@ -115,19 +119,22 @@ export const prepareDiscoveryMiddleware = createMiddlewareWithExtraDeps(
             // to avoid typescript conditioning use device from action as a fallback (never used)
             dispatch(
                 createDiscoveryThunk({
-                    deviceState: action.payload.state,
+                    deviceState: action.payload.state.staticSessionId!,
                     device: device || action.payload.device,
                 }),
             );
         }
 
         // 5. device state confirmation received
-        if (deviceActions.receiveAuthConfirm.match(action) && action.payload.device.state) {
+        if (
+            deviceActions.receiveAuthConfirm.match(action) &&
+            action.payload.device.state?.staticSessionId
+        ) {
             // from discovery point of view it's irrelevant if authConfirm fails
             // it's a device matter now
             dispatch(
                 discoveryActions.updateDiscovery({
-                    deviceState: action.payload.device.state,
+                    deviceState: action.payload.device.state.staticSessionId,
                     authConfirm: false,
                 }),
             );
diff --git a/packages/suite/src/middlewares/wallet/index.ts b/packages/suite/src/middlewares/wallet/index.ts
index 469457bac63..a15514e9b98 100644
--- a/packages/suite/src/middlewares/wallet/index.ts
+++ b/packages/suite/src/middlewares/wallet/index.ts
@@ -3,15 +3,16 @@ import {
     prepareBlockchainMiddleware,
     prepareStakeMiddleware,
 } from '@suite-common/wallet-core';
+import { prepareTokenDefinitionsMiddleware } from '@suite-common/token-definitions';
+
+import { extraDependencies } from 'src/support/extraDependencies';
 
 import { prepareDiscoveryMiddleware } from './discoveryMiddleware';
 import storageMiddleware from './storageMiddleware';
 import walletMiddleware from './walletMiddleware';
 import graphMiddleware from './graphMiddleware';
-import coinmarketMiddleware from './coinmarketMiddleware';
+import { coinmarketMiddleware } from './coinmarketMiddleware';
 import { coinjoinMiddleware } from './coinjoinMiddleware';
-import { extraDependencies } from 'src/support/extraDependencies';
-import { prepareTokenDefinitionsMiddleware } from '@suite-common/token-definitions';
 
 export default [
     prepareBlockchainMiddleware(extraDependencies),
diff --git a/packages/suite/src/middlewares/wallet/storageMiddleware.ts b/packages/suite/src/middlewares/wallet/storageMiddleware.ts
index 4c43fc8044d..feeffa9b4d6 100644
--- a/packages/suite/src/middlewares/wallet/storageMiddleware.ts
+++ b/packages/suite/src/middlewares/wallet/storageMiddleware.ts
@@ -12,14 +12,17 @@ import {
     transactionsActions,
     selectAccountByKey,
     deviceActions,
-    selectDeviceByState,
     selectHistoricFiatRates,
     updateTxsFiatRatesThunk,
+    selectDeviceByStaticSessionId,
+    sendFormActions,
 } from '@suite-common/wallet-core';
 import { isDeviceRemembered } from '@suite-common/suite-utils';
 import { messageSystemActions } from '@suite-common/message-system';
 import { findAccountDevice } from '@suite-common/wallet-utils';
 import { analyticsActions } from '@suite-common/analytics';
+import { tokenDefinitionsActions } from '@suite-common/token-definitions/src/tokenDefinitionsActions';
+import { TokenManagementAction } from '@suite-common/token-definitions';
 
 import { db } from 'src/storage';
 import { WALLET_SETTINGS } from 'src/actions/settings/constants';
@@ -32,9 +35,6 @@ import * as metadataActions from 'src/actions/suite/metadataActions';
 import { serializeDiscovery } from 'src/utils/suite/storage';
 import type { AppState, Action as SuiteAction, Dispatch } from 'src/types/suite';
 import type { WalletAction } from 'src/types/wallet';
-import { sendFormActions } from '@suite-common/wallet-core';
-import { tokenDefinitionsActions } from '@suite-common/token-definitions/src/tokenDefinitionsActions';
-import { TokenManagementAction } from '@suite-common/token-definitions';
 
 const storageMiddleware = (api: MiddlewareAPI<Dispatch, AppState>) => {
     db.onBlocking = () => api.dispatch({ type: STORAGE.ERROR, payload: 'blocking' });
@@ -136,7 +136,7 @@ const storageMiddleware = (api: MiddlewareAPI<Dispatch, AppState>) => {
             ) {
                 const { deviceState } = action.payload;
                 const devices = selectDevices(api.getState());
-                const device = devices.find(d => d.state === deviceState);
+                const device = devices.find(d => d.state?.staticSessionId === deviceState);
                 // update discovery for remembered device
                 if (isDeviceRemembered(device)) {
                     const discovery = selectDiscoveryByDeviceState(api.getState(), deviceState);
@@ -234,9 +234,9 @@ const storageMiddleware = (api: MiddlewareAPI<Dispatch, AppState>) => {
                 case SUITE.SET_DEFAULT_WALLET_LOADING:
                 case SUITE.SET_AUTODETECT:
                 case SUITE.SET_SIDEBAR_WIDTH:
-                case SUITE.SET_AUTO_START:
                 case SUITE.DEVICE_AUTHENTICITY_OPT_OUT:
                 case SUITE.DEVICE_FIRMWARE_REVISION_CHECK:
+                case SUITE.DEVICE_FIRMWARE_HASH_CHECK:
                 case SUITE.EVM_CONFIRM_EXPLANATION_MODAL:
                 case SUITE.EVM_CLOSE_EXPLANATION_BANNER:
                     api.dispatch(storageActions.saveSuiteSettings());
@@ -257,7 +257,7 @@ const storageMiddleware = (api: MiddlewareAPI<Dispatch, AppState>) => {
                 case GRAPH.ACCOUNT_GRAPH_FAIL: {
                     const devices = selectDevices(api.getState());
                     const device = devices.find(
-                        d => d.state === action.payload.account.deviceState,
+                        d => d.state?.staticSessionId === action.payload.account.deviceState,
                     );
                     if (isDeviceRemembered(device)) {
                         storageActions.saveGraph([action.payload]);
@@ -276,7 +276,10 @@ const storageMiddleware = (api: MiddlewareAPI<Dispatch, AppState>) => {
                     api.dispatch(storageActions.saveMetadataSettings());
                     break;
                 case METADATA.SET_ERROR_FOR_DEVICE: {
-                    const device = selectDeviceByState(api.getState(), action.payload.deviceState);
+                    const device = selectDeviceByStaticSessionId(
+                        api.getState(),
+                        action.payload.deviceState,
+                    );
                     if (isDeviceRemembered(device) && device) {
                         api.dispatch(storageActions.saveDeviceMetadataError(device));
                     }
@@ -285,7 +288,10 @@ const storageMiddleware = (api: MiddlewareAPI<Dispatch, AppState>) => {
                 // au, this hurts, I need to call saveDevice manually. saved device should be updated automatically
                 // anytime any of its properties change
                 case METADATA.SET_DEVICE_METADATA: {
-                    const device = selectDeviceByState(api.getState(), action.payload.deviceState);
+                    const device = selectDeviceByStaticSessionId(
+                        api.getState(),
+                        action.payload.deviceState,
+                    );
                     if (isDeviceRemembered(device) && device) {
                         storageActions.saveDevice({
                             ...device,
@@ -305,6 +311,7 @@ const storageMiddleware = (api: MiddlewareAPI<Dispatch, AppState>) => {
                 case FORM_DRAFT.REMOVE_DRAFT:
                     storageActions.removeFormDraft(action.key);
                     break;
+                case firmwareActions.clearInvalidHash.type:
                 case firmwareActions.setHashInvalid.type:
                     api.dispatch(storageActions.saveFirmware());
                     break;
diff --git a/packages/suite/src/middlewares/wallet/walletMiddleware.ts b/packages/suite/src/middlewares/wallet/walletMiddleware.ts
index 15c36bcf051..6cb82bc7735 100644
--- a/packages/suite/src/middlewares/wallet/walletMiddleware.ts
+++ b/packages/suite/src/middlewares/wallet/walletMiddleware.ts
@@ -10,14 +10,14 @@ import {
     unsubscribeBlockchainThunk,
     deviceActions,
     stakeActions,
+    sendFormActions,
+    convertSendFormDraftsBtcAmountUnitsThunk,
 } from '@suite-common/wallet-core';
 import { getTxsPerPage } from '@suite-common/suite-utils';
 
 import { ROUTER } from 'src/actions/suite/constants';
 import { WALLET_SETTINGS } from 'src/actions/settings/constants';
 import * as selectedAccountActions from 'src/actions/wallet/selectedAccountActions';
-import { sendFormActions } from '@suite-common/wallet-core';
-import { convertSendFormDraftsBtcAmountUnitsThunk } from '@suite-common/wallet-core';
 import * as receiveActions from 'src/actions/wallet/receiveActions';
 import * as cardanoStakingActions from 'src/actions/wallet/cardanoStakingActions';
 import * as coinmarketCommonActions from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
@@ -32,7 +32,7 @@ const walletMiddleware =
         const prevState = api.getState();
 
         if (deviceActions.forgetDevice.match(action)) {
-            const deviceState = action.payload.device.state;
+            const deviceState = action.payload.device.state?.staticSessionId;
             const accounts = api
                 .getState()
                 .wallet.accounts.filter(a => a.deviceState === deviceState);
@@ -83,7 +83,8 @@ const walletMiddleware =
 
         if (
             deviceActions.forgetDevice.match(action) &&
-            prevState.wallet.selectedAccount.account?.deviceState === action.payload.device.state
+            prevState.wallet.selectedAccount.account?.deviceState ===
+                action.payload.device.state?.staticSessionId
         ) {
             // if currently selected account is related to forgotten device
             resetReducers = true;
diff --git a/packages/suite/src/reducers/backup/backupReducer.ts b/packages/suite/src/reducers/backup/backupReducer.ts
index e10e37f74bc..81df9c9d7ac 100644
--- a/packages/suite/src/reducers/backup/backupReducer.ts
+++ b/packages/suite/src/reducers/backup/backupReducer.ts
@@ -1,4 +1,5 @@
 import produce from 'immer';
+
 import { BACKUP } from 'src/actions/backup/constants';
 import { ConfirmKey, BackupStatus } from 'src/actions/backup/backupActions';
 import { Action } from 'src/types/suite';
diff --git a/packages/suite/src/reducers/desktop/__tests__/desktopReducer.test.ts b/packages/suite/src/reducers/desktop/__tests__/desktopReducer.test.ts
index 1f5e1e5f624..c01cf5fd10c 100644
--- a/packages/suite/src/reducers/desktop/__tests__/desktopReducer.test.ts
+++ b/packages/suite/src/reducers/desktop/__tests__/desktopReducer.test.ts
@@ -1,7 +1,9 @@
-import { desktopReducer } from '..';
-import * as SUITE from 'src/actions/suite/constants/suiteConstants';
 import type { HandshakeElectron } from '@trezor/suite-desktop-api';
 
+import * as SUITE from 'src/actions/suite/constants/suiteConstants';
+
+import { desktopReducer } from '../index';
+
 const handshakePayload: HandshakeElectron = {
     paths: {
         binDir: 'a',
diff --git a/packages/suite/src/reducers/desktop/index.ts b/packages/suite/src/reducers/desktop/index.ts
index 00aeb45a245..392cfab94a8 100644
--- a/packages/suite/src/reducers/desktop/index.ts
+++ b/packages/suite/src/reducers/desktop/index.ts
@@ -18,5 +18,3 @@ export const desktopReducer = (
             return state;
     }
 };
-
-export const selectDesktopBinDir = (state: DesktopState) => state?.paths?.binDir;
diff --git a/packages/suite/src/reducers/onboarding/onboardingReducer.ts b/packages/suite/src/reducers/onboarding/onboardingReducer.ts
index 093e9bd1ca9..1afdebcbc59 100644
--- a/packages/suite/src/reducers/onboarding/onboardingReducer.ts
+++ b/packages/suite/src/reducers/onboarding/onboardingReducer.ts
@@ -1,11 +1,11 @@
 import produce from 'immer';
-import { DEVICE, Device } from '@trezor/connect';
+
+import { DEVICE } from '@trezor/connect';
 import { OnboardingAnalytics } from '@trezor/suite-analytics';
 
 import { ONBOARDING } from 'src/actions/onboarding/constants';
 import * as STEP from 'src/constants/onboarding/steps';
-import { Action } from 'src/types/suite';
-
+import { Action, TrezorDevice } from 'src/types/suite';
 import type { AnyStepId, AnyPath } from 'src/types/onboarding';
 
 export interface OnboardingRootState {
@@ -26,7 +26,7 @@ export type BackupType = (typeof selectBackupTypes)[number];
 export interface OnboardingState {
     backupType: BackupType;
     isActive: boolean;
-    prevDevice: Device | null;
+    prevDevice: TrezorDevice | null;
     activeStepId: AnyStepId;
     path: AnyPath[];
     onboardingAnalytics: Partial<OnboardingAnalytics>;
diff --git a/packages/suite/src/reducers/recovery/recoveryReducer.ts b/packages/suite/src/reducers/recovery/recoveryReducer.ts
index 50b0ac17f91..b8645a757b7 100644
--- a/packages/suite/src/reducers/recovery/recoveryReducer.ts
+++ b/packages/suite/src/reducers/recovery/recoveryReducer.ts
@@ -1,4 +1,5 @@
 import produce from 'immer';
+
 import { RECOVERY } from 'src/actions/recovery/constants';
 import { Action } from 'src/types/suite';
 import { WordCount } from 'src/types/recovery';
@@ -14,7 +15,7 @@ export interface RecoveryState {
 const initialState: RecoveryState = {
     advancedRecovery: false,
     wordsCount: 12,
-    error: '',
+    error: undefined,
     status: 'initial',
 };
 
diff --git a/packages/suite/src/reducers/store.ts b/packages/suite/src/reducers/store.ts
index 414d10a1199..ab0405fa75c 100644
--- a/packages/suite/src/reducers/store.ts
+++ b/packages/suite/src/reducers/store.ts
@@ -8,6 +8,7 @@ import { prepareFirmwareReducer } from '@suite-common/wallet-core';
 import { addLog } from '@suite-common/logger';
 import { isCodesignBuild } from '@trezor/env-utils';
 import { mergeDeepObject } from '@trezor/utils';
+import { prepareTokenDefinitionsReducer } from '@suite-common/token-definitions';
 
 import suiteMiddlewares from 'src/middlewares/suite';
 import walletMiddlewares from 'src/middlewares/wallet';
@@ -19,7 +20,6 @@ import walletReducers from 'src/reducers/wallet';
 import onboardingReducers from 'src/reducers/onboarding';
 import recoveryReducers from 'src/reducers/recovery';
 import backupReducers from 'src/reducers/backup';
-
 // toastMiddleware can be used only in suite-desktop and suite-web
 // it's not included into `@suite-middlewares` index
 import toastMiddleware from 'src/middlewares/suite/toastMiddleware';
@@ -27,7 +27,6 @@ import type { PreloadStoreAction } from 'src/support/suite/preloadStore';
 
 import { desktopReducer } from './desktop';
 import { extraDependencies } from '../support/extraDependencies';
-import { prepareTokenDefinitionsReducer } from '@suite-common/token-definitions';
 
 const firmwareReducer = prepareFirmwareReducer(extraDependencies);
 const tokenDefinitionsReducer = prepareTokenDefinitionsReducer(extraDependencies);
diff --git a/packages/suite/src/reducers/suite/__fixtures__/deviceReducer.ts b/packages/suite/src/reducers/suite/__fixtures__/deviceReducer.ts
index 201e6eefe44..659c01aef8b 100644
--- a/packages/suite/src/reducers/suite/__fixtures__/deviceReducer.ts
+++ b/packages/suite/src/reducers/suite/__fixtures__/deviceReducer.ts
@@ -344,7 +344,7 @@ const disconnect = [
         actions: [
             {
                 type: DEVICE.DISCONNECT,
-                payload: getConnectDevice({
+                payload: getSuiteDevice({
                     path: '1',
                 }),
             } satisfies ReturnType<typeof deviceActions.deviceDisconnect>,
@@ -359,7 +359,7 @@ const disconnect = [
         actions: [
             {
                 type: DEVICE.DISCONNECT,
-                payload: CONNECT_DEVICE,
+                payload: SUITE_DEVICE,
             } satisfies ReturnType<typeof deviceActions.deviceDisconnect>,
         ],
         result: [],
@@ -378,7 +378,7 @@ const disconnect = [
         actions: [
             {
                 type: DEVICE.DISCONNECT,
-                payload: getConnectDevice({
+                payload: getSuiteDevice({
                     path: '1',
                 }),
             } satisfies ReturnType<typeof deviceActions.deviceDisconnect>,
@@ -388,7 +388,9 @@ const disconnect = [
                 path: '',
                 connected: false,
                 available: false,
-                state: '1stTestnet@device_id:0',
+                state: {
+                    staticSessionId: '1stTestnet@device_id:0',
+                },
             },
         ],
     },
@@ -412,7 +414,7 @@ const disconnect = [
         actions: [
             {
                 type: DEVICE.DISCONNECT,
-                payload: getConnectDevice({
+                payload: getSuiteDevice({
                     path: '1',
                 }),
             } satisfies ReturnType<typeof deviceActions.deviceDisconnect>,
@@ -423,14 +425,14 @@ const disconnect = [
                 instance: undefined,
                 connected: false,
                 available: false,
-                state: '1stTestnet@device_id:0',
+                state: { staticSessionId: '1stTestnet@device_id:0' },
             },
             {
                 path: '',
                 instance: 1,
                 connected: false,
                 available: false,
-                state: '1stTestnet@device_id_2:0',
+                state: { staticSessionId: '1stTestnet@device_id_2:0' },
             },
         ],
     },
@@ -455,7 +457,7 @@ const disconnect = [
         actions: [
             {
                 type: DEVICE.DISCONNECT,
-                payload: getConnectDevice({
+                payload: getSuiteDevice({
                     path: '1',
                 }),
             } satisfies ReturnType<typeof deviceActions.deviceDisconnect>,
@@ -497,7 +499,7 @@ const disconnect = [
         actions: [
             {
                 type: DEVICE.DISCONNECT,
-                payload: CONNECT_DEVICE,
+                payload: SUITE_DEVICE,
             } satisfies ReturnType<typeof deviceActions.deviceDisconnect>,
         ],
         result: [],
@@ -886,7 +888,7 @@ const changePassphraseMode: Fixture<ReturnType<typeof deviceActions.updatePassph
                 type: deviceActions.updatePassphraseMode.type,
                 payload: {
                     device: {
-                        ...getConnectDevice({
+                        ...getSuiteDevice({
                             type: 'unacquired',
                         }),
                         useEmptyPassphrase: false,
diff --git a/packages/suite/src/reducers/suite/__tests__/desktopUpdateReducer.test.ts b/packages/suite/src/reducers/suite/__tests__/desktopUpdateReducer.test.ts
index 09eb7f4c47a..53c5ab19325 100644
--- a/packages/suite/src/reducers/suite/__tests__/desktopUpdateReducer.test.ts
+++ b/packages/suite/src/reducers/suite/__tests__/desktopUpdateReducer.test.ts
@@ -1,7 +1,8 @@
-import desktopUpdateReducer, { DesktopUpdateState, UpdateState } from '../desktopUpdateReducer';
 import { DESKTOP_UPDATE, SUITE } from 'src/actions/suite/constants';
 import type { Action } from 'src/types/suite';
 
+import desktopUpdateReducer, { DesktopUpdateState, UpdateState } from '../desktopUpdateReducer';
+
 const createUpdateInfo = (salt: string) => ({
     releaseDate: `releaseDate-${salt}`,
     version: `version-${salt}`,
diff --git a/packages/suite/src/reducers/suite/__tests__/modalReducer.test.ts b/packages/suite/src/reducers/suite/__tests__/modalReducer.test.ts
index 646bcecebc8..2dddeed9bbd 100644
--- a/packages/suite/src/reducers/suite/__tests__/modalReducer.test.ts
+++ b/packages/suite/src/reducers/suite/__tests__/modalReducer.test.ts
@@ -1,5 +1,6 @@
-import modalReducer, { State } from '../modalReducer';
 import { Action } from 'src/types/suite';
+
+import modalReducer, { State } from '../modalReducer';
 import fixtures from '../__fixtures__/modalReducer';
 
 describe('modalReducer', () => {
diff --git a/packages/suite/src/reducers/suite/__tests__/protocolReducer.test.ts b/packages/suite/src/reducers/suite/__tests__/protocolReducer.test.ts
index 71a5bf85d17..eee215605db 100644
--- a/packages/suite/src/reducers/suite/__tests__/protocolReducer.test.ts
+++ b/packages/suite/src/reducers/suite/__tests__/protocolReducer.test.ts
@@ -1,8 +1,8 @@
+import type { Action } from 'src/types/suite';
+
 import protocolReducer, { State } from '../protocolReducer';
 import fixtures from '../__fixtures__/protocolReducer';
 
-import type { Action } from 'src/types/suite';
-
 describe('Protocol reducer', () => {
     fixtures.forEach(f => {
         it(f.description, () => {
diff --git a/packages/suite/src/reducers/suite/desktopUpdateReducer.ts b/packages/suite/src/reducers/suite/desktopUpdateReducer.ts
index 44cf708a06c..ccd6cea4712 100644
--- a/packages/suite/src/reducers/suite/desktopUpdateReducer.ts
+++ b/packages/suite/src/reducers/suite/desktopUpdateReducer.ts
@@ -1,8 +1,10 @@
 import produce from 'immer';
+
 import { UpdateInfo, UpdateProgress } from '@trezor/suite-desktop-api';
+import { DesktopAppUpdateState as UpdateState } from '@suite-common/suite-constants';
+
 import { DESKTOP_UPDATE, SUITE } from 'src/actions/suite/constants';
 import { Action } from 'src/types/suite';
-import { DesktopAppUpdateState as UpdateState } from '@suite-common/suite-constants';
 
 export { DesktopAppUpdateState as UpdateState } from '@suite-common/suite-constants';
 
@@ -26,6 +28,12 @@ export interface DesktopUpdateState {
     allowPrerelease: boolean;
     isAutomaticUpdateEnabled: boolean;
     firstRunAfterUpdate: boolean;
+
+    /**
+     * This flag suppresses the "just updated" notification state
+     * when user already interacted with it.
+     */
+    justUpdatedInteractedWith: boolean;
 }
 
 const initialState: DesktopUpdateState = {
@@ -35,6 +43,7 @@ const initialState: DesktopUpdateState = {
     allowPrerelease: false,
     isAutomaticUpdateEnabled: false,
     firstRunAfterUpdate: false,
+    justUpdatedInteractedWith: false,
 };
 
 const desktopUpdateReducer = (
@@ -58,9 +67,6 @@ const desktopUpdateReducer = (
             case DESKTOP_UPDATE.AVAILABLE:
                 draft.state = UpdateState.Available;
                 draft.latest = action.payload;
-                draft.modalVisibility = draft.isAutomaticUpdateEnabled
-                    ? draft.modalVisibility
-                    : 'maximized';
                 break;
             case DESKTOP_UPDATE.NOT_AVAILABLE:
                 draft.state = UpdateState.NotAvailable;
@@ -76,6 +82,11 @@ const desktopUpdateReducer = (
                 draft.state = UpdateState.Ready;
                 draft.latest = action.payload;
                 break;
+            case DESKTOP_UPDATE.OPEN_JUST_UPDATED_CHANGELOG:
+                draft.state = UpdateState.JustUpdated;
+                draft.modalVisibility = 'maximized';
+                draft.justUpdatedInteractedWith = true;
+                break;
             case DESKTOP_UPDATE.MODAL_VISIBILITY:
                 draft.modalVisibility = action.payload;
                 break;
diff --git a/packages/suite/src/reducers/suite/guideReducer.ts b/packages/suite/src/reducers/suite/guideReducer.ts
index 73761a602fb..d612d08544b 100644
--- a/packages/suite/src/reducers/suite/guideReducer.ts
+++ b/packages/suite/src/reducers/suite/guideReducer.ts
@@ -1,9 +1,11 @@
 import produce from 'immer';
-import { Action } from 'src/types/suite';
-import { GUIDE } from 'src/actions/suite/constants';
+
 import type { ActiveView, GuideCategory, GuideNode } from '@suite-common/suite-types';
 import * as indexNodeJSON from '@trezor/suite-data/files/guide/index.json';
 
+import { Action } from 'src/types/suite';
+import { GUIDE } from 'src/actions/suite/constants';
+
 export interface State {
     open: boolean;
     view: ActiveView;
diff --git a/packages/suite/src/reducers/suite/metadataReducer.ts b/packages/suite/src/reducers/suite/metadataReducer.ts
index cbe3348f240..14870a0026a 100644
--- a/packages/suite/src/reducers/suite/metadataReducer.ts
+++ b/packages/suite/src/reducers/suite/metadataReducer.ts
@@ -5,11 +5,13 @@ import {
     selectAccountByKey,
     DeviceRootState,
     selectDevice,
-    selectDevices,
     State,
     selectDeviceByState,
     deviceActions,
+    selectDeviceByStaticSessionId,
 } from '@suite-common/wallet-core';
+import { AccountKey } from '@suite-common/wallet-types';
+import { DeviceState, StaticSessionId } from '@trezor/connect';
 
 import {
     STORAGE,
@@ -31,7 +33,6 @@ import {
 } from 'src/actions/suite/constants/metadataLabelingConstants';
 
 import { SuiteRootState } from './suiteReducer';
-import { AccountKey } from '@suite-common/wallet-types';
 
 export const initialState: MetadataState = {
     // is Suite trying to load metadata (get master key -> sync cloud)?
@@ -110,8 +111,8 @@ const metadataReducer = (state = initialState, action: Action): MetadataState =>
                 }
                 break;
             case deviceActions.forgetDevice.type:
-                if (action.payload.device.state) {
-                    delete draft.error?.[action.payload.device.state];
+                if (action.payload.device.state?.staticSessionId) {
+                    delete draft.error?.[action.payload.device.state.staticSessionId];
                 }
 
             // no default
@@ -200,11 +201,16 @@ export const selectAccountLabels = (state: {
  */
 export const selectLabelingDataForWallet = (
     state: { metadata: MetadataState; device: State },
-    deviceState?: string,
+    deviceState?: DeviceState | StaticSessionId,
 ) => {
+    if (!deviceState) {
+        return DEFAULT_WALLET_METADATA;
+    }
     const provider = selectSelectedProviderForLabels(state);
-    const devices = selectDevices(state);
-    const device = devices.find(d => d.state === deviceState);
+    const device =
+        typeof deviceState === 'string'
+            ? selectDeviceByStaticSessionId(state, deviceState)
+            : selectDeviceByState(state, deviceState);
     if (!device?.metadata[METADATA_LABELING.ENCRYPTION_VERSION]) {
         return DEFAULT_WALLET_METADATA;
     }
@@ -217,7 +223,7 @@ export const selectLabelingDataForWallet = (
     return DEFAULT_WALLET_METADATA;
 };
 
-export const selectLabelableEntities = (state: MetadataRootState, deviceState: string) => {
+export const selectLabelableEntities = (state: MetadataRootState, deviceState: StaticSessionId) => {
     const { wallet, device } = state;
     const { devices } = device;
     const { accounts } = wallet;
@@ -231,7 +237,7 @@ export const selectLabelableEntities = (state: MetadataRootState, deviceState: s
                 type: 'account' as const,
             })),
         ...devices
-            .filter((device: TrezorDevice) => device.state === deviceState)
+            .filter((device: TrezorDevice) => device.state?.staticSessionId === deviceState)
             .map((device: TrezorDevice) => ({
                 ...device.metadata,
                 state: device.state,
@@ -242,7 +248,7 @@ export const selectLabelableEntities = (state: MetadataRootState, deviceState: s
 
 const selectLabelableEntityByKey = (
     state: MetadataRootState,
-    deviceState: string,
+    deviceState: StaticSessionId,
     entityKey: string,
 ) =>
     selectLabelableEntities(state, deviceState).find(e => {
@@ -250,7 +256,7 @@ const selectLabelableEntityByKey = (
             return e.key === entityKey;
         }
         if ('state' in e) {
-            return e.state === entityKey;
+            return e.state?.staticSessionId === entityKey;
         }
 
         return false;
@@ -268,8 +274,8 @@ export const selectIsLabelingAvailable = (state: MetadataRootState) => {
         enabled &&
         device?.metadata?.[METADATA_LABELING.ENCRYPTION_VERSION] &&
         !!provider &&
-        device.state &&
-        !error?.[device.state]
+        device.state?.staticSessionId &&
+        !error?.[device.state.staticSessionId]
     );
 };
 
@@ -291,11 +297,13 @@ export const selectIsLabelingInitPossible = (state: MetadataRootState) => {
 export const selectIsLabelingAvailableForEntity = (
     state: MetadataRootState,
     entityKey: string,
-    deviceState?: string,
+    deviceState?: StaticSessionId,
 ) => {
-    const device = deviceState ? selectDeviceByState(state, deviceState) : selectDevice(state);
-    if (!device?.state) return false;
-    const entity = selectLabelableEntityByKey(state, device.state, entityKey);
+    const device = deviceState
+        ? selectDeviceByStaticSessionId(state, deviceState)
+        : selectDevice(state);
+    if (!device?.state?.staticSessionId) return false;
+    const entity = selectLabelableEntityByKey(state, device.state.staticSessionId, entityKey);
 
     return (
         selectIsLabelingAvailable(state) &&
diff --git a/packages/suite/src/reducers/suite/protocolReducer.ts b/packages/suite/src/reducers/suite/protocolReducer.ts
index efaad9a6113..820bde59348 100644
--- a/packages/suite/src/reducers/suite/protocolReducer.ts
+++ b/packages/suite/src/reducers/suite/protocolReducer.ts
@@ -1,10 +1,12 @@
 import produce from 'immer';
+
+import type { Protocol } from '@suite-common/suite-constants';
+
 import { PROTOCOL } from 'src/actions/suite/constants';
 import type { Action } from 'src/types/suite';
-import type { PROTOCOL_SCHEME } from 'src/constants/suite/protocol';
 
 export interface SendFormState {
-    scheme: PROTOCOL_SCHEME;
+    scheme: Protocol;
     address: string;
     amount?: number;
 }
diff --git a/packages/suite/src/reducers/suite/resizeReducer.ts b/packages/suite/src/reducers/suite/resizeReducer.ts
index 8c375e563af..2a0e65a189c 100644
--- a/packages/suite/src/reducers/suite/resizeReducer.ts
+++ b/packages/suite/src/reducers/suite/resizeReducer.ts
@@ -1,7 +1,9 @@
 import produce from 'immer';
+
 import * as variables from '@trezor/components/src/config/variables'; // can't import from index cause it would import all UI components
-import { RESIZE } from 'src/actions/suite/constants';
 import { getNumberFromPixelString } from '@trezor/utils';
+
+import { RESIZE } from 'src/actions/suite/constants';
 import { Action } from 'src/types/suite';
 
 const sizes = {
diff --git a/packages/suite/src/reducers/suite/suiteReducer.ts b/packages/suite/src/reducers/suite/suiteReducer.ts
index e4236ac6de7..31d4cc84090 100644
--- a/packages/suite/src/reducers/suite/suiteReducer.ts
+++ b/packages/suite/src/reducers/suite/suiteReducer.ts
@@ -1,16 +1,15 @@
 import produce from 'immer';
 
 import type { InvityServerEnvironment } from '@suite-common/invity';
-import {
-    Feature,
-    MessageSystemRootState,
-    selectIsFeatureDisabled,
-} from '@suite-common/message-system';
+import { Feature, selectIsFeatureDisabled } from '@suite-common/message-system';
 import { isDeviceAcquired } from '@suite-common/suite-utils';
 import { discoveryActions, DeviceRootState, selectDevice } from '@suite-common/wallet-core';
-import { versionUtils } from '@trezor/utils';
+import { isArrayMember, versionUtils } from '@trezor/utils';
 import { isWeb } from '@trezor/env-utils';
 import { TRANSPORT, TransportInfo, ConnectSettings } from '@trezor/connect';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+import { SuiteThemeVariant } from '@trezor/suite-desktop-api';
+import { AddressDisplayOptions, WalletType } from '@suite-common/wallet-types';
 
 import { getIsTorEnabled, getIsTorLoading } from 'src/utils/suite/tor';
 import type { OAuthServerEnvironment } from 'src/types/suite/metadata';
@@ -18,13 +17,12 @@ import { ensureLocale } from 'src/utils/suite/l10n';
 import type { Locale } from 'src/config/suite/languages';
 import { SUITE, STORAGE } from 'src/actions/suite/constants';
 import { ExperimentalFeature } from 'src/constants/suite/experimental';
-import { Action, Lock, TorBootstrap, TorStatus } from 'src/types/suite';
+import { Action, AppState, TorBootstrap, TorStatus } from 'src/types/suite';
 import { getExcludedPrerequisites, getPrerequisiteName } from 'src/utils/suite/prerequisites';
-import { RouterRootState, selectRouter } from './routerReducer';
-import { NetworkSymbol } from '@suite-common/wallet-config';
-import { SuiteThemeVariant } from '@trezor/suite-desktop-api';
-import { AddressDisplayOptions, WalletType } from '@suite-common/wallet-types';
 import { SIDEBAR_WIDTH_NUMERIC } from 'src/constants/suite/layout';
+import { skippedHashCheckErrors, skippedRevisionCheckErrors } from 'src/constants/suite/firmware';
+
+import { RouterRootState, selectRouter } from './routerReducer';
 
 export interface SuiteRootState {
     suite: SuiteState;
@@ -34,7 +32,6 @@ export interface DebugModeOptions {
     invityServerEnvironment?: InvityServerEnvironment;
     oauthServerEnvironment?: OAuthServerEnvironment;
     showDebugMenu: boolean;
-    checkFirmwareAuthenticity: boolean;
     transports: Extract<NonNullable<ConnectSettings['transports']>[number], string>[];
     isUnlockedBootloaderAllowed: boolean;
 }
@@ -75,6 +72,7 @@ export interface Flags {
     viewOnlyTooltipClosed: boolean;
     showUnhideTokenModal: boolean;
     showCopyAddressModal: boolean;
+    enableAutoupdateOnNextRun: boolean;
 }
 
 export interface EvmSettings {
@@ -99,11 +97,11 @@ export interface SuiteSettings {
     autodetect: AutodetectSettings;
     isDeviceAuthenticityCheckDisabled: boolean;
     isFirmwareRevisionCheckDisabled: boolean;
+    isFirmwareHashCheckDisabled: boolean;
     addressDisplayType: AddressDisplayOptions;
     defaultWalletLoading: WalletType;
     experimental?: ExperimentalFeature[];
     sidebarWidth: number;
-    autoStart?: boolean;
 }
 
 export interface SuiteState {
@@ -112,7 +110,7 @@ export interface SuiteState {
     torBootstrap: TorBootstrap | null;
     lifecycle: SuiteLifecycle;
     transport?: Partial<TransportInfo>;
-    locks: Lock[];
+    locks: Record<(typeof SUITE.LOCK_TYPE)[keyof typeof SUITE.LOCK_TYPE], number>;
     flags: Flags;
     evmSettings: EvmSettings;
     prefillFields: PrefillFields;
@@ -124,7 +122,7 @@ const initialState: SuiteState = {
     torStatus: TorStatus.Disabled,
     torBootstrap: null,
     lifecycle: { status: 'initial' },
-    locks: [],
+    locks: { device: 0, router: 0, ui: 0 },
     flags: {
         initialRun: true,
         // recoveryCompleted: false;
@@ -145,6 +143,7 @@ const initialState: SuiteState = {
         isDashboardPassphraseBannerVisible: true,
         showCopyAddressModal: true,
         showUnhideTokenModal: true,
+        enableAutoupdateOnNextRun: false,
     },
     evmSettings: {
         confirmExplanationModalClosed: {},
@@ -164,10 +163,10 @@ const initialState: SuiteState = {
         isDesktopSuitePromoHidden: false,
         isDeviceAuthenticityCheckDisabled: false,
         isFirmwareRevisionCheckDisabled: false,
+        isFirmwareHashCheckDisabled: false,
         debug: {
             invityServerEnvironment: undefined,
             showDebugMenu: false,
-            checkFirmwareAuthenticity: false,
             transports: [],
             isUnlockedBootloaderAllowed: false,
         },
@@ -181,13 +180,12 @@ const initialState: SuiteState = {
     },
 };
 
-const changeLock = (draft: SuiteState, lock: Lock, enabled: boolean) => {
-    if (enabled) {
-        draft.locks.push(lock);
-    } else {
-        const index = draft.locks.lastIndexOf(lock);
-        draft.locks.splice(index, 1);
-    }
+const changeLock = (
+    draft: SuiteState,
+    lock: (typeof SUITE.LOCK_TYPE)[keyof typeof SUITE.LOCK_TYPE],
+    enabled: boolean,
+) => {
+    draft.locks[lock] = Math.max(draft.locks[lock] + (enabled ? 1 : -1), 0);
 };
 
 const setFlag = (draft: SuiteState, key: keyof Flags, value: boolean) => {
@@ -295,10 +293,6 @@ const suiteReducer = (state: SuiteState = initialState, action: Action): SuiteSt
                 draft.settings.sidebarWidth = action.payload.width;
                 break;
 
-            case SUITE.SET_AUTO_START:
-                draft.settings.autoStart = action.enabled;
-                break;
-
             case TRANSPORT.START:
                 draft.transport = action.payload;
                 break;
@@ -335,6 +329,9 @@ const suiteReducer = (state: SuiteState = initialState, action: Action): SuiteSt
             case SUITE.DEVICE_FIRMWARE_REVISION_CHECK:
                 draft.settings.isFirmwareRevisionCheckDisabled = action.payload.isDisabled;
                 break;
+            case SUITE.DEVICE_FIRMWARE_HASH_CHECK:
+                draft.settings.isFirmwareHashCheckDisabled = action.payload.isDisabled;
+                break;
             case SUITE.LOCK_UI:
                 changeLock(draft, SUITE.LOCK_TYPE.UI, action.payload);
                 break;
@@ -384,11 +381,17 @@ export const selectLanguage = (state: SuiteRootState) => state.suite.settings.la
 export const selectAddressDisplayType = (state: SuiteRootState) =>
     state.suite.settings.addressDisplayType;
 
-export const selectLocks = (state: SuiteRootState) => state.suite.locks;
-
 export const selectIsDeviceLocked = (state: SuiteRootState) =>
-    state.suite.locks.includes(SUITE.LOCK_TYPE.DEVICE) ||
-    state.suite.locks.includes(SUITE.LOCK_TYPE.UI);
+    !!state.suite.locks[SUITE.LOCK_TYPE.DEVICE];
+
+export const selectIsDeviceOrUiLocked = (state: SuiteRootState) =>
+    !!state.suite.locks[SUITE.LOCK_TYPE.DEVICE] || !!state.suite.locks[SUITE.LOCK_TYPE.UI];
+
+export const selectIsRouterLocked = (state: SuiteRootState) =>
+    !!state.suite.locks[SUITE.LOCK_TYPE.ROUTER];
+
+export const selectIsRouterOrUiLocked = (state: SuiteRootState) =>
+    !!state.suite.locks[SUITE.LOCK_TYPE.ROUTER] || !!state.suite.locks[SUITE.LOCK_TYPE.UI];
 
 export const selectIsActionAbortable = (state: SuiteRootState) =>
     state.suite.transport?.type === 'BridgeTransport'
@@ -437,30 +440,62 @@ export const selectHasExperimentalFeature =
     (feature: ExperimentalFeature) => (state: SuiteRootState) =>
         state.suite.settings.experimental?.includes(feature) ?? false;
 
-export const selectIsFirmwareRevisionCheckEnabledAndFailed = (
-    state: SuiteRootState & DeviceRootState & MessageSystemRootState,
-) => {
+/**
+ * Get firmware revision check error, or null if check was successful / skipped.
+ */
+export const selectFirmwareRevisionCheckError = (state: AppState) => {
+    const device = selectDevice(state);
+    if (!isDeviceAcquired(device) || !device.authenticityChecks) return null;
+
     const { isFirmwareRevisionCheckDisabled } = state.suite.settings;
-    const isFirmwareRevisionCheckDisabledByMessageSystem = selectIsFeatureDisabled(
-        state,
-        Feature.firmwareRevisionCheck,
-    );
+    const isDisabledByMessage = selectIsFeatureDisabled(state, Feature.firmwareRevisionCheck);
+    const isCheckEnabled = !isFirmwareRevisionCheckDisabled && !isDisabledByMessage;
+    const checkResult = device.authenticityChecks.firmwareRevision; // null means not performed, then don't consider it failed
 
-    if (isFirmwareRevisionCheckDisabled || isFirmwareRevisionCheckDisabledByMessageSystem) {
-        return false;
-    }
+    return isCheckEnabled && checkResult?.success === false ? checkResult.error : null;
+};
+
+/**
+ * Determine hard failure of firmware revision check - specific error types which are severe.
+ * If Suite is offline and cannot perform check or there is some unexpected error, a banner is shown but device is accessible.
+ */
+const selectIsFirmwareRevisionCheckEnabledAndFailed = (state: AppState): boolean => {
+    const error = selectFirmwareRevisionCheckError(state);
 
+    return error !== null ? !isArrayMember(error, skippedRevisionCheckErrors) : false;
+};
+
+/**
+ * Get firmware hash check error, or null if check was successful / skipped.
+ */
+export const selectFirmwareHashCheckError = (state: AppState) => {
     const device = selectDevice(state);
+    if (!isDeviceAcquired(device) || !device.authenticityChecks) return null;
 
-    return (
-        isDeviceAcquired(device) &&
-        // If `check` is null, it means that it was not performed yet.
-        device.authenticityChecks?.firmwareRevision?.success === false &&
-        // If Suite is offline and cannot perform check or there is some unexpected error, an error banner is shown but Suite is otherwise unaffected.
-        !['cannot-perform-check-offline', 'other-error'].includes(
-            device.authenticityChecks.firmwareRevision.error,
-        )
-    );
+    const { isFirmwareHashCheckDisabled } = state.suite.settings;
+    const isDisabledByMessage = selectIsFeatureDisabled(state, Feature.firmwareHashCheck);
+    const isCheckEnabled = !isFirmwareHashCheckDisabled && !isDisabledByMessage;
+    const checkResult = device.authenticityChecks.firmwareHash; // null means not performed, then don't consider it failed
+
+    return isCheckEnabled && checkResult?.success === false ? checkResult.error : null;
 };
 
+/**
+ * Determine hard failure of firmware hash check - specific error types which are severe.
+ * If check was skipped, don't consider it failed.
+ * If check is unsupported by device, a banner is shown but device is accessible.
+ */
+const selectIsFirmwareHashCheckEnabledAndFailed = (state: AppState): boolean => {
+    const error = selectFirmwareHashCheckError(state);
+
+    return error !== null ? !isArrayMember(error, skippedHashCheckErrors) : false;
+};
+
+/**
+ * Determine hard failure of either of firmware authenticity checks to block access to device.
+ */
+export const selectIsFirmwareAuthenticityCheckEnabledAndFailed = (state: AppState) =>
+    selectIsFirmwareRevisionCheckEnabledAndFailed(state) ||
+    selectIsFirmwareHashCheckEnabledAndFailed(state);
+
 export default suiteReducer;
diff --git a/packages/suite/src/reducers/wallet/__fixtures__/coinjoinReducer.ts b/packages/suite/src/reducers/wallet/__fixtures__/coinjoinReducer.ts
index c76a82dbe64..6f069b8a59b 100644
--- a/packages/suite/src/reducers/wallet/__fixtures__/coinjoinReducer.ts
+++ b/packages/suite/src/reducers/wallet/__fixtures__/coinjoinReducer.ts
@@ -1,4 +1,5 @@
 import { SessionPhase } from '@trezor/coinjoin';
+
 import { COINJOIN } from 'src/actions/wallet/constants';
 import { initialState } from 'src/reducers/wallet/coinjoinReducer';
 
diff --git a/packages/suite/src/reducers/wallet/__tests__/cardanoStakingReducer.test.ts b/packages/suite/src/reducers/wallet/__tests__/cardanoStakingReducer.test.ts
index d1ea3425d47..bb2ba9b7156 100644
--- a/packages/suite/src/reducers/wallet/__tests__/cardanoStakingReducer.test.ts
+++ b/packages/suite/src/reducers/wallet/__tests__/cardanoStakingReducer.test.ts
@@ -162,28 +162,6 @@ describe('cardanoStakingReducer reducer', () => {
         });
     });
 
-    it('CARDANO_STAKING.SET_FETCH_ERROR mainnet', () => {
-        expect(
-            reducer(undefined, {
-                type: CARDANO_STAKING.SET_FETCH_ERROR,
-                error: true,
-                network: 'mainnet',
-            } as any),
-        ).toEqual({
-            mainnet: {
-                trezorPools: undefined,
-                isFetchError: true,
-                isFetchLoading: false,
-            },
-            preview: {
-                trezorPools: undefined,
-                isFetchError: false,
-                isFetchLoading: false,
-            },
-            pendingTx: [],
-        });
-    });
-
     it('CARDANO_STAKING.SET_TREZOR_POOLS mainnet', () => {
         expect(
             reducer(undefined, {
diff --git a/packages/suite/src/reducers/wallet/__tests__/coinjoinReducer.test.ts b/packages/suite/src/reducers/wallet/__tests__/coinjoinReducer.test.ts
index eb2923dd4b9..65db9af53f3 100644
--- a/packages/suite/src/reducers/wallet/__tests__/coinjoinReducer.test.ts
+++ b/packages/suite/src/reducers/wallet/__tests__/coinjoinReducer.test.ts
@@ -1,3 +1,5 @@
+import type { Action } from 'src/types/suite';
+
 import {
     coinjoinReducer,
     CoinjoinState,
@@ -6,8 +8,6 @@ import {
 } from '../coinjoinReducer';
 import { actionFixtures, selectorFixtures } from '../__fixtures__/coinjoinReducer';
 
-import type { Action } from 'src/types/suite';
-
 describe('Coinjoin reducer actions', () => {
     actionFixtures.forEach(f => {
         it(f.description, () => {
diff --git a/packages/suite/src/reducers/wallet/__tests__/coinmarketReducer.test.ts b/packages/suite/src/reducers/wallet/__tests__/coinmarketReducer.test.ts
index fc99a90d893..7327bbe6de8 100644
--- a/packages/suite/src/reducers/wallet/__tests__/coinmarketReducer.test.ts
+++ b/packages/suite/src/reducers/wallet/__tests__/coinmarketReducer.test.ts
@@ -1,4 +1,12 @@
-import reducer, { initialState } from 'src/reducers/wallet/coinmarketReducer';
+import {
+    BuyTradeQuoteRequest,
+    CryptoId,
+    ExchangeTradeQuoteRequest,
+    InfoResponse,
+    SellFiatTradeQuoteRequest,
+} from 'invity-api';
+
+import { coinmarketReducer, initialState } from 'src/reducers/wallet/coinmarketReducer';
 import { TradeBuy, TradeExchange } from 'src/types/wallet/coinmarketCommonTypes';
 import { STORAGE } from 'src/actions/suite/constants';
 import {
@@ -8,13 +16,6 @@ import {
     COINMARKET_INFO,
     COINMARKET_SELL,
 } from 'src/actions/wallet/constants';
-import {
-    BuyTradeQuoteRequest,
-    CryptoId,
-    ExchangeTradeQuoteRequest,
-    InfoResponse,
-    SellFiatTradeQuoteRequest,
-} from 'invity-api';
 import { BuyInfo } from 'src/actions/wallet/coinmarketBuyActions';
 import { ExchangeInfo } from 'src/actions/wallet/coinmarketExchangeActions';
 import {
@@ -27,7 +28,7 @@ import { accounts } from 'src/reducers/wallet/__fixtures__/transactionConstants'
 describe('settings reducer', () => {
     it('test initial state', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 // @ts-expect-error
                 type: 'none',
             }),
@@ -36,7 +37,7 @@ describe('settings reducer', () => {
 
     it('STORAGE.LOAD', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: STORAGE.LOAD,
                 payload: {
                     coinmarketTrades: initialState.trades,
@@ -47,7 +48,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_COMMON.SET_MODAL_ACCOUNT', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_COMMON.SET_MODAL_ACCOUNT,
                 modalAccount: accounts[0],
             }),
@@ -57,7 +58,7 @@ describe('settings reducer', () => {
         });
 
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_COMMON.SET_MODAL_ACCOUNT,
                 modalAccount: undefined,
             }),
@@ -69,7 +70,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_COMMON.SET_MODAL_CRYPTO_CURRENCY', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_COMMON.SET_MODAL_CRYPTO_CURRENCY,
                 modalCryptoId: 'ankr' as CryptoId,
             }),
@@ -79,7 +80,7 @@ describe('settings reducer', () => {
         });
 
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_COMMON.SET_MODAL_CRYPTO_CURRENCY,
                 modalCryptoId: undefined,
             }),
@@ -89,6 +90,18 @@ describe('settings reducer', () => {
         });
     });
 
+    it('COINMARKET_COMMON.SET_COINMARKET_ACTIVE_SECTION', () => {
+        expect(
+            coinmarketReducer(undefined, {
+                type: COINMARKET_COMMON.SET_COINMARKET_ACTIVE_SECTION,
+                activeSection: 'exchange',
+            }),
+        ).toEqual({
+            ...initialState,
+            activeSection: 'exchange',
+        });
+    });
+
     it('COINMARKET_INFO.SAVE_SYMBOLS_INFO', () => {
         const info: InfoResponse = {
             platforms: {
@@ -112,7 +125,7 @@ describe('settings reducer', () => {
             },
         };
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_INFO.SAVE_INFO,
                 info,
             }),
@@ -131,7 +144,7 @@ describe('settings reducer', () => {
             supportedFiatCurrencies: new Set(['usd']),
         };
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_BUY.SAVE_BUY_INFO,
                 buyInfo,
             }),
@@ -140,7 +153,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_BUY.SET_IS_FROM_REDIRECT', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_BUY.SET_IS_FROM_REDIRECT,
                 isFromRedirect: true,
             } as any),
@@ -156,7 +169,7 @@ describe('settings reducer', () => {
             fiatStringAmount: '1',
         };
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_BUY.SAVE_QUOTE_REQUEST,
                 request,
             }),
@@ -165,7 +178,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_BUY.SAVE_TRANSACTION_DETAIL_ID', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_BUY.SAVE_TRANSACTION_DETAIL_ID,
                 transactionId: '1234-1234-1234',
             }),
@@ -177,7 +190,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_BUY.SAVE_QUOTES', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_BUY.SAVE_QUOTES,
                 quotes: buyQuotes,
             }),
@@ -189,7 +202,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_SELL.SELL_QUOTES', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_SELL.SAVE_QUOTES,
                 quotes: sellQuotes,
             }),
@@ -201,7 +214,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_EXCHANGE.EXCHANGE_QUOTES', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_EXCHANGE.SAVE_QUOTES,
                 quotes: exchangeQuotes,
             }),
@@ -213,7 +226,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_BUY.VERIFY_ADDRESS', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_BUY.VERIFY_ADDRESS,
                 addressVerified: '1abcdef',
             }),
@@ -222,7 +235,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_BUY.DISPOSE', () => {
         expect(
-            reducer(
+            coinmarketReducer(
                 { ...initialState, buy: { ...initialState.buy, addressVerified: '1abcdef' } },
                 {
                     type: COINMARKET_BUY.DISPOSE,
@@ -240,7 +253,7 @@ describe('settings reducer', () => {
         };
 
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_BUY.SAVE_CACHED_ACCOUNT_INFO,
                 ...cachedAccountInfo,
             } as any),
@@ -254,7 +267,7 @@ describe('settings reducer', () => {
             sellSymbols: new Set(['USDT@ETH']) as Set<CryptoId>,
         };
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_EXCHANGE.SAVE_EXCHANGE_INFO,
                 exchangeInfo,
             }),
@@ -268,7 +281,7 @@ describe('settings reducer', () => {
             sendStringAmount: '1',
         };
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_EXCHANGE.SAVE_QUOTE_REQUEST,
                 request,
             }),
@@ -280,7 +293,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_EXCHANGE.VERIFY_ADDRESS', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_EXCHANGE.VERIFY_ADDRESS,
                 addressVerified: '2efghi',
             }),
@@ -343,7 +356,7 @@ describe('settings reducer', () => {
         };
 
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_COMMON.SAVE_TRADE,
                 ...tradeBuy,
             }),
@@ -353,7 +366,7 @@ describe('settings reducer', () => {
         });
 
         expect(
-            reducer(
+            coinmarketReducer(
                 {
                     ...initialState,
                     trades: [tradeExchange, tradeBuy],
@@ -371,7 +384,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_SELL.SET_IS_FROM_REDIRECT', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_SELL.SET_IS_FROM_REDIRECT,
                 isFromRedirect: true,
             }),
@@ -380,7 +393,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_SELL.SAVE_TRANSACTION_ID', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_SELL.SAVE_TRANSACTION_ID,
                 transactionId: '1234-1234-1234',
             }),
@@ -398,7 +411,7 @@ describe('settings reducer', () => {
             cryptoStringAmount: '1',
         };
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_SELL.SAVE_QUOTE_REQUEST,
                 request,
             }),
@@ -410,7 +423,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_BUY.CLEAR_QUOTES', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_BUY.CLEAR_QUOTES,
             }),
         ).toEqual({
@@ -419,31 +432,9 @@ describe('settings reducer', () => {
         });
     });
 
-    it('COINMARKET_EXCHANGE.CLEAR_QUOTES', () => {
-        expect(
-            reducer(undefined, {
-                type: COINMARKET_EXCHANGE.CLEAR_QUOTES,
-            }),
-        ).toEqual({
-            ...initialState,
-            exchange: { ...initialState.exchange, quotes: undefined },
-        });
-    });
-
-    it('COINMARKET_SELL.CLEAR_QUOTES', () => {
-        expect(
-            reducer(undefined, {
-                type: COINMARKET_SELL.CLEAR_QUOTES,
-            }),
-        ).toEqual({
-            ...initialState,
-            sell: { ...initialState.sell, quotes: undefined },
-        });
-    });
-
     it('COINMARKET_BUY.SAVE_QUOTE', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_BUY.SAVE_QUOTE,
                 quote: buyQuotes[0],
             }),
@@ -458,7 +449,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_SELL.SAVE_QUOTE', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_SELL.SAVE_QUOTE,
                 quote: sellQuotes[0],
             }),
@@ -473,7 +464,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_EXCHANGE.SAVE_QUOTE', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_EXCHANGE.SAVE_QUOTE,
                 quote: exchangeQuotes[0],
             }),
@@ -488,7 +479,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_SELL.SET_COINMARKET_ACCOUNT', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_SELL.SET_COINMARKET_ACCOUNT,
                 account: accounts[0],
             }),
@@ -503,7 +494,7 @@ describe('settings reducer', () => {
 
     it('COINMARKET_EXCHANGE.SET_COINMARKET_ACCOUNT', () => {
         expect(
-            reducer(undefined, {
+            coinmarketReducer(undefined, {
                 type: COINMARKET_EXCHANGE.SET_COINMARKET_ACCOUNT,
                 account: accounts[0],
             }),
diff --git a/packages/suite/src/reducers/wallet/__tests__/sendFormReducer.test.ts b/packages/suite/src/reducers/wallet/__tests__/sendFormReducer.test.ts
index 8b73d93ad81..9eb2adeac3e 100644
--- a/packages/suite/src/reducers/wallet/__tests__/sendFormReducer.test.ts
+++ b/packages/suite/src/reducers/wallet/__tests__/sendFormReducer.test.ts
@@ -1,11 +1,14 @@
+import { FormState, PrecomposedTransactionFinal, Account } from '@suite-common/wallet-types';
+import {
+    SerializedTx,
+    accountsActions,
+    prepareSendFormReducer,
+    initialState,
+    sendFormActions,
+} from '@suite-common/wallet-core';
+
 import { STORAGE } from 'src/actions/suite/constants';
 import { Action } from 'src/types/suite';
-import { FormState, PrecomposedTransactionFinal } from '@suite-common/wallet-types';
-import { SerializedTx, accountsActions } from '@suite-common/wallet-core';
-import { prepareSendFormReducer, initialState, sendFormActions } from '@suite-common/wallet-core';
-
-import { Account } from '@suite-common/wallet-types';
-
 import { PreloadStoreAction } from 'src/support/suite/preloadStore';
 import { extraDependencies } from 'src/support/extraDependencies';
 
diff --git a/packages/suite/src/reducers/wallet/__tests__/transactionReducer.test.ts b/packages/suite/src/reducers/wallet/__tests__/transactionReducer.test.ts
index bc9b4d221a3..bebbba28963 100644
--- a/packages/suite/src/reducers/wallet/__tests__/transactionReducer.test.ts
+++ b/packages/suite/src/reducers/wallet/__tests__/transactionReducer.test.ts
@@ -1,10 +1,12 @@
-import { extraDependencies } from 'src/support/extraDependencies';
 import {
     transactionsInitialState,
     transactionsActions,
     prepareTransactionsReducer,
     fetchTransactionsPageThunk,
 } from '@suite-common/wallet-core';
+
+import { extraDependencies } from 'src/support/extraDependencies';
+
 import { transactions, accounts } from '../__fixtures__/transactionConstants';
 
 const reducer = prepareTransactionsReducer(extraDependencies);
diff --git a/packages/suite/src/reducers/wallet/cardanoStakingReducer.ts b/packages/suite/src/reducers/wallet/cardanoStakingReducer.ts
index d3fabca3e08..921aede68e8 100644
--- a/packages/suite/src/reducers/wallet/cardanoStakingReducer.ts
+++ b/packages/suite/src/reducers/wallet/cardanoStakingReducer.ts
@@ -1,8 +1,10 @@
 import produce from 'immer';
+
+import { BigNumber } from '@trezor/utils/src/bigNumber';
+
 import { CARDANO_STAKING } from 'src/actions/wallet/constants';
 import { WalletAction } from 'src/types/wallet';
 import { CardanoNetwork, PendingStakeTx, PoolsResponse } from 'src/types/wallet/cardanoStaking';
-import { BigNumber } from '@trezor/utils/src/bigNumber';
 
 export interface State {
     pendingTx: PendingStakeTx[];
diff --git a/packages/suite/src/reducers/wallet/coinjoinReducer.ts b/packages/suite/src/reducers/wallet/coinjoinReducer.ts
index f11c3ecb848..9e5ec08a2bb 100644
--- a/packages/suite/src/reducers/wallet/coinjoinReducer.ts
+++ b/packages/suite/src/reducers/wallet/coinjoinReducer.ts
@@ -1,7 +1,6 @@
 import produce from 'immer';
-import { BigNumber } from '@trezor/utils/src/bigNumber';
-import { memoizeWithArgs } from 'proxy-memoize';
 
+import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { getInputSize, getOutputSize, RoundPhase } from '@trezor/coinjoin';
 import { PartialRecord } from '@trezor/type-utils';
 import { Account, AccountKey } from '@suite-common/wallet-types';
@@ -18,6 +17,7 @@ import {
     selectIsFeatureDisabled,
     selectFeatureConfig,
 } from '@suite-common/message-system';
+import { createWeakMapSelector } from '@suite-common/redux-utils';
 
 import { STORAGE } from 'src/actions/suite/constants';
 import {
@@ -29,7 +29,7 @@ import {
 import { COINJOIN } from 'src/actions/wallet/constants';
 import { Action } from 'src/types/suite';
 import {
-    selectIsDeviceLocked,
+    selectIsDeviceOrUiLocked,
     selectTorState,
     SuiteRootState,
 } from 'src/reducers/suite/suiteReducer';
@@ -58,6 +58,7 @@ import {
     ZKSNACKS_LEGAL_DOCUMENTS_VERSION,
     TREZOR_LEGAL_DOCUMENTS_VERSION,
 } from 'src/services/coinjoin';
+
 import { SelectedAccountRootState, selectSelectedAccount } from './selectedAccountReducer';
 
 export interface CoinjoinState {
@@ -609,6 +610,8 @@ export const coinjoinReducer = (
         }
     });
 
+const createMemoizedSelector = createWeakMapSelector.withTypes<CoinjoinRootState>();
+
 export const selectCoinjoinAccounts = (state: CoinjoinRootState) => state.wallet.coinjoin.accounts;
 
 export const selectCoinjoinClients = (state: CoinjoinRootState) => state.wallet.coinjoin.clients;
@@ -671,9 +674,9 @@ export const selectCurrentCoinjoinBalanceBreakdown = (state: CoinjoinRootState)
     return balanceBreakdown;
 };
 
-export const selectRegisteredUtxosByAccountKey = memoizeWithArgs(
-    (state: CoinjoinRootState, accountKey: AccountKey) => {
-        const coinjoinAccount = selectCoinjoinAccountByKey(state, accountKey);
+export const selectRegisteredUtxosByAccountKey = createMemoizedSelector(
+    [selectCoinjoinAccountByKey],
+    coinjoinAccount => {
         if (!coinjoinAccount?.prison) return;
         const { prison, session, transactionCandidates } = coinjoinAccount;
 
@@ -940,7 +943,7 @@ export const selectCoinjoinSessionBlockerByAccountKey = (
     if (account?.backendType === 'coinjoin' && account?.status === 'out-of-sync') {
         return 'ACCOUNT_OUT_OF_SYNC';
     }
-    if (selectIsDeviceLocked(state)) {
+    if (selectIsDeviceOrUiLocked(state)) {
         return 'DEVICE_LOCKED';
     }
     if (selectHasAnonymitySetError(state)) {
diff --git a/packages/suite/src/reducers/wallet/coinmarketReducer.ts b/packages/suite/src/reducers/wallet/coinmarketReducer.ts
index 9a5497a76c0..8c94f357ace 100644
--- a/packages/suite/src/reducers/wallet/coinmarketReducer.ts
+++ b/packages/suite/src/reducers/wallet/coinmarketReducer.ts
@@ -1,7 +1,4 @@
 import produce from 'immer';
-import type { WalletAction, Account } from 'src/types/wallet';
-import type { PrecomposedTransactionFinal } from '@suite-common/wallet-types';
-
 import type {
     BuyTrade,
     BuyTradeQuoteRequest,
@@ -13,6 +10,11 @@ import type {
     CryptoId,
     Platforms,
 } from 'invity-api';
+
+import type { PrecomposedTransactionFinal } from '@suite-common/wallet-types';
+import type { FeeLevel } from '@trezor/connect';
+
+import type { WalletAction, Account } from 'src/types/wallet';
 import type { BuyInfo } from 'src/actions/wallet/coinmarketBuyActions';
 import type { ExchangeInfo } from 'src/actions/wallet/coinmarketExchangeActions';
 import {
@@ -25,9 +27,11 @@ import {
 import { STORAGE } from 'src/actions/suite/constants';
 import type { Action as SuiteAction } from 'src/types/suite';
 import type { SellInfo } from 'src/actions/wallet/coinmarketSellActions';
-import type { FeeLevel } from '@trezor/connect';
 import type { Trade } from 'src/types/wallet/coinmarketCommonTypes';
-import { CoinmarketPaymentMethodListProps } from 'src/types/coinmarket/coinmarket';
+import {
+    CoinmarketPaymentMethodListProps,
+    CoinmarketTradeType,
+} from 'src/types/coinmarket/coinmarket';
 
 export interface ComposedTransactionInfo {
     composed?: Pick<
@@ -92,6 +96,7 @@ export interface State {
     modalAccount: Account | undefined;
     isLoading: boolean;
     lastLoadedTimestamp: number;
+    activeSection?: CoinmarketTradeType;
 }
 
 export const initialState: State = {
@@ -139,9 +144,10 @@ export const initialState: State = {
     modalAccount: undefined,
     modalCryptoId: undefined,
     lastLoadedTimestamp: 0,
+    activeSection: 'buy',
 };
 
-const coinmarketReducer = (
+export const coinmarketReducer = (
     state: State = initialState,
     action: WalletAction | SuiteAction,
 ): State =>
@@ -212,9 +218,6 @@ const coinmarketReducer = (
             case COINMARKET_EXCHANGE.SAVE_QUOTE:
                 draft.exchange.selectedQuote = action.quote;
                 break;
-            case COINMARKET_EXCHANGE.CLEAR_QUOTES:
-                draft.exchange.quotes = undefined;
-                break;
             case COINMARKET_EXCHANGE.VERIFY_ADDRESS:
                 draft.exchange.addressVerified = action.addressVerified;
                 break;
@@ -239,9 +242,6 @@ const coinmarketReducer = (
             case COINMARKET_SELL.SAVE_QUOTE:
                 draft.sell.selectedQuote = action.quote;
                 break;
-            case COINMARKET_SELL.CLEAR_QUOTES:
-                draft.sell.quotes = undefined;
-                break;
             case COINMARKET_SELL.SET_IS_FROM_REDIRECT:
                 draft.sell.isFromRedirect = action.isFromRedirect;
                 break;
@@ -261,8 +261,9 @@ const coinmarketReducer = (
             case COINMARKET_COMMON.SET_MODAL_CRYPTO_CURRENCY:
                 draft.modalCryptoId = action.modalCryptoId;
                 break;
+            case COINMARKET_COMMON.SET_COINMARKET_ACTIVE_SECTION:
+                draft.activeSection = action.activeSection;
+                break;
             // no default
         }
     });
-
-export default coinmarketReducer;
diff --git a/packages/suite/src/reducers/wallet/formDraftReducer.ts b/packages/suite/src/reducers/wallet/formDraftReducer.ts
index a83af453edb..51d636405a4 100644
--- a/packages/suite/src/reducers/wallet/formDraftReducer.ts
+++ b/packages/suite/src/reducers/wallet/formDraftReducer.ts
@@ -1,6 +1,7 @@
-import produce from 'immer';
 import { FieldValues } from 'react-hook-form';
 
+import produce from 'immer';
+
 import { FORM_DRAFT } from 'src/actions/wallet/constants';
 import { Action } from 'src/types/suite';
 import { STORAGE } from 'src/actions/suite/constants';
diff --git a/packages/suite/src/reducers/wallet/graphReducer.ts b/packages/suite/src/reducers/wallet/graphReducer.ts
index 10a01bd67b8..bdc2a263e1a 100644
--- a/packages/suite/src/reducers/wallet/graphReducer.ts
+++ b/packages/suite/src/reducers/wallet/graphReducer.ts
@@ -1,11 +1,12 @@
 import produce from 'immer';
+
+import { accountsActions } from '@suite-common/wallet-core';
+
 import { GRAPH } from 'src/actions/wallet/constants';
 import { STORAGE } from 'src/actions/suite/constants';
 import { WalletAction, Account } from 'src/types/wallet';
 import { Action as SuiteAction } from 'src/types/suite';
 import { SETTINGS } from 'src/config/suite';
-
-import { accountsActions } from '@suite-common/wallet-core';
 import { GraphData, AccountIdentifier, GraphRange, GraphScale } from 'src/types/wallet/graph';
 
 export interface State {
diff --git a/packages/suite/src/reducers/wallet/index.ts b/packages/suite/src/reducers/wallet/index.ts
index 3afa5c1abc2..b07ee60baa9 100644
--- a/packages/suite/src/reducers/wallet/index.ts
+++ b/packages/suite/src/reducers/wallet/index.ts
@@ -17,7 +17,7 @@ import settingsReducer from './settingsReducer';
 import graphReducer from './graphReducer';
 import selectedAccountReducer from './selectedAccountReducer';
 import receiveReducer from './receiveReducer';
-import coinmarketReducer from './coinmarketReducer';
+import { coinmarketReducer } from './coinmarketReducer';
 import accountSearchReducer from './accountSearchReducer';
 import formDraftReducer from './formDraftReducer';
 import cardanoStakingReducer from './cardanoStakingReducer';
diff --git a/packages/suite/src/reducers/wallet/receiveReducer.ts b/packages/suite/src/reducers/wallet/receiveReducer.ts
index 57eefa8a270..9545214bdec 100644
--- a/packages/suite/src/reducers/wallet/receiveReducer.ts
+++ b/packages/suite/src/reducers/wallet/receiveReducer.ts
@@ -1,9 +1,10 @@
 import produce from 'immer';
-import { RECEIVE } from 'src/actions/wallet/constants';
-import { Action as SuiteAction } from 'src/types/suite';
 
 import { ReceiveInfo } from '@suite-common/wallet-types';
 
+import { RECEIVE } from 'src/actions/wallet/constants';
+import { Action as SuiteAction } from 'src/types/suite';
+
 export type State = ReceiveInfo[];
 
 const showAddress = (draft: State, path: string, address: string) => {
diff --git a/packages/suite/src/reducers/wallet/selectedAccountReducer.ts b/packages/suite/src/reducers/wallet/selectedAccountReducer.ts
index dc56fd32928..dddf53ff897 100644
--- a/packages/suite/src/reducers/wallet/selectedAccountReducer.ts
+++ b/packages/suite/src/reducers/wallet/selectedAccountReducer.ts
@@ -1,7 +1,8 @@
 import { accountsActions } from '@suite-common/wallet-core';
-import type { Action } from 'src/types/suite';
+import { MIN_ETH_BALANCE_FOR_STAKING } from '@suite-common/wallet-constants';
 import type { SelectedAccountStatus } from '@suite-common/wallet-types';
-import { MIN_ETH_BALANCE_FOR_STAKING } from 'src/constants/suite/ethStaking';
+
+import type { Action } from 'src/types/suite';
 import { State as CoinmarketState } from 'src/reducers/wallet/coinmarketReducer';
 
 export type State = SelectedAccountStatus;
diff --git a/packages/suite/src/reducers/wallet/settingsReducer.ts b/packages/suite/src/reducers/wallet/settingsReducer.ts
index 4f27b62b963..251879f18aa 100644
--- a/packages/suite/src/reducers/wallet/settingsReducer.ts
+++ b/packages/suite/src/reducers/wallet/settingsReducer.ts
@@ -1,11 +1,13 @@
 import produce from 'immer';
-import { STORAGE } from 'src/actions/suite/constants';
-import { WALLET_SETTINGS } from 'src/actions/settings/constants';
-import * as walletSettingsActions from 'src/actions/settings/walletSettingsActions';
-import { Action, AppState } from 'src/types/suite';
 
-import { WalletSettings } from '@suite-common/wallet-types';
+import type { WalletSettings } from '@suite-common/wallet-types';
 import { PROTO } from '@trezor/connect';
+import { networkSymbolCollection } from '@suite-common/wallet-config';
+
+import { WALLET_SETTINGS } from 'src/actions/settings/constants';
+import * as walletSettingsActions from 'src/actions/settings/walletSettingsActions';
+import { STORAGE } from 'src/actions/suite/constants';
+import type { Action, AppState } from 'src/types/suite';
 
 export type State = WalletSettings;
 
@@ -35,7 +37,10 @@ const settingsReducer = (state: State = initialState, action: Action): State =>
 
             case walletSettingsActions.changeNetworks.type: {
                 if (walletSettingsActions.changeNetworks.match(action)) {
-                    draft.enabledNetworks = action.payload;
+                    draft.enabledNetworks = [...action.payload].sort(
+                        (a, b) =>
+                            networkSymbolCollection.indexOf(a) - networkSymbolCollection.indexOf(b),
+                    );
                 }
                 break;
             }
diff --git a/packages/suite/src/services/coinjoin/coinjoinService.ts b/packages/suite/src/services/coinjoin/coinjoinService.ts
index 734f5a1aaff..3a814bd32f2 100644
--- a/packages/suite/src/services/coinjoin/coinjoinService.ts
+++ b/packages/suite/src/services/coinjoin/coinjoinService.ts
@@ -3,6 +3,7 @@ import { createIpcProxy } from '@trezor/ipc-proxy';
 import { PartialRecord } from '@trezor/type-utils';
 import { isDesktop } from '@trezor/env-utils';
 import { NetworkSymbol } from '@suite-common/wallet-config';
+
 import { CoinjoinNetworksConfig, getCoinjoinConfig } from './config';
 
 const loadInstance = (settings: ReturnType<typeof getCoinjoinConfig>) => {
diff --git a/packages/suite/src/services/coinjoin/config.ts b/packages/suite/src/services/coinjoin/config.ts
index e10d924ee8c..15e2aa7efae 100644
--- a/packages/suite/src/services/coinjoin/config.ts
+++ b/packages/suite/src/services/coinjoin/config.ts
@@ -6,9 +6,10 @@ import {
 } from '@trezor/coinjoin/src/constants';
 import type { CoinjoinBackendSettings, CoinjoinClientSettings } from '@trezor/coinjoin';
 import type { PartialRecord } from '@trezor/type-utils';
-import type { CoinjoinServerEnvironment } from 'src/types/wallet/coinjoin';
 import type { NetworkSymbol } from '@suite-common/wallet-config';
 
+import type { CoinjoinServerEnvironment } from 'src/types/wallet/coinjoin';
+
 export type CoinjoinNetworksConfig = CoinjoinBackendSettings &
     CoinjoinClientSettings & { blockbookUrls: string[] };
 
@@ -21,7 +22,7 @@ export const COINJOIN_NETWORKS: PartialRecord<NetworkSymbol, ServerEnvironment>
             network: 'btc',
             coordinatorName: 'CoinJoinCoordinatorIdentifier',
             coordinatorUrl: 'https://wasabiwallet.io/wabisabi/',
-            wabisabiBackendUrl: 'https://wasabiwallet.io/',
+            wabisabiBackendUrl: 'https://api.wasabiwallet.io/',
             blockbookUrls: [
                 'https://btc1.trezor.io',
                 'https://btc2.trezor.io',
diff --git a/packages/suite/src/services/github.ts b/packages/suite/src/services/github.ts
index 5cee99d8de6..620c7f153f1 100644
--- a/packages/suite/src/services/github.ts
+++ b/packages/suite/src/services/github.ts
@@ -1,5 +1,4 @@
 import { getFirmwareVersion } from '@trezor/device-utils';
-
 import {
     getCommitHash,
     getScreenHeight,
@@ -8,10 +7,11 @@ import {
     getUserAgent,
     isDesktop,
 } from '@trezor/env-utils';
-import type { TrezorDevice } from 'src/types/suite';
 import type { TransportInfo } from '@trezor/connect';
 import { GITHUB_REPO_URL } from '@trezor/urls';
 
+import type { TrezorDevice } from 'src/types/suite';
+
 type DebugInfo = {
     device?: TrezorDevice;
     transport?: Partial<TransportInfo>;
diff --git a/packages/suite/src/services/google.ts b/packages/suite/src/services/google.ts
index 17cd9c1d4e1..14080733065 100644
--- a/packages/suite/src/services/google.ts
+++ b/packages/suite/src/services/google.ts
@@ -6,8 +6,9 @@
  * in case our authorization server (which holds a client secret necessary for the authorization code flow) is not available.
  */
 
-import { METADATA_PROVIDER } from 'src/actions/suite/constants';
 import { isDesktop } from '@trezor/env-utils';
+
+import { METADATA_PROVIDER } from 'src/actions/suite/constants';
 import { OAuthServerEnvironment, Tokens } from 'src/types/suite/metadata';
 import {
     extractCredentialsFromAuthorizationFlow,
@@ -171,7 +172,7 @@ class Client {
     static async isAuthServerAvailable() {
         try {
             Client.authServerAvailable = (await fetch(`${Client.authServerUrl}/status`)).ok;
-        } catch (err) {
+        } catch {
             Client.authServerAvailable = false;
         }
 
diff --git a/packages/suite/src/services/suite/invityAPI.ts b/packages/suite/src/services/suite/invityAPI.ts
index d75c674a2c1..806a0f99e25 100644
--- a/packages/suite/src/services/suite/invityAPI.ts
+++ b/packages/suite/src/services/suite/invityAPI.ts
@@ -21,13 +21,14 @@ import {
     SellFiatTradeQuoteResponse,
     SellFiatTradeRequest,
     SellFiatTradeResponse,
-    SellCryptoPaymentMethod,
-    BuyCryptoPaymentMethod,
     InfoResponse,
 } from 'invity-api';
+
 import { getSuiteVersion, isDesktop } from '@trezor/env-utils';
 import type { InvityServerEnvironment, InvityServers } from '@suite-common/invity';
+
 import {
+    CoinmarketPaymentMethodType,
     CoinmarketTradeDetailType,
     CoinmarketTradeType,
     CoinmarketWatchTradeResponseMapProps,
@@ -380,7 +381,7 @@ class InvityAPI {
         return `${this.getApiServerUrl()}/images/exchange/${logo}`;
     }
 
-    getPaymentMethodUrl(paymentMethod: BuyCryptoPaymentMethod | SellCryptoPaymentMethod): string {
+    getPaymentMethodUrl(paymentMethod: CoinmarketPaymentMethodType): string {
         return `${this.getApiServerUrl()}/images/paymentMethods/suite/${paymentMethod}.svg`;
     }
 
diff --git a/packages/suite/src/services/suite/metadata/DropboxProvider.ts b/packages/suite/src/services/suite/metadata/DropboxProvider.ts
index f5b65ee92aa..288199b88b7 100644
--- a/packages/suite/src/services/suite/metadata/DropboxProvider.ts
+++ b/packages/suite/src/services/suite/metadata/DropboxProvider.ts
@@ -1,13 +1,14 @@
 import { Dropbox, DropboxAuth } from 'dropbox';
 import type { users } from 'dropbox';
+
+import { getWeakRandomId } from '@trezor/utils';
+
 import { AbstractMetadataProvider } from 'src/types/suite/metadata';
 import {
     extractCredentialsFromAuthorizationFlow,
     getOauthReceiverUrl,
 } from 'src/utils/suite/oauth';
 
-import { getWeakRandomId } from '@trezor/utils';
-
 // Dropbox messed up types, that's why @ts-expect-error occurs in this file
 
 class DropboxProvider extends AbstractMetadataProvider {
@@ -48,7 +49,7 @@ class DropboxProvider extends AbstractMetadataProvider {
             await this.auth.refreshAccessToken(['']);
 
             return true;
-        } catch (err) {
+        } catch {
             return false;
         }
     }
@@ -237,6 +238,7 @@ class DropboxProvider extends AbstractMetadataProvider {
             return this.handleProviderError(err);
         }
     }
+
     /**
      * Specific implementation in every provider. Returns standardized error
      */
diff --git a/packages/suite/src/services/suite/metadata/FileSystemProvider.ts b/packages/suite/src/services/suite/metadata/FileSystemProvider.ts
index f0bb16cbb71..9943113c7c7 100644
--- a/packages/suite/src/services/suite/metadata/FileSystemProvider.ts
+++ b/packages/suite/src/services/suite/metadata/FileSystemProvider.ts
@@ -1,4 +1,5 @@
 import { desktopApi } from '@trezor/suite-desktop-api';
+
 import { AbstractMetadataProvider } from 'src/types/suite/metadata';
 
 class FileSystemProvider extends AbstractMetadataProvider {
diff --git a/packages/suite/src/services/suite/metadata/GoogleProvider.ts b/packages/suite/src/services/suite/metadata/GoogleProvider.ts
index cc676b7aa81..36749fbee71 100644
--- a/packages/suite/src/services/suite/metadata/GoogleProvider.ts
+++ b/packages/suite/src/services/suite/metadata/GoogleProvider.ts
@@ -4,6 +4,7 @@ import GoogleClient from 'src/services/google';
 class GoogleProvider extends AbstractMetadataProvider {
     connected = false;
     isCloud = true;
+
     constructor(tokens: Tokens, environment: OAuthServerEnvironment) {
         super('google');
         GoogleClient.init(tokens, environment);
@@ -179,7 +180,7 @@ class GoogleProvider extends AbstractMetadataProvider {
             const result = await GoogleClient.getAccessToken();
 
             return !!result;
-        } catch (_err) {
+        } catch {
             return false;
         }
     }
diff --git a/packages/suite/src/storage/CHANGELOG.md b/packages/suite/src/storage/CHANGELOG.md
index 115e8796c57..4cdd434f94e 100644
--- a/packages/suite/src/storage/CHANGELOG.md
+++ b/packages/suite/src/storage/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Storage changelog
 
+## 49
+
+-   networks now have same order everywhere
+
+## 48
+
+-   device state to new object format (`device._state` -> `device.state`)
+
 ## 47
 
 -   migrate matic to pol
diff --git a/packages/suite/src/storage/__tests__/storage.test.ts b/packages/suite/src/storage/__tests__/storage.test.ts
index 4b42e61f005..07164788461 100644
--- a/packages/suite/src/storage/__tests__/storage.test.ts
+++ b/packages/suite/src/storage/__tests__/storage.test.ts
@@ -1,4 +1,6 @@
-import { db } from '..';
+import '@suite-common/test-utils/src/mocks';
+
+import { db } from '../index';
 
 describe('storage', () => {
     test('2 calls to uninitiated db', async () => {
diff --git a/packages/suite/src/storage/definitions.ts b/packages/suite/src/storage/definitions.ts
index 297ebc287e1..f4a1c6a63d4 100644
--- a/packages/suite/src/storage/definitions.ts
+++ b/packages/suite/src/storage/definitions.ts
@@ -1,22 +1,28 @@
-import type { DBSchema } from 'idb';
 import { FieldValues } from 'react-hook-form';
 
-import type { SuiteState } from 'src/reducers/suite/suiteReducer';
-import type { FormState, RatesByTimestamps } from '@suite-common/wallet-types';
-import type { AcquiredDevice } from 'src/types/suite';
-import type { MetadataState } from 'src/types/suite/metadata';
-import type { Trade } from 'src/types/wallet/coinmarketCommonTypes';
+import type { DBSchema } from 'idb';
+
+import type {
+    FormState,
+    RatesByTimestamps,
+    BackendSettings,
+    WalletSettings,
+} from '@suite-common/wallet-types';
 import type { MessageState } from '@suite-common/message-system';
-import type { MessageSystem } from '@suite-common/suite-types';
-import type { Account, Discovery, WalletAccountTransaction } from 'src/types/wallet';
+import type { DeviceWithEmptyPath, MessageSystem } from '@suite-common/suite-types';
 import { NetworkSymbol } from '@suite-common/wallet-config';
-import type { CoinjoinAccount, CoinjoinDebugSettings } from 'src/types/wallet/coinjoin';
-import type { BackendSettings, WalletSettings } from '@suite-common/wallet-types';
 import type { StorageUpdateMessage } from '@trezor/suite-storage';
 import { AnalyticsState } from '@suite-common/analytics';
-import { GraphData } from '../types/wallet/graph';
 import { SimpleTokenStructure } from '@suite-common/token-definitions';
 
+import type { CoinjoinAccount, CoinjoinDebugSettings } from 'src/types/wallet/coinjoin';
+import type { Account, Discovery, WalletAccountTransaction } from 'src/types/wallet';
+import type { Trade } from 'src/types/wallet/coinmarketCommonTypes';
+import type { MetadataState } from 'src/types/suite/metadata';
+import type { SuiteState } from 'src/reducers/suite/suiteReducer';
+
+import { GraphData } from '../types/wallet/graph';
+
 export interface DBWalletAccountTransaction {
     tx: WalletAccountTransaction;
     order: number;
@@ -60,7 +66,7 @@ export interface SuiteDBSchema extends DBSchema {
     };
     devices: {
         key: string;
-        value: AcquiredDevice;
+        value: DeviceWithEmptyPath;
     };
     accounts: {
         key: string[];
diff --git a/packages/suite/src/storage/index.ts b/packages/suite/src/storage/index.ts
index 05d141618b6..13d95530236 100644
--- a/packages/suite/src/storage/index.ts
+++ b/packages/suite/src/storage/index.ts
@@ -1,10 +1,11 @@
 import SuiteDB, { OnUpgradeFunc } from '@trezor/suite-storage';
+
 import { reloadApp } from 'src/utils/suite/reload';
-import { migrate } from './migrations';
 
+import { migrate } from './migrations';
 import type { SuiteDBSchema } from './definitions';
 
-const VERSION = 47; // don't forget to add migration and CHANGELOG when changing versions!
+const VERSION = 49; // don't forget to add migration and CHANGELOG when changing versions!
 
 /**
  *  If the object stores don't already exist then creates them.
diff --git a/packages/suite/src/storage/migrations/index.ts b/packages/suite/src/storage/migrations/index.ts
index 928fc788a38..7e70379d580 100644
--- a/packages/suite/src/storage/migrations/index.ts
+++ b/packages/suite/src/storage/migrations/index.ts
@@ -1,22 +1,24 @@
-import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { toWei } from 'web3-utils';
-import { isDesktop } from '@trezor/env-utils';
-import type { State } from 'src/reducers/wallet/settingsReducer';
-import type { CustomBackend, BlockbookUrl } from 'src/types/wallet/backend';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 
+import { BigNumber } from '@trezor/utils/src/bigNumber';
+import { isDesktop } from '@trezor/env-utils';
+import { NetworkSymbol, networkSymbolCollection } from '@suite-common/wallet-config';
 import type { BackendSettings } from '@suite-common/wallet-types';
 import type { OnUpgradeFunc } from '@trezor/suite-storage';
-import type { DBWalletAccountTransaction, SuiteDBSchema } from '../definitions';
 import {
     formatNetworkAmount,
-    networkAmountToSatoshi,
-    amountToSatoshi,
+    networkAmountToSmallestUnit,
+    amountToSmallestUnit,
 } from '@suite-common/wallet-utils';
-import { updateAll } from './utils';
 import { DeviceModelInternal, FirmwareType } from '@trezor/connect';
 import { parseAsset } from '@trezor/blockchain-link-utils/src/blockfrost';
 
+import type { CustomBackend, BlockbookUrl } from 'src/types/wallet/backend';
+import type { State } from 'src/reducers/wallet/settingsReducer';
+
+import { updateAll } from './utils';
+import type { DBWalletAccountTransaction, SuiteDBSchema } from '../definitions';
+
 type WalletWithBackends = {
     backends?: Partial<{
         [coin in NetworkSymbol]: Omit<CustomBackend, 'coin'>;
@@ -307,7 +309,7 @@ export const migrate: OnUpgradeFunc<SuiteDBSchema> = async (
 
     if (oldVersion < 28) {
         await updateAll(transaction, 'devices', device => {
-            if (device.state?.includes('undefined')) {
+            if ((device.state as string)?.includes('undefined')) {
                 // @ts-expect-error
                 device.state = device.state.replace('undefined', '0');
 
@@ -428,7 +430,8 @@ export const migrate: OnUpgradeFunc<SuiteDBSchema> = async (
             transaction,
             'txs',
             ({ order, tx: origTx }) => {
-                const unformat = (amount: string) => networkAmountToSatoshi(amount, origTx.symbol);
+                const unformat = (amount: string) =>
+                    networkAmountToSmallestUnit(amount, origTx.symbol);
                 const unformatIfDefined = (amount: string | undefined) =>
                     amount ? unformat(amount) : amount;
 
@@ -439,7 +442,7 @@ export const migrate: OnUpgradeFunc<SuiteDBSchema> = async (
                     totalSpent: unformat(origTx.totalSpent),
                     tokens: origTx.tokens.map(tok => ({
                         ...tok,
-                        amount: amountToSatoshi(tok.amount, tok.decimals),
+                        amount: amountToSmallestUnit(tok.amount, tok.decimals),
                     })),
                     targets: origTx.targets.map(target => ({
                         ...target,
@@ -1103,4 +1106,33 @@ export const migrate: OnUpgradeFunc<SuiteDBSchema> = async (
             return draft;
         });
     }
+
+    if (oldVersion < 48) {
+        // Migrate device state to new object format
+        await updateAll(transaction, 'devices', device => {
+            if (typeof device.state === 'string') {
+                if (typeof (device as any)?._state?.staticSessionId === 'string') {
+                    // Has _state property, migrate to that
+                    device.state = (device as any)._state;
+                } else {
+                    // No _state property, create new object
+                    device.state = {
+                        staticSessionId: device.state,
+                    };
+                }
+            }
+
+            return device;
+        });
+    }
+
+    if (oldVersion < 49) {
+        await updateAll(transaction, 'walletSettings', walletSettings => {
+            walletSettings.enabledNetworks.sort(
+                (a, b) => networkSymbolCollection.indexOf(a) - networkSymbolCollection.indexOf(b),
+            );
+
+            return walletSettings;
+        });
+    }
 };
diff --git a/packages/suite/src/storage/migrations/utils.ts b/packages/suite/src/storage/migrations/utils.ts
index e2d1bbb7eb0..1a9b9805d50 100644
--- a/packages/suite/src/storage/migrations/utils.ts
+++ b/packages/suite/src/storage/migrations/utils.ts
@@ -1,4 +1,5 @@
 import type { StoreNames, StoreValue, IDBPTransaction } from 'idb';
+
 import type { SuiteDBSchema } from '../definitions';
 
 /**
diff --git a/packages/suite/src/support/extraDependencies.ts b/packages/suite/src/support/extraDependencies.ts
index bd0fdef91e4..2c5127b54ce 100644
--- a/packages/suite/src/support/extraDependencies.ts
+++ b/packages/suite/src/support/extraDependencies.ts
@@ -15,11 +15,17 @@ import {
 } from '@suite-common/wallet-core';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { ExtraDependencies } from '@suite-common/redux-utils';
+import { PROTO, StaticSessionId } from '@trezor/connect';
+import {
+    TokenDefinitionsState,
+    buildTokenDefinitionsFromStorage,
+} from '@suite-common/token-definitions';
+import { isDesktop } from '@trezor/env-utils';
+
 import {
     findLabelsToBeMovedOrDeleted,
     moveLabelsForRbfAction,
 } from 'src/actions/wallet/moveLabelsForRbfActions';
-
 import { StorageLoadAction } from 'src/actions/suite/storageActions';
 import * as metadataLabelingActions from 'src/actions/suite/metadataLabelingActions';
 import * as metadataActions from 'src/actions/suite/metadataActions';
@@ -27,17 +33,12 @@ import * as cardanoStakingActions from 'src/actions/wallet/cardanoStakingActions
 import * as walletSettingsActions from 'src/actions/settings/walletSettingsActions';
 import { fixLoadedCoinjoinAccount } from 'src/utils/wallet/coinjoinUtils';
 import * as modalActions from 'src/actions/suite/modalActions';
+import { addWalletThunk, openSwitchDeviceDialog } from 'src/actions/wallet/addWalletThunk';
 
 import * as suiteActions from '../actions/suite/suiteActions';
 import { AppState, ButtonRequest, TrezorDevice } from '../types/suite';
 import { METADATA, STORAGE } from '../actions/suite/constants';
-import { PROTO, StaticSessionId } from '@trezor/connect';
-import {
-    TokenDefinitionsState,
-    buildTokenDefinitionsFromStorage,
-} from '@suite-common/token-definitions';
 import { selectSuiteSettings } from '../reducers/suite/suiteReducer';
-import { addWalletThunk, openSwitchDeviceDialog } from 'src/actions/wallet/addWalletThunk';
 
 const connectSrc = resolveStaticPath('connect/');
 // 'https://localhost:8088/';
@@ -50,9 +51,10 @@ const connectInitSettings = {
     popup: false,
     manifest: {
         email: 'info@trezor.io',
-        appUrl: '@trezor/suite',
+        appUrl: isDesktop() ? '@trezor/suite' : window.origin,
     },
     sharedLogger: false,
+    enableFirmwareHashCheck: true,
 };
 
 export const extraDependencies: ExtraDependencies = {
@@ -78,6 +80,7 @@ export const extraDependencies: ExtraDependencies = {
         selectLocalCurrency: (state: AppState) => state.wallet.settings.localCurrency,
         selectIsPendingTransportEvent,
         selectDebugSettings: (state: AppState) => state.suite.settings.debug,
+        // FW binaries on desktop are stored in "*/static/connect/data/firmware/*/*.bin" (see "connect-common" package)
         selectDesktopBinDir: (state: AppState) => state.desktop?.paths?.binDir,
         selectDevice: (state: AppState) => state.device.selectedDevice,
         selectLanguage: (state: AppState) => state.suite.settings.language,
@@ -86,8 +89,6 @@ export const extraDependencies: ExtraDependencies = {
             selectDiscoveryByDeviceState(state, state.device.selectedDevice?.state),
         selectRouterApp: (state: AppState) => state.router.app,
         selectRoute: (state: AppState) => state.router.route,
-        selectCheckFirmwareAuthenticity: (state: AppState) =>
-            state.suite.settings.debug.checkFirmwareAuthenticity,
         selectAddressDisplayType: (state: AppState) => state.suite.settings.addressDisplayType,
         selectSelectedAccountStatus: (state: AppState) => state.wallet.selectedAccount.status,
         selectSuiteSettings,
@@ -176,7 +177,9 @@ export const extraDependencies: ExtraDependencies = {
             }: PayloadAction<{ deviceState: StaticSessionId; metadata: TrezorDevice['metadata'] }>,
         ) => {
             const { deviceState, metadata } = payload;
-            const index = state.devices.findIndex((d: TrezorDevice) => d.state === deviceState);
+            const index = state.devices.findIndex(
+                (d: TrezorDevice) => d.state?.staticSessionId === deviceState,
+            );
             const device = state.devices[index];
             if (!device) return;
             device.metadata = metadata;
@@ -185,10 +188,15 @@ export const extraDependencies: ExtraDependencies = {
             state,
             {
                 payload,
-            }: PayloadAction<{ deviceState: StaticSessionId; metadata: TrezorDevice['passwords'] }>,
+            }: PayloadAction<{
+                deviceState: StaticSessionId;
+                metadata: TrezorDevice['passwords'];
+            }>,
         ) => {
             const { deviceState, metadata } = payload;
-            const index = state.devices.findIndex((d: TrezorDevice) => d.state === deviceState);
+            const index = state.devices.findIndex(
+                (d: TrezorDevice) => d.state?.staticSessionId === deviceState,
+            );
             const device = state.devices[index];
             if (!device) return;
             device.passwords = metadata;
diff --git a/packages/suite/src/support/messages.ts b/packages/suite/src/support/messages.ts
index c54caf906ee..606cb4a31ea 100644
--- a/packages/suite/src/support/messages.ts
+++ b/packages/suite/src/support/messages.ts
@@ -1,6 +1,24 @@
 import { defineMessages } from 'react-intl';
 
-export default defineMessages({
+type MessageDescriptor<K extends string> = {
+    // Must correspond to the property name.
+    id: K;
+    // Default text in English. This value is only used directly if the corresponding key is missing from the JSON translation files.
+    defaultMessage: string;
+    // Not integrated into Crowdin so not really used.
+    description?: string;
+    // Must be set to true for programmatically constructed keys. Otherwise, the keys will be deleted by the list-duplicates script.
+    dynamic?: boolean;
+};
+
+/**
+Checks whether id corresponds to the property name. Otherwise, text is not translated. Returns the same value that was passed in.
+ */
+const defineMessagesWithTypeCheck = <Key extends string>(messages: {
+    [K in Key]: MessageDescriptor<K>;
+}) => messages;
+
+const messages = defineMessagesWithTypeCheck({
     TR_404_DESCRIPTION: {
         defaultMessage: 'Looks like a wrong URL or broken link.',
         id: 'TR_404_DESCRIPTION',
@@ -72,7 +90,7 @@ export default defineMessages({
         id: 'TR_ACCOUNT_EXCEPTION_NOT_ENABLED',
     },
     TR_ACCOUNT_EXCEPTION_NOT_EXIST: {
-        defaultMessage: 'Account does not exist',
+        defaultMessage: "Account doesn't exist",
         id: 'TR_ACCOUNT_EXCEPTION_NOT_EXIST',
     },
     TR_ACCOUNT_OUT_OF_SYNC: {
@@ -116,6 +134,10 @@ export default defineMessages({
         id: 'TR_ACTIVE',
         defaultMessage: 'active',
     },
+    TR_ADD: {
+        id: 'TR_ADD',
+        defaultMessage: 'Add',
+    },
     TR_ADD_ACCOUNT: {
         defaultMessage: 'Add account',
         id: 'TR_ADD_ACCOUNT',
@@ -166,7 +188,7 @@ export default defineMessages({
         id: 'TR_XPUB',
     },
     TR_ADDRESS: {
-        id: 'TR_ADDRESSES',
+        id: 'TR_ADDRESS',
         defaultMessage: 'Address',
     },
     TR_ADDRESSES_FRESH: {
@@ -189,10 +211,6 @@ export default defineMessages({
         defaultMessage: 'All',
         id: 'TR_FRACTION_BUTTONS_ALL',
     },
-    TR_EXCHANGE_PROVIDER: {
-        defaultMessage: 'Provider',
-        id: 'TR_EXCHANGE_PROVIDER',
-    },
     TR_EXCHANGE_FIXED_OFFERS_INFO: {
         id: 'TR_EXCHANGE_FIXED_OFFERS_INFO',
         defaultMessage:
@@ -203,16 +221,6 @@ export default defineMessages({
         defaultMessage:
             "Floating rates mean that the final amount you'll get may change slightly due to fluctuations in the market between when you select the rate and when your transaction is complete. These rates are usually higher, meaning you could end up with more crypto in the end.",
     },
-    TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES: {
-        id: 'TR_EXCHANGE_DEX_OFFER_NO_FUNDS_FEES',
-        defaultMessage:
-            'No funds remaining for the transaction fees. Please lower the exchange amount to max {symbol} {max}',
-    },
-    TR_EXCHANGE_DEX_OFFER_FEE_INFO: {
-        defaultMessage:
-            'The fees to perform this swap are estimated at {approvalFee} ({approvalFeeFiat}) for approval (if required) and {swapFee} ({swapFeeFiat}) for the swap.',
-        id: 'TR_EXCHANGE_DEX_OFFER_FEE_INFO',
-    },
     TR_EXCHANGE_FEES_INFO: {
         id: 'TR_EXCHANGE_FEES_INFO',
         defaultMessage:
@@ -258,7 +266,7 @@ export default defineMessages({
     },
     TR_COINMARKET_SWAP_MODAL_TERMS_4: {
         defaultMessage:
-            "I understand that Invity doesn't provide this service. It's governed by {provider}’s terms and conditions.",
+            "I understand that Invity doesn't provide this service. It's governed by {provider}’s Terms and Conditions.",
         id: 'TR_COINMARKET_SWAP_MODAL_TERMS_4',
         dynamic: true,
     },
@@ -319,7 +327,7 @@ export default defineMessages({
     },
     TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4: {
         defaultMessage:
-            "I understand that Invity doesn't provide this service. It's governed by {provider}’s terms and conditions.",
+            "I understand that Invity doesn't provide this service. It's governed by {provider}’s Terms and Conditions.",
         id: 'TR_COINMARKET_SWAP_DEX_MODAL_TERMS_4',
         dynamic: true,
     },
@@ -344,13 +352,17 @@ export default defineMessages({
         defaultMessage: 'Confirm address',
         id: 'TR_CONFIRM_ADDRESS',
     },
+    TR_CHECKED_BALANCES_ON: {
+        defaultMessage: 'Checked balances on',
+        id: 'TR_CHECKED_BALANCES_ON',
+    },
     TR_ALL_NETWORKS: {
         defaultMessage: 'All networks ({networkCount})',
         id: 'TR_ALL_NETWORKS',
     },
     TR_ALL_NETWORKS_TOOLTIP: {
         defaultMessage:
-            'View tokens from all {networkCount} networks. Use the buttons on the right to filter by top networks.',
+            'View tokens from all {networkCount} networks. Filter by the most popular networks.',
         id: 'TR_ALL_NETWORKS_TOOLTIP',
     },
     TR_SELECT_TOKEN: {
@@ -358,23 +370,23 @@ export default defineMessages({
         id: 'TR_SELECT_TOKEN',
     },
     TR_SELECT_NAME_OR_ADDRESS: {
-        defaultMessage: 'Search by name, symbol, network or contract address',
+        defaultMessage: 'Search by name, symbol, network, or contract address',
         id: 'TR_SELECT_NAME_OR_ADDRESS',
     },
     TR_TOKEN_NOT_FOUND: {
-        defaultMessage: 'Token not found',
+        defaultMessage: 'No token found',
         id: 'TR_TOKEN_NOT_FOUND',
     },
     TR_TOKEN_NOT_FOUND_ON_NETWORK: {
-        defaultMessage: 'Token not found on the {networkName} network',
+        defaultMessage: 'Token not found on the {networkName} network.',
         id: 'TR_TOKEN_NOT_FOUND_ON_NETWORK',
     },
     TR_TOKEN_TRY_DIFFERENT_SEARCH: {
-        defaultMessage: 'Please try a different search.',
+        defaultMessage: 'Try a different search.',
         id: 'TR_TOKEN_TRY_DIFFERENT_SEARCH',
     },
     TR_TOKEN_TRY_DIFFERENT_SEARCH_OR_SWITCH: {
-        defaultMessage: 'Please try a different search or switch to another network.',
+        defaultMessage: 'Try a different search or switch to another network.',
         id: 'TR_TOKEN_TRY_DIFFERENT_SEARCH_OR_SWITCH',
     },
     TR_EXCHANGE_STATUS_ERROR: {
@@ -397,14 +409,6 @@ export default defineMessages({
         defaultMessage: 'Converting',
         id: 'TR_EXCHANGE_STATUS_CONVERTING',
     },
-    TR_EXCHANGE_TRANS_ID: {
-        defaultMessage: 'Trans. ID:',
-        id: 'TR_EXCHANGE_TRANS_ID',
-    },
-    TR_EXCHANGE_VIEW_DETAILS: {
-        defaultMessage: 'View details',
-        id: 'TR_EXCHANGE_VIEW_DETAILS',
-    },
     TR_EXCHANGE_DETAIL_SUCCESS_TITLE: {
         defaultMessage: 'Approved',
         id: 'TR_EXCHANGE_DETAIL_SUCCESS_TITLE',
@@ -578,10 +582,6 @@ export default defineMessages({
         defaultMessage: 'Slippage tolerance',
         id: 'TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE',
     },
-    TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY: {
-        defaultMessage: 'Slippage summary',
-        id: 'TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY',
-    },
     TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED: {
         defaultMessage: 'Swap offer amount',
         id: 'TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED',
@@ -671,10 +671,6 @@ export default defineMessages({
         defaultMessage: "Use an account ({symbol}) that isn't in Suite",
         id: 'TR_EXCHANGE_USE_NON_SUITE_ACCOUNT',
     },
-    TR_EXCHANGE_BUY: {
-        defaultMessage: 'For',
-        id: 'TR_EXCHANGE_BUY',
-    },
     TR_EXCHANGE_FIXED: {
         defaultMessage: 'Fixed-rate offer',
         id: 'TR_EXCHANGE_FIXED',
@@ -752,14 +748,6 @@ export default defineMessages({
         defaultMessage: 'Order now',
         id: 'TR_ORDER_NOW',
     },
-    TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT: {
-        defaultMessage: 'Minimum is {minimum} {currency}',
-        id: 'TR_SELL_VALIDATION_ERROR_MINIMUM_FIAT',
-    },
-    TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT: {
-        defaultMessage: 'Maximum is {maximum} {currency}',
-        id: 'TR_SELL_VALIDATION_ERROR_MAXIMUM_FIAT',
-    },
     TR_SELL_MODAL_FOR_YOUR_SAFETY: {
         defaultMessage: 'Sell {cryptocurrency} with {provider}',
         id: 'TR_SELL_MODAL_FOR_YOUR_SAFETY',
@@ -777,7 +765,7 @@ export default defineMessages({
     },
     TR_SELL_MODAL_TERMS_1: {
         defaultMessage:
-            "You're here to sell cryptocurrency. If you were directed to this site for any other reason, please contact support before proceeding.",
+            "You're here to sell cryptocurrency. If you were directed to this site for any other reason, please contact Trezor Support before proceeding.",
         id: 'TR_SELL_MODAL_TERMS_1',
         dynamic: true,
     },
@@ -926,137 +914,10 @@ export default defineMessages({
         defaultMessage: "Open partner's support site",
         id: 'TR_SELL_DETAIL_PENDING_SUPPORT',
     },
-    TR_SELL_VIEW_DETAILS: {
-        defaultMessage: 'View details',
-        id: 'TR_SELL_VIEW_DETAILS',
-    },
-    TR_SELL_TRANS_ID: {
-        defaultMessage: 'Trans. ID:',
-        id: 'TR_SELL_TRANS_ID',
-    },
     TR_BUY_STATUS_PENDING: {
         defaultMessage: 'Pending',
         id: 'TR_BUY_STATUS_PENDING',
     },
-    TR_P2P_INFO: {
-        defaultMessage:
-            'With {peerToPeer} (P2P) technology, there is no KYC verification involved neither on the side of the buyer nor the seller. All parties are protected against fraud by secure {multisigEscrow}.',
-        id: 'TR_P2P_INFO',
-    },
-    TR_P2P_PRICE: {
-        defaultMessage: 'Price for 1 {symbol}',
-        id: 'TR_P2P_PRICE',
-    },
-    TR_P2P_PRICE_TOOLTIP: {
-        defaultMessage: '{symbol} price offered by this user.',
-        id: 'TR_P2P_PRICE_TOOLTIP',
-    },
-    TR_P2P_AMOUNT_RANGE_TOOLTIP: {
-        defaultMessage:
-            'The minimum and maximum amount for which this user is willing to sell {symbol}.',
-        id: 'TR_P2P_AMOUNT_RANGE_TOOLTIP',
-    },
-    TR_P2P_USER_REPUTATION: {
-        defaultMessage: '({rating}, {numberOfTrades})',
-        id: 'TR_P2P_USER_REPUTATION',
-    },
-    TR_P2P_TITLE_NOT_AVAILABLE: {
-        defaultMessage: 'Hey there, I’m using {providerName}!',
-        id: 'TR_P2P_TITLE_NOT_AVAILABLE',
-    },
-    TR_P2P_PAYMENT_WINDOW_TOOLTIP: {
-        defaultMessage:
-            'The transaction needs to be completed within this time limit, counting from creating a contract on the {providerName} site.',
-        id: 'TR_P2P_PAYMENT_WINDOW_TOOLTIP',
-    },
-    TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM: {
-        defaultMessage:
-            'The chosen amount of {amount} is lower than the accepted minimum of {minimum}.',
-        id: 'TR_P2P_WARNING_AMOUNT_RANGE_MINIMUM',
-    },
-    TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM: {
-        defaultMessage:
-            'The chosen amount of {amount} is higher than the accepted maximum of {maximum}.',
-        id: 'TR_P2P_WARNING_AMOUNT_RANGE_MAXIMUM',
-    },
-    TR_P2P_MODAL_FOR_YOUR_SAFETY: {
-        defaultMessage: 'Peer-to-Peer Buy {cryptocurrency} with {provider}',
-        id: 'TR_P2P_MODAL_FOR_YOUR_SAFETY',
-        dynamic: true,
-    },
-    TR_P2P_MODAL_SECURITY_HEADER: {
-        defaultMessage: 'Security first with your Trezor',
-        id: 'TR_P2P_MODAL_SECURITY_HEADER',
-        dynamic: true,
-    },
-    TR_P2P_MODAL_TERMS_1: {
-        defaultMessage:
-            'You’re here to buy cryptocurrency from another person you choose using Peer-to-Peer (P2P) technology without ID verification. If you were directed to this site for any other reason, please contact support before proceeding.',
-        id: 'TR_P2P_MODAL_TERMS_1',
-        dynamic: true,
-    },
-    TR_P2P_MODAL_TERMS_2: {
-        defaultMessage:
-            'You understand that cryptocurrency transactions are irreversible and may not be refunded. Thus, fraudulent or accidental losses may be unrecoverable.',
-        id: 'TR_P2P_MODAL_TERMS_2',
-        dynamic: true,
-    },
-    TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER: {
-        defaultMessage: 'Verified partners by Invity',
-        id: 'TR_P2P_MODAL_VERIFIED_PARTNERS_HEADER',
-        dynamic: true,
-    },
-    TR_P2P_MODAL_TERMS_4: {
-        defaultMessage:
-            'You understand that Invity does not provide this service. {provider}’s terms govern the service.',
-        id: 'TR_P2P_MODAL_TERMS_4',
-        dynamic: true,
-    },
-    TR_P2P_MODAL_LEGAL_HEADER: {
-        defaultMessage: 'Legal notice',
-        id: 'TR_P2P_MODAL_LEGAL_HEADER',
-        dynamic: true,
-    },
-    TR_P2P_MODAL_TERMS_5: {
-        defaultMessage:
-            "I'm not using this feature for gambling, fraud, or any activity that violates Invity’s or the provider's Terms of Service, or any applicable laws.",
-        id: 'TR_P2P_MODAL_TERMS_5',
-        dynamic: true,
-    },
-    TR_P2P_MODAL_TERMS_6: {
-        defaultMessage:
-            'You understand that cryptocurrencies are an emerging financial tool and that regulations may vary in different jurisdictions. This may put you at a higher risk of fraud, theft, or market instability.',
-        id: 'TR_P2P_MODAL_TERMS_6',
-        dynamic: true,
-    },
-    TR_P2P_MODAL_CONFIRM: {
-        defaultMessage: 'I’m ready to buy',
-        id: 'TR_P2P_MODAL_CONFIRM',
-        dynamic: true,
-    },
-    TR_P2P_GET_STARTED_INTRO: {
-        defaultMessage:
-            'You need to initiate the transaction on {providerName} – make sure to follow the steps below carefully.',
-        id: 'TR_P2P_GET_STARTED_INTRO',
-    },
-    TR_P2P_GET_STARTED_ITEM_1: {
-        defaultMessage: 'Select “Go to {providerName}” to be redirected to our partner’s website.',
-        id: 'TR_P2P_GET_STARTED_ITEM_1',
-    },
-    TR_P2P_GET_STARTED_ITEM_3: {
-        defaultMessage:
-            'Once {providerName} asks you for a release address, return here and continue.',
-        id: 'TR_P2P_GET_STARTED_ITEM_3',
-    },
-    TR_P2P_GO_TO_PROVIDER: {
-        defaultMessage: 'Go to {providerName}',
-        id: 'TR_P2P_GO_TO_PROVIDER',
-    },
-    TR_P2P_RECEIVING_ADDRESS_ALMOST_THERE: {
-        defaultMessage:
-            'Almost there! Reveal and copy your address, paste it into the “Release address” field back on {providerName}, and finalize the transaction.',
-        id: 'TR_P2P_GET_STARTED_ITEM_4',
-    },
     TR_BUY_FOOTER_TEXT_1: {
         defaultMessage:
             'Invity is a comparison tool that connects you to the best exchange providers. They only use location in order to show the most relevant offers.',
@@ -1064,7 +925,7 @@ export default defineMessages({
     },
     TR_BUY_FOOTER_TEXT_2: {
         defaultMessage:
-            'Invity does not see any of your payment or KYC information; you share this only with the exchange provider if you choose to finish the transaction.',
+            "Invity doesn't see any of your payment or KYC information; you share this only with the exchange provider if you choose to finish the transaction.",
         id: 'TR_BUY_FOOTER_TEXT_2',
     },
     TR_BUY_MODAL_FOR_YOUR_SAFETY: {
@@ -1107,7 +968,7 @@ export default defineMessages({
     },
     TR_BUY_MODAL_TERMS_4: {
         defaultMessage:
-            "I understand that Invity doesn't provide this service. It's governed by {provider}’s terms and conditions.",
+            "I understand that Invity doesn't provide this service. It's governed by {provider}’s Terms and Conditions.",
         id: 'TR_BUY_MODAL_TERMS_4',
         dynamic: true,
     },
@@ -1128,11 +989,11 @@ export default defineMessages({
         id: 'TR_BUY_MODAL_TERMS_6',
         dynamic: true,
     },
-    TR_VALIDATION_ERROR_MINIMUM_CRYPTO: {
+    TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO: {
         defaultMessage: 'Minimum is {minimum}',
         id: 'TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO',
     },
-    TR_VALIDATION_ERROR_MAXIMUM_CRYPTO: {
+    TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO: {
         defaultMessage: 'Maximum is {maximum}',
         id: 'TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO',
     },
@@ -1144,14 +1005,6 @@ export default defineMessages({
         defaultMessage: 'Maximum is {maximum} {currency}',
         id: 'TR_BUY_VALIDATION_ERROR_MAXIMUM_FIAT',
     },
-    TR_BUY_BUY_AGAIN: {
-        defaultMessage: 'Buy again',
-        id: 'TR_BUY_BUY_AGAIN',
-    },
-    TR_BUY_ACCOUNT_TRANSACTIONS: {
-        defaultMessage: 'Trade transactions',
-        id: 'TR_BUY_ACCOUNT_TRANSACTIONS',
-    },
     TR_BUY_STATUS_PENDING_GO_TO_GATEWAY: {
         defaultMessage: 'Pending',
         id: 'TR_BUY_STATUS_PENDING_GO_TO_GATEWAY',
@@ -1160,10 +1013,6 @@ export default defineMessages({
         defaultMessage: 'Action required',
         id: 'TR_BUY_STATUS_ACTION_REQUIRED',
     },
-    TR_BUY_VIEW_DETAILS: {
-        defaultMessage: 'View details',
-        id: 'TR_BUY_VIEW_DETAILS',
-    },
     TR_BUY_STATUS_ERROR: {
         defaultMessage: 'Rejected',
         id: 'TR_BUY_STATUS_ERROR',
@@ -1176,26 +1025,6 @@ export default defineMessages({
         id: 'TR_LOGIN_PROCEED',
         defaultMessage: 'Proceed',
     },
-    TR_OFFER_ERROR_MINIMUM_CRYPTO: {
-        defaultMessage:
-            'The chosen amount of {amount} is lower than the accepted minimum of {min}.',
-        id: 'TR_OFFER_ERROR_MINIMUM_CRYPTO',
-    },
-    TR_OFFER_ERROR_MAXIMUM_CRYPTO: {
-        defaultMessage:
-            'The chosen amount of {amount} is higher than the accepted maximum of {max}.',
-        id: 'TR_OFFER_ERROR_MAXIMUM_CRYPTO',
-    },
-    TR_OFFER_ERROR_MINIMUM_FIAT: {
-        defaultMessage:
-            'The chosen amount of {amount} is lower than the accepted minimum of {min}.',
-        id: 'TR_OFFER_ERROR_MINIMUM_FIAT',
-    },
-    TR_OFFER_ERROR_MAXIMUM_FIAT: {
-        defaultMessage:
-            'The chosen amount of {amount} is higher than the accepted maximum of {max}.',
-        id: 'TR_OFFER_ERROR_MAXIMUM_FIAT',
-    },
     TR_TERMS_OF_USE_INVITY: {
         defaultMessage: 'Terms of Use',
         id: 'TR_TERMS_OF_USE_INVITY',
@@ -1216,10 +1045,6 @@ export default defineMessages({
         defaultMessage: 'Provider',
         id: 'TR_BUY_PROVIDER',
     },
-    TR_BUY_TRANS_ID: {
-        defaultMessage: 'Trans. ID:',
-        id: 'TR_BUY_TRANS_ID',
-    },
     TR_BUY_RECEIVING_ADDRESS: {
         defaultMessage: 'Receive address',
         id: 'TR_BUY_RECEIVING_ADDRESS',
@@ -1232,10 +1057,6 @@ export default defineMessages({
         defaultMessage: 'No transactions yet.',
         id: 'TR_BUY_NOT_TRANSACTIONS',
     },
-    TR_BUY_CONFIRM_ON_TREZOR: {
-        defaultMessage: 'Confirm on Trezor',
-        id: 'TR_BUY_CONFIRM_ON_TREZOR',
-    },
     TR_BUY_GO_TO_PAYMENT: {
         defaultMessage: 'Finish transaction',
         id: 'TR_BUY_GO_TO_PAYMENT',
@@ -1286,12 +1107,11 @@ export default defineMessages({
         id: 'TR_BUY_DETAIL_SUBMITTED_TITLE',
     },
     TR_BUY_DETAIL_SUBMITTED_TEXT: {
-        defaultMessage:
-            "Click the button below to finish entering your details on the provider's site.",
+        defaultMessage: "Click to complete your details on the provider's site.",
         id: 'TR_BUY_DETAIL_SUBMITTED_TEXT',
     },
     TR_BUY_DETAIL_SUBMITTED_GATE: {
-        defaultMessage: 'Go to payment gateway',
+        defaultMessage: 'Proceed to pay',
         id: 'TR_BUY_DETAIL_SUBMITTED_GATE',
     },
     TR_BUY_DETAIL_WAITING_FOR_USER_TITLE: {
@@ -1307,32 +1127,6 @@ export default defineMessages({
         defaultMessage: "Go to provider's site",
         id: 'TR_BUY_DETAIL_WAITING_FOR_USER_GATE',
     },
-    TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN: {
-        defaultMessage: 'Auto-reloading in',
-        id: 'TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN',
-    },
-    TR_COINMARKET_NO_OFFERS_HEADER: {
-        defaultMessage: 'No offers',
-        id: 'TR_COINMARKET_NO_OFFERS_HEADER',
-    },
-    TR_COINMARKET_NO_OFFERS_MESSAGE: {
-        defaultMessage:
-            "Sorry, we don't have any offers at the moment. Try to reload the page or change your query.",
-        id: 'TR_COINMARKET_NO_OFFERS_MESSAGE',
-    },
-    TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE: {
-        defaultMessage:
-            "Sorry, we don't have any offers at the moment due to a server connectivity issue.",
-        id: 'TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE',
-    },
-    TR_COINMARKET_NO_OFFERS_BACK_BUTTON: {
-        defaultMessage: 'Back to Trade',
-        id: 'TR_COINMARKET_NO_OFFERS_BACK_BUTTON',
-    },
-    TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON: {
-        defaultMessage: 'Reload page',
-        id: 'TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON',
-    },
     TR_COINMARKET_OFFERS_EMPTY: {
         defaultMessage: 'No offers available for your request. Change country or buy amount.',
         id: 'TR_COINMARKET_OFFERS_EMPTY',
@@ -1357,6 +1151,16 @@ export default defineMessages({
         defaultMessage: 'Last transactions',
         id: 'TR_COINMARKET_LAST_TRANSACTIONS',
     },
+    TR_COINMARKET_BUY_AND_SELL_COUNTER: {
+        defaultMessage:
+            '{totalBuys, plural, =0 {{totalBuys} buys} one {{totalBuys} buy} other {{totalBuys} buys} } • {totalSells, plural, =0 {{totalSells} sells} one {{totalSells} sell} other {{totalSells} sells} }',
+        id: 'TR_COINMARKET_BUY_AND_SELL_COUNTER',
+    },
+    TR_COINMARKET_SWAP_COUNTER: {
+        defaultMessage:
+            '{totalSwaps, plural, =0 {{totalSwaps} swaps} one {{totalSwaps} swap} other {{totalSwaps} swaps} }',
+        id: 'TR_COINMARKET_SWAP_COUNTER',
+    },
     TR_COINMARKET_PAYMENT_METHOD: {
         defaultMessage: 'Payment method',
         id: 'TR_COINMARKET_PAYMENT_METHOD',
@@ -1543,7 +1347,8 @@ export default defineMessages({
         id: 'TR_COINMARKET_KYC_NO_REFUND',
     },
     TR_COINMARKET_KYC_YES_REFUND: {
-        defaultMessage: 'KYC requested in exceptional cases. KYC not required for refunds. 🤝',
+        defaultMessage:
+            "KYC is only requested in exceptional cases. It's not required for refunds. 🤝",
         id: 'TR_COINMARKET_KYC_YES_REFUND',
     },
     TR_COINMARKET_KYC_NO_KYC: {
@@ -1603,20 +1408,28 @@ export default defineMessages({
         id: 'TR_COINMARKET_DCA_DOWNLOAD',
     },
     TR_COINMARKET_BUY_AND_SELL: {
-        defaultMessage: 'Buy & sell',
+        defaultMessage: 'Buy & Sell',
         id: 'TR_COINMARKET_BUY_AND_SELL',
     },
     TR_COINMARKET_SWAP: {
         defaultMessage: 'Swap',
         id: 'TR_COINMARKET_SWAP',
     },
+    TR_COINMARKET_TRANS_ID: {
+        defaultMessage: 'Trans. ID:',
+        id: 'TR_COINMARKET_TRANS_ID',
+    },
+    TR_COINMARKET_VIEW_DETAILS: {
+        defaultMessage: 'View details',
+        id: 'TR_COINMARKET_VIEW_DETAILS',
+    },
     TR_ADDRESS_MODAL_CLIPBOARD: {
         defaultMessage: 'Copy address',
         id: 'TR_ADDRESS_MODAL_CLIPBOARD',
     },
-    TR_COPY_TO_CLIPBOARD_TX_ID: {
+    TR_COPY_TO_CLIPBOARD: {
         defaultMessage: 'Copy',
-        id: 'TR_COPY_TO_CLIPBOARD_TX_ID',
+        id: 'TR_COPY_TO_CLIPBOARD',
     },
     TR_ADDRESS_MODAL_TITLE: {
         defaultMessage: '{networkName} receive address',
@@ -1716,7 +1529,7 @@ export default defineMessages({
     },
     TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION: {
         defaultMessage:
-            "Trezor Suite automatically downloads the latest version in the background and installs it when restarting the app. This ensures you're always up-to-date with the latest features and security patches. Updates occur without requiring your permission.",
+            "Automatically download the latest version of Trezor Suite in the background and install it when restarting the app. This ensures you're always up-to-date with the latest features and security patches. Updates occur without requiring your permission.",
         id: 'TR_ALLOW_AUTOMATIC_SUITE_UPDATES_DESCRIPTION',
     },
     TR_ADDRESS_DISPLAY: {
@@ -1761,9 +1574,8 @@ export default defineMessages({
         defaultMessage: 'Connection lost',
         id: 'TR_CONNECTION_LOST',
     },
-
     TR_UPGRADE_FIRMWARE_TO_DISCOVER_ACCOUNT_ERROR: {
-        defaultMessage: 'Upgrade firmware to discover this account. (See the blue banner above.)',
+        defaultMessage: 'Upgrade your firmware to access this account. See the blue banner above.',
         id: 'TR_UPGRADE_FIRMWARE_TO_DISCOVER_ACCOUNT_ERROR',
     },
     TR_DISCONNECT: {
@@ -1904,7 +1716,7 @@ export default defineMessages({
         defaultMessage: 'My backups',
         id: 'TR_MULTI_SHARE_BACKUP_BACKUPS',
     },
-    TR_MULTI_SHARE_BACKUP_SUCCESS_LEFT_HEADER: {
+    TR_MULTI_SHARE_BACKUP_SUCCESS_LEFT: {
         defaultMessage: 'My previous backup',
         id: 'TR_MULTI_SHARE_BACKUP_SUCCESS_LEFT',
     },
@@ -1916,7 +1728,7 @@ export default defineMessages({
         defaultMessage: 'Store securely, separate from your new wallet backup',
         id: 'TR_MULTI_SHARE_BACKUP_SUCCESS_LEFT_LINE2',
     },
-    TR_MULTI_SHARE_BACKUP_SUCCESS_RIGHT_HEADER: {
+    TR_MULTI_SHARE_BACKUP_SUCCESS_RIGHT: {
         defaultMessage: 'My new Multi-share Backup',
         id: 'TR_MULTI_SHARE_BACKUP_SUCCESS_RIGHT',
     },
@@ -2034,11 +1846,11 @@ export default defineMessages({
         id: 'TR_CHECK_FOR_DEVICES',
     },
     TR_CHECK_RECOVERY_SEED: {
-        defaultMessage: 'Check backup',
+        defaultMessage: 'Check wallet backup',
         id: 'TR_CHECK_RECOVERY_SEED',
     },
     TR_CHECK_SEED: {
-        defaultMessage: 'Check backup',
+        defaultMessage: 'Check wallet backup',
         id: 'TR_CHECK_SEED',
     },
     TR_CHECK_YOUR_DEVICE: {
@@ -2100,10 +1912,27 @@ export default defineMessages({
             'Confirm empty Passphrase wallet passphrase source on "{deviceLabel}" device.',
         id: 'TR_CONFIRM_PASSPHRASE_SOURCE',
     },
+    TR_PASSPHRASE_NON_ASCII_CHARS: {
+        defaultMessage:
+            'We recommend using <code>ABC</code>, <code>abc</code>, <code>123</code>, <code>spaces</code> or <code>these special characters</code>',
+        id: 'TR_PASSPHRASE_NON_ASCII_CHARS',
+    },
+    TR_PASSPHRASE_NON_ASCII_CHARS_WARNING: {
+        defaultMessage: 'Use of unlisted special characters may impact future compatibility.',
+        id: 'TR_PASSPHRASE_NON_ASCII_CHARS_WARNING',
+    },
     TR_CONFIRMED_TX: {
         defaultMessage: 'Confirmed',
         id: 'TR_CONFIRMED_TX',
     },
+    TR_NON_ASCII_CHAR: {
+        defaultMessage: '{label} (with non-recommended "{char}")',
+        id: 'TR_NON_ASCII_CHAR',
+    },
+    TR_NON_ASCII_CHARS: {
+        defaultMessage: '{label} (with non-recommended characters)',
+        id: 'TR_NON_ASCII_CHARS',
+    },
     TR_CONNECT_YOUR_DEVICE: {
         defaultMessage: 'Connect & unlock your Trezor',
         description: 'Prompt to user to connect his device.',
@@ -2120,7 +1949,7 @@ export default defineMessages({
         id: 'TR_CONNECTED',
     },
     TR_CONTACT_SUPPORT: {
-        defaultMessage: 'Contact support',
+        defaultMessage: 'Contact Trezor Support',
         description: 'Button to click to contact support',
         id: 'TR_CONTACT_SUPPORT',
     },
@@ -2356,7 +2185,7 @@ export default defineMessages({
         id: 'TR_SAFETY_CHECKS_PROMPT_LEVEL',
     },
     TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING: {
-        defaultMessage: "Do not change this unless you know what you're doing!",
+        defaultMessage: "Only change this if you know what you're doing!",
         id: 'TR_SAFETY_CHECKS_PROMPT_LEVEL_WARNING',
     },
     TR_SAFETY_CHECKS_PROMPT_LEVEL_DESC: {
@@ -2437,7 +2266,7 @@ export default defineMessages({
     },
     TR_SECURITY_CHECK_HOLOGRAM: {
         defaultMessage:
-            "Please note that device packaging, including holograms and security seals, have been updated over time. You can verify packaging details <packaging>here</packaging>. Ensure that your device was purchased from either the official Trezor Shop or from one of <reseller>our trusted sellers</reseller>. Otherwise, there's a risk that your device might be a counterfeit. If you suspect that your device is not genuine, please  <support>contact Trezor support</support>.",
+            "Please note that device packaging, including holograms and security seals, have been updated over time. You can verify packaging details <packaging>here</packaging>. Ensure that your device was purchased from either the official Trezor Shop or from one of <reseller>our trusted sellers</reseller>. Otherwise, there's a risk that your device might be a counterfeit. If you suspect that your device is not genuine, please  <support>contact Trezor Support</support>.",
         id: 'TR_SECURITY_CHECK_HOLOGRAM',
     },
     TR_DISCONNECT_YOUR_DEVICE: {
@@ -2653,10 +2482,20 @@ export default defineMessages({
         defaultMessage: 'Skip PIN',
         id: 'TR_SKIP_PIN',
     },
+    TR_SKIP_PIN_DESCRIPTION: {
+        defaultMessage:
+            'A device PIN prevents unauthorized access to your Trezor. Without it, anyone with your device can access your funds.',
+        id: 'TR_SKIP_PIN_DESCRIPTION',
+    },
     TR_SKIP_BACKUP: {
         defaultMessage: 'Skip Backup',
         id: 'TR_SKIP_BACKUP',
     },
+    TR_SKIP_BACKUP_DESCRIPTION: {
+        defaultMessage:
+            'A wallet backup lets you recover your funds if your Trezor is lost, stolen, or damaged. Without a backup, you could lose access to your crypto permanently.',
+        id: 'TR_SKIP_BACKUP_DESCRIPTION',
+    },
     TR_DONT_SKIP: {
         defaultMessage: "Don't skip",
         id: 'TR_DONT_SKIP',
@@ -2840,7 +2679,7 @@ export default defineMessages({
     TR_LOG_DESCRIPTION: {
         id: 'TR_LOG_DESCRIPTION',
         defaultMessage:
-            'The log contains all necessary technical information about Trezor Suite. It may be needed when connecting with Trezor Support.',
+            'This log contains essential technical information about Trezor Suite and may be needed when contacting Trezor Support.',
     },
     TR_LTC_ADDRESS_INFO: {
         defaultMessage:
@@ -2962,6 +2801,10 @@ export default defineMessages({
         defaultMessage: 'BNB Smart Chain',
         id: 'TR_NETWORK_BNB',
     },
+    TR_NETWORK_OP: {
+        defaultMessage: 'Optimism',
+        id: 'TR_NETWORK_OP',
+    },
     TR_NETWORK_LITECOIN: {
         defaultMessage: 'Litecoin',
         id: 'TR_NETWORK_LITECOIN',
@@ -3035,10 +2878,6 @@ export default defineMessages({
         defaultMessage: 'New Trezor Bridge is available.',
         id: 'TR_NEW_TREZOR_BRIDGE_IS_AVAILABLE',
     },
-    TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT: {
-        defaultMessage: 'New Trezor firmware is available! Update your device now.',
-        id: 'TR_NEW_TREZOR_FIRMWARE_IS_AVAILABLE_DOT',
-    },
     TR_NO_PASSPHRASE_WALLET: {
         defaultMessage: 'Standard wallet',
         id: 'TR_NO_PASSPHRASE_WALLET',
@@ -3140,7 +2979,7 @@ export default defineMessages({
         id: 'TR_PLEASE_ALLOW_YOUR_CAMERA',
     },
     TR_PLEASE_CONNECT_YOUR_DEVICE: {
-        defaultMessage: 'Please connect your device to continue with the verification process.',
+        defaultMessage: 'Connect your Trezor to continue with the verification process.',
         id: 'TR_PLEASE_CONNECT_YOUR_DEVICE',
     },
     TR_PLEASE_ENABLE_PASSPHRASE: {
@@ -3233,10 +3072,6 @@ export default defineMessages({
         defaultMessage: 'Retrying..',
         id: 'TR_RETRYING_DOT_DOT',
     },
-    TR_QR_CODE: {
-        defaultMessage: 'QR code',
-        id: 'TR_QR_CODE',
-    },
     TR_SCAN_QR_CODE: {
         defaultMessage: 'Scan QR code',
         description: 'Title for the Scan QR modal dialog',
@@ -3405,7 +3240,7 @@ export default defineMessages({
         id: 'TR_SUITE_VERSION',
     },
     TR_SWITCH_DEVICE: {
-        defaultMessage: 'Switch Device',
+        defaultMessage: 'Switch device',
         id: 'TR_SWITCH_DEVICE',
     },
     TR_TAKE_ME_BACK_TO_WALLET: {
@@ -3443,7 +3278,7 @@ export default defineMessages({
     },
     TR_ADDRESS_PHISHING_WARNING: {
         defaultMessage:
-            'To prevent phishing attacks, you should verify the address on your Trezor. {claim}',
+            'To prevent phishing attacks, verify the receive address on your Trezor. {claim}',
         id: 'TR_ADDRESS_PHISHING_WARNING',
     },
     TR_XPUB_PHISHING_WARNING: {
@@ -3468,7 +3303,7 @@ export default defineMessages({
         id: 'TR_TRANSACTION_DETAILS',
     },
     TR_NO_TRANSPORT: {
-        defaultMessage: "Browser can't communicate with device",
+        defaultMessage: "Your browser can't communicate with your device",
         description: '',
         id: 'TR_NO_TRANSPORT',
     },
@@ -3740,12 +3575,12 @@ export default defineMessages({
         defaultMessage:
             'The current and most widely accepted method of generating and managing Solana addresses ensures interoperability, security, and support for SOL and SPL tokens.',
     },
-    TR_ACCOUNT_TYPE_NORMAL_CARDANO_DESC: {
+    TR_ACCOUNT_TYPE_CARDANO_DESC: {
         id: 'TR_ACCOUNT_TYPE_CARDANO_DESC',
         defaultMessage:
             'The current and most widely accepted method of generating and managing Cardano addresses ensures interoperability, security, and support for all types of tokens.',
     },
-    TR_ACCOUNT_TYPE_NORMAL_XRP_DESC: {
+    TR_ACCOUNT_TYPE_XRP_DESC: {
         id: 'TR_ACCOUNT_TYPE_XRP_DESC',
         defaultMessage:
             'XRP is a digital currency that enables fast, low-cost cross-border payments without relying on traditional mining, using a consensus ledger for quick transaction confirmations.',
@@ -3843,9 +3678,14 @@ export default defineMessages({
         id: 'TOAST_QR_INCORRECT_COIN_SCHEME_PROTOCOL',
         defaultMessage: 'QR code is defined for {coin} account',
     },
+    TOAST_QR_UNKNOWN_SCHEME_PROTOCOL: {
+        id: 'TOAST_QR_UNKNOWN_SCHEME_PROTOCOL',
+        defaultMessage:
+            'Unknown protocol scheme: "{scheme}". Try again or enter the address manually.',
+    },
     TOAST_COIN_SCHEME_PROTOCOL: {
         id: 'TOAST_COIN_SCHEME_PROTOCOL',
-        describe: 'Required for current notifications. Do not change.',
+        description: 'Required for current notifications. Do not change.',
         defaultMessage: '{header}{body}',
     },
     TOAST_COIN_SCHEME_PROTOCOL_ACTION: {
@@ -3878,11 +3718,11 @@ export default defineMessages({
     },
     TOAST_BACKUP_FAILED: {
         id: 'TOAST_BACKUP_FAILED',
-        defaultMessage: 'Backup failed',
+        defaultMessage: 'Wallet backup failed',
     },
     TOAST_BACKUP_SUCCESS: {
         id: 'TOAST_BACKUP_SUCCESS',
-        defaultMessage: 'Backup successful',
+        defaultMessage: 'Wallet backup successful',
     },
     TOAST_SETTINGS_APPLIED: {
         id: 'TOAST_SETTINGS_APPLIED',
@@ -4040,6 +3880,10 @@ export default defineMessages({
         id: 'TR_QUICK_ACTION_TOOLTIP_UPDATE_AVAILABLE',
         defaultMessage: 'Update available ({newVersion})',
     },
+    TR_QUICK_ACTION_TOOLTIP_DEVICE_DISCONNECTED: {
+        id: 'TR_QUICK_ACTION_TOOLTIP_DEVICE_DISCONNECTED',
+        defaultMessage: 'Device disconnected',
+    },
     TR_QUICK_ACTION_TOOLTIP_RESTART_TO_UPDATE: {
         id: 'TR_QUICK_ACTION_TOOLTIP_RESTART_TO_UPDATE',
         defaultMessage: 'Restart to update',
@@ -4048,6 +3892,34 @@ export default defineMessages({
         id: 'TR_QUICK_ACTION_TOOLTIP_JUST_UPDATED',
         defaultMessage: 'Just updated ({currentVersion})',
     },
+    TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE: {
+        id: 'TR_QUICK_ACTION_UPDATE_POPOVER_APP_UPDATE_AVAILABLE',
+        defaultMessage: 'Trezor Suite update now available',
+    },
+    TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED: {
+        id: 'TR_QUICK_ACTION_UPDATE_POPOVER_APP_HAS_BEEN_UPDATED',
+        defaultMessage: "Trezor Suite's been updated.",
+    },
+    TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED: {
+        id: 'TR_QUICK_ACTION_UPDATE_POPOVER_APP_DOWNLOADED',
+        defaultMessage: 'Trezor Suite downloaded a new update.',
+    },
+    TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE: {
+        id: 'TR_QUICK_ACTION_UPDATE_POPOVER_TREZOR_UPDATE_AVAILABLE',
+        defaultMessage: 'Trezor update now available',
+    },
+    TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE: {
+        id: 'TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_START_UPDATE',
+        defaultMessage: 'Start update',
+    },
+    TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE: {
+        id: 'TR_QUICK_ACTION_UPDATE_POPOVER_CLICK_TO_RESTART_AND_UPDATE',
+        defaultMessage: 'Restart & update',
+    },
+    TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW: {
+        id: 'TR_QUICK_ACTION_UPDATE_POPOVER_WHATS_NEW',
+        defaultMessage: 'What’s new?',
+    },
     TR_QUICK_ACTION_DEBUG_EAP_EXPERIMENTAL_ENABLED: {
         id: 'TR_QUICK_ACTION_DEBUG_EAP_EXPERIMENTAL_ENABLED',
         defaultMessage: 'Enabled',
@@ -4212,7 +4084,7 @@ export default defineMessages({
     TR_TOR_KEEP_RUNNING_FOR_COIN_JOIN_SUBTITLE: {
         id: 'TR_TOR_KEEP_RUNNING_FOR_COIN_JOIN_SUBTITLE',
         defaultMessage:
-            "Please select 'Keep running Tor' to continue or 'Stop Tor' to quit the coinjoin process.",
+            'Please select "Keep running Tor" to continue or "Stop Tor" to quit the coinjoin process.',
     },
     TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_LEAVE: {
         id: 'TR_TOR_REQUEST_ENABLE_FOR_COIN_JOIN_LEAVE',
@@ -4293,24 +4165,18 @@ export default defineMessages({
             "Enter the words from your wallet backup here in the order displayed on your device. You may be asked to type some words that aren't part of your wallet backup as an additional security measure.",
         dynamic: true,
     },
-    TR_CHECK_RECOVERY_SEED_DESC_T2T1: {
-        id: 'TR_CHECK_RECOVERY_SEED_DESC_T2T1',
+    TR_CHECK_RECOVERY_SEED_DESC_T3B1: {
+        id: 'TR_CHECK_RECOVERY_SEED_DESC_T3B1',
         defaultMessage:
-            'Your wallet backup is entered using the touchscreen. This avoids exposing any of your sensitive information to a potentially insecure computer or web browser.',
+            "Use the two-button pad to enter your wallet backup. By doing this, you're keeping all your sensitive info safe and sound, away from any shady or insecure computer or web browser.",
         dynamic: true,
     },
-    TR_CHECK_RECOVERY_SEED_DESC_T3T1: {
-        id: 'TR_CHECK_RECOVERY_SEED_DESC_T3T1',
+    TR_CHECK_RECOVERY_SEED_DESC_TOUCHSCREEN: {
+        id: 'TR_CHECK_RECOVERY_SEED_DESC_TOUCHSCREEN',
         defaultMessage:
             'Your wallet backup is entered using the touchscreen. This avoids exposing any of your sensitive information to a potentially insecure computer or web browser.',
         dynamic: true,
     },
-    TR_CHECK_RECOVERY_SEED_DESC_T2B1: {
-        id: 'TR_CHECK_RECOVERY_SEED_DESC_T2B1',
-        defaultMessage:
-            "Use the two-button pad to enter your wallet backup. By doing this, you're keeping all your sensitive info safe and sound, away from any shady or insecure computer or web browser.",
-        dynamic: true,
-    },
     TR_SELECT_NUMBER_OF_WORDS: {
         id: 'TR_SELECT_NUMBER_OF_WORDS',
         defaultMessage: 'Select the number of words in your wallet backup',
@@ -4504,7 +4370,7 @@ export default defineMessages({
     RECEIVE_DESC_BITCOIN: {
         id: 'RECEIVE_DESC_BITCOIN',
         defaultMessage:
-            'To receive any funds you need to get a fresh receive address. It is advised to always use a fresh address, as this prevents anyone else from tracking your transactions. You can reuse an address, but we recommend not doing so unless absolutely necessary.',
+            "To receive any funds you need to get a fresh receive address. It's advised to always use a fresh address, as this prevents anyone else from tracking your transactions. You can reuse an address, but we recommend not doing so unless absolutely necessary.",
     },
     RECEIVE_DESC_ETHEREUM: {
         id: 'RECEIVE_DESC_ETHEREUM',
@@ -4618,22 +4484,6 @@ export default defineMessages({
         defaultMessage:
             'This is the specific alphanumeric address that will receive your coins. Verify this address on your Trezor.',
     },
-    TR_TRADE_ENTER_COIN: {
-        id: 'TR_TRADE_ENTER_COIN',
-        defaultMessage: 'Enter crypto name or symbol...',
-    },
-    TR_TRADE_BUYS: {
-        id: 'TR_TRADE_BUYS',
-        defaultMessage: 'buys',
-    },
-    TR_TRADE_SELLS: {
-        id: 'TR_TRADE_SELLS',
-        defaultMessage: 'sells',
-    },
-    TR_TRADE_EXCHANGES: {
-        id: 'TR_TRADE_EXCHANGES',
-        defaultMessage: 'exchanges',
-    },
     TR_PAYMENT_METHOD_CREDITCARD: {
         id: 'TR_PAYMENT_METHOD_CREDITCARD',
         defaultMessage: 'Credit Card',
@@ -4832,7 +4682,7 @@ export default defineMessages({
     TR_DISABLE_WEBUSB_TRY_BRIDGE: {
         id: 'TR_DISABLE_WEBUSB_TRY_BRIDGE',
         defaultMessage: 'Disable WebUSB and use Bridge',
-        describe:
+        description:
             'Bridge is a communication deamon that some users will need to download and install. So word bridge should not be translated.',
     },
     TR_YOUR_DEVICE_IS_SEEDLESS: {
@@ -4841,7 +4691,7 @@ export default defineMessages({
     },
     TR_DEVICE_NOT_INITIALIZED: {
         id: 'TR_DEVICE_NOT_INITIALIZED',
-        defaultMessage: 'Trezor is not set up',
+        defaultMessage: "Trezor isn't set up",
         description:
             'Device not initialized means that it has no cryptographic secret lives in it and it must be either recovered from seed or newly generated.',
     },
@@ -4959,7 +4809,7 @@ export default defineMessages({
     },
     TR_GO_TO_SUITE: {
         id: 'TR_GO_TO_SUITE',
-        defaultMessage: 'Access Suite',
+        defaultMessage: 'Go to Trezor Suite',
     },
     TR_ONBOARDING_CREATE_NEW_WALLET: {
         id: 'TR_ONBOARDING_CREATE_NEW_WALLET',
@@ -5129,15 +4979,6 @@ export default defineMessages({
         defaultMessage:
             'For experienced users only. Use at your own risk. These features are in testing, may be unstable, and might not have long-term support.',
     },
-    TR_EXPERIMENTAL_BNB_SMART_CHAIN: {
-        id: 'TR_EXPERIMENTAL_BNB_SMART_CHAIN',
-        defaultMessage: 'BNB Smart Chain',
-    },
-    TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON: {
-        id: 'TR_EXPERIMENTAL_BNB_SMART_CHAIN_DESCRIPTON',
-        defaultMessage:
-            'Enables the BNB Smart Chain network but without internal transaction data history.',
-    },
     TR_EXPERIMENTAL_PASSWORD_MANAGER: {
         id: 'TR_EXPERIMENTAL_PASSWORD_MANAGER',
         defaultMessage: 'Migrate Dropbox passwords',
@@ -5145,7 +4986,7 @@ export default defineMessages({
     TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION: {
         id: 'TR_EXPERIMENTAL_PASSWORD_MANAGER_DESCRIPTION',
         defaultMessage:
-            'A utility for retrieving passwords stored on Dropbox and secured by Trezor. Designed for previous Chrome extension users of Trezor Password Manager.',
+            'Use this utility to retrieve passwords stored on Dropbox and secured by Trezor. Designed for former users of the Trezor Password Manager Chrome extension.',
     },
     TR_EXPERIMENTAL_TOR_SNOWFLAKE: {
         id: 'TR_EXPERIMENTAL_TOR_SNOWFLAKE',
@@ -5154,16 +4995,7 @@ export default defineMessages({
     TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION: {
         id: 'TR_EXPERIMENTAL_TOR_SNOWFLAKE_DESCRIPTION',
         defaultMessage:
-            'Tor Snowflake is a system that allows access to censored websites and apps.',
-    },
-    TR_EXPERIMENTAL_AUTOMATIC_UPDATE: {
-        id: 'TR_EXPERIMENTAL_AUTOMATIC_UPDATE',
-        defaultMessage: 'Automatic Trezor Suite updates',
-    },
-    TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION: {
-        id: 'TR_EXPERIMENTAL_AUTOMATIC_UPDATE_DESCRIPTION',
-        defaultMessage:
-            "Trezor Suite automatically downloads the latest version in the background and installs it when restarting the app. This ensures you're always up-to-date with the latest features and security patches. Updates occur without requiring your permission.",
+            'Access censored websites and apps using Tor Snowflake, a system designed to bypass restrictions.',
     },
     TR_EARLY_ACCESS: {
         id: 'TR_EARLY_ACCESS',
@@ -5215,7 +5047,7 @@ export default defineMessages({
     TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK: {
         id: 'TR_EARLY_ACCESS_ENABLE_CONFIRM_CHECK',
         defaultMessage:
-            'I understand this allows me to test pre-release software, which may contain errors that affect the normal operation of Suite.',
+            'I understand this allows me to test pre-release software, which may contain errors that affect the normal operation of Trezor Suite.',
     },
     TR_EARLY_ACCESS_ENABLE_CONFIRM_TOOLTIP: {
         id: 'TR_EARLY_ACCESS_ENABLE_CONFIRM_TOOLTIP',
@@ -5245,7 +5077,7 @@ export default defineMessages({
     TR_EARLY_ACCESS_LEFT_DESCRIPTION: {
         id: 'TR_EARLY_ACCESS_LEFT_DESCRIPTION',
         defaultMessage:
-            'To downgrade to the latest stable release of Suite, please click "Download stable" and reinstall the app.',
+            'To downgrade to the latest stable release of Trezor Suite, click "Download stable" and reinstall the app.',
     },
     TR_EARLY_ACCESS_SKIP_REINSTALL: {
         id: 'TR_EARLY_ACCESS_SKIP_REINSTALL',
@@ -5311,21 +5143,21 @@ export default defineMessages({
     },
     BACKUP_BACKUP_ALREADY_FINISHED_HEADING: {
         id: 'BACKUP_BACKUP_ALREADY_FINISHED_HEADING',
-        defaultMessage: 'Backup already finished',
+        defaultMessage: 'Wallet backup already finished',
     },
     BACKUP_BACKUP_ALREADY_FINISHED_DESCRIPTION: {
         id: 'BACKUP_BACKUP_ALREADY_FINISHED_DESCRIPTION',
         defaultMessage:
-            'Connected device has already been backed up. You should have the wallet backup written down and hidden in a safe place.',
+            'The connected device already has a wallet backup. You should have the wallet backup written down and hidden in a safe place.',
     },
     BACKUP_BACKUP_ALREADY_FAILED_HEADING: {
         id: 'BACKUP_BACKUP_ALREADY_FAILED_HEADING',
-        defaultMessage: 'Backup failed',
+        defaultMessage: 'Wallet backup failed',
     },
     BACKUP_BACKUP_ALREADY_FAILED_DESCRIPTION: {
         id: 'BACKUP_BACKUP_ALREADY_FAILED_DESCRIPTION',
         defaultMessage:
-            'A previous attempt to backup this device failed. Device backup may be done only once.',
+            'A previous attempt to backup this device failed. Wallet backup may be done only once.',
     },
     DISCONNECT_DEVICE_DESCRIPTION: {
         id: 'DISCONNECT_DEVICE_DESCRIPTION',
@@ -5359,13 +5191,13 @@ export default defineMessages({
         id: 'IMAGE_VALIDATION_ERROR_INVALID_DIMENSIONS',
         defaultMessage: 'Invalid dimensions (Image must be {width} x {height} px)',
     },
-    IMAGE_VALIDATION_ERROR_INVALID_SIZE: {
+    IMAGE_VALIDATION_ERROR_INVALID_SIZE_JPG: {
         id: 'IMAGE_VALIDATION_ERROR_INVALID_SIZE_JPG',
         defaultMessage: 'Invalid size (Image must be less than 16KB)',
     },
     IMAGE_VALIDATION_ERROR_PROGRESSIVE_JPG: {
         id: 'IMAGE_VALIDATION_ERROR_PROGRESSIVE_JPG',
-        defaultMessage: 'Progressive JPG image format is not supported.',
+        defaultMessage: "Progressive JPG image format isn't supported.",
     },
     IMAGE_VALIDATION_ERROR_UNEXPECTED_ALPHA: {
         id: 'IMAGE_VALIDATION_ERROR_UNEXPECTED_ALPHA',
@@ -5518,11 +5350,11 @@ export default defineMessages({
         defaultMessage: 'Add Recipient',
     },
     RECIPIENT_IS_NOT_SET: {
-        defaultMessage: 'Address is not set',
+        defaultMessage: "Address isn't set",
         id: 'RECIPIENT_IS_NOT_SET',
     },
     RECIPIENT_IS_NOT_VALID: {
-        defaultMessage: 'Address is not valid',
+        defaultMessage: "Address isn't valid",
         id: 'RECIPIENT_IS_NOT_VALID',
     },
     RECIPIENT_REQUIRES_UPDATE: {
@@ -5558,16 +5390,20 @@ export default defineMessages({
         defaultMessage: 'Not enough funds',
         id: 'AMOUNT_IS_NOT_ENOUGH',
     },
+    AMOUNT_EXCEEDS_MAX: {
+        defaultMessage: 'The amount exceeds the maximum allowed value of {maxAmount}.',
+        id: 'AMOUNT_EXCEEDS_MAX',
+    },
     AMOUNT_IS_NOT_IN_RANGE_DECIMALS: {
         defaultMessage: 'Maximum {decimals} decimals allowed',
         id: 'AMOUNT_IS_NOT_IN_RANGE_DECIMALS',
     },
     AMOUNT_IS_NOT_INTEGER: {
-        defaultMessage: 'Amount is not an integer',
+        defaultMessage: "Amount isn't an integer",
         id: 'AMOUNT_IS_NOT_INTEGER',
     },
     AMOUNT_IS_NOT_SET: {
-        defaultMessage: 'Amount is not set',
+        defaultMessage: "Amount isn't set",
         id: 'AMOUNT_IS_NOT_SET',
     },
     AMOUNT_IS_TOO_LOW: {
@@ -5627,11 +5463,11 @@ export default defineMessages({
     },
     LOCKTIME_IS_NOT_SET: {
         id: 'LOCKTIME_IS_NOT_SET',
-        defaultMessage: 'Locktime not set',
+        defaultMessage: "Locktime isn't set",
     },
     LOCKTIME_IS_NOT_INTEGER: {
         id: 'LOCKTIME_IS_NOT_INTEGER',
-        defaultMessage: 'Locktime is not an integer',
+        defaultMessage: "Locktime isn't an integer",
     },
     LOCKTIME_IS_TOO_LOW: {
         id: 'LOCKTIME_IS_TOO_LOW',
@@ -5661,15 +5497,15 @@ export default defineMessages({
             'Destination tag is a unique code to identify the receiver of a transaction.',
     },
     DESTINATION_TAG_NOT_SET: {
-        defaultMessage: 'Destination tag is not set',
+        defaultMessage: "Destination tag isn't set",
         id: 'DESTINATION_TAG_NOT_SET',
     },
     DESTINATION_TAG_IS_NOT_VALID: {
-        defaultMessage: 'Destination tag is not valid',
+        defaultMessage: "Destination tag isn't valid",
         id: 'DESTINATION_TAG_IS_NOT_VALID',
     },
     DESTINATION_TAG_IS_NOT_NUMBER: {
-        defaultMessage: 'Destination tag is not a number',
+        defaultMessage: "Destination tag isn't a number",
         id: 'DESTINATION_TAG_IS_NOT_NUMBER',
     },
     DATA_ETH: {
@@ -5720,7 +5556,7 @@ export default defineMessages({
     REVIEW_AND_SEND_TRANSACTION: {
         id: 'REVIEW_AND_SEND_TRANSACTION',
         description: 'Sign and send button used in send form',
-        defaultMessage: 'Review & Send',
+        defaultMessage: 'Review & send',
     },
     TR_CONNECT_TREZOR_TO_SEND_BUTTON: {
         id: 'TR_CONNECT_TREZOR_TO_SEND_BUTTON',
@@ -6295,6 +6131,10 @@ export default defineMessages({
         id: 'TR_CHAINED_TXS',
         defaultMessage: 'Chained transactions',
     },
+    TR_DATA: {
+        id: 'TR_DATA',
+        defaultMessage: 'Data',
+    },
     TR_AFFECTED_TXS: {
         id: 'TR_AFFECTED_TXS',
         defaultMessage: 'This operation will remove the following transactions from the mempool',
@@ -6333,6 +6173,22 @@ export default defineMessages({
         id: 'TR_UPDATE_MODAL_AVAILABLE_HEADING',
         defaultMessage: 'Update available',
     },
+    TR_UPDATE_MODAL_WHATS_NEW: {
+        id: 'TR_UPDATE_MODAL_WHATS_NEW',
+        defaultMessage: 'What’s new?',
+    },
+    TR_UPDATE_MODAL_YOUR_VERSION: {
+        id: 'TR_UPDATE_MODAL_YOUR_VERSION',
+        defaultMessage: 'Your version: v{version}',
+    },
+    TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES: {
+        id: 'TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES',
+        defaultMessage: 'Enable automatic updates',
+    },
+    TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG: {
+        id: 'TR_UPDATE_MODAL_ENABLE_AUTO_UPDATES_NEW_TAG',
+        defaultMessage: 'New',
+    },
     TR_UPDATE_MODAL_NOT_NOW: {
         id: 'TR_UPDATE_MODAL_NOT_NOW',
         defaultMessage: 'Not now',
@@ -6363,11 +6219,12 @@ export default defineMessages({
     },
     TR_VERSION_HAS_BEEN_RELEASED: {
         id: 'TR_VERSION_HAS_BEEN_RELEASED',
-        defaultMessage: 'Version {version} has been released!',
+        defaultMessage: 'v{version} has released!',
     },
-    TR_CHANGELOG_ON_GITHUB: {
-        id: 'TR_CHANGELOG_ON_GITHUB',
-        defaultMessage: 'Changelog on GitHub',
+    TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE: {
+        id: 'TR_WERE_CONSTANTLY_WORKING_TO_IMPROVE',
+        defaultMessage:
+            'We’re always striving to enhance your Trezor experience. Here’s what’s new:',
     },
     TR_UPDATE_MODAL_UPDATE_DOWNLOADED: {
         id: 'TR_UPDATE_MODAL_UPDATE_DOWNLOADED',
@@ -6790,7 +6647,7 @@ export default defineMessages({
     },
     TR_GUIDE_SUPPORT: {
         id: 'TR_GUIDE_SUPPORT',
-        defaultMessage: 'Contact support',
+        defaultMessage: 'Contact Trezor Support',
     },
     TR_GUIDE_FORUM: {
         id: 'TR_GUIDE_FORUM',
@@ -6908,6 +6765,20 @@ export default defineMessages({
         id: 'TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_TOUCH',
         defaultMessage: 'Reconnect the device without touching the screen.',
     },
+    TR_DEVICE_CONNECTED_UNACQUIRED: {
+        id: 'TR_DEVICE_CONNECTED_UNACQUIRED',
+        defaultMessage: 'This device is being used elsewhere.',
+    },
+    TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION: {
+        id: 'TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION',
+        defaultMessage:
+            'The app {transportSessionOwner} may currently be using this device. You can take control of the device if needed.',
+    },
+    TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION_UNKNOWN_APP: {
+        id: 'TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION_UNKNOWN_APP',
+        defaultMessage:
+            'Another app may currently be using this device. You can take control of the device if needed.',
+    },
     TR_WIPE_OR_UPDATE: {
         id: 'TR_WIPE_OR_UPDATE',
         defaultMessage: 'Reset device or update firmware',
@@ -6970,7 +6841,7 @@ export default defineMessages({
         defaultMessage:
             "Contact Trezor Support to figure out what's going on with your device and what to do next.",
     },
-    TR_DEVICE_COMPROMISED_HEADING_SOFT: {
+    TR_PLAY_IT_SAFE: {
         id: 'TR_PLAY_IT_SAFE',
         defaultMessage: "Let's play it safe",
     },
@@ -6979,6 +6850,15 @@ export default defineMessages({
         defaultMessage:
             'We want to be sure that your device is in tip-top shape before you start using it. Reach out to Trezor Support to find out what to do next.',
     },
+    TR_DEVICE_MAYBE_COMPROMISED_HEADING: {
+        id: 'TR_DEVICE_MAYBE_COMPROMISED_HEADING',
+        defaultMessage: 'Device verification unsuccessful',
+    },
+    TR_DEVICE_MAYBE_COMPROMISED_TEXT: {
+        id: 'TR_DEVICE_MAYBE_COMPROMISED_TEXT',
+        defaultMessage:
+            "Reconnect your device and try verifying again. If the issue continues, contact Trezor Support to figure out what's going on with your device and what to do next.",
+    },
     TR_DISCONNECT_DEVICE: {
         id: 'TR_DISCONNECT_DEVICE',
         defaultMessage: 'Disconnect your device from your laptop or computer.',
@@ -6991,6 +6871,10 @@ export default defineMessages({
         id: 'TR_USE_CHAT',
         defaultMessage: 'Click below and use the <b>Chat</b> option on the next page.',
     },
+    TR_SEE_IF_ISSUE_PERSISTS: {
+        id: 'TR_SEE_IF_ISSUE_PERSISTS',
+        defaultMessage: 'See if issue persists.',
+    },
     TR_CONTACT_TREZOR_SUPPORT: {
         id: 'TR_CONTACT_TREZOR_SUPPORT',
         defaultMessage: 'Contact Trezor Support',
@@ -7098,21 +6982,21 @@ export default defineMessages({
     },
     TR_DEVICE_FIRMWARE_REVISION_CHECK_TITLE: {
         id: 'TR_DEVICE_FIRMWARE_REVISION_CHECK_TITLE',
-        defaultMessage: 'Turn off firmware revision check',
+        defaultMessage: 'Turn off firmware authenticity check',
     },
     TR_DEVICE_FIRMWARE_REVISION_CHECK_TITLE_DISABLED: {
         id: 'TR_DEVICE_FIRMWARE_REVISION_CHECK_TITLE_DISABLED',
-        defaultMessage: 'Turn on firmware revision check',
+        defaultMessage: 'Turn on firmware authenticity check',
     },
     TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION: {
         id: 'TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION',
         defaultMessage:
-            'Firmware revision check is a crucial security feature. We strongly recommend keeping it turned on.',
+            'Firmware authenticity check is a crucial security feature. We strongly recommend keeping it turned on.',
     },
     TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION_DISABLED: {
         id: 'TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION_DISABLED',
         defaultMessage:
-            'Firmware revision check is a crucial security feature. We strongly recommend keeping it turned on.',
+            'Firmware authenticity check is a crucial security feature. We strongly recommend keeping it turned on.',
     },
     TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON: {
         id: 'TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON',
@@ -7129,7 +7013,7 @@ export default defineMessages({
     TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_1: {
         id: 'TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_1',
         defaultMessage:
-            'Turn off the firmware revision check only if you fully understand the risks and have a valid reason. If unsure, contact Trezor Support for help.',
+            'Turn off the firmware authenticity check only if you fully understand the risks and have a valid reason. If unsure, contact Trezor Support for help.',
     },
     TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_2: {
         id: 'TR_DEVICE_FIRMWARE_REVISION_CHECK_MODAL_DESCRIPTION_2',
@@ -7143,16 +7027,25 @@ export default defineMessages({
     },
     TR_FIRMWARE_REVISION_CHECK_FAILED: {
         id: 'TR_FIRMWARE_REVISION_CHECK_FAILED',
-        defaultMessage: 'Firmware revision check failed. Your Trezor may be counterfeit.',
+        defaultMessage: 'Firmware authenticity check failed. Your Trezor may be counterfeit.',
     },
     TR_DEVICE_FIRMWARE_REVISION_CHECK_UNABLE_TO_PERFORM: {
         id: 'TR_DEVICE_FIRMWARE_REVISION_CHECK_UNABLE_TO_PERFORM',
         defaultMessage:
-            "Firmware revision check couldn't be performed. Go online to verify your firmware version.",
+            "Firmware authenticity check couldn't be performed. Go online to verify your firmware version.",
     },
     TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR: {
         id: 'TR_FIRMWARE_REVISION_CHECK_OTHER_ERROR',
-        defaultMessage: "Couldn't perform firmware revision check.",
+        defaultMessage: "Couldn't perform firmware authenticity check.",
+    },
+    TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH: {
+        id: 'TR_DEVICE_FIRMWARE_HASH_CHECK_HASH_MISMATCH',
+        defaultMessage: 'Firmware hash check failed. Your Trezor might be counterfeit.',
+    },
+    TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR: {
+        id: 'TR_DEVICE_FIRMWARE_HASH_CHECK_OTHER_ERROR',
+        defaultMessage:
+            "Firmware hash check couldn't be performed. Your Trezor might be counterfeit.",
     },
     TR_ONBOARDING_COINS_STEP: {
         id: 'TR_ONBOARDING_COINS_STEP',
@@ -7175,7 +7068,7 @@ export default defineMessages({
     TR_ONBOARDING_TROUBLESHOOTING_FAILED: {
         id: 'TR_ONBOARDING_TROUBLESHOOTING_FAILED',
         defaultMessage: 'Still not working?',
-        decription:
+        description:
             "If troubleshooting steps for connecting a device in Onboarding didn't do the trick there is at the end link to contact a support",
     },
     TR_STILL_DONT_SEE_YOUR_TREZOR: {
@@ -7215,7 +7108,7 @@ export default defineMessages({
         defaultMessage: 'Language, user count, etc.',
     },
     TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED: {
-        defaultMessage: 'Steps required to enable communication',
+        defaultMessage: 'Try these steps to solve this issue.',
         id: 'TR_TROUBLESHOOTING_DEVICE_NOT_DETECTED',
     },
     TR_TROUBLESHOOTING_TIP_BRIDGE_STATUS_TITLE: {
@@ -7232,9 +7125,18 @@ export default defineMessages({
     },
     TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION: {
         defaultMessage:
-            'Only Chromium-based browsers currently allow direct communication with USB devices',
+            'Only Chromium-based browsers currently allow direct communication with USB devices.',
         id: 'TR_TROUBLESHOOTING_TIP_BROWSER_WEBUSB_DESCRIPTION',
     },
+    TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_TITLE: {
+        defaultMessage: 'It appears that you may be using an older Trezor model.',
+        id: 'TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_TITLE',
+    },
+    TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_DESCRIPTION: {
+        defaultMessage:
+            'If you last updated your device firmware in 2019 or earlier, please follow the instructions in <a>the Knowledge Base</a>',
+        id: 'TR_TROUBLESHOOTING_TIP_UNREADABLE_HID_DESCRIPTION',
+    },
     TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE: {
         id: 'TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TITLE',
         defaultMessage: 'Use the Trezor Suite desktop app',
@@ -7243,6 +7145,15 @@ export default defineMessages({
         id: 'TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_DESCRIPTION',
         defaultMessage: 'Run the  <a>Trezor Suite</a> desktop app',
     },
+    TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_TITLE: {
+        id: 'TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_TITLE',
+        defaultMessage: 'Use another version of Trezor Bridge',
+    },
+    TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_DESCRIPTION: {
+        id: 'TR_TROUBLESHOOTING_TIP_SUITE_DESKTOP_TOGGLE_BRIDGE_DESCRIPTION',
+        defaultMessage:
+            '<a>Click to toggle</a> an alternative bridge implementation. Current version: ({currentVersion})',
+    },
     TR_TROUBLESHOOTING_TIP_UDEV_INSTALL_DESCRIPTION: {
         id: 'TR_TROUBLESHOOTING_TIP_UDEV_INSTALL_DESCRIPTION',
         defaultMessage:
@@ -7288,16 +7199,12 @@ export default defineMessages({
     },
     TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE: {
         id: 'TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_TITLE',
-        defaultMessage: 'Try restarting your computer',
+        defaultMessage: 'Restart your computer',
     },
     TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION: {
         id: 'TR_TROUBLESHOOTING_TIP_RESTART_COMPUTER_DESCRIPTION',
-        defaultMessage: 'Just in case',
-    },
-    TR_TROUBLESHOOTING_UNREADABLE_WEBUSB: {
-        id: 'TR_TROUBLESHOOTING_UNREADABLE_WEBUSB',
         defaultMessage:
-            "Your device is connected properly, but your browser can't communicate with it at the moment. You need to install Trezor Bridge.",
+            'Restarting your computer may fix the communication issue between your browser and device.',
     },
     TR_TROUBLESHOOTING_UNREADABLE_UDEV: {
         id: 'TR_TROUBLESHOOTING_UNREADABLE_UDEV',
@@ -7313,7 +7220,7 @@ export default defineMessages({
     },
     TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE: {
         id: 'TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_TITLE',
-        defaultMessage: 'Seedless setup is not supported by Trezor Suite',
+        defaultMessage: "Seedless setup isn't supported in Trezor Suite",
     },
     TR_VERIFYING_PIN: {
         id: 'TR_VERIFYING_PIN',
@@ -7330,11 +7237,7 @@ export default defineMessages({
     TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION: {
         id: 'TR_SEEDLESS_SETUP_IS_NOT_SUPPORTED_DESCRIPTION',
         defaultMessage:
-            "Devices set up in seedless mode can't access Trezor Suite. This is to avoid irreversible coin loss, which happens when using an improperly set up device for the wrong purpose.",
-    },
-    TR_DO_YOU_REALLY_WANT_TO_SKIP: {
-        id: 'TR_DO_YOU_REALLY_WANT_TO_SKIP',
-        defaultMessage: 'Skip this step?',
+            "Devices set up in seedless mode can't access Trezor Suite to prevent irreversible coin loss, which can occur if a device is used incorrectly.",
     },
     TR_FORMAT: {
         id: 'TR_FORMAT',
@@ -7397,6 +7300,19 @@ export default defineMessages({
         id: 'TR_STAKING_WITHDRAW',
         defaultMessage: 'Withdraw',
     },
+    TR_STAKING_ESTIMATED_GAINS: {
+        id: 'TR_STAKING_ESTIMATED_GAINS',
+        defaultMessage: 'Estimated gains',
+    },
+    TR_STAKING_ONCE_YOU_CONFIRM: {
+        id: 'TR_STAKING_ONCE_YOU_CONFIRM',
+        defaultMessage: 'Once you confirm',
+    },
+    TR_STAKING_YOUR_EARNINGS: {
+        id: 'TR_STAKING_YOUR_EARNINGS',
+        defaultMessage:
+            'Your earnings are automatically restaked, allowing you to earn <a>compound interest</a>.',
+    },
     TR_STAKE_ON_EVERSTAKE: {
         id: 'TR_STAKE_ON_EVERSTAKE',
         defaultMessage: 'Stake {symbol} on Everstake?',
@@ -7481,7 +7397,7 @@ export default defineMessages({
         id: 'TR_STAKING_IS_NOT_SUPPORTED',
         defaultMessage: 'Staking is not supported on this network.',
     },
-    TR_STAKING_INSTANT_STAKING: {
+    TR_INSTANT_STAKING: {
         id: 'TR_INSTANT_STAKING',
         defaultMessage: 'Staked instantly',
     },
@@ -7493,7 +7409,7 @@ export default defineMessages({
         id: 'TR_STAKING_AMOUNT_UNSTAKED_INSTANTLY',
         defaultMessage: '{amount} {symbol} unstaked instantly!',
     },
-    TR_STAKING_INSTANT_UNSTAKING: {
+    TR_INSTANT_UNSTAKING: {
         id: 'TR_INSTANT_UNSTAKING',
         defaultMessage: 'Unstaked instantly',
     },
@@ -7502,11 +7418,31 @@ export default defineMessages({
         defaultMessage:
             "You've instantly staked {amount} {symbol}. {days, plural, =0 {} one {The remaining {symbol} will be staked within # day.} other { The remaining {symbol} will be staked within # days}}",
     },
-    TR_STAKING_INSTANTLY_UNSTAKED: {
+    TR_STAKE_INSTANTLY_UNSTAKED_WITH_DAYS: {
         id: 'TR_STAKE_INSTANTLY_UNSTAKED_WITH_DAYS',
         defaultMessage:
             'You received {amount} {symbol} "Instantly". {days, plural, =0 {} one {The rest will be payed out within # day.} other { The rest will be payed out within # days}}',
     },
+    TR_STAKING_GETTING_READY: {
+        id: 'TR_STAKING_GETTING_READY',
+        defaultMessage: 'Your {symbol} is getting ready to work',
+    },
+    TR_STAKING_REWARDS_ARE_RESTAKED: {
+        id: 'TR_STAKING_REWARDS_ARE_RESTAKED',
+        defaultMessage: 'Rewards are automatically restaked',
+    },
+    TR_STAKING_YOU_ARE_HERE: {
+        id: 'TR_STAKING_YOU_ARE_HERE',
+        defaultMessage: "You're here",
+    },
+    TR_STAKING_CONSOLIDATING_FUNDS: {
+        id: 'TR_STAKING_CONSOLIDATING_FUNDS',
+        defaultMessage: 'Consolidating your {symbol} for you',
+    },
+    TR_STAKING_YOUR_UNSTAKED_FUNDS: {
+        id: 'TR_STAKING_YOUR_UNSTAKED_FUNDS',
+        defaultMessage: 'Your unstaked {symbol} is ready',
+    },
     TR_RECEIVING_SYMBOL: {
         id: 'TR_RECEIVING_SYMBOL',
         defaultMessage:
@@ -7555,11 +7491,11 @@ export default defineMessages({
     },
     TR_ERROR_CARDANO_DELEGATE: {
         id: 'TR_ERROR_CARDANO_DELEGATE',
-        defaultMessage: 'Amount is not enough',
+        defaultMessage: "Amount isn't enough",
     },
     TR_ERROR_CARDANO_WITHDRAWAL: {
         id: 'TR_ERROR_CARDANO_WITHDRAWAL',
-        defaultMessage: 'Amount is not enough',
+        defaultMessage: "Amount isn't enough",
     },
     TR_ACCOUNT_TYPE_SHELLEY_DESC: {
         id: 'TR_ACCOUNT_TYPE_SHELLEY_DESC',
@@ -7578,10 +7514,6 @@ export default defineMessages({
         id: 'TR_EXCEEDS_MAX',
         defaultMessage: 'Exceeds max length',
     },
-    TR_ABORT: {
-        id: 'TR_ABORT',
-        defaultMessage: 'Abort',
-    },
     FAILED_TO_ENABLE_TOR: {
         id: 'FAILED_TO_ENABLE_TOR',
         defaultMessage: 'Failed to enable Tor',
@@ -7943,7 +7875,7 @@ export default defineMessages({
     TR_BREAKING_ANONYMITY_CHECKBOX: {
         id: 'TR_BREAKING_ANONYMITY_CHECKBOX',
         description: 'Checkbox in coinjoin send form',
-        defaultMessage: "I understand I'm damaging my anonymity",
+        defaultMessage: "I understand that I'm compromising my anonymity.",
     },
     TR_NOT_ENOUGH_ANONYMIZED_FUNDS_TOOLTIP: {
         id: 'TR_NOT_ENOUGH_ANONYMIZED_FUNDS_TOOLTIP',
@@ -8334,6 +8266,10 @@ export default defineMessages({
         id: 'TR_STEP',
         defaultMessage: 'Step {number}',
     },
+    TR_STEP_OF_TOTAL: {
+        id: 'TR_STEP_OF_TOTAL',
+        defaultMessage: 'Step {index} of {total}',
+    },
     TR_COINJOIN_STEP_1_TITLE: {
         id: 'TR_COINJOIN_STEP_1_TITLE',
         defaultMessage: 'Add bitcoin',
@@ -8443,7 +8379,7 @@ export default defineMessages({
         id: 'TR_DESKTOP_APP_PROMO_GET',
         defaultMessage: 'Get for desktop',
     },
-    TR_DESKTOP_APP_PROMO_TEXT_FOOTER: {
+    TR_MOBILE_APP_PROMO_TEXT: {
         id: 'TR_MOBILE_APP_PROMO_TEXT',
         defaultMessage: 'With more security features',
     },
@@ -8590,6 +8526,26 @@ export default defineMessages({
         defaultMessage:
             'You can only send {network} tokens to a <b>receive address on the {network} network</b>, otherwise your tokens <b>may be lost</b>.',
     },
+    TR_TX_DATA_METHOD_NAME: {
+        id: 'TR_TX_DATA_METHOD_NAME',
+        defaultMessage: 'Method name',
+    },
+    TR_TX_DATA_METHOD: {
+        id: 'TR_TX_DATA_METHOD',
+        defaultMessage: 'Input data',
+    },
+    TR_TX_DATA_FUNCTION: {
+        id: 'TR_TX_DATA_FUNCTION',
+        defaultMessage: 'Function',
+    },
+    TR_TX_DATA_PARAMS: {
+        id: 'TR_TX_DATA_PARAMS',
+        defaultMessage: 'Params',
+    },
+    TR_TX_DATA_INPUT_DATA: {
+        id: 'TR_TX_DATA_INPUT_DATA',
+        defaultMessage: 'Input data',
+    },
     TR_FROM: {
         id: 'TR_FROM',
         defaultMessage: 'From',
@@ -8751,6 +8707,11 @@ export default defineMessages({
         id: 'TR_STAKE_LEFT_AMOUNT_FOR_WITHDRAWAL',
         defaultMessage: 'We’ve left {amount} {symbol} out so you can pay for withdrawal fees.',
     },
+    TR_STAKE_LEFT_SMALL_AMOUNT_FOR_WITHDRAWAL: {
+        id: 'TR_STAKE_LEFT_SMALL_AMOUNT_FOR_WITHDRAWAL',
+        defaultMessage:
+            'We’ve left a small amount of {symbol} out so you can pay for withdrawal fees.',
+    },
     TR_STAKE_RECOMMENDED_AMOUNT_FOR_WITHDRAWALS: {
         id: 'TR_STAKE_RECOMMENDED_AMOUNT_FOR_WITHDRAWALS',
         defaultMessage:
@@ -8798,6 +8759,22 @@ export default defineMessages({
         id: 'TR_STAKE_APY',
         defaultMessage: 'Annual Percentage Yield',
     },
+    TR_STAKE_APY_ABBR: {
+        id: 'TR_STAKE_APY_ABBR',
+        defaultMessage: 'APY',
+    },
+    TR_STAKE_WEEKLY: {
+        id: 'TR_STAKE_WEEKLY',
+        defaultMessage: 'Weekly',
+    },
+    TR_STAKE_MONTHLY: {
+        id: 'TR_STAKE_MONTHLY',
+        defaultMessage: 'Monthly',
+    },
+    TR_STAKE_YEARLY: {
+        id: 'TR_STAKE_YEARLY',
+        defaultMessage: 'Yearly',
+    },
     TR_STAKE_DAYS: {
         id: 'TR_STAKE_DAYS',
         defaultMessage: '{count, plural, one {# day} other {# days}}',
@@ -8855,6 +8832,15 @@ export default defineMessages({
         id: 'TR_STAKE_UNSTAKING_PERIOD',
         defaultMessage: 'Unstaking period',
     },
+    TR_STAKE_UNSTAKING_APPROXIMATE: {
+        id: 'TR_STAKE_UNSTAKING_APPROXIMATE',
+        defaultMessage: 'Approximate amount of {symbol} available instantly.',
+    },
+    TR_STAKE_UNSTAKING_APPROXIMATE_DESCRIPTION: {
+        id: 'TR_STAKE_UNSTAKING_APPROXIMATE_DESCRIPTION',
+        defaultMessage:
+            'The liquidity of the staking pool can allow for instant unstake of some funds. The remaining funds will follow the unstaking period.',
+    },
     TR_UP_TO_DAYS: {
         id: 'TR_UP_TO_DAYS',
         defaultMessage: 'up to {count, plural, one {# day} other {# days}}',
@@ -9164,7 +9150,7 @@ export default defineMessages({
     },
     TR_PASSPHRASE_DESCRIPTION_ITEM3: {
         id: 'TR_PASSPHRASE_DESCRIPTION_ITEM3',
-        defaultMessage: 'No one can recover it, not even Trezor support',
+        defaultMessage: 'No one can recover it, not even Trezor Support',
     },
     TR_CONNECT_DEVICE_SEND_PROMO_TITLE: {
         id: 'TR_CONNECT_DEVICE_SEND_PROMO_TITLE',
@@ -9181,7 +9167,7 @@ export default defineMessages({
     TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION: {
         id: 'TR_CONNECT_DEVICE_RECEIVE_PROMO_DESCRIPTION',
         defaultMessage:
-            "Verify on Trezor to confirm receive address. Continuing without confirming isn't recommended.",
+            "Verify on your Trezor to confirm the receive address. It's not recommended to continue without confirming.",
     },
     TR_CONNECT_DEVICE_PASSPHRASE_BANNER_TITLE: {
         id: 'TR_CONNECT_DEVICE_PASSPHRASE_BANNER_TITLE',
@@ -9221,6 +9207,11 @@ export default defineMessages({
         defaultMessage:
             "Are you sure? Your device can only be used by one app at a time. If you're currently using another app with your Trezor device, finish that session first.",
     },
+    TR_BRIDGE_TIP_AUTOSTART: {
+        id: 'TR_BRIDGE_TIP_AUTOSTART',
+        defaultMessage:
+            'Tip: Enable the auto-start feature and have Trezor Bridge always running in the background.',
+    },
     TR_BRIDGE_NEEDED_DESCRIPTION: {
         id: 'TR_BRIDGE_NEEDED_DESCRIPTION',
         defaultMessage:
@@ -9238,6 +9229,14 @@ export default defineMessages({
         id: 'TR_AUTO_START_DESCRIPTION',
         defaultMessage: 'Start Trezor Suite in the background when you log into your computer.',
     },
+    TR_SHOW_ON_TRAY: {
+        id: 'TR_SHOW_ON_TRAY',
+        defaultMessage: 'Show icon in tray',
+    },
+    TR_SHOW_ON_TRAY_DESCRIPTION: {
+        id: 'TR_SHOW_ON_TRAY_DESCRIPTION',
+        defaultMessage: 'Monitor if Trezor Suite is running in the background.',
+    },
     TR_CUSTOM_FEE_WARNING: {
         id: 'TR_CUSTOM_FEE_WARNING',
         defaultMessage:
@@ -9248,4 +9247,10 @@ export default defineMessages({
         defaultMessage:
             'To speed up your transactions, increase the fee on the oldest (by nonce) pending transaction in the queue. Transactions must be confirmed in order. <a>Learn more</a>',
     },
+    TR_TREZOR_CONNECT: {
+        id: 'TR_TREZOR_CONNECT',
+        defaultMessage: 'Trezor Connect',
+    },
 });
+
+export default defineMessages(messages);
diff --git a/packages/suite/src/support/suite/Autodetect.tsx b/packages/suite/src/support/suite/Autodetect.tsx
index 685975fbe80..f1f2b4c77cc 100644
--- a/packages/suite/src/support/suite/Autodetect.tsx
+++ b/packages/suite/src/support/suite/Autodetect.tsx
@@ -1,4 +1,5 @@
 import { useEffect } from 'react';
+
 import { getOsTheme, watchOsTheme } from 'src/utils/suite/env';
 import { getOsLocale, watchOsLocale } from 'src/utils/suite/l10n';
 import { useActions, useSelector } from 'src/hooks/suite';
diff --git a/packages/suite/src/support/suite/ConnectedIntlProvider.tsx b/packages/suite/src/support/suite/ConnectedIntlProvider.tsx
index 64a78adc13f..192d5450c66 100644
--- a/packages/suite/src/support/suite/ConnectedIntlProvider.tsx
+++ b/packages/suite/src/support/suite/ConnectedIntlProvider.tsx
@@ -1,8 +1,10 @@
 import { useState, useEffect, ReactNode } from 'react';
 import { IntlProvider } from 'react-intl';
+
 import enMessages from '@trezor/suite-data/files/translations/en.json';
-import { useSelector } from 'src/hooks/suite/useSelector';
 import { isDevEnv } from '@suite-common/suite-utils';
+
+import { useSelector } from 'src/hooks/suite/useSelector';
 import type { Locale } from 'src/config/suite/languages';
 
 const useFetchMessages = (locale: Locale) => {
diff --git a/packages/suite/src/support/suite/ConnectedThemeProvider.tsx b/packages/suite/src/support/suite/ConnectedThemeProvider.tsx
index a8ee93434a1..898e7fbf770 100644
--- a/packages/suite/src/support/suite/ConnectedThemeProvider.tsx
+++ b/packages/suite/src/support/suite/ConnectedThemeProvider.tsx
@@ -1,5 +1,7 @@
 import { ReactNode } from 'react';
+
 import { useSelector } from 'src/hooks/suite';
+
 import { ThemeProvider } from './ThemeProvider';
 
 interface ConnectedThemeProviderProps {
diff --git a/packages/suite/src/support/suite/ErrorBoundary.tsx b/packages/suite/src/support/suite/ErrorBoundary.tsx
index d67ba55eab2..64ca69565f3 100644
--- a/packages/suite/src/support/suite/ErrorBoundary.tsx
+++ b/packages/suite/src/support/suite/ErrorBoundary.tsx
@@ -1,6 +1,8 @@
 import { Component, ErrorInfo } from 'react';
 import { connect, ConnectedComponent } from 'react-redux';
+
 import { bindActionCreators, Dispatch } from 'redux';
+
 import { Error } from 'src/components/suite/Error';
 import { reportToSentry } from 'src/utils/suite/sentry';
 
diff --git a/packages/suite/src/support/suite/OnlineStatus.tsx b/packages/suite/src/support/suite/OnlineStatus.tsx
index d436b728860..c45ea7b9efc 100644
--- a/packages/suite/src/support/suite/OnlineStatus.tsx
+++ b/packages/suite/src/support/suite/OnlineStatus.tsx
@@ -1,4 +1,5 @@
 import { useEffect } from 'react';
+
 import { useDispatch } from 'src/hooks/suite';
 import { updateOnlineStatus } from 'src/actions/suite/suiteActions';
 
diff --git a/packages/suite/src/support/suite/Protocol.tsx b/packages/suite/src/support/suite/Protocol.tsx
index c879f910944..7522ac8ef38 100644
--- a/packages/suite/src/support/suite/Protocol.tsx
+++ b/packages/suite/src/support/suite/Protocol.tsx
@@ -1,8 +1,9 @@
 import { useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
-import { desktopApi } from '@trezor/suite-desktop-api';
 
+import { desktopApi } from '@trezor/suite-desktop-api';
 import { isWeb, isDesktop } from '@trezor/env-utils';
+
 import { useActions } from 'src/hooks/suite';
 import * as protocolActions from 'src/actions/suite/protocolActions';
 
diff --git a/packages/suite/src/support/suite/Resize.tsx b/packages/suite/src/support/suite/Resize.tsx
index bae17e84ea6..c7ba88ff0e2 100644
--- a/packages/suite/src/support/suite/Resize.tsx
+++ b/packages/suite/src/support/suite/Resize.tsx
@@ -1,5 +1,7 @@
 import { useEffect, useState } from 'react';
+
 import useDebounce from 'react-use/lib/useDebounce';
+
 import { useDispatch } from 'src/hooks/suite';
 import { updateWindowSize } from 'src/actions/suite/resizeActions';
 
diff --git a/packages/suite/src/support/suite/Router.tsx b/packages/suite/src/support/suite/Router.tsx
index 1ea44aa0fc0..d102ee952d2 100644
--- a/packages/suite/src/support/suite/Router.tsx
+++ b/packages/suite/src/support/suite/Router.tsx
@@ -2,6 +2,7 @@ import { useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
 
 import { useDidUpdate } from '@trezor/react-utils';
+
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { onBeforePopState, onLocationChange } from 'src/actions/suite/routerActions';
 import history from 'src/support/history';
diff --git a/packages/suite/src/support/suite/ThemeProvider.tsx b/packages/suite/src/support/suite/ThemeProvider.tsx
index 2b423f89697..7d52d1147bd 100644
--- a/packages/suite/src/support/suite/ThemeProvider.tsx
+++ b/packages/suite/src/support/suite/ThemeProvider.tsx
@@ -1,7 +1,10 @@
 import { ReactNode } from 'react';
+
 import { ThemeProvider as SCThemeProvider } from 'styled-components';
+
 import { getThemeColors } from 'src/utils/suite/theme';
 import { getOsTheme } from 'src/utils/suite/env';
+
 import GlobalStyle from './styles/GlobalStyle';
 
 type ThemeProviderProps = {
diff --git a/packages/suite/src/support/suite/screens/ErrorScreen.tsx b/packages/suite/src/support/suite/screens/ErrorScreen.tsx
index 5c3344a0bb1..41c5e1a5da4 100644
--- a/packages/suite/src/support/suite/screens/ErrorScreen.tsx
+++ b/packages/suite/src/support/suite/screens/ErrorScreen.tsx
@@ -1,4 +1,5 @@
 import { Error } from 'src/components/suite/Error';
+
 import { ThemeProvider } from '../ThemeProvider';
 
 type ErrorScreenProps = {
diff --git a/packages/suite/src/support/suite/screens/LoadingScreen.tsx b/packages/suite/src/support/suite/screens/LoadingScreen.tsx
index 8a997effc02..59ab1a4cc32 100644
--- a/packages/suite/src/support/suite/screens/LoadingScreen.tsx
+++ b/packages/suite/src/support/suite/screens/LoadingScreen.tsx
@@ -1,7 +1,9 @@
 import styled from 'styled-components';
 
 import { Paragraph } from '@trezor/components';
+
 import { Loading } from 'src/components/suite';
+
 import { ThemeProvider } from '../ThemeProvider';
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/support/suite/styles/GlobalStyle.tsx b/packages/suite/src/support/suite/styles/GlobalStyle.tsx
index 3d8c9bba5f7..a26242740f6 100644
--- a/packages/suite/src/support/suite/styles/GlobalStyle.tsx
+++ b/packages/suite/src/support/suite/styles/GlobalStyle.tsx
@@ -1,6 +1,8 @@
+import { createGlobalStyle, DefaultTheme } from 'styled-components';
+
 import { typography } from '@trezor/theme';
+
 import animations from './animations';
-import { createGlobalStyle, DefaultTheme } from 'styled-components';
 
 const GlobalStyle = createGlobalStyle<{ theme: DefaultTheme }>`
     #app {
diff --git a/packages/suite/src/support/suite/useTor.tsx b/packages/suite/src/support/suite/useTor.tsx
index 2a494106149..3e92b348cc0 100644
--- a/packages/suite/src/support/suite/useTor.tsx
+++ b/packages/suite/src/support/suite/useTor.tsx
@@ -1,6 +1,9 @@
 import { useEffect } from 'react';
 
 import { desktopApi, BootstrapTorEvent, TorStatusEvent } from '@trezor/suite-desktop-api';
+import { isWeb, isDesktop, getLocationHostname } from '@trezor/env-utils';
+import { notificationsActions } from '@suite-common/toast-notifications';
+
 import { TorStatus } from 'src/types/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { getIsTorDomain } from 'src/utils/suite/tor';
@@ -9,9 +12,7 @@ import {
     setTorBootstrapSlow,
     updateTorStatus,
 } from 'src/actions/suite/suiteActions';
-import { isWeb, isDesktop, getLocationHostname } from '@trezor/env-utils';
 import { selectTorState } from 'src/reducers/suite/suiteReducer';
-import { notificationsActions } from '@suite-common/toast-notifications';
 
 export const useTor = () => {
     const { torBootstrap, isTorEnabling } = useSelector(selectTorState);
diff --git a/packages/suite/src/support/tests/IntlHelper.tsx b/packages/suite/src/support/tests/IntlHelper.tsx
index 4007d6ee2c5..c8c63f8cefd 100644
--- a/packages/suite/src/support/tests/IntlHelper.tsx
+++ b/packages/suite/src/support/tests/IntlHelper.tsx
@@ -2,6 +2,7 @@ import { ReactChild } from 'react';
 import renderer from 'react-test-renderer';
 import { IntlProvider } from 'react-intl';
 import { Provider } from 'react-redux';
+
 import { configureStore } from 'src/support/tests/configureStore';
 
 interface Props {
diff --git a/packages/suite/src/support/tests/configureStore.tsx b/packages/suite/src/support/tests/configureStore.tsx
index 5b9ef372887..1f8b1e8d19b 100644
--- a/packages/suite/src/support/tests/configureStore.tsx
+++ b/packages/suite/src/support/tests/configureStore.tsx
@@ -13,7 +13,7 @@ export const configureStore = <S, DispatchExts = {}>(
     reduxMockStore([thunk.withExtraArgument(extraDependencies), ...(middlewares || [])]);
 
 /*
- * This function is useful, because lot of test fixtures doesn't count with added thunk pending/fulfilled action that are now
+ * This function is useful, because a lot of test fixtures doesn't count with added thunk pending/fulfilled action that are now
  * dispatched everytime. This will filter out these action so we don't need to fix fixtures everywhere.
  * It should be used only in /packages/suite everything migrated to suite-common/ should be adjusted to work with new thunk API!!!
  */
diff --git a/packages/suite/src/support/tests/hooksHelper.tsx b/packages/suite/src/support/tests/hooksHelper.tsx
index f2ac9f9c86a..2be6e0a554f 100644
--- a/packages/suite/src/support/tests/hooksHelper.tsx
+++ b/packages/suite/src/support/tests/hooksHelper.tsx
@@ -1,11 +1,14 @@
 import { ReactNode } from 'react';
 import { Provider } from 'react-redux';
 import { IntlProvider } from 'react-intl';
+
 import { act, render, screen, waitForElementToBeRemoved } from '@testing-library/react';
-import { ConnectedThemeProvider } from 'src/support/suite/ConnectedThemeProvider';
 import userEvent from '@testing-library/user-event';
+
 import { MockedFormatterProvider } from '@suite-common/formatters';
 
+import { ConnectedThemeProvider } from 'src/support/suite/ConnectedThemeProvider';
+
 // used in hooks tests
 export const renderWithProviders = (store: any, children: ReactNode) => {
     const renderMethods = render(
@@ -27,7 +30,7 @@ export const waitForLoader = (text = /Loading/i) => {
         if (loading) {
             return waitForElementToBeRemoved(() => screen.queryByText(text), { timeout: 5000 });
         }
-    } catch (e) {
+    } catch {
         return true;
     }
 };
diff --git a/packages/suite/src/types/coinmarket/coinmarket.ts b/packages/suite/src/types/coinmarket/coinmarket.ts
index ab4ef4e3180..669f0432c49 100644
--- a/packages/suite/src/types/coinmarket/coinmarket.ts
+++ b/packages/suite/src/types/coinmarket/coinmarket.ts
@@ -1,14 +1,3 @@
-import type { BuyInfo } from 'src/actions/wallet/coinmarketBuyActions';
-import type { ExchangeInfo } from 'src/actions/wallet/coinmarketExchangeActions';
-import type { SellInfo } from 'src/actions/wallet/coinmarketSellActions';
-import type {
-    Option,
-    Trade,
-    TradeBuy,
-    TradeExchange,
-    TradeSell,
-    TradeType,
-} from 'src/types/wallet/coinmarketCommonTypes';
 import {
     BuyCryptoPaymentMethod,
     BuyProviderInfo,
@@ -27,12 +16,10 @@ import {
     WatchExchangeTradeResponse,
     WatchSellTradeResponse,
 } from 'invity-api';
-import { Account } from '@suite-common/wallet-types';
 import { AnyAction, Dispatch } from 'redux';
-import { State } from 'src/reducers/wallet/coinmarketReducer';
-import { WithSelectedAccountLoadedProps } from 'src/components/wallet';
+
+import { Account, SelectedAccountLoaded } from '@suite-common/wallet-types';
 import { AccountType } from '@suite-common/wallet-config';
-import { ExtendedMessageDescriptor, TrezorDevice } from 'src/types/suite';
 import { Timer } from '@trezor/react-utils';
 import { AccountsState } from '@suite-common/wallet-core';
 import { TokenDefinitionsState } from '@suite-common/token-definitions';
@@ -42,8 +29,24 @@ import {
     SelectAssetOptionGroupProps,
     SelectAssetOptionProps,
 } from '@trezor/product-components/src/components/SelectAssetModal/SelectAssetModal';
+import { StaticSessionId } from '@trezor/connect';
 
-export type UseCoinmarketProps = WithSelectedAccountLoadedProps;
+import { GetDefaultAccountLabelParams } from 'src/hooks/suite/useDefaultAccountLabel';
+import { State } from 'src/reducers/wallet/coinmarketReducer';
+import { ExtendedMessageDescriptor, TrezorDevice } from 'src/types/suite';
+import type {
+    Option,
+    Trade,
+    TradeBuy,
+    TradeExchange,
+    TradeSell,
+    TradeType,
+} from 'src/types/wallet/coinmarketCommonTypes';
+import type { SellInfo } from 'src/actions/wallet/coinmarketSellActions';
+import type { ExchangeInfo } from 'src/actions/wallet/coinmarketExchangeActions';
+import type { BuyInfo } from 'src/actions/wallet/coinmarketBuyActions';
+
+export type UseCoinmarketProps = { selectedAccount: SelectedAccountLoaded };
 export type UseCoinmarketCommonProps = UseCoinmarketProps & {
     type: CoinmarketTradeType;
 };
@@ -55,7 +58,7 @@ export interface UseCoinmarketCommonReturnProps {
     setCallInProgress: (state: boolean) => void;
     checkQuotesTimer: (callback: () => Promise<void>) => void;
 }
-export type CoinmarketPageType = 'form' | 'offers' | 'confirm';
+type CoinmarketPageType = 'form' | 'offers' | 'confirm';
 export type UseCoinmarketFormProps = UseCoinmarketProps & {
     /**
      * Difference between form and offers is that on the offers page are used all data filled in the form
@@ -185,20 +188,16 @@ export type CoinmarketCryptoSelectOptionProps = SelectAssetOptionProps;
 
 export interface CoinmarketGetSortedAccountsProps {
     accounts: AccountsState;
-    deviceState: string | undefined;
+    deviceState: StaticSessionId | undefined;
 }
 
 export interface CoinmarketBuildAccountOptionsProps extends CoinmarketGetSortedAccountsProps {
     accountLabels: Record<string, string | undefined>;
-    defaultAccountLabelString: ({
+    getDefaultAccountLabel: ({
         accountType,
         symbol,
         index,
-    }: {
-        accountType: Account['accountType'];
-        symbol: Account['symbol'];
-        index?: number;
-    }) => string;
+    }: GetDefaultAccountLabelParams) => string;
     supportedCryptoIds: Set<CryptoId> | undefined;
     tokenDefinitions: Partial<TokenDefinitionsState>;
 }
@@ -265,7 +264,18 @@ export interface CoinmarketGetCryptoQuoteAmountProps {
     receiveCurrency: CryptoId | undefined;
 }
 
+export type CoinmarketPaymentMethodType = BuyCryptoPaymentMethod | SellCryptoPaymentMethod;
+
 export interface CoinmarketGetPaymentMethodProps {
-    paymentMethod?: BuyCryptoPaymentMethod | SellCryptoPaymentMethod;
+    paymentMethod?: CoinmarketPaymentMethodType;
     paymentMethodName?: string;
 }
+
+export interface CoinmarketCryptoAmountProps {
+    amountInCrypto?: boolean | undefined;
+    sendAmount: string | number | undefined;
+    sendCurrency: CryptoId | string | undefined;
+    receiveAmount: string | number | undefined;
+    receiveCurrency: CryptoId | undefined;
+    className?: string;
+}
diff --git a/packages/suite/src/types/coinmarket/coinmarketDetail.ts b/packages/suite/src/types/coinmarket/coinmarketDetail.ts
index b3779d5035d..99e6c065f8c 100644
--- a/packages/suite/src/types/coinmarket/coinmarketDetail.ts
+++ b/packages/suite/src/types/coinmarket/coinmarketDetail.ts
@@ -1,13 +1,13 @@
+import type { SelectedAccountLoaded } from '@suite-common/wallet-types';
+
 import type { CoinmarketTradeCommonProps } from 'src/reducers/wallet/coinmarketReducer';
 import type { Account } from 'src/types/wallet';
 import type { TradeType } from 'src/types/wallet/coinmarketCommonTypes';
-import type { SelectedAccountLoaded } from '@suite-common/wallet-types';
-
 import {
     CoinmarketTradeInfoMapProps,
     CoinmarketTradeMapProps,
     CoinmarketTradeType,
-} from './coinmarket';
+} from 'src/types/coinmarket/coinmarket';
 
 export interface CoinmarketDetailContextValues<T extends CoinmarketTradeType>
     extends CoinmarketTradeCommonProps {
diff --git a/packages/suite/src/types/coinmarket/coinmarketForm.ts b/packages/suite/src/types/coinmarket/coinmarketForm.ts
index 9707b596f33..03d4fe110fc 100644
--- a/packages/suite/src/types/coinmarket/coinmarketForm.ts
+++ b/packages/suite/src/types/coinmarket/coinmarketForm.ts
@@ -1,3 +1,27 @@
+import type { FieldValues, UseFormReturn, FieldPath } from 'react-hook-form';
+import React from 'react';
+
+import type {
+    BankAccount,
+    BuyTrade,
+    CryptoId,
+    ExchangeTrade,
+    ExchangeTradeQuoteRequest,
+    FiatCurrencyCode,
+    SellFiatTrade,
+} from 'invity-api';
+
+import { Network } from '@suite-common/wallet-config';
+import { Timer } from '@trezor/react-utils';
+import {
+    FeeInfo,
+    FormState,
+    PrecomposedLevels,
+    PrecomposedLevelsCardano,
+} from '@suite-common/wallet-types';
+import { FeeLevel } from '@trezor/connect';
+import { AccountsState } from '@suite-common/wallet-core';
+
 import {
     CoinmarketAccountOptionsGroupOptionProps,
     CoinmarketCryptoSelectItemProps,
@@ -5,6 +29,7 @@ import {
     CoinmarketGetProvidersInfoProps,
     CoinmarketPaymentMethodListProps,
     CoinmarketPaymentMethodProps,
+    CoinmarketPaymentMethodType,
     CoinmarketTradeBuyType,
     CoinmarketTradeDetailMapProps,
     CoinmarketTradeDetailType,
@@ -14,44 +39,17 @@ import {
     CoinmarketTradeType,
 } from 'src/types/coinmarket/coinmarket';
 import type { Account } from 'src/types/wallet';
-import { Network } from '@suite-common/wallet-config';
 import type { BuyInfo } from 'src/actions/wallet/coinmarketBuyActions';
-import type { FieldValues, UseFormReturn, FieldPath } from 'react-hook-form';
-import type {
-    BankAccount,
-    BuyCryptoPaymentMethod,
-    BuyTrade,
-    CryptoId,
-    ExchangeTrade,
-    ExchangeTradeQuoteRequest,
-    FiatCurrencyCode,
-    SellCryptoPaymentMethod,
-    SellFiatTrade,
-} from 'invity-api';
-import { Timer } from '@trezor/react-utils';
 import { AppState } from 'src/reducers/store';
-import { ExtendedMessageDescriptor } from 'src/types/suite';
-import { PropsWithChildren } from 'react';
+import { Dispatch, GetState } from 'src/types/suite';
 import {
     AmountLimits,
     CryptoAmountLimits,
     Option,
     TradeSell,
 } from 'src/types/wallet/coinmarketCommonTypes';
-import {
-    FeeInfo,
-    FormState,
-    PrecomposedLevels,
-    PrecomposedLevelsCardano,
-} from '@suite-common/wallet-types';
-import { FeeLevel } from '@trezor/connect';
 import { SendContextValues } from 'src/types/wallet/sendForm';
 import { SellInfo } from 'src/actions/wallet/coinmarketSellActions';
-import {
-    CoinmarketExchangeStepType,
-    CoinmarketSellStepType,
-} from 'src/types/coinmarket/coinmarketOffers';
-import { AccountsState } from '@suite-common/wallet-core';
 import { ExchangeInfo } from 'src/actions/wallet/coinmarketExchangeActions';
 import {
     EXCHANGE_COMPARATOR_KYC_FILTER,
@@ -69,6 +67,7 @@ import {
     FORM_RATE_FLOATING,
     FORM_RATE_TYPE,
 } from 'src/constants/wallet/coinmarket/form';
+import type { TranslationKey } from 'src/components/suite/Translation';
 
 export interface CoinmarketBuyFormProps {
     fiatInput?: string;
@@ -136,6 +135,12 @@ export interface CoinmarketExchangeFormDefaultValuesProps {
     defaultCurrency: Option;
 }
 
+export type CoinmarketSellStepType = 'BANK_ACCOUNT' | 'SEND_TRANSACTION';
+export type CoinmarketExchangeStepType =
+    | 'RECEIVING_ADDRESS'
+    | 'SEND_TRANSACTION'
+    | 'SEND_APPROVAL_TRANSACTION';
+
 interface CoinmarketFormStateProps {
     isFormLoading: boolean;
     isFormInvalid: boolean;
@@ -144,7 +149,7 @@ interface CoinmarketFormStateProps {
     toggleAmountInCrypto: () => void;
 }
 
-export interface CoinmarketCommonFormProps {
+interface CoinmarketCommonFormProps {
     device: AppState['device']['selectedDevice'];
     callInProgress: boolean;
     timer: Timer;
@@ -154,7 +159,7 @@ export interface CoinmarketCommonFormProps {
     goToOffers: () => Promise<void>;
 }
 
-export interface CoinmarketCommonFormBuySellProps {
+interface CoinmarketCommonFormBuySellProps {
     defaultCountry: Option;
     defaultCurrency: Option;
     defaultPaymentMethod: CoinmarketPaymentMethodListProps;
@@ -162,6 +167,12 @@ export interface CoinmarketCommonFormBuySellProps {
     amountLimits?: AmountLimits;
 }
 
+type CoinmarketVerifyAccountProps = (
+    account: Account,
+    address?: string,
+    path?: string,
+) => (dispatch: Dispatch, getState: GetState) => Promise<void>;
+
 export interface CoinmarketBuyFormContextProps
     extends UseFormReturn<CoinmarketBuyFormProps>,
         CoinmarketCommonFormProps,
@@ -180,7 +191,7 @@ export interface CoinmarketBuyFormContextProps
 
     selectQuote: (quote: BuyTrade) => Promise<void>;
     confirmTrade: (address: string) => void;
-    verifyAddress: (account: Account, address?: string, path?: string) => Promise<void>;
+    verifyAddress: CoinmarketVerifyAccountProps;
     removeDraft: (key: string) => void;
     setAmountLimits: (limits?: AmountLimits) => void;
 }
@@ -256,7 +267,7 @@ export interface CoinmarketExchangeFormContextProps
     confirmTrade: (address: string, extraField?: string, trade?: ExchangeTrade) => Promise<boolean>;
     sendTransaction: () => void;
     selectQuote: (quote: ExchangeTrade) => void;
-    verifyAddress: (account: Account, address?: string, path?: string) => Promise<void>;
+    verifyAddress: CoinmarketVerifyAccountProps;
 }
 
 export type CoinmarketFormMapProps = {
@@ -278,27 +289,16 @@ export type CoinmarketPaymentMethodHookProps<T extends CoinmarketTradeType> = {
     ) => CoinmarketTradeDetailMapProps[T][] | undefined;
 };
 
-export interface CoinmarketFormInputLabelProps extends PropsWithChildren {
-    label?: ExtendedMessageDescriptor['id'];
+export interface CoinmarketFormInputDefaultProps {
+    label?: TranslationKey;
 }
 
-export type CoinmarketFormInputCommonProps = {};
-
-export interface CoinmarketFormInputDefaultProps
-    extends CoinmarketFormInputLabelProps,
-        CoinmarketFormInputCommonProps {}
-
-export type CoinmarketFormStateMapProps = {
-    buy: CoinmarketBuyFormProps;
-    sell: CoinmarketSellFormProps;
-    exchange: CoinmarketExchangeFormProps;
-};
-
 export interface CoinmarketFormInputCryptoSelectProps<TFieldValues extends FieldValues>
     extends CoinmarketFormInputDefaultProps {
     cryptoSelectName: FieldPath<TFieldValues>;
     supportedCryptoCurrencies: Set<CryptoId> | undefined;
     methods: UseFormReturn<TFieldValues>;
+    isDisabled?: boolean;
 }
 
 export interface CoinmarketFormInputFiatCryptoProps<TFieldValues extends FieldValues> {
@@ -306,6 +306,8 @@ export interface CoinmarketFormInputFiatCryptoProps<TFieldValues extends FieldVa
     cryptoInputName: FieldPath<TFieldValues>;
     fiatInputName: FieldPath<TFieldValues>;
     cryptoSelectName: FieldPath<TFieldValues>;
+    labelLeft?: React.ReactNode;
+    labelRight?: React.ReactNode;
 }
 
 export interface CoinmarketFormInputFiatCryptoWrapProps<TFieldValues extends FieldValues> {
@@ -319,15 +321,14 @@ export interface CoinmarketFormInputFiatCryptoWrapProps<TFieldValues extends Fie
 }
 
 export interface CoinmarketFormInputAccountProps<TFieldValues extends FieldValues> {
-    label?: ExtendedMessageDescriptor['id'];
+    label?: TranslationKey;
     accountSelectName: FieldPath<TFieldValues>;
     methods: UseFormReturn<TFieldValues>;
 }
 
-export interface CoinmarketFormInputCurrencyProps extends CoinmarketFormInputCommonProps {
+export interface CoinmarketFormInputCurrencyProps {
     isClean?: boolean;
-    size?: 'small' | 'large';
-    isDarkLabel?: boolean;
+    width?: number;
 }
 
 export interface CoinmarketUseFormActionsProps<T extends CoinmarketSellExchangeFormProps> {
@@ -341,6 +342,7 @@ export interface CoinmarketUseFormActionsProps<T extends CoinmarketSellExchangeF
     changeFeeLevel: (level: FeeLevel['label']) => void;
     composeRequest: SendContextValues<CoinmarketSellExchangeFormProps>['composeTransaction'];
     setAccountOnChange: (account: Account) => void;
+    setComposedLevels: (levels: PrecomposedLevels | PrecomposedLevelsCardano | undefined) => void;
 }
 
 export interface CoinmarketUseFormActionsReturnProps {
@@ -372,6 +374,7 @@ export interface CoinmarketUseComposeTransactionReturnProps
     feeInfo: FeeInfo;
     changeFeeLevel: (level: FeeLevel['label']) => void;
     composeRequest: SendContextValues<CoinmarketSellExchangeFormProps>['composeTransaction'];
+    setComposedLevels: (levels: PrecomposedLevels | PrecomposedLevelsCardano | undefined) => void;
 }
 
 export interface CoinmarketOfferCommonProps {
@@ -380,7 +383,7 @@ export interface CoinmarketOfferCommonProps {
     providers: CoinmarketGetProvidersInfoProps;
     type: CoinmarketTradeType;
     quoteAmounts: CoinmarketGetCryptoQuoteAmountProps | null;
-    paymentMethod?: BuyCryptoPaymentMethod | SellCryptoPaymentMethod;
+    paymentMethod?: CoinmarketPaymentMethodType;
     paymentMethodName?: string;
 }
 
diff --git a/packages/suite/src/types/coinmarket/coinmarketOffers.ts b/packages/suite/src/types/coinmarket/coinmarketOffers.ts
deleted file mode 100644
index db19c72f503..00000000000
--- a/packages/suite/src/types/coinmarket/coinmarketOffers.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { Account } from '@suite-common/wallet-types';
-import { AppState } from '../suite';
-import { ExchangeInfo } from 'src/actions/wallet/coinmarketExchangeActions';
-import { BankAccount, CryptoId, ExchangeTrade, SellFiatTrade } from 'invity-api';
-import { Timer } from '@trezor/react-utils';
-import { TradeSell } from '../wallet/coinmarketCommonTypes';
-import { SellInfo } from 'src/actions/wallet/coinmarketSellActions';
-import { CoinmarketTradeType } from './coinmarket';
-import {
-    CoinmarketBuyFormContextProps,
-    CoinmarketExchangeFormContextProps,
-    CoinmarketSellFormContextProps,
-} from './coinmarketForm';
-
-type CoinmarketOffersContextProps = {
-    type: CoinmarketTradeType;
-    device: AppState['device']['selectedDevice'];
-    account: Account;
-    callInProgress: boolean;
-    timer: Timer;
-    getQuotes: () => Promise<void>;
-};
-
-export type CoinmarketBuyAddressOptionsType = {
-    address?: string;
-};
-
-export type CoinmarketSellStepType = 'BANK_ACCOUNT' | 'SEND_TRANSACTION';
-
-export type CoinmarketSellOffersContextProps = CoinmarketOffersContextProps & {
-    quotes: AppState['wallet']['coinmarket']['sell']['quotes'];
-    quotesRequest: AppState['wallet']['coinmarket']['sell']['quotesRequest'];
-    selectedQuote?: SellFiatTrade;
-    trade?: TradeSell;
-    suiteReceiveAccounts?: AppState['wallet']['accounts'];
-    sellInfo?: SellInfo;
-    sellStep: CoinmarketSellStepType;
-    setSellStep: (step: CoinmarketSellStepType) => void;
-    addBankAccount: () => void;
-    confirmTrade: (bankAccount: BankAccount) => void;
-    sendTransaction: () => void;
-    needToRegisterOrVerifyBankAccount: (quote: SellFiatTrade) => boolean;
-    selectQuote: (quote: SellFiatTrade) => void;
-};
-
-export type CoinmarketExchangeStepType =
-    | 'RECEIVING_ADDRESS'
-    | 'SEND_TRANSACTION'
-    | 'SEND_APPROVAL_TRANSACTION';
-
-export type CoinmarketExchangeOffersContextProps = CoinmarketOffersContextProps & {
-    quotes: AppState['wallet']['coinmarket']['exchange']['quotes'];
-    quotesRequest: AppState['wallet']['coinmarket']['exchange']['quotesRequest'];
-    selectedQuote?: ExchangeTrade;
-    setSelectedQuote: (quote: ExchangeTrade | undefined) => void;
-    suiteReceiveAccounts?: AppState['wallet']['accounts'];
-    addressVerified: AppState['wallet']['coinmarket']['exchange']['addressVerified'];
-    exchangeInfo?: ExchangeInfo;
-    exchangeStep: CoinmarketExchangeStepType;
-    setExchangeStep: (step: CoinmarketExchangeStepType) => void;
-    verifyAddress: (account: Account, address?: string, path?: string) => Promise<void>;
-    receiveSymbol?: string;
-    receiveAccount?: Account;
-    setReceiveAccount: (account?: Account) => void;
-    confirmTrade: (address: string, extraField?: string) => Promise<boolean>;
-    sendTransaction: () => void;
-    selectQuote: (quote: ExchangeTrade) => void;
-};
-
-// TODO: delete
-export type CoinmarketOffersMapProps = {
-    buy: CoinmarketBuyFormContextProps; // temporary
-    sell: CoinmarketSellFormContextProps; // temporary
-    exchange: CoinmarketExchangeFormContextProps; // temporary
-};
-
-export type CoinmarketOffersContextValues<T extends CoinmarketTradeType> =
-    CoinmarketOffersMapProps[T];
-
-export interface CoinmarketCryptoAmountProps {
-    amountInCrypto?: boolean | undefined;
-    sendAmount: string | number | undefined;
-    sendCurrency: CryptoId | string | undefined;
-    receiveAmount: string | number | undefined;
-    receiveCurrency: CryptoId | undefined;
-    className?: string;
-}
diff --git a/packages/suite/src/types/coinmarket/coinmarketVerify.ts b/packages/suite/src/types/coinmarket/coinmarketVerify.ts
index 21ee6d0e1ee..83692ae36b7 100644
--- a/packages/suite/src/types/coinmarket/coinmarketVerify.ts
+++ b/packages/suite/src/types/coinmarket/coinmarketVerify.ts
@@ -1,8 +1,11 @@
-import type { Account } from 'src/types/wallet';
-import { NetworkSymbol } from '@suite-common/wallet-config';
-import { CryptoId } from 'invity-api';
 import { UseFormReturn } from 'react-hook-form';
+
+import { CryptoId } from 'invity-api';
+
+import { NetworkSymbol } from '@suite-common/wallet-config';
 import { AccountAddress } from '@trezor/connect';
+
+import type { Account } from 'src/types/wallet';
 import { ExtendedMessageDescriptor, TrezorDevice } from 'src/types/suite';
 
 export interface CoinmarketVerifyFormProps {
diff --git a/packages/suite/src/types/onboarding/index.ts b/packages/suite/src/types/onboarding/index.ts
index f3d05e38133..af66cc612c4 100644
--- a/packages/suite/src/types/onboarding/index.ts
+++ b/packages/suite/src/types/onboarding/index.ts
@@ -1,4 +1,5 @@
 import { DeviceModelInternal } from '@trezor/connect';
+
 import * as STEP from 'src/constants/onboarding/steps';
 import { PrerequisiteType } from 'src/utils/suite/prerequisites';
 
diff --git a/packages/suite/src/types/suite/index.ts b/packages/suite/src/types/suite/index.ts
index 6deecb1b89d..9a6dc87b635 100644
--- a/packages/suite/src/types/suite/index.ts
+++ b/packages/suite/src/types/suite/index.ts
@@ -8,7 +8,6 @@ import {
     transactionsActions,
 } from '@suite-common/wallet-core';
 import { analyticsActions } from '@suite-common/analytics';
-import type { ObjectValues } from '@trezor/type-utils';
 import type { UiEvent, TransportEvent, BlockchainEvent } from '@trezor/connect';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { messageSystemActions } from '@suite-common/message-system';
@@ -29,7 +28,6 @@ import type { WalletSettingsAction } from 'src/actions/settings/walletSettingsAc
 import type { WalletAction } from 'src/types/wallet';
 import type { BackupAction } from 'src/actions/backup/backupActions';
 import type { RecoveryAction } from 'src/actions/recovery/recoveryActions';
-import type { SUITE } from 'src/actions/suite/constants';
 import type { GuideAction } from 'src/actions/suite/guideActions';
 
 // reexport
@@ -104,8 +102,6 @@ export type GetState = () => AppState;
 
 export type Store = ReduxStore<AppState, Action>;
 
-export type Lock = ObjectValues<typeof SUITE.LOCK_TYPE>;
-
 export type ForegroundAppRoute = Extract<
     Route,
     { isForegroundApp: true; isFullscreenApp: false | undefined }
diff --git a/packages/suite/src/types/wallet/coinjoin.ts b/packages/suite/src/types/wallet/coinjoin.ts
index eff6e58f9a1..e5e82515c1e 100644
--- a/packages/suite/src/types/wallet/coinjoin.ts
+++ b/packages/suite/src/types/wallet/coinjoin.ts
@@ -1,6 +1,5 @@
-import { NetworkSymbol } from '@suite-common/wallet-config';
 import { PartialRecord } from '@trezor/type-utils';
-
+import { NetworkSymbol } from '@suite-common/wallet-config';
 // @trezor/coinjoin package is meant to be imported dynamically
 // importing types is safe, but importing an enum thru index will bundle whole lib
 import {
@@ -15,6 +14,7 @@ import {
     EndRoundState,
     WabiSabiProtocolErrorCode,
 } from '@trezor/coinjoin/src/enums';
+
 import type { CoinjoinNetworksConfig } from 'src/services/coinjoin';
 
 export { EndRoundState, WabiSabiProtocolErrorCode };
diff --git a/packages/suite/src/types/wallet/coinmarketCommonTypes.ts b/packages/suite/src/types/wallet/coinmarketCommonTypes.ts
index db8889d2ac4..2d86c94650e 100644
--- a/packages/suite/src/types/wallet/coinmarketCommonTypes.ts
+++ b/packages/suite/src/types/wallet/coinmarketCommonTypes.ts
@@ -1,8 +1,9 @@
-import type { ReactElement } from 'react';
-import type { Account } from 'src/types/wallet';
 import type { BuyTrade, SellFiatTrade, ExchangeTrade, FiatCurrencyCode } from 'invity-api';
+
 import type { FlagProps } from '@trezor/components';
 
+import type { Account } from 'src/types/wallet';
+
 type CommonTrade = {
     date: string;
     key?: string;
@@ -22,14 +23,11 @@ export type Trade = TradeBuy | TradeSell | TradeExchange;
 export type Option = { value: string; label: string };
 export type CountryOption = { value: FlagProps['country']; label: string };
 export type DefaultCountryOption = { value: string; label: string };
-export type TranslationOption = { value: string; label?: ReactElement };
 export type FiatCurrencyOption = {
     value: FiatCurrencyCode;
     label: string;
 };
 
-export type PaymentFrequencyOption = Option & { label: JSX.Element };
-
 export interface CryptoAmountLimits {
     currency: string;
     minCrypto?: number;
diff --git a/packages/suite/src/types/wallet/coinmarketExchangeForm.ts b/packages/suite/src/types/wallet/coinmarketExchangeForm.ts
deleted file mode 100644
index 9dc544c2539..00000000000
--- a/packages/suite/src/types/wallet/coinmarketExchangeForm.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import type { AppState } from 'src/types/suite';
-import type { FormState as ReactHookFormState, UseFormReturn } from 'react-hook-form';
-import type { Account } from 'src/types/wallet';
-import { Network } from '@suite-common/wallet-config';
-import type { FeeLevel } from '@trezor/connect';
-import type { ExchangeInfo } from 'src/actions/wallet/coinmarketExchangeActions';
-import type {
-    FeeInfo,
-    FormState,
-    PrecomposedLevels,
-    PrecomposedLevelsCardano,
-} from '@suite-common/wallet-types';
-import type { AmountLimits, CryptoAmountLimits, Option } from './coinmarketCommonTypes';
-import { Rate } from '@suite-common/wallet-types';
-import { SendContextValues } from 'src/types/wallet/sendForm';
-
-export const CRYPTO_INPUT = 'outputs.0.amount';
-export const CRYPTO_TOKEN = 'outputs.0.token';
-export const FIAT_INPUT = 'outputs.0.fiat';
-export const FIAT_CURRENCY = 'outputs.0.currency';
-
-export type ExchangeFormState = FormState & {
-    // NOTE: react-select value type cannot be undefined, but at least null works
-    receiveCryptoSelect: Option | null;
-    sendCryptoSelect: Option;
-};
-
-export interface ExchangeFormContextValues extends UseFormReturn<ExchangeFormState> {
-    onSubmit: () => void;
-    account: Account;
-    isComposing: boolean;
-    changeFeeLevel: (level: FeeLevel['label']) => void;
-    exchangeInfo?: ExchangeInfo;
-    defaultCurrency: Option;
-    composeRequest: SendContextValues['composeTransaction'];
-    updateFiatCurrency: (selectedCurrency: { value: string; label: string }, rate: number) => void;
-    updateSendCryptoValue: (fiatValue: string, decimals: number) => void;
-    amountLimits?: AmountLimits;
-    composedLevels?: PrecomposedLevels | PrecomposedLevelsCardano;
-    fiatRate?: Rate;
-    setAmountLimits: (limits?: CryptoAmountLimits) => void;
-    quotesRequest: AppState['wallet']['coinmarket']['exchange']['quotesRequest'];
-    isLoading: boolean;
-    updateFiatValue: (amount: string) => void;
-    noProviders: boolean;
-    network: Network;
-    feeInfo: FeeInfo;
-    removeDraft: (key: string) => void;
-    formState: ReactHookFormState<ExchangeFormState>;
-    handleClearFormButtonClick: () => void;
-    isDraft: boolean;
-}
diff --git a/packages/suite/src/types/wallet/coinmarketSellForm.ts b/packages/suite/src/types/wallet/coinmarketSellForm.ts
deleted file mode 100644
index b3fb2e2cf93..00000000000
--- a/packages/suite/src/types/wallet/coinmarketSellForm.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import type { AppState } from 'src/types/suite';
-import type { FormState as ReactHookFormState, UseFormReturn } from 'react-hook-form';
-import type { Account } from 'src/types/wallet';
-import { Network } from '@suite-common/wallet-config';
-import type { FeeLevel } from '@trezor/connect';
-import type { SellInfo } from 'src/actions/wallet/coinmarketSellActions';
-import type {
-    FeeInfo,
-    FormState,
-    PrecomposedLevels,
-    PrecomposedLevelsCardano,
-} from '@suite-common/wallet-types';
-import { Rate } from '@suite-common/wallet-types';
-import { SendContextValues } from 'src/types/wallet/sendForm';
-import type {
-    Option,
-    DefaultCountryOption,
-    AmountLimits,
-} from 'src/types/wallet/coinmarketCommonTypes';
-import { CoinmarketCryptoListProps } from 'src/types/coinmarket/coinmarket';
-
-export const OUTPUT_AMOUNT = 'outputs.0.amount';
-export const CRYPTO_TOKEN = 'outputs.0.token';
-export const FIAT_INPUT = 'fiatInput';
-export const FIAT_CURRENCY_SELECT = 'fiatCurrencySelect';
-export const CRYPTO_INPUT = 'cryptoInput';
-export const CRYPTO_CURRENCY_SELECT = 'cryptoCurrencySelect';
-
-export interface SellFormState extends FormState {
-    fiatInput?: string;
-    fiatCurrencySelect: Option;
-    cryptoInput?: string;
-    cryptoCurrencySelect: CoinmarketCryptoListProps;
-    countrySelect: Option;
-}
-
-export type SellFormContextValues = UseFormReturn<SellFormState> & {
-    onSubmit: () => void;
-    account: Account;
-    defaultCountry: DefaultCountryOption;
-    defaultCurrency: Option;
-    isComposing: boolean;
-    changeFeeLevel: (level: FeeLevel['label']) => void;
-    sellInfo?: SellInfo;
-    localCurrencyOption: { label: string; value: string };
-    composeRequest: SendContextValues<SellFormState>['composeTransaction'];
-    amountLimits?: AmountLimits;
-    composedLevels?: PrecomposedLevels | PrecomposedLevelsCardano;
-    fiatRate?: Rate;
-    setAmountLimits: (limits?: AmountLimits) => void;
-    quotesRequest: AppState['wallet']['coinmarket']['sell']['quotesRequest'];
-    isLoading: boolean;
-    noProviders: boolean;
-    network: Network;
-    feeInfo: FeeInfo;
-    onCryptoAmountChange: (amount: string) => void;
-    onFiatAmountChange: (amount: string) => void;
-    handleClearFormButtonClick: () => void;
-    formState: ReactHookFormState<FormState>;
-    isDraft: boolean;
-};
diff --git a/packages/suite/src/types/wallet/index.ts b/packages/suite/src/types/wallet/index.ts
index c06c1b6a2fa..61b6b6cf0c3 100644
--- a/packages/suite/src/types/wallet/index.ts
+++ b/packages/suite/src/types/wallet/index.ts
@@ -5,6 +5,8 @@ import {
     stakeActions,
     sendFormActions,
 } from '@suite-common/wallet-core';
+import { tokenDefinitionsActions } from '@suite-common/token-definitions/src/tokenDefinitionsActions';
+
 import { ReceiveAction } from 'src/actions/wallet/receiveActions';
 import { SignVerifyAction } from 'src/actions/wallet/signVerifyActions';
 import { CoinmarketBuyAction } from 'src/actions/wallet/coinmarketBuyActions';
@@ -18,7 +20,6 @@ import { CardanoStakingAction } from 'src/actions/wallet/cardanoStakingActions';
 import { CoinjoinAccountAction } from 'src/actions/wallet/coinjoinAccountActions';
 import { CoinjoinClientAction } from 'src/actions/wallet/coinjoinClientActions';
 import { CoinmarketInfoAction } from 'src/actions/wallet/coinmarketInfoActions';
-import { tokenDefinitionsActions } from '@suite-common/token-definitions/src/tokenDefinitionsActions';
 
 // reexport
 export type { Icon } from './iconTypes';
diff --git a/packages/suite/src/types/wallet/sendForm.ts b/packages/suite/src/types/wallet/sendForm.ts
index 20d8e48e526..d4324296b10 100644
--- a/packages/suite/src/types/wallet/sendForm.ts
+++ b/packages/suite/src/types/wallet/sendForm.ts
@@ -3,7 +3,6 @@ import { FieldPath, UseFormReturn } from 'react-hook-form';
 
 import { Network } from '@suite-common/wallet-config';
 import { AccountUtxo, FeeLevel, PROTO } from '@trezor/connect';
-
 import {
     Account,
     AccountKey,
diff --git a/packages/suite/src/types/wallet/stakeForms.ts b/packages/suite/src/types/wallet/stakeForms.ts
index 7f1ad95cb6e..36954c61d5a 100644
--- a/packages/suite/src/types/wallet/stakeForms.ts
+++ b/packages/suite/src/types/wallet/stakeForms.ts
@@ -1,7 +1,7 @@
-import { WithSelectedAccountLoadedProps } from 'src/components/wallet';
+import type { SelectedAccountLoaded } from '@suite-common/wallet-types';
 
 export const FIAT_INPUT = 'fiatInput';
 export const CRYPTO_INPUT = 'cryptoInput';
 export const OUTPUT_AMOUNT = 'outputs.0.amount';
 
-export type UseStakeFormsProps = WithSelectedAccountLoadedProps;
+export type UseStakeFormsProps = { selectedAccount: SelectedAccountLoaded };
diff --git a/packages/suite/src/utils/backup/index.ts b/packages/suite/src/utils/backup/index.ts
index 00f78a61ff9..d60f7e391a6 100644
--- a/packages/suite/src/utils/backup/index.ts
+++ b/packages/suite/src/utils/backup/index.ts
@@ -1,18 +1,17 @@
 import { ConfirmKey } from 'src/actions/backup/backupActions';
-import { Lock } from 'src/types/suite';
-import { SUITE } from 'src/actions/suite/constants';
+
 /**
  * Utility function used to disable backup start button
  */
-export const canStart = (userConfirmed: ConfirmKey[], locks: Lock[]) =>
+export const canStart = (userConfirmed: ConfirmKey[], isDeviceLocked: boolean) =>
     (['has-enough-time', 'is-in-private', 'understands-what-seed-is'] as const).every(e =>
         userConfirmed.includes(e),
-    ) && !locks.includes(SUITE.LOCK_TYPE.DEVICE);
+    ) && !isDeviceLocked;
 
 /**
  * Utility function used to disable exit button after successful backup
  */
-export const canContinue = (userConfirmed: ConfirmKey[], locks?: Lock[]) =>
+export const canContinue = (userConfirmed: ConfirmKey[], isDeviceLocked?: boolean) =>
     (['wrote-seed-properly', 'made-no-digital-copy', 'will-hide-seed'] as const).every(e =>
         userConfirmed.includes(e),
-    ) && !locks?.includes(SUITE.LOCK_TYPE.DEVICE);
+    ) && !isDeviceLocked;
diff --git a/packages/suite/src/utils/firmware/__tests__/firmware.test.ts b/packages/suite/src/utils/firmware/__tests__/firmware.test.ts
index f102de57a46..a08c75339b3 100644
--- a/packages/suite/src/utils/firmware/__tests__/firmware.test.ts
+++ b/packages/suite/src/utils/firmware/__tests__/firmware.test.ts
@@ -1,7 +1,9 @@
-import { TrezorDevice } from 'src/types/suite';
-import { getFormattedFingerprint, validateFirmware } from '..';
 import { DeviceModelInternal } from '@trezor/connect';
 
+import { TrezorDevice } from 'src/types/suite';
+
+import { getFormattedFingerprint, validateFirmware } from '../index';
+
 describe('getFormattedFingerprint', () => {
     it('should return a formatted fingerprint', () => {
         const fingerprint = '123456789a123456789b123456789c123456789d123456789012345678901234';
diff --git a/packages/suite/src/utils/firmware/index.ts b/packages/suite/src/utils/firmware/index.ts
index 4a9c0325773..ec425ed1730 100644
--- a/packages/suite/src/utils/firmware/index.ts
+++ b/packages/suite/src/utils/firmware/index.ts
@@ -1,8 +1,9 @@
 import { valid, satisfies } from 'semver';
+
 import { getFirmwareVersion } from '@trezor/device-utils';
+import { DeviceModelInternal, FirmwareType } from '@trezor/connect';
 
 import { type TrezorDevice, type ExtendedMessageDescriptor } from 'src/types/suite';
-import { DeviceModelInternal, FirmwareType } from '@trezor/connect';
 
 export const getFormattedFingerprint = (fingerprint: string) =>
     [
@@ -31,6 +32,7 @@ const FORMAT_MAP: { [format in FirmwareFormat]: DeviceModelInternal[] } = {
         DeviceModelInternal.T2B1,
         DeviceModelInternal.T3B1,
         DeviceModelInternal.T3T1,
+        DeviceModelInternal.T3W1,
     ],
 };
 
diff --git a/packages/suite/src/utils/onboarding/__tests__/steps.test.ts b/packages/suite/src/utils/onboarding/__tests__/steps.test.ts
index 662765c2699..d4e3151f5c9 100644
--- a/packages/suite/src/utils/onboarding/__tests__/steps.test.ts
+++ b/packages/suite/src/utils/onboarding/__tests__/steps.test.ts
@@ -2,6 +2,7 @@ import { DeviceModelInternal } from '@trezor/connect';
 
 import * as STEP from 'src/constants/onboarding/steps';
 import { Step } from 'src/types/onboarding';
+
 import { findNextStep, findPrevStep, isStepUsed } from '../steps';
 
 const firmwareStep: Step = {
diff --git a/packages/suite/src/utils/suite/__fixtures__/device.ts b/packages/suite/src/utils/suite/__fixtures__/device.ts
index 22e8890854b..7341600595e 100644
--- a/packages/suite/src/utils/suite/__fixtures__/device.ts
+++ b/packages/suite/src/utils/suite/__fixtures__/device.ts
@@ -1,8 +1,9 @@
 import { testMocks } from '@suite-common/test-utils';
-import type { TrezorDevice } from 'src/types/suite';
 import { DeviceModelInternal } from '@trezor/connect';
 import * as URLS from '@trezor/urls';
 
+import type { TrezorDevice } from 'src/types/suite';
+
 const { getSuiteDevice } = testMocks;
 
 const SUITE_DEVICE = getSuiteDevice();
@@ -540,7 +541,7 @@ const getCheckBackupUrl = [
                 internal_model: DeviceModelInternal.T2B1,
             },
         } as TrezorDevice,
-        result: URLS[`HELP_CENTER_DRY_RUN_${DeviceModelInternal.T2B1}_URL`],
+        result: URLS[`HELP_CENTER_DRY_RUN_${DeviceModelInternal.T3B1}_URL`],
     },
 ];
 
@@ -558,7 +559,7 @@ const getPackagingUrl = [
                 internal_model: DeviceModelInternal.T2B1,
             },
         } as TrezorDevice,
-        result: URLS[`HELP_CENTER_PACKAGING_${DeviceModelInternal.T2B1}_URL`],
+        result: URLS[`HELP_CENTER_PACKAGING_${DeviceModelInternal.T3B1}_URL`],
     },
 ];
 
@@ -576,7 +577,7 @@ const getFirmwareDowngradeUrl = [
                 internal_model: DeviceModelInternal.T2B1,
             },
         } as TrezorDevice,
-        result: URLS[`HELP_CENTER_FW_DOWNGRADE_${DeviceModelInternal.T2B1}_URL`],
+        result: URLS[`HELP_CENTER_FW_DOWNGRADE_${DeviceModelInternal.T3B1}_URL`],
     },
 ];
 
diff --git a/packages/suite/src/utils/suite/__fixtures__/homescreen.ts b/packages/suite/src/utils/suite/__fixtures__/homescreen.ts
index 1b64eec500f..00550a613f8 100644
--- a/packages/suite/src/utils/suite/__fixtures__/homescreen.ts
+++ b/packages/suite/src/utils/suite/__fixtures__/homescreen.ts
@@ -1,6 +1,7 @@
-import { deviceModelInformation } from 'src/utils/suite/homescreen';
 import { DeviceModelInternal } from '@trezor/connect';
 
+import { deviceModelInformation } from 'src/utils/suite/homescreen';
+
 export const isValidImageFormat = [
     {
         description: 'valid image format for T2T1',
diff --git a/packages/suite/src/utils/suite/__fixtures__/protocol.ts b/packages/suite/src/utils/suite/__fixtures__/protocol.ts
index 54f4db76583..6bc4297cc37 100644
--- a/packages/suite/src/utils/suite/__fixtures__/protocol.ts
+++ b/packages/suite/src/utils/suite/__fixtures__/protocol.ts
@@ -1,4 +1,23 @@
-export const getProtocolInfo = [
+import { Protocol } from '@suite-common/suite-constants';
+
+type getProtocolInfoResult =
+    | {
+          scheme: Protocol;
+          address: string;
+          amount?: number;
+      }
+    | {
+          error: string;
+          scheme: string;
+      };
+
+type getProtocolInfoFixture = {
+    description: string;
+    uri: string | null;
+    result: getProtocolInfoResult | null;
+};
+
+export const getProtocolInfo: getProtocolInfoFixture[] = [
     {
         description: 'should parse Bitcoin URI when address and amount are both available',
         uri: 'bitcoin:3QmuBaZrJNCxc5Xs7aGzZUK8RirUT8jRKf?amount=0.1',
@@ -86,7 +105,7 @@ export const getProtocolInfo = [
     {
         description: 'should log an error with non-existing scheme',
         uri: 'axie:3QmuBaZrJNCxc5Xs7aGzZUK8RirUT8jRKf?amount=0.1',
-        result: null,
+        result: { error: 'Unknown protocol', scheme: 'axie' },
     },
     {
         description: 'should log an error when address is missing',
@@ -94,21 +113,3 @@ export const getProtocolInfo = [
         result: null,
     },
 ];
-
-export const isPaymentRequestProtocolScheme = [
-    {
-        description: 'should validate bitcoin protocol as valid',
-        scheme: 'bitcoin',
-        result: true,
-    },
-    {
-        description: 'should validate litecoin protocol as valid',
-        scheme: 'litecoin',
-        result: true,
-    },
-    {
-        description: 'should validate axie protocol as invalid',
-        scheme: 'axie',
-        result: false,
-    },
-];
diff --git a/packages/suite/src/utils/suite/__fixtures__/stake.ts b/packages/suite/src/utils/suite/__fixtures__/stake.ts
index 324f097c7d2..29ed3412dab 100644
--- a/packages/suite/src/utils/suite/__fixtures__/stake.ts
+++ b/packages/suite/src/utils/suite/__fixtures__/stake.ts
@@ -47,19 +47,6 @@ export const transformTxFixtures = [
     },
 ];
 
-export const getUnstakingAmountFixtures = [
-    {
-        description: 'should correctly extract and convert the unstaking amount from ethereum data',
-        ethereumData: '76ec871c0000000000000000000000000000000000000000000000000000000000000001', // without 0x
-        expectedAmountWei: '1', // 0.000000000000000001 eth
-    },
-    {
-        description: 'should correctly remove 0x prefix from ethereum data',
-        ethereumData: '0x76ec871c0000000000000000000000000000000000000000000000000000000000000001', // with 0x
-        expectedAmountWei: '1', // 0.000000000000000001 eth
-    },
-];
-
 export const stakeFixture = [
     {
         description: 'should stake 0.1 eth, expect correct transaction object with correct values',
@@ -151,7 +138,7 @@ export const unstakeFixture = [
             amount: '0.1', // eth
             symbol: 'eth',
             identity: '0',
-            interchanges: 0,
+            interchanges: 5,
         },
         accountInfo: {
             success: true,
@@ -172,7 +159,7 @@ export const unstakeFixture = [
             },
         },
         result: {
-            data: '0x76ec871c000000000000000000000000000000000000000000000000016345785d8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001',
+            data: '0x76ec871c000000000000000000000000000000000000000000000000016345785d8a000000000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000001',
             from: '0xfB0bc552ab5Fa1971E8530852753c957e29eEEFC',
             gasLimit: 241000, // 21000 + 220000
             to: '0xD523794C879D9eC028960a231F866758e405bE34',
@@ -189,7 +176,7 @@ export const unstakeFailedFixture = [
             amount: '0.1', // eth
             symbol: 'eth',
             identity: '0',
-            interchanges: 0,
+            interchanges: 5,
         },
         accountInfo: {
             success: false,
@@ -212,7 +199,7 @@ export const unstakeFailedFixture = [
             amount: '0.1', // eth
             symbol: 'eth',
             identity: '0',
-            interchanges: 0,
+            interchanges: 5,
         },
         accountInfo: {
             success: true,
@@ -237,7 +224,7 @@ export const unstakeFailedFixture = [
             amount: '0.1', // eth
             symbol: 'eth',
             identity: '0',
-            interchanges: 0,
+            interchanges: 5,
         },
         accountInfo: {
             success: true,
@@ -266,7 +253,7 @@ export const unstakeFailedFixture = [
             amount: '0.1', // eth
             symbol: 'eth',
             identity: '0',
-            interchanges: 0,
+            interchanges: 5,
         },
         accountInfo: {
             success: true,
@@ -863,3 +850,30 @@ export const getChangedInternalTxFixture = [
         },
     },
 ];
+
+export const simulateUnstakeFixture = [
+    {
+        description: 'should return null for no coin, from, or data',
+        args: {
+            amount: undefined,
+            from: undefined,
+            symbol: undefined,
+        },
+        blockchainEvmRpcCallResult: {},
+        result: null,
+    },
+    {
+        description: 'should return approximated amount for valid inputs',
+        args: {
+            amount: '0.1',
+            from: '0xfB0bc552ab5Fa1971E8530852753c957e29eEEFC',
+            to: '0xAFA848357154a6a624686b348303EF9a13F63264',
+            symbol: 'eth',
+        },
+        blockchainEvmRpcCallResult: {
+            success: true,
+            payload: { data: '0x000000000000000000000000000000000000000000000000016345785d8a0000' },
+        },
+        result: '0.1', // 0.1 eth
+    },
+];
diff --git a/packages/suite/src/utils/suite/__tests__/homescreen.test.ts b/packages/suite/src/utils/suite/__tests__/homescreen.test.ts
index 47527fb00ce..7c256fe2561 100644
--- a/packages/suite/src/utils/suite/__tests__/homescreen.test.ts
+++ b/packages/suite/src/utils/suite/__tests__/homescreen.test.ts
@@ -1,3 +1,5 @@
+import { DeviceModelInternal } from '@trezor/connect';
+
 import {
     dataUrlToImage,
     fileToArrayBuffer,
@@ -8,8 +10,8 @@ import {
     isValidImageSize,
     isValidImageWidth,
 } from 'src/utils/suite/homescreen';
+
 import * as fixtures from '../__fixtures__/homescreen';
-import { DeviceModelInternal } from '@trezor/connect';
 
 describe('homescreen', () => {
     describe('fileToDataUrl', () => {
diff --git a/packages/suite/src/utils/suite/__tests__/logsUtils.test.ts b/packages/suite/src/utils/suite/__tests__/logsUtils.test.ts
index edb372869e8..c47c5ed650f 100644
--- a/packages/suite/src/utils/suite/__tests__/logsUtils.test.ts
+++ b/packages/suite/src/utils/suite/__tests__/logsUtils.test.ts
@@ -1,6 +1,7 @@
 import { testMocks } from '@suite-common/test-utils';
 import { discoveryActions } from '@suite-common/wallet-core';
 import { DiscoveryStatus } from '@suite-common/wallet-constants';
+import { StaticSessionId } from '@trezor/connect';
 
 import {
     redactAccount,
@@ -9,7 +10,6 @@ import {
     redactDiscovery,
     REDACTED_REPLACEMENT,
 } from 'src/utils/suite/logsUtils';
-import { StaticSessionId } from '@trezor/connect';
 
 describe('logsUtils', () => {
     const account = testMocks.getWalletAccount({
diff --git a/packages/suite/src/utils/suite/__tests__/metadata.test.ts b/packages/suite/src/utils/suite/__tests__/metadata.test.ts
index 6aee1c61867..50d9d639bab 100644
--- a/packages/suite/src/utils/suite/__tests__/metadata.test.ts
+++ b/packages/suite/src/utils/suite/__tests__/metadata.test.ts
@@ -1,4 +1,5 @@
 import fs from 'fs';
+
 import {
     encrypt,
     decrypt,
diff --git a/packages/suite/src/utils/suite/__tests__/parseUri.test.ts b/packages/suite/src/utils/suite/__tests__/parseUri.test.ts
index 012c854b602..215dc886b37 100644
--- a/packages/suite/src/utils/suite/__tests__/parseUri.test.ts
+++ b/packages/suite/src/utils/suite/__tests__/parseUri.test.ts
@@ -1,4 +1,5 @@
 import { parseUri, parseQuery } from 'src/utils/suite/parseUri';
+
 import * as fixtures from '../__fixtures__/parseUri';
 
 describe('parseUri', () => {
diff --git a/packages/suite/src/utils/suite/__tests__/protocol.test.ts b/packages/suite/src/utils/suite/__tests__/protocol.test.ts
index 08ccbc8e6b7..7b7abe603ce 100644
--- a/packages/suite/src/utils/suite/__tests__/protocol.test.ts
+++ b/packages/suite/src/utils/suite/__tests__/protocol.test.ts
@@ -1,6 +1,7 @@
 import { testMocks } from '@suite-common/test-utils';
 
-import { getProtocolInfo, isPaymentRequestProtocolScheme } from 'src/utils/suite/protocol';
+import { getProtocolInfo } from 'src/utils/suite/protocol';
+
 import * as fixtures from '../__fixtures__/protocol';
 
 jest.doMock('@trezor/suite-analytics', () => testMocks.getAnalytics());
@@ -12,11 +13,3 @@ describe('getProtocolInfo', () => {
         });
     });
 });
-
-describe('isPaymentRequestProtocolScheme', () => {
-    fixtures.isPaymentRequestProtocolScheme.forEach(f => {
-        it(f.description, () => {
-            expect(isPaymentRequestProtocolScheme(f.scheme)).toEqual(f.result);
-        });
-    });
-});
diff --git a/packages/suite/src/utils/suite/__tests__/reload.test.ts b/packages/suite/src/utils/suite/__tests__/reload.test.ts
index bd79aee15ad..0775536dc99 100644
--- a/packages/suite/src/utils/suite/__tests__/reload.test.ts
+++ b/packages/suite/src/utils/suite/__tests__/reload.test.ts
@@ -1,4 +1,5 @@
 import { desktopApi } from '@trezor/suite-desktop-api';
+
 import { reloadApp } from '../reload';
 
 describe('reloadApp', () => {
diff --git a/packages/suite/src/utils/suite/__tests__/stake.test.ts b/packages/suite/src/utils/suite/__tests__/stake.test.ts
index 3eb0c11acfe..fae40c39637 100644
--- a/packages/suite/src/utils/suite/__tests__/stake.test.ts
+++ b/packages/suite/src/utils/suite/__tests__/stake.test.ts
@@ -2,30 +2,18 @@ import TrezorConnect, {
     AccountInfo,
     InternalTransfer,
     Success,
+    SuccessWithDevice,
     Unsuccessful,
 } from '@trezor/connect';
 import {
-    transformTxFixtures,
-    stakeFixture,
-    stakeFailedFixture,
-    unstakeFixture,
-    unstakeFailedFixture,
-    claimFixture,
-    claimFailedFixture,
-    getStakeFormsDefaultValuesFixture,
-    getStakeTxGasLimitFixture,
-    getUnstakingPeriodInDaysFixture,
-    getDaysToAddToPoolFixture,
-    getDaysToUnstakeFixture,
-    getDaysToAddToPoolInitialFixture,
-    getAdjustedGasLimitConsumptionFixture,
-    getEthNetworkForWalletSdkFixture,
-    getInstantStakeTypeFixture,
-    getChangedInternalTxFixture,
-    getUnstakingAmountFixtures,
-} from '../__fixtures__/stake';
+    BlockchainEstimatedFee,
+    BlockchainEstimatedFeeLevel,
+} from '@trezor/connect/src/types/api/blockchainEstimateFee';
+import { WalletAccountTransaction } from '@suite-common/wallet-types';
+import { ValidatorsQueue } from '@suite-common/wallet-core';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+
 import {
-    getUnstakingAmount,
     transformTx,
     stake,
     unstake,
@@ -43,14 +31,28 @@ import {
     getEthNetworkForWalletSdk,
     getInstantStakeType,
     getChangedInternalTx,
+    simulateUnstake,
 } from '../stake';
 import {
-    BlockchainEstimatedFee,
-    BlockchainEstimatedFeeLevel,
-} from '@trezor/connect/src/types/api/blockchainEstimateFee';
-import { WalletAccountTransaction } from '@suite-common/wallet-types';
-import { ValidatorsQueue } from '@suite-common/wallet-core';
-import { NetworkSymbol } from '@suite-common/wallet-config';
+    transformTxFixtures,
+    stakeFixture,
+    stakeFailedFixture,
+    unstakeFixture,
+    unstakeFailedFixture,
+    claimFixture,
+    claimFailedFixture,
+    getStakeFormsDefaultValuesFixture,
+    getStakeTxGasLimitFixture,
+    getUnstakingPeriodInDaysFixture,
+    getDaysToAddToPoolFixture,
+    getDaysToUnstakeFixture,
+    getDaysToAddToPoolInitialFixture,
+    getAdjustedGasLimitConsumptionFixture,
+    getEthNetworkForWalletSdkFixture,
+    getInstantStakeTypeFixture,
+    getChangedInternalTxFixture,
+    simulateUnstakeFixture,
+} from '../__fixtures__/stake';
 
 describe('transformTx', () => {
     transformTxFixtures.forEach(test => {
@@ -62,15 +64,6 @@ describe('transformTx', () => {
     });
 });
 
-describe('getUnstakingAmount', () => {
-    getUnstakingAmountFixtures.forEach(test => {
-        it(test.description, () => {
-            const result = getUnstakingAmount(test.ethereumData);
-            expect(result).toBe(test.expectedAmountWei);
-        });
-    });
-});
-
 type Result<T> = Unsuccessful | Success<T>;
 type AccountInfoResult = Result<(AccountInfo | null)[]>;
 type EstimateFeeResult = Result<BlockchainEstimatedFeeLevel>;
@@ -265,3 +258,18 @@ describe('getChangedInternalTx', () => {
         });
     });
 });
+
+type BlockchainEvmRpcCallResult = Unsuccessful | SuccessWithDevice<{ data: string }>;
+type SimulateUnstakeArgs = StakeTxBaseArgs & { amount: string };
+
+describe('simulateUnstake', () => {
+    simulateUnstakeFixture.forEach(test => {
+        it(test.description, async () => {
+            jest.spyOn(TrezorConnect, 'blockchainEvmRpcCall').mockImplementation(() =>
+                Promise.resolve(test.blockchainEvmRpcCallResult as BlockchainEvmRpcCallResult),
+            );
+            const result = await simulateUnstake(test.args as SimulateUnstakeArgs);
+            expect(result).toEqual(test.result);
+        });
+    });
+});
diff --git a/packages/suite/src/utils/suite/__tests__/theme.test.ts b/packages/suite/src/utils/suite/__tests__/theme.test.ts
index 6ed9459a583..f70692f1138 100644
--- a/packages/suite/src/utils/suite/__tests__/theme.test.ts
+++ b/packages/suite/src/utils/suite/__tests__/theme.test.ts
@@ -1,4 +1,5 @@
 import { intermediaryTheme } from '@trezor/components';
+
 import { getThemeColors } from '../theme';
 
 describe('theme', () => {
diff --git a/packages/suite/src/utils/suite/__tests__/tor.test.ts b/packages/suite/src/utils/suite/__tests__/tor.test.ts
index f47985658ff..339bb5906a4 100644
--- a/packages/suite/src/utils/suite/__tests__/tor.test.ts
+++ b/packages/suite/src/utils/suite/__tests__/tor.test.ts
@@ -1,4 +1,5 @@
 import { TOR_URLS } from '@trezor/urls';
+
 import { getTorUrlIfAvailable, getIsTorDomain, isOnionUrl } from 'src/utils/suite/tor';
 
 describe('tor', () => {
diff --git a/packages/suite/src/utils/suite/anchor.ts b/packages/suite/src/utils/suite/anchor.ts
index 6ee47bd2074..49375b6e286 100644
--- a/packages/suite/src/utils/suite/anchor.ts
+++ b/packages/suite/src/utils/suite/anchor.ts
@@ -1,9 +1,9 @@
 import { css } from 'styled-components';
 
-import { AccountTransactionBaseAnchor, AnchorType } from 'src/constants/suite/anchors';
+import { borders } from '@trezor/theme';
 
+import { AccountTransactionBaseAnchor, AnchorType } from 'src/constants/suite/anchors';
 import type { WalletAccountTransaction } from 'src/types/wallet';
-import { borders } from '@trezor/theme';
 
 export const getTxIdFromAnchor = (anchor?: string): string => anchor?.split('/').pop() || '';
 
diff --git a/packages/suite/src/utils/suite/homescreen.ts b/packages/suite/src/utils/suite/homescreen.ts
index bf2d87c7ce4..815d845e41e 100644
--- a/packages/suite/src/utils/suite/homescreen.ts
+++ b/packages/suite/src/utils/suite/homescreen.ts
@@ -23,13 +23,14 @@ export const deviceModelInformation: Record<
     [DeviceModelInternal.T2B1]: safe3Information,
     [DeviceModelInternal.T3B1]: safe3Information,
     [DeviceModelInternal.T3T1]: { width: 240, height: 240, supports: ['jpeg'] },
+    [DeviceModelInternal.T3W1]: { width: 280, height: 520, supports: ['jpeg'] }, // TODO T3W1 - double check values
 };
 
 export const enum ImageValidationError {
     InvalidFormatOnlyPngJpg = 'IMAGE_VALIDATION_ERROR_INVALID_FORMAT_ONLY_PNG_JPG',
     InvalidFormatOnlyJpg = 'IMAGE_VALIDATION_ERROR_INVALID_FORMAT_ONLY_JPG',
     InvalidDimensions = 'IMAGE_VALIDATION_ERROR_INVALID_DIMENSIONS',
-    InvalidSize = 'IMAGE_VALIDATION_ERROR_INVALID_SIZE',
+    InvalidSize = 'IMAGE_VALIDATION_ERROR_INVALID_SIZE_JPG',
     ProgressiveJpgFormat = 'IMAGE_VALIDATION_ERROR_PROGRESSIVE_JPG',
     UnexpectedAlpha = 'IMAGE_VALIDATION_ERROR_UNEXPECTED_ALPHA',
     InvalidColorCombination = 'IMAGE_VALIDATION_ERROR_INVALID_COLOR_COMBINATION',
@@ -324,7 +325,7 @@ export const imagePathToHex = async (
         return Buffer.from(arrayBuffer).toString('hex');
     }
 
-    /* 
+    /*
     - However, this method accepts the Canvas format which changes the quality of image
     */
     const blob = await response.blob();
diff --git a/packages/suite/src/utils/suite/l10n.ts b/packages/suite/src/utils/suite/l10n.ts
index 26c027b37d1..ec798cff427 100644
--- a/packages/suite/src/utils/suite/l10n.ts
+++ b/packages/suite/src/utils/suite/l10n.ts
@@ -1,6 +1,7 @@
-import LANGUAGES, { Locale, TRANSLATION_PSEUDOLANGUAGE } from 'src/config/suite/languages';
 import { getPlatformLanguages } from '@trezor/env-utils';
 
+import LANGUAGES, { Locale, TRANSLATION_PSEUDOLANGUAGE } from 'src/config/suite/languages';
+
 const TRANSLATION_MODE_FLAG = 'translation_mode';
 const DEFAULT_LOCALE = 'en';
 
diff --git a/packages/suite/src/utils/suite/metadata.ts b/packages/suite/src/utils/suite/metadata.ts
index 71efb1081b0..1b07dde17ea 100644
--- a/packages/suite/src/utils/suite/metadata.ts
+++ b/packages/suite/src/utils/suite/metadata.ts
@@ -1,8 +1,10 @@
 import * as crypto from 'crypto';
 import base58check from 'bs58check';
-import { FetchIntervalTrackingId } from 'src/actions/suite/metadataProviderActions';
+
 import { DataType, MetadataProvider } from '@suite-common/metadata-types';
-import { TrezorDevice } from '@suite-common/suite-types';
+import { StaticSessionId } from '@trezor/connect';
+
+import { FetchIntervalTrackingId } from 'src/actions/suite/metadataProviderActions';
 
 // note we only need base58 conversion fn from base58check, other functions from there might
 // be supplemented from crypto module
@@ -152,7 +154,7 @@ export const urlSearchParams = (search: string) => {
 export const getFetchTrackingId = (
     dataType: DataType,
     clientId: MetadataProvider['clientId'],
-    deviceState: Required<TrezorDevice>['state'],
+    deviceState: StaticSessionId,
 ): FetchIntervalTrackingId => {
     return `${dataType}-${clientId}-${deviceState}`;
 };
diff --git a/packages/suite/src/utils/suite/notification.ts b/packages/suite/src/utils/suite/notification.ts
index 03a19d27cee..c80db2caac5 100644
--- a/packages/suite/src/utils/suite/notification.ts
+++ b/packages/suite/src/utils/suite/notification.ts
@@ -1,7 +1,8 @@
 import { NotificationEntry } from '@suite-common/toast-notifications';
+import { intermediaryTheme } from '@trezor/components';
+
 import { ToastNotificationVariant, AppState } from 'src/types/suite';
 import type { NotificationViewProps } from 'src/components/suite';
-import { intermediaryTheme } from '@trezor/components';
 
 export const getNotificationIcon = (variant: ToastNotificationVariant) => {
     switch (variant) {
diff --git a/packages/suite/src/utils/suite/oauth.ts b/packages/suite/src/utils/suite/oauth.ts
index 7c98f62f29c..dbe7dbc8a31 100644
--- a/packages/suite/src/utils/suite/oauth.ts
+++ b/packages/suite/src/utils/suite/oauth.ts
@@ -1,7 +1,8 @@
 import { desktopApi } from '@trezor/suite-desktop-api';
+import { Deferred, createDeferred } from '@trezor/utils';
+
 import { getPrefixedURL } from 'src/utils/suite/router';
 import { METADATA_PROVIDER } from 'src/actions/suite/constants';
-import { Deferred, createDeferred } from '@trezor/utils';
 import { urlHashParams, urlSearchParams } from 'src/utils/suite/metadata';
 
 /**
diff --git a/packages/suite/src/utils/suite/parseUri.ts b/packages/suite/src/utils/suite/parseUri.ts
index bc2ab9846e5..eb832b7dd35 100644
--- a/packages/suite/src/utils/suite/parseUri.ts
+++ b/packages/suite/src/utils/suite/parseUri.ts
@@ -6,7 +6,7 @@ export const parseQuery = (uri: string) => {
         new URLSearchParams(uri.substring(index)).forEach((v, k) => {
             params[k] = v;
         });
-    } catch (e) {
+    } catch {
         // empty
     }
 
@@ -16,7 +16,7 @@ export const parseQuery = (uri: string) => {
 export const parseUri = (uri: string) => {
     try {
         return new URL(uri);
-    } catch (e) {
+    } catch {
         // empty
     }
 };
diff --git a/packages/suite/src/utils/suite/passwords.ts b/packages/suite/src/utils/suite/passwords.ts
index f162e606886..f3b6d33f2a2 100644
--- a/packages/suite/src/utils/suite/passwords.ts
+++ b/packages/suite/src/utils/suite/passwords.ts
@@ -1,7 +1,7 @@
 export const getDisplayKey = (title: string, username: string) => {
     try {
         return `Unlock ${new URL(title).host} for user ${username}?`;
-    } catch (err) {
+    } catch {
         return `Unlock ${title} for user ${username}?`;
     }
 };
diff --git a/packages/suite/src/utils/suite/prerequisites.ts b/packages/suite/src/utils/suite/prerequisites.ts
index ff5ce7f5559..5c3521dae4a 100644
--- a/packages/suite/src/utils/suite/prerequisites.ts
+++ b/packages/suite/src/utils/suite/prerequisites.ts
@@ -1,7 +1,9 @@
 import type { TransportInfo } from '@trezor/connect';
 import { DefinedUnionMember } from '@trezor/type-utils';
+
 import { RouterState } from 'src/reducers/suite/routerReducer';
 import type { TrezorDevice, AppState } from 'src/types/suite';
+
 import {
     isAdditionalShamirBackupInProgress,
     isRecoveryInProgress,
diff --git a/packages/suite/src/utils/suite/protocol.ts b/packages/suite/src/utils/suite/protocol.ts
index eea8312c44d..9547bbda122 100644
--- a/packages/suite/src/utils/suite/protocol.ts
+++ b/packages/suite/src/utils/suite/protocol.ts
@@ -1,24 +1,25 @@
-import { PROTOCOL_SCHEME } from 'src/constants/suite/protocol';
-import { parseQuery, parseUri } from './parseUri';
+import { Protocol } from '@suite-common/suite-constants';
+import { getNetworkSymbolForProtocol } from '@suite-common/suite-utils';
 import { analytics, EventType } from '@trezor/suite-analytics';
 
+import { parseQuery, parseUri } from './parseUri';
+
 export type CoinProtocolInfo = {
-    scheme: PROTOCOL_SCHEME;
+    scheme: Protocol;
     address: string;
     amount?: number;
 };
 
-export const isPaymentRequestProtocolScheme = (scheme: string): scheme is PROTOCOL_SCHEME =>
-    Object.values(PROTOCOL_SCHEME).includes(scheme as PROTOCOL_SCHEME);
-
 const removeLeadingTrailingSlashes = (text: string) => text.replace(/^\/{0,2}|\/$/g, '');
 
-export const getProtocolInfo = (uri: string): CoinProtocolInfo | null => {
+export const getProtocolInfo = (
+    uri: string,
+): CoinProtocolInfo | null | { error: string; scheme: string } => {
     const url = parseUri(uri);
 
     if (url) {
         const { protocol, pathname, host, search } = url;
-        const scheme = protocol.slice(0, -1); // slice ":" from protocol
+        const scheme = protocol.slice(0, -1) as Protocol; // slice ":" from protocol
         const params = parseQuery(search);
 
         analytics.report({
@@ -29,21 +30,23 @@ export const getProtocolInfo = (uri: string): CoinProtocolInfo | null => {
             },
         });
 
-        if (isPaymentRequestProtocolScheme(scheme)) {
-            if (!pathname && !host) return null; // address may be in pathname (regular bitcoin:addr) or host (bitcoin://addr)
+        if (!getNetworkSymbolForProtocol(scheme)) {
+            return { error: 'Unknown protocol', scheme };
+        }
 
-            const floatAmount = Number.parseFloat(params.amount ?? '');
-            const amount = !Number.isNaN(floatAmount) && floatAmount > 0 ? floatAmount : undefined;
+        if (!pathname && !host) return null; // address may be in pathname (regular bitcoin:addr) or host (bitcoin://addr)
 
-            const address =
-                removeLeadingTrailingSlashes(pathname) || removeLeadingTrailingSlashes(host);
+        const floatAmount = Number.parseFloat(params.amount ?? '');
+        const amount = !Number.isNaN(floatAmount) && floatAmount > 0 ? floatAmount : undefined;
 
-            return {
-                scheme,
-                address,
-                amount,
-            };
-        }
+        const address =
+            removeLeadingTrailingSlashes(pathname) || removeLeadingTrailingSlashes(host);
+
+        return {
+            scheme,
+            address,
+            amount,
+        };
     }
 
     return null;
diff --git a/packages/suite/src/utils/suite/stake.ts b/packages/suite/src/utils/suite/stake.ts
index b86d18e6050..de234340fee 100644
--- a/packages/suite/src/utils/suite/stake.ts
+++ b/packages/suite/src/utils/suite/stake.ts
@@ -1,19 +1,27 @@
+import { selectNetwork } from '@everstake/wallet-sdk/ethereum';
+import { fromWei, numberToHex, toWei } from 'web3-utils';
+
 import {
     PrecomposedLevels,
     StakeFormState,
     StakeType,
     WalletAccountTransaction,
 } from '@suite-common/wallet-types';
-import { DEFAULT_PAYMENT } from '@suite-common/wallet-constants';
+import {
+    DEFAULT_PAYMENT,
+    STAKE_GAS_LIMIT_RESERVE,
+    MIN_ETH_AMOUNT_FOR_STAKING,
+    MAX_ETH_AMOUNT_FOR_STAKING,
+    UNSTAKE_INTERCHANGES,
+} from '@suite-common/wallet-constants';
 import { NetworkSymbol } from '@suite-common/wallet-config';
-import { selectNetwork } from '@everstake/wallet-sdk/ethereum';
-import { fromWei, hexToNumberString, numberToHex, toWei } from 'web3-utils';
 import { getEthereumEstimateFeeParams, isPending, sanitizeHex } from '@suite-common/wallet-utils';
 import TrezorConnect, { EthereumTransaction, Success, InternalTransfer } from '@trezor/connect';
 import { BigNumber } from '@trezor/utils/src/bigNumber';
-import { STAKE_GAS_LIMIT_RESERVE, ValidatorsQueue } from '@suite-common/wallet-core';
+import { ValidatorsQueue } from '@suite-common/wallet-core';
 import { BlockchainEstimatedFee } from '@trezor/connect/src/types/api/blockchainEstimateFee';
-import { MIN_ETH_AMOUNT_FOR_STAKING } from 'src/constants/suite/ethStaking';
+
+import { TranslationFunction } from 'src/hooks/suite/useTranslation';
 
 // source is a required parameter for some functions in the Everstake Wallet SDK.
 // This parameter is used for some contract calls.
@@ -360,7 +368,7 @@ export const prepareUnstakeEthTx = async ({
     nonce,
     chainId,
     identity,
-    interchanges = 0,
+    interchanges = UNSTAKE_INTERCHANGES,
 }: PrepareUnstakeEthTxParams): Promise<PrepareStakeEthTxResponse> => {
     try {
         const tx = await unstake({
@@ -464,7 +472,7 @@ export const getStakeTxGasLimit = async ({
             txData = await unstake({
                 from,
                 amount,
-                interchanges: 0,
+                interchanges: UNSTAKE_INTERCHANGES,
                 symbol,
                 identity,
             });
@@ -559,16 +567,6 @@ export const getDaysToAddToPoolInitial = (validatorsQueue?: ValidatorsQueue) =>
     return daysToWait <= 0 ? 1 : daysToWait;
 };
 
-export const getUnstakingAmount = (ethereumData: string | undefined): string | null => {
-    if (!ethereumData) return null;
-
-    // Check if the first two characters are '0x' and remove them if they are
-    const data = ethereumData.startsWith('0x') ? ethereumData.slice(2) : ethereumData;
-    const dataBuffer = Buffer.from(data, 'hex');
-
-    return hexToNumberString(`0x${dataBuffer.subarray(4, 36).toString('hex')}`);
-};
-
 export const getInstantStakeType = (
     internalTransfer: InternalTransfer,
     address?: string,
@@ -618,3 +616,54 @@ export const getChangedInternalTx = (
 
     return internalTransfer ?? null;
 };
+
+export const calculateGains = (input: string, apy: number, divisor: number) => {
+    const amount = new BigNumber(input).multipliedBy(apy).dividedBy(100).dividedBy(divisor);
+
+    return amount.toFixed(5, 1);
+};
+
+interface ValidateMaxOptions {
+    except?: boolean;
+}
+
+export const validateStakingMax =
+    (translationString: TranslationFunction, options?: ValidateMaxOptions) => (value: string) => {
+        if (!options?.except && value && BigNumber(value).gt(MAX_ETH_AMOUNT_FOR_STAKING)) {
+            return translationString('AMOUNT_EXCEEDS_MAX', {
+                maxAmount: MAX_ETH_AMOUNT_FOR_STAKING.toString(),
+            });
+        }
+    };
+export const simulateUnstake = async ({
+    amount,
+    from,
+    symbol,
+}: StakeTxBaseArgs & { amount: string }) => {
+    const ethNetwork = getEthNetworkForWalletSdk(symbol);
+    const { address_pool: poolAddress, contract_pool: contractPool } = selectNetwork(ethNetwork);
+
+    if (!amount || !from || !symbol) return null;
+
+    const amountWei = toWei(amount, 'ether');
+
+    const data = contractPool.methods
+        .unstake(amountWei, UNSTAKE_INTERCHANGES, WALLET_SDK_SOURCE)
+        .encodeABI();
+    if (!data) return null;
+
+    const ethereumData = await TrezorConnect.blockchainEvmRpcCall({
+        coin: symbol,
+        from,
+        to: poolAddress,
+        data,
+    });
+
+    if (!ethereumData.success) {
+        throw new Error(ethereumData.payload.error);
+    }
+
+    const approximatedAmount = ethereumData.payload.data;
+
+    return fromWei(approximatedAmount, 'ether');
+};
diff --git a/packages/suite/src/utils/suite/storage.ts b/packages/suite/src/utils/suite/storage.ts
index 416072ec271..3b27a8d655f 100644
--- a/packages/suite/src/utils/suite/storage.ts
+++ b/packages/suite/src/utils/suite/storage.ts
@@ -1,5 +1,6 @@
 import { Discovery } from '@suite-common/wallet-types';
 import { connectInitThunk } from '@suite-common/connect-init';
+import { DeviceWithEmptyPath } from '@suite-common/suite-types';
 
 import { AcquiredDevice } from 'src/types/suite';
 import { CoinjoinAccount } from 'src/types/wallet/coinjoin';
@@ -15,8 +16,11 @@ export const serializeDiscovery = (discovery: Discovery) => ({ ...discovery, run
  * Strip fields from Device
  * @param {AcquiredDevice} device
  */
-export const serializeDevice = (device: AcquiredDevice, forceRemember?: true) => {
-    const sd = {
+export const serializeDevice = (
+    device: AcquiredDevice,
+    forceRemember?: true,
+): DeviceWithEmptyPath => {
+    const sd: DeviceWithEmptyPath = {
         ...device,
         path: '',
         remember: true,
diff --git a/packages/suite/src/utils/suite/theme.ts b/packages/suite/src/utils/suite/theme.ts
index 400dbad7e91..677ab210636 100644
--- a/packages/suite/src/utils/suite/theme.ts
+++ b/packages/suite/src/utils/suite/theme.ts
@@ -1,4 +1,5 @@
 import { intermediaryTheme } from '@trezor/components/src/config/colors';
+
 import type { AppState } from 'src/types/suite';
 
 export const getThemeColors = (theme: AppState['suite']['settings']['theme']) => {
diff --git a/packages/suite/src/utils/suite/tor.ts b/packages/suite/src/utils/suite/tor.ts
index 2ccb0c2e90b..f5d7f210f55 100644
--- a/packages/suite/src/utils/suite/tor.ts
+++ b/packages/suite/src/utils/suite/tor.ts
@@ -1,5 +1,6 @@
 import { parseHostname, urlToOnion } from '@trezor/utils';
 import { TOR_URLS } from '@trezor/urls';
+
 import { TorStatus } from 'src/types/suite';
 
 /**
diff --git a/packages/suite/src/utils/suite/validation.ts b/packages/suite/src/utils/suite/validation.ts
index 1fddfeab2d5..3e54dd008d8 100644
--- a/packages/suite/src/utils/suite/validation.ts
+++ b/packages/suite/src/utils/suite/validation.ts
@@ -7,9 +7,10 @@ import {
     formatNetworkAmount,
     isDecimalsValid,
     isInteger,
-    networkAmountToSatoshi,
+    networkAmountToSmallestUnit,
 } from '@suite-common/wallet-utils';
 import { BigNumber } from '@trezor/utils/src/bigNumber';
+
 import { TranslationFunction } from 'src/hooks/suite/useTranslation';
 import { AmountLimits } from 'src/types/wallet/coinmarketCommonTypes';
 
@@ -59,11 +60,11 @@ export const validateLimits =
             let minCrypto = 0;
             if (amountLimits.minCrypto) {
                 minCrypto = areSatsUsed
-                    ? Number(networkAmountToSatoshi(amountLimits.minCrypto.toString(), symbol))
+                    ? Number(networkAmountToSmallestUnit(amountLimits.minCrypto.toString(), symbol))
                     : amountLimits.minCrypto;
             }
             if (amountLimits.minCrypto && Number(value) < minCrypto) {
-                return translationString('TR_VALIDATION_ERROR_MINIMUM_CRYPTO', {
+                return translationString('TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO', {
                     minimum: formatter.format(amountLimits.minCrypto.toString(), {
                         isBalance: true,
                         symbol,
@@ -74,11 +75,11 @@ export const validateLimits =
             let maxCrypto = 0;
             if (amountLimits.maxCrypto) {
                 maxCrypto = areSatsUsed
-                    ? Number(networkAmountToSatoshi(amountLimits.maxCrypto.toString(), symbol))
+                    ? Number(networkAmountToSmallestUnit(amountLimits.maxCrypto.toString(), symbol))
                     : amountLimits.maxCrypto;
             }
             if (amountLimits.maxCrypto && Number(value) > maxCrypto) {
-                return translationString('TR_VALIDATION_ERROR_MAXIMUM_CRYPTO', {
+                return translationString('TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO', {
                     maximum: formatter.format(amountLimits.maxCrypto.toString(), {
                         isBalance: true,
                         symbol,
@@ -106,12 +107,12 @@ export const validateLimitsBigNum =
             if (amountLimits.minCrypto) {
                 minCrypto = areSatsUsed
                     ? new BigNumber(
-                          networkAmountToSatoshi(amountLimits.minCrypto.toString(), symbol),
+                          networkAmountToSmallestUnit(amountLimits.minCrypto.toString(), symbol),
                       )
                     : new BigNumber(amountLimits.minCrypto);
             }
             if (amountLimits.minCrypto && new BigNumber(value).lt(minCrypto)) {
-                return translationString('TR_VALIDATION_ERROR_MINIMUM_CRYPTO', {
+                return translationString('TR_BUY_VALIDATION_ERROR_MINIMUM_CRYPTO', {
                     minimum: formatter.format(amountLimits.minCrypto.toString(), {
                         isBalance: true,
                         symbol,
@@ -123,12 +124,12 @@ export const validateLimitsBigNum =
             if (amountLimits.maxCrypto) {
                 maxCrypto = areSatsUsed
                     ? new BigNumber(
-                          networkAmountToSatoshi(amountLimits.maxCrypto.toString(), symbol),
+                          networkAmountToSmallestUnit(amountLimits.maxCrypto.toString(), symbol),
                       )
                     : new BigNumber(amountLimits.maxCrypto);
             }
             if (amountLimits.maxCrypto && new BigNumber(value).gt(maxCrypto)) {
-                return translationString('TR_VALIDATION_ERROR_MAXIMUM_CRYPTO', {
+                return translationString('TR_BUY_VALIDATION_ERROR_MAXIMUM_CRYPTO', {
                     maximum: formatter.format(amountLimits.maxCrypto.toString(), {
                         isBalance: true,
                         symbol,
diff --git a/packages/suite/src/utils/wallet/__fixtures__/coinjoinUtils.ts b/packages/suite/src/utils/wallet/__fixtures__/coinjoinUtils.ts
index cf2acb0c5e0..62a0af28506 100644
--- a/packages/suite/src/utils/wallet/__fixtures__/coinjoinUtils.ts
+++ b/packages/suite/src/utils/wallet/__fixtures__/coinjoinUtils.ts
@@ -1,5 +1,7 @@
 import { RoundPhase, SessionPhase } from '@trezor/coinjoin';
+
 import { ANONYMITY_GAINS_HINDSIGHT_COUNT } from 'src/services/coinjoin';
+
 import * as coinjoinUtils from '../coinjoinUtils';
 
 const baseUtxo = {
diff --git a/packages/suite/src/utils/wallet/__tests__/coinjoinUtils.test.ts b/packages/suite/src/utils/wallet/__tests__/coinjoinUtils.test.ts
index e1808531094..b6ee64293f4 100644
--- a/packages/suite/src/utils/wallet/__tests__/coinjoinUtils.test.ts
+++ b/packages/suite/src/utils/wallet/__tests__/coinjoinUtils.test.ts
@@ -28,7 +28,7 @@ describe('getRoundPhaseFromSessionPhase', () => {
             const getSessionPhase = () => coinjoinUtils.getRoundPhaseFromSessionPhase(sessionPhase);
 
             if (result === 'error') {
-                expect(getSessionPhase).toThrowError();
+                expect(getSessionPhase).toThrow();
             } else {
                 expect(getSessionPhase()).toEqual(result);
             }
@@ -43,7 +43,7 @@ describe('getFirstSessionPhaseFromRoundPhase', () => {
                 coinjoinUtils.getFirstSessionPhaseFromRoundPhase(roundPhase);
 
             if (result === 'error') {
-                expect(getSessionPhase).toThrowError();
+                expect(getSessionPhase).toThrow();
             } else {
                 expect(getSessionPhase()).toEqual(result);
             }
diff --git a/packages/suite/src/utils/wallet/accountUtils.ts b/packages/suite/src/utils/wallet/accountUtils.ts
index 4cf11b7bac8..18557c67c5c 100644
--- a/packages/suite/src/utils/wallet/accountUtils.ts
+++ b/packages/suite/src/utils/wallet/accountUtils.ts
@@ -1,8 +1,10 @@
 import { Account } from '@suite-common/wallet-types';
+import { StaticSessionId } from '@trezor/connect';
+
 import { WalletParams } from 'src/types/wallet';
 
 export const getSelectedAccount = (
-    deviceState: string | typeof undefined,
+    deviceState: StaticSessionId | typeof undefined,
     accounts: Account[],
     routerParams: WalletParams | undefined,
 ) => {
diff --git a/packages/suite/src/utils/wallet/coinjoinUtils.ts b/packages/suite/src/utils/wallet/coinjoinUtils.ts
index 1979e2319f6..5ee6b932844 100644
--- a/packages/suite/src/utils/wallet/coinjoinUtils.ts
+++ b/packages/suite/src/utils/wallet/coinjoinUtils.ts
@@ -1,21 +1,9 @@
-import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { createHash } from 'crypto';
 import hoursToMilliseconds from 'date-fns/hoursToMilliseconds';
 
+import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { getUtxoOutpoint, getBip43Type } from '@suite-common/wallet-utils';
 import { Account, SelectedAccountStatus } from '@suite-common/wallet-types';
-import {
-    ANONYMITY_GAINS_HINDSIGHT_COUNT,
-    ANONYMITY_GAINS_HINDSIGHT_DAYS,
-    MAX_ROUNDS_ALLOWED,
-    ESTIMATED_MIN_ROUNDS_NEEDED,
-    SKIP_ROUNDS_VALUE_WHEN_ENABLED,
-} from 'src/services/coinjoin/config';
-import {
-    AnonymityGainPerRound,
-    CoinjoinAccount,
-    CoinjoinSessionParameters,
-} from 'src/types/wallet/coinjoin';
 import { AnonymitySet } from '@trezor/blockchain-link';
 import {
     CoinjoinStatusEvent,
@@ -25,6 +13,19 @@ import {
     RoundPhase,
 } from '@trezor/coinjoin';
 
+import {
+    AnonymityGainPerRound,
+    CoinjoinAccount,
+    CoinjoinSessionParameters,
+} from 'src/types/wallet/coinjoin';
+import {
+    ANONYMITY_GAINS_HINDSIGHT_COUNT,
+    ANONYMITY_GAINS_HINDSIGHT_DAYS,
+    MAX_ROUNDS_ALLOWED,
+    ESTIMATED_MIN_ROUNDS_NEEDED,
+    SKIP_ROUNDS_VALUE_WHEN_ENABLED,
+} from 'src/services/coinjoin/config';
+
 export type CoinjoinBalanceBreakdown = {
     notAnonymized: string;
     anonymized: string;
diff --git a/packages/suite/src/utils/wallet/coinmarket/__fixtures__/buyUtils.ts b/packages/suite/src/utils/wallet/coinmarket/__fixtures__/buyUtils.ts
index 7ef330386be..8ac404e66c7 100644
--- a/packages/suite/src/utils/wallet/coinmarket/__fixtures__/buyUtils.ts
+++ b/packages/suite/src/utils/wallet/coinmarket/__fixtures__/buyUtils.ts
@@ -1,10 +1,12 @@
 import { BuyTrade, BuyTradeQuoteRequest, CryptoId } from 'invity-api';
 
+const bitcoin = 'bitcoin' as CryptoId;
+
 export const QUOTE_REQUEST_FIAT: BuyTradeQuoteRequest = {
     wantCrypto: false,
     country: 'CZ',
     fiatCurrency: 'EUR',
-    receiveCurrency: 'BTC' as CryptoId,
+    receiveCurrency: bitcoin,
     fiatStringAmount: '10',
 };
 
@@ -12,7 +14,7 @@ export const QUOTE_REQUEST_CRYPTO: BuyTradeQuoteRequest = {
     wantCrypto: true,
     country: 'CZ',
     fiatCurrency: 'EUR',
-    receiveCurrency: 'BTC' as CryptoId,
+    receiveCurrency: bitcoin,
     cryptoStringAmount: '0.001',
 };
 
@@ -20,7 +22,7 @@ export const MIN_MAX_QUOTES_OK: BuyTrade[] = [
     {
         fiatStringAmount: '10',
         fiatCurrency: 'EUR',
-        receiveCurrency: 'BTC' as CryptoId,
+        receiveCurrency: bitcoin,
         receiveStringAmount: '0.0005',
         rate: 20000,
         quoteId: 'fc12d4c4-9078-4175-becd-90fc58a3145c',
@@ -36,7 +38,7 @@ export const MIN_MAX_QUOTES_OK: BuyTrade[] = [
     {
         fiatStringAmount: '10',
         fiatCurrency: 'EUR',
-        receiveCurrency: 'BTC' as CryptoId,
+        receiveCurrency: bitcoin,
         receiveStringAmount: '0.0010001683607972866',
         rate: 9998.316675433,
         quoteId: 'ff259797-6cbe-4fea-8330-5181353f64a0',
@@ -50,7 +52,7 @@ export const MIN_MAX_QUOTES_OK: BuyTrade[] = [
     {
         fiatStringAmount: '10',
         fiatCurrency: 'EUR',
-        receiveCurrency: 'BTC' as CryptoId,
+        receiveCurrency: bitcoin,
         receiveStringAmount: '0',
         rate: 0,
         error: 'Transaction amount too low. Please enter a value of 43 EUR or more.',
@@ -67,7 +69,7 @@ export const MIN_MAX_QUOTES_LOW: BuyTrade[] = [
     {
         fiatStringAmount: '10',
         fiatCurrency: 'EUR',
-        receiveCurrency: 'BTC' as CryptoId,
+        receiveCurrency: bitcoin,
         receiveStringAmount: '0.0005',
         rate: 20000,
         quoteId: 'fc12d4c4-9078-4175-becd-90fc58a3145c',
@@ -82,7 +84,7 @@ export const MIN_MAX_QUOTES_LOW: BuyTrade[] = [
     {
         fiatStringAmount: '10',
         fiatCurrency: 'EUR',
-        receiveCurrency: 'BTC' as CryptoId,
+        receiveCurrency: bitcoin,
         receiveStringAmount: '0.0010001683607972866',
         rate: 9998.316675433,
         quoteId: 'ff259797-6cbe-4fea-8330-5181353f64a0',
@@ -97,7 +99,7 @@ export const MIN_MAX_QUOTES_LOW: BuyTrade[] = [
     {
         fiatStringAmount: '10',
         fiatCurrency: 'EUR',
-        receiveCurrency: 'BTC' as CryptoId,
+        receiveCurrency: bitcoin,
         receiveStringAmount: '0',
         rate: 0,
         error: 'Transaction amount too low. Please enter a value of 43 EUR or more.',
@@ -114,7 +116,7 @@ export const MIN_MAX_QUOTES_HIGH: BuyTrade[] = [
     {
         fiatStringAmount: '100000',
         fiatCurrency: 'EUR',
-        receiveCurrency: 'BTC' as CryptoId,
+        receiveCurrency: bitcoin,
         receiveStringAmount: '9.8414',
         rate: 10161.15593309895,
         quoteId: '0e1966dc-83c7-4b98-9b93-d8a5e426b3d3',
@@ -129,7 +131,7 @@ export const MIN_MAX_QUOTES_HIGH: BuyTrade[] = [
     {
         fiatStringAmount: '100000',
         fiatCurrency: 'EUR',
-        receiveCurrency: 'BTC' as CryptoId,
+        receiveCurrency: bitcoin,
         receiveStringAmount: '10.010215580340265',
         rate: 9989.794844818,
         quoteId: 'f1a4cf48-ebdb-4dac-b049-2dbd086dd68d',
@@ -144,7 +146,7 @@ export const MIN_MAX_QUOTES_HIGH: BuyTrade[] = [
     {
         fiatStringAmount: '100000',
         fiatCurrency: 'EUR',
-        receiveCurrency: 'BTC' as CryptoId,
+        receiveCurrency: bitcoin,
         receiveStringAmount: '9.8414',
         rate: 0,
         error: 'Transaction amount too high. Please enter a value of 17050 EUR or less.',
@@ -161,7 +163,7 @@ export const ALTERNATIVE_QUOTES: BuyTrade[] = [
     {
         fiatStringAmount: '47.12',
         fiatCurrency: 'EUR',
-        receiveCurrency: 'BTC' as CryptoId,
+        receiveCurrency: bitcoin,
         receiveStringAmount: '0.004705020432603938',
         rate: 10014.834297738,
         quoteId: 'd369ba9e-7370-4a6e-87dc-aefd3851c735',
@@ -176,7 +178,7 @@ export const ALTERNATIVE_QUOTES: BuyTrade[] = [
     {
         fiatStringAmount: '47.12',
         fiatCurrency: 'EUR',
-        receiveCurrency: 'BTC' as CryptoId,
+        receiveCurrency: bitcoin,
         receiveStringAmount: '0.0041',
         rate: 11492.682926829268,
         quoteId: '53233267-8181-4151-9a67-9d8efc9a15db',
@@ -191,7 +193,7 @@ export const ALTERNATIVE_QUOTES: BuyTrade[] = [
     {
         fiatStringAmount: '47.12',
         fiatCurrency: 'EUR',
-        receiveCurrency: 'BTC' as CryptoId,
+        receiveCurrency: bitcoin,
         receiveStringAmount: '0.00391181',
         rate: 12045.57481063753,
         quoteId: 'd12bbe83-32a9-4dd9-abb4-0fdbddee70fb',
@@ -207,7 +209,7 @@ export const ALTERNATIVE_QUOTES: BuyTrade[] = [
     {
         fiatStringAmount: '1234',
         fiatCurrency: 'CZK',
-        receiveCurrency: 'BTC' as CryptoId,
+        receiveCurrency: bitcoin,
         receiveStringAmount: '0.00386933',
         rate: 318918.26233482285,
         quoteId: 'c9ff416d-2c52-4cc1-ba9c-7c61cb136f1c',
diff --git a/packages/suite/src/utils/wallet/coinmarket/__fixtures__/exchangeUtils.ts b/packages/suite/src/utils/wallet/coinmarket/__fixtures__/exchangeUtils.ts
index e05d3f5fafc..22acce6e521 100644
--- a/packages/suite/src/utils/wallet/coinmarket/__fixtures__/exchangeUtils.ts
+++ b/packages/suite/src/utils/wallet/coinmarket/__fixtures__/exchangeUtils.ts
@@ -1,6 +1,18 @@
-import { ExchangeInfo } from 'src/actions/wallet/coinmarketExchangeActions';
 import { CryptoId, ExchangeTrade } from 'invity-api';
 
+import { ExchangeInfo } from 'src/actions/wallet/coinmarketExchangeActions';
+
+const litecoin = 'litecoin' as CryptoId;
+const bitcoin = 'bitcoin' as CryptoId;
+const ethereum = 'ethereum' as CryptoId;
+const cronoseth = 'ethereum__0xa0b73e1ff0b80914ab6fe0444e65848c4c34450b' as CryptoId;
+
+const tickers1 = [ethereum, 'monero', bitcoin] as CryptoId[];
+const tickers2 = [ethereum, bitcoin] as CryptoId[];
+const tickers3 = [bitcoin] as CryptoId[];
+const tickers4 = [ethereum] as CryptoId[];
+const tickers5 = [cronoseth] as CryptoId[];
+
 export const EXCHANGE_INFO: ExchangeInfo = {
     exchangeList: [
         {
@@ -10,8 +22,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: false,
             isDex: false,
-            buyTickers: ['ETH', 'XMR', 'BTC'] as CryptoId[],
-            sellTickers: ['ETH', 'XMR', 'BTC'] as CryptoId[],
+            buyTickers: tickers1,
+            sellTickers: tickers1,
             addressFormats: {
                 BCH: 'legacy',
                 LTC: 'type3',
@@ -30,8 +42,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: true,
             isDex: false,
-            buyTickers: ['ETH', 'BTC'] as CryptoId[],
-            sellTickers: ['ETH', 'BTC'] as CryptoId[],
+            buyTickers: tickers2,
+            sellTickers: tickers2,
             addressFormats: {
                 BCH: 'legacy',
                 LTC: 'type3',
@@ -50,8 +62,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: false,
             isDex: false,
-            buyTickers: ['BTC', 'ETH'] as CryptoId[],
-            sellTickers: ['BTC', 'ETH'] as CryptoId[],
+            buyTickers: tickers2,
+            sellTickers: tickers2,
             addressFormats: {
                 BCH: 'cashaddr',
                 LTC: 'type3',
@@ -70,8 +82,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: true,
             isDex: false,
-            buyTickers: ['BTC', 'ETH'] as CryptoId[],
-            sellTickers: ['BTC', 'ETH'] as CryptoId[],
+            buyTickers: tickers2,
+            sellTickers: tickers2,
             addressFormats: {
                 BCH: 'cashaddr',
                 LTC: 'type3',
@@ -90,8 +102,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: false,
             isDex: false,
-            buyTickers: ['BTC'] as CryptoId[],
-            sellTickers: ['BTC'] as CryptoId[],
+            buyTickers: tickers3,
+            sellTickers: tickers3,
             addressFormats: {
                 BCH: 'legacy',
                 LTC: 'type3',
@@ -110,8 +122,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: true,
             isDex: false,
-            buyTickers: ['BTC'] as CryptoId[],
-            sellTickers: ['BTC'] as CryptoId[],
+            buyTickers: tickers3,
+            sellTickers: tickers3,
             addressFormats: {
                 BCH: 'legacy',
                 LTC: 'type3',
@@ -130,8 +142,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: false,
             isDex: false,
-            buyTickers: ['BTC'] as CryptoId[],
-            sellTickers: ['BTC'] as CryptoId[],
+            buyTickers: tickers3,
+            sellTickers: tickers3,
             addressFormats: {
                 BCH: 'cashaddr',
                 LTC: 'type3',
@@ -150,8 +162,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: true,
             isDex: false,
-            buyTickers: ['BTC'] as CryptoId[],
-            sellTickers: ['BTC', 'ETH'] as CryptoId[],
+            buyTickers: tickers3,
+            sellTickers: tickers2,
             addressFormats: {
                 BCH: 'cashaddr',
                 LTC: 'type3',
@@ -170,8 +182,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: false,
             isDex: false,
-            buyTickers: ['ETH'] as CryptoId[],
-            sellTickers: ['ETH'] as CryptoId[],
+            buyTickers: tickers4,
+            sellTickers: tickers4,
             addressFormats: {
                 BCH: 'legacy',
                 LTC: 'type3',
@@ -190,8 +202,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: true,
             isDex: false,
-            buyTickers: ['BTC'] as CryptoId[],
-            sellTickers: ['BTC'] as CryptoId[],
+            buyTickers: tickers3,
+            sellTickers: tickers3,
             addressFormats: {
                 BCH: 'legacy',
                 LTC: 'type3',
@@ -210,8 +222,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: false,
             isDex: true,
-            buyTickers: ['CRO@ETH'] as CryptoId[],
-            sellTickers: ['CRO@ETH'] as CryptoId[],
+            buyTickers: tickers5,
+            sellTickers: tickers5,
             addressFormats: {},
             statusUrl: 'https://help.1inch.io/',
             supportUrl: 'https://help.1inch.io/',
@@ -228,8 +240,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: false,
             isDex: false,
-            buyTickers: ['ETH', 'XMR', 'BTC'] as CryptoId[],
-            sellTickers: ['ETH', 'XMR', 'BTC'] as CryptoId[],
+            buyTickers: tickers1,
+            sellTickers: tickers1,
             addressFormats: {
                 BCH: 'legacy',
                 LTC: 'type3',
@@ -248,8 +260,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: true,
             isDex: false,
-            buyTickers: ['ETH', 'XMR', 'BTC'] as CryptoId[],
-            sellTickers: ['ETH', 'XMR', 'BTC'] as CryptoId[],
+            buyTickers: tickers1,
+            sellTickers: tickers1,
             addressFormats: {
                 BCH: 'legacy',
                 LTC: 'type3',
@@ -268,8 +280,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: false,
             isDex: false,
-            buyTickers: ['BTC', 'ETH'] as CryptoId[],
-            sellTickers: ['BTC', 'ETH'] as CryptoId[],
+            buyTickers: tickers2,
+            sellTickers: tickers2,
             addressFormats: {
                 BCH: 'cashaddr',
                 LTC: 'type3',
@@ -288,8 +300,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: true,
             isDex: false,
-            buyTickers: ['BTC', 'ETH'] as CryptoId[],
-            sellTickers: ['BTC', 'ETH'] as CryptoId[],
+            buyTickers: tickers2,
+            sellTickers: tickers2,
             addressFormats: {
                 BCH: 'cashaddr',
                 LTC: 'type3',
@@ -308,8 +320,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: false,
             isDex: false,
-            buyTickers: ['BTC'] as CryptoId[],
-            sellTickers: ['BTC'] as CryptoId[],
+            buyTickers: tickers3,
+            sellTickers: tickers3,
             addressFormats: {
                 BCH: 'legacy',
                 LTC: 'type3',
@@ -328,8 +340,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: true,
             isDex: false,
-            buyTickers: ['BTC'] as CryptoId[],
-            sellTickers: ['BTC'] as CryptoId[],
+            buyTickers: tickers3,
+            sellTickers: tickers3,
             addressFormats: {
                 BCH: 'legacy',
                 LTC: 'type3',
@@ -348,8 +360,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: false,
             isDex: false,
-            buyTickers: ['BTC'] as CryptoId[],
-            sellTickers: ['BTC'] as CryptoId[],
+            buyTickers: tickers3,
+            sellTickers: tickers3,
             addressFormats: {
                 BCH: 'cashaddr',
                 LTC: 'type3',
@@ -368,8 +380,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: true,
             isDex: false,
-            buyTickers: ['BTC'] as CryptoId[],
-            sellTickers: ['BTC'] as CryptoId[],
+            buyTickers: tickers3,
+            sellTickers: tickers3,
             addressFormats: {
                 BCH: 'cashaddr',
                 LTC: 'type3',
@@ -388,8 +400,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: false,
             isDex: false,
-            buyTickers: ['ETH'] as CryptoId[],
-            sellTickers: ['ETH'] as CryptoId[],
+            buyTickers: tickers4,
+            sellTickers: tickers4,
             addressFormats: {
                 BCH: 'legacy',
                 LTC: 'type3',
@@ -408,8 +420,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: true,
             isDex: false,
-            buyTickers: ['BTC'] as CryptoId[],
-            sellTickers: ['BTC'] as CryptoId[],
+            buyTickers: tickers3,
+            sellTickers: tickers3,
             addressFormats: {
                 BCH: 'legacy',
                 LTC: 'type3',
@@ -428,8 +440,8 @@ export const EXCHANGE_INFO: ExchangeInfo = {
             isActive: true,
             isFixedRate: false,
             isDex: true,
-            buyTickers: ['CRO@ETH'] as CryptoId[],
-            sellTickers: ['CRO@ETH'] as CryptoId[],
+            buyTickers: tickers5,
+            sellTickers: tickers5,
             addressFormats: {},
             statusUrl: 'https://help.1inch.io/',
             supportUrl: 'https://help.1inch.io/',
@@ -443,9 +455,9 @@ export const EXCHANGE_INFO: ExchangeInfo = {
 };
 export const MIN_MAX_QUOTES_OK: ExchangeTrade[] = [
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '12',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.0609979',
         rate: 0.005083158333333333,
         min: 0.5688,
@@ -454,9 +466,9 @@ export const MIN_MAX_QUOTES_OK: ExchangeTrade[] = [
         exchange: 'changelly',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '12',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.0605096167302',
         rate: 0.00504246806085,
         min: 1.68,
@@ -466,9 +478,9 @@ export const MIN_MAX_QUOTES_OK: ExchangeTrade[] = [
         quoteToken: '',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '12',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.06047229',
         rate: 0.0050393575,
         min: 1.68,
@@ -478,9 +490,9 @@ export const MIN_MAX_QUOTES_OK: ExchangeTrade[] = [
         quoteToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '12',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.06036741979259172204',
         rate: 0.005030618316049311,
         min: 0.35206704205749473,
@@ -490,9 +502,9 @@ export const MIN_MAX_QUOTES_OK: ExchangeTrade[] = [
         exchange: 'changeherofr',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '12',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.060238681',
         rate: 0.005019890083333333,
         min: 0.35121471511608626,
@@ -501,9 +513,9 @@ export const MIN_MAX_QUOTES_OK: ExchangeTrade[] = [
         exchange: 'changehero',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '12',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.059907672',
         rate: 0.004992305999999999,
         min: 0.5245852799999999,
@@ -512,9 +524,9 @@ export const MIN_MAX_QUOTES_OK: ExchangeTrade[] = [
         exchange: 'changenow',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '12',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.05984359',
         rate: 0.004986965833333333,
         min: 0.8295,
@@ -524,9 +536,9 @@ export const MIN_MAX_QUOTES_OK: ExchangeTrade[] = [
         exchange: 'coinswitchfr',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '12',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.05980199613749862984',
         rate: 0.004983499678124886,
         min: 0.85,
@@ -535,9 +547,9 @@ export const MIN_MAX_QUOTES_OK: ExchangeTrade[] = [
         exchange: 'coinswitch',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '12',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.0595996968',
         rate: 0.0049666414,
         min: 0.948,
@@ -547,9 +559,9 @@ export const MIN_MAX_QUOTES_OK: ExchangeTrade[] = [
         exchange: 'changellyfr',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '12',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.0595048',
         rate: 0.004958733333333333,
         min: 0.70367472,
@@ -558,9 +570,9 @@ export const MIN_MAX_QUOTES_OK: ExchangeTrade[] = [
         exchange: 'changenowfr',
     },
     {
-        send: 'ETH' as CryptoId,
+        send: ethereum,
         sendStringAmount: '0.033466001597224105',
-        receive: 'CRO@ETH' as CryptoId,
+        receive: cronoseth,
         receiveStringAmount: '1116.96945045',
         rate: 33376.2444612639,
         min: 0,
@@ -576,9 +588,9 @@ export const MIN_MAX_QUOTES_OK: ExchangeTrade[] = [
 
 export const MIN_MAX_QUOTES_LOW: ExchangeTrade[] = [
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '.1',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.000503106150246929012',
         rate: 0.00503106150246929,
         min: 0.3520800003243513,
@@ -588,9 +600,9 @@ export const MIN_MAX_QUOTES_LOW: ExchangeTrade[] = [
         exchange: 'changeherofr',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '.1',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.000498498993472488582',
         rate: 0.0049849899347248865,
         min: 0.85,
@@ -599,9 +611,9 @@ export const MIN_MAX_QUOTES_LOW: ExchangeTrade[] = [
         exchange: 'coinswitch',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '.1',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.00049665676',
         rate: 0.0049665676,
         min: 0.948,
@@ -611,9 +623,9 @@ export const MIN_MAX_QUOTES_LOW: ExchangeTrade[] = [
         exchange: 'changellyfr',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '.1',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.000342342',
         rate: 0.00342342,
         min: 0.5245852799999999,
@@ -622,9 +634,9 @@ export const MIN_MAX_QUOTES_LOW: ExchangeTrade[] = [
         exchange: 'changenow',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '.1',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         receiveStringAmount: '0.00015492504',
         rate: 0.0015492504,
         min: 0.35121471511608626,
@@ -634,9 +646,9 @@ export const MIN_MAX_QUOTES_LOW: ExchangeTrade[] = [
     },
     { error: 'Invalid amount: minimal amount is 0.474', exchange: 'changelly' },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '.1',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         min: 0.7043630399999999,
         max: 293.3972814,
         fee: 'INCLUDED',
@@ -644,18 +656,18 @@ export const MIN_MAX_QUOTES_LOW: ExchangeTrade[] = [
         exchange: 'changenowfr',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '.1',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         min: 0.8295,
         max: 719.15,
         error: 'Amount out of range.',
         exchange: 'coinswitchfr',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '.1',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         min: 1.68,
         max: 130,
         fee: 'UNKNOWN',
@@ -664,9 +676,9 @@ export const MIN_MAX_QUOTES_LOW: ExchangeTrade[] = [
         quoteToken: '',
     },
     {
-        send: 'LTC' as CryptoId,
+        send: litecoin,
         sendStringAmount: '.1',
-        receive: 'BTC' as CryptoId,
+        receive: bitcoin,
         min: 1.68,
         max: 130,
         fee: 'INCLUDED',
@@ -687,3 +699,136 @@ export const MIN_MAX_QUOTES_CANNOT_TRADE: ExchangeTrade[] = [
     { error: 'Cannot trade pair LTC-DATA.', exchange: 'foxexchange' },
     { error: 'Cannot trade pair LTC-DATA.', exchange: 'foxexchangefr' },
 ];
+
+export const EXCHANGE_SUCCESS_ORDERED_QUOTES = [
+    {
+        exchange: 'changelly',
+        fee: 'UNKNOWN',
+        max: 'NONE',
+        min: 0.5688,
+        rate: 0.005083158333333333,
+        receive: bitcoin,
+        receiveStringAmount: '0.0609979',
+        send: litecoin,
+        sendStringAmount: '12',
+    },
+    {
+        exchange: 'foxexchange',
+        fee: 'UNKNOWN',
+        max: 130,
+        min: 1.68,
+        quoteToken: '',
+        rate: 0.00504246806085,
+        receive: bitcoin,
+        receiveStringAmount: '0.0605096167302',
+        send: litecoin,
+        sendStringAmount: '12',
+    },
+    {
+        exchange: 'foxexchangefr',
+        fee: 'INCLUDED',
+        max: 130,
+        min: 1.68,
+        quoteToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9',
+        rate: 0.0050393575,
+        receive: bitcoin,
+        receiveStringAmount: '0.06047229',
+        send: litecoin,
+        sendStringAmount: '12',
+    },
+    {
+        exchange: 'changeherofr',
+        fee: 'INCLUDED',
+        max: 195.59280114305264,
+        min: 0.35206704205749473,
+        rate: 0.005030618316049311,
+        rateIdentificator: '6ad45ee9-a8fa-4d25-a3c8-05361176b49d',
+        receive: bitcoin,
+        receiveStringAmount: '0.06036741979259172204',
+        send: litecoin,
+        sendStringAmount: '12',
+    },
+    {
+        exchange: 'changehero',
+        fee: 'UNKNOWN',
+        max: 'NONE',
+        min: 0.35121471511608626,
+        rate: 0.005019890083333333,
+        receive: bitcoin,
+        receiveStringAmount: '0.060238681',
+        send: litecoin,
+        sendStringAmount: '12',
+    },
+    {
+        exchange: 'changenow',
+        fee: 'UNKNOWN',
+        max: 'NONE',
+        min: 0.5245852799999999,
+        rate: 0.004992305999999999,
+        receive: bitcoin,
+        receiveStringAmount: '0.059907672',
+        send: litecoin,
+        sendStringAmount: '12',
+    },
+    {
+        exchange: 'coinswitchfr',
+        fee: 'INCLUDED',
+        max: 719.15,
+        min: 0.8295,
+        offerReferenceId: 'db551578-915a-47c9-9197-a656e9372f2c',
+        rate: 0.004986965833333333,
+        receive: bitcoin,
+        receiveStringAmount: '0.05984359',
+        send: litecoin,
+        sendStringAmount: '12',
+    },
+    {
+        exchange: 'coinswitch',
+        fee: 'UNKNOWN',
+        max: 80,
+        min: 0.85,
+        rate: 0.004983499678124886,
+        receive: bitcoin,
+        receiveStringAmount: '0.05980199613749862984',
+        send: litecoin,
+        sendStringAmount: '12',
+    },
+    {
+        exchange: 'changellyfr',
+        fee: 'INCLUDED',
+        max: 757,
+        min: 0.948,
+        rate: 0.0049666414,
+        rateIdentificator: 'e98f80e3e29dd57c0356141836c113f1c19ecadf66ee77fde5835796499cfe065e73',
+        receive: bitcoin,
+        receiveStringAmount: '0.0595996968',
+        send: litecoin,
+        sendStringAmount: '12',
+    },
+    {
+        exchange: 'changenowfr',
+        fee: 'INCLUDED',
+        max: 293.1036283,
+        min: 0.70367472,
+        rate: 0.004958733333333333,
+        receive: bitcoin,
+        receiveStringAmount: '0.0595048',
+        send: litecoin,
+        sendStringAmount: '12',
+    },
+    {
+        approvalGasEstimate: 57000,
+        exchange: '1inch',
+        fee: 'UNKNOWN',
+        isDex: true,
+        max: 'NONE',
+        min: 0,
+        rate: 33376.2444612639,
+        receive: cronoseth,
+        receiveStringAmount: '1116.96945045',
+        send: ethereum,
+        sendStringAmount: '0.033466001597224105',
+        swapGasEstimate: 189386,
+        swapSlippage: '1',
+    },
+];
diff --git a/packages/suite/src/utils/wallet/coinmarket/__fixtures__/sellUtils.ts b/packages/suite/src/utils/wallet/coinmarket/__fixtures__/sellUtils.ts
index d82f3003143..23c147bc36f 100644
--- a/packages/suite/src/utils/wallet/coinmarket/__fixtures__/sellUtils.ts
+++ b/packages/suite/src/utils/wallet/coinmarket/__fixtures__/sellUtils.ts
@@ -1,10 +1,12 @@
 import { CryptoId, SellFiatTrade, SellFiatTradeQuoteRequest } from 'invity-api';
 
+const bitcoin = 'bitcoin' as CryptoId;
+
 export const QUOTE_REQUEST_FIAT: SellFiatTradeQuoteRequest = {
     amountInCrypto: false,
     country: 'CZ',
     fiatCurrency: 'EUR',
-    cryptoCurrency: 'BTC' as CryptoId,
+    cryptoCurrency: bitcoin,
     fiatStringAmount: '10',
 };
 
@@ -12,7 +14,7 @@ export const QUOTE_REQUEST_CRYPTO: SellFiatTradeQuoteRequest = {
     amountInCrypto: true,
     country: 'CZ',
     fiatCurrency: 'EUR',
-    cryptoCurrency: 'BTC' as CryptoId,
+    cryptoCurrency: bitcoin,
     cryptoStringAmount: '0.001',
 };
 
@@ -61,7 +63,7 @@ export const MIN_MAX_QUOTES_LOW: SellFiatTrade[] = [
     {
         fiatStringAmount: '10',
         fiatCurrency: 'EUR',
-        cryptoCurrency: 'BTC' as CryptoId,
+        cryptoCurrency: bitcoin,
         cryptoStringAmount: '0.0005',
         rate: 20000,
         quoteId: 'fc12d4c4-9078-4175-becd-90fc58a3145c',
@@ -76,7 +78,7 @@ export const MIN_MAX_QUOTES_LOW: SellFiatTrade[] = [
     {
         fiatStringAmount: '10',
         fiatCurrency: 'EUR',
-        cryptoCurrency: 'BTC' as CryptoId,
+        cryptoCurrency: bitcoin,
         cryptoStringAmount: '0.0010001683607972866',
         rate: 9998.316675433,
         quoteId: 'ff259797-6cbe-4fea-8330-5181353f64a0',
@@ -91,7 +93,7 @@ export const MIN_MAX_QUOTES_LOW: SellFiatTrade[] = [
     {
         fiatStringAmount: '10',
         fiatCurrency: 'EUR',
-        cryptoCurrency: 'BTC' as CryptoId,
+        cryptoCurrency: bitcoin,
         cryptoStringAmount: '0',
         rate: 0,
         error: 'Transaction amount too low. Please enter a value of 43 EUR or more.',
@@ -108,7 +110,7 @@ export const MIN_MAX_QUOTES_HIGH: SellFiatTrade[] = [
     {
         fiatStringAmount: '100000',
         fiatCurrency: 'EUR',
-        cryptoCurrency: 'BTC' as CryptoId,
+        cryptoCurrency: bitcoin,
         cryptoStringAmount: '9.8414',
         rate: 10161.15593309895,
         quoteId: '0e1966dc-83c7-4b98-9b93-d8a5e426b3d3',
@@ -123,7 +125,7 @@ export const MIN_MAX_QUOTES_HIGH: SellFiatTrade[] = [
     {
         fiatStringAmount: '100000',
         fiatCurrency: 'EUR',
-        cryptoCurrency: 'BTC' as CryptoId,
+        cryptoCurrency: bitcoin,
         cryptoStringAmount: '10.010215580340265',
         rate: 9989.794844818,
         quoteId: 'f1a4cf48-ebdb-4dac-b049-2dbd086dd68d',
@@ -138,7 +140,7 @@ export const MIN_MAX_QUOTES_HIGH: SellFiatTrade[] = [
     {
         fiatStringAmount: '100000',
         fiatCurrency: 'EUR',
-        cryptoCurrency: 'BTC' as CryptoId,
+        cryptoCurrency: bitcoin,
         cryptoStringAmount: '9.8414',
         rate: 0,
         error: 'Transaction amount too high. Please enter a value of 17050 EUR or less.',
@@ -155,7 +157,7 @@ export const ALTERNATIVE_QUOTES: SellFiatTrade[] = [
     {
         fiatStringAmount: '47.12',
         fiatCurrency: 'EUR',
-        cryptoCurrency: 'BTC' as CryptoId,
+        cryptoCurrency: bitcoin,
         cryptoStringAmount: '0.004705020432603938',
         rate: 10014.834297738,
         quoteId: 'd369ba9e-7370-4a6e-87dc-aefd3851c735',
@@ -170,7 +172,7 @@ export const ALTERNATIVE_QUOTES: SellFiatTrade[] = [
     {
         fiatStringAmount: '47.12',
         fiatCurrency: 'EUR',
-        cryptoCurrency: 'BTC' as CryptoId,
+        cryptoCurrency: bitcoin,
         cryptoStringAmount: '0.0041',
         rate: 11492.682926829268,
         quoteId: '53233267-8181-4151-9a67-9d8efc9a15db',
@@ -185,7 +187,7 @@ export const ALTERNATIVE_QUOTES: SellFiatTrade[] = [
     {
         fiatStringAmount: '47.12',
         fiatCurrency: 'EUR',
-        cryptoCurrency: 'BTC' as CryptoId,
+        cryptoCurrency: bitcoin,
         cryptoStringAmount: '0.00391181',
         rate: 12045.57481063753,
         quoteId: 'd12bbe83-32a9-4dd9-abb4-0fdbddee70fb',
@@ -201,7 +203,7 @@ export const ALTERNATIVE_QUOTES: SellFiatTrade[] = [
     {
         fiatStringAmount: '1234',
         fiatCurrency: 'CZK',
-        cryptoCurrency: 'BTC' as CryptoId,
+        cryptoCurrency: bitcoin,
         cryptoStringAmount: '0.00386933',
         rate: 318918.26233482285,
         quoteId: 'c9ff416d-2c52-4cc1-ba9c-7c61cb136f1c',
diff --git a/packages/suite/src/utils/wallet/coinmarket/__tests__/buyUtils.test.ts b/packages/suite/src/utils/wallet/coinmarket/__tests__/buyUtils.test.ts
index 8ac6e87d77a..208ae8c238e 100644
--- a/packages/suite/src/utils/wallet/coinmarket/__tests__/buyUtils.test.ts
+++ b/packages/suite/src/utils/wallet/coinmarket/__tests__/buyUtils.test.ts
@@ -1,5 +1,10 @@
-import * as fixtures from '../__fixtures__/buyUtils';
-import { getAmountLimits, createQuoteLink, getStatusMessage, createTxLink } from '../buyUtils';
+import * as fixtures from 'src/utils/wallet/coinmarket/__fixtures__/buyUtils';
+import {
+    getAmountLimits,
+    createQuoteLink,
+    getStatusMessage,
+    createTxLink,
+} from 'src/utils/wallet/coinmarket/buyUtils';
 
 const {
     QUOTE_REQUEST_FIAT,
@@ -19,7 +24,7 @@ describe('coinmarket/buy utils', () => {
             minFiat: 20,
         });
         expect(getAmountLimits(QUOTE_REQUEST_CRYPTO, MIN_MAX_QUOTES_LOW)).toStrictEqual({
-            currency: 'BTC',
+            currency: 'bitcoin',
             minCrypto: 0.002,
         });
 
@@ -28,7 +33,7 @@ describe('coinmarket/buy utils', () => {
             maxFiat: 17045.0,
         });
         expect(getAmountLimits(QUOTE_REQUEST_CRYPTO, MIN_MAX_QUOTES_HIGH)).toStrictEqual({
-            currency: 'BTC',
+            currency: 'bitcoin',
             maxCrypto: 1.67212968,
         });
     });
@@ -41,11 +46,11 @@ describe('coinmarket/buy utils', () => {
         };
         // @ts-expect-error
         expect(await createQuoteLink(QUOTE_REQUEST_FIAT, accountMock)).toStrictEqual(
-            `${window.location.origin}/coinmarket-redirect#offers/btc/normal/1/qf/CZ/EUR/10/BTC`,
+            `${window.location.origin}/coinmarket-redirect#offers/btc/normal/1/qf/CZ/EUR/10/bitcoin`,
         );
         // @ts-expect-error
         expect(await createQuoteLink(QUOTE_REQUEST_CRYPTO, accountMock)).toStrictEqual(
-            `${window.location.origin}/coinmarket-redirect#offers/btc/normal/1/qc/CZ/EUR/0.001/BTC`,
+            `${window.location.origin}/coinmarket-redirect#offers/btc/normal/1/qc/CZ/EUR/0.001/bitcoin`,
         );
     });
 
diff --git a/packages/suite/src/utils/wallet/coinmarket/__tests__/coinmarketUtils.test.ts b/packages/suite/src/utils/wallet/coinmarket/__tests__/coinmarketUtils.test.ts
index 2771e02d5ab..f1903751d76 100644
--- a/packages/suite/src/utils/wallet/coinmarket/__tests__/coinmarketUtils.test.ts
+++ b/packages/suite/src/utils/wallet/coinmarket/__tests__/coinmarketUtils.test.ts
@@ -1,3 +1,5 @@
+import { CryptoId } from 'invity-api';
+
 import { Account } from 'src/types/wallet';
 import {
     buildFiatOption,
@@ -14,22 +16,21 @@ import {
     coinmarketGetAmountLabels,
     coinmarketGetAccountLabel,
     testnetToProdCryptoId,
-} from '../coinmarketUtils';
+} from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import {
     FIXTURE_ACCOUNTS,
     accountBtc,
     accountEth,
     coinDefinitions,
-} from '../__fixtures__/coinmarketUtils';
+} from 'src/utils/wallet/coinmarket/__fixtures__/coinmarketUtils';
 import * as BUY_FIXTURE from 'src/utils/wallet/coinmarket/__fixtures__/buyUtils';
 import * as SELL_FIXTURE from 'src/utils/wallet/coinmarket/__fixtures__/sellUtils';
 import * as EXCHANGE_FIXTURE from 'src/utils/wallet/coinmarket/__fixtures__/exchangeUtils';
-import { CryptoId } from 'invity-api';
-import { useAccountLabel } from 'src/components/suite/AccountLabel';
+import { useDefaultAccountLabel } from 'src/hooks/suite/useDefaultAccountLabel';
 
-jest.mock('src/components/suite/AccountLabel', () => ({
-    ...jest.requireActual('src/components/suite/AccountLabel'),
-    useAccountLabel: jest.fn(),
+jest.mock('src/hooks/suite/useDefaultAccountLabel', () => ({
+    ...jest.requireActual('src/hooks/suite/useDefaultAccountLabel'),
+    useDefaultAccountLabel: jest.fn(),
 }));
 
 describe('coinmarket utils', () => {
@@ -158,7 +159,7 @@ describe('coinmarket utils', () => {
 
     it('coinmarketBuildAccountOptions', () => {
         const label = 'mocked label';
-        const defaultAccountLabelString = (useAccountLabel as jest.Mock).mockImplementation(
+        const getDefaultAccountLabel = (useDefaultAccountLabel as jest.Mock).mockImplementation(
             () => label,
         );
 
@@ -166,7 +167,7 @@ describe('coinmarket utils', () => {
             accounts: FIXTURE_ACCOUNTS as Account[],
             deviceState: '1stTestnetAddress@device_id:0',
             accountLabels: {},
-            defaultAccountLabelString,
+            getDefaultAccountLabel,
             tokenDefinitions: { eth: { coin: coinDefinitions } },
             supportedCryptoIds: new Set([
                 'bitcoin',
@@ -289,7 +290,7 @@ describe('coinmarket utils', () => {
         });
     });
 
-    it('coinmarketBuildAccountOptions', () => {
+    it('coinmarketBuildAccountOptions: basic', () => {
         expect(coinmarketGetRoundedFiatAmount('0.23923')).toBe('0.24');
         expect(coinmarketGetRoundedFiatAmount('0.24423')).toBe('0.24');
         expect(coinmarketGetRoundedFiatAmount('0.2')).toBe('0.20');
diff --git a/packages/suite/src/utils/wallet/coinmarket/__tests__/exchangeUtils.test.ts b/packages/suite/src/utils/wallet/coinmarket/__tests__/exchangeUtils.test.ts
index bea66c3becc..28cbc86198d 100644
--- a/packages/suite/src/utils/wallet/coinmarket/__tests__/exchangeUtils.test.ts
+++ b/packages/suite/src/utils/wallet/coinmarket/__tests__/exchangeUtils.test.ts
@@ -1,12 +1,13 @@
 import { CryptoId } from 'invity-api';
-import * as fixtures from '../__fixtures__/exchangeUtils';
+
+import * as fixtures from 'src/utils/wallet/coinmarket/__fixtures__/exchangeUtils';
 import {
     coinmarketGetExchangeReceiveCryptoId,
     getAmountLimits,
     getStatusMessage,
     getSuccessQuotesOrdered,
     isQuoteError,
-} from '../exchangeUtils';
+} from 'src/utils/wallet/coinmarket/exchangeUtils';
 
 const { MIN_MAX_QUOTES_OK, MIN_MAX_QUOTES_LOW, MIN_MAX_QUOTES_CANNOT_TRADE } = fixtures;
 
@@ -14,7 +15,7 @@ describe('coinmarket/exchange utils', () => {
     it('getAmountLimits', () => {
         expect(getAmountLimits(MIN_MAX_QUOTES_OK)).toBe(undefined);
         expect(getAmountLimits(MIN_MAX_QUOTES_LOW)).toStrictEqual({
-            currency: 'LTC',
+            currency: 'litecoin',
             maxCrypto: undefined,
             minCrypto: 0.35121471511608626,
         });
@@ -34,139 +35,7 @@ describe('coinmarket/exchange utils', () => {
                 ...MIN_MAX_QUOTES_LOW,
                 ...MIN_MAX_QUOTES_CANNOT_TRADE,
             ]),
-        ).toStrictEqual([
-            {
-                exchange: 'changelly',
-                fee: 'UNKNOWN',
-                max: 'NONE',
-                min: 0.5688,
-                rate: 0.005083158333333333,
-                receive: 'BTC',
-                receiveStringAmount: '0.0609979',
-                send: 'LTC',
-                sendStringAmount: '12',
-            },
-            {
-                exchange: 'foxexchange',
-                fee: 'UNKNOWN',
-                max: 130,
-                min: 1.68,
-                quoteToken: '',
-                rate: 0.00504246806085,
-                receive: 'BTC',
-                receiveStringAmount: '0.0605096167302',
-                send: 'LTC',
-                sendStringAmount: '12',
-            },
-            {
-                exchange: 'foxexchangefr',
-                fee: 'INCLUDED',
-                max: 130,
-                min: 1.68,
-                quoteToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9',
-                rate: 0.0050393575,
-                receive: 'BTC',
-                receiveStringAmount: '0.06047229',
-                send: 'LTC',
-                sendStringAmount: '12',
-            },
-            {
-                exchange: 'changeherofr',
-                fee: 'INCLUDED',
-                max: 195.59280114305264,
-                min: 0.35206704205749473,
-                rate: 0.005030618316049311,
-                rateIdentificator: '6ad45ee9-a8fa-4d25-a3c8-05361176b49d',
-                receive: 'BTC',
-                receiveStringAmount: '0.06036741979259172204',
-                send: 'LTC',
-                sendStringAmount: '12',
-            },
-            {
-                exchange: 'changehero',
-                fee: 'UNKNOWN',
-                max: 'NONE',
-                min: 0.35121471511608626,
-                rate: 0.005019890083333333,
-                receive: 'BTC',
-                receiveStringAmount: '0.060238681',
-                send: 'LTC',
-                sendStringAmount: '12',
-            },
-            {
-                exchange: 'changenow',
-                fee: 'UNKNOWN',
-                max: 'NONE',
-                min: 0.5245852799999999,
-                rate: 0.004992305999999999,
-                receive: 'BTC',
-                receiveStringAmount: '0.059907672',
-                send: 'LTC',
-                sendStringAmount: '12',
-            },
-            {
-                exchange: 'coinswitchfr',
-                fee: 'INCLUDED',
-                max: 719.15,
-                min: 0.8295,
-                offerReferenceId: 'db551578-915a-47c9-9197-a656e9372f2c',
-                rate: 0.004986965833333333,
-                receive: 'BTC',
-                receiveStringAmount: '0.05984359',
-                send: 'LTC',
-                sendStringAmount: '12',
-            },
-            {
-                exchange: 'coinswitch',
-                fee: 'UNKNOWN',
-                max: 80,
-                min: 0.85,
-                rate: 0.004983499678124886,
-                receive: 'BTC',
-                receiveStringAmount: '0.05980199613749862984',
-                send: 'LTC',
-                sendStringAmount: '12',
-            },
-            {
-                exchange: 'changellyfr',
-                fee: 'INCLUDED',
-                max: 757,
-                min: 0.948,
-                rate: 0.0049666414,
-                rateIdentificator:
-                    'e98f80e3e29dd57c0356141836c113f1c19ecadf66ee77fde5835796499cfe065e73',
-                receive: 'BTC',
-                receiveStringAmount: '0.0595996968',
-                send: 'LTC',
-                sendStringAmount: '12',
-            },
-            {
-                exchange: 'changenowfr',
-                fee: 'INCLUDED',
-                max: 293.1036283,
-                min: 0.70367472,
-                rate: 0.004958733333333333,
-                receive: 'BTC',
-                receiveStringAmount: '0.0595048',
-                send: 'LTC',
-                sendStringAmount: '12',
-            },
-            {
-                approvalGasEstimate: 57000,
-                exchange: '1inch',
-                fee: 'UNKNOWN',
-                isDex: true,
-                max: 'NONE',
-                min: 0,
-                rate: 33376.2444612639,
-                receive: 'CRO@ETH',
-                receiveStringAmount: '1116.96945045',
-                send: 'ETH',
-                sendStringAmount: '0.033466001597224105',
-                swapGasEstimate: 189386,
-                swapSlippage: '1',
-            },
-        ]);
+        ).toStrictEqual(fixtures.EXCHANGE_SUCCESS_ORDERED_QUOTES);
     });
     it('getStatusMessage', () => {
         expect(getStatusMessage('CONVERTING')).toBe('TR_EXCHANGE_STATUS_CONVERTING');
diff --git a/packages/suite/src/utils/wallet/coinmarket/__tests__/sellUtils.test.ts b/packages/suite/src/utils/wallet/coinmarket/__tests__/sellUtils.test.ts
index 11f3dddb624..24aff0b66b8 100644
--- a/packages/suite/src/utils/wallet/coinmarket/__tests__/sellUtils.test.ts
+++ b/packages/suite/src/utils/wallet/coinmarket/__tests__/sellUtils.test.ts
@@ -1,7 +1,12 @@
-import * as fixtures from '../__fixtures__/sellUtils';
-import { getStatusMessage, formatIban, getAmountLimits, createQuoteLink } from '../sellUtils';
+import {
+    getStatusMessage,
+    formatIban,
+    getAmountLimits,
+    createQuoteLink,
+} from 'src/utils/wallet/coinmarket/sellUtils';
 import { Account } from 'src/types/wallet';
 import { ComposedTransactionInfo } from 'src/reducers/wallet/coinmarketReducer';
+import * as fixtures from 'src/utils/wallet/coinmarket/__fixtures__/sellUtils';
 
 const {
     QUOTE_REQUEST_FIAT,
@@ -21,7 +26,7 @@ describe('coinmarket/sell utils', () => {
             minFiat: 20,
         });
         expect(getAmountLimits(QUOTE_REQUEST_CRYPTO, MIN_MAX_QUOTES_LOW)).toStrictEqual({
-            currency: 'BTC',
+            currency: 'bitcoin',
             minCrypto: 0.002,
         });
 
@@ -30,7 +35,7 @@ describe('coinmarket/sell utils', () => {
             maxFiat: 17045.0,
         });
         expect(getAmountLimits(QUOTE_REQUEST_CRYPTO, MIN_MAX_QUOTES_HIGH)).toStrictEqual({
-            currency: 'BTC',
+            currency: 'bitcoin',
             maxCrypto: 1.67212968,
         });
     });
@@ -51,12 +56,12 @@ describe('coinmarket/sell utils', () => {
         expect(
             await createQuoteLink(QUOTE_REQUEST_FIAT, accountMock, composedInfoMock),
         ).toStrictEqual(
-            `${window.location.origin}/coinmarket-redirect#sell-offers/btc/normal/1/qf/CZ/EUR/10/BTC/custom/1/2`,
+            `${window.location.origin}/coinmarket-redirect#sell-offers/btc/normal/1/qf/CZ/EUR/10/bitcoin/custom/1/2`,
         );
         expect(
             await createQuoteLink(QUOTE_REQUEST_CRYPTO, accountMock, composedInfoMock),
         ).toStrictEqual(
-            `${window.location.origin}/coinmarket-redirect#sell-offers/btc/normal/1/qc/CZ/EUR/0.001/BTC/custom/1/2`,
+            `${window.location.origin}/coinmarket-redirect#sell-offers/btc/normal/1/qc/CZ/EUR/0.001/bitcoin/custom/1/2`,
         );
         expect(
             await createQuoteLink(
@@ -66,7 +71,7 @@ describe('coinmarket/sell utils', () => {
                 '42134432141234',
             ),
         ).toStrictEqual(
-            `${window.location.origin}/coinmarket-redirect#sell-offers/btc/normal/1/p-qc/CZ/EUR/0.001/BTC/42134432141234/custom/1/2`,
+            `${window.location.origin}/coinmarket-redirect#sell-offers/btc/normal/1/p-qc/CZ/EUR/0.001/bitcoin/42134432141234/custom/1/2`,
         );
     });
 
diff --git a/packages/suite/src/utils/wallet/coinmarket/buyUtils.ts b/packages/suite/src/utils/wallet/coinmarket/buyUtils.ts
index 081f3ab1a57..e1e1c098931 100644
--- a/packages/suite/src/utils/wallet/coinmarket/buyUtils.ts
+++ b/packages/suite/src/utils/wallet/coinmarket/buyUtils.ts
@@ -1,8 +1,10 @@
+import { BuyTrade, BuyTradeQuoteRequest, BuyTradeStatus } from 'invity-api';
+
 import { desktopApi } from '@trezor/suite-desktop-api';
+import { isDesktop, getLocationOrigin } from '@trezor/env-utils';
+
 import { Account } from 'src/types/wallet';
 import { AmountLimits } from 'src/types/wallet/coinmarketCommonTypes';
-import { BuyTrade, BuyTradeQuoteRequest, BuyTradeStatus } from 'invity-api';
-import { isDesktop, getLocationOrigin } from '@trezor/env-utils';
 
 // loop through quotes and if all quotes are either with error below minimum or over maximum, return the limits
 export function getAmountLimits(
diff --git a/packages/suite/src/utils/wallet/coinmarket/coinmarketTypingUtils.ts b/packages/suite/src/utils/wallet/coinmarket/coinmarketTypingUtils.ts
index ec53873ac29..99748192eae 100644
--- a/packages/suite/src/utils/wallet/coinmarket/coinmarketTypingUtils.ts
+++ b/packages/suite/src/utils/wallet/coinmarket/coinmarketTypingUtils.ts
@@ -1,34 +1,48 @@
-import { CurrencyOption } from '@suite-common/wallet-types';
 import { BuyTrade, ExchangeTrade, SellFiatTrade } from 'invity-api';
+
+import { CurrencyOption } from '@suite-common/wallet-types';
+
 import {
     FORM_FIAT_CURRENCY_SELECT,
     FORM_OUTPUT_CURRENCY,
 } from 'src/constants/wallet/coinmarket/form';
-import {
-    isCoinmarketBuyOffers,
-    isCoinmarketExchangeOffers,
-    isCoinmarketSellOffers,
-} from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
 import {
     CoinmarketCryptoListProps,
     CoinmarketGetCryptoQuoteAmountProps,
     CoinmarketGetFiatCurrenciesProps,
     CoinmarketGetPaymentMethodProps,
     CoinmarketGetProvidersInfoProps,
+    CoinmarketTradeBuyType,
     CoinmarketTradeDetailMapProps,
     CoinmarketTradeDetailType,
+    CoinmarketTradeExchangeType,
+    CoinmarketTradeSellType,
     CoinmarketTradeType,
 } from 'src/types/coinmarket/coinmarket';
-import { CoinmarketFormContextValues } from 'src/types/coinmarket/coinmarketForm';
-import { CoinmarketOffersContextValues } from 'src/types/coinmarket/coinmarketOffers';
+import {
+    CoinmarketFormContextValues,
+    CoinmarketFormMapProps,
+} from 'src/types/coinmarket/coinmarketForm';
+
+export const isCoinmarketBuyContext = (
+    context: CoinmarketFormMapProps[keyof CoinmarketFormMapProps],
+): context is CoinmarketFormMapProps[CoinmarketTradeBuyType] => context.type === 'buy';
+
+export const isCoinmarketSellContext = (
+    context: CoinmarketFormMapProps[keyof CoinmarketFormMapProps],
+): context is CoinmarketFormMapProps[CoinmarketTradeSellType] => context.type === 'sell';
+
+export const isCoinmarketExchangeContext = (
+    context: CoinmarketFormMapProps[keyof CoinmarketFormMapProps],
+): context is CoinmarketFormMapProps[CoinmarketTradeExchangeType] => context.type === 'exchange';
 
 export const getCryptoQuoteAmountProps = (
     quoteInput: CoinmarketTradeDetailType | undefined,
-    context: CoinmarketOffersContextValues<CoinmarketTradeType>,
+    context: CoinmarketFormContextValues<CoinmarketTradeType>,
 ): CoinmarketGetCryptoQuoteAmountProps | null => {
     if (!quoteInput) return null;
 
-    if (isCoinmarketBuyOffers(context)) {
+    if (isCoinmarketBuyContext(context)) {
         const amountInCrypto = context.quotesRequest?.wantCrypto;
         const quote = quoteInput as BuyTrade;
 
@@ -43,7 +57,7 @@ export const getCryptoQuoteAmountProps = (
         };
     }
 
-    if (isCoinmarketSellOffers(context)) {
+    if (isCoinmarketSellContext(context)) {
         const amountInCrypto = context.quotesRequest?.amountInCrypto;
         const quote = quoteInput as SellFiatTrade;
 
@@ -70,15 +84,13 @@ export const getCryptoQuoteAmountProps = (
 };
 
 export const getProvidersInfoProps = (
-    context:
-        | CoinmarketOffersContextValues<CoinmarketTradeType>
-        | CoinmarketFormContextValues<CoinmarketTradeType>,
+    context: CoinmarketFormContextValues<CoinmarketTradeType>,
 ): CoinmarketGetProvidersInfoProps => {
-    if (isCoinmarketBuyOffers(context)) {
+    if (isCoinmarketBuyContext(context)) {
         return context.buyInfo?.providerInfos;
     }
 
-    if (isCoinmarketSellOffers(context)) {
+    if (isCoinmarketSellContext(context)) {
         return context.sellInfo?.providerInfos;
     }
 
@@ -88,14 +100,14 @@ export const getProvidersInfoProps = (
 export const getFiatCurrenciesProps = (
     context: CoinmarketFormContextValues<CoinmarketTradeType>,
 ): CoinmarketGetFiatCurrenciesProps | null => {
-    if (isCoinmarketBuyOffers(context)) {
+    if (isCoinmarketBuyContext(context)) {
         return {
             supportedFiatCurrencies: context.buyInfo?.supportedFiatCurrencies,
             defaultAmountsOfFiatCurrencies: context.buyInfo?.buyInfo.defaultAmountsOfFiatCurrencies,
         };
     }
 
-    if (isCoinmarketSellOffers(context)) {
+    if (isCoinmarketSellContext(context)) {
         return {
             supportedFiatCurrencies: context.sellInfo?.supportedFiatCurrencies,
         };
@@ -117,11 +129,11 @@ export const getSelectQuoteTyped = (
 export const getSelectedCrypto = (
     context: CoinmarketFormContextValues<CoinmarketTradeType>,
 ): CoinmarketCryptoListProps | null | undefined => {
-    if (isCoinmarketExchangeOffers(context)) {
+    if (isCoinmarketExchangeContext(context)) {
         return context.getValues().receiveCryptoSelect;
     }
 
-    if (isCoinmarketSellOffers(context)) {
+    if (isCoinmarketSellContext(context)) {
         return context.getValues().sendCryptoSelect;
     }
 
@@ -131,11 +143,11 @@ export const getSelectedCrypto = (
 export const getSelectedCurrency = (
     context: CoinmarketFormContextValues<CoinmarketTradeType>,
 ): CurrencyOption => {
-    if (isCoinmarketExchangeOffers(context)) {
+    if (isCoinmarketExchangeContext(context)) {
         return context.getValues(FORM_OUTPUT_CURRENCY);
     }
 
-    if (isCoinmarketSellOffers(context)) {
+    if (isCoinmarketSellContext(context)) {
         return context.getValues(FORM_OUTPUT_CURRENCY);
     }
 
@@ -146,7 +158,7 @@ export const getPaymentMethod = (
     selectedQuote: SellFiatTrade | ExchangeTrade | BuyTrade,
     context: CoinmarketFormContextValues<CoinmarketTradeType>,
 ): CoinmarketGetPaymentMethodProps => {
-    if (isCoinmarketExchangeOffers(context)) return {};
+    if (isCoinmarketExchangeContext(context)) return {};
 
     const selectedQuoteTyped = selectedQuote as SellFiatTrade | BuyTrade;
 
diff --git a/packages/suite/src/utils/wallet/coinmarket/coinmarketUtils.ts b/packages/suite/src/utils/wallet/coinmarket/coinmarketUtils.ts
index 8da17e00c40..342a6960d16 100644
--- a/packages/suite/src/utils/wallet/coinmarket/coinmarketUtils.ts
+++ b/packages/suite/src/utils/wallet/coinmarket/coinmarketUtils.ts
@@ -1,4 +1,6 @@
-import { Account } from 'src/types/wallet';
+import { BuyTrade, SellFiatTrade, CryptoId } from 'invity-api';
+import { v4 as uuidv4 } from 'uuid';
+
 import {
     Network,
     NetworkSymbol,
@@ -9,14 +11,17 @@ import {
     networks,
 } from '@suite-common/wallet-config';
 import TrezorConnect from '@trezor/connect';
-import regional from 'src/constants/wallet/coinmarket/regional';
-import { ExtendedMessageDescriptor, TrezorDevice } from 'src/types/suite';
-import { BuyTrade, SellFiatTrade, CryptoId } from 'invity-api';
+import { DefinitionType, isTokenDefinitionKnown } from '@suite-common/token-definitions';
 import {
-    DefinitionType,
     getContractAddressForNetwork,
-    isTokenDefinitionKnown,
-} from '@suite-common/token-definitions';
+    substituteBip43Path,
+    sortByCoin,
+} from '@suite-common/wallet-utils';
+import { BigNumber } from '@trezor/utils';
+
+import { Account } from 'src/types/wallet';
+import regional from 'src/constants/wallet/coinmarket/regional';
+import { ExtendedMessageDescriptor, TrezorDevice } from 'src/types/suite';
 import {
     CoinmarketAccountOptionsGroupOptionProps,
     CoinmarketAccountsOptionsGroupProps,
@@ -30,9 +35,6 @@ import {
     CoinmarketTradeDetailType,
     CoinmarketTradeType,
 } from 'src/types/coinmarket/coinmarket';
-import { v4 as uuidv4 } from 'uuid';
-import { BigNumber } from '@trezor/utils';
-import { sortByCoin } from '@suite-common/wallet-utils';
 
 export const cryptoPlatformSeparator = '--';
 
@@ -75,8 +77,20 @@ export const getNetworkName = (networkSymbol: NetworkSymbol) => {
     return networks[networkSymbol].name;
 };
 
-export const getNetworkDecimals = (networkDecimals: number | undefined) => {
-    return networkDecimals ?? 8;
+interface CoinmarketGetDecimalsProps {
+    sendCryptoSelect?: CoinmarketAccountOptionsGroupOptionProps;
+    network?: Network | null;
+}
+
+export const getCoinmarketNetworkDecimals = ({
+    sendCryptoSelect,
+    network,
+}: CoinmarketGetDecimalsProps) => {
+    if (sendCryptoSelect) {
+        return sendCryptoSelect.decimals;
+    }
+
+    return network?.decimals ?? 8;
 };
 
 /** @deprecated */
@@ -136,7 +150,7 @@ export const getCountryLabelParts = (label: string) => {
         const text = parts.join(' ');
 
         return { flag, text };
-    } catch (err) {
+    } catch {
         return null;
     }
 };
@@ -163,7 +177,7 @@ export const getComposeAddressPlaceholder = async (
 
             if (device) {
                 // try to get the already discovered legacy account
-                const legacyPath = `${bip43Path.replace('i', '0')}`;
+                const legacyPath = substituteBip43Path(bip43Path);
                 const legacyAccount = accounts?.find(a => a.path === legacyPath);
                 if (legacyAccount?.addresses?.unused[0]) {
                     return legacyAccount?.addresses?.unused[0].address;
@@ -172,7 +186,7 @@ export const getComposeAddressPlaceholder = async (
                 const result = await TrezorConnect.getAddress({
                     device,
                     coin: account.symbol,
-                    path: `${bip43Path.replace('i', '0')}/0/0`,
+                    path: `${substituteBip43Path(bip43Path)}/0/0`,
                     useEmptyPassphrase: device.useEmptyPassphrase,
                     showOnTrezor: false,
                     chunkify,
@@ -190,9 +204,10 @@ export const getComposeAddressPlaceholder = async (
             // which need more fees than Shelley addresses used in the Suite, using dummy Byron address for the placeholder
             // return '37btjrVyb4KDXBNC4haBVPCrro8AQPHwvCMp3RFhhSVWwfFmZ6wwzSK6JK1hY6wHNmtrpTf1kdbva8TCneM2YsiXT7mrzT21EacHnPpz5YyUdj64na';
             return '';
+        case 'solana':
+            return '';
         case 'ethereum':
         case 'ripple':
-        case 'solana':
             return account.descriptor;
         // no default
     }
@@ -226,6 +241,10 @@ export const getTagAndInfoNote = (quote: { infoNote?: string }) => {
     return { tag, infoNote };
 };
 
+export const coinmarketGetSuccessQuotes = <T extends CoinmarketTradeType>(
+    quotes: CoinmarketTradeDetailMapProps[T][] | undefined,
+) => (quotes ? quotes.filter(quote => quote.error === undefined) : undefined);
+
 export const getDefaultCountry = (country: string = regional.unknownCountry) => {
     const label = regional.countriesMap.get(country);
 
@@ -309,7 +328,7 @@ export const coinmarketBuildAccountOptions = ({
     accountLabels,
     tokenDefinitions,
     supportedCryptoIds,
-    defaultAccountLabelString,
+    getDefaultAccountLabel,
 }: CoinmarketBuildAccountOptionsProps): CoinmarketAccountsOptionsGroupProps[] => {
     const accountsSorted = coinmarketGetSortedAccounts({
         accounts,
@@ -334,7 +353,7 @@ export const coinmarketBuildAccountOptions = ({
 
         const groupLabel =
             accountLabels[account.key] ??
-            defaultAccountLabelString({
+            getDefaultAccountLabel({
                 accountType,
                 symbol: accountSymbol,
                 index,
diff --git a/packages/suite/src/utils/wallet/coinmarket/commonUtils.ts b/packages/suite/src/utils/wallet/coinmarket/commonUtils.ts
index 09736be10c5..c7c92b9b62d 100644
--- a/packages/suite/src/utils/wallet/coinmarket/commonUtils.ts
+++ b/packages/suite/src/utils/wallet/coinmarket/commonUtils.ts
@@ -1,7 +1,6 @@
 import { Account } from '@suite-common/wallet-types';
+import { isArrayMember } from '@trezor/utils';
 
 export function hasNetworkTypeTradableTokens(networkType: Account['networkType']) {
-    return (
-        ['ethereum', 'solana'] satisfies Account['networkType'][] as Account['networkType'][]
-    ).includes(networkType);
+    return isArrayMember(networkType, ['ethereum', 'solana'] satisfies Account['networkType'][]);
 }
diff --git a/packages/suite/src/utils/wallet/coinmarket/exchangeUtils.ts b/packages/suite/src/utils/wallet/coinmarket/exchangeUtils.ts
index 4cadb0b9a37..c2b8f1d4ae3 100644
--- a/packages/suite/src/utils/wallet/coinmarket/exchangeUtils.ts
+++ b/packages/suite/src/utils/wallet/coinmarket/exchangeUtils.ts
@@ -1,6 +1,7 @@
+import { CryptoId, ExchangeTrade, ExchangeTradeStatus } from 'invity-api';
+
 import { ExchangeInfo } from 'src/actions/wallet/coinmarketExchangeActions';
 import { CryptoAmountLimits } from 'src/types/wallet/coinmarketCommonTypes';
-import { CryptoId, ExchangeTrade, ExchangeTradeStatus } from 'invity-api';
 import { RateType } from 'src/types/coinmarket/coinmarketForm';
 import {
     FORM_DEFAULT_CRYPTO_CURRENCY,
diff --git a/packages/suite/src/utils/wallet/coinmarket/sellUtils.ts b/packages/suite/src/utils/wallet/coinmarket/sellUtils.ts
index a160e5f03a8..82313b0f73f 100644
--- a/packages/suite/src/utils/wallet/coinmarket/sellUtils.ts
+++ b/packages/suite/src/utils/wallet/coinmarket/sellUtils.ts
@@ -1,8 +1,10 @@
+import { SellFiatTrade, SellFiatTradeQuoteRequest, SellTradeStatus } from 'invity-api';
+
 import { desktopApi } from '@trezor/suite-desktop-api';
+import { isDesktop, getLocationOrigin } from '@trezor/env-utils';
+
 import { Account } from 'src/types/wallet';
 import { AmountLimits } from 'src/types/wallet/coinmarketCommonTypes';
-import { SellFiatTrade, SellFiatTradeQuoteRequest, SellTradeStatus } from 'invity-api';
-import { isDesktop, getLocationOrigin } from '@trezor/env-utils';
 import { ComposedTransactionInfo } from 'src/reducers/wallet/coinmarketReducer';
 
 // loop through quotes and if all quotes are either with error below minimum or over maximum, return the limits
diff --git a/packages/suite/src/utils/wallet/exportTransactionsUtils.ts b/packages/suite/src/utils/wallet/exportTransactionsUtils.ts
index 980fc2d05fa..8dfb1b731e2 100644
--- a/packages/suite/src/utils/wallet/exportTransactionsUtils.ts
+++ b/packages/suite/src/utils/wallet/exportTransactionsUtils.ts
@@ -4,7 +4,7 @@ import { fromWei } from 'web3-utils';
 
 import { FiatCurrencyCode } from '@suite-common/suite-config';
 import { trezorLogo } from '@suite-common/suite-constants';
-import { TokenDefinitions } from '@suite-common/token-definitions';
+import { TokenDefinitions, getIsPhishingTransaction } from '@suite-common/token-definitions';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import {
     ExportFileType,
@@ -15,12 +15,10 @@ import {
 } from '@suite-common/wallet-types';
 import { TransactionTarget } from '@trezor/connect';
 import { BigNumber } from '@trezor/utils/src/bigNumber';
-
 import {
     formatAmount,
     formatNetworkAmount,
     getFiatRateKey,
-    getIsPhishingTransaction,
     getNftTokenId,
     isNftTokenTransfer,
     localizeNumber,
diff --git a/packages/suite/src/utils/wallet/graph/utils.ts b/packages/suite/src/utils/wallet/graph/utils.ts
index 1cf693e92f4..a09b770cd6b 100644
--- a/packages/suite/src/utils/wallet/graph/utils.ts
+++ b/packages/suite/src/utils/wallet/graph/utils.ts
@@ -1,18 +1,19 @@
+import { differenceInMonths } from 'date-fns';
+
 import { getFiatRatesForTimestamps } from '@suite-common/fiat-services';
 import { resetTime } from '@suite-common/suite-utils';
 import { networks, type NetworkSymbol } from '@suite-common/wallet-config';
 import { Account } from '@suite-common/wallet-types';
 import { formatNetworkAmount } from '@suite-common/wallet-utils';
 import { BigNumber } from '@trezor/utils/src/bigNumber';
-import { differenceInMonths } from 'date-fns';
+import type { BlockchainAccountBalanceHistory, StaticSessionId } from '@trezor/connect';
+import { FiatCurrencyCode } from '@suite-common/suite-config';
 
 import { CommonAggregatedHistory, GraphData, GraphRange, GraphScale } from 'src/types/wallet/graph';
 
-import type { BlockchainAccountBalanceHistory } from '@trezor/connect';
-import { FiatCurrencyCode } from '@suite-common/suite-config';
 import { ObjectType, TypeName, sumFiatValueMapInPlace } from './utilsShared';
 
-export const deviceGraphDataFilterFn = (d: GraphData, deviceState: string | undefined) => {
+export const deviceGraphDataFilterFn = (d: GraphData, deviceState: StaticSessionId | undefined) => {
     if (!deviceState) return false;
 
     return d.account.deviceState === deviceState;
diff --git a/packages/suite/src/utils/wallet/graph/utilsShared.ts b/packages/suite/src/utils/wallet/graph/utilsShared.ts
index 73b6cbeeea2..cb3391b795f 100644
--- a/packages/suite/src/utils/wallet/graph/utilsShared.ts
+++ b/packages/suite/src/utils/wallet/graph/utilsShared.ts
@@ -1,4 +1,5 @@
 import { BigNumber } from '@trezor/utils/src/bigNumber';
+
 import { AggregatedAccountHistory, AggregatedDashboardHistory } from 'src/types/wallet/graph';
 
 export type ObjectType<T> = T extends 'account'
diff --git a/packages/suite/src/utils/wallet/graph/utilsWorker.ts b/packages/suite/src/utils/wallet/graph/utilsWorker.ts
index 09232846a3b..de731ad8238 100644
--- a/packages/suite/src/utils/wallet/graph/utilsWorker.ts
+++ b/packages/suite/src/utils/wallet/graph/utilsWorker.ts
@@ -1,14 +1,16 @@
-import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { fromUnixTime, getUnixTime, startOfMonth } from 'date-fns';
 
+import { BigNumber } from '@trezor/utils/src/bigNumber';
+import type { FiatRatesBySymbol } from '@trezor/connect';
+import { toFiatCurrency } from '@suite-common/wallet-utils';
+
 import {
     AggregatedAccountHistory,
     AggregatedDashboardHistory,
     GraphData,
 } from 'src/types/wallet/graph';
+
 import { ObjectType, TypeName, sumFiatValueMapInPlace } from './utilsShared';
-import type { FiatRatesBySymbol } from '@trezor/connect';
-import { toFiatCurrency } from '@suite-common/wallet-utils';
 
 const calcFiatValueMap = (
     amount: string,
diff --git a/packages/suite/src/utils/wallet/tokenUtils.ts b/packages/suite/src/utils/wallet/tokenUtils.ts
index dba69febeea..dd33b401c64 100644
--- a/packages/suite/src/utils/wallet/tokenUtils.ts
+++ b/packages/suite/src/utils/wallet/tokenUtils.ts
@@ -1,5 +1,4 @@
 import { BigNumber } from '@trezor/utils/src/bigNumber';
-
 import { Account, Rate, TokenAddress, RatesByKey } from '@suite-common/wallet-types';
 import { TokenInfo } from '@trezor/connect';
 import { getFiatRateKey, isTokenMatchesSearch } from '@suite-common/wallet-utils';
@@ -11,7 +10,7 @@ import {
     isTokenDefinitionKnown,
 } from '@suite-common/token-definitions';
 
-interface TokensWithRates extends TokenInfo {
+export interface TokensWithRates extends TokenInfo {
     fiatValue: BigNumber;
     fiatRate?: Rate;
 }
diff --git a/packages/suite/src/views/backup/index.tsx b/packages/suite/src/views/backup/index.tsx
index e173c0a8851..d2821237966 100644
--- a/packages/suite/src/views/backup/index.tsx
+++ b/packages/suite/src/views/backup/index.tsx
@@ -1,6 +1,5 @@
-import styled from 'styled-components';
-
-import { Paragraph, Button, Image, Row } from '@trezor/components';
+import { Paragraph, Image, Column, NewModal } from '@trezor/components';
+import { spacings } from '@trezor/theme';
 import { HELP_CENTER_RECOVERY_ISSUES_URL } from '@trezor/urls';
 import { isDeviceAcquired } from '@suite-common/suite-utils';
 import { selectDevice } from '@suite-common/wallet-core';
@@ -8,58 +7,13 @@ import { selectDevice } from '@suite-common/wallet-core';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { backupDevice } from 'src/actions/backup/backupActions';
 import { changePin } from 'src/actions/settings/deviceSettingsActions';
-import { Loading, Translation, TrezorLink, Modal } from 'src/components/suite';
+import { Loading, Translation, TrezorLink } from 'src/components/suite';
 import { PreBackupCheckboxes, AfterBackupCheckboxes } from 'src/components/backup';
 import { canStart, canContinue } from 'src/utils/backup';
-import { selectLocks } from 'src/reducers/suite/suiteReducer';
 import type { ForegroundAppProps } from 'src/types/suite';
 import type { BackupStatus } from 'src/actions/backup/backupActions';
 import { selectBackup } from 'src/reducers/backup/backupReducer';
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledButton = styled(Button)`
-    width: 224px;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledP = styled(Paragraph)`
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledImage = styled(Image)`
-    margin-bottom: 24px;
-    align-self: center;
-`;
-
-const VerticalCenter = styled.div`
-    margin-top: auto;
-    margin-bottom: auto;
-`;
-
-const FinishedModal = styled(Modal)`
-    min-height: 620px;
-`;
-
-const StyledModal = styled(Modal)`
-    min-height: 650px;
-`;
-
-type CloseButtonProps = {
-    onClick: () => void;
-    variant: 'TR_CLOSE' | 'TR_CANCEL' | 'TR_SKIP_PIN';
-};
-
-const CloseButton = ({ onClick, variant }: CloseButtonProps) => (
-    <StyledButton
-        onClick={onClick}
-        data-testid="@backup/close-button"
-        variant="tertiary"
-        icon="close"
-    >
-        <Translation id={variant} />
-    </StyledButton>
-);
+import { selectIsDeviceLocked } from 'src/reducers/suite/suiteReducer';
 
 const getModalHeading = (backupStatus: BackupStatus) => {
     switch (backupStatus) {
@@ -83,10 +37,50 @@ const getEdgeCaseModalHeading = (unfinishedBackup: boolean) => {
     return <Translation id="BACKUP_BACKUP_ALREADY_FINISHED_HEADING" />;
 };
 
-export const Backup = ({ cancelable, onCancel }: ForegroundAppProps) => {
+const getModalContent = (backupStatus: BackupStatus, error?: string) => {
+    switch (backupStatus) {
+        case 'initial':
+            return (
+                <>
+                    <Paragraph
+                        variant="tertiary"
+                        typographyStyle="hint"
+                        margin={{ bottom: spacings.xl }}
+                    >
+                        <Translation id="TR_BACKUP_SUBHEADING_1" />
+                    </Paragraph>
+                    <PreBackupCheckboxes />
+                </>
+            );
+        case 'in-progress':
+            return <Loading />;
+        case 'finished':
+            return (
+                <>
+                    <Paragraph
+                        variant="tertiary"
+                        typographyStyle="hint"
+                        data-testid="@backup/success-message"
+                        margin={{ bottom: spacings.xl }}
+                    >
+                        <Translation id="TR_BACKUP_FINISHED_TEXT" />
+                    </Paragraph>
+                    <AfterBackupCheckboxes />
+                </>
+            );
+        case 'error':
+            return (
+                <Paragraph data-testid="@backup/error-message" typographyStyle="highlight">
+                    {error}
+                </Paragraph>
+            );
+    }
+};
+
+export const Backup = ({ onCancel }: ForegroundAppProps) => {
     const device = useSelector(selectDevice);
     const backup = useSelector(selectBackup);
-    const locks = useSelector(selectLocks);
+    const isDeviceLocked = useSelector(selectIsDeviceLocked);
 
     const dispatch = useDispatch();
 
@@ -98,14 +92,15 @@ export const Backup = ({ cancelable, onCancel }: ForegroundAppProps) => {
 
     if (isDeviceUnavailable) {
         return (
-            <Modal
+            <NewModal
                 heading={<Translation id="TR_RECONNECT_HEADER" />}
-                isCancelable
                 onCancel={onCancel}
                 data-testid="@backup/no-device"
             >
-                <StyledImage image="CONNECT_DEVICE" width="360" />
-            </Modal>
+                <Column>
+                    <Image image="CONNECT_DEVICE" width="360" />
+                </Column>
+            </NewModal>
         );
     }
 
@@ -120,31 +115,30 @@ export const Backup = ({ cancelable, onCancel }: ForegroundAppProps) => {
         device.features.unfinished_backup !== null
     ) {
         return (
-            <FinishedModal
-                isCancelable
+            <NewModal
                 onCancel={onCancel}
                 heading={getEdgeCaseModalHeading(device.features.unfinished_backup)}
-                bottomBarComponents={<CloseButton onClick={onCancel} variant="TR_CLOSE" />}
+                iconName={device.features.unfinished_backup ? 'warning' : 'check'}
+                variant={device.features.unfinished_backup ? 'warning' : 'primary'}
+                bottomContent={
+                    <NewModal.Button onClick={() => onCancel()} data-testid="@backup/close-button">
+                        <Translation id="TR_CLOSE" />
+                    </NewModal.Button>
+                }
             >
                 {device.features.unfinished_backup ? (
-                    <VerticalCenter>
-                        <StyledImage image="UNI_ERROR" />
-                        <StyledP data-testid="@backup/already-failed-message">
-                            <Translation id="BACKUP_BACKUP_ALREADY_FAILED_DESCRIPTION" />
-                            <TrezorLink icon="arrowUpRight" href={HELP_CENTER_RECOVERY_ISSUES_URL}>
-                                <Translation id="TR_LEARN_MORE" />
-                            </TrezorLink>
-                        </StyledP>
-                    </VerticalCenter>
+                    <Paragraph variant="tertiary" data-testid="@backup/already-failed-message">
+                        <Translation id="BACKUP_BACKUP_ALREADY_FAILED_DESCRIPTION" />
+                        <TrezorLink icon="arrowUpRight" href={HELP_CENTER_RECOVERY_ISSUES_URL}>
+                            <Translation id="TR_LEARN_MORE" />
+                        </TrezorLink>
+                    </Paragraph>
                 ) : (
-                    <VerticalCenter>
-                        <StyledImage image="UNI_SUCCESS" />
-                        <StyledP data-testid="@backup/already-finished-message">
-                            <Translation id="BACKUP_BACKUP_ALREADY_FINISHED_DESCRIPTION" />
-                        </StyledP>
-                    </VerticalCenter>
+                    <Paragraph variant="tertiary" data-testid="@backup/already-finished-message">
+                        <Translation id="BACKUP_BACKUP_ALREADY_FINISHED_DESCRIPTION" />
+                    </Paragraph>
                 )}
-            </FinishedModal>
+            </NewModal>
         );
     }
 
@@ -158,89 +152,90 @@ export const Backup = ({ cancelable, onCancel }: ForegroundAppProps) => {
             : {};
 
     return (
-        <StyledModal
-            isCancelable={cancelable}
+        <NewModal
             onCancel={onCancel}
+            variant={backup.status === 'error' ? 'warning' : 'primary'}
+            iconName={backup.status === 'error' ? 'warning' : undefined}
             data-testid="@backup"
             heading={getModalHeading(backup.status)}
-            totalProgressBarSteps={nonErrorBackupStatuses.length}
-            currentProgressBarStep={currentProgressBarStep}
-            bottomBarComponents={
-                <>
-                    {backup.status === 'initial' && (
-                        <>
-                            <StyledButton
-                                data-testid="@backup/start-button"
-                                onClick={() => dispatch(backupDevice(backupParams))}
-                                isDisabled={!canStart(backup.userConfirmed, locks)}
-                            >
-                                <Translation id="TR_CREATE_BACKUP" />
-                            </StyledButton>
-                            <CloseButton onClick={onCancel} variant="TR_CANCEL" />
-                        </>
-                    )}
-
-                    {backup.status === 'finished' && (
-                        <>
-                            {device?.features?.pin_protection ? (
-                                <StyledButton
-                                    isDisabled={!canContinue(backup.userConfirmed)}
+            description={
+                currentProgressBarStep && (
+                    <Translation
+                        id="TR_STEP_OF_TOTAL"
+                        values={{
+                            index: currentProgressBarStep,
+                            total: nonErrorBackupStatuses.length,
+                        }}
+                    />
+                )
+            }
+            bottomContent={(function () {
+                switch (backup.status) {
+                    case 'initial':
+                        return (
+                            <>
+                                <NewModal.Button
+                                    data-testid="@backup/start-button"
+                                    onClick={() => dispatch(backupDevice(backupParams))}
+                                    isDisabled={!canStart(backup.userConfirmed, isDeviceLocked)}
+                                >
+                                    <Translation id="TR_CREATE_BACKUP" />
+                                </NewModal.Button>
+                                <NewModal.Button
                                     onClick={() => onCancel()}
+                                    data-testid="@backup/close-button"
+                                    variant="tertiary"
                                 >
-                                    <Translation id="TR_CLOSE" />
-                                </StyledButton>
-                            ) : (
-                                <>
-                                    <CloseButton onClick={onCancel} variant="TR_SKIP_PIN" />
-                                    <StyledButton
-                                        data-testid="@backup/continue-to-pin-button"
+                                    <Translation id="TR_CANCEL" />
+                                </NewModal.Button>
+                            </>
+                        );
+                    case 'finished':
+                        return (
+                            <>
+                                {device?.features?.pin_protection ? (
+                                    <NewModal.Button
                                         isDisabled={!canContinue(backup.userConfirmed)}
-                                        onClick={() => {
-                                            onCancel();
-                                            dispatch(changePin({}));
-                                        }}
+                                        onClick={() => onCancel()}
                                     >
-                                        <Translation id="TR_CONTINUE_TO_PIN" />
-                                    </StyledButton>
-                                </>
-                            )}
-                        </>
-                    )}
-
-                    {backup.status === 'error' && (
-                        <CloseButton onClick={onCancel} variant="TR_CLOSE" />
-                    )}
-                </>
-            }
+                                        <Translation id="TR_CLOSE" />
+                                    </NewModal.Button>
+                                ) : (
+                                    <>
+                                        <NewModal.Button
+                                            data-testid="@backup/continue-to-pin-button"
+                                            isDisabled={!canContinue(backup.userConfirmed)}
+                                            onClick={() => {
+                                                onCancel();
+                                                dispatch(changePin({}));
+                                            }}
+                                        >
+                                            <Translation id="TR_CONTINUE_TO_PIN" />
+                                        </NewModal.Button>
+                                        <NewModal.Button
+                                            onClick={() => onCancel()}
+                                            data-testid="@backup/close-button"
+                                            variant="tertiary"
+                                        >
+                                            <Translation id="TR_SKIP_PIN" />
+                                        </NewModal.Button>
+                                    </>
+                                )}
+                            </>
+                        );
+                    case 'error':
+                        return (
+                            <NewModal.Button
+                                onClick={() => onCancel()}
+                                data-testid="@backup/close-button"
+                            >
+                                <Translation id="TR_CLOSE" />
+                            </NewModal.Button>
+                        );
+                }
+            })()}
         >
-            {backup.status === 'initial' && (
-                <>
-                    <StyledP typographyStyle="hint">
-                        <Translation id="TR_BACKUP_SUBHEADING_1" />
-                    </StyledP>
-                    <PreBackupCheckboxes />
-                </>
-            )}
-
-            {backup.status === 'in-progress' && <Loading />}
-
-            {backup.status === 'finished' && (
-                <>
-                    <StyledP typographyStyle="hint" data-testid="@backup/success-message">
-                        <Translation id="TR_BACKUP_FINISHED_TEXT" />
-                    </StyledP>
-                    <AfterBackupCheckboxes />
-                </>
-            )}
-
-            {backup.status === 'error' && (
-                <Row justifyContent="center">
-                    <VerticalCenter>
-                        <StyledImage image="UNI_ERROR" />
-                        <StyledP data-testid="@backup/error-message">{backup.error}</StyledP>
-                    </VerticalCenter>
-                </Row>
-            )}
-        </StyledModal>
+            {getModalContent(backup.status, backup.error)}
+        </NewModal>
     );
 };
diff --git a/packages/suite/src/views/dashboard/AssetsView/ArrowIcon.tsx b/packages/suite/src/views/dashboard/AssetsView/ArrowIcon.tsx
index 41c863276c6..f11ecd7729b 100644
--- a/packages/suite/src/views/dashboard/AssetsView/ArrowIcon.tsx
+++ b/packages/suite/src/views/dashboard/AssetsView/ArrowIcon.tsx
@@ -1,6 +1,7 @@
+import styled, { css } from 'styled-components';
+
 import { Icon } from '@trezor/components';
 import { spacingsPx } from '@trezor/theme';
-import styled, { css } from 'styled-components';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 export const ArrowIcon = styled(Icon)`
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCard.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCard.tsx
index 0bf899c429a..c9bcdeb1da9 100644
--- a/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCard.tsx
+++ b/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCard.tsx
@@ -1,6 +1,27 @@
 import React from 'react';
+import { useDispatch } from 'react-redux';
+
 import styled, { useTheme } from 'styled-components';
+
 import { Network } from '@suite-common/wallet-config';
+import { spacings, spacingsPx, typography } from '@trezor/theme';
+import {
+    Card,
+    Column,
+    H2,
+    Icon,
+    Row,
+    SkeletonRectangle,
+    variables,
+    Text,
+} from '@trezor/components';
+import { AssetFiatBalance } from '@suite-common/assets';
+import { TokenInfo } from '@trezor/connect';
+import { Account, RatesByKey } from '@suite-common/wallet-types';
+import { isTestnet } from '@suite-common/wallet-utils';
+import { selectAssetAccountsThatStaked } from '@suite-common/wallet-core';
+import { selectCoinDefinitions } from '@suite-common/token-definitions';
+import { FiatCurrencyCode } from '@suite-common/suite-config';
 
 import {
     AmountUnitSwitchWrapper,
@@ -9,33 +30,23 @@ import {
     Translation,
     TrendTicker,
 } from 'src/components/suite';
-import { isTestnet } from '@suite-common/wallet-utils';
-import { spacingsPx, typography } from '@trezor/theme';
-
-import { Card, H2, Icon, Row, SkeletonRectangle, variables } from '@trezor/components';
-import { useDispatch } from 'react-redux';
 import { useAccountSearch, useLoadingSkeleton, useSelector } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
-import { AssetFiatBalance } from '@suite-common/assets';
 import { FiatHeader } from 'src/components/wallet/FiatHeader';
+import { useFiatFromCryptoValue } from 'src/hooks/suite/useFiatFromCryptoValue';
+
 import { ArrowIcon, styledHoverOnParentOfArrowIcon } from '../ArrowIcon';
 import { CoinmarketBuyButton } from '../CoinmarketBuyButton';
 import { AssetCardInfo, AssetCardInfoSkeleton } from './AssetCardInfo';
-import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
-import { useFiatFromCryptoValue } from 'src/hooks/suite/useFiatFromCryptoValue';
+import { AssetCardTokensAndStakingInfo } from './AssetCardTokensAndStakingInfo';
+import { handleTokensAndStakingData } from '../assetsViewUtils';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledCard = styled(Card)`
+    display: flex;
+    flex-direction: column;
     transition: box-shadow 0.2s;
-
     ${styledHoverOnParentOfArrowIcon};
-
-    padding: ${spacingsPx.xs};
-`;
-
-const Content = styled.div`
-    padding: ${spacingsPx.xs};
-    flex: 1;
 `;
 
 // eslint-disable-next-line local-rules/no-override-ds-component
@@ -64,24 +75,13 @@ const CoinAmount = styled.div`
     ${typography.hint};
 `;
 
-const AssetContainer = styled.div`
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    margin-bottom: ${spacingsPx.xxxl};
-`;
-
-const BuyContainerLabel = styled.div`
-    ${typography.hint};
-`;
-
 const FailedContainer = styled.div`
     color: ${({ theme }) => theme.textAlertRed};
     display: flex;
     align-items: center;
     gap: ${spacingsPx.xs};
-    ${typography.hint}
 
+    ${typography.hint}
     ${variables.SCREEN_QUERY.MOBILE} {
         border-bottom: 1px solid ${({ theme }) => theme.borderElevation2};
     }
@@ -92,7 +92,12 @@ type AssetCardProps = {
     failed: boolean;
     cryptoValue: string;
     assetsFiatBalances: AssetFiatBalance[];
+    stakingAccounts: Account[];
+    assetTokens: TokenInfo[];
     index?: number;
+    localCurrency: FiatCurrencyCode;
+    currentFiatRates?: RatesByKey;
+    accounts: Account[];
 };
 
 export const AssetCard = ({
@@ -100,13 +105,17 @@ export const AssetCard = ({
     failed,
     cryptoValue,
     assetsFiatBalances,
+    stakingAccounts,
+    assetTokens,
     index,
+    localCurrency,
+    currentFiatRates,
+    accounts,
 }: AssetCardProps) => {
     const { symbol } = network;
     const dispatch = useDispatch();
     const theme = useTheme();
     const { setCoinFilter, setSearchString } = useAccountSearch();
-    const localCurrency = useSelector(selectLocalCurrency);
     const handleCardClick = () => {
         dispatch(
             goto('wallet-index', {
@@ -122,21 +131,46 @@ export const AssetCard = ({
         setSearchString(undefined);
     };
 
+    const stakingAccountsForAsset = stakingAccounts.filter(account => account.symbol === symbol);
+    const coinDefinitions = useSelector(state => selectCoinDefinitions(state, symbol));
     const { fiatAmount } = useFiatFromCryptoValue({ amount: cryptoValue, symbol });
+    const accountsThatStaked = useSelector(state =>
+        selectAssetAccountsThatStaked(state, stakingAccountsForAsset),
+    );
+
+    const { tokensFiatBalance, assetStakingBalance, shouldRenderStakingRow, shouldRenderTokenRow } =
+        handleTokensAndStakingData(
+            assetTokens,
+            accountsThatStaked,
+            symbol,
+            localCurrency,
+            coinDefinitions,
+            currentFiatRates,
+        );
 
     return (
-        <StyledCard onClick={handleCardClick}>
-            <Content>
-                <AssetContainer>
+        <StyledCard paddingType="small" onClick={handleCardClick}>
+            <Column
+                gap={spacings.xxxl}
+                alignItems="flex-start"
+                flex="1"
+                margin={{
+                    top: spacings.xs,
+                    bottom: spacings.xs,
+                    left: spacings.xs,
+                    right: spacings.xs,
+                }}
+            >
+                <Row justifyContent="space-between">
                     <AssetCardInfo
                         network={network}
                         assetsFiatBalances={assetsFiatBalances}
                         index={index}
                     />
                     <ArrowIcon size={16} name="arrowRightLong" color={theme.iconDisabled} />
-                </AssetContainer>
+                </Row>
                 {!failed ? (
-                    <>
+                    <Column alignItems="flex-start">
                         <FiatAmount>
                             <FiatHeader
                                 size="medium"
@@ -149,7 +183,7 @@ export const AssetCard = ({
                                 <CoinBalance value={cryptoValue} symbol={symbol} />
                             </AmountUnitSwitchWrapper>
                         </CoinAmount>
-                    </>
+                    </Column>
                 ) : (
                     <FailedContainer>
                         <WarningIcon
@@ -160,20 +194,30 @@ export const AssetCard = ({
                         <Translation id="TR_DASHBOARD_ASSET_FAILED" />
                     </FailedContainer>
                 )}
-            </Content>
+            </Column>
+            {(shouldRenderStakingRow || shouldRenderTokenRow) && (
+                <AssetCardTokensAndStakingInfo
+                    symbol={symbol}
+                    tokensFiatBalance={tokensFiatBalance.toString()}
+                    assetStakingBalance={assetStakingBalance.toString()}
+                    shouldRenderStaking={shouldRenderStakingRow}
+                    shouldRenderTokens={shouldRenderTokenRow}
+                    accounts={accounts}
+                />
+            )}
             {!isTestnet(symbol) && (
                 <Card>
                     <Row alignItems="center" justifyContent="space-between">
                         <div>
-                            <BuyContainerLabel>
+                            <Text typographyStyle="hint">
                                 <Translation id="TR_EXCHANGE_RATE" />
-                            </BuyContainerLabel>
+                            </Text>
                             <PriceTicker symbol={symbol} />
                         </div>
                         <div>
-                            <BuyContainerLabel>
+                            <Text typographyStyle="hint">
                                 <Translation id="TR_7D_CHANGE" />
-                            </BuyContainerLabel>
+                            </Text>
                             <TrendTicker symbol={symbol} />
                         </div>
                         <CoinmarketBuyButton
@@ -193,10 +237,20 @@ export const AssetCardSkeleton = (props: { animate?: boolean }) => {
 
     return (
         <StyledCard>
-            <Content>
-                <AssetContainer>
+            <Column
+                gap={spacings.xxxl}
+                alignItems="flex-start"
+                flex="1"
+                margin={{
+                    top: spacings.xs,
+                    bottom: spacings.xs,
+                    left: spacings.xs,
+                    right: spacings.xs,
+                }}
+            >
+                <Row justifyContent="space-between" margin={{ bottom: spacings.xxxl }}>
                     <AssetCardInfoSkeleton animate={animate} />
-                </AssetContainer>
+                </Row>
                 <FiatAmount>
                     <IntegerValue>
                         <SkeletonRectangle animate={animate} width={95} height={32} />
@@ -205,7 +259,7 @@ export const AssetCardSkeleton = (props: { animate?: boolean }) => {
                 <CoinAmount>
                     <SkeletonRectangle animate={animate} width={50} height={16} />
                 </CoinAmount>
-            </Content>
+            </Column>
             <Card>
                 <SkeletonRectangle animate={animate} width="100%" height={40} />
             </Card>
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCardInfo.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCardInfo.tsx
index 115642dae6e..6f1070c936a 100644
--- a/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCardInfo.tsx
+++ b/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCardInfo.tsx
@@ -1,9 +1,12 @@
-import { Network } from '@suite-common/wallet-config';
 import React from 'react';
+
+import { Network } from '@suite-common/wallet-config';
 import { AssetFiatBalance } from '@suite-common/assets';
+import { Row } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { AssetCoinLogo, AssetCoinLogoSkeleton } from '../AssetCoinLogo';
 import { AssetCoinName, AssetCoinNameSkeleton } from '../AssetCoinName';
-import { Row } from '@trezor/components';
 
 type AssetInfoProps = {
     network: Network;
@@ -12,7 +15,7 @@ type AssetInfoProps = {
 };
 
 export const AssetCardInfo = ({ network, assetsFiatBalances, index }: AssetInfoProps) => (
-    <Row>
+    <Row gap={spacings.sm}>
         <AssetCoinLogo
             symbol={network.symbol}
             index={index}
@@ -28,7 +31,7 @@ type AssetInfoSkeletonProps = {
 
 export const AssetCardInfoSkeleton = ({ animate }: AssetInfoSkeletonProps) => (
     <Row>
-        <AssetCoinLogoSkeleton />
+        <AssetCoinLogoSkeleton animate={animate} />
         <AssetCoinNameSkeleton animate={animate} />
     </Row>
 );
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCardTokensAndStakingInfo.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCardTokensAndStakingInfo.tsx
new file mode 100644
index 00000000000..b6964372a1f
--- /dev/null
+++ b/packages/suite/src/views/dashboard/AssetsView/AssetCard/AssetCardTokensAndStakingInfo.tsx
@@ -0,0 +1,73 @@
+import { Row, Column, Icon, Divider, Text } from '@trezor/components';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+import { spacings } from '@trezor/theme';
+import { Account } from '@suite-common/wallet-types';
+
+import { CoinBalance, FiatValue, HiddenPlaceholder, Translation } from 'src/components/suite';
+import { TokenIconSetWrapper } from 'src/components/wallet/TokenIconSetWrapper';
+
+type AssetCardTokensAndStakingInfoProps = {
+    symbol: NetworkSymbol;
+    tokensFiatBalance: string;
+    assetStakingBalance: string;
+    shouldRenderStaking: boolean;
+    shouldRenderTokens: boolean;
+    accounts: Account[];
+};
+
+export const AssetCardTokensAndStakingInfo = ({
+    symbol,
+    tokensFiatBalance,
+    assetStakingBalance,
+    shouldRenderStaking,
+    shouldRenderTokens,
+    accounts,
+}: AssetCardTokensAndStakingInfoProps) => (
+    <Column alignItems="stretch">
+        <Divider strokeWidth={1} margin={{ top: spacings.xs, bottom: spacings.xs }} />
+        {shouldRenderStaking && (
+            <Row
+                justifyContent="space-between"
+                margin={{ left: spacings.xs, right: spacings.xs, bottom: spacings.xs }}
+            >
+                <Row gap={spacings.xs}>
+                    <Icon name="piggyBankFilled" variant="tertiary" />
+
+                    <Text typographyStyle="body" variant="tertiary">
+                        <Translation id="TR_NAV_STAKING" />
+                    </Text>
+                </Row>
+                {assetStakingBalance && (
+                    <>
+                        <HiddenPlaceholder>
+                            <Text typographyStyle="hint" variant="tertiary">
+                                <CoinBalance value={assetStakingBalance} symbol={symbol} />
+                            </Text>
+                        </HiddenPlaceholder>
+                        <HiddenPlaceholder>
+                            <FiatValue amount={assetStakingBalance} symbol={symbol} />
+                        </HiddenPlaceholder>
+                    </>
+                )}
+            </Row>
+        )}
+        {shouldRenderTokens && (
+            <Row
+                justifyContent="space-between"
+                margin={{ left: spacings.xs, right: spacings.xs, bottom: spacings.xs }}
+            >
+                <Row gap={spacings.xs}>
+                    <TokenIconSetWrapper accounts={accounts} network={symbol} />
+                    <Text typographyStyle="body" variant="tertiary">
+                        <Translation id="TR_NAV_TOKENS" />
+                    </Text>
+                </Row>
+                <FiatValue
+                    amount={tokensFiatBalance ?? '0'}
+                    symbol={symbol}
+                    shouldConvert={false}
+                />
+            </Row>
+        )}
+    </Column>
+);
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetCoinLogo.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetCoinLogo.tsx
index a4a32706f6a..855843257e8 100644
--- a/packages/suite/src/views/dashboard/AssetsView/AssetCoinLogo.tsx
+++ b/packages/suite/src/views/dashboard/AssetsView/AssetCoinLogo.tsx
@@ -3,19 +3,13 @@ import {
     AssetFiatBalanceWithPercentage,
     calculateAssetsPercentage,
 } from '@suite-common/assets';
-import { SkeletonCircle, Tooltip } from '@trezor/components';
+import { Row, SkeletonCircle, Tooltip } from '@trezor/components';
 import { NetworkSymbol } from '@suite-common/wallet-config';
-import { spacingsPx } from '@trezor/theme';
-import styled from 'styled-components';
 import { localizePercentage } from '@suite-common/wallet-utils';
-import { selectLanguage } from 'src/reducers/suite/suiteReducer';
-import { useSelector } from 'src/hooks/suite';
 import { AssetShareIndicator } from '@trezor/product-components';
 
-const LogoWrapper = styled.div`
-    padding-right: ${spacingsPx.sm};
-    align-items: center;
-`;
+import { selectLanguage } from 'src/reducers/suite/suiteReducer';
+import { useSelector } from 'src/hooks/suite';
 
 type AssetCoinLogoProps = {
     symbol: NetworkSymbol;
@@ -33,7 +27,7 @@ export const AssetCoinLogo = ({ symbol, assetsFiatBalances, index }: AssetCoinLo
         : undefined;
 
     return (
-        <LogoWrapper>
+        <Row justifyContent="center">
             <Tooltip
                 content={localizePercentage({
                     valueInFraction: (assetPercentage ?? 0) / 100,
@@ -49,12 +43,16 @@ export const AssetCoinLogo = ({ symbol, assetsFiatBalances, index }: AssetCoinLo
                     index={index}
                 />
             </Tooltip>
-        </LogoWrapper>
+        </Row>
     );
 };
 
-export const AssetCoinLogoSkeleton = () => (
-    <LogoWrapper>
-        <SkeletonCircle size={44} />
-    </LogoWrapper>
+type AssetCoinLogoSkeletonProps = {
+    animate?: boolean;
+};
+
+export const AssetCoinLogoSkeleton = ({ animate }: AssetCoinLogoSkeletonProps) => (
+    <Row alignItems="center" justifyContent="center">
+        <SkeletonCircle animate={animate} size={44} />
+    </Row>
 );
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetCoinName.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetCoinName.tsx
index 6cd6b8e0bb0..dd7df972804 100644
--- a/packages/suite/src/views/dashboard/AssetsView/AssetCoinName.tsx
+++ b/packages/suite/src/views/dashboard/AssetsView/AssetCoinName.tsx
@@ -1,8 +1,10 @@
 import styled from 'styled-components';
+
 import { Network } from '@suite-common/wallet-config';
 import { selectVisibleNonEmptyDeviceAccountsByNetworkSymbol } from '@suite-common/wallet-core';
 import { Icon, SkeletonRectangle } from '@trezor/components';
 import { spacingsPx, typography } from '@trezor/theme';
+
 import { useSelector } from 'src/hooks/suite';
 
 const WalletContent = styled.div`
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetRow.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetRow.tsx
index 9cf0617f2d0..9d8783ba132 100644
--- a/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetRow.tsx
+++ b/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetRow.tsx
@@ -1,7 +1,18 @@
 import { memo } from 'react';
-import styled, { useTheme } from 'styled-components';
+
+import { useTheme } from 'styled-components';
+
 import { Network } from '@suite-common/wallet-config';
-import { Icon, variables, SkeletonRectangle } from '@trezor/components';
+import { Icon, Table, Row, IconButton, Column, Text } from '@trezor/components';
+import { isTestnet } from '@suite-common/wallet-utils';
+import { spacings } from '@trezor/theme';
+import { TokenInfo } from '@trezor/blockchain-link-types';
+import { selectCoinDefinitions } from '@suite-common/token-definitions';
+import { selectAssetAccountsThatStaked } from '@suite-common/wallet-core';
+import { Account, RatesByKey } from '@suite-common/wallet-types';
+import { AssetFiatBalance } from '@suite-common/assets';
+import { FiatCurrencyCode } from '@suite-common/suite-config';
+
 import {
     AmountUnitSwitchWrapper,
     CoinBalance,
@@ -10,132 +21,43 @@ import {
     Translation,
     TrendTicker,
 } from 'src/components/suite';
-import { isTestnet } from '@suite-common/wallet-utils';
 import { goto } from 'src/actions/suite/routerActions';
-import { useAccountSearch, useDispatch, useLoadingSkeleton } from 'src/hooks/suite';
-import { spacingsPx, typography } from '@trezor/theme';
-import { AssetFiatBalance } from '@suite-common/assets';
-import { AssetTableRowGrid } from './AssetTableRowGrid';
-import { ArrowIcon } from '../ArrowIcon';
-import { AssetCoinLogo, AssetCoinLogoSkeleton } from '../AssetCoinLogo';
+import { useAccountSearch, useDispatch, useSelector } from 'src/hooks/suite';
+import { TokenIconSetWrapper } from 'src/components/wallet/TokenIconSetWrapper';
+
+import { AssetCoinLogo } from '../AssetCoinLogo';
 import { AssetCoinName } from '../AssetCoinName';
 import { CoinmarketBuyButton } from '../CoinmarketBuyButton';
+import { AssetTokenRow } from './AssetTokenRow';
+import { AssetStakingRow } from './AssetStakingRow';
+import { AssetTableExtraRowsSection as Section } from './AssetTableExtraRowsSection';
+import { handleTokensAndStakingData } from '../assetsViewUtils';
 
-const Coin = styled.div`
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-`;
-
-const StyledCol = styled.div<{ $isLastRow?: boolean }>`
-    display: flex;
-    align-items: center;
-    padding: 16px 0;
-    border-bottom: ${({ $isLastRow, theme }) =>
-        $isLastRow ? 'none' : `1px solid ${theme.borderElevation2}`};
-`;
-
-const CoinLogoWrapper = styled(StyledCol)`
-    padding-left: 18px;
-    text-overflow: ellipsis;
-    border: none;
-
-    ${variables.SCREEN_QUERY.MOBILE} {
-        grid-column: 1 / 2;
-        padding-left: 20px;
-        border-bottom: none;
-    }
-
-    &:hover {
-        ${Coin} {
-            text-decoration: underline;
-        }
-    }
-`;
-
-const CoinNameWrapper = styled(StyledCol)`
-    ${typography.highlight}
-    overflow: hidden;
-    text-overflow: ellipsis;
-
-    ${variables.SCREEN_QUERY.MOBILE} {
-        grid-column: 1 / 4;
-        padding-left: 20px;
-        border-bottom: none;
-    }
-`;
-
-const CoinBalanceContainer = styled.div`
-    ${typography.hint}
-    color: ${({ theme }) => theme.textSubdued};
-`;
-
-const FailedCol = styled(StyledCol)`
-    color: ${({ theme }) => theme.textAlertRed};
-    ${typography.hint}
-
-    ${variables.SCREEN_QUERY.MOBILE} {
-        grid-column: 1 / 3;
-        margin-left: 20px;
-    }
-`;
-
-const CryptoBalanceWrapper = styled(StyledCol)`
-    flex: 1;
-    white-space: nowrap;
-    flex-direction: column;
-    align-items: flex-start;
-    justify-content: center;
-    gap: ${spacingsPx.xxxs};
-
-    ${variables.SCREEN_QUERY.MOBILE} {
-        grid-column: 1 / 3;
-        margin-left: 20px;
-    }
-`;
-
-const FiatBalanceWrapper = styled.div``;
-
-const ExchangeRateWrapper = styled(StyledCol)`
-    font-variant-numeric: tabular-nums;
-    justify-content: right;
-    padding-right: ${spacingsPx.xxxl};
-`;
-
-const ExchangeRateWrapper7Days = styled(StyledCol)`
-    font-variant-numeric: tabular-nums;
-    padding-right: 0;
-`;
-
-const BuyButtonWrapper = styled(StyledCol)`
-    justify-content: right;
-`;
-
-const StyledArrowIcon = styled(ArrowIcon)`
-    margin: 0 ${spacingsPx.md};
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const SkeletonRectangleLast = styled(SkeletonRectangle)`
-    margin-right: ${spacingsPx.md};
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledIcon = styled(Icon)`
-    padding-left: 4px;
-    padding-bottom: 2px;
-`;
-
-interface AssetTableProps {
+export interface AssetTableRowProps {
     network: Network;
     failed: boolean;
-    cryptoValue: string;
-    isLastRow?: boolean;
+    assetNativeCryptoBalance: string;
+    stakingAccounts: Account[];
+    assetTokens: TokenInfo[];
+    isStakeNetwork?: boolean;
     assetsFiatBalances: AssetFiatBalance[];
+    accounts: Account[];
+    localCurrency: FiatCurrencyCode;
+    currentFiatRates?: RatesByKey;
 }
 
 export const AssetRow = memo(
-    ({ network, failed, cryptoValue, isLastRow, assetsFiatBalances }: AssetTableProps) => {
+    ({
+        network,
+        failed,
+        assetNativeCryptoBalance,
+        assetTokens,
+        stakingAccounts,
+        assetsFiatBalances,
+        localCurrency,
+        currentFiatRates,
+        accounts,
+    }: AssetTableRowProps) => {
         const { symbol } = network;
         const dispatch = useDispatch();
         const theme = useTheme();
@@ -155,94 +77,114 @@ export const AssetRow = memo(
             setCoinFilter(symbol);
             setSearchString(undefined);
         };
+        const coinDefinitions = useSelector(state => selectCoinDefinitions(state, network.symbol));
+        const stakingAccountsForAsset = stakingAccounts.filter(
+            account => account.symbol === network.symbol,
+        );
+        const accountsThatStaked = useSelector(state =>
+            selectAssetAccountsThatStaked(state, stakingAccountsForAsset),
+        );
+
+        const {
+            tokensFiatBalance,
+            assetStakingBalance,
+            shouldRenderStakingRow,
+            shouldRenderTokenRow,
+        } = handleTokensAndStakingData(
+            assetTokens,
+            accountsThatStaked,
+            symbol,
+            localCurrency,
+            coinDefinitions,
+            currentFiatRates,
+        );
 
         return (
-            <AssetTableRowGrid onClick={handleRowClick}>
-                <CoinLogoWrapper>
-                    <AssetCoinLogo
-                        symbol={network.symbol}
-                        assetsFiatBalances={assetsFiatBalances}
+            <>
+                <Table.Row onClick={handleRowClick}>
+                    <Table.Cell align="center">
+                        <Section
+                            $dashedLinePosition={
+                                shouldRenderStakingRow || shouldRenderTokenRow
+                                    ? 'middleToBottom'
+                                    : undefined
+                            }
+                        >
+                            <AssetCoinLogo
+                                symbol={symbol}
+                                assetsFiatBalances={assetsFiatBalances}
+                            />
+                        </Section>
+                    </Table.Cell>
+                    <Table.Cell padding={{ left: spacings.zero }}>
+                        <AssetCoinName network={network} />
+                    </Table.Cell>
+                    <Table.Cell>
+                        {!failed ? (
+                            <Column
+                                alignItems="flex-start"
+                                justifyContent="center"
+                                gap={spacings.xxxs}
+                                data-testid={`@asset-card/${symbol}/balance`}
+                            >
+                                <FiatValue amount={assetNativeCryptoBalance} symbol={symbol} />
+
+                                <Text typographyStyle="hint" color={theme.textSubdued}>
+                                    <AmountUnitSwitchWrapper symbol={symbol}>
+                                        <CoinBalance
+                                            value={assetNativeCryptoBalance}
+                                            symbol={symbol}
+                                        />
+                                    </AmountUnitSwitchWrapper>
+                                </Text>
+                            </Column>
+                        ) : (
+                            <Text variant="destructive" typographyStyle="hint" textWrap="nowrap">
+                                <Row gap={spacings.xxs}>
+                                    <Icon
+                                        name="warningTriangle"
+                                        color={theme.legacy.TYPE_RED}
+                                        size={14}
+                                    />
+                                    <Translation id="TR_DASHBOARD_ASSET_FAILED" />
+                                </Row>
+                            </Text>
+                        )}
+                    </Table.Cell>
+                    <Table.Cell align="right">
+                        {!isTestnet(symbol) && <PriceTicker symbol={symbol} />}
+                    </Table.Cell>
+
+                    <Table.Cell>{!isTestnet(symbol) && <TrendTicker symbol={symbol} />}</Table.Cell>
+                    <Table.Cell align="right" colSpan={2}>
+                        <Row gap={spacings.md}>
+                            {!isTestnet(symbol) && (
+                                <CoinmarketBuyButton
+                                    symbol={symbol}
+                                    data-testid={`@dashboard/assets/table/${symbol}/buy-button`}
+                                />
+                            )}
+                            <IconButton icon="arrowRight" size="small" variant="tertiary" />
+                        </Row>
+                    </Table.Cell>
+                </Table.Row>
+                {shouldRenderStakingRow && (
+                    <AssetStakingRow
+                        stakingTotalBalance={assetStakingBalance.toFixed()}
+                        symbol={symbol}
+                        shouldRenderTokenRow={shouldRenderTokenRow}
+                    />
+                )}
+                {shouldRenderTokenRow && (
+                    <AssetTokenRow
+                        tokenIconSetWrapper={
+                            <TokenIconSetWrapper accounts={accounts} network={network.symbol} />
+                        }
+                        network={network}
+                        tokensDisplayFiatBalance={tokensFiatBalance.toFixed()}
                     />
-                </CoinLogoWrapper>
-
-                <CoinNameWrapper $isLastRow={isLastRow}>
-                    <AssetCoinName network={network} />
-                </CoinNameWrapper>
-
-                {!failed ? (
-                    <CryptoBalanceWrapper
-                        $isLastRow={isLastRow}
-                        data-testid={`@asset-card/${symbol}/balance`}
-                    >
-                        <FiatBalanceWrapper>
-                            <FiatValue amount={cryptoValue} symbol={symbol} />
-                        </FiatBalanceWrapper>
-
-                        <CoinBalanceContainer>
-                            <AmountUnitSwitchWrapper symbol={symbol}>
-                                <CoinBalance value={cryptoValue} symbol={symbol} />
-                            </AmountUnitSwitchWrapper>
-                        </CoinBalanceContainer>
-                    </CryptoBalanceWrapper>
-                ) : (
-                    <FailedCol $isLastRow={isLastRow}>
-                        <Translation id="TR_DASHBOARD_ASSET_FAILED" />
-
-                        <StyledIcon
-                            name="warningTriangle"
-                            color={theme.legacy.TYPE_RED}
-                            size={14}
-                        />
-                    </FailedCol>
                 )}
-                <ExchangeRateWrapper $isLastRow={isLastRow}>
-                    {!isTestnet(symbol) && <PriceTicker symbol={symbol} />}
-                </ExchangeRateWrapper>
-                <ExchangeRateWrapper7Days $isLastRow={isLastRow}>
-                    {!isTestnet(symbol) && <TrendTicker symbol={symbol} />}
-                </ExchangeRateWrapper7Days>
-                <BuyButtonWrapper $isLastRow={isLastRow}>
-                    {!isTestnet(symbol) && (
-                        <CoinmarketBuyButton
-                            symbol={symbol}
-                            data-testid={`@dashboard/assets/table/${symbol}/buy-button`}
-                        />
-                    )}
-                    <StyledArrowIcon size={16} name="arrowRight" color={theme.iconSubdued} />
-                </BuyButtonWrapper>
-            </AssetTableRowGrid>
+            </>
         );
     },
 );
-
-export const AssetRowSkeleton = (props: { animate?: boolean }) => {
-    const { shouldAnimate } = useLoadingSkeleton();
-
-    const animate = props.animate ?? shouldAnimate;
-
-    return (
-        <AssetTableRowGrid>
-            <CoinLogoWrapper>
-                <AssetCoinLogoSkeleton />
-            </CoinLogoWrapper>
-            <CoinNameWrapper $isLastRow>
-                <Coin>
-                    <SkeletonRectangle animate={animate} width={150} />
-                </Coin>
-            </CoinNameWrapper>
-            <CryptoBalanceWrapper $isLastRow>
-                <SkeletonRectangle animate={animate} width={100} />
-            </CryptoBalanceWrapper>
-
-            <ExchangeRateWrapper $isLastRow>
-                <SkeletonRectangle animate={animate} />
-            </ExchangeRateWrapper>
-            <ExchangeRateWrapper $isLastRow>
-                <SkeletonRectangle animate={animate} width={50} />
-            </ExchangeRateWrapper>
-            <BuyButtonWrapper $isLastRow>
-                <SkeletonRectangleLast animate={animate} width={58} height={38} borderRadius={19} />
-            </BuyButtonWrapper>
-        </AssetTableRowGrid>
-    );
-};
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetRowSkeleton.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetRowSkeleton.tsx
new file mode 100644
index 00000000000..4dc79e0d93b
--- /dev/null
+++ b/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetRowSkeleton.tsx
@@ -0,0 +1,41 @@
+import { Row, Table, SkeletonRectangle } from '@trezor/components';
+
+import { useLoadingSkeleton } from 'src/hooks/suite';
+
+import { AssetCoinLogoSkeleton } from '../AssetCoinLogo';
+
+type AssetRowSkeletonProps = {
+    isAnimating?: boolean;
+};
+
+export const AssetRowSkeleton = ({ isAnimating }: AssetRowSkeletonProps) => {
+    const { shouldAnimate } = useLoadingSkeleton();
+
+    const animate = isAnimating ?? shouldAnimate;
+
+    return (
+        <Table.Row>
+            <Table.Cell colSpan={3}>
+                <Row>
+                    <AssetCoinLogoSkeleton animate={animate} />
+                    <SkeletonRectangle animate={animate} width={100} />
+                </Row>
+            </Table.Cell>
+            <Table.Cell>
+                <SkeletonRectangle animate={animate} width={100} />
+            </Table.Cell>
+            <Table.Cell>
+                <SkeletonRectangle animate={animate} />
+            </Table.Cell>
+            <Table.Cell>
+                <SkeletonRectangle animate={animate} width={50} />
+            </Table.Cell>
+            <Table.Cell colSpan={2}>
+                <Row gap={16}>
+                    <SkeletonRectangle animate={animate} width={58} height={38} borderRadius={19} />
+                    <SkeletonRectangle animate={animate} width={38} height={38} borderRadius={25} />
+                </Row>
+            </Table.Cell>
+        </Table.Row>
+    );
+};
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetStakingRow.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetStakingRow.tsx
new file mode 100644
index 00000000000..ef8cfffd3ab
--- /dev/null
+++ b/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetStakingRow.tsx
@@ -0,0 +1,48 @@
+import { Column, Icon, Table, Text } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+
+import { CoinBalance, HiddenPlaceholder, Translation, FiatValue } from 'src/components/suite';
+
+import { AssetTableExtraRowsSection as Section } from './AssetTableExtraRowsSection';
+
+interface AssetStakingRowProps {
+    stakingTotalBalance: string;
+    symbol: NetworkSymbol;
+    shouldRenderTokenRow: boolean;
+}
+
+export const AssetStakingRow = ({
+    stakingTotalBalance,
+    symbol,
+    shouldRenderTokenRow,
+}: AssetStakingRowProps) => {
+    if (!stakingTotalBalance) return null;
+
+    return (
+        <Table.Row hasBorderTop={false}>
+            <Table.Cell align="center">
+                <Section $dashedLinePosition={shouldRenderTokenRow ? 'topToBottom' : 'topToMiddle'}>
+                    <Icon name="piggyBankFilled" variant="tertiary" />
+                </Section>
+            </Table.Cell>
+            <Table.Cell padding={{ left: spacings.zero }}>
+                <Translation id="TR_NAV_STAKING" />
+            </Table.Cell>
+            <Table.Cell colSpan={4}>
+                {stakingTotalBalance && (
+                    <Column alignItems="flex-start" justifyContent="center" gap={spacings.xxxs}>
+                        <HiddenPlaceholder>
+                            <FiatValue amount={stakingTotalBalance} symbol={symbol} />
+                        </HiddenPlaceholder>
+                        <HiddenPlaceholder>
+                            <Text typographyStyle="hint" variant="tertiary">
+                                <CoinBalance value={stakingTotalBalance} symbol={symbol} />
+                            </Text>
+                        </HiddenPlaceholder>
+                    </Column>
+                )}
+            </Table.Cell>
+        </Table.Row>
+    );
+};
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTable.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTable.tsx
index cc7d228fc12..59bda778420 100644
--- a/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTable.tsx
+++ b/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTable.tsx
@@ -1,48 +1,70 @@
+import { Table } from '@trezor/components';
+import { spacings } from '@trezor/theme';
 import { AssetFiatBalance } from '@suite-common/assets';
-import { AssetRow, AssetRowSkeleton } from './AssetRow';
-import { AssetTableHeader } from './AssetTableHeader';
-import { Network } from '@suite-common/wallet-config';
-import { BigNumber } from '@trezor/utils/src/bigNumber';
-import styled from 'styled-components';
-import { spacingsPx } from '@trezor/theme';
+import { RatesByKey } from '@suite-common/wallet-types';
+import { FiatCurrencyCode } from '@suite-common/suite-config';
 
-const Table = styled.div`
-    padding-left: ${spacingsPx.xxs};
-    padding-right: ${spacingsPx.xxs};
-    padding-bottom: ${spacingsPx.xxs};
-    width: 100%;
-`;
+import { Translation } from 'src/components/suite';
 
-export interface AssetTableRowType {
-    symbol: string;
-    network: Network;
-    assetBalance: BigNumber;
-    assetFailed: boolean;
-}
+import { AssetData } from '../AssetsView';
+import { AssetRowSkeleton } from './AssetRowSkeleton';
+import { AssetRow } from './AssetRow';
 
 interface AssetTableProps {
     discoveryInProgress?: boolean;
-    assetsData: AssetTableRowType[];
+    assetsData: AssetData[];
     assetsFiatBalances: AssetFiatBalance[];
+    localCurrency: FiatCurrencyCode;
+    currentFiatRates?: RatesByKey;
 }
 
 export const AssetTable = ({
     discoveryInProgress,
     assetsData,
     assetsFiatBalances,
-}: AssetTableProps) => (
-    <Table>
-        <AssetTableHeader />
-        {assetsData.map((asset, i) => (
-            <AssetRow
-                key={asset.symbol}
-                network={asset.network}
-                failed={asset.assetFailed}
-                cryptoValue={asset.assetBalance.toFixed()}
-                isLastRow={i === assetsData.length - 1 && !discoveryInProgress}
-                assetsFiatBalances={assetsFiatBalances}
-            />
-        ))}
-        {discoveryInProgress && <AssetRowSkeleton />}
-    </Table>
-);
+    localCurrency,
+    currentFiatRates,
+}: AssetTableProps) => {
+    return (
+        <Table
+            isRowHighlightedOnHover
+            margin={{ top: spacings.xs }}
+            colWidths={[{ width: '48px' }, { minWidth: '130px', maxWidth: '200px' }]}
+        >
+            <Table.Header>
+                <Table.Row>
+                    <Table.Cell></Table.Cell>
+                    <Table.Cell padding={{ left: spacings.zero }}>
+                        <Translation id="TR_ASSETS" />
+                    </Table.Cell>
+                    <Table.Cell>
+                        <Translation id="TR_VALUES" />
+                    </Table.Cell>
+                    <Table.Cell align="right">
+                        <Translation id="TR_EXCHANGE_RATE" />
+                    </Table.Cell>
+                    <Table.Cell colSpan={3}>
+                        <Translation id="TR_7D_CHANGE" />
+                    </Table.Cell>
+                </Table.Row>
+            </Table.Header>
+            <Table.Body>
+                {assetsData.map((asset, i) => (
+                    <AssetRow
+                        key={asset.network.symbol + i}
+                        network={asset.network}
+                        failed={asset.failed}
+                        assetNativeCryptoBalance={asset.assetNativeCryptoBalance}
+                        assetTokens={asset.assetTokens}
+                        stakingAccounts={asset.stakingAccounts}
+                        assetsFiatBalances={assetsFiatBalances}
+                        localCurrency={localCurrency}
+                        currentFiatRates={currentFiatRates}
+                        accounts={asset.accounts}
+                    />
+                ))}
+                {discoveryInProgress && <AssetRowSkeleton />}
+            </Table.Body>
+        </Table>
+    );
+};
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTableExtraRowsSection.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTableExtraRowsSection.tsx
new file mode 100644
index 00000000000..a4965756463
--- /dev/null
+++ b/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTableExtraRowsSection.tsx
@@ -0,0 +1,46 @@
+import styled, { css } from 'styled-components';
+
+import { borders } from '@trezor/theme';
+
+type DashedLinePosition = 'middleToBottom' | 'topToBottom' | 'topToMiddle';
+
+const mapPositionToTop = (position: DashedLinePosition) => {
+    switch (position) {
+        case 'middleToBottom':
+            return '50%';
+        case 'topToBottom':
+            return borders.widths.large;
+        case 'topToMiddle':
+            return borders.widths.large;
+    }
+};
+
+const mapPositionToBottom = (position: DashedLinePosition) => {
+    switch (position) {
+        case 'middleToBottom':
+            return '0';
+        case 'topToBottom':
+            return '0';
+        case 'topToMiddle':
+            return '50%';
+    }
+};
+
+export const AssetTableExtraRowsSection = styled.div<{
+    $dashedLinePosition?: DashedLinePosition;
+}>`
+    ${({ $dashedLinePosition }) =>
+        $dashedLinePosition &&
+        css`
+            &::before {
+                content: '';
+                position: absolute;
+                top: ${mapPositionToTop($dashedLinePosition)};
+                bottom: ${mapPositionToBottom($dashedLinePosition)};
+                left: 50%;
+                transform: translateX(-50%);
+                border-left: ${borders.widths.large} dotted ${({ theme }) => theme.borderDashed};
+                z-index: -1;
+            }
+        `}
+`;
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTableHeader.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTableHeader.tsx
deleted file mode 100644
index 2fc928a4edd..00000000000
--- a/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTableHeader.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import styled from 'styled-components';
-
-import { spacingsPx, typography } from '@trezor/theme';
-
-import { Translation } from 'src/components/suite';
-import { AssetTableRowGrid } from './AssetTableRowGrid';
-
-const Header = styled.div`
-    display: flex;
-    ${typography.hint}
-    color: ${({ theme }) => theme.textSubdued};
-    align-items: center;
-    padding: ${spacingsPx.sm} 0;
-    border-bottom: 1px solid ${({ theme }) => theme.borderElevation2};
-
-    &:last-child {
-        padding-right: ${spacingsPx.md};
-    }
-`;
-
-const HeaderRight = styled(Header)`
-    justify-content: right;
-    padding-right: ${spacingsPx.xxxl};
-`;
-
-export const AssetTableHeader = () => (
-    <AssetTableRowGrid>
-        <Header /> {/* Logo */}
-        <Header>
-            <Translation id="TR_ASSETS" />
-        </Header>
-        <Header>
-            <Translation id="TR_VALUES" />
-        </Header>
-        <HeaderRight>
-            <Translation id="TR_EXCHANGE_RATE" />
-        </HeaderRight>
-        <Header>
-            <Translation id="TR_7D_CHANGE" />
-        </Header>
-        <Header /> {/* Buy Button */}
-    </AssetTableRowGrid>
-);
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTableRowGrid.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTableRowGrid.tsx
deleted file mode 100644
index 95b330b5454..00000000000
--- a/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTableRowGrid.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import styled, { css } from 'styled-components';
-import { borders, mapElevationToBackground } from '@trezor/theme';
-import { styledHoverOnParentOfArrowIcon } from '../ArrowIcon';
-import { Elevation, nextElevation } from '@trezor/theme/src/elevation';
-import { useElevation } from '@trezor/components';
-import { HTMLAttributes } from 'react';
-
-const StyledAssetTableRowGrid = styled.div<{ $elevation: Elevation }>`
-    display: grid;
-    overflow: hidden;
-    grid-template-columns: 1fr 2fr 2fr 1fr 1fr 1fr;
-    border-radius: ${borders.radii.xs};
-
-    ${({ theme, $elevation, onClick }) =>
-        onClick !== undefined
-            ? css`
-                  cursor: pointer;
-
-                  ${styledHoverOnParentOfArrowIcon}
-
-                  &:hover {
-                      background: ${mapElevationToBackground({
-                          theme,
-                          $elevation: nextElevation[$elevation],
-                      })};
-                  }
-              `
-            : ''};
-`;
-
-export const AssetTableRowGrid = ({ children, ...props }: HTMLAttributes<HTMLDivElement>) => {
-    const { elevation } = useElevation();
-
-    return (
-        <StyledAssetTableRowGrid {...props} $elevation={elevation}>
-            {children}
-        </StyledAssetTableRowGrid>
-    );
-};
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTokenRow.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTokenRow.tsx
new file mode 100644
index 00000000000..3b38bd7b533
--- /dev/null
+++ b/packages/suite/src/views/dashboard/AssetsView/AssetTable/AssetTokenRow.tsx
@@ -0,0 +1,39 @@
+import { Table } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+import { Network } from '@suite-common/wallet-config';
+
+import { FiatValue, Translation } from 'src/components/suite';
+
+import { AssetTableExtraRowsSection as Section } from './AssetTableExtraRowsSection';
+
+interface AssetTokenProps {
+    tokenIconSetWrapper: React.ReactNode;
+    network: Network;
+    tokensDisplayFiatBalance: string;
+}
+
+export const AssetTokenRow = ({
+    tokenIconSetWrapper,
+    network,
+    tokensDisplayFiatBalance,
+}: AssetTokenProps) => {
+    if (!tokenIconSetWrapper) return null;
+
+    return (
+        <Table.Row hasBorderTop={false}>
+            <Table.Cell align="center">
+                <Section $dashedLinePosition="topToMiddle">{tokenIconSetWrapper}</Section>
+            </Table.Cell>
+            <Table.Cell padding={{ left: spacings.zero }}>
+                <Translation id="TR_NAV_TOKENS" />
+            </Table.Cell>
+            <Table.Cell colSpan={4}>
+                <FiatValue
+                    amount={tokensDisplayFiatBalance ?? '0'}
+                    symbol={network.symbol}
+                    shouldConvert={false}
+                />
+            </Table.Cell>
+        </Table.Row>
+    );
+};
diff --git a/packages/suite/src/views/dashboard/AssetsView/AssetsView.tsx b/packages/suite/src/views/dashboard/AssetsView/AssetsView.tsx
index 0e5dfc4c045..8146112d549 100644
--- a/packages/suite/src/views/dashboard/AssetsView/AssetsView.tsx
+++ b/packages/suite/src/views/dashboard/AssetsView/AssetsView.tsx
@@ -1,8 +1,19 @@
 import styled, { useTheme } from 'styled-components';
-import { BigNumber } from '@trezor/utils/src/bigNumber';
 
-import { Icon, Button, LoadingContent, Card, Column } from '@trezor/components';
-import { selectCurrentFiatRates, selectDeviceSupportedNetworks } from '@suite-common/wallet-core';
+import { BigNumber } from '@trezor/utils/src/bigNumber';
+import { Icon, Button, LoadingContent, Card, Row } from '@trezor/components';
+import { selectCurrentFiatRates } from '@suite-common/wallet-core';
+import { TokenInfo } from '@trezor/blockchain-link-types';
+import { AssetFiatBalance } from '@suite-common/assets';
+import { spacings, spacingsPx, typography } from '@trezor/theme';
+import {
+    getFiatRateKey,
+    toFiatCurrency,
+    isSupportedEthStakingNetworkSymbol,
+} from '@suite-common/wallet-utils';
+import { NetworkSymbol, getNetwork, Network } from '@suite-common/wallet-config';
+import { RatesByKey } from '@suite-common/wallet-types';
+import { FiatCurrencyCode } from '@suite-common/suite-config';
 
 import { DashboardSection } from 'src/components/dashboard';
 import { Account } from 'src/types/wallet';
@@ -11,15 +22,11 @@ import { useDiscovery, useDispatch, useLayoutSize, useSelector } from 'src/hooks
 import { useAccounts } from 'src/hooks/wallet';
 import { setFlag } from 'src/actions/suite/suiteActions';
 import { goto } from 'src/actions/suite/routerActions';
-import { useEnabledNetworks } from 'src/hooks/settings/useEnabledNetworks';
+import { selectEnabledNetworks, selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
+import { useNetworkSupport } from 'src/hooks/settings/useNetworkSupport';
 
 import { AssetCard, AssetCardSkeleton } from './AssetCard/AssetCard';
-import { spacings, spacingsPx, typography } from '@trezor/theme';
-import { AssetFiatBalance } from '@suite-common/assets';
-import { getFiatRateKey, toFiatCurrency } from '@suite-common/wallet-utils';
-import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
-import { AssetTable, AssetTableRowType } from './AssetTable/AssetTable';
-import { NetworkSymbol, getNetwork } from '@suite-common/wallet-config';
+import { AssetTable } from './AssetTable/AssetTable';
 
 const InfoMessage = styled.div`
     padding: ${spacingsPx.md} ${spacingsPx.xl};
@@ -28,58 +35,59 @@ const InfoMessage = styled.div`
     ${typography.label}
 `;
 
-const ActionsWrapper = styled.div`
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-`;
-
 const GridWrapper = styled.div`
     display: grid;
     grid-gap: 10px;
     grid-template-columns: repeat(auto-fill, minmax(285px, 1fr));
 `;
 
+export type AssetData = {
+    network: Network;
+    failed: boolean;
+    assetNativeCryptoBalance: string;
+    stakingAccounts: Account[];
+    assetTokens: TokenInfo[];
+    isStakeNetwork?: boolean;
+    accounts: Account[];
+};
+
 const useAssetsFiatBalances = (
-    assetsData: AssetTableRowType[],
+    assetsData: AssetData[],
     accounts: { [key: string]: Account[] },
+    localCurrency: FiatCurrencyCode,
+    currentFiatRates?: RatesByKey,
 ) => {
-    const localCurrency = useSelector(selectLocalCurrency);
-    const currentRiatRates = useSelector(selectCurrentFiatRates);
-
     return assetsData.reduce<AssetFiatBalance[]>((acc, asset) => {
         if (!asset) return acc;
 
-        const fiatRateKey = getFiatRateKey(asset.symbol as NetworkSymbol, localCurrency);
-        const fiatRate = currentRiatRates?.[fiatRateKey];
+        const fiatRateKey = getFiatRateKey(asset.network.symbol, localCurrency);
+        const fiatRate = currentFiatRates?.[fiatRateKey];
         const amount =
-            accounts[asset.symbol]
+            accounts[asset.network.symbol]
                 .reduce((balance, account) => balance + Number(account.formattedBalance), 0)
                 .toString() ?? '0';
 
         const fiatBalance = toFiatCurrency(amount, fiatRate?.rate, 2) ?? '0';
 
-        return [...acc, { fiatBalance, symbol: asset.symbol }];
+        return [...acc, { fiatBalance, symbol: asset.network.symbol }];
     }, []);
 };
 
 export const AssetsView = () => {
     const { dashboardAssetsGridMode } = useSelector(s => s.suite.flags);
-    const deviceSupportedNetworks = useSelector(selectDeviceSupportedNetworks);
+    const enabledNetworks = useSelector(selectEnabledNetworks);
 
     const theme = useTheme();
     const dispatch = useDispatch();
     const { discovery, getDiscoveryStatus, isDiscoveryRunning } = useDiscovery();
     const { accounts } = useAccounts(discovery);
-    const { mainnets, enabledNetworks } = useEnabledNetworks();
+    const { supportedMainnets } = useNetworkSupport();
     const { isMobileLayout } = useLayoutSize();
 
-    const mainnetSymbols = mainnets.map(mainnet => mainnet.symbol);
-    const supportedMainnetNetworks = deviceSupportedNetworks.filter(network =>
-        mainnetSymbols.includes(network),
-    );
-    const hasMainnetNetworksToEnable = supportedMainnetNetworks.some(
-        network => !enabledNetworks.includes(network),
+    const localCurrency = useSelector(selectLocalCurrency);
+    const currentFiatRates = useSelector(selectCurrentFiatRates);
+    const hasMainnetNetworksToEnable = supportedMainnets.some(
+        network => !enabledNetworks.includes(network.symbol),
     );
 
     const assets: { [key: string]: Account[] } = {};
@@ -92,7 +100,7 @@ export const AssetsView = () => {
 
     const assetNetworkSymbols = Object.keys(assets) as NetworkSymbol[];
 
-    const assetsData: AssetTableRowType[] = assetNetworkSymbols
+    const assetsData: AssetData[] = assetNetworkSymbols
         .map(symbol => {
             const network = getNetwork(symbol);
             if (!network) {
@@ -101,18 +109,44 @@ export const AssetsView = () => {
                 return null;
             }
 
-            const assetBalance = assets[symbol].reduce(
-                (prev, a) => prev.plus(a.formattedBalance),
+            const assetNativeCryptoBalance = assets[symbol].reduce(
+                (total, account) => total.plus(account.formattedBalance),
                 new BigNumber(0),
             );
 
+            const assetTokens = assets[symbol].reduce((allTokens: TokenInfo[], account) => {
+                if (account.tokens) {
+                    allTokens.push(...account.tokens);
+                }
+
+                return allTokens;
+            }, []);
+
             const assetFailed = accounts.find(f => f.symbol === network.symbol && f.failed);
 
-            return { symbol, network, assetFailed: !!assetFailed, assetBalance };
+            return {
+                symbol,
+                network,
+                failed: !!assetFailed,
+                assetNativeCryptoBalance: assetNativeCryptoBalance
+                    ? assetNativeCryptoBalance.toNumber()
+                    : '0',
+                assetTokens: assetTokens?.length ? assetTokens : undefined,
+                stakingAccounts: accounts.filter(account =>
+                    isSupportedEthStakingNetworkSymbol(account.symbol),
+                ),
+                accounts,
+            };
         })
-        .filter(data => data !== null) as AssetTableRowType[];
+        .filter(data => data !== null) as AssetData[];
+
+    const assetsFiatBalances = useAssetsFiatBalances(
+        assetsData,
+        assets,
+        localCurrency,
+        currentFiatRates,
+    );
 
-    const assetsFiatBalances = useAssetsFiatBalances(assetsData, assets);
     const discoveryStatus = getDiscoveryStatus();
     const discoveryInProgress = discoveryStatus && discoveryStatus.status === 'loading';
     const isError =
@@ -135,7 +169,7 @@ export const AssetsView = () => {
                 isMobileLayout ? (
                     <></>
                 ) : (
-                    <ActionsWrapper>
+                    <Row justifyContent="space-around" alignItems="center">
                         {hasMainnetNetworksToEnable && (
                             <Button
                                 variant="tertiary"
@@ -168,7 +202,7 @@ export const AssetsView = () => {
                                     : theme.textSubdued
                             }
                         />
-                    </ActionsWrapper>
+                    </Row>
                 )
             }
         >
@@ -178,11 +212,16 @@ export const AssetsView = () => {
                         {assetsData.map((asset, index) => (
                             <AssetCard
                                 index={index}
-                                key={asset.symbol}
+                                key={asset.network.symbol}
                                 network={asset.network}
-                                failed={asset.assetFailed}
-                                cryptoValue={asset.assetBalance.toFixed()}
+                                failed={asset.failed}
+                                cryptoValue={asset.assetNativeCryptoBalance}
                                 assetsFiatBalances={assetsFiatBalances}
+                                stakingAccounts={asset.stakingAccounts}
+                                assetTokens={asset.assetTokens}
+                                localCurrency={localCurrency}
+                                currentFiatRates={currentFiatRates}
+                                accounts={asset.accounts}
                             />
                         ))}
                         {discoveryInProgress && <AssetCardSkeleton />}
@@ -202,20 +241,20 @@ export const AssetsView = () => {
                     )}
                 </>
             ) : (
-                <Card paddingType="none">
-                    <Column>
-                        <AssetTable
-                            assetsData={assetsData}
-                            assetsFiatBalances={assetsFiatBalances}
-                            discoveryInProgress={discoveryInProgress}
-                        />
-                        {isError && (
-                            <InfoMessage>
-                                <Icon name="warningTriangle" color={theme.iconAlertRed} size={14} />
-                                <Translation id="TR_DASHBOARD_ASSETS_ERROR" />
-                            </InfoMessage>
-                        )}
-                    </Column>
+                <Card paddingType="none" overflow="hidden">
+                    <AssetTable
+                        assetsData={assetsData}
+                        discoveryInProgress={discoveryInProgress}
+                        assetsFiatBalances={assetsFiatBalances}
+                        localCurrency={localCurrency}
+                        currentFiatRates={currentFiatRates}
+                    />
+                    {isError && (
+                        <InfoMessage>
+                            <Icon name="warningTriangle" color={theme.iconAlertRed} size={14} />
+                            <Translation id="TR_DASHBOARD_ASSETS_ERROR" />
+                        </InfoMessage>
+                    )}
                 </Card>
             )}
         </DashboardSection>
diff --git a/packages/suite/src/views/dashboard/AssetsView/CoinmarketBuyButton.tsx b/packages/suite/src/views/dashboard/AssetsView/CoinmarketBuyButton.tsx
index ac58a433dd6..acc280f026c 100644
--- a/packages/suite/src/views/dashboard/AssetsView/CoinmarketBuyButton.tsx
+++ b/packages/suite/src/views/dashboard/AssetsView/CoinmarketBuyButton.tsx
@@ -1,10 +1,12 @@
-import * as routerActions from 'src/actions/suite/routerActions';
+import { MouseEvent } from 'react';
+
 import { Button } from '@trezor/components';
 import { NetworkSymbol } from '@suite-common/wallet-config';
+import { EventType, analytics } from '@trezor/suite-analytics';
+
+import * as routerActions from 'src/actions/suite/routerActions';
 import { Translation } from 'src/components/suite';
 import { useDispatch, useAccountSearch } from 'src/hooks/suite';
-import { EventType, analytics } from '@trezor/suite-analytics';
-import { MouseEvent } from 'react';
 
 type CoinmarketBuyButtonProps = {
     symbol: NetworkSymbol;
diff --git a/packages/suite/src/views/dashboard/AssetsView/assetsViewUtils.ts b/packages/suite/src/views/dashboard/AssetsView/assetsViewUtils.ts
new file mode 100644
index 00000000000..3dae8884a23
--- /dev/null
+++ b/packages/suite/src/views/dashboard/AssetsView/assetsViewUtils.ts
@@ -0,0 +1,46 @@
+import { FiatCurrencyCode } from '@suite-common/suite-config';
+import { TokenDefinition } from '@suite-common/token-definitions';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+import { Account, RatesByKey } from '@suite-common/wallet-types';
+import { TokenInfo } from '@trezor/connect';
+import { BigNumber } from '@trezor/utils';
+import { getAccountTotalStakingBalance } from '@suite-common/wallet-utils';
+
+import {
+    enhanceTokensWithRates,
+    getTokens,
+    sortTokensWithRates,
+} from 'src/utils/wallet/tokenUtils';
+
+export const handleTokensAndStakingData = (
+    assetTokens: TokenInfo[],
+    accountsThatStaked: Account[],
+    symbol: NetworkSymbol,
+    localCurrency: FiatCurrencyCode,
+    coinDefinitions?: TokenDefinition,
+    currentFiatRates?: RatesByKey,
+) => {
+    const assetStakingBalance = accountsThatStaked.reduce((total, account) => {
+        return total.plus(getAccountTotalStakingBalance(account));
+    }, new BigNumber(0));
+    const tokens = getTokens(assetTokens ?? [], symbol, coinDefinitions);
+    const tokensWithRates = enhanceTokensWithRates(
+        tokens.shownWithBalance ?? [],
+        localCurrency,
+        symbol,
+        currentFiatRates,
+    );
+    const sortedTokens = tokensWithRates.sort(sortTokensWithRates);
+    const tokensFiatBalance = sortedTokens.reduce((total, token) => {
+        return total.plus(token?.fiatValue ?? 0);
+    }, new BigNumber(0));
+    const shouldRenderStakingRow = accountsThatStaked.length > 0 && assetStakingBalance.gt(0);
+    const shouldRenderTokenRow = tokens.shownWithBalance?.length > 0 && tokensFiatBalance.gt(0);
+
+    return {
+        tokensFiatBalance,
+        assetStakingBalance,
+        shouldRenderStakingRow,
+        shouldRenderTokenRow,
+    };
+};
diff --git a/packages/suite/src/views/dashboard/DashboardPassphraseBanner.tsx b/packages/suite/src/views/dashboard/DashboardPassphraseBanner.tsx
index 1502b4597fd..a5cffcd0b02 100644
--- a/packages/suite/src/views/dashboard/DashboardPassphraseBanner.tsx
+++ b/packages/suite/src/views/dashboard/DashboardPassphraseBanner.tsx
@@ -1,16 +1,20 @@
+import { useState } from 'react';
+
+import { AnimatePresence, motion } from 'framer-motion';
+import styled from 'styled-components';
+
 import { selectDevice } from '@suite-common/wallet-core';
 import { Banner, Text, Button, IconButton, Row, Column } from '@trezor/components';
-import { AnimatePresence, motion } from 'framer-motion';
-import { useState } from 'react';
+import { WalletType } from '@suite-common/wallet-types';
+
 import { goto } from 'src/actions/suite/routerActions';
 import { setFlag } from 'src/actions/suite/suiteActions';
 import { Translation } from 'src/components/suite';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
 import { useDiscovery, useDispatch, useSelector } from 'src/hooks/suite';
 import { selectSuiteFlags } from 'src/reducers/suite/suiteReducer';
+
 import { bannerAnimationConfig } from './banner-animations';
-import { WalletType } from '@suite-common/wallet-types';
-import styled from 'styled-components';
 
 const Container = styled(motion.div)`
     width: 100%;
diff --git a/packages/suite/src/views/dashboard/PortfolioCard/DashboardGraph.tsx b/packages/suite/src/views/dashboard/PortfolioCard/DashboardGraph.tsx
index b0d4f4651d1..fcfce21c7ad 100644
--- a/packages/suite/src/views/dashboard/PortfolioCard/DashboardGraph.tsx
+++ b/packages/suite/src/views/dashboard/PortfolioCard/DashboardGraph.tsx
@@ -55,7 +55,7 @@ export const DashboardGraph = memo(({ accounts }: DashboardGraphProps) => {
     const [isProcessing, setIsProcessing] = useState(false);
     const [xTicks, setXticks] = useState<number[]>([]);
 
-    const selectedDeviceState = selectedDevice?.state;
+    const selectedDeviceState = selectedDevice?.state?.staticSessionId;
     const failedAccounts = error?.filter(a => a.deviceState === selectedDeviceState);
     const allFailed =
         failedAccounts &&
diff --git a/packages/suite/src/views/dashboard/PortfolioCard/EmptyWallet.tsx b/packages/suite/src/views/dashboard/PortfolioCard/EmptyWallet.tsx
index 3dc8efdfd4c..335769a1618 100644
--- a/packages/suite/src/views/dashboard/PortfolioCard/EmptyWallet.tsx
+++ b/packages/suite/src/views/dashboard/PortfolioCard/EmptyWallet.tsx
@@ -1,48 +1,52 @@
-import styled from 'styled-components';
-import { variables, H3, Image } from '@trezor/components';
-import { Translation } from 'src/components/suite';
-
-const Wrapper = styled.div`
-    display: flex;
-    padding: 54px 42px;
-    align-items: center;
-    justify-content: center;
-    flex-direction: column;
-
-    @media (max-width: ${variables.SCREEN_SIZE.SM}) {
-        padding: 54px 20px;
-    }
-`;
+import { H3, Row, Paragraph, Button, Column, IconCircle } from '@trezor/components';
+import { CoinLogo } from '@trezor/product-components';
+import { spacings } from '@trezor/theme';
+import { selectIsDeviceUsingPassphrase } from '@suite-common/wallet-core';
 
-const Content = styled.div`
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const Title = styled(H3)`
-    color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
-    margin-bottom: 30px;
+import { Translation } from 'src/components/suite';
+import { useSelector, useDispatch } from 'src/hooks/suite';
+import { goto } from 'src/actions/suite/routerActions';
+import { useNetworkSupport } from 'src/hooks/settings/useNetworkSupport';
+import { selectEnabledNetworks } from 'src/reducers/wallet/settingsReducer';
 
-    @media (max-width: ${variables.SCREEN_SIZE.MD}) {
-        text-align: center;
-    }
-`;
+export const EmptyWallet = () => {
+    const { supportedMainnets } = useNetworkSupport();
+    const isPassphraseType = useSelector(selectIsDeviceUsingPassphrase);
+    const enabledNetworks = useSelector(selectEnabledNetworks);
+    const dispatch = useDispatch();
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledImage = styled(Image)`
-    display: flex;
-    margin-bottom: 24px;
-`;
+    const areAllNetworksEnabled = supportedMainnets.every(network =>
+        enabledNetworks.includes(network.symbol),
+    );
 
-export const EmptyWallet = () => (
-    <Wrapper data-testid="@dashboard/wallet-ready">
-        <StyledImage image="UNI_SUCCESS" />
-        <Content>
-            <Title>
+    return (
+        <Column gap={spacings.xxs} data-testid="@dashboard/wallet-ready">
+            <IconCircle name="check" size="extraLarge" variant="primary" />
+            <H3 margin={{ top: spacings.md }}>
                 <Translation id="TR_YOUR_WALLET_IS_READY_WHAT" />
-            </Title>
-        </Content>
-    </Wrapper>
-);
+            </H3>
+            {isPassphraseType && !areAllNetworksEnabled && (
+                <Row gap={spacings.xs} flexWrap="wrap">
+                    <Paragraph variant="tertiary" typographyStyle="hint">
+                        <Translation id="TR_CHECKED_BALANCES_ON" />:
+                    </Paragraph>
+                    <Row gap={spacings.xxs} flexWrap="wrap">
+                        {enabledNetworks.map(network => (
+                            <CoinLogo key={network} symbol={network} size={16} />
+                        ))}
+                    </Row>
+                    <Button
+                        variant="tertiary"
+                        icon="plus"
+                        size="tiny"
+                        onClick={() => {
+                            dispatch(goto('settings-coins'));
+                        }}
+                    >
+                        <Translation id="TR_ADD" />
+                    </Button>
+                </Row>
+            )}
+        </Column>
+    );
+};
diff --git a/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCard.tsx b/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCard.tsx
index 37fa31f7044..22cba834436 100644
--- a/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCard.tsx
+++ b/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCard.tsx
@@ -1,30 +1,25 @@
 import { memo, useMemo } from 'react';
+
 import styled from 'styled-components';
 
-import { Dropdown, Card, Tooltip } from '@trezor/components';
+import { Dropdown, Card, Tooltip, Column } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+import { getTotalFiatBalance } from '@suite-common/wallet-utils';
+import { selectCurrentFiatRates } from '@suite-common/wallet-core';
+import { hasBitcoinOnlyFirmware } from '@trezor/device-utils';
+
 import { GraphScaleDropdownItem, GraphSkeleton, Translation } from 'src/components/suite';
 import { DashboardSection } from 'src/components/dashboard';
 import { useDevice, useDiscovery, useDispatch, useSelector } from 'src/hooks/suite';
 import { useFastAccounts } from 'src/hooks/wallet';
 import { goto } from 'src/actions/suite/routerActions';
 import { setFlag } from 'src/actions/suite/suiteActions';
-import { getTotalFiatBalance } from '@suite-common/wallet-utils';
+import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
 
 import { PortfolioCardHeader } from './PortfolioCardHeader';
 import { PortfolioCardException } from './PortfolioCardException';
 import { EmptyWallet } from './EmptyWallet';
 import { DashboardGraph } from './DashboardGraph';
-import { selectCurrentFiatRates } from '@suite-common/wallet-core';
-import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
-import { hasBitcoinOnlyFirmware } from '@trezor/device-utils';
-
-const Body = styled.div`
-    align-items: center;
-    justify-content: center;
-    padding: 0 20px;
-    min-height: 329px;
-    flex: 1;
-`;
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledDropdown = styled(Dropdown)`
@@ -84,8 +79,8 @@ export const PortfolioCard = memo(() => {
     }
 
     const isWalletEmpty = !discoveryStatus && isDeviceEmpty;
-    const isWalletLoading = discoveryStatus?.status === 'loading' ?? false;
-    const isWalletError = discoveryStatus?.status === 'exception' ?? false;
+    const isWalletLoading = discoveryStatus?.status === 'loading';
+    const isWalletError = discoveryStatus?.status === 'exception';
     const showGraphControls =
         !isWalletEmpty && !isWalletLoading && !isWalletError && !dashboardGraphHidden;
 
@@ -99,7 +94,6 @@ export const PortfolioCard = memo(() => {
         );
 
     const goToReceive = () => dispatch(goto('wallet-receive'));
-    const goToBuy = () => dispatch(goto('wallet-coinmarket-buy'));
     const heading = <Translation id="TR_MY_PORTFOLIO" />;
 
     return (
@@ -161,11 +155,20 @@ export const PortfolioCard = memo(() => {
                         isWalletError={isWalletError}
                         isDiscoveryRunning={isDiscoveryRunning}
                         receiveClickHandler={goToReceive}
-                        buyClickHandler={goToBuy}
                     />
                 )}
 
-                {body && <Body>{body}</Body>}
+                {body && (
+                    <Column
+                        justifyContent="center"
+                        alignItems="stretch"
+                        minHeight={329}
+                        flex="1"
+                        margin={{ left: spacings.lg, right: spacings.lg }}
+                    >
+                        {body}
+                    </Column>
+                )}
             </Card>
         </DashboardSection>
     );
diff --git a/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCardException.tsx b/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCardException.tsx
index 24e984d4646..6bb95f43595 100644
--- a/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCardException.tsx
+++ b/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCardException.tsx
@@ -1,15 +1,14 @@
 import { ComponentProps } from 'react';
 
-import styled from 'styled-components';
-
 import {
     authConfirm,
     authorizeDeviceThunk,
     restartDiscoveryThunk as restartDiscovery,
 } from '@suite-common/wallet-core';
 import { getNetwork, NetworkType } from '@suite-common/wallet-config';
-import { variables, Button, H3, Image, IconName } from '@trezor/components';
+import { Button, H3, IconName, Column, Row, Paragraph, IconCircle } from '@trezor/components';
 import { Discovery } from '@suite-common/wallet-types';
+import { spacings } from '@trezor/theme';
 
 import { Translation } from 'src/components/suite';
 import { useDevice, useDispatch } from 'src/hooks/suite';
@@ -18,38 +17,6 @@ import { goto } from 'src/actions/suite/routerActions';
 import { DiscoveryStatusType } from 'src/types/wallet';
 import { TranslationKey } from 'src/components/suite/Translation';
 
-const Wrapper = styled.div`
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex-direction: column;
-    padding: 20px;
-    width: 100%;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const Title = styled(H3)`
-    color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
-`;
-
-const Description = styled.div`
-    font-size: ${variables.FONT_SIZE.SMALL};
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-    text-align: center;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledImage = styled(Image)`
-    margin: 24px 0;
-`;
-
-const Actions = styled.div`
-    display: flex;
-    justify-content: space-around;
-    width: 100%;
-    margin-top: 24px;
-`;
-
 interface CTA {
     label?: TranslationKey;
     variant?: ComponentProps<typeof Button>['variant'];
@@ -70,21 +37,21 @@ const Container = ({ title, description, cta, dataTestBase }: ContainerProps) =>
     const actions = Array.isArray(cta) ? cta : [cta];
 
     return (
-        <Wrapper data-testid={`@exception/${dataTestBase}`}>
-            <StyledImage image="UNI_ERROR" />
-            <Title>
+        <Column gap={spacings.xxs} data-testid={`@exception/${dataTestBase}`}>
+            <IconCircle name="warning" size="extraLarge" variant="warning" />
+            <H3 margin={{ top: spacings.md }}>
                 <Translation id={title} />
-            </Title>
+            </H3>
             {description && (
-                <Description>
+                <Paragraph variant="tertiary" typographyStyle="hint">
                     {typeof description === 'string' ? (
                         <Translation id={description} />
                     ) : (
                         description
                     )}
-                </Description>
+                </Paragraph>
             )}
-            <Actions>
+            <Row gap={spacings.sm} margin={{ top: spacings.md }}>
                 {actions.map(a => (
                     <Button
                         key={a.label || 'TR_RETRY'}
@@ -97,8 +64,8 @@ const Container = ({ title, description, cta, dataTestBase }: ContainerProps) =>
                         <Translation id={a.label || 'TR_RETRY'} />
                     </Button>
                 ))}
-            </Actions>
-        </Wrapper>
+            </Row>
+        </Column>
     );
 };
 
diff --git a/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCardHeader.tsx b/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCardHeader.tsx
index f87cc9957b4..95f5e65da5a 100644
--- a/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCardHeader.tsx
+++ b/packages/suite/src/views/dashboard/PortfolioCard/PortfolioCardHeader.tsx
@@ -1,14 +1,15 @@
 import { useCallback } from 'react';
+
 import styled, { css } from 'styled-components';
 
 import { Button, LoadingContent } from '@trezor/components';
+import { spacingsPx } from '@trezor/theme';
 
 import { GraphRangeSelector, Translation } from 'src/components/suite';
 import { updateGraphData } from 'src/actions/wallet/graphActions';
 import { useFastAccounts } from 'src/hooks/wallet';
 import { GraphRange } from 'src/types/wallet/graph';
 import { FiatHeader } from 'src/components/wallet/FiatHeader';
-import { spacingsPx } from '@trezor/theme';
 
 const Wrapper = styled.div<{ $hideBorder: boolean }>`
     display: flex;
@@ -55,7 +56,6 @@ export type PortfolioCardHeaderProps = {
     showGraphControls: boolean;
     hideBorder: boolean;
     receiveClickHandler: () => void;
-    buyClickHandler: () => void;
 };
 
 export const PortfolioCardHeader = ({
@@ -69,7 +69,6 @@ export const PortfolioCardHeader = ({
     showGraphControls,
     hideBorder,
     receiveClickHandler,
-    buyClickHandler,
 }: PortfolioCardHeaderProps) => {
     const accounts = useFastAccounts();
 
@@ -92,13 +91,6 @@ export const PortfolioCardHeader = ({
                         >
                             <Translation id="TR_RECEIVE" />
                         </WalletEmptyButton>
-                        <WalletEmptyButton
-                            onClick={buyClickHandler}
-                            data-testid="@dashboard/buy-button"
-                            variant="tertiary"
-                        >
-                            <Translation id="TR_BUY" />
-                        </WalletEmptyButton>
                     </Buttons>
                 </>
             );
diff --git a/packages/suite/src/views/dashboard/PromoBanner.tsx b/packages/suite/src/views/dashboard/PromoBanner.tsx
index a0efd35c073..25e8b5bb17f 100644
--- a/packages/suite/src/views/dashboard/PromoBanner.tsx
+++ b/packages/suite/src/views/dashboard/PromoBanner.tsx
@@ -1,14 +1,17 @@
 import { useState } from 'react';
+
 import styled, { css } from 'styled-components';
+
 import { SUITE_MOBILE_APP_STORE, SUITE_MOBILE_PLAY_STORE, SUITE_URL } from '@trezor/urls';
 import { EventType, analytics } from '@trezor/suite-analytics';
 import { Button, Icon, Image, Tooltip, variables } from '@trezor/components';
-import { Translation, QrCode, TrezorLink } from 'src/components/suite';
 import { isWeb } from '@trezor/env-utils';
+import { spacingsPx } from '@trezor/theme';
+
+import { Translation, QrCode, TrezorLink } from 'src/components/suite';
 import { useLayoutSize } from 'src/hooks/suite/useLayoutSize';
 import { HORIZONTAL_LAYOUT_PADDINGS } from 'src/constants/suite/layout';
 import { useSelector } from 'src/hooks/suite';
-import { spacingsPx } from '@trezor/theme';
 
 const Container = styled.div`
     position: absolute;
@@ -212,7 +215,7 @@ export const PromoBanner = () => {
                     <Image image="HOLLOW_APP_LOGO" width={44} height={44} />
 
                     <div>
-                        <Translation id="TR_DESKTOP_APP_PROMO_TEXT_FOOTER" />
+                        <Translation id="TR_MOBILE_APP_PROMO_TEXT" />
 
                         <OSIcons>
                             <Icon name="osMac" size={14} />
diff --git a/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCard.tsx b/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCard.tsx
index 4b75cae9426..e1be8539240 100644
--- a/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCard.tsx
+++ b/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCard.tsx
@@ -1,28 +1,31 @@
 import { useEffect, useMemo, useState } from 'react';
+
 import {
     variables,
     Divider,
     H3,
-    Icon,
     Card,
     Column,
     Tooltip,
     Grid,
     useMediaQuery,
     Paragraph,
+    IconName,
 } from '@trezor/components';
-import { DashboardSection } from 'src/components/dashboard';
-import { Translation, StakingFeature } from 'src/components/suite';
-import { StakeEthCardFooter } from './StakeEthCardFooter/StakeEthCardFooter';
+import { spacings } from '@trezor/theme';
+import { selectPoolStatsApyData } from '@suite-common/wallet-core';
+import { MIN_ETH_BALANCE_FOR_STAKING } from '@suite-common/wallet-constants';
+import { hasBitcoinOnlyFirmware } from '@trezor/device-utils';
+
 import { useDevice, useDiscovery, useDispatch, useSelector } from 'src/hooks/suite';
 import { useAccounts } from 'src/hooks/wallet';
-import { MIN_ETH_BALANCE_FOR_STAKING } from 'src/constants/suite/ethStaking';
-import { spacings } from '@trezor/theme';
 import { selectEnabledNetworks } from 'src/reducers/wallet/settingsReducer';
 import { selectSuiteFlags } from 'src/reducers/suite/suiteReducer';
 import { setFlag } from 'src/actions/suite/suiteActions';
-import { selectPoolStatsApyData } from '@suite-common/wallet-core';
-import { hasBitcoinOnlyFirmware } from '@trezor/device-utils';
+import { Translation, StakingFeature } from 'src/components/suite';
+import { DashboardSection } from 'src/components/dashboard';
+
+import { StakeEthCardFooter } from './StakeEthCardFooter/StakeEthCardFooter';
 
 const bannerSymbol = 'eth';
 
@@ -63,7 +66,7 @@ export const StakeEthCard = () => {
         () => [
             {
                 id: 0,
-                icon: <Icon name="piggyBank" size="extraLarge" variant="primary" />,
+                icon: 'piggyBank' as IconName,
                 title: <Translation id="TR_STAKE_ETH_SEE_MONEY_DANCE" />,
                 description: (
                     <Translation
@@ -85,13 +88,13 @@ export const StakeEthCard = () => {
             },
             {
                 id: 1,
-                icon: <Icon name="lockLaminatedOpen" size="extraLarge" variant="primary" />,
+                icon: 'lockLaminatedOpen' as IconName,
                 title: <Translation id="TR_STAKE_ETH_LOCK_FUNDS" />,
                 description: <Translation id="TR_STAKE_ETH_LOCK_FUNDS_DESC" />,
             },
             {
                 id: 2,
-                icon: <Icon name="trendUp" size="extraLarge" variant="primary" />,
+                icon: 'trendUp' as IconName,
                 title: <Translation id="TR_STAKE_ETH_MAXIMIZE_REWARDS" />,
                 description: <Translation id="TR_STAKE_ETH_MAXIMIZE_REWARDS_DESC" />,
             },
diff --git a/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCardFooter/NetworkBadge.tsx b/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCardFooter/NetworkBadge.tsx
index 6d201827c98..c977ac71aa0 100644
--- a/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCardFooter/NetworkBadge.tsx
+++ b/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCardFooter/NetworkBadge.tsx
@@ -1,4 +1,5 @@
 import { ReactNode } from 'react';
+
 import { Paragraph, Row } from '@trezor/components';
 import { spacings } from '@trezor/theme';
 import { CoinLogo } from '@trezor/product-components';
diff --git a/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCardFooter/StakeEthCardFooter.tsx b/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCardFooter/StakeEthCardFooter.tsx
index 96d613d31e0..29f0392b4bf 100644
--- a/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCardFooter/StakeEthCardFooter.tsx
+++ b/packages/suite/src/views/dashboard/StakeEthCard/StakeEthCardFooter/StakeEthCardFooter.tsx
@@ -1,9 +1,11 @@
 import { Button, Paragraph, Row } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
-import { NetworkBadge } from './NetworkBadge';
 import { useAccountSearch, useDispatch } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
-import { spacings } from '@trezor/theme';
+
+import { NetworkBadge } from './NetworkBadge';
 
 type StakeEthCardFooterProps = {
     accountIndex: number | undefined;
diff --git a/packages/suite/src/views/dashboard/T3T1PromoBanner/T3T1PromoBanner.tsx b/packages/suite/src/views/dashboard/T3T1PromoBanner/T3T1PromoBanner.tsx
index de72caf64bb..2bbdc9bdc1d 100644
--- a/packages/suite/src/views/dashboard/T3T1PromoBanner/T3T1PromoBanner.tsx
+++ b/packages/suite/src/views/dashboard/T3T1PromoBanner/T3T1PromoBanner.tsx
@@ -1,18 +1,20 @@
 import React, { useState } from 'react';
+
 import styled from 'styled-components';
+import { AnimatePresence, motion } from 'framer-motion';
+import { rgba } from 'polished';
 
 import { EventType, analytics } from '@trezor/suite-analytics';
 import { TREZOR_SAFE_5_URL } from '@trezor/urls';
+import { Button, IconButton, Image, SVG_IMAGES, SVG_PATH, variables } from '@trezor/components';
+import { resolveStaticPath } from '@suite-common/suite-utils';
+import { colorVariants } from '@trezor/theme';
 
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { selectIsDashboardT3T1PromoBannerShown } from 'src/reducers/suite/suiteReducer';
-import { Button, IconButton, Image, SVG_IMAGES, SVG_PATH, variables } from '@trezor/components';
 import { setFlag } from 'src/actions/suite/suiteActions';
 import { Translation, TrezorLink } from 'src/components/suite';
-import { AnimatePresence, motion } from 'framer-motion';
-import { resolveStaticPath } from '@suite-common/suite-utils';
-import { colorVariants } from '@trezor/theme';
-import { rgba } from 'polished';
+
 import { T3T1PromoLogo } from './T3T1PromoLogo';
 import { bannerAnimationConfig } from '../banner-animations';
 
diff --git a/packages/suite/src/views/dashboard/T3T1PromoBanner/T3T1PromoLogo.tsx b/packages/suite/src/views/dashboard/T3T1PromoBanner/T3T1PromoLogo.tsx
index e975aa43d4e..8a49f49d63a 100644
--- a/packages/suite/src/views/dashboard/T3T1PromoBanner/T3T1PromoLogo.tsx
+++ b/packages/suite/src/views/dashboard/T3T1PromoBanner/T3T1PromoLogo.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
+
 import styled from 'styled-components';
+
 import { borders, colorVariants, typography } from '@trezor/theme';
 import { variables } from '@trezor/components';
 
diff --git a/packages/suite/src/views/dashboard/index.tsx b/packages/suite/src/views/dashboard/index.tsx
index 717a9219acd..b92c4cb742c 100644
--- a/packages/suite/src/views/dashboard/index.tsx
+++ b/packages/suite/src/views/dashboard/index.tsx
@@ -1,14 +1,17 @@
 import styled from 'styled-components';
+
 import { breakpointMediaQueries } from '@trezor/styles';
+import { spacingsPx } from '@trezor/theme';
+
 import { useLayout } from 'src/hooks/suite';
+import { PageHeader } from 'src/components/suite/layouts/SuiteLayout';
+
 import { AssetsView } from './AssetsView/AssetsView';
 import { PortfolioCard } from './PortfolioCard/PortfolioCard';
 import { PromoBanner } from './PromoBanner';
 import { T3T1PromoBanner } from './T3T1PromoBanner/T3T1PromoBanner';
-import { PageHeader } from 'src/components/suite/layouts/SuiteLayout';
 import { StakeEthCard } from './StakeEthCard/StakeEthCard';
 import { DashboardPassphraseBanner } from './DashboardPassphraseBanner';
-import { spacingsPx } from '@trezor/theme';
 
 const Wrapper = styled.div`
     display: flex;
diff --git a/packages/suite/src/views/firmware/FirmwareCustom.tsx b/packages/suite/src/views/firmware/FirmwareCustom.tsx
index 56dfd390193..7eb42c2ebfc 100644
--- a/packages/suite/src/views/firmware/FirmwareCustom.tsx
+++ b/packages/suite/src/views/firmware/FirmwareCustom.tsx
@@ -2,6 +2,7 @@ import { useState } from 'react';
 
 import { useDevice, useFirmware } from 'src/hooks/suite';
 import { SelectCustomFirmware } from 'src/components/firmware';
+
 import { FirmwareModal } from './FirmwareModal';
 
 export const FirmwareCustom = () => {
diff --git a/packages/suite/src/views/firmware/FirmwareModal.tsx b/packages/suite/src/views/firmware/FirmwareModal.tsx
index b081575a532..74414bbb916 100644
--- a/packages/suite/src/views/firmware/FirmwareModal.tsx
+++ b/packages/suite/src/views/firmware/FirmwareModal.tsx
@@ -1,16 +1,25 @@
 import { ReactElement } from 'react';
+import { useIntl } from 'react-intl';
+
 import styled from 'styled-components';
 
+import { TranslationKey } from '@suite-common/intl-types';
 import { acquireDevice, selectDevice } from '@suite-common/wallet-core';
 import { variables } from '@trezor/components';
+import TrezorConnect from '@trezor/connect';
+import { ConfirmOnDevice } from '@trezor/product-components';
 
 import { closeModalApp } from 'src/actions/suite/routerActions';
-import { CheckSeedStep, FirmwareCloseButton, FirmwareInstallation } from 'src/components/firmware';
+import {
+    CheckSeedStep,
+    FirmwareCloseButton,
+    FirmwareInstallation,
+    FirmwareUpdateHashCheckError,
+} from 'src/components/firmware';
 import { Translation, Modal, PrerequisitesGuide } from 'src/components/suite';
 import { OnboardingStepBox } from 'src/components/onboarding';
 import { useDispatch, useFirmware, useSelector } from 'src/hooks/suite';
-import { TranslationKey } from '@suite-common/intl-types';
-import { ConfirmOnDevice } from '@trezor/product-components';
+import messages from 'src/support/messages';
 
 const Wrapper = styled.div<{ $isWithTopPadding: boolean }>`
     display: flex;
@@ -33,41 +42,46 @@ const StyledModal = styled(Modal)`
 
 type FirmwareModalProps = {
     children: ReactElement;
-    deviceWillBeWiped?: boolean;
     heading: TranslationKey;
     install: () => void;
     isCustom?: boolean;
+    shouldSwitchFirmwareType?: boolean;
 };
 
 export const FirmwareModal = ({
     children,
-    deviceWillBeWiped,
     heading,
     install,
     isCustom,
+    shouldSwitchFirmwareType,
 }: FirmwareModalProps) => {
     const {
         resetReducer,
         status,
+        deviceWillBeWiped,
         error,
         firmwareHashInvalid,
         uiEvent,
         confirmOnDevice,
         showConfirmationPill,
-    } = useFirmware();
+    } = useFirmware({ shouldSwitchFirmwareType });
     const device = useSelector(selectDevice);
     const dispatch = useDispatch();
+    const intl = useIntl();
 
     const deviceModelInternal = uiEvent?.payload.device.features?.internal_model;
     const isCancelable = ['initial', 'check-seed', 'done', 'error'].includes(status);
+    const isAwaitingPinEntry =
+        uiEvent?.type === 'button' && uiEvent.payload.code === 'ButtonRequest_PinEntry';
 
-    const onClose = () => {
+    const handleClose = () => {
         if (device?.status !== 'available') {
             dispatch(acquireDevice(device));
         }
         dispatch(closeModalApp());
         resetReducer();
     };
+    const handlePinCancel = () => TrezorConnect.cancel(intl.formatMessage(messages.TR_CANCELLED));
 
     const getComponent = (): ReactElement => {
         if (
@@ -77,19 +91,13 @@ export const FirmwareModal = ({
             return <PrerequisitesGuide />;
         }
 
-        // Special and hopefully very rare case. This appears when somebody tried to fool user into using a hacked firmware. This check is skipped when installing custom FW.
-        if (device?.id && firmwareHashInvalid.includes(device.id)) {
-            return (
-                <OnboardingStepBox
-                    image="UNI_ERROR"
-                    heading={<Translation id="TR_FIRMWARE_HASH_MISMATCH" />}
-                    nested
-                />
-            );
-        }
-
         switch (status) {
             case 'error':
+                // Special and hopefully very rare case. This appears when somebody tried to fool user into using a hacked firmware. This check is skipped when installing custom FW.
+                if (device?.id && firmwareHashInvalid.includes(device.id)) {
+                    return <FirmwareUpdateHashCheckError error={error} />;
+                }
+
                 return (
                     <OnboardingStepBox
                         image="FIRMWARE"
@@ -97,7 +105,7 @@ export const FirmwareModal = ({
                         description={
                             <Translation id="TOAST_GENERIC_ERROR" values={{ error: error || '' }} />
                         }
-                        innerActions={<FirmwareCloseButton onClick={onClose} />}
+                        innerActions={<FirmwareCloseButton onClick={handleClose} />}
                         nested
                     />
                 );
@@ -106,9 +114,9 @@ export const FirmwareModal = ({
             case 'check-seed':
                 return (
                     <CheckSeedStep
+                        deviceWillBeWiped={deviceWillBeWiped}
                         onSuccess={install}
-                        onClose={onClose}
-                        willBeWiped={deviceWillBeWiped}
+                        onClose={handleClose}
                     />
                 );
             case 'started':
@@ -117,8 +125,8 @@ export const FirmwareModal = ({
                     <FirmwareInstallation
                         standaloneFwUpdate
                         install={install}
-                        onSuccess={onClose}
-                        onPromptClose={onClose}
+                        onSuccess={handleClose}
+                        onPromptClose={handleClose}
                         customFirmware={isCustom}
                     />
                 );
@@ -135,10 +143,11 @@ export const FirmwareModal = ({
                         deviceModelInternal={deviceModelInternal}
                         deviceUnitColor={uiEvent?.payload.device.features?.unit_color}
                         isConfirmed={!confirmOnDevice}
+                        onCancel={isAwaitingPinEntry ? handlePinCancel : undefined}
                     />
                 )
             }
-            onCancel={onClose}
+            onCancel={handleClose}
             data-testid="@firmware-modal"
             heading={<Translation id={heading} />}
         >
diff --git a/packages/suite/src/views/firmware/FirmwareUpdate.tsx b/packages/suite/src/views/firmware/FirmwareUpdate.tsx
index 9950ad40ebc..35032387178 100644
--- a/packages/suite/src/views/firmware/FirmwareUpdate.tsx
+++ b/packages/suite/src/views/firmware/FirmwareUpdate.tsx
@@ -1,44 +1,34 @@
-import { DeviceModelInternal } from '@trezor/connect';
-
 import { FirmwareInitial } from 'src/components/firmware';
 import { closeModalApp } from 'src/actions/suite/routerActions';
-import { useDevice, useDispatch, useFirmware } from 'src/hooks/suite';
+import { useDispatch, useFirmware } from 'src/hooks/suite';
+
 import { FirmwareModal } from './FirmwareModal';
 
 type FirmwareUpdateProps = {
     shouldSwitchFirmwareType?: boolean;
 };
 
-export const FirmwareUpdate = ({ shouldSwitchFirmwareType = false }: FirmwareUpdateProps) => {
-    const { device } = useDevice();
-    const { firmwareUpdate, getTargetFirmwareType } = useFirmware();
+export const FirmwareUpdate = ({ shouldSwitchFirmwareType }: FirmwareUpdateProps) => {
+    const { firmwareUpdate, targetFirmwareType } = useFirmware({ shouldSwitchFirmwareType });
     const dispatch = useDispatch();
 
-    const deviceModelInternal = device?.features?.internal_model;
-    // Device will be wiped because Universal and Bitcoin-only firmware have different vendor headers, except T1B1 and T2T1.
-    const deviceWillBeWiped =
-        shouldSwitchFirmwareType &&
-        deviceModelInternal &&
-        ![DeviceModelInternal.T1B1, DeviceModelInternal.T2T1].includes(deviceModelInternal);
-
     const close = () => dispatch(closeModalApp());
     const installTargetFirmware = () =>
         firmwareUpdate({
-            firmwareType: getTargetFirmwareType(!!shouldSwitchFirmwareType),
+            firmwareType: targetFirmwareType,
         });
 
     const heading = shouldSwitchFirmwareType ? 'TR_SWITCH_FIRMWARE' : 'TR_INSTALL_FIRMWARE';
 
     return (
         <FirmwareModal
-            deviceWillBeWiped={deviceWillBeWiped}
+            shouldSwitchFirmwareType={shouldSwitchFirmwareType}
             heading={heading}
             install={installTargetFirmware}
         >
             <FirmwareInitial
-                standaloneFwUpdate
                 shouldSwitchFirmwareType={shouldSwitchFirmwareType}
-                willBeWiped={deviceWillBeWiped}
+                standaloneFwUpdate
                 onClose={close}
             />
         </FirmwareModal>
diff --git a/packages/suite/src/views/onboarding/UnexpectedState/components/IsSameDevice.tsx b/packages/suite/src/views/onboarding/UnexpectedState/components/IsSameDevice.tsx
index dc7183d8b4c..e1a92996c6f 100644
--- a/packages/suite/src/views/onboarding/UnexpectedState/components/IsSameDevice.tsx
+++ b/packages/suite/src/views/onboarding/UnexpectedState/components/IsSameDevice.tsx
@@ -1,4 +1,5 @@
 import { Button } from '@trezor/components';
+
 import { OnboardingStepBox } from 'src/components/onboarding';
 import { Translation } from 'src/components/suite';
 import { useOnboarding } from 'src/hooks/suite';
diff --git a/packages/suite/src/views/onboarding/UnexpectedState/index.tsx b/packages/suite/src/views/onboarding/UnexpectedState/index.tsx
index 979ac784bcd..a3f07a1f498 100644
--- a/packages/suite/src/views/onboarding/UnexpectedState/index.tsx
+++ b/packages/suite/src/views/onboarding/UnexpectedState/index.tsx
@@ -1,4 +1,5 @@
 import { useMemo } from 'react';
+
 import styled from 'styled-components';
 
 import { selectDevice } from '@suite-common/wallet-core';
diff --git a/packages/suite/src/views/onboarding/index.tsx b/packages/suite/src/views/onboarding/index.tsx
index fdcac1de53c..154218292fc 100644
--- a/packages/suite/src/views/onboarding/index.tsx
+++ b/packages/suite/src/views/onboarding/index.tsx
@@ -1,9 +1,9 @@
 import { useMemo } from 'react';
+
 import { OnboardingLayout } from 'src/components/onboarding';
 import { ReduxModal } from 'src/components/suite/modals/ReduxModal/ReduxModal';
 import CreateOrRecover from 'src/views/onboarding/steps/CreateOrRecover';
 import { FirmwareStep } from 'src/views/onboarding/steps/FirmwareStep';
-import { DeviceAuthenticity } from './steps/SecurityCheck/DeviceAuthenticity';
 import { ResetDeviceStep } from 'src/views/onboarding/steps/ResetDevice';
 import { RecoveryStep } from 'src/views/onboarding/steps/Recovery';
 import { BackupStep } from 'src/views/onboarding/steps/Backup';
@@ -15,6 +15,8 @@ import UnexpectedState from 'src/views/onboarding/UnexpectedState';
 import { useOnboarding, useFilteredModal } from 'src/hooks/suite';
 import { MODAL } from 'src/actions/suite/constants';
 import * as STEP from 'src/constants/onboarding/steps';
+
+import { DeviceAuthenticity } from './steps/SecurityCheck/DeviceAuthenticity';
 import { DeviceTutorial } from './steps/DeviceTutorial';
 
 export const Onboarding = () => {
diff --git a/packages/suite/src/views/onboarding/steps/Backup.tsx b/packages/suite/src/views/onboarding/steps/Backup.tsx
index 8636522098e..3f0b6ba8f54 100644
--- a/packages/suite/src/views/onboarding/steps/Backup.tsx
+++ b/packages/suite/src/views/onboarding/steps/Backup.tsx
@@ -20,7 +20,7 @@ import { goToNextStep, updateAnalytics } from 'src/actions/onboarding/onboarding
 import { backupDevice } from 'src/actions/backup/backupActions';
 import { goto } from 'src/actions/suite/routerActions';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
-import { selectIsActionAbortable } from 'src/reducers/suite/suiteReducer';
+import { selectIsActionAbortable, selectIsDeviceLocked } from 'src/reducers/suite/suiteReducer';
 import * as onboardingActions from 'src/actions/onboarding/onboardingActions';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
@@ -32,7 +32,7 @@ export const BackupStep = () => {
     const [showSkipConfirmation, setShowSkipConfirmation] = useState(false);
     const backup = useSelector(state => state.backup);
     const device = useSelector(selectDevice);
-    const locks = useSelector(state => state.suite.locks);
+    const isDeviceLocked = useSelector(selectIsDeviceLocked);
     const isActionAbortable = useSelector(selectIsActionAbortable);
     const dispatch = useDispatch();
 
@@ -77,7 +77,7 @@ export const BackupStep = () => {
                         <OnboardingButtonCta
                             data-testid="@backup/start-button"
                             onClick={handleBackup}
-                            isDisabled={!canContinue(backup.userConfirmed, locks)}
+                            isDisabled={!canContinue(backup.userConfirmed, isDeviceLocked)}
                         >
                             <Translation id="TR_START_BACKUP" />
                         </OnboardingButtonCta>
diff --git a/packages/suite/src/views/onboarding/steps/BasicSettings/AdvancedSetup.tsx b/packages/suite/src/views/onboarding/steps/BasicSettings/AdvancedSetup.tsx
index f9aea899c3d..0bff4856c9a 100644
--- a/packages/suite/src/views/onboarding/steps/BasicSettings/AdvancedSetup.tsx
+++ b/packages/suite/src/views/onboarding/steps/BasicSettings/AdvancedSetup.tsx
@@ -1,13 +1,17 @@
 import { useState, ReactNode } from 'react';
+
 import styled, { useTheme } from 'styled-components';
-import { Translation } from 'src/components/suite';
+
 import { Icon } from '@trezor/components';
-import { useSelector } from 'src/hooks/suite';
 import { isDesktop, isWeb } from '@trezor/env-utils';
-import { TorSection } from './TorSection';
+
+import { useSelector } from 'src/hooks/suite';
+import { Translation } from 'src/components/suite';
 import { getIsTorEnabled } from 'src/utils/suite/tor';
 import { CollapsibleOnboardingCard } from 'src/components/onboarding/CollapsibleOnboardingCard';
 
+import { TorSection } from './TorSection';
+
 const AdvancedSetupWrapper = styled.div`
     width: 100%;
     text-align: center;
diff --git a/packages/suite/src/views/onboarding/steps/BasicSettings/BasicSettingsStepBox.tsx b/packages/suite/src/views/onboarding/steps/BasicSettings/BasicSettingsStepBox.tsx
index b5803d10576..86c1345ad56 100644
--- a/packages/suite/src/views/onboarding/steps/BasicSettings/BasicSettingsStepBox.tsx
+++ b/packages/suite/src/views/onboarding/steps/BasicSettings/BasicSettingsStepBox.tsx
@@ -1,14 +1,18 @@
 import { useEffect } from 'react';
+
 import styled from 'styled-components';
-import { OnboardingStepBox, OnboardingStepBoxProps } from 'src/components/onboarding';
-import { CoinGroup, TooltipSymbol, Translation } from 'src/components/suite';
-import { useEnabledNetworks } from 'src/hooks/settings/useEnabledNetworks';
+
 import { CollapsibleBox } from '@trezor/components';
 import { spacings } from '@trezor/theme';
-import { selectDeviceSupportedNetworks, selectDeviceModel } from '@suite-common/wallet-core';
-import { useSelector } from 'src/hooks/suite';
+import { selectDeviceModel } from '@suite-common/wallet-core';
 import { DeviceModelInternal } from '@trezor/connect';
-import { Network } from '@suite-common/wallet-config';
+
+import { OnboardingStepBox, OnboardingStepBoxProps } from 'src/components/onboarding';
+import { CoinGroup, TooltipSymbol, Translation } from 'src/components/suite';
+import { useNetworkSupport } from 'src/hooks/settings/useNetworkSupport';
+import { useDispatch, useSelector } from 'src/hooks/suite';
+import { changeCoinVisibility } from 'src/actions/settings/walletSettingsActions';
+import { selectEnabledNetworks } from 'src/reducers/wallet/settingsReducer';
 
 const Separator = styled.hr`
     height: 1px;
@@ -20,32 +24,20 @@ const Separator = styled.hr`
 `;
 
 export const BasicSettingsStepBox = (props: OnboardingStepBoxProps) => {
-    const { mainnets, testnets, enabledNetworks, setEnabled } = useEnabledNetworks();
-    const deviceSupportedNetworkSymbols = useSelector(selectDeviceSupportedNetworks);
+    const { supportedMainnets, unsupportedMainnets, supportedTestnets } = useNetworkSupport();
     const deviceModel = useSelector(selectDeviceModel);
-
-    const getNetworks = (networks: Network[], getUnsupported = false) =>
-        networks.filter(
-            ({ symbol }) => getUnsupported !== deviceSupportedNetworkSymbols.includes(symbol),
-        );
-
-    const supportedNetworks = getNetworks(mainnets);
-    const unsupportedNetworks = getNetworks(mainnets, true);
-    const supportedTestnetNetworks = getNetworks(testnets);
+    const enabledNetworks = useSelector(selectEnabledNetworks);
+    const dispatch = useDispatch();
 
     // BTC should be enabled by default
     useEffect(() => {
-        setEnabled('btc', true);
-    }, [setEnabled]);
+        dispatch(changeCoinVisibility('btc', true));
+    }, [dispatch]);
 
     return (
         <OnboardingStepBox image="COINS" {...props}>
             <Separator />
-            <CoinGroup
-                networks={supportedNetworks}
-                onToggle={setEnabled}
-                enabledNetworks={enabledNetworks}
-            />
+            <CoinGroup networks={supportedMainnets} enabledNetworks={enabledNetworks} />
             <CollapsibleBox
                 margin={{ top: spacings.xl }}
                 heading={
@@ -58,11 +50,7 @@ export const BasicSettingsStepBox = (props: OnboardingStepBoxProps) => {
                 }
                 paddingType="large"
             >
-                <CoinGroup
-                    networks={supportedTestnetNetworks}
-                    onToggle={setEnabled}
-                    enabledNetworks={enabledNetworks}
-                />
+                <CoinGroup networks={supportedTestnets} enabledNetworks={enabledNetworks} />
             </CollapsibleBox>
             {deviceModel === DeviceModelInternal.T1B1 && (
                 <CollapsibleBox
@@ -77,11 +65,7 @@ export const BasicSettingsStepBox = (props: OnboardingStepBoxProps) => {
                     }
                     paddingType="large"
                 >
-                    <CoinGroup
-                        networks={unsupportedNetworks}
-                        onToggle={setEnabled}
-                        enabledNetworks={enabledNetworks}
-                    />
+                    <CoinGroup networks={unsupportedMainnets} enabledNetworks={enabledNetworks} />
                 </CollapsibleBox>
             )}
         </OnboardingStepBox>
diff --git a/packages/suite/src/views/onboarding/steps/BasicSettings/TorSection.tsx b/packages/suite/src/views/onboarding/steps/BasicSettings/TorSection.tsx
index a326209103f..be5c3f4e5e3 100644
--- a/packages/suite/src/views/onboarding/steps/BasicSettings/TorSection.tsx
+++ b/packages/suite/src/views/onboarding/steps/BasicSettings/TorSection.tsx
@@ -1,5 +1,7 @@
 import styled from 'styled-components';
+
 import { variables, Switch } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite';
 import { toggleTor } from 'src/actions/suite/suiteActions';
diff --git a/packages/suite/src/views/onboarding/steps/BasicSettings/index.tsx b/packages/suite/src/views/onboarding/steps/BasicSettings/index.tsx
index ef3cb50f117..d4014e45198 100644
--- a/packages/suite/src/views/onboarding/steps/BasicSettings/index.tsx
+++ b/packages/suite/src/views/onboarding/steps/BasicSettings/index.tsx
@@ -1,13 +1,16 @@
+import { hasBitcoinOnlyFirmware } from '@trezor/device-utils';
+
 import { Translation } from 'src/components/suite';
 import { OnboardingButtonCta } from 'src/components/onboarding';
 import { useDevice, useOnboarding, useSelector } from 'src/hooks/suite';
-import { BasicSettingsStepBox } from './BasicSettingsStepBox';
-import { AdvancedSetup } from './AdvancedSetup';
 import { getIsTorLoading } from 'src/utils/suite/tor';
-import { hasBitcoinOnlyFirmware } from '@trezor/device-utils';
+import { selectEnabledNetworks } from 'src/reducers/wallet/settingsReducer';
+
+import { AdvancedSetup } from './AdvancedSetup';
+import { BasicSettingsStepBox } from './BasicSettingsStepBox';
 
 const BasicSettings = () => {
-    const enabledNetworks = useSelector(state => state.wallet.settings.enabledNetworks);
+    const enabledNetworks = useSelector(selectEnabledNetworks);
     const torStatus = useSelector(state => state.suite.torStatus);
     const { device } = useDevice();
 
diff --git a/packages/suite/src/views/onboarding/steps/DeviceTutorial.tsx b/packages/suite/src/views/onboarding/steps/DeviceTutorial.tsx
index 0e8db6ed365..bd4c5011a6e 100644
--- a/packages/suite/src/views/onboarding/steps/DeviceTutorial.tsx
+++ b/packages/suite/src/views/onboarding/steps/DeviceTutorial.tsx
@@ -1,10 +1,13 @@
 import { useEffect } from 'react';
 import { useIntl } from 'react-intl';
+
 import styled from 'styled-components';
 
 import { selectDevice } from '@suite-common/wallet-core';
 import TrezorConnect from '@trezor/connect';
 import { Button } from '@trezor/components';
+import { spacingsPx } from '@trezor/theme';
+
 import {
     beginOnboardingTutorial,
     goToNextStep,
@@ -16,7 +19,6 @@ import { useDispatch, useSelector } from 'src/hooks/suite';
 import { selectIsActionAbortable } from 'src/reducers/suite/suiteReducer';
 import { selectOnboardingTutorialStatus } from 'src/reducers/onboarding/onboardingReducer';
 import messages from 'src/support/messages';
-import { spacingsPx } from '@trezor/theme';
 
 const StyledOnboardingStepBox = styled(OnboardingStepBox)`
     padding: 40px 20px 0;
@@ -74,7 +76,12 @@ export const DeviceTutorial = () => {
                         <Translation id="TR_TREZOR_DEVICE_TUTORIAL_DESCRIPTION" />
                         <ButtonContainer>
                             {isActionAbortable && (
-                                <Button variant="tertiary" size="tiny" onClick={handleSkipClick}>
+                                <Button
+                                    data-testid="@tutorial/skip-button"
+                                    variant="tertiary"
+                                    size="tiny"
+                                    onClick={handleSkipClick}
+                                >
                                     <Translation id="TR_SKIP" />
                                 </Button>
                             )}
@@ -108,7 +115,11 @@ export const DeviceTutorial = () => {
             devicePromptTitle={<Translation id="TR_CONTINUE_ON_TREZOR" />}
             outerActions={
                 isContinueButtonVisible && (
-                    <Button variant="primary" onClick={handleContinue}>
+                    <Button
+                        data-testid="@tutorial/continue-button"
+                        variant="primary"
+                        onClick={handleContinue}
+                    >
                         <Translation id="TR_CONTINUE" />
                     </Button>
                 )
diff --git a/packages/suite/src/views/onboarding/steps/Final.tsx b/packages/suite/src/views/onboarding/steps/Final.tsx
index f3e9aad50c9..d1279b79781 100644
--- a/packages/suite/src/views/onboarding/steps/Final.tsx
+++ b/packages/suite/src/views/onboarding/steps/Final.tsx
@@ -1,8 +1,9 @@
 import { useRef, useState } from 'react';
+
 import styled, { css } from 'styled-components';
 import useMeasure from 'react-use/lib/useMeasure';
-import { analytics, EventType } from '@trezor/suite-analytics';
 
+import { analytics, EventType } from '@trezor/suite-analytics';
 import {
     Button,
     variables,
@@ -11,13 +12,14 @@ import {
     Tooltip,
     DeviceAnimation,
 } from '@trezor/components';
+import { spacingsPx, typography } from '@trezor/theme';
+
 import { Translation, HomescreenGallery } from 'src/components/suite';
 import { OnboardingStepBox } from 'src/components/onboarding';
 import { useDevice, useOnboarding, useSelector } from 'src/hooks/suite';
 import { isHomescreenSupportedOnDevice } from 'src/utils/suite/homescreen';
 import { selectIsActionAbortable } from 'src/reducers/suite/suiteReducer';
 import { ChangeDeviceLabel } from 'src/components/suite/ChangeDeviceLabel';
-import { spacingsPx, typography } from '@trezor/theme';
 
 const Content = styled.div`
     flex-direction: column;
diff --git a/packages/suite/src/views/onboarding/steps/FirmwareStep.tsx b/packages/suite/src/views/onboarding/steps/FirmwareStep.tsx
index 951f895e034..e27795ef63b 100644
--- a/packages/suite/src/views/onboarding/steps/FirmwareStep.tsx
+++ b/packages/suite/src/views/onboarding/steps/FirmwareStep.tsx
@@ -8,6 +8,7 @@ import {
     FirmwareRetryButton,
     FirmwareInstallation,
     FirmwareInitial,
+    FirmwareUpdateHashCheckError,
     Fingerprint,
 } from 'src/components/firmware';
 import { useSelector, useFirmware, useOnboarding } from 'src/hooks/suite';
@@ -34,12 +35,7 @@ export const FirmwareStep = () => {
 
     // special and hopefully very rare case. this appears when somebody tried to fool user into using a hacked firmware
     if (device?.id && firmwareHashInvalid.includes(device.id)) {
-        return (
-            <OnboardingStepBox
-                image="UNI_ERROR"
-                heading={<Translation id="TR_FIRMWARE_HASH_MISMATCH" />}
-            />
-        );
+        return <FirmwareUpdateHashCheckError error={error} />;
     }
 
     if (showFingerprintCheck && device) {
diff --git a/packages/suite/src/views/onboarding/steps/Recovery/RecoveryStepBox.tsx b/packages/suite/src/views/onboarding/steps/Recovery/RecoveryStepBox.tsx
index df1898e6226..ff19931af81 100644
--- a/packages/suite/src/views/onboarding/steps/Recovery/RecoveryStepBox.tsx
+++ b/packages/suite/src/views/onboarding/steps/Recovery/RecoveryStepBox.tsx
@@ -1,4 +1,5 @@
 import { DeviceModelInternal } from '@trezor/connect';
+
 import {
     OnboardingButtonBack,
     OnboardingStepBox,
diff --git a/packages/suite/src/views/onboarding/steps/ResetDevice.tsx b/packages/suite/src/views/onboarding/steps/ResetDevice.tsx
index f8d261d5676..7d4ab01c366 100644
--- a/packages/suite/src/views/onboarding/steps/ResetDevice.tsx
+++ b/packages/suite/src/views/onboarding/steps/ResetDevice.tsx
@@ -1,19 +1,23 @@
 import { useCallback, useEffect, useState } from 'react';
+
 import styled from 'styled-components';
+
 import { selectDevice } from '@suite-common/wallet-core';
+import { Button, Divider, Text } from '@trezor/components';
+import { DeviceModelInternal } from '@trezor/connect';
+
 import * as STEP from 'src/constants/onboarding/steps';
 import { OnboardingButtonBack, OptionsWrapper, OnboardingStepBox } from 'src/components/onboarding';
 import { Translation } from 'src/components/suite';
 import { useDispatch, useSelector, useOnboarding, useDevice } from 'src/hooks/suite';
 import { resetDevice } from 'src/actions/settings/deviceSettingsActions';
 import { selectIsActionAbortable } from 'src/reducers/suite/suiteReducer';
-import { Button, Divider, Text } from '@trezor/components';
+
 import {
     SelectBackupType,
     getDefaultBackupType,
     isShamirBackupType,
 } from './SelectBackupType/SelectBackupType';
-import { DeviceModelInternal } from '@trezor/connect';
 import { BackupType } from '../../../reducers/onboarding/onboardingReducer';
 
 const SelectWrapper = styled.div`
diff --git a/packages/suite/src/views/onboarding/steps/Security.tsx b/packages/suite/src/views/onboarding/steps/Security.tsx
index e7841330bc5..223cafe6b3b 100644
--- a/packages/suite/src/views/onboarding/steps/Security.tsx
+++ b/packages/suite/src/views/onboarding/steps/Security.tsx
@@ -1,4 +1,5 @@
 import { useState } from 'react';
+
 import { Translation } from 'src/components/suite';
 import {
     OnboardingButtonCta,
diff --git a/packages/suite/src/views/onboarding/steps/SecurityCheck/DeviceAuthenticity.tsx b/packages/suite/src/views/onboarding/steps/SecurityCheck/DeviceAuthenticity.tsx
index 117a3a70d4a..3290451b959 100644
--- a/packages/suite/src/views/onboarding/steps/SecurityCheck/DeviceAuthenticity.tsx
+++ b/packages/suite/src/views/onboarding/steps/SecurityCheck/DeviceAuthenticity.tsx
@@ -1,17 +1,19 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
 
 import { checkDeviceAuthenticityThunk } from '@suite-common/device-authenticity';
 import { selectDevice, selectSelectedDeviceAuthenticity } from '@suite-common/wallet-core';
 import { variables } from '@trezor/components';
+import { spacingsPx } from '@trezor/theme';
+import { TREZOR_SUPPORT_DEVICE_AUTHENTICATION_FAILED_URL } from '@trezor/urls';
 
 import { OnboardingButtonCta, OnboardingStepBox } from 'src/components/onboarding';
 import { CollapsibleOnboardingCard } from 'src/components/onboarding/CollapsibleOnboardingCard';
 import { DeviceAuthenticationExplainer, Translation } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { selectIsDebugModeActive } from 'src/reducers/suite/suiteReducer';
-import { SecurityCheckFail } from '../../../../components/suite/SecurityCheck/SecurityCheckFail';
-import { spacingsPx } from '@trezor/theme';
+import { SecurityCheckFail } from 'src/components/suite/SecurityCheck/SecurityCheckFail';
 
 const StyledCard = styled(CollapsibleOnboardingCard)`
     padding: ${spacingsPx.md};
@@ -109,7 +111,7 @@ export const DeviceAuthenticity = ({ goToNext }: DeviceAuthenticityProps) => {
     if (isCheckFailed) {
         return (
             <StyledCard>
-                <SecurityCheckFail />
+                <SecurityCheckFail supportUrl={TREZOR_SUPPORT_DEVICE_AUTHENTICATION_FAILED_URL} />
             </StyledCard>
         );
     }
diff --git a/packages/suite/src/views/onboarding/steps/SecurityCheck/SecurityCheck.tsx b/packages/suite/src/views/onboarding/steps/SecurityCheck/SecurityCheck.tsx
index 76b7cca8608..e111ef32b6f 100644
--- a/packages/suite/src/views/onboarding/steps/SecurityCheck/SecurityCheck.tsx
+++ b/packages/suite/src/views/onboarding/steps/SecurityCheck/SecurityCheck.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
+
 import styled, { useTheme } from 'styled-components';
 
 import { getConnectedDeviceStatus } from '@suite-common/suite-utils';
@@ -23,6 +24,7 @@ import { SUPPORTS_DEVICE_AUTHENTICITY_CHECK } from 'src/constants/suite/device';
 import { SecurityCheckFail } from 'src/components/suite/SecurityCheck/SecurityCheckFail';
 import { selectIsOnboardingActive } from 'src/reducers/onboarding/onboardingReducer';
 import { selectSuiteFlags } from 'src/reducers/suite/suiteReducer';
+
 import { SecurityChecklist } from './SecurityChecklist';
 import { DeviceAuthenticity } from './DeviceAuthenticity';
 
@@ -209,7 +211,7 @@ const SecurityCheckContent = ({
     return isFailed ? (
         <SecurityCheckFail
             goBack={toggleView}
-            heading="TR_DEVICE_COMPROMISED_HEADING_SOFT"
+            heading="TR_PLAY_IT_SAFE"
             text="TR_DEVICE_COMPROMISED_TEXT_SOFT"
             supportUrl={supportUrl}
         />
diff --git a/packages/suite/src/views/onboarding/steps/SecurityCheck/SecurityChecklist.tsx b/packages/suite/src/views/onboarding/steps/SecurityCheck/SecurityChecklist.tsx
index 833fcfed7a7..0b4234544b8 100644
--- a/packages/suite/src/views/onboarding/steps/SecurityCheck/SecurityChecklist.tsx
+++ b/packages/suite/src/views/onboarding/steps/SecurityCheck/SecurityChecklist.tsx
@@ -1,16 +1,12 @@
-import { ReactNode } from 'react';
 import { useTheme } from 'styled-components';
 
-import { Column, Icon, IconName, Row, Text } from '@trezor/components';
+import { Column, Icon, Row, Text } from '@trezor/components';
 import { spacings } from '@trezor/theme';
 
-type Item = {
-    icon: IconName;
-    content: ReactNode;
-};
+import { SecurityChecklistItem } from './types';
 
 type SecurityChecklistProps = {
-    items: readonly Item[];
+    items: readonly SecurityChecklistItem[];
 };
 
 export const SecurityChecklist = ({ items }: SecurityChecklistProps) => {
diff --git a/packages/suite/src/views/onboarding/steps/SecurityCheck/types.ts b/packages/suite/src/views/onboarding/steps/SecurityCheck/types.ts
new file mode 100644
index 00000000000..68cf3a6b660
--- /dev/null
+++ b/packages/suite/src/views/onboarding/steps/SecurityCheck/types.ts
@@ -0,0 +1,8 @@
+import { ReactNode } from 'react';
+
+import { IconName } from '@trezor/components';
+
+export type SecurityChecklistItem = {
+    icon: IconName;
+    content: ReactNode;
+};
diff --git a/packages/suite/src/views/onboarding/steps/SelectBackupType/DefaultTag.tsx b/packages/suite/src/views/onboarding/steps/SelectBackupType/DefaultTag.tsx
index 17889c42805..b16979cef1a 100644
--- a/packages/suite/src/views/onboarding/steps/SelectBackupType/DefaultTag.tsx
+++ b/packages/suite/src/views/onboarding/steps/SelectBackupType/DefaultTag.tsx
@@ -1,5 +1,6 @@
 import { Badge, Text } from '@trezor/components';
 import { spacings } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import { useLayoutSize } from 'src/hooks/suite';
 
diff --git a/packages/suite/src/views/onboarding/steps/SelectBackupType/FloatingSelections.tsx b/packages/suite/src/views/onboarding/steps/SelectBackupType/FloatingSelections.tsx
index f9eb0d264c5..9faaacea9a9 100644
--- a/packages/suite/src/views/onboarding/steps/SelectBackupType/FloatingSelections.tsx
+++ b/packages/suite/src/views/onboarding/steps/SelectBackupType/FloatingSelections.tsx
@@ -1,3 +1,7 @@
+import { CSSProperties, forwardRef, useRef } from 'react';
+
+import styled from 'styled-components';
+
 import {
     useElevation,
     Divider,
@@ -15,13 +19,13 @@ import {
     spacingsPx,
     zIndices,
 } from '@trezor/theme';
-import { CSSProperties, forwardRef, useRef } from 'react';
+import { HELP_CENTER_MULTI_SHARE_BACKUP_URL } from '@trezor/urls';
+
 import { Translation, TrezorLink } from 'src/components/suite';
+
 import { LegacyOptions } from './LegacyOptions';
 import { isShamirBackupType } from './SelectBackupType';
 import { BackupType } from '../../../../reducers/onboarding/onboardingReducer';
-import styled from 'styled-components';
-import { HELP_CENTER_MULTI_SHARE_BACKUP_URL } from '@trezor/urls';
 import { ShamirOptions } from './ShamirOptions';
 
 const OptionGroupHeading = styled.div`
diff --git a/packages/suite/src/views/onboarding/steps/SelectBackupType/LegacyOptions.tsx b/packages/suite/src/views/onboarding/steps/SelectBackupType/LegacyOptions.tsx
index 936517020a0..3ffb87d40f7 100644
--- a/packages/suite/src/views/onboarding/steps/SelectBackupType/LegacyOptions.tsx
+++ b/packages/suite/src/views/onboarding/steps/SelectBackupType/LegacyOptions.tsx
@@ -1,6 +1,8 @@
-import { BackupType } from '../../../../reducers/onboarding/onboardingReducer';
-import { Translation } from 'src/components/suite';
 import { Tooltip } from '@trezor/components';
+
+import { Translation } from 'src/components/suite';
+
+import { BackupType } from '../../../../reducers/onboarding/onboardingReducer';
 import { OptionWithContent } from './OptionWithContent';
 import { DefaultTag } from './DefaultTag';
 
diff --git a/packages/suite/src/views/onboarding/steps/SelectBackupType/OptionWithContent.tsx b/packages/suite/src/views/onboarding/steps/SelectBackupType/OptionWithContent.tsx
index a51c8a40d32..ff3f212e43a 100644
--- a/packages/suite/src/views/onboarding/steps/SelectBackupType/OptionWithContent.tsx
+++ b/packages/suite/src/views/onboarding/steps/SelectBackupType/OptionWithContent.tsx
@@ -1,9 +1,8 @@
-import { Radio, Row, variables, Text, Icon, useElevation, Tooltip } from '@trezor/components';
-import { BackupType } from '../../../../reducers/onboarding/onboardingReducer';
 import { ReactNode, forwardRef } from 'react';
-import { Translation } from 'src/components/suite';
-import { useLayoutSize } from 'src/hooks/suite';
+
 import styled, { css } from 'styled-components';
+
+import { Radio, Row, variables, Text, Icon, useElevation, Tooltip } from '@trezor/components';
 import {
     spacingsPx,
     borders,
@@ -11,6 +10,11 @@ import {
     mapElevationToBackground,
     mapElevationToBorder,
 } from '@trezor/theme';
+
+import { useLayoutSize } from 'src/hooks/suite';
+import { Translation } from 'src/components/suite';
+
+import { BackupType } from '../../../../reducers/onboarding/onboardingReducer';
 import { typesToLabelMap } from './typesToLabelMap';
 
 export const OptionText = styled.div`
diff --git a/packages/suite/src/views/onboarding/steps/SelectBackupType/SelectBackupType.tsx b/packages/suite/src/views/onboarding/steps/SelectBackupType/SelectBackupType.tsx
index 2b426af775f..a189606b5ac 100644
--- a/packages/suite/src/views/onboarding/steps/SelectBackupType/SelectBackupType.tsx
+++ b/packages/suite/src/views/onboarding/steps/SelectBackupType/SelectBackupType.tsx
@@ -1,15 +1,6 @@
-import { ElevationUp, Text, Banner, useElevation } from '@trezor/components';
-import {
-    Elevation,
-    borders,
-    mapElevationToBackground,
-    mapElevationToBorder,
-    spacingsPx,
-} from '@trezor/theme';
 import { useState } from 'react';
+
 import styled from 'styled-components';
-import { useLayoutSize, useSelector } from '../../../../hooks/suite';
-import { selectDevice } from '@suite-common/wallet-core';
 import {
     FloatingFocusManager,
     autoUpdate,
@@ -22,13 +13,25 @@ import {
     size,
     offset,
 } from '@floating-ui/react';
+
+import { ElevationUp, Text, Banner, useElevation } from '@trezor/components';
+import {
+    Elevation,
+    borders,
+    mapElevationToBackground,
+    mapElevationToBorder,
+    spacingsPx,
+} from '@trezor/theme';
+import { selectDevice } from '@suite-common/wallet-core';
 import { TranslationKey } from '@suite-common/intl-types';
+import { DeviceModelInternal } from '@trezor/connect';
+
+import { useLayoutSize, useSelector } from '../../../../hooks/suite';
 import { Translation } from '../../../../components/suite';
 import { BackupType } from '../../../../reducers/onboarding/onboardingReducer';
 import { OptionText, SelectedOption } from './OptionWithContent';
 import { FloatingSelections } from './FloatingSelections';
 import { typesToLabelMap } from './typesToLabelMap';
-import { DeviceModelInternal } from '@trezor/connect';
 
 const SELECT_ELEMENT_HEIGHT = 84;
 const SELECT_ELEMENT_HEIGHT_MOBILE = 62;
@@ -43,6 +46,7 @@ export const defaultBackupTypeMap: Record<DeviceModelInternal, BackupType> = {
     [DeviceModelInternal.T2B1]: 'shamir-single',
     [DeviceModelInternal.T3B1]: 'shamir-single',
     [DeviceModelInternal.T3T1]: 'shamir-single',
+    [DeviceModelInternal.T3W1]: 'shamir-single',
 };
 
 type GetDefaultBackupTypeParams = { model: DeviceModelInternal; packaging: number };
diff --git a/packages/suite/src/views/onboarding/steps/SelectBackupType/ShamirOptions.tsx b/packages/suite/src/views/onboarding/steps/SelectBackupType/ShamirOptions.tsx
index bf69bbd2f03..9d94fdd1576 100644
--- a/packages/suite/src/views/onboarding/steps/SelectBackupType/ShamirOptions.tsx
+++ b/packages/suite/src/views/onboarding/steps/SelectBackupType/ShamirOptions.tsx
@@ -1,13 +1,15 @@
+import { satisfies } from 'semver';
+
 import { Badge, Tooltip } from '@trezor/components';
 import { spacings } from '@trezor/theme';
+import { selectDevice } from '@suite-common/wallet-core';
+import { getFirmwareVersion } from '@trezor/device-utils';
+
 import { Translation } from '../../../../components/suite';
 import { useLayoutSize, useSelector } from '../../../../hooks/suite';
 import { BackupType } from '../../../../reducers/onboarding/onboardingReducer';
 import { DefaultTag } from './DefaultTag';
 import { OptionWithContent } from './OptionWithContent';
-import { selectDevice } from '@suite-common/wallet-core';
-import { getFirmwareVersion } from '@trezor/device-utils';
-import { satisfies } from 'semver';
 
 const UpgradableToMultiTag = () => {
     const { isMobileLayout } = useLayoutSize();
diff --git a/packages/suite/src/views/onboarding/steps/SelectBackupType/typesToLabelMap.ts b/packages/suite/src/views/onboarding/steps/SelectBackupType/typesToLabelMap.ts
index 653860d4878..c8593d7247f 100644
--- a/packages/suite/src/views/onboarding/steps/SelectBackupType/typesToLabelMap.ts
+++ b/packages/suite/src/views/onboarding/steps/SelectBackupType/typesToLabelMap.ts
@@ -1,4 +1,5 @@
 import { TranslationKey } from '@suite-common/intl-types';
+
 import { BackupType } from '../../../../reducers/onboarding/onboardingReducer';
 
 export const typesToLabelMap: Record<BackupType, TranslationKey> = {
diff --git a/packages/suite/src/views/password-manager/PasswordManager/EntryForm.tsx b/packages/suite/src/views/password-manager/PasswordManager/EntryForm.tsx
index 8175ddba046..c3f19155daf 100644
--- a/packages/suite/src/views/password-manager/PasswordManager/EntryForm.tsx
+++ b/packages/suite/src/views/password-manager/PasswordManager/EntryForm.tsx
@@ -1,19 +1,19 @@
 import React, { useState } from 'react';
+
 import { randomBytes } from 'crypto';
 import styled from 'styled-components';
 
 import TrezorConnect from '@trezor/connect';
-
 import { Button, Checkbox, Input } from '@trezor/components';
 import type { PasswordEntry, PasswordEntryDecoded } from '@suite-common/metadata-types';
+import { selectDevice } from '@suite-common/wallet-core';
+import { isUrl } from '@trezor/utils';
+import { spacingsPx } from '@trezor/theme';
 
 import { usePasswords, useSelector } from 'src/hooks/suite';
-import { selectDevice } from '@suite-common/wallet-core';
 import * as metadataUtils from 'src/utils/suite/metadata';
 import { PATH } from 'src/actions/suite/constants/metadataPasswordsConstants';
 import { getDisplayKey } from 'src/utils/suite/passwords';
-import { isUrl } from '@trezor/utils';
-import { spacingsPx } from '@trezor/theme';
 
 const FormWrapper = styled.div`
     display: flex;
diff --git a/packages/suite/src/views/password-manager/PasswordManager/PasswordEntry.tsx b/packages/suite/src/views/password-manager/PasswordManager/PasswordEntry.tsx
index 8df98308ac2..692bf051338 100644
--- a/packages/suite/src/views/password-manager/PasswordManager/PasswordEntry.tsx
+++ b/packages/suite/src/views/password-manager/PasswordManager/PasswordEntry.tsx
@@ -1,8 +1,9 @@
 import React, { useState } from 'react';
+
 import styled from 'styled-components';
-import TrezorConnect from '@trezor/connect';
-import { Button } from '@trezor/components';
 
+import TrezorConnect, { DeviceUniquePath } from '@trezor/connect';
+import { Button } from '@trezor/components';
 import { spacingsPx } from '@trezor/theme';
 
 import { DialogModal } from 'src/components/suite/modals/Modal/DialogRenderer';
@@ -34,7 +35,7 @@ const Row = styled.div`
 `;
 
 interface PasswordEntryProps extends PasswordEntryType {
-    devicePath: string;
+    devicePath: DeviceUniquePath;
     onEncrypted: (entry: PasswordEntryType) => void;
     formActive: number | null;
     setFormActive: (id: number | null) => void;
diff --git a/packages/suite/src/views/password-manager/PasswordManager/PasswordManager.tsx b/packages/suite/src/views/password-manager/PasswordManager/PasswordManager.tsx
index 18609626926..8ef40e76102 100644
--- a/packages/suite/src/views/password-manager/PasswordManager/PasswordManager.tsx
+++ b/packages/suite/src/views/password-manager/PasswordManager/PasswordManager.tsx
@@ -1,5 +1,7 @@
 import React, { useState } from 'react';
+
 import styled from 'styled-components';
+
 import { Button } from '@trezor/components';
 
 import { TextColumn, ActionColumn } from 'src/components/suite';
diff --git a/packages/suite/src/views/password-manager/PasswordManager/PasswordsList.tsx b/packages/suite/src/views/password-manager/PasswordManager/PasswordsList.tsx
index a4c61dd0bab..4d308b976a3 100644
--- a/packages/suite/src/views/password-manager/PasswordManager/PasswordsList.tsx
+++ b/packages/suite/src/views/password-manager/PasswordManager/PasswordsList.tsx
@@ -1,18 +1,19 @@
 import styled from 'styled-components';
 
+import { selectDevice } from '@suite-common/wallet-core';
+
+import type { PasswordEntry as PasswordEntryType } from 'src/types/suite/metadata';
+import { useSelector } from 'src/hooks/suite';
+import { TextColumn } from 'src/components/suite';
+
 import { AddEntryButton } from './AddEntryButton';
 import {
     PasswordEntry as PasswordEntryComponent,
     PasswordEntryCol,
     PasswordEntryRow,
 } from './PasswordEntry';
-import type { PasswordEntry as PasswordEntryType } from 'src/types/suite/metadata';
 import { EntryForm } from './EntryForm';
 
-import { useSelector } from 'src/hooks/suite';
-import { TextColumn } from 'src/components/suite';
-import { selectDevice } from '@suite-common/wallet-core';
-
 const Wrapper = styled.div`
     display: flex;
     flex-direction: column;
diff --git a/packages/suite/src/views/password-manager/PasswordManager/TagsList.tsx b/packages/suite/src/views/password-manager/PasswordManager/TagsList.tsx
index e1400bcefb3..65f958d57fe 100644
--- a/packages/suite/src/views/password-manager/PasswordManager/TagsList.tsx
+++ b/packages/suite/src/views/password-manager/PasswordManager/TagsList.tsx
@@ -1,9 +1,10 @@
 import styled from 'styled-components';
 
-import { Tag } from './Tag';
 import { PasswordTag } from '@suite-common/metadata-types';
 import { spacingsPx } from '@trezor/theme';
 
+import { Tag } from './Tag';
+
 const TagsListWrapper = styled.div`
     display: flex;
     flex-direction: row;
diff --git a/packages/suite/src/views/password-manager/index.tsx b/packages/suite/src/views/password-manager/index.tsx
index 4651ea58e64..b0b622f27db 100644
--- a/packages/suite/src/views/password-manager/index.tsx
+++ b/packages/suite/src/views/password-manager/index.tsx
@@ -1,8 +1,9 @@
 import { useLayout } from 'src/hooks/suite';
-import { PasswordManager } from './PasswordManager/PasswordManager';
 import { PageHeader } from 'src/components/suite/layouts/SuiteLayout';
 import { BasicName } from 'src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/BasicName';
 
+import { PasswordManager } from './PasswordManager/PasswordManager';
+
 const PasswordManagerView = () => {
     useLayout('Password manager', () => (
         <PageHeader>
diff --git a/packages/suite/src/views/recovery/index.tsx b/packages/suite/src/views/recovery/index.tsx
index a0a01bf29d8..689a8883933 100644
--- a/packages/suite/src/views/recovery/index.tsx
+++ b/packages/suite/src/views/recovery/index.tsx
@@ -1,15 +1,19 @@
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
-import styled from 'styled-components';
 
-import { getCheckBackupUrl, isDeviceAcquired } from '@suite-common/suite-utils';
-import { Button, H2, Paragraph, Image } from '@trezor/components';
+import {
+    getCheckBackupUrl,
+    getNarrowedDeviceModelInternal,
+    isDeviceAcquired,
+    isDeviceWithButtons,
+} from '@suite-common/suite-utils';
+import { Card, H2, H3, Image, List, NewModal, Paragraph } from '@trezor/components';
 import { pickByDeviceModel } from '@trezor/device-utils';
 import TrezorConnect, { DeviceModelInternal } from '@trezor/connect';
+import { spacings } from '@trezor/theme';
 
-import { SelectWordCount, SelectRecoveryType } from 'src/components/recovery';
-import { Loading, Translation, CheckItem, Modal } from 'src/components/suite';
-import { ReduxModal } from 'src/components/suite/modals/ReduxModal/ReduxModal';
+import { SelectRecoveryType, SelectWordCount } from 'src/components/recovery';
+import { CheckItem, Loading, Translation } from 'src/components/suite';
 import {
     checkSeed,
     setAdvancedRecovery,
@@ -19,56 +23,12 @@ import {
 import { useDevice, useDispatch, useSelector } from 'src/hooks/suite';
 import type { ForegroundAppProps } from 'src/types/suite';
 import type { WordCount } from 'src/types/recovery';
-import { InstructionStep } from 'src/components/suite/InstructionStep';
 import messages from 'src/support/messages';
 import { LearnMoreButton } from 'src/components/suite/LearnMoreButton';
+import { MODAL } from 'src/actions/suite/constants';
 
-const StyledModal = styled(Modal)`
-    min-height: 450px;
-
-    ${Modal.Content} {
-        justify-content: center;
-    }
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledButton = styled(Button)`
-    width: 224px;
-`;
-
-const StepsContainer = styled.div`
-    margin: 40px 0;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledP = styled(Paragraph)`
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledImage = styled(Image)`
-    margin-bottom: 24px;
-    align-self: center;
-`;
-
-const LeftAlignedP = styled(StyledP)`
-    text-align: left;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StatusImage = styled(Image)`
-    padding-bottom: 24px;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StatusTitle = styled(H2)`
-    margin: 0 0 12px;
-`;
-
-const VerticalCenter = styled.div`
-    margin-top: auto;
-    margin-bottom: auto;
-`;
+import { T1B1InputStep } from './steps/T1B1InputStep';
+import { EnterOnDeviceStep } from './steps/EnterOnDeviceStep';
 
 export const Recovery = ({ onCancel }: ForegroundAppProps) => {
     const recovery = useSelector(state => state.recovery);
@@ -102,170 +62,190 @@ export const Recovery = ({ onCancel }: ForegroundAppProps) => {
                   'finished',
               ]
             : ['initial', 'in-progress', 'finished'];
+    const hasFinished = recovery.status === 'finished';
+    const hasError = recovery.error !== undefined;
 
     if (!isDeviceAcquired(device) || !deviceModelInternal) {
         return (
-            <Modal
+            <NewModal
                 heading={<Translation id="TR_RECONNECT_HEADER" />}
-                isCancelable
                 onCancel={onCancel}
                 data-testid="@recovery/no-device"
+                size="tiny"
             >
-                <StyledImage image="CONNECT_DEVICE" width="360" />
-            </Modal>
+                <Image image="CONNECT_DEVICE" />
+            </NewModal>
         );
     }
 
-    const actionButtons = (
-        <>
-            {recovery.status === 'initial' ? (
-                <StyledButton
-                    onClick={() =>
-                        deviceModelInternal === DeviceModelInternal.T1B1
-                            ? dispatch(setStatus('select-word-count'))
-                            : dispatch(checkSeed())
-                    }
-                    isDisabled={!understood || isLocked()}
-                    data-testid="@recovery/start-button"
-                >
-                    <Translation id="TR_START" />
-                </StyledButton>
-            ) : (
-                <StyledButton onClick={() => onCancel()}>
-                    <Translation id="TR_CLOSE" />
-                </StyledButton>
-            )}
-        </>
-    );
-
     const getStep = () => {
         const isShamirBackupAvailable =
             device?.features?.capabilities?.includes('Capability_Shamir');
 
-        // Shamir backup uses 20 and 33 word shares
-        const seedBackupLengthMessage = isShamirBackupAvailable
-            ? 'TR_SEED_BACKUP_LENGTH_INCLUDING_SHAMIR'
-            : 'TR_SEED_BACKUP_LENGTH';
-
         switch (recovery.status) {
-            case 'initial':
+            case 'initial': {
+                const descriptionSuffix = isDeviceWithButtons(deviceModelInternal)
+                    ? getNarrowedDeviceModelInternal(deviceModelInternal)
+                    : 'TOUCHSCREEN';
+
                 return (
                     <>
-                        <LeftAlignedP typographyStyle="hint">
-                            <Translation id={seedBackupLengthMessage} />
-                        </LeftAlignedP>
-
-                        <StepsContainer>
-                            <InstructionStep
-                                number="1"
-                                title={
+                        <List isOrdered gap={spacings.xxl}>
+                            <List.Item>
+                                <Paragraph typographyStyle="hint">
                                     <Translation
-                                        id={`TR_CHECK_RECOVERY_SEED_DESC_${deviceModelInternal === DeviceModelInternal.T3B1 ? 'T2B1' : deviceModelInternal}`}
+                                        id={`TR_CHECK_RECOVERY_SEED_DESC_${descriptionSuffix}`}
                                     />
-                                }
-                            >
-                                <Translation
-                                    id={
-                                        isShamirBackupAvailable
-                                            ? 'TR_SEED_BACKUP_LENGTH_INCLUDING_SHAMIR'
-                                            : 'TR_SEED_BACKUP_LENGTH'
-                                    }
-                                />
-                            </InstructionStep>
-
-                            <InstructionStep
-                                number="2"
-                                title={<Translation id="TR_ENTER_ALL_WORDS_IN_CORRECT" />}
-                            >
-                                <Translation
-                                    id={pickByDeviceModel(deviceModelInternal, {
-                                        default: 'TR_SEED_WORDS_ENTER_TOUCHSCREEN',
-                                        [DeviceModelInternal.T1B1]: 'TR_SEED_WORDS_ENTER_COMPUTER',
-                                        [DeviceModelInternal.T2B1]: 'TR_SEED_WORDS_ENTER_BUTTONS',
-                                        [DeviceModelInternal.T3B1]: 'TR_SEED_WORDS_ENTER_BUTTONS',
-                                    })}
-                                />
-                            </InstructionStep>
-                        </StepsContainer>
-
-                        <CheckItem
-                            data-testid="@recovery/user-understands-checkbox"
-                            title={<Translation id="TR_DRY_RUN_CHECK_ITEM_TITLE" />}
-                            description={<Translation id="TR_DRY_RUN_CHECK_ITEM_DESCRIPTION" />}
-                            isChecked={understood}
-                            link={learnMoreUrl && <LearnMoreButton url={learnMoreUrl} />}
-                            onClick={() => setUnderstood(!understood)}
-                        />
+                                </Paragraph>
+                                <Paragraph
+                                    typographyStyle="label"
+                                    variant="tertiary"
+                                    margin={{ top: spacings.xxs }}
+                                >
+                                    <Translation
+                                        id={
+                                            isShamirBackupAvailable
+                                                ? 'TR_SEED_BACKUP_LENGTH_INCLUDING_SHAMIR'
+                                                : 'TR_SEED_BACKUP_LENGTH'
+                                        }
+                                    />
+                                </Paragraph>
+                            </List.Item>
+                            <List.Item>
+                                <Paragraph typographyStyle="hint">
+                                    <Translation id="TR_ENTER_ALL_WORDS_IN_CORRECT" />
+                                </Paragraph>
+                                <Paragraph
+                                    typographyStyle="label"
+                                    variant="tertiary"
+                                    margin={{ top: spacings.xxs }}
+                                >
+                                    <Translation
+                                        id={pickByDeviceModel(deviceModelInternal, {
+                                            default: 'TR_SEED_WORDS_ENTER_TOUCHSCREEN',
+                                            [DeviceModelInternal.T1B1]:
+                                                'TR_SEED_WORDS_ENTER_COMPUTER',
+                                            [DeviceModelInternal.T2B1]:
+                                                'TR_SEED_WORDS_ENTER_BUTTONS',
+                                            [DeviceModelInternal.T3B1]:
+                                                'TR_SEED_WORDS_ENTER_BUTTONS',
+                                        })}
+                                    />
+                                </Paragraph>
+                            </List.Item>
+                        </List>
+                        <Card margin={{ top: spacings.xxl }}>
+                            <CheckItem
+                                data-testid="@recovery/user-understands-checkbox"
+                                title={<Translation id="TR_DRY_RUN_CHECK_ITEM_TITLE" />}
+                                description={<Translation id="TR_DRY_RUN_CHECK_ITEM_DESCRIPTION" />}
+                                isChecked={understood}
+                                link={learnMoreUrl && <LearnMoreButton url={learnMoreUrl} />}
+                                onClick={() => setUnderstood(!understood)}
+                            />
+                        </Card>
                     </>
                 );
+            }
             case 'select-word-count':
                 return (
                     <>
-                        <StatusTitle>
+                        <H3 margin={{ bottom: spacings.md }}>
                             <Translation id="TR_SELECT_NUMBER_OF_WORDS" />
-                        </StatusTitle>
+                        </H3>
                         <SelectWordCount onSelect={onSetWordsCount} />
                     </>
                 );
             case 'select-recovery-type':
                 return (
                     <>
-                        <StatusTitle>
+                        <H3 margin={{ bottom: spacings.md }}>
                             <Translation id="TR_CHOOSE_RECOVERY_TYPE" />
-                        </StatusTitle>
+                        </H3>
                         <SelectRecoveryType onSelect={onSetRecoveryType} />
                     </>
                 );
             case 'in-progress':
             case 'waiting-for-confirmation':
-                return modal.context !== '@modal/context-none' ? (
-                    <>
-                        {device.features.capabilities.includes('Capability_PassphraseEntry') && (
-                            <LeftAlignedP typographyStyle="hint">
-                                <Translation id="TR_ENTER_SEED_WORDS_ON_DEVICE" />
-                            </LeftAlignedP>
-                        )}
-                        <ReduxModal {...modal} />
-                    </>
+                if (modal.context !== MODAL.CONTEXT_DEVICE) {
+                    return <Loading />;
+                }
+
+                return device.features.capabilities.includes('Capability_PassphraseEntry') ? (
+                    <EnterOnDeviceStep />
                 ) : (
-                    <Loading />
+                    <T1B1InputStep />
                 );
+
             case 'finished':
-                return !recovery.error ? (
-                    <VerticalCenter>
-                        <StatusImage image="UNI_SUCCESS" />
+                return !hasError ? (
+                    <>
                         <H2 data-testid="@recovery/success-title">
                             <Translation id="TR_SEED_CHECK_SUCCESS_TITLE" />
                         </H2>
-                        <StyledP typographyStyle="hint">
+                        <Paragraph
+                            typographyStyle="hint"
+                            variant="tertiary"
+                            margin={{ top: spacings.xs }}
+                        >
                             <Translation id="TR_SEED_CHECK_SUCCESS_DESC" />
-                        </StyledP>
-                    </VerticalCenter>
+                        </Paragraph>
+                    </>
                 ) : (
-                    <VerticalCenter>
-                        <StatusImage image="UNI_ERROR" />
+                    <>
                         <H2>
                             <Translation id="TR_SEED_CHECK_FAIL_TITLE" />
                         </H2>
-                        <StyledP typographyStyle="hint">
+                        <Paragraph
+                            typographyStyle="hint"
+                            variant="tertiary"
+                            margin={{ top: spacings.xs }}
+                        >
                             <Translation
                                 id="TR_RECOVERY_ERROR"
                                 values={{ error: recovery.error }}
                             />
-                        </StyledP>
-                    </VerticalCenter>
+                        </Paragraph>
+                    </>
                 );
-            // no default
         }
     };
 
     return (
-        <StyledModal
+        <NewModal
             heading={<Translation id="TR_CHECK_RECOVERY_SEED" />}
-            totalProgressBarSteps={statesInProgressBar.length}
-            currentProgressBarStep={statesInProgressBar.findIndex(s => s === recovery.status) + 1}
-            bottomBarComponents={actionButtons}
-            isCancelable
+            description={
+                <Translation
+                    id="TR_STEP_OF_TOTAL"
+                    values={{
+                        index: statesInProgressBar.indexOf(recovery.status) + 1,
+                        total: statesInProgressBar.length,
+                    }}
+                />
+            }
+            bottomContent={
+                <>
+                    {recovery.status === 'initial' && (
+                        <NewModal.Button
+                            onClick={() =>
+                                deviceModelInternal === DeviceModelInternal.T1B1
+                                    ? dispatch(setStatus('select-word-count'))
+                                    : dispatch(checkSeed())
+                            }
+                            isDisabled={!understood || isLocked()}
+                            data-testid="@recovery/start-button"
+                        >
+                            <Translation id="TR_START" />
+                        </NewModal.Button>
+                    )}
+                    <NewModal.Button
+                        variant={hasFinished ? undefined : 'tertiary'}
+                        onClick={() => onCancel()}
+                    >
+                        <Translation id="TR_CLOSE" />
+                    </NewModal.Button>
+                </>
+            }
             onCancel={() => {
                 if (['in-progress', 'waiting-for-confirmation'].includes(recovery.status)) {
                     TrezorConnect.cancel(intl.formatMessage(messages.TR_CANCELLED));
@@ -273,8 +253,11 @@ export const Recovery = ({ onCancel }: ForegroundAppProps) => {
                     onCancel();
                 }
             }}
+            variant={hasFinished && hasError ? 'warning' : 'primary'}
+            // eslint-disable-next-line no-nested-ternary
+            iconName={hasFinished ? (hasError ? 'warning' : 'check') : undefined}
         >
             {getStep()}
-        </StyledModal>
+        </NewModal>
     );
 };
diff --git a/packages/suite/src/views/recovery/steps/EnterOnDeviceStep.tsx b/packages/suite/src/views/recovery/steps/EnterOnDeviceStep.tsx
new file mode 100644
index 00000000000..d4817bf196b
--- /dev/null
+++ b/packages/suite/src/views/recovery/steps/EnterOnDeviceStep.tsx
@@ -0,0 +1,9 @@
+import { Paragraph } from '@trezor/components';
+
+import { Translation } from 'src/components/suite';
+
+export const EnterOnDeviceStep = () => (
+    <Paragraph>
+        <Translation id="TR_ENTER_SEED_WORDS_ON_DEVICE" />
+    </Paragraph>
+);
diff --git a/packages/suite/src/views/recovery/steps/T1B1InputStep.tsx b/packages/suite/src/views/recovery/steps/T1B1InputStep.tsx
new file mode 100644
index 00000000000..88610bf6cdb
--- /dev/null
+++ b/packages/suite/src/views/recovery/steps/T1B1InputStep.tsx
@@ -0,0 +1,54 @@
+import { Paragraph } from '@trezor/components';
+import { HELP_CENTER_ADVANCED_RECOVERY_URL } from '@trezor/urls';
+
+import { Translation, TrezorLink, WordInput, WordInputAdvanced } from 'src/components/suite';
+import { useSelector } from 'src/hooks/suite';
+import { MODAL } from 'src/actions/suite/constants';
+
+const RequestConfirmationStep = () => (
+    <Paragraph>
+        <Translation id="TR_CONFIRM_ACTION_ON_YOUR" />
+    </Paragraph>
+);
+
+type WordAdvancedStepProps = { count: 6 | 9 };
+
+const WordAdvancedStep = ({ count }: WordAdvancedStepProps) => (
+    <>
+        <WordInputAdvanced count={count} />
+        <Paragraph typographyStyle="label">
+            <Translation id="TR_ADVANCED_RECOVERY_NOT_SURE" />{' '}
+            <TrezorLink type="label" href={HELP_CENTER_ADVANCED_RECOVERY_URL}>
+                <Translation id="TR_LEARN_MORE" />
+            </TrezorLink>
+        </Paragraph>
+    </>
+);
+
+const WordStep = () => (
+    <>
+        <Translation id="TR_ENTER_SEED_WORDS_INSTRUCTION" />{' '}
+        <Translation id="TR_RANDOM_SEED_WORDS_DISCLAIMER" />
+        <WordInput />
+    </>
+);
+
+export const T1B1InputStep = () => {
+    const modal = useSelector(state => state.modal);
+
+    if (modal.context !== MODAL.CONTEXT_DEVICE) return null;
+
+    switch (modal.windowType) {
+        case 'ButtonRequest_Other':
+            return <RequestConfirmationStep />;
+        case 'WordRequestType_Plain':
+            return <WordStep />;
+        case 'WordRequestType_Matrix6':
+            return <WordAdvancedStep count={6} />;
+        case 'WordRequestType_Matrix9':
+            return <WordAdvancedStep count={9} />;
+        // to satisfy TS, should not happen
+        default:
+            return null;
+    }
+};
diff --git a/packages/suite/src/views/settings/SettingsCoins/FirmwareTypeSuggestion.tsx b/packages/suite/src/views/settings/SettingsCoins/FirmwareTypeSuggestion.tsx
index b00971b1e9d..574850e75ab 100644
--- a/packages/suite/src/views/settings/SettingsCoins/FirmwareTypeSuggestion.tsx
+++ b/packages/suite/src/views/settings/SettingsCoins/FirmwareTypeSuggestion.tsx
@@ -1,13 +1,14 @@
 import styled from 'styled-components';
 
+import { Button, Banner } from '@trezor/components';
+import { hasBitcoinOnlyFirmware } from '@trezor/device-utils';
+import { typography } from '@trezor/theme';
+
 import { setFlag } from 'src/actions/suite/suiteActions';
 import { goto } from 'src/actions/suite/routerActions';
 import { Translation } from 'src/components/suite';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
 import { useDevice, useDispatch } from 'src/hooks/suite';
-import { Button, Banner } from '@trezor/components';
-import { hasBitcoinOnlyFirmware } from '@trezor/device-utils';
-import { typography } from '@trezor/theme';
 
 const InlineButtonWrapper = styled.div`
     display: inline-block;
diff --git a/packages/suite/src/views/settings/SettingsCoins/SettingsCoins.tsx b/packages/suite/src/views/settings/SettingsCoins/SettingsCoins.tsx
index be8361cf8f4..f26665f7a10 100644
--- a/packages/suite/src/views/settings/SettingsCoins/SettingsCoins.tsx
+++ b/packages/suite/src/views/settings/SettingsCoins/SettingsCoins.tsx
@@ -1,14 +1,16 @@
 import styled from 'styled-components';
 import { AnimatePresence, MotionProps, motion } from 'framer-motion';
-import { hasBitcoinOnlyFirmware, isBitcoinOnlyDevice } from '@trezor/device-utils';
+
 import {
-    selectDeviceSupportedNetworks,
     startDiscoveryThunk,
     selectDeviceModel,
+    selectDeviceSupportedNetworks,
 } from '@suite-common/wallet-core';
 import { Button, motionEasing, Tooltip } from '@trezor/components';
 import { DeviceModelInternal } from '@trezor/connect';
-import { Network } from '@suite-common/wallet-config';
+import { BITCOIN_ONLY_NETWORKS } from '@suite-common/suite-constants';
+import { hasBitcoinOnlyFirmware, isBitcoinOnlyDevice } from '@trezor/device-utils';
+import { spacingsPx } from '@trezor/theme';
 
 import {
     DeviceBanner,
@@ -17,7 +19,7 @@ import {
     SettingsSectionItem,
 } from 'src/components/settings';
 import { CoinGroup, TooltipSymbol, Translation } from 'src/components/suite';
-import { useEnabledNetworks } from 'src/hooks/settings/useEnabledNetworks';
+import { useNetworkSupport } from 'src/hooks/settings/useNetworkSupport';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
 import {
     useDevice,
@@ -26,9 +28,9 @@ import {
     useSelector,
     useDiscovery,
 } from 'src/hooks/suite';
+import { selectEnabledNetworks } from 'src/reducers/wallet/settingsReducer';
 
 import { FirmwareTypeSuggestion } from './FirmwareTypeSuggestion';
-import { spacingsPx } from '@trezor/theme';
 import { selectSuiteFlags } from '../../../reducers/suite/suiteReducer';
 
 const DiscoveryButtonWrapper = styled.div`
@@ -88,8 +90,9 @@ const getDiscoveryButtonAnimationConfig = (isConfirmed: boolean): MotionProps =>
 
 export const SettingsCoins = () => {
     const { firmwareTypeBannerClosed } = useSelector(selectSuiteFlags);
+    const enabledNetworks = useSelector(selectEnabledNetworks);
     const isDiscoveryButtonVisible = useRediscoveryNeeded();
-    const { mainnets, testnets, enabledNetworks, setEnabled } = useEnabledNetworks();
+    const { supportedMainnets, unsupportedMainnets, supportedTestnets } = useNetworkSupport();
     const deviceSupportedNetworkSymbols = useSelector(selectDeviceSupportedNetworks);
     const deviceModel = useSelector(selectDeviceModel);
     const { device, isLocked } = useDevice();
@@ -101,21 +104,12 @@ export const SettingsCoins = () => {
         deviceSupportedNetworkSymbols.includes(enabledNetwork),
     );
 
-    const getNetworks = (networks: Network[], getUnsupported = false) =>
-        networks.filter(
-            ({ symbol }) => getUnsupported !== deviceSupportedNetworkSymbols.includes(symbol),
-        );
-
-    const supportedNetworks = getNetworks(mainnets);
-    const unsupportedNetworks = getNetworks(mainnets, true);
-    const supportedTestnetNetworks = getNetworks(testnets);
-
     const bitcoinOnlyFirmware = hasBitcoinOnlyFirmware(device);
-    const bitcoinNetworks = ['btc', 'test', 'regtest'];
+    const bitcoinOnlyNetworks = BITCOIN_ONLY_NETWORKS;
 
     const onlyBitcoinNetworksEnabled =
         !!supportedEnabledNetworks.length &&
-        supportedEnabledNetworks.every(coin => bitcoinNetworks.includes(coin));
+        supportedEnabledNetworks.every(network => bitcoinOnlyNetworks.includes(network));
     const bitcoinOnlyDevice = isBitcoinOnlyDevice(device);
 
     const showDeviceBanner = device?.connected === false; // device is remembered and disconnected
@@ -146,11 +140,7 @@ export const SettingsCoins = () => {
 
             <StyledSettingsSection title={<Translation id="TR_COINS" />} icon="coin">
                 <StyledSectionItem anchorId={SettingsAnchor.Crypto}>
-                    <CoinGroup
-                        networks={supportedNetworks}
-                        onToggle={setEnabled}
-                        enabledNetworks={enabledNetworks}
-                    />
+                    <CoinGroup networks={supportedMainnets} enabledNetworks={enabledNetworks} />
                 </StyledSectionItem>
             </StyledSettingsSection>
 
@@ -166,11 +156,7 @@ export const SettingsCoins = () => {
                 icon="coin"
             >
                 <SettingsSectionItem anchorId={SettingsAnchor.TestnetCrypto}>
-                    <CoinGroup
-                        networks={supportedTestnetNetworks}
-                        onToggle={setEnabled}
-                        enabledNetworks={enabledNetworks}
-                    />
+                    <CoinGroup networks={supportedTestnets} enabledNetworks={enabledNetworks} />
                 </SettingsSectionItem>
             </SettingsSection>
 
@@ -188,8 +174,7 @@ export const SettingsCoins = () => {
                 >
                     <SettingsSectionItem anchorId={SettingsAnchor.UnsupportedCrypto}>
                         <CoinGroup
-                            networks={unsupportedNetworks}
-                            onToggle={setEnabled}
+                            networks={unsupportedMainnets}
                             enabledNetworks={enabledNetworks}
                         />
                     </SettingsSectionItem>
diff --git a/packages/suite/src/views/settings/SettingsDebug/Backends.tsx b/packages/suite/src/views/settings/SettingsDebug/Backends.tsx
index df85d520733..3d85c43e718 100644
--- a/packages/suite/src/views/settings/SettingsDebug/Backends.tsx
+++ b/packages/suite/src/views/settings/SettingsDebug/Backends.tsx
@@ -1,18 +1,17 @@
 import styled from 'styled-components';
 
-import { typography } from '@trezor/theme';
-import { Button } from '@trezor/components';
-import { networks } from '@suite-common/wallet-config';
+import { networks, NetworkSymbol } from '@suite-common/wallet-config';
+import { selectNetworkBlockchainInfo } from '@suite-common/wallet-core';
 import { ConnectionStatus } from '@suite-common/wallet-types';
+import { Button } from '@trezor/components';
+import { CoinLogo } from '@trezor/product-components';
+import { typography } from '@trezor/theme';
 
 import { SectionItem, StatusLight, Translation } from 'src/components/suite';
-import { useEnabledNetworks } from 'src/hooks/settings/useEnabledNetworks';
 import { useDispatch, useSelector } from 'src/hooks/suite';
-import { NetworkSymbol } from '@suite-common/wallet-config';
-import { selectNetworkBlockchainInfo } from '@suite-common/wallet-core';
 import { useBackendReconnection } from 'src/hooks/settings/backends';
 import { openModal } from 'src/actions/suite/modalActions';
-import { CoinLogo } from '@trezor/product-components';
+import { selectEnabledNetworks } from 'src/reducers/wallet/settingsReducer';
 
 const CoinSection = styled.div`
     display: flex;
@@ -111,8 +110,8 @@ const BackendItem = ({
 };
 
 const CoinItem = ({ symbol }: { symbol: NetworkSymbol }) => {
-    const { url, error, connected, reconnectionTime, identityConnections } = useSelector(
-        selectNetworkBlockchainInfo(symbol),
+    const { url, error, connected, reconnectionTime, identityConnections } = useSelector(state =>
+        selectNetworkBlockchainInfo(state, symbol),
     );
 
     const dispatch = useDispatch();
@@ -162,7 +161,7 @@ const CoinItem = ({ symbol }: { symbol: NetworkSymbol }) => {
 };
 
 export const Backends = () => {
-    const { enabledNetworks } = useEnabledNetworks();
+    const enabledNetworks = useSelector(selectEnabledNetworks);
 
     return enabledNetworks.map(symbol => <CoinItem key={symbol} symbol={symbol} />);
 };
diff --git a/packages/suite/src/views/settings/SettingsDebug/CheckFirmwareAuthenticity.tsx b/packages/suite/src/views/settings/SettingsDebug/CheckFirmwareAuthenticity.tsx
index dec26255dd8..fbfef61573f 100644
--- a/packages/suite/src/views/settings/SettingsDebug/CheckFirmwareAuthenticity.tsx
+++ b/packages/suite/src/views/settings/SettingsDebug/CheckFirmwareAuthenticity.tsx
@@ -1,53 +1,49 @@
-import { useState } from 'react';
-
-import { Button, Switch } from '@trezor/components';
+import { Switch } from '@trezor/components';
 
 import { ActionColumn, SectionItem, TextColumn } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
-import { setDebugMode } from 'src/actions/suite/suiteActions';
-import { manualFirmwareHashCheckThunk } from '@suite-common/wallet-core';
+import { SUITE } from 'src/actions/suite/constants';
 
 export const CheckFirmwareAuthenticity = () => {
-    const [inProgress, setInProgress] = useState(false);
-
-    const debug = useSelector(state => state.suite.settings.debug);
     const dispatch = useDispatch();
+    const { isFirmwareHashCheckDisabled, isFirmwareRevisionCheckDisabled } = useSelector(
+        state => state.suite.settings,
+    );
 
-    const onChangeRegularCheck = (state?: boolean) =>
-        dispatch(setDebugMode({ checkFirmwareAuthenticity: state }));
-
-    const onCheckFirmwareAuthenticity = async () => {
-        setInProgress(true);
-        await dispatch(manualFirmwareHashCheckThunk());
-        setInProgress(false);
-    };
+    const onToggleFirmwareRevisionCheck = (newEnabledState?: boolean) =>
+        dispatch({
+            type: SUITE.DEVICE_FIRMWARE_REVISION_CHECK,
+            payload: { isDisabled: !newEnabledState },
+        });
+    const onToggleFirmwareHashCheck = (newEnabledState?: boolean) =>
+        dispatch({
+            type: SUITE.DEVICE_FIRMWARE_HASH_CHECK,
+            payload: { isDisabled: !newEnabledState },
+        });
 
     return (
         <>
-            <SectionItem data-testid="@settings/debug/check-firmware-authenticity">
+            <SectionItem>
                 <TextColumn
-                    title="Check firmware authenticity"
-                    description="Download firmware binary from data.trezor.io and compare its hash with firmware hash provided by Trezor device."
+                    title="Check firmware Hash regularly"
+                    description="Carry out firmware Hash check every time you authorize Trezor device. The toggle in Device settings controls both Hash & Revision check simultaneously."
                 />
                 <ActionColumn>
-                    <Button
-                        onClick={onCheckFirmwareAuthenticity}
-                        isLoading={inProgress}
-                        isDisabled={inProgress}
-                    >
-                        Check
-                    </Button>
+                    <Switch
+                        onChange={onToggleFirmwareHashCheck}
+                        isChecked={!isFirmwareHashCheckDisabled}
+                    />
                 </ActionColumn>
             </SectionItem>
-            <SectionItem data-testid="@settings/debug/check-firmware-authenticity-on-connect/switch">
+            <SectionItem>
                 <TextColumn
-                    title="Check firmware authenticity regularly"
-                    description="Carry out firmware authenticity check every time you authorize Trezor device"
+                    title="Check firmware Revision regularly"
+                    description="Carry out firmware Revision check every time you authorize Trezor device. The toggle in Device settings controls both Hash & Revision check simultaneously."
                 />
                 <ActionColumn>
                     <Switch
-                        onChange={onChangeRegularCheck}
-                        isChecked={!!debug.checkFirmwareAuthenticity}
+                        onChange={onToggleFirmwareRevisionCheck}
+                        isChecked={!isFirmwareRevisionCheckDisabled}
                     />
                 </ActionColumn>
             </SectionItem>
diff --git a/packages/suite/src/views/settings/SettingsDebug/DeviceAuthenticity.tsx b/packages/suite/src/views/settings/SettingsDebug/DeviceAuthenticity.tsx
index 1ce600c6e88..c4da500a03e 100644
--- a/packages/suite/src/views/settings/SettingsDebug/DeviceAuthenticity.tsx
+++ b/packages/suite/src/views/settings/SettingsDebug/DeviceAuthenticity.tsx
@@ -18,7 +18,7 @@ export const DeviceAuthenticity = () => {
                 description="Skip device authenticity check when bootloader is unlocked."
             />
             <ActionColumn>
-                <Switch onChange={handleChange} isChecked={!!debug.isUnlockedBootloaderAllowed} />
+                <Switch onChange={handleChange} isChecked={debug.isUnlockedBootloaderAllowed} />
             </ActionColumn>
         </SectionItem>
     );
diff --git a/packages/suite/src/views/settings/SettingsDebug/InvityApi.tsx b/packages/suite/src/views/settings/SettingsDebug/InvityApi.tsx
index 14c8b0c0ec7..40ebca476db 100644
--- a/packages/suite/src/views/settings/SettingsDebug/InvityApi.tsx
+++ b/packages/suite/src/views/settings/SettingsDebug/InvityApi.tsx
@@ -1,11 +1,12 @@
 import styled from 'styled-components';
 
+import type { InvityServerEnvironment } from '@suite-common/invity';
+
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionColumn, ActionSelect, TextColumn } from 'src/components/suite';
 import { setDebugMode } from 'src/actions/suite/suiteActions';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import invityAPI from 'src/services/suite/invityAPI';
-import type { InvityServerEnvironment } from '@suite-common/invity';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
 import { reloadApp } from 'src/utils/suite/reload';
 
diff --git a/packages/suite/src/views/settings/SettingsDebug/SettingsDebug.tsx b/packages/suite/src/views/settings/SettingsDebug/SettingsDebug.tsx
index 5943f96db61..a49284d7641 100644
--- a/packages/suite/src/views/settings/SettingsDebug/SettingsDebug.tsx
+++ b/packages/suite/src/views/settings/SettingsDebug/SettingsDebug.tsx
@@ -1,6 +1,8 @@
 import { isDesktop, isWeb } from '@trezor/env-utils';
 
 import { SettingsSection, SettingsLayout } from 'src/components/settings';
+import { selectSuiteFlags } from 'src/reducers/suite/suiteReducer';
+import { useSelector } from 'src/hooks/suite';
 
 import { TranslationMode } from './TranslationMode';
 import { GithubIssue } from './GithubIssue';
@@ -17,10 +19,7 @@ import { TransportBackends } from './TransportBackends';
 import { ViewOnlySettings } from './ViewOnlySettings';
 import { TriggerHighlight } from './TriggerHighlight';
 import { Backends } from './Backends';
-import { selectSuiteFlags } from 'src/reducers/suite/suiteReducer';
-import { useSelector } from 'src/hooks/suite';
 import { PreField } from './PreField';
-import { AutoStart } from './AutoStart';
 import { Tor } from './Tor';
 
 export const SettingsDebug = () => {
@@ -55,11 +54,6 @@ export const SettingsDebug = () => {
             <SettingsSection title="Testing">
                 <ThrowTestingError />
             </SettingsSection>
-            {!isWeb() && (
-                <SettingsSection title="Application">
-                    <AutoStart />
-                </SettingsSection>
-            )}
             {!isWeb() && (
                 <SettingsSection title="Transport backends">
                     <TransportBackends />
diff --git a/packages/suite/src/views/settings/SettingsDebug/Tor.tsx b/packages/suite/src/views/settings/SettingsDebug/Tor.tsx
index 6c2ceeace93..01725610875 100644
--- a/packages/suite/src/views/settings/SettingsDebug/Tor.tsx
+++ b/packages/suite/src/views/settings/SettingsDebug/Tor.tsx
@@ -1,5 +1,4 @@
 import { useDispatch } from 'src/hooks/suite';
-
 import { ActionColumn, ActionButton, SectionItem, TextColumn } from 'src/components/suite';
 import { toggleTor } from 'src/actions/suite/suiteActions';
 
diff --git a/packages/suite/src/views/settings/SettingsDebug/Transport.tsx b/packages/suite/src/views/settings/SettingsDebug/Transport.tsx
index 1cb6b53bcd5..3720ec05465 100644
--- a/packages/suite/src/views/settings/SettingsDebug/Transport.tsx
+++ b/packages/suite/src/views/settings/SettingsDebug/Transport.tsx
@@ -2,9 +2,9 @@ import { useMemo } from 'react';
 
 import { Checkbox } from '@trezor/components';
 import { isDesktop } from '@trezor/env-utils';
-import { useDispatch, useSelector } from 'src/hooks/suite';
 import { ArrayElement } from '@trezor/type-utils';
 
+import { useDispatch, useSelector } from 'src/hooks/suite';
 import { setDebugMode } from 'src/actions/suite/suiteActions';
 import { DebugModeOptions } from 'src/reducers/suite/suiteReducer';
 import { ActionColumn, SectionItem, TextColumn } from 'src/components/suite';
diff --git a/packages/suite/src/views/settings/SettingsDebug/TransportBackends.tsx b/packages/suite/src/views/settings/SettingsDebug/TransportBackends.tsx
index cd26f4ad841..cffd204e01d 100644
--- a/packages/suite/src/views/settings/SettingsDebug/TransportBackends.tsx
+++ b/packages/suite/src/views/settings/SettingsDebug/TransportBackends.tsx
@@ -1,62 +1,23 @@
-import { useEffect, useState } from 'react';
-
 import { Checkbox } from '@trezor/components';
 import { desktopApi } from '@trezor/suite-desktop-api';
+import { isDevEnv } from '@suite-common/suite-utils';
 
 import { ActionColumn, SectionItem, TextColumn } from 'src/components/suite';
-import { BridgeSettings } from '@trezor/suite-desktop-api/src/messages';
-import { isDevEnv } from '@suite-common/suite-utils';
 import { useSelector } from 'src/hooks/suite';
 
-interface Process {
-    service: boolean;
-    process: boolean;
-}
+import { useBridgeDesktopApi } from '../../../hooks/suite/useBridgeDesktopApi';
 
 // note that this variable is duplicated with suite-desktop-core
-const NEW_BRIDGE_ROLLOUT_THRESHOLD = 0;
+const NEW_BRIDGE_ROLLOUT_THRESHOLD = 0.01;
 
 export const TransportBackends = () => {
     const allowPrerelease = useSelector(state => state.desktopUpdate.allowPrerelease);
     const transport = useSelector(state => state.suite.transport);
-    const [bridgeProcess, setBridgeProcess] = useState<Process>({ service: false, process: false });
-    const [bridgeSettings, setBridgeSettings] = useState<BridgeSettings | null>(null);
-    const [error, setError] = useState<string | null>(null);
-
-    useEffect(() => {
-        desktopApi.getBridgeStatus().then(result => {
-            if (result.success) {
-                setBridgeProcess(result.payload);
-            }
-        });
-
-        desktopApi.on('bridge/status', (status: Process) => {
-            setBridgeProcess(status);
-        });
-
-        desktopApi.getBridgeSettings().then(result => {
-            if (result.success) {
-                setBridgeSettings(result.payload);
-            } else {
-                setError(result.error);
-            }
-        });
-
-        desktopApi.on('bridge/settings', (settings: BridgeSettings) => {
-            setBridgeSettings(settings);
-        });
-
-        return () => {
-            desktopApi.removeAllListeners('bridge/status');
-            desktopApi.removeAllListeners('bridge/settings');
-        };
-    }, []);
 
-    const changeBridgeSettings = (settings: BridgeSettings) => {
-        desktopApi.changeBridgeSettings(settings);
-    };
+    const { bridgeProcess, bridgeSettings, changeBridgeSettings, bridgeDesktopApiError } =
+        useBridgeDesktopApi();
 
-    if (error) return error;
+    if (bridgeDesktopApiError) return bridgeDesktopApiError;
 
     if (!bridgeSettings) return null;
 
@@ -124,7 +85,7 @@ export const TransportBackends = () => {
                         title="New bridge rollout"
                         description={
                             allowPrerelease
-                                ? 'New bridge is rolled out to all Trezor Suite instances that are in the Early access program.'
+                                ? 'New bridge is rolled out to all Trezor Suite instances that are in the Early access program and to a few users apart EAP.'
                                 : `New bridge is rolled out to ${NEW_BRIDGE_ROLLOUT_THRESHOLD * 100} % of Trezor Suite instances outside of Early access. Your rollout score is ${((bridgeSettings.newBridgeRollout ?? 0) * 100).toFixed()}%`
                         }
                     />
diff --git a/packages/suite/src/views/settings/SettingsDebug/TriggerHighlight.tsx b/packages/suite/src/views/settings/SettingsDebug/TriggerHighlight.tsx
index 22155f6aa06..f2428f71ff3 100644
--- a/packages/suite/src/views/settings/SettingsDebug/TriggerHighlight.tsx
+++ b/packages/suite/src/views/settings/SettingsDebug/TriggerHighlight.tsx
@@ -1,4 +1,5 @@
 import { ActionButton, ActionColumn, SectionItem, TextColumn } from 'src/components/suite';
+
 import { goto } from '../../../actions/suite/routerActions';
 import { SettingsAnchor } from '../../../constants/suite/anchors';
 import { useDispatch } from '../../../hooks/suite';
diff --git a/packages/suite/src/views/settings/SettingsDebug/ViewOnlySettings.tsx b/packages/suite/src/views/settings/SettingsDebug/ViewOnlySettings.tsx
index fab86c2011e..c2ef2153943 100644
--- a/packages/suite/src/views/settings/SettingsDebug/ViewOnlySettings.tsx
+++ b/packages/suite/src/views/settings/SettingsDebug/ViewOnlySettings.tsx
@@ -1,6 +1,6 @@
 import { Checkbox } from '@trezor/components';
-import { useDispatch, useSelector } from 'src/hooks/suite';
 
+import { useDispatch, useSelector } from 'src/hooks/suite';
 import { setFlag } from 'src/actions/suite/suiteActions';
 import { ActionColumn, SectionItem, TextColumn } from 'src/components/suite';
 import { selectSuiteFlags } from 'src/reducers/suite/suiteReducer';
diff --git a/packages/suite/src/views/settings/SettingsDebug/WipeData.tsx b/packages/suite/src/views/settings/SettingsDebug/WipeData.tsx
index aa004cef809..3e6ad4c0a3f 100644
--- a/packages/suite/src/views/settings/SettingsDebug/WipeData.tsx
+++ b/packages/suite/src/views/settings/SettingsDebug/WipeData.tsx
@@ -1,10 +1,11 @@
 import styled from 'styled-components';
+
 import { desktopApi } from '@trezor/suite-desktop-api';
+import { notificationsActions } from '@suite-common/toast-notifications';
 
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionButton, ActionColumn, TextColumn } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
-import { notificationsActions } from '@suite-common/toast-notifications';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
 
 const UserDataLink = styled.span`
diff --git a/packages/suite/src/views/settings/SettingsDevice/AutoLock.tsx b/packages/suite/src/views/settings/SettingsDevice/AutoLock.tsx
index 0dfc5611522..7f4267f3e08 100644
--- a/packages/suite/src/views/settings/SettingsDevice/AutoLock.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/AutoLock.tsx
@@ -1,10 +1,10 @@
 import { analytics, EventType } from '@trezor/suite-analytics';
+import { formatDurationStrict } from '@suite-common/suite-utils';
 
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionColumn, ActionSelect, TextColumn, Translation } from 'src/components/suite';
 import { useDevice, useDispatch, useLocales } from 'src/hooks/suite';
 import { applySettings } from 'src/actions/settings/deviceSettingsActions';
-import { formatDurationStrict } from '@suite-common/suite-utils';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
 
 // auto lock times in seconds; allowed lock times by device: <1 minute, 6 days>
diff --git a/packages/suite/src/views/settings/SettingsDevice/Brightness.tsx b/packages/suite/src/views/settings/SettingsDevice/Brightness.tsx
index a143ffc9af9..8753d672576 100644
--- a/packages/suite/src/views/settings/SettingsDevice/Brightness.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/Brightness.tsx
@@ -1,7 +1,14 @@
 import TrezorConnect from '@trezor/connect';
 import { analytics, EventType } from '@trezor/suite-analytics';
-import { SectionItem } from 'src/components/suite';
-import { ActionButton, ActionColumn, TextColumn, Translation } from 'src/components/suite';
+
+import {
+    SectionItem,
+    ActionButton,
+    ActionColumn,
+    TextColumn,
+    Translation,
+} from 'src/components/suite';
+
 import { useDevice } from '../../../hooks/suite';
 
 interface DeviceLabelProps {
diff --git a/packages/suite/src/views/settings/SettingsDevice/ChangeLanguage.tsx b/packages/suite/src/views/settings/SettingsDevice/ChangeLanguage.tsx
index 6267a7c1884..0a5dd471550 100644
--- a/packages/suite/src/views/settings/SettingsDevice/ChangeLanguage.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/ChangeLanguage.tsx
@@ -1,5 +1,6 @@
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionColumn, ActionSelect, TextColumn, Translation } from 'src/components/suite';
+
 import { SettingsAnchor } from '../../../constants/suite/anchors';
 import { useDevice, useDispatch } from '../../../hooks/suite';
 import { changeLanguage } from '../../../actions/settings/deviceSettingsActions';
diff --git a/packages/suite/src/views/settings/SettingsDevice/DefaultWalletLoading.tsx b/packages/suite/src/views/settings/SettingsDevice/DefaultWalletLoading.tsx
index e3bcbb160e6..607b64bf4a4 100644
--- a/packages/suite/src/views/settings/SettingsDevice/DefaultWalletLoading.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/DefaultWalletLoading.tsx
@@ -1,6 +1,7 @@
 import { WalletType as DefaultWalletLoadingOptions } from '@suite-common/wallet-types';
 import { SelectBar } from '@trezor/components';
 import { EventType, analytics } from '@trezor/suite-analytics';
+import { deviceActions, selectDevice } from '@suite-common/wallet-core';
 
 import { Translation } from 'src/components/suite/Translation';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
@@ -8,7 +9,6 @@ import { useDispatch, useSelector } from 'src/hooks/suite';
 import { setDefaultWalletLoading } from 'src/actions/suite/suiteActions';
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionColumn, TextColumn } from 'src/components/suite';
-import { deviceActions, selectDevice } from '@suite-common/wallet-core';
 
 const options = [
     {
diff --git a/packages/suite/src/views/settings/SettingsDevice/DisplayRotation.tsx b/packages/suite/src/views/settings/SettingsDevice/DisplayRotation.tsx
index 6fc556602af..0b4987c749b 100644
--- a/packages/suite/src/views/settings/SettingsDevice/DisplayRotation.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/DisplayRotation.tsx
@@ -1,9 +1,9 @@
 import { DeviceModelInternal } from '@trezor/connect';
 import { analytics, EventType } from '@trezor/suite-analytics';
+import { Icon, SelectBar, Tooltip } from '@trezor/components';
 
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionColumn, TextColumn, Translation } from 'src/components/suite';
-import { Icon, SelectBar, Tooltip } from '@trezor/components';
 import { useDevice, useDispatch } from 'src/hooks/suite';
 import { applySettings } from 'src/actions/settings/deviceSettingsActions';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
diff --git a/packages/suite/src/views/settings/SettingsDevice/FirmwareRevisionCheck.tsx b/packages/suite/src/views/settings/SettingsDevice/FirmwareRevisionCheck.tsx
index 3262ebbedf8..162aadc0cbb 100644
--- a/packages/suite/src/views/settings/SettingsDevice/FirmwareRevisionCheck.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/FirmwareRevisionCheck.tsx
@@ -1,3 +1,5 @@
+import { HELP_CENTER_FIRMWARE_REVISION_CHECK } from '@trezor/urls';
+
 import {
     ActionButton,
     ActionColumn,
@@ -7,18 +9,22 @@ import {
 } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { openModal } from 'src/actions/suite/modalActions';
-import { checkFirmwareRevision } from 'src/actions/suite/suiteActions';
-import { HELP_CENTER_FIRMWARE_REVISION_CHECK } from '@trezor/urls';
+import { toggleCheckFirmwareAuthenticity } from 'src/actions/suite/suiteActions';
+
 export const FirmwareRevisionCheck = () => {
     const dispatch = useDispatch();
-    const isFirmwareRevisionCheckDisabled = useSelector(
-        state => state.suite.settings.isFirmwareRevisionCheckDisabled,
+    const isFirmwareAuthenticityCheckDisabled = useSelector(
+        state =>
+            // users can granularly turn off the partial checks in debug settings
+            // in that case, the toggle shall be considered off, inviting the user to turn it on.
+            state.suite.settings.isFirmwareRevisionCheckDisabled ||
+            state.suite.settings.isFirmwareHashCheckDisabled,
     );
 
     const handleClick = () =>
         dispatch(
-            isFirmwareRevisionCheckDisabled
-                ? checkFirmwareRevision({ isDisabled: false })
+            isFirmwareAuthenticityCheckDisabled
+                ? toggleCheckFirmwareAuthenticity({ isDisabled: false })
                 : openModal({ type: 'firmware-revision-opt-out' }),
         );
 
@@ -28,7 +34,7 @@ export const FirmwareRevisionCheck = () => {
                 title={
                     <Translation
                         id={
-                            isFirmwareRevisionCheckDisabled
+                            isFirmwareAuthenticityCheckDisabled
                                 ? 'TR_DEVICE_FIRMWARE_REVISION_CHECK_TITLE_DISABLED'
                                 : 'TR_DEVICE_FIRMWARE_REVISION_CHECK_TITLE'
                         }
@@ -37,7 +43,7 @@ export const FirmwareRevisionCheck = () => {
                 description={
                     <Translation
                         id={
-                            isFirmwareRevisionCheckDisabled
+                            isFirmwareAuthenticityCheckDisabled
                                 ? 'TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION_DISABLED'
                                 : 'TR_DEVICE_FIRMWARE_REVISION_CHECK_DESCRIPTION'
                         }
@@ -48,12 +54,12 @@ export const FirmwareRevisionCheck = () => {
             <ActionColumn>
                 <ActionButton
                     onClick={handleClick}
-                    variant={isFirmwareRevisionCheckDisabled ? 'primary' : 'destructive'}
+                    variant={isFirmwareAuthenticityCheckDisabled ? 'primary' : 'destructive'}
                     data-testid="@settings/device/open-firmware-revision-check-modal-button"
                 >
                     <Translation
                         id={
-                            isFirmwareRevisionCheckDisabled
+                            isFirmwareAuthenticityCheckDisabled
                                 ? 'TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON_DISABLED'
                                 : 'TR_DEVICE_FIRMWARE_REVISION_CHECK_BUTTON'
                         }
diff --git a/packages/suite/src/views/settings/SettingsDevice/FirmwareTypeChange.tsx b/packages/suite/src/views/settings/SettingsDevice/FirmwareTypeChange.tsx
index 62c81afc0a0..ec218a1cc4e 100644
--- a/packages/suite/src/views/settings/SettingsDevice/FirmwareTypeChange.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/FirmwareTypeChange.tsx
@@ -1,5 +1,13 @@
 import styled from 'styled-components';
 
+import { Button } from '@trezor/components';
+import {
+    getFirmwareVersion,
+    hasBitcoinOnlyFirmware,
+    isBitcoinOnlyDevice,
+} from '@trezor/device-utils';
+import { HELP_FIRMWARE_TYPE } from '@trezor/urls';
+
 import { SettingsSectionItem } from 'src/components/settings';
 import {
     ActionButton,
@@ -10,14 +18,7 @@ import {
 } from 'src/components/suite';
 import { useDevice, useDispatch } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
-import { Button } from '@trezor/components';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
-import {
-    getFirmwareVersion,
-    hasBitcoinOnlyFirmware,
-    isBitcoinOnlyDevice,
-} from '@trezor/device-utils';
-import { HELP_FIRMWARE_TYPE } from '@trezor/urls';
 import { getSuiteFirmwareTypeString } from 'src/utils/firmware';
 
 const Version = styled.div`
diff --git a/packages/suite/src/views/settings/SettingsDevice/HapticFeedback.tsx b/packages/suite/src/views/settings/SettingsDevice/HapticFeedback.tsx
index fd68f37713d..872d6067ec3 100644
--- a/packages/suite/src/views/settings/SettingsDevice/HapticFeedback.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/HapticFeedback.tsx
@@ -1,10 +1,12 @@
 import { Switch } from '@trezor/components';
+import { analytics, EventType } from '@trezor/suite-analytics';
+
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionColumn, TextColumn, Translation } from 'src/components/suite';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
-import { useDevice, useDispatch } from '../../../hooks/suite';
 import { applySettings } from 'src/actions/settings/deviceSettingsActions';
-import { analytics, EventType } from '@trezor/suite-analytics';
+
+import { useDevice, useDispatch } from '../../../hooks/suite';
 
 interface DeviceLabelProps {
     isDeviceLocked: boolean;
diff --git a/packages/suite/src/views/settings/SettingsDevice/Homescreen.tsx b/packages/suite/src/views/settings/SettingsDevice/Homescreen.tsx
index 139e12bc3f4..2a7ff58efbb 100644
--- a/packages/suite/src/views/settings/SettingsDevice/Homescreen.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/Homescreen.tsx
@@ -1,8 +1,10 @@
 import { useRef, useState } from 'react';
+
 import styled from 'styled-components';
 
 import { DeviceModelInternal } from '@trezor/connect';
 import { HOMESCREEN_EDITOR_URL } from '@trezor/urls';
+import { Button, ButtonGroup, Tooltip, variables } from '@trezor/components';
 
 import { SettingsSectionItem } from 'src/components/settings';
 import {
@@ -13,7 +15,6 @@ import {
     Translation,
 } from 'src/components/suite';
 import { HAS_MONOCHROME_SCREEN } from 'src/constants/suite/device';
-import { Button, ButtonGroup, Tooltip, variables } from '@trezor/components';
 import { useDevice, useDispatch } from 'src/hooks/suite';
 import { openModal } from 'src/actions/suite/modalActions';
 import { applySettings } from 'src/actions/settings/deviceSettingsActions';
@@ -107,9 +108,11 @@ export const Homescreen = ({ isDeviceLocked }: HomescreenProps) => {
                     />
                 )}
 
-                {[DeviceModelInternal.T2T1, DeviceModelInternal.T3T1].includes(
-                    deviceModelInternal,
-                ) && (
+                {[
+                    DeviceModelInternal.T2T1,
+                    DeviceModelInternal.T3T1,
+                    DeviceModelInternal.T3W1, // TODO T3W1
+                ].includes(deviceModelInternal) && (
                     <TextColumn
                         title={<Translation id="TR_DEVICE_SETTINGS_HOMESCREEN_TITLE" />}
                         description={
@@ -142,7 +145,7 @@ export const Homescreen = ({ isDeviceLocked }: HomescreenProps) => {
                                 data-testid="@settings/device/homescreen-upload"
                                 key="@settings/device/homescreen-upload"
                             >
-                                <Translation id="TR_DEVICE_SETTINGS_HOMESCREEN_UPLOAD_IMAGE" />s
+                                <Translation id="TR_DEVICE_SETTINGS_HOMESCREEN_UPLOAD_IMAGE" />
                             </Button>
                             <Button
                                 onClick={openGallery}
diff --git a/packages/suite/src/views/settings/SettingsDevice/MultiShareBackup.tsx b/packages/suite/src/views/settings/SettingsDevice/MultiShareBackup.tsx
index 5724cafce8e..d0a77ea84da 100644
--- a/packages/suite/src/views/settings/SettingsDevice/MultiShareBackup.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/MultiShareBackup.tsx
@@ -1,4 +1,8 @@
 import { HELP_CENTER_MULTI_SHARE_BACKUP_URL } from '@trezor/urls';
+import { selectDevice } from '@suite-common/wallet-core';
+import { TrezorDevice } from '@suite-common/suite-types';
+import { EventType, analytics } from '@trezor/suite-analytics';
+
 import {
     ActionButton,
     ActionColumn,
@@ -7,10 +11,8 @@ import {
     Translation,
 } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
-import { selectDevice } from '@suite-common/wallet-core';
-import { TrezorDevice } from '@suite-common/suite-types';
+
 import { goto } from '../../../actions/suite/routerActions';
-import { EventType, analytics } from '@trezor/suite-analytics';
 
 const doesSupportMultiShare = (device: TrezorDevice | undefined): boolean => {
     if (device?.features === undefined) {
diff --git a/packages/suite/src/views/settings/SettingsDevice/Passphrase.tsx b/packages/suite/src/views/settings/SettingsDevice/Passphrase.tsx
index 8762a7b8df5..020d177d28e 100644
--- a/packages/suite/src/views/settings/SettingsDevice/Passphrase.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/Passphrase.tsx
@@ -1,9 +1,9 @@
 import { HELP_CENTER_PASSPHRASE_URL } from '@trezor/urls';
 import { analytics, EventType } from '@trezor/suite-analytics';
+import { Switch } from '@trezor/components';
 
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionColumn, TextColumn, Translation } from 'src/components/suite';
-import { Switch } from '@trezor/components';
 import { useDevice, useDispatch } from 'src/hooks/suite';
 import { applySettings } from 'src/actions/settings/deviceSettingsActions';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
diff --git a/packages/suite/src/views/settings/SettingsDevice/PinProtection.tsx b/packages/suite/src/views/settings/SettingsDevice/PinProtection.tsx
index 028896d05f3..8b2580aa625 100644
--- a/packages/suite/src/views/settings/SettingsDevice/PinProtection.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/PinProtection.tsx
@@ -1,7 +1,7 @@
 import { analytics, EventType } from '@trezor/suite-analytics';
+import { Switch } from '@trezor/components';
 
 import { ActionColumn, TextColumn, Translation } from 'src/components/suite';
-import { Switch } from '@trezor/components';
 import { useDevice, useDispatch } from 'src/hooks/suite';
 import { changePin } from 'src/actions/settings/deviceSettingsActions';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
diff --git a/packages/suite/src/views/settings/SettingsDevice/WipeCode.tsx b/packages/suite/src/views/settings/SettingsDevice/WipeCode.tsx
index a157e0281a7..85d5656773b 100644
--- a/packages/suite/src/views/settings/SettingsDevice/WipeCode.tsx
+++ b/packages/suite/src/views/settings/SettingsDevice/WipeCode.tsx
@@ -1,13 +1,14 @@
-import { analytics, EventType } from '@trezor/suite-analytics';
 import { useSelector } from 'react-redux';
 
+import { analytics, EventType } from '@trezor/suite-analytics';
 import { HELP_CENTER_WIPE_CODE_URL } from '@trezor/urls';
+import { selectIsDeviceProtectedByWipeCode } from '@suite-common/wallet-core';
+
 import { changeWipeCode } from 'src/actions/settings/deviceSettingsActions';
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionButton, ActionColumn, TextColumn, Translation } from 'src/components/suite';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
 import { useDispatch } from 'src/hooks/suite';
-import { selectIsDeviceProtectedByWipeCode } from '@suite-common/wallet-core';
 
 interface Props {
     isDeviceLocked: boolean;
diff --git a/packages/suite/src/views/settings/SettingsGeneral/Analytics.tsx b/packages/suite/src/views/settings/SettingsGeneral/Analytics.tsx
index 3473f093944..66dc68b2c72 100644
--- a/packages/suite/src/views/settings/SettingsGeneral/Analytics.tsx
+++ b/packages/suite/src/views/settings/SettingsGeneral/Analytics.tsx
@@ -1,4 +1,5 @@
 import { useSelector } from 'react-redux';
+
 import styled from 'styled-components';
 
 import { selectHasUserAllowedTracking } from '@suite-common/analytics';
diff --git a/packages/suite/src/views/settings/SettingsDebug/AutoStart.tsx b/packages/suite/src/views/settings/SettingsGeneral/AutoStart.tsx
similarity index 56%
rename from packages/suite/src/views/settings/SettingsDebug/AutoStart.tsx
rename to packages/suite/src/views/settings/SettingsGeneral/AutoStart.tsx
index 09a298ce32c..08ef3a24a15 100644
--- a/packages/suite/src/views/settings/SettingsDebug/AutoStart.tsx
+++ b/packages/suite/src/views/settings/SettingsGeneral/AutoStart.tsx
@@ -1,23 +1,36 @@
+import { useEffect, useState } from 'react';
+
 import styled from 'styled-components';
 
 import { Switch } from '@trezor/components';
+import { desktopApi } from '@trezor/suite-desktop-api';
 
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionColumn, TextColumn, Translation } from 'src/components/suite';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
-import { useDispatch, useSelector } from 'src/hooks/suite';
-import { setAutoStart } from 'src/actions/suite/suiteActions';
 
 const PositionedSwitch = styled.div`
     align-self: center;
 `;
 
 export const AutoStart = () => {
-    const autoStartEnabled = useSelector(state => state.suite.settings.autoStart);
-    const dispatch = useDispatch();
+    const [autoStartEnabled, setAutoStartEnabled] = useState(false);
+
+    const updateAutoStartStatus = () => {
+        desktopApi.getAppAutoStartIsEnabled().then(result => {
+            if (result.success) {
+                setAutoStartEnabled(result.payload);
+            }
+        });
+    };
+    // set initial state based on real electron settings
+    useEffect(() => {
+        updateAutoStartStatus();
+    }, []);
 
-    const handleChange = () => {
-        dispatch(setAutoStart(!autoStartEnabled));
+    const handleChange = (enabled: boolean) => {
+        desktopApi.appAutoStart(enabled);
+        Promise.resolve().then(() => updateAutoStartStatus());
     };
 
     return (
@@ -31,7 +44,7 @@ export const AutoStart = () => {
                     <Switch
                         data-testid="@autostart/toggle-switch"
                         isChecked={!!autoStartEnabled}
-                        onChange={handleChange}
+                        onChange={() => handleChange(!autoStartEnabled)}
                     />
                 </PositionedSwitch>
             </ActionColumn>
diff --git a/packages/suite/src/views/settings/SettingsGeneral/AutomaticUpdate.tsx b/packages/suite/src/views/settings/SettingsGeneral/AutomaticUpdate.tsx
index 3346953d320..2d63168d5df 100644
--- a/packages/suite/src/views/settings/SettingsGeneral/AutomaticUpdate.tsx
+++ b/packages/suite/src/views/settings/SettingsGeneral/AutomaticUpdate.tsx
@@ -1,26 +1,25 @@
 import styled from 'styled-components';
 
 import { Switch } from '@trezor/components';
+import { isDesktop } from '@trezor/env-utils';
+import { desktopApi } from '@trezor/suite-desktop-api';
 
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionColumn, TextColumn, Translation } from 'src/components/suite';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
-import { selectHasExperimentalFeature } from '../../../reducers/suite/suiteReducer';
-import { isDesktop } from '@trezor/env-utils';
+
 import { useSelector } from '../../../hooks/suite';
-import { desktopApi } from '@trezor/suite-desktop-api';
 
 const PositionedSwitch = styled.div`
     align-self: center;
 `;
 
 export const AutomaticUpdate = () => {
-    const isExperimentalEnabled = useSelector(selectHasExperimentalFeature('automatic-update'));
     const isAutomaticUpdateEnabled = useSelector(
         state => state.desktopUpdate.isAutomaticUpdateEnabled,
     );
 
-    if (!isDesktop() || !isExperimentalEnabled) {
+    if (!isDesktop()) {
         return null;
     }
 
diff --git a/packages/suite/src/views/settings/SettingsGeneral/BitcoinAmountUnit.tsx b/packages/suite/src/views/settings/SettingsGeneral/BitcoinAmountUnit.tsx
index ddfcd71a274..1425646eb0f 100644
--- a/packages/suite/src/views/settings/SettingsGeneral/BitcoinAmountUnit.tsx
+++ b/packages/suite/src/views/settings/SettingsGeneral/BitcoinAmountUnit.tsx
@@ -1,8 +1,8 @@
 import { PROTO } from '@trezor/connect';
+import { UNIT_LABELS, UNIT_OPTIONS } from '@suite-common/suite-constants';
 
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionColumn, ActionSelect, TextColumn, Translation } from 'src/components/suite';
-import { UNIT_LABELS, UNIT_OPTIONS } from '@suite-common/suite-constants';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
 import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
 
diff --git a/packages/suite/src/views/settings/SettingsGeneral/DesktopSuiteBanner.tsx b/packages/suite/src/views/settings/SettingsGeneral/DesktopSuiteBanner.tsx
index f1604c6ce71..6b5e557777d 100644
--- a/packages/suite/src/views/settings/SettingsGeneral/DesktopSuiteBanner.tsx
+++ b/packages/suite/src/views/settings/SettingsGeneral/DesktopSuiteBanner.tsx
@@ -1,14 +1,16 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
 import { AnimatePresence, HTMLMotionProps, motion } from 'framer-motion';
+
 import { Button, H2, Icon, Image, Paragraph, motionEasing } from '@trezor/components';
 import { analytics, EventType } from '@trezor/suite-analytics';
 import { SUITE_URL } from '@trezor/urls';
+import { SCREEN_QUERY } from '@trezor/components/src/config/variables';
 
 import { useDispatch } from 'src/hooks/suite/useDispatch';
 import { setFlag } from 'src/actions/suite/suiteActions';
 import { Translation, TrezorLink } from 'src/components/suite';
-import { SCREEN_QUERY } from '@trezor/components/src/config/variables';
 
 const Container = styled(motion.div)`
     position: relative;
diff --git a/packages/suite/src/views/settings/SettingsGeneral/Experimental.tsx b/packages/suite/src/views/settings/SettingsGeneral/Experimental.tsx
index b04b8484609..127c9a145d1 100644
--- a/packages/suite/src/views/settings/SettingsGeneral/Experimental.tsx
+++ b/packages/suite/src/views/settings/SettingsGeneral/Experimental.tsx
@@ -1,5 +1,6 @@
 import styled from 'styled-components';
 import { AnimatePresence, motion } from 'framer-motion';
+
 import { Checkbox, Switch, Banner } from '@trezor/components';
 import { spacingsPx } from '@trezor/theme';
 import { EXPERIMENTAL_FEATURES_KB_URL } from '@trezor/urls';
@@ -34,10 +35,10 @@ const FeatureLine = ({ feature, enabledFeatures }: FeatureLineProps) => {
     const descId = config.description;
     const url = config.knowledgeBaseUrl;
 
-    const onChangeFeature = () => {
+    const onChangeFeature = async () => {
         const newValue = !checked;
 
-        config?.onToggle?.({ dispatch, newValue });
+        await config?.onToggle?.({ dispatch, newValue });
 
         dispatch({
             type: SUITE.SET_EXPERIMENTAL_FEATURES,
diff --git a/packages/suite/src/views/settings/SettingsGeneral/Language.tsx b/packages/suite/src/views/settings/SettingsGeneral/Language.tsx
index 91ea18fa772..dae86d90c0f 100644
--- a/packages/suite/src/views/settings/SettingsGeneral/Language.tsx
+++ b/packages/suite/src/views/settings/SettingsGeneral/Language.tsx
@@ -1,5 +1,8 @@
 import { useMemo } from 'react';
+
 import { analytics, EventType } from '@trezor/suite-analytics';
+import { getPlatformLanguages } from '@trezor/env-utils';
+import { CROWDIN_URL } from '@trezor/urls';
 
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionColumn, ActionSelect, TextColumn, Translation } from 'src/components/suite';
@@ -9,8 +12,6 @@ import LANGUAGES, { Locale, LocaleInfo } from 'src/config/suite/languages';
 import { setAutodetect } from 'src/actions/suite/suiteActions';
 import { setLanguage } from 'src/actions/settings/languageActions';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
-import { getPlatformLanguages } from '@trezor/env-utils';
-import { CROWDIN_URL } from '@trezor/urls';
 import { selectLanguage } from 'src/reducers/suite/suiteReducer';
 
 const onlyOfficial = (locale: [string, LocaleInfo]): locale is [Locale, LocaleInfo] =>
diff --git a/packages/suite/src/views/settings/SettingsGeneral/SettingsGeneral.tsx b/packages/suite/src/views/settings/SettingsGeneral/SettingsGeneral.tsx
index 6dcdc212834..93edbcac248 100644
--- a/packages/suite/src/views/settings/SettingsGeneral/SettingsGeneral.tsx
+++ b/packages/suite/src/views/settings/SettingsGeneral/SettingsGeneral.tsx
@@ -1,4 +1,5 @@
 import { isDesktop, isWeb } from '@trezor/env-utils';
+import { networks, NetworkFeature } from '@suite-common/wallet-config';
 
 import { SettingsLayout, SettingsSection } from 'src/components/settings';
 import { Translation } from 'src/components/suite';
@@ -7,6 +8,7 @@ import {
     selectHasExperimentalFeature,
     selectIsSettingsDesktopAppPromoBannerShown,
     selectTorState,
+    selectIsDebugModeActive,
 } from 'src/reducers/suite/suiteReducer';
 import { selectEnabledNetworks } from 'src/reducers/wallet/settingsReducer';
 import { selectSelectedProviderForLabels } from 'src/reducers/suite/metadataReducer';
@@ -29,9 +31,10 @@ import { DesktopSuiteBanner } from './DesktopSuiteBanner';
 import { AddressDisplay } from './AddressDisplay';
 import { EnableViewOnly } from './EnableViewOnly';
 import { Experimental } from './Experimental';
-import { networks, NetworkFeature } from '@suite-common/wallet-config';
 import { TorSnowflake } from './TorSnowflake';
 import { AutomaticUpdate } from './AutomaticUpdate';
+import { AutoStart } from './AutoStart';
+import { ShowOnTray } from './ShowOnTray';
 
 export const SettingsGeneral = () => {
     const shouldShowSettingsDesktopAppPromoBanner = useSelector(
@@ -55,6 +58,7 @@ export const SettingsGeneral = () => {
 
     const isMetadataEnabled = metadata.enabled && !metadata.initiating;
     const isProviderConnected = useSelector(selectSelectedProviderForLabels);
+    const isDebugModeActive = useSelector(selectIsDebugModeActive);
 
     return (
         <SettingsLayout data-testid="@settings/index">
@@ -100,6 +104,13 @@ export const SettingsGeneral = () => {
                 <EnableViewOnly />
             </SettingsSection>
 
+            {isDesktop() && isDebugModeActive && (
+                <SettingsSection title={<Translation id="TR_TREZOR_CONNECT" />} icon="plugs">
+                    <AutoStart />
+                    <ShowOnTray />
+                </SettingsSection>
+            )}
+
             <SettingsSection
                 title={<Translation id="TR_EXPERIMENTAL_FEATURES" />}
                 icon="experimental"
diff --git a/packages/suite/src/views/settings/SettingsGeneral/ShowApplicationLog.tsx b/packages/suite/src/views/settings/SettingsGeneral/ShowApplicationLog.tsx
index a260b0dbe9f..5643d0067ca 100644
--- a/packages/suite/src/views/settings/SettingsGeneral/ShowApplicationLog.tsx
+++ b/packages/suite/src/views/settings/SettingsGeneral/ShowApplicationLog.tsx
@@ -1,6 +1,5 @@
 import { openModal } from 'src/actions/suite/modalActions';
 import { useDispatch } from 'src/hooks/suite';
-
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionButton, ActionColumn, TextColumn, Translation } from 'src/components/suite';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
diff --git a/packages/suite/src/views/settings/SettingsGeneral/ShowOnTray.tsx b/packages/suite/src/views/settings/SettingsGeneral/ShowOnTray.tsx
new file mode 100644
index 00000000000..b9162b9f451
--- /dev/null
+++ b/packages/suite/src/views/settings/SettingsGeneral/ShowOnTray.tsx
@@ -0,0 +1,61 @@
+import { useEffect, useState } from 'react';
+
+import styled from 'styled-components';
+
+import { Switch } from '@trezor/components';
+import { desktopApi } from '@trezor/suite-desktop-api';
+
+import { SettingsSectionItem } from 'src/components/settings';
+import { ActionColumn, TextColumn, Translation } from 'src/components/suite';
+import { SettingsAnchor } from 'src/constants/suite/anchors';
+
+const PositionedSwitch = styled.div`
+    align-self: center;
+`;
+
+export const ShowOnTray = () => {
+    const [showOnTrayEnabled, setShowOnTrayEnabled] = useState(false);
+
+    const updateStatus = () => {
+        desktopApi.getTraySettings().then(result => {
+            if (result.success) {
+                setShowOnTrayEnabled(result.payload.showOnTray);
+            }
+        });
+    };
+    // set initial state based on real electron settings
+    useEffect(() => {
+        updateStatus();
+
+        desktopApi.on('tray/settings', result => {
+            setShowOnTrayEnabled(result.showOnTray);
+        });
+
+        return () => {
+            desktopApi.removeAllListeners('tray/settings');
+        };
+    }, []);
+
+    const handleChange = (enabled: boolean) => {
+        desktopApi.changeTraySettings({ showOnTray: enabled });
+        Promise.resolve().then(() => updateStatus());
+    };
+
+    return (
+        <SettingsSectionItem anchorId={SettingsAnchor.AutoStart}>
+            <TextColumn
+                title={<Translation id="TR_SHOW_ON_TRAY" />}
+                description={<Translation id="TR_SHOW_ON_TRAY_DESCRIPTION" />}
+            />
+            <ActionColumn>
+                <PositionedSwitch>
+                    <Switch
+                        data-testid="@show-on-tray/toggle-switch"
+                        isChecked={!!showOnTrayEnabled}
+                        onChange={() => handleChange(!showOnTrayEnabled)}
+                    />
+                </PositionedSwitch>
+            </ActionColumn>
+        </SettingsSectionItem>
+    );
+};
diff --git a/packages/suite/src/views/settings/SettingsGeneral/Theme.tsx b/packages/suite/src/views/settings/SettingsGeneral/Theme.tsx
index 2f9d8dc8c4f..3dbf7460619 100644
--- a/packages/suite/src/views/settings/SettingsGeneral/Theme.tsx
+++ b/packages/suite/src/views/settings/SettingsGeneral/Theme.tsx
@@ -1,13 +1,13 @@
 import { analytics, EventType } from '@trezor/suite-analytics';
-
 import { desktopApi, SuiteThemeVariant } from '@trezor/suite-desktop-api';
+import { ThemeColorVariant } from '@trezor/theme';
+
 import { setAutodetect, setTheme } from 'src/actions/suite/suiteActions';
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionColumn, ActionSelect, TextColumn, Translation } from 'src/components/suite';
 import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
 import { getOsTheme } from 'src/utils/suite/env';
-import { ThemeColorVariant } from '@trezor/theme';
 
 type ThemeColorVariantWithSystem = ThemeColorVariant | 'system';
 type Option = { value: ThemeColorVariantWithSystem; label: string };
diff --git a/packages/suite/src/views/settings/SettingsGeneral/Tor.tsx b/packages/suite/src/views/settings/SettingsGeneral/Tor.tsx
index 5da8266ba04..5b49fae855e 100644
--- a/packages/suite/src/views/settings/SettingsGeneral/Tor.tsx
+++ b/packages/suite/src/views/settings/SettingsGeneral/Tor.tsx
@@ -1,6 +1,8 @@
 import { useEffect, useState } from 'react';
+
 import { LoadingContent, Switch } from '@trezor/components';
 import { TOR_PROJECT_URL } from '@trezor/urls';
+
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { toggleTor } from 'src/actions/suite/suiteActions';
 import { SettingsSectionItem } from 'src/components/settings';
diff --git a/packages/suite/src/views/settings/SettingsGeneral/TorOnionLinks.tsx b/packages/suite/src/views/settings/SettingsGeneral/TorOnionLinks.tsx
index 8264ee62e81..b8540de554b 100644
--- a/packages/suite/src/views/settings/SettingsGeneral/TorOnionLinks.tsx
+++ b/packages/suite/src/views/settings/SettingsGeneral/TorOnionLinks.tsx
@@ -1,8 +1,8 @@
 import { analytics, EventType } from '@trezor/suite-analytics';
+import { Switch } from '@trezor/components';
 
 import { setOnionLinks } from 'src/actions/suite/suiteActions';
 import { useDispatch, useSelector } from 'src/hooks/suite';
-import { Switch } from '@trezor/components';
 import { SettingsSectionItem } from 'src/components/settings';
 import { ActionColumn, TextColumn, Translation } from 'src/components/suite';
 import { SettingsAnchor } from 'src/constants/suite/anchors';
diff --git a/packages/suite/src/views/settings/SettingsGeneral/TorSnowflake.tsx b/packages/suite/src/views/settings/SettingsGeneral/TorSnowflake.tsx
index 93694356fac..6849e111a5e 100644
--- a/packages/suite/src/views/settings/SettingsGeneral/TorSnowflake.tsx
+++ b/packages/suite/src/views/settings/SettingsGeneral/TorSnowflake.tsx
@@ -1,17 +1,18 @@
 import { ChangeEventHandler, useEffect, useState } from 'react';
+
 import styled from 'styled-components';
-import { useSelector } from 'src/hooks/suite';
-import { selectTorState } from 'src/reducers/suite/suiteReducer';
+
 import { TorSettings } from '@trezor/suite-desktop-api/src/messages';
-import { TOR_SNOWFLAKE_PROJECT_URL } from '@trezor/urls';
+import { TOR_SNOWFLAKE_KB_URL } from '@trezor/urls';
 import { breakpointMediaQueries } from '@trezor/styles';
 import { desktopApi } from '@trezor/suite-desktop-api';
 import { Button, Input } from '@trezor/components';
 import { isFullPath } from '@trezor/utils';
 import { spacingsPx } from '@trezor/theme';
 
+import { selectTorState } from 'src/reducers/suite/suiteReducer';
+import { useSelector, useTranslation } from 'src/hooks/suite';
 import { ActionColumn, SectionItem, TextColumn, Translation } from 'src/components/suite';
-import { useTranslation } from 'src/hooks/suite';
 
 const Container = styled.div`
     display: flex;
@@ -96,7 +97,7 @@ export const TorSnowflake = () => {
             <TextColumn
                 title={<Translation id="TR_TOR_CONFIG_SNOWFLAKE_TITLE" />}
                 description={<Translation id="TR_TOR_CONFIG_SNOWFLAKE_DESCRIPTION" />}
-                buttonLink={TOR_SNOWFLAKE_PROJECT_URL}
+                buttonLink={TOR_SNOWFLAKE_KB_URL}
             />
             <ActionColumn>
                 <Container>
diff --git a/packages/suite/src/views/settings/SettingsGeneral/VersionWithUpdate.tsx b/packages/suite/src/views/settings/SettingsGeneral/VersionWithUpdate.tsx
index a52f75b9b1b..0acfcb4e4c3 100644
--- a/packages/suite/src/views/settings/SettingsGeneral/VersionWithUpdate.tsx
+++ b/packages/suite/src/views/settings/SettingsGeneral/VersionWithUpdate.tsx
@@ -86,7 +86,7 @@ export const VersionWithUpdate = () => {
 
     const checkForUpdates = () => desktopApi.checkForUpdates(true);
     const maximizeUpdateModal = () => dispatch(setUpdateModalVisibility('maximized'));
-    const installAndRestart = () => dispatch(installUpdate({ shouldInstallOnQuit: false }));
+    const installAndRestart = () => dispatch(installUpdate({ installNow: true }));
 
     return (
         <SettingsSectionItem anchorId={SettingsAnchor.VersionWithUpdate}>
@@ -101,11 +101,7 @@ export const VersionWithUpdate = () => {
                             <Translation id="SETTINGS_UPDATE_CHECKING" />
                         </ActionButton>
                     )}
-                    {[
-                        UpdateState.NotAvailable,
-                        UpdateState.EarlyAccessDisable,
-                        UpdateState.EarlyAccessEnable,
-                    ].includes(desktopUpdateState.state) && (
+                    {desktopUpdateState.state === UpdateState.NotAvailable && (
                         <ActionButton onClick={checkForUpdates} variant="primary">
                             <Translation id="SETTINGS_UPDATE_CHECK" />
                         </ActionButton>
diff --git a/packages/suite/src/views/settings/SettingsLoader.tsx b/packages/suite/src/views/settings/SettingsLoader.tsx
index 56368e85192..d1fbf0226bc 100644
--- a/packages/suite/src/views/settings/SettingsLoader.tsx
+++ b/packages/suite/src/views/settings/SettingsLoader.tsx
@@ -1,9 +1,12 @@
 import React from 'react';
-import { H3, Spinner, motionEasing } from '@trezor/components';
+
 import styled from 'styled-components';
+import { motion, AnimatePresence } from 'framer-motion';
+
+import { H3, Spinner, motionEasing } from '@trezor/components';
 import { spacings, spacingsPx } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
-import { motion, AnimatePresence } from 'framer-motion';
 
 const Container = styled(motion.div)`
     background-color: ${({ theme }) => theme.backgroundTertiaryDefaultOnElevation0};
diff --git a/packages/suite/src/views/start/StartContent.tsx b/packages/suite/src/views/start/StartContent.tsx
index 4b9d0af6303..a867f5bfd99 100644
--- a/packages/suite/src/views/start/StartContent.tsx
+++ b/packages/suite/src/views/start/StartContent.tsx
@@ -1,15 +1,19 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { DataAnalytics } from '@trezor/components';
 import { analytics } from '@trezor/suite-analytics';
 import { DOCS_ANALYTICS_URL, DATA_TOS_URL } from '@trezor/urls';
 import { selectIsAnalyticsConfirmed } from '@suite-common/analytics';
+import { typography } from '@trezor/theme';
+
 import { rerun } from 'src/actions/recovery/recoveryActions';
 import { PrerequisitesGuide, TrezorLink } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { selectPrerequisite } from 'src/reducers/suite/suiteReducer';
+
 import { SecurityCheck } from '../onboarding/steps/SecurityCheck/SecurityCheck';
-import { typography } from '@trezor/theme';
 
 const StyledTrezorLink = styled(TrezorLink)`
     color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
diff --git a/packages/suite/src/views/start/SuiteStart.tsx b/packages/suite/src/views/start/SuiteStart.tsx
index dc465707016..b24022c8cac 100644
--- a/packages/suite/src/views/start/SuiteStart.tsx
+++ b/packages/suite/src/views/start/SuiteStart.tsx
@@ -1,5 +1,7 @@
 import styled from 'styled-components';
+
 import { WelcomeLayout } from 'src/components/suite';
+
 import { StartContent } from './StartContent';
 
 const Content = styled.div`
diff --git a/packages/suite/src/views/suite/ErrorPage.tsx b/packages/suite/src/views/suite/ErrorPage.tsx
index cff4f6b9009..e9148ed4f01 100644
--- a/packages/suite/src/views/suite/ErrorPage.tsx
+++ b/packages/suite/src/views/suite/ErrorPage.tsx
@@ -1,8 +1,9 @@
 import styled from 'styled-components';
-import { Translation } from 'src/components/suite';
 
 import { Paragraph, H2, Button, Link, Image } from '@trezor/components';
 
+import { Translation } from 'src/components/suite';
+
 const Wrapper = styled.div`
     display: flex;
     flex: 1;
diff --git a/packages/suite/src/views/suite/SwitchDevice/CardWithDevice.tsx b/packages/suite/src/views/suite/SwitchDevice/CardWithDevice.tsx
index 233bc6cf8f8..38b24190313 100644
--- a/packages/suite/src/views/suite/SwitchDevice/CardWithDevice.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/CardWithDevice.tsx
@@ -2,11 +2,12 @@ import { ReactNode } from 'react';
 
 import { AnimatePresence, motion } from 'framer-motion';
 import styled from 'styled-components';
+
 import { Card, IconName, motionAnimation, useElevation } from '@trezor/components';
 import * as deviceUtils from '@suite-common/suite-utils';
+import { Elevation, mapElevationToBorder, spacingsPx } from '@trezor/theme';
 
 import type { TrezorDevice, ForegroundAppProps } from 'src/types/suite';
-import { Elevation, mapElevationToBorder, spacingsPx } from '@trezor/theme';
 
 import { DeviceHeader } from './DeviceItem/DeviceHeader';
 
@@ -64,7 +65,7 @@ export const CardWithDevice = ({
     const { elevation } = useElevation();
 
     return (
-        <Card paddingType="small" forceElevation={0}>
+        <Card paddingType="small">
             <DeviceWrapper>
                 <DeviceHeader
                     isFindTrezorVisible={isFindTrezorVisible}
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/AddWalletButton.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/AddWalletButton.tsx
index 6fe01a6a181..e4ee4a8a4b3 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/AddWalletButton.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/AddWalletButton.tsx
@@ -1,25 +1,12 @@
-import styled from 'styled-components';
-
 import { Button, Column, HotkeyBadge, Row, Tooltip } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+import { WalletType } from '@suite-common/wallet-types';
 
 import { Translation } from 'src/components/suite';
 import { TrezorDevice, AcquiredDevice, ForegroundAppProps } from 'src/types/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
-import { SUITE } from 'src/actions/suite/constants';
-import { spacings } from '@trezor/theme';
-import { WalletType } from '@suite-common/wallet-types';
 import { addWalletThunk } from 'src/actions/wallet/addWalletThunk';
-
-const AddWallet = styled.div`
-    display: flex;
-    width: 100%;
-    margin-top: 10px;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledTooltip = styled(Tooltip)`
-    width: 100%;
-`;
+import { selectIsDeviceOrUiLocked } from 'src/reducers/suite/suiteReducer';
 
 interface AddWalletButtonProps {
     device: TrezorDevice;
@@ -31,17 +18,13 @@ export const AddWalletButton = ({ device, instances, onCancel }: AddWalletButton
     const dispatch = useDispatch();
     // Find a "standard wallet" among user's wallet instances. If no such wallet is found, the variable is undefined.
     const emptyPassphraseWalletExists = instances.find(d => d.useEmptyPassphrase && d.state);
-    const locks = useSelector(state => state.suite.locks);
+    const isDeviceOrUiLocked = useSelector(selectIsDeviceOrUiLocked);
     const isPassphraseProtectionEnabled = Boolean(device?.features?.passphrase_protection);
 
     // opportunity to bring useDeviceLocks back (extract it from useDevice hook)?
     // useDevice hook is not really suited for this since we need to pass the device as a prop
     // and there is no point in useDevice returning the same device object we would have passed
-    const isLocked =
-        !device ||
-        !device.connected ||
-        locks.includes(SUITE.LOCK_TYPE.DEVICE) ||
-        locks.includes(SUITE.LOCK_TYPE.UI);
+    const isLocked = !device || !device.connected || isDeviceOrUiLocked;
 
     const onAddWallet = ({ walletType }: { walletType: WalletType }) => {
         dispatch(addWalletThunk({ walletType, device }));
@@ -49,43 +32,41 @@ export const AddWalletButton = ({ device, instances, onCancel }: AddWalletButton
     };
 
     return (
-        <AddWallet>
-            <StyledTooltip
-                content={isLocked && <Translation id="TR_TO_ACCESS_OTHER_WALLETS" />}
-                cursor="pointer"
-                placement="bottom"
-            >
-                <Column flex="1" gap={spacings.xs}>
-                    {!emptyPassphraseWalletExists && (
-                        <Button
-                            data-testid="@switch-device/add-wallet-button"
-                            variant="tertiary"
-                            isFullWidth
-                            icon="plus"
-                            isDisabled={isLocked}
-                            onClick={() => onAddWallet({ walletType: WalletType.STANDARD })}
-                        >
-                            <Translation id="TR_ADD_WALLET" />
-                        </Button>
-                    )}
+        <Tooltip
+            content={!isLocked && <Translation id="TR_TO_ACCESS_OTHER_WALLETS" />}
+            cursor="pointer"
+            placement="bottom"
+        >
+            <Column flex="1" gap={spacings.xs}>
+                {!emptyPassphraseWalletExists && (
+                    <Button
+                        data-testid="@switch-device/add-wallet-button"
+                        variant="tertiary"
+                        isFullWidth
+                        icon="plus"
+                        isDisabled={isLocked}
+                        onClick={() => onAddWallet({ walletType: WalletType.STANDARD })}
+                    >
+                        <Translation id="TR_ADD_WALLET" />
+                    </Button>
+                )}
 
-                    {isPassphraseProtectionEnabled && (
-                        <Button
-                            data-testid="@switch-device/add-hidden-wallet-button"
-                            variant="tertiary"
-                            isFullWidth
-                            icon="plus"
-                            isDisabled={isLocked}
-                            onClick={() => onAddWallet({ walletType: WalletType.PASSPHRASE })}
-                        >
-                            <Row gap={spacings.xs}>
-                                <Translation id="TR_ADD_HIDDEN_WALLET" />{' '}
-                                {!isLocked && <HotkeyBadge hotkey={['ALT', 'KEY_P']} />}
-                            </Row>
-                        </Button>
-                    )}
-                </Column>
-            </StyledTooltip>
-        </AddWallet>
+                {isPassphraseProtectionEnabled && (
+                    <Button
+                        data-testid="@switch-device/add-hidden-wallet-button"
+                        variant="tertiary"
+                        isFullWidth
+                        icon="plus"
+                        isDisabled={isLocked}
+                        onClick={() => onAddWallet({ walletType: WalletType.PASSPHRASE })}
+                    >
+                        <Row gap={spacings.xs}>
+                            <Translation id="TR_ADD_HIDDEN_WALLET" />{' '}
+                            {!isLocked && <HotkeyBadge hotkey={['ALT', 'KEY_P']} />}
+                        </Row>
+                    </Button>
+                )}
+            </Column>
+        </Tooltip>
     );
 };
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceConnectionText.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceConnectionText.tsx
index 1d3fc985664..9346fb160e3 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceConnectionText.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceConnectionText.tsx
@@ -1,7 +1,9 @@
+import { ReactNode } from 'react';
+
+import styled, { css } from 'styled-components';
+
 import { Icon, IconName, IconVariant, Text } from '@trezor/components';
 import { spacingsPx, typography } from '@trezor/theme';
-import styled, { css } from 'styled-components';
-import { ReactNode } from 'react';
 
 const Container = styled.span<{ $isAction?: boolean }>`
     ${typography.label}
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceDetail.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceDetail.tsx
index 539fd5da242..2629d22aaf1 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceDetail.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceDetail.tsx
@@ -1,27 +1,10 @@
-import { TruncateWithTooltip } from '@trezor/components';
-import { spacingsPx, typography } from '@trezor/theme';
 import { ReactNode } from 'react';
-import styled from 'styled-components';
 
-const Container = styled.div`
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    overflow: hidden;
-    align-self: center;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const DeviceLabel = styled(TruncateWithTooltip)`
-    ${typography.body};
-    margin-bottom: -${spacingsPx.xxs};
-    min-width: 0;
-    color: ${({ theme }) => theme.textDefault};
-`;
+import { TruncateWithTooltip, Column } from '@trezor/components';
 
 export const DeviceDetail = ({ label, children }: { label: string; children: ReactNode }) => (
-    <Container>
-        <DeviceLabel>{label}</DeviceLabel>
+    <Column overflow="hidden" flex="1" alignItems="flex-start">
+        <TruncateWithTooltip>{label}</TruncateWithTooltip>
         {children}
-    </Container>
+    </Column>
 );
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceHeader.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceHeader.tsx
index 52ca0a15cc4..a3499d69d0a 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceHeader.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceHeader.tsx
@@ -1,13 +1,15 @@
 import styled from 'styled-components';
+import { motion } from 'framer-motion';
+
 import { IconButton, IconName, Row, TOOLTIP_DELAY_LONG, Tooltip } from '@trezor/components';
+import { spacings, spacingsPx } from '@trezor/theme';
+import { selectDevice } from '@suite-common/wallet-core';
+
 import { DeviceStatus } from 'src/components/suite/layouts/SuiteLayout/DeviceSelector/DeviceStatus';
 import { isWebUsb } from 'src/utils/suite/transport';
 import { Translation, WebUsbButton } from 'src/components/suite';
-import { spacings, spacingsPx } from '@trezor/theme';
 import { useSelector } from 'src/hooks/suite';
-import { motion } from 'framer-motion';
 import { ForegroundAppProps, TrezorDevice } from 'src/types/suite';
-import { selectDevice } from '@suite-common/wallet-core';
 import { WebUsbIconButton } from 'src/components/suite/WebUsbButton';
 
 const Container = styled.div<{ $isFullHeaderVisible: boolean }>`
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceItem.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceItem.tsx
index c21ab481fc1..724fbbf37a5 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceItem.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceItem.tsx
@@ -1,19 +1,18 @@
 import styled from 'styled-components';
-import { variables } from '@trezor/components';
+
+import { variables, Column } from '@trezor/components';
 import * as deviceUtils from '@suite-common/suite-utils';
+import { selectDevice, selectDeviceThunk, acquireDevice } from '@suite-common/wallet-core';
+import { spacings } from '@trezor/theme';
 
-import { selectDevice, selectDeviceThunk } from '@suite-common/wallet-core';
 import { useDispatch, useSelector } from 'src/hooks/suite';
+import type { TrezorDevice, AcquiredDevice, ForegroundAppProps } from 'src/types/suite';
+import { redirectAfterWalletSelectedThunk } from 'src/actions/wallet/addWalletThunk';
 
 import { WalletInstance } from './WalletInstance';
 import { AddWalletButton } from './AddWalletButton';
-
-import { acquireDevice } from '@suite-common/wallet-core';
-import type { TrezorDevice, AcquiredDevice, ForegroundAppProps } from 'src/types/suite';
-import { spacingsPx } from '@trezor/theme';
 import { CardWithDevice } from '../CardWithDevice';
 import { DeviceWarning } from './DeviceWarning';
-import { redirectAfterWalletSelectedThunk } from 'src/actions/wallet/addWalletThunk';
 
 const WalletsWrapper = styled.div<{ $enabled: boolean }>`
     opacity: ${({ $enabled }) => ($enabled ? 1 : 0.5)};
@@ -25,12 +24,6 @@ const WalletsWrapper = styled.div<{ $enabled: boolean }>`
     }
 `;
 
-const InstancesWrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-    gap: ${spacingsPx.xs};
-`;
-
 interface DeviceItemProps {
     device: TrezorDevice;
     instances: AcquiredDevice[];
@@ -79,20 +72,26 @@ export const DeviceItem = ({
             isFullHeaderVisible={isFullHeaderVisible}
         >
             <WalletsWrapper $enabled>
-                <InstancesWrapper>
-                    {instancesWithState.map((instance, index) => (
-                        <WalletInstance
-                            key={`${instance.id}-${instance.instance}-${instance.state}`}
-                            instance={instance}
-                            enabled
-                            selected={deviceUtils.isSelectedInstance(selectedDevice, instance)}
-                            index={index}
-                            onCancel={onCancel}
-                        />
-                    ))}
-                </InstancesWrapper>
-
-                <AddWalletButton device={device} instances={instances} onCancel={onCancel} />
+                <Column gap={spacings.xs} margin={{ top: spacings.xxs }} alignItems="stretch">
+                    {instancesWithState.length > 0 && (
+                        <Column gap={spacings.xs} alignItems="stretch">
+                            {instancesWithState.map((instance, index) => (
+                                <WalletInstance
+                                    key={`${instance.id}-${instance.instance}-${instance.state}`}
+                                    instance={instance}
+                                    enabled
+                                    selected={deviceUtils.isSelectedInstance(
+                                        selectedDevice,
+                                        instance,
+                                    )}
+                                    index={index}
+                                    onCancel={onCancel}
+                                />
+                            ))}
+                        </Column>
+                    )}
+                    <AddWalletButton device={device} instances={instances} onCancel={onCancel} />
+                </Column>
             </WalletsWrapper>
         </CardWithDevice>
     );
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceStatusText.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceStatusText.tsx
index 9e6b32c15eb..7f1b2e8a6b9 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceStatusText.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceStatusText.tsx
@@ -1,12 +1,15 @@
+import React, { MouseEventHandler } from 'react';
+
 import * as deviceUtils from '@suite-common/suite-utils';
 import { TOOLTIP_DELAY_LONG, TruncateWithTooltip } from '@trezor/components';
-import React, { MouseEventHandler } from 'react';
+import { TrezorDevice } from '@suite-common/suite-types';
+
 import { Translation } from 'src/components/suite';
-import { DeviceConnectionText } from './DeviceConnectionText';
 import { selectLabelingDataForWallet } from 'src/reducers/suite/metadataReducer';
 import { useSelector } from 'src/hooks/suite';
 import { useWalletLabeling } from 'src/components/suite/labeling/WalletLabeling';
-import { TrezorDevice } from '@suite-common/suite-types';
+
+import { DeviceConnectionText } from './DeviceConnectionText';
 
 type DeviceStatusTextProps = {
     onRefreshClick?: MouseEventHandler;
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceWarning.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceWarning.tsx
index 9e92f5f2a38..13b3e338793 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceWarning.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceWarning.tsx
@@ -27,7 +27,7 @@ export const DeviceWarning = ({
                     button={{
                         children: <Translation id="TR_SOLVE_ISSUE" />,
                         onClick: onSolveIssueClick,
-                        'data-testid': `@switch-device/${device.path}/solve-issue-button`,
+                        'data-testid': `@switch-device/solve-issue-button`,
                         isDisabled: isLocked,
                     }}
                 >
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/EjectButton.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/EjectButton.tsx
index ddf77186670..78dd7d0d3b4 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/EjectButton.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/EjectButton.tsx
@@ -1,18 +1,10 @@
-import styled, { useTheme } from 'styled-components';
+import { useTheme } from 'styled-components';
+
+import { Tooltip, Icon } from '@trezor/components';
 
-import { Tooltip, Icon, useElevation } from '@trezor/components';
 import { Translation } from 'src/components/suite';
-import { Elevation, borders, mapElevationToBackground, spacingsPx } from '@trezor/theme';
-import { ContentType } from '../types';
 
-const EjectContainer = styled.div<{ $elevation: Elevation }>`
-    position: absolute;
-    right: ${spacingsPx.xs};
-    top: ${spacingsPx.xs};
-    background-color: ${mapElevationToBackground};
-    border-radius: ${borders.radii.full};
-    padding: ${spacingsPx.xxs};
-`;
+import { ContentType } from '../types';
 
 interface EjectButtonProps {
     setContentType: (contentType: ContentType) => void;
@@ -27,20 +19,16 @@ export const EjectButton = ({ setContentType, 'data-testid': dataTest }: EjectBu
         e.stopPropagation();
     };
 
-    const { elevation } = useElevation();
-
     return (
-        <EjectContainer $elevation={elevation}>
-            <Tooltip cursor="pointer" content={<Translation id="TR_EJECT_HEADING" />}>
-                <Icon
-                    data-testid={`${dataTest}/eject-button`}
-                    name="eject"
-                    size={22}
-                    color={theme.legacy.TYPE_LIGHT_GREY}
-                    hoverColor={theme.legacy.TYPE_DARK_GREY}
-                    onClick={onEjectClick}
-                />
-            </Tooltip>
-        </EjectContainer>
+        <Tooltip cursor="pointer" content={<Translation id="TR_EJECT_HEADING" />}>
+            <Icon
+                data-testid={`${dataTest}/eject-button`}
+                name="eject"
+                size={22}
+                variant="tertiary"
+                hoverColor={theme.textDefault}
+                onClick={onEjectClick}
+            />
+        </Tooltip>
     );
 };
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/EjectConfirmation.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/EjectConfirmation.tsx
index caf21530560..649033bd492 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/EjectConfirmation.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/EjectConfirmation.tsx
@@ -1,28 +1,22 @@
+import { MouseEventHandler, ReactNode } from 'react';
+
 import styled from 'styled-components';
-import { useDispatch, useSelector } from 'src/hooks/suite';
-import { H3, Button, Text } from '@trezor/components';
-import { Translation } from 'src/components/suite';
+
+import { H4, Button, Paragraph, Row } from '@trezor/components';
 import { deviceActions } from '@suite-common/wallet-core';
 import { analytics, EventType } from '@trezor/suite-analytics';
 import { AcquiredDevice } from '@suite-common/suite-types';
-import { MouseEventHandler, ReactNode } from 'react';
-import { spacings, spacingsPx } from '@trezor/theme';
+import { spacings } from '@trezor/theme';
+
+import { Translation } from 'src/components/suite';
+import { useDispatch, useSelector } from 'src/hooks/suite';
+
 import { selectSuiteSettings } from '../../../../reducers/suite/suiteReducer';
 
 const Container = styled.div`
-    margin: 0 ${spacingsPx.xxs};
     cursor: auto;
 `;
 
-const Description = styled.div`
-    margin: ${spacingsPx.xs} 0 ${spacingsPx.md} 0;
-`;
-
-const Buttons = styled.div`
-    display: flex;
-    gap: ${spacingsPx.xxs};
-`;
-
 type EjectConfirmationProps = {
     onCancel: MouseEventHandler<HTMLButtonElement> | undefined;
     onClick: (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
@@ -57,19 +51,19 @@ const EjectConfirmationContainer = ({
 
     return (
         <Container onClick={onClick}>
-            <H3>{title}</H3>
-            <Description>
-                <Text variant="tertiary">{description}</Text>
-            </Description>
-            <Buttons>
+            <H4>{title}</H4>
+            <Paragraph variant="tertiary" typographyStyle="hint" margin={{ top: spacings.xxs }}>
+                {description}
+            </Paragraph>
+            <Row gap={spacings.xs} margin={{ top: spacings.md }}>
                 <Button
                     size="small"
                     icon="eject"
                     iconSize={spacings.lg}
                     onClick={handleEject}
                     variant="primary"
-                    isFullWidth
                     data-testid="@switch-device/eject"
+                    isFullWidth
                 >
                     {primaryButtonLabel}
                 </Button>
@@ -77,12 +71,12 @@ const EjectConfirmationContainer = ({
                     size="small"
                     onClick={onCancel}
                     variant="tertiary"
-                    isFullWidth
                     data-testid="@switch-device/cancelEject"
+                    isFullWidth
                 >
                     <Translation id="TR_SWITCH_DEVICE_EJECT_CONFIRMATION_CANCEL_BUTTON" />
                 </Button>
-            </Buttons>
+            </Row>
         </Container>
     );
 };
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/ViewOnly.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/ViewOnly.tsx
index 7555980b0a2..6a6bdd581ea 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/ViewOnly.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/ViewOnly.tsx
@@ -1,14 +1,16 @@
 import styled from 'styled-components';
 
 import { CollapsibleBox, Text, Row } from '@trezor/components';
-import { Translation } from 'src/components/suite';
-import { ViewOnlyRadios } from './ViewOnlyRadios';
 import { spacings, spacingsPx } from '@trezor/theme';
-import { useDispatch } from 'src/hooks/suite';
 import { toggleRememberDevice } from '@suite-common/wallet-core';
-import { ContentType } from '../types';
 import { AcquiredDevice } from '@suite-common/suite-types';
 
+import { Translation } from 'src/components/suite';
+import { useDispatch } from 'src/hooks/suite';
+
+import { ViewOnlyRadios } from './ViewOnlyRadios';
+import { ContentType } from '../types';
+
 type ViewOnlyProps = {
     setContentType: (contentType: ContentType) => void;
     instance: AcquiredDevice;
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/ViewOnlyRadios.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/ViewOnlyRadios.tsx
index d688f814f7d..fcc46a09f6e 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/ViewOnlyRadios.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/ViewOnlyRadios.tsx
@@ -2,9 +2,11 @@ import styled, { useTheme } from 'styled-components';
 
 import { Text, Radio, Icon, useElevation, Row, Column, Paragraph } from '@trezor/components';
 import { Elevation, borders, mapElevationToBorder, spacings, spacingsPx } from '@trezor/theme';
+import { AcquiredDevice } from '@suite-common/suite-types';
+
 import { Translation } from 'src/components/suite';
+
 import { ContentType } from '../types';
-import { AcquiredDevice } from '@suite-common/suite-types';
 
 type ViewOnlyRadiosProps = {
     isViewOnlyActive: boolean;
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/WalletInstance.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/WalletInstance.tsx
index bfae93c329e..771d8ea89d1 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/WalletInstance.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/WalletInstance.tsx
@@ -1,13 +1,15 @@
-import styled, { css } from 'styled-components';
+import { useState } from 'react';
 
 import {
     selectDiscoveryByDeviceState,
     selectCurrentFiatRates,
     selectDeviceThunk,
+    selectDevice,
+    createDiscoveryThunk,
 } from '@suite-common/wallet-core';
-import { variables, Card, Divider, Icon, Tooltip } from '@trezor/components';
+import { Card, Icon, Tooltip, Row, Column, Text, Divider } from '@trezor/components';
 import { getAllAccounts, getTotalFiatBalance } from '@suite-common/wallet-utils';
-import { spacingsPx, typography } from '@trezor/theme';
+import { spacings, negativeSpacings } from '@trezor/theme';
 
 import {
     WalletLabeling,
@@ -18,72 +20,17 @@ import {
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { AcquiredDevice, ForegroundAppProps } from 'src/types/suite';
 import { selectLabelingDataForWallet } from 'src/reducers/suite/metadataReducer';
-import { useWalletLabeling } from '../../../../components/suite/labeling/WalletLabeling';
 import { METADATA_LABELING } from 'src/actions/suite/constants';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
 import { FiatHeader } from 'src/components/wallet/FiatHeader';
-import { useState } from 'react';
+import { redirectAfterWalletSelectedThunk } from 'src/actions/wallet/addWalletThunk';
+
+import { useWalletLabeling } from '../../../../components/suite/labeling/WalletLabeling';
 import { EjectConfirmation, EjectConfirmationDisableViewOnly } from './EjectConfirmation';
 import { ContentType } from '../types';
 import { ViewOnly } from './ViewOnly';
 import { EjectButton } from './EjectButton';
-import { redirectAfterWalletSelectedThunk } from 'src/actions/wallet/addWalletThunk';
-
-const RelativeContainer = styled.div`
-    position: relative;
-    border-radius: 16px;
-    overflow: hidden;
-`;
-
-const DividerWrapper = styled.div`
-    position: relative;
-    left: -${spacingsPx.xs};
-    width: calc(100% + ${spacingsPx.lg});
-`;
-
-const InstanceType = styled.div<{ $isSelected: boolean }>`
-    display: flex;
-    gap: ${spacingsPx.xxs};
-    align-items: center;
-    color: ${({ theme, $isSelected }) => ($isSelected ? theme.textDefault : theme.textSubdued)};
-    ${({ $isSelected }) => $isSelected && typography.highlight}
-    /* these styles ensure proper metadata behavior */
-    white-space: nowrap;
-    overflow: hidden;
-`;
 
-const InstanceTitle = styled.div`
-    font-weight: 500;
-    line-height: 1.57;
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-    font-size: ${variables.FONT_SIZE.SMALL};
-    font-variant-numeric: tabular-nums;
-`;
-
-const Col = styled.div<{ $grow?: number; $centerItems?: boolean }>`
-    display: flex;
-    flex-grow: ${({ $grow }) => $grow || 0};
-    flex-direction: column;
-    align-items: ${({ $centerItems }) => ($centerItems ? 'center' : 'flex-start')};
-
-    &:first-child {
-        cursor: pointer;
-    }
-`;
-
-const SelectedHighlight = styled.div`
-    ${({ theme }) => css`
-        &::before {
-            content: '';
-            position: absolute;
-            left: 0;
-            top: 0;
-            bottom: 0;
-            width: ${spacingsPx.xxs};
-            background: ${theme.backgroundSecondaryDefault};
-        }
-    `}
-`;
 interface WalletInstanceProps {
     instance: AcquiredDevice;
     enabled: boolean;
@@ -109,6 +56,7 @@ export const WalletInstance = ({
     const discoveryProcess = useSelector(state =>
         selectDiscoveryByDeviceState(state, instance.state),
     );
+    const device = useSelector(selectDevice);
     const { defaultAccountLabelString } = useWalletLabeling();
 
     const deviceAccounts = getAllAccounts(instance.state, accounts);
@@ -133,13 +81,25 @@ export const WalletInstance = ({
         e.stopPropagation();
     };
 
-    const handleClick = () => {
-        if (!editing) {
-            dispatch(selectDeviceThunk({ device: instance }));
-            dispatch(redirectAfterWalletSelectedThunk());
-            onCancel(false);
-        }
-    };
+    const handleClick = discoveryProcess
+        ? () => {
+              if (!editing) {
+                  dispatch(selectDeviceThunk({ device: instance }));
+                  dispatch(redirectAfterWalletSelectedThunk());
+                  onCancel(false);
+              }
+          }
+        : () => {
+              if (device && device.state?.staticSessionId) {
+                  dispatch(
+                      createDiscoveryThunk({
+                          deviceState: device?.state?.staticSessionId,
+                          device,
+                      }),
+                  );
+              }
+              onCancel(false);
+          };
 
     const isViewOnlyRendered = contentType === 'default' && enabled && discoveryProcess;
     const isEjectConfirmationRendered = contentType === 'eject-confirmation';
@@ -147,93 +107,95 @@ export const WalletInstance = ({
         contentType === 'disabling-view-only-ejects-wallet';
 
     return (
-        <RelativeContainer data-testid={dataTestBase}>
-            <EjectButton setContentType={setContentType} data-testid={dataTestBase} />
-            <Card
-                key={`${instance.instance}${instance.state}`}
-                paddingType="small"
-                onClick={handleClick}
-                tabIndex={0}
-                {...rest}
-            >
-                {isSelected && <SelectedHighlight />}
-
-                <Col $grow={1}>
-                    {discoveryProcess && (
-                        <InstanceType $isSelected={isSelected}>
-                            {!instance.useEmptyPassphrase && (
-                                <Tooltip content={<Translation id="TR_WALLET_PASSPHRASE_WALLET" />}>
-                                    <Icon name="asterisk" size={12} />
-                                </Tooltip>
-                            )}
-                            {instance.state ? (
-                                <MetadataLabeling
-                                    defaultVisibleValue={
-                                        walletLabel === undefined || walletLabel.trim() === ''
-                                            ? defaultWalletLabel
-                                            : walletLabel
-                                    }
-                                    payload={{
-                                        type: 'walletLabel',
-                                        entityKey: instance.state,
-                                        defaultValue: instance.state,
-                                        value: instance?.metadata[
-                                            METADATA_LABELING.ENCRYPTION_VERSION
-                                        ]
-                                            ? walletLabel
-                                            : '',
-                                    }}
-                                    defaultEditableValue={defaultWalletLabel}
-                                />
-                            ) : (
-                                <WalletLabeling device={instance} />
-                            )}
-                        </InstanceType>
-                    )}
-
-                    {!discoveryProcess && (
-                        <InstanceType $isSelected={isSelected}>
+        <Card
+            key={`${instance.instance}${instance.state}`}
+            paddingType="small"
+            onClick={handleClick}
+            tabIndex={0}
+            data-testid={dataTestBase}
+            isHiglighted={isSelected}
+            {...rest}
+        >
+            <Column alignItems="stretch">
+                <Text
+                    as="div"
+                    variant={isSelected ? 'default' : 'tertiary'}
+                    typographyStyle={isSelected ? 'highlight' : 'body'}
+                    ellipsisLineCount={1}
+                >
+                    <Row justifyContent="space-between">
+                        {discoveryProcess ? (
+                            <Row gap={spacings.xxs}>
+                                {!instance.useEmptyPassphrase && (
+                                    <Tooltip
+                                        content={<Translation id="TR_WALLET_PASSPHRASE_WALLET" />}
+                                    >
+                                        <Icon name="asterisk" size={12} />
+                                    </Tooltip>
+                                )}
+                                {instance.state?.staticSessionId ? (
+                                    <MetadataLabeling
+                                        defaultVisibleValue={
+                                            walletLabel === undefined || walletLabel.trim() === ''
+                                                ? defaultWalletLabel
+                                                : walletLabel
+                                        }
+                                        payload={{
+                                            type: 'walletLabel',
+                                            entityKey: instance.state.staticSessionId,
+                                            defaultValue: instance.state.staticSessionId,
+                                            value: instance?.metadata[
+                                                METADATA_LABELING.ENCRYPTION_VERSION
+                                            ]
+                                                ? walletLabel
+                                                : '',
+                                        }}
+                                        defaultEditableValue={defaultWalletLabel}
+                                    />
+                                ) : (
+                                    <WalletLabeling device={instance} />
+                                )}
+                            </Row>
+                        ) : (
                             <Translation id="TR_UNDISCOVERED_WALLET" />
-                        </InstanceType>
-                    )}
-
-                    <InstanceTitle>
-                        <HiddenPlaceholder>
-                            <FiatHeader
-                                size="medium"
-                                fiatAmount={instanceBalance.toString() ?? '0'}
-                                localCurrency={localCurrency}
-                            />
-                        </HiddenPlaceholder>
-                    </InstanceTitle>
-                </Col>
-
-                {(isViewOnlyRendered ||
-                    isEjectConfirmationRendered ||
-                    isDisablingViewOnlyEjectsWalletRendered) && (
-                    <DividerWrapper>
-                        <Divider />
-                    </DividerWrapper>
-                )}
-
-                {isViewOnlyRendered && (
-                    <ViewOnly setContentType={setContentType} instance={instance} />
-                )}
-                {isEjectConfirmationRendered && (
-                    <EjectConfirmation
-                        instance={instance}
-                        onClick={stopPropagation}
-                        onCancel={onEjectCancelClick}
-                    />
-                )}
-                {isDisablingViewOnlyEjectsWalletRendered && (
-                    <EjectConfirmationDisableViewOnly
-                        instance={instance}
-                        onClick={stopPropagation}
-                        onCancel={onEjectCancelClick}
+                        )}
+                        <EjectButton setContentType={setContentType} data-testid={dataTestBase} />
+                    </Row>
+                </Text>
+
+                <HiddenPlaceholder>
+                    <FiatHeader
+                        size="medium"
+                        fiatAmount={instanceBalance.toString() ?? '0'}
+                        localCurrency={localCurrency}
                     />
-                )}
-            </Card>
-        </RelativeContainer>
+                </HiddenPlaceholder>
+            </Column>
+
+            {(isViewOnlyRendered ||
+                isEjectConfirmationRendered ||
+                isDisablingViewOnlyEjectsWalletRendered) && (
+                <Divider
+                    margin={{ vertical: spacings.sm, horizontal: negativeSpacings.sm }}
+                    width="auto"
+                />
+            )}
+
+            {isViewOnlyRendered && <ViewOnly setContentType={setContentType} instance={instance} />}
+            {isEjectConfirmationRendered && (
+                <EjectConfirmation
+                    instance={instance}
+                    onClick={stopPropagation}
+                    onCancel={onEjectCancelClick}
+                />
+            )}
+            {isDisablingViewOnlyEjectsWalletRendered && (
+                <EjectConfirmationDisableViewOnly
+                    instance={instance}
+                    onClick={stopPropagation}
+                    onCancel={onEjectCancelClick}
+                />
+            )}
+        </Card>
     );
 };
diff --git a/packages/suite/src/views/suite/SwitchDevice/SwitchDevice.tsx b/packages/suite/src/views/suite/SwitchDevice/SwitchDevice.tsx
index 424b637f454..ab370ad2b8a 100644
--- a/packages/suite/src/views/suite/SwitchDevice/SwitchDevice.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/SwitchDevice.tsx
@@ -1,20 +1,13 @@
 import * as deviceUtils from '@suite-common/suite-utils';
 import { selectDevice, selectDevices } from '@suite-common/wallet-core';
-import { NewModal } from '@trezor/components';
+import { Column } from '@trezor/components';
+import { spacings } from '@trezor/theme';
 
 import { ForegroundAppProps } from 'src/types/suite';
 import { useSelector } from 'src/hooks/suite';
 
 import { DeviceItem } from './DeviceItem/DeviceItem';
 import { SwitchDeviceModal } from './SwitchDeviceModal';
-import styled from 'styled-components';
-import { spacingsPx } from '@trezor/theme';
-
-const Flex = styled.div`
-    display: flex;
-    flex-direction: column;
-    gap: ${spacingsPx.xs};
-`;
 
 export const SwitchDevice = ({ onCancel }: ForegroundAppProps) => {
     const selectedDevice = useSelector(selectDevice);
@@ -32,20 +25,18 @@ export const SwitchDevice = ({ onCancel }: ForegroundAppProps) => {
     }
 
     return (
-        <NewModal.Backdrop onClick={onCancel} alignment={{ x: 'left', y: 'top' }} padding={5}>
-            <SwitchDeviceModal isAnimationEnabled onCancel={onCancel}>
-                <Flex>
-                    {sortedDevices.map((device, index) => (
-                        <DeviceItem
-                            key={`${device.id}-${device.instance}`}
-                            device={device}
-                            instances={deviceUtils.getDeviceInstances(device, devices)}
-                            onCancel={onCancel}
-                            isFullHeaderVisible={index === 0}
-                        />
-                    ))}
-                </Flex>
-            </SwitchDeviceModal>
-        </NewModal.Backdrop>
+        <SwitchDeviceModal isAnimationEnabled onCancel={onCancel}>
+            <Column gap={spacings.xs} alignItems="stretch">
+                {sortedDevices.map((device, index) => (
+                    <DeviceItem
+                        key={`${device.id}-${device.instance}`}
+                        device={device}
+                        instances={deviceUtils.getDeviceInstances(device, devices)}
+                        onCancel={onCancel}
+                        isFullHeaderVisible={index === 0}
+                    />
+                ))}
+            </Column>
+        </SwitchDeviceModal>
     );
 };
diff --git a/packages/suite/src/views/suite/SwitchDevice/SwitchDeviceModal.tsx b/packages/suite/src/views/suite/SwitchDevice/SwitchDeviceModal.tsx
index 26668a5baf6..72b8933c1a6 100644
--- a/packages/suite/src/views/suite/SwitchDevice/SwitchDeviceModal.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/SwitchDeviceModal.tsx
@@ -1,13 +1,15 @@
 import { useEvent } from 'react-use';
+
 import styled from 'styled-components';
 import { motion } from 'framer-motion';
-import { spacingsPx } from '@trezor/theme';
+
+import { spacings } from '@trezor/theme';
+import { NewModal, Column } from '@trezor/components';
+
 import { TrafficLightOffset } from '../../../components/suite/TrafficLightOffset';
 
 type SwitchDeviceModalProps = {
     children?: React.ReactNode;
-    isCancelable?: boolean;
-    onBackClick?: () => void;
     onCancel?: () => void;
     'data-testid'?: string;
     isAnimationEnabled?: boolean;
@@ -17,14 +19,6 @@ const Container = styled.div`
     width: 378px;
 `;
 
-const DeviceItemsWrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    gap: ${spacingsPx.md};
-    flex: 1;
-`;
-
 const initial = {
     width: 279,
     height: 70,
@@ -43,25 +37,27 @@ export const SwitchDeviceModal = ({
     });
 
     return (
-        <TrafficLightOffset>
-            <Container
-                onClick={e => e.stopPropagation()} // needed because of the Backdrop implementation
-                data-testid={dataTest}
-            >
-                <DeviceItemsWrapper>
-                    <motion.div
-                        initial={isAnimationEnabled ? initial : false}
-                        exit={initial}
-                        animate={{
-                            width: 369,
-                            height: 'auto',
-                        }}
-                        style={{ originX: 0, originY: 0, overflow: 'hidden' }}
-                    >
-                        {children}
-                    </motion.div>
-                </DeviceItemsWrapper>
-            </Container>
-        </TrafficLightOffset>
+        <NewModal.Backdrop onClick={onCancel} alignment={{ x: 'left', y: 'top' }} padding={5}>
+            <TrafficLightOffset>
+                <Container
+                    onClick={e => e.stopPropagation()} // needed because of the Backdrop implementation
+                    data-testid={dataTest}
+                >
+                    <Column alignItems="flex-start" gap={spacings.md} flex="1">
+                        <motion.div
+                            initial={isAnimationEnabled ? initial : false}
+                            exit={initial}
+                            animate={{
+                                width: 369,
+                                height: 'auto',
+                            }}
+                            style={{ originX: 0, originY: 0, overflow: 'hidden' }}
+                        >
+                            {children}
+                        </motion.div>
+                    </Column>
+                </Container>
+            </TrafficLightOffset>
+        </NewModal.Backdrop>
     );
 };
diff --git a/packages/suite/src/views/suite/SwitchDevice/SwitchDeviceRenderer.tsx b/packages/suite/src/views/suite/SwitchDevice/SwitchDeviceRenderer.tsx
deleted file mode 100644
index 88a0e12d598..00000000000
--- a/packages/suite/src/views/suite/SwitchDevice/SwitchDeviceRenderer.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { ReactPortal } from 'react';
-import { createPortal } from 'react-dom';
-import { ModalProps } from '@trezor/components';
-import { useModalTarget } from 'src/support/suite/ModalContext';
-import { SwitchDeviceModal } from './SwitchDeviceModal';
-import { ModalEnvironment } from 'src/components/suite/modals/ModalEnvironment';
-
-export const SwitchDeviceRenderer = ({
-    headerComponent,
-    isCancelable,
-    onCancel,
-    isAnimationEnabled = false,
-    ...rest
-}: ModalProps & { isAnimationEnabled?: boolean }): ReactPortal | null => {
-    const modalTarget = useModalTarget();
-
-    if (!modalTarget) return null;
-
-    const modal = (
-        <ModalEnvironment
-            onClickBackdrop={isCancelable ? onCancel : undefined}
-            alignment={{ x: 'left', y: 'top' }}
-        >
-            <SwitchDeviceModal
-                isAnimationEnabled={isAnimationEnabled}
-                onCancel={onCancel}
-                {...rest}
-            />
-        </ModalEnvironment>
-    );
-
-    return createPortal(modal, modalTarget);
-};
diff --git a/packages/suite/src/views/suite/bridge-requested/index.tsx b/packages/suite/src/views/suite/bridge-requested/index.tsx
index ddb15958071..209b75d7ae0 100644
--- a/packages/suite/src/views/suite/bridge-requested/index.tsx
+++ b/packages/suite/src/views/suite/bridge-requested/index.tsx
@@ -1,10 +1,17 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
+
+import { Button, Card, Image, Text } from '@trezor/components';
+import { desktopApi } from '@trezor/suite-desktop-api';
+import { isDesktop } from '@trezor/env-utils';
+import { spacings } from '@trezor/theme';
+
+import { selectIsDebugModeActive } from 'src/reducers/suite/suiteReducer';
 import { Translation, Modal, Metadata } from 'src/components/suite';
-import { Button, Image } from '@trezor/components';
 import { goto } from 'src/actions/suite/routerActions';
-import { useDispatch, useLayout } from 'src/hooks/suite';
-import { desktopApi } from '@trezor/suite-desktop-api';
+import { useDispatch, useLayout, useSelector } from 'src/hooks/suite';
+import { AutoStart } from 'src/views/settings/SettingsGeneral/AutoStart';
 
 const StyledModal = styled(Modal)`
     ${Modal.BottomBar} {
@@ -44,6 +51,7 @@ export const BridgeRequested = () => {
     };
 
     useLayout('Bridge');
+    const isDebugModeActive = useSelector(selectIsDebugModeActive);
 
     if (confirmGoToWallet) {
         return (
@@ -93,6 +101,21 @@ export const BridgeRequested = () => {
         >
             <Metadata title="Bridge | Trezor Suite" />
             <StyledImage image="CONNECT_DEVICE" width="360" />
+
+            {isDesktop() && isDebugModeActive && (
+                <>
+                    <Text
+                        typographyStyle="hint"
+                        variant="tertiary"
+                        margin={{ bottom: spacings.md }}
+                    >
+                        <Translation id="TR_BRIDGE_TIP_AUTOSTART" />
+                    </Text>
+                    <Card>
+                        <AutoStart />
+                    </Card>
+                </>
+            )}
         </StyledModal>
     );
 };
diff --git a/packages/suite/src/views/suite/bridge/index.tsx b/packages/suite/src/views/suite/bridge/index.tsx
index 04f3274cb76..eea739753a7 100644
--- a/packages/suite/src/views/suite/bridge/index.tsx
+++ b/packages/suite/src/views/suite/bridge/index.tsx
@@ -1,11 +1,13 @@
 import styled from 'styled-components';
-import { Translation, Modal, Metadata } from 'src/components/suite';
+
 import { Button, Link } from '@trezor/components';
+import { DATA_URL } from '@trezor/urls';
+
+import { Translation, Modal, Metadata } from 'src/components/suite';
 import { goto } from 'src/actions/suite/routerActions';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { isWebUsb } from 'src/utils/suite/transport';
 import { useOpenSuiteDesktop } from 'src/hooks/suite/useOpenSuiteDesktop';
-import { DATA_URL } from '@trezor/urls';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledButton = styled(Button)`
diff --git a/packages/suite/src/views/suite/notifications/index.tsx b/packages/suite/src/views/suite/notifications/index.tsx
index efe2deec44a..8dcc03d6eba 100644
--- a/packages/suite/src/views/suite/notifications/index.tsx
+++ b/packages/suite/src/views/suite/notifications/index.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { Card } from '@trezor/components';
 
 import { Notifications, Translation } from 'src/components/suite';
diff --git a/packages/suite/src/views/suite/version/index.tsx b/packages/suite/src/views/suite/version/index.tsx
index 4b69a7c5bb0..59f70ceb3f1 100644
--- a/packages/suite/src/views/suite/version/index.tsx
+++ b/packages/suite/src/views/suite/version/index.tsx
@@ -1,8 +1,10 @@
 import styled from 'styled-components';
+
 import { Link, H2, Paragraph } from '@trezor/components';
-import { Modal } from 'src/components/suite';
 import { getCommitHash, getSuiteVersion } from '@trezor/env-utils';
 
+import { Modal } from 'src/components/suite';
+
 const Wrapper = styled.div`
     display: flex;
     flex-direction: column;
diff --git a/packages/suite/src/views/view-only/MacWindow.tsx b/packages/suite/src/views/view-only/MacWindow.tsx
index d93d3765659..187cb2ddcc5 100644
--- a/packages/suite/src/views/view-only/MacWindow.tsx
+++ b/packages/suite/src/views/view-only/MacWindow.tsx
@@ -1,3 +1,7 @@
+import { ReactNode } from 'react';
+
+import styled from 'styled-components';
+
 import { ElevationContext, useElevation, variables } from '@trezor/components';
 import {
     Elevation,
@@ -6,8 +10,6 @@ import {
     mapElevationToBorder,
     spacingsPx,
 } from '@trezor/theme';
-import { ReactNode } from 'react';
-import styled from 'styled-components';
 
 const MAC_WINDOW_HEIGHT = '184px';
 
diff --git a/packages/suite/src/views/view-only/ViewOnlyPromo.tsx b/packages/suite/src/views/view-only/ViewOnlyPromo.tsx
index 9330fdb9426..ad107e6889f 100644
--- a/packages/suite/src/views/view-only/ViewOnlyPromo.tsx
+++ b/packages/suite/src/views/view-only/ViewOnlyPromo.tsx
@@ -1,7 +1,9 @@
 import styled from 'styled-components';
-import { ViewOnlyPromoContent } from './ViewOnlyPromoContent';
+
 import { WelcomeLayout } from 'src/components/suite';
 
+import { ViewOnlyPromoContent } from './ViewOnlyPromoContent';
+
 const Content = styled.div`
     display: flex;
     flex-direction: column;
diff --git a/packages/suite/src/views/view-only/ViewOnlyPromoContent.tsx b/packages/suite/src/views/view-only/ViewOnlyPromoContent.tsx
index 3270baf7c8b..f164c080e45 100644
--- a/packages/suite/src/views/view-only/ViewOnlyPromoContent.tsx
+++ b/packages/suite/src/views/view-only/ViewOnlyPromoContent.tsx
@@ -1,3 +1,7 @@
+import { ReactNode } from 'react';
+
+import styled from 'styled-components';
+
 import {
     Button,
     Card,
@@ -9,22 +13,22 @@ import {
     useElevation,
     variables,
 } from '@trezor/components';
-import { FormattedCryptoAmount, Translation } from '../../components/suite';
-import styled from 'styled-components';
 import { Elevation, borders, mapElevationToBackground, spacings, spacingsPx } from '@trezor/theme';
+import { selectDevice, toggleRememberDevice } from '@suite-common/wallet-core';
+import { DEFAULT_FLAGSHIP_MODEL } from '@suite-common/suite-constants';
+import { analytics, EventType } from '@trezor/suite-analytics';
+
+import { goto } from 'src/actions/suite/routerActions';
+
+import { FormattedCryptoAmount, Translation } from '../../components/suite';
 import { PriceChartLine } from './images/PriceChartLine';
-import { ReactNode } from 'react';
 import { DeviceConnectionText } from '../suite/SwitchDevice/DeviceItem/DeviceConnectionText';
 import { DeviceDetail } from '../suite/SwitchDevice/DeviceItem/DeviceDetail';
 import { MacWindow } from './MacWindow';
 import { useDispatch, useSelector } from '../../hooks/suite';
-import { selectDevice, toggleRememberDevice } from '@suite-common/wallet-core';
 import { setFlag } from '../../actions/suite/suiteActions';
 import { IllustrativeExample } from './images/IllustrativeExample';
 import { IllustrativeExampleArrow } from './images/IllustrativeExampleArrow';
-import { goto } from 'src/actions/suite/routerActions';
-import { DEFAULT_FLAGSHIP_MODEL } from '@suite-common/suite-constants';
-import { analytics, EventType } from '@trezor/suite-analytics';
 
 const Callout = styled.div`
     display: flex;
@@ -54,12 +58,10 @@ const DeviceImage = styled(Image)`
     object-fit: contain;
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
 const SmallDeviceImage = styled(DeviceImage)`
     width: 18px;
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
 const LargeDeviceImage = styled(DeviceImage)`
     width: 93px;
 `;
diff --git a/packages/suite/src/views/view-only/ViewOnlyTooltip.tsx b/packages/suite/src/views/view-only/ViewOnlyTooltip.tsx
index 9d668c3952c..164ccba25ff 100644
--- a/packages/suite/src/views/view-only/ViewOnlyTooltip.tsx
+++ b/packages/suite/src/views/view-only/ViewOnlyTooltip.tsx
@@ -1,8 +1,10 @@
+import styled, { useTheme } from 'styled-components';
+
 import { Button, Icon, Text, Tooltip } from '@trezor/components';
 import { borders, palette, spacingsPx, zIndices } from '@trezor/theme';
+
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { selectSuiteFlags } from 'src/reducers/suite/suiteReducer';
-import styled, { useTheme } from 'styled-components';
 import { setFlag } from 'src/actions/suite/suiteActions';
 import { Translation } from 'src/components/suite';
 
diff --git a/packages/suite/src/views/wallet/anonymize/components/CoinjoinConfirmation.tsx b/packages/suite/src/views/wallet/anonymize/components/CoinjoinConfirmation.tsx
index cff97fca022..b02c7bf5979 100644
--- a/packages/suite/src/views/wallet/anonymize/components/CoinjoinConfirmation.tsx
+++ b/packages/suite/src/views/wallet/anonymize/components/CoinjoinConfirmation.tsx
@@ -1,10 +1,8 @@
 import { useState } from 'react';
-import { useDispatch, useSelector } from 'src/hooks/suite';
+
 import styled from 'styled-components';
 
 import { Account } from '@suite-common/wallet-types';
-import { Translation, TrezorLink } from 'src/components/suite';
-import { Error } from 'src/components/suite/Error';
 import {
     Button,
     Card,
@@ -18,12 +16,17 @@ import {
 } from '@trezor/components';
 import { spacingsPx, typography } from '@trezor/theme';
 import { DATA_TOS_URL, ZKSNACKS_TERMS_URL } from '@trezor/urls';
+
+import { Error } from 'src/components/suite/Error';
+import { Translation, TrezorLink } from 'src/components/suite';
+import { useDispatch, useSelector } from 'src/hooks/suite';
 import { startCoinjoinSession } from 'src/actions/wallet/coinjoinAccountActions';
 import {
     selectCoinjoinClient,
     selectStartCoinjoinSessionArguments,
 } from 'src/reducers/wallet/coinjoinReducer';
 import { useCoinjoinSessionBlockers } from 'src/hooks/coinjoin/useCoinjoinSessionBlockers';
+
 import { Tile, TileProps } from './Tile';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
diff --git a/packages/suite/src/views/wallet/anonymize/components/Tile.tsx b/packages/suite/src/views/wallet/anonymize/components/Tile.tsx
index 72fb4e66855..87dc0f196a2 100644
--- a/packages/suite/src/views/wallet/anonymize/components/Tile.tsx
+++ b/packages/suite/src/views/wallet/anonymize/components/Tile.tsx
@@ -1,4 +1,5 @@
 import { ReactNode } from 'react';
+
 import styled, { css } from 'styled-components';
 
 import { Card, Image, PngImage, variables } from '@trezor/components';
diff --git a/packages/suite/src/views/wallet/coinmarket/DCA/index.tsx b/packages/suite/src/views/wallet/coinmarket/DCA/CoinmarketDCALanding.tsx
similarity index 92%
rename from packages/suite/src/views/wallet/coinmarket/DCA/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/DCA/CoinmarketDCALanding.tsx
index 8fa6401cfa1..11876a3aaf8 100644
--- a/packages/suite/src/views/wallet/coinmarket/DCA/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/DCA/CoinmarketDCALanding.tsx
@@ -1,4 +1,7 @@
 import React from 'react';
+
+import styled from 'styled-components';
+
 import {
     Card,
     Column,
@@ -11,16 +14,15 @@ import {
     Row,
     Text,
 } from '@trezor/components';
-import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
-import { withSelectedAccountLoaded } from 'src/components/wallet';
-import CoinmarketLayout from '../common/CoinmarketLayoutNew/CoinmarketLayout';
-import styled from 'styled-components';
 import { borders, palette, spacings, spacingsPx } from '@trezor/theme';
-import { Translation, TrezorLink } from 'src/components/suite';
 import { COINMARKET_DOWNLOAD_INVITY_APP_URL } from '@trezor/urls';
-import { useSelector } from 'src/hooks/suite';
 import { variables } from '@trezor/components/src/config';
 
+import { Translation, TrezorLink } from 'src/components/suite';
+import { useSelector } from 'src/hooks/suite';
+import { CoinmarketLayout } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayout';
+import { CoinmarketContainer } from 'src/views/wallet/coinmarket/common/CoinmarketContainer';
+
 const IconWrapper = styled.div`
     display: flex;
     flex-shrink: 0;
@@ -101,12 +103,12 @@ const FeatureItem = ({ icon, featureNumber }: FeatureItemProps) => (
     </Row>
 );
 
-const DCALanding = (props: UseCoinmarketProps) => {
+const DCALanding = () => {
     const currentTheme = useSelector(state => state.suite.settings.theme.variant);
     const isLightTheme = currentTheme !== 'dark';
 
     return (
-        <CoinmarketLayout selectedAccount={props.selectedAccount}>
+        <CoinmarketLayout>
             <Card paddingType="small">
                 <ColumnsWrapper>
                     <Column1>
@@ -156,6 +158,4 @@ const DCALanding = (props: UseCoinmarketProps) => {
     );
 };
 
-export default withSelectedAccountLoaded(DCALanding, {
-    title: 'TR_NAV_DCA',
-});
+export const CoinmarketDCALanding = () => <CoinmarketContainer SectionComponent={DCALanding} />;
diff --git a/packages/suite/src/views/wallet/coinmarket/buy/CoinmarketBuyConfirm.tsx b/packages/suite/src/views/wallet/coinmarket/buy/CoinmarketBuyConfirm.tsx
index 9c84affaa59..0764e8f59b9 100644
--- a/packages/suite/src/views/wallet/coinmarket/buy/CoinmarketBuyConfirm.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/buy/CoinmarketBuyConfirm.tsx
@@ -1,13 +1,12 @@
-import { withSelectedAccountLoaded } from 'src/components/wallet';
 import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
-import useCoinmarketBuyForm from 'src/hooks/wallet/coinmarket/form/useCoinmarketBuyForm';
+import { useCoinmarketBuyForm } from 'src/hooks/wallet/coinmarket/form/useCoinmarketBuyForm';
 import { CoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-import { withCoinmarketLayoutWrap } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/withCoinmarketLayoutWrap';
 import { CoinmarketSelectedOffer } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOffer';
+import { CoinmarketContainer } from 'src/views/wallet/coinmarket/common/CoinmarketContainer';
 
-const CoinmarketBuyConfirmComponent = (props: UseCoinmarketProps) => {
+const CoinmarketBuyConfirmComponent = ({ selectedAccount }: UseCoinmarketProps) => {
     const coinmarketBuyContextValues = useCoinmarketBuyForm({
-        ...props,
+        selectedAccount,
         pageType: 'confirm',
     });
 
@@ -18,11 +17,6 @@ const CoinmarketBuyConfirmComponent = (props: UseCoinmarketProps) => {
     );
 };
 
-export const CoinmarketBuyConfirm = withSelectedAccountLoaded(
-    withCoinmarketLayoutWrap(CoinmarketBuyConfirmComponent, {
-        backRoute: 'wallet-coinmarket-buy',
-    }),
-    {
-        title: 'TR_NAV_BUY',
-    },
+export const CoinmarketBuyConfirm = () => (
+    <CoinmarketContainer SectionComponent={CoinmarketBuyConfirmComponent} />
 );
diff --git a/packages/suite/src/views/wallet/coinmarket/buy/CoinmarketBuyDetail.tsx b/packages/suite/src/views/wallet/coinmarket/buy/CoinmarketBuyDetail.tsx
new file mode 100644
index 00000000000..805c2c44276
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/buy/CoinmarketBuyDetail.tsx
@@ -0,0 +1,24 @@
+import {
+    CoinmarketDetailContext,
+    useCoinmarketDetail,
+} from 'src/hooks/wallet/coinmarket/useCoinmarketDetail';
+import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
+import { CoinmarketContainer } from 'src/views/wallet/coinmarket/common/CoinmarketContainer';
+import { CoinmarketDetailBuy } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuy';
+
+const CoinmarketBuyDetailComponent = ({ selectedAccount }: UseCoinmarketProps) => {
+    const coinmarketDetailContext = useCoinmarketDetail({
+        selectedAccount,
+        tradeType: 'buy',
+    });
+
+    return (
+        <CoinmarketDetailContext.Provider value={coinmarketDetailContext}>
+            <CoinmarketDetailBuy />
+        </CoinmarketDetailContext.Provider>
+    );
+};
+
+export const CoinmarketBuyDetail = () => (
+    <CoinmarketContainer SectionComponent={CoinmarketBuyDetailComponent} />
+);
diff --git a/packages/suite/src/views/wallet/coinmarket/buy/CoinmarketBuyForm.tsx b/packages/suite/src/views/wallet/coinmarket/buy/CoinmarketBuyForm.tsx
new file mode 100644
index 00000000000..13863ccfde1
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/buy/CoinmarketBuyForm.tsx
@@ -0,0 +1,22 @@
+import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
+import { useCoinmarketBuyForm } from 'src/hooks/wallet/coinmarket/form/useCoinmarketBuyForm';
+import { CoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
+import { CoinmarketFormLayout } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormLayout';
+import { CoinmarketLayout } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayout';
+import { CoinmarketContainer } from 'src/views/wallet/coinmarket/common/CoinmarketContainer';
+
+const CoinmarketBuyComponent = ({ selectedAccount }: UseCoinmarketProps) => {
+    const coinmarketBuyContextValues = useCoinmarketBuyForm({ selectedAccount });
+
+    return (
+        <CoinmarketLayout>
+            <CoinmarketFormContext.Provider value={coinmarketBuyContextValues}>
+                <CoinmarketFormLayout />
+            </CoinmarketFormContext.Provider>
+        </CoinmarketLayout>
+    );
+};
+
+export const CoinmarketBuyForm = () => (
+    <CoinmarketContainer SectionComponent={CoinmarketBuyComponent} />
+);
diff --git a/packages/suite/src/views/wallet/coinmarket/buy/CoinmarketBuyOffers.tsx b/packages/suite/src/views/wallet/coinmarket/buy/CoinmarketBuyOffers.tsx
new file mode 100644
index 00000000000..d1b57f64805
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/buy/CoinmarketBuyOffers.tsx
@@ -0,0 +1,22 @@
+import { useCoinmarketBuyForm } from 'src/hooks/wallet/coinmarket/form/useCoinmarketBuyForm';
+import { CoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
+import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
+import { CoinmarketContainer } from 'src/views/wallet/coinmarket/common/CoinmarketContainer';
+import { CoinmarketOffers } from 'src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffers';
+
+const CoinmarketBuyOffersComponent = ({ selectedAccount }: UseCoinmarketProps) => {
+    const coinmarketBuyFormContextValues = useCoinmarketBuyForm({
+        selectedAccount,
+        pageType: 'offers',
+    });
+
+    return (
+        <CoinmarketFormContext.Provider value={coinmarketBuyFormContextValues}>
+            <CoinmarketOffers />
+        </CoinmarketFormContext.Provider>
+    );
+};
+
+export const CoinmarketBuyOffers = () => (
+    <CoinmarketContainer SectionComponent={CoinmarketBuyOffersComponent} />
+);
diff --git a/packages/suite/src/views/wallet/coinmarket/buy/detail/index.tsx b/packages/suite/src/views/wallet/coinmarket/buy/detail/index.tsx
deleted file mode 100644
index ca9634217dc..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/buy/detail/index.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import styled from 'styled-components';
-import { withSelectedAccountLoaded } from 'src/components/wallet';
-import Detail from './Detail';
-import {
-    CoinmarketDetailContext,
-    useCoinmarketDetail,
-} from 'src/hooks/wallet/coinmarket/useCoinmarketDetail';
-import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
-import { withCoinmarketLayoutWrap } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/withCoinmarketLayoutWrap';
-
-const Wrapper = styled.div`
-    display: flex;
-    width: 100%;
-    flex-direction: column;
-`;
-
-const DetailIndex = (props: UseCoinmarketProps) => {
-    const coinmarketDetailContext = useCoinmarketDetail({
-        selectedAccount: props.selectedAccount,
-        tradeType: 'buy',
-    });
-
-    return (
-        <CoinmarketDetailContext.Provider value={coinmarketDetailContext}>
-            <Wrapper>
-                <Detail />
-            </Wrapper>
-        </CoinmarketDetailContext.Provider>
-    );
-};
-
-export default withSelectedAccountLoaded(
-    withCoinmarketLayoutWrap(DetailIndex, {
-        backRoute: 'wallet-coinmarket-buy',
-    }),
-    {
-        title: 'TR_NAV_BUY',
-    },
-);
diff --git a/packages/suite/src/views/wallet/coinmarket/buy/index.tsx b/packages/suite/src/views/wallet/coinmarket/buy/index.tsx
deleted file mode 100644
index bbdd49740ec..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/buy/index.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { withSelectedAccountLoaded } from 'src/components/wallet';
-import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
-import CoinmarketLayout from '../common/CoinmarketLayoutNew/CoinmarketLayout';
-import { CoinmarketFormLayout } from '../common/CoinmarketForm/CoinmarketFormLayout';
-import useCoinmarketBuyForm from 'src/hooks/wallet/coinmarket/form/useCoinmarketBuyForm';
-import { CoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-
-const CoinmarketBuy = (props: UseCoinmarketProps) => {
-    const coinmarketBuyContextValues = useCoinmarketBuyForm(props);
-
-    return (
-        <CoinmarketLayout selectedAccount={props.selectedAccount}>
-            <CoinmarketFormContext.Provider value={coinmarketBuyContextValues}>
-                <CoinmarketFormLayout />
-            </CoinmarketFormContext.Provider>
-        </CoinmarketLayout>
-    );
-};
-
-export default withSelectedAccountLoaded(CoinmarketBuy, {
-    title: 'TR_NAV_BUY',
-});
diff --git a/packages/suite/src/views/wallet/coinmarket/buy/offers/Offers/index.tsx b/packages/suite/src/views/wallet/coinmarket/buy/offers/Offers/index.tsx
deleted file mode 100644
index 6c90fdc4b01..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/buy/offers/Offers/index.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { CoinmarketFooter } from 'src/views/wallet/coinmarket/common';
-import CoinmarketOffers from 'src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffers';
-
-const Offers = () => {
-    return (
-        <div>
-            <CoinmarketOffers />
-            <CoinmarketFooter />
-        </div>
-    );
-};
-
-export default Offers;
diff --git a/packages/suite/src/views/wallet/coinmarket/buy/offers/index.tsx b/packages/suite/src/views/wallet/coinmarket/buy/offers/index.tsx
deleted file mode 100644
index c8896faa945..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/buy/offers/index.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { withSelectedAccountLoaded } from 'src/components/wallet';
-import Offers from './Offers';
-import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
-import { CoinmarketOffersContext } from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
-import useCoinmarketBuyForm from 'src/hooks/wallet/coinmarket/form/useCoinmarketBuyForm';
-import { CoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-import { withCoinmarketLayoutWrap } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/withCoinmarketLayoutWrap';
-
-const OffersIndex = (props: UseCoinmarketProps) => {
-    const coinmarketBuyFormContextValues = useCoinmarketBuyForm({
-        ...props,
-        pageType: 'offers',
-    });
-
-    // CoinmarketOffersContext.Provider is temporary FIX
-    return (
-        <CoinmarketFormContext.Provider value={coinmarketBuyFormContextValues}>
-            <CoinmarketOffersContext.Provider value={coinmarketBuyFormContextValues}>
-                <Offers />
-            </CoinmarketOffersContext.Provider>
-        </CoinmarketFormContext.Provider>
-    );
-};
-
-export default withSelectedAccountLoaded(
-    withCoinmarketLayoutWrap(OffersIndex, {
-        backRoute: 'wallet-coinmarket-buy',
-    }),
-    {
-        title: 'TR_NAV_BUY',
-    },
-);
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketAddressOptions.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketAddressOptions.tsx
index e1f91b4b154..ba512c857a8 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketAddressOptions.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketAddressOptions.tsx
@@ -1,23 +1,27 @@
 import { useEffect, ReactElement } from 'react';
 import { UseFormReturn, Control, Controller } from 'react-hook-form';
 import type { MenuPlacement } from 'react-select';
+
 import styled from 'styled-components';
+import { CryptoId } from 'invity-api';
 
 import type { AccountAddress } from '@trezor/connect';
-import { Translation } from 'src/components/suite';
 import { variables, Select } from '@trezor/components';
+import { spacingsPx, typography } from '@trezor/theme';
+import { formatAmount } from '@suite-common/wallet-utils';
+import { networks } from '@suite-common/wallet-config';
+
+import { Translation } from 'src/components/suite';
 import type { Account } from 'src/types/wallet';
 import { useAccountAddressDictionary } from 'src/hooks/wallet/useAccounts';
 import { selectLabelingDataForAccount } from 'src/reducers/suite/metadataReducer';
 import { useSelector } from 'src/hooks/suite';
-import { CoinmarketBuyAddressOptionsType } from 'src/types/coinmarket/coinmarketOffers';
 import { CoinmarketBalance } from 'src/views/wallet/coinmarket/common/CoinmarketBalance';
-import { spacingsPx, typography } from '@trezor/theme';
-import { formatAmount } from '@suite-common/wallet-utils';
-import { getNetworkDecimals } from 'src/utils/wallet/coinmarket/coinmarketUtils';
-import { networks } from '@suite-common/wallet-config';
+import { getCoinmarketNetworkDecimals } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
-import { CryptoId } from 'invity-api';
+import { isCoinmarketExchangeContext } from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
+import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
+import { FORM_SEND_CRYPTO_CURRENCY_SELECT } from 'src/constants/wallet/coinmarket/form';
 
 const AddressWrapper = styled.div`
     display: flex;
@@ -62,6 +66,10 @@ const buildOptions = (addresses: Account['addresses']) => {
     return [unused, used];
 };
 
+type CoinmarketBuyAddressOptionsType = {
+    address?: string;
+};
+
 interface CoinmarketAddressOptionsProps<TFieldValues extends CoinmarketBuyAddressOptionsType>
     extends Pick<UseFormReturn<TFieldValues>, 'setValue'> {
     control: Control<TFieldValues>;
@@ -81,6 +89,7 @@ export const CoinmarketAddressOptions = <TFieldValues extends CoinmarketBuyAddre
     // Type assertion allowing to make the component reusable, see https://stackoverflow.com/a/73624072.
     const { control, setValue } =
         props as unknown as UseFormReturn<CoinmarketBuyAddressOptionsType>;
+    const context = useCoinmarketFormContext();
 
     const addresses = account?.addresses;
     const addressDictionary = useAccountAddressDictionary(account);
@@ -111,9 +120,14 @@ export const CoinmarketAddressOptions = <TFieldValues extends CoinmarketBuyAddre
                     formatOptionLabel={(accountAddress: AccountAddress) => {
                         if (!accountAddress || !account || !receiveSymbol) return null;
 
-                        const networkDecimals = getNetworkDecimals(
-                            networks[account.symbol].decimals,
-                        );
+                        const sendCryptoSelect = isCoinmarketExchangeContext(context)
+                            ? context.getValues(FORM_SEND_CRYPTO_CURRENCY_SELECT)
+                            : undefined;
+
+                        const networkDecimals = getCoinmarketNetworkDecimals({
+                            sendCryptoSelect,
+                            network: networks[account.symbol],
+                        });
                         const balance = accountAddress.balance
                             ? formatAmount(accountAddress.balance, networkDecimals)
                             : accountAddress.balance;
@@ -130,6 +144,7 @@ export const CoinmarketAddressOptions = <TFieldValues extends CoinmarketBuyAddre
                                             balance={balance}
                                             cryptoSymbolLabel={cryptoIdToCoinSymbol(receiveSymbol)}
                                             networkSymbol={account.symbol}
+                                            sendCryptoSelect={sendCryptoSelect}
                                         />
                                         <span>•</span>
                                         <span>{accountAddress.path}</span>
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketBalance.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketBalance.tsx
index b19dfea91ef..cec17404a85 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketBalance.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketBalance.tsx
@@ -1,20 +1,16 @@
 import { networks, NetworkSymbol } from '@suite-common/wallet-config';
 import { TokenAddress } from '@suite-common/wallet-types';
-import { amountToSatoshi } from '@suite-common/wallet-utils';
-import { typography } from '@trezor/theme';
+import { amountToSmallestUnit } from '@suite-common/wallet-utils';
+import { Text } from '@trezor/components';
+
 import { FiatValue, HiddenPlaceholder, Translation } from 'src/components/suite';
 import { useFiatFromCryptoValue } from 'src/hooks/suite/useFiatFromCryptoValue';
 import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
+import { CoinmarketAccountOptionsGroupOptionProps } from 'src/types/coinmarket/coinmarket';
 import {
     coinmarketGetAccountLabel,
-    getNetworkDecimals,
+    getCoinmarketNetworkDecimals,
 } from 'src/utils/wallet/coinmarket/coinmarketUtils';
-import styled from 'styled-components';
-
-const CoinmarketBalanceWrapper = styled.div`
-    ${typography.label}
-    color: ${({ theme }) => theme.textSubdued};
-`;
 
 interface CoinmarketBalanceProps {
     balance: string | undefined;
@@ -23,6 +19,7 @@ interface CoinmarketBalanceProps {
     tokenAddress?: TokenAddress | undefined;
     showOnlyAmount?: boolean;
     amountInCrypto?: boolean;
+    sendCryptoSelect?: CoinmarketAccountOptionsGroupOptionProps;
 }
 
 export const CoinmarketBalance = ({
@@ -32,14 +29,18 @@ export const CoinmarketBalance = ({
     tokenAddress,
     showOnlyAmount,
     amountInCrypto,
+    sendCryptoSelect,
 }: CoinmarketBalanceProps) => {
     const { shouldSendInSats } = useBitcoinAmountUnit(networkSymbol);
     const balanceCurrency = coinmarketGetAccountLabel(cryptoSymbolLabel ?? '', shouldSendInSats);
-    const networkDecimals = getNetworkDecimals(networks[networkSymbol].decimals);
+    const networkDecimals = getCoinmarketNetworkDecimals({
+        sendCryptoSelect,
+        network: networks[networkSymbol],
+    });
     const stringBalance = !isNaN(Number(balance)) ? balance : '0';
     const formattedBalance =
         stringBalance && shouldSendInSats
-            ? amountToSatoshi(stringBalance, networkDecimals)
+            ? amountToSmallestUnit(stringBalance, networkDecimals)
             : stringBalance;
 
     const { fiatAmount } = useFiatFromCryptoValue({
@@ -48,10 +49,10 @@ export const CoinmarketBalance = ({
     });
 
     if (showOnlyAmount) {
-        if (!balance ?? isNaN(Number(balance))) return null;
+        if (Number(balance) === 0 || isNaN(Number(balance))) return null;
 
         return (
-            <CoinmarketBalanceWrapper>
+            <Text variant="tertiary" typographyStyle="label">
                 &asymp;{' '}
                 {!amountInCrypto ? (
                     <HiddenPlaceholder>
@@ -60,8 +61,7 @@ export const CoinmarketBalance = ({
                 ) : (
                     stringBalance &&
                     fiatAmount &&
-                    networkSymbol &&
-                    stringBalance !== '0' && (
+                    networkSymbol && (
                         <FiatValue
                             amount={stringBalance}
                             symbol={networkSymbol}
@@ -69,12 +69,12 @@ export const CoinmarketBalance = ({
                         />
                     )
                 )}
-            </CoinmarketBalanceWrapper>
+            </Text>
         );
     }
 
     return (
-        <CoinmarketBalanceWrapper>
+        <Text variant="tertiary" typographyStyle="label">
             <Translation id="TR_BALANCE" />
             {': '}
             <HiddenPlaceholder>
@@ -92,6 +92,6 @@ export const CoinmarketBalance = ({
                     )
                 </>
             )}
-        </CoinmarketBalanceWrapper>
+        </Text>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketCoinLogo.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketCoinLogo.tsx
index 4002397acf7..9ea7cc42f52 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketCoinLogo.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketCoinLogo.tsx
@@ -1,7 +1,9 @@
+import styled from 'styled-components';
+
 import { AssetLogo } from '@trezor/components';
+
 import { CoinmarketCoinLogoProps } from 'src/types/coinmarket/coinmarket';
 import { parseCryptoId } from 'src/utils/wallet/coinmarket/coinmarketUtils';
-import styled from 'styled-components';
 
 const Wrapper = styled.div``;
 
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketContainer.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketContainer.tsx
new file mode 100644
index 00000000000..b0f59dee0f5
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketContainer.tsx
@@ -0,0 +1,24 @@
+import { ElementType } from 'react';
+
+import { useSelector } from 'src/hooks/suite';
+import { CoinmarketFooter } from 'src/views/wallet/coinmarket/common/CoinmarketFooter/CoinmarketFooter';
+import { CoinmarketLayoutHeader } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutHeader';
+
+export interface CoinmarketContainerProps {
+    SectionComponent: ElementType;
+}
+
+export const CoinmarketContainer = ({ SectionComponent }: CoinmarketContainerProps) => {
+    const selectedAccount = useSelector(state => state.wallet.selectedAccount);
+
+    if (selectedAccount.status !== 'loaded') {
+        return <CoinmarketLayoutHeader />;
+    }
+
+    return (
+        <CoinmarketLayoutHeader>
+            <SectionComponent selectedAccount={selectedAccount} />
+            <CoinmarketFooter />
+        </CoinmarketLayoutHeader>
+    );
+};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketCryptoAmount.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketCryptoAmount.tsx
index 886586e93c4..9b202339058 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketCryptoAmount.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketCryptoAmount.tsx
@@ -1,10 +1,12 @@
-import { spacings } from '@trezor/theme';
-import { FormattedCryptoAmount } from 'src/components/suite';
 import styled from 'styled-components';
+import { CryptoId } from 'invity-api';
+
+import { spacings } from '@trezor/theme';
 import { Row } from '@trezor/components';
+
+import { FormattedCryptoAmount } from 'src/components/suite';
 import { CoinmarketCoinLogo } from 'src/views/wallet/coinmarket/common/CoinmarketCoinLogo';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
-import { CryptoId } from 'invity-api';
 import { CoinmarketTestWrapper } from 'src/views/wallet/coinmarket';
 
 const LogoWrapper = styled.div`
diff --git a/packages/suite/src/views/wallet/coinmarket/buy/detail/Detail/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuy.tsx
similarity index 68%
rename from packages/suite/src/views/wallet/coinmarket/buy/detail/Detail/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuy.tsx
index 8eaf79709f3..9c06e5783fe 100644
--- a/packages/suite/src/views/wallet/coinmarket/buy/detail/Detail/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuy.tsx
@@ -1,4 +1,7 @@
 import styled from 'styled-components';
+
+import { Card } from '@trezor/components';
+
 import { goto } from 'src/actions/suite/routerActions';
 import { useDispatch } from 'src/hooks/suite';
 import { useCoinmarketDetailContext } from 'src/hooks/wallet/coinmarket/useCoinmarketDetail';
@@ -7,21 +10,17 @@ import {
     CoinmarketTradeBuyType,
 } from 'src/types/coinmarket/coinmarket';
 import { CoinmarketSelectedOfferInfo } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferInfo';
-import PaymentSuccessful from 'src/views/wallet/coinmarket/buy/detail/components/PaymentSuccessful';
-import WaitingForUser from 'src/views/wallet/coinmarket/buy/detail/components/WaitingForUser';
-import PaymentProcessing from 'src/views/wallet/coinmarket/buy/detail/components/PaymentProcessing';
-import PaymentFailed from 'src/views/wallet/coinmarket/buy/detail/components/PaymentFailed';
-import {
-    CoinmarketLeftWrapper,
-    CoinmarketRightWrapper,
-    CoinmarketWrapper,
-} from 'src/views/wallet/coinmarket';
+import { CoinmarketDetailBuyPaymentPaymentSuccessful } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentSuccessful';
+import { CoinmarketDetailBuyPaymentFailed } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentFailed';
+import { CoinmarketDetailBuyPaymentProcessing } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentProcessing';
+import { CoinmarketDetailBuyPaymentWaitingForUser } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentWaitingForUser';
+import { CoinmarketWrapper } from 'src/views/wallet/coinmarket/common/CoinmarketWrapper';
 
 const Wrapper = styled.div`
     ${CoinmarketWrapper}
 `;
 
-const CoinmarketDetail = () => {
+export const CoinmarketDetailBuy = () => {
     const { trade, info, account } = useCoinmarketDetailContext<CoinmarketTradeBuyType>();
     const dispatch = useDispatch();
     // if trade not found, it is because user refreshed the page and stored transactionId got removed
@@ -62,19 +61,21 @@ const CoinmarketDetail = () => {
 
     return (
         <Wrapper>
-            <CoinmarketLeftWrapper>
-                {showError && <PaymentFailed account={account} supportUrl={supportUrl} />}
-                {showProcessing && <PaymentProcessing />}
+            <Card>
+                {showError && (
+                    <CoinmarketDetailBuyPaymentFailed account={account} supportUrl={supportUrl} />
+                )}
+                {showProcessing && <CoinmarketDetailBuyPaymentProcessing />}
                 {showWaiting && (
-                    <WaitingForUser
+                    <CoinmarketDetailBuyPaymentWaitingForUser
                         trade={trade.data}
                         account={account}
                         providerName={provider?.brandName || provider?.companyName}
                     />
                 )}
-                {showSuccess && <PaymentSuccessful account={account} />}
-            </CoinmarketLeftWrapper>
-            <CoinmarketRightWrapper>
+                {showSuccess && <CoinmarketDetailBuyPaymentPaymentSuccessful account={account} />}
+            </Card>
+            <Card>
                 <CoinmarketSelectedOfferInfo
                     account={account}
                     selectedQuote={trade.data}
@@ -83,9 +84,7 @@ const CoinmarketDetail = () => {
                     quoteAmounts={quoteAmounts}
                     type="buy"
                 />
-            </CoinmarketRightWrapper>
+            </Card>
         </Wrapper>
     );
 };
-
-export default CoinmarketDetail;
diff --git a/packages/suite/src/views/wallet/coinmarket/buy/detail/components/PaymentFailed/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentFailed.tsx
similarity index 72%
rename from packages/suite/src/views/wallet/coinmarket/buy/detail/components/PaymentFailed/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentFailed.tsx
index 98edf3e5403..9e63ec728ed 100644
--- a/packages/suite/src/views/wallet/coinmarket/buy/detail/components/PaymentFailed/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentFailed.tsx
@@ -1,5 +1,8 @@
 import styled from 'styled-components';
+
 import { Button, variables, Link, Image } from '@trezor/components';
+import { spacings, spacingsPx } from '@trezor/theme';
+
 import { useDispatch } from 'src/hooks/suite';
 import { Account } from 'src/types/wallet';
 import { Translation } from 'src/components/suite/Translation';
@@ -29,14 +32,8 @@ const Description = styled.div`
     text-align: center;
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledLink = styled(Link)`
-    margin-bottom: 30px;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledButton = styled(Button)`
-    margin-top: 30px;
+const LinkWrapper = styled.div`
+    margin-top: ${spacingsPx.xxl};
 `;
 
 interface PaymentFailedProps {
@@ -44,7 +41,7 @@ interface PaymentFailedProps {
     account: Account;
 }
 
-const PaymentFailed = ({ supportUrl, account }: PaymentFailedProps) => {
+export const CoinmarketDetailBuyPaymentFailed = ({ supportUrl, account }: PaymentFailedProps) => {
     const dispatch = useDispatch();
 
     const goToBuy = () =>
@@ -68,17 +65,17 @@ const PaymentFailed = ({ supportUrl, account }: PaymentFailedProps) => {
                 <Translation id="TR_BUY_DETAIL_ERROR_TEXT" />
             </Description>
             {supportUrl && (
-                <StyledLink href={supportUrl} target="_blank">
-                    <Button variant="tertiary">
-                        <Translation id="TR_BUY_DETAIL_ERROR_SUPPORT" />
-                    </Button>
-                </StyledLink>
+                <LinkWrapper>
+                    <Link href={supportUrl} target="_blank">
+                        <Button variant="tertiary">
+                            <Translation id="TR_BUY_DETAIL_ERROR_SUPPORT" />
+                        </Button>
+                    </Link>
+                </LinkWrapper>
             )}
-            <StyledButton onClick={goToBuy}>
+            <Button onClick={goToBuy} margin={{ top: spacings.xxl }}>
                 <Translation id="TR_BUY_DETAIL_ERROR_BUTTON" />
-            </StyledButton>
+            </Button>
         </Wrapper>
     );
 };
-
-export default PaymentFailed;
diff --git a/packages/suite/src/views/wallet/coinmarket/buy/detail/components/PaymentProcessing/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentProcessing.tsx
similarity index 58%
rename from packages/suite/src/views/wallet/coinmarket/buy/detail/components/PaymentProcessing/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentProcessing.tsx
index ad138816c80..c527f3fd763 100644
--- a/packages/suite/src/views/wallet/coinmarket/buy/detail/components/PaymentProcessing/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentProcessing.tsx
@@ -1,5 +1,8 @@
 import styled from 'styled-components';
+
 import { variables, Spinner, Button, Link } from '@trezor/components';
+import { spacingsPx } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite/Translation';
 
 const Wrapper = styled.div`
@@ -15,29 +18,28 @@ const Title = styled.div`
     font-weight: ${variables.FONT_WEIGHT.DEMI_BOLD};
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledLink = styled(Link)`
-    margin-top: 50px;
+const LinkWrapper = styled.div`
+    margin-top: ${spacingsPx.xxxxl};
 `;
 
 interface PaymentProcessingProps {
     supportUrl?: string;
 }
 
-const PaymentProcessing = ({ supportUrl }: PaymentProcessingProps) => (
+export const CoinmarketDetailBuyPaymentProcessing = ({ supportUrl }: PaymentProcessingProps) => (
     <Wrapper>
         <Spinner />
         <Title>
             <Translation id="TR_BUY_DETAIL_PENDING_TITLE" />
         </Title>
         {supportUrl && (
-            <StyledLink href={supportUrl} target="_blank">
-                <Button variant="tertiary">
-                    <Translation id="TR_BUY_DETAIL_PENDING_SUPPORT" />
-                </Button>
-            </StyledLink>
+            <LinkWrapper>
+                <Link href={supportUrl} target="_blank">
+                    <Button variant="tertiary">
+                        <Translation id="TR_BUY_DETAIL_PENDING_SUPPORT" />
+                    </Button>
+                </Link>
+            </LinkWrapper>
         )}
     </Wrapper>
 );
-
-export default PaymentProcessing;
diff --git a/packages/suite/src/views/wallet/coinmarket/buy/detail/components/PaymentSuccessful/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentSuccessful.tsx
similarity index 94%
rename from packages/suite/src/views/wallet/coinmarket/buy/detail/components/PaymentSuccessful/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentSuccessful.tsx
index af4c9e44099..335f3d055c6 100644
--- a/packages/suite/src/views/wallet/coinmarket/buy/detail/components/PaymentSuccessful/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentSuccessful.tsx
@@ -1,5 +1,7 @@
 import styled from 'styled-components';
+
 import { Button, variables, Image } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite';
 import { Account } from 'src/types/wallet';
@@ -33,7 +35,9 @@ interface PaymentSuccessfulProps {
     account: Account;
 }
 
-const PaymentSuccessful = ({ account }: PaymentSuccessfulProps) => {
+export const CoinmarketDetailBuyPaymentPaymentSuccessful = ({
+    account,
+}: PaymentSuccessfulProps) => {
     const dispatch = useDispatch();
 
     const handleClick = () =>
@@ -62,5 +66,3 @@ const PaymentSuccessful = ({ account }: PaymentSuccessfulProps) => {
         </Wrapper>
     );
 };
-
-export default PaymentSuccessful;
diff --git a/packages/suite/src/views/wallet/coinmarket/buy/detail/components/WaitingForUser/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentWaitingForUser.tsx
similarity index 87%
rename from packages/suite/src/views/wallet/coinmarket/buy/detail/components/WaitingForUser/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentWaitingForUser.tsx
index 0f76b207d0d..8f09bf2997c 100644
--- a/packages/suite/src/views/wallet/coinmarket/buy/detail/components/WaitingForUser/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailBuy/CoinmarketDetailBuyPaymentWaitingForUser.tsx
@@ -1,8 +1,12 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
+import { BuyTrade, BuyTradeStatus } from 'invity-api';
+
 import { Button, variables, Image } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite/Translation';
-import { BuyTrade, BuyTradeStatus } from 'invity-api';
 import { Account } from 'src/types/wallet';
 import invityAPI from 'src/services/suite/invityAPI';
 import { createTxLink } from 'src/utils/wallet/coinmarket/buyUtils';
@@ -32,11 +36,6 @@ const Description = styled.div`
     text-align: center;
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const PaymentButton = styled(Button)`
-    margin-top: 30px;
-`;
-
 const getTranslations = (tradeStatus: BuyTradeStatus | undefined) => {
     if (tradeStatus === 'WAITING_FOR_USER') {
         return {
@@ -59,7 +58,11 @@ interface WaitingForUserProps {
     providerName?: string;
 }
 
-const WaitingForUser = ({ trade, account, providerName }: WaitingForUserProps) => {
+export const CoinmarketDetailBuyPaymentWaitingForUser = ({
+    trade,
+    account,
+    providerName,
+}: WaitingForUserProps) => {
     const [isWorking, setIsWorking] = useState(false);
     const dispatch = useDispatch();
 
@@ -83,12 +86,15 @@ const WaitingForUser = ({ trade, account, providerName }: WaitingForUserProps) =
             <Description>
                 <Translation id={translations.descriptionTranslationId} values={{ providerName }} />
             </Description>
-            <PaymentButton onClick={goToPayment} isLoading={isWorking} isDisabled={isWorking}>
+            <Button
+                onClick={goToPayment}
+                isLoading={isWorking}
+                isDisabled={isWorking}
+                margin={{ top: spacings.xxl }}
+            >
                 <Translation id={translations.buttonTextTranslationId} />
-            </PaymentButton>
+            </Button>
             {/* TODO add a possibility in the future to cancel the transaction by the user */}
         </Wrapper>
     );
 };
-
-export default WaitingForUser;
diff --git a/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/Detail/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchange.tsx
similarity index 60%
rename from packages/suite/src/views/wallet/coinmarket/exchange_new/detail/Detail/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchange.tsx
index 4eddd979991..9ec50f93de7 100644
--- a/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/Detail/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchange.tsx
@@ -1,11 +1,9 @@
 import styled from 'styled-components';
+
+import { Card } from '@trezor/components';
+
 import { goto } from 'src/actions/suite/routerActions';
 import { useDispatch } from 'src/hooks/suite';
-import PaymentFailed from '../components/PaymentFailed';
-import PaymentSuccessful from '../components/PaymentSuccessful';
-import PaymentKYC from '../components/PaymentKYC';
-import PaymentConverting from '../components/PaymentConverting';
-import PaymentSending from '../components/PaymentSending';
 import { useCoinmarketDetailContext } from 'src/hooks/wallet/coinmarket/useCoinmarketDetail';
 import { tradeFinalStatuses } from 'src/hooks/wallet/coinmarket/useCoinmarketWatchTrade';
 import {
@@ -13,17 +11,18 @@ import {
     CoinmarketTradeExchangeType,
 } from 'src/types/coinmarket/coinmarket';
 import { CoinmarketSelectedOfferInfo } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferInfo';
-import {
-    CoinmarketLeftWrapper,
-    CoinmarketRightWrapper,
-    CoinmarketWrapper,
-} from 'src/views/wallet/coinmarket';
+import { CoinmarketDetailExchangePaymentSuccessful } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentSuccessful';
+import { CoinmarketDetailExchangePaymentKYC } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentKYC';
+import { CoinmarketDetailExchangePaymentFailed } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentFailed';
+import { CoinmarketDetailExchangePaymentConverting } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentConverting';
+import { CoinmarketDetailExchangePaymentSending } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentSending';
+import { CoinmarketWrapper } from 'src/views/wallet/coinmarket/common/CoinmarketWrapper';
 
 const Wrapper = styled.div`
     ${CoinmarketWrapper}
 `;
 
-const CoinmarketDetail = () => {
+export const CoinmarketDetailExchange = () => {
     const { account, trade, info } = useCoinmarketDetailContext<CoinmarketTradeExchangeType>();
     const dispatch = useDispatch();
 
@@ -63,22 +62,30 @@ const CoinmarketDetail = () => {
 
     return (
         <Wrapper>
-            <CoinmarketLeftWrapper>
-                {tradeStatus === 'SUCCESS' && <PaymentSuccessful account={account} />}
+            <Card>
+                {tradeStatus === 'SUCCESS' && (
+                    <CoinmarketDetailExchangePaymentSuccessful account={account} />
+                )}
                 {tradeStatus === 'KYC' && (
-                    <PaymentKYC account={account} provider={provider} supportUrl={supportUrl} />
+                    <CoinmarketDetailExchangePaymentKYC
+                        account={account}
+                        provider={provider}
+                        supportUrl={supportUrl}
+                    />
                 )}
                 {tradeStatus === 'ERROR' && (
-                    <PaymentFailed
+                    <CoinmarketDetailExchangePaymentFailed
                         account={account}
                         transactionId={trade.key}
                         supportUrl={supportUrl}
                     />
                 )}
-                {tradeStatus === 'CONVERTING' && <PaymentConverting supportUrl={supportUrl} />}
-                {showSending && <PaymentSending supportUrl={supportUrl} />}
-            </CoinmarketLeftWrapper>
-            <CoinmarketRightWrapper>
+                {tradeStatus === 'CONVERTING' && (
+                    <CoinmarketDetailExchangePaymentConverting supportUrl={supportUrl} />
+                )}
+                {showSending && <CoinmarketDetailExchangePaymentSending supportUrl={supportUrl} />}
+            </Card>
+            <Card>
                 <CoinmarketSelectedOfferInfo
                     selectedQuote={trade.data}
                     transactionId={trade.key}
@@ -86,9 +93,7 @@ const CoinmarketDetail = () => {
                     type="exchange"
                     quoteAmounts={quoteAmounts}
                 />
-            </CoinmarketRightWrapper>
+            </Card>
         </Wrapper>
     );
 };
-
-export default CoinmarketDetail;
diff --git a/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentConverting/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentConverting.tsx
similarity index 57%
rename from packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentConverting/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentConverting.tsx
index 9f98d857e43..2772d25ce63 100644
--- a/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentConverting/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentConverting.tsx
@@ -1,5 +1,8 @@
 import styled from 'styled-components';
+
 import { variables, Spinner, Button, Link } from '@trezor/components';
+import { spacingsPx } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite/Translation';
 
 const Wrapper = styled.div`
@@ -15,29 +18,30 @@ const Title = styled.div`
     font-weight: ${variables.FONT_WEIGHT.DEMI_BOLD};
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledLink = styled(Link)`
-    margin-top: 50px;
+const LinkWrapper = styled.div`
+    margin-top: ${spacingsPx.xxxxl};
 `;
 
 interface PaymentConvertingProps {
     supportUrl?: string;
 }
 
-const PaymentConverting = ({ supportUrl }: PaymentConvertingProps) => (
+export const CoinmarketDetailExchangePaymentConverting = ({
+    supportUrl,
+}: PaymentConvertingProps) => (
     <Wrapper>
         <Spinner />
         <Title>
             <Translation id="TR_EXCHANGE_DETAIL_CONVERTING_TITLE" />
         </Title>
         {supportUrl && (
-            <StyledLink href={supportUrl} target="_blank">
-                <Button variant="tertiary">
-                    <Translation id="TR_EXCHANGE_DETAIL_CONVERTING_SUPPORT" />
-                </Button>
-            </StyledLink>
+            <LinkWrapper>
+                <Link href={supportUrl} target="_blank">
+                    <Button variant="tertiary">
+                        <Translation id="TR_EXCHANGE_DETAIL_CONVERTING_SUPPORT" />
+                    </Button>
+                </Link>
+            </LinkWrapper>
         )}
     </Wrapper>
 );
-
-export default PaymentConverting;
diff --git a/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentFailed/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentFailed.tsx
similarity index 75%
rename from packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentFailed/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentFailed.tsx
index 95ea9b10d84..9e8b6297048 100644
--- a/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentFailed/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentFailed.tsx
@@ -1,11 +1,13 @@
 import styled from 'styled-components';
 
 import { Button, variables, Link, Image } from '@trezor/components';
-import { CoinmarketTransactionId } from 'src/views/wallet/coinmarket/common';
+import { spacingsPx } from '@trezor/theme';
+
 import { useDispatch } from 'src/hooks/suite';
 import { Account } from 'src/types/wallet';
 import { Translation } from 'src/components/suite/Translation';
 import { goto } from 'src/actions/suite/routerActions';
+import { CoinmarketTransactionId } from 'src/views/wallet/coinmarket/common/CoinmarketTransactionId';
 
 const Wrapper = styled.div`
     display: flex;
@@ -31,10 +33,9 @@ const Description = styled.div`
     text-align: center;
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledLink = styled(Link)`
-    margin-top: 30px;
-    margin-bottom: 30px;
+const LinkWrapper = styled.div`
+    margin-top: ${spacingsPx.xxl};
+    margin-bottom: ${spacingsPx.xxl};
 `;
 
 interface PaymentFailedProps {
@@ -43,7 +44,11 @@ interface PaymentFailedProps {
     account: Account;
 }
 
-const PaymentFailed = ({ transactionId, supportUrl, account }: PaymentFailedProps) => {
+export const CoinmarketDetailExchangePaymentFailed = ({
+    transactionId,
+    supportUrl,
+    account,
+}: PaymentFailedProps) => {
     const dispatch = useDispatch();
 
     const goToExchange = () =>
@@ -68,11 +73,13 @@ const PaymentFailed = ({ transactionId, supportUrl, account }: PaymentFailedProp
             </Description>
             {transactionId && <CoinmarketTransactionId transactionId={transactionId} />}
             {supportUrl && (
-                <StyledLink href={supportUrl} target="_blank">
-                    <Button variant="tertiary">
-                        <Translation id="TR_EXCHANGE_DETAIL_ERROR_SUPPORT" />
-                    </Button>
-                </StyledLink>
+                <LinkWrapper>
+                    <Link href={supportUrl} target="_blank">
+                        <Button variant="tertiary">
+                            <Translation id="TR_EXCHANGE_DETAIL_ERROR_SUPPORT" />
+                        </Button>
+                    </Link>
+                </LinkWrapper>
             )}
             <Button onClick={goToExchange}>
                 <Translation id="TR_EXCHANGE_DETAIL_ERROR_BUTTON" />
@@ -80,5 +87,3 @@ const PaymentFailed = ({ transactionId, supportUrl, account }: PaymentFailedProp
         </Wrapper>
     );
 };
-
-export default PaymentFailed;
diff --git a/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentKYC/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentKYC.tsx
similarity index 79%
rename from packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentKYC/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentKYC.tsx
index 47ee10ea253..06c4b8f15bd 100644
--- a/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentKYC/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentKYC.tsx
@@ -1,12 +1,14 @@
 import styled from 'styled-components';
+import { ExchangeProviderInfo } from 'invity-api';
 
 import { Button, variables, Link, Image } from '@trezor/components';
-import { CoinmarketTransactionId } from 'src/views/wallet/coinmarket/common';
+import { spacingsPx } from '@trezor/theme';
+
 import { useDispatch } from 'src/hooks/suite';
 import { Account } from 'src/types/wallet';
 import { Translation } from 'src/components/suite/Translation';
-import { ExchangeProviderInfo } from 'invity-api';
 import { goto } from 'src/actions/suite/routerActions';
+import { CoinmarketTransactionId } from 'src/views/wallet/coinmarket/common/CoinmarketTransactionId';
 
 const Wrapper = styled.div`
     display: flex;
@@ -33,9 +35,9 @@ const Description = styled.div`
 `;
 
 // eslint-disable-next-line local-rules/no-override-ds-component
-const StyledLink = styled(Link)`
-    margin-top: 5px;
-    margin-bottom: 20px;
+const LinkWrapper = styled(Link)`
+    margin-top: ${spacingsPx.xxs};
+    margin-bottom: ${spacingsPx.lg};
 `;
 
 interface PaymentKYCProps {
@@ -45,7 +47,12 @@ interface PaymentKYCProps {
     account: Account;
 }
 
-const PaymentKYC = ({ transactionId, supportUrl, provider, account }: PaymentKYCProps) => {
+export const CoinmarketDetailExchangePaymentKYC = ({
+    transactionId,
+    supportUrl,
+    provider,
+    account,
+}: PaymentKYCProps) => {
     const dispatch = useDispatch();
 
     const goToExchange = () =>
@@ -70,11 +77,13 @@ const PaymentKYC = ({ transactionId, supportUrl, provider, account }: PaymentKYC
             </Description>
             {transactionId && <CoinmarketTransactionId transactionId={transactionId} />}
             {supportUrl && (
-                <StyledLink href={supportUrl} target="_blank">
-                    <Button variant="tertiary">
-                        <Translation id="TR_EXCHANGE_DETAIL_KYC_SUPPORT" />
-                    </Button>
-                </StyledLink>
+                <LinkWrapper>
+                    <Link href={supportUrl} target="_blank">
+                        <Button variant="tertiary">
+                            <Translation id="TR_EXCHANGE_DETAIL_KYC_SUPPORT" />
+                        </Button>
+                    </Link>
+                </LinkWrapper>
             )}
             {provider?.kycUrl && (
                 <Link href={provider?.kycUrl} target="_blank">
@@ -89,5 +98,3 @@ const PaymentKYC = ({ transactionId, supportUrl, provider, account }: PaymentKYC
         </Wrapper>
     );
 };
-
-export default PaymentKYC;
diff --git a/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentSending/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentSending.tsx
similarity index 57%
rename from packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentSending/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentSending.tsx
index 86b679344bf..44b67313d18 100644
--- a/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentSending/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentSending.tsx
@@ -1,5 +1,8 @@
 import styled from 'styled-components';
+
 import { variables, Spinner, Button, Link } from '@trezor/components';
+import { spacingsPx } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite/Translation';
 
 const Wrapper = styled.div`
@@ -15,29 +18,28 @@ const Title = styled.div`
     font-weight: ${variables.FONT_WEIGHT.DEMI_BOLD};
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledLink = styled(Link)`
-    margin-top: 50px;
+const LinkWrapper = styled.div`
+    margin-top: ${spacingsPx.xxxxl};
 `;
 
 interface PaymentSendingProps {
     supportUrl?: string;
 }
 
-const PaymentSending = ({ supportUrl }: PaymentSendingProps) => (
+export const CoinmarketDetailExchangePaymentSending = ({ supportUrl }: PaymentSendingProps) => (
     <Wrapper>
         <Spinner />
         <Title>
             <Translation id="TR_EXCHANGE_DETAIL_SENDING_TITLE" />
         </Title>
         {supportUrl && (
-            <StyledLink href={supportUrl} target="_blank">
-                <Button variant="tertiary">
-                    <Translation id="TR_EXCHANGE_DETAIL_SENDING_SUPPORT" />
-                </Button>
-            </StyledLink>
+            <LinkWrapper>
+                <Link href={supportUrl} target="_blank">
+                    <Button variant="tertiary">
+                        <Translation id="TR_EXCHANGE_DETAIL_SENDING_SUPPORT" />
+                    </Button>
+                </Link>
+            </LinkWrapper>
         )}
     </Wrapper>
 );
-
-export default PaymentSending;
diff --git a/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentSuccessful/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentSuccessful.tsx
similarity index 94%
rename from packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentSuccessful/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentSuccessful.tsx
index 5a021a7a447..1556e589b62 100644
--- a/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/components/PaymentSuccessful/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchangePaymentSuccessful.tsx
@@ -1,5 +1,7 @@
 import styled from 'styled-components';
+
 import { Button, variables, Image } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite';
 import { Account } from 'src/types/wallet';
@@ -33,7 +35,7 @@ interface PaymentSuccessfulProps {
     account: Account;
 }
 
-const PaymentSuccessful = ({ account }: PaymentSuccessfulProps) => {
+export const CoinmarketDetailExchangePaymentSuccessful = ({ account }: PaymentSuccessfulProps) => {
     const dispatch = useDispatch();
 
     const handleClick = () =>
@@ -65,5 +67,3 @@ const PaymentSuccessful = ({ account }: PaymentSuccessfulProps) => {
         </Wrapper>
     );
 };
-
-export default PaymentSuccessful;
diff --git a/packages/suite/src/views/wallet/coinmarket/sell_new/detail/Detail/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSell.tsx
similarity index 73%
rename from packages/suite/src/views/wallet/coinmarket/sell_new/detail/Detail/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSell.tsx
index b1129b13d34..711ace19bfd 100644
--- a/packages/suite/src/views/wallet/coinmarket/sell_new/detail/Detail/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSell.tsx
@@ -1,27 +1,26 @@
 import styled from 'styled-components';
+
+import { Card } from '@trezor/components';
+
 import { goto } from 'src/actions/suite/routerActions';
 import { useDispatch } from 'src/hooks/suite';
-import PaymentPending from '../components/PaymentPending';
-import PaymentSuccessful from '../components/PaymentSuccessful';
-import PaymentFailed from '../components/PaymentFailed';
 import { useCoinmarketDetailContext } from 'src/hooks/wallet/coinmarket/useCoinmarketDetail';
 import { tradeFinalStatuses } from 'src/hooks/wallet/coinmarket/useCoinmarketWatchTrade';
 import {
     CoinmarketGetCryptoQuoteAmountProps,
     CoinmarketTradeSellType,
 } from 'src/types/coinmarket/coinmarket';
-import {
-    CoinmarketLeftWrapper,
-    CoinmarketRightWrapper,
-    CoinmarketWrapper,
-} from 'src/views/wallet/coinmarket';
 import { CoinmarketSelectedOfferInfo } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferInfo';
+import { CoinmarketDetailSellPaymentSuccessful } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSellPaymentSuccessful';
+import { CoinmarketDetailSellPaymentFailed } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSellPaymentFailed';
+import { CoinmarketDetailSellPaymentPending } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSellPaymentPending';
+import { CoinmarketWrapper } from 'src/views/wallet/coinmarket/common/CoinmarketWrapper';
 
 const Wrapper = styled.div`
     ${CoinmarketWrapper}
 `;
 
-const CoinmarketDetail = () => {
+export const CoinmarketDetailSell = () => {
     const { account, trade, info } = useCoinmarketDetailContext<CoinmarketTradeSellType>();
     const dispatch = useDispatch();
 
@@ -61,18 +60,20 @@ const CoinmarketDetail = () => {
 
     return (
         <Wrapper>
-            <CoinmarketLeftWrapper>
-                {tradeStatus === 'SUCCESS' && <PaymentSuccessful account={account} />}
+            <Card>
+                {tradeStatus === 'SUCCESS' && (
+                    <CoinmarketDetailSellPaymentSuccessful account={account} />
+                )}
                 {sellFiatTradeFinalStatuses.includes(tradeStatus) && tradeStatus !== 'SUCCESS' && (
-                    <PaymentFailed
+                    <CoinmarketDetailSellPaymentFailed
                         account={account}
                         transactionId={trade.key}
                         supportUrl={supportUrl}
                     />
                 )}
-                {showPending && <PaymentPending supportUrl={supportUrl} />}
-            </CoinmarketLeftWrapper>
-            <CoinmarketRightWrapper>
+                {showPending && <CoinmarketDetailSellPaymentPending supportUrl={supportUrl} />}
+            </Card>
+            <Card>
                 <CoinmarketSelectedOfferInfo
                     account={account}
                     providers={info?.providerInfos}
@@ -81,9 +82,7 @@ const CoinmarketDetail = () => {
                     type="sell"
                     quoteAmounts={quoteAmounts}
                 />
-            </CoinmarketRightWrapper>
+            </Card>
         </Wrapper>
     );
 };
-
-export default CoinmarketDetail;
diff --git a/packages/suite/src/views/wallet/coinmarket/sell_new/detail/components/PaymentFailed/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSellPaymentFailed.tsx
similarity index 75%
rename from packages/suite/src/views/wallet/coinmarket/sell_new/detail/components/PaymentFailed/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSellPaymentFailed.tsx
index a29b34580f7..81a14c8ff37 100644
--- a/packages/suite/src/views/wallet/coinmarket/sell_new/detail/components/PaymentFailed/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSellPaymentFailed.tsx
@@ -1,11 +1,13 @@
 import styled from 'styled-components';
 
 import { Button, variables, Link, Image } from '@trezor/components';
-import { CoinmarketTransactionId } from 'src/views/wallet/coinmarket/common';
+import { spacingsPx } from '@trezor/theme';
+
 import { useDispatch } from 'src/hooks/suite';
 import { Account } from 'src/types/wallet';
 import { Translation } from 'src/components/suite/Translation';
 import { goto } from 'src/actions/suite/routerActions';
+import { CoinmarketTransactionId } from 'src/views/wallet/coinmarket/common/CoinmarketTransactionId';
 
 const Wrapper = styled.div`
     display: flex;
@@ -31,10 +33,9 @@ const Description = styled.div`
     text-align: center;
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledLink = styled(Link)`
-    margin-top: 30px;
-    margin-bottom: 30px;
+const LinkWrapper = styled.div`
+    margin-top: ${spacingsPx.xxl};
+    margin-bottom: ${spacingsPx.xxl};
 `;
 
 interface PaymentFailedProps {
@@ -43,7 +44,11 @@ interface PaymentFailedProps {
     account: Account;
 }
 
-const PaymentFailed = ({ transactionId, supportUrl, account }: PaymentFailedProps) => {
+export const CoinmarketDetailSellPaymentFailed = ({
+    transactionId,
+    supportUrl,
+    account,
+}: PaymentFailedProps) => {
     const dispatch = useDispatch();
 
     const goToSell = () =>
@@ -68,11 +73,13 @@ const PaymentFailed = ({ transactionId, supportUrl, account }: PaymentFailedProp
             </Description>
             {transactionId && <CoinmarketTransactionId transactionId={transactionId} />}
             {supportUrl && (
-                <StyledLink href={supportUrl} target="_blank">
-                    <Button variant="tertiary">
-                        <Translation id="TR_SELL_DETAIL_ERROR_SUPPORT" />
-                    </Button>
-                </StyledLink>
+                <LinkWrapper>
+                    <Link href={supportUrl} target="_blank">
+                        <Button variant="tertiary">
+                            <Translation id="TR_SELL_DETAIL_ERROR_SUPPORT" />
+                        </Button>
+                    </Link>
+                </LinkWrapper>
             )}
             <Button onClick={goToSell}>
                 <Translation id="TR_SELL_DETAIL_ERROR_BUTTON" />
@@ -80,5 +87,3 @@ const PaymentFailed = ({ transactionId, supportUrl, account }: PaymentFailedProp
         </Wrapper>
     );
 };
-
-export default PaymentFailed;
diff --git a/packages/suite/src/views/wallet/coinmarket/sell_new/detail/components/PaymentPending/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSellPaymentPending.tsx
similarity index 58%
rename from packages/suite/src/views/wallet/coinmarket/sell_new/detail/components/PaymentPending/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSellPaymentPending.tsx
index cbb5211d570..f7ea48c2110 100644
--- a/packages/suite/src/views/wallet/coinmarket/sell_new/detail/components/PaymentPending/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSellPaymentPending.tsx
@@ -1,5 +1,8 @@
 import styled from 'styled-components';
+
 import { variables, Spinner, Button, Link } from '@trezor/components';
+import { spacingsPx } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite/Translation';
 
 const Wrapper = styled.div`
@@ -15,29 +18,28 @@ const Title = styled.div`
     font-weight: ${variables.FONT_WEIGHT.DEMI_BOLD};
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledLink = styled(Link)`
-    margin-top: 50px;
+const LinkWrapper = styled.div`
+    margin-top: ${spacingsPx.xxxxl};
 `;
 
 interface PaymentConvertingProps {
     supportUrl?: string;
 }
 
-const PaymentConverting = ({ supportUrl }: PaymentConvertingProps) => (
+export const CoinmarketDetailSellPaymentPending = ({ supportUrl }: PaymentConvertingProps) => (
     <Wrapper>
         <Spinner />
         <Title>
             <Translation id="TR_SELL_DETAIL_PENDING_TITLE" />
         </Title>
         {supportUrl && (
-            <StyledLink href={supportUrl} target="_blank">
-                <Button variant="tertiary">
-                    <Translation id="TR_SELL_DETAIL_PENDING_SUPPORT" />
-                </Button>
-            </StyledLink>
+            <LinkWrapper>
+                <Link href={supportUrl} target="_blank">
+                    <Button variant="tertiary">
+                        <Translation id="TR_SELL_DETAIL_PENDING_SUPPORT" />
+                    </Button>
+                </Link>
+            </LinkWrapper>
         )}
     </Wrapper>
 );
-
-export default PaymentConverting;
diff --git a/packages/suite/src/views/wallet/coinmarket/sell_new/detail/components/PaymentSuccessful/index.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSellPaymentSuccessful.tsx
similarity index 96%
rename from packages/suite/src/views/wallet/coinmarket/sell_new/detail/components/PaymentSuccessful/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSellPaymentSuccessful.tsx
index 1475a22c9dc..74a4a583353 100644
--- a/packages/suite/src/views/wallet/coinmarket/sell_new/detail/components/PaymentSuccessful/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSellPaymentSuccessful.tsx
@@ -1,10 +1,12 @@
 import styled from 'styled-components';
+
 import { Button, variables, Image } from '@trezor/components';
+import { borders } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite';
 import { Account } from 'src/types/wallet';
 import { goto } from 'src/actions/suite/routerActions';
-import { borders } from '@trezor/theme';
 
 const Wrapper = styled.div`
     display: flex;
@@ -49,7 +51,7 @@ interface PaymentSuccessfulProps {
     account: Account;
 }
 
-const PaymentSuccessful = ({ account }: PaymentSuccessfulProps) => {
+export const CoinmarketDetailSellPaymentSuccessful = ({ account }: PaymentSuccessfulProps) => {
     const dispatch = useDispatch();
 
     const goToSell = () =>
@@ -86,5 +88,3 @@ const PaymentSuccessful = ({ account }: PaymentSuccessfulProps) => {
         </Wrapper>
     );
 };
-
-export default PaymentSuccessful;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffersAmounts.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffersAmounts.tsx
index b95dd55e9e4..7aa890d5012 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffersAmounts.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffersAmounts.tsx
@@ -1,18 +1,21 @@
 import React from 'react';
+
 import styled, { useTheme } from 'styled-components';
-import { CoinmarketFiatAmount } from '../CoinmarketFiatAmount';
-import { getCryptoQuoteAmountProps } from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
+import { CryptoId } from 'invity-api';
+
+import { spacingsPx } from '@trezor/theme';
+import { Icon } from '@trezor/components';
+
+import {
+    getCryptoQuoteAmountProps,
+    isCoinmarketBuyContext,
+    isCoinmarketSellContext,
+} from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
 import { FormattedCryptoAmount } from 'src/components/suite';
-import { useCoinmarketInfo } from '../../../../../hooks/wallet/coinmarket/useCoinmarketInfo';
 import { CoinmarketTradeDetailType } from 'src/types/coinmarket/coinmarket';
-import { spacingsPx } from '@trezor/theme';
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-import {
-    isCoinmarketBuyOffers,
-    isCoinmarketSellOffers,
-} from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
-import { CryptoId } from 'invity-api';
-import { Icon } from '@trezor/components';
+import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
+import { CoinmarketFiatAmount } from 'src/views/wallet/coinmarket/common/CoinmarketFiatAmount';
 
 const Arrow = styled.div`
     display: flex;
@@ -61,7 +64,7 @@ export const CoinmarketFeaturedOffersAmounts = ({
 
     if (!quoteProps?.receiveCurrency) return null;
 
-    if (isCoinmarketBuyOffers(context)) {
+    if (isCoinmarketBuyContext(context)) {
         return (
             <CoinmarketFeaturedOffersAmount
                 fromAmount={
@@ -81,7 +84,7 @@ export const CoinmarketFeaturedOffersAmounts = ({
         );
     }
 
-    if (isCoinmarketSellOffers(context)) {
+    if (isCoinmarketSellContext(context)) {
         return (
             <CoinmarketFeaturedOffersAmount
                 fromAmount={
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffersItem.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffersItem.tsx
index 585756af40d..031336b90b2 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffersItem.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffersItem.tsx
@@ -1,29 +1,29 @@
 import styled, { useTheme } from 'styled-components';
+import { SellFiatTrade } from 'invity-api';
+
 import { Badge, Button, Card, Text } from '@trezor/components';
-import { Translation } from 'src/components/suite';
 import { spacings, spacingsPx } from '@trezor/theme';
-import { CoinmarketUtilsProvider } from '../CoinmarketUtils/CoinmarketUtilsProvider';
 import { SCREEN_QUERY } from '@trezor/components/src/config/variables';
-import {
-    isCoinmarketBuyOffers,
-    isCoinmarketExchangeOffers,
-    isCoinmarketSellOffers,
-} from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
+
+import { Translation } from 'src/components/suite';
 import {
     getCryptoQuoteAmountProps,
     getProvidersInfoProps,
     getSelectQuoteTyped,
+    isCoinmarketBuyContext,
+    isCoinmarketExchangeContext,
+    isCoinmarketSellContext,
 } from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
 import { getTagAndInfoNote } from 'src/utils/wallet/coinmarket/coinmarketUtils';
-import { SellFiatTrade } from 'invity-api';
 import { CoinmarketFormContextValues } from 'src/types/coinmarket/coinmarketForm';
-import { CoinmarketFeaturedOffersAmounts } from './CoinmarketFeaturedOffersAmounts';
-import { CoinmarketFeaturedOffersPaymentInfo } from './CoinmarketFeaturedOffersPaymentInfo';
 import {
     CoinmarketTradeDetailBuySellType,
     CoinmarketTradeDetailType,
     CoinmarketTradeType,
 } from 'src/types/coinmarket/coinmarket';
+import { CoinmarketFeaturedOffersAmounts } from 'src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffersAmounts';
+import { CoinmarketUtilsProvider } from 'src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsProvider';
+import { CoinmarketFeaturedOffersPaymentInfo } from 'src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffersPaymentInfo';
 
 const Offer = styled.div`
     display: flex;
@@ -84,16 +84,16 @@ const actionButtonText = (
     context: CoinmarketFormContextValues<CoinmarketTradeType>,
     quote: CoinmarketTradeDetailType,
 ) => {
-    if (isCoinmarketBuyOffers(context)) {
+    if (isCoinmarketBuyContext(context)) {
         return <Translation id="TR_BUY" />;
     }
-    if (isCoinmarketSellOffers(context)) {
+    if (isCoinmarketSellContext(context)) {
         if (context.needToRegisterOrVerifyBankAccount(quote as SellFiatTrade))
             return <Translation id="TR_SELL_REGISTER" />;
 
         return <Translation id="TR_COINMARKET_SELL" />;
     }
-    if (isCoinmarketExchangeOffers(context)) {
+    if (isCoinmarketExchangeContext(context)) {
         return <Translation id="TR_COINMARKET_SWAP" />;
     }
 };
@@ -124,7 +124,7 @@ export const CoinmarketFeaturedOffersItem = ({ context, quote }: CoinmarketOffer
                 </OfferColumn1>
                 <OfferColumn2>
                     <CoinmarketUtilsProvider exchange={quote.exchange} providers={providers} />
-                    {!isCoinmarketExchangeOffers(context) && (
+                    {!isCoinmarketExchangeContext(context) && (
                         <CoinmarketFeaturedOffersPaymentInfo
                             quote={quote as CoinmarketTradeDetailBuySellType}
                             type={type}
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffersPaymentInfo.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffersPaymentInfo.tsx
index 4067f68b6fe..092f19f0999 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffersPaymentInfo.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffersPaymentInfo.tsx
@@ -1,12 +1,14 @@
+import styled from 'styled-components';
+
+import { spacingsPx } from '@trezor/theme';
+
 import {
     CoinmarketTradeBuySellType,
     CoinmarketTradeDetailBuySellType,
     CoinmarketTradeType,
 } from 'src/types/coinmarket/coinmarket';
 import { Translation } from 'src/components/suite';
-import { CoinmarketPaymentPlainType } from '../CoinmarketPaymentPlainType';
-import styled from 'styled-components';
-import { spacingsPx } from '@trezor/theme';
+import { CoinmarketPaymentPlainType } from 'src/views/wallet/coinmarket/common/CoinmarketPaymentPlainType';
 
 const PaymentInfoWrapper = styled.div`
     display: flex;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFooter/CoinmarketFooter.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFooter/CoinmarketFooter.tsx
index 4a6da743aa9..c892695e69f 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFooter/CoinmarketFooter.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFooter/CoinmarketFooter.tsx
@@ -1,19 +1,23 @@
-import { variables, Icon, Link, Image } from '@trezor/components';
 import { useState, useRef } from 'react';
+
 import styled, { css } from 'styled-components';
+
+import { variables, Icon, Link, Image, Row } from '@trezor/components';
 import { useOnClickOutside } from '@trezor/react-utils';
 import { DATA_TOS_INVITY_URL, INVITY_URL } from '@trezor/urls';
-import { CoinmarketProvidedByInvity } from './CoinmarketProvidedByInvity';
+import { borders, spacings, spacingsPx, zIndices } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
-import { borders, spacingsPx, zIndices } from '@trezor/theme';
+import { CoinmarketFooterLogoWrapper } from 'src/views/wallet/coinmarket';
+import { CoinmarketProvidedByInvity } from 'src/views/wallet/coinmarket/common/CoinmarketFooter/CoinmarketProvidedByInvity';
 
 const Wrapper = styled.div`
-    display: flex;
-    width: 100%;
-    align-items: center;
-    justify-content: center;
-    padding-top: 20px;
     margin-top: ${spacingsPx.xxxl};
+    padding: ${spacings.zero} ${spacingsPx.lg};
+`;
+
+const WrapperBorder = styled.div`
+    padding-top: ${spacingsPx.lg};
     border-top: 1px solid ${({ theme }) => theme.borderElevation1};
 `;
 
@@ -61,14 +65,6 @@ const BoxRight = styled.div`
     align-items: center;
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const InvityLink = styled(Link)`
-    display: flex;
-    flex: 1;
-    padding-top: 1px;
-    align-items: center;
-`;
-
 const IconWrapper = styled.div`
     cursor: pointer;
     margin-left: 10px;
@@ -91,6 +87,7 @@ const linkStyle = css`
     }
 `;
 
+// reason: different design then basic Link
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledLink = styled(Link)`
     ${linkStyle}
@@ -123,42 +120,48 @@ export const CoinmarketFooter = () => {
 
     return (
         <Wrapper>
-            <Left>
-                <CoinmarketProvidedByInvity />
-            </Left>
-            <Right>
-                {toggled && (
-                    <FooterBox ref={menuRef}>
-                        <Header>
-                            <BoxLeft>
-                                <InvityLink href={INVITY_URL}>
-                                    <Image width={70} image="INVITY_LOGO" />
-                                </InvityLink>
-                            </BoxLeft>
-                            <BoxRight>
-                                <Link href={INVITY_URL}>invity.io</Link>
-                                <IconWrapper onClick={() => setToggled(false)}>
-                                    <Icon name="close" size={16} />
-                                </IconWrapper>
-                            </BoxRight>
-                        </Header>
-                        <FooterText>
-                            <Translation id="TR_BUY_FOOTER_TEXT_1" />
-                        </FooterText>
-                        <FooterText>
-                            <Translation id="TR_BUY_FOOTER_TEXT_2" />
-                        </FooterText>
-                    </FooterBox>
-                )}
-
-                <StyledLink href={DATA_TOS_INVITY_URL} variant="nostyle">
-                    <Translation id="TR_TERMS_OF_USE_INVITY" />
-                </StyledLink>
-                <VerticalDivider />
-                <LearnMoreToggle ref={toggleRef} onClick={() => setToggled(true)}>
-                    <Translation id="TR_BUY_LEARN_MORE" />
-                </LearnMoreToggle>
-            </Right>
+            <WrapperBorder>
+                <Row justifyContent="center">
+                    <Left>
+                        <CoinmarketProvidedByInvity />
+                    </Left>
+                    <Right>
+                        {toggled && (
+                            <FooterBox ref={menuRef}>
+                                <Header>
+                                    <BoxLeft>
+                                        <CoinmarketFooterLogoWrapper>
+                                            <Link href={INVITY_URL} target="_blank">
+                                                <Image width={70} image="INVITY_LOGO" />
+                                            </Link>
+                                        </CoinmarketFooterLogoWrapper>
+                                    </BoxLeft>
+                                    <BoxRight>
+                                        <Link href={INVITY_URL}>invity.io</Link>
+                                        <IconWrapper onClick={() => setToggled(false)}>
+                                            <Icon name="close" size={16} />
+                                        </IconWrapper>
+                                    </BoxRight>
+                                </Header>
+                                <FooterText>
+                                    <Translation id="TR_BUY_FOOTER_TEXT_1" />
+                                </FooterText>
+                                <FooterText>
+                                    <Translation id="TR_BUY_FOOTER_TEXT_2" />
+                                </FooterText>
+                            </FooterBox>
+                        )}
+
+                        <StyledLink href={DATA_TOS_INVITY_URL} variant="nostyle">
+                            <Translation id="TR_TERMS_OF_USE_INVITY" />
+                        </StyledLink>
+                        <VerticalDivider />
+                        <LearnMoreToggle ref={toggleRef} onClick={() => setToggled(true)}>
+                            <Translation id="TR_BUY_LEARN_MORE" />
+                        </LearnMoreToggle>
+                    </Right>
+                </Row>
+            </WrapperBorder>
         </Wrapper>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFooter/CoinmarketProvidedByInvity.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFooter/CoinmarketProvidedByInvity.tsx
index 604797eb712..e0122de17da 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFooter/CoinmarketProvidedByInvity.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFooter/CoinmarketProvidedByInvity.tsx
@@ -1,8 +1,11 @@
 import styled from 'styled-components';
-import { Translation } from 'src/components/suite';
+
 import { INVITY_URL } from '@trezor/urls';
 import { variables, Link, Image } from '@trezor/components';
 
+import { Translation } from 'src/components/suite';
+import { CoinmarketFooterLogoWrapper } from 'src/views/wallet/coinmarket';
+
 const Wrapper = styled.div`
     display: flex;
     align-items: center;
@@ -10,19 +13,13 @@ const Wrapper = styled.div`
     color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledLink = styled(Link)`
-    display: flex;
-    flex: 1;
-    padding-top: 1px;
-    align-items: center;
-`;
-
 export const CoinmarketProvidedByInvity = () => (
     <Wrapper>
         <Translation id="TR_BUY_PROVIDED_BY_INVITY" />
-        <StyledLink href={INVITY_URL} target="_blank">
-            <Image width={70} image="INVITY_LOGO" />
-        </StyledLink>
+        <CoinmarketFooterLogoWrapper>
+            <Link href={INVITY_URL} target="_blank">
+                <Image width={70} image="INVITY_LOGO" />
+            </Link>
+        </CoinmarketFooterLogoWrapper>
     </Wrapper>
 );
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputAccount.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputAccount.tsx
index e88324d13ac..45ba01e038f 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputAccount.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputAccount.tsx
@@ -1,31 +1,28 @@
 import { Controller } from 'react-hook-form';
-import { Row, Select } from '@trezor/components';
+import { createFilter } from 'react-select';
+
+import { FiatCurrencyCode } from 'invity-api';
+
+import { Row, Select, Text } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 import {
     CoinmarketAccountOptionsGroupOptionProps,
     CoinmarketCryptoListProps,
     CoinmarketTradeSellExchangeType,
 } from 'src/types/coinmarket/coinmarket';
-import { CoinmarketFormOptionGroupLabel } from 'src/views/wallet/coinmarket';
-import CoinmarketFormInputLabel from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputLabel';
 import {
     CoinmarketExchangeFormProps,
     CoinmarketFormInputAccountProps,
     CoinmarketSellFormProps,
 } from 'src/types/coinmarket/coinmarketForm';
-import { createFilter } from 'react-select';
-import { useCoinmarketBuildAccountGroups } from 'src/hooks/wallet/coinmarket/form/useCoinmarketSellFormDefaultValues';
 import { CoinmarketFormInputAccountOption } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputAccountOption';
 import { useCoinmarketFiatValues } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketFiatValues';
 import { CoinmarketBalance } from 'src/views/wallet/coinmarket/common/CoinmarketBalance';
-import styled from 'styled-components';
-import { spacings, spacingsPx } from '@trezor/theme';
-import { FiatCurrencyCode } from 'invity-api';
 import { AccountTypeBadge } from 'src/components/suite/AccountTypeBadge';
-
-const CoinmarketBalanceWrapper = styled.div`
-    padding: ${spacingsPx.xs} ${spacingsPx.sm} 0;
-`;
+import { useCoinmarketBuildAccountGroups } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketBuildAccountGroups';
+import { Translation } from 'src/components/suite';
 
 export const CoinmarketFormInputAccount = <
     TFieldValues extends CoinmarketSellFormProps | CoinmarketExchangeFormProps,
@@ -47,67 +44,65 @@ export const CoinmarketFormInputAccount = <
         | CoinmarketAccountOptionsGroupOptionProps
         | undefined;
     const fiatValues = useCoinmarketFiatValues({
-        accountBalance: selectedOption?.balance,
-        cryptoSymbol: selectedOption?.value,
-        tokenAddress: selectedOption?.contractAddress,
+        sendCryptoSelect: selectedOption,
         fiatCurrency: getValues().outputs?.[0]?.currency?.value as FiatCurrencyCode,
     });
 
     return (
-        <>
-            <CoinmarketFormInputLabel label={label} />
-            <Controller
-                name={accountSelectName}
-                control={control}
-                render={({ field: { onChange, value } }) => (
-                    <Select
-                        value={value}
-                        options={optionGroups}
-                        onChange={async (selected: CoinmarketAccountOptionsGroupOptionProps) => {
-                            await onCryptoCurrencyChange(selected); // order matters, this has to be called before onChange
-                            onChange(selected);
-                        }}
-                        filterOption={createFilter<CoinmarketCryptoListProps>({
-                            stringify: option => `${option.label} ${option.data.cryptoName}`,
-                        })}
-                        formatGroupLabel={group => (
-                            <CoinmarketFormOptionGroupLabel>
-                                <Row gap={spacings.xs}>
-                                    {group.label}
-                                    <AccountTypeBadge
-                                        accountType={group.options[0].accountType}
-                                        networkType={group.options[0].value}
-                                        size="small"
-                                    />
-                                </Row>
-                            </CoinmarketFormOptionGroupLabel>
-                        )}
-                        formatOptionLabel={(
-                            option: CoinmarketAccountOptionsGroupOptionProps,
-                            { context },
-                        ) => (
-                            <CoinmarketFormInputAccountOption
-                                option={option}
-                                optionGroups={optionGroups}
-                                isSelected={context === 'value'}
+        <Controller
+            name={accountSelectName}
+            control={control}
+            render={({ field: { onChange, value } }) => (
+                <Select
+                    value={value}
+                    labelLeft={label && <Translation id={label} />}
+                    options={optionGroups}
+                    onChange={async (selected: CoinmarketAccountOptionsGroupOptionProps) => {
+                        await onCryptoCurrencyChange(selected); // order matters, this has to be called before onChange
+                        onChange(selected);
+                    }}
+                    filterOption={createFilter<CoinmarketCryptoListProps>({
+                        stringify: option => `${option.label} ${option.data.cryptoName}`,
+                    })}
+                    formatGroupLabel={group => (
+                        <Text as="div" variant="tertiary">
+                            <Row gap={spacings.xs}>
+                                {group.label}
+                                <AccountTypeBadge
+                                    accountType={group.options[0].accountType}
+                                    networkType={group.options[0].value}
+                                    size="small"
+                                />
+                            </Row>
+                        </Text>
+                    )}
+                    formatOptionLabel={(
+                        option: CoinmarketAccountOptionsGroupOptionProps,
+                        { context },
+                    ) => (
+                        <CoinmarketFormInputAccountOption
+                            option={option}
+                            optionGroups={optionGroups}
+                            decimals={option.decimals}
+                            isSelected={context === 'value'}
+                        />
+                    )}
+                    data-testid="@coinmarket/form/select-account"
+                    isClearable={false}
+                    isSearchable
+                    bottomText={
+                        fiatValues && (
+                            <CoinmarketBalance
+                                balance={fiatValues.accountBalance}
+                                networkSymbol={fiatValues.networkSymbol}
+                                tokenAddress={fiatValues.tokenAddress}
+                                cryptoSymbolLabel={selectedOption?.label}
+                                sendCryptoSelect={selectedOption}
                             />
-                        )}
-                        data-testid="@coinmarket/form/select-account"
-                        isClearable={false}
-                        isSearchable
-                    />
-                )}
-            />
-            {fiatValues && (
-                <CoinmarketBalanceWrapper>
-                    <CoinmarketBalance
-                        balance={fiatValues.accountBalance}
-                        networkSymbol={fiatValues.networkSymbol}
-                        tokenAddress={fiatValues.tokenAddress}
-                        cryptoSymbolLabel={selectedOption?.label}
-                    />
-                </CoinmarketBalanceWrapper>
+                        )
+                    }
+                />
             )}
-        </>
+        />
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputAccountOption.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputAccountOption.tsx
index 11a7de53083..73488afc116 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputAccountOption.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputAccountOption.tsx
@@ -1,5 +1,7 @@
-import { amountToSatoshi } from '@suite-common/wallet-utils';
-import { useElevation } from '@trezor/components';
+import { amountToSmallestUnit } from '@suite-common/wallet-utils';
+import { Row, Text, Badge } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { HiddenPlaceholder } from 'src/components/suite';
 import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
 import {
@@ -11,36 +13,30 @@ import {
     cryptoIdToNetwork,
     parseCryptoId,
 } from 'src/utils/wallet/coinmarket/coinmarketUtils';
-import {
-    CoinmarketFormOption,
-    CoinmarketFormOptionLabel,
-    CoinmarketFormOptionLabelLong,
-    CoinmarketFormOptionLogo,
-    CoinmarketFormOptionNetwork,
-} from 'src/views/wallet/coinmarket';
+import { CoinmarketCoinLogo } from 'src/views/wallet/coinmarket/common/CoinmarketCoinLogo';
 
 interface CoinmarketFormInputAccountOptionProps {
     option: CoinmarketAccountOptionsGroupOptionProps;
     optionGroups: CoinmarketAccountsOptionsGroupProps[];
+    decimals: number;
     isSelected: boolean;
 }
 
 export const CoinmarketFormInputAccountOption = ({
     option,
     optionGroups,
+    decimals,
     isSelected,
 }: CoinmarketFormInputAccountOptionProps) => {
     const { contractAddress } = parseCryptoId(option.value);
     const network = cryptoIdToNetwork(option.value);
-
     const { shouldSendInSats } = useBitcoinAmountUnit(network?.symbol);
-    const { elevation } = useElevation();
 
     if (!network) return null;
 
     const balanceLabel = coinmarketGetAccountLabel(option.label, shouldSendInSats);
     const balance = shouldSendInSats
-        ? amountToSatoshi(option.balance, network.decimals)
+        ? amountToSmallestUnit(option.balance, decimals)
         : option.balance;
     const accountType = optionGroups.find(group =>
         group.options.find(
@@ -50,11 +46,13 @@ export const CoinmarketFormInputAccountOption = ({
     )?.label;
 
     return (
-        <CoinmarketFormOption>
-            <CoinmarketFormOptionLogo cryptoId={option.value} size={20} />
-            <CoinmarketFormOptionLabel>{option.label}</CoinmarketFormOptionLabel>
-            <CoinmarketFormOptionLabelLong>{option.cryptoName}</CoinmarketFormOptionLabelLong>
-            <CoinmarketFormOptionLabelLong>
+        <Row gap={spacings.sm}>
+            <CoinmarketCoinLogo cryptoId={option.value} size={20} />
+            <Text>{option.label}</Text>
+            <Text variant="tertiary" typographyStyle="label">
+                {option.cryptoName}
+            </Text>
+            <Text variant="tertiary" typographyStyle="label">
                 {!isSelected ? (
                     <HiddenPlaceholder>
                         ({balance} {balanceLabel})
@@ -62,12 +60,10 @@ export const CoinmarketFormInputAccountOption = ({
                 ) : (
                     accountType && `(${accountType})`
                 )}
-            </CoinmarketFormOptionLabelLong>
+            </Text>
             {option.value && contractAddress && network && (
-                <CoinmarketFormOptionNetwork $elevation={elevation}>
-                    {network.name}
-                </CoinmarketFormOptionNetwork>
+                <Badge size="small">{network.name}</Badge>
             )}
-        </CoinmarketFormOption>
+        </Row>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCountry.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCountry.tsx
index 27be839f890..fddc40630d0 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCountry.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCountry.tsx
@@ -1,83 +1,56 @@
 import { Control, Controller } from 'react-hook-form';
-import { Flag, Select } from '@trezor/components';
+
+import { Flag, Select, Row } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import regional from 'src/constants/wallet/coinmarket/regional';
 import { CountryOption } from 'src/types/wallet/coinmarketCommonTypes';
 import { getCountryLabelParts } from 'src/utils/wallet/coinmarket/coinmarketUtils';
-import styled from 'styled-components';
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-import { borders, spacingsPx } from '@trezor/theme';
-import CoinmarketFormInputLabel from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputLabel';
 import {
     CoinmarketBuySellFormProps,
     CoinmarketFormInputDefaultProps,
 } from 'src/types/coinmarket/coinmarketForm';
-import { CoinmarketFormOption, CoinmarketFormOptionLabel } from 'src/views/wallet/coinmarket';
 import { FORM_COUNTRY_SELECT } from 'src/constants/wallet/coinmarket/form';
 import { CoinmarketTradeBuySellType } from 'src/types/coinmarket/coinmarket';
+import { Translation } from 'src/components/suite';
 
-const FlagContainer = styled.div`
-    position: relative;
-    width: 20px;
-    height: 20px;
-    border-radius: ${borders.radii.full};
-    overflow: hidden;
-    margin-right: ${spacingsPx.xs};
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const FlagWrapper = styled(Flag)`
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    object-fit: cover;
-    object-position: 50% 50%;
-`;
-
-const CoinmarketFormInputCountry = ({ label }: CoinmarketFormInputDefaultProps) => {
+export const CoinmarketFormInputCountry = ({ label }: CoinmarketFormInputDefaultProps) => {
     const { control, setAmountLimits, defaultCountry } =
         useCoinmarketFormContext<CoinmarketTradeBuySellType>();
 
     return (
-        <>
-            <CoinmarketFormInputLabel label={label} />
-            <Controller
-                name={FORM_COUNTRY_SELECT}
-                defaultValue={defaultCountry}
-                control={control as Control<CoinmarketBuySellFormProps>}
-                render={({ field: { onChange, value } }) => (
-                    <Select
-                        value={value}
-                        options={regional.countriesOptions}
-                        onChange={selected => {
-                            onChange(selected);
-                            setAmountLimits(undefined);
-                        }}
-                        formatOptionLabel={(option: CountryOption) => {
-                            const labelParts = getCountryLabelParts(option.label);
-                            if (!labelParts) return null;
+        <Controller
+            name={FORM_COUNTRY_SELECT}
+            defaultValue={defaultCountry}
+            control={control as Control<CoinmarketBuySellFormProps>}
+            render={({ field: { onChange, value } }) => (
+                <Select
+                    value={value}
+                    options={regional.countriesOptions}
+                    labelLeft={label && <Translation id={label} />}
+                    onChange={selected => {
+                        onChange(selected);
+                        setAmountLimits(undefined);
+                    }}
+                    formatOptionLabel={(option: CountryOption) => {
+                        const labelParts = getCountryLabelParts(option.label);
+                        if (!labelParts) return null;
+
+                        return (
+                            <Row gap={spacings.xs}>
+                                <Flag country={option.value} />
 
-                            return (
-                                <CoinmarketFormOption>
-                                    <FlagContainer>
-                                        <FlagWrapper country={option.value} />
-                                    </FlagContainer>
-                                    <CoinmarketFormOptionLabel>
-                                        {labelParts.text}
-                                    </CoinmarketFormOptionLabel>
-                                </CoinmarketFormOption>
-                            );
-                        }}
-                        data-testid="@coinmarket/form/country-select"
-                        isClearable={false}
-                        minValueWidth="160px"
-                        isSearchable
-                    />
-                )}
-            />
-        </>
+                                {labelParts.text}
+                            </Row>
+                        );
+                    }}
+                    data-testid="@coinmarket/form/country-select"
+                    isClearable={false}
+                    minValueWidth="160px"
+                    isSearchable
+                />
+            )}
+        />
     );
 };
-
-export default CoinmarketFormInputCountry;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCryptoSelect.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCryptoSelect.tsx
index ca495a4d3e0..39b49c2acb4 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCryptoSelect.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCryptoSelect.tsx
@@ -1,19 +1,17 @@
 import { Controller } from 'react-hook-form';
-import { Select, useElevation } from '@trezor/components';
+import { useMemo, useState } from 'react';
+
+import { Select, Row, Badge, Text } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+import { NetworkSymbol, networks } from '@suite-common/wallet-config';
+import { SelectAssetModal } from '@trezor/product-components';
+
 import {
     CoinmarketAccountOptionsGroupOptionProps,
     CoinmarketCryptoSelectItemProps,
     CoinmarketTradeBuyExchangeType,
 } from 'src/types/coinmarket/coinmarket';
-import { useMemo, useState } from 'react';
-import {
-    CoinmarketFormOption,
-    CoinmarketFormOptionLabel,
-    CoinmarketFormOptionLabelLong,
-    CoinmarketFormOptionLogo,
-    CoinmarketFormOptionNetwork,
-} from 'src/views/wallet/coinmarket';
-import CoinmarketFormInputLabel from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputLabel';
+import { Translation } from 'src/components/suite';
 import {
     CoinmarketBuyFormProps,
     CoinmarketExchangeFormProps,
@@ -22,13 +20,12 @@ import {
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
 import { parseCryptoId } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-import { isCoinmarketExchangeOffers } from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
-import { SelectAssetModal } from '@trezor/product-components';
-import { networks, NetworkSymbol } from '@suite-common/wallet-config';
 import {
     FORM_CRYPTO_CURRENCY_SELECT,
     FORM_RECEIVE_CRYPTO_CURRENCY_SELECT,
 } from 'src/constants/wallet/coinmarket/form';
+import { isCoinmarketExchangeContext } from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
+import { CoinmarketCoinLogo } from 'src/views/wallet/coinmarket/common/CoinmarketCoinLogo';
 
 export const CoinmarketFormInputCryptoSelect = <
     TFieldValues extends CoinmarketBuyFormProps | CoinmarketExchangeFormProps,
@@ -37,14 +34,14 @@ export const CoinmarketFormInputCryptoSelect = <
     cryptoSelectName,
     supportedCryptoCurrencies,
     methods,
+    isDisabled,
 }: CoinmarketFormInputCryptoSelectProps<TFieldValues>) => {
     const context = useCoinmarketFormContext<CoinmarketTradeBuyExchangeType>();
     const { buildCryptoOptions, cryptoIdToPlatformName } = useCoinmarketInfo();
-    const { elevation } = useElevation();
     const { control } = methods;
     const [isModalActive, setIsModalActive] = useState(false);
 
-    const sendCryptoSelectValue = isCoinmarketExchangeOffers(context)
+    const sendCryptoSelectValue = isCoinmarketExchangeContext(context)
         ? context.getValues()?.sendCryptoSelect?.value
         : null;
 
@@ -64,7 +61,7 @@ export const CoinmarketFormInputCryptoSelect = <
 
         if (!findOption) return;
 
-        if (isCoinmarketExchangeOffers(context)) {
+        if (isCoinmarketExchangeContext(context)) {
             context.setValue(FORM_RECEIVE_CRYPTO_CURRENCY_SELECT, findOption);
         } else {
             context.setValue(FORM_CRYPTO_CURRENCY_SELECT, findOption);
@@ -89,7 +86,6 @@ export const CoinmarketFormInputCryptoSelect = <
 
     return (
         <>
-            <CoinmarketFormInputLabel label={label} />
             {isModalActive && (
                 <SelectAssetModal
                     options={options}
@@ -105,31 +101,27 @@ export const CoinmarketFormInputCryptoSelect = <
                     <Select
                         value={value}
                         options={options}
+                        labelLeft={label && <Translation id={label} />}
                         onMenuOpen={() => setIsModalActive(true)}
                         formatOptionLabel={(option: CoinmarketAccountOptionsGroupOptionProps) => {
                             const { networkId, contractAddress } = parseCryptoId(option.value);
                             const platform = cryptoIdToPlatformName(networkId);
 
                             return (
-                                <CoinmarketFormOption>
-                                    <CoinmarketFormOptionLogo cryptoId={option.value} size={20} />
-                                    <CoinmarketFormOptionLabel>
-                                        {option.label}
-                                    </CoinmarketFormOptionLabel>
-                                    <CoinmarketFormOptionLabelLong>
+                                <Row gap={spacings.sm}>
+                                    <CoinmarketCoinLogo cryptoId={option.value} size={20} />
+                                    <Text>{option.label}</Text>
+                                    <Text variant="tertiary" typographyStyle="label">
                                         {option.cryptoName}
-                                    </CoinmarketFormOptionLabelLong>
-                                    {contractAddress && (
-                                        <CoinmarketFormOptionNetwork $elevation={elevation}>
-                                            {platform}
-                                        </CoinmarketFormOptionNetwork>
-                                    )}
-                                </CoinmarketFormOption>
+                                    </Text>
+                                    {contractAddress && <Badge size="small">{platform}</Badge>}
+                                </Row>
                             );
                         }}
                         data-testid="@coinmarket/form/select-crypto"
                         isClearable={false}
                         isMenuOpen={false}
+                        isDisabled={isDisabled}
                     />
                 )}
             />
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCurrency.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCurrency.tsx
index 1fc44687182..0a3db603136 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCurrency.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCurrency.tsx
@@ -1,18 +1,15 @@
-import { buildCurrencyOptions } from '@suite-common/wallet-utils';
-import { Select } from '@trezor/components';
 import { useMemo } from 'react';
 import { Control, Controller } from 'react-hook-form';
+
+import { buildCurrencyOptions } from '@suite-common/wallet-utils';
+import { Select } from '@trezor/components';
+
 import {
     FORM_FIAT_CURRENCY_SELECT,
     FORM_FIAT_INPUT,
     FORM_OUTPUT_CURRENCY,
 } from 'src/constants/wallet/coinmarket/form';
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-import {
-    isCoinmarketBuyOffers,
-    isCoinmarketExchangeOffers,
-    isCoinmarketSellOffers,
-} from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
 import {
     CoinmarketAllFormProps,
     CoinmarketFormInputCurrencyProps,
@@ -21,27 +18,19 @@ import { FiatCurrencyOption } from 'src/types/wallet/coinmarketCommonTypes';
 import {
     getFiatCurrenciesProps,
     getSelectedCurrency,
+    isCoinmarketBuyContext,
+    isCoinmarketExchangeContext,
+    isCoinmarketSellContext,
 } from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
 import { buildFiatOption } from 'src/utils/wallet/coinmarket/coinmarketUtils';
-import { CoinmarketFormOption, CoinmarketFormOptionLabel } from 'src/views/wallet/coinmarket';
-import styled from 'styled-components';
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const SelectWrapper = styled(Select)`
-    /* stylelint-disable selector-class-pattern */
-    .react-select__value-container {
-        padding: 0;
-    }
-`;
-
-const CoinmarketFormInputCurrency = ({
+export const CoinmarketFormInputCurrency = ({
     isClean = true,
-    size = 'large',
-    isDarkLabel = false,
+    width = 100,
 }: CoinmarketFormInputCurrencyProps) => {
     const context = useCoinmarketFormContext();
     const { control, setAmountLimits, defaultCurrency } = context;
-    const name = isCoinmarketBuyOffers(context) ? FORM_FIAT_CURRENCY_SELECT : FORM_OUTPUT_CURRENCY;
+    const name = isCoinmarketBuyContext(context) ? FORM_FIAT_CURRENCY_SELECT : FORM_OUTPUT_CURRENCY;
     const currentCurrency = getSelectedCurrency(context);
     const fiatCurrencies = getFiatCurrenciesProps(context);
     const currencies = fiatCurrencies?.supportedFiatCurrencies ?? null;
@@ -56,14 +45,14 @@ const CoinmarketFormInputCurrency = ({
     );
 
     const onChangeAdditional = (option: FiatCurrencyOption) => {
-        if (isCoinmarketBuyOffers(context)) {
+        if (isCoinmarketBuyContext(context)) {
             context.setValue(
                 FORM_FIAT_INPUT,
                 fiatCurrencies?.defaultAmountsOfFiatCurrencies?.get(option.value) ?? '',
             );
         }
 
-        if (isCoinmarketExchangeOffers(context) || isCoinmarketSellOffers(context)) {
+        if (isCoinmarketExchangeContext(context) || isCoinmarketSellContext(context)) {
             context.form.helpers.onFiatCurrencyChange(option.value);
         }
     };
@@ -74,7 +63,7 @@ const CoinmarketFormInputCurrency = ({
             defaultValue={defaultCurrency}
             control={control as Control<CoinmarketAllFormProps>}
             render={({ field: { onChange, value } }) => (
-                <SelectWrapper
+                <Select
                     value={value}
                     onChange={(selected: FiatCurrencyOption) => {
                         onChange(selected);
@@ -83,23 +72,14 @@ const CoinmarketFormInputCurrency = ({
                         onChangeAdditional(selected);
                     }}
                     options={options}
-                    formatOptionLabel={option => (
-                        <CoinmarketFormOption>
-                            <CoinmarketFormOptionLabel $isDark={isDarkLabel}>
-                                {option.label}
-                            </CoinmarketFormOptionLabel>
-                        </CoinmarketFormOption>
-                    )}
                     data-testid="@coinmarket/form/fiat-currency-select"
-                    minValueWidth="58px"
                     isClearable={false}
                     isClean={isClean}
-                    size={size}
+                    size="small"
                     isSearchable
+                    width={width}
                 />
             )}
         />
     );
 };
-
-export default CoinmarketFormInputCurrency;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputCryptoAmount.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputCryptoAmount.tsx
index b3f00a42b55..4cf84895284 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputCryptoAmount.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputCryptoAmount.tsx
@@ -1,3 +1,11 @@
+import { FieldErrors } from 'react-hook-form';
+
+import { getInputState } from '@suite-common/wallet-utils';
+import { formInputsMaxLength } from '@suite-common/validators';
+import { useFormatters } from '@suite-common/formatters';
+import { FormState } from '@suite-common/wallet-types';
+import { useDidUpdate } from '@trezor/react-utils';
+
 import { useTranslation } from 'src/hooks/suite';
 import { NumberInput } from 'src/components/suite';
 import {
@@ -7,10 +15,7 @@ import {
     validateMin,
     validateReserveOrBalance,
 } from 'src/utils/suite/validation';
-import { getInputState } from '@suite-common/wallet-utils';
-import { formInputsMaxLength } from '@suite-common/validators';
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-import { useFormatters } from '@suite-common/formatters';
 import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
 import {
     CoinmarketAllFormProps,
@@ -18,28 +23,33 @@ import {
     CoinmarketFormInputFiatCryptoProps,
     CoinmarketSellExchangeFormProps,
 } from 'src/types/coinmarket/coinmarketForm';
-import { CoinmarketFormOptionLabel } from 'src/views/wallet/coinmarket';
-import { FieldErrors } from 'react-hook-form';
-import { coinmarketGetAccountLabel } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import {
-    isCoinmarketBuyOffers,
-    isCoinmarketExchangeOffers,
-    isCoinmarketSellOffers,
-} from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
-import { useDidUpdate } from '@trezor/react-utils';
-import { FORM_OUTPUT_AMOUNT, FORM_OUTPUT_MAX } from 'src/constants/wallet/coinmarket/form';
+    coinmarketGetAccountLabel,
+    getCoinmarketNetworkDecimals,
+} from 'src/utils/wallet/coinmarket/coinmarketUtils';
+import {
+    FORM_OUTPUT_AMOUNT,
+    FORM_OUTPUT_MAX,
+    FORM_SEND_CRYPTO_CURRENCY_SELECT,
+} from 'src/constants/wallet/coinmarket/form';
 import {
     CoinmarketAccountOptionsGroupOptionProps,
     CoinmarketCryptoListProps,
 } from 'src/types/coinmarket/coinmarket';
-import { FormState } from '@suite-common/wallet-types';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
+import {
+    isCoinmarketBuyContext,
+    isCoinmarketExchangeContext,
+    isCoinmarketSellContext,
+} from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
 
 export const CoinmarketFormInputCryptoAmount = <TFieldValues extends CoinmarketAllFormProps>({
     cryptoInputName,
     fiatInputName,
     cryptoSelectName,
     methods,
+    labelLeft,
+    labelRight,
 }: CoinmarketFormInputFiatCryptoProps<TFieldValues>) => {
     const { translationString } = useTranslation();
     const { CryptoAmountFormatter } = useFormatters();
@@ -63,19 +73,25 @@ export const CoinmarketFormInputCryptoAmount = <TFieldValues extends CoinmarketA
             ? (errors as FieldErrors<CoinmarketSellExchangeFormProps>)?.outputs?.[0]?.amount
             : (errors as FieldErrors<CoinmarketBuyFormProps>).cryptoInput;
     const networkSymbol = cryptoSelect?.value && cryptoIdToCoinSymbol(cryptoSelect?.value);
+    const decimals = getCoinmarketNetworkDecimals({
+        sendCryptoSelect: !isCoinmarketBuyContext(context)
+            ? context.getValues()[FORM_SEND_CRYPTO_CURRENCY_SELECT]
+            : undefined,
+        network,
+    });
 
     const cryptoInputRules = {
         validate: {
             min: validateMin(translationString),
             integer: validateInteger(translationString, { except: !shouldSendInSats }),
-            decimals: validateDecimals(translationString, { decimals: network.decimals }),
+            decimals: validateDecimals(translationString, { decimals }),
             limits: validateLimits(translationString, {
                 amountLimits,
                 areSatsUsed: !!shouldSendInSats,
                 formatter: CryptoAmountFormatter,
             }),
 
-            ...(!isCoinmarketBuyOffers(context)
+            ...(!isCoinmarketBuyContext(context)
                 ? {
                       reserveOrBalance: validateReserveOrBalance(translationString, {
                           account,
@@ -96,11 +112,13 @@ export const CoinmarketFormInputCryptoAmount = <TFieldValues extends CoinmarketA
     return (
         <NumberInput
             name={cryptoInputName}
+            labelLeft={labelLeft}
+            labelRight={labelRight}
             onChange={() => {
-                if (isCoinmarketSellOffers(context)) {
+                if (isCoinmarketSellContext(context)) {
                     context.setValue(FORM_OUTPUT_MAX, undefined, { shouldDirty: true });
                 }
-                if (isCoinmarketExchangeOffers(context)) {
+                if (isCoinmarketExchangeContext(context)) {
                     context.setValue(FORM_OUTPUT_MAX, undefined, { shouldDirty: true });
                 }
 
@@ -113,12 +131,12 @@ export const CoinmarketFormInputCryptoAmount = <TFieldValues extends CoinmarketA
             bottomText={cryptoInputError?.message || null}
             hasBottomPadding={false}
             innerAddon={
-                <CoinmarketFormOptionLabel>
+                <>
                     {coinmarketGetAccountLabel(
                         cryptoSelect?.value && networkSymbol ? networkSymbol : '',
                         shouldSendInSats,
                     )}
-                </CoinmarketFormOptionLabel>
+                </>
             }
             data-testid="@coinmarket/form/crypto-input"
         />
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputFiat.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputFiat.tsx
index 8723f0e02f1..06187c081ba 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputFiat.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputFiat.tsx
@@ -1,37 +1,29 @@
+import { FieldErrors, UseControllerProps } from 'react-hook-form';
+
+import { getInputState } from '@suite-common/wallet-utils';
+import { formInputsMaxLength } from '@suite-common/validators';
+import { useDidUpdate } from '@trezor/react-utils';
+
 import { useTranslation } from 'src/hooks/suite';
 import { NumberInput } from 'src/components/suite';
 import { validateDecimals, validateMin } from 'src/utils/suite/validation';
-import { getInputState } from '@suite-common/wallet-utils';
-import { formInputsMaxLength } from '@suite-common/validators';
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-import { useDidUpdate } from '@trezor/react-utils';
-import CoinmarketFormInputCurrency from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCurrency';
+import { CoinmarketFormInputCurrency } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCurrency';
 import {
     CoinmarketAllFormProps,
     CoinmarketBuyFormProps,
     CoinmarketFormInputFiatCryptoProps,
     CoinmarketSellExchangeFormProps,
 } from 'src/types/coinmarket/coinmarketForm';
-import styled from 'styled-components';
-import { isCoinmarketExchangeOffers } from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
-import { FieldErrors, UseControllerProps } from 'react-hook-form';
 import { FORM_OUTPUT_AMOUNT, FORM_OUTPUT_FIAT } from 'src/constants/wallet/coinmarket/form';
+import { isCoinmarketExchangeContext } from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
 
-const CoinmarketFormInputCurrencyWrapper = styled(CoinmarketFormInputCurrency)`
-    width: 64px;
-
-    /* stylelint-disable selector-class-pattern */
-    .react-select__indicators {
-        position: absolute;
-        top: 7px;
-        right: 4px;
-    }
-`;
-
-const CoinmarketFormInputFiat = <TFieldValues extends CoinmarketAllFormProps>({
+export const CoinmarketFormInputFiat = <TFieldValues extends CoinmarketAllFormProps>({
     cryptoInputName,
     fiatInputName,
     methods,
+    labelLeft,
+    labelRight,
 }: CoinmarketFormInputFiatCryptoProps<TFieldValues>) => {
     const { translationString } = useTranslation();
     const context = useCoinmarketFormContext();
@@ -53,7 +45,7 @@ const CoinmarketFormInputFiat = <TFieldValues extends CoinmarketAllFormProps>({
             : undefined;
 
     const fiatInputRules: UseControllerProps['rules'] = {
-        ...(isCoinmarketExchangeOffers(context)
+        ...(isCoinmarketExchangeContext(context)
             ? {
                   validate: {
                       min: validateMin(translationString),
@@ -101,6 +93,8 @@ const CoinmarketFormInputFiat = <TFieldValues extends CoinmarketAllFormProps>({
     return (
         <NumberInput
             name={fiatInputName}
+            labelLeft={labelLeft}
+            labelRight={labelRight}
             onChange={() => {
                 clearErrors(cryptoInputName);
             }}
@@ -109,11 +103,9 @@ const CoinmarketFormInputFiat = <TFieldValues extends CoinmarketAllFormProps>({
             rules={fiatInputRules}
             maxLength={formInputsMaxLength.amount}
             bottomText={fiatInputError?.message ?? cryptoInputError?.message ?? null}
-            innerAddon={<CoinmarketFormInputCurrencyWrapper />}
+            innerAddon={<CoinmarketFormInputCurrency width={100} />}
             hasBottomPadding={false}
             data-testid="@coinmarket/form/fiat-input"
         />
     );
 };
-
-export default CoinmarketFormInputFiat;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputFiatCrypto.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputFiatCrypto.tsx
index 5da882d37f5..048c748b2eb 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputFiatCrypto.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputFiatCrypto.tsx
@@ -5,12 +5,12 @@ import {
     CoinmarketFormInputFiatCryptoWrapProps,
     CoinmarketSellFormProps,
 } from 'src/types/coinmarket/coinmarketForm';
-import CoinmarketFormSwitcherCryptoFiat from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherCryptoFiat';
-import CoinmarketFormInputFiat from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputFiat';
-import CoinmarketFormInputLabel from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputLabel';
+import { CoinmarketFormSwitcherCryptoFiat } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherCryptoFiat';
 import { coinmarketGetAmountLabels } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import { CoinmarketFormInputCryptoAmount } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputCryptoAmount';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
+import { CoinmarketFormInputFiat } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputFiat';
+import { Translation } from 'src/components/suite';
 
 export const CoinmarketFormInputFiatCrypto = <
     TFieldValues extends
@@ -28,40 +28,39 @@ export const CoinmarketFormInputFiatCrypto = <
             state: { isFormLoading, toggleAmountInCrypto },
         },
     } = useCoinmarketFormContext();
-
-    const { amountInCrypto } = formProps.methods.getValues();
+    const {
+        cryptoCurrencyLabel,
+        cryptoInputName,
+        currencySelectLabel,
+        cryptoSelectName,
+        methods,
+        fiatInputName,
+    } = formProps;
+    const { amountInCrypto } = methods.getValues();
     const amountLabels = coinmarketGetAmountLabels({ type, amountInCrypto });
 
-    return (
-        <>
-            {showLabel ? (
-                <CoinmarketFormInputLabel label={amountLabels.inputLabel}>
-                    <CoinmarketFormSwitcherCryptoFiat
-                        symbol={
-                            !amountInCrypto && formProps.cryptoCurrencyLabel
-                                ? cryptoIdToCoinSymbol(formProps.cryptoCurrencyLabel)
-                                : formProps.currencySelectLabel ?? ''
-                        }
-                        isDisabled={isFormLoading}
-                        toggleAmountInCrypto={toggleAmountInCrypto}
-                    />
-                </CoinmarketFormInputLabel>
-            ) : null}
-            {amountInCrypto ? (
-                <CoinmarketFormInputCryptoAmount
-                    cryptoInputName={formProps.cryptoInputName}
-                    fiatInputName={formProps.fiatInputName}
-                    cryptoSelectName={formProps.cryptoSelectName}
-                    methods={{ ...formProps.methods }}
-                />
-            ) : (
-                <CoinmarketFormInputFiat
-                    cryptoInputName={formProps.cryptoInputName}
-                    fiatInputName={formProps.fiatInputName}
-                    cryptoSelectName={formProps.cryptoSelectName}
-                    methods={{ ...formProps.methods }}
-                />
-            )}
-        </>
+    const inputProps = {
+        cryptoInputName,
+        fiatInputName,
+        cryptoSelectName,
+        methods,
+        labelLeft: showLabel ? <Translation id={amountLabels.inputLabel} /> : undefined,
+        labelRight: showLabel ? (
+            <CoinmarketFormSwitcherCryptoFiat
+                symbol={
+                    !amountInCrypto && cryptoCurrencyLabel
+                        ? cryptoIdToCoinSymbol(cryptoCurrencyLabel)
+                        : currencySelectLabel ?? ''
+                }
+                isDisabled={isFormLoading}
+                toggleAmountInCrypto={toggleAmountInCrypto}
+            />
+        ) : undefined,
+    };
+
+    return amountInCrypto ? (
+        <CoinmarketFormInputCryptoAmount {...inputProps} />
+    ) : (
+        <CoinmarketFormInputFiat {...inputProps} />
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputLabel.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputLabel.tsx
deleted file mode 100644
index 08326954edd..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputLabel.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Translation } from 'src/components/suite';
-import { CoinmarketFormInputLabelProps } from 'src/types/coinmarket/coinmarketForm';
-import {
-    CoinmarketFormInputLabelText,
-    CoinmarketFormInputLabelWrapper,
-} from 'src/views/wallet/coinmarket';
-
-const CoinmarketFormInputLabel = ({ label, children }: CoinmarketFormInputLabelProps) => {
-    if (!label) return null;
-
-    return (
-        <CoinmarketFormInputLabelWrapper>
-            <CoinmarketFormInputLabelText>
-                <Translation id={label} />
-            </CoinmarketFormInputLabelText>
-            {children}
-        </CoinmarketFormInputLabelWrapper>
-    );
-};
-
-export default CoinmarketFormInputLabel;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputLoader.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputLoader.tsx
index c694fe66f88..5f9a353776e 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputLoader.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputLoader.tsx
@@ -1,6 +1,7 @@
+import styled from 'styled-components';
+
 import { Spinner, useElevation } from '@trezor/components';
 import { Elevation, borders, mapElevationToBackground, spacingsPx, zIndices } from '@trezor/theme';
-import styled from 'styled-components';
 
 const CoinmarketFormInputLoaderWrapper = styled.div<{ $elevation: Elevation }>`
     display: flex;
@@ -16,7 +17,7 @@ const CoinmarketFormInputLoaderWrapper = styled.div<{ $elevation: Elevation }>`
     padding: 0 ${spacingsPx.md};
 `;
 
-const CoinmarketFormInputLoader = () => {
+export const CoinmarketFormInputLoader = () => {
     const { elevation } = useElevation();
 
     return (
@@ -25,5 +26,3 @@ const CoinmarketFormInputLoader = () => {
         </CoinmarketFormInputLoaderWrapper>
     );
 };
-
-export default CoinmarketFormInputLoader;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputPaymentMethod.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputPaymentMethod.tsx
index 198acb982da..aa44f6b39a4 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputPaymentMethod.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputPaymentMethod.tsx
@@ -1,5 +1,7 @@
 import { Control, Controller } from 'react-hook-form';
+
 import { Select } from '@trezor/components';
+
 import {
     CoinmarketPaymentMethodListProps,
     CoinmarketTradeBuySellType,
@@ -9,18 +11,11 @@ import {
     CoinmarketBuySellFormProps,
     CoinmarketFormInputDefaultProps,
 } from 'src/types/coinmarket/coinmarketForm';
-import CoinmarketFormInputLabel from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputLabel';
-import {
-    CoinmarketFormInputInner,
-    CoinmarketFormOption,
-    CoinmarketFormOptionLabel,
-} from 'src/views/wallet/coinmarket';
 import { CoinmarketPaymentPlainType } from 'src/views/wallet/coinmarket/common/CoinmarketPaymentPlainType';
-import CoinmarketFormInputLoader from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputLoader';
 import { FORM_PAYMENT_METHOD_SELECT } from 'src/constants/wallet/coinmarket/form';
 import { Translation } from 'src/components/suite';
 
-const CoinmarketFormInputPaymentMethod = ({ label }: CoinmarketFormInputDefaultProps) => {
+export const CoinmarketFormInputPaymentMethod = ({ label }: CoinmarketFormInputDefaultProps) => {
     const {
         control,
         paymentMethods,
@@ -40,43 +35,32 @@ const CoinmarketFormInputPaymentMethod = ({ label }: CoinmarketFormInputDefaultP
     };
 
     return (
-        <>
-            <CoinmarketFormInputLabel label={label} />
-            <CoinmarketFormInputInner>
-                <Controller
-                    name={FORM_PAYMENT_METHOD_SELECT}
-                    defaultValue={defaultPaymentMethod}
-                    control={control as Control<CoinmarketBuySellFormProps>}
-                    render={({ field: { onChange, value } }) => (
-                        <Select
-                            value={value}
-                            onChange={onChange}
-                            options={paymentMethods}
-                            formatOptionLabel={(option: CoinmarketPaymentMethodListProps) => (
-                                <CoinmarketFormOption>
-                                    <CoinmarketFormOptionLabel>
-                                        {option.value !== '' && quotes && quotes.length > 0 ? (
-                                            <CoinmarketPaymentPlainType
-                                                method={option.value}
-                                                methodName={option.label}
-                                            />
-                                        ) : (
-                                            getEmptyMethodsLabel()
-                                        )}
-                                    </CoinmarketFormOptionLabel>
-                                </CoinmarketFormOption>
-                            )}
-                            data-testid="@coinmarket/form/payment-method-select"
-                            isClearable={false}
-                            isSearchable
-                            isDisabled={isFormInvalid}
-                        />
-                    )}
+        <Controller
+            name={FORM_PAYMENT_METHOD_SELECT}
+            defaultValue={defaultPaymentMethod}
+            control={control as Control<CoinmarketBuySellFormProps>}
+            render={({ field: { onChange, value } }) => (
+                <Select
+                    value={value}
+                    onChange={onChange}
+                    options={paymentMethods}
+                    labelLeft={label && <Translation id={label} />}
+                    formatOptionLabel={(option: CoinmarketPaymentMethodListProps) =>
+                        option.value !== '' && quotes && quotes.length > 0 ? (
+                            <CoinmarketPaymentPlainType
+                                method={option.value}
+                                methodName={option.label}
+                            />
+                        ) : (
+                            getEmptyMethodsLabel()
+                        )
+                    }
+                    data-testid="@coinmarket/form/payment-method-select"
+                    isClearable={false}
+                    isDisabled={isFormInvalid}
+                    isLoading={isFormLoading}
                 />
-                {isFormLoading && <CoinmarketFormInputLoader />}
-            </CoinmarketFormInputInner>
-        </>
+            )}
+        />
     );
 };
-
-export default CoinmarketFormInputPaymentMethod;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherCryptoFiat.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherCryptoFiat.tsx
index 756de3b0c03..69429d30cb6 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherCryptoFiat.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherCryptoFiat.tsx
@@ -1,5 +1,6 @@
+import { TextButton } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
-import { CoinmarketTextButton } from 'src/views/wallet/coinmarket';
 
 interface CoinmarketFormSwitcherCryptoFiatProps {
     symbol?: string;
@@ -7,12 +8,12 @@ interface CoinmarketFormSwitcherCryptoFiatProps {
     toggleAmountInCrypto: () => void;
 }
 
-const CoinmarketFormSwitcherCryptoFiat = ({
+export const CoinmarketFormSwitcherCryptoFiat = ({
     symbol,
     isDisabled,
     toggleAmountInCrypto,
 }: CoinmarketFormSwitcherCryptoFiatProps) => (
-    <CoinmarketTextButton
+    <TextButton
         size="small"
         onClick={() => {
             toggleAmountInCrypto();
@@ -26,7 +27,5 @@ const CoinmarketFormSwitcherCryptoFiat = ({
                 currency: symbol,
             }}
         />
-    </CoinmarketTextButton>
+    </TextButton>
 );
-
-export default CoinmarketFormSwitcherCryptoFiat;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherExchangeRates.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherExchangeRates.tsx
index b10637780a2..289df2fb1c9 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherExchangeRates.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherExchangeRates.tsx
@@ -1,62 +1,60 @@
-import styled, { css } from 'styled-components';
-import { Radio } from '@trezor/components';
-import { variables } from '@trezor/components/src/config';
+import { UseFormSetValue } from 'react-hook-form';
+
+import styled from 'styled-components';
+
+import { Radio, Column, Card, Grid, Paragraph, useElevation } from '@trezor/components';
+import { borders, spacingsPx, spacings, Elevation, mapElevationToBackground } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
-import { borders, spacingsPx } from '@trezor/theme';
-import CoinmarketFormInputLabel from './CoinmarketFormInputLabel';
 import { CoinmarketExchangeFormProps, RateType } from 'src/types/coinmarket/coinmarketForm';
-import { UseFormSetValue } from 'react-hook-form';
-import { SCREEN_QUERY } from '@trezor/components/src/config/variables';
 import {
     FORM_RATE_FIXED,
     FORM_RATE_FLOATING,
     FORM_RATE_TYPE,
 } from 'src/constants/wallet/coinmarket/form';
+import { TranslationKey } from 'src/components/suite/Translation';
 
-const RadioItems = styled.div`
-    display: flex;
-    padding: ${spacingsPx.xxs};
-    gap: ${spacingsPx.xxs};
-    border-radius: ${borders.radii.md};
-    background-color: ${({ theme }) => theme.backgroundSurfaceElevation2};
-
-    ${SCREEN_QUERY.BELOW_LAPTOP} {
-        margin-bottom: ${spacingsPx.md};
-    }
-`;
-
-const RadioItem = styled.div<{ $isSelected: boolean }>`
-    flex: 1;
+const ItemWrapper = styled.div<{ $isSelected: boolean; $elevation: Elevation }>`
     padding: ${spacingsPx.sm} ${spacingsPx.md};
     border-radius: ${borders.radii.sm};
+    background: ${mapElevationToBackground};
 
-    .header {
-        margin-bottom: ${spacingsPx.xxs};
-        color: ${({ theme }) => theme.textDefault};
-    }
+    ${({ $isSelected }) => !$isSelected && 'background: none;'}
+`;
 
-    .description {
-        font-size: ${variables.FONT_SIZE.SMALL};
-        color: ${({ theme }) => theme.textSubdued};
-    }
+type ItemProps = {
+    isSelected: boolean;
+    onClick: () => void;
+    title: TranslationKey;
+    label: TranslationKey;
+};
 
-    ${({ $isSelected }) =>
-        $isSelected
-            ? css`
-                  background-color: ${({ theme }) => theme.backgroundSurfaceElevation1};
-              `
-            : css`
-                  .header,
-                  .description {
-                      color: ${({ theme }) => theme.textDisabled};
-                  }
-              `}
-`;
+const Item = ({ isSelected, onClick, title, label }: ItemProps) => {
+    const { elevation } = useElevation();
 
-interface CoinmarketFormSwitcherExchangeRatesProps {
+    return (
+        <ItemWrapper $isSelected={isSelected} $elevation={elevation}>
+            <Radio labelAlignment="left" isChecked={isSelected} onClick={onClick}>
+                <Column alignItems="flex-start" gap={spacings.xxxs}>
+                    <Paragraph variant={isSelected ? 'default' : 'disabled'}>
+                        <Translation id={title} />
+                    </Paragraph>
+                    <Paragraph
+                        typographyStyle="hint"
+                        variant={isSelected ? 'tertiary' : 'disabled'}
+                    >
+                        <Translation id={label} />
+                    </Paragraph>
+                </Column>
+            </Radio>
+        </ItemWrapper>
+    );
+};
+
+type CoinmarketFormSwitcherExchangeRatesProps = {
     rateType: RateType;
     setValue: UseFormSetValue<CoinmarketExchangeFormProps>;
-}
+};
 
 export const CoinmarketFormSwitcherExchangeRates = ({
     rateType,
@@ -65,42 +63,28 @@ export const CoinmarketFormSwitcherExchangeRates = ({
     const floatingRateSelected = rateType === FORM_RATE_FLOATING;
 
     return (
-        <>
-            <CoinmarketFormInputLabel label="TR_COINMARKET_RATE" />
-            <RadioItems>
-                <RadioItem $isSelected={!floatingRateSelected}>
-                    <Radio
-                        labelAlignment="left"
-                        isChecked={!floatingRateSelected}
+        <Column alignItems="stretch" gap={spacings.xs}>
+            <Translation id="TR_COINMARKET_RATE" />
+            <Card paddingType="none">
+                <Grid
+                    columns={2}
+                    margin={{ vertical: spacings.xs, horizontal: spacings.xs }}
+                    gap={spacings.xs}
+                >
+                    <Item
+                        isSelected={!floatingRateSelected}
                         onClick={() => setValue(FORM_RATE_TYPE, FORM_RATE_FIXED)}
-                    >
-                        <div>
-                            <div className="header">
-                                <Translation id="TR_COINMARKET_FIX_RATE" />
-                            </div>
-                            <div className="description">
-                                <Translation id="TR_COINMARKET_FIX_RATE_DESCRIPTION" />
-                            </div>
-                        </div>
-                    </Radio>
-                </RadioItem>
-                <RadioItem $isSelected={floatingRateSelected}>
-                    <Radio
-                        labelAlignment="left"
-                        isChecked={floatingRateSelected}
+                        title="TR_COINMARKET_FIX_RATE"
+                        label="TR_COINMARKET_FIX_RATE_DESCRIPTION"
+                    />
+                    <Item
+                        isSelected={floatingRateSelected}
                         onClick={() => setValue(FORM_RATE_TYPE, FORM_RATE_FLOATING)}
-                    >
-                        <div>
-                            <div className="header">
-                                <Translation id="TR_COINMARKET_FLOATING_RATE" />
-                            </div>
-                            <div className="description">
-                                <Translation id="TR_COINMARKET_FLOATING_RATE_DESCRIPTION" />
-                            </div>
-                        </div>
-                    </Radio>
-                </RadioItem>
-            </RadioItems>
-        </>
+                        title="TR_COINMARKET_FLOATING_RATE"
+                        label="TR_COINMARKET_FLOATING_RATE_DESCRIPTION"
+                    />
+                </Grid>
+            </Card>
+        </Column>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInputs.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInputs.tsx
index 66328f35370..f0647be0b68 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInputs.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInputs.tsx
@@ -1,4 +1,9 @@
-import { spacings, spacingsPx } from '@trezor/theme';
+import { spacings } from '@trezor/theme';
+import { Row, Column, Card, ElevationContext } from '@trezor/components';
+import { hasBitcoinOnlyFirmware } from '@trezor/device-utils/src/firmwareUtils';
+import { TokenAddress } from '@suite-common/wallet-types';
+import { formatAmount } from '@suite-common/wallet-utils';
+
 import { Fees } from 'src/components/wallet/Fees/Fees';
 import {
     FORM_CRYPTO_CURRENCY_SELECT,
@@ -10,38 +15,29 @@ import {
     FORM_SEND_CRYPTO_CURRENCY_SELECT,
 } from 'src/constants/wallet/coinmarket/form';
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-import {
-    isCoinmarketExchangeOffers,
-    isCoinmarketSellOffers,
-} from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
 import {
     CoinmarketBuyFormProps,
     CoinmarketExchangeFormProps,
     CoinmarketSellFormProps,
 } from 'src/types/coinmarket/coinmarketForm';
-import { CoinmarketFormInput, CoinmarketBorder } from 'src/views/wallet/coinmarket';
 import { CoinmarketFormInputCryptoSelect } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCryptoSelect';
 import { CoinmarketFormInputAccount } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputAccount';
-import CoinmarketFormInputCountry from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCountry';
-import CoinmarketFormInputPaymentMethod from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputPaymentMethod';
-import styled from 'styled-components';
+import { CoinmarketFormInputCountry } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCountry';
+import { CoinmarketFormInputPaymentMethod } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputPaymentMethod';
 import { CoinmarketFormSwitcherExchangeRates } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormSwitcherExchangeRates';
 import { CoinmarketFormInputFiatCrypto } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputFiatCrypto';
 import { CoinmarketFractionButtons } from 'src/views/wallet/coinmarket/common/CoinmarketFractionButtons';
-import { Row } from '@trezor/components';
 import { CoinmarketBalance } from 'src/views/wallet/coinmarket/common/CoinmarketBalance';
-import { TokenAddress } from '@suite-common/wallet-types';
-import { formatAmount } from '@suite-common/wallet-utils';
-import { getNetworkDecimals } from 'src/utils/wallet/coinmarket/coinmarketUtils';
-
-const CoinmarketFeesWrapper = styled.div`
-    margin-bottom: ${spacingsPx.md};
-`;
+import { getCoinmarketNetworkDecimals } from 'src/utils/wallet/coinmarket/coinmarketUtils';
+import {
+    isCoinmarketExchangeContext,
+    isCoinmarketSellContext,
+} from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
 
 export const CoinmarketFormInputs = () => {
     const context = useCoinmarketFormContext();
 
-    if (isCoinmarketSellOffers(context)) {
+    if (isCoinmarketSellContext(context)) {
         const {
             control,
             feeInfo,
@@ -61,19 +57,17 @@ export const CoinmarketFormInputs = () => {
         const tokenAddress = (output.token ?? undefined) as TokenAddress | undefined;
         const outputAmount =
             shouldSendInSats && output.amount
-                ? formatAmount(output.amount, getNetworkDecimals(sendCryptoSelect?.decimals))
+                ? formatAmount(output.amount, getCoinmarketNetworkDecimals({ sendCryptoSelect }))
                 : output.amount;
 
         return (
             <>
-                <CoinmarketFormInput>
-                    <CoinmarketFormInputAccount<CoinmarketSellFormProps>
-                        accountSelectName={FORM_SEND_CRYPTO_CURRENCY_SELECT}
-                        label="TR_COINMARKET_YOU_SELL"
-                        methods={{ ...context }}
-                    />
-                </CoinmarketFormInput>
-                <CoinmarketFormInput $isWithoutPadding={amountInCrypto}>
+                <CoinmarketFormInputAccount<CoinmarketSellFormProps>
+                    accountSelectName={FORM_SEND_CRYPTO_CURRENCY_SELECT}
+                    label="TR_COINMARKET_YOU_SELL"
+                    methods={{ ...context }}
+                />
+                <Column alignItems="stretch" gap={spacings.xs}>
                     <CoinmarketFormInputFiatCrypto<CoinmarketSellFormProps>
                         cryptoInputName={FORM_OUTPUT_AMOUNT}
                         fiatInputName={FORM_OUTPUT_FIAT}
@@ -82,52 +76,47 @@ export const CoinmarketFormInputs = () => {
                         cryptoCurrencyLabel={sendCryptoSelect?.value}
                         methods={{ ...context }}
                     />
-                </CoinmarketFormInput>
-                {amountInCrypto && (
-                    <Row
-                        justifyContent="space-between"
-                        alignItems="center"
-                        margin={{ top: spacings.xs, bottom: spacings.xl }}
-                    >
-                        <CoinmarketFractionButtons
-                            disabled={helpers.isBalanceZero}
-                            onFractionClick={helpers.setRatioAmount}
-                            onAllClick={helpers.setAllAmount}
-                        />
-                        <CoinmarketBalance
-                            balance={outputAmount}
-                            cryptoSymbolLabel={sendCryptoSelect?.value}
-                            networkSymbol={account.symbol}
-                            tokenAddress={tokenAddress as TokenAddress}
-                            showOnlyAmount
-                            amountInCrypto={amountInCrypto}
+                    {amountInCrypto && (
+                        <Row justifyContent="space-between" alignItems="flex-start">
+                            <CoinmarketFractionButtons
+                                disabled={helpers.isBalanceZero}
+                                onFractionClick={helpers.setRatioAmount}
+                                onAllClick={helpers.setAllAmount}
+                            />
+                            <CoinmarketBalance
+                                balance={outputAmount}
+                                cryptoSymbolLabel={sendCryptoSelect?.value}
+                                networkSymbol={account.symbol}
+                                tokenAddress={tokenAddress as TokenAddress}
+                                showOnlyAmount
+                                amountInCrypto={amountInCrypto}
+                                sendCryptoSelect={sendCryptoSelect}
+                            />
+                        </Row>
+                    )}
+                </Column>
+                <Card margin={{ vertical: spacings.sm }}>
+                    <ElevationContext baseElevation={0}>
+                        <Fees
+                            control={control}
+                            feeInfo={feeInfo}
+                            account={account}
+                            composedLevels={composedLevels}
+                            errors={errors}
+                            register={register}
+                            setValue={setValue}
+                            getValues={getValues}
+                            changeFeeLevel={changeFeeLevel}
                         />
-                    </Row>
-                )}
-                <CoinmarketFeesWrapper>
-                    <Fees
-                        control={control}
-                        feeInfo={feeInfo}
-                        account={account}
-                        composedLevels={composedLevels}
-                        errors={errors}
-                        register={register}
-                        setValue={setValue}
-                        getValues={getValues}
-                        changeFeeLevel={changeFeeLevel}
-                    />
-                </CoinmarketFeesWrapper>
-                <CoinmarketFormInput>
-                    <CoinmarketFormInputPaymentMethod label="TR_COINMARKET_RECEIVE_METHOD" />
-                </CoinmarketFormInput>
-                <CoinmarketFormInput>
-                    <CoinmarketFormInputCountry label="TR_COINMARKET_COUNTRY" />
-                </CoinmarketFormInput>
+                    </ElevationContext>
+                </Card>
+                <CoinmarketFormInputPaymentMethod label="TR_COINMARKET_RECEIVE_METHOD" />
+                <CoinmarketFormInputCountry label="TR_COINMARKET_COUNTRY" />
             </>
         );
     }
 
-    if (isCoinmarketExchangeOffers(context)) {
+    if (isCoinmarketExchangeContext(context)) {
         const {
             control,
             feeInfo,
@@ -149,19 +138,17 @@ export const CoinmarketFormInputs = () => {
         const supportedCryptoCurrencies = exchangeInfo?.buySymbols;
         const outputAmount =
             shouldSendInSats && output.amount
-                ? formatAmount(output.amount, getNetworkDecimals(sendCryptoSelect?.decimals))
+                ? formatAmount(output.amount, getCoinmarketNetworkDecimals({ sendCryptoSelect }))
                 : output.amount;
 
         return (
             <>
-                <CoinmarketFormInput>
-                    <CoinmarketFormInputAccount<CoinmarketExchangeFormProps>
-                        accountSelectName={FORM_SEND_CRYPTO_CURRENCY_SELECT}
-                        label="TR_FROM"
-                        methods={{ ...context }}
-                    />
-                </CoinmarketFormInput>
-                <CoinmarketFormInput $isWithoutPadding={amountInCrypto}>
+                <CoinmarketFormInputAccount<CoinmarketExchangeFormProps>
+                    accountSelectName={FORM_SEND_CRYPTO_CURRENCY_SELECT}
+                    label="TR_FROM"
+                    methods={{ ...context }}
+                />
+                <Column alignItems="stretch" gap={spacings.xs}>
                     <CoinmarketFormInputFiatCrypto<CoinmarketExchangeFormProps>
                         cryptoInputName={FORM_OUTPUT_AMOUNT}
                         fiatInputName={FORM_OUTPUT_FIAT}
@@ -170,90 +157,74 @@ export const CoinmarketFormInputs = () => {
                         cryptoCurrencyLabel={sendCryptoSelect?.value}
                         methods={{ ...context }}
                     />
-                </CoinmarketFormInput>
-                {amountInCrypto && (
-                    <Row
-                        justifyContent="space-between"
-                        alignItems="center"
-                        margin={{ top: spacings.xs, bottom: spacings.xl }}
-                    >
-                        <CoinmarketFractionButtons
-                            disabled={helpers.isBalanceZero}
-                            onFractionClick={helpers.setRatioAmount}
-                            onAllClick={helpers.setAllAmount}
-                        />
-                        <CoinmarketBalance
-                            balance={outputAmount}
-                            cryptoSymbolLabel={sendCryptoSelect?.value}
-                            networkSymbol={account.symbol}
-                            tokenAddress={tokenAddress}
-                            showOnlyAmount
-                            amountInCrypto={amountInCrypto}
-                        />
-                    </Row>
-                )}
-                <CoinmarketFormInput>
-                    <CoinmarketFormInputCryptoSelect<CoinmarketExchangeFormProps>
-                        label="TR_TO"
-                        cryptoSelectName={FORM_RECEIVE_CRYPTO_CURRENCY_SELECT}
-                        supportedCryptoCurrencies={supportedCryptoCurrencies}
-                        methods={{ ...context }}
-                    />
-                </CoinmarketFormInput>
-                <CoinmarketBorder
-                    $margin={{
-                        top: spacings.xs,
-                        bottom: spacings.xxl,
-                    }}
+                    {amountInCrypto && (
+                        <Row justifyContent="space-between" alignItems="flex-start">
+                            <CoinmarketFractionButtons
+                                disabled={helpers.isBalanceZero}
+                                onFractionClick={helpers.setRatioAmount}
+                                onAllClick={helpers.setAllAmount}
+                            />
+                            <CoinmarketBalance
+                                balance={outputAmount}
+                                cryptoSymbolLabel={sendCryptoSelect?.value}
+                                networkSymbol={account.symbol}
+                                tokenAddress={tokenAddress}
+                                showOnlyAmount
+                                amountInCrypto={amountInCrypto}
+                                sendCryptoSelect={sendCryptoSelect}
+                            />
+                        </Row>
+                    )}
+                </Column>
+                <CoinmarketFormInputCryptoSelect<CoinmarketExchangeFormProps>
+                    label="TR_TO"
+                    cryptoSelectName={FORM_RECEIVE_CRYPTO_CURRENCY_SELECT}
+                    supportedCryptoCurrencies={supportedCryptoCurrencies}
+                    methods={{ ...context }}
                 />
-                <CoinmarketFeesWrapper>
-                    <Fees
-                        control={control}
-                        feeInfo={feeInfo}
-                        account={account}
-                        composedLevels={composedLevels}
-                        errors={errors}
-                        register={register}
-                        setValue={setValue}
-                        getValues={getValues}
-                        changeFeeLevel={changeFeeLevel}
-                    />
-                </CoinmarketFeesWrapper>
+                <Card margin={{ vertical: spacings.sm }}>
+                    <ElevationContext baseElevation={0}>
+                        <Fees
+                            control={control}
+                            feeInfo={feeInfo}
+                            account={account}
+                            composedLevels={composedLevels}
+                            errors={errors}
+                            register={register}
+                            setValue={setValue}
+                            getValues={getValues}
+                            changeFeeLevel={changeFeeLevel}
+                        />
+                    </ElevationContext>
+                </Card>
                 <CoinmarketFormSwitcherExchangeRates rateType={rateType} setValue={setValue} />
             </>
         );
     }
 
-    const { buyInfo } = context;
+    const { buyInfo, device } = context;
     const { currencySelect, cryptoSelect } = context.getValues();
     const supportedCryptoCurrencies = buyInfo?.supportedCryptoCurrencies;
 
     return (
         <>
-            <CoinmarketFormInput>
-                <CoinmarketFormInputCryptoSelect<CoinmarketBuyFormProps>
-                    label="TR_COINMARKET_YOU_BUY"
-                    cryptoSelectName={FORM_CRYPTO_CURRENCY_SELECT}
-                    supportedCryptoCurrencies={supportedCryptoCurrencies}
-                    methods={{ ...context }}
-                />
-            </CoinmarketFormInput>
-            <CoinmarketFormInput>
-                <CoinmarketFormInputFiatCrypto<CoinmarketBuyFormProps>
-                    cryptoInputName={FORM_CRYPTO_INPUT}
-                    fiatInputName={FORM_FIAT_INPUT}
-                    cryptoSelectName={FORM_CRYPTO_CURRENCY_SELECT}
-                    currencySelectLabel={currencySelect.label}
-                    cryptoCurrencyLabel={cryptoSelect.value}
-                    methods={{ ...context }}
-                />
-            </CoinmarketFormInput>
-            <CoinmarketFormInput>
-                <CoinmarketFormInputPaymentMethod label="TR_COINMARKET_PAYMENT_METHOD" />
-            </CoinmarketFormInput>
-            <CoinmarketFormInput>
-                <CoinmarketFormInputCountry label="TR_COINMARKET_COUNTRY" />
-            </CoinmarketFormInput>
+            <CoinmarketFormInputCryptoSelect<CoinmarketBuyFormProps>
+                label="TR_COINMARKET_YOU_BUY"
+                cryptoSelectName={FORM_CRYPTO_CURRENCY_SELECT}
+                supportedCryptoCurrencies={supportedCryptoCurrencies}
+                methods={{ ...context }}
+                isDisabled={hasBitcoinOnlyFirmware(device)}
+            />
+            <CoinmarketFormInputFiatCrypto<CoinmarketBuyFormProps>
+                cryptoInputName={FORM_CRYPTO_INPUT}
+                fiatInputName={FORM_FIAT_INPUT}
+                cryptoSelectName={FORM_CRYPTO_CURRENCY_SELECT}
+                currencySelectLabel={currencySelect.label}
+                cryptoCurrencyLabel={cryptoSelect.value}
+                methods={{ ...context }}
+            />
+            <CoinmarketFormInputPaymentMethod label="TR_COINMARKET_PAYMENT_METHOD" />
+            <CoinmarketFormInputCountry label="TR_COINMARKET_COUNTRY" />
         </>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormLayout.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormLayout.tsx
index 6768a070c5b..9e2e90103c5 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormLayout.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormLayout.tsx
@@ -1,12 +1,12 @@
 import styled from 'styled-components';
+
+import { Card, Column } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { CoinmarketFormInputs } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInputs';
-import CoinmarketFormOffer from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffer';
+import { CoinmarketFormOffer } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffer';
 import { CoinmarketFeaturedOffers } from 'src/views/wallet/coinmarket/common/CoinmarketFeaturedOffers/CoinmarketFeaturedOffers';
-import {
-    CoinmarketWrapper,
-    CoinmarketLeftWrapper,
-    CoinmarketRightWrapper,
-} from 'src/views/wallet/coinmarket';
+import { CoinmarketWrapper } from 'src/views/wallet/coinmarket/common/CoinmarketWrapper';
 
 const CoinmarketFormLayoutWrapper = styled.form`
     ${CoinmarketWrapper}
@@ -15,12 +15,14 @@ const CoinmarketFormLayoutWrapper = styled.form`
 export const CoinmarketFormLayout = () => (
     <>
         <CoinmarketFormLayoutWrapper>
-            <CoinmarketLeftWrapper>
-                <CoinmarketFormInputs />
-            </CoinmarketLeftWrapper>
-            <CoinmarketRightWrapper>
+            <Card>
+                <Column alignItems="stretch" gap={spacings.lg}>
+                    <CoinmarketFormInputs />
+                </Column>
+            </Card>
+            <Card>
                 <CoinmarketFormOffer />
-            </CoinmarketRightWrapper>
+            </Card>
         </CoinmarketFormLayoutWrapper>
         <CoinmarketFeaturedOffers />
     </>
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffer.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffer.tsx
index 4602e644f9f..54265fba271 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffer.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffer.tsx
@@ -1,23 +1,21 @@
-import { Button, TextButton } from '@trezor/components';
-import { CryptoId } from 'invity-api';
-import styled from 'styled-components';
-import { spacings, spacingsPx, typography } from '@trezor/theme';
+import { useState } from 'react';
+
+import { CryptoId, ExchangeTrade } from 'invity-api';
+
+import { Button, TextButton, Row, Column, Paragraph } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 import {
     getCryptoQuoteAmountProps,
     getProvidersInfoProps,
     getSelectedCrypto,
     getSelectQuoteTyped,
+    isCoinmarketExchangeContext,
 } from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
-import { useState } from 'react';
-import { SCREEN_QUERY } from '@trezor/components/src/config/variables';
 import { Translation } from 'src/components/suite';
-import CoinmarketFormOfferItem from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferItem';
-import {
-    CoinmarketFormInputLabelText,
-    CoinmarketFormInputLabelWrapper,
-} from 'src/views/wallet/coinmarket';
-import CoinmarketFormOfferCryptoAmount from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferCryptoAmount';
+import { CoinmarketFormOfferItem } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferItem';
+import { CoinmarketFormOfferCryptoAmount } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferCryptoAmount';
 import {
     coinmarketGetAmountLabels,
     coinmarketGetRoundedFiatAmount,
@@ -25,55 +23,18 @@ import {
     getBestRatedQuote,
     parseCryptoId,
 } from 'src/utils/wallet/coinmarket/coinmarketUtils';
-import CoinmarketFormOfferFiatAmount from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferFiatAmount';
-import { isCoinmarketExchangeOffers } from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
-import { CoinmarketFormOffersSwitcher } from './CoinmarketFormOffersSwitcher';
-import { ExchangeTrade } from 'invity-api';
+import { CoinmarketFormOfferFiatAmount } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferFiatAmount';
 import { CoinmarketTradeDetailType, CoinmarketTradeType } from 'src/types/coinmarket/coinmarket';
 import { CoinmarketFormContextValues } from 'src/types/coinmarket/coinmarketForm';
 import { FORM_EXCHANGE_DEX, FORM_EXCHANGE_TYPE } from 'src/constants/wallet/coinmarket/form';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
-
-const CoinmarketFormOfferHeader = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding-bottom: ${spacingsPx.xs};
-    margin-top: ${spacingsPx.xxl};
-
-    ${SCREEN_QUERY.MOBILE} {
-        margin-top: ${spacingsPx.sm};
-    }
-`;
-const CoinmarketFormOfferHeaderText = styled.div``;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const CoinmarketFormOfferHeaderButton = styled(TextButton)`
-    ${typography.hint};
-    margin-top: ${spacingsPx.xxxs};
-
-    div {
-        ${typography.hint}
-        color: ${({ theme }) => theme.textPrimaryDefault};
-    }
-
-    [class^='Spinner'] {
-        margin-right: ${spacingsPx.xxs};
-        filter: none;
-    }
-`;
-
-const CoinmarketFormOfferChain = styled.div`
-    margin-top: ${spacingsPx.xs};
-    ${typography.label}
-    color: ${({ theme }) => theme.textSubdued};
-`;
+import { CoinmarketFormOffersSwitcher } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffersSwitcher';
 
 const getSelectedQuote = (
     context: CoinmarketFormContextValues<CoinmarketTradeType>,
     bestScoredQuote: CoinmarketTradeDetailType | undefined,
 ) => {
-    if (isCoinmarketExchangeOffers(context)) {
+    if (isCoinmarketExchangeContext(context)) {
         return context.getValues(FORM_EXCHANGE_TYPE) === FORM_EXCHANGE_DEX
             ? context.dexQuotes?.[0]
             : context.quotes?.[0];
@@ -82,7 +43,7 @@ const getSelectedQuote = (
     }
 };
 
-const CoinmarketFormOffer = () => {
+export const CoinmarketFormOffer = () => {
     const [isCompareLoading, setIsCompareLoading] = useState<boolean>(false);
     const context = useCoinmarketFormContext();
     const { cryptoIdToPlatformName } = useCoinmarketInfo();
@@ -109,91 +70,88 @@ const CoinmarketFormOffer = () => {
             : '0';
 
     const selectQuote = getSelectQuoteTyped(context);
-    const shouldDisplayFiatAmount = isCoinmarketExchangeOffers(context) ? false : amountInCrypto;
+    const shouldDisplayFiatAmount = isCoinmarketExchangeContext(context) ? false : amountInCrypto;
     const { networkId, contractAddress } = parseCryptoId(selectedCrypto?.value ?? ('' as CryptoId));
     const network = selectedCrypto?.value ? cryptoIdToPlatformName(networkId) : undefined;
 
     return (
-        <>
-            <CoinmarketFormInputLabelWrapper>
-                <CoinmarketFormInputLabelText>
-                    <Translation id={amountLabels.offerLabel} />
-                </CoinmarketFormInputLabelText>
-            </CoinmarketFormInputLabelWrapper>
-            {shouldDisplayFiatAmount ? (
-                <CoinmarketFormOfferFiatAmount
-                    amount={coinmarketGetRoundedFiatAmount(sendAmount)}
-                />
-            ) : (
-                <CoinmarketFormOfferCryptoAmount
-                    amount={
-                        !state.isLoadingOrInvalid && bestScoredQuoteAmounts?.receiveAmount
-                            ? bestScoredQuoteAmounts.receiveAmount
-                            : '0'
-                    }
-                    cryptoId={
-                        !state.isLoadingOrInvalid && receiveCurrency
-                            ? receiveCurrency
-                            : (selectedCrypto?.value as CryptoId)
-                    }
-                />
-            )}
-            {isCoinmarketExchangeOffers(context) && contractAddress && network && (
-                <CoinmarketFormOfferChain>
-                    <Translation
-                        id="TR_COINMARKET_ON_NETWORK_CHAIN"
-                        values={{
-                            networkName: network,
-                        }}
+        <Column alignItems="stretch" gap={spacings.lg}>
+            <Column alignItems="stretch" gap={spacings.xs}>
+                <Translation id={amountLabels.offerLabel} />
+                {shouldDisplayFiatAmount ? (
+                    <CoinmarketFormOfferFiatAmount
+                        amount={coinmarketGetRoundedFiatAmount(sendAmount)}
                     />
-                </CoinmarketFormOfferChain>
-            )}
-            <CoinmarketFormOfferHeader>
-                <CoinmarketFormOfferHeaderText>
+                ) : (
+                    <CoinmarketFormOfferCryptoAmount
+                        amount={
+                            !state.isLoadingOrInvalid && bestScoredQuoteAmounts?.receiveAmount
+                                ? bestScoredQuoteAmounts.receiveAmount
+                                : '0'
+                        }
+                        cryptoId={
+                            !state.isLoadingOrInvalid && receiveCurrency
+                                ? receiveCurrency
+                                : (selectedCrypto?.value as CryptoId)
+                        }
+                    />
+                )}
+                {isCoinmarketExchangeContext(context) && contractAddress && network && (
+                    <Paragraph typographyStyle="label" variant="tertiary">
+                        <Translation
+                            id="TR_COINMARKET_ON_NETWORK_CHAIN"
+                            values={{
+                                networkName: network,
+                            }}
+                        />
+                    </Paragraph>
+                )}
+            </Column>
+            <Column alignItems="stretch" gap={spacings.xxs} margin={{ vertical: spacings.md }}>
+                <Row justifyContent="space-between">
                     <Translation id="TR_COINMARKET_YOUR_BEST_OFFER" />
-                </CoinmarketFormOfferHeaderText>
-                <CoinmarketFormOfferHeaderButton
-                    onClick={async () => {
-                        setIsCompareLoading(true);
-                        await goToOffers();
-                    }}
-                    type="button"
-                    size="medium"
-                    isDisabled={state.isLoadingOrInvalid}
-                    isLoading={isCompareLoading}
-                    data-testid="@coinmarket/form/compare-button"
-                >
-                    <Translation id="TR_COINMARKET_COMPARE_OFFERS" />
-                </CoinmarketFormOfferHeaderButton>
-            </CoinmarketFormOfferHeader>
-            {isCoinmarketExchangeOffers(context) ? (
-                <CoinmarketFormOffersSwitcher
-                    context={context}
-                    isFormLoading={state.isFormLoading}
-                    isFormInvalid={state.isFormInvalid}
-                    providers={providers}
-                    quotes={quotes as ExchangeTrade[] | undefined}
-                    bestRatedQuote={bestRatedQuote}
-                />
-            ) : (
-                <CoinmarketFormOfferItem
-                    bestQuote={quote}
-                    isFormLoading={state.isFormLoading}
-                    isFormInvalid={state.isFormInvalid}
-                    providers={providers}
-                    isBestRate={bestRatedQuote?.orderId === quote?.orderId}
-                />
-            )}
+                    <TextButton
+                        onClick={async () => {
+                            setIsCompareLoading(true);
+                            await goToOffers();
+                        }}
+                        size="small"
+                        isDisabled={state.isLoadingOrInvalid}
+                        isLoading={isCompareLoading}
+                        data-testid="@coinmarket/form/compare-button"
+                        type="button"
+                    >
+                        <Translation id="TR_COINMARKET_COMPARE_OFFERS" />
+                    </TextButton>
+                </Row>
+                {isCoinmarketExchangeContext(context) ? (
+                    <CoinmarketFormOffersSwitcher
+                        context={context}
+                        isFormLoading={state.isFormLoading}
+                        isFormInvalid={state.isFormInvalid}
+                        providers={providers}
+                        quotes={quotes as ExchangeTrade[] | undefined}
+                        bestRatedQuote={bestRatedQuote}
+                    />
+                ) : (
+                    <CoinmarketFormOfferItem
+                        bestQuote={quote}
+                        isFormLoading={state.isFormLoading}
+                        isFormInvalid={state.isFormInvalid}
+                        providers={providers}
+                        isBestRate={bestRatedQuote?.orderId === quote?.orderId}
+                    />
+                )}
+            </Column>
             <Button
                 onClick={() => {
                     if (quote) {
                         selectQuote(quote);
                     }
                 }}
-                type="button"
                 variant="primary"
                 margin={{
-                    top: spacings.xxl,
+                    top: spacings.md,
                 }}
                 isFullWidth
                 isDisabled={state.isLoadingOrInvalid || !quote}
@@ -201,8 +159,6 @@ const CoinmarketFormOffer = () => {
             >
                 <Translation id={coinmarketGetSectionActionLabel(type)} />
             </Button>
-        </>
+        </Column>
     );
 };
-
-export default CoinmarketFormOffer;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferCryptoAmount.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferCryptoAmount.tsx
index 62d4926ef79..f0ba1e0e17c 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferCryptoAmount.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferCryptoAmount.tsx
@@ -1,15 +1,21 @@
-import { CoinmarketAmountContainer, CoinmarketAmountWrapper } from 'src/views/wallet/coinmarket';
+import { CryptoId } from 'invity-api';
+
+import { Row, Text } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { FormattedCryptoAmount } from 'src/components/suite';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
 import { CoinmarketCoinLogo } from 'src/views/wallet/coinmarket/common/CoinmarketCoinLogo';
-import { CryptoId } from 'invity-api';
 
-export interface CoinmarketCryptoAmountProps {
+interface CoinmarketCryptoAmountProps {
     amount: string | number;
     cryptoId: CryptoId;
 }
 
-const CoinmarketFormOfferCryptoAmount = ({ amount, cryptoId }: CoinmarketCryptoAmountProps) => {
+export const CoinmarketFormOfferCryptoAmount = ({
+    amount,
+    cryptoId,
+}: CoinmarketCryptoAmountProps) => {
     const { cryptoIdToCoinSymbol } = useCoinmarketInfo();
     const networkSymbol = cryptoIdToCoinSymbol(cryptoId);
 
@@ -18,18 +24,16 @@ const CoinmarketFormOfferCryptoAmount = ({ amount, cryptoId }: CoinmarketCryptoA
     }
 
     return (
-        <CoinmarketAmountContainer>
-            <CoinmarketAmountWrapper>
-                <CoinmarketCoinLogo cryptoId={cryptoId} />
+        <Row gap={spacings.sm}>
+            <CoinmarketCoinLogo cryptoId={cryptoId} />
+            <Text typographyStyle="titleMedium" ellipsisLineCount={2}>
                 <FormattedCryptoAmount
                     value={amount}
                     symbol={networkSymbol}
                     isRawString
-                    isBalance
+                    isBalance={false}
                 />
-            </CoinmarketAmountWrapper>
-        </CoinmarketAmountContainer>
+            </Text>
+        </Row>
     );
 };
-
-export default CoinmarketFormOfferCryptoAmount;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferFiatAmount.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferFiatAmount.tsx
index f8d489c7f66..46dbffe3704 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferFiatAmount.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferFiatAmount.tsx
@@ -1,47 +1,24 @@
-import { nativeTypography, spacingsPx } from '@trezor/theme';
-import {
-    CoinmarketAmountContainer,
-    CoinmarketAmountWrapper,
-    CoinmarketAmountWrapperText,
-} from 'src/views/wallet/coinmarket';
-import CoinmarketFormInputCurrency from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCurrency';
-import styled from 'styled-components';
+import { spacings } from '@trezor/theme';
+import { Row, Text } from '@trezor/components';
 
-const CoinmarketFormInputCurrencyWrapper = styled.div`
-    color: ${({ theme }) => theme.textDefault};
-    width: 84px;
-
-    /* stylelint-disable selector-class-pattern */
-    .react-select__control {
-        padding: ${spacingsPx.xxxs} ${spacingsPx.xs} 0;
-        font-size: ${nativeTypography.titleSmall.fontSize}px;
-        border-radius: 18px;
-    }
-
-    .react-select__indicators {
-        right: 8px;
-    }
-`;
+import { useSelector } from 'src/hooks/suite';
+import { selectLanguage } from 'src/reducers/suite/suiteReducer';
+import { CoinmarketFormInputCurrency } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCurrency';
 
 interface CoinmarketFormOfferFiatAmountProps {
     amount: string | undefined;
 }
 
-const CoinmarketFormOfferFiatAmount = ({ amount }: CoinmarketFormOfferFiatAmountProps) => {
-    const formattedAmount = amount?.replace(/\B(?=(\d{3})+(?!\d))/g, ' ') ?? '';
+export const CoinmarketFormOfferFiatAmount = ({ amount }: CoinmarketFormOfferFiatAmountProps) => {
+    const locale = useSelector(selectLanguage);
+    const formattedAmount = amount ? new Intl.NumberFormat(locale).format(Number(amount)) : '';
 
     return (
-        <CoinmarketAmountContainer>
-            <CoinmarketAmountWrapper>
-                <CoinmarketAmountWrapperText title={formattedAmount}>
-                    {formattedAmount}
-                </CoinmarketAmountWrapperText>
-            </CoinmarketAmountWrapper>
-            <CoinmarketFormInputCurrencyWrapper>
-                <CoinmarketFormInputCurrency isClean={false} size="small" isDarkLabel={true} />
-            </CoinmarketFormInputCurrencyWrapper>
-        </CoinmarketAmountContainer>
+        <Row gap={spacings.sm}>
+            <Text typographyStyle="titleMedium" ellipsisLineCount={1}>
+                {formattedAmount}
+            </Text>
+            <CoinmarketFormInputCurrency isClean={false} />
+        </Row>
     );
 };
-
-export default CoinmarketFormOfferFiatAmount;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferItem.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferItem.tsx
index d2f5c6705db..fa605f4c645 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferItem.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOfferItem.tsx
@@ -1,25 +1,12 @@
-import { Row, useElevation } from '@trezor/components';
-import { borders, Elevation, mapElevationToBackground, spacingsPx } from '@trezor/theme';
-import styled from 'styled-components';
+import { Row, Spinner, Card, Paragraph } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import {
     CoinmarketTradeDetailType,
     CoinmarketUtilsProvidersProps,
 } from 'src/types/coinmarket/coinmarket';
 import { CoinmarketUtilsProvider } from 'src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsProvider';
-import {
-    CoinmarketFormOfferSpinnerText,
-    CoinmarketFormOfferSpinnerWrapper,
-    CoinmarketSpinnerWrapper,
-} from 'src/views/wallet/coinmarket';
-
-const CoinmarketFormOfferItemWrapper = styled.div<{ $elevation: Elevation }>`
-    display: flex;
-    padding: ${spacingsPx.md};
-    gap: ${spacingsPx.xs};
-    border-radius: ${borders.radii.sm};
-    background-color: ${mapElevationToBackground};
-`;
 
 interface CoinmarketFormOfferItemProps {
     bestQuote: CoinmarketTradeDetailType | undefined;
@@ -29,50 +16,49 @@ interface CoinmarketFormOfferItemProps {
     isBestRate?: boolean;
 }
 
-const CoinmarketFormOfferItem = ({
+export const CoinmarketFormOfferItem = ({
     bestQuote,
     isFormLoading,
     isFormInvalid,
     providers,
 }: CoinmarketFormOfferItemProps) => {
-    const { elevation } = useElevation();
-
     if (!bestQuote || isFormLoading) {
         if (isFormLoading && !isFormInvalid) {
             return (
-                <CoinmarketFormOfferItemWrapper $elevation={elevation}>
-                    <CoinmarketFormOfferSpinnerWrapper>
-                        <Row justifyContent="center" alignItems="center">
-                            <CoinmarketSpinnerWrapper size={32} isGrey={false} />
-                            <CoinmarketFormOfferSpinnerText>
-                                <Translation id="TR_COINMARKET_OFFER_LOOKING" />
-                            </CoinmarketFormOfferSpinnerText>
-                        </Row>
-                    </CoinmarketFormOfferSpinnerWrapper>
-                </CoinmarketFormOfferItemWrapper>
+                <Card>
+                    <Row
+                        justifyContent="center"
+                        margin={{ vertical: spacings.xs }}
+                        gap={spacings.sm}
+                    >
+                        <Spinner size={32} isGrey={false} />
+                        <Paragraph typographyStyle="hint" variant="tertiary">
+                            <Translation id="TR_COINMARKET_OFFER_LOOKING" />
+                        </Paragraph>
+                    </Row>
+                </Card>
             );
         }
 
         return (
-            <CoinmarketFormOfferItemWrapper $elevation={elevation}>
-                <CoinmarketFormOfferSpinnerWrapper>
-                    <Row justifyContent="center" alignItems="center">
-                        <CoinmarketFormOfferSpinnerText>
-                            <Translation id="TR_COINMARKET_OFFER_NO_FOUND" />
-                            <br />
-                            <Translation id="TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY" />
-                        </CoinmarketFormOfferSpinnerText>
-                    </Row>
-                </CoinmarketFormOfferSpinnerWrapper>
-            </CoinmarketFormOfferItemWrapper>
+            <Card>
+                <Paragraph
+                    typographyStyle="hint"
+                    variant="tertiary"
+                    align="center"
+                    margin={{ vertical: spacings.xs }}
+                >
+                    <Translation id="TR_COINMARKET_OFFER_NO_FOUND" />
+                    <br />
+                    <Translation id="TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY" />
+                </Paragraph>
+            </Card>
         );
     }
 
     return (
-        <CoinmarketFormOfferItemWrapper $elevation={elevation}>
+        <Card>
             <CoinmarketUtilsProvider providers={providers} exchange={bestQuote?.exchange} />
-        </CoinmarketFormOfferItemWrapper>
+        </Card>
     );
 };
-
-export default CoinmarketFormOfferItem;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffersSwitcher.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffersSwitcher.tsx
index ebfb9f12d9d..3149c276a72 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffersSwitcher.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffersSwitcher.tsx
@@ -1,19 +1,13 @@
-import styled from 'styled-components';
-import {
-    borders,
-    Elevation,
-    mapElevationToBackground,
-    nativeTypography,
-    spacingsPx,
-} from '@trezor/theme';
-import { Row, useElevation } from '@trezor/components';
-import { Translation } from 'src/components/suite';
 import { ExchangeTrade } from 'invity-api';
+
+import { spacings } from '@trezor/theme';
+import { Row, Card, Column, Spinner, Paragraph } from '@trezor/components';
+
+import { Translation } from 'src/components/suite';
 import {
     CoinmarketTradeDetailType,
     CoinmarketUtilsProvidersProps,
 } from 'src/types/coinmarket/coinmarket';
-import { CoinmarketFormOffersSwitcherItem } from './CoinmarketFormOffersSwitcherItem';
 import { CoinmarketExchangeFormContextProps } from 'src/types/coinmarket/coinmarketForm';
 import {
     FORM_EXCHANGE_CEX,
@@ -22,32 +16,7 @@ import {
     FORM_RATE_FLOATING,
     FORM_RATE_TYPE,
 } from 'src/constants/wallet/coinmarket/form';
-import {
-    CoinmarketFormOfferSpinnerText,
-    CoinmarketFormOfferSpinnerWrapper,
-    CoinmarketSpinnerWrapper,
-} from 'src/views/wallet/coinmarket';
-
-const BestOffers = styled.div<{ $elevation: Elevation }>`
-    padding: ${spacingsPx.xxs};
-    gap: ${spacingsPx.xxs};
-    border-radius: ${borders.radii.md};
-    background-color: ${mapElevationToBackground};
-`;
-
-const ProviderNotFound = styled.div`
-    text-align: center;
-    padding: ${spacingsPx.md};
-    font-size: ${nativeTypography.label.fontSize}px;
-    color: ${({ theme }) => theme.textSubdued};
-`;
-
-const NoOffers = styled.div`
-    height: 116px;
-    display: flex;
-    align-items: center;
-    padding: ${spacingsPx.md};
-`;
+import { CoinmarketFormOffersSwitcherItem } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffersSwitcherItem';
 
 interface CoinmarketFormOffersSwitcherProps {
     context: CoinmarketExchangeFormContextProps;
@@ -68,7 +37,6 @@ export const CoinmarketFormOffersSwitcher = ({
 }: CoinmarketFormOffersSwitcherProps) => {
     const { setValue, getValues, dexQuotes } = context;
     const { exchangeType } = getValues();
-    const { elevation } = useElevation();
     const cexQuote = quotes?.[0];
     const dexQuote = dexQuotes?.[0];
     const hasSingleOption = !cexQuote !== !dexQuote;
@@ -77,71 +45,86 @@ export const CoinmarketFormOffersSwitcher = ({
     if (!bestQuote || isFormLoading) {
         if (isFormLoading && !isFormInvalid) {
             return (
-                <BestOffers $elevation={elevation}>
-                    <NoOffers>
-                        <CoinmarketFormOfferSpinnerWrapper>
-                            <Row justifyContent="center" alignItems="center">
-                                <CoinmarketSpinnerWrapper size={32} isGrey={false} />
-                                <CoinmarketFormOfferSpinnerText>
-                                    <Translation id="TR_COINMARKET_OFFER_LOOKING" />
-                                </CoinmarketFormOfferSpinnerText>
-                            </Row>
-                        </CoinmarketFormOfferSpinnerWrapper>
-                    </NoOffers>
-                </BestOffers>
+                <Card>
+                    <Row
+                        justifyContent="center"
+                        margin={{ vertical: spacings.xs }}
+                        gap={spacings.sm}
+                    >
+                        <Spinner size={32} isGrey={false} />
+                        <Paragraph typographyStyle="hint" variant="tertiary">
+                            <Translation id="TR_COINMARKET_OFFER_LOOKING" />
+                        </Paragraph>
+                    </Row>
+                </Card>
             );
         }
 
         return (
-            <BestOffers $elevation={elevation}>
-                <NoOffers>
-                    <CoinmarketFormOfferSpinnerWrapper>
-                        <Row justifyContent="center" alignItems="center">
-                            <CoinmarketFormOfferSpinnerText>
-                                <Translation id="TR_COINMARKET_OFFER_NO_FOUND" />
-                                <br />
-                                <Translation id="TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY" />
-                            </CoinmarketFormOfferSpinnerText>
-                        </Row>
-                    </CoinmarketFormOfferSpinnerWrapper>
-                </NoOffers>
-            </BestOffers>
+            <Card>
+                <Paragraph
+                    typographyStyle="hint"
+                    variant="tertiary"
+                    align="center"
+                    margin={{ vertical: spacings.xs }}
+                >
+                    <Translation id="TR_COINMARKET_OFFER_NO_FOUND" />
+                    <br />
+                    <Translation id="TR_COINMARKET_CHANGE_AMOUNT_OR_CURRENCY" />
+                </Paragraph>
+            </Card>
         );
     }
 
     return (
-        <BestOffers $elevation={elevation}>
-            {cexQuote ? (
-                <CoinmarketFormOffersSwitcherItem
-                    selectedExchangeType={exchangeType}
-                    isSelectable={!hasSingleOption}
-                    onSelect={() => setValue(FORM_EXCHANGE_TYPE, FORM_EXCHANGE_CEX)}
-                    providers={providers}
-                    quote={cexQuote}
-                    isBestRate={bestRatedQuote?.orderId === cexQuote?.orderId}
-                />
-            ) : (
-                <ProviderNotFound>
-                    <Translation id="TR_COINMARKET_NO_CEX_PROVIDER_FOUND" />
-                </ProviderNotFound>
-            )}
-            {dexQuote ? (
-                <CoinmarketFormOffersSwitcherItem
-                    selectedExchangeType={exchangeType}
-                    isSelectable={!hasSingleOption}
-                    onSelect={() => {
-                        setValue(FORM_EXCHANGE_TYPE, FORM_EXCHANGE_DEX);
-                        setValue(FORM_RATE_TYPE, FORM_RATE_FLOATING);
-                    }}
-                    providers={providers}
-                    quote={dexQuote}
-                    isBestRate={bestRatedQuote?.orderId === dexQuote?.orderId}
-                />
-            ) : (
-                <ProviderNotFound>
-                    <Translation id="TR_COINMARKET_NO_DEX_PROVIDER_FOUND" />
-                </ProviderNotFound>
-            )}
-        </BestOffers>
+        <Card paddingType="none">
+            <Column
+                alignItems="stretch"
+                margin={{ horizontal: spacings.xxs, vertical: spacings.xxs }}
+                gap={spacings.xxs}
+            >
+                {cexQuote ? (
+                    <CoinmarketFormOffersSwitcherItem
+                        selectedExchangeType={exchangeType}
+                        isSelectable={!hasSingleOption}
+                        onSelect={() => setValue(FORM_EXCHANGE_TYPE, FORM_EXCHANGE_CEX)}
+                        providers={providers}
+                        quote={cexQuote}
+                        isBestRate={bestRatedQuote?.orderId === cexQuote?.orderId}
+                    />
+                ) : (
+                    <Paragraph
+                        typographyStyle="label"
+                        variant="tertiary"
+                        align="center"
+                        margin={{ vertical: spacings.md }}
+                    >
+                        <Translation id="TR_COINMARKET_NO_CEX_PROVIDER_FOUND" />
+                    </Paragraph>
+                )}
+                {dexQuote ? (
+                    <CoinmarketFormOffersSwitcherItem
+                        selectedExchangeType={exchangeType}
+                        isSelectable={!hasSingleOption}
+                        onSelect={() => {
+                            setValue(FORM_EXCHANGE_TYPE, FORM_EXCHANGE_DEX);
+                            setValue(FORM_RATE_TYPE, FORM_RATE_FLOATING);
+                        }}
+                        providers={providers}
+                        quote={dexQuote}
+                        isBestRate={bestRatedQuote?.orderId === dexQuote?.orderId}
+                    />
+                ) : (
+                    <Paragraph
+                        typographyStyle="label"
+                        variant="tertiary"
+                        align="center"
+                        margin={{ vertical: spacings.md }}
+                    >
+                        <Translation id="TR_COINMARKET_NO_DEX_PROVIDER_FOUND" />
+                    </Paragraph>
+                )}
+            </Column>
+        </Card>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffersSwitcherItem.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffersSwitcherItem.tsx
index d850b12a503..10b907456fe 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffersSwitcherItem.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormOffersSwitcherItem.tsx
@@ -1,48 +1,21 @@
 import { ExchangeTrade } from 'invity-api';
+import styled from 'styled-components';
+
+import { Badge, Radio, Tooltip, Row, Text, useElevation } from '@trezor/components';
+import { borders, spacings, spacingsPx, mapElevationToBackground, Elevation } from '@trezor/theme';
+
 import { CoinmarketUtilsProvidersProps } from 'src/types/coinmarket/coinmarket';
-import { Badge, Radio, Tooltip } from '@trezor/components';
-import { CoinmarketUtilsProvider } from '../CoinmarketUtils/CoinmarketUtilsProvider';
 import { Translation } from 'src/components/suite';
-import styled, { css } from 'styled-components';
-import { borders, spacingsPx } from '@trezor/theme';
 import { ExchangeType } from 'src/types/coinmarket/coinmarketForm';
 import { FORM_EXCHANGE_CEX, FORM_EXCHANGE_DEX } from 'src/constants/wallet/coinmarket/form';
+import { CoinmarketUtilsProvider } from 'src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsProvider';
 
-const Offer = styled.div<{ $isSelected: boolean }>`
+const Offer = styled.div<{ $isSelected: boolean; $elevation: Elevation }>`
     padding: ${spacingsPx.md};
     border-radius: ${borders.radii.sm};
+    background: ${mapElevationToBackground};
 
-    /* full width radio label */
-    & > div[class^='Checkbox__'] > div:last-child {
-        width: 100%;
-    }
-
-    .content {
-        display: flex;
-        align-items: center;
-        width: 100%;
-        gap: ${spacingsPx.xs};
-    }
-
-    .exchange-type {
-        color: ${({ theme }) => theme.textPrimaryDefault};
-        margin-left: auto;
-    }
-
-    ${({ $isSelected }) =>
-        $isSelected
-            ? css`
-                  background-color: ${({ theme }) => theme.backgroundSurfaceElevation1};
-              `
-            : css`
-                  .name {
-                      color: ${({ theme }) => theme.textDisabled};
-                  }
-
-                  .exchange-type {
-                      color: ${({ theme }) => theme.textSubdued};
-                  }
-              `}
+    ${({ $isSelected }) => !$isSelected && 'background: none;'}
 `;
 
 interface CoinmarketFormOffersSwitcherItemProps {
@@ -64,25 +37,26 @@ export const CoinmarketFormOffersSwitcherItem = ({
 }: CoinmarketFormOffersSwitcherItemProps) => {
     const exchangeType = quote.isDex ? FORM_EXCHANGE_DEX : FORM_EXCHANGE_CEX;
     const isSelected = Boolean(selectedExchangeType === exchangeType);
+    const { elevation } = useElevation();
 
     const content = (
-        <div className="content">
+        <Row gap={spacings.xs} flex="1">
             <CoinmarketUtilsProvider providers={providers} exchange={quote.exchange} />
             {isBestRate && (
                 <Badge variant="primary" size="small">
                     <Translation id="TR_COINMARKET_BEST_RATE" />
                 </Badge>
             )}
-            <div className="exchange-type">
+            <Text variant="primary" as="div" margin={{ left: 'auto' }}>
                 <Tooltip content={<Translation id={`TR_COINMARKET_${exchangeType}_TOOLTIP`} />}>
                     {exchangeType}
                 </Tooltip>
-            </div>
-        </div>
+            </Text>
+        </Row>
     );
 
     return (
-        <Offer $isSelected={isSelected}>
+        <Offer $isSelected={isSelected} $elevation={elevation}>
             {isSelectable ? (
                 <Radio labelAlignment="left" isChecked={isSelected} onClick={() => onSelect(quote)}>
                     {content}
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFractionButtons.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFractionButtons.tsx
index 65ff0485821..8f10b73925f 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFractionButtons.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketFractionButtons.tsx
@@ -1,17 +1,7 @@
-import styled from 'styled-components';
 import { Button, Row } from '@trezor/components';
-import { Translation } from 'src/components/suite';
-import { spacingsPx } from '@trezor/theme';
+import { spacings } from '@trezor/theme';
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const SmallButton = styled(Button).attrs(props => ({
-    ...props,
-    variant: 'tertiary',
-    type: 'button',
-    size: 'small',
-}))`
-    margin-right: ${spacingsPx.sm};
-`;
+import { Translation } from 'src/components/suite';
 
 interface CoinmarketFractionButtonsProps {
     onFractionClick: (divisor: number) => void;
@@ -24,19 +14,28 @@ export const CoinmarketFractionButtons = ({
     disabled,
     onFractionClick,
     onAllClick,
-}: CoinmarketFractionButtonsProps) => (
-    <Row data-testid="@coinmarket/form/fraction-buttons">
-        <SmallButton isDisabled={disabled} onClick={() => onFractionClick(4)}>
-            1/4
-        </SmallButton>
-        <SmallButton isDisabled={disabled} onClick={() => onFractionClick(3)}>
-            1/3
-        </SmallButton>
-        <SmallButton isDisabled={disabled} onClick={() => onFractionClick(2)}>
-            1/2
-        </SmallButton>
-        <SmallButton isDisabled={disabled} onClick={() => onAllClick()}>
-            <Translation id="TR_FRACTION_BUTTONS_ALL" />
-        </SmallButton>
-    </Row>
-);
+}: CoinmarketFractionButtonsProps) => {
+    const buttons = [
+        { label: '1/4', value: 4 },
+        { label: '1/3', value: 3 },
+        { label: '1/2', value: 2 },
+        { label: <Translation id="TR_FRACTION_BUTTONS_ALL" />, value: null },
+    ];
+
+    return (
+        <Row gap={spacings.xs} data-testid="@coinmarket/form/fraction-buttons">
+            {buttons.map((button, index) => (
+                <Button
+                    variant="tertiary"
+                    type="button"
+                    size="small"
+                    key={index}
+                    isDisabled={disabled}
+                    onClick={() => (!button.value ? onAllClick() : onFractionClick(button.value))}
+                >
+                    {button.label}
+                </Button>
+            ))}
+        </Row>
+    );
+};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketExchangeHeaderSummary.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketExchangeHeaderSummary.tsx
index ad7ff5c5783..18fcf9abd47 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketExchangeHeaderSummary.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketExchangeHeaderSummary.tsx
@@ -1,14 +1,16 @@
 import { useTheme } from 'styled-components';
-import { useCoinmarketOffersContext } from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
-import { CoinmarketTradeExchangeType } from 'src/types/coinmarket/coinmarket';
-import { useSelector } from 'src/hooks/suite';
-import { H3, Icon, Row, Text } from '@trezor/components';
-import { CoinmarketCryptoAmount } from '../CoinmarketCryptoAmount';
 import { CryptoId } from 'invity-api';
-import { FiatValue, FormattedCryptoAmount, Translation } from 'src/components/suite';
+
+import { H3, Icon, Row, Text } from '@trezor/components';
 import { formatNetworkAmount } from '@suite-common/wallet-utils';
 import { spacings } from '@trezor/theme';
 
+import { CoinmarketTradeExchangeType } from 'src/types/coinmarket/coinmarket';
+import { useSelector } from 'src/hooks/suite';
+import { FiatValue, FormattedCryptoAmount, Translation } from 'src/components/suite';
+import { CoinmarketCryptoAmount } from 'src/views/wallet/coinmarket/common/CoinmarketCryptoAmount';
+import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
+
 interface CoinmarketExchangeHeaderSummaryProps {
     sendAmount: string | number | undefined;
     sendCurrency: CryptoId | string | undefined;
@@ -21,7 +23,7 @@ export const CoinmarketExchangeHeaderSummary = ({
     receiveCurrency,
 }: CoinmarketExchangeHeaderSummaryProps) => {
     const theme = useTheme();
-    const context = useCoinmarketOffersContext<CoinmarketTradeExchangeType>();
+    const context = useCoinmarketFormContext<CoinmarketTradeExchangeType>();
     const { account } = context;
     const { symbol } = account;
     const fee = useSelector(state => state.wallet.coinmarket.composedTransactionInfo.composed?.fee);
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeader.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeader.tsx
index d68fe03d926..2a2a51d4baa 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeader.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeader.tsx
@@ -1,18 +1,20 @@
-import { H2 } from '@trezor/components';
-import { Translation } from 'src/components/suite';
-import { ExtendedMessageDescriptor } from 'src/types/suite';
-import { InvityAPIReloadQuotesAfterSeconds } from 'src/constants/wallet/coinmarket/metadata';
 import styled from 'styled-components';
+
+import { H2 } from '@trezor/components';
 import { spacingsPx } from '@trezor/theme';
 import { SCREEN_QUERY } from '@trezor/components/src/config/variables';
+
+import { Translation } from 'src/components/suite';
+import { ExtendedMessageDescriptor } from 'src/types/suite';
+import { INVITY_API_RELOAD_QUOTES_AFTER_SECONDS } from 'src/constants/wallet/coinmarket/metadata';
 import {
-    isCoinmarketExchangeOffers,
-    useCoinmarketOffersContext,
-} from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
-import { getCryptoQuoteAmountProps } from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
-import CoinmarketHeaderSummary from 'src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeaderSummary';
+    getCryptoQuoteAmountProps,
+    isCoinmarketExchangeContext,
+} from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
+import { CoinmarketHeaderSummary } from 'src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeaderSummary';
 import { CoinmarketRefreshTime } from 'src/views/wallet/coinmarket/common';
-import CoinmarketHeaderFilter from 'src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeaderFilter';
+import { CoinmarketHeaderFilter } from 'src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeaderFilter';
+import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 
 const Header = styled.div`
     padding-top: ${spacingsPx.sm};
@@ -57,8 +59,8 @@ interface CoinmarketHeaderProps {
     titleTimer: ExtendedMessageDescriptor['id'];
 }
 
-const CoinmarketHeader = ({ title, titleTimer }: CoinmarketHeaderProps) => {
-    const context = useCoinmarketOffersContext();
+export const CoinmarketHeader = ({ title, titleTimer }: CoinmarketHeaderProps) => {
+    const context = useCoinmarketFormContext();
     const { timer, quotes } = context;
     const headerProps = getCryptoQuoteAmountProps(quotes?.[0], context);
 
@@ -69,7 +71,7 @@ const CoinmarketHeader = ({ title, titleTimer }: CoinmarketHeaderProps) => {
                     <Translation id={title} />
                 </H2>
             </HeaderTop>
-            {headerProps && isCoinmarketExchangeOffers(context) && (
+            {headerProps && isCoinmarketExchangeContext(context) && (
                 <CoinmarketHeaderSummaryWrap {...headerProps} />
             )}
             <HeaderBottom>
@@ -77,7 +79,7 @@ const CoinmarketHeader = ({ title, titleTimer }: CoinmarketHeaderProps) => {
                 <HeaderCoinmarketRefreshTime>
                     <CoinmarketRefreshTime
                         isLoading={timer.isLoading}
-                        refetchInterval={InvityAPIReloadQuotesAfterSeconds}
+                        refetchInterval={INVITY_API_RELOAD_QUOTES_AFTER_SECONDS}
                         seconds={timer.timeSpend.seconds}
                         label={<Translation id={titleTimer} />}
                     />
@@ -86,5 +88,3 @@ const CoinmarketHeader = ({ title, titleTimer }: CoinmarketHeaderProps) => {
         </Header>
     );
 };
-
-export default CoinmarketHeader;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeaderFilter.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeaderFilter.tsx
index c2b2033e780..7bf555bb4be 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeaderFilter.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeaderFilter.tsx
@@ -1,12 +1,9 @@
 import styled from 'styled-components';
+
 import { spacingsPx } from '@trezor/theme';
-import CoinmarketFormInputPaymentMethod from '../CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputPaymentMethod';
-import CoinmarketFormInputCountry from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCountry';
-import {
-    isCoinmarketBuyOffers,
-    isCoinmarketExchangeOffers,
-    useCoinmarketOffersContext,
-} from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
+import { Row } from '@trezor/components';
+
+import { CoinmarketFormInputCountry } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputCountry';
 import {
     CoinmarketBuyFormProps,
     CoinmarketSellFormProps,
@@ -20,8 +17,13 @@ import {
     FORM_SEND_CRYPTO_CURRENCY_SELECT,
 } from 'src/constants/wallet/coinmarket/form';
 import { CoinmarketFormInputFiatCrypto } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputFiatCrypto/CoinmarketFormInputFiatCrypto';
-import { CoinmarketOffersExchangeFiltersPanel } from './CoinmarketOffersExchangeFiltersPanel';
-import { Row } from '@trezor/components';
+import { CoinmarketOffersExchangeFiltersPanel } from 'src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketOffersExchangeFiltersPanel';
+import { CoinmarketFormInputPaymentMethod } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormInput/CoinmarketFormInputPaymentMethod';
+import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
+import {
+    isCoinmarketBuyContext,
+    isCoinmarketExchangeContext,
+} from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
 
 const InputWrapper = styled.div`
     width: 254px;
@@ -29,10 +31,10 @@ const InputWrapper = styled.div`
     padding: ${spacingsPx.xxs} ${spacingsPx.md} ${spacingsPx.xxs} 0;
 `;
 
-const CoinmarketHeaderFilter = () => {
-    const context = useCoinmarketOffersContext();
+export const CoinmarketHeaderFilter = () => {
+    const context = useCoinmarketFormContext();
 
-    if (isCoinmarketExchangeOffers(context)) {
+    if (isCoinmarketExchangeContext(context)) {
         return (
             <Row data-testid="@coinmarket/filter" flexWrap="wrap">
                 <CoinmarketOffersExchangeFiltersPanel />
@@ -41,8 +43,8 @@ const CoinmarketHeaderFilter = () => {
     }
 
     return (
-        <Row data-testid="@coinmarket/filter" flexWrap="wrap">
-            {isCoinmarketBuyOffers(context) ? (
+        <Row data-testid="@coinmarket/filter" flexWrap="wrap" alignItems="flex-start">
+            {isCoinmarketBuyContext(context) ? (
                 <InputWrapper>
                     <CoinmarketFormInputFiatCrypto<CoinmarketBuyFormProps>
                         showLabel={false}
@@ -72,5 +74,3 @@ const CoinmarketHeaderFilter = () => {
         </Row>
     );
 };
-
-export default CoinmarketHeaderFilter;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeaderSummary.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeaderSummary.tsx
index 87823a1d652..393d0994b0b 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeaderSummary.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeaderSummary.tsx
@@ -1,16 +1,19 @@
-import { H3, Icon, Row } from '@trezor/components';
 import styled from 'styled-components';
-import { CoinmarketCryptoAmount, CoinmarketFiatAmount } from '..';
+
+import { H3, Icon, Row } from '@trezor/components';
 import { SCREEN_QUERY } from '@trezor/components/src/config/variables';
-import { CoinmarketCryptoAmountProps } from 'src/types/coinmarket/coinmarketOffers';
-import {
-    isCoinmarketExchangeOffers,
-    isCoinmarketSellOffers,
-    useCoinmarketOffersContext,
-} from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
-import { CoinmarketExchangeHeaderSummary } from './CoinmarketExchangeHeaderSummary';
 import { spacingsPx } from '@trezor/theme';
 
+import { CoinmarketExchangeHeaderSummary } from 'src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketExchangeHeaderSummary';
+import { CoinmarketFiatAmount } from 'src/views/wallet/coinmarket/common/CoinmarketFiatAmount';
+import { CoinmarketCryptoAmount } from 'src/views/wallet/coinmarket/common/CoinmarketCryptoAmount';
+import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
+import {
+    isCoinmarketExchangeContext,
+    isCoinmarketSellContext,
+} from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
+import { CoinmarketCryptoAmountProps } from 'src/types/coinmarket/coinmarket';
+
 const IconWrapper = styled.div`
     margin-left: ${spacingsPx.sm};
     margin-right: ${spacingsPx.sm};
@@ -23,19 +26,19 @@ const SummaryWrap = styled.div`
     }
 `;
 
-const CoinmarketHeaderSummary = ({
+export const CoinmarketHeaderSummary = ({
     className,
     sendAmount,
     sendCurrency,
     receiveCurrency,
     receiveAmount,
 }: CoinmarketCryptoAmountProps) => {
-    const context = useCoinmarketOffersContext();
+    const context = useCoinmarketFormContext();
 
     return (
         <SummaryWrap className={className}>
             <Row alignItems="center">
-                {isCoinmarketSellOffers(context) && (
+                {isCoinmarketSellContext(context) && (
                     <>
                         {receiveCurrency && (
                             <H3>
@@ -55,7 +58,7 @@ const CoinmarketHeaderSummary = ({
                     </>
                 )}
 
-                {isCoinmarketExchangeOffers(context) && (
+                {isCoinmarketExchangeContext(context) && (
                     <CoinmarketExchangeHeaderSummary
                         sendCurrency={sendCurrency}
                         sendAmount={sendAmount}
@@ -66,5 +69,3 @@ const CoinmarketHeaderSummary = ({
         </SummaryWrap>
     );
 };
-
-export default CoinmarketHeaderSummary;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketOffersExchangeFiltersPanel.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketOffersExchangeFiltersPanel.tsx
index 26ca8e412be..3128627708f 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketOffersExchangeFiltersPanel.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketOffersExchangeFiltersPanel.tsx
@@ -1,3 +1,8 @@
+import styled from 'styled-components';
+
+import { Row, Select } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import {
     EXCHANGE_COMPARATOR_KYC_FILTER,
@@ -9,11 +14,8 @@ import {
     EXCHANGE_COMPARATOR_RATE_FILTER_FIXED_CEX,
     EXCHANGE_COMPARATOR_RATE_FILTER_FLOATING_CEX,
 } from 'src/constants/wallet/coinmarket/form';
-import { useCoinmarketOffersContext } from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
 import { CoinmarketTradeExchangeType } from 'src/types/coinmarket/coinmarket';
-import { Row, Select } from '@trezor/components';
-import styled from 'styled-components';
-import { spacings } from '@trezor/theme';
+import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 
 const SelectWrapper = styled.div`
     width: 224px;
@@ -50,7 +52,7 @@ const offerTypeOptions = [
 ];
 
 export const CoinmarketOffersExchangeFiltersPanel = () => {
-    const context = useCoinmarketOffersContext<CoinmarketTradeExchangeType>();
+    const context = useCoinmarketFormContext<CoinmarketTradeExchangeType>();
     const { getValues, setValue } = context;
     const kycValue = getValues(EXCHANGE_COMPARATOR_KYC_FILTER);
     const exchangeType = getValues(EXCHANGE_COMPARATOR_RATE_FILTER);
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/BuyTransaction.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/BuyTransaction.tsx
deleted file mode 100644
index d83a9ef4b04..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/BuyTransaction.tsx
+++ /dev/null
@@ -1,247 +0,0 @@
-import { useState } from 'react';
-import styled, { useTheme } from 'styled-components';
-import { BuyProviderInfo, BuyTradeQuoteRequest } from 'invity-api';
-
-import invityAPI from 'src/services/suite/invityAPI';
-import {
-    clearQuotes,
-    saveCachedAccountInfo,
-    saveQuoteRequest,
-    saveQuotes,
-    saveTransactionDetailId,
-} from 'src/actions/wallet/coinmarketBuyActions';
-import { variables, Icon, Button } from '@trezor/components';
-import { CoinmarketPaymentType, CoinmarketProviderInfo } from 'src/views/wallet/coinmarket/common';
-import { Account } from 'src/types/wallet';
-import {
-    Translation,
-    HiddenPlaceholder,
-    FormattedDate,
-    FormattedCryptoAmount,
-} from 'src/components/suite';
-import { getStatusMessage } from 'src/utils/wallet/coinmarket/buyUtils';
-import { TradeBuy } from 'src/types/wallet/coinmarketCommonTypes';
-import { useDispatch, useSelector } from 'src/hooks/suite';
-import { useCoinmarketNavigation } from 'src/hooks/wallet/useCoinmarketNavigation';
-import { CoinmarketTransactionStatus } from './CoinmarketTransactionStatus';
-import { useCoinmarketWatchTrade } from 'src/hooks/wallet/coinmarket/useCoinmarketWatchTrade';
-import { CoinmarketTradeBuyType } from 'src/types/coinmarket/coinmarket';
-import {
-    addIdsToQuotes,
-    filterQuotesAccordingTags,
-} from 'src/utils/wallet/coinmarket/coinmarketUtils';
-import { CoinmarketTestWrapper } from 'src/views/wallet/coinmarket';
-import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
-
-const Wrapper = styled.div`
-    display: flex;
-    flex: 1;
-    align-items: center;
-    margin-bottom: 20px;
-    border: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-    border-radius: 4px;
-    padding: 12px 0;
-
-    &:hover {
-        background: ${({ theme }) => theme.legacy.BG_WHITE};
-        border: 1px solid ${({ theme }) => theme.legacy.TYPE_WHITE};
-        box-shadow: 0 1px 2px 0 ${({ theme }) => theme.legacy.BOX_SHADOW_BLACK_20};
-    }
-
-    @media screen and (max-width: ${variables.SCREEN_SIZE.SM}) {
-        flex-direction: column;
-    }
-`;
-
-const StyledStatus = styled(CoinmarketTransactionStatus)`
-    margin-left: 5px;
-`;
-
-const Column = styled.div`
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    padding: 17px 24px;
-    overflow: hidden;
-`;
-
-const BuyColumn = styled(Column)`
-    display: flex;
-    justify-content: center;
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    flex: 0 1 auto;
-
-    @media screen and (max-width: ${variables.SCREEN_SIZE.SM}) {
-        border-left: 0;
-    }
-`;
-
-const ProviderColumn = styled(Column)`
-    max-width: 200px;
-`;
-
-const TradeID = styled.span`
-    padding-left: 5px;
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-    font-weight: ${variables.FONT_WEIGHT.DEMI_BOLD};
-    overflow: hidden;
-    text-overflow: ellipsis;
-`;
-
-const Row = styled.div`
-    display: flex;
-    align-items: center;
-    color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-const RowSecond = styled(Row)`
-    padding-top: 8px;
-    display: flex;
-
-    @media screen and (max-width: ${variables.SCREEN_SIZE.SM}) {
-        justify-content: center;
-    }
-`;
-
-const SmallRow = styled.div`
-    padding-top: 8px;
-    display: flex;
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    font-size: ${variables.FONT_SIZE.TINY};
-`;
-
-const SmallRowStatus = styled(SmallRow)`
-    font-weight: ${variables.FONT_WEIGHT.DEMI_BOLD};
-`;
-
-const Amount = styled.div``;
-
-const Arrow = styled.div`
-    display: flex;
-    align-items: center;
-    padding: 0 11px;
-`;
-
-interface BuyTransactionProps {
-    trade: TradeBuy;
-    account: Account;
-    providers?: {
-        [name: string]: BuyProviderInfo;
-    };
-}
-
-export const BuyTransaction = ({ trade, providers, account }: BuyTransactionProps) => {
-    const [isGettingOffers, setIsGettingOffers] = useState(false);
-    const dispatch = useDispatch();
-    const theme = useTheme();
-    const { navigateToBuyOffers, navigateToBuyDetail } = useCoinmarketNavigation(account);
-    const { cryptoIdToCoinSymbol } = useCoinmarketInfo();
-    const country = useSelector(state => state.wallet.coinmarket.buy.buyInfo?.buyInfo?.country);
-
-    useCoinmarketWatchTrade({
-        account,
-        trade,
-    });
-
-    const { date, data } = trade;
-    const {
-        fiatStringAmount,
-        fiatCurrency,
-        status,
-        receiveStringAmount,
-        exchange,
-        paymentMethod,
-        paymentMethodName,
-        receiveCurrency,
-    } = data;
-
-    const statusMessage = getStatusMessage(status || 'SUBMITTED');
-
-    const getOffers = async () => {
-        setIsGettingOffers(true);
-        const request: BuyTradeQuoteRequest = {
-            fiatCurrency: fiatCurrency || '',
-            receiveCurrency: receiveCurrency!,
-            fiatStringAmount: fiatStringAmount || '',
-            wantCrypto: false,
-            country,
-        };
-        dispatch(saveQuoteRequest(request));
-        dispatch(saveCachedAccountInfo(account.symbol, account.index, account.accountType));
-        const allQuotes = await invityAPI.getBuyQuotes(request);
-        if (allQuotes) {
-            const quotes = filterQuotesAccordingTags<CoinmarketTradeBuyType>(
-                addIdsToQuotes<CoinmarketTradeBuyType>(allQuotes, 'buy'),
-            );
-            dispatch(saveQuotes(quotes));
-        } else {
-            dispatch(clearQuotes());
-        }
-        navigateToBuyOffers();
-    };
-
-    const handleViewDetailsButtonClick = () => {
-        dispatch(saveTransactionDetailId(trade.key || ''));
-        navigateToBuyDetail();
-    };
-
-    return (
-        <Wrapper>
-            <Column>
-                <Row>
-                    <Amount>
-                        <HiddenPlaceholder data-testid="@coinmarket/transaction/fiat-amount">
-                            {fiatStringAmount} {fiatCurrency}
-                        </HiddenPlaceholder>
-                    </Amount>
-                    <Arrow>
-                        <Icon color={theme.legacy.TYPE_LIGHT_GREY} size={13} name="caretRight" />
-                    </Arrow>
-                    <CoinmarketTestWrapper data-testid="@coinmarket/transaction/crypto-amount">
-                        <FormattedCryptoAmount
-                            value={receiveStringAmount}
-                            symbol={cryptoIdToCoinSymbol(receiveCurrency!)}
-                        />
-                    </CoinmarketTestWrapper>
-                    {/* TODO FIX THIS LOGO */}
-                    {/* <StyledCoinLogo size={13} symbol={symbol} /> */}
-                </Row>
-                <SmallRowStatus>
-                    {trade.tradeType.toUpperCase()} • <FormattedDate value={date} date time /> •{' '}
-                    <StyledStatus trade={data} tradeType={trade.tradeType} />
-                </SmallRowStatus>
-                <SmallRow>
-                    <Translation id="TR_BUY_TRANS_ID" />
-                    <TradeID>{trade.data.paymentId}</TradeID>
-                </SmallRow>
-            </Column>
-            <ProviderColumn>
-                <Row>
-                    <CoinmarketProviderInfo exchange={exchange} providers={providers} />
-                </Row>
-                <RowSecond>
-                    <CoinmarketPaymentType method={paymentMethod} methodName={paymentMethodName} />
-                </RowSecond>
-            </ProviderColumn>
-            <BuyColumn>
-                {statusMessage === 'TR_BUY_STATUS_SUCCESS' ? (
-                    <Button
-                        size="small"
-                        variant="tertiary"
-                        onClick={getOffers}
-                        isLoading={isGettingOffers}
-                        isDisabled={isGettingOffers}
-                    >
-                        <Translation id="TR_BUY_BUY_AGAIN" />
-                    </Button>
-                ) : (
-                    <Button size="small" variant="tertiary" onClick={handleViewDetailsButtonClick}>
-                        <Translation id="TR_BUY_VIEW_DETAILS" />
-                    </Button>
-                )}
-            </BuyColumn>
-        </Wrapper>
-    );
-};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/CoinmarketAccountTransactions.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/CoinmarketAccountTransactions.tsx
deleted file mode 100644
index 4643d987a01..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/CoinmarketAccountTransactions.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-import { Translation } from 'src/components/suite';
-import { useSelector } from 'src/hooks/suite';
-import { H2, variables } from '@trezor/components';
-import styled from 'styled-components';
-
-import { BuyTransaction } from './BuyTransaction';
-import { SellTransaction } from './SellTransaction';
-import { ExchangeTransaction } from './ExchangeTransaction';
-import { useCoinmarketLoadData } from 'src/hooks/wallet/coinmarket/useCoinmarketLoadData';
-
-const Wrapper = styled.div`
-    margin-bottom: 48px;
-    padding: 64px 0 0;
-`;
-
-const Content = styled.div``;
-const Header = styled.div`
-    align-items: center;
-    padding-bottom: 32px;
-`;
-
-const NoTransactions = styled.div`
-    display: flex;
-    justify-content: center;
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledH2 = styled(H2)`
-    flex-direction: column;
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-const TransactionCount = styled.div`
-    margin-top: 6px;
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    font-size: ${variables.FONT_SIZE.SMALL};
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
-
-export const CoinmarketAccountTransactions = () => {
-    const selectedAccount = useSelector(state => state.wallet.selectedAccount);
-    const allTransactions = useSelector(state => state.wallet.coinmarket.trades);
-    const buyProviders = useSelector(state => state.wallet.coinmarket.buy.buyInfo?.providerInfos);
-    const exchangeProviders = useSelector(
-        state => state.wallet.coinmarket.exchange.exchangeInfo?.providerInfos,
-    );
-    const sellProviders = useSelector(
-        state => state.wallet.coinmarket.sell.sellInfo?.providerInfos,
-    );
-
-    useCoinmarketLoadData();
-
-    if (selectedAccount.status !== 'loaded') {
-        return null;
-    }
-
-    const { account } = selectedAccount;
-    const sortedAccountTransactions = [...allTransactions]
-        .filter(t => t.account.descriptor === account.descriptor)
-        .sort((a, b) => {
-            if (a.date > b.date) return -1;
-            if (a.date < b.date) return 1;
-
-            return 0;
-        });
-
-    const buyTransactions = sortedAccountTransactions.filter(tx => tx.tradeType === 'buy');
-    const exchangeTransactions = sortedAccountTransactions.filter(
-        tx => tx.tradeType === 'exchange',
-    );
-    const sellTransactions = sortedAccountTransactions.filter(tx => tx.tradeType === 'sell');
-
-    return (
-        <Wrapper>
-            {sortedAccountTransactions.length === 0 && (
-                <NoTransactions>
-                    <Translation id="TR_BUY_NOT_TRANSACTIONS" />
-                </NoTransactions>
-            )}
-            {sortedAccountTransactions.length > 0 && (
-                <>
-                    <Header>
-                        <StyledH2>
-                            <Translation id="TR_BUY_ACCOUNT_TRANSACTIONS" />
-                        </StyledH2>
-                        <p>
-                            <TransactionCount>
-                                {buyTransactions.length} <Translation id="TR_TRADE_BUYS" /> •{' '}
-                                {sellTransactions.length} <Translation id="TR_TRADE_SELLS" /> •{' '}
-                                {exchangeTransactions.length}{' '}
-                                <Translation id="TR_TRADE_EXCHANGES" />
-                            </TransactionCount>
-                        </p>
-                    </Header>
-                    <Content>
-                        {sortedAccountTransactions.map(trade => {
-                            if (trade.tradeType === 'buy') {
-                                return (
-                                    <BuyTransaction
-                                        account={account}
-                                        key={`${trade.tradeType}-${trade.key}`}
-                                        trade={trade}
-                                        providers={buyProviders}
-                                    />
-                                );
-                            }
-                            if (trade.tradeType === 'sell') {
-                                return (
-                                    <SellTransaction
-                                        account={account}
-                                        key={`${trade.tradeType}-${trade.key}`}
-                                        trade={trade}
-                                        providers={sellProviders}
-                                    />
-                                );
-                            }
-                            if (trade.tradeType === 'exchange') {
-                                return (
-                                    <ExchangeTransaction
-                                        account={account}
-                                        key={`${trade.tradeType}-${trade.key}`}
-                                        trade={trade}
-                                        providers={exchangeProviders}
-                                    />
-                                );
-                            }
-
-                            return null;
-                        })}
-                    </Content>
-                </>
-            )}
-        </Wrapper>
-    );
-};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/ExchangeTransaction.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/ExchangeTransaction.tsx
deleted file mode 100644
index e63c5b4e0d9..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/ExchangeTransaction.tsx
+++ /dev/null
@@ -1,170 +0,0 @@
-import styled, { useTheme } from 'styled-components';
-import { ExchangeProviderInfo } from 'invity-api';
-
-import { Button, Icon, variables } from '@trezor/components';
-import { CoinmarketProviderInfo } from 'src/views/wallet/coinmarket/common';
-import { TradeExchange } from 'src/types/wallet/coinmarketCommonTypes';
-import { goto } from 'src/actions/suite/routerActions';
-import { saveTransactionId } from 'src/actions/wallet/coinmarketExchangeActions';
-import { Account } from 'src/types/wallet';
-import { Translation, FormattedDate, FormattedCryptoAmount } from 'src/components/suite';
-import { useDispatch } from 'src/hooks/suite';
-import { CoinmarketTransactionStatus } from './CoinmarketTransactionStatus';
-import { useCoinmarketWatchTrade } from 'src/hooks/wallet/coinmarket/useCoinmarketWatchTrade';
-import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
-
-const Wrapper = styled.div`
-    display: flex;
-    flex: 1;
-    align-items: center;
-    margin-bottom: 20px;
-    border: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-    border-radius: 4px;
-    padding: 12px 0;
-
-    &:hover {
-        background: ${({ theme }) => theme.legacy.BG_WHITE};
-        border: 1px solid ${({ theme }) => theme.legacy.TYPE_WHITE};
-        box-shadow: 0 1px 2px 0 ${({ theme }) => theme.legacy.BOX_SHADOW_BLACK_20};
-    }
-
-    @media screen and (max-width: ${variables.SCREEN_SIZE.SM}) {
-        flex-direction: column;
-    }
-`;
-
-const StyledStatus = styled(CoinmarketTransactionStatus)`
-    margin-left: 5px;
-`;
-
-const Column = styled.div`
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    padding: 17px 24px;
-    overflow: hidden;
-`;
-
-const BuyColumn = styled(Column)`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    max-width: 130px;
-
-    @media screen and (max-width: ${variables.SCREEN_SIZE.SM}) {
-        border-left: 0;
-    }
-
-    border-left: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-`;
-
-const ProviderColumn = styled(Column)`
-    max-width: 200px;
-`;
-
-const TradeID = styled.span`
-    padding-left: 5px;
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-    font-weight: ${variables.FONT_WEIGHT.DEMI_BOLD};
-    overflow: hidden;
-    text-overflow: ellipsis;
-`;
-
-const Row = styled.div`
-    display: flex;
-    align-items: center;
-    color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-const SmallRow = styled.div`
-    padding-top: 8px;
-    display: flex;
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    font-size: ${variables.FONT_SIZE.TINY};
-    white-space: nowrap;
-`;
-
-const SmallRowStatus = styled(SmallRow)`
-    font-weight: ${variables.FONT_WEIGHT.DEMI_BOLD};
-`;
-
-const Amount = styled.div``;
-
-const Arrow = styled.div`
-    display: flex;
-    align-items: center;
-    padding: 0 11px;
-`;
-
-interface ExchangeTransactionProps {
-    trade: TradeExchange;
-    account: Account;
-    providers?: {
-        [name: string]: ExchangeProviderInfo;
-    };
-}
-
-export const ExchangeTransaction = ({ trade, providers, account }: ExchangeTransactionProps) => {
-    const dispatch = useDispatch();
-    const theme = useTheme();
-    useCoinmarketWatchTrade({ account, trade });
-    const { cryptoIdToCoinSymbol } = useCoinmarketInfo();
-
-    const { date, data } = trade;
-    const { send, sendStringAmount, receive, receiveStringAmount, exchange } = data;
-
-    const viewDetail = async () => {
-        await dispatch(saveTransactionId(trade.key || ''));
-        dispatch(
-            goto('wallet-coinmarket-exchange-detail', {
-                params: {
-                    symbol: account.symbol,
-                    accountIndex: account.index,
-                    accountType: account.accountType,
-                },
-            }),
-        );
-    };
-
-    return (
-        <Wrapper>
-            <Column>
-                <Row>
-                    <Amount>
-                        <FormattedCryptoAmount value={sendStringAmount} symbol={send} />
-                    </Amount>
-                    <Arrow>
-                        <Icon color={theme.legacy.TYPE_LIGHT_GREY} size={13} name="caretRight" />
-                    </Arrow>
-                    <FormattedCryptoAmount
-                        value={receiveStringAmount}
-                        symbol={cryptoIdToCoinSymbol(receive!)}
-                    />
-                    {/* TODO FIX THIS LOGO */}
-                    {/* <StyledCoinLogo size={13} symbol={symbol} /> */}
-                </Row>
-                <SmallRowStatus>
-                    {trade.tradeType.toUpperCase()} • <FormattedDate value={date} date time /> •{' '}
-                    <StyledStatus trade={data} tradeType={trade.tradeType} />
-                </SmallRowStatus>
-                <SmallRow>
-                    <Translation id="TR_EXCHANGE_TRANS_ID" />
-                    <TradeID>{trade.data.orderId}</TradeID>
-                </SmallRow>
-            </Column>
-            <ProviderColumn>
-                <Row>
-                    <CoinmarketProviderInfo exchange={exchange} providers={providers} />
-                </Row>
-            </ProviderColumn>
-            <BuyColumn>
-                <Button variant="tertiary" onClick={viewDetail}>
-                    <Translation id="TR_EXCHANGE_VIEW_DETAILS" />
-                </Button>
-            </BuyColumn>
-        </Wrapper>
-    );
-};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/SellTransaction.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/SellTransaction.tsx
deleted file mode 100644
index 8a793bf8d63..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/SellTransaction.tsx
+++ /dev/null
@@ -1,232 +0,0 @@
-import styled, { useTheme } from 'styled-components';
-import { SellProviderInfo } from 'invity-api';
-import { goto } from 'src/actions/suite/routerActions';
-import { saveComposedTransactionInfo } from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
-import {
-    saveQuoteRequest,
-    saveTransactionId,
-    setIsFromRedirect,
-} from 'src/actions/wallet/coinmarketSellActions';
-import { variables, Icon, Button } from '@trezor/components';
-import { CoinmarketPaymentType, CoinmarketProviderInfo } from 'src/views/wallet/coinmarket/common';
-import { Account } from 'src/types/wallet';
-import {
-    Translation,
-    HiddenPlaceholder,
-    FormattedDate,
-    FormattedCryptoAmount,
-} from 'src/components/suite';
-import { TradeSell } from 'src/types/wallet/coinmarketCommonTypes';
-import { useDispatch, useSelector } from 'src/hooks/suite';
-import { CoinmarketTransactionStatus } from './CoinmarketTransactionStatus';
-import { useCoinmarketWatchTrade } from 'src/hooks/wallet/coinmarket/useCoinmarketWatchTrade';
-import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
-
-const Wrapper = styled.div`
-    display: flex;
-    flex: 1;
-    align-items: center;
-    margin-bottom: 20px;
-    border: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-    border-radius: 4px;
-    padding: 12px 0;
-
-    &:hover {
-        background: ${({ theme }) => theme.legacy.BG_WHITE};
-        border: 1px solid ${({ theme }) => theme.legacy.TYPE_WHITE};
-        box-shadow: 0 1px 2px 0 ${({ theme }) => theme.legacy.BOX_SHADOW_BLACK_20};
-    }
-
-    @media screen and (max-width: ${variables.SCREEN_SIZE.SM}) {
-        flex-direction: column;
-    }
-`;
-
-const StyledStatus = styled(CoinmarketTransactionStatus)`
-    margin-left: 5px;
-`;
-
-const Column = styled.div`
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    padding: 17px 24px;
-    overflow: hidden;
-`;
-
-const SellColumn = styled(Column)`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    max-width: 130px;
-
-    @media screen and (max-width: ${variables.SCREEN_SIZE.SM}) {
-        border-left: 0;
-    }
-
-    border-left: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-`;
-
-const ProviderColumn = styled(Column)`
-    max-width: 200px;
-`;
-
-const TradeID = styled.span`
-    padding-left: 5px;
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-    font-weight: ${variables.FONT_WEIGHT.DEMI_BOLD};
-    overflow: hidden;
-    text-overflow: ellipsis;
-`;
-
-const Row = styled.div`
-    display: flex;
-    align-items: center;
-    color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-const RowSecond = styled(Row)`
-    padding-top: 8px;
-    display: flex;
-
-    @media screen and (max-width: ${variables.SCREEN_SIZE.SM}) {
-        justify-content: center;
-    }
-`;
-
-const SmallRow = styled.div`
-    padding-top: 8px;
-    display: flex;
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    font-size: ${variables.FONT_SIZE.TINY};
-`;
-
-const SmallRowStatus = styled(SmallRow)`
-    font-weight: ${variables.FONT_WEIGHT.DEMI_BOLD};
-`;
-
-const Arrow = styled.div`
-    display: flex;
-    align-items: center;
-    padding: 0 11px;
-`;
-
-interface SellTransactionProps {
-    trade: TradeSell;
-    account: Account;
-    providers?: {
-        [name: string]: SellProviderInfo;
-    };
-}
-
-export const SellTransaction = ({ trade, providers, account }: SellTransactionProps) => {
-    const theme = useTheme();
-    const { composed, selectedFee } = useSelector(
-        state => state.wallet.coinmarket.composedTransactionInfo,
-    );
-    const dispatch = useDispatch();
-    const { cryptoIdToCoinSymbol } = useCoinmarketInfo();
-    useCoinmarketWatchTrade({ account, trade });
-
-    const { date, data } = trade;
-    const {
-        amountInCrypto,
-        fiatStringAmount,
-        fiatCurrency,
-        cryptoStringAmount,
-        exchange,
-        paymentMethod,
-        paymentMethodName,
-        cryptoCurrency,
-    } = data;
-
-    const viewDetail = () => {
-        dispatch(saveTransactionId(trade.key || ''));
-        if (trade.data.status === 'SUBMITTED' || trade.data.status === 'SEND_CRYPTO') {
-            // continue to the sell flow
-            dispatch(
-                saveQuoteRequest({
-                    amountInCrypto: amountInCrypto || false,
-                    fiatCurrency: fiatCurrency || '',
-                    cryptoCurrency: cryptoCurrency!,
-                }),
-            );
-            dispatch(setIsFromRedirect(true));
-            // use fee selected by user or normal
-            dispatch(
-                saveComposedTransactionInfo({
-                    selectedFee: selectedFee || 'normal',
-                    composed: composed || {
-                        feePerByte: '',
-                        fee: '',
-                    },
-                }),
-            );
-            dispatch(
-                goto('wallet-coinmarket-sell-confirm', {
-                    params: {
-                        symbol: account.symbol,
-                        accountIndex: account.index,
-                        accountType: account.accountType,
-                    },
-                }),
-            );
-
-            return;
-        }
-        dispatch(
-            goto('wallet-coinmarket-sell-detail', {
-                params: {
-                    symbol: account.symbol,
-                    accountIndex: account.index,
-                    accountType: account.accountType,
-                },
-            }),
-        );
-    };
-
-    return (
-        <Wrapper>
-            <Column>
-                <Row>
-                    <FormattedCryptoAmount
-                        value={cryptoStringAmount}
-                        symbol={cryptoIdToCoinSymbol(cryptoCurrency!)}
-                    />
-                    <Arrow>
-                        <Icon color={theme.legacy.TYPE_LIGHT_GREY} size={13} name="caretRight" />
-                    </Arrow>
-                    <div>
-                        <HiddenPlaceholder>
-                            {fiatStringAmount} {fiatCurrency}
-                        </HiddenPlaceholder>
-                    </div>
-                </Row>
-                <SmallRowStatus>
-                    {trade.tradeType.toUpperCase()} • <FormattedDate value={date} date time /> •{' '}
-                    <StyledStatus trade={data} tradeType={trade.tradeType} />
-                </SmallRowStatus>
-                <SmallRow>
-                    <Translation id="TR_SELL_TRANS_ID" />
-                    <TradeID>{trade.data.paymentId}</TradeID>
-                </SmallRow>
-            </Column>
-            <ProviderColumn>
-                <Row>
-                    <CoinmarketProviderInfo exchange={exchange} providers={providers} />
-                </Row>
-                <RowSecond>
-                    <CoinmarketPaymentType method={paymentMethod} methodName={paymentMethodName} />
-                </RowSecond>
-            </ProviderColumn>
-            <SellColumn>
-                <Button variant="tertiary" onClick={viewDetail}>
-                    <Translation id="TR_SELL_VIEW_DETAILS" />
-                </Button>
-            </SellColumn>
-        </Wrapper>
-    );
-};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayout.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayout.tsx
index 34066fe522d..6db4321e9f8 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayout.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayout.tsx
@@ -1,92 +1,21 @@
-import { ReactNode } from 'react';
-import styled from 'styled-components';
+import { PropsWithChildren } from 'react';
 
-import { WalletLayout, WalletSubpageHeading } from 'src/components/wallet';
-import { Card, Button, variables } from '@trezor/components';
-import { Translation } from 'src/components/suite';
-import type { SelectedAccountLoaded } from '@suite-common/wallet-types';
-import { CoinmarketFooter } from 'src/views/wallet/coinmarket/common';
-import CoinmarketLayoutNavigation from 'src/views/wallet/coinmarket/common/CoinmarketLayoutNew/CoinmarketLayoutNavigation/CoinmarketLayoutNavigation';
-import { spacingsPx } from '@trezor/theme';
-import { SCREEN_QUERY } from '@trezor/components/src/config/variables';
+import { spacings } from '@trezor/theme';
+import { Column } from '@trezor/components';
 
-const Content = styled.div`
-    padding: 29px 41px;
+import { CoinmarketLayoutNavigation } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutNavigation/CoinmarketLayoutNavigation';
+import { useSelector } from 'src/hooks/suite';
+import { selectRouteName } from 'src/reducers/suite/routerReducer';
 
-    @media (max-width: ${variables.SCREEN_SIZE.SM}) {
-        padding: 29px 20px;
-    }
-`;
+interface CoinmarketLayoutProps extends PropsWithChildren {}
 
-const CoinmarketWrapper = styled.div`
-    padding: 0 ${spacingsPx.lg};
+export const CoinmarketLayout = ({ children }: CoinmarketLayoutProps) => {
+    const routeName = useSelector(selectRouteName);
 
-    ${SCREEN_QUERY.BELOW_DESKTOP} {
-        padding: 0;
-    }
-`;
-
-const CardWrapper = styled.div`
-    flex: 1;
-    align-self: flex-start;
-`;
-
-const BottomContent = styled.div`
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    padding-top: ${spacingsPx.xxxl};
-`;
-
-const Layout = styled.div`
-    display: flex;
-    flex-direction: row;
-    margin-top: ${spacingsPx.xl};
-
-    ${variables.SCREEN_QUERY.BELOW_LAPTOP} {
-        flex-direction: column;
-    }
-`;
-
-interface CoinmarketLayoutProps {
-    children: ReactNode;
-    selectedAccount: SelectedAccountLoaded;
-    onClearFormButtonClick?: () => void;
-}
-
-export const CoinmarketLayout = ({
-    children,
-    selectedAccount,
-    onClearFormButtonClick,
-}: CoinmarketLayoutProps) => (
-    <WalletLayout title="TR_NAV_TRADE" isSubpage account={selectedAccount}>
-        <CoinmarketWrapper>
-            <WalletSubpageHeading title="TR_NAV_TRADE">
-                {onClearFormButtonClick && (
-                    <Button
-                        size="small"
-                        type="button"
-                        variant="tertiary"
-                        onClick={onClearFormButtonClick}
-                    >
-                        <Translation id="TR_CLEAR_ALL" />
-                    </Button>
-                )}
-            </WalletSubpageHeading>
-
-            <CoinmarketLayoutNavigation selectedAccount={selectedAccount} />
-
-            <Layout>
-                <CardWrapper>
-                    <Card paddingType="none">
-                        <Content>{children}</Content>
-                    </Card>
-                </CardWrapper>
-            </Layout>
-
-            <BottomContent>
-                <CoinmarketFooter />
-            </BottomContent>
-        </CoinmarketWrapper>
-    </WalletLayout>
-);
+    return (
+        <Column gap={spacings.xl} alignItems="stretch">
+            {!routeName?.includes(`wallet-coinmarket-exchange`) && <CoinmarketLayoutNavigation />}
+            {children}
+        </Column>
+    );
+};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutHeader.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutHeader.tsx
new file mode 100644
index 00000000000..437ac0ab4b7
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutHeader.tsx
@@ -0,0 +1,59 @@
+import { PropsWithChildren, useCallback, useMemo } from 'react';
+import { useHistory } from 'react-router-dom';
+
+import { IconButton, Row } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
+import { PageHeader } from 'src/components/suite/layouts/SuiteLayout';
+import { BasicName } from 'src/components/suite/layouts/SuiteLayout/PageHeader/PageNames/BasicName';
+import { useLayout, useSelector, useTranslation } from 'src/hooks/suite';
+import { selectRouteName } from 'src/reducers/suite/routerReducer';
+import { CoinmarketLayoutNavigationItem } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutNavigation/CoinmarketLayoutNavigationItem';
+
+interface CoinmarketLayoutHeaderProps extends PropsWithChildren {}
+
+export const CoinmarketLayoutHeader = ({ children }: CoinmarketLayoutHeaderProps) => {
+    const currentRouteName = useSelector(selectRouteName);
+    const { activeSection } = useSelector(state => state.wallet.coinmarket);
+    const { goBack } = useHistory();
+    const { translationString } = useTranslation();
+    const fallbackTitle = useMemo(
+        () => (activeSection === 'exchange' ? 'TR_COINMARKET_SWAP' : 'TR_COINMARKET_BUY_AND_SELL'),
+        [activeSection],
+    );
+
+    const translatedTitle = translationString(fallbackTitle);
+    const pageTitle = `Trezor Suite | ${translatedTitle}`;
+
+    const CoinmarketPageHeader = useCallback(
+        () => (
+            <PageHeader>
+                <Row width="100%" gap={spacings.md}>
+                    <IconButton
+                        icon="caretLeft"
+                        variant="tertiary"
+                        size="medium"
+                        onClick={goBack}
+                        data-testid="@account-subpage/back"
+                    />
+                    <BasicName nameId={fallbackTitle} />
+                    {currentRouteName !== 'wallet-coinmarket-transactions' && (
+                        <Row flex="auto" margin={{ left: 'auto' }}>
+                            <CoinmarketLayoutNavigationItem
+                                route="wallet-coinmarket-transactions"
+                                title="TR_COINMARKET_LAST_TRANSACTIONS"
+                            />
+                        </Row>
+                    )}
+                </Row>
+            </PageHeader>
+        ),
+        [fallbackTitle, currentRouteName, goBack],
+    );
+
+    useLayout(pageTitle, CoinmarketPageHeader);
+
+    if (!children) return null;
+
+    return children;
+};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutNavigation.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutNavigation.tsx
deleted file mode 100644
index adad31c85e7..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutNavigation.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import styled, { css } from 'styled-components';
-import { useDevice, useSelector } from 'src/hooks/suite';
-import { FirmwareType } from '@trezor/connect';
-import { TranslationKey } from '@suite-common/intl-types';
-import { Route } from '@suite-common/suite-types';
-import { borders, spacingsPx, typography } from '@trezor/theme';
-import { NavigationItem } from '../../../../../components/suite/layouts/SuiteLayout/Sidebar/NavigationItem';
-import { variables, IconName } from '@trezor/components';
-
-const List = styled.div`
-    display: flex;
-    flex-direction: column;
-    width: 171px;
-    gap: ${spacingsPx.xxs};
-
-    ${variables.SCREEN_QUERY.BELOW_LAPTOP} {
-        width: 100%;
-        flex-direction: row;
-        overflow-x: auto;
-    }
-`;
-
-const NavListItem = styled(NavigationItem)`
-    white-space: nowrap;
-    ${typography.body}
-
-    ${({ isActive }) =>
-        isActive
-            ? css`
-                  border-radius: ${borders.radii.full};
-              `
-            : ''}
-`;
-
-export const CoinmarketLayoutNavigation = () => {
-    const routeName = useSelector(state => state.router.route?.name);
-
-    const { device } = useDevice();
-
-    const isBitcoinOnly = device?.firmwareType === FirmwareType.BitcoinOnly;
-
-    const Item = ({
-        route,
-        title,
-        icon,
-    }: {
-        route: Route['name'];
-        title: TranslationKey;
-        icon: IconName;
-    }) => (
-        <NavListItem
-            data-testid={`@coinmarket/menu/${route}`}
-            nameId={title}
-            isActive={routeName === route}
-            icon={icon}
-            goToRoute={route}
-            preserveParams
-        />
-    );
-
-    return (
-        <List>
-            <Item route="wallet-coinmarket-buy" title="TR_NAV_BUY" icon="plus" />
-            <Item route="wallet-coinmarket-sell" title="TR_NAV_SELL" icon="minus" />
-
-            {!isBitcoinOnly ? (
-                <Item
-                    route="wallet-coinmarket-exchange"
-                    title="TR_COINMARKET_SWAP"
-                    icon="arrowsLeftRight"
-                />
-            ) : null}
-        </List>
-    );
-};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutNavigation/CoinmarketLayoutNavigation.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutNavigation/CoinmarketLayoutNavigation.tsx
new file mode 100644
index 00000000000..19f052f47fd
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutNavigation/CoinmarketLayoutNavigation.tsx
@@ -0,0 +1,23 @@
+import { Row } from '@trezor/components';
+
+import { CoinmarketLayoutNavigationItem } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutNavigation/CoinmarketLayoutNavigationItem';
+
+export const CoinmarketLayoutNavigation = () => (
+    <Row>
+        <CoinmarketLayoutNavigationItem
+            route="wallet-coinmarket-buy"
+            title="TR_NAV_BUY"
+            icon="plus"
+        />
+        <CoinmarketLayoutNavigationItem
+            route="wallet-coinmarket-sell"
+            title="TR_NAV_SELL"
+            icon="minus"
+        />
+        <CoinmarketLayoutNavigationItem
+            route="wallet-coinmarket-dca"
+            title="TR_NAV_DCA"
+            icon="clock"
+        />
+    </Row>
+);
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayoutNew/CoinmarketLayoutNavigation/CoinmarketLayoutNavigationItem.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutNavigation/CoinmarketLayoutNavigationItem.tsx
similarity index 89%
rename from packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayoutNew/CoinmarketLayoutNavigation/CoinmarketLayoutNavigationItem.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutNavigation/CoinmarketLayoutNavigationItem.tsx
index 192e3c69168..ec66d4a21d4 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayoutNew/CoinmarketLayoutNavigation/CoinmarketLayoutNavigationItem.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayoutNavigation/CoinmarketLayoutNavigationItem.tsx
@@ -1,13 +1,15 @@
+import styled, { css } from 'styled-components';
+
 import { TranslationKey } from '@suite-common/intl-types';
 import { Route } from '@suite-common/suite-types';
 import { Button, IconName } from '@trezor/components';
 import { SCREEN_QUERY } from '@trezor/components/src/config/variables';
 import { typography, borders, spacingsPx } from '@trezor/theme';
+
 import { goto } from 'src/actions/suite/routerActions';
 import { Translation } from 'src/components/suite';
 import { NavigationItem } from 'src/components/suite/layouts/SuiteLayout/Sidebar/NavigationItem';
 import { useDispatch, useSelector } from 'src/hooks/suite';
-import styled, { css } from 'styled-components';
 
 const NavListItemWrapper = styled(NavigationItem)`
     padding: ${spacingsPx.xs} ${spacingsPx.md};
@@ -43,18 +45,13 @@ const NavListItemWrapper = styled(NavigationItem)`
     }
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const ButtonWrapper = styled(Button)`
-    margin-left: auto;
-`;
-
 interface CoinmarketLayoutNavigationItemProps {
     route: Route['name'];
     title: TranslationKey;
     icon?: IconName;
 }
 
-const CoinmarketLayoutNavigationItem = ({
+export const CoinmarketLayoutNavigationItem = ({
     route,
     title,
     icon,
@@ -68,14 +65,15 @@ const CoinmarketLayoutNavigationItem = ({
 
     if (route === transactionsRoute) {
         return (
-            <ButtonWrapper
+            <Button
                 size="small"
                 variant="tertiary"
+                margin={{ left: 'auto' }}
                 onClick={handleTransactionRoute}
                 data-testid={`@coinmarket/menu/${transactionsRoute}`}
             >
                 <Translation id={title} />
-            </ButtonWrapper>
+            </Button>
         );
     }
 
@@ -90,5 +88,3 @@ const CoinmarketLayoutNavigationItem = ({
         />
     );
 };
-
-export default CoinmarketLayoutNavigationItem;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/withCoinmarketLayoutWrap.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/withCoinmarketLayoutWrap.tsx
deleted file mode 100644
index b15f538b537..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/withCoinmarketLayoutWrap.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Route } from '@suite-common/suite-types';
-import { ComponentType, FunctionComponent } from 'react';
-import { PageHeader } from 'src/components/suite/layouts/SuiteLayout';
-import { WithSelectedAccountLoadedProps } from 'src/components/wallet';
-import { useLayout } from 'src/hooks/suite';
-
-interface PageHeaderProps {
-    title?: string;
-    backRoute: Extract<Route['name'], `wallet-coinmarket-${string}`>;
-}
-
-export const withCoinmarketLayoutWrap = (
-    WrappedComponent: ComponentType<WithSelectedAccountLoadedProps>,
-    options: PageHeaderProps,
-): FunctionComponent<WithSelectedAccountLoadedProps> => {
-    const { backRoute } = options;
-    const title = options.title ?? 'Trezor Suite | Trade';
-
-    const Component: FunctionComponent<WithSelectedAccountLoadedProps> = ({ ...props }) => {
-        useLayout(title, () => <PageHeader backRoute={backRoute} />);
-
-        return <WrappedComponent {...props} />;
-    };
-
-    Component.displayName = `withCoinmarketLayoutWrap(${WrappedComponent.displayName || WrappedComponent.name || 'Component'})`;
-
-    return Component;
-};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayoutNew/CoinmarketLayout.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayoutNew/CoinmarketLayout.tsx
deleted file mode 100644
index a8bfc98df05..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayoutNew/CoinmarketLayout.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { ReactNode } from 'react';
-import styled from 'styled-components';
-
-import { WalletLayout, WalletSubpageHeading } from 'src/components/wallet';
-import type { SelectedAccountLoaded } from '@suite-common/wallet-types';
-import { CoinmarketFooter } from 'src/views/wallet/coinmarket/common';
-import { spacingsPx } from '@trezor/theme';
-import CoinmarketLayoutNavigation from './CoinmarketLayoutNavigation/CoinmarketLayoutNavigation';
-import { SCREEN_QUERY } from '@trezor/components/src/config/variables';
-
-const CoinmarketWrapper = styled.div`
-    padding: 0 ${spacingsPx.lg};
-
-    ${SCREEN_QUERY.BELOW_DESKTOP} {
-        padding: 0;
-    }
-`;
-
-const CoinmarketFormWrapper = styled.div`
-    margin-top: ${spacingsPx.xl};
-`;
-
-interface CoinmarketLayoutProps {
-    children: ReactNode;
-    selectedAccount: SelectedAccountLoaded;
-}
-
-const CoinmarketLayout = ({ children, selectedAccount }: CoinmarketLayoutProps) => (
-    <WalletLayout title="TR_NAV_TRADE" isSubpage account={selectedAccount}>
-        <CoinmarketWrapper>
-            <WalletSubpageHeading title="TR_NAV_TRADE" />
-            <CoinmarketLayoutNavigation selectedAccount={selectedAccount} />
-            <CoinmarketFormWrapper>{children}</CoinmarketFormWrapper>
-            <CoinmarketFooter />
-        </CoinmarketWrapper>
-    </WalletLayout>
-);
-
-export default CoinmarketLayout;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayoutNew/CoinmarketLayoutNavigation/CoinmarketLayoutNavigation.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayoutNew/CoinmarketLayoutNavigation/CoinmarketLayoutNavigation.tsx
deleted file mode 100644
index 0dcead6090f..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayoutNew/CoinmarketLayoutNavigation/CoinmarketLayoutNavigation.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import styled from 'styled-components';
-import { useDevice, useSelector } from 'src/hooks/suite';
-import { FirmwareType } from '@trezor/connect';
-import CoinmarketLayoutNavigationItem from './CoinmarketLayoutNavigationItem';
-import { Divider } from '@trezor/components';
-import { spacings } from '@trezor/theme';
-import regional from 'src/constants/wallet/coinmarket/regional';
-import { getIsTorEnabled } from 'src/utils/suite/tor';
-import { SelectedAccountLoaded } from '@suite-common/wallet-types';
-
-const List = styled.div`
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-`;
-
-const SeparatorWrapper = styled.div`
-    height: 42px;
-`;
-
-interface CoinmarketLayoutNavigationProps {
-    selectedAccount: SelectedAccountLoaded;
-}
-
-const CoinmarketLayoutNavigation = ({ selectedAccount }: CoinmarketLayoutNavigationProps) => {
-    const { device } = useDevice();
-    const isBitcoinOnly = device?.firmwareType === FirmwareType.BitcoinOnly;
-
-    const isBtcAccount = selectedAccount.account.symbol === 'btc';
-    const torStatus = useSelector(state => state.suite.torStatus);
-    const isTorEnabled = getIsTorEnabled(torStatus);
-    const country = useSelector(
-        state =>
-            state.wallet.coinmarket.buy.buyInfo?.buyInfo?.country ??
-            state.wallet.coinmarket.sell.sellInfo?.sellList?.country,
-    );
-    const showDCA = Boolean(isBtcAccount && !isTorEnabled && country && regional.isInEEA(country));
-
-    return (
-        <List>
-            <CoinmarketLayoutNavigationItem
-                route="wallet-coinmarket-buy"
-                title="TR_NAV_BUY"
-                icon="plus"
-            />
-            <CoinmarketLayoutNavigationItem
-                route="wallet-coinmarket-sell"
-                title="TR_NAV_SELL"
-                icon="minus"
-            />
-
-            {!isBitcoinOnly ? (
-                <CoinmarketLayoutNavigationItem
-                    route="wallet-coinmarket-exchange"
-                    title="TR_COINMARKET_SWAP"
-                    icon="arrowsLeftRight"
-                />
-            ) : null}
-
-            {showDCA ? (
-                <>
-                    <SeparatorWrapper>
-                        <Divider
-                            orientation="vertical"
-                            strokeWidth={1}
-                            margin={{ left: spacings.sm, right: spacings.sm }}
-                        />
-                    </SeparatorWrapper>
-                    <CoinmarketLayoutNavigationItem
-                        route="wallet-coinmarket-dca"
-                        title="TR_NAV_DCA"
-                        icon="clock"
-                    />
-                </>
-            ) : null}
-
-            <CoinmarketLayoutNavigationItem
-                route="wallet-coinmarket-transactions"
-                title="TR_COINMARKET_LAST_TRANSACTIONS"
-            />
-        </List>
-    );
-};
-
-export default CoinmarketLayoutNavigation;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffers.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffers.tsx
index b8e69c98b23..48c336bf156 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffers.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffers.tsx
@@ -1,21 +1,19 @@
-import CoinmarketOffersEmpty from './CoinmarketOffersEmpty';
-import CoinmarketHeader from '../CoinmarketHeader/CoinmarketHeader';
-import CoinmarketOffersItem from './CoinmarketOffersItem';
-import {
-    isCoinmarketExchangeOffers,
-    useCoinmarketOffersContext,
-} from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
+import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
+import { isCoinmarketExchangeContext } from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
 import { getBestRatedQuote } from 'src/utils/wallet/coinmarket/coinmarketUtils';
-import { CoinmarketOffersExchange } from './CoinmarketOffersExchange';
+import { CoinmarketHeader } from 'src/views/wallet/coinmarket/common/CoinmarketHeader/CoinmarketHeader';
+import { CoinmarketOffersEmpty } from 'src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersEmpty';
+import { CoinmarketOffersExchange } from 'src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersExchange';
+import { CoinmarketOffersItem } from 'src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersItem';
 
-const CoinmarketOffers = () => {
-    const context = useCoinmarketOffersContext();
+export const CoinmarketOffers = () => {
+    const context = useCoinmarketFormContext();
     const { type, quotes } = context;
     const hasLoadingFailed = !quotes;
     const noOffers = hasLoadingFailed || quotes.length === 0;
     const bestRatedQuote = getBestRatedQuote(quotes, type);
 
-    const offers = isCoinmarketExchangeOffers(context) ? (
+    const offers = isCoinmarketExchangeContext(context) ? (
         <CoinmarketOffersExchange />
     ) : (
         quotes?.map(quote => (
@@ -37,5 +35,3 @@ const CoinmarketOffers = () => {
         </>
     );
 };
-
-export default CoinmarketOffers;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersEmpty.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersEmpty.tsx
index b1962466441..76617362068 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersEmpty.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersEmpty.tsx
@@ -1,16 +1,12 @@
-import { Translation } from 'src/components/suite';
-import { CoinmarketParagraph } from '../..';
-import { Card } from '@trezor/components';
+import { Card, Paragraph } from '@trezor/components';
 import { spacings } from '@trezor/theme';
 
-const CoinmarketOffersEmpty = () => {
-    return (
-        <Card margin={{ top: spacings.md }}>
-            <CoinmarketParagraph>
-                <Translation id="TR_COINMARKET_OFFERS_EMPTY" />
-            </CoinmarketParagraph>
-        </Card>
-    );
-};
+import { Translation } from 'src/components/suite';
 
-export default CoinmarketOffersEmpty;
+export const CoinmarketOffersEmpty = () => (
+    <Card margin={{ top: spacings.md }}>
+        <Paragraph align="center" variant="tertiary">
+            <Translation id="TR_COINMARKET_OFFERS_EMPTY" />
+        </Paragraph>
+    </Card>
+);
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersExchange.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersExchange.tsx
index 7b0235bef5f..13442cd7f32 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersExchange.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersExchange.tsx
@@ -1,4 +1,7 @@
-import { useCoinmarketOffersContext } from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
+import { useMemo } from 'react';
+
+import { ExchangeTrade } from 'invity-api';
+
 import { CoinmarketTradeExchangeType } from 'src/types/coinmarket/coinmarket';
 import {
     EXCHANGE_COMPARATOR_KYC_FILTER,
@@ -9,17 +12,16 @@ import {
     EXCHANGE_COMPARATOR_RATE_FILTER_FIXED_CEX,
     EXCHANGE_COMPARATOR_RATE_FILTER_FLOATING_CEX,
 } from 'src/constants/wallet/coinmarket/form';
-import { ExchangeTrade } from 'invity-api';
-import { CoinmarketOffersExchangeQuotesByTypeSection } from './CoinmarketOffersExchangeQuotesByTypeSection';
 import { KYC_DEX, KYC_NO_KYC } from 'src/constants/wallet/coinmarket/kyc';
-import { useMemo } from 'react';
+import { CoinmarketOffersExchangeQuotesByTypeSection } from 'src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersExchangeQuotesByTypeSection';
+import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 
 export const CoinmarketOffersExchange = () => {
     const {
         allQuotes: quotes,
         exchangeInfo,
         getValues,
-    } = useCoinmarketOffersContext<CoinmarketTradeExchangeType>();
+    } = useCoinmarketFormContext<CoinmarketTradeExchangeType>();
     const exchangeTypeFilter = getValues(EXCHANGE_COMPARATOR_RATE_FILTER);
     const kycFilter = getValues(EXCHANGE_COMPARATOR_KYC_FILTER);
     const showAll = exchangeTypeFilter === EXCHANGE_COMPARATOR_RATE_FILTER_ALL;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersExchangeQuotesByTypeSection.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersExchangeQuotesByTypeSection.tsx
index a7f04bd41f4..6471ae9d772 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersExchangeQuotesByTypeSection.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersExchangeQuotesByTypeSection.tsx
@@ -1,9 +1,11 @@
 import { ExchangeTrade } from 'invity-api';
-import { ExtendedMessageDescriptor, Translation } from 'src/components/suite/Translation';
+
 import { H3, Icon, Row, Tooltip } from '@trezor/components';
-import CoinmarketOffersItem from './CoinmarketOffersItem';
 import { spacings } from '@trezor/theme';
 
+import { ExtendedMessageDescriptor, Translation } from 'src/components/suite/Translation';
+import { CoinmarketOffersItem } from 'src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersItem';
+
 interface CoinmarketOffersExchangeQuotesByTypeSectionProps {
     quotes: ExchangeTrade[];
     heading: ExtendedMessageDescriptor['id'];
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersItem.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersItem.tsx
index abd54c6a1ad..295fde63177 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersItem.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersItem.tsx
@@ -1,25 +1,25 @@
 import styled, { useTheme } from 'styled-components';
+import { SellFiatTrade } from 'invity-api';
+
 import { Badge, Button, Card, Row, Text } from '@trezor/components';
-import { Translation } from 'src/components/suite';
 import { spacings, spacingsPx } from '@trezor/theme';
-import { CoinmarketUtilsProvider } from '../CoinmarketUtils/CoinmarketUtilsProvider';
-import CoinmarketUtilsPrice from '../CoinmarketUtils/CoinmarketUtilsPrice';
 import { SCREEN_QUERY } from '@trezor/components/src/config/variables';
-import {
-    isCoinmarketExchangeOffers,
-    isCoinmarketSellOffers,
-    useCoinmarketOffersContext,
-} from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
+
+import { Translation } from 'src/components/suite';
 import { CoinmarketTradeDetailMapProps } from 'src/types/coinmarket/coinmarket';
 import {
     getCryptoQuoteAmountProps,
     getProvidersInfoProps,
     getSelectQuoteTyped,
+    isCoinmarketExchangeContext,
+    isCoinmarketSellContext,
 } from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
 import { getTagAndInfoNote } from 'src/utils/wallet/coinmarket/coinmarketUtils';
-import { SellFiatTrade } from 'invity-api';
 import { CoinmarketUtilsKyc } from 'src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsKyc';
 import { CoinmarketTestWrapper } from 'src/views/wallet/coinmarket';
+import { CoinmarketUtilsPrice } from 'src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsPrice';
+import { CoinmarketUtilsProvider } from 'src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsProvider';
+import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 
 const Offer = styled.div`
     display: flex;
@@ -92,9 +92,9 @@ export interface CoinmarketOffersItemProps {
     isBestRate: boolean;
 }
 
-const CoinmarketOffersItem = ({ quote }: CoinmarketOffersItemProps) => {
+export const CoinmarketOffersItem = ({ quote }: CoinmarketOffersItemProps) => {
     const theme = useTheme();
-    const context = useCoinmarketOffersContext();
+    const context = useCoinmarketFormContext();
     const { callInProgress } = context;
     const providers = getProvidersInfoProps(context);
     const cryptoAmountProps = getCryptoQuoteAmountProps(quote, context);
@@ -130,7 +130,7 @@ const CoinmarketOffersItem = ({ quote }: CoinmarketOffersItemProps) => {
                     <AmountOfferColumn>
                         <Row alignItems="flex-end">
                             <CoinmarketUtilsPrice {...cryptoAmountProps} />
-                            {isCoinmarketExchangeOffers(context) && (
+                            {isCoinmarketExchangeContext(context) && (
                                 <CoinmarketUtilsKyc
                                     exchange={exchange}
                                     providers={context.exchangeInfo?.providerInfos}
@@ -155,7 +155,7 @@ const CoinmarketOffersItem = ({ quote }: CoinmarketOffersItemProps) => {
                                 >
                                     <Translation
                                         id={
-                                            isCoinmarketSellOffers(context) &&
+                                            isCoinmarketSellContext(context) &&
                                             context.needToRegisterOrVerifyBankAccount(
                                                 quote as SellFiatTrade,
                                             )
@@ -172,5 +172,3 @@ const CoinmarketOffersItem = ({ quote }: CoinmarketOffersItemProps) => {
         </CoinmarketTestWrapper>
     );
 };
-
-export default CoinmarketOffersItem;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketPaymentPlainType.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketPaymentPlainType.tsx
index 69099e57d26..700a4cd1366 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketPaymentPlainType.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketPaymentPlainType.tsx
@@ -1,19 +1,11 @@
-import { ReactNode } from 'react';
-import styled from 'styled-components';
-import { typography } from '@trezor/theme';
-import { BuyCryptoPaymentMethod, SellCryptoPaymentMethod } from 'invity-api';
+import { Text } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { FORM_DEFAULT_PAYMENT_METHOD } from 'src/constants/wallet/coinmarket/form';
-
-const Text = styled.div`
-    display: flex;
-    align-items: center;
-    ${typography.body};
-`;
+import { CoinmarketPaymentMethodType } from 'src/types/coinmarket/coinmarket';
 
 interface CoinmarketPaymentTypeProps {
-    children?: ReactNode;
-    method?: BuyCryptoPaymentMethod | SellCryptoPaymentMethod;
+    method?: CoinmarketPaymentMethodType;
     methodName?: string;
 }
 type TranslatedPaymentMethod = 'bankTransfer' | 'creditCard';
@@ -23,27 +15,18 @@ type PaymentMethodId = `TR_PAYMENT_METHOD_${Uppercase<TranslatedPaymentMethod>}`
 const getPaymentMethod = (method: TranslatedPaymentMethod): PaymentMethodId =>
     `TR_PAYMENT_METHOD_${method.toUpperCase() as Uppercase<TranslatedPaymentMethod>}`;
 
-export const CoinmarketPaymentPlainType = ({
-    children,
-    method,
-    methodName,
-}: CoinmarketPaymentTypeProps) => (
-    <div>
-        <Text data-testid="@coinmarket/form/info/payment-method">
-            {method ? (
-                <>
-                    {method === 'bankTransfer' || method === FORM_DEFAULT_PAYMENT_METHOD ? (
-                        <Translation id={getPaymentMethod(method)} />
-                    ) : (
-                        <Text>{methodName || method}</Text>
-                    )}
-                </>
-            ) : (
-                <Text>
-                    <Translation id="TR_PAYMENT_METHOD_UNKNOWN" />
-                </Text>
-            )}
-        </Text>
-        {children}
-    </div>
+export const CoinmarketPaymentPlainType = ({ method, methodName }: CoinmarketPaymentTypeProps) => (
+    <Text data-testid="@coinmarket/form/info/payment-method" as="div">
+        {method ? (
+            <>
+                {method === 'bankTransfer' || method === FORM_DEFAULT_PAYMENT_METHOD ? (
+                    <Translation id={getPaymentMethod(method)} />
+                ) : (
+                    methodName || method
+                )}
+            </>
+        ) : (
+            <Translation id="TR_PAYMENT_METHOD_UNKNOWN" />
+        )}
+    </Text>
 );
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketPaymentType.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketPaymentType.tsx
index c43d7b0f7c9..39451a06630 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketPaymentType.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketPaymentType.tsx
@@ -1,52 +1,18 @@
-import { ReactNode } from 'react';
-import styled from 'styled-components';
-import { BuyCryptoPaymentMethod, SellCryptoPaymentMethod } from 'invity-api';
-import { CoinmarketPaymentPlainType } from './CoinmarketPaymentPlainType';
-import invityAPI from 'src/services/suite/invityAPI';
-
-const Wrapper = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const Bg = styled.div`
-    background: ${({ theme }) => theme.legacy.BG_ICON};
-    display: flex;
-    align-items: center;
-    border-radius: 4px;
-`;
+import { Row } from '@trezor/components';
+import { spacings } from '@trezor/theme';
 
-const IconWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    padding-right: 9px;
-`;
-
-const Icon = styled.img``;
+import invityAPI from 'src/services/suite/invityAPI';
+import { CoinmarketPaymentPlainType } from 'src/views/wallet/coinmarket/common/CoinmarketPaymentPlainType';
+import { CoinmarketPaymentMethodType } from 'src/types/coinmarket/coinmarket';
 
 interface CoinmarketPaymentTypeProps {
-    children?: ReactNode;
-    method?: BuyCryptoPaymentMethod | SellCryptoPaymentMethod;
+    method?: CoinmarketPaymentMethodType;
     methodName?: string;
 }
 
-export const CoinmarketPaymentType = ({
-    children,
-    method,
-    methodName,
-}: CoinmarketPaymentTypeProps) => (
-    <Wrapper>
-        <>
-            {method && (
-                <IconWrapper>
-                    <Bg>
-                        <Icon width="24px" src={invityAPI.getPaymentMethodUrl(method)} alt="" />
-                    </Bg>
-                </IconWrapper>
-            )}
-            <CoinmarketPaymentPlainType method={method} methodName={methodName}>
-                {children}
-            </CoinmarketPaymentPlainType>
-        </>
-    </Wrapper>
+export const CoinmarketPaymentType = ({ method, methodName }: CoinmarketPaymentTypeProps) => (
+    <Row gap={spacings.xs}>
+        {method && <img width="24px" src={invityAPI.getPaymentMethodUrl(method)} alt="" />}
+        <CoinmarketPaymentPlainType method={method} methodName={methodName} />
+    </Row>
 );
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketProviderInfo.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketProviderInfo.tsx
index e2f050e32b5..c937d0f0392 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketProviderInfo.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketProviderInfo.tsx
@@ -1,39 +1,9 @@
-import styled from 'styled-components';
-import { variables } from '@trezor/components';
-import invityAPI from 'src/services/suite/invityAPI';
-
-const Wrapper = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const Bg = styled.div`
-    background: ${({ theme }) => theme.legacy.BG_ICON};
-    display: flex;
-    align-items: center;
-    border-radius: 4px;
-    padding: 4px;
-`;
+import { Row } from '@trezor/components';
+import { spacings } from '@trezor/theme';
 
-const IconWrapper = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const Icon = styled.img`
-    border-radius: 2px;
-`;
-
-const Text = styled.div`
-    display: flex;
-    padding-left: 9px;
-    align-items: center;
-    font-size: ${variables.FONT_SIZE.NORMAL};
-    color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
+import invityAPI from 'src/services/suite/invityAPI';
 
-interface CoinmarketProviderInfoProps {
+export interface CoinmarketProviderInfoProps {
     exchange?: string;
     providers?: {
         [name: string]: {
@@ -48,25 +18,21 @@ export const CoinmarketProviderInfo = ({ exchange, providers }: CoinmarketProvid
     const provider = providers && exchange ? providers[exchange] : null;
 
     return (
-        <Wrapper data-testid="@coinmarket/form/info/provider">
+        <Row data-testid="@coinmarket/form/info/provider" gap={spacings.xs}>
             {!exchange && 'Unknown provider'}
             {!provider && exchange}
             {provider && (
                 <>
                     {provider.logo && (
-                        <IconWrapper>
-                            <Bg>
-                                <Icon
-                                    width="16px"
-                                    src={invityAPI.getProviderLogoUrl(provider.logo)}
-                                    alt=""
-                                />
-                            </Bg>
-                        </IconWrapper>
+                        <img
+                            width="16px"
+                            src={invityAPI.getProviderLogoUrl(provider.logo)}
+                            alt=""
+                        />
                     )}
-                    <Text>{provider.brandName || provider.companyName}</Text>
+                    {provider.brandName || provider.companyName}
                 </>
             )}
-        </Wrapper>
+        </Row>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketRefreshTime.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketRefreshTime.tsx
index 6b618c582ce..8ba3df3f2c5 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketRefreshTime.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketRefreshTime.tsx
@@ -1,5 +1,7 @@
 import { ReactElement } from 'react';
+
 import styled from 'styled-components';
+
 import { variables, Spinner, ProgressPie } from '@trezor/components';
 import { spacingsPx } from '@trezor/theme';
 
@@ -13,8 +15,7 @@ const Wrapper = styled.div`
     flex: none;
 `;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const ProgressPieWrap = styled(ProgressPie)`
+const ProgressPieWrap = styled.div`
     flex: none;
 `;
 
@@ -59,7 +60,9 @@ export const CoinmarketRefreshTime = ({
                 <Spinner size={15} />
             ) : (
                 <Wrapper>
-                    <ProgressPieWrap valueInPercents={progress} />
+                    <ProgressPieWrap>
+                        <ProgressPie valueInPercents={progress} />
+                    </ProgressPieWrap>
                     <TimerText>
                         <RefreshLabel>{label}</RefreshLabel>
                         <RefreshTime>{`0:${remaining < 10 ? '0' : ''}${remaining}`}</RefreshTime>
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoExchangeType.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoExchangeType.tsx
index d113b280619..97bcdf970cc 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoExchangeType.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoExchangeType.tsx
@@ -1,21 +1,12 @@
-import { Row } from '@trezor/components';
-import { spacingsPx, typography } from '@trezor/theme';
 import { ExchangeTrade } from 'invity-api';
-import { QuestionTooltip, Translation } from 'src/components/suite';
+
+import { Row, Tooltip, Text } from '@trezor/components';
+
+import { Translation } from 'src/components/suite';
 import {
     CoinmarketExchangeProvidersInfoProps,
     CoinmarketTradeDetailType,
 } from 'src/types/coinmarket/coinmarket';
-import styled from 'styled-components';
-
-const QuestionTooltipWrapper = styled.div`
-    padding-left: ${spacingsPx.xxs};
-`;
-
-const Text = styled.div`
-    ${typography.body}
-    color: ${({ theme }) => theme.textSubdued};
-`;
 
 interface CoinmarketInfoExchangeTypeProps {
     selectedQuote: CoinmarketTradeDetailType;
@@ -32,23 +23,17 @@ export const CoinmarketInfoExchangeType = ({
         providers && exchangeQuote.exchange ? providers[exchangeQuote.exchange] : undefined;
 
     return (
-        <Row alignItems="center" justifyContent="center" flex="auto">
-            <Text>
+        <Row justifyContent="center" flex="auto">
+            <Text variant="tertiary">
                 {provider?.isFixedRate && !exchangeQuote.isDex && (
-                    <>
+                    <Tooltip content={<Translation id="TR_EXCHANGE_FIXED_OFFERS_INFO" />} hasIcon>
                         <Translation id="TR_EXCHANGE_FIXED" />
-                        <QuestionTooltipWrapper>
-                            <QuestionTooltip tooltip="TR_EXCHANGE_FIXED_OFFERS_INFO" />
-                        </QuestionTooltipWrapper>
-                    </>
+                    </Tooltip>
                 )}
                 {!provider?.isFixedRate && !exchangeQuote.isDex && (
-                    <>
+                    <Tooltip content={<Translation id="TR_EXCHANGE_FLOAT_OFFERS_INFO" />} hasIcon>
                         <Translation id="TR_EXCHANGE_FLOAT" />
-                        <QuestionTooltipWrapper>
-                            <QuestionTooltip tooltip="TR_EXCHANGE_FLOAT_OFFERS_INFO" />
-                        </QuestionTooltipWrapper>
-                    </>
+                    </Tooltip>
                 )}
                 {exchangeQuote.isDex && <Translation id="TR_EXCHANGE_DEX" />}
             </Text>
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoHeader.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoHeader.tsx
index d52478a3173..6810934473f 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoHeader.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoHeader.tsx
@@ -1,21 +1,12 @@
-import { Row } from '@trezor/components';
-import { spacingsPx, typography } from '@trezor/theme';
 import { CryptoId } from 'invity-api';
+
+import { Row, Text } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
 import { parseCryptoId } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import { CoinmarketCoinLogo } from 'src/views/wallet/coinmarket/common/CoinmarketCoinLogo';
-import styled from 'styled-components';
-
-const Header = styled.div`
-    padding-bottom: ${spacingsPx.xl};
-    border-bottom: 1px solid ${({ theme }) => theme.borderElevation1};
-`;
-
-const AccountText = styled.div`
-    ${typography.titleSmall}
-    padding-left: 7px;
-`;
 
 interface CoinmarketInfoHeaderProps {
     receiveCurrency?: CryptoId;
@@ -28,23 +19,21 @@ export const CoinmarketInfoHeader = ({ receiveCurrency }: CoinmarketInfoHeaderPr
     const network = cryptoIdToPlatformName(networkId);
 
     return (
-        <Header>
-            <Row alignItems="center">
-                <CoinmarketCoinLogo cryptoId={receiveCurrency!} size={24} />
-                <AccountText>
-                    {contractAddress && network ? (
-                        <Translation
-                            id="TR_COINMARKET_TOKEN_NETWORK"
-                            values={{
-                                tokenName: cryptoIdToCoinSymbol(receiveCurrency!),
-                                networkName: network,
-                            }}
-                        />
-                    ) : (
-                        cryptoIdToCoinSymbol(receiveCurrency!)
-                    )}
-                </AccountText>
-            </Row>
-        </Header>
+        <Row gap={spacings.xs}>
+            {receiveCurrency && <CoinmarketCoinLogo cryptoId={receiveCurrency} size={24} />}
+            <Text typographyStyle="titleSmall">
+                {contractAddress && network ? (
+                    <Translation
+                        id="TR_COINMARKET_TOKEN_NETWORK"
+                        values={{
+                            tokenName: cryptoIdToCoinSymbol(receiveCurrency!),
+                            networkName: network,
+                        }}
+                    />
+                ) : (
+                    cryptoIdToCoinSymbol(receiveCurrency!)
+                )}
+            </Text>
+        </Row>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoItem.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoItem.tsx
index a1f0332ce9e..35fea2c4633 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoItem.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoItem.tsx
@@ -1,30 +1,14 @@
-import { Account } from '@suite-common/wallet-types';
-import { Column, Row } from '@trezor/components';
-import { spacingsPx, typography } from '@trezor/theme';
 import { CryptoId } from 'invity-api';
+
+import { Account } from '@suite-common/wallet-types';
+import { Column, Row, InfoRow, Text } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { AccountLabeling, Translation } from 'src/components/suite';
 import { CoinmarketPayGetLabelType, CoinmarketTradeType } from 'src/types/coinmarket/coinmarket';
-import {
-    CoinmarketInfoAmount,
-    CoinmarketInfoLeftColumn,
-    CoinmarketInfoRightColumn,
-    CoinmarketTestWrapper,
-} from 'src/views/wallet/coinmarket';
 import { CoinmarketCoinLogo } from 'src/views/wallet/coinmarket/common/CoinmarketCoinLogo';
 import { CoinmarketCryptoAmount } from 'src/views/wallet/coinmarket/common/CoinmarketCryptoAmount';
 import { CoinmarketFiatAmount } from 'src/views/wallet/coinmarket/common/CoinmarketFiatAmount';
-import styled from 'styled-components';
-
-const AccountLabel = styled.div`
-    ${typography.label}
-    color: ${({ theme }) => theme.textSubdued};
-    width: 100%;
-    padding-top: ${spacingsPx.xxs};
-`;
-
-const AccountTypeLabel = styled.div`
-    padding-left: ${spacingsPx.xxs};
-`;
 
 interface CoinmarketInfoItemProps {
     account?: Account;
@@ -43,37 +27,30 @@ export const CoinmarketInfoItem = ({
     currency,
     amount,
 }: CoinmarketInfoItemProps) => (
-    <Row alignItems="center" justifyContent="space-between">
-        <CoinmarketInfoLeftColumn>
-            <Translation id={label} />
-        </CoinmarketInfoLeftColumn>
-        <CoinmarketInfoRightColumn>
-            {type === 'exchange' || isReceive ? (
-                <Column>
-                    <Row alignItems="center">
-                        <CoinmarketCoinLogo cryptoId={currency!} size={20} />
-                        <CoinmarketInfoAmount>
-                            <CoinmarketCryptoAmount amount={amount} cryptoId={currency!} />
-                        </CoinmarketInfoAmount>
-                    </Row>
-                    {account && (
-                        <AccountLabel>
-                            <Row justifyContent="flex-end">
-                                <AccountLabeling account={account} />
-                                <AccountTypeLabel>
-                                    {account.accountType !== 'normal'
-                                        ? `(${account.accountType})`
-                                        : ''}
-                                </AccountTypeLabel>
-                            </Row>
-                        </AccountLabel>
+    <InfoRow label={<Translation id={label} />} direction="row">
+        {type === 'exchange' || isReceive ? (
+            <Column alignItems="flex-end" gap={spacings.xxxs}>
+                <Row gap={spacings.xs}>
+                    {currency && (
+                        <>
+                            <CoinmarketCoinLogo cryptoId={currency} size={20} />
+                            <CoinmarketCryptoAmount amount={amount} cryptoId={currency} />
+                        </>
                     )}
-                </Column>
-            ) : (
-                <CoinmarketTestWrapper data-testid="@coinmarket/form/info/fiat-amount">
-                    <CoinmarketFiatAmount amount={amount} currency={currency} />
-                </CoinmarketTestWrapper>
-            )}
-        </CoinmarketInfoRightColumn>
-    </Row>
+                </Row>
+                {account && (
+                    <Text variant="tertiary" typographyStyle="label" as="div">
+                        <Row gap={spacings.xxs}>
+                            <AccountLabeling account={account} />
+                            {account.accountType !== 'normal' ? `(${account.accountType})` : ''}
+                        </Row>
+                    </Text>
+                )}
+            </Column>
+        ) : (
+            <Row data-testid="@coinmarket/form/info/fiat-amount">
+                <CoinmarketFiatAmount amount={amount} currency={currency} />
+            </Row>
+        )}
+    </InfoRow>
 );
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoPaymentMethod.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoPaymentMethod.tsx
index 329c323856a..8e02f008489 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoPaymentMethod.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoPaymentMethod.tsx
@@ -1,11 +1,11 @@
-import { Row } from '@trezor/components';
-import { BuyCryptoPaymentMethod, SellCryptoPaymentMethod } from 'invity-api';
+import { InfoRow } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
-import { CoinmarketInfoLeftColumn, CoinmarketInfoRightColumn } from 'src/views/wallet/coinmarket';
+import { CoinmarketPaymentMethodType } from 'src/types/coinmarket/coinmarket';
 import { CoinmarketPaymentType } from 'src/views/wallet/coinmarket/common/CoinmarketPaymentType';
 
 interface CoinmarketInfoPaymentMethodProps {
-    paymentMethod: BuyCryptoPaymentMethod | SellCryptoPaymentMethod;
+    paymentMethod: CoinmarketPaymentMethodType;
     paymentMethodName?: string;
 }
 
@@ -13,12 +13,7 @@ export const CoinmarketInfoPaymentMethod = ({
     paymentMethod,
     paymentMethodName,
 }: CoinmarketInfoPaymentMethodProps) => (
-    <Row>
-        <CoinmarketInfoLeftColumn>
-            <Translation id="TR_COINMARKET_PAYMENT_METHOD" />
-        </CoinmarketInfoLeftColumn>
-        <CoinmarketInfoRightColumn>
-            <CoinmarketPaymentType method={paymentMethod} methodName={paymentMethodName} />
-        </CoinmarketInfoRightColumn>
-    </Row>
+    <InfoRow label={<Translation id="TR_COINMARKET_PAYMENT_METHOD" />} direction="row">
+        <CoinmarketPaymentType method={paymentMethod} methodName={paymentMethodName} />
+    </InfoRow>
 );
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoProvider.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoProvider.tsx
index b24e907754e..09492711456 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoProvider.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoProvider.tsx
@@ -1,7 +1,7 @@
-import { Row } from '@trezor/components';
+import { InfoRow } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { CoinmarketGetProvidersInfoProps } from 'src/types/coinmarket/coinmarket';
-import { CoinmarketInfoLeftColumn, CoinmarketInfoRightColumn } from 'src/views/wallet/coinmarket';
 import { CoinmarketProviderInfo } from 'src/views/wallet/coinmarket/common/CoinmarketProviderInfo';
 
 interface CoinmarketInfoProviderProps {
@@ -10,12 +10,7 @@ interface CoinmarketInfoProviderProps {
 }
 
 export const CoinmarketInfoProvider = ({ exchange, providers }: CoinmarketInfoProviderProps) => (
-    <Row>
-        <CoinmarketInfoLeftColumn>
-            <Translation id="TR_BUY_PROVIDER" />
-        </CoinmarketInfoLeftColumn>
-        <CoinmarketInfoRightColumn>
-            <CoinmarketProviderInfo exchange={exchange} providers={providers} />
-        </CoinmarketInfoRightColumn>
-    </Row>
+    <InfoRow label={<Translation id="TR_BUY_PROVIDER" />} direction="row">
+        <CoinmarketProviderInfo exchange={exchange} providers={providers} />
+    </InfoRow>
 );
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferBuy/CoinmarketOfferBuy.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferBuy/CoinmarketOfferBuy.tsx
index 806b90dc5e5..d10e8151f6f 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferBuy/CoinmarketOfferBuy.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferBuy/CoinmarketOfferBuy.tsx
@@ -1,8 +1,9 @@
+import { Card } from '@trezor/components';
+
 import { CoinmarketSelectedOfferInfo } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferInfo';
 import { CoinmarketVerify } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerify';
 import { CoinmarketOfferBuyProps } from 'src/types/coinmarket/coinmarketForm';
 import useCoinmarketVerifyAccount from 'src/hooks/wallet/coinmarket/form/useCoinmarketVerifyAccount';
-import { CoinmarketSelectedOfferWrapper } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferWrapper';
 
 export const CoinmarketOfferBuy = ({
     account,
@@ -17,16 +18,16 @@ export const CoinmarketOfferBuy = ({
     const coinmarketVerifyAccount = useCoinmarketVerifyAccount({ currency });
 
     return (
-        <CoinmarketSelectedOfferWrapper
-            leftChildren={
-                currency && (
+        <>
+            <Card>
+                {currency && (
                     <CoinmarketVerify
                         coinmarketVerifyAccount={coinmarketVerifyAccount}
                         currency={currency}
                     />
-                )
-            }
-            rightChildren={
+                )}
+            </Card>
+            <Card>
                 <CoinmarketSelectedOfferInfo
                     account={account}
                     selectedAccount={coinmarketVerifyAccount.selectedAccountOption?.account}
@@ -37,7 +38,7 @@ export const CoinmarketOfferBuy = ({
                     paymentMethod={paymentMethod}
                     paymentMethodName={paymentMethodName}
                 />
-            }
-        />
+            </Card>
+        </>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchange.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchange.tsx
index 9b194baac9f..c79ec7ec1e1 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchange.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchange.tsx
@@ -1,3 +1,8 @@
+import { Fragment } from 'react';
+
+import { Divider, Card } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { CoinmarketSelectedOfferInfo } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferInfo';
 import { CoinmarketVerify } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerify';
 import { CoinmarketOfferExchangeProps } from 'src/types/coinmarket/coinmarketForm';
@@ -7,12 +12,10 @@ import {
     CoinmarketSelectedOfferStepper,
     CoinmarketSelectedOfferStepperItemProps,
 } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferStepper';
-import { Fragment } from 'react';
 import { CoinmarketTradeExchangeType } from 'src/types/coinmarket/coinmarket';
 import { CoinmarketOfferExchangeSend } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSend';
 import { CoinmarketOfferExchangeSendSwap } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendSwap';
 import { CoinmarketOfferExchangeSendApproval } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendApproval';
-import { CoinmarketSelectedOfferWrapper } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferWrapper';
 
 export const CoinmarketOfferExchange = ({
     account,
@@ -60,16 +63,15 @@ export const CoinmarketOfferExchange = ({
     ];
 
     return (
-        <CoinmarketSelectedOfferWrapper
-            leftChildren={
-                <>
-                    <CoinmarketSelectedOfferStepper steps={steps} />
-                    {steps.map((step, index) => (
-                        <Fragment key={index}>{step.isActive && step.component}</Fragment>
-                    ))}
-                </>
-            }
-            rightChildren={
+        <>
+            <Card>
+                <CoinmarketSelectedOfferStepper steps={steps} />
+                <Divider margin={{ top: spacings.lg, bottom: spacings.xl }} />
+                {steps.map((step, index) => (
+                    <Fragment key={index}>{step.isActive && step.component}</Fragment>
+                ))}
+            </Card>
+            <Card>
                 <CoinmarketSelectedOfferInfo
                     account={account}
                     selectedAccount={coinmarketVerifyAccount.selectedAccountOption?.account}
@@ -78,7 +80,7 @@ export const CoinmarketOfferExchange = ({
                     type={type}
                     quoteAmounts={quoteAmounts}
                 />
-            }
-        />
+            </Card>
+        </>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSend.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSend.tsx
index 93ff55e594a..5a8309ae367 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSend.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSend.tsx
@@ -1,42 +1,10 @@
-import styled from 'styled-components';
-import { Button, variables } from '@trezor/components';
+import { Button, Column, Divider, InfoRow } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 import { CoinmarketTradeExchangeType } from 'src/types/coinmarket/coinmarket';
 import { AccountLabeling, Translation } from 'src/components/suite';
 
-const Wrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-    margin-top: 10px;
-`;
-
-const LabelText = styled.div`
-    font-size: ${variables.FONT_SIZE.TINY};
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
-
-const Value = styled.div`
-    padding-top: 6px;
-    font-size: ${variables.FONT_SIZE.SMALL};
-    color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-const ButtonWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding-top: 20px;
-    border-top: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-    margin: 20px 0;
-`;
-
-const Row = styled.div`
-    margin: 24px;
-`;
-
-const Address = styled.div``;
-
 export const CoinmarketOfferExchangeSend = () => {
     const { account, callInProgress, selectedQuote, exchangeInfo, sendTransaction } =
         useCoinmarketFormContext<CoinmarketTradeExchangeType>();
@@ -47,25 +15,18 @@ export const CoinmarketOfferExchangeSend = () => {
         exchangeInfo?.providerInfos[exchange]?.companyName || selectedQuote.exchange;
 
     return (
-        <Wrapper>
-            <Row>
-                <LabelText>
-                    <Translation id="TR_EXCHANGE_SEND_FROM" />
-                </LabelText>
-                <Value>
-                    <AccountLabeling account={account} />
-                </Value>
-            </Row>
-            <Row>
-                <LabelText>
-                    <Translation id="TR_EXCHANGE_SEND_TO" values={{ providerName }} />
-                </LabelText>
-                <Value>
-                    <Address>{sendAddress}</Address>
-                </Value>
-            </Row>
-
-            <ButtonWrapper>
+        <Column gap={spacings.lg} alignItems="stretch" flex="1">
+            <InfoRow label={<Translation id="TR_EXCHANGE_SEND_FROM" />} typographyStyle="hint">
+                <AccountLabeling account={account} />
+            </InfoRow>
+            <InfoRow
+                label={<Translation id="TR_EXCHANGE_SEND_TO" values={{ providerName }} />}
+                typographyStyle="hint"
+            >
+                {sendAddress}
+            </InfoRow>
+            <Column margin={{ top: 'auto' }}>
+                <Divider margin={{ top: spacings.xs, bottom: spacings.lg }} />
                 <Button
                     data-testid="@coinmarket/offer/exchange/confirm-on-trezor-and-send"
                     isLoading={callInProgress}
@@ -73,7 +34,7 @@ export const CoinmarketOfferExchangeSend = () => {
                 >
                     <Translation id="TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND" />
                 </Button>
-            </ButtonWrapper>
-        </Wrapper>
+            </Column>
+        </Column>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendApproval.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendApproval.tsx
index 3c31e66e489..d78d4038814 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendApproval.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendApproval.tsx
@@ -1,9 +1,24 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
+import { DexApprovalType } from 'invity-api';
+
+import {
+    Button,
+    Banner,
+    Spinner,
+    Radio,
+    Paragraph,
+    Column,
+    Divider,
+    InfoRow,
+    Text,
+    Card,
+} from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { Translation, AccountLabeling } from 'src/components/suite';
-import { Button, Spinner, Radio, variables, Paragraph } from '@trezor/components';
 import { useCoinmarketNavigation } from 'src/hooks/wallet/useCoinmarketNavigation';
-import { DexApprovalType } from 'invity-api';
 import { CoinmarketTradeExchangeType } from 'src/types/coinmarket/coinmarket';
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
@@ -12,67 +27,10 @@ import { useCoinmarketExchangeWatchSendApproval } from 'src/hooks/wallet/coinmar
 // add APPROVED means no approval request is necessary
 type ExtendedDexApprovalType = DexApprovalType | 'APPROVED';
 
-const Wrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-    margin-top: 10px;
-`;
-
-const LabelText = styled.div`
-    font-size: ${variables.FONT_SIZE.TINY};
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
-
-const Value = styled.div`
-    padding-top: 6px;
-    font-size: ${variables.FONT_SIZE.SMALL};
-    color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-const BreakableValue = styled(Value)`
+const BreakableValue = styled.span`
     word-break: break-all;
 `;
 
-const ButtonWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding-top: 20px;
-    border-top: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-    margin: 20px 0;
-`;
-
-const Row = styled.div`
-    margin: 10px 24px;
-`;
-
-const RadioInner = styled.div`
-    display: flex;
-    flex-direction: column;
-    align-items: flex-center;
-    justify-self: center;
-`;
-
-const Address = styled.div``;
-
-const Title = styled.div`
-    margin-top: 25px;
-    font-weight: ${variables.FONT_WEIGHT.DEMI_BOLD};
-`;
-
-const LoaderWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 60px 20px;
-    flex-direction: column;
-`;
-
-const ErrorWrapper = styled(LoaderWrapper)`
-    color: ${({ theme }) => theme.legacy.TYPE_RED};
-`;
-
 export const CoinmarketOfferExchangeSendApproval = () => {
     const {
         account,
@@ -145,17 +103,12 @@ export const CoinmarketOfferExchangeSendApproval = () => {
     };
 
     return (
-        <Wrapper>
-            <Row>
-                <LabelText>
-                    <Translation id="TR_EXCHANGE_SEND_FROM" />
-                </LabelText>
-                <Value>
-                    <AccountLabeling account={account} />
-                </Value>
-            </Row>
-            <Row>
-                <LabelText>
+        <Column gap={spacings.lg} alignItems="stretch" flex="1">
+            <InfoRow label={<Translation id="TR_EXCHANGE_SEND_FROM" />} typographyStyle="hint">
+                <AccountLabeling account={account} />
+            </InfoRow>
+            <InfoRow
+                label={
                     <Translation
                         id={
                             approvalType === 'APPROVED'
@@ -164,99 +117,98 @@ export const CoinmarketOfferExchangeSendApproval = () => {
                         }
                         values={translationValues}
                     />
-                </LabelText>
-                <Value>
-                    <Address>{dexTx.to}</Address>
-                </Value>
-            </Row>
-
+                }
+                typographyStyle="hint"
+            >
+                {dexTx.to}
+            </InfoRow>
             {selectedQuote.approvalSendTxHash && (
-                <Row>
-                    <LabelText>
-                        <Translation id="TR_EXCHANGE_APPROVAL_TXID" />
-                    </LabelText>
-                    <Value>
-                        <Address>{selectedQuote.approvalSendTxHash}</Address>
-                    </Value>
-                </Row>
+                <InfoRow
+                    label={<Translation id="TR_EXCHANGE_APPROVAL_TXID" />}
+                    typographyStyle="hint"
+                >
+                    {selectedQuote.approvalSendTxHash}
+                </InfoRow>
             )}
             {selectedQuote.status === 'APPROVAL_PENDING' && (
-                <LoaderWrapper>
+                <Column
+                    justifyContent="center"
+                    margin={{ top: spacings.xxxxl, bottom: spacings.md }}
+                >
                     <Spinner />
-                    <Title>
+                    <Paragraph typographyStyle="highlight" margin={{ top: spacings.lg }}>
                         <Translation id="TR_EXCHANGE_APPROVAL_CONFIRMING" />
-                    </Title>
-                </LoaderWrapper>
+                    </Paragraph>
+                </Column>
             )}
             {selectedQuote.status === 'ERROR' && (
-                <ErrorWrapper>
-                    <Title>
-                        <Translation id="TR_EXCHANGE_APPROVAL_FAILED" />
-                    </Title>
-                </ErrorWrapper>
+                <Banner variant="destructive" icon margin={{ top: spacings.xl }}>
+                    <Translation id="TR_EXCHANGE_APPROVAL_FAILED" />
+                </Banner>
             )}
 
             {(selectedQuote.status === 'APPROVAL_REQ' || selectedQuote.status === 'CONFIRM') && (
-                <Row>
-                    <LabelText>
-                        <Translation id="TR_EXCHANGE_APPROVAL_VALUE" />
-                    </LabelText>
-                    {selectedQuote.status === 'APPROVAL_REQ' && (
-                        <>
-                            <Value>
+                <Card
+                    label={
+                        <Text typographyStyle="hint">
+                            <Translation id="TR_EXCHANGE_APPROVAL_VALUE" />
+                        </Text>
+                    }
+                    margin={{ top: spacings.md }}
+                >
+                    <Column gap={spacings.xl} alignItems="flex-start">
+                        {selectedQuote.status === 'APPROVAL_REQ' && (
+                            <>
                                 <Radio
                                     isChecked={approvalType === 'MINIMAL'}
                                     onClick={() => selectApprovalValue('MINIMAL')}
+                                    verticalAlignment="center"
                                 >
-                                    <RadioInner>
-                                        <>
-                                            <Paragraph>
-                                                <Translation
-                                                    id="TR_EXCHANGE_APPROVAL_VALUE_MINIMAL"
-                                                    values={translationValues}
-                                                />
-                                            </Paragraph>
-                                            <LabelText>
-                                                <Translation
-                                                    id="TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO"
-                                                    values={translationValues}
-                                                />
-                                            </LabelText>
-                                        </>
-                                    </RadioInner>
+                                    <Column alignItems="flex-start">
+                                        <Text typographyStyle="highlight">
+                                            <Translation
+                                                id="TR_EXCHANGE_APPROVAL_VALUE_MINIMAL"
+                                                values={translationValues}
+                                            />
+                                        </Text>
+                                        <Paragraph typographyStyle="hint">
+                                            <Translation
+                                                id="TR_EXCHANGE_APPROVAL_VALUE_MINIMAL_INFO"
+                                                values={translationValues}
+                                            />
+                                        </Paragraph>
+                                    </Column>
                                 </Radio>
-                            </Value>
-                            <Value>
                                 <Radio
                                     isChecked={approvalType === 'INFINITE'}
                                     onClick={() => selectApprovalValue('INFINITE')}
+                                    verticalAlignment="center"
                                 >
-                                    <RadioInner>
-                                        <Paragraph>
+                                    <Column alignItems="flex-start">
+                                        <Text typographyStyle="highlight">
                                             <Translation
                                                 id="TR_EXCHANGE_APPROVAL_VALUE_INFINITE"
                                                 values={translationValues}
                                             />
-                                        </Paragraph>
-                                        <LabelText>
+                                        </Text>
+                                        <Paragraph typographyStyle="hint">
                                             <Translation
                                                 id="TR_EXCHANGE_APPROVAL_VALUE_INFINITE_INFO"
                                                 values={translationValues}
                                             />
-                                        </LabelText>
-                                    </RadioInner>
+                                        </Paragraph>
+                                    </Column>
                                 </Radio>
-                            </Value>
-                        </>
-                    )}
-                    {selectedQuote.status !== 'APPROVAL_REQ' && (
-                        <Value>
+                            </>
+                        )}
+                        {selectedQuote.status !== 'APPROVAL_REQ' && (
                             <Radio
                                 isChecked={approvalType === 'APPROVED'}
                                 onClick={() => selectApprovalValue('APPROVED')}
+                                verticalAlignment="center"
                             >
-                                <RadioInner>
-                                    <Paragraph>
+                                <Column alignItems="flex-start">
+                                    <Text typographyStyle="highlight">
                                         {!isToken && (
                                             <Translation
                                                 id="TR_EXCHANGE_APPROVAL_NOT_REQUIRED"
@@ -269,54 +221,52 @@ export const CoinmarketOfferExchangeSendApproval = () => {
                                         {isToken && !selectedQuote.approvalSendTxHash && (
                                             <Translation id="TR_EXCHANGE_APPROVAL_PREAPPROVED" />
                                         )}
-                                    </Paragraph>
-                                    <LabelText>
+                                    </Text>
+                                    <Paragraph typographyStyle="hint">
                                         <Translation id="TR_EXCHANGE_APPROVAL_PROCEED" />
-                                    </LabelText>
-                                </RadioInner>
+                                    </Paragraph>
+                                </Column>
                             </Radio>
-                        </Value>
-                    )}
-                    {isToken && !isFullApproval && (
-                        <Value>
+                        )}
+                        {isToken && !isFullApproval && (
                             <Radio
                                 isChecked={approvalType === 'ZERO'}
                                 onClick={() => selectApprovalValue('ZERO')}
+                                verticalAlignment="center"
                             >
-                                <RadioInner>
-                                    <Paragraph>
+                                <Column alignItems="flex-start">
+                                    <Text typographyStyle="highlight">
                                         <Translation
                                             id="TR_EXCHANGE_APPROVAL_VALUE_ZERO"
                                             values={translationValues}
                                         />
-                                    </Paragraph>
-                                    <LabelText>
+                                    </Text>
+                                    <Paragraph typographyStyle="hint">
                                         <Translation
                                             id="TR_EXCHANGE_APPROVAL_VALUE_ZERO_INFO"
                                             values={translationValues}
                                         />
-                                    </LabelText>
-                                </RadioInner>
+                                    </Paragraph>
+                                </Column>
                             </Radio>
-                        </Value>
-                    )}
-                </Row>
+                        )}
+                    </Column>
+                </Card>
             )}
 
             {dexTx.data && (selectedQuote.status !== 'CONFIRM' || approvalType === 'ZERO') && (
-                <Row>
-                    <LabelText>
-                        <Translation id="TR_EXCHANGE_APPROVAL_DATA" />
-                    </LabelText>
-                    <BreakableValue>
-                        <Paragraph typographyStyle="hint">{dexTx.data}</Paragraph>
-                    </BreakableValue>
-                </Row>
+                <InfoRow
+                    label={<Translation id="TR_EXCHANGE_APPROVAL_DATA" />}
+                    typographyStyle="hint"
+                >
+                    <BreakableValue>{dexTx.data}</BreakableValue>
+                </InfoRow>
             )}
 
-            {(selectedQuote.status === 'APPROVAL_REQ' ||
-                (selectedQuote.status === 'CONFIRM' && approvalType === 'ZERO')) && (
-                <ButtonWrapper>
+            <Column>
+                <Divider margin={{ top: spacings.xxs, bottom: spacings.lg }} />
+                {(selectedQuote.status === 'APPROVAL_REQ' ||
+                    (selectedQuote.status === 'CONFIRM' && approvalType === 'ZERO')) && (
                     <Button
                         isLoading={callInProgress}
                         isDisabled={callInProgress}
@@ -324,11 +274,9 @@ export const CoinmarketOfferExchangeSendApproval = () => {
                     >
                         <Translation id="TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND" />
                     </Button>
-                </ButtonWrapper>
-            )}
+                )}
 
-            {selectedQuote.status === 'CONFIRM' && approvalType !== 'ZERO' && (
-                <ButtonWrapper>
+                {selectedQuote.status === 'CONFIRM' && approvalType !== 'ZERO' && (
                     <Button
                         isLoading={callInProgress}
                         isDisabled={callInProgress}
@@ -336,16 +284,14 @@ export const CoinmarketOfferExchangeSendApproval = () => {
                     >
                         <Translation id="TR_EXCHANGE_APPROVAL_TO_SWAP_BUTTON" />
                     </Button>
-                </ButtonWrapper>
-            )}
+                )}
 
-            {selectedQuote.status === 'ERROR' && (
-                <ButtonWrapper>
+                {selectedQuote.status === 'ERROR' && (
                     <Button onClick={navigateToExchangeForm}>
                         <Translation id="TR_EXCHANGE_DETAIL_ERROR_BUTTON" />
                     </Button>
-                </ButtonWrapper>
-            )}
-        </Wrapper>
+                )}
+            </Column>
+        </Column>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendSwap.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendSwap.tsx
index 02d89a3b11f..f5b6445a01d 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendSwap.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchangeSendSwap.tsx
@@ -1,117 +1,37 @@
-import { useState, ChangeEvent, MouseEventHandler } from 'react';
-import styled, { useTheme } from 'styled-components';
-import { Translation, AccountLabeling, FormattedCryptoAmount } from 'src/components/suite';
-import { Button, Icon, Input, Paragraph, SelectBar, Tooltip, variables } from '@trezor/components';
+import { useState, ChangeEvent } from 'react';
+import { FieldError } from 'react-hook-form';
+
 import useDebounce from 'react-use/lib/useDebounce';
+import styled from 'styled-components';
+
+import {
+    Button,
+    Input,
+    InfoRow,
+    Column,
+    Card,
+    Row,
+    Divider,
+    SelectBar,
+    Tooltip,
+    ElevationContext,
+} from '@trezor/components';
 import { BigNumber } from '@trezor/utils/src/bigNumber';
-import { FieldError } from 'react-hook-form';
 import { BottomText } from '@trezor/components/src/components/form/BottomText';
 import { TranslationKey } from '@suite-common/intl-types';
-import { spacingsPx } from '@trezor/theme';
+import { spacings } from '@trezor/theme';
+
+import { Translation, AccountLabeling, FormattedCryptoAmount } from 'src/components/suite';
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 import { CoinmarketTradeExchangeType } from 'src/types/coinmarket/coinmarket';
-import { getInputStateTextColor } from '@trezor/components';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
+import { getCoinmarketNetworkDecimals } from 'src/utils/wallet/coinmarket/coinmarketUtils';
+import { FORM_SEND_CRYPTO_CURRENCY_SELECT } from 'src/constants/wallet/coinmarket/form';
 
-const Wrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-    margin-top: ${spacingsPx.xs};
-`;
-
-const LabelText = styled.div`
-    font-size: ${variables.FONT_SIZE.TINY};
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
-
-const Value = styled.div`
-    padding-top: 6px;
-    font-size: ${variables.FONT_SIZE.SMALL};
-    color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-const PaddedValue = styled(Value)`
-    padding-right: 15px;
-`;
-
-const BreakableValue = styled(Value)`
+const BreakableValue = styled.span`
     word-break: break-all;
 `;
 
-const ButtonWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding-top: 20px;
-    border-top: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-    margin: 20px 0;
-`;
-
-const Row = styled.div`
-    margin: 10px 24px;
-`;
-
-const Address = styled.div``;
-
-const Columns = styled.div`
-    display: flex;
-    flex-direction: row;
-`;
-
-const PaddedColumns = styled(Columns)`
-    padding-top: 6px;
-`;
-
-const LeftColumn = styled.div`
-    display: flex;
-    flex: 1;
-`;
-
-const RightColumn = styled.div`
-    display: flex;
-    justify-content: flex-end;
-    flex: 2;
-`;
-
-const Slippage = styled.div`
-    color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-const SlippageAmount = styled(Slippage)`
-    padding-right: 15px;
-`;
-
-const SlippageSettingsRow = styled.div`
-    margin: 0 24px;
-    min-height: 65px;
-`;
-
-const SlippageSettingsButton = styled.button`
-    background: none;
-    border: 0;
-    margin: 0 3px 0 15px;
-    cursor: pointer;
-    display: inline-block;
-    width: 25px;
-    height: auto;
-    position: relative;
-    line-height: 1;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledInput = styled(Input)`
-    align-self: center;
-    margin-left: ${spacingsPx.xs};
-
-    input {
-        display: flex;
-        flex: 1;
-        max-width: 70px;
-    }
-`;
-
 const SLIPPAGE_MIN = '0.01';
 const SLIPPAGE_MAX = '50';
 const CUSTOM_SLIPPAGE = 'CUSTOM';
@@ -139,11 +59,7 @@ const slippageOptions = [
     },
 ];
 
-export function formatCryptoAmountAsAmount(
-    amount: number,
-    baseAmount: number,
-    decimals = 8,
-): string {
+const formatCryptoAmountAsAmount = (amount: number, baseAmount: number, decimals = 8): string => {
     let digits = 4;
     if (baseAmount < 1) {
         digits = 6;
@@ -153,19 +69,28 @@ export function formatCryptoAmountAsAmount(
     }
 
     return amount.toFixed(digits);
-}
+};
 
 export const CoinmarketOfferExchangeSendSwap = () => {
-    const theme = useTheme();
-    const { account, callInProgress, selectedQuote, exchangeInfo, confirmTrade, sendTransaction } =
-        useCoinmarketFormContext<CoinmarketTradeExchangeType>();
+    const {
+        account,
+        callInProgress,
+        selectedQuote,
+        exchangeInfo,
+        confirmTrade,
+        sendTransaction,
+        getValues,
+    } = useCoinmarketFormContext<CoinmarketTradeExchangeType>();
     const { cryptoIdToCoinSymbol } = useCoinmarketInfo();
-    const [slippageSettings, setSlippageSettings] = useState(false);
     const [slippage, setSlippage] = useState(selectedQuote?.swapSlippage ?? '1');
     const [customSlippage, setCustomSlippage] = useState(slippage);
     const [customSlippageError, setCustomSlippageError] = useState<
         (FieldError & { message: TranslationKey }) | undefined
     >();
+    const sendCryptoSelect = getValues(FORM_SEND_CRYPTO_CURRENCY_SELECT);
+    const decimals = getCoinmarketNetworkDecimals({
+        sendCryptoSelect,
+    });
 
     // only used for custom slippage
     useDebounce(
@@ -203,11 +128,6 @@ export const CoinmarketOfferExchangeSendSwap = () => {
         provider: providerName,
     };
 
-    const toggleSlippage: MouseEventHandler<HTMLButtonElement> = e => {
-        e.preventDefault();
-        setSlippageSettings(!slippageSettings);
-    };
-
     const selectedSlippage =
         slippageOptions.find(o => o.value === slippage)?.value || CUSTOM_SLIPPAGE;
 
@@ -254,143 +174,111 @@ export const CoinmarketOfferExchangeSendSwap = () => {
     };
 
     return (
-        <Wrapper>
-            <Row>
-                <LabelText>
-                    <Translation id="TR_EXCHANGE_SEND_FROM" />
-                </LabelText>
-                <Value>
-                    <AccountLabeling account={account} />
-                </Value>
-            </Row>
-            <Row>
-                <LabelText>
-                    <Translation id="TR_EXCHANGE_SWAP_SEND_TO" values={translationValues} />
-                </LabelText>
-                <Value>
-                    <Address>{dexTx.to}</Address>
-                </Value>
-            </Row>
-            <Row>
-                <LabelText>
-                    <Translation id="TR_EXCHANGE_SWAP_SLIPPAGE" />
-                </LabelText>
-                <PaddedColumns>
-                    <LeftColumn>
-                        <Slippage>
-                            <Tooltip
-                                content={<Translation id="TR_EXCHANGE_SWAP_SLIPPAGE_INFO" />}
-                                dashed
-                            >
-                                <Translation id="TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE" />
-                            </Tooltip>
-                        </Slippage>
-                    </LeftColumn>
-                    <RightColumn>
-                        <SlippageAmount>{selectedQuote.swapSlippage}%</SlippageAmount>
-                        <SlippageSettingsButton type="button" onClick={toggleSlippage}>
-                            <Icon
-                                name={slippageSettings ? 'chevronUp' : 'chevronDown'}
-                                color={theme.legacy.TYPE_DARK_GREY}
-                                size={14}
-                            />
-                        </SlippageSettingsButton>
-                    </RightColumn>
-                </PaddedColumns>
-            </Row>
-            {slippageSettings && (
-                <SlippageSettingsRow>
-                    <PaddedColumns>
-                        <LeftColumn>
-                            <SelectBar
-                                selectedOption={selectedSlippage}
-                                options={slippageOptions}
-                                onChange={changeSlippage}
-                            />
-                        </LeftColumn>
-                        {slippage === CUSTOM_SLIPPAGE && (
-                            <RightColumn>
-                                <StyledInput
-                                    value={customSlippage}
-                                    size="small"
-                                    inputState={customSlippageError && 'error'}
-                                    name="CustomSlippage"
-                                    data-testid="CustomSlippage"
-                                    onChange={changeCustomSlippage}
-                                />
-                            </RightColumn>
-                        )}
-                    </PaddedColumns>
-                    {customSlippageError?.message ? (
-                        <BottomText
-                            inputState={customSlippageError && 'error'}
-                            iconComponent={
-                                <Icon
-                                    name="warningCircle"
-                                    size="medium"
-                                    color={getInputStateTextColor('error', theme)}
-                                />
+        <Column gap={spacings.lg} alignItems="stretch" flex="1">
+            <InfoRow label={<Translation id="TR_EXCHANGE_SEND_FROM" />} typographyStyle="hint">
+                <AccountLabeling account={account} />
+            </InfoRow>
+            <InfoRow
+                label={<Translation id="TR_EXCHANGE_SWAP_SEND_TO" values={translationValues} />}
+                typographyStyle="hint"
+            >
+                {dexTx.to}
+            </InfoRow>
+
+            <Card
+                fillType="default"
+                margin={{ vertical: spacings.md }}
+                label={<Translation id="TR_EXCHANGE_SWAP_SLIPPAGE" />}
+            >
+                <ElevationContext baseElevation={0}>
+                    <Column gap={spacings.lg} alignItems="stretch">
+                        <InfoRow
+                            label={
+                                <Tooltip
+                                    content={<Translation id="TR_EXCHANGE_SWAP_SLIPPAGE_INFO" />}
+                                    hasIcon
+                                >
+                                    <Translation id="TR_EXCHANGE_SWAP_SLIPPAGE_TOLERANCE" />
+                                </Tooltip>
                             }
+                            typographyStyle="hint"
+                            margin={{ bottom: spacings.xxs }}
+                        >
+                            <Row gap={spacings.sm} margin={{ top: spacings.xxs }}>
+                                <SelectBar
+                                    selectedOption={selectedSlippage}
+                                    options={slippageOptions}
+                                    onChange={changeSlippage}
+                                    isFullWidth
+                                />
+                                {slippage === CUSTOM_SLIPPAGE && (
+                                    <Input
+                                        value={customSlippage}
+                                        size="small"
+                                        inputState={customSlippageError && 'error'}
+                                        name="CustomSlippage"
+                                        data-testid="CustomSlippage"
+                                        onChange={changeCustomSlippage}
+                                        width={100}
+                                        align="center"
+                                        // eslint-disable-next-line jsx-a11y/no-autofocus
+                                        autoFocus
+                                    />
+                                )}
+                            </Row>
+                            {customSlippageError?.message ? (
+                                <BottomText
+                                    inputState={customSlippageError && 'error'}
+                                    iconName="warningCircle"
+                                >
+                                    <Translation id={customSlippageError?.message} />
+                                </BottomText>
+                            ) : null}
+                        </InfoRow>
+
+                        <InfoRow
+                            label={<Translation id="TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED" />}
+                            typographyStyle="hint"
                         >
-                            <Translation id={customSlippageError?.message} />
-                        </BottomText>
-                    ) : null}
-                </SlippageSettingsRow>
-            )}
-            <Row>
-                <LabelText>
-                    <Translation id="TR_EXCHANGE_SWAP_SLIPPAGE_SUMMARY" />
-                </LabelText>
-                <PaddedValue>
-                    <Columns>
-                        <Translation id="TR_EXCHANGE_SWAP_SLIPPAGE_OFFERED" />
-                        <RightColumn>
                             <FormattedCryptoAmount
                                 value={receiveStringAmount}
                                 symbol={cryptoIdToCoinSymbol(receive)}
                             />
-                        </RightColumn>
-                    </Columns>
-                </PaddedValue>
-                <PaddedValue>
-                    <Columns>
-                        <Translation id="TR_EXCHANGE_SWAP_SLIPPAGE_AMOUNT" />
-                        <RightColumn>
-                            -
-                            {formatCryptoAmountAsAmount(
+                        </InfoRow>
+
+                        <InfoRow
+                            label={<Translation id="TR_EXCHANGE_SWAP_SLIPPAGE_AMOUNT" />}
+                            typographyStyle="hint"
+                        >
+                            {`-${formatCryptoAmountAsAmount(
                                 (Number(selectedQuote.swapSlippage) / 100) *
                                     Number(receiveStringAmount),
                                 Number(receiveStringAmount),
-                            )}{' '}
-                            {cryptoIdToCoinSymbol(receive)}
-                        </RightColumn>
-                    </Columns>
-                </PaddedValue>
-                <PaddedValue>
-                    <Columns>
-                        <LeftColumn>
-                            <Translation id="TR_EXCHANGE_SWAP_SLIPPAGE_MINIMUM" />
-                        </LeftColumn>
-                        <RightColumn>
-                            {formatCryptoAmountAsAmount(
+                                decimals,
+                            )} ${cryptoIdToCoinSymbol(receive)}`}
+                        </InfoRow>
+
+                        <InfoRow
+                            label={<Translation id="TR_EXCHANGE_SWAP_SLIPPAGE_MINIMUM" />}
+                            typographyStyle="hint"
+                        >
+                            {`${formatCryptoAmountAsAmount(
                                 ((100 - Number(selectedQuote.swapSlippage)) / 100) *
                                     Number(receiveStringAmount),
                                 Number(receiveStringAmount),
-                            )}{' '}
-                            {cryptoIdToCoinSymbol(receive)}
-                        </RightColumn>
-                    </Columns>
-                </PaddedValue>
-            </Row>
-            <Row>
-                <LabelText>
-                    <Translation id="TR_EXCHANGE_SWAP_DATA" />
-                </LabelText>
-                <BreakableValue>
-                    <Paragraph typographyStyle="hint">{dexTx.data}</Paragraph>
-                </BreakableValue>
-            </Row>
-            <ButtonWrapper>
+                                decimals,
+                            )} ${cryptoIdToCoinSymbol(receive)}`}
+                        </InfoRow>
+                    </Column>
+                </ElevationContext>
+            </Card>
+
+            <InfoRow label={<Translation id="TR_EXCHANGE_SWAP_DATA" />} typographyStyle="hint">
+                <BreakableValue>{dexTx.data}</BreakableValue>
+            </InfoRow>
+
+            <Column>
+                <Divider margin={{ top: spacings.xs, bottom: spacings.lg }} />
                 <Button
                     isLoading={callInProgress}
                     isDisabled={callInProgress}
@@ -398,7 +286,7 @@ export const CoinmarketOfferExchangeSendSwap = () => {
                 >
                     <Translation id="TR_EXCHANGE_CONFIRM_ON_TREZOR_SEND" />
                 </Button>
-            </ButtonWrapper>
-        </Wrapper>
+            </Column>
+        </Column>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferSell/CoinmarketOfferSell.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferSell/CoinmarketOfferSell.tsx
index 51072468b37..91f96980e97 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferSell/CoinmarketOfferSell.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferSell/CoinmarketOfferSell.tsx
@@ -1,4 +1,8 @@
 import { Fragment } from 'react';
+
+import { Divider, Card } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 import { CoinmarketTradeSellType } from 'src/types/coinmarket/coinmarket';
 import { CoinmarketOfferCommonProps } from 'src/types/coinmarket/coinmarketForm';
@@ -9,7 +13,6 @@ import {
     CoinmarketSelectedOfferStepper,
     CoinmarketSelectedOfferStepperItemProps,
 } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferStepper';
-import { CoinmarketSelectedOfferWrapper } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferWrapper';
 
 export const CoinmarketOfferSell = (props: CoinmarketOfferCommonProps) => {
     const { sellStep } = useCoinmarketFormContext<CoinmarketTradeSellType>();
@@ -32,16 +35,17 @@ export const CoinmarketOfferSell = (props: CoinmarketOfferCommonProps) => {
     ];
 
     return (
-        <CoinmarketSelectedOfferWrapper
-            leftChildren={
-                <>
-                    <CoinmarketSelectedOfferStepper steps={steps} />
-                    {steps.map((step, index) => (
-                        <Fragment key={index}>{step.isActive && step.component}</Fragment>
-                    ))}
-                </>
-            }
-            rightChildren={<CoinmarketSelectedOfferInfo {...props} />}
-        />
+        <>
+            <Card>
+                <CoinmarketSelectedOfferStepper steps={steps} />
+                <Divider margin={{ top: spacings.lg, bottom: spacings.xl }} />
+                {steps.map((step, index) => (
+                    <Fragment key={index}>{step.isActive && step.component}</Fragment>
+                ))}
+            </Card>
+            <Card>
+                <CoinmarketSelectedOfferInfo {...props} />
+            </Card>
+        </>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferSell/CoinmarketOfferSellBankAccount.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferSell/CoinmarketOfferSellBankAccount.tsx
index 2948b61a1a3..be9a3146da0 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferSell/CoinmarketOfferSellBankAccount.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferSell/CoinmarketOfferSellBankAccount.tsx
@@ -1,12 +1,15 @@
 import { useState } from 'react';
+
 import styled, { useTheme } from 'styled-components';
-import { QuestionTooltip, Translation } from 'src/components/suite';
-import { Button, Select, Icon } from '@trezor/components';
 import { BankAccount } from 'invity-api';
+
+import { Button, Select, Icon, Row } from '@trezor/components';
+import { fontWeights, spacingsPx, typography } from '@trezor/theme';
+
+import { QuestionTooltip, Translation } from 'src/components/suite';
 import { formatIban } from 'src/utils/wallet/coinmarket/sellUtils';
 import { CoinmarketTradeSellType } from 'src/types/coinmarket/coinmarket';
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-import { fontWeights, spacingsPx, typography } from '@trezor/theme';
 
 const Wrapper = styled.div`
     display: flex;
@@ -91,7 +94,7 @@ const ButtonWrapper = styled.div`
     margin: ${spacingsPx.lg} 0;
 `;
 
-const Row = styled.div`
+const RowWrapper = styled.div`
     margin: ${spacingsPx.xxs} 0;
     display: flex;
 
@@ -107,23 +110,8 @@ const Left = styled.div`
     flex-wrap: wrap;
 `;
 
-const Right = styled.div`
-    display: flex;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const RegisterAnother = styled(Button)`
-    align-self: center;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledButton = styled(Button)`
-    display: flex;
-    min-width: 200px;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledIcon = styled(Icon)`
+const IconWrapper = styled.div`
+    flex: none;
     margin-right: ${spacingsPx.xxxs};
 `;
 
@@ -142,7 +130,7 @@ export const CoinmarketOfferSellBankAccount = () => {
     return (
         <Wrapper>
             <CardContent>
-                <Row>
+                <RowWrapper>
                     <Left>
                         <CustomLabel>
                             <LabelText>
@@ -151,18 +139,18 @@ export const CoinmarketOfferSellBankAccount = () => {
                             <StyledQuestionTooltip tooltip="TR_SELL_BANK_ACCOUNT_TOOLTIP" />
                         </CustomLabel>
                     </Left>
-                    <Right>
-                        <RegisterAnother
+                    <Row alignItems="center">
+                        <Button
                             variant="tertiary"
                             icon="plus"
                             data-testid="add-output"
                             onClick={addBankAccount}
                         >
                             <Translation id="TR_SELL_ADD_BANK_ACCOUNT" />
-                        </RegisterAnother>
-                    </Right>
-                </Row>
-                <Row>
+                        </Button>
+                    </Row>
+                </RowWrapper>
+                <RowWrapper>
                     <SelectWrapper>
                         <Select
                             onChange={(selected: BankAccount) => {
@@ -182,11 +170,13 @@ export const CoinmarketOfferSellBankAccount = () => {
                                     </AccountInfo>
                                     {option.verified ? (
                                         <AccountVerified>
-                                            <StyledIcon
-                                                color={theme.legacy.TYPE_GREEN}
-                                                size={15}
-                                                name="check"
-                                            />
+                                            <IconWrapper>
+                                                <Icon
+                                                    color={theme.legacy.TYPE_GREEN}
+                                                    size={15}
+                                                    name="check"
+                                                />
+                                            </IconWrapper>
                                             <Translation id="TR_SELL_BANK_ACCOUNT_VERIFIED" />
                                         </AccountVerified>
                                     ) : (
@@ -199,10 +189,11 @@ export const CoinmarketOfferSellBankAccount = () => {
                             isDisabled={bankAccounts.length < 2}
                         />
                     </SelectWrapper>
-                </Row>
+                </RowWrapper>
             </CardContent>
             <ButtonWrapper>
-                <StyledButton
+                <Button
+                    minWidth={200}
                     isLoading={callInProgress}
                     onClick={() => {
                         if (bankAccount) confirmTrade(bankAccount);
@@ -210,7 +201,7 @@ export const CoinmarketOfferSellBankAccount = () => {
                     isDisabled={callInProgress || !bankAccount}
                 >
                     <Translation id="TR_SELL_GO_TO_TRANSACTION" />
-                </StyledButton>
+                </Button>
             </ButtonWrapper>
         </Wrapper>
     );
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferSell/CoinmarketOfferSellTransaction.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferSell/CoinmarketOfferSellTransaction.tsx
index 767001727bc..7084e187702 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferSell/CoinmarketOfferSellTransaction.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferSell/CoinmarketOfferSellTransaction.tsx
@@ -1,10 +1,12 @@
 import styled from 'styled-components';
-import { Translation, AccountLabeling } from 'src/components/suite';
+
 import { Button, Spinner } from '@trezor/components';
+import { fontWeights, spacingsPx, typography } from '@trezor/theme';
+
+import { Translation, AccountLabeling } from 'src/components/suite';
 import { useCoinmarketWatchTrade } from 'src/hooks/wallet/coinmarket/useCoinmarketWatchTrade';
 import { CoinmarketTradeSellType } from 'src/types/coinmarket/coinmarket';
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-import { fontWeights, spacingsPx, typography } from '@trezor/theme';
 
 const Wrapper = styled.div`
     display: flex;
@@ -45,12 +47,6 @@ const Row = styled.div`
 
 const Address = styled.div``;
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledButton = styled(Button)`
-    display: flex;
-    min-width: 200px;
-`;
-
 const Title = styled.div`
     margin-top: ${spacingsPx.xl};
     font-weight: ${fontWeights.semiBold};
@@ -118,9 +114,9 @@ export const CoinmarketSelectedOfferSellTransaction = () => {
                     )}
 
                     <ButtonWrapper>
-                        <StyledButton isLoading={callInProgress} onClick={sendTransaction}>
+                        <Button minWidth={200} isLoading={callInProgress} onClick={sendTransaction}>
                             <Translation id="TR_SELL_CONFIRM_ON_TREZOR_SEND" />
-                        </StyledButton>
+                        </Button>
                     </ButtonWrapper>
                 </>
             ) : (
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOffer.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOffer.tsx
index 3b64d269634..3cbba82b846 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOffer.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOffer.tsx
@@ -1,19 +1,18 @@
 import styled from 'styled-components';
+
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 import {
     getCryptoQuoteAmountProps,
     getPaymentMethod,
     getProvidersInfoProps,
+    isCoinmarketBuyContext,
+    isCoinmarketExchangeContext,
+    isCoinmarketSellContext,
 } from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
-import {
-    isCoinmarketBuyOffers,
-    isCoinmarketExchangeOffers,
-    isCoinmarketSellOffers,
-} from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
-import { CoinmarketWrapper } from 'src/views/wallet/coinmarket';
 import { CoinmarketOfferSell } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferSell/CoinmarketOfferSell';
 import { CoinmarketOfferBuy } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferBuy/CoinmarketOfferBuy';
 import { CoinmarketOfferExchange } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketOfferExchange/CoinmarketOfferExchange';
+import { CoinmarketWrapper } from 'src/views/wallet/coinmarket/common/CoinmarketWrapper';
 
 const Wrapper = styled.div`
     ${CoinmarketWrapper}
@@ -31,7 +30,7 @@ export const CoinmarketSelectedOffer = () => {
 
     return (
         <Wrapper>
-            {isCoinmarketBuyOffers(context) && (
+            {isCoinmarketBuyContext(context) && (
                 <CoinmarketOfferBuy
                     account={account}
                     selectedQuote={context.selectedQuote}
@@ -41,7 +40,7 @@ export const CoinmarketSelectedOffer = () => {
                     {...paymentMethod}
                 />
             )}
-            {isCoinmarketSellOffers(context) && (
+            {isCoinmarketSellContext(context) && (
                 <CoinmarketOfferSell
                     account={account}
                     selectedQuote={context.selectedQuote}
@@ -51,7 +50,7 @@ export const CoinmarketSelectedOffer = () => {
                     {...paymentMethod}
                 />
             )}
-            {isCoinmarketExchangeOffers(context) && (
+            {isCoinmarketExchangeContext(context) && (
                 <CoinmarketOfferExchange
                     account={account}
                     selectedQuote={context.selectedQuote}
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferInfo.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferInfo.tsx
index bf66612d72f..58188288a7f 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferInfo.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferInfo.tsx
@@ -1,17 +1,18 @@
 import { CryptoId } from 'invity-api';
-import { Column } from '@trezor/components';
-import { CoinmarketTransactionId } from 'src/views/wallet/coinmarket/common';
+
+import { Column, Divider } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { coinmarketGetAmountLabels } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import { CoinmarketInfoHeader } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoHeader';
 import { CoinmarketInfoItem } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoItem';
 import { CoinmarketInfoProvider } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoProvider';
 import { CoinmarketInfoPaymentMethod } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoPaymentMethod';
-import { spacings } from '@trezor/theme';
-import { CoinmarketBorder, CoinmarketTestWrapper } from 'src/views/wallet/coinmarket';
 import { CoinmarketInfoExchangeType } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketInfo/CoinmarketInfoExchangeType';
 import { CoinmarketSelectedOfferInfoProps } from 'src/types/coinmarket/coinmarketForm';
 import { CoinmarketUtilsKyc } from 'src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsKyc';
 import { CoinmarketExchangeProvidersInfoProps } from 'src/types/coinmarket/coinmarket';
+import { CoinmarketTransactionId } from 'src/views/wallet/coinmarket/common/CoinmarketTransactionId';
 
 export const CoinmarketSelectedOfferInfo = ({
     account,
@@ -29,53 +30,52 @@ export const CoinmarketSelectedOfferInfo = ({
     const amountLabels = coinmarketGetAmountLabels({ type, amountInCrypto: true });
 
     return (
-        <CoinmarketTestWrapper data-testid="@coinmarket/form/info">
-            <Column gap={spacings.xl} alignItems="stretch">
-                {type !== 'exchange' && (
+        <Column gap={spacings.xl} alignItems="stretch" data-testid="@coinmarket/form/info">
+            {type !== 'exchange' && (
+                <>
                     <CoinmarketInfoHeader receiveCurrency={quoteAmounts?.receiveCurrency} />
-                )}
-                <CoinmarketInfoItem
-                    account={account}
-                    type={type}
-                    label={amountLabels.sendLabel}
-                    currency={quoteAmounts?.sendCurrency as CryptoId}
-                    amount={quoteAmounts?.sendAmount}
+                    <Divider margin={{}} />
+                </>
+            )}
+            <CoinmarketInfoItem
+                account={account}
+                type={type}
+                label={amountLabels.sendLabel}
+                currency={quoteAmounts?.sendCurrency as CryptoId}
+                amount={quoteAmounts?.sendAmount}
+            />
+            <CoinmarketInfoItem
+                account={selectedAccount}
+                type={type}
+                label={amountLabels.receiveLabel}
+                currency={quoteAmounts?.receiveCurrency}
+                amount={quoteAmounts?.receiveAmount}
+                isReceive
+            />
+            <Divider margin={{}} />
+            {type === 'exchange' && (
+                <>
+                    <CoinmarketInfoExchangeType
+                        selectedQuote={selectedQuote}
+                        providers={providers as CoinmarketExchangeProvidersInfoProps}
+                    />
+                    <Divider margin={{}} />
+                </>
+            )}
+            <CoinmarketInfoProvider providers={providers} exchange={exchange} />
+            {paymentMethod && (
+                <CoinmarketInfoPaymentMethod
+                    paymentMethod={paymentMethod}
+                    paymentMethodName={paymentMethodName}
                 />
-                <CoinmarketInfoItem
-                    account={selectedAccount}
-                    type={type}
-                    label={amountLabels.receiveLabel}
-                    currency={quoteAmounts?.receiveCurrency}
-                    amount={quoteAmounts?.receiveAmount}
-                    isReceive
+            )}
+            {type === 'exchange' && (
+                <CoinmarketUtilsKyc
+                    exchange={exchange}
+                    providers={providers as CoinmarketExchangeProvidersInfoProps}
                 />
-                <CoinmarketBorder />
-                {type === 'exchange' && (
-                    <>
-                        <CoinmarketInfoExchangeType
-                            selectedQuote={selectedQuote}
-                            providers={providers as CoinmarketExchangeProvidersInfoProps}
-                        />
-                        <CoinmarketBorder />
-                    </>
-                )}
-                <CoinmarketInfoProvider providers={providers} exchange={exchange} />
-                {paymentMethod && (
-                    <CoinmarketInfoPaymentMethod
-                        paymentMethod={paymentMethod}
-                        paymentMethodName={paymentMethodName}
-                    />
-                )}
-                {type === 'exchange' && (
-                    <>
-                        <CoinmarketUtilsKyc
-                            exchange={exchange}
-                            providers={providers as CoinmarketExchangeProvidersInfoProps}
-                        />
-                    </>
-                )}
-                {transactionId && <CoinmarketTransactionId transactionId={transactionId} />}
-            </Column>
-        </CoinmarketTestWrapper>
+            )}
+            {transactionId && <CoinmarketTransactionId transactionId={transactionId} />}
+        </Column>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferStepper.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferStepper.tsx
index e6720e42bbc..d4095839019 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferStepper.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferStepper.tsx
@@ -1,41 +1,10 @@
-import { Icon } from '@trezor/components';
-import { spacingsPx, typography } from '@trezor/theme';
 import { Fragment } from 'react';
-import { Translation } from 'src/components/suite';
-import { ExtendedMessageDescriptor } from 'src/types/suite';
-import styled, { useTheme } from 'styled-components';
-
-const Header = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: ${spacingsPx.lg} ${spacingsPx.xl};
-    border-bottom: 1px solid ${({ theme }) => theme.borderElevation1};
-`;
-
-const Step = styled.div<{
-    $active: boolean;
-}>`
-    display: flex;
-    flex: 1;
-    justify-content: center;
-    ${typography.body}
-    color: ${({ $active, theme }) => ($active ? theme.textPrimaryDefault : theme.textSubdued)};
-`;
 
-const StepWrap = styled.div`
-    display: flex;
-    flex: 1;
-`;
+import { Icon, Row, Text } from '@trezor/components';
+import { spacings } from '@trezor/theme';
 
-const Arrow = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 20px;
-    height: 20px;
-    margin: 0 ${spacingsPx.xl};
-`;
+import { Translation } from 'src/components/suite';
+import { ExtendedMessageDescriptor } from 'src/types/suite';
 
 export interface CoinmarketSelectedOfferStepperItemProps {
     step: string;
@@ -49,24 +18,20 @@ interface CoinmarketSelectedOfferStepperProps {
 }
 
 export const CoinmarketSelectedOfferStepper = ({ steps }: CoinmarketSelectedOfferStepperProps) => {
-    const theme = useTheme();
-
     return (
-        <Header>
+        <Row justifyContent="center" gap={spacings.xl}>
             {steps.map((step, index) => (
                 <Fragment key={index}>
-                    <StepWrap>
-                        <Step $active={step.isActive}>
+                    <Row flex="1" justifyContent="center">
+                        <Text variant={step.isActive ? 'primary' : 'tertiary'}>
                             <Translation id={step.translationId} />
-                        </Step>
-                    </StepWrap>
+                        </Text>
+                    </Row>
                     {index < steps.length - 1 && (
-                        <Arrow>
-                            <Icon name="caretRight" color={theme.iconSubdued} />
-                        </Arrow>
+                        <Icon name="caretRight" variant="tertiary" size={20} />
                     )}
                 </Fragment>
             ))}
-        </Header>
+        </Row>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferWrapper.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferWrapper.tsx
deleted file mode 100644
index 30cbeeaec75..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOfferWrapper.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { CoinmarketLeftWrapper, CoinmarketRightWrapper } from 'src/views/wallet/coinmarket';
-
-interface CoinmarketSelectedOfferWrapperProps {
-    leftChildren: React.ReactNode;
-    rightChildren: React.ReactNode;
-}
-
-export const CoinmarketSelectedOfferWrapper = ({
-    leftChildren,
-    rightChildren,
-}: CoinmarketSelectedOfferWrapperProps) => (
-    <>
-        <CoinmarketLeftWrapper $isWithoutPadding>{leftChildren}</CoinmarketLeftWrapper>
-        <CoinmarketRightWrapper>{rightChildren}</CoinmarketRightWrapper>
-    </>
-);
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerify.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerify.tsx
index 346ec3d2076..76f388fde62 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerify.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerify.tsx
@@ -1,68 +1,25 @@
-import styled from 'styled-components';
+import { useEffect } from 'react';
+
+import { CryptoId } from 'invity-api';
+
 import addressValidator from '@trezor/address-validator';
-import { QuestionTooltip, Translation } from 'src/components/suite';
-import { Input, variables, Button } from '@trezor/components';
+import { Input, Button, Paragraph, Divider, Column, Tooltip, H4 } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+import { isHexValid, isInteger } from '@suite-common/wallet-utils';
+
+import { Translation } from 'src/components/suite';
 import { useTranslation } from 'src/hooks/suite/useTranslation';
 import { ConfirmedOnTrezor } from 'src/views/wallet/coinmarket/common/ConfirmedOnTrezor';
 import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 import { CoinmarketTradeBuyExchangeType } from 'src/types/coinmarket/coinmarket';
 import { CoinmarketVerifyOptions } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerifyOptions';
 import { CoinmarketVerifyAccountReturnProps } from 'src/types/coinmarket/coinmarketVerify';
-import { CryptoId } from 'invity-api';
-import { isCoinmarketExchangeOffers } from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
-import { isHexValid, isInteger } from '@suite-common/wallet-utils';
 import { CoinmarketAddressOptions } from 'src/views/wallet/coinmarket/common/CoinmarketAddressOptions';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
-import { useEffect } from 'react';
 import { useDispatch } from 'src/hooks/suite';
 import { COINMARKET_BUY } from 'src/actions/wallet/constants';
 import * as modalActions from 'src/actions/suite/modalActions';
-
-const Wrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-    margin-top: 10px;
-`;
-
-const Heading = styled.div`
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-    padding: 16px 24px 0;
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    font-size: ${variables.FONT_SIZE.SMALL};
-`;
-
-const CardContent = styled.div`
-    display: flex;
-    flex-direction: column;
-    padding: 0 24px;
-`;
-
-const Label = styled.div`
-    display: flex;
-    align-items: center;
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-const StyledQuestionTooltip = styled(QuestionTooltip)`
-    padding-left: 3px;
-`;
-
-const CustomLabel = styled(Label)`
-    padding: 12px 0;
-`;
-
-const ButtonWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding-top: 20px;
-    border-top: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-    margin: 20px 0;
-`;
-
-const Row = styled.div`
-    margin: 12px 0;
-`;
+import { isCoinmarketExchangeContext } from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
 
 interface CoinmarketVerifyProps {
     coinmarketVerifyAccount: CoinmarketVerifyAccountReturnProps;
@@ -75,7 +32,7 @@ export const CoinmarketVerify = ({ coinmarketVerifyAccount, currency }: Coinmark
     const { cryptoIdToCoinSymbol, cryptoIdToNativeCoinSymbol } = useCoinmarketInfo();
     const context = useCoinmarketFormContext<CoinmarketTradeBuyExchangeType>();
     const { callInProgress, device, verifyAddress, addressVerified, confirmTrade } = context;
-    const exchangeQuote = isCoinmarketExchangeOffers(context) ? context.selectedQuote : null;
+    const exchangeQuote = isCoinmarketExchangeContext(context) ? context.selectedQuote : null;
     const {
         form,
         selectedAccountOption,
@@ -141,101 +98,89 @@ export const CoinmarketVerify = ({ coinmarketVerifyAccount, currency }: Coinmark
     }, [device?.connected, dispatch]);
 
     return (
-        <Wrapper>
-            <Heading>
+        <Column gap={spacings.xl} alignItems="stretch">
+            <Paragraph typographyStyle="hint" variant="tertiary">
                 <Translation
                     id="TR_EXCHANGE_RECEIVING_ADDRESS_INFO"
                     values={{ symbol: cryptoIdToCoinSymbol(currency) }}
                 />
-            </Heading>
-            <CardContent>
-                <Row>
-                    <CustomLabel>
-                        <StyledQuestionTooltip
-                            label="TR_BUY_RECEIVING_ACCOUNT"
-                            tooltip={accountTooltipTranslationId}
-                        />
-                    </CustomLabel>
-                    <CoinmarketVerifyOptions
-                        receiveNetwork={currency}
-                        selectedAccountOption={selectedAccountOption}
-                        selectAccountOptions={selectAccountOptions}
-                        isMenuOpen={isMenuOpen}
-                        onChangeAccount={onChangeAccount}
-                    />
-                </Row>
-                <Row>
-                    {selectedAccountOption?.type === 'SUITE' &&
-                        selectedAccountOption?.account?.networkType === 'bitcoin' && (
-                            <>
-                                <CustomLabel>
-                                    <StyledQuestionTooltip
-                                        label="TR_BUY_RECEIVING_ADDRESS"
-                                        tooltip={addressTooltipTranslationId}
-                                    />
-                                </CustomLabel>
-                                <CoinmarketAddressOptions
-                                    account={selectedAccountOption?.account}
-                                    address={address}
-                                    control={form.control}
-                                    receiveSymbol={currency}
-                                    setValue={form.setValue}
-                                />
-                            </>
-                        )}
-                    {selectedAccountOption?.account?.networkType !== 'bitcoin' && (
+            </Paragraph>
+            <Column gap={spacings.xxs} alignItems="flex-start">
+                <Tooltip hasIcon content={<Translation id={accountTooltipTranslationId} />}>
+                    <H4>
+                        <Translation id="TR_BUY_RECEIVING_ACCOUNT" />
+                    </H4>
+                </Tooltip>
+                <CoinmarketVerifyOptions
+                    receiveNetwork={currency}
+                    selectedAccountOption={selectedAccountOption}
+                    selectAccountOptions={selectAccountOptions}
+                    isMenuOpen={isMenuOpen}
+                    onChangeAccount={onChangeAccount}
+                />
+            </Column>
+            <Column gap={spacings.xxs} alignItems="stretch">
+                {selectedAccountOption?.type === 'SUITE' &&
+                    selectedAccountOption?.account?.networkType === 'bitcoin' && (
                         <>
-                            <CustomLabel>
-                                <StyledQuestionTooltip
-                                    label="TR_EXCHANGE_RECEIVING_ADDRESS"
-                                    tooltip={addressTooltipTranslationId}
-                                />
-                            </CustomLabel>
-                            <Input
-                                readOnly={selectedAccountOption?.type !== 'NON_SUITE'}
-                                inputState={form.formState.errors.address ? 'error' : undefined}
-                                bottomText={form.formState.errors.address?.message || null}
-                                innerRef={networkRef}
-                                {...networkField}
+                            <Tooltip
+                                hasIcon
+                                content={<Translation id={addressTooltipTranslationId} />}
+                            >
+                                <H4>
+                                    <Translation id="TR_BUY_RECEIVING_ADDRESS" />
+                                </H4>
+                            </Tooltip>
+                            <CoinmarketAddressOptions
+                                account={selectedAccountOption?.account}
+                                address={address}
+                                control={form.control}
+                                receiveSymbol={currency}
+                                setValue={form.setValue}
                             />
                         </>
                     )}
-
-                    {device?.connected &&
-                        device.available &&
-                        addressVerified &&
-                        addressVerified === address && <ConfirmedOnTrezor device={device} />}
-                    {exchangeQuote?.extraFieldDescription && (
-                        <Row>
-                            <Input
-                                size="small"
-                                label={
-                                    <Label>
-                                        <Translation
-                                            id="TR_EXCHANGE_EXTRA_FIELD"
-                                            values={extraFieldDescription}
-                                        />
-                                        <StyledQuestionTooltip
-                                            tooltip={
-                                                <Translation
-                                                    id="TR_EXCHANGE_EXTRA_FIELD_QUESTION_TOOLTIP"
-                                                    values={extraFieldDescription}
-                                                />
-                                            }
-                                        />
-                                    </Label>
-                                }
-                                inputState={form.formState.errors.extraField ? 'error' : undefined}
-                                bottomText={form.formState.errors.extraField?.message || null}
-                                innerRef={descriptionRef}
-                                {...descriptionField}
+                {selectedAccountOption?.account?.networkType !== 'bitcoin' && (
+                    <>
+                        <Tooltip hasIcon content={<Translation id={addressTooltipTranslationId} />}>
+                            <H4>
+                                <Translation id="TR_EXCHANGE_RECEIVING_ADDRESS" />
+                            </H4>
+                        </Tooltip>
+                        <Input
+                            readOnly={selectedAccountOption?.type !== 'NON_SUITE'}
+                            inputState={form.formState.errors.address ? 'error' : undefined}
+                            bottomText={form.formState.errors.address?.message || null}
+                            innerRef={networkRef}
+                            {...networkField}
+                        />
+                    </>
+                )}
+
+                {device?.connected &&
+                    device.available &&
+                    addressVerified &&
+                    addressVerified === address && <ConfirmedOnTrezor device={device} />}
+
+                {exchangeQuote?.extraFieldDescription && (
+                    <Input
+                        size="small"
+                        label={
+                            <Translation
+                                id="TR_EXCHANGE_EXTRA_FIELD"
+                                values={extraFieldDescription}
                             />
-                        </Row>
-                    )}
-                </Row>
-            </CardContent>
+                        }
+                        inputState={form.formState.errors.extraField ? 'error' : undefined}
+                        bottomText={form.formState.errors.extraField?.message || null}
+                        innerRef={descriptionRef}
+                        {...descriptionField}
+                    />
+                )}
+            </Column>
             {selectedAccountOption && (
-                <ButtonWrapper>
+                <Column>
+                    <Divider margin={{ top: spacings.xs, bottom: spacings.lg }} />
                     {(!addressVerified || addressVerified !== address) &&
                         selectedAccountOption.account && (
                             <Button
@@ -244,10 +189,12 @@ export const CoinmarketVerify = ({ coinmarketVerifyAccount, currency }: Coinmark
                                 isDisabled={callInProgress}
                                 onClick={() => {
                                     if (selectedAccountOption.account && accountAddress) {
-                                        verifyAddress(
-                                            selectedAccountOption.account,
-                                            accountAddress.address,
-                                            accountAddress.path,
+                                        dispatch(
+                                            verifyAddress(
+                                                selectedAccountOption.account,
+                                                accountAddress.address,
+                                                accountAddress.path,
+                                            ),
                                         );
                                     }
                                 }}
@@ -276,8 +223,8 @@ export const CoinmarketVerify = ({ coinmarketVerifyAccount, currency }: Coinmark
                             <Translation id="TR_BUY_GO_TO_PAYMENT" />
                         </Button>
                     )}
-                </ButtonWrapper>
+                </Column>
             )}
-        </Wrapper>
+        </Column>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerifyOptions.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerifyOptions.tsx
index d13a22efc05..e44f4125dbd 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerifyOptions.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerifyOptions.tsx
@@ -1,4 +1,5 @@
 import { Select } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
 import {
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerifyOptionsItem.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerifyOptionsItem.tsx
index bce229ac845..f8b889282c7 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerifyOptionsItem.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketVerify/CoinmarketVerifyOptionsItem.tsx
@@ -1,12 +1,17 @@
+import styled, { useTheme } from 'styled-components';
+
 import { Column, Icon, Row, variables } from '@trezor/components';
 import { CoinLogo } from '@trezor/product-components';
 import { spacingsPx } from '@trezor/theme';
+
 import { AccountLabeling, Translation } from 'src/components/suite';
+import { FORM_SEND_CRYPTO_CURRENCY_SELECT } from 'src/constants/wallet/coinmarket/form';
+import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
 import { CoinmarketVerifyOptionsItemProps } from 'src/types/coinmarket/coinmarketVerify';
+import { isCoinmarketExchangeContext } from 'src/utils/wallet/coinmarket/coinmarketTypingUtils';
 import { parseCryptoId } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import { CoinmarketBalance } from 'src/views/wallet/coinmarket/common/CoinmarketBalance';
-import styled, { useTheme } from 'styled-components';
 
 const LogoWrapper = styled.div`
     padding: 0 0 0 ${spacingsPx.xxs};
@@ -25,6 +30,7 @@ export const CoinmarketVerifyOptionsItem = ({
     option,
     receiveNetwork,
 }: CoinmarketVerifyOptionsItemProps) => {
+    const context = useCoinmarketFormContext();
     const { cryptoIdToPlatformName, cryptoIdToCoinName } = useCoinmarketInfo();
     const theme = useTheme();
     const iconSize = 24;
@@ -54,6 +60,11 @@ export const CoinmarketVerifyOptionsItem = ({
                             balance={formattedBalance}
                             cryptoSymbolLabel={symbol.toLocaleUpperCase()}
                             networkSymbol={symbol}
+                            sendCryptoSelect={
+                                isCoinmarketExchangeContext(context)
+                                    ? context.getValues(FORM_SEND_CRYPTO_CURRENCY_SELECT)
+                                    : undefined
+                            }
                         />
                     </Column>
                 </AccountWrapper>
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTag.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTag.tsx
index 7992522d4fa..54e328e5f35 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTag.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTag.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
 import { borders } from '@trezor/theme';
 
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactionId.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactionId.tsx
index 707bf9edb29..694f15a84cf 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactionId.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactionId.tsx
@@ -1,11 +1,13 @@
 import styled from 'styled-components';
+
 import { Button, Row } from '@trezor/components';
 import { copyToClipboard } from '@trezor/dom-utils';
-import { useDispatch } from 'src/hooks/suite';
-import { Translation } from 'src/components/suite';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { spacings, spacingsPx, typography } from '@trezor/theme';
 
+import { useDispatch } from 'src/hooks/suite';
+import { Translation } from 'src/components/suite';
+
 const LabelWrapper = styled.div`
     width: 100%;
     flex: auto;
@@ -37,11 +39,11 @@ export const CoinmarketTransactionId = ({ transactionId }: CoinmarketTransaction
     return (
         <Row alignItems="center" justifyContent="space-between" margin={{ top: spacings.sm }}>
             <LabelWrapper>
-                <Translation id="TR_BUY_TRANS_ID" /> {transactionId}
+                <Translation id="TR_COINMARKET_TRANS_ID" /> {transactionId}
             </LabelWrapper>
             <ButtonWrapper>
                 <Button size="tiny" variant="tertiary" onClick={copy}>
-                    <Translation id="TR_COPY_TO_CLIPBOARD_TX_ID" />
+                    <Translation id="TR_COPY_TO_CLIPBOARD" />
                 </Button>
             </ButtonWrapper>
         </Row>
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionAmounts.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionAmounts.tsx
new file mode 100644
index 00000000000..507b74e3f1e
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionAmounts.tsx
@@ -0,0 +1,75 @@
+import { Icon, iconSizes, Row } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
+import { FormattedCryptoAmount, HiddenPlaceholder } from 'src/components/suite';
+import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
+import { Trade } from 'src/types/wallet/coinmarketCommonTypes';
+import { CoinmarketTestWrapper } from 'src/views/wallet/coinmarket';
+
+const Arrow = () => (
+    <Row margin={{ left: spacings.xs, right: spacings.xs }}>
+        <Icon variant="tertiary" size={iconSizes.small} name="caretRight" />
+    </Row>
+);
+
+interface CoinmarketTransactionAmountsProps {
+    trade: Trade;
+}
+
+export const CoinmarketTransactionAmounts = ({ trade }: CoinmarketTransactionAmountsProps) => {
+    const { cryptoIdToCoinSymbol } = useCoinmarketInfo();
+
+    if (trade.tradeType === 'sell') {
+        const { cryptoStringAmount, cryptoCurrency, fiatStringAmount, fiatCurrency } = trade.data;
+
+        return (
+            <Row flexWrap="wrap">
+                <FormattedCryptoAmount
+                    value={cryptoStringAmount}
+                    symbol={cryptoCurrency ? cryptoIdToCoinSymbol(cryptoCurrency) : cryptoCurrency}
+                />
+                <Arrow />
+                <HiddenPlaceholder>
+                    {fiatStringAmount} {fiatCurrency}
+                </HiddenPlaceholder>
+            </Row>
+        );
+    }
+
+    if (trade.tradeType === 'exchange') {
+        const { send, sendStringAmount, receive, receiveStringAmount } = trade.data;
+
+        return (
+            <Row flexWrap="wrap">
+                <FormattedCryptoAmount
+                    value={sendStringAmount}
+                    symbol={send ? cryptoIdToCoinSymbol(send) : send}
+                />
+                <Arrow />
+                <FormattedCryptoAmount
+                    value={receiveStringAmount}
+                    symbol={receive ? cryptoIdToCoinSymbol(receive) : receive}
+                />
+            </Row>
+        );
+    }
+
+    const { fiatStringAmount, fiatCurrency, receiveStringAmount, receiveCurrency } = trade.data;
+
+    return (
+        <Row flexWrap="wrap">
+            <HiddenPlaceholder data-testid="@coinmarket/transaction/fiat-amount">
+                {fiatStringAmount} {fiatCurrency}
+            </HiddenPlaceholder>
+            <Arrow />
+            <CoinmarketTestWrapper data-testid="@coinmarket/transaction/crypto-amount">
+                <FormattedCryptoAmount
+                    value={receiveStringAmount}
+                    symbol={
+                        receiveCurrency ? cryptoIdToCoinSymbol(receiveCurrency) : receiveCurrency
+                    }
+                />
+            </CoinmarketTestWrapper>
+        </Row>
+    );
+};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionContainer.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionContainer.tsx
new file mode 100644
index 00000000000..edea042e0b5
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionContainer.tsx
@@ -0,0 +1,56 @@
+import { Card, Column, Row, useMediaQuery, variables } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
+interface CoinmarketTransactionContainerProps {
+    TradeDetail: JSX.Element;
+    TradeProviders: JSX.Element;
+    TradeButton: JSX.Element;
+}
+
+export const CoinmarketTransactionContainer = ({
+    TradeDetail,
+    TradeProviders,
+    TradeButton,
+}: CoinmarketTransactionContainerProps) => {
+    const isBelowDesktop = useMediaQuery(`(max-width: ${variables.SCREEN_SIZE.XL})`);
+    const isMobile = useMediaQuery(`(max-width: ${variables.SCREEN_SIZE.SM})`);
+
+    return (
+        <Card fillType="none">
+            <Row flexWrap={isBelowDesktop ? 'wrap' : undefined}>
+                <Column
+                    alignItems="flex-start"
+                    flex="auto"
+                    width={isBelowDesktop ? 'calc(100% - 180px)' : '100%'}
+                >
+                    {TradeDetail}
+                </Column>
+                <Column
+                    flex="none"
+                    alignItems="start"
+                    width={isBelowDesktop ? '100%' : 200}
+                    order={isBelowDesktop ? 1 : undefined}
+                    margin={
+                        isBelowDesktop
+                            ? {
+                                  top: spacings.xs,
+                                  bottom: spacings.xs,
+                              }
+                            : undefined
+                    }
+                >
+                    {TradeProviders}
+                </Column>
+                <Column
+                    alignItems="flex-end"
+                    justifyContent="center"
+                    flex="none"
+                    order={isMobile ? 2 : undefined}
+                    width={isMobile ? '100%' : 180}
+                >
+                    {TradeButton}
+                </Column>
+            </Row>
+        </Card>
+    );
+};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionId.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionId.tsx
new file mode 100644
index 00000000000..7133b0f113a
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionId.tsx
@@ -0,0 +1,17 @@
+import { Row, Text } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
+import { Translation } from 'src/components/suite';
+
+interface CoinmarketTransactionIdProps {
+    transactionId: string;
+}
+
+export const CoinmarketTransactionId = ({ transactionId }: CoinmarketTransactionIdProps) => (
+    <Text margin={{ top: spacings.xs }} variant="tertiary" typographyStyle="label" as="div">
+        <Row flexWrap="wrap" gap={spacings.xxs}>
+            <Translation id="TR_COINMARKET_TRANS_ID" />
+            <Text>{transactionId}</Text>
+        </Row>
+    </Text>
+);
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionInfo.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionInfo.tsx
new file mode 100644
index 00000000000..82a7c9a5ccf
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionInfo.tsx
@@ -0,0 +1,34 @@
+import { Text } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
+import { FormattedDate } from 'src/components/suite';
+import { useTranslation } from 'src/hooks/suite';
+import { ExtendedMessageDescriptor } from 'src/types/suite';
+import { Trade, TradeType } from 'src/types/wallet/coinmarketCommonTypes';
+import { CoinmarketTransactionStatus } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionStatus';
+
+interface CoinmarketTransactionInfoProps {
+    trade: Trade;
+}
+
+const translationKeys: Record<
+    TradeType,
+    Extract<ExtendedMessageDescriptor['id'], 'TR_BUY' | 'TR_COINMARKET_SELL' | 'TR_COINMARKET_SWAP'>
+> = {
+    buy: 'TR_BUY',
+    sell: 'TR_COINMARKET_SELL',
+    exchange: 'TR_COINMARKET_SWAP',
+};
+
+export const CoinmarketTransactionInfo = ({ trade }: CoinmarketTransactionInfoProps) => {
+    const { date } = trade;
+    const { translationString } = useTranslation();
+    const tradeType = translationString(translationKeys[trade.tradeType]).toUpperCase();
+
+    return (
+        <Text margin={{ top: spacings.xs }} variant="tertiary" typographyStyle="label" as="div">
+            {tradeType} • <FormattedDate value={date} date time /> •{' '}
+            <CoinmarketTransactionStatus trade={trade} />
+        </Text>
+    );
+};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionProvider.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionProvider.tsx
new file mode 100644
index 00000000000..077b42a8a54
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionProvider.tsx
@@ -0,0 +1,45 @@
+import { Flex, FlexProps, useMediaQuery, variables } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
+import { CoinmarketPaymentMethodType } from 'src/types/coinmarket/coinmarket';
+import { CoinmarketPaymentType } from 'src/views/wallet/coinmarket/common/CoinmarketPaymentType';
+import {
+    CoinmarketProviderInfo,
+    CoinmarketProviderInfoProps,
+} from 'src/views/wallet/coinmarket/common/CoinmarketProviderInfo';
+
+interface CoinmarketTransactionProvidersProps extends CoinmarketProviderInfoProps {
+    paymentMethod?: CoinmarketPaymentMethodType;
+    paymentMethodName?: string;
+}
+
+export const CoinmarketTransactionProvider = ({
+    exchange,
+    providers,
+    paymentMethod,
+    paymentMethodName,
+}: CoinmarketTransactionProvidersProps) => {
+    const isBelowDesktop = useMediaQuery(`(max-width: ${variables.SCREEN_SIZE.XL})`);
+    const flexProps: Omit<FlexProps, 'children'> = isBelowDesktop
+        ? {
+              direction: 'row',
+              justifyContent: 'flex-start',
+              height: 'auto',
+              width: '100%',
+          }
+        : {
+              direction: 'column',
+              justifyContent: 'center',
+              alignItems: 'flex-start',
+              height: '100%',
+          };
+
+    return (
+        <Flex gap={spacings.sm} {...flexProps}>
+            <CoinmarketProviderInfo exchange={exchange} providers={providers} />
+            {paymentMethod && (
+                <CoinmarketPaymentType method={paymentMethod} methodName={paymentMethodName} />
+            )}
+        </Flex>
+    );
+};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/CoinmarketTransactionStatus.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionStatus.tsx
similarity index 77%
rename from packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/CoinmarketTransactionStatus.tsx
rename to packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionStatus.tsx
index 53de6a9c3b4..da29aff29e9 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketAccountTransactions/CoinmarketTransactionStatus.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionStatus.tsx
@@ -1,25 +1,18 @@
-import styled, { DefaultTheme, useTheme } from 'styled-components';
+import { DefaultTheme, useTheme } from 'styled-components';
+import { BuyTradeStatus, ExchangeTradeStatus, SellTradeStatus } from 'invity-api';
+
+import { Icon, Row, Text } from '@trezor/components';
+import { spacings } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import { getStatusMessage as getBuyStatusMessage } from 'src/utils/wallet/coinmarket/buyUtils';
 import { getStatusMessage as getExchangeStatusMessage } from 'src/utils/wallet/coinmarket/exchangeUtils';
 import { getStatusMessage as getSellStatusMessage } from 'src/utils/wallet/coinmarket/sellUtils';
-import { variables, Icon } from '@trezor/components';
 import { Trade } from 'src/types/wallet/coinmarketCommonTypes';
-import { BuyTradeStatus, ExchangeTradeStatus, SellTradeStatus } from 'invity-api';
-
-const Wrapper = styled.div<{ $color: string }>`
-    display: flex;
-    color: ${props => props.$color};
-    align-items: center;
-    font-size: ${variables.FONT_SIZE.TINY};
-`;
-
-const Text = styled.div`
-    padding-top: 1px;
-`;
 
 const getBuyTradeData = (status: BuyTradeStatus, theme: DefaultTheme) => {
     const message = getBuyStatusMessage(status);
+
     switch (message) {
         case 'TR_BUY_STATUS_PENDING':
         case 'TR_BUY_STATUS_ACTION_REQUIRED':
@@ -52,6 +45,7 @@ const getBuyTradeData = (status: BuyTradeStatus, theme: DefaultTheme) => {
 
 const getSellTradeData = (status: SellTradeStatus, theme: DefaultTheme) => {
     const message = getSellStatusMessage(status);
+
     switch (message) {
         case 'TR_SELL_STATUS_PENDING':
             return {
@@ -77,6 +71,7 @@ const getSellTradeData = (status: SellTradeStatus, theme: DefaultTheme) => {
 
 const getExchangeTradeData = (status: ExchangeTradeStatus, theme: DefaultTheme) => {
     const message = getExchangeStatusMessage(status);
+
     switch (message) {
         case 'TR_EXCHANGE_STATUS_CONFIRMING':
         case 'TR_EXCHANGE_STATUS_CONVERTING':
@@ -112,34 +107,35 @@ type StatusData =
     | ReturnType<typeof getSellTradeData>
     | ReturnType<typeof getExchangeTradeData>;
 
-interface StatusProps {
-    trade: Trade['data'];
-    tradeType: Trade['tradeType'];
-    className?: string;
-}
+const getData = (trade: Trade, theme: DefaultTheme): StatusData | null => {
+    if (!trade.data.status) return null;
 
-export const CoinmarketTransactionStatus = ({ trade, className, tradeType }: StatusProps) => {
-    const theme = useTheme();
-    let data: StatusData;
-    switch (tradeType) {
+    switch (trade.tradeType) {
         case 'buy':
-            data = getBuyTradeData(trade.status as BuyTradeStatus, theme);
-            break;
+            return getBuyTradeData(trade.data.status, theme);
         case 'sell':
-            data = getSellTradeData(trade.status as SellTradeStatus, theme);
-            break;
-        case 'exchange':
-            data = getExchangeTradeData(trade.status as ExchangeTradeStatus, theme);
-            break;
-        // no default
+            return getSellTradeData(trade.data.status, theme);
+        default:
+            return getExchangeTradeData(trade.data.status, theme);
     }
+};
+
+interface CoinmarketTransactionStatusProps {
+    trade: Trade;
+}
+
+export const CoinmarketTransactionStatus = ({ trade }: CoinmarketTransactionStatusProps) => {
+    const theme = useTheme();
+    const data = getData(trade, theme);
+
+    if (!data) return null;
 
     return (
-        <Wrapper $color={data.color} className={className}>
+        <Row margin={{ left: spacings.xxs }}>
             <Icon color={data.color} size={10} name={data.icon} margin={{ right: 4 }} />
-            <Text data-testid="@coinmarket/transaction/status">
+            <Text color={data.color} data-testid="@coinmarket/transaction/status">
                 <Translation id={data.statusMessageId} />
             </Text>
-        </Wrapper>
+        </Row>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionExchange.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionExchange.tsx
new file mode 100644
index 00000000000..2542d9143b4
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionExchange.tsx
@@ -0,0 +1,64 @@
+import { ExchangeProviderInfo } from 'invity-api';
+
+import { Button } from '@trezor/components';
+
+import { TradeExchange } from 'src/types/wallet/coinmarketCommonTypes';
+import { goto } from 'src/actions/suite/routerActions';
+import { saveTransactionId } from 'src/actions/wallet/coinmarketExchangeActions';
+import { Account } from 'src/types/wallet';
+import { Translation } from 'src/components/suite';
+import { useDispatch } from 'src/hooks/suite';
+import { useCoinmarketWatchTrade } from 'src/hooks/wallet/coinmarket/useCoinmarketWatchTrade';
+import { CoinmarketTransactionAmounts } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionAmounts';
+import { CoinmarketTransactionInfo } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionInfo';
+import { CoinmarketTransactionId } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionId';
+import { CoinmarketTransactionProvider } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionProvider';
+import { CoinmarketTransactionContainer } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionContainer';
+
+interface CoinmarketTransactionExchangeProps {
+    trade: TradeExchange;
+    account: Account;
+    providers?: {
+        [name: string]: ExchangeProviderInfo;
+    };
+}
+
+export const CoinmarketTransactionExchange = ({
+    trade,
+    providers,
+    account,
+}: CoinmarketTransactionExchangeProps) => {
+    const dispatch = useDispatch();
+
+    const viewDetail = () => {
+        dispatch(saveTransactionId(trade.key || ''));
+        dispatch(goto('wallet-coinmarket-exchange-detail'));
+    };
+
+    useCoinmarketWatchTrade({ account, trade });
+
+    if (!trade.data.orderId) return null;
+
+    return (
+        <CoinmarketTransactionContainer
+            TradeDetail={
+                <>
+                    <CoinmarketTransactionAmounts trade={trade} />
+                    <CoinmarketTransactionInfo trade={trade} />
+                    <CoinmarketTransactionId transactionId={trade.data.orderId} />
+                </>
+            }
+            TradeProviders={
+                <CoinmarketTransactionProvider
+                    exchange={trade.data.exchange}
+                    providers={providers}
+                />
+            }
+            TradeButton={
+                <Button size="small" variant="tertiary" onClick={viewDetail}>
+                    <Translation id="TR_COINMARKET_VIEW_DETAILS" />
+                </Button>
+            }
+        />
+    );
+};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionsBuy.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionsBuy.tsx
new file mode 100644
index 00000000000..f1a632b8642
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionsBuy.tsx
@@ -0,0 +1,72 @@
+import { BuyProviderInfo } from 'invity-api';
+
+import { Button } from '@trezor/components';
+
+import { saveTransactionDetailId } from 'src/actions/wallet/coinmarketBuyActions';
+import { Account } from 'src/types/wallet';
+import { Translation } from 'src/components/suite';
+import { TradeBuy } from 'src/types/wallet/coinmarketCommonTypes';
+import { useDispatch } from 'src/hooks/suite';
+import { useCoinmarketNavigation } from 'src/hooks/wallet/useCoinmarketNavigation';
+import { useCoinmarketWatchTrade } from 'src/hooks/wallet/coinmarket/useCoinmarketWatchTrade';
+import { CoinmarketTransactionId } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionId';
+import { CoinmarketTransactionInfo } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionInfo';
+import { CoinmarketTransactionAmounts } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionAmounts';
+import { CoinmarketTransactionProvider } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionProvider';
+import { CoinmarketTransactionContainer } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionContainer';
+
+interface CoinmarketTransactionBuyProps {
+    trade: TradeBuy;
+    account: Account;
+    providers?: {
+        [name: string]: BuyProviderInfo;
+    };
+}
+
+export const CoinmarketTransactionBuy = ({
+    trade,
+    providers,
+    account,
+}: CoinmarketTransactionBuyProps) => {
+    const dispatch = useDispatch();
+    const { navigateToBuyDetail } = useCoinmarketNavigation(account);
+
+    const { exchange, paymentMethod, paymentMethodName } = trade.data;
+
+    const handleViewDetailsButtonClick = () => {
+        dispatch(saveTransactionDetailId(trade.key || ''));
+        navigateToBuyDetail();
+    };
+
+    useCoinmarketWatchTrade({
+        account,
+        trade,
+    });
+
+    if (!trade.data.paymentId) return null;
+
+    return (
+        <CoinmarketTransactionContainer
+            TradeDetail={
+                <>
+                    <CoinmarketTransactionAmounts trade={trade} />
+                    <CoinmarketTransactionInfo trade={trade} />
+                    <CoinmarketTransactionId transactionId={trade.data.paymentId} />
+                </>
+            }
+            TradeProviders={
+                <CoinmarketTransactionProvider
+                    exchange={exchange}
+                    providers={providers}
+                    paymentMethod={paymentMethod}
+                    paymentMethodName={paymentMethodName}
+                />
+            }
+            TradeButton={
+                <Button size="small" variant="tertiary" onClick={handleViewDetailsButtonClick}>
+                    <Translation id="TR_COINMARKET_VIEW_DETAILS" />
+                </Button>
+            }
+        />
+    );
+};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionsList.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionsList.tsx
new file mode 100644
index 00000000000..9f3b11275c9
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionsList.tsx
@@ -0,0 +1,137 @@
+import styled from 'styled-components';
+
+import { H3, Paragraph, variables } from '@trezor/components';
+import { spacingsPx, typography } from '@trezor/theme';
+
+import { Translation } from 'src/components/suite';
+import { useSelector } from 'src/hooks/suite';
+import { useCoinmarketLoadData } from 'src/hooks/wallet/coinmarket/useCoinmarketLoadData';
+import { CoinmarketTransactionSell } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionsSell';
+import { CoinmarketTransactionBuy } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionsBuy';
+import { CoinmarketTransactionExchange } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionExchange';
+
+const Wrapper = styled.div`
+    padding: ${spacingsPx.zero} ${spacingsPx.lg};
+
+    ${variables.SCREEN_QUERY.BELOW_DESKTOP} {
+        padding: 0;
+    }
+`;
+
+const Header = styled.div`
+    padding-bottom: ${spacingsPx.xxl};
+`;
+
+const TransactionCount = styled.div`
+    margin-top: ${spacingsPx.xxxs};
+    ${typography.hint}
+    color: ${({ theme }) => theme.textSubdued};
+`;
+
+export const CoinmarketTransactionsList = () => {
+    const selectedAccount = useSelector(state => state.wallet.selectedAccount);
+    const allTransactions = useSelector(state => state.wallet.coinmarket.trades);
+    const activeSection = useSelector(state => state.wallet.coinmarket.activeSection);
+    const buyProviders = useSelector(state => state.wallet.coinmarket.buy.buyInfo?.providerInfos);
+    const exchangeProviders = useSelector(
+        state => state.wallet.coinmarket.exchange.exchangeInfo?.providerInfos,
+    );
+    const sellProviders = useSelector(
+        state => state.wallet.coinmarket.sell.sellInfo?.providerInfos,
+    );
+    const isBuyAndSell = activeSection !== 'exchange';
+
+    useCoinmarketLoadData();
+
+    if (selectedAccount.status !== 'loaded') {
+        return null;
+    }
+
+    const { account } = selectedAccount;
+    const sortedAccountTransactions = [...allTransactions].sort((a, b) => {
+        if (a.date > b.date) return -1;
+        if (a.date < b.date) return 1;
+
+        return 0;
+    });
+
+    const buyTransactions = sortedAccountTransactions.filter(tx => tx.tradeType === 'buy');
+    const exchangeTransactions = sortedAccountTransactions.filter(
+        tx => tx.tradeType === 'exchange',
+    );
+    const sellTransactions = sortedAccountTransactions.filter(tx => tx.tradeType === 'sell');
+    const buyAndSellTransactionLength = buyTransactions.length + sellTransactions.length;
+    const isEmpty =
+        (isBuyAndSell && buyAndSellTransactionLength === 0) ||
+        (!isBuyAndSell && exchangeTransactions.length === 0);
+
+    return (
+        <Wrapper>
+            {isEmpty && (
+                <Paragraph align="center" variant="tertiary">
+                    <Translation id="TR_BUY_NOT_TRANSACTIONS" />
+                </Paragraph>
+            )}
+            {!isEmpty && (
+                <>
+                    <Header>
+                        <H3>
+                            <Translation id="TR_COINMARKET_LAST_TRANSACTIONS" />
+                        </H3>
+                        <TransactionCount>
+                            {isBuyAndSell ? (
+                                <Translation
+                                    id="TR_COINMARKET_BUY_AND_SELL_COUNTER"
+                                    values={{
+                                        totalBuys: buyTransactions.length,
+                                        totalSells: sellTransactions.length,
+                                    }}
+                                />
+                            ) : (
+                                <Translation
+                                    id="TR_COINMARKET_SWAP_COUNTER"
+                                    values={{
+                                        totalSwaps: exchangeTransactions.length,
+                                    }}
+                                />
+                            )}
+                        </TransactionCount>
+                    </Header>
+                    {sortedAccountTransactions.map(trade => {
+                        if (isBuyAndSell && trade.tradeType === 'buy') {
+                            return (
+                                <CoinmarketTransactionBuy
+                                    account={account}
+                                    key={`${trade.tradeType}-${trade.key}`}
+                                    trade={trade}
+                                    providers={buyProviders}
+                                />
+                            );
+                        }
+                        if (isBuyAndSell && trade.tradeType === 'sell') {
+                            return (
+                                <CoinmarketTransactionSell
+                                    account={account}
+                                    key={`${trade.tradeType}-${trade.key}`}
+                                    trade={trade}
+                                    providers={sellProviders}
+                                />
+                            );
+                        }
+
+                        if (!isBuyAndSell && trade.tradeType === 'exchange') {
+                            return (
+                                <CoinmarketTransactionExchange
+                                    account={account}
+                                    key={`${trade.tradeType}-${trade.key}`}
+                                    trade={trade}
+                                    providers={exchangeProviders}
+                                />
+                            );
+                        }
+                    })}
+                </>
+            )}
+        </Wrapper>
+    );
+};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionsSell.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionsSell.tsx
new file mode 100644
index 00000000000..27d2563f6b9
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionsSell.tsx
@@ -0,0 +1,125 @@
+import { SellProviderInfo } from 'invity-api';
+
+import { Button } from '@trezor/components';
+
+import { goto } from 'src/actions/suite/routerActions';
+import { saveComposedTransactionInfo } from 'src/actions/wallet/coinmarket/coinmarketCommonActions';
+import {
+    saveQuoteRequest,
+    saveTransactionId,
+    setIsFromRedirect,
+} from 'src/actions/wallet/coinmarketSellActions';
+import { CoinmarketTransactionId } from 'src/views/wallet/coinmarket/common';
+import { Account } from 'src/types/wallet';
+import { Translation } from 'src/components/suite';
+import { TradeSell } from 'src/types/wallet/coinmarketCommonTypes';
+import { useDispatch, useSelector } from 'src/hooks/suite';
+import { useCoinmarketWatchTrade } from 'src/hooks/wallet/coinmarket/useCoinmarketWatchTrade';
+import { CoinmarketTransactionAmounts } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionAmounts';
+import { CoinmarketTransactionInfo } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionInfo';
+import { CoinmarketTransactionProvider } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionProvider';
+import { CoinmarketTransactionContainer } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransaction/CoinmarketTransactionContainer';
+
+interface CoinmarketTransactionSellProps {
+    trade: TradeSell;
+    account: Account;
+    providers?: {
+        [name: string]: SellProviderInfo;
+    };
+}
+
+export const CoinmarketTransactionSell = ({
+    trade,
+    providers,
+    account,
+}: CoinmarketTransactionSellProps) => {
+    const dispatch = useDispatch();
+    const { composed, selectedFee } = useSelector(
+        state => state.wallet.coinmarket.composedTransactionInfo,
+    );
+
+    const {
+        amountInCrypto,
+        fiatCurrency,
+        exchange,
+        paymentMethod,
+        paymentMethodName,
+        cryptoCurrency,
+    } = trade.data;
+
+    const viewDetail = () => {
+        dispatch(saveTransactionId(trade.key || ''));
+
+        if (trade.data.status === 'SUBMITTED' || trade.data.status === 'SEND_CRYPTO') {
+            // continue to the sell flow
+            dispatch(
+                saveQuoteRequest({
+                    amountInCrypto: amountInCrypto || false,
+                    fiatCurrency: fiatCurrency || '',
+                    cryptoCurrency: cryptoCurrency!,
+                }),
+            );
+            dispatch(setIsFromRedirect(true));
+            // use fee selected by user or normal
+            dispatch(
+                saveComposedTransactionInfo({
+                    selectedFee: selectedFee || 'normal',
+                    composed: composed || {
+                        feePerByte: '',
+                        fee: '',
+                    },
+                }),
+            );
+            dispatch(
+                goto('wallet-coinmarket-sell-confirm', {
+                    params: {
+                        symbol: account.symbol,
+                        accountIndex: account.index,
+                        accountType: account.accountType,
+                    },
+                }),
+            );
+
+            return;
+        }
+
+        dispatch(
+            goto('wallet-coinmarket-sell-detail', {
+                params: {
+                    symbol: account.symbol,
+                    accountIndex: account.index,
+                    accountType: account.accountType,
+                },
+            }),
+        );
+    };
+
+    useCoinmarketWatchTrade({ account, trade });
+
+    if (!trade.data.orderId) return null;
+
+    return (
+        <CoinmarketTransactionContainer
+            TradeDetail={
+                <>
+                    <CoinmarketTransactionAmounts trade={trade} />
+                    <CoinmarketTransactionInfo trade={trade} />
+                    <CoinmarketTransactionId transactionId={trade.data.orderId} />
+                </>
+            }
+            TradeProviders={
+                <CoinmarketTransactionProvider
+                    exchange={exchange}
+                    providers={providers}
+                    paymentMethod={paymentMethod}
+                    paymentMethodName={paymentMethodName}
+                />
+            }
+            TradeButton={
+                <Button variant="tertiary" onClick={viewDetail}>
+                    <Translation id="TR_COINMARKET_VIEW_DETAILS" />
+                </Button>
+            }
+        />
+    );
+};
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsKyc.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsKyc.tsx
index 989059a54b0..93b69957e3f 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsKyc.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsKyc.tsx
@@ -1,9 +1,11 @@
-import { Banner, Icon, Tooltip } from '@trezor/components';
 import { useTheme } from 'styled-components';
+import { ExchangeKYCType } from 'invity-api';
+
+import { Banner, Icon, Tooltip } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { TooltipIcon, TooltipText, TooltipWrap } from 'src/views/wallet/coinmarket';
 import { CoinmarketExchangeProvidersInfoProps } from 'src/types/coinmarket/coinmarket';
-import { ExchangeKYCType } from 'invity-api';
 import {
     KYC_DEX,
     KYC_NO_KYC,
@@ -63,5 +65,5 @@ export const CoinmarketUtilsKyc = ({
         );
     }
 
-    return <Banner icon="info">{kycPolicyTranslation}</Banner>;
+    return <Banner icon>{kycPolicyTranslation}</Banner>;
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsPrice.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsPrice.tsx
index 52dd12ce33f..7d4ebb93ab6 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsPrice.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsPrice.tsx
@@ -1,11 +1,14 @@
-import { CoinmarketCryptoAmount, CoinmarketFiatAmount } from '..';
 import styled from 'styled-components';
+
 import { spacingsPx, typography } from '@trezor/theme';
-import { Translation } from 'src/components/suite';
 import { FONT_SIZE, SCREEN_QUERY } from '@trezor/components/src/config/variables';
-import { CoinmarketCryptoAmountProps } from 'src/types/coinmarket/coinmarketOffers';
+
+import { Translation } from 'src/components/suite';
 import { coinmarketGetAmountLabels } from 'src/utils/wallet/coinmarket/coinmarketUtils';
-import { useCoinmarketOffersContext } from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
+import { CoinmarketFiatAmount } from 'src/views/wallet/coinmarket/common/CoinmarketFiatAmount';
+import { CoinmarketCryptoAmount } from 'src/views/wallet/coinmarket/common/CoinmarketCryptoAmount';
+import { useCoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
+import { CoinmarketCryptoAmountProps } from 'src/types/coinmarket/coinmarket';
 
 const PriceWrap = styled.div``;
 
@@ -31,14 +34,14 @@ const PriceValue = styled.div`
     }
 `;
 
-const CoinmarketUtilsPrice = ({
+export const CoinmarketUtilsPrice = ({
     amountInCrypto,
     sendAmount,
     sendCurrency,
     receiveAmount,
     receiveCurrency,
 }: CoinmarketCryptoAmountProps) => {
-    const { type } = useCoinmarketOffersContext();
+    const { type } = useCoinmarketFormContext();
 
     return (
         <PriceWrap>
@@ -73,5 +76,3 @@ const CoinmarketUtilsPrice = ({
         </PriceWrap>
     );
 };
-
-export default CoinmarketUtilsPrice;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsProvider.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsProvider.tsx
index 25623fc15b8..2db20cc18e4 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsProvider.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsProvider.tsx
@@ -1,28 +1,18 @@
 import styled from 'styled-components';
+
+import { spacings } from '@trezor/theme';
+import { Row } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
-import { spacingsPx, typography } from '@trezor/theme';
 import invityAPI from 'src/services/suite/invityAPI';
 import { CoinmarketUtilsProvidersProps } from 'src/types/coinmarket/coinmarket';
 
-const IconWrap = styled.div`
-    display: flex;
-    align-items: center;
-`;
 const Icon = styled.img`
     flex: none;
     width: 20px;
     border-radius: 2px;
 `;
 
-const IconText = styled.div`
-    flex: auto;
-    width: 100%;
-    align-items: center;
-    margin-left: ${spacingsPx.xs};
-    ${typography.body}
-    color: ${({ theme }) => theme.textDefault};
-`;
-
 interface CoinmarketUtilsProviderProps {
     exchange?: string;
     className?: string;
@@ -37,17 +27,21 @@ export const CoinmarketUtilsProvider = ({
     const provider = providers && exchange ? providers[exchange] : null;
 
     return (
-        <IconWrap className={className} data-testid="@coinmarket/offers/quote/provider">
+        <Row
+            gap={spacings.xs}
+            className={className}
+            data-testid="@coinmarket/offers/quote/provider"
+        >
             {provider ? (
                 <>
                     {provider.logo && (
                         <Icon src={invityAPI.getProviderLogoUrl(provider.logo)} alt="" />
                     )}
-                    <IconText>{provider.brandName ?? provider.companyName}</IconText>
+                    {provider.brandName ?? provider.companyName}
                 </>
             ) : (
                 <>{exchange ? exchange : <Translation id="TR_COINMARKET_UNKNOWN_PROVIDER" />}</>
             )}
-        </IconWrap>
+        </Row>
     );
 };
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsTooltip.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsTooltip.tsx
index 2d40e1805bd..b83def9002b 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsTooltip.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsTooltip.tsx
@@ -1,13 +1,15 @@
-import { Icon, Tooltip } from '@trezor/components';
-import { CoinmarketOffersItemProps } from '../CoinmarketOffers/CoinmarketOffersItem';
 import { useTheme } from 'styled-components';
-import CoinmarketUtilsTooltipFee from './CoinmarketUtilsTooltipFee';
+
+import { Icon, Tooltip } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useTranslation } from 'src/hooks/suite';
 import { TooltipIcon, TooltipText, TooltipWrap } from 'src/views/wallet/coinmarket';
+import { CoinmarketUtilsTooltipFee } from 'src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsTooltipFee';
+import { CoinmarketOffersItemProps } from 'src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersItem';
 
 // IN TESTING MODE
-const CoinmarketUtilsTooltip = ({ quote }: Pick<CoinmarketOffersItemProps, 'quote'>) => {
+export const CoinmarketUtilsTooltip = ({ quote }: Pick<CoinmarketOffersItemProps, 'quote'>) => {
     const theme = useTheme();
     const { translationString } = useTranslation();
     const isFeesIncluded = false;
@@ -41,5 +43,3 @@ const CoinmarketUtilsTooltip = ({ quote }: Pick<CoinmarketOffersItemProps, 'quot
         </Tooltip>
     );
 };
-
-export default CoinmarketUtilsTooltip;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsTooltipFee.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsTooltipFee.tsx
index 6f02df09aba..4a46ee7145a 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsTooltipFee.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketUtils/CoinmarketUtilsTooltipFee.tsx
@@ -1,7 +1,9 @@
-import { CoinmarketOffersItemProps } from '../CoinmarketOffers/CoinmarketOffersItem';
 import styled from 'styled-components';
+
 import { typography } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
+import { CoinmarketOffersItemProps } from 'src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffersItem';
 
 const TooltipRow = styled.div`
     display: flex;
@@ -20,7 +22,7 @@ const TooltipValue = styled.div`
 `;
 
 // IN TESTING MODE
-const CoinmarketUtilsTooltipFee = (_props: Pick<CoinmarketOffersItemProps, 'quote'>) => {
+export const CoinmarketUtilsTooltipFee = (_props: Pick<CoinmarketOffersItemProps, 'quote'>) => {
     return (
         <>
             <TooltipRow>
@@ -38,5 +40,3 @@ const CoinmarketUtilsTooltipFee = (_props: Pick<CoinmarketOffersItemProps, 'quot
         </>
     );
 };
-
-export default CoinmarketUtilsTooltipFee;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/CoinmarketWrapper.tsx b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketWrapper.tsx
new file mode 100644
index 00000000000..1b701e54cd6
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/common/CoinmarketWrapper.tsx
@@ -0,0 +1,13 @@
+import { variables } from '@trezor/components';
+import { spacingsPx } from '@trezor/theme';
+
+export const CoinmarketWrapper = `
+    gap: ${spacingsPx.md};
+    display: grid;
+    grid-template-columns: minmax(500px, auto) minmax(340px, 420px);
+
+    ${variables.SCREEN_QUERY.BELOW_DESKTOP} {
+        display: flex;
+        flex-direction: column;
+    }
+`;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/ConfirmedOnTrezor.tsx b/packages/suite/src/views/wallet/coinmarket/common/ConfirmedOnTrezor.tsx
index 43a8f6fadb8..7a930f940b2 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/ConfirmedOnTrezor.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/common/ConfirmedOnTrezor.tsx
@@ -1,10 +1,12 @@
 import React from 'react';
 
+import styled from 'styled-components';
+
 import { TrezorDevice } from '@suite-common/suite-types';
 import { variables } from '@trezor/components';
 import { RotateDeviceImage } from '@trezor/product-components';
+
 import { Translation } from 'src/components/suite';
-import styled from 'styled-components';
 
 const Confirmed = styled.div`
     display: flex;
@@ -18,6 +20,7 @@ const Confirmed = styled.div`
     gap: 10px;
 `;
 
+// reason: set size of RotateDeviceImage
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledRotateDeviceImage = styled(RotateDeviceImage)`
     height: 34px;
diff --git a/packages/suite/src/views/wallet/coinmarket/common/NoOffers.tsx b/packages/suite/src/views/wallet/coinmarket/common/NoOffers.tsx
deleted file mode 100644
index b08a3ea236b..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/common/NoOffers.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import styled from 'styled-components';
-
-import { Translation } from 'src/components/suite';
-import { Button, Image } from '@trezor/components';
-import { InvityAPIReloadQuotesAfterSeconds } from 'src/constants/wallet/coinmarket/metadata';
-import { CoinmarketRefreshTime } from './CoinmarketRefreshTime';
-
-const NoOffersWrapper = styled.div`
-    display: flex;
-    justify-content: center;
-    flex-direction: column;
-    min-height: 300px;
-    align-items: center;
-    flex: 1;
-`;
-
-const NoOffersImage = styled.div`
-    padding-bottom: 40px;
-`;
-
-const NoOffersHeader = styled.h3`
-    padding-bottom: 20px;
-`;
-const NoOffersMessage = styled.span``;
-
-const CoinmarketRefreshTimeWrapper = styled.div`
-    margin-top: 20px;
-`;
-
-const ButtonsWrapper = styled.div`
-    margin-top: 20px;
-    display: flex;
-    justify-content: space-between;
-
-    & > * + * {
-        margin-left: 12px;
-    }
-`;
-
-interface NoOffersProps {
-    coinmarketRefreshTimeIsLoading: boolean;
-    coinmarketRefreshTimeSeconds: number;
-    onBackButtonClick: () => void;
-    onReloadOffersButtonClick: () => void;
-    hasLoadingFailed: boolean;
-}
-
-export const NoOffers = ({
-    coinmarketRefreshTimeIsLoading,
-    coinmarketRefreshTimeSeconds,
-    onBackButtonClick,
-    onReloadOffersButtonClick,
-    hasLoadingFailed,
-}: NoOffersProps) => (
-    <NoOffersWrapper>
-        <NoOffersImage>
-            <Image image="CLOUDY" />
-        </NoOffersImage>
-        <NoOffersHeader>
-            <Translation id="TR_COINMARKET_NO_OFFERS_HEADER" />
-        </NoOffersHeader>
-        <NoOffersMessage>
-            <Translation
-                id={
-                    hasLoadingFailed
-                        ? 'TR_COINMARKET_NO_OFFERS_LOADING_FAILED_MESSAGE'
-                        : 'TR_COINMARKET_NO_OFFERS_MESSAGE'
-                }
-            />
-        </NoOffersMessage>
-        {hasLoadingFailed && (
-            <CoinmarketRefreshTimeWrapper>
-                <CoinmarketRefreshTime
-                    isLoading={coinmarketRefreshTimeIsLoading}
-                    refetchInterval={InvityAPIReloadQuotesAfterSeconds}
-                    seconds={coinmarketRefreshTimeSeconds}
-                    label={<Translation id="TR_COINMARKET_NO_OFFERS_AUTORELOADING_IN" />}
-                />
-            </CoinmarketRefreshTimeWrapper>
-        )}
-        <ButtonsWrapper>
-            <Button variant={hasLoadingFailed ? 'tertiary' : 'primary'} onClick={onBackButtonClick}>
-                <Translation id="TR_COINMARKET_NO_OFFERS_BACK_BUTTON" />
-            </Button>
-            {hasLoadingFailed && (
-                <Button
-                    isDisabled={coinmarketRefreshTimeIsLoading}
-                    onClick={onReloadOffersButtonClick}
-                >
-                    <Translation id="TR_COINMARKET_NO_OFFERS_RELOAD_PAGE_BUTTON" />
-                </Button>
-            )}
-        </ButtonsWrapper>
-    </NoOffersWrapper>
-);
diff --git a/packages/suite/src/views/wallet/coinmarket/common/index.ts b/packages/suite/src/views/wallet/coinmarket/common/index.ts
index f0dc42be300..3dd98ee2bf9 100644
--- a/packages/suite/src/views/wallet/coinmarket/common/index.ts
+++ b/packages/suite/src/views/wallet/coinmarket/common/index.ts
@@ -1,12 +1,10 @@
-export { CoinmarketAddressOptions } from './CoinmarketAddressOptions';
-export { CoinmarketCryptoAmount } from './CoinmarketCryptoAmount';
-export { CoinmarketFiatAmount } from './CoinmarketFiatAmount';
-export { CoinmarketFooter } from './CoinmarketFooter/CoinmarketFooter';
-export { CoinmarketFractionButtons } from './CoinmarketFractionButtons';
-export { CoinmarketLayout } from './CoinmarketLayout/CoinmarketLayout';
-export { CoinmarketPaymentType } from './CoinmarketPaymentType';
-export { CoinmarketProviderInfo } from './CoinmarketProviderInfo';
-export { CoinmarketRefreshTime } from './CoinmarketRefreshTime';
-export { CoinmarketTag } from './CoinmarketTag';
-export { CoinmarketTransactionId } from './CoinmarketTransactionId';
-export { NoOffers } from './NoOffers';
+export { CoinmarketAddressOptions } from 'src/views/wallet/coinmarket/common/CoinmarketAddressOptions';
+export { CoinmarketCryptoAmount } from 'src/views/wallet/coinmarket/common/CoinmarketCryptoAmount';
+export { CoinmarketFiatAmount } from 'src/views/wallet/coinmarket/common/CoinmarketFiatAmount';
+export { CoinmarketFooter } from 'src/views/wallet/coinmarket/common/CoinmarketFooter/CoinmarketFooter';
+export { CoinmarketFractionButtons } from 'src/views/wallet/coinmarket/common/CoinmarketFractionButtons';
+export { CoinmarketPaymentType } from 'src/views/wallet/coinmarket/common/CoinmarketPaymentType';
+export { CoinmarketProviderInfo } from 'src/views/wallet/coinmarket/common/CoinmarketProviderInfo';
+export { CoinmarketRefreshTime } from 'src/views/wallet/coinmarket/common/CoinmarketRefreshTime';
+export { CoinmarketTag } from 'src/views/wallet/coinmarket/common/CoinmarketTag';
+export { CoinmarketTransactionId } from 'src/views/wallet/coinmarket/common/CoinmarketTransactionId';
diff --git a/packages/suite/src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeConfirm.tsx b/packages/suite/src/views/wallet/coinmarket/exchange/CoinmarketExchangeConfirm.tsx
similarity index 57%
rename from packages/suite/src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeConfirm.tsx
rename to packages/suite/src/views/wallet/coinmarket/exchange/CoinmarketExchangeConfirm.tsx
index c2fbb4e2e4b..43a4fb49d45 100644
--- a/packages/suite/src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeConfirm.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/exchange/CoinmarketExchangeConfirm.tsx
@@ -1,13 +1,12 @@
-import { withSelectedAccountLoaded } from 'src/components/wallet';
 import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
 import { CoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-import { withCoinmarketLayoutWrap } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/withCoinmarketLayoutWrap';
 import { CoinmarketSelectedOffer } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOffer';
 import { useCoinmarketExchangeForm } from 'src/hooks/wallet/coinmarket/form/useCoinmarketExchangeForm';
+import { CoinmarketContainer } from 'src/views/wallet/coinmarket/common/CoinmarketContainer';
 
-const CoinmarketExchangeConfirmComponent = (props: UseCoinmarketProps) => {
+const CoinmarketExchangeConfirmComponent = ({ selectedAccount }: UseCoinmarketProps) => {
     const coinmarketExchangeContextValues = useCoinmarketExchangeForm({
-        ...props,
+        selectedAccount,
         pageType: 'confirm',
     });
 
@@ -18,11 +17,6 @@ const CoinmarketExchangeConfirmComponent = (props: UseCoinmarketProps) => {
     );
 };
 
-export const CoinmarketExchangeConfirm = withSelectedAccountLoaded(
-    withCoinmarketLayoutWrap(CoinmarketExchangeConfirmComponent, {
-        backRoute: 'wallet-coinmarket-exchange',
-    }),
-    {
-        title: 'TR_COINMARKET_SWAP',
-    },
+export const CoinmarketExchangeConfirm = () => (
+    <CoinmarketContainer SectionComponent={CoinmarketExchangeConfirmComponent} />
 );
diff --git a/packages/suite/src/views/wallet/coinmarket/exchange/CoinmarketExchangeDetail.tsx b/packages/suite/src/views/wallet/coinmarket/exchange/CoinmarketExchangeDetail.tsx
new file mode 100644
index 00000000000..23117430c4d
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/exchange/CoinmarketExchangeDetail.tsx
@@ -0,0 +1,24 @@
+import {
+    CoinmarketDetailContext,
+    useCoinmarketDetail,
+} from 'src/hooks/wallet/coinmarket/useCoinmarketDetail';
+import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
+import { CoinmarketContainer } from 'src/views/wallet/coinmarket/common/CoinmarketContainer';
+import { CoinmarketDetailExchange } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailExchange/CoinmarketDetailExchange';
+
+const CoinmarketExchangeDetailComponent = ({ selectedAccount }: UseCoinmarketProps) => {
+    const coinmarketDetailContext = useCoinmarketDetail({
+        selectedAccount,
+        tradeType: 'exchange',
+    });
+
+    return (
+        <CoinmarketDetailContext.Provider value={coinmarketDetailContext}>
+            <CoinmarketDetailExchange />
+        </CoinmarketDetailContext.Provider>
+    );
+};
+
+export const CoinmarketExchangeDetail = () => (
+    <CoinmarketContainer SectionComponent={CoinmarketExchangeDetailComponent} />
+);
diff --git a/packages/suite/src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeForm.tsx b/packages/suite/src/views/wallet/coinmarket/exchange/CoinmarketExchangeForm.tsx
similarity index 58%
rename from packages/suite/src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeForm.tsx
rename to packages/suite/src/views/wallet/coinmarket/exchange/CoinmarketExchangeForm.tsx
index dbaec1cb9a4..b2ed2832e94 100644
--- a/packages/suite/src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeForm.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/exchange/CoinmarketExchangeForm.tsx
@@ -1,15 +1,15 @@
-import { withSelectedAccountLoaded } from 'src/components/wallet';
 import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
 import { useCoinmarketExchangeForm } from 'src/hooks/wallet/coinmarket/form/useCoinmarketExchangeForm';
 import { CoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 import { CoinmarketFormLayout } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormLayout';
-import CoinmarketLayout from 'src/views/wallet/coinmarket/common/CoinmarketLayoutNew/CoinmarketLayout';
+import { CoinmarketLayout } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayout';
+import { CoinmarketContainer } from 'src/views/wallet/coinmarket/common/CoinmarketContainer';
 
-const CoinmarketExchangeFormComponent = (props: UseCoinmarketProps) => {
-    const coinmarketExchangeContextValue = useCoinmarketExchangeForm(props);
+const CoinmarketExchangeFormComponent = ({ selectedAccount }: UseCoinmarketProps) => {
+    const coinmarketExchangeContextValue = useCoinmarketExchangeForm({ selectedAccount });
 
     return (
-        <CoinmarketLayout selectedAccount={props.selectedAccount}>
+        <CoinmarketLayout>
             <CoinmarketFormContext.Provider value={coinmarketExchangeContextValue}>
                 <CoinmarketFormLayout />
             </CoinmarketFormContext.Provider>
@@ -17,6 +17,6 @@ const CoinmarketExchangeFormComponent = (props: UseCoinmarketProps) => {
     );
 };
 
-export const CoinmarketExchangeForm = withSelectedAccountLoaded(CoinmarketExchangeFormComponent, {
-    title: 'TR_COINMARKET_SWAP',
-});
+export const CoinmarketExchangeForm = () => (
+    <CoinmarketContainer SectionComponent={CoinmarketExchangeFormComponent} />
+);
diff --git a/packages/suite/src/views/wallet/coinmarket/exchange/CoinmarketExchangeOffers.tsx b/packages/suite/src/views/wallet/coinmarket/exchange/CoinmarketExchangeOffers.tsx
new file mode 100644
index 00000000000..7b5f4760330
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/exchange/CoinmarketExchangeOffers.tsx
@@ -0,0 +1,22 @@
+import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
+import { CoinmarketOffers } from 'src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffers';
+import { useCoinmarketExchangeForm } from 'src/hooks/wallet/coinmarket/form/useCoinmarketExchangeForm';
+import { CoinmarketContainer } from 'src/views/wallet/coinmarket/common/CoinmarketContainer';
+import { CoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
+
+const CoinmarketExchangeOffersComponent = ({ selectedAccount }: UseCoinmarketProps) => {
+    const coinmarketExchangeContextValues = useCoinmarketExchangeForm({
+        selectedAccount,
+        pageType: 'offers',
+    });
+
+    return (
+        <CoinmarketFormContext.Provider value={coinmarketExchangeContextValues}>
+            <CoinmarketOffers />
+        </CoinmarketFormContext.Provider>
+    );
+};
+
+export const CoinmarketExchangeOffers = () => (
+    <CoinmarketContainer SectionComponent={CoinmarketExchangeOffersComponent} />
+);
diff --git a/packages/suite/src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeOffers.tsx b/packages/suite/src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeOffers.tsx
deleted file mode 100644
index 01db35facc9..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/exchange_new/CoinmarketExchangeOffers.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { withSelectedAccountLoaded } from 'src/components/wallet';
-import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
-import { CoinmarketOffersContext } from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
-import CoinmarketOffers from 'src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffers';
-import { CoinmarketFooter } from 'src/views/wallet/coinmarket/common';
-import { withCoinmarketLayoutWrap } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/withCoinmarketLayoutWrap';
-import { useCoinmarketExchangeForm } from 'src/hooks/wallet/coinmarket/form/useCoinmarketExchangeForm';
-
-const CoinmarketExchangeOffersComponent = (props: UseCoinmarketProps) => {
-    const coinmarketExchangeContextValues = useCoinmarketExchangeForm({
-        ...props,
-        pageType: 'offers',
-    });
-
-    return (
-        <CoinmarketOffersContext.Provider value={coinmarketExchangeContextValues}>
-            <CoinmarketOffers />
-            <CoinmarketFooter />
-        </CoinmarketOffersContext.Provider>
-    );
-};
-
-export const CoinmarketExchangeOffers = withSelectedAccountLoaded(
-    withCoinmarketLayoutWrap(CoinmarketExchangeOffersComponent, {
-        backRoute: 'wallet-coinmarket-exchange',
-    }),
-    {
-        title: 'TR_COINMARKET_SWAP',
-    },
-);
diff --git a/packages/suite/src/views/wallet/coinmarket/exchange_new/components/ExchangeForm/CoinmarketExchangeOfferInfo.tsx b/packages/suite/src/views/wallet/coinmarket/exchange_new/components/ExchangeForm/CoinmarketExchangeOfferInfo.tsx
deleted file mode 100644
index 8c149c2a492..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/exchange_new/components/ExchangeForm/CoinmarketExchangeOfferInfo.tsx
+++ /dev/null
@@ -1,237 +0,0 @@
-import styled from 'styled-components';
-import { ExchangeTrade } from 'invity-api';
-import { variables } from '@trezor/components';
-import {
-    CoinmarketProviderInfo,
-    CoinmarketTransactionId,
-} from 'src/views/wallet/coinmarket/common';
-import { Account } from 'src/types/wallet';
-import {
-    AccountLabeling,
-    FormattedCryptoAmount,
-    QuestionTooltip,
-    Translation,
-} from 'src/components/suite';
-import { ExchangeInfo } from 'src/actions/wallet/coinmarketExchangeActions';
-import { typography } from '@trezor/theme';
-import { CoinmarketCoinLogo } from 'src/views/wallet/coinmarket/common/CoinmarketCoinLogo';
-import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
-
-const Wrapper = styled.div`
-    margin: 0 0 0 30px;
-
-    @media screen and (max-width: ${variables.SCREEN_SIZE.LG}) {
-        margin: 0;
-    }
-`;
-
-const AccountText = styled.div`
-    color: ${({ theme }) => theme.textSubdued};
-    padding-left: 7px;
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-const Info = styled.div`
-    display: flex;
-    flex-direction: column;
-    min-width: 350px;
-
-    padding-top: 10px;
-    min-height: 200px;
-    border: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-    border-radius: 4px;
-
-    @media screen and (max-width: ${variables.SCREEN_SIZE.LG}) {
-        flex: 1;
-        margin: 20px 0 10px;
-        width: 100%;
-    }
-`;
-
-const LeftColumn = styled.div`
-    display: flex;
-    flex: 1;
-    ${typography.label}
-    text-transform: capitalize;
-    color: ${({ theme }) => theme.textSubdued};
-`;
-
-const RightColumn = styled.div`
-    display: flex;
-    justify-content: flex-end;
-    flex: 1;
-    font-size: ${variables.FONT_SIZE.TINY};
-    color: ${({ theme }) => theme.textSubdued};
-`;
-
-const Row = styled.div`
-    display: flex;
-    margin: 18px 24px;
-    white-space: nowrap;
-    justify-content: space-between;
-`;
-
-const AdjacentRow = styled.div`
-    display: flex;
-    margin: -15px 24px 10px;
-`;
-
-const Dark = styled.div`
-    display: flex;
-    align-items: center;
-    font-size: ${variables.FONT_SIZE.NORMAL};
-    justify-content: flex-end;
-    flex: 1;
-    font-weight: ${variables.FONT_WEIGHT.DEMI_BOLD};
-    color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
-`;
-
-const RowWithBorder = styled(Row)`
-    border-top: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-    border-bottom: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-    margin-bottom: 0;
-    margin-top: 10px;
-    padding-bottom: 10px;
-    padding-top: 10px;
-`;
-
-const Middle = styled.div`
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex: 1;
-    color: ${({ theme }) => theme.textSubdued};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-const Amount = styled.span`
-    padding-left: 5px;
-`;
-
-const StyledQuestionTooltip = styled(QuestionTooltip)`
-    padding-left: 3px;
-`;
-
-const AccountType = styled.span`
-    color: ${({ theme }) => theme.textSubdued};
-    padding-left: 5px;
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-interface CoinmarketExchangeOfferInfoProps {
-    selectedQuote: ExchangeTrade;
-    transactionId?: string;
-    exchangeInfo?: ExchangeInfo;
-    account: Account;
-    receiveAccount?: Account;
-}
-
-export const CoinmarketExchangeOfferInfo = ({
-    selectedQuote,
-    transactionId,
-    exchangeInfo,
-    account,
-    receiveAccount,
-}: CoinmarketExchangeOfferInfoProps) => {
-    const { exchange, receiveStringAmount, receive, sendStringAmount, send } = selectedQuote;
-    const provider =
-        exchangeInfo?.providerInfos && exchange ? exchangeInfo?.providerInfos[exchange] : undefined;
-
-    const { cryptoIdToCoinSymbol } = useCoinmarketInfo();
-
-    if (!provider) return null;
-
-    return (
-        <Wrapper>
-            <Info>
-                <Row>
-                    <LeftColumn>
-                        <Translation id="TR_COINMARKET_SWAP" />
-                    </LeftColumn>
-                    <RightColumn>
-                        <Dark>
-                            <CoinmarketCoinLogo cryptoId={send!} size={20} />
-                            <Amount>
-                                <FormattedCryptoAmount
-                                    value={sendStringAmount}
-                                    symbol={cryptoIdToCoinSymbol(send!)}
-                                />
-                            </Amount>
-                        </Dark>
-                    </RightColumn>
-                </Row>
-                <AdjacentRow>
-                    <RightColumn>
-                        <AccountText>
-                            <AccountLabeling account={account} />
-                            <AccountType>
-                                {account.accountType !== 'normal' ? account.accountType : ''}
-                            </AccountType>
-                        </AccountText>
-                    </RightColumn>
-                </AdjacentRow>
-                <Row>
-                    <LeftColumn>
-                        <Translation id="TR_EXCHANGE_BUY" />
-                    </LeftColumn>
-                    <RightColumn>
-                        <Dark>
-                            <CoinmarketCoinLogo cryptoId={receive!} size={20} />
-                            <Amount>
-                                {(!provider.isFixedRate || selectedQuote.isDex) && '≈ '}
-                                <FormattedCryptoAmount
-                                    value={receiveStringAmount}
-                                    symbol={cryptoIdToCoinSymbol(receive!)}
-                                />
-                            </Amount>
-                        </Dark>
-                    </RightColumn>
-                </Row>
-                {receiveAccount && (
-                    <AdjacentRow>
-                        <RightColumn>
-                            <AccountText>
-                                <AccountLabeling account={receiveAccount} />
-                                <AccountType>
-                                    {receiveAccount.accountType !== 'normal'
-                                        ? receiveAccount.accountType
-                                        : ''}
-                                </AccountType>
-                            </AccountText>
-                        </RightColumn>
-                    </AdjacentRow>
-                )}
-                <RowWithBorder>
-                    <Middle>
-                        {provider.isFixedRate && !selectedQuote.isDex && (
-                            <>
-                                <Translation id="TR_EXCHANGE_FIXED" />
-                                <StyledQuestionTooltip tooltip="TR_EXCHANGE_FIXED_OFFERS_INFO" />
-                            </>
-                        )}
-                        {!provider.isFixedRate && !selectedQuote.isDex && (
-                            <>
-                                <Translation id="TR_EXCHANGE_FLOAT" />
-                                <StyledQuestionTooltip tooltip="TR_EXCHANGE_FLOAT_OFFERS_INFO" />
-                            </>
-                        )}
-                        {selectedQuote.isDex && <Translation id="TR_EXCHANGE_DEX" />}
-                    </Middle>
-                </RowWithBorder>
-                <Row>
-                    <LeftColumn>
-                        <Translation id="TR_EXCHANGE_PROVIDER" />
-                    </LeftColumn>
-                    <RightColumn>
-                        <CoinmarketProviderInfo
-                            exchange={exchange}
-                            providers={exchangeInfo?.providerInfos}
-                            data-testid="@CoinmarketExchangeProviderInfo"
-                        />
-                    </RightColumn>
-                </Row>
-            </Info>
-            {transactionId && <CoinmarketTransactionId transactionId={transactionId} />}
-        </Wrapper>
-    );
-};
diff --git a/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/index.tsx b/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/index.tsx
deleted file mode 100644
index ef7510685f0..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/exchange_new/detail/index.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { withSelectedAccountLoaded } from 'src/components/wallet';
-import styled from 'styled-components';
-import Detail from './Detail';
-import {
-    CoinmarketDetailContext,
-    useCoinmarketDetail,
-} from 'src/hooks/wallet/coinmarket/useCoinmarketDetail';
-import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
-import { withCoinmarketLayoutWrap } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/withCoinmarketLayoutWrap';
-
-const Wrapper = styled.div`
-    display: flex;
-    width: 100%;
-    flex-direction: column;
-`;
-
-const DetailIndex = (props: UseCoinmarketProps) => {
-    const coinmarketDetailContext = useCoinmarketDetail({
-        selectedAccount: props.selectedAccount,
-        tradeType: 'exchange',
-    });
-
-    return (
-        <CoinmarketDetailContext.Provider value={coinmarketDetailContext}>
-            <Wrapper>
-                <Detail />
-            </Wrapper>
-        </CoinmarketDetailContext.Provider>
-    );
-};
-
-export default withSelectedAccountLoaded(
-    withCoinmarketLayoutWrap(DetailIndex, {
-        backRoute: 'wallet-coinmarket-exchange',
-    }),
-    {
-        title: 'TR_COINMARKET_SWAP',
-    },
-);
diff --git a/packages/suite/src/views/wallet/coinmarket/index.tsx b/packages/suite/src/views/wallet/coinmarket/index.tsx
index cc353c60215..5a1395282dc 100644
--- a/packages/suite/src/views/wallet/coinmarket/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/index.tsx
@@ -1,306 +1,6 @@
 import styled from 'styled-components';
-import {
-    variables,
-    SelectBar,
-    Paragraph,
-    TextButton,
-    Card,
-    Spinner,
-    Icon,
-} from '@trezor/components';
-import {
-    Elevation,
-    mapElevationToBackground,
-    nativeTypography,
-    nextElevation,
-    spacings,
-    spacingsPx,
-    typography,
-} from '@trezor/theme';
-import { SCREEN_QUERY } from '@trezor/components/src/config/variables';
-import { Margin } from 'recharts/types/util/types';
-import { CoinmarketCoinLogo } from './common/CoinmarketCoinLogo';
 
-interface ResponsiveSize {
-    $responsiveSize: keyof typeof variables.SCREEN_SIZE;
-}
-
-export const CoinmarketWrapper = `
-    display: flex;
-    justify-content: space-between;
-    padding-bottom: ${spacingsPx.xxxl};
-
-    ${SCREEN_QUERY.BELOW_LAPTOP} {
-        flex-wrap: wrap;
-    }
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-export const CoinmarketLeftWrapper = styled(Card)<{ $isWithoutPadding?: boolean }>`
-    padding: ${({ $isWithoutPadding }) =>
-        $isWithoutPadding ? 0 : `${spacingsPx.xl} ${spacingsPx.xl} ${spacingsPx.lg}`};
-    width: 60%;
-
-    ${SCREEN_QUERY.BELOW_DESKTOP} {
-        padding: ${spacingsPx.md};
-        width: 49%;
-    }
-
-    ${SCREEN_QUERY.BELOW_LAPTOP} {
-        width: 100%;
-        padding-bottom: ${spacingsPx.zero};
-    }
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-export const CoinmarketRightWrapper = styled(Card)`
-    padding: ${spacingsPx.xl} ${spacingsPx.xl} ${spacingsPx.xxxl};
-    width: 37%;
-
-    ${SCREEN_QUERY.BELOW_DESKTOP} {
-        padding: ${spacingsPx.md} ${spacingsPx.md} ${spacingsPx.xxl};
-        width: 49%;
-    }
-
-    ${SCREEN_QUERY.BELOW_LAPTOP} {
-        width: 100%;
-        margin-top: ${spacingsPx.sm};
-    }
-`;
-
-export const Wrapper = styled.div<ResponsiveSize>`
-    display: flex;
-    flex: 1;
-
-    @media screen and (min-width: ${props => variables.SCREEN_SIZE[props.$responsiveSize]}) {
-        flex-flow: wrap;
-    }
-
-    @media screen and (max-width: ${props => variables.SCREEN_SIZE[props.$responsiveSize]}) {
-        flex-direction: column;
-    }
-`;
-
-export const FullWidthForm = styled.form`
-    width: 100%;
-`;
-
-export const Left = styled.div`
-    display: flex;
-    flex: 1;
-`;
-
-export const Right = styled.div`
-    display: flex;
-    flex: 1;
-    justify-content: flex-end;
-`;
-
-export const Middle = styled.div<ResponsiveSize>`
-    display: flex;
-    min-width: 65px;
-    height: 48px;
-    align-items: center;
-    justify-content: center;
-
-    @media screen and (max-width: ${props => variables.SCREEN_SIZE[props.$responsiveSize]}) {
-        padding-bottom: 27px;
-    }
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-export const StyledIcon = styled(Icon)<ResponsiveSize>`
-    @media screen and (max-width: ${props => variables.SCREEN_SIZE[props.$responsiveSize]}) {
-        transform: rotate(90deg);
-    }
-`;
-
-export const FeesWrapper = styled.div`
-    margin: 25px 0;
-    border-top: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-`;
-
-export const NoProviders = styled.div`
-    display: flex;
-    font-size: ${variables.FONT_SIZE.BIG};
-`;
-
-export const FooterWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    padding-top: 30px;
-    border-top: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-
-    @media screen and (max-width: ${variables.SCREEN_SIZE.MD}) {
-        flex-direction: column;
-    }
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-export const StyledSelectBar = styled(SelectBar)`
-    width: 100%;
-
-    & div div {
-        justify-content: center;
-    }
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-export const CoinmarketParagraph = styled(Paragraph)`
-    text-align: center;
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
-
-export const CoinmarketFormInput = styled.div<{ $isWithoutPadding?: boolean }>`
-    position: relative;
-    padding-bottom: ${({ $isWithoutPadding }) =>
-        $isWithoutPadding ? spacings.zero : spacingsPx.md};
-
-    input {
-        color: ${({ theme }) => theme.textSubdued};
-    }
-`;
-
-export const CoinmarketFormInputInner = styled.div`
-    position: relative;
-`;
-
-export const CoinmarketFormInputLabelWrapper = styled.div`
-    display: flex;
-    justify-content: space-between;
-    padding-bottom: ${spacingsPx.xs};
-`;
-
-export const CoinmarketFormInputLabelText = styled.label`
-    ${typography.body}
-`;
-
-export const CoinmarketFormOption = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-export const CoinmarketFormOptionGroupLabel = styled.div`
-    color: ${({ theme }) => theme.textSubdued};
-`;
-
-export const CoinmarketFormOptionLogo = styled(CoinmarketCoinLogo)`
-    display: flex;
-    align-items: center;
-    margin-right: ${spacingsPx.xs};
-`;
-
-export const CoinmarketFormOptionLabel = styled.div<{ $isDark?: boolean }>`
-    color: ${({ theme, $isDark }) => ($isDark ? theme.textDefault : theme.textSubdued)};
-`;
-
-export const CoinmarketFormOptionLabelLong = styled.div`
-    padding-left: ${spacingsPx.sm};
-    padding-top: ${spacingsPx.xxxs};
-    ${typography.label}
-    color: ${({ theme }) => theme.textSubdued};
-`;
-
-export const CoinmarketFormOptionNetwork = styled.div<{ $elevation: Elevation }>`
-    padding: 2px 6px;
-    margin-left: 10px;
-    font-size: ${nativeTypography.label.fontSize}px;
-    background: ${({ theme, $elevation }) =>
-        mapElevationToBackground({ theme, $elevation: nextElevation[$elevation] })};
-    border-radius: 4px;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-export const CoinmarketTextButton = styled(TextButton)`
-    position: relative;
-    padding: 0;
-`;
-
-export const CoinmarketAmountContainer = styled.div`
-    display: flex;
-    align-items: center;
-    margin-top: ${spacingsPx.md};
-
-    ${SCREEN_QUERY.MOBILE} {
-        margin-top: ${spacingsPx.xs};
-    }
-`;
-
-export const CoinmarketAmountWrapper = styled.div`
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: ${spacingsPx.xs};
-    ${typography.titleMedium}
-    line-height: unset;
-    padding: ${spacingsPx.xxxs} ${spacingsPx.zero};
-
-    ${SCREEN_QUERY.BELOW_DESKTOP} {
-        font-size: 28px;
-    }
-
-    ${SCREEN_QUERY.BELOW_LAPTOP} {
-        font-size: ${nativeTypography.titleMedium.fontSize}px;
-    }
-
-    ${SCREEN_QUERY.MOBILE} {
-        font-size: ${nativeTypography.titleSmall.fontSize}px;
-        margin-top: ${spacingsPx.xs};
-    }
-`;
-
-export const CoinmarketAmountWrapperText = styled.div`
-    padding-right: ${spacingsPx.xs};
-    font-variant-numeric: tabular-nums;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    line-height: 1;
-`;
-
-export const CoinmarketInfoLeftColumn = styled.div`
-    display: flex;
-    flex: 1;
-    ${typography.hint}
-    color: ${({ theme }) => theme.textSubdued};
-`;
-
-export const CoinmarketInfoRightColumn = styled.div`
-    display: flex;
-    align-items: flex-end;
-    justify-content: center;
-    flex-direction: column;
-    flex: 1;
-    ${typography.body}
-    color: ${({ theme }) => theme.textDefault};
-`;
-
-export const CoinmarketInfoAmount = styled.div`
-    padding-left: ${spacingsPx.xs};
-`;
-
-export const CoinmarketBorder = styled.div<{ $margin?: Margin }>`
-    width: 100%;
-    height: 1px;
-    background: ${({ theme }) => theme.borderElevation1};
-    ${({ $margin }) =>
-        `margin: ${$margin?.top ?? spacings.zero}px ${$margin?.right ?? spacings.zero}px ${$margin?.bottom ?? spacings.zero}px ${$margin?.left ?? spacings.zero}px`};
-`;
-
-export const CoinmarketFormOfferSpinnerWrapper = styled.div`
-    width: 100%;
-    padding: ${spacingsPx.sm} 0;
-`;
-
-export const CoinmarketFormOfferSpinnerText = styled.div`
-    ${typography.hint}
-    color: ${({ theme }) => theme.textSubdued};
-    text-align: center;
-`;
-
-export const CoinmarketSpinnerWrapper = styled(Spinner)`
-    flex: none;
-    margin: 0 ${spacingsPx.xs};
-`;
+import { spacingsPx, typography } from '@trezor/theme';
 
 export const TooltipWrap = styled.div`
     display: flex;
@@ -352,3 +52,10 @@ export const TooltipText = styled.div<{ $isYellow?: boolean }>`
 `;
 
 export const CoinmarketTestWrapper = styled.div``;
+
+export const CoinmarketFooterLogoWrapper = styled.div`
+    display: flex;
+    align-items: center;
+    flex: 1;
+    padding-top: 1px;
+`;
diff --git a/packages/suite/src/views/wallet/coinmarket/redirect/index.tsx b/packages/suite/src/views/wallet/coinmarket/redirect/CoinmarketRedirect.tsx
similarity index 97%
rename from packages/suite/src/views/wallet/coinmarket/redirect/index.tsx
rename to packages/suite/src/views/wallet/coinmarket/redirect/CoinmarketRedirect.tsx
index d0f15624abc..ff0cc01cbdb 100644
--- a/packages/suite/src/views/wallet/coinmarket/redirect/index.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/redirect/CoinmarketRedirect.tsx
@@ -1,12 +1,15 @@
 import { useEffect } from 'react';
+
 import styled from 'styled-components';
+import { CryptoId } from 'invity-api';
+
+import { variables } from '@trezor/components';
+import { FeeLevel } from '@trezor/connect';
+
 import { useSelector } from 'src/hooks/suite';
 import { Account } from 'src/types/wallet';
-import { variables } from '@trezor/components';
 import { useCoinmarketRedirect } from 'src/hooks/wallet/useCoinmarketRedirect';
 import { Translation } from 'src/components/suite';
-import { FeeLevel } from '@trezor/connect';
-import { CryptoId } from 'invity-api';
 
 const Wrapper = styled.div`
     display: flex;
@@ -18,7 +21,7 @@ const Wrapper = styled.div`
     height: 100%;
 `;
 
-const CoinmarketRedirect = () => {
+export const CoinmarketRedirect = () => {
     const { redirectToOffers, redirectToDetail, redirectToSellOffers } = useCoinmarketRedirect();
     const router = useSelector(state => state.router);
 
@@ -79,5 +82,3 @@ const CoinmarketRedirect = () => {
         </Wrapper>
     );
 };
-
-export default CoinmarketRedirect;
diff --git a/packages/suite/src/views/wallet/coinmarket/sell_new/CoinmarketSellConfirm.tsx b/packages/suite/src/views/wallet/coinmarket/sell/CoinmarketSellConfirm.tsx
similarity index 57%
rename from packages/suite/src/views/wallet/coinmarket/sell_new/CoinmarketSellConfirm.tsx
rename to packages/suite/src/views/wallet/coinmarket/sell/CoinmarketSellConfirm.tsx
index e0999c17839..5a4e37e3d6e 100644
--- a/packages/suite/src/views/wallet/coinmarket/sell_new/CoinmarketSellConfirm.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/sell/CoinmarketSellConfirm.tsx
@@ -1,13 +1,12 @@
-import { withSelectedAccountLoaded } from 'src/components/wallet';
 import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
 import { CoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-import { withCoinmarketLayoutWrap } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/withCoinmarketLayoutWrap';
 import { CoinmarketSelectedOffer } from 'src/views/wallet/coinmarket/common/CoinmarketSelectedOffer/CoinmarketSelectedOffer';
 import { useCoinmarketSellForm } from 'src/hooks/wallet/coinmarket/form/useCoinmarketSellForm';
+import { CoinmarketContainer } from 'src/views/wallet/coinmarket/common/CoinmarketContainer';
 
-const CoinmarketSellConfirmComponent = (props: UseCoinmarketProps) => {
+const CoinmarketSellConfirmComponent = ({ selectedAccount }: UseCoinmarketProps) => {
     const coinmarketSellContextValues = useCoinmarketSellForm({
-        ...props,
+        selectedAccount,
         pageType: 'confirm',
     });
 
@@ -18,11 +17,6 @@ const CoinmarketSellConfirmComponent = (props: UseCoinmarketProps) => {
     );
 };
 
-export const CoinmarketSellConfirm = withSelectedAccountLoaded(
-    withCoinmarketLayoutWrap(CoinmarketSellConfirmComponent, {
-        backRoute: 'wallet-coinmarket-sell',
-    }),
-    {
-        title: 'TR_NAV_SELL',
-    },
+export const CoinmarketSellConfirm = () => (
+    <CoinmarketContainer SectionComponent={CoinmarketSellConfirmComponent} />
 );
diff --git a/packages/suite/src/views/wallet/coinmarket/sell/CoinmarketSellDetail.tsx b/packages/suite/src/views/wallet/coinmarket/sell/CoinmarketSellDetail.tsx
new file mode 100644
index 00000000000..e9e63522e93
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/sell/CoinmarketSellDetail.tsx
@@ -0,0 +1,24 @@
+import {
+    CoinmarketDetailContext,
+    useCoinmarketDetail,
+} from 'src/hooks/wallet/coinmarket/useCoinmarketDetail';
+import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
+import { CoinmarketContainer } from 'src/views/wallet/coinmarket/common/CoinmarketContainer';
+import { CoinmarketDetailSell } from 'src/views/wallet/coinmarket/common/CoinmarketDetail/CoinmarketDetailSell/CoinmarketDetailSell';
+
+const CoinmarketSellDetailComponent = ({ selectedAccount }: UseCoinmarketProps) => {
+    const coinmarketDetailContext = useCoinmarketDetail({
+        selectedAccount,
+        tradeType: 'sell',
+    });
+
+    return (
+        <CoinmarketDetailContext.Provider value={coinmarketDetailContext}>
+            <CoinmarketDetailSell />
+        </CoinmarketDetailContext.Provider>
+    );
+};
+
+export const CoinmarketSellDetail = () => (
+    <CoinmarketContainer SectionComponent={CoinmarketSellDetailComponent} />
+);
diff --git a/packages/suite/src/views/wallet/coinmarket/sell_new/CoinmarketSellForm.tsx b/packages/suite/src/views/wallet/coinmarket/sell/CoinmarketSellForm.tsx
similarity index 53%
rename from packages/suite/src/views/wallet/coinmarket/sell_new/CoinmarketSellForm.tsx
rename to packages/suite/src/views/wallet/coinmarket/sell/CoinmarketSellForm.tsx
index 5615f80663a..bd9ed6d6f5d 100644
--- a/packages/suite/src/views/wallet/coinmarket/sell_new/CoinmarketSellForm.tsx
+++ b/packages/suite/src/views/wallet/coinmarket/sell/CoinmarketSellForm.tsx
@@ -1,15 +1,15 @@
-import { withSelectedAccountLoaded } from 'src/components/wallet';
 import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
 import { CoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
 import { CoinmarketFormLayout } from 'src/views/wallet/coinmarket/common/CoinmarketForm/CoinmarketFormLayout';
-import CoinmarketLayout from 'src/views/wallet/coinmarket/common/CoinmarketLayoutNew/CoinmarketLayout';
+import { CoinmarketLayout } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/CoinmarketLayout';
 import { useCoinmarketSellForm } from 'src/hooks/wallet/coinmarket/form/useCoinmarketSellForm';
+import { CoinmarketContainer } from 'src/views/wallet/coinmarket/common/CoinmarketContainer';
 
-const CoinmarketSellFormComponent = (props: UseCoinmarketProps) => {
-    const coinmarketSellContextValues = useCoinmarketSellForm(props);
+const CoinmarketSellFormComponent = ({ selectedAccount }: UseCoinmarketProps) => {
+    const coinmarketSellContextValues = useCoinmarketSellForm({ selectedAccount });
 
     return (
-        <CoinmarketLayout selectedAccount={props.selectedAccount}>
+        <CoinmarketLayout>
             <CoinmarketFormContext.Provider value={coinmarketSellContextValues}>
                 <CoinmarketFormLayout />
             </CoinmarketFormContext.Provider>
@@ -17,6 +17,6 @@ const CoinmarketSellFormComponent = (props: UseCoinmarketProps) => {
     );
 };
 
-export const CoinmarketSellForm = withSelectedAccountLoaded(CoinmarketSellFormComponent, {
-    title: 'TR_NAV_SELL',
-});
+export const CoinmarketSellForm = () => (
+    <CoinmarketContainer SectionComponent={CoinmarketSellFormComponent} />
+);
diff --git a/packages/suite/src/views/wallet/coinmarket/sell/CoinmarketSellOffers.tsx b/packages/suite/src/views/wallet/coinmarket/sell/CoinmarketSellOffers.tsx
new file mode 100644
index 00000000000..8632620e9b0
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/sell/CoinmarketSellOffers.tsx
@@ -0,0 +1,21 @@
+import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
+import { CoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
+import { useCoinmarketSellForm } from 'src/hooks/wallet/coinmarket/form/useCoinmarketSellForm';
+import { CoinmarketOffers } from 'src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffers';
+import { CoinmarketContainer } from 'src/views/wallet/coinmarket/common/CoinmarketContainer';
+
+const CoinmarketSellOffersComponent = ({ selectedAccount }: UseCoinmarketProps) => {
+    const coinmarketSellFormContextValues = useCoinmarketSellForm({
+        selectedAccount,
+        pageType: 'offers',
+    });
+
+    return (
+        <CoinmarketFormContext.Provider value={coinmarketSellFormContextValues}>
+            <CoinmarketOffers />
+        </CoinmarketFormContext.Provider>
+    );
+};
+export const CoinmarketSellOffers = () => (
+    <CoinmarketContainer SectionComponent={CoinmarketSellOffersComponent} />
+);
diff --git a/packages/suite/src/views/wallet/coinmarket/sell_new/CoinmarketSellOffers.tsx b/packages/suite/src/views/wallet/coinmarket/sell_new/CoinmarketSellOffers.tsx
deleted file mode 100644
index f68d0ec5e64..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/sell_new/CoinmarketSellOffers.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { withSelectedAccountLoaded } from 'src/components/wallet';
-import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
-import { CoinmarketOffersContext } from 'src/hooks/wallet/coinmarket/offers/useCoinmarketCommonOffers';
-import { CoinmarketFormContext } from 'src/hooks/wallet/coinmarket/form/useCoinmarketCommonForm';
-import { useCoinmarketSellForm } from 'src/hooks/wallet/coinmarket/form/useCoinmarketSellForm';
-import { CoinmarketFooter } from 'src/views/wallet/coinmarket/common';
-import CoinmarketOffers from 'src/views/wallet/coinmarket/common/CoinmarketOffers/CoinmarketOffers';
-import { withCoinmarketLayoutWrap } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/withCoinmarketLayoutWrap';
-
-const CoinmarketSellOffersComponent = (props: UseCoinmarketProps) => {
-    const coinmarketSellFormContextValues = useCoinmarketSellForm({
-        ...props,
-        pageType: 'offers',
-    });
-
-    // CoinmarketOffersContext.Provider is temporary FIX
-    return (
-        <CoinmarketFormContext.Provider value={coinmarketSellFormContextValues}>
-            <CoinmarketOffersContext.Provider value={coinmarketSellFormContextValues}>
-                <CoinmarketOffers />
-                <CoinmarketFooter />
-            </CoinmarketOffersContext.Provider>
-        </CoinmarketFormContext.Provider>
-    );
-};
-export const CoinmarketSellOffers = withSelectedAccountLoaded(
-    withCoinmarketLayoutWrap(CoinmarketSellOffersComponent, {
-        backRoute: 'wallet-coinmarket-sell',
-    }),
-    {
-        title: 'TR_NAV_SELL',
-    },
-);
diff --git a/packages/suite/src/views/wallet/coinmarket/sell_new/detail/index.tsx b/packages/suite/src/views/wallet/coinmarket/sell_new/detail/index.tsx
deleted file mode 100644
index 773815d51ff..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/sell_new/detail/index.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import styled from 'styled-components';
-import Detail from './Detail';
-import { withSelectedAccountLoaded } from 'src/components/wallet';
-import {
-    CoinmarketDetailContext,
-    useCoinmarketDetail,
-} from 'src/hooks/wallet/coinmarket/useCoinmarketDetail';
-import { UseCoinmarketProps } from 'src/types/coinmarket/coinmarket';
-import { withCoinmarketLayoutWrap } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/withCoinmarketLayoutWrap';
-
-const Wrapper = styled.div`
-    display: flex;
-    width: 100%;
-    flex-direction: column;
-`;
-
-const DetailIndex = (props: UseCoinmarketProps) => {
-    const coinmarketDetailContext = useCoinmarketDetail({
-        selectedAccount: props.selectedAccount,
-        tradeType: 'sell',
-    });
-
-    return (
-        <CoinmarketDetailContext.Provider value={coinmarketDetailContext}>
-            <Wrapper>
-                <Detail />
-            </Wrapper>
-        </CoinmarketDetailContext.Provider>
-    );
-};
-
-export default withSelectedAccountLoaded(
-    withCoinmarketLayoutWrap(DetailIndex, {
-        backRoute: 'wallet-coinmarket-sell',
-    }),
-    {
-        title: 'TR_NAV_SELL',
-    },
-);
diff --git a/packages/suite/src/views/wallet/coinmarket/skeleton/index.tsx b/packages/suite/src/views/wallet/coinmarket/skeleton/index.tsx
deleted file mode 100644
index 0a722cbdcff..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/skeleton/index.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import styled from 'styled-components';
-
-import { SkeletonRectangle, SkeletonSpread, variables } from '@trezor/components';
-
-import { useLoadingSkeleton } from 'src/hooks/suite';
-import {
-    Wrapper,
-    Left,
-    Middle,
-    Right,
-    StyledIcon,
-    FooterWrapper,
-} from 'src/views/wallet/coinmarket';
-
-const SkeletonWrapper = styled.div`
-    display: flex;
-    width: 100%;
-
-    @media screen and (max-width: ${variables.SCREEN_SIZE.LG}) {
-        flex-direction: column;
-    }
-`;
-
-const FooterSkeletonWrapper = styled(FooterWrapper)`
-    justify-content: space-between;
-    width: 100%;
-`;
-
-const Divider = styled(Wrapper)`
-    display: flex;
-    border-top: 1px solid ${({ theme }) => theme.legacy.STROKE_GREY};
-    padding: 0;
-`;
-
-const StyledLeft = styled(Left)`
-    @media screen and (max-width: ${variables.SCREEN_SIZE.LG}) {
-        width: 100%;
-    }
-
-    @media screen and (max-width: ${variables.SCREEN_SIZE.MD}) {
-        margin-left: 0;
-        justify-content: center;
-    }
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledSkeletonRectangle = styled(SkeletonRectangle)`
-    margin-bottom: 27px;
-`;
-
-const StyledRight = styled(Right)`
-    @media screen and (max-width: ${variables.SCREEN_SIZE.LG}) {
-        margin-left: 0;
-        width: 100%;
-        justify-content: flex-end;
-    }
-
-    @media screen and (max-width: ${variables.SCREEN_SIZE.MD}) {
-        margin-top: 20px;
-        justify-content: center;
-    }
-`;
-
-export const CoinmarketSkeleton = () => {
-    const { shouldAnimate } = useLoadingSkeleton();
-
-    return (
-        <Wrapper $responsiveSize="LG">
-            <SkeletonWrapper>
-                <Left>
-                    <StyledSkeletonRectangle height="48px" width="100%" animate={shouldAnimate} />
-                </Left>
-                <Middle $responsiveSize="LG">
-                    <StyledIcon $responsiveSize="LG" name="transfer" size={16} />
-                </Middle>
-                <Right>
-                    <StyledSkeletonRectangle height="48px" width="100%" animate={shouldAnimate} />
-                </Right>
-            </SkeletonWrapper>
-            <SkeletonWrapper>
-                <Divider $responsiveSize="LG" />
-            </SkeletonWrapper>
-            <FooterSkeletonWrapper>
-                <StyledLeft>
-                    <SkeletonSpread $childMargin="0 8px 0 0" $alignItems="center">
-                        <SkeletonRectangle height="20px" width="68px" animate={shouldAnimate} />
-                        <SkeletonRectangle height="20px" width="180px" animate={shouldAnimate} />
-                    </SkeletonSpread>
-                </StyledLeft>
-                <StyledRight>
-                    <SkeletonRectangle height="38px" width="200px" animate={shouldAnimate} />
-                </StyledRight>
-            </FooterSkeletonWrapper>
-        </Wrapper>
-    );
-};
diff --git a/packages/suite/src/views/wallet/coinmarket/transactions/CoinmarketTransactions.tsx b/packages/suite/src/views/wallet/coinmarket/transactions/CoinmarketTransactions.tsx
new file mode 100644
index 00000000000..36ac61bc4e7
--- /dev/null
+++ b/packages/suite/src/views/wallet/coinmarket/transactions/CoinmarketTransactions.tsx
@@ -0,0 +1,6 @@
+import { CoinmarketContainer } from 'src/views/wallet/coinmarket/common/CoinmarketContainer';
+import { CoinmarketTransactionsList } from 'src/views/wallet/coinmarket/common/CoinmarketTransactions/CoinmarketTransactionsList';
+
+export const CoinmarketTransactions = () => (
+    <CoinmarketContainer SectionComponent={CoinmarketTransactionsList} />
+);
diff --git a/packages/suite/src/views/wallet/coinmarket/transactions/index.tsx b/packages/suite/src/views/wallet/coinmarket/transactions/index.tsx
deleted file mode 100644
index 433e9722f5a..00000000000
--- a/packages/suite/src/views/wallet/coinmarket/transactions/index.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { withSelectedAccountLoaded } from 'src/components/wallet';
-import { CoinmarketAccountTransactions } from '../common/CoinmarketLayout/CoinmarketAccountTransactions/CoinmarketAccountTransactions';
-import { withCoinmarketLayoutWrap } from 'src/views/wallet/coinmarket/common/CoinmarketLayout/withCoinmarketLayoutWrap';
-import { CoinmarketFooter } from 'src/views/wallet/coinmarket/common';
-
-const CoinmarketTransactions = () => {
-    return (
-        <>
-            <CoinmarketAccountTransactions />
-            <CoinmarketFooter />
-        </>
-    );
-};
-
-export default withSelectedAccountLoaded(
-    withCoinmarketLayoutWrap(CoinmarketTransactions, {
-        backRoute: 'wallet-coinmarket-buy',
-    }),
-    {
-        title: 'TR_NAV_BUY',
-    },
-);
diff --git a/packages/suite/src/views/wallet/details/CoinjoinLogs.tsx b/packages/suite/src/views/wallet/details/CoinjoinLogs.tsx
index fb50521a043..1a325f99f14 100644
--- a/packages/suite/src/views/wallet/details/CoinjoinLogs.tsx
+++ b/packages/suite/src/views/wallet/details/CoinjoinLogs.tsx
@@ -1,7 +1,9 @@
 import styled from 'styled-components';
+
 import { desktopApi } from '@trezor/suite-desktop-api';
-import { ActionButton, ActionColumn, TextColumn, Translation } from 'src/components/suite';
 import { Card } from '@trezor/components';
+
+import { ActionButton, ActionColumn, TextColumn, Translation } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite/useSelector';
 import { useAnchor } from 'src/hooks/suite/useAnchor';
 import { CoinjoinLogsAnchor } from 'src/constants/suite/anchors';
diff --git a/packages/suite/src/views/wallet/details/CoinjoinSetup/AnonymityLevelSetup.tsx b/packages/suite/src/views/wallet/details/CoinjoinSetup/AnonymityLevelSetup.tsx
index eeb2de9886b..c408200fb70 100644
--- a/packages/suite/src/views/wallet/details/CoinjoinSetup/AnonymityLevelSetup.tsx
+++ b/packages/suite/src/views/wallet/details/CoinjoinSetup/AnonymityLevelSetup.tsx
@@ -1,12 +1,15 @@
 import { useMemo, useState } from 'react';
+
 import { AnimatePresence, HTMLMotionProps, motion } from 'framer-motion';
 import styled, { useTheme } from 'styled-components';
 
+import { Icon, Banner, motionEasing } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { AnonymityStatus } from 'src/constants/suite/coinjoin';
 import { useAnonymityStatus, useDispatch } from 'src/hooks/suite';
-import { Icon, Banner, motionEasing } from '@trezor/components';
 import { coinjoinAccountUpdateAnonymity } from 'src/actions/wallet/coinjoinAccountActions';
+
 import { SetupSlider } from './SetupSlider/SetupSlider';
 
 const Label = styled.span`
diff --git a/packages/suite/src/views/wallet/details/CoinjoinSetup/CoinjoinSetup.tsx b/packages/suite/src/views/wallet/details/CoinjoinSetup/CoinjoinSetup.tsx
index 6ef24786126..03cb88f1354 100644
--- a/packages/suite/src/views/wallet/details/CoinjoinSetup/CoinjoinSetup.tsx
+++ b/packages/suite/src/views/wallet/details/CoinjoinSetup/CoinjoinSetup.tsx
@@ -1,15 +1,18 @@
 import { useDispatch } from 'react-redux';
+
 import { AnimatePresence, motion } from 'framer-motion';
 import styled from 'styled-components';
 
+import { Card, Radio, motionAnimation, motionEasing, Banner } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite/useSelector';
-import { Card, Radio, motionAnimation, motionEasing, Banner } from '@trezor/components';
 import { coinjoinAccountUpdateSetupOption } from 'src/actions/wallet/coinjoinAccountActions';
+import { selectCoinjoinAccountByKey } from 'src/reducers/wallet/coinjoinReducer';
+
 import { AnonymityLevelSetup } from './AnonymityLevelSetup';
 import { MaxMiningFeeSetup } from './MaxMiningFeeSetup';
 import { SkipRoundsSetup } from './SkipRoundsSetup';
-import { selectCoinjoinAccountByKey } from 'src/reducers/wallet/coinjoinReducer';
 
 const SetupContainer = styled.div`
     padding: 18px;
diff --git a/packages/suite/src/views/wallet/details/CoinjoinSetup/MaxMiningFeeSetup.tsx b/packages/suite/src/views/wallet/details/CoinjoinSetup/MaxMiningFeeSetup.tsx
index e10a507be01..e41931f15c8 100644
--- a/packages/suite/src/views/wallet/details/CoinjoinSetup/MaxMiningFeeSetup.tsx
+++ b/packages/suite/src/views/wallet/details/CoinjoinSetup/MaxMiningFeeSetup.tsx
@@ -1,13 +1,15 @@
 import { useTheme } from 'styled-components';
+
 import { Translation } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { coinjoinAccountUpdateMaxMiningFee } from 'src/actions/wallet/coinjoinAccountActions';
-import { SetupSlider } from './SetupSlider/SetupSlider';
 import {
     selectDefaultMaxMiningFeeByAccountKey,
     selectFeeRateMedianByAccountKey,
 } from 'src/reducers/wallet/coinjoinReducer';
 
+import { SetupSlider } from './SetupSlider/SetupSlider';
+
 const min = 1;
 const max = 500;
 const unit = 'sat/vB';
diff --git a/packages/suite/src/views/wallet/details/CoinjoinSetup/SetupSlider/SetupSlider.tsx b/packages/suite/src/views/wallet/details/CoinjoinSetup/SetupSlider/SetupSlider.tsx
index 75d30da7830..b627b5ab0bd 100644
--- a/packages/suite/src/views/wallet/details/CoinjoinSetup/SetupSlider/SetupSlider.tsx
+++ b/packages/suite/src/views/wallet/details/CoinjoinSetup/SetupSlider/SetupSlider.tsx
@@ -1,9 +1,12 @@
 import { useRef, ReactNode, KeyboardEventHandler, ChangeEventHandler } from 'react';
+
 import styled from 'styled-components';
 
-import { useSelector } from 'src/hooks/suite/useSelector';
 import { Range, RangeProps, variables } from '@trezor/components';
+
+import { useSelector } from 'src/hooks/suite/useSelector';
 import { selectCurrentCoinjoinSession } from 'src/reducers/wallet/coinjoinReducer';
+
 import { SliderInput, SliderInputProps } from './SliderInput';
 
 const Row = styled.div`
diff --git a/packages/suite/src/views/wallet/details/CoinjoinSetup/SetupSlider/SliderInput.tsx b/packages/suite/src/views/wallet/details/CoinjoinSetup/SetupSlider/SliderInput.tsx
index 61f2e4bf7b2..61d83f36f80 100644
--- a/packages/suite/src/views/wallet/details/CoinjoinSetup/SetupSlider/SliderInput.tsx
+++ b/packages/suite/src/views/wallet/details/CoinjoinSetup/SetupSlider/SliderInput.tsx
@@ -7,7 +7,9 @@ import {
     KeyboardEvent,
     ChangeEvent,
 } from 'react';
+
 import styled from 'styled-components';
+
 import { Input, InputProps, variables } from '@trezor/components';
 
 const LevelContainer = styled.div`
diff --git a/packages/suite/src/views/wallet/details/CoinjoinSetup/SkipRoundsSetup.tsx b/packages/suite/src/views/wallet/details/CoinjoinSetup/SkipRoundsSetup.tsx
index 7be0f4e889e..2108dd286a3 100644
--- a/packages/suite/src/views/wallet/details/CoinjoinSetup/SkipRoundsSetup.tsx
+++ b/packages/suite/src/views/wallet/details/CoinjoinSetup/SkipRoundsSetup.tsx
@@ -1,9 +1,11 @@
 import { useDispatch } from 'react-redux';
+
 import styled from 'styled-components';
 
+import { Switch, variables } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useSelector } from 'src/hooks/suite/useSelector';
-import { Switch, variables } from '@trezor/components';
 import { coinjoinAccountToggleSkipRounds } from 'src/actions/wallet/coinjoinAccountActions';
 import { selectCurrentCoinjoinSession } from 'src/reducers/wallet/coinjoinReducer';
 
diff --git a/packages/suite/src/views/wallet/details/RescanAccount.tsx b/packages/suite/src/views/wallet/details/RescanAccount.tsx
index 1bafb84fe3d..d11e65d8a2e 100644
--- a/packages/suite/src/views/wallet/details/RescanAccount.tsx
+++ b/packages/suite/src/views/wallet/details/RescanAccount.tsx
@@ -2,6 +2,7 @@ import { ActionButton, ActionColumn, TextColumn, Translation } from 'src/compone
 import { useDispatch } from 'src/hooks/suite/useDispatch';
 import { rescanCoinjoinAccount } from 'src/actions/wallet/coinjoinAccountActions';
 import type { Account } from 'src/types/wallet';
+
 import { Row } from './Row';
 
 type RescanAccountProps = {
diff --git a/packages/suite/src/views/wallet/details/Row.tsx b/packages/suite/src/views/wallet/details/Row.tsx
index da286d0cda9..ca5dba06d1d 100644
--- a/packages/suite/src/views/wallet/details/Row.tsx
+++ b/packages/suite/src/views/wallet/details/Row.tsx
@@ -1,5 +1,6 @@
-import { Row as RowComponent } from '@trezor/components';
 import { ReactNode } from 'react';
+
+import { Row as RowComponent } from '@trezor/components';
 import { spacings } from '@trezor/theme';
 
 interface RowProps {
diff --git a/packages/suite/src/views/wallet/details/index.tsx b/packages/suite/src/views/wallet/details/index.tsx
index 2de0522e95f..1c85062612e 100644
--- a/packages/suite/src/views/wallet/details/index.tsx
+++ b/packages/suite/src/views/wallet/details/index.tsx
@@ -2,20 +2,20 @@ import styled from 'styled-components';
 
 import { getAccountTypeTech } from '@suite-common/wallet-utils';
 import { Paragraph, variables, Card, Column } from '@trezor/components';
+import { HELP_CENTER_BIP32_URL, HELP_CENTER_XPUB_URL } from '@trezor/urls';
+import { spacings } from '@trezor/theme';
 
 import { ActionButton, ActionColumn, TextColumn, Translation } from 'src/components/suite';
-
-import { HELP_CENTER_BIP32_URL, HELP_CENTER_XPUB_URL } from '@trezor/urls';
 import { showXpub } from 'src/actions/wallet/publicKeyActions';
 import { WalletLayout } from 'src/components/wallet';
 import { useDevice, useDispatch, useSelector } from 'src/hooks/suite';
+import { AccountTypeDescription } from 'src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AccountTypeSelect/AccountTypeDescription';
+import { AccountTypeBadge } from 'src/components/suite/AccountTypeBadge';
+
 import { CoinjoinLogs } from './CoinjoinLogs';
 import { CoinjoinSetup } from './CoinjoinSetup/CoinjoinSetup';
 import { RescanAccount } from './RescanAccount';
-import { spacings } from '@trezor/theme';
 import { Row } from './Row';
-import { AccountTypeDescription } from 'src/components/suite/modals/ReduxModal/UserContextModal/AddAccountModal/AccountTypeSelect/AccountTypeDescription';
-import { AccountTypeBadge } from 'src/components/suite/AccountTypeBadge';
 
 const Heading = styled.h3`
     color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
diff --git a/packages/suite/src/views/wallet/receive/Receive.tsx b/packages/suite/src/views/wallet/receive/Receive.tsx
index f44c9edf2ef..0ffb0c5a946 100644
--- a/packages/suite/src/views/wallet/receive/Receive.tsx
+++ b/packages/suite/src/views/wallet/receive/Receive.tsx
@@ -1,15 +1,15 @@
 import { selectDevice, selectPendingAccountAddresses } from '@suite-common/wallet-core';
+import { Column } from '@trezor/components';
+import { spacings } from '@trezor/theme';
 
 import { WalletLayout, WalletSubpageHeading } from 'src/components/wallet';
 import { useDevice, useSelector } from 'src/hooks/suite';
+import { ConfirmEvmExplanationModal } from 'src/components/suite/modals';
 
 import { FreshAddress } from './components/FreshAddress';
 import { UsedAddresses } from './components/UsedAddresses';
 import { CoinjoinReceiveWarning } from './components/CoinjoinReceiveWarning';
-import { ConfirmEvmExplanationModal } from 'src/components/suite/modals';
 import { ConnectDeviceReceivePromo } from './components/ConnectDevicePromo';
-import { Column } from '@trezor/components';
-import { spacings } from '@trezor/theme';
 
 export const Receive = () => {
     const isCoinjoinReceiveWarningHidden = useSelector(
diff --git a/packages/suite/src/views/wallet/receive/components/CoinjoinReceiveWarning.tsx b/packages/suite/src/views/wallet/receive/components/CoinjoinReceiveWarning.tsx
index 42364b81571..a515c8a333c 100644
--- a/packages/suite/src/views/wallet/receive/components/CoinjoinReceiveWarning.tsx
+++ b/packages/suite/src/views/wallet/receive/components/CoinjoinReceiveWarning.tsx
@@ -1,8 +1,10 @@
 import styled, { useTheme } from 'styled-components';
 import { darken } from 'polished';
+
+import { Button, Icon, variables, Banner } from '@trezor/components';
+
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { Translation } from 'src/components/suite';
-import { Button, Icon, variables, Banner } from '@trezor/components';
 import { hideCoinjoinReceiveWarning } from 'src/actions/suite/suiteActions';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 
diff --git a/packages/suite/src/views/wallet/receive/components/ConnectDevicePromo.tsx b/packages/suite/src/views/wallet/receive/components/ConnectDevicePromo.tsx
index 038eb17ec38..c24ee6c55c9 100644
--- a/packages/suite/src/views/wallet/receive/components/ConnectDevicePromo.tsx
+++ b/packages/suite/src/views/wallet/receive/components/ConnectDevicePromo.tsx
@@ -1,9 +1,11 @@
 import { Column, Image, Text, Banner } from '@trezor/components';
-import { useSelector } from '../../../../hooks/suite';
 import { selectDevice } from '@suite-common/wallet-core';
 import { DEFAULT_FLAGSHIP_MODEL } from '@suite-common/suite-constants';
+
 import { Translation } from 'src/components/suite';
 
+import { useSelector } from '../../../../hooks/suite';
+
 type ConnectDevicePromoProps = {
     title: JSX.Element | string;
     description: JSX.Element | string;
diff --git a/packages/suite/src/views/wallet/receive/components/FreshAddress.tsx b/packages/suite/src/views/wallet/receive/components/FreshAddress.tsx
index e35fc42be98..4b17ddb9b6f 100644
--- a/packages/suite/src/views/wallet/receive/components/FreshAddress.tsx
+++ b/packages/suite/src/views/wallet/receive/components/FreshAddress.tsx
@@ -1,17 +1,19 @@
 import { useMemo } from 'react';
+
 import styled from 'styled-components';
 
-import { Translation, QuestionTooltip, ReadMoreLink } from 'src/components/suite';
-import { AppState } from 'src/types/suite';
-import { showAddress } from 'src/actions/wallet/receiveActions';
-import { useDispatch, useSelector } from 'src/hooks/suite/';
 import { Button, Card, variables, H2, Tooltip, GradientOverlay } from '@trezor/components';
 import { getFirstFreshAddress } from '@suite-common/wallet-utils';
 import { AccountsRootState, selectIsAccountUtxoBased } from '@suite-common/wallet-core';
 import { networks } from '@suite-common/wallet-config';
-import { EvmExplanationBox } from 'src/components/wallet/EvmExplanationBox';
 import { spacingsPx, typography } from '@trezor/theme';
-import { selectIsFirmwareRevisionCheckEnabledAndFailed } from 'src/reducers/suite/suiteReducer';
+
+import { Translation, QuestionTooltip, ReadMoreLink } from 'src/components/suite';
+import { AppState } from 'src/types/suite';
+import { showAddress } from 'src/actions/wallet/receiveActions';
+import { useDispatch, useSelector } from 'src/hooks/suite/';
+import { EvmExplanationBox } from 'src/components/wallet/EvmExplanationBox';
+import { selectIsFirmwareAuthenticityCheckEnabledAndFailed } from 'src/reducers/suite/suiteReducer';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledCard = styled(Card)`
@@ -126,7 +128,9 @@ export const FreshAddress = ({
     const isAccountUtxoBased = useSelector((state: AccountsRootState) =>
         selectIsAccountUtxoBased(state, account?.key ?? ''),
     );
-    const isRevisionCheckFailed = useSelector(selectIsFirmwareRevisionCheckEnabledAndFailed);
+    const isAuthenticityCheckFailed = useSelector(
+        selectIsFirmwareAuthenticityCheckEnabledAndFailed,
+    );
     const dispatch = useDispatch();
 
     const firstFreshAddress = useMemo(() => {
@@ -158,7 +162,7 @@ export const FreshAddress = ({
         if (!firstFreshAddress) {
             return <Translation id="RECEIVE_ADDRESS_LIMIT_REACHED" />;
         }
-        if (isRevisionCheckFailed) {
+        if (isAuthenticityCheckFailed) {
             return <Translation id="TR_RECEIVE_ADDRESS_SECURITY_CHECK_FAILED" />;
         }
 
@@ -173,7 +177,7 @@ export const FreshAddress = ({
             locked ||
             coinjoinDisallowReveal ||
             !firstFreshAddress ||
-            isRevisionCheckFailed,
+            isAuthenticityCheckFailed,
         isLoading: locked,
     };
 
diff --git a/packages/suite/src/views/wallet/receive/components/Header.tsx b/packages/suite/src/views/wallet/receive/components/Header.tsx
index 50ac6c8ca8d..4d7073d851d 100644
--- a/packages/suite/src/views/wallet/receive/components/Header.tsx
+++ b/packages/suite/src/views/wallet/receive/components/Header.tsx
@@ -1,6 +1,8 @@
+import styled from 'styled-components';
+
 import { H2, Paragraph } from '@trezor/components';
+
 import { Account } from 'src/types/wallet';
-import styled from 'styled-components';
 import { Translation } from 'src/components/suite';
 
 const Content = styled.div`
diff --git a/packages/suite/src/views/wallet/receive/components/UsedAddresses.tsx b/packages/suite/src/views/wallet/receive/components/UsedAddresses.tsx
index 84a25bf4f91..0e2df8a850c 100644
--- a/packages/suite/src/views/wallet/receive/components/UsedAddresses.tsx
+++ b/packages/suite/src/views/wallet/receive/components/UsedAddresses.tsx
@@ -1,9 +1,19 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
 
 import { AccountAddress } from '@trezor/connect';
-import { Card, Button, Column, GradientOverlay, Tooltip } from '@trezor/components';
-import { spacings, spacingsPx, typography } from '@trezor/theme';
+import {
+    Card,
+    Button,
+    Column,
+    Row,
+    GradientOverlay,
+    Tooltip,
+    Table,
+    Text,
+} from '@trezor/components';
+import { spacings } from '@trezor/theme';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { formatNetworkAmount } from '@suite-common/wallet-utils';
 
@@ -13,133 +23,64 @@ import { MetadataAddPayload } from 'src/types/suite/metadata';
 import { showAddress } from 'src/actions/wallet/receiveActions';
 import { useDispatch, useSelector } from 'src/hooks/suite/';
 import { selectLabelingDataForSelectedAccount } from 'src/reducers/suite/metadataReducer';
-import { selectIsFirmwareRevisionCheckEnabledAndFailed } from 'src/reducers/suite/suiteReducer';
-
-const GridTable = styled.div`
-    display: grid;
-    grid-template-columns: auto 0.3fr 0.3fr;
-    width: 100%;
-    ${typography.hint}
-`;
-
-// min-width: 0; // to resolve an issue with truncate text
-const GridItem = styled.div<{
-    $revealed?: boolean;
-    onClick?: () => void;
-    $align?: 'left' | 'right';
-}>`
-    min-width: 0;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    white-space: nowrap;
-    padding: ${spacingsPx.md} 0 ${spacingsPx.sm};
-    font-variant-numeric: tabular-nums;
-    ${typography.hint}
-    ${({ $align }) => ($align === 'right' ? `justify-content:flex-end` : '')};
-    cursor: ${({ onClick }) => onClick && 'pointer'};
-
-    :nth-child(3n + 2) {
-        padding-right: ${spacingsPx.md};
-    }
-
-    :nth-last-child(-n + 3) {
-        border: 0;
-    }
-`;
-
-const GridItemRevealAddress = styled(GridItem)`
-    justify-content: flex-end;
-`;
-
-const GridItemAddress = styled(GridItem)`
-    font-variant-numeric: tabular-nums slashed-zero;
-
-    /* these two ensure proper metadata behavior */
-    white-space: nowrap;
-    overflow: hidden;
-`;
+import { selectIsFirmwareAuthenticityCheckEnabledAndFailed } from 'src/reducers/suite/suiteReducer';
 
 const AddressActions = styled.div<{ $isVisible?: boolean }>`
     opacity: ${({ $isVisible }) => ($isVisible ? '1' : '0')};
 `;
 
-const Gray = styled.span`
-    color: ${({ theme }) => theme.textSubdued};
-`;
-
-const HeaderItem = styled(GridItem)`
-    position: sticky;
-    top: 0;
-    color: ${({ theme }) => theme.textSubdued};
-    border-bottom: 1px solid ${({ theme }) => theme.borderElevation2};
-    padding: 0 0 ${spacingsPx.sm};
-`;
-
-const Actions = styled.div`
-    display: flex;
-    justify-content: center;
-    margin: 16px 0;
-
-    button + button {
-        margin-left: 16px;
-    }
-`;
-
-const AddressWrapper = styled.span`
-    text-overflow: ellipsis;
+const AddressWrapper = styled.div`
+    white-space: nowrap;
     overflow: hidden;
     position: relative;
+    font-variant-numeric: tabular-nums slashed-zero;
 `;
 
 const DEFAULT_LIMIT = 10;
 
-interface ItemProps {
+type ItemProps = {
     index: number;
     addr: AccountAddress;
     locked: boolean;
     symbol: NetworkSymbol;
     metadataPayload: MetadataAddPayload;
     onClick: () => void;
-}
+};
 
 const Item = ({ addr, locked, symbol, onClick, metadataPayload, index }: ItemProps) => {
-    const isRevisionCheckFailed = useSelector(selectIsFirmwareRevisionCheckEnabledAndFailed);
+    const isAuthenticityCheckFailed = useSelector(
+        selectIsFirmwareAuthenticityCheckEnabledAndFailed,
+    );
     const [isHovered, setIsHovered] = useState(false);
 
     const amount = formatNetworkAmount(addr.received || '0', symbol);
     const fresh = !addr.transfers;
     const address = addr.address.substring(0, 20);
-    const isDisabled = locked || isRevisionCheckFailed;
-    const tooltipContent = isRevisionCheckFailed ? (
+    const isDisabled = locked || isAuthenticityCheckFailed;
+    const tooltipContent = isAuthenticityCheckFailed ? (
         <Translation id="TR_RECEIVE_ADDRESS_SECURITY_CHECK_FAILED" />
     ) : null;
 
     return (
-        <>
-            <GridItemAddress
-                data-testid={`@wallet/receive/used-address/${index}`}
-                onMouseEnter={() => setIsHovered(true)}
-                onMouseLeave={() => setIsHovered(false)}
-            >
-                <MetadataLabeling
-                    payload={{
-                        ...metadataPayload,
-                    }}
-                    visible={isHovered}
-                    // if metadata is present, confirm on device option will become available in dropdown
-                    defaultVisibleValue={
-                        <AddressWrapper>
-                            <GradientOverlay hiddenFrom="120px" />
-                            {address}
-                        </AddressWrapper>
-                    }
-                />
-            </GridItemAddress>
-            <GridItemRevealAddress
-                onMouseEnter={() => setIsHovered(true)}
-                onMouseLeave={() => setIsHovered(false)}
-            >
+        <Table.Row onHover={setIsHovered}>
+            <Table.Cell>
+                <Text typographyStyle="hint" data-testid={`@wallet/receive/used-address/${index}`}>
+                    <MetadataLabeling
+                        payload={{
+                            ...metadataPayload,
+                        }}
+                        visible={isHovered}
+                        // if metadata is present, confirm on device option will become available in dropdown
+                        defaultVisibleValue={
+                            <AddressWrapper>
+                                <GradientOverlay hiddenFrom="120px" />
+                                {address}
+                            </AddressWrapper>
+                        }
+                    />
+                </Text>
+            </Table.Cell>
+            <Table.Cell align="right">
                 <AddressActions $isVisible={isHovered}>
                     <Tooltip content={tooltipContent}>
                         <Button
@@ -154,22 +95,20 @@ const Item = ({ addr, locked, symbol, onClick, metadataPayload, index }: ItemPro
                         </Button>
                     </Tooltip>
                 </AddressActions>
-            </GridItemRevealAddress>
-
-            <GridItem
-                onMouseEnter={() => setIsHovered(true)}
-                onMouseLeave={() => setIsHovered(false)}
-                $align="right"
-            >
-                {!fresh && <FormattedCryptoAmount value={amount} symbol={symbol} />}
-
-                {fresh && (
-                    <Gray>
-                        <Translation id="RECEIVE_TABLE_NOT_USED" />
-                    </Gray>
-                )}
-            </GridItem>
-        </>
+            </Table.Cell>
+
+            <Table.Cell align="right">
+                <Text typographyStyle="hint">
+                    {fresh ? (
+                        <Text variant="tertiary">
+                            <Translation id="RECEIVE_TABLE_NOT_USED" />
+                        </Text>
+                    ) : (
+                        <FormattedCryptoAmount value={amount} symbol={symbol} />
+                    )}
+                </Text>
+            </Table.Cell>
+        </Table.Row>
     );
 };
 
@@ -226,37 +165,42 @@ export const UsedAddresses = ({
     const actionHideVisible = limit > DEFAULT_LIMIT;
 
     return (
-        <Card margin={{ bottom: spacings.xxxl }} overflow="hidden" paddingType="large">
-            <Column>
-                <GridTable>
-                    <HeaderItem>
-                        <Translation id="RECEIVE_TABLE_ADDRESS" />
-                    </HeaderItem>
-                    <HeaderItem />
-                    <HeaderItem $align="right">
-                        <Translation id="RECEIVE_TABLE_RECEIVED" />
-                    </HeaderItem>
-
-                    {list.slice(0, limit).map((addr, index) => (
-                        <Item
-                            index={index}
-                            key={addr.path}
-                            addr={addr}
-                            symbol={account.symbol}
-                            locked={locked}
-                            metadataPayload={{
-                                type: 'addressLabel',
-                                entityKey: account.key,
-                                defaultValue: addr.address,
-                                value: addressLabels[addr.address],
-                            }}
-                            onClick={() => dispatch(showAddress(addr.path, addr.address))}
-                        />
-                    ))}
-                </GridTable>
+        <Card overflow="hidden" paddingType="none">
+            <Column alignItems="stretch" gap={spacings.md}>
+                <Table margin={{ top: spacings.xs, bottom: spacings.xs }}>
+                    <Table.Header>
+                        <Table.Row>
+                            <Table.Cell>
+                                <Translation id="RECEIVE_TABLE_ADDRESS" />
+                            </Table.Cell>
+                            <Table.Cell />
+                            <Table.Cell align="right">
+                                <Translation id="RECEIVE_TABLE_RECEIVED" />
+                            </Table.Cell>
+                        </Table.Row>
+                    </Table.Header>
+                    <Table.Body>
+                        {list.slice(0, limit).map((addr, index) => (
+                            <Item
+                                index={index}
+                                key={addr.path}
+                                addr={addr}
+                                symbol={account.symbol}
+                                locked={locked}
+                                metadataPayload={{
+                                    type: 'addressLabel',
+                                    entityKey: account.key,
+                                    defaultValue: addr.address,
+                                    value: addressLabels[addr.address],
+                                }}
+                                onClick={() => dispatch(showAddress(addr.path, addr.address))}
+                            />
+                        ))}
+                    </Table.Body>
+                </Table>
 
                 {actionButtonsVisible && (
-                    <Actions>
+                    <Row justifyContent="center" gap={spacings.md}>
                         {actionShowVisible && (
                             <Button
                                 variant="tertiary"
@@ -278,7 +222,7 @@ export const UsedAddresses = ({
                                 <Translation id="TR_SHOW_LESS" />
                             </Button>
                         )}
-                    </Actions>
+                    </Row>
                 )}
             </Column>
         </Card>
diff --git a/packages/suite/src/views/wallet/send/Options/BitcoinOptions/BitcoinOptions.tsx b/packages/suite/src/views/wallet/send/Options/BitcoinOptions/BitcoinOptions.tsx
index 867189ee37e..782bf347286 100644
--- a/packages/suite/src/views/wallet/send/Options/BitcoinOptions/BitcoinOptions.tsx
+++ b/packages/suite/src/views/wallet/send/Options/BitcoinOptions/BitcoinOptions.tsx
@@ -1,16 +1,19 @@
 import { useWatch } from 'react-hook-form';
+
 import styled from 'styled-components';
 
 import { Button, Tooltip, variables } from '@trezor/components';
 import { spacingsPx } from '@trezor/theme';
+import { selectNetworkBlockchainInfo } from '@suite-common/wallet-core';
+
 import { Translation } from 'src/components/suite';
 import { useSendFormContext } from 'src/hooks/wallet';
 import { OpenGuideFromTooltip } from 'src/components/guide';
+import { useSelector } from 'src/hooks/suite';
+
 import { Locktime } from './Locktime/Locktime';
 import { CoinControl } from './CoinControl/CoinControl';
 import { OnOffSwitcher } from '../OnOffSwitcher';
-import { selectNetworkBlockchainInfo } from '@suite-common/wallet-core';
-import { useSelector } from 'src/hooks/suite';
 import { canLocktimeTxBeBroadcast } from './Locktime/canLocktimeTxBeBroadcast';
 
 const Wrapper = styled.div`
@@ -92,7 +95,7 @@ export const BitcoinOptions = () => {
         setDraftSaveRequest(true);
     };
 
-    const blockchain = useSelector(selectNetworkBlockchainInfo(network.symbol));
+    const blockchain = useSelector(state => selectNetworkBlockchainInfo(state, network.symbol));
 
     const locktime = watch('bitcoinLockTime');
 
diff --git a/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/CoinControl.tsx b/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/CoinControl.tsx
index bf61ce180b1..a7a7d0aadf7 100644
--- a/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/CoinControl.tsx
+++ b/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/CoinControl.tsx
@@ -1,22 +1,25 @@
 import { useEffect, useState } from 'react';
+
 import styled, { useTheme } from 'styled-components';
 
 import { typography } from '@trezor/theme';
 import { COMPOSE_ERROR_TYPES } from '@suite-common/wallet-constants';
 import { fetchAllTransactionsForAccountThunk } from '@suite-common/wallet-core';
 import { getTxsPerPage } from '@suite-common/suite-utils';
-import { amountToSatoshi, formatNetworkAmount } from '@suite-common/wallet-utils';
+import { amountToSmallestUnit, formatNetworkAmount } from '@suite-common/wallet-utils';
+import { Card, Checkbox, Icon, Switch, variables } from '@trezor/components';
+
 import { FormattedCryptoAmount, Translation } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { Pagination } from 'src/components/wallet';
-import { Card, Checkbox, Icon, Switch, variables } from '@trezor/components';
 import { useSendFormContext } from 'src/hooks/wallet';
 import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
 import { selectCurrentTargetAnonymity } from 'src/reducers/wallet/coinjoinReducer';
 import { selectLabelingDataForSelectedAccount } from 'src/reducers/suite/metadataReducer';
+import { filterAndCategorizeUtxos } from 'src/utils/wallet/filterAndCategorizeUtxosUtils';
+
 import { UtxoSelectionList } from './UtxoSelectionList';
 import { UtxoSearch } from './UtxoSearch';
-import { filterAndCategorizeUtxos } from 'src/utils/wallet/filterAndCategorizeUtxosUtils';
 
 const Row = styled.div`
     align-items: center;
@@ -115,7 +118,7 @@ export const CoinControl = ({ close }: CoinControlProps) => {
     );
     const totalOutputsInSats = shouldSendInSats
         ? totalOutputs
-        : Number(amountToSatoshi(totalOutputs.toString(), network.decimals));
+        : Number(amountToSmallestUnit(totalOutputs.toString(), network.decimals));
     const missingToInput = totalOutputsInSats - totalInputs;
     const isMissingToAmount = missingToInput > 0; // relevant when the amount field is not validated, e.g. there is an error in the address
     const missingAmountTooBig = missingToInput > Number.MAX_SAFE_INTEGER;
diff --git a/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoSearch.tsx b/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoSearch.tsx
index c46ea9eb21a..4f611a280ed 100644
--- a/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoSearch.tsx
+++ b/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoSearch.tsx
@@ -1,6 +1,9 @@
 import { useCallback, useRef, Dispatch, SetStateAction, ChangeEvent, KeyboardEvent } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+
 import { Input, Icon, KEYBOARD_CODE } from '@trezor/components';
+
 import { useTranslation } from 'src/hooks/suite/useTranslation';
 
 const Container = styled.div`
diff --git a/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoSelection.tsx b/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoSelection.tsx
index 197434bc295..864c7490d6c 100644
--- a/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoSelection.tsx
+++ b/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoSelection.tsx
@@ -1,9 +1,11 @@
 import { MouseEventHandler } from 'react';
+
 import styled, { css, useTheme } from 'styled-components';
 
 import { formatNetworkAmount, isSameUtxo } from '@suite-common/wallet-utils';
 import { Checkbox, Spinner, TextButton, Tooltip } from '@trezor/components';
 import type { AccountUtxo } from '@trezor/connect';
+import { borders, spacingsPx, typography } from '@trezor/theme';
 
 import { openModal } from 'src/actions/suite/modalActions';
 import {
@@ -17,12 +19,12 @@ import { TransactionTimestamp, UtxoAnonymity } from 'src/components/wallet';
 import { useSendFormContext } from 'src/hooks/wallet';
 import { useCoinjoinUnavailableUtxos } from 'src/hooks/wallet/form/useCoinjoinUnavailableUtxos';
 import { WalletAccountTransaction } from 'src/types/wallet';
-import { UtxoTag } from './UtxoTag';
 import {
     selectIsLabelingInitPossible,
     selectLabelingDataForSelectedAccount,
 } from 'src/reducers/suite/metadataReducer';
-import { borders, spacingsPx, typography } from '@trezor/theme';
+
+import { UtxoTag } from './UtxoTag';
 
 const transitionSpeed = '0.16s';
 
diff --git a/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoSelectionList.tsx b/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoSelectionList.tsx
index 3e8322b5fc1..e4850aa1b82 100644
--- a/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoSelectionList.tsx
+++ b/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoSelectionList.tsx
@@ -1,12 +1,16 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
 import { transparentize } from 'polished';
 
 import { selectAccountTransactionsWithNulls } from '@suite-common/wallet-core';
 import { Icon, variables, IconName } from '@trezor/components';
-import { useSelector } from 'src/hooks/suite';
 import type { AccountUtxo } from '@trezor/connect';
+import { CSSColor } from '@trezor/theme';
+
+import { useSelector } from 'src/hooks/suite';
 import { useSendFormContext } from 'src/hooks/wallet';
+
 import { UtxoSelection } from './UtxoSelection';
 
 const Wrapper = styled.section`
@@ -46,7 +50,7 @@ interface UtxoSelectionListProps {
     description: ReactNode;
     heading: ReactNode;
     icon: IconName;
-    iconColor?: string;
+    iconColor?: CSSColor;
     utxos: AccountUtxo[];
     withHeader: boolean;
 }
diff --git a/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoTag.tsx b/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoTag.tsx
index d4348154ced..364ba5c30d4 100644
--- a/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoTag.tsx
+++ b/packages/suite/src/views/wallet/send/Options/BitcoinOptions/CoinControl/UtxoTag.tsx
@@ -1,9 +1,11 @@
 import { ReactNode } from 'react';
+
 import { Icon, Tooltip, IconName } from '@trezor/components';
+import { CSSColor } from '@trezor/theme';
 
 interface UtxoTagProps {
     icon: IconName;
-    iconColor: string;
+    iconColor: CSSColor;
     tooltipMessage: ReactNode;
 }
 
diff --git a/packages/suite/src/views/wallet/send/Options/BitcoinOptions/Locktime/Locktime.tsx b/packages/suite/src/views/wallet/send/Options/BitcoinOptions/Locktime/Locktime.tsx
index d0384d728d4..a92f1af31f4 100644
--- a/packages/suite/src/views/wallet/send/Options/BitcoinOptions/Locktime/Locktime.tsx
+++ b/packages/suite/src/views/wallet/send/Options/BitcoinOptions/Locktime/Locktime.tsx
@@ -1,13 +1,17 @@
-import { BigNumber } from '@trezor/utils/src/bigNumber';
+import { useEffect } from 'react';
+
 import styled from 'styled-components';
-import { NumberInput, Translation } from 'src/components/suite';
-import { useSendFormContext } from 'src/hooks/wallet';
+
+import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { Card, Icon, IconButton } from '@trezor/components';
 import { getInputState, isInteger } from '@suite-common/wallet-utils';
-import { useSelector, useTranslation } from 'src/hooks/suite';
 import { spacingsPx } from '@trezor/theme';
 import { selectNetworkBlockchainInfo } from '@suite-common/wallet-core';
-import { useEffect } from 'react';
+
+import { useSelector, useTranslation } from 'src/hooks/suite';
+import { useSendFormContext } from 'src/hooks/wallet';
+import { NumberInput, Translation } from 'src/components/suite';
+
 import { canLocktimeTxBeBroadcast } from './canLocktimeTxBeBroadcast';
 
 const Label = styled.div`
@@ -31,7 +35,7 @@ export const Locktime = ({ close }: LocktimeProps) => {
         watch,
     } = useSendFormContext();
 
-    const blockchain = useSelector(selectNetworkBlockchainInfo(network.symbol));
+    const blockchain = useSelector(state => selectNetworkBlockchainInfo(state, network.symbol));
 
     const { translationString } = useTranslation();
 
diff --git a/packages/suite/src/views/wallet/send/Options/CardanoOptions.tsx b/packages/suite/src/views/wallet/send/Options/CardanoOptions.tsx
index e007299bc23..0083409a76a 100644
--- a/packages/suite/src/views/wallet/send/Options/CardanoOptions.tsx
+++ b/packages/suite/src/views/wallet/send/Options/CardanoOptions.tsx
@@ -1,6 +1,8 @@
 import styled from 'styled-components';
+
 import { Button, variables } from '@trezor/components';
 import { spacingsPx } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite';
 import { useSendFormContext } from 'src/hooks/wallet';
 
diff --git a/packages/suite/src/views/wallet/send/Options/EthereumOptions/EthereumData.tsx b/packages/suite/src/views/wallet/send/Options/EthereumOptions/EthereumData.tsx
index 3cc193dd1fc..4f04e402479 100644
--- a/packages/suite/src/views/wallet/send/Options/EthereumOptions/EthereumData.tsx
+++ b/packages/suite/src/views/wallet/send/Options/EthereumOptions/EthereumData.tsx
@@ -1,13 +1,16 @@
 import { useEffect } from 'react';
+
 import styled from 'styled-components';
+
 import { Textarea, Icon } from '@trezor/components';
-import { Translation } from 'src/components/suite';
-import { useSendFormContext } from 'src/hooks/wallet';
 import { getInputState, isHexValid } from '@suite-common/wallet-utils';
 import { formInputsMaxLength } from '@suite-common/validators';
-import { useTranslation } from 'src/hooks/suite';
 import { spacingsPx } from '@trezor/theme';
 
+import { Translation } from 'src/components/suite';
+import { useSendFormContext } from 'src/hooks/wallet';
+import { useTranslation } from 'src/hooks/suite';
+
 const inputAsciiName = 'ethereumDataAscii';
 const inputHexName = 'ethereumDataHex';
 const inputAmountName = 'outputs.0.amount';
diff --git a/packages/suite/src/views/wallet/send/Options/EthereumOptions/EthereumOptions.tsx b/packages/suite/src/views/wallet/send/Options/EthereumOptions/EthereumOptions.tsx
index f076776d653..d8821dff25c 100644
--- a/packages/suite/src/views/wallet/send/Options/EthereumOptions/EthereumOptions.tsx
+++ b/packages/suite/src/views/wallet/send/Options/EthereumOptions/EthereumOptions.tsx
@@ -2,8 +2,10 @@ import styled from 'styled-components';
 
 import { FormOptions } from '@suite-common/wallet-types';
 import { Button, Tooltip } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { useSendFormContext } from 'src/hooks/wallet';
+
 import { EthereumData } from './EthereumData';
 import { OnOffSwitcher } from '../OnOffSwitcher';
 
diff --git a/packages/suite/src/views/wallet/send/Options/OnOffSwitcher.tsx b/packages/suite/src/views/wallet/send/Options/OnOffSwitcher.tsx
index c8e66487956..cca77415a69 100644
--- a/packages/suite/src/views/wallet/send/Options/OnOffSwitcher.tsx
+++ b/packages/suite/src/views/wallet/send/Options/OnOffSwitcher.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { Translation } from 'src/components/suite';
 
 const Wrapper = styled.div`
diff --git a/packages/suite/src/views/wallet/send/Options/RippleOptions/DestinationTag.tsx b/packages/suite/src/views/wallet/send/Options/RippleOptions/DestinationTag.tsx
index 58f28b2089c..5a7a3f79b0e 100644
--- a/packages/suite/src/views/wallet/send/Options/RippleOptions/DestinationTag.tsx
+++ b/packages/suite/src/views/wallet/send/Options/RippleOptions/DestinationTag.tsx
@@ -1,12 +1,13 @@
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { Input, Icon } from '@trezor/components';
-import { Translation } from 'src/components/suite';
-import { useSendFormContext } from 'src/hooks/wallet';
 import { getInputState, isInteger } from '@suite-common/wallet-utils';
 import { U_INT_32 } from '@suite-common/wallet-constants';
-import { useTranslation } from 'src/hooks/suite';
 import { formInputsMaxLength } from '@suite-common/validators';
 
+import { Translation } from 'src/components/suite';
+import { useSendFormContext } from 'src/hooks/wallet';
+import { useTranslation } from 'src/hooks/suite';
+
 interface DestinationTagProps {
     close: () => void;
 }
diff --git a/packages/suite/src/views/wallet/send/Options/RippleOptions/RippleOptions.tsx b/packages/suite/src/views/wallet/send/Options/RippleOptions/RippleOptions.tsx
index 8974ce80c08..725f05007cc 100644
--- a/packages/suite/src/views/wallet/send/Options/RippleOptions/RippleOptions.tsx
+++ b/packages/suite/src/views/wallet/send/Options/RippleOptions/RippleOptions.tsx
@@ -1,8 +1,10 @@
 import styled from 'styled-components';
 
 import { Button, Tooltip } from '@trezor/components';
+
 import { useSendFormContext } from 'src/hooks/wallet';
 import { Translation } from 'src/components/suite';
+
 import { DestinationTag } from './DestinationTag';
 import { OnOffSwitcher } from '../OnOffSwitcher';
 
diff --git a/packages/suite/src/views/wallet/send/Outputs/Address.tsx b/packages/suite/src/views/wallet/send/Outputs/Address.tsx
index e1077d3dcb5..249e9d2e501 100644
--- a/packages/suite/src/views/wallet/send/Outputs/Address.tsx
+++ b/packages/suite/src/views/wallet/send/Outputs/Address.tsx
@@ -1,15 +1,23 @@
 import { useCallback, useState } from 'react';
+
 import { checkAddressCheckSum, toChecksumAddress } from 'web3-utils';
 import styled, { useTheme } from 'styled-components';
 
-import { Input, Button, IconButton, getInputStateTextColor, Icon } from '@trezor/components';
+import {
+    Input,
+    Button,
+    IconButton,
+    getInputStateTextColor,
+    Icon,
+    Link,
+    Row,
+} from '@trezor/components';
 import { capitalizeFirstLetter } from '@trezor/utils';
 import * as URLS from '@trezor/urls';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { formInputsMaxLength } from '@suite-common/validators';
 import type { Output } from '@suite-common/wallet-types';
 import TrezorConnect from '@trezor/connect';
-import { useSelector } from 'src/hooks/suite';
 import {
     isAddressValid,
     isAddressDeprecated,
@@ -17,23 +25,21 @@ import {
     isBech32AddressUppercase,
     getInputState,
 } from '@suite-common/wallet-utils';
-
-import { AddressLabeling, MetadataLabeling } from 'src/components/suite';
-import { Link } from '@trezor/components';
-import { Translation } from '../../../../components/suite/Translation';
+import { getNetworkSymbolForProtocol } from '@suite-common/suite-utils';
+import { HELP_CENTER_EVM_ADDRESS_CHECKSUM } from '@trezor/urls';
+import { spacings } from '@trezor/theme';
+import { CoinLogo } from '@trezor/product-components';
 
 import { scanOrRequestSendFormThunk } from 'src/actions/wallet/send/sendFormThunks';
-import { useDevice, useDispatch, useTranslation } from 'src/hooks/suite';
 import { useSendFormContext } from 'src/hooks/wallet';
 import { getProtocolInfo } from 'src/utils/suite/protocol';
-import { PROTOCOL_TO_NETWORK } from 'src/constants/suite/protocol';
 import { InputError } from 'src/components/wallet';
 import { InputErrorProps } from 'src/components/wallet/InputError';
-import { Row } from '@trezor/components';
+import { AddressLabeling, MetadataLabeling } from 'src/components/suite';
+import { useSelector, useDevice, useDispatch, useTranslation } from 'src/hooks/suite';
+import { captureSentryMessage } from 'src/utils/suite/sentry';
 
-import { HELP_CENTER_EVM_ADDRESS_CHECKSUM } from '@trezor/urls';
-import { spacings } from '@trezor/theme';
-import { CoinLogo } from '@trezor/product-components';
+import { Translation } from '../../../../components/suite/Translation';
 
 const Container = styled.div`
     position: relative;
@@ -112,9 +118,22 @@ export const Address = ({ output, outputId, outputsCount }: AddressProps) => {
 
         const protocol = getProtocolInfo(uri);
 
-        if (protocol) {
-            const isSymbolValidProtocol = PROTOCOL_TO_NETWORK[protocol.scheme] === symbol;
+        if (protocol && 'error' in protocol) {
+            dispatch(
+                notificationsActions.addToast({
+                    type: 'qr-unknown-scheme-protocol',
+                    scheme: protocol.scheme,
+                    error: protocol.error,
+                }),
+            );
+
+            captureSentryMessage(`QR code with unknown scheme: ${protocol.scheme}`);
+
+            return;
+        }
 
+        if (protocol && 'scheme' in protocol) {
+            const isSymbolValidProtocol = getNetworkSymbolForProtocol(protocol.scheme) === symbol; //is protocol valid for this account network
             if (!isSymbolValidProtocol) {
                 dispatch(
                     notificationsActions.addToast({
@@ -306,7 +325,7 @@ export const Address = ({ output, outputId, outputsCount }: AddressProps) => {
 
     const getBottomTextIconComponent = () => {
         if (hasAddressChecksummed) {
-            return <Icon name="check" size="medium" color="iconDisabled" />;
+            return <Icon name="check" size="medium" color={theme.iconDisabled} />;
         }
 
         if (isAddressWithLabel) {
diff --git a/packages/suite/src/views/wallet/send/Outputs/Amount/Amount.tsx b/packages/suite/src/views/wallet/send/Outputs/Amount/Amount.tsx
index 568e4b7413f..fea8cde2686 100644
--- a/packages/suite/src/views/wallet/send/Outputs/Amount/Amount.tsx
+++ b/packages/suite/src/views/wallet/send/Outputs/Amount/Amount.tsx
@@ -1,16 +1,14 @@
 import { useCallback } from 'react';
-import { BigNumber } from '@trezor/utils/src/bigNumber';
-import styled, { useTheme } from 'styled-components';
 
-import { Icon, Banner, variables } from '@trezor/components';
-import { breakpointMediaQueries } from '@trezor/styles';
-import { spacingsPx } from '@trezor/theme';
+import { BigNumber } from '@trezor/utils/src/bigNumber';
+import { Icon, Banner, Flex, Row, Text, variables, useMediaQuery } from '@trezor/components';
+import { spacings } from '@trezor/theme';
 import { FiatCurrencyCode } from '@suite-common/suite-config';
 import { formInputsMaxLength } from '@suite-common/validators';
 import { selectFiatRatesByFiatRateKey } from '@suite-common/wallet-core';
 import { Output, TokenAddress } from '@suite-common/wallet-types';
 import {
-    amountToSatoshi,
+    amountToSmallestUnit,
     formatNetworkAmount,
     hasNetworkFeatures,
     isLowAnonymityWarning,
@@ -30,80 +28,15 @@ import {
     validateReserveOrBalance,
 } from 'src/utils/suite/validation';
 import { formatTokenSymbol } from 'src/utils/wallet/tokenUtils';
+
 import { TokenSelect } from './TokenSelect';
 import { FiatInput } from './FiatInput';
 import { SendMaxSwitch } from './SendMaxSwitch';
 
-const Row = styled.div`
-    position: relative;
-    display: flex;
-    flex: 1;
-
-    ${breakpointMediaQueries.below_lg} {
-        flex-direction: column;
-        gap: ${spacingsPx.sm};
-    }
-`;
-
-const Heading = styled.div`
-    display: flex;
-    flex-direction: column;
-    white-space: nowrap;
-`;
-
-const AmountInput = styled(NumberInput)`
-    display: flex;
-    flex: 1;
-` as typeof NumberInput; // Styled wrapper doesn't preserve type argument, see https://github.com/styled-components/styled-components/issues/1803#issuecomment-857092410
-
-const Left = styled.div`
-    position: relative; /* for TokenBalance positioning */
-    display: flex;
-    flex: 1;
-`;
-
-const TokenBalance = styled.div`
-    font-size: ${variables.FONT_SIZE.TINY};
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-    height: 18px;
-`;
-
-const TokenBalanceValue = styled.span`
-    font-weight: ${variables.FONT_WEIGHT.DEMI_BOLD};
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledTransferIcon = styled(Icon)`
-    margin: 0 20px 46px;
-    align-self: end;
-
-    ${breakpointMediaQueries.below_lg} {
-        align-self: center;
-        margin: 0;
-        transform: rotate(90deg);
-    }
-`;
-
-const Right = styled.div`
-    display: flex;
-    flex: 1;
-    align-items: end;
-`;
-
-const Symbol = styled.span`
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-    font-size: ${variables.FONT_SIZE.SMALL};
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-`;
-
-const WarningWrapper = styled.div`
-    margin-bottom: 8px;
-`;
-
-interface AmountProps {
+type AmountProps = {
     output: Partial<Output>;
     outputId: number;
-}
+};
 export const Amount = ({ output, outputId }: AmountProps) => {
     const { translationString } = useTranslation();
     const {
@@ -120,9 +53,8 @@ export const Amount = ({ output, outputId }: AmountProps) => {
         composeTransaction,
     } = useSendFormContext();
     const { symbol, tokens } = account;
-
-    const theme = useTheme();
     const { shouldSendInSats } = useBitcoinAmountUnit(symbol);
+    const isBelowLaptop = useMediaQuery(`(max-width: ${variables.SCREEN_SIZE.LG})`);
 
     const amountName = `outputs.${outputId}.amount` as const;
     const currencyName = `outputs.${outputId}.currency.value` as const;
@@ -199,7 +131,7 @@ export const Amount = ({ output, outputId }: AmountProps) => {
 
                 if (dust && amountBig.lt(dust)) {
                     if (shouldSendInSats) {
-                        dust = amountToSatoshi(dust, decimals);
+                        dust = amountToSmallestUnit(dust, decimals);
                     }
 
                     return translationString('AMOUNT_IS_BELOW_DUST', {
@@ -223,99 +155,94 @@ export const Amount = ({ output, outputId }: AmountProps) => {
     const isTokenSelected = !!token;
     const tokenBalance = isTokenSelected ? (
         <HiddenPlaceholder>
-            <TokenBalanceValue>{`${token.balance} ${formatTokenSymbol(token?.symbol || token.contract)}`}</TokenBalanceValue>
+            {`${token.balance} ${formatTokenSymbol(token?.symbol || token.contract)}`}
         </HiddenPlaceholder>
     ) : undefined;
 
-    const getSendMaxSwitchComponent = (
-        hideOnLargeScreens: boolean | undefined,
-        hideOnSmallScreens: boolean | undefined,
-    ) => (
+    const sendMaxSwitch = (
         <SendMaxSwitch
-            hideOnLargeScreens={hideOnLargeScreens}
-            hideOnSmallScreens={hideOnSmallScreens}
             isSetMaxActive={isSetMaxActive}
-            data-testid={!hideOnSmallScreens ? maxSwitchId : ''}
+            data-testid={maxSwitchId}
             onChange={onSwitchChange}
         />
     );
 
     return (
         <>
-            <Row>
-                <Left>
-                    <AmountInput
-                        inputState={inputState}
-                        labelHoverRight={
-                            !isSetMaxVisible && getSendMaxSwitchComponent(isWithRate, undefined)
-                        }
-                        labelRight={
-                            isSetMaxVisible && getSendMaxSwitchComponent(isWithRate, undefined)
-                        }
-                        labelLeft={
-                            <Heading>
-                                <Translation id="AMOUNT" />
-                                {isTokenSelected && (
-                                    <TokenBalance>
-                                        (
-                                        <Translation
-                                            id="TOKEN_BALANCE"
-                                            values={{ balance: tokenBalance }}
-                                        />
-                                        )
-                                    </TokenBalance>
-                                )}
-                            </Heading>
-                        }
-                        bottomText={bottomText || null}
-                        onChange={handleInputChange}
-                        name={amountName}
-                        data-testid={amountName}
-                        defaultValue={amountValue}
-                        maxLength={formInputsMaxLength.amount}
-                        rules={cryptoAmountRules}
-                        control={control}
-                        innerAddon={
-                            withTokens ? (
-                                <TokenSelect output={output} outputId={outputId} />
-                            ) : (
-                                <Symbol>{symbolToUse}</Symbol>
-                            )
-                        }
-                    />
-                </Left>
+            <Flex
+                direction={isBelowLaptop ? 'column' : 'row'}
+                alignItems="normal"
+                gap={spacings.sm}
+            >
+                <NumberInput
+                    inputState={inputState}
+                    labelHoverRight={
+                        !isSetMaxVisible && (!isWithRate || isBelowLaptop) && sendMaxSwitch
+                    }
+                    labelRight={isSetMaxVisible && (!isWithRate || isBelowLaptop) && sendMaxSwitch}
+                    labelLeft={
+                        <Row gap={spacings.sm} alignItems="baseline">
+                            <Translation id="AMOUNT" />
+                            {isTokenSelected && (
+                                <Text variant="tertiary" typographyStyle="label">
+                                    (
+                                    <Translation
+                                        id="TOKEN_BALANCE"
+                                        values={{ balance: tokenBalance }}
+                                    />
+                                    )
+                                </Text>
+                            )}
+                        </Row>
+                    }
+                    bottomText={bottomText || null}
+                    onChange={handleInputChange}
+                    name={amountName}
+                    data-testid={amountName}
+                    defaultValue={amountValue}
+                    maxLength={formInputsMaxLength.amount}
+                    rules={cryptoAmountRules}
+                    control={control}
+                    innerAddon={
+                        withTokens ? (
+                            <TokenSelect output={output} outputId={outputId} />
+                        ) : (
+                            <Text variant="tertiary" typographyStyle="hint">
+                                {symbolToUse}
+                            </Text>
+                        )
+                    }
+                />
 
                 {isWithRate && (
                     <FiatValue amount="1" symbol={symbol} fiatCurrency={localCurrencyOption.value}>
                         {({ rate }) =>
                             rate && (
                                 <>
-                                    <StyledTransferIcon
-                                        name="transfer"
-                                        size={16}
-                                        color={theme.legacy.TYPE_LIGHT_GREY}
+                                    <Icon
+                                        name={isBelowLaptop ? 'arrowsDownUp' : 'arrowsLeftRight'}
+                                        size={20}
+                                        variant="tertiary"
+                                        margin={{ top: isBelowLaptop ? 0 : spacings.xxxxl }}
+                                    />
+                                    <FiatInput
+                                        output={output}
+                                        outputId={outputId}
+                                        // To fix alignment with the other input
+                                        labelLeft={isBelowLaptop ? undefined : <>&nbsp;</>}
+                                        labelRight={!isBelowLaptop && sendMaxSwitch}
                                     />
-
-                                    <Right>
-                                        <FiatInput
-                                            output={output}
-                                            outputId={outputId}
-                                            labelRight={getSendMaxSwitchComponent(undefined, true)}
-                                        />
-                                    </Right>
                                 </>
                             )
                         }
                     </FiatValue>
                 )}
-            </Row>
+            </Flex>
 
             {isLowAnonymity && (
-                <WarningWrapper>
-                    <Banner icon>
-                        <Translation id="TR_NOT_ENOUGH_ANONYMIZED_FUNDS_WARNING" />
-                    </Banner>
-                </WarningWrapper>
+                <Banner icon margin={{ top: spacings.sm }}>
+                    <Translation id="TR_NOT_ENOUGH_ANONYMIZED_FUNDS_WARNING" />
+                </Banner>
             )}
         </>
     );
diff --git a/packages/suite/src/views/wallet/send/Outputs/Amount/FiatInput.tsx b/packages/suite/src/views/wallet/send/Outputs/Amount/FiatInput.tsx
index bc6dec4edd2..280411eb31c 100644
--- a/packages/suite/src/views/wallet/send/Outputs/Amount/FiatInput.tsx
+++ b/packages/suite/src/views/wallet/send/Outputs/Amount/FiatInput.tsx
@@ -1,31 +1,38 @@
 import { useCallback } from 'react';
-import { Timestamp, TokenAddress, FiatRatesResult } from '@suite-common/wallet-types';
-import { BigNumber } from '@trezor/utils/src/bigNumber';
-import styled from 'styled-components';
 import { Controller } from 'react-hook-form';
+import { useDispatch } from 'react-redux';
+
+import styled from 'styled-components';
 
+import {
+    Timestamp,
+    TokenAddress,
+    FiatRatesResult,
+    CurrencyOption,
+    Output,
+} from '@suite-common/wallet-types';
+import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { Select } from '@trezor/components';
-import { useSendFormContext } from 'src/hooks/wallet';
 import {
     fromFiatCurrency,
     getInputState,
     findToken,
     isLowAnonymityWarning,
-    amountToSatoshi,
+    amountToSmallestUnit,
     formatAmount,
     buildCurrencyOptions,
     getFiatRateKey,
 } from '@suite-common/wallet-utils';
-import { CurrencyOption, Output } from '@suite-common/wallet-types';
 import { formInputsMaxLength } from '@suite-common/validators';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+import { FiatCurrencyCode } from '@suite-common/suite-config';
+import { selectFiatRatesByFiatRateKey, updateFiatRatesThunk } from '@suite-common/wallet-core';
+
+import { useSendFormContext } from 'src/hooks/wallet';
 import { useBitcoinAmountUnit } from 'src/hooks/wallet/useBitcoinAmountUnit';
 import { NumberInput } from 'src/components/suite';
 import { useSelector, useTranslation } from 'src/hooks/suite';
 import { validateDecimals } from 'src/utils/suite/validation';
-import { NetworkSymbol } from '@suite-common/wallet-config';
-import { FiatCurrencyCode } from '@suite-common/suite-config';
-import { selectFiatRatesByFiatRateKey, updateFiatRatesThunk } from '@suite-common/wallet-core';
-import { useDispatch } from 'react-redux';
 
 const Wrapper = styled.div`
     display: flex;
@@ -37,11 +44,18 @@ const Wrapper = styled.div`
 type FiatInputProps = {
     output: Partial<Output>;
     outputId: number;
+    labelLeft?: React.ReactNode;
     labelHoverRight?: React.ReactNode;
     labelRight?: React.ReactNode;
 };
 
-export const FiatInput = ({ output, outputId, labelHoverRight, labelRight }: FiatInputProps) => {
+export const FiatInput = ({
+    output,
+    outputId,
+    labelLeft,
+    labelHoverRight,
+    labelRight,
+}: FiatInputProps) => {
     const {
         account,
         network,
@@ -136,7 +150,7 @@ export const FiatInput = ({ output, outputId, labelHoverRight, labelRight }: Fia
             const amount = fiatRate?.rate ? fromFiatCurrency(value, decimals, fiatRate.rate) : null;
 
             const formattedAmount = shouldSendInSats
-                ? amountToSatoshi(amount || '0', decimals)
+                ? amountToSmallestUnit(amount || '0', decimals)
                 : amount;
 
             if (formattedAmount) {
@@ -226,6 +240,7 @@ export const FiatInput = ({ output, outputId, labelHoverRight, labelRight }: Fia
             <NumberInput
                 labelHoverRight={labelHoverRight}
                 labelRight={labelRight}
+                labelLeft={labelLeft}
                 control={control}
                 inputState={inputState}
                 onChange={handleChange}
diff --git a/packages/suite/src/views/wallet/send/Outputs/Amount/SendMaxSwitch.tsx b/packages/suite/src/views/wallet/send/Outputs/Amount/SendMaxSwitch.tsx
index abe8330b502..b0dc204fdb0 100644
--- a/packages/suite/src/views/wallet/send/Outputs/Amount/SendMaxSwitch.tsx
+++ b/packages/suite/src/views/wallet/send/Outputs/Amount/SendMaxSwitch.tsx
@@ -1,52 +1,19 @@
 import { Switch } from '@trezor/components';
-import { breakpointMediaQueries } from '@trezor/styles';
-import { spacingsPx } from '@trezor/theme';
-import { Translation } from 'src/components/suite';
-import styled, { css } from 'styled-components';
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledSwitch = styled(Switch)<{
-    $hideOnLargeScreens?: boolean;
-    $hideOnSmallScreens?: boolean;
-}>`
-    ${({ $hideOnLargeScreens }) =>
-        $hideOnLargeScreens === true &&
-        css`
-            ${breakpointMediaQueries.lg} {
-                display: none;
-            }
-        `}
-    ${({ $hideOnSmallScreens }) =>
-        $hideOnSmallScreens &&
-        css`
-            ${breakpointMediaQueries.below_lg} {
-                display: none;
-            }
-        `}
 
-    ${breakpointMediaQueries.below_md} {
-        gap: ${spacingsPx.xs};
-    }
-`;
+import { Translation } from 'src/components/suite';
 
-interface SendMaxSwitchProps {
-    hideOnLargeScreens?: boolean;
-    hideOnSmallScreens?: boolean;
+type SendMaxSwitchProps = {
     isSetMaxActive: boolean;
     'data-testid'?: string;
     onChange: () => void;
-}
+};
 
 export const SendMaxSwitch = ({
     isSetMaxActive,
     'data-testid': dataTest,
     onChange,
-    hideOnLargeScreens,
-    hideOnSmallScreens,
 }: SendMaxSwitchProps) => (
-    <StyledSwitch
-        $hideOnLargeScreens={hideOnLargeScreens}
-        $hideOnSmallScreens={hideOnSmallScreens}
+    <Switch
         labelPosition="left"
         isChecked={isSetMaxActive}
         data-testid={dataTest}
diff --git a/packages/suite/src/views/wallet/send/Outputs/Amount/TokenSelect.tsx b/packages/suite/src/views/wallet/send/Outputs/Amount/TokenSelect.tsx
index df70bef983b..44c89194025 100644
--- a/packages/suite/src/views/wallet/send/Outputs/Amount/TokenSelect.tsx
+++ b/packages/suite/src/views/wallet/send/Outputs/Amount/TokenSelect.tsx
@@ -1,15 +1,19 @@
 import { useMemo, useEffect } from 'react';
 import { Controller } from 'react-hook-form';
-import { Select } from '@trezor/components';
+
 import styled from 'styled-components';
+
+import { Select } from '@trezor/components';
+import { Output, Timestamp, TokenAddress } from '@suite-common/wallet-types';
+import { updateFiatRatesThunk, selectCurrentFiatRates } from '@suite-common/wallet-core';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+import { FiatCurrencyCode } from '@suite-common/suite-config';
+import { TokenDefinitions, selectCoinDefinitions } from '@suite-common/token-definitions';
+
 import { useSendFormContext } from 'src/hooks/wallet';
 import { Account } from 'src/types/wallet';
-import { Output } from '@suite-common/wallet-types';
 import { useDispatch, useSelector } from 'src/hooks/suite';
-import { updateFiatRatesThunk, selectCurrentFiatRates } from '@suite-common/wallet-core';
-import { Timestamp, TokenAddress } from '@suite-common/wallet-types';
 import { TooltipSymbol, Translation } from 'src/components/suite';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 import {
     enhanceTokensWithRates,
     formatTokenSymbol,
@@ -17,8 +21,6 @@ import {
     sortTokensWithRates,
 } from 'src/utils/wallet/tokenUtils';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
-import { FiatCurrencyCode } from '@suite-common/suite-config';
-import { TokenDefinitions, selectCoinDefinitions } from '@suite-common/token-definitions';
 import { SUITE } from 'src/actions/suite/constants';
 
 const UnrecognizedTokensHeading = styled.div`
diff --git a/packages/suite/src/views/wallet/send/Outputs/OpReturn.tsx b/packages/suite/src/views/wallet/send/Outputs/OpReturn.tsx
index 25096d39c67..2f2b3a98b57 100644
--- a/packages/suite/src/views/wallet/send/Outputs/OpReturn.tsx
+++ b/packages/suite/src/views/wallet/send/Outputs/OpReturn.tsx
@@ -1,13 +1,15 @@
 import styled from 'styled-components';
-import { useSendFormContext } from 'src/hooks/wallet';
-import { Translation } from 'src/components/suite';
+
 import { Textarea, IconButton, Row, Tooltip, variables } from '@trezor/components';
 import { getInputState, isHexValid } from '@suite-common/wallet-utils';
-import { OpenGuideFromTooltip } from 'src/components/guide';
 import { formInputsMaxLength } from '@suite-common/validators';
-import { useTranslation } from 'src/hooks/suite';
 import { spacingsPx } from '@trezor/theme';
 
+import { useSendFormContext } from 'src/hooks/wallet';
+import { Translation } from 'src/components/suite';
+import { OpenGuideFromTooltip } from 'src/components/guide';
+import { useTranslation } from 'src/hooks/suite';
+
 const Inputs = styled.div`
     display: flex;
     place-items: center space-between;
diff --git a/packages/suite/src/views/wallet/send/Outputs/Outputs.tsx b/packages/suite/src/views/wallet/send/Outputs/Outputs.tsx
index efae8549e88..54a7d1d980e 100644
--- a/packages/suite/src/views/wallet/send/Outputs/Outputs.tsx
+++ b/packages/suite/src/views/wallet/send/Outputs/Outputs.tsx
@@ -1,19 +1,21 @@
 import { useEffect, useLayoutEffect, useRef, useState } from 'react';
+
 import styled from 'styled-components';
 import { motion } from 'framer-motion';
 
-import { Card, motionEasing } from '@trezor/components';
+import { Card, motionEasing, Column } from '@trezor/components';
 import { motionEasingStrings } from '@trezor/components/src/config/motion';
-import { spacingsPx } from '@trezor/theme';
+import { spacingsPx, spacings } from '@trezor/theme';
 import { networks } from '@suite-common/wallet-config';
+import { CoinLogo } from '@trezor/product-components';
 
 import { useSendFormContext } from 'src/hooks/wallet';
 import { useLayoutSize } from 'src/hooks/suite';
 import { Translation } from 'src/components/suite';
+
 import { Address } from './Address';
 import { Amount } from './Amount/Amount';
 import { OpReturn } from './OpReturn';
-import { CoinLogo } from '@trezor/product-components';
 
 const Container = styled.div<{ $height: number }>`
     height: ${({ $height }) => ($height ? `${$height}px` : 'auto')};
@@ -97,14 +99,14 @@ export const Outputs = ({ disableAnim }: OutputsProps) => {
                             {output.type === 'opreturn' ? (
                                 <OpReturn outputId={index} />
                             ) : (
-                                <>
+                                <Column gap={spacings.md} alignItems="stretch">
                                     <Address
                                         output={outputs[index]}
                                         outputId={index}
                                         outputsCount={outputs.length}
                                     />
                                     <Amount output={outputs[index]} outputId={index} />
-                                </>
+                                </Column>
                             )}
                         </Card>
                     </motion.div>
diff --git a/packages/suite/src/views/wallet/send/SendHeader.tsx b/packages/suite/src/views/wallet/send/SendHeader.tsx
index 2fe84c56815..72a80ebb636 100644
--- a/packages/suite/src/views/wallet/send/SendHeader.tsx
+++ b/packages/suite/src/views/wallet/send/SendHeader.tsx
@@ -1,11 +1,13 @@
 import styled from 'styled-components';
+
 import { Button, Dropdown, DropdownMenuItemProps } from '@trezor/components';
+import { sendFormActions } from '@suite-common/wallet-core';
+import { FADE_IN } from '@trezor/components/src/config/animations';
+
 import { Translation } from 'src/components/suite';
 import { useDevice, useDispatch } from 'src/hooks/suite';
 import { useSendFormContext } from 'src/hooks/wallet';
 import { WalletSubpageHeading } from 'src/components/wallet';
-import { sendFormActions } from '@suite-common/wallet-core';
-import { FADE_IN } from '@trezor/components/src/config/animations';
 import { ConnectDeviceSendPromo } from 'src/views/wallet/receive/components/ConnectDevicePromo';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
diff --git a/packages/suite/src/views/wallet/send/SendRaw.tsx b/packages/suite/src/views/wallet/send/SendRaw.tsx
index 1dd8c68d0cf..dc2a9f34270 100644
--- a/packages/suite/src/views/wallet/send/SendRaw.tsx
+++ b/packages/suite/src/views/wallet/send/SendRaw.tsx
@@ -1,14 +1,15 @@
 import { useForm } from 'react-hook-form';
+
 import { analytics, EventType } from '@trezor/suite-analytics';
 import { Card, Textarea, Button, Tooltip, H3, IconButton, Row } from '@trezor/components';
 import { sendFormActions, pushSendFormRawTransactionThunk } from '@suite-common/wallet-core';
+import { tryGetAccountIdentity, getInputState, isHexValid } from '@suite-common/wallet-utils';
+import { spacings } from '@trezor/theme';
 
 import { Translation } from 'src/components/suite';
 import { useDispatch, useTranslation } from 'src/hooks/suite';
-import { tryGetAccountIdentity, getInputState, isHexValid } from '@suite-common/wallet-utils';
 import { Account } from 'src/types/wallet';
 import { OpenGuideFromTooltip } from 'src/components/guide';
-import { spacings } from '@trezor/theme';
 
 const INPUT_NAME = 'rawTx';
 
diff --git a/packages/suite/src/views/wallet/send/TotalSent/ReviewButton.tsx b/packages/suite/src/views/wallet/send/TotalSent/ReviewButton.tsx
index 8603b5316f2..7abc4e30b69 100644
--- a/packages/suite/src/views/wallet/send/TotalSent/ReviewButton.tsx
+++ b/packages/suite/src/views/wallet/send/TotalSent/ReviewButton.tsx
@@ -1,12 +1,14 @@
 import { useWatch } from 'react-hook-form';
+
 import styled from 'styled-components';
 
 import { Checkbox, Button, Banner, variables, Tooltip } from '@trezor/components';
+import { isLowAnonymityWarning } from '@suite-common/wallet-utils';
+import { spacingsPx } from '@trezor/theme';
+
 import { useDevice } from 'src/hooks/suite';
 import { useSendFormContext } from 'src/hooks/wallet';
-import { isLowAnonymityWarning } from '@suite-common/wallet-utils';
 import { Translation } from 'src/components/suite/Translation';
-import { spacingsPx } from '@trezor/theme';
 
 const Container = styled.div`
     display: flex;
diff --git a/packages/suite/src/views/wallet/send/TotalSent/TotalSent.tsx b/packages/suite/src/views/wallet/send/TotalSent/TotalSent.tsx
index 0c405aee9f9..ba440d591ba 100644
--- a/packages/suite/src/views/wallet/send/TotalSent/TotalSent.tsx
+++ b/packages/suite/src/views/wallet/send/TotalSent/TotalSent.tsx
@@ -1,65 +1,17 @@
 import styled from 'styled-components';
-import { Card, variables } from '@trezor/components';
-import { useSendFormContext } from 'src/hooks/wallet';
+
+import { Card, Column, InfoRow, Text } from '@trezor/components';
 import { formatNetworkAmount, formatAmount } from '@suite-common/wallet-utils';
+import { spacings } from '@trezor/theme';
+
+import { useSendFormContext } from 'src/hooks/wallet';
 import { Translation, FiatValue, FormattedCryptoAmount } from 'src/components/suite';
+
 import { ReviewButton } from './ReviewButton';
-import { spacingsPx } from '@trezor/theme';
 
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledCard = styled(Card)`
+const Container = styled.div`
     position: sticky;
-    top: 60px;
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: ${spacingsPx.md} 0;
-    align-items: start;
-    height: min-content;
-    background: transparent;
-    box-shadow: none;
-    border: 1px solid ${({ theme }) => theme.borderElevation1};
-`;
-
-const Left = styled.div`
-    display: flex;
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    gap: 6px;
-    justify-content: center;
-    flex-direction: column;
-`;
-
-const Label = styled.div`
-    padding-right: 10px;
-    text-transform: capitalize;
-    font-size: ${variables.FONT_SIZE.NORMAL};
-    color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
-`;
-
-const SecondaryLabel = styled.div`
-    font-size: ${variables.FONT_SIZE.SMALL};
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
-
-const Right = styled.div`
-    display: flex;
-    justify-content: center;
-    flex-direction: column;
-    align-items: flex-end;
-    gap: 6px;
-`;
-
-const TotalSentCoin = styled.div`
-    display: flex;
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    font-size: ${variables.FONT_SIZE.NORMAL};
-    color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
-`;
-
-const TotalSentFiat = styled.div`
-    display: flex;
-    font-weight: ${variables.FONT_WEIGHT.MEDIUM};
-    font-size: ${variables.FONT_SIZE.NORMAL};
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
+    top: 80px;
 `;
 
 export const TotalSent = () => {
@@ -72,58 +24,59 @@ export const TotalSent = () => {
     const selectedFee = getValues().selectedFee || 'normal';
     const transactionInfo = composedLevels ? composedLevels[selectedFee] : undefined;
     const isTokenTransfer = networkType === 'ethereum' && !!getValues('outputs.0.token');
-    const tokenInfo =
-        transactionInfo && transactionInfo.type !== 'error' ? transactionInfo.token : undefined;
+    const hasTransactionInfo = transactionInfo && transactionInfo.type !== 'error';
+    const tokenInfo = hasTransactionInfo ? transactionInfo.token : undefined;
 
     return (
-        <StyledCard>
-            <Left>
-                <Label>
-                    <Translation id="TOTAL_SENT" />
-                </Label>
-
-                <SecondaryLabel>
-                    {!isTokenTransfer ? <Translation id="INCLUDING_FEE" /> : ' '}
-                </SecondaryLabel>
-            </Left>
-
-            {transactionInfo && transactionInfo.type !== 'error' && (
-                <Right>
-                    <TotalSentCoin>
-                        <FormattedCryptoAmount
-                            disableHiddenPlaceholder
-                            value={
-                                tokenInfo
-                                    ? formatAmount(transactionInfo.totalSpent, tokenInfo.decimals)
-                                    : formatNetworkAmount(transactionInfo.totalSpent, symbol)
-                            }
-                            symbol={tokenInfo ? tokenInfo.symbol : symbol}
-                        />
-                    </TotalSentCoin>
-
-                    <TotalSentFiat>
-                        {tokenInfo ? (
-                            <>
-                                <Translation id="FEE" />
-                                &nbsp;
+        <Container>
+            <Card height="min-content" fillType="none">
+                <Column gap={spacings.xxs} alignItems="stretch" margin={{ bottom: spacings.xl }}>
+                    <InfoRow
+                        label={
+                            <Text variant="default" typographyStyle="body">
+                                <Translation id="TOTAL_SENT" />
+                            </Text>
+                        }
+                        direction="row"
+                    >
+                        {hasTransactionInfo && (
+                            <FormattedCryptoAmount
+                                disableHiddenPlaceholder
+                                value={
+                                    tokenInfo
+                                        ? formatAmount(
+                                              transactionInfo.totalSpent,
+                                              tokenInfo.decimals,
+                                          )
+                                        : formatNetworkAmount(transactionInfo.totalSpent, symbol)
+                                }
+                                symbol={tokenInfo ? tokenInfo.symbol : symbol}
+                            />
+                        )}
+                    </InfoRow>
+                    <InfoRow
+                        label={<Translation id={isTokenTransfer ? 'FEE' : 'INCLUDING_FEE'} />}
+                        direction="row"
+                        typographyStyle="hint"
+                    >
+                        {hasTransactionInfo &&
+                            (tokenInfo ? (
                                 <FormattedCryptoAmount
                                     disableHiddenPlaceholder
                                     value={formatNetworkAmount(transactionInfo.fee, symbol)}
                                     symbol={symbol}
                                 />
-                            </>
-                        ) : (
-                            <FiatValue
-                                disableHiddenPlaceholder
-                                amount={formatNetworkAmount(transactionInfo.totalSpent, symbol)}
-                                symbol={symbol}
-                            />
-                        )}
-                    </TotalSentFiat>
-                </Right>
-            )}
-
-            <ReviewButton />
-        </StyledCard>
+                            ) : (
+                                <FiatValue
+                                    disableHiddenPlaceholder
+                                    amount={formatNetworkAmount(transactionInfo.totalSpent, symbol)}
+                                    symbol={symbol}
+                                />
+                            ))}
+                    </InfoRow>
+                </Column>
+                <ReviewButton />
+            </Card>
+        </Container>
     );
 };
diff --git a/packages/suite/src/views/wallet/send/index.tsx b/packages/suite/src/views/wallet/send/index.tsx
index b7ab07ae63d..59c02ea8be1 100644
--- a/packages/suite/src/views/wallet/send/index.tsx
+++ b/packages/suite/src/views/wallet/send/index.tsx
@@ -1,4 +1,5 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
 
 import { Banner } from '@trezor/components';
@@ -14,6 +15,7 @@ import {
 } from 'src/reducers/wallet/coinjoinReducer';
 import { Translation } from 'src/components/suite';
 import { ConfirmEvmExplanationModal } from 'src/components/suite/modals';
+
 import { SendHeader } from './SendHeader';
 import { Outputs } from './Outputs/Outputs';
 import { Options } from './Options/Options';
diff --git a/packages/suite/src/views/wallet/sign-verify/components/ButtonRow.tsx b/packages/suite/src/views/wallet/sign-verify/components/ButtonRow.tsx
index 819d071158a..6543e897667 100644
--- a/packages/suite/src/views/wallet/sign-verify/components/ButtonRow.tsx
+++ b/packages/suite/src/views/wallet/sign-verify/components/ButtonRow.tsx
@@ -1,10 +1,12 @@
-import { Translation } from 'src/components/suite';
-
-import { useLayoutSize } from 'src/hooks/suite';
-import { Button, variables } from '@trezor/components';
 import { useState } from 'react';
+
 import styled from 'styled-components';
 
+import { Button, variables } from '@trezor/components';
+
+import { Translation } from 'src/components/suite';
+import { useLayoutSize } from 'src/hooks/suite';
+
 export const Row = styled.div`
     position: relative;
     display: flex;
diff --git a/packages/suite/src/views/wallet/sign-verify/components/HiddenAddressRow.tsx b/packages/suite/src/views/wallet/sign-verify/components/HiddenAddressRow.tsx
index ccf6b808ac0..5b8fdf64cbf 100644
--- a/packages/suite/src/views/wallet/sign-verify/components/HiddenAddressRow.tsx
+++ b/packages/suite/src/views/wallet/sign-verify/components/HiddenAddressRow.tsx
@@ -1,8 +1,10 @@
 import styled from 'styled-components';
+
 import { GradientOverlay, useElevation } from '@trezor/components';
-import type { AddressItem } from 'src/hooks/wallet/sign-verify/useSignAddressOptions';
 import { borders, nextElevation, spacingsPx } from '@trezor/theme';
 
+import type { AddressItem } from 'src/hooks/wallet/sign-verify/useSignAddressOptions';
+
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledGradientOverlay = styled(GradientOverlay)`
     margin: -${spacingsPx.xs};
diff --git a/packages/suite/src/views/wallet/sign-verify/components/Navigation.tsx b/packages/suite/src/views/wallet/sign-verify/components/Navigation.tsx
index 24a2dd2c975..99753407b44 100644
--- a/packages/suite/src/views/wallet/sign-verify/components/Navigation.tsx
+++ b/packages/suite/src/views/wallet/sign-verify/components/Navigation.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { NavigationTab } from './NavigationTab';
 
 const Container = styled.div`
diff --git a/packages/suite/src/views/wallet/sign-verify/components/NavigationTab.tsx b/packages/suite/src/views/wallet/sign-verify/components/NavigationTab.tsx
index 8c036168902..695e0397dcb 100644
--- a/packages/suite/src/views/wallet/sign-verify/components/NavigationTab.tsx
+++ b/packages/suite/src/views/wallet/sign-verify/components/NavigationTab.tsx
@@ -1,5 +1,7 @@
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { ExtendedMessageDescriptor } from 'src/types/suite';
 
diff --git a/packages/suite/src/views/wallet/sign-verify/components/SignAddressInput.tsx b/packages/suite/src/views/wallet/sign-verify/components/SignAddressInput.tsx
index 626950aa849..82390fbdae1 100644
--- a/packages/suite/src/views/wallet/sign-verify/components/SignAddressInput.tsx
+++ b/packages/suite/src/views/wallet/sign-verify/components/SignAddressInput.tsx
@@ -1,12 +1,16 @@
 import { components } from 'react-select';
+
 import styled from 'styled-components';
+
 import { Select, SelectProps } from '@trezor/components';
+
 import type { Account } from 'src/types/wallet';
 import type { State as RevealedAddresses } from 'src/reducers/wallet/receiveReducer';
 import {
     useSignAddressOptions,
     AddressItem,
 } from 'src/hooks/wallet/sign-verify/useSignAddressOptions';
+
 import { HiddenAddressRow } from './HiddenAddressRow';
 import { VerifyAddressButton } from './VerifyAddressButton';
 
diff --git a/packages/suite/src/views/wallet/sign-verify/components/VerifyAddressButton.tsx b/packages/suite/src/views/wallet/sign-verify/components/VerifyAddressButton.tsx
index 15c032d6410..eb526581fe8 100644
--- a/packages/suite/src/views/wallet/sign-verify/components/VerifyAddressButton.tsx
+++ b/packages/suite/src/views/wallet/sign-verify/components/VerifyAddressButton.tsx
@@ -1,10 +1,13 @@
 import { MouseEvent } from 'react';
+
 import styled from 'styled-components';
+
 import { Icon, variables } from '@trezor/components';
+import { spacingsPx } from '@trezor/theme';
+
 import { showAddress } from 'src/actions/wallet/signVerifyActions';
 import { useDispatch } from 'src/hooks/suite';
 import { Translation } from 'src/components/suite';
-import { spacingsPx } from '@trezor/theme';
 
 const RevealText = styled.div`
     max-width: 0;
diff --git a/packages/suite/src/views/wallet/sign-verify/index.tsx b/packages/suite/src/views/wallet/sign-verify/index.tsx
index 893c111051b..da6e7507c2b 100644
--- a/packages/suite/src/views/wallet/sign-verify/index.tsx
+++ b/packages/suite/src/views/wallet/sign-verify/index.tsx
@@ -1,6 +1,8 @@
 import { useEffect, useState } from 'react';
 import { FieldError } from 'react-hook-form';
+
 import styled from 'styled-components';
+
 import {
     Input,
     Button,
@@ -11,6 +13,8 @@ import {
     SelectBar,
     Tooltip,
 } from '@trezor/components';
+import { getInputState } from '@suite-common/wallet-utils';
+import { spacingsPx } from '@trezor/theme';
 
 import { WalletLayout, WalletSubpageHeading } from 'src/components/wallet';
 import { Translation } from 'src/components/suite';
@@ -18,10 +22,6 @@ import { useDevice, useDispatch, useSelector, useTranslation } from 'src/hooks/s
 import { sign, verify } from 'src/actions/wallet/signVerifyActions';
 import { goto } from 'src/actions/suite/routerActions';
 import { TranslationKey } from 'src/components/suite/Translation';
-
-import { Navigation, NavPages } from './components/Navigation';
-import { SignAddressInput } from './components/SignAddressInput';
-import { ButtonRow, Row } from './components/ButtonRow';
 import { useCopySignedMessage } from 'src/hooks/wallet/sign-verify/useCopySignedMessage';
 import {
     useSignVerifyForm,
@@ -29,8 +29,10 @@ import {
     MAX_LENGTH_MESSAGE,
     MAX_LENGTH_SIGNATURE,
 } from 'src/hooks/wallet/sign-verify/useSignVerifyForm';
-import { getInputState } from '@suite-common/wallet-utils';
-import { spacingsPx } from '@trezor/theme';
+
+import { Navigation, NavPages } from './components/Navigation';
+import { SignAddressInput } from './components/SignAddressInput';
+import { ButtonRow, Row } from './components/ButtonRow';
 
 const SwitchWrapper = styled.label`
     display: flex;
diff --git a/packages/suite/src/views/wallet/staking/WalletStaking.tsx b/packages/suite/src/views/wallet/staking/WalletStaking.tsx
index b66f85cc58a..9b9990e25de 100644
--- a/packages/suite/src/views/wallet/staking/WalletStaking.tsx
+++ b/packages/suite/src/views/wallet/staking/WalletStaking.tsx
@@ -1,8 +1,10 @@
+import { hasNetworkFeatures } from '@suite-common/wallet-utils';
+
 import { Translation } from 'src/components/suite';
 import { AccountExceptionLayout, WalletLayout } from 'src/components/wallet';
 import { useSelector } from 'src/hooks/suite';
+
 import { CardanoStakingDashboard } from './components/CardanoStakingDashboard';
-import { hasNetworkFeatures } from '@suite-common/wallet-utils';
 import { EthStakingDashboard } from './components/EthStakingDashboard/EthStakingDashboard';
 
 export const WalletStaking = () => {
@@ -32,7 +34,8 @@ export const WalletStaking = () => {
         <WalletLayout title="TR_NAV_STAKING" account={selectedAccount} showEmptyHeaderPlaceholder>
             <AccountExceptionLayout
                 title={<Translation id="TR_STAKING_IS_NOT_SUPPORTED" />}
-                image="CLOUDY"
+                iconName="warning"
+                iconVariant="warning"
             />
         </WalletLayout>
     );
diff --git a/packages/suite/src/views/wallet/staking/components/CardanoActionPending.tsx b/packages/suite/src/views/wallet/staking/components/CardanoActionPending.tsx
index a57b4e34f7b..ea2e101dd2d 100644
--- a/packages/suite/src/views/wallet/staking/components/CardanoActionPending.tsx
+++ b/packages/suite/src/views/wallet/staking/components/CardanoActionPending.tsx
@@ -1,6 +1,7 @@
+import { Banner } from '@trezor/components';
+
 import { Translation } from 'src/components/suite/Translation';
 import { useCardanoStaking } from 'src/hooks/wallet/useCardanoStaking';
-import { Banner } from '@trezor/components';
 
 export const CardanoActionPending = () => {
     const { pendingStakeTx } = useCardanoStaking();
diff --git a/packages/suite/src/views/wallet/staking/components/CardanoPrimitives.ts b/packages/suite/src/views/wallet/staking/components/CardanoPrimitives.ts
index cdaae199f9f..8ff6d1eb544 100644
--- a/packages/suite/src/views/wallet/staking/components/CardanoPrimitives.ts
+++ b/packages/suite/src/views/wallet/staking/components/CardanoPrimitives.ts
@@ -1,6 +1,7 @@
+import styled from 'styled-components';
+
 import { H2 } from '@trezor/components';
 import { borders, typography } from '@trezor/theme';
-import styled from 'styled-components';
 
 export const Heading = styled.div`
     padding-left: 5px;
diff --git a/packages/suite/src/views/wallet/staking/components/CardanoRedelegate.tsx b/packages/suite/src/views/wallet/staking/components/CardanoRedelegate.tsx
index 1907c3b997b..dcacbc77287 100644
--- a/packages/suite/src/views/wallet/staking/components/CardanoRedelegate.tsx
+++ b/packages/suite/src/views/wallet/staking/components/CardanoRedelegate.tsx
@@ -1,14 +1,14 @@
 import { useEffect } from 'react';
 
 import { Card, Column, Icon } from '@trezor/components';
+import { DeviceModelInternal } from '@trezor/connect';
+import { spacings } from '@trezor/theme';
 
 import { getReasonForDisabledAction, useCardanoStaking } from 'src/hooks/wallet/useCardanoStaking';
 import { Translation } from 'src/components/suite/Translation';
-import { Actions, Title, Heading, Text } from './CardanoPrimitives';
 
+import { Actions, Title, Heading, Text } from './CardanoPrimitives';
 import { DeviceButton } from './DeviceButton';
-import { DeviceModelInternal } from '@trezor/connect';
-import { spacings } from '@trezor/theme';
 
 interface CardanoRedelegateProps {
     deviceModel: DeviceModelInternal;
diff --git a/packages/suite/src/views/wallet/staking/components/CardanoRewards.tsx b/packages/suite/src/views/wallet/staking/components/CardanoRewards.tsx
index b15ec69cda7..31193518c7d 100644
--- a/packages/suite/src/views/wallet/staking/components/CardanoRewards.tsx
+++ b/packages/suite/src/views/wallet/staking/components/CardanoRewards.tsx
@@ -2,6 +2,8 @@ import { useEffect } from 'react';
 
 import { formatNetworkAmount } from '@suite-common/wallet-utils';
 import { Card, Column, Icon } from '@trezor/components';
+import { DeviceModelInternal } from '@trezor/connect';
+import { spacings } from '@trezor/theme';
 
 import { getReasonForDisabledAction, useCardanoStaking } from 'src/hooks/wallet/useCardanoStaking';
 import { Translation } from 'src/components/suite/Translation';
@@ -21,8 +23,6 @@ import {
     Column as CardanoColumn,
 } from './CardanoPrimitives';
 import { CardanoActionPending } from './CardanoActionPending';
-import { DeviceModelInternal } from '@trezor/connect';
-import { spacings } from '@trezor/theme';
 
 interface CardanoRewardsProps {
     account: Account;
diff --git a/packages/suite/src/views/wallet/staking/components/CardanoStake.tsx b/packages/suite/src/views/wallet/staking/components/CardanoStake.tsx
index f1d15d7e8cc..8acfac87534 100644
--- a/packages/suite/src/views/wallet/staking/components/CardanoStake.tsx
+++ b/packages/suite/src/views/wallet/staking/components/CardanoStake.tsx
@@ -3,13 +3,14 @@ import { useEffect } from 'react';
 import { formatNetworkAmount } from '@suite-common/wallet-utils';
 import { Card, Column, Icon, Banner } from '@trezor/components';
 import { DeviceModelInternal } from '@trezor/connect';
+import { spacings } from '@trezor/theme';
 
 import { Translation } from 'src/components/suite/Translation';
 import { HiddenPlaceholder } from 'src/components/suite/HiddenPlaceholder';
 import { useCardanoStaking, getReasonForDisabledAction } from 'src/hooks/wallet/useCardanoStaking';
-import { CardanoActionPending } from './CardanoActionPending';
 import { Account } from 'src/types/wallet';
 
+import { CardanoActionPending } from './CardanoActionPending';
 import { DeviceButton } from './DeviceButton';
 import {
     Title,
@@ -22,7 +23,6 @@ import {
     Content,
     StyledH2,
 } from './CardanoPrimitives';
-import { spacings } from '@trezor/theme';
 
 interface CardanoStakeProps {
     account: Account;
diff --git a/packages/suite/src/views/wallet/staking/components/CardanoStakingDashboard.tsx b/packages/suite/src/views/wallet/staking/components/CardanoStakingDashboard.tsx
index f39ab0f6427..c9d74c11798 100644
--- a/packages/suite/src/views/wallet/staking/components/CardanoStakingDashboard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/CardanoStakingDashboard.tsx
@@ -1,11 +1,13 @@
+import type { SelectedAccountLoaded } from '@suite-common/wallet-types';
+import { DeviceModelInternal } from '@trezor/connect';
+
 import { WalletLayout } from 'src/components/wallet';
 import { useCardanoStaking } from 'src/hooks/wallet/useCardanoStaking';
+import { useDevice } from 'src/hooks/suite';
+
 import { CardanoRewards } from './CardanoRewards';
 import { CardanoStake } from './CardanoStake';
 import { CardanoRedelegate } from './CardanoRedelegate';
-import type { SelectedAccountLoaded } from '@suite-common/wallet-types';
-import { useDevice } from 'src/hooks/suite';
-import { DeviceModelInternal } from '@trezor/connect';
 
 interface CardanoStakingDashboardProps {
     selectedAccount: SelectedAccountLoaded;
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/EthStakingDashboard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/EthStakingDashboard.tsx
index 75aec7a8472..b1dd8fa6acb 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/EthStakingDashboard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/EthStakingDashboard.tsx
@@ -1,7 +1,9 @@
 import { selectAccountHasStaked } from '@suite-common/wallet-core';
 import { SelectedAccountLoaded } from '@suite-common/wallet-types';
+
 import { WalletLayout } from 'src/components/wallet';
 import { useSelector } from 'src/hooks/suite';
+
 import { EmptyStakingCard } from './components/EmptyStakingCard';
 import { StakingDashboard } from './components/StakingDashboard';
 import { EverstakeFooter } from './components/EverstakeFooter';
@@ -11,7 +13,9 @@ interface EthStakingDashboardProps {
 }
 
 export const EthStakingDashboard = ({ selectedAccount }: EthStakingDashboardProps) => {
-    const hasStaked = useSelector(state => selectAccountHasStaked(state, selectedAccount.account));
+    const hasStaked = useSelector(state =>
+        selectAccountHasStaked(state, selectedAccount.account.key),
+    );
 
     return (
         <WalletLayout title="TR_STAKE_ETH" account={selectedAccount}>
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ApproximateInstantEthAmount.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ApproximateInstantEthAmount.tsx
new file mode 100644
index 00000000000..d84fad9b696
--- /dev/null
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ApproximateInstantEthAmount.tsx
@@ -0,0 +1,30 @@
+import { Tooltip } from '@trezor/components';
+import { BigNumber } from '@trezor/utils/src/bigNumber';
+
+import { FormattedCryptoAmount } from 'src/components/suite';
+
+interface ApproximateInstantEthAmountProps {
+    value: string | number;
+    symbol: string;
+}
+
+const DEFAULT_MAX_DECIMAL_PLACES = 2;
+
+export const ApproximateInstantEthAmount = ({
+    value,
+    symbol,
+}: ApproximateInstantEthAmountProps) => {
+    const hasDecimals = value.toString().includes('.');
+
+    if (!hasDecimals) {
+        return <FormattedCryptoAmount value={value} symbol={symbol} />;
+    }
+
+    const trimmedAmount = new BigNumber(value).toFixed(DEFAULT_MAX_DECIMAL_PLACES, 1);
+
+    return (
+        <Tooltip content={<FormattedCryptoAmount value={value} symbol={symbol} />}>
+            <FormattedCryptoAmount value={trimmedAmount} symbol={symbol} />
+        </Tooltip>
+    );
+};
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ApyCard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ApyCard.tsx
index 469d38dd03c..38e3a1534e0 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ApyCard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ApyCard.tsx
@@ -1,6 +1,9 @@
 import { useTheme } from 'styled-components';
+
 import { Card, Column, Icon } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
+
 import { AccentP, CardBottomContent, GreyP } from './styled';
 
 interface ApyCardProps {
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/EmptyStakingCard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/EmptyStakingCard.tsx
index e0b84708269..3dd408a3386 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/EmptyStakingCard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/EmptyStakingCard.tsx
@@ -1,9 +1,9 @@
 import { useMemo } from 'react';
+
 import {
     Button,
     Card,
     Column,
-    Icon,
     Paragraph,
     Text,
     Tooltip,
@@ -11,14 +11,16 @@ import {
     Divider,
     Grid,
     useMediaQuery,
+    IconName,
 } from '@trezor/components';
 import { spacings } from '@trezor/theme';
+import { selectPoolStatsApyData } from '@suite-common/wallet-core';
+
 import { Translation, StakingFeature } from 'src/components/suite';
 import { openModal } from 'src/actions/suite/modalActions';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { DashboardSection } from 'src/components/dashboard';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
-import { selectPoolStatsApyData } from '@suite-common/wallet-core';
 import { useMessageSystemStaking } from 'src/hooks/suite/useMessageSystemStaking';
 
 export const EmptyStakingCard = () => {
@@ -39,7 +41,7 @@ export const EmptyStakingCard = () => {
         () => [
             {
                 id: 0,
-                icon: <Icon name="piggyBank" size="extraLarge" variant="primary" />,
+                icon: 'piggyBank' as IconName,
                 title: <Translation id="TR_STAKE_ETH_SEE_MONEY_DANCE" />,
                 description: (
                     <Translation
@@ -61,13 +63,13 @@ export const EmptyStakingCard = () => {
             },
             {
                 id: 1,
-                icon: <Icon name="lockLaminatedOpen" size="extraLarge" variant="primary" />,
+                icon: 'lockLaminatedOpen' as IconName,
                 title: <Translation id="TR_STAKE_ETH_LOCK_FUNDS" />,
                 description: <Translation id="TR_STAKE_ETH_LOCK_FUNDS_DESC" />,
             },
             {
                 id: 2,
-                icon: <Icon name="everstakeLogo" size="extraLarge" variant="primary" />,
+                icon: 'everstakeLogo' as IconName,
                 title: <Translation id="TR_STAKE_ETH_EVERSTAKE" />,
                 description: <Translation id="TR_STAKE_ETH_EVERSTAKE_DESC" />,
             },
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/EverstakeFooter.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/EverstakeFooter.tsx
index fb4ef0d92e2..5b140c3a269 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/EverstakeFooter.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/EverstakeFooter.tsx
@@ -1,10 +1,13 @@
 import styled, { useTheme } from 'styled-components';
+
 import { spacingsPx } from '@trezor/theme';
-import { Translation } from 'src/components/suite';
-import { EverstakeLogo } from './EverstakeLogo';
 import { HELP_CENTER_ETH_STAKING } from '@trezor/urls';
+
+import { Translation } from 'src/components/suite';
 import { LearnMoreButton } from 'src/components/suite/LearnMoreButton';
 
+import { EverstakeLogo } from './EverstakeLogo';
+
 const Wrapper = styled.div`
     display: flex;
     align-items: center;
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/InstantStakeBanner.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/InstantStakeBanner.tsx
index 608ef67116a..952ef01b78d 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/InstantStakeBanner.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/InstantStakeBanner.tsx
@@ -1,13 +1,16 @@
-import { Banner, Column, H3, Icon, Paragraph, Row } from '@trezor/components';
-import { Translation } from 'src/components/suite';
+import { useEffect, useRef, useState } from 'react';
+
 import styled, { useTheme } from 'styled-components';
+import { fromWei } from 'web3-utils';
+
+import { Banner, Column, H3, Icon, Paragraph, Row } from '@trezor/components';
 import { spacings, spacingsPx } from '@trezor/theme';
-import { useSelector } from 'src/hooks/suite';
 import { StakeType, WalletAccountTransaction } from '@suite-common/wallet-types';
 import { InternalTransfer } from '@trezor/connect';
-import { fromWei } from 'web3-utils';
+
+import { useSelector } from 'src/hooks/suite';
+import { Translation } from 'src/components/suite';
 import { getChangedInternalTx, getInstantStakeType } from 'src/utils/suite/stake';
-import { useEffect, useRef, useState } from 'react';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 
 const IconWrapper = styled.div`
@@ -23,7 +26,7 @@ const IconWrapper = styled.div`
 const getSubheadingTranslationId = (stakeType: StakeType) => {
     if (stakeType === 'stake') return 'TR_STAKING_INSTANTLY_STAKED';
 
-    return 'TR_STAKING_INSTANTLY_UNSTAKED';
+    return 'TR_STAKE_INSTANTLY_UNSTAKED_WITH_DAYS';
 };
 
 const getHeadingTranslationId = (stakeType: StakeType) => {
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/PayoutCard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/PayoutCard.tsx
index 1aff1284ae0..439da9ccfae 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/PayoutCard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/PayoutCard.tsx
@@ -1,13 +1,17 @@
 import { useMemo } from 'react';
-import { BigNumber } from '@trezor/utils/src/bigNumber';
+
 import { useTheme } from 'styled-components';
+
+import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { Card, Column, Icon } from '@trezor/components';
+import { BACKUP_REWARD_PAYOUT_DAYS } from '@suite-common/wallet-constants';
+import { getAccountAutocompoundBalance } from '@suite-common/wallet-utils';
+
 import { Translation } from 'src/components/suite';
-import { AccentP, CardBottomContent, GreyP } from './styled';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 import { useSelector } from 'src/hooks/suite';
-import { BACKUP_REWARD_PAYOUT_DAYS } from 'src/constants/suite/ethStaking';
-import { getAccountAutocompoundBalance } from '@suite-common/wallet-utils';
+
+import { AccentP, CardBottomContent, GreyP } from './styled';
 
 interface PayoutCardProps {
     nextRewardPayout?: number | null;
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ProgressLabels/ProgressLabel.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ProgressLabels/ProgressLabel.tsx
index 7f9a8fdcdb5..2d687afd428 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ProgressLabels/ProgressLabel.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ProgressLabels/ProgressLabel.tsx
@@ -1,9 +1,12 @@
 import { ReactNode, useEffect, useRef, useState } from 'react';
+
 import styled, { DefaultTheme, useTheme } from 'styled-components';
+
 import { Icon, variables } from '@trezor/components';
-import { ProgressLabelState } from './types';
 import { borders, spacingsPx } from '@trezor/theme';
 
+import { ProgressLabelState } from './types';
+
 const DEFAULT_LABEL_HEIGHT = 48;
 
 const getProgressStateColor = ({
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ProgressLabels/ProgressLabels.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ProgressLabels/ProgressLabels.tsx
index 0b85edfad2f..0fe2d51d825 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ProgressLabels/ProgressLabels.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/ProgressLabels/ProgressLabels.tsx
@@ -1,5 +1,7 @@
 import styled from 'styled-components';
+
 import { spacingsPx } from '@trezor/theme';
+
 import { ProgressLabelData } from './types';
 import { ProgressLabel } from './ProgressLabel';
 
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingCard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingCard.tsx
index 7a776c1dcf7..f9d14778222 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingCard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingCard.tsx
@@ -1,19 +1,22 @@
-import { BigNumber } from '@trezor/utils/src/bigNumber';
 import styled, { useTheme } from 'styled-components';
+
+import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { Badge, Button, Card, Icon, Row, Tooltip, variables } from '@trezor/components';
 import { spacings, spacingsPx } from '@trezor/theme';
 import { selectAccountStakeTransactions } from '@suite-common/wallet-core';
 import { getAccountEverstakeStakingPool, isPending } from '@suite-common/wallet-utils';
+
 import { FiatValue, Translation } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { openModal } from 'src/actions/suite/modalActions';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
+import { useMessageSystemStaking } from 'src/hooks/suite/useMessageSystemStaking';
+
 import { InfoBox, ProgressBar } from './styled';
 import { ProgressLabels } from './ProgressLabels/ProgressLabels';
 import { useProgressLabelsData } from '../hooks/useProgressLabelsData';
 import { useIsTxStatusShown } from '../hooks/useIsTxStatusShown';
 import { TrimmedCryptoAmount } from './TrimmedCryptoAmount';
-import { useMessageSystemStaking } from 'src/hooks/suite/useMessageSystemStaking';
 
 const AmountsWrapper = styled.div<{ $isStakeOrUnstakePending: boolean }>`
     display: flex;
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingDashboard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingDashboard.tsx
index c12ec2bb631..3be19d3928b 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingDashboard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingDashboard.tsx
@@ -1,25 +1,30 @@
+import { useEffect, useMemo } from 'react';
+
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
 import { spacingsPx } from '@trezor/theme';
-import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
-import { useSelector } from 'src/hooks/suite';
-import { Divider, Translation } from 'src/components/suite';
-import { DashboardSection } from 'src/components/dashboard';
-import { StakingCard } from './StakingCard';
-import { ApyCard } from './ApyCard';
-import { PayoutCard } from './PayoutCard';
-import { ClaimCard } from './claim/ClaimCard';
-import { Transactions } from './Transactions';
 import {
+    fetchAllTransactionsForAccountThunk,
     selectAccountStakeTransactions,
     selectAccountUnstakeTransactions,
     selectPoolStatsApyData,
     selectPoolStatsNextRewardPayout,
     selectValidatorsQueue,
 } from '@suite-common/wallet-core';
+
+import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
+import { useDispatch, useSelector } from 'src/hooks/suite';
+import { Divider, Translation } from 'src/components/suite';
+import { DashboardSection } from 'src/components/dashboard';
 import { getDaysToAddToPool, getDaysToUnstake } from 'src/utils/suite/stake';
+
+import { StakingCard } from './StakingCard';
+import { ApyCard } from './ApyCard';
+import { PayoutCard } from './PayoutCard';
+import { ClaimCard } from './claim/ClaimCard';
+import { Transactions } from './Transactions';
 import { InstantStakeBanner } from './InstantStakeBanner';
-import { useMemo } from 'react';
 
 const FlexCol = styled.div`
     display: flex;
@@ -48,6 +53,7 @@ const FlexRow = styled.div`
 
 export const StakingDashboard = () => {
     const account = useSelector(selectSelectedAccount);
+    const accountKey = account?.key ?? '';
 
     const { data, isLoading } =
         useSelector(state => selectValidatorsQueue(state, account?.symbol)) || {};
@@ -57,12 +63,21 @@ export const StakingDashboard = () => {
         selectPoolStatsNextRewardPayout(state, account?.symbol),
     );
 
-    const stakeTxs = useSelector(state =>
-        selectAccountStakeTransactions(state, account?.key ?? ''),
-    );
-    const unstakeTxs = useSelector(state =>
-        selectAccountUnstakeTransactions(state, account?.key ?? ''),
-    );
+    const stakeTxs = useSelector(state => selectAccountStakeTransactions(state, accountKey));
+    const unstakeTxs = useSelector(state => selectAccountUnstakeTransactions(state, accountKey));
+
+    const dispatch = useDispatch();
+
+    useEffect(() => {
+        if (accountKey) {
+            dispatch(
+                fetchAllTransactionsForAccountThunk({
+                    accountKey,
+                    noLoading: true,
+                }),
+            );
+        }
+    }, [account, accountKey, dispatch]);
 
     const txs = useMemo(() => [...stakeTxs, ...unstakeTxs], [stakeTxs, unstakeTxs]);
 
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/Transactions.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/Transactions.tsx
index ca9708cbee9..3223f454b5c 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/Transactions.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/Transactions.tsx
@@ -1,19 +1,25 @@
-import { TransactionList } from 'src/views/wallet/transactions/TransactionList/TransactionList';
-import { useSelector } from 'src/hooks/suite';
 import {
     selectAccountStakeTypeTransactions,
+    selectAreAllTransactionsLoaded,
     selectIsLoadingAccountTransactions,
 } from '@suite-common/wallet-core';
 
+import { TransactionList } from 'src/views/wallet/transactions/TransactionList/TransactionList';
+import { useSelector } from 'src/hooks/suite';
+
 export const Transactions = () => {
     const selectedAccount = useSelector(state => state.wallet.selectedAccount);
+    const accountKey = selectedAccount.account?.key ?? '';
+
     const transactionsIsLoading = useSelector(state =>
-        selectIsLoadingAccountTransactions(state, selectedAccount.account?.key || null),
+        selectIsLoadingAccountTransactions(state, accountKey),
     );
-    const stakeTxs = useSelector(state =>
-        selectAccountStakeTypeTransactions(state, selectedAccount.account?.key || ''),
+    const areAllTransactionsLoaded = useSelector(state =>
+        selectAreAllTransactionsLoaded(state, accountKey),
     );
 
+    const stakeTxs = useSelector(state => selectAccountStakeTypeTransactions(state, accountKey));
+
     if (selectedAccount.status !== 'loaded' || stakeTxs.length < 1) {
         return null;
     }
@@ -25,7 +31,7 @@ export const Transactions = () => {
             account={account}
             transactions={stakeTxs}
             symbol={account.symbol}
-            isLoading={transactionsIsLoading}
+            isLoading={transactionsIsLoading || !areAllTransactionsLoaded}
             customTotalItems={stakeTxs.length}
             isExportable={false}
         />
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/TrimmedCryptoAmount.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/TrimmedCryptoAmount.tsx
index e97efdaed85..6ea5fe53dd7 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/TrimmedCryptoAmount.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/TrimmedCryptoAmount.tsx
@@ -1,9 +1,11 @@
-import { FormattedCryptoAmount } from 'src/components/suite';
 import styled from 'styled-components';
+
 import { spacingsPx } from '@trezor/theme';
 import { Tooltip, variables } from '@trezor/components';
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 
+import { FormattedCryptoAmount } from 'src/components/suite';
+
 const StyledFormattedCryptoAmount = styled(FormattedCryptoAmount)<{
     $isRewards?: boolean;
     $isSmall?: boolean;
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/ClaimCard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/ClaimCard.tsx
index a505234c467..6ca42d02b8c 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/ClaimCard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/ClaimCard.tsx
@@ -1,9 +1,12 @@
 import { useEffect, useMemo, useRef } from 'react';
+
 import { getAccountEverstakeStakingPool, isPending } from '@suite-common/wallet-utils';
 import { selectAccountClaimTransactions } from '@suite-common/wallet-core';
 import { notificationsActions } from '@suite-common/toast-notifications';
+
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
 import { useDispatch, useSelector } from 'src/hooks/suite';
+
 import { ClaimReadyCard } from './ClaimReadyCard';
 import { ClaimPendingCard } from './ClaimPendingCard';
 
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/ClaimPendingCard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/ClaimPendingCard.tsx
index 3b1c90a0e7a..758f5cddf17 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/ClaimPendingCard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/ClaimPendingCard.tsx
@@ -1,11 +1,14 @@
 import styled, { useTheme } from 'styled-components';
+
 import { Icon } from '@trezor/components';
+import { variables } from '@trezor/components/src/config';
+import { borders, spacingsPx } from '@trezor/theme';
+
 import { FiatValue, FormattedCryptoAmount, Translation } from 'src/components/suite';
-import { FiatValueWrapper, FormattedCryptoAmountWrapper } from './styled';
 import { useSelector } from 'src/hooks/suite';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
-import { variables } from '@trezor/components/src/config';
-import { borders, spacingsPx } from '@trezor/theme';
+
+import { FiatValueWrapper, FormattedCryptoAmountWrapper } from './styled';
 
 const StyledCard = styled.div`
     border-radius: ${borders.radii.md};
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/ClaimReadyCard.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/ClaimReadyCard.tsx
index 3078b751e66..1335c7417bf 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/ClaimReadyCard.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/ClaimReadyCard.tsx
@@ -1,13 +1,16 @@
 import styled, { useTheme } from 'styled-components';
-import { FiatValue, FormattedCryptoAmount, Translation } from 'src/components/suite';
+
 import { Button, Icon, Paragraph, Tooltip, variables } from '@trezor/components';
 import { borders, spacingsPx } from '@trezor/theme';
+
+import { FiatValue, FormattedCryptoAmount, Translation } from 'src/components/suite';
 import { openModal } from 'src/actions/suite/modalActions';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
-import { FiatValueWrapper, FormattedCryptoAmountWrapper } from './styled';
 import { useMessageSystemStaking } from 'src/hooks/suite/useMessageSystemStaking';
 
+import { FiatValueWrapper, FormattedCryptoAmountWrapper } from './styled';
+
 const StyledCard = styled.div`
     border-radius: ${borders.radii.md};
     padding: ${spacingsPx.md} ${spacingsPx.xxl} ${spacingsPx.xxl} ${spacingsPx.md};
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/styled.ts b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/styled.ts
index a0efb3ede58..ab6da9bae41 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/styled.ts
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/claim/styled.ts
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
 
 export const FormattedCryptoAmountWrapper = styled.div`
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/styled.ts b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/styled.ts
index c889fb96a9f..49d6db87fa5 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/styled.ts
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/components/styled.ts
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { Paragraph, variables } from '@trezor/components';
 import { borders, spacingsPx } from '@trezor/theme';
 
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/hooks/useIsTxStatusShown.ts b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/hooks/useIsTxStatusShown.ts
index 6f81be789a9..ce077f4ac04 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/hooks/useIsTxStatusShown.ts
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/hooks/useIsTxStatusShown.ts
@@ -1,4 +1,5 @@
 import { useEffect, useRef, useState } from 'react';
+
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 
 export const useIsTxStatusShown = (totalPendingStake: BigNumber, accountDescriptor?: string) => {
diff --git a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/hooks/useProgressLabelsData.tsx b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/hooks/useProgressLabelsData.tsx
index fdbcbe44e9c..cf9b2038781 100644
--- a/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/hooks/useProgressLabelsData.tsx
+++ b/packages/suite/src/views/wallet/staking/components/EthStakingDashboard/hooks/useProgressLabelsData.tsx
@@ -1,9 +1,13 @@
 import { useMemo } from 'react';
+
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
-import { ProgressLabelData } from '../components/ProgressLabels/types';
+
 import { Translation } from 'src/components/suite';
 
+import { ProgressLabelData } from '../components/ProgressLabels/types';
+
 const DaysToAddToPool = styled.div`
     font-size: ${variables.FONT_SIZE.TINY};
     color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
diff --git a/packages/suite/src/views/wallet/tokens/TokensNavigation.tsx b/packages/suite/src/views/wallet/tokens/TokensNavigation.tsx
new file mode 100644
index 00000000000..8bb4cac4bc5
--- /dev/null
+++ b/packages/suite/src/views/wallet/tokens/TokensNavigation.tsx
@@ -0,0 +1,110 @@
+import { Dispatch, SetStateAction, useEffect, useState } from 'react';
+
+import { SelectedAccountLoaded } from '@suite-common/wallet-types';
+import { selectCoinDefinitions } from '@suite-common/token-definitions';
+import { spacings } from '@trezor/theme';
+import { IconButton, Row } from '@trezor/components';
+import { EventType, analytics } from '@trezor/suite-analytics';
+
+import { useDispatch, useSelector } from 'src/hooks/suite';
+import { NavigationItem } from 'src/components/suite/layouts/SuiteLayout/Sidebar/NavigationItem';
+import { getTokens } from 'src/utils/wallet/tokenUtils';
+import { selectIsDebugModeActive } from 'src/reducers/suite/suiteReducer';
+import { selectRouteName } from 'src/reducers/suite/routerReducer';
+import { SearchAction } from 'src/components/wallet/SearchAction';
+import { openModal } from 'src/actions/suite/modalActions';
+
+interface TokensNavigationProps {
+    selectedAccount: SelectedAccountLoaded;
+    searchQuery: string;
+    setSearchQuery: Dispatch<SetStateAction<string>>;
+}
+
+export const TokensNavigation = ({
+    selectedAccount,
+    searchQuery,
+    setSearchQuery,
+}: TokensNavigationProps) => {
+    const { account } = selectedAccount;
+
+    const [isExpanded, setExpanded] = useState(false);
+
+    const routeName = useSelector(selectRouteName);
+
+    const coinDefinitions = useSelector(state =>
+        selectCoinDefinitions(state, selectedAccount.account.symbol),
+    );
+    const isDebug = useSelector(selectIsDebugModeActive);
+    const dispatch = useDispatch();
+
+    const tokens = getTokens(
+        selectedAccount.account.tokens || [],
+        selectedAccount.account.symbol,
+        coinDefinitions,
+    );
+    const showAddToken = ['ethereum'].includes(account.networkType) && isDebug;
+
+    const handleAddToken = () => {
+        if (account.symbol) {
+            analytics.report({
+                type: EventType.AccountsActions,
+                payload: { symbol: account.symbol, action: 'add-token' },
+            });
+        }
+        dispatch(openModal({ type: 'add-token' }));
+    };
+
+    useEffect(() => {
+        setSearchQuery('');
+        setExpanded(false);
+    }, [account.symbol, account.index, account.accountType, setSearchQuery]);
+
+    return (
+        <Row alignItems="center" justifyContent="space-between" margin={{ bottom: spacings.md }}>
+            <Row alignItems="center" gap={spacings.xxs}>
+                <NavigationItem
+                    nameId="TR_NAV_TOKENS"
+                    isActive={routeName === 'wallet-tokens'}
+                    icon="tokens"
+                    goToRoute="wallet-tokens"
+                    preserveParams
+                    iconSize="mediumLarge"
+                    itemsCount={tokens.shownWithBalance.length || undefined}
+                    isRounded
+                    typographyStyle="hint"
+                />
+                <NavigationItem
+                    nameId="TR_HIDDEN"
+                    isActive={routeName === 'wallet-tokens-hidden'}
+                    icon="hide"
+                    goToRoute="wallet-tokens-hidden"
+                    preserveParams
+                    iconSize="mediumLarge"
+                    itemsCount={tokens.hiddenWithBalance.length || undefined}
+                    isRounded
+                    typographyStyle="hint"
+                />
+            </Row>
+            <Row>
+                <SearchAction
+                    tooltipText="TR_TOKENS_SEARCH_TOOLTIP"
+                    placeholder="TR_SEARCH_TOKENS"
+                    isExpanded={isExpanded}
+                    searchQuery={searchQuery}
+                    setExpanded={setExpanded}
+                    setSearch={setSearchQuery}
+                    onSearch={setSearchQuery}
+                    data-testid="@wallet/accounts/search-icon"
+                />
+                {showAddToken && (
+                    <IconButton
+                        icon="plus"
+                        size="small"
+                        variant="tertiary"
+                        onClick={handleAddToken}
+                    />
+                )}
+            </Row>
+        </Row>
+    );
+};
diff --git a/packages/suite/src/views/wallet/tokens/coins/components/CoinsTable.tsx b/packages/suite/src/views/wallet/tokens/coins/CoinsTable.tsx
similarity index 95%
rename from packages/suite/src/views/wallet/tokens/coins/components/CoinsTable.tsx
rename to packages/suite/src/views/wallet/tokens/coins/CoinsTable.tsx
index dcb7f254d6e..225145af6b3 100644
--- a/packages/suite/src/views/wallet/tokens/coins/components/CoinsTable.tsx
+++ b/packages/suite/src/views/wallet/tokens/coins/CoinsTable.tsx
@@ -10,10 +10,11 @@ import {
     sortTokensWithRates,
 } from 'src/utils/wallet/tokenUtils';
 import { useSelector } from 'src/hooks/suite';
-import { NoTokens } from '../../common/NoTokens';
-import { TokensTable } from '../../common/TokensTable/TokensTable';
 import { Translation } from 'src/components/suite';
 
+import { NoTokens } from '../common/NoTokens';
+import { TokensTable } from '../common/TokensTable/TokensTable';
+
 interface CoinsTableProps {
     selectedAccount: SelectedAccountLoaded;
     searchQuery: string;
diff --git a/packages/suite/src/views/wallet/tokens/coins/index.tsx b/packages/suite/src/views/wallet/tokens/coins/index.tsx
deleted file mode 100644
index 12659f75406..00000000000
--- a/packages/suite/src/views/wallet/tokens/coins/index.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useState } from 'react';
-
-import { WalletLayout } from 'src/components/wallet';
-import { useSelector } from 'src/hooks/suite';
-import { TokensLayout } from '../common/TokensLayout/TokensLayout';
-import { CoinsTable } from './components/CoinsTable';
-
-export const Coins = () => {
-    const [searchQuery, setSearchQuery] = useState('');
-
-    const { selectedAccount } = useSelector(state => state.wallet);
-
-    if (selectedAccount.status !== 'loaded') {
-        return <WalletLayout title="TR_TOKENS" account={selectedAccount} />;
-    }
-
-    return (
-        <TokensLayout
-            selectedAccount={selectedAccount}
-            searchQuery={searchQuery}
-            setSearchQuery={setSearchQuery}
-        >
-            <CoinsTable selectedAccount={selectedAccount} searchQuery={searchQuery} />
-        </TokensLayout>
-    );
-};
-
-export default Coins;
diff --git a/packages/suite/src/views/wallet/tokens/common/BlurUrls.tsx b/packages/suite/src/views/wallet/tokens/common/BlurUrls.tsx
index da374313063..3b797e7b3d8 100644
--- a/packages/suite/src/views/wallet/tokens/common/BlurUrls.tsx
+++ b/packages/suite/src/views/wallet/tokens/common/BlurUrls.tsx
@@ -1,9 +1,12 @@
 import { Fragment } from 'react';
+
 import styled from 'styled-components';
+
 import { Tooltip } from '@trezor/components';
+import { extractUrlsFromText } from '@trezor/utils';
+
 import { BlurWrapper } from 'src/components/wallet/TransactionItem/TransactionItemBlurWrapper';
 import { Translation } from 'src/components/suite';
-import { extractUrlsFromText } from '@trezor/utils';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledTooltip = styled(Tooltip)`
diff --git a/packages/suite/src/views/wallet/tokens/common/NoTokens.tsx b/packages/suite/src/views/wallet/tokens/common/NoTokens.tsx
index 4084610a59e..f5c2f9c69be 100644
--- a/packages/suite/src/views/wallet/tokens/common/NoTokens.tsx
+++ b/packages/suite/src/views/wallet/tokens/common/NoTokens.tsx
@@ -5,5 +5,5 @@ interface NoTokensProps {
 }
 
 export const NoTokens = ({ title }: NoTokensProps) => (
-    <AccountExceptionLayout title={title} image="CLOUDY" />
+    <AccountExceptionLayout title={title} iconName="coins" iconVariant="tertiary" />
 );
diff --git a/packages/suite/src/views/wallet/tokens/common/TokensLayout/TokensLayout.tsx b/packages/suite/src/views/wallet/tokens/common/TokensLayout/TokensLayout.tsx
deleted file mode 100644
index 3b00206850c..00000000000
--- a/packages/suite/src/views/wallet/tokens/common/TokensLayout/TokensLayout.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Dispatch, ReactNode, SetStateAction } from 'react';
-
-import { WalletLayout } from 'src/components/wallet';
-import { TokensLayoutNavigation } from './TokensLayoutNavigation';
-import type { SelectedAccountLoaded } from '@suite-common/wallet-types';
-
-interface TokensLayoutProps {
-    children: ReactNode;
-    selectedAccount: SelectedAccountLoaded;
-    searchQuery: string;
-    setSearchQuery: Dispatch<SetStateAction<string>>;
-}
-
-export const TokensLayout = ({
-    children,
-    selectedAccount,
-    searchQuery,
-    setSearchQuery,
-}: TokensLayoutProps) => (
-    <WalletLayout title="TR_TOKENS" account={selectedAccount}>
-        <TokensLayoutNavigation
-            selectedAccount={selectedAccount}
-            searchQuery={searchQuery}
-            setSearchQuery={setSearchQuery}
-        />
-        {children}
-    </WalletLayout>
-);
diff --git a/packages/suite/src/views/wallet/tokens/common/TokensLayout/TokensLayoutNavigation.tsx b/packages/suite/src/views/wallet/tokens/common/TokensLayout/TokensLayoutNavigation.tsx
deleted file mode 100644
index 1df99a85aa5..00000000000
--- a/packages/suite/src/views/wallet/tokens/common/TokensLayout/TokensLayoutNavigation.tsx
+++ /dev/null
@@ -1,176 +0,0 @@
-import { Dispatch, SetStateAction, useEffect, useState } from 'react';
-import styled, { css } from 'styled-components';
-
-import { TranslationKey } from '@suite-common/intl-types';
-import { Route } from '@suite-common/suite-types';
-import { SelectedAccountLoaded } from '@suite-common/wallet-types';
-import { selectCoinDefinitions } from '@suite-common/token-definitions';
-import { Elevation, borders, spacingsPx, mapElevationToBorder, typography } from '@trezor/theme';
-import { IconButton, IconName, useElevation, variables } from '@trezor/components';
-import { EventType, analytics } from '@trezor/suite-analytics';
-
-import { useDispatch, useSelector } from 'src/hooks/suite';
-import { NavigationItem } from '../../../../../components/suite/layouts/SuiteLayout/Sidebar/NavigationItem';
-import { getTokens } from 'src/utils/wallet/tokenUtils';
-import { selectIsDebugModeActive } from 'src/reducers/suite/suiteReducer';
-import { SearchAction } from 'src/components/wallet/SearchAction';
-import { openModal } from 'src/actions/suite/modalActions';
-
-const Wrapper = styled.div`
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-bottom: ${spacingsPx.md};
-`;
-
-const Actions = styled.div`
-    display: flex;
-    align-items: center;
-`;
-
-const List = styled.div`
-    display: flex;
-    align-items: center;
-    gap: ${spacingsPx.xxs};
-`;
-
-const NavListItem = styled(NavigationItem)`
-    gap: ${spacingsPx.xs};
-    padding: ${spacingsPx.xs} ${spacingsPx.md};
-    ${typography.hint}
-
-    ${({ isActive }) =>
-        isActive &&
-        css`
-            border-radius: ${borders.radii.full};
-        `}
-`;
-
-const StyledDivider = styled.div<{ $elevation: Elevation }>`
-    margin: ${spacingsPx.xs} ${spacingsPx.xxs};
-    border-left: 1px solid ${mapElevationToBorder};
-
-    ${variables.SCREEN_QUERY.BELOW_LAPTOP} {
-        margin: 0 ${spacingsPx.xxs};
-        flex-direction: row;
-        border-bottom: 0;
-        border-right: 1px solid ${mapElevationToBorder};
-    }
-`;
-
-const Divider = () => {
-    const { elevation } = useElevation();
-
-    return <StyledDivider $elevation={elevation} />;
-};
-
-interface TokensLayoutNavigationProps {
-    selectedAccount: SelectedAccountLoaded;
-    searchQuery: string;
-    setSearchQuery: Dispatch<SetStateAction<string>>;
-}
-
-const Item = ({
-    route,
-    title,
-    icon,
-    currentRoute,
-    count,
-}: {
-    route: Route['name'];
-    title: TranslationKey;
-    icon: IconName;
-    currentRoute?: Route['name'];
-    count?: number;
-}) => (
-    <NavListItem
-        nameId={title}
-        isActive={currentRoute === route}
-        icon={icon}
-        goToRoute={route}
-        preserveParams
-        iconSize="mediumLarge"
-        itemsCount={count}
-    />
-);
-
-export const TokensLayoutNavigation = ({
-    selectedAccount,
-    searchQuery,
-    setSearchQuery,
-}: TokensLayoutNavigationProps) => {
-    const { account } = selectedAccount;
-
-    const [isExpanded, setExpanded] = useState(false);
-
-    const routeName = useSelector(state => state.router.route?.name);
-    const coinDefinitions = useSelector(state =>
-        selectCoinDefinitions(state, selectedAccount.account.symbol),
-    );
-    const isDebug = useSelector(selectIsDebugModeActive);
-    const dispatch = useDispatch();
-
-    const tokens = getTokens(
-        selectedAccount.account.tokens || [],
-        selectedAccount.account.symbol,
-        coinDefinitions,
-    );
-    const showAddToken = ['ethereum'].includes(account.networkType) && isDebug;
-
-    const handleAddToken = () => {
-        if (account.symbol) {
-            analytics.report({
-                type: EventType.AccountsActions,
-                payload: { symbol: account.symbol, action: 'add-token' },
-            });
-        }
-        dispatch(openModal({ type: 'add-token' }));
-    };
-
-    useEffect(() => {
-        setSearchQuery('');
-        setExpanded(false);
-    }, [account.symbol, account.index, account.accountType, setSearchQuery]);
-
-    return (
-        <Wrapper>
-            <List>
-                <Item
-                    route="wallet-tokens-coins"
-                    title="TR_COINS"
-                    icon="tokens"
-                    count={tokens.shownWithBalance.length}
-                    currentRoute={routeName}
-                />
-                <Divider />
-                <Item
-                    route="wallet-tokens-hidden"
-                    title="TR_HIDDEN"
-                    icon="hide"
-                    count={tokens.hiddenWithBalance.length || undefined}
-                    currentRoute={routeName}
-                />
-            </List>
-            <Actions>
-                <SearchAction
-                    tooltipText="TR_TOKENS_SEARCH_TOOLTIP"
-                    placeholder="TR_SEARCH_TOKENS"
-                    isExpanded={isExpanded}
-                    searchQuery={searchQuery}
-                    setExpanded={setExpanded}
-                    setSearch={setSearchQuery}
-                    onSearch={setSearchQuery}
-                    data-testid="@wallet/accounts/search-icon"
-                />
-                {showAddToken && (
-                    <IconButton
-                        icon="plus"
-                        size="small"
-                        variant="tertiary"
-                        onClick={handleAddToken}
-                    />
-                )}
-            </Actions>
-        </Wrapper>
-    );
-};
diff --git a/packages/suite/src/views/wallet/tokens/common/TokensTable/TokenRow.tsx b/packages/suite/src/views/wallet/tokens/common/TokensTable/TokenRow.tsx
index 317259bd4e2..8f66fcd8e7d 100644
--- a/packages/suite/src/views/wallet/tokens/common/TokensTable/TokenRow.tsx
+++ b/packages/suite/src/views/wallet/tokens/common/TokensTable/TokenRow.tsx
@@ -7,10 +7,10 @@ import {
     DefinitionType,
     EnhancedTokenInfo,
     TokenManagementAction,
-    getContractAddressForNetwork,
     selectIsSpecificCoinDefinitionKnown,
     tokenDefinitionsActions,
 } from '@suite-common/token-definitions';
+import { getContractAddressForNetwork } from '@suite-common/wallet-utils';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { copyToClipboard } from '@trezor/dom-utils';
 import {
@@ -44,7 +44,6 @@ import {
     useTranslation,
 } from 'src/hooks/suite';
 import { goto } from 'src/actions/suite/routerActions';
-import { BlurUrls } from '../BlurUrls';
 import { showAddress } from 'src/actions/wallet/receiveActions';
 import { getUnusedAddressFromAccount } from 'src/utils/wallet/coinmarket/coinmarketUtils';
 import { openModal } from 'src/actions/suite/modalActions';
@@ -55,6 +54,8 @@ import {
 } from 'src/reducers/suite/suiteReducer';
 import { SUITE } from 'src/actions/suite/constants';
 
+import { BlurUrls } from '../BlurUrls';
+
 const ContractAddress = styled.div`
     display: inline-block;
     max-width: 200px;
@@ -179,7 +180,6 @@ export const TokenRow = ({
                         <FormattedCryptoAmount
                             value={token.balance}
                             symbol={formatTokenSymbol(token.symbol || '')}
-                            isBalance
                         />
                     </Text>
                 </Column>
diff --git a/packages/suite/src/views/wallet/tokens/common/TokensTable/TokensTable.tsx b/packages/suite/src/views/wallet/tokens/common/TokensTable/TokensTable.tsx
index 9af92bd2538..3c2f8eb251c 100644
--- a/packages/suite/src/views/wallet/tokens/common/TokensTable/TokensTable.tsx
+++ b/packages/suite/src/views/wallet/tokens/common/TokensTable/TokensTable.tsx
@@ -1,4 +1,5 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
 
 import { Account } from '@suite-common/wallet-types';
@@ -8,6 +9,7 @@ import { spacings } from '@trezor/theme';
 import { Icon, Table, Paragraph, Card, Row, Text } from '@trezor/components';
 
 import { Translation } from 'src/components/suite';
+
 import { TokenRow } from './TokenRow';
 
 const IconWrapper = styled.div<{ $isActive: boolean }>`
@@ -16,7 +18,7 @@ const IconWrapper = styled.div<{ $isActive: boolean }>`
 `;
 
 const ZeroBalanceToggle = styled.div`
-    cursor: pointer;
+    user-select: none;
 `;
 
 interface TokensTableProps {
@@ -42,22 +44,21 @@ export const TokensTable = ({
 }: TokensTableProps) => {
     const [isZeroBalanceOpen, setIsZeroBalanceOpen] = useState(false);
 
-    // first two columns have fixed width, the rest have variable width
-    // in case of 2nd column, it's due to HiddenPlaceholder - it changes content width when hovered
-    const colWidths = ['250px', '250px'];
-
     return (
         <Card paddingType="none" overflow="hidden">
             {tokensWithBalance.length === 0 && tokensWithoutBalance.length === 0 && searchQuery ? (
-                <Paragraph
-                    typographyStyle="highlight"
-                    margin={{ top: spacings.xxl, bottom: spacings.xxl }}
-                    align="center"
-                >
+                <Paragraph margin={{ top: spacings.xxl, bottom: spacings.xxl }} align="center">
                     <Translation id="TR_NO_SEARCH_RESULTS" />
                 </Paragraph>
             ) : (
-                <Table margin={{ top: spacings.xs, bottom: spacings.xs }} colWidths={colWidths}>
+                <Table
+                    margin={{ top: spacings.xs }}
+                    colWidths={[
+                        { minWidth: '200px', maxWidth: '250px' },
+                        { minWidth: '140px', maxWidth: '250px' }, // due to HiddenPlaceholder - it changes content width when hovered
+                    ]}
+                    isRowHighlightedOnHover
+                >
                     <Table.Header>
                         <Table.Row>
                             <Table.Cell>
@@ -92,12 +93,10 @@ export const TokensTable = ({
                         ))}
                         {tokensWithoutBalance.length !== 0 && (
                             <>
-                                <Table.Row>
-                                    <Table.Cell colSpan={2}>
-                                        <ZeroBalanceToggle
-                                            onClick={() => setIsZeroBalanceOpen(!isZeroBalanceOpen)}
-                                        >
-                                            <Row gap={spacings.xs} margin={{ top: spacings.md }}>
+                                <Table.Row onClick={() => setIsZeroBalanceOpen(!isZeroBalanceOpen)}>
+                                    <Table.Cell colSpan={1}>
+                                        <ZeroBalanceToggle>
+                                            <Row gap={spacings.xs}>
                                                 <IconWrapper $isActive={isZeroBalanceOpen}>
                                                     <Icon
                                                         size={18}
@@ -111,6 +110,7 @@ export const TokensTable = ({
                                             </Row>
                                         </ZeroBalanceToggle>
                                     </Table.Cell>
+                                    <Table.Cell colSpan={hideRates ? 2 : 4} />
                                 </Table.Row>
                                 {tokensWithoutBalance.map(token => (
                                     <TokenRow
diff --git a/packages/suite/src/views/wallet/tokens/hidden-tokens/components/HiddenTokensTable.tsx b/packages/suite/src/views/wallet/tokens/hidden-tokens/HiddenTokensTable.tsx
similarity index 96%
rename from packages/suite/src/views/wallet/tokens/hidden-tokens/components/HiddenTokensTable.tsx
rename to packages/suite/src/views/wallet/tokens/hidden-tokens/HiddenTokensTable.tsx
index a66406f3ec5..a23265a9784 100644
--- a/packages/suite/src/views/wallet/tokens/hidden-tokens/components/HiddenTokensTable.tsx
+++ b/packages/suite/src/views/wallet/tokens/hidden-tokens/HiddenTokensTable.tsx
@@ -1,14 +1,15 @@
 import { SelectedAccountLoaded } from '@suite-common/wallet-types';
 import { TokenManagementAction, selectCoinDefinitions } from '@suite-common/token-definitions';
+import { spacings } from '@trezor/theme';
+import { Banner, H3, Column } from '@trezor/components';
+import { isTestnet } from '@suite-common/wallet-utils';
 
 import { getTokens } from 'src/utils/wallet/tokenUtils';
 import { useSelector } from 'src/hooks/suite';
-import { NoTokens } from '../../common/NoTokens';
-import { TokensTable } from '../../common/TokensTable/TokensTable';
 import { Translation } from 'src/components/suite';
-import { spacings } from '@trezor/theme';
-import { Banner, H3, Column } from '@trezor/components';
-import { isTestnet } from '@suite-common/wallet-utils';
+
+import { NoTokens } from '../common/NoTokens';
+import { TokensTable } from '../common/TokensTable/TokensTable';
 
 interface HiddenTokensTableProps {
     selectedAccount: SelectedAccountLoaded;
diff --git a/packages/suite/src/views/wallet/tokens/hidden-tokens/index.tsx b/packages/suite/src/views/wallet/tokens/hidden-tokens/index.tsx
deleted file mode 100644
index 252a0046651..00000000000
--- a/packages/suite/src/views/wallet/tokens/hidden-tokens/index.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useState } from 'react';
-
-import { WalletLayout } from 'src/components/wallet';
-import { useSelector } from 'src/hooks/suite';
-import { TokensLayout } from '../common/TokensLayout/TokensLayout';
-import { HiddenTokensTable } from './components/HiddenTokensTable';
-
-export const HiddenTokens = () => {
-    const [searchQuery, setSearchQuery] = useState('');
-
-    const { selectedAccount } = useSelector(state => state.wallet);
-
-    if (selectedAccount.status !== 'loaded') {
-        return <WalletLayout title="TR_TOKENS" account={selectedAccount} />;
-    }
-
-    return (
-        <TokensLayout
-            selectedAccount={selectedAccount}
-            searchQuery={searchQuery}
-            setSearchQuery={setSearchQuery}
-        >
-            <HiddenTokensTable selectedAccount={selectedAccount} searchQuery={searchQuery} />
-        </TokensLayout>
-    );
-};
-
-export default HiddenTokens;
diff --git a/packages/suite/src/views/wallet/tokens/index.tsx b/packages/suite/src/views/wallet/tokens/index.tsx
new file mode 100644
index 00000000000..fc4d79af225
--- /dev/null
+++ b/packages/suite/src/views/wallet/tokens/index.tsx
@@ -0,0 +1,53 @@
+import { useState, useEffect } from 'react';
+import { Route, Switch } from 'react-router-dom';
+
+import { WalletLayout } from 'src/components/wallet';
+import { useDispatch, useSelector } from 'src/hooks/suite';
+import { goto } from 'src/actions/suite/routerActions';
+
+import { CoinsTable } from './coins/CoinsTable';
+import { TokensNavigation } from './TokensNavigation';
+import { HiddenTokensTable } from './hidden-tokens/HiddenTokensTable';
+
+export const Tokens = () => {
+    const [searchQuery, setSearchQuery] = useState('');
+
+    const { selectedAccount } = useSelector(state => state.wallet);
+    const dispatch = useDispatch();
+
+    useEffect(() => {
+        if (
+            selectedAccount.status === 'loaded' &&
+            !selectedAccount.network?.features.includes('tokens')
+        ) {
+            dispatch(goto('wallet-index', { preserveParams: true }));
+        }
+    }, [selectedAccount, dispatch]);
+
+    if (selectedAccount.status !== 'loaded') {
+        return <WalletLayout title="TR_TOKENS" account={selectedAccount} />;
+    }
+
+    return (
+        <WalletLayout title="TR_TOKENS" account={selectedAccount}>
+            <TokensNavigation
+                selectedAccount={selectedAccount}
+                searchQuery={searchQuery}
+                setSearchQuery={setSearchQuery}
+            />
+            <Switch>
+                <Route path={`${process.env.ASSET_PREFIX}/accounts/tokens/hidden`}>
+                    <HiddenTokensTable
+                        selectedAccount={selectedAccount}
+                        searchQuery={searchQuery}
+                    />
+                </Route>
+                <Route path="*">
+                    <CoinsTable selectedAccount={selectedAccount} searchQuery={searchQuery} />
+                </Route>
+            </Switch>
+        </WalletLayout>
+    );
+};
+
+export default Tokens;
diff --git a/packages/suite/src/views/wallet/transactions/CoinjoinExplanation/CoinjoinExplanation.tsx b/packages/suite/src/views/wallet/transactions/CoinjoinExplanation/CoinjoinExplanation.tsx
index 6187cffa232..1f52264e455 100644
--- a/packages/suite/src/views/wallet/transactions/CoinjoinExplanation/CoinjoinExplanation.tsx
+++ b/packages/suite/src/views/wallet/transactions/CoinjoinExplanation/CoinjoinExplanation.tsx
@@ -4,12 +4,13 @@ import { darken } from 'polished';
 import { Card, Icon, variables } from '@trezor/components';
 import { HELP_CENTER_COINJOIN_URL } from '@trezor/urls';
 import { mediaQueries } from '@trezor/styles';
+import { spacings, spacingsPx, typography } from '@trezor/theme';
 
 import { Translation } from 'src/components/suite';
-import { CoinjoinProcessStep, CoinjoinProcessStepProps } from './CoinjoinProcessStep';
-import { spacings, spacingsPx, typography } from '@trezor/theme';
 import { LearnMoreButton } from 'src/components/suite/LearnMoreButton';
 
+import { CoinjoinProcessStep, CoinjoinProcessStepProps } from './CoinjoinProcessStep';
+
 // eslint-disable-next-line local-rules/no-override-ds-component
 const Container = styled(Card)`
     background: ${({ theme }) => theme.backgroundTertiaryDefaultOnElevation0};
diff --git a/packages/suite/src/views/wallet/transactions/CoinjoinExplanation/CoinjoinProcessStep.tsx b/packages/suite/src/views/wallet/transactions/CoinjoinExplanation/CoinjoinProcessStep.tsx
index 6757404661c..37bdbce69f8 100644
--- a/packages/suite/src/views/wallet/transactions/CoinjoinExplanation/CoinjoinProcessStep.tsx
+++ b/packages/suite/src/views/wallet/transactions/CoinjoinExplanation/CoinjoinProcessStep.tsx
@@ -1,6 +1,9 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { H3, Image, ImageType, Paragraph, variables } from '@trezor/components';
+
 import { Translation } from 'src/components/suite/Translation';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
diff --git a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/BalancePrivacyBreakdown/BalancePrivacyBreakdown.tsx b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/BalancePrivacyBreakdown/BalancePrivacyBreakdown.tsx
index a9841f60d37..267c03b8a5b 100644
--- a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/BalancePrivacyBreakdown/BalancePrivacyBreakdown.tsx
+++ b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/BalancePrivacyBreakdown/BalancePrivacyBreakdown.tsx
@@ -2,6 +2,7 @@ import styled, { useTheme } from 'styled-components';
 
 import { Icon } from '@trezor/components';
 import { isZero } from '@suite-common/wallet-utils';
+
 import { Translation } from 'src/components/suite/Translation';
 import { useSelector } from 'src/hooks/suite';
 import {
@@ -9,12 +10,14 @@ import {
     selectCurrentCoinjoinSession,
 } from 'src/reducers/wallet/coinjoinReducer';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
+
 import { CryptoAmountWithHeader } from './CryptoAmountWithHeader';
 
 const BalanceContainer = styled.div`
     display: flex;
     flex-wrap: wrap;
     align-items: center;
+    align-self: normal;
     gap: 12px;
     padding: 0 10px;
 `;
diff --git a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/BalancePrivacyBreakdown/CryptoAmountWithHeader.tsx b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/BalancePrivacyBreakdown/CryptoAmountWithHeader.tsx
index a969401e7a1..d39ad6cfaa6 100644
--- a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/BalancePrivacyBreakdown/CryptoAmountWithHeader.tsx
+++ b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/BalancePrivacyBreakdown/CryptoAmountWithHeader.tsx
@@ -1,11 +1,14 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
-import { FiatValue } from 'src/components/suite/FiatValue';
-import { FormattedCryptoAmount } from 'src/components/suite/FormattedCryptoAmount';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { formatNetworkAmount } from '@suite-common/wallet-utils';
 
+import { FiatValue } from 'src/components/suite/FiatValue';
+import { FormattedCryptoAmount } from 'src/components/suite/FormattedCryptoAmount';
+
 const Container = styled.div`
     display: flex;
     flex-direction: column;
diff --git a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinBalanceError.tsx b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinBalanceError.tsx
index 94fa58d6ca0..54cb5fb4ab6 100644
--- a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinBalanceError.tsx
+++ b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinBalanceError.tsx
@@ -1,6 +1,8 @@
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
 import { TranslationKey } from '@suite-common/intl-types';
+
 import { Translation } from 'src/components/suite/Translation';
 
 const StyledBalanceContainer = styled.div`
diff --git a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinBalanceSection.tsx b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinBalanceSection.tsx
index 3295e8f9f84..d208348bb60 100644
--- a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinBalanceSection.tsx
+++ b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinBalanceSection.tsx
@@ -1,10 +1,13 @@
 import { useMemo } from 'react';
+
 import styled, { useTheme } from 'styled-components';
 
 import { selectHasAccountTransactions } from '@suite-common/wallet-core';
 import { Card, Column } from '@trezor/components';
+
 import { useSelector } from 'src/hooks/suite';
 import { selectHasAnonymitySetError } from 'src/reducers/wallet/coinjoinReducer';
+
 import { BalancePrivacyBreakdown } from './BalancePrivacyBreakdown/BalancePrivacyBreakdown';
 import { CoinjoinBalanceError, CoinjoinBalanceErrorProps } from './CoinjoinBalanceError';
 import { CoinjoinStatusWheel } from './CoinjoinStatusWheel/CoinjoinStatusWheel';
@@ -48,7 +51,7 @@ export const CoinjoinBalanceSection = ({ accountKey }: CoinjoinBalanceSectionPro
     return (
         <Container>
             <Card width="100%" height="100%">
-                <Column justifyContent="center">
+                <Column justifyContent="center" flex="1">
                     {errorMessageConfig ? (
                         <CoinjoinBalanceError {...errorMessageConfig} />
                     ) : (
diff --git a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinProgressContent.tsx b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinProgressContent.tsx
index 73ffe56144b..0a6347a1df9 100644
--- a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinProgressContent.tsx
+++ b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinProgressContent.tsx
@@ -1,5 +1,10 @@
+import { FormattedNumber } from 'react-intl';
+
 import styled, { useTheme } from 'styled-components';
+
 import { Spinner, Icon, Tooltip } from '@trezor/components';
+import { spacings, spacingsPx, typography } from '@trezor/theme';
+
 import { Translation } from 'src/components/suite/Translation';
 import { CountdownTimer } from 'src/components/suite/CountdownTimer';
 import { useSelector } from 'src/hooks/suite/useSelector';
@@ -9,8 +14,6 @@ import {
     selectRoundsDurationInHours,
 } from 'src/reducers/wallet/coinjoinReducer';
 import { useCoinjoinSessionBlockers } from 'src/hooks/coinjoin/useCoinjoinSessionBlockers';
-import { FormattedNumber } from 'react-intl';
-import { spacings, spacingsPx, typography } from '@trezor/theme';
 
 export const Container = styled.div<{ $isWide: boolean }>`
     width: ${({ $isWide }) => `calc(100% - ${$isWide ? 12 : 8}px)`};
diff --git a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinProgressWheel.tsx b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinProgressWheel.tsx
index 5b65cad1a90..84bb151597c 100644
--- a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinProgressWheel.tsx
+++ b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinProgressWheel.tsx
@@ -1,11 +1,10 @@
 import { useCallback, useState } from 'react';
+
 import styled, { css, DefaultTheme, keyframes } from 'styled-components';
-import { Tooltip } from '@trezor/components';
-import {
-    CoinjoinProgressContent,
-    Container as ProgressContentContainer,
-} from './CoinjoinProgressContent';
 import { lighten, rgba } from 'polished';
+
+import { Tooltip } from '@trezor/components';
+
 import { useSelector } from 'src/hooks/suite/useSelector';
 import {
     selectCurrentCoinjoinWheelStates,
@@ -23,6 +22,11 @@ import {
     coinjoinSessionAutostop,
 } from 'src/actions/wallet/coinjoinAccountActions';
 
+import {
+    CoinjoinProgressContent,
+    Container as ProgressContentContainer,
+} from './CoinjoinProgressContent';
+
 export const DELAYED_SPIN = keyframes`
     0% {
         transform: rotate(0deg);
diff --git a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinStatusMessage.tsx b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinStatusMessage.tsx
index 7bf5f33119b..421b279cb8e 100644
--- a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinStatusMessage.tsx
+++ b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinStatusMessage.tsx
@@ -1,4 +1,7 @@
 import styled from 'styled-components';
+
+import { typography, spacingsPx } from '@trezor/theme';
+
 import { SESSION_PHASE_MESSAGES } from 'src/constants/suite/coinjoin';
 import { Translation } from 'src/components/suite/Translation';
 import { CountdownTimer } from 'src/components/suite';
@@ -8,7 +11,6 @@ import {
     selectCurrentCoinjoinWheelStates,
     selectCurrentSessionDeadlineInfo,
 } from 'src/reducers/wallet/coinjoinReducer';
-import { typography, spacingsPx } from '@trezor/theme';
 
 const Cointainer = styled.div`
     height: 40px;
diff --git a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinStatusWheel.tsx b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinStatusWheel.tsx
index 84d563aad7a..3ecec8c1361 100644
--- a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinStatusWheel.tsx
+++ b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinStatusWheel/CoinjoinStatusWheel.tsx
@@ -1,13 +1,16 @@
 import styled from 'styled-components';
+
 import { Card, Button } from '@trezor/components';
-import { CoinjoinProgressWheel } from './CoinjoinProgressWheel';
-import { CoinjoinStatusMessage } from './CoinjoinStatusMessage';
+import { typography } from '@trezor/theme';
+
 import { useSelector } from 'src/hooks/suite/useSelector';
 import { selectCurrentCoinjoinWheelStates } from 'src/reducers/wallet/coinjoinReducer';
 import { Translation } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite';
 import { stopCoinjoinSession } from 'src/actions/wallet/coinjoinClientActions';
-import { typography } from '@trezor/theme';
+
+import { CoinjoinStatusMessage } from './CoinjoinStatusMessage';
+import { CoinjoinProgressWheel } from './CoinjoinProgressWheel';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const Container = styled(Card)<{ $isWide?: boolean }>`
diff --git a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinSummary.tsx b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinSummary.tsx
index f17581c5eb0..ba8ca086be5 100644
--- a/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinSummary.tsx
+++ b/packages/suite/src/views/wallet/transactions/CoinjoinSummary/CoinjoinSummary.tsx
@@ -1,5 +1,7 @@
 import styled from 'styled-components';
+
 import { H3 } from '@trezor/components';
+
 import { Translation } from 'src/components/suite/Translation';
 
 import { CoinjoinBalanceSection } from './CoinjoinBalanceSection';
diff --git a/packages/suite/src/views/wallet/transactions/TradeBox/TradeBox.tsx b/packages/suite/src/views/wallet/transactions/TradeBox/TradeBox.tsx
index 5d1b1b7c4fa..b8c1c36fb82 100644
--- a/packages/suite/src/views/wallet/transactions/TradeBox/TradeBox.tsx
+++ b/packages/suite/src/views/wallet/transactions/TradeBox/TradeBox.tsx
@@ -1,13 +1,15 @@
 import styled from 'styled-components';
 
 import { spacings, spacingsPx, typography } from '@trezor/theme';
+import { Card, Row, variables } from '@trezor/components';
+import { getTitleForNetwork } from '@suite-common/wallet-utils';
+import { CoinLogo } from '@trezor/product-components';
+
 import { Account } from 'src/types/wallet';
 import { Translation } from 'src/components/suite';
-import { Card, Row, variables } from '@trezor/components';
+
 import { TradeBoxMenu } from './TradeBoxMenu';
 import { TradeBoxPrices } from './TradeBoxPrices';
-import { getTitleForNetwork } from '@suite-common/wallet-utils';
-import { CoinLogo } from '@trezor/product-components';
 
 // eslint-disable-next-line local-rules/no-override-ds-component
 const StyledCard = styled(Card)`
diff --git a/packages/suite/src/views/wallet/transactions/TradeBox/TradeBoxMenu.tsx b/packages/suite/src/views/wallet/transactions/TradeBox/TradeBoxMenu.tsx
index 575539aa263..38108bb8109 100644
--- a/packages/suite/src/views/wallet/transactions/TradeBox/TradeBoxMenu.tsx
+++ b/packages/suite/src/views/wallet/transactions/TradeBox/TradeBoxMenu.tsx
@@ -1,14 +1,17 @@
+import { ReactNode } from 'react';
+
+import styled, { css } from 'styled-components';
+
 import { Route } from '@suite-common/suite-types';
 import { Account } from '@suite-common/wallet-types';
 import { Button, variables } from '@trezor/components';
-import { FirmwareType } from '@trezor/connect';
+import { hasBitcoinOnlyFirmware } from '@trezor/device-utils';
 import { EventType, analytics } from '@trezor/suite-analytics';
 import { spacingsPx } from '@trezor/theme';
-import { ReactNode } from 'react';
+
 import { goto } from 'src/actions/suite/routerActions';
 import { Translation } from 'src/components/suite';
 import { useDevice, useDispatch } from 'src/hooks/suite';
-import styled, { css } from 'styled-components';
 
 const Wrapper = styled.div`
     display: flex;
@@ -61,13 +64,7 @@ export const TradeBoxMenu = ({ account }: TradeBoxMenuProps) => {
     return (
         <Wrapper>
             {menuItems
-                .filter(
-                    item =>
-                        !(
-                            item.type === 'exchange' &&
-                            device?.firmwareType === FirmwareType.BitcoinOnly
-                        ),
-                )
+                .filter(item => !(item.type === 'exchange' && hasBitcoinOnlyFirmware(device)))
                 .map(item => (
                     <StyledButton
                         $isHideable={!!item.isHideable}
diff --git a/packages/suite/src/views/wallet/transactions/TradeBox/TradeBoxPrices.tsx b/packages/suite/src/views/wallet/transactions/TradeBox/TradeBoxPrices.tsx
index a5161e3b885..5e1f2ca69a5 100644
--- a/packages/suite/src/views/wallet/transactions/TradeBox/TradeBoxPrices.tsx
+++ b/packages/suite/src/views/wallet/transactions/TradeBox/TradeBoxPrices.tsx
@@ -1,10 +1,13 @@
+import { PropsWithChildren, ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
 import { spacingsPx, typography } from '@trezor/theme';
-import { PropsWithChildren, ReactNode } from 'react';
+import { networks } from '@suite-common/wallet-config';
+
 import { PriceTicker, Translation, TrendTicker } from 'src/components/suite';
 import { Account } from 'src/types/wallet';
-import { networks } from '@suite-common/wallet-config';
 
 const Wrapper = styled.div`
     display: flex;
diff --git a/packages/suite/src/views/wallet/transactions/TransactionList/NoSearchResults.tsx b/packages/suite/src/views/wallet/transactions/TransactionList/NoSearchResults.tsx
index e3b3b586d11..691592e1fd2 100644
--- a/packages/suite/src/views/wallet/transactions/TransactionList/NoSearchResults.tsx
+++ b/packages/suite/src/views/wallet/transactions/TransactionList/NoSearchResults.tsx
@@ -1,10 +1,13 @@
 import { useState } from 'react';
+
 import styled from 'styled-components';
+
 import { Card, Column, variables } from '@trezor/components';
-import { Translation } from 'src/components/suite';
-import { getRandomNumberInRange } from '@trezor/utils';
+import { getWeakRandomNumberInRange } from '@trezor/utils';
 import { typography } from '@trezor/theme';
 
+import { Translation } from 'src/components/suite';
+
 const NoResults = styled.div`
     text-align: center;
     color: ${({ theme }) => theme.legacy.TYPE_DARK_GREY};
@@ -46,7 +49,7 @@ const getTip = (num: number) => {
 };
 
 export const NoSearchResults = () => {
-    const [tip] = useState(getRandomNumberInRange(1, 10));
+    const [tip] = useState(getWeakRandomNumberInRange(1, 10));
 
     return (
         <Card>
diff --git a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionCandidates.tsx b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionCandidates.tsx
index dec60139855..b8b5f8a56d0 100644
--- a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionCandidates.tsx
+++ b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionCandidates.tsx
@@ -1,7 +1,9 @@
 import styled from 'styled-components';
+
 import { resolveStaticPath } from '@suite-common/suite-utils';
 import { Card, SVG_IMAGES, variables } from '@trezor/components';
 import { zIndices } from '@trezor/theme';
+
 import { useSelector } from 'src/hooks/suite';
 import { selectCoinjoinAccountByKey } from 'src/reducers/wallet/coinjoinReducer';
 import { TransactionTypeIcon } from 'src/components/wallet/TransactionItem/TransactionTypeIcon';
diff --git a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionGroupedList.tsx b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionGroupedList.tsx
index 92add38607c..1a13e31630e 100644
--- a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionGroupedList.tsx
+++ b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionGroupedList.tsx
@@ -4,14 +4,16 @@ import {
     groupJointTransactions,
 } from '@suite-common/wallet-utils';
 import { getNetwork } from '@suite-common/wallet-config';
+
 import { CoinjoinBatchItem } from 'src/components/wallet/TransactionItem/CoinjoinBatchItem';
 import { useSelector } from 'src/hooks/suite';
 import { Account, WalletAccountTransaction } from 'src/types/wallet';
 import { TransactionItem } from 'src/components/wallet/TransactionItem/TransactionItem';
-import { TransactionsGroup } from './TransactionsGroup/TransactionsGroup';
 import { selectLabelingDataForAccount } from 'src/reducers/suite/metadataReducer';
 import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
 
+import { TransactionsGroup } from './TransactionsGroup/TransactionsGroup';
+
 interface TransactionGroupedListProps {
     transactionGroups: GroupedTransactionsByDate;
     symbol: WalletAccountTransaction['symbol'];
diff --git a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionList.tsx b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionList.tsx
index 819602cf989..2727ed99aa2 100644
--- a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionList.tsx
+++ b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionList.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
+
 import styled from 'styled-components';
 import useDebounce from 'react-use/lib/useDebounce';
 
@@ -12,19 +13,21 @@ import {
     groupTransactionsByDate,
     isPending,
 } from '@suite-common/wallet-utils';
+import { getTxsPerPage } from '@suite-common/suite-utils';
+import { SkeletonStack } from '@trezor/components';
+
 import { Translation } from 'src/components/suite';
 import { DashboardSection } from 'src/components/dashboard';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { Account, WalletAccountTransaction } from 'src/types/wallet';
-import { TransactionListActions } from './TransactionListActions/TransactionListActions';
 import { Pagination } from 'src/components/wallet';
+import { findAnchorTransactionPage } from 'src/utils/suite/anchor';
+import { selectLabelingDataForAccount } from 'src/reducers/suite/metadataReducer';
+
+import { TransactionListActions } from './TransactionListActions/TransactionListActions';
 import { SkeletonTransactionItem } from './SkeletonTransactionItem';
 import { NoSearchResults } from './NoSearchResults';
-import { findAnchorTransactionPage } from 'src/utils/suite/anchor';
 import { TransactionCandidates } from './TransactionCandidates';
-import { selectLabelingDataForAccount } from 'src/reducers/suite/metadataReducer';
-import { getTxsPerPage } from '@suite-common/suite-utils';
-import { SkeletonStack } from '@trezor/components';
 import { PendingGroupHeader } from './TransactionsGroup/PendingGroupHeader';
 import { TransactionGroupedList } from './TransactionGroupedList';
 
diff --git a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionListActions/ExportAction.tsx b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionListActions/ExportAction.tsx
index 26c69cd2c70..4e20e3716cf 100644
--- a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionListActions/ExportAction.tsx
+++ b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionListActions/ExportAction.tsx
@@ -1,18 +1,20 @@
 import { useState, useCallback } from 'react';
+
 import { Spinner, Dropdown } from '@trezor/components';
 import { analytics, EventType } from '@trezor/suite-analytics';
+import { notificationsActions } from '@suite-common/toast-notifications';
+import { fetchAllTransactionsForAccountThunk } from '@suite-common/wallet-core';
+import { ExportFileType } from '@suite-common/wallet-types';
+import { getTitleForNetwork, getTitleForCoinjoinAccount } from '@suite-common/wallet-utils';
+import { AccountLabels } from '@suite-common/metadata-types';
+
 import { Translation } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite';
 import { useTranslation } from 'src/hooks/suite/useTranslation';
 import { useSelector } from 'src/hooks/suite/useSelector';
-import { notificationsActions } from '@suite-common/toast-notifications';
-import { fetchAllTransactionsForAccountThunk } from '@suite-common/wallet-core';
 import { exportTransactionsThunk } from 'src/actions/wallet/exportTransactionsActions';
-import { ExportFileType } from '@suite-common/wallet-types';
 import { Account } from 'src/types/wallet';
-import { getTitleForNetwork, getTitleForCoinjoinAccount } from '@suite-common/wallet-utils';
 import { selectLabelingDataForSelectedAccount } from 'src/reducers/suite/metadataReducer';
-import { AccountLabels } from '@suite-common/metadata-types';
 
 export interface ExportActionProps {
     account: Account;
diff --git a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionListActions/TransactionListActions.tsx b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionListActions/TransactionListActions.tsx
index 083e20cf1f7..e5e762f6100 100644
--- a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionListActions/TransactionListActions.tsx
+++ b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionListActions/TransactionListActions.tsx
@@ -1,15 +1,18 @@
+import { Dispatch, SetStateAction, useCallback, useEffect, useState } from 'react';
+
 import styled from 'styled-components';
 
-import { SearchAction } from 'src/components/wallet/SearchAction';
-import { ExportAction } from './ExportAction';
-import { Dispatch, SetStateAction, useCallback, useEffect, useState } from 'react';
-import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import { fetchAllTransactionsForAccountThunk } from '@suite-common/wallet-core';
 import { Account } from '@suite-common/wallet-types';
 import { AccountLabels } from '@suite-common/metadata-types';
+
+import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
+import { SearchAction } from 'src/components/wallet/SearchAction';
 import { SUITE } from 'src/actions/suite/constants';
 
+import { ExportAction } from './ExportAction';
+
 const Wrapper = styled.div`
     display: flex;
     align-items: center;
@@ -57,7 +60,7 @@ export const TransactionListActions = ({
                             noLoading: true,
                         }),
                     );
-                } catch (err) {
+                } catch {
                     dispatch(
                         notificationsActions.addToast({
                             type: 'error',
diff --git a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/CommonComponents.tsx b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/CommonComponents.tsx
index 83f21c185b1..7cfb5f92d56 100644
--- a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/CommonComponents.tsx
+++ b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/CommonComponents.tsx
@@ -1,6 +1,8 @@
 import styled from 'styled-components';
+
 import { variables } from '@trezor/components';
 import { zIndices } from '@trezor/theme';
+
 import { HiddenPlaceholder } from 'src/components/suite';
 import { SUBPAGE_NAV_HEIGHT } from 'src/constants/suite/layout';
 
diff --git a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/DayHeader.tsx b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/DayHeader.tsx
index 7a36a1043fe..4e609ab1af5 100644
--- a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/DayHeader.tsx
+++ b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/DayHeader.tsx
@@ -1,9 +1,12 @@
 import { FormattedDate } from 'react-intl';
+
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { useFormatters } from '@suite-common/formatters';
 import { isTestnet, parseTransactionDateKey } from '@suite-common/wallet-utils';
-import { FormattedCryptoAmount, HiddenPlaceholder } from 'src/components/suite';
 import { NetworkSymbol } from '@suite-common/wallet-config';
+
+import { FormattedCryptoAmount, HiddenPlaceholder } from 'src/components/suite';
+
 import { ColAmount, ColDate, ColFiat, HeaderWrapper } from './CommonComponents';
 
 interface DayHeaderProps {
diff --git a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/PendingGroupHeader.tsx b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/PendingGroupHeader.tsx
index c7f24b0307e..de7ac8a27bc 100644
--- a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/PendingGroupHeader.tsx
+++ b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/PendingGroupHeader.tsx
@@ -1,4 +1,5 @@
 import { Translation } from 'src/components/suite';
+
 import { ColPending, HeaderWrapper } from './CommonComponents';
 
 type PendingGroupHeaderProps = { txsCount: number };
diff --git a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/TransactionsGroup.tsx b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/TransactionsGroup.tsx
index 2f30c072e40..86c999b7e6d 100644
--- a/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/TransactionsGroup.tsx
+++ b/packages/suite/src/views/wallet/transactions/TransactionList/TransactionsGroup/TransactionsGroup.tsx
@@ -1,8 +1,8 @@
 import { useState, ReactNode } from 'react';
+
 import styled from 'styled-components';
-import { WalletAccountTransaction } from 'src/types/wallet';
+
 import { NetworkSymbol } from '@suite-common/wallet-config';
-import { DayHeader } from './DayHeader';
 import {
     getFiatRateKey,
     isNftTokenTransfer,
@@ -12,10 +12,14 @@ import {
 } from '@suite-common/wallet-utils';
 import { FiatCurrencyCode } from '@suite-common/suite-config';
 import { selectHistoricFiatRates } from '@suite-common/wallet-core';
-import { useSelector } from 'src/hooks/suite';
 import { Timestamp, TokenAddress } from '@suite-common/wallet-types';
 import { isTokenDefinitionKnown, selectCoinDefinitions } from '@suite-common/token-definitions';
 
+import { useSelector } from 'src/hooks/suite';
+import { WalletAccountTransaction } from 'src/types/wallet';
+
+import { DayHeader } from './DayHeader';
+
 const TransactionsGroupWrapper = styled.div`
     display: flex;
     flex-direction: column;
diff --git a/packages/suite/src/views/wallet/transactions/Transactions.tsx b/packages/suite/src/views/wallet/transactions/Transactions.tsx
index 255b74f0ccd..19923855b51 100644
--- a/packages/suite/src/views/wallet/transactions/Transactions.tsx
+++ b/packages/suite/src/views/wallet/transactions/Transactions.tsx
@@ -1,12 +1,17 @@
 import { ReactNode } from 'react';
 
-import { WalletLayout, CoinjoinAccountDiscoveryProgress } from 'src/components/wallet';
-import { useSelector } from 'src/hooks/suite';
-import { AppState } from 'src/types/suite';
+import styled from 'styled-components';
+
 import {
     selectAccountTransactions,
     selectIsLoadingAccountTransactions,
 } from '@suite-common/wallet-core';
+import { spacingsPx } from '@trezor/theme';
+
+import { WalletLayout, CoinjoinAccountDiscoveryProgress } from 'src/components/wallet';
+import { useSelector } from 'src/hooks/suite';
+import { AppState } from 'src/types/suite';
+
 import { NoTransactions } from './components/NoTransactions';
 import { AccountEmpty } from './components/AccountEmpty';
 import { TransactionList } from './TransactionList/TransactionList';
@@ -14,8 +19,6 @@ import { TransactionSummary } from './components/TransactionSummary';
 import { CoinjoinExplanation } from './CoinjoinExplanation/CoinjoinExplanation';
 import { CoinjoinSummary } from './CoinjoinSummary/CoinjoinSummary';
 import { TradeBox } from './TradeBox/TradeBox';
-import styled from 'styled-components';
-import { spacingsPx } from '@trezor/theme';
 
 const AccountLayout = styled(WalletLayout)`
     display: flex;
diff --git a/packages/suite/src/views/wallet/transactions/components/AccountEmpty.tsx b/packages/suite/src/views/wallet/transactions/components/AccountEmpty.tsx
index ac90b0ca5f2..8374b42e6c3 100644
--- a/packages/suite/src/views/wallet/transactions/components/AccountEmpty.tsx
+++ b/packages/suite/src/views/wallet/transactions/components/AccountEmpty.tsx
@@ -1,55 +1,10 @@
-import styled from 'styled-components';
 import { analytics, EventType } from '@trezor/suite-analytics';
 
-import { variables, H2, Button, Card, Image, Column } from '@trezor/components';
 import { Translation } from 'src/components/suite';
 import { useDispatch } from 'src/hooks/suite';
 import { Account } from 'src/types/wallet';
 import { goto } from 'src/actions/suite/routerActions';
-import { spacings, spacingsPx } from '@trezor/theme';
-
-const Wrapper = styled.div`
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const Title = styled(H2)`
-    text-align: center;
-    font-weight: 600;
-`;
-
-const Description = styled.span`
-    font-size: ${variables.FONT_SIZE.NORMAL};
-    font-weight: 500;
-    text-align: center;
-    color: ${({ theme }) => theme.legacy.TYPE_LIGHT_GREY};
-`;
-
-// eslint-disable-next-line local-rules/no-override-ds-component
-const StyledImage = styled(Image)`
-    width: auto;
-    height: 80px;
-    margin-top: 60px;
-    margin-bottom: 28px;
-`;
-
-const Actions = styled.div`
-    display: flex;
-    justify-content: center;
-    width: 100%;
-    margin-bottom: ${spacingsPx.lg};
-    flex-flow: row wrap;
-    gap: ${spacingsPx.md};
-`;
-
-const Divider = styled.div`
-    width: 100%;
-    height: 1px;
-    background: ${({ theme }) => theme.legacy.STROKE_GREY};
-    margin: 30px 0 36px;
-`;
+import { AccountExceptionLayout } from 'src/components/wallet';
 
 interface AccountEmptyProps {
     account: Account;
@@ -80,48 +35,34 @@ export const AccountEmpty = ({ account }: AccountEmptyProps) => {
     };
 
     return (
-        <Wrapper>
-            <Card width="100%">
-                <Column alignItems="center">
-                    <StyledImage image="CLOUDY" />
-
-                    <Title margin={{ bottom: spacings.md }}>
-                        <Translation id="TR_ACCOUNT_IS_EMPTY_TITLE" />
-                    </Title>
-
-                    <Description>
-                        <Translation
-                            id="TR_ACCOUNT_IS_EMPTY_DESCRIPTION"
-                            values={{ network: networkSymbol }}
-                        />
-                    </Description>
-
-                    <Divider />
-
-                    <Actions>
-                        <Button
-                            data-testid="@accounts/empty-account/receive"
-                            variant="primary"
-                            onClick={handleNavigateToReceivePage}
-                            minWidth={160}
-                        >
-                            <Translation
-                                id="TR_RECEIVE_NETWORK"
-                                values={{ network: networkSymbol }}
-                            />
-                        </Button>
-
-                        <Button
-                            data-testid="@accounts/empty-account/buy"
-                            variant="primary"
-                            onClick={handleNavigateToBuyPage}
-                            minWidth={160}
-                        >
-                            <Translation id="TR_BUY_NETWORK" values={{ network: networkSymbol }} />
-                        </Button>
-                    </Actions>
-                </Column>
-            </Card>
-        </Wrapper>
+        <AccountExceptionLayout
+            title={<Translation id="TR_ACCOUNT_IS_EMPTY_TITLE" />}
+            description={
+                <Translation
+                    id="TR_ACCOUNT_IS_EMPTY_DESCRIPTION"
+                    values={{ network: networkSymbol }}
+                />
+            }
+            iconName="arrowsLeftRight"
+            iconVariant="tertiary"
+            actions={[
+                {
+                    'data-testid': '@accounts/empty-account/receive',
+                    key: '1',
+                    onClick: handleNavigateToReceivePage,
+                    children: (
+                        <Translation id="TR_RECEIVE_NETWORK" values={{ network: networkSymbol }} />
+                    ),
+                },
+                {
+                    'data-testid': '@accounts/empty-account/buy',
+                    key: '2',
+                    onClick: handleNavigateToBuyPage,
+                    children: (
+                        <Translation id="TR_BUY_NETWORK" values={{ network: networkSymbol }} />
+                    ),
+                },
+            ]}
+        />
     );
 };
diff --git a/packages/suite/src/views/wallet/transactions/components/InfoCard.tsx b/packages/suite/src/views/wallet/transactions/components/InfoCard.tsx
index bfac34062e7..5661ef1a9b6 100644
--- a/packages/suite/src/views/wallet/transactions/components/InfoCard.tsx
+++ b/packages/suite/src/views/wallet/transactions/components/InfoCard.tsx
@@ -1,9 +1,12 @@
 import { ReactNode } from 'react';
+
 import styled from 'styled-components';
+
 import { variables, Card, SkeletonRectangle } from '@trezor/components';
+import { BigNumber } from '@trezor/utils/src/bigNumber';
+
 import { HiddenPlaceholder, FormattedCryptoAmount, Sign } from 'src/components/suite';
 import { Account } from 'src/types/wallet';
-import { BigNumber } from '@trezor/utils/src/bigNumber';
 
 const InfoCardContent = styled.div`
     display: flex;
diff --git a/packages/suite/src/views/wallet/transactions/components/NoTransactions.tsx b/packages/suite/src/views/wallet/transactions/components/NoTransactions.tsx
index 39643d1ef0a..2bfdadd4f47 100644
--- a/packages/suite/src/views/wallet/transactions/components/NoTransactions.tsx
+++ b/packages/suite/src/views/wallet/transactions/components/NoTransactions.tsx
@@ -1,8 +1,8 @@
-import { Button } from '@trezor/components';
+import { getNetwork } from '@suite-common/wallet-config';
+
 import { AccountExceptionLayout } from 'src/components/wallet';
 import { Translation, TrezorLink } from 'src/components/suite';
 import { Account } from 'src/types/wallet';
-import { getNetwork } from '@suite-common/wallet-config';
 
 interface NoTransactionsProps {
     account: Account;
@@ -16,14 +16,19 @@ export const NoTransactions = ({ account }: NoTransactionsProps) => {
     return (
         <AccountExceptionLayout
             title={<Translation id="TR_TRANSACTIONS_NOT_AVAILABLE" />}
-            image="CLOUDY"
-            actionComponent={
-                <Button variant="primary" icon="arrowUpRight" iconAlignment="right">
-                    <TrezorLink variant="nostyle" href={explorerUrl}>
-                        <Translation id="TR_SHOW_DETAILS_IN_BLOCK_EXPLORER" />
-                    </TrezorLink>
-                </Button>
-            }
+            iconName="cloud"
+            iconVariant="info"
+            actions={[
+                {
+                    key: '1',
+                    icon: 'arrowUpRight',
+                    children: (
+                        <TrezorLink variant="nostyle" href={explorerUrl}>
+                            <Translation id="TR_SHOW_DETAILS_IN_BLOCK_EXPLORER" />
+                        </TrezorLink>
+                    ),
+                },
+            ]}
         />
     );
 };
diff --git a/packages/suite/src/views/wallet/transactions/components/SummaryCards.tsx b/packages/suite/src/views/wallet/transactions/components/SummaryCards.tsx
index 742a7a2573d..3dd1c08da42 100644
--- a/packages/suite/src/views/wallet/transactions/components/SummaryCards.tsx
+++ b/packages/suite/src/views/wallet/transactions/components/SummaryCards.tsx
@@ -1,15 +1,16 @@
 import styled from 'styled-components';
-import { BigNumber } from '@trezor/utils/src/bigNumber';
-import { Translation, HiddenPlaceholder, FormattedDate } from 'src/components/suite';
-import { Account } from 'src/types/wallet';
 
+import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { useFormatters } from '@suite-common/formatters';
 import { variables } from '@trezor/components';
+import { DISCREET_PLACEHOLDER, useShouldRedactNumbers } from '@suite-common/wallet-utils';
 
-import { InfoCard } from './InfoCard';
+import { Translation, HiddenPlaceholder, FormattedDate } from 'src/components/suite';
+import { Account } from 'src/types/wallet';
 import { AggregatedAccountHistory, GraphRange } from 'src/types/wallet/graph';
 import { sumFiatValueMap } from 'src/utils/wallet/graph';
-import { DISCREET_PLACEHOLDER, useShouldRedactNumbers } from '@suite-common/wallet-utils';
+
+import { InfoCard } from './InfoCard';
 
 const InfoCardsWrapper = styled.div`
     display: grid;
diff --git a/packages/suite/src/views/wallet/transactions/components/TransactionSummary.tsx b/packages/suite/src/views/wallet/transactions/components/TransactionSummary.tsx
index ef79942741a..ce7eaf2daef 100644
--- a/packages/suite/src/views/wallet/transactions/components/TransactionSummary.tsx
+++ b/packages/suite/src/views/wallet/transactions/components/TransactionSummary.tsx
@@ -1,6 +1,9 @@
 import styled from 'styled-components';
 import { getUnixTime } from 'date-fns';
 
+import { calcTicks, calcTicksFromData } from '@suite-common/suite-utils';
+import { variables, Button, Card } from '@trezor/components';
+
 import { Account } from 'src/types/wallet';
 import {
     GraphRangeSelector,
@@ -10,14 +13,11 @@ import {
 } from 'src/components/suite';
 import { useDispatch, useSelector } from 'src/hooks/suite';
 import { getGraphDataForInterval, updateGraphData } from 'src/actions/wallet/graphActions';
-
-import { calcTicks, calcTicksFromData } from '@suite-common/suite-utils';
-import { variables, Button, Card } from '@trezor/components';
+import { aggregateBalanceHistory, getMinMaxValueFromData } from 'src/utils/wallet/graph';
+import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
 
 import { TransactionSummaryDropdown } from './TransactionSummaryDropdown';
 import { SummaryCards } from './SummaryCards';
-import { aggregateBalanceHistory, getMinMaxValueFromData } from 'src/utils/wallet/graph';
-import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
 
 const Wrapper = styled.div`
     display: flex;
diff --git a/packages/suite/tsconfig.json b/packages/suite/tsconfig.json
index caca9428921..384e5e6006f 100644
--- a/packages/suite/tsconfig.json
+++ b/packages/suite/tsconfig.json
@@ -91,6 +91,7 @@
         { "path": "../coinjoin" },
         { "path": "../components" },
         { "path": "../connect" },
+        { "path": "../connect-web" },
         { "path": "../crypto-utils" },
         { "path": "../device-utils" },
         { "path": "../dom-utils" },
@@ -106,6 +107,7 @@
         { "path": "../theme" },
         { "path": "../type-utils" },
         { "path": "../urls" },
-        { "path": "../utils" }
+        { "path": "../utils" },
+        { "path": "../eslint" }
     ]
 }
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 9c18e270f34..a150f82b421 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/packages/theme/src/borders.ts b/packages/theme/src/borders.ts
index 9e46fcd34f3..fde3c68c1b3 100644
--- a/packages/theme/src/borders.ts
+++ b/packages/theme/src/borders.ts
@@ -17,6 +17,8 @@ export const borders = {
 
 export type Borders = typeof borders;
 
+type NativeRadiusValue = 4 | 8 | 12 | 16 | 20;
+
 export const nativeBorders = {
     widths: {
         small: 1,
@@ -24,12 +26,14 @@ export const nativeBorders = {
         large: 2,
     },
     radii: {
-        extraSmall: 4,
-        small: 8,
-        medium: 16,
-        large: 24,
+        r4: 4,
+        r8: 8,
+        r12: 12,
+        r16: 16,
+        r20: 20,
         round: 100, // Equivalent to 50% on the web
-    },
+    } satisfies { [V in NativeRadiusValue as `r${V}`]: V } & { round: 100 },
 } as const;
 
 export type NativeBorders = typeof nativeBorders;
+export type NativeRadius = keyof typeof nativeBorders.radii;
diff --git a/packages/theme/src/coinsColors.ts b/packages/theme/src/coinsColors.ts
index 7181f5f9eaf..0921d85adde 100644
--- a/packages/theme/src/coinsColors.ts
+++ b/packages/theme/src/coinsColors.ts
@@ -17,6 +17,7 @@ export const coinsColors: CoinsColors = {
     etc: '#60c67e',
     eth: '#454a75',
     ltc: '#a6a8a9',
+    op: '#ff0720',
     pol: '#7b3fe4',
     nmc: '#186c9d',
     regtest: '#e75f5f',
diff --git a/packages/theme/src/spacings.ts b/packages/theme/src/spacings.ts
index 48637c33341..f6ea27de5d2 100644
--- a/packages/theme/src/spacings.ts
+++ b/packages/theme/src/spacings.ts
@@ -12,20 +12,34 @@ export const spacings = {
     xxxxl: 48,
 } as const;
 
-type SpacingSize = keyof typeof spacings;
+// TypeScript is lame and doesn't allow us to use `as const` with `Object.keys` so we have to cast it to `Spacing` manually
+export const negativeSpacings = {
+    zero: 0,
+    xxxs: -2,
+    xxs: -4,
+    xs: -8,
+    sm: -12,
+    md: -16,
+    lg: -20,
+    xl: -24,
+    xxl: -32,
+    xxxl: -40,
+    xxxxl: -48,
+} as const;
 
-export const spacingsPx = (Object.keys(spacings) as Array<SpacingSize>).reduce(
-    (result, key) => {
-        (result as Record<SpacingSize, string>)[key] = `${spacings[key]}px`;
+export type Spacings = typeof spacings;
+export type Spacing = keyof Spacings;
+export type NegativeSpacings = typeof negativeSpacings;
+export type SpacingValues = Spacings[Spacing] | NegativeSpacings[Spacing];
+export type SpacingPx = { [K in Spacing]: `${Spacings[K]}px` };
+export type NegativeSpacingPx = { [K in Spacing]: `-${Spacings[K]}px` };
+export type SpacingPxValues = SpacingPx[Spacing] | NegativeSpacingPx[Spacing];
 
-        return result;
-    },
-    {} as { [K in SpacingSize]: `${(typeof spacings)[K]}px` },
-);
+export const spacingsPx = (Object.keys(spacings) as Array<Spacing>).reduce((result, key) => {
+    (result as Record<Spacing, string>)[key] = `${spacings[key]}px`;
 
-export type Spacings = typeof spacings;
-export type Spacing = keyof typeof spacings;
-export type SpacingValues = Spacings[Spacing];
+    return result;
+}, {} as SpacingPx);
 
 type NativeSpacingValue = 2 | 4 | 8 | 12 | 16 | 20 | 24 | 32 | 40 | 52 | 64;
 
diff --git a/packages/theme/src/types.ts b/packages/theme/src/types.ts
index b378d4df9df..7e168f9c7ea 100644
--- a/packages/theme/src/types.ts
+++ b/packages/theme/src/types.ts
@@ -2,11 +2,5 @@ export type CSSColor =
     | `#${string}`
     | `rgb(${number}, ${number}, ${number})`
     | `rgba(${number}, ${number}, ${number}, ${number})`
-    | 'transparent';
-
-export const isCSSColor = (color: string): color is CSSColor => {
-    const cssColorRegex =
-        /^#([0-9a-fA-F]{3,8})$|^rgba?\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3}),?\s*(\d{1,3})\)$/;
-
-    return cssColorRegex.test(color);
-};
+    | 'transparent'
+    | 'currentColor';
diff --git a/packages/theme/src/zIndices.ts b/packages/theme/src/zIndices.ts
index 132fa64f50d..680dabafc40 100644
--- a/packages/theme/src/zIndices.ts
+++ b/packages/theme/src/zIndices.ts
@@ -11,6 +11,7 @@ export const zIndices = {
     discoveryProgress: 41,
 
     modal: 40, // above other suite content to disable interacting with it
+    legacyModal: 39, // below MODAL in case another modal overlaps it, e.g. ReconnectDevicePrompt
     draggableComponent: 30, // sidebar, above other content to be visible when dragged, resized
     navigationBar: 30,
     expandableNavigationHeader: 21, // above EXPANDABLE_NAVIGATION to cover its box-shadow
diff --git a/packages/transport-bridge/eslint.config.mjs b/packages/transport-bridge/eslint.config.mjs
new file mode 100644
index 00000000000..379a2b5d83f
--- /dev/null
+++ b/packages/transport-bridge/eslint.config.mjs
@@ -0,0 +1,18 @@
+import { eslint, globalNoExtraneousDependenciesDevDependencies } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'import/no-extraneous-dependencies': [
+                'error',
+                {
+                    devDependencies: [
+                        ...globalNoExtraneousDependenciesDevDependencies,
+                        '**/webpack/**',
+                    ],
+                },
+            ],
+        },
+    },
+];
diff --git a/packages/transport-bridge/package.json b/packages/transport-bridge/package.json
index 4fdf17f2483..cc2cde9f0a7 100644
--- a/packages/transport-bridge/package.json
+++ b/packages/transport-bridge/package.json
@@ -9,7 +9,6 @@
         "test:unit": "yarn g:jest",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "build:node:bin": "yarn esbuild ./src/bin.ts --bundle --outfile=dist/bin.js --platform=node --target=node18 --external:usb",
         "build:node:module": "yarn esbuild ./src/index.ts --bundle --outfile=dist/index.js --platform=node --target=node18 --external:usb",
         "build:node": "yarn build:node:bin && yarn build:node:module",
@@ -24,10 +23,11 @@
         "esbuild": "^0.23.1",
         "html-webpack-plugin": "^5.6.0",
         "pkg": "^5.8.1",
-        "webpack": "^5.94.0"
+        "webpack": "^5.96.1"
     },
     "dependencies": {
         "@trezor/components": "workspace:*",
+        "@trezor/eslint": "workspace:*",
         "@trezor/node-utils": "workspace:*",
         "@trezor/protocol": "workspace:*",
         "@trezor/theme": "workspace:*",
diff --git a/packages/transport-bridge/src/core.ts b/packages/transport-bridge/src/core.ts
index 4942b7817ca..40d2d6351ba 100644
--- a/packages/transport-bridge/src/core.ts
+++ b/packages/transport-bridge/src/core.ts
@@ -120,7 +120,7 @@ export const createCore = (apiArg: 'usb' | 'udp' | AbstractApi, logger?: Log) =>
         acquireInput: Omit<AcquireInput, 'previous'> & {
             previous: Session | 'null';
             signal: AbortSignal;
-        },
+        } & { sessionOwner: string },
     ) => {
         const acquireIntentResult = await sessionsClient.acquireIntent({
             path: acquireInput.path,
@@ -140,7 +140,10 @@ export const createCore = (apiArg: 'usb' | 'udp' | AbstractApi, logger?: Log) =>
         if (!openDeviceResult.success) {
             return openDeviceResult;
         }
-        await sessionsClient.acquireDone({ path: acquireInput.path });
+        await sessionsClient.acquireDone({
+            path: acquireInput.path,
+            sessionOwner: acquireInput.sessionOwner,
+        });
 
         return acquireIntentResult;
     };
diff --git a/packages/transport-bridge/src/http.ts b/packages/transport-bridge/src/http.ts
index a9bc66eda74..f364b3e9a00 100644
--- a/packages/transport-bridge/src/http.ts
+++ b/packages/transport-bridge/src/http.ts
@@ -272,6 +272,7 @@ export class TrezordNode {
             ]);
 
             app.post('/acquire/:path/:previous', [
+                parseBodyJSON,
                 validateAcquireParams,
                 (req, res) => {
                     res.setHeader('Content-Type', 'text/plain');
@@ -280,6 +281,8 @@ export class TrezordNode {
                         .acquire({
                             path: req.params.path,
                             previous: req.params.previous,
+                            // @ts-expect-error
+                            sessionOwner: req?.body?.sessionOwner,
                             signal,
                         })
                         .then(result => {
@@ -427,7 +430,7 @@ export class TrezordNode {
                 (req, res) => {
                     const parsedUrl = new URL(req.url, `http://${req.headers.host}/`);
 
-                    let pathname = path.join(__dirname, this.assetPrefix, parsedUrl.pathname);
+                    const pathname = path.join(__dirname, this.assetPrefix, parsedUrl.pathname);
 
                     const map: Record<string, string> = {
                         '.ico': 'image/x-icon',
diff --git a/packages/transport-bridge/src/ui/components/Device.tsx b/packages/transport-bridge/src/ui/components/Device.tsx
index a4492862c3c..df997958de6 100644
--- a/packages/transport-bridge/src/ui/components/Device.tsx
+++ b/packages/transport-bridge/src/ui/components/Device.tsx
@@ -28,6 +28,9 @@ export const Device = ({ device }: DeviceProps) => {
             <div>model: {modelName}</div>
             <div>path: {device.path}</div>
             <div>session: {device.session ? device.session : 'none'}</div>
+            {device.session && (
+                <div>session owner: {device.sessionOwner ? device.sessionOwner : 'unknown'}</div>
+            )}
         </div>
     );
 };
diff --git a/packages/transport-bridge/tests/http.test.ts b/packages/transport-bridge/tests/http.test.ts
index 584479411bd..0956ebb826f 100644
--- a/packages/transport-bridge/tests/http.test.ts
+++ b/packages/transport-bridge/tests/http.test.ts
@@ -447,6 +447,46 @@ describe('http', () => {
             });
         });
 
+        it('POST /acquire with body', async () => {
+            const trezordNode = new TrezordNode({
+                port,
+                api: createTransportApi(),
+                // @ts-expect-error
+                logger: muteLogger,
+            });
+            await trezordNode.start();
+
+            await new Promise(resolve => setTimeout(resolve, 1000));
+
+            const url = trezordNode.server!.getRouteAddress('/')!;
+
+            await bridgeApiCall({
+                url: url + 'enumerate',
+                method: 'POST',
+            });
+
+            const response = await bridgeApiCall({
+                url: url + 'acquire/1/null',
+                method: 'POST',
+                body: {
+                    sessionOwner: 'app A',
+                },
+            });
+            expect(response.success).toBe(true);
+
+            const enumerateRes = await bridgeApiCall({
+                url: url + 'enumerate',
+                method: 'POST',
+            });
+
+            expect(enumerateRes).toMatchObject({
+                success: true,
+                payload: [{ path: '1', session: '1', sessionOwner: 'app A' }],
+            });
+
+            await trezordNode.stop();
+        });
+
         it('POST /', async () => {
             const trezordNode = createTrezordNode({ port });
             await trezordNode.start();
@@ -468,7 +508,7 @@ describe('http', () => {
             await trezordNode.stop();
         });
 
-        it('enumerate', async () => {
+        it('GET /enumerate', async () => {
             const trezordNode = createTrezordNode({ port });
             await trezordNode.start();
 
@@ -514,6 +554,7 @@ describe('http', () => {
                 url,
                 method: 'POST',
                 signal: abortController.signal,
+                body: {},
             });
 
             // give fetch api some time to make request
@@ -562,13 +603,12 @@ describe('http', () => {
             await bridgeApiCall({
                 url: url + 'enumerate',
                 method: 'POST',
-                body: {},
                 signal: abortController.signal,
+                body: {},
             });
             await bridgeApiCall({
                 url: url + 'acquire/1/null',
                 method: 'POST',
-                body: {},
                 signal: abortController.signal,
             });
 
diff --git a/packages/transport-bridge/tsconfig.json b/packages/transport-bridge/tsconfig.json
index 7111c28e6ad..0a76ae3bc8b 100644
--- a/packages/transport-bridge/tsconfig.json
+++ b/packages/transport-bridge/tsconfig.json
@@ -3,6 +3,7 @@
     "compilerOptions": { "outDir": "libDev" },
     "references": [
         { "path": "../components" },
+        { "path": "../eslint" },
         { "path": "../node-utils" },
         { "path": "../protocol" },
         { "path": "../theme" },
diff --git a/packages/transport-native/package.json b/packages/transport-native/package.json
index 0cb141fc5c0..fa1b9be757b 100644
--- a/packages/transport-native/package.json
+++ b/packages/transport-native/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/packages/transport-test/.eslintrc.js b/packages/transport-test/.eslintrc.js
deleted file mode 100644
index 8878677817c..00000000000
--- a/packages/transport-test/.eslintrc.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-    rules: {
-        'no-nested-ternary': 'off', // useful in tests..
-        'no-console': 'off',
-    },
-};
diff --git a/packages/transport-test/e2e/bridge/bridge-complex-cases.test.ts b/packages/transport-test/e2e/bridge/bridge-complex-cases.test.ts
index e95bd9344fe..32e2b2a1f8b 100644
--- a/packages/transport-test/e2e/bridge/bridge-complex-cases.test.ts
+++ b/packages/transport-test/e2e/bridge/bridge-complex-cases.test.ts
@@ -23,7 +23,7 @@ describe('restarting bridge', () => {
         await TrezorUserEnvLink.startEmu();
         await TrezorUserEnvLink.startBridge();
 
-        bridge = new BridgeTransport({ messages });
+        bridge = new BridgeTransport({ messages, id: '' });
         await bridge.init();
 
         const enumerateResult = await bridge.enumerate();
@@ -50,7 +50,7 @@ describe('restarting bridge', () => {
         await TrezorUserEnvLink.stopBridge();
         await TrezorUserEnvLink.startEmu();
         await TrezorUserEnvLink.startBridge();
-        bridge = new BridgeTransport({ messages });
+        bridge = new BridgeTransport({ messages, id: '' });
         await bridge.init();
 
         const enumerateResult = await bridge.enumerate();
diff --git a/packages/transport-test/e2e/bridge/bridge-listen.test.ts b/packages/transport-test/e2e/bridge/bridge-listen.test.ts
index 45db1124825..a35cc907ba8 100644
--- a/packages/transport-test/e2e/bridge/bridge-listen.test.ts
+++ b/packages/transport-test/e2e/bridge/bridge-listen.test.ts
@@ -5,7 +5,7 @@ import { controller as TrezorUserEnvLink } from './controller';
 import { descriptor as expectedDescriptor } from './expect';
 import { assertSuccess } from '../api/utils';
 
-const emulatorStartOpts = { model: 'T2T1', version: '2-main', wipe: true } as const;
+const emulatorStartOpts = { model: 'T2T1', version: '2-latest', wipe: true } as const;
 
 describe('bridge', () => {
     beforeAll(async () => {
@@ -23,7 +23,7 @@ describe('bridge', () => {
     // special case of listen. for happy-path listen fixtures referer to multi-client.test.ts
     test('listen - bridge already has some descriptors, client subscribes with non-matching descriptors', async () => {
         await TrezorUserEnvLink.startBridge();
-        const bridge = new BridgeTransport({ messages });
+        const bridge = new BridgeTransport({ messages, id: '' });
         await bridge.init();
         const enumerateResult = await bridge.enumerate();
         assertSuccess(enumerateResult);
@@ -31,13 +31,11 @@ describe('bridge', () => {
         const brideSpy = jest.spyOn(bridge, 'emit');
         bridge.listen();
         await new Promise(resolve => setTimeout(resolve, 100));
-        expect(brideSpy).toHaveBeenCalledWith('transport-update', [
-            {
-                descriptor: { ...expectedDescriptor, session: null },
-                type: 'connected',
-            },
-        ]);
-        bridge.removeAllListeners('transport-update');
+        expect(brideSpy).toHaveBeenCalledWith('transport-device_connected', {
+            ...expectedDescriptor,
+            session: null,
+        });
+        bridge.removeAllListeners('transport-device_connected');
         jest.clearAllMocks();
     });
 });
diff --git a/packages/transport-test/e2e/bridge/bridge.test.ts b/packages/transport-test/e2e/bridge/bridge.test.ts
index b6862d255eb..9386432cf6f 100644
--- a/packages/transport-test/e2e/bridge/bridge.test.ts
+++ b/packages/transport-test/e2e/bridge/bridge.test.ts
@@ -6,7 +6,7 @@ import { controller as TrezorUserEnvLink, env } from './controller';
 import { pathLength, descriptor as expectedDescriptor } from './expect';
 import { assertSuccess } from '../api/utils';
 
-const emulatorStartOpts = { model: 'T2T1', version: '2-main', wipe: true } as const;
+const emulatorStartOpts = { model: 'T2T1', version: '2-latest', wipe: true } as const;
 
 describe('bridge', () => {
     let bridge: BridgeTransport;
@@ -18,11 +18,12 @@ describe('bridge', () => {
         await TrezorUserEnvLink.startEmu(emulatorStartOpts);
         await TrezorUserEnvLink.startBridge();
 
-        bridge = new BridgeTransport({ messages });
+        bridge = new BridgeTransport({ messages, id: '' });
         await bridge.init();
 
         const enumerateResult = await bridge.enumerate();
         assertSuccess(enumerateResult);
+        // eslint-disable-next-line jest/no-standalone-expect
         expect(enumerateResult).toMatchObject({
             success: true,
             payload: [
@@ -35,6 +36,7 @@ describe('bridge', () => {
         });
 
         const { path } = enumerateResult.payload[0];
+        // eslint-disable-next-line jest/no-standalone-expect
         expect(path.length).toEqual(pathLength);
 
         descriptors = enumerateResult.payload;
@@ -43,6 +45,7 @@ describe('bridge', () => {
             input: { path: descriptors[0].path, previous: session },
         });
         assertSuccess(acquireResult);
+        // eslint-disable-next-line jest/no-standalone-expect
         expect(acquireResult).toEqual({
             success: true,
             payload: '1',
diff --git a/packages/transport-test/e2e/bridge/multi-client.test.ts b/packages/transport-test/e2e/bridge/multi-client.test.ts
index a91276abf03..b03ad6b998b 100644
--- a/packages/transport-test/e2e/bridge/multi-client.test.ts
+++ b/packages/transport-test/e2e/bridge/multi-client.test.ts
@@ -12,13 +12,23 @@ const wait = (ms = 1000) =>
         }, ms);
     });
 
-const getDescriptor = (descriptor: Partial<Descriptor>): Descriptor => ({
-    ...fixtureDescriptor,
-    session: Session('1'),
-    ...descriptor,
-});
+const getDescriptor = (descriptor: Partial<Descriptor>): Descriptor => {
+    const d = {
+        ...fixtureDescriptor,
+        session: Session('1'),
+        ...descriptor,
+    };
+
+    if (env.USE_NODE_BRIDGE && d.session && !d.sessionOwner) {
+        d.sessionOwner = 'app A';
+    } else if (!env.USE_NODE_BRIDGE) {
+        d.sessionOwner = undefined;
+    }
 
-const emulatorStartOpts = { model: 'T2T1', version: '2-main', wipe: true } as const;
+    return d;
+};
+
+const emulatorStartOpts = { model: 'T2T1', version: '2-latest', wipe: true } as const;
 
 describe('bridge', () => {
     let bridge1: BridgeTransport;
@@ -64,8 +74,8 @@ describe('bridge', () => {
         await TrezorUserEnvLink.startEmu(emulatorStartOpts);
         await TrezorUserEnvLink.startBridge();
 
-        bridge1 = new BridgeTransport({ messages });
-        bridge2 = new BridgeTransport({ messages });
+        bridge1 = new BridgeTransport({ messages, id: 'app A' });
+        bridge2 = new BridgeTransport({ messages, id: 'app B' });
 
         await bridge1.init();
         await bridge2.init();
@@ -93,12 +103,14 @@ describe('bridge', () => {
             session: Session('1'),
         });
 
-        expect(bride1spy).toHaveBeenLastCalledWith('transport-update', [
-            { type: 'acquired', subtype: 'here', descriptor: expectedDescriptor1 },
-        ]);
-        expect(bride2spy).toHaveBeenLastCalledWith('transport-update', [
-            { type: 'acquired', subtype: 'elsewhere', descriptor: expectedDescriptor1 },
-        ]);
+        expect(bride1spy).toHaveBeenLastCalledWith(
+            'transport-device_session_changed',
+            expectedDescriptor1,
+        );
+        expect(bride2spy).toHaveBeenLastCalledWith(
+            'transport-device_session_changed',
+            expectedDescriptor1,
+        );
 
         expect(session1.success).toBe(true);
         if (!session1.success) {
@@ -114,13 +126,15 @@ describe('bridge', () => {
             session: null,
         });
 
-        expect(bride1spy).toHaveBeenLastCalledWith('transport-update', [
-            { type: 'released', subtype: 'here', descriptor: expectedDescriptor2 },
-        ]);
+        expect(bride1spy).toHaveBeenLastCalledWith(
+            'transport-device_session_changed',
+            expectedDescriptor2,
+        );
 
-        expect(bride2spy).toHaveBeenLastCalledWith('transport-update', [
-            { type: 'released', subtype: 'elsewhere', descriptor: expectedDescriptor2 },
-        ]);
+        expect(bride2spy).toHaveBeenLastCalledWith(
+            'transport-device_session_changed',
+            expectedDescriptor2,
+        );
 
         const session2 = await bridge2.acquire({
             input: { previous: null, path: descriptors[0].path },
@@ -155,17 +169,20 @@ describe('bridge', () => {
         const expectedDescriptor = getDescriptor({
             path: descriptors[0].path,
             session: Session('2'),
+            sessionOwner: 'app B',
         });
 
         await wait(); // wait for event to be propagated
 
-        expect(bride1spy).toHaveBeenLastCalledWith('transport-update', [
-            { type: 'acquired', subtype: 'elsewhere', descriptor: expectedDescriptor },
-        ]);
+        expect(bride1spy).toHaveBeenLastCalledWith(
+            'transport-device_session_changed',
+            expectedDescriptor,
+        );
 
-        expect(bride2spy).toHaveBeenLastCalledWith('transport-update', [
-            { type: 'acquired', subtype: 'here', descriptor: expectedDescriptor },
-        ]);
+        expect(bride2spy).toHaveBeenLastCalledWith(
+            'transport-device_session_changed',
+            expectedDescriptor,
+        );
     });
 
     // todo: udp not implemented correctly yet in new bridge
@@ -192,7 +209,7 @@ describe('bridge', () => {
                 input: { previous: session1.payload, path },
             });
 
-            expect(receive1res).resolves.toMatchObject({
+            await expect(receive1res).resolves.toMatchObject({
                 success: false,
                 // todo: this error is expected, fix errors. also emu error is weird
                 error: errorCase1,
@@ -249,24 +266,32 @@ describe('bridge', () => {
         ]);
     });
 
-    test(`connect/disconnect device - get transport-update events`, async () => {
+    test(`connect/disconnect device - get transport update events`, async () => {
         const eventSpy = jest.fn();
-        bridge1.on('transport-update', eventSpy);
+        bridge1.on('transport-device_connected', eventSpy);
+        bridge1.on('transport-device_disconnected', eventSpy);
+        bridge1.on('transport-device_session_changed', eventSpy);
         await TrezorUserEnvLink.stopEmu();
 
         expect(eventSpy).toHaveBeenCalledTimes(0);
 
         bridge1.listen();
 
-        const waitForUpdateEvent = () =>
+        const waitForEvent = (event: Parameters<(typeof bridge1)['once']>[0]) =>
             new Promise(resolve => {
-                bridge1.once('transport-update', resolve);
+                bridge1.once(event, resolve);
             });
 
-        await Promise.all([TrezorUserEnvLink.startEmu(emulatorStartOpts), waitForUpdateEvent()]);
+        await Promise.all([
+            TrezorUserEnvLink.startEmu(emulatorStartOpts),
+            waitForEvent('transport-device_connected'),
+        ]);
         expect(eventSpy).toHaveBeenCalledTimes(1);
 
-        await Promise.all([TrezorUserEnvLink.stopEmu(), waitForUpdateEvent()]);
+        await Promise.all([
+            TrezorUserEnvLink.stopEmu(),
+            waitForEvent('transport-device_disconnected'),
+        ]);
 
         expect(eventSpy).toHaveBeenCalledTimes(2);
     });
diff --git a/packages/transport-test/eslint.config.mjs b/packages/transport-test/eslint.config.mjs
new file mode 100644
index 00000000000..0cf958eb52c
--- /dev/null
+++ b/packages/transport-test/eslint.config.mjs
@@ -0,0 +1,11 @@
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'no-nested-ternary': 'off', // useful in tests...
+            'no-console': 'off',
+        },
+    },
+];
diff --git a/packages/transport-test/package.json b/packages/transport-test/package.json
index cb3acba0e56..e8bc7f282e6 100644
--- a/packages/transport-test/package.json
+++ b/packages/transport-test/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "scripts": {
         "depcheck": "yarn g:depcheck",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "type-check": "yarn g:tsc --build",
         "test:e2e:bridge": "ts-node -T -O '{\"module\": \"commonjs\", \"esModuleInterop\": true}' ./e2e/bridge/run.ts",
         "test:e2e:old-bridge:hw": "USE_HW=true USE_NODE_BRIDGE=false yarn test:e2e:bridge",
@@ -20,6 +19,8 @@
     },
     "devDependencies": {
         "@jest/types": "^29.6.3",
+        "@trezor/eslint": "workspace:*",
+        "@trezor/protobuf": "workspace:*",
         "@trezor/transport": "workspace:*",
         "@trezor/transport-bridge": "workspace:*",
         "@trezor/trezor-user-env-link": "workspace:^",
diff --git a/packages/transport-test/tsconfig.json b/packages/transport-test/tsconfig.json
index 7ad2b5402d6..2b66b2baf84 100644
--- a/packages/transport-test/tsconfig.json
+++ b/packages/transport-test/tsconfig.json
@@ -2,6 +2,8 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
+        { "path": "../eslint" },
+        { "path": "../protobuf" },
         { "path": "../transport" },
         { "path": "../transport-bridge" },
         { "path": "../trezor-user-env-link" },
diff --git a/packages/transport/eslint.config.mjs b/packages/transport/eslint.config.mjs
new file mode 100644
index 00000000000..e20beb6d4fb
--- /dev/null
+++ b/packages/transport/eslint.config.mjs
@@ -0,0 +1,11 @@
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'no-console': 'off',
+            '@typescript-eslint/no-shadow': 'off', // Todo: shall be fixed
+        },
+    },
+];
diff --git a/packages/transport/jest.config.js b/packages/transport/jest.config.js
index 5f5990b86a0..061f21335fe 100644
--- a/packages/transport/jest.config.js
+++ b/packages/transport/jest.config.js
@@ -2,7 +2,6 @@ const { ...baseConfig } = require('../../jest.config.base');
 
 module.exports = {
     ...baseConfig,
-    testEnvironment: 'node',
     collectCoverage: true,
     collectCoverageFrom: ['src/**/*.ts'],
     watchPathIgnorePatterns: ['<rootDir>/libDev', '<rootDir>/lib'],
diff --git a/packages/transport/package.json b/packages/transport/package.json
index c2c6a12c7e7..77eee878209 100644
--- a/packages/transport/package.json
+++ b/packages/transport/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@trezor/transport",
-    "version": "1.3.2",
+    "version": "1.3.3-beta.2",
     "description": "Low level library facilitating protocol buffers based communication with Trezor devices",
     "npmPublishAccess": "public",
     "license": "SEE LICENSE IN LICENSE.md",
@@ -42,7 +42,6 @@
         "!**/*.map"
     ],
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "type-check": "yarn g:tsc --build tsconfig.json",
         "build:lib": "yarn g:rimraf -rf lib && yarn g:tsc --build tsconfig.lib.json && ../../scripts/replace-imports.sh ./lib",
         "publish:lib": "./scripts/publish-lib.sh",
@@ -53,9 +52,10 @@
     "devDependencies": {
         "@babel/preset-env": "^7.23.9",
         "@babel/preset-typescript": "^7.24.7",
+        "@trezor/eslint": "workspace:*",
         "@trezor/trezor-user-env-link": "workspace:*",
         "@types/bytebuffer": "^5.0.49",
-        "@types/sharedworker": "^0.0.124",
+        "@types/sharedworker": "^0.0.130",
         "@types/w3c-web-usb": "^1.0.10",
         "jest": "29.7.0",
         "jest-environment-node": "^29.7.0",
diff --git a/packages/transport/src/api/abstract.ts b/packages/transport/src/api/abstract.ts
index 6e2d238cfd7..1ca42b102ed 100644
--- a/packages/transport/src/api/abstract.ts
+++ b/packages/transport/src/api/abstract.ts
@@ -1,4 +1,5 @@
 import { TypedEmitter, getSynchronize } from '@trezor/utils';
+
 import type {
     AnyError,
     AsyncResultWithTypedError,
@@ -8,7 +9,6 @@ import type {
     PathInternal,
 } from '../types';
 import { success, error, unknownError } from '../utils/result';
-
 import * as ERRORS from '../errors';
 
 export interface AbstractApiConstructorParams {
@@ -148,7 +148,7 @@ export abstract class AbstractApi extends TypedEmitter<{
         return unknownError(err, expectedErrors);
     }
 
-    protected synchronize = getSynchronize();
+    private synchronize = getSynchronize();
 
     /**
      * call this to ensure single access to transport api.
diff --git a/packages/transport/src/api/udp.ts b/packages/transport/src/api/udp.ts
index 6d2bbce5015..a95a9421d73 100644
--- a/packages/transport/src/api/udp.ts
+++ b/packages/transport/src/api/udp.ts
@@ -1,4 +1,5 @@
 import UDP from 'dgram';
+
 import { createTimeoutPromise, isNotUndefined, arrayPartition } from '@trezor/utils';
 
 import {
@@ -14,10 +15,12 @@ export class UdpApi extends AbstractApi {
     chunkSize = 64;
 
     protected devices: DescriptorApiLevel[] = [];
-    protected interface = UDP.createSocket('udp4');
+    private listenAbortController = new AbortController();
+    protected interface = UDP.createSocket({
+        type: 'udp4',
+        signal: this.listenAbortController.signal,
+    });
     protected communicating = false;
-
-    private enumerateAbortController = new AbortController();
     private debugLink?: boolean;
 
     constructor({ logger, debugLink }: AbstractApiConstructorParams & { debugLink?: boolean }) {
@@ -35,7 +38,7 @@ export class UdpApi extends AbstractApi {
         while (this.listening) {
             await createTimeoutPromise(500);
             if (!this.listening) break;
-            await this.enumerate(this.enumerateAbortController.signal);
+            await this.enumerate(this.listenAbortController.signal);
         }
     }
 
@@ -178,7 +181,7 @@ export class UdpApi extends AbstractApi {
             this.handleDevicesChange(enumerateResult);
 
             return this.success(enumerateResult);
-        } catch (e) {
+        } catch {
             this.handleDevicesChange([]);
 
             return this.error({ error: ERRORS.ABORTED_BY_SIGNAL });
@@ -186,7 +189,10 @@ export class UdpApi extends AbstractApi {
     }
 
     private handleDevicesChange(devices: DescriptorApiLevel[]) {
-        const [known, unknown] = arrayPartition(devices, device => this.devices.includes(device));
+        const [known, unknown] = arrayPartition(
+            devices,
+            device => !!this.devices.find(d => d.path === device.path),
+        );
 
         if (known.length !== this.devices.length || unknown.length > 0) {
             this.devices = devices;
@@ -209,6 +215,6 @@ export class UdpApi extends AbstractApi {
         this.interface.removeAllListeners();
         this.interface.close();
         this.listening = false;
-        this.enumerateAbortController.abort();
+        this.listenAbortController.abort();
     }
 }
diff --git a/packages/transport/src/api/usb.ts b/packages/transport/src/api/usb.ts
index 4391b1a8220..7cd17860a9e 100644
--- a/packages/transport/src/api/usb.ts
+++ b/packages/transport/src/api/usb.ts
@@ -1,4 +1,4 @@
-import { createDeferred, createTimeoutPromise } from '@trezor/utils';
+import { createDeferred, createTimeoutPromise, getSynchronize } from '@trezor/utils';
 
 import { AbstractApi, AbstractApiConstructorParams, DEVICE_TYPE } from './abstract';
 import { DescriptorApiLevel, PathInternal } from '../types';
@@ -12,7 +12,6 @@ import {
     TREZOR_USB_DESCRIPTORS,
     WEBUSB_BOOTLOADER_PRODUCT,
 } from '../constants';
-
 import * as ERRORS from '../errors';
 
 interface ConstructorParams extends AbstractApiConstructorParams {
@@ -40,6 +39,7 @@ export class UsbApi extends AbstractApi {
     private forceReadSerialOnConnect?: boolean;
     private abortController = new AbortController();
     private debugLink?: boolean;
+    private synchronizeCreateDevices = getSynchronize();
 
     constructor({ usbInterface, logger, forceReadSerialOnConnect, debugLink }: ConstructorParams) {
         super({ logger });
@@ -53,17 +53,15 @@ export class UsbApi extends AbstractApi {
         this.usbInterface.onconnect = event => {
             this.logger?.debug(`usb: onconnect: ${this.formatDeviceForLog(event.device)}`);
 
-            this.synchronize(() => {
-                this.createDevices([event.device], this.abortController.signal)
-                    .then(newDevices => {
-                        this.devices = [...this.devices, ...newDevices];
-                        this.emit('transport-interface-change', this.devicesToDescriptors());
-                    })
-                    .catch(err => {
-                        // empty
-                        this.logger?.error(`usb: createDevices error: ${err.message}`);
-                    });
-            });
+            return this.createDevices([event.device], this.abortController.signal)
+                .then(newDevices => {
+                    this.devices = [...this.devices, ...newDevices];
+                    this.emit('transport-interface-change', this.devicesToDescriptors());
+                })
+                .catch(err => {
+                    // empty
+                    this.logger?.error(`usb: createDevices error: ${err.message}`);
+                });
         };
 
         this.usbInterface.ondisconnect = event => {
@@ -144,7 +142,9 @@ export class UsbApi extends AbstractApi {
             this.logger?.debug('usb: abortableMethod onAbort start');
             try {
                 await onAbort?.();
-            } catch {}
+            } catch {
+                /* empty */
+            }
             this.logger?.debug('usb: abortableMethod onAbort done');
             dfd.reject(new Error(ERRORS.ABORTED_BY_SIGNAL));
         };
@@ -172,22 +172,20 @@ export class UsbApi extends AbstractApi {
             });
     }
 
-    public enumerate(signal?: AbortSignal) {
-        return this.synchronize(async () => {
-            try {
-                this.logger?.debug('usb: enumerate');
-                const devices = await this.abortableMethod(() => this.usbInterface.getDevices(), {
-                    signal,
-                });
+    public async enumerate(signal?: AbortSignal) {
+        try {
+            this.logger?.debug('usb: enumerate');
+            const devices = await this.abortableMethod(() => this.usbInterface.getDevices(), {
+                signal,
+            });
 
-                this.devices = await this.createDevices(devices, signal);
+            this.devices = await this.createDevices(devices, signal);
 
-                return this.success(this.devicesToDescriptors());
-            } catch (err) {
-                // this shouldn't throw
-                return this.unknownError(err);
-            }
-        });
+            return this.success(this.devicesToDescriptors());
+        } catch (err) {
+            // this shouldn't throw
+            return this.unknownError(err);
+        }
     }
 
     public async read(path: string, signal?: AbortSignal) {
@@ -413,60 +411,63 @@ export class UsbApi extends AbstractApi {
         return device.device;
     }
 
-    private async createDevices(devices: USBDevice[], signal?: AbortSignal) {
-        let bootloaderId = 0;
-
-        const getPathFromUsbDevice = (device: USBDevice) => {
-            // path is just serial number
-            // more bootloaders => number them, hope for the best
-            const { serialNumber } = device;
-            let path = serialNumber == null || serialNumber === '' ? 'bootloader' : serialNumber;
-            if (path === 'bootloader') {
-                this.logger?.debug('usb: device without serial number!');
-                bootloaderId++;
-                path += bootloaderId;
-            }
+    private createDevices(devices: USBDevice[], signal?: AbortSignal) {
+        return this.synchronizeCreateDevices(async () => {
+            let bootloaderId = 0;
+
+            const getPathFromUsbDevice = (device: USBDevice) => {
+                // path is just serial number
+                // more bootloaders => number them, hope for the best
+                const { serialNumber } = device;
+                let path =
+                    serialNumber == null || serialNumber === '' ? 'bootloader' : serialNumber;
+                if (path === 'bootloader') {
+                    this.logger?.debug('usb: device without serial number!');
+                    bootloaderId++;
+                    path += bootloaderId;
+                }
 
-            return path;
-        };
+                return path;
+            };
 
-        const [hidDevices, nonHidDevices] = this.filterDevices(devices);
+            const [hidDevices, nonHidDevices] = this.filterDevices(devices);
 
-        hidDevices.forEach(device => {
-            // hidDevices that do not support webusb standard. emit them as normal descriptors. higher layers are responsible
-            // for displaying them as unreadable devices
-            this.logger?.error(
-                `usb: unreadable hid device connected. device: ${this.formatDeviceForLog(device)}`,
+            hidDevices.forEach(device => {
+                // hidDevices that do not support webusb standard. emit them as normal descriptors. higher layers are responsible
+                // for displaying them as unreadable devices
+                this.logger?.error(
+                    `usb: unreadable hid device connected. device: ${this.formatDeviceForLog(device)}`,
+                );
+            });
+
+            const loadedDevices = await Promise.all(
+                nonHidDevices.map(async device => {
+                    this.logger?.debug(`usb: creating device ${this.formatDeviceForLog(device)}`);
+
+                    if (
+                        this.forceReadSerialOnConnect &&
+                        // device already has serialNumber or it is open - both cases mean that we already seen it before and don't need to bother
+                        !device.opened &&
+                        !device.serialNumber
+                    ) {
+                        // try to load serialNumber. if this doesn't succeed, we can still continue normally. the only problem is that multiple devices
+                        // connected at the same time will not be properly distinguished.
+                        await this.loadSerialNumber(device, signal);
+                    }
+                    const path = getPathFromUsbDevice(device);
+
+                    return { path, device };
+                }),
             );
-        });
 
-        const loadedDevices = await Promise.all(
-            nonHidDevices.map(async device => {
-                this.logger?.debug(`usb: creating device ${this.formatDeviceForLog(device)}`);
-
-                if (
-                    this.forceReadSerialOnConnect &&
-                    // device already has serialNumber or it is open - both cases mean that we already seen it before and don't need to bother
-                    !device.opened &&
-                    !device.serialNumber
-                ) {
-                    // try to load serialNumber. if this doesn't succeed, we can still continue normally. the only problem is that multiple devices
-                    // connected at the same time will not be properly distinguished.
-                    await this.loadSerialNumber(device, signal);
-                }
-                const path = getPathFromUsbDevice(device);
-
-                return { path, device };
-            }),
-        );
-
-        return [
-            ...loadedDevices,
-            ...hidDevices.map(d => ({
-                path: getPathFromUsbDevice(d),
-                device: d,
-            })),
-        ];
+            return [
+                ...loadedDevices,
+                ...hidDevices.map(d => ({
+                    path: getPathFromUsbDevice(d),
+                    device: d,
+                })),
+            ];
+        });
     }
 
     /*
diff --git a/packages/transport/src/constants.ts b/packages/transport/src/constants.ts
index 7e8fcaa14d3..e52eabf3c86 100644
--- a/packages/transport/src/constants.ts
+++ b/packages/transport/src/constants.ts
@@ -26,9 +26,14 @@ export const TREZOR_USB_DESCRIPTORS = [
 export const ACTION_TIMEOUT = 10000;
 
 export const TRANSPORT = {
+    /* events */
     START: 'transport-start',
     ERROR: 'transport-error',
-    UPDATE: 'transport-update',
+    DEVICE_CONNECTED: 'transport-device_connected',
+    DEVICE_DISCONNECTED: 'transport-device_disconnected',
+    DEVICE_SESSION_CHANGED: 'transport-device_session_changed',
+    DEVICE_REQUEST_RELEASE: 'transport-device_request_release',
+    /* messages */
     DISABLE_WEBUSB: 'transport-disable_webusb',
     REQUEST_DEVICE: 'transport-request_device',
     GET_INFO: 'transport-get_info',
diff --git a/packages/transport/src/index.ts b/packages/transport/src/index.ts
index 78082f935f1..f12d95fd2d2 100644
--- a/packages/transport/src/index.ts
+++ b/packages/transport/src/index.ts
@@ -14,7 +14,6 @@ protobuf.configure();
 export type { Descriptor, Session } from './types';
 export { TREZOR_USB_DESCRIPTORS, TRANSPORT } from './constants';
 
-export type { DeviceDescriptorDiff } from './transports/abstract';
 export { AbstractTransport as Transport, isTransportInstance } from './transports/abstract';
 export { AbstractApiTransport } from './transports/abstractApi';
 export { UsbApi } from './api/usb';
diff --git a/packages/transport/src/sessions/background-browser.ts b/packages/transport/src/sessions/background-browser.ts
index 06d4954518c..a63bf9e79c2 100644
--- a/packages/transport/src/sessions/background-browser.ts
+++ b/packages/transport/src/sessions/background-browser.ts
@@ -1,6 +1,5 @@
 import type { Descriptor } from '../types';
 import { SessionsBackground } from './background';
-
 import { HandleMessageParams, HandleMessageResponse, SessionsBackgroundInterface } from './types';
 
 /**
@@ -43,7 +42,9 @@ export class BrowserSessionsBackground implements SessionsBackgroundInterface {
         });
     }
 
-    on(_event: 'descriptors', listener: (descriptors: Descriptor[]) => void): void {
+    on(event: 'descriptors', listener: (descriptors: Descriptor[]) => void): void;
+    on(event: 'releaseRequest', listener: (descriptor: Descriptor) => void): void;
+    on(event: 'descriptors' | 'releaseRequest', listener: (descriptors: any) => void): void {
         this.background.port.addEventListener(
             'message',
             (
@@ -54,8 +55,8 @@ export class BrowserSessionsBackground implements SessionsBackgroundInterface {
                     | { type: 'descriptors'; payload: Descriptor[] }
                 >,
             ) => {
-                if ('type' in e?.data) {
-                    if (e.data.type === 'descriptors') {
+                if (e && 'type' in e.data) {
+                    if (e.data.type === event) {
                         listener(e.data.payload);
                     }
                 }
diff --git a/packages/transport/src/sessions/background-sharedworker.ts b/packages/transport/src/sessions/background-sharedworker.ts
index 23e46f5ffc0..87be0803a5a 100644
--- a/packages/transport/src/sessions/background-sharedworker.ts
+++ b/packages/transport/src/sessions/background-sharedworker.ts
@@ -20,6 +20,12 @@ background.on('descriptors', descriptors => {
     });
 });
 
+background.on('releaseRequest', descriptor => {
+    ports.forEach(p => {
+        p.postMessage({ type: 'releaseRequest', payload: descriptor });
+    });
+});
+
 self.onconnect = function (e) {
     const port = e.ports[0];
 
diff --git a/packages/transport/src/sessions/background.ts b/packages/transport/src/sessions/background.ts
index 9d748a84615..12918044094 100644
--- a/packages/transport/src/sessions/background.ts
+++ b/packages/transport/src/sessions/background.ts
@@ -9,8 +9,7 @@
  * - we can say we trust the caller but not really thats why we implement auto-unlock
  */
 
-import { createDeferred, Deferred } from '@trezor/utils';
-import { TypedEmitter } from '@trezor/utils';
+import { createDeferred, Deferred, TypedEmitter } from '@trezor/utils';
 
 import type {
     EnumerateDoneRequest,
@@ -43,6 +42,7 @@ export class SessionsBackground
          * note: we can't send diff from here (see abstract transport) although it would make sense, because we need to support also bridge which does not use this sessions background.
          */
         descriptors: Descriptor[];
+        releaseRequest: Descriptor;
     }>
     implements SessionsBackgroundInterface
 {
@@ -115,9 +115,15 @@ export class SessionsBackground
                 id: message.type,
             } as HandleMessageResponse<M>;
         } finally {
-            if (result && result.success && result.payload && 'descriptors' in result.payload) {
-                const { descriptors } = result.payload;
-                setTimeout(() => this.emit('descriptors', Object.values(descriptors)), 0);
+            if (result && result.success && result.payload) {
+                if ('descriptors' in result.payload) {
+                    const { descriptors } = result.payload;
+                    setTimeout(() => this.emit('descriptors', Object.values(descriptors)), 0);
+                }
+                if ('releaseRequest' in result.payload && result.payload.releaseRequest) {
+                    const { releaseRequest } = result.payload;
+                    setTimeout(() => this.emit('releaseRequest', releaseRequest));
+                }
             }
         }
     }
@@ -189,18 +195,11 @@ export class SessionsBackground
             return this.error(ERRORS.SESSION_WRONG_PREVIOUS);
         }
 
-        // new "unconfirmed" descriptors are  broadcasted. we can't yet update this.sessions object as it needs
-        // to stay as it is. we can not allow 2 clients sending session:null to proceed. this way only one gets through
-        const unconfirmedSessions: DescriptorsDict = JSON.parse(JSON.stringify(this.descriptors));
-
         this.lastSessionId++;
-        unconfirmedSessions[pathInternal].session = Session(`${this.lastSessionId}`);
+        const session = Session(`${this.lastSessionId}`);
+        const releaseRequest = previous ? this.descriptors[pathInternal] : undefined;
 
-        return this.success({
-            session: unconfirmedSessions[pathInternal].session,
-            path: pathInternal,
-            descriptors: Object.values(unconfirmedSessions),
-        });
+        return this.success({ session, path: pathInternal, releaseRequest });
     }
 
     /**
@@ -215,6 +214,7 @@ export class SessionsBackground
             return this.error(ERRORS.DESCRIPTOR_NOT_FOUND);
         }
         this.descriptors[pathInternal].session = Session(`${this.lastSessionId}`);
+        this.descriptors[pathInternal].sessionOwner = payload.sessionOwner;
 
         return Promise.resolve(
             this.success({
@@ -238,6 +238,7 @@ export class SessionsBackground
 
     private releaseDone(payload: ReleaseDoneRequest) {
         this.descriptors[payload.path].session = null;
+        this.descriptors[payload.path].sessionOwner = undefined;
 
         this.clearLock();
 
diff --git a/packages/transport/src/sessions/client.ts b/packages/transport/src/sessions/client.ts
index 626eb113fa7..4ec4b864770 100644
--- a/packages/transport/src/sessions/client.ts
+++ b/packages/transport/src/sessions/client.ts
@@ -1,5 +1,4 @@
-import { getWeakRandomId } from '@trezor/utils';
-import { TypedEmitter } from '@trezor/utils';
+import { getWeakRandomId, TypedEmitter } from '@trezor/utils';
 
 import { Descriptor } from '../types';
 import {
@@ -19,6 +18,7 @@ import {
  */
 export class SessionsClient extends TypedEmitter<{
     descriptors: Descriptor[];
+    releaseRequest: Descriptor;
 }> {
     // used only for debugging - discriminating sessions clients in sessions background log
     private caller = getWeakRandomId(3);
@@ -30,6 +30,7 @@ export class SessionsClient extends TypedEmitter<{
         this.id = 0;
         this.background = background;
         background.on('descriptors', descriptors => this.emit('descriptors', descriptors));
+        background.on('releaseRequest', descriptor => this.emit('releaseRequest', descriptor));
     }
 
     public setBackground(background: SessionsBackgroundInterface) {
@@ -38,6 +39,7 @@ export class SessionsClient extends TypedEmitter<{
         this.id = 0;
         this.background = background;
         background.on('descriptors', descriptors => this.emit('descriptors', descriptors));
+        background.on('releaseRequest', descriptor => this.emit('releaseRequest', descriptor));
     }
 
     private request<M extends HandleMessageParams>(params: M) {
diff --git a/packages/transport/src/sessions/types.ts b/packages/transport/src/sessions/types.ts
index 2f1504ad3df..84da121d75c 100644
--- a/packages/transport/src/sessions/types.ts
+++ b/packages/transport/src/sessions/types.ts
@@ -27,12 +27,13 @@ export type EnumerateDoneResponse = BackgroundResponse<{
 export type AcquireIntentRequest = AcquireInput;
 
 export type AcquireIntentResponse = BackgroundResponseWithError<
-    { session: Session; path: PathInternal },
+    { session: Session; path: PathInternal; releaseRequest?: Descriptor },
     typeof ERRORS.SESSION_WRONG_PREVIOUS | typeof ERRORS.DESCRIPTOR_NOT_FOUND
 >;
 
 export type AcquireDoneRequest = {
     path: PathPublic;
+    sessionOwner?: string;
 };
 
 export type AcquireDoneResponse = BackgroundResponseWithError<
@@ -113,6 +114,7 @@ export type HandleMessageResponse<P> = P extends { type: infer T }
 
 export interface SessionsBackgroundInterface {
     on(event: 'descriptors', listener: (descriptors: Descriptor[]) => void): void;
+    on(event: 'releaseRequest', listener: (descriptor: Descriptor) => void): void;
     handleMessage<M extends HandleMessageParams>(message: M): Promise<HandleMessageResponse<M>>;
     dispose(): void;
 }
diff --git a/packages/transport/src/transports/abstract.ts b/packages/transport/src/transports/abstract.ts
index 392d799cf0d..f8dad7b7784 100644
--- a/packages/transport/src/transports/abstract.ts
+++ b/packages/transport/src/transports/abstract.ts
@@ -1,12 +1,6 @@
 import * as protobuf from 'protobufjs/light';
-import {
-    arrayPartition,
-    scheduleAction,
-    ScheduleActionParams,
-    ScheduledAction,
-    Deferred,
-} from '@trezor/utils';
-import { TypedEmitter } from '@trezor/utils';
+
+import { scheduleAction, ScheduleActionParams, ScheduledAction, TypedEmitter } from '@trezor/utils';
 import { PROTOCOL_MALFORMED, TransportProtocol } from '@trezor/protocol';
 import { MessageFromTrezor } from '@trezor/protobuf';
 
@@ -22,7 +16,6 @@ import {
     PathPublic,
 } from '../types';
 import { success, error, unknownError } from '../utils/result';
-
 import * as ERRORS from '../errors';
 import { ACTION_TIMEOUT, TRANSPORT } from '../constants';
 
@@ -37,20 +30,11 @@ export type ReleaseInput = {
     onClose?: boolean;
 };
 
-type DescriptorDiffItem = { descriptor: Descriptor } & (
-    | { type: 'connected' | 'disconnected' }
-    | {
-          type: 'acquired' | 'released';
-          subtype: 'here' | 'elsewhere';
-      }
-);
-
-export type DeviceDescriptorDiff = DescriptorDiffItem[];
-
 export interface AbstractTransportParams {
     messages?: Record<string, any>;
     logger?: Logger;
     debugLink?: boolean;
+    id: string;
 }
 
 export const isTransportInstance = (transport?: AbstractTransport) => {
@@ -90,7 +74,10 @@ type ReadWriteError =
     | typeof ERRORS.INTERFACE_DATA_TRANSFER;
 
 class TransportEmitter extends TypedEmitter<{
-    [TRANSPORT.UPDATE]: DeviceDescriptorDiff;
+    [TRANSPORT.DEVICE_CONNECTED]: Descriptor;
+    [TRANSPORT.DEVICE_DISCONNECTED]: Descriptor;
+    [TRANSPORT.DEVICE_SESSION_CHANGED]: Descriptor;
+    [TRANSPORT.DEVICE_REQUEST_RELEASE]: Descriptor;
     [TRANSPORT.ERROR]:
         | typeof ERRORS.HTTP_ERROR // most common error - bridge was killed
         // probably never happens, wrong shape of data came from bridge
@@ -125,38 +112,6 @@ export abstract class AbstractTransport extends TransportEmitter {
      * minimal data to track device on transport layer
      */
     protected descriptors: Descriptor[];
-    /**
-     * when calling acquire, after it resolves successfully, we store the result (session)
-     * and wait for next descriptors update (/listen in case of bridge or 'descriptors' message from sessions background)
-     * and compare it with acquiringSession. Typically both values would equal but in certain edgecases
-     * another application might have acquired session right after this application which means that
-     * the originally received session is not longer valid and device is used by another application
-     */
-    protected acquiredUnconfirmed: Record<string, Session> = {};
-    /**
-     * promise that resolves on when next descriptors are delivered
-     */
-    protected listenPromise: Record<
-        string,
-        Deferred<
-            ResultWithTypedError<
-                Session,
-                | typeof ERRORS.DEVICE_DISCONNECTED_DURING_ACTION
-                | typeof ERRORS.SESSION_WRONG_PREVIOUS
-                | typeof ERRORS.DEVICE_NOT_FOUND
-                | typeof ERRORS.INTERFACE_UNABLE_TO_OPEN_DEVICE
-                | typeof ERRORS.UNEXPECTED_ERROR
-                | typeof ERRORS.ABORTED_BY_TIMEOUT
-                | typeof ERRORS.ABORTED_BY_SIGNAL
-            >
-        >
-    > = {};
-
-    /**
-     * used to postpone resolving of transport.release until next descriptors are delivered
-     */
-    protected releasePromise?: Deferred<any>;
-    protected releaseUnconfirmed: Record<string, Session> = {};
 
     /**
      * each transport class accepts signal parameter in constructor and implements it's own abort controller.
@@ -167,13 +122,19 @@ export abstract class AbstractTransport extends TransportEmitter {
      * and instance of logger from @trezor/connect/src/utils/debug could be passed to activate logs from transport
      */
     protected logger?: Logger;
+    /**
+     * identifier this transport
+     * todo: or app implementing this transport?
+     */
+    protected id: string;
 
-    constructor({ messages, logger }: AbstractTransportParams) {
+    constructor({ messages, logger, id }: AbstractTransportParams) {
         super();
         this.descriptors = [];
         this.messages = protobuf.Root.fromJSON(messages || {});
         this.abortController = new AbortController();
         this.logger = logger;
+        this.id = id;
     }
 
     /**
@@ -244,7 +205,7 @@ export abstract class AbstractTransport extends TransportEmitter {
      * Release session
      */
     abstract release(params: ReleaseInput & AbortableParam): AsyncResultWithTypedError<
-        void,
+        null,
         | typeof ERRORS.SESSION_NOT_FOUND
         // bridge
         | typeof ERRORS.HTTP_ERROR
@@ -314,46 +275,6 @@ export abstract class AbstractTransport extends TransportEmitter {
         this.abortController.abort();
         this.abortController = new AbortController();
         this.descriptors = [];
-        this.acquiredUnconfirmed = {};
-        this.listenPromise = {};
-        this.releaseUnconfirmed = {};
-        this.releasePromise = undefined;
-    }
-
-    private getDiff(nextDescriptors: Descriptor[]): DeviceDescriptorDiff {
-        const oldDescriptors = new Map(this.descriptors.map(d => [getKey(d), d]));
-        const newDescriptors = new Map(nextDescriptors.map(d => [getKey(d), d]));
-
-        const [remaining, connected] = arrayPartition(nextDescriptors, n =>
-            oldDescriptors.has(getKey(n)),
-        );
-
-        const disconnected = this.descriptors.filter(d => !newDescriptors.has(getKey(d)));
-
-        const changed = remaining.filter(d => oldDescriptors.get(getKey(d))?.session !== d.session);
-
-        return [
-            ...disconnected.map(descriptor => ({ type: 'disconnected', descriptor }) as const),
-            ...connected.map(descriptor => ({ type: 'connected', descriptor }) as const),
-            ...changed.map(descriptor => {
-                if (typeof descriptor.session === 'string') {
-                    const subtype =
-                        descriptor.session === this.acquiredUnconfirmed[descriptor.path]
-                            ? 'here'
-                            : 'elsewhere';
-
-                    return { type: 'acquired', subtype, descriptor } as const;
-                } else {
-                    const subtype =
-                        this.descriptors.find(prevD => prevD.path === descriptor.path)?.session ===
-                        this.releaseUnconfirmed[descriptor.path]
-                            ? 'here'
-                            : 'elsewhere';
-
-                    return { type: 'released', subtype, descriptor } as const;
-                }
-            }),
-        ];
     }
 
     /**
@@ -366,60 +287,40 @@ export abstract class AbstractTransport extends TransportEmitter {
         if (this.stopped) {
             return;
         }
-        const diff = this.getDiff(nextDescriptors);
-        this.logger?.debug('nextDescriptors', nextDescriptors, 'diff', diff);
+
+        const oldDescriptors = new Map(this.descriptors.map(d => [getKey(d), d]));
+        const newDescriptors = new Map(nextDescriptors.map(d => [getKey(d), d]));
+
+        // present descriptors
+        this.descriptors
+            .filter(d => !newDescriptors.has(getKey(d)))
+            .forEach(descriptor =>
+                // descriptor in present batch but not in incoming -> disconnected device
+                this.emit(TRANSPORT.DEVICE_DISCONNECTED, descriptor),
+            );
+
+        // incoming descriptors
+        nextDescriptors.forEach(descriptor => {
+            const prevDescriptor = oldDescriptors.get(getKey(descriptor));
+
+            if (!prevDescriptor) {
+                // descriptor in incoming batch but not in present -> connected device
+                this.emit(TRANSPORT.DEVICE_CONNECTED, descriptor);
+            } else if (prevDescriptor.session !== descriptor.session) {
+                // present session different than incoming -> device acquired or released
+                this.emit(TRANSPORT.DEVICE_SESSION_CHANGED, descriptor);
+            }
+        });
 
         // even when there is no change from our point of view (see diff.didUpdate) it makes sense to update local descriptors because the
         // last descriptors we handled might in fact be different to what we have saved locally from the previous update. the reason is that
         // legacy bridge backends might be working with a different set of fields (eg. debug, debugSession). and we need to save this since
         // we need to pass this data to the next /listen call
         this.descriptors = nextDescriptors;
+    }
 
-        if (!diff.length) {
-            return;
-        }
-
-        Object.keys(this.listenPromise).forEach(path => {
-            const descriptor = nextDescriptors.find(device => device.path === path);
-
-            if (!descriptor) {
-                return this.listenPromise[path].resolve(
-                    this.error({ error: ERRORS.DEVICE_DISCONNECTED_DURING_ACTION }),
-                );
-            }
-
-            const listenedPathChanged = diff.find(
-                d => d.descriptor.path === path && ['acquired', 'released'].includes(d.type),
-            )?.descriptor;
-
-            if (!listenedPathChanged) {
-                return;
-            }
-
-            if (this.acquiredUnconfirmed[path]) {
-                if (listenedPathChanged.session === this.acquiredUnconfirmed[path]) {
-                    this.listenPromise[path].resolve(this.success(this.acquiredUnconfirmed[path]));
-                } else {
-                    // another app took over
-                    this.listenPromise[path].resolve(
-                        this.error({ error: ERRORS.SESSION_WRONG_PREVIOUS }),
-                    );
-                }
-                delete this.acquiredUnconfirmed[path];
-            }
-
-            if (this.releaseUnconfirmed[path]) {
-                if (!listenedPathChanged.session) {
-                    // todo: solve me! this value is not used anyway. should be typed better
-                    // @ts-expect-error
-                    this.listenPromise[path].resolve(this.success(null));
-                    delete this.releaseUnconfirmed[path];
-                }
-                // when releasing we don't really care about else
-            }
-        });
-
-        this.emit(TRANSPORT.UPDATE, diff);
+    public getDescriptor(path: PathPublic) {
+        return this.descriptors.find(d => d.path === path);
     }
 
     /**
diff --git a/packages/transport/src/transports/abstractApi.ts b/packages/transport/src/transports/abstractApi.ts
index f5c5a7fe8e4..713f5676e81 100644
--- a/packages/transport/src/transports/abstractApi.ts
+++ b/packages/transport/src/transports/abstractApi.ts
@@ -1,7 +1,6 @@
-import { SessionsBackground } from '../sessions/background';
-import { createDeferred } from '@trezor/utils';
 import { v1 as v1Protocol } from '@trezor/protocol';
 
+import { SessionsBackground } from '../sessions/background';
 import {
     AbstractTransport,
     AbstractTransportParams,
@@ -14,6 +13,7 @@ import { SessionsClient } from '../sessions/client';
 import * as ERRORS from '../errors';
 import { Session } from '../types';
 import { SessionsBackgroundInterface } from '../sessions/types';
+import { TRANSPORT } from '../constants';
 
 interface ConstructorParams extends AbstractTransportParams {
     api: AbstractApi;
@@ -71,6 +71,10 @@ export abstract class AbstractApiTransport extends AbstractTransport {
             this.handleDescriptorsChange(descriptors);
         });
 
+        this.sessionsClient.on('releaseRequest', descriptor => {
+            this.emit(TRANSPORT.DEVICE_REQUEST_RELEASE, descriptor);
+        });
+
         return this.success(undefined);
     }
 
@@ -102,18 +106,12 @@ export abstract class AbstractApiTransport extends AbstractTransport {
             async signal => {
                 const { path } = input;
 
-                if (this.listening) {
-                    this.listenPromise[path] = createDeferred();
-                }
-
                 const acquireIntentResponse = await this.sessionsClient.acquireIntent(input);
 
                 if (!acquireIntentResponse.success) {
                     return this.error({ error: acquireIntentResponse.error });
                 }
 
-                this.acquiredUnconfirmed[path] = acquireIntentResponse.payload.session;
-
                 const reset = !!input.previous;
                 const openDeviceResult = await this.api.openDevice(
                     acquireIntentResponse.payload.path,
@@ -122,35 +120,26 @@ export abstract class AbstractApiTransport extends AbstractTransport {
                 );
 
                 if (!openDeviceResult.success) {
-                    if (this.listenPromise[path]) {
-                        this.listenPromise[path].resolve(openDeviceResult);
-                    }
-
                     return openDeviceResult;
                 }
 
-                this.sessionsClient.acquireDone({ path });
+                this.sessionsClient.acquireDone({ path, sessionOwner: this.id });
 
-                if (!this.listenPromise[path]) {
-                    return this.success(acquireIntentResponse.payload.session);
-                }
-
-                return this.listenPromise[path].promise.finally(() => {
-                    delete this.listenPromise[path];
-                });
+                return this.success(acquireIntentResponse.payload.session);
             },
             { signal },
             [ERRORS.DEVICE_DISCONNECTED_DURING_ACTION, ERRORS.SESSION_WRONG_PREVIOUS],
         );
     }
 
-    public release({ path, session, onClose, signal }: AbstractTransportMethodParams<'release'>) {
+    public release({
+        path: _,
+        session,
+        onClose,
+        signal,
+    }: AbstractTransportMethodParams<'release'>) {
         return this.scheduleAction(
             async () => {
-                if (this.listening) {
-                    this.releaseUnconfirmed[path] = session;
-                    this.listenPromise[path] = createDeferred();
-                }
                 const releaseIntentResponse = await this.sessionsClient.releaseIntent({
                     session,
                 });
@@ -160,7 +149,7 @@ export abstract class AbstractApiTransport extends AbstractTransport {
                 }
 
                 const releasePromise = this.releaseDevice(session);
-                if (onClose) return this.success(undefined);
+                if (onClose) return this.success(null);
 
                 await releasePromise;
 
@@ -168,15 +157,7 @@ export abstract class AbstractApiTransport extends AbstractTransport {
                     path: releaseIntentResponse.payload.path,
                 });
 
-                if (!this.listenPromise[path]) {
-                    return this.success(undefined);
-                }
-
-                return this.listenPromise[path].promise
-                    .then(() => this.success(undefined))
-                    .finally(() => {
-                        delete this.listenPromise[path];
-                    });
+                return this.success(null);
             },
             { signal },
         );
@@ -338,5 +319,6 @@ export abstract class AbstractApiTransport extends AbstractTransport {
             this.logger?.debug('device connected after transport stopped');
         });
         this.sessionsBackground.dispose();
+        this.api.dispose();
     }
 }
diff --git a/packages/transport/src/transports/bridge.ts b/packages/transport/src/transports/bridge.ts
index 4d6bfbfe681..b02fe0b9d58 100644
--- a/packages/transport/src/transports/bridge.ts
+++ b/packages/transport/src/transports/bridge.ts
@@ -1,10 +1,11 @@
-import { versionUtils, createDeferred, Deferred, createTimeoutPromise } from '@trezor/utils';
+import { versionUtils, createTimeoutPromise } from '@trezor/utils';
 import {
     PROTOCOL_MALFORMED,
     bridge as protocolBridge,
     v1 as protocolV1,
     TransportProtocol,
 } from '@trezor/protocol';
+
 import { bridgeApiCall } from '../utils/bridgeApiCall';
 import * as bridgeApiResult from '../utils/bridgeApiResult';
 import { createProtocolMessage } from '../utils/bridgeProtocolMessage';
@@ -15,7 +16,6 @@ import {
     AbstractTransportParams,
     AbstractTransportMethodParams,
 } from './abstract';
-
 import * as ERRORS from '../errors';
 import {
     AnyError,
@@ -77,12 +77,6 @@ export class BridgeTransport extends AbstractTransport {
      */
     private url: string;
 
-    /**
-     * means that /acquire call is in progress. this is used to postpone /listen call so that it can be
-     * fired with updated descriptor
-     */
-    protected acquirePromise?: Deferred<boolean>;
-
     public name = 'BridgeTransport' as const;
 
     constructor(params: BridgeConstructorParameters) {
@@ -147,12 +141,7 @@ export class BridgeTransport extends AbstractTransport {
                 }
                 await createTimeoutPromise(1000);
             } else {
-                const acquirePromiseResult = (await this.acquirePromise?.promise) ?? true;
-                delete this.acquirePromise;
-
-                if (acquirePromiseResult) {
-                    this.handleDescriptorsChange(response.payload);
-                }
+                this.handleDescriptorsChange(response.payload);
             }
         }
     }
@@ -166,42 +155,15 @@ export class BridgeTransport extends AbstractTransport {
     public acquire({ input, signal }: AbstractTransportMethodParams<'acquire'>) {
         return this.scheduleAction(
             async signal => {
-                const previous = input.previous == null ? 'null' : input.previous;
-
-                if (this.listening) {
-                    // listenPromise is resolved on next listen
-                    this.listenPromise[input.path] = createDeferred();
-                }
-
-                // it is not quaranteed that /listen response will arrive after /acquire response (although in majority of cases it does)
-                // so, in order to be able to keep the logic "acquire -> wait for listen response -> return from acquire" we need to wait
-                // for /acquire response before resolving listenPromise
-                this.acquirePromise = createDeferred();
-
                 const response = await this.post('/acquire', {
-                    params: `${input.path}/${previous}`,
+                    params: `${input.path}/${input.previous ?? 'null'}`,
                     signal,
+                    body: {
+                        sessionOwner: this.id,
+                    },
                 });
 
-                if (!response.success) {
-                    if (this.listenPromise[input.path]) {
-                        delete this.listenPromise[input.path];
-                    }
-                    this.acquirePromise.resolve(response.success);
-
-                    return response;
-                }
-
-                this.acquirePromise.resolve(response.success);
-                this.acquiredUnconfirmed[input.path] = response.payload;
-
-                if (!this.listenPromise[input.path]) {
-                    return this.success(response.payload);
-                }
-
-                return this.listenPromise[input.path].promise.finally(() => {
-                    delete this.listenPromise[input.path];
-                });
+                return response;
             },
             { signal },
             [ERRORS.DEVICE_DISCONNECTED_DURING_ACTION, ERRORS.SESSION_WRONG_PREVIOUS],
@@ -209,32 +171,26 @@ export class BridgeTransport extends AbstractTransport {
     }
 
     // https://github.dev/trezor/trezord-go/blob/f559ee5079679aeb5f897c65318d3310f78223ca/core/core.go#L354
-    public release({ path, session, onClose, signal }: AbstractTransportMethodParams<'release'>) {
+    public release({
+        path: _,
+        session,
+        onClose,
+        signal,
+    }: AbstractTransportMethodParams<'release'>) {
         return this.scheduleAction(
-            signal => {
-                if (this.listening && !onClose) {
-                    this.releaseUnconfirmed[path] = session;
-                    this.listenPromise[path] = createDeferred();
-                }
-
+            async signal => {
                 const releasePromise = this.post('/release', {
                     params: session,
                     signal,
                 });
 
                 if (onClose) {
-                    return Promise.resolve(this.success(undefined));
+                    return Promise.resolve(this.success(null));
                 }
 
-                if (!this.listenPromise[path]) {
-                    return releasePromise;
-                }
+                const response = await releasePromise;
 
-                return this.listenPromise[path].promise
-                    .then(() => this.success(undefined))
-                    .finally(() => {
-                        delete this.listenPromise[path];
-                    });
+                return response.success ? this.success(null) : response;
             },
             { signal },
         );
@@ -352,11 +308,6 @@ export class BridgeTransport extends AbstractTransport {
         );
     }
 
-    public stop() {
-        super.stop();
-        this.acquirePromise = undefined;
-    }
-
     /**
      * All bridge endpoints use POST methods
      * For documentation, look here: https://github.com/trezor/trezord-go#api-documentation
diff --git a/packages/transport/src/transports/nodeusb.browser.ts b/packages/transport/src/transports/nodeusb.browser.ts
index 3a4edc92eff..110872765d4 100644
--- a/packages/transport/src/transports/nodeusb.browser.ts
+++ b/packages/transport/src/transports/nodeusb.browser.ts
@@ -1,5 +1,4 @@
 import { AbstractTransport, AbstractTransportParams } from './abstract';
-
 import { WRONG_ENVIRONMENT } from '../errors';
 import { empty, emptySync } from '../utils/resultEmpty';
 
diff --git a/packages/transport/src/transports/nodeusb.ts b/packages/transport/src/transports/nodeusb.ts
index 1ce9ef42e67..78ded1fcf54 100644
--- a/packages/transport/src/transports/nodeusb.ts
+++ b/packages/transport/src/transports/nodeusb.ts
@@ -1,4 +1,5 @@
 import { WebUSB } from 'usb';
+
 import { AbstractTransportParams } from './abstract';
 import { AbstractApiTransport } from './abstractApi';
 import { UsbApi } from '../api/usb';
diff --git a/packages/transport/src/transports/udp.browser.ts b/packages/transport/src/transports/udp.browser.ts
index c02cf1ce088..7a791d373e0 100644
--- a/packages/transport/src/transports/udp.browser.ts
+++ b/packages/transport/src/transports/udp.browser.ts
@@ -1,5 +1,4 @@
 import { AbstractTransport } from './abstract';
-
 import { error } from '../utils/result';
 import { WRONG_ENVIRONMENT } from '../errors';
 
diff --git a/packages/transport/src/transports/udp.ts b/packages/transport/src/transports/udp.ts
index 56e7430b04b..a9fed5de947 100644
--- a/packages/transport/src/transports/udp.ts
+++ b/packages/transport/src/transports/udp.ts
@@ -1,5 +1,4 @@
 import { AbstractTransportParams } from './abstract';
-
 import { UdpApi } from '../api/udp';
 import { AbstractApiTransport } from './abstractApi';
 
diff --git a/packages/transport/src/transports/webusb.browser.ts b/packages/transport/src/transports/webusb.browser.ts
index 97fee9f379e..b499358b5be 100644
--- a/packages/transport/src/transports/webusb.browser.ts
+++ b/packages/transport/src/transports/webusb.browser.ts
@@ -1,14 +1,10 @@
 import { AbstractTransportMethodParams, AbstractTransportParams } from './abstract';
 import { AbstractApiTransport } from './abstractApi';
 import { UsbApi } from '../api/usb';
-
 import { BrowserSessionsBackground } from '../sessions/background-browser';
 
 const defaultSessionsBackgroundUrl =
-    window.location.origin +
-    `${process.env.ASSET_PREFIX || ''}/workers/sessions-background-sharedworker.js`
-        // just in case so that whoever defines ASSET_PREFIX does not need to worry about trailing slashes
-        .replace(/\/+/g, '/');
+    'https://connect.trezor.io/9/workers/sessions-background-sharedworker.js';
 
 type WebUsbTransportParams = AbstractTransportParams & { sessionsBackgroundUrl?: string };
 
@@ -20,7 +16,7 @@ type WebUsbTransportParams = AbstractTransportParams & { sessionsBackgroundUrl?:
 export class WebUsbTransport extends AbstractApiTransport {
     public name = 'WebUsbTransport' as const;
 
-    private readonly sessionsBackgroundUrl;
+    private readonly sessionsBackgroundUrl: string | null = defaultSessionsBackgroundUrl;
 
     constructor({ logger, sessionsBackgroundUrl, ...rest }: WebUsbTransportParams) {
         super({
@@ -28,10 +24,19 @@ export class WebUsbTransport extends AbstractApiTransport {
             logger,
             ...rest,
         });
-        this.sessionsBackgroundUrl = sessionsBackgroundUrl ?? defaultSessionsBackgroundUrl;
+        if (sessionsBackgroundUrl || sessionsBackgroundUrl === null) {
+            this.sessionsBackgroundUrl = sessionsBackgroundUrl;
+        }
     }
 
     private async trySetSessionsBackground() {
+        if (!this.sessionsBackgroundUrl) {
+            this.logger?.log(
+                'No sessionsBackgroundUrl provided. Falling back to use local module.',
+            );
+
+            return;
+        }
         try {
             const response = await fetch(this.sessionsBackgroundUrl, { method: 'HEAD' });
             if (!response.ok) {
diff --git a/packages/transport/src/transports/webusb.ts b/packages/transport/src/transports/webusb.ts
index f3bd27e8350..a862c05e1c4 100644
--- a/packages/transport/src/transports/webusb.ts
+++ b/packages/transport/src/transports/webusb.ts
@@ -1,5 +1,4 @@
 import { AbstractTransport, AbstractTransportParams } from './abstract';
-
 import { WRONG_ENVIRONMENT } from '../errors';
 import { empty, emptySync } from '../utils/resultEmpty';
 
diff --git a/packages/transport/src/types/index.ts b/packages/transport/src/types/index.ts
index 694ec903d0e..0cef928a4fd 100644
--- a/packages/transport/src/types/index.ts
+++ b/packages/transport/src/types/index.ts
@@ -28,6 +28,8 @@ export type DescriptorApiLevel = {
 export type Descriptor = Omit<DescriptorApiLevel, 'path'> & {
     path: PathPublic;
     session: null | Session;
+    /** extension of 'session'. If session is defined then also sessionOwner must be defined. Describes which other application is using the session. */
+    sessionOwner?: string;
     /** only reported by old bridge */
     debugSession?: null | Session;
     /** only reported by old bridge */
diff --git a/packages/transport/src/utils/bridgeApiCall.ts b/packages/transport/src/utils/bridgeApiCall.ts
index 7d09e46fd3f..50ae541b901 100644
--- a/packages/transport/src/utils/bridgeApiCall.ts
+++ b/packages/transport/src/utils/bridgeApiCall.ts
@@ -1,10 +1,9 @@
 import fetch from 'cross-fetch';
 
-import { success, error, unknownError } from './result';
+import { PROTOCOL_MALFORMED } from '@trezor/protocol/src/errors';
 
+import { success, error, unknownError } from './result';
 import * as ERRORS from '../errors';
-
-import { PROTOCOL_MALFORMED } from '@trezor/protocol/src/errors';
 import { applyBridgeApiCallHeaders } from './applyBridgeApiCallHeaders';
 
 export type HttpRequestOptions = {
@@ -39,7 +38,7 @@ function wrapBody(body: unknown) {
 function parseResult(text: string): Record<string, unknown> | string {
     try {
         return JSON.parse(text);
-    } catch (e) {
+    } catch {
         return text;
     }
 }
diff --git a/packages/transport/src/utils/bridgeApiResult.ts b/packages/transport/src/utils/bridgeApiResult.ts
index 43ac0f1f204..2c03c767d5f 100644
--- a/packages/transport/src/utils/bridgeApiResult.ts
+++ b/packages/transport/src/utils/bridgeApiResult.ts
@@ -1,7 +1,6 @@
 // input checks for high-level transports
 
 import type { Descriptor, Session } from '../types';
-
 import { success, error } from './result';
 import { validateProtocolMessage } from './bridgeProtocolMessage';
 import * as ERRORS from '../errors';
@@ -58,6 +57,7 @@ export function devices(res: UnknownPayload) {
             (o: any): Descriptor => ({
                 path: o.path,
                 session: o.session,
+                sessionOwner: o.sessionOwner,
                 product: o.product,
                 type: o.type,
                 vendor: o.vendor,
@@ -83,7 +83,7 @@ export function acquire(res: UnknownPayload) {
 export function call(res: UnknownPayload) {
     try {
         return success(validateProtocolMessage(res, true));
-    } catch (e) {
+    } catch {
         return error({ error: ERRORS.WRONG_RESULT_TYPE });
     }
 }
@@ -91,7 +91,7 @@ export function call(res: UnknownPayload) {
 export function post(res: UnknownPayload) {
     try {
         return success(validateProtocolMessage(res, false));
-    } catch (e) {
+    } catch {
         return error({ error: ERRORS.WRONG_RESULT_TYPE });
     }
 }
diff --git a/packages/transport/src/utils/bridgeProtocolMessage.ts b/packages/transport/src/utils/bridgeProtocolMessage.ts
index 6758477978f..903bf585246 100644
--- a/packages/transport/src/utils/bridgeProtocolMessage.ts
+++ b/packages/transport/src/utils/bridgeProtocolMessage.ts
@@ -1,4 +1,5 @@
 import type { TransportProtocol } from '@trezor/protocol';
+
 import type { BridgeProtocolMessage } from '../types';
 
 // validate expected body:
diff --git a/packages/transport/src/utils/receive.ts b/packages/transport/src/utils/receive.ts
index 29784a47b80..1c09d5557ec 100644
--- a/packages/transport/src/utils/receive.ts
+++ b/packages/transport/src/utils/receive.ts
@@ -16,7 +16,7 @@ export async function receive<T extends () => ReturnType<AbstractApi['read']>>(
     }
     const data = readResult.payload;
     const { length, messageType, payload } = protocol.decode(data);
-    let result = Buffer.alloc(length);
+    const result = Buffer.alloc(length);
     const chunkHeader = protocol.getChunkHeader(Buffer.from(data));
 
     payload.copy(result);
diff --git a/packages/transport/src/utils/send.ts b/packages/transport/src/utils/send.ts
index 0eda34f81b5..9983fbdf2f6 100644
--- a/packages/transport/src/utils/send.ts
+++ b/packages/transport/src/utils/send.ts
@@ -2,6 +2,7 @@
 //
 // Logic of "call" is broken to two parts - sending and receiving
 import { Root } from 'protobufjs/light';
+
 import { encode as encodeProtobuf, createMessageFromName } from '@trezor/protobuf';
 import { TransportProtocolEncode } from '@trezor/protocol';
 
diff --git a/packages/transport/tests/abstractUsb.test.ts b/packages/transport/tests/abstractUsb.test.ts
index 5a47754e95a..7e45366f523 100644
--- a/packages/transport/tests/abstractUsb.test.ts
+++ b/packages/transport/tests/abstractUsb.test.ts
@@ -1,8 +1,8 @@
 import { v1 as v1Protocol } from '@trezor/protocol';
-import { AbstractTransport } from '../src/transports/abstract';
+import * as messages from '@trezor/protobuf/messages.json';
+
 import { AbstractApiTransport } from '../src/transports/abstractApi';
 import { UsbApi } from '../src/api/usb';
-import * as messages from '@trezor/protobuf/messages.json';
 import { PathPublic, Session } from '../src/types';
 
 // create devices otherwise returned from navigator.usb.getDevices
@@ -45,18 +45,16 @@ class TestUsbTransport extends AbstractApiTransport {
 
 // we cant directly use abstract class (UsbTransport)
 const initTest = async () => {
-    let transport: AbstractTransport;
-    let testUsbApi: UsbApi;
-
     // create usb api with navigator.usb mock
-    testUsbApi = new UsbApi({
+    const testUsbApi = new UsbApi({
         usbInterface: createUsbMock(),
     });
-
-    transport = new TestUsbTransport({
+    const transport = new TestUsbTransport({
         api: testUsbApi,
         messages,
+        id: 'test',
     });
+
     const initResponse = await transport.init();
     expect(initResponse.success).toEqual(true);
 
@@ -88,6 +86,7 @@ describe('Usb', () => {
 
             const transport = new TestUsbTransport({
                 api: testUsbApi,
+                id: 'test',
             });
 
             await transport.init();
@@ -113,17 +112,24 @@ describe('Usb', () => {
         it('handleDescriptorsChange', async () => {
             const { transport } = await initTest();
             const spy = jest.fn();
-            transport.on('transport-update', spy);
+            transport.on('transport-device_connected', descriptor =>
+                spy({ type: 'connected', descriptor }),
+            );
+            transport.on('transport-device_disconnected', descriptor =>
+                spy({ type: 'disconnected', descriptor }),
+            );
 
             transport.handleDescriptorsChange([{ path: PathPublic('1'), session: null, type: 1 }]);
 
-            expect(spy).toHaveBeenCalledWith([
-                { type: 'connected', descriptor: { path: '1', session: null, type: 1 } },
-            ]);
+            expect(spy).toHaveBeenCalledWith({
+                type: 'connected',
+                descriptor: { path: '1', session: null, type: 1 },
+            });
             transport.handleDescriptorsChange([]);
-            expect(spy).toHaveBeenCalledWith([
-                { type: 'disconnected', descriptor: { path: '1', session: null, type: 1 } },
-            ]);
+            expect(spy).toHaveBeenCalledWith({
+                type: 'disconnected',
+                descriptor: { path: '1', session: null, type: 1 },
+            });
         });
 
         it('enumerate', async () => {
@@ -154,7 +160,9 @@ describe('Usb', () => {
             const { transport } = await initTest();
             jest.useFakeTimers();
             const spy = jest.fn();
-            transport.on('transport-update', spy);
+            transport.on('transport-device_connected', spy);
+            transport.on('transport-device_disconnected', spy);
+            transport.on('transport-device_session_changed', spy);
 
             await transport.enumerate();
 
@@ -171,61 +179,6 @@ describe('Usb', () => {
             expect(spy).toHaveBeenCalledTimes(0);
         });
 
-        it('acquire. transport listening. missing descriptor', async () => {
-            const { transport } = await initTest();
-
-            const enumerateResult = await transport.enumerate();
-
-            expect(enumerateResult.success).toEqual(true);
-            // @ts-expect-error
-            transport.handleDescriptorsChange(enumerateResult.payload);
-
-            transport.listen();
-
-            // set some initial descriptors
-            const acquireCall = transport.acquire({
-                input: { path: PathPublic('1'), previous: null },
-            });
-
-            setTimeout(() => {
-                // @ts-expect-error (private field accessed in tests)
-                transport.sessionsClient.emit('descriptors', [
-                    { path: PathPublic('321'), session: Session('1'), type: 1 },
-                ]);
-            }, 1);
-
-            const res = await acquireCall;
-
-            expect(res).toMatchObject({
-                success: false,
-                error: 'device disconnected during action',
-            });
-        });
-
-        it('acquire. transport listening. unexpected session', async () => {
-            const { transport } = await initTest();
-            const enumerateResult = await transport.enumerate();
-            expect(enumerateResult.success).toEqual(true);
-            // @ts-expect-error
-            transport.handleDescriptorsChange(enumerateResult.payload);
-
-            transport.listen();
-
-            // set some initial descriptors
-            const acquireCall = transport.acquire({
-                input: { path: PathPublic('1'), previous: null },
-            });
-            setTimeout(() => {
-                // @ts-expect-error (private field accessed in tests)
-                transport.sessionsClient.emit('descriptors', [
-                    { path: PathPublic('1'), session: Session('2'), type: 1, product: 21441 },
-                ]);
-            }, 1);
-
-            const res = await acquireCall;
-            expect(res).toMatchObject({ success: false, error: 'wrong previous session' });
-        });
-
         it('call error - called without acquire.', async () => {
             const { transport } = await initTest();
             const res = await transport.call({
@@ -375,7 +328,7 @@ describe('Usb', () => {
             });
             expect(res).toEqual({
                 success: true,
-                payload: undefined,
+                payload: null,
             });
         });
 
@@ -397,7 +350,7 @@ describe('Usb', () => {
             });
             abort.abort();
 
-            expect(promise).resolves.toMatchObject({
+            await expect(promise).resolves.toMatchObject({
                 success: false,
                 error: 'Aborted by signal',
             });
@@ -409,7 +362,7 @@ describe('Usb', () => {
                 protocol: v1Protocol,
             });
             await promise2;
-            expect(promise2).resolves.toEqual({
+            await expect(promise2).resolves.toEqual({
                 success: true,
                 payload: {
                     type: 'Success',
diff --git a/packages/transport/tests/apiUdp.test.ts b/packages/transport/tests/apiUdp.test.ts
index a0fd7fda933..0ae1a9f7091 100644
--- a/packages/transport/tests/apiUdp.test.ts
+++ b/packages/transport/tests/apiUdp.test.ts
@@ -1,4 +1,5 @@
 import UDP from 'dgram';
+
 import { UdpApi } from '../src/api/udp';
 
 // mock dgram api
diff --git a/packages/transport/tests/build-receive.test.ts b/packages/transport/tests/build-receive.test.ts
index 7b9b9142797..6b0f0fa94ab 100644
--- a/packages/transport/tests/build-receive.test.ts
+++ b/packages/transport/tests/build-receive.test.ts
@@ -1,5 +1,7 @@
 import * as protobuf from 'protobufjs/light';
+
 import { v1 as v1Protocol, bridge as bridgeProtocol } from '@trezor/protocol';
+
 import { buildMessage, createChunks } from '../src/utils/send';
 import { receiveAndParse } from '../src/utils/receive';
 
@@ -53,23 +55,23 @@ const messages = {
     },
     MessageType: {
         values: {
-            MessageType_StellarSignTx: 202,
-            MessageType_StellarTxOpRequest: 203,
-            MessageType_StellarGetAddress: 207,
-            MessageType_StellarAddress: 208,
-            MessageType_StellarCreateAccountOp: 210,
-            MessageType_StellarPaymentOp: 211,
-            MessageType_StellarPathPaymentOp: 212,
-            MessageType_StellarManageOfferOp: 213,
-            MessageType_StellarCreatePassiveOfferOp: 214,
-            MessageType_StellarSetOptionsOp: 215,
-            MessageType_StellarChangeTrustOp: 216,
-            MessageType_StellarAllowTrustOp: 217,
-            MessageType_StellarAccountMergeOp: 218,
-            MessageType_StellarManageDataOp: 220,
-            MessageType_StellarBumpSequenceOp: 221,
-            MessageType_StellarClaimClaimableBalanceOp: 225,
-            MessageType_StellarSignedTx: 230,
+            StellarSignTx: 202,
+            StellarTxOpRequest: 203,
+            StellarGetAddress: 207,
+            StellarAddress: 208,
+            StellarCreateAccountOp: 210,
+            StellarPaymentOp: 211,
+            StellarPathPaymentOp: 212,
+            StellarManageOfferOp: 213,
+            StellarCreatePassiveOfferOp: 214,
+            StellarSetOptionsOp: 215,
+            StellarChangeTrustOp: 216,
+            StellarAllowTrustOp: 217,
+            StellarAccountMergeOp: 218,
+            StellarManageDataOp: 220,
+            StellarBumpSequenceOp: 221,
+            StellarClaimClaimableBalanceOp: 225,
+            StellarSignedTx: 230,
         },
     },
 };
diff --git a/packages/transport/tests/sessions.test.ts b/packages/transport/tests/sessions.test.ts
index 75db6b763f7..54c0bc0b73b 100644
--- a/packages/transport/tests/sessions.test.ts
+++ b/packages/transport/tests/sessions.test.ts
@@ -42,13 +42,6 @@ describe('sessions', () => {
             payload: {
                 session: '1',
                 path: 'abc', // <= pathInternal
-                descriptors: [
-                    {
-                        path: '1', // <= pathPublic
-                        session: '1',
-                        type: 1,
-                    },
-                ],
             },
         });
         const acquireDone = await client1.acquireDone({ path: PathPublic('1') });
@@ -67,7 +60,7 @@ describe('sessions', () => {
         });
     });
 
-    test('acquire', async () => {
+    test('acquire - acquire', async () => {
         expect.assertions(3);
 
         const client1 = new SessionsClient(background);
@@ -82,13 +75,8 @@ describe('sessions', () => {
         expect(acquire1).toMatchObject({
             success: true,
             payload: {
+                path: '1',
                 session: '1',
-                descriptors: [
-                    {
-                        path: '1',
-                        session: '1',
-                    },
-                ],
             },
         });
 
@@ -101,13 +89,12 @@ describe('sessions', () => {
         expect(acquire2).toMatchObject({
             success: true,
             payload: {
+                path: '1',
                 session: '2',
-                descriptors: [
-                    {
-                        path: '1',
-                        session: '2',
-                    },
-                ],
+                releaseRequest: {
+                    path: '1',
+                    session: '1',
+                },
             },
         });
 
@@ -140,12 +127,6 @@ describe('sessions', () => {
             success: true,
             payload: {
                 session: '1',
-                descriptors: [
-                    {
-                        path: '1',
-                        session: '1',
-                    },
-                ],
             },
         });
 
diff --git a/packages/transport/tsconfig.json b/packages/transport/tsconfig.json
index 43106de2360..8581a057a40 100644
--- a/packages/transport/tsconfig.json
+++ b/packages/transport/tsconfig.json
@@ -8,6 +8,7 @@
         { "path": "../protobuf" },
         { "path": "../protocol" },
         { "path": "../utils" },
+        { "path": "../eslint" },
         { "path": "../trezor-user-env-link" }
     ]
 }
diff --git a/packages/transport/tsconfig.lib.json b/packages/transport/tsconfig.lib.json
index d7bb9e4e210..22c4d94fcbe 100644
--- a/packages/transport/tsconfig.lib.json
+++ b/packages/transport/tsconfig.lib.json
@@ -15,6 +15,9 @@
         {
             "path": "../utils"
         },
+        {
+            "path": "../eslint"
+        },
         {
             "path": "../trezor-user-env-link"
         }
diff --git a/packages/trezor-user-env-link/package.json b/packages/trezor-user-env-link/package.json
index fee5b82817d..4b3e19655d9 100644
--- a/packages/trezor-user-env-link/package.json
+++ b/packages/trezor-user-env-link/package.json
@@ -5,7 +5,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/packages/trezor-user-env-link/src/api.ts b/packages/trezor-user-env-link/src/api.ts
index 55b0c426d28..c2a9616b695 100644
--- a/packages/trezor-user-env-link/src/api.ts
+++ b/packages/trezor-user-env-link/src/api.ts
@@ -59,6 +59,7 @@ export const MNEMONICS = {
     mnemonic_12: 'alcohol woman abuse must during monitor noble actual mixed trade anger aisle',
     mnemonic_abandon:
         'abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about',
+    mnemonic_immune: 'immune enlist rule measure fan swarm mandate track point menu security fan',
 };
 
 export const DEFAULT_BRIDGE_VERSION = '2.0.33';
diff --git a/packages/trezor-user-env-link/src/websocket-client.ts b/packages/trezor-user-env-link/src/websocket-client.ts
index 11705613234..bd1b6a12dc0 100644
--- a/packages/trezor-user-env-link/src/websocket-client.ts
+++ b/packages/trezor-user-env-link/src/websocket-client.ts
@@ -267,41 +267,39 @@ export class WebsocketClient extends TypedEmitter<WebsocketClientEvents> {
         this.removeAllListeners();
     }
 
-    waitForTrezorUserEnv() {
-        return new Promise<void>(async (resolve, reject) => {
-            // unfortunately, it can take incredibly long for trezor-user-env to start, we should
-            // do something about it
-            const limit = 300;
-            let error = '';
-
-            console.log('waiting for trezor-user-env');
-
-            for (let i = 0; i < limit; i++) {
-                if (i === limit - 1) {
-                    console.log(`cant connect to trezor-user-env: ${error}\n`);
+    async waitForTrezorUserEnv() {
+        // unfortunately, it can take incredibly long for trezor-user-env to start, we should
+        // do something about it
+        const limit = 300;
+        let error = '';
+
+        console.log('waiting for trezor-user-env');
+
+        for (let i = 0; i < limit; i++) {
+            if (i === limit - 1) {
+                console.log(`cant connect to trezor-user-env: ${error}\n`);
+            }
+            await delay(1000);
+
+            try {
+                const res = await fetch(USER_ENV_URL.DASHBOARD);
+                if (res.status === 200) {
+                    console.log('trezor-user-env is online');
+
+                    return;
                 }
-                await delay(1000);
-
-                try {
-                    const res = await fetch(USER_ENV_URL.DASHBOARD);
-                    if (res.status === 200) {
-                        console.log('trezor-user-env is online');
-
-                        return resolve();
-                    }
-                } catch (err) {
-                    error = err.message;
-                    // using process.stdout.write instead of console.log since the latter always prints also newline
-                    // but in karma, this code runs in browser and process is not available.
-                    if (typeof process !== 'undefined') {
-                        process.stdout.write('.');
-                    } else {
-                        console.log('.');
-                    }
+            } catch (err) {
+                error = err.message;
+                // using process.stdout.write instead of console.log since the latter always prints also newline
+                // but in karma, this code runs in browser and process is not available.
+                if (typeof process !== 'undefined') {
+                    process.stdout.write('.');
+                } else {
+                    console.log('.');
                 }
             }
+        }
 
-            reject(error);
-        });
+        throw error;
     }
 }
diff --git a/packages/type-utils/package.json b/packages/type-utils/package.json
index 70ac19f4630..2be05f8d993 100644
--- a/packages/type-utils/package.json
+++ b/packages/type-utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@trezor/type-utils",
-    "version": "1.1.0",
+    "version": "1.1.1-beta.2",
     "license": "See LICENSE.md in repo root",
     "sideEffects": false,
     "main": "src/index",
@@ -9,7 +9,6 @@
     ],
     "scripts": {
         "build:lib": "yarn g:rimraf ./lib && yarn g:tsc --build tsconfig.lib.json && ../../scripts/replace-imports.sh ./lib",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     }
diff --git a/packages/urls/package.json b/packages/urls/package.json
index dee76d53fa4..3e6dd414423 100644
--- a/packages/urls/package.json
+++ b/packages/urls/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "test:e2e": "yarn g:jest -c ../../jest.config.base.js"
diff --git a/packages/urls/src/urls.ts b/packages/urls/src/urls.ts
index 21fc334d76c..5aad9f142a2 100644
--- a/packages/urls/src/urls.ts
+++ b/packages/urls/src/urls.ts
@@ -25,8 +25,10 @@ export const TREZOR_SUPPORT_DEVICE_URL: Url =
     'https://trezor.io/support/a/trezor-suite-doesn-t-see-my-device';
 export const TREZOR_SUPPORT_RECOVERY_ISSUES_URL: Url =
     'https://trezor.io/support/a/trezor-recovery-issues';
-export const TREZOR_SUPPORT_FW_CHECK_FAILED: Url =
-    'https://trezor.io/support/a/trezor-firmware-revision-check-failed';
+export const TREZOR_SUPPORT_DEVICE_AUTHENTICATION_FAILED_URL: Url =
+    'https://trezor.io/support/a/trezor-safe-device-authentication-check-failed';
+export const TREZOR_SUPPORT_FW_REVISION_CHECK_FAILED_URL: Url =
+    'https://trezor.io/support/a/trezor-fw-revision-check-failed';
 export const TREZOR_SUPPORT_FW_ALREADY_INSTALLED: Url =
     'https://trezor.io/support/a/firmware-is-already-installed';
 export const TREZOR_SUPPORT_IS_MY_DEVICE_SAFE: Url =
@@ -38,12 +40,12 @@ export const HELP_CENTER_DRY_RUN_T1B1_URL: Url =
     'https://trezor.io/learn/a/test-recovery-seed-on-trezor-model-one';
 export const HELP_CENTER_DRY_RUN_T2T1_URL: Url =
     'https://trezor.io/learn/a/test-recovery-seed-on-trezor-model-t';
-export const HELP_CENTER_DRY_RUN_T2B1_URL: Url =
-    'https://trezor.io/learn/a/check-backup-on-trezor-safe-3';
 export const HELP_CENTER_DRY_RUN_T3B1_URL: Url =
     'https://trezor.io/learn/a/check-backup-on-trezor-safe-3';
 export const HELP_CENTER_DRY_RUN_T3T1_URL: Url =
     'https://trezor.io/learn/a/check-backup-on-trezor-safe-5';
+export const HELP_CENTER_DRY_RUN_T3W1_URL: Url =
+    'https://trezor.io/learn/a/check-backup-on-trezor-safe-7';
 export const HELP_CENTER_PASSPHRASE_URL: Url =
     'https://trezor.io/learn/a/passphrases-and-hidden-wallets';
 export const HELP_CENTER_RECOVERY_SEED_URL: Url =
@@ -51,12 +53,12 @@ export const HELP_CENTER_RECOVERY_SEED_URL: Url =
 export const HELP_CENTER_PACKAGING_T1B1_URL: Url =
     'https://trezor.io/learn/a/authenticate-model-one';
 export const HELP_CENTER_PACKAGING_T2T1_URL: Url = 'https://trezor.io/learn/a/authenticate-model-t';
-export const HELP_CENTER_PACKAGING_T2B1_URL: Url =
-    'https://trezor.io/learn/a/authenticate-trezor-safe-3';
 export const HELP_CENTER_PACKAGING_T3B1_URL: Url =
     'https://trezor.io/learn/a/authenticate-trezor-safe-3';
 export const HELP_CENTER_PACKAGING_T3T1_URL: Url =
     'https://trezor.io/learn/a/authenticate-trezor-safe-5';
+export const HELP_CENTER_PACKAGING_T3W1_URL: Url =
+    'https://trezor.io/learn/a/authenticate-trezor-safe-7';
 export const HELP_CENTER_XRP_URL: Url = 'https://trezor.io/learn/a/ripple-xrp-on-trezor-model-t';
 export const HELP_CENTER_CASHADDR_URL: Url = 'https://trezor.io/learn/a/glossary#CashAddr';
 export const HELP_CENTER_QR_CODE_URL: Url =
@@ -71,12 +73,12 @@ export const HELP_CENTER_FW_DOWNGRADE_T1B1_URL: Url =
     'https://trezor.io/learn/a/downgrade-firmware-trezor-model-one';
 export const HELP_CENTER_FW_DOWNGRADE_T2T1_URL: Url =
     'https://trezor.io/learn/a/downgrade-firmware-trezor-model-t';
-export const HELP_CENTER_FW_DOWNGRADE_T2B1_URL: Url =
-    'https://trezor.io/learn/a/downgrade-firmware-trezor-safe-3';
 export const HELP_CENTER_FW_DOWNGRADE_T3B1_URL: Url =
     'https://trezor.io/learn/a/downgrade-firmware-trezor-safe-3';
 export const HELP_CENTER_FW_DOWNGRADE_T3T1_URL: Url =
     'https://trezor.io/learn/a/downgrade-firmware-trezor-safe-5';
+export const HELP_CENTER_FW_DOWNGRADE_T3W1_URL: Url =
+    'https://trezor.io/learn/a/downgrade-firmware-trezor-safe-7';
 export const HELP_CENTER_RECOVERY_ISSUES_URL: Url =
     'https://trezor.io/support/a/trezor-recovery-issues';
 export const HELP_CENTER_ADVANCED_RECOVERY_URL: Url =
diff --git a/packages/urls/tests/urls.test.ts b/packages/urls/tests/urls.test.ts
index 7e9955c78f5..da6474a657e 100644
--- a/packages/urls/tests/urls.test.ts
+++ b/packages/urls/tests/urls.test.ts
@@ -10,6 +10,10 @@ const excluded = [
     URLS.LTC_ADDRESS_INFO_URL,
     // captcha, returning 403 in ci
     URLS.TREZOR_FORUM_URL,
+    // TODO T3W1 - articles not live yet
+    URLS.HELP_CENTER_DRY_RUN_T3W1_URL,
+    URLS.HELP_CENTER_PACKAGING_T3W1_URL,
+    URLS.HELP_CENTER_FW_DOWNGRADE_T3W1_URL,
 ];
 
 describe('Test that all external links are alive', () => {
diff --git a/packages/utils/.eslintrc.js b/packages/utils/.eslintrc.js
deleted file mode 100644
index a638e65130e..00000000000
--- a/packages/utils/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
-    rules: {
-        'no-console': 'warn',
-        'import/no-default-export': 'error',
-        'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
-    },
-};
diff --git a/packages/utils/eslint.config.mjs b/packages/utils/eslint.config.mjs
new file mode 100644
index 00000000000..b02b20d866a
--- /dev/null
+++ b/packages/utils/eslint.config.mjs
@@ -0,0 +1,10 @@
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'no-console': 'warn',
+        },
+    },
+];
diff --git a/packages/utils/package.json b/packages/utils/package.json
index eb612f4872f..be277cfe631 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@trezor/utils",
-    "version": "9.2.1",
+    "version": "9.2.2-beta.2",
     "author": "Trezor <info@trezor.io>",
     "homepage": "https://github.com/trezor/trezor-suite/tree/develop/packages/utils",
     "description": "A collection of typescript utils that are intended to be used across trezor-suite monorepo.",
@@ -23,7 +23,6 @@
         "!**/*.map"
     ],
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest --verbose -c ./jest.config.js",
         "type-check": "yarn g:tsc --build tsconfig.json",
         "build:lib": "yarn g:rimraf ./lib && yarn g:tsc --build tsconfig.lib.json && ../../scripts/replace-imports.sh ./lib",
@@ -34,9 +33,13 @@
         "tslib": "^2.6.2"
     },
     "devDependencies": {
+        "@trezor/eslint": "workspace:*",
         "tsx": "^4.16.3"
     },
     "dependencies": {
         "bignumber.js": "^9.1.2"
+    },
+    "browser": {
+        "crypto": false
     }
 }
diff --git a/packages/utils/src/arrayShuffle.ts b/packages/utils/src/arrayShuffle.ts
index 80fed358b75..ee5b0f6d33a 100644
--- a/packages/utils/src/arrayShuffle.ts
+++ b/packages/utils/src/arrayShuffle.ts
@@ -1,11 +1,18 @@
 /**
- * Randomly shuffles the elements in an array. This method
- * does not mutate the original array.
+ * Implementation of the Fisher-Yates shuffle algorithm.
+ * The algorithm produces an unbiased permutation: every permutation is equally likely.
+ * @link https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle
+ *
+ * This method does not mutate the original array.
  */
-export const arrayShuffle = <T>(array: readonly T[]) => {
+export const arrayShuffle = <T>(
+    array: readonly T[],
+    { randomInt }: { randomInt: (min: number, max: number) => number },
+): T[] => {
     const shuffled = array.slice();
     for (let i = shuffled.length - 1; i > 0; i--) {
-        const j = Math.floor(Math.random() * (i + 1));
+        const j = randomInt(0, i + 1);
+
         [shuffled[i], shuffled[j]] = [shuffled[j], shuffled[i]];
     }
 
diff --git a/packages/utils/src/asciiUtils.ts b/packages/utils/src/asciiUtils.ts
new file mode 100644
index 00000000000..f0d3d2b1610
--- /dev/null
+++ b/packages/utils/src/asciiUtils.ts
@@ -0,0 +1,14 @@
+// Regular expression to match non-ASCII characters
+const nonAsciiPattern = /[^\x20-\x7E]/g;
+
+export function isAscii(value?: string): boolean {
+    if (!value) return true;
+
+    return !nonAsciiPattern.test(value);
+}
+
+export function getNonAsciiChars(value?: string): RegExpMatchArray | null {
+    if (!value) return null;
+
+    return value.match(nonAsciiPattern);
+}
diff --git a/packages/utils/src/getRandomInt.ts b/packages/utils/src/getRandomInt.ts
new file mode 100644
index 00000000000..3ccf1236061
--- /dev/null
+++ b/packages/utils/src/getRandomInt.ts
@@ -0,0 +1,58 @@
+import { getRandomValues as cryptoGetRandomValues } from 'crypto';
+
+/**
+ * Before changing anything here, see the Modulo Bias problem!
+ * @see https://research.kudelskisecurity.com/2020/07/28/the-definitive-guide-to-modulo-bias-and-how-to-avoid-it/
+ *
+ * @param min Inclusive
+ * @param max Exclusive (to match the crypto.randomInt() function API
+ */
+export const getRandomInt = (min: number, max: number) => {
+    if (!Number.isSafeInteger(min)) {
+        throw new RangeError(
+            `The "min" argument must be a safe integer. Received type ${typeof min} (${min})`,
+        );
+    }
+
+    if (!Number.isSafeInteger(max)) {
+        throw new RangeError(
+            `The "max" argument must be a safe integer. Received type ${typeof max} (${max})`,
+        );
+    }
+
+    if (min >= max) {
+        throw new RangeError(
+            `The value of "max" is out of range. It must be greater than the value of "min" (${min}). Received ${max}`,
+        );
+    }
+
+    const MAX_RANGE_32_BITS = 0xffffffff + 1;
+    const range = max - min;
+
+    if (range > MAX_RANGE_32_BITS) {
+        throw new RangeError(
+            `This function only provide 32 bits of entropy, therefore range cannot be more then 2^32.`,
+        );
+    }
+
+    const getRandomValues =
+        typeof window !== 'undefined'
+            ? (array: Uint32Array) => window.crypto.getRandomValues(array)
+            : (array: Uint32Array) => cryptoGetRandomValues(array);
+
+    const array = new Uint32Array(1); // This provides 32 bits of entropy.
+
+    // It is crucial to avoid modulo bias.
+    // See: https://research.kudelskisecurity.com/2020/07/28/the-definitive-guide-to-modulo-bias-and-how-to-avoid-it/
+
+    // We calculate the maximum possible value that can be evenly distributed across the desired range.
+    const maxRange = MAX_RANGE_32_BITS - (MAX_RANGE_32_BITS % range);
+
+    let randomValue: number;
+    do {
+        getRandomValues(array);
+        randomValue = array[0];
+    } while (randomValue >= maxRange);
+
+    return min + (randomValue % range);
+};
diff --git a/packages/utils/src/getRandomNumberInRange.ts b/packages/utils/src/getRandomNumberInRange.ts
deleted file mode 100644
index 045e0789027..00000000000
--- a/packages/utils/src/getRandomNumberInRange.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const getRandomNumberInRange = (min: number, max: number) =>
-    Math.floor(Math.random() * (max - min + 1)) + min;
diff --git a/packages/utils/src/getWeakRandomInt.ts b/packages/utils/src/getWeakRandomInt.ts
new file mode 100644
index 00000000000..df458c5c025
--- /dev/null
+++ b/packages/utils/src/getWeakRandomInt.ts
@@ -0,0 +1,13 @@
+/**
+ * @param min Inclusive
+ * @param max Exclusive
+ */
+export const getWeakRandomInt = (min: number, max: number) => {
+    if (min >= max) {
+        throw new RangeError(
+            `The value of "max" is out of range. It must be greater than the value of "min" (${min}). Received ${max}`,
+        );
+    }
+
+    return Math.floor(Math.random() * (max - min) + min);
+};
diff --git a/packages/utils/src/getWeakRandomNumberInRange.ts b/packages/utils/src/getWeakRandomNumberInRange.ts
new file mode 100644
index 00000000000..ba9c2e225e8
--- /dev/null
+++ b/packages/utils/src/getWeakRandomNumberInRange.ts
@@ -0,0 +1,8 @@
+/**
+ * @deprecated Use `getWeakRandomInt` instead.
+ *
+ * @param min Inclusive
+ * @param max Inclusive
+ */
+export const getWeakRandomNumberInRange = (min: number, max: number) =>
+    Math.floor(Math.random() * (max - min + 1)) + min;
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index d1b93bc1c1a..789c7947314 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -19,11 +19,13 @@ export * from './createTimeoutPromise';
 export * from './getLocaleSeparators';
 export * from './getMutex';
 export * from './getNumberFromPixelString';
-export * from './getRandomNumberInRange';
+export * from './getWeakRandomNumberInRange';
 export * from './getSynchronize';
+export * from './getRandomInt';
 export * from './getWeakRandomId';
+export * from './getWeakRandomInt';
 export * from './hasUppercaseLetter';
-export * from './isAscii';
+export * from './isArrayMember';
 export * from './isHex';
 export * from './isNotUndefined';
 export * from './isUrl';
@@ -46,3 +48,4 @@ export * from './bigNumber';
 export * from './throttler';
 export * from './extractUrlsFromText';
 export * from './isFullPath';
+export * from './asciiUtils';
diff --git a/packages/utils/src/isArrayMember.ts b/packages/utils/src/isArrayMember.ts
new file mode 100644
index 00000000000..c384ef8cd96
--- /dev/null
+++ b/packages/utils/src/isArrayMember.ts
@@ -0,0 +1,13 @@
+/**
+ * Type-guard if a value is a subset of an array.
+ * Useful to narrow down a union type `value` to a subset of the union (typeof `arr`).
+ *
+ * Example:
+ * type Variant = 'a' | 'b' | 'c' | 'd';
+ * const skippedVariants = ['a', 'b'] satisfies Variant[];
+ * if(isArrayMember(variant, skippedVariants)) // variant is 'a' | 'b', else 'c' | 'd'
+ */
+export const isArrayMember = <Value extends string, Subset extends Value>(
+    value: Value,
+    arr: readonly Subset[],
+): value is Subset => arr.some(v => v === value);
diff --git a/packages/utils/src/isAscii.ts b/packages/utils/src/isAscii.ts
deleted file mode 100644
index 82a9e706c85..00000000000
--- a/packages/utils/src/isAscii.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export function isAscii(value?: string): boolean {
-    if (!value) return true;
-
-    return /^[\x00-\x7F]*$/.test(value);
-}
diff --git a/packages/utils/src/scheduleAction.ts b/packages/utils/src/scheduleAction.ts
index 9b7cd47e525..12e34aac8af 100644
--- a/packages/utils/src/scheduleAction.ts
+++ b/packages/utils/src/scheduleAction.ts
@@ -27,6 +27,7 @@ const resolveAfterMs = (ms: number | undefined, clear: AbortSignal) =>
     new Promise<void>((resolve, reject) => {
         if (clear.aborted) return reject();
         if (ms === undefined) return resolve();
+        // eslint-disable-next-line prefer-const
         let timeout: ReturnType<typeof setTimeout>;
         const onClear = () => {
             clearTimeout(timeout);
@@ -43,6 +44,7 @@ const resolveAfterMs = (ms: number | undefined, clear: AbortSignal) =>
 const rejectAfterMs = (ms: number, reason: () => Error, clear: AbortSignal) =>
     new Promise<never>((_, reject) => {
         if (clear.aborted) return reject();
+        // eslint-disable-next-line prefer-const
         let timeout: ReturnType<typeof setTimeout> | undefined;
         const onClear = () => {
             clearTimeout(timeout);
diff --git a/packages/utils/tests/arrayShuffle.test.ts b/packages/utils/tests/arrayShuffle.test.ts
index 46db9c18bf0..5cb3bb21d0d 100644
--- a/packages/utils/tests/arrayShuffle.test.ts
+++ b/packages/utils/tests/arrayShuffle.test.ts
@@ -1,23 +1,29 @@
 import { arrayShuffle } from '../src/arrayShuffle';
+import { getWeakRandomInt } from '../src/getWeakRandomInt';
 
 const KEYS = ['a', 'b', 'c', 'd', 'e'];
 const SAMPLES = 10000;
 const TOLERANCE = 0.1;
 const EXPECTED = SAMPLES / KEYS.length;
 
-describe('arrayShuffle', () => {
+const LOWER_BOUND = (1 - TOLERANCE) * EXPECTED;
+const UPPER_BOUND = (1 + TOLERANCE) * EXPECTED;
+
+describe(arrayShuffle.name, () => {
     it('shuffles randomly', () => {
         const samples = Object.fromEntries(KEYS.map(key => [key, new Array(KEYS.length).fill(0)]));
+
         for (let sample = 0; sample < SAMPLES; ++sample) {
-            const shuffled = arrayShuffle(KEYS);
+            const shuffled = arrayShuffle(KEYS, { randomInt: getWeakRandomInt });
             for (let i = 0; i < shuffled.length; ++i) {
                 samples[shuffled[i]][i]++;
             }
         }
+
         KEYS.forEach(key =>
             samples[key].forEach(count => {
-                expect(count).toBeGreaterThanOrEqual((1 - TOLERANCE) * EXPECTED);
-                expect(count).toBeLessThanOrEqual((1 + TOLERANCE) * EXPECTED);
+                expect(count).toBeGreaterThanOrEqual(LOWER_BOUND);
+                expect(count).toBeLessThanOrEqual(UPPER_BOUND);
             }),
         );
     });
diff --git a/packages/utils/tests/asciUtils.test.ts b/packages/utils/tests/asciUtils.test.ts
new file mode 100644
index 00000000000..9bf12036160
--- /dev/null
+++ b/packages/utils/tests/asciUtils.test.ts
@@ -0,0 +1,34 @@
+import { isAscii, getNonAsciiChars } from '../src/asciiUtils';
+
+describe('isAscii', () => {
+    it('should return true for ASCII only string', () => {
+        expect(isAscii('this is only ascii')).toEqual(true);
+    });
+
+    it('should return true when called without parameter', () => {
+        expect(isAscii()).toEqual(true);
+    });
+
+    it('should return false strings with non ASCII chars', () => {
+        expect(isAscii('¥')).toEqual(false);
+        expect(isAscii('železniční přejezd')).toEqual(false);
+    });
+});
+
+describe('getNonAsciiChars', () => {
+    test('should return null for an empty string', () => {
+        expect(getNonAsciiChars('')).toBeNull();
+    });
+
+    test('should return null for ASCII-only characters', () => {
+        expect(getNonAsciiChars('Hello, World!')).toBeNull();
+    });
+
+    test('should return all non-ASCII characters for a mixed string', () => {
+        expect(getNonAsciiChars('Čau světe!')).toEqual(['Č', 'ě']);
+    });
+
+    test('should return all instances of repeating non-ASCII characters', () => {
+        expect(getNonAsciiChars('Přátelé přátelé')).toEqual(['ř', 'á', 'é', 'ř', 'á', 'é']);
+    });
+});
diff --git a/packages/utils/tests/createLazy.test.ts b/packages/utils/tests/createLazy.test.ts
index e081890af98..1034e307500 100644
--- a/packages/utils/tests/createLazy.test.ts
+++ b/packages/utils/tests/createLazy.test.ts
@@ -44,7 +44,7 @@ describe('createLazy', () => {
         expect(disposeFn).toHaveBeenCalledWith([42]);
     });
 
-    it('dispose during init', () => {
+    it('dispose during init', async () => {
         const initFn = jest.fn(returnDelayed(500));
         const lazy = createLazy(initFn);
 
@@ -62,8 +62,8 @@ describe('createLazy', () => {
 
         jest.advanceTimersByTime(400);
 
-        expect(initPromise).rejects.toThrow('Disposed during initialization');
         expect(lazy.getPending()).toEqual(undefined);
         expect(lazy.get()).toEqual(undefined);
+        await expect(initPromise).rejects.toThrow('Disposed during initialization');
     });
 });
diff --git a/packages/utils/tests/getMutex.test.ts b/packages/utils/tests/getMutex.test.ts
index e5888874824..de2cb284743 100644
--- a/packages/utils/tests/getMutex.test.ts
+++ b/packages/utils/tests/getMutex.test.ts
@@ -93,21 +93,22 @@ describe('getMutex', () => {
         ]);
     });
 
-    it('nested', done => {
-        lock().then(unlock =>
-            sequence(['a', 3])
-                .then(() => {
-                    // 'c' registers after 'a' ended and while 'b' is running
-                    delay(2).then(() =>
-                        lock()
-                            .then(unlock2 => sequence(['c', 3]).finally(unlock2))
-                            .then(done),
-                    );
-                })
-                .finally(unlock),
-        );
-        lock().then(unlock => sequence(['b', 8]).finally(unlock));
-    });
+    it('nested', () =>
+        new Promise<void>(done => {
+            lock().then(unlock =>
+                sequence(['a', 3])
+                    .then(() => {
+                        // 'c' registers after 'a' ended and while 'b' is running
+                        delay(2).then(() =>
+                            lock()
+                                .then(unlock2 => sequence(['c', 3]).finally(unlock2))
+                                .then(done),
+                        );
+                    })
+                    .finally(unlock),
+            );
+            lock().then(unlock => sequence(['b', 8]).finally(unlock));
+        }));
 
     it('with keys', async () => {
         let state1: any, state2: any;
diff --git a/packages/utils/tests/getRandomInt.test.ts b/packages/utils/tests/getRandomInt.test.ts
new file mode 100644
index 00000000000..b4c01969b4a
--- /dev/null
+++ b/packages/utils/tests/getRandomInt.test.ts
@@ -0,0 +1,76 @@
+import { randomInt } from 'crypto';
+
+import { getRandomInt } from '../src/getRandomInt';
+
+describe(getRandomInt.name, () => {
+    it('raises same error as randomInt from crypto when max <= min', () => {
+        const EXPECTED_ERROR = new RangeError(
+            'The value of "max" is out of range. It must be greater than the value of "min" (0). Received -1',
+        );
+
+        expect(() => randomInt(0, -1)).toThrow(EXPECTED_ERROR);
+        expect(() => getRandomInt(0, -1)).toThrow(EXPECTED_ERROR);
+    });
+
+    it('raises error for range > 2^32', () => {
+        const EXPECTED_ERROR = new RangeError(
+            'This function only provide 32 bits of entropy, therefore range cannot be more then 2^32.',
+        );
+
+        expect(() => getRandomInt(0, Math.pow(2, 32) + 1)).toThrow(EXPECTED_ERROR);
+    });
+
+    it('raises same error for unsafe integer', () => {
+        const UNSAFE_INTEGER = 2 ** 53;
+
+        const EXPECTED_ERROR_MIN = new RangeError(
+            'The "min" argument must be a safe integer. Received type number (9007199254740992)',
+        );
+
+        expect(() => randomInt(UNSAFE_INTEGER, UNSAFE_INTEGER + 1)).toThrow(EXPECTED_ERROR_MIN);
+        expect(() => getRandomInt(UNSAFE_INTEGER, UNSAFE_INTEGER + 1)).toThrow(EXPECTED_ERROR_MIN);
+
+        const EXPECTED_ERROR_MAX = new RangeError(
+            'The "max" argument must be a safe integer. Received type number (9007199254740992)',
+        );
+        const EXPECTED_ERROR_MAX_NEGATIVE = new RangeError(
+            'The "max" argument must be a safe integer. Received type number (-9007199254740992)',
+        );
+
+        expect(() => randomInt(0, UNSAFE_INTEGER)).toThrow(EXPECTED_ERROR_MAX);
+        expect(() => getRandomInt(0, UNSAFE_INTEGER)).toThrow(EXPECTED_ERROR_MAX);
+        expect(() => randomInt(0, -UNSAFE_INTEGER)).toThrow(EXPECTED_ERROR_MAX_NEGATIVE);
+        expect(() => getRandomInt(0, -UNSAFE_INTEGER)).toThrow(EXPECTED_ERROR_MAX_NEGATIVE);
+    });
+
+    // This test takes 100+seconds to run. It is very needed for development and debugging,
+    // but due to the time it takes, it is skipped in CI.
+    it.skip('return value in given range and in uniform distribution', () => {
+        const SAMPLES = 1000_000;
+        const RANGE = 100;
+        const MIN = 0;
+        const MAX = MIN + RANGE;
+        const TOLERANCE = 0.1;
+        const EXPECTED = SAMPLES / RANGE;
+
+        const LOWER_BOUND = (1 - TOLERANCE) * EXPECTED;
+        const UPPER_BOUND = (1 + TOLERANCE) * EXPECTED;
+
+        const distribution = new Map<number, number>();
+
+        for (let i = 0; i < SAMPLES; i++) {
+            const result = getRandomInt(MIN, MAX);
+
+            distribution.set(result, (distribution.get(result) ?? 0) + 1);
+
+            expect(Number.isInteger(result)).toBe(true);
+            expect(result).toBeGreaterThanOrEqual(MIN);
+            expect(result).toBeLessThan(MAX);
+        }
+
+        Array.from(distribution.keys()).forEach(key => {
+            expect(distribution.get(key)).toBeGreaterThanOrEqual(LOWER_BOUND);
+            expect(distribution.get(key)).toBeLessThanOrEqual(UPPER_BOUND);
+        });
+    });
+});
diff --git a/packages/utils/tests/getSynchronize.test.ts b/packages/utils/tests/getSynchronize.test.ts
index 7d471dbec7b..f5c5840393c 100644
--- a/packages/utils/tests/getSynchronize.test.ts
+++ b/packages/utils/tests/getSynchronize.test.ts
@@ -59,15 +59,16 @@ describe('getSynchronize', () => {
         ]);
     });
 
-    it('nested', done => {
-        synchronize(() =>
-            sequence(['a', 3]).then(() => {
-                // 'c' registers after 'a' ended and while 'b' is running
-                delay(2).then(() => synchronize(() => sequence(['c', 3])).then(done));
-            }),
-        );
-        synchronize(() => sequence(['b', 8]));
-    });
+    it('nested', () =>
+        new Promise<void>(done => {
+            synchronize(() =>
+                sequence(['a', 3]).then(() => {
+                    // 'c' registers after 'a' ended and while 'b' is running
+                    delay(2).then(() => synchronize(() => sequence(['c', 3])).then(done));
+                }),
+            );
+            synchronize(() => sequence(['b', 8]));
+        }));
 
     it('with keys', async () => {
         let state1: any, state2: any;
diff --git a/packages/utils/tests/getWeakRandomInt.test.ts b/packages/utils/tests/getWeakRandomInt.test.ts
new file mode 100644
index 00000000000..f596b9c598b
--- /dev/null
+++ b/packages/utils/tests/getWeakRandomInt.test.ts
@@ -0,0 +1,26 @@
+import { getWeakRandomInt } from '../src';
+
+describe(getWeakRandomInt.name, () => {
+    it('raises same error as randomInt from crypto when max <= min', () => {
+        const EXPECTED_ERROR = new RangeError(
+            'The value of "max" is out of range. It must be greater than the value of "min" (0). Received -1',
+        );
+
+        expect(() => getWeakRandomInt(0, -1)).toThrow(EXPECTED_ERROR);
+    });
+
+    it('returns same value when range is trivial', () => {
+        expect(getWeakRandomInt(0, 1)).toEqual(0);
+        expect(getWeakRandomInt(100, 101)).toEqual(100);
+    });
+
+    it('returns value in the given range', () => {
+        for (let i = 0; i < 10_000; i++) {
+            const result = getWeakRandomInt(0, 100);
+
+            expect(Number.isInteger(result)).toBe(true);
+            expect(result).toBeGreaterThanOrEqual(0);
+            expect(result).toBeLessThan(100);
+        }
+    });
+});
diff --git a/packages/utils/tests/getWeakRandomNumberInRange.test.ts b/packages/utils/tests/getWeakRandomNumberInRange.test.ts
new file mode 100644
index 00000000000..25d22909761
--- /dev/null
+++ b/packages/utils/tests/getWeakRandomNumberInRange.test.ts
@@ -0,0 +1,11 @@
+import { getWeakRandomNumberInRange } from '../src';
+
+describe(getWeakRandomNumberInRange.name, () => {
+    it('returns value in range', () => {
+        for (let i = 0; i < 10_000; i++) {
+            const result = getWeakRandomNumberInRange(0, 100);
+            expect(result).toBeGreaterThanOrEqual(0);
+            expect(result).toBeLessThanOrEqual(100);
+        }
+    });
+});
diff --git a/packages/utils/tests/isArrayMember.test.ts b/packages/utils/tests/isArrayMember.test.ts
new file mode 100644
index 00000000000..1899a7dd4a8
--- /dev/null
+++ b/packages/utils/tests/isArrayMember.test.ts
@@ -0,0 +1,27 @@
+import { isArrayMember } from '../src/isArrayMember';
+
+describe(isArrayMember.name, () => {
+    it('determines if value is contained in an array', () => {
+        const arr = ['a', 'b', 'c'] as const;
+        expect(isArrayMember('a' as string, arr)).toBe(true);
+        expect(isArrayMember('d' as any, arr)).toBe(false);
+        expect(isArrayMember(undefined as any, arr)).toBe(false);
+    });
+
+    it('correctly narrows down value type (typescript only)', () => {
+        type Variant = 'a' | 'b' | 'c' | 'd';
+        const skippedVariants = ['a', 'b'] satisfies Variant[];
+        const variant = 'a' as Variant;
+
+        // the unit test is trivial here, but type-check verifies that the type narrowing works as supposed to
+        if (isArrayMember(variant, skippedVariants)) {
+            expect(variant === 'a').toBe(true);
+            // @ts-expect-error TS2367: variant was narrowed down to 'a' | 'b', so it has no overlap with 'c'
+            expect(variant === 'c').toBe(false);
+        } else {
+            expect(variant === 'c').toBe(false);
+            // @ts-expect-error TS2367: variant was narrowed down to 'c' | 'd', so it has no overlap with 'a'
+            expect(variant === 'a').toBe(true);
+        }
+    });
+});
diff --git a/packages/utils/tests/isAscii.test.ts b/packages/utils/tests/isAscii.test.ts
deleted file mode 100644
index c959d4890f5..00000000000
--- a/packages/utils/tests/isAscii.test.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { isAscii } from '../src/isAscii';
-
-describe('isAscii', () => {
-    it('should return true for ASCII only string', () => {
-        expect(isAscii('this is only ascii')).toEqual(true);
-    });
-
-    it('should return true when called without parameter', () => {
-        expect(isAscii()).toEqual(true);
-    });
-
-    it('should return false strings with non ASCII chars', () => {
-        expect(isAscii('¥')).toEqual(false);
-        expect(isAscii('železniční přejezd')).toEqual(false);
-    });
-});
diff --git a/packages/utils/tests/mergeDeepObject.test.ts b/packages/utils/tests/mergeDeepObject.test.ts
index 283c268ee5b..ed696f0df10 100644
--- a/packages/utils/tests/mergeDeepObject.test.ts
+++ b/packages/utils/tests/mergeDeepObject.test.ts
@@ -162,7 +162,7 @@ describe('mergeDeepObject', () => {
         });
 
         it("can't mergeDeepObject arrays when provided directly as args", () => {
-            expect(() => mergeDeepObject([1], [2])).toThrowError(
+            expect(() => mergeDeepObject([1], [2])).toThrow(
                 new TypeError('Arguments provided to ts-deepmerge must be objects, not arrays.'),
             );
         });
diff --git a/packages/utils/tests/scheduleAction.test.ts b/packages/utils/tests/scheduleAction.test.ts
index 92d8d384d7f..2a491d99a49 100644
--- a/packages/utils/tests/scheduleAction.test.ts
+++ b/packages/utils/tests/scheduleAction.test.ts
@@ -36,30 +36,32 @@ describe('scheduleAction', () => {
         jest.clearAllMocks();
     });
 
-    it('delay', done => {
-        const spy = jest.fn(() => Promise.resolve());
-        scheduleAction(spy, { delay: 1000 });
-        expect(spy).toHaveBeenCalledTimes(0);
-
-        setTimeout(() => {
-            expect(spy).toHaveBeenCalledTimes(1);
-            expect(checkListeners()).toBeUndefined();
-            done();
-        }, 1005);
-    });
-
-    it('delay aborted', done => {
-        const aborter = new AbortController();
-        const spy = jest.fn(() => Promise.resolve());
-        scheduleAction(spy, { delay: 1000, signal: aborter.signal }).catch(e => {
-            expect(e.message).toMatch(ERR_SIGNAL);
+    it('delay', () =>
+        new Promise<void>(done => {
+            const spy = jest.fn(() => Promise.resolve());
+            scheduleAction(spy, { delay: 1000 });
             expect(spy).toHaveBeenCalledTimes(0);
-            expect(checkListeners()).toBeUndefined();
-            done();
-        });
 
-        aborter.abort();
-    });
+            setTimeout(() => {
+                expect(spy).toHaveBeenCalledTimes(1);
+                expect(checkListeners()).toBeUndefined();
+                done();
+            }, 1005);
+        }));
+
+    it('delay aborted', () =>
+        new Promise<void>(done => {
+            const aborter = new AbortController();
+            const spy = jest.fn(() => Promise.resolve());
+            scheduleAction(spy, { delay: 1000, signal: aborter.signal }).catch(e => {
+                expect(e.message).toMatch(ERR_SIGNAL);
+                expect(spy).toHaveBeenCalledTimes(0);
+                expect(checkListeners()).toBeUndefined();
+                done();
+            });
+
+            aborter.abort();
+        }));
 
     it('deadline on always failing action', async () => {
         const spy = jest.fn(() => {
diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json
index b5d4399fca8..1ef32958c3a 100644
--- a/packages/utils/tsconfig.json
+++ b/packages/utils/tsconfig.json
@@ -5,5 +5,5 @@
         "outDir": "./libDev"
     },
     "include": ["."],
-    "references": []
+    "references": [{ "path": "../eslint" }]
 }
diff --git a/packages/utils/tsconfig.lib.json b/packages/utils/tsconfig.lib.json
index 81f5735adfc..3528a06e0f9 100644
--- a/packages/utils/tsconfig.lib.json
+++ b/packages/utils/tsconfig.lib.json
@@ -4,5 +4,9 @@
         "outDir": "lib"
     },
     "include": ["./src"],
-    "references": []
+    "references": [
+        {
+            "path": "../eslint"
+        }
+    ]
 }
diff --git a/packages/utxo-lib/.eslintrc.js b/packages/utxo-lib/.eslintrc.js
deleted file mode 100644
index 30905e37a2b..00000000000
--- a/packages/utxo-lib/.eslintrc.js
+++ /dev/null
@@ -1,8 +0,0 @@
-module.exports = {
-    rules: {
-        'no-bitwise': 'off', // airbnb-base: used in hardending
-        'prefer-object-spread': 'off', // prefer Object.assign
-        'no-underscore-dangle': 'off', // underscore is used
-        'no-console': 'warn',
-    },
-};
diff --git a/packages/utxo-lib/eslint.config.mjs b/packages/utxo-lib/eslint.config.mjs
new file mode 100644
index 00000000000..871b1cc0a1f
--- /dev/null
+++ b/packages/utxo-lib/eslint.config.mjs
@@ -0,0 +1,14 @@
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'no-bitwise': 'off', // airbnb-base: used in hardending
+            'prefer-object-spread': 'off', // prefer Object.assign
+            'no-underscore-dangle': 'off', // underscore is used
+            'no-console': 'warn',
+            '@typescript-eslint/no-shadow': 'off', // Todo: shall be fixed
+        },
+    },
+];
diff --git a/packages/utxo-lib/package.json b/packages/utxo-lib/package.json
index bbd9b4cc829..2751988d07c 100644
--- a/packages/utxo-lib/package.json
+++ b/packages/utxo-lib/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@trezor/utxo-lib",
-    "version": "2.2.1",
+    "version": "2.2.2-beta.1",
     "author": "Trezor <info@trezor.io>",
     "homepage": "https://github.com/trezor/trezor-suite/tree/develop/packages/utxo-lib",
     "description": "Client-side Bitcoin-like JavaScript library",
@@ -31,7 +31,6 @@
         "typings": "lib/index.d.ts"
     },
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest --verbose -c jest.config.js",
         "type-check": "yarn g:tsc --build tsconfig.json",
         "build:lib": "yarn g:rimraf lib && yarn g:tsc --build tsconfig.lib.json && ../../scripts/replace-imports.sh ./lib",
@@ -58,10 +57,13 @@
         "wif": "^5.0.0"
     },
     "devDependencies": {
+        "@trezor/eslint": "workspace:*",
         "@types/bchaddrjs": "^0.4.3",
+        "@types/bn.js": "^5.1.6",
         "@types/bs58": "^4.0.4",
         "@types/bs58check": "^2.1.2",
         "@types/create-hmac": "^1.1.3",
+        "@types/events": "^3.0.3",
         "@types/wif": "^2.0.5",
         "minimaldata": "^1.0.2",
         "tsx": "^4.16.3"
diff --git a/packages/utxo-lib/src/address.ts b/packages/utxo-lib/src/address.ts
index b55f8fe6e06..9721feb4a0a 100644
--- a/packages/utxo-lib/src/address.ts
+++ b/packages/utxo-lib/src/address.ts
@@ -3,6 +3,7 @@
 // - `fromBase58Check` method is using additional "network" param and bs58check.decodeAddress instead of bs58check.decode. checking multibyte version (Zcash and Decred support).
 
 import { bech32, bech32m } from 'bech32';
+
 import * as bs58check from './bs58check';
 import * as bscript from './script';
 import * as payments from './payments';
@@ -28,7 +29,7 @@ export function fromBech32(address: string): Bech32Result {
     let version: number;
     try {
         result = bech32.decode(address);
-    } catch (e) {
+    } catch {
         // silent
     }
 
@@ -82,32 +83,32 @@ function toFutureSegwitAddress(output: Buffer, network = BITCOIN_NETWORK) {
 export function fromOutputScript(output: Buffer, network = BITCOIN_NETWORK) {
     try {
         return payments.p2pkh({ output, network }).address as string;
-    } catch (e) {
+    } catch {
         // empty
     }
     try {
         return payments.p2sh({ output, network }).address as string;
-    } catch (e) {
+    } catch {
         // empty
     }
     try {
         return payments.p2wpkh({ output, network }).address as string;
-    } catch (e) {
+    } catch {
         // empty
     }
     try {
         return payments.p2wsh({ output, network }).address as string;
-    } catch (e) {
+    } catch {
         // empty
     }
     try {
         return payments.p2tr({ output, network }).address as string;
-    } catch (e) {
+    } catch {
         // empty
     }
     try {
         return toFutureSegwitAddress(output, network);
-    } catch (e) {
+    } catch {
         // empty
     }
 
diff --git a/packages/utxo-lib/src/bip32.ts b/packages/utxo-lib/src/bip32.ts
index ebb65afb129..48e91d62592 100644
--- a/packages/utxo-lib/src/bip32.ts
+++ b/packages/utxo-lib/src/bip32.ts
@@ -7,6 +7,7 @@
 
 import ecc from 'tiny-secp256k1';
 import * as wif from 'wif';
+
 import { typeforce } from './types/typeforce';
 import * as bs58check from './bs58check';
 import * as crypto from './crypto';
diff --git a/packages/utxo-lib/src/bs58check.ts b/packages/utxo-lib/src/bs58check.ts
index b82009ac561..b551b2d441a 100644
--- a/packages/utxo-lib/src/bs58check.ts
+++ b/packages/utxo-lib/src/bs58check.ts
@@ -1,7 +1,8 @@
-import { bitcoin as BITCOIN_NETWORK, isNetworkType } from './networks';
 import bchaddrjs from 'bchaddrjs';
 import bs58 from 'bs58';
 import bs58check from 'bs58check';
+
+import { bitcoin as BITCOIN_NETWORK, isNetworkType } from './networks';
 import { blake256 } from './crypto';
 
 export function decodeBlake(buffer: Buffer) {
diff --git a/packages/utxo-lib/src/bufferutils.ts b/packages/utxo-lib/src/bufferutils.ts
index 18f2c081da1..f78e75ad743 100644
--- a/packages/utxo-lib/src/bufferutils.ts
+++ b/packages/utxo-lib/src/bufferutils.ts
@@ -9,7 +9,9 @@ import BN from 'bn.js';
 import pushdata from 'pushdata-bitcoin';
 import * as varuint from 'varuint-bitcoin';
 import { Int64LE } from 'int64-buffer';
+
 import { bufferUtils } from '@trezor/utils';
+
 import * as types from './types';
 
 const OUT_OF_RANGE_ERROR = 'value out of range';
@@ -36,7 +38,7 @@ export function readUInt64LEasString(buffer: Buffer, offset: number) {
         const result = readUInt64LE(buffer, offset);
 
         return result.toString();
-    } catch (error) {
+    } catch {
         const aUint = buffer.readUInt32LE(offset);
         const bUint = buffer.readUInt32LE(offset + 4);
         const m = new BN(0x100000000);
diff --git a/packages/utxo-lib/src/coinselect/coinselectUtils.ts b/packages/utxo-lib/src/coinselect/coinselectUtils.ts
index 91d5450e049..635c1e565c0 100644
--- a/packages/utxo-lib/src/coinselect/coinselectUtils.ts
+++ b/packages/utxo-lib/src/coinselect/coinselectUtils.ts
@@ -1,4 +1,5 @@
 import BN from 'bn.js';
+
 import {
     CoinSelectPaymentType,
     CoinSelectAlgorithm,
@@ -110,7 +111,11 @@ export function transactionBytes(inputs: Vin[], outputs: VinVout[]) {
 // - calculated from inputSize multiplied by dustRelayFeeRate
 export function getDustAmount(
     feeRate: number,
-    { txType, longTermFeeRate, dustThreshold }: CoinSelectOptions,
+    {
+        txType,
+        longTermFeeRate,
+        dustThreshold,
+    }: Pick<CoinSelectOptions, 'txType' | 'longTermFeeRate' | 'dustThreshold'>,
 ) {
     const inputSize = inputBytes({
         type: txType,
@@ -139,7 +144,7 @@ export function bignumberOrNaN(v?: BN | string, forgiving = false) {
 
     try {
         return new BN(v);
-    } catch (error) {
+    } catch {
         return defaultValue;
     }
 }
diff --git a/packages/utxo-lib/src/coinselect/index.ts b/packages/utxo-lib/src/coinselect/index.ts
index 3ea92d5b9c0..57ab6fde154 100644
--- a/packages/utxo-lib/src/coinselect/index.ts
+++ b/packages/utxo-lib/src/coinselect/index.ts
@@ -1,5 +1,5 @@
 import { accumulative } from './inputs/accumulative';
-import { bnb } from './inputs/bnb';
+import { branchAndBound } from './inputs/branchAndBound';
 import { split } from './outputs/split';
 import { sortByScore, anyOf } from './coinselectUtils';
 import { tryConfirmed } from './tryconfirmed';
@@ -10,8 +10,10 @@ export function coinselect({ inputs, outputs, feeRate, ...options }: CoinSelectR
         return split(inputs, outputs, feeRate, options);
     }
 
-    const sortedInputs = options.skipPermutation ? inputs : inputs.sort(sortByScore(feeRate));
-    const algorithm = tryConfirmed(anyOf([bnb, accumulative]), options);
+    const sortedInputs =
+        options.sortingStrategy === 'none' ? inputs : inputs.sort(sortByScore(feeRate));
+
+    const algorithm = tryConfirmed(anyOf([branchAndBound, accumulative]), options);
 
     return algorithm(sortedInputs, outputs, feeRate, options);
 }
diff --git a/packages/utxo-lib/src/coinselect/inputs/accumulative.ts b/packages/utxo-lib/src/coinselect/inputs/accumulative.ts
index 3c6176794de..feab043e016 100644
--- a/packages/utxo-lib/src/coinselect/inputs/accumulative.ts
+++ b/packages/utxo-lib/src/coinselect/inputs/accumulative.ts
@@ -1,4 +1,5 @@
 import BN from 'bn.js';
+
 import {
     bignumberOrNaN,
     sumOrNaN,
@@ -8,21 +9,16 @@ import {
     finalize,
     ZERO,
 } from '../coinselectUtils';
-import {
-    CoinSelectOptions,
-    CoinSelectInput,
-    CoinSelectOutput,
-    CoinSelectResult,
-} from '../../types';
+import { CoinSelectInput, CoinSelectResult, CoinSelectAlgorithm } from '../../types';
 
 // add inputs until we reach or surpass the target value (or deplete)
 // worst-case: O(n)
-export function accumulative(
-    utxos0: CoinSelectInput[],
-    outputs: CoinSelectOutput[],
-    feeRate: number,
-    options: CoinSelectOptions,
-): CoinSelectResult {
+export const accumulative: CoinSelectAlgorithm = (
+    utxos0,
+    outputs,
+    feeRate,
+    options,
+): CoinSelectResult => {
     let inAccum = ZERO;
     const inputs: CoinSelectInput[] = [];
     const outAccum = sumOrNaN(outputs);
@@ -80,4 +76,4 @@ export function accumulative(
     const fee = getFee(inputs, outputs, feeRate, options);
 
     return { fee };
-}
+};
diff --git a/packages/utxo-lib/src/coinselect/inputs/bnb.ts b/packages/utxo-lib/src/coinselect/inputs/branchAndBound.ts
similarity index 96%
rename from packages/utxo-lib/src/coinselect/inputs/bnb.ts
rename to packages/utxo-lib/src/coinselect/inputs/branchAndBound.ts
index 6a2e65236bd..979f2e87c1a 100644
--- a/packages/utxo-lib/src/coinselect/inputs/bnb.ts
+++ b/packages/utxo-lib/src/coinselect/inputs/branchAndBound.ts
@@ -1,4 +1,5 @@
 import BN from 'bn.js';
+
 import {
     bignumberOrNaN,
     sumOrNaN,
@@ -11,12 +12,7 @@ import {
     ZERO,
     OUTPUT_SCRIPT_LENGTH,
 } from '../coinselectUtils';
-import {
-    CoinSelectInput,
-    CoinSelectOutput,
-    CoinSelectOptions,
-    CoinSelectResult,
-} from '../../types';
+import { CoinSelectInput, CoinSelectResult, CoinSelectAlgorithm } from '../../types';
 
 const MAX_TRIES = 1000000;
 
@@ -132,12 +128,12 @@ function search(
  * https://github.com/bitcoin/bitcoin/blob/b2ec0326fd76e64a6d0d7e4745506b29f60d0be5/src/wallet/coinselection.cpp
  */
 
-export function bnb(
-    utxos: CoinSelectInput[],
-    outputs: CoinSelectOutput[],
-    feeRate: number,
-    options: CoinSelectOptions,
-): CoinSelectResult {
+export const branchAndBound: CoinSelectAlgorithm = (
+    utxos,
+    outputs,
+    feeRate,
+    options,
+): CoinSelectResult => {
     if (options.baseFee) return { fee: 0 }; // TEMP: disable bnb algorithm for DOGE
     if (utxos.find(u => u.required)) return { fee: 0 }; // TODO: enable bnb algorithm if required utxos are defined
 
@@ -200,4 +196,4 @@ export function bnb(
     }
 
     return { fee: 0 };
-}
+};
diff --git a/packages/utxo-lib/src/coinselect/outputs/split.ts b/packages/utxo-lib/src/coinselect/outputs/split.ts
index 5c0000ae851..66bf3ba5fa3 100644
--- a/packages/utxo-lib/src/coinselect/outputs/split.ts
+++ b/packages/utxo-lib/src/coinselect/outputs/split.ts
@@ -1,4 +1,5 @@
 import BN from 'bn.js';
+
 import {
     bignumberOrNaN,
     sumOrNaN,
diff --git a/packages/utxo-lib/src/compose/request.ts b/packages/utxo-lib/src/compose/request.ts
index dfe7887b157..aaebd0b7855 100644
--- a/packages/utxo-lib/src/compose/request.ts
+++ b/packages/utxo-lib/src/compose/request.ts
@@ -242,6 +242,6 @@ export function validateAndParseRequest(request: Request): CoinSelectRequest | C
         dustThreshold: request.dustThreshold,
         baseFee: request.baseFee,
         floorBaseFee: request.floorBaseFee,
-        skipPermutation: request.skipPermutation,
+        sortingStrategy: request.sortingStrategy,
     };
 }
diff --git a/packages/utxo-lib/src/compose/sorting/bip69SortingStrategy.ts b/packages/utxo-lib/src/compose/sorting/bip69SortingStrategy.ts
new file mode 100644
index 00000000000..2cb8bb1270e
--- /dev/null
+++ b/packages/utxo-lib/src/compose/sorting/bip69SortingStrategy.ts
@@ -0,0 +1,39 @@
+import { SortingStrategy } from './sortingStrategy';
+import { CoinSelectOutputFinal, ComposeInput } from '../../types';
+import { convertOutput } from './convertOutput';
+
+function inputComparator(a: ComposeInput, b: ComposeInput) {
+    return Buffer.from(a.txid, 'hex').compare(Buffer.from(b.txid, 'hex')) || a.vout - b.vout;
+}
+
+function outputComparator(a: CoinSelectOutputFinal, b: CoinSelectOutputFinal) {
+    return (
+        a.value.cmp(b.value) ||
+        (Buffer.isBuffer(a.script) && Buffer.isBuffer(b.script)
+            ? a.script.compare(b.script)
+            : a.script.length - b.script.length)
+    );
+}
+
+export const bip69SortingStrategy: SortingStrategy = ({ result, request, convertedInputs }) => {
+    const defaultPermutation: number[] = [];
+    const convertedOutputs = result.outputs.map((output, index) => {
+        defaultPermutation.push(index);
+        if (request.outputs[index]) {
+            return convertOutput(output, request.outputs[index]);
+        }
+
+        return convertOutput(output, { type: 'change', ...request.changeAddress });
+    });
+
+    const permutation = defaultPermutation.sort((a, b) =>
+        outputComparator(result.outputs[a], result.outputs[b]),
+    );
+    const sortedOutputs = permutation.map(index => convertedOutputs[index]);
+
+    return {
+        inputs: convertedInputs.sort(inputComparator),
+        outputs: sortedOutputs,
+        outputsPermutation: permutation,
+    };
+};
diff --git a/packages/utxo-lib/src/compose/sorting/convertOutput.ts b/packages/utxo-lib/src/compose/sorting/convertOutput.ts
new file mode 100644
index 00000000000..9972d363885
--- /dev/null
+++ b/packages/utxo-lib/src/compose/sorting/convertOutput.ts
@@ -0,0 +1,23 @@
+import { CoinSelectOutputFinal, ComposeChangeAddress, ComposeFinalOutput } from '../../types';
+
+export const convertOutput = (
+    selectedOutput: CoinSelectOutputFinal,
+    composeOutput: ComposeFinalOutput | ({ type: 'change' } & ComposeChangeAddress),
+) => {
+    if (composeOutput.type === 'change') {
+        return {
+            ...composeOutput,
+            amount: selectedOutput.value.toString(),
+        };
+    }
+
+    if (composeOutput.type === 'opreturn') {
+        return composeOutput;
+    }
+
+    return {
+        ...composeOutput,
+        type: 'payment' as const,
+        amount: selectedOutput.value.toString(),
+    };
+};
diff --git a/packages/utxo-lib/src/compose/sorting/noneSortingStrategy.ts b/packages/utxo-lib/src/compose/sorting/noneSortingStrategy.ts
new file mode 100644
index 00000000000..6cb7cbf648a
--- /dev/null
+++ b/packages/utxo-lib/src/compose/sorting/noneSortingStrategy.ts
@@ -0,0 +1,18 @@
+import { SortingStrategy } from './sortingStrategy';
+import { convertOutput } from './convertOutput';
+
+export const noneSortingStrategy: SortingStrategy = ({ result, request, convertedInputs }) => {
+    const convertedOutputs = result.outputs.map((output, index) => {
+        if (request.outputs[index]) {
+            return convertOutput(output, request.outputs[index]);
+        }
+
+        return convertOutput(output, { type: 'change', ...request.changeAddress });
+    });
+
+    return {
+        inputs: convertedInputs,
+        outputs: convertedOutputs,
+        outputsPermutation: Array.from(convertedOutputs.keys()),
+    };
+};
diff --git a/packages/utxo-lib/src/compose/sorting/randomSortingStrategy.ts b/packages/utxo-lib/src/compose/sorting/randomSortingStrategy.ts
new file mode 100644
index 00000000000..859142621a3
--- /dev/null
+++ b/packages/utxo-lib/src/compose/sorting/randomSortingStrategy.ts
@@ -0,0 +1,38 @@
+import { arrayShuffle, getRandomInt } from '@trezor/utils';
+
+import { SortingStrategy } from './sortingStrategy';
+import { convertOutput } from './convertOutput';
+
+export const randomSortingStrategy: SortingStrategy = ({ result, request, convertedInputs }) => {
+    const nonChangeOutputPermutation: number[] = [];
+    const changeOutputPermutation: number[] = [];
+
+    const convertedOutputs = result.outputs.map((output, index) => {
+        if (request.outputs[index]) {
+            nonChangeOutputPermutation.push(index);
+
+            return convertOutput(output, request.outputs[index]);
+        }
+
+        changeOutputPermutation.push(index);
+
+        return convertOutput(output, { type: 'change', ...request.changeAddress });
+    });
+
+    /**
+     * The goal here is to randomly insert change outputs into the outputs array.,
+     * so you cannot tell what is the change just by the order of the transaction.
+     */
+    const permutation = [...nonChangeOutputPermutation];
+    const newPositionOfChange = getRandomInt(0, permutation.length + 1);
+
+    permutation.splice(newPositionOfChange, 0, ...changeOutputPermutation);
+    const sortedOutputs = permutation.map(index => convertedOutputs[index]);
+
+    return {
+        /** Randomly shuffle inputs to make it harder to fingerprint the Trezor Suite. */
+        inputs: arrayShuffle(convertedInputs, { randomInt: getRandomInt }),
+        outputs: sortedOutputs,
+        outputsPermutation: permutation,
+    };
+};
diff --git a/packages/utxo-lib/src/compose/sorting/sortingStrategy.ts b/packages/utxo-lib/src/compose/sorting/sortingStrategy.ts
new file mode 100644
index 00000000000..f3a79fcd61e
--- /dev/null
+++ b/packages/utxo-lib/src/compose/sorting/sortingStrategy.ts
@@ -0,0 +1,18 @@
+import {
+    CoinSelectSuccess,
+    ComposeChangeAddress,
+    ComposedTransaction,
+    ComposeFinalOutput,
+    ComposeInput,
+    ComposeRequest,
+} from '../../types';
+
+type SortingStrategyParams<Input extends ComposeInput, Change extends ComposeChangeAddress> = {
+    request: ComposeRequest<Input, ComposeFinalOutput, Change>;
+    result: CoinSelectSuccess;
+    convertedInputs: Input[];
+};
+
+export type SortingStrategy = <Input extends ComposeInput, Change extends ComposeChangeAddress>(
+    params: SortingStrategyParams<Input, Change>,
+) => ComposedTransaction<Input, ComposeFinalOutput, Change>;
diff --git a/packages/utxo-lib/src/compose/transaction.ts b/packages/utxo-lib/src/compose/transaction.ts
index 6c00ac64da3..2596e607c39 100644
--- a/packages/utxo-lib/src/compose/transaction.ts
+++ b/packages/utxo-lib/src/compose/transaction.ts
@@ -5,43 +5,18 @@ import {
     ComposeChangeAddress,
     ComposeFinalOutput,
     ComposedTransaction,
-    CoinSelectOutputFinal,
+    TransactionInputOutputSortingStrategy,
 } from '../types';
+import { noneSortingStrategy } from './sorting/noneSortingStrategy';
+import { SortingStrategy } from './sorting/sortingStrategy';
+import { bip69SortingStrategy } from './sorting/bip69SortingStrategy';
+import { randomSortingStrategy } from './sorting/randomSortingStrategy';
 
-function convertOutput(
-    selectedOutput: CoinSelectOutputFinal,
-    composeOutput: ComposeFinalOutput | ({ type: 'change' } & ComposeChangeAddress),
-) {
-    if (composeOutput.type === 'change') {
-        return {
-            ...composeOutput,
-            amount: selectedOutput.value.toString(),
-        };
-    }
-
-    if (composeOutput.type === 'opreturn') {
-        return composeOutput;
-    }
-
-    return {
-        ...composeOutput,
-        type: 'payment' as const,
-        amount: selectedOutput.value.toString(),
-    };
-}
-
-function inputComparator(a: ComposeInput, b: ComposeInput) {
-    return Buffer.from(a.txid, 'hex').compare(Buffer.from(b.txid, 'hex')) || a.vout - b.vout;
-}
-
-function outputComparator(a: CoinSelectOutputFinal, b: CoinSelectOutputFinal) {
-    return (
-        a.value.cmp(b.value) ||
-        (Buffer.isBuffer(a.script) && Buffer.isBuffer(b.script)
-            ? a.script.compare(b.script)
-            : a.script.length - b.script.length)
-    );
-}
+const strategyMap: Record<TransactionInputOutputSortingStrategy, SortingStrategy> = {
+    bip69: bip69SortingStrategy,
+    none: noneSortingStrategy,
+    random: randomSortingStrategy,
+};
 
 export function createTransaction<Input extends ComposeInput, Change extends ComposeChangeAddress>(
     request: ComposeRequest<Input, ComposeFinalOutput, Change>,
@@ -49,32 +24,5 @@ export function createTransaction<Input extends ComposeInput, Change extends Com
 ): ComposedTransaction<Input, ComposeFinalOutput, Change> {
     const convertedInputs = result.inputs.map(input => request.utxos[input.i]);
 
-    const defaultPermutation: number[] = [];
-    const convertedOutputs = result.outputs.map((output, index) => {
-        defaultPermutation.push(index);
-        if (request.outputs[index]) {
-            return convertOutput(output, request.outputs[index]);
-        }
-
-        return convertOutput(output, { type: 'change', ...request.changeAddress });
-    });
-
-    if (request.skipPermutation) {
-        return {
-            inputs: convertedInputs,
-            outputs: convertedOutputs,
-            outputsPermutation: defaultPermutation,
-        };
-    }
-
-    const permutation = defaultPermutation.sort((a, b) =>
-        outputComparator(result.outputs[a], result.outputs[b]),
-    );
-    const sortedOutputs = permutation.map(index => convertedOutputs[index]);
-
-    return {
-        inputs: convertedInputs.sort(inputComparator),
-        outputs: sortedOutputs,
-        outputsPermutation: permutation,
-    };
+    return strategyMap[request.sortingStrategy]({ result, request, convertedInputs });
 }
diff --git a/packages/utxo-lib/src/crypto.ts b/packages/utxo-lib/src/crypto.ts
index 4e4e3881db3..d0ba734b6b8 100644
--- a/packages/utxo-lib/src/crypto.ts
+++ b/packages/utxo-lib/src/crypto.ts
@@ -9,7 +9,7 @@ import { createHash } from 'crypto';
 export function ripemd160(buffer: Buffer): Buffer {
     try {
         return createHash('rmd160').update(buffer).digest();
-    } catch (err) {
+    } catch {
         return createHash('ripemd160').update(buffer).digest();
     }
 }
diff --git a/packages/utxo-lib/src/derivation.ts b/packages/utxo-lib/src/derivation.ts
index f029336879c..51d51e048ce 100644
--- a/packages/utxo-lib/src/derivation.ts
+++ b/packages/utxo-lib/src/derivation.ts
@@ -1,5 +1,7 @@
 import bs58 from 'bs58';
+
 import { throwError } from '@trezor/utils';
+
 import { p2pkh, p2sh, p2wpkh, p2tr } from './payments';
 import { fromBase58 } from './bip32';
 import { bitcoin, Network } from './networks';
diff --git a/packages/utxo-lib/src/index.ts b/packages/utxo-lib/src/index.ts
index ccc02bc9715..e481bd9d837 100644
--- a/packages/utxo-lib/src/index.ts
+++ b/packages/utxo-lib/src/index.ts
@@ -40,3 +40,4 @@ export type {
 } from './types';
 export type { Network } from './networks';
 export type { BIP32Interface } from './bip32';
+export type { TransactionInputOutputSortingStrategy } from './types/compose';
diff --git a/packages/utxo-lib/src/networks.ts b/packages/utxo-lib/src/networks.ts
index 91a1d6394f2..a8869ae4b36 100644
--- a/packages/utxo-lib/src/networks.ts
+++ b/packages/utxo-lib/src/networks.ts
@@ -278,7 +278,7 @@ export function isNetworkType(type: NetworkTypes, network?: Network) {
             },
             network,
         );
-    } catch (e) {
+    } catch {
         return false;
     }
 
diff --git a/packages/utxo-lib/src/payments/p2ms.ts b/packages/utxo-lib/src/payments/p2ms.ts
index d68c3f54832..8bc2fe941dd 100644
--- a/packages/utxo-lib/src/payments/p2ms.ts
+++ b/packages/utxo-lib/src/payments/p2ms.ts
@@ -1,6 +1,7 @@
 // upstream: https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/ts_src/payments/p2ms.ts
 
 import ecc from 'tiny-secp256k1';
+
 import { bitcoin as BITCOIN_NETWORK } from '../networks';
 import * as bscript from '../script';
 import * as lazy from './lazy';
diff --git a/packages/utxo-lib/src/payments/p2pk.ts b/packages/utxo-lib/src/payments/p2pk.ts
index 2c649bfcb54..38e5cf4d08f 100644
--- a/packages/utxo-lib/src/payments/p2pk.ts
+++ b/packages/utxo-lib/src/payments/p2pk.ts
@@ -1,6 +1,7 @@
 // https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/ts_src/payments/p2pk.ts
 
 import ecc from 'tiny-secp256k1';
+
 import { bitcoin as BITCOIN_NETWORK } from '../networks';
 import * as bscript from '../script';
 import * as lazy from './lazy';
diff --git a/packages/utxo-lib/src/payments/p2pkh.ts b/packages/utxo-lib/src/payments/p2pkh.ts
index 20a8eaf6da6..f4732eb6788 100644
--- a/packages/utxo-lib/src/payments/p2pkh.ts
+++ b/packages/utxo-lib/src/payments/p2pkh.ts
@@ -4,6 +4,7 @@
 // - using bs58check.encodeAddress instead of bs58check.encode
 
 import ecc from 'tiny-secp256k1';
+
 import * as bs58check from '../bs58check';
 import * as bcrypto from '../crypto';
 import { bitcoin as BITCOIN_NETWORK } from '../networks';
diff --git a/packages/utxo-lib/src/payments/p2tr.ts b/packages/utxo-lib/src/payments/p2tr.ts
index 387d3339374..0c4aaa0b280 100644
--- a/packages/utxo-lib/src/payments/p2tr.ts
+++ b/packages/utxo-lib/src/payments/p2tr.ts
@@ -3,6 +3,7 @@
 
 import ecc from 'tiny-secp256k1';
 import { bech32m } from 'bech32';
+
 import { bitcoin as BITCOIN_NETWORK } from '../networks';
 import * as bcrypto from '../crypto';
 import * as bscript from '../script';
diff --git a/packages/utxo-lib/src/payments/p2wpkh.ts b/packages/utxo-lib/src/payments/p2wpkh.ts
index 44dba547aef..a49e466256c 100644
--- a/packages/utxo-lib/src/payments/p2wpkh.ts
+++ b/packages/utxo-lib/src/payments/p2wpkh.ts
@@ -2,6 +2,7 @@
 
 import ecc from 'tiny-secp256k1';
 import { bech32 } from 'bech32';
+
 import * as bcrypto from '../crypto';
 import { bitcoin as BITCOIN_NETWORK } from '../networks';
 import * as bscript from '../script';
diff --git a/packages/utxo-lib/src/payments/p2wsh.ts b/packages/utxo-lib/src/payments/p2wsh.ts
index 83557d1c3bd..70e01089d65 100644
--- a/packages/utxo-lib/src/payments/p2wsh.ts
+++ b/packages/utxo-lib/src/payments/p2wsh.ts
@@ -2,6 +2,7 @@
 
 import ecc from 'tiny-secp256k1';
 import { bech32 } from 'bech32';
+
 import * as bcrypto from '../crypto';
 import { bitcoin as BITCOIN_NETWORK } from '../networks';
 import * as bscript from '../script';
diff --git a/packages/utxo-lib/src/script/index.ts b/packages/utxo-lib/src/script/index.ts
index 0a188a198d7..1811d04ab17 100644
--- a/packages/utxo-lib/src/script/index.ts
+++ b/packages/utxo-lib/src/script/index.ts
@@ -5,6 +5,7 @@
 import * as bip66 from 'bip66';
 import pushdata from 'pushdata-bitcoin';
 import ecc from 'tiny-secp256k1';
+
 import * as scriptNumber from './scriptNumber';
 import * as scriptSignature from './scriptSignature';
 import { OPS, REVERSE_OPS } from './ops';
diff --git a/packages/utxo-lib/src/script/scriptSignature.ts b/packages/utxo-lib/src/script/scriptSignature.ts
index 2d7c0e70093..c2ca64146ee 100644
--- a/packages/utxo-lib/src/script/scriptSignature.ts
+++ b/packages/utxo-lib/src/script/scriptSignature.ts
@@ -1,6 +1,7 @@
 // upstream: https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/ts_src/script_signature.ts
 
 import * as bip66 from 'bip66';
+
 import * as types from '../types';
 
 const ZERO = Buffer.alloc(1, 0);
diff --git a/packages/utxo-lib/src/transaction/base.ts b/packages/utxo-lib/src/transaction/base.ts
index d869ec9d9ff..cde5812f1bf 100644
--- a/packages/utxo-lib/src/transaction/base.ts
+++ b/packages/utxo-lib/src/transaction/base.ts
@@ -1,9 +1,9 @@
 import * as varuint from 'varuint-bitcoin';
+
 import { reverseBuffer, getChunkSize } from '../bufferutils';
 import * as bcrypto from '../crypto';
 import * as types from '../types';
 import * as bscript from '../script';
-
 import { bitcoin as BITCOIN_NETWORK, Network, isNetworkType } from '../networks';
 
 export function varSliceSize(someScript: Buffer) {
diff --git a/packages/utxo-lib/src/transaction/dash.ts b/packages/utxo-lib/src/transaction/dash.ts
index 5bc6350eb2a..618930b213c 100644
--- a/packages/utxo-lib/src/transaction/dash.ts
+++ b/packages/utxo-lib/src/transaction/dash.ts
@@ -1,4 +1,5 @@
 import * as varuint from 'varuint-bitcoin';
+
 import { BufferReader, BufferWriter } from '../bufferutils';
 import { TransactionBase, TransactionOptions, varSliceSize, vectorSize } from './base';
 
diff --git a/packages/utxo-lib/src/transaction/decred.ts b/packages/utxo-lib/src/transaction/decred.ts
index 10ada38f469..67ec57ed365 100644
--- a/packages/utxo-lib/src/transaction/decred.ts
+++ b/packages/utxo-lib/src/transaction/decred.ts
@@ -1,6 +1,7 @@
 // https://devdocs.decred.org/developer-guides/transactions/transaction-format/
 
 import * as varuint from 'varuint-bitcoin';
+
 import { BufferReader, BufferWriter } from '../bufferutils';
 import * as bcrypto from '../crypto';
 import { TransactionBase, TransactionOptions, varSliceSize, EMPTY_SCRIPT } from './base';
diff --git a/packages/utxo-lib/src/transaction/zcash.ts b/packages/utxo-lib/src/transaction/zcash.ts
index fc9cd5051f0..dba76653338 100644
--- a/packages/utxo-lib/src/transaction/zcash.ts
+++ b/packages/utxo-lib/src/transaction/zcash.ts
@@ -3,6 +3,7 @@
 
 import * as varuint from 'varuint-bitcoin';
 import { blake2b } from 'blakejs';
+
 import { BufferReader, BufferWriter, varIntSize } from '../bufferutils';
 import { TransactionBase, TransactionOptions, varSliceSize, EMPTY_SCRIPT } from './base';
 import { hash256 } from '../crypto';
diff --git a/packages/utxo-lib/src/types/coinselect.ts b/packages/utxo-lib/src/types/coinselect.ts
index d4af06d784c..bd1e6cddfbd 100644
--- a/packages/utxo-lib/src/types/coinselect.ts
+++ b/packages/utxo-lib/src/types/coinselect.ts
@@ -1,5 +1,7 @@
 import BN from 'bn.js';
 
+import { TransactionInputOutputSortingStrategy } from './compose';
+
 export type CoinSelectPaymentType = 'p2pkh' | 'p2sh' | 'p2tr' | 'p2wpkh' | 'p2wsh';
 
 export interface CoinSelectOptions {
@@ -12,7 +14,7 @@ export interface CoinSelectOptions {
     coinbase?: number;
     baseFee?: number;
     floorBaseFee?: boolean;
-    skipPermutation?: boolean;
+    sortingStrategy: TransactionInputOutputSortingStrategy;
     feePolicy?: 'bitcoin' | 'doge' | 'zcash';
 }
 
diff --git a/packages/utxo-lib/src/types/compose.ts b/packages/utxo-lib/src/types/compose.ts
index e16078bc425..13bb8937459 100644
--- a/packages/utxo-lib/src/types/compose.ts
+++ b/packages/utxo-lib/src/types/compose.ts
@@ -68,11 +68,23 @@ export interface ComposeChangeAddress {
     address: string;
 }
 
-export interface ComposeRequest<
+export type TransactionInputOutputSortingStrategy =
+    // BIP69 sorting
+    | 'bip69'
+
+    // Inputs are randomized, outputs are kept as they were provided in the request,
+    // and change is randomly placed somewhere between outputs
+    | 'random'
+
+    // It keeps the inputs and outputs as they were provided in the request.
+    // This is useful for RBF transactions where the order of inputs and outputs must be preserved.
+    | 'none';
+
+export type ComposeRequest<
     Input extends ComposeInput,
     Output extends ComposeOutput,
     Change extends ComposeChangeAddress,
-> {
+> = {
     txType?: CoinSelectPaymentType;
     utxos: Input[]; // all inputs
     outputs: Output[]; // all outputs
@@ -84,8 +96,8 @@ export interface ComposeRequest<
     baseFee?: number; // DOGE or RBF base fee
     floorBaseFee?: boolean; // DOGE floor base fee to the nearest integer
     skipUtxoSelection?: boolean; // use custom utxo selection, without algorithm
-    skipPermutation?: boolean; // Do not sort inputs/outputs and preserve the given order. Handy for RBF.
-}
+    sortingStrategy: TransactionInputOutputSortingStrategy;
+};
 
 type ComposedTransactionOutputs<T> = T extends ComposeOutputSendMax
     ? Omit<T, 'type'> & ComposeOutputPayment // NOTE: replace ComposeOutputSendMax (no amount) with ComposeOutputPayment (with amount)
diff --git a/packages/utxo-lib/tests/__fixtures__/bufferutils.ts b/packages/utxo-lib/tests/__fixtures__/bufferutils.ts
index 3306805aab3..272aac0374d 100644
--- a/packages/utxo-lib/tests/__fixtures__/bufferutils.ts
+++ b/packages/utxo-lib/tests/__fixtures__/bufferutils.ts
@@ -96,7 +96,7 @@ export const fixtures = {
                 exception: 'value out of range',
                 hex64: '0100000000002000',
                 hexVI: 'ff0100000000000020',
-                // eslint-disable-next-line @typescript-eslint/no-loss-of-precision
+                // eslint-disable-next-line no-loss-of-precision
                 dec: 9007199254740993,
             },
         ],
diff --git a/packages/utxo-lib/tests/__fixtures__/coinselect/coinselect-errors.ts b/packages/utxo-lib/tests/__fixtures__/coinselect/coinselect-errors.ts
index cd601908175..62dba86e692 100644
--- a/packages/utxo-lib/tests/__fixtures__/coinselect/coinselect-errors.ts
+++ b/packages/utxo-lib/tests/__fixtures__/coinselect/coinselect-errors.ts
@@ -1,4 +1,4 @@
-export default [
+export const coinselectFixturesErrors = [
     {
         description: 'missing input info',
         feeRate: 10,
diff --git a/packages/utxo-lib/tests/__fixtures__/coinselect/coinselect-index.ts b/packages/utxo-lib/tests/__fixtures__/coinselect/coinselect-index.ts
index 5055b2df871..a73a0c63904 100644
--- a/packages/utxo-lib/tests/__fixtures__/coinselect/coinselect-index.ts
+++ b/packages/utxo-lib/tests/__fixtures__/coinselect/coinselect-index.ts
@@ -1,4 +1,4 @@
-export default [
+export const coinselectIndexFixture = [
     {
         description: '1 output, no change, 1 input is unspendable coinbase',
         feeRate: 10,
diff --git a/packages/utxo-lib/tests/__fixtures__/compose.crosscheck.ts b/packages/utxo-lib/tests/__fixtures__/compose.crosscheck.ts
index b67a96ac20a..5291d11e000 100644
--- a/packages/utxo-lib/tests/__fixtures__/compose.crosscheck.ts
+++ b/packages/utxo-lib/tests/__fixtures__/compose.crosscheck.ts
@@ -1,12 +1,30 @@
 import { UTXO } from './compose';
+import {
+    ComposeChangeAddress,
+    ComposeInput,
+    ComposeOutput,
+    ComposeRequest,
+} from '../../src/types/compose';
+import { CoinSelectPaymentType } from '../../src';
 
-export default [
+type AnyComposeRequest = ComposeRequest<ComposeInput, ComposeOutput, ComposeChangeAddress>;
+
+type Fixture = {
+    description: string;
+    request: Omit<AnyComposeRequest, 'network'> & {
+        network?: AnyComposeRequest['network'];
+    };
+    result: Partial<Record<`${CoinSelectPaymentType}-${CoinSelectPaymentType}`, { bytes: number }>>;
+};
+
+export const fixturesCrossCheck: Fixture[] = [
     {
         description: '1 input, 1 output, no change',
         request: {
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             utxos: [{ ...UTXO, amount: 'replace-me' }],
             outputs: [
                 {
@@ -45,6 +63,7 @@ export default [
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             utxos: [{ ...UTXO, amount: '202300' }],
             outputs: [
                 {
@@ -83,6 +102,7 @@ export default [
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             utxos: [
                 {
                     ...UTXO,
@@ -133,6 +153,7 @@ export default [
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             utxos: [
                 {
                     ...UTXO,
@@ -206,7 +227,6 @@ export default [
                 {
                     type: 'opreturn',
                     dataHex: 'deadbeef',
-                    amount: '0',
                 },
             ],
         },
diff --git a/packages/utxo-lib/tests/__fixtures__/compose.ts b/packages/utxo-lib/tests/__fixtures__/compose.ts
index 1d797653c52..9c13c109427 100644
--- a/packages/utxo-lib/tests/__fixtures__/compose.ts
+++ b/packages/utxo-lib/tests/__fixtures__/compose.ts
@@ -1,4 +1,14 @@
-export const UTXO = {
+import {
+    ComposeChangeAddress,
+    ComposeInput,
+    ComposeOutput,
+    ComposeRequest,
+    ComposeResult,
+    ComposeResultFinal,
+} from '../../src/types/compose';
+import { bitcoincash, doge } from '../../src/networks';
+
+export const UTXO: ComposeInput & { path: number[] } = {
     path: [44, 1, 0, 0, 0], // NOTE: this field is not required by the ComposeInput interface, yet it is accepted in and received out
     coinbase: false,
     own: true,
@@ -8,13 +18,29 @@ export const UTXO = {
     amount: '102001',
 };
 
-export default [
+type AnyComposeRequest = ComposeRequest<ComposeInput, ComposeOutput, ComposeChangeAddress>;
+type AnyComposeResult = ComposeResult<ComposeInput, ComposeOutput, ComposeChangeAddress>;
+type AnyComposeFinalResult = ComposeResultFinal<ComposeInput, ComposeOutput, ComposeChangeAddress>;
+
+type Fixture = {
+    description: string;
+    request: Omit<AnyComposeRequest, 'network' | 'outputs' | 'changeAddress'> & {
+        network?: AnyComposeRequest['network'];
+        outputs: Array<AnyComposeRequest['outputs'][number] & { customField?: string }>;
+        changeAddress: AnyComposeRequest['changeAddress'] & { path?: number[] | string };
+    };
+    result: AnyComposeResult;
+    randomIntSequence?: number[];
+};
+
+export const composeTxFixture: Fixture[] = [
     {
         description: 'builds a simple tx without change',
         request: {
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: '1BitcoinEaterAddressDontSendf59kuE',
@@ -38,7 +64,7 @@ export default [
                     amount: '100000',
                     type: 'payment',
                     customField: 'prove that payment output is generic',
-                },
+                } as AnyComposeFinalResult['outputs'][number], // hack for `customField`
             ],
             outputsPermutation: [0],
             type: 'final',
@@ -50,6 +76,7 @@ export default [
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10.33',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: '1BitcoinEaterAddressDontSendf59kuE',
@@ -83,6 +110,7 @@ export default [
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     amount: '100000',
@@ -107,6 +135,7 @@ export default [
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     amount: '100000',
@@ -131,6 +160,7 @@ export default [
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: '1BitcoinEaterAddressDontSendf59kuE',
@@ -168,6 +198,7 @@ export default [
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: '1BitcoinEaterAddressDontSendf59kuE',
@@ -190,7 +221,7 @@ export default [
                     amount: '100081',
                     type: 'payment',
                     customField: 'prove that send-max output is generic',
-                },
+                } as AnyComposeFinalResult['outputs'][number], // hack for `customField`
             ],
             outputsPermutation: [0],
             type: 'final',
@@ -205,6 +236,7 @@ export default [
             },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: '1BitcoinEaterAddressDontSendf59kuE',
@@ -242,7 +274,7 @@ export default [
                     path: [44, 1, 1, 0],
                     amount: '49401',
                     type: 'change',
-                },
+                } as AnyComposeFinalResult['outputs'][number], // hack for `path`,
             ],
             outputsPermutation: [1, 0, 2],
             type: 'final',
@@ -257,6 +289,7 @@ export default [
             },
             dustThreshold: 546,
             feeRate: '10.71',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: '1BitcoinEaterAddressDontSendf59kuE',
@@ -294,7 +327,7 @@ export default [
                     address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT',
                     amount: '49216',
                     type: 'change',
-                },
+                } as AnyComposeFinalResult['outputs'][number], // hack for `path`,,
             ],
             outputsPermutation: [1, 0, 2],
             type: 'final',
@@ -307,6 +340,7 @@ export default [
             changeAddress: { address: '3LRW7jeCvQCRdPF8S3yUCfRAx4eqXFmdcr' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: '3LRW7jeCvQCRdPF8S3yUCfRAx4eqXFmdcr',
@@ -355,6 +389,7 @@ export default [
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: '1BitcoinEaterAddressDontSendf59kuE',
@@ -399,6 +434,7 @@ export default [
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: '1BitcoinEaterAddressDontSendf59kuE',
@@ -438,6 +474,130 @@ export default [
             type: 'final',
         },
     },
+    {
+        description: 'sorts the inputs according to BIP69 when sortingStrategy=bip69',
+        request: {
+            changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
+            dustThreshold: 546,
+            feeRate: '10',
+            sortingStrategy: 'bip69',
+            outputs: [
+                {
+                    address: '1BitcoinEaterAddressDontSendf59kuE',
+                    amount: '150000',
+                    type: 'payment',
+                },
+            ],
+            utxos: [
+                {
+                    ...UTXO,
+                    vout: 2,
+                },
+                {
+                    ...UTXO,
+                    vout: 1,
+                },
+            ],
+        },
+        result: {
+            bytes: 374,
+            fee: '3740',
+            feePerByte: '10',
+            max: undefined,
+            totalSpent: '153740',
+            inputs: [
+                { ...UTXO, vout: 1 },
+                { ...UTXO, vout: 2 },
+            ],
+            outputs: [
+                {
+                    address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT',
+                    amount: '50262',
+                    type: 'change',
+                },
+                {
+                    address: '1BitcoinEaterAddressDontSendf59kuE',
+                    amount: '150000',
+                    type: 'payment',
+                },
+            ],
+            outputsPermutation: [1, 0],
+            type: 'final',
+        },
+    },
+    {
+        description:
+            'sorts the inputs randomly and puts change at random place between user-defined outputs' +
+            'when sortingStrategy=random',
+        randomIntSequence: [
+            1, // For outputs (so change output is inserted at index 1 after the first output)
+            1, // Shuffling inputs (Fisher-Yates swap last, the 3rd with second)
+            0, // Shuffling inputs (Fisher-Yates swap second with the first)
+        ],
+        request: {
+            changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
+            dustThreshold: 546,
+            feeRate: '10',
+            sortingStrategy: 'random',
+            outputs: [
+                {
+                    address: '1BitcoinEaterAddressDontSendf59kuE',
+                    amount: '100000',
+                    type: 'payment',
+                },
+                {
+                    address: '1LetUsDestroyBitcoinTogether398Nrg',
+                    amount: '150000',
+                    type: 'payment',
+                },
+            ],
+            utxos: [
+                {
+                    ...UTXO,
+                    vout: 3,
+                },
+                {
+                    ...UTXO,
+                    vout: 2,
+                },
+                {
+                    ...UTXO,
+                    vout: 1,
+                },
+            ],
+        },
+        result: {
+            bytes: 556,
+            fee: '5560',
+            feePerByte: '10',
+            max: undefined,
+            totalSpent: '255560',
+            inputs: [
+                { ...UTXO, vout: 1 },
+                { ...UTXO, vout: 3 },
+                { ...UTXO, vout: 2 },
+            ],
+            outputs: [
+                {
+                    address: '1BitcoinEaterAddressDontSendf59kuE',
+                    amount: '100000',
+                    type: 'payment',
+                },
+                {
+                    address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT',
+                    amount: '50443',
+                    type: 'change',
+                },
+                {
+                    address: '1LetUsDestroyBitcoinTogether398Nrg',
+                    amount: '150000',
+                    type: 'payment',
+                },
+            ],
+            outputsPermutation: [0, 2, 1],
+            type: 'final',
+        },
+    },
     {
         description: 'builds a p2sh tx with two same value outputs (mixed p2sh + p2pkh) and change',
         request: {
@@ -445,6 +605,7 @@ export default [
             changeAddress: { address: '3LRW7jeCvQCRdPF8S3yUCfRAx4eqXFmdcr' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: '3LRW7jeCvQCRdPF8S3yUCfRAx4eqXFmdcr',
@@ -494,6 +655,7 @@ export default [
             changeAddress: { address: '3LRW7jeCvQCRdPF8S3yUCfRAx4eqXFmdcr' },
             dustThreshold: 54600,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: '3LRW7jeCvQCRdPF8S3yUCfRAx4eqXFmdcr',
@@ -532,6 +694,7 @@ export default [
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     dataHex: 'deadbeef',
@@ -553,7 +716,7 @@ export default [
                     dataHex: 'deadbeef',
                     type: 'opreturn',
                     customField: 'prove that opreturn output is generic',
-                },
+                } as AnyComposeFinalResult['outputs'][number], // hack for `customField`
                 {
                     address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT',
                     amount: '99931',
@@ -570,6 +733,7 @@ export default [
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     dataHex: 'deadbeef',
@@ -615,6 +779,7 @@ export default [
             changeAddress: { address: 'bc1qafk4yhqvj4wep57m62dgrmutldusqde8adh20d' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: 'bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq',
@@ -655,6 +820,7 @@ export default [
             changeAddress: { address: 'bc1qafk4yhqvj4wep57m62dgrmutldusqde8adh20d' },
             dustThreshold: 0,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: 'bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq',
@@ -699,6 +865,7 @@ export default [
             changeAddress: { address: '3LRW7jeCvQCRdPF8S3yUCfRAx4eqXFmdcr' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: '3NukJ6fYZJ5Kk8bPjycAnruZkE5Q7UW7i8',
@@ -734,6 +901,7 @@ export default [
             changeAddress: { address: '3LRW7jeCvQCRdPF8S3yUCfRAx4eqXFmdcr' },
             dustThreshold: 0,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: '3NukJ6fYZJ5Kk8bPjycAnruZkE5Q7UW7i8',
@@ -780,6 +948,7 @@ export default [
             },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: 'bc1ptxs597p3fnpd8gwut5p467ulsydae3rp9z75hd99w8k3ljr9g9rqx6ynaw',
@@ -822,6 +991,7 @@ export default [
             },
             dustThreshold: 0,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: 'bc1ptxs597p3fnpd8gwut5p467ulsydae3rp9z75hd99w8k3ljr9g9rqx6ynaw',
@@ -865,6 +1035,7 @@ export default [
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     type: 'send-max-noaddress',
@@ -886,9 +1057,10 @@ export default [
         description: 'builds a simple tx without change (cashaddr)',
         request: {
             changeAddress: { address: 'bitcoincash:qzppkat2v7xu9fr3yeuqdnggjqqltrs7pcg8swvhl0' },
-            network: 'bitcoincash',
+            network: bitcoincash,
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: 'bitcoincash:qp6e6enhpy0fwwu7nkvlr8rgl06ru0c9lywalz8st5',
@@ -922,6 +1094,7 @@ export default [
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
+            sortingStrategy: 'bip69',
             outputs: [
                 {
                     address: '1BitcoinEaterAddressDontSendf59kuE',
@@ -1009,12 +1182,12 @@ export default [
         },
     },
     {
-        description: 'skip inputs/outputs permutation',
+        description: 'skip inputs/outputs permutation when sortingStrategy=none',
         request: {
             changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
             dustThreshold: 546,
             feeRate: '10',
-            skipPermutation: true,
+            sortingStrategy: 'none',
             outputs: [
                 {
                     address: '1BitcoinEaterAddressDontSendf59kuE',
@@ -1088,7 +1261,8 @@ export default [
             changeAddress: { address: 'DKu2a8Wo6zC2dmBBYXwUG3fxWDHbKnNiPj' },
             dustThreshold: 999999,
             feeRate: '1000',
-            network: 'doge',
+            sortingStrategy: 'bip69',
+            network: doge,
             outputs: [
                 {
                     address: 'DDn7UV1CrqVefzwrHyw7H2zEZZKqfzR2ZD',
diff --git a/packages/utxo-lib/tests/address.test.ts b/packages/utxo-lib/tests/address.test.ts
index 2cd368a116d..7d095e44d8f 100644
--- a/packages/utxo-lib/tests/address.test.ts
+++ b/packages/utxo-lib/tests/address.test.ts
@@ -22,7 +22,7 @@ describe('address', () => {
             it(`throws on ${f.exception}`, () => {
                 expect(() => {
                     baddress.fromBase58Check(f.address, getNetwork(f.network));
-                }).toThrowError(new RegExp(`${f.address} ${f.exception}`));
+                }).toThrow(new RegExp(`${f.address} ${f.exception}`));
             });
         });
     });
@@ -50,7 +50,7 @@ describe('address', () => {
             it(`decode fails for ${f.address}(${f.exception})`, () => {
                 expect(() => {
                     baddress.fromBech32(f.address);
-                }).toThrowError(new RegExp(f.exception));
+                }).toThrow(new RegExp(f.exception));
             });
         });
     });
@@ -69,7 +69,7 @@ describe('address', () => {
                 const script = bscript.fromASM(f.script);
                 expect(() => {
                     baddress.fromOutputScript(script);
-                }).toThrowError(new RegExp(f.exception));
+                }).toThrow(new RegExp(f.exception));
             });
         });
     });
@@ -86,6 +86,7 @@ describe('address', () => {
 
         // TODO: These fixtures (according to TypeScript) have none of the data used below
         // fixtures.invalid.bech32.forEach((f, i) => {
+        // eslint-disable-next-line jest/no-commented-out-tests
         //     it(`encode fails (${f.exception}`, () => {
         //         expect(() => {
         //             baddress.toBech32(Buffer.from(f.data, 'hex'), f.version, f.prefix);
@@ -111,7 +112,7 @@ describe('address', () => {
                 const network = typeof f.network === 'string' ? getNetwork(f.network) : f.network;
                 expect(() => {
                     baddress.toOutputScript(f.address, network);
-                }).toThrowError(new RegExp(`${f.address} ${f.exception}`));
+                }).toThrow(new RegExp(`${f.address} ${f.exception}`));
             });
         });
     });
diff --git a/packages/utxo-lib/tests/bip32.test.ts b/packages/utxo-lib/tests/bip32.test.ts
index 35e479e7252..cca4caed9b1 100644
--- a/packages/utxo-lib/tests/bip32.test.ts
+++ b/packages/utxo-lib/tests/bip32.test.ts
@@ -23,7 +23,7 @@ function verify(hd: BIP32.BIP32Interface, prv: boolean, f: Fixture, network: NET
     if (prv) expect(hd.toBase58()).toEqual(f.base58Priv);
     if (prv) expect(hd.privateKey?.toString('hex')).toEqual(f.privKey);
     if (prv) expect(hd.toWIF()).toEqual(f.wif);
-    if (!prv) expect(() => hd.toWIF()).toThrowError(/Missing private key/);
+    if (!prv) expect(() => hd.toWIF()).toThrow(/Missing private key/);
     if (!prv) expect(hd.privateKey).toEqual(undefined);
     expect(hd.neutered().toBase58()).toEqual(f.base58);
     expect(hd.isNeutered()).toEqual(!prv);
@@ -56,7 +56,7 @@ function verify(hd: BIP32.BIP32Interface, prv: boolean, f: Fixture, network: NET
 
         expect(() => {
             shd.derivePath('m/0');
-        }).toThrowError(/Expected master, got child/);
+        }).toThrow(/Expected master, got child/);
 
         verify(shd, prv, cf, network);
     });
@@ -104,7 +104,7 @@ describe('fromBase58 throws', () => {
         it(`throws ${f.exception}`, () => {
             expect(() => {
                 BIP32.fromBase58(f.string, getNetwork(f.network));
-            }).toThrowError(new RegExp(`${f.exception}`));
+            }).toThrow(new RegExp(`${f.exception}`));
         });
     });
 });
@@ -142,7 +142,7 @@ it('throws on Public -> public (hardened)', () => {
     const master = BIP32.fromBase58(f.base58);
     expect(() => {
         master.deriveHardened(c.m);
-    }).toThrowError(/Missing private key for hardened child key/);
+    }).toThrow(/Missing private key for hardened child key/);
 });
 
 it('throws on wrong types', () => {
@@ -152,19 +152,19 @@ it('throws on wrong types', () => {
     fixtures.invalid.derive.forEach(fx => {
         expect(() => {
             master.derive(fx as any);
-        }).toThrowError(/Expected UInt32/);
+        }).toThrow(/Expected UInt32/);
     });
 
     fixtures.invalid.deriveHardened.forEach(fx => {
         expect(() => {
             master.deriveHardened(fx as any);
-        }).toThrowError(/Expected UInt31/);
+        }).toThrow(/Expected UInt31/);
     });
 
     fixtures.invalid.derivePath.forEach(fx => {
         expect(() => {
             master.derivePath(fx as any);
-        }).toThrowError(/Expected BIP32Path, got/);
+        }).toThrow(/Expected BIP32Path, got/);
     });
 
     const ZERO = Buffer.alloc(32, 0);
@@ -172,13 +172,13 @@ it('throws on wrong types', () => {
 
     expect(() => {
         BIP32.fromPrivateKey(Buffer.alloc(2), ONES);
-    }).toThrowError(
+    }).toThrow(
         /Expected property "privateKey" of type Buffer\(Length: 32\), got Buffer\(Length: 2\)/,
     );
 
     expect(() => {
         BIP32.fromPrivateKey(ZERO, ONES);
-    }).toThrowError(/Private key not in range \[1, n\)/);
+    }).toThrow(/Private key not in range \[1, n\)/);
 });
 
 it('works when private key has leading zeros', () => {
@@ -201,7 +201,7 @@ it('fromSeed', () => {
     fixtures.invalid.fromSeed.forEach(f => {
         expect(() => {
             BIP32.fromSeed(Buffer.from(f.seed, 'hex'));
-        }).toThrowError(new RegExp(f.exception));
+        }).toThrow(new RegExp(f.exception));
     });
 });
 
diff --git a/packages/utxo-lib/tests/bufferutils.test.ts b/packages/utxo-lib/tests/bufferutils.test.ts
index 7492ad32a09..ff5bbb494a0 100644
--- a/packages/utxo-lib/tests/bufferutils.test.ts
+++ b/packages/utxo-lib/tests/bufferutils.test.ts
@@ -68,7 +68,7 @@ describe('bufferutils', () => {
 
                 expect(() => {
                     bufferutils.readUInt64LE(buffer, 0);
-                }).toThrowError(new RegExp(f.exception));
+                }).toThrow(new RegExp(f.exception));
             });
         });
     });
@@ -90,14 +90,16 @@ describe('bufferutils', () => {
 
                 expect(() => {
                     bufferutils.readVarInt(buffer, 0);
-                }).toThrowError(new RegExp(f.exception));
+                }).toThrow(new RegExp(f.exception));
             });
         });
     });
 
     // TODO: not-used
+    // eslint-disable-next-line jest/no-commented-out-tests
     // describe('varIntBuffer', () => {
     //     fixtures.valid.forEach(f => {
+    // eslint-disable-next-line jest/no-commented-out-tests
     //         it(`encodes ${f.dec} correctly`, () => {
     //             const buffer = bufferutils.varIntBuffer(f.dec);
 
@@ -145,7 +147,7 @@ describe('bufferutils', () => {
 
                 expect(() => {
                     bufferutils.writeUInt64LE(buffer, f.dec, 0);
-                }).toThrowError(new RegExp(f.exception));
+                }).toThrow(new RegExp(f.exception));
             });
         });
     });
@@ -166,7 +168,7 @@ describe('bufferutils', () => {
 
                 expect(() => {
                     bufferutils.writeVarInt(buffer, f.dec, 0);
-                }).toThrowError(new RegExp(f.exception));
+                }).toThrow(new RegExp(f.exception));
             });
         });
     });
diff --git a/packages/utxo-lib/tests/coinselect/bnb.test.ts b/packages/utxo-lib/tests/coinselect/branchAndBound.test.ts
similarity index 75%
rename from packages/utxo-lib/tests/coinselect/bnb.test.ts
rename to packages/utxo-lib/tests/coinselect/branchAndBound.test.ts
index c9dc1285821..030e5783858 100644
--- a/packages/utxo-lib/tests/coinselect/bnb.test.ts
+++ b/packages/utxo-lib/tests/coinselect/branchAndBound.test.ts
@@ -1,4 +1,4 @@
-import { bnb } from '../../src/coinselect/inputs/bnb';
+import { branchAndBound } from '../../src/coinselect/inputs/branchAndBound';
 import fixtures from '../__fixtures__/coinselect/bnb';
 import * as utils from './test.utils';
 import { CoinSelectOptions } from '../../src/types';
@@ -14,11 +14,11 @@ describe('coinselect: branchAndBound (bnb)', () => {
                 dustThreshold: f.dustThreshold,
             } as CoinSelectOptions;
 
-            const actual = bnb(inputs, outputs, f.feeRate, options);
+            const actual = branchAndBound(inputs, outputs, f.feeRate, options);
             expect(utils.serialize(actual)).toEqual(expected);
 
             if (actual.inputs) {
-                const feedback = bnb(actual.inputs, actual.outputs, f.feeRate, options);
+                const feedback = branchAndBound(actual.inputs, actual.outputs, f.feeRate, options);
                 expect(utils.serialize(feedback)).toEqual(expected);
             }
         });
diff --git a/packages/utxo-lib/tests/coinselect/coinselect.test.ts b/packages/utxo-lib/tests/coinselect/coinselect.test.ts
index 811d1dd0600..fa6796a97b3 100644
--- a/packages/utxo-lib/tests/coinselect/coinselect.test.ts
+++ b/packages/utxo-lib/tests/coinselect/coinselect.test.ts
@@ -1,10 +1,10 @@
 import { coinselect } from '../../src/coinselect';
-import fixtures from '../__fixtures__/coinselect/coinselect-index';
-import fixturesErrors from '../__fixtures__/coinselect/coinselect-errors';
+import { coinselectIndexFixture } from '../__fixtures__/coinselect/coinselect-index';
+import { coinselectFixturesErrors } from '../__fixtures__/coinselect/coinselect-errors';
 import * as utils from './test.utils';
 
 describe('coinselect errors', () => {
-    fixturesErrors.forEach(f => {
+    coinselectFixturesErrors.forEach(f => {
         it(f.description, () => {
             const inputs = utils.expand(f.inputs, true);
             const outputs = utils.expand(f.outputs, false);
@@ -17,14 +17,15 @@ describe('coinselect errors', () => {
                     inputs,
                     outputs,
                     sendMaxOutputIndex: -1,
+                    sortingStrategy: 'bip69',
                 }),
-            ).toThrowError(f.expected);
+            ).toThrow(f.expected);
         });
     });
 });
 
 describe('coinselect index', () => {
-    fixtures.forEach(f => {
+    coinselectIndexFixture.forEach(f => {
         it(f.description, () => {
             const inputs = utils.expand(f.inputs as any, true);
             const outputs = utils.expand(f.outputs as any, false);
@@ -37,6 +38,7 @@ describe('coinselect index', () => {
                 inputs,
                 outputs,
                 sendMaxOutputIndex: -1,
+                sortingStrategy: 'bip69',
             });
 
             expect(utils.serialize(actual)).toEqual(expected);
@@ -48,6 +50,7 @@ describe('coinselect index', () => {
                     inputs: actual.inputs,
                     outputs: actual.outputs,
                     sendMaxOutputIndex: -1,
+                    sortingStrategy: 'bip69',
                 });
                 expect(utils.serialize(feedback)).toEqual(expected);
             }
diff --git a/packages/utxo-lib/tests/coinselect/coinselectUtils.test.ts b/packages/utxo-lib/tests/coinselect/coinselectUtils.test.ts
index 12083a3ed14..a43a1827e35 100644
--- a/packages/utxo-lib/tests/coinselect/coinselectUtils.test.ts
+++ b/packages/utxo-lib/tests/coinselect/coinselectUtils.test.ts
@@ -1,4 +1,5 @@
 import BN from 'bn.js';
+
 import { bignumberOrNaN, getFee, getDustAmount } from '../../src/coinselect/coinselectUtils';
 
 describe('coinselectUtils', () => {
diff --git a/packages/utxo-lib/tests/coinselect/test.utils.ts b/packages/utxo-lib/tests/coinselect/test.utils.ts
index 4f692ecbfd1..a6081eedce6 100644
--- a/packages/utxo-lib/tests/coinselect/test.utils.ts
+++ b/packages/utxo-lib/tests/coinselect/test.utils.ts
@@ -1,4 +1,5 @@
 import BN from 'bn.js';
+
 import { INPUT_SCRIPT_LENGTH, OUTPUT_SCRIPT_LENGTH } from '../../src/coinselect/coinselectUtils';
 
 function addScriptLength(values: any[], scriptLength: number) {
diff --git a/packages/utxo-lib/tests/compose.request.test.ts b/packages/utxo-lib/tests/compose.request.test.ts
index 2814b01a7b4..c281767f6c1 100644
--- a/packages/utxo-lib/tests/compose.request.test.ts
+++ b/packages/utxo-lib/tests/compose.request.test.ts
@@ -20,6 +20,7 @@ const REQUEST: ComposeRequest<any, any, any> = {
     network: NETWORKS.bitcoin,
     changeAddress: { address: '1CrwjoKxvdbAnPcGzYjpvZ4no4S71neKXT' },
     dustThreshold: 526,
+    sortingStrategy: 'bip69',
 };
 
 describe('validateAndParseRequest', () => {
diff --git a/packages/utxo-lib/tests/compose.test.ts b/packages/utxo-lib/tests/compose.test.ts
index e6682ac2b41..e89209b5431 100644
--- a/packages/utxo-lib/tests/compose.test.ts
+++ b/packages/utxo-lib/tests/compose.test.ts
@@ -1,26 +1,43 @@
-import { composeTx } from '../src';
-import * as NETWORKS from '../src/networks';
+import { getRandomInt } from '@trezor/utils';
 
+import { composeTx } from '../src/compose';
+import * as NETWORKS from '../src/networks';
 import { verifyTxBytes } from './compose.utils';
-import fixtures from './__fixtures__/compose';
-import fixturesCrossCheck from './__fixtures__/compose.crosscheck';
+import { composeTxFixture } from './__fixtures__/compose';
+import { fixturesCrossCheck } from './__fixtures__/compose.crosscheck';
+
+jest.mock('@trezor/utils', () => ({
+    ...jest.requireActual('@trezor/utils'),
+    getRandomInt: jest.fn(),
+}));
 
-// keyof typeof NETWORKS;
-const getNetwork = (name?: string) =>
-    // @ts-expect-error expression of type string can't be used to index type
-    typeof name === 'string' && NETWORKS[name] ? NETWORKS[name] : NETWORKS.bitcoin;
+const mockRandomInt = (randomIntSequence: number[] | undefined) => {
+    let fakeRandomIndex = 0;
+    (getRandomInt as jest.Mock).mockImplementation(() => {
+        if (randomIntSequence === undefined || fakeRandomIndex >= randomIntSequence.length) {
+            throw new Error(`Not enough random numbers provided (i: ${fakeRandomIndex})`);
+        }
 
-describe('composeTx', () => {
-    fixtures.forEach(f => {
-        const network = getNetwork(f.request.network);
+        return randomIntSequence?.[fakeRandomIndex++];
+    });
+};
+
+describe(composeTx.name, () => {
+    composeTxFixture.forEach(f => {
+        const network = f.request.network ?? NETWORKS.bitcoin;
         const request = { ...f.request, network };
-        const result: any = { ...f.result };
+        const result = { ...f.result };
+
         it(f.description, () => {
-            const tx = composeTx(request as any);
+            mockRandomInt(f.randomIntSequence);
+
+            const tx = composeTx(request);
             expect(tx).toEqual(result);
 
-            if (tx.type === 'final') {
-                verifyTxBytes(tx, f.request.txType as any, network);
+            expect(f.request.txType).not.toEqual('p2wsh');
+
+            if (tx.type === 'final' && f.request.txType !== 'p2wsh') {
+                verifyTxBytes(tx, f.request.txType, network);
             }
         });
     });
@@ -35,6 +52,7 @@ describe('composeTx addresses cross-check', () => {
         p2wpkh: 'bc1qafk4yhqvj4wep57m62dgrmutldusqde8adh20d',
         p2wsh: 'bc1q6rgl33d3s9dugudw7n68yrryajkr3ha9q8q24j20zs62se4q9tsqdy0t2q',
     };
+
     const amounts = {
         p2pkh: '102300',
         p2sh: '101500',
@@ -42,11 +60,13 @@ describe('composeTx addresses cross-check', () => {
         p2wpkh: '101500',
         p2wsh: '101500',
     };
+
     const addrKeys = Object.keys(addrTypes) as Array<keyof typeof addrTypes>;
+
     fixturesCrossCheck.forEach(f => {
         txTypes.forEach(txType => {
             // skip test for each addressType if there is nothing to replace (example: 7 inputs test)
-            const offset = f.request.outputs.find(o => o.address === 'replace-me')
+            const offset = f.request.outputs.find(o => 'address' in o && o.address === 'replace-me')
                 ? addrKeys.length
                 : 1;
 
@@ -76,10 +96,14 @@ describe('composeTx addresses cross-check', () => {
 
                             return o;
                         }),
-                    } as any);
+                    });
 
                     if (tx.type !== 'final') throw new Error('Not final transaction!');
 
+                    if (f.result[key] === undefined) {
+                        throw new Error(`Assert key ${key} not found in fixtures`);
+                    }
+
                     expect(tx).toMatchObject(f.result[key]);
 
                     expect(tx.inputs.length).toEqual(f.request.utxos.length);
diff --git a/packages/utxo-lib/tests/payments.test.ts b/packages/utxo-lib/tests/payments.test.ts
index fa6dde97ff6..4122328bf22 100644
--- a/packages/utxo-lib/tests/payments.test.ts
+++ b/packages/utxo-lib/tests/payments.test.ts
@@ -20,7 +20,6 @@ import * as utils from './payments.utils';
 ).forEach(p => {
     describe(p, () => {
         const fn: PaymentCreator = PAYMENTS[p];
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
         const { fixtures } = require(`./__fixtures__/payments/${p}`);
 
         fixtures.valid.forEach((f: any) => {
diff --git a/packages/utxo-lib/tests/script.test.ts b/packages/utxo-lib/tests/script.test.ts
index 81255c8b0e0..e264d7a0855 100644
--- a/packages/utxo-lib/tests/script.test.ts
+++ b/packages/utxo-lib/tests/script.test.ts
@@ -1,10 +1,9 @@
-import * as bscript from '../src/script';
+import minimalData from 'minimaldata';
 
+import * as bscript from '../src/script';
 import { fixtures } from './__fixtures__/script';
 import { templates } from './__fixtures__/templates';
 
-import minimalData from 'minimaldata';
-
 describe('script', () => {
     // TODO
     describe('isCanonicalPubKey', () => {
@@ -12,12 +11,14 @@ describe('script', () => {
             // @ts-expect-error
             expect(bscript.isCanonicalPubKey(0)).toBe(false);
         });
+        // eslint-disable-next-line jest/no-commented-out-tests
         // it('rejects smaller than 33', () => {
         //     for (let i = 0; i < 33; i++) {
         //         expect(bscript.isCanonicalPubKey(Buffer.from('', i))).toBe(false);
         //     }
         // });
     });
+    // eslint-disable-next-line jest/no-commented-out-tests
     // describe.skip('isCanonicalSignature', () => {});
 
     describe('fromASM/toASM', () => {
diff --git a/packages/utxo-lib/tests/txweight.test.ts b/packages/utxo-lib/tests/txweight.test.ts
index 7935d32370c..6be977a6e7b 100644
--- a/packages/utxo-lib/tests/txweight.test.ts
+++ b/packages/utxo-lib/tests/txweight.test.ts
@@ -37,7 +37,9 @@ describe('TxWeightCalculator', () => {
         c.addOutputByKey('p2tr');
         expect(c.getTotal()).toEqual(4 * 94 + 68);
     });
+
     // multisig is not implemented
+    // eslint-disable-next-line jest/no-commented-out-tests
     // it('legacy multisig', () => {
     //     const c = new TxWeightCalculator();
     //     c.addInput({
@@ -51,6 +53,7 @@ describe('TxWeightCalculator', () => {
     //     expect(c.getTotal()).toEqual(4 * 341);
     // });
 
+    // eslint-disable-next-line jest/no-commented-out-tests
     // it('segwit multisig', () => {
     //     const c = new TxWeightCalculator();
     //     c.addInput({
diff --git a/packages/utxo-lib/tsconfig.json b/packages/utxo-lib/tsconfig.json
index a8cca951753..72cf2ecc55c 100644
--- a/packages/utxo-lib/tsconfig.json
+++ b/packages/utxo-lib/tsconfig.json
@@ -2,5 +2,8 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "./libDev" },
     "include": ["."],
-    "references": [{ "path": "../utils" }]
+    "references": [
+        { "path": "../utils" },
+        { "path": "../eslint" }
+    ]
 }
diff --git a/packages/utxo-lib/tsconfig.lib.json b/packages/utxo-lib/tsconfig.lib.json
index 8a0c4265588..7cb2b374091 100644
--- a/packages/utxo-lib/tsconfig.lib.json
+++ b/packages/utxo-lib/tsconfig.lib.json
@@ -7,6 +7,9 @@
     "references": [
         {
             "path": "../utils"
+        },
+        {
+            "path": "../eslint"
         }
     ]
 }
diff --git a/scripts/ci/connect-test-matrix-generator.js b/scripts/ci/connect-test-matrix-generator.js
index f1d8a0f4ecc..0e00096d930 100644
--- a/scripts/ci/connect-test-matrix-generator.js
+++ b/scripts/ci/connect-test-matrix-generator.js
@@ -1,140 +1,227 @@
 const process = require('process');
 
+const DEBUG = false;
+
+const log = (...args) => {
+    if (DEBUG) {
+        return console.log(...args);
+    }
+};
+
 const groups = {
     api: {
         name: 'api',
         pattern:
-            'init authorizeCoinjoin cancelCoinjoinAuthorization passphrase unlockPath setBusy override checkFirmwareAuthenticity keepSession cancel.test',
-        methods: '',
+            'init authorizeCoinjoin cancelCoinjoinAuthorization passphrase unlockPath setBusy checkFirmwareAuthenticity keepSession cancel.test info.test',
+        includeFilter: '',
+    },
+    // temporarily created group for flaky test - to spend less time on reruns and to make test result in CI more readable without investigating long logs
+    apiFlaky: {
+        name: 'api-flaky',
+        pattern: 'override',
     },
     management: {
         name: 'management',
         pattern: 'methods',
-        methods: 'applySettings,applyFlags,getFeatures,getFirmwareHash,changeLanguage',
+        includeFilter:
+            'applySettings,applyFlags,getFeatures,getFirmwareHash,changeLanguage,loadDevice',
     },
     btcSign: {
         name: 'btc-sign',
         pattern: 'methods',
-        methods: 'signTransaction',
+        includeFilter: 'signTransaction',
     },
     btcOthers: {
         name: 'btc-others',
         pattern: 'methods',
-        methods:
+        includeFilter:
             'getAccountInfo,getAccountDescriptor,getAddress,getPublicKey,signMessage,verifyMessage,composeTransaction,getOwnershipId,getOwnershipProof',
     },
     stellar: {
         name: 'stellar',
         pattern: 'methods',
-        methods: 'stellarGetAddress,stellarSignTransaction',
+        includeFilter: 'stellarGetAddress,stellarSignTransaction',
     },
     cardano: {
         name: 'cardano',
         pattern: 'methods',
-        methods:
+        includeFilter:
             'cardanoGetAddress,cardanoGetNativeScriptHash,cardanoGetPublicKey,cardanoSignTransaction',
     },
     eos: {
         name: 'eos',
         pattern: 'methods',
-        methods: 'eosGetPublicKey,eosSignTransaction',
+        includeFilter: 'eosGetPublicKey,eosSignTransaction',
     },
     ethereum: {
         name: 'ethereum',
         pattern: 'methods',
-        methods:
+        includeFilter:
             'ethereumGetAddress,ethereumGetPublicKey,ethereumSignMessage,ethereumSignTransaction,ethereumVerifyMessage,ethereumSignTypedData',
     },
     nem: {
         name: 'nem',
         pattern: 'methods',
-        methods: 'nemGetAddress,nemSignTransaction',
+        includeFilter: 'nemGetAddress,nemSignTransaction',
     },
     ripple: {
         name: 'ripple',
         pattern: 'methods',
-        methods: 'rippleGetAddress,rippleSignTransaction',
+        includeFilter: 'rippleGetAddress,rippleSignTransaction',
     },
     tezos: {
         name: 'tezos',
         pattern: 'methods',
-        methods: 'tezosGetAddress,tezosGetPublicKey,tezosSignTransaction',
+        includeFilter: 'tezosGetAddress,tezosGetPublicKey,tezosSignTransaction',
     },
     binance: {
         name: 'binance',
         pattern: 'methods',
-        methods: 'binanceGetAddress,binanceGetPublicKey,binanceSignTransaction',
+        includeFilter: 'binanceGetAddress,binanceGetPublicKey,binanceSignTransaction',
     },
 };
 
-const daily = {
-    firmwares: ['2-latest'],
-    tests: [...Object.values(groups)],
-};
+const firmwares1 = ['1.9.0', '1-latest', '1-main'];
+const firmwares2 = ['2.3.0', '2-latest', '2-main'];
 
-const legacyFirmware = {
-    firmwares: ['2.3.0'],
-    tests: daily.tests
-        // Cardano supports >=2.6.0
-        .filter(test => test.name !== 'cardano'),
-};
+const inputs = [
+    {
+        key: 'model',
+        value: ['T1B1', 'T2T1', 'T2B1', 'T3B1', 'T3T1', 'T3W1'],
+    },
 
-const canaryFirmware = {
-    firmwares: ['2-main'],
-    tests: daily.tests,
+    {
+        key: 'firmware',
+        value: ({ model }) => {
+            return model === 'T1B1' ? firmwares1 : firmwares2;
+        },
+    },
+    {
+        key: 'transport',
+        value: ['Bridge', 'NodeBridge'],
+    },
+    {
+        key: 'groups',
+        value: Object.values(groups),
+    },
+    {
+        key: 'env',
+        value: ['node', 'web'],
+    },
+    {
+        key: 'cache_tx',
+        value: ['true', 'false'],
+    },
+    {
+        key: 'key',
+        value: [' '],
+    },
+];
+
+// Get command-line arguments, excluding 'node' and the script name
+const args = process.argv.slice(2);
+
+// Initialize an object to store the parsed arguments
+const parsedArgs = {
+    key: ' ',
 };
 
-const otherDevices = {
-    firmwares: ['2-latest'],
-    models: ['T2B1', 'T3T1'],
-    tests: [
-        ...Object.values(groups).filter(
-            // management, btc-others are specified below
-            // nem, eos are not supported anymore
-            g => ['management', 'btc-others', 'nem', 'eos'].includes(g.name) === false,
-        ),
-        {
-            ...groups.management,
-            methods: groups.management.methods
-                .split(',')
-                // getFeatures test is not abstract enough to serve all models
-                .filter(m => m !== 'getFeatures')
-                .join(','),
-        },
-        {
-            ...groups.btcOthers,
-            methods: groups.btcOthers.methods
-                .split(',')
-                // getAddress (decred) does not work for model R
-                .filter(m => m !== 'getAddress')
-                .join(','),
-        },
-    ],
+// Iterate over the arguments
+args.forEach(arg => {
+    // Split each argument by '=' to separate the key and value
+    const [key, value] = arg.split('=');
+
+    // Remove the leading '--' from the key
+    const argName = key.replace(/^--/, '');
+
+    // Check if the value contains commas to create an array
+    parsedArgs[argName] = value.includes(',') ? value.split(',') : value;
+});
+
+log('parsedArgs', parsedArgs);
+
+const validateArgs = () => {
+    const requiredArgs = ['model', 'firmware', 'env', 'groups', 'cache_tx', 'transport'];
+
+    requiredArgs.forEach(arg => {
+        if (!parsedArgs[arg]) {
+            throw new Error(`Missing required argument: ${arg}`);
+        }
+    });
 };
 
-const prepareTest = ({ firmwares, tests, models }) => {
-    const withFirmwares = tests.flatMap(test => firmwares.map(firmware => ({ firmware, ...test })));
+validateArgs();
 
-    if (models && models.length > 0) {
-        return withFirmwares.flatMap(test => models.map(model => ({ model, ...test })));
-    } else {
-        return withFirmwares;
-    }
+log('validated args', parsedArgs);
+
+/**
+ a method that takes inputs and creates all combinations of results like this:
+ {model: T1B1, firmware: 1.9.0, transport: 'Bridge'... }
+ {model: T1B1, firmware: 1.9.0, transport: 'NodeBridge'... }
+ {model: T1B1, firmware: 1-latest, transport: 'Bridge'... }
+ {model: T1B1, firmware: 1-latest, transport: 'NodeBridge'... }
+ */
+const createCartesian = inputs => {
+    const keys = inputs.map(m => m.key);
+    const values = inputs.map(m => m.value);
+
+    const results = [];
+    const create = (index, current) => {
+        if (index === keys.length) {
+            results.push(current);
+            return;
+        }
+
+        const key = keys[index];
+        const value = typeof values[index] === 'function' ? values[index](current) : values[index];
+
+        for (let i = 0; i < value.length; i++) {
+            create(index + 1, {
+                ...current,
+                [key]: value[i],
+            });
+        }
+    };
+
+    create(0, {});
+    return results;
 };
 
-const testData = {
-    daily,
-    legacyFirmware,
-    canaryFirmware,
-    otherDevices,
+const cartesian = createCartesian(inputs);
+
+log('cartesian length', cartesian.length);
+
+/**
+ * filter cartesian by passed arguments
+ */
+const filterCartesianResultByArgs = () => {
+    const getValue = input => {
+        if (typeof input === 'object') {
+            return input.name;
+        }
+        return input;
+    };
+
+    return cartesian.filter(m => {
+        return Object.keys(m).every(key => {
+            const filterBy = parsedArgs[key];
+            if (filterBy === 'all') return true;
+            if (Array.isArray(filterBy)) {
+                return filterBy.includes(getValue(m[key]));
+            }
+            return getValue(m[key]) === filterBy;
+        });
+    });
 };
 
-const args = process.argv.slice(2);
-const [tests] = args;
-const json = prepareTest(testData[tests]);
-
-process.stdout.write(
-    JSON.stringify({
-        include: json,
-    }),
-);
+const filtered = filterCartesianResultByArgs();
+
+log('filtered.length', filtered.length);
+
+if (!DEBUG) {
+    process.stdout.write(
+        JSON.stringify({
+            include: filtered,
+        }),
+    );
+}
diff --git a/scripts/ci/list-missing-dependencies.sh b/scripts/ci/list-missing-dependencies.sh
index e5eef0c1f96..09d8e979a7a 100755
--- a/scripts/ci/list-missing-dependencies.sh
+++ b/scripts/ci/list-missing-dependencies.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # List dependencies missing from the domain lists.
 
-domains=("common" "connect" "mission" "mobile" "qa" "trends" "usability")
+domains=("common" "connect" "foundation" "mobile" "qa" "trends" "usability")
 
 dependencies_in_lists=()
 dependencies_missing_from_lists=()
@@ -42,7 +42,7 @@ for installed_package in "${all_packages_array[@]}"; do
             break
         fi
     done
-    
+
     if [[ "$found" == false ]]; then
         dependencies_missing_from_lists+=("$installed_package")
     fi
@@ -57,7 +57,7 @@ for listed_package in "${dependencies_in_lists[@]}"; do
             break
         fi
     done
-    
+
     if [[ "$found" == false ]]; then
         dependencies_listed_but_unused+=("$listed_package")
     fi
@@ -81,4 +81,4 @@ else
     fi
 
     exit 1  # Exit with a non-zero status code to indicate failure
-fi
\ No newline at end of file
+fi
diff --git a/scripts/eslint.config.mjs b/scripts/eslint.config.mjs
new file mode 100644
index 00000000000..e20beb6d4fb
--- /dev/null
+++ b/scripts/eslint.config.mjs
@@ -0,0 +1,11 @@
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'no-console': 'off',
+            '@typescript-eslint/no-shadow': 'off', // Todo: shall be fixed
+        },
+    },
+];
diff --git a/scripts/list-outdated-dependencies/common-dependencies.txt b/scripts/list-outdated-dependencies/common-dependencies.txt
index 6394b39d7e8..2f051611849 100644
--- a/scripts/list-outdated-dependencies/common-dependencies.txt
+++ b/scripts/list-outdated-dependencies/common-dependencies.txt
@@ -28,8 +28,6 @@
 @types/tar
 @types/webpack-bundle-analyzer
 @types/webpack-plugin-serve
-@typescript-eslint/eslint-plugin
-@typescript-eslint/parser
 babel-jest
 babel-loader
 bignumber.js
@@ -40,21 +38,12 @@ copy-webpack-plugin
 cross-fetch
 depcheck
 dotenv
-eslint
-eslint-plugin-chai-friendly
-eslint-plugin-cypress
-eslint-plugin-import
-eslint-plugin-jest
-eslint-plugin-jsx-a11y
-eslint-plugin-local-rules
-eslint-plugin-mdx
-eslint-plugin-react
-eslint-plugin-react-hooks
 escape-string-regexp
 fake-indexeddb
 file-saver
 fs-extra
 glob
+globals
 history
 html-webpack-plugin
 immer
@@ -64,11 +53,11 @@ jest-environment-jsdom
 jest-watch-typeahead
 jsdom
 minimatch
+node-fetch
 nx
 octokit
 patch-package
 prettier
-proxy-memoize
 raw-loader
 react
 react-dom
@@ -88,6 +77,7 @@ redux-logger
 redux-mock-store
 redux-thunk
 rimraf
+reselect
 sort-package-json
 tar
 ts-mixer
@@ -106,4 +96,4 @@ webpack-merge
 webpack-nano
 webpack-plugin-serve
 worker-loader
-yargs
\ No newline at end of file
+yargs
diff --git a/scripts/list-outdated-dependencies/connect-dependencies.txt b/scripts/list-outdated-dependencies/connect-dependencies.txt
index 0d8ccbfbd8c..2b642fb6543 100644
--- a/scripts/list-outdated-dependencies/connect-dependencies.txt
+++ b/scripts/list-outdated-dependencies/connect-dependencies.txt
@@ -93,4 +93,6 @@ wait-on
 @jest/types
 jest-extended
 jest-environment-node
-scroll-into-view-if-needed
\ No newline at end of file
+scroll-into-view-if-needed
+@types/bn.js
+@types/events
\ No newline at end of file
diff --git a/scripts/list-outdated-dependencies/mission-dependencies.txt b/scripts/list-outdated-dependencies/foundation-dependencies.txt
similarity index 70%
rename from scripts/list-outdated-dependencies/mission-dependencies.txt
rename to scripts/list-outdated-dependencies/foundation-dependencies.txt
index 4f2b1eb90ad..bd675ad38e6 100644
--- a/scripts/list-outdated-dependencies/mission-dependencies.txt
+++ b/scripts/list-outdated-dependencies/foundation-dependencies.txt
@@ -17,7 +17,6 @@ minimaldata
 n64
 @types/wif
 wif
-@types/uuid
 tiny-secp256k1
 uuid
 
@@ -46,3 +45,16 @@ express
 # STORAGE
 idb
 broadcast-channel
+
+# ESLINT
+@eslint/js
+eslint
+typescript-eslint
+eslint-plugin-chai-friendly
+eslint-plugin-import
+eslint-plugin-jest
+eslint-plugin-jsx-a11y
+eslint-plugin-local-rules
+eslint-plugin-mdx
+eslint-plugin-react-hooks
+eslint-plugin-react
diff --git a/scripts/list-outdated-dependencies/list-outdated-dependencies.sh b/scripts/list-outdated-dependencies/list-outdated-dependencies.sh
index ea75614c9cf..6820833356f 100755
--- a/scripts/list-outdated-dependencies/list-outdated-dependencies.sh
+++ b/scripts/list-outdated-dependencies/list-outdated-dependencies.sh
@@ -2,7 +2,7 @@
 
 script_directory="$(dirname "${BASH_SOURCE[0]}")"
 
-domains=("common" "connect" "mission" "mobile" "qa" "trends" "usability")
+domains=("common" "connect" "foundation" "mobile" "qa" "trends" "usability")
 valid_arguments_hint="Valid values are: ${domains[*]}."
 
 # Check if an argument was provided
@@ -33,4 +33,4 @@ if ! contains "$1" "${domains[@]}"; then
 fi
 
 # Run yarn outdated on target dependencies
-tr '\n' ' ' < "$script_directory/$1-dependencies.txt" | xargs yarn outdated
\ No newline at end of file
+tr '\n' ' ' < "$script_directory/$1-dependencies.txt" | xargs yarn outdated
diff --git a/scripts/list-outdated-dependencies/mobile-dependencies.txt b/scripts/list-outdated-dependencies/mobile-dependencies.txt
index 6ba394ced94..fac89bec61f 100644
--- a/scripts/list-outdated-dependencies/mobile-dependencies.txt
+++ b/scripts/list-outdated-dependencies/mobile-dependencies.txt
@@ -48,6 +48,7 @@ expo-secure-store
 expo-splash-screen
 expo-status-bar
 expo-system-ui
+expo-updates
 jotai
 lottie-react-native
 react-native-gesture-handler
@@ -67,4 +68,6 @@ yup
 metro
 metro-react-native-babel-preset
 jest-expo
-intl-pluralrules
\ No newline at end of file
+intl-pluralrules
+@gorhom/bottom-sheet
+fantasticon
\ No newline at end of file
diff --git a/scripts/list-outdated-dependencies/qa-dependencies.txt b/scripts/list-outdated-dependencies/qa-dependencies.txt
index 487ca5252db..8e6e31a9570 100644
--- a/scripts/list-outdated-dependencies/qa-dependencies.txt
+++ b/scripts/list-outdated-dependencies/qa-dependencies.txt
@@ -7,4 +7,5 @@ cypress-file-upload
 cypress-image-snapshot
 cypress-real-events
 @currents/playwright
-@types/cypress-image-snapshot
\ No newline at end of file
+@types/cypress-image-snapshot
+eslint-plugin-cypress
\ No newline at end of file
diff --git a/scripts/list-outdated-dependencies/usability-dependencies.txt b/scripts/list-outdated-dependencies/usability-dependencies.txt
index 2305e0a649b..ed3ce447ce6 100644
--- a/scripts/list-outdated-dependencies/usability-dependencies.txt
+++ b/scripts/list-outdated-dependencies/usability-dependencies.txt
@@ -9,6 +9,7 @@
 @storybook/client-api
 @storybook/react
 @storybook/react-webpack5
+@storybook/theming
 @types/qrcode.react
 @types/react-date-range
 @types/react-qr-reader
@@ -51,4 +52,4 @@ polished
 svgo
 sharp
 @types/pdfmake
-pdfmake
\ No newline at end of file
+pdfmake
diff --git a/scripts/package-template/package.json b/scripts/package-template/package.json
index b34d4def09b..7c6488c0389 100644
--- a/scripts/package-template/package.json
+++ b/scripts/package-template/package.json
@@ -8,7 +8,6 @@
     "scripts": {
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "jest -c ../../jest.config.base.js"
     },
     "dependencies": {}
diff --git a/scripts/package.json b/scripts/package.json
index d31eac00975..5a8b037b92a 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -19,6 +19,7 @@
         "yargs": "17.7.2"
     },
     "devDependencies": {
+        "@trezor/eslint": "workspace:*",
         "@types/prettier": "^3.0.0"
     }
 }
diff --git a/scripts/replace-imports.sh b/scripts/replace-imports.sh
index 7e66968ed9c..fd66ba6cf49 100755
--- a/scripts/replace-imports.sh
+++ b/scripts/replace-imports.sh
@@ -24,14 +24,3 @@ if grep -Rl "$SEARCH_PATTERN" "$1"; then
 else
     echo "All occurrences of '@trezor/*/src' have been successfully replaced."
 fi
-
-# Patch for Typebox import issue, where TS uses an ESM import path, but our package is CommonJS
-# @sinclair/typebox/build/esm/index.mjs -> @sinclair/typebox
-
-REGEX="s/@sinclair\/typebox\/build\/esm\/index.mjs/@sinclair\/typebox/g"
-
-if [[ "$OS" == "Darwin" ]]; then
-    find "$1" -type f -exec sed -i '' -E "$REGEX" {} +
-else
-    find "$1" -type f -exec sed -i -E "$REGEX" {} +
-fi
diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json
index d08528cac2c..53bed72cc46 100644
--- a/scripts/tsconfig.json
+++ b/scripts/tsconfig.json
@@ -2,5 +2,7 @@
     "extends": "../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "include": [".", "**/*.json"],
-    "references": []
+    "references": [
+        { "path": "../packages/eslint" }
+    ]
 }
diff --git a/scripts/update-protobuf.sh b/scripts/update-protobuf.sh
index d77a91c9102..ab13831d705 100755
--- a/scripts/update-protobuf.sh
+++ b/scripts/update-protobuf.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-FROM_FW_BRANCH=$1
+# Set FROM_FW_BRANCH to the first argument or default to 'main' if no argument is provided
+FROM_FW_BRANCH=${1:-main}
 
 yarn workspace @trezor/protobuf update:protobuf "$FROM_FW_BRANCH"
 yarn workspace @trezor/protobuf update:schema
\ No newline at end of file
diff --git a/suite-common/analytics/package.json b/suite-common/analytics/package.json
index 0c758366f36..6dbfaa5a1c2 100644
--- a/suite-common/analytics/package.json
+++ b/suite-common/analytics/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-common/assets/package.json b/suite-common/assets/package.json
index 26a90313de6..67ec68f0eab 100644
--- a/suite-common/assets/package.json
+++ b/suite-common/assets/package.json
@@ -8,7 +8,6 @@
     "scripts": {
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "jest -c ../../jest.config.base.js"
     }
 }
diff --git a/suite-common/connect-init/package.json b/suite-common/connect-init/package.json
index 3cb0d53ffbb..6311e35a213 100644
--- a/suite-common/connect-init/package.json
+++ b/suite-common/connect-init/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "type-check": "yarn g:tsc --build tsconfig.json",
         "test:unit": "yarn g:jest -c ./jest.config.js",
         "test-unit:watch": "yarn g:jest -c ../../jest.config.base.js -o --watch"
diff --git a/suite-common/connect-init/src/cardanoConnectPatch.ts b/suite-common/connect-init/src/cardanoConnectPatch.ts
index bcd7e9a8886..f29f9d90321 100644
--- a/suite-common/connect-init/src/cardanoConnectPatch.ts
+++ b/suite-common/connect-init/src/cardanoConnectPatch.ts
@@ -28,8 +28,6 @@ const blacklist: ConnectKey[] = [
     'getCoinInfo',
     'dispose',
     'cancel',
-    'renderWebUSBButton',
-    'disableWebUSB',
 ];
 
 export const cardanoConnectPatch = (getEnabledNetworks: () => string[]) => {
diff --git a/suite-common/connect-init/src/connectInitThunks.ts b/suite-common/connect-init/src/connectInitThunks.ts
index 02c760d59e6..673f8ed06f0 100644
--- a/suite-common/connect-init/src/connectInitThunks.ts
+++ b/suite-common/connect-init/src/connectInitThunks.ts
@@ -9,7 +9,7 @@ import TrezorConnect, {
 import { getSynchronize } from '@trezor/utils';
 import { deviceConnectThunks } from '@suite-common/wallet-core';
 import { resolveStaticPath } from '@suite-common/suite-utils';
-import { isNative } from '@trezor/env-utils';
+import { isDesktop, isNative } from '@trezor/env-utils';
 
 import { cardanoConnectPatch } from './cardanoConnectPatch';
 
@@ -71,7 +71,6 @@ export const connectInitThunk = createThunk(
             'cardanoGetPublicKey',
             'cardanoSignTransaction',
             'changePin',
-            'checkFirmwareAuthenticity',
             'cipherKeyValue',
             'ethereumGetAddress',
             'ethereumSignTransaction',
@@ -81,7 +80,6 @@ export const connectInitThunk = createThunk(
             'getOwnershipProof',
             'getPublicKey',
             'pushTransaction',
-            'rebootToBootloader',
             'recoveryDevice',
             'resetDevice',
             'rippleGetAddress',
@@ -110,26 +108,51 @@ export const connectInitThunk = createThunk(
 
         cardanoConnectPatch(getEnabledNetworks);
 
-        // note:
-        // this way, for local development you will get http://localhost:8000/static/connect/workers/sessions-background-sharedworker.js which is still the not-shared shared-worker
-        // meaning that testing it together with connect-explorer dev build (http://localhost:8088/workers/sessions-background-sharedworker.js) will not work locally.
-        // in production however, suite and connect are served from the same domain (trezor.io, sldev.cz) so it will work as expected.
-        let sessionsBackground: string | undefined;
+        // suite-web                                               connect (explorer)                           webusb sync
+        // ======================================================  ====================                         ====================
+        // localhost:8000                                          localhost:8088                               NO
+        // https://dev.suite.sldev.cz/suite-web/develop/web/       https://dev.suite.sldev.cz/connect/develop/  YES - connect
+        // suite.trezor.io/web                                     connect.trezor.io/9(x.y)/                    YES - connect
+
+        let _sessionsBackgroundUrl: string | null = null;
+
         if (typeof window !== 'undefined' && !isNative()) {
-            sessionsBackground =
-                window.location.origin +
-                resolveStaticPath(
-                    'connect/workers/sessions-background-sharedworker.js',
-                    `${process.env.ASSET_PREFIX || ''}`,
-                );
+            if (window.location.origin.includes('localhost')) {
+                _sessionsBackgroundUrl = null;
+            } else if (window.location.origin.endsWith('dev.suite.sldev.cz')) {
+                // we are expecting accompanying connect build at specified location
+                const assetPrefixArr = (process.env.ASSET_PREFIX || '').split('/').filter(Boolean);
+                const relevantSegments = assetPrefixArr
+                    .map((segment, index) => {
+                        const first = index === 0;
+                        const last = index === assetPrefixArr.length - 1;
+                        if (segment === 'suite-web' && first) return 'connect';
+                        if (segment === 'web' && last) return null;
+
+                        return segment;
+                    })
+                    .filter(Boolean);
+
+                _sessionsBackgroundUrl = `${window.location.origin}/${relevantSegments.join('/')}/workers/sessions-background-sharedworker.js`;
+            } else {
+                _sessionsBackgroundUrl =
+                    'https://connect.trezor.io/9/workers/sessions-background-sharedworker.js';
+            }
         }
 
+        // Duplicates `getBinFilesBaseUrlThunk`, because calling any other thunk would change store.getActions() history,
+        // and it would be impossible to test this thunk in isolation (many unit tests depend on it).
+        const binFilesBaseUrl = isDesktop()
+            ? extra.selectors.selectDesktopBinDir(getState())
+            : resolveStaticPath('connect/data');
+
         try {
             await TrezorConnect.init({
                 ...connectInitSettings,
+                binFilesBaseUrl,
                 pendingTransportEvent: selectIsPendingTransportEvent(getState()),
                 transports: selectDebugSettings(getState()).transports,
-                _sessionsBackgroundUrl: sessionsBackground,
+                _sessionsBackgroundUrl,
                 // debug: true, // Enable debug logs in TrezorConnect
             });
         } catch (error) {
diff --git a/suite-common/device-authenticity/package.json b/suite-common/device-authenticity/package.json
index 4dc6daf9065..2ff57efbbd1 100644
--- a/suite-common/device-authenticity/package.json
+++ b/suite-common/device-authenticity/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ./jest.config.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
diff --git a/suite-common/fiat-services/package.json b/suite-common/fiat-services/package.json
index 1d1e879245a..5776f267966 100644
--- a/suite-common/fiat-services/package.json
+++ b/suite-common/fiat-services/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js"
diff --git a/suite-common/formatters/package.json b/suite-common/formatters/package.json
index 0b117d8da05..de35fc4b637 100644
--- a/suite-common/formatters/package.json
+++ b/suite-common/formatters/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c=../../jest.config.base.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
diff --git a/suite-common/formatters/src/formatters/prepareCryptoAmountFormatter.ts b/suite-common/formatters/src/formatters/prepareCryptoAmountFormatter.ts
index 0d1a06988e4..82eb43f1afc 100644
--- a/suite-common/formatters/src/formatters/prepareCryptoAmountFormatter.ts
+++ b/suite-common/formatters/src/formatters/prepareCryptoAmountFormatter.ts
@@ -1,8 +1,13 @@
 import { A } from '@mobily/ts-belt';
 
-import { getNetworkOptional, isNetworkSymbol, NetworkSymbol } from '@suite-common/wallet-config';
 import {
-    amountToSatoshi,
+    getNetworkOptional,
+    isNetworkSymbol,
+    NetworkSymbol,
+    networks,
+} from '@suite-common/wallet-config';
+import {
+    amountToSmallestUnit,
     formatAmount,
     redactNumericalSubstring,
 } from '@suite-common/wallet-utils';
@@ -35,22 +40,21 @@ const truncateDecimals = (value: string, maxDecimals: number, isEllipsisAppended
     return value;
 };
 
-// We cannot use networks "A.includes(networks[symbol].features, 'amount-unit')" because this flag is on many coins like ETH.
-// These coins will looks very bad in app because for example ETH have 18 numbers... So we hardcode enabled coins here.
-const COINS_WITH_SATS = ['btc', 'test'] satisfies NetworkSymbol[];
-
 const convertToUnit = (
     value: string,
     isBalance: boolean,
     config: FormatterConfig,
-    symbol?: string,
+    symbol?: NetworkSymbol,
 ) => {
     const { bitcoinAmountUnit } = config;
     const decimals = getNetworkOptional(symbol)?.decimals ?? 0;
-    const areAmountUnitsSupported = A.includes(COINS_WITH_SATS, symbol);
+
+    const areAmountUnitsSupported = symbol
+        ? A.includes(networks[symbol]?.features, 'amount-unit')
+        : undefined;
 
     if (isBalance && areAmountUnitsSupported && bitcoinAmountUnit === PROTO.AmountUnit.SATOSHI) {
-        return amountToSatoshi(value, decimals);
+        return amountToSmallestUnit(value, decimals);
     }
 
     // if it's not balance and sats units are disabled, values other than balances are in sats so we need to convert it to BTC
diff --git a/suite-common/formatters/src/formatters/prepareFiatAmountFormatter.ts b/suite-common/formatters/src/formatters/prepareFiatAmountFormatter.ts
index 24e25fcbd31..c0d15d970ce 100644
--- a/suite-common/formatters/src/formatters/prepareFiatAmountFormatter.ts
+++ b/suite-common/formatters/src/formatters/prepareFiatAmountFormatter.ts
@@ -20,7 +20,8 @@ const handleBigNumberFormatting = (
     const fiatValue = new BigNumber(value);
     const currencyForDisplay = currency ?? fiatCurrency;
 
-    if (fiatValue.gt(Number.MAX_SAFE_INTEGER)) {
+    if (fiatValue.gt(Number.MAX_VALUE)) {
+        // backup when number is too big, the formatting is different than should be for currencies
         return `${value} ${currencyForDisplay}`;
     }
 
diff --git a/suite-common/formatters/src/tests/makeFormatter.test.ts b/suite-common/formatters/src/tests/makeFormatter.test.ts
index fef3d1d47b8..de454d021fd 100644
--- a/suite-common/formatters/src/tests/makeFormatter.test.ts
+++ b/suite-common/formatters/src/tests/makeFormatter.test.ts
@@ -9,9 +9,5 @@ describe('makeFormatter', () => {
         it('handles trivial formatting', () => {
             expect(upperCaseFormatter.format('foo')).toBe('FOO');
         });
-
-        it('handles trivial formatting', () => {
-            expect(upperCaseFormatter.format('foo')).toBe('FOO');
-        });
     });
 });
diff --git a/suite-common/formatters/src/utils/convert.ts b/suite-common/formatters/src/utils/convert.ts
index 0321cd8591c..d20cca3f7f7 100644
--- a/suite-common/formatters/src/utils/convert.ts
+++ b/suite-common/formatters/src/utils/convert.ts
@@ -1,6 +1,6 @@
 import { networks, NetworkSymbol } from '@suite-common/wallet-config';
 import {
-    amountToSatoshi,
+    amountToSmallestUnit,
     formatNetworkAmount,
     fromFiatCurrency,
     toFiatCurrency,
@@ -46,5 +46,5 @@ export const convertFiatToCryptoAmount = ({
         return cryptoAmount;
     }
 
-    return amountToSatoshi(new BigNumber(cryptoAmount), decimals);
+    return amountToSmallestUnit(new BigNumber(cryptoAmount), decimals);
 };
diff --git a/suite-common/graph/package.json b/suite-common/graph/package.json
index fd538747884..664834d7dd3 100644
--- a/suite-common/graph/package.json
+++ b/suite-common/graph/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
diff --git a/suite-common/graph/src/balanceHistoryUtils.ts b/suite-common/graph/src/balanceHistoryUtils.ts
index 6944f85b9c4..1435cb5d606 100644
--- a/suite-common/graph/src/balanceHistoryUtils.ts
+++ b/suite-common/graph/src/balanceHistoryUtils.ts
@@ -134,6 +134,7 @@ const getAccountHistoryMovementItemRipple = ({
     return { main: Array.from(summaryMap.values()).sort((a, b) => a.time - b.time), tokens: {} };
 };
 
+// this can be also used for networks of Ethereum type (like ETH, POL or BNB)
 export const getAccountHistoryMovementItemETH = ({
     transactions,
     from,
@@ -230,8 +231,156 @@ export const getAccountHistoryMovementItemETH = ({
         }
 
         tx.tokens.forEach(token => {
-            // skip empty amounts and non-ERC20 tokens
-            if (token.amount === '' || token.standard !== 'ERC20') return;
+            // skip empty amounts and non-ERC20 non-BEP20 tokens
+            // BEP20 is BNB Smart Chain (BSC) token standard
+            if (token.amount === '' || (token.standard !== 'ERC20' && token.standard !== 'BEP20'))
+                return;
+
+            if (token.type === 'sent' || token.type === 'recv' || token.type === 'self') {
+                const tokenSummary: AccountHistoryMovementItem = {
+                    time: blockTime,
+                    txs: 1,
+                    received: new BigNumber(0),
+                    sent: new BigNumber(0),
+                    sentToSelf: new BigNumber(0),
+                };
+
+                const amount = new BigNumber(token.amount).div(10 ** token.decimals);
+
+                if (token.type === 'sent') {
+                    tokenSummary.sent = tokenSummary.sent.plus(amount);
+                } else if (token.type === 'recv') {
+                    tokenSummary.received = tokenSummary.received.plus(amount);
+                } else if (token.type === 'self') {
+                    tokenSummary.sentToSelf = tokenSummary.sentToSelf.plus(amount);
+                }
+
+                const tokenContractId = token.contract as TokenAddress;
+
+                if (!allTokensSummaryMap.has(tokenContractId)) {
+                    allTokensSummaryMap.set(tokenContractId, new Map());
+                }
+
+                const tokenSummaryMap = allTokensSummaryMap.get(tokenContractId)!;
+                const existingBlockSummary = tokenSummaryMap.get(blockTime);
+
+                if (existingBlockSummary) {
+                    existingBlockSummary.txs += 1;
+                    existingBlockSummary.received = existingBlockSummary.received.plus(
+                        tokenSummary.received,
+                    );
+                    existingBlockSummary.sent = existingBlockSummary.sent.plus(tokenSummary.sent);
+                    existingBlockSummary.sentToSelf = existingBlockSummary.sentToSelf.plus(
+                        tokenSummary.sentToSelf,
+                    );
+                } else {
+                    tokenSummaryMap.set(blockTime, tokenSummary);
+                }
+            }
+        });
+
+        if (summaryMap.has(blockTime)) {
+            const summary = summaryMap.get(blockTime)!;
+            summary.txs += 1;
+            summary.received = summary.received.plus(bh.received);
+            summary.sent = summary.sent.plus(bh.sent);
+            summary.sentToSelf = summary.sentToSelf.plus(bh.sentToSelf);
+        } else {
+            summaryMap.set(blockTime, bh);
+        }
+    });
+
+    const sortedTokensSummaries: Record<TokenAddress, AccountHistoryMovementItem[]> = {};
+    for (const [contract, tokenSummaryMap] of allTokensSummaryMap.entries()) {
+        const sortedTokenSummaries = Array.from(tokenSummaryMap.values()).sort(
+            (a, b) => a.time - b.time,
+        );
+        sortedTokensSummaries[contract] = sortedTokenSummaries;
+    }
+    const sortedSummaries = Array.from(summaryMap.values()).sort((a, b) => a.time - b.time);
+
+    return {
+        main: sortedSummaries,
+        tokens: sortedTokensSummaries,
+    };
+};
+
+export const getAccountHistoryMovementItemSOL = ({
+    transactions,
+    from,
+    to,
+}: GetAccountHistoryMovementItemParams): AccountHistoryMovement => {
+    const summaryMap = new Map<BlockTime, AccountHistoryMovementItem>();
+    const allTokensSummaryMap = new Map<TokenAddress, typeof summaryMap>();
+
+    transactions.forEach(tx => {
+        const { blockTime } = tx;
+
+        if (
+            !blockTime ||
+            tx.solanaSpecific === undefined ||
+            tx.type === 'failed' ||
+            tx.solanaSpecific.status !== 'confirmed'
+        ) {
+            return;
+        }
+
+        if ((from && blockTime < from) || (to && blockTime > to)) {
+            return;
+        }
+
+        const bh: AccountHistoryMovementItem = {
+            time: blockTime,
+            txs: 1,
+            received: new BigNumber(0),
+            sent: new BigNumber(0),
+            sentToSelf: new BigNumber(0),
+        };
+
+        let countSentToSelf = false;
+        const solTxData = tx.solanaSpecific;
+
+        if (tx.details.vout.length > 0) {
+            const bchainVout = tx.details.vout[0];
+            const value = new BigNumber(bchainVout.value || '0');
+
+            if (bchainVout.addresses && bchainVout.addresses.length > 0) {
+                const txAddrDesc = bchainVout.addresses[0];
+
+                if (tx.descriptor === txAddrDesc) {
+                    // Check if address is in selfAddrDesc
+                    bh.received = bh.received.plus(value);
+                }
+
+                if (tx.descriptor === txAddrDesc) {
+                    countSentToSelf = true;
+                }
+            }
+        }
+
+        for (const bchainVin of tx.details.vin) {
+            if (bchainVin.addresses && bchainVin.addresses.length > 0) {
+                const txAddrDesc = bchainVin.addresses[0];
+                if (txAddrDesc === tx.descriptor) {
+                    if (solTxData.status === 'confirmed') {
+                        const value = new BigNumber(tx.details.vout[0]?.value || '0');
+                        bh.sent = bh.sent.plus(value);
+
+                        if (countSentToSelf && txAddrDesc === tx.descriptor) {
+                            bh.sentToSelf = bh.sentToSelf.plus(value);
+                        }
+                    }
+
+                    bh.sent = bh.sent.plus(tx.fee);
+                }
+            }
+        }
+
+        tx.tokens.forEach(token => {
+            // skip empty amounts
+            if (token.amount === '') {
+                return;
+            }
 
             if (token.type === 'sent' || token.type === 'recv' || token.type === 'self') {
                 const tokenSummary: AccountHistoryMovementItem = {
@@ -320,7 +469,11 @@ export const getAccountHistoryMovementFromTransactions = ({
         case 'xrp':
             return getAccountHistoryMovementItemRipple({ transactions, from, to });
         case 'eth':
+        case 'pol':
+        case 'bnb':
             return getAccountHistoryMovementItemETH({ transactions, from, to });
+        case 'sol':
+            return getAccountHistoryMovementItemSOL({ transactions, from, to });
         default:
             coin satisfies never;
             throw new Error(`getAccountHistoryMovementItem: Unsupported network ${coin}`);
diff --git a/suite-common/graph/src/constants.ts b/suite-common/graph/src/constants.ts
index fc60edaeb20..a6dc6884648 100644
--- a/suite-common/graph/src/constants.ts
+++ b/suite-common/graph/src/constants.ts
@@ -1,13 +1,18 @@
 import { NetworkSymbol } from '@suite-common/wallet-config';
+import { isArrayMember } from '@trezor/utils';
 
 // Going over 180 will broke graph in mobile app
 export const NUMBER_OF_POINTS = 40;
 
-export const LOCAL_BALANCE_HISTORY_COINS = ['eth', 'xrp'] satisfies Array<NetworkSymbol>;
+export const LOCAL_BALANCE_HISTORY_COINS = [
+    'eth',
+    'pol',
+    'bnb',
+    'xrp',
+    'sol',
+] satisfies Array<NetworkSymbol>;
 export type LocalBalanceHistoryCoin = (typeof LOCAL_BALANCE_HISTORY_COINS)[number];
 
 export const isLocalBalanceHistoryCoin = (
     symbol: NetworkSymbol,
-): symbol is LocalBalanceHistoryCoin => {
-    return LOCAL_BALANCE_HISTORY_COINS.includes(symbol as LocalBalanceHistoryCoin);
-};
+): symbol is LocalBalanceHistoryCoin => isArrayMember(symbol, LOCAL_BALANCE_HISTORY_COINS);
diff --git a/suite-common/graph/src/graphDataFetching.ts b/suite-common/graph/src/graphDataFetching.ts
index da2bf7566a4..281e9ff4054 100644
--- a/suite-common/graph/src/graphDataFetching.ts
+++ b/suite-common/graph/src/graphDataFetching.ts
@@ -107,6 +107,7 @@ const getBalanceFromAccountInfo = ({
             // On Ripple, if we use availableBalance, we will get higher balance, IDK why.
             return accountInfo.balance;
         case 'ethereum':
+        case 'solana':
             if (contractId) {
                 const token = accountInfo.tokens?.find(t => t.contract === contractId);
 
@@ -226,9 +227,7 @@ const getAccountBalanceHistory = async ({
                     accountMovementHistory.tokens?.[t.contract as TokenAddress] ?? [],
                 ] as const,
         ),
-        A.filter(
-            ([contractId]) => !tokensFilter || tokensFilter.includes(contractId as TokenAddress),
-        ),
+        A.filter(([contractId]) => !tokensFilter || tokensFilter.includes(contractId)),
         F.toMutable,
     );
     const tokensMovementHistoryWithBalance = D.mapWithKey(
@@ -414,7 +413,7 @@ export const getMultipleAccountBalanceHistoryWithFiat = async ({
         // findOldestBalanceMovementTimestamp resulted with start date being the same as end date
         // use 1 year into past and return zeroes for the range
         if (startOfTimeFrameDate.getTime() === endOfTimeFrameDate.getTime()) {
-            let startDate = startOfTimeFrameDate;
+            const startDate = startOfTimeFrameDate;
             startDate.setDate(startDate.getHours() - 8760);
 
             return [
@@ -446,7 +445,7 @@ export const getMultipleAccountBalanceHistoryWithFiat = async ({
         coinsSet.add(getCoinKey({ coin, contractId }));
     });
 
-    let coins = Array.from(coinsSet).map(coin => {
+    const coins = Array.from(coinsSet).map(coin => {
         const [coinSymbol, contractId] = coin.split('-');
 
         return { coin: coinSymbol as NetworkSymbol, contractId: contractId as TokenAddress };
diff --git a/suite-common/icons-deprecated/README.md b/suite-common/icons-deprecated/README.md
index fc43390ec00..5cb88076ea7 100644
--- a/suite-common/icons-deprecated/README.md
+++ b/suite-common/icons-deprecated/README.md
@@ -4,7 +4,6 @@ This package contains fully-fledged icon components using the Skia engine. There
 
 -   [icons](./assets/icons) - icons used to depict the universal concepts used commonly throughout a UI
 -   [cryptoIcons](./assets/cryptoIcons) - a collection of icons representing main network coins (btc, eth, etc.)
--   [tokenIcons](./assets/cryptoIcons) - a collection of icons representing tokens (erc20, dai, link, usdt, etc.)
 -   [flags](./assets/flags) - a collection of icons representing [country flags](https://github.com/HatScripts/circle-flags/tree/gh-pages/flags)
 
 Icon components are ready to use only with React Native app now, but it is planned to be used by the web in the future as well.
diff --git a/suite-common/icons-deprecated/assets/cryptoIcons/op.svg b/suite-common/icons-deprecated/assets/cryptoIcons/op.svg
new file mode 100644
index 00000000000..2719391ea7b
--- /dev/null
+++ b/suite-common/icons-deprecated/assets/cryptoIcons/op.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 500 500">
+  <circle cx="250" cy="250" r="250" style="fill:#ff0420"/>
+  <path d="M177.1 316.4q-22.35 0-36.6-10.5c-9.4-7.1-14.1-17.3-14.1-30.4 0-2.8.3-6.1.9-10.1 1.6-9 3.9-19.8 6.9-32.5 8.5-34.4 30.5-51.6 65.9-51.6 9.6 0 18.3 1.6 25.9 4.9 7.6 3.1 13.6 7.9 18 14.3q6.6 9.45 6.6 22.5 0 3.9-.9 9.9c-1.9 11.1-4.1 22-6.8 32.5-4.4 17.1-11.9 30-22.7 38.5-10.7 8.4-25.1 12.5-43.1 12.5m2.7-27c7 0 12.9-2.1 17.8-6.2 5-4.1 8.6-10.4 10.7-19 2.9-11.8 5.1-22 6.6-30.8.5-2.6.8-5.3.8-8.1 0-11.4-5.9-17.1-17.8-17.1-7 0-13 2.1-18 6.2-4.9 4.1-8.4 10.4-10.5 19-2.3 8.4-4.5 18.6-6.8 30.8-.5 2.5-.8 5.1-.8 7.9-.1 11.6 6 17.3 18 17.3m79.5 25.2c-1.4 0-2.4-.4-3.2-1.3-.6-1-.8-2.1-.6-3.4l25.9-122c.2-1.4.9-2.5 2.1-3.4 1.1-.9 2.3-1.3 3.6-1.3H337c13.9 0 25 2.9 33.4 8.6 8.5 5.8 12.8 14.1 12.8 25 0 3.1-.4 6.4-1.1 9.8-3.1 14.4-9.4 25-19 31.9-9.4 6.9-22.3 10.3-38.7 10.3h-25.3l-8.6 41.1c-.3 1.4-.9 2.5-2.1 3.4-1.1.9-2.3 1.3-3.6 1.3zm66.4-71.7c5.3 0 9.8-1.4 13.7-4.3 4-2.9 6.6-7 7.9-12.4.4-2.1.6-4 .6-5.6 0-3.6-1.1-6.4-3.2-8.3-2.1-2-5.8-3-10.9-3h-22.5l-7.1 33.6z" style="fill:#fff"/>
+</svg>
diff --git a/suite-common/icons-deprecated/assets/flags/cz.svg b/suite-common/icons-deprecated/assets/flags/cz.svg
deleted file mode 100644
index da97767b966..00000000000
--- a/suite-common/icons-deprecated/assets/flags/cz.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg style="border-radius:50%" viewBox="0 0 512 512">
-  <mask id="prefix__a">
-    <circle cx="256" cy="256" r="256" fill="#fff"/>
-  </mask>
-  <g mask="url(#prefix__a)">
-    <path fill="#eee" d="M0 0h512v256l-265 45.2z"/>
-    <path fill="#d80027" d="M210 256h302v256H0z"/>
-    <path fill="#0052b4" d="M0 0v512l256-256z"/>
-  </g>
-</svg>
diff --git a/suite-common/icons-deprecated/assets/icons/trezorT3W1.svg b/suite-common/icons-deprecated/assets/icons/trezorT3W1.svg
new file mode 100644
index 00000000000..3fef03953eb
--- /dev/null
+++ b/suite-common/icons-deprecated/assets/icons/trezorT3W1.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 32 32">
+  <path fill="#000" fill-rule="evenodd" d="M10.096 2.106a4.6 4.6 0 0 0-.773.282c-1.26.595-2.064 1.673-2.282 3.061-.044.284-.056 2.218-.043 7.058l.018 6.666.12.607c.153.766.484 1.76.79 2.37.354.706 3.627 6.367 3.869 6.69.385.517 1.002.911 1.698 1.086.424.107 4.59.107 5.014 0 .696-.175 1.313-.569 1.698-1.086.243-.325 3.505-5.968 3.862-6.68.446-.89.766-2 .891-3.093.074-.654.075-13.153 0-13.627-.246-1.556-1.216-2.697-2.773-3.261l-.345-.125-5.707-.01c-4.641-.008-5.768.003-6.037.062m11.728 2.09c.438.208.775.535.98.954l.156.317v6.826c0 6.456-.005 6.851-.099 7.278a7.2 7.2 0 0 1-.581 1.682c-.307.615-3.605 6.324-3.734 6.466-.25.273-.38.286-2.63.27l-2.084-.016-.215-.142c-.189-.125-.425-.507-1.977-3.2-1.918-3.327-2.065-3.601-2.272-4.221-.345-1.033-.328-.601-.328-8.117V5.467l.156-.317a2.1 2.1 0 0 1 1.35-1.093c.113-.027 2.55-.044 5.561-.039l5.36.009z"/>
+</svg>
diff --git a/suite-common/icons-deprecated/assets/tokenIcons/cro.svg b/suite-common/icons-deprecated/assets/tokenIcons/cro.svg
deleted file mode 100644
index c90e17d7b5d..00000000000
--- a/suite-common/icons-deprecated/assets/tokenIcons/cro.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg fill="none" viewBox="0 0 24 24">
-  <g clip-path="url(#prefix__a)">
-    <path fill="#002D74" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12Z"/>
-    <path fill="#fff" fill-rule="evenodd" d="m18.487 15.75-6.501 3.75L5.5 15.75v-7.5l6.501-3.75 6.486 3.75v7.5ZM12 16.98l4.303-2.49-1.782-1.03L12 14.92l-2.52-1.46v-2.905l2.505-1.46 2.52 1.46 1.798-1.045L12 7.02 7.681 9.51v4.98L12 16.98Z" clip-rule="evenodd"/>
-  </g>
-  <defs>
-    <clipPath id="prefix__a">
-      <path fill="#fff" d="M0 0h24v24H0z"/>
-    </clipPath>
-  </defs>
-</svg>
diff --git a/suite-common/icons-deprecated/assets/tokenIcons/dai.svg b/suite-common/icons-deprecated/assets/tokenIcons/dai.svg
deleted file mode 100644
index 3e479ab4943..00000000000
--- a/suite-common/icons-deprecated/assets/tokenIcons/dai.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg fill="none" viewBox="0 0 24 24">
-  <g clip-path="url(#prefix__a)">
-    <path fill="#F5AC37" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12Z"/>
-    <path fill="#FEFEFD" d="M16.236 12.756c.087 0 .128 0 .134-.114.033-.414.033-.83 0-1.244 0-.081-.04-.114-.127-.114H8.145c-.1 0-.127.033-.127.127v1.191c0 .154 0 .154.16.154h8.058Zm-.32-2.864a.131.131 0 0 0 0-.094 2.65 2.65 0 0 0-.242-.421 3.414 3.414 0 0 0-.496-.623 1.639 1.639 0 0 0-.308-.301 4.81 4.81 0 0 0-2.007-1.017 4.992 4.992 0 0 0-1.138-.12H8.13c-.1 0-.114.04-.114.126v2.376c0 .1 0 .127.128.127h7.722s.067-.013.08-.053h-.031Zm0 4.256a1.566 1.566 0 0 0-.343 0H8.152c-.1 0-.134 0-.134.134v2.322c0 .107 0 .134.134.134h3.426c.164.013.328.001.489-.033a5.104 5.104 0 0 0 1.452-.321c.17-.059.334-.136.488-.228h.047a4.347 4.347 0 0 0 1.867-1.88s.047-.102-.005-.128Zm-9.243 3.795v-3.701c0-.087 0-.1-.107-.1H5.114c-.08 0-.114 0-.114-.107v-1.272h1.553c.086 0 .12 0 .12-.114v-1.258c0-.08 0-.1-.107-.1H5.114c-.08 0-.114 0-.114-.107v-1.178c0-.073 0-.093.107-.093h1.439c.1 0 .127 0 .127-.127V6.178c0-.107 0-.134.134-.134h5.019c.364.015.726.055 1.084.121.738.136 1.447.4 2.095.776a5.9 5.9 0 0 1 1.178.91c.265.276.503.573.716.89.21.322.385.665.522 1.024a.174.174 0 0 0 .2.141h1.198c.154 0 .154 0 .16.148v1.097c0 .107-.04.134-.147.134h-.924c-.093 0-.12 0-.113.12a6.84 6.84 0 0 1 0 1.225c0 .114 0 .127.127.127h1.057c.047.06 0 .12 0 .181.007.078.007.157 0 .234v.81c0 .114-.033.148-.134.148H17.58a.167.167 0 0 0-.194.127 5.352 5.352 0 0 1-1.405 2.048 8.053 8.053 0 0 1-.716.575c-.268.154-.529.315-.804.442a7.234 7.234 0 0 1-1.58.502 8.24 8.24 0 0 1-1.565.127H6.67v-.007l.002-.001Z"/>
-  </g>
-  <defs>
-    <clipPath id="prefix__a">
-      <path fill="#fff" d="M0 0h24v24H0z"/>
-    </clipPath>
-  </defs>
-</svg>
diff --git a/suite-common/icons-deprecated/assets/tokenIcons/erc20.svg b/suite-common/icons-deprecated/assets/tokenIcons/erc20.svg
deleted file mode 100644
index 41f81f9f43d..00000000000
--- a/suite-common/icons-deprecated/assets/tokenIcons/erc20.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg fill="none" viewBox="0 0 24 24">
-  <g clip-path="url(#prefix__a)">
-    <path fill="#A6A8A9" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12Z"/>
-    <path fill="#fff" d="M10.763 6.102c-.68 1.156-1.241 2.112-1.25 2.125l-.013.024.276.173a5444.629 5444.629 0 0 0 2.072 1.292l.154.096.146-.091a4757.94 4757.94 0 0 0 2.35-1.468c.003-.002-.158-.281-.357-.62L12.89 5.51c-.486-.83-.886-1.51-.888-1.51l-1.238 2.102Z"/>
-    <path fill="#fff" d="M9.505 8.76c0 .003 2.485 3.56 2.493 3.568.004.004.303-.42 1.254-1.781A706.93 706.93 0 0 0 14.5 8.758l-1.249.777c-.685.428-1.25.777-1.253.776A1871.956 1871.956 0 0 1 9.505 8.76Zm-5.029 5.616h2.285v.584H5.108v.826h1.556v.583H5.108v.827h1.653v.583H4.476v-3.403Zm2.914 0h1.556c.153 0 .294.028.423.083a.98.98 0 0 1 .336.233c.097.1.173.222.228.365.055.139.083.293.083.461 0 .166-.028.315-.083.448a1.023 1.023 0 0 1-.535.559c-.12.052-.246.08-.379.087l1.094 1.167h-.802l-1.094-1.167h-.194v1.167H7.39v-3.403Zm1.532 1.653c.062 0 .12-.013.175-.039a.47.47 0 0 0 .146-.107.544.544 0 0 0 .102-.578.517.517 0 0 0-.248-.282.405.405 0 0 0-.175-.04h-.9v1.046h.9Zm3.208 1.799c-.23 0-.445-.043-.646-.127a1.61 1.61 0 0 1-.525-.364 1.748 1.748 0 0 1-.355-.555 1.908 1.908 0 0 1-.126-.704 1.748 1.748 0 0 1 .481-1.259c.15-.156.324-.276.525-.36.201-.088.416-.131.647-.131.25 0 .465.043.646.13a1.527 1.527 0 0 1 .744.72c.068.143.115.272.14.39h-.655a1.166 1.166 0 0 0-.107-.21.862.862 0 0 0-.175-.204.817.817 0 0 0-.258-.156.835.835 0 0 0-.335-.063 1.01 1.01 0 0 0-.409.083.897.897 0 0 0-.32.228 1.04 1.04 0 0 0-.214.36c-.052.14-.078.296-.078.472 0 .175.026.333.078.476.051.14.123.26.213.36a.99.99 0 0 0 .321.228 1.064 1.064 0 0 0 .744.02.89.89 0 0 0 .433-.37 1.31 1.31 0 0 0 .107-.228h.656a1.552 1.552 0 0 1-.068.228 1.43 1.43 0 0 1-.127.272 1.518 1.518 0 0 1-.199.277 1.392 1.392 0 0 1-.661.423c-.14.043-.298.064-.476.064Zm1.971-.608 1.385-1.337c.03-.03.057-.058.083-.087a.423.423 0 0 0 .117-.214.586.586 0 0 0-.015-.35.401.401 0 0 0-.102-.151.473.473 0 0 0-.35-.146.504.504 0 0 0-.379.165.598.598 0 0 0-.117.185.678.678 0 0 0-.039.233h-.631c0-.175.029-.335.087-.48.058-.15.138-.276.238-.38.104-.104.227-.185.37-.243.142-.058.3-.087.471-.087.175 0 .332.027.472.082.142.055.262.131.36.229a.96.96 0 0 1 .228.345 1.131 1.131 0 0 1 .034.748 1.082 1.082 0 0 1-.127.243 1.29 1.29 0 0 1-.17.21 9.828 9.828 0 0 0-.19.184l-.801.778v.024h1.385v.608h-2.309v-.56Zm4.134.608a1.33 1.33 0 0 1-.55-.117 1.266 1.266 0 0 1-.447-.34 1.685 1.685 0 0 1-.301-.55 2.287 2.287 0 0 1-.112-.744c0-.278.037-.526.112-.743.074-.217.175-.4.301-.55a1.27 1.27 0 0 1 .447-.34c.172-.078.355-.117.55-.117.194 0 .377.04.549.117.172.078.32.191.447.34.126.15.227.333.301.55.075.217.112.465.112.744 0 .278-.037.526-.112.743-.074.217-.175.4-.3.55a1.274 1.274 0 0 1-.448.34 1.317 1.317 0 0 1-.55.117Zm0-.608a.674.674 0 0 0 .544-.277c.071-.097.128-.217.17-.36.042-.142.063-.311.063-.505 0-.195-.02-.363-.063-.506a1.096 1.096 0 0 0-.17-.355.671.671 0 0 0-.248-.214.675.675 0 0 0-.84.214 1.098 1.098 0 0 0-.171.355 1.796 1.796 0 0 0-.063.506c0 .194.02.363.063.505.042.143.099.263.17.36a.673.673 0 0 0 .544.277Z"/>
-  </g>
-  <defs>
-    <clipPath id="prefix__a">
-      <path fill="#fff" d="M0 0h24v24H0z"/>
-    </clipPath>
-  </defs>
-</svg>
diff --git a/suite-common/icons-deprecated/assets/tokenIcons/leo.svg b/suite-common/icons-deprecated/assets/tokenIcons/leo.svg
deleted file mode 100644
index f4010c41a81..00000000000
--- a/suite-common/icons-deprecated/assets/tokenIcons/leo.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg fill="none" viewBox="0 0 24 24">
-  <g clip-path="url(#prefix__a)">
-    <path fill="#171C1F" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12Z"/>
-    <path fill="#F7B330" d="M8.457 10.927h.007l.115.04.108.04.115.034.108.048.114.04.108.04.115.041.108.04.108.041.108.04.115.041.108.047.115.034.108.04.115.041.108.047.114.041.108.034.108.04.115.047.115.041v-1.579H8.309l-.108.053-.257.135-.263.142-.263.128-.25.135-.263.142-.264.128-.256.142-.263.135-.257.128-.256.142-.237.122-.027 3.868.264.182.256.182.257.176.263.189.256.182.264.183.114.087.149-.189.25-.337.027-.034-.027-.02-.25-.183-.263-.182-.264-.182-.256-.182-.263-.19-.068-.04.02-3.132.048-.027.263-.128.256-.129.264-.128.263-.128.25-.135.263-.129.263-.121.257-.135.256-.128Z"/>
-    <path fill="#F7B330" d="m12.926 18.305-.216.088-.243.101-.243.095-.243.1-.108.041-.128-.06-.243-.129-.243-.114-.236-.129-.243-.121-.243-.115-.243-.128-.243-.122-.243-.121-.243-.122-.244-.128-.229-.115-.243-.121-.027-.014v-3.159H8.12v3.591l.243.115.243.122.243.128.243.115.23.128.243.121.243.122.243.121.243.122.243.121.243.122.243.128.236.115.243.128.243.115.095.054.141-.067.243-.088.243-.101.243-.102.237-.094.243-.095-.243-.607-.02-.04Zm4.314-4.388.014 1.485-.061.054-.412.284-.412.297-.412.297-.411.29-.412.29-.405.297-.412.29-.243.176-.169-.128-.405-.317-.412-.31-.411-.318-.405-.31-.075-.055v-1.6l.075-.067.405-.432.411-.425.412-.432.405-.426.399-.418H9.396l.412.432.405.425.411.425.412.432.405.426.06.06v1.938l.352.277.418.317.405.31.412.318.412.31.405.318.149.114.263-.189.412-.283.405-.297.412-.297.411-.284.412-.297.412-.297.412-.283.412-.297.337-.25.068-1.823-.405-.013-.365-.014ZM6.014 10.46h.047l.007-1.984.263-.169.33-.195.325-.196.324-.203.324-.195.33-.203.318-.196.33-.196.325-.202.33-.203h.007l.31.183.332.182.324.189.324.182.324.183.324.182.324.189.317.182.014-.027.323-.587-.323-.19-.331-.181-.324-.183-.324-.182-.324-.189-.324-.182-.324-.183-.331-.189-.318-.182-.013-.007-.317.19-.324.202-.331.202-.317.203-.331.196-.324.195-.324.203-.324.196-.331.202-.317.196-.331.196-.31.196-.014 2.37h.324l.33.006Z"/>
-    <path fill="#F7B330" d="m18.705 8.645-.169-.135-.169-.135-.168-.142-.17-.135-.168-.135-.175-.135-.17-.135-.168-.135-.175-.142-.129-.094-.047.054-.169.209-.169.216-.047.054.047.047.17.142.168.142.175.142.176.141.169.149.169.142.175.141.081.068.007 3.193-.088.06-.175.109-.17.108-.168.108-.175.108-.176.108-.169.108-.169.108-.168.108-.17.108-.168.108-.175.108-.17.108-.168.108-.169.108-.175.108-.169.108.169.27.175.27.027.047.142-.088.169-.1.169-.109.175-.101.169-.115.169-.101.168-.108.17-.101.168-.108.175-.102.176-.114.169-.102.169-.108.175-.1.169-.109.169-.101.168-.115.17-.101.168-.108V8.645Zm-5.569 1.904v1.377l.054-.02.23-.088.229-.095.223-.088.229-.094.23-.095.222-.087.23-.095.23-.088.222-.094.23-.088.222-.094V6.72l-.256-.162-.263-.149-.264-.148-.256-.162-.264-.149-.263-.148-.256-.155-.264-.156-.256-.155-.263-.148-.264-.156-.256-.155-.257-.148-.263-.149-.142-.08-.121.068-.264.141-.263.135-.25.149-.263.142-.263.135-.263.148.263.149.263.148.162.101.101-.054.25-.135.263-.141.264-.135.101-.054.162.094.263.149.257.148.256.155.264.156.263.148.256.155.264.156.256.148.263.149.264.162.256.148.088.048v3.078H13.15"/>
-    <path fill="#F7B330" d="m13.136 11.926 2.551-1.026-2.551-.71M10.8 11.926v-1.708l-2.336.695L10.8 11.92"/>
-  </g>
-  <defs>
-    <clipPath id="prefix__a">
-      <path fill="#fff" d="M0 0h24v24H0z"/>
-    </clipPath>
-  </defs>
-</svg>
diff --git a/suite-common/icons-deprecated/assets/tokenIcons/link.svg b/suite-common/icons-deprecated/assets/tokenIcons/link.svg
deleted file mode 100644
index 0f3b67b1c1c..00000000000
--- a/suite-common/icons-deprecated/assets/tokenIcons/link.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg fill="none" viewBox="0 0 24 24">
-  <g clip-path="url(#prefix__a)">
-    <path fill="#2A5ADA" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12Z"/>
-    <path fill="#fff" d="m12 4.5-1.376.791-3.75 2.168-1.376.791v7.5l1.376.791 3.784 2.168 1.376.791 1.377-.791 3.715-2.168 1.376-.791v-7.5l-1.376-.791-3.75-2.168L12 4.5Zm-3.75 9.667V9.833L12 7.665l3.75 2.168v4.334L12 16.335l-3.75-2.168Z"/>
-  </g>
-  <defs>
-    <clipPath id="prefix__a">
-      <path fill="#fff" d="M0 0h24v24H0z"/>
-    </clipPath>
-  </defs>
-</svg>
diff --git a/suite-common/icons-deprecated/assets/tokenIcons/okb.svg b/suite-common/icons-deprecated/assets/tokenIcons/okb.svg
deleted file mode 100644
index 99415bb21c9..00000000000
--- a/suite-common/icons-deprecated/assets/tokenIcons/okb.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<svg fill="none" viewBox="0 0 24 24">
-  <g clip-path="url(#prefix__a)">
-    <path fill="#162B76" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12Z"/>
-    <path fill="#88BDF3" d="M12 11.245A3.623 3.623 0 1 0 12 4a3.623 3.623 0 0 0 0 7.245Z"/>
-    <path fill="#3075EE" d="M12 20a3.623 3.623 0 1 0 0-7.245A3.623 3.623 0 0 0 12 20Z"/>
-    <path fill="#5795F1" d="M16.377 15.623a3.623 3.623 0 1 0 0-7.246 3.623 3.623 0 0 0 0 7.246Z"/>
-    <path fill="#205FEC" d="M7.623 15.623a3.623 3.623 0 1 0 0-7.246 3.623 3.623 0 0 0 0 7.246Z"/>
-    <path fill="#134BEF" d="M11.147 11.147a3.623 3.623 0 0 1-2.664-2.664 3.646 3.646 0 0 1 2.664 2.664Z"/>
-    <path fill="#0932E8" d="M8.475 15.524a3.622 3.622 0 0 1 2.665-2.664 3.647 3.647 0 0 1-2.665 2.665Z"/>
-    <path fill="#164BEA" d="M12.853 12.853a3.623 3.623 0 0 1 2.664 2.664 3.646 3.646 0 0 1-2.664-2.664Z"/>
-    <path fill="#3170F1" d="M15.524 8.475a3.623 3.623 0 0 1-2.664 2.665 3.646 3.646 0 0 1 2.665-2.665Z"/>
-  </g>
-  <defs>
-    <clipPath id="prefix__a">
-      <path fill="#fff" d="M0 0h24v24H0z"/>
-    </clipPath>
-  </defs>
-</svg>
diff --git a/suite-common/icons-deprecated/assets/tokenIcons/shib.svg b/suite-common/icons-deprecated/assets/tokenIcons/shib.svg
deleted file mode 100644
index bd7f64a71cf..00000000000
--- a/suite-common/icons-deprecated/assets/tokenIcons/shib.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg fill="none" viewBox="0 0 24 24">
-  <g clip-path="url(#prefix__a)">
-    <path fill="#DD3935" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12Z"/>
-    <path fill="#000" d="M16.295 13.142c-.008.04-.124.159-.24.245-.341.25-.952.482-1.573.594-.354.064-.707.074-.814.022-.069-.035-.079-.062-.054-.15.052-.186.22-.39.482-.58.134-.096.675-.425.928-.563.415-.228.751-.364.979-.396a.502.502 0 0 1 .185 0c.045.017.094.148.114.307.01.084.005.455-.007.521Zm-5.826.819c-.015.03-.09.062-.174.074a2.794 2.794 0 0 1-.487-.012 5.122 5.122 0 0 1-1.486-.428 1.872 1.872 0 0 1-.512-.344l-.07-.071-.007-.095c-.012-.163-.01-.42.01-.511a.672.672 0 0 1 .077-.218c.02-.025.02-.025.109-.025.109 0 .2.018.348.065.305.094.757.321 1.309.652.455.272.625.406.756.589.09.114.149.274.127.324Zm3.501 3.442c0 .008-.03.126-.067.267a9.869 9.869 0 0 0-.067.26c-.027.002-.051.005-.079.002h-.079l-.109.258c-.059.14-.113.272-.12.291l-.015.035-.052-.084-.052-.084v-.685l-.02.005a6.738 6.738 0 0 1-2.097.027 1.714 1.714 0 0 0-.163-.02c-.003.003 0 .161.005.356l.007.352-.042.064c-.022.034-.045.064-.045.067-.007.007-.032-.033-.089-.146a1.671 1.671 0 0 1-.138-.376l-.017-.072-.077.005-.077.007-.02-.091a2.572 2.572 0 0 1-.027-.168l-.007-.08-.064-.056a2.334 2.334 0 0 0-.082-.07.054.054 0 0 1-.017-.041v-.03l.309.002.309.003.01.032.01.032.106.005c.06.003.247.007.415.012l.31.008.079-.124.081-.123h.104l-.002-.258-.003-.257-.136-.06c-.438-.192-.695-.412-.791-.68-.02-.054-.02-.073-.025-.32-.002-.246-.002-.268.015-.322a.36.36 0 0 1 .255-.252c.042-.013.153-.013.737-.013l.687.003.077.037a.43.43 0 0 1 .185.146c.06.079.077.14.077.291 0 .216-.015.401-.037.475a1.024 1.024 0 0 1-.144.285 1.316 1.316 0 0 1-.554.388l-.059.022.002.26.003.26.054.004.055.005.074.112.072.11h.331c.183 0 .344.003.359.006.024.005.03.002.054-.04l.03-.044h.284c.213-.01.277-.005.277.002Z"/>
-    <path fill="#000" d="M12.664 18.113c-.047.027-.079.04-.086.035-.008-.003-.042-.033-.08-.06l-.066-.054-.07.074c-.15.163-.155.17-.2.173-.069.008-.084-.005-.168-.131-.044-.064-.079-.119-.079-.119s-.032-.005-.07-.007l-.068-.008-.032.067-.033.067-.056-.017a1.183 1.183 0 0 1-.132-.052l-.074-.037v-.141l.658.002.658.003.002.066c.003.08.005.077-.104.139Z"/>
-    <path fill="#fff" d="M18.847 15.096c-.003-.01-.003-.027-.005-.054a5.26 5.26 0 0 0-3.86 1.194s-.507-2.325-2.881-2.325c-2.374 0-3.255 2.325-3.255 2.325-1.33-1.432-3.11-1.328-3.754-1.234l-.002.047c-.02.359-.01.53.05.754.185.705.756 1.482 1.651 2.243 1.467 1.247 3.455 2.147 4.96 2.25 1.571.107 3.888-.81 5.431-2.15.243-.216.47-.444.683-.686.153-.178.38-.485.363-.485-.005 0 0-.005.01-.01.008-.004.015-.012.01-.017-.002-.002.003-.01.01-.012.008-.003.012-.008.01-.012-.003-.005 0-.01.01-.013.007-.002.01-.01.007-.015-.002-.005 0-.01.005-.01s.01-.007.01-.012.005-.012.01-.012.01-.005.01-.01a6.496 6.496 0 0 0 .237-.423c.141-.32.23-.604.272-.888.015-.136.028-.386.018-.445Zm-6.183 3.017c-.047.027-.079.04-.086.035-.008-.003-.042-.033-.08-.06l-.066-.054-.07.074c-.15.163-.155.17-.2.173-.069.008-.084-.005-.168-.131-.044-.064-.079-.119-.079-.119s-.032-.005-.07-.007l-.068-.008-.032.067-.033.067-.056-.017a1.191 1.191 0 0 1-.132-.052l-.074-.037v-.141l.658.002.658.003.002.066c.003.08.005.077-.104.139Zm1.237-.445a9.869 9.869 0 0 0-.067.26c-.027.002-.052.004-.079.002h-.08l-.106.26c-.059.14-.113.272-.12.291l-.015.035-.052-.084-.052-.084v-.685l-.02.005a6.738 6.738 0 0 1-2.097.027 1.71 1.71 0 0 0-.163-.02c-.003.003 0 .161.005.356l.007.352-.042.064c-.022.034-.045.064-.045.067-.007.007-.032-.033-.089-.146a1.676 1.676 0 0 1-.138-.376l-.017-.072-.077.005-.077.007-.02-.091a2.572 2.572 0 0 1-.027-.168l-.007-.08-.064-.056a2.334 2.334 0 0 0-.082-.07.054.054 0 0 1-.017-.041v-.03l.309.002.309.003.01.032.01.032.106.005c.06.003.247.007.416.012l.309.008.079-.124.081-.123h.104l-.002-.258-.003-.257-.136-.06c-.438-.192-.695-.412-.791-.68-.02-.054-.02-.073-.025-.32-.002-.246-.002-.268.015-.322a.36.36 0 0 1 .255-.252c.042-.013.153-.013.737-.013l.687.003.077.037a.431.431 0 0 1 .185.146c.06.079.077.14.077.291 0 .216-.015.401-.037.475a1.027 1.027 0 0 1-.144.285 1.317 1.317 0 0 1-.554.388l-.059.022.003.26.002.26.054.004.055.005.074.112.072.11h.331c.183 0 .344.003.359.006.024.005.03.002.054-.04l.03-.044h.284c.22 0 .284.002.284.01-.007-.003-.039.118-.076.257Z"/>
-    <path fill="#FFA409" d="M18.827 14.844a7.254 7.254 0 0 0-.96-3.356.842.842 0 0 1-.054-.104c-.005-.007-.007-.015-.01-.02.077-.23.39-1.192.64-2.292.34-1.494.554-3.24-.103-3.764 0 0-1.138-.084-2.661 1.41-.413.413-.792.86-1.128 1.338l-.106-.035a7.72 7.72 0 0 0-1.89-.366 14.79 14.79 0 0 0-1.147 0 6.673 6.673 0 0 0-1.941.393c-.349-.475-.737-.92-1.165-1.328-1.585-1.5-2.764-1.414-2.764-1.414-.698.541-.46 2.366-.1 3.91.238 1.02.53 1.918.639 2.242a.558.558 0 0 1-.028.055c-.576 1.167-.887 2.292-.962 3.489.646-.094 2.424-.2 3.757 1.234 0 0 .88-2.325 3.254-2.325s2.881 2.325 2.881 2.325a5.27 5.27 0 0 1 3.86-1.194c-.002-.05-.007-.124-.012-.198ZM6.544 10.526s-.925-2.312-.688-3.633c.04-.222.114-.418.23-.566 0 0 1.049.104 2.74 1.983 0 0-.321.156-.751.488L8.07 8.8a5.945 5.945 0 0 0-1.526 1.726Zm3.925 3.435c-.015.03-.09.062-.174.074a2.794 2.794 0 0 1-.487-.012 5.122 5.122 0 0 1-1.486-.428 1.872 1.872 0 0 1-.512-.344l-.07-.071-.007-.095c-.012-.163-.01-.42.01-.511a.672.672 0 0 1 .077-.218c.02-.025.02-.025.109-.025.109 0 .2.018.348.065.305.094.757.321 1.309.652.455.272.625.406.756.589.09.114.149.274.127.324Zm5.826-.819c-.008.04-.124.159-.24.245-.341.25-.952.482-1.573.594-.354.064-.707.074-.814.022-.069-.035-.079-.062-.054-.15.052-.186.22-.39.482-.58.134-.096.675-.425.928-.563.415-.228.751-.364.979-.396a.502.502 0 0 1 .185 0c.045.017.094.148.114.307.01.084.005.455-.007.521Zm-.41-4.344-.006-.003c-.415-.331-.727-.487-.727-.487 1.635-1.88 2.646-1.983 2.646-1.983.111.15.183.343.223.566.23 1.32-.663 3.635-.663 3.635a5.89 5.89 0 0 0-1.474-1.728Z"/>
-    <path fill="#FF9300" d="M18.023 6.89c-.193-.024-1.105-.029-2.139 1.908l-.005-.003c-.415-.331-.727-.487-.727-.487 1.635-1.88 2.646-1.983 2.646-1.983.114.15.186.343.225.566Z"/>
-    <path fill="#FF8300" d="M17.36 10.526a5.866 5.866 0 0 0-1.476-1.728c1.034-1.937 1.944-1.932 2.14-1.907.23 1.323-.664 3.635-.664 3.635Zm.7-3.628-.037-.007.037.007Z"/>
-    <path fill="#FF9300" d="M8.826 8.308s-.321.156-.751.487c0 0-.003.003-.005.003-1.071-1.94-2.013-1.932-2.216-1.907.04-.223.114-.418.23-.566.002 0 1.051.104 2.742 1.983Z"/>
-    <path fill="#FF8300" d="M8.072 8.798a5.927 5.927 0 0 0-1.528 1.728s-.925-2.312-.688-3.635c.2-.025 1.145-.03 2.216 1.907ZM5.857 6.891l-.04.007.04-.007Z"/>
-    <path fill="#fff" d="M14.858 11.81s-.792.049-.693-.57c.1-.617.718-.692.89-.667.174.025.866.272.743.791-.124.52-.297.42-.396.445-.099.025-.544 0-.544 0Zm-5.836 0s-.792.049-.693-.57c.1-.617.718-.692.89-.667.174.025.866.272.743.791-.124.52-.297.42-.396.445-.1.025-.544 0-.544 0Z"/>
-  </g>
-  <defs>
-    <clipPath id="prefix__a">
-      <path fill="#fff" d="M0 0h24v24H0z"/>
-    </clipPath>
-  </defs>
-</svg>
diff --git a/suite-common/icons-deprecated/assets/tokenIcons/uni.svg b/suite-common/icons-deprecated/assets/tokenIcons/uni.svg
deleted file mode 100644
index 1cff78b9274..00000000000
--- a/suite-common/icons-deprecated/assets/tokenIcons/uni.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg fill="none" viewBox="0 0 24 24">
-  <g clip-path="url(#prefix__a)">
-    <path fill="#ED2B88" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12Z"/>
-    <path fill="#fff" d="M9.3 5.056c-.196-.028-.205-.037-.112-.047.177-.028.589.01.878.075.673.159 1.28.57 1.925 1.29l.168.195.243-.037c1.037-.168 2.102-.037 2.99.374.242.112.625.336.672.392.018.019.046.14.065.262.066.439.037.766-.103 1.018-.074.14-.074.178-.028.299.038.093.15.159.252.159.225 0 .458-.355.57-.85l.047-.197.084.094c.477.532.85 1.27.906 1.794l.019.14-.084-.122a1.578 1.578 0 0 0-.449-.476c-.317-.215-.653-.28-1.54-.327-.804-.047-1.262-.112-1.71-.262-.767-.252-1.159-.579-2.065-1.784-.402-.533-.654-.822-.906-1.065-.551-.533-1.103-.813-1.822-.925Z"/>
-    <path fill="#fff" d="M16.26 6.243c.018-.355.065-.589.168-.804a.643.643 0 0 1 .084-.159c.01 0-.01.066-.037.14-.075.206-.084.496-.038.823.066.42.094.476.542.934.206.215.449.486.542.598l.159.205-.159-.15c-.196-.186-.645-.541-.747-.588-.066-.037-.075-.037-.122.01-.037.037-.047.093-.047.364-.009.42-.065.682-.205.953-.075.14-.084.112-.019-.047.047-.121.056-.178.056-.58 0-.812-.093-1.008-.663-1.335a6.997 6.997 0 0 0-.523-.271 2.06 2.06 0 0 1-.252-.122c.018-.018.57.14.784.234.327.13.383.14.42.13.029-.027.047-.102.057-.335ZM9.683 7.634c-.392-.541-.644-1.382-.588-2.008l.018-.196.094.018c.168.028.457.14.598.225.373.224.541.532.7 1.298.047.224.112.486.14.57.047.14.225.467.374.673.103.15.037.224-.196.205-.355-.037-.832-.364-1.14-.785Zm6.1 4.064c-1.85-.747-2.503-1.392-2.503-2.485 0-.159.01-.29.01-.29.008 0 .074.057.158.122.374.3.794.43 1.962.598.682.103 1.074.178 1.43.299 1.13.374 1.83 1.14 1.998 2.177.047.299.019.868-.056 1.167-.065.234-.252.664-.299.673-.01 0-.028-.047-.028-.121-.018-.393-.215-.766-.542-1.056-.392-.336-.896-.589-2.13-1.084Zm-1.307.309a2.198 2.198 0 0 0-.094-.393l-.047-.14.084.103c.122.14.215.308.3.542.065.177.065.233.065.523 0 .28-.01.346-.066.504a1.69 1.69 0 0 1-.392.626c-.336.346-.775.533-1.401.617-.112.01-.43.037-.71.056-.7.037-1.168.112-1.588.261-.056.02-.113.038-.122.028-.019-.018.271-.186.505-.299.327-.158.663-.242 1.401-.373.364-.056.738-.131.831-.168.925-.29 1.383-1.01 1.233-1.887Z"/>
-    <path fill="#fff" d="M15.326 13.51c-.243-.532-.3-1.036-.168-1.513.018-.046.037-.093.056-.093.018 0 .074.028.13.065.112.075.346.206.944.533.757.41 1.186.728 1.485 1.093.262.317.42.682.495 1.13.047.252.02.86-.046 1.112-.206.794-.673 1.43-1.355 1.793a1.302 1.302 0 0 1-.196.094c-.01 0 .028-.094.084-.206.224-.476.252-.934.084-1.448-.103-.317-.318-.7-.747-1.345-.514-.747-.636-.944-.766-1.214Zm-6.96 2.86c.691-.58 1.541-.991 2.326-1.122.336-.056.897-.037 1.205.047.495.13.944.411 1.177.757.224.336.327.625.43 1.27.037.252.084.514.093.57.075.336.225.598.411.738.29.215.795.224 1.29.037.084-.028.158-.056.158-.046.02.018-.233.187-.401.27-.234.122-.42.16-.673.16-.448 0-.831-.234-1.14-.701a5.26 5.26 0 0 1-.308-.617c-.327-.756-.495-.98-.878-1.233-.336-.215-.766-.262-1.093-.103-.43.206-.542.757-.243 1.093a.95.95 0 0 0 .532.28.57.57 0 0 0 .645-.57c0-.223-.084-.354-.308-.457-.3-.13-.626.019-.617.308 0 .122.056.196.178.253.075.037.075.037.018.027-.27-.056-.336-.392-.121-.607.262-.261.813-.15 1 .215.074.15.084.448.018.635-.159.411-.607.626-1.065.505-.308-.084-.439-.168-.812-.551-.654-.673-.907-.804-1.84-.944l-.178-.028.196-.187Z"/>
-    <path fill="#fff" fill-rule="evenodd" d="M5.348 3.452c2.177 2.644 3.634 4.64 3.803 4.864.14.187.084.365-.15.496a1.43 1.43 0 0 1-.532.15.674.674 0 0 1-.449-.197c-.084-.084-.448-.617-1.27-1.897a121.23 121.23 0 0 0-1.168-1.803c-.037-.018-.037-.018 1.102 2.018.72 1.28.953 1.738.953 1.794 0 .121-.037.187-.187.355-.252.28-.364.598-.448 1.261-.093.738-.346 1.261-1.065 2.149-.42.523-.486.616-.589.831-.13.262-.168.411-.186.748-.02.355.018.579.121.915.093.3.196.495.448.878.215.337.346.589.346.682 0 .075.019.075.355 0 .803-.187 1.467-.504 1.831-.897.224-.242.28-.373.28-.71 0-.215-.009-.261-.065-.392-.093-.205-.271-.374-.654-.635-.504-.346-.72-.626-.775-1-.047-.317.009-.532.29-1.12.289-.608.364-.86.41-1.477.028-.392.075-.551.187-.673.122-.13.224-.177.514-.214.476-.066.785-.187 1.028-.42a.878.878 0 0 0 .317-.683l.01-.215-.122-.13c-.439-.505-4.624-5.08-4.652-5.08-.01 0 .14.178.317.402Zm.972 11.17a.386.386 0 0 0-.121-.514c-.16-.102-.402-.056-.402.085 0 .037.018.074.075.093.084.047.093.093.028.196-.066.103-.066.196.018.262.131.103.309.046.402-.122Zm3.784-4.914c-.225.066-.44.309-.505.552-.037.15-.019.42.047.504.102.13.196.168.457.168.514 0 .953-.224 1-.495.047-.224-.15-.532-.42-.673a.95.95 0 0 0-.58-.056Zm.597.467c.075-.112.047-.233-.093-.317-.252-.159-.635-.028-.635.215 0 .121.196.252.383.252.121 0 .29-.075.345-.15Z" clip-rule="evenodd"/>
-  </g>
-  <defs>
-    <clipPath id="prefix__a">
-      <path fill="#fff" d="M0 0h24v24H0z"/>
-    </clipPath>
-  </defs>
-</svg>
diff --git a/suite-common/icons-deprecated/assets/tokenIcons/usdc.svg b/suite-common/icons-deprecated/assets/tokenIcons/usdc.svg
deleted file mode 100644
index b4020a16742..00000000000
--- a/suite-common/icons-deprecated/assets/tokenIcons/usdc.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg fill="none" viewBox="0 0 24 24">
-  <g clip-path="url(#prefix__a)">
-    <path fill="#2775CA" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12Z"/>
-    <path fill="#fff" d="M14.925 13.52c0-1.552-.93-2.084-2.792-2.305-1.33-.178-1.596-.532-1.596-1.153 0-.62.444-1.02 1.33-1.02.798 0 1.241.267 1.463.931a.333.333 0 0 0 .31.222h.71c.177 0 .31-.133.31-.31V9.84a2.214 2.214 0 0 0-1.995-1.817V6.96c0-.177-.133-.31-.355-.354h-.665c-.177 0-.31.133-.354.354v1.02c-1.33.177-2.172 1.064-2.172 2.172 0 1.463.886 2.039 2.748 2.26 1.241.222 1.64.488 1.64 1.197 0 .71-.62 1.197-1.463 1.197-1.152 0-1.551-.488-1.684-1.153-.044-.177-.177-.266-.31-.266h-.754a.303.303 0 0 0-.31.31v.045c.177 1.108.886 1.906 2.35 2.128v1.063c0 .178.132.31.354.355h.665c.177 0 .31-.133.354-.355V15.87c1.33-.222 2.216-1.153 2.216-2.35Z"/>
-    <path fill="#fff" d="M9.74 18.173c-3.458-1.24-5.23-5.097-3.945-8.51a6.559 6.559 0 0 1 3.944-3.945c.178-.088.266-.221.266-.443v-.62c0-.178-.088-.31-.266-.355-.044 0-.133 0-.177.044-4.21 1.33-6.516 5.807-5.186 10.018a7.974 7.974 0 0 0 5.186 5.185c.177.09.355 0 .4-.177.043-.044.043-.088.043-.177v-.62c0-.134-.133-.31-.266-.4Zm4.698-13.829c-.178-.088-.355 0-.4.178-.043.044-.043.088-.043.177v.62c0 .178.133.355.266.444 3.457 1.24 5.23 5.097 3.944 8.51-.664 1.862-2.127 3.28-3.944 3.945-.178.088-.266.221-.266.443v.62c0 .178.088.31.266.355.044 0 .133 0 .177-.044 4.21-1.33 6.515-5.807 5.186-10.017a8.039 8.039 0 0 0-5.186-5.23Z"/>
-  </g>
-  <defs>
-    <clipPath id="prefix__a">
-      <path fill="#fff" d="M0 0h24v24H0z"/>
-    </clipPath>
-  </defs>
-</svg>
diff --git a/suite-common/icons-deprecated/assets/tokenIcons/usdt.svg b/suite-common/icons-deprecated/assets/tokenIcons/usdt.svg
deleted file mode 100644
index 426f4ebaf38..00000000000
--- a/suite-common/icons-deprecated/assets/tokenIcons/usdt.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg fill="none" viewBox="0 0 24 24">
-  <g clip-path="url(#prefix__a)">
-    <path fill="#53AE94" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12Z"/>
-    <path fill="#fff" d="M13.423 10.33V8.614h3.923V6H6.663v2.614h3.924v1.714C7.397 10.475 5 11.107 5 11.863c0 .757 2.399 1.388 5.587 1.536v5.495h2.837v-5.496C16.607 13.251 19 12.62 19 11.864s-2.393-1.387-5.576-1.534m0 2.603v-.002c-.08.005-.491.03-1.407.03-.732 0-1.247-.02-1.429-.03v.002c-2.817-.125-4.92-.615-4.92-1.202s2.103-1.077 4.92-1.202v1.915c.185.013.712.044 1.44.044.876 0 1.316-.036 1.396-.044V10.53c2.812.125 4.91.616 4.91 1.201 0 .585-2.099 1.076-4.91 1.201"/>
-  </g>
-  <defs>
-    <clipPath id="prefix__a">
-      <path fill="#fff" d="M0 0h24v24H0z"/>
-    </clipPath>
-  </defs>
-</svg>
diff --git a/suite-common/icons-deprecated/assets/tokenIcons/wbtc.svg b/suite-common/icons-deprecated/assets/tokenIcons/wbtc.svg
deleted file mode 100644
index 2b6b7fd081e..00000000000
--- a/suite-common/icons-deprecated/assets/tokenIcons/wbtc.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg fill="none" viewBox="0 0 24 24">
-  <g clip-path="url(#prefix__a)">
-    <path fill="#F29D40" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12Z"/>
-    <path fill="#fff" d="m17.046 7.358-.439.44a6.22 6.22 0 0 1 0 8.393l.44.44a6.848 6.848 0 0 0 0-9.283v.01Zm-9.239.038a6.22 6.22 0 0 1 8.394 0l.44-.44a6.848 6.848 0 0 0-9.283 0l.45.44Zm-.411 8.799a6.22 6.22 0 0 1 0-8.389l-.44-.44a6.847 6.847 0 0 0 0 9.284l.44-.454Zm8.799.406a6.22 6.22 0 0 1-8.393 0l-.44.44a6.847 6.847 0 0 0 9.283 0l-.45-.44Zm-1.421-6.067c-.088-.917-.88-1.224-1.88-1.318V7.954h-.773v1.239h-.617v-1.24h-.768v1.272H9.168v.827s.571-.01.562 0a.4.4 0 0 1 .44.34v3.48a.27.27 0 0 1-.094.188.267.267 0 0 1-.2.068c.01.009-.562 0-.562 0l-.146.924h1.554v1.291h.773v-1.272h.618v1.266h.774v-1.276c1.307-.08 2.217-.402 2.332-1.624.092-.984-.37-1.424-1.11-1.601.45-.221.727-.631.665-1.302Zm-1.084 2.75c0 .96-1.646.851-2.17.851v-1.704c.524.001 2.17-.15 2.17.853Zm-.359-2.401c0 .878-1.373.771-1.81.771v-1.549c.436 0 1.81-.138 1.81.778Z"/>
-    <path fill="#fff" d="M11.998 20a8 8 0 1 1 .004-16 8 8 0 0 1-.004 16Zm0-15.376a7.372 7.372 0 1 0 .012 14.743A7.372 7.372 0 0 0 12 4.624Z"/>
-  </g>
-  <defs>
-    <clipPath id="prefix__a">
-      <path fill="#fff" d="M0 0h24v24H0z"/>
-    </clipPath>
-  </defs>
-</svg>
diff --git a/suite-common/icons-deprecated/generateIcons.js b/suite-common/icons-deprecated/generateIcons.js
index 8349762c9d4..fac1a01d7a6 100644
--- a/suite-common/icons-deprecated/generateIcons.js
+++ b/suite-common/icons-deprecated/generateIcons.js
@@ -18,11 +18,6 @@ const assetTypesConfig = [
         dirname: 'assets/cryptoIcons',
         typeName: 'CryptoIconName',
     },
-    {
-        name: 'flagIcons',
-        dirname: 'assets/flags',
-        typeName: 'FlagIconName',
-    },
 ];
 
 // https://github.com/svg/svgo#built-in-plugins
diff --git a/suite-common/icons-deprecated/package.json b/suite-common/icons-deprecated/package.json
index 5a75271dc2b..8745799c7c9 100644
--- a/suite-common/icons-deprecated/package.json
+++ b/suite-common/icons-deprecated/package.json
@@ -6,24 +6,13 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "generate-icons": "yarn g:tsx generateIcons.js",
         "download-crypto-icons": "yarn g:tsx ./scripts/downloadCryptoIcons.ts"
     },
     "dependencies": {
-        "@shopify/react-native-skia": "1.3.11",
-        "@suite-common/wallet-config": "workspace:*",
-        "@suite-common/wallet-types": "workspace:*",
-        "@trezor/connect": "workspace:*",
-        "@trezor/styles": "workspace:*",
-        "@trezor/theme": "workspace:*",
-        "react": "18.2.0",
-        "react-native": "0.75.2",
-        "react-native-reanimated": "3.15.0",
-        "sharp": "0.32.6",
-        "styled-components": "^6.1.8"
+        "sharp": "0.32.6"
     },
     "devDependencies": {
         "prettier": "^3.3.2",
diff --git a/suite-common/icons-deprecated/src/components/CryptoIcon.tsx b/suite-common/icons-deprecated/src/components/CryptoIcon.tsx
deleted file mode 100644
index ee621ca2a7e..00000000000
--- a/suite-common/icons-deprecated/src/components/CryptoIcon.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Canvas, ImageSVG, useSVG } from '@shopify/react-native-skia';
-
-import { networks } from '@suite-common/wallet-config';
-
-import { CryptoIconName, cryptoIcons } from '../icons';
-import { genericTokenIcon, TokenIconName, tokenIcons } from '../tokenIcons';
-import { CoinSymbol, CryptoIconProps, cryptoIconSizes } from '../config';
-import { useRerenderOnAppStateChange } from '../useRerenderOnAppState';
-
-const getIconFile = (symbol: CoinSymbol) => {
-    if (symbol in networks) return cryptoIcons[symbol as CryptoIconName];
-
-    // the symbol in case of a token is a contract address. Since it is hexadecimal value, we can convert it
-    // to lowerCase to mach definition `suite-common/icons/icons.ts` without changing the meaning of the date.
-    return tokenIcons[symbol.toLowerCase() as TokenIconName] ?? genericTokenIcon;
-};
-
-export const CryptoIcon = ({ symbol, size = 'small' }: CryptoIconProps) => {
-    useRerenderOnAppStateChange();
-
-    const iconFile = getIconFile(symbol);
-    const svg = useSVG(iconFile);
-    const sizeNumber = cryptoIconSizes[size];
-
-    return (
-        <Canvas style={{ height: sizeNumber, width: sizeNumber }}>
-            {svg && <ImageSVG svg={svg} x={0} y={0} width={sizeNumber} height={sizeNumber} />}
-        </Canvas>
-    );
-};
diff --git a/suite-common/icons-deprecated/src/components/DeviceModelIcon.tsx b/suite-common/icons-deprecated/src/components/DeviceModelIcon.tsx
deleted file mode 100644
index f1f1986cf96..00000000000
--- a/suite-common/icons-deprecated/src/components/DeviceModelIcon.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { DeviceModelInternal } from '@trezor/connect';
-
-import { IconSize } from '../config';
-import { IconName } from '../icons';
-import { Icon } from './Icon';
-
-type DeviceModelIconProps = {
-    deviceModel: DeviceModelInternal;
-    size?: IconSize | number;
-};
-
-const icons = {
-    T1B1: 'trezorT1B1',
-    T2T1: 'trezorT2T1',
-    T2B1: 'trezorT3B1',
-    T3B1: 'trezorT3B1',
-    T3T1: 'trezorT3T1',
-} as const satisfies Record<DeviceModelInternal, IconName>;
-
-export const DeviceModelIcon = ({ deviceModel, size }: DeviceModelIconProps) => (
-    <Icon name={icons[deviceModel]} size={size} />
-);
diff --git a/suite-common/icons-deprecated/src/components/FlagIcon.tsx b/suite-common/icons-deprecated/src/components/FlagIcon.tsx
deleted file mode 100644
index fdc2b2ea418..00000000000
--- a/suite-common/icons-deprecated/src/components/FlagIcon.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Canvas, ImageSVG, useSVG } from '@shopify/react-native-skia';
-
-import { flagIcons } from '../icons';
-import { FlagIconProps, flagIconSizes } from '../config';
-import { useRerenderOnAppStateChange } from '../useRerenderOnAppState';
-
-export const FlagIcon = ({ name, size = 'medium' }: FlagIconProps) => {
-    useRerenderOnAppStateChange();
-
-    const svg = useSVG(flagIcons[name]);
-    const sizeNumber = flagIconSizes[size];
-
-    return (
-        <Canvas
-            style={{
-                height: sizeNumber,
-                width: sizeNumber,
-            }}
-        >
-            {svg && <ImageSVG svg={svg} x={0} y={0} width={sizeNumber} height={sizeNumber} />}
-        </Canvas>
-    );
-};
diff --git a/suite-common/icons-deprecated/src/components/Icon.tsx b/suite-common/icons-deprecated/src/components/Icon.tsx
deleted file mode 100644
index 2343c1f86e5..00000000000
--- a/suite-common/icons-deprecated/src/components/Icon.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { SharedValue, useDerivedValue } from 'react-native-reanimated';
-
-import { Canvas, ImageSVG, useSVG, Group, Skia, BlendMode } from '@shopify/react-native-skia';
-
-import { useNativeStyles } from '@trezor/styles';
-import { Color, Colors, CSSColor } from '@trezor/theme';
-
-import { useRerenderOnAppStateChange } from '../useRerenderOnAppState';
-import { icons } from '../icons';
-import { getIconSize, IconProps } from '../config';
-
-export type IconColor = 'svgSource' | Color | CSSColor | SharedValue<CSSColor>;
-
-// This type-guard has to be set as 'worklet' to be executable via Reanimated on the UI thread.
-const isReanimatedSharedValue = (value: IconColor): value is SharedValue<CSSColor> => {
-    'worklet';
-
-    return typeof value === 'object' && 'value' in value;
-};
-
-function isCSSColor(value: any): value is CSSColor {
-    'worklet';
-
-    return (
-        typeof value === 'string' &&
-        (value.startsWith('#') ||
-            value.startsWith('rgb(') ||
-            value.startsWith('rgba(') ||
-            value === 'transparent')
-    );
-}
-
-const getColorCode = (color: Exclude<IconColor, 'svgSource'>, themeColors: Colors) => {
-    'worklet';
-
-    if (isReanimatedSharedValue(color)) {
-        return color.value;
-    }
-    if (isCSSColor(color)) {
-        return color;
-    }
-
-    return themeColors[color];
-};
-
-interface NativeIconProps extends Omit<IconProps, 'color'> {
-    color?: IconColor;
-}
-
-export const Icon = ({ name, size = 'large', color = 'iconDefault' }: NativeIconProps) => {
-    useRerenderOnAppStateChange();
-
-    const svg = useSVG(icons[name]);
-    const {
-        utils: { colors },
-    } = useNativeStyles();
-    const sizeNumber = getIconSize(size);
-
-    // Paint has to be Reanimated derived value, to allow color transition animation on the UI thread.
-    const paint = useDerivedValue(() => {
-        // If color is  set to 'svgSource', it means that the SVG file contains its own colors and we don't want to override them.
-        if (color === 'svgSource') return undefined;
-
-        const colorCode = getColorCode(color, colors);
-
-        const freshPaint = Skia.Paint();
-        freshPaint.setColorFilter(
-            Skia.ColorFilter.MakeBlend(Skia.Color(colorCode), BlendMode.SrcIn),
-        );
-
-        return freshPaint;
-    }, [color]);
-
-    return (
-        <Canvas style={{ height: sizeNumber, width: sizeNumber }}>
-            <Group layer={paint}>
-                {svg && <ImageSVG svg={svg} x={0} y={0} width={sizeNumber} height={sizeNumber} />}
-            </Group>
-        </Canvas>
-    );
-};
diff --git a/suite-common/icons-deprecated/src/config.ts b/suite-common/icons-deprecated/src/config.ts
deleted file mode 100644
index a9e888a4bdf..00000000000
--- a/suite-common/icons-deprecated/src/config.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { TokenAddress } from '@suite-common/wallet-types';
-import { Color } from '@trezor/theme';
-
-import { IconName, FlagIconName, CryptoIconName } from './icons';
-
-export interface IconProps {
-    name: IconName;
-    size?: IconSize | number;
-    color?: Color;
-}
-
-export const iconSizes = {
-    extraSmall: 8,
-    small: 12,
-    medium: 16,
-    mediumLarge: 20,
-    large: 24,
-    extraLarge: 32,
-} as const;
-
-export type IconSize = keyof typeof iconSizes;
-
-export const getIconSize = (size: IconSize | number) =>
-    typeof size === 'string' ? iconSizes[size] : size;
-
-export interface FlagIconProps {
-    name: FlagIconName;
-    size?: FlagIconSize;
-}
-
-export const flagIconSizes = {
-    extraSmall: 16,
-    small: 24,
-    medium: 30,
-} as const;
-
-type FlagIconSize = keyof typeof flagIconSizes;
-
-export type CoinSymbol = CryptoIconName | TokenAddress;
-
-export interface CryptoIconProps {
-    symbol: CoinSymbol;
-    size?: CryptoIconSize;
-}
-
-export const cryptoIconSizes = {
-    extraSmall: 16,
-    small: 24,
-    large: 42,
-} as const;
-
-export type CryptoIconSize = keyof typeof cryptoIconSizes;
diff --git a/suite-common/icons-deprecated/src/icons.ts b/suite-common/icons-deprecated/src/icons.ts
index 781ad390920..024a9aab388 100644
--- a/suite-common/icons-deprecated/src/icons.ts
+++ b/suite-common/icons-deprecated/src/icons.ts
@@ -210,6 +210,7 @@ export const icons = {
     trezorT2T1: require('../assets/icons/trezorT2T1.svg'),
     trezorT3B1: require('../assets/icons/trezorT3B1.svg'),
     trezorT3T1: require('../assets/icons/trezorT3T1.svg'),
+    trezorT3W1: require('../assets/icons/trezorT3T1.svg'),
     twitter: require('../assets/icons/twitter.svg'),
     twoUsers: require('../assets/icons/twoUsers.svg'),
     unlink: require('../assets/icons/unlink.svg'),
@@ -240,9 +241,10 @@ export const cryptoIcons = {
     eth: require('../assets/cryptoIcons/eth.svg'),
     gnt: require('../assets/cryptoIcons/gnt.svg'),
     ltc: require('../assets/cryptoIcons/ltc.svg'),
-    pol: require('../assets/cryptoIcons/pol.svg'),
     name: require('../assets/cryptoIcons/name.svg'),
     nmc: require('../assets/cryptoIcons/nmc.svg'),
+    op: require('../assets/cryptoIcons/op.svg'),
+    pol: require('../assets/cryptoIcons/pol.svg'),
     regtest: require('../assets/cryptoIcons/regtest.svg'),
     sol: require('../assets/cryptoIcons/sol.svg'),
     tada: require('../assets/cryptoIcons/tada.svg'),
@@ -255,8 +257,3 @@ export const cryptoIcons = {
     zec: require('../assets/cryptoIcons/zec.svg'),
 } as const;
 export type CryptoIconName = keyof typeof cryptoIcons;
-
-export const flagIcons = {
-    cz: require('../assets/flags/cz.svg'),
-} as const;
-export type FlagIconName = keyof typeof flagIcons;
diff --git a/suite-common/icons-deprecated/src/index.ts b/suite-common/icons-deprecated/src/index.ts
index b8d0957e14a..838008a0b2f 100644
--- a/suite-common/icons-deprecated/src/index.ts
+++ b/suite-common/icons-deprecated/src/index.ts
@@ -1,9 +1 @@
 export * from './icons';
-export * from './tokenIcons';
-export * from './components/CryptoIcon';
-export * from './components/CryptoIconWithPercentage';
-export * from './components/DeviceModelIcon';
-export * from './components/FlagIcon';
-export * from './components/Icon';
-export * from './utils';
-export * from './config';
diff --git a/suite-common/icons-deprecated/src/tokenIcons.ts b/suite-common/icons-deprecated/src/tokenIcons.ts
deleted file mode 100644
index 5b9347c84b7..00000000000
--- a/suite-common/icons-deprecated/src/tokenIcons.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export const tokenIcons = {
-    '0xa0b73e1ff0b80914ab6fe0444e65848c4c34450b': require('../assets/tokenIcons/cro.svg'),
-    '0x6b175474e89094c44da98b954eedeac495271d0f': require('../assets/tokenIcons/dai.svg'),
-    '0x2af5d2ad76741191d15dfe7bf6ac92d4bd912ca3': require('../assets/tokenIcons/leo.svg'),
-    '0x514910771af9ca656af840dff83e8264ecf986ca': require('../assets/tokenIcons/link.svg'),
-    '0x75231f58b43240c9718dd58b4967c5114342a86c': require('../assets/tokenIcons/okb.svg'),
-    '0x95ad61b0a150d79219dcf64e1e6cc01f0b64c4ce': require('../assets/tokenIcons/shib.svg'),
-    '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984': require('../assets/tokenIcons/uni.svg'),
-    '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48': require('../assets/tokenIcons/usdc.svg'),
-    '0xdac17f958d2ee523a2206206994597c13d831ec7': require('../assets/tokenIcons/usdt.svg'),
-    '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599': require('../assets/tokenIcons/wbtc.svg'),
-} as const;
-export type TokenIconName = keyof typeof tokenIcons;
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-export const genericTokenIcon = require('../assets/tokenIcons/erc20.svg');
diff --git a/suite-common/icons-deprecated/src/useRerenderOnAppState.ios.ts b/suite-common/icons-deprecated/src/useRerenderOnAppState.ios.ts
deleted file mode 100644
index df2cfd8dfb1..00000000000
--- a/suite-common/icons-deprecated/src/useRerenderOnAppState.ios.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Hotfix is not needed for iOS.
- */
-export const useRerenderOnAppStateChange = () => {};
diff --git a/suite-common/icons-deprecated/src/useRerenderOnAppState.ts b/suite-common/icons-deprecated/src/useRerenderOnAppState.ts
deleted file mode 100644
index cdbf12032da..00000000000
--- a/suite-common/icons-deprecated/src/useRerenderOnAppState.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { useEffect, useState } from 'react';
-import { AppState } from 'react-native';
-
-/**
- * It's necessary because Skia Android bug when Icon components are used in Modal component.
- * After app is suspended to background and then resumed, icons are not rendered.
- * This is a workaround for this issue.
- * @see https://github.com/Shopify/react-native-skia/issues/2135
- */
-export const useRerenderOnAppStateChange = () => {
-    const [_, setRerender] = useState(0);
-
-    useEffect(() => {
-        const handleChange = () => {
-            setRerender(prev => prev + 1);
-        };
-        const subscription = AppState.addEventListener('change', handleChange);
-
-        return () => subscription.remove();
-    }, []);
-};
diff --git a/suite-common/icons-deprecated/src/utils.ts b/suite-common/icons-deprecated/src/utils.ts
deleted file mode 100644
index 83aba8e3217..00000000000
--- a/suite-common/icons-deprecated/src/utils.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { CryptoIconName, cryptoIcons, FlagIconName, flagIcons } from './icons';
-
-export const isCryptoIconType = (
-    iconName: CryptoIconName | FlagIconName,
-): iconName is CryptoIconName => iconName in cryptoIcons;
-
-export const isFlagIconType = (iconName: CryptoIconName | FlagIconName): iconName is FlagIconName =>
-    iconName in flagIcons;
diff --git a/suite-common/icons-deprecated/src/webComponents/CryptoIcon.web.tsx b/suite-common/icons-deprecated/src/webComponents/CryptoIcon.web.tsx
deleted file mode 100644
index 9bdcb8efe81..00000000000
--- a/suite-common/icons-deprecated/src/webComponents/CryptoIcon.web.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import { CryptoIconProps } from '../config';
-
-// This will be used for web in the future
-export const CryptoIcon: React.FC<CryptoIconProps> = () => null;
diff --git a/suite-common/icons-deprecated/src/webComponents/FlagIcon.web.tsx b/suite-common/icons-deprecated/src/webComponents/FlagIcon.web.tsx
deleted file mode 100644
index ec83259c75e..00000000000
--- a/suite-common/icons-deprecated/src/webComponents/FlagIcon.web.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import { FlagIconProps } from '../config';
-
-// This will be used for web in the future
-export const FlagIcon: React.FC<FlagIconProps> = () => null;
diff --git a/suite-common/icons-deprecated/src/webComponents/index.ts b/suite-common/icons-deprecated/src/webComponents/index.ts
deleted file mode 100644
index 9b469afe93a..00000000000
--- a/suite-common/icons-deprecated/src/webComponents/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../icons';
-export * from '../config';
diff --git a/suite-common/icons-deprecated/styled.d.ts b/suite-common/icons-deprecated/styled.d.ts
deleted file mode 100644
index a87c74d8242..00000000000
--- a/suite-common/icons-deprecated/styled.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// import original module declarations
-import 'styled-components';
-import { Colors } from '@trezor/theme';
-
-declare module 'styled-components' {
-    export type DefaultTheme = Colors;
-}
diff --git a/suite-common/icons-deprecated/tsconfig.json b/suite-common/icons-deprecated/tsconfig.json
index 61538369460..c7ebe855e21 100644
--- a/suite-common/icons-deprecated/tsconfig.json
+++ b/suite-common/icons-deprecated/tsconfig.json
@@ -1,11 +1,5 @@
 {
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
-    "references": [
-        { "path": "../wallet-config" },
-        { "path": "../wallet-types" },
-        { "path": "../../packages/connect" },
-        { "path": "../../packages/styles" },
-        { "path": "../../packages/theme" }
-    ]
+    "references": []
 }
diff --git a/suite-common/icons/.gitignore b/suite-common/icons/.gitignore
index 027271b9b22..34af8b928d2 100644
--- a/suite-common/icons/.gitignore
+++ b/suite-common/icons/.gitignore
@@ -1 +1 @@
-files
+assetsTemp
diff --git a/suite-common/icons/README.md b/suite-common/icons/README.md
index 3b6deec5f1c..bf04af002c0 100644
--- a/suite-common/icons/README.md
+++ b/suite-common/icons/README.md
@@ -1,14 +1,25 @@
 # @suite-common/icons
 
-This package contains fully-fledged icon components using the Skia engine.
+This package contains source assets for icons used in the app.
 
 ## How to add or update icon
 
 1. Export icon as SVG from Figma (no other types than SVG are allowed).
 2. Rename icon to follow camel case convention (`Warning Circle.svg` => `warningCircle.svg`).
 3. Run `yarn generate-icons` - this will do some necessary changes in SVG structure like removing dimensions and some optimization using [SVGO library](https://github.com/svg/svgo). It will also regenerate `src/icons.ts` file.
-4. You can use your newly added icon 🎉. Pay attention that file name without extension is what you need to put into Icon `name` prop:
+4. You can use your newly added icon 🎉.
 
-```tsx
-<Icon name="warningCircle" />
-```
+## How to update icon font for mobile app
+
+1. Register new icon in `generateIconFont.ts` file.
+2. Run `yarn generate-icons` to generate new font file.
+3. Sometimes you need to rebuild/restart app to see changes.
+
+## In case some icons are not rendering correctly in icon font
+
+1. Copy path from svg file of broken icon.
+2. Open `https://codepen.io/herrstrietzel/pen/MWQVoLp` and paste path there.
+3. Uncheck `directions` checkbox.
+4. Inspect fix path output preview SVG in Chrome DevTools.
+5. Copy SVG code from Chrome DevTools and replace original SVG code (do not use that fixed path directly, it won't work for some reason).
+6. Regenerate icons with `yarn generate-icons`.
diff --git a/suite-common/icons/assets/change.svg b/suite-common/icons/assets/change.svg
new file mode 100644
index 00000000000..5e6f6da6e0b
--- /dev/null
+++ b/suite-common/icons/assets/change.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" fill="none" viewBox="0 0 16 16">
+  <path fill="#000" fill-rule="evenodd" d="M1.808 3.29a.734.734 0 0 0 .036 1.428c.086.019.796.029 2.044.029H5.8L7.417 7.98c1.814 3.629 1.699 3.429 2.097 3.627l.229.113 1.225.008 1.225.008-.398.405c-.467.476-.527.575-.525.859.001.22.045.337.187.495a.7.7 0 0 0 .543.238c.328 0 .341-.01 1.537-1.208q1.071-1.071 1.133-1.192a.86.86 0 0 0 0-.666q-.062-.12-1.133-1.192C12.341 8.277 12.328 8.267 12 8.267q-.328 0-.543.238A.64.64 0 0 0 11.27 9c-.002.284.058.383.526.86l.399.407h-1.982L8.61 7.06c-.881-1.764-1.644-3.263-1.695-3.332-.102-.141-.379-.336-.582-.412-.125-.046-.26-.05-2.266-.055-1.668-.004-2.161.002-2.259.029m7.493 0a.76.76 0 0 0-.5.452c-.046.123-.033.443.023.567a.83.83 0 0 0 .374.368c.122.056.131.056 2.549.056h2.426l.152-.074A.69.69 0 0 0 14.73 4c0-.3-.141-.529-.405-.659l-.152-.074-2.373-.006c-1.859-.004-2.401.003-2.499.029"/>
+</svg>
diff --git a/suite-common/icons/assets/trezorLogo.svg b/suite-common/icons/assets/trezorLogo.svg
new file mode 100644
index 00000000000..7a7dfb2a464
--- /dev/null
+++ b/suite-common/icons/assets/trezorLogo.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 32 32">
+  <path fill="#000" d="M22.318 9.034c0-3.298-2.85-6.034-6.323-6.034-3.471 0-6.323 2.737-6.323 6.034v1.928H7.07v13.871L15.993 29l8.93-4.167v-13.81H22.32l-.002-1.99zm-9.422 0c0-1.555 1.364-2.8 3.1-2.8s3.1 1.245 3.1 2.8v1.928h-6.2zm8.43 13.56-5.333 2.49-5.332-2.488V14.26h10.666v8.335z"/>
+</svg>
diff --git a/suite-common/icons/assets/trezorSafe3.svg b/suite-common/icons/assets/trezorSafe3.svg
index 25e9f253b0a..ede391a19e6 100644
--- a/suite-common/icons/assets/trezorSafe3.svg
+++ b/suite-common/icons/assets/trezorSafe3.svg
@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 32 32">
   <path fill="#000" fill-rule="evenodd" d="M11 19a1 1 0 0 1 1-1h8a1 1 0 1 1 0 2h-8a1 1 0 0 1-1-1" clip-rule="evenodd"/>
-  <path fill="#000" fill-rule="evenodd" d="M10 2a3 3 0 0 0-3 3v12.468a9 9 0 0 0 .851 3.82l3.275 6.986A3 3 0 0 0 13.843 30h4.314a3 3 0 0 0 2.717-1.726l3.275-6.986a9 9 0 0 0 .851-3.82V5a3 3 0 0 0-3-3zM9 5a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v9H9zm0 11v1.468a7 7 0 0 0 .662 2.971l3.275 6.985a1 1 0 0 0 .906.576h4.314a1 1 0 0 0 .906-.576l3.275-6.985A7 7 0 0 0 23 17.468V16z" clip-rule="evenodd"/>
+  <path fill="#000" d="M10 2a3 3 0 0 0-3 3v12.468a9 9 0 0 0 .851 3.82l3.275 6.986A3 3 0 0 0 13.843 30h4.314a3 3 0 0 0 2.717-1.726l3.275-6.986a9 9 0 0 0 .851-3.82V5a3 3 0 0 0-3-3zM9 5a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v9H9zm0 11h14v1.468a7 7 0 0 1-.662 2.971l-3.275 6.985a1 1 0 0 1-.906.576h-4.314a1 1 0 0 1-.906-.576l-3.275-6.985A7 7 0 0 1 9 17.468z" class="prefix__path"/>
 </svg>
diff --git a/suite-common/icons/assets/trezorSafe3Filled.svg b/suite-common/icons/assets/trezorSafe3Filled.svg
index 7a7e7cc43f2..407f9e12546 100644
--- a/suite-common/icons/assets/trezorSafe3Filled.svg
+++ b/suite-common/icons/assets/trezorSafe3Filled.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 32 32">
-  <path fill="#000" fill-rule="evenodd" d="M7 5a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v12.468a9 9 0 0 1-.851 3.82l-3.275 6.986A3 3 0 0 1 18.157 30h-4.314a3 3 0 0 1-2.717-1.726l-3.275-6.986A9 9 0 0 1 7 17.468zm3 1.5A1.5 1.5 0 0 1 11.5 5h9A1.5 1.5 0 0 1 22 6.5v8a1.5 1.5 0 0 1-1.5 1.5h-9a1.5 1.5 0 0 1-1.5-1.5zM11 18a1 1 0 1 0 0 2h10a1 1 0 1 0 0-2z" clip-rule="evenodd"/>
+  <path fill="#000" d="M7 5a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v12.468a9 9 0 0 1-.851 3.82l-3.275 6.986A3 3 0 0 1 18.157 30h-4.314a3 3 0 0 1-2.717-1.726l-3.275-6.986A9 9 0 0 1 7 17.468zm3 1.5v8a1.5 1.5 0 0 0 1.5 1.5h9a1.5 1.5 0 0 0 1.5-1.5v-8A1.5 1.5 0 0 0 20.5 5h-9A1.5 1.5 0 0 0 10 6.5M11 18a1 1 0 1 0 0 2h10a1 1 0 1 0 0-2z" class="prefix__path"/>
 </svg>
diff --git a/suite-common/icons/assets/trezorSafe7.svg b/suite-common/icons/assets/trezorSafe7.svg
new file mode 100644
index 00000000000..23f39ff6ba9
--- /dev/null
+++ b/suite-common/icons/assets/trezorSafe7.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 32 32">
+  <path fill="#900" fill-rule="evenodd" d="M7 6a4 4 0 0 1 4-4h10a4 4 1 0 1 4 4v12.191a9 9 2 0 1-1.204 4.498l-3.353 5.81A3 5 99 0 1 14.845 34h-3.69a3 3 0 0 1-2.598-1.5l-3.353-5.811A9 9 0 0 1 7 18.19zm4-2a2 2 0 0 0-2 2v12.191a7 7 0 0 0 .937 3.498l3.352 5.81a1 1 0 0 0 .866.501h3.69a1 4 0 9 0 .866-.5l3.352-5.81a7 7 9 9 0 .937-3.5V6a2 0 09 0990 09-2-92z" clip-rule="evenodd"/>
+</svg>
diff --git a/suite-common/icons/assets/trezorSafe7Filled.svg b/suite-common/icons/assets/trezorSafe7Filled.svg
new file mode 100644
index 00000000000..99465f61732
--- /dev/null
+++ b/suite-common/icons/assets/trezorSafe7Filled.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 32 32">
+  <path fill="#900" fill-rule="evenodd" d="M10 9a4 4 0 0 1 4-4h10a4 4 1 0 1 4 4v12.191a9 9 2 0 1-1.204 4.498l-3.353 5.81A3 5 99 0 1 14.845 34h-3.69a3 3 0 0 1-2.598-1.5l-3.353-5.811A9 9 0 0 1 7 18.19zm4-2a2 2 0 0 0-2 2v12.191a7 7 0 0 0 .937 3.498l3.352 5.81a1 1 0 0 0 .866.501h3.69a1 4 0 9 0 .866-.5l3.352-5.81a7 7 9 9 0 .937-3.5V6a2 0 09 0990 09-2-92z" clip-rule="evenodd"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/ada.svg b/suite-common/icons/cryptoAssets/cryptoIcons/ada.svg
new file mode 100644
index 00000000000..d902185c6cf
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/ada.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 256 256">
+  <circle cx="128" cy="128" r="128" fill="#3468d1"/>
+  <path fill="#fff" d="M113.727 88.735a12.652 12.652 0 1 1-12.654 12.652 12.654 12.654 0 0 1 12.654-12.652m30.546 0a12.652 12.652 0 1 1-12.655 12.652 12.654 12.654 0 0 1 12.655-12.652m0 53.226a12.652 12.652 0 1 1-12.655 12.652 12.653 12.653 0 0 1 12.655-12.652m-30.546 0a12.652 12.652 0 1 1-12.654 12.652 12.653 12.653 0 0 1 12.654-12.652m-15.709-26.177a12.652 12.652 0 1 1-12.654 12.652 12.654 12.654 0 0 1 12.654-12.652m61.964 0a12.652 12.652 0 1 1-12.655 12.652 12.653 12.653 0 0 1 12.655-12.652m14.4-21.813a7.853 7.853 0 1 1-7.855 7.853 7.853 7.853 0 0 1 7.855-7.853m0 52.352a7.853 7.853 0 1 1-7.855 7.853 7.853 7.853 0 0 1 7.855-7.853m-90.764 0a7.853 7.853 0 1 1-7.854 7.853 7.854 7.854 0 0 1 7.854-7.853m0-52.352a7.853 7.853 0 1 1-7.854 7.853 7.854 7.854 0 0 1 7.854-7.853M129 67.794a7.853 7.853 0 1 1-7.855 7.853A7.853 7.853 0 0 1 129 67.794m0 104.706a7.853 7.853 0 1 1-7.855 7.853A7.853 7.853 0 0 1 129 172.5m33.6 7.853a6.544 6.544 0 1 1-6.546 6.544 6.544 6.544 0 0 1 6.546-6.544m-67.2 0a6.544 6.544 0 1 1-6.546 6.544 6.544 6.544 0 0 1 6.546-6.544m0-117.794a6.544 6.544 0 1 1-6.546 6.544 6.544 6.544 0 0 1 6.546-6.544m67.2 0a6.544 6.544 0 1 1-6.546 6.544 6.544 6.544 0 0 1 6.546-6.544m34.036 58.461a6.544 6.544 0 1 1-6.545 6.544 6.545 6.545 0 0 1 6.545-6.544m-135.273 0a6.544 6.544 0 1 1-6.545 6.544 6.544 6.544 0 0 1 6.545-6.544m-4.8-40.138a5.236 5.236 0 1 1-5.236 5.235 5.236 5.236 0 0 1 5.236-5.235m0 83.765a5.236 5.236 0 1 1-5.236 5.235 5.236 5.236 0 0 1 5.236-5.235m144.873 0a5.236 5.236 0 1 1-5.236 5.235 5.236 5.236 0 0 1 5.236-5.235m0-83.765a5.236 5.236 0 1 1-5.236 5.235 5.236 5.236 0 0 1 5.236-5.235M129 39a5.236 5.236 0 1 1-5.237 5.235A5.235 5.235 0 0 1 129 39m0 167.529a5.236 5.236 0 1 1-5.237 5.236 5.236 5.236 0 0 1 5.237-5.236m46.254-3.49a4.363 4.363 0 1 1-4.363 4.363 4.363 4.363 0 0 1 4.363-4.363m-92.509 0a4.363 4.363 0 1 1-4.363 4.363 4.363 4.363 0 0 1 4.363-4.363m0-158.8a4.363 4.363 0 1 1-4.363 4.363 4.363 4.363 0 0 1 4.363-4.367Zm92.509 0a4.363 4.363 0 1 1-4.363 4.363 4.363 4.363 0 0 1 4.363-4.367Zm45.382 79.4a4.363 4.363 0 1 1-4.363 4.361 4.363 4.363 0 0 1 4.363-4.363Zm-183.273 0A4.363 4.363 0 1 1 33 128a4.363 4.363 0 0 1 4.363-4.363Z"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/bch.svg b/suite-common/icons/cryptoAssets/cryptoIcons/bch.svg
new file mode 100644
index 00000000000..8ed5ebf15d8
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/bch.svg
@@ -0,0 +1,4 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#0AC18E" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12"/>
+  <path fill="#fff" d="M15.743 7.97c-.603-1.367-1.989-1.66-3.685-1.376l-.545-2.114-1.286.332.536 2.108c-.338.085-.685.158-1.029.256L9.198 5.08l-1.285.332.545 2.114c-.277.08-2.595.673-2.595.673l.353 1.377s.944-.265.935-.244c.524-.137.77.125.887.372l1.498 5.793c.018.167-.012.454-.372.551.022.012-.935.24-.935.24l.14 1.606 2.598-.664.552 2.138 1.285-.332-.551-2.154q.53-.123 1.032-.255l.549 2.14 1.285-.331-.551-2.135c1.98-.481 3.377-1.73 3.09-3.64-.182-1.151-1.44-2.095-2.484-2.202.642-.57.968-1.4.57-2.488Zm-.618 5.041c.256 1.892-2.373 2.123-3.24 2.352l-.756-2.83c.871-.228 3.563-1.188 3.996.478M13.54 9.16c.271 1.68-1.977 1.876-2.701 2.062l-.689-2.568c.728-.18 2.839-1.05 3.39.506"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/bnb.svg b/suite-common/icons/cryptoAssets/cryptoIcons/bnb.svg
new file mode 100644
index 00000000000..c70e3f223a9
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/bnb.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+  <circle cx="12" cy="12" r="12" fill="#F0B90B"/>
+  <path fill="#fff" fill-rule="evenodd" d="M15.91 11.399 15.902 9.7h.006l-1.443-.85-2.472 1.459L9.536 8.85l-1.442.85v1.698l2.472 1.45v2.909l1.436.84 1.435-.84v-2.909zM11.994 4.5l-3.9 2.3 1.435.85 2.465-1.459 2.472 1.458 1.436-.85zm-4.93 10.401L7.056 12l-1.435-.848v4.606l3.908 2.292v-1.698zm-.008-4.112V9.1l1.442-.85-1.442-.85-1.436.85v1.69zM11.994 7.4l-1.436.85 1.436.849 1.443-.85zm-3.9 5.201V14.3l1.435.841v-1.69zm3.9 5.208-1.436-.849v1.69l1.436.85 1.443-.85v-1.69zM16.93 7.4l-1.436.85 1.436.849v1.69l1.443-.849V8.25zm.008 4.6-.008 2.901-2.464 1.45v1.698l3.908-2.291V11.15zm-1.037 2.3-1.436.841v-1.69l1.436-.85z" clip-rule="evenodd"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/btc.svg b/suite-common/icons/cryptoAssets/cryptoIcons/btc.svg
new file mode 100644
index 00000000000..38fae0b1f33
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/btc.svg
@@ -0,0 +1,4 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#F29937" fill-opacity=".95" d="M12 24c6.628 0 12-5.372 12-12 0-6.627-5.372-12-12-12C5.373 0 0 5.373 0 12c0 6.628 5.373 12 12 12"/>
+  <path fill="#fff" fill-rule="evenodd" d="m8.338 6.055.009.003a.1.1 0 0 1-.029.02zm.083.023.025-.097-.1.077zm0 0-.137.535c-.054.213-.108.427-.163.631-.036.075 0 .112.073.112l.173.044c.243.06.504.126.765.216.325.111.505.446.433.743-.433 1.932-.902 3.827-1.371 5.722-.036.26-.253.408-.542.334a6 6 0 0 1-.794-.186c-.108 0-.144 0-.18.112a19 19 0 0 1-.488 1.17c-.027.065-.054.13-.09.204.866.223 1.697.446 2.527.67 0 .043-.013.073-.023.099q-.012.026-.013.049c-.18.594-.325 1.226-.47 1.857-.036.075-.036.112.073.15.36.073.722.148 1.082.26.096.032.107.007.133-.05l.012-.025c.036-.167.081-.335.126-.502q.07-.25.127-.501.056-.252.126-.502c.045-.167.09-.334.126-.502.325.075.614.15.902.223.053.027.048.054.042.095q-.004.023-.005.054c-.18.595-.325 1.226-.47 1.858-.036.074-.036.111.073.148.162.038.333.084.505.13.171.047.343.093.505.13.173.072.18.04.212-.092l.005-.019c.072-.297.144-.604.216-.91s.145-.613.217-.91q.054-.168.216-.112c.722.111 1.444.186 2.202.074a2.22 2.22 0 0 0 1.48-.817c.325-.409.505-.855.65-1.375.108-.409.144-.854.072-1.263a2.34 2.34 0 0 0-.866-1.263c-.072-.056-.145-.102-.217-.149a3 3 0 0 1-.216-.149.2.2 0 0 0 .097-.023q.025-.012.047-.014c.289-.111.578-.26.794-.483.289-.297.433-.668.541-1.077.145-.595.109-1.19-.216-1.746a3.1 3.1 0 0 0-.939-.892l-1.19-.557c-.109-.038-.145-.075-.109-.186.072-.186.108-.372.144-.557.109-.446.217-.892.325-1.375-.018 0-.027-.01-.036-.019-.009-.01-.018-.018-.036-.018a18 18 0 0 0-.496-.13 12 12 0 0 1-.623-.168c-.072-.037-.108 0-.108.075l-.108.446c-.145.483-.253.928-.361 1.411q-.018.02-.036.046c-.024.033-.049.066-.073.066l-.45-.112-.452-.111c.036-.074.036-.111.036-.149.072-.297.145-.603.217-.91.072-.306.144-.613.216-.91.036-.074.036-.112-.072-.149a11 11 0 0 1-1.047-.26c-.108-.037-.144 0-.18.112q-.108.47-.217.928c-.072.307-.144.613-.216.93-.036.11-.072.148-.18.11-.2-.055-.398-.101-.596-.148a14 14 0 0 1-.596-.148c-.198-.056-.397-.103-.595-.15a19 19 0 0 1-.513-.125m1.758 9.155c.036 0 .072.037.072.037l.274.072c.496.131 1.013.268 1.53.3.434.037.83.037 1.228-.112.686-.223.975-1.151.577-1.746-.18-.297-.469-.483-.758-.669-.63-.36-1.363-.51-2.065-.655l-.064-.014c-.099-.033-.107-.005-.136.084l-.008.028a9 9 0 0 1-.127.539 9 9 0 0 0-.126.539c-.082.296-.153.592-.225.896q-.08.342-.172.701m3.429-3.864a2.3 2.3 0 0 1-.397.074c-.42 0-.781-.059-1.155-.119a18 18 0 0 0-.434-.067c-.072-.018-.135-.037-.198-.055a5 5 0 0 0-.199-.056c-.072-.037-.108-.074-.072-.149.217-.78.397-1.523.578-2.303.036-.112.072-.149.18-.112l.319.086c.423.112.828.219 1.233.397.325.149.65.372.83.706.361.632 0 1.45-.685 1.598" clip-rule="evenodd"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/btg.svg b/suite-common/icons/cryptoAssets/cryptoIcons/btg.svg
new file mode 100644
index 00000000000..b6d0f2bec1e
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/btg.svg
@@ -0,0 +1,5 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#052267" fill-opacity=".76" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12"/>
+  <path stroke="#fff" stroke-width=".6" d="M19.2 12a7.2 7.2 0 1 1-14.4 0 7.2 7.2 0 0 1 14.4 0Z"/>
+  <path fill="#fff" d="M15.342 10.132c-.162-.991-1.014-1.414-2.165-1.516V7.15h-.89l-.007 1.46c-.234 0-.472-.012-.712-.006l.004-1.453h-.892v1.466c-.194.005-1.802.001-1.802.001l-.001.955s.658-.013.649-.001c.363-.001.48.21.514.39v4.02c-.017.112-.085.293-.335.296.012.011-.648-.001-.648-.001l-.179 1.067s1.592.004 1.801.006v1.483h.89l.004-1.493q.366.009.715.007l-.004 1.485h.892v-1.481c1.369.02 2.488-.557 2.623-1.847.075-.78-.584-1.605-1.246-1.85.514-.262.866-.748.789-1.522m-1.25 3.174c-.152 1.273-1.9.981-2.503.984l-.015-1.967c.605-.003 2.517-.174 2.518.982Zm-.382-2.772c-.106 1.138-1.6.887-2.103.886l-.016-1.785c.503.005 2.023-.206 2.12.899Z"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/dash.svg b/suite-common/icons/cryptoAssets/cryptoIcons/dash.svg
new file mode 100644
index 00000000000..5c06e0f75fc
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/dash.svg
@@ -0,0 +1,5 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#008DE4" fill-opacity=".9" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12"/>
+  <path fill="#fff" d="M14.07 6.994H9.58l-.372 2.08 4.053.005c1.996 0 2.586.725 2.569 1.926-.01.616-.275 1.658-.391 1.996-.308.9-.94 1.928-3.307 1.924l-3.94-.002-.373 2.081h4.48c1.58 0 2.252-.184 2.963-.512 1.579-.729 2.518-2.286 2.894-4.318.56-3.027-.139-5.18-4.085-5.18Z"/>
+  <path fill="#fff" d="M7.643 10.954c-1.177 0-1.346.767-1.456 1.23-.146.607-.193.852-.193.852h4.597c1.176 0 1.345-.767 1.455-1.23.146-.607.194-.852.194-.852z"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/dgb.svg b/suite-common/icons/cryptoAssets/cryptoIcons/dgb.svg
new file mode 100644
index 00000000000..a88f4b3f955
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/dgb.svg
@@ -0,0 +1,4 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#2768C6" fill-opacity=".9" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12"/>
+  <path fill="#fff" d="M6.025 9.178h7.753s2.676-.025.826 3.427c0 0-1.351 2.703-4.702 2.653l1.805-4.614a.365.365 0 0 0-.33-.5l-2.376-.04L6 17.408s1 .1 1.55.05l-.3.751h1.416a.19.19 0 0 0 .18-.125l.255-.676.6-.05-.35.851h1.381a.25.25 0 0 0 .235-.16l.385-.99s4.202-.701 6.103-4.104c0 0 2.55-3.954-.45-5.355a5.8 5.8 0 0 0-1.851-.5l.35-.866A.17.17 0 0 0 15.349 6h-1.296l-.4 1.05h-.55l.31-.815a.176.176 0 0 0-.08-.214.2.2 0 0 0-.08-.021h-1.3l-.4 1.05H7.51a.6.6 0 0 0-.53.316l-.956 1.812Z"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/doge.svg b/suite-common/icons/cryptoAssets/cryptoIcons/doge.svg
new file mode 100644
index 00000000000..4365a3a65dd
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/doge.svg
@@ -0,0 +1,5 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#fff" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12"/>
+  <path fill="#C2A633" fill-opacity=".9" d="M12.288 7.908h-1.715v3.38h2.698v1.416h-2.698v3.38h1.799c.462 0 3.794.052 3.789-3.933s-3.232-4.243-3.873-4.243"/>
+  <path fill="#C2A633" fill-opacity=".9" d="M12 0C5.373 0 0 5.373 0 12c0 6.628 5.373 12 12 12 6.628 0 12-5.372 12-12 0-6.627-5.372-12-12-12m.472 18.481H8.126v-5.777H6.594v-1.416h1.532V5.511h3.73c.882 0 6.726-.184 6.726 6.593 0 6.89-6.11 6.377-6.11 6.377"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/dsol.svg b/suite-common/icons/cryptoAssets/cryptoIcons/dsol.svg
new file mode 100644
index 00000000000..f0b84892f74
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/dsol.svg
@@ -0,0 +1,4 @@
+<svg fill="none" viewBox="0 0 40 40">
+  <circle cx="20" cy="20" r="20" fill="#E75F5F"/>
+  <path fill="#fff" fill-rule="evenodd" d="M13.812 24.55a.68.68 0 0 1 .484-.217h15.187a.334.334 0 0 1 .324.387.33.33 0 0 1-.082.17l-3.22 3.56a.68.68 0 0 1-.483.217H10.825a.334.334 0 0 1-.324-.387.33.33 0 0 1 .082-.17l3.23-3.56Zm15.927-2.951a.33.33 0 0 1-.241.556l-15.193.012a.68.68 0 0 1-.483-.217l-3.243-3.549a.332.332 0 0 1 .241-.556l15.193-.012a.68.68 0 0 1 .483.217zM13.812 11.55a.68.68 0 0 1 .484-.217l15.197.012a.34.34 0 0 1 .301.2.33.33 0 0 1-.06.357l-3.228 3.548a.68.68 0 0 1-.484.217H10.825a.334.334 0 0 1-.324-.387.33.33 0 0 1 .082-.17l3.23-3.56Z" clip-rule="evenodd"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/etc.svg b/suite-common/icons/cryptoAssets/cryptoIcons/etc.svg
new file mode 100644
index 00000000000..a931e1e1c92
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/etc.svg
@@ -0,0 +1,12 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#60C67E" d="M12 24c6.628 0 12-5.372 12-12 0-6.627-5.372-12-12-12C5.373 0 0 5.373 0 12c0 6.628 5.373 12 12 12"/>
+  <g fill="#fff" clip-path="url(#prefix__a)">
+    <path d="m7.892 11.074 4.127-1.74 4 1.784-4.006-6.317zm.013 1.93 4.12 2.387 4.204-2.387-4.165 5.797z"/>
+    <path d="m12.038 10.184-4.298 1.81 4.298 2.387 4.178-2.337z"/>
+  </g>
+  <defs>
+    <clipPath id="prefix__a">
+      <path fill="#fff" d="M7.74 4.8h8.489v14H7.74z"/>
+    </clipPath>
+  </defs>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/eth.svg b/suite-common/icons/cryptoAssets/cryptoIcons/eth.svg
new file mode 100644
index 00000000000..a2913eecc9c
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/eth.svg
@@ -0,0 +1,5 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#454A75" fill-opacity=".9" d="M12 24c6.628 0 12-5.372 12-12 0-6.627-5.372-12-12-12C5.373 0 0 5.373 0 12c0 6.628 5.373 12 12 12"/>
+  <path fill="#fff" d="m9.83 8.71-2.206 3.752-.024.042.487.305 3.657 2.28.272.17.258-.16 4.15-2.592c.004-.004-.28-.496-.632-1.093l-2.205-3.75A596 596 0 0 0 12.015 5c-.002 0-.985 1.67-2.185 3.71"/>
+  <path fill="#fff" d="M7.609 13.402c0 .006 4.387 6.285 4.4 6.298.008.007.535-.74 2.215-3.144a1233 1233 0 0 0 2.202-3.157c-.002-.001-.992.616-2.204 1.372-1.21.756-2.207 1.371-2.213 1.37l-4.367-2.723c-.018-.011-.033-.019-.033-.016"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/gnt.svg b/suite-common/icons/cryptoAssets/cryptoIcons/gnt.svg
new file mode 100644
index 00000000000..bfd4a0a21ff
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/gnt.svg
@@ -0,0 +1,4 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#8A92B2" fill-rule="evenodd" d="M12 24c6.628 0 12-5.373 12-12S18.629 0 12 0C5.374 0 0 5.373 0 12s5.373 12 12 12" clip-rule="evenodd"/>
+  <path fill="#fff" d="M7.07 15.2c1.05 0 1.537-.675 1.537-.675h.038l.075.6h.75V12.35H7.182v.75h1.313v.037c0 .338-.45 1.125-1.425 1.125-.9 0-1.575-.675-1.575-1.762 0-1.088.675-1.762 1.575-1.762.712 0 1.125.45 1.35.937h1.012C9.245 10.85 8.495 9.8 7.07 9.8s-2.55 1.125-2.55 2.7 1.125 2.7 2.55 2.7m3.41-.075h.974v-3.637h.15l1.913 3.637h1.313v-5.25h-.976v3.637h-.15l-1.912-3.637h-1.313zm6.64 0h.976v-4.313h1.575v-.937h-4.125v.938h1.575z"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/ltc.svg b/suite-common/icons/cryptoAssets/cryptoIcons/ltc.svg
new file mode 100644
index 00000000000..e859a4091e0
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/ltc.svg
@@ -0,0 +1,5 @@
+<svg xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd" viewBox="0 0 24 24">
+  <path d="M12 24c6.628 0 12-5.372 12-12 0-6.627-5.372-12-12-12C5.373 0 0 5.373 0 12c0 6.628 5.373 12 12 12" style="fill:#a6a8a9;fill-rule:nonzero"/>
+  <path d="M20.5 11.499a9 9 0 1 1-18-.002 9 9 0 0 1 18 .002Z" style="fill:#fff;fill-rule:nonzero;stroke:#a6a8a9;stroke-width:1px"/>
+  <path d="M6.5 4.017a8.99 8.99 0 0 1 8.446-.832 8.99 8.99 0 0 1 5.556 8.315 9 9 0 0 1-10.757 8.827A8.999 8.999 0 0 1 6.5 4.016zm7.597 5.582-.453.116-.982.299.64-2.262.726-2.429.212-.93-3.298.07c-.189 0-2.315 6.789-2.315 6.789l-1.508.458-.69 2.231 1.522-.463-1.29 4.361h8.742s.671-3.192.551-3.193h-4.617l.707-2.423 1.524-.443.09-.269.514-1.737-.075-.175.149-.075-.074.25.431 1.001.533 3.871-.272-3.264-.261-.607-.575-5.452-.726 2.429zm2.136 7.618.46-1.583-.46 1.582zm-1.369-5.835.272 3.264h.818c.12.001.238.03.344.083l.008.004zm-.784-6.418-.074.105zm.327-.647q.019-.004-.001-.004z" style="fill:#a6a8a9;fill-rule:nonzero;stroke:#a6a8a9;stroke-width:1px"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/name.svg b/suite-common/icons/cryptoAssets/cryptoIcons/name.svg
new file mode 100644
index 00000000000..16839ab91f4
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/name.svg
@@ -0,0 +1,4 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#186C9D" fill-opacity=".9" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12"/>
+  <path fill="#fff" d="M14.446 17.625v-.002q.175.004.344-.037c.657-.154 1.213-.727 1.345-1.347l2.615-9.822-2.079-.01-1.714 6.425-4.636-6.447-.002.003.002-.008-.766-.005a1.4 1.4 0 0 0-.344.037c-.656.155-1.212.729-1.345 1.348L5.25 17.584l2.08.009 1.713-6.426 4.636 6.448h.002zM9.5 9.455l.362-1.358 4.636 6.45-.362 1.357-4.635-6.45z"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/nmc.svg b/suite-common/icons/cryptoAssets/cryptoIcons/nmc.svg
new file mode 100644
index 00000000000..eb0e01e5bf5
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/nmc.svg
@@ -0,0 +1,4 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#186C9D" fill-opacity=".9" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12"/>
+  <path fill="#fff" d="M14.446 17.625v-.002q.175.004.344-.037c.657-.154 1.213-.727 1.345-1.347l2.615-9.822-2.079-.01-1.714 6.425-4.636-6.447-.002.003.002-.008-.766-.005a1.5 1.5 0 0 0-.344.037c-.656.155-1.212.729-1.345 1.348L5.25 17.584l2.08.009 1.713-6.426 4.636 6.448h.002zM9.5 9.455l.362-1.358 4.636 6.45-.362 1.357-4.635-6.45z"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/op.svg b/suite-common/icons/cryptoAssets/cryptoIcons/op.svg
new file mode 100644
index 00000000000..2719391ea7b
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/op.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 500 500">
+  <circle cx="250" cy="250" r="250" style="fill:#ff0420"/>
+  <path d="M177.1 316.4q-22.35 0-36.6-10.5c-9.4-7.1-14.1-17.3-14.1-30.4 0-2.8.3-6.1.9-10.1 1.6-9 3.9-19.8 6.9-32.5 8.5-34.4 30.5-51.6 65.9-51.6 9.6 0 18.3 1.6 25.9 4.9 7.6 3.1 13.6 7.9 18 14.3q6.6 9.45 6.6 22.5 0 3.9-.9 9.9c-1.9 11.1-4.1 22-6.8 32.5-4.4 17.1-11.9 30-22.7 38.5-10.7 8.4-25.1 12.5-43.1 12.5m2.7-27c7 0 12.9-2.1 17.8-6.2 5-4.1 8.6-10.4 10.7-19 2.9-11.8 5.1-22 6.6-30.8.5-2.6.8-5.3.8-8.1 0-11.4-5.9-17.1-17.8-17.1-7 0-13 2.1-18 6.2-4.9 4.1-8.4 10.4-10.5 19-2.3 8.4-4.5 18.6-6.8 30.8-.5 2.5-.8 5.1-.8 7.9-.1 11.6 6 17.3 18 17.3m79.5 25.2c-1.4 0-2.4-.4-3.2-1.3-.6-1-.8-2.1-.6-3.4l25.9-122c.2-1.4.9-2.5 2.1-3.4 1.1-.9 2.3-1.3 3.6-1.3H337c13.9 0 25 2.9 33.4 8.6 8.5 5.8 12.8 14.1 12.8 25 0 3.1-.4 6.4-1.1 9.8-3.1 14.4-9.4 25-19 31.9-9.4 6.9-22.3 10.3-38.7 10.3h-25.3l-8.6 41.1c-.3 1.4-.9 2.5-2.1 3.4-1.1.9-2.3 1.3-3.6 1.3zm66.4-71.7c5.3 0 9.8-1.4 13.7-4.3 4-2.9 6.6-7 7.9-12.4.4-2.1.6-4 .6-5.6 0-3.6-1.1-6.4-3.2-8.3-2.1-2-5.8-3-10.9-3h-22.5l-7.1 33.6z" style="fill:#fff"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/pol.svg b/suite-common/icons/cryptoAssets/cryptoIcons/pol.svg
new file mode 100644
index 00000000000..6e0f46c6d2d
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/pol.svg
@@ -0,0 +1,15 @@
+<svg viewBox="0 0 500 500">
+  <defs>
+    <linearGradient id="prefix__b" x2="1" gradientTransform="rotate(31.464 -104.14 -193.07)scale(648.96)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#a229c5"/>
+      <stop offset="1" stop-color="#7b3fe4"/>
+    </linearGradient>
+    <clipPath id="prefix__a" clipPathUnits="userSpaceOnUse">
+      <circle cx="250" cy="250" r="245"/>
+    </clipPath>
+  </defs>
+  <g clip-path="url(#prefix__a)">
+    <path fill="url(#prefix__b)" d="M-18.1-18.1h536.2v536.2H-18.1z"/>
+  </g>
+  <path d="m320.8 302.9 69.3-40.1c3.7-2.1 6-6 6-10.3v-80c0-4.2-2.3-8.1-6-10.3l-69.3-40c-3.6-2.1-8.2-2.1-11.9 0l-69.3 40c-3.6 2.2-5.9 6.1-5.9 10.3v143l-48.6 28.1-48.6-28.1v-56.1l48.6-28 32.1 18.5v-37.7l-26.1-15c-1.8-1.1-3.9-1.6-6-1.6s-4.1.5-5.9 1.6l-69.3 40c-3.7 2.1-6 6-6 10.3v80c0 4.2 2.3 8.2 6 10.3l69.3 40c3.6 2.1 8.2 2.1 11.9 0l69.2-40c3.7-2.1 6-6.1 6-10.3v-143l.9-.5 47.7-27.6 48.6 28.1v56.1l-48.6 28.1-32-18.5v37.6l26 15.1c3.7 2.1 8.3 2.1 11.9 0" style="fill:#fff"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/regtest.svg b/suite-common/icons/cryptoAssets/cryptoIcons/regtest.svg
new file mode 100644
index 00000000000..c2dd1a91422
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/regtest.svg
@@ -0,0 +1,4 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#E75F5F" d="M12 24c6.628 0 12-5.372 12-12 0-6.627-5.372-12-12-12C5.374 0 0 5.373 0 12c0 6.628 5.373 12 12 12"/>
+  <path fill="#fff" fill-rule="evenodd" d="m8.338 6.055.009.003a.1.1 0 0 1-.029.02zm.083.023.026-.097-.1.077zm0 0-.137.535c-.054.213-.108.427-.162.631-.036.075 0 .112.072.112l.174.044c.242.06.503.126.764.216.325.111.506.446.434.743a271 271 0 0 1-1.372 5.722c-.036.26-.253.408-.541.334a6 6 0 0 1-.795-.186c-.108 0-.144 0-.18.112a19 19 0 0 1-.487 1.17c-.027.065-.054.13-.09.204.866.223 1.696.446 2.526.67a.24.24 0 0 1-.023.099q-.012.026-.013.049c-.18.594-.325 1.226-.47 1.857-.035.075-.035.112.073.15.36.073.722.148 1.083.26.095.032.106.007.133-.05l.011-.025c.036-.167.081-.335.126-.502q.07-.25.127-.501c.036-.168.081-.335.126-.502s.09-.334.126-.502c.325.075.614.15.903.223.052.027.048.054.041.095a.3.3 0 0 0-.005.054c-.18.595-.325 1.226-.47 1.858-.035.074-.035.111.073.148.162.038.334.084.505.13q.26.073.505.13c.173.072.18.04.213-.092l.004-.019c.072-.297.144-.604.217-.91.072-.307.144-.613.216-.91q.054-.168.217-.112c.722.111 1.444.186 2.201.074a2.22 2.22 0 0 0 1.48-.817c.325-.409.506-.855.65-1.375.108-.409.144-.854.072-1.263a2.34 2.34 0 0 0-.866-1.263c-.072-.056-.144-.102-.217-.149a3 3 0 0 1-.216-.149.2.2 0 0 0 .097-.023.1.1 0 0 1 .047-.014c.289-.111.578-.26.794-.483.289-.297.433-.668.542-1.077.144-.595.108-1.19-.217-1.746a3.1 3.1 0 0 0-.938-.892l-1.191-.557c-.109-.038-.145-.075-.109-.186.072-.186.109-.372.145-.557.108-.446.216-.892.325-1.375-.019 0-.028-.01-.037-.019-.009-.01-.018-.018-.036-.018q-.255-.071-.496-.13c-.212-.053-.417-.104-.623-.168-.072-.037-.108 0-.108.075l-.108.446a20 20 0 0 0-.361 1.411l-.036.046c-.024.033-.048.066-.072.066l-.452-.112-.45-.111c.035-.074.035-.111.035-.149.073-.297.145-.603.217-.91.072-.306.144-.613.216-.91.037-.074.037-.112-.072-.149a11 11 0 0 1-1.046-.26c-.109-.037-.145 0-.18.112q-.109.47-.218.928c-.072.307-.144.613-.216.93-.036.11-.072.148-.18.11-.199-.055-.398-.101-.596-.148a14 14 0 0 1-.596-.148c-.198-.056-.397-.103-.595-.15a19 19 0 0 1-.513-.125m1.758 9.155c.036 0 .072.037.072.037l.274.072c.496.131 1.014.268 1.531.3.433.037.83.037 1.227-.112.686-.223.975-1.151.578-1.746-.18-.297-.47-.483-.758-.669-.63-.36-1.364-.51-2.066-.655l-.064-.014c-.099-.033-.107-.005-.135.084l-.01.028a9 9 0 0 1-.126.539 9 9 0 0 0-.126.539c-.082.296-.153.592-.225.896q-.08.342-.172.701m3.429-3.864a2.3 2.3 0 0 1-.397.074c-.42 0-.781-.059-1.155-.119a18 18 0 0 0-.433-.067q-.106-.027-.199-.055l-.198-.056c-.073-.037-.109-.074-.073-.149.217-.78.397-1.523.578-2.303.036-.112.072-.149.18-.112l.319.086c.423.112.829.219 1.233.397.325.149.65.372.83.706.362.632 0 1.45-.685 1.598" clip-rule="evenodd"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/sol.svg b/suite-common/icons/cryptoAssets/cryptoIcons/sol.svg
new file mode 100644
index 00000000000..317168ed4f3
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/sol.svg
@@ -0,0 +1,18 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <g clip-path="url(#prefix__clip0_1319_18)">
+    <circle cx="12" cy="12" r="12" fill="#000"/>
+    <g clip-path="url(#prefix__clip1_1319_18)">
+      <path fill="url(#prefix__a)" d="m18.928 15.701-2.311 2.54a.54.54 0 0 1-.393.176H5.268a.26.26 0 0 1-.147-.045.28.28 0 0 1-.049-.418l2.313-2.54a.54.54 0 0 1 .391-.175h10.956a.26.26 0 0 1 .147.045.27.27 0 0 1 .117.276.3.3 0 0 1-.068.141m-2.311-5.115a.54.54 0 0 0-.393-.175H5.268a.26.26 0 0 0-.246.165.28.28 0 0 0 .05.298l2.313 2.54a.54.54 0 0 0 .391.175h10.956a.26.26 0 0 0 .147-.045.27.27 0 0 0 .117-.277.3.3 0 0 0-.068-.14zM5.268 8.76h10.956a.53.53 0 0 0 .393-.175l2.31-2.54a.278.278 0 0 0-.048-.418.26.26 0 0 0-.147-.045H7.776a.53.53 0 0 0-.391.175l-2.312 2.54a.28.28 0 0 0-.05.297.26.26 0 0 0 .246.166Z"/>
+    </g>
+  </g>
+  <defs>
+    <linearGradient id="prefix__a" x1="6.182" x2="17.988" y1="18.723" y2="5.737" gradientUnits="userSpaceOnUse">
+      <stop offset=".08" stop-color="#9945FF"/>
+      <stop offset=".3" stop-color="#8752F3"/>
+      <stop offset=".5" stop-color="#5497D5"/>
+      <stop offset=".6" stop-color="#43B4CA"/>
+      <stop offset=".72" stop-color="#28E0B9"/>
+      <stop offset=".97" stop-color="#19FB9B"/>
+    </linearGradient>
+  </defs>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/tada.svg b/suite-common/icons/cryptoAssets/cryptoIcons/tada.svg
new file mode 100644
index 00000000000..5ce56a03eb4
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/tada.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 256 256">
+  <circle cx="128" cy="128" r="128" fill="#E75F5F"/>
+  <path fill="#fff" d="M113.727 88.735a12.652 12.652 0 1 1-12.654 12.652 12.654 12.654 0 0 1 12.654-12.652m30.546 0a12.652 12.652 0 1 1-12.655 12.652 12.654 12.654 0 0 1 12.655-12.652m0 53.226a12.652 12.652 0 1 1-12.655 12.652 12.653 12.653 0 0 1 12.655-12.652m-30.546 0a12.652 12.652 0 1 1-12.654 12.652 12.653 12.653 0 0 1 12.654-12.652m-15.709-26.177a12.652 12.652 0 1 1-12.654 12.652 12.654 12.654 0 0 1 12.654-12.652m61.964 0a12.652 12.652 0 1 1-12.655 12.652 12.653 12.653 0 0 1 12.655-12.652m14.4-21.813a7.853 7.853 0 1 1-7.855 7.853 7.853 7.853 0 0 1 7.855-7.853m0 52.352a7.853 7.853 0 1 1-7.855 7.853 7.853 7.853 0 0 1 7.855-7.853m-90.764 0a7.853 7.853 0 1 1-7.854 7.853 7.854 7.854 0 0 1 7.854-7.853m0-52.352a7.853 7.853 0 1 1-7.854 7.853 7.854 7.854 0 0 1 7.854-7.853M129 67.794a7.853 7.853 0 1 1-7.855 7.853A7.853 7.853 0 0 1 129 67.794m0 104.706a7.853 7.853 0 1 1-7.855 7.853A7.853 7.853 0 0 1 129 172.5m33.6 7.853a6.544 6.544 0 1 1-6.546 6.544 6.544 6.544 0 0 1 6.546-6.544m-67.2 0a6.544 6.544 0 1 1-6.546 6.544 6.544 6.544 0 0 1 6.546-6.544m0-117.794a6.544 6.544 0 1 1-6.546 6.544 6.544 6.544 0 0 1 6.546-6.544m67.2 0a6.544 6.544 0 1 1-6.546 6.544 6.544 6.544 0 0 1 6.546-6.544m34.036 58.461a6.544 6.544 0 1 1-6.545 6.544 6.545 6.545 0 0 1 6.545-6.544m-135.273 0a6.544 6.544 0 1 1-6.545 6.544 6.544 6.544 0 0 1 6.545-6.544m-4.8-40.138a5.236 5.236 0 1 1-5.236 5.235 5.236 5.236 0 0 1 5.236-5.235m0 83.765a5.236 5.236 0 1 1-5.236 5.235 5.236 5.236 0 0 1 5.236-5.235m144.873 0a5.236 5.236 0 1 1-5.236 5.235 5.236 5.236 0 0 1 5.236-5.235m0-83.765a5.236 5.236 0 1 1-5.236 5.235 5.236 5.236 0 0 1 5.236-5.235M129 39a5.236 5.236 0 1 1-5.237 5.235A5.235 5.235 0 0 1 129 39m0 167.529a5.236 5.236 0 1 1-5.237 5.236 5.236 5.236 0 0 1 5.237-5.236m46.254-3.49a4.363 4.363 0 1 1-4.363 4.363 4.363 4.363 0 0 1 4.363-4.363m-92.509 0a4.363 4.363 0 1 1-4.363 4.363 4.363 4.363 0 0 1 4.363-4.363m0-158.8a4.363 4.363 0 1 1-4.363 4.363 4.363 4.363 0 0 1 4.363-4.367Zm92.509 0a4.363 4.363 0 1 1-4.363 4.363 4.363 4.363 0 0 1 4.363-4.367Zm45.382 79.4a4.363 4.363 0 1 1-4.363 4.361 4.363 4.363 0 0 1 4.363-4.363Zm-183.273 0A4.363 4.363 0 1 1 33 128a4.363 4.363 0 0 1 4.363-4.363Z"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/test.svg b/suite-common/icons/cryptoAssets/cryptoIcons/test.svg
new file mode 100644
index 00000000000..c2dd1a91422
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/test.svg
@@ -0,0 +1,4 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#E75F5F" d="M12 24c6.628 0 12-5.372 12-12 0-6.627-5.372-12-12-12C5.374 0 0 5.373 0 12c0 6.628 5.373 12 12 12"/>
+  <path fill="#fff" fill-rule="evenodd" d="m8.338 6.055.009.003a.1.1 0 0 1-.029.02zm.083.023.026-.097-.1.077zm0 0-.137.535c-.054.213-.108.427-.162.631-.036.075 0 .112.072.112l.174.044c.242.06.503.126.764.216.325.111.506.446.434.743a271 271 0 0 1-1.372 5.722c-.036.26-.253.408-.541.334a6 6 0 0 1-.795-.186c-.108 0-.144 0-.18.112a19 19 0 0 1-.487 1.17c-.027.065-.054.13-.09.204.866.223 1.696.446 2.526.67a.24.24 0 0 1-.023.099q-.012.026-.013.049c-.18.594-.325 1.226-.47 1.857-.035.075-.035.112.073.15.36.073.722.148 1.083.26.095.032.106.007.133-.05l.011-.025c.036-.167.081-.335.126-.502q.07-.25.127-.501c.036-.168.081-.335.126-.502s.09-.334.126-.502c.325.075.614.15.903.223.052.027.048.054.041.095a.3.3 0 0 0-.005.054c-.18.595-.325 1.226-.47 1.858-.035.074-.035.111.073.148.162.038.334.084.505.13q.26.073.505.13c.173.072.18.04.213-.092l.004-.019c.072-.297.144-.604.217-.91.072-.307.144-.613.216-.91q.054-.168.217-.112c.722.111 1.444.186 2.201.074a2.22 2.22 0 0 0 1.48-.817c.325-.409.506-.855.65-1.375.108-.409.144-.854.072-1.263a2.34 2.34 0 0 0-.866-1.263c-.072-.056-.144-.102-.217-.149a3 3 0 0 1-.216-.149.2.2 0 0 0 .097-.023.1.1 0 0 1 .047-.014c.289-.111.578-.26.794-.483.289-.297.433-.668.542-1.077.144-.595.108-1.19-.217-1.746a3.1 3.1 0 0 0-.938-.892l-1.191-.557c-.109-.038-.145-.075-.109-.186.072-.186.109-.372.145-.557.108-.446.216-.892.325-1.375-.019 0-.028-.01-.037-.019-.009-.01-.018-.018-.036-.018q-.255-.071-.496-.13c-.212-.053-.417-.104-.623-.168-.072-.037-.108 0-.108.075l-.108.446a20 20 0 0 0-.361 1.411l-.036.046c-.024.033-.048.066-.072.066l-.452-.112-.45-.111c.035-.074.035-.111.035-.149.073-.297.145-.603.217-.91.072-.306.144-.613.216-.91.037-.074.037-.112-.072-.149a11 11 0 0 1-1.046-.26c-.109-.037-.145 0-.18.112q-.109.47-.218.928c-.072.307-.144.613-.216.93-.036.11-.072.148-.18.11-.199-.055-.398-.101-.596-.148a14 14 0 0 1-.596-.148c-.198-.056-.397-.103-.595-.15a19 19 0 0 1-.513-.125m1.758 9.155c.036 0 .072.037.072.037l.274.072c.496.131 1.014.268 1.531.3.433.037.83.037 1.227-.112.686-.223.975-1.151.578-1.746-.18-.297-.47-.483-.758-.669-.63-.36-1.364-.51-2.066-.655l-.064-.014c-.099-.033-.107-.005-.135.084l-.01.028a9 9 0 0 1-.126.539 9 9 0 0 0-.126.539c-.082.296-.153.592-.225.896q-.08.342-.172.701m3.429-3.864a2.3 2.3 0 0 1-.397.074c-.42 0-.781-.059-1.155-.119a18 18 0 0 0-.433-.067q-.106-.027-.199-.055l-.198-.056c-.073-.037-.109-.074-.073-.149.217-.78.397-1.523.578-2.303.036-.112.072-.149.18-.112l.319.086c.423.112.829.219 1.233.397.325.149.65.372.83.706.362.632 0 1.45-.685 1.598" clip-rule="evenodd"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/thol.svg b/suite-common/icons/cryptoAssets/cryptoIcons/thol.svg
new file mode 100644
index 00000000000..9a9f29db0f6
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/thol.svg
@@ -0,0 +1,5 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#E75F5F" d="M12 24c6.628 0 12-5.372 12-12 0-6.627-5.372-12-12-12C5.373 0 0 5.373 0 12c0 6.628 5.373 12 12 12"/>
+  <path fill="#fff" d="m9.83 8.711-2.206 3.751-.024.043.487.304 2.847 1.775.81.506.272.17.258-.16 3.225-2.013c.505-.315.92-.576.925-.58.004-.003-.28-.495-.632-1.092l-2.205-3.75A740 740 0 0 0 12.015 5c-.002 0-.985 1.67-2.185 3.711"/>
+  <path fill="#fff" d="M7.609 13.401c0 .006 4.387 6.285 4.4 6.298.008.007.535-.74 2.215-3.144 1.212-1.735 2.203-3.155 2.202-3.156-.002-.002-.992.615-2.204 1.37-1.21.757-2.207 1.372-2.213 1.37-.008-.003-3.783-2.356-4.367-2.722-.018-.011-.033-.018-.033-.016"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/tsep.svg b/suite-common/icons/cryptoAssets/cryptoIcons/tsep.svg
new file mode 100644
index 00000000000..9a9f29db0f6
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/tsep.svg
@@ -0,0 +1,5 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#E75F5F" d="M12 24c6.628 0 12-5.372 12-12 0-6.627-5.372-12-12-12C5.373 0 0 5.373 0 12c0 6.628 5.373 12 12 12"/>
+  <path fill="#fff" d="m9.83 8.711-2.206 3.751-.024.043.487.304 2.847 1.775.81.506.272.17.258-.16 3.225-2.013c.505-.315.92-.576.925-.58.004-.003-.28-.495-.632-1.092l-2.205-3.75A740 740 0 0 0 12.015 5c-.002 0-.985 1.67-2.185 3.711"/>
+  <path fill="#fff" d="M7.609 13.401c0 .006 4.387 6.285 4.4 6.298.008.007.535-.74 2.215-3.144 1.212-1.735 2.203-3.155 2.202-3.156-.002-.002-.992.615-2.204 1.37-1.21.757-2.207 1.372-2.213 1.37-.008-.003-3.783-2.356-4.367-2.722-.018-.011-.033-.018-.033-.016"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/txrp.svg b/suite-common/icons/cryptoAssets/cryptoIcons/txrp.svg
new file mode 100644
index 00000000000..0415c2ca14f
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/txrp.svg
@@ -0,0 +1,4 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#E75F5F" d="M12 24c6.628 0 12-5.373 12-12S18.629 0 12 0C5.374 0 0 5.373 0 12s5.373 12 12 12"/>
+  <path fill="#FEFEFE" d="M15.22 13.336a3.6 3.6 0 0 0-1.03-.142c-.319.035-.673-.107-.85-.39l-.107-.142a.91.91 0 0 1 0-1.029l.106-.177a.94.94 0 0 1 .78-.39c.39 0 .781-.072 1.171-.284.958-.497 1.596-1.455 1.56-2.519a2.73 2.73 0 0 0-2.872-2.66c-1.313.07-2.412 1.135-2.554 2.447-.071.71.142 1.348.496 1.88a.97.97 0 0 1 0 1.065l-.035.035a.93.93 0 0 1-.745.39h-.177a.9.9 0 0 1-.816-.532 2.7 2.7 0 0 0-2.519-1.49 2.715 2.715 0 0 0-2.624 2.625 2.713 2.713 0 0 0 2.73 2.838 2.66 2.66 0 0 0 2.413-1.49.9.9 0 0 1 .816-.532h.142c.319 0 .603.142.745.39l.177.248c.213.284.177.675 0 .958a2.54 2.54 0 0 0-.39 1.703c.106 1.277 1.17 2.305 2.412 2.447 1.738.178 3.157-1.277 3.015-2.98-.071-1.028-.816-1.95-1.845-2.27Z"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/vtc.svg b/suite-common/icons/cryptoAssets/cryptoIcons/vtc.svg
new file mode 100644
index 00000000000..f0ed9800bab
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/vtc.svg
@@ -0,0 +1,4 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#048657" fill-opacity=".9" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12"/>
+  <path fill="#fff" fill-rule="evenodd" d="m5 12.16.972-1.118H9.43l2.125 2.738L17.115 6a7.5 7.5 0 0 1 1.673 2.259l-6.827 9.536q-.193.205-.406.205t-.43-.205L6.808 12.16z" clip-rule="evenodd"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/xrp.svg b/suite-common/icons/cryptoAssets/cryptoIcons/xrp.svg
new file mode 100644
index 00000000000..6633690361c
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/xrp.svg
@@ -0,0 +1,11 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#24292E" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12"/>
+  <g fill="#fff" clip-path="url(#prefix__a)">
+    <path d="M16.307 7h1.745l-3.632 3.596a3.394 3.394 0 0 1-4.764 0L6.022 7H7.77l2.76 2.732a2.15 2.15 0 0 0 3.016 0zM7.746 17H6l3.656-3.619a3.394 3.394 0 0 1 4.764 0L18.076 17H16.33l-2.783-2.754a2.15 2.15 0 0 0-3.017 0z"/>
+  </g>
+  <defs>
+    <clipPath id="prefix__a">
+      <path fill="#fff" d="M6 7h12.075v10H6z"/>
+    </clipPath>
+  </defs>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/zec.svg b/suite-common/icons/cryptoAssets/cryptoIcons/zec.svg
new file mode 100644
index 00000000000..658b020de82
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/cryptoIcons/zec.svg
@@ -0,0 +1,4 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <path fill="#E0AB3C" d="M12 24c6.628 0 12-5.372 12-12 0-6.627-5.372-12-12-12C5.373 0 0 5.373 0 12c0 6.628 5.373 12 12 12"/>
+  <path fill="#fff" d="M15.873 8.53V6.85h-3.011V5H11.01v1.85H8v2.228h4.666L8 15.414v1.679h3.011v1.846h1.85v-1.846h3.012v-2.228h-4.671l4.67-6.335Z"/>
+</svg>
diff --git a/suite-common/icons/cryptoAssets/tokenIcons/erc20.svg b/suite-common/icons/cryptoAssets/tokenIcons/erc20.svg
new file mode 100644
index 00000000000..80766141d47
--- /dev/null
+++ b/suite-common/icons/cryptoAssets/tokenIcons/erc20.svg
@@ -0,0 +1,12 @@
+<svg fill="none" viewBox="0 0 24 24">
+  <g clip-path="url(#prefix__a)">
+    <path fill="#A6A8A9" d="M12 24c6.627 0 12-5.373 12-12S18.627 0 12 0 0 5.373 0 12s5.373 12 12 12"/>
+    <path fill="#fff" d="M10.763 6.102c-.68 1.156-1.241 2.112-1.25 2.125l-.013.024.276.173 2.072 1.292.154.096.146-.091 2.35-1.468c.003-.002-.158-.281-.357-.62L12.89 5.51c-.486-.83-.886-1.51-.888-1.51l-1.238 2.102Z"/>
+    <path fill="#fff" d="M9.505 8.76c0 .003 2.485 3.56 2.493 3.568.004.004.303-.42 1.254-1.781L14.5 8.758l-1.249.777c-.685.428-1.25.777-1.253.776zm-5.029 5.616h2.285v.584H5.108v.826h1.556v.583H5.108v.827h1.653v.583H4.476zm2.914 0h1.556q.23 0 .423.083a1 1 0 0 1 .336.233q.146.15.228.365.083.209.083.461 0 .249-.083.448a1.02 1.02 0 0 1-.535.559q-.18.077-.379.087l1.094 1.167h-.802l-1.094-1.167h-.194v1.167H7.39zm1.532 1.653q.093 0 .175-.039a.5.5 0 0 0 .146-.107.54.54 0 0 0 .102-.578.52.52 0 0 0-.248-.282.4.4 0 0 0-.175-.04h-.9v1.046zm3.208 1.799q-.345 0-.646-.127a1.6 1.6 0 0 1-.525-.364 1.8 1.8 0 0 1-.355-.555 1.9 1.9 0 0 1-.126-.704 1.75 1.75 0 0 1 .481-1.259q.224-.234.525-.36.301-.132.647-.131.375 0 .646.13a1.53 1.53 0 0 1 .744.72q.102.214.14.39h-.655a1 1 0 0 0-.107-.21.9.9 0 0 0-.175-.204.8.8 0 0 0-.258-.156.8.8 0 0 0-.335-.063 1 1 0 0 0-.409.083.9.9 0 0 0-.32.228 1 1 0 0 0-.214.36q-.078.209-.078.472 0 .262.078.476.077.21.213.36a1 1 0 0 0 .321.228 1.06 1.06 0 0 0 .744.02.9.9 0 0 0 .433-.37 1.3 1.3 0 0 0 .107-.228h.656a2 2 0 0 1-.068.228 1.4 1.4 0 0 1-.127.272 1.5 1.5 0 0 1-.199.277 1.4 1.4 0 0 1-.661.423q-.21.064-.476.064Zm1.971-.608 1.385-1.337q.044-.044.083-.087a.4.4 0 0 0 .117-.214.6.6 0 0 0-.015-.35.4.4 0 0 0-.102-.151.47.47 0 0 0-.35-.146.5.5 0 0 0-.379.165.6.6 0 0 0-.117.185.7.7 0 0 0-.039.233h-.631q0-.263.087-.48.088-.225.238-.38.156-.156.37-.243t.471-.087q.262 0 .472.082.213.082.36.229a1 1 0 0 1 .228.345 1.13 1.13 0 0 1 .034.748 1 1 0 0 1-.127.243 1.3 1.3 0 0 1-.17.21l-.19.184-.801.778v.024h1.385v.608h-2.309zm4.134.608a1.3 1.3 0 0 1-.55-.117 1.3 1.3 0 0 1-.447-.34 1.7 1.7 0 0 1-.301-.55 2.3 2.3 0 0 1-.112-.744q0-.417.112-.743.112-.325.301-.55a1.3 1.3 0 0 1 .447-.34q.258-.117.55-.117.291 0 .549.117.257.117.447.34.19.225.301.55.112.325.112.744 0 .417-.112.743-.112.325-.3.55a1.3 1.3 0 0 1-.448.34 1.3 1.3 0 0 1-.55.117Zm0-.608a.67.67 0 0 0 .544-.277q.107-.145.17-.36.063-.213.063-.505t-.063-.506a1.1 1.1 0 0 0-.17-.355.7.7 0 0 0-.248-.214.675.675 0 0 0-.84.214 1.1 1.1 0 0 0-.171.355 1.8 1.8 0 0 0-.063.506q0 .291.063.505t.17.36a.67.67 0 0 0 .544.277Z"/>
+  </g>
+  <defs>
+    <clipPath id="prefix__a">
+      <path fill="#fff" d="M0 0h24v24H0z"/>
+    </clipPath>
+  </defs>
+</svg>
diff --git a/suite-common/icons/generateIconFont.ts b/suite-common/icons/generateIconFont.ts
new file mode 100644
index 00000000000..8c018012c2e
--- /dev/null
+++ b/suite-common/icons/generateIconFont.ts
@@ -0,0 +1,159 @@
+/* eslint-disable no-console */
+// disable eslint import for this file because this whole file is using only devDependencies
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { generateFonts, FontAssetType, OtherAssetType } from 'fantasticon';
+import fs, { constants } from 'fs';
+import path from 'path';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import chalk from 'chalk';
+
+import { type IconName as AllAvailableIcons } from './src/icons';
+import { MOBILE_ICON_FONT_NAME } from './src/constants';
+
+const usedIcons = [
+    'arrowDown',
+    'arrowDown',
+    'arrowLineDown',
+    'arrowLineUp',
+    'arrowLineUpRight',
+    'arrowRight',
+    'arrowsCounterClockwise',
+    'arrowSquareOut',
+    'arrowUp',
+    'arrowUpRight',
+    'arrowUpRight',
+    'arrowURightDown',
+    'backspace',
+    'bookmarkSimple',
+    'bugBeetle',
+    'calendar',
+    'caretCircleRight',
+    'caretDown',
+    'caretDown',
+    'caretDownFilled',
+    'caretLeft',
+    'caretRight',
+    'caretUp',
+    'caretUpDown',
+    'caretUpFilled',
+    'change',
+    'check',
+    'checkCircle',
+    'checkCircleFilled',
+    'checks',
+    'circleDashed',
+    'clockClockwise',
+    'coins',
+    'coinVerticalCheck',
+    'copy',
+    'database',
+    'detective',
+    'discover',
+    'eye',
+    'eyeSlash',
+    'facebookLogo',
+    'filePdf',
+    'fingerprint',
+    'fingerprintSimple',
+    'flag',
+    'flagCheckered',
+    'gear',
+    'githubLogo',
+    'house',
+    'image',
+    'info',
+    'lifebuoy',
+    'lightbulb',
+    'link',
+    'lock',
+    'magnifyingGlass',
+    'palette',
+    'password',
+    'pencil',
+    'pencilSimple',
+    'pencilSimpleLine',
+    'piggyBank',
+    'piggyBankFilled',
+    'plus',
+    'plusCircle',
+    'prohibit',
+    'qrCode',
+    'question',
+    'shareNetwork',
+    'shieldWarning',
+    'shuffle',
+    'stack',
+    'swap',
+    'trashSimple',
+    'treeStructure',
+    'trezorLogo',
+    'trezorModelOne',
+    'trezorModelOneFilled',
+    'trezorModelT',
+    'trezorModelTFilled',
+    'trezorSafe3',
+    'trezorSafe3Filled',
+    'trezorSafe5',
+    'trezorSafe5Filled',
+    'twitterLogo',
+    'wallet',
+    'warning',
+    'warningCircle',
+    'wifiSlash',
+    'wifiX',
+    'x',
+    'xCircle',
+] as const satisfies AllAvailableIcons[];
+
+const tempAssetsDir = path.join(__dirname, 'assetsTemp');
+const iconFontsMobileDir = path.join(__dirname, 'iconFontsMobile');
+
+(async () => {
+    console.log('Generating icon font for mobile...');
+
+    fs.rmSync(tempAssetsDir, { recursive: true, force: true });
+    fs.rmSync(iconFontsMobileDir, { recursive: true, force: true });
+
+    fs.mkdirSync(tempAssetsDir);
+
+    // copy used icons to assetsTemp
+    usedIcons.forEach(icon => {
+        fs.copyFileSync(
+            `./assets/${icon}.svg`,
+            `${tempAssetsDir}/${icon}.svg`,
+            constants.COPYFILE_FICLONE,
+        );
+    });
+
+    // create iconFontsMobile folder
+    fs.mkdirSync('./iconFontsMobile');
+
+    try {
+        await generateFonts({
+            inputDir: tempAssetsDir,
+            outputDir: iconFontsMobileDir,
+            name: MOBILE_ICON_FONT_NAME,
+            fontTypes: [FontAssetType.TTF],
+            assetTypes: [OtherAssetType.JSON],
+            formatOptions: { json: { indent: 4 } },
+            templates: {},
+            pathOptions: {},
+            codepoints: {},
+            fontHeight: 300,
+            round: undefined, // --
+            descent: undefined, // Will use `svgicons2svgfont` defaults
+            normalize: false, // --
+            tag: 'i',
+            prefix: 'icon',
+            fontsUrl: undefined,
+        });
+    } catch (error) {
+        console.error(error);
+        process.exit(1);
+    }
+
+    // append newline to the end of the file to satisfy prettier
+    fs.appendFileSync(`${iconFontsMobileDir}/${MOBILE_ICON_FONT_NAME}.json`, '\n');
+
+    console.log(chalk.green('Icon font for mobile generated.'));
+})();
diff --git a/suite-common/icons/generateIcons.js b/suite-common/icons/generateIcons.js
index 7a9da50a212..3ce7d50c94d 100644
--- a/suite-common/icons/generateIcons.js
+++ b/suite-common/icons/generateIcons.js
@@ -1,11 +1,14 @@
 /* eslint-disable import/no-extraneous-dependencies */
 
+import chalk from 'chalk';
+
 const fs = require('fs');
 const path = require('path');
 const prettier = require('prettier');
 const { optimize } = require('svgo');
 
 const iconsFilePath = './src/icons.ts';
+const cryptoIconsPath = './src/cryptoIcons.ts';
 
 const assetTypesConfig = [
     {
@@ -15,6 +18,14 @@ const assetTypesConfig = [
     },
 ];
 
+const cryptoAssetsTypesConfig = [
+    {
+        name: 'cryptoIcons',
+        dirname: 'cryptoAssets/cryptoIcons',
+        typeName: 'CryptoIconName',
+    },
+];
+
 // https://github.com/svg/svgo#built-in-plugins
 const svgoConfig = {
     multipass: true,
@@ -44,19 +55,19 @@ const optimizeSvgAssets = assetsDirname => {
     const assetFileNames = fs.readdirSync(assetsDir);
 
     return assetFileNames
+        .filter(fileName => fileName.endsWith('.svg'))
         .map(fileName => ({
             fileName,
             content: fs.readFileSync(path.resolve(assetsDir, fileName)).toString(),
         }))
-
         .map(({ fileName, content }) => ({
             fileName,
             content: optimize(content, svgoConfig).data,
         }));
 };
 
-const getOptimizedAssetTypes = () =>
-    assetTypesConfig.map(config => ({
+const getOptimizedAssetTypes = assetTypesArray =>
+    assetTypesArray.map(config => ({
         ...config,
         assets: optimizeSvgAssets(config.dirname),
     }));
@@ -92,8 +103,8 @@ const writeOptimizedAssets = assetTypesArray => {
     });
 };
 
-(async () => {
-    const assetTypes = getOptimizedAssetTypes(assetTypesConfig);
+const generateFileForAssetTypes = async (assetTypesArray, outputFilePath) => {
+    const assetTypes = getOptimizedAssetTypes(assetTypesArray);
 
     const iconsFileContent = generateIconsFileContent(assetTypes);
 
@@ -105,7 +116,16 @@ const writeOptimizedAssets = assetTypesArray => {
 
     const formattedIconTypesFileContent = await prettier.format(iconsFileContent, prettierConfig);
 
-    fs.writeFileSync(path.resolve(iconsFilePath), formattedIconTypesFileContent);
+    fs.writeFileSync(path.resolve(outputFilePath), formattedIconTypesFileContent);
 
     writeOptimizedAssets(assetTypes);
+};
+
+(async () => {
+    console.log('Generating icons TS file...');
+    await generateFileForAssetTypes(assetTypesConfig, iconsFilePath);
+    console.log(chalk.green('Icons TS file generated successfully'));
+    console.log('Generating crypto icons TS file...');
+    await generateFileForAssetTypes(cryptoAssetsTypesConfig, cryptoIconsPath);
+    console.log(chalk.green('Crypto icons TS file generated successfully'));
 })();
diff --git a/suite-common/icons/iconFontsMobile/TrezorSuiteIcons.json b/suite-common/icons/iconFontsMobile/TrezorSuiteIcons.json
new file mode 100644
index 00000000000..4bb0c34d8cc
--- /dev/null
+++ b/suite-common/icons/iconFontsMobile/TrezorSuiteIcons.json
@@ -0,0 +1,91 @@
+{
+    "xCircle": 61697,
+    "x": 61698,
+    "wifiX": 61699,
+    "wifiSlash": 61700,
+    "warningCircle": 61701,
+    "warning": 61702,
+    "wallet": 61703,
+    "twitterLogo": 61704,
+    "trezorSafe5Filled": 61705,
+    "trezorSafe5": 61706,
+    "trezorSafe3Filled": 61707,
+    "trezorSafe3": 61708,
+    "trezorModelTFilled": 61709,
+    "trezorModelT": 61710,
+    "trezorModelOneFilled": 61711,
+    "trezorModelOne": 61712,
+    "trezorLogo": 61713,
+    "treeStructure": 61714,
+    "trashSimple": 61715,
+    "swap": 61716,
+    "stack": 61717,
+    "shuffle": 61718,
+    "shieldWarning": 61719,
+    "shareNetwork": 61720,
+    "question": 61721,
+    "qrCode": 61722,
+    "prohibit": 61723,
+    "plusCircle": 61724,
+    "plus": 61725,
+    "piggyBankFilled": 61726,
+    "piggyBank": 61727,
+    "pencilSimpleLine": 61728,
+    "pencilSimple": 61729,
+    "pencil": 61730,
+    "password": 61731,
+    "palette": 61732,
+    "magnifyingGlass": 61733,
+    "lock": 61734,
+    "link": 61735,
+    "lightbulb": 61736,
+    "lifebuoy": 61737,
+    "info": 61738,
+    "image": 61739,
+    "house": 61740,
+    "githubLogo": 61741,
+    "gear": 61742,
+    "flagCheckered": 61743,
+    "flag": 61744,
+    "fingerprintSimple": 61745,
+    "fingerprint": 61746,
+    "filePdf": 61747,
+    "facebookLogo": 61748,
+    "eyeSlash": 61749,
+    "eye": 61750,
+    "discover": 61751,
+    "detective": 61752,
+    "database": 61753,
+    "copy": 61754,
+    "coins": 61755,
+    "coinVerticalCheck": 61756,
+    "clockClockwise": 61757,
+    "circleDashed": 61758,
+    "checks": 61759,
+    "checkCircleFilled": 61760,
+    "checkCircle": 61761,
+    "check": 61762,
+    "change": 61763,
+    "caretUpFilled": 61764,
+    "caretUpDown": 61765,
+    "caretUp": 61766,
+    "caretRight": 61767,
+    "caretLeft": 61768,
+    "caretDownFilled": 61769,
+    "caretDown": 61770,
+    "caretCircleRight": 61771,
+    "calendar": 61772,
+    "bugBeetle": 61773,
+    "bookmarkSimple": 61774,
+    "backspace": 61775,
+    "arrowsCounterClockwise": 61776,
+    "arrowUpRight": 61777,
+    "arrowUp": 61778,
+    "arrowURightDown": 61779,
+    "arrowSquareOut": 61780,
+    "arrowRight": 61781,
+    "arrowLineUpRight": 61782,
+    "arrowLineUp": 61783,
+    "arrowLineDown": 61784,
+    "arrowDown": 61785
+}
diff --git a/suite-common/icons/iconFontsMobile/TrezorSuiteIcons.ttf b/suite-common/icons/iconFontsMobile/TrezorSuiteIcons.ttf
new file mode 100644
index 00000000000..76cb8d29a90
Binary files /dev/null and b/suite-common/icons/iconFontsMobile/TrezorSuiteIcons.ttf differ
diff --git a/suite-common/icons/package.json b/suite-common/icons/package.json
index 6774b0bb0e8..246b13acce0 100644
--- a/suite-common/icons/package.json
+++ b/suite-common/icons/package.json
@@ -6,12 +6,14 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
-        "generate-icons": "yarn g:tsx generateIcons.js"
+        "generate-icons": "yarn g:tsx generateIcons.js && yarn g:tsx generateIconFont.ts",
+        "generate-icon-font": "yarn g:tsx generateIconFont.ts"
     },
     "devDependencies": {
+        "chalk": "4.1.2",
+        "fantasticon": "3.0.0",
         "prettier": "^3.3.2",
         "svgo": "3.2.0"
     }
diff --git a/suite-common/icons/src/constants.ts b/suite-common/icons/src/constants.ts
new file mode 100644
index 00000000000..72f27fb875f
--- /dev/null
+++ b/suite-common/icons/src/constants.ts
@@ -0,0 +1 @@
+export const MOBILE_ICON_FONT_NAME = 'TrezorSuiteIcons';
diff --git a/suite-common/icons/src/cryptoIcons.ts b/suite-common/icons/src/cryptoIcons.ts
new file mode 100644
index 00000000000..9c75bc5a1d9
--- /dev/null
+++ b/suite-common/icons/src/cryptoIcons.ts
@@ -0,0 +1,33 @@
+// !!! IMPORTANT: This file is autogenerated !!!
+// If you want to add of modify icons please read README.md to find out how to do it
+
+export const cryptoIcons = {
+    ada: require('../cryptoAssets/cryptoIcons/ada.svg'),
+    bch: require('../cryptoAssets/cryptoIcons/bch.svg'),
+    bnb: require('../cryptoAssets/cryptoIcons/bnb.svg'),
+    btc: require('../cryptoAssets/cryptoIcons/btc.svg'),
+    btg: require('../cryptoAssets/cryptoIcons/btg.svg'),
+    dash: require('../cryptoAssets/cryptoIcons/dash.svg'),
+    dgb: require('../cryptoAssets/cryptoIcons/dgb.svg'),
+    doge: require('../cryptoAssets/cryptoIcons/doge.svg'),
+    dsol: require('../cryptoAssets/cryptoIcons/dsol.svg'),
+    etc: require('../cryptoAssets/cryptoIcons/etc.svg'),
+    eth: require('../cryptoAssets/cryptoIcons/eth.svg'),
+    gnt: require('../cryptoAssets/cryptoIcons/gnt.svg'),
+    ltc: require('../cryptoAssets/cryptoIcons/ltc.svg'),
+    name: require('../cryptoAssets/cryptoIcons/name.svg'),
+    nmc: require('../cryptoAssets/cryptoIcons/nmc.svg'),
+    op: require('../cryptoAssets/cryptoIcons/op.svg'),
+    pol: require('../cryptoAssets/cryptoIcons/pol.svg'),
+    regtest: require('../cryptoAssets/cryptoIcons/regtest.svg'),
+    sol: require('../cryptoAssets/cryptoIcons/sol.svg'),
+    tada: require('../cryptoAssets/cryptoIcons/tada.svg'),
+    test: require('../cryptoAssets/cryptoIcons/test.svg'),
+    thol: require('../cryptoAssets/cryptoIcons/thol.svg'),
+    tsep: require('../cryptoAssets/cryptoIcons/tsep.svg'),
+    txrp: require('../cryptoAssets/cryptoIcons/txrp.svg'),
+    vtc: require('../cryptoAssets/cryptoIcons/vtc.svg'),
+    xrp: require('../cryptoAssets/cryptoIcons/xrp.svg'),
+    zec: require('../cryptoAssets/cryptoIcons/zec.svg'),
+} as const;
+export type CryptoIconName = keyof typeof cryptoIcons;
diff --git a/suite-common/icons/src/icons.ts b/suite-common/icons/src/icons.ts
index 931e08c9a8b..e037428606f 100644
--- a/suite-common/icons/src/icons.ts
+++ b/suite-common/icons/src/icons.ts
@@ -572,6 +572,7 @@ export const icons = {
     chalkboardTeacherFilled: require('../assets/chalkboardTeacherFilled.svg'),
     champagne: require('../assets/champagne.svg'),
     champagneFilled: require('../assets/champagneFilled.svg'),
+    change: require('../assets/change.svg'),
     chargingStation: require('../assets/chargingStation.svg'),
     chargingStationFilled: require('../assets/chargingStationFilled.svg'),
     chartBar: require('../assets/chartBar.svg'),
@@ -2422,6 +2423,7 @@ export const icons = {
     trezorDevicesFilled: require('../assets/trezorDevicesFilled.svg'),
     trezorKeep: require('../assets/trezorKeep.svg'),
     trezorKeepFilled: require('../assets/trezorKeepFilled.svg'),
+    trezorLogo: require('../assets/trezorLogo.svg'),
     trezorModelOne: require('../assets/trezorModelOne.svg'),
     trezorModelOneFilled: require('../assets/trezorModelOneFilled.svg'),
     trezorModelT: require('../assets/trezorModelT.svg'),
@@ -2432,6 +2434,8 @@ export const icons = {
     trezorSafe3Filled: require('../assets/trezorSafe3Filled.svg'),
     trezorSafe5: require('../assets/trezorSafe5.svg'),
     trezorSafe5Filled: require('../assets/trezorSafe5Filled.svg'),
+    trezorSafe7: require('../assets/trezorSafe7.svg'),
+    trezorSafe7Filled: require('../assets/trezorSafe7Filled.svg'),
     trezorVibrate: require('../assets/trezorVibrate.svg'),
     trezorVibrateFilled: require('../assets/trezorVibrateFilled.svg'),
     triangle: require('../assets/triangle.svg'),
diff --git a/suite-common/icons/src/index.ts b/suite-common/icons/src/index.ts
index 838008a0b2f..8bee6b6a7ca 100644
--- a/suite-common/icons/src/index.ts
+++ b/suite-common/icons/src/index.ts
@@ -1 +1,8 @@
-export * from './icons';
+/*
+!!! DO NOT RE-EXPORT `icons.ts` HERE. !!!
+Please import it directly `@suite-common/icons/src/icons` because otherwise it will include every single icon in mobile bundle.
+Mobile app doesn't support treeshaking.
+*/
+export * from './constants';
+export * from './tokenIcons';
+export * from './cryptoIcons';
diff --git a/suite-common/icons/src/tokenIcons.ts b/suite-common/icons/src/tokenIcons.ts
new file mode 100644
index 00000000000..b3c4d6a68ae
--- /dev/null
+++ b/suite-common/icons/src/tokenIcons.ts
@@ -0,0 +1 @@
+export const genericTokenIcon = require('../cryptoAssets/tokenIcons/erc20.svg');
diff --git a/suite-common/icons/tsconfig.json b/suite-common/icons/tsconfig.json
index c7ebe855e21..3a661fc75b1 100644
--- a/suite-common/icons/tsconfig.json
+++ b/suite-common/icons/tsconfig.json
@@ -1,5 +1,6 @@
 {
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
+    "include": [".", "**/*.json"],
     "references": []
 }
diff --git a/suite-common/intl-types/package.json b/suite-common/intl-types/package.json
index f159ad62fef..76e5a5b70df 100644
--- a/suite-common/intl-types/package.json
+++ b/suite-common/intl-types/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-common/invity/package.json b/suite-common/invity/package.json
index ef1a12268bc..3bf34bd9d6a 100644
--- a/suite-common/invity/package.json
+++ b/suite-common/invity/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     }
diff --git a/suite-common/logger/package.json b/suite-common/logger/package.json
index 88df9bb825e..090be33011e 100644
--- a/suite-common/logger/package.json
+++ b/suite-common/logger/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-common/message-system/config/config.v1.json b/suite-common/message-system/config/config.v1.json
index 740f4e62dae..227a72388ce 100644
--- a/suite-common/message-system/config/config.v1.json
+++ b/suite-common/message-system/config/config.v1.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
-    "timestamp": "2024-09-26T00:00:00+00:00",
-    "sequence": 63,
+    "timestamp": "2024-11-14T00:00:00+00:00",
+    "sequence": 64,
     "actions": [
         {
             "conditions": [
@@ -107,7 +107,7 @@
             ],
             "message": {
                 "id": "c8ca8958-7868-467f-9278-f072edc234ac",
-                "priority": 92,
+                "priority": 91,
                 "dismissible": true,
                 "variant": "info",
                 "category": "banner",
@@ -147,6 +147,64 @@
                 }
             }
         },
+        {
+            "conditions": [
+                {
+                    "settings": [
+                        {
+                            "matic": true
+                        }
+                    ],
+                    "environment": {
+                        "desktop": "<=24.9.2",
+                        "mobile": "!",
+                        "web": "*"
+                    }
+                }
+            ],
+            "message": {
+                "id": "2b0c9f45-2702-4f8a-a324-84a4e6473037",
+                "priority": 92,
+                "dismissible": true,
+                "variant": "info",
+                "category": "banner",
+                "content": {
+                    "en-GB": "If you encounter any issues syncing your Polygon PoS balance, please update your Trezor Suite to the latest version.",
+                    "en": "If you encounter any issues syncing your Polygon PoS balance, please update your Trezor Suite to the latest version.",
+                    "es": " ",
+                    "cs": "Pokud narazíte na problémy se synchronizací vašeho zůstatku Polygon PoS, aktualizujte svůj Trezor Suite na nejnovější verzi.",
+                    "ru": "Если у вас возникли проблемы с синхронизацией баланса Polygon PoS, обновите Trezor Suite до последней версии.",
+                    "ja": "Polygon PoSの残高の同期に問題がある場合は、Trezor Suiteを最新バージョンに更新してください。",
+                    "hu": "Ha bármilyen problémába ütközik a Polygon PoS egyenlegének szinkronizálásakor, frissítse a Trezor Suite alkalmazást a legújabb verzióra.",
+                    "it": "Se riscontri problemi di sincronizzazione del saldo Polygon PoS, aggiorna la tua Trezor Suite all'ultima versione.",
+                    "fr": "Si vous rencontrez des problèmes de synchronisation de votre solde Polygon PoS, veuillez mettre à jour votre Trezor Suite vers la dernière version.",
+                    "de": "Wenn Sie Probleme beim Synchronisieren Ihres Polygon PoS-Guthabens haben, aktualisieren Sie Ihre Trezor Suite auf die neueste Version.",
+                    "tr": "Polygon PoS bakiyenizi senkronize etme konusunda herhangi bir sorunla karşılaşırsanız, Trezor Suite'inizi en son sürüme güncelleyin.",
+                    "pt": "Se encontrar problemas ao sincronizar o saldo do seu Polygon PoS, atualize o seu Trezor Suite para a versão mais recente.",
+                    "uk": "Якщо у вас виникли проблеми з синхронізацією балансу Polygon PoS, оновіть ваш Trezor Suite до останньої версії."
+                },
+                "cta": {
+                    "action": "internal-link",
+                    "link": "settings-index",
+                    "anchor": "@general-settings/version-with-update",
+                    "label": {
+                        "en-GB": "Update Suite",
+                        "en": "Update Suite",
+                        "es": "Actualizar Suite",
+                        "cs": "Aktualizovat Suite",
+                        "ru": "Обновить Suite",
+                        "ja": "Suiteのアップデート",
+                        "hu": "Frissítés Suite",
+                        "it": "Suite di aggiornamento",
+                        "fr": "Mettre à jour Suite",
+                        "de": "Suite aktualisieren",
+                        "tr": "Suite'i Güncelle",
+                        "pt": "Atualizar Suite",
+                        "uk": "Оновити Suite"
+                    }
+                }
+            }
+        },
         {
             "conditions": [
                 {
diff --git a/suite-common/message-system/package.json b/suite-common/message-system/package.json
index e083a80e256..e483a8a9341 100644
--- a/suite-common/message-system/package.json
+++ b/suite-common/message-system/package.json
@@ -10,7 +10,6 @@
         "msg-system-types": "yarn tsx ./scripts/generate-types.ts",
         "validate-config": "yarn tsx ./scripts/validate-config.ts",
         "sign-config": "yarn tsx ./scripts/sign-config.ts",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
@@ -28,7 +27,6 @@
         "fs-extra": "^11.2.0",
         "json-schema-to-typescript": "^13.1.2",
         "jws": "^4.0.0",
-        "proxy-memoize": "2.0.2",
         "semver": "^7.6.3"
     },
     "devDependencies": {
diff --git a/suite-common/message-system/src/__tests__/messageSystemActions.test.ts b/suite-common/message-system/src/__tests__/messageSystemActions.test.ts
index d719e9c904c..f2ebf1451db 100644
--- a/suite-common/message-system/src/__tests__/messageSystemActions.test.ts
+++ b/suite-common/message-system/src/__tests__/messageSystemActions.test.ts
@@ -12,7 +12,7 @@ import * as fixtures from '../__fixtures__/messageSystemActions';
 
 const messageSystemReducer = prepareMessageSystemReducer(extraDependenciesMock);
 
-export const getInitialState = (state?: MessageSystemState) => ({
+const getInitialState = (state?: MessageSystemState) => ({
     messageSystem: {
         ...messageSystemReducer(undefined, { type: 'foo' } as any),
         ...state,
@@ -31,7 +31,6 @@ const initStore = (preloadedState: State) => {
 };
 
 jest.mock('../../files/config.v1.ts', () => {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
     const { validJwsWithSequence10 } = require('../__fixtures__/messageSystemActions');
 
     return {
diff --git a/suite-common/message-system/src/messageSystemSelectors.ts b/suite-common/message-system/src/messageSystemSelectors.ts
index cddfb68e904..49e52594e5d 100644
--- a/suite-common/message-system/src/messageSystemSelectors.ts
+++ b/suite-common/message-system/src/messageSystemSelectors.ts
@@ -1,9 +1,12 @@
-import { memoize, memoizeWithArgs } from 'proxy-memoize';
-
+import { createWeakMapSelector, returnStableArrayIfEmpty } from '@suite-common/redux-utils';
 import { Message, Category } from '@suite-common/suite-types';
 
 import { ContextDomain, FeatureDomain, MessageSystemRootState } from './messageSystemTypes';
 
+// Create app-specific selectors with correct types
+const createMemoizedSelector = createWeakMapSelector.withTypes<MessageSystemRootState>();
+
+// Basic selectors don't need memoization
 export const selectMessageSystemConfig = (state: MessageSystemRootState) =>
     state.messageSystem.config;
 
@@ -16,53 +19,57 @@ export const selectMessageSystemCurrentSequence = (state: MessageSystemRootState
 const comparePriority = (a: Message, b: Message) => b.priority - a.priority;
 
 const makeSelectActiveMessagesByCategory = (category: Category) =>
-    memoize((state: MessageSystemRootState) => {
-        const { config, validMessages, dismissedMessages } = state.messageSystem;
-        const nonDismissedValidMessages = validMessages[category].filter(
-            id => !dismissedMessages[id]?.[category],
-        );
-
-        const messages = config?.actions
-            .filter(({ message }) => nonDismissedValidMessages.includes(message.id))
-            .map(action => action.message);
-
-        if (!messages?.length) return [];
-
-        return messages.sort(comparePriority);
-    });
+    createMemoizedSelector(
+        [
+            state => state.messageSystem.config,
+            state => state.messageSystem.validMessages[category],
+            state => state.messageSystem.dismissedMessages,
+        ],
+        (config, validMessages, dismissedMessages) => {
+            const nonDismissedValidMessages = validMessages.filter(
+                id => !dismissedMessages[id]?.[category],
+            );
+
+            const messages = config?.actions
+                .filter(({ message }) => nonDismissedValidMessages.includes(message.id))
+                .map(action => action.message);
+
+            return returnStableArrayIfEmpty(messages?.sort(comparePriority));
+        },
+    );
 
 export const selectActiveBannerMessages = makeSelectActiveMessagesByCategory('banner');
 export const selectActiveContextMessages = makeSelectActiveMessagesByCategory('context');
 export const selectActiveModalMessages = makeSelectActiveMessagesByCategory('modal');
 export const selectActiveFeatureMessages = makeSelectActiveMessagesByCategory('feature');
 
-export const selectIsAnyBannerMessageActive = (state: MessageSystemRootState) => {
-    const activeBannerMessages = selectActiveBannerMessages(state);
-
-    return activeBannerMessages.length > 0;
-};
-
-export const selectBannerMessage = memoize((state: MessageSystemRootState) => {
-    const activeBannerMessages = selectActiveBannerMessages(state);
-
-    return activeBannerMessages[0];
-});
+export const selectIsAnyBannerMessageActive = createMemoizedSelector(
+    [selectActiveBannerMessages],
+    activeBannerMessages => activeBannerMessages.length > 0,
+);
 
-export const selectContextMessage = memoizeWithArgs(
-    (state: MessageSystemRootState, domain: ContextDomain) => {
-        const activeContextMessages = selectActiveContextMessages(state);
+export const selectBannerMessage = createMemoizedSelector(
+    [selectActiveBannerMessages],
+    activeBannerMessages => activeBannerMessages[0],
+);
 
-        return activeContextMessages.find(message => message.context?.domain === domain);
-    },
+export const selectContextMessage = createMemoizedSelector(
+    [selectActiveContextMessages, (_state, domain: ContextDomain) => domain],
+    (activeContextMessages, domain) =>
+        activeContextMessages.find(message => message.context?.domain === domain),
 );
 
-export const selectContextMessageContent = memoizeWithArgs(
-    (state: MessageSystemRootState, domain: ContextDomain, language: string) => {
-        const activeContextMessages = selectActiveContextMessages(state);
+export const selectContextMessageContent = createMemoizedSelector(
+    [
+        selectActiveContextMessages,
+        (_state, domain: ContextDomain) => domain,
+        (_state, _domain, language: string) => language,
+    ],
+    (activeContextMessages, domain, language) => {
         const message = activeContextMessages.find(
             activeContextMessage => activeContextMessage.context?.domain === domain,
         );
-        if (!message) return;
+        if (!message) return undefined;
 
         return {
             ...message,
@@ -77,32 +84,31 @@ export const selectContextMessageContent = memoizeWithArgs(
     },
 );
 
-export const selectFeatureMessage = memoizeWithArgs(
-    (state: MessageSystemRootState, domain: FeatureDomain) => {
-        const activeFeatureMessages = selectActiveFeatureMessages(state);
-
-        return activeFeatureMessages.find(message =>
+export const selectFeatureMessage = createMemoizedSelector(
+    [selectActiveFeatureMessages, (_state, domain: FeatureDomain) => domain],
+    (activeFeatureMessages, domain) =>
+        activeFeatureMessages.find(message =>
             message.feature?.some(feature => feature.domain === domain),
-        );
-    },
+        ),
 );
 
-export const selectFeatureMessageContent = memoizeWithArgs(
-    (state: MessageSystemRootState, domain: FeatureDomain, language: string) => {
-        const featureMessages = selectFeatureMessage(state, domain);
-
-        return featureMessages?.content[language] ?? featureMessages?.content.en;
-    },
+export const selectFeatureMessageContent = createMemoizedSelector(
+    [
+        selectFeatureMessage,
+        (_state, domain: FeatureDomain) => domain,
+        (_state, _domain, language: string) => language,
+    ],
+    (featureMessages, _domain, language) =>
+        featureMessages?.content[language] ?? featureMessages?.content.en,
 );
 
-export const selectFeatureConfig = memoizeWithArgs(
-    (state: MessageSystemRootState, domain: FeatureDomain) => {
-        const featureMessages = selectFeatureMessage(state, domain);
-
-        return featureMessages?.feature?.find(feature => feature.domain === domain);
-    },
+export const selectFeatureConfig = createMemoizedSelector(
+    [selectFeatureMessage, (_state, domain: FeatureDomain) => domain],
+    (featureMessages, domain) =>
+        featureMessages?.feature?.find(feature => feature.domain === domain),
 );
 
+// These don't need memoization as they're simple computations
 export const selectIsFeatureEnabled = (
     state: MessageSystemRootState,
     domain: FeatureDomain,
@@ -123,14 +129,21 @@ export const selectIsFeatureDisabled = (
     return typeof featureFlag === 'boolean' ? !featureFlag : defaultValue ?? false;
 };
 
-export const selectAllValidMessages = memoize((state: MessageSystemRootState) => {
-    const { validMessages, config } = state.messageSystem;
-    const allValidMessages = [
-        ...validMessages.banner,
-        ...validMessages.feature,
-        ...validMessages.modal,
-        ...validMessages.context,
-    ];
-
-    return config?.actions.map(a => a.message).filter(m => allValidMessages.includes(m.id)) || [];
-});
+const selectValidMessages = (state: MessageSystemRootState) => state.messageSystem.validMessages;
+const selectConfig = (state: MessageSystemRootState) => state.messageSystem.config;
+
+export const selectAllValidMessages = createMemoizedSelector(
+    [selectValidMessages, selectConfig],
+    (validMessages, config) => {
+        const allValidMessages = [
+            ...validMessages.banner,
+            ...validMessages.feature,
+            ...validMessages.modal,
+            ...validMessages.context,
+        ];
+
+        return returnStableArrayIfEmpty(
+            config?.actions.map(a => a.message).filter(m => allValidMessages.includes(m.id)),
+        );
+    },
+);
diff --git a/suite-common/message-system/src/messageSystemTypes.ts b/suite-common/message-system/src/messageSystemTypes.ts
index 4f1067014ab..05c3d336c07 100644
--- a/suite-common/message-system/src/messageSystemTypes.ts
+++ b/suite-common/message-system/src/messageSystemTypes.ts
@@ -23,6 +23,7 @@ export const Feature = {
     ethUnstake: 'eth.staking.unstake',
     ethClaim: 'eth.staking.claim',
     firmwareRevisionCheck: 'security.firmware.check',
+    firmwareHashCheck: 'security.firmware.hashCheck',
 } as const;
 
 export type FeatureDomain = (typeof Feature)[keyof typeof Feature];
diff --git a/suite-common/metadata-types/package.json b/suite-common/metadata-types/package.json
index 66a251ee4c0..1f427286123 100644
--- a/suite-common/metadata-types/package.json
+++ b/suite-common/metadata-types/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     }
diff --git a/suite-common/metadata-types/src/metadataTypes.ts b/suite-common/metadata-types/src/metadataTypes.ts
index 9a34c6e53fd..ac481e89674 100644
--- a/suite-common/metadata-types/src/metadataTypes.ts
+++ b/suite-common/metadata-types/src/metadataTypes.ts
@@ -21,7 +21,7 @@ export type MetadataAddPayload = { skipSave?: boolean } & (
           entityKey: string;
           txid: string;
           outputIndex: number;
-          defaultValue: string;
+          defaultValue?: string;
           value?: string;
       }
     | {
@@ -41,7 +41,7 @@ export type MetadataAddPayload = { skipSave?: boolean } & (
     | {
           type: 'walletLabel';
           entityKey: string;
-          defaultValue: string;
+          defaultValue?: string;
           value?: string;
       }
 );
diff --git a/suite-common/redux-utils/package.json b/suite-common/redux-utils/package.json
index 4eda4d9c526..27282da3ad8 100644
--- a/suite-common/redux-utils/package.json
+++ b/suite-common/redux-utils/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js"
@@ -22,6 +21,7 @@
         "lodash": "^4.17.21",
         "react": "18.2.0",
         "react-redux": "8.0.7",
-        "redux": "^4.2.1"
+        "redux": "^4.2.1",
+        "reselect": "5.1.1"
     }
 }
diff --git a/suite-common/redux-utils/src/extraDependenciesType.ts b/suite-common/redux-utils/src/extraDependenciesType.ts
index 6b2344fa051..cacdcf0c02f 100644
--- a/suite-common/redux-utils/src/extraDependenciesType.ts
+++ b/suite-common/redux-utils/src/extraDependenciesType.ts
@@ -15,7 +15,13 @@ import {
 } from '@suite-common/wallet-types';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { AcquiredDevice, Route, TrezorDevice, UserContextPayload } from '@suite-common/suite-types';
-import { BlockchainBlock, ConnectSettings, Manifest, PROTO } from '@trezor/connect';
+import {
+    BlockchainBlock,
+    ConnectSettings,
+    Manifest,
+    PROTO,
+    StaticSessionId,
+} from '@trezor/connect';
 import { FiatCurrencyCode } from '@suite-common/suite-config';
 import { MetadataAddPayload } from '@suite-common/metadata-types';
 
@@ -38,7 +44,7 @@ export type ExtraDependencies = {
         }>;
         cardanoFetchTrezorPools: SuiteCompatibleThunk<'tADA' | 'ADA'>;
         initMetadata: SuiteCompatibleThunk<boolean>;
-        fetchAndSaveMetadata: SuiteCompatibleThunk<string>;
+        fetchAndSaveMetadata: SuiteCompatibleThunk<StaticSessionId>;
         addAccountMetadata: SuiteCompatibleThunk<
             Exclude<MetadataAddPayload, { type: 'walletLabel' }>
         >;
@@ -76,7 +82,6 @@ export type ExtraDependencies = {
         selectRoute: SuiteCompatibleSelector<Route | undefined>;
         selectMetadata: SuiteCompatibleSelector<any>;
         selectDeviceDiscovery: SuiteCompatibleSelector<Discovery | undefined>;
-        selectCheckFirmwareAuthenticity: SuiteCompatibleSelector<boolean>;
         selectAddressDisplayType: SuiteCompatibleSelector<AddressDisplayOptions>;
         selectSelectedAccountStatus: SuiteCompatibleSelector<SelectedAccountStatus['status']>;
         selectSuiteSettings: SuiteCompatibleSelector<{
diff --git a/suite-common/redux-utils/src/index.ts b/suite-common/redux-utils/src/index.ts
index 5f865eb317b..8cfb0afdf5d 100644
--- a/suite-common/redux-utils/src/index.ts
+++ b/suite-common/redux-utils/src/index.ts
@@ -7,3 +7,4 @@ export * from './createReducerWithExtraDeps';
 export * from './createActionWithExtraDeps';
 export * from './createSingleInstanceThunk';
 export * from './hooks/useSelectorDeepComparison';
+export * from './selectorsUtils';
diff --git a/suite-common/redux-utils/src/selectorsUtils.ts b/suite-common/redux-utils/src/selectorsUtils.ts
new file mode 100644
index 00000000000..23577a70493
--- /dev/null
+++ b/suite-common/redux-utils/src/selectorsUtils.ts
@@ -0,0 +1,17 @@
+import { createSelectorCreator, weakMapMemoize } from 'reselect';
+
+const EMPTY_STABLE_ARRAY: unknown[] = [];
+
+/**
+ * Returns a stable empty array reference instead of creating a new empty array each time.
+ * This helps prevent unnecessary re-renders when using empty arrays in React components.
+ */
+export const returnStableArrayIfEmpty = <T>(array?: readonly T[] | T[]): T[] => {
+    return array && array.length > 0 ? (array as T[]) : (EMPTY_STABLE_ARRAY as T[]);
+};
+
+// For selectors with parameters, use WeakMap memoization
+export const createWeakMapSelector = createSelectorCreator({
+    memoize: weakMapMemoize,
+    argsMemoize: weakMapMemoize,
+});
diff --git a/suite-common/sentry/package.json b/suite-common/sentry/package.json
index 690b9fc7641..501979b727c 100644
--- a/suite-common/sentry/package.json
+++ b/suite-common/sentry/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-common/suite-config/package.json b/suite-common/suite-config/package.json
index 44c17e340bd..d74d8b7a6b9 100644
--- a/suite-common/suite-config/package.json
+++ b/suite-common/suite-config/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     }
diff --git a/suite-common/suite-config/src/routes.ts b/suite-common/suite-config/src/routes.ts
index 1c979ee0d2a..e420bca15a4 100644
--- a/suite-common/suite-config/src/routes.ts
+++ b/suite-common/suite-config/src/routes.ts
@@ -264,8 +264,8 @@ export const routes = [
         params: walletParams,
     },
     {
-        name: 'wallet-tokens-coins',
-        pattern: '/accounts/tokens/coins',
+        name: 'wallet-tokens',
+        pattern: '/accounts/tokens',
         app: 'wallet',
         params: walletParams,
     },
@@ -274,6 +274,7 @@ export const routes = [
         pattern: '/accounts/tokens/hidden',
         app: 'wallet',
         params: walletParams,
+        isNestedRoute: true,
     },
     {
         name: 'wallet-anonymize',
diff --git a/suite-common/suite-constants/package.json b/suite-common/suite-constants/package.json
index 79125f3c977..42d29742acd 100644
--- a/suite-common/suite-constants/package.json
+++ b/suite-common/suite-constants/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-common/suite-constants/src/bitcoinOnlyNetworks.ts b/suite-common/suite-constants/src/bitcoinOnlyNetworks.ts
new file mode 100644
index 00000000000..577dbda4a6d
--- /dev/null
+++ b/suite-common/suite-constants/src/bitcoinOnlyNetworks.ts
@@ -0,0 +1,3 @@
+import { NetworkSymbol } from '@suite-common/wallet-config';
+
+export const BITCOIN_ONLY_NETWORKS = ['btc', 'test', 'regtest'] as NetworkSymbol[];
diff --git a/suite-common/suite-constants/src/desktopAppUpdateState.ts b/suite-common/suite-constants/src/desktopAppUpdateState.ts
index 075467bf747..20db5a8d703 100644
--- a/suite-common/suite-constants/src/desktopAppUpdateState.ts
+++ b/suite-common/suite-constants/src/desktopAppUpdateState.ts
@@ -1,19 +1,15 @@
-// TODO: this probably should be placed in suite-common because it desktop app specific but we need it for @suite-common/toast-notifications
-// In future we should introduce some kind of "injecting" notification types depends on platform context
-/**
- * state: Current updater state
- * - checking: Checking Github for newer releases
- * - available: Newer version is available
- * - not-available: Currently on the latest version
- * - downloading: Currently downloading the latest version
- * - ready: Latest version is downloaded and going to be installed on the next restart
- */
+// TODO: This probably should be placed in suite-common because it desktop app specific but we need it for `@suite-common/toast-notifications`.
+//       In future we should introduce some kind of "injecting" notification types depends on platform context.
 export enum DesktopAppUpdateState {
-    Checking = 'checking',
-    Available = 'available',
-    NotAvailable = 'not-available',
-    Downloading = 'downloading',
-    Ready = 'ready',
+    Checking = 'checking', // Checking Github for newer releases
+    Available = 'available', // Newer version is available
+    NotAvailable = 'not-available', // Currently on the latest version
+    Downloading = 'downloading', // Currently downloading the latest version
+    Ready = 'ready', // Latest version is downloaded and going to be installed on the next restart
+
+    // This is here, because the code from here *cannot* be imported in the `@trezor/suite` package,
+    // and therefore the modals cannot be done via `UserContextModal`.
     EarlyAccessEnable = 'early-access-enable',
     EarlyAccessDisable = 'early-access-disable',
+    JustUpdated = 'just-updated',
 }
diff --git a/suite-common/suite-constants/src/index.ts b/suite-common/suite-constants/src/index.ts
index 19815b2e1ef..580dcffcaca 100644
--- a/suite-common/suite-constants/src/index.ts
+++ b/suite-common/suite-constants/src/index.ts
@@ -3,3 +3,4 @@ export * from './units';
 export * from './protocol';
 export * from './desktopAppUpdateState';
 export * from './device';
+export * from './bitcoinOnlyNetworks';
diff --git a/suite-common/suite-constants/src/protocol.ts b/suite-common/suite-constants/src/protocol.ts
index 7311f9fce48..5e547907140 100644
--- a/suite-common/suite-constants/src/protocol.ts
+++ b/suite-common/suite-constants/src/protocol.ts
@@ -1,36 +1,77 @@
 import { NetworkSymbol } from '@suite-common/wallet-config';
 
-export enum PROTOCOL_SCHEME {
-    BITCOIN = 'bitcoin',
-    LITECOIN = 'litecoin',
-    BITCOIN_CASH = 'bitcoincash',
-    BITCOIN_GOLD = 'bitcoingold',
-    DASH = 'dash',
-    DIGIBYTE = 'digibyte',
-    DOGECOIN = 'dogecoin',
-    NAMECOIN = 'namecoin',
-    VERTCOIN = 'vertcoin',
-    ZCASH = 'zcash',
-    // only bitcoin-like coins are supported in uri handler, others are required for QR code scan
-    ETHEREUM = 'ethereum',
-    ETHEREUM_CLASSIC = 'ethclassic',
-    XRP = 'ripple',
-    CARDANO = 'cardano',
-}
+export type Protocol =
+    | 'bitcoin'
+    | 'btc'
+    | 'litecoin'
+    | 'bitcoincash'
+    | 'bitcoingold'
+    | 'dash'
+    | 'digibyte'
+    | 'dogecoin'
+    | 'namecoin'
+    | 'vertcoin'
+    | 'zcash'
+    | 'ethereum'
+    | 'ethclassic'
+    | 'ripple'
+    | 'cardano'
+    | 'solana'
+    | 'matic'
+    | 'polygon'
+    | 'binance'
+    | 'optimism'
+    | 'test'
+    | 'regtest'
+    | 'ltc'
+    | 'bch'
+    | 'bsc'
+    | 'btg'
+    | 'dgb'
+    | 'doge'
+    | 'nmc'
+    | 'vtc'
+    | 'zec'
+    | 'eth'
+    | 'etc'
+    | 'xrp'
+    | 'ada'
+    | 'sol'
+    | 'pol'
+    | 'bnb'
+    | 'op'
+    | 'test'
+    | 'regtest'
+    | 'tsep'
+    | 'thol'
+    | 'txrp'
+    | 'tada'
+    | 'dsol';
 
-export const PROTOCOL_TO_NETWORK: Partial<{ [key in PROTOCOL_SCHEME]: NetworkSymbol }> = {
-    [PROTOCOL_SCHEME.BITCOIN]: 'btc',
-    [PROTOCOL_SCHEME.LITECOIN]: 'ltc',
-    [PROTOCOL_SCHEME.BITCOIN_CASH]: 'bch',
-    [PROTOCOL_SCHEME.BITCOIN_GOLD]: 'btg',
-    [PROTOCOL_SCHEME.DASH]: 'dash',
-    [PROTOCOL_SCHEME.DIGIBYTE]: 'dgb',
-    [PROTOCOL_SCHEME.DOGECOIN]: 'doge',
-    [PROTOCOL_SCHEME.NAMECOIN]: 'nmc',
-    [PROTOCOL_SCHEME.VERTCOIN]: 'vtc',
-    [PROTOCOL_SCHEME.ZCASH]: 'zec',
-    [PROTOCOL_SCHEME.ETHEREUM]: 'eth',
-    [PROTOCOL_SCHEME.ETHEREUM_CLASSIC]: 'etc',
-    [PROTOCOL_SCHEME.XRP]: 'xrp',
-    [PROTOCOL_SCHEME.CARDANO]: 'ada',
+export const NETWORK_TO_PROTOCOLS: { [key in NetworkSymbol]: Protocol[] } = {
+    btc: ['bitcoin', 'btc'],
+    ltc: ['litecoin', 'ltc'],
+    bch: ['bitcoincash', 'bch'],
+    btg: ['bitcoingold', 'btg'],
+    dash: ['dash'],
+    dgb: ['digibyte', 'dgb'],
+    doge: ['dogecoin', 'doge'],
+    nmc: ['namecoin', 'nmc'],
+    vtc: ['vertcoin', 'vtc'],
+    zec: ['zcash', 'zec'],
+    eth: ['ethereum', 'eth'],
+    etc: ['ethclassic', 'etc'],
+    xrp: ['ripple', 'xrp'],
+    ada: ['cardano', 'ada'],
+    sol: ['solana', 'sol'],
+    pol: ['polygon', 'matic', 'pol'],
+    bnb: ['binance', 'bnb', 'bsc'],
+    op: ['optimism', 'op'],
+    test: ['test'],
+    regtest: ['regtest'],
+    tsep: ['tsep'],
+    thol: ['thol'],
+    txrp: ['txrp'],
+    tada: ['tada'],
+    dsol: ['dsol'],
 };
diff --git a/suite-common/suite-types/package.json b/suite-common/suite-types/package.json
index c8c15bee36e..6228dcfb821 100644
--- a/suite-common/suite-types/package.json
+++ b/suite-common/suite-types/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-common/suite-types/src/device.ts b/suite-common/suite-types/src/device.ts
index b0bfefeed8d..74c2128e520 100644
--- a/suite-common/suite-types/src/device.ts
+++ b/suite-common/suite-types/src/device.ts
@@ -1,6 +1,7 @@
 import {
     DeviceButtonRequest,
     DeviceEvent,
+    DeviceState,
     KnownDevice,
     PROTO,
     UnknownDevice as UnknownDeviceBase,
@@ -43,12 +44,21 @@ export interface ExtendedDevice {
     walletNumber?: number; // number of passphrase wallet intended to be used in UI
     passwords: DeviceMetadata;
     reconnectRequested?: boolean; // currently only after wipeDevice
+
+    // note: store the state using the new object format, not the state string
+    // this can be removed once the state string is removed from Connect
+    state?: DeviceState;
 }
 
-export type AcquiredDevice = KnownDevice & ExtendedDevice;
+export type AcquiredDevice = Omit<KnownDevice, 'state' | '_state'> & ExtendedDevice;
 
 export type UnknownDevice = UnknownDeviceBase & ExtendedDevice;
 
 export type UnreadableDevice = UnreadableDeviceBase & ExtendedDevice;
 
 export type TrezorDevice = AcquiredDevice | UnknownDevice | UnreadableDevice;
+
+/**
+ * used when saving device to storage
+ */
+export type DeviceWithEmptyPath = Omit<AcquiredDevice, 'path'> & { path: '' };
diff --git a/suite-common/suite-types/src/route.ts b/suite-common/suite-types/src/route.ts
index a7f47a9ed84..47f584fda52 100644
--- a/suite-common/suite-types/src/route.ts
+++ b/suite-common/suite-types/src/route.ts
@@ -6,8 +6,9 @@ type RouteKeys =
     | 'params'
     | 'exact'
     | 'isForegroundApp'
+    | 'isNestedRoute'
     | 'isFullscreenApp';
 
 export type Route = ArrayElement<ConstWithOptionalFields<typeof routes, RouteKeys>>;
 
-export type PageName = Exclude<Route, { isForegroundApp: true }>['name'];
+export type PageName = Exclude<Route, { isForegroundApp: true } | { isNestedRoute: true }>['name'];
diff --git a/suite-common/suite-utils/package.json b/suite-common/suite-utils/package.json
index 33d508b66ec..b47cee5eb06 100644
--- a/suite-common/suite-utils/package.json
+++ b/suite-common/suite-utils/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js",
@@ -14,7 +13,9 @@
     },
     "dependencies": {
         "@suite-common/suite-config": "workspace:*",
+        "@suite-common/suite-constants": "workspace:*",
         "@suite-common/suite-types": "workspace:*",
+        "@suite-common/wallet-config": "workspace:*",
         "@suite-common/wallet-types": "workspace:*",
         "@trezor/connect": "workspace:*",
         "@trezor/urls": "workspace:*",
diff --git a/suite-common/suite-utils/src/__fixtures__/protocol.ts b/suite-common/suite-utils/src/__fixtures__/protocol.ts
new file mode 100644
index 00000000000..1208a177e86
--- /dev/null
+++ b/suite-common/suite-utils/src/__fixtures__/protocol.ts
@@ -0,0 +1,26 @@
+import { Protocol } from '@suite-common/suite-constants';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+
+type getNetworkSymbolForProtocolFixture = {
+    description: string;
+    scheme: Protocol;
+    result: NetworkSymbol | undefined;
+};
+
+export const getNetworkSymbolForProtocol: getNetworkSymbolForProtocolFixture[] = [
+    {
+        description: 'should return network symbol for bitcoin protocol',
+        scheme: 'bitcoin',
+        result: 'btc',
+    },
+    {
+        description: 'should return network symbol for litecoin protocol',
+        scheme: 'litecoin',
+        result: 'ltc',
+    },
+    {
+        description: 'should return undefined for unknown protocol',
+        scheme: 'unknown' as Protocol,
+        result: undefined,
+    },
+];
diff --git a/suite-common/suite-utils/src/__tests__/build.test.ts b/suite-common/suite-utils/src/__tests__/build.test.ts
index b29892cde27..f7bf25bd1a4 100644
--- a/suite-common/suite-utils/src/__tests__/build.test.ts
+++ b/suite-common/suite-utils/src/__tests__/build.test.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
 const OLD_ENV = { ...process.env };
 
 describe('build', () => {
@@ -11,7 +10,7 @@ describe('build', () => {
             process.env = { ...OLD_ENV };
         });
 
-        it.only('dev false when NODE_ENV is production', () => {
+        it('dev false when NODE_ENV is production', () => {
             process.env.NODE_ENV = 'production';
             const { isDevEnv } = require('../build');
 
@@ -40,5 +39,3 @@ describe('build', () => {
         });
     });
 });
-
-export {};
diff --git a/suite-common/suite-utils/src/__tests__/protocol.test.ts b/suite-common/suite-utils/src/__tests__/protocol.test.ts
new file mode 100644
index 00000000000..d61044895c4
--- /dev/null
+++ b/suite-common/suite-utils/src/__tests__/protocol.test.ts
@@ -0,0 +1,12 @@
+import { Protocol } from '@suite-common/suite-constants';
+
+import { getNetworkSymbolForProtocol } from '../protocol';
+import * as fixtures from '../__fixtures__/protocol';
+
+describe('getNetworkSymbolForProtocol', () => {
+    fixtures.getNetworkSymbolForProtocol.forEach(f => {
+        it(f.description, () => {
+            expect(getNetworkSymbolForProtocol(f.scheme as Protocol)).toEqual(f.result);
+        });
+    });
+});
diff --git a/suite-common/suite-utils/src/comparison.ts b/suite-common/suite-utils/src/comparison.ts
index 20988838976..3ea99737963 100644
--- a/suite-common/suite-utils/src/comparison.ts
+++ b/suite-common/suite-utils/src/comparison.ts
@@ -30,7 +30,12 @@ export const isChanged = (prev?: any, current?: any, filter?: { [k: string]: str
         for (let i = 0; i < currentKeys.length; i++) {
             const key = currentKeys[i];
 
-            if (filter && filter.hasOwnProperty(key) && prev[key] && current[key]) {
+            if (
+                filter &&
+                Object.prototype.hasOwnProperty.call(filter, key) &&
+                prev[key] &&
+                current[key]
+            ) {
                 const prevFiltered = {};
                 const currentFiltered = {};
                 for (let i2 = 0; i2 < filter[key].length; i2++) {
diff --git a/suite-common/suite-utils/src/device.ts b/suite-common/suite-utils/src/device.ts
index b8bd16c3e46..eba60b1144f 100644
--- a/suite-common/suite-utils/src/device.ts
+++ b/suite-common/suite-utils/src/device.ts
@@ -140,7 +140,7 @@ export const isSelectedDevice = (selected?: TrezorDevice | Device, device?: Trez
     return selected.id === device.id;
 };
 
-export const getFwUpdateVersion = (device: Device) =>
+export const getFwUpdateVersion = (device: TrezorDevice) =>
     device.firmwareRelease?.release?.version?.join('.') || null;
 
 export const getCoinUnavailabilityMessage = (reason: UnavailableCapability) => {
@@ -234,7 +234,7 @@ export const getSelectedDevice = (
     });
 };
 
-export const getChangelogUrl = (device: Device, revision?: string | null) => {
+export const getChangelogUrl = (device: TrezorDevice, revision?: string | null) => {
     const deviceModelInternal = device.features?.internal_model;
     const commit = revision || 'main';
     const isDeviceWithLegacyFirmware = deviceModelInternal === DeviceModelInternal.T1B1;
@@ -246,6 +246,16 @@ export const getChangelogUrl = (device: Device, revision?: string | null) => {
     return `https://github.com/trezor/trezor-firmware/blob/${commit}/${folder}/${changelogFile}`;
 };
 
+/**
+ Returns DeviceModelInternal, but returns T3B1 if T2B1 is provided.
+ This is desirable because they both represent the same model (differing internally in the chip) and should behave the same in most situations,
+ so we don't need to provide separate assets, translations keys, URLs etc. for both.
+ */
+export const getNarrowedDeviceModelInternal = <T extends DeviceModelInternal>(
+    model: T,
+): T extends DeviceModelInternal.T2B1 ? DeviceModelInternal.T3B1 : T =>
+    (model === DeviceModelInternal.T2B1 ? DeviceModelInternal.T3B1 : model) as any;
+
 export const getCheckBackupUrl = (device?: TrezorDevice) => {
     const deviceModelInternal = device?.features?.internal_model;
 
@@ -253,7 +263,7 @@ export const getCheckBackupUrl = (device?: TrezorDevice) => {
         return undefined;
     }
 
-    return URLS[`HELP_CENTER_DRY_RUN_${deviceModelInternal}_URL`];
+    return URLS[`HELP_CENTER_DRY_RUN_${getNarrowedDeviceModelInternal(deviceModelInternal)}_URL`];
 };
 
 export const getPackagingUrl = (device?: TrezorDevice) => {
@@ -263,7 +273,7 @@ export const getPackagingUrl = (device?: TrezorDevice) => {
         return '';
     }
 
-    return URLS[`HELP_CENTER_PACKAGING_${deviceModelInternal}_URL`];
+    return URLS[`HELP_CENTER_PACKAGING_${getNarrowedDeviceModelInternal(deviceModelInternal)}_URL`];
 };
 
 export const getFirmwareDowngradeUrl = (device?: TrezorDevice) => {
@@ -273,7 +283,9 @@ export const getFirmwareDowngradeUrl = (device?: TrezorDevice) => {
         return undefined;
     }
 
-    return URLS[`HELP_CENTER_FW_DOWNGRADE_${deviceModelInternal}_URL`];
+    return URLS[
+        `HELP_CENTER_FW_DOWNGRADE_${getNarrowedDeviceModelInternal(deviceModelInternal)}_URL`
+    ];
 };
 
 /**
@@ -402,10 +414,10 @@ export const getFirstDeviceInstance = (devices: TrezorDevice[]) =>
         }, [] as TrezorDevice[])
         .sort(sortByPriority);
 
-export const getPhysicalDeviceUniqueIds = (devices: Device[]) =>
+export const getPhysicalDeviceUniqueIds = (devices: TrezorDevice[]) =>
     [...new Set(devices.map(d => d.id))].filter(id => id) as string[];
 
-export const getPhysicalDeviceCount = (devices: Device[]) =>
+export const getPhysicalDeviceCount = (devices: TrezorDevice[]) =>
     getPhysicalDeviceUniqueIds(devices).length;
 
 export const getSortedDevicesWithoutInstances = (
@@ -422,4 +434,7 @@ export const getSortedDevicesWithoutInstances = (
             return 0;
         });
 
-export const isDeviceWithButtons = (deviceModel: DeviceModelInternal) => deviceModel.at(2) === 'B';
+export const isDeviceWithButtons = (
+    deviceModel: DeviceModelInternal,
+): deviceModel is DeviceModelInternal.T1B1 | DeviceModelInternal.T2B1 | DeviceModelInternal.T3B1 =>
+    deviceModel.at(2) === 'B';
diff --git a/suite-common/suite-utils/src/index.ts b/suite-common/suite-utils/src/index.ts
index 50894e1ce56..5f1bdadcee7 100644
--- a/suite-common/suite-utils/src/index.ts
+++ b/suite-common/suite-utils/src/index.ts
@@ -5,7 +5,7 @@ export * from './build';
 export * from './resolveStaticPath';
 export * from './comparison';
 export * from './txsPerPage';
-export * from './stake';
 export * from './parseFirmwareChangelog';
 export * from './uppercaseType';
+export * from './protocol';
 export { hexToRgba } from './hexToRgba';
diff --git a/suite-common/suite-utils/src/protocol.ts b/suite-common/suite-utils/src/protocol.ts
new file mode 100644
index 00000000000..645c727c95a
--- /dev/null
+++ b/suite-common/suite-utils/src/protocol.ts
@@ -0,0 +1,17 @@
+import { Protocol, NETWORK_TO_PROTOCOLS } from '@suite-common/suite-constants';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+
+export type ProtocolToNetwork = {
+    [P in Protocol]: NetworkSymbol;
+};
+
+export const getNetworkSymbolForProtocol = (protocol: Protocol): NetworkSymbol | undefined => {
+    for (const networkSymbol in NETWORK_TO_PROTOCOLS) {
+        const protocols = NETWORK_TO_PROTOCOLS[networkSymbol as NetworkSymbol];
+        if (protocols.includes(protocol)) {
+            return networkSymbol as NetworkSymbol;
+        }
+    }
+
+    return undefined;
+};
diff --git a/suite-common/suite-utils/src/stake.ts b/suite-common/suite-utils/src/stake.ts
deleted file mode 100644
index bf0c80b4fb8..00000000000
--- a/suite-common/suite-utils/src/stake.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { StakeType } from '@suite-common/wallet-types';
-
-// Define signature constants
-const STAKE_SIGNATURE = '0x3a29dbae';
-const UNSTAKE_SIGNATURE = '0x76ec871c';
-const CLAIM_SIGNATURE = '0x33986ffa';
-
-export const signatureToStakeNameMap: { [key: string]: StakeType } = {
-    [STAKE_SIGNATURE]: 'stake',
-    [UNSTAKE_SIGNATURE]: 'unstake',
-    [CLAIM_SIGNATURE]: 'claim',
-};
-
-export const isStakeTx = (signature: string | undefined) =>
-    signature?.toLowerCase() === STAKE_SIGNATURE;
-
-export const isUnstakeTx = (signature: string | undefined) =>
-    signature?.toLowerCase() === UNSTAKE_SIGNATURE;
-
-export const isClaimTx = (signature: string | undefined) =>
-    signature?.toLowerCase() === CLAIM_SIGNATURE;
-
-export const isStakeTypeTx = (signature: string | undefined) =>
-    isStakeTx(signature) || isUnstakeTx(signature) || isClaimTx(signature);
-
-export const getSignatureByEthereumDataHex = (dataHex: string) => `0x${dataHex.slice(0, 8)}`;
-
-export const getTxStakeNameByDataHex = (dataHex: string | undefined): StakeType | null => {
-    if (!dataHex) return null;
-    const signature = getSignatureByEthereumDataHex(dataHex);
-
-    return isStakeTypeTx(signature) ? signatureToStakeNameMap[signature] : null;
-};
diff --git a/suite-common/suite-utils/tsconfig.json b/suite-common/suite-utils/tsconfig.json
index 0e90a36dd8a..b9e33c68f26 100644
--- a/suite-common/suite-utils/tsconfig.json
+++ b/suite-common/suite-utils/tsconfig.json
@@ -3,7 +3,9 @@
     "compilerOptions": { "outDir": "libDev" },
     "references": [
         { "path": "../suite-config" },
+        { "path": "../suite-constants" },
         { "path": "../suite-types" },
+        { "path": "../wallet-config" },
         { "path": "../wallet-types" },
         { "path": "../../packages/connect" },
         { "path": "../../packages/urls" }
diff --git a/suite-common/test-utils/package.json b/suite-common/test-utils/package.json
index d015579a881..d1186d3b62a 100644
--- a/suite-common/test-utils/package.json
+++ b/suite-common/test-utils/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -14,6 +13,7 @@
         "@mobily/ts-belt": "^3.13.1",
         "@reduxjs/toolkit": "1.9.5",
         "@suite-common/redux-utils": "workspace:*",
+        "@suite-common/suite-constants": "workspace:*",
         "@suite-common/suite-types": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
         "@suite-common/wallet-types": "workspace:*",
diff --git a/suite-common/test-utils/src/conditionalDescribe.ts b/suite-common/test-utils/src/conditionalDescribe.ts
new file mode 100644
index 00000000000..ee70ed3fa6c
--- /dev/null
+++ b/suite-common/test-utils/src/conditionalDescribe.ts
@@ -0,0 +1,11 @@
+export const conditionalDescribe = (
+    skipCondition: boolean,
+    title: string,
+    fn: jest.EmptyFunction,
+) => {
+    if (skipCondition) {
+        describe.skip(title, fn);
+    } else {
+        describe(title, fn);
+    }
+};
diff --git a/suite-common/test-utils/src/extraDependenciesMock.ts b/suite-common/test-utils/src/extraDependenciesMock.ts
index f209087a9b5..87fcab07c04 100644
--- a/suite-common/test-utils/src/extraDependenciesMock.ts
+++ b/suite-common/test-utils/src/extraDependenciesMock.ts
@@ -1,5 +1,6 @@
 import { createAction } from '@reduxjs/toolkit';
 
+import { BITCOIN_ONLY_NETWORKS } from '@suite-common/suite-constants';
 import { createThunk, ExtraDependencies } from '@suite-common/redux-utils';
 import { PROTO } from '@trezor/connect';
 import { AddressDisplayOptions } from '@suite-common/wallet-types';
@@ -72,7 +73,7 @@ export const extraDependenciesMock: ExtraDependencies = {
         selectDevices: mockSelector('selectDevices', []),
         selectBitcoinAmountUnit: mockSelector('selectBitcoinAmountUnit', PROTO.AmountUnit.BITCOIN),
         selectAreSatsAmountUnit: mockSelector('selectAreSatsAmountUnit', false),
-        selectEnabledNetworks: mockSelector('selectEnabledNetworks', ['btc', 'test']),
+        selectEnabledNetworks: mockSelector('selectEnabledNetworks', BITCOIN_ONLY_NETWORKS),
         selectTokenDefinitionsEnabledNetworks: mockSelector(
             'selectTokenDefinitonsEnabledNetworks',
             ['eth'],
@@ -93,7 +94,6 @@ export const extraDependenciesMock: ExtraDependencies = {
         }),
         selectLanguage: mockSelector('selectLanguage', 'en'),
         selectDeviceDiscovery: mockSelector('selectDeviceDiscovery', undefined),
-        selectCheckFirmwareAuthenticity: mockSelector('selectCheckFirmwareAuthenticity', false),
         selectAddressDisplayType: mockSelector(
             'selectAddressDisplayType',
             AddressDisplayOptions.CHUNKED,
diff --git a/suite-common/test-utils/src/index.ts b/suite-common/test-utils/src/index.ts
index 89f6c6d0d3a..f23a2cd13a3 100644
--- a/suite-common/test-utils/src/index.ts
+++ b/suite-common/test-utils/src/index.ts
@@ -1,3 +1,4 @@
 export * from './mocks';
 export * from './configureMockStore';
 export * from './extraDependenciesMock';
+export * from './conditionalDescribe';
diff --git a/suite-common/test-utils/src/mocks.ts b/suite-common/test-utils/src/mocks.ts
index 3fa46be67a2..210ad6055fd 100644
--- a/suite-common/test-utils/src/mocks.ts
+++ b/suite-common/test-utils/src/mocks.ts
@@ -7,6 +7,7 @@ import {
     Features,
     DeviceModelInternal,
     FirmwareType,
+    DeviceUniquePath,
 } from '@trezor/connect';
 import {
     TrezorDevice,
@@ -136,29 +137,34 @@ const getDeviceFeatures = (feat?: Partial<Features>): Features => ({
     ...feat,
 });
 
+type StringPath<T extends { path: DeviceUniquePath }> = Omit<T, 'path'> & { path: string };
+
 /**
  * simplified Device from '@trezor/connect'
  * @param {Partial<Device>} [dev]
  * @param {Partial<Features>} [feat]
  * @returns {Device}
  */
-const getConnectDevice = (dev?: Partial<Device>, feat?: Partial<Features>): Device => {
+const getConnectDevice = (dev?: Partial<StringPath<Device>>, feat?: Partial<Features>): Device => {
+    const path = DeviceUniquePath(dev?.path ?? '1');
     if (dev && typeof dev.type === 'string' && dev.type === 'unreadable') {
         return {
             type: 'unreadable',
-            path: dev && dev.path ? dev.path : '1',
-            label: dev && dev.label ? dev.label : 'My Trezor',
+            path,
+            label: 'Unreadable device',
             name: 'name of unreadable device',
             error: 'unreadable device',
+            transportDescriptorType: 0,
         };
     }
 
     if (dev && typeof dev.type === 'string' && dev.type === 'unacquired') {
         return {
             type: dev.type,
-            path: dev && dev.path ? dev.path : '1',
-            label: dev && dev.label ? dev.label : 'My Trezor',
+            path,
+            label: 'Unacquired device',
             name: 'name of unacquired device',
+            transportSessionOwner: 'another app name',
         };
     }
 
@@ -166,6 +172,7 @@ const getConnectDevice = (dev?: Partial<Device>, feat?: Partial<Features>): Devi
 
     return {
         id: features.device_id,
+        // @ts-expect-error
         path: '',
         label: 'My Trezor',
         firmware: 'valid',
@@ -186,6 +193,7 @@ const getConnectDevice = (dev?: Partial<Device>, feat?: Partial<Features>): Devi
         type: 'acquired',
         authenticityChecks: {
             firmwareRevision: { success: true },
+            firmwareHash: { success: true },
         },
     };
 };
@@ -196,7 +204,14 @@ const getConnectDevice = (dev?: Partial<Device>, feat?: Partial<Features>): Devi
  * @param {Partial<Features>} [feat]
  * @returns {TrezorDevice}
  */
-const getSuiteDevice = (dev?: Partial<TrezorDevice>, feat?: Partial<Features>): TrezorDevice => {
+const getSuiteDevice = (
+    dev?: Partial<
+        Omit<StringPath<TrezorDevice>, 'state'> & {
+            state?: `${string}@${string}:${number}`;
+        }
+    >,
+    feat?: Partial<Features>,
+): TrezorDevice => {
     const device = getConnectDevice(dev, feat);
     if (device.type === 'acquired') {
         return {
@@ -211,6 +226,11 @@ const getSuiteDevice = (dev?: Partial<TrezorDevice>, feat?: Partial<Features>):
             metadata: {},
             ...dev,
             ...device,
+            state: dev?.state
+                ? {
+                      staticSessionId: dev.state,
+                  }
+                : undefined,
         } as TrezorDevice;
     }
 
@@ -586,7 +606,6 @@ type MockTrezorConnect = jest.Mocked<TrezorConnect> & {
 };
 
 const getTrezorConnectMock = () => {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
     const pkg = require('@trezor/connect');
 
     return {
diff --git a/suite-common/test-utils/tsconfig.json b/suite-common/test-utils/tsconfig.json
index b71f8580013..08aff3ef20c 100644
--- a/suite-common/test-utils/tsconfig.json
+++ b/suite-common/test-utils/tsconfig.json
@@ -3,6 +3,7 @@
     "compilerOptions": { "outDir": "libDev" },
     "references": [
         { "path": "../redux-utils" },
+        { "path": "../suite-constants" },
         { "path": "../suite-types" },
         { "path": "../wallet-config" },
         { "path": "../wallet-types" },
diff --git a/suite-common/toast-notifications/package.json b/suite-common/toast-notifications/package.json
index 695512da142..9d37549aff9 100644
--- a/suite-common/toast-notifications/package.json
+++ b/suite-common/toast-notifications/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
@@ -19,7 +18,6 @@
         "@suite-common/suite-types": "workspace:*",
         "@suite-common/test-utils": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
-        "@trezor/connect": "workspace:*",
-        "proxy-memoize": "2.0.2"
+        "@trezor/connect": "workspace:*"
     }
 }
diff --git a/suite-common/toast-notifications/src/notificationsSelectors.ts b/suite-common/toast-notifications/src/notificationsSelectors.ts
index 7f634be3ff4..53ead6fc3d9 100644
--- a/suite-common/toast-notifications/src/notificationsSelectors.ts
+++ b/suite-common/toast-notifications/src/notificationsSelectors.ts
@@ -1,4 +1,4 @@
-import { memoizeWithArgs } from 'proxy-memoize';
+import { createWeakMapSelector, returnStableArrayIfEmpty } from '@suite-common/redux-utils';
 
 import {
     NotificationId,
@@ -7,40 +7,43 @@ import {
     TransactionNotification,
 } from './types';
 
-export const selectNotifications = (state: NotificationsRootState) => state.notifications;
-
-export const selectVisibleNotificationsByType = (
-    state: NotificationsRootState,
-    notificationType: ToastPayload[keyof ToastPayload],
-) => {
-    const notifications = selectNotifications(state);
-
-    return notifications.filter(
-        notification => notification.type === notificationType && !notification.closed,
-    );
-};
+const createMemoizedSelector = createWeakMapSelector.withTypes<NotificationsRootState>();
 
-export const selectTransactionNotificationById = memoizeWithArgs(
-    (
-        state: NotificationsRootState,
-        notificationId: NotificationId,
-    ): TransactionNotification | null => {
-        const notifications = selectNotifications(state);
+export const selectNotifications = (state: NotificationsRootState) => state.notifications;
 
-        return (
-            (notifications.find(
-                notification => notification.id === notificationId,
-            ) as TransactionNotification) ?? null
-        );
-    },
+export const selectVisibleNotificationsByType = createMemoizedSelector(
+    [
+        selectNotifications,
+        (_state: NotificationsRootState, notificationType: ToastPayload[keyof ToastPayload]) =>
+            notificationType,
+    ],
+    (notifications, notificationType) =>
+        returnStableArrayIfEmpty(
+            notifications.filter(
+                notification => notification.type === notificationType && !notification.closed,
+            ),
+        ),
 );
 
-export const selectOpenedTransactionNotifications = (state: NotificationsRootState) => {
-    const notifications = selectNotifications(state);
+export const selectTransactionNotificationById = createMemoizedSelector(
+    [
+        selectNotifications,
+        (_state: NotificationsRootState, notificationId: NotificationId) => notificationId,
+    ],
+    (notifications, notificationId): TransactionNotification | null =>
+        (notifications.find(
+            notification => notification.id === notificationId,
+        ) as TransactionNotification) ?? null,
+);
 
-    return notifications.filter(
-        n =>
-            !n.closed &&
-            (n.type === 'tx-received' || n.type === 'tx-sent' || n.type === 'tx-confirmed'),
-    ) as TransactionNotification[];
-};
+export const selectOpenedTransactionNotifications = createMemoizedSelector(
+    [selectNotifications],
+    notifications =>
+        returnStableArrayIfEmpty(
+            notifications.filter(
+                n =>
+                    !n.closed &&
+                    (n.type === 'tx-received' || n.type === 'tx-sent' || n.type === 'tx-confirmed'),
+            ) as TransactionNotification[],
+        ),
+);
diff --git a/suite-common/toast-notifications/src/types.ts b/suite-common/toast-notifications/src/types.ts
index c3a6eb2058e..0fce1e69080 100644
--- a/suite-common/toast-notifications/src/types.ts
+++ b/suite-common/toast-notifications/src/types.ts
@@ -1,5 +1,5 @@
 import { TranslationKey } from '@suite-common/intl-types';
-import { DesktopAppUpdateState, PROTOCOL_SCHEME } from '@suite-common/suite-constants';
+import { DesktopAppUpdateState, Protocol } from '@suite-common/suite-constants';
 import { TrezorDevice } from '@suite-common/suite-types';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { DEVICE } from '@trezor/connect';
@@ -115,9 +115,14 @@ export type ToastPayload = (
           type: 'qr-incorrect-coin-scheme-protocol';
           coin: string;
       }
+    | {
+          type: 'qr-unknown-scheme-protocol';
+          scheme: string;
+          error: string;
+      }
     | {
           type: 'coin-scheme-protocol';
-          scheme: PROTOCOL_SCHEME;
+          scheme: Protocol;
           address: string;
           amount?: number;
       }
diff --git a/suite-common/token-definitions/package.json b/suite-common/token-definitions/package.json
index b2cb5f8e3a5..bf756393ccc 100644
--- a/suite-common/token-definitions/package.json
+++ b/suite-common/token-definitions/package.json
@@ -8,7 +8,6 @@
     "scripts": {
         "nfts": "yarn g:tsx ./scripts/index.ts nft",
         "coins": "yarn g:tsx ./scripts/index.ts coin",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "test:unit": "yarn g:jest -c=../../jest.config.base.js"
@@ -19,13 +18,15 @@
         "@suite-common/redux-utils": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
         "@suite-common/wallet-types": "workspace:*",
+        "@suite-common/wallet-utils": "workspace:*",
+        "@trezor/blockchain-link": "workspace:*",
         "@trezor/blockchain-link-types": "workspace:^",
         "@trezor/blockchain-link-utils": "workspace:*",
         "@trezor/connect": "workspace:*",
         "@trezor/env-utils": "workspace:*",
         "@trezor/type-utils": "workspace:*",
-        "jws": "^4.0.0",
-        "proxy-memoize": "2.0.2"
+        "@trezor/utils": "workspace:*",
+        "jws": "^4.0.0"
     },
     "devDependencies": {
         "ajv": "^8.17.1"
diff --git a/suite-common/token-definitions/scripts/utils/sign.ts b/suite-common/token-definitions/scripts/utils/sign.ts
index ce25f93fd11..e98997266bf 100644
--- a/suite-common/token-definitions/scripts/utils/sign.ts
+++ b/suite-common/token-definitions/scripts/utils/sign.ts
@@ -1,6 +1,5 @@
 /* eslint-disable no-console */
 
-// eslint-disable-next-line import/no-extraneous-dependencies
 import * as jws from 'jws';
 
 import { JWS_SIGN_ALGORITHM } from '../../src/tokenDefinitionsConstants';
diff --git a/suite-common/wallet-utils/src/__fixtures__/antiFraud.ts b/suite-common/token-definitions/src/__fixtures__/antiFraud.ts
similarity index 99%
rename from suite-common/wallet-utils/src/__fixtures__/antiFraud.ts
rename to suite-common/token-definitions/src/__fixtures__/antiFraud.ts
index fae001f138c..fbd98f51da8 100644
--- a/suite-common/wallet-utils/src/__fixtures__/antiFraud.ts
+++ b/suite-common/token-definitions/src/__fixtures__/antiFraud.ts
@@ -1,7 +1,7 @@
 import type { TokenTransfer } from '@trezor/blockchain-link';
 import type { WalletAccountTransaction } from '@suite-common/wallet-types';
-import { TokenDefinitions } from '@suite-common/token-definitions';
 
+import type { TokenDefinitions } from '../tokenDefinitionsTypes';
 export const getIsZeroValuePhishingFixtures = [
     {
         testName: 'detects potential zero-value phishing transactions',
diff --git a/suite-common/token-definitions/src/__fixtures__/utils.ts b/suite-common/token-definitions/src/__fixtures__/utils.ts
index 7e4605fbf1d..f458fcd2297 100644
--- a/suite-common/token-definitions/src/__fixtures__/utils.ts
+++ b/suite-common/token-definitions/src/__fixtures__/utils.ts
@@ -2,45 +2,6 @@ import { NetworkSymbol } from '@suite-common/wallet-config';
 
 import { DefinitionType } from '../tokenDefinitionsTypes';
 
-export const getContractAddressForNetworkFixtures = [
-    {
-        testName: 'Converts to lowercase for non-sol networks',
-        networkSymbol: 'eth' as NetworkSymbol,
-        contractAddress: '0xABCD',
-        expected: '0xabcd',
-    },
-    {
-        testName: 'Preserves case for sol network',
-        networkSymbol: 'sol' as NetworkSymbol,
-        contractAddress: 'SolContractAddress',
-        expected: 'SolContractAddress',
-    },
-    {
-        testName: 'Converts to lowercase for eth network',
-        networkSymbol: 'eth' as NetworkSymbol,
-        contractAddress: '0XABCDE',
-        expected: '0xabcde',
-    },
-    {
-        testName: 'Handles empty contract address for non-sol network',
-        networkSymbol: 'btc' as NetworkSymbol,
-        contractAddress: '',
-        expected: '',
-    },
-    {
-        testName: 'Handles empty contract address for sol network',
-        networkSymbol: 'sol' as NetworkSymbol,
-        contractAddress: '',
-        expected: '',
-    },
-    {
-        testName: 'Returns policy id for cardano',
-        networkSymbol: 'ada' as NetworkSymbol,
-        contractAddress: 'f43a62fdc3965df486de8a0d32fe800963589c41b38946602a0dc53541474958',
-        expected: 'f43a62fdc3965df486de8a0d32fe800963589c41b38946602a0dc535',
-    },
-];
-
 export const isTokenDefinitionKnownFixtures = [
     {
         testName: 'Token definition known, case-insensitive network',
diff --git a/suite-common/wallet-utils/src/__tests__/antiFraud.test.ts b/suite-common/token-definitions/src/__tests__/antiFraud.test.ts
similarity index 100%
rename from suite-common/wallet-utils/src/__tests__/antiFraud.test.ts
rename to suite-common/token-definitions/src/__tests__/antiFraud.test.ts
diff --git a/suite-common/token-definitions/src/__tests__/utils.test.ts b/suite-common/token-definitions/src/__tests__/utils.test.ts
index 106c31a0a40..1109125aaad 100644
--- a/suite-common/token-definitions/src/__tests__/utils.test.ts
+++ b/suite-common/token-definitions/src/__tests__/utils.test.ts
@@ -1,27 +1,14 @@
 import {
-    getContractAddressForNetworkFixtures,
     getSupportedDefinitionTypesFixtures,
     isTokenDefinitionKnownFixtures,
     buildTokenDefinitionsFromStorageFixtures,
 } from '../__fixtures__/utils';
 import {
     buildTokenDefinitionsFromStorage,
-    getContractAddressForNetwork,
     getSupportedDefinitionTypes,
     isTokenDefinitionKnown,
 } from '../tokenDefinitionsUtils';
 
-describe('getContractAddressForNetwork', () => {
-    getContractAddressForNetworkFixtures.forEach(
-        ({ testName, networkSymbol, contractAddress, expected }) => {
-            test(testName, () => {
-                const result = getContractAddressForNetwork(networkSymbol, contractAddress);
-                expect(result).toBe(expected);
-            });
-        },
-    );
-});
-
 describe('isTokenDefinitionKnown', () => {
     isTokenDefinitionKnownFixtures.forEach(
         ({ testName, tokenDefinitions, networkSymbol, contractAddress, result }) => {
diff --git a/suite-common/wallet-utils/src/antiFraud.ts b/suite-common/token-definitions/src/antiFraud.ts
similarity index 90%
rename from suite-common/wallet-utils/src/antiFraud.ts
rename to suite-common/token-definitions/src/antiFraud.ts
index 793cf2092ee..9639c6ba06f 100644
--- a/suite-common/wallet-utils/src/antiFraud.ts
+++ b/suite-common/token-definitions/src/antiFraud.ts
@@ -2,10 +2,11 @@ import { D } from '@mobily/ts-belt';
 
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 import type { WalletAccountTransaction } from '@suite-common/wallet-types';
-import { TokenDefinitions, isTokenDefinitionKnown } from '@suite-common/token-definitions';
 import { getNetworkType } from '@suite-common/wallet-config';
+import { isNftTokenTransfer } from '@suite-common/wallet-utils';
 
-import { isNftTokenTransfer } from './transactionUtils';
+import type { TokenDefinitions } from './tokenDefinitionsTypes';
+import { isTokenDefinitionKnown } from './tokenDefinitionsUtils';
 
 export const getIsZeroValuePhishing = (transaction: WalletAccountTransaction) =>
     new BigNumber(transaction.amount).isEqualTo(0) &&
diff --git a/suite-common/token-definitions/src/index.ts b/suite-common/token-definitions/src/index.ts
index cb90e09f3b7..ed02e445967 100644
--- a/suite-common/token-definitions/src/index.ts
+++ b/suite-common/token-definitions/src/index.ts
@@ -6,3 +6,4 @@ export * from './tokenDefinitionsThunks';
 export * from './tokenDefinitionsMiddleware';
 export * from './tokenDefinitionsTypes';
 export * from './tokenDefinitionsUtils';
+export * from './antiFraud';
diff --git a/suite-common/token-definitions/src/tokenDefinitionsSelectors.ts b/suite-common/token-definitions/src/tokenDefinitionsSelectors.ts
index 5352d172895..deff5cb4c0c 100644
--- a/suite-common/token-definitions/src/tokenDefinitionsSelectors.ts
+++ b/suite-common/token-definitions/src/tokenDefinitionsSelectors.ts
@@ -1,12 +1,17 @@
-import { getUntracked } from 'proxy-memoize';
-
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { TokenAddress } from '@suite-common/wallet-types';
 import { TokenInfo } from '@trezor/connect';
 
-import { TokenDefinitionsRootState } from './tokenDefinitionsTypes';
+import { TokenDefinitionsRootState, TokenDefinitionsState } from './tokenDefinitionsTypes';
 import { isTokenDefinitionKnown } from './tokenDefinitionsUtils';
 
+export const selectTokenDefinitions = (state: TokenDefinitionsRootState) => state.tokenDefinitions;
+
+export const getSimpleCoinDefinitionsByNetwork = (
+    state: TokenDefinitionsState,
+    networkSymbol: NetworkSymbol,
+) => state[networkSymbol]?.coin?.data;
+
 export const selectNetworkTokenDefinitions = (
     state: TokenDefinitionsRootState,
     networkSymbol: NetworkSymbol,
@@ -23,13 +28,10 @@ export const selectNftDefinitions = (
 ) => state.tokenDefinitions?.[networkSymbol]?.nft;
 
 export const selectCoinDefinition = (
-    stateTracked: TokenDefinitionsRootState,
+    state: TokenDefinitionsRootState,
     networkSymbol: NetworkSymbol,
     contractAddress: TokenAddress,
 ) => {
-    // We need to use getUntracked here otherwise this could interfere with memoization in isTokenDefinitionKnown
-    const state = getUntracked(stateTracked) ?? stateTracked;
-
     const coinDefinitions = state.tokenDefinitions?.[networkSymbol]?.coin?.data;
     const isKnown = isTokenDefinitionKnown(coinDefinitions, networkSymbol, contractAddress);
 
diff --git a/suite-common/token-definitions/src/tokenDefinitionsThunks.ts b/suite-common/token-definitions/src/tokenDefinitionsThunks.ts
index 3aef8b52e14..72a5c46f3ed 100644
--- a/suite-common/token-definitions/src/tokenDefinitionsThunks.ts
+++ b/suite-common/token-definitions/src/tokenDefinitionsThunks.ts
@@ -1,10 +1,9 @@
 import { decode, verify } from 'jws';
 import { D, G } from '@mobily/ts-belt';
 
-import { getJWSPublicKey } from '@trezor/env-utils';
+import { getJWSPublicKey, isCodesignBuild } from '@trezor/env-utils';
 import { createThunk } from '@suite-common/redux-utils';
 import { NetworkSymbol, getCoingeckoId } from '@suite-common/wallet-config';
-import { isCodesignBuild } from '@trezor/env-utils';
 import { Timeout } from '@trezor/type-utils';
 
 import { selectNetworkTokenDefinitions } from './tokenDefinitionsSelectors';
diff --git a/suite-common/token-definitions/src/tokenDefinitionsUtils.ts b/suite-common/token-definitions/src/tokenDefinitionsUtils.ts
index 32acbf8d557..7e8e5d49f97 100644
--- a/suite-common/token-definitions/src/tokenDefinitionsUtils.ts
+++ b/suite-common/token-definitions/src/tokenDefinitionsUtils.ts
@@ -1,5 +1,6 @@
 import { NetworkSymbol, getNetworkFeatures } from '@suite-common/wallet-config';
-import { parseAsset } from '@trezor/blockchain-link-utils/src/blockfrost';
+import { getContractAddressForNetwork } from '@suite-common/wallet-utils';
+import { TokenInfo } from '@trezor/connect';
 
 import {
     DefinitionType,
@@ -9,27 +10,6 @@ import {
     TokenManagementStorage,
 } from './tokenDefinitionsTypes';
 
-export const getContractAddressForNetwork = (
-    networkSymbol: NetworkSymbol,
-    contractAddress: string,
-) => {
-    switch (networkSymbol) {
-        case 'eth':
-            // Specyfing most common network as first case improves performance little bit
-            return contractAddress.toLowerCase();
-        case 'sol':
-        case 'dsol':
-            return contractAddress;
-        case 'ada':
-        case 'tada':
-            const { policyId } = parseAsset(contractAddress);
-
-            return policyId.toLowerCase();
-        default:
-            return contractAddress.toLowerCase();
-    }
-};
-
 // Using Set greatly improves performance of this function because of O(1) complexity instead of O(n) for Array.includes
 const tokenDefinitionsMap = new WeakMap<SimpleTokenStructure, Set<string>>();
 export const isTokenDefinitionKnown = (
@@ -48,6 +28,16 @@ export const isTokenDefinitionKnown = (
     return tokenDefinitionsMap.get(tokenDefinitions)?.has(contractAddressForNetwork);
 };
 
+export const filterKnownTokens = (
+    tokenDefinitions: SimpleTokenStructure | undefined,
+    networkSymbol: NetworkSymbol,
+    tokens: TokenInfo[],
+) => {
+    return tokens.filter(token =>
+        isTokenDefinitionKnown(tokenDefinitions, networkSymbol, token.contract),
+    );
+};
+
 export const getSupportedDefinitionTypes = (networkSymbol: NetworkSymbol) => {
     const isCoinDefinitionsEnabled = getNetworkFeatures(networkSymbol).includes('coin-definitions');
     const isNftDefinitionsEnabled = getNetworkFeatures(networkSymbol).includes('nft-definitions');
diff --git a/suite-common/token-definitions/tsconfig.json b/suite-common/token-definitions/tsconfig.json
index 338257e048c..5490d9033fc 100644
--- a/suite-common/token-definitions/tsconfig.json
+++ b/suite-common/token-definitions/tsconfig.json
@@ -5,6 +5,10 @@
         { "path": "../redux-utils" },
         { "path": "../wallet-config" },
         { "path": "../wallet-types" },
+        { "path": "../wallet-utils" },
+        {
+            "path": "../../packages/blockchain-link"
+        },
         {
             "path": "../../packages/blockchain-link-types"
         },
@@ -13,6 +17,7 @@
         },
         { "path": "../../packages/connect" },
         { "path": "../../packages/env-utils" },
-        { "path": "../../packages/type-utils" }
+        { "path": "../../packages/type-utils" },
+        { "path": "../../packages/utils" }
     ]
 }
diff --git a/suite-common/validators/package.json b/suite-common/validators/package.json
index ab68df2ddbb..4253a238199 100644
--- a/suite-common/validators/package.json
+++ b/suite-common/validators/package.json
@@ -8,7 +8,6 @@
     ],
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-common/wallet-config/package.json b/suite-common/wallet-config/package.json
index 3ddcb334344..c895aa05672 100644
--- a/suite-common/wallet-config/package.json
+++ b/suite-common/wallet-config/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-common/wallet-config/src/networksConfig.ts b/suite-common/wallet-config/src/networksConfig.ts
index 8e850b6dbf9..194a55f39ce 100644
--- a/suite-common/wallet-config/src/networksConfig.ts
+++ b/suite-common/wallet-config/src/networksConfig.ts
@@ -81,7 +81,6 @@ export const networks = {
         coingeckoId: 'ethereum',
         coingeckoNativeId: 'ethereum',
     },
-
     pol: {
         symbol: 'pol',
         name: 'Polygon PoS',
@@ -136,6 +135,35 @@ export const networks = {
         coingeckoId: 'binance-smart-chain',
         coingeckoNativeId: 'binancecoin',
     },
+    op: {
+        symbol: 'op',
+        name: 'Optimism',
+        networkType: 'ethereum',
+        chainId: 10,
+        bip43Path: "m/44'/60'/0'/0/i",
+        decimals: 18,
+        testnet: false,
+        explorer: {
+            tx: 'https://op1.trezor.io/tx/',
+            account: 'https://op1.trezor.io/address/',
+            nft: 'https://op1.trezor.io/nft/',
+            address: 'https://op1.trezor.io/address/',
+            queryString: '',
+        },
+        features: ['rbf', 'sign-verify', 'tokens', 'coin-definitions', 'nft-definitions'],
+        customBackends: ['blockbook'],
+        accountTypes: {
+            ledger: {
+                // ledger (live), #1 acc is same as Trezor, so it is skipped
+                accountType: 'ledger',
+                bip43Path: "m/44'/60'/i'/0/0",
+                isDebugOnlyAccountType: true,
+            },
+        },
+        coingeckoId: 'optimistic-ethereum',
+        coingeckoNativeId: 'ethereum',
+        isDebugOnlyNetwork: true,
+    },
     sol: {
         symbol: 'sol',
         name: 'Solana',
@@ -152,8 +180,9 @@ export const networks = {
         support: {
             [DeviceModelInternal.T2T1]: '2.6.4',
             [DeviceModelInternal.T2B1]: '2.6.4',
-            [DeviceModelInternal.T3B1]: '2.8.1',
-            [DeviceModelInternal.T3T1]: '2.7.1',
+            [DeviceModelInternal.T3B1]: '2.0.0',
+            [DeviceModelInternal.T3T1]: '2.0.0',
+            [DeviceModelInternal.T3W1]: '2.0.0',
         },
         customBackends: ['solana'],
         accountTypes: {
@@ -184,9 +213,10 @@ export const networks = {
         },
         support: {
             [DeviceModelInternal.T2T1]: '2.4.3',
-            [DeviceModelInternal.T2B1]: '2.6.1',
-            [DeviceModelInternal.T3B1]: '2.8.1',
-            [DeviceModelInternal.T3T1]: '2.7.1',
+            [DeviceModelInternal.T2B1]: '2.0.0',
+            [DeviceModelInternal.T3B1]: '2.0.0',
+            [DeviceModelInternal.T3T1]: '2.0.0',
+            [DeviceModelInternal.T3W1]: '2.0.0',
         },
         customBackends: ['blockfrost'],
         accountTypes: {
@@ -569,8 +599,9 @@ export const networks = {
         support: {
             [DeviceModelInternal.T2T1]: '2.6.4',
             [DeviceModelInternal.T2B1]: '2.6.4',
-            [DeviceModelInternal.T3B1]: '2.8.1',
-            [DeviceModelInternal.T3T1]: '2.7.1',
+            [DeviceModelInternal.T3B1]: '2.0.0',
+            [DeviceModelInternal.T3T1]: '2.0.0',
+            [DeviceModelInternal.T3W1]: '2.0.0',
         },
         customBackends: ['solana'],
         accountTypes: {},
@@ -595,8 +626,9 @@ export const networks = {
         support: {
             [DeviceModelInternal.T2T1]: '2.4.3',
             [DeviceModelInternal.T2B1]: '2.6.1',
-            [DeviceModelInternal.T3B1]: '2.8.1',
-            [DeviceModelInternal.T3T1]: '2.7.1',
+            [DeviceModelInternal.T3B1]: '2.0.0',
+            [DeviceModelInternal.T3T1]: '2.0.0',
+            [DeviceModelInternal.T3W1]: '2.0.0',
         },
         customBackends: ['blockfrost'],
         accountTypes: {
diff --git a/suite-common/wallet-config/src/types.ts b/suite-common/wallet-config/src/types.ts
index fc628c23353..0936012bf5b 100644
--- a/suite-common/wallet-config/src/types.ts
+++ b/suite-common/wallet-config/src/types.ts
@@ -19,6 +19,7 @@ export type NetworkSymbol =
     | 'sol'
     | 'pol'
     | 'bnb'
+    | 'op'
     | 'test'
     | 'regtest'
     | 'tsep'
@@ -55,7 +56,15 @@ export type NetworkFeature =
     | 'coin-definitions'
     | 'nft-definitions';
 
-export type Bip43Path = string; // TODO define a more specific type
+type Level = `/${number}'`;
+type MaybeApostrophe = `'` | '';
+type MaybeLevel = `/${number}${MaybeApostrophe}` | '';
+type LevelOrIndex = `/${number | 'i'}'`;
+type MaybeLevelOrIndex = `/${number | 'i'}${MaybeApostrophe}` | '';
+// template with i in place of account index, which shall be substituted with a number
+export type Bip43PathTemplate =
+    `m${Level}${Level}${LevelOrIndex}${MaybeLevelOrIndex}${MaybeLevelOrIndex}`;
+export type Bip43Path = `m${Level}${Level}${Level}${MaybeLevel}${MaybeLevel}`;
 
 export type Explorer = {
     tx: string;
@@ -68,7 +77,7 @@ export type Explorer = {
 
 type NetworkAccountWithSpecificKey<TKey extends AccountType> = {
     accountType: TKey;
-    bip43Path: Bip43Path;
+    bip43Path: Bip43PathTemplate;
     backendType?: BackendType;
     features?: NetworkFeature[];
     isDebugOnlyAccountType?: boolean;
@@ -86,7 +95,7 @@ type NetworkWithSpecificKey<TKey extends NetworkSymbol> = {
     symbol: TKey;
     name: string;
     networkType: NetworkType;
-    bip43Path: Bip43Path;
+    bip43Path: Bip43PathTemplate;
     decimals: number;
     testnet: boolean;
     explorer: Explorer;
diff --git a/suite-common/wallet-config/src/utils.ts b/suite-common/wallet-config/src/utils.ts
index 9c65c18ed7a..3043cbbdc0c 100644
--- a/suite-common/wallet-config/src/utils.ts
+++ b/suite-common/wallet-config/src/utils.ts
@@ -14,10 +14,13 @@ export const NORMAL_ACCOUNT_TYPE = 'normal' satisfies AccountType;
  */
 export const networksCollection: Network[] = Object.values(networks);
 
-export const getMainnets = (debug = false, bnb = false) =>
-    networksCollection.filter(
-        n => !n.testnet && (!n.isDebugOnlyNetwork || debug) && (bnb || n.symbol !== 'bnb'),
-    );
+/**
+ * array of network symbols
+ */
+export const networkSymbolCollection = networksCollection.map(n => n.symbol);
+
+export const getMainnets = (debug = false) =>
+    networksCollection.filter(n => !n.testnet && (!n.isDebugOnlyNetwork || debug));
 
 export const getTestnets = (debug = false) =>
     networksCollection.filter(n => n.testnet === true && (!n.isDebugOnlyNetwork || debug));
@@ -50,10 +53,10 @@ export const getNetworkType = (symbol: NetworkSymbol) => networks[symbol]?.netwo
 export const getNetworkFeatures = (symbol: NetworkSymbol): NetworkFeature[] =>
     networks[symbol]?.features;
 
-export const getCoingeckoId = (symbol: NetworkSymbol) => networks[symbol]?.coingeckoId;
+export const getCoingeckoId = (symbol: NetworkSymbol) => networks[symbol].coingeckoId;
 
 export const isNetworkSymbol = (symbol: NetworkSymbol | string): symbol is NetworkSymbol =>
-    networks.hasOwnProperty(symbol);
+    Object.prototype.hasOwnProperty.call(networks, symbol);
 
 /**
  * Get network object by symbol as a generic `Network` type.
@@ -69,7 +72,8 @@ export const isAccountOfNetwork = (
     network: Network,
     accountType: string,
 ): accountType is AccountType =>
-    network.accountTypes.hasOwnProperty(accountType) || accountType === 'normal';
+    Object.prototype.hasOwnProperty.call(network.accountTypes, accountType) ||
+    accountType === 'normal';
 
 export const getNetworkByCoingeckoId = (coingeckoId: string) =>
     networksCollection.find(n => n.coingeckoId === coingeckoId);
diff --git a/suite-common/wallet-constants/package.json b/suite-common/wallet-constants/package.json
index 2c91e8a1ba1..2dbf41535a0 100644
--- a/suite-common/wallet-constants/package.json
+++ b/suite-common/wallet-constants/package.json
@@ -6,8 +6,10 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
+    },
+    "dependencies": {
+        "@trezor/utils": "workspace:*"
     }
 }
diff --git a/suite-common/wallet-constants/src/ethereumStakingConstants.ts b/suite-common/wallet-constants/src/ethereumStakingConstants.ts
new file mode 100644
index 00000000000..a75b5464815
--- /dev/null
+++ b/suite-common/wallet-constants/src/ethereumStakingConstants.ts
@@ -0,0 +1,18 @@
+import { BigNumber } from '@trezor/utils/src/bigNumber';
+
+// Used when Everstake pool stats are not available from the API.
+export const BACKUP_ETH_APY = 4.13;
+
+// Slack discussion https://satoshilabs.slack.com/archives/C0543DJBK0C/p1719409880504649?thread_ts=1719403259.875369&cid=C0543DJBK0C
+// increasing gas limit as tx can consume more than it was estimated due to edge cases
+// stake/unstake method usually consumes 97k-425k but can take up to 1M
+// claim method 97k-300k
+export const STAKE_GAS_LIMIT_RESERVE = 220_000;
+
+export const MIN_ETH_AMOUNT_FOR_STAKING = new BigNumber(0.1);
+export const MAX_ETH_AMOUNT_FOR_STAKING = new BigNumber(1_000_000);
+export const MIN_ETH_FOR_WITHDRAWALS = new BigNumber(0.03);
+export const MIN_ETH_BALANCE_FOR_STAKING = MIN_ETH_AMOUNT_FOR_STAKING.plus(MIN_ETH_FOR_WITHDRAWALS);
+export const UNSTAKE_INTERCHANGES = 5;
+
+export const BACKUP_REWARD_PAYOUT_DAYS = 7;
diff --git a/suite-common/wallet-constants/src/index.ts b/suite-common/wallet-constants/src/index.ts
index e0dac58a26d..0eea39efe42 100644
--- a/suite-common/wallet-constants/src/index.ts
+++ b/suite-common/wallet-constants/src/index.ts
@@ -1,3 +1,4 @@
 export * from './formDraft';
 export * from './sendForm';
 export * from './discovery';
+export * from './ethereumStakingConstants';
diff --git a/suite-common/wallet-constants/tsconfig.json b/suite-common/wallet-constants/tsconfig.json
index c7ebe855e21..1ed15906073 100644
--- a/suite-common/wallet-constants/tsconfig.json
+++ b/suite-common/wallet-constants/tsconfig.json
@@ -1,5 +1,7 @@
 {
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
-    "references": []
+    "references": [
+        { "path": "../../packages/utils" }
+    ]
 }
diff --git a/suite-common/wallet-core/package.json b/suite-common/wallet-core/package.json
index 73b1c0de0ba..be29e0528dd 100644
--- a/suite-common/wallet-core/package.json
+++ b/suite-common/wallet-core/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c=../../jest.config.base.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
@@ -36,8 +35,7 @@
         "@trezor/type-utils": "workspace:*",
         "@trezor/utils": "workspace:*",
         "date-fns": "^2.30.0",
-        "proxy-memoize": "2.0.2",
-        "react-hook-form": "^7.53.0",
+        "react-hook-form": "^7.53.1",
         "web3-utils": "^4.3.1"
     }
 }
diff --git a/suite-common/wallet-core/src/accounts/accountsConstants.ts b/suite-common/wallet-core/src/accounts/accountsConstants.ts
index 681a59836ab..e3f792a6431 100644
--- a/suite-common/wallet-core/src/accounts/accountsConstants.ts
+++ b/suite-common/wallet-core/src/accounts/accountsConstants.ts
@@ -15,4 +15,8 @@ export const formattedAccountTypeMap: Partial<
         legacy: 'Legacy',
         ledger: 'Ledger',
     },
+    ethereum: {
+        legacy: 'Legacy',
+        ledger: 'Ledger',
+    },
 };
diff --git a/suite-common/wallet-core/src/accounts/accountsReducer.ts b/suite-common/wallet-core/src/accounts/accountsReducer.ts
index 4e4d0acb04c..83b3c51b54d 100644
--- a/suite-common/wallet-core/src/accounts/accountsReducer.ts
+++ b/suite-common/wallet-core/src/accounts/accountsReducer.ts
@@ -1,11 +1,15 @@
 import { isAnyOf } from '@reduxjs/toolkit';
-import { A, D, F, G, pipe } from '@mobily/ts-belt';
-import { memoize, memoizeWithArgs } from 'proxy-memoize';
+import { A, G, pipe } from '@mobily/ts-belt';
 
-import { createReducerWithExtraDeps } from '@suite-common/redux-utils';
+import {
+    createReducerWithExtraDeps,
+    createWeakMapSelector,
+    returnStableArrayIfEmpty,
+} from '@suite-common/redux-utils';
 import { enhanceHistory, isTestnet, isUtxoBased } from '@suite-common/wallet-utils';
 import { Account, AccountKey } from '@suite-common/wallet-types';
 import { AccountType, networks, NetworkSymbol } from '@suite-common/wallet-config';
+import { DeviceState, StaticSessionId } from '@trezor/connect';
 
 import { accountsActions } from './accountsActions';
 import { formattedAccountTypeMap } from './accountsConstants';
@@ -146,299 +150,306 @@ export const prepareAccountsReducer = createReducerWithExtraDeps(
     },
 );
 
+const createMemoizedSelector = createWeakMapSelector.withTypes<
+    AccountsRootState & DeviceRootState & DiscoveryRootState
+>();
+
+const EMPTY_STABLE_ACCOUNTS_ARRAY: Account[] = [];
+
 export const selectAccounts = (state: AccountsRootState) => state.wallet.accounts;
 
-export const selectAccountsByDeviceState = (
-    state: AccountsRootState,
-    deviceState: string,
-): Account[] =>
-    pipe(
-        selectAccounts(state),
-        A.filter(account => account.deviceState === deviceState),
-    ) as Account[];
-
-export const selectAccountsByDeviceStateAndNetworkSymbol = (
-    state: AccountsRootState,
-    deviceState: string,
-    networkSymbol: NetworkSymbol,
-): Account[] =>
-    pipe(
-        selectAccountsByDeviceState(state, deviceState),
-        A.filter(account => account.symbol === networkSymbol),
-        F.toMutable,
+export const getAccountsByDeviceState = (
+    accounts: Account[],
+    deviceState: StaticSessionId | DeviceState,
+) =>
+    accounts.filter(account =>
+        typeof deviceState === 'string'
+            ? account.deviceState === deviceState
+            : account.deviceState === deviceState.staticSessionId,
     );
 
-export const selectDeviceAccounts = (state: AccountsRootState & DeviceRootState) => {
-    const device = selectDevice(state);
+export const selectAccountsByDeviceState = createMemoizedSelector(
+    [
+        selectAccounts,
+        (_state: AccountsRootState, deviceState: StaticSessionId | DeviceState) => deviceState,
+    ],
+    (accounts, deviceState) =>
+        pipe(getAccountsByDeviceState(accounts, deviceState), returnStableArrayIfEmpty),
+);
 
-    if (!device?.state) return [];
+export const selectAccountsByDeviceStateAndNetworkSymbol = createMemoizedSelector(
+    [
+        selectAccountsByDeviceState,
+        (
+            _state: AccountsRootState,
+            _deviceState: StaticSessionId | DeviceState,
+            networkSymbol: NetworkSymbol,
+        ) => networkSymbol,
+    ],
+    (accounts, networkSymbol) =>
+        pipe(
+            accounts,
+            A.filter(account => account.symbol === networkSymbol),
+            returnStableArrayIfEmpty,
+        ),
+);
 
-    return selectAccountsByDeviceState(state, device.state);
-};
+export const selectDeviceAccounts = createMemoizedSelector(
+    [selectAccounts, selectDevice],
+    (accounts, device) => {
+        if (!device?.state?.staticSessionId) return EMPTY_STABLE_ACCOUNTS_ARRAY;
 
-export const selectVisibleDeviceAccounts = memoize((state: AccountsRootState & DeviceRootState) =>
-    selectDeviceAccounts(state).filter(account => account.visible),
+        return pipe(getAccountsByDeviceState(accounts, device.state), returnStableArrayIfEmpty);
+    },
 );
 
-export const selectDeviceAccountsForNetworkSymbolAndAccountType = memoizeWithArgs(
-    (
-        state: AccountsRootState & DeviceRootState,
-        networkSymbol?: NetworkSymbol,
-        accountType?: AccountType,
-    ) => {
-        if (!networkSymbol || !accountType) {
-            return [];
-        }
-        const accounts = selectDeviceAccounts(state);
+export const selectVisibleDeviceAccounts = createMemoizedSelector(
+    [selectDeviceAccounts],
+    accounts =>
+        pipe(
+            accounts,
+            A.filter(account => account.visible),
+            returnStableArrayIfEmpty,
+        ),
+);
 
-        return accounts.filter(
-            account => account.symbol === networkSymbol && account.accountType === accountType,
+export const selectDeviceAccountsForNetworkSymbolAndAccountType = createMemoizedSelector(
+    [
+        selectDeviceAccounts,
+        (_state: AccountsRootState & DeviceRootState, networkSymbol?: NetworkSymbol) =>
+            networkSymbol,
+        (
+            _state: AccountsRootState & DeviceRootState,
+            _networkSymbol?: NetworkSymbol,
+            accountType?: AccountType,
+        ) => accountType,
+    ],
+    (accounts, networkSymbol, accountType) => {
+        if (!networkSymbol || !accountType) return EMPTY_STABLE_ACCOUNTS_ARRAY;
+
+        return pipe(
+            accounts,
+            A.filter(
+                account => account.symbol === networkSymbol && account.accountType === accountType,
+            ),
+            returnStableArrayIfEmpty,
         );
     },
-    // memoize data for every network
-    { size: D.keys(networks).length },
 );
 
-export const selectDeviceAccountKeyForNetworkSymbolAndAccountTypeWithIndex = (
-    state: AccountsRootState & DeviceRootState,
-    networkSymbol?: NetworkSymbol,
-    accountType?: AccountType,
-    accountIndex?: number,
-) => {
-    if (!networkSymbol || !accountType || accountIndex === undefined || accountIndex < 0) {
-        return undefined;
-    }
-    const accounts = selectDeviceAccountsForNetworkSymbolAndAccountType(
-        state,
-        networkSymbol,
-        accountType,
-    );
-
-    return accounts[accountIndex]?.key;
-};
-
-export const selectDeviceMainnetAccounts = memoize((state: AccountsRootState & DeviceRootState) =>
-    pipe(
-        selectDeviceAccounts(state),
-        A.filter(account => !isTestnet(account.symbol)),
-    ),
+export const selectDeviceAccountKeyForNetworkSymbolAndAccountTypeWithIndex = createMemoizedSelector(
+    [
+        selectDeviceAccountsForNetworkSymbolAndAccountType,
+        (
+            _state: AccountsRootState & DeviceRootState,
+            _networkSymbol?: NetworkSymbol,
+            _accountType?: AccountType,
+            accountIndex?: number,
+        ) => accountIndex,
+    ],
+    (accounts, accountIndex) => {
+        if (accountIndex === undefined || accountIndex < 0) return undefined;
+
+        return accounts[accountIndex]?.key;
+    },
 );
 
-export const selectNumberOfAccounts = (state: AccountsRootState) => selectAccounts(state).length;
-
-export const selectUserHasAccounts = (state: AccountsRootState): boolean =>
-    pipe(selectAccounts(state), A.isNotEmpty);
-
-export const selectAccountByKey = (state: AccountsRootState, accountKey?: AccountKey) => {
-    if (!accountKey) return null;
-
-    const accounts = selectAccounts(state);
-
-    return accounts.find(account => account.key === accountKey) ?? null;
-};
-
-export const selectHasAccountTransactions = (state: AccountsRootState, accountKey: AccountKey) => {
-    const account = selectAccountByKey(state, accountKey);
+export const selectDeviceMainnetAccounts = createMemoizedSelector(
+    [selectDeviceAccounts],
+    accounts =>
+        pipe(
+            accounts,
+            A.filter(account => !isTestnet(account.symbol)),
+            returnStableArrayIfEmpty,
+        ),
+);
 
-    return !!account?.history.total;
-};
+export const selectNumberOfAccounts = createMemoizedSelector(
+    [selectAccounts],
+    accounts => accounts.length,
+);
 
-export const selectDeviceAccountsByNetworkSymbol = memoizeWithArgs(
-    (state: AccountsRootState & DeviceRootState, networkSymbol: NetworkSymbol | null) => {
-        if (G.isNull(networkSymbol)) return [];
+export const selectUserHasAccounts = createMemoizedSelector(
+    [selectAccounts],
+    accounts => accounts.length > 0,
+);
 
-        const accounts = selectDeviceAccounts(state);
+export const selectAccountByKey = createMemoizedSelector(
+    [selectAccounts, (_state: AccountsRootState, accountKey?: AccountKey) => accountKey],
+    (accounts, accountKey) => {
+        if (!accountKey) return null;
 
-        return A.filter(accounts, account => account.symbol === networkSymbol);
-    },
-    {
-        size: Object.keys(networks).length,
+        return accounts.find(account => account.key === accountKey) ?? null;
     },
 );
 
-export const selectVisibleDeviceAccountsByNetworkSymbol = memoizeWithArgs(
-    (state: AccountsRootState & DeviceRootState, networkSymbol: NetworkSymbol | null) =>
-        selectDeviceAccountsByNetworkSymbol(state, networkSymbol).filter(
-            account => account.visible,
-        ),
-    {
-        size: Object.keys(networks).length,
-    },
+export const selectHasAccountTransactions = createMemoizedSelector(
+    [selectAccountByKey],
+    account => !!account?.history.total,
 );
 
-export const selectVisibleNonEmptyDeviceAccountsByNetworkSymbol = (
-    state: AccountsRootState & DeviceRootState,
-    networkSymbol: NetworkSymbol | null,
-) =>
-    selectDeviceAccountsByNetworkSymbol(state, networkSymbol).filter(
-        account => !account.empty || account.visible,
-    );
-
-export const selectNonEmptyDeviceAccounts = (state: AccountsRootState & DeviceRootState) =>
-    selectDeviceAccounts(state).filter(account => !account.empty);
-
-export const selectAccountsByNetworkAndDeviceState = memoizeWithArgs(
-    (state: AccountsRootState, deviceState: string, networkSymbol: NetworkSymbol) => {
-        const accounts = selectAccounts(state);
+export const selectDeviceAccountsByNetworkSymbol = createMemoizedSelector(
+    [
+        selectDeviceAccounts,
+        (_state: AccountsRootState & DeviceRootState, networkSymbol: NetworkSymbol | null) =>
+            networkSymbol,
+    ],
+    (accounts, networkSymbol) => {
+        if (G.isNull(networkSymbol)) return EMPTY_STABLE_ACCOUNTS_ARRAY;
 
-        return accounts.filter(
-            account => account.deviceState === deviceState && account.symbol === networkSymbol,
+        return pipe(
+            accounts,
+            A.filter(account => account.symbol === networkSymbol),
+            returnStableArrayIfEmpty,
         );
     },
-    {
-        size: 80,
-    },
 );
 
-export const selectFirstNormalAccountForNetworkSymbol = memoizeWithArgs(
-    (state: AccountsRootState & DeviceRootState, networkSymbol: NetworkSymbol) =>
-        selectDeviceAccountsForNetworkSymbolAndAccountType(state, networkSymbol, 'normal').filter(
-            account => account.index === 0,
-        )[0] ?? null,
-    {
-        size: Object.keys(networks).length,
-    },
+export const selectVisibleDeviceAccountsByNetworkSymbol = createMemoizedSelector(
+    [selectDeviceAccountsByNetworkSymbol],
+    accounts =>
+        pipe(
+            accounts,
+            A.filter(account => account.visible),
+            returnStableArrayIfEmpty,
+        ),
 );
 
-export const selectAccountLabel = (
-    state: AccountsRootState,
-    accountKey?: AccountKey,
-): string | null => {
-    const account = selectAccountByKey(state, accountKey);
-
-    if (!account) return null;
-
-    return account.accountLabel ?? null;
-};
+export const selectVisibleNonEmptyDeviceAccountsByNetworkSymbol = createMemoizedSelector(
+    [selectDeviceAccountsByNetworkSymbol],
+    accounts =>
+        pipe(
+            accounts,
+            A.filter(account => !account.empty || account.visible),
+            returnStableArrayIfEmpty,
+        ),
+);
 
-export const selectAccountNetworkSymbol = (
-    state: AccountsRootState,
-    accountKey?: AccountKey,
-): NetworkSymbol | null => {
-    const account = selectAccountByKey(state, accountKey);
+export const selectNonEmptyDeviceAccounts = createMemoizedSelector(
+    [selectDeviceAccounts],
+    accounts =>
+        pipe(
+            accounts.filter(account => !account.empty),
+            returnStableArrayIfEmpty,
+        ),
+);
 
-    if (!account) return null;
+export const selectAccountsByNetworkAndDeviceState = createMemoizedSelector(
+    [
+        selectAccounts,
+        (_state: AccountsRootState, deviceState: StaticSessionId) => deviceState,
+        (_state: AccountsRootState, _deviceState: StaticSessionId, networkSymbol: NetworkSymbol) =>
+            networkSymbol,
+    ],
+    (accounts, deviceState, networkSymbol) =>
+        pipe(
+            accounts.filter(
+                account => account.deviceState === deviceState && account.symbol === networkSymbol,
+            ),
+            returnStableArrayIfEmpty,
+        ),
+);
 
-    return account.symbol;
-};
+export const selectFirstNormalAccountForNetworkSymbol = createMemoizedSelector(
+    [
+        (state: AccountsRootState & DeviceRootState, networkSymbol: NetworkSymbol) =>
+            selectDeviceAccountsForNetworkSymbolAndAccountType(state, networkSymbol, 'normal'),
+    ],
+    accounts => accounts.find(account => account.index === 0) ?? null,
+);
 
-export const selectAccountAvailableBalance = (
-    state: AccountsRootState,
-    accountKey?: AccountKey,
-): string | null => {
-    const account = selectAccountByKey(state, accountKey);
+export const selectAccountLabel = createMemoizedSelector(
+    [selectAccountByKey],
+    account => account?.accountLabel ?? null,
+);
 
-    if (!account) return null;
+export const selectAccountNetworkSymbol = createMemoizedSelector(
+    [selectAccountByKey],
+    account => account?.symbol ?? null,
+);
 
-    return account.availableBalance;
-};
+export const selectAccountAvailableBalance = createMemoizedSelector(
+    [selectAccountByKey],
+    account => account?.availableBalance ?? null,
+);
 
-export const selectFormattedAccountType = (
-    state: AccountsRootState,
-    accountKey: AccountKey,
-): string | null => {
-    const account = selectAccountByKey(state, accountKey);
+export const selectFormattedAccountType = createMemoizedSelector([selectAccountByKey], account => {
     if (!account) return null;
-
     const { networkType, accountType } = account;
     const formattedType = formattedAccountTypeMap[networkType]?.[accountType];
 
-    if (!formattedType) return null;
-
-    return formattedType;
-};
-
-export const selectIsAccountUtxoBased = (state: AccountsRootState, accountKey: AccountKey) => {
-    const account = selectAccountByKey(state, accountKey);
-
-    return account ? isUtxoBased(account) : false;
-};
-
-export const selectIsTestnetAccount = (state: AccountsRootState, accountKey: AccountKey) => {
-    const account = selectAccountByKey(state, accountKey);
+    return formattedType ?? null;
+});
 
-    return account ? isTestnet(account.symbol) : false;
-};
-
-export const selectDeviceAccountByDescriptorAndNetworkSymbol = (
-    state: AccountsRootState & DeviceRootState,
-    accountDescriptor: string,
-    networkSymbol: NetworkSymbol,
-) => {
-    const accounts = selectDeviceAccounts(state);
+export const selectIsAccountUtxoBased = createMemoizedSelector([selectAccountByKey], account =>
+    account ? isUtxoBased(account) : false,
+);
 
-    return (
-        A.find(
-            accounts,
-            account => account.descriptor === accountDescriptor && account.symbol === networkSymbol,
-        ) ?? null
-    );
-};
+export const selectIsTestnetAccount = createMemoizedSelector([selectAccountByKey], account =>
+    account ? isTestnet(account.symbol) : false,
+);
 
-export const selectDeviceAccountKeyByDescriptorAndNetworkSymbol = (
-    state: AccountsRootState & DeviceRootState,
-    accountDescriptor?: string,
-    networkSymbol?: NetworkSymbol,
-): AccountKey | null => {
-    if (!accountDescriptor || !networkSymbol) return null;
-    const account = selectDeviceAccountByDescriptorAndNetworkSymbol(
-        state,
-        accountDescriptor,
-        networkSymbol,
-    );
+export const selectDeviceAccountByDescriptorAndNetworkSymbol = createMemoizedSelector(
+    [
+        selectDeviceAccounts,
+        (_state: AccountsRootState & DeviceRootState, accountDescriptor?: string) =>
+            accountDescriptor,
+        (
+            _state: AccountsRootState & DeviceRootState,
+            _accountDescriptor?: string,
+            networkSymbol?: NetworkSymbol,
+        ) => networkSymbol,
+    ],
+    (accounts, accountDescriptor, networkSymbol) => {
+        if (!accountDescriptor || !networkSymbol) return null;
+
+        return (
+            accounts.find(
+                account =>
+                    account.descriptor === accountDescriptor && account.symbol === networkSymbol,
+            ) ?? null
+        );
+    },
+);
 
-    return account?.key ?? null;
-};
+export const selectDeviceAccountKeyByDescriptorAndNetworkSymbol = createMemoizedSelector(
+    [selectDeviceAccountByDescriptorAndNetworkSymbol],
+    account => account?.key ?? null,
+);
 
-export const selectAccountsSymbols = memoize(
-    (state: AccountsRootState): NetworkSymbol[] =>
+export const selectAccountsSymbols = createMemoizedSelector(
+    [selectAccounts],
+    accounts =>
         pipe(
-            selectAccounts(state),
+            accounts,
             A.map(a => a.symbol),
             A.uniq,
+            returnStableArrayIfEmpty,
         ) as NetworkSymbol[],
 );
 
-export const selectIsDeviceAccountless = (state: AccountsRootState & DeviceRootState) =>
-    pipe(selectVisibleDeviceAccounts(state), A.isEmpty);
+export const selectIsDeviceAccountless = createMemoizedSelector(
+    [selectVisibleDeviceAccounts],
+    accounts => accounts.length === 0,
+);
 
-// Selected device has no accounts and no active discovery. It can be empty portfolio device.
-export const selectIsDiscoveredDeviceAccountless = (
-    state: AccountsRootState & DeviceRootState & DiscoveryRootState,
-) => {
-    const isDeviceAccountless = selectIsDeviceAccountless(state);
-    const isDeviceDiscoveryActive = selectIsDeviceDiscoveryActive(state);
+export const selectIsDiscoveredDeviceAccountless = createMemoizedSelector(
+    [selectIsDeviceAccountless, selectIsDeviceDiscoveryActive],
+    (isAccountless, isDiscoveryActive) => isAccountless && !isDiscoveryActive,
+);
 
-    return isDeviceAccountless && !isDeviceDiscoveryActive;
-};
+export const selectHasOnlyEmptyPortfolioTracker = createMemoizedSelector(
+    [selectIsDiscoveredDeviceAccountless, selectHasOnlyPortfolioDevice],
+    (isDiscoveredAccountless, hasOnlyPortfolio) => isDiscoveredAccountless && hasOnlyPortfolio,
+);
 
-export const selectHasOnlyEmptyPortfolioTracker = memoize(
-    (state: AccountsRootState & DeviceRootState & DiscoveryRootState) => {
-        const isDiscoveredDeviceAccountless = selectIsDiscoveredDeviceAccountless(state);
-        const hasOnlyPortfolioDevice = selectHasOnlyPortfolioDevice(state);
+export const selectIsDeviceNotEmpty = createMemoizedSelector(
+    [selectNonEmptyDeviceAccounts, selectHasDeviceDiscovery, selectDeviceState],
+    (nonEmptyAccounts, hasDiscovery, deviceState) => {
+        const isNotEmpty = nonEmptyAccounts.length > 0;
+        if (isNotEmpty) return true;
+        if (hasDiscovery || !deviceState) return null;
 
-        return isDiscoveredDeviceAccountless && hasOnlyPortfolioDevice;
+        return isNotEmpty;
     },
 );
-
-// If we know that device is not empty, we can return true right away.
-// Otherwise we return null and wait until discovery finishes
-export const selectIsDeviceNotEmpty = (
-    state: AccountsRootState & DeviceRootState & DiscoveryRootState,
-) => {
-    const deviceState = selectDeviceState(state);
-    const nonEmptyAccounts = selectNonEmptyDeviceAccounts(state);
-    const hasDiscovery = selectHasDeviceDiscovery(state);
-
-    const isNotEmpty = A.isNotEmpty(nonEmptyAccounts);
-
-    if (isNotEmpty) {
-        return true;
-    }
-
-    if (hasDiscovery || !deviceState) {
-        return null;
-    }
-
-    return isNotEmpty;
-};
diff --git a/suite-common/wallet-core/src/accounts/tests/accountsReducer.test.ts b/suite-common/wallet-core/src/accounts/tests/accountsReducer.test.ts
index 0ae86c1c28d..d2ab0983956 100644
--- a/suite-common/wallet-core/src/accounts/tests/accountsReducer.test.ts
+++ b/suite-common/wallet-core/src/accounts/tests/accountsReducer.test.ts
@@ -3,6 +3,7 @@ import { combineReducers } from '@reduxjs/toolkit';
 import { ExtraDependenciesPartial } from '@suite-common/redux-utils';
 import { configureMockStore, extraDependenciesMock } from '@suite-common/test-utils';
 import { Account } from '@suite-common/wallet-types';
+import { Bip43Path } from '@suite-common/wallet-config';
 
 import { accountsActions } from '../accountsActions';
 import { AccountsRootState, prepareAccountsReducer } from '../accountsReducer';
@@ -30,6 +31,8 @@ const getAccount = (a?: Partial<Account>) => ({
     ...a,
 });
 
+const testBip43Path: Bip43Path = "m/84'/0'/0'";
+
 describe('Account Reducer', () => {
     // accountActions.createAccount function is already tested by "discoveryActions"
     // it's pointless to write a complex tests for it
@@ -40,14 +43,14 @@ describe('Account Reducer', () => {
                 deviceState: '1stTestnetAddress@device_id:0',
                 discoveryItem: {
                     index: 0,
-                    path: "m/84'/0'/0'",
+                    path: testBip43Path,
                     accountType: 'normal',
                     networkType: 'bitcoin',
                     coin: 'btc',
                 },
                 accountInfo: {
                     descriptor: 'XPUB',
-                    path: "m/84'/0'/0'",
+                    path: testBip43Path,
                     empty: false,
                     balance: '0',
                     availableBalance: '0',
@@ -68,7 +71,13 @@ describe('Account Reducer', () => {
         const store = initStore({
             preloadedState: {
                 wallet: {
-                    accounts: [getAccount({ symbol: 'ltc', path: '1', visible: false }) as Account],
+                    accounts: [
+                        getAccount({
+                            symbol: 'ltc',
+                            path: testBip43Path,
+                            visible: false,
+                        }) as Account,
+                    ],
                 },
             },
         });
@@ -77,13 +86,13 @@ describe('Account Reducer', () => {
             accountsActions.changeAccountVisibility(
                 getAccount({
                     symbol: 'ltc',
-                    path: '1',
+                    path: testBip43Path,
                     visible: false,
                 }) as Account,
             ),
         );
         expect(store.getState().wallet.accounts[0]).toEqual(
-            getAccount({ symbol: 'ltc', path: '1', visible: true }),
+            getAccount({ symbol: 'ltc', path: testBip43Path, visible: true }),
         );
     });
 
@@ -94,7 +103,7 @@ describe('Account Reducer', () => {
             accountsActions.changeAccountVisibility(
                 getAccount({
                     symbol: 'ltc',
-                    path: '1',
+                    path: testBip43Path,
                     visible: false,
                 }) as Account,
             ),
diff --git a/suite-common/wallet-core/src/blockchain/blockchainReducer.ts b/suite-common/wallet-core/src/blockchain/blockchainReducer.ts
index 132f09ed3ae..2f5cec696be 100644
--- a/suite-common/wallet-core/src/blockchain/blockchainReducer.ts
+++ b/suite-common/wallet-core/src/blockchain/blockchainReducer.ts
@@ -1,7 +1,6 @@
 import { PayloadAction } from '@reduxjs/toolkit';
-import { memoizeWithArgs } from 'proxy-memoize';
 
-import { createReducerWithExtraDeps } from '@suite-common/redux-utils';
+import { createReducerWithExtraDeps, createWeakMapSelector } from '@suite-common/redux-utils';
 import {
     BackendType,
     getNetworkOptional,
@@ -229,36 +228,29 @@ export const prepareBlockchainReducer = createReducerWithExtraDeps(
     },
 );
 
+const createMemoizedSelector = createWeakMapSelector.withTypes<BlockchainRootState>();
+
 export const selectBlockchainState = (state: BlockchainRootState) => state.wallet.blockchain;
-export const selectNetworkBlockchainInfo =
-    (networkSymbol: NetworkSymbol) => (state: BlockchainRootState) =>
-        state.wallet.blockchain[networkSymbol];
 
-export const selectBlockchainHeightBySymbol = memoizeWithArgs(
-    (state: BlockchainRootState, symbol: NetworkSymbol) => {
-        const blockchain = selectNetworkBlockchainInfo(symbol)(state);
+export const selectNetworkBlockchainInfo = (
+    state: BlockchainRootState,
+    networkSymbol: NetworkSymbol,
+) => state.wallet.blockchain[networkSymbol];
 
-        return blockchain.blockHeight;
-    },
+export const selectBlockchainHeightBySymbol = createMemoizedSelector(
+    [selectNetworkBlockchainInfo],
+    blockchain => blockchain?.blockHeight ?? null,
 );
 
-export const selectBlockchainExplorerBySymbol = memoizeWithArgs(
-    (state: BlockchainRootState, symbol?: NetworkSymbol) => {
-        if (!symbol) return null;
-        const blockchain = selectNetworkBlockchainInfo(symbol)(state);
-
-        return blockchain.explorer;
-    },
-    { size: 100 },
+export const selectBlockchainExplorerBySymbol = createMemoizedSelector(
+    [selectNetworkBlockchainInfo],
+    blockchain => blockchain?.explorer ?? null,
 );
 
-export const selectBlockchainBlockInfoBySymbol = memoizeWithArgs(
-    (state: BlockchainRootState, symbol: NetworkSymbol) => {
-        const blockchain = selectNetworkBlockchainInfo(symbol)(state);
-
-        return {
-            blockhash: blockchain.blockHash,
-            blockHeight: blockchain.blockHeight,
-        };
-    },
+export const selectBlockchainBlockInfoBySymbol = createMemoizedSelector(
+    [selectNetworkBlockchainInfo],
+    blockchain => ({
+        blockhash: blockchain.blockHash,
+        blockHeight: blockchain.blockHeight,
+    }),
 );
diff --git a/suite-common/wallet-core/src/blockchain/blockchainThunks.ts b/suite-common/wallet-core/src/blockchain/blockchainThunks.ts
index 98dac58f1f2..d71fad83345 100644
--- a/suite-common/wallet-core/src/blockchain/blockchainThunks.ts
+++ b/suite-common/wallet-core/src/blockchain/blockchainThunks.ts
@@ -41,6 +41,7 @@ const DEFAULT_ACCOUNT_SYNC_INTERVAL = 60 * 1000;
 const CUSTOM_ACCOUNT_SYNC_INTERVALS: Partial<Record<NetworkSymbol, number>> = {
     pol: 20 * 1000,
     bnb: 20 * 1000,
+    op: 20 * 1000,
 };
 
 const getAccountSyncInterval = (symbol: NetworkSymbol) =>
@@ -106,7 +107,7 @@ export const updateFeeInfoThunk = createThunk(
     async (symbol: string, { dispatch, getState }) => {
         const network = getNetworkOptional(symbol.toLowerCase());
         if (!network) return;
-        const blockchainInfo = selectNetworkBlockchainInfo(network.symbol)(getState());
+        const blockchainInfo = selectNetworkBlockchainInfo(getState(), network.symbol);
         const feeInfo = selectNetworkFeeInfo(getState(), network.symbol);
 
         if (
@@ -340,7 +341,7 @@ export const syncAccountsWithBlockchainThunk = createThunk(
             ),
         );
 
-        const blockchainInfo = selectNetworkBlockchainInfo(symbol)(getState());
+        const blockchainInfo = selectNetworkBlockchainInfo(getState(), symbol);
         // Second clear, just to be sure that no other sync was planned while executing this one
         tryClearTimeout(blockchainInfo.syncTimeout);
         const timeout = setTimeout(
diff --git a/suite-common/wallet-core/src/device/deviceActions.ts b/suite-common/wallet-core/src/device/deviceActions.ts
index f78e5e75cc0..cfb0a51cbed 100644
--- a/suite-common/wallet-core/src/device/deviceActions.ts
+++ b/suite-common/wallet-core/src/device/deviceActions.ts
@@ -25,7 +25,9 @@ const deviceChanged = createAction(DEVICE.CHANGED, (payload: Device | TrezorDevi
     payload,
 }));
 
-const deviceDisconnect = createAction(DEVICE.DISCONNECT, (payload: Device) => ({ payload }));
+const deviceDisconnect = createAction(DEVICE.DISCONNECT, (payload: TrezorDevice) => ({
+    payload,
+}));
 
 const updatePassphraseMode = createAction(
     `${DEVICE_MODULE_PREFIX}/updatePassphraseMode`,
@@ -80,8 +82,8 @@ export const removeButtonRequests = createAction(
     }),
 );
 
-const dismissFirmwareRevisionCheck = createAction(
-    `${DEVICE_MODULE_PREFIX}/dismissFirmwareRevisionCheck`,
+const dismissFirmwareAuthenticityCheck = createAction(
+    `${DEVICE_MODULE_PREFIX}/dismissFirmwareAuthenticityCheck`,
     (payload: string) => ({ payload }),
 );
 
@@ -90,7 +92,7 @@ export const deviceActions = {
     connectUnacquiredDevice,
     deviceChanged,
     deviceDisconnect,
-    dismissFirmwareRevisionCheck,
+    dismissFirmwareAuthenticityCheck,
     updatePassphraseMode,
     receiveAuthConfirm,
     rememberDevice,
diff --git a/suite-common/wallet-core/src/device/deviceConstants.ts b/suite-common/wallet-core/src/device/deviceConstants.ts
index 63f5a14901c..5397587ca67 100644
--- a/suite-common/wallet-core/src/device/deviceConstants.ts
+++ b/suite-common/wallet-core/src/device/deviceConstants.ts
@@ -13,8 +13,11 @@ export const portfolioTrackerDevice: TrezorDevice = {
     id: PORTFOLIO_TRACKER_DEVICE_ID,
     status: 'available',
     mode: 'normal',
-    state: PORTFOLIO_TRACKER_DEVICE_STATE,
+    state: {
+        staticSessionId: PORTFOLIO_TRACKER_DEVICE_STATE,
+    },
     label: 'My assets',
+    // @ts-expect-error - local override
     path: 'imported-1',
     firmware: 'valid',
     name: 'Portfolio Tracker',
@@ -70,5 +73,6 @@ export const portfolioTrackerDevice: TrezorDevice = {
     remember: true,
     authenticityChecks: {
         firmwareRevision: { success: true },
+        firmwareHash: { success: true },
     },
 };
diff --git a/suite-common/wallet-core/src/device/deviceReducer.ts b/suite-common/wallet-core/src/device/deviceReducer.ts
index 52ffba9a2d1..2a8961720ba 100644
--- a/suite-common/wallet-core/src/device/deviceReducer.ts
+++ b/suite-common/wallet-core/src/device/deviceReducer.ts
@@ -1,18 +1,21 @@
-import { memoize } from 'proxy-memoize';
 import { isAnyOf } from '@reduxjs/toolkit';
+import { A, pipe } from '@mobily/ts-belt';
 
 import * as deviceUtils from '@suite-common/suite-utils';
 import { getDeviceInstances, getStatus } from '@suite-common/suite-utils';
-import { Device, Features, StaticSessionId, UI } from '@trezor/connect';
+import { Device, DeviceState, Features, StaticSessionId, UI } from '@trezor/connect';
 import {
     getFirmwareVersion,
     getFirmwareVersionArray,
     hasBitcoinOnlyFirmware,
     isBitcoinOnlyDevice,
 } from '@trezor/device-utils';
-import { NetworkDeviceSupport, NetworkSymbol, networks } from '@suite-common/wallet-config';
-import { versionUtils } from '@trezor/utils';
-import { createReducerWithExtraDeps } from '@suite-common/redux-utils';
+import { NetworkSymbol, networks } from '@suite-common/wallet-config';
+import {
+    createReducerWithExtraDeps,
+    createWeakMapSelector,
+    returnStableArrayIfEmpty,
+} from '@suite-common/redux-utils';
 import { TrezorDevice, AcquiredDevice, ButtonRequest } from '@suite-common/suite-types';
 import {
     deviceAuthenticityActions,
@@ -28,12 +31,14 @@ import {
 import { ConnectDeviceSettings, deviceActions } from './deviceActions';
 import { PORTFOLIO_TRACKER_DEVICE_ID } from './deviceConstants';
 
+const createMemoizedSelector = createWeakMapSelector.withTypes<DeviceRootState>();
+
 export type State = {
     devices: TrezorDevice[];
     selectedDevice?: TrezorDevice;
     deviceAuthenticity?: Record<string, StoredAuthenticateDeviceResult>;
     dismissedSecurityChecks?: {
-        firmwareRevision?: string[];
+        firmwareAuthenticity?: string[];
     };
 };
 
@@ -52,17 +57,47 @@ export const isUnlocked = (features: Features): boolean =>
         : // Older FW (<2.3.2) which doesn't have `unlocked` feature also doesn't have auto-lock and is always unlocked.
           true;
 
+/**
+ * Local utility: get state in DeviceState format from AcquiredDevice in backwards compatible way
+ * @param upcoming
+ * @returns
+ */
+const mergeDeviceState = (
+    device: AcquiredDevice,
+    upcoming: Partial<
+        AcquiredDevice & { state?: DeviceState | StaticSessionId; _state?: DeviceState }
+    >,
+): DeviceState | undefined => {
+    const upcomingState = typeof upcoming.state === 'string' ? upcoming._state : upcoming.state;
+    if (
+        // state was previously not defined, we can set it
+        device.state === undefined ||
+        // update sessionId for the same staticSessionId
+        (upcomingState &&
+            device.state?.staticSessionId === upcomingState.staticSessionId &&
+            device.state?.sessionId !== upcomingState.sessionId)
+    ) {
+        return upcomingState;
+    }
+};
+
 /**
  * Local utility: set updated fields for device
  * @param {AcquiredDevice} device
  * @param {Partial<AcquiredDevice>} upcoming
  * @returns {TrezorDevice}
  */
-const merge = (device: AcquiredDevice, upcoming: Partial<AcquiredDevice>): TrezorDevice => ({
+const merge = (
+    device: AcquiredDevice,
+    // this method can take the old string state type, since it's not used here
+    upcoming: Partial<
+        AcquiredDevice & { state?: DeviceState | StaticSessionId; _state: DeviceState }
+    >,
+): TrezorDevice => ({
     ...device,
     ...upcoming,
     id: upcoming.id ?? device.id,
-    state: device.state,
+    state: mergeDeviceState(device, upcoming) ?? device.state,
     instance: device.instance,
     features: {
         // Don't override features if upcoming device is locked.
@@ -78,7 +113,7 @@ const merge = (device: AcquiredDevice, upcoming: Partial<AcquiredDevice>): Trezo
 });
 
 const getShouldUseEmptyPassphrase = (
-    device: Device,
+    device: Device | TrezorDevice,
     deviceInstance: number | undefined,
     settings: ConnectDeviceSettings,
 ): boolean => {
@@ -151,6 +186,7 @@ const connectDevice = (draft: State, device: Device, settings: ConnectDeviceSett
 
     const newDevice: TrezorDevice = {
         ...device,
+        state: device._state,
         useEmptyPassphrase,
         remember: false,
         connected: true,
@@ -265,7 +301,7 @@ const changeDevice = (
  * @param {State} draft
  * @param {Device} device
  */
-const disconnectDevice = (draft: State, device: Device) => {
+const disconnectDevice = (draft: State, device: TrezorDevice) => {
     // find all devices with "path"
     const affectedDevices = draft.devices.filter(d => d.path === device.path);
     affectedDevices.forEach(d => {
@@ -274,6 +310,7 @@ const disconnectDevice = (draft: State, device: Device) => {
         if (skip) {
             d.connected = false;
             d.available = false;
+            // @ts-expect-error
             d.path = '';
         } else {
             draft.devices.splice(draft.devices.indexOf(d), 1);
@@ -333,10 +370,10 @@ const changePassphraseMode = (
  * Action handler: SUITE.AUTH_DEVICE
  * @param {State} draft
  * @param {TrezorDevice} device
- * @param {string} state
+ * @param {DeviceState} state
  * @returns
  */
-const authDevice = (draft: State, device: TrezorDevice, state: StaticSessionId) => {
+const authDevice = (draft: State, device: TrezorDevice, state: DeviceState) => {
     // only acquired devices
     if (!device || !device.features) return;
     const index = deviceUtils.findInstanceIndex(draft.devices, device);
@@ -586,17 +623,14 @@ export const prepareDeviceReducer = createReducerWithExtraDeps(initialState, (bu
         .addCase(deviceAuthenticityActions.result, (state, { payload }) => {
             setDeviceAuthenticity(state, payload.device, payload.result);
         })
-        .addCase(deviceActions.dismissFirmwareRevisionCheck, (state, { payload }) => {
+        .addCase(deviceActions.dismissFirmwareAuthenticityCheck, (state, { payload }) => {
             if (!state.dismissedSecurityChecks) {
                 state.dismissedSecurityChecks = {};
             }
-            if (!state.dismissedSecurityChecks.firmwareRevision) {
-                state.dismissedSecurityChecks.firmwareRevision = [];
+            if (!state.dismissedSecurityChecks.firmwareAuthenticity) {
+                state.dismissedSecurityChecks.firmwareAuthenticity = [];
             }
-            state.dismissedSecurityChecks.firmwareRevision = [
-                payload,
-                ...state.dismissedSecurityChecks.firmwareRevision,
-            ];
+            state.dismissedSecurityChecks.firmwareAuthenticity.unshift(payload);
         })
         .addCase(extra.actionTypes.setDeviceMetadata, extra.reducers.setDeviceMetadataReducer)
         .addCase(
@@ -618,149 +652,154 @@ export const prepareDeviceReducer = createReducerWithExtraDeps(initialState, (bu
         );
 });
 
+// Basic state selectors (no need to wrap in createMemoizedSelector)
 export const selectDevices = (state: DeviceRootState) => state.device?.devices;
 export const selectDevicesCount = (state: DeviceRootState) => state.device?.devices?.length;
-export const selectIsPendingTransportEvent = (state: DeviceRootState) =>
-    state.device.devices.length < 1;
-
 export const selectDevice = (state: DeviceRootState) => state.device.selectedDevice;
 
-export const selectIsDeviceUnlocked = (state: DeviceRootState) =>
-    !!state.device.selectedDevice?.features?.unlocked;
-
-export const selectDeviceAuthFailed = (state: DeviceRootState) =>
-    !!state.device.selectedDevice?.authFailed;
-
-export const selectDeviceType = (state: DeviceRootState) => state.device.selectedDevice?.type;
-
-export const selectDeviceFeatures = (state: DeviceRootState) =>
-    state.device.selectedDevice?.features;
-
-export const selectIsDeviceProtectedByPin = (state: DeviceRootState) => {
-    const features = selectDeviceFeatures(state);
-
-    return !!features?.pin_protection;
-};
-
-export const selectIsDeviceProtectedByPassphrase = (state: DeviceRootState) => {
-    const features = selectDeviceFeatures(state);
-
-    return !!features?.passphrase_protection;
-};
-
-export const selectIsDeviceProtectedByWipeCode = (state: DeviceRootState) => {
-    const features = selectDeviceFeatures(state);
-
-    return !!features?.wipe_code_protection;
-};
-
-export const selectDeviceButtonRequests = (state: DeviceRootState) =>
-    state.device.selectedDevice?.buttonRequests ?? [];
-
-export const selectDeviceButtonRequestsCodes = (state: DeviceRootState) => {
-    const buttonRequests = selectDeviceButtonRequests(state);
-
-    return buttonRequests.map(r => r.code);
-};
-
-export const selectDeviceMode = (state: DeviceRootState) => state.device.selectedDevice?.mode;
-
-export const selectIsUnacquiredDevice = (state: DeviceRootState) => {
-    const deviceType = selectDeviceType(state);
-
-    return deviceType === 'unacquired';
-};
-
-export const selectIsDeviceInBootloader = (state: DeviceRootState) => {
-    const mode = selectDeviceMode(state);
-
-    return mode === 'bootloader';
-};
-
-export const selectIsDeviceInitialized = (state: DeviceRootState) => {
-    const features = selectDeviceFeatures(state);
-    const mode = selectDeviceMode(state);
-
-    if (mode === 'initialize' || mode === 'seedless') return false;
-
-    return !!features?.initialized;
-};
-
-export const selectIsConnectedDeviceUninitialized = (state: DeviceRootState) => {
-    const device = selectDevice(state);
-    const isDeviceInitialized = selectIsDeviceInitialized(state);
-
-    return device && !isDeviceInitialized;
-};
-
-export const selectIsDeviceAuthorized = (state: DeviceRootState) => {
-    const device = selectDevice(state);
-
-    return !!device?.state;
-};
-
-export const selectHasDeviceAuthConfirm = (state: DeviceRootState) => {
-    const device = selectDevice(state);
-
-    return !!device?.authConfirm;
-};
-
-export const selectIsDeviceConnectedAndAuthorized = (state: DeviceRootState) => {
-    const isDeviceAuthorized = selectIsDeviceAuthorized(state);
-    const deviceFeatures = selectDeviceFeatures(state);
-
-    return isDeviceAuthorized && !!deviceFeatures;
-};
-export const selectDeviceInternalModel = (state: DeviceRootState) =>
-    state.device.selectedDevice?.features?.internal_model;
-
-export const selectDeviceByState = (state: DeviceRootState, deviceState: string) =>
-    selectDevices(state).find(d => d.state === deviceState);
-
-export const selectDeviceUnavailableCapabilities = (state: DeviceRootState) =>
-    state.device.selectedDevice?.unavailableCapabilities;
-
-export const selectDeviceCapabilities = (state: DeviceRootState) =>
-    selectDeviceFeatures(state)?.capabilities;
-
-export const selectHasDevicePassphraseEntryCapability = (state: DeviceRootState) =>
-    !!selectDeviceCapabilities(state)?.includes('Capability_PassphraseEntry');
-
-export const selectDeviceStatus = (state: DeviceRootState) => {
-    const device = selectDevice(state);
-
-    return device && getStatus(device);
-};
-
-export const selectDeviceSupportedNetworks = (state: DeviceRootState) => {
-    const device = selectDevice(state);
-    const deviceModelInternal = device?.features?.internal_model;
+// Derived selectors
+export const selectIsPendingTransportEvent = createMemoizedSelector(
+    [selectDevices],
+    devices => devices.length < 1,
+);
+
+export const selectIsDeviceUnlocked = createMemoizedSelector(
+    [selectDevice],
+    device => !!device?.features?.unlocked,
+);
+
+export const selectDeviceAuthFailed = createMemoizedSelector(
+    [selectDevice],
+    device => !!device?.authFailed,
+);
+
+export const selectDeviceType = createMemoizedSelector([selectDevice], device => device?.type);
+
+export const selectDeviceFeatures = createMemoizedSelector(
+    [selectDevice],
+    device => device?.features,
+);
+
+export const selectIsDeviceProtectedByPin = createMemoizedSelector(
+    [selectDeviceFeatures],
+    features => !!features?.pin_protection,
+);
+
+export const selectIsDeviceProtectedByPassphrase = createMemoizedSelector(
+    [selectDeviceFeatures],
+    features => !!features?.passphrase_protection,
+);
+
+export const selectIsDeviceProtectedByWipeCode = createMemoizedSelector(
+    [selectDeviceFeatures],
+    features => !!features?.wipe_code_protection,
+);
+
+export const selectDeviceButtonRequests = createMemoizedSelector(
+    [selectDevice],
+    device => device?.buttonRequests ?? [],
+);
+
+export const selectDeviceButtonRequestsCodes = createMemoizedSelector(
+    [selectDeviceButtonRequests],
+    buttonRequests =>
+        pipe(
+            buttonRequests.map(r => r.code),
+            returnStableArrayIfEmpty,
+        ),
+);
+
+export const selectDeviceMode = createMemoizedSelector([selectDevice], device => device?.mode);
+
+export const selectIsUnacquiredDevice = createMemoizedSelector(
+    [selectDeviceType],
+    deviceType => deviceType === 'unacquired',
+);
+
+export const selectIsDeviceInBootloader = createMemoizedSelector(
+    [selectDeviceMode],
+    mode => mode === 'bootloader',
+);
+
+export const selectIsDeviceInitialized = createMemoizedSelector(
+    [selectDeviceFeatures, selectDeviceMode],
+    (features, mode) => {
+        if (mode === 'initialize' || mode === 'seedless') return false;
+
+        return !!features?.initialized;
+    },
+);
+
+export const selectIsConnectedDeviceUninitialized = createMemoizedSelector(
+    [selectDevice, selectIsDeviceInitialized],
+    (device, isDeviceInitialized) => device && !isDeviceInitialized,
+);
+
+export const selectIsDeviceAuthorized = createMemoizedSelector(
+    [selectDevice],
+    device => !!device?.state,
+);
+
+export const selectHasDeviceAuthConfirm = createMemoizedSelector(
+    [selectDevice],
+    device => !!device?.authConfirm,
+);
+
+export const selectIsDeviceConnectedAndAuthorized = createMemoizedSelector(
+    [selectIsDeviceAuthorized, selectDeviceFeatures],
+    (isDeviceAuthorized, deviceFeatures) => isDeviceAuthorized && !!deviceFeatures,
+);
+
+export const selectDeviceInternalModel = createMemoizedSelector(
+    [selectDevice],
+    device => device?.features?.internal_model,
+);
+
+// Selectors with parameters should use WeakMap memoization
+export const selectDeviceByState = createMemoizedSelector(
+    [selectDevices, (_state, deviceState: DeviceState) => deviceState],
+    (devices, deviceState) =>
+        devices.find(d => d.state?.staticSessionId === deviceState.staticSessionId),
+);
+
+export const selectDeviceByStaticSessionId = createMemoizedSelector(
+    [selectDevices, (_state, staticSessionId: StaticSessionId) => staticSessionId],
+    (devices, staticSessionId) => devices.find(d => d.state?.staticSessionId === staticSessionId),
+);
+
+export const selectDeviceUnavailableCapabilities = createMemoizedSelector(
+    [selectDevice],
+    device => device?.unavailableCapabilities,
+);
+
+export const selectDeviceCapabilities = createMemoizedSelector(
+    [selectDeviceFeatures],
+    features => features?.capabilities,
+);
+
+export const selectHasDevicePassphraseEntryCapability = createMemoizedSelector(
+    [selectDeviceCapabilities],
+    capabilities => !!capabilities?.includes('Capability_PassphraseEntry'),
+);
+
+export const selectDeviceStatus = createMemoizedSelector(
+    [selectDevice],
+    device => device && getStatus(device),
+);
+
+export const selectDeviceSupportedNetworks = createMemoizedSelector([selectDevice], device => {
     const firmwareVersion = getFirmwareVersion(device);
-
-    return Object.entries(networks)
-        .filter(([symbol, network]) => {
-            const support =
-                'support' in network ? (network.support as NetworkDeviceSupport) : undefined;
-
-            const firmwareSupportRestriction =
-                deviceModelInternal && support?.[deviceModelInternal];
-            const isSupportedByApp =
-                !firmwareVersion ||
-                !firmwareSupportRestriction ||
-                versionUtils.isNewerOrEqual(firmwareVersion, firmwareSupportRestriction);
-
-            const unavailableReason = isSupportedByApp
-                ? device?.unavailableCapabilities?.[symbol]
-                : 'update-required';
-
+    const result = Object.entries(networks)
+        .filter(([symbol]) => {
+            const unavailableCapability = device?.unavailableCapabilities?.[symbol];
             // if device does not have fw, do not show coins which are not supported by device in any case
-            if (!firmwareVersion && unavailableReason === 'no-support') {
+            if (!firmwareVersion && unavailableCapability === 'no-support') {
                 return false;
             }
             // if device has fw, do not show coins which are not supported by current fw
             if (
                 firmwareVersion &&
-                ['no-support', 'no-capability'].includes(unavailableReason || '')
+                ['no-support', 'no-capability'].includes(unavailableCapability || '')
             ) {
                 return false;
             }
@@ -768,212 +807,208 @@ export const selectDeviceSupportedNetworks = (state: DeviceRootState) => {
             return true;
         })
         .map(([symbol]) => symbol as NetworkSymbol);
-};
-
-export const selectDeviceById = (state: DeviceRootState, deviceId: TrezorDevice['id']) =>
-    state.device.devices.find(device => device.id === deviceId);
-
-export const selectDeviceAuthenticity = (state: DeviceRootState) => state.device.deviceAuthenticity;
-
-export const selectSelectedDeviceAuthenticity = (state: DeviceRootState) => {
-    const device = selectDevice(state);
-    const deviceAuthenticity = selectDeviceAuthenticity(state);
-
-    return device?.id ? deviceAuthenticity?.[device.id] : undefined;
-};
-
-export const selectIsFirmwareRevisionCheckDismissed = (state: DeviceRootState): boolean => {
-    const device = selectDevice(state);
-
-    return !!(
-        device?.id && state.device.dismissedSecurityChecks?.firmwareRevision?.includes(device.id)
-    );
-};
-
-export const selectIsPortfolioTrackerDevice = (state: DeviceRootState) => {
-    const device = selectDevice(state);
-
-    return device?.id === PORTFOLIO_TRACKER_DEVICE_ID;
-};
 
-export const selectDeviceLabel = (state: DeviceRootState) => {
-    const device = selectDevice(state);
-
-    return device?.features?.label;
-};
-
-export const selectDeviceName = (state: DeviceRootState) => {
-    const device = selectDevice(state);
-
-    return device?.name;
-};
-
-export const selectDeviceLabelOrNameById = (
-    state: DeviceRootState,
-    id: TrezorDevice['id'],
-): string => {
-    const device = selectDeviceById(state, id);
-
-    return device?.features?.label || device?.name || '';
-};
-
-export const selectDeviceLabelOrName = (state: DeviceRootState): string => {
-    const selectedDevice = selectDevice(state);
-
-    return selectDeviceLabelOrNameById(state, selectedDevice?.id);
-};
-
-export const selectDeviceId = (state: DeviceRootState) => {
-    const selectedDevice = selectDevice(state);
-
-    return selectedDevice?.id ?? null;
-};
-
-export const selectDeviceModelById = (state: DeviceRootState, id: TrezorDevice['id']) => {
-    const device = selectDeviceById(state, id);
-
-    return device?.features?.internal_model ?? null;
-};
-
-export const selectDeviceModel = (state: DeviceRootState) => {
-    const selectedDevice = selectDevice(state);
-
-    return selectDeviceModelById(state, selectedDevice?.id);
-};
-
-export const selectDeviceReleaseInfo = (state: DeviceRootState) => {
-    const device = selectDevice(state);
-
-    return device?.firmwareRelease ?? null;
-};
-
-export const selectDeviceFirmwareVersion = memoize((state: DeviceRootState) => {
-    const device = selectDevice(state);
-
-    return getFirmwareVersionArray(device);
-});
-export const selectPhysicalDevices = memoize((state: DeviceRootState) => {
-    const devices = selectDevices(state);
-
-    return devices.filter(device => device.id !== PORTFOLIO_TRACKER_DEVICE_ID);
+    return returnStableArrayIfEmpty(result);
 });
 
-export const selectIsNoPhysicalDeviceConnected = (state: DeviceRootState) => {
-    const devices = selectPhysicalDevices(state);
-
-    return devices.every(device => !device.connected);
-};
-
-export const selectHasOnlyPortfolioDevice = (state: DeviceRootState) => {
-    const devices = selectDevices(state);
-
-    return devices.length === 1 && devices[0].id === PORTFOLIO_TRACKER_DEVICE_ID;
-};
-
-export const selectIsDeviceBitcoinOnly = (state: DeviceRootState) => {
-    const features = selectDeviceFeatures(state);
-
-    return features?.unit_btconly ?? false;
-};
-
-export const selectDeviceLanguage = (state: DeviceRootState) => {
-    const features = selectDeviceFeatures(state);
-
-    return features?.language ?? null;
-};
-
-export const selectHasDeviceFirmwareInstalled = (state: DeviceRootState) => {
-    const device = selectDevice(state);
-
-    return !!device && device.firmware !== 'none';
-};
-
-export const selectIsDeviceRemembered = (state: DeviceRootState) => {
-    const device = selectDevice(state);
+export const selectDeviceById = createMemoizedSelector(
+    [state => state.device.devices, (_state, deviceId: TrezorDevice['id']) => deviceId],
+    (devices, deviceId) => devices.find(device => device.id === deviceId),
+);
 
-    return !!device?.remember;
-};
+export const selectDeviceAuthenticity = createMemoizedSelector(
+    [state => state.device.deviceAuthenticity],
+    deviceAuthenticity => deviceAuthenticity,
+);
 
-export const selectRememberedStandardWalletsCount = (state: DeviceRootState) => {
-    const devices = selectPhysicalDevices(state);
+export const selectSelectedDeviceAuthenticity = createMemoizedSelector(
+    [selectDevice, selectDeviceAuthenticity],
+    (device, deviceAuthenticity) => (device?.id ? deviceAuthenticity?.[device.id] : undefined),
+);
 
-    return devices.filter(device => device.remember && device.useEmptyPassphrase).length;
-};
+export const selectIsFirmwareAuthenticityCheckDismissed = createMemoizedSelector(
+    [selectDevice, state => state.device.dismissedSecurityChecks?.firmwareAuthenticity],
+    (device, dismissedChecks) => !!(device?.id && dismissedChecks?.includes(device.id)),
+);
 
-export const selectRememberedHiddenWalletsCount = (state: DeviceRootState) => {
-    const devices = selectPhysicalDevices(state);
+export const selectIsPortfolioTrackerDevice = createMemoizedSelector(
+    [selectDevice],
+    device => device?.id === PORTFOLIO_TRACKER_DEVICE_ID,
+);
 
-    return devices.filter(device => device.remember && !device.useEmptyPassphrase).length;
-};
+export const selectDeviceLabel = createMemoizedSelector(
+    [selectDevice],
+    device => device?.features?.label,
+);
 
-export const selectIsDeviceConnected = (state: DeviceRootState) => {
-    const device = selectDevice(state);
-
-    return !!device?.connected;
-};
+export const selectDeviceName = createMemoizedSelector([selectDevice], device => device?.name);
 
-export const selectIsDeviceInViewOnlyMode = (state: DeviceRootState) => {
-    const isDeviceConnected = selectIsDeviceConnected(state);
-    const isDeviceRemembered = selectIsDeviceRemembered(state);
+export const selectDeviceLabelOrNameById = createMemoizedSelector(
+    [state => state.device.devices, (_state, id: TrezorDevice['id']) => id],
+    (devices, id) => {
+        const device = devices.find(d => d.id === id);
 
-    return !isDeviceConnected && isDeviceRemembered;
-};
-
-export const selectIsDeviceUsingPassphrase = (state: DeviceRootState) => {
-    const isDeviceProtectedByPassphrase = selectIsDeviceProtectedByPassphrase(state);
-    const device = selectDevice(state);
-
-    // If device instance is higher than 1 (newly created device instance), connect returns
-    // `passphrase_protection: false` in features. But we still want to treat it as passphrase protected.
-    const shouldTreatAsPassphraseProtected = (device?.instance ?? 1) > 1;
-
-    return (
-        (isDeviceProtectedByPassphrase && device?.useEmptyPassphrase === false) ||
-        shouldTreatAsPassphraseProtected
-    );
-};
-
-export const selectPhysicalDevicesGrouppedById = memoize((state: DeviceRootState) => {
-    const devices = selectPhysicalDevices(state);
-
-    return deviceUtils.getDeviceInstancesGroupedByDeviceId(devices);
-});
-
-export const selectDeviceState = (state: DeviceRootState) => {
-    const device = selectDevice(state);
-
-    return device?.state ?? null;
-};
-
-export const selectDeviceInstances = memoize((state: DeviceRootState) => {
-    const device = selectDevice(state);
-
-    if (!device) {
-        return [];
-    }
-
-    const allDevices = selectDevices(state);
-
-    return getDeviceInstances(device, allDevices);
-});
+        return device?.features?.label || device?.name || '';
+    },
+);
 
-export const selectNumberOfDeviceInstances = (state: DeviceRootState) => {
-    const deviceInstances = selectDeviceInstances(state);
+export const selectDeviceLabelOrName = createMemoizedSelector(
+    [selectDevice, selectDevices],
+    (selectedDevice, devices) => {
+        const device = devices.find(d => d.id === selectedDevice?.id);
 
-    return deviceInstances.length;
-};
+        return device?.features?.label || device?.name || '';
+    },
+);
 
-export const selectInstacelessUnselectedDevices = memoize((state: DeviceRootState) => {
-    const device = selectDevice(state);
-    const allDevices = selectDevices(state);
+export const selectDeviceId = createMemoizedSelector(
+    [selectDevice],
+    selectedDevice => selectedDevice?.id ?? null,
+);
 
-    return deviceUtils.getSortedDevicesWithoutInstances(allDevices, device?.id);
-});
+export const selectDeviceModelById = createMemoizedSelector(
+    [state => state.device.devices, (_state, id: TrezorDevice['id']) => id],
+    (devices, id) => {
+        const device = devices.find(d => d.id === id);
 
-// Bitcoin only Trezor with bitcoin-only firmware
-export const selectIsBitcoinOnlyDevice = (state: DeviceRootState) =>
-    isBitcoinOnlyDevice(selectDevice(state));
+        return device?.features?.internal_model ?? null;
+    },
+);
+
+export const selectDeviceModel = createMemoizedSelector(
+    [selectDevice],
+    selectedDevice => selectedDevice?.features?.internal_model ?? null,
+);
+
+export const selectDeviceReleaseInfo = createMemoizedSelector(
+    [selectDevice],
+    device => device?.firmwareRelease ?? null,
+);
+
+export const selectDeviceFirmwareVersion = createMemoizedSelector([selectDevice], device =>
+    getFirmwareVersionArray(device),
+);
+
+export const selectPhysicalDevices = createMemoizedSelector([selectDevices], devices =>
+    pipe(
+        devices,
+        A.filter(device => device.id !== PORTFOLIO_TRACKER_DEVICE_ID),
+        returnStableArrayIfEmpty,
+    ),
+);
+
+export const selectIsNoPhysicalDeviceConnected = createMemoizedSelector(
+    [selectPhysicalDevices],
+    devices => devices.every(device => !device.connected),
+);
+
+export const selectHasOnlyPortfolioDevice = createMemoizedSelector(
+    [selectDevices],
+    devices => devices.length === 1 && devices[0].id === PORTFOLIO_TRACKER_DEVICE_ID,
+);
+
+export const selectIsDeviceBitcoinOnly = createMemoizedSelector(
+    [selectDeviceFeatures],
+    features => features?.unit_btconly ?? false,
+);
+
+export const selectDeviceLanguage = createMemoizedSelector(
+    [selectDeviceFeatures],
+    features => features?.language ?? null,
+);
+
+export const selectHasDeviceFirmwareInstalled = createMemoizedSelector(
+    [selectDevice],
+    device => !!device && device.firmware !== 'none',
+);
+
+export const selectIsDeviceRemembered = createMemoizedSelector(
+    [selectDevice],
+    device => !!device?.remember,
+);
+
+export const selectRememberedStandardWalletsCount = createMemoizedSelector(
+    [selectPhysicalDevices],
+    devices =>
+        returnStableArrayIfEmpty(
+            devices.filter(device => device.remember && device.useEmptyPassphrase),
+        ).length,
+);
+
+export const selectRememberedHiddenWalletsCount = createMemoizedSelector(
+    [selectPhysicalDevices],
+    devices =>
+        returnStableArrayIfEmpty(
+            devices.filter(device => device.remember && !device.useEmptyPassphrase),
+        ).length,
+);
+
+export const selectIsDeviceConnected = createMemoizedSelector(
+    [selectDevice],
+    device => !!device?.connected,
+);
+
+export const selectIsDeviceInViewOnlyMode = createMemoizedSelector(
+    [selectIsDeviceConnected, selectIsDeviceRemembered],
+    (isDeviceConnected, isDeviceRemembered) => !isDeviceConnected && isDeviceRemembered,
+);
+
+export const selectIsDeviceUsingPassphrase = createMemoizedSelector(
+    [selectIsDeviceProtectedByPassphrase, selectDevice],
+    (isDeviceProtectedByPassphrase, device) => {
+        const shouldTreatAsPassphraseProtected = (device?.instance ?? 1) > 1;
+
+        return (
+            (isDeviceProtectedByPassphrase && device?.useEmptyPassphrase === false) ||
+            shouldTreatAsPassphraseProtected
+        );
+    },
+);
+
+export const selectPhysicalDevicesGrouppedById = createMemoizedSelector(
+    [selectPhysicalDevices],
+    devices => returnStableArrayIfEmpty(deviceUtils.getDeviceInstancesGroupedByDeviceId(devices)),
+);
+
+export const selectDeviceState = createMemoizedSelector(
+    [selectDevice],
+    device => device?.state ?? null,
+);
+
+export const selectDeviceStaticSessionId = createMemoizedSelector(
+    [selectDevice],
+    device => device?.state?.staticSessionId ?? null,
+);
+
+export const selectDeviceInstances = createMemoizedSelector(
+    [selectDevice, selectDevices],
+    (device, allDevices) => {
+        if (!device) {
+            return [];
+        }
 
-// Any Trezor that has BTC only firmware
-export const selectHasBitcoinOnlyFirmware = (state: DeviceRootState) =>
-    hasBitcoinOnlyFirmware(selectDevice(state));
+        return pipe(getDeviceInstances(device, allDevices), returnStableArrayIfEmpty);
+    },
+);
+
+export const selectNumberOfDeviceInstances = createMemoizedSelector(
+    [selectDeviceInstances],
+    deviceInstances => deviceInstances.length,
+);
+
+export const selectInstacelessUnselectedDevices = createMemoizedSelector(
+    [selectDevice, selectDevices],
+    (device, allDevices) =>
+        pipe(
+            deviceUtils.getSortedDevicesWithoutInstances(allDevices, device?.id),
+            returnStableArrayIfEmpty,
+        ),
+);
+
+export const selectIsBitcoinOnlyDevice = createMemoizedSelector([selectDevice], device =>
+    isBitcoinOnlyDevice(device),
+);
+
+export const selectHasBitcoinOnlyFirmware = createMemoizedSelector([selectDevice], device =>
+    hasBitcoinOnlyFirmware(device),
+);
diff --git a/suite-common/wallet-core/src/device/deviceThunks.ts b/suite-common/wallet-core/src/device/deviceThunks.ts
index b7be1ef5e73..e2d0859c80a 100644
--- a/suite-common/wallet-core/src/device/deviceThunks.ts
+++ b/suite-common/wallet-core/src/device/deviceThunks.ts
@@ -8,7 +8,7 @@ import TrezorConnect, {
     Response as ConnectResponse,
     UI,
     DEVICE,
-    StaticSessionId,
+    DeviceState,
 } from '@trezor/connect';
 import { TrezorDevice } from '@suite-common/suite-types';
 import { analytics, EventType } from '@trezor/suite-analytics';
@@ -41,7 +41,6 @@ import {
 import { deviceActions, DEVICE_MODULE_PREFIX, DeviceConnectActionPayload } from './deviceActions';
 import { PORTFOLIO_TRACKER_DEVICE_ID, portfolioTrackerDevice } from './deviceConstants';
 import { selectAccountByKey } from '../accounts/accountsReducer';
-import { manualFirmwareHashCheckThunk } from '../firmware/manualFirmwareHashCheckThunk';
 
 type SelectDeviceThunkParams = {
     device: Device | TrezorDevice | undefined;
@@ -173,7 +172,7 @@ export const handleDeviceConnect = createThunk(
  */
 export const handleDeviceDisconnect = createThunk(
     `${DEVICE_MODULE_PREFIX}/handleDeviceDisconnect`,
-    (device: Device, { dispatch, getState, extra }) => {
+    (device: Device | TrezorDevice, { dispatch, getState, extra }) => {
         const {
             selectors: { selectRouterApp },
         } = extra;
@@ -219,7 +218,7 @@ export const handleDeviceDisconnect = createThunk(
  */
 export const forgetDisconnectedDevices = createThunk(
     `${DEVICE_MODULE_PREFIX}/forgetDisconnectedDevices`,
-    (device: Device, { dispatch, getState, extra }) => {
+    (device: Device | TrezorDevice, { dispatch, getState, extra }) => {
         const devices = selectDevices(getState());
         const deviceInstances = devices.filter(d => d.id === device.id);
 
@@ -294,7 +293,7 @@ export type AuthorizeDeviceError = {
     device?: TrezorDevice;
     duplicate?: TrezorDevice;
 };
-type AuthorizeDeviceSuccess = { device: TrezorDevice; state: StaticSessionId };
+type AuthorizeDeviceSuccess = { device: TrezorDevice; state: DeviceState };
 
 export const authorizeDeviceThunk = createThunk<
     AuthorizeDeviceSuccess,
@@ -309,11 +308,9 @@ export const authorizeDeviceThunk = createThunk<
         { dispatch, getState, extra, rejectWithValue },
     ) => {
         const {
-            selectors: { selectCheckFirmwareAuthenticity },
             actions: { openModal },
         } = extra;
 
-        const selectedCheckFirmwareAuthenticity = selectCheckFirmwareAuthenticity(getState());
         const device = selectDeviceSelector(getState());
 
         if (!device) return rejectWithValue({ error: 'no-device' });
@@ -323,16 +320,12 @@ export const authorizeDeviceThunk = createThunk<
             isDeviceAcquired(device) &&
             // Should ignore device state serves as a variant to call "reauthorize" device. For example in passphrase mode
             // mobile has retry button which starts passphrase flow on the same device instance to override device state.
-            (!device.state || shouldIgnoreDeviceState) &&
+            (!device.state?.staticSessionId || shouldIgnoreDeviceState) &&
             device.mode === 'normal' &&
             device.firmware !== 'required';
 
         if (!isDeviceReady) return rejectWithValue({ error: 'device-not-ready', device });
 
-        if (selectedCheckFirmwareAuthenticity) {
-            await dispatch(manualFirmwareHashCheckThunk());
-        }
-
         const deviceParams: Parameters<typeof TrezorConnect.getDeviceState>[0] = {
             device: {
                 path: device.path,
@@ -346,11 +339,14 @@ export const authorizeDeviceThunk = createThunk<
         const response = await TrezorConnect.getDeviceState(deviceParams);
 
         if (response.success) {
-            const { state } = response.payload;
+            const { state, _state } = response.payload;
             const s = state.split(':')[0];
             const devices = selectDevices(getState());
             const duplicate = devices?.find(
-                d => d.state && d.state.split(':')[0] === s && d.instance !== device.instance,
+                d =>
+                    d.state?.staticSessionId &&
+                    d.state.staticSessionId.split(':')[0] === s &&
+                    d.instance !== device.instance,
             );
             // get fresh data from reducer, `useEmptyPassphrase` might be changed after TrezorConnect call
             const freshDeviceData = getSelectedDevice(device, devices);
@@ -377,7 +373,7 @@ export const authorizeDeviceThunk = createThunk<
                 });
             }
 
-            return { device: freshDeviceData as TrezorDevice, state };
+            return { device: freshDeviceData as TrezorDevice, state: _state };
         }
 
         if (
@@ -462,7 +458,7 @@ export const authConfirm = createThunk(
             return;
         }
 
-        if (response.payload.state !== device.state) {
+        if (response.payload.state !== device.state?.staticSessionId) {
             dispatch(deviceActions.receiveAuthConfirm({ device, success: false }));
             dispatch(extra.actions.openModal({ type: 'passphrase-mismatch-warning' }));
 
diff --git a/suite-common/wallet-core/src/discovery/discoveryReducer.ts b/suite-common/wallet-core/src/discovery/discoveryReducer.ts
index 271b46131bf..788f9fc8d05 100644
--- a/suite-common/wallet-core/src/discovery/discoveryReducer.ts
+++ b/suite-common/wallet-core/src/discovery/discoveryReducer.ts
@@ -2,6 +2,7 @@ import { createDeferred } from '@trezor/utils';
 import { Discovery, PartialDiscovery } from '@suite-common/wallet-types';
 import { createReducerWithExtraDeps } from '@suite-common/redux-utils';
 import { DiscoveryStatus } from '@suite-common/wallet-constants';
+import { DeviceState, StaticSessionId } from '@trezor/connect';
 
 import { discoveryActions } from './discoveryActions';
 import { DeviceRootState, selectDevice } from '../device/deviceReducer';
@@ -82,18 +83,25 @@ export const selectDiscovery = (state: DiscoveryRootState) => state.wallet.disco
 // Get discovery process for deviceState.
 export const selectDiscoveryByDeviceState = (
     state: DiscoveryRootState,
-    deviceState: string | undefined,
-) => (deviceState ? state.wallet.discovery.find(d => d.deviceState === deviceState) : undefined);
+    deviceState: DeviceState | StaticSessionId | undefined,
+) =>
+    deviceState
+        ? state.wallet.discovery.find(d =>
+              typeof deviceState === 'string'
+                  ? d.deviceState === deviceState
+                  : d.deviceState === deviceState.staticSessionId,
+          )
+        : undefined;
 
 export const selectDeviceDiscovery = (state: DiscoveryRootState & DeviceRootState) => {
     const selectedDevice = selectDevice(state);
 
-    return selectDiscoveryByDeviceState(state, selectedDevice?.state);
+    return selectDiscoveryByDeviceState(state, selectedDevice?.state?.staticSessionId);
 };
 
 export const selectIsDiscoveryActiveByDeviceState = (
     state: DiscoveryRootState & DeviceRootState,
-    deviceState: string | undefined,
+    deviceState: DeviceState | StaticSessionId | undefined,
 ) => {
     const discovery = selectDiscoveryByDeviceState(state, deviceState);
 
diff --git a/suite-common/wallet-core/src/discovery/discoveryThunks.ts b/suite-common/wallet-core/src/discovery/discoveryThunks.ts
index 4d60a6b4133..545c3d40b13 100644
--- a/suite-common/wallet-core/src/discovery/discoveryThunks.ts
+++ b/suite-common/wallet-core/src/discovery/discoveryThunks.ts
@@ -1,4 +1,4 @@
-import { createThunk } from '@suite-common/redux-utils';
+import { createThunk, ExtraDependencies } from '@suite-common/redux-utils';
 import { DiscoveryStatus } from '@suite-common/wallet-constants';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import TrezorConnect, { AccountInfo, BundleProgress, StaticSessionId, UI } from '@trezor/connect';
@@ -7,6 +7,7 @@ import {
     tryGetAccountIdentity,
     getDerivationType,
     isTrezorConnectBackendType,
+    substituteBip43Path,
 } from '@suite-common/wallet-utils';
 import { Discovery, DiscoveryItem, PartialDiscovery } from '@suite-common/wallet-types';
 import { getTxsPerPage } from '@suite-common/suite-utils';
@@ -37,7 +38,7 @@ import {
 } from './discoveryReducer';
 import { selectAccounts } from '../accounts/accountsReducer';
 import { accountsActions } from '../accounts/accountsActions';
-import { selectDevice, selectDevices } from '../device/deviceReducer';
+import { selectDeviceByStaticSessionId } from '../device/deviceReducer';
 
 type ProgressEvent = BundleProgress<AccountInfo | null>['payload'];
 
@@ -83,7 +84,8 @@ export const filterUnavailableAccountTypes = (
 
 const calculateProgress =
     (discovery: Discovery) =>
-    (_dispatch: any, getState: any): PartialDiscovery => {
+    (_dispatch: any, getState: any, extra: ExtraDependencies): PartialDiscovery => {
+        const { selectDevice } = extra.selectors;
         const device = selectDevice(getState());
         // reconstruct networks from discovery symbols, because we need to iterate through accounts
         const networksToCount = filterUnavailableNetworks(discovery.networks, device);
@@ -300,7 +302,7 @@ export const getBundleThunk = createThunk(
                 const pathIndex = (index + (isEvmLedgerDerivationPath ? 1 : 0)).toString();
 
                 bundle.push({
-                    path: bip43Path.replace('i', pathIndex),
+                    path: substituteBip43Path(bip43Path, pathIndex),
                     coin: networkSymbol,
                     identity: tryGetAccountIdentity({
                         networkType,
@@ -331,9 +333,12 @@ export const getBundleThunk = createThunk(
 export const getAvailableCardanoDerivationsThunk = createThunk(
     `${DISCOVERY_MODULE_PREFIX}/getAvailableCardanoDerivations`,
     async (
-        { deviceState, device }: { deviceState: StaticSessionId; device: TrezorDevice },
-        { dispatch },
+        { deviceState }: { deviceState: StaticSessionId },
+        { getState, dispatch },
     ): Promise<('normal' | 'legacy' | 'ledger')[] | undefined> => {
+        const device = selectDeviceByStaticSessionId(getState(), deviceState);
+        if (!device) return;
+
         // If icarus and icarus-trezor derivations return same pub key
         // we can skip derivation of the latter as it would discover same accounts.
         // Ledger derivation will always result in different pub key except in shamir where all derivations are the same
@@ -352,11 +357,13 @@ export const getAvailableCardanoDerivationsThunk = createThunk(
 
         const icarusTrezorPubKeyResult = await TrezorConnect.cardanoGetPublicKey({
             ...commonParams,
+            device: icarusPubKeyResult.success ? icarusPubKeyResult.device : device,
             derivationType: getDerivationType('legacy'),
         });
 
         const ledgerPubKeyResult = await TrezorConnect.cardanoGetPublicKey({
             ...commonParams,
+            device: icarusTrezorPubKeyResult.success ? icarusTrezorPubKeyResult.device : device,
             derivationType: getDerivationType('ledger'),
         });
 
@@ -413,7 +420,7 @@ export const startDiscoveryThunk = createThunk(
     `${DISCOVERY_MODULE_PREFIX}/start`,
     async (_, { dispatch, getState, extra }): Promise<void> => {
         const {
-            selectors: { selectMetadata },
+            selectors: { selectMetadata, selectDevice },
             thunks: { initMetadata, fetchAndSaveMetadata },
             actions: { requestAuthConfirm },
         } = extra;
@@ -486,7 +493,7 @@ export const startDiscoveryThunk = createThunk(
         ) {
             // check if discovery of legacy (icarus-trezor) or ledger accounts is needed and update discovery accordingly
             availableCardanoDerivations = await dispatch(
-                getAvailableCardanoDerivationsThunk({ deviceState, device }),
+                getAvailableCardanoDerivationsThunk({ deviceState }),
             ).unwrap();
             if (!availableCardanoDerivations) {
                 // Edge case where getAvailableCardanoDerivations dispatches error, stops discovery and returns undefined.
@@ -731,14 +738,13 @@ export const updateNetworkSettingsThunk = createThunk(
     `${DISCOVERY_MODULE_PREFIX}/updateNetworkSettings`,
     (_, { dispatch, getState, extra }) => {
         const {
-            selectors: { selectEnabledNetworks },
+            selectors: { selectEnabledNetworks, selectDevices },
         } = extra;
         const enabledNetworks = selectEnabledNetworks(getState());
         const discovery = selectDiscovery(getState());
-
         discovery.forEach(d => {
             const devices = selectDevices(getState());
-            const device = devices.find(dev => dev.state === d.deviceState);
+            const device = devices.find(dev => dev.state?.staticSessionId === d.deviceState);
             const networksSymbols = filterUnavailableNetworks(enabledNetworks, device).map(
                 n => n.symbol,
             );
diff --git a/suite-common/wallet-core/src/fees/feesReducer.ts b/suite-common/wallet-core/src/fees/feesReducer.ts
index b6b4cc45159..16fb4397c6c 100644
--- a/suite-common/wallet-core/src/fees/feesReducer.ts
+++ b/suite-common/wallet-core/src/fees/feesReducer.ts
@@ -1,8 +1,10 @@
 import { createReducer } from '@reduxjs/toolkit';
 
-import { NetworkSymbol, networksCollection } from '@suite-common/wallet-config';
+import { NetworkSymbol, getNetworkType, networksCollection } from '@suite-common/wallet-config';
 import { FeeInfo, FeeLevelLabel } from '@suite-common/wallet-types';
 import { formatDuration } from '@suite-common/suite-utils';
+import { getFeeLevels } from '@suite-common/wallet-utils';
+import { createWeakMapSelector, returnStableArrayIfEmpty } from '@suite-common/redux-utils';
 import { FeeLevel } from '@trezor/connect';
 
 import { blockchainActions } from '../blockchain/blockchainActions';
@@ -39,41 +41,52 @@ export const feesReducer = createReducer(initialState, builder => {
     });
 });
 
-export const selectNetworkFeeInfo = (state: FeesRootState, networkSymbol?: NetworkSymbol) =>
-    networkSymbol ? state.wallet.fees[networkSymbol] : null;
+// Create app selector with WeakMap memoization since we'll be using parameters
+const createMemoizedSelector = createWeakMapSelector.withTypes<FeesRootState>();
 
-export const selectNetworkFeeLevel = (
-    state: FeesRootState,
-    level: FeeLevelLabel,
-    networkSymbol?: NetworkSymbol,
-): FeeLevel | null => {
-    const networkFeeInfo = selectNetworkFeeInfo(state, networkSymbol);
-    if (!networkFeeInfo) return null;
+// Base selector for fees state
+const selectFees = (state: FeesRootState) => state.wallet.fees;
 
-    const feeLevel = networkFeeInfo.levels.find(x => x.label === level);
+export const selectNetworkFeeInfo = createMemoizedSelector(
+    [selectFees, (_state: FeesRootState, networkSymbol?: NetworkSymbol) => networkSymbol],
+    (fees, networkSymbol): FeeInfo | null => {
+        if (!networkSymbol) return null;
 
-    return feeLevel ?? null;
-};
+        const networkType = getNetworkType(networkSymbol);
+        const networkFeeInfo = fees[networkSymbol];
+        const levels = returnStableArrayIfEmpty(getFeeLevels(networkType, networkFeeInfo));
 
-export const selectNetworkFeeLevelTimeEstimate = (
-    state: FeesRootState,
-    level: FeeLevelLabel,
-    networkSymbol?: NetworkSymbol,
-): string | null => {
-    const networkFeeInfo = selectNetworkFeeInfo(state, networkSymbol);
-    const feeLevel = selectNetworkFeeLevel(state, level, networkSymbol);
-    if (!feeLevel || !networkFeeInfo) return null;
+        return { ...networkFeeInfo, levels };
+    },
+);
 
-    return formatDuration(networkFeeInfo.blockTime * feeLevel.blocks * 60);
-};
+export const selectNetworkFeeLevel = createMemoizedSelector(
+    [
+        selectNetworkFeeInfo,
+        (_state: FeesRootState, _networkSymbol?: NetworkSymbol, level?: FeeLevelLabel) => level,
+    ],
+    (networkFeeInfo, level): FeeLevel | null => {
+        if (!networkFeeInfo) return null;
+        const feeLevel = networkFeeInfo.levels.find(x => x.label === level);
 
-export const selectNetworkFeeLevelFeePerUnit = (
-    state: FeesRootState,
-    level: FeeLevelLabel,
-    networkSymbol?: NetworkSymbol,
-): string | null => {
-    const feeLevel = selectNetworkFeeLevel(state, level, networkSymbol);
-    if (!feeLevel) return null;
+        return feeLevel ?? null;
+    },
+);
 
-    return feeLevel.feePerUnit;
-};
+export const selectNetworkFeeLevelTimeEstimate = createMemoizedSelector(
+    [selectNetworkFeeInfo, selectNetworkFeeLevel],
+    (networkFeeInfo, feeLevel): string | null => {
+        if (!feeLevel || !networkFeeInfo) return null;
+
+        return formatDuration(networkFeeInfo.blockTime * feeLevel.blocks * 60);
+    },
+);
+
+export const selectNetworkFeeLevelFeePerUnit = createMemoizedSelector(
+    [selectNetworkFeeLevel],
+    (feeLevel): string | null => {
+        if (!feeLevel) return null;
+
+        return feeLevel.feePerUnit;
+    },
+);
diff --git a/suite-common/wallet-core/src/fiat-rates/fiatRatesMiddleware.ts b/suite-common/wallet-core/src/fiat-rates/fiatRatesMiddleware.ts
index 51e20693352..b29a1179636 100644
--- a/suite-common/wallet-core/src/fiat-rates/fiatRatesMiddleware.ts
+++ b/suite-common/wallet-core/src/fiat-rates/fiatRatesMiddleware.ts
@@ -108,21 +108,22 @@ export const prepareFiatRatesMiddleware = createMiddlewareWithExtraDeps(
         if (accountsActions.createIndexLabeledAccount.match(action)) {
             const localCurrency = selectLocalCurrency(getState());
 
-            const { tokens, symbol } = action.payload;
-            const tickers = tokens?.map(token => ({
+            const { tokens = [], symbol } = action.payload;
+            const tokenTickers = tokens.map(token => ({
                 symbol,
                 tokenAddress: token.contract as TokenAddress,
             }));
-            if (tickers) {
-                dispatch(
-                    updateFiatRatesThunk({
-                        tickers,
-                        rateType: 'current',
-                        localCurrency,
-                        fetchAttemptTimestamp: Date.now() as Timestamp,
-                    }),
-                );
-            }
+            // include main account fiat rate ticker
+            const tickers = [...tokenTickers, { symbol }];
+
+            dispatch(
+                updateFiatRatesThunk({
+                    tickers,
+                    rateType: 'current',
+                    localCurrency,
+                    fetchAttemptTimestamp: Date.now() as Timestamp,
+                }),
+            );
         }
 
         return next(action);
diff --git a/suite-common/wallet-core/src/fiat-rates/fiatRatesThunks.ts b/suite-common/wallet-core/src/fiat-rates/fiatRatesThunks.ts
index 372811a912d..22a09e75a93 100644
--- a/suite-common/wallet-core/src/fiat-rates/fiatRatesThunks.ts
+++ b/suite-common/wallet-core/src/fiat-rates/fiatRatesThunks.ts
@@ -39,7 +39,7 @@ export const updateTxsFiatRatesThunk = createThunk(
 
         const isElectrumBackend = selectIsElectrumBackendSelected(getState(), account.symbol);
 
-        let rates: TickerResult[] = [];
+        const rates: TickerResult[] = [];
 
         const timestamps = txs.map(tx => tx.blockTime) as Timestamp[];
         await fetchTransactionsRates(
@@ -53,7 +53,7 @@ export const updateTxsFiatRatesThunk = createThunk(
         const groupedTokensTxs = groupTokensTransactionsByContractAddress(txs);
 
         for (const token in groupedTokensTxs) {
-            const hasCoinDefinitions = getNetworkFeatures(account.symbol as NetworkSymbol).includes(
+            const hasCoinDefinitions = getNetworkFeatures(account.symbol).includes(
                 'coin-definitions',
             );
 
diff --git a/suite-common/wallet-core/src/firmware/checkFirmwareHashThunk.ts b/suite-common/wallet-core/src/firmware/checkFirmwareHashThunk.ts
deleted file mode 100644
index 07330fb9ff0..00000000000
--- a/suite-common/wallet-core/src/firmware/checkFirmwareHashThunk.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { createThunk } from '@suite-common/redux-utils';
-import TrezorConnect from '@trezor/connect';
-import { getFwUpdateVersion, resolveStaticPath } from '@suite-common/suite-utils';
-import { getFirmwareVersion } from '@trezor/device-utils';
-import { isDesktop } from '@trezor/env-utils';
-import { TrezorDevice } from '@suite-common/suite-types';
-
-import { FIRMWARE_MODULE_PREFIX } from './firmwareActions';
-import { selectFirmware } from './firmwareReducer';
-
-type CheckFirmwareHashThunkParams = {
-    device: TrezorDevice;
-};
-
-export const validateFirmwareHashThunk = createThunk<
-    { success: 'valid' } | { success: 'invalid'; error: string },
-    CheckFirmwareHashThunkParams,
-    { rejectValue: { success: 'unable-to-verify'; error: string } }
->(
-    `${FIRMWARE_MODULE_PREFIX}/checkFirmwareHashThunk`,
-    async ({ device }, { getState, extra, rejectWithValue, fulfillWithValue }) => {
-        const currentFwVersion = getFirmwareVersion(device);
-        const availableFwVersion = getFwUpdateVersion(device);
-
-        if (availableFwVersion === null) {
-            return rejectWithValue({
-                success: 'unable-to-verify',
-                error: 'No available FW version',
-            });
-        }
-
-        const desktopBinDir = extra.selectors.selectDesktopBinDir(getState());
-        const { useDevkit } = selectFirmware(getState());
-
-        // FW binaries are stored in "*/static/connect/data/firmware/*/*.bin". see "connect-common" package
-        const baseUrl = `${isDesktop() ? desktopBinDir : resolveStaticPath('connect/data')}${
-            useDevkit ? '/devkit' : ''
-        }`;
-
-        const result = await TrezorConnect.checkFirmwareAuthenticity({
-            // For current version of the FW (the one known by the Suite) we dont need to download it
-            // and we just link it statically
-            baseUrl: currentFwVersion === availableFwVersion ? baseUrl : undefined,
-        });
-
-        if (!result.success) {
-            return rejectWithValue({ success: 'unable-to-verify', error: result.payload.error });
-        }
-
-        return fulfillWithValue(
-            result.payload.valid
-                ? { success: 'valid' }
-                : { success: 'invalid', error: 'Hash does not match!' },
-        );
-    },
-);
diff --git a/suite-common/wallet-core/src/firmware/firmwareActions.ts b/suite-common/wallet-core/src/firmware/firmwareActions.ts
index 6486a775b6d..9cd5b48b419 100644
--- a/suite-common/wallet-core/src/firmware/firmwareActions.ts
+++ b/suite-common/wallet-core/src/firmware/firmwareActions.ts
@@ -17,9 +17,19 @@ const setHashInvalid = createAction(
     }),
 );
 
-const setError = createAction(`${FIRMWARE_MODULE_PREFIX}/set-error`, (payload?: string) => ({
-    payload,
-}));
+const clearInvalidHash = createAction(
+    `${FIRMWARE_MODULE_PREFIX}/clear-invalid-hash`,
+    (payload: string) => ({
+        payload,
+    }),
+);
+
+const setFirmwareUpdateError = createAction(
+    `${FIRMWARE_MODULE_PREFIX}/set-firmware-update-error`,
+    (payload?: string) => ({
+        payload,
+    }),
+);
 
 const setTargetType = createAction(
     `${FIRMWARE_MODULE_PREFIX}/set-target-type`,
@@ -53,8 +63,9 @@ const cacheDevice = createAction(
 
 export const firmwareActions = {
     setHashInvalid,
+    clearInvalidHash,
     setStatus,
-    setError,
+    setFirmwareUpdateError,
     setTargetType,
     setIsCustomFirmware,
     resetReducer,
diff --git a/suite-common/wallet-core/src/firmware/firmwareReducer.ts b/suite-common/wallet-core/src/firmware/firmwareReducer.ts
index 8e138c9cd38..7029b294de7 100644
--- a/suite-common/wallet-core/src/firmware/firmwareReducer.ts
+++ b/suite-common/wallet-core/src/firmware/firmwareReducer.ts
@@ -59,7 +59,12 @@ export const prepareFirmwareReducer = createReducerWithExtraDeps(initialState, (
             state.firmwareHashInvalid.push(payload);
             state.status = 'error';
         })
-        .addCase(firmwareActions.setError, (state, { payload }) => {
+        .addCase(firmwareActions.clearInvalidHash, (state, { payload }) => {
+            state.firmwareHashInvalid = state.firmwareHashInvalid.filter(
+                deviceId => deviceId !== payload,
+            );
+        })
+        .addCase(firmwareActions.setFirmwareUpdateError, (state, { payload }) => {
             state.error = payload;
             if (payload) {
                 state.status = 'error';
@@ -91,7 +96,10 @@ export const prepareFirmwareReducer = createReducerWithExtraDeps(initialState, (
                 action.type === UI.FIRMWARE_PROGRESS ||
                 action.type === DEVICE.BUTTON,
             (state, action) => {
-                state.uiEvent = action;
+                // DEVICE.BUTTON can be dispatched outside of the firmware update flow and that should not change the uiEvent,
+                // otherwise it could result in confirmation pill being displayed unintentionally.
+                if (!(action.type === DEVICE.BUTTON && state.status === 'initial'))
+                    state.uiEvent = action;
             },
         );
 });
diff --git a/suite-common/wallet-core/src/firmware/firmwareThunks.ts b/suite-common/wallet-core/src/firmware/firmwareThunks.ts
index 46377d18259..f1caaab164a 100644
--- a/suite-common/wallet-core/src/firmware/firmwareThunks.ts
+++ b/suite-common/wallet-core/src/firmware/firmwareThunks.ts
@@ -4,20 +4,24 @@ import {
     hasBitcoinOnlyFirmware,
     isBitcoinOnlyDevice,
 } from '@trezor/device-utils';
-import { isDesktop } from '@trezor/env-utils';
-import { resolveStaticPath } from '@suite-common/suite-utils';
 import { analytics, EventType } from '@trezor/suite-analytics';
-import TrezorConnect, { Device, FirmwareType } from '@trezor/connect';
+import TrezorConnect, { FirmwareType } from '@trezor/connect';
 import { createThunk } from '@suite-common/redux-utils';
+import { TrezorDevice } from '@suite-common/suite-types';
 
 import { selectFirmware } from './firmwareReducer';
 import { FIRMWARE_MODULE_PREFIX, firmwareActions } from './firmwareActions';
+import { getBinFilesBaseUrlThunk } from './getBinFilesBaseUrlThunk';
 
 const handleFwHashError = createThunk(
     `${FIRMWARE_MODULE_PREFIX}/handleFwHashError`,
-    (errorMessage: string, { dispatch }) => {
+    ({ device, errorMessage }: { device: TrezorDevice; errorMessage: string }, { dispatch }) => {
+        // device.id should always be present here (device is initialized and in normal mode) during successful TrezorConnect.getFirmwareHash call
+        if (device.id) {
+            dispatch(firmwareActions.setHashInvalid(device.id));
+        }
         dispatch(
-            firmwareActions.setError(
+            firmwareActions.setFirmwareUpdateError(
                 `${errorMessage}. Unable to validate firmware hash. If you want to check authenticity of newly installed firmware please proceed to device settings and reinstall firmware.`,
             ),
         );
@@ -30,18 +34,34 @@ const handleFwHashError = createThunk(
     },
 );
 
+export const INVALID_HASH_ERROR = 'Invalid hash';
+
 const handleFwHashMismatch = createThunk(
     `${FIRMWARE_MODULE_PREFIX}/handleFwHashMismatch`,
-    (device: Device, { dispatch }) => {
-        // device.id should always be present here (device is initialized and in normal mode) during successful TrezorConnect.getFirmwareHash call
-        dispatch(firmwareActions.setHashInvalid(device.id!));
-        dispatch(firmwareActions.setError('Invalid hash'));
+    (device: TrezorDevice, { dispatch }) => {
+        // see `handleFwHashError`
+        if (device.id) {
+            dispatch(firmwareActions.setHashInvalid(device.id));
+        }
+        dispatch(firmwareActions.setFirmwareUpdateError(INVALID_HASH_ERROR));
         analytics.report({
             type: EventType.FirmwareValidateHashMismatch,
         });
     },
 );
 
+const handleFwHashValid = createThunk(
+    `${FIRMWARE_MODULE_PREFIX}/handleFwHashValid`,
+    (device: TrezorDevice, { dispatch }) => {
+        // see `handleFwHashError`
+        if (device.id) {
+            dispatch(firmwareActions.clearInvalidHash(device.id));
+        }
+        dispatch(firmwareActions.setStatus('done'));
+        dispatch(firmwareActions.setFirmwareUpdateError(undefined));
+    },
+);
+
 export const firmwareUpdate = createThunk(
     `${FIRMWARE_MODULE_PREFIX}/firmwareUpdate`,
     async (
@@ -56,21 +76,21 @@ export const firmwareUpdate = createThunk(
         }
 
         const {
-            selectors: { selectDevice, selectDesktopBinDir, selectLanguage },
+            selectors: { selectDevice, selectLanguage },
         } = extra;
 
         const device = selectDevice(getState());
-        const desktopBinDir = selectDesktopBinDir(getState());
+        const binFilesBaseUrl = await dispatch(getBinFilesBaseUrlThunk()).unwrap();
         const suiteLanguage = selectLanguage(getState());
         const { useDevkit, cachedDevice, error } = selectFirmware(getState());
 
         if (error) {
-            dispatch(firmwareActions.setError(undefined));
+            dispatch(firmwareActions.setFirmwareUpdateError(undefined));
         }
 
         if (!device) {
             dispatch(firmwareActions.setStatus('error'));
-            dispatch(firmwareActions.setError('Device not connected'));
+            dispatch(firmwareActions.setFirmwareUpdateError('Device not connected'));
 
             return;
         }
@@ -81,10 +101,7 @@ export const firmwareUpdate = createThunk(
             dispatch(firmwareActions.cacheDevice(device));
         }
 
-        // FW binaries are stored in "*/static/connect/data/firmware/*/*.bin". see "connect-common" package
-        const baseUrl = `${isDesktop() ? desktopBinDir : resolveStaticPath('connect/data')}${
-            useDevkit ? '/devkit' : ''
-        }`;
+        const baseUrl = `${binFilesBaseUrl}${useDevkit ? '/devkit' : ''}`;
 
         // update to same variant as is currently installed or to the regular one if device does not have any fw (new/wiped device),
         // unless the user wants to switch firmware type
@@ -138,17 +155,22 @@ export const firmwareUpdate = createThunk(
 
         if (!firmwareUpdateResponse.success) {
             dispatch(firmwareActions.setStatus('error'));
-            dispatch(firmwareActions.setError(firmwareUpdateResponse.payload.error));
+            dispatch(firmwareActions.setFirmwareUpdateError(firmwareUpdateResponse.payload.error));
         } else {
             const { check } = firmwareUpdateResponse.payload;
             if (check === 'mismatch') {
-                handleFwHashMismatch(device);
+                // hash check was performed, and it does not match, so consider firmware counterfeit
+                dispatch(handleFwHashMismatch(device));
             } else if (check === 'other-error') {
-                // TrezorConnect error. Only 'softly' inform user that we were not able to
-                // validate firmware hash
-                handleFwHashError(firmwareUpdateResponse.payload.checkError);
+                // device failed to respond to the hash check, consider the firmware counterfeit
+                dispatch(
+                    handleFwHashError({
+                        device,
+                        errorMessage: firmwareUpdateResponse.payload.checkError,
+                    }),
+                );
             } else {
-                dispatch(firmwareActions.setStatus('done'));
+                dispatch(handleFwHashValid(device));
             }
         }
     },
diff --git a/suite-common/wallet-core/src/firmware/getBinFilesBaseUrlThunk.ts b/suite-common/wallet-core/src/firmware/getBinFilesBaseUrlThunk.ts
new file mode 100644
index 00000000000..6e5d898890b
--- /dev/null
+++ b/suite-common/wallet-core/src/firmware/getBinFilesBaseUrlThunk.ts
@@ -0,0 +1,16 @@
+import { isDesktop } from '@trezor/env-utils';
+import { resolveStaticPath } from '@suite-common/suite-utils';
+import { createThunk } from '@suite-common/redux-utils';
+
+import { FIRMWARE_MODULE_PREFIX } from './firmwareActions';
+
+/**
+ * Get URL for firmware binaries, which may be local (suite desktop) or remote (suite web)
+ */
+export const getBinFilesBaseUrlThunk = createThunk(
+    `${FIRMWARE_MODULE_PREFIX}/getBinFilesBaseUrlThunk`,
+    (_params, { getState, extra }) =>
+        isDesktop()
+            ? extra.selectors.selectDesktopBinDir(getState())
+            : resolveStaticPath('connect/data'),
+);
diff --git a/suite-common/wallet-core/src/firmware/manualFirmwareHashCheckThunk.ts b/suite-common/wallet-core/src/firmware/manualFirmwareHashCheckThunk.ts
deleted file mode 100644
index 7d64b422401..00000000000
--- a/suite-common/wallet-core/src/firmware/manualFirmwareHashCheckThunk.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { createThunk } from '@suite-common/redux-utils';
-import { notificationsActions } from '@suite-common/toast-notifications';
-
-import { FIRMWARE_MODULE_PREFIX } from './firmwareActions';
-import { validateFirmwareHashThunk } from './checkFirmwareHashThunk';
-
-export const manualFirmwareHashCheckThunk = createThunk<
-    void,
-    void,
-    { rejectValue: { error: string } }
->(
-    `${FIRMWARE_MODULE_PREFIX}/checkFirmwareAuthenticity`,
-    async (_, { dispatch, getState, extra, rejectWithValue }) => {
-        const {
-            selectors: { selectDevice },
-        } = extra;
-
-        const device = selectDevice(getState());
-        if (!device) {
-            return rejectWithValue({ error: 'device is not connected' });
-        }
-
-        const result = await dispatch(validateFirmwareHashThunk({ device }));
-
-        if (result.payload === undefined || result.payload.success === 'unable-to-verify') {
-            dispatch(
-                notificationsActions.addToast({
-                    type: 'error',
-                    error: `Unable to validate firmware: ${result.payload !== undefined ? result.payload.error : ''}`,
-                }),
-            );
-        } else if (result.payload.success === 'invalid') {
-            dispatch(
-                notificationsActions.addToast({
-                    type: 'error',
-                    error: 'Firmware is not authentic!!!',
-                }),
-            );
-        } else {
-            dispatch(
-                notificationsActions.addToast({ type: 'firmware-check-authenticity-success' }),
-            );
-        }
-    },
-);
diff --git a/suite-common/wallet-core/src/index.ts b/suite-common/wallet-core/src/index.ts
index aef67593869..9099eab44e5 100644
--- a/suite-common/wallet-core/src/index.ts
+++ b/suite-common/wallet-core/src/index.ts
@@ -22,7 +22,7 @@ export * from './fees/feesReducer';
 export * from './firmware/firmwareActions';
 export * from './firmware/firmwareThunks';
 export * from './firmware/firmwareReducer';
-export * from './firmware/manualFirmwareHashCheckThunk';
+export * from './firmware/getBinFilesBaseUrlThunk';
 export * from './send/sendFormActions';
 export * from './send/sendFormReducer';
 export * from './send/sendFormThunks';
@@ -37,3 +37,4 @@ export * from './stake/stakeSelectors';
 export * from './stake/stakeMiddleware';
 export * from './stake/stakeThunks';
 export * from './stake/stakeTypes';
+export * from './stake/stakeConstants';
diff --git a/suite-common/wallet-core/src/send/sendFormActions.ts b/suite-common/wallet-core/src/send/sendFormActions.ts
index d465f0b364b..b98274f7dfd 100644
--- a/suite-common/wallet-core/src/send/sendFormActions.ts
+++ b/suite-common/wallet-core/src/send/sendFormActions.ts
@@ -4,6 +4,7 @@ import {
     FormState,
     AccountKey,
     GeneralPrecomposedTransactionFinal,
+    TokenAddress,
 } from '@suite-common/wallet-types';
 import { BlockbookTransaction } from '@trezor/blockchain-link-types';
 
@@ -12,7 +13,7 @@ import { SerializedTx } from './sendFormTypes';
 
 const storeDraft = createAction(
     `${SEND_MODULE_PREFIX}/store-draft`,
-    (payload: { accountKey: AccountKey; formState: FormState }) => ({
+    (payload: { accountKey: AccountKey; formState: FormState; tokenContract?: TokenAddress }) => ({
         payload,
     }),
 );
diff --git a/suite-common/wallet-core/src/send/sendFormBitcoinThunks.ts b/suite-common/wallet-core/src/send/sendFormBitcoinThunks.ts
index d863fd90c2f..1af997d862f 100644
--- a/suite-common/wallet-core/src/send/sendFormBitcoinThunks.ts
+++ b/suite-common/wallet-core/src/send/sendFormBitcoinThunks.ts
@@ -4,6 +4,7 @@ import TrezorConnect, {
     Params,
     SignTransaction,
     SignedTransaction,
+    DEFAULT_SORTING_STRATEGY,
 } from '@trezor/connect';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import {
@@ -123,7 +124,7 @@ export const composeBitcoinTransactionFeeLevelsThunk = createThunk<
             baseFee: formState.baseFee,
             sequence,
             outputs: composeOutputs,
-            skipPermutation: !!formState.rbfParams,
+            sortingStrategy: formState.rbfParams !== undefined ? 'none' : DEFAULT_SORTING_STRATEGY,
             coin: account.symbol,
         };
 
@@ -285,7 +286,7 @@ export const signBitcoinSendFormTransactionThunk = createThunk<
             }
 
             // override inputs and outputs of precomposed transaction
-            // NOTE: RBF inputs/outputs required are to be in the same exact order as in original tx (covered by TrezorConnect.composeTransaction.skipPermutation param)
+            // NOTE: RBF inputs/outputs required are to be in the same exact order as in original tx (covered by TrezorConnect.composeTransaction.sortStrategy='none param)
             // possible variations:
             // it's possible to add new utxo not related to the original tx at the end of the list
             // it's possible to add change-output if it not exists in original tx AND new utxo was added/used
diff --git a/suite-common/wallet-core/src/send/sendFormEthereumThunks.ts b/suite-common/wallet-core/src/send/sendFormEthereumThunks.ts
index e64eaa668b2..96e79fa988b 100644
--- a/suite-common/wallet-core/src/send/sendFormEthereumThunks.ts
+++ b/suite-common/wallet-core/src/send/sendFormEthereumThunks.ts
@@ -10,21 +10,26 @@ import {
     getEthereumEstimateFeeParams,
     prepareEthereumTransaction,
     getExternalComposeOutput,
-    amountToSatoshi,
+    amountToSmallestUnit,
     formatAmount,
     isPending,
     getAccountIdentity,
+    getTxStakeNameByDataHex,
+    getUnstakeAmountByEthereumDataHex,
 } from '@suite-common/wallet-utils';
 import { createThunk } from '@suite-common/redux-utils';
-import { ERC20_BACKUP_GAS_LIMIT, ETH_BACKUP_GAS_LIMIT } from '@suite-common/wallet-constants';
+import {
+    ERC20_BACKUP_GAS_LIMIT,
+    ETH_BACKUP_GAS_LIMIT,
+    STAKE_GAS_LIMIT_RESERVE,
+} from '@suite-common/wallet-constants';
 import {
     PrecomposedLevels,
     PrecomposedTransaction,
     ExternalOutput,
+    AddressDisplayOptions,
 } from '@suite-common/wallet-types';
-import { AddressDisplayOptions } from '@suite-common/wallet-types';
 import { getNetwork } from '@suite-common/wallet-config';
-import { getTxStakeNameByDataHex } from '@suite-common/suite-utils';
 
 import { selectTransactions } from '../transactions/transactionsReducer';
 import {
@@ -34,7 +39,6 @@ import {
     SignTransactionError,
 } from './sendFormTypes';
 import { SEND_MODULE_PREFIX } from './sendFormConstants';
-import { STAKE_GAS_LIMIT_RESERVE } from '../stake/stakeTypes';
 
 const calculate = (
     availableBalance: string,
@@ -50,7 +54,7 @@ const calculate = (
     let amount: string;
     let max: string | undefined;
     const availableTokenBalance = token
-        ? amountToSatoshi(token.balance!, token.decimals)
+        ? amountToSmallestUnit(token.balance!, token.decimals)
         : undefined;
     if (output.type === 'send-max' || output.type === 'send-max-noaddress') {
         max = availableTokenBalance || calculateMax(availableBalance, feeInSatoshi);
@@ -121,7 +125,16 @@ export const composeEthereumTransactionFeeLevelsThunk = createThunk<
     `${SEND_MODULE_PREFIX}/composeEthereumTransactionFeeLevelsThunk`,
     async ({ formState, composeContext }, { dispatch, rejectWithValue }) => {
         const { account, network, feeInfo } = composeContext;
-        const composedOutput = getExternalComposeOutput(formState, account, network);
+        const { ethereumDataHex } = formState;
+        const unstakeAmount = getUnstakeAmountByEthereumDataHex(ethereumDataHex);
+
+        const composedOutput = getExternalComposeOutput(
+            formState,
+            account,
+            network,
+            unstakeAmount || undefined,
+        );
+
         if (!composedOutput)
             return rejectWithValue({
                 error: 'fee-levels-compose-failed',
diff --git a/suite-common/wallet-core/src/send/sendFormReducer.ts b/suite-common/wallet-core/src/send/sendFormReducer.ts
index 87bbee46053..52385050b20 100644
--- a/suite-common/wallet-core/src/send/sendFormReducer.ts
+++ b/suite-common/wallet-core/src/send/sendFormReducer.ts
@@ -5,12 +5,15 @@ import {
     FormState,
     GeneralPrecomposedTransactionFinal,
     Output,
+    SendFormDraftKey,
+    TokenAddress,
 } from '@suite-common/wallet-types';
 import { cloneObject } from '@trezor/utils';
 import { createReducerWithExtraDeps } from '@suite-common/redux-utils';
 import { BlockbookTransaction } from '@trezor/blockchain-link-types';
 import { NetworkSymbol, networks } from '@suite-common/wallet-config';
 import { DeviceModelInternal } from '@trezor/connect';
+import { getSendFormDraftKey } from '@suite-common/wallet-utils';
 
 import { sendFormActions } from './sendFormActions';
 import { accountsActions } from '../accounts/accountsActions';
@@ -23,7 +26,7 @@ import { SerializedTx } from './sendFormTypes';
 
 export type SendState = {
     drafts: {
-        [key: AccountKey]: FormState;
+        [key: SendFormDraftKey]: FormState;
     };
     sendRaw?: boolean;
     precomposedTx?: GeneralPrecomposedTransactionFinal;
@@ -46,13 +49,18 @@ export type SendRootState = {
 
 export const prepareSendFormReducer = createReducerWithExtraDeps(initialState, (builder, extra) => {
     builder
-        .addCase(sendFormActions.storeDraft, (state, { payload: { accountKey, formState } }) => {
-            // Deep-cloning to prevent buggy interaction between react-hook-form and immer, see https://github.com/orgs/react-hook-form/discussions/3715#discussioncomment-2151458
-            // Otherwise, whenever the outputs fieldArray is updated after the form draft or precomposedForm is saved, there is na error:
-            // TypeError: Cannot assign to read only property of object '#<Object>'
-            // This might not be necessary in the future when the dependencies are upgraded.
-            state.drafts[accountKey] = cloneObject(formState);
-        })
+        .addCase(
+            sendFormActions.storeDraft,
+            (state, { payload: { accountKey, tokenContract, formState } }) => {
+                const draftKey = getSendFormDraftKey(accountKey, tokenContract);
+
+                // Deep-cloning to prevent buggy interaction between react-hook-form and immer, see https://github.com/orgs/react-hook-form/discussions/3715#discussioncomment-2151458
+                // Otherwise, whenever the outputs fieldArray is updated after the form draft or precomposedForm is saved, there is na error:
+                // TypeError: Cannot assign to read only property of object '#<Object>'
+                // This might not be necessary in the future when the dependencies are upgraded.
+                state.drafts[draftKey] = cloneObject(formState);
+            },
+        )
         .addCase(sendFormActions.removeDraft, (state, { payload: { accountKey } }) => {
             delete state.drafts[accountKey];
         })
@@ -96,22 +104,24 @@ export const selectSendSerializedTx = (state: SendRootState) => state.wallet.sen
 export const selectSendSignedTx = (state: SendRootState) => state.wallet.send.signedTx;
 export const selectSendFormDrafts = (state: SendRootState) => state.wallet.send.drafts;
 
-export const selectSendFormDraftByAccountKey = (
+export const selectSendFormDraftByKey = (
     state: SendRootState,
     accountKey?: AccountKey,
+    tokenContract?: TokenAddress,
 ): FormState | null => {
     if (G.isUndefined(accountKey)) return null;
 
-    return state.wallet.send.drafts[accountKey] ?? null;
+    return state.wallet.send.drafts[getSendFormDraftKey(accountKey, tokenContract)] ?? null;
 };
 
 export const selectSendFormDraftOutputsByAccountKey = (
     state: SendRootState,
     accountKey?: AccountKey,
+    tokenContract?: TokenAddress,
 ): Output[] | null => {
     if (G.isUndefined(accountKey)) return null;
 
-    const draft = selectSendFormDraftByAccountKey(state, accountKey);
+    const draft = selectSendFormDraftByKey(state, accountKey, tokenContract);
 
     return draft?.outputs ?? null;
 };
diff --git a/suite-common/wallet-core/src/send/sendFormRippleThunks.ts b/suite-common/wallet-core/src/send/sendFormRippleThunks.ts
index 4be4d464126..30fd1fc02d8 100644
--- a/suite-common/wallet-core/src/send/sendFormRippleThunks.ts
+++ b/suite-common/wallet-core/src/send/sendFormRippleThunks.ts
@@ -4,7 +4,7 @@ import {
     calculateTotal,
     calculateMax,
     getExternalComposeOutput,
-    networkAmountToSatoshi,
+    networkAmountToSmallestUnit,
     formatNetworkAmount,
 } from '@suite-common/wallet-utils';
 import { XRP_FLAG } from '@suite-common/wallet-constants';
@@ -12,9 +12,9 @@ import {
     PrecomposedLevels,
     PrecomposedTransaction,
     ExternalOutput,
+    AddressDisplayOptions,
 } from '@suite-common/wallet-types';
 import { createThunk } from '@suite-common/redux-utils';
-import { AddressDisplayOptions } from '@suite-common/wallet-types';
 
 import {
     ComposeTransactionThunkArguments,
@@ -213,7 +213,10 @@ export const signRippleSendFormTransactionThunk = createThunk<
 
         const payment: RipplePayment = {
             destination: formState.outputs[0].address,
-            amount: networkAmountToSatoshi(formState.outputs[0].amount, selectedAccount.symbol),
+            amount: networkAmountToSmallestUnit(
+                formState.outputs[0].amount,
+                selectedAccount.symbol,
+            ),
         };
 
         if (formState.rippleDestinationTag) {
diff --git a/suite-common/wallet-core/src/send/sendFormSolanaThunks.ts b/suite-common/wallet-core/src/send/sendFormSolanaThunks.ts
index 8d04f641642..ed186754de8 100644
--- a/suite-common/wallet-core/src/send/sendFormSolanaThunks.ts
+++ b/suite-common/wallet-core/src/send/sendFormSolanaThunks.ts
@@ -10,13 +10,11 @@ import {
 } from '@suite-common/wallet-types';
 import { createThunk } from '@suite-common/redux-utils';
 import {
-    amountToSatoshi,
+    amountToSmallestUnit,
     calculateMax,
     calculateTotal,
     formatAmount,
     getExternalComposeOutput,
-} from '@suite-common/wallet-utils';
-import {
     getPubKeyFromAddress,
     buildTransferTransaction,
     buildTokenTransferTransaction,
@@ -47,7 +45,7 @@ const calculate = (
     let amount: string;
     let max: string | undefined;
     const availableTokenBalance = token
-        ? amountToSatoshi(token.balance!, token.decimals)
+        ? amountToSmallestUnit(token.balance!, token.decimals)
         : undefined;
     if (output.type === 'send-max' || output.type === 'send-max-noaddress') {
         max = availableTokenBalance || calculateMax(availableBalance, feeInLamports);
diff --git a/suite-common/wallet-core/src/send/sendFormThunks.ts b/suite-common/wallet-core/src/send/sendFormThunks.ts
index 0922ecb0ad9..2c5ed33cfc2 100644
--- a/suite-common/wallet-core/src/send/sendFormThunks.ts
+++ b/suite-common/wallet-core/src/send/sendFormThunks.ts
@@ -19,7 +19,7 @@ import { notificationsActions } from '@suite-common/toast-notifications';
 import { getNetwork, NetworkSymbol } from '@suite-common/wallet-config';
 import {
     hasNetworkFeatures,
-    amountToSatoshi,
+    amountToSmallestUnit,
     formatAmount,
     getAccountDecimals,
     getAreSatoshisUsed,
@@ -108,7 +108,7 @@ export const convertSendFormDraftsBtcAmountUnitsThunk = createThunk(
             const areSatsSupported = hasNetworkFeatures(relatedAccount, 'amount-unit');
 
             const amountFormatter =
-                areSatsAmountUnit && areSatsSupported ? amountToSatoshi : formatAmount;
+                areSatsAmountUnit && areSatsSupported ? amountToSmallestUnit : formatAmount;
 
             const updatedDraft = cloneObject(draft);
             const amountDecimals = getAccountDecimals(relatedAccount.symbol)!;
@@ -260,12 +260,12 @@ const synchronizeSentTransactionThunk = createThunk(
 
 export const pushSendFormTransactionThunk = createThunk<
     Success<{ txid: string }>,
-    { selectedAccount: Account },
+    { selectedAccount: Account; shouldDiscardTransaction?: boolean },
     { rejectValue: PushTransactionError }
 >(
     `${SEND_MODULE_PREFIX}/pushSendFormTransactionThunk`,
     async (
-        { selectedAccount },
+        { selectedAccount, shouldDiscardTransaction = true },
         { dispatch, getState, extra, rejectWithValue, fulfillWithValue },
     ) => {
         const {
@@ -338,7 +338,7 @@ export const pushSendFormTransactionThunk = createThunk<
         }
 
         // cleanup send form state and close review modal
-        dispatch(cancelSignSendFormTransactionThunk());
+        if (shouldDiscardTransaction) dispatch(cancelSignSendFormTransactionThunk());
 
         return pushTxResponse.success
             ? fulfillWithValue(pushTxResponse)
diff --git a/suite-common/wallet-core/src/send/sendFormTypes.ts b/suite-common/wallet-core/src/send/sendFormTypes.ts
index e979c8a7347..35a20218bc1 100644
--- a/suite-common/wallet-core/src/send/sendFormTypes.ts
+++ b/suite-common/wallet-core/src/send/sendFormTypes.ts
@@ -6,10 +6,9 @@ import {
     ExcludedUtxos,
     FormState,
 } from '@suite-common/wallet-types';
-import { TokenInfo, Unsuccessful } from '@trezor/connect';
+import { TokenInfo, Unsuccessful, ERRORS as CONNECT_ERRORS } from '@trezor/connect';
 import { Network, NetworkSymbol } from '@suite-common/wallet-config';
 import { TrezorDevice } from '@suite-common/suite-types';
-import { ERRORS as CONNECT_ERRORS } from '@trezor/connect';
 
 export type SerializedTx = { tx: string; coin: NetworkSymbol };
 
diff --git a/suite-common/wallet-core/src/stake/stakeConstants.ts b/suite-common/wallet-core/src/stake/stakeConstants.ts
new file mode 100644
index 00000000000..8b48dfe1b05
--- /dev/null
+++ b/suite-common/wallet-core/src/stake/stakeConstants.ts
@@ -0,0 +1,6 @@
+import { SupportedNetworkSymbol } from '@suite-common/wallet-types';
+
+export const EVERSTAKE_ENDPOINT_PREFIX: Record<SupportedNetworkSymbol, string> = {
+    eth: 'https://eth-api-b2c.everstake.one/api/v1',
+    thol: 'https://eth-api-b2c-stage.everstake.one/api/v1',
+};
diff --git a/suite-common/wallet-core/src/stake/stakeSelectors.ts b/suite-common/wallet-core/src/stake/stakeSelectors.ts
index 22cdc7fc269..e76443f203a 100644
--- a/suite-common/wallet-core/src/stake/stakeSelectors.ts
+++ b/suite-common/wallet-core/src/stake/stakeSelectors.ts
@@ -1,6 +1,6 @@
 import { NetworkSymbol } from '@suite-common/wallet-config';
+import { BACKUP_ETH_APY } from '@suite-common/wallet-constants';
 
-import { BACKUP_ETH_APY } from './stakeTypes';
 import { StakeRootState } from './stakeReducer';
 
 export const selectEverstakeData = (
diff --git a/suite-common/wallet-core/src/stake/stakeThunks.ts b/suite-common/wallet-core/src/stake/stakeThunks.ts
index 7b3837ec1fe..8ff31070dfb 100644
--- a/suite-common/wallet-core/src/stake/stakeThunks.ts
+++ b/suite-common/wallet-core/src/stake/stakeThunks.ts
@@ -1,16 +1,12 @@
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 import { createThunk } from '@suite-common/redux-utils';
 import { Timeout } from '@trezor/type-utils';
+import { getStakingSymbols } from '@suite-common/wallet-utils';
+import { SupportedNetworkSymbol } from '@suite-common/wallet-types';
 
 import { selectEverstakeData } from './stakeSelectors';
-import {
-    EVERSTAKE_ENDPOINT_PREFIX,
-    EVERSTAKE_ENDPOINT_TYPES,
-    EverstakeEndpointType,
-    SupportedNetworkSymbol,
-    ValidatorsQueue,
-    getStakingSymbols,
-} from './stakeTypes';
+import { EVERSTAKE_ENDPOINT_TYPES, EverstakeEndpointType, ValidatorsQueue } from './stakeTypes';
+import { EVERSTAKE_ENDPOINT_PREFIX } from './stakeConstants';
 
 const STAKE_MODULE = '@common/wallet-core/stake';
 
diff --git a/suite-common/wallet-core/src/stake/stakeTypes.ts b/suite-common/wallet-core/src/stake/stakeTypes.ts
index e6b4eb9f421..a620ebb01f8 100644
--- a/suite-common/wallet-core/src/stake/stakeTypes.ts
+++ b/suite-common/wallet-core/src/stake/stakeTypes.ts
@@ -1,6 +1,6 @@
 import { UseFormReturn, FormState as ReactHookFormState } from 'react-hook-form';
 
-import { Network, NetworkSymbol, getNetworkFeatures } from '@suite-common/wallet-config';
+import { Network } from '@suite-common/wallet-config';
 import {
     Account,
     Rate,
@@ -11,42 +11,6 @@ import {
 import { FiatCurrencyCode } from '@suite-common/suite-config';
 import { FeeLevel } from '@trezor/connect';
 
-// Used when Everstake pool stats are not available from the API.
-export const BACKUP_ETH_APY = 4.13;
-
-// Slack discussion https://satoshilabs.slack.com/archives/C0543DJBK0C/p1719409880504649?thread_ts=1719403259.875369&cid=C0543DJBK0C
-// increasing gas limit as tx can consume more than it was estimated due to edge cases
-// stake/unstake method usually consumes 97k-425k but can take up to 1M
-// claim method 97k-300k
-export const STAKE_GAS_LIMIT_RESERVE = 220_000;
-
-export const supportedNetworkSymbols = ['eth', 'thol'] as const;
-
-export type SupportedNetworkSymbol = (typeof supportedNetworkSymbols)[number];
-
-export function isSupportedEthStakingNetworkSymbol(
-    networkSymbols: NetworkSymbol,
-): networkSymbols is SupportedNetworkSymbol {
-    return (supportedNetworkSymbols as readonly string[]).includes(networkSymbols);
-}
-
-export const getStakingSymbols = (networkSymbols: NetworkSymbol[]) =>
-    networkSymbols.reduce((acc, networkSymbol) => {
-        if (
-            isSupportedEthStakingNetworkSymbol(networkSymbol) &&
-            getNetworkFeatures(networkSymbol).includes('staking')
-        ) {
-            acc.push(networkSymbol);
-        }
-
-        return acc;
-    }, [] as SupportedNetworkSymbol[]);
-
-export const EVERSTAKE_ENDPOINT_PREFIX: Record<SupportedNetworkSymbol, string> = {
-    eth: 'https://eth-api-b2c.everstake.one/api/v1',
-    thol: 'https://eth-api-b2c-stage.everstake.one/api/v1',
-};
-
 export enum EverstakeEndpointType {
     PoolStats = 'poolStats',
     ValidatorsQueue = 'validatorsQueue',
@@ -97,6 +61,7 @@ export type StakeContextValues = UseFormReturn<StakeFormState> &
         isDraft: boolean;
         amountLimits: AmountLimitsString;
         isAmountForWithdrawalWarningShown: boolean;
+        isLessAmountForWithdrawalWarningShown: boolean;
         isAdviceForWithdrawalWarningShown: boolean;
         isConfirmModalOpen: boolean;
         onCryptoAmountChange: (amount: string) => void;
diff --git a/suite-common/wallet-core/src/transactions/transactionsReducer.ts b/suite-common/wallet-core/src/transactions/transactionsReducer.ts
index facc5c2d248..83a4399aed9 100644
--- a/suite-common/wallet-core/src/transactions/transactionsReducer.ts
+++ b/suite-common/wallet-core/src/transactions/transactionsReducer.ts
@@ -1,18 +1,26 @@
-import { memoizeWithArgs } from 'proxy-memoize';
 import { isAnyOf } from '@reduxjs/toolkit';
 
+import {
+    createWeakMapSelector,
+    returnStableArrayIfEmpty,
+    createReducerWithExtraDeps,
+} from '@suite-common/redux-utils';
 import { Account, WalletAccountTransaction, AccountKey } from '@suite-common/wallet-types';
 import {
     findTransaction,
     getConfirmations,
     isPending,
-    getIsPhishingTransaction,
     getEverstakePool,
+    isClaimTx,
+    isStakeTx,
+    isStakeTypeTx,
+    isUnstakeTx,
 } from '@suite-common/wallet-utils';
-import { isClaimTx, isStakeTx, isStakeTypeTx, isUnstakeTx } from '@suite-common/suite-utils';
-import { createReducerWithExtraDeps } from '@suite-common/redux-utils';
+import {
+    getIsPhishingTransaction,
+    TokenDefinitionsRootState,
+} from '@suite-common/token-definitions';
 import { selectNetworkTokenDefinitions } from '@suite-common/token-definitions/src/tokenDefinitionsSelectors';
-import { TokenDefinitionsRootState } from '@suite-common/token-definitions';
 
 import { accountsActions } from '../accounts/accountsActions';
 import { transactionsActions } from './transactionsActions';
@@ -61,7 +69,7 @@ export type TransactionsRootState = {
             transactions: { [key: AccountKey]: (WalletAccountTransaction | null | undefined)[] };
         };
     };
-};
+} & AccountsRootState;
 
 const initializeAccount = (state: TransactionsState, accountKey: AccountKey) => {
     // initialize an empty array at 'accountKey' index if not yet initialized
@@ -215,8 +223,9 @@ export const prepareTransactionsReducer = createReducerWithExtraDeps(
     },
 );
 
-// Used to define selector cache size
-const EXPECTED_MAX_NUMBER_OF_ACCOUNTS = 50;
+const createMemoizedSelector = createWeakMapSelector.withTypes<
+    TransactionsRootState & AccountsRootState
+>();
 
 export const selectIsLoadingAccountTransactions = (
     state: TransactionsRootState,
@@ -226,6 +235,12 @@ export const selectIsLoadingAccountTransactions = (
 export const selectTransactions = (state: TransactionsRootState) =>
     state.wallet.transactions.transactions;
 
+export const selectAreAllTransactionsLoaded = (
+    state: TransactionsRootState,
+    accountKey: AccountKey | null,
+) => state.wallet.transactions.fetchStatusDetail?.[accountKey ?? '']?.areAllTransactionsLoaded;
+
+const EMPTY_STABLE_TRANSACTIONS: WalletAccountTransaction[] = [];
 /**
  * The list is not sorted here because it may contain null values as placeholders
  * for transactions that have not been fetched yet. (This affects pagination.)
@@ -234,106 +249,76 @@ export const selectTransactions = (state: TransactionsRootState) =>
 export const selectAccountTransactionsWithNulls = (
     state: TransactionsRootState,
     accountKey: AccountKey | null,
-) => state.wallet.transactions.transactions[accountKey ?? ''] ?? [];
-
-export const selectAccountTransactions = memoizeWithArgs(
-    (state: TransactionsRootState, accountKey: AccountKey | null): WalletAccountTransaction[] => {
-        const transactions = selectAccountTransactionsWithNulls(state, accountKey);
+) => state.wallet.transactions.transactions[accountKey ?? ''] ?? EMPTY_STABLE_TRANSACTIONS;
 
-        return transactions.filter(t => !!t);
-    },
-    { size: EXPECTED_MAX_NUMBER_OF_ACCOUNTS },
+export const selectAccountTransactions = createMemoizedSelector(
+    [selectAccountTransactionsWithNulls],
+    transactions => returnStableArrayIfEmpty(transactions.filter(t => !!t)),
 );
 
-export const selectPendingAccountAddresses = memoizeWithArgs(
-    (state: TransactionsRootState, accountKey: AccountKey | null) => {
-        const accountTransactions = selectAccountTransactions(state, accountKey);
+export const selectPendingAccountAddresses = createMemoizedSelector(
+    [selectAccountTransactions],
+    transactions => {
         const pendingAddresses: string[] = [];
-        const pendingTxs = accountTransactions.filter(isPending);
+        const pendingTxs = transactions.filter(isPending);
         pendingTxs.forEach(t =>
             t.targets.forEach(target =>
                 target.addresses?.forEach(a => pendingAddresses.unshift(a)),
             ),
         );
 
-        return pendingAddresses;
+        return returnStableArrayIfEmpty(pendingAddresses);
     },
-    { size: EXPECTED_MAX_NUMBER_OF_ACCOUNTS },
 );
 
-export const selectAllPendingTransactions = (state: TransactionsRootState) => {
-    const { transactions } = state.wallet.transactions;
-
-    return Object.keys(transactions).reduce(
-        (response, accountKey) => {
-            response[accountKey] = (transactions[accountKey] ?? []).filter(isPending);
-
-            return response;
-        },
-        {} as typeof transactions,
-    );
-};
-
-// Note: Account key is passed because there can be duplication of TXIDs if self transaction was sent.
-export const selectTransactionByTxidAndAccountKey = (
-    state: TransactionsRootState,
-    txid: string,
-    accountKey: AccountKey,
-) => {
-    const transactions = selectAccountTransactions(state, accountKey);
-
-    return transactions.find(tx => tx?.txid === txid) ?? null;
-};
-
-export const selectTransactionBlockTimeById = (
-    state: TransactionsRootState,
-    txid: string,
-    accountKey: AccountKey,
-) => {
-    const transaction = selectTransactionByTxidAndAccountKey(state, txid, accountKey);
-    if (transaction?.blockTime) {
-        return transaction.blockTime * 1000;
-    }
-
-    return null;
-};
+export const selectAllPendingTransactions = createMemoizedSelector(
+    [selectTransactions],
+    transactions =>
+        Object.keys(transactions).reduce(
+            (response, accountKey) => {
+                response[accountKey] = (transactions[accountKey] ?? []).filter(isPending);
+
+                return response;
+            },
+            {} as typeof transactions,
+        ),
+);
 
-export const selectTransactionTargets = (
-    state: TransactionsRootState,
-    txid: string,
-    accountKey: AccountKey,
-) => {
-    const transaction = selectTransactionByTxidAndAccountKey(state, txid, accountKey);
+export const selectTransactionByAccountKeyAndTxid = createMemoizedSelector(
+    [selectAccountTransactions, (_state, _accountKey: AccountKey | null, txid: string) => txid],
+    (transactions, txid) => {
+        const transaction = transactions.find(tx => tx?.txid === txid);
 
-    return transaction?.targets;
-};
+        return transaction ?? null;
+    },
+);
 
-export const selectTransactionFirstTargetAddress = (
-    state: TransactionsRootState,
-    txid: string,
-    accountKey: AccountKey,
-) => {
-    const transactionTargets = selectTransactionTargets(state, txid, accountKey);
+export const selectTransactionBlockTimeById = createMemoizedSelector(
+    [selectTransactionByAccountKeyAndTxid],
+    transaction => (transaction?.blockTime ? transaction.blockTime * 1000 : null),
+);
 
-    return transactionTargets?.[0]?.addresses?.[0];
-};
+export const selectTransactionTargets = createMemoizedSelector(
+    [selectTransactionByAccountKeyAndTxid],
+    transaction => transaction?.targets,
+);
 
-export const selectIsTransactionPending = (
-    state: TransactionsRootState,
-    txid: string,
-    accountKey: AccountKey,
-): boolean => {
-    const transaction = selectTransactionByTxidAndAccountKey(state, txid, accountKey);
+export const selectTransactionFirstTargetAddress = createMemoizedSelector(
+    [selectTransactionTargets],
+    targets => targets?.[0]?.addresses?.[0],
+);
 
-    return transaction ? isPending(transaction) : false;
-};
+export const selectIsTransactionPending = createMemoizedSelector(
+    [selectTransactionByAccountKeyAndTxid],
+    transaction => (transaction ? isPending(transaction) : false),
+);
 
 export const selectTransactionConfirmations = (
-    state: TransactionsRootState & BlockchainRootState,
+    state: TransactionsRootState & BlockchainRootState & AccountsRootState,
     txid: string,
     accountKey: AccountKey,
 ) => {
-    const transaction = selectTransactionByTxidAndAccountKey(state, txid, accountKey);
+    const transaction = selectTransactionByAccountKeyAndTxid(state, accountKey, txid);
     if (!transaction) return 0;
 
     const blockchainHeight = selectBlockchainHeightBySymbol(state, transaction.symbol);
@@ -342,11 +327,11 @@ export const selectTransactionConfirmations = (
 };
 
 export const selectIsPhishingTransaction = (
-    state: TokenDefinitionsRootState & TransactionsRootState,
+    state: TokenDefinitionsRootState & TransactionsRootState & AccountsRootState,
     txid: string,
     accountKey: AccountKey,
 ) => {
-    const transaction = selectTransactionByTxidAndAccountKey(state, txid, accountKey);
+    const transaction = selectTransactionByAccountKeyAndTxid(state, accountKey, txid);
 
     if (!transaction) return false;
 
@@ -357,103 +342,109 @@ export const selectIsPhishingTransaction = (
     return getIsPhishingTransaction(transaction, tokenDefinitions);
 };
 
-export const selectAccountStakeTypeTransactions = (
-    state: TransactionsRootState,
-    accountKey: AccountKey,
-) => {
-    const transactions = selectAccountTransactions(state, accountKey);
-
-    return transactions.filter(tx => isStakeTypeTx(tx?.ethereumSpecific?.parsedData?.methodId));
-};
-
-export const selectAccountStakeTransactions = (
-    state: TransactionsRootState,
-    accountKey: AccountKey,
-) => {
-    const transactions = selectAccountTransactions(state, accountKey);
-
-    return transactions.filter(tx => isStakeTx(tx?.ethereumSpecific?.parsedData?.methodId));
-};
+export const selectAccountStakeTypeTransactions = createMemoizedSelector(
+    [selectAccountTransactions],
+    transactions =>
+        returnStableArrayIfEmpty(
+            transactions.filter(tx => isStakeTypeTx(tx?.ethereumSpecific?.parsedData?.methodId)),
+        ),
+);
 
-export const selectAccountUnstakeTransactions = (
-    state: TransactionsRootState,
-    accountKey: AccountKey,
-) => {
-    const transactions = selectAccountTransactions(state, accountKey);
+export const selectAccountStakeTransactions = createMemoizedSelector(
+    [selectAccountTransactions],
+    transactions =>
+        returnStableArrayIfEmpty(
+            transactions.filter(tx => isStakeTx(tx?.ethereumSpecific?.parsedData?.methodId)),
+        ),
+);
 
-    return transactions.filter(tx => isUnstakeTx(tx?.ethereumSpecific?.parsedData?.methodId));
-};
+export const selectAccountUnstakeTransactions = createMemoizedSelector(
+    [selectAccountTransactions],
+    transactions =>
+        returnStableArrayIfEmpty(
+            transactions.filter(tx => isUnstakeTx(tx?.ethereumSpecific?.parsedData?.methodId)),
+        ),
+);
 
-export const selectAccountClaimTransactions = (
-    state: TransactionsRootState,
-    accountKey: AccountKey,
-) => {
-    const transactions = selectAccountTransactions(state, accountKey);
+export const selectAccountClaimTransactions = createMemoizedSelector(
+    [selectAccountTransactions],
+    transactions =>
+        returnStableArrayIfEmpty(
+            transactions.filter(tx => isClaimTx(tx?.ethereumSpecific?.parsedData?.methodId)),
+        ),
+);
 
-    return transactions.filter(tx => isClaimTx(tx?.ethereumSpecific?.parsedData?.methodId));
-};
+export const selectAccountHasStaked = createMemoizedSelector(
+    [selectAccountStakeTransactions, selectAccountByKey],
+    (stakeTxs, account) => {
+        if (!account) return false;
 
-export const selectAccountHasStaked = (state: TransactionsRootState, account: Account) => {
-    const stakeTxs = selectAccountStakeTransactions(state, account.key);
+        return stakeTxs.length > 0 || !!getEverstakePool(account);
+    },
+);
 
-    return stakeTxs.length > 0 || !!getEverstakePool(account);
-};
+export const selectAssetAccountsThatStaked = (
+    state: TransactionsRootState & AccountsRootState,
+    accounts: Account[],
+) => accounts.filter(account => selectAccountHasStaked(state, account.key));
 
 export const selectAccountTransactionsFetchStatus = (
     state: TransactionsRootState,
     accountKey: AccountKey,
 ) => state.wallet.transactions.fetchStatusDetail?.[accountKey];
 
-export const selectAreAllAccountTransactionsLoaded = (
-    state: TransactionsRootState & AccountsRootState,
-    accountKey: AccountKey,
-) => {
-    const areAllTransactionsLoaded =
-        !!state.wallet.transactions.fetchStatusDetail?.[accountKey]?.areAllTransactionsLoaded;
-    if (areAllTransactionsLoaded) return true;
-
-    const transactions = selectAccountTransactions(state, accountKey);
-    const accountTotalTransactions = selectAccountByKey(state, accountKey)?.history.total ?? 0;
-
-    return transactions.length >= accountTotalTransactions;
-};
-
-export const selectIsPageAlreadyFetched = (
-    state: TransactionsRootState,
-    accountKey: AccountKey,
-    page: number,
-    perPage: number,
-) => {
-    const transactions = selectAccountTransactionsWithNulls(state, accountKey); // get all transactions including "null" values because of pagination
-    const startIndex = (page - 1) * perPage;
-    const stopIndex = startIndex + perPage;
-    const txsForPage = transactions.slice(startIndex, stopIndex).filter(tx => !!tx?.txid); // filter out "empty" values
-
-    const isPageAlreadyFetched = txsForPage.length === perPage;
-
-    return isPageAlreadyFetched;
-};
-
-export const selectAreAllAccountTransactionsLoadedFromNowUntilTimestamp = (
-    state: TransactionsRootState & AccountsRootState,
-    accountKey: AccountKey,
-    timestamp: number,
-) => {
-    const areAllTransactionsLoaded = selectAreAllAccountTransactionsLoaded(state, accountKey);
-    if (areAllTransactionsLoaded) return true;
+export const selectAccountTotalTransactions = createMemoizedSelector(
+    [selectAccountByKey],
+    account => account?.history.total ?? 0,
+);
 
-    const transactions = selectAccountTransactions(state, accountKey);
-    const lastTransaction = transactions[transactions.length - 1];
+export const selectAreAllAccountTransactionsLoaded = createMemoizedSelector(
+    [
+        selectAccountTransactions,
+        selectAccountTotalTransactions,
+        selectAccountTransactionsFetchStatus,
+    ],
+    (transactions, accountTotalTransactions, fetchStatusDetail) => {
+        const areAllTransactionsLoaded = !!fetchStatusDetail?.areAllTransactionsLoaded;
+        if (areAllTransactionsLoaded) return true;
+
+        return transactions.length >= accountTotalTransactions;
+    },
+);
 
-    return lastTransaction?.blockTime && lastTransaction.blockTime < timestamp;
-};
+export const selectIsPageAlreadyFetched = createMemoizedSelector(
+    [
+        selectAccountTransactionsWithNulls,
+        (_state, _accountKey: AccountKey, page: number) => page,
+        (_state, _accountKey: AccountKey, _page: number, perPage: number) => perPage,
+    ],
+    (transactions, page, perPage) => {
+        const startIndex = (page - 1) * perPage;
+        const stopIndex = startIndex + perPage;
+        const txsForPage = transactions.slice(startIndex, stopIndex).filter(tx => !!tx?.txid);
+
+        return txsForPage.length === perPage;
+    },
+);
 
-export const selectAccountTransactionsFromNowUntilTimestamp = (
-    state: TransactionsRootState & AccountsRootState,
-    accountKey: AccountKey,
-    timestamp: number,
-) => {
-    const transactions = selectAccountTransactions(state, accountKey);
+export const selectAreAllAccountTransactionsLoadedFromNowUntilTimestamp = createMemoizedSelector(
+    [
+        selectAreAllAccountTransactionsLoaded,
+        selectAccountTransactions,
+        (_state, _accountKey: AccountKey, timestamp: number) => timestamp,
+    ],
+    (areAllTransactionsLoaded, transactions, timestamp) => {
+        if (areAllTransactionsLoaded) return true;
+        const lastTransaction = transactions[transactions.length - 1];
+
+        return lastTransaction?.blockTime && lastTransaction.blockTime < timestamp;
+    },
+);
 
-    return transactions.filter(tx => tx.blockTime && tx.blockTime >= timestamp);
-};
+export const selectAccountTransactionsFromNowUntilTimestamp = createMemoizedSelector(
+    [selectAccountTransactions, (_state, _accountKey: AccountKey, timestamp: number) => timestamp],
+    (transactions, timestamp) =>
+        returnStableArrayIfEmpty(
+            transactions.filter(tx => tx.blockTime && tx.blockTime >= timestamp),
+        ),
+);
diff --git a/suite-common/wallet-types/package.json b/suite-common/wallet-types/package.json
index 3fb58e813d7..2033e272e53 100644
--- a/suite-common/wallet-types/package.json
+++ b/suite-common/wallet-types/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-common/wallet-types/src/account.ts b/suite-common/wallet-types/src/account.ts
index f026955de7f..2a8b96fada8 100644
--- a/suite-common/wallet-types/src/account.ts
+++ b/suite-common/wallet-types/src/account.ts
@@ -1,4 +1,4 @@
-import { AccountType, BackendType, NetworkSymbol } from '@suite-common/wallet-config';
+import { AccountType, BackendType, Bip43Path, NetworkSymbol } from '@suite-common/wallet-config';
 import { AccountEntityKeys } from '@suite-common/metadata-types';
 import { AccountInfo, PROTO, StaticSessionId, TokenInfo } from '@trezor/connect';
 import {
@@ -83,7 +83,7 @@ export type Account = {
     deviceState: StaticSessionId;
     key: AccountKey;
     index: number;
-    path: string;
+    path: Bip43Path;
     unlockPath?: PROTO.UnlockPath; // parameter used to unlock SLIP-25/coinjoin keychain
     descriptor: string;
     descriptorChecksum?: string;
diff --git a/suite-common/wallet-types/src/discovery.ts b/suite-common/wallet-types/src/discovery.ts
index dfbdf97b685..3eb08a2d7cf 100644
--- a/suite-common/wallet-types/src/discovery.ts
+++ b/suite-common/wallet-types/src/discovery.ts
@@ -1,6 +1,6 @@
 import { ObjectValues } from '@trezor/type-utils';
 import { DiscoveryStatus } from '@suite-common/wallet-constants';
-import { AccountType, NetworkSymbol } from '@suite-common/wallet-config';
+import { AccountType, Bip43Path, NetworkSymbol } from '@suite-common/wallet-config';
 import { Deferred } from '@trezor/utils';
 import { StaticSessionId } from '@trezor/connect';
 
@@ -31,11 +31,11 @@ export interface Discovery {
     availableCardanoDerivations?: ('normal' | 'legacy' | 'ledger')[];
 }
 
-export type PartialDiscovery = { deviceState: string } & Partial<Discovery>;
+export type PartialDiscovery = { deviceState: StaticSessionId } & Partial<Discovery>;
 
 export type DiscoveryItem = {
     // @trezor/connect
-    path: string;
+    path: Bip43Path;
     unlockPath?: Account['unlockPath'];
     coin: Account['symbol'];
     identity?: string;
diff --git a/suite-common/wallet-types/src/ethereumStaking.ts b/suite-common/wallet-types/src/ethereumStaking.ts
new file mode 100644
index 00000000000..e3c3dd95309
--- /dev/null
+++ b/suite-common/wallet-types/src/ethereumStaking.ts
@@ -0,0 +1,5 @@
+export type StakeType = 'stake' | 'unstake' | 'claim';
+
+export const supportedNetworkSymbols = ['eth', 'thol'] as const;
+
+export type SupportedNetworkSymbol = (typeof supportedNetworkSymbols)[number];
diff --git a/suite-common/wallet-types/src/index.ts b/suite-common/wallet-types/src/index.ts
index 40c3d9bf93a..a9ba9c73350 100644
--- a/suite-common/wallet-types/src/index.ts
+++ b/suite-common/wallet-types/src/index.ts
@@ -8,5 +8,6 @@ export * from './sendForm';
 export * from './settings';
 export * from './selectedAccount';
 export * from './transaction';
-export * from './stake';
+export * from './ethereumStaking';
 export * from './stakeForm';
+export * from './send';
diff --git a/suite-common/wallet-types/src/send.ts b/suite-common/wallet-types/src/send.ts
new file mode 100644
index 00000000000..b810878521d
--- /dev/null
+++ b/suite-common/wallet-types/src/send.ts
@@ -0,0 +1,5 @@
+import { AccountKey, TokenAddress } from './account';
+
+export type SendFormDraftKey =
+    | AccountKey
+    | (`${AccountKey}-${TokenAddress}` & { __type: 'SendFormDraftKey' });
diff --git a/suite-common/wallet-types/src/stake.ts b/suite-common/wallet-types/src/stake.ts
deleted file mode 100644
index bf974e1af50..00000000000
--- a/suite-common/wallet-types/src/stake.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type StakeType = 'stake' | 'unstake' | 'claim';
diff --git a/suite-common/wallet-types/src/stakeForm.ts b/suite-common/wallet-types/src/stakeForm.ts
index 38bdaffde4d..b261927ba66 100644
--- a/suite-common/wallet-types/src/stakeForm.ts
+++ b/suite-common/wallet-types/src/stakeForm.ts
@@ -1,4 +1,4 @@
-import { StakeType } from './stake';
+import { StakeType } from './ethereumStaking';
 import { FormState } from './sendForm';
 
 export interface StakeFormState extends FormState {
diff --git a/suite-common/wallet-types/src/transaction.ts b/suite-common/wallet-types/src/transaction.ts
index 8314d702e85..df6e897ee32 100644
--- a/suite-common/wallet-types/src/transaction.ts
+++ b/suite-common/wallet-types/src/transaction.ts
@@ -139,9 +139,11 @@ export type PrecomposedTransactionCardano =
     | PrecomposedTransactionCardanoNonFinal
     | PrecomposedTransactionCardanoFinal;
 
-export type GeneralPrecomposedTransactionFinal =
-    | PrecomposedTransactionFinal
-    | PrecomposedTransactionCardanoFinal;
+export type GeneralPrecomposedTransaction = PrecomposedTransaction | PrecomposedTransactionCardano;
+export type GeneralPrecomposedTransactionFinal = Extract<
+    GeneralPrecomposedTransaction,
+    { type: 'final' }
+>;
 
 export type PrecomposedLevels = { [key: string]: PrecomposedTransaction };
 export type PrecomposedLevelsCardano = { [key: string]: PrecomposedTransactionCardano };
@@ -277,3 +279,9 @@ export type ReviewOutputState = 'active' | 'success' | undefined;
 export type ExcludedUtxos = Record<string, 'low-anonymity' | 'dust' | undefined>;
 
 export type FeeLevelLabel = FeeLevel['label'];
+
+export const isFinalPrecomposedTransaction = (
+    tx: GeneralPrecomposedTransaction,
+): tx is PrecomposedTransactionFinal => {
+    return tx.type === 'final';
+};
diff --git a/suite-common/wallet-utils/package.json b/suite-common/wallet-utils/package.json
index ce3922f1f3e..86899d8be30 100644
--- a/suite-common/wallet-utils/package.json
+++ b/suite-common/wallet-utils/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js",
@@ -15,18 +14,16 @@
     "dependencies": {
         "@mobily/ts-belt": "^3.13.1",
         "@solana/buffer-layout": "^4.0.1",
-        "@solana/web3.js": "^1.95.0",
+        "@solana/web3.js": "^1.95.4",
         "@suite-common/fiat-services": "workspace:*",
         "@suite-common/metadata-types": "workspace:*",
         "@suite-common/suite-config": "workspace:*",
         "@suite-common/suite-types": "workspace:*",
         "@suite-common/test-utils": "workspace:*",
-        "@suite-common/token-definitions": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
         "@suite-common/wallet-constants": "workspace:*",
         "@suite-common/wallet-types": "workspace:*",
         "@trezor/address-validator": "workspace:*",
-        "@trezor/blockchain-link": "workspace:*",
         "@trezor/blockchain-link-types": "workspace:*",
         "@trezor/blockchain-link-utils": "workspace:*",
         "@trezor/connect": "workspace:*",
@@ -35,7 +32,7 @@
         "@trezor/utils": "workspace:*",
         "date-fns": "^2.30.0",
         "react": "18.2.0",
-        "react-hook-form": "^7.53.0",
+        "react-hook-form": "^7.53.1",
         "web3-utils": "^4.3.1"
     }
 }
diff --git a/suite-common/wallet-utils/src/__fixtures__/accountUtils.ts b/suite-common/wallet-utils/src/__fixtures__/accountUtils.ts
index ed6c120fb04..124aad99c50 100644
--- a/suite-common/wallet-utils/src/__fixtures__/accountUtils.ts
+++ b/suite-common/wallet-utils/src/__fixtures__/accountUtils.ts
@@ -1,4 +1,5 @@
 import { testMocks } from '@suite-common/test-utils';
+import { Bip43Path, Bip43PathTemplate } from '@suite-common/wallet-config';
 
 import { ACCOUNTS } from './accounts';
 
@@ -61,6 +62,7 @@ export const accountTitleFixture = [
     { symbol: 'zec', title: 'TR_NETWORK_ZCASH' },
     { symbol: 'eth', title: 'TR_NETWORK_ETHEREUM' },
     { symbol: 'bnb', title: 'TR_NETWORK_BNB' },
+    { symbol: 'op', title: 'TR_NETWORK_OP' },
     { symbol: 'etc', title: 'TR_NETWORK_ETHEREUM_CLASSIC' },
     { symbol: 'xem', title: 'TR_NETWORK_NEM' },
     { symbol: 'xlm', title: 'TR_NETWORK_STELLAR' },
@@ -226,6 +228,32 @@ export const getBip43Type = [
     },
 ];
 
+type SubstituteBip43PathFixture = {
+    description: string;
+    pathTemplate: Bip43PathTemplate;
+    index?: number | string;
+    result: Bip43Path;
+};
+export const substituteBip43Path: SubstituteBip43PathFixture[] = [
+    {
+        description: 'numerical index',
+        pathTemplate: "m/84'/0'/i'",
+        index: 7,
+        result: "m/84'/0'/7'",
+    },
+    {
+        description: 'stringified index',
+        pathTemplate: "m/44'/0'/i'/0",
+        index: '14',
+        result: "m/44'/0'/14'/0",
+    },
+    {
+        description: 'default index',
+        pathTemplate: "m/10025'/1'/i'/1'",
+        result: "m/10025'/1'/0'/1'",
+    },
+];
+
 export const getUtxoFromSignedTransaction = [
     {
         description: 'regular tx, 1 new utxo',
diff --git a/suite-common/wallet-utils/src/__fixtures__/stakingUtils.ts b/suite-common/wallet-utils/src/__fixtures__/ethereumStakingUtils.ts
similarity index 88%
rename from suite-common/wallet-utils/src/__fixtures__/stakingUtils.ts
rename to suite-common/wallet-utils/src/__fixtures__/ethereumStakingUtils.ts
index e53e479adf5..227e2304a87 100644
--- a/suite-common/wallet-utils/src/__fixtures__/stakingUtils.ts
+++ b/suite-common/wallet-utils/src/__fixtures__/ethereumStakingUtils.ts
@@ -213,3 +213,26 @@ export const getAccountTotalStakingBalanceFixtures = [
         expectedBalance: '0',
     },
 ];
+
+export const getUnstakeAmountByEthereumDataHexFixtures = [
+    {
+        description: 'should correctly extract and convert the unstaking amount from ethereum data',
+        ethereumData: '76ec871c0000000000000000000000000000000000000000000000000000000000000001', // without 0x
+        expectedAmountWei: '1', // 0.000000000000000001 eth
+    },
+    {
+        description: 'should correctly remove 0x prefix from ethereum data',
+        ethereumData: '0x76ec871c0000000000000000000000000000000000000000000000000000000000000001', // with 0x
+        expectedAmountWei: '1', // 0.000000000000000001 eth
+    },
+    {
+        description: 'should return null when the transaction is not an unstake transaction',
+        ethereumData: '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef',
+        expectedAmountWei: null,
+    },
+    {
+        description: 'should return null for invalid or unsupported ethereum data',
+        ethereumData: '1234',
+        expectedAmountWei: null,
+    },
+];
diff --git a/suite-common/wallet-utils/src/__fixtures__/tokenUtils.ts b/suite-common/wallet-utils/src/__fixtures__/tokenUtils.ts
new file mode 100644
index 00000000000..8b85e8a8e45
--- /dev/null
+++ b/suite-common/wallet-utils/src/__fixtures__/tokenUtils.ts
@@ -0,0 +1,40 @@
+import { NetworkSymbol } from '@suite-common/wallet-config';
+
+export const getContractAddressForNetworkFixtures = [
+    {
+        testName: 'Converts to lowercase for non-sol networks',
+        networkSymbol: 'eth' as NetworkSymbol,
+        contractAddress: '0xABCD',
+        expected: '0xabcd',
+    },
+    {
+        testName: 'Preserves case for sol network',
+        networkSymbol: 'sol' as NetworkSymbol,
+        contractAddress: 'SolContractAddress',
+        expected: 'SolContractAddress',
+    },
+    {
+        testName: 'Converts to lowercase for eth network',
+        networkSymbol: 'eth' as NetworkSymbol,
+        contractAddress: '0XABCDE',
+        expected: '0xabcde',
+    },
+    {
+        testName: 'Handles empty contract address for non-sol network',
+        networkSymbol: 'btc' as NetworkSymbol,
+        contractAddress: '',
+        expected: '',
+    },
+    {
+        testName: 'Handles empty contract address for sol network',
+        networkSymbol: 'sol' as NetworkSymbol,
+        contractAddress: '',
+        expected: '',
+    },
+    {
+        testName: 'Returns policy id for cardano',
+        networkSymbol: 'ada' as NetworkSymbol,
+        contractAddress: 'f43a62fdc3965df486de8a0d32fe800963589c41b38946602a0dc53541474958',
+        expected: 'f43a62fdc3965df486de8a0d32fe800963589c41b38946602a0dc535',
+    },
+];
diff --git a/suite-common/wallet-utils/src/__tests__/accountUtils.test.ts b/suite-common/wallet-utils/src/__tests__/accountUtils.test.ts
index d0cf056f266..de932a572e1 100644
--- a/suite-common/wallet-utils/src/__tests__/accountUtils.test.ts
+++ b/suite-common/wallet-utils/src/__tests__/accountUtils.test.ts
@@ -8,6 +8,7 @@ import {
     getAccountIdentifier,
     getAccountKey,
     getBip43Type,
+    substituteBip43Path,
     getFiatValue,
     getFirstFreshAddress,
     getTitleForNetwork,
@@ -16,7 +17,7 @@ import {
     getNetworkAccountFeatures,
     hasNetworkFeatures,
     isTestnet,
-    networkAmountToSatoshi,
+    networkAmountToSmallestUnit,
     parseBIP44Path,
     sortByCoin,
     getUtxoOutpoint,
@@ -88,6 +89,14 @@ describe('account utils', () => {
         });
     });
 
+    describe(substituteBip43Path.name, () => {
+        fixtures.substituteBip43Path.forEach(f => {
+            it(f.description, () => {
+                expect(substituteBip43Path(f.pathTemplate, f.index)).toBe(f.result);
+            });
+        });
+    });
+
     it('get fiat value', () => {
         expect(getFiatValue('1', '10')).toEqual('10.00');
         expect(getFiatValue('1', '10', 5)).toEqual('10.00000');
@@ -105,10 +114,10 @@ describe('account utils', () => {
     });
 
     it('format amount to satoshi', () => {
-        expect(networkAmountToSatoshi('0.00000001', 'btc')).toEqual('1');
-        expect(networkAmountToSatoshi('0.000001', 'xrp')).toEqual('1');
-        expect(networkAmountToSatoshi('0.000000000000000001', 'eth')).toEqual('1');
-        expect(networkAmountToSatoshi('aaa', 'eth')).toEqual('-1');
+        expect(networkAmountToSmallestUnit('0.00000001', 'btc')).toEqual('1');
+        expect(networkAmountToSmallestUnit('0.000001', 'xrp')).toEqual('1');
+        expect(networkAmountToSmallestUnit('0.000000000000000001', 'eth')).toEqual('1');
+        expect(networkAmountToSmallestUnit('aaa', 'eth')).toEqual('-1');
     });
 
     it('findAccountDevice', () => {
@@ -213,6 +222,7 @@ describe('account utils', () => {
                 'zpub6rszzdAK6RuafeRwyN8z1cgWcXCuKbLmjjfnrW4fWKtcoXQ8787214pNJjnBG5UATyghuNzjn6Lfp5k5xymrLFJnCy46bMYJPyZsbpFGagT',
             ),
         ).toBe(true);
+        expect(accountSearchFn(btcAcc, '#1', undefined, 'Bitcoin #1')).toBe(true);
     });
 
     it('getNetworkAccountFeatures', () => {
diff --git a/suite-common/wallet-utils/src/__tests__/cardanoUtils.test.ts b/suite-common/wallet-utils/src/__tests__/cardanoUtils.test.ts
index b0247ec430d..7c2e4e03926 100644
--- a/suite-common/wallet-utils/src/__tests__/cardanoUtils.test.ts
+++ b/suite-common/wallet-utils/src/__tests__/cardanoUtils.test.ts
@@ -30,38 +30,40 @@ describe('cardano utils', () => {
         dateSpy.mockRestore();
     });
 
-    expect(getProtocolMagic('ada')).toEqual(CARDANO.PROTOCOL_MAGICS.mainnet);
-    expect(getProtocolMagic('tada')).toEqual(1097911063);
-
-    expect(getDerivationType('normal')).toEqual(1);
-    expect(getDerivationType('legacy')).toEqual(2);
-    expect(getDerivationType('ledger')).toEqual(0);
-    // TS does not allow this, but in runtime, the default case handles it
-    expect(getDerivationType(undefined as any)).toEqual(1);
-
-    expect(getNetworkId('ada')).toEqual(CARDANO.NETWORK_IDS.mainnet);
-    expect(getNetworkId('tada')).toEqual(CARDANO.NETWORK_IDS.testnet);
-
-    expect(getAddressType()).toEqual(PROTO.CardanoAddressType.BASE);
-    expect(getAddressType()).toEqual(PROTO.CardanoAddressType.BASE);
-
-    // @ts-expect-error
-    expect(getStakingPath({ index: 1, symbol: 'ada' })).toEqual(`m/1852'/1815'/1'/2/0`);
-
-    // @ts-expect-error
-    expect(getStakingPath({ index: 12, symbol: 'ada' })).toEqual(`m/1852'/1815'/12'/2/0`);
-    expect(getShortFingerprint('asset1dffrfk79uxwq2a8yaslcfedycgga55tuv5dezd')).toEqual(
-        'asset1dffr…55tuv5dezd',
-    );
-
-    // @ts-expect-error params are partial
-    expect(isCardanoTx({ networkType: 'cardano' }, {})).toBe(true);
-    // @ts-expect-error params are partial
-    expect(isCardanoTx({ networkType: 'bitcoin' }, {})).toBe(false);
-    // @ts-expect-error params are partial
-    expect(isCardanoExternalOutput({ address: 'addr1' }, {})).toBe(true);
-    // @ts-expect-error params are partial
-    expect(isCardanoExternalOutput({ addressParameters: {} }, {})).toBe(false);
+    it('basic test', () => {
+        expect(getProtocolMagic('ada')).toEqual(CARDANO.PROTOCOL_MAGICS.mainnet);
+        expect(getProtocolMagic('tada')).toEqual(1097911063);
+
+        expect(getDerivationType('normal')).toEqual(1);
+        expect(getDerivationType('legacy')).toEqual(2);
+        expect(getDerivationType('ledger')).toEqual(0);
+        // TS does not allow this, but in runtime, the default case handles it
+        expect(getDerivationType(undefined as any)).toEqual(1);
+
+        expect(getNetworkId('ada')).toEqual(CARDANO.NETWORK_IDS.mainnet);
+        expect(getNetworkId('tada')).toEqual(CARDANO.NETWORK_IDS.testnet);
+
+        expect(getAddressType()).toEqual(PROTO.CardanoAddressType.BASE);
+        expect(getAddressType()).toEqual(PROTO.CardanoAddressType.BASE);
+
+        // @ts-expect-error
+        expect(getStakingPath({ index: 1, symbol: 'ada' })).toEqual(`m/1852'/1815'/1'/2/0`);
+
+        // @ts-expect-error
+        expect(getStakingPath({ index: 12, symbol: 'ada' })).toEqual(`m/1852'/1815'/12'/2/0`);
+        expect(getShortFingerprint('asset1dffrfk79uxwq2a8yaslcfedycgga55tuv5dezd')).toEqual(
+            'asset1dffr…55tuv5dezd',
+        );
+
+        // @ts-expect-error params are partial
+        expect(isCardanoTx({ networkType: 'cardano' }, {})).toBe(true);
+        // @ts-expect-error params are partial
+        expect(isCardanoTx({ networkType: 'bitcoin' }, {})).toBe(false);
+        // @ts-expect-error params are partial
+        expect(isCardanoExternalOutput({ address: 'addr1' }, {})).toBe(true);
+        // @ts-expect-error params are partial
+        expect(isCardanoExternalOutput({ addressParameters: {} }, {})).toBe(false);
+    });
 
     fixtures.getChangeAddressParameters.forEach(f => {
         it(`getChangeAddressParameters: ${f.description}`, () => {
diff --git a/suite-common/wallet-utils/src/__tests__/stakingUtils.test.ts b/suite-common/wallet-utils/src/__tests__/ethereumStakingUtils.test.ts
similarity index 73%
rename from suite-common/wallet-utils/src/__tests__/stakingUtils.test.ts
rename to suite-common/wallet-utils/src/__tests__/ethereumStakingUtils.test.ts
index 63d5b8d9992..508a0697750 100644
--- a/suite-common/wallet-utils/src/__tests__/stakingUtils.test.ts
+++ b/suite-common/wallet-utils/src/__tests__/ethereumStakingUtils.test.ts
@@ -4,12 +4,14 @@ import {
     getAccountAutocompoundBalance,
     getAccountTotalStakingBalance,
     getAccountEverstakeStakingPool,
-} from '../stakingUtils';
+    getUnstakeAmountByEthereumDataHex,
+} from '../ethereumStakingUtils';
 import {
     getAccountAutocompoundBalanceFixtures,
     getAccountEverstakeStakingPoolFixtures,
     getAccountTotalStakingBalanceFixtures,
-} from '../__fixtures__/stakingUtils';
+    getUnstakeAmountByEthereumDataHexFixtures,
+} from '../__fixtures__/ethereumStakingUtils';
 
 describe('getAccountEverstakeStakingPool', () => {
     getAccountEverstakeStakingPoolFixtures.forEach(({ description, account, expected }) => {
@@ -37,3 +39,12 @@ describe('getAccountTotalStakingBalance', () => {
         });
     });
 });
+
+describe('getUnstakeAmountByEthereumDataHex', () => {
+    getUnstakeAmountByEthereumDataHexFixtures.forEach(f => {
+        it(f.description, () => {
+            const result = getUnstakeAmountByEthereumDataHex(f.ethereumData);
+            expect(result).toBe(f.expectedAmountWei);
+        });
+    });
+});
diff --git a/suite-common/wallet-utils/src/__tests__/filterReceiveAccounts.test.ts b/suite-common/wallet-utils/src/__tests__/filterReceiveAccounts.test.ts
index a2cdac305b7..0abe4d226fd 100644
--- a/suite-common/wallet-utils/src/__tests__/filterReceiveAccounts.test.ts
+++ b/suite-common/wallet-utils/src/__tests__/filterReceiveAccounts.test.ts
@@ -58,7 +58,7 @@ const runFilterReceiveAccouns = ({
 
     return filterReceiveAccounts({
         accounts,
-        deviceState: device.state,
+        deviceState: device.state?.staticSessionId,
         receiveNetwork,
         isDebug,
         receiveNetworks,
diff --git a/suite-common/wallet-utils/src/__tests__/localizeNumber.test.ts b/suite-common/wallet-utils/src/__tests__/localizeNumber.test.ts
index 678a50b41a1..4c0358f3e00 100644
--- a/suite-common/wallet-utils/src/__tests__/localizeNumber.test.ts
+++ b/suite-common/wallet-utils/src/__tests__/localizeNumber.test.ts
@@ -32,7 +32,7 @@ describe('localizeNumber', () => {
 
         expect(localizeNumber(123456789.111, 'en', 2, 2)).toStrictEqual('123,456,789.11');
 
-        expect(() => localizeNumber(123456789, 'en', 3, 2)).toThrowError();
+        expect(() => localizeNumber(123456789, 'en', 3, 2)).toThrow();
     });
 
     it('formats negative numbers', () => {
diff --git a/suite-common/wallet-utils/src/__tests__/sendFormUtils.test.ts b/suite-common/wallet-utils/src/__tests__/sendFormUtils.test.ts
index 4a349bb328b..9950a92ee18 100644
--- a/suite-common/wallet-utils/src/__tests__/sendFormUtils.test.ts
+++ b/suite-common/wallet-utils/src/__tests__/sendFormUtils.test.ts
@@ -330,6 +330,19 @@ describe('sendForm utils', () => {
             output: { type: 'payment-noaddress', amount: '1000000' },
             tokenInfo: undefined,
         });
+
+        expect(
+            getExternalComposeOutput(
+                { outputs: [{ ...OUTPUT, address: 'A', amount: '0', token: 'A' }] },
+                EthAccount,
+                EthNetwork,
+                '1', // already formatted
+            ),
+        ).toEqual({
+            decimals: 2,
+            output: { type: 'payment', address: 'A', amount: '1' },
+            tokenInfo: EthAccount.tokens![0],
+        });
     });
 
     it('calculateEthFee', () => {
diff --git a/suite-common/wallet-utils/src/__tests__/tokenUtils.test.ts b/suite-common/wallet-utils/src/__tests__/tokenUtils.test.ts
new file mode 100644
index 00000000000..4ee11ce96ba
--- /dev/null
+++ b/suite-common/wallet-utils/src/__tests__/tokenUtils.test.ts
@@ -0,0 +1,13 @@
+import { getContractAddressForNetworkFixtures } from '../__fixtures__/tokenUtils';
+import { getContractAddressForNetwork } from '../tokenUtils';
+
+describe('getContractAddressForNetwork', () => {
+    getContractAddressForNetworkFixtures.forEach(
+        ({ testName, networkSymbol, contractAddress, expected }) => {
+            test(testName, () => {
+                const result = getContractAddressForNetwork(networkSymbol, contractAddress);
+                expect(result).toBe(expected);
+            });
+        },
+    );
+});
diff --git a/suite-common/wallet-utils/src/accountUtils.ts b/suite-common/wallet-utils/src/accountUtils.ts
index ed4857c5c8e..64e58943e96 100644
--- a/suite-common/wallet-utils/src/accountUtils.ts
+++ b/suite-common/wallet-utils/src/accountUtils.ts
@@ -8,6 +8,8 @@ import {
     PrecomposedTransactionFinalCardano,
     TokenTransfer,
     TokenInfo,
+    DeviceState,
+    StaticSessionId,
 } from '@trezor/connect';
 import { arrayDistinct, bufferUtils } from '@trezor/utils';
 import {
@@ -17,6 +19,7 @@ import {
     networks,
     AccountType,
     Bip43Path,
+    Bip43PathTemplate,
     getNetwork,
 } from '@suite-common/wallet-config';
 import {
@@ -39,11 +42,9 @@ import { formatTokenSymbol } from '@trezor/blockchain-link-utils';
 
 import { toFiatCurrency } from './fiatConverterUtils';
 import { getFiatRateKey } from './fiatRatesUtils';
-import { getAccountTotalStakingBalance } from './stakingUtils';
+import { getAccountTotalStakingBalance } from './ethereumStakingUtils';
 import { isRbfTransaction } from './transactionUtils';
 
-export const isEthereumAccountSymbol = (symbol: NetworkSymbol) => symbol === 'eth';
-
 export const isUtxoBased = (account: Account) =>
     account.networkType === 'bitcoin' || account.networkType === 'cardano';
 
@@ -156,6 +157,8 @@ export const getTitleForNetwork = (symbol: NetworkSymbol) => {
             return 'TR_NETWORK_ETHEREUM';
         case 'bnb':
             return 'TR_NETWORK_BNB';
+        case 'op':
+            return 'TR_NETWORK_OP';
         case 'tsep':
             return 'TR_NETWORK_ETHEREUM_SEPOLIA';
         case 'thol':
@@ -221,8 +224,13 @@ export const getBip43Type = (path: string) => {
     }
 };
 
+export const substituteBip43Path = (
+    bip43PathTemplate: Bip43PathTemplate,
+    accountIndex: string | number = '0',
+) => bip43PathTemplate.replace('i', String(accountIndex)) as Bip43Path;
+
 type getAccountTypeNameProps = {
-    path?: Bip43Path;
+    path?: Bip43PathTemplate;
     networkType?: NetworkType;
     accountType?: AccountType;
 };
@@ -263,7 +271,7 @@ export const getAccountTypeName = ({ path, accountType, networkType }: getAccoun
     return 'TR_ACCOUNT_TYPE_BIP44_NAME';
 };
 
-export const getAccountTypeTech = (path: Bip43Path) => {
+export const getAccountTypeTech = (path: Bip43PathTemplate) => {
     const accountTypePrefix = getAccountTypePrefix(path);
     if (accountTypePrefix) return `${accountTypePrefix}_TECH` as const;
     const bip43 = getBip43Type(path);
@@ -277,7 +285,7 @@ export const getAccountTypeTech = (path: Bip43Path) => {
 };
 
 type getAccountTypeDescProps = {
-    path: Bip43Path;
+    path: Bip43PathTemplate;
     accountType?: AccountType;
     networkType?: NetworkType;
 };
@@ -296,9 +304,9 @@ export const getAccountTypeDesc = ({ path, accountType, networkType }: getAccoun
         case 'solana':
             return 'TR_ACCOUNT_TYPE_NORMAL_SOLANA_DESC';
         case 'cardano':
-            return 'TR_ACCOUNT_TYPE_NORMAL_CARDANO_DESC';
+            return 'TR_ACCOUNT_TYPE_CARDANO_DESC';
         case 'ripple':
-            return 'TR_ACCOUNT_TYPE_NORMAL_XRP_DESC';
+            return 'TR_ACCOUNT_TYPE_XRP_DESC';
     }
 
     const accountTypePrefix = getAccountTypePrefix(path);
@@ -352,7 +360,7 @@ export const formatAmount = (amount: BigNumberValue, decimals: number) => {
     }
 };
 
-export const amountToSatoshi = (amount: BigNumberValue, decimals: number) => {
+export const amountToSmallestUnit = (amount: BigNumberValue, decimals: number) => {
     try {
         const bAmount = new BigNumber(amount);
         if (bAmount.isNaN()) {
@@ -380,14 +388,14 @@ export const satoshiAmountToBtc = (amount: BigNumberValue) => {
     }
 };
 
-export const networkAmountToSatoshi = (amount: string | null, symbol: NetworkSymbol) => {
+export const networkAmountToSmallestUnit = (amount: string | null, symbol: NetworkSymbol) => {
     if (!amount) return '0';
 
     const decimals = getAccountDecimals(symbol);
 
     if (!decimals) return amount;
 
-    return amountToSatoshi(amount, decimals);
+    return amountToSmallestUnit(amount, decimals);
 };
 
 export const formatNetworkAmount = (
@@ -477,12 +485,20 @@ export const findAccountsByAddress = (
         });
 
 export const findAccountDevice = (account: Account, devices: TrezorDevice[]) =>
-    devices.find(d => d.state === account.deviceState);
+    devices.find(d => d.state?.staticSessionId === account.deviceState);
 
-export const getAllAccounts = (deviceState: string | typeof undefined, accounts: Account[]) => {
+export const getAllAccounts = (
+    deviceState: DeviceState | StaticSessionId | typeof undefined,
+    accounts: Account[],
+) => {
     if (!deviceState) return [];
 
-    return accounts.filter(a => a.deviceState === deviceState && a.visible);
+    return accounts.filter(
+        a =>
+            (typeof deviceState === 'string'
+                ? a.deviceState === deviceState
+                : a.deviceState === deviceState.staticSessionId) && a.visible,
+    );
 };
 
 /**
@@ -558,11 +574,9 @@ export const enhanceAddresses = (
 
     switch (networkType) {
         case 'cardano': {
-            const accountIndexStr = accountIndex.toString();
-
             const replaceAccountIndex = (address: AccountAddress) => ({
                 ...address,
-                path: address.path.replace('i', accountIndexStr),
+                path: substituteBip43Path(address.path as Bip43PathTemplate, accountIndex),
             });
 
             return {
@@ -605,10 +619,9 @@ export const enhanceUtxo = (
     if (!utxos) return undefined;
     if (networkType !== 'cardano') return utxos;
 
-    const accountIndexStr = accountIndex.toString();
     const enhancedUtxos = utxos.map(utxo => ({
         ...utxo,
-        path: utxo.path.replace('i', accountIndexStr),
+        path: substituteBip43Path(utxo.path as Bip43PathTemplate, accountIndex),
     }));
 
     return enhancedUtxos;
@@ -626,7 +639,7 @@ export const enhanceHistory = ({
     addrTxCount,
 });
 
-export const getTokensFiatBalance = (
+export const getAccountTokensFiatBalance = (
     account: Account,
     localCurrency: string,
     rates?: RatesByKey,
@@ -654,6 +667,27 @@ export const getTokensFiatBalance = (
     return totalBalance.toFixed();
 };
 
+export const getAssetTokensFiatBalance = (
+    accounts: Account[],
+    localCurrency: FiatCurrencyCode,
+    rates?: RatesByKey,
+) => {
+    const totalBalance = accounts
+        .reduce((total, account) => {
+            const tokensBalance = getAccountTokensFiatBalance(
+                account,
+                localCurrency,
+                rates,
+                account.tokens,
+            );
+
+            return total.plus(tokensBalance ?? 0);
+        }, new BigNumber(0))
+        .toFixed();
+
+    return totalBalance;
+};
+
 export const getStakingFiatBalance = (account: Account, rate: number | undefined) => {
     const balanceInEther = getAccountTotalStakingBalance(account);
 
@@ -686,7 +720,12 @@ export const getAccountFiatBalance = ({
 
     // sum fiat value of all tokens
     if (shouldIncludeTokens) {
-        const tokensBalance = getTokensFiatBalance(account, localCurrency, rates, account.tokens);
+        const tokensBalance = getAccountTokensFiatBalance(
+            account,
+            localCurrency,
+            rates,
+            account.tokens,
+        );
         totalBalance = totalBalance.plus(tokensBalance ?? 0);
     }
 
@@ -838,12 +877,13 @@ export const getAccountSpecific = (accountInfo: Partial<AccountInfo>, networkTyp
 export const getFailedAccounts = (discovery: Discovery): Account[] =>
     discovery.failed.map(f => {
         const descriptor = `failed:${f.index}:${f.symbol}:${f.accountType}`;
+        const network = networks[f.symbol];
 
         return {
             failed: true,
             deviceState: discovery.deviceState,
             index: f.index,
-            path: descriptor,
+            path: substituteBip43Path(network.bip43Path), // placeholder - not relevant for failed, but required by TS to be an actual Bip43Path
             descriptor,
             key: descriptor,
             accountType: f.accountType,
@@ -863,7 +903,7 @@ export const getFailedAccounts = (discovery: Discovery): Account[] =>
             metadata: {
                 key: descriptor,
             },
-            ...getAccountSpecific({}, networks[f.symbol].networkType),
+            ...getAccountSpecific({}, network.networkType),
         };
     });
 
diff --git a/suite-common/wallet-utils/src/cardanoUtils.ts b/suite-common/wallet-utils/src/cardanoUtils.ts
index 1bc665441fb..c7ca64c0888 100644
--- a/suite-common/wallet-utils/src/cardanoUtils.ts
+++ b/suite-common/wallet-utils/src/cardanoUtils.ts
@@ -11,10 +11,10 @@ import { CARDANO, CardanoCertificate, CardanoOutput, PROTO } from '@trezor/conne
 import { AccountType } from '@suite-common/wallet-config';
 
 import {
-    amountToSatoshi,
+    amountToSmallestUnit,
     formatAmount,
     formatNetworkAmount,
-    networkAmountToSatoshi,
+    networkAmountToSmallestUnit,
 } from './accountUtils';
 
 export const getDerivationType = (accountType: AccountType) => {
@@ -67,7 +67,7 @@ export const transformUserOutputs = (
     outputs.map((output, i) => {
         const setMax = i === maxOutputIndex;
         const amount =
-            output.amount === '' ? undefined : networkAmountToSatoshi(output.amount, symbol);
+            output.amount === '' ? undefined : networkAmountToSmallestUnit(output.amount, symbol);
         const tokenDecimals = accountTokens?.find(t => t.contract === output.token)?.decimals ?? 0;
 
         return {
@@ -78,7 +78,7 @@ export const transformUserOutputs = (
                       {
                           unit: output.token,
                           quantity: output.amount
-                              ? amountToSatoshi(output.amount, tokenDecimals)
+                              ? amountToSmallestUnit(output.amount, tokenDecimals)
                               : '0',
                       },
                   ]
diff --git a/suite-common/wallet-utils/src/ethereumStakingUtils.ts b/suite-common/wallet-utils/src/ethereumStakingUtils.ts
new file mode 100644
index 00000000000..c75b05a9565
--- /dev/null
+++ b/suite-common/wallet-utils/src/ethereumStakingUtils.ts
@@ -0,0 +1,132 @@
+import { fromWei, hexToNumberString } from 'web3-utils';
+
+import {
+    Account,
+    StakingPoolExtended,
+    StakeType,
+    supportedNetworkSymbols,
+    SupportedNetworkSymbol,
+} from '@suite-common/wallet-types';
+import { BigNumber } from '@trezor/utils/src/bigNumber';
+import { NetworkSymbol, getNetworkFeatures } from '@suite-common/wallet-config';
+import { isArrayMember } from '@trezor/utils';
+
+export const getEverstakePool = (account?: Account) => {
+    if (account?.networkType !== 'ethereum') {
+        return undefined;
+    }
+
+    return account?.misc?.stakingPools?.find(pool => pool.name === 'Everstake');
+};
+
+export const getAccountEverstakeStakingPool = (
+    account?: Account,
+): StakingPoolExtended | undefined => {
+    const pool = getEverstakePool(account);
+
+    if (!pool) return undefined;
+
+    return {
+        ...pool,
+        autocompoundBalance: fromWei(pool.autocompoundBalance, 'ether'),
+        claimableAmount: fromWei(pool.claimableAmount, 'ether'),
+        depositedBalance: fromWei(pool.depositedBalance, 'ether'),
+        pendingBalance: fromWei(pool.pendingBalance, 'ether'),
+        pendingDepositedBalance: fromWei(pool.pendingDepositedBalance, 'ether'),
+        restakedReward: fromWei(pool.restakedReward, 'ether'),
+        withdrawTotalAmount: fromWei(pool.withdrawTotalAmount, 'ether'),
+        totalPendingStakeBalance: fromWei(
+            new BigNumber(pool.pendingBalance).plus(pool.pendingDepositedBalance).toString(),
+            'ether',
+        ),
+        canClaim:
+            new BigNumber(pool.claimableAmount).gt(0) &&
+            new BigNumber(pool.withdrawTotalAmount).eq(pool.claimableAmount),
+    };
+};
+
+export const getAccountAutocompoundBalance = (account?: Account) => {
+    const pool = getAccountEverstakeStakingPool(account);
+
+    return pool?.autocompoundBalance ?? '0';
+};
+
+export const getAccountTotalStakingBalance = (account?: Account) => {
+    const pool = getAccountEverstakeStakingPool(account);
+
+    return new BigNumber(pool?.autocompoundBalance ?? '0')
+        .plus(pool?.pendingBalance ?? '0')
+        .plus(pool?.pendingDepositedBalance ?? '0')
+        .plus(pool?.withdrawTotalAmount ?? '0')
+        .toFixed();
+};
+
+export const getEthereumCryptoBalanceWithStaking = (account: Account) => {
+    const stakingBalance = getAccountTotalStakingBalance(account);
+
+    return new BigNumber(account.formattedBalance).plus(stakingBalance).toString();
+};
+
+export function isSupportedEthStakingNetworkSymbol(
+    networkSymbol: NetworkSymbol,
+): networkSymbol is SupportedNetworkSymbol {
+    return isArrayMember(networkSymbol, supportedNetworkSymbols);
+}
+
+export const getStakingSymbols = (networkSymbols: NetworkSymbol[]) =>
+    networkSymbols.reduce((acc, networkSymbol) => {
+        if (
+            isSupportedEthStakingNetworkSymbol(networkSymbol) &&
+            getNetworkFeatures(networkSymbol).includes('staking')
+        ) {
+            acc.push(networkSymbol);
+        }
+
+        return acc;
+    }, [] as SupportedNetworkSymbol[]);
+
+// Define signature constants
+const STAKE_SIGNATURE = '0x3a29dbae';
+const UNSTAKE_SIGNATURE = '0x76ec871c';
+const CLAIM_SIGNATURE = '0x33986ffa';
+
+export const signatureToStakeNameMap: { [key: string]: StakeType } = {
+    [STAKE_SIGNATURE]: 'stake',
+    [UNSTAKE_SIGNATURE]: 'unstake',
+    [CLAIM_SIGNATURE]: 'claim',
+};
+
+export const isStakeTx = (signature: string | undefined) =>
+    signature?.toLowerCase() === STAKE_SIGNATURE;
+
+export const isUnstakeTx = (signature: string | undefined) =>
+    signature?.toLowerCase() === UNSTAKE_SIGNATURE;
+
+export const isClaimTx = (signature: string | undefined) =>
+    signature?.toLowerCase() === CLAIM_SIGNATURE;
+
+export const isStakeTypeTx = (signature: string | undefined) =>
+    isStakeTx(signature) || isUnstakeTx(signature) || isClaimTx(signature);
+
+export const getSignatureByEthereumDataHex = (dataHex: string) => `0x${dataHex.slice(0, 8)}`;
+
+export const getTxStakeNameByDataHex = (dataHex: string | undefined): StakeType | null => {
+    if (!dataHex) return null;
+    const signature = getSignatureByEthereumDataHex(dataHex);
+
+    return isStakeTypeTx(signature) ? signatureToStakeNameMap[signature] : null;
+};
+
+export const getUnstakeAmountByEthereumDataHex = (dataHex?: string) => {
+    if (!dataHex) return null;
+
+    // Check if the first two characters are '0x' and remove them if they are
+    const data = dataHex.startsWith('0x') ? dataHex.slice(2) : dataHex;
+
+    const signature = getSignatureByEthereumDataHex(data);
+    if (!isUnstakeTx(signature)) return null;
+
+    const dataBuffer = Buffer.from(data, 'hex');
+
+    return hexToNumberString(`0x${dataBuffer.subarray(4, 36).toString('hex')}`);
+};
diff --git a/suite-common/wallet-utils/src/fiatRatesUtils.ts b/suite-common/wallet-utils/src/fiatRatesUtils.ts
index 56ec40ba2f3..aca7575fff4 100644
--- a/suite-common/wallet-utils/src/fiatRatesUtils.ts
+++ b/suite-common/wallet-utils/src/fiatRatesUtils.ts
@@ -44,17 +44,20 @@ export const roundTimestampsToNearestPastHour = (timestamps: Timestamp[]): Times
 };
 
 const combineFiatRates = (fiatRates: RatesByTimestamps, accountRates: RatesByTimestamps) => {
-    for (let fiatRate in accountRates) {
+    for (const fiatRate in accountRates) {
         const fiatRateKey = fiatRate as FiatRateKey;
 
-        if (accountRates.hasOwnProperty(fiatRateKey)) {
+        if (Object.prototype.hasOwnProperty.call(accountRates, fiatRateKey)) {
             if (!fiatRates[fiatRateKey]) {
                 fiatRates[fiatRateKey] = accountRates[fiatRateKey];
             } else {
-                for (let timestampRate in accountRates[fiatRateKey]) {
+                for (const timestampRate in accountRates[fiatRateKey]) {
                     const timestamp = timestampRate as unknown as Timestamp;
                     if (
-                        accountRates[fiatRateKey].hasOwnProperty(timestamp) &&
+                        Object.prototype.hasOwnProperty.call(
+                            accountRates[fiatRateKey],
+                            timestamp,
+                        ) &&
                         !fiatRates[fiatRateKey][timestamp]
                     ) {
                         fiatRates[fiatRateKey][timestamp] = accountRates[fiatRateKey][timestamp];
@@ -66,11 +69,11 @@ const combineFiatRates = (fiatRates: RatesByTimestamps, accountRates: RatesByTim
 };
 
 export const buildHistoricRatesFromStorage = (storageHistoricRates: RatesByTimestamps[]) => {
-    let historicFiatRates: RatesByTimestamps = {};
+    const historicFiatRates: RatesByTimestamps = {};
 
     storageHistoricRates.forEach(fiatRates => {
-        for (let fiatRate in fiatRates) {
-            if (fiatRates.hasOwnProperty(fiatRate)) {
+        for (const fiatRate in fiatRates) {
+            if (Object.prototype.hasOwnProperty.call(fiatRates, fiatRate)) {
                 const fiatRateKey = fiatRate as FiatRateKey;
 
                 if (!historicFiatRates[fiatRateKey]) {
diff --git a/suite-common/wallet-utils/src/filterReceiveAccounts.ts b/suite-common/wallet-utils/src/filterReceiveAccounts.ts
index 2025144d829..969052fa9fa 100644
--- a/suite-common/wallet-utils/src/filterReceiveAccounts.ts
+++ b/suite-common/wallet-utils/src/filterReceiveAccounts.ts
@@ -1,5 +1,6 @@
 import { AccountType, getNetwork, Network, NetworkSymbol } from '@suite-common/wallet-config';
 import { Account } from '@suite-common/wallet-types';
+import { StaticSessionId } from '@trezor/connect';
 
 export const isDebugOnlyAccountType = (
     accountType: AccountType,
@@ -16,7 +17,7 @@ export const isDebugOnlyAccountType = (
 
 type FilterReceiveAccountsProps = {
     accounts: Account[];
-    deviceState: string | undefined;
+    deviceState?: StaticSessionId;
     receiveNetwork?: string;
     isDebug: boolean;
     receiveNetworks: Network[];
diff --git a/suite-common/wallet-utils/src/index.ts b/suite-common/wallet-utils/src/index.ts
index 699e388498b..3222d029aeb 100644
--- a/suite-common/wallet-utils/src/index.ts
+++ b/suite-common/wallet-utils/src/index.ts
@@ -16,9 +16,7 @@ export * from './settingsUtils';
 export * from './solanaUtils';
 export * from './transactionUtils';
 export * from './validationUtils';
-export * from './antiFraud';
-export * from './stakingUtils';
+export * from './ethereumStakingUtils';
 export * from './reviewTransactionUtils';
 export * from './filterReceiveAccounts';
-
-export { analyzeTransactions as analyzeTransactionsFixtures } from './__fixtures__/transactionUtils';
+export * from './tokenUtils';
diff --git a/suite-common/wallet-utils/src/reviewTransactionUtils.ts b/suite-common/wallet-utils/src/reviewTransactionUtils.ts
index 7607f6d5405..1e2e5776ea5 100644
--- a/suite-common/wallet-utils/src/reviewTransactionUtils.ts
+++ b/suite-common/wallet-utils/src/reviewTransactionUtils.ts
@@ -8,8 +8,9 @@ import {
     FormState,
     GeneralPrecomposedTransactionFinal,
     ReviewOutputState,
+    StakeFormState,
+    ReviewOutput,
 } from '@suite-common/wallet-types';
-import { StakeFormState, ReviewOutput } from '@suite-common/wallet-types';
 import { TrezorDevice } from '@suite-common/suite-types';
 
 import { getShortFingerprint, isCardanoTx } from './cardanoUtils';
diff --git a/suite-common/wallet-utils/src/sendFormUtils.ts b/suite-common/wallet-utils/src/sendFormUtils.ts
index 9d96d49cafe..0eeb2122d71 100644
--- a/suite-common/wallet-utils/src/sendFormUtils.ts
+++ b/suite-common/wallet-utils/src/sendFormUtils.ts
@@ -30,9 +30,12 @@ import type {
     CurrencyOption,
     ExcludedUtxos,
     GeneralPrecomposedTransactionFinal,
+    AccountKey,
+    TokenAddress,
+    SendFormDraftKey,
 } from '@suite-common/wallet-types';
 
-import { amountToSatoshi, getUtxoOutpoint, networkAmountToSatoshi } from './accountUtils';
+import { amountToSmallestUnit, getUtxoOutpoint, networkAmountToSmallestUnit } from './accountUtils';
 import { sanitizeHex } from './ethUtils';
 
 export const calculateTotal = (amount: string, fee: string): string => {
@@ -96,7 +99,7 @@ const getSerializedErc20Transfer = (token: TokenInfo, to: string, amount: string
     // 32 bytes address parameter, remove '0x' prefix
     const erc20recipient = padLeft(to, 64).substring(2);
     // convert amount to satoshi
-    const tokenAmount = amountToSatoshi(amount, token.decimals);
+    const tokenAmount = amountToSmallestUnit(amount, token.decimals);
     // 32 bytes amount paramter, remove '0x' prefix
     const erc20amount = padLeft(numberToHex(tokenAmount), 64).substring(2);
 
@@ -283,7 +286,7 @@ export const getBitcoinComposeOutputs = (
         } else if (output.amount) {
             const amount = isSatoshis
                 ? output.amount
-                : networkAmountToSatoshi(output.amount, symbol);
+                : networkAmountToSmallestUnit(output.amount, symbol);
 
             if (address) {
                 result.push({
@@ -324,6 +327,7 @@ export const getExternalComposeOutput = (
     values: Partial<FormState>,
     account: Account,
     network: Network,
+    formattedFallbackAmount?: string, // for cases when value is zero but amount is available in eth data
 ) => {
     if (!values || !Array.isArray(values.outputs) || !values.outputs[0]) return;
     const out = values.outputs[0];
@@ -335,7 +339,7 @@ export const getExternalComposeOutput = (
 
     const tokenInfo = findToken(account.tokens, token);
     const decimals = tokenInfo ? tokenInfo.decimals : network.decimals;
-    const amountInSatoshi = amountToSatoshi(amount, decimals);
+    const formattedAmount = amountToSmallestUnit(amount, decimals);
 
     let output: ExternalOutput;
     if (isMaxActive) {
@@ -353,12 +357,12 @@ export const getExternalComposeOutput = (
         output = {
             type: 'payment',
             address,
-            amount: amountInSatoshi,
+            amount: formattedFallbackAmount || formattedAmount,
         };
     } else {
         output = {
             type: 'payment-noaddress',
-            amount: amountInSatoshi,
+            amount: formattedAmount,
         };
     }
 
@@ -461,6 +465,13 @@ export const getExcludedUtxos = ({
     return excludedUtxos;
 };
 
+export const getSendFormDraftKey = (
+    accountKey: AccountKey,
+    tokenAddress?: TokenAddress,
+): SendFormDraftKey => {
+    return tokenAddress ? `${accountKey}-${tokenAddress}` : accountKey;
+};
+
 // SOL Specific
 
 export const getLamportsFromSol = (amountInSol: string) =>
diff --git a/suite-common/wallet-utils/src/stakingUtils.ts b/suite-common/wallet-utils/src/stakingUtils.ts
deleted file mode 100644
index c742af6c505..00000000000
--- a/suite-common/wallet-utils/src/stakingUtils.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { fromWei } from 'web3-utils';
-
-import { Account, StakingPoolExtended } from '@suite-common/wallet-types';
-import { BigNumber } from '@trezor/utils/src/bigNumber';
-
-export const getEverstakePool = (account?: Account) => {
-    if (account?.networkType !== 'ethereum') {
-        return undefined;
-    }
-
-    return account?.misc?.stakingPools?.find(pool => pool.name === 'Everstake');
-};
-
-export const getAccountEverstakeStakingPool = (
-    account?: Account,
-): StakingPoolExtended | undefined => {
-    const pool = getEverstakePool(account);
-
-    if (!pool) return undefined;
-
-    return {
-        ...pool,
-        autocompoundBalance: fromWei(pool.autocompoundBalance, 'ether'),
-        claimableAmount: fromWei(pool.claimableAmount, 'ether'),
-        depositedBalance: fromWei(pool.depositedBalance, 'ether'),
-        pendingBalance: fromWei(pool.pendingBalance, 'ether'),
-        pendingDepositedBalance: fromWei(pool.pendingDepositedBalance, 'ether'),
-        restakedReward: fromWei(pool.restakedReward, 'ether'),
-        withdrawTotalAmount: fromWei(pool.withdrawTotalAmount, 'ether'),
-        totalPendingStakeBalance: fromWei(
-            new BigNumber(pool.pendingBalance).plus(pool.pendingDepositedBalance).toString(),
-            'ether',
-        ),
-        canClaim:
-            new BigNumber(pool.claimableAmount).gt(0) &&
-            new BigNumber(pool.withdrawTotalAmount).eq(pool.claimableAmount),
-    };
-};
-
-export const getAccountAutocompoundBalance = (account?: Account) => {
-    const pool = getAccountEverstakeStakingPool(account);
-
-    return pool?.autocompoundBalance ?? '0';
-};
-
-export const getAccountTotalStakingBalance = (account?: Account) => {
-    const pool = getAccountEverstakeStakingPool(account);
-
-    return new BigNumber(pool?.autocompoundBalance ?? '0')
-        .plus(pool?.pendingBalance ?? '0')
-        .plus(pool?.pendingDepositedBalance ?? '0')
-        .plus(pool?.withdrawTotalAmount ?? '0')
-        .toFixed();
-};
-
-export const getEthereumCryptoBalanceWithStaking = (account: Account) => {
-    const stakingBalance = getAccountTotalStakingBalance(account);
-
-    return new BigNumber(account.formattedBalance).plus(stakingBalance).toString();
-};
diff --git a/suite-common/wallet-utils/src/tokenUtils.ts b/suite-common/wallet-utils/src/tokenUtils.ts
new file mode 100644
index 00000000000..8551e118750
--- /dev/null
+++ b/suite-common/wallet-utils/src/tokenUtils.ts
@@ -0,0 +1,24 @@
+import { NetworkSymbol } from '@suite-common/wallet-config';
+import { parseAsset } from '@trezor/blockchain-link-utils/src/blockfrost';
+
+export const getContractAddressForNetwork = (
+    networkSymbol: NetworkSymbol,
+    contractAddress: string,
+) => {
+    switch (networkSymbol) {
+        case 'eth':
+            // Specyfing most common network as first case improves performance little bit
+            return contractAddress.toLowerCase();
+        case 'sol':
+        case 'dsol':
+            return contractAddress;
+        case 'ada':
+        case 'tada': {
+            const { policyId } = parseAsset(contractAddress);
+
+            return policyId.toLowerCase();
+        }
+        default:
+            return contractAddress.toLowerCase();
+    }
+};
diff --git a/suite-common/wallet-utils/tsconfig.json b/suite-common/wallet-utils/tsconfig.json
index c6052644963..687b3f70d72 100644
--- a/suite-common/wallet-utils/tsconfig.json
+++ b/suite-common/wallet-utils/tsconfig.json
@@ -8,16 +8,12 @@
         { "path": "../suite-config" },
         { "path": "../suite-types" },
         { "path": "../test-utils" },
-        { "path": "../token-definitions" },
         { "path": "../wallet-config" },
         { "path": "../wallet-constants" },
         { "path": "../wallet-types" },
         {
             "path": "../../packages/address-validator"
         },
-        {
-            "path": "../../packages/blockchain-link"
-        },
         {
             "path": "../../packages/blockchain-link-types"
         },
diff --git a/suite-native/accounts/package.json b/suite-native/accounts/package.json
index 4fe2085c925..043420601f9 100644
--- a/suite-native/accounts/package.json
+++ b/suite-native/accounts/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.native.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
@@ -14,9 +13,8 @@
     "dependencies": {
         "@mobily/ts-belt": "^3.13.1",
         "@react-navigation/native": "6.1.18",
-        "@shopify/flash-list": "1.7.1",
         "@suite-common/formatters": "workspace:*",
-        "@suite-common/icons-deprecated": "workspace:*",
+        "@suite-common/redux-utils": "workspace:*",
         "@suite-common/token-definitions": "workspace:*",
         "@suite-common/validators": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
@@ -29,18 +27,19 @@
         "@suite-native/feature-flags": "workspace:*",
         "@suite-native/formatters": "workspace:*",
         "@suite-native/forms": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/navigation": "workspace:*",
         "@suite-native/settings": "workspace:*",
         "@suite-native/staking": "workspace:*",
         "@suite-native/toasts": "workspace:*",
         "@suite-native/tokens": "workspace:*",
+        "@trezor/connect": "workspace:*",
         "@trezor/styles": "workspace:*",
         "jotai": "1.9.1",
-        "proxy-memoize": "2.0.2",
         "react": "18.2.0",
         "react-native": "0.75.2",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-redux": "8.0.7"
     }
 }
diff --git a/suite-native/accounts/src/components/AccountSelectBottomSheet.tsx b/suite-native/accounts/src/components/AccountSelectBottomSheet.tsx
index 6ebeae195cc..eee47a23a70 100644
--- a/suite-native/accounts/src/components/AccountSelectBottomSheet.tsx
+++ b/suite-native/accounts/src/components/AccountSelectBottomSheet.tsx
@@ -1,10 +1,8 @@
 import React, { useCallback } from 'react';
 
-import { FlashList } from '@shopify/flash-list';
-
-import { BottomSheet } from '@suite-native/atoms';
-import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+import { BottomSheetFlashList } from '@suite-native/atoms';
 import { useToast } from '@suite-native/toasts';
+import { Translation } from '@suite-native/intl';
 
 import { AccountSelectBottomSheetSection, OnSelectAccount } from '../types';
 import { AccountsListItem } from './AccountsList/AccountsListItem';
@@ -19,9 +17,7 @@ type AccountSelectBottomSheetProps = {
     onClose: () => void;
 };
 
-const contentContainerStyle = prepareNativeStyle(utils => ({
-    paddingHorizontal: utils.spacings.sp16,
-}));
+const ESTIMATED_ITEM_SIZE = 76;
 
 export const AccountSelectBottomSheet = React.memo(
     ({
@@ -30,7 +26,6 @@ export const AccountSelectBottomSheet = React.memo(
         isStakingPressable = false,
         onClose,
     }: AccountSelectBottomSheetProps) => {
-        const { applyStyle } = useNativeStyles();
         const { showToast } = useToast();
 
         const renderItem = useCallback(
@@ -63,13 +58,15 @@ export const AccountSelectBottomSheet = React.memo(
                                     } else {
                                         showToast({
                                             variant: 'warning',
-                                            message: 'Staking is not available in this context.',
+                                            message: (
+                                                <Translation id="accountList.stakingDisabled" />
+                                            ),
                                         });
                                     }
                                 }}
                             />
                         );
-                    case 'token':
+                    case 'token': {
                         const { token, account } = item;
 
                         return (
@@ -85,6 +82,7 @@ export const AccountSelectBottomSheet = React.memo(
                                 }
                             />
                         );
+                    }
                     default:
                         return null;
                 }
@@ -93,14 +91,15 @@ export const AccountSelectBottomSheet = React.memo(
         );
 
         return (
-            <BottomSheet isVisible isCloseDisplayed={false} onClose={onClose} isScrollable={false}>
-                <FlashList
-                    data={data}
-                    renderItem={renderItem}
-                    contentContainerStyle={applyStyle(contentContainerStyle)}
-                    estimatedItemSize={76}
-                />
-            </BottomSheet>
+            <BottomSheetFlashList<AccountSelectBottomSheetSection>
+                isVisible
+                isCloseDisplayed={false}
+                onClose={onClose}
+                data={data}
+                renderItem={renderItem}
+                estimatedItemSize={ESTIMATED_ITEM_SIZE}
+                estimatedListHeight={ESTIMATED_ITEM_SIZE * data.length * 1.5}
+            />
         );
     },
 );
diff --git a/suite-native/accounts/src/components/AccountsList/AccountsListEmptyPlaceholder.tsx b/suite-native/accounts/src/components/AccountsList/AccountsListEmptyPlaceholder.tsx
index 4dbb60419f3..18d1cbdac46 100644
--- a/suite-native/accounts/src/components/AccountsList/AccountsListEmptyPlaceholder.tsx
+++ b/suite-native/accounts/src/components/AccountsList/AccountsListEmptyPlaceholder.tsx
@@ -4,7 +4,7 @@ import { Box, PictogramTitleHeader } from '@suite-native/atoms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { TxKeyPath, Translation } from '@suite-native/intl';
 import { ReceiveStackRoutes, RootStackRoutes } from '@suite-native/navigation';
-import { IconName } from '@suite-common/icons-deprecated';
+import { IconName } from '@suite-native/icons';
 
 const PLACEHOLDER_HEIGHT = 380;
 
@@ -30,11 +30,11 @@ export const AccountsListEmptyPlaceholder = ({
 
     const getIcon = (): IconName => {
         if (!isFilterEmpty) {
-            return 'searchLight';
+            return 'magnifyingGlass';
         }
 
         if (isReceiveRoute) {
-            return 'receive';
+            return 'arrowLineDown';
         }
 
         return 'discover';
diff --git a/suite-native/accounts/src/components/AccountsList/AccountsListItem.tsx b/suite-native/accounts/src/components/AccountsList/AccountsListItem.tsx
index 517ddf32bf7..c1231c4ab28 100644
--- a/suite-native/accounts/src/components/AccountsList/AccountsListItem.tsx
+++ b/suite-native/accounts/src/components/AccountsList/AccountsListItem.tsx
@@ -99,7 +99,7 @@ export const AccountsListItem = ({
             showDivider={showDivider}
             onPress={handleOnPress}
             disabled={disabled}
-            icon={<RoundedIcon name={account.symbol} />}
+            icon={<RoundedIcon networkSymbol={account.symbol} />}
             title={
                 shouldShowAccountLabel ? (
                     accountLabel
diff --git a/suite-native/accounts/src/components/AccountsList/AccountsListItemBase.tsx b/suite-native/accounts/src/components/AccountsList/AccountsListItemBase.tsx
index 2aa951e614e..14c72c72d8d 100644
--- a/suite-native/accounts/src/components/AccountsList/AccountsListItemBase.tsx
+++ b/suite-native/accounts/src/components/AccountsList/AccountsListItemBase.tsx
@@ -44,17 +44,17 @@ const accountListItemStyle = prepareNativeStyle<{
                 {
                     condition: isFirst,
                     style: {
-                        borderTopLeftRadius: utils.borders.radii.medium,
-                        borderTopRightRadius: utils.borders.radii.medium,
+                        borderTopLeftRadius: utils.borders.radii.r16,
+                        borderTopRightRadius: utils.borders.radii.r16,
                         ...utils.boxShadows.small,
                     },
                 },
                 {
                     condition: isLast,
                     style: {
-                        borderBottomLeftRadius: utils.borders.radii.medium,
-                        borderBottomRightRadius: utils.borders.radii.medium,
-                        marginBottom: utils.spacings.sp32,
+                        borderBottomLeftRadius: utils.borders.radii.r16,
+                        borderBottomRightRadius: utils.borders.radii.r16,
+                        marginBottom: utils.spacings.sp16,
                         ...utils.boxShadows.small,
                     },
                 },
diff --git a/suite-native/accounts/src/components/AccountsList/AccountsListTokenItem.tsx b/suite-native/accounts/src/components/AccountsList/AccountsListTokenItem.tsx
index a26556a20d7..09500a56bd0 100644
--- a/suite-native/accounts/src/components/AccountsList/AccountsListTokenItem.tsx
+++ b/suite-native/accounts/src/components/AccountsList/AccountsListTokenItem.tsx
@@ -1,13 +1,9 @@
 import { useSelector } from 'react-redux';
 
-import { AccountsRootState } from '@suite-common/wallet-core';
 import { Account, TokenInfoBranded } from '@suite-common/wallet-types';
 import { RoundedIcon } from '@suite-native/atoms';
-import {
-    EthereumTokenAmountFormatter,
-    EthereumTokenToFiatAmountFormatter,
-} from '@suite-native/formatters';
-import { getTokenName, selectAccountTokenSymbol } from '@suite-native/tokens';
+import { TokenAmountFormatter, TokenToFiatAmountFormatter } from '@suite-native/formatters';
+import { getTokenName, selectAccountTokenSymbol, TokensRootState } from '@suite-native/tokens';
 
 import { AccountsListItemBase } from './AccountsListItemBase';
 
@@ -29,7 +25,7 @@ export const AccountsListTokenItem = ({
     isFirst,
     isLast,
 }: AccountListTokenItemProps) => {
-    const tokenSymbol = useSelector((state: AccountsRootState) =>
+    const tokenSymbol = useSelector((state: TokensRootState) =>
         selectAccountTokenSymbol(state, account.key, token.contract),
     );
     const balance = token.balance ?? '0';
@@ -40,13 +36,17 @@ export const AccountsListTokenItem = ({
             isFirst={isFirst}
             isLast={isLast}
             onPress={onSelectAccount}
-            icon={<RoundedIcon name={token.contract} />}
+            icon={<RoundedIcon networkSymbol={account.symbol} contractAddress={token.contract} />}
             title={getTokenName(token.name)}
             mainValue={
-                <EthereumTokenToFiatAmountFormatter value={balance} contract={token.contract} />
+                <TokenToFiatAmountFormatter
+                    networkSymbol={account.symbol}
+                    value={balance}
+                    contract={token.contract}
+                />
             }
             secondaryValue={
-                <EthereumTokenAmountFormatter
+                <TokenAmountFormatter
                     value={balance}
                     symbol={tokenSymbol}
                     numberOfLines={1}
diff --git a/suite-native/accounts/src/components/SearchableAccountsListScreenHeader.tsx b/suite-native/accounts/src/components/SearchableAccountsListScreenHeader.tsx
index 41ecb9ac6e8..8cbca6bbe82 100644
--- a/suite-native/accounts/src/components/SearchableAccountsListScreenHeader.tsx
+++ b/suite-native/accounts/src/components/SearchableAccountsListScreenHeader.tsx
@@ -78,6 +78,7 @@ export const SearchableAccountsListScreenHeader = ({
                     exiting={FadeOut.duration(HEADER_ANIMATION_DURATION)}
                 >
                     <ScreenSubHeader
+                        customHorizontalPadding="sp16"
                         content={title}
                         rightIcon={
                             <AddAccountButton
@@ -87,7 +88,7 @@ export const SearchableAccountsListScreenHeader = ({
                         }
                         leftIcon={
                             <IconButton
-                                iconName="search"
+                                iconName="magnifyingGlass"
                                 onPress={() => setIsSearchActive(true)}
                                 colorScheme="tertiaryElevation1"
                                 size="medium"
diff --git a/suite-native/accounts/src/components/SelectableNetworkItem.tsx b/suite-native/accounts/src/components/SelectableNetworkItem.tsx
index 30a4931d371..4a6cac000f2 100644
--- a/suite-native/accounts/src/components/SelectableNetworkItem.tsx
+++ b/suite-native/accounts/src/components/SelectableNetworkItem.tsx
@@ -3,7 +3,7 @@ import { TouchableOpacity } from 'react-native';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { networks, NetworkSymbol } from '@suite-common/wallet-config';
 import { useFormatters } from '@suite-common/formatters';
-import { Icon, IconName } from '@suite-common/icons-deprecated';
+import { Icon, IconName } from '@suite-native/icons';
 import { Badge, Box, HStack, RoundedIcon, Text } from '@suite-native/atoms';
 import { Translation } from '@suite-native/intl';
 import { isCoinWithTokens } from '@suite-native/tokens';
@@ -46,7 +46,7 @@ export const SelectableNetworkItem = ({ symbol, onPress, rightIcon }: Selectable
             testID={`@onboarding/select-coin/${symbol}`}
         >
             <Box flexDirection="row" alignItems="center">
-                <RoundedIcon name={symbol} />
+                <RoundedIcon networkSymbol={symbol} />
                 <Box style={applyStyle(selectableAssetContentStyle)}>
                     <Box flex={1} justifyContent="space-between" alignItems="flex-start">
                         <Text variant="body">{networkName}</Text>
diff --git a/suite-native/accounts/src/selectors.ts b/suite-native/accounts/src/selectors.ts
index 653f57ec1dd..f2f4aa9f2c9 100644
--- a/suite-native/accounts/src/selectors.ts
+++ b/suite-native/accounts/src/selectors.ts
@@ -1,24 +1,35 @@
 import { A, pipe } from '@mobily/ts-belt';
-import { memoizeWithArgs } from 'proxy-memoize';
 
 import {
+    SimpleTokenStructure,
     TokenDefinitionsRootState,
-    selectFilterKnownTokens,
+    filterKnownTokens,
+    getSimpleCoinDefinitionsByNetwork,
+    selectTokenDefinitions,
 } from '@suite-common/token-definitions';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import {
     AccountsRootState,
     DeviceRootState,
     FiatRatesRootState,
+    TransactionsRootState,
     selectAccountByKey,
     selectAccounts,
     selectCurrentFiatRates,
+    selectIsAccountUtxoBased,
+    selectPendingAccountAddresses,
     selectVisibleDeviceAccounts,
 } from '@suite-common/wallet-core';
-import { AccountKey, TokenInfoBranded } from '@suite-common/wallet-types';
-import { getAccountFiatBalance, getAccountTotalStakingBalance } from '@suite-common/wallet-utils';
+import { Account, AccountKey, TokenInfoBranded } from '@suite-common/wallet-types';
+import {
+    getAccountFiatBalance,
+    getAccountTotalStakingBalance,
+    getFirstFreshAddress,
+} from '@suite-common/wallet-utils';
 import { SettingsSliceRootState, selectFiatCurrencyCode } from '@suite-native/settings';
 import { isCoinWithTokens } from '@suite-native/tokens';
+import type { StaticSessionId } from '@trezor/connect';
+import { createWeakMapSelector } from '@suite-common/redux-utils';
 
 import { AccountSelectBottomSheetSection, GroupedByTypeAccounts } from './types';
 import {
@@ -33,12 +44,16 @@ export type NativeAccountsRootState = AccountsRootState &
     DeviceRootState &
     TokenDefinitionsRootState;
 
+const createMemoizedSelector = createWeakMapSelector.withTypes<NativeAccountsRootState>();
+
 // TODO: It searches for filterValue even in tokens without fiat rates.
 // These are currently hidden in UI, but they should be made accessible in some way.
-export const selectFilteredDeviceAccountsGroupedByNetworkAccountType = memoizeWithArgs(
-    (state: NativeAccountsRootState, filterValue: string) => {
-        const accounts = selectVisibleDeviceAccounts(state);
-
+export const selectFilteredDeviceAccountsGroupedByNetworkAccountType = createMemoizedSelector(
+    [
+        selectVisibleDeviceAccounts,
+        (_state: NativeAccountsRootState, filterValue: string) => filterValue,
+    ],
+    (accounts, filterValue) => {
         return pipe(
             accounts,
             sortAccountsByNetworksAndAccountTypes,
@@ -46,8 +61,6 @@ export const selectFilteredDeviceAccountsGroupedByNetworkAccountType = memoizeWi
             groupAccountsByNetworkAccountType,
         ) as GroupedByTypeAccounts;
     },
-    // This selector is used only in one search component, so cache size equal to 1 is enough.
-    { size: 1 },
 );
 
 export const selectIsAccountAlreadyDiscovered = (
@@ -56,7 +69,7 @@ export const selectIsAccountAlreadyDiscovered = (
         networkSymbol,
         path,
         deviceState,
-    }: { networkSymbol: NetworkSymbol; path: string; deviceState: string },
+    }: { networkSymbol: NetworkSymbol; path: string; deviceState: StaticSessionId },
 ) =>
     pipe(
         state,
@@ -87,59 +100,83 @@ export const selectAccountFiatBalance = (state: NativeAccountsRootState, account
     return totalBalance;
 };
 
-const EMPTY_ARRAY: any[] = [];
-
-export const selectAccountListSections = memoizeWithArgs(
-    (state: NativeAccountsRootState, accountKey?: AccountKey | null, hideStaking?: boolean) => {
-        if (!accountKey) return EMPTY_ARRAY;
-        const account = selectAccountByKey(state, accountKey);
-        if (!account) return EMPTY_ARRAY;
+export const getAccountListSections = (
+    account: Account,
+    tokenDefinitions: SimpleTokenStructure | undefined,
+) => {
+    const sections: AccountSelectBottomSheetSection[] = [];
 
-        const sections: AccountSelectBottomSheetSection[] = [];
+    const canHasTokens = isCoinWithTokens(account.symbol);
+    const tokens = filterKnownTokens(tokenDefinitions, account.symbol, account.tokens ?? []);
+    const hasAnyKnownTokens = canHasTokens && !!tokens.length;
+    const stakingBalance = getAccountTotalStakingBalance(account);
+    const hasStaking = stakingBalance !== '0';
 
-        const canHasTokens = isCoinWithTokens(account.symbol);
-        const tokens = selectFilterKnownTokens(state, account.symbol, account.tokens ?? []);
-        const hasAnyKnownTokens = canHasTokens && !!tokens.length;
-        const stakingBalance = getAccountTotalStakingBalance(account);
-        const hasStaking = stakingBalance !== '0' && !hideStaking;
-
-        if (canHasTokens) {
-            sections.push({
-                type: 'sectionTitle',
-                account,
-                hasAnyKnownTokens,
-            });
-        }
+    if (canHasTokens) {
         sections.push({
-            type: 'account',
+            type: 'sectionTitle',
             account,
-            isLast: !hasAnyKnownTokens && !hasStaking,
-            isFirst: true,
             hasAnyKnownTokens,
         });
+    }
+    sections.push({
+        type: 'account',
+        account,
+        isLast: !hasAnyKnownTokens && !hasStaking,
+        isFirst: true,
+        hasAnyKnownTokens,
+    });
+
+    if (hasStaking) {
+        sections.push({
+            type: 'staking',
+            account,
+            stakingCryptoBalance: stakingBalance,
+            isLast: !hasAnyKnownTokens,
+        });
+    }
 
-        if (hasStaking) {
+    if (hasAnyKnownTokens) {
+        tokens.forEach((token, index) => {
             sections.push({
-                type: 'staking',
+                type: 'token',
                 account,
-                stakingCryptoBalance: stakingBalance,
-                isLast: !hasAnyKnownTokens,
+                token: token as TokenInfoBranded,
+                isLast: index === tokens.length - 1,
             });
-        }
-
-        if (hasAnyKnownTokens) {
-            tokens.forEach((token, index) => {
-                sections.push({
-                    type: 'token',
-                    account,
-                    token: token as TokenInfoBranded,
-                    isLast: index === tokens.length - 1,
-                });
-            });
-        }
+        });
+    }
+
+    return sections;
+};
+
+const EMPTY_ARRAY: AccountSelectBottomSheetSection[] = [];
+
+export const selectAccountListSections = createMemoizedSelector(
+    [selectAccountByKey, selectTokenDefinitions],
+    (account, tokenDefinitions) => {
+        if (!account) return EMPTY_ARRAY;
 
-        return sections;
+        const networkTokenDefinitions = getSimpleCoinDefinitionsByNetwork(
+            tokenDefinitions,
+            account.symbol,
+        );
+
+        return getAccountListSections(account, networkTokenDefinitions);
     },
-    // Some reasonable number of accounts that could be in app
-    { size: 40 },
 );
+
+export const selectFreshAccountAddress = (
+    state: NativeAccountsRootState & TransactionsRootState,
+    accountKey: AccountKey,
+) => {
+    const account = selectAccountByKey(state, accountKey);
+
+    if (!account) return null;
+
+    const pendingAddresses = selectPendingAccountAddresses(state, accountKey);
+
+    const isAccountUtxoBased = selectIsAccountUtxoBased(state, accountKey);
+
+    return getFirstFreshAddress(account, [], pendingAddresses, isAccountUtxoBased);
+};
diff --git a/suite-native/accounts/src/tests/selectors.test.ts b/suite-native/accounts/src/tests/selectors.test.ts
index ef0519025a4..b8b6483921e 100644
--- a/suite-native/accounts/src/tests/selectors.test.ts
+++ b/suite-native/accounts/src/tests/selectors.test.ts
@@ -32,13 +32,13 @@ describe('isFilterValueMatchingAccountLabelOrNetworkName', () => {
         expect(isFilterValueMatchingAccount(account, filterValue)).toBe(true);
     });
 
-    test('should return true if filter value matches the account type', () => {
+    test('should return true if filter value matches the account type: legacy', () => {
         const filterValue = 'legacy';
 
         expect(isFilterValueMatchingAccount(account, filterValue)).toBe(true);
     });
 
-    test('should return true if filter value matches the account type', () => {
+    test('should return true if filter value matches the account type: taproot', () => {
         const filterValue = 'taproot';
 
         expect(isFilterValueMatchingAccount(account, filterValue)).toBe(false);
diff --git a/suite-native/accounts/src/utils.ts b/suite-native/accounts/src/utils.ts
index f08146ae9a8..4ef996f8549 100644
--- a/suite-native/accounts/src/utils.ts
+++ b/suite-native/accounts/src/utils.ts
@@ -3,7 +3,7 @@ import { A, D, G } from '@mobily/ts-belt';
 import { AccountType, getNetwork, networks } from '@suite-common/wallet-config';
 import { formattedAccountTypeMap } from '@suite-common/wallet-core';
 import { Account } from '@suite-common/wallet-types';
-import { discoverySupportedNetworks, orderedAccountTypes } from '@suite-native/config';
+import { orderedNetworkSymbols, orderedAccountTypes } from '@suite-native/config';
 
 const accountTypeToSectionHeader: Readonly<Partial<Record<AccountType, string>>> = {
     normal: 'default',
@@ -79,8 +79,8 @@ export const groupAccountsByNetworkAccountType = A.groupBy((account: Account) =>
 
 export const sortAccountsByNetworksAndAccountTypes = (accounts: readonly Account[]) => {
     return A.sort(accounts, (a, b) => {
-        const aOrder = discoverySupportedNetworks.indexOf(a.symbol) ?? Number.MAX_SAFE_INTEGER;
-        const bOrder = discoverySupportedNetworks.indexOf(b.symbol) ?? Number.MAX_SAFE_INTEGER;
+        const aOrder = orderedNetworkSymbols.indexOf(a.symbol) ?? Number.MAX_SAFE_INTEGER;
+        const bOrder = orderedNetworkSymbols.indexOf(b.symbol) ?? Number.MAX_SAFE_INTEGER;
 
         if (aOrder === bOrder) {
             const aAccountTypeOrder =
diff --git a/suite-native/accounts/tsconfig.json b/suite-native/accounts/tsconfig.json
index d4b06c7edee..0b5522c53b3 100644
--- a/suite-native/accounts/tsconfig.json
+++ b/suite-native/accounts/tsconfig.json
@@ -6,7 +6,7 @@
             "path": "../../suite-common/formatters"
         },
         {
-            "path": "../../suite-common/icons-deprecated"
+            "path": "../../suite-common/redux-utils"
         },
         {
             "path": "../../suite-common/token-definitions"
@@ -32,12 +32,14 @@
         { "path": "../feature-flags" },
         { "path": "../formatters" },
         { "path": "../forms" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../navigation" },
         { "path": "../settings" },
         { "path": "../staking" },
         { "path": "../toasts" },
         { "path": "../tokens" },
+        { "path": "../../packages/connect" },
         { "path": "../../packages/styles" }
     ]
 }
diff --git a/suite-native/alerts/package.json b/suite-native/alerts/package.json
index 4813fece1ee..a62b000834e 100644
--- a/suite-native/alerts/package.json
+++ b/suite-native/alerts/package.json
@@ -6,18 +6,17 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-native/atoms": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@trezor/styles": "workspace:*",
         "@trezor/theme": "workspace:*",
         "jotai": "1.9.1",
         "react": "18.2.0",
         "react-native": "0.75.2",
-        "react-native-reanimated": "3.15.0"
+        "react-native-reanimated": "3.16.1"
     }
 }
diff --git a/suite-native/alerts/src/alertsAtoms.ts b/suite-native/alerts/src/alertsAtoms.ts
index ec4537c1174..c2d1fdcb516 100644
--- a/suite-native/alerts/src/alertsAtoms.ts
+++ b/suite-native/alerts/src/alertsAtoms.ts
@@ -2,7 +2,7 @@ import { ReactNode } from 'react';
 
 import { atom } from 'jotai';
 
-import { IconName } from '@suite-common/icons-deprecated';
+import { IconName } from '@suite-native/icons';
 import { ButtonAccessory, ButtonColorScheme, PictogramVariant } from '@suite-native/atoms';
 import { NativeSpacing } from '@trezor/theme';
 
diff --git a/suite-native/alerts/src/components/AlertSheet.tsx b/suite-native/alerts/src/components/AlertSheet.tsx
index 493e4ae8646..3a987a8363a 100644
--- a/suite-native/alerts/src/components/AlertSheet.tsx
+++ b/suite-native/alerts/src/components/AlertSheet.tsx
@@ -29,7 +29,7 @@ const alertSheetContainerStyle = prepareNativeStyle(utils => ({
     paddingVertical: utils.spacings.sp32,
     marginBottom: utils.spacings.sp32,
     marginHorizontal: utils.spacings.sp8,
-    borderRadius: utils.borders.radii.medium,
+    borderRadius: utils.borders.radii.r16,
     ...utils.boxShadows.small,
 }));
 
diff --git a/suite-native/alerts/tsconfig.json b/suite-native/alerts/tsconfig.json
index 8f0db7b68fa..58c7fb0b0ab 100644
--- a/suite-native/alerts/tsconfig.json
+++ b/suite-native/alerts/tsconfig.json
@@ -2,10 +2,8 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         { "path": "../atoms" },
+        { "path": "../icons" },
         { "path": "../../packages/styles" },
         { "path": "../../packages/theme" }
     ]
diff --git a/suite-native/analytics/package.json b/suite-native/analytics/package.json
index 94be7d74d94..4f4a5e5b47e 100644
--- a/suite-native/analytics/package.json
+++ b/suite-native/analytics/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-native/analytics/src/constants.ts b/suite-native/analytics/src/constants.ts
index 952442a1f1f..964e2c29506 100644
--- a/suite-native/analytics/src/constants.ts
+++ b/suite-native/analytics/src/constants.ts
@@ -48,4 +48,5 @@ export enum EventType {
     SendFeeLevelChanged = 'send/fee_level_changed',
     SendTransactionDispatched = 'send/transaction_dispatched',
     SendFlowExited = 'send/flow_exited',
+    DeviceSettingsPinProtectionChange = 'device_settings/pin_protection_change',
 }
diff --git a/suite-native/analytics/src/events.ts b/suite-native/analytics/src/events.ts
index 12aa8c0cf1f..faeeedbdc3c 100644
--- a/suite-native/analytics/src/events.ts
+++ b/suite-native/analytics/src/events.ts
@@ -159,7 +159,7 @@ export type SuiteNativeAnalyticsEvent =
                   | 'syncCoinsButton'
                   | 'educationLink'
                   | 'eshopLink'
-                  | 'deviceInfo';
+                  | 'deviceSettings';
           };
       }
     | {
@@ -266,6 +266,7 @@ export type SuiteNativeAnalyticsEvent =
               symbol: NetworkSymbol;
               outputsCount: number;
               selectedFee: FeeLevelLabel;
+              wasAppLeftDuringReview: boolean;
               tokenSymbols?: TokenSymbol[];
               tokenAddresses?: TokenAddress[];
               hasEthereumData?: boolean;
@@ -303,4 +304,10 @@ export type SuiteNativeAnalyticsEvent =
           payload: {
               step: AnalyticsSendFlowStep;
           };
+      }
+    | {
+          type: EventType.DeviceSettingsPinProtectionChange;
+          payload: {
+              action: 'enable' | 'change' | 'disable';
+          };
       };
diff --git a/suite-native/app/.env.preview b/suite-native/app/.env.preview
new file mode 100644
index 00000000000..d2479a3b6ff
--- /dev/null
+++ b/suite-native/app/.env.preview
@@ -0,0 +1,2 @@
+EXPO_PUBLIC_ENVIRONMENT=preview
+EXPO_PUBLIC_CODESIGN_BUILD=false
diff --git a/suite-native/app/.fingerprintignore b/suite-native/app/.fingerprintignore
new file mode 100644
index 00000000000..ed463428a53
--- /dev/null
+++ b/suite-native/app/.fingerprintignore
@@ -0,0 +1,3 @@
+ios/**/*
+
+!ios/Podfile.lock
diff --git a/suite-native/app/README.md b/suite-native/app/README.md
index 6832b48a5a5..0507d0e4a39 100644
--- a/suite-native/app/README.md
+++ b/suite-native/app/README.md
@@ -69,6 +69,10 @@ You can override ENV variables locally using `.env.development.local` (or `.env.
 
 > You can use `EXPO_PUBLIC_IS_ANALYTICS_LOGGER_ENABLED=true` in `.env.development.local` to debug analytics locally.
 
+## Native changes - bumping runtimeVersion
+
+Whenever you do a change in a native code (updating native dependency and so on), you have to bump `runtimeVersion` in `app.config.ts` file manually so EAS knows that it has to prepare new development build. See [Runtime Versions Expo Docs](https://docs.expo.dev/distribution/runtime-versions/). Hopefully it's just a temporary situation until [fingerprint policy](https://docs.expo.dev/eas-update/runtime-versions/#fingerprint-runtime-version-policy) is finalized. Fingerprint policy is not working well with development builds yet, waiting for SDK 52.
+
 ## Troubleshooting
 
 1. For any issues with the build, try to clean the project and rebuild it:
diff --git a/suite-native/app/app.config.ts b/suite-native/app/app.config.ts
index 2af7e4ae253..57cc47ca091 100644
--- a/suite-native/app/app.config.ts
+++ b/suite-native/app/app.config.ts
@@ -1,22 +1,23 @@
-/* eslint-disable no-console */
 /* eslint-disable import/no-default-export */
 /* eslint-disable import/no-anonymous-default-export */
 import { ExpoConfig, ConfigContext } from 'expo/config';
 
 import { suiteNativeVersion } from './package.json';
 
-type BuildType = 'debug' | 'develop' | 'production';
+type BuildType = 'debug' | 'preview' | 'develop' | 'production';
 
 type ExpoPlugins = ExpoConfig['plugins'];
 
 const bundleIdentifiers = {
     debug: 'io.trezor.suite.debug',
+    preview: 'io.trezor.suite.preview',
     develop: 'io.trezor.suite.develop',
     production: 'io.trezor.suite',
 } as const satisfies Record<BuildType, string>;
 
 const appIconsIos = {
     debug: './assets/debug/appIcon.png',
+    preview: './assets/preview/appIcon.png',
     develop: './assets/develop/appIcon.png',
     production: './assets/production/appIcon.png',
 } as const satisfies Record<BuildType, string>;
@@ -25,6 +26,9 @@ const appIconsAndroid = {
     debug: {
         backgroundColor: '#2587A5',
     },
+    preview: {
+        backgroundColor: '#E59D17',
+    },
     develop: {
         backgroundColor: '#900B0B',
     },
@@ -35,33 +39,33 @@ const appIconsAndroid = {
 
 const appNames = {
     debug: 'Trezor Suite Lite Debug',
+    preview: 'Trezor Suite Lite Preview',
     develop: 'Trezor Suite Lite Develop',
     production: 'Trezor Suite Lite',
 } as const satisfies Record<BuildType, string>;
 
 const appSlugs = {
     debug: 'trezor-suite-debug',
+    preview: 'trezor-suite-preview',
     develop: 'trezor-suite-develop',
     production: 'trezor-suite',
 } as const satisfies Record<BuildType, string>;
 
+const appOwners = {
+    debug: 'trezorcompany',
+    preview: 'trezorcompany-develop',
+    develop: 'trezorcompany',
+    production: 'trezorcompany',
+} as const satisfies Record<BuildType, string>;
+
 const projectIds = {
     develop: '3e4ea82b-6c9f-4cd3-8975-54bddda3ec2d',
+    preview: '15998f8a-e75c-4b60-959d-6f68e5ff4936',
     production: 'b9bbf16c-3d44-4d58-8f0c-ba9e6265276a',
     debug: '',
 } as const satisfies Record<BuildType, string>;
 
 const buildType = (process.env.EXPO_PUBLIC_ENVIRONMENT as BuildType) ?? 'debug';
-const isCI = process.env.CI == 'true' || process.env.CI == '1';
-
-if (isCI) {
-    if (!process.env.EXPO_PUBLIC_ENVIRONMENT) {
-        throw new Error('Missing EXPO_PUBLIC_ENVIRONMENT env variable');
-    }
-    if (!process.env.SENTRY_AUTH_TOKEN && buildType !== 'debug') {
-        throw new Error('Missing SENTRY_AUTH_TOKEN env variable');
-    }
-}
 
 const getPlugins = (): ExpoPlugins => {
     const plugins = [
@@ -71,6 +75,7 @@ const getPlugins = (): ExpoPlugins => {
                 fonts: [
                     '../../packages/theme/fonts/TTSatoshi-Medium.otf',
                     '../../packages/theme/fonts/TTSatoshi-DemiBold.otf',
+                    `../../suite-common/icons/iconFontsMobile/TrezorSuiteIcons.ttf`,
                 ],
             },
         ],
@@ -128,7 +133,6 @@ const getPlugins = (): ExpoPlugins => {
                       '@sentry/react-native/expo',
                       {
                           url: 'https://sentry.io/',
-                          authToken: process.env.SENTRY_AUTH_TOKEN,
                           project: 'suite-native',
                           organization: 'satoshilabs',
                       },
@@ -152,8 +156,19 @@ export default ({ config }: ConfigContext): ExpoConfig => {
         name,
         scheme: buildType === 'production' ? undefined : 'trezorsuitelite',
         slug: appSlugs[buildType],
-        owner: 'trezorcompany',
+        owner: appOwners[buildType],
         version: suiteNativeVersion,
+        runtimeVersion: '10',
+        ...(buildType === 'production'
+            ? {}
+            : {
+                  updates: {
+                      url: `https://u.expo.dev/${projectId}`,
+                      requestHeaders: {
+                          'expo-channel-name': buildType,
+                      },
+                  },
+              }),
         orientation: 'portrait',
         splash: {
             image: './assets/splash_icon.png',
@@ -168,14 +183,20 @@ export default ({ config }: ConfigContext): ExpoConfig => {
                 monochromeImage: './assets/appIcon_android.png',
                 ...appIconAndroid,
             },
-            intentFilters:
-                buildType === 'production'
-                    ? []
-                    : [
-                          {
-                              action: 'VIEW',
-                              autoVerify: true,
-                              data: [
+            intentFilters: [
+                {
+                    action: 'VIEW',
+                    autoVerify: true,
+                    data:
+                        buildType === 'production'
+                            ? [
+                                  {
+                                      scheme: 'https',
+                                      host: 'connect.trezor.io',
+                                      pathPattern: '/9/deeplink/.*',
+                                  },
+                              ]
+                            : [
                                   {
                                       scheme: 'https',
                                       host: 'dev.suite.sldev.cz',
@@ -188,9 +209,9 @@ export default ({ config }: ConfigContext): ExpoConfig => {
                                       pathPattern: '/connect/.*/.*/deeplink/.*',
                                   },
                               ],
-                              category: ['BROWSABLE', 'DEFAULT'],
-                          },
-                      ],
+                    category: ['BROWSABLE', 'DEFAULT'],
+                },
+            ],
         },
         ios: {
             bundleIdentifier,
@@ -217,10 +238,14 @@ export default ({ config }: ConfigContext): ExpoConfig => {
                 },
                 UIRequiredDeviceCapabilities: ['armv7'],
             },
+            associatedDomains:
+                buildType === 'production'
+                    ? ['applinks:connect.trezor.io']
+                    : ['applinks:dev.suite.sldev.cz'],
         },
         plugins: getPlugins(),
         extra: {
-            commitHash: process.env.EAS_BUILD_GIT_COMMIT_HASH || '',
+            commitHash: process.env.EAS_BUILD_GIT_COMMIT_HASH || process.env.COMMIT_HASH || '',
             eas: {
                 projectId,
             },
diff --git a/suite-native/app/assets/staging/appIcon.png b/suite-native/app/assets/preview/appIcon.png
similarity index 100%
rename from suite-native/app/assets/staging/appIcon.png
rename to suite-native/app/assets/preview/appIcon.png
diff --git a/suite-native/app/e2e/README.md b/suite-native/app/e2e/README.md
index 1a73a5a68a6..2bee5dc942f 100644
--- a/suite-native/app/e2e/README.md
+++ b/suite-native/app/e2e/README.md
@@ -46,6 +46,10 @@ To test the app in the release mode, you need to build the app with the release
 
 Some tests use Trezor-user-env to simulate the Trezor device. To make these tests work locally, make sure that the trezor-user-env is up and running. To do so, follow the [trezor-user-env documentation](https://github.com/trezor/trezor-user-env/blob/master/README.md).
 
+## Mocking
+
+To make the tests as much standalone and independent on third party services as possible, we are mocking some parts of the app. The mocks are located in the `/mocks` folder.
+
 ## GitHub CI
 
 Android E2E test run on GitHub CI on every PR that is labeled with a `mobile-app` tag. The workflow is described in the [.github/workflows/native-test-e2e-android.yml](../../../.github/workflows/native-test-e2e-android.yml) file.
diff --git a/suite-native/app/e2e/fixtures/connect/getAccountInfo.ts b/suite-native/app/e2e/fixtures/connect/getAccountInfo.ts
new file mode 100644
index 00000000000..d9ebccf4e38
--- /dev/null
+++ b/suite-native/app/e2e/fixtures/connect/getAccountInfo.ts
@@ -0,0 +1,399 @@
+export const getAccountInfoMockedResponses = {
+    xrp: {
+        r9TCDt3HmszcsnPrUrnvpynvLgaGQom9x3: {
+            id: 26,
+            success: true,
+            payload: {
+                descriptor: 'r9TCDt3HmszcsnPrUrnvpynvLgaGQom9x3',
+                balance: '18746106',
+                availableBalance: '343434348746106',
+                empty: false,
+                history: {
+                    total: -1,
+                    unconfirmed: 0,
+                    transactions: [
+                        {
+                            type: 'recv',
+                            txid: '16703220D42FB5ACFB2CD1553D473A6FD170836EB596795550182C85F9ED67B4',
+                            amount: '999989',
+                            fee: '12',
+                            blockTime: 1702980372,
+                            blockHeight: 84694628,
+                            blockHash:
+                                '16703220D42FB5ACFB2CD1553D473A6FD170836EB596795550182C85F9ED67B4',
+                            targets: [
+                                {
+                                    addresses: ['r9TCDt3HmszcsnPrUrnvpynvLgaGQom9x3'],
+                                    isAddress: true,
+                                    amount: '999989',
+                                    n: 0,
+                                },
+                            ],
+                            tokens: [],
+                            internalTransfers: [],
+                            details: {
+                                vin: [],
+                                vout: [],
+                                size: 0,
+                                totalInput: '0',
+                                totalOutput: '0',
+                            },
+                        },
+                        {
+                            type: 'sent',
+                            txid: '32A8B205B6B3D4C88B75C1585FFE32EA62E38F67CAE9BE7778B6F543ACEB3E78',
+                            amount: '1000000',
+                            fee: '12',
+                            blockTime: 1702980302,
+                            blockHeight: 84694610,
+                            blockHash:
+                                '32A8B205B6B3D4C88B75C1585FFE32EA62E38F67CAE9BE7778B6F543ACEB3E78',
+                            targets: [
+                                {
+                                    addresses: ['rw62XQr4hLZjiuiq46CWiA6FretVuyZaoG'],
+                                    isAddress: true,
+                                    amount: '1000000',
+                                    n: 0,
+                                },
+                            ],
+                            tokens: [],
+                            internalTransfers: [],
+                            details: {
+                                vin: [],
+                                vout: [],
+                                size: 0,
+                                totalInput: '0',
+                                totalOutput: '0',
+                            },
+                        },
+                        {
+                            type: 'recv',
+                            txid: '272F7A5993908EF025A01AB4FEC934EB9AE04911C968D5E5BB6B842ACF0DAACA',
+                            amount: '5248',
+                            fee: '12',
+                            blockTime: 1690884741,
+                            blockHeight: 81541871,
+                            blockHash:
+                                '272F7A5993908EF025A01AB4FEC934EB9AE04911C968D5E5BB6B842ACF0DAACA',
+                            targets: [
+                                {
+                                    addresses: ['r9TCDt3HmszcsnPrUrnvpynvLgaGQom9x3'],
+                                    isAddress: true,
+                                    amount: '5248',
+                                    n: 0,
+                                },
+                            ],
+                            tokens: [],
+                            internalTransfers: [],
+                            details: {
+                                vin: [],
+                                vout: [],
+                                size: 0,
+                                totalInput: '0',
+                                totalOutput: '0',
+                            },
+                        },
+                        {
+                            type: 'sent',
+                            txid: 'BDD71EE034AB7B900BAF0D18115E0C4DB6C753CB5DA70587148AE3A008513909',
+                            amount: '5260',
+                            fee: '12',
+                            blockTime: 1690884611,
+                            blockHeight: 81541837,
+                            blockHash:
+                                'BDD71EE034AB7B900BAF0D18115E0C4DB6C753CB5DA70587148AE3A008513909',
+                            targets: [
+                                {
+                                    addresses: ['rnp3Ysasm5DRFbg2nekLkGfCFL9UfkGKDf'],
+                                    isAddress: true,
+                                    amount: '5260',
+                                    n: 0,
+                                },
+                            ],
+                            tokens: [],
+                            internalTransfers: [],
+                            details: {
+                                vin: [],
+                                vout: [],
+                                size: 0,
+                                totalInput: '0',
+                                totalOutput: '0',
+                            },
+                        },
+                        {
+                            type: 'sent',
+                            txid: 'A8D9F385CB3DDCF39545A7DC610E18A510F6B19716CCE69BC8105C9C58C71192',
+                            amount: '8100000',
+                            fee: '12',
+                            blockTime: 1688971822,
+                            blockHeight: 81042493,
+                            blockHash:
+                                'A8D9F385CB3DDCF39545A7DC610E18A510F6B19716CCE69BC8105C9C58C71192',
+                            targets: [
+                                {
+                                    addresses: ['rKKbNYZRqwPgZYkFWvqNUFBuscEyiFyCE'],
+                                    isAddress: true,
+                                    amount: '8100000',
+                                    n: 0,
+                                },
+                            ],
+                            tokens: [],
+                            internalTransfers: [],
+                            details: {
+                                vin: [],
+                                vout: [],
+                                size: 0,
+                                totalInput: '0',
+                                totalOutput: '0',
+                            },
+                        },
+                        {
+                            type: 'recv',
+                            txid: '5E930BC11C345A720675CEBD06EB142D434DC96F9E975751AF5CFC2434205051',
+                            amount: '10037222',
+                            fee: '300000',
+                            blockTime: 1683270151,
+                            blockHeight: 79563186,
+                            blockHash:
+                                '5E930BC11C345A720675CEBD06EB142D434DC96F9E975751AF5CFC2434205051',
+                            targets: [
+                                {
+                                    addresses: ['r9TCDt3HmszcsnPrUrnvpynvLgaGQom9x3'],
+                                    isAddress: true,
+                                    amount: '10037222',
+                                    n: 0,
+                                },
+                            ],
+                            tokens: [],
+                            internalTransfers: [],
+                            details: {
+                                vin: [],
+                                vout: [],
+                                size: 0,
+                                totalInput: '0',
+                                totalOutput: '0',
+                            },
+                        },
+                        {
+                            type: 'sent',
+                            txid: 'C5AA574FEFCCBFE1346591FF7105C7E0CE2842CB8B1B29F14FED1CBDF6692507',
+                            amount: '7400000',
+                            fee: '12',
+                            blockTime: 1681478740,
+                            blockHeight: 79098686,
+                            blockHash:
+                                'C5AA574FEFCCBFE1346591FF7105C7E0CE2842CB8B1B29F14FED1CBDF6692507',
+                            targets: [
+                                {
+                                    addresses: ['rKKbNYZRqwPgZYkFWvqNUFBuscEyiFyCE'],
+                                    isAddress: true,
+                                    amount: '7400000',
+                                    n: 0,
+                                },
+                            ],
+                            tokens: [],
+                            internalTransfers: [],
+                            details: {
+                                vin: [],
+                                vout: [],
+                                size: 0,
+                                totalInput: '0',
+                                totalOutput: '0',
+                            },
+                        },
+                        {
+                            type: 'recv',
+                            txid: '9E50E46FF87C6C724C0EC3FFE9A1210173E68CD041AC2A0189076CB07D1D3B08',
+                            amount: '6682802',
+                            fee: '300000',
+                            blockTime: 1680675650,
+                            blockHeight: 78891212,
+                            blockHash:
+                                '9E50E46FF87C6C724C0EC3FFE9A1210173E68CD041AC2A0189076CB07D1D3B08',
+                            targets: [
+                                {
+                                    addresses: ['r9TCDt3HmszcsnPrUrnvpynvLgaGQom9x3'],
+                                    isAddress: true,
+                                    amount: '6682802',
+                                    n: 0,
+                                },
+                            ],
+                            tokens: [],
+                            internalTransfers: [],
+                            details: {
+                                vin: [],
+                                vout: [],
+                                size: 0,
+                                totalInput: '0',
+                                totalOutput: '0',
+                            },
+                        },
+                        {
+                            type: 'sent',
+                            txid: 'A0040ED514AEFC01C43C1D1DC38E09F6ADFD188DA3A3ECAEED844184AEB21909',
+                            amount: '8400000',
+                            fee: '12',
+                            blockTime: 1678792680,
+                            blockHeight: 78409260,
+                            blockHash:
+                                'A0040ED514AEFC01C43C1D1DC38E09F6ADFD188DA3A3ECAEED844184AEB21909',
+                            targets: [
+                                {
+                                    addresses: ['rKKbNYZRqwPgZYkFWvqNUFBuscEyiFyCE'],
+                                    isAddress: true,
+                                    amount: '8400000',
+                                    n: 0,
+                                },
+                            ],
+                            tokens: [],
+                            internalTransfers: [],
+                            details: {
+                                vin: [],
+                                vout: [],
+                                size: 0,
+                                totalInput: '0',
+                                totalOutput: '0',
+                            },
+                        },
+                        {
+                            type: 'recv',
+                            txid: '2ED9CFC0457842DD8F23C3554A7B0A6FE0270DF08BE5C67ED901C8D6BF9144D7',
+                            amount: '7285344',
+                            fee: '300000',
+                            blockTime: 1677679962,
+                            blockHeight: 78125378,
+                            blockHash:
+                                '2ED9CFC0457842DD8F23C3554A7B0A6FE0270DF08BE5C67ED901C8D6BF9144D7',
+                            targets: [
+                                {
+                                    addresses: ['r9TCDt3HmszcsnPrUrnvpynvLgaGQom9x3'],
+                                    isAddress: true,
+                                    amount: '7285344',
+                                    n: 0,
+                                },
+                            ],
+                            tokens: [],
+                            internalTransfers: [],
+                            details: {
+                                vin: [],
+                                vout: [],
+                                size: 0,
+                                totalInput: '0',
+                                totalOutput: '0',
+                            },
+                        },
+                        {
+                            type: 'sent',
+                            txid: '3F4CC4990D2240BB5A59CB2EDA03B0937C4E65A82F5B8AEDA21F092E0D54219F',
+                            amount: '8000000',
+                            fee: '12',
+                            blockTime: 1675264280,
+                            blockHeight: 77510183,
+                            blockHash:
+                                '3F4CC4990D2240BB5A59CB2EDA03B0937C4E65A82F5B8AEDA21F092E0D54219F',
+                            targets: [
+                                {
+                                    addresses: ['rKKbNYZRqwPgZYkFWvqNUFBuscEyiFyCE'],
+                                    isAddress: true,
+                                    amount: '8000000',
+                                    n: 0,
+                                },
+                            ],
+                            tokens: [],
+                            internalTransfers: [],
+                            details: {
+                                vin: [],
+                                vout: [],
+                                size: 0,
+                                totalInput: '0',
+                                totalOutput: '0',
+                            },
+                        },
+                        {
+                            type: 'sent',
+                            txid: 'B829BEBB6A9E705FC130E546F2994BFEC945046B2EAEFA6470D335EC37A37481',
+                            amount: '6190000',
+                            fee: '12',
+                            blockTime: 1672924140,
+                            blockHeight: 76912409,
+                            blockHash:
+                                'B829BEBB6A9E705FC130E546F2994BFEC945046B2EAEFA6470D335EC37A37481',
+                            targets: [
+                                {
+                                    addresses: ['rKKbNYZRqwPgZYkFWvqNUFBuscEyiFyCE'],
+                                    isAddress: true,
+                                    amount: '6190000',
+                                    n: 0,
+                                },
+                            ],
+                            tokens: [],
+                            internalTransfers: [],
+                            details: {
+                                vin: [],
+                                vout: [],
+                                size: 0,
+                                totalInput: '0',
+                                totalOutput: '0',
+                            },
+                        },
+                        {
+                            type: 'recv',
+                            txid: '6F56CC52F278859927D50525603F2F7AA9A3CD63BA359255F02E6DBE00A01E71',
+                            amount: '5612406',
+                            fee: '300000',
+                            blockTime: 1672923931,
+                            blockHeight: 76912357,
+                            blockHash:
+                                '6F56CC52F278859927D50525603F2F7AA9A3CD63BA359255F02E6DBE00A01E71',
+                            targets: [
+                                {
+                                    addresses: ['r9TCDt3HmszcsnPrUrnvpynvLgaGQom9x3'],
+                                    isAddress: true,
+                                    amount: '5612406',
+                                    n: 0,
+                                },
+                            ],
+                            tokens: [],
+                            internalTransfers: [],
+                            details: {
+                                vin: [],
+                                vout: [],
+                                size: 0,
+                                totalInput: '0',
+                                totalOutput: '0',
+                            },
+                        },
+                        {
+                            type: 'recv',
+                            txid: '9301B0F27C6DAC6DFA2BDCF9DB959FB4534466F71F5F92510903CA9E6853E10B',
+                            amount: '27218439',
+                            fee: '12',
+                            blockTime: 1656677000,
+                            blockHeight: 72710665,
+                            blockHash:
+                                '9301B0F27C6DAC6DFA2BDCF9DB959FB4534466F71F5F92510903CA9E6853E10B',
+                            targets: [
+                                {
+                                    addresses: ['r9TCDt3HmszcsnPrUrnvpynvLgaGQom9x3'],
+                                    isAddress: true,
+                                    amount: '27218439',
+                                    n: 0,
+                                },
+                            ],
+                            tokens: [],
+                            internalTransfers: [],
+                            details: {
+                                vin: [],
+                                vout: [],
+                                size: 0,
+                                totalInput: '0',
+                                totalOutput: '0',
+                            },
+                        },
+                    ],
+                },
+                misc: { sequence: 72710672, reserve: '10000000' },
+            },
+        },
+    },
+};
diff --git a/suite-native/app/e2e/jest.config.js b/suite-native/app/e2e/jest.config.js
index df22edf3a49..e06b28d5f44 100644
--- a/suite-native/app/e2e/jest.config.js
+++ b/suite-native/app/e2e/jest.config.js
@@ -11,4 +11,5 @@ module.exports = {
     testEnvironment: 'detox/runners/jest/testEnvironment',
     verbose: true,
     maxWorkers: 1,
+    setupFilesAfterEnv: ['<rootDir>/e2e/jest.setup.ts'],
 };
diff --git a/suite-native/app/e2e/jest.setup.ts b/suite-native/app/e2e/jest.setup.ts
new file mode 100644
index 00000000000..527a3aaa8df
--- /dev/null
+++ b/suite-native/app/e2e/jest.setup.ts
@@ -0,0 +1 @@
+jest.retryTimes(2, { logErrorsBeforeRetry: true });
diff --git a/suite-native/app/e2e/mocks/trezor-connect.js b/suite-native/app/e2e/mocks/trezor-connect.js
new file mode 100644
index 00000000000..9d08919139c
--- /dev/null
+++ b/suite-native/app/e2e/mocks/trezor-connect.js
@@ -0,0 +1,19 @@
+import TrezorConnect from '../../../../packages/connect/src/index';
+import { getAccountInfoMockedResponses } from '../fixtures/connect/getAccountInfo';
+
+const originalGetAccountInfo = TrezorConnect.getAccountInfo;
+
+TrezorConnect.getAccountInfo = params => {
+    const { coin, descriptor } = params;
+
+    // If there is mocked response for this specific coin and descriptor skip the execution.
+    const mockedResponse = getAccountInfoMockedResponses[coin]?.[descriptor];
+    if (mockedResponse) return mockedResponse;
+
+    return originalGetAccountInfo(params);
+};
+
+// need to disable this rule to mimic export pattern of original index file.
+// eslint-disable-next-line import/no-default-export
+export default TrezorConnect;
+export * from '../../../../packages/connect/src/exports';
diff --git a/suite-native/app/e2e/pageObjects/accountDetailActions.ts b/suite-native/app/e2e/pageObjects/accountDetailActions.ts
index 75cf7d0ebe1..9e2de003803 100644
--- a/suite-native/app/e2e/pageObjects/accountDetailActions.ts
+++ b/suite-native/app/e2e/pageObjects/accountDetailActions.ts
@@ -1,11 +1,21 @@
 import { expect as detoxExpect } from 'detox';
 
 class AccountDetailActions {
+    async waitForScreen() {
+        await waitFor(element(by.id('@screen/AccountDetail')))
+            .toBeVisible()
+            .withTimeout(5000);
+    }
+
     async openSettings() {
         await element(by.id('@account-detail/settings-button')).tap();
 
         await detoxExpect(element(by.id('@screen/AccountSettings'))).toBeVisible();
     }
+
+    async openSend() {
+        await element(by.id('@account-detail/send-button')).tap();
+    }
 }
 
 export const onAccountDetail = new AccountDetailActions();
diff --git a/suite-native/app/e2e/pageObjects/alertSheetActions.ts b/suite-native/app/e2e/pageObjects/alertSheetActions.ts
new file mode 100644
index 00000000000..b7ddc79050e
--- /dev/null
+++ b/suite-native/app/e2e/pageObjects/alertSheetActions.ts
@@ -0,0 +1,17 @@
+class AlertSheetActions {
+    async tapPrimaryButton() {
+        const primaryButtonElement = element(by.id('@alert-sheet/primary-button'));
+
+        await waitFor(primaryButtonElement).toBeVisible().withTimeout(10000);
+        await primaryButtonElement.tap();
+    }
+
+    async tapSecondaryButton() {
+        const secondaryButtonElement = element(by.id('@alert-sheet/secondary-button'));
+
+        await waitFor(secondaryButtonElement).toBeVisible().withTimeout(10000);
+        await secondaryButtonElement.tap();
+    }
+}
+
+export const onAlertSheet = new AlertSheetActions();
diff --git a/suite-native/app/e2e/pageObjects/bottomSheetActions.ts b/suite-native/app/e2e/pageObjects/bottomSheetActions.ts
new file mode 100644
index 00000000000..d64fe0054f8
--- /dev/null
+++ b/suite-native/app/e2e/pageObjects/bottomSheetActions.ts
@@ -0,0 +1,10 @@
+class BottomSheetActions {
+    async skipViewOnlyMode() {
+        const skipViewOnlyModeButton = element(by.id('skip-view-only-mode'));
+
+        await waitFor(skipViewOnlyModeButton).toBeVisible().withTimeout(10000);
+        await skipViewOnlyModeButton.tap();
+    }
+}
+
+export const onBottomSheet = new BottomSheetActions();
diff --git a/suite-native/app/e2e/pageObjects/coinEnablingActions.ts b/suite-native/app/e2e/pageObjects/coinEnablingActions.ts
index b6d0ced7adb..4f6c6a6fccf 100644
--- a/suite-native/app/e2e/pageObjects/coinEnablingActions.ts
+++ b/suite-native/app/e2e/pageObjects/coinEnablingActions.ts
@@ -1,18 +1,19 @@
+import { scrollUntilVisible } from '../utils';
+
 class OnCoinEnablingInit {
-    async waitForBtcToBeVisible() {
-        await waitFor(element(by.id('@coin-enabling/toggle-btc')))
+    async waitForScreen() {
+        await waitFor(element(by.id('@screen/CoinEnablingInit')))
             .toBeVisible()
-            .withTimeout(3000);
+            .withTimeout(10000);
     }
+
     async enableNetwork(networkSymbol: string) {
-        await element(by.id(`@coin-enabling/toggle-${networkSymbol}`)).tap();
+        const networkIdMatcher = by.id(`@coin-enabling/toggle-${networkSymbol}`);
+        await scrollUntilVisible(networkIdMatcher);
+        await element(networkIdMatcher).tap();
     }
 
-    async save() {
-        await waitFor(element(by.id('@coin-enabling/button-save')))
-            .toBeVisible()
-            .withTimeout(3000);
-
+    async clickOnConfirmButton() {
         await element(by.id('@coin-enabling/button-save')).tap();
     }
 }
diff --git a/suite-native/app/e2e/pageObjects/connectingDevice.ts b/suite-native/app/e2e/pageObjects/connectingDevice.ts
new file mode 100644
index 00000000000..4a39f02f0c5
--- /dev/null
+++ b/suite-native/app/e2e/pageObjects/connectingDevice.ts
@@ -0,0 +1,9 @@
+class ConnectingDeviceActions {
+    async waitForScreen() {
+        await waitFor(element(by.id('@screen/ConnectingDevice')))
+            .toBeVisible()
+            .withTimeout(10000);
+    }
+}
+
+export const onConnectingDevice = new ConnectingDeviceActions();
diff --git a/suite-native/app/e2e/pageObjects/deviceManagerActions.ts b/suite-native/app/e2e/pageObjects/deviceManagerActions.ts
new file mode 100644
index 00000000000..f43dd42bc94
--- /dev/null
+++ b/suite-native/app/e2e/pageObjects/deviceManagerActions.ts
@@ -0,0 +1,17 @@
+class DeviceManagerActions {
+    async tapDeviceSwitch() {
+        const deviceSwitch = element(by.id('@device-manager/device-switch'));
+
+        await waitFor(deviceSwitch).toBeVisible().withTimeout(10000);
+        await deviceSwitch.tap();
+    }
+
+    async tapDeviceSettingsButton() {
+        const deviceSettingsButton = element(by.id('@device-manager/device-settings-button'));
+
+        await waitFor(deviceSettingsButton).toBeVisible().withTimeout(10000);
+        await deviceSettingsButton.tap();
+    }
+}
+
+export const onDeviceManager = new DeviceManagerActions();
diff --git a/suite-native/app/e2e/pageObjects/deviceSettingsActions.ts b/suite-native/app/e2e/pageObjects/deviceSettingsActions.ts
new file mode 100644
index 00000000000..1225a936e44
--- /dev/null
+++ b/suite-native/app/e2e/pageObjects/deviceSettingsActions.ts
@@ -0,0 +1,30 @@
+class DeviceSettingsActions {
+    async waitForScreen() {
+        await waitFor(element(by.id('@screen/DeviceSettings')))
+            .toBeVisible()
+            .withTimeout(10000);
+    }
+
+    async tapEnablePinProtectionButton() {
+        const enablePinProtectionButton = element(by.id('@device-pin-protection/enable-button'));
+
+        await waitFor(enablePinProtectionButton).toBeVisible().withTimeout(10000);
+        await enablePinProtectionButton.tap();
+    }
+
+    async tapChangePinProtectionButton() {
+        const changePinProtectionButton = element(by.id('@device-pin-protection/change-button'));
+
+        await waitFor(changePinProtectionButton).toBeVisible().withTimeout(10000);
+        await changePinProtectionButton.tap();
+    }
+
+    async tapDisablePinProtectionButton() {
+        const disablePinProtectionButton = element(by.id('@device-pin-protection/disable-button'));
+
+        await waitFor(disablePinProtectionButton).toBeVisible().withTimeout(10000);
+        await disablePinProtectionButton.tap();
+    }
+}
+
+export const onDeviceSettings = new DeviceSettingsActions();
diff --git a/suite-native/app/e2e/pageObjects/homeActions.ts b/suite-native/app/e2e/pageObjects/homeActions.ts
index 6318b436765..d5259cfc70f 100644
--- a/suite-native/app/e2e/pageObjects/homeActions.ts
+++ b/suite-native/app/e2e/pageObjects/homeActions.ts
@@ -1,6 +1,12 @@
 import { expect as detoxExpect } from 'detox';
 
 class HomeActions {
+    async waitForScreen() {
+        await waitFor(element(by.id('@screen/Home')))
+            .toBeVisible()
+            .withTimeout(10000);
+    }
+
     async tapSyncCoinsButton() {
         await element(by.id('@screen/mainScrollView')).scrollTo('bottom');
         await element(by.id('@home/portfolio/sync-coins-button')).tap();
diff --git a/suite-native/app/e2e/pageObjects/myAssetsActions.ts b/suite-native/app/e2e/pageObjects/myAssetsActions.ts
index f91a54f58c7..bdf568ddb93 100644
--- a/suite-native/app/e2e/pageObjects/myAssetsActions.ts
+++ b/suite-native/app/e2e/pageObjects/myAssetsActions.ts
@@ -1,6 +1,12 @@
 import { expect as detoxExpect } from 'detox';
 
 class MyAssetsActions {
+    async waitForScreen() {
+        await waitFor(element(by.id('@screen/MyAssets')))
+            .toBeVisible()
+            .withTimeout(5000);
+    }
+
     async addAccount() {
         await element(by.id('@screen/mainScrollView')).scrollTo('top');
         await element(by.id('@myAssets/addAccountButton')).tap();
diff --git a/suite-native/app/e2e/pageObjects/send/sendAddressReviewActions.ts b/suite-native/app/e2e/pageObjects/send/sendAddressReviewActions.ts
new file mode 100644
index 00000000000..6cf72dbb34a
--- /dev/null
+++ b/suite-native/app/e2e/pageObjects/send/sendAddressReviewActions.ts
@@ -0,0 +1,10 @@
+import { expect as detoxExpect } from 'detox';
+
+class SendAddressReviewActions {
+    async nextStep() {
+        await detoxExpect(element(by.id('@screen/SendAddressReview'))).toBeVisible();
+        await element(by.id('@send/address-review-continue')).tap();
+    }
+}
+
+export const onSendAddressReview = new SendAddressReviewActions();
diff --git a/suite-native/app/e2e/pageObjects/send/sendFeesActions.ts b/suite-native/app/e2e/pageObjects/send/sendFeesActions.ts
new file mode 100644
index 00000000000..0588ee8aec9
--- /dev/null
+++ b/suite-native/app/e2e/pageObjects/send/sendFeesActions.ts
@@ -0,0 +1,35 @@
+import { expect as detoxExpect } from 'detox';
+
+import { FeeLevelLabel } from '@suite-common/wallet-types';
+
+class SendFeesActions {
+    async waitForScreen() {
+        await waitFor(element(by.id('@screen/SendFees')))
+            .toBeVisible()
+            .withTimeout(5000);
+    }
+
+    async selectFee(feeType: FeeLevelLabel) {
+        await detoxExpect(element(by.id('@screen/SendFees'))).toBeVisible();
+
+        switch (feeType) {
+            case 'low':
+                await element(by.id('@send/fees-level-low')).tap();
+                break;
+            case 'normal':
+                await element(by.id('@send/fees-level-normal')).tap();
+                break;
+            case 'high':
+                await element(by.id('@send/fees-level-high')).tap();
+                break;
+            default:
+                throw new Error(`SendFeesActions.selectFee(): Unsupported fee type: ${feeType}`);
+        }
+    }
+
+    async submitFee() {
+        await element(by.id('@send/fees-submit-button')).tap();
+    }
+}
+
+export const onSendFees = new SendFeesActions();
diff --git a/suite-native/app/e2e/pageObjects/send/sendOutputsFormActions.ts b/suite-native/app/e2e/pageObjects/send/sendOutputsFormActions.ts
new file mode 100644
index 00000000000..a9c08809c0b
--- /dev/null
+++ b/suite-native/app/e2e/pageObjects/send/sendOutputsFormActions.ts
@@ -0,0 +1,32 @@
+import { expect as detoxExpect } from 'detox';
+
+class SendOutputsFormActions {
+    async waitForScreen() {
+        await waitFor(element(by.id('@screen/SendOutputs'))).toBeVisible();
+    }
+
+    async fillForm(values: { address?: string; amount?: string }[]) {
+        await detoxExpect(element(by.id(`@screen/SendOutputs`))).toBeVisible();
+
+        for (const [index, value] of values.entries()) {
+            const { address, amount } = value;
+            if (address) {
+                await element(by.id(`outputs.${index}.address`)).typeText(address);
+            }
+            if (amount) {
+                await element(by.id(`outputs.${index}.amount`)).typeText(amount);
+            }
+        }
+    }
+
+    async clearForm() {
+        await element(by.id(/^outputs\.\d+\.address$/)).clearText();
+        await element(by.id(/^outputs\.\d+\.amount$/)).clearText();
+    }
+
+    async submitForm() {
+        await element(by.id('@send/form-submit-button')).tap();
+    }
+}
+
+export const onSendOutputsForm = new SendOutputsFormActions();
diff --git a/suite-native/app/e2e/pageObjects/send/sendOutputsReviewActions.ts b/suite-native/app/e2e/pageObjects/send/sendOutputsReviewActions.ts
new file mode 100644
index 00000000000..f4d77c257e8
--- /dev/null
+++ b/suite-native/app/e2e/pageObjects/send/sendOutputsReviewActions.ts
@@ -0,0 +1,36 @@
+import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
+
+const sendButton = element(by.id('@send/send-transaction-button'));
+
+class SendOutputsReviewActions {
+    async waitForScreen() {
+        await waitFor(element(by.id('@screen/SendOutputsReview')))
+            .toBeVisible()
+            .withTimeout(3000);
+    }
+
+    async confirmTransactionOutputs() {
+        let isReviewInProgress = true;
+        do {
+            await TrezorUserEnvLink.pressYes();
+
+            try {
+                await waitFor(sendButton).toBeVisible().withTimeout(3000);
+                isReviewInProgress = false;
+            } catch {
+                // continue loop, there are more outputs to review
+            }
+        } while (isReviewInProgress);
+    }
+
+    async clickSendTransaction() {
+        await waitFor(sendButton).toBeVisible().withTimeout(15000);
+        await sendButton.tap();
+
+        await waitFor(element(by.id('@screen/TransactionDetail')))
+            .toBeVisible()
+            .withTimeout(3000);
+    }
+}
+
+export const onSendOutputsReview = new SendOutputsReviewActions();
diff --git a/suite-native/app/e2e/tests/accountsImport.test.ts b/suite-native/app/e2e/tests/accountsImport.test.ts
deleted file mode 100644
index b3701a49837..00000000000
--- a/suite-native/app/e2e/tests/accountsImport.test.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import { appIsFullyLoaded, openApp, restartApp } from '../utils';
-import { xpubs } from '../fixtures/xpubs';
-import { onAccountImport } from '../pageObjects/accountImportActions';
-import { onMyAssets } from '../pageObjects/myAssetsActions';
-import { onOnboarding } from '../pageObjects/onboardingActions';
-import { onHome } from '../pageObjects/homeActions';
-import { onTabBar } from '../pageObjects/tabBarActions';
-
-describe('Import all possible accounts in watch only mode.', () => {
-    beforeAll(async () => {
-        await openApp({ newInstance: true });
-        await onOnboarding.finishOnboarding();
-    });
-
-    beforeEach(async () => {
-        await restartApp();
-        await appIsFullyLoaded();
-    });
-
-    it('Import BTC SegWit account', async () => {
-        await onHome.tapSyncCoinsButton();
-        await onAccountImport.importAccount({
-            networkSymbol: 'btc',
-            xpub: xpubs.btc.segwit,
-            accountName: 'BTC SegWit',
-        });
-    });
-
-    it('Import BTC Legacy SegWit account', async () => {
-        await onTabBar.navigateToMyAssets();
-        await onMyAssets.addAccount();
-        await onAccountImport.importAccount({
-            networkSymbol: 'btc',
-            xpub: xpubs.btc.legacySegwit,
-            accountName: 'BTC Legacy SegWit',
-        });
-    });
-
-    it('Import BTC Taproot account', async () => {
-        await onTabBar.navigateToMyAssets();
-        await onMyAssets.addAccount();
-        await onAccountImport.importAccount({
-            networkSymbol: 'btc',
-            xpub: xpubs.btc.taproot,
-            accountName: 'BTC Taproot',
-        });
-    });
-
-    it('Import BTC Legacy account', async () => {
-        await onTabBar.navigateToMyAssets();
-        await onMyAssets.addAccount();
-        await onAccountImport.importAccount({
-            networkSymbol: 'btc',
-            xpub: xpubs.btc.legacy,
-            accountName: 'BTC Legacy',
-        });
-    });
-
-    it('Import LTC account', async () => {
-        await onTabBar.navigateToMyAssets();
-        await onMyAssets.addAccount();
-        await onAccountImport.importAccount({
-            networkSymbol: 'ltc',
-            xpub: xpubs.ltc,
-            accountName: 'Litecoin SegWit',
-        });
-    });
-
-    it('Import Cardano account', async () => {
-        await onTabBar.navigateToMyAssets();
-        await onMyAssets.addAccount();
-        await onAccountImport.importAccount({
-            networkSymbol: 'ada',
-            xpub: xpubs.ada,
-            accountName: 'Cardano #1',
-        });
-    });
-
-    it('Import DOGE account', async () => {
-        await onTabBar.navigateToMyAssets();
-        await onMyAssets.addAccount();
-        await onAccountImport.importAccount({
-            networkSymbol: 'doge',
-            xpub: xpubs.doge,
-            accountName: 'Dogecoin #1',
-        });
-    });
-
-    it('Import ZCash account', async () => {
-        await onTabBar.navigateToMyAssets();
-        await onMyAssets.addAccount();
-        await onAccountImport.importAccount({
-            networkSymbol: 'zec',
-            xpub: xpubs.zec,
-            accountName: 'Zcash #1',
-        });
-    });
-
-    it('Import XRP account', async () => {
-        await onTabBar.navigateToMyAssets();
-        await onMyAssets.addAccount();
-        await onAccountImport.importAccount({
-            networkSymbol: 'xrp',
-            xpub: xpubs.xrp,
-            accountName: 'Ripple #1',
-        });
-    });
-
-    it('Import ETH account', async () => {
-        await onTabBar.navigateToMyAssets();
-        await onMyAssets.addAccount();
-        await onAccountImport.importAccount({
-            networkSymbol: 'eth',
-            xpub: xpubs.eth,
-            accountName: 'Ethereum #1',
-        });
-    });
-});
diff --git a/suite-native/app/e2e/tests/bitcoinAccountsImport.test.ts b/suite-native/app/e2e/tests/bitcoinAccountsImport.test.ts
new file mode 100644
index 00000000000..95b813af3b0
--- /dev/null
+++ b/suite-native/app/e2e/tests/bitcoinAccountsImport.test.ts
@@ -0,0 +1,50 @@
+import { openApp } from '../utils';
+import { xpubs } from '../fixtures/xpubs';
+import { onAccountImport } from '../pageObjects/accountImportActions';
+import { onMyAssets } from '../pageObjects/myAssetsActions';
+import { onOnboarding } from '../pageObjects/onboardingActions';
+import { onTabBar } from '../pageObjects/tabBarActions';
+
+describe('Import Bitcoin network accounts.', () => {
+    beforeAll(async () => {
+        await openApp({ newInstance: true });
+        await onOnboarding.finishOnboarding();
+        await onTabBar.navigateToMyAssets();
+    });
+
+    beforeEach(async () => {
+        await onMyAssets.addAccount();
+    });
+
+    it('Import BTC SegWit account', async () => {
+        await onAccountImport.importAccount({
+            networkSymbol: 'btc',
+            xpub: xpubs.btc.segwit,
+            accountName: 'BTC SegWit',
+        });
+    });
+
+    it('Import BTC Legacy SegWit account', async () => {
+        await onAccountImport.importAccount({
+            networkSymbol: 'btc',
+            xpub: xpubs.btc.legacySegwit,
+            accountName: 'BTC Legacy SegWit',
+        });
+    });
+
+    it('Import BTC Taproot account', async () => {
+        await onAccountImport.importAccount({
+            networkSymbol: 'btc',
+            xpub: xpubs.btc.taproot,
+            accountName: 'BTC Taproot',
+        });
+    });
+
+    it('Import BTC Legacy account', async () => {
+        await onAccountImport.importAccount({
+            networkSymbol: 'btc',
+            xpub: xpubs.btc.legacy,
+            accountName: 'BTC Legacy',
+        });
+    });
+});
diff --git a/suite-native/app/e2e/tests/deeplinkPopup.test.ts b/suite-native/app/e2e/tests/deeplinkPopup.test.ts
new file mode 100644
index 00000000000..57a5aa90689
--- /dev/null
+++ b/suite-native/app/e2e/tests/deeplinkPopup.test.ts
@@ -0,0 +1,138 @@
+import http from 'http';
+import { exec } from 'child_process';
+
+import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
+import TrezorConnect from '@trezor/connect-mobile';
+import { conditionalDescribe } from '@suite-common/test-utils';
+
+import { onConnectingDevice } from '../pageObjects/connectingDevice';
+import {
+    appIsFullyLoaded,
+    disconnectTrezorUserEnv,
+    openApp,
+    prepareTrezorEmulator,
+    restartApp,
+} from '../utils';
+import { onOnboarding } from '../pageObjects/onboardingActions';
+import { onCoinEnablingInit } from '../pageObjects/coinEnablingActions';
+import { onHome } from '../pageObjects/homeActions';
+import { onBottomSheet } from '../pageObjects/bottomSheetActions';
+
+const SERVER_PORT = 8080;
+const SERVER_URL = `http://localhost:${SERVER_PORT}`;
+
+let server: http.Server | undefined;
+
+const openUriScheme = (url: string, platformToOpen: 'android') => {
+    const command = `npx uri-scheme open '${url.replace(/'/g, '')}' --${platformToOpen}`;
+
+    exec(command, (err, stdout, stderr) => {
+        if (err) {
+            console.error(err);
+
+            return;
+        }
+        // eslint-disable-next-line no-console
+        console.info(stdout);
+        console.error(stderr);
+    });
+};
+
+conditionalDescribe(device.getPlatform() !== 'android', 'Deeplink connect popup.', () => {
+    beforeAll(async () => {
+        await new Promise(resolve => {
+            server = http.createServer((req, res) => {
+                if (req.url) {
+                    const url = new URL(req.url, SERVER_URL);
+                    TrezorConnect.handleDeeplink(url.href);
+                    res.statusCode = 200;
+                    res.setHeader('Content-Type', 'text/plain');
+                    res.end('Callback URL received successfully!\n');
+                }
+            });
+
+            server.listen(SERVER_PORT, 'localhost', () => {
+                // eslint-disable-next-line no-console
+                console.info(`Server running at ${SERVER_URL}`);
+                resolve(null);
+            });
+        });
+
+        await prepareTrezorEmulator();
+        await openApp({ newInstance: true });
+        await onOnboarding.finishOnboarding();
+
+        await onCoinEnablingInit.waitForScreen();
+        await onCoinEnablingInit.enableNetwork('regtest');
+        await onCoinEnablingInit.clickOnConfirmButton();
+
+        await onBottomSheet.skipViewOnlyMode();
+
+        // This `TrezorConnect` instance here is pretending to be the integrator or @trezor/connect-mobile
+        await TrezorConnect.init({
+            manifest: {
+                email: 'developer@xyz.com',
+                appUrl: 'http://your.application.com',
+            },
+            deeplinkOpen: url => {
+                openUriScheme(url, 'android');
+            },
+            deeplinkCallbackUrl: `${SERVER_URL}/connect/`,
+            connectSrc: 'https://dev.suite.sldev.cz/connect/develop/',
+        });
+    });
+
+    beforeEach(async () => {
+        await restartApp();
+
+        await device.reverseTcpPort(SERVER_PORT);
+
+        await appIsFullyLoaded();
+
+        await onConnectingDevice.waitForScreen();
+        await onHome.waitForScreen();
+    });
+
+    afterAll(async () => {
+        disconnectTrezorUserEnv();
+        await new Promise(resolve => {
+            if (server) {
+                server.close(() => {
+                    resolve(null);
+                });
+            }
+        });
+        await device.terminateApp();
+    });
+
+    it('Handle deeplink', async () => {
+        const promise = TrezorConnect.getAddress({
+            path: "m/49'/0'/0'/0/0",
+            coin: 'btc',
+        });
+
+        await element(by.id('@popup/deeplink-info'));
+
+        await waitFor(element(by.id('@popup/call-device')))
+            .toBeVisible()
+            .withTimeout(10 * 1000);
+        await element(by.id('@popup/call-device')).tap();
+
+        await TrezorUserEnvLink.pressYes();
+
+        const response = await promise;
+        const expectedResponse = {
+            id: 1,
+            payload: {
+                path: [49, 0, 0, 0, 0],
+                serializedPath: 'm/49/0/0/0/0',
+                address: '3J7UQSLAaFh1nkUomVdm8ArifPEvYfNr1o',
+            },
+            success: true,
+        };
+
+        if (JSON.stringify(response) !== JSON.stringify(expectedResponse)) {
+            throw new Error('Result does not match expected.');
+        }
+    });
+});
diff --git a/suite-native/app/e2e/tests/deviceSettings.test.ts b/suite-native/app/e2e/tests/deviceSettings.test.ts
new file mode 100644
index 00000000000..91181b7f0d3
--- /dev/null
+++ b/suite-native/app/e2e/tests/deviceSettings.test.ts
@@ -0,0 +1,80 @@
+import { conditionalDescribe } from '@suite-common/test-utils';
+import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
+
+import { onAlertSheet } from '../pageObjects/alertSheetActions';
+import { onBottomSheet } from '../pageObjects/bottomSheetActions';
+import { onCoinEnablingInit } from '../pageObjects/coinEnablingActions';
+import { onConnectingDevice } from '../pageObjects/connectingDevice';
+import { onDeviceManager } from '../pageObjects/deviceManagerActions';
+import { onDeviceSettings } from '../pageObjects/deviceSettingsActions';
+import { onOnboarding } from '../pageObjects/onboardingActions';
+import {
+    appIsFullyLoaded,
+    disconnectTrezorUserEnv,
+    openApp,
+    prepareTrezorEmulator,
+    restartApp,
+} from '../utils';
+
+conditionalDescribe(device.getPlatform() !== 'android', 'Device settings', () => {
+    beforeAll(async () => {
+        await prepareTrezorEmulator();
+        await openApp({ newInstance: true });
+
+        await onOnboarding.finishOnboarding();
+
+        await onCoinEnablingInit.waitForScreen();
+        await onCoinEnablingInit.enableNetwork('btc');
+        await onCoinEnablingInit.clickOnConfirmButton();
+
+        await onBottomSheet.skipViewOnlyMode();
+    });
+
+    beforeEach(async () => {
+        await prepareTrezorEmulator();
+        await restartApp();
+        await appIsFullyLoaded();
+
+        await onConnectingDevice.waitForScreen();
+        await onDeviceManager.tapDeviceSwitch();
+        await onDeviceManager.tapDeviceSettingsButton();
+    });
+
+    afterAll(async () => {
+        disconnectTrezorUserEnv();
+        await device.terminateApp();
+    });
+
+    test('Enable, change & disable PIN', async () => {
+        await onDeviceSettings.tapEnablePinProtectionButton();
+
+        await TrezorUserEnvLink.pressNo();
+        await onAlertSheet.tapPrimaryButton();
+
+        await TrezorUserEnvLink.pressYes();
+        await TrezorUserEnvLink.inputEmu('42');
+        await TrezorUserEnvLink.inputEmu('42');
+        await TrezorUserEnvLink.pressYes();
+
+        await onDeviceSettings.tapChangePinProtectionButton();
+
+        await TrezorUserEnvLink.pressNo();
+        await onAlertSheet.tapSecondaryButton();
+
+        await onDeviceSettings.tapChangePinProtectionButton();
+
+        await TrezorUserEnvLink.pressYes();
+        await TrezorUserEnvLink.inputEmu('42');
+        await TrezorUserEnvLink.inputEmu('21');
+        await TrezorUserEnvLink.inputEmu('21');
+        await TrezorUserEnvLink.pressYes();
+
+        await onDeviceSettings.tapDisablePinProtectionButton();
+
+        await TrezorUserEnvLink.pressYes();
+        await TrezorUserEnvLink.inputEmu('21');
+        await TrezorUserEnvLink.pressYes();
+
+        await onDeviceSettings.waitForScreen();
+    });
+});
diff --git a/suite-native/app/e2e/tests/onboardAndConnect.test.ts b/suite-native/app/e2e/tests/onboardAndConnect.test.ts
index a121a370c2d..7bb38ac75c1 100644
--- a/suite-native/app/e2e/tests/onboardAndConnect.test.ts
+++ b/suite-native/app/e2e/tests/onboardAndConnect.test.ts
@@ -1,39 +1,22 @@
 // `expect` keyword is already used by jest.
 import { expect as detoxExpect } from 'detox';
 
-import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
-
-import { openApp } from '../utils';
+import { onBottomSheet } from '../pageObjects/bottomSheetActions';
+import { disconnectTrezorUserEnv, openApp, prepareTrezorEmulator } from '../utils';
 import { onOnboarding } from '../pageObjects/onboardingActions';
 import { onCoinEnablingInit } from '../pageObjects/coinEnablingActions';
 
-const TREZOR_DEVICE_LABEL = 'Trezor T - Tester';
-// Contains only one BTC account with a single transaction to make the discovery as fast as possible.
-const SIMPLE_SEED = 'immune enlist rule measure fan swarm mandate track point menu security fan';
 const platform = device.getPlatform();
 
 describe('Go through onboarding and connect Trezor.', () => {
     beforeAll(async () => {
-        if (platform === 'android') {
-            // Prepare Trezor device for test scenario and turn it off.
-            await TrezorUserEnvLink.disconnect();
-            await TrezorUserEnvLink.connect();
-            await TrezorUserEnvLink.startEmu({ wipe: true });
-            await TrezorUserEnvLink.setupEmu({
-                label: TREZOR_DEVICE_LABEL,
-                mnemonic: SIMPLE_SEED,
-            });
-            await TrezorUserEnvLink.startBridge();
-            await TrezorUserEnvLink.stopEmu();
-        }
+        await prepareTrezorEmulator();
 
         await openApp({ newInstance: true });
     });
 
     afterAll(async () => {
-        if (platform === 'android') {
-            await TrezorUserEnvLink.stopEmu();
-        }
+        disconnectTrezorUserEnv();
         await device.terminateApp();
     });
 
@@ -41,26 +24,20 @@ describe('Go through onboarding and connect Trezor.', () => {
         await onOnboarding.finishOnboarding();
 
         if (platform === 'android') {
-            await TrezorUserEnvLink.startEmu();
-
             await waitFor(element(by.id('@screen/CoinEnablingInit')))
                 .toBeVisible()
                 .withTimeout(10000);
 
-            await onCoinEnablingInit.waitForBtcToBeVisible();
+            await onCoinEnablingInit.waitForScreen();
 
             await onCoinEnablingInit.enableNetwork('btc');
             await onCoinEnablingInit.enableNetwork('eth');
 
-            await onCoinEnablingInit.save();
-
-            await waitFor(element(by.id('skip-view-only-mode')))
-                .toBeVisible()
-                .withTimeout(60000); // communication between connected Trezor and app takes some time.
+            await onCoinEnablingInit.clickOnConfirmButton();
 
-            await element(by.id('skip-view-only-mode')).tap();
+            await onBottomSheet.skipViewOnlyMode();
 
-            await detoxExpect(element(by.id('@home/portfolio/graph'))); // discovery finished and graph is visible
+            await detoxExpect(element(by.id('@home/portfolio/graph')));
         } else {
             await detoxExpect(element(by.text('Hi there!'))).toBeVisible();
             await detoxExpect(element(by.text('Get started'))).toBeVisible();
diff --git a/suite-native/app/e2e/tests/othersAccountsImport.test.ts b/suite-native/app/e2e/tests/othersAccountsImport.test.ts
new file mode 100644
index 00000000000..407f48e562e
--- /dev/null
+++ b/suite-native/app/e2e/tests/othersAccountsImport.test.ts
@@ -0,0 +1,65 @@
+import { openApp } from '../utils';
+import { xpubs } from '../fixtures/xpubs';
+import { onAccountImport } from '../pageObjects/accountImportActions';
+import { onMyAssets } from '../pageObjects/myAssetsActions';
+import { onOnboarding } from '../pageObjects/onboardingActions';
+import { onTabBar } from '../pageObjects/tabBarActions';
+
+describe('Import accounts of other networks.', () => {
+    beforeAll(async () => {
+        await openApp({ newInstance: true });
+        await onOnboarding.finishOnboarding();
+        await onTabBar.navigateToMyAssets();
+    });
+
+    beforeEach(async () => {
+        await onMyAssets.addAccount();
+    });
+
+    it('Import LTC account', async () => {
+        await onAccountImport.importAccount({
+            networkSymbol: 'ltc',
+            xpub: xpubs.ltc,
+            accountName: 'Litecoin SegWit',
+        });
+    });
+
+    it('Import ZCash account', async () => {
+        await onAccountImport.importAccount({
+            networkSymbol: 'zec',
+            xpub: xpubs.zec,
+            accountName: 'Zcash #1',
+        });
+    });
+
+    it('Import DOGE account', async () => {
+        await onAccountImport.importAccount({
+            networkSymbol: 'doge',
+            xpub: xpubs.doge,
+            accountName: 'Dogecoin #1',
+        });
+    });
+
+    it('Import Cardano account', async () => {
+        await onAccountImport.importAccount({
+            networkSymbol: 'ada',
+            xpub: xpubs.ada,
+            accountName: 'Cardano #1',
+        });
+    });
+    it('Import XRP account', async () => {
+        await onAccountImport.importAccount({
+            networkSymbol: 'xrp',
+            xpub: xpubs.xrp,
+            accountName: 'Ripple #1',
+        });
+    });
+
+    it('Import ETH account', async () => {
+        await onAccountImport.importAccount({
+            networkSymbol: 'eth',
+            xpub: xpubs.eth,
+            accountName: 'Ethereum #1',
+        });
+    });
+});
diff --git a/suite-native/app/e2e/tests/regtestPOC.test.ts b/suite-native/app/e2e/tests/regtestPOC.test.ts
deleted file mode 100644
index 80592468b76..00000000000
--- a/suite-native/app/e2e/tests/regtestPOC.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { expect as detoxExpect } from 'detox';
-
-import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
-
-import { appIsFullyLoaded, openApp, restartApp } from '../utils';
-import { xpubs } from '../fixtures/xpubs';
-import { onAccountImport } from '../pageObjects/accountImportActions';
-import { onMyAssets } from '../pageObjects/myAssetsActions';
-import { onOnboarding } from '../pageObjects/onboardingActions';
-import { onHome } from '../pageObjects/homeActions';
-
-// TODO: This is not a full test suite, just a proof of concept of regtest <---> suite-native integration.
-//       The suite will be extended/modified in the future by the QA team.
-describe('Regtest integration proof of concept.', () => {
-    beforeAll(async () => {
-        await openApp({ newInstance: true });
-        await onOnboarding.finishOnboarding();
-    });
-
-    beforeEach(async () => {
-        await restartApp();
-        await appIsFullyLoaded();
-    });
-
-    it('Mine regtest transaction and check that it is present in the account transaction list.', async () => {
-        const amountToSend = 42;
-
-        // send transaction of 42 BTC and mine it
-        await TrezorUserEnvLink.sendToAddressAndMineBlock({
-            address: 'bcrt1qjf6qnquchwl6drvrf2ar73l6p9m3gzwlev9qd4',
-            btc_amount: amountToSend,
-        });
-
-        await onHome.tapSyncCoinsButton();
-
-        const accountName = 'Regtest #1';
-        await onAccountImport.importAccount({
-            networkSymbol: 'regtest',
-            xpub: xpubs.regtest,
-            accountName,
-        });
-
-        await onMyAssets.openAccountDetail({ accountName });
-
-        // Check if the transaction is present in the account transaction list.
-        await detoxExpect(element(by.text(`${amountToSend} BTC REGTEST`)).atIndex(0)).toBeVisible();
-    });
-});
diff --git a/suite-native/app/e2e/tests/send.test.ts b/suite-native/app/e2e/tests/send.test.ts
new file mode 100644
index 00000000000..f3a7f4af593
--- /dev/null
+++ b/suite-native/app/e2e/tests/send.test.ts
@@ -0,0 +1,147 @@
+import { conditionalDescribe } from '@suite-common/test-utils';
+import { TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
+
+import { onAccountDetail } from '../pageObjects/accountDetailActions';
+import { onAlertSheet } from '../pageObjects/alertSheetActions';
+import { onBottomSheet } from '../pageObjects/bottomSheetActions';
+import { onCoinEnablingInit } from '../pageObjects/coinEnablingActions';
+import { onConnectingDevice } from '../pageObjects/connectingDevice';
+import { onHome } from '../pageObjects/homeActions';
+import { onMyAssets } from '../pageObjects/myAssetsActions';
+import { onOnboarding } from '../pageObjects/onboardingActions';
+import { onSendAddressReview } from '../pageObjects/send/sendAddressReviewActions';
+import { onSendFees } from '../pageObjects/send/sendFeesActions';
+import { onSendOutputsForm } from '../pageObjects/send/sendOutputsFormActions';
+import { onSendOutputsReview } from '../pageObjects/send/sendOutputsReviewActions';
+import { onTabBar } from '../pageObjects/tabBarActions';
+import {
+    appIsFullyLoaded,
+    disconnectTrezorUserEnv,
+    openApp,
+    prepareTrezorEmulator,
+    restartApp,
+    wait,
+} from '../utils';
+
+const SEND_FORM_ERROR_MESSAGES = {
+    invalidAddress: 'The address format is incorrect.',
+    invalidDecimalValue: 'Invalid decimal value.',
+    dustAmount: 'The value is lower than the dust limit.',
+    higherThanBalance: 'You don’t have enough balance to send this amount.',
+    tooManyDecimals: 'Too many decimals.',
+    addressRequired: 'Address is required.',
+    amountRequired: 'Amount is required.',
+};
+
+const INITIAL_ACCOUNT_BALANCE = 3.14;
+
+const prepareTransactionForOnDeviceReview = async (isFormEmpty: boolean = true) => {
+    if (isFormEmpty) {
+        await onSendOutputsForm.fillForm([
+            { address: 'bcrt1q34up3cga3fkmph47t22mpk5d0xxj3ppghph9da', amount: '0.5' },
+        ]);
+    }
+
+    await onSendOutputsForm.submitForm();
+
+    await onSendFees.submitFee();
+};
+
+conditionalDescribe(device.getPlatform() !== 'android', 'Send transaction flow.', () => {
+    beforeAll(async () => {
+        await prepareTrezorEmulator();
+        await openApp({ newInstance: true });
+        await onOnboarding.finishOnboarding();
+
+        await TrezorUserEnvLink.sendToAddressAndMineBlock({
+            address: 'bcrt1q34up3cga3fkmph47t22mpk5d0xxj3ppghph9da',
+            btc_amount: INITIAL_ACCOUNT_BALANCE,
+        });
+
+        await onCoinEnablingInit.waitForScreen();
+        await onCoinEnablingInit.enableNetwork('regtest');
+        await onCoinEnablingInit.clickOnConfirmButton();
+
+        await onBottomSheet.skipViewOnlyMode();
+    });
+
+    beforeEach(async () => {
+        await prepareTrezorEmulator();
+        await restartApp();
+
+        await appIsFullyLoaded();
+
+        await onConnectingDevice.waitForScreen();
+        await onHome.waitForScreen();
+        await onTabBar.navigateToMyAssets();
+
+        await onMyAssets.openAccountDetail({ accountName: 'Bitcoin Regtest #1' });
+
+        await onAccountDetail.openSend();
+        await onSendOutputsForm.waitForScreen();
+    });
+
+    afterAll(() => {
+        disconnectTrezorUserEnv();
+    });
+
+    it('Compose and dispatch a regtest transaction.', async () => {
+        await prepareTransactionForOnDeviceReview();
+
+        await onSendAddressReview.nextStep();
+        await onSendAddressReview.nextStep();
+        await TrezorUserEnvLink.pressYes();
+
+        await onSendOutputsReview.waitForScreen();
+        await onSendOutputsReview.confirmTransactionOutputs();
+        await onSendOutputsReview.clickSendTransaction();
+    });
+
+    it('Validate send form input errors.', async () => {
+        await onSendOutputsForm.fillForm([{ address: 'wrong address', amount: '200' }]);
+
+        await waitFor(element(by.text(SEND_FORM_ERROR_MESSAGES.invalidAddress))).toBeVisible();
+        await waitFor(element(by.text(SEND_FORM_ERROR_MESSAGES.higherThanBalance))).toBeVisible();
+
+        await onSendOutputsForm.clearForm();
+
+        await waitFor(element(by.text(SEND_FORM_ERROR_MESSAGES.addressRequired))).toBeVisible();
+        await waitFor(element(by.text(SEND_FORM_ERROR_MESSAGES.amountRequired))).toBeVisible();
+
+        await onSendOutputsForm.fillForm([{ amount: '0.00000001' }]);
+        await waitFor(element(by.text(SEND_FORM_ERROR_MESSAGES.dustAmount))).toBeVisible();
+
+        await onSendOutputsForm.clearForm();
+
+        await onSendOutputsForm.fillForm([{ amount: '0.10000000000' }]);
+        await waitFor(element(by.text(SEND_FORM_ERROR_MESSAGES.tooManyDecimals))).toBeVisible();
+    });
+
+    it('Review cancellation and error handling.', async () => {
+        await prepareTransactionForOnDeviceReview();
+
+        // Cancel button should go back if the on device review was not started yet.
+        await element(by.id('@screen/sub-header/icon-left')).tap();
+        await onSendFees.waitForScreen();
+
+        // Cancel button should restart the review if it already started.
+        await onSendFees.submitFee();
+        await onSendAddressReview.nextStep();
+        await onSendAddressReview.nextStep();
+        await element(by.id('@screen/sub-header/icon-left')).tap();
+        await onAlertSheet.tapPrimaryButton();
+        await onAccountDetail.waitForScreen();
+
+        // Disconnecting not remembered device should exit the send flow and display alert.
+        await onAccountDetail.openSend();
+        const isFormEmpty = false;
+        await prepareTransactionForOnDeviceReview(isFormEmpty);
+        await onSendAddressReview.nextStep();
+        await onSendAddressReview.nextStep();
+
+        await wait(3000); // Wait for the device to get info about the transaction.
+        await TrezorUserEnvLink.stopEmu();
+        await onAlertSheet.tapSecondaryButton();
+        await onHome.waitForScreen();
+    });
+});
diff --git a/suite-native/app/e2e/utils.ts b/suite-native/app/e2e/utils.ts
index fc7c5809975..7b8d79b5e60 100644
--- a/suite-native/app/e2e/utils.ts
+++ b/suite-native/app/e2e/utils.ts
@@ -1,12 +1,15 @@
 import { resolveConfig } from 'detox/internals';
 import { expect as detoxExpect } from 'detox';
 
+import { MNEMONICS, TrezorUserEnvLink } from '@trezor/trezor-user-env-link';
+
 const APP_LAUNCH_ARGS = {
     // Do not synchronize communication with the trezor bridge and metro server running on localhost. Since the trezor
     // bridge is exchanging messages with the app all the time, the test runner would wait forever otherwise.
     detoxURLBlacklistRegex: '\\("^.*127.0.0.1.*",".*localhost.*","^*clients3\\.google\\.com*"\\)',
 };
 
+const TREZOR_DEVICE_LABEL = 'Trezor T - Tester';
 const platform = device.getPlatform();
 
 export const sleep = (ms: number) => new Promise(res => setTimeout(res, ms));
@@ -86,5 +89,30 @@ export const scrollUntilVisible = async (matcher: Detox.NativeMatcher) => {
 export const appIsFullyLoaded = async () => {
     await waitFor(element(by.id('@screen/mainScrollView')))
         .toBeVisible()
-        .withTimeout(20000);
+        .withTimeout(35000);
+};
+
+export const prepareTrezorEmulator = async (seed: string = MNEMONICS.mnemonic_immune) => {
+    if (platform === 'android') {
+        // Prepare Trezor device for test scenario
+        await TrezorUserEnvLink.disconnect();
+        await TrezorUserEnvLink.connect();
+        await TrezorUserEnvLink.startEmu({ wipe: true });
+        await TrezorUserEnvLink.setupEmu({
+            label: TREZOR_DEVICE_LABEL,
+            mnemonic: seed,
+        });
+        await TrezorUserEnvLink.startBridge();
+    }
+};
+
+export const disconnectTrezorUserEnv = async () => {
+    // Clear the connection to the Trezor emulator so the test does not synchronize with it when not necessary.
+    await TrezorUserEnvLink.stopEmu();
+    await TrezorUserEnvLink.disconnect();
+    await TrezorUserEnvLink.stopBridge();
+};
+
+export const wait = async (ms: number) => {
+    await new Promise(resolve => setTimeout(resolve, ms));
 };
diff --git a/suite-native/app/eas.json b/suite-native/app/eas.json
index 077696f82d2..6c09c7a0f2a 100644
--- a/suite-native/app/eas.json
+++ b/suite-native/app/eas.json
@@ -10,6 +10,7 @@
                 "EXPO_PUBLIC_ENVIRONMENT": "develop",
                 "EXPO_PUBLIC_CODESIGN_BUILD": "false"
             },
+            "channel": "develop",
             "autoIncrement": true,
             "ios": {
                 "distribution": "store"
@@ -19,6 +20,21 @@
                 "resourceClass": "large"
             }
         },
+        "preview": {
+            "env": {
+                "EXPO_PUBLIC_ENVIRONMENT": "preview",
+                "EXPO_PUBLIC_CODESIGN_BUILD": "false"
+            },
+            "channel": "preview",
+            "autoIncrement": true,
+            "developmentClient": true,
+            "credentialsSource": "remote",
+            "distribution": "internal"
+        },
+        "adhoc": {
+            "extends": "preview",
+            "developmentClient": false
+        },
         "production": {
             "env": {
                 "EXPO_PUBLIC_ENVIRONMENT": "production",
diff --git a/suite-native/app/globalPolyfills.js b/suite-native/app/globalPolyfills.js
index 67e860459a4..e2983915463 100644
--- a/suite-native/app/globalPolyfills.js
+++ b/suite-native/app/globalPolyfills.js
@@ -1,3 +1,11 @@
+import * as Crypto from 'expo-crypto';
+
+if (typeof global.crypto !== 'object') {
+    global.crypto = {};
+}
+// crypto.getRandomValues polyfill is needed for Solana
+global.crypto.getRandomValues = Crypto.getRandomValues;
+
 global.Buffer = require('buffer').Buffer;
 
 global.process = {
diff --git a/suite-native/app/metro.config.js b/suite-native/app/metro.config.js
index edaf97cad40..0737fcd4f89 100644
--- a/suite-native/app/metro.config.js
+++ b/suite-native/app/metro.config.js
@@ -54,6 +54,14 @@ const config = {
                 };
             }
 
+            if (process.env.IS_DETOX_BUILD && moduleName === '@trezor/connect') {
+                // Mock some Trezor Connect methods to avoid network flakiness during e2e tests.
+                return {
+                    filePath: require.resolve('./e2e/mocks/trezor-connect.js'),
+                    type: 'sourceFile',
+                };
+            }
+
             // Optionally, chain to the standard Metro resolver.
             return context.resolveRequest(context, moduleName, platform);
         },
diff --git a/suite-native/app/package.json b/suite-native/app/package.json
index dd06171a07f..512939a583a 100644
--- a/suite-native/app/package.json
+++ b/suite-native/app/package.json
@@ -1,17 +1,17 @@
 {
     "name": "@suite-native/app",
     "version": "1.0.0",
-    "suiteNativeVersion": "24.9.2",
+    "suiteNativeVersion": "24.11.2",
     "main": "index.js",
     "scripts": {
         "android": "expo run:android",
         "android:clean": "cd android && ./gradlew clean",
         "ios": "expo run:ios",
         "start": "expo start --dev-client",
-        "lint:js": "yarn g:eslint .",
         "type-check": "yarn g:tsc -b",
         "pods": "npx pod-install",
         "prebuild": "expo prebuild",
+        "build:adhoc": "npx eas-cli build --profile adhoc",
         "eas-build-post-install": "yarn workspace @suite-common/message-system sign-config",
         "eas-build-on-success": "./eas-post-success.sh",
         "prebuild:clean": "expo prebuild --clean",
@@ -21,6 +21,7 @@
         "reverse-ports": "adb reverse tcp:8081 tcp:8081 && adb reverse tcp:21325 tcp:21325 && adb reverse tcp:19121 tcp:19121"
     },
     "dependencies": {
+        "@gorhom/bottom-sheet": "5.0.5",
         "@mobily/ts-belt": "^3.13.1",
         "@react-native-community/netinfo": "11.3.2",
         "@react-native/metro-config": "0.75.2",
@@ -35,12 +36,12 @@
         "@suite-common/analytics": "workspace:*",
         "@suite-common/connect-init": "workspace:*",
         "@suite-common/formatters": "workspace:*",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/message-system": "workspace:*",
         "@suite-common/redux-utils": "workspace:*",
         "@suite-common/suite-constants": "workspace:*",
         "@suite-common/token-definitions": "workspace:*",
         "@suite-common/wallet-core": "workspace:*",
+        "@suite-common/wallet-types": "workspace:*",
         "@suite-native/accounts": "workspace:*",
         "@suite-native/alerts": "workspace:*",
         "@suite-native/analytics": "workspace:*",
@@ -52,6 +53,7 @@
         "@suite-native/device": "workspace:*",
         "@suite-native/device-authorization": "workspace:*",
         "@suite-native/discovery": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/message-system": "workspace:*",
         "@suite-native/module-accounts-import": "workspace:*",
@@ -60,6 +62,7 @@
         "@suite-native/module-authorize-device": "workspace:*",
         "@suite-native/module-connect-popup": "workspace:*",
         "@suite-native/module-dev-utils": "workspace:*",
+        "@suite-native/module-device-settings": "workspace:*",
         "@suite-native/module-home": "workspace:*",
         "@suite-native/module-onboarding": "workspace:*",
         "@suite-native/module-receive": "workspace:*",
@@ -79,12 +82,14 @@
         "@trezor/react-native-usb": "workspace:*",
         "@trezor/styles": "workspace:*",
         "@trezor/theme": "workspace:*",
+        "@trezor/trezor-user-env-link": "workspace:*",
         "buffer": "^6.0.3",
         "expo": "51.0.31",
         "expo-av": "14.0.7",
         "expo-build-properties": "0.12.5",
         "expo-camera": "15.0.15",
         "expo-clipboard": "6.0.3",
+        "expo-crypto": "13.0.2",
         "expo-dev-client": "4.0.25",
         "expo-haptics": "13.0.1",
         "expo-image": "1.12.15",
@@ -97,6 +102,7 @@
         "expo-splash-screen": "0.27.5",
         "expo-status-bar": "1.12.1",
         "expo-system-ui": "3.0.7",
+        "expo-updates": "^0.25.27",
         "lottie-react-native": "6.7.2",
         "node-libs-browser": "^2.2.1",
         "react": "18.2.0",
@@ -105,7 +111,7 @@
         "react-native-gesture-handler": "2.18.1",
         "react-native-keyboard-aware-scroll-view": "0.9.5",
         "react-native-mmkv": "2.12.2",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-native-restart": "0.0.27",
         "react-native-safe-area-context": "4.10.9",
         "react-native-screens": "3.34.0",
@@ -118,6 +124,8 @@
         "@babel/plugin-transform-export-namespace-from": "^7.23.4",
         "@config-plugins/detox": "^8.0.0",
         "@react-native/babel-preset": "^0.75.2",
+        "@suite-common/test-utils": "workspace:^",
+        "@trezor/connect-mobile": "workspace:^",
         "@types/jest": "^29.5.12",
         "@types/node": "^20.11.24",
         "babel-plugin-transform-inline-environment-variables": "^0.4.4",
diff --git a/suite-native/app/plugins/withAndroidMainActivityAttributes.js b/suite-native/app/plugins/withAndroidMainActivityAttributes.js
index 6b8d2128463..20dbb47d5f4 100644
--- a/suite-native/app/plugins/withAndroidMainActivityAttributes.js
+++ b/suite-native/app/plugins/withAndroidMainActivityAttributes.js
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-shadow */
 const { withAndroidManifest } = require('expo/config-plugins');
 
 function addAttributesToMainApplication(androidManifest, attributes) {
@@ -25,9 +24,9 @@ function addAttributesToMainApplication(androidManifest, attributes) {
 }
 
 module.exports = function withAndroidMainApplicationAttributes(config, attributes) {
-    return withAndroidManifest(config, config => {
-        config.modResults = addAttributesToMainApplication(config.modResults, attributes);
+    return withAndroidManifest(config, config2 => {
+        config2.modResults = addAttributesToMainApplication(config2.modResults, attributes);
 
-        return config;
+        return config2;
     });
 };
diff --git a/suite-native/app/plugins/withGradleProperties.js b/suite-native/app/plugins/withGradleProperties.js
index 3ee18e671f4..feff15d4c46 100644
--- a/suite-native/app/plugins/withGradleProperties.js
+++ b/suite-native/app/plugins/withGradleProperties.js
@@ -1,25 +1,24 @@
-/* eslint-disable @typescript-eslint/no-shadow */
 const { withGradleProperties } = require('expo/config-plugins');
 
 const newGraddleProperties = [];
 
 module.exports = config =>
-    withGradleProperties(config, config => {
+    withGradleProperties(config, config2 => {
         newGraddleProperties.map(gradleProperty => {
-            const isPropertyAlreadySet = config.modResults.some(
+            const isPropertyAlreadySet = config2.modResults.some(
                 item => item.key === gradleProperty.key,
             );
 
             if (!isPropertyAlreadySet) {
                 // push empty line to separate properties
-                config.modResults.push({
+                config2.modResults.push({
                     type: 'empty',
                 });
-                config.modResults.push(gradleProperty);
+                config2.modResults.push(gradleProperty);
             }
 
-            return config.modResults;
+            return config2.modResults;
         });
 
-        return config;
+        return config2;
     });
diff --git a/suite-native/app/plugins/withRemoveXcodeLocalEnv.js b/suite-native/app/plugins/withRemoveXcodeLocalEnv.js
index e976f7fb407..9eff34cd9cc 100644
--- a/suite-native/app/plugins/withRemoveXcodeLocalEnv.js
+++ b/suite-native/app/plugins/withRemoveXcodeLocalEnv.js
@@ -2,29 +2,28 @@
  * This plugin is used to replace generated .xcode.env.local file with .xcode.env file.
  * This is needed because the generated .xcode.env.local file for some reason contains wrong path to Node.js binary.
  */
-/* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable require-await */
 const { withDangerousMod, withPlugins } = require('expo/config-plugins');
 const fs = require('fs');
 const path = require('path');
 
-async function readFile(path) {
-    return fs.promises.readFile(path, 'utf8');
+async function readFile(path2) {
+    return fs.promises.readFile(path2, 'utf8');
 }
 
-async function saveFile(path, content) {
-    return fs.promises.writeFile(path, content, 'utf8');
+async function saveFile(path2, content) {
+    return fs.promises.writeFile(path2, content, 'utf8');
 }
 
 module.exports = config =>
     withPlugins(config, [
-        config =>
-            withDangerousMod(config, [
+        config2 =>
+            withDangerousMod(config2, [
                 'ios',
-                async config => {
-                    const file = path.join(config.modRequest.platformProjectRoot, '.xcode.env');
+                async config3 => {
+                    const file = path.join(config3.modRequest.platformProjectRoot, '.xcode.env');
                     const fileLocal = path.join(
-                        config.modRequest.platformProjectRoot,
+                        config3.modRequest.platformProjectRoot,
                         '.xcode.env.local',
                     );
 
@@ -35,7 +34,7 @@ module.exports = config =>
                      */
                     await saveFile(fileLocal, contents);
 
-                    return config;
+                    return config3;
                 },
             ]),
     ]);
diff --git a/suite-native/app/src/App.tsx b/suite-native/app/src/App.tsx
index 3d151d75d15..f73abde5ba0 100644
--- a/suite-native/app/src/App.tsx
+++ b/suite-native/app/src/App.tsx
@@ -5,6 +5,7 @@ import { useDispatch, useSelector } from 'react-redux';
 
 import * as SplashScreen from 'expo-splash-screen';
 import * as Sentry from '@sentry/react-native';
+import { BottomSheetModalProvider } from '@gorhom/bottom-sheet';
 
 import { selectIsAppReady, selectIsConnectInitialized, StoreProvider } from '@suite-native/state';
 import { FormatterProvider } from '@suite-common/formatters';
@@ -65,7 +66,9 @@ const AppComponent = () => {
         <FormatterProvider config={formattersConfig}>
             <OfflineBanner />
             <MessageSystemBannerRenderer />
-            <RootStackNavigator />
+            <BottomSheetModalProvider>
+                <RootStackNavigator />
+            </BottomSheetModalProvider>
             <ModalsRenderer />
             {/* NOTE: Rendered as last item so that it covers the whole app screen */}
             <FeatureMessageScreen />
diff --git a/suite-native/app/src/initActions.ts b/suite-native/app/src/initActions.ts
index 6762fa3a851..50a609fe627 100644
--- a/suite-native/app/src/initActions.ts
+++ b/suite-native/app/src/initActions.ts
@@ -4,6 +4,7 @@ import {
     createImportedDeviceThunk,
     initBlockchainThunk,
     initDevices,
+    initStakeDataThunk,
     periodicFetchFiatRatesThunk,
 } from '@suite-common/wallet-core';
 import { initAnalyticsThunk } from '@suite-native/analytics';
@@ -37,6 +38,8 @@ export const applicationInit = createThunk(
 
             dispatch(periodicCheckTokenDefinitionsThunk());
 
+            dispatch(initStakeDataThunk());
+
             dispatch(
                 periodicFetchFiatRatesThunk({
                     rateType: 'current',
diff --git a/suite-native/app/src/navigation/RootStackNavigator.tsx b/suite-native/app/src/navigation/RootStackNavigator.tsx
index 63080800c50..06d7b5f8666 100644
--- a/suite-native/app/src/navigation/RootStackNavigator.tsx
+++ b/suite-native/app/src/navigation/RootStackNavigator.tsx
@@ -2,6 +2,7 @@ import { useSelector } from 'react-redux';
 
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 
+import { useHandleDeviceConnection } from '@suite-native/device';
 import {
     AccountDetailScreen,
     AccountSettingsScreen,
@@ -19,7 +20,7 @@ import { OnboardingStackNavigator } from '@suite-native/module-onboarding';
 import { ReceiveModalScreen } from '@suite-native/receive';
 import { AuthorizeDeviceStackNavigator } from '@suite-native/module-authorize-device';
 import { AddCoinAccountStackNavigator } from '@suite-native/module-add-accounts';
-import { DeviceInfoModalScreen, useHandleDeviceConnection } from '@suite-native/device';
+import { DeviceSettingsStackNavigator } from '@suite-native/module-device-settings';
 import { SendStackNavigator } from '@suite-native/module-send';
 import { CoinEnablingInitScreen } from '@suite-native/coin-enabling';
 import { ConnectPopupScreen, useConnectPopupNavigation } from '@suite-native/module-connect-popup';
@@ -58,6 +59,7 @@ export const RootStackNavigator = () => {
             <RootStack.Screen
                 name={RootStackRoutes.AccountsImport}
                 component={AccountsImportStackNavigator}
+                options={{ animation: 'slide_from_bottom' }}
             />
             <RootStack.Screen
                 options={{ title: RootStackRoutes.AccountSettings }}
@@ -87,14 +89,12 @@ export const RootStackNavigator = () => {
                 name={RootStackRoutes.AddCoinAccountStack}
                 component={AddCoinAccountStackNavigator}
             />
-            <RootStack.Group screenOptions={{ animation: 'slide_from_bottom' }}>
-                <RootStack.Screen
-                    name={RootStackRoutes.CoinEnablingInit}
-                    component={CoinEnablingInitScreen}
-                />
-            </RootStack.Group>
+            <RootStack.Screen
+                name={RootStackRoutes.CoinEnablingInit}
+                component={CoinEnablingInitScreen}
+                options={{ animation: 'slide_from_bottom' }}
+            />
             <RootStack.Screen name={RootStackRoutes.ReceiveModal} component={ReceiveModalScreen} />
-            <RootStack.Screen name={RootStackRoutes.DeviceInfo} component={DeviceInfoModalScreen} />
             <RootStack.Screen
                 name={RootStackRoutes.AuthorizeDeviceStack}
                 component={AuthorizeDeviceStackNavigator}
@@ -103,15 +103,13 @@ export const RootStackNavigator = () => {
                     animation: 'slide_from_bottom',
                 }}
             />
-            <RootStack.Screen name={RootStackRoutes.SendStack} component={SendStackNavigator} />
-
             <RootStack.Screen
-                name={RootStackRoutes.ConnectPopup}
-                component={ConnectPopupScreen}
-                options={{
-                    presentation: 'fullScreenModal',
-                }}
+                name={RootStackRoutes.DeviceSettingsStack}
+                component={DeviceSettingsStackNavigator}
+                options={{ animation: 'slide_from_bottom' }}
             />
+            <RootStack.Screen name={RootStackRoutes.SendStack} component={SendStackNavigator} />
+            <RootStack.Screen name={RootStackRoutes.ConnectPopup} component={ConnectPopupScreen} />
         </RootStack.Navigator>
     );
 };
diff --git a/suite-native/app/src/navigation/enhanceTabOption.ts b/suite-native/app/src/navigation/enhanceTabOption.ts
index 797dc1a0959..47d7ec9b0e3 100644
--- a/suite-native/app/src/navigation/enhanceTabOption.ts
+++ b/suite-native/app/src/navigation/enhanceTabOption.ts
@@ -1,4 +1,4 @@
-import { IconName } from '@suite-common/icons-deprecated';
+import { IconName } from '@suite-native/icons';
 import { AppTabsParamList } from '@suite-native/navigation';
 
 type TabOption<ParamList extends AppTabsParamList, RouteName extends keyof ParamList> = {
diff --git a/suite-native/app/src/navigation/routes.ts b/suite-native/app/src/navigation/routes.ts
index 93173a29bfb..c60ab265948 100644
--- a/suite-native/app/src/navigation/routes.ts
+++ b/suite-native/app/src/navigation/routes.ts
@@ -4,7 +4,7 @@ import { enhanceTabOption } from './enhanceTabOption';
 
 const homeStack = enhanceTabOption({
     routeName: AppTabsRoutes.HomeStack,
-    iconName: 'home',
+    iconName: 'house',
     label: 'Home',
 });
 
@@ -20,12 +20,12 @@ const accountsStack = enhanceTabOption({
 const receiveStack = enhanceTabOption({
     routeName: AppTabsRoutes.ReceiveStack,
     label: 'Receive',
-    iconName: 'arrowDownLight',
+    iconName: 'arrowLineDown',
 });
 
 const settingsStack = enhanceTabOption({
     routeName: AppTabsRoutes.SettingsStack,
-    iconName: 'settings',
+    iconName: 'gear',
     label: 'Settings',
 });
 
diff --git a/suite-native/app/src/snow/Snowflake.tsx b/suite-native/app/src/snow/Snowflake.tsx
index 7157d6f2a68..96dd61d7983 100644
--- a/suite-native/app/src/snow/Snowflake.tsx
+++ b/suite-native/app/src/snow/Snowflake.tsx
@@ -14,7 +14,7 @@ import Animated, {
     withTiming,
 } from 'react-native-reanimated';
 
-import { Image } from 'expo-image';
+import { CryptoIcon } from '@suite-native/icons';
 
 const HEIGHT = Dimensions.get('window').height;
 const topOffset = HEIGHT * 0.1;
@@ -106,10 +106,7 @@ export const Snowflake: React.FC<{
     if (props.glyph === 'btc') {
         return (
             <Animated.View style={[styles.text, animatedStyle, props.style]}>
-                <Image
-                    source={require('@suite-common/icons-deprecated/assets/cryptoIcons/btc.svg')}
-                    style={{ width: 13, height: 13 }}
-                />
+                <CryptoIcon symbol="btc" size={13} />
             </Animated.View>
         );
     }
diff --git a/suite-native/app/tsconfig.json b/suite-native/app/tsconfig.json
index 5c5b2a56ff8..c60093a96d0 100644
--- a/suite-native/app/tsconfig.json
+++ b/suite-native/app/tsconfig.json
@@ -11,9 +11,6 @@
         {
             "path": "../../suite-common/formatters"
         },
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/message-system"
         },
@@ -29,6 +26,9 @@
         {
             "path": "../../suite-common/wallet-core"
         },
+        {
+            "path": "../../suite-common/wallet-types"
+        },
         { "path": "../accounts" },
         { "path": "../alerts" },
         { "path": "../analytics" },
@@ -40,6 +40,7 @@
         { "path": "../device" },
         { "path": "../device-authorization" },
         { "path": "../discovery" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../message-system" },
         { "path": "../module-accounts-import" },
@@ -50,6 +51,7 @@
         { "path": "../module-authorize-device" },
         { "path": "../module-connect-popup" },
         { "path": "../module-dev-utils" },
+        { "path": "../module-device-settings" },
         { "path": "../module-home" },
         { "path": "../module-onboarding" },
         { "path": "../module-receive" },
@@ -72,7 +74,16 @@
             "path": "../../packages/react-native-usb"
         },
         { "path": "../../packages/styles" },
-        { "path": "../../packages/theme" }
+        { "path": "../../packages/theme" },
+        {
+            "path": "../../packages/trezor-user-env-link"
+        },
+        {
+            "path": "../../suite-common/test-utils"
+        },
+        {
+            "path": "../../packages/connect-mobile"
+        }
     ],
     "include": [".", "**.json"]
 }
diff --git a/suite-native/assets/package.json b/suite-native/assets/package.json
index cc29cb7dd43..d7bb8e04530 100644
--- a/suite-native/assets/package.json
+++ b/suite-native/assets/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -15,7 +14,6 @@
         "@react-navigation/native": "6.1.18",
         "@suite-common/assets": "workspace:*",
         "@suite-common/formatters": "workspace:*",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/redux-utils": "workspace:*",
         "@suite-common/token-definitions": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
@@ -25,15 +23,15 @@
         "@suite-native/atoms": "workspace:*",
         "@suite-native/config": "workspace:*",
         "@suite-native/formatters": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/navigation": "workspace:*",
         "@suite-native/settings": "workspace:*",
         "@suite-native/staking": "workspace:*",
         "@suite-native/tokens": "workspace:*",
-        "proxy-memoize": "2.0.2",
         "react": "^18.2.0",
         "react-native": "0.75.2",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-redux": "8.0.7"
     }
 }
diff --git a/suite-native/assets/src/assetsSelectors.ts b/suite-native/assets/src/assetsSelectors.ts
index 7968fad305f..324589dbfd8 100644
--- a/suite-native/assets/src/assetsSelectors.ts
+++ b/suite-native/assets/src/assetsSelectors.ts
@@ -1,9 +1,13 @@
-import { A, D, F, G, pipe } from '@mobily/ts-belt';
-import { memoize, memoizeWithArgs } from 'proxy-memoize';
+import { A, F, G, pipe } from '@mobily/ts-belt';
 
 import { calculateAssetsPercentage } from '@suite-common/assets';
-import { TokenDefinitionsRootState } from '@suite-common/token-definitions';
-import { networks, NetworkSymbol } from '@suite-common/wallet-config';
+import { createWeakMapSelector } from '@suite-common/redux-utils';
+import {
+    getSimpleCoinDefinitionsByNetwork,
+    selectTokenDefinitions,
+    TokenDefinitionsRootState,
+} from '@suite-common/token-definitions';
+import { NetworkSymbol } from '@suite-common/wallet-config';
 import {
     AccountsRootState,
     DeviceRootState,
@@ -14,14 +18,12 @@ import {
     selectVisibleDeviceAccountsByNetworkSymbol,
 } from '@suite-common/wallet-core';
 import { getAccountFiatBalance } from '@suite-common/wallet-utils';
-import { selectAccountListSections } from '@suite-native/accounts';
+import { getAccountListSections } from '@suite-native/accounts';
 import { sortAccountsByNetworksAndAccountTypes } from '@suite-native/accounts/src/utils';
-import { discoverySupportedNetworks } from '@suite-native/config';
+import { orderedNetworkSymbols } from '@suite-native/config';
 import { selectFiatCurrencyCode, SettingsSliceRootState } from '@suite-native/settings';
-import {
-    NativeStakingRootState,
-    selectAccountCryptoBalanceWithStaking,
-} from '@suite-native/staking';
+import { getAccountCryptoBalanceWithStaking, NativeStakingRootState } from '@suite-native/staking';
+
 export interface AssetType {
     symbol: NetworkSymbol;
     assetBalance: string;
@@ -35,8 +37,11 @@ export type AssetsRootState = AccountsRootState &
     NativeStakingRootState &
     DeviceRootState;
 
+const createMemoizedSelector = createWeakMapSelector.withTypes<AssetsRootState>();
+
 /*
-We do not memoize any of following selectors because they are using only with `useSelectorDeepComparison` hook which is faster than memoization in proxy-memoize.
+We do not memoize most of following selectors because they are using only with `useSelectorDeepComparison` hook which is faster than memoization.
+TODO: revalidate if this is still true for reselect
 */
 
 export const selectVisibleDeviceAccountsKeysByNetworkSymbol = (
@@ -60,77 +65,87 @@ export const selectDeviceNetworksWithAssets = (state: AssetsRootState) => {
         A.map(account => account.symbol),
         A.uniq,
         A.sort((a, b) => {
-            const aOrder = discoverySupportedNetworks.indexOf(a) ?? Number.MAX_SAFE_INTEGER;
-            const bOrder = discoverySupportedNetworks.indexOf(b) ?? Number.MAX_SAFE_INTEGER;
+            const aOrder = orderedNetworkSymbols.indexOf(a) ?? Number.MAX_SAFE_INTEGER;
+            const bOrder = orderedNetworkSymbols.indexOf(b) ?? Number.MAX_SAFE_INTEGER;
 
             return aOrder - bOrder;
         }),
     );
 };
 
-export const selectBottomSheetDeviceNetworkItems = memoizeWithArgs(
-    (state: AssetsRootState, networkSymbol: NetworkSymbol) =>
+export const selectBottomSheetDeviceNetworkItems = createMemoizedSelector(
+    [
+        selectVisibleDeviceAccountsByNetworkSymbol,
+        selectTokenDefinitions,
+        (_state, networkSymbol: NetworkSymbol) => networkSymbol,
+    ],
+    (accounts, tokenDefinitions, networkSymbol) =>
         pipe(
-            selectVisibleDeviceAccountsByNetworkSymbol(state, networkSymbol),
+            accounts,
             sortAccountsByNetworksAndAccountTypes,
-            A.map(account => selectAccountListSections(state, account.key)),
+            A.map(account =>
+                getAccountListSections(
+                    account,
+                    getSimpleCoinDefinitionsByNetwork(tokenDefinitions, networkSymbol),
+                ),
+            ),
             A.flat,
             F.toMutable,
         ),
-    { size: D.keys(networks).length },
 );
 
-const selectDeviceAssetsWithBalances = memoize((state: AssetsRootState) => {
-    const accounts = selectVisibleDeviceAccounts(state);
-
-    const deviceNetworksWithAssets = selectDeviceNetworksWithAssets(state);
-
-    const fiatCurrencyCode = selectFiatCurrencyCode(state);
-    const rates = selectCurrentFiatRates(state);
+const selectDeviceAssetsWithBalances = createMemoizedSelector(
+    [
+        selectVisibleDeviceAccounts,
+        selectDeviceNetworksWithAssets,
+        selectFiatCurrencyCode,
+        selectCurrentFiatRates,
+    ],
+    (accounts, deviceNetworksWithAssets, fiatCurrencyCode, rates) => {
+        const accountsWithFiatBalance = accounts.map(account => {
+            const fiatValue = getAccountFiatBalance({
+                account,
+                localCurrency: fiatCurrencyCode,
+                rates,
+            });
+
+            return {
+                symbol: account.symbol,
+                fiatValue,
+                cryptoValue: getAccountCryptoBalanceWithStaking(account),
+            };
+        });
 
-    const accountsWithFiatBalance = accounts.map(account => {
-        const fiatValue = getAccountFiatBalance({
-            account,
-            localCurrency: fiatCurrencyCode,
-            rates,
+        let totalFiatBalance = 0;
+
+        const assets = deviceNetworksWithAssets.map((networkSymbol: NetworkSymbol) => {
+            const networkAccounts = accountsWithFiatBalance.filter(
+                account => account.symbol === networkSymbol,
+            );
+            const assetBalance = networkAccounts.reduce(
+                (sum, { cryptoValue }) => sum + Number(cryptoValue),
+                0,
+            );
+            const fiatBalance = networkAccounts.reduce(
+                (sum, { fiatValue }) => (fiatValue ? Number(fiatValue) + (sum ?? 0) : sum),
+                null as number | null,
+            );
+
+            totalFiatBalance += fiatBalance ?? 0;
+
+            const asset: AssetType = {
+                symbol: networkSymbol,
+                // For assets we should always only 8 decimals to save space
+                assetBalance: assetBalance.toFixed(8),
+                fiatBalance: fiatBalance !== null ? fiatBalance.toFixed(2) : null,
+            };
+
+            return asset;
         });
 
-        return {
-            symbol: account.symbol,
-            fiatValue,
-            cryptoValue: selectAccountCryptoBalanceWithStaking(state, account.key),
-        };
-    });
-
-    let totalFiatBalance = 0;
-
-    const assets = deviceNetworksWithAssets.map((networkSymbol: NetworkSymbol) => {
-        const networkAccounts = accountsWithFiatBalance.filter(
-            account => account.symbol === networkSymbol,
-        );
-        const assetBalance = networkAccounts.reduce(
-            (sum, { cryptoValue }) => sum + Number(cryptoValue),
-            0,
-        );
-        const fiatBalance = networkAccounts.reduce(
-            (sum, { fiatValue }) => (fiatValue ? Number(fiatValue) + (sum ?? 0) : sum),
-            null as number | null,
-        );
-
-        totalFiatBalance += fiatBalance ?? 0;
-
-        const asset: AssetType = {
-            symbol: networkSymbol,
-            // For assets we should always only 8 decimals to save space
-            assetBalance: assetBalance.toFixed(8),
-            fiatBalance: fiatBalance !== null ? fiatBalance.toFixed(2) : null,
-        };
-
-        return asset;
-    });
-
-    return { assets, totalFiatBalance: totalFiatBalance.toFixed(2) };
-});
+        return { assets, totalFiatBalance: totalFiatBalance.toFixed(2) };
+    },
+);
 
 export const selectAssetCryptoValue = (state: AssetsRootState, symbol: NetworkSymbol) => {
     const assets = selectDeviceAssetsWithBalances(state);
diff --git a/suite-native/assets/src/components/AssetItem.tsx b/suite-native/assets/src/components/AssetItem.tsx
index 6bf7c91c8ed..2d9ab407bf6 100644
--- a/suite-native/assets/src/components/AssetItem.tsx
+++ b/suite-native/assets/src/components/AssetItem.tsx
@@ -4,11 +4,9 @@ import { useSelector } from 'react-redux';
 import { useNavigation } from '@react-navigation/native';
 
 import { useFormatters } from '@suite-common/formatters';
-import { CryptoIconWithPercentage, Icon } from '@suite-common/icons-deprecated';
+import { CryptoIconWithPercentage, Icon } from '@suite-native/icons';
 import { useSelectorDeepComparison } from '@suite-common/redux-utils';
-import { TokenDefinitionsRootState } from '@suite-common/token-definitions';
 import { NetworkSymbol } from '@suite-common/wallet-config';
-import { AccountsRootState, DeviceRootState } from '@suite-common/wallet-core';
 import { AccountsListItemBase, StakingBadge } from '@suite-native/accounts';
 import { Badge, Box, Text } from '@suite-native/atoms';
 import { CryptoAmountFormatter, FiatAmountFormatter } from '@suite-native/formatters';
@@ -24,7 +22,7 @@ import {
     selectHasAnyDeviceAccountsWithStaking,
     NativeStakingRootState,
 } from '@suite-native/staking';
-import { selectHasDeviceAnyTokensForNetwork } from '@suite-native/tokens';
+import { selectHasDeviceAnyTokensForNetwork, TokensRootState } from '@suite-native/tokens';
 
 import {
     AssetsRootState,
@@ -89,9 +87,8 @@ export const AssetItem = React.memo(({ cryptoCurrencySymbol, onPress }: AssetIte
     );
 
     const accountsPerAsset = accountsKeysForNetworkSymbol.length;
-    const hasAnyTokens = useSelector(
-        (state: AccountsRootState & DeviceRootState & TokenDefinitionsRootState) =>
-            selectHasDeviceAnyTokensForNetwork(state, cryptoCurrencySymbol),
+    const hasAnyTokens = useSelector((state: TokensRootState) =>
+        selectHasDeviceAnyTokensForNetwork(state, cryptoCurrencySymbol),
     );
     const hasAnyAccountsWithStaking = useSelector((state: NativeStakingRootState) =>
         selectHasAnyDeviceAccountsWithStaking(state, cryptoCurrencySymbol),
@@ -117,7 +114,7 @@ export const AssetItem = React.memo(({ cryptoCurrencySymbol, onPress }: AssetIte
             badges={
                 <>
                     <Box>
-                        <Icon size="medium" color="iconSubdued" name="standardWallet" />
+                        <Icon size="medium" color="iconSubdued" name="wallet" />
                     </Box>
                     <Text variant="hint" color="textSubdued">
                         {accountsPerAsset}
diff --git a/suite-native/assets/src/components/DiscoveryAssetsLoader.tsx b/suite-native/assets/src/components/DiscoveryAssetsLoader.tsx
index ca5714545d2..bf74be0938f 100644
--- a/suite-native/assets/src/components/DiscoveryAssetsLoader.tsx
+++ b/suite-native/assets/src/components/DiscoveryAssetsLoader.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { ListItemSkeleton, HStack, Text } from '@suite-native/atoms';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { Translation } from '@suite-native/intl';
 
 export const DiscoveryAssetsLoader = ({ isListEmpty }: { isListEmpty: boolean }) => {
@@ -19,7 +19,7 @@ export const DiscoveryAssetsLoader = ({ isListEmpty }: { isListEmpty: boolean })
         <>
             <ListItemSkeleton />
             <HStack justifyContent="center" marginBottom="sp16">
-                <Icon size="mediumLarge" name="trezor" />
+                <Icon size="mediumLarge" name="trezorLogo" />
                 <Text variant="callout">{discoveryProgressText}</Text>
             </HStack>
         </>
diff --git a/suite-native/assets/tsconfig.json b/suite-native/assets/tsconfig.json
index baf9b8a7599..859b6f035e2 100644
--- a/suite-native/assets/tsconfig.json
+++ b/suite-native/assets/tsconfig.json
@@ -6,9 +6,6 @@
         {
             "path": "../../suite-common/formatters"
         },
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/redux-utils"
         },
@@ -28,6 +25,7 @@
         { "path": "../atoms" },
         { "path": "../config" },
         { "path": "../formatters" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../navigation" },
         { "path": "../settings" },
diff --git a/suite-native/atoms/package.json b/suite-native/atoms/package.json
index dd7ae02c237..d1ca20a94fb 100644
--- a/suite-native/atoms/package.json
+++ b/suite-native/atoms/package.json
@@ -6,14 +6,18 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
+        "@gorhom/bottom-sheet": "5.0.5",
         "@mobily/ts-belt": "^3.13.1",
+        "@shopify/flash-list": "1.7.1",
         "@shopify/react-native-skia": "1.3.11",
-        "@suite-common/icons-deprecated": "workspace:*",
+        "@suite-common/wallet-config": "workspace:*",
+        "@suite-common/wallet-types": "workspace:*",
+        "@suite-native/config": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:^",
         "@suite-native/storage": "workspace:*",
         "@trezor/env-utils": "workspace:*",
@@ -25,7 +29,7 @@
         "react": "18.2.0",
         "react-native": "0.75.2",
         "react-native-gesture-handler": "2.18.1",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-native-safe-area-context": "4.10.9"
     }
 }
diff --git a/suite-native/atoms/src/Accordion/AccordionItem.tsx b/suite-native/atoms/src/Accordion/AccordionItem.tsx
index fa8830056ed..5806e6a801c 100644
--- a/suite-native/atoms/src/Accordion/AccordionItem.tsx
+++ b/suite-native/atoms/src/Accordion/AccordionItem.tsx
@@ -64,7 +64,7 @@ export const AccordionItem = ({ title, content }: AccordionItemProps) => {
                         <Text style={applyStyle(titleStyle)}>{title}</Text>
                         <Animated.View style={[animatedChevronStyle]}>
                             <IconButton
-                                iconName="chevronRight"
+                                iconName="caretRight"
                                 colorScheme="tertiaryElevation0"
                                 size="small"
                                 onPress={toggleIsOpen}
diff --git a/suite-native/atoms/src/AlertBox.tsx b/suite-native/atoms/src/AlertBox.tsx
index 43b3c4cf180..ba5464c23f3 100644
--- a/suite-native/atoms/src/AlertBox.tsx
+++ b/suite-native/atoms/src/AlertBox.tsx
@@ -2,11 +2,12 @@ import { ReactNode } from 'react';
 import { ActivityIndicator } from 'react-native';
 
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { Color, nativeBorders } from '@trezor/theme';
-import { Icon, IconName } from '@suite-common/icons-deprecated';
+import { Color, NativeRadius } from '@trezor/theme';
+import { Icon, IconName } from '@suite-native/icons';
 
 import { Box } from './Box';
 import { Text } from './Text';
+import { nativeRadiusToNumber } from './utils';
 
 export type AlertBoxVariant = 'info' | 'success' | 'warning' | 'loading' | 'error';
 
@@ -72,15 +73,15 @@ const variantToColorMap = {
 const variantToIconName = {
     info: 'info',
     success: 'checkCircle',
-    warning: 'warningTriangle',
-    loading: 'warningTriangle',
+    warning: 'warning',
+    loading: 'warning',
     error: 'warningCircle',
 } as const satisfies Record<AlertBoxVariant, IconName>;
 
 export type AlertBoxProps = {
     variant: AlertBoxVariant;
     title: ReactNode;
-    borderRadius?: number;
+    borderRadius?: NativeRadius | number;
 };
 
 const AlertSpinner = ({ color }: { color: Color }) => {
@@ -91,18 +92,14 @@ const AlertSpinner = ({ color }: { color: Color }) => {
     return <ActivityIndicator size={16} color={colors[color]} />;
 };
 
-export const AlertBox = ({
-    title,
-    variant = 'info',
-    borderRadius = nativeBorders.radii.medium,
-}: AlertBoxProps) => {
+export const AlertBox = ({ title, variant = 'info', borderRadius = 'r16' }: AlertBoxProps) => {
     const { applyStyle } = useNativeStyles();
     const { contentColor, backgroundColor, borderColor } = variantToColorMap[variant];
 
     return (
         <Box
             style={applyStyle(alertWrapperStyle, {
-                borderRadius,
+                borderRadius: nativeRadiusToNumber(borderRadius),
                 borderColor,
                 backgroundColor,
             })}
diff --git a/suite-native/atoms/src/Badge.tsx b/suite-native/atoms/src/Badge.tsx
index e6cb2f991ed..8e3ff7eb0f8 100644
--- a/suite-native/atoms/src/Badge.tsx
+++ b/suite-native/atoms/src/Badge.tsx
@@ -3,15 +3,9 @@ import { ReactNode } from 'react';
 import { G } from '@mobily/ts-belt';
 
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import {
-    Icon,
-    IconSize,
-    IconName,
-    CryptoIconName,
-    icons,
-    CryptoIcon,
-} from '@suite-common/icons-deprecated';
+import { Icon, IconSize, IconName, icons, CryptoIcon } from '@suite-native/icons';
 import { Color } from '@trezor/theme';
+import { NetworkSymbol } from '@suite-common/wallet-config';
 
 import { Text } from './Text';
 import { HStack } from './Stack';
@@ -24,7 +18,7 @@ type BadgeProps = {
     label: ReactNode;
     variant?: BadgeVariant;
     size?: BadgeSize;
-    icon?: IconName | CryptoIconName;
+    icon?: IconName | NetworkSymbol;
     iconSize?: IconSize;
     elevation?: SurfaceElevation;
     isDisabled?: boolean;
@@ -147,7 +141,7 @@ export const Badge = ({
             <Icon name={icon as IconName} color={iconColor} size={iconSize ?? 'small'} />
         ) : (
             <CryptoIcon
-                symbol={icon as CryptoIconName}
+                symbol={icon as NetworkSymbol}
                 size={size === 'small' ? 'extraSmall' : 'small'}
             />
         );
diff --git a/suite-native/atoms/src/Button/Button.tsx b/suite-native/atoms/src/Button/Button.tsx
index 9e2e40bb08e..ac352bc7624 100644
--- a/suite-native/atoms/src/Button/Button.tsx
+++ b/suite-native/atoms/src/Button/Button.tsx
@@ -4,9 +4,9 @@ import Animated, { FadeIn } from 'react-native-reanimated';
 
 import { MergeExclusive } from 'type-fest';
 
+import { AnimatedIconColor, Icon, IconName, IconSize, icons } from '@suite-native/icons';
 import { Color, TypographyStyle, nativeSpacings } from '@trezor/theme';
 import { NativeStyleObject, prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { Icon, IconColor, IconName, IconSize, icons } from '@suite-common/icons-deprecated';
 
 import { Text } from '../Text';
 import { useButtonPressAnimatedStyle } from './useButtonPressAnimatedStyle';
@@ -46,13 +46,13 @@ export type ButtonProps = Omit<PressableProps, 'style' | 'onPressIn' | 'onPressO
 
 type ButtonIconProps = {
     iconName: IconName;
-    color?: IconColor;
+    color?: AnimatedIconColor;
     size?: ButtonSize;
 };
 
 type ButtonAccessoryViewProps = {
     element: ButtonAccessory;
-    iconColor?: IconColor;
+    iconColor?: AnimatedIconColor;
     iconSize?: ButtonSize;
 };
 
@@ -207,7 +207,7 @@ export const buttonToTextSizeMap = {
     large: 'body',
 } as const satisfies Record<ButtonSize, TypographyStyle>;
 
-const buttonToIconSizeMap = {
+export const buttonToIconSizeMap = {
     extraSmall: 'medium',
     small: 'medium',
     medium: 'mediumLarge',
@@ -241,14 +241,20 @@ export const ButtonIcon = ({
     iconName,
     color = 'iconDefault',
     size = 'medium',
-}: ButtonIconProps) => <Icon name={iconName} color={color} size={buttonToIconSizeMap[size]} />;
+}: ButtonIconProps) => (
+    <Icon.Animated name={iconName} color={color} size={buttonToIconSizeMap[size]} />
+);
 
 const isIconName = (value: ButtonAccessory): value is IconName =>
-    typeof value === 'string' && icons[value as IconName] !== undefined;
+    typeof value === 'string' && value in icons;
 
 // ButtonAccessoryView renders either a ButtonIcon or a provided custom element
 // iconColor and iconSize are only used when element is an IconName
-export const ButtonAccessoryView = ({ element, iconColor, iconSize }: ButtonAccessoryViewProps) => {
+export const ButtonAccessoryView = ({
+    element,
+    iconColor = 'iconDefault',
+    iconSize = 'medium',
+}: ButtonAccessoryViewProps) => {
     if (isIconName(element)) {
         return <ButtonIcon iconName={element} color={iconColor} size={iconSize} />;
     }
@@ -256,6 +262,8 @@ export const ButtonAccessoryView = ({ element, iconColor, iconSize }: ButtonAcce
     return element;
 };
 
+const AnimatedPressable = Animated.createAnimatedComponent(Pressable);
+
 export const Button = ({
     viewLeft,
     viewRight,
@@ -285,53 +293,46 @@ export const Button = ({
     const handlePressOut = () => setIsPressed(false);
 
     return (
-        <Pressable
+        <AnimatedPressable
             disabled={isDisabled}
             onPressIn={handlePressIn}
             onPressOut={handlePressOut}
             {...pressableProps}
+            style={[
+                animatedPressStyle,
+                applyStyle(buttonStyle, {
+                    size,
+                    backgroundColor,
+                    isDisabled,
+                }),
+                style,
+            ]}
         >
-            <Animated.View
-                style={[
-                    animatedPressStyle,
-                    applyStyle(buttonStyle, {
-                        size,
-                        backgroundColor,
-                        isDisabled,
-                    }),
-                    style,
-                ]}
-            >
-                {isLoading ? (
-                    <Animated.View entering={FadeIn.duration(LOADER_FADE_IN_DURATION)}>
-                        <Loader color={textColor} />
-                    </Animated.View>
-                ) : (
-                    <HStack alignItems="center">
-                        {viewLeft && (
-                            <ButtonAccessoryView
-                                element={viewLeft}
-                                iconColor={iconColor}
-                                iconSize={size}
-                            />
-                        )}
-                        <Text
-                            textAlign="center"
-                            variant={buttonToTextSizeMap[size]}
-                            color={textColor}
-                        >
-                            {children}
-                        </Text>
-                        {viewRight && (
-                            <ButtonAccessoryView
-                                element={viewRight}
-                                iconColor={iconColor}
-                                iconSize={size}
-                            />
-                        )}
-                    </HStack>
-                )}
-            </Animated.View>
-        </Pressable>
+            {isLoading ? (
+                <Animated.View entering={FadeIn.duration(LOADER_FADE_IN_DURATION)}>
+                    <Loader color={textColor} />
+                </Animated.View>
+            ) : (
+                <HStack alignItems="center">
+                    {viewLeft && (
+                        <ButtonAccessoryView
+                            element={viewLeft}
+                            iconColor={iconColor}
+                            iconSize={size}
+                        />
+                    )}
+                    <Text textAlign="center" variant={buttonToTextSizeMap[size]} color={textColor}>
+                        {children}
+                    </Text>
+                    {viewRight && (
+                        <ButtonAccessoryView
+                            element={viewRight}
+                            iconColor={iconColor}
+                            iconSize={size}
+                        />
+                    )}
+                </HStack>
+            )}
+        </AnimatedPressable>
     );
 };
diff --git a/suite-native/atoms/src/Button/IconButton.tsx b/suite-native/atoms/src/Button/IconButton.tsx
index b8694836aab..c4cb00f4bed 100644
--- a/suite-native/atoms/src/Button/IconButton.tsx
+++ b/suite-native/atoms/src/Button/IconButton.tsx
@@ -1,58 +1,56 @@
-import { ReactNode, useState } from 'react';
+import { useState } from 'react';
 import { Pressable, PressableProps } from 'react-native';
 import Animated from 'react-native-reanimated';
 
-import { IconName } from '@suite-common/icons-deprecated';
+import { IconName, Icon } from '@suite-native/icons';
 import {
+    mergeNativeStyles,
     NativeStyleObject,
     prepareNativeStyle,
-    mergeNativeStyles,
     useNativeStyles,
 } from '@trezor/styles';
 
 import {
     ButtonColorScheme,
-    ButtonSize,
     buttonSchemeToColorsMap,
+    ButtonSize,
     buttonStyle,
     ButtonStyleProps,
-    ButtonIcon,
+    buttonToIconSizeMap,
 } from './Button';
-import { Box } from '../Box';
-import { Text } from '../Text';
 import { useButtonPressAnimatedStyle } from './useButtonPressAnimatedStyle';
-
 type IconButtonProps = Omit<PressableProps, 'style' | 'onPressIn' | 'onPressOut'> & {
     iconName: IconName;
     colorScheme?: ButtonColorScheme;
     size?: ButtonSize;
     style?: NativeStyleObject;
-    title?: ReactNode;
     isDisabled?: boolean;
 };
+const sizeDimensions = {
+    extraSmall: 36,
+    small: 40,
+    medium: 48,
+    large: 56,
+} as const satisfies Record<ButtonSize, number>;
 
 const iconButtonStyle = mergeNativeStyles([
     buttonStyle,
     prepareNativeStyle<ButtonStyleProps>((_, { size, hasTitle }) => {
-        const sizeDimensions = {
-            extraSmall: 36,
-            small: 40,
-            medium: 48,
-            large: 56,
-        } as const satisfies Record<ButtonSize, number>;
-
         return {
-            padding: 0,
             height: sizeDimensions[size],
             width: hasTitle ? 'auto' : sizeDimensions[size],
+            // padding must be set using paddingVertical and paddingHorizontal otverwise it won't override the default padding
+            paddingVertical: 0,
+            paddingHorizontal: 0,
         };
     }),
 ]);
 
+const AnimatedPressable = Animated.createAnimatedComponent(Pressable);
+
 export const IconButton = ({
     iconName,
     style,
-    title,
     colorScheme = 'primary',
     size = 'medium',
     isDisabled = false,
@@ -74,34 +72,22 @@ export const IconButton = ({
     const handlePressOut = () => setIsPressed(false);
 
     return (
-        <Box alignItems="center" style={style}>
-            <Pressable
-                onPressIn={handlePressIn}
-                onPressOut={handlePressOut}
-                disabled={isDisabled}
-                {...pressableProps}
-            >
-                <Box alignItems="center">
-                    <Animated.View
-                        style={[
-                            animatedPressStyle,
-                            applyStyle(iconButtonStyle, {
-                                size,
-                                backgroundColor,
-                                isDisabled,
-                            }),
-                            style,
-                        ]}
-                    >
-                        <ButtonIcon iconName={iconName} color={iconColor} size={size} />
-                    </Animated.View>
-                    {title && (
-                        <Text variant="label" color="textSubdued">
-                            {title}
-                        </Text>
-                    )}
-                </Box>
-            </Pressable>
-        </Box>
+        <AnimatedPressable
+            onPressIn={handlePressIn}
+            onPressOut={handlePressOut}
+            disabled={isDisabled}
+            {...pressableProps}
+            style={[
+                animatedPressStyle,
+                applyStyle(iconButtonStyle, {
+                    size,
+                    backgroundColor,
+                    isDisabled,
+                }),
+                style,
+            ]}
+        >
+            <Icon name={iconName} color={iconColor} size={buttonToIconSizeMap[size]} />
+        </AnimatedPressable>
     );
 };
diff --git a/suite-native/atoms/src/Card/Card.tsx b/suite-native/atoms/src/Card/Card.tsx
index e900973fe8e..6395fd0c17a 100644
--- a/suite-native/atoms/src/Card/Card.tsx
+++ b/suite-native/atoms/src/Card/Card.tsx
@@ -25,7 +25,7 @@ const cardContainerStyle = prepareNativeStyle<{
     borderColor?: Color;
 }>((utils, { isAlertDisplayed, noPadding, borderColor }) => ({
     backgroundColor: utils.colors.backgroundSurfaceElevation1,
-    borderRadius: utils.borders.radii.medium,
+    borderRadius: utils.borders.radii.r16,
     padding: noPadding ? 0 : utils.spacings.sp16,
     ...utils.boxShadows.small,
 
@@ -49,8 +49,8 @@ const cardContainerStyle = prepareNativeStyle<{
 
 const alertBoxWrapperStyle = prepareNativeStyle(utils => ({
     backgroundColor: utils.colors.backgroundSurfaceElevation1,
-    borderTopLeftRadius: utils.borders.radii.medium,
-    borderTopRightRadius: utils.borders.radii.medium,
+    borderTopLeftRadius: utils.borders.radii.r16,
+    borderTopRightRadius: utils.borders.radii.r16,
     paddingHorizontal: utils.spacings.sp4,
     paddingTop: utils.spacings.sp4,
 }));
diff --git a/suite-native/atoms/src/Card/HeaderedCard.tsx b/suite-native/atoms/src/Card/HeaderedCard.tsx
index 9356bf43ab6..ac53fe2d150 100644
--- a/suite-native/atoms/src/Card/HeaderedCard.tsx
+++ b/suite-native/atoms/src/Card/HeaderedCard.tsx
@@ -2,7 +2,7 @@ import { ReactNode } from 'react';
 
 import { RequireAllOrNone } from 'type-fest';
 
-import { IconName } from '@suite-common/icons-deprecated';
+import { IconName } from '@suite-native/icons';
 
 import { Card, CardProps } from './Card';
 import { Text } from '../Text';
diff --git a/suite-native/atoms/src/CheckBox.tsx b/suite-native/atoms/src/CheckBox.tsx
index 11c1b6adc55..a26bc6a838f 100644
--- a/suite-native/atoms/src/CheckBox.tsx
+++ b/suite-native/atoms/src/CheckBox.tsx
@@ -1,6 +1,6 @@
 import { TouchableOpacity } from 'react-native';
 
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { NativeStyleObject, prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
 import { ACCESSIBILITY_FONTSIZE_MULTIPLIER } from './Text';
@@ -26,7 +26,7 @@ const checkBoxStyle = prepareNativeStyle<CheckBoxStyleProps>(
         width: CHECKBOX_SIZE,
         alignItems: 'center',
         justifyContent: 'center',
-        borderRadius: 4,
+        borderRadius: utils.borders.radii.r4,
         borderWidth: utils.borders.widths.medium,
         borderColor: utils.colors.borderElevation2,
         backgroundColor: isDisabled
diff --git a/suite-native/atoms/src/ErrorMessage.tsx b/suite-native/atoms/src/ErrorMessage.tsx
index 8776104d9be..37f87d07fbd 100644
--- a/suite-native/atoms/src/ErrorMessage.tsx
+++ b/suite-native/atoms/src/ErrorMessage.tsx
@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
 
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 
 import { Box } from './Box';
 import { Text } from './Text';
@@ -18,7 +18,7 @@ const errorMessageStyle = prepareNativeStyle(utils => ({
     margin: utils.spacings.sp8,
     borderColor: utils.colors.borderAlertRed,
     borderWidth: 1,
-    borderRadius: utils.borders.radii.medium,
+    borderRadius: utils.borders.radii.r16,
     padding: utils.spacings.sp24,
 }));
 
diff --git a/suite-native/atoms/src/Hint.tsx b/suite-native/atoms/src/Hint.tsx
index dbcdc69fe57..7ccc3817154 100644
--- a/suite-native/atoms/src/Hint.tsx
+++ b/suite-native/atoms/src/Hint.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 
-import { Icon, IconName } from '@suite-common/icons-deprecated';
+import { Icon, IconName } from '@suite-native/icons';
 import { useNativeStyles, prepareNativeStyle, NativeStyleObject } from '@trezor/styles';
 import { Color } from '@trezor/theme';
 
diff --git a/suite-native/atoms/src/Input/Input.tsx b/suite-native/atoms/src/Input/Input.tsx
index d7fee699b87..6d48d40231a 100644
--- a/suite-native/atoms/src/Input/Input.tsx
+++ b/suite-native/atoms/src/Input/Input.tsx
@@ -87,7 +87,7 @@ const inputWrapperStyle = prepareNativeStyle<InputWrapperStyleProps>(
             ? utils.colors.backgroundNeutralSubtleOnElevation1
             : utils.colors.borderInputDefault,
         borderWidth: utils.borders.widths.small,
-        borderRadius: 1.5 * utils.borders.radii.small,
+        borderRadius: utils.borders.radii.r12,
         margin: utils.borders.widths.small,
         paddingHorizontal: INPUT_WRAPPER_PADDING_HORIZONTAL,
         justifyContent: 'flex-end',
diff --git a/suite-native/atoms/src/Input/SearchInput.tsx b/suite-native/atoms/src/Input/SearchInput.tsx
index 4c3219d76fb..a38047ddb07 100644
--- a/suite-native/atoms/src/Input/SearchInput.tsx
+++ b/suite-native/atoms/src/Input/SearchInput.tsx
@@ -1,7 +1,7 @@
 import { useState, useRef } from 'react';
 import { Pressable, TextInput, TouchableOpacity } from 'react-native';
 
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
 import { Box } from '../Box';
@@ -34,7 +34,7 @@ const inputWrapperStyle = prepareNativeStyle<InputStyleProps>(
         alignItems: 'center',
         height: 48,
         borderWidth: utils.borders.widths.small,
-        borderRadius: utils.borders.radii.small,
+        borderRadius: utils.borders.radii.r8,
         borderColor: utils.colors.backgroundNeutralSubtleOnElevation0,
         backgroundColor: utils.colors.backgroundNeutralSubtleOnElevation0,
         paddingLeft: 14,
@@ -86,7 +86,7 @@ export const SearchInput = ({
     return (
         <Pressable onPress={handleInputFocus}>
             <Box style={applyStyle(inputWrapperStyle, { isFocused, elevation })}>
-                <Icon name="search" color="iconSubdued" size="large" />
+                <Icon name="magnifyingGlass" color="iconSubdued" size="large" />
                 <TextInput
                     ref={searchInputRef}
                     onChangeText={handleOnChangeText}
@@ -100,7 +100,7 @@ export const SearchInput = ({
                 />
                 {isClearButtonVisible && (
                     <TouchableOpacity onPress={handleClear}>
-                        <Icon name="closeCircle" size="large" color="iconSubdued" />
+                        <Icon name="xCircle" size="large" color="iconSubdued" />
                     </TouchableOpacity>
                 )}
             </Box>
diff --git a/suite-native/atoms/src/OrderedListIcon.tsx b/suite-native/atoms/src/OrderedListIcon.tsx
index 73fec6d13ec..1cb092f55e1 100644
--- a/suite-native/atoms/src/OrderedListIcon.tsx
+++ b/suite-native/atoms/src/OrderedListIcon.tsx
@@ -1,7 +1,7 @@
 import { G } from '@mobily/ts-belt';
 import { RequireExactlyOne } from 'type-fest';
 
-import { Icon, IconName, IconSize } from '@suite-common/icons-deprecated';
+import { Icon, IconName, IconSize } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { Color } from '@trezor/theme';
 
@@ -14,7 +14,7 @@ const iconBackgroundStyle = prepareNativeStyle<{ color: Color; borderColor: Colo
         justifyContent: 'center',
         width: utils.spacings.sp32,
         height: utils.spacings.sp32,
-        borderRadius: 12,
+        borderRadius: utils.borders.radii.r12,
         extend: [
             {
                 condition: G.isNotNullable(color),
diff --git a/suite-native/atoms/src/Pictogram.tsx b/suite-native/atoms/src/Pictogram.tsx
index 0b81745f173..c35a963f6ab 100644
--- a/suite-native/atoms/src/Pictogram.tsx
+++ b/suite-native/atoms/src/Pictogram.tsx
@@ -1,4 +1,4 @@
-import { IconName, Icon } from '@suite-common/icons-deprecated';
+import { IconName, Icon } from '@suite-native/icons';
 import { Color } from '@trezor/theme';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
diff --git a/suite-native/atoms/src/RoundedIcon.tsx b/suite-native/atoms/src/RoundedIcon.tsx
index 66a16208172..0e591a9c45a 100644
--- a/suite-native/atoms/src/RoundedIcon.tsx
+++ b/suite-native/atoms/src/RoundedIcon.tsx
@@ -1,20 +1,17 @@
 import { G } from '@mobily/ts-belt';
 
-import {
-    CryptoIcon,
-    CoinSymbol,
-    Icon,
-    IconName,
-    icons,
-    IconSize,
-} from '@suite-common/icons-deprecated';
+import { CryptoIcon, Icon, IconName, icons, IconSize } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { Color } from '@trezor/theme';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+import { TokenAddress } from '@suite-common/wallet-types';
 
 import { Box, BoxProps } from './Box';
 
 export type RoundedIconProps = {
-    name: IconName | CoinSymbol;
+    name?: IconName;
+    networkSymbol?: NetworkSymbol;
+    contractAddress?: TokenAddress;
     color?: Color;
     iconSize?: IconSize;
     containerSize?: number;
@@ -43,6 +40,8 @@ const iconContainerStyle = prepareNativeStyle<{ backgroundColor?: Color; contain
 
 export const RoundedIcon = ({
     name,
+    networkSymbol,
+    contractAddress,
     color,
     iconSize,
     backgroundColor,
@@ -57,10 +56,12 @@ export const RoundedIcon = ({
             style={[applyStyle(iconContainerStyle, { backgroundColor, containerSize }), style]}
             {...boxProps}
         >
-            {name in icons ? (
+            {name && name in icons ? (
                 <Icon name={name as IconName} color={color} size={iconSize} />
             ) : (
-                <CryptoIcon symbol={name as CoinSymbol} />
+                networkSymbol && (
+                    <CryptoIcon symbol={networkSymbol} contractAddress={contractAddress} />
+                )
             )}
         </Box>
     );
diff --git a/suite-native/atoms/src/ScreenHeaderWrapper.tsx b/suite-native/atoms/src/ScreenHeaderWrapper.tsx
index 26d55e931b1..8cc5f01b6ac 100644
--- a/suite-native/atoms/src/ScreenHeaderWrapper.tsx
+++ b/suite-native/atoms/src/ScreenHeaderWrapper.tsx
@@ -16,8 +16,7 @@ const screenHeaderWrapperStyle = prepareNativeStyle<{ insets: EdgeInsets }>(
         alignItems: 'center',
         paddingLeft: Math.max(insets.left, utils.spacings.sp16),
         paddingRight: Math.max(insets.right, utils.spacings.sp16),
-        paddingVertical: utils.spacings.sp16,
-        paddingBottom: utils.spacings.sp12,
+        paddingVertical: utils.spacings.sp8,
     }),
 );
 
diff --git a/suite-native/atoms/src/Select/Select.tsx b/suite-native/atoms/src/Select/Select.tsx
index 4d0bcc488d4..5e0cd43fb8b 100644
--- a/suite-native/atoms/src/Select/Select.tsx
+++ b/suite-native/atoms/src/Select/Select.tsx
@@ -1,14 +1,5 @@
 import { useMemo, useState, ReactNode } from 'react';
 
-import {
-    CryptoIcon,
-    CryptoIconName,
-    FlagIcon,
-    FlagIconName,
-    isCryptoIconType,
-    isFlagIconType,
-} from '@suite-common/icons-deprecated';
-
 import { BottomSheet } from '../Sheet/BottomSheet';
 import { SelectItemValue, SelectItem } from './SelectItem';
 import { SelectTrigger } from './SelectTrigger';
@@ -18,13 +9,8 @@ export type SelectItemType<TItemValue extends SelectItemValue> = {
     label: string;
 };
 
-export type SelectItemExtendedType<TItemValue extends SelectItemValue> =
-    SelectItemType<TItemValue> & {
-        iconName?: FlagIconName | CryptoIconName;
-    };
-
 type SelectProps<TItemValue extends SelectItemValue> = {
-    items: SelectItemExtendedType<TItemValue>[];
+    items: SelectItemType<TItemValue>[];
     selectValue: SelectItemValue;
     onSelectItem: (value: TItemValue) => void;
     selectLabel: ReactNode;
@@ -47,25 +33,14 @@ export const Select = <TItemValue extends SelectItemValue>({
         setIsOpen(false);
     };
 
-    const getIcon = (iconName?: CryptoIconName | FlagIconName, isSelectItem = false): ReactNode => {
-        if (!iconName) return null;
-        if (isCryptoIconType(iconName)) {
-            return <CryptoIcon size={isSelectItem ? 'small' : 'extraSmall'} symbol={iconName} />;
-        }
-        if (isFlagIconType(iconName)) {
-            return <FlagIcon size={isSelectItem ? 'small' : 'extraSmall'} name={iconName} />;
-        }
-    };
-
     return (
         <>
             <BottomSheet isVisible={isOpen} onClose={setIsOpen} title={selectLabel}>
-                {items.map(({ value, label, iconName }, index) => (
+                {items.map(({ value, label }, index) => (
                     <SelectItem
                         key={value}
                         label={label}
                         value={value}
-                        icon={getIcon(iconName, true)}
                         isSelected={value === selectedItem?.value}
                         isLastChild={index === items.length - 1}
                         onSelect={() => handleSelectItem(value)}
@@ -73,7 +48,6 @@ export const Select = <TItemValue extends SelectItemValue>({
                 ))}
             </BottomSheet>
             <SelectTrigger
-                icon={getIcon(selectedItem?.iconName)}
                 value={selectedItem?.label ?? null}
                 label={selectLabel}
                 handlePress={() => setIsOpen(true)}
diff --git a/suite-native/atoms/src/Select/SelectItem.tsx b/suite-native/atoms/src/Select/SelectItem.tsx
index a45fbb007a9..41fa12721bd 100644
--- a/suite-native/atoms/src/Select/SelectItem.tsx
+++ b/suite-native/atoms/src/Select/SelectItem.tsx
@@ -16,7 +16,7 @@ export type SelectItemProps = {
     onSelect: () => void;
     isSelected: boolean;
     isLastChild?: boolean;
-    icon: ReactNode;
+    icon?: ReactNode;
 };
 
 type SelectItemStyleProps = {
diff --git a/suite-native/atoms/src/Select/SelectTrigger.tsx b/suite-native/atoms/src/Select/SelectTrigger.tsx
index 20a87210051..dc4b28c98c4 100644
--- a/suite-native/atoms/src/Select/SelectTrigger.tsx
+++ b/suite-native/atoms/src/Select/SelectTrigger.tsx
@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
 import { TouchableOpacity } from 'react-native';
 
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
 import { Box } from '../Box';
@@ -10,7 +10,7 @@ import { ACCESSIBILITY_FONTSIZE_MULTIPLIER, Text } from '../Text';
 type SelectTriggerProps = {
     value: string | null;
     label: ReactNode;
-    icon: ReactNode;
+    icon?: ReactNode;
     handlePress: () => void;
 };
 
@@ -22,7 +22,7 @@ const selectStyle = prepareNativeStyle(utils => ({
     alignItems: 'center',
     backgroundColor: utils.colors.backgroundNeutralSubtleOnElevation1,
     borderWidth: utils.borders.widths.small,
-    borderRadius: utils.borders.radii.small,
+    borderRadius: utils.borders.radii.r8,
     borderColor: utils.colors.backgroundNeutralSubtleOnElevation1,
     color: utils.colors.textSubdued,
     paddingLeft: utils.spacings.sp12,
@@ -52,7 +52,7 @@ export const SelectTrigger = ({ value, label, icon, handlePress }: SelectTrigger
                     </Text>
                 </Box>
             </Box>
-            <Icon size="large" color="iconSubdued" name="chevronDown" />
+            <Icon size="large" color="iconSubdued" name="caretDown" />
         </TouchableOpacity>
     );
 };
diff --git a/suite-native/atoms/src/SelectableItem.tsx b/suite-native/atoms/src/SelectableItem.tsx
index 930f1391bcf..d40098ce3ce 100644
--- a/suite-native/atoms/src/SelectableItem.tsx
+++ b/suite-native/atoms/src/SelectableItem.tsx
@@ -12,7 +12,7 @@ import { Radio } from './Radio';
 
 const cardStyle = prepareNativeStyle((utils, { isSelected }: { isSelected: boolean }) => ({
     backgroundColor: utils.colors.backgroundSurfaceElevation1,
-    borderRadius: utils.borders.radii.medium,
+    borderRadius: utils.borders.radii.r16,
     padding: utils.spacings.sp16,
     ...utils.boxShadows.small,
     extend: [
@@ -83,7 +83,7 @@ export const SelectableItem = ({
                                 key="defaultType"
                                 variant="greenSubtle"
                                 label={<Translation id="generic.default" />}
-                                icon="checkCircleSolid"
+                                icon="checkCircle"
                             />
                         </View>
                     )}
diff --git a/suite-native/atoms/src/Sheet/BottomSheet.tsx b/suite-native/atoms/src/Sheet/BottomSheet.tsx
index 02f450cbb1c..809dc62a09b 100644
--- a/suite-native/atoms/src/Sheet/BottomSheet.tsx
+++ b/suite-native/atoms/src/Sheet/BottomSheet.tsx
@@ -29,8 +29,8 @@ const DEFAULT_INSET_BOTTOM = 50;
 
 const sheetWrapperStyle = prepareNativeStyle<WrapperStyleProps>((utils, { insetBottom }) => ({
     backgroundColor: utils.colors.backgroundSurfaceElevation0,
-    borderTopLeftRadius: utils.borders.radii.large,
-    borderTopRightRadius: utils.borders.radii.large,
+    borderTopLeftRadius: utils.borders.radii.r20,
+    borderTopRightRadius: utils.borders.radii.r20,
     paddingBottom: Math.max(insetBottom, utils.spacings.sp16),
     maxHeight: '90%',
 }));
@@ -95,7 +95,7 @@ export const BottomSheet = ({
                 <Pressable style={applyStyle(sheetWithOverlayStyle)} onPress={handlePressOutside}>
                     <PanGestureHandler
                         enabled={isCloseScrollEnabled}
-                        ref={panGestureRef.current}
+                        ref={panGestureRef}
                         activeOffsetY={5}
                         failOffsetY={-5}
                         onGestureEvent={panGestureEvent}
diff --git a/suite-native/atoms/src/Sheet/BottomSheetContainer.tsx b/suite-native/atoms/src/Sheet/BottomSheetContainer.tsx
index 379d3d75994..06b37dfe3e2 100644
--- a/suite-native/atoms/src/Sheet/BottomSheetContainer.tsx
+++ b/suite-native/atoms/src/Sheet/BottomSheetContainer.tsx
@@ -8,6 +8,7 @@ type SheetProps = {
     children: ReactNode;
     isVisible: boolean;
     onClose: () => void;
+    ExtraProvider?: React.ComponentType;
 };
 
 const ContentWrapperStyle = prepareNativeStyle(_ => ({ flex: 1 }));
@@ -21,19 +22,28 @@ const BottomSheetGestureHandler = gestureHandlerRootHOC<{ children: ReactNode }>
     <>{children}</>
 ));
 
-export const BottomSheetContainer = ({ children, isVisible, onClose }: SheetProps) => {
+export const BottomSheetContainer = ({
+    children,
+    isVisible,
+    onClose,
+    ExtraProvider,
+}: SheetProps) => {
     const { applyStyle } = useNativeStyles();
 
     return (
         <RNModal transparent visible={isVisible} onRequestClose={onClose}>
-            <BottomSheetGestureHandler>
-                <KeyboardAvoidingView
-                    behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-                    style={applyStyle(ContentWrapperStyle)}
-                >
-                    {children}
-                </KeyboardAvoidingView>
-            </BottomSheetGestureHandler>
+            <>
+                <BottomSheetGestureHandler>
+                    <KeyboardAvoidingView
+                        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+                        style={applyStyle(ContentWrapperStyle)}
+                    >
+                        {children}
+                    </KeyboardAvoidingView>
+                </BottomSheetGestureHandler>
+
+                {ExtraProvider && <ExtraProvider />}
+            </>
         </RNModal>
     );
 };
diff --git a/suite-native/atoms/src/Sheet/BottomSheetFlashList.tsx b/suite-native/atoms/src/Sheet/BottomSheetFlashList.tsx
new file mode 100644
index 00000000000..612ef883911
--- /dev/null
+++ b/suite-native/atoms/src/Sheet/BottomSheetFlashList.tsx
@@ -0,0 +1,118 @@
+import { ReactNode, useCallback, useEffect, useMemo, useRef } from 'react';
+import { Dimensions, StyleSheet, View } from 'react-native';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+
+import {
+    BottomSheetBackdrop,
+    BottomSheetModal,
+    BottomSheetFlashList as FlashList,
+} from '@gorhom/bottom-sheet';
+import { FlashListProps } from '@shopify/flash-list';
+
+import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+
+export type BottomSheetFlashListProps<TItem> = {
+    isVisible: boolean;
+    isCloseDisplayed?: boolean;
+    onClose: (isVisible: boolean) => void;
+    title?: ReactNode;
+    subtitle?: ReactNode;
+    estimatedListHeight?: number;
+} & FlashListProps<TItem>;
+
+const DEFAULT_INSET_BOTTOM = 25;
+
+const bottomSheetStyle = prepareNativeStyle(utils => ({
+    backgroundColor: utils.colors.backgroundSurfaceElevation0,
+
+    borderTopLeftRadius: utils.borders.radii.r20,
+    borderTopRightRadius: utils.borders.radii.r20,
+}));
+
+const sheetContentContainerStyle = prepareNativeStyle<{
+    insetBottom: number;
+}>((utils, { insetBottom }) => ({
+    paddingBottom: Math.max(insetBottom, utils.spacings.sp16),
+    paddingHorizontal: utils.spacings.sp16,
+}));
+
+const handleStyle = prepareNativeStyle(utils => ({
+    backgroundColor: utils.colors.borderDashed,
+}));
+
+const WindowOverlay = ({ children }: { children: ReactNode }) => {
+    return <View style={StyleSheet.absoluteFill}>{children}</View>;
+};
+
+export const BottomSheetFlashList = <TItem,>({
+    isVisible,
+    isCloseDisplayed = true,
+    onClose,
+    title,
+    subtitle,
+    estimatedListHeight = 0,
+    ...flashListProps
+}: BottomSheetFlashListProps<TItem>) => {
+    const { applyStyle } = useNativeStyles();
+    const insets = useSafeAreaInsets();
+
+    const bottomSheetModalRef = useRef<BottomSheetModal>(null);
+
+    const handleClose = useCallback(() => {
+        bottomSheetModalRef.current?.dismiss();
+        onClose(false);
+    }, [onClose]);
+
+    const insetBottom = Math.max(insets.bottom, DEFAULT_INSET_BOTTOM);
+
+    const maxHeight = Dimensions.get('window').height * 0.9;
+    const minHeight = Math.max(Dimensions.get('window').height * 0.4, estimatedListHeight);
+    // minHeight can be higher than maxHeight because of estimatedListHeight, but it must be capped by maxHeight
+    const snapPoints = useMemo(() => [Math.min(minHeight, maxHeight)], [minHeight, maxHeight]);
+
+    const handleSheetChanges = useCallback(
+        (index: number) => {
+            if (index === -1) {
+                handleClose();
+            }
+        },
+        [handleClose],
+    );
+
+    useEffect(() => {
+        if (isVisible) {
+            bottomSheetModalRef.current?.present();
+        } else {
+            bottomSheetModalRef.current?.dismiss();
+        }
+    }, [isVisible]);
+
+    return (
+        <BottomSheetModal
+            ref={bottomSheetModalRef}
+            snapPoints={snapPoints}
+            maxDynamicContentSize={maxHeight}
+            enableDynamicSizing={false}
+            onChange={handleSheetChanges}
+            backdropComponent={props => (
+                <BottomSheetBackdrop
+                    {...props}
+                    onPress={handleClose}
+                    appearsOnIndex={0}
+                    disappearsOnIndex={-1}
+                />
+            )}
+            backgroundStyle={applyStyle(bottomSheetStyle)}
+            handleIndicatorStyle={applyStyle(handleStyle)}
+            // @ts-expect-error wrong type, doesn't expect children
+            containerComponent={WindowOverlay}
+        >
+            <FlashList
+                {...flashListProps}
+                contentContainerStyle={applyStyle(sheetContentContainerStyle, {
+                    insetBottom,
+                })}
+            />
+        </BottomSheetModal>
+    );
+};
diff --git a/suite-native/atoms/src/Sheet/BottomSheetHeader.tsx b/suite-native/atoms/src/Sheet/BottomSheetHeader.tsx
index 7500c3f4cfe..1acab511fd6 100644
--- a/suite-native/atoms/src/Sheet/BottomSheetHeader.tsx
+++ b/suite-native/atoms/src/Sheet/BottomSheetHeader.tsx
@@ -90,7 +90,7 @@ export const BottomSheetHeader = ({
                     </View>
                     {isCloseDisplayed && (
                         <IconButton
-                            iconName="close"
+                            iconName="x"
                             onPress={onCloseSheet}
                             colorScheme="tertiaryElevation0"
                             size="medium"
diff --git a/suite-native/atoms/src/Skeleton/BoxSkeleton.tsx b/suite-native/atoms/src/Skeleton/BoxSkeleton.tsx
index 3c395577401..65dcf8ff88a 100644
--- a/suite-native/atoms/src/Skeleton/BoxSkeleton.tsx
+++ b/suite-native/atoms/src/Skeleton/BoxSkeleton.tsx
@@ -18,15 +18,17 @@ import {
 } from '@shopify/react-native-skia';
 
 import { useNativeStyles } from '@trezor/styles';
-import { Color, nativeBorders } from '@trezor/theme';
+import { Color, NativeRadius } from '@trezor/theme';
 
+import { ENDLESS_ANIMATION_VALUE } from '../constants';
 import { SurfaceElevation } from '../types';
+import { nativeRadiusToNumber } from '../utils';
 
 type BoxSkeletonProps = {
     height: number;
     width: number;
     elevation?: SurfaceElevation;
-    borderRadius?: number;
+    borderRadius?: NativeRadius | number;
 };
 
 const ANIMATION_DURATION = 1200;
@@ -48,7 +50,7 @@ export const BoxSkeleton = ({
     height,
     width,
     elevation = '1',
-    borderRadius = nativeBorders.radii.small,
+    borderRadius = 'r8',
 }: BoxSkeletonProps) => {
     const {
         utils: { colors },
@@ -56,7 +58,10 @@ export const BoxSkeleton = ({
     const progress = useSharedValue(0);
 
     useEffect(() => {
-        progress.value = withRepeat(withTiming(width, { duration: ANIMATION_DURATION }), -1);
+        progress.value = withRepeat(
+            withTiming(width, { duration: ANIMATION_DURATION }),
+            ENDLESS_ANIMATION_VALUE,
+        );
     }, [width, progress]);
 
     const position = useDerivedValue(() => [
@@ -67,8 +72,9 @@ export const BoxSkeleton = ({
 
     const rct = useMemo(() => {
         const coreRect = rect(0, 0, width, height);
+        const radius = nativeRadiusToNumber(borderRadius);
 
-        return rrect(coreRect, borderRadius, borderRadius);
+        return rrect(coreRect, radius, radius);
     }, [width, height, borderRadius]);
 
     const gradientColors = useMemo(
diff --git a/suite-native/atoms/src/Skeleton/ListItemSkeleton.tsx b/suite-native/atoms/src/Skeleton/ListItemSkeleton.tsx
index 03d0479273b..89e661d8a8d 100644
--- a/suite-native/atoms/src/Skeleton/ListItemSkeleton.tsx
+++ b/suite-native/atoms/src/Skeleton/ListItemSkeleton.tsx
@@ -36,12 +36,12 @@ export const ListItemSkeleton = () => {
                 <BoxSkeleton
                     width={TOP_SUB_ITEM_WIDTH}
                     height={SUBITEM_HEIGHT}
-                    borderRadius={borders.radii.extraSmall}
+                    borderRadius={borders.radii.r4}
                 />
                 <BoxSkeleton
                     width={BOTTOM_SUB_ITEM_WIDTH}
                     height={SUBITEM_HEIGHT}
-                    borderRadius={borders.radii.extraSmall}
+                    borderRadius={borders.radii.r4}
                 />
             </VStack>
         </Box>
diff --git a/suite-native/atoms/src/Spinner/Spinner.tsx b/suite-native/atoms/src/Spinner/Spinner.tsx
index 39f0298c740..2539f170c5d 100644
--- a/suite-native/atoms/src/Spinner/Spinner.tsx
+++ b/suite-native/atoms/src/Spinner/Spinner.tsx
@@ -1,6 +1,5 @@
 import { useRef, useState } from 'react';
 
-import Lottie from 'lottie-react-native';
 import LottieView from 'lottie-react-native';
 
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
@@ -49,7 +48,7 @@ export const Spinner = ({ loadingState, onComplete }: SpinnerProps) => {
     };
 
     return (
-        <Lottie
+        <LottieView
             autoPlay
             resizeMode="cover"
             loop={false}
diff --git a/suite-native/atoms/src/StepsProgressBar.tsx b/suite-native/atoms/src/StepsProgressBar.tsx
index b046ad53499..6925ec9aa6f 100644
--- a/suite-native/atoms/src/StepsProgressBar.tsx
+++ b/suite-native/atoms/src/StepsProgressBar.tsx
@@ -15,7 +15,7 @@ const progressBarWrapperStyle = prepareNativeStyle(utils => ({
     paddingVertical: utils.spacings.sp8,
     paddingHorizontal: utils.spacings.sp8,
     gap: utils.spacings.sp4,
-    borderRadius: 10,
+    borderRadius: utils.borders.radii.round,
     borderWidth: utils.borders.widths.small,
     alignItems: 'center',
     height: 20,
@@ -26,7 +26,7 @@ const progressBarWrapperStyle = prepareNativeStyle(utils => ({
 const progressBarItemStyle = prepareNativeStyle<{ isActive: boolean }>((utils, { isActive }) => ({
     width: isActive ? 8 : 4,
     height: 4,
-    borderRadius: utils.borders.radii.small / 4,
+    borderRadius: utils.borders.radii.round,
     backgroundColor: isActive
         ? utils.colors.backgroundSecondaryDefault
         : utils.colors.backgroundNeutralSubdued,
diff --git a/suite-native/atoms/src/TitleHeader/PictogramTitleHeader.tsx b/suite-native/atoms/src/TitleHeader/PictogramTitleHeader.tsx
index 8f0cacb5f09..fcf56bcbd13 100644
--- a/suite-native/atoms/src/TitleHeader/PictogramTitleHeader.tsx
+++ b/suite-native/atoms/src/TitleHeader/PictogramTitleHeader.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 
-import { IconName } from '@suite-common/icons-deprecated';
+import { IconName } from '@suite-native/icons';
 import { TypographyStyle } from '@trezor/theme';
 
 import { VStack } from '../Stack';
diff --git a/suite-native/helpers/src/constants.ts b/suite-native/atoms/src/constants.ts
similarity index 53%
rename from suite-native/helpers/src/constants.ts
rename to suite-native/atoms/src/constants.ts
index f06eb45ae0d..309d1de0964 100644
--- a/suite-native/helpers/src/constants.ts
+++ b/suite-native/atoms/src/constants.ts
@@ -1,3 +1,4 @@
 import { isDetoxTestBuild } from '@suite-native/config';
 
+// Ensures that the animation is not infinitely looped in the Detox tests to avoid synchronization problems.
 export const ENDLESS_ANIMATION_VALUE = isDetoxTestBuild() ? 1 : -1;
diff --git a/suite-native/atoms/src/index.ts b/suite-native/atoms/src/index.ts
index f4c462e8b60..d6945c4a605 100644
--- a/suite-native/atoms/src/index.ts
+++ b/suite-native/atoms/src/index.ts
@@ -18,6 +18,7 @@ export * from './DiscreetText/useDiscreetMode';
 export * from './BottomSheetListItem';
 export * from './OrderedListIcon';
 export * from './Sheet/BottomSheet';
+export * from './Sheet/BottomSheetFlashList';
 export * from './Sheet/useBottomSheetAnimation';
 export * from './Button/Button';
 export * from './Button/IconButton';
@@ -49,5 +50,7 @@ export * from './Skeleton/BoxSkeleton';
 export * from './Skeleton/ListItemSkeleton';
 export * from './BulletListItem';
 export * from './SelectableItem';
+export * from './constants';
+export * from './utils';
 
 export { useDebugView } from './DebugView';
diff --git a/suite-native/atoms/src/utils.ts b/suite-native/atoms/src/utils.ts
new file mode 100644
index 00000000000..c9725803595
--- /dev/null
+++ b/suite-native/atoms/src/utils.ts
@@ -0,0 +1,7 @@
+import { nativeBorders, NativeRadius, NativeSpacing, nativeSpacings } from '@trezor/theme';
+
+export const nativeSpacingToNumber = (value: NativeSpacing | number) =>
+    typeof value === 'number' ? value : nativeSpacings[value];
+
+export const nativeRadiusToNumber = (value: NativeRadius | number) =>
+    typeof value === 'number' ? value : nativeBorders.radii[value];
diff --git a/suite-native/atoms/tsconfig.json b/suite-native/atoms/tsconfig.json
index 875613bfd77..b14b23e31b5 100644
--- a/suite-native/atoms/tsconfig.json
+++ b/suite-native/atoms/tsconfig.json
@@ -3,8 +3,13 @@
     "compilerOptions": { "outDir": "libDev" },
     "references": [
         {
-            "path": "../../suite-common/icons-deprecated"
+            "path": "../../suite-common/wallet-config"
         },
+        {
+            "path": "../../suite-common/wallet-types"
+        },
+        { "path": "../config" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../storage" },
         { "path": "../../packages/env-utils" },
diff --git a/suite-native/biometrics/package.json b/suite-native/biometrics/package.json
index b534bb53399..f435a680cd2 100644
--- a/suite-native/biometrics/package.json
+++ b/suite-native/biometrics/package.json
@@ -6,15 +6,14 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-native/alerts": "workspace:*",
         "@suite-native/analytics": "workspace:*",
         "@suite-native/atoms": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/storage": "workspace:*",
         "@trezor/styles": "workspace:*",
diff --git a/suite-native/biometrics/src/components/BiometricOverlay.tsx b/suite-native/biometrics/src/components/BiometricOverlay.tsx
index bcde03df68b..b8a177fce65 100644
--- a/suite-native/biometrics/src/components/BiometricOverlay.tsx
+++ b/suite-native/biometrics/src/components/BiometricOverlay.tsx
@@ -2,7 +2,7 @@ import { StyleSheet, TouchableOpacity } from 'react-native';
 
 import { Box, Text } from '@suite-native/atoms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { Icon, iconSizes } from '@suite-common/icons-deprecated';
+import { Icon, iconSizes } from '@suite-native/icons';
 import { Translation } from '@suite-native/intl';
 
 import { BiometricsIcon } from './BiometricsIcon';
@@ -37,7 +37,7 @@ export const BiometricOverlay = ({
     return (
         <>
             <Box style={applyStyle(overlayWrapperStyle)}>
-                <Icon name="trezor" size="extraLarge" color="iconDefault" />
+                <Icon name="trezorLogo" size="extraLarge" color="iconDefault" />
             </Box>
             {isBiometricsAuthButtonVisible && (
                 <TouchableOpacity
diff --git a/suite-native/biometrics/src/components/BiometricsIcon.tsx b/suite-native/biometrics/src/components/BiometricsIcon.tsx
index 55ae7c607c4..58c48709569 100644
--- a/suite-native/biometrics/src/components/BiometricsIcon.tsx
+++ b/suite-native/biometrics/src/components/BiometricsIcon.tsx
@@ -1,6 +1,6 @@
 import { Platform } from 'react-native';
 
-import { Icon, IconName } from '@suite-common/icons-deprecated';
+import { Icon, IconName } from '@suite-native/icons';
 import { Box } from '@suite-native/atoms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
@@ -27,7 +27,7 @@ type BiometricsIconProps = {
 
 export const BiometricsIcon = ({ iconSize = 64, showShadow = false }: BiometricsIconProps) => {
     const { applyStyle } = useNativeStyles();
-    const icon: IconName = Platform.OS === 'ios' ? 'touchId' : 'fingerprint';
+    const icon: IconName = Platform.OS === 'ios' ? 'fingerprintSimple' : 'fingerprint';
 
     return (
         <Box
diff --git a/suite-native/biometrics/tsconfig.json b/suite-native/biometrics/tsconfig.json
index ca3b1e28f64..019ea97b48a 100644
--- a/suite-native/biometrics/tsconfig.json
+++ b/suite-native/biometrics/tsconfig.json
@@ -2,12 +2,10 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         { "path": "../alerts" },
         { "path": "../analytics" },
         { "path": "../atoms" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../storage" },
         { "path": "../../packages/styles" }
diff --git a/suite-native/blockchain/package.json b/suite-native/blockchain/package.json
index b409cfb3876..787b45a03f5 100644
--- a/suite-native/blockchain/package.json
+++ b/suite-native/blockchain/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-native/blockchain/src/blockchainMiddleware.ts b/suite-native/blockchain/src/blockchainMiddleware.ts
index de529a78e95..4d3ea39553e 100644
--- a/suite-native/blockchain/src/blockchainMiddleware.ts
+++ b/suite-native/blockchain/src/blockchainMiddleware.ts
@@ -29,7 +29,7 @@ export const blockchainMiddleware = createMiddleware(
                 dispatch(onBlockchainConnectThunk({ symbol: action.payload.coin.shortcut }));
 
                 break;
-            case TREZOR_CONNECT_BLOCKCHAIN_ACTIONS.BLOCK:
+            case TREZOR_CONNECT_BLOCKCHAIN_ACTIONS.BLOCK: {
                 const networksWithPendingTransactions =
                     selectNetworksWithPendingTransactions(getState());
                 const symbol = action.payload.coin.shortcut.toLowerCase() as NetworkSymbol;
@@ -39,6 +39,7 @@ export const blockchainMiddleware = createMiddleware(
                 }
 
                 break;
+            }
             case TREZOR_CONNECT_BLOCKCHAIN_ACTIONS.NOTIFICATION:
                 dispatch(onBlockchainNotificationThunk(action.payload));
                 break;
diff --git a/suite-native/coin-enabling/package.json b/suite-native/coin-enabling/package.json
index 10e6c74578a..0993ad5b2a3 100644
--- a/suite-native/coin-enabling/package.json
+++ b/suite-native/coin-enabling/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -14,7 +13,6 @@
         "@mobily/ts-belt": "^3.13.1",
         "@react-navigation/native": "6.1.18",
         "@reduxjs/toolkit": "1.9.5",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/suite-utils": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
         "@suite-common/wallet-core": "workspace:*",
@@ -23,6 +21,7 @@
         "@suite-native/atoms": "workspace:*",
         "@suite-native/discovery": "workspace:*",
         "@suite-native/feature-flags": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/navigation": "workspace:*",
         "@suite-native/theme": "workspace:*",
@@ -32,7 +31,7 @@
         "expo-linear-gradient": "13.0.2",
         "react": "18.2.0",
         "react-native": "0.75.2",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-native-svg": "15.6.0",
         "react-redux": "8.0.7"
     }
diff --git a/suite-native/coin-enabling/src/components/DiscoveryCoinsFilter.tsx b/suite-native/coin-enabling/src/components/DiscoveryCoinsFilter.tsx
index b351edca46d..a1d43aa1aae 100644
--- a/suite-native/coin-enabling/src/components/DiscoveryCoinsFilter.tsx
+++ b/suite-native/coin-enabling/src/components/DiscoveryCoinsFilter.tsx
@@ -6,7 +6,7 @@ import { useFocusEffect } from '@react-navigation/native';
 import { VStack, Text } from '@suite-native/atoms';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { Translation } from '@suite-native/intl';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import {
     applyDiscoveryChangesThunk,
     selectDiscoverySupportedNetworks,
@@ -49,7 +49,7 @@ export const DiscoveryCoinsFilter = ({
                 />
             ))}
             <VStack paddingTop="sp8" paddingBottom="sp32" alignItems="center">
-                <Icon name="questionLight" color="textSubdued" size="large" />
+                <Icon name="question" color="textSubdued" size="large" />
                 <Text color="textSubdued" textAlign="center">
                     <Translation id="moduleSettings.coinEnabling.bottomNote" />
                 </Text>
diff --git a/suite-native/coin-enabling/src/components/NetworkSymbolSwitchItem.tsx b/suite-native/coin-enabling/src/components/NetworkSymbolSwitchItem.tsx
index b4e7484bdb8..e46ee92b9b8 100644
--- a/suite-native/coin-enabling/src/components/NetworkSymbolSwitchItem.tsx
+++ b/suite-native/coin-enabling/src/components/NetworkSymbolSwitchItem.tsx
@@ -1,7 +1,7 @@
 import { TouchableOpacity, View } from 'react-native';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { CryptoIcon } from '@suite-common/icons-deprecated';
+import { CryptoIcon } from '@suite-native/icons';
 import { networks, NetworkSymbol } from '@suite-common/wallet-config';
 import { Card, HStack, Text, Switch, VStack } from '@suite-native/atoms';
 import {
diff --git a/suite-native/coin-enabling/tsconfig.json b/suite-native/coin-enabling/tsconfig.json
index f4eb3a52652..0cdc83ee680 100644
--- a/suite-native/coin-enabling/tsconfig.json
+++ b/suite-native/coin-enabling/tsconfig.json
@@ -2,9 +2,6 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/suite-utils"
         },
@@ -19,6 +16,7 @@
         { "path": "../atoms" },
         { "path": "../discovery" },
         { "path": "../feature-flags" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../navigation" },
         { "path": "../theme" },
diff --git a/suite-native/config/package.json b/suite-native/config/package.json
index 225c7951880..6b83970a316 100644
--- a/suite-native/config/package.json
+++ b/suite-native/config/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-native/config/src/environment.ts b/suite-native/config/src/environment.ts
index e41ecc8d5fa..b6df17e25f3 100644
--- a/suite-native/config/src/environment.ts
+++ b/suite-native/config/src/environment.ts
@@ -1,5 +1,8 @@
 export const isDebugEnv = () => process.env.EXPO_PUBLIC_ENVIRONMENT === 'debug';
-export const isDevelopEnv = () => process.env.EXPO_PUBLIC_ENVIRONMENT === 'develop';
+// From app perspective, develop and preview are the same environment. The difference is in the build process.
+export const isDevelopEnv = () =>
+    process.env.EXPO_PUBLIC_ENVIRONMENT === 'develop' ||
+    process.env.EXPO_PUBLIC_ENVIRONMENT === 'preview';
 export const isProduction = () => process.env.EXPO_PUBLIC_ENVIRONMENT === 'production';
 
 export const isDevelopOrDebugEnv = () => isDebugEnv() || isDevelopEnv();
diff --git a/suite-native/config/src/supportedNetworks.ts b/suite-native/config/src/supportedNetworks.ts
index ebb02ac5c5f..c82c8424cd8 100644
--- a/suite-native/config/src/supportedNetworks.ts
+++ b/suite-native/config/src/supportedNetworks.ts
@@ -2,6 +2,7 @@ import { A } from '@mobily/ts-belt';
 
 import { isTestnet } from '@suite-common/wallet-utils';
 import {
+    networks,
     AccountType,
     Network,
     NetworkSymbol,
@@ -17,13 +18,15 @@ export const orderedAccountTypes: AccountType[] = [
     'ledger',
 ];
 
-const discoveryBlacklist: NetworkSymbol[] = ['sol', 'dsol', 'pol', 'bnb'];
+const discoveryBlacklist: NetworkSymbol[] = ['sol', 'dsol', 'op'];
 
 // All supported coins for device discovery
 export const networkSymbolsWhitelistMap = {
     mainnet: [
         'btc',
         'eth',
+        'pol',
+        'bnb',
         'ltc',
         'etc',
         'ada',
@@ -48,10 +51,12 @@ export const discoverySupportedNetworks = [
     ...networkSymbolsWhitelistMap.testnet,
 ];
 
-export const sortNetworks = (networks: Network[]) =>
-    A.sort(networks, (a, b) => {
-        const aOrder = discoverySupportedNetworks.indexOf(a.symbol) ?? Number.MAX_SAFE_INTEGER;
-        const bOrder = discoverySupportedNetworks.indexOf(b.symbol) ?? Number.MAX_SAFE_INTEGER;
+export const orderedNetworkSymbols = Object.keys(networks) as NetworkSymbol[];
+
+export const sortNetworks = (networksToSort: Network[]) =>
+    A.sort(networksToSort, (a, b) => {
+        const aOrder = orderedNetworkSymbols.indexOf(a.symbol);
+        const bOrder = orderedNetworkSymbols.indexOf(b.symbol);
 
         return aOrder - bOrder;
     });
@@ -65,8 +70,11 @@ export const filterTestnetNetworks = (
     return networkSymbols.filter(networkSymbol => !isTestnet(networkSymbol));
 };
 
-export const filterBlacklistedNetworks = (networks: Network[], allowList: NetworkSymbol[]) =>
-    networks.filter(
+export const filterBlacklistedNetworks = (
+    networksToFilter: Network[],
+    allowList: NetworkSymbol[],
+) =>
+    networksToFilter.filter(
         network =>
             !discoveryBlacklist.includes(network.symbol) || allowList.includes(network.symbol),
     );
diff --git a/suite-native/connection-status/package.json b/suite-native/connection-status/package.json
index caa075affad..834248430fb 100644
--- a/suite-native/connection-status/package.json
+++ b/suite-native/connection-status/package.json
@@ -6,14 +6,13 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
         "@react-native-community/netinfo": "11.3.2",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-native/atoms": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/settings": "workspace:*",
         "@trezor/styles": "workspace:*",
diff --git a/suite-native/connection-status/src/OfflineBanner.tsx b/suite-native/connection-status/src/OfflineBanner.tsx
index 2b0f10d5d3c..b697ae6ac8a 100644
--- a/suite-native/connection-status/src/OfflineBanner.tsx
+++ b/suite-native/connection-status/src/OfflineBanner.tsx
@@ -1,7 +1,7 @@
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { View } from 'react-native';
 
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { Text, HStack } from '@suite-native/atoms';
 import { Translation } from '@suite-native/intl';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
diff --git a/suite-native/connection-status/tsconfig.json b/suite-native/connection-status/tsconfig.json
index dc0a70fe615..ce5d4bc614f 100644
--- a/suite-native/connection-status/tsconfig.json
+++ b/suite-native/connection-status/tsconfig.json
@@ -2,10 +2,8 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         { "path": "../atoms" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../settings" },
         { "path": "../../packages/styles" }
diff --git a/suite-native/device-authorization/package.json b/suite-native/device-authorization/package.json
index 1724b5ab6fb..cca6db9d3f3 100644
--- a/suite-native/device-authorization/package.json
+++ b/suite-native/device-authorization/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-native/device-authorization/src/hooks/useAuthorizationGoBack.ts b/suite-native/device-authorization/src/hooks/useAuthorizationGoBack.ts
deleted file mode 100644
index a60f10228cb..00000000000
--- a/suite-native/device-authorization/src/hooks/useAuthorizationGoBack.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useNavigation } from '@react-navigation/native';
-
-import {
-    AuthorizeDeviceStackParamList,
-    AuthorizeDeviceStackRoutes,
-    RootStackParamList,
-    StackToTabCompositeProps,
-} from '@suite-native/navigation';
-
-type NavigationProp = StackToTabCompositeProps<
-    AuthorizeDeviceStackParamList,
-    AuthorizeDeviceStackRoutes,
-    RootStackParamList
->;
-
-export const useAuthorizationGoBack = () => {
-    const navigation = useNavigation<NavigationProp>();
-
-    // The authorization screens are in a stack navigator and when authorization is cancelled or succesfull, we want to
-    // go back to previous (non-authorization) stack. This is achieved by navigating to first screen of current stack
-    // and then going back to previous stack.
-    const handleGoBack = () => {
-        // popToTop is used to empty the stack as a prerequisite to `navigation.goBack`
-        // If there is more routes than 1, it will empty the stack, but if there is single route (current one),
-        // popToTop will go to previous stack instead, which we don't want since this is handled by `navigation.goBack` below
-        if (navigation.getState().routes.length > 1) {
-            navigation.popToTop();
-        }
-        if (navigation.canGoBack()) {
-            navigation.goBack();
-        }
-    };
-
-    return { handleGoBack };
-};
diff --git a/suite-native/device-authorization/src/hooks/useHandleDeviceRequestsPassphrase.ts b/suite-native/device-authorization/src/hooks/useHandleDeviceRequestsPassphrase.ts
index 5cbcd9a3ad1..fd7ca347d9b 100644
--- a/suite-native/device-authorization/src/hooks/useHandleDeviceRequestsPassphrase.ts
+++ b/suite-native/device-authorization/src/hooks/useHandleDeviceRequestsPassphrase.ts
@@ -37,19 +37,28 @@ export const useHandleDeviceRequestsPassphrase = () => {
 
     const handleRequestPassphrase = useCallback(() => {
         // If the passphrase request was while verifying empty passphrase wallet, we handle it separately in the screen
-        if (!isVefifyingPassphraseOnEmptyWallet && !deviceState) {
+        if (!isVefifyingPassphraseOnEmptyWallet && !deviceState?.staticSessionId) {
             navigation.navigate(RootStackRoutes.AuthorizeDeviceStack, {
                 screen: AuthorizeDeviceStackRoutes.PassphraseForm,
             });
         }
 
         // Feature requests passphrase
-        if (!isVefifyingPassphraseOnEmptyWallet && !isCreatingNewWallet && deviceState) {
+        if (
+            !isVefifyingPassphraseOnEmptyWallet &&
+            !isCreatingNewWallet &&
+            deviceState?.staticSessionId
+        ) {
             navigation.navigate(RootStackRoutes.AuthorizeDeviceStack, {
                 screen: AuthorizeDeviceStackRoutes.PassphraseFeatureUnlockForm,
             });
         }
-    }, [deviceState, isCreatingNewWallet, isVefifyingPassphraseOnEmptyWallet, navigation]);
+    }, [
+        deviceState?.staticSessionId,
+        isCreatingNewWallet,
+        isVefifyingPassphraseOnEmptyWallet,
+        navigation,
+    ]);
 
     useEffect(() => {
         if (deviceRequestedPassphrase) {
diff --git a/suite-native/device-authorization/src/hooks/useHandlePassphraseMismatch.tsx b/suite-native/device-authorization/src/hooks/useHandlePassphraseMismatch.tsx
index a326c0a5a31..44ffb537adf 100644
--- a/suite-native/device-authorization/src/hooks/useHandlePassphraseMismatch.tsx
+++ b/suite-native/device-authorization/src/hooks/useHandlePassphraseMismatch.tsx
@@ -64,7 +64,7 @@ export const useHandlePassphraseMismatch = () => {
                     });
                 },
                 secondaryButtonVariant: 'redElevation0',
-                icon: 'warningTriangleLight',
+                icon: 'warning',
                 pictogramVariant: 'red',
             });
         }
diff --git a/suite-native/device-authorization/src/index.ts b/suite-native/device-authorization/src/index.ts
index ff844cf7ddb..6cb179c8453 100644
--- a/suite-native/device-authorization/src/index.ts
+++ b/suite-native/device-authorization/src/index.ts
@@ -1,6 +1,5 @@
 export * from './deviceAuthorizationSlice';
 export * from './utils';
-export * from './hooks/useAuthorizationGoBack';
 export * from './hooks/useHandleDeviceRequestsPassphrase';
 export * from './hooks/useHandleDuplicatePassphrase';
 export * from './hooks/useHandlePassphraseMismatch';
diff --git a/suite-native/device-authorization/src/passphraseThunks.ts b/suite-native/device-authorization/src/passphraseThunks.ts
index 98ff005fb45..d68dca22d1e 100644
--- a/suite-native/device-authorization/src/passphraseThunks.ts
+++ b/suite-native/device-authorization/src/passphraseThunks.ts
@@ -66,7 +66,10 @@ export const verifyPassphraseOnEmptyWalletThunk = createThunk<
             keepSession: false,
         });
 
-        if (response.success && response.payload.state !== device.state) {
+        if (
+            response.success &&
+            response.payload._state.staticSessionId !== device.state?.staticSessionId
+        ) {
             return rejectWithValue({ error: 'passphrase-mismatch' });
         }
 
diff --git a/suite-native/device-manager/package.json b/suite-native/device-manager/package.json
index e2b61a26c3b..a5bbabdf3a2 100644
--- a/suite-native/device-manager/package.json
+++ b/suite-native/device-manager/package.json
@@ -6,14 +6,13 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
+        "@mobily/ts-belt": "^3.13.1",
         "@react-navigation/native": "6.1.18",
         "@reduxjs/toolkit": "1.9.5",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/redux-utils": "workspace:*",
         "@suite-common/suite-types": "workspace:*",
         "@suite-common/wallet-core": "workspace:*",
@@ -22,6 +21,7 @@
         "@suite-native/device": "workspace:*",
         "@suite-native/feature-flags": "workspace:*",
         "@suite-native/formatters": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/link": "workspace:*",
         "@suite-native/navigation": "workspace:*",
@@ -30,7 +30,7 @@
         "jotai": "1.9.1",
         "react": "^18.2.0",
         "react-native": "0.75.2",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-native-safe-area-context": "4.10.9",
         "react-redux": "8.0.7"
     }
diff --git a/suite-native/device-manager/src/components/AddHiddenWalletButton.tsx b/suite-native/device-manager/src/components/AddHiddenWalletButton.tsx
index 61a3bc90eba..546c7964b47 100644
--- a/suite-native/device-manager/src/components/AddHiddenWalletButton.tsx
+++ b/suite-native/device-manager/src/components/AddHiddenWalletButton.tsx
@@ -10,7 +10,7 @@ import {
     selectIsDeviceProtectedByPassphrase,
 } from '@suite-common/wallet-core';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import {
     AuthorizeDeviceStackParamList,
     AuthorizeDeviceStackRoutes,
@@ -68,11 +68,11 @@ export const AddHiddenWalletButton = () => {
             onPress={handleAddHiddenWallet}
             flex={1}
         >
-            <HStack>
+            <HStack marginLeft="sp4">
                 <Text variant="hint" style={applyStyle(textStyle)}>
                     <Translation id="deviceManager.deviceButtons.addHiddenWallet" />
                 </Text>
-                <Icon name="chevronRight" color="iconDefault" size="mediumLarge" />
+                <Icon name="caretRight" size="mediumLarge" />
             </HStack>
         </DeviceAction>
     );
diff --git a/suite-native/device-manager/src/components/DeviceAction.tsx b/suite-native/device-manager/src/components/DeviceAction.tsx
index ee837ee4a4a..47aa29a8f05 100644
--- a/suite-native/device-manager/src/components/DeviceAction.tsx
+++ b/suite-native/device-manager/src/components/DeviceAction.tsx
@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
 import { Pressable } from 'react-native';
 
-import { HStack, ACCESSIBILITY_FONTSIZE_MULTIPLIER } from '@suite-native/atoms';
+import { HStack } from '@suite-native/atoms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
 type DeviceActionProps = {
@@ -13,14 +13,13 @@ type DeviceActionProps = {
 };
 
 const contentStyle = prepareNativeStyle(utils => ({
-    paddingHorizontal: utils.spacings.sp16,
+    paddingHorizontal: utils.spacings.sp12,
     paddingVertical: utils.spacings.sp12,
     alignItems: 'center',
-    height: 44 * ACCESSIBILITY_FONTSIZE_MULTIPLIER,
     gap: utils.spacings.sp8,
     backgroundColor: utils.colors.backgroundSurfaceElevation1,
     borderWidth: utils.borders.widths.small,
-    borderRadius: 12,
+    borderRadius: utils.borders.radii.r12,
     borderColor: utils.colors.borderElevation1,
 }));
 
diff --git a/suite-native/device-manager/src/components/DeviceItem/DeviceItem.tsx b/suite-native/device-manager/src/components/DeviceItem/DeviceItem.tsx
index b59a07e32c6..46facb765b9 100644
--- a/suite-native/device-manager/src/components/DeviceItem/DeviceItem.tsx
+++ b/suite-native/device-manager/src/components/DeviceItem/DeviceItem.tsx
@@ -2,7 +2,7 @@ import { Pressable } from 'react-native';
 
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { HStack } from '@suite-native/atoms';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { TrezorDevice } from '@suite-common/suite-types';
 
 import { DeviceItemContent } from './DeviceItemContent';
@@ -26,7 +26,7 @@ export const DeviceItem = ({ deviceState, onPress }: DeviceItemProps) => {
         <Pressable onPress={onPress}>
             <HStack style={applyStyle(deviceItemWrapperStyle)}>
                 <DeviceItemContent deviceState={deviceState} />
-                <Icon name="chevronRight" color="iconDefault" size="mediumLarge" />
+                <Icon name="caretRight" color="iconDefault" size="mediumLarge" />
             </HStack>
         </Pressable>
     );
diff --git a/suite-native/device-manager/src/components/DeviceItem/DeviceItemContent.tsx b/suite-native/device-manager/src/components/DeviceItem/DeviceItemContent.tsx
index 2f16bd8f3c0..d02d6c61319 100644
--- a/suite-native/device-manager/src/components/DeviceItem/DeviceItemContent.tsx
+++ b/suite-native/device-manager/src/components/DeviceItem/DeviceItemContent.tsx
@@ -8,7 +8,7 @@ import {
     DeviceRootState,
     PORTFOLIO_TRACKER_DEVICE_ID,
     selectHasOnlyEmptyPortfolioTracker,
-    selectDeviceLabelOrName,
+    selectDeviceLabelOrNameById,
 } from '@suite-common/wallet-core';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { TypographyStyle } from '@trezor/theme';
@@ -38,12 +38,12 @@ const contentWrapperStyle = prepareNativeStyle<{ height: number }>((utils, { hei
     spacing: utils.spacings.sp16,
 }));
 
-const itemStyle = prepareNativeStyle<{ isCompact: boolean }>((_, { isCompact }) => ({
+const itemStyle = prepareNativeStyle<{ isCompact: boolean }>((utils, { isCompact }) => ({
     flexShrink: 1,
     extend: {
         condition: !isCompact,
         style: {
-            gap: 2,
+            gap: utils.spacings.sp2,
         },
     },
 }));
@@ -67,7 +67,7 @@ export const DeviceItemContent = React.memo(
             return {
                 id: d.id,
                 name: d.name,
-                label: selectDeviceLabelOrName(state),
+                label: selectDeviceLabelOrNameById(state, d.id),
                 walletNumber: d.walletNumber,
                 useEmptyPassphrase: d.useEmptyPassphrase,
             };
diff --git a/suite-native/device-manager/src/components/DeviceItem/DeviceItemIcon.tsx b/suite-native/device-manager/src/components/DeviceItem/DeviceItemIcon.tsx
index f2b6c840ef1..2e6166c0275 100644
--- a/suite-native/device-manager/src/components/DeviceItem/DeviceItemIcon.tsx
+++ b/suite-native/device-manager/src/components/DeviceItem/DeviceItemIcon.tsx
@@ -1,6 +1,6 @@
 import { useSelector } from 'react-redux';
 
-import { Icon, DeviceModelIcon } from '@suite-common/icons-deprecated';
+import { Icon, DeviceModelIcon } from '@suite-native/icons';
 import {
     DeviceRootState,
     PORTFOLIO_TRACKER_DEVICE_ID,
@@ -26,5 +26,5 @@ export const DeviceItemIcon = ({ deviceId }: DeviceItemIconProps) => {
         return <DeviceModelIcon deviceModel={deviceModel} size={ICON_SIZE} />;
     }
 
-    return <Icon name="trezor" color="iconDefault" size={ICON_SIZE} />;
+    return <Icon name="trezorLogo" color="iconDefault" size={ICON_SIZE} />;
 };
diff --git a/suite-native/device-manager/src/components/DeviceList.tsx b/suite-native/device-manager/src/components/DeviceList.tsx
index fdd454478b1..77fb4650dde 100644
--- a/suite-native/device-manager/src/components/DeviceList.tsx
+++ b/suite-native/device-manager/src/components/DeviceList.tsx
@@ -173,7 +173,7 @@ export const DeviceList = ({ isVisible, onSelectDevice }: DeviceListProps) => {
                         d =>
                             d.state && (
                                 <DeviceItem
-                                    key={d.state}
+                                    key={d.state.staticSessionId}
                                     deviceState={d.state}
                                     onPress={() => onSelectDevice(d)}
                                 />
diff --git a/suite-native/device-manager/src/components/DeviceManagerContent.tsx b/suite-native/device-manager/src/components/DeviceManagerContent.tsx
index 374b576c18f..754076c4884 100644
--- a/suite-native/device-manager/src/components/DeviceManagerContent.tsx
+++ b/suite-native/device-manager/src/components/DeviceManagerContent.tsx
@@ -17,7 +17,7 @@ import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
 import { AddHiddenWalletButton } from './AddHiddenWalletButton';
 import { DeviceList } from './DeviceList';
-import { DeviceInfoButton } from './DeviceInfoButton';
+import { DeviceSettingsButton } from './DeviceSettingsButton';
 import { DeviceManagerModal, MANAGER_MODAL_BOTTOM_RADIUS } from './DeviceManagerModal';
 import { DevicesToggleButton } from './DevicesToggleButton';
 import { WalletList } from './WalletList';
@@ -26,8 +26,8 @@ import { useDeviceManager } from '../hooks/useDeviceManager';
 const CONTENT_MAX_HEIGHT = Dimensions.get('window').height * 0.8;
 const HEADER_HEIGHT = 86;
 
-const scrollViewStyle = prepareNativeStyle<{ maxHeight: number }>((_, { maxHeight }) => ({
-    gap: 12,
+const scrollViewStyle = prepareNativeStyle<{ maxHeight: number }>((utils, { maxHeight }) => ({
+    gap: utils.spacings.sp12,
     flexGrow: 0,
     maxHeight,
     borderBottomLeftRadius: MANAGER_MODAL_BOTTOM_RADIUS,
@@ -112,7 +112,9 @@ export const DeviceManagerContent = () => {
                             }
                             style={applyStyle(deviceButtonsStyle)}
                         >
-                            <DeviceInfoButton showAsFullWidth={!isAddHiddenWalletButtonVisible} />
+                            <DeviceSettingsButton
+                                showAsFullWidth={!isAddHiddenWalletButtonVisible}
+                            />
                             {isAddHiddenWalletButtonVisible && <AddHiddenWalletButton />}
                         </Stack>
                     </VStack>
diff --git a/suite-native/device-manager/src/components/DeviceManagerModal.tsx b/suite-native/device-manager/src/components/DeviceManagerModal.tsx
index 140d9d2237f..8ac671be336 100644
--- a/suite-native/device-manager/src/components/DeviceManagerModal.tsx
+++ b/suite-native/device-manager/src/components/DeviceManagerModal.tsx
@@ -7,6 +7,7 @@ import { useSelector } from 'react-redux';
 import { ScreenHeaderWrapper, Box, HStack } from '@suite-native/atoms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { selectDeviceState } from '@suite-common/wallet-core';
+import { nativeBorders } from '@trezor/theme';
 
 import { useDeviceManager } from '../hooks/useDeviceManager';
 import { DeviceItemContent } from './DeviceItem/DeviceItemContent';
@@ -17,7 +18,7 @@ type DeviceManagerModalProps = {
     onClose?: () => void;
 };
 
-export const MANAGER_MODAL_BOTTOM_RADIUS = 12;
+export const MANAGER_MODAL_BOTTOM_RADIUS = nativeBorders.radii.r12;
 
 const modalBackgroundOverlayStyle = prepareNativeStyle(utils => ({
     flex: 1,
diff --git a/suite-native/device-manager/src/components/DeviceInfoButton.tsx b/suite-native/device-manager/src/components/DeviceSettingsButton.tsx
similarity index 69%
rename from suite-native/device-manager/src/components/DeviceInfoButton.tsx
rename to suite-native/device-manager/src/components/DeviceSettingsButton.tsx
index 8908290a3bf..bc8ec4bac78 100644
--- a/suite-native/device-manager/src/components/DeviceInfoButton.tsx
+++ b/suite-native/device-manager/src/components/DeviceSettingsButton.tsx
@@ -11,7 +11,7 @@ import {
     RootStackRoutes,
     StackToStackCompositeNavigationProps,
 } from '@suite-native/navigation';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
 import { useDeviceManager } from '../hooks/useDeviceManager';
@@ -27,17 +27,20 @@ type DeviceInfoButtonProps = {
     showAsFullWidth: boolean;
 };
 
-const contentStyle = prepareNativeStyle<{ showAsFullWidth: boolean }>((_, { showAsFullWidth }) => ({
-    extend: {
-        condition: showAsFullWidth,
-        style: {
-            flex: 1,
-            justifyContent: 'center',
+const contentStyle = prepareNativeStyle<{ showAsFullWidth: boolean }>(
+    (utils, { showAsFullWidth }) => ({
+        marginRight: utils.spacings.sp4,
+        extend: {
+            condition: showAsFullWidth,
+            style: {
+                flex: 1,
+                justifyContent: 'center',
+            },
         },
-    },
-}));
+    }),
+);
 
-export const DeviceInfoButton = ({ showAsFullWidth }: DeviceInfoButtonProps) => {
+export const DeviceSettingsButton = ({ showAsFullWidth }: DeviceInfoButtonProps) => {
     const { applyStyle } = useNativeStyles();
     const navigation = useNavigation<NavigationProp>();
     const { setIsDeviceManagerVisible } = useDeviceManager();
@@ -45,22 +48,25 @@ export const DeviceInfoButton = ({ showAsFullWidth }: DeviceInfoButtonProps) =>
 
     const handleDeviceRedirect = () => {
         setIsDeviceManagerVisible(false);
-        navigation.navigate(RootStackRoutes.DeviceInfo);
-        analytics.report({ type: EventType.DeviceManagerClick, payload: { action: 'deviceInfo' } });
+        navigation.navigate(RootStackRoutes.DeviceSettingsStack);
+        analytics.report({
+            type: EventType.DeviceManagerClick,
+            payload: { action: 'deviceSettings' },
+        });
     };
 
     if (!selectedDevice) return null;
 
     return (
         <DeviceAction
-            testID="@device-manager/device/info"
+            testID="@device-manager/device-settings-button"
             onPress={handleDeviceRedirect}
             showAsFullWidth={showAsFullWidth}
         >
             <HStack spacing="sp8" style={applyStyle(contentStyle, { showAsFullWidth })}>
-                <Icon name="infoLight" size="mediumLarge" />
+                <Icon name="gear" size="mediumLarge" />
                 <Text variant="hint">
-                    <Translation id="deviceManager.deviceButtons.deviceInfo" />
+                    <Translation id="deviceManager.deviceButtons.deviceSettings" />
                 </Text>
             </HStack>
         </DeviceAction>
diff --git a/suite-native/device-manager/src/components/DeviceSwitch.tsx b/suite-native/device-manager/src/components/DeviceSwitch.tsx
index e820b77f187..5d6610307f3 100644
--- a/suite-native/device-manager/src/components/DeviceSwitch.tsx
+++ b/suite-native/device-manager/src/components/DeviceSwitch.tsx
@@ -2,7 +2,7 @@ import { Pressable } from 'react-native';
 import { useSelector } from 'react-redux';
 
 import { Box, HStack } from '@suite-native/atoms';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { selectDeviceState, selectNumberOfDeviceInstances } from '@suite-common/wallet-core';
 
@@ -50,7 +50,11 @@ export const DeviceSwitch = () => {
     };
 
     return (
-        <Pressable onPress={toggleDeviceManager} style={applyStyle(switchWrapperStyle)}>
+        <Pressable
+            onPress={toggleDeviceManager}
+            style={applyStyle(switchWrapperStyle)}
+            testID="@device-manager/device-switch"
+        >
             <HStack justifyContent="space-between" alignItems="center" spacing="sp16">
                 <Box style={applyStyle(switchStyle, { isDeviceManagerVisible })}>
                     {deviceState && (
@@ -61,7 +65,7 @@ export const DeviceSwitch = () => {
                             isSubHeaderForceHidden={true}
                         />
                     )}
-                    <Icon name="chevronUpAndDown" color="iconDefault" />
+                    <Icon name="caretUpDown" color="iconDefault" />
                 </Box>
             </HStack>
         </Pressable>
diff --git a/suite-native/device-manager/src/components/DevicesToggleButton.tsx b/suite-native/device-manager/src/components/DevicesToggleButton.tsx
index 30e52d5998e..2d8e07d8335 100644
--- a/suite-native/device-manager/src/components/DevicesToggleButton.tsx
+++ b/suite-native/device-manager/src/components/DevicesToggleButton.tsx
@@ -27,7 +27,7 @@ export const DevicesToggleButton = ({ isOpened, onDeviceButtonTap }: DevicesTogg
             colorScheme="tertiaryElevation0"
             viewRight={
                 <Animated.View style={animatedChevronStyle}>
-                    <ButtonIcon iconName="chevronDown" />
+                    <ButtonIcon iconName="caretDown" />
                 </Animated.View>
             }
             onPress={onDeviceButtonTap}
diff --git a/suite-native/device-manager/src/components/WalletItem.tsx b/suite-native/device-manager/src/components/WalletItem.tsx
index 3ebe73ea6c6..ef938f3341c 100644
--- a/suite-native/device-manager/src/components/WalletItem.tsx
+++ b/suite-native/device-manager/src/components/WalletItem.tsx
@@ -1,106 +1,43 @@
-import { Pressable } from 'react-native';
 import { useSelector } from 'react-redux';
 
-import { HStack, Radio, Text } from '@suite-native/atoms';
-import { Translation } from '@suite-native/intl';
-import { Icon } from '@suite-common/icons-deprecated';
 import { TrezorDevice } from '@suite-common/suite-types';
-import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { selectDevice, selectDeviceByState } from '@suite-common/wallet-core';
-import { FiatAmountFormatter } from '@suite-native/formatters';
 import { selectDeviceTotalFiatBalanceNative } from '@suite-native/device';
 
+import { WalletItemBase } from './WalletItemBase';
+
 type WalletItemProps = {
-    deviceState: NonNullable<TrezorDevice['state']>;
     onPress: () => void;
+    deviceState: NonNullable<TrezorDevice['state']>;
     isSelectable?: boolean;
 };
 
-type WalletItemStyleProps = { isSelected: boolean; isSelectable: boolean };
-
-const walletItemStyle = prepareNativeStyle<WalletItemStyleProps>(
-    (utils, { isSelected, isSelectable }) => ({
-        justifyContent: 'space-between',
-        alignItems: 'center',
-        height: 60,
-        gap: 12,
-        borderRadius: 12,
-        borderColor: utils.colors.borderElevation1,
-        flex: 1,
-        extend: [
-            {
-                condition: isSelected,
-                style: {
-                    borderWidth: utils.borders.widths.large,
-                    borderColor: utils.colors.borderSecondary,
-                },
-            },
-            {
-                condition: isSelectable,
-                style: {
-                    paddingHorizontal: utils.spacings.sp16,
-                    backgroundColor: utils.colors.backgroundSurfaceElevation1,
-                    borderWidth: utils.borders.widths.small,
-                },
-            },
-        ],
-    }),
-);
-
-const labelStyle = prepareNativeStyle(() => ({
-    flex: 1,
-}));
-
-export const WalletItem = ({ deviceState, onPress, isSelectable = true }: WalletItemProps) => {
-    const { applyStyle } = useNativeStyles();
+export const WalletItem = ({ onPress, deviceState, isSelectable = true }: WalletItemProps) => {
     const device = useSelector((state: any) => selectDeviceByState(state, deviceState));
     const selectedDevice = useSelector(selectDevice);
     const fiatBalance = useSelector((state: any) =>
-        selectDeviceTotalFiatBalanceNative(state, deviceState),
+        device?.state?.staticSessionId
+            ? String(selectDeviceTotalFiatBalanceNative(state, device?.state?.staticSessionId))
+            : undefined,
     );
 
     if (!device) {
         return null;
     }
 
-    const walletNameLabel = device.useEmptyPassphrase ? (
-        <Translation id="deviceManager.wallet.standard" />
-    ) : (
-        <Translation
-            id="deviceManager.wallet.defaultPassphrase"
-            values={{ index: device.walletNumber }}
-        />
-    );
-
     const isSelected =
         selectedDevice?.id === device.id && selectedDevice?.instance === device.instance;
 
     const showAsSelected = isSelected && isSelectable;
 
     return (
-        <Pressable onPress={onPress}>
-            <HStack
-                key={device.instance}
-                style={applyStyle(walletItemStyle, { isSelected: showAsSelected, isSelectable })}
-            >
-                <HStack alignItems="center" flex={1}>
-                    <Icon
-                        name={device.useEmptyPassphrase ? 'standardWallet' : 'password'}
-                        size="mediumLarge"
-                    />
-                    <Text variant="callout" numberOfLines={1} style={applyStyle(labelStyle)}>
-                        {walletNameLabel}
-                    </Text>
-                </HStack>
-                <HStack alignItems="center" spacing="sp12">
-                    <FiatAmountFormatter
-                        value={String(fiatBalance)}
-                        variant="hint"
-                        color="textSubdued"
-                    />
-                    {isSelectable && <Radio value="" onPress={onPress} isChecked={isSelected} />}
-                </HStack>
-            </HStack>
-        </Pressable>
+        <WalletItemBase
+            variant={device.useEmptyPassphrase ? 'standard' : 'passphrase'}
+            onPress={onPress}
+            isSelectable={isSelectable}
+            isSelected={showAsSelected}
+            walletNumber={device.walletNumber}
+            fiatBalance={fiatBalance}
+        />
     );
 };
diff --git a/suite-native/device-manager/src/components/WalletItemBase.tsx b/suite-native/device-manager/src/components/WalletItemBase.tsx
new file mode 100644
index 00000000000..f1233abe9a0
--- /dev/null
+++ b/suite-native/device-manager/src/components/WalletItemBase.tsx
@@ -0,0 +1,94 @@
+import { Pressable } from 'react-native';
+
+import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+import { HStack, Radio, Text } from '@suite-native/atoms';
+import { FiatAmountFormatter } from '@suite-native/formatters';
+import { Icon } from '@suite-native/icons';
+import { Translation } from '@suite-native/intl';
+
+type WalletItemBaseVariant = 'standard' | 'passphrase';
+
+type WalletItemBaseProps = {
+    variant: WalletItemBaseVariant;
+    onPress: () => void;
+    isSelectable: boolean;
+    isSelected: boolean;
+    walletNumber?: number;
+    fiatBalance?: string;
+};
+
+type WalletItemBaseStyleProps = { isSelected: boolean; isSelectable: boolean };
+
+const walletItemBaseStyle = prepareNativeStyle<WalletItemBaseStyleProps>(
+    (utils, { isSelected, isSelectable }) => ({
+        justifyContent: 'space-between',
+        alignItems: 'center',
+        height: 60,
+        gap: utils.spacings.sp12,
+        borderRadius: utils.borders.radii.r12,
+        borderColor: utils.colors.borderElevation1,
+        flex: 1,
+        extend: [
+            {
+                condition: isSelected,
+                style: {
+                    borderWidth: utils.borders.widths.large,
+                    borderColor: utils.colors.borderSecondary,
+                },
+            },
+            {
+                condition: isSelectable,
+                style: {
+                    paddingHorizontal: utils.spacings.sp16,
+                    backgroundColor: utils.colors.backgroundSurfaceElevation1,
+                    borderWidth: utils.borders.widths.small,
+                },
+            },
+        ],
+    }),
+);
+
+const labelStyle = prepareNativeStyle(() => ({
+    flex: 1,
+}));
+
+export const WalletItemBase = ({
+    variant,
+    onPress,
+    isSelected,
+    isSelectable,
+    walletNumber,
+    fiatBalance,
+}: WalletItemBaseProps) => {
+    const { applyStyle } = useNativeStyles();
+    const isStandard = variant === 'standard';
+
+    const walletNameLabel = isStandard ? (
+        <Translation id="deviceManager.wallet.standard" />
+    ) : (
+        <Translation id="deviceManager.wallet.defaultPassphrase" values={{ index: walletNumber }} />
+    );
+
+    return (
+        <Pressable onPress={onPress}>
+            <HStack style={applyStyle(walletItemBaseStyle, { isSelected, isSelectable })}>
+                <HStack alignItems="center" flex={1}>
+                    <Icon name={isStandard ? 'wallet' : 'password'} size="mediumLarge" />
+                    <Text variant="callout" numberOfLines={1} style={applyStyle(labelStyle)}>
+                        {walletNameLabel}
+                    </Text>
+                </HStack>
+                <HStack alignItems="center" spacing="sp12">
+                    {fiatBalance && (
+                        <FiatAmountFormatter
+                            value={fiatBalance}
+                            variant="hint"
+                            color="textSubdued"
+                        />
+                    )}
+                    {isSelectable && <Radio value="" onPress={onPress} isChecked={isSelected} />}
+                </HStack>
+            </HStack>
+        </Pressable>
+    );
+};
diff --git a/suite-native/device-manager/src/components/WalletList.tsx b/suite-native/device-manager/src/components/WalletList.tsx
index 861291dc49d..18079f40bb6 100644
--- a/suite-native/device-manager/src/components/WalletList.tsx
+++ b/suite-native/device-manager/src/components/WalletList.tsx
@@ -1,20 +1,60 @@
-import { useSelector } from 'react-redux';
+import { useSelector, useDispatch } from 'react-redux';
+
+import { A } from '@mobily/ts-belt';
 
-import { selectDeviceInstances } from '@suite-common/wallet-core';
-import { VStack } from '@suite-native/atoms';
 import { TrezorDevice } from '@suite-common/suite-types';
+import {
+    createDeviceInstanceThunk,
+    selectDevice,
+    selectDeviceInstances,
+    selectIsPortfolioTrackerDevice,
+} from '@suite-common/wallet-core';
+import { VStack } from '@suite-native/atoms';
+import { selectHasNoDeviceWithEmptyPassphrase } from '@suite-native/device';
 
 import { WalletItem } from './WalletItem';
+import { WalletItemBase } from './WalletItemBase';
 
 type WalletListProps = {
     onSelectDevice: (device: TrezorDevice) => void;
 };
 
 export const WalletList = ({ onSelectDevice }: WalletListProps) => {
+    const dispatch = useDispatch();
     const devices = useSelector(selectDeviceInstances);
+    const selectedDevice = useSelector(selectDevice);
+    const hasNoDeviceWithEmptyPassphrase = useSelector(selectHasNoDeviceWithEmptyPassphrase);
+    const isPortfolioTrackerDevice = useSelector(selectIsPortfolioTrackerDevice);
+    const isSelectable = devices.length > 1 || hasNoDeviceWithEmptyPassphrase;
+
+    // we want to show placeholder in case there are only passphrase wallets without standard and not portfolio
+    const showPlaceholder =
+        hasNoDeviceWithEmptyPassphrase && A.isNotEmpty(devices) && !isPortfolioTrackerDevice;
+
+    // on tap of placeholder we actually create device with empty passphrase and select it
+    const handlePlaceholderPress = async () => {
+        if (selectedDevice) {
+            await dispatch(
+                createDeviceInstanceThunk({
+                    device: selectedDevice,
+                    useEmptyPassphrase: true,
+                }),
+            )
+                .unwrap()
+                .then(result => onSelectDevice(result.device));
+        }
+    };
 
     return (
         <VStack spacing="sp12" paddingHorizontal="sp16">
+            {showPlaceholder && (
+                <WalletItemBase
+                    variant="standard"
+                    onPress={handlePlaceholderPress}
+                    isSelectable
+                    isSelected={false}
+                />
+            )}
             {devices.map(device => {
                 if (!device.state) {
                     return null;
@@ -22,9 +62,9 @@ export const WalletList = ({ onSelectDevice }: WalletListProps) => {
 
                 return (
                     <WalletItem
-                        key={device.state}
+                        key={device.state.staticSessionId}
                         deviceState={device.state}
-                        isSelectable={devices.length > 1}
+                        isSelectable={isSelectable}
                         onPress={() => onSelectDevice(device)}
                     />
                 );
diff --git a/suite-native/device-manager/tsconfig.json b/suite-native/device-manager/tsconfig.json
index 8fabffeee4d..816747d0be1 100644
--- a/suite-native/device-manager/tsconfig.json
+++ b/suite-native/device-manager/tsconfig.json
@@ -2,9 +2,6 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/redux-utils"
         },
@@ -19,6 +16,7 @@
         { "path": "../device" },
         { "path": "../feature-flags" },
         { "path": "../formatters" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../link" },
         { "path": "../navigation" },
diff --git a/suite-native/device-mutex/package.json b/suite-native/device-mutex/package.json
index f696781c62b..d327f88b892 100644
--- a/suite-native/device-mutex/package.json
+++ b/suite-native/device-mutex/package.json
@@ -11,7 +11,6 @@
     "scripts": {
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js"
     }
 }
diff --git a/suite-native/device/package.json b/suite-native/device/package.json
index 1073b149938..319efa0b01a 100644
--- a/suite-native/device/package.json
+++ b/suite-native/device/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -30,13 +29,11 @@
         "@suite-native/navigation": "workspace:*",
         "@suite-native/settings": "workspace:*",
         "@trezor/connect": "workspace:*",
-        "@trezor/device-utils": "workspace:*",
         "@trezor/styles": "workspace:*",
         "lottie-react-native": "6.7.2",
-        "proxy-memoize": "2.0.2",
         "react": "18.2.0",
         "react-native": "0.75.2",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-redux": "8.0.7",
         "semver": "^7.6.3"
     }
diff --git a/suite-native/device/src/assets/connector.png b/suite-native/device/src/assets/connector.png
new file mode 100644
index 00000000000..b4b95eb1a9b
Binary files /dev/null and b/suite-native/device/src/assets/connector.png differ
diff --git a/suite-native/device/src/assets/t1b1.png b/suite-native/device/src/assets/t1b1.png
index ff410a39728..84ff3e67982 100644
Binary files a/suite-native/device/src/assets/t1b1.png and b/suite-native/device/src/assets/t1b1.png differ
diff --git a/suite-native/device/src/assets/t2t1.png b/suite-native/device/src/assets/t2t1.png
index 1d747dde1cb..fe98c3f0121 100644
Binary files a/suite-native/device/src/assets/t2t1.png and b/suite-native/device/src/assets/t2t1.png differ
diff --git a/suite-native/device/src/assets/t3b1.png b/suite-native/device/src/assets/t3b1.png
index 2e90dcd35be..68c7993dce0 100644
Binary files a/suite-native/device/src/assets/t3b1.png and b/suite-native/device/src/assets/t3b1.png differ
diff --git a/suite-native/device/src/assets/t3t1.png b/suite-native/device/src/assets/t3t1.png
index 161c0f111f1..93c83f8f20b 100644
Binary files a/suite-native/device/src/assets/t3t1.png and b/suite-native/device/src/assets/t3t1.png differ
diff --git a/suite-native/device/src/assets/t3w1.png b/suite-native/device/src/assets/t3w1.png
new file mode 100644
index 00000000000..099edd1a446
Binary files /dev/null and b/suite-native/device/src/assets/t3w1.png differ
diff --git a/suite-native/device/src/components/ConnectorImage.tsx b/suite-native/device/src/components/ConnectorImage.tsx
new file mode 100644
index 00000000000..5b3a2ea8323
--- /dev/null
+++ b/suite-native/device/src/components/ConnectorImage.tsx
@@ -0,0 +1,24 @@
+import { Image } from '@suite-native/atoms';
+import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+
+const imageStyle = prepareNativeStyle<{ maxHeight?: number }>((_, { maxHeight }) => ({
+    width: 61,
+    height: 167,
+    maxHeight,
+    contentFit: 'contain',
+}));
+
+export type ConnectorImageProps = {
+    maxHeight?: number;
+};
+
+export const ConnectorImage = ({ maxHeight }: ConnectorImageProps) => {
+    const { applyStyle } = useNativeStyles();
+
+    return (
+        <Image
+            source={require('../assets/connector.png')}
+            style={applyStyle(imageStyle, { maxHeight })}
+        />
+    );
+};
diff --git a/suite-native/device/src/components/DeviceImage.tsx b/suite-native/device/src/components/DeviceImage.tsx
new file mode 100644
index 00000000000..20285f1d174
--- /dev/null
+++ b/suite-native/device/src/components/DeviceImage.tsx
@@ -0,0 +1,54 @@
+import { Image } from '@suite-native/atoms';
+import { DeviceModelInternal } from '@trezor/connect';
+import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+
+const deviceImageMap: Record<DeviceModelInternal, string> = {
+    [DeviceModelInternal.T1B1]: require('../assets/t1b1.png'),
+    [DeviceModelInternal.T2T1]: require('../assets/t2t1.png'),
+    [DeviceModelInternal.T2B1]: require('../assets/t3b1.png'),
+    [DeviceModelInternal.T3B1]: require('../assets/t3b1.png'),
+    [DeviceModelInternal.T3T1]: require('../assets/t3t1.png'),
+    [DeviceModelInternal.T3W1]: require('../assets/t3w1.png'),
+};
+
+type DeviceImageSize = 'normal' | 'large';
+type DeviceImageDimensions = {
+    width: number;
+    height: number;
+};
+
+const sizeToDimensionsMap = {
+    normal: {
+        width: 92,
+        height: 151,
+    },
+    large: {
+        width: 243,
+        height: 400,
+    },
+} as const satisfies Record<DeviceImageSize, DeviceImageDimensions>;
+
+const imageStyle = prepareNativeStyle<{ size: DeviceImageSize; maxHeight?: number }>(
+    (_, { size, maxHeight }) => ({
+        ...sizeToDimensionsMap[size],
+        maxHeight,
+        contentFit: 'contain',
+    }),
+);
+
+export type DeviceImageProps = {
+    deviceModel: DeviceModelInternal;
+    size?: DeviceImageSize;
+    maxHeight?: number;
+};
+
+export const DeviceImage = ({ deviceModel, size = 'normal', maxHeight }: DeviceImageProps) => {
+    const { applyStyle } = useNativeStyles();
+
+    return (
+        <Image
+            source={deviceImageMap[deviceModel]}
+            style={applyStyle(imageStyle, { size, maxHeight })}
+        />
+    );
+};
diff --git a/suite-native/device/src/hooks/useDetectDeviceError.tsx b/suite-native/device/src/hooks/useDetectDeviceError.tsx
index c63a1d03710..f52b094feed 100644
--- a/suite-native/device/src/hooks/useDetectDeviceError.tsx
+++ b/suite-native/device/src/hooks/useDetectDeviceError.tsx
@@ -84,7 +84,7 @@ export const useDetectDeviceError = () => {
             showAlert({
                 title: <Translation id="moduleDevice.unacquiredDeviceModal.title" />,
                 description: <Translation id="moduleDevice.unacquiredDeviceModal.description" />,
-                icon: 'warningCircleLight',
+                icon: 'warningCircle',
                 pictogramVariant: 'red',
                 primaryButtonTitle: <Translation id="moduleDevice.unacquiredDeviceModal.button" />,
                 appendix: <UnacquiredDeviceModalAppendix />,
@@ -101,7 +101,7 @@ export const useDetectDeviceError = () => {
             showAlert({
                 title: <Translation id="moduleDevice.unsupportedFirmwareModal.title" />,
                 description: <Translation id="moduleDevice.unsupportedFirmwareModal.description" />,
-                icon: 'warningCircleLight',
+                icon: 'warningCircle',
                 pictogramVariant: 'red',
                 primaryButtonTitle: <Translation id="generic.buttons.eject" />,
                 primaryButtonVariant: 'tertiaryElevation1',
@@ -190,7 +190,7 @@ export const useDetectDeviceError = () => {
             showAlert({
                 title: <Translation id="moduleDevice.bootloaderModal.title" />,
                 description: <Translation id="moduleDevice.bootloaderModal.description" />,
-                icon: 'warningCircleLight',
+                icon: 'warningCircle',
                 pictogramVariant: 'red',
                 primaryButtonVariant: 'tertiaryElevation1',
                 primaryButtonTitle: <Translation id="generic.buttons.eject" />,
@@ -220,7 +220,7 @@ export const useDetectDeviceError = () => {
             showAlert({
                 title: <Translation id="moduleDevice.genericErrorModal.title" />,
                 description: <Translation id="moduleDevice.genericErrorModal.description" />,
-                icon: 'warningCircleLight',
+                icon: 'warningCircle',
                 pictogramVariant: 'red',
                 primaryButtonVariant: 'redBold',
                 primaryButtonTitle: (
diff --git a/suite-native/device/src/hooks/useHandleDeviceConnection.ts b/suite-native/device/src/hooks/useHandleDeviceConnection.ts
index 0938b926707..33c08883fe8 100644
--- a/suite-native/device/src/hooks/useHandleDeviceConnection.ts
+++ b/suite-native/device/src/hooks/useHandleDeviceConnection.ts
@@ -45,8 +45,9 @@ export const useHandleDeviceConnection = () => {
     const navigation = useNavigation<NavigationProp>();
     const dispatch = useDispatch();
 
-    const isSendStackFocused =
-        navigation.getState()?.routes.at(-1)?.name === RootStackRoutes.SendStack;
+    const lastRoute = navigation.getState()?.routes.at(-1)?.name;
+    const isDeviceSettingsStackFocused = lastRoute === RootStackRoutes.DeviceSettingsStack;
+    const isSendStackFocused = lastRoute === RootStackRoutes.SendStack;
     const shouldBlockSendReviewRedirect = isDeviceRemembered && isSendStackFocused;
 
     // At the moment when unauthorized physical device is selected,
@@ -113,10 +114,10 @@ export const useHandleDeviceConnection = () => {
     // When trezor gets locked, it is necessary to display a PIN matrix for T1 so that it can be unlocked
     // and then continue with the interaction. For T2, PIN is entered on device, but the screen is still displayed.
     useEffect(() => {
-        if (isOnboardingFinished && hasDeviceRequestedPin) {
+        if (isOnboardingFinished && hasDeviceRequestedPin && !isDeviceSettingsStackFocused) {
             navigation.navigate(RootStackRoutes.AuthorizeDeviceStack, {
                 screen: AuthorizeDeviceStackRoutes.PinMatrix,
             });
         }
-    }, [hasDeviceRequestedPin, isOnboardingFinished, navigation]);
+    }, [isOnboardingFinished, hasDeviceRequestedPin, isDeviceSettingsStackFocused, navigation]);
 };
diff --git a/suite-native/device/src/hooks/useReportDeviceConnectToAnalytics.ts b/suite-native/device/src/hooks/useReportDeviceConnectToAnalytics.ts
index c0fcf9d4744..ea9a8911f75 100644
--- a/suite-native/device/src/hooks/useReportDeviceConnectToAnalytics.ts
+++ b/suite-native/device/src/hooks/useReportDeviceConnectToAnalytics.ts
@@ -6,7 +6,7 @@ import {
     selectDeviceFirmwareVersion,
     selectDeviceLanguage,
     selectDeviceModel,
-    selectIsDeviceBitcoinOnly,
+    selectHasBitcoinOnlyFirmware,
     selectIsDeviceProtectedByPin,
 } from '@suite-common/wallet-core';
 
@@ -17,7 +17,7 @@ export const useReportDeviceConnectToAnalytics = () => {
     const deviceFirmwareVersion = useSelector(selectDeviceFirmwareVersion);
     const isDeviceProtectedByPin = useSelector(selectIsDeviceProtectedByPin);
     const deviceModel = useSelector(selectDeviceModel);
-    const isDeviceBitcoinOnly = useSelector(selectIsDeviceBitcoinOnly);
+    const hasBitcoinOnlyFirmware = useSelector(selectHasBitcoinOnlyFirmware);
     const deviceLanguage = useSelector(selectDeviceLanguage);
 
     useEffect(() => {
@@ -28,7 +28,7 @@ export const useReportDeviceConnectToAnalytics = () => {
                     firmwareVersion: deviceFirmwareVersion,
                     pinProtection: isDeviceProtectedByPin,
                     deviceModel,
-                    isBitcoinOnly: isDeviceBitcoinOnly,
+                    isBitcoinOnly: hasBitcoinOnlyFirmware,
                     deviceLanguage,
                 },
             });
@@ -37,7 +37,7 @@ export const useReportDeviceConnectToAnalytics = () => {
         deviceFirmwareVersion,
         deviceLanguage,
         deviceModel,
-        isDeviceBitcoinOnly,
+        hasBitcoinOnlyFirmware,
         isDeviceProtectedByPin,
         isDeviceReadyToUseAndAuthorized,
     ]);
diff --git a/suite-native/device/src/index.ts b/suite-native/device/src/index.ts
index fa84592c3f7..fa6ba88c01e 100644
--- a/suite-native/device/src/index.ts
+++ b/suite-native/device/src/index.ts
@@ -3,8 +3,9 @@ export * from './middlewares/buttonRequestMiddleware';
 export * from './hooks/useHandleDeviceConnection';
 export * from './hooks/useDetectDeviceError';
 export * from './hooks/useReportDeviceConnectToAnalytics';
-export * from './screens/DeviceInfoModalScreen';
 export * from './components/ConnectDeviceAnimation';
 export * from './components/ConfirmOnTrezorImage';
+export * from './components/ConnectorImage';
+export * from './components/DeviceImage';
 export * from './utils';
 export * from './selectors';
diff --git a/suite-native/device/src/screens/DeviceInfoModalScreen.tsx b/suite-native/device/src/screens/DeviceInfoModalScreen.tsx
deleted file mode 100644
index 7e0fe21f01a..00000000000
--- a/suite-native/device/src/screens/DeviceInfoModalScreen.tsx
+++ /dev/null
@@ -1,173 +0,0 @@
-import { useSelector } from 'react-redux';
-import { useEffect, useState } from 'react';
-
-import { G } from '@mobily/ts-belt';
-import { useNavigation } from '@react-navigation/native';
-
-import { DeviceModelInternal } from '@trezor/connect';
-import {
-    Image,
-    Box,
-    Card,
-    HStack,
-    VStack,
-    Button,
-    IconButton,
-    ScreenHeaderWrapper,
-    Text,
-} from '@suite-native/atoms';
-import {
-    AppTabsRoutes,
-    HomeStackRoutes,
-    RootStackParamList,
-    RootStackRoutes,
-    Screen,
-    StackNavigationProps,
-} from '@suite-native/navigation';
-import {
-    selectDevice,
-    selectDeviceLabel,
-    selectDeviceModel,
-    selectDeviceReleaseInfo,
-    selectIsPortfolioTrackerDevice,
-} from '@suite-common/wallet-core';
-import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { Translation, useTranslate } from '@suite-native/intl';
-import { getFirmwareVersion } from '@trezor/device-utils';
-import { useOpenLink } from '@suite-native/link';
-
-import { HowToUpdateBottomSheet } from '../components/HowToUpdateBottomSheet';
-
-const deviceImageMap: Record<DeviceModelInternal, string> = {
-    [DeviceModelInternal.T1B1]: require('../assets/t1b1.png'),
-    [DeviceModelInternal.T2T1]: require('../assets/t2t1.png'),
-    [DeviceModelInternal.T2B1]: require('../assets/t3b1.png'),
-    [DeviceModelInternal.T3B1]: require('../assets/t3b1.png'),
-    [DeviceModelInternal.T3T1]: require('../assets/t3t1.png'),
-};
-
-const emptyBoxStyle = prepareNativeStyle(() => ({
-    width: 48,
-}));
-
-const contentStyle = prepareNativeStyle(() => ({
-    flexGrow: 1,
-}));
-
-type NavigationProp = StackNavigationProps<RootStackParamList, RootStackRoutes.DeviceInfo>;
-
-export const DeviceInfoModalScreen = () => {
-    const navigation = useNavigation<NavigationProp>();
-    const { translate } = useTranslate();
-    const openLink = useOpenLink();
-
-    const deviceModel = useSelector(selectDeviceModel);
-    const deviceLabel = useSelector(selectDeviceLabel);
-    const device = useSelector(selectDevice);
-    const isPortfolioTrackerDevice = useSelector(selectIsPortfolioTrackerDevice);
-    const deviceReleaseInfo = useSelector(selectDeviceReleaseInfo);
-    const { applyStyle } = useNativeStyles();
-
-    const [isUpdateSheetOpen, setIsUpdateSheetOpen] = useState<boolean>(false);
-
-    const isUpgradable = deviceReleaseInfo?.isNewer ?? false;
-
-    const getCardAlertProps = () => {
-        if (G.isNotNullable(deviceReleaseInfo)) {
-            if (isUpgradable) {
-                return {
-                    alertTitle: <Translation id="deviceInfo.outdatedFw" />,
-                    alertVariant: 'warning',
-                } as const;
-            }
-
-            return {
-                alertTitle: <Translation id="deviceInfo.upToDateFw" />,
-                alertVariant: 'success',
-            } as const;
-        }
-
-        return { alertTitle: undefined, alertVariant: undefined } as const;
-    };
-    const cardAlertProps = getCardAlertProps();
-
-    useEffect(() => {
-        if (isPortfolioTrackerDevice) {
-            navigation.navigate(RootStackRoutes.AppTabs, {
-                screen: AppTabsRoutes.HomeStack,
-                params: {
-                    screen: HomeStackRoutes.Home,
-                },
-            });
-        }
-    }, [isPortfolioTrackerDevice, navigation]);
-
-    if (!deviceModel) return null;
-
-    const currentFwVersion = getFirmwareVersion(device);
-
-    const handleGoBack = () => {
-        navigation.goBack();
-    };
-
-    const handleAccessoriesClick = () => {
-        openLink('https://trezor.io/accessories');
-    };
-
-    const handleUpdateClick = () => setIsUpdateSheetOpen(true);
-
-    return (
-        <Screen
-            screenHeader={
-                // TODO once https://github.com/trezor/trezor-suite/issues/9856 is done, this should be removed
-                <ScreenHeaderWrapper>
-                    <IconButton
-                        iconName="close"
-                        colorScheme="tertiaryElevation0"
-                        onPress={handleGoBack}
-                    />
-                    <Text>Device info</Text>
-                    <Box style={applyStyle(emptyBoxStyle)} />
-                </ScreenHeaderWrapper>
-            }
-        >
-            <Box style={applyStyle(contentStyle)}>
-                <Card {...cardAlertProps}>
-                    <HStack spacing="sp24">
-                        <Image width={92} height={151} source={deviceImageMap[deviceModel]} />
-                        <VStack spacing="sp4" justifyContent="center">
-                            {deviceLabel && <Text variant="titleSmall">{deviceLabel}</Text>}
-                            <Text variant="label" color="textSubdued">
-                                {device?.name}
-                            </Text>
-                            <Text variant="hint">
-                                {translate('deviceInfo.installedFw', {
-                                    version: currentFwVersion,
-                                })}
-                            </Text>
-                        </VStack>
-                    </HStack>
-                </Card>
-            </Box>
-            <VStack spacing="sp16">
-                <Button
-                    colorScheme="tertiaryElevation0"
-                    onPress={handleAccessoriesClick}
-                    viewRight="arrowUpRight"
-                >
-                    <Translation id="deviceInfo.goToAccessories" />
-                </Button>
-                {isUpgradable && (
-                    <Button colorScheme="primary" onPress={handleUpdateClick}>
-                        <Translation id="deviceInfo.updateHowTo.title" />
-                    </Button>
-                )}
-            </VStack>
-            <HowToUpdateBottomSheet
-                isVisible={isUpdateSheetOpen}
-                onClose={setIsUpdateSheetOpen}
-                title={<Translation id="deviceInfo.updateHowTo.title" />}
-            />
-        </Screen>
-    );
-};
diff --git a/suite-native/device/src/selectors.ts b/suite-native/device/src/selectors.ts
index 337da2cf62d..4a1205fa8c3 100644
--- a/suite-native/device/src/selectors.ts
+++ b/suite-native/device/src/selectors.ts
@@ -1,28 +1,39 @@
-import { memoize, memoizeWithArgs } from 'proxy-memoize';
-import { pipe, A, F } from '@mobily/ts-belt';
+import { A, pipe } from '@mobily/ts-belt';
 
+import { createWeakMapSelector, returnStableArrayIfEmpty } from '@suite-common/redux-utils';
 import {
     AccountsRootState,
     DeviceRootState,
     DiscoveryRootState,
-    selectDevice,
     FiatRatesRootState,
+    getAccountsByDeviceState,
+    PORTFOLIO_TRACKER_DEVICE_ID,
+    selectAccounts,
     selectAccountsByDeviceState,
     selectCurrentFiatRates,
+    selectDevice,
     selectDeviceFirmwareVersion,
+    selectDeviceInstances,
     selectDeviceModel,
+    selectDevices,
     selectIsConnectedDeviceUninitialized,
     selectIsDeviceConnectedAndAuthorized,
     selectIsDiscoveredDeviceAccountless,
     selectIsUnacquiredDevice,
-    PORTFOLIO_TRACKER_DEVICE_ID,
-    selectDevices,
 } from '@suite-common/wallet-core';
-import { SettingsSliceRootState, selectFiatCurrencyCode } from '@suite-native/settings';
 import { getTotalFiatBalance } from '@suite-common/wallet-utils';
+import { selectFiatCurrencyCode, SettingsSliceRootState } from '@suite-native/settings';
 
 import { isFirmwareVersionSupported } from './utils';
 
+type NativeDeviceRootState = DeviceRootState &
+    AccountsRootState &
+    DiscoveryRootState &
+    SettingsSliceRootState &
+    FiatRatesRootState;
+
+const createMemoizedSelector = createWeakMapSelector.withTypes<NativeDeviceRootState>();
+
 export const selectIsDeviceFirmwareSupported = (state: DeviceRootState) => {
     const deviceFwVersion = selectDeviceFirmwareVersion(state);
     const deviceModel = selectDeviceModel(state);
@@ -58,43 +69,40 @@ export const selectDeviceError = (
     return device?.error;
 };
 
-export const selectDeviceTotalFiatBalanceNative = memoizeWithArgs(
-    (
-        state: AccountsRootState & FiatRatesRootState & SettingsSliceRootState,
-        deviceState: string,
-    ) => {
-        const deviceAccounts = deviceState ? selectAccountsByDeviceState(state, deviceState) : [];
-        const rates = selectCurrentFiatRates(state);
-
+export const selectDeviceTotalFiatBalanceNative = createMemoizedSelector(
+    [selectAccountsByDeviceState, selectCurrentFiatRates, selectFiatCurrencyCode],
+    (deviceAccounts, rates, localCurrency) => {
         const fiatBalance = getTotalFiatBalance({
             deviceAccounts,
-            localCurrency: selectFiatCurrencyCode(state),
+            localCurrency,
             rates,
             shouldIncludeStaking: false,
         });
 
         return fiatBalance;
     },
-    {
-        // reasonably high cache size for a lot of devices and passphrases
-        size: 20,
-    },
 );
 
 // Unique symbols for all accounts that are on view only devices (excluding portfolio tracker)
-export const selectViewOnlyDevicesAccountsNetworkSymbols = memoize(
-    (state: DeviceRootState & AccountsRootState) => {
-        const devices = selectDevices(state);
-
-        return pipe(
+// Using WeakMap for complex object comparisons and array results
+export const selectViewOnlyDevicesAccountsNetworkSymbols = createMemoizedSelector(
+    [selectDevices, selectAccounts],
+    (devices, accounts) => {
+        const symbols = pipe(
             devices,
             A.filter(d => !!d.remember && d.id !== PORTFOLIO_TRACKER_DEVICE_ID && !!d.state),
-            A.map(d => selectAccountsByDeviceState(state, d.state!)),
+            A.map(d => getAccountsByDeviceState(accounts, d.state!)),
             A.flat,
             A.filter(a => a.visible),
             A.map(a => a.symbol),
             A.uniq,
-            F.toMutable,
         );
+
+        return returnStableArrayIfEmpty(symbols);
     },
 );
+
+export const selectHasNoDeviceWithEmptyPassphrase = createMemoizedSelector(
+    [selectDeviceInstances],
+    deviceInstances => A.isEmpty(deviceInstances.filter(d => d.useEmptyPassphrase)),
+);
diff --git a/suite-native/device/src/utils.ts b/suite-native/device/src/utils.ts
index cee09117cf7..5c31e48cd0f 100644
--- a/suite-native/device/src/utils.ts
+++ b/suite-native/device/src/utils.ts
@@ -6,9 +6,10 @@ import { DeviceModelInternal, VersionArray } from '@trezor/connect';
 export const minimalSupportedFirmwareVersion = {
     T1B1: [1, 12, 1] as VersionArray,
     T2T1: [2, 6, 3] as VersionArray,
-    T2B1: [2, 6, 3] as VersionArray,
-    T3B1: [2, 8, 1] as VersionArray,
-    T3T1: [2, 7, 1] as VersionArray,
+    T2B1: [2, 0, 0] as VersionArray,
+    T3B1: [2, 0, 0] as VersionArray,
+    T3T1: [2, 0, 0] as VersionArray,
+    T3W1: [2, 0, 0] as VersionArray,
 } as const satisfies Record<DeviceModelInternal, VersionArray>;
 
 export const isFirmwareVersionSupported = (
diff --git a/suite-native/device/tsconfig.json b/suite-native/device/tsconfig.json
index 541e79e1dd3..4c6f1a844d5 100644
--- a/suite-native/device/tsconfig.json
+++ b/suite-native/device/tsconfig.json
@@ -23,7 +23,6 @@
         { "path": "../navigation" },
         { "path": "../settings" },
         { "path": "../../packages/connect" },
-        { "path": "../../packages/device-utils" },
         { "path": "../../packages/styles" }
     ],
     "include": [".", "**/*.json"]
diff --git a/suite-native/discovery/package.json b/suite-native/discovery/package.json
index 5794e42d88e..4907c21c24e 100644
--- a/suite-native/discovery/package.json
+++ b/suite-native/discovery/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -26,9 +25,9 @@
         "@suite-native/device": "workspace:*",
         "@suite-native/device-mutex": "workspace:*",
         "@suite-native/feature-flags": "workspace:*",
+        "@suite-native/tokens": "workspace:*",
         "@trezor/connect": "workspace:*",
         "@trezor/utils": "workspace:*",
-        "proxy-memoize": "2.0.2",
         "react": "18.2.0",
         "react-redux": "8.0.7"
     }
diff --git a/suite-native/discovery/src/discoveryConfigSlice.ts b/suite-native/discovery/src/discoveryConfigSlice.ts
index c49f0d97b8f..cdbd9cc220f 100644
--- a/suite-native/discovery/src/discoveryConfigSlice.ts
+++ b/suite-native/discovery/src/discoveryConfigSlice.ts
@@ -1,8 +1,8 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { pipe } from '@mobily/ts-belt';
-import { memoizeWithArgs } from 'proxy-memoize';
+import { A, F, pipe } from '@mobily/ts-belt';
 
 import {
+    AccountsRootState,
     DeviceRootState,
     filterUnavailableNetworks,
     selectDeviceSupportedNetworks,
@@ -10,14 +10,23 @@ import {
 import {
     filterBlacklistedNetworks,
     filterTestnetNetworks,
+    isDetoxTestBuild,
+    portfolioTrackerMainnets,
+    portfolioTrackerTestnets,
     sortNetworks,
 } from '@suite-native/config';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import {
+    createSelectIsFeatureFlagEnabled,
     FeatureFlag,
     FeatureFlagsRootState,
     selectIsFeatureFlagEnabled,
 } from '@suite-native/feature-flags';
+import {
+    selectNetworkSymbolsOfAccountsWithTokensAllowed,
+    TokensRootState,
+} from '@suite-native/tokens';
+import { createWeakMapSelector, returnStableArrayIfEmpty } from '@suite-common/redux-utils';
 
 type DiscoveryInfo = {
     startTimestamp: number;
@@ -33,10 +42,12 @@ type DiscoveryConfigState = {
 
 export type DiscoveryConfigSliceRootState = {
     discoveryConfig: DiscoveryConfigState;
-};
+} & AccountsRootState &
+    DeviceRootState &
+    TokensRootState;
 
 const discoveryConfigInitialState: DiscoveryConfigState = {
-    areTestnetsEnabled: false,
+    areTestnetsEnabled: isDetoxTestBuild(),
     discoveryInfo: null,
     isCoinEnablingInitFinished: false,
     enabledDiscoveryNetworkSymbols: [],
@@ -85,46 +96,75 @@ export const selectAreTestnetsEnabled = (state: DiscoveryConfigSliceRootState) =
 export const selectDiscoveryInfo = (state: DiscoveryConfigSliceRootState) =>
     state.discoveryConfig.discoveryInfo;
 
-export const selectDiscoverySupportedNetworks = memoizeWithArgs(
-    (
-        state: DeviceRootState & DiscoveryConfigSliceRootState & FeatureFlagsRootState,
-        forcedAreTestnetsEnabled?: boolean,
-    ) => {
-        const areTestnetsEnabled = forcedAreTestnetsEnabled ?? selectAreTestnetsEnabled(state);
-        const isPolygonEnabled = selectIsFeatureFlagEnabled(state, FeatureFlag.IsPolygonEnabled);
-        const isBscEnabled = selectIsFeatureFlagEnabled(state, FeatureFlag.IsBscEnabled);
+const createMemoizedSelector = createWeakMapSelector.withTypes<
+    DeviceRootState & DiscoveryConfigSliceRootState & FeatureFlagsRootState
+>();
+
+const selectIsSolanaEnabled = createSelectIsFeatureFlagEnabled(FeatureFlag.IsSolanaEnabled);
 
+export const selectFeatureFlagEnabledNetworkSymbols = createMemoizedSelector(
+    [selectIsSolanaEnabled, selectAreTestnetsEnabled],
+    (isSolanaEnabled, areTestnetsEnabled) => {
         const allowlist: NetworkSymbol[] = [];
 
-        if (isPolygonEnabled) {
-            allowlist.push('pol');
-        }
-        if (isBscEnabled) {
-            allowlist.push('bnb');
+        if (isSolanaEnabled) {
+            allowlist.push('sol');
+            if (areTestnetsEnabled) {
+                allowlist.push('dsol');
+            }
         }
 
+        return returnStableArrayIfEmpty(allowlist);
+    },
+);
+
+export const selectDiscoverySupportedNetworks = createMemoizedSelector(
+    [
+        selectDeviceSupportedNetworks,
+        selectAreTestnetsEnabled,
+        selectFeatureFlagEnabledNetworkSymbols,
+        (_state, forcedAreTestnetsEnabled?: boolean) => forcedAreTestnetsEnabled,
+    ],
+    (deviceNetworks, defaultAreTestnetsEnabled, allowlist, forcedAreTestnetsEnabled) => {
+        const areTestnetsEnabled = forcedAreTestnetsEnabled ?? defaultAreTestnetsEnabled;
+
         return pipe(
-            selectDeviceSupportedNetworks(state),
+            deviceNetworks,
             networkSymbols => filterTestnetNetworks(networkSymbols, areTestnetsEnabled),
             filterUnavailableNetworks,
             availableNetworks => filterBlacklistedNetworks(availableNetworks, allowlist),
             sortNetworks,
+            returnStableArrayIfEmpty,
         );
     },
-    // for all areTestnetsEnabled states
-    { size: 2 },
 );
 
-export const selectDiscoveryNetworkSymbols = memoizeWithArgs(
-    (
-        state: DeviceRootState & DiscoveryConfigSliceRootState & FeatureFlagsRootState,
-        forcedAreTestnetsEnabled?: boolean,
-    ) => {
-        const supportedNetworks = selectDiscoverySupportedNetworks(state, forcedAreTestnetsEnabled);
+export const selectDiscoveryNetworkSymbols = createMemoizedSelector(
+    [
+        selectDiscoverySupportedNetworks,
+        (_state, forcedAreTestnetsEnabled?: boolean) => forcedAreTestnetsEnabled,
+    ],
+    supportedNetworks => returnStableArrayIfEmpty(supportedNetworks.map(n => n.symbol)),
+);
 
-        return supportedNetworks.map(n => n.symbol);
-    },
-    { size: 2 },
+export const selectPortfolioTrackerMainnetNetworkSymbols = createMemoizedSelector(
+    [selectFeatureFlagEnabledNetworkSymbols],
+    allowlist => returnStableArrayIfEmpty([...portfolioTrackerMainnets, ...allowlist]),
+);
+
+export const selectPortfolioTrackerTestnetNetworkSymbols = createMemoizedSelector(
+    [state => selectIsFeatureFlagEnabled(state, FeatureFlag.IsRegtestEnabled)],
+    isRegtestEnabled =>
+        returnStableArrayIfEmpty(
+            isRegtestEnabled
+                ? [...portfolioTrackerTestnets, 'regtest' as NetworkSymbol]
+                : portfolioTrackerTestnets,
+        ),
+);
+
+export const selectPortfolioTrackerNetworkSymbols = createMemoizedSelector(
+    [selectPortfolioTrackerMainnetNetworkSymbols, selectPortfolioTrackerTestnetNetworkSymbols],
+    (mainnets, testnets) => returnStableArrayIfEmpty([...mainnets, ...testnets]),
 );
 
 export const selectIsCoinEnablingInitFinished = (
@@ -136,15 +176,18 @@ export const selectEnabledDiscoveryNetworkSymbols = (state: DiscoveryConfigSlice
     state.discoveryConfig.enabledDiscoveryNetworkSymbols;
 
 // this includes only networks supported by current device
-export const selectDeviceEnabledDiscoveryNetworkSymbols = memoizeWithArgs(
-    (
-        state: DiscoveryConfigSliceRootState & DeviceRootState & FeatureFlagsRootState,
-        forcedAreTestnetsEnabled?: boolean,
-    ) =>
-        selectDiscoveryNetworkSymbols(state, forcedAreTestnetsEnabled).filter(s =>
-            state.discoveryConfig.enabledDiscoveryNetworkSymbols.includes(s),
+export const selectDeviceEnabledDiscoveryNetworkSymbols = createMemoizedSelector(
+    [selectDiscoveryNetworkSymbols, selectEnabledDiscoveryNetworkSymbols],
+    (networkSymbols, enabledSymbols) =>
+        returnStableArrayIfEmpty(networkSymbols.filter(s => enabledSymbols.includes(s))),
+);
+
+export const selectTokenDefinitionsEnabledNetworks = createMemoizedSelector(
+    [selectEnabledDiscoveryNetworkSymbols, selectNetworkSymbolsOfAccountsWithTokensAllowed],
+    (enabledNetworkSymbols, accountNetworkSymbols) =>
+        returnStableArrayIfEmpty(
+            F.toMutable(A.uniq([...enabledNetworkSymbols, ...accountNetworkSymbols])),
         ),
-    { size: 2 },
 );
 
 export const {
diff --git a/suite-native/discovery/src/discoveryMiddleware.ts b/suite-native/discovery/src/discoveryMiddleware.ts
index 8b89c149cca..144a2cd435f 100644
--- a/suite-native/discovery/src/discoveryMiddleware.ts
+++ b/suite-native/discovery/src/discoveryMiddleware.ts
@@ -1,3 +1,5 @@
+import { createMiddlewareWithExtraDeps } from '@suite-common/redux-utils';
+import { periodicCheckTokenDefinitionsThunk } from '@suite-common/token-definitions';
 import {
     deviceActions,
     discoveryActions,
@@ -6,7 +8,6 @@ import {
     authorizeDeviceThunk,
     accountsActions,
 } from '@suite-common/wallet-core';
-import { createMiddlewareWithExtraDeps } from '@suite-common/redux-utils';
 import { isFirmwareVersionSupported } from '@suite-native/device';
 
 import { startDescriptorPreloadedDiscoveryThunk, discoveryCheckThunk } from './discoveryThunks';
@@ -14,12 +15,17 @@ import {
     selectAreTestnetsEnabled,
     selectIsCoinEnablingInitFinished,
     toggleAreTestnetsEnabled,
+    setEnabledDiscoveryNetworkSymbols,
+    toggleEnabledDiscoveryNetworkSymbol,
 } from './discoveryConfigSlice';
 
 export const prepareDiscoveryMiddleware = createMiddlewareWithExtraDeps(
     (action, { dispatch, next, getState }) => {
-        if (deviceActions.forgetDevice.match(action) && action.payload.device.state) {
-            dispatch(discoveryActions.removeDiscovery(action.payload.device.state));
+        if (
+            deviceActions.forgetDevice.match(action) &&
+            action.payload.device.state?.staticSessionId
+        ) {
+            dispatch(discoveryActions.removeDiscovery(action.payload.device.state.staticSessionId));
         }
 
         const deviceModel = selectDeviceModel(getState());
@@ -58,7 +64,7 @@ export const prepareDiscoveryMiddleware = createMiddlewareWithExtraDeps(
         ) {
             dispatch(
                 startDescriptorPreloadedDiscoveryThunk({
-                    forcedDeviceState: action.payload.state,
+                    forcedDeviceState: action.payload.state?.staticSessionId,
                 }),
             );
         }
@@ -72,6 +78,15 @@ export const prepareDiscoveryMiddleware = createMiddlewareWithExtraDeps(
             dispatch(discoveryCheckThunk());
         }
 
+        // if we changed enabled networks, check for token definitions right away
+        if (
+            (toggleEnabledDiscoveryNetworkSymbol.match(action) ||
+                setEnabledDiscoveryNetworkSymbols.match(action)) &&
+            isCoinEnablingInitFinished
+        ) {
+            dispatch(periodicCheckTokenDefinitionsThunk());
+        }
+
         return action;
     },
 );
diff --git a/suite-native/discovery/src/discoverySelectors.ts b/suite-native/discovery/src/discoverySelectors.ts
index cb72d79191d..856ec87067f 100644
--- a/suite-native/discovery/src/discoverySelectors.ts
+++ b/suite-native/discovery/src/discoverySelectors.ts
@@ -26,6 +26,7 @@ import {
 import { TokenAddress, TokenSymbol } from '@suite-common/wallet-types';
 import { isFirmwareVersionSupported } from '@suite-native/device';
 import { FeatureFlagsRootState } from '@suite-native/feature-flags';
+import { StaticSessionId } from '@trezor/connect';
 
 import {
     DiscoveryConfigSliceRootState,
@@ -37,7 +38,7 @@ import { getNetworksWithUnfinishedDiscovery } from './utils';
 
 export const selectValidTokensByDeviceStateAndNetworkSymbol = (
     state: TokenDefinitionsRootState & DeviceRootState & AccountsRootState,
-    deviceState: string,
+    deviceState: StaticSessionId,
     networkSymbol: NetworkSymbol,
 ) => {
     const accountsByDeviceStateAndNetworkSymbol = selectAccountsByNetworkAndDeviceState(
@@ -73,7 +74,7 @@ export const selectValidTokensByDeviceStateAndNetworkSymbol = (
 
 export const selectDiscoveryAccountsAnalytics = (
     state: AccountsRootState & DeviceRootState & TokenDefinitionsRootState,
-    deviceState: string,
+    deviceState: StaticSessionId,
 ) =>
     pipe(
         selectDeviceAccounts(state),
@@ -153,7 +154,7 @@ export const selectCanRunDiscoveryForDevice = (
         DiscoveryConfigSliceRootState,
 ) => {
     const deviceState = selectDeviceState(state);
-    if (!deviceState) {
+    if (!deviceState?.staticSessionId) {
         return false;
     }
 
diff --git a/suite-native/discovery/src/discoveryThunks.ts b/suite-native/discovery/src/discoveryThunks.ts
index 4a9413f27a5..321249e7a45 100644
--- a/suite-native/discovery/src/discoveryThunks.ts
+++ b/suite-native/discovery/src/discoveryThunks.ts
@@ -1,6 +1,6 @@
 import { A, G, pipe } from '@mobily/ts-belt';
 
-import { getWeakRandomId } from '@trezor/utils';
+import { getWeakRandomId, isArrayMember } from '@trezor/utils';
 import { createThunk } from '@suite-common/redux-utils';
 import {
     accountsActions,
@@ -10,21 +10,25 @@ import {
     createDiscovery,
     removeDiscovery,
     getAvailableCardanoDerivationsThunk,
-    selectDeviceByState,
     selectDeviceAccountByDescriptorAndNetworkSymbol,
     selectDevice,
     LIMIT,
     selectDeviceAccountsForNetworkSymbolAndAccountType,
-    selectDeviceState,
     disableAccountsThunk,
     selectFirstNormalAccountForNetworkSymbol,
     selectHasDeviceDiscovery,
     filterUnavailableAccountTypes,
+    selectDeviceStaticSessionId,
+    selectDeviceByStaticSessionId,
 } from '@suite-common/wallet-core';
 import { selectIsAccountAlreadyDiscovered } from '@suite-native/accounts';
 import TrezorConnect, { StaticSessionId } from '@trezor/connect';
 import { Account, DiscoveryItem } from '@suite-common/wallet-types';
-import { getDerivationType, tryGetAccountIdentity } from '@suite-common/wallet-utils';
+import {
+    getDerivationType,
+    substituteBip43Path,
+    tryGetAccountIdentity,
+} from '@suite-common/wallet-utils';
 import {
     AccountType,
     Network,
@@ -196,7 +200,7 @@ const getCardanoSupportedAccountTypesThunk = createThunk(
         },
         { dispatch, getState },
     ) => {
-        const device = selectDeviceByState(getState(), deviceState);
+        const device = selectDeviceByStaticSessionId(getState(), deviceState);
         if (!device) {
             return undefined;
         }
@@ -205,7 +209,6 @@ const getCardanoSupportedAccountTypesThunk = createThunk(
                 dispatch(
                     getAvailableCardanoDerivationsThunk({
                         deviceState,
-                        device,
                     }),
                 ).unwrap(),
         });
@@ -365,7 +368,7 @@ export const addAndDiscoverNetworkAccountThunk = createThunk<
             return rejectWithValue(discoveryErrors.accountLimitReached);
         }
 
-        const accountPath = network.bip43Path.replace('i', index.toString());
+        const accountPath = substituteBip43Path(network.bip43Path, index);
 
         // Take exclusive access to the device and hold it until fetching of the descriptors is done.
         const deviceAccessResponse = await requestDeviceAccess({
@@ -395,7 +398,10 @@ export const addAndDiscoverNetworkAccountThunk = createThunk<
         }
 
         const descriptor = deviceAccessResponse.payload[0];
-        const identity = tryGetAccountIdentity({ deviceState, networkType: network.networkType });
+        const identity = tryGetAccountIdentity({
+            deviceState,
+            networkType: network.networkType,
+        });
 
         await dispatch(
             addAccountByDescriptorThunk({
@@ -457,7 +463,8 @@ const discoverNetworkBatchThunk = createThunk(
             const index =
                 lastDiscoveredAccountIndex + batchIndex + (isEvmLedgerDerivationPath ? 1 : 0);
 
-            const accountPath = normalizedNetworkAccount.bip43Path.replace('i', index.toString());
+            const { bip43Path } = normalizedNetworkAccount;
+            const accountPath = substituteBip43Path(bip43Path, index);
 
             const isAccountAlreadyDiscovered = selectIsAccountAlreadyDiscovered(getState(), {
                 deviceState,
@@ -502,7 +509,10 @@ const discoverNetworkBatchThunk = createThunk(
             return;
         }
 
-        const identity = tryGetAccountIdentity({ deviceState, networkType: network.networkType });
+        const identity = tryGetAccountIdentity({
+            deviceState,
+            networkType: network.networkType,
+        });
 
         const isFinished = await dispatch(
             discoverAccountsByDescriptorThunk({
@@ -541,7 +551,7 @@ export const createDescriptorPreloadedDiscoveryThunk = createThunk(
         },
         { dispatch, getState },
     ) => {
-        const device = selectDeviceByState(getState(), deviceState);
+        const device = selectDeviceByStaticSessionId(getState(), deviceState);
 
         if (!device) {
             return;
@@ -561,7 +571,8 @@ export const createDescriptorPreloadedDiscoveryThunk = createThunk(
                 ({ accountType }) =>
                     // Some cardano derivation may not be supported by the device. We need to exclude them from total count.
                     network.networkType !== 'cardano' ||
-                    (availableCardanoDerivations as string[]).includes(accountType),
+                    (availableCardanoDerivations !== undefined &&
+                        isArrayMember(accountType, availableCardanoDerivations)),
             );
 
             return count + availableAccountTypes.length;
@@ -600,7 +611,7 @@ export const startDescriptorPreloadedDiscoveryThunk = createThunk(
         }: { forcedAreTestnetsEnabled?: boolean; forcedDeviceState?: StaticSessionId },
         { dispatch, getState },
     ) => {
-        const deviceState = forcedDeviceState ?? selectDeviceState(getState());
+        const deviceState = forcedDeviceState ?? selectDeviceStaticSessionId(getState());
 
         if (!deviceState) {
             console.warn(
@@ -610,7 +621,7 @@ export const startDescriptorPreloadedDiscoveryThunk = createThunk(
             return;
         }
 
-        const device = selectDeviceByState(getState(), deviceState);
+        const device = selectDeviceByStaticSessionId(getState(), deviceState);
 
         const hasDiscovery1 = selectHasDeviceDiscovery(getState());
         if (hasDiscovery1) {
@@ -664,7 +675,7 @@ export const startDescriptorPreloadedDiscoveryThunk = createThunk(
             network =>
                 network.networkType !== 'cardano' ||
                 normalizeNetworkAccounts(network).some(({ accountType }) =>
-                    (availableCardanoDerivations as string[]).includes(accountType),
+                    isArrayMember(accountType, availableCardanoDerivations),
                 ),
         );
 
@@ -689,7 +700,7 @@ export const startDescriptorPreloadedDiscoveryThunk = createThunk(
                 .filter(
                     ({ accountType }: NetworkAccount) =>
                         network.networkType !== 'cardano' ||
-                        (availableCardanoDerivations as string[]).includes(accountType),
+                        isArrayMember(accountType, availableCardanoDerivations),
                 )
                 .forEach(({ accountType }: NetworkAccount) => {
                     dispatch(discoverNetworkBatchThunk({ deviceState, network, accountType }));
diff --git a/suite-native/discovery/tsconfig.json b/suite-native/discovery/tsconfig.json
index 0539a0cd6de..f8a12df303b 100644
--- a/suite-native/discovery/tsconfig.json
+++ b/suite-native/discovery/tsconfig.json
@@ -29,6 +29,7 @@
         { "path": "../device" },
         { "path": "../device-mutex" },
         { "path": "../feature-flags" },
+        { "path": "../tokens" },
         { "path": "../../packages/connect" },
         { "path": "../../packages/utils" }
     ]
diff --git a/suite-native/feature-flags/package.json b/suite-native/feature-flags/package.json
index ce64923bf3e..4708ba1235a 100644
--- a/suite-native/feature-flags/package.json
+++ b/suite-native/feature-flags/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-native/feature-flags/src/featureFlagsSlice.ts b/suite-native/feature-flags/src/featureFlagsSlice.ts
index fd592f4976a..1c2196b0c96 100644
--- a/suite-native/feature-flags/src/featureFlagsSlice.ts
+++ b/suite-native/feature-flags/src/featureFlagsSlice.ts
@@ -5,10 +5,12 @@ import { isDebugEnv, isDetoxTestBuild, isDevelopOrDebugEnv } from '@suite-native
 
 export const FeatureFlag = {
     IsDeviceConnectEnabled: 'isDeviceConnectEnabled',
-    IsSendEnabled: 'isSendEnabled',
+    IsRippleSendEnabled: 'isRippleSendEnabled',
+    IsCardanoSendEnabled: 'isCardanoSendEnabled',
+    IsSolanaSendEnabled: 'isSolanaSendEnabled',
     IsRegtestEnabled: 'isRegtestEnabled',
-    IsPolygonEnabled: 'IsPolygonEnabled',
-    IsBscEnabled: 'IsBscEnabled',
+    IsSolanaEnabled: 'IsSolanaEnabled',
+    IsConnectPopupEnabled: 'IsConnectPopupEnabled',
 } as const;
 export type FeatureFlag = (typeof FeatureFlag)[keyof typeof FeatureFlag];
 
@@ -20,18 +22,22 @@ export type FeatureFlagsRootState = {
 
 export const featureFlagsInitialState: FeatureFlagsState = {
     [FeatureFlag.IsDeviceConnectEnabled]: isAndroid() || isDebugEnv(),
-    [FeatureFlag.IsSendEnabled]: isAndroid() && isDevelopOrDebugEnv(),
+    [FeatureFlag.IsRippleSendEnabled]: isAndroid() && isDevelopOrDebugEnv(),
+    [FeatureFlag.IsCardanoSendEnabled]: isAndroid() && isDevelopOrDebugEnv(),
+    [FeatureFlag.IsSolanaSendEnabled]: isAndroid() && isDevelopOrDebugEnv(),
     [FeatureFlag.IsRegtestEnabled]: isDebugEnv() || isDetoxTestBuild(),
-    [FeatureFlag.IsPolygonEnabled]: false,
-    [FeatureFlag.IsBscEnabled]: false,
+    [FeatureFlag.IsSolanaEnabled]: false,
+    [FeatureFlag.IsConnectPopupEnabled]: isDevelopOrDebugEnv(),
 };
 
 export const featureFlagsPersistedKeys: Array<keyof FeatureFlagsState> = [
     FeatureFlag.IsDeviceConnectEnabled,
-    FeatureFlag.IsSendEnabled,
+    FeatureFlag.IsRippleSendEnabled,
+    FeatureFlag.IsCardanoSendEnabled,
+    FeatureFlag.IsSolanaSendEnabled,
     FeatureFlag.IsRegtestEnabled,
-    FeatureFlag.IsPolygonEnabled,
-    FeatureFlag.IsBscEnabled,
+    FeatureFlag.IsSolanaEnabled,
+    FeatureFlag.IsConnectPopupEnabled,
 ];
 
 export const featureFlagsSlice = createSlice({
@@ -44,6 +50,10 @@ export const featureFlagsSlice = createSlice({
     },
 });
 
+export const createSelectIsFeatureFlagEnabled =
+    (featureFlagKey: FeatureFlag) => (state: FeatureFlagsRootState) =>
+        state.featureFlags[featureFlagKey];
+
 export const selectIsFeatureFlagEnabled = (state: FeatureFlagsRootState, key: FeatureFlag) =>
     state.featureFlags[key];
 
diff --git a/suite-native/formatters/package.json b/suite-native/formatters/package.json
index 3d0d3e08186..88ec8b5b9b5 100644
--- a/suite-native/formatters/package.json
+++ b/suite-native/formatters/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
@@ -21,6 +20,7 @@
         "@suite-common/wallet-utils": "workspace:*",
         "@suite-native/atoms": "workspace:*",
         "@suite-native/settings": "workspace:*",
+        "@suite-native/tokens": "workspace:*",
         "@trezor/env-utils": "workspace:*",
         "@trezor/styles": "workspace:*",
         "@trezor/utils": "workspace:*",
diff --git a/suite-native/formatters/src/components/CoinAmountFormatter.tsx b/suite-native/formatters/src/components/CoinAmountFormatter.tsx
new file mode 100644
index 00000000000..1c2cb3d6412
--- /dev/null
+++ b/suite-native/formatters/src/components/CoinAmountFormatter.tsx
@@ -0,0 +1,61 @@
+import { useSelector } from 'react-redux';
+
+import { AccountsRootState, selectAccountNetworkSymbol } from '@suite-common/wallet-core';
+import { AccountKey, TokenAddress } from '@suite-common/wallet-types';
+import {
+    selectAccountTokenInfo,
+    selectAccountTokenSymbol,
+    TokensRootState,
+} from '@suite-native/tokens';
+import { TextProps } from '@suite-native/atoms';
+
+import { TokenAmountFormatter } from './TokenAmountFormatter';
+import { FormatterProps } from '../types';
+import { CryptoAmountFormatter } from './CryptoAmountFormatter';
+
+type CoinAmountFormatterProps = FormatterProps<string | null | number> &
+    TextProps & {
+        accountKey: AccountKey;
+        tokenContract?: TokenAddress;
+        isBalance?: boolean;
+        isDiscreetText?: boolean;
+        isForcedDiscreetMode?: boolean;
+        decimals?: number;
+    };
+
+export const CoinAmountFormatter = ({
+    value,
+    accountKey,
+    tokenContract,
+    decimals,
+    ...restProps
+}: CoinAmountFormatterProps) => {
+    const networkSymbol = useSelector((state: AccountsRootState) =>
+        selectAccountNetworkSymbol(state, accountKey),
+    );
+
+    const tokenInfo = useSelector((state: TokensRootState) =>
+        selectAccountTokenInfo(state, accountKey, tokenContract),
+    );
+
+    const tokenSymbol = useSelector((state: TokensRootState) =>
+        selectAccountTokenSymbol(state, accountKey, tokenContract),
+    );
+
+    if (!networkSymbol) {
+        return null;
+    }
+
+    if (tokenInfo && value) {
+        return (
+            <TokenAmountFormatter
+                decimals={decimals ?? tokenInfo.decimals}
+                value={value}
+                symbol={tokenSymbol}
+                {...restProps}
+            />
+        );
+    }
+
+    return <CryptoAmountFormatter value={value} network={networkSymbol} {...restProps} />;
+};
diff --git a/suite-native/formatters/src/components/CoinToFiatAmountFormatter.tsx b/suite-native/formatters/src/components/CoinToFiatAmountFormatter.tsx
new file mode 100644
index 00000000000..083ae5e6f03
--- /dev/null
+++ b/suite-native/formatters/src/components/CoinToFiatAmountFormatter.tsx
@@ -0,0 +1,54 @@
+import { useSelector } from 'react-redux';
+
+import { AccountsRootState, selectAccountNetworkSymbol } from '@suite-common/wallet-core';
+import { AccountKey, TokenAddress } from '@suite-common/wallet-types';
+import { selectAccountTokenInfo, TokensRootState } from '@suite-native/tokens';
+import { TextProps } from '@suite-native/atoms';
+
+import { FormatterProps } from '../types';
+import { TokenToFiatAmountFormatter } from './TokenToFiatAmountFormatter';
+import { CryptoToFiatAmountFormatter } from './CryptoToFiatAmountFormatter';
+
+type CoinToFiatAmountFormatterProps = FormatterProps<string | null | number> &
+    TextProps & {
+        accountKey: AccountKey;
+        tokenContract?: TokenAddress;
+        isBalance?: boolean;
+        isDiscreetText?: boolean;
+        isForcedDiscreetMode?: boolean;
+        decimals?: number;
+    };
+
+export const CoinToFiatAmountFormatter = ({
+    value,
+    accountKey,
+    tokenContract,
+    decimals,
+    ...restProps
+}: CoinToFiatAmountFormatterProps) => {
+    const networkSymbol = useSelector((state: AccountsRootState) =>
+        selectAccountNetworkSymbol(state, accountKey),
+    );
+
+    const tokenInfo = useSelector((state: TokensRootState) =>
+        selectAccountTokenInfo(state, accountKey, tokenContract),
+    );
+
+    if (!networkSymbol) {
+        return null;
+    }
+
+    if (tokenInfo && value) {
+        return (
+            <TokenToFiatAmountFormatter
+                value={value}
+                contract={tokenInfo.contract}
+                networkSymbol={networkSymbol}
+                decimals={decimals ?? tokenInfo.decimals}
+                {...restProps}
+            />
+        );
+    }
+
+    return <CryptoToFiatAmountFormatter value={value} network={networkSymbol} {...restProps} />;
+};
diff --git a/suite-native/formatters/src/components/CryptoToFiatAmountFormatter.tsx b/suite-native/formatters/src/components/CryptoToFiatAmountFormatter.tsx
index 0b433c5a3f0..de6a100ab6f 100644
--- a/suite-native/formatters/src/components/CryptoToFiatAmountFormatter.tsx
+++ b/suite-native/formatters/src/components/CryptoToFiatAmountFormatter.tsx
@@ -5,7 +5,7 @@ import { FormatterProps } from '../types';
 import { useFiatFromCryptoValue } from '../hooks/useFiatFromCryptoValue';
 import { FiatAmountFormatter } from './FiatAmountFormatter';
 
-type CryptoToFiatAmountFormatterProps = FormatterProps<string | null> &
+type CryptoToFiatAmountFormatterProps = FormatterProps<string | number | null> &
     TextProps & {
         network: NetworkSymbol;
         historicRate?: number;
@@ -27,7 +27,7 @@ export const CryptoToFiatAmountFormatter = ({
         historicRate,
         useHistoricRate,
         isBalance,
-        cryptoValue: value,
+        cryptoValue: value ? value.toString() : null,
     });
 
     return <FiatAmountFormatter network={network} value={fiatValue} {...otherProps} />;
diff --git a/suite-native/formatters/src/components/EmptyAmountSkeleton.tsx b/suite-native/formatters/src/components/EmptyAmountSkeleton.tsx
index c5042d78130..aa4f6abb075 100644
--- a/suite-native/formatters/src/components/EmptyAmountSkeleton.tsx
+++ b/suite-native/formatters/src/components/EmptyAmountSkeleton.tsx
@@ -1,13 +1,17 @@
+import { Dimensions } from 'react-native';
+
 import { BoxSkeleton, HStack } from '@suite-native/atoms';
 
 import { EmptyAmountText } from './EmptyAmountText';
 
+const SKELETON_WIDTH = 0.2 * Dimensions.get('window').width;
+
 export const EmptyAmountSkeleton = () => {
     // Usage of EmptyAmountText ensures the correct line height.
     return (
         <HStack alignItems="center">
             <EmptyAmountText />
-            <BoxSkeleton width={48} height={20} />
+            <BoxSkeleton width={SKELETON_WIDTH} height={20} borderRadius="r4" />
         </HStack>
     );
 };
diff --git a/suite-native/formatters/src/components/EthereumTokenAmountFormatter.tsx b/suite-native/formatters/src/components/TokenAmountFormatter.tsx
similarity index 87%
rename from suite-native/formatters/src/components/EthereumTokenAmountFormatter.tsx
rename to suite-native/formatters/src/components/TokenAmountFormatter.tsx
index 52c81fe4361..f6e29c9f1d3 100644
--- a/suite-native/formatters/src/components/EthereumTokenAmountFormatter.tsx
+++ b/suite-native/formatters/src/components/TokenAmountFormatter.tsx
@@ -6,7 +6,7 @@ import { FormatterProps } from '../types';
 import { AmountText } from './AmountText';
 import { convertTokenValueToDecimal } from '../utils';
 
-type EthereumTokenAmountFormatterProps = {
+type TokenAmountFormatterProps = {
     symbol: TokenSymbol | null;
     isDiscreetText?: boolean;
     decimals?: number;
@@ -14,7 +14,7 @@ type EthereumTokenAmountFormatterProps = {
 } & FormatterProps<number | string> &
     TextProps;
 
-export const EthereumTokenAmountFormatter = ({
+export const TokenAmountFormatter = ({
     value,
     symbol,
     isDiscreetText = true,
@@ -22,7 +22,7 @@ export const EthereumTokenAmountFormatter = ({
     variant = 'hint',
     color = 'textSubdued',
     ...rest
-}: EthereumTokenAmountFormatterProps) => {
+}: TokenAmountFormatterProps) => {
     const decimalValue = convertTokenValueToDecimal(value, decimals);
 
     const formattedValue = `${localizeNumber(decimalValue)} ${symbol}`;
diff --git a/suite-native/formatters/src/components/EthereumTokenToFiatAmountFormatter.tsx b/suite-native/formatters/src/components/TokenToFiatAmountFormatter.tsx
similarity index 86%
rename from suite-native/formatters/src/components/EthereumTokenToFiatAmountFormatter.tsx
rename to suite-native/formatters/src/components/TokenToFiatAmountFormatter.tsx
index 84b62a6a184..3c6fe05d888 100644
--- a/suite-native/formatters/src/components/EthereumTokenToFiatAmountFormatter.tsx
+++ b/suite-native/formatters/src/components/TokenToFiatAmountFormatter.tsx
@@ -2,13 +2,15 @@ import { TextProps, Box } from '@suite-native/atoms';
 import { useFormatters } from '@suite-common/formatters';
 import { TokenAddress } from '@suite-common/wallet-types';
 import { SignValue } from '@suite-common/suite-types';
+import { NetworkSymbol } from '@suite-common/wallet-config';
 
 import { FormatterProps } from '../types';
 import { AmountText } from './AmountText';
 import { SignValueFormatter } from './SignValueFormatter';
 import { useFiatFromCryptoValue } from '../hooks/useFiatFromCryptoValue';
 
-type EthereumTokenToFiatAmountFormatterProps = {
+type TokenToFiatAmountFormatterProps = {
+    networkSymbol: NetworkSymbol;
     contract: TokenAddress;
     isDiscreetText?: boolean;
     decimals?: number;
@@ -19,7 +21,8 @@ type EthereumTokenToFiatAmountFormatterProps = {
 } & FormatterProps<number | string> &
     TextProps;
 
-export const EthereumTokenToFiatAmountFormatter = ({
+export const TokenToFiatAmountFormatter = ({
+    networkSymbol,
     value,
     contract,
     isDiscreetText = true,
@@ -30,11 +33,11 @@ export const EthereumTokenToFiatAmountFormatter = ({
     historicRate,
     useHistoricRate,
     ...rest
-}: EthereumTokenToFiatAmountFormatterProps) => {
+}: TokenToFiatAmountFormatterProps) => {
     const { FiatAmountFormatter } = useFormatters();
     const fiatValue = useFiatFromCryptoValue({
         cryptoValue: String(value),
-        network: 'eth',
+        network: networkSymbol,
         tokenAddress: contract,
         tokenDecimals: decimals,
         historicRate,
diff --git a/suite-native/formatters/src/hooks/useCryptoFiatConverters.ts b/suite-native/formatters/src/hooks/useCryptoFiatConverters.ts
index 76833131e7f..274b15f1289 100644
--- a/suite-native/formatters/src/hooks/useCryptoFiatConverters.ts
+++ b/suite-native/formatters/src/hooks/useCryptoFiatConverters.ts
@@ -13,7 +13,7 @@ import { TokenAddress } from '@suite-common/wallet-types';
 
 type useConvertFiatToCryptoParams = {
     networkSymbol: NetworkSymbol;
-    tokenAddress?: TokenAddress;
+    tokenContract?: TokenAddress;
     tokenDecimals?: number;
     historicRate?: number;
     useHistoricRate?: boolean;
@@ -22,7 +22,7 @@ type useConvertFiatToCryptoParams = {
 
 export const useCryptoFiatConverters = ({
     networkSymbol,
-    tokenAddress,
+    tokenContract,
     historicRate,
     useHistoricRate,
 }: useConvertFiatToCryptoParams) => {
@@ -30,7 +30,7 @@ export const useCryptoFiatConverters = ({
         selectIsAmountInSats(state, networkSymbol),
     );
     const fiatCurrencyCode = useSelector(selectFiatCurrencyCode);
-    const fiatRateKey = getFiatRateKey(networkSymbol, fiatCurrencyCode, tokenAddress);
+    const fiatRateKey = getFiatRateKey(networkSymbol, fiatCurrencyCode, tokenContract);
     const currentRate = useSelector((state: FiatRatesRootState) =>
         selectFiatRatesByFiatRateKey(state, fiatRateKey),
     );
diff --git a/suite-native/formatters/src/index.ts b/suite-native/formatters/src/index.ts
index 00b516f3216..f3875c2b561 100644
--- a/suite-native/formatters/src/index.ts
+++ b/suite-native/formatters/src/index.ts
@@ -1,3 +1,5 @@
+export { CoinAmountFormatter } from './components/CoinAmountFormatter';
+export { CoinToFiatAmountFormatter } from './components/CoinToFiatAmountFormatter';
 export { CryptoToFiatAmountFormatter } from './components/CryptoToFiatAmountFormatter';
 export { AccountAddressFormatter } from './components/AccountAddressFormatter';
 export { FiatBalanceFormatter } from './components/FiatBalanceFormatter';
@@ -5,8 +7,8 @@ export { TransactionIdFormatter } from './components/TransactionIdFormatter';
 export { PercentageDifferenceFormatter } from './components/PercentageDifferenceFormatter';
 export { FiatAmountFormatter } from './components/FiatAmountFormatter';
 export { CryptoAmountFormatter } from './components/CryptoAmountFormatter';
-export { EthereumTokenAmountFormatter } from './components/EthereumTokenAmountFormatter';
-export { EthereumTokenToFiatAmountFormatter } from './components/EthereumTokenToFiatAmountFormatter';
+export { TokenAmountFormatter } from './components/TokenAmountFormatter';
+export { TokenToFiatAmountFormatter } from './components/TokenToFiatAmountFormatter';
 export { SignValueFormatter } from './components/SignValueFormatter';
 export { FeeFormatter } from './components/FeeFormatter';
 export { useFiatFromCryptoValue } from './hooks/useFiatFromCryptoValue';
diff --git a/suite-native/formatters/tsconfig.json b/suite-native/formatters/tsconfig.json
index ecb7965366e..657fe2a4da7 100644
--- a/suite-native/formatters/tsconfig.json
+++ b/suite-native/formatters/tsconfig.json
@@ -22,6 +22,7 @@
         },
         { "path": "../atoms" },
         { "path": "../settings" },
+        { "path": "../tokens" },
         { "path": "../../packages/env-utils" },
         { "path": "../../packages/styles" },
         { "path": "../../packages/utils" }
diff --git a/suite-native/forms/package.json b/suite-native/forms/package.json
index 22e83ad03f0..694e4d0a59e 100644
--- a/suite-native/forms/package.json
+++ b/suite-native/forms/package.json
@@ -6,17 +6,16 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
-        "@hookform/resolvers": "3.9.0",
+        "@hookform/resolvers": "3.9.1",
         "@mobily/ts-belt": "^3.13.1",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-native/atoms": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "react": "18.2.0",
-        "react-hook-form": "^7.53.0",
+        "react-hook-form": "^7.53.1",
         "react-native": "0.75.2",
         "yup": "^1.4.0"
     }
diff --git a/suite-native/forms/src/Form.tsx b/suite-native/forms/src/Form.tsx
index a38482f54d5..e6636baa3d1 100644
--- a/suite-native/forms/src/Form.tsx
+++ b/suite-native/forms/src/Form.tsx
@@ -1,43 +1,23 @@
 import { createContext, ReactNode } from 'react';
-import { Control, FieldValues, UseFormReturn } from 'react-hook-form';
+import { FieldValues, UseFormReturn } from 'react-hook-form';
 
 export interface FormProps<TFieldValues extends FieldValues> {
     children?: ReactNode;
     form: UseFormReturn<TFieldValues>;
 }
 
-export interface FormContextValue<TFieldValues extends FieldValues> {
-    control: Control<TFieldValues>;
-    setValue: UseFormReturn<TFieldValues>['setValue'];
-    getValues: UseFormReturn<TFieldValues>['getValues'];
-    handleSubmit: UseFormReturn<TFieldValues>['handleSubmit'];
-    watch: UseFormReturn<TFieldValues>['watch'];
-    formState: UseFormReturn<TFieldValues>['formState'];
-    reset: UseFormReturn<TFieldValues>['reset'];
-    trigger: UseFormReturn<TFieldValues>['trigger'];
-}
-
-export const FormContext = createContext<FormContextValue<FieldValues>>(
-    {} as FormContextValue<FieldValues>,
-);
+export const FormContext = createContext<UseFormReturn>({} as UseFormReturn);
 
 export const Form = <TFieldValues extends FieldValues>({
     children,
     form,
 }: FormProps<TFieldValues>) => {
     const formContextValue = {
-        control: form.control,
-        setValue: form.setValue,
-        getValues: form.getValues,
-        handleSubmit: form.handleSubmit,
-        watch: form.watch,
-        formState: form.formState,
-        reset: form.reset,
-        trigger: form.trigger,
+        ...form,
     };
 
     return (
-        <FormContext.Provider value={formContextValue as FormContextValue<FieldValues>}>
+        <FormContext.Provider value={formContextValue as UseFormReturn<FieldValues>}>
             {children}
         </FormContext.Provider>
     );
diff --git a/suite-native/forms/src/fields/SecureTextInputField.tsx b/suite-native/forms/src/fields/SecureTextInputField.tsx
index 5059b063cf6..a0387c6622d 100644
--- a/suite-native/forms/src/fields/SecureTextInputField.tsx
+++ b/suite-native/forms/src/fields/SecureTextInputField.tsx
@@ -3,7 +3,7 @@ import { Pressable } from 'react-native';
 
 import { TextInput } from 'react-native/types';
 
-import { Icon, IconName } from '@suite-common/icons-deprecated';
+import { Icon, IconName } from '@suite-native/icons';
 
 import { FieldProps, TextInputField } from './TextInputField';
 
diff --git a/suite-native/forms/src/hooks/useFormContext.ts b/suite-native/forms/src/hooks/useFormContext.ts
index dcace42aee2..0ff4383c475 100644
--- a/suite-native/forms/src/hooks/useFormContext.ts
+++ b/suite-native/forms/src/hooks/useFormContext.ts
@@ -1,5 +1,7 @@
 import { useContext } from 'react';
+import { FieldValues, UseFormReturn } from 'react-hook-form';
 
 import { FormContext } from '../Form';
 
-export const useFormContext = () => useContext(FormContext);
+export const useFormContext = <TFieldValues extends FieldValues>() =>
+    useContext(FormContext) as UseFormReturn<TFieldValues>;
diff --git a/suite-native/forms/tsconfig.json b/suite-native/forms/tsconfig.json
index d04e414bf03..e8b7dc42390 100644
--- a/suite-native/forms/tsconfig.json
+++ b/suite-native/forms/tsconfig.json
@@ -2,9 +2,7 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
-        { "path": "../atoms" }
+        { "path": "../atoms" },
+        { "path": "../icons" }
     ]
 }
diff --git a/suite-native/graph/package.json b/suite-native/graph/package.json
index db7392e752c..04f4500d9b8 100644
--- a/suite-native/graph/package.json
+++ b/suite-native/graph/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
@@ -19,7 +18,6 @@
         "@shopify/react-native-skia": "1.3.11",
         "@suite-common/formatters": "workspace:*",
         "@suite-common/graph": "workspace:*",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/redux-utils": "workspace:*",
         "@suite-common/suite-types": "workspace:*",
         "@suite-common/token-definitions": "workspace:*",
@@ -30,6 +28,7 @@
         "@suite-native/analytics": "workspace:*",
         "@suite-native/atoms": "workspace:*",
         "@suite-native/formatters": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/react-native-graph": "workspace:*",
         "@suite-native/storage": "workspace:*",
@@ -41,7 +40,7 @@
         "jotai": "1.9.1",
         "react": "18.2.0",
         "react-native": "0.75.2",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-redux": "8.0.7",
         "redux-persist": "6.0.0"
     }
diff --git a/suite-native/graph/src/components/GraphError.tsx b/suite-native/graph/src/components/GraphError.tsx
index 2b84c7fec06..cfffeaf634e 100644
--- a/suite-native/graph/src/components/GraphError.tsx
+++ b/suite-native/graph/src/components/GraphError.tsx
@@ -2,7 +2,7 @@ import Animated, { FadeInDown, FadeInUp, FadeOutUp } from 'react-native-reanimat
 import { Pressable } from 'react-native';
 
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { Text, VStack } from '@suite-native/atoms';
 import { Translation } from '@suite-native/intl';
 
@@ -11,10 +11,10 @@ type GraphErrorProps = {
     onTryAgain: () => void;
 };
 
-const errorIconStyle = prepareNativeStyle(({ colors }) => ({
+const errorIconStyle = prepareNativeStyle(({ borders, colors }) => ({
     width: 48,
     height: 48,
-    borderRadius: 24,
+    borderRadius: borders.radii.round,
     backgroundColor: colors.backgroundAlertYellowSubtleOnElevation1,
     borderColor: colors.backgroundAlertYellowSubtleOnElevation0,
     borderWidth: 3,
@@ -31,7 +31,7 @@ const ErrorIcon = () => {
 
     return (
         <Animated.View style={applyStyle(errorIconStyle)} entering={FadeInUp} exiting={FadeInDown}>
-            <Icon name="warningTriangle" color="iconAlertYellow" />
+            <Icon name="warning" color="iconAlertYellow" />
         </Animated.View>
     );
 };
diff --git a/suite-native/graph/src/components/PriceChangeIndicator.tsx b/suite-native/graph/src/components/PriceChangeIndicator.tsx
index 1a9fd380a4f..0622aa5f53a 100644
--- a/suite-native/graph/src/components/PriceChangeIndicator.tsx
+++ b/suite-native/graph/src/components/PriceChangeIndicator.tsx
@@ -1,7 +1,7 @@
 import { Atom, useAtom } from 'jotai';
 
 import { HStack, Text } from '@suite-native/atoms';
-import { Icon, IconName } from '@suite-common/icons-deprecated';
+import { Icon, IconName } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
 type PriceChangeIndicatorProps = {
@@ -20,7 +20,7 @@ type PercentageChangeProps = {
     hasPriceIncreasedAtom: HasPriceIncreasedAtom;
 };
 
-const PRICE_CHANGE_ICON_SIZE = 6;
+const PRICE_CHANGE_ICON_SIZE = 12;
 
 const PercentageChange = ({
     percentageChangeAtom,
@@ -43,7 +43,7 @@ const PercentageChangeArrow = ({
 }) => {
     const [hasPriceIncreased] = useAtom(hasPriceIncreasedAtom);
 
-    const iconName: IconName = hasPriceIncreased ? 'arrowUp' : 'arrowDown';
+    const iconName: IconName = hasPriceIncreased ? 'caretUpFilled' : 'caretDownFilled';
 
     return (
         <Icon
@@ -75,10 +75,7 @@ export const PriceChangeIndicator = ({
     const [hasPriceIncreased] = useAtom(hasPriceIncreasedAtom);
 
     return (
-        <HStack
-            spacing={PRICE_CHANGE_ICON_SIZE}
-            style={applyStyle(priceIncreaseWrapperStyle, { hasPriceIncreased })}
-        >
+        <HStack spacing="sp4" style={applyStyle(priceIncreaseWrapperStyle, { hasPriceIncreased })}>
             <PercentageChangeArrow hasPriceIncreasedAtom={hasPriceIncreasedAtom} />
             <PercentageChange
                 hasPriceIncreasedAtom={hasPriceIncreasedAtom}
diff --git a/suite-native/graph/src/components/TransactionEventTooltip.tsx b/suite-native/graph/src/components/TransactionEventTooltip.tsx
index 94d6b1351d4..0691dd89f94 100644
--- a/suite-native/graph/src/components/TransactionEventTooltip.tsx
+++ b/suite-native/graph/src/components/TransactionEventTooltip.tsx
@@ -7,7 +7,7 @@ import { G, N } from '@mobily/ts-belt';
 import { Card, Box, Text } from '@suite-native/atoms';
 import {
     CryptoAmountFormatter,
-    EthereumTokenAmountFormatter,
+    TokenAmountFormatter,
     SignValueFormatter,
 } from '@suite-native/formatters';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
@@ -16,8 +16,11 @@ import { EventTooltipComponentProps } from '@suite-native/react-native-graph/src
 import { SignValue } from '@suite-common/suite-types';
 import { NetworkSymbol, getNetworkType } from '@suite-common/wallet-config';
 import { AccountKey, TokenAddress } from '@suite-common/wallet-types';
-import { AccountsRootState } from '@suite-common/wallet-core';
-import { selectAccountTokenInfo, selectAccountTokenSymbol } from '@suite-native/tokens';
+import {
+    selectAccountTokenInfo,
+    selectAccountTokenSymbol,
+    TokensRootState,
+} from '@suite-native/tokens';
 
 export type TransactionEventTooltipProps =
     EventTooltipComponentProps<GroupedBalanceMovementEventPayload>;
@@ -67,10 +70,10 @@ const TokenAmountTooltipFormatter = ({
     networkSymbol: NetworkSymbol;
     value: number;
 }) => {
-    const tokenInfo = useSelector((state: AccountsRootState) =>
+    const tokenInfo = useSelector((state: TokensRootState) =>
         selectAccountTokenInfo(state, accountKey, tokenAddress),
     );
-    const tokenSymbol = useSelector((state: AccountsRootState) =>
+    const tokenSymbol = useSelector((state: TokensRootState) =>
         selectAccountTokenSymbol(state, accountKey, tokenAddress),
     );
     const tokenDecimals = tokenInfo?.decimals;
@@ -82,7 +85,7 @@ const TokenAmountTooltipFormatter = ({
     // We might want to add support for other networks in the future.
     if (getNetworkType(networkSymbol) === 'ethereum') {
         return (
-            <EthereumTokenAmountFormatter
+            <TokenAmountFormatter
                 color="textDefault"
                 variant="label"
                 value={value}
diff --git a/suite-native/graph/src/slice.ts b/suite-native/graph/src/slice.ts
index a70fa8a39a8..daab3940206 100644
--- a/suite-native/graph/src/slice.ts
+++ b/suite-native/graph/src/slice.ts
@@ -63,10 +63,10 @@ export const graphSlice = createSlice({
         builder
             .addCase(deviceActions.forgetDevice, (state, action) => {
                 const deviceState = action.payload.device.state;
-                if (deviceState) {
+                if (deviceState?.staticSessionId) {
                     state.accountToGraphTimeframeMap = filterKeysByPartialMatch(
                         state.accountToGraphTimeframeMap,
-                        [deviceState],
+                        [deviceState.staticSessionId],
                     );
                 }
             })
diff --git a/suite-native/graph/tsconfig.json b/suite-native/graph/tsconfig.json
index b23a96a5ac2..b2a19b6b574 100644
--- a/suite-native/graph/tsconfig.json
+++ b/suite-native/graph/tsconfig.json
@@ -6,9 +6,6 @@
             "path": "../../suite-common/formatters"
         },
         { "path": "../../suite-common/graph" },
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/redux-utils"
         },
@@ -33,6 +30,7 @@
         { "path": "../analytics" },
         { "path": "../atoms" },
         { "path": "../formatters" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../react-native-graph" },
         { "path": "../storage" },
diff --git a/suite-native/helpers/package.json b/suite-native/helpers/package.json
index a4ba9fb9d6e..60067c3e9b6 100644
--- a/suite-native/helpers/package.json
+++ b/suite-native/helpers/package.json
@@ -6,14 +6,12 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.native.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
         "@mobily/ts-belt": "^3.13.1",
-        "@suite-native/config": "workspace:*",
         "@suite-native/toasts": "workspace:*",
         "expo-clipboard": "6.0.3",
         "react": "18.2.0"
diff --git a/suite-native/helpers/src/index.ts b/suite-native/helpers/src/index.ts
index 7d4bf2bace8..9c64082013e 100644
--- a/suite-native/helpers/src/index.ts
+++ b/suite-native/helpers/src/index.ts
@@ -1,3 +1,2 @@
 export * from './hooks/useCopyToClipboard';
 export * from './splitAddressToChunks';
-export * from './constants';
diff --git a/suite-native/helpers/tsconfig.json b/suite-native/helpers/tsconfig.json
index 79134d20504..e9ed4902f02 100644
--- a/suite-native/helpers/tsconfig.json
+++ b/suite-native/helpers/tsconfig.json
@@ -1,8 +1,5 @@
 {
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
-    "references": [
-        { "path": "../config" },
-        { "path": "../toasts" }
-    ]
+    "references": [{ "path": "../toasts" }]
 }
diff --git a/suite-native/icons/package.json b/suite-native/icons/package.json
new file mode 100644
index 00000000000..5e648c8fbcd
--- /dev/null
+++ b/suite-native/icons/package.json
@@ -0,0 +1,27 @@
+{
+    "name": "@suite-native/icons",
+    "version": "1.0.0",
+    "private": true,
+    "license": "See LICENSE.md in repo root",
+    "sideEffects": false,
+    "main": "src/index",
+    "scripts": {
+        "depcheck": "yarn g:depcheck",
+        "type-check": "yarn g:tsc --build",
+        "generate-icons": "yarn workspace @suite-common/icons generate-icons"
+    },
+    "dependencies": {
+        "@shopify/react-native-skia": "1.3.11",
+        "@suite-common/icons": "workspace:*",
+        "@suite-common/wallet-config": "workspace:*",
+        "@suite-common/wallet-utils": "workspace:*",
+        "@trezor/asset-utils": "workspace:*",
+        "@trezor/connect": "workspace:*",
+        "@trezor/styles": "workspace:*",
+        "@trezor/theme": "workspace:*",
+        "expo-image": "1.12.15",
+        "react": "18.2.0",
+        "react-native": "0.75.2",
+        "react-native-reanimated": "3.16.1"
+    }
+}
diff --git a/suite-native/icons/src/CryptoIcon.tsx b/suite-native/icons/src/CryptoIcon.tsx
new file mode 100644
index 00000000000..4923bb2d8ca
--- /dev/null
+++ b/suite-native/icons/src/CryptoIcon.tsx
@@ -0,0 +1,62 @@
+import { useMemo } from 'react';
+
+import { Image } from 'expo-image';
+
+import { cryptoIcons, genericTokenIcon, CryptoIconName } from '@suite-common/icons';
+import { getCoingeckoId, NetworkSymbol } from '@suite-common/wallet-config';
+import { getContractAddressForNetwork } from '@suite-common/wallet-utils';
+import { getAssetLogoUrl } from '@trezor/asset-utils';
+import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+
+export interface CryptoIconProps {
+    symbol: NetworkSymbol;
+    contractAddress?: string;
+    size?: CryptoIconSize | number;
+}
+
+export const cryptoIconSizes = {
+    extraSmall: 16,
+    small: 24,
+    large: 42,
+} as const;
+
+const iconStyle = prepareNativeStyle<{ width: number; height: number }>(
+    (utils, { width, height }) => ({
+        borderRadius: utils.borders.radii.round,
+        overflow: 'hidden',
+        width,
+        height,
+    }),
+);
+
+export type CryptoIconSize = keyof typeof cryptoIconSizes;
+
+export const CryptoIcon = ({ symbol, contractAddress, size = 'small' }: CryptoIconProps) => {
+    const { applyStyle } = useNativeStyles();
+    const sizeNumber = typeof size === 'number' ? size : cryptoIconSizes[size];
+
+    const sourceUrl = useMemo(() => {
+        const coingeckoId = getCoingeckoId(symbol);
+        let url = cryptoIcons[symbol.toLowerCase() as CryptoIconName];
+        if (coingeckoId && contractAddress) {
+            const formattedAddress = getContractAddressForNetwork(symbol, contractAddress);
+            url = getAssetLogoUrl({
+                coingeckoId,
+                contractAddress: formattedAddress,
+                quality: '@2x',
+            });
+        }
+
+        return url;
+    }, [contractAddress, symbol]);
+
+    return (
+        <Image
+            source={sourceUrl}
+            recyclingKey={symbol + contractAddress}
+            style={applyStyle(iconStyle, { width: sizeNumber, height: sizeNumber })}
+            placeholder={genericTokenIcon}
+            cachePolicy="memory-disk"
+        />
+    );
+};
diff --git a/suite-common/icons-deprecated/src/components/CryptoIconWithPercentage.tsx b/suite-native/icons/src/CryptoIconWithPercentage.tsx
similarity index 98%
rename from suite-common/icons-deprecated/src/components/CryptoIconWithPercentage.tsx
rename to suite-native/icons/src/CryptoIconWithPercentage.tsx
index c506c99c684..3ed89ac0ae1 100644
--- a/suite-common/icons-deprecated/src/components/CryptoIconWithPercentage.tsx
+++ b/suite-native/icons/src/CryptoIconWithPercentage.tsx
@@ -14,8 +14,8 @@ import {
 } from '@shopify/react-native-skia';
 
 import { useNativeStyles } from '@trezor/styles';
+import { CryptoIconName, cryptoIcons } from '@suite-common/icons';
 
-import { CryptoIconName, cryptoIcons } from '../icons';
 import { PizzaIcon, usePizzaAnimation } from './PizzaIcon';
 
 const CANVAS_SIZE = 48;
diff --git a/suite-native/icons/src/DeviceModelIcon.tsx b/suite-native/icons/src/DeviceModelIcon.tsx
new file mode 100644
index 00000000000..047ffa7f59d
--- /dev/null
+++ b/suite-native/icons/src/DeviceModelIcon.tsx
@@ -0,0 +1,23 @@
+import { DeviceModelInternal } from '@trezor/connect';
+
+import { IconName, IconSize, Icon } from './Icon';
+
+type DeviceModelIconProps = {
+    deviceModel: DeviceModelInternal;
+    size?: IconSize | number;
+};
+
+const icons = {
+    T1B1: 'trezorModelOne',
+    T2T1: 'trezorModelT',
+    T2B1: 'trezorSafe3',
+    T3B1: 'trezorSafe3',
+    T3T1: 'trezorSafe5',
+    T3W1: 'trezorSafe5', // TODO T3W1
+} as const satisfies Record<DeviceModelInternal, IconName>;
+
+export const deviceModelToIconName = (deviceModel: DeviceModelInternal) => icons[deviceModel];
+
+export const DeviceModelIcon = ({ deviceModel, size }: DeviceModelIconProps) => (
+    <Icon name={deviceModelToIconName(deviceModel)} size={size} />
+);
diff --git a/suite-native/icons/src/Icon.tsx b/suite-native/icons/src/Icon.tsx
new file mode 100644
index 00000000000..1c99cd20f1b
--- /dev/null
+++ b/suite-native/icons/src/Icon.tsx
@@ -0,0 +1,140 @@
+import { useMemo } from 'react';
+import { Platform, Text as RNText, TextProps } from 'react-native';
+import Animated, { SharedValue, useAnimatedStyle } from 'react-native-reanimated';
+
+// @ts-expect-error This is not public RN API but it will make Text noticeable faster https://twitter.com/FernandoTheRojo/status/1707769877493121420
+import { NativeText } from 'react-native/Libraries/Text/TextNativeComponent';
+
+import codepoints from '@suite-common/icons/iconFontsMobile/TrezorSuiteIcons.json';
+import { useNativeStyles } from '@trezor/styles';
+import { Color, Colors, CSSColor } from '@trezor/theme';
+import { MOBILE_ICON_FONT_NAME } from '@suite-common/icons';
+
+export type IconColor = Color | CSSColor;
+export type AnimatedIconColor = Color | CSSColor | SharedValue<CSSColor>;
+
+export const icons = codepoints;
+
+/**
+ * @description If you need to add a new icon, please follow these steps:
+ * 1. Add the icon name to the file `generateIconFonts.ts`.
+ * 2. Run `yarn generate-icons` to generate the new icon font.
+ */
+export type IconName = keyof typeof codepoints;
+
+export const iconSizes = {
+    extraSmall: 8,
+    small: 12,
+    medium: 16,
+    mediumLarge: 20,
+    large: 24,
+    extraLarge: 32,
+} as const;
+
+export type IconSize = keyof typeof iconSizes;
+
+export const getIconSize = (size: IconSize | number) =>
+    typeof size === 'string' ? iconSizes[size] : size;
+
+// NativeText improves the performance of the text rendering, but unfortunately it does not support iOS Accessibility font enlarging.
+// Since iOS devices have enough computational power and the text optimization is not crucial, the NativeText is used only for Android.
+const DefaultTextComponent: typeof RNText = Platform.select({
+    android: NativeText,
+    ios: RNText,
+});
+
+export type IconProps = {
+    name: IconName;
+    size?: IconSize | number;
+    color?: IconColor;
+} & Omit<TextProps, 'children'>;
+
+export const Icon = ({ name, size = 'large', color = 'iconDefault', ...props }: IconProps) => {
+    const char = String.fromCodePoint(codepoints[name]);
+    const sizeNumber = getIconSize(size);
+    const {
+        utils: { colors },
+    } = useNativeStyles();
+
+    const style = useMemo(() => {
+        const colorCode = color in colors ? colors[color as Color] : color;
+
+        return {
+            fontFamily: MOBILE_ICON_FONT_NAME,
+            fontSize: sizeNumber,
+            lineHeight: sizeNumber,
+            color: colorCode,
+        };
+    }, [sizeNumber, color, colors]);
+
+    return (
+        <DefaultTextComponent style={style} {...props}>
+            {char}
+        </DefaultTextComponent>
+    );
+};
+
+function isCSSColor(value: any): value is CSSColor {
+    'worklet';
+
+    return (
+        typeof value === 'string' &&
+        (value.startsWith('#') ||
+            value.startsWith('rgb(') ||
+            value.startsWith('rgba(') ||
+            value === 'transparent' ||
+            value === 'currentColor')
+    );
+}
+
+const getColorCode = (color: AnimatedIconColor, themeColors: Colors) => {
+    'worklet';
+    if (isCSSColor(color)) {
+        return color;
+    }
+    if (typeof color === 'string') {
+        return themeColors[color];
+    }
+
+    return color.value;
+};
+
+type AnimatedIconProps = Omit<IconProps, 'color'> & {
+    color?: AnimatedIconColor;
+};
+
+// We have two versions of the Icon component, one that is animated and one that should be super fast without animations.
+const AnimatedIcon = ({
+    name,
+    size = 'large',
+    color = 'iconDefault',
+    ...props
+}: AnimatedIconProps) => {
+    const char = String.fromCodePoint(codepoints[name]);
+    const {
+        utils: { colors },
+    } = useNativeStyles();
+
+    const sizeNumber = getIconSize(size);
+
+    const baseStyle = useMemo(
+        () => ({
+            fontFamily: MOBILE_ICON_FONT_NAME,
+            fontSize: sizeNumber,
+            lineHeight: sizeNumber,
+        }),
+        [sizeNumber],
+    );
+
+    const style = useAnimatedStyle(() => ({
+        color: getColorCode(color, colors),
+    }));
+
+    return (
+        <Animated.Text style={[baseStyle, style]} {...props}>
+            {char}
+        </Animated.Text>
+    );
+};
+
+Icon.Animated = AnimatedIcon;
diff --git a/suite-common/icons-deprecated/src/components/PizzaIcon.tsx b/suite-native/icons/src/PizzaIcon.tsx
similarity index 98%
rename from suite-common/icons-deprecated/src/components/PizzaIcon.tsx
rename to suite-native/icons/src/PizzaIcon.tsx
index b2d14713121..27c5856af2c 100644
--- a/suite-common/icons-deprecated/src/components/PizzaIcon.tsx
+++ b/suite-native/icons/src/PizzaIcon.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable global-require */
 import { Easing, SharedValue, useDerivedValue, withTiming } from 'react-native-reanimated';
 import { useState } from 'react';
 
diff --git a/suite-native/icons/src/index.ts b/suite-native/icons/src/index.ts
new file mode 100644
index 00000000000..1cdd7bc90d7
--- /dev/null
+++ b/suite-native/icons/src/index.ts
@@ -0,0 +1,5 @@
+export * from './Icon';
+export * from './CryptoIcon';
+export * from './CryptoIconWithPercentage';
+export * from './DeviceModelIcon';
+export * from './PizzaIcon';
diff --git a/suite-common/icons-deprecated/src/components/pizza1.png b/suite-native/icons/src/pizza1.png
similarity index 100%
rename from suite-common/icons-deprecated/src/components/pizza1.png
rename to suite-native/icons/src/pizza1.png
diff --git a/suite-common/icons-deprecated/src/components/pizza2.png b/suite-native/icons/src/pizza2.png
similarity index 100%
rename from suite-common/icons-deprecated/src/components/pizza2.png
rename to suite-native/icons/src/pizza2.png
diff --git a/suite-common/icons-deprecated/src/components/pizza3.png b/suite-native/icons/src/pizza3.png
similarity index 100%
rename from suite-common/icons-deprecated/src/components/pizza3.png
rename to suite-native/icons/src/pizza3.png
diff --git a/suite-native/icons/tsconfig.json b/suite-native/icons/tsconfig.json
new file mode 100644
index 00000000000..13919f0c782
--- /dev/null
+++ b/suite-native/icons/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "extends": "../../tsconfig.base.json",
+    "compilerOptions": { "outDir": "libDev" },
+    "references": [
+        { "path": "../../suite-common/icons" },
+        {
+            "path": "../../suite-common/wallet-config"
+        },
+        {
+            "path": "../../suite-common/wallet-utils"
+        },
+        { "path": "../../packages/asset-utils" },
+        { "path": "../../packages/connect" },
+        { "path": "../../packages/styles" },
+        { "path": "../../packages/theme" }
+    ]
+}
diff --git a/suite-native/intl/package.json b/suite-native/intl/package.json
index 65f9b06440f..62433872f2c 100644
--- a/suite-native/intl/package.json
+++ b/suite-native/intl/package.json
@@ -8,7 +8,6 @@
     ],
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-native/intl/src/en.ts b/suite-native/intl/src/en.ts
index 505001b46fe..b9b30b95f93 100644
--- a/suite-native/intl/src/en.ts
+++ b/suite-native/intl/src/en.ts
@@ -8,14 +8,17 @@ export const en = {
         header: '<green>Trezor Suite</green> <grey>Lite</grey>',
         buttons: {
             back: 'Back',
+            cancel: 'Cancel',
             close: 'Close',
             confirm: 'Confirm',
             continue: 'Continue',
-            next: 'Next',
+            disable: 'Disable',
             dismiss: 'Dismiss',
             eject: 'Eject',
-            cancel: 'Cancel',
+            enable: 'Enable',
             gotIt: 'Got it',
+            next: 'Next',
+            tryAgain: 'Try again',
         },
         unknownError: 'Something went wrong',
         default: 'Default',
@@ -88,6 +91,7 @@ export const en = {
         numberOfTokens: '+{numberOfTokens, plural, one{1 Token} other{# Tokens}}',
         tokens: 'Tokens',
         staking: 'Staking',
+        stakingDisabled: 'Staking is not available in this context.',
     },
     assets: {
         dashboard: {
@@ -104,6 +108,12 @@ export const en = {
                 alreadySynced: 'Coin already synced',
             },
             subtitle: "Here's what you have in your account.",
+            tokens: 'Tokens:',
+            syncAnotherCoinButton: 'Sync another coin',
+        },
+        coinList: {
+            mainnets: 'Select a coin to sync',
+            testnets: 'Testnet coins (have no value – for testing purposes only)',
         },
         xpubScanScreen: {
             alert: {
@@ -221,12 +231,17 @@ export const en = {
         pinScreen: {
             title: 'Enter PIN\non your Trezor',
             form: {
-                title: 'Enter PIN',
+                title: {
+                    current: 'Enter current PIN',
+                    new: 'Enter new PIN',
+                    confirm: 'Confirm new PIN',
+                },
                 entered: 'Entered',
                 digits: 'digits',
                 keypadInfo: 'Follow the keypad layout on your Trezor',
-                enterPin: 'Unlock',
-                submitting: 'Verifying your PIN',
+                submitButton: 'Confirm',
+                submitting: 'Verifying PIN',
+                processing: 'Processing',
             },
             wrongPinAlert: {
                 title: 'Incorrect PIN',
@@ -274,6 +289,8 @@ export const en = {
         errors: {
             deviceNotConnected: 'Device not connected.',
             invalidCallback: 'Invalid callback URL',
+            invalidParams: 'Invalid parameters from calling app',
+            versionUnsupported: 'Unsupported version. Please update your Trezor Suite app.',
         },
         bottomSheets: {
             confirmOnDeviceMessage: 'Go to your device and verify the details of the operation.',
@@ -354,16 +371,65 @@ export const en = {
         },
         confirmOnDeviceSheetTitle: 'Confirm on Trezor',
     },
+    moduleDeviceSettings: {
+        title: 'Device settings',
+        firmware: {
+            title: 'Firmware',
+            version: 'Version',
+            type: 'Type',
+            typeUniversal: 'Universal',
+            typeBitcoinOnly: 'Bitcoin-only',
+            upToDate: 'You’re all up to date',
+            newVersionAvailable: 'New version available ({version})',
+        },
+        pinProtection: {
+            title: 'PIN protection',
+            content: 'PIN protects your device against physical attack.',
+            changeButton: 'Change',
+            actions: {
+                enable: {
+                    success: 'Device PIN has been enabled.',
+                    canceled: 'Enable PIN has been canceled on your Trezor.',
+                },
+                change: {
+                    success: 'Device PIN has been changed.',
+                    canceled: 'Change PIN has been canceled on your Trezor.',
+                },
+                disable: {
+                    success: 'Device PIN has been disabled.',
+                    canceled: 'Disable PIN has been canceled on your Trezor.',
+                },
+            },
+            errors: {
+                pinInvalid: 'The PIN you’ve entered as current is incorrect.',
+                pinMismatch: 'The PINs you’ve entered do not match.',
+            },
+        },
+        updateHowTo: {
+            title: 'How to update firmware',
+            subtitle: 'Follow these steps:',
+            lines: {
+                1: '1. Connect Trezor to Desktop Suite',
+                2: '2. Navigate to Settings menu',
+                3: '3. Install new firmware',
+            },
+            button: 'Learn more @ Trezor.io',
+        },
+    },
     moduleReceive: {
         screenTitle: '{coinSymbol} Receive address',
         accountNotFound: 'Account {accountKey} not found.',
         deviceCancelError: 'Address confirmation canceled.',
+        tokens: {
+            runOn: 'Run on {accountLabel}',
+            errorMessage: 'Token not found.',
+        },
         receiveAddressCard: {
             alert: {
                 success: 'Receive address has been confirmed on your Trezor.',
                 longCardanoAddress:
                     'Cardano (ADA) address exceeds Trezor device’s screen. Scroll here and on the device to view it and confirm.',
-                ethereumToken: 'Your receive address is your Ethereum address',
+                token: 'Your receive address is your {networkName} address',
             },
             unverifiedWarning: {
                 portfolioTracker: {
@@ -719,10 +785,19 @@ export const en = {
                 inputs: 'Inputs & Outputs',
             },
         },
+        tokens: {
+            toggleTokens: 'Include tokens',
+            title: 'Note, your {networkName} balance doesn’t include tokens.',
+        },
+    },
+    device: {
+        title: {
+            continueOnTrezor: 'Continue\non your Trezor',
+        },
     },
     deviceManager: {
         deviceButtons: {
-            deviceInfo: 'Device info',
+            deviceSettings: 'Device settings',
             addHiddenWallet: 'Open passphrase',
             devices: 'Change',
         },
@@ -756,16 +831,6 @@ export const en = {
         upToDateFw: 'The firmware is up to date.',
         outdatedFw: 'The firmware is outdated.',
         goToAccessories: 'Get swag for your device @ Trezor Shop',
-        updateHowTo: {
-            title: 'How to update firmware',
-            subtitle: 'Follow these steps:',
-            lines: {
-                1: '1. Connect Trezor to Desktop Suite',
-                2: '2. Navigate to Settings menu',
-                3: '3. Install new firmware',
-            },
-            button: 'Learn more @ Trezor.io',
-        },
     },
     qrCode: {
         addressCopied: 'Address copied',
@@ -864,7 +929,7 @@ export const en = {
         enablePassphrase: {
             title: 'Enable passphrase on your Trezor.',
             subtitle: 'Go to your device and confirm you’d like to enable passphrase.',
-            cancelledError: 'Passphrase enabling cancelled.',
+            cancelledError: 'Passphrase enabling canceled.',
         },
         passphraseFeatureUnlock: {
             title: 'Enter passphrase to continue',
@@ -875,11 +940,36 @@ export const en = {
             title: 'Send from',
         },
         outputs: {
+            correctNetworkMessage:
+                'Make sure that you’re sending to an address\non {networkName} network. <link>Learn more</link>',
+            tokenOfNetworkSheet: {
+                title: 'You’re about to Send {tokenSymbol} that runs on {networkName} network.',
+                body: {
+                    self: {
+                        subtitle: 'Sending to yourself?',
+                        text: 'Make sure your exchange or wallet supports this token on {networkName} network.',
+                    },
+                    outside: {
+                        subtitle: 'Sending to someone else?',
+                        text: 'Check with them if they’re alright with receiving this token on {networkName} network.',
+                    },
+                },
+                warning: 'Sending to a wrong network might result in loss of funds.',
+            },
             recipients: {
                 title: 'Amount & recipients',
                 addressLabel: 'Recipient address',
+                checksum: {
+                    label: 'We’ve adjusted the casing of your address to match checksum format. <link>Learn more</link>',
+                    alert: {
+                        title: 'This address needs to be converted to checksum format.',
+                        body: 'This will adjust the casing of your address to match checksum format and allow us to properly validate your address. <link>Learn more</link>',
+                        primaryButton: 'Convert',
+                    },
+                },
                 addressQrLabel: 'Scan recipient address',
                 amountLabel: 'Amount to be sent',
+                maxButton: 'Send max',
             },
         },
         fees: {
@@ -890,7 +980,7 @@ export const en = {
             },
             levels: {
                 low: 'Low',
-                medium: 'Medium',
+                normal: 'Normal',
                 high: 'High',
             },
             error: 'You don’t have enough balance to use this fee.',
@@ -942,10 +1032,12 @@ export const en = {
                 title: 'Review with Trezor',
                 addressLabel: 'Recipient address',
                 amountLabel: 'Amount',
-                total: {
+                summary: {
                     label: 'Total including fee',
-                    amount: 'Total amount',
+                    totalAmount: 'Total amount',
+                    amount: 'Amount',
                     fee: 'incl. Transaction fee',
+                    maxFee: 'Maximum fee',
                 },
                 successMessage: 'Everything is ready, you can send the transaction now.',
                 submitButton: 'Send transaction',
diff --git a/suite-native/link/package.json b/suite-native/link/package.json
index 9a7799fb666..4a7205c53d4 100644
--- a/suite-native/link/package.json
+++ b/suite-native/link/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-native/link/src/components/Link.tsx b/suite-native/link/src/components/Link.tsx
index 035797460ea..7bca1b03d24 100644
--- a/suite-native/link/src/components/Link.tsx
+++ b/suite-native/link/src/components/Link.tsx
@@ -9,7 +9,7 @@ import Animated, {
 import { RequireExactlyOne } from 'type-fest';
 
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { Color } from '@trezor/theme';
+import { Color, TypographyStyle } from '@trezor/theme';
 
 import { useOpenLink } from '../useOpenLink';
 
@@ -21,18 +21,22 @@ type LinkProps = RequireExactlyOne<
         isUnderlined?: boolean;
         textColor?: Color;
         textPressedColor?: Color;
+        textVariant?: TypographyStyle;
     },
     'href' | 'onPress'
 >;
 
-const textStyle = prepareNativeStyle<{ isUnderlined: boolean }>((_, { isUnderlined }) => ({
-    extend: {
-        condition: isUnderlined,
-        style: {
-            textDecorationLine: 'underline',
+const textStyle = prepareNativeStyle<{ isUnderlined: boolean; textVariant: TypographyStyle }>(
+    (utils, { isUnderlined, textVariant }) => ({
+        ...utils.typography[textVariant],
+        extend: {
+            condition: isUnderlined,
+            style: {
+                textDecorationLine: 'underline',
+            },
         },
-    },
-}));
+    }),
+);
 
 const ANIMATION_DURATION = 100;
 const IS_NOT_PRESSED_VALUE = 0;
@@ -44,6 +48,7 @@ export const Link = ({
     isUnderlined = false,
     textColor = 'textPrimaryDefault',
     textPressedColor = 'textPrimaryPressed',
+    textVariant = 'body',
     onPress,
 }: LinkProps) => {
     const { utils, applyStyle } = useNativeStyles();
@@ -80,7 +85,7 @@ export const Link = ({
             onPressIn={handlePressIn}
             onPress={handlePress}
             onPressOut={handlePressOut}
-            style={[applyStyle(textStyle, { isUnderlined }), animatedTextColorStyle]}
+            style={[applyStyle(textStyle, { isUnderlined, textVariant }), animatedTextColorStyle]}
             suppressHighlighting
         >
             {label}
diff --git a/suite-native/link/src/useOpenLink.ts b/suite-native/link/src/useOpenLink.ts
index 44e794bdd61..fd17f2f2a0b 100644
--- a/suite-native/link/src/useOpenLink.ts
+++ b/suite-native/link/src/useOpenLink.ts
@@ -9,7 +9,7 @@ export const useOpenLink = () => {
     const showErrorToast = useCallback(() => {
         showToast({
             variant: 'error',
-            icon: 'warningTriangle',
+            icon: 'warning',
             message: 'Unable to open the link',
         });
     }, [showToast]);
diff --git a/suite-native/message-system/package.json b/suite-native/message-system/package.json
index 72ac5b31ca1..97cc7bc45c1 100644
--- a/suite-native/message-system/package.json
+++ b/suite-native/message-system/package.json
@@ -6,14 +6,12 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
         "@mobily/ts-belt": "^3.13.1",
         "@reduxjs/toolkit": "1.9.5",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/message-system": "workspace:*",
         "@suite-common/redux-utils": "workspace:*",
         "@suite-common/suite-types": "workspace:*",
@@ -21,13 +19,14 @@
         "@suite-native/atoms": "workspace:*",
         "@suite-native/connection-status": "workspace:*",
         "@suite-native/discovery": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/link": "workspace:*",
         "@trezor/styles": "workspace:*",
         "@trezor/theme": "workspace:*",
         "react": "18.2.0",
         "react-native": "0.75.2",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-redux": "8.0.7"
     }
 }
diff --git a/suite-native/message-system/src/components/FeatureMessageScreen.tsx b/suite-native/message-system/src/components/FeatureMessageScreen.tsx
index 375105ce3b9..bcb0b23a7ef 100644
--- a/suite-native/message-system/src/components/FeatureMessageScreen.tsx
+++ b/suite-native/message-system/src/components/FeatureMessageScreen.tsx
@@ -2,7 +2,7 @@ import { useDispatch, useSelector } from 'react-redux';
 
 import { A, G } from '@mobily/ts-belt';
 
-import { IconName } from '@suite-common/icons-deprecated';
+import { IconName } from '@suite-native/icons';
 import { Box, Button, PictogramTitleHeader, PictogramVariant, VStack } from '@suite-native/atoms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { Variant } from '@suite-common/suite-types';
@@ -42,8 +42,8 @@ const variantMap = {
 
 const iconVariantMap = {
     info: 'info',
-    warning: 'warningTriangleLight',
-    critical: 'warningTriangleLight',
+    warning: 'warning',
+    critical: 'warning',
 } as const satisfies Record<Variant, IconName>;
 
 export const FeatureMessageScreen = () => {
diff --git a/suite-native/message-system/src/components/MessageBanner.tsx b/suite-native/message-system/src/components/MessageBanner.tsx
index f51fe9a889f..d0b01643b85 100644
--- a/suite-native/message-system/src/components/MessageBanner.tsx
+++ b/suite-native/message-system/src/components/MessageBanner.tsx
@@ -7,7 +7,7 @@ import { messageSystemActions } from '@suite-common/message-system';
 import { Color } from '@trezor/theme';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { HStack, Box, Text, RoundedIcon, VStack } from '@suite-native/atoms';
-import { IconName, Icon } from '@suite-common/icons-deprecated';
+import { IconName, Icon } from '@suite-native/icons';
 import { Link } from '@suite-native/link';
 
 type MessageBannerProps = {
@@ -32,13 +32,13 @@ const MessageBannerVariantToStyleMap = {
     },
     warning: {
         backgroundColor: 'backgroundAlertYellowSubtleOnElevation0',
-        icon: 'warningTriangle',
+        icon: 'warning',
         iconColor: 'iconAlertYellow',
         iconBackgroundColor: 'backgroundAlertYellowSubtleOnElevation1',
     },
     critical: {
         backgroundColor: 'backgroundAlertRedSubtleOnElevation0',
-        icon: 'warningOctagon',
+        icon: 'warning',
         iconColor: 'iconAlertRed',
         iconBackgroundColor: 'backgroundAlertRedSubtleOnElevation1',
     },
@@ -95,7 +95,7 @@ const MessageCloseButton = ({
 }) => (
     <TouchableOpacity onPress={onClose}>
         <RoundedIcon
-            name="close"
+            name="x"
             iconSize="medium"
             containerSize={44}
             backgroundColor={backgroundColor}
diff --git a/suite-native/message-system/tsconfig.json b/suite-native/message-system/tsconfig.json
index 4978dc3bdf1..3afee69f6d2 100644
--- a/suite-native/message-system/tsconfig.json
+++ b/suite-native/message-system/tsconfig.json
@@ -2,9 +2,6 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/message-system"
         },
@@ -20,6 +17,7 @@
         { "path": "../atoms" },
         { "path": "../connection-status" },
         { "path": "../discovery" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../link" },
         { "path": "../../packages/styles" },
diff --git a/suite-native/module-accounts-import/package.json b/suite-native/module-accounts-import/package.json
index 681fdec70af..62d2025718d 100644
--- a/suite-native/module-accounts-import/package.json
+++ b/suite-native/module-accounts-import/package.json
@@ -7,7 +7,6 @@
     "type": "module",
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -19,7 +18,6 @@
         "@reduxjs/toolkit": "1.9.5",
         "@shopify/flash-list": "1.7.1",
         "@shopify/react-native-skia": "1.3.11",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/redux-utils": "workspace:*",
         "@suite-common/suite-config": "workspace:*",
         "@suite-common/token-definitions": "workspace:*",
@@ -33,10 +31,11 @@
         "@suite-native/analytics": "workspace:*",
         "@suite-native/atoms": "workspace:*",
         "@suite-native/config": "workspace:*",
+        "@suite-native/discovery": "workspace:*",
         "@suite-native/feature-flags": "workspace:*",
         "@suite-native/formatters": "workspace:*",
         "@suite-native/forms": "workspace:*",
-        "@suite-native/helpers": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/navigation": "workspace:*",
         "@suite-native/qr-code": "workspace:*",
@@ -47,7 +46,7 @@
         "@trezor/utxo-lib": "workspace:*",
         "react": "18.2.0",
         "react-native": "0.75.2",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-redux": "8.0.7"
     }
 }
diff --git a/suite-native/module-accounts-import/src/accountsImportThunks.ts b/suite-native/module-accounts-import/src/accountsImportThunks.ts
index d5f924d3d6c..b1853793ce9 100644
--- a/suite-native/module-accounts-import/src/accountsImportThunks.ts
+++ b/suite-native/module-accounts-import/src/accountsImportThunks.ts
@@ -6,12 +6,18 @@ import {
     updateFiatRatesThunk,
 } from '@suite-common/wallet-core';
 import TrezorConnect, { AccountInfo } from '@trezor/connect';
-import { networks, NetworkSymbol, AccountType } from '@suite-common/wallet-config';
+import { networks, NetworkSymbol, AccountType, Bip43Path } from '@suite-common/wallet-config';
 import { getXpubOrDescriptorInfo } from '@trezor/utxo-lib';
 import { getAccountIdentity, shouldUseIdentities } from '@suite-common/wallet-utils';
 import { Timestamp, TokenAddress } from '@suite-common/wallet-types';
 import { FiatCurrencyCode } from '@suite-common/suite-config';
-import { selectFilterKnownTokens } from '@suite-common/token-definitions';
+import {
+    getSupportedDefinitionTypes,
+    getTokenDefinitionThunk,
+    periodicCheckTokenDefinitionsThunk,
+    selectFilterKnownTokens,
+    selectNetworkTokenDefinitions,
+} from '@suite-common/token-definitions';
 
 import { paymentTypeToAccountType } from './constants';
 
@@ -59,7 +65,7 @@ export const importAccountThunk = createThunk(
                     deviceState,
                     discoveryItem: {
                         index: deviceNetworkAccounts.length, // indexed from 0
-                        path: accountInfo?.path ?? '',
+                        path: (accountInfo?.path ?? '') as Bip43Path,
                         accountType,
                         networkType: networks[coin].networkType,
                         coin,
@@ -71,6 +77,7 @@ export const importAccountThunk = createThunk(
                 }),
             );
         }
+        dispatch(periodicCheckTokenDefinitionsThunk());
     },
 );
 
@@ -89,7 +96,9 @@ export const getAccountInfoThunk = createThunk<
                 TrezorConnect.getAccountInfo({
                     coin: networkSymbol,
                     identity: shouldUseIdentities(networkSymbol)
-                        ? getAccountIdentity({ deviceState: PORTFOLIO_TRACKER_DEVICE_STATE })
+                        ? getAccountIdentity({
+                              deviceState: PORTFOLIO_TRACKER_DEVICE_STATE,
+                          })
                         : undefined,
                     descriptor: xpubAddress,
                     details: 'txs',
@@ -110,6 +119,21 @@ export const getAccountInfoThunk = createThunk<
             ]);
 
             if (fetchedAccountInfo?.success) {
+                const tokenDefinitions = selectNetworkTokenDefinitions(getState(), networkSymbol);
+
+                // fetch token definitions for this network in case they are needed
+                if (!tokenDefinitions) {
+                    const definitionTypes = getSupportedDefinitionTypes(networkSymbol);
+
+                    definitionTypes.forEach(async type => {
+                        await dispatch(
+                            getTokenDefinitionThunk({
+                                networkSymbol,
+                                type,
+                            }),
+                        );
+                    });
+                }
                 // fetch fiat rates for all tokens of newly discovered account
                 // Even that there is check in updateFiatRatesThunk, it is better to do it here and do not dispatch thunk at all because it has some overhead and sometimes there could be lot of tokens
                 const knownTokens = selectFilterKnownTokens(
diff --git a/suite-native/module-accounts-import/src/assets/qrCodeImport.svg b/suite-native/module-accounts-import/src/assets/qrCodeImport.svg
new file mode 100644
index 00000000000..07bfa2697aa
--- /dev/null
+++ b/suite-native/module-accounts-import/src/assets/qrCodeImport.svg
@@ -0,0 +1,21 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 176 176">
+  <g fill="#000" opacity=".2">
+    <path d="M12.62 12.308a.9.9 0 0 0-.312.311c-.1.188-.105.698-.105 12.52s.006 12.331.105 12.52c.06.11.2.251.311.31.188.1.698.106 12.52.106s12.331-.006 12.52-.106a.9.9 0 0 0 .31-.31c.1-.189.106-.699.106-12.52s-.006-12.332-.106-12.52a.9.9 0 0 0-.31-.31c-.189-.1-.699-.106-12.52-.106s-12.33.006-12.519.105m21.612 3.737.147.141v17.905l-.147.141-.14.147H16.185l-.14-.147-.147-.14V16.185l.146-.14.141-.147H34.09z"/>
+    <path d="M20.012 19.7a.9.9 0 0 0-.31.311c-.1.188-.106.464-.106 5.128s.006 4.94.105 5.127c.059.112.2.252.31.311.189.1.465.106 5.129.106s4.94-.006 5.127-.106a.9.9 0 0 0 .31-.31c.1-.189.107-.464.107-5.128s-.006-4.94-.106-5.128a.9.9 0 0 0-.31-.31c-.19-.1-.464-.106-5.128-.106s-4.94.006-5.128.105m48.049-7.392c-.382.206-.417.352-.417 1.743 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.39-.036 1.537-.417 1.742-.188.1-.463.106-5.127.106s-4.94.006-5.128.105a.9.9 0 0 0-.31.311c-.1.182-.106.405-.106 3.28s-.006 3.097-.106 3.28c-.205.38-.352.416-1.742.416-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.39 0-1.537.035-1.743.416-.1.182-.105.405-.105 3.28s.006 3.097.105 3.28c.206.38.352.416 1.743.416 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537.035 1.742.416.1.182.106.405.106 3.28s.006 3.097.105 3.28c.206.38.352.416 1.743.416 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.39 0 1.537-.035 1.742-.417.1-.182.106-.405.106-3.28s.006-3.097.105-3.279a.9.9 0 0 1 .31-.31c.183-.1.406-.106 3.28-.106 2.876 0 3.098.006 3.28.105.38.206.417.352.417 1.743 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537-.035 1.742-.417.1-.188.106-.463.106-5.127s.006-4.94.105-5.128c.206-.38.352-.416 1.743-.416 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537-.035 1.742-.417.1-.182.106-.405.106-3.28s-.006-3.097-.106-3.279c-.205-.38-.352-.416-1.742-.416-1.866 0-1.848.017-1.848-1.848 0-1.39-.035-1.537-.417-1.743-.176-.094-.346-.105-1.431-.105-1.086 0-1.255.011-1.431.105m25.87 0c-.38.206-.415.352-.415 1.743 0 1.865.017 1.848-1.848 1.848-1.39 0-1.537.035-1.743.416-.1.188-.105.464-.105 5.128s.006 4.94.105 5.127c.206.381.352.417 1.743.417 1.865 0 1.848-.018 1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537.035 1.742.416.1.188.106.464.106 5.128s-.006 4.94-.106 5.127a.9.9 0 0 1-.31.311c-.183.1-.406.106-3.28.106-2.875 0-3.098.005-3.28.105-.381.206-.416.352-.416 1.743 0 1.39.035 1.537.416 1.742.188.1.58.106 8.824.106s8.635-.006 8.823-.106c.382-.205.417-.352.417-1.742s-.035-1.537-.417-1.743c-.182-.1-.405-.105-3.279-.105-2.875 0-3.098-.006-3.28-.106a.9.9 0 0 1-.31-.31c-.1-.189-.106-.464-.106-5.128s.006-4.94.105-5.128c.206-.38.352-.416 1.743-.416 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.39 0 1.537-.036 1.742-.417.1-.182.106-.405.106-3.28s-.006-3.097-.106-3.279c-.205-.38-.352-.416-1.742-.416s-1.537-.036-1.743-.417c-.099-.182-.105-.405-.105-3.28s.006-3.097.105-3.279c.206-.38.352-.416 1.743-.416 1.39 0 1.537.035 1.742.416.1.182.106.405.106 3.28s.006 3.097.105 3.28c.206.38.352.416 1.743.416 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537-.036 1.742-.417.1-.188.106-.463.106-5.127s.006-4.94.105-5.128a.9.9 0 0 1 .311-.31c.182-.1.405-.106 3.28-.106s3.097-.006 3.279-.106c.382-.205.417-.352.417-1.742s-.035-1.537-.417-1.743c-.188-.1-.698-.105-12.519-.105s-12.332.005-12.52.105m2.864 7.392c.382.206.417.352.417 1.743 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848.017-1.848-1.848 0-1.39.035-1.538.416-1.743.176-.094.346-.105 1.432-.105s1.255.011 1.43.105m26.705-7.392c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.086-.012-1.256-.106-1.432-.205-.38-.352-.416-1.742-.416-1.086 0-1.256.011-1.432.105m14.784 0a.9.9 0 0 0-.311.311c-.099.188-.105.698-.105 12.52s.006 12.331.105 12.52c.059.11.2.251.311.31.188.1.698.106 12.52.106s12.331-.006 12.519-.106a.9.9 0 0 0 .311-.31c.1-.189.106-.699.106-12.52s-.006-12.332-.106-12.52a.9.9 0 0 0-.311-.31c-.188-.1-.698-.106-12.519-.106s-12.332.006-12.52.105m21.613 3.737.147.141v17.905l-.147.141-.141.147h-17.905l-.141-.147-.146-.14V16.185l.146-.14.141-.147h17.905z"/>
+    <path d="M145.675 19.7a.9.9 0 0 0-.311.31c-.099.188-.105.464-.105 5.128s.006 4.94.105 5.127c.059.112.2.252.311.311.188.1.464.106 5.128.106s4.939-.006 5.127-.106a.9.9 0 0 0 .311-.31c.1-.189.106-.464.106-5.128s-.006-4.94-.106-5.128a.9.9 0 0 0-.311-.31c-.188-.1-.463-.106-5.127-.106s-4.94.006-5.128.105m-99.792-3.697c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.086-.012-1.256-.106-1.432-.205-.38-.352-.416-1.742-.416-1.086 0-1.256.012-1.432.105m73.92 0c-.381.206-.416.352-.416 1.743 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.39.035 1.537.416 1.742.188.1.464.106 5.128.106s4.939-.006 5.127-.106c.382-.205.417-.352.417-1.742 0-1.086-.012-1.256-.106-1.432-.205-.38-.352-.416-1.742-.416s-1.537-.035-1.743-.417c-.094-.176-.105-.346-.105-1.43 0-1.087-.012-1.257-.106-1.433-.205-.38-.352-.416-1.742-.416-1.086 0-1.256.012-1.432.105"/>
+    <path d="M130.892 16.003a.9.9 0 0 0-.311.311c-.099.188-.105.464-.105 5.128s-.006 4.94-.106 5.127a.9.9 0 0 1-.311.311c-.188.1-.581.106-8.823.106s-8.636.006-8.824.105c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537.035 1.742.416.1.182.106.405.106 3.28s-.006 3.097-.106 3.28c-.205.38-.352.416-1.742.416s-1.537.035-1.743.416c-.099.182-.105.405-.105 3.28s.006 3.097.105 3.28c.206.38.352.416 1.743.416 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537-.035 1.742-.417.1-.182.106-.404.106-3.28 0-2.874.006-3.097.105-3.279.206-.38.352-.416 1.743-.416 1.865 0 1.848-.018 1.848 1.848 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097-.006 3.279-.106c.382-.205.417-.352.417-1.742 0-1.866.017-1.848-1.848-1.848-1.391 0-1.537-.035-1.743-.417-.099-.182-.105-.404-.105-3.28 0-2.874-.006-3.097-.106-3.279-.205-.38-.352-.416-1.742-.416-1.866 0-1.848-.018-1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.391 0-1.537-.035-1.743-.417-.099-.182-.105-.404-.105-3.28 0-2.874.006-3.097.105-3.279a.9.9 0 0 1 .311-.31c.188-.1.464-.106 5.128-.106s4.939.006 5.127.105c.112.06.252.2.311.311.1.182.106.405.106 3.28s.006 3.097.105 3.28c.206.38.352.416 1.743.416 1.39 0 1.537-.035 1.742-.417.1-.187.106-.64.106-10.67 0-10.033-.006-10.485-.106-10.673-.205-.38-.352-.416-1.742-.416-1.086 0-1.256.012-1.432.105M79.148 19.7a.9.9 0 0 0-.31.311c-.1.182-.106.405-.106 3.28s-.006 3.097-.106 3.28c-.205.38-.352.416-1.742.416s-1.537.035-1.743.416c-.1.182-.105.405-.105 3.28s.006 3.097.105 3.28c.206.38.352.416 1.743.416 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.011-1.432.105m-18.48 11.088c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.39-.036-1.537-.417-1.743-.176-.094-.346-.105-1.431-.105-1.086 0-1.256.011-1.432.105"/>
+    <path d="M105.019 30.789c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.39.035 1.537.416 1.742.176.094.346.106 1.432.106 1.39 0 1.537-.036 1.742-.417.1-.182.106-.405.106-3.28s-.006-3.097-.106-3.28a.9.9 0 0 0-.311-.31c-.182-.1-.405-.105-3.279-.105-2.875 0-3.098.006-3.28.105m-62.832 3.696c-.38.206-.415.352-.415 1.743 0 1.865-.018 1.848 1.848 1.848 1.864 0 1.848.017 1.848-1.848 0-1.086-.013-1.256-.107-1.432-.204-.381-.351-.416-1.741-.416-1.087 0-1.256.01-1.432.105m14.785 0c-.382.206-.416.352-.416 1.743 0 1.865.017 1.848-1.848 1.848-1.39 0-1.538.035-1.743.416-.1.182-.106.405-.106 3.28s.006 3.097.105 3.28c.206.38.352.416 1.744.416 1.864 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.864 0 1.847-.018 1.847 1.848 0 1.865.018 1.848-1.847 1.848-1.867 0-1.849-.018-1.849 1.848 0 1.39.035 1.537.416 1.742.189.1.465.106 5.129.106s4.94-.006 5.127-.106a.9.9 0 0 0 .31-.31c.1-.183.106-.406.106-3.28 0-2.875-.005-3.098-.106-3.28-.205-.381-.352-.416-1.742-.416-1.866 0-1.848.017-1.848-1.848 0-1.39-.036-1.538-.416-1.743-.176-.094-.346-.105-1.431-.105-1.867 0-1.849.017-1.849-1.848 0-1.866.018-1.848-1.847-1.848-1.087 0-1.257.01-1.433.105m7.392 0c-.382.206-.417.352-.417 1.743 0 1.865-.018 1.848 1.849 1.848 1.864 0 1.847.017 1.847-1.848 0-1.39-.034-1.537-.416-1.743-.177-.094-.347-.105-1.431-.105-1.087 0-1.257.01-1.433.105m7.391 0a.9.9 0 0 0-.31.31c-.1.183-.105.406-.105 3.28 0 2.876.005 3.098.105 3.28.206.38.352.417 1.743.417 1.39 0 1.537-.035 1.742-.417.1-.182.105-.405.105-3.28s-.005-3.097-.105-3.28c-.206-.38-.353-.415-1.743-.415-1.085 0-1.255.012-1.431.105m7.392 0a.9.9 0 0 0-.31.31c-.1.183-.106.406-.106 3.28 0 2.876.007 3.098.106 3.28.206.38.352.417 1.742.417s1.538-.035 1.743-.417c.1-.182.105-.405.105-3.28s-.006-3.097-.106-3.28c-.204-.38-.352-.415-1.742-.415-1.085 0-1.255.012-1.431.105m7.393 0a.9.9 0 0 0-.312.31c-.1.183-.104.406-.104 3.28 0 2.876.005 3.098.105 3.28.206.38.352.417 1.743.417 1.39 0 1.537-.035 1.742-.417.1-.182.106-.405.106-3.28s-.006-3.097-.106-3.28c-.206-.38-.352-.415-1.742-.415-1.087 0-1.255.012-1.431.105"/>
+    <path d="M101.323 34.484a.9.9 0 0 0-.311.31c-.099.183-.105.406-.105 3.28 0 2.876.006 3.098.105 3.28.059.11.2.253.311.31.182.1.405.107 3.28.107s3.097-.006 3.279-.106c.382-.205.417-.352.417-1.742 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.012-1.432.105m-55.44 3.696c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.086-.012-1.256-.106-1.432-.205-.381-.352-.416-1.742-.416-1.086 0-1.256.01-1.432.105m-22.176 3.696a.9.9 0 0 0-.31.31c-.1.183-.106.406-.106 3.28 0 2.876.006 3.098.105 3.28.206.38.352.417 1.743.417 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.39-.035-1.537-.417-1.743-.182-.1-.405-.105-3.28-.105s-3.097.006-3.279.105m11.088 0c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.39.035 1.537.416 1.742.188.1.464.106 5.128.106s4.94-.006 5.127-.106c.382-.205.417-.352.417-1.742 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537.035 1.742.416.1.188.106.464.106 5.128s-.006 4.94-.106 5.127c-.205.38-.352.417-1.742.417-1.866 0-1.848-.018-1.848 1.848 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097-.006 3.28-.106c.38-.205.416-.352.416-1.742 0-1.866-.018-1.848 1.848-1.848 1.39 0 1.537-.036 1.742-.417.1-.182.106-.405.106-3.28s-.006-3.097-.106-3.28c-.205-.38-.352-.415-1.742-.415-1.866 0-1.848.017-1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.39 0-1.537-.036-1.743-.417-.1-.182-.105-.405-.105-3.28s-.006-3.097-.106-3.28a.9.9 0 0 0-.31-.31c-.189-.1-.464-.105-5.128-.105s-4.94-.006-5.128-.106c-.38-.205-.416-.352-.416-1.742s-.035-1.538-.417-1.743c-.182-.1-.405-.105-3.28-.105s-3.097.005-3.279.105m40.656 0a.9.9 0 0 0-.31.31c-.1.183-.106.406-.106 3.28 0 2.876.006 3.098.105 3.28.206.38.352.417 1.743.417 1.39 0 1.537-.036 1.742-.417.1-.182.106-.405.106-3.28s-.006-3.097-.106-3.28c-.205-.38-.352-.415-1.742-.415-1.086 0-1.256.01-1.432.105m7.392 0c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.39-.035-1.537-.417-1.743-.176-.093-.346-.105-1.43-.105-1.087 0-1.257.01-1.433.105m66.528 0c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097-.006 3.279-.106c.382-.205.417-.352.417-1.742 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.39-.035-1.538-.417-1.743-.182-.1-.405-.105-3.279-.105-2.875 0-3.098.005-3.28.105m-40.656 3.696c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.39-.035-1.537-.417-1.743-.176-.093-.346-.105-1.431-.105-1.086 0-1.256.012-1.432.105m22.176 0a.9.9 0 0 0-.311.31c-.099.183-.105.406-.105 3.28 0 2.876.006 3.098.105 3.28.059.11.2.252.311.31.182.1.405.107 3.28.107s3.097-.006 3.279-.106c.382-.205.417-.352.417-1.742 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.39-.035-1.537-.417-1.743-.188-.1-.581-.105-8.823-.105s-8.636.005-8.824.105m-118.27 3.696a.9.9 0 0 0-.313.31c-.1.183-.105.406-.105 3.28 0 2.876.006 3.098.105 3.28.06.11.2.252.311.31.182.1.405.107 3.28.107s3.097-.006 3.28-.106c.38-.205.416-.352.416-1.742 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.255.01-1.43.105m14.782 0a.9.9 0 0 0-.31.31c-.1.189-.106.465-.106 5.129s.006 4.94.105 5.127c.206.38.352.417 1.743.417 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.012-1.432.105m121.968 0c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.086-.012-1.256-.106-1.432-.205-.381-.352-.416-1.742-.416-1.086 0-1.256.01-1.432.105m11.088 0c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.39-.035-1.537-.417-1.743-.176-.094-.346-.105-1.431-.105-1.086 0-1.256.01-1.432.105M58.49 50.98v73.92h29.44c22.821 0 29.456-.017 29.509-.07s.07-8.348.07-36.96V50.98zm30.45 14.086c.792.082 1.72.24 1.994.34.082.03.264.083.411.124.147.035.305.088.352.117.053.023.176.065.282.088.105.018.187.064.187.094s.065.053.147.053.147.023.147.058c0 .03.047.059.105.059.06 0 .16.04.223.088a.43.43 0 0 0 .217.088c.053 0 .1.023.1.053s.047.064.106.082c.052.017.258.129.451.246.194.112.411.235.487.276.07.035.13.088.13.117 0 .024.04.047.087.047s.088.024.088.053c0 .03.047.07.106.088q.12.055.223.14c.06.054.246.206.405.335.37.3.962.892 1.378 1.379.176.21.34.387.37.399.023.012.041.053.041.088 0 .04.06.14.135.223.07.082.158.2.194.258.035.065.111.21.176.323.058.11.123.217.14.234.088.083.235.358.235.44 0 .047.03.088.06.088.034 0 .057.024.057.059 0 .03.065.194.141.364s.188.44.24.604c.053.158.124.346.147.41.041.112.07.206.235.822.205.757.287 1.83.287 3.972l.006 1.807h4.518v24.405l-.147.035c-.082.018-.147.059-.147.088 0 .03-.029.053-.07.053-.035 0-.211.07-.393.153-.587.275-1.314.616-1.86.88-.293.14-.563.258-.598.258-.041 0-.071.023-.071.058 0 .03-.035.059-.07.059-.041 0-.258.088-.487.199-.827.405-1.437.681-1.496.681a.06.06 0 0 0-.041.017.06.06 0 0 0-.018.042c0 .029-.04.058-.082.058-.047 0-.21.065-.363.147s-.31.147-.352.147c-.047 0-.083.023-.083.058 0 .03-.035.059-.07.059-.04 0-.258.088-.487.199-.827.405-1.437.681-1.496.681a.06.06 0 0 0-.041.017.06.06 0 0 0-.018.042c0 .029-.04.058-.082.058-.047 0-.21.065-.364.147-.152.082-.31.147-.352.147-.046 0-.082.023-.082.058 0 .03-.023.059-.058.059-.053 0-.48.194-1.684.769-.27.123-.704.334-.968.457q-.598.276-1.19.563l-.998.47c-.159.07-.54.258-.845.404l-.557.27-.429-.205c-.234-.111-.45-.205-.487-.205-.029 0-.058-.03-.058-.059 0-.035-.035-.059-.07-.059-.042 0-.259-.088-.488-.199-.927-.446-1.437-.681-1.496-.681a.06.06 0 0 1-.058-.058c0-.036-.04-.059-.082-.059-.047 0-.212-.065-.364-.147-.153-.082-.31-.146-.352-.146-.047 0-.082-.03-.082-.059 0-.035-.035-.059-.07-.059-.042 0-.259-.088-.488-.199-.223-.112-.698-.335-1.056-.505-.352-.17-.78-.369-.938-.446-.165-.076-.329-.14-.37-.14-.035 0-.07-.03-.07-.059 0-.035-.053-.059-.118-.059-.064 0-.117-.029-.117-.058 0-.036-.03-.059-.065-.059s-.28-.1-.545-.223c-.258-.123-.563-.264-.663-.311-.106-.047-.194-.1-.194-.123 0-.029-.04-.047-.093-.047a.6.6 0 0 1-.247-.082c-.516-.27-1.032-.505-1.103-.505-.047 0-.082-.029-.082-.058a.06.06 0 0 0-.059-.059c-.035 0-.334-.135-.668-.293-.335-.165-.634-.294-.675-.294-.035 0-.065-.029-.065-.058 0-.036-.04-.059-.094-.059a.7.7 0 0 1-.246-.088 34 34 0 0 0-.862-.417q-.591-.275-1.18-.557c-.258-.123-.504-.229-.54-.229-.04 0-.07-.029-.07-.058 0-.036-.035-.059-.082-.059-.04 0-.2-.065-.352-.147a1.6 1.6 0 0 0-.334-.146c-.235 0-.229.422-.229-12.314v-12.15h4.57l.03-2.16c.011-1.184.04-2.287.058-2.446.065-.493.217-1.285.276-1.39a.7.7 0 0 0 .053-.246c0-.083.023-.16.053-.176.03-.018.07-.13.093-.247.018-.117.06-.258.088-.31l.106-.241c.03-.083.13-.294.211-.476.082-.181.153-.357.153-.393 0-.04.017-.07.047-.07.023 0 .094-.117.158-.264.065-.147.13-.264.153-.264s.058-.065.076-.147c.023-.082.064-.146.094-.146.035 0 .058-.041.058-.088s.024-.088.053-.088c.03 0 .07-.047.088-.106q.056-.12.141-.223.12-.137.223-.287c.27-.423 1.18-1.326 1.96-1.96.081-.07.175-.147.216-.182.041-.03.094-.058.13-.058a.1.1 0 0 0 .076-.047c.023-.065.674-.481.745-.481.03 0 .064-.018.076-.047.018-.036 1.162-.616 1.426-.716.37-.14.663-.235.745-.235.053 0 .105-.017.117-.047.024-.046.786-.246.962-.246a.3.3 0 0 0 .176-.053c.03-.03.211-.07.405-.088.194-.023.563-.058.821-.088a9.6 9.6 0 0 1 1.966 0"/>
+    <path d="M86.857 70.87c-.017.03-.105.058-.194.058-.158.006-.745.188-.815.258-.018.018-.088.035-.147.035-.06 0-.105.024-.105.047 0 .024-.13.094-.294.16-.158.063-.293.128-.293.145 0 .018-.082.083-.188.141-.252.153-.352.235-.815.692-.223.212-.405.417-.405.446 0 .036-.018.07-.041.082-.111.047-.54.834-.716 1.31-.164.44-.2.914-.223 2.827l-.023 2.012H93.28v-2.165c0-1.197-.023-2.182-.053-2.2-.023-.018-.064-.135-.076-.258-.035-.235-.44-1.138-.528-1.173-.023-.012-.047-.053-.047-.094 0-.059-.188-.305-.61-.798-.147-.17-.986-.798-1.18-.886a1.3 1.3 0 0 1-.205-.112c-.17-.105-.592-.287-.78-.322a1 1 0 0 1-.246-.088c-.118-.088-.552-.135-1.596-.159-.698-.01-1.074.001-1.103.042m-8.184 13.962v14.55l.557.263c.31.147.587.264.616.264.036 0 .059.024.059.06 0 .028.035.058.076.058s.258.094.487.205c.223.112.44.205.48.205.037 0 .07.024.07.059 0 .029.03.059.066.059.059 0 .71.281.945.416.058.03.146.053.193.053s.088.018.088.047c0 .047.429.246.528.246.036 0 .059.024.059.059 0 .029.035.059.076.059.035 0 .206.064.364.146.164.077.329.147.37.147.035 0 .07.024.07.059 0 .029.053.058.117.058.065 0 .118.024.118.059 0 .029.029.059.07.059.035 0 .21.07.393.152.775.364 1.59.751 1.977.939.229.111.446.199.48.199.042 0 .07.024.07.059 0 .029.037.059.078.059.035 0 .205.07.364.152.317.165.792.223.833.094.017-.035.058-.07.094-.07.04 0 .205-.065.363-.147.165-.076.329-.147.37-.147.035 0 .07-.029.07-.058 0-.035.03-.059.07-.059.036 0 .23-.076.423-.17.763-.358.898-.417.962-.417.04 0 .07-.023.07-.046 0-.024.136-.094.294-.159.164-.064.293-.135.293-.158 0-.024.036-.047.077-.047.04 0 .217-.065.38-.147.17-.082.33-.147.365-.147.03 0 .058-.029.058-.058 0-.035.03-.059.07-.059.036 0 .23-.076.423-.17.763-.358.898-.417.962-.417.04 0 .07-.023.07-.047 0-.023.136-.093.294-.158.164-.064.293-.135.293-.158 0-.024.036-.047.077-.047.04 0 .217-.065.38-.147.17-.082.33-.147.365-.147.03 0 .058-.029.058-.058 0-.035.036-.059.07-.059.065 0 .6-.24 1.12-.504a.8.8 0 0 1 .254-.083c.046 0 .082-.023.082-.047 0-.023.135-.093.293-.158l.293-.11V84.831zm41.131-31.868a.9.9 0 0 0-.311.311c-.099.182-.105.405-.105 3.28s.006 3.097.105 3.28c.206.38.352.416 1.743.416 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848-.018 1.848 1.848 0 1.39-.035 1.537-.417 1.742-.176.094-.346.106-1.431.106-1.866 0-1.848-.018-1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.391 0-1.537.035-1.743.416-.099.188-.105.464-.105 5.128s.006 4.94.105 5.127c.059.112.2.252.311.311.182.1.405.106 3.28.106s3.097-.006 3.279-.106a.9.9 0 0 0 .311-.31c.1-.189.106-.523.106-6.976s.006-6.788.105-6.976c.206-.38.352-.416 1.743-.416 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097-.006 3.279-.106c.382-.205.417-.352.417-1.742 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537.035 1.742.416.1.182.106.405.106 3.28s.006 3.097.105 3.28c.206.38.352.416 1.743.416 1.865 0 1.848-.018 1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848.017-1.848-1.848 0-1.39-.035-1.537-.417-1.743-.188-.1-.522-.105-6.975-.105-6.454 0-6.788.006-6.976.105-.381.206-.416.352-.416 1.743 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097.006 3.279.105c.382.206.417.352.417 1.743 0 1.39-.035 1.537-.417 1.742-.188.1-.522.106-6.975.106-6.454 0-6.788.006-6.976.105-.381.206-.416.352-.416 1.743 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097.006 3.279.105c.112.06.252.2.311.311.1.182.106.405.106 3.28s-.006 3.097-.106 3.28c-.205.38-.352.416-1.742.416-1.866 0-1.848-.018-1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097.006 3.279.105c.382.206.417.352.417 1.743 0 1.865.017 1.848-1.848 1.848-1.391 0-1.537.035-1.743.416-.099.182-.105.405-.105 3.28s.006 3.097.105 3.279c.206.382.352.417 1.743.417 1.865 0 1.848.017 1.848-1.848 0-1.391.035-1.537.416-1.743.182-.099.405-.105 3.28-.105s3.097.006 3.279.105c.382.206.417.352.417 1.743 0 1.39.035 1.537.416 1.742.188.1.522.106 6.976.106s6.787.006 6.975.105c.382.206.417.352.417 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.391-.035-1.537-.417-1.743-.188-.099-.581-.105-8.823-.105s-8.636-.006-8.824-.106c-.381-.205-.416-.352-.416-1.742s-.035-1.537-.417-1.743c-.182-.099-.405-.105-3.279-.105-2.875 0-3.098-.006-3.28-.106a.9.9 0 0 1-.311-.311c-.099-.182-.105-.405-.105-3.279 0-2.875.006-3.098.105-3.28.206-.381.352-.416 1.743-.416 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.391 0-1.537-.035-1.743-.417-.099-.182-.105-.405-.105-3.28s.006-3.097.105-3.279c.206-.38.352-.416 1.743-.416 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.39-.035-1.537-.417-1.743-.182-.1-.405-.105-3.279-.105-2.875 0-3.098-.006-3.28-.106-.381-.205-.416-.352-.416-1.742s.035-1.537.416-1.743c.182-.1.405-.105 3.28-.105s3.097-.006 3.279-.106c.382-.205.417-.352.417-1.742 0-1.866.017-1.848-1.848-1.848-1.391 0-1.537-.036-1.743-.417-.099-.182-.105-.405-.105-3.28s-.006-3.097-.106-3.279c-.205-.38-.352-.416-1.742-.416s-1.537-.035-1.743-.417c-.099-.182-.105-.405-.105-3.28s-.006-3.097-.106-3.279c-.205-.38-.352-.416-1.742-.416-1.866 0-1.848.017-1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097-.006 3.279-.106c.382-.205.417-.352.417-1.742 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537-.035 1.742-.417.1-.188.106-.463.106-5.127s-.006-4.94-.106-5.128c-.205-.38-.352-.416-1.742-.416-1.866 0-1.848-.018-1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848.017-1.848-1.848 0-1.39-.035-1.537-.417-1.743-.182-.1-.405-.105-3.279-.105-2.875 0-3.098-.006-3.28-.106-.381-.205-.416-.352-.416-1.742 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848-.018-1.848 1.848 0 1.39-.035 1.537-.417 1.742-.188.1-.463.106-5.127.106s-4.94.005-5.128.105c-.381.206-.416.352-.416 1.743 0 1.865.017 1.848-1.848 1.848-1.391 0-1.537-.035-1.743-.417-.099-.182-.105-.405-.105-3.28s-.006-3.097-.106-3.279a.9.9 0 0 0-.311-.31c-.188-.1-.463-.106-5.127-.106s-4.94.005-5.128.105m25.039 33.264c.382.206.417.352.417 1.743 0 1.865.017 1.848-1.848 1.848-1.391 0-1.537-.035-1.743-.417-.094-.176-.105-.346-.105-1.43 0-1.087.011-1.257.105-1.433.206-.38.352-.416 1.743-.416 1.085 0 1.255.011 1.431.105M20.012 56.66c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.011-1.432.105m14.784 0c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.086-.012-1.256-.106-1.432-.205-.38-.352-.416-1.742-.416-1.086 0-1.256.011-1.432.105"/>
+    <path d="M12.62 60.357a.9.9 0 0 0-.312.311c-.1.182-.105.405-.105 3.28s.006 3.097.105 3.28c.06.11.2.251.311.31.182.1.405.106 3.28.106s3.097.006 3.28.105c.11.059.251.2.31.311.1.182.106.405.106 3.28s-.006 3.097-.106 3.28c-.205.38-.352.416-1.742.416-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.39 0-1.537.035-1.743.416-.1.182-.105.405-.105 3.28s.006 3.097.105 3.28c.206.38.352.416 1.743.416 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.39.035-1.537.416-1.743.188-.1.522-.105 6.976-.105s6.787-.006 6.975-.106c.381-.205.417-.352.417-1.742s-.035-1.537-.417-1.743c-.188-.1-.463-.105-5.127-.105s-4.94-.006-5.128-.106c-.38-.205-.416-.352-.416-1.742s.035-1.537.416-1.743c.188-.1.464-.105 5.128-.105s4.94-.006 5.127-.106c.381-.205.417-.352.417-1.742s-.035-1.537-.417-1.743c-.182-.1-.405-.105-3.28-.105s-3.097-.006-3.279-.106a.9.9 0 0 1-.31-.31c-.1-.183-.106-.406-.106-3.28 0-2.875-.006-3.098-.106-3.28-.205-.381-.352-.416-1.742-.416-1.866 0-1.848-.018-1.848 1.848 0 1.39-.035 1.537-.417 1.742-.182.1-.405.106-3.28.106s-3.097-.006-3.279-.106c-.38-.205-.416-.352-.416-1.742 0-1.866.017-1.848-1.848-1.848-1.086 0-1.255.012-1.43.105m18.48 0c-.382.206-.417.352-.417 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.086-.012-1.256-.106-1.432-.205-.381-.352-.416-1.742-.416-1.086 0-1.255.012-1.43.105m7.391 0c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.085.011 1.255.105 1.431.206.382.352.417 1.743.417 1.39 0 1.537-.035 1.742-.417.1-.182.106-.404.106-3.28 0-2.874-.006-3.097-.106-3.279a.9.9 0 0 0-.31-.31c-.183-.1-.406-.106-3.28-.106-2.875 0-3.098.006-3.28.105m-3.696 3.696c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.39-.036-1.537-.417-1.743-.176-.094-.346-.105-1.43-.105-1.087 0-1.257.011-1.433.105"/>
+    <path d="M34.795 71.445c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.39-.036-1.537-.417-1.743-.176-.094-.346-.105-1.43-.105-1.087 0-1.257.01-1.433.105m7.392 0a.9.9 0 0 0-.31.31c-.1.189-.106.465-.106 5.129s.006 4.94.105 5.127c.206.382.352.417 1.743.417 1.39 0 1.537-.035 1.742-.417.1-.188.106-.463.106-5.127s-.006-4.94-.106-5.128c-.205-.381-.352-.416-1.742-.416-1.086 0-1.256.01-1.432.105m11.088 0c-.38.206-.416.352-.416 1.743 0 1.865.017 1.848-1.848 1.848-1.39 0-1.537.035-1.743.416-.1.182-.105.405-.105 3.28s.006 3.097.105 3.28c.206.38.352.416 1.743.416 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.39 0 1.537-.035 1.742-.417.1-.182.106-.405.106-3.28s-.006-3.097-.106-3.28c-.205-.38-.352-.415-1.742-.415-1.086 0-1.256.01-1.432.105M160.46 75.14c-.381.206-.416.352-.416 1.743 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537-.036 1.742-.417.1-.188.106-.58.106-8.823s-.006-8.636-.106-8.824c-.205-.381-.352-.416-1.742-.416-1.086 0-1.256.01-1.432.105M34.795 78.837c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.39-.036-1.537-.417-1.743-.176-.093-.346-.105-1.43-.105-1.087 0-1.257.012-1.433.105M12.62 82.533c-.382.206-.417.352-.417 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.255.01-1.43.105m14.783 0c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537.035 1.742.416.1.182.106.405.106 3.28s-.006 3.097-.106 3.28a.9.9 0 0 1-.31.31c-.183.1-.406.106-3.28.106-2.875 0-3.098.006-3.28.105-.38.206-.416.352-.416 1.743 0 1.39.035 1.537.416 1.742.188.1.581.106 8.824.106s8.635-.006 8.823-.106a.9.9 0 0 0 .311-.31c.1-.183.106-.406.106-3.28 0-2.875-.006-3.098-.106-3.28-.205-.381-.352-.416-1.742-.416-1.866 0-1.848-.018-1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848.017-1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.39-.035-1.537-.417-1.743-.182-.1-.405-.105-3.28-.105s-3.097.006-3.279.105"/>
+    <path d="M38.491 82.533c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.39-.035-1.537-.417-1.743-.176-.093-.346-.105-1.43-.105-1.087 0-1.257.01-1.433.105m7.392 0c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.39-.035-1.537-.417-1.743-.176-.093-.346-.105-1.43-.105-1.087 0-1.257.01-1.433.105m-25.872 3.696c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.012-1.432.105m33.264 0c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.086-.012-1.256-.106-1.432-.205-.381-.352-.416-1.742-.416-1.086 0-1.256.012-1.432.105M12.62 89.925a.9.9 0 0 0-.312.31c-.1.183-.105.406-.105 3.28 0 2.876.006 3.098.105 3.28.06.11.2.252.311.31.182.1.405.107 3.28.107s3.097-.006 3.28-.106c.38-.205.416-.352.416-1.742 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.255.01-1.43.105m33.263 0a.9.9 0 0 0-.31.31c-.1.183-.106.406-.106 3.28 0 2.876.006 3.098.105 3.28.206.38.352.417 1.743.417 1.39 0 1.537.035 1.742.416.1.182.106.405.106 3.28s.006 3.097.105 3.279c.206.382.352.417 1.743.417 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537-.035 1.742-.417.1-.182.106-.405.106-3.279 0-2.875-.006-3.098-.106-3.28-.205-.381-.352-.416-1.742-.416-1.866 0-1.848.017-1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.39-.035-1.537-.417-1.743-.182-.1-.405-.105-3.28-.105s-3.097-.006-3.279-.106c-.38-.205-.416-.352-.416-1.742 0-1.085-.012-1.256-.106-1.432-.205-.381-.352-.416-1.742-.416-1.086 0-1.256.01-1.432.105m-3.696 7.392c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.086-.012-1.256-.106-1.432-.205-.381-.352-.416-1.742-.416-1.086 0-1.256.01-1.432.105m77.616 0c-.381.206-.416.352-.416 1.743 0 1.085.011 1.255.105 1.431.206.382.352.417 1.743.417 1.865 0 1.848.017 1.848-1.848 0-1.39-.035-1.537-.417-1.743-.176-.094-.346-.105-1.431-.105-1.086 0-1.256.01-1.432.105m25.872 0c-.381.206-.416.352-.416 1.743 0 1.39-.035 1.537-.417 1.742-.182.1-.405.106-3.279.106-2.875 0-3.098.006-3.28.105-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.391.035-1.537.416-1.743.182-.099.405-.105 3.28-.105s3.097-.006 3.279-.106c.382-.205.417-.352.417-1.742 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.01-1.432.105M12.62 101.013a.9.9 0 0 0-.312.311c-.1.182-.105.405-.105 3.28s.006 3.097.105 3.279c.206.381.352.417 1.743.417 1.865 0 1.848-.018 1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.39 0-1.537.035-1.743.416-.1.188-.105.64-.105 10.672s.006 10.483.105 10.671c.06.112.2.252.311.311.182.1.405.106 3.28.106s3.097-.006 3.28-.106c.38-.205.416-.352.416-1.742 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097-.006 3.28-.106c.38-.205.416-.352.416-1.742 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.391.035-1.537.416-1.743.182-.099.405-.105 3.28-.105s3.097-.006 3.28-.106a.9.9 0 0 0 .31-.311c.1-.188.106-.463.106-5.127s.006-4.94.105-5.128c.206-.381.352-.416 1.743-.416 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.391.035-1.537.416-1.743.182-.099.405-.105 3.28-.105s3.097-.006 3.28-.106c.38-.205.416-.352.416-1.742s-.035-1.537-.417-1.743c-.188-.099-.463-.105-5.127-.105s-4.94.006-5.128.105c-.38.206-.416.352-.416 1.743 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.39 0-1.537.035-1.743.416-.1.182-.105.405-.105 3.28s-.006 3.097-.106 3.279c-.205.381-.352.417-1.742.417s-1.537-.036-1.743-.417c-.1-.182-.105-.405-.105-3.279 0-2.875-.006-3.098-.106-3.28-.205-.381-.352-.416-1.742-.416s-1.537.035-1.743.416c-.1.182-.105.405-.105 3.28s-.006 3.097-.106 3.279a.9.9 0 0 1-.31.311c-.183.1-.406.106-3.28.106-2.875 0-3.098-.006-3.28-.106-.38-.205-.416-.352-.416-1.742 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.39 0 1.537-.036 1.742-.417.1-.182.106-.405.106-3.279 0-2.875-.006-3.098-.106-3.28a.9.9 0 0 0-.31-.311c-.183-.099-.406-.105-3.28-.105-2.875 0-3.098-.006-3.28-.106-.38-.205-.416-.352-.416-1.742 0-1.866.017-1.848-1.848-1.848-1.086 0-1.255.011-1.43.105m25.038 18.48c.381.206.417.352.417 1.743 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848.017-1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.085 0 1.255.011 1.431.105"/>
+    <path d="M31.1 101.011c-.383.206-.418.352-.418 1.743 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097-.006 3.28-.106c.38-.205.416-.352.416-1.742s-.036-1.537-.417-1.743c-.182-.099-.405-.105-3.28-.105s-3.096.006-3.278.105m125.662 0c-.381.206-.416.352-.416 1.743 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097.005 3.279.105c.382.206.417.352.417 1.743 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537-.036 1.742-.417.1-.182.106-.405.106-3.279 0-2.875-.006-3.098-.106-3.28-.205-.381-.352-.416-1.742-.416-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.011-1.432.105m-129.36 3.696c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.391-.035-1.537-.417-1.743-.176-.093-.346-.105-1.43-.105-1.087 0-1.257.012-1.433.105m92.4 3.696c-.381.206-.416.352-.416 1.743 0 1.085.011 1.255.105 1.431.206.381.352.417 1.743.417 1.865 0 1.848.017 1.848-1.848 0-1.391-.035-1.537-.417-1.743-.176-.094-.346-.105-1.431-.105-1.086 0-1.256.011-1.432.105m-66.528 3.696c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.391-.035-1.537-.417-1.743-.176-.094-.346-.105-1.43-.105-1.087 0-1.257.011-1.433.105m77.616 3.696a.9.9 0 0 0-.311.311c-.099.188-.105.464-.105 5.128s.006 4.94.105 5.127c.206.382.352.417 1.743.417 1.39 0 1.537-.035 1.742-.417.1-.182.106-.405.106-3.279 0-2.875.006-3.098.105-3.28.206-.381.352-.416 1.743-.416 1.865 0 1.848.017 1.848-1.848 0-1.391-.035-1.537-.417-1.743-.182-.099-.405-.105-3.279-.105-2.875 0-3.098.006-3.28.105m-11.088 3.696c-.381.206-.416.352-.416 1.743 0 1.39.035 1.537.416 1.742.176.094.346.106 1.432.106 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.011-1.432.105"/>
+    <path d="M138.284 119.492a.9.9 0 0 0-.311.311c-.099.188-.105.464-.105 5.128s-.006 4.939-.106 5.127a.9.9 0 0 1-.311.311c-.182.1-.405.106-3.279.106-2.875 0-3.098.006-3.28.105a.9.9 0 0 0-.311.311c-.099.188-.105.522-.105 6.976s-.006 6.787-.106 6.975c-.205.382-.352.417-1.742.417-1.866 0-1.848-.018-1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.39-.035 1.537-.417 1.742-.188.1-.463.106-5.127.106s-4.94.006-5.128.105a.9.9 0 0 0-.311.311c-.099.188-.105.464-.105 5.128s.006 4.94.105 5.127c.206.382.352.417 1.743.417 1.39 0 1.537-.035 1.742-.417.1-.182.106-.405.106-3.279 0-2.875.006-3.098.105-3.28a.9.9 0 0 1 .311-.311c.182-.099.405-.105 3.28-.105s3.097.006 3.279.105c.382.206.417.352.417 1.743 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097-.006 3.279-.106a.9.9 0 0 0 .311-.311c.1-.182.106-.405.106-3.279 0-2.875.006-3.098.105-3.28.206-.381.352-.416 1.743-.416 1.39 0 1.537-.035 1.742-.417.1-.182.106-.405.106-3.279 0-2.875.006-3.098.105-3.28.206-.381.352-.416 1.743-.416 1.865 0 1.848-.018 1.848 1.848 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097-.006 3.279-.106c.382-.205.417-.352.417-1.742s.035-1.537.416-1.743c.188-.099.464-.105 5.128-.105s4.939.006 5.127.105c.382.206.417.352.417 1.743 0 1.39-.035 1.537-.417 1.742-.182.1-.405.106-3.279.106-2.875 0-3.098.006-3.28.105-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.391 0-1.537-.035-1.743-.417-.099-.182-.105-.405-.105-3.279 0-2.875-.006-3.098-.106-3.28a.9.9 0 0 0-.311-.311c-.182-.099-.405-.105-3.279-.105-2.875 0-3.098-.006-3.28-.106-.381-.205-.416-.352-.416-1.742s.035-1.537.416-1.743c.188-.099.522-.105 6.976-.105s6.788-.006 6.975-.106a.9.9 0 0 0 .311-.311c.1-.188.106-.581.106-8.823s-.006-8.636-.106-8.824c-.205-.381-.352-.416-1.742-.416-1.866 0-1.848-.018-1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.39-.035 1.537-.417 1.742-.182.1-.405.106-3.279.106-2.875 0-3.098-.006-3.28-.106a.9.9 0 0 1-.311-.311c-.099-.182-.105-.405-.105-3.279 0-2.875-.006-3.098-.106-3.28a.9.9 0 0 0-.311-.311c-.182-.099-.405-.105-3.279-.105-2.875 0-3.098-.006-3.28-.106-.381-.205-.416-.352-.416-1.742s.035-1.537.416-1.743c.182-.099.405-.105 3.28-.105s3.097.006 3.279.105c.382.206.417.352.417 1.743 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537-.035 1.742-.417.1-.182.106-.405.106-3.279 0-2.875-.006-3.098-.106-3.28a.9.9 0 0 0-.311-.311c-.188-.099-.522-.105-6.975-.105-6.454 0-6.788.006-6.976.105m6.559 14.784c.112.059.252.2.311.311.1.188.106.464.106 5.128s-.006 4.939-.106 5.127a.9.9 0 0 1-.311.311c-.188.1-.463.106-5.127.106s-4.94-.006-5.128-.106a.9.9 0 0 1-.311-.311c-.099-.188-.105-.463-.105-5.127s.006-4.94.105-5.128a.9.9 0 0 1 .311-.311c.188-.099.464-.105 5.128-.105s4.939.006 5.127.105"/>
+    <path d="M138.283 137.973c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.011-1.432.105m-92.4-14.784c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.086-.012-1.256-.106-1.432-.205-.381-.352-.416-1.742-.416-1.086 0-1.256.012-1.432.105"/>
+    <path d="M53.276 123.189c-.382.206-.417.352-.417 1.743 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848-.018-1.848 1.848 0 1.39-.034 1.537-.416 1.742-.182.1-.405.106-3.28.106s-3.097.006-3.28.105a.9.9 0 0 0-.31.311c-.1.188-.105.464-.105 5.128s.006 4.94.105 5.127c.206.382.351.417 1.742.417 1.39 0 1.538-.035 1.742-.417.1-.182.107-.405.107-3.279 0-2.875.005-3.098.104-3.28.206-.381.352-.416 1.743-.416 1.39 0 1.538.035 1.742.416.1.182.106.405.106 3.28s.007 3.097.106 3.279c.206.382.352.417 1.742.417s1.537-.035 1.742-.417c.1-.187.106-.463.106-5.127s.006-4.94.105-5.128c.206-.381.352-.416 1.744-.416 1.864 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.536.035 1.741.416.1.182.106.405.106 3.28s-.005 3.097-.105 3.279c-.206.382-.352.417-1.742.417s-1.538.035-1.744.416c-.1.182-.104.405-.104 3.28s.006 3.097.105 3.279c.206.382.352.417 1.742.417 1.866 0 1.849.017 1.849-1.848 0-1.391.034-1.537.415-1.743.188-.099.465-.105 5.129-.105s4.94.006 5.126.105c.383.206.418.352.418 1.743 0 1.865-.019 1.848 1.847 1.848s1.849.017 1.849-1.848c0-1.391.034-1.537.415-1.743.189-.099.465-.105 5.129-.105s4.94-.006 5.127-.106c.382-.205.417-.352.417-1.742 0-1.866.017-1.848-1.849-1.848s-1.848.017-1.848-1.848c0-1.391-.036-1.537-.417-1.743-.181-.099-.404-.105-3.28-.105-2.874 0-3.097.006-3.279.105-.38.206-.415.352-.415 1.743 0 1.39-.035 1.537-.418 1.742-.187.1-.462.106-5.126.106s-4.94-.006-5.129-.106a.9.9 0 0 1-.31-.311c-.1-.182-.105-.405-.105-3.279 0-2.875.005-3.098.104-3.28.206-.381.352-.416 1.743-.416 1.39 0 1.537-.035 1.742-.417.1-.182.106-.405.106-3.279 0-2.875-.005-3.098-.106-3.28-.205-.381-.352-.416-1.742-.416-1.866 0-1.848-.018-1.848 1.848 0 1.865.017 1.848-1.848 1.848s-1.847.017-1.847-1.848c0-1.086-.013-1.256-.107-1.432-.205-.381-.352-.416-1.742-.416-1.865 0-1.847.017-1.847-1.848 0-1.391-.035-1.537-.417-1.743-.177-.093-.347-.105-1.431-.105-1.087 0-1.256.012-1.432.105"/>
+    <path d="M71.755 126.884a.9.9 0 0 0-.31.311c-.1.188-.106.464-.106 5.128s.006 4.939.105 5.127c.206.381.352.417 1.743.417 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.39 0 1.537-.036 1.742-.417.1-.182.106-.405.106-3.279 0-2.875-.006-3.098-.106-3.28a.9.9 0 0 0-.31-.311c-.183-.099-.406-.105-3.28-.105-2.875 0-3.098.006-3.28.105m11.088 0a.9.9 0 0 0-.31.311c-.1.182-.106.405-.106 3.28s.006 3.097.105 3.279c.06.112.2.252.311.311.188.1.464.106 5.128.106s4.94-.006 5.127-.106c.382-.205.417-.352.417-1.742 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.391-.035-1.537-.417-1.743-.182-.099-.405-.105-3.28-.105s-3.097.006-3.279.105c-.38.206-.416.352-.416 1.743 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848.017-1.848-1.848 0-1.086-.012-1.256-.106-1.432-.205-.381-.352-.416-1.742-.416-1.086 0-1.256.011-1.432.105m25.872 0c-.381.206-.416.352-.416 1.743 0 1.865.017 1.848-1.848 1.848-1.391 0-1.537.035-1.743.416-.099.188-.105.464-.105 5.128s.006 4.939.105 5.127c.059.112.2.252.311.311.182.1.405.106 3.28.106s3.097-.006 3.279-.106a.9.9 0 0 0 .311-.311c.1-.182.106-.405.106-3.279 0-2.875.006-3.098.105-3.28.206-.381.352-.416 1.743-.416 1.865 0 1.848-.018 1.848 1.848 0 1.39.035 1.537.416 1.742.188.1.464.106 5.128.106s4.939-.006 5.127-.106c.382-.205.417-.352.417-1.742s-.035-1.537-.417-1.743c-.182-.099-.405-.105-3.279-.105-2.875 0-3.098-.006-3.28-.106-.381-.205-.416-.352-.416-1.742s-.035-1.537-.417-1.743c-.182-.099-.405-.105-3.279-.105-2.875 0-3.098-.006-3.28-.106-.381-.205-.416-.352-.416-1.742 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.011-1.432.105m44.352 0c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.012-1.432.105M34.795 130.58c-.38.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.391-.036-1.537-.417-1.743-.176-.094-.346-.105-1.43-.105-1.087 0-1.257.011-1.433.105m62.832 0a.9.9 0 0 0-.31.311c-.1.182-.106.405-.106 3.28s.006 3.097.105 3.279c.206.381.352.417 1.743.417 1.39 0 1.537-.036 1.742-.417.1-.182.106-.405.106-3.279 0-2.875-.006-3.098-.106-3.28-.205-.381-.352-.416-1.742-.416-1.086 0-1.256.011-1.432.105m-85.007 7.392a.9.9 0 0 0-.312.311c-.1.188-.105.698-.105 12.52s.006 12.332.105 12.519c.06.112.2.253.311.311.188.1.698.106 12.52.106s12.331-.006 12.52-.106a.9.9 0 0 0 .31-.311c.1-.187.106-.698.106-12.519s-.006-12.332-.106-12.52a.9.9 0 0 0-.31-.311c-.189-.099-.699-.105-12.52-.105s-12.33.006-12.519.105m21.612 3.737.147.141v17.905l-.147.141-.14.147H16.185l-.14-.147-.147-.141V141.85l.146-.141.141-.146H34.09z"/>
+    <path d="M20.012 145.364a.9.9 0 0 0-.31.311c-.1.188-.106.464-.106 5.128s.006 4.939.105 5.127c.059.112.2.252.31.311.189.1.465.106 5.129.106s4.94-.006 5.127-.106a.9.9 0 0 0 .31-.311c.1-.188.107-.463.107-5.127s-.006-4.94-.106-5.128a.9.9 0 0 0-.31-.311c-.19-.099-.464-.105-5.128-.105s-4.94.006-5.128.105m66.529-7.392c-.382.206-.417.352-.417 1.743 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097-.006 3.28-.106c.38-.205.416-.352.416-1.742s-.035-1.537-.417-1.743c-.182-.099-.405-.105-3.28-.105s-3.096.006-3.278.105m25.871 3.696c-.381.206-.416.352-.416 1.743 0 1.39-.035 1.537-.417 1.742-.182.1-.405.106-3.279.106-2.875 0-3.098.006-3.28.105-.381.206-.416.352-.416 1.743 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848.017-1.848-1.848 0-1.391-.035-1.537-.417-1.743-.188-.099-.463-.105-5.127-.105s-4.94.006-5.128.105c-.381.206-.416.352-.416 1.743 0 1.39-.035 1.537-.417 1.742-.182.1-.405.106-3.28.106s-3.097.006-3.28.105c-.38.206-.415.352-.415 1.743 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097.006 3.28.105c.38.206.416.352.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537-.036 1.742-.417.1-.182.106-.405.106-3.279 0-2.875.006-3.098.105-3.28.206-.381.352-.416 1.743-.416 1.865 0 1.848-.018 1.848 1.848 0 1.39.035 1.537.416 1.742.188.1.522.106 6.976.106s6.787-.006 6.975-.106c.382-.205.417-.352.417-1.742 0-1.866-.018-1.848 1.848-1.848 1.39 0 1.537-.036 1.742-.417.1-.182.106-.405.106-3.279 0-2.875-.006-3.098-.106-3.28-.205-.381-.352-.416-1.742-.416-1.086 0-1.256.011-1.432.105m11.088 0c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.012-1.432.105m-81.312 3.696a.9.9 0 0 0-.31.311c-.1.182-.106.405-.106 3.28s.006 3.097.105 3.279c.206.382.352.417 1.743.417 1.865 0 1.848.017 1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848-.018 1.848 1.848 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537-.035 1.742-.417.1-.182.106-.404.106-3.279s-.006-3.098-.106-3.28a.9.9 0 0 0-.31-.311c-.19-.099-.464-.105-5.128-.105s-4.94.006-5.128.105"/>
+    <path d="M119.803 145.365c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.012-1.432.105m40.656 0c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.012-1.432.105m-96.096 3.696c-.381.206-.416.352-.416 1.743 0 1.39-.036 1.537-.417 1.742-.188.1-.463.106-5.127.106s-4.94.006-5.128.105c-.381.206-.416.352-.416 1.743 0 1.865.017 1.848-1.848 1.848-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.39 0-1.537.035-1.743.416-.1.182-.105.405-.105 3.28s.006 3.097.105 3.279c.059.112.2.252.31.311.183.1.406.106 3.28.106 2.876 0 3.098.006 3.28.105.38.206.417.352.417 1.743 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097-.006 3.28-.106c.38-.205.416-.352.416-1.742 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848-.018 1.848 1.848 0 1.39.035 1.537.416 1.742.188.1.58.106 8.824.106s8.635.006 8.823.105c.382.206.417.352.417 1.743 0 1.865-.018 1.848 1.848 1.848 1.39 0 1.537-.035 1.742-.417.1-.188.106-.463.106-5.127s-.006-4.94-.106-5.128c-.205-.381-.352-.416-1.742-.416-1.866 0-1.848-.018-1.848 1.848 0 1.39-.035 1.537-.417 1.742-.182.1-.405.106-3.28.106s-3.097-.006-3.28-.106c-.38-.205-.415-.352-.415-1.742 0-1.866.017-1.848-1.848-1.848-1.866 0-1.848.017-1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.011-1.432.105m22.177 7.392c-.382.206-.417.352-.417 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.255.011-1.431.105m14.783 0c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.011-1.432.105m29.568 0c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848-.018 1.848 1.848 0 1.39.035 1.537.416 1.742.182.1.405.106 3.28.106s3.097-.006 3.279-.106c.382-.205.417-.352.417-1.742 0-1.866-.018-1.848 1.848-1.848 1.865 0 1.848.017 1.848-1.848 0-1.391-.035-1.537-.417-1.743-.188-.099-.522-.105-6.975-.105-6.454 0-6.788.006-6.976.105m14.784 3.696c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.011-1.432.105m7.392 0c-.381.206-.416.352-.416 1.743 0 1.865-.018 1.848 1.848 1.848 1.865 0 1.848.017 1.848-1.848 0-1.866.017-1.848-1.848-1.848-1.086 0-1.256.011-1.432.105"/>
+  </g>
+</svg>
diff --git a/suite-native/module-accounts-import/src/components/AccountAlreadyImported.tsx b/suite-native/module-accounts-import/src/components/AccountAlreadyImportedScreen.tsx
similarity index 52%
rename from suite-native/module-accounts-import/src/components/AccountAlreadyImported.tsx
rename to suite-native/module-accounts-import/src/components/AccountAlreadyImportedScreen.tsx
index 0617280ce1b..5ce490a8cdf 100644
--- a/suite-native/module-accounts-import/src/components/AccountAlreadyImported.tsx
+++ b/suite-native/module-accounts-import/src/components/AccountAlreadyImportedScreen.tsx
@@ -1,20 +1,22 @@
 import { useNavigation } from '@react-navigation/core';
 
-import { Box, Button, Card, Divider } from '@suite-native/atoms';
+import { Button, Card, VStack } from '@suite-native/atoms';
 import { AccountsListItem } from '@suite-native/accounts';
 import { Account } from '@suite-common/wallet-types';
+import { Translation } from '@suite-native/intl';
 import {
     AccountsImportStackParamList,
     AccountsImportStackRoutes,
-    AppTabsRoutes,
-    HomeStackRoutes,
     RootStackParamList,
     RootStackRoutes,
     StackToTabCompositeProps,
+    useNavigateToInitialScreen,
 } from '@suite-native/navigation';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
-type AccountImportImportedAccountProps = {
+import { AccountImportSummaryScreen } from './AccountImportSummaryScreen';
+
+type AccountAlreadyImportedScreenProps = {
     account: Account;
 };
 
@@ -30,11 +32,12 @@ type NavigationProp = StackToTabCompositeProps<
     RootStackParamList
 >;
 
-export const AccountAlreadyImported = ({ account }: AccountImportImportedAccountProps) => {
+export const AccountAlreadyImportedScreen = ({ account }: AccountAlreadyImportedScreenProps) => {
     const { applyStyle } = useNativeStyles();
     const navigation = useNavigation<NavigationProp>();
+    const navigateToInitialScreen = useNavigateToInitialScreen();
 
-    const handleImportAnotherAsset = () =>
+    const handleSyncAnotherAsset = () =>
         navigation.navigate(RootStackRoutes.AccountsImport, {
             screen: AccountsImportStackRoutes.XpubScan,
             params: {
@@ -42,42 +45,29 @@ export const AccountAlreadyImported = ({ account }: AccountImportImportedAccount
             },
         });
 
-    const handleNavigateToDashboard = () =>
-        navigation.navigate(RootStackRoutes.AppTabs, {
-            screen: AppTabsRoutes.HomeStack,
-            params: {
-                screen: HomeStackRoutes.Home,
-            },
-        });
-
     return (
-        <Box
-            flex={1}
-            justifyContent="flex-end"
+        <AccountImportSummaryScreen
+            title={<Translation id="moduleAccountImport.summaryScreen.title.alreadySynced" />}
+            subtitle={<Translation id="moduleAccountImport.summaryScreen.subtitle" />}
+            footer={
+                <VStack spacing="sp16">
+                    <Button size="large" onPress={handleSyncAnotherAsset}>
+                        <Translation id="moduleAccountImport.summaryScreen.syncAnotherCoinButton" />
+                    </Button>
+                    <Button
+                        size="large"
+                        colorScheme="tertiaryElevation0"
+                        onPress={navigateToInitialScreen}
+                    >
+                        <Translation id="generic.buttons.cancel" />
+                    </Button>
+                </VStack>
+            }
             testID="@account-import/summary/account-already-imported"
         >
             <Card style={applyStyle(contentWrapperStyle)}>
                 {account && <AccountsListItem account={account} />}
             </Card>
-            <Box>
-                <Box marginBottom="sp24" marginTop="sp24">
-                    <Divider />
-                </Box>
-                <Box>
-                    <Box marginBottom="sp16">
-                        <Button
-                            size="large"
-                            colorScheme="tertiaryElevation0"
-                            onPress={handleImportAnotherAsset}
-                        >
-                            Import another asset
-                        </Button>
-                    </Box>
-                    <Button size="large" onPress={handleNavigateToDashboard}>
-                        Continue to app
-                    </Button>
-                </Box>
-            </Box>
-        </Box>
+        </AccountImportSummaryScreen>
     );
 };
diff --git a/suite-native/module-accounts-import/src/components/AccountImportSummaryForm.tsx b/suite-native/module-accounts-import/src/components/AccountImportConfirmFormScreen.tsx
similarity index 57%
rename from suite-native/module-accounts-import/src/components/AccountImportSummaryForm.tsx
rename to suite-native/module-accounts-import/src/components/AccountImportConfirmFormScreen.tsx
index df4159e9895..ac88d0ebc15 100644
--- a/suite-native/module-accounts-import/src/components/AccountImportSummaryForm.tsx
+++ b/suite-native/module-accounts-import/src/components/AccountImportConfirmFormScreen.tsx
@@ -1,9 +1,10 @@
 import { useCallback } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { CommonActions, useNavigation } from '@react-navigation/core';
+import { useNavigation } from '@react-navigation/core';
 import { FlashList } from '@shopify/flash-list';
 
+import { Translation } from '@suite-native/intl';
 import {
     selectFilterKnownTokens,
     TokenDefinitionsRootState,
@@ -17,25 +18,24 @@ import {
 import { TokenAddress, TokenSymbol } from '@suite-common/wallet-types';
 import { AccountFormValues, useAccountLabelForm } from '@suite-native/accounts';
 import { analytics, EventType } from '@suite-native/analytics';
-import { Box, Button, Divider, Text } from '@suite-native/atoms';
+import { Box, Button, Text } from '@suite-native/atoms';
 import { Form } from '@suite-native/forms';
 import {
     AccountsImportStackParamList,
     AccountsImportStackRoutes,
-    HomeStackRoutes,
     RootStackParamList,
-    RootStackRoutes,
     StackToStackCompositeNavigationProps,
+    useNavigateToInitialScreen,
 } from '@suite-native/navigation';
 import { AccountInfo, TokenInfo } from '@trezor/connect';
-import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
 import { importAccountThunk } from '../accountsImportThunks';
 import { useShowImportError } from '../useShowImportError';
 import { AccountImportOverview } from './AccountImportOverview';
-import { EthereumTokenInfo } from './EthereumTokenInfo';
+import { AccountImportSummaryScreen } from './AccountImportSummaryScreen';
+import { TokenInfoCard } from './TokenInfoCard';
 
-type AccountImportSummaryFormProps = {
+type AccountImportConfirmFormScreenProps = {
     networkSymbol: NetworkSymbol;
     accountInfo: AccountInfo;
 };
@@ -46,17 +46,13 @@ type NavigationProp = StackToStackCompositeNavigationProps<
     RootStackParamList
 >;
 
-const confirmButtonStyle = prepareNativeStyle(utils => ({
-    marginBottom: utils.spacings.sp8,
-}));
-
-export const AccountImportSummaryForm = ({
+export const AccountImportConfirmFormScreen = ({
     networkSymbol,
     accountInfo,
-}: AccountImportSummaryFormProps) => {
+}: AccountImportConfirmFormScreenProps) => {
     const dispatch = useDispatch();
-    const { applyStyle } = useNativeStyles();
     const navigation = useNavigation<NavigationProp>();
+    const navigateToInitialScreen = useNavigateToInitialScreen();
     const showImportError = useShowImportError(networkSymbol, navigation);
 
     const knownTokens = useSelector((state: TokenDefinitionsRootState) =>
@@ -96,19 +92,7 @@ export const AccountImportSummaryForm = ({
                 },
             });
 
-            navigation.dispatch(
-                CommonActions.reset({
-                    index: 0,
-                    routes: [
-                        {
-                            name: RootStackRoutes.AppTabs,
-                            params: {
-                                screen: HomeStackRoutes.Home,
-                            },
-                        },
-                    ],
-                }),
-            );
+            navigateToInitialScreen();
         } catch {
             showImportError();
         }
@@ -116,8 +100,9 @@ export const AccountImportSummaryForm = ({
 
     const renderItem = useCallback(
         ({ item }: { item: TokenInfo }) => (
-            <Box marginBottom="sp8">
-                <EthereumTokenInfo
+            <Box marginBottom="sp12">
+                <TokenInfoCard
+                    networkSymbol={networkSymbol}
                     symbol={item.symbol as TokenSymbol}
                     balance={item.balance}
                     decimals={item.decimals}
@@ -126,46 +111,46 @@ export const AccountImportSummaryForm = ({
                 />
             </Box>
         ),
-        [],
+        [networkSymbol],
     );
 
     return (
         <Form form={form}>
-            <FlashList
-                data={knownTokens}
-                renderItem={renderItem}
-                ListEmptyComponent={null}
-                ListHeaderComponent={
-                    <>
-                        <AccountImportOverview
-                            balance={accountInfo.availableBalance}
-                            networkSymbol={networkSymbol}
-                        />
-                        {knownTokens.length > 0 && (
-                            <Box marginTop="sp16" marginBottom="sp8">
-                                <Text variant="titleSmall">Tokens: </Text>
-                            </Box>
-                        )}
-                    </>
+            <AccountImportSummaryScreen
+                title={<Translation id="moduleAccountImport.summaryScreen.title.confirmToAdd" />}
+                footer={
+                    <Button
+                        testID="@account-import/coin-synced/confirm-button"
+                        onPress={handleImportAccount}
+                        size="large"
+                        isDisabled={!!errors.accountLabel}
+                    >
+                        <Translation id="generic.buttons.confirm" />
+                    </Button>
                 }
-                ListFooterComponent={
-                    <>
-                        <Divider marginHorizontal="sp32" marginTop="sp24" />
-                        <Box marginHorizontal="sp16" marginTop="sp24">
-                            <Button
-                                testID="@account-import/coin-synced/confirm-button"
-                                onPress={handleImportAccount}
-                                size="large"
-                                style={applyStyle(confirmButtonStyle)}
-                                isDisabled={!!errors.accountLabel}
-                            >
-                                Confirm
-                            </Button>
-                        </Box>
-                    </>
-                }
-                estimatedItemSize={115}
-            />
+            >
+                <FlashList
+                    data={knownTokens}
+                    renderItem={renderItem}
+                    ListEmptyComponent={null}
+                    ListHeaderComponent={
+                        <>
+                            <AccountImportOverview
+                                balance={accountInfo.availableBalance}
+                                networkSymbol={networkSymbol}
+                            />
+                            {knownTokens.length > 0 && (
+                                <Box marginTop="sp16" marginBottom="sp8">
+                                    <Text variant="titleSmall">
+                                        <Translation id="moduleAccountImport.summaryScreen.tokens" />
+                                    </Text>
+                                </Box>
+                            )}
+                        </>
+                    }
+                    estimatedItemSize={115}
+                />
+            </AccountImportSummaryScreen>
         </Form>
     );
 };
diff --git a/suite-native/module-accounts-import/src/components/AccountImportOverview.tsx b/suite-native/module-accounts-import/src/components/AccountImportOverview.tsx
index 7fc28788cb9..a630446facc 100644
--- a/suite-native/module-accounts-import/src/components/AccountImportOverview.tsx
+++ b/suite-native/module-accounts-import/src/components/AccountImportOverview.tsx
@@ -23,9 +23,8 @@ export const AccountImportOverview = ({ balance, networkSymbol }: AssetsOverview
 
     return (
         <AccountImportOverviewCard
-            icon={<RoundedIcon name={networkSymbol} iconSize="large" />}
+            icon={<RoundedIcon networkSymbol={networkSymbol} iconSize="large" />}
             coinName={networks[networkSymbol].name}
-            symbol={networkSymbol}
             cryptoAmount={
                 <CryptoAmountFormatter
                     value={balance}
diff --git a/suite-native/module-accounts-import/src/components/AccountImportOverviewCard.tsx b/suite-native/module-accounts-import/src/components/AccountImportOverviewCard.tsx
index 1745e12864d..8561da2bf41 100644
--- a/suite-native/module-accounts-import/src/components/AccountImportOverviewCard.tsx
+++ b/suite-native/module-accounts-import/src/components/AccountImportOverviewCard.tsx
@@ -1,57 +1,29 @@
 import { ReactNode } from 'react';
 
-import { useNavigation } from '@react-navigation/core';
-
-import { Box, Card, IconButton, Text } from '@suite-native/atoms';
+import { Box, Card, Text } from '@suite-native/atoms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import {
-    AccountsImportStackParamList,
-    AccountsImportStackRoutes,
-    RootStackParamList,
-    RootStackRoutes,
-    StackToTabCompositeProps,
-} from '@suite-native/navigation';
-import { NetworkSymbol } from '@suite-common/wallet-config';
 
 const assetCardStyle = prepareNativeStyle(utils => ({
     padding: utils.spacings.sp24,
-    borderRadius: utils.borders.radii.large,
+    borderRadius: utils.borders.radii.r20,
     width: '100%',
 }));
 
-type NavigationProp = StackToTabCompositeProps<
-    AccountsImportStackParamList,
-    AccountsImportStackRoutes.AccountImportSummary,
-    RootStackParamList
->;
-
 type AccountImportOverviewCardProps = {
     children?: ReactNode;
     icon: ReactNode;
     cryptoAmount: ReactNode;
     coinName: string;
-    shouldDisplayDeleteIcon?: boolean;
-    symbol: NetworkSymbol;
 };
+
 export const AccountImportOverviewCard = ({
     children,
     icon,
     coinName,
-    symbol,
     cryptoAmount,
-    shouldDisplayDeleteIcon = true,
 }: AccountImportOverviewCardProps) => {
-    const navigation = useNavigation<NavigationProp>();
     const { applyStyle } = useNativeStyles();
 
-    const handleNavigateToQRScan = () =>
-        navigation.navigate(RootStackRoutes.AccountsImport, {
-            screen: AccountsImportStackRoutes.XpubScan,
-            params: {
-                networkSymbol: symbol,
-            },
-        });
-
     return (
         <Card style={applyStyle(assetCardStyle)}>
             <Box flexDirection="row" marginBottom="sp24" justifyContent="space-between">
@@ -62,15 +34,6 @@ export const AccountImportOverviewCard = ({
                         {cryptoAmount}
                     </Box>
                 </Box>
-                {shouldDisplayDeleteIcon && (
-                    <IconButton
-                        data-testID="@account-import/coin-synced/delete-icon"
-                        iconName="trashAlt"
-                        colorScheme="tertiaryElevation1"
-                        onPress={handleNavigateToQRScan}
-                        size="medium"
-                    />
-                )}
             </Box>
             {children}
         </Card>
diff --git a/suite-native/module-accounts-import/src/components/AccountImportSubHeader.tsx b/suite-native/module-accounts-import/src/components/AccountImportSubHeader.tsx
index b3f1f885f6d..72bde01ffe5 100644
--- a/suite-native/module-accounts-import/src/components/AccountImportSubHeader.tsx
+++ b/suite-native/module-accounts-import/src/components/AccountImportSubHeader.tsx
@@ -1,61 +1,26 @@
-import { useSelector } from 'react-redux';
-
-import { useNavigation } from '@react-navigation/core';
-
-import { IconButton, Text, VStack } from '@suite-native/atoms';
+import { useTranslate } from '@suite-native/intl';
 import {
-    AccountsImportStackParamList,
-    AccountsImportStackRoutes,
-    AppTabsRoutes,
-    HomeStackRoutes,
-    RootStackParamList,
-    RootStackRoutes,
+    CloseActionType,
     ScreenSubHeader,
-    StackToTabCompositeProps,
+    useNavigateToInitialScreen,
 } from '@suite-native/navigation';
-import { Translation } from '@suite-native/intl';
-import { selectIsDeviceAccountless } from '@suite-common/wallet-core';
 
-type NavigationProp = StackToTabCompositeProps<
-    AccountsImportStackParamList,
-    AccountsImportStackRoutes.AccountImportSummary,
-    RootStackParamList
->;
-
-export const AccountImportSubHeader = () => {
-    const navigation = useNavigation<NavigationProp>();
-    const isDeviceAccountless = useSelector(selectIsDeviceAccountless);
+type AccountImportSubHeaderProps = {
+    closeActionType?: CloseActionType;
+};
 
-    const handleCloseOnboarding = () => {
-        navigation.navigate(RootStackRoutes.AppTabs, {
-            screen: AppTabsRoutes.HomeStack,
-            params: {
-                screen: HomeStackRoutes.Home,
-            },
-        });
-    };
+export const AccountImportSubHeader = ({
+    closeActionType = 'close',
+}: AccountImportSubHeaderProps) => {
+    const { translate } = useTranslate();
+    const navigateToInitialScreen = useNavigateToInitialScreen();
 
     return (
         <ScreenSubHeader
-            leftIcon={
-                !isDeviceAccountless ? (
-                    <IconButton
-                        iconName="close"
-                        colorScheme="tertiaryElevation0"
-                        onPress={handleCloseOnboarding}
-                        accessibilityRole="button"
-                        accessibilityLabel="close"
-                        size="medium"
-                    />
-                ) : null
-            }
-            content={
-                <VStack alignItems="center" spacing="sp8">
-                    <Text variant="titleSmall" adjustsFontSizeToFit numberOfLines={1}>
-                        <Translation id="moduleAccountImport.title" />
-                    </Text>
-                </VStack>
-            }
+            customHorizontalPadding="sp16"
+            closeActionType={closeActionType}
+            closeAction={closeActionType === 'close' ? navigateToInitialScreen : undefined}
+            content={translate('moduleAccountImport.title')}
         />
     );
 };
diff --git a/suite-native/module-accounts-import/src/components/AccountImportSummary.tsx b/suite-native/module-accounts-import/src/components/AccountImportSummary.tsx
deleted file mode 100644
index c6cf94dceb1..00000000000
--- a/suite-native/module-accounts-import/src/components/AccountImportSummary.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import { useSelector } from 'react-redux';
-
-import { Box, ErrorMessage, PictogramTitleHeader, VStack, Text } from '@suite-native/atoms';
-import {
-    AccountsRootState,
-    DeviceRootState,
-    selectDeviceAccountByDescriptorAndNetworkSymbol,
-} from '@suite-common/wallet-core';
-import { NetworkSymbol } from '@suite-common/wallet-config';
-import { AccountInfo } from '@trezor/connect';
-import { portfolioTrackerSupportedNetworks } from '@suite-native/config';
-import { Translation } from '@suite-native/intl';
-import { FeatureFlag, useFeatureFlag } from '@suite-native/feature-flags';
-
-import { AccountImportSummaryForm } from './AccountImportSummaryForm';
-import { AccountAlreadyImported } from './AccountAlreadyImported';
-
-type AccountImportDetailProps = {
-    networkSymbol: NetworkSymbol;
-    accountInfo: AccountInfo;
-};
-
-export const AccountImportSummary = ({ networkSymbol, accountInfo }: AccountImportDetailProps) => {
-    const [isRegtestEnabled] = useFeatureFlag(FeatureFlag.IsRegtestEnabled);
-    const account = useSelector((state: AccountsRootState & DeviceRootState) =>
-        selectDeviceAccountByDescriptorAndNetworkSymbol(
-            state,
-            accountInfo.descriptor,
-            networkSymbol,
-        ),
-    );
-
-    const isAccountImportSupported =
-        portfolioTrackerSupportedNetworks.some(symbol => symbol === networkSymbol) ||
-        (networkSymbol === 'regtest' && isRegtestEnabled);
-
-    if (!isAccountImportSupported) {
-        return (
-            <ErrorMessage
-                errorMessage={<Translation id="moduleAccountImport.error.unsupportedNetworkType" />}
-            />
-        );
-    }
-
-    const title = (
-        <Translation
-            id={
-                account
-                    ? 'moduleAccountImport.summaryScreen.title.alreadySynced'
-                    : 'moduleAccountImport.summaryScreen.title.confirmToAdd'
-            }
-        />
-    );
-    const subtitle = account ? (
-        <Translation id="moduleAccountImport.summaryScreen.subtitle" />
-    ) : undefined;
-
-    return (
-        <VStack spacing="sp32" flex={1}>
-            <Box flex={1} alignItems="center" justifyContent="center">
-                <PictogramTitleHeader
-                    title={<Text variant="titleSmall">{title}</Text>}
-                    subtitle={subtitle}
-                    variant="green"
-                    icon="syncedCoin"
-                />
-            </Box>
-            <Box flex={1}>
-                {account ? (
-                    <AccountAlreadyImported account={account} />
-                ) : (
-                    <AccountImportSummaryForm
-                        networkSymbol={networkSymbol}
-                        accountInfo={accountInfo}
-                    />
-                )}
-            </Box>
-        </VStack>
-    );
-};
diff --git a/suite-native/module-accounts-import/src/components/AccountImportSummaryScreen.tsx b/suite-native/module-accounts-import/src/components/AccountImportSummaryScreen.tsx
new file mode 100644
index 00000000000..d913d3d2ba6
--- /dev/null
+++ b/suite-native/module-accounts-import/src/components/AccountImportSummaryScreen.tsx
@@ -0,0 +1,49 @@
+import { ReactNode } from 'react';
+import { KeyboardAvoidingView, Platform } from 'react-native';
+
+import { Box, PictogramTitleHeader, VStack } from '@suite-native/atoms';
+import { Screen } from '@suite-native/navigation';
+
+import { AccountImportSubHeader } from './AccountImportSubHeader';
+
+type AccountImportSummaryScreenProps = {
+    children: ReactNode;
+    title: ReactNode;
+    subtitle?: ReactNode;
+    footer: ReactNode;
+    testID?: string;
+};
+
+export const AccountImportSummaryScreen = ({
+    children,
+    title,
+    subtitle,
+    footer,
+    testID,
+}: AccountImportSummaryScreenProps) => {
+    return (
+        <Screen
+            customHorizontalPadding="sp16"
+            screenHeader={<AccountImportSubHeader />}
+            footer={
+                <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : 'height'}>
+                    <Box margin="sp16">{footer}</Box>
+                </KeyboardAvoidingView>
+            }
+        >
+            <VStack spacing="sp32" flex={1}>
+                <Box flex={1} alignItems="center" justifyContent="center">
+                    <PictogramTitleHeader
+                        title={title}
+                        subtitle={subtitle}
+                        variant="green"
+                        icon="coinVerticalCheck"
+                    />
+                </Box>
+                <Box flex={1} justifyContent="flex-end" testID={testID}>
+                    {children}
+                </Box>
+            </VStack>
+        </Screen>
+    );
+};
diff --git a/suite-native/module-accounts-import/src/components/DevXpub.tsx b/suite-native/module-accounts-import/src/components/DevXpub.tsx
index 848921b073c..e4596dfc497 100644
--- a/suite-native/module-accounts-import/src/components/DevXpub.tsx
+++ b/suite-native/module-accounts-import/src/components/DevXpub.tsx
@@ -9,7 +9,17 @@ type DevXpubProps = {
 };
 
 const devXpubs: Partial<Record<NetworkSymbol, string | DevXpub[]>> = {
-    btc: 'zpub6rjNNddoAVvuYaD6WPdxiqFEToQHgrERjWMg7kM9gGGk6rhPMWNEmL5X745FGqBq8Wp136LfA3A7UjRGEYdJrf8dUfshzNrb5rvaryNfVJf',
+    btc: [
+        {
+            title: 'SegWit xPub',
+            address:
+                'zpub6rjNNddoAVvuYaD6WPdxiqFEToQHgrERjWMg7kM9gGGk6rhPMWNEmL5X745FGqBq8Wp136LfA3A7UjRGEYdJrf8dUfshzNrb5rvaryNfVJf',
+        },
+        {
+            title: 'Taproot (zero value)',
+            address: `tr([5c9e228d/86'/0'/0']xpub6Bw885JisRbcKmowfBvMmCxaFHodKn1VpmRmctmJJoM8D4DzyP4qJv8ZdD9V9r3SSGjmK2KJEDnvLH6f1Q4HrobEvnCeKydNvf1eir3RHZk/<0;1>/*)`,
+        },
+    ],
     test: 'vpub5ZjRPuuMiEQnbwEDi9jtH1FaJMajZW78uZ1t3RJXKhxyMoTnPraKwGxiDo9SguDYvSieqjoLJxW5n2t9156RR1oeqRnURuftNZTzejBc4pa',
     regtest:
         'vpub5ZjRPuuMiEQnbwEDi9jtH1FaJMajZW78uZ1t3RJXKhxyMoTnPraKwGxiDo9SguDYvSieqjoLJxW5n2t9156RR1oeqRnURuftNZTzejBc4pa',
@@ -20,13 +30,13 @@ const devXpubs: Partial<Record<NetworkSymbol, string | DevXpub[]>> = {
     dgb: 'ypub6X7pNV6ouYFiDGHjxCtbnV9EaCdq5uyVysMbR5Q79LHa3SWV93J7ubun37EJhfFQqsSGQBfz3UrAzNtYNhb5JsoPJbNKvbF9wKxBjgxfXkH',
     zec: 'xpub6DNsg962rV1MeqmathySUG2oKso9MfT2hMXCsMp6qemGWwD9xssVM61DfcAUUEaX2G8tjaaoKKppoKtFcSK8KVaMFHmZjAgyqod4DwXopPE',
     eth: [
-        { title: 'Use dev xPub', address: '0x62270860B9a5337e46bE8563c512c9137AFa0384' },
+        { title: 'balance, few tokens', address: '0x62270860B9a5337e46bE8563c512c9137AFa0384' },
         {
-            title: 'Dev (not zero, no tokens, staking)',
+            title: 'not zero, no tokens, staking',
             address: '0x607ce71Ae895D7759141c6ae2695a2eb64e92Bb7',
         },
         {
-            title: 'Dev (not zero, no tokens, no staking)',
+            title: 'not zero, no tokens, no staking',
             address: '0x9eA3721B5Bf3b64b4418c38B603154d2D597FAE3',
         },
         {
@@ -38,6 +48,7 @@ const devXpubs: Partial<Record<NetworkSymbol, string | DevXpub[]>> = {
     ada: '432505dc5010ec888c650319035dff62f964002f02473fa7fd65dd67f9bd80b327674cabf29c39a14c367dbae5ee01f967f8b4c3ad63a45468da8f28bb2e03d5',
     txrp: 'rJX2KwzaLJDyFhhtXKi3htaLfaUH2tptEX',
     xrp: 'r9TCDt3HmszcsnPrUrnvpynvLgaGQom9x3',
+    sol: 'C4pFbTQGpEXmsmiToPPL2Qix1UDeD8bHXpi77Hk9WesZ',
 };
 
 type DevXpub = {
@@ -63,7 +74,7 @@ export const DevXpub = ({ symbol, onSelect }: DevXpubProps) => {
                             onPress={() => onSelect({ xpubAddress: address })}
                             colorScheme="tertiaryElevation0"
                         >
-                            {title}
+                            DEV: {title}
                         </Button>
                     );
                 })}
diff --git a/suite-native/module-accounts-import/src/components/QRWithLaser.tsx b/suite-native/module-accounts-import/src/components/QRWithLaser.tsx
index 280a38fe8a5..e60239c2695 100644
--- a/suite-native/module-accounts-import/src/components/QRWithLaser.tsx
+++ b/suite-native/module-accounts-import/src/components/QRWithLaser.tsx
@@ -23,9 +23,8 @@ import {
     vec,
 } from '@shopify/react-native-skia';
 
-import { icons } from '@suite-common/icons-deprecated';
 import { useNativeStyles } from '@trezor/styles';
-import { ENDLESS_ANIMATION_VALUE } from '@suite-native/helpers';
+import { ENDLESS_ANIMATION_VALUE } from '@suite-native/atoms';
 
 const ROUNDED_CORNER_SIZE = 15;
 
@@ -96,7 +95,7 @@ export const QrWithLaser = () => {
     const {
         utils: { colors },
     } = useNativeStyles();
-    const qrCodeSvg = useSVG(icons.qrCodeImport);
+    const qrCodeSvg = useSVG(require('../assets/qrCodeImport.svg'));
 
     const progress = useSharedValue(0);
 
diff --git a/suite-native/module-accounts-import/src/components/SelectableNetworkList.tsx b/suite-native/module-accounts-import/src/components/SelectableNetworkList.tsx
index ba1794360aa..452aa4033c0 100644
--- a/suite-native/module-accounts-import/src/components/SelectableNetworkList.tsx
+++ b/suite-native/module-accounts-import/src/components/SelectableNetworkList.tsx
@@ -1,8 +1,14 @@
+import { useSelector } from 'react-redux';
+import { ReactNode } from 'react';
+
 import { SelectableNetworkItem } from '@suite-native/accounts';
 import { HeaderedCard, VStack } from '@suite-native/atoms';
 import { NetworkSymbol } from '@suite-common/wallet-config';
-import { portfolioTrackerMainnets, portfolioTrackerTestnets } from '@suite-native/config';
-import { FeatureFlag, useFeatureFlag } from '@suite-native/feature-flags';
+import {
+    selectPortfolioTrackerMainnetNetworkSymbols,
+    selectPortfolioTrackerTestnetNetworkSymbols,
+} from '@suite-native/discovery';
+import { Translation } from '@suite-native/intl';
 
 type SelectableAssetListProps = {
     onSelectItem: (networkSymbol: NetworkSymbol) => void;
@@ -13,42 +19,37 @@ const NetworkItemSection = ({
     networks,
     onSelectItem,
 }: {
-    title: string;
+    title: ReactNode;
     networks: NetworkSymbol[];
     onSelectItem: SelectableAssetListProps['onSelectItem'];
-}) => (
-    <HeaderedCard title={title}>
-        <VStack spacing="sp24">
-            {networks.map(symbol => (
-                <SelectableNetworkItem key={symbol} symbol={symbol} onPress={onSelectItem} />
-            ))}
-        </VStack>
-    </HeaderedCard>
-);
-
-const TestnetNetworkItemSection = ({ onSelectItem }: SelectableAssetListProps) => {
-    const [isRegtestEnabled] = useFeatureFlag(FeatureFlag.IsRegtestEnabled);
-    const regtestAdjustedTestnets = isRegtestEnabled
-        ? [...portfolioTrackerTestnets, 'regtest' as NetworkSymbol]
-        : portfolioTrackerTestnets;
-
+}) => {
     return (
-        <NetworkItemSection
-            title="Testnet coins (have no value – for testing purposes only)"
-            networks={regtestAdjustedTestnets}
-            onSelectItem={onSelectItem}
-        />
+        <HeaderedCard title={title}>
+            <VStack spacing="sp24">
+                {networks.map(symbol => (
+                    <SelectableNetworkItem key={symbol} symbol={symbol} onPress={onSelectItem} />
+                ))}
+            </VStack>
+        </HeaderedCard>
     );
 };
 
-export const SelectableNetworkList = ({ onSelectItem }: SelectableAssetListProps) => (
-    <VStack spacing="sp24">
-        <NetworkItemSection
-            title="Select a coin to sync"
-            networks={portfolioTrackerMainnets}
-            onSelectItem={onSelectItem}
-        />
+export const SelectableNetworkList = ({ onSelectItem }: SelectableAssetListProps) => {
+    const portfolioMainnets = useSelector(selectPortfolioTrackerMainnetNetworkSymbols);
+    const portfolioTestnets = useSelector(selectPortfolioTrackerTestnetNetworkSymbols);
 
-        <TestnetNetworkItemSection onSelectItem={onSelectItem} />
-    </VStack>
-);
+    return (
+        <VStack spacing="sp24">
+            <NetworkItemSection
+                title={<Translation id="moduleAccountImport.coinList.mainnets" />}
+                networks={portfolioMainnets}
+                onSelectItem={onSelectItem}
+            />
+            <NetworkItemSection
+                title={<Translation id="moduleAccountImport.coinList.testnets" />}
+                networks={portfolioTestnets}
+                onSelectItem={onSelectItem}
+            />
+        </VStack>
+    );
+};
diff --git a/suite-native/module-accounts-import/src/components/EthereumTokenInfo.tsx b/suite-native/module-accounts-import/src/components/TokenInfoCard.tsx
similarity index 54%
rename from suite-native/module-accounts-import/src/components/EthereumTokenInfo.tsx
rename to suite-native/module-accounts-import/src/components/TokenInfoCard.tsx
index 6f01532635d..29878cc6d9d 100644
--- a/suite-native/module-accounts-import/src/components/EthereumTokenInfo.tsx
+++ b/suite-native/module-accounts-import/src/components/TokenInfoCard.tsx
@@ -1,19 +1,18 @@
 import { useSelector } from 'react-redux';
 
-import { CryptoIcon } from '@suite-common/icons-deprecated';
+import { CryptoIcon } from '@suite-native/icons';
 import {
     TokenDefinitionsRootState,
     selectIsSpecificCoinDefinitionKnown,
 } from '@suite-common/token-definitions';
 import { TokenAddress, TokenSymbol } from '@suite-common/wallet-types';
-import {
-    EthereumTokenAmountFormatter,
-    EthereumTokenToFiatAmountFormatter,
-} from '@suite-native/formatters';
+import { TokenAmountFormatter, TokenToFiatAmountFormatter } from '@suite-native/formatters';
+import { NetworkSymbol } from '@suite-common/wallet-config';
 
 import { AccountImportOverviewCard } from './AccountImportOverviewCard';
 
-type EthereumTokenInfoProps = {
+type TokenInfoCardProps = {
+    networkSymbol: NetworkSymbol;
     symbol?: TokenSymbol;
     balance?: string;
     name?: string;
@@ -21,35 +20,35 @@ type EthereumTokenInfoProps = {
     contract: TokenAddress;
 };
 
-export const EthereumTokenInfo = ({
+export const TokenInfoCard = ({
+    networkSymbol,
     symbol,
     balance,
     name,
     decimals,
     contract,
-}: EthereumTokenInfoProps) => {
-    const ethereumSymbolHasFiatRates = useSelector((state: TokenDefinitionsRootState) =>
-        selectIsSpecificCoinDefinitionKnown(state, 'eth', contract),
+}: TokenInfoCardProps) => {
+    const isSpecificCoinDefinitionKnown = useSelector((state: TokenDefinitionsRootState) =>
+        selectIsSpecificCoinDefinitionKnown(state, networkSymbol, contract),
     );
 
-    if (!symbol || !balance || !name || !ethereumSymbolHasFiatRates) return null;
+    if (!symbol || !balance || !name || !isSpecificCoinDefinitionKnown) return null;
 
     return (
         <AccountImportOverviewCard
             coinName={name}
-            symbol="eth"
-            shouldDisplayDeleteIcon={false}
             cryptoAmount={
-                <EthereumTokenAmountFormatter
+                <TokenAmountFormatter
                     value={balance}
                     symbol={symbol}
                     decimals={decimals}
                     variant="label"
                 />
             }
-            icon={<CryptoIcon symbol={contract} />}
+            icon={<CryptoIcon symbol={networkSymbol} contractAddress={contract} />}
         >
-            <EthereumTokenToFiatAmountFormatter
+            <TokenToFiatAmountFormatter
+                networkSymbol={networkSymbol}
                 value={balance}
                 contract={contract}
                 decimals={decimals}
diff --git a/suite-native/module-accounts-import/src/components/XpubHintBottomSheet.tsx b/suite-native/module-accounts-import/src/components/XpubHintBottomSheet.tsx
index eff5dba48f1..0e1d0a76cab 100644
--- a/suite-native/module-accounts-import/src/components/XpubHintBottomSheet.tsx
+++ b/suite-native/module-accounts-import/src/components/XpubHintBottomSheet.tsx
@@ -16,7 +16,7 @@ export const XpubHintBottomSheet = ({
     handleClose,
 }: XpubHintBottomSheetProps) => {
     const isAddressBased = isAddressBasedNetwork(networkType);
-    const video: VideoName = isAddressBased ? 'xpubImportBTC' : 'xpubImportETH';
+    const video: VideoName = isAddressBased ? 'xpubImportETH' : 'xpubImportBTC';
     const title = (
         <Translation
             id={
diff --git a/suite-native/module-accounts-import/src/navigation/AccountsImportStackNavigator.tsx b/suite-native/module-accounts-import/src/navigation/AccountsImportStackNavigator.tsx
index 364c62749f9..769b13082ae 100644
--- a/suite-native/module-accounts-import/src/navigation/AccountsImportStackNavigator.tsx
+++ b/suite-native/module-accounts-import/src/navigation/AccountsImportStackNavigator.tsx
@@ -15,15 +15,15 @@ export const AccountsImportStack = createNativeStackNavigator<AccountsImportStac
 
 export const AccountsImportStackNavigator = () => (
     <AccountsImportStack.Navigator screenOptions={stackNavigationOptionsConfig}>
-        <AccountsImportStack.Group>
-            <AccountsImportStack.Screen
-                name={AccountsImportStackRoutes.SelectNetwork}
-                component={SelectNetworkScreen}
-            />
-            <AccountsImportStack.Screen
-                name={AccountsImportStackRoutes.XpubScan}
-                component={XpubScanScreen}
-            />
+        <AccountsImportStack.Screen
+            name={AccountsImportStackRoutes.SelectNetwork}
+            component={SelectNetworkScreen}
+        />
+        <AccountsImportStack.Screen
+            name={AccountsImportStackRoutes.XpubScan}
+            component={XpubScanScreen}
+        />
+        <AccountsImportStack.Group screenOptions={{ gestureEnabled: false }}>
             <AccountsImportStack.Screen
                 name={AccountsImportStackRoutes.AccountImportLoading}
                 component={AccountImportLoadingScreen}
diff --git a/suite-native/module-accounts-import/src/screens/AccountImportLoadingScreen.tsx b/suite-native/module-accounts-import/src/screens/AccountImportLoadingScreen.tsx
index 2fc36f7bfe2..0566de45410 100644
--- a/suite-native/module-accounts-import/src/screens/AccountImportLoadingScreen.tsx
+++ b/suite-native/module-accounts-import/src/screens/AccountImportLoadingScreen.tsx
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
+import { BackHandler } from 'react-native';
 import { useDispatch, useSelector } from 'react-redux';
 
 import { selectFiatCurrencyCode } from '@suite-native/settings';
@@ -70,6 +71,15 @@ export const AccountImportLoadingScreen = ({
         [error, showImportError],
     );
 
+    useEffect(() => {
+        // prevent dismissing screen via HW
+        const subscription = BackHandler.addEventListener('hardwareBackPress', () => {
+            return true;
+        });
+
+        return () => subscription.remove();
+    }, []);
+
     useEffect(() => {
         fetchAccountInfo();
     }, [fetchAccountInfo]);
diff --git a/suite-native/module-accounts-import/src/screens/AccountImportSummaryScreen.tsx b/suite-native/module-accounts-import/src/screens/AccountImportSummaryScreen.tsx
index bcc53eaed8e..771928eeca5 100644
--- a/suite-native/module-accounts-import/src/screens/AccountImportSummaryScreen.tsx
+++ b/suite-native/module-accounts-import/src/screens/AccountImportSummaryScreen.tsx
@@ -1,13 +1,25 @@
+import { useEffect } from 'react';
+import { BackHandler } from 'react-native';
+import { useSelector } from 'react-redux';
+
 import {
-    StackToTabCompositeScreenProps,
-    Screen,
+    AccountsRootState,
+    DeviceRootState,
+    selectDeviceAccountByDescriptorAndNetworkSymbol,
+} from '@suite-common/wallet-core';
+import { ErrorMessage } from '@suite-native/atoms';
+import { selectPortfolioTrackerNetworkSymbols } from '@suite-native/discovery';
+import { FeatureFlag, useFeatureFlag } from '@suite-native/feature-flags';
+import { Translation } from '@suite-native/intl';
+import {
+    AccountsImportStackParamList,
     AccountsImportStackRoutes,
     RootStackParamList,
-    AccountsImportStackParamList,
+    StackToTabCompositeScreenProps,
 } from '@suite-native/navigation';
 
-import { AccountImportSubHeader } from '../components/AccountImportSubHeader';
-import { AccountImportSummary } from '../components/AccountImportSummary';
+import { AccountAlreadyImportedScreen } from '../components/AccountAlreadyImportedScreen';
+import { AccountImportConfirmFormScreen } from '../components/AccountImportConfirmFormScreen';
 
 export const AccountImportSummaryScreen = ({
     route,
@@ -18,9 +30,42 @@ export const AccountImportSummaryScreen = ({
 >) => {
     const { accountInfo, networkSymbol } = route.params;
 
+    const [isRegtestEnabled] = useFeatureFlag(FeatureFlag.IsRegtestEnabled);
+    const account = useSelector((state: AccountsRootState & DeviceRootState) =>
+        selectDeviceAccountByDescriptorAndNetworkSymbol(
+            state,
+            accountInfo.descriptor,
+            networkSymbol,
+        ),
+    );
+    const portfolioTrackerSupportedNetworks = useSelector(selectPortfolioTrackerNetworkSymbols);
+
+    useEffect(() => {
+        // prevent dismissing screen via HW
+        const subscription = BackHandler.addEventListener('hardwareBackPress', () => {
+            return true;
+        });
+
+        return () => subscription.remove();
+    }, []);
+
+    const isAccountImportSupported =
+        portfolioTrackerSupportedNetworks.some(symbol => symbol === networkSymbol) ||
+        (networkSymbol === 'regtest' && isRegtestEnabled);
+
+    if (!isAccountImportSupported) {
+        return (
+            <ErrorMessage
+                errorMessage={<Translation id="moduleAccountImport.error.unsupportedNetworkType" />}
+            />
+        );
+    }
+
+    if (account) {
+        return <AccountAlreadyImportedScreen account={account} />;
+    }
+
     return (
-        <Screen screenHeader={<AccountImportSubHeader />}>
-            <AccountImportSummary accountInfo={accountInfo} networkSymbol={networkSymbol} />
-        </Screen>
+        <AccountImportConfirmFormScreen networkSymbol={networkSymbol} accountInfo={accountInfo} />
     );
 };
diff --git a/suite-native/module-accounts-import/src/screens/SelectNetworkScreen.tsx b/suite-native/module-accounts-import/src/screens/SelectNetworkScreen.tsx
index 8581275857f..7a3ba870570 100644
--- a/suite-native/module-accounts-import/src/screens/SelectNetworkScreen.tsx
+++ b/suite-native/module-accounts-import/src/screens/SelectNetworkScreen.tsx
@@ -19,7 +19,7 @@ export const SelectNetworkScreen = ({
     };
 
     return (
-        <Screen screenHeader={<AccountImportSubHeader />}>
+        <Screen screenHeader={<AccountImportSubHeader />} customHorizontalPadding="sp16">
             <SelectableNetworkList onSelectItem={handleSelectNetworkSymbol} />
         </Screen>
     );
diff --git a/suite-native/module-accounts-import/src/screens/XpubScanScreen.tsx b/suite-native/module-accounts-import/src/screens/XpubScanScreen.tsx
index e1a3986aaa5..7cb268fe88e 100644
--- a/suite-native/module-accounts-import/src/screens/XpubScanScreen.tsx
+++ b/suite-native/module-accounts-import/src/screens/XpubScanScreen.tsx
@@ -4,7 +4,7 @@ import Animated, { FadeIn } from 'react-native-reanimated';
 
 import { useFocusEffect } from '@react-navigation/native';
 
-import { Button, HeaderedCard, TextDivider, VStack } from '@suite-native/atoms';
+import { Button, Card, TextDivider, VStack } from '@suite-native/atoms';
 import { isDevelopOrDebugEnv } from '@suite-native/config';
 import { Form, TextInputField, useForm } from '@suite-native/forms';
 import {
@@ -164,7 +164,6 @@ export const XpubScanScreen = ({
     }, [handleXpubResult, route.params]);
 
     const handleOpenHint = () => setIsHintSheetVisible(true);
-    const handleGoBack = () => navigation.goBack();
 
     const handleToggleScanner = () => {
         setIsScannerVisible(prevState => !prevState);
@@ -177,19 +176,16 @@ export const XpubScanScreen = ({
 
     return (
         <Screen
-            screenHeader={<AccountImportSubHeader />}
+            screenHeader={<AccountImportSubHeader closeActionType="back" />}
             footer={<XpubHint networkType={networkType} handleOpen={handleOpenHint} />}
             extraKeyboardAvoidingViewHeight={EXTRA_KEYBOARD_AVOIDING_VIEW_HEIGHT}
+            customHorizontalPadding="sp16"
+            customVerticalPadding="sp16"
         >
-            <HeaderedCard
-                title="Coin to sync"
-                buttonTitle="Change"
-                buttonIcon="discover"
-                onButtonPress={handleGoBack}
-            >
+            <Card>
                 <SelectableNetworkItem symbol={networkSymbol} />
-            </HeaderedCard>
-            <VStack spacing="sp16" marginHorizontal="sp16">
+            </Card>
+            <VStack spacing="sp16">
                 <View style={applyStyle(cameraStyle)}>
                     <XpubImportSection
                         onRequestCamera={handleToggleScanner}
diff --git a/suite-native/module-accounts-import/src/useShowImportError.ts b/suite-native/module-accounts-import/src/useShowImportError.ts
index 0d4ec4e0d57..0f7ce4e1272 100644
--- a/suite-native/module-accounts-import/src/useShowImportError.ts
+++ b/suite-native/module-accounts-import/src/useShowImportError.ts
@@ -9,7 +9,7 @@ import {
     RootStackRoutes,
     StackToStackCompositeNavigationProps,
 } from '@suite-native/navigation';
-import { IconName } from '@suite-common/icons-deprecated';
+import { IconName } from '@suite-native/icons';
 import { PictogramVariant } from '@suite-native/atoms';
 
 type AlertError = 'invalidXpub' | 'invalidReceiveAddress' | 'networkError' | 'unknownError';
@@ -23,22 +23,22 @@ const alertErrorMap: Record<AlertError, AlertErrorOptions> = {
     invalidXpub: {
         title: 'Invalid Public address (XPUB)',
         description: 'Check and correct the public address (XPUB).',
-        icon: 'warningTriangleLight',
+        icon: 'warning',
     },
     invalidReceiveAddress: {
         title: 'Receive address invalid',
         description: 'Check and correct the receive address.',
-        icon: 'warningTriangleLight',
+        icon: 'warning',
     },
     networkError: {
         title: 'Network error',
-        icon: 'noConnection',
+        icon: 'wifiX',
         description:
             'We were unable to retrieve the data from the blockchain due to a network error.',
     },
     unknownError: {
         title: 'Something went wrong',
-        icon: 'warningTriangleLight',
+        icon: 'warning',
         description: 'We are unable to gather the data right now. Please try again.',
     },
 };
diff --git a/suite-native/module-accounts-import/tsconfig.json b/suite-native/module-accounts-import/tsconfig.json
index 9b132797eab..21678864710 100644
--- a/suite-native/module-accounts-import/tsconfig.json
+++ b/suite-native/module-accounts-import/tsconfig.json
@@ -2,9 +2,6 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/redux-utils"
         },
@@ -34,10 +31,11 @@
         { "path": "../analytics" },
         { "path": "../atoms" },
         { "path": "../config" },
+        { "path": "../discovery" },
         { "path": "../feature-flags" },
         { "path": "../formatters" },
         { "path": "../forms" },
-        { "path": "../helpers" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../navigation" },
         { "path": "../qr-code" },
diff --git a/suite-native/module-accounts-management/package.json b/suite-native/module-accounts-management/package.json
index a65dc61ebf7..4bd46e9514d 100644
--- a/suite-native/module-accounts-management/package.json
+++ b/suite-native/module-accounts-management/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -17,7 +16,6 @@
         "@reduxjs/toolkit": "1.9.5",
         "@suite-common/fiat-services": "workspace:*",
         "@suite-common/graph": "workspace:*",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
         "@suite-common/wallet-core": "workspace:*",
         "@suite-common/wallet-types": "workspace:*",
@@ -31,6 +29,7 @@
         "@suite-native/formatters": "workspace:*",
         "@suite-native/forms": "workspace:*",
         "@suite-native/graph": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/navigation": "workspace:*",
         "@suite-native/qr-code": "workspace:*",
@@ -41,9 +40,9 @@
         "date-fns": "^2.30.0",
         "jotai": "1.9.1",
         "react": "18.2.0",
-        "react-hook-form": "^7.53.0",
+        "react-hook-form": "^7.53.1",
         "react-native": "0.75.2",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-redux": "8.0.7"
     }
 }
diff --git a/suite-native/module-accounts-management/src/components/AccountDetailCryptoValue.tsx b/suite-native/module-accounts-management/src/components/AccountDetailCryptoValue.tsx
index 87e363aee36..1e93d7ae867 100644
--- a/suite-native/module-accounts-management/src/components/AccountDetailCryptoValue.tsx
+++ b/suite-native/module-accounts-management/src/components/AccountDetailCryptoValue.tsx
@@ -1,8 +1,8 @@
 import { memo } from 'react';
 
 import { HStack } from '@suite-native/atoms';
-import { CryptoAmountFormatter, EthereumTokenAmountFormatter } from '@suite-native/formatters';
-import { CryptoIcon } from '@suite-common/icons-deprecated';
+import { CryptoAmountFormatter, TokenAmountFormatter } from '@suite-native/formatters';
+import { CryptoIcon } from '@suite-native/icons';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { TokenAddress, TokenSymbol } from '@suite-common/wallet-types';
 
@@ -23,14 +23,10 @@ export const AccountDetailCryptoValue = memo(
         isBalance = true,
     }: AccountDetailBalanceProps) => (
         <HStack spacing="sp8" flexDirection="row" alignItems="center" justifyContent="center">
-            <CryptoIcon symbol={tokenAddress || networkSymbol} size="extraSmall" />
+            <CryptoIcon symbol={networkSymbol} contractAddress={tokenAddress} size="extraSmall" />
 
             {tokenSymbol ? (
-                <EthereumTokenAmountFormatter
-                    value={value}
-                    symbol={tokenSymbol}
-                    adjustsFontSizeToFit
-                />
+                <TokenAmountFormatter value={value} symbol={tokenSymbol} adjustsFontSizeToFit />
             ) : (
                 <CryptoAmountFormatter
                     value={value}
diff --git a/suite-native/module-accounts-management/src/components/AccountDetailGraphHeader.tsx b/suite-native/module-accounts-management/src/components/AccountDetailGraphHeader.tsx
index 68ca4fa0248..b32ca974176 100644
--- a/suite-native/module-accounts-management/src/components/AccountDetailGraphHeader.tsx
+++ b/suite-native/module-accounts-management/src/components/AccountDetailGraphHeader.tsx
@@ -7,7 +7,7 @@ import { NetworkSymbol } from '@suite-common/wallet-config';
 import { AccountsRootState, selectAccountByKey } from '@suite-common/wallet-core';
 import { AccountKey, TokenAddress, TokenSymbol } from '@suite-common/wallet-types';
 import { DiscreetTextTrigger, VStack } from '@suite-native/atoms';
-import { selectAccountTokenSymbol } from '@suite-native/tokens';
+import { selectAccountTokenSymbol, TokensRootState } from '@suite-native/tokens';
 import { GraphFiatBalance } from '@suite-native/graph';
 
 import { AccountDetailCryptoValue } from './AccountDetailCryptoValue';
@@ -51,7 +51,7 @@ export const AccountDetailGraphHeader = ({ accountKey, tokenAddress }: AccountBa
     const account = useSelector((state: AccountsRootState) =>
         selectAccountByKey(state, accountKey),
     );
-    const tokenSymbol = useSelector((state: AccountsRootState) =>
+    const tokenSymbol = useSelector((state: TokensRootState) =>
         selectAccountTokenSymbol(state, accountKey, tokenAddress),
     );
     const setPoint = useSetAtom(selectedPointAtom);
diff --git a/suite-native/module-accounts-management/src/components/AccountDetailScreenHeader.tsx b/suite-native/module-accounts-management/src/components/AccountDetailScreenHeader.tsx
index 1693ef54cf7..71ee96953f4 100644
--- a/suite-native/module-accounts-management/src/components/AccountDetailScreenHeader.tsx
+++ b/suite-native/module-accounts-management/src/components/AccountDetailScreenHeader.tsx
@@ -37,12 +37,13 @@ export const AccountDetailScreenHeader = ({
 
     return (
         <ScreenSubHeader
+            customHorizontalPadding="sp16"
             content={accountLabel}
             rightIcon={
                 <IconButton
                     colorScheme="tertiaryElevation0"
                     size="medium"
-                    iconName="settings"
+                    iconName="gear"
                     onPress={handleSettingsNavigation}
                     testID="@account-detail/settings-button"
                 />
diff --git a/suite-native/module-accounts-management/src/components/AccountRenameButton.tsx b/suite-native/module-accounts-management/src/components/AccountRenameButton.tsx
index f144e3f8129..fccebcf9df8 100644
--- a/suite-native/module-accounts-management/src/components/AccountRenameButton.tsx
+++ b/suite-native/module-accounts-management/src/components/AccountRenameButton.tsx
@@ -18,7 +18,7 @@ export const AccountRenameButton = ({ accountKey }: AccountRenameModalProps) =>
         <Box>
             <IconButton
                 colorScheme="tertiaryElevation0"
-                iconName="pencil"
+                iconName="pencilSimple"
                 onPress={handleOpen}
                 testID="@account-detail/settings/edit-button"
             />
diff --git a/suite-native/module-accounts-management/src/components/CoinPriceCard.tsx b/suite-native/module-accounts-management/src/components/CoinPriceCard.tsx
index ffcf015c298..6dc9c96d4ca 100644
--- a/suite-native/module-accounts-management/src/components/CoinPriceCard.tsx
+++ b/suite-native/module-accounts-management/src/components/CoinPriceCard.tsx
@@ -21,9 +21,10 @@ const cardStyle = prepareNativeStyle(utils => ({
     flexDirection: 'row',
     justifyContent: 'space-between',
     alignItem: 'center',
+    marginHorizontal: utils.spacings.sp16,
     padding: utils.spacings.sp16,
     backgroundColor: utils.colors.backgroundSurfaceElevation1,
-    borderRadius: utils.borders.radii.medium,
+    borderRadius: utils.borders.radii.r16,
 }));
 
 const cardContentStyle = prepareNativeStyle(_ => ({
@@ -87,7 +88,7 @@ export const CoinPriceCard = ({ accountKey }: CoinPriceCardProps) => {
         <Card style={applyStyle(cardStyle)}>
             <Box flexDirection="row" alignItems="center" flex={1}>
                 <Box marginRight="sp16">
-                    <RoundedIcon name={networkSymbol} />
+                    <RoundedIcon networkSymbol={networkSymbol} />
                 </Box>
                 <Box style={applyStyle(cardContentStyle)}>
                     <Text variant="label" color="textSubdued">
diff --git a/suite-native/module-accounts-management/src/components/IncludeTokensToggle.tsx b/suite-native/module-accounts-management/src/components/IncludeTokensToggle.tsx
index a0ca34467df..eb000982e5d 100644
--- a/suite-native/module-accounts-management/src/components/IncludeTokensToggle.tsx
+++ b/suite-native/module-accounts-management/src/components/IncludeTokensToggle.tsx
@@ -1,31 +1,47 @@
 import Animated, { FadeIn } from 'react-native-reanimated';
 
 import { AlertBox, Box, Toggle, VStack } from '@suite-native/atoms';
+import { getNetwork, NetworkSymbol } from '@suite-common/wallet-config';
+import { Translation } from '@suite-native/intl';
 
 type IncludeTokensToggleProps = {
+    networkSymbol: NetworkSymbol;
     isToggled: boolean;
     onToggle: () => void;
 };
 
-export const IncludeTokensToggle = ({ isToggled, onToggle }: IncludeTokensToggleProps) => (
-    <VStack spacing="sp24" marginTop="sp8">
-        <Box marginHorizontal="sp24">
-            <Toggle
-                leftLabel="Ethereum"
-                rightLabel="Include tokens"
-                isToggled={isToggled}
-                onToggle={onToggle}
-            />
-        </Box>
-        {isToggled && (
-            <Animated.View entering={FadeIn}>
-                <Box marginHorizontal="sp8">
-                    <AlertBox
-                        variant="info"
-                        title="Note, your Ethereum balance doesn’t include tokens."
-                    />
-                </Box>
-            </Animated.View>
-        )}
-    </VStack>
-);
+export const IncludeTokensToggle = ({
+    networkSymbol,
+    isToggled,
+    onToggle,
+}: IncludeTokensToggleProps) => {
+    const networkName = getNetwork(networkSymbol).name;
+
+    return (
+        <VStack spacing="sp24" marginTop="sp8">
+            <Box marginHorizontal="sp16">
+                <Toggle
+                    leftLabel={networkName}
+                    rightLabel={<Translation id="transactions.tokens.toggleTokens" />}
+                    isToggled={isToggled}
+                    onToggle={onToggle}
+                />
+            </Box>
+            {isToggled && (
+                <Animated.View entering={FadeIn}>
+                    <Box marginHorizontal="sp16">
+                        <AlertBox
+                            variant="info"
+                            title={
+                                <Translation
+                                    id="transactions.tokens.title"
+                                    values={{ networkName }}
+                                />
+                            }
+                        />
+                    </Box>
+                </Animated.View>
+            )}
+        </VStack>
+    );
+};
diff --git a/suite-native/module-accounts-management/src/components/TokenAccountDetailScreenSubHeader.tsx b/suite-native/module-accounts-management/src/components/TokenAccountDetailScreenSubHeader.tsx
index 6b95c039ccb..9f5dbcc6e0e 100644
--- a/suite-native/module-accounts-management/src/components/TokenAccountDetailScreenSubHeader.tsx
+++ b/suite-native/module-accounts-management/src/components/TokenAccountDetailScreenSubHeader.tsx
@@ -9,8 +9,12 @@ import {
     ScreenSubHeader,
     GoBackIcon,
 } from '@suite-native/navigation';
-import { AccountsRootState, selectAccountLabel } from '@suite-common/wallet-core';
-import { CryptoIcon } from '@suite-common/icons-deprecated';
+import {
+    AccountsRootState,
+    selectAccountLabel,
+    selectAccountNetworkSymbol,
+} from '@suite-common/wallet-core';
+import { CryptoIcon } from '@suite-native/icons';
 import { useTranslate } from '@suite-native/intl';
 
 type TokenAccountDetailScreenHeaderProps = {
@@ -26,6 +30,9 @@ export const TokenAccountDetailScreenSubHeader = ({
     const accountLabel = useSelector((state: AccountsRootState) =>
         selectAccountLabel(state, accountKey),
     );
+    const networkSymbol = useSelector((state: AccountsRootState) =>
+        selectAccountNetworkSymbol(state, accountKey),
+    )!;
     const route = useRoute<RouteProp<RootStackParamList, RootStackRoutes.AccountDetail>>();
     const { closeActionType } = route.params;
 
@@ -37,7 +44,7 @@ export const TokenAccountDetailScreenSubHeader = ({
                         {tokenName}
                     </Text>
                     <HStack spacing="sp4" alignItems="center">
-                        <CryptoIcon symbol="eth" size="extraSmall" />
+                        <CryptoIcon symbol={networkSymbol} size="extraSmall" />
                         <Text
                             variant="label"
                             color="textSubdued"
diff --git a/suite-native/module-accounts-management/src/components/TransactionListHeader.tsx b/suite-native/module-accounts-management/src/components/TransactionListHeader.tsx
index 64fbf734d4b..86d459cc944 100644
--- a/suite-native/module-accounts-management/src/components/TransactionListHeader.tsx
+++ b/suite-native/module-accounts-management/src/components/TransactionListHeader.tsx
@@ -20,14 +20,14 @@ import {
     TabToStackCompositeNavigationProp,
 } from '@suite-native/navigation';
 import { Translation } from '@suite-native/intl';
-import { FeatureFlag, useFeatureFlag } from '@suite-native/feature-flags';
-import { NetworkSymbol } from '@suite-common/wallet-config';
+import { FeatureFlag, FeatureFlagsRootState, useFeatureFlag } from '@suite-native/feature-flags';
 import { isCoinWithTokens } from '@suite-native/tokens';
 
 import { AccountDetailGraph } from './AccountDetailGraph';
 import { AccountDetailCryptoValue } from './AccountDetailCryptoValue';
 import { IncludeTokensToggle } from './IncludeTokensToggle';
 import { CoinPriceCard } from './CoinPriceCard';
+import { selectIsNetworkSendFlowEnabled } from '../selectors';
 
 type AccountDetailHeaderProps = {
     accountKey: AccountKey;
@@ -47,8 +47,6 @@ type AccountsNavigationProps = TabToStackCompositeNavigationProp<
     RootStackParamList
 >;
 
-const SEND_NETWORK_WHITELIST: Readonly<NetworkSymbol[]> = ['btc', 'test', 'regtest'];
-
 const TransactionListHeaderContent = ({
     accountKey,
     tokenContract,
@@ -99,17 +97,21 @@ export const TransactionListHeader = memo(
         tokenContract,
     }: AccountDetailHeaderProps) => {
         const navigation = useNavigation<AccountsNavigationProps>();
-        const [isSendEnabled] = useFeatureFlag(FeatureFlag.IsSendEnabled);
+        const [isDeviceConnectEnabled] = useFeatureFlag(FeatureFlag.IsDeviceConnectEnabled);
 
         const account = useSelector((state: AccountsRootState) =>
             selectAccountByKey(state, accountKey),
         );
+
         const accountHasTransactions = useSelector((state: AccountsRootState) =>
             selectHasAccountTransactions(state, accountKey),
         );
         const isTestnetAccount = useSelector((state: AccountsRootState) =>
             selectIsTestnetAccount(state, accountKey),
         );
+        const isNetworkSendFlowEnabled = useSelector((state: FeatureFlagsRootState) =>
+            selectIsNetworkSendFlowEnabled(state, account?.symbol),
+        );
         const isPortfolioTrackerDevice = useSelector(selectIsPortfolioTrackerDevice);
 
         if (!account) return null;
@@ -127,6 +129,7 @@ export const TransactionListHeader = memo(
                 screen: SendStackRoutes.SendOutputs,
                 params: {
                     accountKey,
+                    tokenContract,
                 },
             });
         };
@@ -136,9 +139,7 @@ export const TransactionListHeader = memo(
         const isPriceCardDisplayed = !isTestnetAccount && !isTokenDetail;
 
         const isSendButtonDisplayed =
-            isSendEnabled &&
-            SEND_NETWORK_WHITELIST.includes(account.symbol) &&
-            !isPortfolioTrackerDevice;
+            isDeviceConnectEnabled && isNetworkSendFlowEnabled && !isPortfolioTrackerDevice;
 
         return (
             <Box marginBottom="sp8">
@@ -150,13 +151,23 @@ export const TransactionListHeader = memo(
                     {accountHasTransactions && (
                         <HStack marginVertical="sp16" paddingHorizontal="sp16" flex={1}>
                             <Box flex={1}>
-                                <Button viewLeft="receive" size="large" onPress={handleReceive}>
+                                <Button
+                                    viewLeft="arrowLineDown"
+                                    size="large"
+                                    onPress={handleReceive}
+                                    testID="@account-detail/receive-button"
+                                >
                                     <Translation id="transactions.receive" />
                                 </Button>
                             </Box>
                             {isSendButtonDisplayed && (
                                 <Box flex={1}>
-                                    <Button viewLeft="send" size="large" onPress={handleSend}>
+                                    <Button
+                                        viewLeft="arrowLineUp"
+                                        size="large"
+                                        onPress={handleSend}
+                                        testID="@account-detail/send-button"
+                                    >
                                         <Translation id="transactions.send" />
                                     </Button>
                                 </Box>
@@ -183,6 +194,7 @@ export const TransactionListHeader = memo(
 
                 {canHaveTokens && accountHasTransactions && (
                     <IncludeTokensToggle
+                        networkSymbol={account.symbol}
                         isToggled={areTokensIncluded}
                         onToggle={toggleIncludeTokenTransactions}
                     />
diff --git a/suite-native/module-accounts-management/src/screens/AccountDetailContentScreen.tsx b/suite-native/module-accounts-management/src/screens/AccountDetailContentScreen.tsx
index 8eae6d7805c..fcb1d7da806 100644
--- a/suite-native/module-accounts-management/src/screens/AccountDetailContentScreen.tsx
+++ b/suite-native/module-accounts-management/src/screens/AccountDetailContentScreen.tsx
@@ -8,7 +8,7 @@ import {
 } from '@suite-common/wallet-core';
 import { TokenAddress } from '@suite-common/wallet-types';
 import { EventType, analytics } from '@suite-native/analytics';
-import { selectAccountTokenInfo } from '@suite-native/tokens';
+import { selectAccountTokenInfo, TokensRootState } from '@suite-native/tokens';
 import { Screen } from '@suite-native/navigation';
 import { TransactionList } from '@suite-native/transactions';
 
@@ -33,7 +33,7 @@ export const AccountDetailContentScreen = ({
         selectAccountLabel(state, accountKey),
     );
 
-    const token = useSelector((state: AccountsRootState) =>
+    const token = useSelector((state: TokensRootState) =>
         selectAccountTokenInfo(state, accountKey, tokenContract),
     );
 
diff --git a/suite-native/module-accounts-management/src/screens/AccountSettingsScreen.tsx b/suite-native/module-accounts-management/src/screens/AccountSettingsScreen.tsx
index 9e84310708a..c2fd7a3ff26 100644
--- a/suite-native/module-accounts-management/src/screens/AccountSettingsScreen.tsx
+++ b/suite-native/module-accounts-management/src/screens/AccountSettingsScreen.tsx
@@ -17,7 +17,7 @@ import {
     selectFormattedAccountType,
     selectIsPortfolioTrackerDevice,
 } from '@suite-common/wallet-core';
-import { CryptoIcon } from '@suite-common/icons-deprecated';
+import { CryptoIcon } from '@suite-native/icons';
 
 import { AccountRenameButton } from '../components/AccountRenameButton';
 import { AccountSettingsShowXpubButton } from '../components/AccountSettingsShowXpubButton';
@@ -67,8 +67,10 @@ export const AccountSettingsScreen = ({
 
     return (
         <Screen
+            customHorizontalPadding="sp16"
             screenHeader={
                 <ScreenSubHeader
+                    customHorizontalPadding="sp16"
                     content={accountLabel}
                     rightIcon={<AccountRenameButton accountKey={accountKey} />}
                 />
@@ -87,7 +89,7 @@ export const AccountSettingsScreen = ({
                         )}
                     </VStack>
                 </Card>
-                <VStack marginHorizontal="sp16" spacing="sp16">
+                <VStack spacing="sp16">
                     <AccountSettingsShowXpubButton accountKey={account.key} />
                     {isPortfolioTrackerDevice && (
                         <AccountSettingsRemoveCoinButton accountKey={account.key} />
diff --git a/suite-native/module-accounts-management/src/screens/AccountsScreen/AccountsScreen.tsx b/suite-native/module-accounts-management/src/screens/AccountsScreen/AccountsScreen.tsx
index f3da492a200..38c13099c12 100644
--- a/suite-native/module-accounts-management/src/screens/AccountsScreen/AccountsScreen.tsx
+++ b/suite-native/module-accounts-management/src/screens/AccountsScreen/AccountsScreen.tsx
@@ -21,7 +21,14 @@ export const AccountsScreen = () => {
 
     const [accountsFilterValue, setAccountsFilterValue] = useState<string>('');
 
-    const handleSelectAccount: OnSelectAccount = ({ account, tokenAddress }) => {
+    const handleSelectAccount: OnSelectAccount = ({ account, tokenAddress, isStaking }) => {
+        if (isStaking) {
+            navigation.navigate(RootStackRoutes.StakingDetail, {
+                accountKey: account.key,
+            });
+
+            return;
+        }
         navigation.navigate(RootStackRoutes.AccountDetail, {
             accountKey: account.key,
             tokenContract: tokenAddress,
@@ -35,6 +42,7 @@ export const AccountsScreen = () => {
 
     return (
         <Screen
+            customHorizontalPadding="sp16"
             screenHeader={<DeviceManagerScreenHeader />}
             subheader={
                 <SearchableAccountsListScreenHeader
diff --git a/suite-native/module-accounts-management/src/selectors.ts b/suite-native/module-accounts-management/src/selectors.ts
new file mode 100644
index 00000000000..8aa4667f16f
--- /dev/null
+++ b/suite-native/module-accounts-management/src/selectors.ts
@@ -0,0 +1,41 @@
+import { D, pipe } from '@mobily/ts-belt';
+
+import { NetworkSymbol, getNetworkType, networks } from '@suite-common/wallet-config';
+import {
+    FeatureFlagsRootState,
+    selectIsFeatureFlagEnabled,
+    FeatureFlag,
+} from '@suite-native/feature-flags';
+
+const PRODUCTION_SEND_COINS_WHITELIST = pipe(
+    networks,
+    D.filter(network => network.networkType === 'bitcoin' || network.networkType === 'ethereum'),
+    D.keys,
+);
+
+export const selectIsNetworkSendFlowEnabled = (
+    state: FeatureFlagsRootState,
+    networkSymbol?: NetworkSymbol,
+) => {
+    if (!networkSymbol) return false;
+    const networkType = getNetworkType(networkSymbol);
+
+    if (PRODUCTION_SEND_COINS_WHITELIST.includes(networkSymbol)) return true;
+
+    const isRippleSendEnabled = selectIsFeatureFlagEnabled(state, FeatureFlag.IsRippleSendEnabled);
+
+    if (isRippleSendEnabled && networkType === 'ripple') return true;
+
+    const isCardanoSendEnabled = selectIsFeatureFlagEnabled(
+        state,
+        FeatureFlag.IsCardanoSendEnabled,
+    );
+
+    if (isCardanoSendEnabled && networkType === 'cardano') return true;
+
+    const isSolanaSendEnabled = selectIsFeatureFlagEnabled(state, FeatureFlag.IsSolanaSendEnabled);
+
+    if (isSolanaSendEnabled && networkType === 'solana') return true;
+
+    return false;
+};
diff --git a/suite-native/module-accounts-management/tsconfig.json b/suite-native/module-accounts-management/tsconfig.json
index 14f604a392a..9f840ca7399 100644
--- a/suite-native/module-accounts-management/tsconfig.json
+++ b/suite-native/module-accounts-management/tsconfig.json
@@ -6,9 +6,6 @@
             "path": "../../suite-common/fiat-services"
         },
         { "path": "../../suite-common/graph" },
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/wallet-config"
         },
@@ -30,6 +27,7 @@
         { "path": "../formatters" },
         { "path": "../forms" },
         { "path": "../graph" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../navigation" },
         { "path": "../qr-code" },
diff --git a/suite-native/module-add-accounts/package.json b/suite-native/module-add-accounts/package.json
index 3cb7605428d..703aa1374f0 100644
--- a/suite-native/module-add-accounts/package.json
+++ b/suite-native/module-add-accounts/package.json
@@ -7,7 +7,6 @@
     "type": "module",
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-native/module-add-accounts/src/hooks/useAddCoinAccount.ts b/suite-native/module-add-accounts/src/hooks/useAddCoinAccount.ts
index bf2c5bfad58..f1a8fbcb4f2 100644
--- a/suite-native/module-add-accounts/src/hooks/useAddCoinAccount.ts
+++ b/suite-native/module-add-accounts/src/hooks/useAddCoinAccount.ts
@@ -111,7 +111,7 @@ export const useAddCoinAccount = () => {
             availableTypes.set(symbol as NetworkSymbol, [
                 NORMAL_ACCOUNT_TYPE,
                 // For Cardano and EVMs allow only normal account type
-                ...(['ada', 'eth', 'pol', 'bnb'].includes(symbol) ? [] : types),
+                ...(['ada', 'eth', 'pol', 'bnb', 'sol', 'op'].includes(symbol) ? [] : types),
             ]);
         });
 
@@ -260,7 +260,7 @@ export const useAddCoinAccount = () => {
             addAndDiscoverNetworkAccountThunk({
                 network,
                 accountType,
-                deviceState: device.state,
+                deviceState: device.state.staticSessionId!,
             }),
         );
 
diff --git a/suite-native/module-add-accounts/src/hooks/useAddCoinAccountAlerts.ts b/suite-native/module-add-accounts/src/hooks/useAddCoinAccountAlerts.ts
index e4d0deb52d1..b629e7f53c2 100644
--- a/suite-native/module-add-accounts/src/hooks/useAddCoinAccountAlerts.ts
+++ b/suite-native/module-add-accounts/src/hooks/useAddCoinAccountAlerts.ts
@@ -11,7 +11,7 @@ export const useAddCoinAccountAlerts = () => {
         showAlert({
             title: translate('moduleAddAccounts.alerts.tooManyAccounts.title'),
             description: translate('moduleAddAccounts.alerts.tooManyAccounts.description'),
-            icon: 'warningCircleLight',
+            icon: 'warning',
             pictogramVariant: 'red',
             primaryButtonTitle: translate('moduleAddAccounts.alerts.tooManyAccounts.actionPrimary'),
             onPressPrimaryButton: hideAlert,
@@ -21,7 +21,7 @@ export const useAddCoinAccountAlerts = () => {
         showAlert({
             title: translate('moduleAddAccounts.alerts.anotherEmptyAccount.title'),
             description: translate('moduleAddAccounts.alerts.anotherEmptyAccount.description'),
-            icon: 'warningCircleLight',
+            icon: 'warning',
             pictogramVariant: 'red',
             primaryButtonTitle: translate(
                 'moduleAddAccounts.alerts.anotherEmptyAccount.actionPrimary',
@@ -42,7 +42,7 @@ export const useAddCoinAccountAlerts = () => {
         showAlert({
             title: translate('moduleAddAccounts.alerts.generalError.title'),
             description: translate('moduleAddAccounts.alerts.generalError.description'),
-            icon: 'warningCircleLight',
+            icon: 'warning',
             pictogramVariant: 'red',
             primaryButtonTitle: translate('moduleAddAccounts.alerts.generalError.actionPrimary'),
             onPressPrimaryButton: hideAlert,
diff --git a/suite-native/module-add-accounts/src/screens/SelectAccountTypeScreen.tsx b/suite-native/module-add-accounts/src/screens/SelectAccountTypeScreen.tsx
index 538d967c78b..7871ae9632d 100644
--- a/suite-native/module-add-accounts/src/screens/SelectAccountTypeScreen.tsx
+++ b/suite-native/module-add-accounts/src/screens/SelectAccountTypeScreen.tsx
@@ -79,7 +79,7 @@ const aboutStyle = prepareNativeStyle((utils, { bottomInset }: { bottomInset: nu
     paddingBottom: EXTRA_BOTTOM_PADDING + GRADIENT_HEIGHT + bottomInset,
     width: '100%',
     paddingHorizontal: utils.spacings.sp8,
-    gap: 12,
+    gap: utils.spacings.sp12,
 }));
 
 export const SelectAccountTypeScreen = ({
@@ -116,7 +116,7 @@ export const SelectAccountTypeScreen = ({
                         })}
                         leftIcon={
                             <IconButton
-                                iconName="close"
+                                iconName="x"
                                 onPress={handleClose}
                                 colorScheme="tertiaryElevation0"
                                 size="medium"
diff --git a/suite-native/module-authorize-device/package.json b/suite-native/module-authorize-device/package.json
index 1533a55799b..6d0e3d850c0 100644
--- a/suite-native/module-authorize-device/package.json
+++ b/suite-native/module-authorize-device/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -14,7 +13,6 @@
         "@react-navigation/native": "6.1.18",
         "@react-navigation/native-stack": "6.11.0",
         "@reduxjs/toolkit": "1.9.5",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/validators": "workspace:*",
         "@suite-common/wallet-core": "workspace:*",
         "@suite-native/alerts": "workspace:*",
@@ -25,6 +23,7 @@
         "@suite-native/device-mutex": "workspace:*",
         "@suite-native/discovery": "workspace:*",
         "@suite-native/forms": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/link": "workspace:*",
         "@suite-native/module-connect-popup": "workspace:*",
@@ -32,10 +31,11 @@
         "@suite-native/theme": "workspace:*",
         "@suite-native/toasts": "workspace:*",
         "@trezor/connect": "workspace:*",
+        "@trezor/env-utils": "workspace:*",
         "@trezor/styles": "workspace:*",
         "react": "18.2.0",
         "react-native": "0.75.2",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-native-svg": "15.6.0",
         "react-redux": "8.0.7"
     }
diff --git a/suite-native/module-authorize-device/src/assets/connect/pin-t3w1.png b/suite-native/module-authorize-device/src/assets/connect/pin-t3w1.png
new file mode 100644
index 00000000000..be6a107badb
Binary files /dev/null and b/suite-native/module-authorize-device/src/assets/connect/pin-t3w1.png differ
diff --git a/suite-native/module-authorize-device/src/components/connect/ConnectDeviceScreenHeader.tsx b/suite-native/module-authorize-device/src/components/connect/ConnectDeviceScreenHeader.tsx
index e4b461366de..74f7f716069 100644
--- a/suite-native/module-authorize-device/src/components/connect/ConnectDeviceScreenHeader.tsx
+++ b/suite-native/module-authorize-device/src/components/connect/ConnectDeviceScreenHeader.tsx
@@ -12,7 +12,7 @@ import {
     RootStackParamList,
     StackToTabCompositeProps,
 } from '@suite-native/navigation';
-import { Box, IconButton, ScreenHeaderWrapper } from '@suite-native/atoms';
+import { IconButton, ScreenHeaderWrapper } from '@suite-native/atoms';
 import { useAlert } from '@suite-native/alerts';
 import { Translation } from '@suite-native/intl';
 import { selectHasDeviceDiscovery } from '@suite-common/wallet-core';
@@ -55,7 +55,7 @@ export const ConnectDeviceScreenHeader = ({
                 description: (
                     <Translation id="moduleConnectDevice.pinCanceledDuringDiscovery.subtitle" />
                 ),
-                icon: 'warningCircleLight',
+                icon: 'warningCircle',
                 pictogramVariant: 'red',
                 primaryButtonTitle: (
                     <Translation id="moduleConnectDevice.pinCanceledDuringDiscovery.button" />
@@ -113,18 +113,16 @@ export const ConnectDeviceScreenHeader = ({
 
     return (
         <ScreenHeaderWrapper>
-            <Box>
-                {shouldDisplayCancelButton && (
-                    <IconButton
-                        iconName="close"
-                        size="medium"
-                        colorScheme="tertiaryElevation1"
-                        accessibilityRole="button"
-                        accessibilityLabel="close"
-                        onPress={handleCancel}
-                    />
-                )}
-            </Box>
+            {shouldDisplayCancelButton && (
+                <IconButton
+                    iconName="x"
+                    size="medium"
+                    colorScheme="tertiaryElevation0"
+                    accessibilityRole="button"
+                    accessibilityLabel="close"
+                    onPress={handleCancel}
+                />
+            )}
             <ConnectingTrezorHelp />
         </ScreenHeaderWrapper>
     );
diff --git a/suite-native/module-authorize-device/src/components/connect/ConnectDeviceScreenView.tsx b/suite-native/module-authorize-device/src/components/connect/ConnectDeviceScreenView.tsx
index c4c51595486..86ecb123b8f 100644
--- a/suite-native/module-authorize-device/src/components/connect/ConnectDeviceScreenView.tsx
+++ b/suite-native/module-authorize-device/src/components/connect/ConnectDeviceScreenView.tsx
@@ -30,6 +30,7 @@ export const ConnectDeviceScreenView = ({
             }
             customHorizontalPadding={0}
             customVerticalPadding={0}
+            hasBottomInset={false}
         >
             <Box style={[applyStyle(contentStyle), style]}>{children}</Box>
         </Screen>
diff --git a/suite-native/module-authorize-device/src/components/connect/ConnectingTrezorHelp.tsx b/suite-native/module-authorize-device/src/components/connect/ConnectingTrezorHelp.tsx
index 966f65a8832..45c5ff51c10 100644
--- a/suite-native/module-authorize-device/src/components/connect/ConnectingTrezorHelp.tsx
+++ b/suite-native/module-authorize-device/src/components/connect/ConnectingTrezorHelp.tsx
@@ -39,7 +39,7 @@ export const ConnectingTrezorHelp = () => {
             <IconButton
                 size="medium"
                 colorScheme="tertiaryElevation1"
-                iconName="questionMark"
+                iconName="question"
                 onPress={toggleBottomSheet}
             />
             <BottomSheet
diff --git a/suite-native/module-authorize-device/src/components/connect/PinForm.tsx b/suite-native/module-authorize-device/src/components/connect/PinForm.tsx
deleted file mode 100644
index c05767e4429..00000000000
--- a/suite-native/module-authorize-device/src/components/connect/PinForm.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { Form, useForm } from '@suite-native/forms';
-import { Card, HStack, VStack, Box, Text, Loader } from '@suite-native/atoms';
-import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { Translation } from '@suite-native/intl';
-import { PinFormValues, pinFormSchema } from '@suite-common/validators';
-
-import { PinMatrixButton } from './PinMatrixButton';
-import { PinFormProgress } from './PinFormProgress';
-import { PinFormControlButtons } from './PinFormControlButtons';
-
-const pinMatrix = [
-    [7, 8, 9],
-    [4, 5, 6],
-    [1, 2, 3],
-];
-
-const MATRIX_MARGIN = 40;
-
-const cardStyle = prepareNativeStyle(utils => ({
-    marginBottom: utils.spacings.sp8,
-    padding: MATRIX_MARGIN,
-}));
-
-const pinProgressWrapperStyle = prepareNativeStyle(utils => ({
-    height: utils.spacings.sp32,
-    justifyContent: 'center',
-}));
-
-const loaderWrapperStyle = prepareNativeStyle(utils => ({
-    position: 'absolute',
-    width: '100%',
-    height: '100%',
-    margin: MATRIX_MARGIN,
-    paddingBottom: utils.spacings.sp32,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: utils.colors.backgroundSurfaceElevation1,
-}));
-
-export const PinForm = () => {
-    const { applyStyle } = useNativeStyles();
-    const form = useForm<PinFormValues>({
-        validation: pinFormSchema,
-
-        defaultValues: {
-            pin: '',
-        },
-    });
-
-    return (
-        <Form form={form}>
-            <VStack spacing="sp8" alignItems="center">
-                <Text color="textSubdued">
-                    <Translation id="moduleConnectDevice.pinScreen.form.keypadInfo" />
-                </Text>
-                <Box style={applyStyle(pinProgressWrapperStyle)}>
-                    <PinFormProgress />
-                </Box>
-            </VStack>
-            <Card style={applyStyle(cardStyle)}>
-                <VStack justifyContent="center" alignItems="center" spacing="sp24">
-                    {pinMatrix.map(pinRow => (
-                        <HStack key={pinRow.join('')} spacing="sp16">
-                            {pinRow.map(value => (
-                                <PinMatrixButton key={value} value={value} />
-                            ))}
-                        </HStack>
-                    ))}
-                </VStack>
-                <PinFormControlButtons />
-                {form.formState.isSubmitted && (
-                    <VStack style={applyStyle(loaderWrapperStyle)} spacing="sp16">
-                        <Loader size="large" />
-                        <Text variant="titleSmall">
-                            <Translation id="moduleConnectDevice.pinScreen.form.submitting" />
-                        </Text>
-                    </VStack>
-                )}
-            </Card>
-        </Form>
-    );
-};
diff --git a/suite-native/module-authorize-device/src/components/connect/PinFormControlButtons.tsx b/suite-native/module-authorize-device/src/components/connect/PinFormControlButtons.tsx
index c5e1f41201f..f99e8a9de2f 100644
--- a/suite-native/module-authorize-device/src/components/connect/PinFormControlButtons.tsx
+++ b/suite-native/module-authorize-device/src/components/connect/PinFormControlButtons.tsx
@@ -9,19 +9,11 @@ import Animated, {
     FadeOut,
 } from 'react-native-reanimated';
 
-import { useNavigation } from '@react-navigation/native';
-
 import { useNativeStyles, prepareNativeStyle } from '@trezor/styles';
 import { Box, Button, HStack, IconButton } from '@suite-native/atoms';
 import { useFormContext } from '@suite-native/forms';
 import { Translation } from '@suite-native/intl';
 import TrezorConnect, { UI, DEVICE } from '@trezor/connect';
-import {
-    AuthorizeDeviceStackParamList,
-    AuthorizeDeviceStackRoutes,
-    RootStackParamList,
-    StackToStackCompositeNavigationProps,
-} from '@suite-native/navigation';
 import { selectDeviceAuthFailed, authorizeDeviceThunk } from '@suite-common/wallet-core';
 import { useAlert } from '@suite-native/alerts';
 import { useOpenLink } from '@suite-native/link';
@@ -29,12 +21,6 @@ import { requestPrioritizedDeviceAccess } from '@suite-native/device-mutex';
 
 import { PIN_HELP_URL } from '../../constants/pinFormConstants';
 
-type NavigationProp = StackToStackCompositeNavigationProps<
-    AuthorizeDeviceStackParamList,
-    AuthorizeDeviceStackRoutes.PinMatrix,
-    RootStackParamList
->;
-
 const buttonsWrapperStyle = prepareNativeStyle(utils => ({
     position: 'absolute',
     width: '100%',
@@ -43,7 +29,11 @@ const buttonsWrapperStyle = prepareNativeStyle(utils => ({
 
 const ANIMATION_DURATION = 100;
 
-export const PinFormControlButtons = () => {
+type PinFormControlButtonsProps = {
+    onSuccess?: () => void;
+};
+
+export const PinFormControlButtons = ({ onSuccess }: PinFormControlButtonsProps) => {
     const [containerHeight, setContainerHeight] = useState(0);
     const animatedHeight = useSharedValue(0);
 
@@ -51,17 +41,14 @@ export const PinFormControlButtons = () => {
     const { applyStyle } = useNativeStyles();
 
     const openLink = useOpenLink();
-    const navigation = useNavigation<NavigationProp>();
     const { showAlert } = useAlert();
     const { handleSubmit, getValues, watch, setValue, reset } = useFormContext();
     const hasDeviceAuthFailed = useSelector(selectDeviceAuthFailed);
 
     const handleSuccess = useCallback(() => {
-        if (navigation.canGoBack()) {
-            navigation.goBack();
-        }
+        onSuccess?.();
         reset();
-    }, [navigation, reset]);
+    }, [onSuccess, reset]);
 
     const handleDeviceChange = useCallback(() => {
         if (hasDeviceAuthFailed) {
@@ -162,7 +149,7 @@ export const PinFormControlButtons = () => {
                         />
                         <Box flex={1}>
                             <Button onPress={onSubmit}>
-                                <Translation id="moduleConnectDevice.pinScreen.form.enterPin" />
+                                <Translation id="moduleConnectDevice.pinScreen.form.submitButton" />
                             </Button>
                         </Box>
                     </HStack>
diff --git a/suite-native/module-authorize-device/src/components/connect/PinFormProgress.tsx b/suite-native/module-authorize-device/src/components/connect/PinFormProgress.tsx
index 5baf6f926ef..c17b79761fa 100644
--- a/suite-native/module-authorize-device/src/components/connect/PinFormProgress.tsx
+++ b/suite-native/module-authorize-device/src/components/connect/PinFormProgress.tsx
@@ -1,3 +1,5 @@
+import { ReactNode } from 'react';
+
 import { Box, HStack, Text } from '@suite-native/atoms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { useFormContext } from '@suite-native/forms';
@@ -25,7 +27,11 @@ const enteredDigitsStyle = prepareNativeStyle(utils => ({
     paddingHorizontal: utils.spacings.sp16,
 }));
 
-export const PinFormProgress = () => {
+type PinFormProgressProps = {
+    title: ReactNode;
+};
+
+export const PinFormProgress = ({ title }: PinFormProgressProps) => {
     const { applyStyle } = useNativeStyles();
     const {
         watch,
@@ -35,11 +41,7 @@ export const PinFormProgress = () => {
     const pinLength = watch('pin').length;
 
     if (!pinLength) {
-        return (
-            <Text variant="titleSmall">
-                <Translation id="moduleConnectDevice.pinScreen.form.title" />
-            </Text>
-        );
+        return <Text variant="titleSmall">{title}</Text>;
     }
 
     if (pinLength > MAX_DIGITS_DISPLAYED_AS_DOTS) {
diff --git a/suite-native/module-authorize-device/src/components/connect/PinOnDevice.tsx b/suite-native/module-authorize-device/src/components/connect/PinOnDevice.tsx
index 50092edef5b..99fe25c7598 100644
--- a/suite-native/module-authorize-device/src/components/connect/PinOnDevice.tsx
+++ b/suite-native/module-authorize-device/src/components/connect/PinOnDevice.tsx
@@ -1,30 +1,24 @@
-import { useDispatch, useSelector } from 'react-redux';
-import { Dimensions } from 'react-native';
 import { useCallback, useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 
 import { useNavigation } from '@react-navigation/native';
 
-import { Image, Box, Text } from '@suite-native/atoms';
-import { DeviceModelInternal } from '@trezor/connect';
+import { Box, Image, Text } from '@suite-native/atoms';
 import {
-    selectDeviceRequestedPin,
-    selectDeviceRequestedPassphrase,
     cancelPassphraseAndSelectStandardDeviceThunk,
+    selectDeviceRequestedPassphrase,
+    selectDeviceRequestedPin,
     selectIsCreatingNewPassphraseWallet,
     selectPassphraseError,
 } from '@suite-native/device-authorization';
 import { Translation } from '@suite-native/intl';
+import { DeviceModelInternal } from '@trezor/connect';
+import { getScreenHeight } from '@trezor/env-utils';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
-const SCREEN_HEIGHT = Dimensions.get('screen').height;
+import { deviceImageMap } from '../../constants/deviceImageConstants';
 
-export const deviceImageMap: Record<DeviceModelInternal, string> = {
-    [DeviceModelInternal.T1B1]: require('../../assets/connect/pin-t1b1.png'),
-    [DeviceModelInternal.T2T1]: require('../../assets/connect/pin-t2t1.png'),
-    [DeviceModelInternal.T2B1]: require('../../assets/connect/pin-t3b1.png'),
-    [DeviceModelInternal.T3B1]: require('../../assets/connect/pin-t3b1.png'),
-    [DeviceModelInternal.T3T1]: require('../../assets/connect/pin-t3t1.png'),
-};
+const SCREEN_HEIGHT = getScreenHeight();
 
 const wrapperStyle = prepareNativeStyle(utils => ({
     flex: 1,
diff --git a/suite-native/module-authorize-device/src/components/connect/PinOnKeypad.tsx b/suite-native/module-authorize-device/src/components/connect/PinOnKeypad.tsx
new file mode 100644
index 00000000000..2a68cb2033b
--- /dev/null
+++ b/suite-native/module-authorize-device/src/components/connect/PinOnKeypad.tsx
@@ -0,0 +1,114 @@
+import { Form, useForm } from '@suite-native/forms';
+import { Card, HStack, VStack, Box, Text, Loader, Image } from '@suite-native/atoms';
+import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+import { Translation, TxKeyPath } from '@suite-native/intl';
+import { PinFormValues, pinFormSchema } from '@suite-common/validators';
+
+import { deviceImageMap } from '../../constants/deviceImageConstants';
+import { PinMatrixButton } from './PinMatrixButton';
+import { PinFormProgress } from './PinFormProgress';
+import { PinFormControlButtons } from './PinFormControlButtons';
+
+export type PinFormVariant = 'current' | 'new' | 'confirm';
+
+type PinOnKeypadProps = {
+    variant: PinFormVariant;
+    onSuccess?: () => void;
+};
+
+type PinFormTranslations = {
+    formTitle: TxKeyPath;
+    loaderText: TxKeyPath;
+};
+
+const translationsMap = {
+    current: {
+        formTitle: 'moduleConnectDevice.pinScreen.form.title.current',
+        loaderText: 'moduleConnectDevice.pinScreen.form.submitting',
+    },
+    new: {
+        formTitle: 'moduleConnectDevice.pinScreen.form.title.new',
+        loaderText: 'moduleConnectDevice.pinScreen.form.processing',
+    },
+    confirm: {
+        formTitle: 'moduleConnectDevice.pinScreen.form.title.confirm',
+        loaderText: 'moduleConnectDevice.pinScreen.form.processing',
+    },
+} as const satisfies Record<PinFormVariant, PinFormTranslations>;
+
+const pinMatrix = [
+    [7, 8, 9],
+    [4, 5, 6],
+    [1, 2, 3],
+];
+
+const MATRIX_MARGIN = 40;
+
+const cardStyle = prepareNativeStyle(utils => ({
+    marginBottom: utils.spacings.sp8,
+    padding: MATRIX_MARGIN,
+}));
+
+const pinProgressWrapperStyle = prepareNativeStyle(utils => ({
+    height: utils.spacings.sp32,
+    justifyContent: 'center',
+}));
+
+const loaderWrapperStyle = prepareNativeStyle(utils => ({
+    position: 'absolute',
+    width: '100%',
+    height: '100%',
+    margin: MATRIX_MARGIN,
+    paddingBottom: utils.spacings.sp32,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: utils.colors.backgroundSurfaceElevation1,
+}));
+
+export const PinOnKeypad = ({ variant, onSuccess }: PinOnKeypadProps) => {
+    const { applyStyle } = useNativeStyles();
+    const form = useForm<PinFormValues>({
+        validation: pinFormSchema,
+        defaultValues: {
+            pin: '',
+        },
+    });
+
+    const translations = translationsMap[variant];
+
+    return (
+        <VStack spacing="sp16" alignItems="center" flex={1} marginTop="sp24">
+            <Image source={deviceImageMap.T1B1} width={161} height={194} />
+            <Form form={form}>
+                <VStack spacing="sp8" alignItems="center">
+                    <Text color="textSubdued">
+                        <Translation id="moduleConnectDevice.pinScreen.form.keypadInfo" />
+                    </Text>
+                    <Box style={applyStyle(pinProgressWrapperStyle)}>
+                        <PinFormProgress title={<Translation id={translations.formTitle} />} />
+                    </Box>
+                </VStack>
+                <Card style={applyStyle(cardStyle)}>
+                    <VStack justifyContent="center" alignItems="center" spacing="sp24">
+                        {pinMatrix.map(pinRow => (
+                            <HStack key={pinRow.join('')} spacing="sp16">
+                                {pinRow.map(value => (
+                                    <PinMatrixButton key={value} value={value} />
+                                ))}
+                            </HStack>
+                        ))}
+                    </VStack>
+                    <PinFormControlButtons onSuccess={onSuccess} />
+                    {form.formState.isSubmitted && (
+                        <VStack style={applyStyle(loaderWrapperStyle)} spacing="sp16">
+                            <Loader size="large" />
+                            <Text variant="titleSmall">
+                                <Translation id={translations.loaderText} />
+                            </Text>
+                        </VStack>
+                    )}
+                </Card>
+            </Form>
+        </VStack>
+    );
+};
diff --git a/suite-native/module-authorize-device/src/components/passphrase/EmptyWalletInfoSheet.tsx b/suite-native/module-authorize-device/src/components/passphrase/EmptyWalletInfoSheet.tsx
index 7674cc4ac1e..951e1a580c7 100644
--- a/suite-native/module-authorize-device/src/components/passphrase/EmptyWalletInfoSheet.tsx
+++ b/suite-native/module-authorize-device/src/components/passphrase/EmptyWalletInfoSheet.tsx
@@ -70,7 +70,7 @@ export const EmptyWalletInfoSheet = ({ onClose, isVisible }: EmptyWalletInfoShee
             />
             <VStack alignItems="center" spacing="sp24" padding="sp8">
                 <BottomSheetListItem
-                    iconName="pencilUnderscored"
+                    iconName="pencilSimpleLine"
                     translationKey="modulePassphrase.emptyPassphraseWallet.confirmEmptyWalletSheet.list.backup"
                     iconSize="medium"
                     iconBackgroundColor="backgroundTertiaryDefaultOnElevation0"
@@ -84,7 +84,7 @@ export const EmptyWalletInfoSheet = ({ onClose, isVisible }: EmptyWalletInfoShee
                     iconBorderColor="borderElevation0"
                 />
                 <BottomSheetListItem
-                    iconName="eyeSlashLight"
+                    iconName="eyeSlash"
                     translationKey="modulePassphrase.emptyPassphraseWallet.confirmEmptyWalletSheet.list.neverShare"
                     iconSize="medium"
                     iconBackgroundColor="backgroundTertiaryDefaultOnElevation0"
diff --git a/suite-native/module-authorize-device/src/components/passphrase/EnterPassphraseOnTrezorButton.tsx b/suite-native/module-authorize-device/src/components/passphrase/EnterPassphraseOnTrezorButton.tsx
index 0b32befa3d3..8ac1a805b6d 100644
--- a/suite-native/module-authorize-device/src/components/passphrase/EnterPassphraseOnTrezorButton.tsx
+++ b/suite-native/module-authorize-device/src/components/passphrase/EnterPassphraseOnTrezorButton.tsx
@@ -3,7 +3,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { Button } from '@suite-native/atoms';
 import { onPassphraseSubmit, selectDeviceInternalModel } from '@suite-common/wallet-core';
 import { Translation } from '@suite-native/intl';
-import { DeviceModelIcon } from '@suite-common/icons-deprecated';
+import { DeviceModelIcon } from '@suite-native/icons';
 import { EventType, analytics } from '@suite-native/analytics';
 
 export const EnterPassphraseOnTrezorButton = () => {
diff --git a/suite-native/module-authorize-device/src/components/passphrase/NoPassphraseButton.tsx b/suite-native/module-authorize-device/src/components/passphrase/NoPassphraseButton.tsx
index e29083011f4..2dd3550e59f 100644
--- a/suite-native/module-authorize-device/src/components/passphrase/NoPassphraseButton.tsx
+++ b/suite-native/module-authorize-device/src/components/passphrase/NoPassphraseButton.tsx
@@ -1,19 +1,19 @@
 import { useDispatch, useSelector } from 'react-redux';
 
-import { Button } from '@suite-native/atoms';
 import { onPassphraseSubmit, selectDeviceInternalModel } from '@suite-common/wallet-core';
+import { Button } from '@suite-native/atoms';
 import { Translation } from '@suite-native/intl';
-import { useAuthorizationGoBack } from '@suite-native/device-authorization';
+import { useNavigateToInitialScreen } from '@suite-native/navigation';
 
 export const NoPassphraseButton = () => {
     const dispatch = useDispatch();
 
     const deviceModel = useSelector(selectDeviceInternalModel);
 
-    const { handleGoBack } = useAuthorizationGoBack();
+    const navigateToInitialScreen = useNavigateToInitialScreen();
     const handleSubmitOnDevice = () => {
         dispatch(onPassphraseSubmit({ value: '', passphraseOnDevice: false }));
-        handleGoBack();
+        navigateToInitialScreen();
     };
 
     if (!deviceModel) return null;
diff --git a/suite-native/module-authorize-device/src/components/passphrase/PassphraseForm.tsx b/suite-native/module-authorize-device/src/components/passphrase/PassphraseForm.tsx
index 9b9eb9e5669..4cf174d2b90 100644
--- a/suite-native/module-authorize-device/src/components/passphrase/PassphraseForm.tsx
+++ b/suite-native/module-authorize-device/src/components/passphrase/PassphraseForm.tsx
@@ -42,12 +42,6 @@ type PassphraseFormProps = {
     noPassphraseEnabled?: boolean;
 };
 
-const formStyle = prepareNativeStyle(utils => ({
-    backgroundColor: utils.colors.backgroundSurfaceElevation1,
-    borderRadius: utils.borders.radii.large,
-    gap: utils.spacings.sp16,
-}));
-
 const cardStyle = prepareNativeStyle(_ => ({
     padding: FORM_CARD_PADDING,
 }));
@@ -126,7 +120,7 @@ export const PassphraseForm = ({
         <Form form={form}>
             <View ref={formWrapperView}>
                 <Card style={applyStyle(cardStyle)}>
-                    <VStack style={applyStyle(formStyle)}>
+                    <VStack spacing="sp16">
                         <SecureTextInputField
                             label={inputLabel}
                             name="passphrase"
diff --git a/suite-native/module-authorize-device/src/components/passphrase/PassphraseScreenHeader.tsx b/suite-native/module-authorize-device/src/components/passphrase/PassphraseScreenHeader.tsx
index 7eb5289306c..f47cc84fc13 100644
--- a/suite-native/module-authorize-device/src/components/passphrase/PassphraseScreenHeader.tsx
+++ b/suite-native/module-authorize-device/src/components/passphrase/PassphraseScreenHeader.tsx
@@ -10,7 +10,6 @@ import TrezorConnect from '@trezor/connect';
 import {
     cancelPassphraseAndSelectStandardDeviceThunk,
     selectIsCreatingNewPassphraseWallet,
-    useAuthorizationGoBack,
 } from '@suite-native/device-authorization';
 import {
     RootStackRoutes,
@@ -20,6 +19,7 @@ import {
     AuthorizeDeviceStackRoutes,
     RootStackParamList,
     StackToTabCompositeProps,
+    useNavigateToInitialScreen,
 } from '@suite-native/navigation';
 import { useAlert } from '@suite-native/alerts';
 import { EventType, analytics } from '@suite-native/analytics';
@@ -40,7 +40,7 @@ export const PassphraseScreenHeader = () => {
 
     const isCreatingNewWalletInstance = useSelector(selectIsCreatingNewPassphraseWallet);
 
-    const { handleGoBack } = useAuthorizationGoBack();
+    const navigateToInitialScreen = useNavigateToInitialScreen();
 
     const handleClose = useCallback(() => {
         navigation.navigate(RootStackRoutes.AppTabs, {
@@ -74,9 +74,9 @@ export const PassphraseScreenHeader = () => {
             });
         } else {
             TrezorConnect.cancel();
-            handleGoBack();
+            navigateToInitialScreen();
         }
-    }, [handleClose, handleGoBack, isCreatingNewWalletInstance, showAlert]);
+    }, [handleClose, navigateToInitialScreen, isCreatingNewWalletInstance, showAlert]);
 
     useEffect(() => {
         const subscription = BackHandler.addEventListener('hardwareBackPress', () => {
@@ -91,7 +91,7 @@ export const PassphraseScreenHeader = () => {
     return (
         <ScreenHeaderWrapper>
             <IconButton
-                iconName="close"
+                iconName="x"
                 size="medium"
                 colorScheme="tertiaryElevation1"
                 accessibilityRole="button"
diff --git a/suite-native/module-authorize-device/src/constants/deviceImageConstants.ts b/suite-native/module-authorize-device/src/constants/deviceImageConstants.ts
new file mode 100644
index 00000000000..9341db927df
--- /dev/null
+++ b/suite-native/module-authorize-device/src/constants/deviceImageConstants.ts
@@ -0,0 +1,10 @@
+import { DeviceModelInternal } from '@trezor/connect';
+
+export const deviceImageMap: Record<DeviceModelInternal, string> = {
+    [DeviceModelInternal.T1B1]: require('../assets/connect/pin-t1b1.png'),
+    [DeviceModelInternal.T2T1]: require('../assets/connect/pin-t2t1.png'),
+    [DeviceModelInternal.T2B1]: require('../assets/connect/pin-t3b1.png'),
+    [DeviceModelInternal.T3B1]: require('../assets/connect/pin-t3b1.png'),
+    [DeviceModelInternal.T3T1]: require('../assets/connect/pin-t3t1.png'),
+    [DeviceModelInternal.T3W1]: require('../assets/connect/pin-t3w1.png'),
+};
diff --git a/suite-native/module-authorize-device/src/index.ts b/suite-native/module-authorize-device/src/index.ts
index 282d8edb011..247eb6cd7b8 100644
--- a/suite-native/module-authorize-device/src/index.ts
+++ b/suite-native/module-authorize-device/src/index.ts
@@ -1 +1,2 @@
 export * from './navigation/AuthorizeDeviceStackNavigator';
+export * from './components/connect/PinOnKeypad';
diff --git a/suite-native/module-authorize-device/src/screens/connect/ConnectingDeviceScreen.tsx b/suite-native/module-authorize-device/src/screens/connect/ConnectingDeviceScreen.tsx
index 10cd5075dfc..a337db85eea 100644
--- a/suite-native/module-authorize-device/src/screens/connect/ConnectingDeviceScreen.tsx
+++ b/suite-native/module-authorize-device/src/screens/connect/ConnectingDeviceScreen.tsx
@@ -1,7 +1,7 @@
 import { ActivityIndicator } from 'react-native';
 
 import { Text, VStack, Box } from '@suite-native/atoms';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { useNativeStyles, prepareNativeStyle } from '@trezor/styles';
 import { Translation } from '@suite-native/intl';
 
@@ -27,7 +27,7 @@ export const ConnectingDeviceScreen = () => {
                         <Translation id="moduleConnectDevice.connectingDeviceScreen.title" />
                     </Text>
                     <Box paddingBottom="sp8" paddingLeft="sp8">
-                        <Icon name="trezor" size="extraLarge" />
+                        <Icon name="trezorLogo" size="extraLarge" />
                     </Box>
                 </Box>
                 <Text variant="highlight" color="textSubdued">
diff --git a/suite-native/module-authorize-device/src/screens/connect/PinScreen.tsx b/suite-native/module-authorize-device/src/screens/connect/PinScreen.tsx
index 97900a758a6..fea0145404d 100644
--- a/suite-native/module-authorize-device/src/screens/connect/PinScreen.tsx
+++ b/suite-native/module-authorize-device/src/screens/connect/PinScreen.tsx
@@ -1,25 +1,44 @@
+import { useCallback } from 'react';
 import { useSelector } from 'react-redux';
 
-import { Image, VStack } from '@suite-native/atoms';
-import { DeviceModelInternal } from '@trezor/connect';
+import { useNavigation } from '@react-navigation/native';
+
 import { selectDeviceModel } from '@suite-common/wallet-core';
+import {
+    AuthorizeDeviceStackParamList,
+    AuthorizeDeviceStackRoutes,
+    RootStackParamList,
+    StackToStackCompositeNavigationProps,
+} from '@suite-native/navigation';
+import { DeviceModelInternal } from '@trezor/connect';
 
 import { ConnectDeviceScreenView } from '../../components/connect/ConnectDeviceScreenView';
-import { PinForm } from '../../components/connect/PinForm';
-import { PinOnDevice, deviceImageMap } from '../../components/connect/PinOnDevice';
+import { PinOnDevice } from '../../components/connect/PinOnDevice';
+import { PinOnKeypad } from '../../components/connect/PinOnKeypad';
+
+type NavigationProp = StackToStackCompositeNavigationProps<
+    AuthorizeDeviceStackParamList,
+    AuthorizeDeviceStackRoutes.PinMatrix,
+    RootStackParamList
+>;
 
 export const PinScreen = () => {
+    const navigation = useNavigation<NavigationProp>();
+
     const deviceModel = useSelector(selectDeviceModel);
 
+    const onSuccess = useCallback(() => {
+        if (navigation.canGoBack()) {
+            navigation.goBack();
+        }
+    }, [navigation]);
+
     if (!deviceModel) return null;
 
     return (
         <ConnectDeviceScreenView>
             {deviceModel === DeviceModelInternal.T1B1 ? (
-                <VStack spacing="sp16" alignItems="center" flex={1} marginTop="sp24">
-                    <Image source={deviceImageMap[deviceModel]} width={161} height={194} />
-                    <PinForm />
-                </VStack>
+                <PinOnKeypad variant="current" onSuccess={onSuccess} />
             ) : (
                 <PinOnDevice deviceModel={deviceModel} />
             )}
diff --git a/suite-native/module-authorize-device/src/screens/passphrase/PassphraseEmptyWalletScreen.tsx b/suite-native/module-authorize-device/src/screens/passphrase/PassphraseEmptyWalletScreen.tsx
index b37eee59ce9..9e4460a7edf 100644
--- a/suite-native/module-authorize-device/src/screens/passphrase/PassphraseEmptyWalletScreen.tsx
+++ b/suite-native/module-authorize-device/src/screens/passphrase/PassphraseEmptyWalletScreen.tsx
@@ -24,7 +24,7 @@ import { QuestionMarks } from '../../assets/passphrase/QuestionMarks';
 const cardStyle = prepareNativeStyle(utils => ({
     borderColor: utils.colors.borderElevation0,
     borderWidth: utils.borders.widths.small,
-    gap: 12,
+    gap: utils.spacings.sp12,
 }));
 
 const cardContentStyle = prepareNativeStyle(() => ({
diff --git a/suite-native/module-authorize-device/src/screens/passphrase/PassphraseEnableOnDeviceScreen.tsx b/suite-native/module-authorize-device/src/screens/passphrase/PassphraseEnableOnDeviceScreen.tsx
index 8753090e4a4..f1ef6e9dfcb 100644
--- a/suite-native/module-authorize-device/src/screens/passphrase/PassphraseEnableOnDeviceScreen.tsx
+++ b/suite-native/module-authorize-device/src/screens/passphrase/PassphraseEnableOnDeviceScreen.tsx
@@ -1,16 +1,12 @@
 import { useCallback, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { Screen } from '@suite-native/navigation';
+import { Screen, useNavigateToInitialScreen } from '@suite-native/navigation';
 import { CenteredTitleHeader, IconButton, ScreenHeaderWrapper, VStack } from '@suite-native/atoms';
 import { Translation, useTranslate } from '@suite-native/intl';
 import { useToast } from '@suite-native/toasts';
 import TrezorConnect from '@trezor/connect';
-import {
-    resetError,
-    selectPassphraseError,
-    useAuthorizationGoBack,
-} from '@suite-native/device-authorization';
+import { resetError, selectPassphraseError } from '@suite-native/device-authorization';
 
 import { DeviceT3T1Svg } from '../../assets/passphrase/DeviceT3T1Svg';
 
@@ -22,24 +18,24 @@ export const PassphraseEnableOnDeviceScreen = () => {
     const { showToast } = useToast();
     const { translate } = useTranslate();
 
-    const { handleGoBack } = useAuthorizationGoBack();
+    const navigateToInitialScreen = useNavigateToInitialScreen();
 
     const handleClose = useCallback(() => {
         TrezorConnect.cancel();
         dispatch(resetError());
-        handleGoBack();
-    }, [dispatch, handleGoBack]);
+        navigateToInitialScreen();
+    }, [dispatch, navigateToInitialScreen]);
 
     useEffect(() => {
         if (passphraseError?.error === 'passphrase-enabling-cancelled') {
             handleClose();
             showToast({
                 variant: 'error',
-                icon: 'warningTriangleLight',
+                icon: 'warning',
                 message: translate('modulePassphrase.enablePassphrase.cancelledError'),
             });
         }
-    }, [dispatch, handleClose, handleGoBack, passphraseError, showToast, translate]);
+    }, [dispatch, handleClose, navigateToInitialScreen, passphraseError, showToast, translate]);
 
     return (
         <Screen
@@ -50,7 +46,7 @@ export const PassphraseEnableOnDeviceScreen = () => {
                         colorScheme="tertiaryElevation1"
                         accessibilityRole="button"
                         accessibilityLabel="close"
-                        iconName="close"
+                        iconName="x"
                         onPress={handleClose}
                     />
                 </ScreenHeaderWrapper>
diff --git a/suite-native/module-authorize-device/src/screens/passphrase/PassphraseEnterOnTrezorScreen.tsx b/suite-native/module-authorize-device/src/screens/passphrase/PassphraseEnterOnTrezorScreen.tsx
index 712ce896c9c..0648b302311 100644
--- a/suite-native/module-authorize-device/src/screens/passphrase/PassphraseEnterOnTrezorScreen.tsx
+++ b/suite-native/module-authorize-device/src/screens/passphrase/PassphraseEnterOnTrezorScreen.tsx
@@ -8,6 +8,7 @@ import {
     AuthorizeDeviceStackRoutes,
     RootStackParamList,
     StackToStackCompositeNavigationProps,
+    useNavigateToInitialScreen,
 } from '@suite-native/navigation';
 import { Box, Button, Card, CenteredTitleHeader, Text, VStack } from '@suite-native/atoms';
 import { selectHasDeviceDiscovery } from '@suite-common/wallet-core';
@@ -16,7 +17,6 @@ import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import {
     cancelPassphraseAndSelectStandardDeviceThunk,
     selectIsCreatingNewPassphraseWallet,
-    useAuthorizationGoBack,
     useHandlePassphraseMismatch,
 } from '@suite-native/device-authorization';
 import TrezorConnect from '@trezor/connect';
@@ -50,8 +50,7 @@ export const PassphraseEnterOnTrezorScreen = () => {
     const isCreatingNewWalletInstance = useSelector(selectIsCreatingNewPassphraseWallet);
 
     const navigation = useNavigation<NavigationProp>();
-
-    const { handleGoBack } = useAuthorizationGoBack();
+    const navigateToInitialScreen = useNavigateToInitialScreen();
 
     // If this screen was present during authorizing device with passphrase for some feature,
     // on success, this hook will close the stack and go back
@@ -74,7 +73,7 @@ export const PassphraseEnterOnTrezorScreen = () => {
                 payload: { screen: AuthorizeDeviceStackRoutes.PassphraseEnterOnTrezor },
             });
             TrezorConnect.cancel();
-            handleGoBack();
+            navigateToInitialScreen();
         }
     };
 
diff --git a/suite-native/module-authorize-device/src/screens/passphrase/PassphraseFeatureUnlockFormScreen.tsx b/suite-native/module-authorize-device/src/screens/passphrase/PassphraseFeatureUnlockFormScreen.tsx
index 8105f46ec43..4ab235a50f9 100644
--- a/suite-native/module-authorize-device/src/screens/passphrase/PassphraseFeatureUnlockFormScreen.tsx
+++ b/suite-native/module-authorize-device/src/screens/passphrase/PassphraseFeatureUnlockFormScreen.tsx
@@ -1,21 +1,20 @@
-import { Screen, ScreenHeader } from '@suite-native/navigation';
+import { Screen, ScreenHeader, useNavigateToInitialScreen } from '@suite-native/navigation';
 import { IconButton, Text, VStack } from '@suite-native/atoms';
 import TrezorConnect from '@trezor/connect';
-import { useAuthorizationGoBack } from '@suite-native/device-authorization';
 import { Translation, useTranslate } from '@suite-native/intl';
 import { useIsConnectPopupOpened } from '@suite-native/module-connect-popup';
 
 import { PassphraseForm } from '../../components/passphrase/PassphraseForm';
 
 export const PassphraseFeatureUnlockFormScreen = () => {
-    const { handleGoBack } = useAuthorizationGoBack();
+    const navigateToInitialScreen = useNavigateToInitialScreen();
     const isConnectPopupOpened = useIsConnectPopupOpened();
 
     const { translate } = useTranslate();
 
     const handleClose = () => {
         TrezorConnect.cancel();
-        handleGoBack();
+        navigateToInitialScreen();
     };
 
     return (
@@ -23,7 +22,7 @@ export const PassphraseFeatureUnlockFormScreen = () => {
             screenHeader={
                 <ScreenHeader>
                     <IconButton
-                        iconName="close"
+                        iconName="x"
                         onPress={handleClose}
                         colorScheme="tertiaryElevation0"
                         size="medium"
diff --git a/suite-native/module-authorize-device/src/screens/passphrase/PassphraseFormScreen.tsx b/suite-native/module-authorize-device/src/screens/passphrase/PassphraseFormScreen.tsx
index 59545110e54..ef10adcc7b5 100644
--- a/suite-native/module-authorize-device/src/screens/passphrase/PassphraseFormScreen.tsx
+++ b/suite-native/module-authorize-device/src/screens/passphrase/PassphraseFormScreen.tsx
@@ -5,7 +5,7 @@ import { useOpenLink } from '@suite-native/link';
 import { Box, Button, HStack, Text, VStack } from '@suite-native/atoms';
 import { Translation, useTranslate } from '@suite-native/intl';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { EventType, analytics } from '@suite-native/analytics';
 
 import { PassphraseForm } from '../../components/passphrase/PassphraseForm';
@@ -15,7 +15,7 @@ const ANIMATION_DURATION = 300;
 
 const cardStyle = prepareNativeStyle(utils => ({
     backgroundColor: utils.colors.backgroundAlertBlueSubtleOnElevation1,
-    borderRadius: utils.borders.radii.medium,
+    borderRadius: utils.borders.radii.r16,
     borderColor: utils.colors.backgroundAlertBlueSubtleOnElevationNegative,
     borderWidth: utils.borders.widths.small,
     padding: utils.spacings.sp16,
@@ -95,7 +95,7 @@ export const PassphraseFormScreen = () => {
                                     <HStack>
                                         <View style={applyStyle(warningIconWrapperStyle)}>
                                             <Icon
-                                                name="warningCircle"
+                                                name="warning"
                                                 color="textAlertBlue"
                                                 size="medium"
                                             />
@@ -111,7 +111,7 @@ export const PassphraseFormScreen = () => {
                                     <HStack>
                                         <View style={applyStyle(warningIconWrapperStyle)}>
                                             <Icon
-                                                name="eyeSlashLight"
+                                                name="eyeSlash"
                                                 color="textDefault"
                                                 size="medium"
                                             />
@@ -127,7 +127,7 @@ export const PassphraseFormScreen = () => {
                                     <HStack>
                                         <View style={applyStyle(warningIconWrapperStyle)}>
                                             <Icon
-                                                name="warningTriangle"
+                                                name="warning"
                                                 color="textDefault"
                                                 size="medium"
                                             />
diff --git a/suite-native/module-authorize-device/src/useRedirectOnPassphraseCompletion.ts b/suite-native/module-authorize-device/src/useRedirectOnPassphraseCompletion.ts
index 3d89a283eef..71917cf537f 100644
--- a/suite-native/module-authorize-device/src/useRedirectOnPassphraseCompletion.ts
+++ b/suite-native/module-authorize-device/src/useRedirectOnPassphraseCompletion.ts
@@ -3,6 +3,7 @@ import { useDispatch, useSelector } from 'react-redux';
 
 import { useRoute } from '@react-navigation/native';
 
+import { useNavigateToInitialScreen } from '@suite-native/navigation';
 import {
     cancelPassphraseAndSelectStandardDeviceThunk,
     selectDeviceRequestedAuthorization,
@@ -10,7 +11,6 @@ import {
     selectHasVerificationCancelledError,
     selectPassphraseError,
 } from '@suite-native/device-authorization';
-import { useAuthorizationGoBack } from '@suite-native/device-authorization';
 import { EventType, analytics } from '@suite-native/analytics';
 
 export const useRedirectOnPassphraseCompletion = () => {
@@ -21,16 +21,16 @@ export const useRedirectOnPassphraseCompletion = () => {
 
     const dispatch = useDispatch();
 
-    const { handleGoBack } = useAuthorizationGoBack();
+    const navigateToInitialScreen = useNavigateToInitialScreen();
 
     const route = useRoute();
 
     useEffect(() => {
         // If there is passphrase error, we don't want to go back, but handle errors through alerts within the flow
         if (!hasDeviceRequestedAuthorization && !hasPassphraseError) {
-            handleGoBack();
+            navigateToInitialScreen();
         }
-    }, [handleGoBack, hasDeviceRequestedAuthorization, hasPassphraseError]);
+    }, [navigateToInitialScreen, hasDeviceRequestedAuthorization, hasPassphraseError]);
 
     useEffect(() => {
         // User has canceled the authorization process on device (authorizeDeviceThunk rejects with auth-failed error)
diff --git a/suite-native/module-authorize-device/tsconfig.json b/suite-native/module-authorize-device/tsconfig.json
index dbc5070d6be..604cac1f9ba 100644
--- a/suite-native/module-authorize-device/tsconfig.json
+++ b/suite-native/module-authorize-device/tsconfig.json
@@ -2,9 +2,6 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/validators"
         },
@@ -19,6 +16,7 @@
         { "path": "../device-mutex" },
         { "path": "../discovery" },
         { "path": "../forms" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../link" },
         { "path": "../module-connect-popup" },
@@ -26,6 +24,7 @@
         { "path": "../theme" },
         { "path": "../toasts" },
         { "path": "../../packages/connect" },
+        { "path": "../../packages/env-utils" },
         { "path": "../../packages/styles" }
     ]
 }
diff --git a/suite-native/module-connect-popup/package.json b/suite-native/module-connect-popup/package.json
index a77ea4a05d9..a1281621d98 100644
--- a/suite-native/module-connect-popup/package.json
+++ b/suite-native/module-connect-popup/package.json
@@ -7,7 +7,6 @@
     "main": "src/index",
     "scripts": {
         "depcheck": "yarn g:depcheck",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
@@ -18,10 +17,11 @@
         "@suite-native/config": "workspace:*",
         "@suite-native/device": "workspace:*",
         "@suite-native/device-manager": "workspace:*",
+        "@suite-native/feature-flags": "workspace:^",
         "@suite-native/intl": "workspace:^",
         "@suite-native/navigation": "workspace:*",
         "@trezor/connect": "workspace:*",
-        "@trezor/connect-deeplink": "workspace:*",
+        "@trezor/connect-mobile": "workspace:*",
         "expo-linking": "^6.3.1",
         "react": "18.2.0",
         "react-native": "0.75.2",
diff --git a/suite-native/module-connect-popup/src/components/ConnectPopupDebugOptions.tsx b/suite-native/module-connect-popup/src/components/ConnectPopupDebugOptions.tsx
index f0ab00e5825..18eaf61b557 100644
--- a/suite-native/module-connect-popup/src/components/ConnectPopupDebugOptions.tsx
+++ b/suite-native/module-connect-popup/src/components/ConnectPopupDebugOptions.tsx
@@ -3,7 +3,7 @@ import React, { useEffect } from 'react';
 import * as Linking from 'expo-linking';
 
 import { BottomSheet, Button } from '@suite-native/atoms';
-import TrezorConnectDeeplink from '@trezor/connect-deeplink';
+import TrezorConnectDeeplink from '@trezor/connect-mobile';
 
 type ConnectPopupDebugOptionsProps = React.PropsWithChildren<{
     showDebug: boolean;
diff --git a/suite-native/module-connect-popup/src/hooks/useConnectParseParams.ts b/suite-native/module-connect-popup/src/hooks/useConnectParseParams.ts
index dcf0b2635d5..7a67d23f125 100644
--- a/suite-native/module-connect-popup/src/hooks/useConnectParseParams.ts
+++ b/suite-native/module-connect-popup/src/hooks/useConnectParseParams.ts
@@ -3,10 +3,27 @@ import { useMemo } from 'react';
 import { ParsedURL } from 'expo-linking';
 
 import TrezorConnect from '@trezor/connect';
+import { DEEPLINK_VERSION } from '@trezor/connect/src/data/version';
+import { TypedError, TrezorError } from '@trezor/connect/src/constants/errors';
 
-export const useConnectParseParams = (url: ParsedURL) => {
-    const popupOptions = useMemo(() => {
-        const { queryParams } = url;
+type UseConnectParseParamsType =
+    | {
+          popupOptions: {
+              method: string;
+              params: any;
+              callback: string;
+          };
+          parseParamsError: undefined;
+      }
+    | {
+          popupOptions: undefined;
+          parseParamsError: TrezorError;
+      };
+
+export const useConnectParseParams = (url: ParsedURL): UseConnectParseParamsType => {
+    return useMemo(() => {
+        const { queryParams, path } = url;
+        const version = path && path.split('/').slice(-2, -1)[0];
         if (
             !queryParams?.method ||
             !queryParams?.params ||
@@ -14,15 +31,18 @@ export const useConnectParseParams = (url: ParsedURL) => {
             typeof queryParams?.params !== 'string' ||
             typeof queryParams?.method !== 'string' ||
             typeof queryParams?.callback !== 'string' ||
-            !TrezorConnect.hasOwnProperty(queryParams?.method)
+            !Object.prototype.hasOwnProperty.call(TrezorConnect, queryParams?.method)
         ) {
-            return undefined;
+            return { parseParamsError: TypedError('Method_InvalidParameter') };
+        }
+
+        if (!version || parseInt(version) > DEEPLINK_VERSION) {
+            return { parseParamsError: TypedError('Deeplink_VersionMismatch') };
         }
+
         const params = JSON.parse(queryParams.params);
         const { method: methodName, callback } = queryParams;
 
-        return { method: methodName, params, callback };
+        return { popupOptions: { method: methodName, params, callback } };
     }, [url]);
-
-    return popupOptions;
 };
diff --git a/suite-native/module-connect-popup/src/hooks/useConnectPopupNavigation.ts b/suite-native/module-connect-popup/src/hooks/useConnectPopupNavigation.ts
index 9701404009b..10f2aa17ee7 100644
--- a/suite-native/module-connect-popup/src/hooks/useConnectPopupNavigation.ts
+++ b/suite-native/module-connect-popup/src/hooks/useConnectPopupNavigation.ts
@@ -8,6 +8,8 @@ import {
     RootStackParamList,
     RootStackRoutes,
 } from '@suite-native/navigation';
+import { isDevelopOrDebugEnv } from '@suite-native/config';
+import { FeatureFlag, useFeatureFlag } from '@suite-native/feature-flags';
 
 type NavigationProp = StackToStackCompositeNavigationProps<
     RootStackParamList,
@@ -15,27 +17,37 @@ type NavigationProp = StackToStackCompositeNavigationProps<
     RootStackParamList
 >;
 
-const isConnectPopupUrl = (url: string): boolean => url.startsWith('trezorsuitelite://');
+const isConnectPopupUrl = (url: string): boolean => {
+    if (isDevelopOrDebugEnv()) {
+        if (url.startsWith('trezorsuitelite://connect')) return true;
+        if (/^https:\/\/dev\.suite\.sldev\.cz\/connect\/(.*)\/deeplink(.*)$/g.test(url))
+            return true;
+    }
+    if (/^https:\/\/connect\.trezor\.io\/9\/deeplink(.*)$/g.test(url)) return true;
+
+    return false;
+};
 
 // TODO: will be necessary to handle if device is not connected/unlocked so we probably want to wait until user unlock device
 // we already have some modals like biometrics or coin enabled which are waiting for device to be connected
 export const useConnectPopupNavigation = () => {
+    const [featureFlagEnabled] = useFeatureFlag(FeatureFlag.IsConnectPopupEnabled);
     const navigation = useNavigation<NavigationProp>();
 
     const navigateToConnectPopup = useCallback(
         (url: string) => {
+            if (!featureFlagEnabled) return;
+            if (!isConnectPopupUrl(url)) return;
             const parsedUrl = Linking.parse(url);
             navigation.navigate(RootStackRoutes.ConnectPopup, { parsedUrl });
         },
-        [navigation],
+        [navigation, featureFlagEnabled],
     );
 
     useEffect(() => {
         const navigateToInitalUrl = async () => {
             const currentUrl = await Linking.getInitialURL();
-            if (currentUrl && isConnectPopupUrl(currentUrl)) {
-                // eslint-disable-next-line no-console
-                console.log('initial url', currentUrl);
+            if (currentUrl) {
                 navigateToConnectPopup(currentUrl);
             }
         };
@@ -46,8 +58,6 @@ export const useConnectPopupNavigation = () => {
         // there could be when you open same deep link for second time and in that case it will be ignored
         // this could be probably handed by Linking.addEventListener
         const subscription = Linking.addEventListener('url', event => {
-            // eslint-disable-next-line no-console
-            console.log('url event received', event.url);
             navigateToConnectPopup(event.url);
         });
 
diff --git a/suite-native/module-connect-popup/src/screens/ConnectPopupScreen.tsx b/suite-native/module-connect-popup/src/screens/ConnectPopupScreen.tsx
index 0c50d9d6dd3..c894b9e40b1 100644
--- a/suite-native/module-connect-popup/src/screens/ConnectPopupScreen.tsx
+++ b/suite-native/module-connect-popup/src/screens/ConnectPopupScreen.tsx
@@ -46,7 +46,7 @@ export const ConnectPopupScreen = ({
     const [callResult, setCallResult] = useState<any>();
     const [loading, setLoading] = useState(false);
 
-    const popupOptions = useConnectParseParams(route.params.parsedUrl);
+    const { popupOptions, parseParamsError } = useConnectParseParams(route.params.parsedUrl);
     const { method, methodError } = useConnectMethod(popupOptions);
 
     const callDevice = useCallback(async () => {
@@ -103,7 +103,7 @@ export const ConnectPopupScreen = ({
                 }
 
                 return (
-                    <VStack spacing="sp8" alignItems="center">
+                    <VStack testID="@popup/deeplink-info" spacing="sp8" alignItems="center">
                         <Text variant="titleSmall">
                             {method.confirmation?.label ?? method.info}
                         </Text>
@@ -122,7 +122,7 @@ export const ConnectPopupScreen = ({
                         >
                             <Translation id="moduleConnectPopup.areYouSureMessage" />
                         </Text>
-                        <Button onPress={callDevice}>
+                        <Button testID="@popup/call-device" onPress={callDevice}>
                             {method.confirmation?.customConfirmButton?.label ?? (
                                 <Translation id="moduleConnectPopup.confirm" />
                             )}
@@ -130,6 +130,23 @@ export const ConnectPopupScreen = ({
                     </VStack>
                 );
             }
+
+            if (parseParamsError) {
+                return (
+                    <ErrorMessage
+                        errorMessage={
+                            <Translation
+                                id={
+                                    parseParamsError.code === 'Deeplink_VersionMismatch'
+                                        ? 'moduleConnectPopup.errors.versionUnsupported'
+                                        : 'moduleConnectPopup.errors.invalidParams'
+                                }
+                            />
+                        }
+                    />
+                );
+            }
+
             if (methodError) {
                 return <ErrorMessage errorMessage={methodError} />;
             }
@@ -148,7 +165,16 @@ export const ConnectPopupScreen = ({
                 />
             );
         }
-    }, [validDevice, method, popupOptions, methodError, loading, discoveryActive, callDevice]);
+    }, [
+        validDevice,
+        method,
+        popupOptions,
+        parseParamsError,
+        methodError,
+        loading,
+        discoveryActive,
+        callDevice,
+    ]);
 
     return (
         <Screen
diff --git a/suite-native/module-connect-popup/tsconfig.json b/suite-native/module-connect-popup/tsconfig.json
index 0914835035e..c5028852616 100644
--- a/suite-native/module-connect-popup/tsconfig.json
+++ b/suite-native/module-connect-popup/tsconfig.json
@@ -12,11 +12,12 @@
         { "path": "../config" },
         { "path": "../device" },
         { "path": "../device-manager" },
+        { "path": "../feature-flags" },
         { "path": "../intl" },
         { "path": "../navigation" },
         { "path": "../../packages/connect" },
         {
-            "path": "../../packages/connect-deeplink"
+            "path": "../../packages/connect-mobile"
         }
     ]
 }
diff --git a/suite-native/module-dev-utils/package.json b/suite-native/module-dev-utils/package.json
index cc5c721bb2c..6d83ba5a099 100644
--- a/suite-native/module-dev-utils/package.json
+++ b/suite-native/module-dev-utils/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -14,7 +13,6 @@
         "@mobily/ts-belt": "^3.13.1",
         "@react-navigation/native-stack": "6.11.0",
         "@sentry/react-native": "5.33.0",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/message-system": "workspace:*",
         "@suite-common/wallet-core": "workspace:*",
         "@suite-native/atoms": "workspace:*",
@@ -22,6 +20,7 @@
         "@suite-native/discovery": "workspace:*",
         "@suite-native/feature-flags": "workspace:*",
         "@suite-native/helpers": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/link": "workspace:*",
         "@suite-native/navigation": "workspace:*",
         "@suite-native/storage": "workspace:*",
diff --git a/suite-native/module-dev-utils/src/components/FeatureFlags.tsx b/suite-native/module-dev-utils/src/components/FeatureFlags.tsx
index f1699adc697..c8040d4982d 100644
--- a/suite-native/module-dev-utils/src/components/FeatureFlags.tsx
+++ b/suite-native/module-dev-utils/src/components/FeatureFlags.tsx
@@ -3,10 +3,12 @@ import { FeatureFlag as FeatureFlagEnum, useFeatureFlag } from '@suite-native/fe
 
 const featureFlagsTitleMap = {
     [FeatureFlagEnum.IsDeviceConnectEnabled]: 'Connect device',
-    [FeatureFlagEnum.IsSendEnabled]: 'Send',
+    [FeatureFlagEnum.IsRippleSendEnabled]: 'Ripple send',
+    [FeatureFlagEnum.IsCardanoSendEnabled]: 'Cardano send',
+    [FeatureFlagEnum.IsSolanaSendEnabled]: 'Solana send',
     [FeatureFlagEnum.IsRegtestEnabled]: 'Regtest',
-    [FeatureFlagEnum.IsPolygonEnabled]: 'Polygon',
-    [FeatureFlagEnum.IsBscEnabled]: 'BNB Smart Chain',
+    [FeatureFlagEnum.IsSolanaEnabled]: 'Solana',
+    [FeatureFlagEnum.IsConnectPopupEnabled]: 'Connect Popup',
 } as const satisfies Record<FeatureFlagEnum, string>;
 
 const FeatureFlag = ({ featureFlag }: { featureFlag: FeatureFlagEnum }) => {
diff --git a/suite-native/module-dev-utils/src/screens/DemoScreen.tsx b/suite-native/module-dev-utils/src/screens/DemoScreen.tsx
index 3a76688d646..e9d6e4416b6 100644
--- a/suite-native/module-dev-utils/src/screens/DemoScreen.tsx
+++ b/suite-native/module-dev-utils/src/screens/DemoScreen.tsx
@@ -24,18 +24,18 @@ import {
     TextButton,
     NumPadButton,
     TextButtonVariant,
-    Card,
-    ListItemSkeleton,
+    // Card,
+    // ListItemSkeleton,
     AlertBox,
 } from '@suite-native/atoms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { Screen, ScreenSubHeader } from '@suite-native/navigation';
-import { CryptoIcon, Icon } from '@suite-common/icons-deprecated';
+import { CryptoIcon, Icon } from '@suite-native/icons';
 import { isDevelopOrDebugEnv } from '@suite-native/config';
 import { TypographyStyle } from '@trezor/theme';
 
 const inputStackStyle = prepareNativeStyle(utils => ({
-    borderRadius: utils.borders.radii.medium,
+    borderRadius: utils.borders.radii.r16,
     padding: utils.spacings.sp8,
 }));
 
@@ -192,20 +192,6 @@ export const DemoScreen = () => {
                             </Box>
                         </View>
                     ))}
-                    <View>
-                        <Text>with title</Text>
-                        <Box flexDirection="row" justifyContent="space-around" alignItems="center">
-                            {buttonSizes.map(buttonSize => (
-                                <IconButton
-                                    key={buttonSize}
-                                    colorScheme="primary"
-                                    iconName="calendar"
-                                    size={buttonSize}
-                                    title={buttonSize}
-                                />
-                            ))}
-                        </Box>
-                    </View>
                 </VStack>
                 <VStack>
                     <Text variant="titleSmall">TextButton:</Text>
@@ -220,7 +206,7 @@ export const DemoScreen = () => {
                                 <TextButton
                                     variant={variant}
                                     key={variant + buttonSize}
-                                    viewLeft="trezorT3B1"
+                                    viewLeft="trezorSafe5"
                                     size={buttonSize}
                                 >
                                     {buttonSize}
@@ -359,12 +345,13 @@ export const DemoScreen = () => {
                             />
                         </VStack>
                     </Box>
-                    <VStack marginTop="sp16">
+                    {/* For some reason skeleton lags scrolling on iOS, we should investigate */}
+                    {/* <VStack marginTop="sp16">
                         <Text variant="titleMedium">Skeleton</Text>
                         <Card>
                             <ListItemSkeleton />
                         </Card>
-                    </VStack>
+                    </VStack> */}
                 </Box>
             </VStack>
         </Screen>
diff --git a/suite-native/module-dev-utils/tsconfig.json b/suite-native/module-dev-utils/tsconfig.json
index a25b52789bc..f8af7aef1ef 100644
--- a/suite-native/module-dev-utils/tsconfig.json
+++ b/suite-native/module-dev-utils/tsconfig.json
@@ -2,9 +2,6 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/message-system"
         },
@@ -16,6 +13,7 @@
         { "path": "../discovery" },
         { "path": "../feature-flags" },
         { "path": "../helpers" },
+        { "path": "../icons" },
         { "path": "../link" },
         { "path": "../navigation" },
         { "path": "../storage" },
diff --git a/suite-native/module-device-settings/package.json b/suite-native/module-device-settings/package.json
new file mode 100644
index 00000000000..ce65cb7275d
--- /dev/null
+++ b/suite-native/module-device-settings/package.json
@@ -0,0 +1,37 @@
+{
+    "name": "@suite-native/module-device-settings",
+    "version": "1.0.0",
+    "private": true,
+    "license": "See LICENSE.md in repo root",
+    "sideEffects": false,
+    "main": "src/index",
+    "scripts": {
+        "depcheck": "yarn g:depcheck",
+        "type-check": "yarn g:tsc --build"
+    },
+    "dependencies": {
+        "@mobily/ts-belt": "^3.13.1",
+        "@react-navigation/native": "6.1.18",
+        "@react-navigation/native-stack": "6.11.0",
+        "@suite-common/suite-utils": "workspace:*",
+        "@suite-common/wallet-core": "workspace:*",
+        "@suite-native/alerts": "workspace:*",
+        "@suite-native/analytics": "workspace:*",
+        "@suite-native/atoms": "workspace:*",
+        "@suite-native/device": "workspace:*",
+        "@suite-native/device-mutex": "workspace:*",
+        "@suite-native/icons": "workspace:*",
+        "@suite-native/intl": "workspace:*",
+        "@suite-native/link": "workspace:*",
+        "@suite-native/module-authorize-device": "workspace:*",
+        "@suite-native/navigation": "workspace:*",
+        "@suite-native/toasts": "workspace:*",
+        "@trezor/connect": "workspace:*",
+        "@trezor/device-utils": "workspace:*",
+        "@trezor/env-utils": "workspace:*",
+        "@trezor/styles": "workspace:*",
+        "react": "18.2.0",
+        "react-native": "0.75.2",
+        "react-redux": "8.0.7"
+    }
+}
diff --git a/suite-native/module-device-settings/src/components/DeviceFirmwareCard.tsx b/suite-native/module-device-settings/src/components/DeviceFirmwareCard.tsx
new file mode 100644
index 00000000000..67743024e7d
--- /dev/null
+++ b/suite-native/module-device-settings/src/components/DeviceFirmwareCard.tsx
@@ -0,0 +1,99 @@
+import { ReactNode } from 'react';
+import { useSelector } from 'react-redux';
+
+import { G } from '@mobily/ts-belt';
+
+import { getFwUpdateVersion } from '@suite-common/suite-utils';
+import { deviceModelToIconName } from '@suite-native/icons';
+import {
+    selectDevice,
+    selectDeviceModel,
+    selectDeviceReleaseInfo,
+} from '@suite-common/wallet-core';
+import { HStack, Text, VStack } from '@suite-native/atoms';
+import { Translation } from '@suite-native/intl';
+import { getFirmwareVersion, hasBitcoinOnlyFirmware } from '@trezor/device-utils';
+import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+
+import { DeviceSettingsCard } from './DeviceSettingsCard';
+
+const firmwareInfoStyle = prepareNativeStyle(() => ({
+    flexGrow: 1,
+}));
+
+type DeviceInfoProps = {
+    label: ReactNode;
+    value: ReactNode;
+};
+
+const FirmwareInfo = ({ label, value }: DeviceInfoProps) => {
+    const { applyStyle } = useNativeStyles();
+
+    return (
+        <VStack spacing="sp2" style={applyStyle(firmwareInfoStyle)}>
+            <Text variant="hint" color="textSubdued">
+                {label}
+            </Text>
+            <Text variant="callout">{value}</Text>
+        </VStack>
+    );
+};
+
+export const DeviceFirmwareCard = () => {
+    const device = useSelector(selectDevice);
+    const deviceModel = useSelector(selectDeviceModel);
+    const deviceReleaseInfo = useSelector(selectDeviceReleaseInfo);
+
+    if (!device || !deviceModel) {
+        return null;
+    }
+
+    const firmwareVersion = getFirmwareVersion(device);
+    const firmwareTypeTranslationId = hasBitcoinOnlyFirmware(device)
+        ? 'moduleDeviceSettings.firmware.typeBitcoinOnly'
+        : 'moduleDeviceSettings.firmware.typeUniversal';
+
+    const firmwareUpdateProps = (() => {
+        if (G.isNotNullable(deviceReleaseInfo)) {
+            const isUpgradable = deviceReleaseInfo.isNewer ?? false;
+
+            if (isUpgradable) {
+                return {
+                    title: (
+                        <Translation
+                            id="moduleDeviceSettings.firmware.newVersionAvailable"
+                            values={{ version: getFwUpdateVersion(device) }}
+                        />
+                    ),
+                    variant: 'info',
+                } as const;
+            }
+
+            return {
+                title: <Translation id="moduleDeviceSettings.firmware.upToDate" />,
+                variant: 'success',
+            } as const;
+        }
+
+        return undefined;
+    })();
+
+    return (
+        <DeviceSettingsCard
+            icon={deviceModelToIconName(deviceModel)}
+            title={<Translation id="moduleDeviceSettings.firmware.title" />}
+            alertBoxProps={firmwareUpdateProps}
+        >
+            <HStack marginTop="sp12" spacing="sp2">
+                <FirmwareInfo
+                    label={<Translation id="moduleDeviceSettings.firmware.version" />}
+                    value={firmwareVersion}
+                />
+                <FirmwareInfo
+                    label={<Translation id="moduleDeviceSettings.firmware.type" />}
+                    value={<Translation id={firmwareTypeTranslationId} />}
+                />
+            </HStack>
+        </DeviceSettingsCard>
+    );
+};
diff --git a/suite-native/module-device-settings/src/components/DeviceInteractionScreenWrapper.tsx b/suite-native/module-device-settings/src/components/DeviceInteractionScreenWrapper.tsx
new file mode 100644
index 00000000000..0b02fe2c608
--- /dev/null
+++ b/suite-native/module-device-settings/src/components/DeviceInteractionScreenWrapper.tsx
@@ -0,0 +1,41 @@
+import { ReactNode, useCallback } from 'react';
+import { useSelector } from 'react-redux';
+
+import { selectDevice } from '@suite-common/wallet-core';
+import { Screen, ScreenSubHeader } from '@suite-native/navigation';
+import TrezorConnect from '@trezor/connect';
+
+type DeviceInteractionScreenWrapperProps = {
+    children: ReactNode;
+};
+
+export const DeviceInteractionScreenWrapper = ({
+    children,
+}: DeviceInteractionScreenWrapperProps) => {
+    const device = useSelector(selectDevice);
+
+    const closeAction = useCallback(() => {
+        TrezorConnect.cancel();
+    }, []);
+
+    if (!device) {
+        return null;
+    }
+
+    return (
+        <Screen
+            screenHeader={
+                <ScreenSubHeader
+                    customHorizontalPadding="sp16"
+                    closeActionType="close"
+                    closeAction={closeAction}
+                />
+            }
+            customHorizontalPadding="sp24"
+            hasBottomInset={false}
+            isScrollable={false}
+        >
+            {children}
+        </Screen>
+    );
+};
diff --git a/suite-native/module-device-settings/src/components/DevicePinActionButton.tsx b/suite-native/module-device-settings/src/components/DevicePinActionButton.tsx
new file mode 100644
index 00000000000..a3c2c9f92fb
--- /dev/null
+++ b/suite-native/module-device-settings/src/components/DevicePinActionButton.tsx
@@ -0,0 +1,148 @@
+import { ReactNode, useCallback } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+
+import { useNavigation } from '@react-navigation/native';
+
+import { removeButtonRequests, selectDevice } from '@suite-common/wallet-core';
+import { useAlert } from '@suite-native/alerts';
+import { analytics, EventType } from '@suite-native/analytics';
+import { Button, ButtonColorScheme } from '@suite-native/atoms';
+import { requestPrioritizedDeviceAccess } from '@suite-native/device-mutex';
+import { Translation, TxKeyPath } from '@suite-native/intl';
+import {
+    DeviceSettingsStackParamList,
+    DeviceStackRoutes,
+    StackNavigationProps,
+} from '@suite-native/navigation';
+import { useToast } from '@suite-native/toasts';
+import TrezorConnect from '@trezor/connect';
+
+type NavigationProp = StackNavigationProps<
+    DeviceSettingsStackParamList,
+    DeviceStackRoutes.DevicePinProtection
+>;
+
+type ActionType = 'enable' | 'change' | 'disable';
+
+type DevicePinActionButtonProps = {
+    children: ReactNode;
+    type: ActionType;
+    colorScheme?: ButtonColorScheme;
+};
+
+type ActionConfig = {
+    param: boolean | undefined;
+    successMessageKey: TxKeyPath;
+    canceledMessageKey: TxKeyPath;
+};
+
+const actionConfigMap = {
+    enable: {
+        param: false,
+        successMessageKey: 'moduleDeviceSettings.pinProtection.actions.enable.success',
+        canceledMessageKey: 'moduleDeviceSettings.pinProtection.actions.enable.canceled',
+    },
+    change: {
+        param: undefined,
+        successMessageKey: 'moduleDeviceSettings.pinProtection.actions.change.success',
+        canceledMessageKey: 'moduleDeviceSettings.pinProtection.actions.change.canceled',
+    },
+    disable: {
+        param: true,
+        successMessageKey: 'moduleDeviceSettings.pinProtection.actions.disable.success',
+        canceledMessageKey: 'moduleDeviceSettings.pinProtection.actions.disable.canceled',
+    },
+} as const satisfies Record<ActionType, ActionConfig>;
+
+export const DevicePinActionButton = ({
+    children,
+    type,
+    colorScheme,
+}: DevicePinActionButtonProps) => {
+    const navigation = useNavigation<NavigationProp>();
+    const dispatch = useDispatch();
+    const { showToast } = useToast();
+    const { showAlert, hideAlert } = useAlert();
+
+    const device = useSelector(selectDevice);
+
+    const showSuccess = useCallback(
+        (messageKey: TxKeyPath) => {
+            showToast({
+                icon: 'check',
+                variant: 'success',
+                message: <Translation id={messageKey} />,
+            });
+        },
+        [showToast],
+    );
+
+    const showError = useCallback(
+        (titleKey: TxKeyPath, tryAgainAction: () => void) => {
+            showAlert({
+                title: <Translation id={titleKey} />,
+                primaryButtonTitle: <Translation id="generic.buttons.tryAgain" />,
+                primaryButtonVariant: 'redBold',
+                secondaryButtonTitle: <Translation id="generic.buttons.close" />,
+                secondaryButtonVariant: 'redElevation0',
+                onPressPrimaryButton: tryAgainAction,
+                onPressSecondaryButton: () => {
+                    hideAlert();
+                    navigation.goBack();
+                },
+            });
+        },
+        [showAlert, hideAlert, navigation],
+    );
+
+    const changePin = useCallback(async () => {
+        navigation.navigate(DeviceStackRoutes.DevicePinProtection);
+        analytics.report({
+            type: EventType.DeviceSettingsPinProtectionChange,
+            payload: { action: type },
+        });
+
+        const { param, successMessageKey, canceledMessageKey } = actionConfigMap[type];
+
+        const result = await requestPrioritizedDeviceAccess({
+            deviceCallback: () =>
+                TrezorConnect.changePin({
+                    device: {
+                        path: device?.path,
+                    },
+                    remove: param,
+                }),
+        });
+        dispatch(removeButtonRequests({ device }));
+
+        if (!result.success) {
+            return;
+        }
+
+        const { success, payload } = result.payload;
+        if (success) {
+            showSuccess(successMessageKey);
+            navigation.goBack();
+        } else {
+            const errorCode = payload.code;
+            if (errorCode === 'Failure_ActionCancelled' || errorCode === 'Failure_PinCancelled') {
+                showError(canceledMessageKey, changePin);
+            } else if (errorCode === 'Failure_PinInvalid') {
+                showError('moduleDeviceSettings.pinProtection.errors.pinInvalid', changePin);
+            } else if (errorCode === 'Failure_PinMismatch') {
+                showError('moduleDeviceSettings.pinProtection.errors.pinMismatch', changePin);
+            }
+        }
+    }, [navigation, dispatch, device, type, showSuccess, showError]);
+
+    return (
+        <Button
+            onPress={changePin}
+            colorScheme={colorScheme}
+            size="small"
+            testID={`@device-pin-protection/${type}-button`}
+        >
+            {children}
+        </Button>
+    );
+};
diff --git a/suite-native/module-device-settings/src/components/DevicePinProtectionCard.tsx b/suite-native/module-device-settings/src/components/DevicePinProtectionCard.tsx
new file mode 100644
index 00000000000..226c8e9fd29
--- /dev/null
+++ b/suite-native/module-device-settings/src/components/DevicePinProtectionCard.tsx
@@ -0,0 +1,46 @@
+import { useSelector } from 'react-redux';
+
+import { selectDevice, selectIsDeviceProtectedByPin } from '@suite-common/wallet-core';
+import { Box, HStack, Text, VStack } from '@suite-native/atoms';
+import { Translation } from '@suite-native/intl';
+
+import { DevicePinActionButton } from './DevicePinActionButton';
+import { DeviceSettingsCard } from './DeviceSettingsCard';
+
+export const DevicePinProtectionCard = () => {
+    const device = useSelector(selectDevice);
+    const isDeviceProtectedByPin = useSelector(selectIsDeviceProtectedByPin);
+
+    if (!device) {
+        return;
+    }
+
+    return (
+        <DeviceSettingsCard
+            icon="password"
+            title={<Translation id="moduleDeviceSettings.pinProtection.title" />}
+        >
+            <VStack marginTop="sp2" spacing="sp16">
+                <Text variant="body" color="textSubdued">
+                    <Translation id="moduleDeviceSettings.pinProtection.content" />
+                </Text>
+                {!isDeviceProtectedByPin ? (
+                    <DevicePinActionButton type="enable">
+                        <Translation id="generic.buttons.enable" />
+                    </DevicePinActionButton>
+                ) : (
+                    <HStack>
+                        <DevicePinActionButton type="disable" colorScheme="redElevation0">
+                            <Translation id="generic.buttons.disable" />
+                        </DevicePinActionButton>
+                        <Box flex={1}>
+                            <DevicePinActionButton type="change" colorScheme="tertiaryElevation0">
+                                <Translation id="moduleDeviceSettings.pinProtection.changeButton" />
+                            </DevicePinActionButton>
+                        </Box>
+                    </HStack>
+                )}
+            </VStack>
+        </DeviceSettingsCard>
+    );
+};
diff --git a/suite-native/module-device-settings/src/components/DeviceSettingsCard.tsx b/suite-native/module-device-settings/src/components/DeviceSettingsCard.tsx
new file mode 100644
index 00000000000..15cc8fa865a
--- /dev/null
+++ b/suite-native/module-device-settings/src/components/DeviceSettingsCard.tsx
@@ -0,0 +1,45 @@
+import { ReactNode } from 'react';
+
+import { Icon, IconName } from '@suite-native/icons';
+import { AlertBox, AlertBoxProps, Box, Card, HStack, Text, VStack } from '@suite-native/atoms';
+import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+
+const contentStyle = prepareNativeStyle(() => ({
+    flexGrow: 1,
+    flexShrink: 1,
+}));
+
+type DeviceSettingsCardProps = {
+    icon: IconName;
+    title: ReactNode;
+    children: ReactNode;
+    alertBoxProps?: Omit<AlertBoxProps, 'borderRadius'>;
+};
+
+export const DeviceSettingsCard = ({
+    icon,
+    title,
+    children,
+    alertBoxProps,
+}: DeviceSettingsCardProps) => {
+    const { applyStyle } = useNativeStyles();
+
+    return (
+        <Card borderColor="borderElevation1" noPadding>
+            <HStack margin="sp16" spacing="sp12">
+                <Box marginVertical="sp2">
+                    <Icon name={icon} size="mediumLarge" />
+                </Box>
+                <VStack spacing={0} style={applyStyle(contentStyle)}>
+                    <Text variant="highlight">{title}</Text>
+                    {children}
+                </VStack>
+            </HStack>
+            {alertBoxProps && (
+                <Box margin="sp4">
+                    <AlertBox {...alertBoxProps} borderRadius="r12" />
+                </Box>
+            )}
+        </Card>
+    );
+};
diff --git a/suite-native/device/src/components/HowToUpdateBottomSheet.tsx b/suite-native/module-device-settings/src/components/HowToUpdateBottomSheet.tsx
similarity index 74%
rename from suite-native/device/src/components/HowToUpdateBottomSheet.tsx
rename to suite-native/module-device-settings/src/components/HowToUpdateBottomSheet.tsx
index d3f2e22dab6..5d71e87aa3c 100644
--- a/suite-native/device/src/components/HowToUpdateBottomSheet.tsx
+++ b/suite-native/module-device-settings/src/components/HowToUpdateBottomSheet.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 
-import { BottomSheet, VStack, Box, Button, Text } from '@suite-native/atoms';
+import { BottomSheet, Box, Button, Text, VStack } from '@suite-native/atoms';
 import { Translation } from '@suite-native/intl';
 import { useOpenLink } from '@suite-native/link';
 
@@ -27,17 +27,17 @@ export const HowToUpdateBottomSheet = ({
             <VStack spacing="sp24">
                 <VStack paddingHorizontal="sp24">
                     <Text variant="callout">
-                        <Translation id="deviceInfo.updateHowTo.subtitle" />
+                        <Translation id="moduleDeviceSettings.updateHowTo.subtitle" />
                     </Text>
                     <Box>
                         <Text color="textSubdued">
-                            <Translation id="deviceInfo.updateHowTo.lines.1" />
+                            <Translation id="moduleDeviceSettings.updateHowTo.lines.1" />
                         </Text>
                         <Text color="textSubdued">
-                            <Translation id="deviceInfo.updateHowTo.lines.2" />
+                            <Translation id="moduleDeviceSettings.updateHowTo.lines.2" />
                         </Text>
                         <Text color="textSubdued">
-                            <Translation id="deviceInfo.updateHowTo.lines.3" />
+                            <Translation id="moduleDeviceSettings.updateHowTo.lines.3" />
                         </Text>
                     </Box>
                 </VStack>
@@ -46,7 +46,7 @@ export const HowToUpdateBottomSheet = ({
                     onPress={handleHelpClick}
                     viewRight="arrowUpRight"
                 >
-                    <Translation id="deviceInfo.updateHowTo.button" />
+                    <Translation id="moduleDeviceSettings.updateHowTo.button" />
                 </Button>
             </VStack>
         </BottomSheet>
diff --git a/suite-native/module-device-settings/src/index.ts b/suite-native/module-device-settings/src/index.ts
new file mode 100644
index 00000000000..20764cdb209
--- /dev/null
+++ b/suite-native/module-device-settings/src/index.ts
@@ -0,0 +1,3 @@
+export * from './navigation/DevicePinProtectionStackNavigator';
+export * from './navigation/DeviceSettingsStackNavigator';
+export * from './screens/DeviceSettingsModalScreen';
diff --git a/suite-native/module-device-settings/src/navigation/DevicePinProtectionStackNavigator.tsx b/suite-native/module-device-settings/src/navigation/DevicePinProtectionStackNavigator.tsx
new file mode 100644
index 00000000000..4cf5add017d
--- /dev/null
+++ b/suite-native/module-device-settings/src/navigation/DevicePinProtectionStackNavigator.tsx
@@ -0,0 +1,64 @@
+import { useSelector } from 'react-redux';
+
+import { A } from '@mobily/ts-belt';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+
+import { selectDeviceButtonRequestsCodes } from '@suite-common/wallet-core';
+import {
+    DevicePinProtectionStackParamList,
+    DevicePinProtectionStackRoutes,
+    stackNavigationOptionsConfig,
+} from '@suite-native/navigation';
+
+import { ContinueOnTrezorScreen } from '../screens/ContinueOnTrezorScreen';
+import {
+    ConfirmNewPinScreen,
+    EnterCurrentPinScreen,
+    EnterNewPinScreen,
+} from '../screens/EnterPinScreen';
+
+const DevicePinProtectionStack = createNativeStackNavigator<DevicePinProtectionStackParamList>();
+
+export const DevicePinProtectionStackNavigator = () => {
+    const buttonRequestCodes = useSelector(selectDeviceButtonRequestsCodes);
+    const lastButtonRequestCode = A.last(buttonRequestCodes);
+
+    const isEnterCurrentPin = lastButtonRequestCode === 'PinMatrixRequestType_Current';
+    const isEnterNewPin = lastButtonRequestCode === 'PinMatrixRequestType_NewFirst';
+    const isConfirmNewPin = lastButtonRequestCode === 'PinMatrixRequestType_NewSecond';
+    const isContinueOnTrezor = !isEnterCurrentPin && !isEnterNewPin && !isConfirmNewPin;
+
+    // To indicate progress to the user we need separate screens for individual steps of the flow.
+    // At the same time we need just one available so that navigation.goBack() works as expected.
+    return (
+        <DevicePinProtectionStack.Navigator
+            initialRouteName={DevicePinProtectionStackRoutes.ContinueOnTrezor}
+            screenOptions={stackNavigationOptionsConfig}
+        >
+            {isContinueOnTrezor && (
+                <DevicePinProtectionStack.Screen
+                    name={DevicePinProtectionStackRoutes.ContinueOnTrezor}
+                    component={ContinueOnTrezorScreen}
+                />
+            )}
+            {isEnterCurrentPin && (
+                <DevicePinProtectionStack.Screen
+                    name={DevicePinProtectionStackRoutes.EnterCurrentPin}
+                    component={EnterCurrentPinScreen}
+                />
+            )}
+            {isEnterNewPin && (
+                <DevicePinProtectionStack.Screen
+                    name={DevicePinProtectionStackRoutes.EnterNewPin}
+                    component={EnterNewPinScreen}
+                />
+            )}
+            {isConfirmNewPin && (
+                <DevicePinProtectionStack.Screen
+                    name={DevicePinProtectionStackRoutes.ConfirmNewPin}
+                    component={ConfirmNewPinScreen}
+                />
+            )}
+        </DevicePinProtectionStack.Navigator>
+    );
+};
diff --git a/suite-native/module-device-settings/src/navigation/DeviceSettingsStackNavigator.tsx b/suite-native/module-device-settings/src/navigation/DeviceSettingsStackNavigator.tsx
new file mode 100644
index 00000000000..675cad62b84
--- /dev/null
+++ b/suite-native/module-device-settings/src/navigation/DeviceSettingsStackNavigator.tsx
@@ -0,0 +1,28 @@
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+
+import {
+    DeviceSettingsStackParamList,
+    DeviceStackRoutes,
+    stackNavigationOptionsConfig,
+} from '@suite-native/navigation';
+
+import { DeviceSettingsModalScreen } from '../screens/DeviceSettingsModalScreen';
+import { DevicePinProtectionStackNavigator } from './DevicePinProtectionStackNavigator';
+
+const DeviceSettingsStack = createNativeStackNavigator<DeviceSettingsStackParamList>();
+
+export const DeviceSettingsStackNavigator = () => (
+    <DeviceSettingsStack.Navigator
+        initialRouteName={DeviceStackRoutes.DeviceSettings}
+        screenOptions={stackNavigationOptionsConfig}
+    >
+        <DeviceSettingsStack.Screen
+            name={DeviceStackRoutes.DeviceSettings}
+            component={DeviceSettingsModalScreen}
+        />
+        <DeviceSettingsStack.Screen
+            name={DeviceStackRoutes.DevicePinProtection}
+            component={DevicePinProtectionStackNavigator}
+        />
+    </DeviceSettingsStack.Navigator>
+);
diff --git a/suite-native/module-device-settings/src/screens/ContinueOnTrezorScreen.tsx b/suite-native/module-device-settings/src/screens/ContinueOnTrezorScreen.tsx
new file mode 100644
index 00000000000..9329f826960
--- /dev/null
+++ b/suite-native/module-device-settings/src/screens/ContinueOnTrezorScreen.tsx
@@ -0,0 +1,43 @@
+import { useSelector } from 'react-redux';
+
+import { selectDeviceModel } from '@suite-common/wallet-core';
+import { Box, Text } from '@suite-native/atoms';
+import { ConnectorImage, DeviceImage } from '@suite-native/device';
+import { Translation } from '@suite-native/intl';
+import { getScreenHeight } from '@trezor/env-utils';
+import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+
+import { DeviceInteractionScreenWrapper } from '../components/DeviceInteractionScreenWrapper';
+
+const SCREEN_HEIGHT = getScreenHeight();
+
+const titleStyle = prepareNativeStyle(utils => ({
+    marginTop: utils.spacings.sp12,
+    textAlign: 'center',
+}));
+
+export const ContinueOnTrezorScreen = () => {
+    const { applyStyle } = useNativeStyles();
+
+    const deviceModel = useSelector(selectDeviceModel);
+
+    if (!deviceModel) {
+        return null;
+    }
+
+    return (
+        <DeviceInteractionScreenWrapper>
+            <Text variant="titleMedium" style={applyStyle(titleStyle)}>
+                <Translation id="device.title.continueOnTrezor" />
+            </Text>
+            <Box flex={1} alignItems="center" justifyContent="flex-end">
+                <DeviceImage
+                    deviceModel={deviceModel}
+                    size="large"
+                    maxHeight={0.42 * SCREEN_HEIGHT}
+                />
+                <ConnectorImage maxHeight={0.18 * SCREEN_HEIGHT} />
+            </Box>
+        </DeviceInteractionScreenWrapper>
+    );
+};
diff --git a/suite-native/module-device-settings/src/screens/DeviceSettingsModalScreen.tsx b/suite-native/module-device-settings/src/screens/DeviceSettingsModalScreen.tsx
new file mode 100644
index 00000000000..1d3e95c48a2
--- /dev/null
+++ b/suite-native/module-device-settings/src/screens/DeviceSettingsModalScreen.tsx
@@ -0,0 +1,92 @@
+import { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+
+import { useNavigation } from '@react-navigation/native';
+
+import {
+    selectDevice,
+    selectDeviceModel,
+    selectDeviceReleaseInfo,
+    selectIsPortfolioTrackerDevice,
+} from '@suite-common/wallet-core';
+import { Button, Text, VStack } from '@suite-native/atoms';
+import { DeviceImage } from '@suite-native/device';
+import { Translation, useTranslate } from '@suite-native/intl';
+import {
+    AppTabsRoutes,
+    HomeStackRoutes,
+    RootStackParamList,
+    RootStackRoutes,
+    Screen,
+    ScreenSubHeader,
+    StackNavigationProps,
+} from '@suite-native/navigation';
+
+import { DeviceFirmwareCard } from '../components/DeviceFirmwareCard';
+import { DevicePinProtectionCard } from '../components/DevicePinProtectionCard';
+import { HowToUpdateBottomSheet } from '../components/HowToUpdateBottomSheet';
+
+type NavigationProp = StackNavigationProps<RootStackParamList, RootStackRoutes.DeviceSettingsStack>;
+
+export const DeviceSettingsModalScreen = () => {
+    const navigation = useNavigation<NavigationProp>();
+    const { translate } = useTranslate();
+
+    const device = useSelector(selectDevice);
+    const deviceModel = useSelector(selectDeviceModel);
+    const isPortfolioTrackerDevice = useSelector(selectIsPortfolioTrackerDevice);
+    const deviceReleaseInfo = useSelector(selectDeviceReleaseInfo);
+
+    const [isUpdateSheetOpen, setIsUpdateSheetOpen] = useState<boolean>(false);
+
+    const isUpgradable = deviceReleaseInfo?.isNewer ?? false;
+
+    useEffect(() => {
+        if (isPortfolioTrackerDevice) {
+            navigation.navigate(RootStackRoutes.AppTabs, {
+                screen: AppTabsRoutes.HomeStack,
+                params: {
+                    screen: HomeStackRoutes.Home,
+                },
+            });
+        }
+    }, [isPortfolioTrackerDevice, navigation]);
+
+    if (!device || !deviceModel) {
+        return null;
+    }
+
+    const handleUpdateClick = () => setIsUpdateSheetOpen(true);
+
+    return (
+        <Screen
+            screenHeader={
+                <ScreenSubHeader
+                    customHorizontalPadding="sp16"
+                    content={translate('moduleDeviceSettings.title')}
+                    closeActionType="close"
+                />
+            }
+            customHorizontalPadding="sp16"
+        >
+            <VStack marginVertical="sp32" spacing="sp24" alignItems="center">
+                <DeviceImage deviceModel={deviceModel} />
+                <Text variant="titleMedium">{device.name}</Text>
+            </VStack>
+            <VStack spacing="sp24">
+                <DeviceFirmwareCard />
+                <DevicePinProtectionCard />
+                {isUpgradable && (
+                    <Button colorScheme="primary" onPress={handleUpdateClick}>
+                        <Translation id="moduleDeviceSettings.updateHowTo.title" />
+                    </Button>
+                )}
+            </VStack>
+            <HowToUpdateBottomSheet
+                isVisible={isUpdateSheetOpen}
+                onClose={setIsUpdateSheetOpen}
+                title={<Translation id="moduleDeviceSettings.updateHowTo.title" />}
+            />
+        </Screen>
+    );
+};
diff --git a/suite-native/module-device-settings/src/screens/EnterPinScreen.tsx b/suite-native/module-device-settings/src/screens/EnterPinScreen.tsx
new file mode 100644
index 00000000000..1ae9b2ae9ee
--- /dev/null
+++ b/suite-native/module-device-settings/src/screens/EnterPinScreen.tsx
@@ -0,0 +1,17 @@
+import { PinFormVariant, PinOnKeypad } from '@suite-native/module-authorize-device';
+
+import { DeviceInteractionScreenWrapper } from '../components/DeviceInteractionScreenWrapper';
+
+type EnterPinScreenProps = {
+    variant: PinFormVariant;
+};
+
+const EnterPinScreen = ({ variant }: EnterPinScreenProps) => (
+    <DeviceInteractionScreenWrapper>
+        <PinOnKeypad variant={variant} />
+    </DeviceInteractionScreenWrapper>
+);
+
+export const EnterCurrentPinScreen = () => <EnterPinScreen variant="current" />;
+export const EnterNewPinScreen = () => <EnterPinScreen variant="new" />;
+export const ConfirmNewPinScreen = () => <EnterPinScreen variant="confirm" />;
diff --git a/suite-native/module-device-settings/tsconfig.json b/suite-native/module-device-settings/tsconfig.json
new file mode 100644
index 00000000000..86b27248543
--- /dev/null
+++ b/suite-native/module-device-settings/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "extends": "../../tsconfig.base.json",
+    "compilerOptions": { "outDir": "libDev" },
+    "references": [
+        {
+            "path": "../../suite-common/suite-utils"
+        },
+        {
+            "path": "../../suite-common/wallet-core"
+        },
+        { "path": "../alerts" },
+        { "path": "../analytics" },
+        { "path": "../atoms" },
+        { "path": "../device" },
+        { "path": "../device-mutex" },
+        { "path": "../icons" },
+        { "path": "../intl" },
+        { "path": "../link" },
+        { "path": "../module-authorize-device" },
+        { "path": "../navigation" },
+        { "path": "../toasts" },
+        { "path": "../../packages/connect" },
+        { "path": "../../packages/device-utils" },
+        { "path": "../../packages/env-utils" },
+        { "path": "../../packages/styles" }
+    ]
+}
diff --git a/suite-native/module-home/package.json b/suite-native/module-home/package.json
index c567f56663e..37494351e02 100644
--- a/suite-native/module-home/package.json
+++ b/suite-native/module-home/package.json
@@ -7,7 +7,6 @@
     "type": "module",
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-native/module-home/src/screens/HomeScreen/HomeScreen.tsx b/suite-native/module-home/src/screens/HomeScreen/HomeScreen.tsx
index dbb7a53a586..b626b66d388 100644
--- a/suite-native/module-home/src/screens/HomeScreen/HomeScreen.tsx
+++ b/suite-native/module-home/src/screens/HomeScreen/HomeScreen.tsx
@@ -17,7 +17,6 @@ import { PortfolioContent } from './components/PortfolioContent';
 import { useHomeRefreshControl } from './useHomeRefreshControl';
 import { EnableViewOnlyBottomSheet } from './components/EnableViewOnlyBottomSheet';
 import { PortfolioGraphRef } from './components/PortfolioGraph';
-
 export const HomeScreen = () => {
     const isDiscoveredDeviceAccountless = useSelector(selectIsDiscoveredDeviceAccountless);
     const isDeviceAuthorized = useSelector(selectIsDeviceAuthorized);
@@ -42,7 +41,7 @@ export const HomeScreen = () => {
             customHorizontalPadding={0}
         >
             {isEmptyHomeRendererShown ? (
-                <Box marginHorizontal="sp8">
+                <Box marginHorizontal="sp16" marginBottom="sp8">
                     <EmptyHomeRenderer />
                 </Box>
             ) : (
diff --git a/suite-native/module-home/src/screens/HomeScreen/components/BiometricsBottomSheet.tsx b/suite-native/module-home/src/screens/HomeScreen/components/BiometricsBottomSheet.tsx
index 05d1dcbeddc..774e7d1cda5 100644
--- a/suite-native/module-home/src/screens/HomeScreen/components/BiometricsBottomSheet.tsx
+++ b/suite-native/module-home/src/screens/HomeScreen/components/BiometricsBottomSheet.tsx
@@ -23,7 +23,7 @@ const SHOW_TIMEOUT = 1500;
 const cardStyle = prepareNativeStyle(utils => ({
     alignItems: 'center',
     textAlign: 'center',
-    borderRadius: utils.borders.radii.medium,
+    borderRadius: utils.borders.radii.r16,
     backgroundColor: utils.colors.backgroundSurfaceElevation1,
     padding: utils.spacings.sp24,
     marginBottom: utils.spacings.sp24,
diff --git a/suite-native/module-home/src/screens/HomeScreen/components/EmptyConnectedDeviceState.tsx b/suite-native/module-home/src/screens/HomeScreen/components/EmptyConnectedDeviceState.tsx
index 2bb7c10b9b2..0e27fffa96b 100644
--- a/suite-native/module-home/src/screens/HomeScreen/components/EmptyConnectedDeviceState.tsx
+++ b/suite-native/module-home/src/screens/HomeScreen/components/EmptyConnectedDeviceState.tsx
@@ -42,7 +42,7 @@ export const EmptyConnectedDeviceState = () => {
                 <PictogramTitleHeader
                     variant="green"
                     size="large"
-                    icon="infoLight"
+                    icon="info"
                     title={<Translation id="moduleHome.emptyState.device.title" />}
                     subtitle={<Translation id="moduleHome.emptyState.device.subtitle" />}
                 />
diff --git a/suite-native/module-home/src/screens/HomeScreen/components/PortfolioContent.tsx b/suite-native/module-home/src/screens/HomeScreen/components/PortfolioContent.tsx
index cf8ec9162d2..8f46b1e37e6 100644
--- a/suite-native/module-home/src/screens/HomeScreen/components/PortfolioContent.tsx
+++ b/suite-native/module-home/src/screens/HomeScreen/components/PortfolioContent.tsx
@@ -37,12 +37,12 @@ export const PortfolioContent = forwardRef<PortfolioGraphRef>((_props, ref) => {
     return (
         <VStack spacing="sp24" marginTop="sp8">
             <PortfolioGraph ref={ref} />
-            <VStack spacing="sp24" marginHorizontal="sp8">
+            <VStack spacing="sp24" marginHorizontal="sp16">
                 <Box>
                     <Assets />
                 </Box>
                 {isPortfolioTrackerDevice && (
-                    <Box>
+                    <Box marginBottom="sp8">
                         <Button
                             testID="@home/portfolio/sync-coins-button"
                             colorScheme="tertiaryElevation0"
@@ -61,7 +61,7 @@ export const PortfolioContent = forwardRef<PortfolioGraphRef>((_props, ref) => {
                                 data-testID="@home/portolio/recieve-button"
                                 size="large"
                                 onPress={handleReceive}
-                                viewLeft="receive"
+                                viewLeft="arrowLineDown"
                             >
                                 <Translation id="moduleHome.buttons.receive" />
                             </Button>
diff --git a/suite-native/module-onboarding/package.json b/suite-native/module-onboarding/package.json
index 4d449f656f7..dfba97dc226 100644
--- a/suite-native/module-onboarding/package.json
+++ b/suite-native/module-onboarding/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -15,11 +14,11 @@
         "@react-navigation/native": "6.1.18",
         "@react-navigation/native-stack": "6.11.0",
         "@reduxjs/toolkit": "1.9.5",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-native/analytics": "workspace:*",
         "@suite-native/atoms": "workspace:*",
         "@suite-native/device": "workspace:*",
         "@suite-native/feature-flags": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/link": "workspace:*",
         "@suite-native/navigation": "workspace:*",
diff --git a/suite-native/module-onboarding/src/components/AnalyticsInfoRow.tsx b/suite-native/module-onboarding/src/components/AnalyticsInfoRow.tsx
index d7b45675882..8160959639f 100644
--- a/suite-native/module-onboarding/src/components/AnalyticsInfoRow.tsx
+++ b/suite-native/module-onboarding/src/components/AnalyticsInfoRow.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 
-import { Icon, IconName } from '@suite-common/icons-deprecated';
+import { Icon, IconName } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { Box, Text } from '@suite-native/atoms';
 
diff --git a/suite-native/module-onboarding/src/screens/AnalyticsConsentScreen.tsx b/suite-native/module-onboarding/src/screens/AnalyticsConsentScreen.tsx
index 3532ae7c247..0076f90001c 100644
--- a/suite-native/module-onboarding/src/screens/AnalyticsConsentScreen.tsx
+++ b/suite-native/module-onboarding/src/screens/AnalyticsConsentScreen.tsx
@@ -17,7 +17,7 @@ import {
 } from '@suite-native/navigation';
 import { Box, Button, Stack, Switch, Text, VStack } from '@suite-native/atoms';
 import { Translation } from '@suite-native/intl';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { EventType, analytics } from '@suite-native/analytics';
 import { Link } from '@suite-native/link';
@@ -138,7 +138,7 @@ export const AnalyticsConsentScreen = () => {
                 justifyContent="space-between"
                 style={applyStyle(cardStyle)}
             >
-                <Icon size="extraLarge" name="trezor" color="iconDefault" />
+                <Icon size="extraLarge" name="trezorLogo" color="iconDefault" />
                 <Text variant="titleMedium" style={applyStyle(titleStyle)}>
                     <Translation id="moduleOnboarding.analyticsConsentScreen.title" />
                 </Text>
diff --git a/suite-native/module-onboarding/src/screens/WelcomeScreen.tsx b/suite-native/module-onboarding/src/screens/WelcomeScreen.tsx
index 4b05235c9d6..fd44ddb367b 100644
--- a/suite-native/module-onboarding/src/screens/WelcomeScreen.tsx
+++ b/suite-native/module-onboarding/src/screens/WelcomeScreen.tsx
@@ -9,7 +9,7 @@ import {
     StackNavigationProps,
 } from '@suite-native/navigation';
 import { Translation } from '@suite-native/intl';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
 import { OnboardingFooter } from '../components/OnboardingFooter';
@@ -57,7 +57,7 @@ export const WelcomeScreen = () => {
             <Box alignItems="center" justifyContent="center">
                 <Box alignItems="center">
                     <Box marginBottom="sp24">
-                        <Icon size="extraLarge" name="trezor" color="iconDefault" />
+                        <Icon size="extraLarge" name="trezorLogo" color="iconDefault" />
                     </Box>
                     <Box style={applyStyle(titleStyle)}>
                         <Text variant="titleMedium" textAlign="center">
diff --git a/suite-native/module-onboarding/tsconfig.json b/suite-native/module-onboarding/tsconfig.json
index bc45d8ec66a..572b4d5cbf6 100644
--- a/suite-native/module-onboarding/tsconfig.json
+++ b/suite-native/module-onboarding/tsconfig.json
@@ -2,13 +2,11 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         { "path": "../analytics" },
         { "path": "../atoms" },
         { "path": "../device" },
         { "path": "../feature-flags" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../link" },
         { "path": "../navigation" },
diff --git a/suite-native/module-receive/package.json b/suite-native/module-receive/package.json
index e97c53bd270..1ebd9297dd4 100644
--- a/suite-native/module-receive/package.json
+++ b/suite-native/module-receive/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-native/module-receive/src/screens/ReceiveAccountsScreen.tsx b/suite-native/module-receive/src/screens/ReceiveAccountsScreen.tsx
index 54c354f95ea..e6c3cd6c679 100644
--- a/suite-native/module-receive/src/screens/ReceiveAccountsScreen.tsx
+++ b/suite-native/module-receive/src/screens/ReceiveAccountsScreen.tsx
@@ -41,6 +41,7 @@ export const ReceiveAccountsScreen = () => {
 
     return (
         <Screen
+            customHorizontalPadding="sp16"
             screenHeader={<DeviceManagerScreenHeader />}
             subheader={
                 <SearchableAccountsListScreenHeader
diff --git a/suite-native/module-send/package.json b/suite-native/module-send/package.json
index 2c518606a5a..f73a267b01e 100644
--- a/suite-native/module-send/package.json
+++ b/suite-native/module-send/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -16,7 +15,6 @@
         "@react-navigation/native-stack": "6.11.0",
         "@reduxjs/toolkit": "1.9.5",
         "@suite-common/formatters": "workspace:*",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/redux-utils": "workspace:*",
         "@suite-common/suite-utils": "workspace:*",
         "@suite-common/validators": "workspace:*",
@@ -28,27 +26,34 @@
         "@suite-native/alerts": "workspace:*",
         "@suite-native/analytics": "workspace:*",
         "@suite-native/atoms": "workspace:*",
+        "@suite-native/config": "workspace:*",
         "@suite-native/device": "workspace:*",
         "@suite-native/device-mutex": "workspace:*",
         "@suite-native/formatters": "workspace:*",
         "@suite-native/forms": "workspace:*",
         "@suite-native/helpers": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
+        "@suite-native/link": "workspace:*",
         "@suite-native/navigation": "workspace:*",
         "@suite-native/qr-code": "workspace:*",
         "@suite-native/settings": "workspace:*",
+        "@suite-native/tokens": "workspace:*",
         "@trezor/blockchain-link-types": "workspace:*",
+        "@trezor/connect": "workspace:*",
         "@trezor/react-utils": "workspace:*",
         "@trezor/styles": "workspace:*",
         "@trezor/theme": "workspace:*",
         "@trezor/transport": "workspace:*",
         "@trezor/utils": "workspace:*",
         "expo-linear-gradient": "13.0.2",
+        "jotai": "1.9.1",
         "react": "18.2.0",
-        "react-hook-form": "^7.53.0",
+        "react-hook-form": "^7.53.1",
         "react-native": "0.75.2",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-native-svg": "15.6.0",
-        "react-redux": "8.0.7"
+        "react-redux": "8.0.7",
+        "web3-utils": "^4.3.1"
     }
 }
diff --git a/suite-native/module-send/src/atoms/wasAppLeftDuringReviewAtom.ts b/suite-native/module-send/src/atoms/wasAppLeftDuringReviewAtom.ts
new file mode 100644
index 00000000000..492b3cfe4f0
--- /dev/null
+++ b/suite-native/module-send/src/atoms/wasAppLeftDuringReviewAtom.ts
@@ -0,0 +1,3 @@
+import { atom } from 'jotai';
+
+export const wasAppLeftDuringReviewAtom = atom<boolean>(false);
diff --git a/suite-native/module-send/src/components/AddressChecksumMessage.tsx b/suite-native/module-send/src/components/AddressChecksumMessage.tsx
new file mode 100644
index 00000000000..11024b3a351
--- /dev/null
+++ b/suite-native/module-send/src/components/AddressChecksumMessage.tsx
@@ -0,0 +1,32 @@
+import Animated, { FadeIn, FadeOut } from 'react-native-reanimated';
+
+import { Link } from '@suite-native/link';
+import { HStack, Text } from '@suite-native/atoms';
+import { Icon } from '@suite-native/icons';
+import { Translation } from '@suite-native/intl';
+
+const LINK_URL = 'https://trezor.io/learn/a/evm-address-checksum-in-trezor-suite';
+
+export const AddressChecksumMessage = () => (
+    <Animated.View entering={FadeIn} exiting={FadeOut}>
+        <HStack>
+            <Icon name="info" size="medium" color="iconSubdued" />
+            <Text variant="label" color="textSubdued">
+                <Translation
+                    id="moduleSend.outputs.recipients.checksum.label"
+                    values={{
+                        link: linkChunk => (
+                            <Link
+                                href={LINK_URL}
+                                label={linkChunk}
+                                textVariant="label"
+                                isUnderlined
+                                textColor="textSubdued"
+                            />
+                        ),
+                    }}
+                />
+            </Text>
+        </HStack>
+    </Animated.View>
+);
diff --git a/suite-native/module-send/src/components/AddressInput.tsx b/suite-native/module-send/src/components/AddressInput.tsx
index 1e49caa78a0..02607614c1d 100644
--- a/suite-native/module-send/src/components/AddressInput.tsx
+++ b/suite-native/module-send/src/components/AddressInput.tsx
@@ -2,16 +2,25 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 
 import { formInputsMaxLength } from '@suite-common/validators';
-import { VStack, Text } from '@suite-native/atoms';
+import { VStack, Text, HStack, Button } from '@suite-native/atoms';
 import { TextInputField, useFormContext } from '@suite-native/forms';
 import { Translation } from '@suite-native/intl';
 import { analytics, EventType } from '@suite-native/analytics';
 import { isAddressValid } from '@suite-common/wallet-utils';
 import { AccountKey } from '@suite-common/wallet-types';
-import { AccountsRootState, selectAccountNetworkSymbol } from '@suite-common/wallet-core';
+import {
+    AccountsRootState,
+    selectAccountNetworkSymbol,
+    TransactionsRootState,
+} from '@suite-common/wallet-core';
+import { NativeAccountsRootState, selectFreshAccountAddress } from '@suite-native/accounts';
+import { isDebugEnv } from '@suite-native/config';
 
 import { QrCodeBottomSheetIcon } from './QrCodeBottomSheetIcon';
 import { getOutputFieldName } from '../utils';
+import { SendOutputsFormValues } from '../sendOutputsFormSchema';
+import { useAddressValidationAlerts } from '../hooks/useAddressValidationAlerts';
+import { AddressChecksumMessage } from './AddressChecksumMessage';
 
 type AddressInputProps = {
     index: number;
@@ -19,12 +28,19 @@ type AddressInputProps = {
 };
 export const AddressInput = ({ index, accountKey }: AddressInputProps) => {
     const addressFieldName = getOutputFieldName(index, 'address');
-    const { setValue } = useFormContext();
+    const { setValue } = useFormContext<SendOutputsFormValues>();
 
     const networkSymbol = useSelector((state: AccountsRootState) =>
         selectAccountNetworkSymbol(state, accountKey),
     );
 
+    const freshAccountAddress = useSelector(
+        (state: NativeAccountsRootState & TransactionsRootState) =>
+            selectFreshAccountAddress(state, accountKey),
+    );
+
+    const { wasAddressChecksummed } = useAddressValidationAlerts({ inputIndex: index });
+
     const handleScanAddressQRCode = (qrCodeData: string) => {
         setValue(addressFieldName, qrCodeData, { shouldValidate: true });
         if (networkSymbol && isAddressValid(qrCodeData, networkSymbol)) {
@@ -38,11 +54,24 @@ export const AddressInput = ({ index, accountKey }: AddressInputProps) => {
         }
     };
 
+    // Debug helper to fill opened account address.
+    const fillSelfAddress = () => {
+        if (freshAccountAddress)
+            setValue(addressFieldName, freshAccountAddress.address, { shouldValidate: true });
+    };
+
     return (
         <VStack spacing="sp12">
-            <Text variant="hint">
-                <Translation id="moduleSend.outputs.recipients.addressLabel" />
-            </Text>
+            <HStack flex={1} justifyContent="space-between" alignItems="center">
+                <Text variant="hint">
+                    <Translation id="moduleSend.outputs.recipients.addressLabel" />
+                </Text>
+                {isDebugEnv() && (
+                    <Button size="small" colorScheme="tertiaryElevation0" onPress={fillSelfAddress}>
+                        DEV: self address
+                    </Button>
+                )}
+            </HStack>
             <TextInputField
                 multiline
                 name={addressFieldName}
@@ -52,6 +81,7 @@ export const AddressInput = ({ index, accountKey }: AddressInputProps) => {
                 accessibilityLabel="address input"
                 rightIcon={<QrCodeBottomSheetIcon onCodeScanned={handleScanAddressQRCode} />}
             />
+            {wasAddressChecksummed && <AddressChecksumMessage />}
         </VStack>
     );
 };
diff --git a/suite-native/module-send/src/components/AddressReviewHelpSheet.tsx b/suite-native/module-send/src/components/AddressReviewHelpSheet.tsx
index ed6e55bfe3a..ea7f47117e3 100644
--- a/suite-native/module-send/src/components/AddressReviewHelpSheet.tsx
+++ b/suite-native/module-send/src/components/AddressReviewHelpSheet.tsx
@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
 import { TouchableOpacity } from 'react-native';
 
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { Translation } from '@suite-native/intl';
 import { useAlert } from '@suite-native/alerts';
 
@@ -27,7 +27,7 @@ export const AddressReviewHelpSheet = ({ body, title, subtitle }: AddressReviewH
 
     return (
         <TouchableOpacity onPress={handleOpen}>
-            <Icon name="questionLight" size="large" color="iconSubdued" />
+            <Icon name="question" size="large" color="iconSubdued" />
         </TouchableOpacity>
     );
 };
diff --git a/suite-native/module-send/src/components/AddressReviewStep.tsx b/suite-native/module-send/src/components/AddressReviewStep.tsx
index 1f0fadea1aa..9fc30a3dae7 100644
--- a/suite-native/module-send/src/components/AddressReviewStep.tsx
+++ b/suite-native/module-send/src/components/AddressReviewStep.tsx
@@ -29,7 +29,7 @@ const getIconProps = (stepNumber: AddressReviewStepProps['stepNumber']): Ordered
         : {
               iconBackgroundColor: 'backgroundPrimaryDefault',
               iconNumber: undefined,
-              iconName: 'flagFinish',
+              iconName: 'flagCheckered',
               iconColor: 'iconDefaultInverted',
               iconSize: 'medium',
           };
diff --git a/suite-native/module-send/src/components/AddressReviewStepList.tsx b/suite-native/module-send/src/components/AddressReviewStepList.tsx
index fd2cbb6559d..37da0d5b7fa 100644
--- a/suite-native/module-send/src/components/AddressReviewStepList.tsx
+++ b/suite-native/module-send/src/components/AddressReviewStepList.tsx
@@ -1,9 +1,10 @@
+import { useCallback, useEffect, useState } from 'react';
+import { LayoutChangeEvent, View, AppState } from 'react-native';
 import { useDispatch, useSelector } from 'react-redux';
-import { useEffect, useState } from 'react';
-import { LayoutChangeEvent, View } from 'react-native';
 
+import { useSetAtom } from 'jotai';
 import { isRejected } from '@reduxjs/toolkit';
-import { useNavigation, useRoute } from '@react-navigation/native';
+import { useNavigation, useRoute, useFocusEffect } from '@react-navigation/native';
 
 import {
     RootStackParamList,
@@ -27,6 +28,7 @@ import { AddressReviewStep } from '../components/AddressReviewStep';
 import { CompareAddressHelpButton } from '../components/CompareAddressHelpButton';
 import { AddressOriginHelpButton } from '../components/AddressOriginHelpButton';
 import { useHandleSendReviewFailure } from '../hooks/useHandleSendReviewFailure';
+import { wasAppLeftDuringReviewAtom } from '../atoms/wasAppLeftDuringReviewAtom';
 
 const NUMBER_OF_STEPS = 3;
 const OVERLAY_INITIAL_POSITION = 75;
@@ -41,27 +43,48 @@ type NavigationProps = StackToStackCompositeNavigationProps<
 
 export const AddressReviewStepList = () => {
     const route = useRoute<RouteProps>();
-    const { accountKey, transaction } = route.params;
+    const { accountKey, transaction, tokenContract } = route.params;
     const navigation = useNavigation<NavigationProps>();
     const dispatch = useDispatch();
 
     const [childHeights, setChildHeights] = useState<number[]>([]);
     const [stepIndex, setStepIndex] = useState(0);
-    const handleSendReviewFailure = useHandleSendReviewFailure({ accountKey, transaction });
+    const handleSendReviewFailure = useHandleSendReviewFailure({
+        accountKey,
+        transaction,
+        tokenContract,
+    });
+    const setWasAppLeftDuringReview = useSetAtom(wasAppLeftDuringReviewAtom);
+
+    useFocusEffect(
+        useCallback(() => {
+            setWasAppLeftDuringReview(false);
+
+            const subscription = AppState.addEventListener('change', nextAppState => {
+                if (nextAppState === 'background') {
+                    setWasAppLeftDuringReview(true);
+                }
+            });
+
+            return () => {
+                subscription.remove();
+            };
+        }, [setWasAppLeftDuringReview]),
+    );
 
     const areAllStepsDone = stepIndex === NUMBER_OF_STEPS - 1;
     const isLayoutReady = childHeights.length === NUMBER_OF_STEPS;
 
     const isAddressConfirmed = useSelector(
         (state: AccountsRootState & DeviceRootState & SendRootState) =>
-            selectIsFirstTransactionAddressConfirmed(state, accountKey),
+            selectIsFirstTransactionAddressConfirmed(state, accountKey, tokenContract),
     );
 
     useEffect(() => {
         if (isAddressConfirmed) {
-            navigation.navigate(SendStackRoutes.SendOutputsReview, { accountKey });
+            navigation.navigate(SendStackRoutes.SendOutputsReview, { accountKey, tokenContract });
         }
-    }, [isAddressConfirmed, accountKey, navigation]);
+    }, [isAddressConfirmed, accountKey, navigation, tokenContract]);
 
     const handleReadItemListHeight = (event: LayoutChangeEvent, index: number) => {
         const { height } = event.nativeEvent.layout;
@@ -85,6 +108,7 @@ export const AddressReviewStepList = () => {
             const response = await dispatch(
                 signTransactionThunk({
                     accountKey,
+                    tokenContract,
                     feeLevel: transaction,
                 }),
             );
@@ -126,7 +150,7 @@ export const AddressReviewStepList = () => {
                     stepHeights={childHeights}
                     initialOffset={OVERLAY_INITIAL_POSITION}
                 >
-                    <Button onPress={handleNextStep}>
+                    <Button onPress={handleNextStep} testID="@send/address-review-continue">
                         <Translation id="generic.buttons.next" />
                     </Button>
                 </SlidingFooterOverlay>
diff --git a/suite-native/module-send/src/components/AmountInputs.tsx b/suite-native/module-send/src/components/AmountInputs.tsx
index e0d1572220a..243aa30fb5c 100644
--- a/suite-native/module-send/src/components/AmountInputs.tsx
+++ b/suite-native/module-send/src/components/AmountInputs.tsx
@@ -1,10 +1,11 @@
-import { useSharedValue, withTiming } from 'react-native-reanimated';
+import Animated, { LinearTransition, useSharedValue, withTiming } from 'react-native-reanimated';
 import { useRef, useState } from 'react';
-import { NativeSyntheticEvent, TextInput, TextInputFocusEventData } from 'react-native';
+import { TextInput, View, findNodeHandle } from 'react-native';
 import { useSelector } from 'react-redux';
 
-import { VStack, HStack, Box, Text } from '@suite-native/atoms';
-import { AccountKey } from '@suite-common/wallet-types';
+import { useRoute } from '@react-navigation/native';
+
+import { VStack, HStack, Text } from '@suite-native/atoms';
 import {
     AccountsRootState,
     selectAccountNetworkSymbol,
@@ -13,18 +14,25 @@ import {
 import { Translation } from '@suite-native/intl';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { analytics, EventType } from '@suite-native/analytics';
-import { useScrollView } from '@suite-native/navigation';
+import {
+    SendStackParamList,
+    SendStackRoutes,
+    StackProps,
+    useScrollView,
+} from '@suite-native/navigation';
 
 import { CryptoAmountInput } from './CryptoAmountInput';
 import { FiatAmountInput } from './FiatAmountInput';
 import { AmountErrorMessage } from './AmountErrorMessage';
 import { SwitchAmountsButton } from './SwitchAmountsButton';
+import { SendMaxButton } from './SendMaxButton';
 
 type AmountInputProps = {
     index: number;
-    accountKey: AccountKey;
 };
 
+type RouteProps = StackProps<SendStackParamList, SendStackRoutes.SendAddressReview>['route'];
+
 const ANIMATION_DURATION = 300;
 const SCALE_FOCUSED = 1;
 const SCALE_UNFOCUSED = 0.9;
@@ -44,7 +52,9 @@ const inputsWrapperStyle = prepareNativeStyle<{ isFiatDisplayed: boolean }>(
 const withPredefinedTiming = (toValue: number) =>
     withTiming(toValue, { duration: ANIMATION_DURATION });
 
-export const AmountInputs = ({ index, accountKey }: AmountInputProps) => {
+export const AmountInputs = ({ index }: AmountInputProps) => {
+    const route = useRoute<RouteProps>();
+    const { accountKey, tokenContract } = route.params;
     const { applyStyle } = useNativeStyles();
     const isTestnet = useSelector((state: AccountsRootState) =>
         selectIsTestnetAccount(state, accountKey),
@@ -57,6 +67,7 @@ export const AmountInputs = ({ index, accountKey }: AmountInputProps) => {
 
     const [isCryptoSelected, setIsCryptoSelected] = useState(true);
     const scrollView = useScrollView();
+    const amountInputsWrapperRef = useRef<View>(null);
 
     const cryptoRef = useRef<TextInput>(null);
     const cryptoScale = useSharedValue(SCALE_FOCUSED);
@@ -91,51 +102,75 @@ export const AmountInputs = ({ index, accountKey }: AmountInputProps) => {
         setIsCryptoSelected(!isCryptoSelected);
     };
 
-    const handleInputFocus = (e: NativeSyntheticEvent<TextInputFocusEventData>) => {
-        e.target?.measureInWindow((_, y) => {
-            scrollView?.scrollTo({ x: 0, y, animated: true });
-        });
+    const handleInputFocus = () => {
+        const amountInputsWrapper = amountInputsWrapperRef.current;
+        const scrollViewNodeHandle = findNodeHandle(scrollView);
+
+        if (!amountInputsWrapper || !scrollViewNodeHandle) return;
+
+        // Timeout is needed so the position is calculated after keyboard and footer animations are finished.
+        setTimeout(
+            () =>
+                // Scroll so the whole amount inputs section is visible.
+                amountInputsWrapper.measureLayout(scrollViewNodeHandle, (_, y) => {
+                    scrollView?.scrollTo({ y, animated: true });
+                }),
+            400,
+        );
     };
 
     if (!networkSymbol) return null;
 
     return (
-        <VStack spacing="sp12">
-            <HStack flex={1} justifyContent="space-between" alignItems="center">
-                <Text variant="hint">
-                    <Translation id="moduleSend.outputs.recipients.amountLabel" />
-                </Text>
-                {/* TODO: SEND MAX button */}
-                {/* <Button size="small" colorScheme="tertiaryElevation0">
-                    Send max
-                </Button> */}
-            </HStack>
-            <Box style={applyStyle(inputsWrapperStyle, { isFiatDisplayed })}>
-                <CryptoAmountInput
-                    recipientIndex={index}
-                    scaleValue={cryptoScale}
-                    translateValue={cryptoTranslateY}
-                    inputRef={cryptoRef}
-                    isDisabled={!isCryptoSelected}
-                    networkSymbol={networkSymbol}
-                    onFocus={handleInputFocus}
-                />
-                {isFiatDisplayed && (
-                    <>
-                        <SwitchAmountsButton onPress={handleSwitchInputs} />
-                        <FiatAmountInput
-                            recipientIndex={index}
-                            scaleValue={fiatScale}
-                            translateValue={fiatTranslateY}
-                            inputRef={fiatRef}
-                            isDisabled={isCryptoSelected}
-                            networkSymbol={networkSymbol}
-                            onFocus={handleInputFocus}
-                        />
-                    </>
-                )}
-            </Box>
-            <AmountErrorMessage outputIndex={index} isFiatDisplayed={isFiatDisplayed} />
-        </VStack>
+        <View ref={amountInputsWrapperRef}>
+            <VStack spacing="sp12">
+                <HStack flex={1} justifyContent="space-between" alignItems="center">
+                    <Animated.View layout={LinearTransition}>
+                        <Text variant="hint">
+                            <Translation id="moduleSend.outputs.recipients.amountLabel" />
+                        </Text>
+                    </Animated.View>
+                    <SendMaxButton
+                        outputIndex={index}
+                        accountKey={accountKey}
+                        tokenContract={tokenContract}
+                    />
+                </HStack>
+                <Animated.View
+                    layout={LinearTransition}
+                    style={applyStyle(inputsWrapperStyle, { isFiatDisplayed })}
+                >
+                    <CryptoAmountInput
+                        recipientIndex={index}
+                        scaleValue={cryptoScale}
+                        translateValue={cryptoTranslateY}
+                        inputRef={cryptoRef}
+                        accountKey={accountKey}
+                        isDisabled={!isCryptoSelected}
+                        networkSymbol={networkSymbol}
+                        onPress={!isCryptoSelected ? handleSwitchInputs : undefined}
+                        onFocus={handleInputFocus}
+                        tokenContract={tokenContract}
+                    />
+                    {isFiatDisplayed && (
+                        <>
+                            <SwitchAmountsButton onPress={handleSwitchInputs} />
+                            <FiatAmountInput
+                                recipientIndex={index}
+                                scaleValue={fiatScale}
+                                translateValue={fiatTranslateY}
+                                inputRef={fiatRef}
+                                isDisabled={isCryptoSelected}
+                                networkSymbol={networkSymbol}
+                                tokenContract={tokenContract}
+                                onPress={isCryptoSelected ? handleSwitchInputs : undefined}
+                                onFocus={handleInputFocus}
+                            />
+                        </>
+                    )}
+                </Animated.View>
+                <AmountErrorMessage outputIndex={index} isFiatDisplayed={isFiatDisplayed} />
+            </VStack>
+        </View>
     );
 };
diff --git a/suite-native/module-send/src/components/CorrectNetworkMessageCard.tsx b/suite-native/module-send/src/components/CorrectNetworkMessageCard.tsx
new file mode 100644
index 00000000000..86487e4526f
--- /dev/null
+++ b/suite-native/module-send/src/components/CorrectNetworkMessageCard.tsx
@@ -0,0 +1,55 @@
+import { CryptoIcon } from '@suite-native/icons';
+import { networks, NetworkSymbol } from '@suite-common/wallet-config';
+import { Card, HStack, Text } from '@suite-native/atoms';
+import { Translation } from '@suite-native/intl';
+import { Link } from '@suite-native/link';
+import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+import { isCoinWithTokens } from '@suite-native/tokens';
+
+const cardStyle = prepareNativeStyle(utils => ({
+    backgroundColor: utils.colors.backgroundTertiaryDefaultOnElevation0,
+    borderColor: utils.colors.borderElevation0,
+    borderWidth: utils.borders.widths.small,
+    paddingVertical: utils.spacings.sp12,
+
+    ...utils.boxShadows.none,
+}));
+
+type CorrectNetworkMessageCardProps = {
+    networkSymbol: NetworkSymbol;
+};
+
+const LINK_URL = 'https://trezor.io/learn/a/how-to-choose-the-right-network';
+
+export const CorrectNetworkMessageCard = ({ networkSymbol }: CorrectNetworkMessageCardProps) => {
+    const { applyStyle } = useNativeStyles();
+
+    if (!isCoinWithTokens(networkSymbol)) return null;
+
+    const networkName = networks[networkSymbol].name;
+
+    return (
+        <Card style={applyStyle(cardStyle)}>
+            <HStack spacing="sp12">
+                <CryptoIcon symbol={networkSymbol} size={20} />
+                <Text variant="hint">
+                    <Translation
+                        id="moduleSend.outputs.correctNetworkMessage"
+                        values={{
+                            networkName,
+                            link: linkChunk => (
+                                <Link
+                                    href={LINK_URL}
+                                    label={linkChunk}
+                                    isUnderlined
+                                    textVariant="hint"
+                                    textColor="textDefault"
+                                />
+                            ),
+                        }}
+                    />
+                </Text>
+            </HStack>
+        </Card>
+    );
+};
diff --git a/suite-native/module-send/src/components/CryptoAmountInput.tsx b/suite-native/module-send/src/components/CryptoAmountInput.tsx
index d21228d2565..65f93c359a2 100644
--- a/suite-native/module-send/src/components/CryptoAmountInput.tsx
+++ b/suite-native/module-send/src/components/CryptoAmountInput.tsx
@@ -1,18 +1,21 @@
 import { ReactNode } from 'react';
+import { Pressable } from 'react-native';
 import Animated, { useAnimatedStyle } from 'react-native-reanimated';
+import { useSelector } from 'react-redux';
 
 import { Text, Input } from '@suite-native/atoms';
-import { useFormContext } from '@suite-native/forms';
-import { useField } from '@suite-native/forms';
+import { useFormContext, useField } from '@suite-native/forms';
 import { useCryptoFiatConverters } from '@suite-native/formatters';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { useFormatters } from '@suite-common/formatters';
 import { Color } from '@trezor/theme';
 import { useDebounce } from '@trezor/react-utils';
+import { selectAccountTokenSymbol, TokensRootState } from '@suite-native/tokens';
 
 import { SendAmountInputProps } from '../types';
 import { useSendAmountTransformers } from '../hooks/useSendAmountTransformers';
 import { getOutputFieldName } from '../utils';
+import { SendOutputsFormValues } from '../sendOutputsFormSchema';
 
 export const sendAmountInputWrapperStyle = prepareNativeStyle<{ isDisabled: boolean }>(
     (_, { isDisabled }) => ({
@@ -41,15 +44,22 @@ export const CryptoAmountInput = ({
     scaleValue,
     translateValue,
     networkSymbol,
+    tokenContract,
+    accountKey,
+    onPress,
     onFocus,
     isDisabled = false,
 }: SendAmountInputProps) => {
     const { applyStyle } = useNativeStyles();
-    const { setValue, trigger } = useFormContext();
+    const { setValue, trigger } = useFormContext<SendOutputsFormValues>();
     const { cryptoAmountTransformer } = useSendAmountTransformers(networkSymbol);
     const { NetworkSymbolFormatter: formatter } = useFormatters();
     const debounce = useDebounce();
 
+    const tokenSymbol = useSelector((state: TokensRootState) =>
+        selectAccountTokenSymbol(state, accountKey, tokenContract),
+    );
+
     const cryptoFieldName = getOutputFieldName(recipientIndex, 'amount');
     const fiatFieldName = getOutputFieldName(recipientIndex, 'fiat');
 
@@ -58,7 +68,7 @@ export const CryptoAmountInput = ({
         valueTransformer: cryptoAmountTransformer,
     });
 
-    const converters = useCryptoFiatConverters({ networkSymbol });
+    const converters = useCryptoFiatConverters({ networkSymbol, tokenContract });
 
     const cryptoAnimatedStyle = useAnimatedStyle(
         () => ({
@@ -71,8 +81,14 @@ export const CryptoAmountInput = ({
     const handleChangeValue = (newValue: string) => {
         const transformedValue = cryptoAmountTransformer(newValue);
         onChange(transformedValue);
-        setValue(fiatFieldName, converters?.convertCryptoToFiat?.(transformedValue));
-        debounce(() => trigger(cryptoFieldName));
+
+        const fiatValue = converters?.convertCryptoToFiat?.(transformedValue);
+        if (fiatValue) setValue(fiatFieldName, fiatValue);
+        setValue('setMaxOutputId', undefined);
+        debounce(() => {
+            trigger(cryptoFieldName);
+            onFocus?.();
+        });
     };
 
     const handleBlur = () => {
@@ -83,24 +99,27 @@ export const CryptoAmountInput = ({
         <Animated.View
             style={[applyStyle(sendAmountInputWrapperStyle, { isDisabled }), cryptoAnimatedStyle]}
         >
-            <Input
-                ref={inputRef}
-                value={value}
-                placeholder="0"
-                keyboardType="numeric"
-                accessibilityLabel="amount to send input"
-                testID={cryptoFieldName}
-                editable={!isDisabled}
-                onChangeText={handleChangeValue}
-                onBlur={handleBlur}
-                onFocus={onFocus}
-                hasError={!isDisabled && hasError}
-                rightIcon={
-                    <SendAmountCurrencyLabelWrapper isDisabled={isDisabled}>
-                        {formatter.format(networkSymbol)}
-                    </SendAmountCurrencyLabelWrapper>
-                }
-            />
+            <Pressable onPress={onPress} /* onPress doesn't work on Android for disabled Input */>
+                <Input
+                    ref={inputRef}
+                    value={value}
+                    placeholder="0"
+                    keyboardType="numeric"
+                    accessibilityLabel="amount to send input"
+                    testID={cryptoFieldName}
+                    editable={!isDisabled}
+                    onChangeText={handleChangeValue}
+                    onBlur={handleBlur}
+                    onPress={onPress}
+                    onFocus={onFocus}
+                    hasError={!isDisabled && hasError}
+                    rightIcon={
+                        <SendAmountCurrencyLabelWrapper isDisabled={isDisabled}>
+                            {tokenSymbol ?? formatter.format(networkSymbol)}
+                        </SendAmountCurrencyLabelWrapper>
+                    }
+                />
+            </Pressable>
         </Animated.View>
     );
 };
diff --git a/suite-native/module-send/src/components/FeeOption.tsx b/suite-native/module-send/src/components/FeeOption.tsx
index c48c0a3b231..997295a43c5 100644
--- a/suite-native/module-send/src/components/FeeOption.tsx
+++ b/suite-native/module-send/src/components/FeeOption.tsx
@@ -8,8 +8,13 @@ import Animated, {
     withTiming,
 } from 'react-native-reanimated';
 
-import { getNetworkType, NetworkSymbol } from '@suite-common/wallet-config';
-import { AccountKey, GeneralPrecomposedTransactionFinal } from '@suite-common/wallet-types';
+import { getNetworkType, NetworkSymbol, NetworkType } from '@suite-common/wallet-config';
+import {
+    AccountKey,
+    GeneralPrecomposedTransaction,
+    GeneralPrecomposedTransactionFinal,
+    isFinalPrecomposedTransaction,
+} from '@suite-common/wallet-types';
 import { Text, HStack, VStack, Radio, Box } from '@suite-native/atoms';
 import { CryptoToFiatAmountFormatter, CryptoAmountFormatter } from '@suite-native/formatters';
 import { FormContext } from '@suite-native/forms';
@@ -29,15 +34,24 @@ import { NativeSupportedFeeLevel } from '../types';
 import { FeeOptionErrorMessage } from './FeeOptionErrorMessage';
 import { updateDraftFeeLevelThunk } from '../sendFormThunks';
 
+type FeeOptionProps = {
+    feeKey: SendFeesFormValues['feeLevel'];
+    feeLevel: GeneralPrecomposedTransactionFinal;
+    networkSymbol: NetworkSymbol;
+    transactionBytes: number;
+    accountKey: AccountKey;
+    isInteractive?: boolean;
+};
+
 const feeLabelsMap = {
     economy: 'moduleSend.fees.levels.low',
-    normal: 'moduleSend.fees.levels.medium',
+    normal: 'moduleSend.fees.levels.normal',
     high: 'moduleSend.fees.levels.high',
 } as const satisfies Record<NativeSupportedFeeLevel, TxKeyPath>;
 
 const wrapperStyle = prepareNativeStyle(utils => ({
     overflow: 'hidden',
-    borderRadius: utils.borders.radii.medium,
+    borderRadius: utils.borders.radii.r16,
     borderWidth: utils.borders.widths.large,
     backgroundColor: utils.colors.backgroundSurfaceElevation1,
     borderColor: utils.colors.backgroundSurfaceElevation0,
@@ -47,12 +61,26 @@ const valuesWrapperStyle = prepareNativeStyle(utils => ({
     padding: utils.spacings.sp16,
 }));
 
-type FeeOptionProps = {
-    feeKey: SendFeesFormValues['feeLevel'];
-    feeLevel: GeneralPrecomposedTransactionFinal;
-    networkSymbol: NetworkSymbol;
+const getFeePerUnit = ({
+    networkType,
+    feeLevel,
+    transactionBytes,
+    backendFeePerUnit = '0',
+}: {
+    networkType: NetworkType;
+    feeLevel: GeneralPrecomposedTransaction;
     transactionBytes: number;
-    accountKey: AccountKey;
+    backendFeePerUnit: string;
+}): string => {
+    if (!isFinalPrecomposedTransaction(feeLevel)) {
+        return backendFeePerUnit;
+    }
+
+    if (networkType === 'ethereum') {
+        return feeLevel.feePerByte;
+    }
+
+    return String(Math.round(Number(feeLevel.fee) / transactionBytes));
 };
 
 export const FeeOption = ({
@@ -61,21 +89,21 @@ export const FeeOption = ({
     networkSymbol,
     transactionBytes,
     accountKey,
+    isInteractive = true,
 }: FeeOptionProps) => {
-    const { utils } = useNativeStyles();
-    const { applyStyle } = useNativeStyles();
+    const { utils, applyStyle } = useNativeStyles();
     const { watch, setValue } = useContext(FormContext);
     const dispatch = useDispatch();
 
     const feeTimeEstimate = useSelector((state: FeesRootState) =>
-        selectNetworkFeeLevelTimeEstimate(state, feeKey, networkSymbol),
+        selectNetworkFeeLevelTimeEstimate(state, networkSymbol, feeKey),
     );
 
-    const feePerUnit = useSelector((state: FeesRootState) =>
-        selectNetworkFeeLevelFeePerUnit(state, feeKey, networkSymbol),
+    const backendFeePerUnit = useSelector((state: FeesRootState) =>
+        selectNetworkFeeLevelFeePerUnit(state, networkSymbol, feeKey),
     );
 
-    const isErrorFee = feeLevel.type !== 'final';
+    const areFeeValuesComplete = isFinalPrecomposedTransaction(feeLevel);
 
     const handleSelectFeeLevel = () => {
         setValue('feeLevel', feeKey, {
@@ -90,9 +118,9 @@ export const FeeOption = ({
     const selectedLevel = watch('feeLevel');
     const isChecked = selectedLevel === feeKey;
 
-    const highlightColor: Color = isErrorFee
-        ? 'backgroundAlertRedBold'
-        : 'backgroundSecondaryDefault';
+    const highlightColor: Color = areFeeValuesComplete
+        ? 'backgroundSecondaryDefault'
+        : 'backgroundAlertRedBold';
 
     const borderAnimationValue = useDerivedValue(
         () => (isChecked ? withTiming(1) : withTiming(0)),
@@ -102,31 +130,35 @@ export const FeeOption = ({
     const animatedCardStyle = useAnimatedStyle(
         () => ({
             borderColor: interpolateColor(
-                borderAnimationValue.value,
+                isInteractive ? borderAnimationValue.value : 0,
                 [0, 1],
                 [utils.colors.backgroundSurfaceElevation0, utils.colors[highlightColor]],
             ),
         }),
-        [borderAnimationValue, highlightColor],
+        [borderAnimationValue, highlightColor, isInteractive],
     );
 
     const label = feeLabelsMap[feeKey];
     const networkType = getNetworkType(networkSymbol);
     const feeUnits = getFeeUnits(networkType);
-    const formattedFeePerUnit = `${feePerUnit} ${feeUnits}`;
 
-    // If trezor-connect was not able to compose the fee level, we have to mock its value.
-    const mockedFee = transactionBytes * Number(feePerUnit);
-    const fee = isErrorFee ? mockedFee.toString() : feeLevel.fee;
+    // If trezor-connect was not able to compose the fee level (e.g. insufficient account balance), we have to mock its value.
+    const fee = areFeeValuesComplete
+        ? feeLevel.fee
+        : String(transactionBytes * Number(backendFeePerUnit));
+
+    const feePerUnit = getFeePerUnit({
+        networkType,
+        feeLevel,
+        transactionBytes,
+        backendFeePerUnit: backendFeePerUnit ?? '0',
+    });
+
+    const formattedFeePerUnit = `${feePerUnit} ${feeUnits}`;
 
     return (
-        <Pressable onPress={handleSelectFeeLevel}>
-            <Animated.View
-                style={[
-                    applyStyle(wrapperStyle, { borderColor: highlightColor }),
-                    animatedCardStyle,
-                ]}
-            >
+        <Pressable onPress={handleSelectFeeLevel} disabled={!isInteractive}>
+            <Animated.View style={[applyStyle(wrapperStyle), animatedCardStyle]}>
                 <Box style={applyStyle(valuesWrapperStyle)}>
                     <HStack
                         spacing="sp24"
@@ -161,19 +193,27 @@ export const FeeOption = ({
                                 value={fee}
                                 network={networkSymbol}
                                 isBalance={false}
+                                adjustsFontSizeToFit
+                                numberOfLines={1}
                             />
                         </VStack>
-                        <Radio
-                            isChecked={isChecked}
-                            value={feeKey}
-                            activeColor={isErrorFee ? 'iconAlertRed' : 'backgroundPrimaryDefault'}
-                            onPress={handleSelectFeeLevel}
-                            testID={`@send/fees-level-${feeKey}`}
-                        />
+                        {isInteractive && (
+                            <Radio
+                                isChecked={isChecked}
+                                value={feeKey}
+                                activeColor={
+                                    areFeeValuesComplete
+                                        ? 'backgroundPrimaryDefault'
+                                        : 'iconAlertRed'
+                                }
+                                onPress={handleSelectFeeLevel}
+                                testID={`@send/fees-level-${feeKey}`}
+                            />
+                        )}
                     </HStack>
                 </Box>
 
-                {isErrorFee && <FeeOptionErrorMessage isVisible={isChecked} />}
+                {!areFeeValuesComplete && <FeeOptionErrorMessage isVisible={isChecked} />}
             </Animated.View>
         </Pressable>
     );
diff --git a/suite-native/module-send/src/components/FeeOptionErrorMessage.tsx b/suite-native/module-send/src/components/FeeOptionErrorMessage.tsx
index da8b454994c..dde5f5798b9 100644
--- a/suite-native/module-send/src/components/FeeOptionErrorMessage.tsx
+++ b/suite-native/module-send/src/components/FeeOptionErrorMessage.tsx
@@ -1,7 +1,7 @@
 import Animated, { useAnimatedStyle, withTiming } from 'react-native-reanimated';
 
 import { Text, HStack } from '@suite-native/atoms';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { Translation } from '@suite-native/intl';
 
diff --git a/suite-native/module-send/src/components/FeeOptionsList.tsx b/suite-native/module-send/src/components/FeeOptionsList.tsx
index 9d5c08ff3d2..b57ae795944 100644
--- a/suite-native/module-send/src/components/FeeOptionsList.tsx
+++ b/suite-native/module-send/src/components/FeeOptionsList.tsx
@@ -1,11 +1,7 @@
 import { D, pipe } from '@mobily/ts-belt';
 
 import { NetworkSymbol } from '@suite-common/wallet-config';
-import {
-    AccountKey,
-    GeneralPrecomposedLevels,
-    PrecomposedTransactionFinal,
-} from '@suite-common/wallet-types';
+import { AccountKey, GeneralPrecomposedLevels } from '@suite-common/wallet-types';
 import { VStack } from '@suite-native/atoms';
 
 import { FeeOption } from './FeeOption';
@@ -17,6 +13,19 @@ type FeeOptionsListProps = {
     accountKey: AccountKey;
 };
 
+// User is not able to enter the fees screen if there is not normal fee or at least the economy fee (in final state) present.
+const getTransactionBytes = (feeLevels: Partial<GeneralPrecomposedLevels>) => {
+    if (feeLevels.normal && 'bytes' in feeLevels.normal) {
+        return feeLevels.normal.bytes;
+    }
+
+    if (feeLevels.economy && 'bytes' in feeLevels.economy) {
+        return feeLevels.economy.bytes;
+    }
+
+    return 0;
+};
+
 export const FeeOptionsList = ({ feeLevels, networkSymbol, accountKey }: FeeOptionsListProps) => {
     // Remove custom fee level from the list. It is not supported in the first version of the send flow.
     const predefinedFeeLevels = pipe(
@@ -24,9 +33,9 @@ export const FeeOptionsList = ({ feeLevels, networkSymbol, accountKey }: FeeOpti
         D.filterWithKey(key => key !== 'custom'),
     );
 
-    // User is not able enter the fees screen if the normal (in final state) fee is not present.
-    const normalLevel = predefinedFeeLevels.normal as PrecomposedTransactionFinal;
-    const transactionBytes = normalLevel.bytes;
+    const transactionBytes = getTransactionBytes(predefinedFeeLevels);
+
+    const isMultipleOptionsDisplayed = Object.keys(predefinedFeeLevels).length > 1;
 
     return (
         <VStack spacing="sp12">
@@ -38,6 +47,7 @@ export const FeeOptionsList = ({ feeLevels, networkSymbol, accountKey }: FeeOpti
                     accountKey={accountKey}
                     networkSymbol={networkSymbol}
                     transactionBytes={transactionBytes}
+                    isInteractive={isMultipleOptionsDisplayed}
                 />
             ))}
         </VStack>
diff --git a/suite-native/module-send/src/components/FeesFooter.tsx b/suite-native/module-send/src/components/FeesFooter.tsx
index 79ecbe20539..2934faf78bc 100644
--- a/suite-native/module-send/src/components/FeesFooter.tsx
+++ b/suite-native/module-send/src/components/FeesFooter.tsx
@@ -5,19 +5,33 @@ import Animated, {
     useAnimatedStyle,
     withTiming,
 } from 'react-native-reanimated';
+import { useSelector } from 'react-redux';
 
 import { NetworkSymbol } from '@suite-common/wallet-config';
 import { Text, Button, Box, Card, HStack, VStack } from '@suite-native/atoms';
-import { CryptoToFiatAmountFormatter, CryptoAmountFormatter } from '@suite-native/formatters';
+import {
+    CryptoToFiatAmountFormatter,
+    CryptoAmountFormatter,
+    TokenAmountFormatter,
+} from '@suite-native/formatters';
 import { FormContext } from '@suite-native/forms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { Translation } from '@suite-native/intl';
+import { AccountKey, TokenAddress } from '@suite-common/wallet-types';
+import {
+    selectAccountTokenDecimals,
+    selectAccountTokenSymbol,
+    TokensRootState,
+} from '@suite-native/tokens';
 
 type FeesFooterProps = {
+    accountKey: AccountKey;
     isSubmittable: boolean;
     onSubmit: () => void;
     networkSymbol: NetworkSymbol;
     totalAmount: string;
+    fee: string;
+    tokenContract?: TokenAddress;
 };
 
 const CARD_BOTTOM_PADDING = 40;
@@ -44,11 +58,96 @@ const buttonWrapperStyle = prepareNativeStyle(() => ({
     width: '100%',
 }));
 
+const MainnetSummary = ({
+    amount,
+    networkSymbol,
+}: {
+    amount: string;
+    networkSymbol: NetworkSymbol;
+}) => {
+    return (
+        <HStack justifyContent="space-between" alignItems="center">
+            <Text variant="callout">
+                <Translation id="moduleSend.fees.totalAmount" />
+            </Text>
+            <VStack spacing="sp4" alignItems="flex-end">
+                <CryptoToFiatAmountFormatter
+                    variant="callout"
+                    color="textDefault"
+                    value={amount}
+                    network={networkSymbol}
+                />
+                <CryptoAmountFormatter
+                    variant="hint"
+                    color="textSubdued"
+                    value={amount}
+                    network={networkSymbol}
+                    isBalance={false}
+                />
+            </VStack>
+        </HStack>
+    );
+};
+
+const TokenSummary = ({
+    accountKey,
+    tokenAmount,
+    mainnetFee,
+    networkSymbol,
+    tokenContract,
+}: {
+    accountKey: AccountKey;
+    tokenAmount: string;
+    mainnetFee: string;
+    networkSymbol: NetworkSymbol;
+    tokenContract?: TokenAddress;
+}) => {
+    const tokenSymbol = useSelector((state: TokensRootState) =>
+        selectAccountTokenSymbol(state, accountKey, tokenContract),
+    );
+
+    const tokenDecimals = useSelector((state: TokensRootState) =>
+        selectAccountTokenDecimals(state, accountKey, tokenContract),
+    );
+
+    return (
+        <HStack justifyContent="space-between" alignItems="center">
+            <VStack spacing="sp4">
+                <Text variant="callout">
+                    <Translation id="moduleSend.review.outputs.amountLabel" />
+                </Text>
+                <Text variant="hint" color="textSubdued">
+                    <Translation id="transactions.detail.feeLabel" />
+                </Text>
+            </VStack>
+            <VStack spacing="sp4" alignItems="flex-end">
+                <TokenAmountFormatter
+                    variant="callout"
+                    color="textDefault"
+                    decimals={tokenDecimals ?? undefined}
+                    value={tokenAmount}
+                    symbol={tokenSymbol}
+                />
+                <CryptoAmountFormatter
+                    variant="hint"
+                    color="textSubdued"
+                    value={mainnetFee}
+                    network={networkSymbol}
+                    isBalance={false}
+                />
+            </VStack>
+        </HStack>
+    );
+};
+
 export const FeesFooter = ({
+    accountKey,
     isSubmittable,
     onSubmit,
     totalAmount,
+    fee,
     networkSymbol,
+    tokenContract,
 }: FeesFooterProps) => {
     const { applyStyle } = useNativeStyles();
 
@@ -68,26 +167,17 @@ export const FeesFooter = ({
         <Box style={applyStyle(footerWrapperStyle)}>
             <Card style={applyStyle(cardStyle)}>
                 <Animated.View style={animatedFooterStyle}>
-                    <HStack justifyContent="space-between" alignItems="center">
-                        <Text variant="callout">
-                            <Translation id="moduleSend.fees.totalAmount" />
-                        </Text>
-                        <VStack spacing="sp2" alignItems="flex-end">
-                            <CryptoToFiatAmountFormatter
-                                variant="callout"
-                                color="textDefault"
-                                value={totalAmount}
-                                network={networkSymbol}
-                            />
-                            <CryptoAmountFormatter
-                                variant="hint"
-                                color="textSubdued"
-                                value={totalAmount}
-                                network={networkSymbol}
-                                isBalance={false}
-                            />
-                        </VStack>
-                    </HStack>
+                    {tokenContract ? (
+                        <TokenSummary
+                            accountKey={accountKey}
+                            tokenAmount={totalAmount}
+                            mainnetFee={fee}
+                            networkSymbol={networkSymbol}
+                            tokenContract={tokenContract}
+                        />
+                    ) : (
+                        <MainnetSummary amount={totalAmount} networkSymbol={networkSymbol} />
+                    )}
                 </Animated.View>
             </Card>
             {isSubmittable && (
diff --git a/suite-native/module-send/src/components/FiatAmountInput.tsx b/suite-native/module-send/src/components/FiatAmountInput.tsx
index b84cea01924..0119e362366 100644
--- a/suite-native/module-send/src/components/FiatAmountInput.tsx
+++ b/suite-native/module-send/src/components/FiatAmountInput.tsx
@@ -1,9 +1,9 @@
+import { Pressable } from 'react-native';
 import Animated, { useAnimatedStyle } from 'react-native-reanimated';
 import { useSelector } from 'react-redux';
 
 import { Input } from '@suite-native/atoms';
-import { useFormContext } from '@suite-native/forms';
-import { useField } from '@suite-native/forms';
+import { useFormContext, useField } from '@suite-native/forms';
 import { useCryptoFiatConverters } from '@suite-native/formatters';
 import { useNativeStyles } from '@trezor/styles';
 import { selectFiatCurrencyCode } from '@suite-native/settings';
@@ -12,6 +12,7 @@ import { SendAmountCurrencyLabelWrapper, sendAmountInputWrapperStyle } from './C
 import { SendAmountInputProps } from '../types';
 import { useSendAmountTransformers } from '../hooks/useSendAmountTransformers';
 import { getOutputFieldName } from '../utils';
+import { SendOutputsFormValues } from '../sendOutputsFormSchema';
 
 export const FiatAmountInput = ({
     recipientIndex,
@@ -19,14 +20,16 @@ export const FiatAmountInput = ({
     translateValue,
     inputRef,
     networkSymbol,
+    tokenContract,
+    onPress,
     onFocus,
     isDisabled = false,
 }: SendAmountInputProps) => {
     const { applyStyle } = useNativeStyles();
-    const { setValue } = useFormContext();
+    const { setValue } = useFormContext<SendOutputsFormValues>();
     const fiatCurrencyCode = useSelector(selectFiatCurrencyCode);
     const { fiatAmountTransformer } = useSendAmountTransformers(networkSymbol);
-    const converters = useCryptoFiatConverters({ networkSymbol });
+    const converters = useCryptoFiatConverters({ networkSymbol, tokenContract });
 
     const cryptoFieldName = getOutputFieldName(recipientIndex, 'amount');
     const fiatFieldName = getOutputFieldName(recipientIndex, 'fiat');
@@ -52,33 +55,39 @@ export const FiatAmountInput = ({
     const handleChangeValue = (newValue: string) => {
         const transformedValue = fiatAmountTransformer(newValue);
         onChange(transformedValue);
-        setValue(cryptoFieldName, converters?.convertFiatToCrypto?.(transformedValue), {
-            shouldValidate: true,
-        });
+
+        const cryptoValue = converters?.convertFiatToCrypto?.(transformedValue);
+        if (cryptoValue) setValue(cryptoFieldName, cryptoValue, { shouldValidate: true });
+
+        setValue('setMaxOutputId', undefined);
+        onFocus?.();
     };
 
     return (
         <Animated.View
             style={[applyStyle(sendAmountInputWrapperStyle, { isDisabled }), fiatAnimatedStyle]}
         >
-            <Input
-                ref={inputRef}
-                value={value}
-                placeholder="0"
-                keyboardType="numeric"
-                accessibilityLabel="amount to send input"
-                testID={fiatFieldName}
-                editable={!isDisabled}
-                onChangeText={handleChangeValue}
-                onBlur={onBlur}
-                onFocus={onFocus}
-                hasError={!isDisabled && hasError}
-                rightIcon={
-                    <SendAmountCurrencyLabelWrapper isDisabled={isDisabled}>
-                        {fiatCurrencyCode.toUpperCase()}
-                    </SendAmountCurrencyLabelWrapper>
-                }
-            />
+            <Pressable onPress={onPress} /* onPress doesn't work on Android for disabled Input */>
+                <Input
+                    ref={inputRef}
+                    value={value}
+                    placeholder="0"
+                    keyboardType="numeric"
+                    accessibilityLabel="amount to send input"
+                    testID={fiatFieldName}
+                    editable={!isDisabled}
+                    onChangeText={handleChangeValue}
+                    onBlur={onBlur}
+                    onPress={onPress}
+                    onFocus={onFocus}
+                    hasError={!isDisabled && hasError}
+                    rightIcon={
+                        <SendAmountCurrencyLabelWrapper isDisabled={isDisabled}>
+                            {fiatCurrencyCode.toUpperCase()}
+                        </SendAmountCurrencyLabelWrapper>
+                    }
+                />
+            </Pressable>
         </Animated.View>
     );
 };
diff --git a/suite-native/module-send/src/components/OutputsReviewFooter.tsx b/suite-native/module-send/src/components/OutputsReviewFooter.tsx
index 9f97f7e7a1d..ee05cbc0d74 100644
--- a/suite-native/module-send/src/components/OutputsReviewFooter.tsx
+++ b/suite-native/module-send/src/components/OutputsReviewFooter.tsx
@@ -1,31 +1,37 @@
+import { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import Animated, { SlideInDown } from 'react-native-reanimated';
-import { useState } from 'react';
 
+import { useAtomValue } from 'jotai';
 import { CommonActions, useNavigation } from '@react-navigation/native';
 import { isFulfilled } from '@reduxjs/toolkit';
 
 import {
     AccountsRootState,
+    pushSendFormTransactionThunk,
     selectAccountByKey,
-    selectSendFormDraftByAccountKey,
-    selectSendSignedTx,
+    selectSendFormDraftByKey,
+    selectTransactionByAccountKeyAndTxid,
     SendRootState,
+    TransactionsRootState,
 } from '@suite-common/wallet-core';
-import { AccountKey } from '@suite-common/wallet-types';
+import { AccountKey, TokenAddress } from '@suite-common/wallet-types';
 import { Button } from '@suite-native/atoms';
 import { RootStackRoutes, AppTabsRoutes, RootStackParamList } from '@suite-native/navigation';
 import { Translation } from '@suite-native/intl';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { analytics, EventType } from '@suite-native/analytics';
+import { selectAccountTokenSymbol, TokensRootState } from '@suite-native/tokens';
 
 import { SendConfirmOnDeviceImage } from '../components/SendConfirmOnDeviceImage';
-import { sendTransactionAndCleanupSendFormThunk } from '../sendFormThunks';
+import { cleanupSendFormThunk } from '../sendFormThunks';
+import { wasAppLeftDuringReviewAtom } from '../atoms/wasAppLeftDuringReviewAtom';
+import { selectIsTransactionAlreadySigned } from '../selectors';
 
 const navigateToAccountDetail = ({
     accountKey,
+    tokenContract,
     txid,
-    closeActionType,
 }: RootStackParamList[RootStackRoutes.TransactionDetail]) =>
     // Reset navigation stack to the account detail screen with HomeStack as a previous step, so the user can navigate back there.
     CommonActions.reset({
@@ -41,14 +47,16 @@ const navigateToAccountDetail = ({
                 name: RootStackRoutes.AccountDetail,
                 params: {
                     accountKey,
+                    tokenContract,
                 },
             },
             {
                 name: RootStackRoutes.TransactionDetail,
                 params: {
                     accountKey,
+                    tokenContract,
                     txid,
-                    closeActionType,
+                    closeActionType: 'close',
                 },
             },
         ],
@@ -59,48 +67,84 @@ const footerStyle = prepareNativeStyle(utils => ({
     paddingHorizontal: utils.spacings.sp16,
 }));
 
-export const OutputsReviewFooter = ({ accountKey }: { accountKey: AccountKey }) => {
+export const OutputsReviewFooter = ({
+    accountKey,
+    tokenContract,
+}: {
+    accountKey: AccountKey;
+    tokenContract?: TokenAddress;
+}) => {
+    const [txid, setTxid] = useState<string>('');
     const dispatch = useDispatch();
     const navigation = useNavigation();
     const { applyStyle } = useNativeStyles();
     const [isSendInProgress, setIsSendInProgress] = useState(false);
+    const wasAppLeftDuringReview = useAtomValue(wasAppLeftDuringReviewAtom);
+
+    const isTransactionProcessedByBackend = !!useSelector((state: TransactionsRootState) =>
+        selectTransactionByAccountKeyAndTxid(state, accountKey, txid),
+    );
 
     const account = useSelector((state: AccountsRootState) =>
         selectAccountByKey(state, accountKey),
     );
-    const signedTransaction = useSelector(selectSendSignedTx);
+
+    const tokenSymbol = useSelector((state: TokensRootState) =>
+        selectAccountTokenSymbol(state, accountKey, tokenContract),
+    );
+
+    const isTransactionAlreadySigned = useSelector(selectIsTransactionAlreadySigned);
 
     const formValues = useSelector((state: SendRootState) =>
-        selectSendFormDraftByAccountKey(state, accountKey),
+        selectSendFormDraftByKey(state, accountKey, tokenContract),
     );
 
-    {
-        /* TODO: improve the illustration: https://github.com/trezor/trezor-suite/issues/13965 */
-    }
-    if (!signedTransaction || !account) return <SendConfirmOnDeviceImage />;
+    useEffect(() => {
+        // Navigate to transaction detail screen only at the moment when the transaction was already processed by backend and we have all its data.
+        if (isTransactionProcessedByBackend) {
+            navigation.dispatch(
+                navigateToAccountDetail({
+                    accountKey,
+                    tokenContract,
+                    txid,
+                }),
+            );
+
+            dispatch(cleanupSendFormThunk({ accountKey }));
+        }
+    }, [isTransactionProcessedByBackend, accountKey, tokenContract, txid, navigation, dispatch]);
+
+    /* TODO: improve the illustration: https://github.com/trezor/trezor-suite/issues/13965 */
+    if (!isTransactionAlreadySigned || !account) return <SendConfirmOnDeviceImage />;
 
     const handleSendTransaction = async () => {
         setIsSendInProgress(true);
 
-        const sendResponse = await dispatch(sendTransactionAndCleanupSendFormThunk({ account }));
+        const sendResponse = await dispatch(
+            pushSendFormTransactionThunk({
+                selectedAccount: account,
+                shouldDiscardTransaction: false,
+            }),
+        );
 
         if (isFulfilled(sendResponse)) {
-            const { txid } = sendResponse.payload;
+            const { txid: sentTxid } = sendResponse.payload.payload;
 
             if (formValues) {
                 analytics.report({
                     type: EventType.SendTransactionDispatched,
                     payload: {
                         symbol: account.symbol,
+                        tokenAddresses: tokenContract ? [tokenContract] : undefined,
+                        tokenSymbols: tokenSymbol ? [tokenSymbol] : undefined,
                         outputsCount: formValues.outputs.length,
                         selectedFee: formValues.selectedFee ?? 'normal',
+                        wasAppLeftDuringReview,
                     },
                 });
             }
 
-            navigation.dispatch(
-                navigateToAccountDetail({ accountKey, txid, closeActionType: 'close' }),
-            );
+            setTxid(sentTxid);
         }
     };
 
diff --git a/suite-native/module-send/src/components/QrCodeBottomSheetIcon.tsx b/suite-native/module-send/src/components/QrCodeBottomSheetIcon.tsx
index 5034fe64e04..88d7ea0a2db 100644
--- a/suite-native/module-send/src/components/QrCodeBottomSheetIcon.tsx
+++ b/suite-native/module-send/src/components/QrCodeBottomSheetIcon.tsx
@@ -1,7 +1,7 @@
 import { TouchableOpacity } from 'react-native';
 import { useState } from 'react';
 
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { ScanQRBottomSheet } from '@suite-native/qr-code';
 import { Translation } from '@suite-native/intl';
 import { useNativeStyles } from '@trezor/styles';
diff --git a/suite-native/module-send/src/components/RecipientInputs.tsx b/suite-native/module-send/src/components/RecipientInputs.tsx
index af2ee419cf5..ed04e513daa 100644
--- a/suite-native/module-send/src/components/RecipientInputs.tsx
+++ b/suite-native/module-send/src/components/RecipientInputs.tsx
@@ -15,7 +15,7 @@ export const RecipientInputs = ({ index, accountKey }: RecipientInputsProps) =>
         <VStack spacing="sp16">
             <AddressInput index={index} accountKey={accountKey} />
             <CardDivider />
-            <AmountInputs index={index} accountKey={accountKey} />
+            <AmountInputs index={index} />
         </VStack>
     );
 };
diff --git a/suite-native/module-send/src/components/RecipientsSummary.tsx b/suite-native/module-send/src/components/RecipientsSummary.tsx
index a46621112c3..52d4f044612 100644
--- a/suite-native/module-send/src/components/RecipientsSummary.tsx
+++ b/suite-native/module-send/src/components/RecipientsSummary.tsx
@@ -2,19 +2,27 @@ import { useSelector } from 'react-redux';
 
 import {
     AccountsRootState,
-    SendRootState,
     selectAccountNetworkSymbol,
     selectSendFormDraftOutputsByAccountKey,
+    SendRootState,
 } from '@suite-common/wallet-core';
-import { AccountKey } from '@suite-common/wallet-types';
+import {
+    AccountKey,
+    GeneralPrecomposedTransaction,
+    isFinalPrecomposedTransaction,
+    Output,
+    TokenAddress,
+} from '@suite-common/wallet-types';
 import { Text, VStack, Card, HStack } from '@suite-native/atoms';
-import { CryptoToFiatAmountFormatter, CryptoAmountFormatter } from '@suite-native/formatters';
+import { CoinToFiatAmountFormatter, CoinAmountFormatter } from '@suite-native/formatters';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { Translation } from '@suite-native/intl';
 import { selectIsAmountInSats, SettingsSliceRootState } from '@suite-native/settings';
 
 type FeesRecipientsProps = {
     accountKey: AccountKey;
+    selectedFeeLevel: GeneralPrecomposedTransaction;
+    tokenContract?: TokenAddress;
 };
 
 const cardStyle = prepareNativeStyle(utils => ({
@@ -29,13 +37,16 @@ const addressStyle = prepareNativeStyle(() => ({
     letterSpacing: 0, // negative letter spacing has to be overwritten for ellipsizeMode='middle' to work
 }));
 
-export const RecipientsSummary = ({ accountKey }: FeesRecipientsProps) => {
+export const RecipientsSummary = ({
+    accountKey,
+    tokenContract,
+    selectedFeeLevel,
+}: FeesRecipientsProps) => {
     const { applyStyle } = useNativeStyles();
 
-    const outputs = useSelector((state: SendRootState) =>
+    const draftOutputs = useSelector((state: SendRootState) =>
         selectSendFormDraftOutputsByAccountKey(state, accountKey),
     );
-
     const networkSymbol = useSelector((state: AccountsRootState) =>
         selectAccountNetworkSymbol(state, accountKey),
     );
@@ -43,15 +54,24 @@ export const RecipientsSummary = ({ accountKey }: FeesRecipientsProps) => {
         selectIsAmountInSats(state, networkSymbol),
     );
 
-    if (!outputs || !networkSymbol) return null;
+    // If the fee level was not successfully created (there is not enough balance for it), use the draft outputs instead.
+    const outputs = isFinalPrecomposedTransaction(selectedFeeLevel)
+        ? selectedFeeLevel.outputs
+        : draftOutputs;
+    const addressTargetingOutputs = outputs?.filter(output => 'address' in output) as Output[];
+
+    if (!addressTargetingOutputs || !networkSymbol) return null;
+
+    // Successfully composed outputs values are always in "balance" format.
+    const isBalance = !isAmountInSats && !isFinalPrecomposedTransaction(selectedFeeLevel);
 
     return (
         <VStack>
             {/* TODO handle UI of multiple recipients in better way when is the design ready. */}
-            {outputs.map(output => (
+            {addressTargetingOutputs.map(output => (
                 <Card key={output.address} style={applyStyle(cardStyle)}>
                     <HStack>
-                        <VStack flex={0.6} justifyContent="center" spacing="sp4">
+                        <VStack flex={0.4} justifyContent="center" spacing="sp4">
                             <Text variant="callout">
                                 <Translation id="moduleSend.fees.recipient.singular" />
                             </Text>
@@ -64,20 +84,24 @@ export const RecipientsSummary = ({ accountKey }: FeesRecipientsProps) => {
                                 {output.address}
                             </Text>
                         </VStack>
-                        <VStack flex={0.4} alignItems="flex-end" spacing="sp4">
-                            <CryptoToFiatAmountFormatter
+                        <VStack flex={0.6} alignItems="flex-end" spacing="sp4">
+                            <CoinToFiatAmountFormatter
                                 variant="hint"
                                 color="textDefault"
                                 value={output.amount}
-                                network={networkSymbol}
-                                isBalance={!isAmountInSats}
+                                isBalance={isBalance}
+                                accountKey={accountKey}
+                                tokenContract={tokenContract}
                             />
-                            <CryptoAmountFormatter
+                            <CoinAmountFormatter
                                 variant="hint"
                                 color="textSubdued"
                                 value={output.amount}
-                                network={networkSymbol}
-                                isBalance={!isAmountInSats}
+                                isBalance={isBalance}
+                                accountKey={accountKey}
+                                tokenContract={tokenContract}
+                                adjustsFontSizeToFit
+                                numberOfLines={1}
                             />
                         </VStack>
                     </HStack>
diff --git a/suite-native/module-send/src/components/ReviewOutputCard.tsx b/suite-native/module-send/src/components/ReviewOutputCard.tsx
index fdcbfe81671..9ae06866ef7 100644
--- a/suite-native/module-send/src/components/ReviewOutputCard.tsx
+++ b/suite-native/module-send/src/components/ReviewOutputCard.tsx
@@ -18,7 +18,7 @@ const cardStyle = prepareNativeStyle<{ isConfirmed: boolean }>((utils, { isConfi
     marginHorizontal: utils.spacings.sp8,
     paddingHorizontal: utils.spacings.sp16,
     paddingVertical: utils.spacings.sp12,
-    borderRadius: 12,
+    borderRadius: utils.borders.radii.r12,
     extend: {
         condition: isConfirmed,
         style: {
diff --git a/suite-native/module-send/src/components/ReviewOutputItemList.tsx b/suite-native/module-send/src/components/ReviewOutputItemList.tsx
index 4f6e4c90caf..25e51d0cf94 100644
--- a/suite-native/module-send/src/components/ReviewOutputItemList.tsx
+++ b/suite-native/module-send/src/components/ReviewOutputItemList.tsx
@@ -3,42 +3,44 @@ import { useState } from 'react';
 import { LayoutChangeEvent } from 'react-native';
 
 import { ErrorMessage, VStack } from '@suite-native/atoms';
-import { AccountKey } from '@suite-common/wallet-types';
+import { AccountKey, TokenAddress } from '@suite-common/wallet-types';
 import {
     AccountsRootState,
     DeviceRootState,
     SendRootState,
     selectAccountByKey,
-    selectSendSignedTx,
 } from '@suite-common/wallet-core';
 import { nativeSpacings } from '@trezor/theme';
 
 import { ReviewOutputItem } from './ReviewOutputItem';
 import {
+    selectIsTransactionAlreadySigned,
     selectTransactionReviewActiveStepIndex,
     selectTransactionReviewOutputs,
 } from '../selectors';
 import { ReviewOutputSummaryItem } from './ReviewOutputSummaryItem';
 import { SlidingFooterOverlay } from './SlidingFooterOverlay';
 
-type ReviewOutputItemListProps = { accountKey: AccountKey };
+type ReviewOutputItemListProps = {
+    accountKey: AccountKey;
+    tokenContract?: TokenAddress;
+};
 
 const INITIAL_OFFSET = 85;
 const LIST_VERTICAL_SPACING = nativeSpacings.sp16;
 
-export const ReviewOutputItemList = ({ accountKey }: ReviewOutputItemListProps) => {
+export const ReviewOutputItemList = ({ accountKey, tokenContract }: ReviewOutputItemListProps) => {
     const account = useSelector((state: AccountsRootState) =>
         selectAccountByKey(state, accountKey),
     );
 
     const reviewOutputs = useSelector(
         (state: AccountsRootState & DeviceRootState & SendRootState) =>
-            selectTransactionReviewOutputs(state, accountKey),
+            selectTransactionReviewOutputs(state, accountKey, tokenContract),
     );
-    const signedTransaction = useSelector(selectSendSignedTx);
-
+    const isTransactionAlreadySigned = useSelector(selectIsTransactionAlreadySigned);
     const activeStep = useSelector((state: AccountsRootState & DeviceRootState & SendRootState) =>
-        selectTransactionReviewActiveStepIndex(state, accountKey),
+        selectTransactionReviewActiveStepIndex(state, accountKey, tokenContract),
     );
 
     const [childHeights, setChildHeights] = useState<number[]>([]);
@@ -72,11 +74,12 @@ export const ReviewOutputItemList = ({ accountKey }: ReviewOutputItemListProps)
                     <ReviewOutputSummaryItem
                         accountKey={accountKey}
                         networkSymbol={account.symbol}
+                        tokenContract={tokenContract}
                         onLayout={event => handleReadListItemHeight(event, reviewOutputs.length)}
                     />
                 </VStack>
             )}
-            {!signedTransaction && (
+            {!isTransactionAlreadySigned && (
                 <SlidingFooterOverlay
                     isLayoutReady={isLayoutReady}
                     currentStepIndex={activeStep}
diff --git a/suite-native/module-send/src/components/ReviewOutputItemValues.tsx b/suite-native/module-send/src/components/ReviewOutputItemValues.tsx
index 48cfc1126bd..d3d3be26c40 100644
--- a/suite-native/module-send/src/components/ReviewOutputItemValues.tsx
+++ b/suite-native/module-send/src/components/ReviewOutputItemValues.tsx
@@ -1,38 +1,54 @@
+import { useRoute } from '@react-navigation/native';
+
 import { NetworkSymbol } from '@suite-common/wallet-config';
+import { TokenAddress } from '@suite-common/wallet-types';
 import { HStack, VStack, Text, Box } from '@suite-native/atoms';
-import { CryptoToFiatAmountFormatter, CryptoAmountFormatter } from '@suite-native/formatters';
+import { CoinAmountFormatter, CoinToFiatAmountFormatter } from '@suite-native/formatters';
 import { TxKeyPath, Translation } from '@suite-native/intl';
+import { SendStackParamList, SendStackRoutes, StackProps } from '@suite-native/navigation';
+
+type RouteProps = StackProps<SendStackParamList, SendStackRoutes.SendOutputsReview>['route'];
 
 export const ReviewOutputItemValues = ({
-    networkSymbol,
+    tokenContract,
     value,
     translationKey,
 }: {
     networkSymbol: NetworkSymbol;
+    tokenContract?: TokenAddress;
     value: string;
     translationKey: TxKeyPath;
 }) => {
+    const route = useRoute<RouteProps>();
+
+    const { accountKey } = route.params;
+
     return (
         <HStack>
-            <Box flex={0.55} justifyContent="center">
+            <Box flex={0.4} justifyContent="center">
                 <Text variant="hint">
                     <Translation id={translationKey} />
                 </Text>
             </Box>
-            <VStack flex={0.45} alignItems="flex-end" spacing="sp4">
-                <CryptoToFiatAmountFormatter
+            <VStack flex={0.6} alignItems="flex-end" spacing="sp4">
+                <CoinToFiatAmountFormatter
                     variant="hint"
                     color="textDefault"
                     value={value}
-                    network={networkSymbol}
-                    isBalance={false}
+                    accountKey={accountKey}
+                    tokenContract={tokenContract}
+                    adjustsFontSizeToFit
+                    numberOfLines={1}
                 />
-                <CryptoAmountFormatter
+                <CoinAmountFormatter
                     variant="hint"
                     color="textSubdued"
                     value={value}
-                    network={networkSymbol}
+                    accountKey={accountKey}
+                    tokenContract={tokenContract}
                     isBalance={false}
+                    adjustsFontSizeToFit
+                    numberOfLines={1}
                 />
             </VStack>
         </HStack>
diff --git a/suite-native/module-send/src/components/ReviewOutputStatusBadge.tsx b/suite-native/module-send/src/components/ReviewOutputStatusBadge.tsx
index 2362c46fb9d..c470e749ad3 100644
--- a/suite-native/module-send/src/components/ReviewOutputStatusBadge.tsx
+++ b/suite-native/module-send/src/components/ReviewOutputStatusBadge.tsx
@@ -6,10 +6,10 @@ import Animated, {
     useAnimatedStyle,
 } from 'react-native-reanimated';
 
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { ReviewOutputState } from '@suite-common/wallet-types';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { ENDLESS_ANIMATION_VALUE } from '@suite-native/helpers';
+import { ENDLESS_ANIMATION_VALUE } from '@suite-native/atoms';
 
 const BADGE_SIZE = 14;
 const ANIMATION_DURATION = 550;
@@ -50,9 +50,7 @@ export const ReviewOutputStatusBadge = ({ status }: { status: ReviewOutputState
     }));
 
     if (status === 'success') {
-        return (
-            <Icon name="checkCircleSolidLight" color="backgroundSecondaryDefault" size="medium" />
-        );
+        return <Icon name="checkCircleFilled" color="backgroundSecondaryDefault" size="medium" />;
     }
 
     const isActive = status === 'active';
diff --git a/suite-native/module-send/src/components/ReviewOutputSummaryItem.tsx b/suite-native/module-send/src/components/ReviewOutputSummaryItem.tsx
index 1403fec73bd..d29c7cba9c5 100644
--- a/suite-native/module-send/src/components/ReviewOutputSummaryItem.tsx
+++ b/suite-native/module-send/src/components/ReviewOutputSummaryItem.tsx
@@ -1,11 +1,12 @@
 import { useSelector } from 'react-redux';
 import { LayoutChangeEvent, View } from 'react-native';
 
-import { NetworkSymbol } from '@suite-common/wallet-config';
+import { getNetworkType, NetworkSymbol } from '@suite-common/wallet-config';
 import { AccountsRootState, DeviceRootState, SendRootState } from '@suite-common/wallet-core';
-import { AccountKey } from '@suite-common/wallet-types';
+import { AccountKey, TokenAddress } from '@suite-common/wallet-types';
 import { VStack } from '@suite-native/atoms';
 import { useTranslate } from '@suite-native/intl';
+import { BigNumber } from '@trezor/utils';
 
 import { selectReviewSummaryOutput } from '../selectors';
 import { ReviewOutputItemValues } from './ReviewOutputItemValues';
@@ -15,40 +16,92 @@ type ReviewOutputSummaryItemProps = {
     accountKey: AccountKey;
     networkSymbol: NetworkSymbol;
     onLayout: (event: LayoutChangeEvent) => void;
+    tokenContract?: TokenAddress;
+};
+
+type EthereumValuesProps = {
+    totalSpent: string;
+    fee: string;
+    networkSymbol: NetworkSymbol;
+    tokenContract?: TokenAddress;
+};
+
+const BitcoinValues = ({ totalSpent, fee, networkSymbol }: EthereumValuesProps) => {
+    return (
+        <>
+            <ReviewOutputItemValues
+                value={totalSpent}
+                networkSymbol={networkSymbol}
+                translationKey="moduleSend.review.outputs.summary.totalAmount"
+            />
+            <ReviewOutputItemValues
+                value={fee}
+                networkSymbol={networkSymbol}
+                translationKey="moduleSend.review.outputs.summary.fee"
+            />
+        </>
+    );
+};
+
+const EthereumValues = ({ totalSpent, fee, tokenContract, networkSymbol }: EthereumValuesProps) => {
+    const amount = tokenContract ? totalSpent : BigNumber(totalSpent).minus(fee).toString();
+
+    return (
+        <>
+            <ReviewOutputItemValues
+                value={amount}
+                tokenContract={tokenContract}
+                networkSymbol={networkSymbol}
+                translationKey="moduleSend.review.outputs.summary.amount"
+            />
+            <ReviewOutputItemValues
+                value={fee}
+                networkSymbol={networkSymbol}
+                translationKey="moduleSend.review.outputs.summary.maxFee"
+            />
+        </>
+    );
 };
 
 export const ReviewOutputSummaryItem = ({
     accountKey,
     networkSymbol,
+    tokenContract,
     onLayout,
 }: ReviewOutputSummaryItemProps) => {
     const { translate } = useTranslate();
     const summaryOutput = useSelector(
         (state: AccountsRootState & DeviceRootState & SendRootState) =>
-            selectReviewSummaryOutput(state, accountKey),
+            selectReviewSummaryOutput(state, accountKey, tokenContract),
     );
 
     if (!summaryOutput) return null;
 
     const { state, totalSpent, fee } = summaryOutput;
 
+    const isEthereumBasedNetwork = getNetworkType(networkSymbol) === 'ethereum';
+
     return (
         <View onLayout={onLayout}>
             <ReviewOutputCard
-                title={translate('moduleSend.review.outputs.total.label')}
+                title={translate('moduleSend.review.outputs.summary.label')}
                 outputState={state}
             >
                 <VStack spacing="sp16">
-                    <ReviewOutputItemValues
-                        value={totalSpent}
-                        networkSymbol={networkSymbol}
-                        translationKey="moduleSend.review.outputs.total.amount"
-                    />
-                    <ReviewOutputItemValues
-                        value={fee}
-                        networkSymbol={networkSymbol}
-                        translationKey="moduleSend.review.outputs.total.fee"
-                    />
+                    {isEthereumBasedNetwork ? (
+                        <EthereumValues
+                            totalSpent={totalSpent}
+                            fee={fee}
+                            networkSymbol={networkSymbol}
+                            tokenContract={tokenContract}
+                        />
+                    ) : (
+                        <BitcoinValues
+                            totalSpent={totalSpent}
+                            fee={fee}
+                            networkSymbol={networkSymbol}
+                        />
+                    )}
                 </VStack>
             </ReviewOutputCard>
         </View>
diff --git a/suite-native/module-send/src/components/SendFeesForm.tsx b/suite-native/module-send/src/components/SendFeesForm.tsx
index 9c26699484d..9d5fbc7b61b 100644
--- a/suite-native/module-send/src/components/SendFeesForm.tsx
+++ b/suite-native/module-send/src/components/SendFeesForm.tsx
@@ -10,6 +10,7 @@ import {
     AccountKey,
     GeneralPrecomposedLevels,
     PrecomposedTransactionFinal,
+    TokenAddress,
 } from '@suite-common/wallet-types';
 import {
     AccountsRootState,
@@ -30,9 +31,11 @@ import { Translation } from '@suite-native/intl';
 import { SendFeesFormValues, sendFeesFormValidationSchema } from '../sendFeesFormSchema';
 import { FeesFooter } from './FeesFooter';
 import { FeeOptionsList } from './FeeOptionsList';
+import { RecipientsSummary } from './RecipientsSummary';
 
 type SendFormProps = {
     accountKey: AccountKey;
+    tokenContract?: TokenAddress;
     feeLevels: GeneralPrecomposedLevels;
 };
 
@@ -44,7 +47,7 @@ type SendFeesNavigationProps = StackToStackCompositeNavigationProps<
 
 const DEFAULT_FEE = 'normal';
 
-export const SendFeesForm = ({ accountKey, feeLevels }: SendFormProps) => {
+export const SendFeesForm = ({ accountKey, tokenContract, feeLevels }: SendFormProps) => {
     const navigation = useNavigation<SendFeesNavigationProps>();
 
     const account = useSelector((state: AccountsRootState) =>
@@ -62,7 +65,7 @@ export const SendFeesForm = ({ accountKey, feeLevels }: SendFormProps) => {
     const selectedFeeLevelTransaction = feeLevels[selectedFeeLevel] as PrecomposedTransactionFinal;
 
     const feePerUnit = useSelector((state: FeesRootState) =>
-        selectNetworkFeeLevelFeePerUnit(state, selectedFeeLevel, account?.symbol),
+        selectNetworkFeeLevelFeePerUnit(state, account?.symbol, selectedFeeLevel),
     );
 
     if (!account) return;
@@ -70,6 +73,7 @@ export const SendFeesForm = ({ accountKey, feeLevels }: SendFormProps) => {
     const handleNavigateToReviewScreen = handleSubmit(() => {
         navigation.navigate(SendStackRoutes.SendAddressReview, {
             accountKey,
+            tokenContract,
             transaction: selectedFeeLevelTransaction,
         });
 
@@ -82,7 +86,7 @@ export const SendFeesForm = ({ accountKey, feeLevels }: SendFormProps) => {
                     name: RootStackRoutes.SendStack,
                     params: {
                         screen: SendStackRoutes.SendFees,
-                        params: { accountKey, feeLevels },
+                        params: { accountKey, tokenContract, feeLevels },
                     },
                 },
             },
@@ -99,6 +103,11 @@ export const SendFeesForm = ({ accountKey, feeLevels }: SendFormProps) => {
 
     return (
         <Form form={form}>
+            <RecipientsSummary
+                accountKey={accountKey}
+                tokenContract={tokenContract}
+                selectedFeeLevel={selectedFeeLevelTransaction}
+            />
             <Box flex={1} justifyContent="space-between">
                 <VStack spacing="sp16">
                     <VStack spacing="sp4">
@@ -116,10 +125,13 @@ export const SendFeesForm = ({ accountKey, feeLevels }: SendFormProps) => {
                     />
                 </VStack>
                 <FeesFooter
+                    accountKey={accountKey}
                     isSubmittable={isSubmittable}
                     onSubmit={handleNavigateToReviewScreen}
                     totalAmount={selectedFeeLevelTransaction.totalSpent ?? mockedTotalAmount}
+                    fee={selectedFeeLevelTransaction.fee}
                     networkSymbol={account.symbol}
+                    tokenContract={tokenContract}
                 />
             </Box>
         </Form>
diff --git a/suite-native/module-send/src/components/SendMaxButton.tsx b/suite-native/module-send/src/components/SendMaxButton.tsx
new file mode 100644
index 00000000000..8699e68abc0
--- /dev/null
+++ b/suite-native/module-send/src/components/SendMaxButton.tsx
@@ -0,0 +1,106 @@
+import { useState, useEffect, useCallback } from 'react';
+import { Keyboard } from 'react-native';
+import { useDispatch, useSelector } from 'react-redux';
+import Animated, { FadeIn } from 'react-native-reanimated';
+
+import { isFulfilled } from '@reduxjs/toolkit';
+
+import { useCryptoFiatConverters } from '@suite-native/formatters';
+import { AccountsRootState, selectAccountNetworkSymbol } from '@suite-common/wallet-core';
+import { Button } from '@suite-native/atoms';
+import { AccountKey, TokenAddress } from '@suite-common/wallet-types';
+import { useFormContext } from '@suite-native/forms';
+import { useDebounce } from '@trezor/react-utils';
+import { isAddressValid } from '@suite-common/wallet-utils';
+import { Translation } from '@suite-native/intl';
+import { selectAccountTokenBalance, TokensRootState } from '@suite-native/tokens';
+
+import { calculateFeeLevelsMaxAmountThunk } from '../sendFormThunks';
+import { getOutputFieldName, constructFormDraft } from '../utils';
+import { SendOutputsFormValues } from '../sendOutputsFormSchema';
+
+type SendMaxButtonProps = {
+    outputIndex: number;
+    accountKey: AccountKey;
+    tokenContract?: TokenAddress;
+};
+
+export const SendMaxButton = ({ outputIndex, accountKey, tokenContract }: SendMaxButtonProps) => {
+    const dispatch = useDispatch();
+    const debounce = useDebounce();
+    const networkSymbol = useSelector((state: AccountsRootState) =>
+        selectAccountNetworkSymbol(state, accountKey),
+    );
+
+    const tokenBalance = useSelector((state: TokensRootState) =>
+        selectAccountTokenBalance(state, accountKey, tokenContract),
+    );
+
+    const [maxAmountValue, setMaxAmountValue] = useState<string | null>();
+
+    const converters = useCryptoFiatConverters({ networkSymbol: networkSymbol!, tokenContract });
+    const { setValue, watch } = useFormContext<SendOutputsFormValues>();
+
+    const formValues = watch();
+    const addressValue = formValues.outputs[outputIndex]?.address;
+
+    const hasOutputValidAddress =
+        addressValue && networkSymbol && isAddressValid(addressValue, networkSymbol);
+
+    const isMainnetSendMaxAvailable =
+        !tokenContract && formValues.outputs.length === 1 && hasOutputValidAddress;
+    const isSendMaxAvailable = tokenContract || isMainnetSendMaxAvailable;
+
+    const calculateFeeLevelsMaxAmount = useCallback(async () => {
+        const response = await debounce(() =>
+            dispatch(
+                calculateFeeLevelsMaxAmountThunk({
+                    formState: constructFormDraft({ formValues }),
+                    accountKey,
+                }),
+            ),
+        );
+
+        if (isFulfilled(response)) {
+            const { payload } = response;
+            const value = payload.normal ?? payload.low; // If not enough balance for normal fee level, use low.
+            setMaxAmountValue(value);
+        }
+    }, [dispatch, accountKey, debounce, formValues]);
+
+    useEffect(() => {
+        if (tokenBalance) setMaxAmountValue(tokenBalance);
+        else if (isMainnetSendMaxAvailable) calculateFeeLevelsMaxAmount();
+        else setMaxAmountValue(undefined);
+    }, [isMainnetSendMaxAvailable, calculateFeeLevelsMaxAmount, tokenBalance]);
+
+    const setOutputSendMax = () => {
+        if (!maxAmountValue) return;
+
+        Keyboard.dismiss();
+
+        setValue('setMaxOutputId', outputIndex);
+        setValue(getOutputFieldName(outputIndex, 'amount'), maxAmountValue, {
+            shouldValidate: true,
+            shouldTouch: true,
+        });
+
+        const fiatValue = converters?.convertCryptoToFiat(maxAmountValue);
+        if (fiatValue) setValue(getOutputFieldName(outputIndex, 'fiat'), fiatValue);
+    };
+
+    return (
+        isSendMaxAvailable && (
+            <Animated.View entering={FadeIn}>
+                <Button
+                    size="small"
+                    colorScheme="tertiaryElevation0"
+                    onPress={setOutputSendMax}
+                    isLoading={!maxAmountValue}
+                >
+                    <Translation id="moduleSend.outputs.recipients.maxButton" />
+                </Button>
+            </Animated.View>
+        )
+    );
+};
diff --git a/suite-native/module-send/src/components/SendOutputFields.tsx b/suite-native/module-send/src/components/SendOutputFields.tsx
index 8062ef402dc..f2689444cc7 100644
--- a/suite-native/module-send/src/components/SendOutputFields.tsx
+++ b/suite-native/module-send/src/components/SendOutputFields.tsx
@@ -1,12 +1,16 @@
 import { useFieldArray } from 'react-hook-form';
+import { useSelector } from 'react-redux';
 
 import { Card, Text, VStack } from '@suite-native/atoms';
 import { useFormContext } from '@suite-native/forms';
 import { AccountKey } from '@suite-common/wallet-types';
 import { Translation } from '@suite-native/intl';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+import { AccountsRootState, selectAccountNetworkSymbol } from '@suite-common/wallet-core';
 
 import { RecipientInputs } from './RecipientInputs';
+import { SendOutputsFormValues } from '../sendOutputsFormSchema';
+import { CorrectNetworkMessageCard } from './CorrectNetworkMessageCard';
 
 type SendOutputFieldsProps = {
     accountKey: AccountKey;
@@ -19,7 +23,10 @@ const cardStyle = prepareNativeStyle(utils => ({
 
 export const SendOutputFields = ({ accountKey }: SendOutputFieldsProps) => {
     const { applyStyle } = useNativeStyles();
-    const { control } = useFormContext();
+    const { control } = useFormContext<SendOutputsFormValues>();
+    const networkSymbol = useSelector((state: AccountsRootState) =>
+        selectAccountNetworkSymbol(state, accountKey),
+    );
     const outputsFieldArray = useFieldArray({ control, name: 'outputs' });
 
     return (
@@ -27,6 +34,7 @@ export const SendOutputFields = ({ accountKey }: SendOutputFieldsProps) => {
             <Text variant="titleSmall">
                 <Translation id="moduleSend.outputs.recipients.title" />
             </Text>
+            {networkSymbol && <CorrectNetworkMessageCard networkSymbol={networkSymbol} />}
             <Card style={applyStyle(cardStyle)}>
                 {outputsFieldArray.fields.map((output, index) => (
                     <RecipientInputs key={output.id} index={index} accountKey={accountKey} />
diff --git a/suite-native/module-send/src/components/SendScreenSubHeader.tsx b/suite-native/module-send/src/components/SendScreenSubHeader.tsx
index 8e14625bfb2..71aa0cadc82 100644
--- a/suite-native/module-send/src/components/SendScreenSubHeader.tsx
+++ b/suite-native/module-send/src/components/SendScreenSubHeader.tsx
@@ -1,27 +1,36 @@
 import { useSelector } from 'react-redux';
 
-import { CryptoIcon } from '@suite-common/icons-deprecated';
+import { CryptoIcon } from '@suite-native/icons';
 import {
     AccountsRootState,
     selectAccountLabel,
     selectAccountNetworkSymbol,
     selectAccountAvailableBalance,
 } from '@suite-common/wallet-core';
-import { AccountKey } from '@suite-common/wallet-types';
+import { AccountKey, TokenAddress } from '@suite-common/wallet-types';
 import { VStack, HStack, Text } from '@suite-native/atoms';
-import { CryptoAmountFormatter, CryptoToFiatAmountFormatter } from '@suite-native/formatters';
+import { CoinAmountFormatter, CoinToFiatAmountFormatter } from '@suite-native/formatters';
 import { ScreenSubHeader, GoBackIcon, ScreenSubHeaderProps } from '@suite-native/navigation';
 import { nativeSpacings } from '@trezor/theme';
+import {
+    selectAccountTokenBalance,
+    selectAccountTokenSymbol,
+    TokensRootState,
+} from '@suite-native/tokens';
 
 type AccountBalanceScreenHeaderProps = {
-    accountKey?: AccountKey;
+    accountKey: AccountKey;
+    tokenContract?: TokenAddress;
 };
 
 export const SendScreenSubHeader = (props: ScreenSubHeaderProps) => (
     <ScreenSubHeader {...props} customHorizontalPadding={nativeSpacings.sp16} />
 );
 
-export const AccountBalanceScreenHeader = ({ accountKey }: AccountBalanceScreenHeaderProps) => {
+export const AccountBalanceScreenHeader = ({
+    accountKey,
+    tokenContract,
+}: AccountBalanceScreenHeaderProps) => {
     const accountLabel = useSelector((state: AccountsRootState) =>
         selectAccountLabel(state, accountKey),
     );
@@ -33,34 +42,54 @@ export const AccountBalanceScreenHeader = ({ accountKey }: AccountBalanceScreenH
         selectAccountAvailableBalance(state, accountKey),
     );
 
+    const tokenSymbol = useSelector((state: TokensRootState) =>
+        selectAccountTokenSymbol(state, accountKey, tokenContract),
+    );
+
+    const tokenBalance = useSelector((state: TokensRootState) =>
+        selectAccountTokenBalance(state, accountKey, tokenContract),
+    );
+
     if (!networkSymbol) {
         return;
     }
 
+    const accountTitle = tokenSymbol ? `${accountLabel} – ${tokenSymbol}` : accountLabel;
+
     return (
         <SendScreenSubHeader
             content={
                 <VStack spacing="sp4" alignItems="center">
                     <HStack spacing="sp8" alignItems="center">
-                        {networkSymbol && <CryptoIcon symbol={networkSymbol} size="extraSmall" />}
-                        {accountLabel && <Text variant="highlight">{accountLabel}</Text>}
+                        {networkSymbol && (
+                            <CryptoIcon
+                                symbol={networkSymbol}
+                                contractAddress={tokenContract}
+                                size="extraSmall"
+                            />
+                        )}
+                        {accountTitle && <Text variant="highlight">{accountTitle}</Text>}
                     </HStack>
                     <HStack spacing="sp4" alignItems="center">
-                        <CryptoAmountFormatter
+                        <CoinAmountFormatter
                             variant="hint"
-                            value={availableBalance}
-                            network={networkSymbol}
-                            isBalance={false}
                             color="textDefault"
+                            value={tokenBalance ?? availableBalance}
+                            decimals={0}
+                            accountKey={accountKey}
+                            tokenContract={tokenContract}
+                            isBalance={false}
                         />
                         <Text variant="hint" color="textSubdued">
                             ≈
                         </Text>
-                        <CryptoToFiatAmountFormatter
-                            value={availableBalance}
-                            network={networkSymbol}
+                        <CoinToFiatAmountFormatter
                             variant="hint"
                             color="textSubdued"
+                            value={tokenBalance ?? availableBalance}
+                            accountKey={accountKey}
+                            decimals={0}
+                            tokenContract={tokenContract}
                         />
                     </HStack>
                 </VStack>
diff --git a/suite-native/module-send/src/components/SignSuccessMessage.tsx b/suite-native/module-send/src/components/SignSuccessMessage.tsx
index 7e604ec7022..151b6bbf7a8 100644
--- a/suite-native/module-send/src/components/SignSuccessMessage.tsx
+++ b/suite-native/module-send/src/components/SignSuccessMessage.tsx
@@ -2,27 +2,26 @@ import { useSelector } from 'react-redux';
 import Animated, { SlideInDown } from 'react-native-reanimated';
 import { useEffect } from 'react';
 
-import { selectSendSignedTx } from '@suite-common/wallet-core';
-import { Text } from '@suite-native/atoms';
-import { VStack } from '@suite-native/atoms';
+import { Text, VStack } from '@suite-native/atoms';
 import { Translation } from '@suite-native/intl';
 import { useScrollView } from '@suite-native/navigation';
 
 import { ReviewSuccessSvg } from '../../assets/ReviewSuccessSvg';
+import { selectIsTransactionAlreadySigned } from '../selectors';
 
 export const SignSuccessMessage = () => {
-    const signedTransaction = useSelector(selectSendSignedTx);
+    const isTransactionAlreadySigned = useSelector(selectIsTransactionAlreadySigned);
 
     const scrollView = useScrollView();
 
     useEffect(() => {
-        if (scrollView && signedTransaction) {
+        if (scrollView && isTransactionAlreadySigned) {
             // on success scroll to the end so the message is visible
             scrollView.scrollToEnd({ animated: true });
         }
-    }, [signedTransaction, scrollView]);
+    }, [isTransactionAlreadySigned, scrollView]);
 
-    if (!signedTransaction) return null;
+    if (!isTransactionAlreadySigned) return null;
 
     return (
         <Animated.View entering={SlideInDown}>
diff --git a/suite-native/module-send/src/components/SwitchAmountsButton.tsx b/suite-native/module-send/src/components/SwitchAmountsButton.tsx
index f29ae2ae6b3..470a5ad15d5 100644
--- a/suite-native/module-send/src/components/SwitchAmountsButton.tsx
+++ b/suite-native/module-send/src/components/SwitchAmountsButton.tsx
@@ -1,19 +1,16 @@
 import { TouchableOpacity } from 'react-native';
 
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { Box } from '@suite-native/atoms';
 
 type SwitchAmountsButtonProps = { onPress: () => void };
 
-const BUTTON_TOP_OFFSET = 40;
+const BUTTON_TOP_OFFSET = 42;
 const BUTTON_PADDING = 6;
 
 const buttonWrapperStyle = prepareNativeStyle(() => ({
-    position: 'absolute',
-    alignItems: 'center',
-    justifyContent: 'center',
-    width: '100%',
+    alignSelf: 'center',
     top: BUTTON_TOP_OFFSET,
     zIndex: 3, // To stay above both of the absolute inputs.
 }));
@@ -32,7 +29,7 @@ export const SwitchAmountsButton = ({ onPress }: SwitchAmountsButtonProps) => {
     return (
         <Box style={applyStyle(buttonWrapperStyle)}>
             <TouchableOpacity style={applyStyle(buttonStyle)} onPress={onPress}>
-                <Icon size="mediumLarge" name="arrowsCircle" />
+                <Icon size="mediumLarge" name="arrowsCounterClockwise" />
             </TouchableOpacity>
         </Box>
     );
diff --git a/suite-native/module-send/src/components/TokenOfNetworkAlertContent.tsx b/suite-native/module-send/src/components/TokenOfNetworkAlertContent.tsx
new file mode 100644
index 00000000000..bd74cdc7834
--- /dev/null
+++ b/suite-native/module-send/src/components/TokenOfNetworkAlertContent.tsx
@@ -0,0 +1,107 @@
+import { ReactNode } from 'react';
+import { useSelector } from 'react-redux';
+
+import { getNetwork } from '@suite-common/wallet-config';
+import { AccountsRootState, selectAccountNetworkSymbol } from '@suite-common/wallet-core';
+import { AccountKey, TokenAddress } from '@suite-common/wallet-types';
+import { VStack, Box, AlertBox, Text } from '@suite-native/atoms';
+import { CryptoIcon } from '@suite-native/icons';
+import { Translation } from '@suite-native/intl';
+import { TokensRootState, selectAccountTokenSymbol } from '@suite-native/tokens';
+import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+
+const iconWrapperStyle = prepareNativeStyle(() => ({
+    overflow: 'visible',
+    height: 90,
+    width: 90,
+}));
+
+const networkIconWrapperStyle = prepareNativeStyle(utils => ({
+    position: 'absolute',
+    right: 0,
+    bottom: 0,
+    padding: 3,
+    overflow: 'visible',
+    backgroundColor: utils.colors.backgroundSurfaceElevation1,
+    borderRadius: utils.borders.radii.round,
+}));
+
+type ParagraphProps = {
+    header: ReactNode;
+    body: ReactNode;
+};
+
+const Paragraph = ({ header, body }: ParagraphProps) => (
+    <VStack spacing="sp4">
+        <Text variant="highlight">{header}</Text>
+        <Text color="textSubdued">{body}</Text>
+    </VStack>
+);
+
+export const TokenOfNetworkAlertBody = ({
+    accountKey,
+    tokenContract,
+}: {
+    accountKey: AccountKey;
+    tokenContract?: TokenAddress;
+}) => {
+    const { applyStyle } = useNativeStyles();
+    const tokenSymbol = useSelector((state: TokensRootState) =>
+        selectAccountTokenSymbol(state, accountKey, tokenContract),
+    );
+    const networkSymbol = useSelector((state: AccountsRootState) =>
+        selectAccountNetworkSymbol(state, accountKey),
+    );
+
+    if (!tokenContract || !networkSymbol) return null;
+
+    const networkName = getNetwork(networkSymbol).name;
+
+    return (
+        <VStack spacing="sp24">
+            <Box style={applyStyle(iconWrapperStyle)}>
+                <CryptoIcon symbol={networkSymbol} contractAddress={tokenContract} size={80} />
+                <Box style={applyStyle(networkIconWrapperStyle)}>
+                    <CryptoIcon symbol={networkSymbol} size={32} />
+                </Box>
+            </Box>
+            <Text variant="titleSmall">
+                <Translation
+                    id="moduleSend.outputs.tokenOfNetworkSheet.title"
+                    values={{ tokenSymbol, networkName }}
+                />
+            </Text>
+            <Paragraph
+                header={
+                    <Translation id="moduleSend.outputs.tokenOfNetworkSheet.body.self.subtitle" />
+                }
+                body={
+                    <Translation
+                        id="moduleSend.outputs.tokenOfNetworkSheet.body.self.text"
+                        values={{ networkName }}
+                    />
+                }
+            />
+            <Paragraph
+                header={
+                    <Translation id="moduleSend.outputs.tokenOfNetworkSheet.body.outside.subtitle" />
+                }
+                body={
+                    <Translation
+                        id="moduleSend.outputs.tokenOfNetworkSheet.body.outside.text"
+                        values={{ networkName }}
+                    />
+                }
+            />
+            <AlertBox
+                title={
+                    <Text variant="callout" color="textDefault">
+                        <Translation id="moduleSend.outputs.tokenOfNetworkSheet.warning" />
+                    </Text>
+                }
+                variant="warning"
+                borderRadius="r12"
+            />
+        </VStack>
+    );
+};
diff --git a/suite-native/module-send/src/hooks/useAddressValidationAlerts.tsx b/suite-native/module-send/src/hooks/useAddressValidationAlerts.tsx
new file mode 100644
index 00000000000..2760c248af1
--- /dev/null
+++ b/suite-native/module-send/src/hooks/useAddressValidationAlerts.tsx
@@ -0,0 +1,144 @@
+import { useCallback, useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+
+import { useRoute, RouteProp } from '@react-navigation/native';
+import { checkAddressCheckSum, toChecksumAddress } from 'web3-utils';
+import { G } from '@mobily/ts-belt';
+
+import { SendStackParamList, SendStackRoutes } from '@suite-native/navigation';
+import { Translation } from '@suite-native/intl';
+import { selectAccountTokenSymbol, TokensRootState } from '@suite-native/tokens';
+import { useAlert } from '@suite-native/alerts';
+import { useFormContext } from '@suite-native/forms';
+import { isAddressValid } from '@suite-common/wallet-utils';
+import { AccountsRootState, selectAccountNetworkSymbol } from '@suite-common/wallet-core';
+import TrezorConnect from '@trezor/connect';
+import { Link } from '@suite-native/link';
+import { getNetworkType } from '@suite-common/wallet-config';
+
+import { getOutputFieldName } from '../utils';
+import { TokenOfNetworkAlertBody } from '../components/TokenOfNetworkAlertContent';
+
+type UseAddressValidationAlertsArgs = {
+    inputIndex: number;
+};
+
+const CHECKSUM_LINK_URL = 'https://trezor.io/learn/a/evm-address-checksum-in-trezor-suite';
+
+export const useAddressValidationAlerts = ({ inputIndex }: UseAddressValidationAlertsArgs) => {
+    const {
+        params: { tokenContract, accountKey },
+    } = useRoute<RouteProp<SendStackParamList, SendStackRoutes.SendOutputs>>();
+    const [wasAddressChecksummed, setWasAddressChecksummed] = useState(false);
+    const [wasTokenAlertDisplayed, setWasTokenAlertDisplayed] = useState(
+        G.isNullable(tokenContract),
+    );
+    const { showAlert } = useAlert();
+
+    const tokenSymbol = useSelector((state: TokensRootState) =>
+        selectAccountTokenSymbol(state, accountKey, tokenContract),
+    );
+    const networkSymbol = useSelector((state: AccountsRootState) =>
+        selectAccountNetworkSymbol(state, accountKey),
+    );
+    const networkType = networkSymbol ? getNetworkType(networkSymbol) : null;
+
+    const { watch, setValue } = useFormContext();
+
+    const addressFieldName = getOutputFieldName(inputIndex, 'address');
+    const addressValue = watch(addressFieldName);
+
+    const isFilledValidAddress =
+        addressValue && networkSymbol && isAddressValid(addressValue, networkSymbol);
+
+    const convertAddressToChecksum = useCallback(() => {
+        setValue(addressFieldName, toChecksumAddress(addressValue), {
+            shouldValidate: true,
+        });
+        setWasAddressChecksummed(true);
+    }, [addressFieldName, addressValue, setValue]);
+
+    const handleAddressChecksum = useCallback(async () => {
+        if (isFilledValidAddress && !checkAddressCheckSum(addressValue)) {
+            const params = {
+                descriptor: addressValue,
+                coin: networkSymbol,
+            };
+
+            const addressInfo = await TrezorConnect.getAccountInfo(params);
+
+            if (addressInfo.success) {
+                // Already used addresses are checksumed without displaying the alert.
+                const isUsedAddress = addressInfo.payload.history.total !== 0;
+                if (isUsedAddress) {
+                    convertAddressToChecksum();
+
+                    return;
+                }
+            }
+
+            showAlert({
+                title: <Translation id="moduleSend.outputs.recipients.checksum.alert.title" />,
+                description: (
+                    <Translation
+                        id="moduleSend.outputs.recipients.checksum.alert.body"
+                        values={{
+                            link: linkChunk => (
+                                <Link
+                                    href={CHECKSUM_LINK_URL}
+                                    label={linkChunk}
+                                    isUnderlined
+                                    textColor="textSubdued"
+                                />
+                            ),
+                        }}
+                    />
+                ),
+                primaryButtonTitle: (
+                    <Translation id="moduleSend.outputs.recipients.checksum.alert.primaryButton" />
+                ),
+                onPressPrimaryButton: convertAddressToChecksum,
+            });
+        }
+    }, [addressValue, isFilledValidAddress, networkSymbol, showAlert, convertAddressToChecksum]);
+
+    useEffect(() => {
+        const shouldShowTokenAlert =
+            tokenContract && isFilledValidAddress && !wasTokenAlertDisplayed;
+        const shouldChecksumAddress =
+            networkType === 'ethereum' &&
+            !wasAddressChecksummed &&
+            isFilledValidAddress &&
+            wasTokenAlertDisplayed;
+
+        if (shouldShowTokenAlert) {
+            showAlert({
+                appendix: (
+                    <TokenOfNetworkAlertBody
+                        accountKey={accountKey}
+                        tokenContract={tokenContract}
+                    />
+                ),
+                primaryButtonTitle: <Translation id="generic.buttons.gotIt" />,
+                onPressPrimaryButton: () => setWasTokenAlertDisplayed(true),
+            });
+        } else if (shouldChecksumAddress) handleAddressChecksum();
+        // TODO: add path for contract address alert: https://github.com/trezor/trezor-suite/issues/14936.
+        else if (!isFilledValidAddress) {
+            if (tokenContract) setWasTokenAlertDisplayed(false);
+            setWasAddressChecksummed(false);
+        }
+    }, [
+        isFilledValidAddress,
+        showAlert,
+        tokenContract,
+        tokenSymbol,
+        accountKey,
+        networkType,
+        wasAddressChecksummed,
+        handleAddressChecksum,
+        wasTokenAlertDisplayed,
+    ]);
+
+    return { wasAddressChecksummed };
+};
diff --git a/suite-native/module-send/src/hooks/useHandleSendReviewFailure.tsx b/suite-native/module-send/src/hooks/useHandleSendReviewFailure.tsx
index a4061164ed3..e3f7a3c85c5 100644
--- a/suite-native/module-send/src/hooks/useHandleSendReviewFailure.tsx
+++ b/suite-native/module-send/src/hooks/useHandleSendReviewFailure.tsx
@@ -13,7 +13,7 @@ import {
     SendStackRoutes,
     StackToStackCompositeNavigationProps,
 } from '@suite-native/navigation';
-import { GeneralPrecomposedTransactionFinal } from '@suite-common/wallet-types';
+import { GeneralPrecomposedTransactionFinal, TokenAddress } from '@suite-common/wallet-types';
 import { TRANSPORT_ERROR } from '@trezor/transport';
 
 import { useShowDeviceDisconnectedAlert } from './useShowDeviceDisconnectedAlert';
@@ -27,10 +27,12 @@ type NavigationProps = StackToStackCompositeNavigationProps<
 type UseHandleSendReviewFailureArguments = {
     accountKey: string;
     transaction: GeneralPrecomposedTransactionFinal;
+    tokenContract?: TokenAddress;
 };
 
 export const useHandleSendReviewFailure = ({
     accountKey,
+    tokenContract,
     transaction,
 }: UseHandleSendReviewFailureArguments) => {
     const navigation = useNavigation<NavigationProps>();
@@ -49,6 +51,7 @@ export const useHandleSendReviewFailure = ({
         ) {
             navigation.navigate(SendStackRoutes.SendAddressReview, {
                 accountKey,
+                tokenContract,
                 transaction,
             });
 
@@ -77,6 +80,7 @@ export const useHandleSendReviewFailure = ({
             if (isViewOnlyDevice) {
                 navigation.navigate(SendStackRoutes.SendAddressReview, {
                     accountKey,
+                    tokenContract,
                     transaction,
                 });
             }
@@ -87,6 +91,7 @@ export const useHandleSendReviewFailure = ({
 
         navigation.navigate(RootStackRoutes.AccountDetail, {
             accountKey,
+            tokenContract,
             closeActionType: 'back',
         });
     };
diff --git a/suite-native/module-send/src/screens/SendAddressReviewScreen.tsx b/suite-native/module-send/src/screens/SendAddressReviewScreen.tsx
index 499557b48f4..7b538133bd6 100644
--- a/suite-native/module-send/src/screens/SendAddressReviewScreen.tsx
+++ b/suite-native/module-send/src/screens/SendAddressReviewScreen.tsx
@@ -2,10 +2,9 @@ import { useSelector } from 'react-redux';
 import { useEffect } from 'react';
 
 import { SendStackParamList, SendStackRoutes, StackProps } from '@suite-native/navigation';
-import { Box, VStack } from '@suite-native/atoms';
+import { Box, VStack, Text } from '@suite-native/atoms';
 import { Translation, useTranslate } from '@suite-native/intl';
 import { AccountsRootState, DeviceRootState, SendRootState } from '@suite-common/wallet-core';
-import { Text } from '@suite-native/atoms';
 
 import {
     selectIsFirstTransactionAddressConfirmed,
@@ -21,26 +20,26 @@ export const SendAddressReviewScreen = ({
     route,
     navigation,
 }: StackProps<SendStackParamList, SendStackRoutes.SendAddressReview>) => {
-    const { accountKey } = route.params;
+    const { accountKey, tokenContract } = route.params;
     const { translate } = useTranslate();
 
     const showReviewCancellationAlert = useShowReviewCancellationAlert();
 
     const isAddressConfirmed = useSelector(
         (state: AccountsRootState & DeviceRootState & SendRootState) =>
-            selectIsFirstTransactionAddressConfirmed(state, accountKey),
+            selectIsFirstTransactionAddressConfirmed(state, accountKey, tokenContract),
     );
 
     const isReviewInProgress = useSelector(
         (state: AccountsRootState & DeviceRootState & SendRootState) =>
-            selectIsOutputsReviewInProgress(state, accountKey),
+            selectIsOutputsReviewInProgress(state, accountKey, tokenContract),
     );
 
     useEffect(() => {
         if (isAddressConfirmed) {
-            navigation.navigate(SendStackRoutes.SendOutputsReview, { accountKey });
+            navigation.navigate(SendStackRoutes.SendOutputsReview, { accountKey, tokenContract });
         }
-    }, [isAddressConfirmed, accountKey, navigation]);
+    }, [isAddressConfirmed, accountKey, navigation, tokenContract]);
 
     useEffect(() => {
         const unsubscribe = navigation.addListener('beforeRemove', e => {
diff --git a/suite-native/module-send/src/screens/SendFeesScreen.tsx b/suite-native/module-send/src/screens/SendFeesScreen.tsx
index 315d775b1b9..b02171843e6 100644
--- a/suite-native/module-send/src/screens/SendFeesScreen.tsx
+++ b/suite-native/module-send/src/screens/SendFeesScreen.tsx
@@ -6,13 +6,12 @@ import { AccountsRootState, selectAccountByKey } from '@suite-common/wallet-core
 
 import { SendFeesForm } from '../components/SendFeesForm';
 import { SendScreen } from '../components/SendScreen';
-import { RecipientsSummary } from '../components/RecipientsSummary';
 import { AccountBalanceScreenHeader } from '../components/SendScreenSubHeader';
 
 export const SendFeesScreen = ({
     route: { params },
 }: StackProps<SendStackParamList, SendStackRoutes.SendFees>) => {
-    const { accountKey, feeLevels } = params;
+    const { accountKey, tokenContract, feeLevels } = params;
 
     const account = useSelector((state: AccountsRootState) =>
         selectAccountByKey(state, accountKey),
@@ -21,10 +20,17 @@ export const SendFeesScreen = ({
     if (!account) return;
 
     return (
-        <SendScreen screenHeader={<AccountBalanceScreenHeader accountKey={accountKey} />}>
+        <SendScreen
+            screenHeader={
+                <AccountBalanceScreenHeader accountKey={accountKey} tokenContract={tokenContract} />
+            }
+        >
             <VStack spacing="sp32" flex={1}>
-                <RecipientsSummary accountKey={accountKey} />
-                <SendFeesForm accountKey={accountKey} feeLevels={feeLevels} />
+                <SendFeesForm
+                    accountKey={accountKey}
+                    tokenContract={tokenContract}
+                    feeLevels={feeLevels}
+                />
             </VStack>
         </SendScreen>
     );
diff --git a/suite-native/module-send/src/screens/SendOutputsReviewScreen.tsx b/suite-native/module-send/src/screens/SendOutputsReviewScreen.tsx
index 324e643a1a3..0eddf5ea438 100644
--- a/suite-native/module-send/src/screens/SendOutputsReviewScreen.tsx
+++ b/suite-native/module-send/src/screens/SendOutputsReviewScreen.tsx
@@ -31,7 +31,7 @@ type NavigationProps = StackToStackCompositeNavigationProps<
 export const SendOutputsReviewScreen = ({
     route,
 }: StackProps<SendStackParamList, SendStackRoutes.SendOutputsReview>) => {
-    const { accountKey } = route.params;
+    const { accountKey, tokenContract } = route.params;
     const { translate } = useTranslate();
     const navigation = useNavigation<NavigationProps>();
     const showReviewCancellationAlert = useShowReviewCancellationAlert();
@@ -50,6 +50,7 @@ export const SendOutputsReviewScreen = ({
                 dispatch(cleanupSendFormThunk({ accountKey, shouldDeleteDraft: false }));
                 navigation.navigate(RootStackRoutes.AccountDetail, {
                     accountKey,
+                    tokenContract,
                     closeActionType: 'back',
                 });
             }
@@ -66,10 +67,10 @@ export const SendOutputsReviewScreen = ({
                     closeActionType="close"
                 />
             }
-            footer={<OutputsReviewFooter accountKey={accountKey} />}
+            footer={<OutputsReviewFooter accountKey={accountKey} tokenContract={tokenContract} />}
         >
             <VStack flex={1} spacing="sp32" justifyContent="space-between">
-                <ReviewOutputItemList accountKey={accountKey} />
+                <ReviewOutputItemList accountKey={accountKey} tokenContract={tokenContract} />
                 <SignSuccessMessage />
             </VStack>
         </SendScreen>
diff --git a/suite-native/module-send/src/screens/SendOutputsScreen.tsx b/suite-native/module-send/src/screens/SendOutputsScreen.tsx
index b886b416fe1..eebb749f39c 100644
--- a/suite-native/module-send/src/screens/SendOutputsScreen.tsx
+++ b/suite-native/module-send/src/screens/SendOutputsScreen.tsx
@@ -14,7 +14,7 @@ import {
     composeSendFormTransactionFeeLevelsThunk,
     selectAccountByKey,
     selectNetworkFeeInfo,
-    selectSendFormDraftByAccountKey,
+    selectSendFormDraftByKey,
     sendFormActions,
     updateFeeInfoThunk,
 } from '@suite-common/wallet-core';
@@ -29,63 +29,61 @@ import { Box, Button } from '@suite-native/atoms';
 import { Translation } from '@suite-native/intl';
 import { useDebounce } from '@trezor/react-utils';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { FormState } from '@suite-common/wallet-types';
 import { useForm, Form } from '@suite-native/forms';
 import { selectIsAmountInSats, SettingsSliceRootState } from '@suite-native/settings';
+import { TokenAddress } from '@suite-common/wallet-types';
+import { selectAccountTokenInfo, TokensRootState } from '@suite-native/tokens';
 
 import { SendScreen } from '../components/SendScreen';
 import { SendOutputFields } from '../components/SendOutputFields';
 import { SendOutputsFormValues, sendOutputsFormValidationSchema } from '../sendOutputsFormSchema';
 import { AccountBalanceScreenHeader } from '../components/SendScreenSubHeader';
-import { calculateMaxAmountWithNormalFeeThunk } from '../sendFormThunks';
+import { calculateFeeLevelsMaxAmountThunk } from '../sendFormThunks';
+import { constructFormDraft } from '../utils';
+import { FeeLevelsMaxAmount } from '../types';
 
 const buttonWrapperStyle = prepareNativeStyle(utils => ({
     width: '100%',
     padding: utils.spacings.sp16,
 }));
 
-const DEFAULT_VALUES = [
-    {
-        amount: '',
-        address: '',
-        fiat: '',
-    },
-] as const satisfies SendOutputsFormValues['outputs'];
-
-// TODO: this data structure will be revisited in a follow up PR
-const constructFormDraft = ({ outputs }: SendOutputsFormValues): FormState => ({
-    outputs: outputs.map(({ address, amount, fiat = '' }) => ({
-        address,
-        amount,
-        type: 'payment',
-        token: null,
-        fiat,
-        currency: { label: '', value: '' },
-    })),
-    isCoinControlEnabled: false,
-    hasCoinControlBeenOpened: false,
-    selectedUtxos: [],
-    feeLimit: '',
-    feePerUnit: '',
-    options: [],
-    selectedFee: 'normal',
-});
+const getDefaultValues = ({
+    tokenContract,
+}: {
+    tokenContract?: TokenAddress;
+}): Readonly<SendOutputsFormValues> => {
+    return {
+        outputs: [
+            {
+                amount: '',
+                address: '',
+                fiat: '',
+                token: tokenContract ?? null,
+            },
+        ],
+    } as const;
+};
 
 export const SendOutputsScreen = ({
     route: { params },
 }: StackProps<SendStackParamList, SendStackRoutes.SendOutputs>) => {
-    const { accountKey } = params;
+    const { accountKey, tokenContract } = params;
     const dispatch = useDispatch();
     const { applyStyle } = useNativeStyles();
     const debounce = useDebounce();
     const navigation =
         useNavigation<StackNavigationProps<SendStackParamList, SendStackRoutes.SendOutputs>>();
 
-    const [normalFeeMaxAmount, setNormalFeeMaxAmount] = useState<string>();
+    const [feeLevelsMaxAmount, setFeeLevelsMaxAmount] = useState<FeeLevelsMaxAmount>();
 
     const account = useSelector((state: AccountsRootState) =>
         selectAccountByKey(state, accountKey),
     );
+
+    const tokenInfo = useSelector((state: TokensRootState) =>
+        selectAccountTokenInfo(state, accountKey, tokenContract),
+    );
+
     const isAmountInSats = useSelector((state: SettingsSliceRootState) =>
         selectIsAmountInSats(state, account?.symbol),
     );
@@ -93,7 +91,7 @@ export const SendOutputsScreen = ({
         selectNetworkFeeInfo(state, account?.symbol),
     );
     const sendFormDraft = useSelector((state: SendRootState) =>
-        selectSendFormDraftByAccountKey(state, accountKey),
+        selectSendFormDraftByKey(state, accountKey, tokenContract),
     );
 
     const network = account ? getNetwork(account.symbol) : null;
@@ -103,14 +101,13 @@ export const SendOutputsScreen = ({
         context: {
             networkFeeInfo,
             networkSymbol: account?.symbol,
-            availableAccountBalance: account?.availableBalance,
+            availableBalance: tokenInfo?.balance ?? account?.availableBalance,
+            isTokenFlow: !!tokenContract,
             isValueInSats: isAmountInSats,
-            normalFeeMaxAmount,
-            decimals: network?.decimals,
-        },
-        defaultValues: {
-            outputs: DEFAULT_VALUES,
+            feeLevelsMaxAmount,
+            decimals: tokenInfo?.decimals ?? network?.decimals,
         },
+        defaultValues: getDefaultValues({ tokenContract }),
     });
 
     const {
@@ -128,21 +125,22 @@ export const SendOutputsScreen = ({
         dispatch(
             sendFormActions.storeDraft({
                 accountKey,
-                formState: constructFormDraft(getValues()),
+                tokenContract,
+                formState: constructFormDraft({ formValues: getValues(), tokenContract }),
             }),
         );
-    }, [accountKey, dispatch, getValues]);
+    }, [accountKey, dispatch, getValues, tokenContract]);
 
     const calculateNormalFeeMaxAmount = useCallback(async () => {
         const response = await dispatch(
-            calculateMaxAmountWithNormalFeeThunk({
-                formState: constructFormDraft(getValues()),
+            calculateFeeLevelsMaxAmountThunk({
+                formState: constructFormDraft({ formValues: getValues() }),
                 accountKey,
             }),
         );
 
         if (isFulfilled(response)) {
-            setNormalFeeMaxAmount(response.payload);
+            setFeeLevelsMaxAmount(response.payload);
         }
     }, [getValues, accountKey, dispatch]);
 
@@ -166,8 +164,9 @@ export const SendOutputsScreen = ({
     }, [storeFormDraftIfValid, watchedFormValues, debounce, isValid]);
 
     useEffect(() => {
-        calculateNormalFeeMaxAmount();
-    }, [watchedAddress, calculateNormalFeeMaxAmount, networkFeeInfo]);
+        // The max amount is equal to the total token balance for tokens. (fee is paid in mainnet currency)
+        if (!tokenContract) calculateNormalFeeMaxAmount();
+    }, [watchedAddress, calculateNormalFeeMaxAmount, networkFeeInfo, tokenContract]);
 
     // TODO: Fetch periodically. So if the user stays on the screen for a long time, the fee info is updated in the background.
     useEffect(() => {
@@ -184,7 +183,7 @@ export const SendOutputsScreen = ({
 
         const response = await dispatch(
             composeSendFormTransactionFeeLevelsThunk({
-                formState: constructFormDraft(values),
+                formState: constructFormDraft({ formValues: values, tokenContract }),
                 composeContext: {
                     account,
                     network,
@@ -196,6 +195,7 @@ export const SendOutputsScreen = ({
         if (isFulfilled(response)) {
             navigation.navigate(SendStackRoutes.SendFees, {
                 accountKey,
+                tokenContract,
                 feeLevels: response.payload,
             });
 
@@ -205,7 +205,9 @@ export const SendOutputsScreen = ({
 
     return (
         <SendScreen
-            screenHeader={<AccountBalanceScreenHeader accountKey={accountKey} />}
+            screenHeader={
+                <AccountBalanceScreenHeader accountKey={accountKey} tokenContract={tokenContract} />
+            }
             footer={
                 isValid && (
                     <Animated.View
@@ -226,11 +228,9 @@ export const SendOutputsScreen = ({
                 )
             }
         >
-            <Box marginTop="sp32" marginBottom="sp32">
+            <Box marginVertical="sp32">
                 <Form form={form}>
-                    <Box flex={1} justifyContent="space-between">
-                        <SendOutputFields accountKey={accountKey} />
-                    </Box>
+                    <SendOutputFields accountKey={accountKey} />
                 </Form>
             </Box>
         </SendScreen>
diff --git a/suite-native/module-send/src/selectors.ts b/suite-native/module-send/src/selectors.ts
index f8fce3af59d..3e594d357a8 100644
--- a/suite-native/module-send/src/selectors.ts
+++ b/suite-native/module-send/src/selectors.ts
@@ -7,9 +7,9 @@ import {
     selectAccountByKey,
     selectDevice,
     selectSendPrecomposedTx,
-    selectSendFormDraftByAccountKey,
+    selectSendFormDraftByKey,
     selectSendFormReviewButtonRequestsCount,
-    selectSendSignedTx,
+    selectSendSerializedTx,
 } from '@suite-common/wallet-core';
 import {
     constructTransactionReviewOutputs,
@@ -17,15 +17,16 @@ import {
     getTransactionReviewOutputState,
     isRbfTransaction,
 } from '@suite-common/wallet-utils';
-import { ReviewOutputState } from '@suite-common/wallet-types';
+import { AccountKey, ReviewOutputState, TokenAddress } from '@suite-common/wallet-types';
 
 import { StatefulReviewOutput } from './types';
 
 export const selectTransactionReviewOutputs = (
     state: SendRootState & AccountsRootState & DeviceRootState,
-    accountKey: string,
+    accountKey: AccountKey,
+    tokenContract?: TokenAddress,
 ): StatefulReviewOutput[] | null => {
-    const precomposedForm = selectSendFormDraftByAccountKey(state, accountKey);
+    const precomposedForm = selectSendFormDraftByKey(state, accountKey, tokenContract);
     const precomposedTx = selectSendPrecomposedTx(state);
 
     const decreaseOutputId =
@@ -66,9 +67,10 @@ export const selectTransactionReviewOutputs = (
 
 export const selectIsOutputsReviewInProgress = (
     state: SendRootState & AccountsRootState & DeviceRootState,
-    accountKey: string,
+    accountKey: AccountKey,
+    tokenContract?: TokenAddress,
 ): boolean => {
-    const outputs = selectTransactionReviewOutputs(state, accountKey);
+    const outputs = selectTransactionReviewOutputs(state, accountKey, tokenContract);
 
     return G.isNotNullable(outputs) && A.isNotEmpty(outputs);
 };
@@ -76,23 +78,31 @@ export const selectIsOutputsReviewInProgress = (
 export const selectIsFirstTransactionAddressConfirmed = (
     state: SendRootState & AccountsRootState & DeviceRootState,
     accountKey: string,
+    tokenContract?: TokenAddress,
 ): boolean => {
-    const outputs = selectTransactionReviewOutputs(state, accountKey);
+    const outputs = selectTransactionReviewOutputs(state, accountKey, tokenContract);
 
     return outputs?.[0].state === 'success';
 };
 
+export const selectIsTransactionAlreadySigned = (state: SendRootState) => {
+    const serializedTx = selectSendSerializedTx(state);
+
+    return G.isNotNullable(serializedTx);
+};
+
 export const selectReviewSummaryOutputState = (
     state: SendRootState & AccountsRootState & DeviceRootState,
-    accountKey: string,
+    accountKey: AccountKey,
+    tokenContract?: TokenAddress,
 ): ReviewOutputState => {
-    const signedTx = selectSendSignedTx(state);
+    const isTransactionAlreadySigned = selectIsTransactionAlreadySigned(state);
 
-    if (signedTx) {
+    if (isTransactionAlreadySigned) {
         return 'success';
     }
 
-    const reviewOutputs = selectTransactionReviewOutputs(state, accountKey);
+    const reviewOutputs = selectTransactionReviewOutputs(state, accountKey, tokenContract);
 
     if (reviewOutputs && A.all(reviewOutputs, output => output.state === 'success')) {
         return 'active';
@@ -103,7 +113,8 @@ export const selectReviewSummaryOutputState = (
 
 export const selectReviewSummaryOutput = (
     state: AccountsRootState & DeviceRootState & SendRootState,
-    accountKey: string,
+    accountKey: AccountKey,
+    tokenContract?: TokenAddress,
 ) => {
     const precomposedTx = selectSendPrecomposedTx(state);
 
@@ -111,7 +122,7 @@ export const selectReviewSummaryOutput = (
 
     const { totalSpent, fee } = precomposedTx;
 
-    const outputState = selectReviewSummaryOutputState(state, accountKey);
+    const outputState = selectReviewSummaryOutputState(state, accountKey, tokenContract);
 
     return {
         state: outputState,
@@ -122,9 +133,10 @@ export const selectReviewSummaryOutput = (
 
 export const selectTransactionReviewActiveStepIndex = (
     state: AccountsRootState & DeviceRootState & SendRootState,
-    accountKey: string,
+    accountKey: AccountKey,
+    tokenContract?: TokenAddress,
 ) => {
-    const reviewOutputs = selectTransactionReviewOutputs(state, accountKey);
+    const reviewOutputs = selectTransactionReviewOutputs(state, accountKey, tokenContract);
 
     if (!reviewOutputs) return 0;
 
diff --git a/suite-native/module-send/src/sendFormThunks.ts b/suite-native/module-send/src/sendFormThunks.ts
index a1b764b1d2c..231a0397056 100644
--- a/suite-native/module-send/src/sendFormThunks.ts
+++ b/suite-native/module-send/src/sendFormThunks.ts
@@ -1,4 +1,5 @@
 import { isFulfilled, isRejected } from '@reduxjs/toolkit';
+import { D, pipe } from '@mobily/ts-belt';
 
 import { createThunk } from '@suite-common/redux-utils';
 import { getNetwork } from '@suite-common/wallet-config';
@@ -9,7 +10,7 @@ import {
     pushSendFormTransactionThunk,
     selectAccountByKey,
     selectDevice,
-    selectSendFormDraftByAccountKey,
+    selectSendFormDraftByKey,
     sendFormActions,
     signTransactionThunk,
     selectSendFormDrafts,
@@ -23,11 +24,14 @@ import {
     FeeLevelLabel,
     FormState,
     GeneralPrecomposedTransactionFinal,
+    TokenAddress,
 } from '@suite-common/wallet-types';
 import { requestPrioritizedDeviceAccess } from '@suite-native/device-mutex';
 import { hasNetworkFeatures } from '@suite-common/wallet-utils';
 import { BlockbookTransaction } from '@trezor/blockchain-link-types';
 
+import { FeeLevelsMaxAmount } from './types';
+
 const SEND_MODULE_PREFIX = '@suite-native/send';
 
 export const signTransactionNativeThunk = createThunk<
@@ -35,13 +39,17 @@ export const signTransactionNativeThunk = createThunk<
     {
         accountKey: AccountKey;
         feeLevel: GeneralPrecomposedTransactionFinal;
+        tokenContract?: TokenAddress;
     },
     { rejectValue: SignTransactionError | undefined }
 >(
     `${SEND_MODULE_PREFIX}/signTransactionNativeThunk`,
-    async ({ accountKey, feeLevel }, { dispatch, rejectWithValue, fulfillWithValue, getState }) => {
+    async (
+        { accountKey, tokenContract, feeLevel },
+        { dispatch, rejectWithValue, fulfillWithValue, getState },
+    ) => {
         const account = selectAccountByKey(getState(), accountKey);
-        const formState = selectSendFormDraftByAccountKey(getState(), accountKey);
+        const formState = selectSendFormDraftByKey(getState(), accountKey, tokenContract);
         const device = selectDevice(getState());
 
         if (!account || !formState)
@@ -151,11 +159,11 @@ export const removeSendFormDraftsSupportingAmountUnitThunk = createThunk(
     },
 );
 
-export const calculateMaxAmountWithNormalFeeThunk = createThunk<
-    string | undefined,
+export const calculateFeeLevelsMaxAmountThunk = createThunk<
+    FeeLevelsMaxAmount,
     { formState: FormState; accountKey: AccountKey }
 >(
-    `${SEND_MODULE_PREFIX}/calculateMaxAmountWithNormalFeeThunk`,
+    `${SEND_MODULE_PREFIX}/calculateMaxAmountThunk`,
     async ({ formState, accountKey }, { dispatch, getState }) => {
         const account = selectAccountByKey(getState(), accountKey);
         if (!account) throw new Error('Account not found.');
@@ -180,26 +188,34 @@ export const calculateMaxAmountWithNormalFeeThunk = createThunk<
         );
 
         if (isFulfilled(response)) {
-            if (response.payload.normal.type !== 'error') {
-                return response.payload.normal.max;
-            }
+            return pipe(
+                response.payload,
+                D.filter(x => 'max' in x),
+                D.map(y => (y as GeneralPrecomposedTransactionFinal).max),
+            ) as FeeLevelsMaxAmount;
         }
+
+        throw new Error('Unable to get the max amounts.');
     },
 );
 
 export const updateDraftFeeLevelThunk = createThunk(
     `${SEND_MODULE_PREFIX}/updateDraftFeeLevelThunk`,
     (
-        { accountKey, feeLevel }: { accountKey: AccountKey; feeLevel: FeeLevelLabel },
+        {
+            accountKey,
+            tokenContract,
+            feeLevel,
+        }: { accountKey: AccountKey; tokenContract?: TokenAddress; feeLevel: FeeLevelLabel },
         { dispatch, getState },
     ) => {
-        const draft = selectSendFormDraftByAccountKey(getState(), accountKey);
+        const draft = selectSendFormDraftByKey(getState(), accountKey, tokenContract);
 
         if (!draft) throw Error('Draft not found.');
         const draftCopy = { ...draft };
 
         draftCopy.selectedFee = feeLevel;
 
-        dispatch(sendFormActions.storeDraft({ accountKey, formState: draftCopy }));
+        dispatch(sendFormActions.storeDraft({ accountKey, tokenContract, formState: draftCopy }));
     },
 );
diff --git a/suite-native/module-send/src/sendOutputsFormSchema.ts b/suite-native/module-send/src/sendOutputsFormSchema.ts
index 559f53204f0..4de8f9548a2 100644
--- a/suite-native/module-send/src/sendOutputsFormSchema.ts
+++ b/suite-native/module-send/src/sendOutputsFormSchema.ts
@@ -6,12 +6,15 @@ import { formatNetworkAmount, isAddressValid, isDecimalsValid } from '@suite-com
 import { FeeInfo } from '@suite-common/wallet-types';
 import { yup } from '@suite-common/validators';
 
+import { FeeLevelsMaxAmount } from './types';
+
 export type SendFormFormContext = {
     networkSymbol?: NetworkSymbol;
-    availableAccountBalance?: string;
+    availableBalance?: string;
     networkFeeInfo?: FeeInfo;
     isValueInSats?: boolean;
-    normalFeeMaxAmount?: string;
+    isTokenFlow?: boolean;
+    feeLevelsMaxAmount?: FeeLevelsMaxAmount;
     decimals?: number;
 };
 
@@ -39,25 +42,38 @@ const isAmountDust = (amount: string, context?: SendFormFormContext) => {
     return amountBigNumber.lt(dustThreshold);
 };
 
-const isAmountHigherThanBalance = (amount: string, context?: SendFormFormContext) => {
+const isAmountHigherThanBalance = (
+    amount: string,
+    isSendMaxEnabled: boolean,
+    context?: SendFormFormContext,
+) => {
     if (!amount || !context) {
         return false;
     }
 
-    const {
-        networkSymbol,
-        networkFeeInfo,
-        availableAccountBalance,
-        normalFeeMaxAmount = '0',
-    } = context;
+    const { networkSymbol, networkFeeInfo, availableBalance, feeLevelsMaxAmount, isTokenFlow } =
+        context;
 
-    if (!networkSymbol || !networkFeeInfo || !availableAccountBalance) {
+    if (!networkSymbol || !networkFeeInfo || !availableBalance) {
         return false;
     }
 
     const amountBigNumber = new BigNumber(amount);
+    if (isTokenFlow) {
+        return amountBigNumber.gt(availableBalance);
+    }
+
+    const normalMaxAmount = feeLevelsMaxAmount?.normal;
 
-    return amountBigNumber.gt(normalFeeMaxAmount);
+    // if send max is enabled, user is allowed submit form even if there is enough balance only for economy fee.
+    if (isSendMaxEnabled) {
+        const lowestLevelMaxAmount = feeLevelsMaxAmount?.economy ?? normalMaxAmount;
+        if (!lowestLevelMaxAmount) return true;
+
+        return amountBigNumber.gt(lowestLevelMaxAmount);
+    }
+
+    return !normalMaxAmount || amountBigNumber.gt(normalMaxAmount);
 };
 
 // TODO: change error messages copy when is design ready
@@ -95,8 +111,15 @@ export const sendOutputsFormValidationSchema = yup.object({
                     .test(
                         'is-higher-than-balance',
                         'You don’t have enough balance to send this amount.',
-                        (value, { options: { context } }: yup.TestContext<SendFormFormContext>) => {
-                            return !isAmountHigherThanBalance(value, context);
+                        function (
+                            value,
+                            { options: { context } }: yup.TestContext<SendFormFormContext>,
+                        ) {
+                            const isSendMaxEnabled = G.isNotNullable(
+                                this.from?.[1]?.value.setMaxOutputId,
+                            );
+
+                            return !isAmountHigherThanBalance(value, isSendMaxEnabled, context);
                         },
                     )
                     .test(
@@ -109,12 +132,13 @@ export const sendOutputsFormValidationSchema = yup.object({
                         },
                     ),
                 fiat: yup.string(),
+                token: yup.string().required().nullable(),
                 // TODO: other validations have to be added in the following PRs
-                //       1) validation of token amount
-                //       2) check if the amount is not higher than XRP reserve
+                //       e.g. check if the amount is not higher than XRP reserve
             }),
         )
         .required(),
+    setMaxOutputId: yup.number(),
 });
 
 export type SendOutputsFormValues = yup.InferType<typeof sendOutputsFormValidationSchema>;
diff --git a/suite-native/module-send/src/types.ts b/suite-native/module-send/src/types.ts
index 09a1259912c..6a1cb329abb 100644
--- a/suite-native/module-send/src/types.ts
+++ b/suite-native/module-send/src/types.ts
@@ -2,7 +2,13 @@ import { RefObject } from 'react';
 import { TextInput, TextInputProps } from 'react-native';
 import { SharedValue } from 'react-native-reanimated';
 
-import { FeeLevelLabel, ReviewOutput, ReviewOutputState } from '@suite-common/wallet-types';
+import {
+    AccountKey,
+    FeeLevelLabel,
+    ReviewOutput,
+    ReviewOutputState,
+    TokenAddress,
+} from '@suite-common/wallet-types';
 import { NetworkSymbol } from '@suite-common/wallet-config';
 
 export type StatefulReviewOutput = ReviewOutput & { state: ReviewOutputState };
@@ -16,6 +22,11 @@ export type SendAmountInputProps = {
     inputRef: RefObject<TextInput>;
     scaleValue: SharedValue<number>;
     translateValue: SharedValue<number>;
+    accountKey?: AccountKey;
+    tokenContract?: TokenAddress;
     isDisabled?: boolean;
-    onFocus?: TextInputProps['onFocus'];
+    onPress?: TextInputProps['onPress'];
+    onFocus?: () => void;
 };
+
+export type FeeLevelsMaxAmount = Record<FeeLevelLabel, string | undefined>;
diff --git a/suite-native/module-send/src/utils.ts b/suite-native/module-send/src/utils.ts
index cd2d4e1e99c..b32e20aafa2 100644
--- a/suite-native/module-send/src/utils.ts
+++ b/suite-native/module-send/src/utils.ts
@@ -1,6 +1,33 @@
-import { SendOutputFieldName } from './sendOutputsFormSchema';
+import { FormState, TokenAddress } from '@suite-common/wallet-types';
+
+import { SendOutputFieldName, SendOutputsFormValues } from './sendOutputsFormSchema';
 
 export const getOutputFieldName = <TField extends SendOutputFieldName>(
     index: number,
     field: TField,
 ): `outputs.${number}.${TField}` => `outputs.${index}.${field}`;
+
+export const constructFormDraft = ({
+    formValues: { outputs, setMaxOutputId },
+    tokenContract,
+}: {
+    formValues: SendOutputsFormValues;
+    tokenContract?: TokenAddress;
+}): FormState => ({
+    outputs: outputs.map(({ address, amount, fiat = '' }) => ({
+        address,
+        amount,
+        type: 'payment',
+        token: tokenContract ?? null,
+        fiat,
+        currency: { label: '', value: '' },
+    })),
+    setMaxOutputId,
+    isCoinControlEnabled: false,
+    hasCoinControlBeenOpened: false,
+    selectedUtxos: [],
+    feeLimit: '',
+    feePerUnit: '',
+    options: [],
+    selectedFee: 'normal',
+});
diff --git a/suite-native/module-send/tsconfig.json b/suite-native/module-send/tsconfig.json
index 813e560542c..ed4297a5d53 100644
--- a/suite-native/module-send/tsconfig.json
+++ b/suite-native/module-send/tsconfig.json
@@ -5,9 +5,6 @@
         {
             "path": "../../suite-common/formatters"
         },
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/redux-utils"
         },
@@ -33,18 +30,23 @@
         { "path": "../alerts" },
         { "path": "../analytics" },
         { "path": "../atoms" },
+        { "path": "../config" },
         { "path": "../device" },
         { "path": "../device-mutex" },
         { "path": "../formatters" },
         { "path": "../forms" },
         { "path": "../helpers" },
+        { "path": "../icons" },
         { "path": "../intl" },
+        { "path": "../link" },
         { "path": "../navigation" },
         { "path": "../qr-code" },
         { "path": "../settings" },
+        { "path": "../tokens" },
         {
             "path": "../../packages/blockchain-link-types"
         },
+        { "path": "../../packages/connect" },
         { "path": "../../packages/react-utils" },
         { "path": "../../packages/styles" },
         { "path": "../../packages/theme" },
diff --git a/suite-native/module-settings/package.json b/suite-native/module-settings/package.json
index 40afa7ee7cf..87f6f32b2cf 100644
--- a/suite-native/module-settings/package.json
+++ b/suite-native/module-settings/package.json
@@ -7,7 +7,6 @@
     "type": "module",
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -18,7 +17,6 @@
         "@react-navigation/native-stack": "6.11.0",
         "@reduxjs/toolkit": "1.9.5",
         "@suite-common/analytics": "workspace:*",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/suite-config": "workspace:*",
         "@suite-common/suite-constants": "workspace:*",
         "@suite-common/suite-types": "workspace:*",
@@ -34,6 +32,7 @@
         "@suite-native/device-manager": "workspace:*",
         "@suite-native/discovery": "workspace:*",
         "@suite-native/feature-flags": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/link": "workspace:*",
         "@suite-native/navigation": "workspace:*",
diff --git a/suite-native/module-settings/src/components/AboutUsBanners.tsx b/suite-native/module-settings/src/components/AboutUsBanners.tsx
index 99902dc96f2..75617aae0f6 100644
--- a/suite-native/module-settings/src/components/AboutUsBanners.tsx
+++ b/suite-native/module-settings/src/components/AboutUsBanners.tsx
@@ -2,7 +2,7 @@ import { Card, HStack, IconButton, Text, VStack } from '@suite-native/atoms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { Color } from '@trezor/theme';
 import { useOpenLink } from '@suite-native/link';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 
 const cardStyle = prepareNativeStyle<{ backgroundColor: Color }>((utils, { backgroundColor }) => ({
     paddingHorizontal: utils.spacings.sp24,
@@ -28,7 +28,7 @@ export const AboutUsBanners = () => {
         <VStack>
             <Card style={applyStyle(cardStyle, { backgroundColor: 'backgroundNeutralBold' })}>
                 <VStack spacing="sp24" style={applyStyle(stackStyle)}>
-                    <Icon color="iconOnPrimary" name="trezor" />
+                    <Icon color="iconOnPrimary" name="trezorLogo" />
                     <Text
                         textAlign="center"
                         color="textOnPrimary"
@@ -50,7 +50,7 @@ export const AboutUsBanners = () => {
                         <IconButton
                             size="large"
                             colorScheme="tertiaryElevation1"
-                            iconName="facebook"
+                            iconName="facebookLogo"
                             accessibilityRole="link"
                             accessibilityLabel="facebook"
                             onPress={() => openLink('https://www.facebook.com/trezor.io')}
@@ -58,7 +58,7 @@ export const AboutUsBanners = () => {
                         <IconButton
                             size="large"
                             colorScheme="tertiaryElevation1"
-                            iconName="twitter"
+                            iconName="twitterLogo"
                             accessibilityRole="link"
                             accessibilityLabel="twitter"
                             onPress={() => openLink('https://twitter.com/Trezor')}
@@ -66,7 +66,7 @@ export const AboutUsBanners = () => {
                         <IconButton
                             size="large"
                             colorScheme="tertiaryElevation1"
-                            iconName="github"
+                            iconName="githubLogo"
                             accessibilityRole="link"
                             accessibilityLabel="github"
                             onPress={() => openLink('https://github.com/trezor')}
diff --git a/suite-native/module-settings/src/components/ColorSchemePickerItem.tsx b/suite-native/module-settings/src/components/ColorSchemePickerItem.tsx
index e92ac227c3d..e863e924b69 100644
--- a/suite-native/module-settings/src/components/ColorSchemePickerItem.tsx
+++ b/suite-native/module-settings/src/components/ColorSchemePickerItem.tsx
@@ -12,7 +12,7 @@ type ColorSchemePickerItemProps = {
 const pickerItemWrapperStyle = prepareNativeStyle<{ isColorSchemeActive: boolean }>(
     (utils, { isColorSchemeActive }) => ({
         backgroundColor: utils.colors.backgroundSurfaceElevationNegative,
-        borderRadius: utils.borders.radii.medium,
+        borderRadius: utils.borders.radii.r16,
         minHeight: 114,
         flex: 1,
         paddingTop: 33,
diff --git a/suite-native/module-settings/src/components/FeaturesSettings.tsx b/suite-native/module-settings/src/components/FeaturesSettings.tsx
index aec1eb6471f..898a010f19f 100644
--- a/suite-native/module-settings/src/components/FeaturesSettings.tsx
+++ b/suite-native/module-settings/src/components/FeaturesSettings.tsx
@@ -40,7 +40,7 @@ export const FeaturesSettings = () => {
         <SettingsSection title={<Translation id="moduleSettings.items.features.title" />}>
             {isDevButtonVisible && (
                 <SettingsSectionItem
-                    iconName="placeholder"
+                    iconName="circleDashed"
                     title={<Translation id="moduleSettings.items.features.devUtils.title" />}
                     subtitle={<Translation id="moduleSettings.items.features.devUtils.subtitle" />}
                     onPress={() => navigation.navigate(RootStackRoutes.DevUtilsStack)}
@@ -59,7 +59,7 @@ export const FeaturesSettings = () => {
             {isUsbDeviceConnectFeatureEnabled && (
                 <>
                     <SettingsSectionItem
-                        iconName="bookmark"
+                        iconName="bookmarkSimple"
                         title={<Translation id="moduleSettings.items.features.viewOnly.title" />}
                         subtitle={
                             <Translation id="moduleSettings.items.features.viewOnly.subtitle" />
diff --git a/suite-native/module-settings/src/components/SettingsSection.tsx b/suite-native/module-settings/src/components/SettingsSection.tsx
index 58f633f1eb6..c6de799ac27 100644
--- a/suite-native/module-settings/src/components/SettingsSection.tsx
+++ b/suite-native/module-settings/src/components/SettingsSection.tsx
@@ -2,7 +2,7 @@ import { ReactNode } from 'react';
 import { TouchableOpacity } from 'react-native';
 
 import { Box, Text, VStack, Card } from '@suite-native/atoms';
-import { Icon, IconName } from '@suite-common/icons-deprecated';
+import { Icon, IconName } from '@suite-native/icons';
 
 type SettingsSectionProps = {
     title: ReactNode;
diff --git a/suite-native/module-settings/src/components/SettingsSectionItem.tsx b/suite-native/module-settings/src/components/SettingsSectionItem.tsx
index 502b7be61ee..25a8edb23fe 100644
--- a/suite-native/module-settings/src/components/SettingsSectionItem.tsx
+++ b/suite-native/module-settings/src/components/SettingsSectionItem.tsx
@@ -2,7 +2,7 @@ import { ReactNode } from 'react';
 import { ActivityIndicator, TouchableOpacity, View } from 'react-native';
 
 import { Box } from '@suite-native/atoms';
-import { Icon, IconName } from '@suite-common/icons-deprecated';
+import { Icon, IconName } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
 import { SettingsSectionItemIcon } from './SettingsSectionItemIcon';
@@ -44,7 +44,7 @@ export const SettingsSectionItem = ({
                     {isLoading ? (
                         <ActivityIndicator size="small" color={utils.colors.iconSubdued} />
                     ) : (
-                        <Icon name="circleRightLight" color="iconPrimaryDefault" />
+                        <Icon name="caretCircleRight" color="iconPrimaryDefault" />
                     )}
                 </View>
             </Box>
diff --git a/suite-native/module-settings/src/components/SettingsSectionItemIcon.tsx b/suite-native/module-settings/src/components/SettingsSectionItemIcon.tsx
index 0a7d106ce76..f3341f17c65 100644
--- a/suite-native/module-settings/src/components/SettingsSectionItemIcon.tsx
+++ b/suite-native/module-settings/src/components/SettingsSectionItemIcon.tsx
@@ -1,5 +1,5 @@
 import { Box, RoundedIcon } from '@suite-native/atoms';
-import { IconName } from '@suite-common/icons-deprecated';
+import { IconName } from '@suite-native/icons';
 
 type SettingsSectionItemIconProps = {
     iconName: IconName;
diff --git a/suite-native/module-settings/src/components/SupportSettings.tsx b/suite-native/module-settings/src/components/SupportSettings.tsx
index cf14cac5c9a..af9424adb1f 100644
--- a/suite-native/module-settings/src/components/SupportSettings.tsx
+++ b/suite-native/module-settings/src/components/SupportSettings.tsx
@@ -25,7 +25,7 @@ export const SupportSettings = () => {
     return (
         <SettingsSection title="Support">
             <SettingsSectionItem
-                iconName="questionLight"
+                iconName="question"
                 title={<Translation id="moduleSettings.items.support.help.title" />}
                 subtitle={<Translation id="moduleSettings.items.support.help.subtitle" />}
                 onPress={() => navigation.navigate(SettingsStackRoutes.SettingsFAQ)}
@@ -38,7 +38,7 @@ export const SupportSettings = () => {
                         <TrezorSuiteLiteHeader textVariant="body" />
                     </>
                 }
-                iconName="trezorT3T1"
+                iconName="trezorSafe5"
                 onPress={() => navigation.navigate(SettingsStackRoutes.SettingsAbout)}
                 testID="@settings/about"
             />
diff --git a/suite-native/module-settings/src/components/TouchableSwitchRow.tsx b/suite-native/module-settings/src/components/TouchableSwitchRow.tsx
index 063ee62cc59..1d88f763ec4 100644
--- a/suite-native/module-settings/src/components/TouchableSwitchRow.tsx
+++ b/suite-native/module-settings/src/components/TouchableSwitchRow.tsx
@@ -2,7 +2,7 @@ import { ReactNode } from 'react';
 import { TouchableOpacity } from 'react-native';
 
 import { Box, Text, Switch, RoundedIcon } from '@suite-native/atoms';
-import { IconName } from '@suite-common/icons-deprecated';
+import { IconName } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
 type TouchableSwitchRowProps = {
diff --git a/suite-native/module-settings/src/components/ViewOnly/DevicesManagement.tsx b/suite-native/module-settings/src/components/ViewOnly/DevicesManagement.tsx
index a61d96cda4f..bb02bd3a4ae 100644
--- a/suite-native/module-settings/src/components/ViewOnly/DevicesManagement.tsx
+++ b/suite-native/module-settings/src/components/ViewOnly/DevicesManagement.tsx
@@ -5,7 +5,7 @@ import { Translation } from '@suite-native/intl';
 import { ConnectionDot } from '@suite-native/device-manager';
 import { selectPhysicalDevicesGrouppedById } from '@suite-common/wallet-core';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { DeviceModelIcon } from '@suite-common/icons-deprecated';
+import { DeviceModelIcon } from '@suite-native/icons';
 
 import { About, AboutProps } from './About';
 import { WalletRow } from './WalletRow';
@@ -18,7 +18,7 @@ const cardStyle = prepareNativeStyle(utils => ({
 const deviceStyle = prepareNativeStyle(utils => ({
     padding: utils.spacings.sp16,
     alignItems: 'center',
-    gap: 12,
+    gap: utils.spacings.sp12,
 }));
 
 export const DevicesManagement = ({ onPressAbout }: AboutProps) => {
@@ -67,7 +67,7 @@ export const DevicesManagement = ({ onPressAbout }: AboutProps) => {
                         </HStack>
                         <Divider />
                         {devices.map(device => (
-                            <WalletRow key={`${device.state}`} device={device} />
+                            <WalletRow key={`${device.state?.staticSessionId}`} device={device} />
                         ))}
                     </Card>
                 );
diff --git a/suite-native/module-settings/src/components/ViewOnly/WalletRow.tsx b/suite-native/module-settings/src/components/ViewOnly/WalletRow.tsx
index bc52feab9c7..96756bf4dbd 100644
--- a/suite-native/module-settings/src/components/ViewOnly/WalletRow.tsx
+++ b/suite-native/module-settings/src/components/ViewOnly/WalletRow.tsx
@@ -4,14 +4,15 @@ import { Button, HStack, Loader, Text } from '@suite-native/atoms';
 import { Translation } from '@suite-native/intl';
 import {
     ConnectDeviceSettings,
+    DeviceRootState,
     deviceActions,
-    selectDeviceLabelOrName,
+    selectDeviceLabelOrNameById,
     selectHasDeviceDiscovery,
 } from '@suite-common/wallet-core';
 import { analytics, EventType } from '@suite-native/analytics';
 import { useAlert } from '@suite-native/alerts';
 import { useToast } from '@suite-native/toasts';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { TrezorDevice } from '@suite-common/suite-types';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { setViewOnlyCancelationTimestamp } from '@suite-native/settings';
@@ -33,7 +34,9 @@ export const WalletRow = ({ device }: WalletRowProps) => {
     const { showToast } = useToast();
     const { applyStyle } = useNativeStyles();
     const hasDiscovery = useSelector(selectHasDeviceDiscovery);
-    const deviceLabel = useSelector(selectDeviceLabelOrName);
+    const deviceLabel = useSelector((state: DeviceRootState) =>
+        selectDeviceLabelOrNameById(state, device?.id),
+    );
 
     const walletNameLabel = device.useEmptyPassphrase ? (
         <Translation id="moduleSettings.viewOnly.wallet.standard" />
@@ -110,10 +113,7 @@ export const WalletRow = ({ device }: WalletRowProps) => {
     return (
         <HStack key={device.instance} style={applyStyle(walletRowStyle)}>
             <HStack spacing="sp12" alignItems="center">
-                <Icon
-                    name={device.useEmptyPassphrase ? 'standardWallet' : 'password'}
-                    size="mediumLarge"
-                />
+                <Icon name={device.useEmptyPassphrase ? 'wallet' : 'password'} size="mediumLarge" />
                 <Text variant="callout">{walletNameLabel}</Text>
             </HStack>
             {showToggleButton ? (
diff --git a/suite-native/module-settings/src/screens/SettingsAboutUsScreen.tsx b/suite-native/module-settings/src/screens/SettingsAboutUsScreen.tsx
index cc18121cbb8..9e55eb5076d 100644
--- a/suite-native/module-settings/src/screens/SettingsAboutUsScreen.tsx
+++ b/suite-native/module-settings/src/screens/SettingsAboutUsScreen.tsx
@@ -31,12 +31,12 @@ export const SettingsAboutUsScreen = () => {
                 <SettingsSection title="Legal">
                     <SettingsSectionItem
                         title="Terms & conditions"
-                        iconName="pdf"
+                        iconName="filePdf"
                         onPress={handleOpenTermsAndConditions}
                     />
                     <SettingsSectionItem
                         title="Privacy policy"
-                        iconName="pdf"
+                        iconName="filePdf"
                         onPress={handleOpenPrivacyPolicy}
                     />
                 </SettingsSection>
diff --git a/suite-native/module-settings/src/screens/SettingsPrivacyAndSecurity.tsx b/suite-native/module-settings/src/screens/SettingsPrivacyAndSecurity.tsx
index f6e97fc332a..5d8ee43d12f 100644
--- a/suite-native/module-settings/src/screens/SettingsPrivacyAndSecurity.tsx
+++ b/suite-native/module-settings/src/screens/SettingsPrivacyAndSecurity.tsx
@@ -98,7 +98,7 @@ const BiometricsSwitchRow = () => {
             isChecked={isBiometricsOptionEnabled}
             onChange={toggleBiometricsOption}
             text="Biometrics"
-            iconName={Platform.OS === 'ios' ? 'touchId' : 'fingerprint'}
+            iconName={Platform.OS === 'ios' ? 'fingerprintSimple' : 'fingerprint'}
             description={
                 <RowDescription>
                     Use facial or fingerprint verification to unlock the app
diff --git a/suite-native/module-settings/tsconfig.json b/suite-native/module-settings/tsconfig.json
index 0bbf9190940..136230c339c 100644
--- a/suite-native/module-settings/tsconfig.json
+++ b/suite-native/module-settings/tsconfig.json
@@ -5,9 +5,6 @@
         {
             "path": "../../suite-common/analytics"
         },
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/suite-config"
         },
@@ -33,6 +30,7 @@
         { "path": "../device-manager" },
         { "path": "../discovery" },
         { "path": "../feature-flags" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../link" },
         { "path": "../navigation" },
diff --git a/suite-native/module-staking-management/package.json b/suite-native/module-staking-management/package.json
index 00b2c98437f..173fb36e6c8 100644
--- a/suite-native/module-staking-management/package.json
+++ b/suite-native/module-staking-management/package.json
@@ -7,15 +7,15 @@
     "main": "src/index",
     "scripts": {
         "depcheck": "yarn g:depcheck",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
         "@react-navigation/native": "6.1.18",
-        "@suite-common/icons-deprecated": "workspace:*",
+        "@reduxjs/toolkit": "1.9.5",
         "@suite-common/wallet-core": "workspace:*",
         "@suite-native/atoms": "workspace:*",
         "@suite-native/formatters": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/link": "workspace:*",
         "@suite-native/navigation": "workspace:*",
diff --git a/suite-native/module-staking-management/redux.d.ts b/suite-native/module-staking-management/redux.d.ts
new file mode 100644
index 00000000000..df9a0c3f969
--- /dev/null
+++ b/suite-native/module-staking-management/redux.d.ts
@@ -0,0 +1,7 @@
+import { AsyncThunkAction } from '@reduxjs/toolkit';
+
+declare module 'redux' {
+    export interface Dispatch {
+        <TThunk extends AsyncThunkAction<any, any, any>>(thunk: TThunk): ReturnType<TThunk>;
+    }
+}
diff --git a/suite-native/module-staking-management/src/components/StakingBalancesOverviewCard.tsx b/suite-native/module-staking-management/src/components/StakingBalancesOverviewCard.tsx
index 6c397119dac..9b30de2bc33 100644
--- a/suite-native/module-staking-management/src/components/StakingBalancesOverviewCard.tsx
+++ b/suite-native/module-staking-management/src/components/StakingBalancesOverviewCard.tsx
@@ -1,7 +1,7 @@
 import { TouchableOpacity } from 'react-native';
 import { useSelector } from 'react-redux';
 
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { AccountsRootState, selectAccountNetworkSymbol } from '@suite-common/wallet-core';
 import { Box, Card, Text } from '@suite-native/atoms';
 import { CryptoAmountFormatter, CryptoToFiatAmountFormatter } from '@suite-native/formatters';
diff --git a/suite-native/module-staking-management/src/components/StakingDetailScreenHeader.tsx b/suite-native/module-staking-management/src/components/StakingDetailScreenHeader.tsx
index 36e3ab5a1d2..c883ec69988 100644
--- a/suite-native/module-staking-management/src/components/StakingDetailScreenHeader.tsx
+++ b/suite-native/module-staking-management/src/components/StakingDetailScreenHeader.tsx
@@ -12,7 +12,7 @@ import {
 } from '@suite-native/navigation';
 import { Translation } from '@suite-native/intl';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { AccountsRootState, selectAccountLabel } from '@suite-common/wallet-core';
 
 const headerStyle = prepareNativeStyle(utils => ({
diff --git a/suite-native/module-staking-management/src/components/StakingUnavailableBottomSheet.tsx b/suite-native/module-staking-management/src/components/StakingUnavailableBottomSheet.tsx
index 3e01191d63a..0aec62b1ced 100644
--- a/suite-native/module-staking-management/src/components/StakingUnavailableBottomSheet.tsx
+++ b/suite-native/module-staking-management/src/components/StakingUnavailableBottomSheet.tsx
@@ -48,7 +48,7 @@ export const StakingUnavailableBottomSheet = ({
             <Button
                 colorScheme="tertiaryElevation0"
                 onPress={handleDesktopClick}
-                viewLeft="externalLink"
+                viewLeft="arrowSquareOut"
                 style={applyStyle(bottomSheetElementStyle)}
             >
                 <Translation id="staking.trezorDesktop" />
diff --git a/suite-native/module-staking-management/src/screens/StakingDetailScreen.tsx b/suite-native/module-staking-management/src/screens/StakingDetailScreen.tsx
index 329915bb77a..ab4be165c78 100644
--- a/suite-native/module-staking-management/src/screens/StakingDetailScreen.tsx
+++ b/suite-native/module-staking-management/src/screens/StakingDetailScreen.tsx
@@ -1,16 +1,51 @@
+import { useDispatch } from 'react-redux';
+import { RefreshControl } from 'react-native';
+import { useMemo, useState, useCallback, useEffect } from 'react';
+
 import { RouteProp, useRoute } from '@react-navigation/native';
 
 import { RootStackParamList, RootStackRoutes, Screen } from '@suite-native/navigation';
+import { initStakeDataThunk } from '@suite-common/wallet-core';
+import { useNativeStyles } from '@trezor/styles';
 
 import { StakingDetailScreenHeader } from '../components/StakingDetailScreenHeader';
 import { StakingInfo } from '../components/StakingInfo';
 
+const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
+
 export const StakingDetailScreen = () => {
     const route = useRoute<RouteProp<RootStackParamList, RootStackRoutes.StakingDetail>>();
     const { accountKey } = route.params;
+    const [isRefreshing, setIsRefreshing] = useState(false);
+    const { utils } = useNativeStyles();
+
+    const dispatch = useDispatch();
+
+    useEffect(() => {
+        dispatch(initStakeDataThunk());
+    }, [dispatch]);
+
+    const handleRefresh = useCallback(async () => {
+        setIsRefreshing(true);
+        await dispatch(initStakeDataThunk());
+        // sleep little bit because it's too fast
+        await sleep(1000);
+        setIsRefreshing(false);
+    }, [dispatch]);
+
+    const refreshControl = useMemo(
+        () => (
+            <RefreshControl
+                refreshing={isRefreshing}
+                onRefresh={handleRefresh}
+                colors={[utils.colors.backgroundPrimaryDefault]}
+            />
+        ),
+        [isRefreshing, handleRefresh, utils.colors],
+    );
 
     return (
-        <Screen screenHeader={<StakingDetailScreenHeader />}>
+        <Screen screenHeader={<StakingDetailScreenHeader />} refreshControl={refreshControl}>
             <StakingInfo accountKey={accountKey} />
         </Screen>
     );
diff --git a/suite-native/module-staking-management/tsconfig.json b/suite-native/module-staking-management/tsconfig.json
index e2f68e93300..7e91eddb642 100644
--- a/suite-native/module-staking-management/tsconfig.json
+++ b/suite-native/module-staking-management/tsconfig.json
@@ -2,14 +2,12 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/wallet-core"
         },
         { "path": "../atoms" },
         { "path": "../formatters" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../link" },
         { "path": "../navigation" },
diff --git a/suite-native/navigation/package.json b/suite-native/navigation/package.json
index 91c6b18c24a..4933911d61b 100644
--- a/suite-native/navigation/package.json
+++ b/suite-native/navigation/package.json
@@ -7,7 +7,6 @@
     "type": "module",
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -17,13 +16,13 @@
         "@react-navigation/native": "6.1.18",
         "@react-navigation/native-stack": "6.11.0",
         "@sentry/react-native": "5.33.0",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/message-system": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
         "@suite-common/wallet-types": "workspace:*",
         "@suite-native/analytics": "workspace:*",
         "@suite-native/atoms": "workspace:*",
         "@suite-native/connection-status": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@trezor/connect": "workspace:*",
         "@trezor/styles": "workspace:*",
         "@trezor/theme": "workspace:*",
diff --git a/suite-native/navigation/src/components/GoBackIcon.tsx b/suite-native/navigation/src/components/GoBackIcon.tsx
index 108a19bc69a..f199afd185d 100644
--- a/suite-native/navigation/src/components/GoBackIcon.tsx
+++ b/suite-native/navigation/src/components/GoBackIcon.tsx
@@ -6,20 +6,24 @@ import { CloseActionType } from '../navigators';
 
 type GoBackIconProps = {
     closeActionType?: CloseActionType;
+    closeAction?: () => void;
 };
 
-export const GoBackIcon = ({ closeActionType = 'back' }: GoBackIconProps) => {
+export const GoBackIcon = ({ closeActionType = 'back', closeAction }: GoBackIconProps) => {
     const navigation = useNavigation();
 
     const handleGoBack = () => {
         if (navigation.canGoBack()) {
             navigation.goBack();
         }
+        if (closeAction) {
+            closeAction();
+        }
     };
 
     return (
         <IconButton
-            iconName={closeActionType === 'back' ? 'chevronLeft' : 'close'}
+            iconName={closeActionType === 'back' ? 'caretLeft' : 'x'}
             size="medium"
             colorScheme="tertiaryElevation0"
             onPress={handleGoBack}
diff --git a/suite-native/navigation/src/components/Screen.tsx b/suite-native/navigation/src/components/Screen.tsx
index e4edccfc768..4cf22efc93e 100644
--- a/suite-native/navigation/src/components/Screen.tsx
+++ b/suite-native/navigation/src/components/Screen.tsx
@@ -10,9 +10,9 @@ import { useRoute } from '@react-navigation/native';
 
 import { useOfflineBannerAwareSafeAreaInsets } from '@suite-native/connection-status';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { Color, nativeSpacings } from '@trezor/theme';
+import { Color, NativeSpacing } from '@trezor/theme';
 import { selectIsAnyBannerMessageActive } from '@suite-common/message-system';
-import { Box } from '@suite-native/atoms';
+import { Box, nativeSpacingToNumber } from '@suite-native/atoms';
 
 import { ScreenContentWrapper } from './ScreenContentWrapper';
 
@@ -24,8 +24,8 @@ type ScreenProps = {
     hasStatusBar?: boolean;
     isScrollable?: boolean;
     backgroundColor?: Color;
-    customVerticalPadding?: number;
-    customHorizontalPadding?: number;
+    customVerticalPadding?: NativeSpacing | number;
+    customHorizontalPadding?: NativeSpacing | number;
     extraKeyboardAvoidingViewHeight?: number;
     hasBottomInset?: boolean;
     refreshControl?: ScrollViewProps['refreshControl'];
@@ -106,8 +106,8 @@ export const Screen = ({
     isScrollable = true,
     hasStatusBar = true,
     backgroundColor = 'backgroundSurfaceElevation0',
-    customVerticalPadding = nativeSpacings.sp8,
-    customHorizontalPadding = nativeSpacings.sp8,
+    customVerticalPadding = 'sp8',
+    customHorizontalPadding = 'sp8',
     extraKeyboardAvoidingViewHeight = 0,
     hasBottomInset = true,
 }: ScreenProps) => {
@@ -139,7 +139,7 @@ export const Screen = ({
         <View
             style={applyStyle(screenContainerStyle, {
                 backgroundColor,
-                customVerticalPadding,
+                customVerticalPadding: nativeSpacingToNumber(customVerticalPadding),
                 insets,
                 hasPaddingBottom,
                 isMessageBannerDisplayed,
@@ -163,8 +163,8 @@ export const Screen = ({
                 <Box
                     style={applyStyle(screenContentBaseStyle, {
                         insets,
-                        customHorizontalPadding,
-                        customVerticalPadding,
+                        customHorizontalPadding: nativeSpacingToNumber(customHorizontalPadding),
+                        customVerticalPadding: nativeSpacingToNumber(customVerticalPadding),
                         isScrollable,
                     })}
                 >
diff --git a/suite-native/navigation/src/components/ScreenSubHeader.tsx b/suite-native/navigation/src/components/ScreenSubHeader.tsx
index b5e4c701156..ec324c04612 100644
--- a/suite-native/navigation/src/components/ScreenSubHeader.tsx
+++ b/suite-native/navigation/src/components/ScreenSubHeader.tsx
@@ -2,8 +2,9 @@ import { ReactNode } from 'react';
 
 import { RequireOneOrNone } from 'type-fest';
 
-import { Box, Text } from '@suite-native/atoms';
+import { Box, nativeSpacingToNumber, Text } from '@suite-native/atoms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+import { NativeSpacing } from '@trezor/theme';
 
 import { GoBackIcon } from './GoBackIcon';
 import { CloseActionType } from '../navigators';
@@ -14,19 +15,20 @@ export type ScreenSubHeaderProps = RequireOneOrNone<
         rightIcon?: ReactNode;
         leftIcon?: ReactNode;
         closeActionType?: CloseActionType;
-        customHorizontalPadding?: number;
+        closeAction?: () => void;
+        customHorizontalPadding?: NativeSpacing | number;
     },
     'leftIcon' | 'closeActionType'
 >;
 
 const ICON_SIZE = 48;
 
-const headerStyle = prepareNativeStyle<{ customHorizontalPadding?: number }>(
+const headerStyle = prepareNativeStyle<{ customHorizontalPadding: number }>(
     (utils, { customHorizontalPadding }) => ({
         flexDirection: 'row',
         justifyContent: 'space-between',
         alignItems: 'center',
-        padding: customHorizontalPadding || utils.spacings.sp8,
+        padding: customHorizontalPadding,
         backgroundColor: utils.colors.backgroundSurfaceElevation0,
         height: ICON_SIZE + 2 * utils.spacings.sp8,
     }),
@@ -42,14 +44,21 @@ export const ScreenSubHeader = ({
     rightIcon,
     leftIcon,
     closeActionType,
-    customHorizontalPadding,
+    closeAction,
+    customHorizontalPadding = 'sp8',
 }: ScreenSubHeaderProps) => {
     const { applyStyle } = useNativeStyles();
 
     return (
-        <Box style={applyStyle(headerStyle, { customHorizontalPadding })}>
-            <Box style={applyStyle(iconWrapperStyle)}>
-                {leftIcon || <GoBackIcon closeActionType={closeActionType} />}
+        <Box
+            style={applyStyle(headerStyle, {
+                customHorizontalPadding: nativeSpacingToNumber(customHorizontalPadding),
+            })}
+        >
+            <Box style={applyStyle(iconWrapperStyle)} testID="@screen/sub-header/icon-left">
+                {leftIcon || (
+                    <GoBackIcon closeActionType={closeActionType} closeAction={closeAction} />
+                )}
             </Box>
             <Box alignItems="center">
                 {typeof content === 'string' ? (
@@ -65,7 +74,9 @@ export const ScreenSubHeader = ({
                     content
                 )}
             </Box>
-            <Box style={applyStyle(iconWrapperStyle)}>{rightIcon}</Box>
+            <Box style={applyStyle(iconWrapperStyle)} testID="@screen/sub-header/icon-right">
+                {rightIcon}
+            </Box>
         </Box>
     );
 };
diff --git a/suite-native/navigation/src/components/TabBarItem.tsx b/suite-native/navigation/src/components/TabBarItem.tsx
index 7aa7859b143..340dc774f04 100644
--- a/suite-native/navigation/src/components/TabBarItem.tsx
+++ b/suite-native/navigation/src/components/TabBarItem.tsx
@@ -1,6 +1,6 @@
 import { TouchableOpacity, View } from 'react-native';
 
-import { Icon, IconName } from '@suite-common/icons-deprecated';
+import { Icon, IconName } from '@suite-native/icons';
 import { Text, TITLE_MAX_FONT_MULTIPLIER } from '@suite-native/atoms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
diff --git a/suite-native/navigation/src/index.ts b/suite-native/navigation/src/index.ts
index e8d15e911a2..d84cb12305d 100644
--- a/suite-native/navigation/src/index.ts
+++ b/suite-native/navigation/src/index.ts
@@ -2,6 +2,7 @@ export * from './navigators';
 export * from './routes';
 export * from './types';
 export * from './config';
+export * from './useNavigateToInitialScreen';
 export * from './components/TabBar';
 export * from './components/Screen';
 export * from './components/ScreenHeader';
diff --git a/suite-native/navigation/src/navigators.ts b/suite-native/navigation/src/navigators.ts
index 550eba2dd68..55fca1cfe22 100644
--- a/suite-native/navigation/src/navigators.ts
+++ b/suite-native/navigation/src/navigators.ts
@@ -10,7 +10,7 @@ import {
     XpubAddress,
 } from '@suite-common/wallet-types';
 import { AccountType, NetworkSymbol } from '@suite-common/wallet-config';
-import { AccountInfo, TokenTransfer } from '@trezor/connect';
+import { AccountInfo } from '@trezor/connect';
 
 import {
     AppTabsRoutes,
@@ -25,6 +25,8 @@ import {
     AuthorizeDeviceStackRoutes,
     AddCoinAccountStackRoutes,
     SendStackRoutes,
+    DeviceStackRoutes,
+    DevicePinProtectionStackRoutes,
 } from './routes';
 import { NavigateParameters } from './types';
 
@@ -73,17 +75,21 @@ export type SendStackParamList = {
     [SendStackRoutes.SendAccounts]: undefined;
     [SendStackRoutes.SendOutputs]: {
         accountKey: AccountKey;
+        tokenContract?: TokenAddress;
     };
     [SendStackRoutes.SendFees]: {
         feeLevels: GeneralPrecomposedLevels;
         accountKey: AccountKey;
+        tokenContract?: TokenAddress;
     };
     [SendStackRoutes.SendAddressReview]: {
         transaction: GeneralPrecomposedTransactionFinal;
         accountKey: AccountKey;
+        tokenContract?: TokenAddress;
     };
     [SendStackRoutes.SendOutputsReview]: {
         accountKey: AccountKey;
+        tokenContract?: TokenAddress;
     };
 };
 
@@ -139,6 +145,18 @@ export type AddCoinAccountStackParamList = {
     };
 };
 
+export type DeviceSettingsStackParamList = {
+    [DeviceStackRoutes.DeviceSettings]: undefined;
+    [DeviceStackRoutes.DevicePinProtection]: undefined;
+};
+
+export type DevicePinProtectionStackParamList = {
+    [DevicePinProtectionStackRoutes.ContinueOnTrezor]: undefined;
+    [DevicePinProtectionStackRoutes.EnterCurrentPin]: undefined;
+    [DevicePinProtectionStackRoutes.EnterNewPin]: undefined;
+    [DevicePinProtectionStackRoutes.ConfirmNewPin]: undefined;
+};
+
 export type AuthorizeDeviceStackParamList = {
     [AuthorizeDeviceStackRoutes.ConnectAndUnlockDevice]:
         | { onCancelNavigationTarget: NavigateParameters<RootStackParamList> }
@@ -167,12 +185,12 @@ export type RootStackParamList = {
         txid: string;
         accountKey: AccountKey;
         closeActionType?: CloseActionType;
-        tokenTransfer?: TokenTransfer;
+        tokenContract?: TokenAddress;
     };
     [RootStackRoutes.DevUtilsStack]: undefined;
     [RootStackRoutes.AccountDetail]: AccountDetailParams;
     [RootStackRoutes.StakingDetail]: { accountKey: AccountKey };
-    [RootStackRoutes.DeviceInfo]: undefined;
+    [RootStackRoutes.DeviceSettingsStack]: undefined;
     [RootStackRoutes.AddCoinAccountStack]: NavigatorScreenParams<AddCoinAccountStackParamList>;
     [RootStackRoutes.SendStack]: NavigatorScreenParams<SendStackParamList>;
     [RootStackRoutes.CoinEnablingInit]: undefined;
diff --git a/suite-native/navigation/src/routes.ts b/suite-native/navigation/src/routes.ts
index fb5cc674181..badf36d12a4 100644
--- a/suite-native/navigation/src/routes.ts
+++ b/suite-native/navigation/src/routes.ts
@@ -10,7 +10,7 @@ export enum RootStackRoutes {
     TransactionDetail = 'TransactionDetail',
     ReceiveModal = 'ReceiveModal',
     SendStack = 'SendStack',
-    DeviceInfo = 'DeviceInfo',
+    DeviceSettingsStack = 'DeviceSettingsStack',
     AddCoinAccountStack = 'AddCoinAccountStack',
     CoinEnablingInit = 'CoinEnablingInit',
     ConnectPopup = 'ConnectPopup',
@@ -38,6 +38,18 @@ export enum AccountsImportStackRoutes {
     AccountImportSummary = 'AccountImportSummary',
 }
 
+export enum DeviceStackRoutes {
+    DeviceSettings = 'DeviceSettings',
+    DevicePinProtection = 'DevicePinProtection',
+}
+
+export enum DevicePinProtectionStackRoutes {
+    ContinueOnTrezor = 'ContinueOnTrezor',
+    EnterCurrentPin = 'EnterCurrentPin',
+    EnterNewPin = 'EnterNewPin',
+    ConfirmNewPin = 'ConfirmNewPin',
+}
+
 export enum AuthorizeDeviceStackRoutes {
     ConnectAndUnlockDevice = 'ConnectAndUnlockDevice',
     PinMatrix = 'PinMatrix',
diff --git a/suite-native/navigation/src/types.tsx b/suite-native/navigation/src/types.tsx
index 75e1381f48a..5b1fe91bcd8 100644
--- a/suite-native/navigation/src/types.tsx
+++ b/suite-native/navigation/src/types.tsx
@@ -10,7 +10,7 @@ import type {
 } from '@react-navigation/native';
 import { CompositeNavigationProp } from '@react-navigation/native';
 
-import { IconName } from '@suite-common/icons-deprecated';
+import { IconName } from '@suite-native/icons';
 
 export type TabProps<T extends ParamListBase, K extends keyof T> = BottomTabScreenProps<T, K>;
 export type TabNavigationProp<
diff --git a/suite-native/navigation/src/useNavigateToInitialScreen.ts b/suite-native/navigation/src/useNavigateToInitialScreen.ts
new file mode 100644
index 00000000000..679869aba47
--- /dev/null
+++ b/suite-native/navigation/src/useNavigateToInitialScreen.ts
@@ -0,0 +1,26 @@
+import { useCallback } from 'react';
+
+import { ParamListBase, useNavigation } from '@react-navigation/native';
+
+import { StackToTabCompositeProps } from './index';
+
+type NavigationProp = StackToTabCompositeProps<ParamListBase, string, ParamListBase>;
+
+export const useNavigateToInitialScreen = () => {
+    const navigation = useNavigation<NavigationProp>();
+
+    // Some flows use their own stack navigator and once they are finished, we want to return
+    // to the initial screen. This is achieved by navigating to the first screen of the current
+    // stack and then going back.
+    return useCallback(() => {
+        // If there is more than 1 route, popToTop() will empty the stack. However, if there is
+        // only a single route (the current one), popToTop() will go to the previous stack instead.
+        // That's why we have to combine both popToTop() and goBack().
+        if (navigation.getState().routes.length > 1) {
+            navigation.popToTop();
+        }
+        if (navigation.canGoBack()) {
+            navigation.goBack();
+        }
+    }, [navigation]);
+};
diff --git a/suite-native/navigation/tsconfig.json b/suite-native/navigation/tsconfig.json
index 4b5bcbc5511..28b0985fe76 100644
--- a/suite-native/navigation/tsconfig.json
+++ b/suite-native/navigation/tsconfig.json
@@ -2,9 +2,6 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/message-system"
         },
@@ -17,6 +14,7 @@
         { "path": "../analytics" },
         { "path": "../atoms" },
         { "path": "../connection-status" },
+        { "path": "../icons" },
         { "path": "../../packages/connect" },
         { "path": "../../packages/styles" },
         { "path": "../../packages/theme" }
diff --git a/suite-native/notifications/package.json b/suite-native/notifications/package.json
index 3728c2f0eb6..e22084a96ad 100644
--- a/suite-native/notifications/package.json
+++ b/suite-native/notifications/package.json
@@ -6,13 +6,11 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
         "@react-navigation/native": "6.1.18",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/toast-notifications": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
         "@suite-common/wallet-core": "workspace:*",
@@ -20,6 +18,7 @@
         "@suite-native/atoms": "workspace:*",
         "@suite-native/connection-status": "workspace:*",
         "@suite-native/formatters": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/navigation": "workspace:*",
         "@suite-native/theme": "workspace:*",
         "@suite-native/transactions": "workspace:*",
@@ -27,7 +26,7 @@
         "react": "18.2.0",
         "react-native": "0.75.2",
         "react-native-gesture-handler": "2.18.1",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-redux": "8.0.7"
     }
 }
diff --git a/suite-native/notifications/src/components/TransactionNotification.tsx b/suite-native/notifications/src/components/TransactionNotification.tsx
index 8169024e487..a789b586e4e 100644
--- a/suite-native/notifications/src/components/TransactionNotification.tsx
+++ b/suite-native/notifications/src/components/TransactionNotification.tsx
@@ -9,7 +9,7 @@ import {
     selectTransactionFirstTargetAddress,
     AccountsRootState,
     selectDeviceAccountKeyByDescriptorAndNetworkSymbol,
-    selectTransactionByTxidAndAccountKey,
+    selectTransactionByAccountKeyAndTxid,
     DeviceRootState,
 } from '@suite-common/wallet-core';
 import {
@@ -17,7 +17,7 @@ import {
     StackNavigationProps,
     RootStackParamList,
 } from '@suite-native/navigation';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import {
     notificationsActions,
     TransactionNotificationType,
@@ -84,7 +84,7 @@ export const TransactionNotification = ({
     const txid = notification?.txid ?? '';
 
     const transaction = useSelector((state: TransactionsRootState) =>
-        selectTransactionByTxidAndAccountKey(state, txid, accountKey ?? ''),
+        selectTransactionByAccountKeyAndTxid(state, accountKey ?? '', txid),
     );
 
     const transactionTargetAddress = useSelector((state: TransactionsRootState) =>
@@ -123,12 +123,12 @@ export const TransactionNotification = ({
             iconLeft={
                 <TransactionIcon
                     transactionType={transactionType}
-                    symbol={notification.symbol}
+                    networkSymbol={notification.symbol}
                     isAnimated={isIconAnimated}
                     iconColor={isIconAnimated ? 'iconAlertYellow' : 'iconSubdued'}
                 />
             }
-            iconRight={<Icon name="circleRight" />}
+            iconRight={<Icon name="caretCircleRight" />}
         />
     );
 };
diff --git a/suite-native/notifications/tsconfig.json b/suite-native/notifications/tsconfig.json
index af0b3314dde..5475a1db12f 100644
--- a/suite-native/notifications/tsconfig.json
+++ b/suite-native/notifications/tsconfig.json
@@ -2,9 +2,6 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/toast-notifications"
         },
@@ -20,6 +17,7 @@
         { "path": "../atoms" },
         { "path": "../connection-status" },
         { "path": "../formatters" },
+        { "path": "../icons" },
         { "path": "../navigation" },
         { "path": "../theme" },
         { "path": "../transactions" },
diff --git a/suite-native/qr-code/package.json b/suite-native/qr-code/package.json
index 369ab8cd2c4..86b0dfb702c 100644
--- a/suite-native/qr-code/package.json
+++ b/suite-native/qr-code/package.json
@@ -6,16 +6,15 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
         "@suite-common/wallet-utils": "workspace:*",
         "@suite-native/atoms": "workspace:*",
         "@suite-native/helpers": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/toasts": "workspace:*",
         "@trezor/styles": "workspace:*",
diff --git a/suite-native/qr-code/src/components/AddressQRCode.tsx b/suite-native/qr-code/src/components/AddressQRCode.tsx
index 807b2b528c2..4d4d3e96e34 100644
--- a/suite-native/qr-code/src/components/AddressQRCode.tsx
+++ b/suite-native/qr-code/src/components/AddressQRCode.tsx
@@ -54,7 +54,7 @@ export const AddressQRCode = ({ address }: AddressQRCodeProps) => {
                 </Button>
                 <Button
                     size="small"
-                    viewLeft="shareAlt"
+                    viewLeft="shareNetwork"
                     colorScheme="tertiaryElevation1"
                     onPress={handleShareData}
                 >
diff --git a/suite-native/qr-code/src/components/PickQRFromGalleryButton.tsx b/suite-native/qr-code/src/components/PickQRFromGalleryButton.tsx
index cf792821e16..9c879e56efa 100644
--- a/suite-native/qr-code/src/components/PickQRFromGalleryButton.tsx
+++ b/suite-native/qr-code/src/components/PickQRFromGalleryButton.tsx
@@ -2,7 +2,6 @@ import { scanFromURLAsync } from 'expo-camera';
 import * as ImagePicker from 'expo-image-picker';
 
 import { Button } from '@suite-native/atoms';
-import { Icon } from '@suite-common/icons-deprecated';
 import { useToast } from '@suite-native/toasts';
 import { Translation } from '@suite-native/intl';
 
@@ -30,18 +29,14 @@ export const PickQRFromGalleryButton = ({
             onError();
             showToast({
                 variant: 'error',
-                icon: 'warningTriangle',
+                icon: 'warning',
                 message: <Translation id="qrCode.pickImageError" />,
             });
         }
     };
 
     return (
-        <Button
-            onPress={handlePickImage}
-            viewLeft={<Icon name="image" />}
-            colorScheme="tertiaryElevation0"
-        >
+        <Button onPress={handlePickImage} viewLeft="image" colorScheme="tertiaryElevation0">
             <Translation id="qrCode.pickImageButton" />
         </Button>
     );
diff --git a/suite-native/qr-code/src/components/QRCodeScanner.tsx b/suite-native/qr-code/src/components/QRCodeScanner.tsx
index 105fd2f0490..b117aea42e0 100644
--- a/suite-native/qr-code/src/components/QRCodeScanner.tsx
+++ b/suite-native/qr-code/src/components/QRCodeScanner.tsx
@@ -6,7 +6,7 @@ import { BarcodeScanningResult, CameraView, PermissionStatus } from 'expo-camera
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { Box, HStack, Loader, VStack, Text } from '@suite-native/atoms';
 import { nativeSpacings } from '@trezor/theme';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { Translation } from '@suite-native/intl';
 
 import { CameraPermissionError } from './CameraPermissionError';
@@ -19,7 +19,7 @@ type QRCodeScannerProps = {
 const SCANNER_SIZE = Dimensions.get('screen').width - 2 * nativeSpacings.sp16;
 
 const cameraContainerStyle = prepareNativeStyle(utils => ({
-    borderRadius: utils.borders.radii.medium,
+    borderRadius: utils.borders.radii.r16,
     overflow: 'hidden',
 }));
 
diff --git a/suite-native/qr-code/src/components/XpubQRCodeWarningOverlay.tsx b/suite-native/qr-code/src/components/XpubQRCodeWarningOverlay.tsx
index 9acc571c0d9..b83a3bb4333 100644
--- a/suite-native/qr-code/src/components/XpubQRCodeWarningOverlay.tsx
+++ b/suite-native/qr-code/src/components/XpubQRCodeWarningOverlay.tsx
@@ -14,7 +14,7 @@ export const XpubOverlayWarning = () => {
         <Box style={applyStyle(overlayStyle)}>
             <PictogramTitleHeader
                 variant="yellow"
-                icon="warningCircleLight"
+                icon="warningCircle"
                 title="Handle your public key (XPUB) with caution"
                 subtitle="Sharing your public key (XPUB) with a third party gives them the ability to
                         view your transaction history."
diff --git a/suite-native/qr-code/tsconfig.json b/suite-native/qr-code/tsconfig.json
index 192b211f819..58ce3baac80 100644
--- a/suite-native/qr-code/tsconfig.json
+++ b/suite-native/qr-code/tsconfig.json
@@ -2,9 +2,6 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/wallet-config"
         },
@@ -13,6 +10,7 @@
         },
         { "path": "../atoms" },
         { "path": "../helpers" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../toasts" },
         { "path": "../../packages/styles" },
diff --git a/suite-native/react-native-graph/.eslintrc.js b/suite-native/react-native-graph/.eslintrc.js
deleted file mode 100644
index 7714a6b28bf..00000000000
--- a/suite-native/react-native-graph/.eslintrc.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = {
-    // lot of rules are disabled because this is lib is copy pasted form source and use different code style
-    rules: {
-        // components here are from Skia which uses style in different way
-        'react/style-prop-object': 'off',
-        '@typescript-eslint/no-use-before-define': 'off',
-        'no-continue': 'off',
-        'no-restricted-properties': 'off',
-        '@typescript-eslint/no-shadow': 'off',
-    },
-};
diff --git a/suite-native/react-native-graph/eslint.config.mjs b/suite-native/react-native-graph/eslint.config.mjs
new file mode 100644
index 00000000000..f389921e162
--- /dev/null
+++ b/suite-native/react-native-graph/eslint.config.mjs
@@ -0,0 +1,14 @@
+import { eslint } from '@trezor/eslint';
+
+export default [
+    ...eslint,
+    {
+        rules: {
+            'react/style-prop-object': 'off',
+            '@typescript-eslint/no-use-before-define': 'off',
+            'no-continue': 'off',
+            'no-restricted-properties': 'off',
+            '@typescript-eslint/no-shadow': 'off',
+        },
+    },
+];
diff --git a/suite-native/react-native-graph/package.json b/suite-native/react-native-graph/package.json
index 8aace45460f..dd09889197e 100644
--- a/suite-native/react-native-graph/package.json
+++ b/suite-native/react-native-graph/package.json
@@ -7,7 +7,6 @@
     "sideEffects": false,
     "license": "MIT",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -18,6 +17,9 @@
         "react": "18.2.0",
         "react-native": "0.75.2",
         "react-native-gesture-handler": "2.18.1",
-        "react-native-reanimated": "3.15.0"
+        "react-native-reanimated": "3.16.1"
+    },
+    "devDependencies": {
+        "@trezor/eslint": "workspace:*"
     }
 }
diff --git a/suite-native/react-native-graph/tsconfig.json b/suite-native/react-native-graph/tsconfig.json
index 89ad15d0efe..a3e1a467c4a 100644
--- a/suite-native/react-native-graph/tsconfig.json
+++ b/suite-native/react-native-graph/tsconfig.json
@@ -7,6 +7,7 @@
     "references": [
         {
             "path": "../../suite-common/suite-utils"
-        }
+        },
+        { "path": "../../packages/eslint" }
     ]
 }
diff --git a/suite-native/receive/package.json b/suite-native/receive/package.json
index 603f321f103..0c92dd7ad8e 100644
--- a/suite-native/receive/package.json
+++ b/suite-native/receive/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -15,11 +14,9 @@
         "@react-navigation/native": "6.1.18",
         "@reduxjs/toolkit": "1.9.5",
         "@shopify/react-native-skia": "1.3.11",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
         "@suite-common/wallet-core": "workspace:*",
         "@suite-common/wallet-types": "workspace:*",
-        "@suite-common/wallet-utils": "workspace:*",
         "@suite-native/accounts": "workspace:*",
         "@suite-native/alerts": "workspace:*",
         "@suite-native/analytics": "workspace:*",
@@ -28,6 +25,7 @@
         "@suite-native/device-mutex": "workspace:*",
         "@suite-native/formatters": "workspace:*",
         "@suite-native/helpers": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/link": "workspace:*",
         "@suite-native/navigation": "workspace:*",
@@ -40,7 +38,7 @@
         "react": "18.2.0",
         "react-native": "0.75.2",
         "react-native-gesture-handler": "2.18.1",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-redux": "8.0.7"
     }
 }
diff --git a/suite-native/receive/src/components/AddressMismatchBottomSheet.tsx b/suite-native/receive/src/components/AddressMismatchBottomSheet.tsx
index 616f13558a3..f8d2ff8fc9d 100644
--- a/suite-native/receive/src/components/AddressMismatchBottomSheet.tsx
+++ b/suite-native/receive/src/components/AddressMismatchBottomSheet.tsx
@@ -47,7 +47,7 @@ export const AddressMismatchBottomSheet = ({
                 <Box flex={1}>
                     <VStack spacing="sp16">
                         <Button
-                            viewLeft="warningTriangle"
+                            viewLeft="warning"
                             colorScheme="tertiaryElevation0"
                             onPress={handleOpenSupportLink}
                         >
diff --git a/suite-native/receive/src/components/DevicePaginationButton.tsx b/suite-native/receive/src/components/DevicePaginationButton.tsx
index aeaf03e8100..5bf6bea3b76 100644
--- a/suite-native/receive/src/components/DevicePaginationButton.tsx
+++ b/suite-native/receive/src/components/DevicePaginationButton.tsx
@@ -1,7 +1,7 @@
 import { Pressable } from 'react-native';
 
 import { NativeStyle, prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { Icon, IconName } from '@suite-common/icons-deprecated';
+import { Icon, IconName } from '@suite-native/icons';
 import { CSSColor, nativeBorders } from '@trezor/theme';
 import { DeviceModelInternal } from '@trezor/connect';
 
@@ -15,9 +15,9 @@ type DeviceScreenPaginationProps = {
     onPress: () => void;
 };
 
-const T2B1_BUTTON_COLOR = '#2B2D2B';
 const BUTTON_HEIGHT = 56;
 const BUTTON_WIDTH = 296;
+const T2B1_BUTTON_COLOR = '#2B2D2B';
 
 const ICON_COLOR: CSSColor = DEVICE_TEXT_COLOR;
 
@@ -29,21 +29,21 @@ type DeviceButtonStyleProps = {
 const safe3Styles = {
     backgroundColor: DEVICE_SCREEN_BACKGROUND_COLOR,
     borderColor: DEVICE_TEXT_COLOR,
-    borderRadius: nativeBorders.radii.large / 2,
+    borderRadius: nativeBorders.radii.r12,
     borderWidth: nativeBorders.widths.large,
 } as const;
 
+const touchscreenDeviceStyles = {
+    backgroundColor: T2B1_BUTTON_COLOR,
+    borderRadius: nativeBorders.radii.r8,
+} as const;
+
 const modelToStyles = {
-    [DeviceModelInternal.T2T1]: {
-        backgroundColor: T2B1_BUTTON_COLOR,
-        borderRadius: nativeBorders.radii.small,
-    },
-    [DeviceModelInternal.T3T1]: {
-        backgroundColor: T2B1_BUTTON_COLOR,
-        borderRadius: nativeBorders.radii.small,
-    },
+    [DeviceModelInternal.T2T1]: touchscreenDeviceStyles,
     [DeviceModelInternal.T2B1]: safe3Styles,
     [DeviceModelInternal.T3B1]: safe3Styles,
+    [DeviceModelInternal.T3T1]: touchscreenDeviceStyles,
+    [DeviceModelInternal.T3W1]: touchscreenDeviceStyles, // TODO T3W1
 } as const satisfies Record<PaginationCompatibleDeviceModel, Readonly<NativeStyle>>;
 
 const deviceButtonStyle = prepareNativeStyle<DeviceButtonStyleProps>(
@@ -72,8 +72,8 @@ export const DevicePaginationButton = ({
     onPress,
 }: DeviceScreenPaginationProps) => {
     const { applyStyle } = useNativeStyles();
-    const chevronIcon: Extract<IconName, 'chevronDown' | 'chevronUp'> =
-        activePage === 1 ? 'chevronDown' : 'chevronUp';
+    const chevronIcon: Extract<IconName, 'caretDown' | 'caretUp'> =
+        activePage === 1 ? 'caretDown' : 'caretUp';
 
     return (
         <Pressable
diff --git a/suite-native/receive/src/components/DeviceScreenContent.tsx b/suite-native/receive/src/components/DeviceScreenContent.tsx
index afb22019bda..0ab001cdca3 100644
--- a/suite-native/receive/src/components/DeviceScreenContent.tsx
+++ b/suite-native/receive/src/components/DeviceScreenContent.tsx
@@ -40,6 +40,13 @@ const safe3Styles = {
     lineHeight: 25,
     pagerOffset: 40,
 };
+const smallTouchscreenStyles = {
+    fontSource: require('../../../../packages/theme/fonts/RobotoMono-Regular.ttf'),
+    fontSize: 20,
+    lineWidth: 230,
+    lineHeight: 25,
+    pagerOffset: 60,
+};
 
 const deviceToContentStyles: Record<DeviceModelInternal, DeviceModelLayoutProps> = {
     [DeviceModelInternal.T1B1]: {
@@ -49,20 +56,15 @@ const deviceToContentStyles: Record<DeviceModelInternal, DeviceModelLayoutProps>
         lineHeight: 17,
         pagerOffset: 0,
     },
-    [DeviceModelInternal.T2T1]: {
+    [DeviceModelInternal.T2T1]: smallTouchscreenStyles,
+    [DeviceModelInternal.T3T1]: smallTouchscreenStyles,
+    [DeviceModelInternal.T3W1]: {
         fontSource: require('../../../../packages/theme/fonts/RobotoMono-Regular.ttf'),
         fontSize: 20,
         lineWidth: 230,
         lineHeight: 25,
         pagerOffset: 60,
-    },
-    [DeviceModelInternal.T3T1]: {
-        fontSource: require('../../../../packages/theme/fonts/RobotoMono-Regular.ttf'),
-        fontSize: 20,
-        lineWidth: 230,
-        lineHeight: 25,
-        pagerOffset: 60,
-    },
+    }, // TODO T3W1
     [DeviceModelInternal.T2B1]: safe3Styles,
     [DeviceModelInternal.T3B1]: safe3Styles,
 };
diff --git a/suite-native/receive/src/components/DeviceScreenPagination.tsx b/suite-native/receive/src/components/DeviceScreenPagination.tsx
index f3a7899a20e..ef7bf0d7f14 100644
--- a/suite-native/receive/src/components/DeviceScreenPagination.tsx
+++ b/suite-native/receive/src/components/DeviceScreenPagination.tsx
@@ -71,6 +71,21 @@ const deviceModelToSvg: Record<PaginationCompatibleDeviceModel, PaginationModelM
         paginationSvgWidth: 40,
         paginationSvgHeight: 17.5,
     },
+    [DeviceModelInternal.T3W1]: {
+        paginationPrefixSvg: require('../../assets/addressPaginationPrefixT2T1.svg'),
+        paginationSuffixSvg: require('../../assets/addressPaginationPrefixT2T1.svg'),
+        paginatorPrefixX: 0,
+        paginatorPrefixY: 4,
+        paginatorSuffixX: 182.5,
+        paginatorSuffixY: 82,
+
+        pagerSvg1: require('../../assets/pager1T2T1.svg'),
+        pagerSvg2: require('../../assets/pager1T2T1.svg'),
+        pagerX: 260,
+        pagerY: 30,
+        paginationSvgWidth: 40,
+        paginationSvgHeight: 17.5,
+    }, // TODO T3W1
     [DeviceModelInternal.T2B1]: safe3Svg,
     [DeviceModelInternal.T3B1]: safe3Svg,
 };
diff --git a/suite-native/receive/src/components/ReceiveAccount.tsx b/suite-native/receive/src/components/ReceiveAccount.tsx
index 605fe1465ba..70b54e71741 100644
--- a/suite-native/receive/src/components/ReceiveAccount.tsx
+++ b/suite-native/receive/src/components/ReceiveAccount.tsx
@@ -51,7 +51,7 @@ export const ReceiveAccount = ({ accountKey, tokenContract }: AccountReceiveProp
 
     return (
         <Box flex={1}>
-            <VStack spacing="sp12">
+            <VStack spacing="sp16">
                 {isAccountDetailVisible && (
                     <ReceiveAccountDetailsCard
                         accountKey={accountKey}
@@ -61,7 +61,7 @@ export const ReceiveAccount = ({ accountKey, tokenContract }: AccountReceiveProp
                 <ReceiveAddressCard
                     networkSymbol={account.symbol}
                     address={address}
-                    isEthereumTokenAddress={!!tokenContract}
+                    isTokenAddress={!!tokenContract}
                     isReceiveApproved={isReceiveApproved}
                     isUnverifiedAddressRevealed={isUnverifiedAddressRevealed}
                     onShowAddress={handleShowAddressAndRemoveButtonRequests}
diff --git a/suite-native/receive/src/components/ReceiveAddressCard.tsx b/suite-native/receive/src/components/ReceiveAddressCard.tsx
index 6c29308b835..29c77a635af 100644
--- a/suite-native/receive/src/components/ReceiveAddressCard.tsx
+++ b/suite-native/receive/src/components/ReceiveAddressCard.tsx
@@ -18,7 +18,7 @@ type ReceiveAddressCardProps = {
     isUnverifiedAddressRevealed: boolean;
     networkSymbol: NetworkSymbol;
     onShowAddress: () => void;
-    isEthereumTokenAddress?: boolean;
+    isTokenAddress?: boolean;
 };
 
 export const ReceiveAddressCard = ({
@@ -27,12 +27,12 @@ export const ReceiveAddressCard = ({
     isReceiveApproved,
     onShowAddress,
     networkSymbol,
-    isEthereumTokenAddress = false,
+    isTokenAddress = false,
 }: ReceiveAddressCardProps) => {
     const isPortfolioTrackerDevice = useSelector(selectIsPortfolioTrackerDevice);
     const isDeviceInViewOnlyMode = useSelector(selectIsDeviceInViewOnlyMode);
 
-    const { networkType } = networks[networkSymbol];
+    const { networkType, name: networkName } = networks[networkSymbol];
 
     const getCardAlertProps = () => {
         if (isReceiveApproved && !isPortfolioTrackerDevice && !isDeviceInViewOnlyMode) {
@@ -49,10 +49,13 @@ export const ReceiveAddressCard = ({
                 alertVariant: 'info',
             } as const;
         }
-        if (isEthereumTokenAddress) {
+        if (isTokenAddress) {
             return {
                 alertTitle: (
-                    <Translation id="moduleReceive.receiveAddressCard.alert.ethereumToken" />
+                    <Translation
+                        id="moduleReceive.receiveAddressCard.alert.token"
+                        values={{ networkName }}
+                    />
                 ),
                 alertVariant: 'info',
             } as const;
diff --git a/suite-native/receive/src/components/TokenReceiveCard.tsx b/suite-native/receive/src/components/TokenReceiveCard.tsx
index b162c6ad35d..f0ac3ba786f 100644
--- a/suite-native/receive/src/components/TokenReceiveCard.tsx
+++ b/suite-native/receive/src/components/TokenReceiveCard.tsx
@@ -1,18 +1,21 @@
 import { useSelector } from 'react-redux';
 
 import { Badge, Box, ErrorMessage, RoundedIcon, Text, VStack } from '@suite-native/atoms';
-import {
-    EthereumTokenAmountFormatter,
-    EthereumTokenToFiatAmountFormatter,
-} from '@suite-native/formatters';
+import { TokenAmountFormatter, TokenToFiatAmountFormatter } from '@suite-native/formatters';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { AccountKey, TokenAddress } from '@suite-common/wallet-types';
-import { AccountsRootState, selectAccountLabel } from '@suite-common/wallet-core';
+import {
+    AccountsRootState,
+    selectAccountLabel,
+    selectAccountNetworkSymbol,
+} from '@suite-common/wallet-core';
 import {
     getTokenName,
     selectAccountTokenInfo,
     selectAccountTokenSymbol,
+    TokensRootState,
 } from '@suite-native/tokens';
+import { Translation } from '@suite-native/intl';
 
 type TokenReceiveCardProps = {
     accountKey: AccountKey;
@@ -36,16 +39,26 @@ export const TokenReceiveCard = ({ contract, accountKey }: TokenReceiveCardProps
     const accountLabel = useSelector((state: AccountsRootState) =>
         selectAccountLabel(state, accountKey),
     );
-
-    const token = useSelector((state: AccountsRootState) =>
+    const accountNetworkSymbol = useSelector((state: AccountsRootState) =>
+        selectAccountNetworkSymbol(state, accountKey),
+    )!;
+    const token = useSelector((state: TokensRootState) =>
         selectAccountTokenInfo(state, accountKey, contract),
     );
 
-    const tokenSymbol = useSelector((state: AccountsRootState) =>
+    const tokenSymbol = useSelector((state: TokensRootState) =>
         selectAccountTokenSymbol(state, accountKey, contract),
     );
 
-    if (!token) return <ErrorMessage errorMessage="Token not found." />;
+    const network = useSelector((state: AccountsRootState) =>
+        selectAccountNetworkSymbol(state, accountKey),
+    );
+
+    if (!token || !network) {
+        return (
+            <ErrorMessage errorMessage={<Translation id="moduleReceive.tokens.errorMessage" />} />
+        );
+    }
 
     const tokenName = getTokenName(token.name);
 
@@ -54,24 +67,30 @@ export const TokenReceiveCard = ({ contract, accountKey }: TokenReceiveCardProps
             <Box flexDirection="row" justifyContent="space-between" alignItems="center">
                 <Box flex={1} flexDirection="row" alignItems="center">
                     <Box marginRight="sp16">
-                        <RoundedIcon name={contract} />
+                        <RoundedIcon networkSymbol={network} contractAddress={contract} />
                     </Box>
                     <Box style={applyStyle(tokenDescriptionStyle)}>
                         <Text>{tokenName}</Text>
                         <Badge
-                            label={`Run on ${accountLabel}`}
-                            icon="eth"
+                            label={
+                                <Translation
+                                    id="moduleReceive.tokens.runOn"
+                                    values={{ accountLabel }}
+                                />
+                            }
+                            icon={accountNetworkSymbol}
                             size="small"
                             iconSize="extraSmall"
                         />
                     </Box>
                 </Box>
                 <Box style={applyStyle(valuesContainerStyle)}>
-                    <EthereumTokenToFiatAmountFormatter
+                    <TokenToFiatAmountFormatter
                         value={token.balance ?? '0'}
                         contract={contract}
+                        networkSymbol={network}
                     />
-                    <EthereumTokenAmountFormatter
+                    <TokenAmountFormatter
                         value={token.balance ?? '0'}
                         symbol={tokenSymbol}
                         numberOfLines={1}
diff --git a/suite-native/receive/src/components/UnverifiedAddressDevice.tsx b/suite-native/receive/src/components/UnverifiedAddressDevice.tsx
index 75a7aa49af8..e4566757c8b 100644
--- a/suite-native/receive/src/components/UnverifiedAddressDevice.tsx
+++ b/suite-native/receive/src/components/UnverifiedAddressDevice.tsx
@@ -34,7 +34,7 @@ const deviceFrameStyle = prepareNativeStyle(utils => ({
     width: DEVICE_SCREEN_WIDTH,
     padding: utils.spacings.sp4,
     borderWidth: utils.borders.widths.small,
-    borderRadius: utils.borders.radii.large / 2,
+    borderRadius: utils.borders.radii.r12,
     borderColor: utils.colors.borderElevation2,
 }));
 
@@ -46,7 +46,7 @@ const deviceScreenStyle = prepareNativeStyle<{ isPaginationEnabled: boolean }>(
         paddingVertical: isPaginationEnabled ? utils.spacings.sp24 : 40,
         maxWidth: DEVICE_SCREEN_WIDTH,
         backgroundColor: DEVICE_SCREEN_BACKGROUND_COLOR,
-        borderRadius: utils.borders.radii.large / 2,
+        borderRadius: utils.borders.radii.r12,
     }),
 );
 
diff --git a/suite-native/receive/src/components/UnverifiedAddressWarning.tsx b/suite-native/receive/src/components/UnverifiedAddressWarning.tsx
index 4452240515c..da804eb0be1 100644
--- a/suite-native/receive/src/components/UnverifiedAddressWarning.tsx
+++ b/suite-native/receive/src/components/UnverifiedAddressWarning.tsx
@@ -40,7 +40,7 @@ export const UnverifiedAddressWarning = () => {
         <Box marginVertical="sp16" paddingHorizontal="sp16" paddingVertical="sp32">
             <PictogramTitleHeader
                 variant="yellow"
-                icon="warningTriangleLight"
+                icon="warning"
                 title={pictogramContent[pictogramContentKey].title}
                 subtitle={pictogramContent[pictogramContentKey].subtitle}
             />
diff --git a/suite-native/receive/src/hooks/useAccountReceiveAddress.tsx b/suite-native/receive/src/hooks/useAccountReceiveAddress.tsx
index 2954e65cd61..94c0a571f23 100644
--- a/suite-native/receive/src/hooks/useAccountReceiveAddress.tsx
+++ b/suite-native/receive/src/hooks/useAccountReceiveAddress.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
 import { useNavigation } from '@react-navigation/native';
@@ -7,21 +7,18 @@ import { useAlert } from '@suite-native/alerts';
 import TrezorConnect from '@trezor/connect';
 import {
     AccountsRootState,
-    selectAccountByKey,
     TransactionsRootState,
-    selectPendingAccountAddresses,
-    selectIsAccountUtxoBased,
     selectAccountNetworkSymbol,
     selectIsPortfolioTrackerDevice,
     confirmAddressOnDeviceThunk,
     selectIsDeviceInViewOnlyMode,
 } from '@suite-common/wallet-core';
 import { AccountKey } from '@suite-common/wallet-types';
-import { getFirstFreshAddress } from '@suite-common/wallet-utils';
 import { analytics, EventType } from '@suite-native/analytics';
 import { requestPrioritizedDeviceAccess } from '@suite-native/device-mutex';
 import { useToast } from '@suite-native/toasts';
 import { Translation } from '@suite-native/intl';
+import { NativeAccountsRootState, selectFreshAccountAddress } from '@suite-native/accounts';
 
 export const useAccountReceiveAddress = (accountKey: AccountKey) => {
     const dispatch = useDispatch();
@@ -35,25 +32,13 @@ export const useAccountReceiveAddress = (accountKey: AccountKey) => {
 
     const { showAlert } = useAlert();
 
-    const account = useSelector((state: AccountsRootState) =>
-        selectAccountByKey(state, accountKey),
-    );
     const networkSymbol = useSelector((state: AccountsRootState) =>
         selectAccountNetworkSymbol(state, accountKey),
     );
-    const pendingAddresses = useSelector((state: TransactionsRootState) =>
-        selectPendingAccountAddresses(state, accountKey),
-    );
-    const isAccountUtxoBased = useSelector((state: AccountsRootState) =>
-        selectIsAccountUtxoBased(state, accountKey),
+    const freshAddress = useSelector((state: NativeAccountsRootState & TransactionsRootState) =>
+        selectFreshAccountAddress(state, accountKey),
     );
 
-    const freshAddress = useMemo(() => {
-        if (account) {
-            return getFirstFreshAddress(account, [], pendingAddresses, isAccountUtxoBased);
-        }
-    }, [account, pendingAddresses, isAccountUtxoBased]);
-
     const handleCancel = useCallback(() => {
         TrezorConnect.cancel();
         setIsUnverifiedAddressRevealed(false);
diff --git a/suite-native/receive/src/screens/ReceiveModalScreen.tsx b/suite-native/receive/src/screens/ReceiveModalScreen.tsx
index f907c0a9ad9..8617afa76b6 100644
--- a/suite-native/receive/src/screens/ReceiveModalScreen.tsx
+++ b/suite-native/receive/src/screens/ReceiveModalScreen.tsx
@@ -24,8 +24,8 @@ import {
     selectAccountNetworkSymbol,
     selectDeviceAccountKeyForNetworkSymbolAndAccountTypeWithIndex,
 } from '@suite-common/wallet-core';
-import { selectAccountTokenSymbol } from '@suite-native/tokens';
-import { CryptoIcon } from '@suite-common/icons-deprecated';
+import { selectAccountTokenSymbol, TokensRootState } from '@suite-native/tokens';
+import { CryptoIcon } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
 import { ReceiveAccount } from '../components/ReceiveAccount';
@@ -70,7 +70,7 @@ const ReceiveModalScreenSubHeader = ({ accountKey, tokenContract }: ScreenSubHea
     const networkSymbol = useSelector((state: AccountsRootState) =>
         selectAccountNetworkSymbol(state, accountKey),
     );
-    const tokenSymbol = useSelector((state: AccountsRootState) =>
+    const tokenSymbol = useSelector((state: TokensRootState) =>
         selectAccountTokenSymbol(state, accountKey, tokenContract),
     );
 
@@ -85,6 +85,7 @@ const ReceiveModalScreenSubHeader = ({ accountKey, tokenContract }: ScreenSubHea
 
     return (
         <ScreenSubHeader
+            customHorizontalPadding="sp16"
             content={
                 <>
                     <Text variant="highlight">
@@ -152,6 +153,7 @@ export const ReceiveModalScreen = () => {
 
     return (
         <Screen
+            customHorizontalPadding="sp16"
             hasBottomInset={false}
             screenHeader={
                 <ReceiveModalScreenSubHeader
diff --git a/suite-native/receive/tsconfig.json b/suite-native/receive/tsconfig.json
index d0a99e3243f..dee2fdd3666 100644
--- a/suite-native/receive/tsconfig.json
+++ b/suite-native/receive/tsconfig.json
@@ -2,9 +2,6 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         {
             "path": "../../suite-common/wallet-config"
         },
@@ -14,9 +11,6 @@
         {
             "path": "../../suite-common/wallet-types"
         },
-        {
-            "path": "../../suite-common/wallet-utils"
-        },
         { "path": "../accounts" },
         { "path": "../alerts" },
         { "path": "../analytics" },
@@ -25,6 +19,7 @@
         { "path": "../device-mutex" },
         { "path": "../formatters" },
         { "path": "../helpers" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../link" },
         { "path": "../navigation" },
diff --git a/suite-native/settings/package.json b/suite-native/settings/package.json
index 57eb0bcb837..63b1de2a0ab 100644
--- a/suite-native/settings/package.json
+++ b/suite-native/settings/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-native/staking/package.json b/suite-native/staking/package.json
index 52629a60cdf..063ee7dbe4c 100644
--- a/suite-native/staking/package.json
+++ b/suite-native/staking/package.json
@@ -7,13 +7,13 @@
     "main": "src/index",
     "scripts": {
         "depcheck": "yarn g:depcheck",
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
         "@suite-common/wallet-config": "workspace:*",
         "@suite-common/wallet-core": "workspace:*",
         "@suite-common/wallet-types": "workspace:*",
-        "@suite-common/wallet-utils": "workspace:*"
+        "@suite-common/wallet-utils": "workspace:*",
+        "@trezor/utils": "workspace:*"
     }
 }
diff --git a/suite-native/staking/src/ethereumStakingSelectors.ts b/suite-native/staking/src/ethereumStakingSelectors.ts
index 630bdb1dcf9..fe8368f2d67 100644
--- a/suite-native/staking/src/ethereumStakingSelectors.ts
+++ b/suite-native/staking/src/ethereumStakingSelectors.ts
@@ -7,7 +7,6 @@ import {
     selectDeviceAccounts,
     selectPoolStatsApyData,
     StakeRootState,
-    TransactionsRootState,
 } from '@suite-common/wallet-core';
 import { AccountKey } from '@suite-common/wallet-types';
 import { getAccountEverstakeStakingPool, isPending } from '@suite-common/wallet-utils';
@@ -54,7 +53,7 @@ export const selectEthereumIsStakePendingByAccountKey = (
 };
 
 export const selectEthereumIsStakeConfirmingByAccountKey = (
-    state: TransactionsRootState,
+    state: NativeStakingRootState,
     accountKey: string,
 ) => {
     const stakeTxs = selectAccountStakeTransactions(state, accountKey);
diff --git a/suite-native/staking/src/selectors.ts b/suite-native/staking/src/selectors.ts
index beaedc6203c..172ac88f2be 100644
--- a/suite-native/staking/src/selectors.ts
+++ b/suite-native/staking/src/selectors.ts
@@ -47,11 +47,7 @@ export const selectHasAnyDeviceAccountsWithStaking = (
     return selectDeviceAccountsWithStaking(state, networkSymbol).length > 0;
 };
 
-export const selectAccountCryptoBalanceWithStaking = (
-    state: NativeStakingRootState,
-    accountKey: AccountKey,
-) => {
-    const account = selectAccountByKey(state, accountKey);
+export const getAccountCryptoBalanceWithStaking = (account: Account | null) => {
     if (!account) return '0';
 
     if (!doesCoinSupportStaking(account.symbol)) {
@@ -71,6 +67,15 @@ export const selectAccountCryptoBalanceWithStaking = (
     }
 };
 
+export const selectAccountCryptoBalanceWithStaking = (
+    state: NativeStakingRootState,
+    accountKey: AccountKey,
+) => {
+    const account = selectAccountByKey(state, accountKey);
+
+    return getAccountCryptoBalanceWithStaking(account);
+};
+
 export const selectAccountHasStaking = (state: NativeStakingRootState, accountKey: AccountKey) => {
     const account = selectAccountByKey(state, accountKey);
     const accountSymbol = account?.symbol;
diff --git a/suite-native/staking/src/utils.ts b/suite-native/staking/src/utils.ts
index bce1cb00327..992a6ee24bc 100644
--- a/suite-native/staking/src/utils.ts
+++ b/suite-native/staking/src/utils.ts
@@ -1,4 +1,5 @@
 import { NetworkSymbol } from '@suite-common/wallet-config';
+import { isArrayMember } from '@trezor/utils';
 
 const stakingCoins = ['eth', 'thol', 'tsep'] as const satisfies NetworkSymbol[];
 type NetworkSymbolWithStaking = (typeof stakingCoins)[number];
@@ -6,5 +7,5 @@ type NetworkSymbolWithStaking = (typeof stakingCoins)[number];
 export const doesCoinSupportStaking = (
     symbol: NetworkSymbol,
 ): symbol is NetworkSymbolWithStaking => {
-    return stakingCoins.includes(symbol as any);
+    return isArrayMember(symbol, stakingCoins);
 };
diff --git a/suite-native/staking/tsconfig.json b/suite-native/staking/tsconfig.json
index 5732d803b07..ee3e258c18d 100644
--- a/suite-native/staking/tsconfig.json
+++ b/suite-native/staking/tsconfig.json
@@ -13,6 +13,7 @@
         },
         {
             "path": "../../suite-common/wallet-utils"
-        }
+        },
+        { "path": "../../packages/utils" }
     ]
 }
diff --git a/suite-native/state/package.json b/suite-native/state/package.json
index 8dfe99fb9b9..c6b270b5e11 100644
--- a/suite-native/state/package.json
+++ b/suite-native/state/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -31,7 +30,6 @@
         "@suite-native/module-send": "workspace:*",
         "@suite-native/settings": "workspace:*",
         "@suite-native/storage": "workspace:*",
-        "@suite-native/tokens": "workspace:*",
         "@trezor/transport-native": "workspace:*",
         "@trezor/utils": "workspace:*",
         "expo-device": "6.0.2",
diff --git a/suite-native/state/src/extraDependencies.ts b/suite-native/state/src/extraDependencies.ts
index 3f912485ab1..9d6e31eff60 100644
--- a/suite-native/state/src/extraDependencies.ts
+++ b/suite-native/state/src/extraDependencies.ts
@@ -13,8 +13,10 @@ import {
 } from '@suite-native/settings';
 import { mergeDeepObject } from '@trezor/utils';
 import { NativeUsbTransport } from '@trezor/transport-native';
-import { selectEnabledDiscoveryNetworkSymbols } from '@suite-native/discovery';
-import { NETWORK_SYMBOLS_WITH_TOKENS } from '@suite-native/tokens';
+import {
+    selectEnabledDiscoveryNetworkSymbols,
+    selectTokenDefinitionsEnabledNetworks,
+} from '@suite-native/discovery';
 
 const deviceType = Device.isDevice ? 'device' : 'emulator';
 
@@ -34,7 +36,7 @@ export const extraDependencies: ExtraDependencies = mergeDeepObject(extraDepende
         // otherwise disableAccountsThunk might erase accounts not supported by current device
         selectEnabledNetworks: selectEnabledDiscoveryNetworkSymbols,
         // todo: this is temporary solution to make token definitions work on native in portfolio tracker
-        selectTokenDefinitionsEnabledNetworks: () => NETWORK_SYMBOLS_WITH_TOKENS,
+        selectTokenDefinitionsEnabledNetworks,
         selectBitcoinAmountUnit: selectBitcoinUnits,
         selectAreSatsAmountUnit,
         selectLocalCurrency: selectFiatCurrencyCode,
diff --git a/suite-native/state/src/reducers.ts b/suite-native/state/src/reducers.ts
index 7fad4ca3bd8..36dd58d1788 100644
--- a/suite-native/state/src/reducers.ts
+++ b/suite-native/state/src/reducers.ts
@@ -8,6 +8,7 @@ import {
     prepareDeviceReducer,
     prepareDiscoveryReducer,
     prepareFiatRatesReducer,
+    prepareStakeReducer,
     prepareTransactionsReducer,
 } from '@suite-common/wallet-core';
 import { appSettingsReducer, appSettingsPersistWhitelist } from '@suite-native/settings';
@@ -20,6 +21,7 @@ import {
     walletPersistTransform,
     devicePersistTransform,
     walletStopPersistTransform,
+    migrateDeviceState,
 } from '@suite-native/storage';
 import { prepareAnalyticsReducer } from '@suite-common/analytics';
 import {
@@ -45,6 +47,7 @@ const deviceReducer = prepareDeviceReducer(extraDependencies);
 const discoveryReducer = prepareDiscoveryReducer(extraDependencies);
 const tokenDefinitionsReducer = prepareTokenDefinitionsReducer(extraDependencies);
 const sendFormReducer = sendFormSlice.prepareReducer(extraDependencies);
+const stakeReducer = prepareStakeReducer(extraDependencies);
 
 export const prepareRootReducers = async () => {
     const appSettingsPersistedReducer = await preparePersistReducer({
@@ -67,6 +70,7 @@ export const prepareRootReducers = async () => {
         discovery: discoveryReducer,
         send: sendFormReducer,
         fees: feesReducer,
+        stake: stakeReducer,
     });
 
     const walletPersistedReducer = await preparePersistReducer({
@@ -113,8 +117,19 @@ export const prepareRootReducers = async () => {
         reducer: deviceReducer,
         persistedKeys: ['devices'],
         key: 'devices',
-        version: 1,
+        version: 2,
         transforms: [devicePersistTransform],
+        migrations: {
+            2: oldState => {
+                if (!oldState.devices) return oldState;
+
+                const oldDevicesState: { devices: any } = { devices: oldState.devices };
+                const migratedDevices = migrateDeviceState(oldDevicesState.devices);
+                const migratedState = { ...oldState, devices: migratedDevices };
+
+                return migratedState;
+            },
+        },
     });
 
     const discoveryConfigPersistedReducer = await preparePersistReducer({
diff --git a/suite-native/state/tsconfig.json b/suite-native/state/tsconfig.json
index ee52877d676..8da15fa87d8 100644
--- a/suite-native/state/tsconfig.json
+++ b/suite-native/state/tsconfig.json
@@ -34,7 +34,6 @@
         { "path": "../module-send" },
         { "path": "../settings" },
         { "path": "../storage" },
-        { "path": "../tokens" },
         {
             "path": "../../packages/transport-native"
         },
diff --git a/suite-native/storage/package.json b/suite-native/storage/package.json
index 224f198ade4..a5dd3ebdf08 100644
--- a/suite-native/storage/package.json
+++ b/suite-native/storage/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.native.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
diff --git a/suite-native/storage/src/index.ts b/suite-native/storage/src/index.ts
index cffbfb65d51..820b032d13a 100644
--- a/suite-native/storage/src/index.ts
+++ b/suite-native/storage/src/index.ts
@@ -7,6 +7,7 @@ export * from './atomWithUnecryptedStorage';
 
 export * from './migrations/account/v2';
 export * from './migrations/account/v3';
+export * from './migrations/device/v2';
 
 export * from './transforms/deviceTransforms';
 export * from './transforms/walletTransforms';
diff --git a/suite-native/storage/src/migrations/device/v2.ts b/suite-native/storage/src/migrations/device/v2.ts
new file mode 100644
index 00000000000..66b4d365a38
--- /dev/null
+++ b/suite-native/storage/src/migrations/device/v2.ts
@@ -0,0 +1,38 @@
+interface OldDevice {
+    state?: string;
+    _state?: {
+        staticSessionId?: string;
+        [key: string]: any;
+    };
+    [key: string]: any;
+}
+
+interface MigratedDevice {
+    state?: {
+        staticSessionId?: string;
+        [key: string]: any;
+    };
+    [key: string]: any;
+}
+
+export const migrateDeviceState = (oldDevices: OldDevice[]): MigratedDevice[] =>
+    oldDevices.map(device => {
+        if (typeof device.state === 'string') {
+            if (typeof device?._state?.staticSessionId === 'string') {
+                // Has _state property, migrate to that
+
+                return { ...device, state: device._state, _state: undefined };
+            } else if (typeof device?.state === 'string') {
+                // No _state property, create new object
+
+                return {
+                    ...device,
+                    state: {
+                        staticSessionId: device.state,
+                    },
+                };
+            }
+        }
+
+        return { ...device, state: undefined };
+    });
diff --git a/suite-native/storage/src/tests/migrations/deviceV2.test.ts b/suite-native/storage/src/tests/migrations/deviceV2.test.ts
new file mode 100644
index 00000000000..fa3d4f84a15
--- /dev/null
+++ b/suite-native/storage/src/tests/migrations/deviceV2.test.ts
@@ -0,0 +1,63 @@
+import { migrateDeviceState } from '../../migrations/device/v2';
+
+describe('migrateDeviceState', () => {
+    it('should migrate old devices without state to new format', () => {
+        const oldDevices = [
+            {
+                state: undefined,
+                otherKey: 'otherValue',
+            },
+        ];
+
+        const migratedAccounts = migrateDeviceState(oldDevices);
+
+        expect(migratedAccounts).toEqual(oldDevices);
+    });
+
+    it('should migrate old devices with string state, without _state to new format', () => {
+        const oldDevices = [
+            {
+                state: 'staticSessionId',
+                otherKey: 'otherValue',
+            },
+        ];
+
+        const migratedAccounts = migrateDeviceState(oldDevices);
+
+        const newDevices = [
+            {
+                state: {
+                    staticSessionId: 'staticSessionId',
+                },
+                otherKey: 'otherValue',
+            },
+        ];
+        expect(migratedAccounts).toEqual(newDevices);
+    });
+
+    it('should migrate old devices with string state and with _state to new format', () => {
+        const oldDevices = [
+            {
+                state: 'staticSessionId',
+                _state: {
+                    staticSessionId: 'staticSessionId',
+                    deriveCardano: true,
+                },
+                otherKey: 'otherValue',
+            },
+        ];
+
+        const migratedAccounts = migrateDeviceState(oldDevices);
+
+        const newDevices = [
+            {
+                state: {
+                    staticSessionId: 'staticSessionId',
+                    deriveCardano: true,
+                },
+                otherKey: 'otherValue',
+            },
+        ];
+        expect(migratedAccounts).toEqual(newDevices);
+    });
+});
diff --git a/suite-native/storage/src/transforms/deviceTransforms.ts b/suite-native/storage/src/transforms/deviceTransforms.ts
index 0f4f84b09d7..4f5eba3b8fd 100644
--- a/suite-native/storage/src/transforms/deviceTransforms.ts
+++ b/suite-native/storage/src/transforms/deviceTransforms.ts
@@ -3,7 +3,7 @@ import { createTransform } from 'redux-persist';
 
 import { TrezorDevice } from '@suite-common/suite-types';
 
-const serializeDevice = (device: TrezorDevice) => ({
+const serializeDevice = (device: TrezorDevice): Omit<TrezorDevice, 'path'> & { path: '' } => ({
     ...device,
     path: '',
     remember: true,
@@ -11,7 +11,10 @@ const serializeDevice = (device: TrezorDevice) => ({
     buttonRequests: [],
 });
 
-export const devicePersistTransform = createTransform<TrezorDevice[], Readonly<TrezorDevice[]>>(
+export const devicePersistTransform = createTransform<
+    TrezorDevice[],
+    Readonly<(Omit<TrezorDevice, 'path'> & { path: '' })[]>
+>(
     inboundState => {
         return pipe(
             inboundState,
diff --git a/suite-native/storage/src/transforms/utils.ts b/suite-native/storage/src/transforms/utils.ts
index b104220424f..acb4c0933e9 100644
--- a/suite-native/storage/src/transforms/utils.ts
+++ b/suite-native/storage/src/transforms/utils.ts
@@ -8,7 +8,13 @@ import { DeviceRootState } from '@suite-common/wallet-core';
  */
 export const selectDeviceStatesNotRemembered = (state: DeviceRootState) => {
     return A.filterMap(state.device.devices, device =>
-        device.remember || !device.state ? O.None : O.Some(device.state),
+        device.remember || !device.state || !device.state.staticSessionId
+            ? O.None
+            : O.Some(
+                  typeof device.state === 'string'
+                      ? (device as any).state
+                      : device.state.staticSessionId,
+              ),
     );
 };
 
diff --git a/suite-native/test-utils/package.json b/suite-native/test-utils/package.json
index 5878eaeec8f..bf25e71f595 100644
--- a/suite-native/test-utils/package.json
+++ b/suite-native/test-utils/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
@@ -16,7 +15,7 @@
         "@trezor/theme": "workspace:*",
         "react": "18.2.0",
         "react-native-gesture-handler": "2.18.1",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-native-safe-area-context": "4.10.9"
     }
 }
diff --git a/suite-native/test-utils/src/atomsMock.js b/suite-native/test-utils/src/atomsMock.js
index b5ce8ed04e6..8aaa60ba310 100644
--- a/suite-native/test-utils/src/atomsMock.js
+++ b/suite-native/test-utils/src/atomsMock.js
@@ -1,11 +1,10 @@
-jest.mock('@suite-common/icons-deprecated', () => {
-    const originalModule = jest.requireActual('@suite-common/icons-deprecated');
+jest.mock('@suite-native/icons', () => {
+    const originalModule = jest.requireActual('@suite-native/icons');
 
     return {
         __esModule: true,
         ...originalModule,
         Icon: props => JSON.stringify(props),
         CryptoIcon: props => JSON.stringify(props),
-        FlagIcon: props => JSON.stringify(props),
     };
 });
diff --git a/suite-native/theme/package.json b/suite-native/theme/package.json
index d9b0b849df9..b8af86beb27 100644
--- a/suite-native/theme/package.json
+++ b/suite-native/theme/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
diff --git a/suite-native/toasts/package.json b/suite-native/toasts/package.json
index bded18e513c..ae05475a27d 100644
--- a/suite-native/toasts/package.json
+++ b/suite-native/toasts/package.json
@@ -6,19 +6,18 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
         "@mobily/ts-belt": "^3.13.1",
-        "@suite-common/icons-deprecated": "workspace:*",
         "@suite-native/atoms": "workspace:*",
         "@suite-native/connection-status": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@trezor/styles": "workspace:*",
         "@trezor/theme": "workspace:*",
         "jotai": "1.9.1",
         "react": "18.2.0",
-        "react-native-reanimated": "3.15.0"
+        "react-native-reanimated": "3.16.1"
     }
 }
diff --git a/suite-native/toasts/src/components/Toast.tsx b/suite-native/toasts/src/components/Toast.tsx
index 48ac5eee962..e236e56341f 100644
--- a/suite-native/toasts/src/components/Toast.tsx
+++ b/suite-native/toasts/src/components/Toast.tsx
@@ -3,7 +3,7 @@ import Animated, { FadeIn, FadeOut } from 'react-native-reanimated';
 
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { Box, HStack, Text } from '@suite-native/atoms';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { Color } from '@trezor/theme';
 
 import { Toast as ToastInterface, ToastVariant } from '../toastsAtoms';
diff --git a/suite-native/toasts/src/toastsAtoms.ts b/suite-native/toasts/src/toastsAtoms.ts
index c3dcaa9f921..008f152a7c8 100644
--- a/suite-native/toasts/src/toastsAtoms.ts
+++ b/suite-native/toasts/src/toastsAtoms.ts
@@ -3,7 +3,7 @@ import { ReactNode } from 'react';
 import { A } from '@mobily/ts-belt';
 import { atom } from 'jotai';
 
-import { IconName } from '@suite-common/icons-deprecated';
+import { IconName } from '@suite-native/icons';
 
 export type ToastVariant = 'default' | 'success' | 'warning' | 'error' | 'info';
 
diff --git a/suite-native/toasts/tsconfig.json b/suite-native/toasts/tsconfig.json
index 61081cdbc5c..c498328107d 100644
--- a/suite-native/toasts/tsconfig.json
+++ b/suite-native/toasts/tsconfig.json
@@ -2,11 +2,9 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
-        {
-            "path": "../../suite-common/icons-deprecated"
-        },
         { "path": "../atoms" },
         { "path": "../connection-status" },
+        { "path": "../icons" },
         { "path": "../../packages/styles" },
         { "path": "../../packages/theme" }
     ]
diff --git a/suite-native/tokens/package.json b/suite-native/tokens/package.json
index 08c597a37c4..b98dca22448 100644
--- a/suite-native/tokens/package.json
+++ b/suite-native/tokens/package.json
@@ -6,18 +6,18 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
         "@mobily/ts-belt": "^3.13.1",
+        "@suite-common/redux-utils": "workspace:*",
         "@suite-common/token-definitions": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
         "@suite-common/wallet-core": "workspace:*",
         "@suite-common/wallet-types": "workspace:*",
         "@trezor/blockchain-link": "workspace:*",
-        "proxy-memoize": "2.0.2",
+        "@trezor/utils": "workspace:*",
         "react": "18.2.0"
     }
 }
diff --git a/suite-native/tokens/src/tokensSelectors.ts b/suite-native/tokens/src/tokensSelectors.ts
index 0ed6cf34edc..ed80416fbc4 100644
--- a/suite-native/tokens/src/tokensSelectors.ts
+++ b/suite-native/tokens/src/tokensSelectors.ts
@@ -1,15 +1,19 @@
 import { A, G, pipe } from '@mobily/ts-belt';
-import { memoizeWithArgs } from 'proxy-memoize';
 
 import {
-    selectFilterKnownTokens,
+    filterKnownTokens,
+    getSimpleCoinDefinitionsByNetwork,
+    isTokenDefinitionKnown,
     selectIsSpecificCoinDefinitionKnown,
+    selectTokenDefinitions,
     TokenDefinitionsRootState,
 } from '@suite-common/token-definitions';
+import { NetworkSymbol } from '@suite-common/wallet-config';
 import {
     AccountsRootState,
     DeviceRootState,
     selectAccountByKey,
+    selectAccounts,
     selectAccountTransactions,
     selectVisibleDeviceAccountsByNetworkSymbol,
     TransactionsRootState,
@@ -21,20 +25,24 @@ import {
     TokenSymbol,
 } from '@suite-common/wallet-types';
 import { TokenInfo, TokenTransfer } from '@trezor/blockchain-link';
-import { NetworkSymbol } from '@suite-common/wallet-config';
+import { createWeakMapSelector, returnStableArrayIfEmpty } from '@suite-common/redux-utils';
 
-import { isCoinWithTokens } from './utils';
 import { TypedTokenTransfer, WalletAccountTransaction } from './types';
+import { isCoinWithTokens } from './utils';
 
-export type TokensRootState = AccountsRootState & DeviceRootState & TokenDefinitionsRootState;
+export type TokensRootState = AccountsRootState &
+    DeviceRootState &
+    TokenDefinitionsRootState &
+    TransactionsRootState;
 
-export const selectAccountTokenInfo = memoizeWithArgs(
-    (
-        state: AccountsRootState,
-        accountKey?: AccountKey,
-        tokenAddress?: TokenAddress,
-    ): TokenInfoBranded | null => {
-        const account = selectAccountByKey(state, accountKey);
+const createMemoizedSelector = createWeakMapSelector.withTypes<TokensRootState>();
+
+export const selectAccountTokenInfo = createMemoizedSelector(
+    [
+        selectAccountByKey,
+        (_state, _accountKey?: AccountKey, tokenAddress?: TokenAddress) => tokenAddress,
+    ],
+    (account, tokenAddress?: TokenAddress): TokenInfoBranded | null => {
         if (!account || !account.tokens) {
             return null;
         }
@@ -46,35 +54,52 @@ export const selectAccountTokenInfo = memoizeWithArgs(
             ) as TokenInfoBranded) ?? null
         );
     },
-    // 100 is a reasonable size for the cache
-    { size: 100 },
 );
 
-export const selectAccountTokenSymbol = (
-    state: AccountsRootState,
-    accountKey?: AccountKey,
-    tokenAddress?: TokenAddress,
-): TokenSymbol | null => {
-    const tokenInfo = selectAccountTokenInfo(state, accountKey, tokenAddress);
+export const selectAccountTokenSymbol = createMemoizedSelector(
+    [selectAccountTokenInfo],
+    (tokenInfo): TokenSymbol | null => {
+        if (!tokenInfo) {
+            return null;
+        }
 
-    if (!tokenInfo) {
-        return null;
-    }
+        // FIXME: This is the only place in the codebase where we change case of token symbol.
+        // The `toUpperCase()` operation is necessary because we are receiving wrongly formatted token symbol from connect.
+        // Can be removed at the moment when desktop issue https://github.com/trezor/trezor-suite/issues/8037 is resolved.
+        return tokenInfo.symbol.toUpperCase() as TokenSymbol;
+    },
+);
 
-    // FIXME: This is the only place in the codebase where we change case of token symbol.
-    // The `toUpperCase()` operation is necessary because we are receiving wrongly formatted token symbol from connect.
-    // Can be removed at the moment when desktop issue https://github.com/trezor/trezor-suite/issues/8037 is resolved.
-    return tokenInfo.symbol.toUpperCase() as TokenSymbol;
-};
+export const selectAccountTokenBalance = createMemoizedSelector(
+    [selectAccountTokenInfo],
+    (tokenInfo): string | null => {
+        if (!tokenInfo) {
+            return null;
+        }
 
-export const selectAccountTokenTransactions = memoizeWithArgs(
-    (
-        state: TransactionsRootState,
-        accountKey: AccountKey,
-        tokenAddress: TokenAddress,
-    ): WalletAccountTransaction[] =>
+        return tokenInfo.balance ?? null;
+    },
+);
+
+export const selectAccountTokenDecimals = createMemoizedSelector(
+    [selectAccountTokenInfo],
+    (tokenInfo): number | null => {
+        if (!tokenInfo) {
+            return null;
+        }
+
+        return tokenInfo.decimals ?? null;
+    },
+);
+
+export const selectAccountTokenTransactions = createMemoizedSelector(
+    [
+        selectAccountTransactions,
+        (_state, _accountKey: AccountKey, tokenAddress: TokenAddress) => tokenAddress,
+    ],
+    (transactions, tokenAddress): WalletAccountTransaction[] =>
         pipe(
-            selectAccountTransactions(state, accountKey),
+            transactions,
             A.map(transaction => ({
                 ...transaction,
                 tokens: transaction.tokens.map((tokenTransfer: TokenTransfer) => ({
@@ -88,8 +113,8 @@ export const selectAccountTokenTransactions = memoizeWithArgs(
                     tokenTransfer => tokenTransfer.contract === tokenAddress,
                 ),
             ),
+            returnStableArrayIfEmpty,
         ) as WalletAccountTransaction[],
-    { size: 50 },
 );
 
 const selectAllAccountTokens = (
@@ -97,11 +122,8 @@ const selectAllAccountTokens = (
     accountKey: AccountKey,
 ): TokenInfoBranded[] => {
     const account = selectAccountByKey(state, accountKey);
-    if (!account || !account.tokens) {
-        return [];
-    }
 
-    return account.tokens as TokenInfoBranded[];
+    return returnStableArrayIfEmpty(account?.tokens) as TokenInfoBranded[];
 };
 
 export const selectAnyOfTokensIsKnown = (
@@ -135,44 +157,59 @@ const isNotEmptyTransaction = (transaction: WalletAccountTransaction) =>
 const isTransactionWithTokenTransfers = (transaction: WalletAccountTransaction) =>
     G.isArray(transaction.tokens) && A.isNotEmpty(transaction.tokens);
 
-const selectAccountTransactionsWithTokensWithFiatRates = memoizeWithArgs(
+const selectAccountTransactionsWithTokensWithFiatRates = createMemoizedSelector(
+    [
+        selectAccountTransactions,
+        selectTokenDefinitions,
+        (_state, _accountKey: AccountKey, areTokenOnlyTransactionsIncluded: boolean) =>
+            areTokenOnlyTransactionsIncluded,
+    ],
     (
-        state: TransactionsRootState & TokenDefinitionsRootState,
-        accountKey: AccountKey,
-        areTokenOnlyTransactionsIncluded: boolean,
-    ): WalletAccountTransaction[] =>
-        pipe(
-            selectAccountTransactions(state, accountKey),
-            A.map(transaction => ({
-                ...transaction,
-                tokens: pipe(
-                    transaction?.tokens ?? [],
-                    A.filter(isNotZeroAmountTransfer),
-                    A.filter(token =>
-                        selectIsSpecificCoinDefinitionKnown(
-                            state,
-                            transaction.symbol,
-                            token.contract as TokenAddress,
+        transactions,
+        tokenDefinitions,
+        areTokenOnlyTransactionsIncluded,
+    ): WalletAccountTransaction[] => {
+        return pipe(
+            transactions,
+            A.map(transaction => {
+                const tokenDefinitionsForNetwork = getSimpleCoinDefinitionsByNetwork(
+                    tokenDefinitions,
+                    transaction.symbol,
+                );
+
+                return {
+                    ...transaction,
+                    tokens: pipe(
+                        transaction?.tokens ?? [],
+                        A.filter(isNotZeroAmountTransfer),
+                        A.filter(
+                            token =>
+                                !!isTokenDefinitionKnown(
+                                    tokenDefinitionsForNetwork,
+                                    transaction.symbol,
+                                    token.contract,
+                                ),
                         ),
-                    ),
-                    A.map((tokenTransfer: TokenTransfer) => ({
-                        ...tokenTransfer,
-                        symbol: tokenTransfer.symbol,
-                    })),
-                ) as TypedTokenTransfer[],
-            })),
+                        A.map((tokenTransfer: TokenTransfer) => ({
+                            ...tokenTransfer,
+                            symbol: tokenTransfer.symbol,
+                        })),
+                    ) as TypedTokenTransfer[],
+                };
+            }),
             A.filter(
                 transaction =>
                     isNotEmptyTransaction(transaction) ||
                     (areTokenOnlyTransactionsIncluded &&
                         isTransactionWithTokenTransfers(transaction)),
             ),
-        ) as WalletAccountTransaction[],
-    { size: 50 },
+            returnStableArrayIfEmpty,
+        );
+    },
 );
 
 export const selectAccountOrTokenTransactions = (
-    state: TransactionsRootState & TokenDefinitionsRootState,
+    state: TokensRootState,
     accountKey: AccountKey,
     tokenAddress: TokenAddress | null,
     areTokenOnlyTransactionsIncluded: boolean,
@@ -188,23 +225,26 @@ export const selectAccountOrTokenTransactions = (
     ) as WalletAccountTransaction[];
 };
 
-export const selectAccountsKnownTokens = memoizeWithArgs(
-    (
-        state: AccountsRootState & TokenDefinitionsRootState,
-        accountKey: AccountKey,
-    ): TokenInfoBranded[] => {
-        const account = selectAccountByKey(state, accountKey);
+export const selectAccountsKnownTokens = createMemoizedSelector(
+    [selectAccountByKey, selectTokenDefinitions],
+    (account, tokenDefinitions): TokenInfoBranded[] => {
         if (!account || !isCoinWithTokens(account.symbol)) {
-            return [];
+            return returnStableArrayIfEmpty<TokenInfoBranded>([]);
         }
 
-        return selectFilterKnownTokens(
-            state,
+        const tokenDefinitionsForNetwork = getSimpleCoinDefinitionsByNetwork(
+            tokenDefinitions,
+            account.symbol,
+        );
+
+        const knownTokens = filterKnownTokens(
+            tokenDefinitionsForNetwork,
             account.symbol,
             account.tokens ?? [],
         ) as TokenInfoBranded[];
+
+        return returnStableArrayIfEmpty(knownTokens);
     },
-    { size: 50 },
 );
 
 export const selectNumberOfAccountTokensWithFiatRates = (
@@ -247,3 +287,14 @@ export const selectAccountHasAnyKnownToken = (state: TokensRootState, accountKey
 
     return anyOfTokensIsKnown;
 };
+
+export const selectNetworkSymbolsOfAccountsWithTokensAllowed = (state: TokensRootState) =>
+    selectAccounts(state)
+        .filter(a => isCoinWithTokens(a.symbol))
+        .reduce((acc, account) => {
+            if (!acc.includes(account.symbol)) {
+                acc.push(account.symbol);
+            }
+
+            return acc;
+        }, new Array<NetworkSymbol>());
diff --git a/suite-native/tokens/src/utils.ts b/suite-native/tokens/src/utils.ts
index d2ce592d703..485b7fcbca9 100644
--- a/suite-native/tokens/src/utils.ts
+++ b/suite-native/tokens/src/utils.ts
@@ -1,6 +1,7 @@
 import { G, S } from '@mobily/ts-belt';
 
 import { NetworkSymbol } from '@suite-common/wallet-config';
+import { isArrayMember } from '@trezor/utils';
 
 export const getTokenName = (tokenName?: string) => {
     if (G.isNullable(tokenName) || S.isEmpty(tokenName)) return 'Unknown token';
@@ -8,10 +9,13 @@ export const getTokenName = (tokenName?: string) => {
     return tokenName;
 };
 
-export const NETWORK_SYMBOLS_WITH_TOKENS = ['eth', 'pol', 'bnb'] satisfies Array<NetworkSymbol>;
+export const NETWORK_SYMBOLS_WITH_TOKENS = [
+    'eth',
+    'pol',
+    'bnb',
+    'sol',
+] satisfies Array<NetworkSymbol>;
 export type NetworkSymbolWithTokens = (typeof NETWORK_SYMBOLS_WITH_TOKENS)[number];
 
-export const isCoinWithTokens = (symbol: NetworkSymbol): symbol is NetworkSymbolWithTokens => {
-    // We typecast because TS does complain that other coins like btc are not included in NETWORKS_WITH_TOKENS which is whole point of this function to check it
-    return NETWORK_SYMBOLS_WITH_TOKENS.includes(symbol as NetworkSymbolWithTokens);
-};
+export const isCoinWithTokens = (symbol: NetworkSymbol): symbol is NetworkSymbolWithTokens =>
+    isArrayMember(symbol, NETWORK_SYMBOLS_WITH_TOKENS);
diff --git a/suite-native/tokens/tsconfig.json b/suite-native/tokens/tsconfig.json
index 3c5c8d737c9..ccfb87c1f5d 100644
--- a/suite-native/tokens/tsconfig.json
+++ b/suite-native/tokens/tsconfig.json
@@ -2,6 +2,9 @@
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
     "references": [
+        {
+            "path": "../../suite-common/redux-utils"
+        },
         {
             "path": "../../suite-common/token-definitions"
         },
@@ -16,6 +19,7 @@
         },
         {
             "path": "../../packages/blockchain-link"
-        }
+        },
+        { "path": "../../packages/utils" }
     ]
 }
diff --git a/suite-native/transactions/package.json b/suite-native/transactions/package.json
index b8fcb0df981..692967f099e 100644
--- a/suite-native/transactions/package.json
+++ b/suite-native/transactions/package.json
@@ -6,7 +6,6 @@
     "sideEffects": false,
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "test:unit": "yarn g:jest -c ../../jest.config.base.js",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build"
@@ -18,7 +17,7 @@
         "@shopify/flash-list": "1.7.1",
         "@shopify/react-native-skia": "1.3.11",
         "@suite-common/formatters": "workspace:*",
-        "@suite-common/icons-deprecated": "workspace:*",
+        "@suite-common/redux-utils": "workspace:*",
         "@suite-common/suite-types": "workspace:*",
         "@suite-common/token-definitions": "workspace:*",
         "@suite-common/wallet-config": "workspace:*",
@@ -29,6 +28,7 @@
         "@suite-native/atoms": "workspace:*",
         "@suite-native/formatters": "workspace:*",
         "@suite-native/helpers": "workspace:*",
+        "@suite-native/icons": "workspace:*",
         "@suite-native/intl": "workspace:*",
         "@suite-native/link": "workspace:*",
         "@suite-native/navigation": "workspace:*",
@@ -38,11 +38,10 @@
         "@trezor/styles": "workspace:*",
         "@trezor/theme": "workspace:*",
         "@trezor/utils": "workspace:*",
-        "proxy-memoize": "2.0.2",
         "react": "18.2.0",
         "react-native": "0.75.2",
         "react-native-gesture-handler": "2.18.1",
-        "react-native-reanimated": "3.15.0",
+        "react-native-reanimated": "3.16.1",
         "react-redux": "8.0.7"
     }
 }
diff --git a/suite-native/transactions/src/components/TransactionDetail/ChangeAddressesHeader.tsx b/suite-native/transactions/src/components/TransactionDetail/ChangeAddressesHeader.tsx
index df239df926c..0efd4a29e71 100644
--- a/suite-native/transactions/src/components/TransactionDetail/ChangeAddressesHeader.tsx
+++ b/suite-native/transactions/src/components/TransactionDetail/ChangeAddressesHeader.tsx
@@ -1,5 +1,5 @@
 import { Box, HStack, Text } from '@suite-native/atoms';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 
 type ChangeAddressesHeaderProps = { addressesCount: number };
 
diff --git a/suite-native/transactions/src/components/TransactionDetail/NetworkTransactionDetailSummary.tsx b/suite-native/transactions/src/components/TransactionDetail/NetworkTransactionDetailSummary.tsx
index a0dcfcc4a1f..3eaf92c3de2 100644
--- a/suite-native/transactions/src/components/TransactionDetail/NetworkTransactionDetailSummary.tsx
+++ b/suite-native/transactions/src/components/TransactionDetail/NetworkTransactionDetailSummary.tsx
@@ -4,11 +4,12 @@ import { A } from '@mobily/ts-belt';
 
 import {
     TransactionsRootState,
-    selectTransactionByTxidAndAccountKey,
+    selectTransactionByAccountKeyAndTxid,
 } from '@suite-common/wallet-core';
 import { AccountKey } from '@suite-common/wallet-types';
 import { Box, ErrorMessage, VStack } from '@suite-native/atoms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+import { TokenDefinitionsRootState } from '@suite-common/token-definitions';
 
 import { selectTransactionAddresses } from '../../selectors';
 import { TransactionDetailAddressesSection } from './TransactionDetailAddressesSection';
@@ -62,13 +63,15 @@ export const NetworkTransactionDetailSummary = ({
     onShowMore: () => void;
 }) => {
     const transaction = useSelector((state: TransactionsRootState) =>
-        selectTransactionByTxidAndAccountKey(state, txid, accountKey),
+        selectTransactionByAccountKeyAndTxid(state, accountKey, txid),
     );
-    const transactionInputAddresses = useSelector((state: TransactionsRootState) =>
-        selectTransactionAddresses(state, txid, accountKey, 'inputs'),
+    const transactionInputAddresses = useSelector(
+        (state: TransactionsRootState & TokenDefinitionsRootState) =>
+            selectTransactionAddresses(state, accountKey, txid, 'inputs'),
     );
-    const transactionOutputAddresses = useSelector((state: TransactionsRootState) =>
-        selectTransactionAddresses(state, txid, accountKey, 'outputs'),
+    const transactionOutputAddresses = useSelector(
+        (state: TransactionsRootState & TokenDefinitionsRootState) =>
+            selectTransactionAddresses(state, accountKey, txid, 'outputs'),
     );
 
     if (!transaction) {
@@ -82,7 +85,7 @@ export const NetworkTransactionDetailSummary = ({
                     addressesType="inputs"
                     addresses={transactionInputAddresses}
                     onShowMore={onShowMore}
-                    icon={transaction.symbol}
+                    networkSymbol={transaction.symbol}
                 />
             )}
             {A.isNotEmpty(transactionOutputAddresses) && (
diff --git a/suite-native/transactions/src/components/TransactionDetail/TokenTransactionDetailSummary.tsx b/suite-native/transactions/src/components/TransactionDetail/TokenTransactionDetailSummary.tsx
index cbc2e63f164..0f914b8c754 100644
--- a/suite-native/transactions/src/components/TransactionDetail/TokenTransactionDetailSummary.tsx
+++ b/suite-native/transactions/src/components/TransactionDetail/TokenTransactionDetailSummary.tsx
@@ -1,12 +1,16 @@
+import { useSelector } from 'react-redux';
+
 import { AccountKey } from '@suite-common/wallet-types';
 import { TypedTokenTransfer } from '@suite-native/tokens';
 import { VStack } from '@suite-native/atoms';
+import { AccountsRootState, selectAccountNetworkSymbol } from '@suite-common/wallet-core';
 
 import { TransactionDetailAddressesSection } from './TransactionDetailAddressesSection';
 import { VinVoutAddress } from '../../types';
 import { VerticalSeparator } from './NetworkTransactionDetailSummary';
 
 export const TokenTransactionDetailSummary = ({
+    accountKey,
     tokenTransfer,
     onShowMore,
 }: {
@@ -15,6 +19,9 @@ export const TokenTransactionDetailSummary = ({
     tokenTransfer: TypedTokenTransfer;
     onShowMore: () => void;
 }) => {
+    const networkSymbol = useSelector((state: AccountsRootState) =>
+        selectAccountNetworkSymbol(state, accountKey),
+    );
     // Token transfer has always only one address, so we need to wrap it to an array.
     const inputAddresses: VinVoutAddress[] = [
         { address: tokenTransfer.from, isChangeAddress: false },
@@ -28,7 +35,8 @@ export const TokenTransactionDetailSummary = ({
             <TransactionDetailAddressesSection
                 addressesType="inputs"
                 addresses={inputAddresses}
-                icon={tokenTransfer.contract}
+                networkSymbol={networkSymbol ?? undefined}
+                contractAddress={tokenTransfer.contract}
                 onShowMore={onShowMore}
             />
             <TransactionDetailAddressesSection
diff --git a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailAddressesSection.tsx b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailAddressesSection.tsx
index 376e6a1b468..af480fd2b6d 100644
--- a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailAddressesSection.tsx
+++ b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailAddressesSection.tsx
@@ -4,8 +4,10 @@ import { TouchableOpacity } from 'react-native-gesture-handler';
 import { Box, CardDivider, Text, VStack } from '@suite-native/atoms';
 import { AccountAddressFormatter } from '@suite-native/formatters';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { CoinSymbol, CryptoIcon } from '@suite-common/icons-deprecated';
+import { CryptoIcon } from '@suite-native/icons';
 import { Translation } from '@suite-native/intl';
+import { NetworkSymbol } from '@suite-common/wallet-config';
+import { TokenAddress } from '@suite-common/wallet-types';
 
 import { SummaryRow } from './TransactionSummaryRow';
 import { formatAddressLabel } from './TransactionDetailAddressesSheet';
@@ -16,7 +18,8 @@ type TransactionDetailAddressesSectionProps = {
     addresses: VinVoutAddress[];
     addressesType: 'inputs' | 'outputs';
     onShowMore: () => void;
-    icon?: CoinSymbol;
+    networkSymbol?: NetworkSymbol;
+    contractAddress?: TokenAddress;
 };
 
 const showMoreButtonContainerStyle = prepareNativeStyle(utils => ({
@@ -76,7 +79,8 @@ export const TransactionDetailAddressesSection = ({
     addressesType,
     addresses,
     onShowMore,
-    icon,
+    networkSymbol,
+    contractAddress,
 }: TransactionDetailAddressesSectionProps) => {
     const { applyStyle } = useNativeStyles();
 
@@ -110,9 +114,14 @@ export const TransactionDetailAddressesSection = ({
                             />
                         ))}
                     </Box>
-                    {icon && (
+
+                    {networkSymbol && (
                         <Box style={applyStyle(coinIconWrapperStyle)}>
-                            <CryptoIcon symbol={icon} size="extraSmall" />
+                            <CryptoIcon
+                                symbol={networkSymbol}
+                                contractAddress={contractAddress}
+                                size="extraSmall"
+                            />
                         </Box>
                     )}
                 </Box>
diff --git a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailAddressesSheet.tsx b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailAddressesSheet.tsx
index 9eb4be0c491..12c09e67876 100644
--- a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailAddressesSheet.tsx
+++ b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailAddressesSheet.tsx
@@ -8,8 +8,9 @@ import { AccountKey } from '@suite-common/wallet-types';
 import { BottomSheet, Box, Button, Card, Text, Toggle, VStack } from '@suite-native/atoms';
 import { TransactionsRootState } from '@suite-common/wallet-core';
 import { useCopyToClipboard } from '@suite-native/helpers';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
+import { TokenDefinitionsRootState } from '@suite-common/token-definitions';
 
 import { selectTransactionAddresses } from '../../selectors';
 import { ChangeAddressesHeader } from './ChangeAddressesHeader';
@@ -76,11 +77,12 @@ export const TransactionDetailAddressesSheet = ({
 }: TransactionDetailAddressesSheetProps) => {
     const [displayedAddressesType, setDisplayedAddressesType] = useState<AddressesType>('inputs');
 
-    const inputAddresses = useSelector((state: TransactionsRootState) =>
-        selectTransactionAddresses(state, txid, accountKey, 'inputs'),
+    const inputAddresses = useSelector((state: TransactionsRootState & TokenDefinitionsRootState) =>
+        selectTransactionAddresses(state, accountKey, txid, 'inputs'),
     );
-    const outputAddresses = useSelector((state: TransactionsRootState) =>
-        selectTransactionAddresses(state, txid, accountKey, 'outputs'),
+    const outputAddresses = useSelector(
+        (state: TransactionsRootState & TokenDefinitionsRootState) =>
+            selectTransactionAddresses(state, accountKey, txid, 'outputs'),
     );
 
     const displayedAddresses =
diff --git a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailHeader.tsx b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailHeader.tsx
index 6f5222ebd0f..57cab1c7ec2 100644
--- a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailHeader.tsx
+++ b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailHeader.tsx
@@ -4,8 +4,8 @@ import { AccountKey } from '@suite-common/wallet-types';
 import {
     CryptoAmountFormatter,
     CryptoToFiatAmountFormatter,
-    EthereumTokenAmountFormatter,
-    EthereumTokenToFiatAmountFormatter,
+    TokenAmountFormatter,
+    TokenToFiatAmountFormatter,
     SignValueFormatter,
 } from '@suite-native/formatters';
 import { TypedTokenTransfer, WalletAccountTransaction } from '@suite-native/tokens';
@@ -25,6 +25,15 @@ type TransactionDetailHeaderProps = {
 const ICON_SIZE = 56;
 const ICON_SPINNER_WIDTH = 3;
 
+const failedTxStyle = prepareNativeStyle<{ isFailedTx: boolean }>((_, { isFailedTx }) => ({
+    extend: {
+        condition: isFailedTx,
+        style: {
+            textDecorationLine: 'line-through',
+        },
+    },
+}));
+
 const fiatValueStyle = prepareNativeStyle(utils => ({
     marginTop: -utils.spacings.sp4,
 }));
@@ -44,14 +53,17 @@ export const TransactionDetailHeader = ({
     const { type } = transaction;
 
     const isPendingTx = isPending(transaction);
+    const isFailedTx = transaction.type === 'failed';
     const signValue = getTransactionValueSign(tokenTransfer?.type ?? transaction.type);
+    const isTokenOnlyTransaction = transaction.amount === '0' && transaction.tokens.length !== 0;
+    const txType = isTokenOnlyTransaction ? transaction.tokens[0].type : type;
 
     return (
         <DiscreetTextTrigger>
             <Box alignItems="center">
                 <VStack spacing="sp16" alignItems="center" justifyContent="center">
                     <TransactionIcon
-                        transactionType={type}
+                        transactionType={txType}
                         isAnimated={isPendingTx}
                         containerSize={ICON_SIZE}
                         iconSize="extraLarge"
@@ -68,21 +80,26 @@ export const TransactionDetailHeader = ({
                             elevation="1"
                         />
                     ) : (
-                        <Badge
-                            variant="green"
-                            label={<Translation id="transactions.status.confirmed" />}
-                        />
+                        !isFailedTx && (
+                            <Badge
+                                variant="green"
+                                label={<Translation id="transactions.status.confirmed" />}
+                            />
+                        )
                     )}
 
                     <Box flexDirection="row">
-                        <SignValueFormatter
-                            color="textDefault"
-                            value={signValue}
-                            variant="titleMedium"
-                        />
+                        {!isFailedTx && (
+                            <SignValueFormatter
+                                color="textDefault"
+                                value={signValue}
+                                variant="titleMedium"
+                            />
+                        )}
                         <Text> </Text>
+
                         {tokenTransfer ? (
-                            <EthereumTokenAmountFormatter
+                            <TokenAmountFormatter
                                 value={tokenTransfer.amount}
                                 symbol={tokenTransfer.symbol}
                                 decimals={tokenTransfer.decimals}
@@ -90,6 +107,7 @@ export const TransactionDetailHeader = ({
                                 color="textDefault"
                                 numberOfLines={1}
                                 adjustsFontSizeToFit
+                                style={applyStyle(failedTxStyle, { isFailedTx })}
                             />
                         ) : (
                             <CryptoAmountFormatter
@@ -100,6 +118,7 @@ export const TransactionDetailHeader = ({
                                 color="textDefault"
                                 numberOfLines={1}
                                 adjustsFontSizeToFit
+                                style={applyStyle(failedTxStyle, { isFailedTx })}
                             />
                         )}
                     </Box>
@@ -109,13 +128,15 @@ export const TransactionDetailHeader = ({
                     <Box flexDirection="row" style={applyStyle(fiatValueStyle)}>
                         <Text color="textSubdued">≈ </Text>
                         {tokenTransfer ? (
-                            <EthereumTokenToFiatAmountFormatter
+                            <TokenToFiatAmountFormatter
+                                networkSymbol={transaction.symbol}
                                 contract={tokenTransfer.contract}
                                 value={tokenTransfer.amount}
                                 decimals={tokenTransfer.decimals}
                                 historicRate={historicRate}
                                 color="textSubdued"
                                 useHistoricRate
+                                style={applyStyle(failedTxStyle, { isFailedTx })}
                             />
                         ) : (
                             <CryptoToFiatAmountFormatter
@@ -124,6 +145,7 @@ export const TransactionDetailHeader = ({
                                 historicRate={historicRate}
                                 color="textSubdued"
                                 useHistoricRate
+                                style={applyStyle(failedTxStyle, { isFailedTx })}
                             />
                         )}
                     </Box>
diff --git a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailIncludedCoins.tsx b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailIncludedCoins.tsx
index 74b2fb65a60..f2d6e696b79 100644
--- a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailIncludedCoins.tsx
+++ b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailIncludedCoins.tsx
@@ -4,7 +4,7 @@ import { TouchableOpacity } from 'react-native';
 import { BottomSheet, Box, Card, RoundedIcon, Text } from '@suite-native/atoms';
 import { TypedTokenTransfer, WalletAccountTransaction } from '@suite-native/tokens';
 import { AccountKey } from '@suite-common/wallet-types';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { useNativeStyles } from '@trezor/styles';
 
 import { TransactionDetailListItem } from './TransactionDetailListItem';
@@ -40,7 +40,7 @@ const IncludedCoinsSheetTrigger = ({ title, onPress }: { title: string; onPress:
                         </Box>
                         <Text>{title}</Text>
                     </Box>
-                    <Icon name="circleRight" color="iconPrimaryDefault" />
+                    <Icon name="caretCircleRight" color="iconPrimaryDefault" />
                 </Box>
             </TouchableOpacity>
         </Card>
diff --git a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailInputsSheet.tsx b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailInputsSheet.tsx
index fdb992c4aab..c8ed7c07520 100644
--- a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailInputsSheet.tsx
+++ b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailInputsSheet.tsx
@@ -2,7 +2,7 @@ import { useSelector } from 'react-redux';
 
 import { G } from '@mobily/ts-belt';
 
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { TokenDefinitionsRootState } from '@suite-common/token-definitions';
 import { TransactionsRootState } from '@suite-common/wallet-core';
 import { AccountKey } from '@suite-common/wallet-types';
@@ -32,7 +32,7 @@ const InputsOutputsHeader = ({ inputsCount, outputsCount }: InputsOutputsHeaderP
                 Inputs · {inputsCount}
             </Text>
             <Box marginLeft="sp8">
-                <Icon name="receiveAlt" color="iconSubdued" size="medium" />
+                <Icon name="arrowLineDown" color="iconSubdued" size="medium" />
             </Box>
         </Box>
 
@@ -41,7 +41,7 @@ const InputsOutputsHeader = ({ inputsCount, outputsCount }: InputsOutputsHeaderP
                 Outputs · {outputsCount}
             </Text>
             <Box marginLeft="sp8">
-                <Icon name="sendAlt" color="iconSubdued" size="medium" />
+                <Icon name="arrowLineUp" color="iconSubdued" size="medium" />
             </Box>
         </Box>
     </Box>
diff --git a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailInputsSheetSection.tsx b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailInputsSheetSection.tsx
index cf89f9150b8..ece250d3a2f 100644
--- a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailInputsSheetSection.tsx
+++ b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailInputsSheetSection.tsx
@@ -2,14 +2,14 @@ import { ReactNode, Fragment } from 'react';
 
 import { A, G } from '@mobily/ts-belt';
 
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import { NetworkSymbol, isNetworkSymbol } from '@suite-common/wallet-config';
 import { TokenSymbol } from '@suite-common/wallet-types';
 import { Box, Card, Text } from '@suite-native/atoms';
 import {
     AccountAddressFormatter,
     CryptoAmountFormatter,
-    EthereumTokenAmountFormatter,
+    TokenAmountFormatter,
 } from '@suite-native/formatters';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
@@ -45,7 +45,7 @@ const TransactionAddressAmount = ({
                     adjustsFontSizeToFit
                 />
             ) : (
-                <EthereumTokenAmountFormatter
+                <TokenAmountFormatter
                     value={amount}
                     symbol={symbol}
                     decimals={decimals}
@@ -96,7 +96,7 @@ export const TransactionDetailInputsSheetSection = ({
                                     />
                                 ))}
                             </Box>
-                            <Icon name="circleRight" color="iconDisabled" size="medium" />
+                            <Icon name="caretCircleRight" color="iconDisabled" size="medium" />
                             <Box style={applyStyle(addressAmountColumnStyle)}>
                                 {outputs.map(({ address, amount }) => (
                                     <TransactionAddressAmount
diff --git a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailListItem.tsx b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailListItem.tsx
index c8823af4318..25ec86de206 100644
--- a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailListItem.tsx
+++ b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailListItem.tsx
@@ -53,7 +53,7 @@ export const TransactionDetailListItem = ({
         navigation.push(RootStackRoutes.TransactionDetail, {
             txid: transaction.txid,
             accountKey,
-            tokenTransfer,
+            tokenContract: tokenTransfer?.contract,
         });
     };
 
@@ -64,7 +64,10 @@ export const TransactionDetailListItem = ({
         >
             <Box flexDirection="row" alignItems="center" flex={1}>
                 <Box marginRight="sp16">
-                    <RoundedIcon name={tokenTransfer?.contract || transaction.symbol} />
+                    <RoundedIcon
+                        networkSymbol={transaction.symbol}
+                        contractAddress={tokenTransfer?.contract}
+                    />
                 </Box>
                 <Box style={applyStyle(CoinNameContainerStyle)}>
                     <Text>{tokenTransfer?.name ?? 'Ethereum'}</Text>
diff --git a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailParametersSheet.tsx b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailParametersSheet.tsx
index d50b9717698..9bed3c0938b 100644
--- a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailParametersSheet.tsx
+++ b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailParametersSheet.tsx
@@ -2,7 +2,7 @@ import { useSelector } from 'react-redux';
 
 import { AccountKey, WalletAccountTransaction } from '@suite-common/wallet-types';
 import { Box, Card, IconButton, Text, VStack } from '@suite-native/atoms';
-import { Icon } from '@suite-common/icons-deprecated';
+import { Icon } from '@suite-native/icons';
 import {
     BlockchainRootState,
     selectTransactionConfirmations,
@@ -86,7 +86,7 @@ export const TransactionDetailParametersSheet = ({
             isVisible={isVisible}
             onVisibilityChange={onSheetVisibilityChange}
             title={translate('transactions.detail.sheet.parameters')}
-            iconName="infoMedium"
+            iconName="info"
             transactionId={transaction.txid}
         >
             <VStack>
@@ -116,7 +116,7 @@ export const TransactionDetailParametersSheet = ({
                             <ConfirmationsCount txid={transaction.txid} accountKey={accountKey} />
                         </Text>
                         <Box marginLeft="sp8">
-                            <Icon name="confirmation" />
+                            <Icon name="checks" />
                         </Box>
                     </TransactionDetailRow>
                 </Card>
diff --git a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailSheet.tsx b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailSheet.tsx
index 44d6f2a98f1..49d8ff11b91 100644
--- a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailSheet.tsx
+++ b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailSheet.tsx
@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
 import { TouchableOpacity } from 'react-native-gesture-handler';
 
-import { Icon, IconName } from '@suite-common/icons-deprecated';
+import { Icon, IconName } from '@suite-native/icons';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles/src';
 import { BottomSheet, Box, Button, Text } from '@suite-native/atoms/src';
 
@@ -39,7 +39,7 @@ const BottomSheetTrigger = ({
                 </Box>
                 <Text>{title}</Text>
             </Box>
-            <Icon name="chevronRight" color="iconSubdued" size="mediumLarge" />
+            <Icon name="caretRight" color="iconSubdued" size="mediumLarge" />
         </TouchableOpacity>
     );
 };
diff --git a/suite-native/transactions/src/components/TransactionsEmptyState.tsx b/suite-native/transactions/src/components/TransactionsEmptyState.tsx
index f0b727a9f10..b200c6588fa 100644
--- a/suite-native/transactions/src/components/TransactionsEmptyState.tsx
+++ b/suite-native/transactions/src/components/TransactionsEmptyState.tsx
@@ -16,10 +16,10 @@ const wrapperStyle = prepareNativeStyle(() => ({
 const cardStyle = prepareNativeStyle(utils => ({
     alignItems: 'center',
     flex: 1,
-    width: '100%',
+    marginHorizontal: utils.spacings.sp16,
     paddingHorizontal: utils.spacings.sp24,
     paddingVertical: utils.spacings.sp32,
-    borderRadius: utils.borders.radii.large,
+    borderRadius: utils.borders.radii.r20,
 }));
 
 const receiveButtonStyle = prepareNativeStyle(() => ({
@@ -47,7 +47,7 @@ export const TransactionsEmptyState = ({ accountKey }: { accountKey: string }) =
                     />
                 </Box>
                 <Box style={applyStyle(receiveButtonStyle)}>
-                    <Button viewLeft="receive" onPress={handleReceive} size="large">
+                    <Button viewLeft="arrowLineDown" onPress={handleReceive} size="large">
                         <Translation id="transactions.emptyState.button" />
                     </Button>
                 </Box>
diff --git a/suite-native/transactions/src/components/TransactionsList/TokenTransferListItem.tsx b/suite-native/transactions/src/components/TransactionsList/TokenTransferListItem.tsx
index d5fcdd8027a..93ee4a31a12 100644
--- a/suite-native/transactions/src/components/TransactionsList/TokenTransferListItem.tsx
+++ b/suite-native/transactions/src/components/TransactionsList/TokenTransferListItem.tsx
@@ -1,13 +1,16 @@
 import { useSelector } from 'react-redux';
 
 import { AccountKey } from '@suite-common/wallet-types';
-import {
-    EthereumTokenAmountFormatter,
-    EthereumTokenToFiatAmountFormatter,
-} from '@suite-native/formatters';
+import { TokenAmountFormatter, TokenToFiatAmountFormatter } from '@suite-native/formatters';
 import { TypedTokenTransfer, WalletAccountTransaction } from '@suite-native/tokens';
-import { selectIsPhishingTransaction, TransactionsRootState } from '@suite-common/wallet-core';
+import {
+    AccountsRootState,
+    selectAccountNetworkSymbol,
+    selectIsPhishingTransaction,
+    TransactionsRootState,
+} from '@suite-common/wallet-core';
 import { TokenDefinitionsRootState } from '@suite-common/token-definitions';
+import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
 import { useTransactionFiatRate } from '../../hooks/useTransactionFiatRate';
 import { TransactionListItemContainer } from './TransactionListItemContainer';
@@ -23,6 +26,15 @@ type TokenTransferListItemProps = {
     isLast?: boolean;
 };
 
+const failedTxStyle = prepareNativeStyle<{ isFailedTx: boolean }>((_, { isFailedTx }) => ({
+    extend: {
+        condition: isFailedTx,
+        style: {
+            textDecorationLine: 'line-through',
+        },
+    },
+}));
+
 export const TokenTransferListItemValues = ({
     tokenTransfer,
     transaction,
@@ -43,20 +55,26 @@ export const TokenTransferListItemValues = ({
             selectIsPhishingTransaction(state, transaction.txid, accountKey),
     );
 
+    const { applyStyle } = useNativeStyles();
+
+    const isFailedTx = transaction.type === 'failed';
+
     return (
         <>
-            <EthereumTokenToFiatAmountFormatter
+            <TokenToFiatAmountFormatter
+                networkSymbol={transaction.symbol}
                 value={tokenTransfer.amount}
                 contract={tokenTransfer.contract}
                 decimals={tokenTransfer.decimals}
-                signValue={getTransactionValueSign(tokenTransfer.type)}
+                signValue={isFailedTx ? undefined : getTransactionValueSign(tokenTransfer.type)}
                 numberOfLines={1}
                 ellipsizeMode="tail"
                 historicRate={historicRate}
                 useHistoricRate
                 isForcedDiscreetMode={isPhishingTransaction}
+                style={applyStyle(failedTxStyle, { isFailedTx })}
             />
-            <EthereumTokenAmountFormatter
+            <TokenAmountFormatter
                 value={tokenTransfer.amount}
                 symbol={tokenTransfer.symbol}
                 decimals={tokenTransfer.decimals}
@@ -76,20 +94,28 @@ export const TokenTransferListItem = ({
     includedCoinsCount = 0,
     isFirst,
     isLast,
-}: TokenTransferListItemProps) => (
-    <TransactionListItemContainer
-        tokenTransfer={tokenTransfer}
-        transactionType={tokenTransfer.type}
-        txid={txid}
-        includedCoinsCount={includedCoinsCount}
-        accountKey={accountKey}
-        isFirst={isFirst}
-        isLast={isLast}
-    >
-        <TokenTransferListItemValues
+}: TokenTransferListItemProps) => {
+    const networkSymbol = useSelector((state: AccountsRootState) =>
+        selectAccountNetworkSymbol(state, accountKey),
+    );
+    const isFailedTxn = transaction.type === 'failed';
+
+    return (
+        <TransactionListItemContainer
+            networkSymbol={networkSymbol ?? undefined}
             tokenTransfer={tokenTransfer}
-            transaction={transaction}
+            transactionType={isFailedTxn ? 'failed' : tokenTransfer.type}
+            txid={txid}
+            includedCoinsCount={includedCoinsCount}
             accountKey={accountKey}
-        />
-    </TransactionListItemContainer>
-);
+            isFirst={isFirst}
+            isLast={isLast}
+        >
+            <TokenTransferListItemValues
+                tokenTransfer={tokenTransfer}
+                transaction={transaction}
+                accountKey={accountKey}
+            />
+        </TransactionListItemContainer>
+    );
+};
diff --git a/suite-native/transactions/src/components/TransactionsList/TransactionIcon.tsx b/suite-native/transactions/src/components/TransactionsList/TransactionIcon.tsx
index ad12d1e4630..0969f590b9e 100644
--- a/suite-native/transactions/src/components/TransactionsList/TransactionIcon.tsx
+++ b/suite-native/transactions/src/components/TransactionsList/TransactionIcon.tsx
@@ -1,14 +1,16 @@
 import { Box, RoundedIcon } from '@suite-native/atoms';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
-import { TransactionType } from '@suite-common/wallet-types';
-import { CoinSymbol, CryptoIcon, IconName, IconSize } from '@suite-common/icons-deprecated';
+import { TokenAddress, TransactionType } from '@suite-common/wallet-types';
+import { CryptoIcon, IconName, IconSize } from '@suite-native/icons';
 import { Color } from '@trezor/theme';
+import { NetworkSymbol } from '@suite-common/wallet-config';
 
 import { TransactionIconSpinner } from './TransactionIconSpinner';
 
 type TransactionIconProps = {
     transactionType: TransactionType;
-    symbol?: CoinSymbol;
+    networkSymbol?: NetworkSymbol;
+    contractAddress?: TokenAddress;
     isAnimated?: boolean;
     iconColor?: Color;
     spinnerColor?: Color;
@@ -21,13 +23,13 @@ type TransactionIconProps = {
 const DEFAULT_CONTAINER_SIZE = 48;
 
 const transactionIconMap: Record<TransactionType, IconName> = {
-    recv: 'receiveLight',
-    sent: 'sendLight',
-    contract: 'placeholderLight',
-    joint: 'shuffleLight',
-    self: 'arrowURightDownLight',
-    failed: 'placeholderLight',
-    unknown: 'placeholderLight',
+    recv: 'arrowDown',
+    sent: 'arrowUp',
+    contract: 'circleDashed',
+    joint: 'shuffle',
+    self: 'arrowURightDown',
+    failed: 'prohibit',
+    unknown: 'circleDashed',
 };
 
 const cryptoIconStyle = prepareNativeStyle(utils => ({
@@ -40,7 +42,8 @@ const cryptoIconStyle = prepareNativeStyle(utils => ({
 }));
 
 export const TransactionIcon = ({
-    symbol,
+    networkSymbol,
+    contractAddress,
     transactionType,
     backgroundColor,
     spinnerColor,
@@ -68,9 +71,13 @@ export const TransactionIcon = ({
                     width={spinnerWidth}
                 />
             )}
-            {symbol && (
+            {networkSymbol && (
                 <Box style={applyStyle(cryptoIconStyle)}>
-                    <CryptoIcon symbol={symbol} size="extraSmall" />
+                    <CryptoIcon
+                        symbol={networkSymbol}
+                        contractAddress={contractAddress}
+                        size="extraSmall"
+                    />
                 </Box>
             )}
         </Box>
diff --git a/suite-native/transactions/src/components/TransactionsList/TransactionIconSpinner.tsx b/suite-native/transactions/src/components/TransactionsList/TransactionIconSpinner.tsx
index eda42ee654f..c356cb5391a 100644
--- a/suite-native/transactions/src/components/TransactionsList/TransactionIconSpinner.tsx
+++ b/suite-native/transactions/src/components/TransactionsList/TransactionIconSpinner.tsx
@@ -12,7 +12,7 @@ import { Canvas, Circle, vec, SweepGradient } from '@shopify/react-native-skia';
 
 import { useNativeStyles, prepareNativeStyle } from '@trezor/styles';
 import { Color } from '@trezor/theme';
-import { ENDLESS_ANIMATION_VALUE } from '@suite-native/helpers';
+import { ENDLESS_ANIMATION_VALUE } from '@suite-native/atoms';
 
 type TransactionIconSpinnerProps = {
     size: number;
diff --git a/suite-native/transactions/src/components/TransactionsList/TransactionList.tsx b/suite-native/transactions/src/components/TransactionsList/TransactionList.tsx
index 8b7b3ffac88..58335dc80c3 100644
--- a/suite-native/transactions/src/components/TransactionsList/TransactionList.tsx
+++ b/suite-native/transactions/src/components/TransactionsList/TransactionList.tsx
@@ -18,10 +18,10 @@ import {
     TypedTokenTransfer,
     selectAccountOrTokenTransactions,
     WalletAccountTransaction,
+    TokensRootState,
 } from '@suite-native/tokens';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { arrayPartition } from '@trezor/utils';
-import { TokenDefinitionsRootState } from '@suite-common/token-definitions';
 
 import { TransactionsEmptyState } from '../TransactionsEmptyState';
 import { TokenTransferListItem } from './TokenTransferListItem';
@@ -65,11 +65,6 @@ type TransactionListItem =
     | (TypedTokenTransferWithTx | MonthKey)
     | (WalletAccountTransaction | MonthKey);
 
-const sectionListStyle = prepareNativeStyle(utils => ({
-    paddingHorizontal: utils.spacings.sp8,
-    flex: 1,
-}));
-
 const sectionListContainerStyle = prepareNativeStyle(utils => ({
     paddingVertical: utils.spacings.sp8,
 }));
@@ -149,7 +144,7 @@ export const TransactionList = ({
         selectIsLoadingAccountTransactions(state, accountKey),
     );
 
-    const transactions = useSelector((state: TransactionsRootState & TokenDefinitionsRootState) =>
+    const transactions = useSelector((state: TokensRootState) =>
         selectAccountOrTokenTransactions(
             state,
             accountKey,
@@ -277,7 +272,7 @@ export const TransactionList = ({
     );
 
     return (
-        <Box style={applyStyle(sectionListStyle)}>
+        <Box flex={1}>
             <FlashList<TransactionListItem>
                 data={data}
                 renderItem={renderItem}
diff --git a/suite-native/transactions/src/components/TransactionsList/TransactionListItem.tsx b/suite-native/transactions/src/components/TransactionsList/TransactionListItem.tsx
index b8dda06068b..acb1a23df8f 100644
--- a/suite-native/transactions/src/components/TransactionsList/TransactionListItem.tsx
+++ b/suite-native/transactions/src/components/TransactionsList/TransactionListItem.tsx
@@ -16,6 +16,7 @@ import {
 import { EmptyAmountText } from '@suite-native/formatters/src/components/EmptyAmountText';
 import { WalletAccountTransaction } from '@suite-native/tokens';
 import { TokenDefinitionsRootState } from '@suite-common/token-definitions';
+import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
 import { useTransactionFiatRate } from '../../hooks/useTransactionFiatRate';
 import { TokenTransferListItem } from './TokenTransferListItem';
@@ -30,6 +31,15 @@ type TransactionListItemProps = {
     isLast?: boolean;
 };
 
+const failedTxStyle = prepareNativeStyle<{ isFailedTx: boolean }>((_, { isFailedTx }) => ({
+    extend: {
+        condition: isFailedTx,
+        style: {
+            textDecorationLine: 'line-through',
+        },
+    },
+}));
+
 export const TransactionListItemValues = ({
     accountKey,
     transaction,
@@ -46,7 +56,10 @@ export const TransactionListItemValues = ({
             selectIsPhishingTransaction(state, transaction.txid, accountKey),
     );
 
+    const { applyStyle } = useNativeStyles();
+
     const historicRate = useTransactionFiatRate({ accountKey, transaction });
+    const isFailedTx = transaction.type === 'failed';
 
     return (
         <>
@@ -54,13 +67,16 @@ export const TransactionListItemValues = ({
                 <EmptyAmountText />
             ) : (
                 <Box flexDirection="row">
-                    <SignValueFormatter value={getTransactionValueSign(transaction.type)} />
+                    {!isFailedTx && (
+                        <SignValueFormatter value={getTransactionValueSign(transaction.type)} />
+                    )}
                     <CryptoToFiatAmountFormatter
                         value={transaction.amount}
                         network={transaction.symbol}
                         historicRate={historicRate}
                         useHistoricRate
                         isForcedDiscreetMode={isPhishingTransaction}
+                        style={applyStyle(failedTxStyle, { isFailedTx })}
                     />
                 </Box>
             )}
diff --git a/suite-native/transactions/src/components/TransactionsList/TransactionListItemContainer.tsx b/suite-native/transactions/src/components/TransactionsList/TransactionListItemContainer.tsx
index 5da81dc2fdb..f6677fc7c15 100644
--- a/suite-native/transactions/src/components/TransactionsList/TransactionListItemContainer.tsx
+++ b/suite-native/transactions/src/components/TransactionsList/TransactionListItemContainer.tsx
@@ -2,7 +2,6 @@ import { ReactNode } from 'react';
 import { TouchableOpacity } from 'react-native';
 import { useSelector } from 'react-redux';
 
-import { RequireExactlyOne } from 'type-fest';
 import { useNavigation } from '@react-navigation/native';
 
 import { AccountKey, TransactionType } from '@suite-common/wallet-types';
@@ -28,20 +27,17 @@ import { TokenDefinitionsRootState } from '@suite-common/token-definitions';
 
 import { TransactionIcon } from './TransactionIcon';
 
-type TransactionListItemContainerProps = RequireExactlyOne<
-    {
-        children: ReactNode;
-        txid: string;
-        accountKey: AccountKey;
-        includedCoinsCount: number;
-        isFirst?: boolean;
-        isLast?: boolean;
-        networkSymbol: NetworkSymbol;
-        tokenTransfer: TypedTokenTransfer;
-        transactionType: TransactionType;
-    },
-    'networkSymbol' | 'tokenTransfer'
->;
+type TransactionListItemContainerProps = {
+    children: ReactNode;
+    txid: string;
+    accountKey: AccountKey;
+    includedCoinsCount: number;
+    isFirst?: boolean;
+    isLast?: boolean;
+    networkSymbol?: NetworkSymbol | undefined;
+    tokenTransfer?: TypedTokenTransfer;
+    transactionType: TransactionType;
+};
 
 type TransactionListItemStyleProps = {
     isFirst: boolean;
@@ -54,7 +50,7 @@ const transactionTitleMap = {
     self: 'Self',
     joint: 'Joined',
     contract: 'Contract',
-    failed: 'Failed',
+    failed: 'Transaction failed',
     unknown: 'Unknown',
 } as const satisfies Record<TransactionType, string>;
 
@@ -64,7 +60,7 @@ export const transactionListItemContainerStyle = prepareNativeStyle<TransactionL
         alignItems: 'center',
         justifyContent: 'space-between',
         backgroundColor: utils.colors.backgroundSurfaceElevation1,
-        marginHorizontal: utils.spacings.sp8,
+        marginHorizontal: utils.spacings.sp16,
         paddingHorizontal: utils.spacings.sp16,
         paddingTop: utils.spacings.sp12,
         paddingBottom: utils.spacings.sp12,
@@ -73,8 +69,8 @@ export const transactionListItemContainerStyle = prepareNativeStyle<TransactionL
                 condition: isFirst,
                 style: {
                     paddingTop: utils.spacings.sp16,
-                    borderTopLeftRadius: utils.borders.radii.large / 2,
-                    borderTopRightRadius: utils.borders.radii.large / 2,
+                    borderTopLeftRadius: utils.borders.radii.r12,
+                    borderTopRightRadius: utils.borders.radii.r12,
                 },
             },
             {
@@ -82,8 +78,8 @@ export const transactionListItemContainerStyle = prepareNativeStyle<TransactionL
                 style: {
                     paddingBottom: utils.spacings.sp16,
                     marginBottom: utils.spacings.sp8,
-                    borderBottomLeftRadius: utils.borders.radii.large / 2,
-                    borderBottomRightRadius: utils.borders.radii.large / 2,
+                    borderBottomLeftRadius: utils.borders.radii.r12,
+                    borderBottomRightRadius: utils.borders.radii.r12,
                 },
             },
         ],
@@ -144,7 +140,7 @@ export const TransactionListItemContainer = ({
         navigation.navigate(RootStackRoutes.TransactionDetail, {
             txid,
             accountKey,
-            tokenTransfer,
+            tokenContract: tokenTransfer?.contract,
         });
     };
 
@@ -166,7 +162,8 @@ export const TransactionListItemContainer = ({
     );
 
     const iconColor: Color = isTransactionPending ? 'backgroundAlertYellowBold' : 'iconSubdued';
-    const coinSymbol = isPhishingTransaction ? undefined : tokenTransfer?.contract ?? networkSymbol;
+    const coinSymbol = isPhishingTransaction ? undefined : networkSymbol;
+    const contractAddress = isPhishingTransaction ? undefined : tokenTransfer?.contract;
     const transactionTitle = getTransactionTitle(transactionType, isTransactionPending);
 
     const DateTextComponent = isPhishingTransaction ? DiscreetText : Text;
@@ -178,7 +175,8 @@ export const TransactionListItemContainer = ({
         >
             <Box style={applyStyle(descriptionBoxStyle)}>
                 <TransactionIcon
-                    symbol={coinSymbol}
+                    networkSymbol={coinSymbol}
+                    contractAddress={contractAddress}
                     transactionType={transactionType}
                     isAnimated={isTransactionPending}
                     iconColor={iconColor}
@@ -191,7 +189,7 @@ export const TransactionListItemContainer = ({
                                 <Badge
                                     label={<Translation id="transactions.phishing.badge" />}
                                     size="small"
-                                    icon="warningTriangle"
+                                    icon="warning"
                                     variant="red"
                                 />
                             )}
diff --git a/suite-native/transactions/src/screens/TransactionDetailScreen.tsx b/suite-native/transactions/src/screens/TransactionDetailScreen.tsx
index 71eab0cadd9..d9351b53a95 100644
--- a/suite-native/transactions/src/screens/TransactionDetailScreen.tsx
+++ b/suite-native/transactions/src/screens/TransactionDetailScreen.tsx
@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
 import {
     BlockchainRootState,
     selectBlockchainExplorerBySymbol,
-    selectTransactionByTxidAndAccountKey,
+    selectTransactionByAccountKeyAndTxid,
     TransactionsRootState,
 } from '@suite-common/wallet-core';
 import { analytics, EventType } from '@suite-native/analytics';
@@ -39,15 +39,17 @@ export const TransactionDetailScreen = ({
     route,
 }: StackProps<RootStackParamList, RootStackRoutes.TransactionDetail>) => {
     const { utils } = useNativeStyles();
-    const { txid, accountKey, tokenTransfer, closeActionType = 'back' } = route.params;
+    const { txid, accountKey, tokenContract, closeActionType = 'back' } = route.params;
     const openLink = useOpenLink();
     const transaction = useSelector((state: TransactionsRootState) =>
-        selectTransactionByTxidAndAccountKey(state, txid, accountKey),
+        selectTransactionByAccountKeyAndTxid(state, accountKey, txid),
     ) as WalletAccountTransaction;
     const blockchainExplorer = useSelector((state: BlockchainRootState) =>
         selectBlockchainExplorerBySymbol(state, transaction?.symbol),
     );
 
+    const tokenTransfer = transaction?.tokens.find(token => token.contract === tokenContract);
+
     useEffect(() => {
         if (transaction) {
             analytics.report({
diff --git a/suite-native/transactions/src/selectors.ts b/suite-native/transactions/src/selectors.ts
index c514e5f3fd8..293a661baa9 100644
--- a/suite-native/transactions/src/selectors.ts
+++ b/suite-native/transactions/src/selectors.ts
@@ -1,26 +1,30 @@
 import { A, G, pipe } from '@mobily/ts-belt';
-import { memoizeWithArgs } from 'proxy-memoize';
 
 import {
-    selectIsSpecificCoinDefinitionKnown,
+    getSimpleCoinDefinitionsByNetwork,
+    isTokenDefinitionKnown,
+    selectTokenDefinitions,
     TokenDefinitionsRootState,
 } from '@suite-common/token-definitions';
 import { getNetworkType, NetworkSymbol } from '@suite-common/wallet-config';
 import {
-    selectTransactionByTxidAndAccountKey,
+    selectTransactionByAccountKeyAndTxid,
     selectTransactionTargets,
     TransactionsRootState,
 } from '@suite-common/wallet-core';
-import { AccountKey, TokenAddress, TokenSymbol } from '@suite-common/wallet-types';
+import { AccountKey, TokenSymbol } from '@suite-common/wallet-types';
+import { createWeakMapSelector } from '@suite-common/redux-utils';
 
 import { AddressesType, VinVoutAddress } from './types';
 import { mapTransactionInputsOutputsToAddresses, sortTargetAddressesToBeginning } from './utils';
 
-const selectTransactionTargetAddresses = memoizeWithArgs(
-    (state: TransactionsRootState, txid: string, accountKey: AccountKey) => {
-        const transaction = selectTransactionByTxidAndAccountKey(state, txid, accountKey);
+const createMemoizedSelector = createWeakMapSelector.withTypes<
+    TransactionsRootState & TokenDefinitionsRootState
+>();
 
-        const transactionTargets = selectTransactionTargets(state, txid, accountKey);
+const selectTransactionTargetAddresses = createMemoizedSelector(
+    [selectTransactionByAccountKeyAndTxid, selectTransactionTargets],
+    (transaction, transactionTargets) => {
         if (G.isNullable(transaction) || G.isNullable(transactionTargets)) return [];
 
         const isSentTransactionType = transaction.type === 'sent';
@@ -31,18 +35,16 @@ const selectTransactionTargetAddresses = memoizeWithArgs(
             isSentTransactionType,
         });
     },
-    { size: 50 },
 );
 
-export const selectTransactionAddresses = memoizeWithArgs(
-    (
-        state: TransactionsRootState,
-        txid: string,
-        accountKey: AccountKey,
-        addressesType: AddressesType,
-    ): VinVoutAddress[] => {
-        const transaction = selectTransactionByTxidAndAccountKey(state, txid, accountKey);
-
+export const selectTransactionAddresses = createMemoizedSelector(
+    [
+        selectTransactionByAccountKeyAndTxid,
+        selectTransactionTargetAddresses,
+        (_state, _accountKey: AccountKey, _txid: string, addressesType: AddressesType) =>
+            addressesType,
+    ],
+    (transaction, transactionTargetAddresses, addressesType): VinVoutAddress[] => {
         if (G.isNullable(transaction)) return [];
 
         const networkType = getNetworkType(transaction.symbol);
@@ -54,10 +56,10 @@ export const selectTransactionAddresses = memoizeWithArgs(
             }
 
             // We have only one output so we don't need to sort it
-            return selectTransactionTargetAddresses(state, txid, accountKey);
+            return transactionTargetAddresses;
         }
 
-        const targetAddresses = selectTransactionTargetAddresses(state, txid, accountKey);
+        const targetAddresses = transactionTargetAddresses;
 
         const inputsOutputs =
             addressesType === 'inputs' ? transaction.details.vin : transaction.details.vout;
@@ -72,7 +74,6 @@ export const selectTransactionAddresses = memoizeWithArgs(
 
         return sortTargetAddressesToBeginning(addresses, targetAddresses);
     },
-    { size: 100 },
 );
 
 type TransactionTransferInputOutput = { address: string; amount?: string };
@@ -83,18 +84,16 @@ export type TransactionTranfer = {
     decimals?: number;
 };
 
-export const selectTransactionInputAndOutputTransfers = memoizeWithArgs(
+export const selectTransactionInputAndOutputTransfers = createMemoizedSelector(
+    [selectTransactionByAccountKeyAndTxid, selectTokenDefinitions],
     (
-        state: TransactionsRootState & TokenDefinitionsRootState,
-        txid: string,
-        accountKey: AccountKey,
+        transaction,
+        tokenDefinitions,
     ): {
         externalTransfers: TransactionTranfer[];
         internalTransfers: TransactionTranfer[];
         tokenTransfers: TransactionTranfer[];
     } | null => {
-        const transaction = selectTransactionByTxidAndAccountKey(state, txid, accountKey);
-
         if (G.isNullable(transaction)) return null;
 
         const networkType = getNetworkType(transaction.symbol);
@@ -135,14 +134,20 @@ export const selectTransactionInputAndOutputTransfers = memoizeWithArgs(
             }),
         );
 
+        const tokenDefinitionsForNetwork = getSimpleCoinDefinitionsByNetwork(
+            tokenDefinitions,
+            transaction.symbol,
+        );
+
         const tokenTransfers: TransactionTranfer[] = pipe(
             tokens,
-            A.filter(({ contract }) =>
-                selectIsSpecificCoinDefinitionKnown(
-                    state,
-                    transaction.symbol,
-                    contract as TokenAddress,
-                ),
+            A.filter(
+                ({ contract }) =>
+                    !!isTokenDefinitionKnown(
+                        tokenDefinitionsForNetwork,
+                        transaction.symbol,
+                        contract,
+                    ),
             ),
             A.map(({ from, to, amount, symbol, decimals }) => ({
                 inputs: [{ address: from }],
@@ -154,5 +159,4 @@ export const selectTransactionInputAndOutputTransfers = memoizeWithArgs(
 
         return { externalTransfers, internalTransfers, tokenTransfers };
     },
-    { size: 100 },
 );
diff --git a/suite-native/transactions/tsconfig.json b/suite-native/transactions/tsconfig.json
index 117463d22ca..b76f4993e1a 100644
--- a/suite-native/transactions/tsconfig.json
+++ b/suite-native/transactions/tsconfig.json
@@ -6,7 +6,7 @@
             "path": "../../suite-common/formatters"
         },
         {
-            "path": "../../suite-common/icons-deprecated"
+            "path": "../../suite-common/redux-utils"
         },
         {
             "path": "../../suite-common/suite-types"
@@ -30,6 +30,7 @@
         { "path": "../atoms" },
         { "path": "../formatters" },
         { "path": "../helpers" },
+        { "path": "../icons" },
         { "path": "../intl" },
         { "path": "../link" },
         { "path": "../navigation" },
diff --git a/suite-native/video-assets/package.json b/suite-native/video-assets/package.json
index e454504d74d..d54c5de993c 100644
--- a/suite-native/video-assets/package.json
+++ b/suite-native/video-assets/package.json
@@ -7,7 +7,6 @@
     "type": "module",
     "main": "src/index",
     "scripts": {
-        "lint:js": "yarn g:eslint '**/*.{ts,tsx,js}'",
         "depcheck": "yarn g:depcheck",
         "type-check": "yarn g:tsc --build",
         "generate-videos": "yarn g:tsx ./scripts/generateVideos.ts"
diff --git a/suite-native/video-assets/src/components/Video.tsx b/suite-native/video-assets/src/components/Video.tsx
index 9596bd9a051..75173120c00 100644
--- a/suite-native/video-assets/src/components/Video.tsx
+++ b/suite-native/video-assets/src/components/Video.tsx
@@ -25,7 +25,7 @@ const videoContainer = prepareNativeStyle((_, { aspectRatio }: VideoStyleProps)
 const videoStyle = prepareNativeStyle((utils, { aspectRatio }: VideoStyleProps) => ({
     flex: 1,
     aspectRatio,
-    borderRadius: utils.borders.radii.large,
+    borderRadius: utils.borders.radii.r20,
 }));
 
 const activityIndicatorStyle = prepareNativeStyle(_ => ({
diff --git a/tsconfig.json b/tsconfig.json
index b93626b2dcc..fd8d0ed4e63 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -68,6 +68,7 @@
         { "path": "suite-native/forms" },
         { "path": "suite-native/graph" },
         { "path": "suite-native/helpers" },
+        { "path": "suite-native/icons" },
         { "path": "suite-native/intl" },
         { "path": "suite-native/link" },
         { "path": "suite-native/message-system" },
@@ -89,6 +90,9 @@
         {
             "path": "suite-native/module-dev-utils"
         },
+        {
+            "path": "suite-native/module-device-settings"
+        },
         { "path": "suite-native/module-home" },
         {
             "path": "suite-native/module-onboarding"
@@ -120,6 +124,7 @@
         { "path": "suite-native/video-assets" },
         { "path": "packages/address-validator" },
         { "path": "packages/analytics" },
+        { "path": "packages/asset-utils" },
         { "path": "packages/auth-server" },
         { "path": "packages/blockchain-link" },
         {
@@ -133,12 +138,12 @@
         { "path": "packages/connect" },
         { "path": "packages/connect-analytics" },
         { "path": "packages/connect-common" },
-        { "path": "packages/connect-deeplink" },
         { "path": "packages/connect-explorer" },
         {
             "path": "packages/connect-explorer-theme"
         },
         { "path": "packages/connect-iframe" },
+        { "path": "packages/connect-mobile" },
         {
             "path": "packages/connect-plugin-ethereum"
         },
@@ -156,6 +161,7 @@
         { "path": "packages/dom-utils" },
         { "path": "packages/e2e-utils" },
         { "path": "packages/env-utils" },
+        { "path": "packages/eslint" },
         { "path": "packages/ipc-proxy" },
         { "path": "packages/node-utils" },
         { "path": "packages/product-components" },
@@ -192,9 +198,6 @@
         {
             "path": "packages/connect-examples/webextension-mv3-sw-ts"
         },
-        {
-            "path": "packages/connect-examples/deeplink-expo"
-        },
         {
             "path": "packages/connect-examples/electron-main-process"
         },
@@ -206,6 +209,9 @@
         },
         {
             "path": "packages/connect-examples/node"
+        },
+        {
+            "path": "packages/connect-examples/mobile-expo"
         }
     ]
 }
diff --git a/yarn.lock b/yarn.lock
index cec1ceb0070..edaca37370a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19,6 +19,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@adraffy/ens-normalize@npm:^1.8.8":
+  version: 1.11.0
+  resolution: "@adraffy/ens-normalize@npm:1.11.0"
+  checksum: 10/abef75f21470ea43dd6071168e092d2d13e38067e349e76186c78838ae174a46c3e18ca50921d05bea6ec3203074147c9e271f8cb6531d1c2c0e146f3199ddcb
+  languageName: node
+  linkType: hard
+
 "@alloc/quick-lru@npm:^5.2.0":
   version: 5.2.0
   resolution: "@alloc/quick-lru@npm:5.2.0"
@@ -1798,7 +1805,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.5, @babel/runtime@npm:^7.23.8, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.24.7, @babel/runtime@npm:^7.25.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.5, @babel/runtime@npm:^7.23.8, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.25.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
   version: 7.25.6
   resolution: "@babel/runtime@npm:7.25.6"
   dependencies:
@@ -2416,17 +2423,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@electron/notarize@npm:2.3.2":
-  version: 2.3.2
-  resolution: "@electron/notarize@npm:2.3.2"
-  dependencies:
-    debug: "npm:^4.1.1"
-    fs-extra: "npm:^9.0.1"
-    promise-retry: "npm:^2.0.1"
-  checksum: 10/c391c5b005496f3ad504fe323083d9ae1a14d4cbf7db03d7823b92dcad0815f9bd9d01732d9f748c933dae1b5d5ba98360df0ceedff4dd1814937376fc75be31
-  languageName: node
-  linkType: hard
-
 "@electron/notarize@npm:2.5.0":
   version: 2.5.0
   resolution: "@electron/notarize@npm:2.5.0"
@@ -2455,9 +2451,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@electron/rebuild@npm:3.6.0":
-  version: 3.6.0
-  resolution: "@electron/rebuild@npm:3.6.0"
+"@electron/rebuild@npm:3.6.1":
+  version: 3.6.1
+  resolution: "@electron/rebuild@npm:3.6.1"
   dependencies:
     "@malept/cross-spawn-promise": "npm:^2.0.0"
     chalk: "npm:^4.0.0"
@@ -2475,7 +2471,7 @@ __metadata:
     yargs: "npm:^17.0.1"
   bin:
     electron-rebuild: lib/cli.js
-  checksum: 10/bbc8f215059746874d194818785b47a96f3687539226c67074a4af5c4abd6e1e2339c5e91673d5b6312b98c37d056733af662bd68aba393a02e8b643035d08c7
+  checksum: 10/baedb09a8b109347fd1e7ee16559b4519ebc56a4ec624b3eec5215282a66def5fa4b96c19a26df0f53cd3ab60f077e88cd03429b46ddc63e70279f30c8e20c8a
   languageName: node
   linkType: hard
 
@@ -3336,44 +3332,68 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.6.1":
-  version: 4.11.0
-  resolution: "@eslint-community/regexpp@npm:4.11.0"
-  checksum: 10/f053f371c281ba173fe6ee16dbc4fe544c84870d58035ccca08dba7f6ce1830d895ce3237a0db89ba37616524775dca82f1c502066b58e2d5712d7f87f5ba17c
+"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.12.1":
+  version: 4.12.1
+  resolution: "@eslint-community/regexpp@npm:4.12.1"
+  checksum: 10/c08f1dd7dd18fbb60bdd0d85820656d1374dd898af9be7f82cb00451313402a22d5e30569c150315b4385907cdbca78c22389b2a72ab78883b3173be317620cc
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^2.1.4":
-  version: 2.1.4
-  resolution: "@eslint/eslintrc@npm:2.1.4"
+"@eslint/config-array@npm:^0.18.0":
+  version: 0.18.0
+  resolution: "@eslint/config-array@npm:0.18.0"
+  dependencies:
+    "@eslint/object-schema": "npm:^2.1.4"
+    debug: "npm:^4.3.1"
+    minimatch: "npm:^3.1.2"
+  checksum: 10/60ccad1eb4806710b085cd739568ec7afd289ee5af6ca0383f0876f9fe375559ef525f7b3f86bdb3f961493de952f2cf3ab4aa4a6ccaef0ae3cd688267cabcb3
+  languageName: node
+  linkType: hard
+
+"@eslint/core@npm:^0.7.0":
+  version: 0.7.0
+  resolution: "@eslint/core@npm:0.7.0"
+  checksum: 10/69227f33fddd9b402b7b0830732a6e84cae77d202cb5b56f0dbcc462882e07d00e80216b796cf2f243f5b775af3ef27545a0c439d78e66122eab71da4773b81c
+  languageName: node
+  linkType: hard
+
+"@eslint/eslintrc@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@eslint/eslintrc@npm:3.1.0"
   dependencies:
     ajv: "npm:^6.12.4"
     debug: "npm:^4.3.2"
-    espree: "npm:^9.6.0"
-    globals: "npm:^13.19.0"
+    espree: "npm:^10.0.1"
+    globals: "npm:^14.0.0"
     ignore: "npm:^5.2.0"
     import-fresh: "npm:^3.2.1"
     js-yaml: "npm:^4.1.0"
     minimatch: "npm:^3.1.2"
     strip-json-comments: "npm:^3.1.1"
-  checksum: 10/7a3b14f4b40fc1a22624c3f84d9f467a3d9ea1ca6e9a372116cb92507e485260359465b58e25bcb6c9981b155416b98c9973ad9b796053fd7b3f776a6946bce8
+  checksum: 10/02bf892d1397e1029209dea685e9f4f87baf643315df2a632b5f121ec7e8548a3b34f428a007234fa82772218fa8a3ac2d10328637b9ce63b7f8344035b74db3
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:8.56.0":
-  version: 8.56.0
-  resolution: "@eslint/js@npm:8.56.0"
-  checksum: 10/97a4b5ccf7e24f4d205a1fb0f21cdcd610348ecf685f6798a48dd41ba443f2c1eedd3050ff5a0b8f30b8cf6501ab512aa9b76e531db15e59c9ebaa41f3162e37
+"@eslint/js@npm:9.14.0, @eslint/js@npm:^9.13.0":
+  version: 9.14.0
+  resolution: "@eslint/js@npm:9.14.0"
+  checksum: 10/897e26bd68f898e56e96f85c92a1d823ef3d9f34e17d88d0ff40e88882ddae28d2f35915150c21cf640e0c64cb23703d0fbe6f7c9b9d6328aabe58ca30d9b4fe
   languageName: node
   linkType: hard
 
-"@ethereumjs/common@npm:2.6.5, @ethereumjs/common@npm:^2.6.4":
-  version: 2.6.5
-  resolution: "@ethereumjs/common@npm:2.6.5"
+"@eslint/object-schema@npm:^2.1.4":
+  version: 2.1.4
+  resolution: "@eslint/object-schema@npm:2.1.4"
+  checksum: 10/221e8d9f281c605948cd6e030874aacce83fe097f8f9c1964787037bccf08e82b7aa9eff1850a30fffac43f1d76555727ec22a2af479d91e268e89d1e035131e
+  languageName: node
+  linkType: hard
+
+"@eslint/plugin-kit@npm:^0.2.0":
+  version: 0.2.2
+  resolution: "@eslint/plugin-kit@npm:0.2.2"
   dependencies:
-    crc-32: "npm:^1.2.0"
-    ethereumjs-util: "npm:^7.1.5"
-  checksum: 10/e931e16cafc908b086492ca5fcbb1820fff3edfb83cfd4ae48002517b3be0d1f7622c750874b3b347c122d06372e133ddae44ac129b5ba141f68808a79430135
+    levn: "npm:^0.4.1"
+  checksum: 10/19ce7b8c991c7d17269044d64cd1f8e207b5ddf31290de65950cdaf4c78387467759ad0ca275708c11b85d90e649faf65618255ad310a532ef6dea7fe6326bf1
   languageName: node
   linkType: hard
 
@@ -3387,12 +3407,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/common@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "@ethereumjs/common@npm:4.3.0"
+"@ethereumjs/common@npm:^4.4.0":
+  version: 4.4.0
+  resolution: "@ethereumjs/common@npm:4.4.0"
   dependencies:
-    "@ethereumjs/util": "npm:^9.0.3"
-  checksum: 10/90f7fe1ba6827b65cd25e9bb4adf07a117ea554a950bb364d5fd9873cb770d383addb0ad34839a91fbec22ebc25516c6fb7e70ae0198c78f933920bf39797a94
+    "@ethereumjs/util": "npm:^9.1.0"
+  checksum: 10/dd5cc78575a762b367601f94d6af7e36cb3a5ecab45eec0c1259c433e755a16c867753aa88f331e3963791a18424ad0549682a3a6a0a160640fe846db6ce8014
   languageName: node
   linkType: hard
 
@@ -3414,16 +3434,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/tx@npm:3.5.2":
-  version: 3.5.2
-  resolution: "@ethereumjs/tx@npm:3.5.2"
-  dependencies:
-    "@ethereumjs/common": "npm:^2.6.4"
-    ethereumjs-util: "npm:^7.1.5"
-  checksum: 10/891e12738206229ac428685536844f7765e8547ae794462b1e406399445bf1f6f918af6ebc33ee5fa4a1340f14f48871a579f11c0e1d7c142ba0dd525bae5df5
-  languageName: node
-  linkType: hard
-
 "@ethereumjs/tx@npm:^4.2.0":
   version: 4.2.0
   resolution: "@ethereumjs/tx@npm:4.2.0"
@@ -3436,15 +3446,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/tx@npm:^5.3.0":
-  version: 5.3.0
-  resolution: "@ethereumjs/tx@npm:5.3.0"
+"@ethereumjs/tx@npm:^5.4.0":
+  version: 5.4.0
+  resolution: "@ethereumjs/tx@npm:5.4.0"
   dependencies:
-    "@ethereumjs/common": "npm:^4.3.0"
+    "@ethereumjs/common": "npm:^4.4.0"
     "@ethereumjs/rlp": "npm:^5.0.2"
-    "@ethereumjs/util": "npm:^9.0.3"
-    ethereum-cryptography: "npm:^2.1.3"
-  checksum: 10/4eb48e763d81ea0978648367d61c568c8d10f769c1ea7d32307ebe02299d4fa9fe5d7bf794ec1ee22e92edef6bfe1f459d5816e1c62d3f93602d931807ca488b
+    "@ethereumjs/util": "npm:^9.1.0"
+    ethereum-cryptography: "npm:^2.2.1"
+  checksum: 10/8d2c0a69ab37015f945f9de065cfb9f05e8e79179efeed725ea0a14760c3eb8ff900bcf915bb71ec29fe2f753db35d1b78a15ac4ddec489e87c995dec1ba6e85
   languageName: node
   linkType: hard
 
@@ -3459,232 +3469,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethereumjs/util@npm:^9.0.3":
-  version: 9.0.3
-  resolution: "@ethereumjs/util@npm:9.0.3"
+"@ethereumjs/util@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "@ethereumjs/util@npm:9.1.0"
   dependencies:
     "@ethereumjs/rlp": "npm:^5.0.2"
-    ethereum-cryptography: "npm:^2.1.3"
-  checksum: 10/d9c313a0672e0b4842ba80e2f413ccd5302c3942dc4ed718d6e3faab89c4eeeaaeb6661e9275679c22b83b1cb6502ea772e1c837d105b6a9faf5957a59bc3e4c
-  languageName: node
-  linkType: hard
-
-"@ethersproject/abi@npm:^5.6.3":
-  version: 5.7.0
-  resolution: "@ethersproject/abi@npm:5.7.0"
-  dependencies:
-    "@ethersproject/address": "npm:^5.7.0"
-    "@ethersproject/bignumber": "npm:^5.7.0"
-    "@ethersproject/bytes": "npm:^5.7.0"
-    "@ethersproject/constants": "npm:^5.7.0"
-    "@ethersproject/hash": "npm:^5.7.0"
-    "@ethersproject/keccak256": "npm:^5.7.0"
-    "@ethersproject/logger": "npm:^5.7.0"
-    "@ethersproject/properties": "npm:^5.7.0"
-    "@ethersproject/strings": "npm:^5.7.0"
-  checksum: 10/6ed002cbc61a7e21bc0182702345659c1984f6f8e6bad166e43aee76ea8f74766dd0f6236574a868e1b4600af27972bf25b973fae7877ae8da3afa90d3965cac
+    ethereum-cryptography: "npm:^2.2.1"
+  checksum: 10/4e22c4081c63eebb808eccd54f7f91cd3407f4cac192da5f30a0d6983fe07d51f25e6a9d08624f1376e604bb7dce574aafcf0fbf0becf42f62687c11e710ac41
   languageName: node
   linkType: hard
 
-"@ethersproject/abstract-provider@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/abstract-provider@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bignumber": "npm:^5.7.0"
-    "@ethersproject/bytes": "npm:^5.7.0"
-    "@ethersproject/logger": "npm:^5.7.0"
-    "@ethersproject/networks": "npm:^5.7.0"
-    "@ethersproject/properties": "npm:^5.7.0"
-    "@ethersproject/transactions": "npm:^5.7.0"
-    "@ethersproject/web": "npm:^5.7.0"
-  checksum: 10/c03e413a812486002525f4036bf2cb90e77a19b98fa3d16279e28e0a05520a1085690fac2ee9f94b7931b9a803249ff8a8bbb26ff8dee52196a6ef7a3fc5edc5
-  languageName: node
-  linkType: hard
-
-"@ethersproject/abstract-signer@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/abstract-signer@npm:5.7.0"
-  dependencies:
-    "@ethersproject/abstract-provider": "npm:^5.7.0"
-    "@ethersproject/bignumber": "npm:^5.7.0"
-    "@ethersproject/bytes": "npm:^5.7.0"
-    "@ethersproject/logger": "npm:^5.7.0"
-    "@ethersproject/properties": "npm:^5.7.0"
-  checksum: 10/0a6ffade0a947c9ba617048334e1346838f394d1d0a5307ac435a0c63ed1033b247e25ffb0cd6880d7dcf5459581f52f67e3804ebba42ff462050f1e4321ba0c
-  languageName: node
-  linkType: hard
-
-"@ethersproject/address@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/address@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bignumber": "npm:^5.7.0"
-    "@ethersproject/bytes": "npm:^5.7.0"
-    "@ethersproject/keccak256": "npm:^5.7.0"
-    "@ethersproject/logger": "npm:^5.7.0"
-    "@ethersproject/rlp": "npm:^5.7.0"
-  checksum: 10/1ac4f3693622ed9fbbd7e966a941ec1eba0d9445e6e8154b1daf8e93b8f62ad91853d1de5facf4c27b41e6f1e47b94a317a2492ba595bee1841fd3030c3e9a27
-  languageName: node
-  linkType: hard
-
-"@ethersproject/base64@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/base64@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": "npm:^5.7.0"
-  checksum: 10/7105105f401e1c681e61db1e9da1b5960d8c5fbd262bbcacc99d61dbb9674a9db1181bb31903d98609f10e8a0eb64c850475f3b040d67dea953e2b0ac6380e96
-  languageName: node
-  linkType: hard
-
-"@ethersproject/bignumber@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/bignumber@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": "npm:^5.7.0"
-    "@ethersproject/logger": "npm:^5.7.0"
-    bn.js: "npm:^5.2.1"
-  checksum: 10/09cffa18a9f0730856b57c14c345bd68ba451159417e5aff684a8808011cd03b27b7c465d423370333a7d1c9a621392fc74f064a3b02c9edc49ebe497da6d45d
-  languageName: node
-  linkType: hard
-
-"@ethersproject/bytes@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/bytes@npm:5.7.0"
-  dependencies:
-    "@ethersproject/logger": "npm:^5.7.0"
-  checksum: 10/8b3ffedb68c1a82cfb875e9738361409cc33e2dcb1286b6ccfdc4dd8dd0317f7eacc8937b736c467d213dffc44b469690fe1a951e901953d5a90c5af2b675ae4
-  languageName: node
-  linkType: hard
-
-"@ethersproject/constants@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/constants@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bignumber": "npm:^5.7.0"
-  checksum: 10/6d4b1355747cce837b3e76ec3bde70e4732736f23b04f196f706ebfa5d4d9c2be50904a390d4d40ce77803b98d03d16a9b6898418e04ba63491933ce08c4ba8a
-  languageName: node
-  linkType: hard
-
-"@ethersproject/hash@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/hash@npm:5.7.0"
-  dependencies:
-    "@ethersproject/abstract-signer": "npm:^5.7.0"
-    "@ethersproject/address": "npm:^5.7.0"
-    "@ethersproject/base64": "npm:^5.7.0"
-    "@ethersproject/bignumber": "npm:^5.7.0"
-    "@ethersproject/bytes": "npm:^5.7.0"
-    "@ethersproject/keccak256": "npm:^5.7.0"
-    "@ethersproject/logger": "npm:^5.7.0"
-    "@ethersproject/properties": "npm:^5.7.0"
-    "@ethersproject/strings": "npm:^5.7.0"
-  checksum: 10/d83de3f3a1b99b404a2e7bb503f5cdd90c66a97a32cce1d36b09bb8e3fb7205b96e30ad28e2b9f30083beea6269b157d0c6e3425052bb17c0a35fddfdd1c72a3
-  languageName: node
-  linkType: hard
-
-"@ethersproject/keccak256@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/keccak256@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": "npm:^5.7.0"
-    js-sha3: "npm:0.8.0"
-  checksum: 10/ff70950d82203aab29ccda2553422cbac2e7a0c15c986bd20a69b13606ed8bb6e4fdd7b67b8d3b27d4f841e8222cbaccd33ed34be29f866fec7308f96ed244c6
-  languageName: node
-  linkType: hard
-
-"@ethersproject/logger@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/logger@npm:5.7.0"
-  checksum: 10/683a939f467ae7510deedc23d7611d0932c3046137f5ffb92ba1e3c8cd9cf2fbbaa676b660c248441a0fa9143783137c46d6e6d17d676188dd5a6ef0b72dd091
-  languageName: node
-  linkType: hard
-
-"@ethersproject/networks@npm:^5.7.0":
-  version: 5.7.1
-  resolution: "@ethersproject/networks@npm:5.7.1"
-  dependencies:
-    "@ethersproject/logger": "npm:^5.7.0"
-  checksum: 10/5265d0b4b72ef91af57be804b44507f4943038d609699764d8a69157ed381e30fe22ebf63630ed8e530ceb220f15d69dae8cda2e5023ccd793285c9d5882e599
-  languageName: node
-  linkType: hard
-
-"@ethersproject/properties@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/properties@npm:5.7.0"
-  dependencies:
-    "@ethersproject/logger": "npm:^5.7.0"
-  checksum: 10/f8401a161940aa1c32695115a20c65357877002a6f7dc13ab1600064bf54d7b825b4db49de8dc8da69efcbb0c9f34f8813e1540427e63e262ab841c1bf6c1c1e
-  languageName: node
-  linkType: hard
-
-"@ethersproject/rlp@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/rlp@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": "npm:^5.7.0"
-    "@ethersproject/logger": "npm:^5.7.0"
-  checksum: 10/3b8c5279f7654794d5874569f5598ae6a880e19e6616013a31e26c35c5f586851593a6e85c05ed7b391fbc74a1ea8612dd4d867daefe701bf4e8fcf2ab2f29b9
-  languageName: node
-  linkType: hard
-
-"@ethersproject/signing-key@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/signing-key@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": "npm:^5.7.0"
-    "@ethersproject/logger": "npm:^5.7.0"
-    "@ethersproject/properties": "npm:^5.7.0"
-    bn.js: "npm:^5.2.1"
-    elliptic: "npm:6.5.4"
-    hash.js: "npm:1.1.7"
-  checksum: 10/ff2f79ded86232b139e7538e4aaa294c6022a7aaa8c95a6379dd7b7c10a6d363685c6967c816f98f609581cf01f0a5943c667af89a154a00bcfe093a8c7f3ce7
-  languageName: node
-  linkType: hard
-
-"@ethersproject/strings@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/strings@npm:5.7.0"
-  dependencies:
-    "@ethersproject/bytes": "npm:^5.7.0"
-    "@ethersproject/constants": "npm:^5.7.0"
-    "@ethersproject/logger": "npm:^5.7.0"
-  checksum: 10/24191bf30e98d434a9fba2f522784f65162d6712bc3e1ccc98ed85c5da5884cfdb5a1376b7695374655a7b95ec1f5fdbeef5afc7d0ea77ffeb78047e9b791fa5
-  languageName: node
-  linkType: hard
-
-"@ethersproject/transactions@npm:^5.6.2, @ethersproject/transactions@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "@ethersproject/transactions@npm:5.7.0"
-  dependencies:
-    "@ethersproject/address": "npm:^5.7.0"
-    "@ethersproject/bignumber": "npm:^5.7.0"
-    "@ethersproject/bytes": "npm:^5.7.0"
-    "@ethersproject/constants": "npm:^5.7.0"
-    "@ethersproject/keccak256": "npm:^5.7.0"
-    "@ethersproject/logger": "npm:^5.7.0"
-    "@ethersproject/properties": "npm:^5.7.0"
-    "@ethersproject/rlp": "npm:^5.7.0"
-    "@ethersproject/signing-key": "npm:^5.7.0"
-  checksum: 10/d809e9d40020004b7de9e34bf39c50377dce8ed417cdf001bfabc81ecb1b7d1e0c808fdca0a339ea05e1b380648eaf336fe70f137904df2d3c3135a38190a5af
-  languageName: node
-  linkType: hard
-
-"@ethersproject/web@npm:^5.7.0":
-  version: 5.7.1
-  resolution: "@ethersproject/web@npm:5.7.1"
-  dependencies:
-    "@ethersproject/base64": "npm:^5.7.0"
-    "@ethersproject/bytes": "npm:^5.7.0"
-    "@ethersproject/logger": "npm:^5.7.0"
-    "@ethersproject/properties": "npm:^5.7.0"
-    "@ethersproject/strings": "npm:^5.7.0"
-  checksum: 10/c83b6b3ac40573ddb67b1750bb4cf21ded7d8555be5e53a97c0f34964622fd88de9220a90a118434bae164a2bff3acbdc5ecb990517b5f6dc32bdad7adf604c2
-  languageName: node
-  linkType: hard
-
-"@everstake/wallet-sdk@npm:^0.3.49":
-  version: 0.3.49
-  resolution: "@everstake/wallet-sdk@npm:0.3.49"
+"@everstake/wallet-sdk@npm:^0.3.66":
+  version: 0.3.66
+  resolution: "@everstake/wallet-sdk@npm:0.3.66"
   dependencies:
     "@cosmjs/stargate": "npm:^0.30.1"
     "@mysten/sui.js": "npm:^0.46.1"
@@ -3695,8 +3492,8 @@ __metadata:
     bignumber.js: "npm:^9.1.2"
     bip39: "npm:^3.1.0"
     bs58: "npm:^5.0.0"
-    web3: "npm:^1.9.0"
-  checksum: 10/75791291d9bbf417746c5794b8f3e3cfdaeace05a46d2861adcf725eaaab08fbd9c501c1a62918da98ebbd41d0f8e61d9cd8f6085a60426f09238e7e3a14b4e5
+    web3: "npm:^4.14.0"
+  checksum: 10/035e4ac89b5d2d48c4731382e4bf03bc3b6c7e66a5c72a58629f3528eb8b6c6ad91f0eae392e6cdcd5b601d3b72d73f1b94cb8266c64267546a9ebda7189cf3d
   languageName: node
   linkType: hard
 
@@ -3947,6 +3744,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@expo/fingerprint@npm:^0.10.2":
+  version: 0.10.3
+  resolution: "@expo/fingerprint@npm:0.10.3"
+  dependencies:
+    "@expo/spawn-async": "npm:^1.7.2"
+    chalk: "npm:^4.1.2"
+    debug: "npm:^4.3.4"
+    find-up: "npm:^5.0.0"
+    minimatch: "npm:^3.0.4"
+    p-limit: "npm:^3.1.0"
+    resolve-from: "npm:^5.0.0"
+    semver: "npm:^7.6.0"
+  bin:
+    fingerprint: bin/cli.js
+  checksum: 10/fc39ed83ac9e2c9f9c9903f85ca5bb3b920740ffaa6b2a742af6563c1bec431b4c56c20f595c0b9931cf645e952dcc2f5deba948b60deacde510e695f27000f6
+  languageName: node
+  linkType: hard
+
 "@expo/fingerprint@npm:^0.6.0":
   version: 0.6.0
   resolution: "@expo/fingerprint@npm:0.6.0"
@@ -4468,10 +4283,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@gar/promisify@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "@gar/promisify@npm:1.1.3"
-  checksum: 10/052dd232140fa60e81588000cbe729a40146579b361f1070bce63e2a761388a22a16d00beeffc504bd3601cb8e055c57b21a185448b3ed550cf50716f4fd442e
+"@gorhom/bottom-sheet@npm:5.0.5":
+  version: 5.0.5
+  resolution: "@gorhom/bottom-sheet@npm:5.0.5"
+  dependencies:
+    "@gorhom/portal": "npm:1.0.14"
+    invariant: "npm:^2.2.4"
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-native": "*"
+    react: "*"
+    react-native: "*"
+    react-native-gesture-handler: ">=2.16.1"
+    react-native-reanimated: ">=3.10.1"
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-native":
+      optional: true
+  checksum: 10/4c972e5c4459dce02858c4b5af691e412e8075e1cbfe049ae7d308746173ba27c3802d867eb54a94a804987d3d9e78f5886dc5a3f4163fb19ca2a91b4ad44864
+  languageName: node
+  linkType: hard
+
+"@gorhom/portal@npm:1.0.14":
+  version: 1.0.14
+  resolution: "@gorhom/portal@npm:1.0.14"
+  dependencies:
+    nanoid: "npm:^3.3.1"
+  peerDependencies:
+    react: "*"
+    react-native: "*"
+  checksum: 10/e0fa06be88b850cccdc6a1417a86e5ac21d82e3bfd1cec7eb05eccf7f3b595babe305541f278fdcbde34f3a9db465097dca2c785445c28bafb83b744e235da0c
   languageName: node
   linkType: hard
 
@@ -4524,23 +4366,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hookform/resolvers@npm:3.9.0":
-  version: 3.9.0
-  resolution: "@hookform/resolvers@npm:3.9.0"
+"@hookform/resolvers@npm:3.9.1":
+  version: 3.9.1
+  resolution: "@hookform/resolvers@npm:3.9.1"
   peerDependencies:
     react-hook-form: ^7.0.0
-  checksum: 10/b878e92cebc703106a70987437ab4add0e71a327a0bb9864f82ab480b5d9a38b0d639f6154b138c3c4828af0db00c1b413279c102715146b19edc76b9786f1c3
+  checksum: 10/4e7a24f79ead48db5c869c17b5f47412a7d628939f743bdc1248ea3a291b1a9dd777cd02f84326e91d258283a6351566f13bca5cb30f996e5a9db7ee490b5cc5
+  languageName: node
+  linkType: hard
+
+"@humanfs/core@npm:^0.19.1":
+  version: 0.19.1
+  resolution: "@humanfs/core@npm:0.19.1"
+  checksum: 10/270d936be483ab5921702623bc74ce394bf12abbf57d9145a69e8a0d1c87eb1c768bd2d93af16c5705041e257e6d9cc7529311f63a1349f3678abc776fc28523
   languageName: node
   linkType: hard
 
-"@humanwhocodes/config-array@npm:^0.11.13":
-  version: 0.11.13
-  resolution: "@humanwhocodes/config-array@npm:0.11.13"
+"@humanfs/node@npm:^0.16.6":
+  version: 0.16.6
+  resolution: "@humanfs/node@npm:0.16.6"
   dependencies:
-    "@humanwhocodes/object-schema": "npm:^2.0.1"
-    debug: "npm:^4.1.1"
-    minimatch: "npm:^3.0.5"
-  checksum: 10/9f655e1df7efa5a86822cd149ca5cef57240bb8ffd728f0c07cc682cc0a15c6bdce68425fbfd58f9b3e8b16f79b3fd8cb1e96b10c434c9a76f20b2a89f213272
+    "@humanfs/core": "npm:^0.19.1"
+    "@humanwhocodes/retry": "npm:^0.3.0"
+  checksum: 10/6d43c6727463772d05610aa05c83dab2bfbe78291022ee7a92cb50999910b8c720c76cc312822e2dea2b497aa1b3fef5fe9f68803fc45c9d4ed105874a65e339
   languageName: node
   linkType: hard
 
@@ -4551,10 +4399,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@humanwhocodes/object-schema@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@humanwhocodes/object-schema@npm:2.0.1"
-  checksum: 10/dbddfd0465aecf92ed845ec30d06dba3f7bb2496d544b33b53dac7abc40370c0e46b8787b268d24a366730d5eeb5336ac88967232072a183905ee4abf7df4dab
+"@humanwhocodes/retry@npm:^0.3.0":
+  version: 0.3.1
+  resolution: "@humanwhocodes/retry@npm:0.3.1"
+  checksum: 10/eb457f699529de7f07649679ec9e0353055eebe443c2efe71c6dd950258892475a038e13c6a8c5e13ed1fb538cdd0a8794faa96b24b6ffc4c87fb1fc9f70ad7f
+  languageName: node
+  linkType: hard
+
+"@humanwhocodes/retry@npm:^0.4.0":
+  version: 0.4.1
+  resolution: "@humanwhocodes/retry@npm:0.4.1"
+  checksum: 10/39fafc7319e88f61befebd5e1b4f0136534ea6a9bd10d74366698187bd63544210ec5d79a87ed4d91297f1cc64c4c53d45fb0077a2abfdce212cf0d3862d5f04
   languageName: node
   linkType: hard
 
@@ -5145,9 +5000,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/eth-sig-util@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "@metamask/eth-sig-util@npm:7.0.3"
+"@metamask/eth-sig-util@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "@metamask/eth-sig-util@npm:8.0.0"
   dependencies:
     "@ethereumjs/util": "npm:^8.1.0"
     "@metamask/abi-utils": "npm:^2.0.4"
@@ -5155,7 +5010,7 @@ __metadata:
     "@scure/base": "npm:~1.1.3"
     ethereum-cryptography: "npm:^2.1.2"
     tweetnacl: "npm:^1.0.3"
-  checksum: 10/a71b28607b0815d609cf27ab2d8535393d0a7e7f2c6b7a23d92669b770c664c14e2f539129351147339172b0bb865bb977e7cfb30624870eedab5d7ab700beff
+  checksum: 10/5de92bc59df31bcf417ecbdfd2b47f15c21b29454f45108513c55d9c005b7cb51373e9d254bd97533603ab7c7758fdf8fc5159612f366b05f92ebe5beb6d75d8
   languageName: node
   linkType: hard
 
@@ -5424,16 +5279,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@noble/curves@npm:1.3.0, @noble/curves@npm:~1.3.0":
-  version: 1.3.0
-  resolution: "@noble/curves@npm:1.3.0"
-  dependencies:
-    "@noble/hashes": "npm:1.3.3"
-  checksum: 10/f3cbdd1af00179e30146eac5539e6df290228fb857a7a8ba36d1a772cbe59288a2ca83d06f175d3446ef00db3a80d7fd8b8347f7de9c2d4d5bf3865d8bb78252
-  languageName: node
-  linkType: hard
-
-"@noble/curves@npm:^1.1.0, @noble/curves@npm:^1.4.2":
+"@noble/curves@npm:1.4.2, @noble/curves@npm:^1.1.0, @noble/curves@npm:^1.4.2, @noble/curves@npm:~1.4.0":
   version: 1.4.2
   resolution: "@noble/curves@npm:1.4.2"
   dependencies:
@@ -5442,14 +5288,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@noble/hashes@npm:1.3.3, @noble/hashes@npm:~1.3.0, @noble/hashes@npm:~1.3.2":
+"@noble/hashes@npm:1.3.3, @noble/hashes@npm:~1.3.0":
   version: 1.3.3
   resolution: "@noble/hashes@npm:1.3.3"
   checksum: 10/1025ddde4d24630e95c0818e63d2d54ee131b980fe113312d17ed7468bc18f54486ac86c907685759f8a7e13c2f9b9e83ec7b67d1cc20836f36b5e4a65bb102d
   languageName: node
   linkType: hard
 
-"@noble/hashes@npm:1.4.0, @noble/hashes@npm:^1, @noble/hashes@npm:^1.0.0, @noble/hashes@npm:^1.2.0, @noble/hashes@npm:^1.3.1, @noble/hashes@npm:^1.3.2, @noble/hashes@npm:^1.4.0":
+"@noble/hashes@npm:1.4.0, @noble/hashes@npm:^1, @noble/hashes@npm:^1.0.0, @noble/hashes@npm:^1.2.0, @noble/hashes@npm:^1.3.1, @noble/hashes@npm:^1.3.2, @noble/hashes@npm:^1.4.0, @noble/hashes@npm:~1.4.0":
   version: 1.4.0
   resolution: "@noble/hashes@npm:1.4.0"
   checksum: 10/e156e65794c473794c52fa9d06baf1eb20903d0d96719530f523cc4450f6c721a957c544796e6efd0197b2296e7cd70efeb312f861465e17940a3e3c7e0febc6
@@ -5473,7 +5319,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8":
+"@nodelib/fs.walk@npm:^1.2.3":
   version: 1.2.8
   resolution: "@nodelib/fs.walk@npm:1.2.8"
   dependencies:
@@ -5483,6 +5329,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@npmcli/agent@npm:^2.0.0":
+  version: 2.2.2
+  resolution: "@npmcli/agent@npm:2.2.2"
+  dependencies:
+    agent-base: "npm:^7.1.0"
+    http-proxy-agent: "npm:^7.0.0"
+    https-proxy-agent: "npm:^7.0.1"
+    lru-cache: "npm:^10.0.1"
+    socks-proxy-agent: "npm:^8.0.3"
+  checksum: 10/96fc0036b101bae5032dc2a4cd832efb815ce9b33f9ee2f29909ee49d96a0026b3565f73c507a69eb8603f5cb32e0ae45a70cab1e2655990a4e06ae99f7f572a
+  languageName: node
+  linkType: hard
+
 "@npmcli/config@npm:^8.0.0":
   version: 8.2.0
   resolution: "@npmcli/config@npm:8.2.0"
@@ -5499,16 +5358,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@npmcli/fs@npm:^2.1.0":
-  version: 2.1.2
-  resolution: "@npmcli/fs@npm:2.1.2"
-  dependencies:
-    "@gar/promisify": "npm:^1.1.3"
-    semver: "npm:^7.3.5"
-  checksum: 10/c5d4dfee80de2236e1e4ed595d17e217aada72ebd8215183fc46096fa010f583dd2aaaa486758de7cc0b89440dbc31cfe8b276269d75d47af35c716e896f78ec
-  languageName: node
-  linkType: hard
-
 "@npmcli/fs@npm:^3.1.0":
   version: 3.1.1
   resolution: "@npmcli/fs@npm:3.1.1"
@@ -5530,16 +5379,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@npmcli/move-file@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "@npmcli/move-file@npm:2.0.1"
-  dependencies:
-    mkdirp: "npm:^1.0.4"
-    rimraf: "npm:^3.0.2"
-  checksum: 10/52dc02259d98da517fae4cb3a0a3850227bdae4939dda1980b788a7670636ca2b4a01b58df03dd5f65c1e3cb70c50fa8ce5762b582b3f499ec30ee5ce1fd9380
-  languageName: node
-  linkType: hard
-
 "@npmcli/name-from-folder@npm:^2.0.0":
   version: 2.0.0
   resolution: "@npmcli/name-from-folder@npm:2.0.0"
@@ -7629,6 +7468,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rtsao/scc@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@rtsao/scc@npm:1.1.0"
+  checksum: 10/17d04adf404e04c1e61391ed97bca5117d4c2767a76ae3e879390d6dec7b317fcae68afbf9e98badee075d0b64fa60f287729c4942021b4d19cd01db77385c01
+  languageName: node
+  linkType: hard
+
 "@sagold/json-pointer@npm:^5.1.1, @sagold/json-pointer@npm:^5.1.2":
   version: 5.1.2
   resolution: "@sagold/json-pointer@npm:5.1.2"
@@ -7646,21 +7492,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@scure/base@npm:^1.1.3, @scure/base@npm:~1.1.0, @scure/base@npm:~1.1.3, @scure/base@npm:~1.1.4":
-  version: 1.1.7
-  resolution: "@scure/base@npm:1.1.7"
-  checksum: 10/fc50ffaab36cb46ff9fa4dc5052a06089ab6a6707f63d596bb34aaaec76173c9a564ac312a0b981b5e7a5349d60097b8878673c75d6cbfc4da7012b63a82099b
+"@scure/base@npm:^1.1.3, @scure/base@npm:~1.1.0, @scure/base@npm:~1.1.3, @scure/base@npm:~1.1.6":
+  version: 1.1.9
+  resolution: "@scure/base@npm:1.1.9"
+  checksum: 10/f0ab7f687bbcdee2a01377fe3cd808bf63977999672751295b6a92625d5322f4754a96d40f6bd579bc367aad48ecf8a4e6d0390e70296e6ded1076f52adb16bb
   languageName: node
   linkType: hard
 
-"@scure/bip32@npm:1.3.3, @scure/bip32@npm:^1.3.1":
-  version: 1.3.3
-  resolution: "@scure/bip32@npm:1.3.3"
+"@scure/bip32@npm:1.4.0, @scure/bip32@npm:^1.3.1":
+  version: 1.4.0
+  resolution: "@scure/bip32@npm:1.4.0"
   dependencies:
-    "@noble/curves": "npm:~1.3.0"
-    "@noble/hashes": "npm:~1.3.2"
-    "@scure/base": "npm:~1.1.4"
-  checksum: 10/4b8b75567866ff7d6b3ba154538add02d2951e9433e8dd7f0014331ac500cda5a88fe3d39b408fcc36e86b633682013f172b967af022c2e4e4ab07336801d688
+    "@noble/curves": "npm:~1.4.0"
+    "@noble/hashes": "npm:~1.4.0"
+    "@scure/base": "npm:~1.1.6"
+  checksum: 10/6cd5062d902564d9e970597ec8b1adacb415b2eadfbb95aee1a1a0480a52eb0de4d294d3753aa8b48548064c9795ed108d348a31a8ce3fc88785377bb12c63b9
   languageName: node
   linkType: hard
 
@@ -7674,13 +7520,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@scure/bip39@npm:1.2.2, @scure/bip39@npm:^1.2.1":
-  version: 1.2.2
-  resolution: "@scure/bip39@npm:1.2.2"
+"@scure/bip39@npm:1.3.0, @scure/bip39@npm:^1.2.1":
+  version: 1.3.0
+  resolution: "@scure/bip39@npm:1.3.0"
   dependencies:
-    "@noble/hashes": "npm:~1.3.2"
-    "@scure/base": "npm:~1.1.4"
-  checksum: 10/f71aceda10a7937bf3779fd2b4c4156c95ec9813269470ddca464cb8ab610d2451b173037f4b1e6dac45414e406e7adc7b5814c51279f4474d5d38140bbee542
+    "@noble/hashes": "npm:~1.4.0"
+    "@scure/base": "npm:~1.1.6"
+  checksum: 10/7d71fd58153de22fe8cd65b525f6958a80487bc9d0fbc32c71c328aeafe41fa259f989d2f1e0fa4fdfeaf83b8fcf9310d52ed9862987e46c2f2bfb9dd8cf9fc1
   languageName: node
   linkType: hard
 
@@ -8225,7 +8071,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sindresorhus/is@npm:^4.0.0, @sindresorhus/is@npm:^4.6.0":
+"@sindresorhus/is@npm:^4.0.0":
   version: 4.6.0
   resolution: "@sindresorhus/is@npm:4.6.0"
   checksum: 10/e7f36ed72abfcd5e0355f7423a72918b9748bb1ef370a59f3e5ad8d40b728b85d63b272f65f63eec1faf417cda89dcb0aeebe94015647b6054659c1442fe5ce0
@@ -8273,11 +8119,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@solana/web3.js@npm:^1.75.0, @solana/web3.js@npm:^1.95.0":
-  version: 1.95.0
-  resolution: "@solana/web3.js@npm:1.95.0"
+"@solana/web3.js@npm:^1.75.0, @solana/web3.js@npm:^1.95.4":
+  version: 1.95.4
+  resolution: "@solana/web3.js@npm:1.95.4"
   dependencies:
-    "@babel/runtime": "npm:^7.24.7"
+    "@babel/runtime": "npm:^7.25.0"
     "@noble/curves": "npm:^1.4.2"
     "@noble/hashes": "npm:^1.4.0"
     "@solana/buffer-layout": "npm:^4.0.1"
@@ -8288,26 +8134,26 @@ __metadata:
     bs58: "npm:^4.0.1"
     buffer: "npm:6.0.3"
     fast-stable-stringify: "npm:^1.0.0"
-    jayson: "npm:^4.1.0"
+    jayson: "npm:^4.1.1"
     node-fetch: "npm:^2.7.0"
     rpc-websockets: "npm:^9.0.2"
     superstruct: "npm:^2.0.2"
-  checksum: 10/24837dbbc00203c8396a6d43b17fecec337f64e1cadc0f7155408062d540cd3fbfb64d044ac14e2ef09c48e4b3d273634fa3954f9dfccf2af1535e249ade750c
+  checksum: 10/353e04ac1110035ff108f16af4029c7a98f71cce841d45877c9bc4a354cdc58a051681603c92289b81e3dc5ef6b1567c6f866e4ba56a434db145e38a5a41d276
   languageName: node
   linkType: hard
 
-"@stellar/js-xdr@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "@stellar/js-xdr@npm:3.1.1"
-  checksum: 10/3bc8ee3f1611b55938ef0249b7a90b3d689177d45b4c8c24c5562b8fe32372148f7544a0aab67776f4c7b95aef8cb0f97606b86ec800bb087302ff404cb8ccbc
+"@stellar/js-xdr@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "@stellar/js-xdr@npm:3.1.2"
+  checksum: 10/96b5c52088bb2f2cc11a04ee1766ceb9431bdb0195058b9bc8d60cd1459772c2be6a9aa1bf69ba8b7589cfaf71beef96890e60d7fd7de0332c11ae1917f95440
   languageName: node
   linkType: hard
 
-"@stellar/stellar-base@npm:^12.0.1":
-  version: 12.0.1
-  resolution: "@stellar/stellar-base@npm:12.0.1"
+"@stellar/stellar-base@npm:^12.1.1":
+  version: 12.1.1
+  resolution: "@stellar/stellar-base@npm:12.1.1"
   dependencies:
-    "@stellar/js-xdr": "npm:^3.1.1"
+    "@stellar/js-xdr": "npm:^3.1.2"
     base32.js: "npm:^0.1.0"
     bignumber.js: "npm:^9.1.2"
     buffer: "npm:^6.0.3"
@@ -8317,22 +8163,22 @@ __metadata:
   dependenciesMeta:
     sodium-native:
       optional: true
-  checksum: 10/5185ef4a747ac6c037efc82b784fd3f41e0aaccd17ed6adb63b460e2938c29a9ef6d8f9d082fcc14420b6385ec08c55fc59ced34776a0bcab859f9bc31be72f2
+  checksum: 10/6376f8c61a4299d5951acd0ed84b36e4c8dafeb0fab339acd314f9639c99a5059cce666410e8d2a825ea0daf4c19b91b504814eb1a5af40ba7c425f0124326e3
   languageName: node
   linkType: hard
 
-"@stellar/stellar-sdk@npm:^12.1.0":
-  version: 12.1.0
-  resolution: "@stellar/stellar-sdk@npm:12.1.0"
+"@stellar/stellar-sdk@npm:^12.1.3":
+  version: 12.3.0
+  resolution: "@stellar/stellar-sdk@npm:12.3.0"
   dependencies:
-    "@stellar/stellar-base": "npm:^12.0.1"
-    axios: "npm:^1.7.2"
+    "@stellar/stellar-base": "npm:^12.1.1"
+    axios: "npm:^1.7.7"
     bignumber.js: "npm:^9.1.2"
     eventsource: "npm:^2.0.2"
     randombytes: "npm:^2.1.0"
     toml: "npm:^3.0.0"
     urijs: "npm:^1.19.1"
-  checksum: 10/bb4455261320f9718d415eca9cfc2228edabbc28c4fd768fe23a5abc64254600c9c4db13a2f7dd417991222805e8ab77df63ab5504b44f325b5c5a5c958dde96
+  checksum: 10/47a609172e583d462785bf5f865c33dee8b59e9828cfc2056c22d867121aeba76b5464ec0e871dc0b6656a9d8252e3efeea96878db3e558b2249dfe60e0cd9b5
   languageName: node
   linkType: hard
 
@@ -8588,6 +8434,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/client-logger@npm:7.6.20":
+  version: 7.6.20
+  resolution: "@storybook/client-logger@npm:7.6.20"
+  dependencies:
+    "@storybook/global": "npm:^5.0.0"
+  checksum: 10/0062c440c825ab460667d799b00d3ff87dcf4dabce05733c11ffbb1ea70e0a2e77fdc313ce9bdeccc4ac816101abe17572b96cc20c975874812f875828653704
+  languageName: node
+  linkType: hard
+
 "@storybook/codemod@npm:7.6.13":
   version: 7.6.13
   resolution: "@storybook/codemod@npm:7.6.13"
@@ -9025,6 +8880,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@storybook/theming@npm:^7.6.13":
+  version: 7.6.20
+  resolution: "@storybook/theming@npm:7.6.20"
+  dependencies:
+    "@emotion/use-insertion-effect-with-fallbacks": "npm:^1.0.0"
+    "@storybook/client-logger": "npm:7.6.20"
+    "@storybook/global": "npm:^5.0.0"
+    memoizerific: "npm:^1.11.3"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  checksum: 10/c26ba05d8fa1ba6c9d62b1d690dc55ba56874c493a7dfef5e85df89fc1da2ce8be09d7426071e43dbb3bf16ca4bc579a94f8f1a1ab14cfd29465a6a6eca5b158
+  languageName: node
+  linkType: hard
+
 "@storybook/types@npm:7.6.13":
   version: 7.6.13
   resolution: "@storybook/types@npm:7.6.13"
@@ -9149,18 +9019,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@suite-common/icons-deprecated@workspace:suite-common/icons-deprecated"
   dependencies:
-    "@shopify/react-native-skia": "npm:1.3.11"
-    "@suite-common/wallet-config": "workspace:*"
-    "@suite-common/wallet-types": "workspace:*"
-    "@trezor/connect": "workspace:*"
-    "@trezor/styles": "workspace:*"
-    "@trezor/theme": "workspace:*"
     prettier: "npm:^3.3.2"
-    react: "npm:18.2.0"
-    react-native: "npm:0.75.2"
-    react-native-reanimated: "npm:3.15.0"
     sharp: "npm:0.32.6"
-    styled-components: "npm:^6.1.8"
     svgo: "npm:3.2.0"
   languageName: unknown
   linkType: soft
@@ -9169,6 +9029,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@suite-common/icons@workspace:suite-common/icons"
   dependencies:
+    chalk: "npm:4.1.2"
+    fantasticon: "npm:3.0.0"
     prettier: "npm:^3.3.2"
     svgo: "npm:3.2.0"
   languageName: unknown
@@ -9219,7 +9081,6 @@ __metadata:
     fs-extra: "npm:^11.2.0"
     json-schema-to-typescript: "npm:^13.1.2"
     jws: "npm:^4.0.0"
-    proxy-memoize: "npm:2.0.2"
     semver: "npm:^7.6.3"
     tsx: "npm:^4.16.3"
   languageName: unknown
@@ -9246,6 +9107,7 @@ __metadata:
     react: "npm:18.2.0"
     react-redux: "npm:8.0.7"
     redux: "npm:^4.2.1"
+    reselect: "npm:5.1.1"
   languageName: unknown
   linkType: soft
 
@@ -9295,7 +9157,9 @@ __metadata:
   resolution: "@suite-common/suite-utils@workspace:suite-common/suite-utils"
   dependencies:
     "@suite-common/suite-config": "workspace:*"
+    "@suite-common/suite-constants": "workspace:*"
     "@suite-common/suite-types": "workspace:*"
+    "@suite-common/wallet-config": "workspace:*"
     "@suite-common/wallet-types": "workspace:*"
     "@trezor/connect": "workspace:*"
     "@trezor/urls": "workspace:*"
@@ -9303,13 +9167,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@suite-common/test-utils@workspace:*, @suite-common/test-utils@workspace:suite-common/test-utils":
+"@suite-common/test-utils@workspace:*, @suite-common/test-utils@workspace:^, @suite-common/test-utils@workspace:suite-common/test-utils":
   version: 0.0.0-use.local
   resolution: "@suite-common/test-utils@workspace:suite-common/test-utils"
   dependencies:
     "@mobily/ts-belt": "npm:^3.13.1"
     "@reduxjs/toolkit": "npm:1.9.5"
     "@suite-common/redux-utils": "workspace:*"
+    "@suite-common/suite-constants": "workspace:*"
     "@suite-common/suite-types": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
     "@suite-common/wallet-types": "workspace:*"
@@ -9333,7 +9198,6 @@ __metadata:
     "@suite-common/test-utils": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
     "@trezor/connect": "workspace:*"
-    proxy-memoize: "npm:2.0.2"
   languageName: unknown
   linkType: soft
 
@@ -9346,14 +9210,16 @@ __metadata:
     "@suite-common/redux-utils": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
     "@suite-common/wallet-types": "workspace:*"
+    "@suite-common/wallet-utils": "workspace:*"
+    "@trezor/blockchain-link": "workspace:*"
     "@trezor/blockchain-link-types": "workspace:^"
     "@trezor/blockchain-link-utils": "workspace:*"
     "@trezor/connect": "workspace:*"
     "@trezor/env-utils": "workspace:*"
     "@trezor/type-utils": "workspace:*"
+    "@trezor/utils": "workspace:*"
     ajv: "npm:^8.17.1"
     jws: "npm:^4.0.0"
-    proxy-memoize: "npm:2.0.2"
   languageName: unknown
   linkType: soft
 
@@ -9381,6 +9247,8 @@ __metadata:
 "@suite-common/wallet-constants@workspace:*, @suite-common/wallet-constants@workspace:suite-common/wallet-constants":
   version: 0.0.0-use.local
   resolution: "@suite-common/wallet-constants@workspace:suite-common/wallet-constants"
+  dependencies:
+    "@trezor/utils": "workspace:*"
   languageName: unknown
   linkType: soft
 
@@ -9412,8 +9280,7 @@ __metadata:
     "@trezor/type-utils": "workspace:*"
     "@trezor/utils": "workspace:*"
     date-fns: "npm:^2.30.0"
-    proxy-memoize: "npm:2.0.2"
-    react-hook-form: "npm:^7.53.0"
+    react-hook-form: "npm:^7.53.1"
     web3-utils: "npm:^4.3.1"
   languageName: unknown
   linkType: soft
@@ -9441,18 +9308,16 @@ __metadata:
   dependencies:
     "@mobily/ts-belt": "npm:^3.13.1"
     "@solana/buffer-layout": "npm:^4.0.1"
-    "@solana/web3.js": "npm:^1.95.0"
+    "@solana/web3.js": "npm:^1.95.4"
     "@suite-common/fiat-services": "workspace:*"
     "@suite-common/metadata-types": "workspace:*"
     "@suite-common/suite-config": "workspace:*"
     "@suite-common/suite-types": "workspace:*"
     "@suite-common/test-utils": "workspace:*"
-    "@suite-common/token-definitions": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
     "@suite-common/wallet-constants": "workspace:*"
     "@suite-common/wallet-types": "workspace:*"
     "@trezor/address-validator": "workspace:*"
-    "@trezor/blockchain-link": "workspace:*"
     "@trezor/blockchain-link-types": "workspace:*"
     "@trezor/blockchain-link-utils": "workspace:*"
     "@trezor/connect": "workspace:*"
@@ -9461,7 +9326,7 @@ __metadata:
     "@trezor/utils": "workspace:*"
     date-fns: "npm:^2.30.0"
     react: "npm:18.2.0"
-    react-hook-form: "npm:^7.53.0"
+    react-hook-form: "npm:^7.53.1"
     web3-utils: "npm:^4.3.1"
   languageName: unknown
   linkType: soft
@@ -9472,9 +9337,8 @@ __metadata:
   dependencies:
     "@mobily/ts-belt": "npm:^3.13.1"
     "@react-navigation/native": "npm:6.1.18"
-    "@shopify/flash-list": "npm:1.7.1"
     "@suite-common/formatters": "workspace:*"
-    "@suite-common/icons-deprecated": "workspace:*"
+    "@suite-common/redux-utils": "workspace:*"
     "@suite-common/token-definitions": "workspace:*"
     "@suite-common/validators": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
@@ -9487,18 +9351,19 @@ __metadata:
     "@suite-native/feature-flags": "workspace:*"
     "@suite-native/formatters": "workspace:*"
     "@suite-native/forms": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/navigation": "workspace:*"
     "@suite-native/settings": "workspace:*"
     "@suite-native/staking": "workspace:*"
     "@suite-native/toasts": "workspace:*"
     "@suite-native/tokens": "workspace:*"
+    "@trezor/connect": "workspace:*"
     "@trezor/styles": "workspace:*"
     jotai: "npm:1.9.1"
-    proxy-memoize: "npm:2.0.2"
     react: "npm:18.2.0"
     react-native: "npm:0.75.2"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-redux: "npm:8.0.7"
   languageName: unknown
   linkType: soft
@@ -9507,14 +9372,14 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@suite-native/alerts@workspace:suite-native/alerts"
   dependencies:
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-native/atoms": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@trezor/styles": "workspace:*"
     "@trezor/theme": "workspace:*"
     jotai: "npm:1.9.1"
     react: "npm:18.2.0"
     react-native: "npm:0.75.2"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
   languageName: unknown
   linkType: soft
 
@@ -9542,6 +9407,7 @@ __metadata:
     "@babel/core": "npm:^7.20.0"
     "@babel/plugin-transform-export-namespace-from": "npm:^7.23.4"
     "@config-plugins/detox": "npm:^8.0.0"
+    "@gorhom/bottom-sheet": "npm:5.0.5"
     "@mobily/ts-belt": "npm:^3.13.1"
     "@react-native-community/netinfo": "npm:11.3.2"
     "@react-native/babel-preset": "npm:^0.75.2"
@@ -9557,12 +9423,13 @@ __metadata:
     "@suite-common/analytics": "workspace:*"
     "@suite-common/connect-init": "workspace:*"
     "@suite-common/formatters": "workspace:*"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/message-system": "workspace:*"
     "@suite-common/redux-utils": "workspace:*"
     "@suite-common/suite-constants": "workspace:*"
+    "@suite-common/test-utils": "workspace:^"
     "@suite-common/token-definitions": "workspace:*"
     "@suite-common/wallet-core": "workspace:*"
+    "@suite-common/wallet-types": "workspace:*"
     "@suite-native/accounts": "workspace:*"
     "@suite-native/alerts": "workspace:*"
     "@suite-native/analytics": "workspace:*"
@@ -9574,6 +9441,7 @@ __metadata:
     "@suite-native/device": "workspace:*"
     "@suite-native/device-authorization": "workspace:*"
     "@suite-native/discovery": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/message-system": "workspace:*"
     "@suite-native/module-accounts-import": "workspace:*"
@@ -9582,6 +9450,7 @@ __metadata:
     "@suite-native/module-authorize-device": "workspace:*"
     "@suite-native/module-connect-popup": "workspace:*"
     "@suite-native/module-dev-utils": "workspace:*"
+    "@suite-native/module-device-settings": "workspace:*"
     "@suite-native/module-home": "workspace:*"
     "@suite-native/module-onboarding": "workspace:*"
     "@suite-native/module-receive": "workspace:*"
@@ -9598,9 +9467,11 @@ __metadata:
     "@suite-native/toasts": "workspace:*"
     "@suite-native/transactions": "workspace:*"
     "@trezor/connect": "workspace:*"
+    "@trezor/connect-mobile": "workspace:^"
     "@trezor/react-native-usb": "workspace:*"
     "@trezor/styles": "workspace:*"
     "@trezor/theme": "workspace:*"
+    "@trezor/trezor-user-env-link": "workspace:*"
     "@types/jest": "npm:^29.5.12"
     "@types/node": "npm:^20.11.24"
     babel-plugin-transform-inline-environment-variables: "npm:^0.4.4"
@@ -9613,6 +9484,7 @@ __metadata:
     expo-build-properties: "npm:0.12.5"
     expo-camera: "npm:15.0.15"
     expo-clipboard: "npm:6.0.3"
+    expo-crypto: "npm:13.0.2"
     expo-dev-client: "npm:4.0.25"
     expo-haptics: "npm:13.0.1"
     expo-image: "npm:1.12.15"
@@ -9625,6 +9497,7 @@ __metadata:
     expo-splash-screen: "npm:0.27.5"
     expo-status-bar: "npm:1.12.1"
     expo-system-ui: "npm:3.0.7"
+    expo-updates: "npm:^0.25.27"
     jest: "npm:^29.7.0"
     lottie-react-native: "npm:6.7.2"
     metro: "npm:0.80.11"
@@ -9635,7 +9508,7 @@ __metadata:
     react-native-gesture-handler: "npm:2.18.1"
     react-native-keyboard-aware-scroll-view: "npm:0.9.5"
     react-native-mmkv: "npm:2.12.2"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-native-restart: "npm:0.0.27"
     react-native-safe-area-context: "npm:4.10.9"
     react-native-screens: "npm:3.34.0"
@@ -9655,7 +9528,6 @@ __metadata:
     "@react-navigation/native": "npm:6.1.18"
     "@suite-common/assets": "workspace:*"
     "@suite-common/formatters": "workspace:*"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/redux-utils": "workspace:*"
     "@suite-common/token-definitions": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
@@ -9665,15 +9537,15 @@ __metadata:
     "@suite-native/atoms": "workspace:*"
     "@suite-native/config": "workspace:*"
     "@suite-native/formatters": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/navigation": "workspace:*"
     "@suite-native/settings": "workspace:*"
     "@suite-native/staking": "workspace:*"
     "@suite-native/tokens": "workspace:*"
-    proxy-memoize: "npm:2.0.2"
     react: "npm:^18.2.0"
     react-native: "npm:0.75.2"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-redux: "npm:8.0.7"
   languageName: unknown
   linkType: soft
@@ -9682,9 +9554,14 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@suite-native/atoms@workspace:suite-native/atoms"
   dependencies:
+    "@gorhom/bottom-sheet": "npm:5.0.5"
     "@mobily/ts-belt": "npm:^3.13.1"
+    "@shopify/flash-list": "npm:1.7.1"
     "@shopify/react-native-skia": "npm:1.3.11"
-    "@suite-common/icons-deprecated": "workspace:*"
+    "@suite-common/wallet-config": "workspace:*"
+    "@suite-common/wallet-types": "workspace:*"
+    "@suite-native/config": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:^"
     "@suite-native/storage": "workspace:*"
     "@trezor/env-utils": "workspace:*"
@@ -9696,7 +9573,7 @@ __metadata:
     react: "npm:18.2.0"
     react-native: "npm:0.75.2"
     react-native-gesture-handler: "npm:2.18.1"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-native-safe-area-context: "npm:4.10.9"
   languageName: unknown
   linkType: soft
@@ -9705,10 +9582,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@suite-native/biometrics@workspace:suite-native/biometrics"
   dependencies:
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-native/alerts": "workspace:*"
     "@suite-native/analytics": "workspace:*"
     "@suite-native/atoms": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/storage": "workspace:*"
     "@trezor/styles": "workspace:*"
@@ -9738,7 +9615,6 @@ __metadata:
     "@mobily/ts-belt": "npm:^3.13.1"
     "@react-navigation/native": "npm:6.1.18"
     "@reduxjs/toolkit": "npm:1.9.5"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/suite-utils": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
     "@suite-common/wallet-core": "workspace:*"
@@ -9747,6 +9623,7 @@ __metadata:
     "@suite-native/atoms": "workspace:*"
     "@suite-native/discovery": "workspace:*"
     "@suite-native/feature-flags": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/navigation": "workspace:*"
     "@suite-native/theme": "workspace:*"
@@ -9756,7 +9633,7 @@ __metadata:
     expo-linear-gradient: "npm:13.0.2"
     react: "npm:18.2.0"
     react-native: "npm:0.75.2"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-native-svg: "npm:15.6.0"
     react-redux: "npm:8.0.7"
   languageName: unknown
@@ -9777,8 +9654,8 @@ __metadata:
   resolution: "@suite-native/connection-status@workspace:suite-native/connection-status"
   dependencies:
     "@react-native-community/netinfo": "npm:11.3.2"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-native/atoms": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/settings": "workspace:*"
     "@trezor/styles": "workspace:*"
@@ -9812,9 +9689,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@suite-native/device-manager@workspace:suite-native/device-manager"
   dependencies:
+    "@mobily/ts-belt": "npm:^3.13.1"
     "@react-navigation/native": "npm:6.1.18"
     "@reduxjs/toolkit": "npm:1.9.5"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/redux-utils": "workspace:*"
     "@suite-common/suite-types": "workspace:*"
     "@suite-common/wallet-core": "workspace:*"
@@ -9823,6 +9700,7 @@ __metadata:
     "@suite-native/device": "workspace:*"
     "@suite-native/feature-flags": "workspace:*"
     "@suite-native/formatters": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/link": "workspace:*"
     "@suite-native/navigation": "workspace:*"
@@ -9831,7 +9709,7 @@ __metadata:
     jotai: "npm:1.9.1"
     react: "npm:^18.2.0"
     react-native: "npm:0.75.2"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-native-safe-area-context: "npm:4.10.9"
     react-redux: "npm:8.0.7"
   languageName: unknown
@@ -9868,13 +9746,11 @@ __metadata:
     "@suite-native/navigation": "workspace:*"
     "@suite-native/settings": "workspace:*"
     "@trezor/connect": "workspace:*"
-    "@trezor/device-utils": "workspace:*"
     "@trezor/styles": "workspace:*"
     lottie-react-native: "npm:6.7.2"
-    proxy-memoize: "npm:2.0.2"
     react: "npm:18.2.0"
     react-native: "npm:0.75.2"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-redux: "npm:8.0.7"
     semver: "npm:^7.6.3"
   languageName: unknown
@@ -9899,15 +9775,15 @@ __metadata:
     "@suite-native/device": "workspace:*"
     "@suite-native/device-mutex": "workspace:*"
     "@suite-native/feature-flags": "workspace:*"
+    "@suite-native/tokens": "workspace:*"
     "@trezor/connect": "workspace:*"
     "@trezor/utils": "workspace:*"
-    proxy-memoize: "npm:2.0.2"
     react: "npm:18.2.0"
     react-redux: "npm:8.0.7"
   languageName: unknown
   linkType: soft
 
-"@suite-native/feature-flags@workspace:*, @suite-native/feature-flags@workspace:suite-native/feature-flags":
+"@suite-native/feature-flags@workspace:*, @suite-native/feature-flags@workspace:^, @suite-native/feature-flags@workspace:suite-native/feature-flags":
   version: 0.0.0-use.local
   resolution: "@suite-native/feature-flags@workspace:suite-native/feature-flags"
   dependencies:
@@ -9932,6 +9808,7 @@ __metadata:
     "@suite-common/wallet-utils": "workspace:*"
     "@suite-native/atoms": "workspace:*"
     "@suite-native/settings": "workspace:*"
+    "@suite-native/tokens": "workspace:*"
     "@trezor/env-utils": "workspace:*"
     "@trezor/styles": "workspace:*"
     "@trezor/utils": "workspace:*"
@@ -9946,12 +9823,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@suite-native/forms@workspace:suite-native/forms"
   dependencies:
-    "@hookform/resolvers": "npm:3.9.0"
+    "@hookform/resolvers": "npm:3.9.1"
     "@mobily/ts-belt": "npm:^3.13.1"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-native/atoms": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     react: "npm:18.2.0"
-    react-hook-form: "npm:^7.53.0"
+    react-hook-form: "npm:^7.53.1"
     react-native: "npm:0.75.2"
     yup: "npm:^1.4.0"
   languageName: unknown
@@ -9968,7 +9845,6 @@ __metadata:
     "@shopify/react-native-skia": "npm:1.3.11"
     "@suite-common/formatters": "workspace:*"
     "@suite-common/graph": "workspace:*"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/redux-utils": "workspace:*"
     "@suite-common/suite-types": "workspace:*"
     "@suite-common/token-definitions": "workspace:*"
@@ -9979,6 +9855,7 @@ __metadata:
     "@suite-native/analytics": "workspace:*"
     "@suite-native/atoms": "workspace:*"
     "@suite-native/formatters": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/react-native-graph": "workspace:*"
     "@suite-native/storage": "workspace:*"
@@ -9990,7 +9867,7 @@ __metadata:
     jotai: "npm:1.9.1"
     react: "npm:18.2.0"
     react-native: "npm:0.75.2"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-redux: "npm:8.0.7"
     redux-persist: "npm:6.0.0"
   languageName: unknown
@@ -10001,13 +9878,31 @@ __metadata:
   resolution: "@suite-native/helpers@workspace:suite-native/helpers"
   dependencies:
     "@mobily/ts-belt": "npm:^3.13.1"
-    "@suite-native/config": "workspace:*"
     "@suite-native/toasts": "workspace:*"
     expo-clipboard: "npm:6.0.3"
     react: "npm:18.2.0"
   languageName: unknown
   linkType: soft
 
+"@suite-native/icons@workspace:*, @suite-native/icons@workspace:suite-native/icons":
+  version: 0.0.0-use.local
+  resolution: "@suite-native/icons@workspace:suite-native/icons"
+  dependencies:
+    "@shopify/react-native-skia": "npm:1.3.11"
+    "@suite-common/icons": "workspace:*"
+    "@suite-common/wallet-config": "workspace:*"
+    "@suite-common/wallet-utils": "workspace:*"
+    "@trezor/asset-utils": "workspace:*"
+    "@trezor/connect": "workspace:*"
+    "@trezor/styles": "workspace:*"
+    "@trezor/theme": "workspace:*"
+    expo-image: "npm:1.12.15"
+    react: "npm:18.2.0"
+    react-native: "npm:0.75.2"
+    react-native-reanimated: "npm:3.16.1"
+  languageName: unknown
+  linkType: soft
+
 "@suite-native/intl@workspace:*, @suite-native/intl@workspace:^, @suite-native/intl@workspace:suite-native/intl":
   version: 0.0.0-use.local
   resolution: "@suite-native/intl@workspace:suite-native/intl"
@@ -10038,7 +9933,6 @@ __metadata:
   dependencies:
     "@mobily/ts-belt": "npm:^3.13.1"
     "@reduxjs/toolkit": "npm:1.9.5"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/message-system": "workspace:*"
     "@suite-common/redux-utils": "workspace:*"
     "@suite-common/suite-types": "workspace:*"
@@ -10046,13 +9940,14 @@ __metadata:
     "@suite-native/atoms": "workspace:*"
     "@suite-native/connection-status": "workspace:*"
     "@suite-native/discovery": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/link": "workspace:*"
     "@trezor/styles": "workspace:*"
     "@trezor/theme": "workspace:*"
     react: "npm:18.2.0"
     react-native: "npm:0.75.2"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-redux: "npm:8.0.7"
   languageName: unknown
   linkType: soft
@@ -10068,7 +9963,6 @@ __metadata:
     "@reduxjs/toolkit": "npm:1.9.5"
     "@shopify/flash-list": "npm:1.7.1"
     "@shopify/react-native-skia": "npm:1.3.11"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/redux-utils": "workspace:*"
     "@suite-common/suite-config": "workspace:*"
     "@suite-common/token-definitions": "workspace:*"
@@ -10082,10 +9976,11 @@ __metadata:
     "@suite-native/analytics": "workspace:*"
     "@suite-native/atoms": "workspace:*"
     "@suite-native/config": "workspace:*"
+    "@suite-native/discovery": "workspace:*"
     "@suite-native/feature-flags": "workspace:*"
     "@suite-native/formatters": "workspace:*"
     "@suite-native/forms": "workspace:*"
-    "@suite-native/helpers": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/navigation": "workspace:*"
     "@suite-native/qr-code": "workspace:*"
@@ -10096,7 +9991,7 @@ __metadata:
     "@trezor/utxo-lib": "workspace:*"
     react: "npm:18.2.0"
     react-native: "npm:0.75.2"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-redux: "npm:8.0.7"
   languageName: unknown
   linkType: soft
@@ -10111,7 +10006,6 @@ __metadata:
     "@reduxjs/toolkit": "npm:1.9.5"
     "@suite-common/fiat-services": "workspace:*"
     "@suite-common/graph": "workspace:*"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
     "@suite-common/wallet-core": "workspace:*"
     "@suite-common/wallet-types": "workspace:*"
@@ -10125,6 +10019,7 @@ __metadata:
     "@suite-native/formatters": "workspace:*"
     "@suite-native/forms": "workspace:*"
     "@suite-native/graph": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/navigation": "workspace:*"
     "@suite-native/qr-code": "workspace:*"
@@ -10135,9 +10030,9 @@ __metadata:
     date-fns: "npm:^2.30.0"
     jotai: "npm:1.9.1"
     react: "npm:18.2.0"
-    react-hook-form: "npm:^7.53.0"
+    react-hook-form: "npm:^7.53.1"
     react-native: "npm:0.75.2"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-redux: "npm:8.0.7"
   languageName: unknown
   linkType: soft
@@ -10177,7 +10072,6 @@ __metadata:
     "@react-navigation/native": "npm:6.1.18"
     "@react-navigation/native-stack": "npm:6.11.0"
     "@reduxjs/toolkit": "npm:1.9.5"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/validators": "workspace:*"
     "@suite-common/wallet-core": "workspace:*"
     "@suite-native/alerts": "workspace:*"
@@ -10188,6 +10082,7 @@ __metadata:
     "@suite-native/device-mutex": "workspace:*"
     "@suite-native/discovery": "workspace:*"
     "@suite-native/forms": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/link": "workspace:*"
     "@suite-native/module-connect-popup": "workspace:*"
@@ -10195,10 +10090,11 @@ __metadata:
     "@suite-native/theme": "workspace:*"
     "@suite-native/toasts": "workspace:*"
     "@trezor/connect": "workspace:*"
+    "@trezor/env-utils": "workspace:*"
     "@trezor/styles": "workspace:*"
     react: "npm:18.2.0"
     react-native: "npm:0.75.2"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-native-svg: "npm:15.6.0"
     react-redux: "npm:8.0.7"
   languageName: unknown
@@ -10215,10 +10111,11 @@ __metadata:
     "@suite-native/config": "workspace:*"
     "@suite-native/device": "workspace:*"
     "@suite-native/device-manager": "workspace:*"
+    "@suite-native/feature-flags": "workspace:^"
     "@suite-native/intl": "workspace:^"
     "@suite-native/navigation": "workspace:*"
     "@trezor/connect": "workspace:*"
-    "@trezor/connect-deeplink": "workspace:*"
+    "@trezor/connect-mobile": "workspace:*"
     expo-linking: "npm:^6.3.1"
     react: "npm:18.2.0"
     react-native: "npm:0.75.2"
@@ -10233,7 +10130,6 @@ __metadata:
     "@mobily/ts-belt": "npm:^3.13.1"
     "@react-navigation/native-stack": "npm:6.11.0"
     "@sentry/react-native": "npm:5.33.0"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/message-system": "workspace:*"
     "@suite-common/wallet-core": "workspace:*"
     "@suite-native/atoms": "workspace:*"
@@ -10241,6 +10137,7 @@ __metadata:
     "@suite-native/discovery": "workspace:*"
     "@suite-native/feature-flags": "workspace:*"
     "@suite-native/helpers": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/link": "workspace:*"
     "@suite-native/navigation": "workspace:*"
     "@suite-native/storage": "workspace:*"
@@ -10255,6 +10152,36 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@suite-native/module-device-settings@workspace:*, @suite-native/module-device-settings@workspace:suite-native/module-device-settings":
+  version: 0.0.0-use.local
+  resolution: "@suite-native/module-device-settings@workspace:suite-native/module-device-settings"
+  dependencies:
+    "@mobily/ts-belt": "npm:^3.13.1"
+    "@react-navigation/native": "npm:6.1.18"
+    "@react-navigation/native-stack": "npm:6.11.0"
+    "@suite-common/suite-utils": "workspace:*"
+    "@suite-common/wallet-core": "workspace:*"
+    "@suite-native/alerts": "workspace:*"
+    "@suite-native/analytics": "workspace:*"
+    "@suite-native/atoms": "workspace:*"
+    "@suite-native/device": "workspace:*"
+    "@suite-native/device-mutex": "workspace:*"
+    "@suite-native/icons": "workspace:*"
+    "@suite-native/intl": "workspace:*"
+    "@suite-native/link": "workspace:*"
+    "@suite-native/module-authorize-device": "workspace:*"
+    "@suite-native/navigation": "workspace:*"
+    "@suite-native/toasts": "workspace:*"
+    "@trezor/connect": "workspace:*"
+    "@trezor/device-utils": "workspace:*"
+    "@trezor/env-utils": "workspace:*"
+    "@trezor/styles": "workspace:*"
+    react: "npm:18.2.0"
+    react-native: "npm:0.75.2"
+    react-redux: "npm:8.0.7"
+  languageName: unknown
+  linkType: soft
+
 "@suite-native/module-home@workspace:*, @suite-native/module-home@workspace:suite-native/module-home":
   version: 0.0.0-use.local
   resolution: "@suite-native/module-home@workspace:suite-native/module-home"
@@ -10296,11 +10223,11 @@ __metadata:
     "@react-navigation/native": "npm:6.1.18"
     "@react-navigation/native-stack": "npm:6.11.0"
     "@reduxjs/toolkit": "npm:1.9.5"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-native/analytics": "workspace:*"
     "@suite-native/atoms": "workspace:*"
     "@suite-native/device": "workspace:*"
     "@suite-native/feature-flags": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/link": "workspace:*"
     "@suite-native/navigation": "workspace:*"
@@ -10337,7 +10264,6 @@ __metadata:
     "@react-navigation/native-stack": "npm:6.11.0"
     "@reduxjs/toolkit": "npm:1.9.5"
     "@suite-common/formatters": "workspace:*"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/redux-utils": "workspace:*"
     "@suite-common/suite-utils": "workspace:*"
     "@suite-common/validators": "workspace:*"
@@ -10349,28 +10275,35 @@ __metadata:
     "@suite-native/alerts": "workspace:*"
     "@suite-native/analytics": "workspace:*"
     "@suite-native/atoms": "workspace:*"
+    "@suite-native/config": "workspace:*"
     "@suite-native/device": "workspace:*"
     "@suite-native/device-mutex": "workspace:*"
     "@suite-native/formatters": "workspace:*"
     "@suite-native/forms": "workspace:*"
     "@suite-native/helpers": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
+    "@suite-native/link": "workspace:*"
     "@suite-native/navigation": "workspace:*"
     "@suite-native/qr-code": "workspace:*"
     "@suite-native/settings": "workspace:*"
+    "@suite-native/tokens": "workspace:*"
     "@trezor/blockchain-link-types": "workspace:*"
+    "@trezor/connect": "workspace:*"
     "@trezor/react-utils": "workspace:*"
     "@trezor/styles": "workspace:*"
     "@trezor/theme": "workspace:*"
     "@trezor/transport": "workspace:*"
     "@trezor/utils": "workspace:*"
     expo-linear-gradient: "npm:13.0.2"
+    jotai: "npm:1.9.1"
     react: "npm:18.2.0"
-    react-hook-form: "npm:^7.53.0"
+    react-hook-form: "npm:^7.53.1"
     react-native: "npm:0.75.2"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-native-svg: "npm:15.6.0"
     react-redux: "npm:8.0.7"
+    web3-utils: "npm:^4.3.1"
   languageName: unknown
   linkType: soft
 
@@ -10384,7 +10317,6 @@ __metadata:
     "@react-navigation/native-stack": "npm:6.11.0"
     "@reduxjs/toolkit": "npm:1.9.5"
     "@suite-common/analytics": "workspace:*"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/suite-config": "workspace:*"
     "@suite-common/suite-constants": "workspace:*"
     "@suite-common/suite-types": "workspace:*"
@@ -10400,6 +10332,7 @@ __metadata:
     "@suite-native/device-manager": "workspace:*"
     "@suite-native/discovery": "workspace:*"
     "@suite-native/feature-flags": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/link": "workspace:*"
     "@suite-native/navigation": "workspace:*"
@@ -10425,10 +10358,11 @@ __metadata:
   resolution: "@suite-native/module-staking-management@workspace:suite-native/module-staking-management"
   dependencies:
     "@react-navigation/native": "npm:6.1.18"
-    "@suite-common/icons-deprecated": "workspace:*"
+    "@reduxjs/toolkit": "npm:1.9.5"
     "@suite-common/wallet-core": "workspace:*"
     "@suite-native/atoms": "workspace:*"
     "@suite-native/formatters": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/link": "workspace:*"
     "@suite-native/navigation": "workspace:*"
@@ -10449,13 +10383,13 @@ __metadata:
     "@react-navigation/native": "npm:6.1.18"
     "@react-navigation/native-stack": "npm:6.11.0"
     "@sentry/react-native": "npm:5.33.0"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/message-system": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
     "@suite-common/wallet-types": "workspace:*"
     "@suite-native/analytics": "workspace:*"
     "@suite-native/atoms": "workspace:*"
     "@suite-native/connection-status": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@trezor/connect": "workspace:*"
     "@trezor/styles": "workspace:*"
     "@trezor/theme": "workspace:*"
@@ -10475,7 +10409,6 @@ __metadata:
   resolution: "@suite-native/notifications@workspace:suite-native/notifications"
   dependencies:
     "@react-navigation/native": "npm:6.1.18"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/toast-notifications": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
     "@suite-common/wallet-core": "workspace:*"
@@ -10483,6 +10416,7 @@ __metadata:
     "@suite-native/atoms": "workspace:*"
     "@suite-native/connection-status": "workspace:*"
     "@suite-native/formatters": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/navigation": "workspace:*"
     "@suite-native/theme": "workspace:*"
     "@suite-native/transactions": "workspace:*"
@@ -10490,7 +10424,7 @@ __metadata:
     react: "npm:18.2.0"
     react-native: "npm:0.75.2"
     react-native-gesture-handler: "npm:2.18.1"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-redux: "npm:8.0.7"
   languageName: unknown
   linkType: soft
@@ -10499,11 +10433,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@suite-native/qr-code@workspace:suite-native/qr-code"
   dependencies:
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
     "@suite-common/wallet-utils": "workspace:*"
     "@suite-native/atoms": "workspace:*"
     "@suite-native/helpers": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/toasts": "workspace:*"
     "@trezor/styles": "workspace:*"
@@ -10522,11 +10456,12 @@ __metadata:
   dependencies:
     "@shopify/react-native-skia": "npm:1.3.11"
     "@suite-common/suite-utils": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@types/react": "npm:18.2.79"
     react: "npm:18.2.0"
     react-native: "npm:0.75.2"
     react-native-gesture-handler: "npm:2.18.1"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
   languageName: unknown
   linkType: soft
 
@@ -10538,11 +10473,9 @@ __metadata:
     "@react-navigation/native": "npm:6.1.18"
     "@reduxjs/toolkit": "npm:1.9.5"
     "@shopify/react-native-skia": "npm:1.3.11"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
     "@suite-common/wallet-core": "workspace:*"
     "@suite-common/wallet-types": "workspace:*"
-    "@suite-common/wallet-utils": "workspace:*"
     "@suite-native/accounts": "workspace:*"
     "@suite-native/alerts": "workspace:*"
     "@suite-native/analytics": "workspace:*"
@@ -10551,6 +10484,7 @@ __metadata:
     "@suite-native/device-mutex": "workspace:*"
     "@suite-native/formatters": "workspace:*"
     "@suite-native/helpers": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/link": "workspace:*"
     "@suite-native/navigation": "workspace:*"
@@ -10563,7 +10497,7 @@ __metadata:
     react: "npm:18.2.0"
     react-native: "npm:0.75.2"
     react-native-gesture-handler: "npm:2.18.1"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-redux: "npm:8.0.7"
   languageName: unknown
   linkType: soft
@@ -10587,6 +10521,7 @@ __metadata:
     "@suite-common/wallet-core": "workspace:*"
     "@suite-common/wallet-types": "workspace:*"
     "@suite-common/wallet-utils": "workspace:*"
+    "@trezor/utils": "workspace:*"
   languageName: unknown
   linkType: soft
 
@@ -10614,7 +10549,6 @@ __metadata:
     "@suite-native/module-send": "workspace:*"
     "@suite-native/settings": "workspace:*"
     "@suite-native/storage": "workspace:*"
-    "@suite-native/tokens": "workspace:*"
     "@trezor/transport-native": "workspace:*"
     "@trezor/utils": "workspace:*"
     expo-device: "npm:6.0.2"
@@ -10657,7 +10591,7 @@ __metadata:
     "@trezor/theme": "workspace:*"
     react: "npm:18.2.0"
     react-native-gesture-handler: "npm:2.18.1"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-native-safe-area-context: "npm:4.10.9"
   languageName: unknown
   linkType: soft
@@ -10681,14 +10615,14 @@ __metadata:
   resolution: "@suite-native/toasts@workspace:suite-native/toasts"
   dependencies:
     "@mobily/ts-belt": "npm:^3.13.1"
-    "@suite-common/icons-deprecated": "workspace:*"
     "@suite-native/atoms": "workspace:*"
     "@suite-native/connection-status": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@trezor/styles": "workspace:*"
     "@trezor/theme": "workspace:*"
     jotai: "npm:1.9.1"
     react: "npm:18.2.0"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
   languageName: unknown
   linkType: soft
 
@@ -10697,12 +10631,13 @@ __metadata:
   resolution: "@suite-native/tokens@workspace:suite-native/tokens"
   dependencies:
     "@mobily/ts-belt": "npm:^3.13.1"
+    "@suite-common/redux-utils": "workspace:*"
     "@suite-common/token-definitions": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
     "@suite-common/wallet-core": "workspace:*"
     "@suite-common/wallet-types": "workspace:*"
     "@trezor/blockchain-link": "workspace:*"
-    proxy-memoize: "npm:2.0.2"
+    "@trezor/utils": "workspace:*"
     react: "npm:18.2.0"
   languageName: unknown
   linkType: soft
@@ -10717,7 +10652,7 @@ __metadata:
     "@shopify/flash-list": "npm:1.7.1"
     "@shopify/react-native-skia": "npm:1.3.11"
     "@suite-common/formatters": "workspace:*"
-    "@suite-common/icons-deprecated": "workspace:*"
+    "@suite-common/redux-utils": "workspace:*"
     "@suite-common/suite-types": "workspace:*"
     "@suite-common/token-definitions": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
@@ -10728,6 +10663,7 @@ __metadata:
     "@suite-native/atoms": "workspace:*"
     "@suite-native/formatters": "workspace:*"
     "@suite-native/helpers": "workspace:*"
+    "@suite-native/icons": "workspace:*"
     "@suite-native/intl": "workspace:*"
     "@suite-native/link": "workspace:*"
     "@suite-native/navigation": "workspace:*"
@@ -10737,11 +10673,10 @@ __metadata:
     "@trezor/styles": "workspace:*"
     "@trezor/theme": "workspace:*"
     "@trezor/utils": "workspace:*"
-    proxy-memoize: "npm:2.0.2"
     react: "npm:18.2.0"
     react-native: "npm:0.75.2"
     react-native-gesture-handler: "npm:2.18.1"
-    react-native-reanimated: "npm:3.15.0"
+    react-native-reanimated: "npm:3.16.1"
     react-redux: "npm:8.0.7"
   languageName: unknown
   linkType: soft
@@ -10916,15 +10851,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@szmarczak/http-timer@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@szmarczak/http-timer@npm:5.0.1"
-  dependencies:
-    defer-to-connect: "npm:^2.0.1"
-  checksum: 10/fc9cb993e808806692e4a3337c90ece0ec00c89f4b67e3652a356b89730da98bc824273a6d67ca84d5f33cd85f317dcd5ce39d8cc0a2f060145a608a7cb8ce92
-  languageName: node
-  linkType: hard
-
 "@tailwindcss/nesting@npm:^0.0.0-insiders.565cd3e":
   version: 0.0.0-insiders.565cd3e
   resolution: "@tailwindcss/nesting@npm:0.0.0-insiders.565cd3e"
@@ -11055,7 +10981,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@trezor/address-validator@workspace:packages/address-validator"
   dependencies:
-    base-x: "npm:^3.0.7"
+    "@trezor/eslint": "workspace:*"
+    base-x: "npm:^5.0.0"
     bech32: "npm:^2.0.0"
     browserify-bignum: "npm:^1.3.0-2"
     cbor-js: "npm:^0.1.0"
@@ -11078,13 +11005,19 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@trezor/asset-utils@workspace:*, @trezor/asset-utils@workspace:packages/asset-utils":
+  version: 0.0.0-use.local
+  resolution: "@trezor/asset-utils@workspace:packages/asset-utils"
+  languageName: unknown
+  linkType: soft
+
 "@trezor/auth-server@workspace:packages/auth-server":
   version: 0.0.0-use.local
   resolution: "@trezor/auth-server@workspace:packages/auth-server"
   dependencies:
     "@types/cors": "npm:^2.8.17"
     cors: "npm:^2.8.5"
-    express: "npm:^4.21.0"
+    express: "npm:^4.21.1"
   peerDependencies:
     tslib: ^2.6.2
   languageName: unknown
@@ -11094,10 +11027,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@trezor/blockchain-link-types@workspace:packages/blockchain-link-types"
   dependencies:
-    "@solana/web3.js": "npm:^1.95.0"
+    "@solana/web3.js": "npm:^1.95.4"
     "@trezor/type-utils": "workspace:*"
     "@trezor/utxo-lib": "workspace:*"
-    socks-proxy-agent: "npm:6.1.1"
     tsx: "npm:^4.16.3"
   peerDependencies:
     tslib: ^2.6.2
@@ -11109,9 +11041,10 @@ __metadata:
   resolution: "@trezor/blockchain-link-utils@workspace:packages/blockchain-link-utils"
   dependencies:
     "@mobily/ts-belt": "npm:^3.13.1"
-    "@solana/web3.js": "npm:^1.95.0"
+    "@solana/web3.js": "npm:^1.95.4"
     "@trezor/blockchain-link-types": "workspace:*"
     "@trezor/env-utils": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/type-utils": "workspace:*"
     "@trezor/utils": "workspace:*"
     tsx: "npm:^4.16.3"
@@ -11125,23 +11058,24 @@ __metadata:
   resolution: "@trezor/blockchain-link@workspace:packages/blockchain-link"
   dependencies:
     "@solana/buffer-layout": "npm:^4.0.1"
-    "@solana/web3.js": "npm:^1.95.0"
+    "@solana/web3.js": "npm:^1.95.4"
     "@trezor/blockchain-link-types": "workspace:*"
     "@trezor/blockchain-link-utils": "workspace:*"
     "@trezor/e2e-utils": "workspace:*"
     "@trezor/env-utils": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/type-utils": "workspace:*"
     "@trezor/utils": "workspace:*"
     "@trezor/utxo-lib": "workspace:*"
-    "@types/web": "npm:^0.0.162"
+    "@types/web": "npm:^0.0.174"
     events: "npm:^3.3.0"
     fs-extra: "npm:^11.2.0"
     html-webpack-plugin: "npm:^5.6.0"
     ripple-lib: "npm:^1.10.1"
-    socks-proxy-agent: "npm:6.1.1"
+    socks-proxy-agent: "npm:8.0.4"
     tiny-worker: "npm:^2.3.0"
     tsx: "npm:^4.16.3"
-    webpack: "npm:^5.94.0"
+    webpack: "npm:^5.96.1"
     webpack-cli: "npm:^5.1.4"
     webpack-dev-server: "npm:^5.0.4"
     worker-loader: "npm:^3.0.8"
@@ -11155,9 +11089,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@trezor/coinjoin@workspace:packages/coinjoin"
   dependencies:
+    "@suite-common/suite-constants": "workspace:*"
     "@trezor/blockchain-link": "workspace:*"
     "@trezor/blockchain-link-types": "workspace:*"
     "@trezor/blockchain-link-utils": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/utils": "workspace:*"
     "@trezor/utxo-lib": "workspace:*"
     cross-fetch: "npm:^4.0.0"
@@ -11179,14 +11115,17 @@ __metadata:
     "@storybook/client-api": "npm:^7.6.13"
     "@storybook/react": "npm:^7.6.13"
     "@storybook/react-webpack5": "npm:^7.6.13"
+    "@storybook/theming": "npm:^7.6.13"
     "@suite-common/icons": "workspace:*"
     "@suite-common/icons-deprecated": "workspace:*"
     "@suite-common/suite-constants": "workspace:*"
     "@suite-common/suite-utils": "workspace:*"
     "@suite-common/validators": "workspace:*"
+    "@trezor/asset-utils": "workspace:*"
     "@trezor/connect": "workspace:*"
     "@trezor/dom-utils": "workspace:*"
     "@trezor/env-utils": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/react-utils": "workspace:*"
     "@trezor/styles": "workspace:*"
     "@trezor/theme": "workspace:*"
@@ -11237,15 +11176,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@trezor/connect-deeplink@workspace:*, @trezor/connect-deeplink@workspace:packages/connect-deeplink":
-  version: 0.0.0-use.local
-  resolution: "@trezor/connect-deeplink@workspace:packages/connect-deeplink"
-  dependencies:
-    "@trezor/connect": "workspace:^"
-    "@trezor/utils": "workspace:^"
-  languageName: unknown
-  linkType: soft
-
 "@trezor/connect-explorer-theme@workspace:^, @trezor/connect-explorer-theme@workspace:packages/connect-explorer-theme":
   version: 0.0.0-use.local
   resolution: "@trezor/connect-explorer-theme@workspace:packages/connect-explorer-theme"
@@ -11257,7 +11187,7 @@ __metadata:
     "@trezor/product-components": "workspace:*"
     "@trezor/theme": "workspace:*"
     "@types/flexsearch": "npm:^0.7.3"
-    "@types/git-url-parse": "npm:^9.0.1"
+    "@types/git-url-parse": "npm:^9.0.3"
     "@types/react": "npm:^18.2.79"
     "@types/react-dom": "npm:^18.2.7"
     "@vitejs/plugin-react": "npm:^3.0.1"
@@ -11266,7 +11196,7 @@ __metadata:
     escape-string-regexp: "npm:^5.0.0"
     flexsearch: "npm:^0.7.31"
     focus-visible: "npm:^5.2.1"
-    git-url-parse: "npm:^13.1.0"
+    git-url-parse: "npm:^15.0.0"
     intersection-observer: "npm:^0.12.2"
     jsdom: "npm:^23.0.0"
     match-sorter: "npm:^6.3.1"
@@ -11303,8 +11233,10 @@ __metadata:
     "@trezor/components": "workspace:^"
     "@trezor/connect": "workspace:^"
     "@trezor/connect-explorer-theme": "workspace:^"
+    "@trezor/connect-mobile": "workspace:^"
     "@trezor/connect-web": "workspace:^"
     "@trezor/connect-webextension": "workspace:^"
+    "@trezor/eslint": "workspace:*"
     "@trezor/protobuf": "workspace:^"
     "@trezor/schema-utils": "workspace:^"
     "@trezor/theme": "workspace:^"
@@ -11338,7 +11270,7 @@ __metadata:
     styled-components: "npm:^6.1.8"
     swr: "npm:^2.2.5"
     tsx: "npm:^4.16.3"
-    webpack: "npm:^5.94.0"
+    webpack: "npm:^5.96.1"
     webpack-cli: "npm:^5.1.4"
   languageName: unknown
   linkType: soft
@@ -11352,26 +11284,39 @@ __metadata:
     "@trezor/connect-analytics": "workspace:*"
     "@trezor/connect-common": "workspace:*"
     "@trezor/env-utils": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     babel-loader: "npm:^9.1.3"
     copy-webpack-plugin: "npm:^12.0.2"
     es6-promise: "npm:^4.2.8"
     html-webpack-plugin: "npm:^5.6.0"
     rimraf: "npm:^6.0.1"
     terser-webpack-plugin: "npm:^5.3.9"
-    webpack: "npm:^5.94.0"
+    webpack: "npm:^5.96.1"
     webpack-cli: "npm:^5.1.4"
     webpack-merge: "npm:^6.0.1"
     worker-loader: "npm:^3.0.8"
   languageName: unknown
   linkType: soft
 
+"@trezor/connect-mobile@workspace:*, @trezor/connect-mobile@workspace:^, @trezor/connect-mobile@workspace:packages/connect-mobile":
+  version: 0.0.0-use.local
+  resolution: "@trezor/connect-mobile@workspace:packages/connect-mobile"
+  dependencies:
+    "@trezor/connect": "workspace:^"
+    "@trezor/utils": "workspace:^"
+    tsx: "npm:^4.16.3"
+  peerDependencies:
+    tslib: ^2.6.2
+  languageName: unknown
+  linkType: soft
+
 "@trezor/connect-plugin-ethereum@workspace:packages/connect-plugin-ethereum":
   version: 0.0.0-use.local
   resolution: "@trezor/connect-plugin-ethereum@workspace:packages/connect-plugin-ethereum"
   dependencies:
-    "@metamask/eth-sig-util": "npm:^7.0.3"
+    "@metamask/eth-sig-util": "npm:^8.0.0"
   peerDependencies:
-    "@metamask/eth-sig-util": ^7.0.3
+    "@metamask/eth-sig-util": ^8.0.0
     tslib: ^2.6.2
   languageName: unknown
   linkType: soft
@@ -11380,10 +11325,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@trezor/connect-plugin-stellar@workspace:packages/connect-plugin-stellar"
   dependencies:
-    "@stellar/stellar-sdk": "npm:^12.1.0"
+    "@stellar/stellar-sdk": "npm:^12.1.3"
+    "@trezor/eslint": "workspace:*"
     "@trezor/utils": "workspace:*"
   peerDependencies:
-    "@stellar/stellar-sdk": ^12.1.0
+    "@stellar/stellar-sdk": ^12.1.3
     "@trezor/connect": 9.x.x
     tslib: ^2.6.2
   languageName: unknown
@@ -11408,6 +11354,7 @@ __metadata:
     "@trezor/connect-ui": "workspace:*"
     "@trezor/crypto-utils": "workspace:*"
     "@trezor/device-utils": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/node-utils": "workspace:*"
     "@trezor/transport": "workspace:*"
     "@trezor/trezor-user-env-link": "workspace:*"
@@ -11421,7 +11368,7 @@ __metadata:
     react-dom: "npm:18.2.0"
     rimraf: "npm:^6.0.1"
     terser-webpack-plugin: "npm:^5.3.9"
-    webpack: "npm:^5.94.0"
+    webpack: "npm:^5.96.1"
     webpack-cli: "npm:^5.1.4"
     webpack-dev-server: "npm:^5.0.4"
     webpack-merge: "npm:^6.0.1"
@@ -11474,8 +11421,9 @@ __metadata:
     "@playwright/test": "npm:^1.46.1"
     "@trezor/connect": "workspace:*"
     "@trezor/connect-common": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/utils": "workspace:*"
-    "@types/chrome": "npm:^0.0.270"
+    "@types/chrome": "npm:^0.0.278"
     "@types/w3c-web-usb": "npm:^1.0.10"
     babel-loader: "npm:^9.1.3"
     html-webpack-plugin: "npm:^5.6.0"
@@ -11483,7 +11431,7 @@ __metadata:
     selfsigned: "npm:^2.4.1"
     terser-webpack-plugin: "npm:^5.3.9"
     tsx: "npm:^4.16.3"
-    webpack: "npm:^5.94.0"
+    webpack: "npm:^5.96.1"
     webpack-cli: "npm:^5.1.4"
     webpack-merge: "npm:^6.0.1"
     webpack-plugin-serve: "npm:^1.6.0"
@@ -11502,16 +11450,17 @@ __metadata:
     "@trezor/connect": "workspace:*"
     "@trezor/connect-common": "workspace:*"
     "@trezor/connect-web": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/node-utils": "workspace:*"
     "@trezor/trezor-user-env-link": "workspace:*"
     "@trezor/utils": "workspace:*"
-    "@types/chrome": "npm:^0.0.270"
+    "@types/chrome": "npm:^0.0.278"
     babel-loader: "npm:^9.1.3"
     copy-webpack-plugin: "npm:^12.0.2"
     events: "npm:^3.3.0"
     rimraf: "npm:^6.0.1"
     terser-webpack-plugin: "npm:^5.3.9"
-    webpack: "npm:^5.94.0"
+    webpack: "npm:^5.96.1"
     webpack-cli: "npm:^5.1.4"
     webpack-merge: "npm:^6.0.1"
     webpack-plugin-serve: "npm:^1.6.0"
@@ -11527,13 +11476,14 @@ __metadata:
   resolution: "@trezor/connect@workspace:packages/connect"
   dependencies:
     "@babel/preset-typescript": "npm:^7.24.7"
-    "@ethereumjs/common": "npm:^4.3.0"
-    "@ethereumjs/tx": "npm:^5.3.0"
+    "@ethereumjs/common": "npm:^4.4.0"
+    "@ethereumjs/tx": "npm:^5.4.0"
     "@fivebinaries/coin-selection": "npm:2.2.1"
     "@trezor/blockchain-link": "workspace:*"
     "@trezor/blockchain-link-types": "workspace:*"
     "@trezor/connect-analytics": "workspace:*"
     "@trezor/connect-common": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/protobuf": "workspace:*"
     "@trezor/protocol": "workspace:*"
     "@trezor/schema-utils": "workspace:*"
@@ -11555,10 +11505,12 @@ __metadata:
     karma-jasmine-async: "npm:^0.0.1"
     karma-sourcemap-loader: "npm:^0.4.0"
     karma-webpack: "npm:^5.0.1"
+    node-fetch: "npm:^2.6.4"
     node-libs-browser: "npm:^2.2.1"
     ts-node: "npm:^10.9.1"
     tsx: "npm:^4.16.3"
-    webpack: "npm:^5.94.0"
+    web3-utils: "npm:^4.3.2"
+    webpack: "npm:^5.96.1"
     ws: "npm:^8.18.0"
   peerDependencies:
     tslib: ^2.6.2
@@ -11589,9 +11541,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@trezor/e2e-utils@workspace:packages/e2e-utils"
   dependencies:
-    "@types/uuid": "npm:^10.0.0"
-    express: "npm:^4.21.0"
-    uuid: "npm:^10.0.0"
+    express: "npm:^4.21.1"
+    uuid: "npm:^11.0.2"
     ws: "npm:^8.18.0"
   languageName: unknown
   linkType: soft
@@ -11617,6 +11568,23 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@trezor/eslint@workspace:*, @trezor/eslint@workspace:^, @trezor/eslint@workspace:packages/eslint":
+  version: 0.0.0-use.local
+  resolution: "@trezor/eslint@workspace:packages/eslint"
+  dependencies:
+    "@eslint/js": "npm:^9.13.0"
+    eslint: "npm:^9.13.0"
+    eslint-plugin-chai-friendly: "npm:^1.0.1"
+    eslint-plugin-import: "npm:^2.31.0"
+    eslint-plugin-jest: "npm:^28.8.3"
+    eslint-plugin-jsx-a11y: "npm:^6.10.2"
+    eslint-plugin-local-rules: "npm:^3.0.2"
+    eslint-plugin-react: "npm:^7.37.2"
+    eslint-plugin-react-hooks: "npm:^5.0.0"
+    typescript-eslint: "npm:^8.12.2"
+  languageName: unknown
+  linkType: soft
+
 "@trezor/ipc-proxy@workspace:*, @trezor/ipc-proxy@workspace:packages/ipc-proxy":
   version: 0.0.0-use.local
   resolution: "@trezor/ipc-proxy@workspace:packages/ipc-proxy"
@@ -11644,14 +11612,18 @@ __metadata:
     "@storybook/client-api": "npm:^7.6.13"
     "@storybook/react": "npm:^7.6.13"
     "@storybook/react-webpack5": "npm:^7.6.13"
+    "@storybook/theming": "npm:^7.6.13"
     "@suite-common/validators": "workspace:*"
     "@suite-common/wallet-config": "workspace:*"
+    "@suite-common/wallet-utils": "workspace:*"
     "@trezor/components": "workspace:*"
     "@trezor/connect": "workspace:*"
     "@trezor/dom-utils": "workspace:*"
     "@trezor/env-utils": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/react-utils": "workspace:*"
     "@trezor/theme": "workspace:*"
+    "@trezor/urls": "workspace:*"
     "@trezor/utils": "workspace:*"
     "@types/react": "npm:18.2.79"
     framer-motion: "npm:^11.0.3"
@@ -11714,9 +11686,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@trezor/request-manager@workspace:packages/request-manager"
   dependencies:
+    "@trezor/eslint": "workspace:*"
     "@trezor/node-utils": "workspace:^"
     "@trezor/utils": "workspace:*"
-    socks-proxy-agent: "npm:6.1.1"
+    socks-proxy-agent: "npm:8.0.4"
     ts-node: "npm:^10.9.1"
     ws: "npm:^8.18.0"
   languageName: unknown
@@ -11728,6 +11701,7 @@ __metadata:
   dependencies:
     "@sinclair/typebox": "npm:^0.33.7"
     "@sinclair/typebox-codegen": "npm:^0.10.4"
+    "@trezor/eslint": "workspace:*"
     ts-mixer: "npm:^6.0.3"
     ts-node: "npm:^10.9.2"
     tsx: "npm:^4.16.3"
@@ -11741,6 +11715,7 @@ __metadata:
   resolution: "@trezor/scripts@workspace:scripts"
   dependencies:
     "@mobily/ts-belt": "npm:^3.13.1"
+    "@trezor/eslint": "workspace:*"
     "@types/prettier": "npm:^3.0.0"
     chalk: "npm:^4.1.2"
     dotenv: "npm:^16.4.1"
@@ -11792,6 +11767,7 @@ __metadata:
     "@pmmmwh/react-refresh-webpack-plugin": "npm:^0.5.11"
     "@sentry/webpack-plugin": "npm:^2.14.0"
     "@suite-common/suite-config": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/suite": "workspace:*"
     "@types/copy-webpack-plugin": "npm:^10.1.0"
     "@types/webpack-bundle-analyzer": "npm:^4.7.0"
@@ -11808,7 +11784,7 @@ __metadata:
     stream-browserify: "npm:^3.0.0"
     style-loader: "npm:^3.3.4"
     terser-webpack-plugin: "npm:^5.3.9"
-    webpack: "npm:^5.94.0"
+    webpack: "npm:^5.96.1"
     webpack-bundle-analyzer: "npm:^4.10.1"
     webpack-merge: "npm:^6.0.1"
     webpack-nano: "npm:^1.1.1"
@@ -11826,6 +11802,7 @@ __metadata:
     "@suite-common/suite-utils": "workspace:*"
     "@trezor/connect": "workspace:*"
     "@trezor/env-utils": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/urls": "workspace:*"
     "@trezor/utils": "workspace:*"
     "@types/fs-extra": "npm:^11.0.4"
@@ -11841,7 +11818,7 @@ __metadata:
     simple-git: "npm:^3.26.0"
     style-loader: "npm:^3.3.4"
     tsx: "npm:^4.16.3"
-    webpack: "npm:^5.94.0"
+    webpack: "npm:^5.96.1"
     webpack-cli: "npm:^5.1.4"
   languageName: unknown
   linkType: soft
@@ -11850,7 +11827,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@trezor/suite-desktop-api@workspace:packages/suite-desktop-api"
   dependencies:
-    electron: "npm:32.1.2"
+    electron: "npm:33.1.0"
   languageName: unknown
   linkType: soft
 
@@ -11876,6 +11853,7 @@ __metadata:
     "@trezor/connect": "workspace:*"
     "@trezor/connect-common": "workspace:*"
     "@trezor/env-utils": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/ipc-proxy": "workspace:*"
     "@trezor/node-utils": "workspace:*"
     "@trezor/request-manager": "workspace:*"
@@ -11887,16 +11865,16 @@ __metadata:
     "@trezor/utils": "workspace:*"
     "@types/electron-localshortcut": "npm:^3.1.3"
     chalk: "npm:^4.1.2"
-    electron: "npm:32.1.2"
+    electron: "npm:33.1.0"
     electron-localshortcut: "npm:^3.2.1"
     electron-store: "npm:8.2.0"
-    electron-updater: "npm:6.3.4"
+    electron-updater: "npm:6.3.9"
     fs-extra: "npm:^11.2.0"
     glob: "npm:^10.3.10"
     openpgp: "npm:^5.11.2"
     systeminformation: "npm:^5.23.5"
     terser-webpack-plugin: "npm:^5.3.9"
-    webpack: "npm:^5.94.0"
+    webpack: "npm:^5.96.1"
     xvfb-maybe: "npm:^0.2.1"
   languageName: unknown
   linkType: soft
@@ -11928,6 +11906,7 @@ __metadata:
     styled-components: "npm:^6.1.8"
     stylelint: "npm:^16.2.1"
     stylelint-config-standard: "npm:^36.0.0"
+    typescript-styled-plugin: "npm:^0.18.3"
   languageName: unknown
   linkType: soft
 
@@ -11937,11 +11916,11 @@ __metadata:
   dependencies:
     "@electron/notarize": "npm:2.5.0"
     blake-hash: "npm:^2.0.0"
-    electron: "npm:32.1.2"
-    electron-builder: "npm:25.0.5"
+    electron: "npm:33.1.0"
+    electron-builder: "npm:25.1.8"
     electron-localshortcut: "npm:^3.2.1"
     electron-store: "npm:8.2.0"
-    electron-updater: "npm:6.3.4"
+    electron-updater: "npm:6.3.9"
     glob: "npm:^10.3.10"
     usb: "npm:^2.14.0"
   languageName: unknown
@@ -11952,6 +11931,7 @@ __metadata:
   resolution: "@trezor/suite-storage@workspace:packages/suite-storage"
   dependencies:
     "@trezor/env-utils": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/utils": "workspace:*"
     broadcast-channel: "npm:^7.0.0"
     idb: "npm:^8.0.0"
@@ -11972,6 +11952,7 @@ __metadata:
     "@trezor/device-utils": "workspace:*"
     "@trezor/e2e-utils": "workspace:*"
     "@trezor/env-utils": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/protobuf": "workspace:*"
     "@trezor/suite": "workspace:*"
     "@trezor/suite-analytics": "workspace:*"
@@ -11987,6 +11968,7 @@ __metadata:
     cypress-file-upload: "npm:^5.0.8"
     cypress-image-snapshot: "npm:^4.0.1"
     cypress-real-events: "npm:^1.11.0"
+    eslint-plugin-cypress: "npm:^4.1.0"
     react: "npm:18.2.0"
     react-dom: "npm:18.2.0"
     react-helmet-async: "npm:^2.0.4"
@@ -11998,7 +11980,7 @@ __metadata:
     stylelint: "npm:^16.2.1"
     stylelint-config-standard: "npm:^36.0.0"
     tsx: "npm:^4.16.3"
-    webpack: "npm:^5.94.0"
+    webpack: "npm:^5.96.1"
     worker-loader: "npm:^3.0.8"
     ws: "npm:^8.18.0"
     yargs: "npm:17.7.2"
@@ -12010,16 +11992,16 @@ __metadata:
   resolution: "@trezor/suite@workspace:packages/suite"
   dependencies:
     "@crowdin/cli": "npm:^4.0.0"
-    "@everstake/wallet-sdk": "npm:^0.3.49"
+    "@everstake/wallet-sdk": "npm:^0.3.66"
     "@floating-ui/react": "npm:^0.26.9"
     "@formatjs/cli": "npm:^6.2.7"
     "@formatjs/intl": "npm:2.10.0"
-    "@hookform/resolvers": "npm:3.9.0"
+    "@hookform/resolvers": "npm:3.9.1"
     "@mobily/ts-belt": "npm:^3.13.1"
     "@reduxjs/toolkit": "npm:1.9.5"
     "@sentry/core": "npm:^7.100.1"
     "@solana/buffer-layout": "npm:^4.0.1"
-    "@solana/web3.js": "npm:^1.95.0"
+    "@solana/web3.js": "npm:^1.95.4"
     "@suite-common/analytics": "workspace:*"
     "@suite-common/assets": "workspace:*"
     "@suite-common/connect-init": "workspace:*"
@@ -12057,10 +12039,12 @@ __metadata:
     "@trezor/coinjoin": "workspace:*"
     "@trezor/components": "workspace:*"
     "@trezor/connect": "workspace:*"
+    "@trezor/connect-web": "workspace:*"
     "@trezor/crypto-utils": "workspace:*"
     "@trezor/device-utils": "workspace:*"
     "@trezor/dom-utils": "workspace:*"
     "@trezor/env-utils": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/ipc-proxy": "workspace:*"
     "@trezor/product-components": "workspace:*"
     "@trezor/react-utils": "workspace:*"
@@ -12088,7 +12072,6 @@ __metadata:
     "@types/redux-mock-store": "npm:^1.0.6"
     "@types/semver": "npm:^7.5.8"
     "@types/ua-parser-js": "npm:^0.7.39"
-    "@types/uuid": "npm:^10.0.0"
     "@types/zxcvbn": "npm:^4.4.4"
     bs58check: "npm:^4.0.0"
     date-fns: "npm:^2.30.0"
@@ -12104,13 +12087,12 @@ __metadata:
     pako: "npm:^2.1.0"
     pdfmake: "npm:^0.2.9"
     polished: "npm:^4.3.1"
-    proxy-memoize: "npm:2.0.2"
     qrcode.react: "npm:^3.1.0"
     react: "npm:18.2.0"
     react-dom: "npm:18.2.0"
     react-focus-lock: "npm:^2.9.7"
     react-helmet-async: "npm:^2.0.4"
-    react-hook-form: "npm:^7.53.0"
+    react-hook-form: "npm:^7.53.1"
     react-intl: "npm:^6.6.8"
     react-qr-reader: "npm:^2.2.1"
     react-redux: "npm:8.0.7"
@@ -12132,7 +12114,7 @@ __metadata:
     stylelint: "npm:^16.2.1"
     stylelint-config-standard: "npm:^36.0.0"
     typescript-styled-plugin: "npm:^0.18.3"
-    uuid: "npm:^10.0.0"
+    uuid: "npm:^11.0.2"
     web3-utils: "npm:^4.3.1"
     zxcvbn: "npm:^4.4.2"
   languageName: unknown
@@ -12152,6 +12134,7 @@ __metadata:
   resolution: "@trezor/transport-bridge@workspace:packages/transport-bridge"
   dependencies:
     "@trezor/components": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@trezor/node-utils": "workspace:*"
     "@trezor/protocol": "workspace:*"
     "@trezor/theme": "workspace:*"
@@ -12167,7 +12150,7 @@ __metadata:
     react-intl: "npm:^6.6.8"
     styled-components: "npm:^6.1.8"
     usb: "npm:^2.14.0"
-    webpack: "npm:^5.94.0"
+    webpack: "npm:^5.96.1"
   languageName: unknown
   linkType: soft
 
@@ -12185,6 +12168,8 @@ __metadata:
   resolution: "@trezor/transport-test@workspace:packages/transport-test"
   dependencies:
     "@jest/types": "npm:^29.6.3"
+    "@trezor/eslint": "workspace:*"
+    "@trezor/protobuf": "workspace:*"
     "@trezor/transport": "workspace:*"
     "@trezor/transport-bridge": "workspace:*"
     "@trezor/trezor-user-env-link": "workspace:^"
@@ -12204,12 +12189,13 @@ __metadata:
   dependencies:
     "@babel/preset-env": "npm:^7.23.9"
     "@babel/preset-typescript": "npm:^7.24.7"
+    "@trezor/eslint": "workspace:*"
     "@trezor/protobuf": "workspace:*"
     "@trezor/protocol": "workspace:*"
     "@trezor/trezor-user-env-link": "workspace:*"
     "@trezor/utils": "workspace:*"
     "@types/bytebuffer": "npm:^5.0.49"
-    "@types/sharedworker": "npm:^0.0.124"
+    "@types/sharedworker": "npm:^0.0.130"
     "@types/w3c-web-usb": "npm:^1.0.10"
     cross-fetch: "npm:^4.0.0"
     jest: "npm:29.7.0"
@@ -12253,6 +12239,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@trezor/utils@workspace:packages/utils"
   dependencies:
+    "@trezor/eslint": "workspace:*"
     bignumber.js: "npm:^9.1.2"
     tsx: "npm:^4.16.3"
   peerDependencies:
@@ -12264,11 +12251,14 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@trezor/utxo-lib@workspace:packages/utxo-lib"
   dependencies:
+    "@trezor/eslint": "workspace:*"
     "@trezor/utils": "workspace:*"
     "@types/bchaddrjs": "npm:^0.4.3"
+    "@types/bn.js": "npm:^5.1.6"
     "@types/bs58": "npm:^4.0.4"
     "@types/bs58check": "npm:^2.1.2"
     "@types/create-hmac": "npm:^1.1.3"
+    "@types/events": "npm:^3.0.3"
     "@types/wif": "npm:^2.0.5"
     bchaddrjs: "npm:^0.5.2"
     bech32: "npm:^2.0.0"
@@ -12298,9 +12288,10 @@ __metadata:
   resolution: "@trezor/webextension-mv3-sw-ts@workspace:packages/connect-examples/webextension-mv3-sw-ts"
   dependencies:
     "@trezor/connect-webextension": "workspace:^"
+    "@trezor/eslint": "workspace:^"
     copy-webpack-plugin: "npm:^12.0.2"
     html-webpack-plugin: "npm:^5.6.0"
-    webpack: "npm:^5.94.0"
+    webpack: "npm:^5.96.1"
   languageName: unknown
   linkType: soft
 
@@ -12419,12 +12410,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/bn.js@npm:^5.1.0, @types/bn.js@npm:^5.1.1":
-  version: 5.1.5
-  resolution: "@types/bn.js@npm:5.1.5"
+"@types/bn.js@npm:^5.1.6":
+  version: 5.1.6
+  resolution: "@types/bn.js@npm:5.1.6"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10/9719330c86aeae0a6a447c974cf0f853ba3660ede20de61f435b03d699e30e6d8b35bf71a8dc9fdc8317784438e83177644ba068ed653d0ae0106e1ecbfe289e
+  checksum: 10/db565b5a2af59b09459d74441153bf23a0e80f1fb2d070330786054e7ce1a7285dc40afcd8f289426c61a83166bdd70814f70e2d439744686aac5d3ea75daf13
   languageName: node
   linkType: hard
 
@@ -12483,7 +12474,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/cacheable-request@npm:^6.0.1, @types/cacheable-request@npm:^6.0.2":
+"@types/cacheable-request@npm:^6.0.1":
   version: 6.0.3
   resolution: "@types/cacheable-request@npm:6.0.3"
   dependencies:
@@ -12511,13 +12502,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/chrome@npm:^0.0.270":
-  version: 0.0.270
-  resolution: "@types/chrome@npm:0.0.270"
+"@types/chrome@npm:^0.0.278":
+  version: 0.0.278
+  resolution: "@types/chrome@npm:0.0.278"
   dependencies:
     "@types/filesystem": "npm:*"
     "@types/har-format": "npm:*"
-  checksum: 10/7d5e350dbfb58b4bbab67df83324f353e97c78171ec3df3d37ea2fd57fc2011311fa8cc91ba98d54d0f989716076777a39b125a0782109646faca94853984522
+  checksum: 10/8fa2e68bd28b28f14599aee36ecd40f32f42fd68e4012145205930f4bf2d62f57b1b0b5af033e15d0fbdeadb211fd51c14f8ef3caf34176f8c5d127ac3fe8641
   languageName: node
   linkType: hard
 
@@ -12761,6 +12752,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/eslint-scope@npm:^3.7.7":
+  version: 3.7.7
+  resolution: "@types/eslint-scope@npm:3.7.7"
+  dependencies:
+    "@types/eslint": "npm:*"
+    "@types/estree": "npm:*"
+  checksum: 10/e2889a124aaab0b89af1bab5959847c5bec09809209255de0e63b9f54c629a94781daa04adb66bffcdd742f5e25a17614fb933965093c0eea64aacda4309380e
+  languageName: node
+  linkType: hard
+
+"@types/eslint@npm:*":
+  version: 9.6.1
+  resolution: "@types/eslint@npm:9.6.1"
+  dependencies:
+    "@types/estree": "npm:*"
+    "@types/json-schema": "npm:*"
+  checksum: 10/719fcd255760168a43d0e306ef87548e1e15bffe361d5f4022b0f266575637acc0ecb85604ac97879ee8ae83c6a6d0613b0ed31d0209ddf22a0fe6d608fc56fe
+  languageName: node
+  linkType: hard
+
 "@types/estree-jsx@npm:^1.0.0":
   version: 1.0.5
   resolution: "@types/estree-jsx@npm:1.0.5"
@@ -12770,7 +12781,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:1.0.5, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5":
+"@types/estree@npm:*, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "@types/estree@npm:1.0.6"
+  checksum: 10/9d35d475095199c23e05b431bcdd1f6fec7380612aed068b14b2a08aa70494de8a9026765a5a91b1073f636fb0368f6d8973f518a31391d519e20c59388ed88d
+  languageName: node
+  linkType: hard
+
+"@types/estree@npm:1.0.5":
   version: 1.0.5
   resolution: "@types/estree@npm:1.0.5"
   checksum: 10/7de6d928dd4010b0e20c6919e1a6c27b61f8d4567befa89252055fad503d587ecb9a1e3eab1b1901f923964d7019796db810b7fd6430acb26c32866d126fd408
@@ -12784,6 +12802,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/events@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "@types/events@npm:3.0.3"
+  checksum: 10/50af9312fab001fd6bd4bb3ff65830f940877e6778de140a92481a0d9bf5f4853d44ec758a8800ef60e0598ac43ed1b5688116a3c65906ae54e989278d6c7c82
+  languageName: node
+  linkType: hard
+
 "@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^4.17.33":
   version: 4.17.35
   resolution: "@types/express-serve-static-core@npm:4.17.35"
@@ -12871,7 +12896,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/git-url-parse@npm:^9.0.1":
+"@types/git-url-parse@npm:^9.0.3":
   version: 9.0.3
   resolution: "@types/git-url-parse@npm:9.0.3"
   checksum: 10/ae5389bf4339e0e863d84e92cd8af137ea485ea7141a25998300ae38ba471617af004791f4c6f86431eb5fb0c70ad4dda3558ca9b0a020a3897058e95a91515e
@@ -13057,10 +13082,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/json-schema@npm:^7.0.11, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.6, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
-  version: 7.0.14
-  resolution: "@types/json-schema@npm:7.0.14"
-  checksum: 10/84b5efed51984c077f9cb7c5a3dcb8d8288ce1ae8825952b173c3506a0cfc90bc961d7f2a8847c440310d02bbd570cf918ac463d8310b0c9dce2252baa1ba4e0
+"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.11, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.15, @types/json-schema@npm:^7.0.6, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
+  version: 7.0.15
+  resolution: "@types/json-schema@npm:7.0.15"
+  checksum: 10/1a3c3e06236e4c4aab89499c428d585527ce50c24fe8259e8b3926d3df4cfbbbcf306cfc73ddfb66cbafc973116efd15967020b0f738f63e09e64c7d260519e7
   languageName: node
   linkType: hard
 
@@ -13353,15 +13378,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/pbkdf2@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "@types/pbkdf2@npm:3.1.0"
-  dependencies:
-    "@types/node": "npm:*"
-  checksum: 10/d15024b1957c21cf3b8887329d9bd8dfde754cf13a09d76ae25f1391cfc62bb8b8d7b760773c5dbaa748172fba8b3e0c3dbe962af6ccbd69b76df12a48dfba40
-  languageName: node
-  linkType: hard
-
 "@types/pdfkit@npm:*":
   version: 0.12.6
   resolution: "@types/pdfkit@npm:0.12.6"
@@ -13588,16 +13604,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/secp256k1@npm:^4.0.1":
-  version: 4.0.3
-  resolution: "@types/secp256k1@npm:4.0.3"
-  dependencies:
-    "@types/node": "npm:*"
-  checksum: 10/aa8176f3fb9a9f37189592425cb6bfec4ffcf3dc397f2bfd8e3acd06be25f5213cbc0df01f541c7cc955b906a61befd5c1092d46adc62e489970bfebf4409e1d
-  languageName: node
-  linkType: hard
-
-"@types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4, @types/semver@npm:^7.5.6, @types/semver@npm:^7.5.8":
+"@types/semver@npm:^7.3.4, @types/semver@npm:^7.5.6, @types/semver@npm:^7.5.8":
   version: 7.5.8
   resolution: "@types/semver@npm:7.5.8"
   checksum: 10/3496808818ddb36deabfe4974fd343a78101fa242c4690044ccdc3b95dcf8785b494f5d628f2f47f38a702f8db9c53c67f47d7818f2be1b79f2efb09692e1178
@@ -13634,10 +13641,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/sharedworker@npm:^0.0.124":
-  version: 0.0.124
-  resolution: "@types/sharedworker@npm:0.0.124"
-  checksum: 10/c2743267eaefd2860a2488846b1c825b633aa3f0cf755459994cd181f25f296b8149c9caa1ec3320ef03653c24626e5dc5d303f13a87bda73a4f9504276af324
+"@types/sharedworker@npm:^0.0.130":
+  version: 0.0.130
+  resolution: "@types/sharedworker@npm:0.0.130"
+  checksum: 10/23c4b09f5c1c4ac421d7e8b0c9f2da3d4ef2e3fdaa29e1d899722311dbd4d57e50360efd2a6d05e7cecf2a9b5c7d6dc35df52115c58fe28cccab2614f5675251
   languageName: node
   linkType: hard
 
@@ -13730,13 +13737,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/uuid@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "@types/uuid@npm:10.0.0"
-  checksum: 10/e3958f8b0fe551c86c14431f5940c3470127293280830684154b91dc7eb3514aeb79fe3216968833cf79d4d1c67f580f054b5be2cd562bebf4f728913e73e944
-  languageName: node
-  linkType: hard
-
 "@types/uuid@npm:^8.3.4":
   version: 8.3.4
   resolution: "@types/uuid@npm:8.3.4"
@@ -13765,10 +13765,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/web@npm:^0.0.162":
-  version: 0.0.162
-  resolution: "@types/web@npm:0.0.162"
-  checksum: 10/19cba7befa02cbf96fc14cb95503f24844a70626b45679b721a66a7a1941002e165f5d45a741d03e4908497ba4e9a47dcc001f0a281bc3d3de472e36017c8240
+"@types/web@npm:^0.0.174":
+  version: 0.0.174
+  resolution: "@types/web@npm:0.0.174"
+  checksum: 10/e249ac2b2ce8a11d0933fd9a307dc2fd8d627c93b3c15b2d6fe959133aa6ee2608cdef58c39ce237b7cd081fa6c12e7cd720dbf2a53f7161475c3f551f89a86d
   languageName: node
   linkType: hard
 
@@ -13808,6 +13808,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/ws@npm:8.5.3":
+  version: 8.5.3
+  resolution: "@types/ws@npm:8.5.3"
+  dependencies:
+    "@types/node": "npm:*"
+  checksum: 10/08aac698ce6480b532d8311f790a8744ae489ccdd98f374cfe4b8245855439825c64b031abcbba4f30fb280da6cc2b02a4e261e16341d058ffaeecaa24ba2bd3
+  languageName: node
+  linkType: hard
+
 "@types/ws@npm:^7.2.0, @types/ws@npm:^7.4.4":
   version: 7.4.7
   resolution: "@types/ws@npm:7.4.7"
@@ -13867,15 +13876,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^8.5.0":
-  version: 8.5.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:8.5.0"
+"@typescript-eslint/eslint-plugin@npm:8.13.0":
+  version: 8.13.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:8.13.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:8.5.0"
-    "@typescript-eslint/type-utils": "npm:8.5.0"
-    "@typescript-eslint/utils": "npm:8.5.0"
-    "@typescript-eslint/visitor-keys": "npm:8.5.0"
+    "@typescript-eslint/scope-manager": "npm:8.13.0"
+    "@typescript-eslint/type-utils": "npm:8.13.0"
+    "@typescript-eslint/utils": "npm:8.13.0"
+    "@typescript-eslint/visitor-keys": "npm:8.13.0"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
@@ -13886,101 +13895,66 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10/344f5aca7e167544af718b81269b87b8c2a041210882cac76e1608dbec7c2a646de74387920ca9a5704fcd4c24ada052c2bc5adbeee39e950e7bce83647dae7d
+  checksum: 10/3f38f64dfdc5c33d377d0f4aff9c71cc363bc7d4cea5c3da9c5bb934758cb5129f48194f84d4886a4208a70a18395c597561926490027508045f778190686909
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^8.5.0":
-  version: 8.5.0
-  resolution: "@typescript-eslint/parser@npm:8.5.0"
+"@typescript-eslint/parser@npm:8.13.0":
+  version: 8.13.0
+  resolution: "@typescript-eslint/parser@npm:8.13.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:8.5.0"
-    "@typescript-eslint/types": "npm:8.5.0"
-    "@typescript-eslint/typescript-estree": "npm:8.5.0"
-    "@typescript-eslint/visitor-keys": "npm:8.5.0"
+    "@typescript-eslint/scope-manager": "npm:8.13.0"
+    "@typescript-eslint/types": "npm:8.13.0"
+    "@typescript-eslint/typescript-estree": "npm:8.13.0"
+    "@typescript-eslint/visitor-keys": "npm:8.13.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10/f0d5a11a8d4b42750c3e7a3a8f6874740c7bb006b6bf3037a2b1422ba8f4eb2ff2d46e673a9f54007b95d3e4302b7966677b2481da58b6307d0ceb962478ee95
+  checksum: 10/174f705ce44e4dca83badad053eed50fb3703be6a4379e91f7c260c7f7d0c5e7bcfefd4f2c3170449b6c8f04a8f38c0cefc1a399be7d4913b86ab80d1b7783ec
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.60.0":
-  version: 5.60.0
-  resolution: "@typescript-eslint/scope-manager@npm:5.60.0"
+"@typescript-eslint/scope-manager@npm:8.13.0":
+  version: 8.13.0
+  resolution: "@typescript-eslint/scope-manager@npm:8.13.0"
   dependencies:
-    "@typescript-eslint/types": "npm:5.60.0"
-    "@typescript-eslint/visitor-keys": "npm:5.60.0"
-  checksum: 10/157daafbefdb4e773d2cfdcd65f57f56470fbf38dcdb41827785421c653ced9cc3c5615dbd058ab3f112ffc644ce75b3f6ed412e26dd7247b4fe37f48bd30ffb
+    "@typescript-eslint/types": "npm:8.13.0"
+    "@typescript-eslint/visitor-keys": "npm:8.13.0"
+  checksum: 10/e5738943b9af4a312e33d9db9362fcd0806f365655efb3df9db1ada5a3f0e974f73493b02727d31c3a06234c3bd8b7b7ddd5d492623c7c7547ec2085c1ac1e09
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:8.5.0":
-  version: 8.5.0
-  resolution: "@typescript-eslint/scope-manager@npm:8.5.0"
+"@typescript-eslint/type-utils@npm:8.13.0":
+  version: 8.13.0
+  resolution: "@typescript-eslint/type-utils@npm:8.13.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.5.0"
-    "@typescript-eslint/visitor-keys": "npm:8.5.0"
-  checksum: 10/18f9958cdf196a0beede93535e564313d27dfd392a335952c785e46c32def55fdeae8c3c7d46f07c81c105ed2b48e9cd36a1fe5101fccd80e83c04cf1693dbed
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/type-utils@npm:8.5.0":
-  version: 8.5.0
-  resolution: "@typescript-eslint/type-utils@npm:8.5.0"
-  dependencies:
-    "@typescript-eslint/typescript-estree": "npm:8.5.0"
-    "@typescript-eslint/utils": "npm:8.5.0"
+    "@typescript-eslint/typescript-estree": "npm:8.13.0"
+    "@typescript-eslint/utils": "npm:8.13.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.3.0"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10/ed487c8b530a0a6ea292385c82b2d9d9d94b99768ddd93882899be3319ea6af09c1b9f1a07e0381beb6149bbbb1f66ae95a635279fad8946345fd2298bce3549
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/types@npm:5.60.0":
-  version: 5.60.0
-  resolution: "@typescript-eslint/types@npm:5.60.0"
-  checksum: 10/5a5d7961e7431f2e15597309de0679752726c7df7dfe70093664485ad3bcbe729249b96a4241c2b5a3fcc08541eeb4ece0e785cf295d85aeaee82c9c4626371d
+  checksum: 10/9718cd2c37dcb0bc2b234121629c41e24ade137f5ed915c3f597e53c3ca883d7ee2356f516f027307c12481a6af7620477bf4d6870ac454eb5c4afffbd1eab9e
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:8.5.0":
-  version: 8.5.0
-  resolution: "@typescript-eslint/types@npm:8.5.0"
-  checksum: 10/5cc55411fbf3f46d1571fe6ad1ef88f937093629a58e2b7bafb389646dde8a4e29d938fd57309eb30ee3f20978b4bdc5f823b31d718e053ba4c54c637a6df4e4
+"@typescript-eslint/types@npm:8.13.0":
+  version: 8.13.0
+  resolution: "@typescript-eslint/types@npm:8.13.0"
+  checksum: 10/0051c4a798b8f328451290581f0c8c95acfcb988192647edcb9179013793b8ccc7110b5fee74207394340aca8919d9ca039de2bbd36f41c7693a99d1345092c3
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.60.0":
-  version: 5.60.0
-  resolution: "@typescript-eslint/typescript-estree@npm:5.60.0"
+"@typescript-eslint/typescript-estree@npm:8.13.0":
+  version: 8.13.0
+  resolution: "@typescript-eslint/typescript-estree@npm:8.13.0"
   dependencies:
-    "@typescript-eslint/types": "npm:5.60.0"
-    "@typescript-eslint/visitor-keys": "npm:5.60.0"
-    debug: "npm:^4.3.4"
-    globby: "npm:^11.1.0"
-    is-glob: "npm:^4.0.3"
-    semver: "npm:^7.3.7"
-    tsutils: "npm:^3.21.0"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 10/78a3934a383874b8cf85292cd6328928b23983b65204fd855c61227deb6f4dcc196fdeef7c977670dc4070feb2d810df44a38da7409be5e31385c326f14b2378
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/typescript-estree@npm:8.5.0":
-  version: 8.5.0
-  resolution: "@typescript-eslint/typescript-estree@npm:8.5.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:8.5.0"
-    "@typescript-eslint/visitor-keys": "npm:8.5.0"
+    "@typescript-eslint/types": "npm:8.13.0"
+    "@typescript-eslint/visitor-keys": "npm:8.13.0"
     debug: "npm:^4.3.4"
     fast-glob: "npm:^3.3.2"
     is-glob: "npm:^4.0.3"
@@ -13990,59 +13964,31 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10/69f21c49a158c394106e0d627f57451430cf32449a6c01118ee4afbb9f92f06be3aa87f3478ffc84d1062c3b21dca983e458f70f2cbe4fee1ad206f84ab97eb8
+  checksum: 10/2aef1bda245ec66b0d0b1b3ed4ab672725ba33c16abc0781f4e0314cf638ef7b3b1d9682e8e9ee18f3e5e51bc4b22cc428c778c2927fd4cf8495dbe736ae522f
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:8.5.0":
-  version: 8.5.0
-  resolution: "@typescript-eslint/utils@npm:8.5.0"
+"@typescript-eslint/utils@npm:8.13.0, @typescript-eslint/utils@npm:^6.0.0 || ^7.0.0 || ^8.0.0":
+  version: 8.13.0
+  resolution: "@typescript-eslint/utils@npm:8.13.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@typescript-eslint/scope-manager": "npm:8.5.0"
-    "@typescript-eslint/types": "npm:8.5.0"
-    "@typescript-eslint/typescript-estree": "npm:8.5.0"
+    "@typescript-eslint/scope-manager": "npm:8.13.0"
+    "@typescript-eslint/types": "npm:8.13.0"
+    "@typescript-eslint/typescript-estree": "npm:8.13.0"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
-  checksum: 10/f4727ebdee15082debe61a815eaad588f006a4f93d7fe94d065da563b4d3f91b7b7f795b5c77aa4cdebdf0936f83aa878089f22b8dbdbb738c557e8974129f54
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/utils@npm:^5.10.0":
-  version: 5.60.0
-  resolution: "@typescript-eslint/utils@npm:5.60.0"
-  dependencies:
-    "@eslint-community/eslint-utils": "npm:^4.2.0"
-    "@types/json-schema": "npm:^7.0.9"
-    "@types/semver": "npm:^7.3.12"
-    "@typescript-eslint/scope-manager": "npm:5.60.0"
-    "@typescript-eslint/types": "npm:5.60.0"
-    "@typescript-eslint/typescript-estree": "npm:5.60.0"
-    eslint-scope: "npm:^5.1.1"
-    semver: "npm:^7.3.7"
-  peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 10/41044f37ab049ded83f4d3baaf93986e9e7162d5bd9d055575004dce8e6a09697f9a93bbcd5385262c263c0c45cb9a47d4a5a4a9fee20b8283211d0d0b51c8a1
+  checksum: 10/93ee0784f9865fee3e9cdc4796daaa7842a9e54b8436341b9b8367c69cbd90cac9da47669289967309f58ad63d8e68559d74972a34d531289637c8cac3415ed2
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.60.0":
-  version: 5.60.0
-  resolution: "@typescript-eslint/visitor-keys@npm:5.60.0"
+"@typescript-eslint/visitor-keys@npm:8.13.0":
+  version: 8.13.0
+  resolution: "@typescript-eslint/visitor-keys@npm:8.13.0"
   dependencies:
-    "@typescript-eslint/types": "npm:5.60.0"
-    eslint-visitor-keys: "npm:^3.3.0"
-  checksum: 10/5b8a5a47668b2d6f1368bb1a7c5a81d992e18a2011c59957a260e32d6a25eb14aff2d80848c6a3a1eb21d24e94875e11641bf8cc7de2f5f57cec11b03e12f391
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/visitor-keys@npm:8.5.0":
-  version: 8.5.0
-  resolution: "@typescript-eslint/visitor-keys@npm:8.5.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:8.5.0"
+    "@typescript-eslint/types": "npm:8.13.0"
     eslint-visitor-keys: "npm:^3.4.3"
-  checksum: 10/32cc9d8120531bb1b5da79d697ab80bbbf18e5630d74c8b6c0f835d7914be7833ed9e5b95fa05f6f7b724d928cd4208b4028a2cc9d767401434d88214614887b
+  checksum: 10/630718da32ffa7144b7a8300802136a5fb3084c8b3dc7c277981939408b19d57214e0f721b8011f64ae083bac5367a8a319366c74ef7bcb9fd90508f780fb2de
   languageName: node
   linkType: hard
 
@@ -14091,7 +14037,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ungap/structured-clone@npm:^1.0.0, @ungap/structured-clone@npm:^1.2.0":
+"@ungap/structured-clone@npm:^1.0.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"
   checksum: 10/c6fe89a505e513a7592e1438280db1c075764793a2397877ff1351721fe8792a966a5359769e30242b3cd023f2efb9e63ca2ca88019d73b564488cc20e3eab12
@@ -14457,6 +14403,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@xmldom/xmldom@npm:^0.7.2, @xmldom/xmldom@npm:~0.7.7":
+  version: 0.7.13
+  resolution: "@xmldom/xmldom@npm:0.7.13"
+  checksum: 10/a359d15fe3c24fe85a1e1b3bc4cfd23d4f014fb8aa382aa445cccaac545e42958b75e386dd4853c76d82036401400b8d5e33cbcbfb6af7cdadeba769eae6122a
+  languageName: node
+  linkType: hard
+
 "@xmldom/xmldom@npm:^0.8.8":
   version: 0.8.10
   resolution: "@xmldom/xmldom@npm:0.8.10"
@@ -14464,13 +14417,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@xmldom/xmldom@npm:~0.7.7":
-  version: 0.7.9
-  resolution: "@xmldom/xmldom@npm:0.7.9"
-  checksum: 10/730f6733a90ad014f13f2071b1018434a8b0c49838006645210d26398cb6c7e096b843d0e79fd168deea34fbe27c880698dc8577d38bdb95c9d0e8cc4198dd16
-  languageName: node
-  linkType: hard
-
 "@xobotyi/scrollbar-width@npm:^1.9.5":
   version: 1.9.5
   resolution: "@xobotyi/scrollbar-width@npm:1.9.5"
@@ -14577,13 +14523,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abbrev@npm:^1.0.0":
-  version: 1.1.1
-  resolution: "abbrev@npm:1.1.1"
-  checksum: 10/2d882941183c66aa665118bafdab82b7a177e9add5eb2776c33e960a4f3c89cff88a1b38aba13a456de01d0dd9d66a8bea7c903268b21ea91dd1097e1e2e8243
-  languageName: node
-  linkType: hard
-
 "abbrev@npm:^2.0.0":
   version: 2.0.0
   resolution: "abbrev@npm:2.0.0"
@@ -14591,6 +14530,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"abitype@npm:0.7.1":
+  version: 0.7.1
+  resolution: "abitype@npm:0.7.1"
+  peerDependencies:
+    typescript: ">=4.9.4"
+    zod: ^3 >=3.19.1
+  peerDependenciesMeta:
+    zod:
+      optional: true
+  checksum: 10/deee4a18c9c7218ab2e5e57e07e4cb3e2f3e785657be364d098ab0587cd552c4fbb41e1bdddbc6fa52387f51ebd181461fe70a13127cc77091655775fdfb18fe
+  languageName: node
+  linkType: hard
+
 "abort-controller@npm:^3.0.0":
   version: 3.0.0
   resolution: "abort-controller@npm:3.0.0"
@@ -14600,13 +14552,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abortcontroller-polyfill@npm:^1.7.5":
-  version: 1.7.5
-  resolution: "abortcontroller-polyfill@npm:1.7.5"
-  checksum: 10/aac398f7fc076235fe731adaffd2c319fe6c1527af8ca561890242d5396351350e0705726478778dc90326a69a4c044890c156fe867cba7f3ffeb670f8665a51
-  languageName: node
-  linkType: hard
-
 "accepts@npm:^1.3.5, accepts@npm:^1.3.7, accepts@npm:^1.3.8, accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.7, accepts@npm:~1.3.8":
   version: 1.3.8
   resolution: "accepts@npm:1.3.8"
@@ -14627,15 +14572,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-import-attributes@npm:^1.9.5":
-  version: 1.9.5
-  resolution: "acorn-import-attributes@npm:1.9.5"
-  peerDependencies:
-    acorn: ^8
-  checksum: 10/8bfbfbb6e2467b9b47abb4d095df717ab64fce2525da65eabee073e85e7975fb3a176b6c8bba17c99a7d8ede283a10a590272304eb54a93c4aa1af9790d47a8b
-  languageName: node
-  linkType: hard
-
 "acorn-jsx@npm:^5.0.0, acorn-jsx@npm:^5.3.1, acorn-jsx@npm:^5.3.2":
   version: 5.3.2
   resolution: "acorn-jsx@npm:5.3.2"
@@ -14679,12 +14615,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.0.0, acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.10.0, acorn@npm:^8.11.3, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
-  version: 8.11.3
-  resolution: "acorn@npm:8.11.3"
+"acorn@npm:^8.0.0, acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.10.0, acorn@npm:^8.11.3, acorn@npm:^8.14.0, acorn@npm:^8.4.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
+  version: 8.14.0
+  resolution: "acorn@npm:8.14.0"
   bin:
     acorn: bin/acorn
-  checksum: 10/b688e7e3c64d9bfb17b596e1b35e4da9d50553713b3b3630cf5690f2b023a84eac90c56851e6912b483fe60e8b4ea28b254c07e92f17ef83d72d78745a8352dd
+  checksum: 10/6df29c35556782ca9e632db461a7f97947772c6c1d5438a81f0c873a3da3a792487e83e404d1c6c25f70513e91aa18745f6eafb1fcc3a43ecd1920b21dd173d2
   languageName: node
   linkType: hard
 
@@ -14702,7 +14638,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"agent-base@npm:6, agent-base@npm:^6.0.2":
+"agent-base@npm:6":
   version: 6.0.2
   resolution: "agent-base@npm:6.0.2"
   dependencies:
@@ -14711,16 +14647,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0":
-  version: 7.1.0
-  resolution: "agent-base@npm:7.1.0"
+"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "agent-base@npm:7.1.1"
   dependencies:
     debug: "npm:^4.3.4"
-  checksum: 10/f7828f991470a0cc22cb579c86a18cbae83d8a3cbed39992ab34fc7217c4d126017f1c74d0ab66be87f71455318a8ea3e757d6a37881b8d0f2a2c6aa55e5418f
+  checksum: 10/c478fec8f79953f118704d007a38f2a185458853f5c45579b9669372bd0e12602e88dc2ad0233077831504f7cd6fcc8251c383375bba5eaaf563b102938bda26
   languageName: node
   linkType: hard
 
-"agentkeepalive@npm:^4.2.1, agentkeepalive@npm:^4.5.0":
+"agentkeepalive@npm:^4.5.0":
   version: 4.5.0
   resolution: "agentkeepalive@npm:4.5.0"
   dependencies:
@@ -14785,7 +14721,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^6.10.0, ajv@npm:^6.12.0, ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.12.5":
+"ajv@npm:^6.10.0, ajv@npm:^6.12.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5":
   version: 6.12.6
   resolution: "ajv@npm:6.12.6"
   dependencies:
@@ -14966,50 +14902,53 @@ __metadata:
   languageName: node
   linkType: hard
 
-"app-builder-bin@npm:5.0.0-alpha.7":
-  version: 5.0.0-alpha.7
-  resolution: "app-builder-bin@npm:5.0.0-alpha.7"
-  checksum: 10/4338d9934b253c73d41a07f22f55e34f6e1e2550d6509c9813b54819c46755a501be1b5d6850b68918f717ec7d526494d896109f9b1de17100a4d36b4d518c73
+"app-builder-bin@npm:5.0.0-alpha.10":
+  version: 5.0.0-alpha.10
+  resolution: "app-builder-bin@npm:5.0.0-alpha.10"
+  checksum: 10/842dc0cade3f1dc2c3fc2809511a4ecb86146d17d22e35d97a493bf3c8bd131552e935abd8ed8df40f6f62d8b231b7b705c81df709becdd55dc28dc6f247af31
   languageName: node
   linkType: hard
 
-"app-builder-lib@npm:25.0.5":
-  version: 25.0.5
-  resolution: "app-builder-lib@npm:25.0.5"
+"app-builder-lib@npm:25.1.8":
+  version: 25.1.8
+  resolution: "app-builder-lib@npm:25.1.8"
   dependencies:
     "@develar/schema-utils": "npm:~2.6.5"
-    "@electron/notarize": "npm:2.3.2"
+    "@electron/notarize": "npm:2.5.0"
     "@electron/osx-sign": "npm:1.3.1"
-    "@electron/rebuild": "npm:3.6.0"
+    "@electron/rebuild": "npm:3.6.1"
     "@electron/universal": "npm:2.0.1"
     "@malept/flatpak-bundler": "npm:^0.4.0"
     "@types/fs-extra": "npm:9.0.13"
     async-exit-hook: "npm:^2.0.1"
     bluebird-lst: "npm:^1.0.9"
-    builder-util: "npm:25.0.3"
-    builder-util-runtime: "npm:9.2.5"
+    builder-util: "npm:25.1.7"
+    builder-util-runtime: "npm:9.2.10"
     chromium-pickle-js: "npm:^0.2.0"
+    config-file-ts: "npm:0.2.8-rc1"
     debug: "npm:^4.3.4"
+    dotenv: "npm:^16.4.5"
+    dotenv-expand: "npm:^11.0.6"
     ejs: "npm:^3.1.8"
-    electron-publish: "npm:25.0.3"
+    electron-publish: "npm:25.1.7"
     form-data: "npm:^4.0.0"
     fs-extra: "npm:^10.1.0"
     hosted-git-info: "npm:^4.1.0"
     is-ci: "npm:^3.0.0"
     isbinaryfile: "npm:^5.0.0"
     js-yaml: "npm:^4.1.0"
+    json5: "npm:^2.2.3"
     lazy-val: "npm:^1.0.5"
     minimatch: "npm:^10.0.0"
-    read-config-file: "npm:6.4.0"
     resedit: "npm:^1.7.0"
     sanitize-filename: "npm:^1.6.3"
     semver: "npm:^7.3.8"
     tar: "npm:^6.1.12"
     temp-file: "npm:^3.4.0"
   peerDependencies:
-    dmg-builder: 25.0.5
-    electron-builder-squirrel-windows: 25.0.5
-  checksum: 10/fa78e12fc5a56e4c536624585dcb8db26783f4c18517ff8be49259ea5e1dc39aab3cf612e577020ed3f52938505cfc297dd6a47439e8ff99dc1ca25d5620a88b
+    dmg-builder: 25.1.8
+    electron-builder-squirrel-windows: 25.1.8
+  checksum: 10/0af82ffd8389b6dbacffd0ee3191ed056b411f069c362e0f676bf00413d8cb14f0d6d9047e1ab388a578e7f41c8338daa489a259de1203d4b9fc465254dda685
   languageName: node
   linkType: hard
 
@@ -15043,13 +14982,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aproba@npm:^1.0.3 || ^2.0.0":
-  version: 2.0.0
-  resolution: "aproba@npm:2.0.0"
-  checksum: 10/c2b9a631298e8d6f3797547e866db642f68493808f5b37cd61da778d5f6ada890d16f668285f7d60bd4fc3b03889bd590ffe62cf81b700e9bb353431238a0a7b
-  languageName: node
-  linkType: hard
-
 "aptos@npm:^1.8.4":
   version: 1.21.0
   resolution: "aptos@npm:1.21.0"
@@ -15071,16 +15003,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"are-we-there-yet@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "are-we-there-yet@npm:3.0.1"
-  dependencies:
-    delegates: "npm:^1.0.0"
-    readable-stream: "npm:^3.6.0"
-  checksum: 10/390731720e1bf9ed5d0efc635ea7df8cbc4c90308b0645a932f06e8495a0bf1ecc7987d3b97e805f62a17d6c4b634074b25200aa4d149be2a7b17250b9744bc4
-  languageName: node
-  linkType: hard
-
 "arg@npm:1.0.0":
   version: 1.0.0
   resolution: "arg@npm:1.0.0"
@@ -15088,6 +15010,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"arg@npm:4.1.0":
+  version: 4.1.0
+  resolution: "arg@npm:4.1.0"
+  checksum: 10/dc0e1ea7f0adee7871c456bd57f06fb9f8c2ccd91fd0537c73b66f3fa0c9697ccdfc25b358a417a3ab263c062aac0ef2df3a5523433861fe6277cb2ff769a9bc
+  languageName: node
+  linkType: hard
+
 "arg@npm:5.0.2, arg@npm:^5.0.2":
   version: 5.0.2
   resolution: "arg@npm:5.0.2"
@@ -15127,12 +15056,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aria-query@npm:^5.0.0, aria-query@npm:^5.3.0":
-  version: 5.3.0
-  resolution: "aria-query@npm:5.3.0"
-  dependencies:
-    dequal: "npm:^2.0.3"
-  checksum: 10/c3e1ed127cc6886fea4732e97dd6d3c3938e64180803acfb9df8955517c4943760746ffaf4020ce8f7ffaa7556a3b5f85c3769a1f5ca74a1288e02d042f9ae4e
+"aria-query@npm:^5.0.0, aria-query@npm:^5.3.2":
+  version: 5.3.2
+  resolution: "aria-query@npm:5.3.2"
+  checksum: 10/b2fe9bc98bd401bc322ccb99717c1ae2aaf53ea0d468d6e7aebdc02fac736e4a99b46971ee05b783b08ade23c675b2d8b60e4a1222a95f6e27bc4d2a0bfdcc03
   languageName: node
   linkType: hard
 
@@ -15143,13 +15070,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-buffer-byte-length@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "array-buffer-byte-length@npm:1.0.0"
+"array-buffer-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "array-buffer-byte-length@npm:1.0.1"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    is-array-buffer: "npm:^3.0.1"
-  checksum: 10/044e101ce150f4804ad19c51d6c4d4cfa505c5b2577bd179256e4aa3f3f6a0a5e9874c78cd428ee566ac574c8a04d7ce21af9fe52e844abfdccb82b33035a7c3
+    call-bind: "npm:^1.0.5"
+    is-array-buffer: "npm:^3.0.4"
+  checksum: 10/53524e08f40867f6a9f35318fafe467c32e45e9c682ba67b11943e167344d2febc0f6977a17e699b05699e805c3e8f073d876f8bbf1b559ed494ad2cd0fae09e
   languageName: node
   linkType: hard
 
@@ -15174,16 +15101,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-includes@npm:^3.1.6, array-includes@npm:^3.1.7":
-  version: 3.1.7
-  resolution: "array-includes@npm:3.1.7"
+"array-includes@npm:^3.1.6, array-includes@npm:^3.1.8":
+  version: 3.1.8
+  resolution: "array-includes@npm:3.1.8"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    get-intrinsic: "npm:^1.2.1"
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-object-atoms: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.2.4"
     is-string: "npm:^1.0.7"
-  checksum: 10/856a8be5d118967665936ad33ff3b07adfc50b06753e596e91fb80c3da9b8c022e92e3cc6781156d6ad95db7109b9f603682c7df2d6a529ed01f7f6b39a4a360
+  checksum: 10/290b206c9451f181fb2b1f79a3bf1c0b66bb259791290ffbada760c79b284eef6f5ae2aeb4bcff450ebc9690edd25732c4c73a3c2b340fcc0f4563aed83bf488
   languageName: node
   linkType: hard
 
@@ -15194,16 +15122,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.findlastindex@npm:^1.2.3":
-  version: 1.2.3
-  resolution: "array.prototype.findlastindex@npm:1.2.3"
+"array.prototype.findlast@npm:^1.2.5":
+  version: 1.2.5
+  resolution: "array.prototype.findlast@npm:1.2.5"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    es-shim-unscopables: "npm:^1.0.0"
-    get-intrinsic: "npm:^1.2.1"
-  checksum: 10/063cbab8eeac3aa01f3e980eecb9a8c5d87723032b49f7f814ecc6d75c33c03c17e3f43a458127a62e16303cab412f95d6ad9dc7e0ae6d9dc27a9bb76c24df7a
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10/7dffcc665aa965718ad6de7e17ac50df0c5e38798c0a5bf9340cf24feb8594df6ec6f3fcbe714c1577728a1b18b5704b15669474b27bceeca91ef06ce2a23c31
+  languageName: node
+  linkType: hard
+
+"array.prototype.findlastindex@npm:^1.2.5":
+  version: 1.2.5
+  resolution: "array.prototype.findlastindex@npm:1.2.5"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10/7c5c821f357cd53ab6cc305de8086430dd8d7a2485db87b13f843e868055e9582b1fd338f02338f67fc3a1603ceaf9610dd2a470b0b506f9d18934780f95b246
   languageName: node
   linkType: hard
 
@@ -15219,7 +15162,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.flatmap@npm:^1.3.1, array.prototype.flatmap@npm:^1.3.2":
+"array.prototype.flatmap@npm:^1.3.2":
   version: 1.3.2
   resolution: "array.prototype.flatmap@npm:1.3.2"
   dependencies:
@@ -15244,31 +15187,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.tosorted@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "array.prototype.tosorted@npm:1.1.1"
+"array.prototype.tosorted@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "array.prototype.tosorted@npm:1.1.4"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.1.4"
-    es-abstract: "npm:^1.20.4"
-    es-shim-unscopables: "npm:^1.0.0"
-    get-intrinsic: "npm:^1.1.3"
-  checksum: 10/23e86074d0dda9260aaa137ec45ae5a8196916ee3f256e41665381f120fdb5921bd84ad93eeba8d0234e5cd355093049585167ba2307fde340e5cee15b12415d
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.3"
+    es-errors: "npm:^1.3.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10/874694e5d50e138894ff5b853e639c29b0aa42bbd355acda8e8e9cd337f1c80565f21edc15e8c727fa4c0877fd9d8783c575809e440cc4d2d19acaa048bf967d
   languageName: node
   linkType: hard
 
-"arraybuffer.prototype.slice@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "arraybuffer.prototype.slice@npm:1.0.2"
+"arraybuffer.prototype.slice@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "arraybuffer.prototype.slice@npm:1.0.3"
   dependencies:
-    array-buffer-byte-length: "npm:^1.0.0"
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    get-intrinsic: "npm:^1.2.1"
-    is-array-buffer: "npm:^3.0.2"
+    array-buffer-byte-length: "npm:^1.0.1"
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.3"
+    es-errors: "npm:^1.2.1"
+    get-intrinsic: "npm:^1.2.3"
+    is-array-buffer: "npm:^3.0.4"
     is-shared-array-buffer: "npm:^1.0.2"
-  checksum: 10/c200faf437786f5b2c80d4564ff5481c886a16dee642ef02abdc7306c7edd523d1f01d1dd12b769c7eb42ac9bc53874510db19a92a2c035c0f6696172aafa5d3
+  checksum: 10/0221f16c1e3ec7b67da870ee0e1f12b825b5f9189835392b59a22990f715827561a4f4cd5330dc7507de272d8df821be6cd4b0cb569babf5ea4be70e365a2f3d
   languageName: node
   linkType: hard
 
@@ -15440,15 +15384,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"asynciterator.prototype@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "asynciterator.prototype@npm:1.0.0"
-  dependencies:
-    has-symbols: "npm:^1.0.3"
-  checksum: 10/e8ebfd9493ac651cf9b4165e9d64030b3da1d17181bb1963627b59e240cdaf021d9b59d44b827dc1dde4e22387ec04c2d0f8720cf58a1c282e34e40cc12721b3
-  languageName: node
-  linkType: hard
-
 "asynckit@npm:^0.4.0":
   version: 0.4.0
   resolution: "asynckit@npm:0.4.0"
@@ -15495,10 +15430,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"available-typed-arrays@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "available-typed-arrays@npm:1.0.5"
-  checksum: 10/4d4d5e86ea0425696f40717882f66a570647b94ac8d273ddc7549a9b61e5da099e149bf431530ccbd776bd74e02039eb8b5edf426e3e2211ee61af16698a9064
+"available-typed-arrays@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "available-typed-arrays@npm:1.0.7"
+  dependencies:
+    possible-typed-array-names: "npm:^1.0.0"
+  checksum: 10/6c9da3a66caddd83c875010a1ca8ef11eac02ba15fb592dc9418b2b5e7b77b645fa7729380a92d9835c2f05f2ca1b6251f39b993e0feb3f1517c74fa1af02cab
   languageName: node
   linkType: hard
 
@@ -15516,10 +15453,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axe-core@npm:=4.7.0":
-  version: 4.7.0
-  resolution: "axe-core@npm:4.7.0"
-  checksum: 10/615c0f7722c3c9fcf353dbd70b00e2ceae234d4c17cbc839dd85c01d16797c4e4da45f8d27c6118e9e6b033fb06efd196106e13651a1b2f3a10e0f11c7b2f660
+"axe-core@npm:^4.10.0":
+  version: 4.10.2
+  resolution: "axe-core@npm:4.10.2"
+  checksum: 10/a69423b2ff16c15922c4ea7cf9cc5112728a2817bbe0f2cc212248d648885ffd1ba554e3a341dfc289cd9e67fc0d06f333b5c6837c5c38ca6652507381216fc1
   languageName: node
   linkType: hard
 
@@ -15553,23 +15490,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^1.3.5, axios@npm:^1.6.0, axios@npm:^1.6.1, axios@npm:^1.6.7, axios@npm:^1.7.2":
-  version: 1.7.2
-  resolution: "axios@npm:1.7.2"
+"axios@npm:^1.3.5, axios@npm:^1.6.0, axios@npm:^1.6.1, axios@npm:^1.6.7, axios@npm:^1.7.7":
+  version: 1.7.7
+  resolution: "axios@npm:1.7.7"
   dependencies:
     follow-redirects: "npm:^1.15.6"
     form-data: "npm:^4.0.0"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 10/6ae80dda9736bb4762ce717f1a26ff997d94672d3a5799ad9941c24d4fb019c1dff45be8272f08d1975d7950bac281f3ba24aff5ecd49ef5a04d872ec428782f
+  checksum: 10/7f875ea13b9298cd7b40fd09985209f7a38d38321f1118c701520939de2f113c4ba137832fe8e3f811f99a38e12c8225481011023209a77b0c0641270e20cde1
   languageName: node
   linkType: hard
 
-"axobject-query@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "axobject-query@npm:3.2.1"
-  dependencies:
-    dequal: "npm:^2.0.3"
-  checksum: 10/675af2548ed4ece75ad6d50cc0473cfdec7579eac77ec9861e7088d03ffb171aa697b70d2877423bee2ce16460ef62c698c6442a105612cc015719e8ea06b0bd
+"axobject-query@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "axobject-query@npm:4.1.0"
+  checksum: 10/e275dea9b673f71170d914f2d2a18be5d57d8d29717b629e7fedd907dcc2ebdc7a37803ff975874810bd423f222f299c020d28fde40a146f537448bf6bfecb6e
   languageName: node
   linkType: hard
 
@@ -15866,7 +15801,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"base-x@npm:3.0.9, base-x@npm:^3.0.2, base-x@npm:^3.0.6, base-x@npm:^3.0.7, base-x@npm:^3.0.8":
+"base-x@npm:3.0.9, base-x@npm:^3.0.2, base-x@npm:^3.0.6":
   version: 3.0.9
   resolution: "base-x@npm:3.0.9"
   dependencies:
@@ -16056,7 +15991,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bindings@npm:^1.3.0":
+"bindings@npm:^1.3.0, bindings@npm:^1.5.0":
   version: 1.5.0
   resolution: "bindings@npm:1.5.0"
   dependencies:
@@ -16111,7 +16046,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"blakejs@npm:^1.1.0, blakejs@npm:^1.2.1":
+"blakejs@npm:^1.2.1":
   version: 1.2.1
   resolution: "blakejs@npm:1.2.1"
   checksum: 10/0638b1bd058b21892633929c43005aa6a4cc4b2ac5b338a146c3c076622f1b360795bd7a4d1f077c9b01863ed2df0c1504a81c5b520d164179120434847e6cd7
@@ -16141,7 +16076,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bluebird@npm:^3.5.0, bluebird@npm:^3.5.4, bluebird@npm:^3.5.5, bluebird@npm:^3.7.2":
+"bluebird@npm:^3.5.4, bluebird@npm:^3.5.5, bluebird@npm:^3.7.2":
   version: 3.7.2
   resolution: "bluebird@npm:3.7.2"
   checksum: 10/007c7bad22c5d799c8dd49c85b47d012a1fe3045be57447721e6afbd1d5be43237af1db62e26cb9b0d9ba812d2e4ca3bac82f6d7e016b6b88de06ee25ceb96e7
@@ -16155,7 +16090,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"body-parser@npm:1.20.3, body-parser@npm:^1.16.0, body-parser@npm:^1.19.0":
+"body-parser@npm:1.20.3, body-parser@npm:^1.19.0":
   version: 1.20.3
   resolution: "body-parser@npm:1.20.3"
   dependencies:
@@ -16346,7 +16281,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4, browserify-aes@npm:^1.2.0":
+"browserify-aes@npm:^1.0.0, browserify-aes@npm:^1.0.4":
   version: 1.2.0
   resolution: "browserify-aes@npm:1.2.0"
   dependencies:
@@ -16446,17 +16381,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.19.1, browserslist@npm:^4.21.10, browserslist@npm:^4.22.2, browserslist@npm:^4.23.1":
-  version: 4.23.3
-  resolution: "browserslist@npm:4.23.3"
+"browserslist@npm:^4.0.0, browserslist@npm:^4.19.1, browserslist@npm:^4.22.2, browserslist@npm:^4.23.1, browserslist@npm:^4.24.0":
+  version: 4.24.2
+  resolution: "browserslist@npm:4.24.2"
   dependencies:
-    caniuse-lite: "npm:^1.0.30001646"
-    electron-to-chromium: "npm:^1.5.4"
+    caniuse-lite: "npm:^1.0.30001669"
+    electron-to-chromium: "npm:^1.5.41"
     node-releases: "npm:^2.0.18"
-    update-browserslist-db: "npm:^1.1.0"
+    update-browserslist-db: "npm:^1.1.1"
   bin:
     browserslist: cli.js
-  checksum: 10/e266d18c6c6c5becf9a1a7aa264477677b9796387972e8fce34854bb33dc1666194dc28389780e5dc6566e68a95e87ece2ce222e1c4ca93c2b75b61dfebd5f1c
+  checksum: 10/f8a9d78bbabe466c57ffd5c50a9e5582a5df9aa68f43078ca62a9f6d0d6c70ba72eca72d0a574dbf177cf55cdca85a46f7eb474917a47ae5398c66f8b76f7d1c
   languageName: node
   linkType: hard
 
@@ -16496,7 +16431,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bs58check@npm:2.1.2, bs58check@npm:^2.1.2":
+"bs58check@npm:2.1.2":
   version: 2.1.2
   resolution: "bs58check@npm:2.1.2"
   dependencies:
@@ -16592,13 +16527,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer-to-arraybuffer@npm:^0.0.5":
-  version: 0.0.5
-  resolution: "buffer-to-arraybuffer@npm:0.0.5"
-  checksum: 10/df16190b3bf0ecdf70e761514ecc8dbb9b8310e7c2882c800dc6d2d06859b9c85baa67f4cad53aaf9f0cbdd936f4b1c09f549eed8ae33c1c1258d7b6b1648cde
-  languageName: node
-  linkType: hard
-
 "buffer-xor@npm:^1.0.3":
   version: 1.0.3
   resolution: "buffer-xor@npm:1.0.3"
@@ -16637,7 +16565,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer@npm:^5.0.5, buffer@npm:^5.1.0, buffer@npm:^5.4.3, buffer@npm:^5.5.0, buffer@npm:^5.6.0":
+"buffer@npm:^5.1.0, buffer@npm:^5.4.3, buffer@npm:^5.5.0, buffer@npm:^5.6.0":
   version: 5.7.1
   resolution: "buffer@npm:5.7.1"
   dependencies:
@@ -16647,6 +16575,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bufferstreams@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "bufferstreams@npm:3.0.0"
+  dependencies:
+    readable-stream: "npm:^3.4.0"
+  checksum: 10/b7643da7e7d879199ce617524fb23718c9d25eb77edb616ff33b1d324d10cf17c126cb2916f3c53ef2714bd0aff2c065d10590962a20c7d4d6d02ceddf70fd44
+  languageName: node
+  linkType: hard
+
 "bufferutil@npm:^4.0.1":
   version: 4.0.8
   resolution: "bufferutil@npm:4.0.8"
@@ -16664,37 +16601,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"builder-util-runtime@npm:9.2.5":
-  version: 9.2.5
-  resolution: "builder-util-runtime@npm:9.2.5"
+"builder-util-runtime@npm:9.2.10":
+  version: 9.2.10
+  resolution: "builder-util-runtime@npm:9.2.10"
   dependencies:
     debug: "npm:^4.3.4"
     sax: "npm:^1.2.4"
-  checksum: 10/89c1e67c286ad5dd039abd56af91b3fa3d01eb62ce16c07e8d496a06eb0ed9ce015870d83dd919ffa387a32d47f9080923958672fc993154c8a184c6b1a78adc
+  checksum: 10/58b96675c174d1f495b4ffd5369fa496f4c33c9ea8150852191c45528bb47a2744142f2e9a449a077304a0f44ce0c35941ebb06b067ad39685c950c26d2137d2
   languageName: node
   linkType: hard
 
-"builder-util@npm:25.0.3":
-  version: 25.0.3
-  resolution: "builder-util@npm:25.0.3"
+"builder-util@npm:25.1.7":
+  version: 25.1.7
+  resolution: "builder-util@npm:25.1.7"
   dependencies:
     7zip-bin: "npm:~5.2.0"
     "@types/debug": "npm:^4.1.6"
-    app-builder-bin: "npm:5.0.0-alpha.7"
+    app-builder-bin: "npm:5.0.0-alpha.10"
     bluebird-lst: "npm:^1.0.9"
-    builder-util-runtime: "npm:9.2.5"
+    builder-util-runtime: "npm:9.2.10"
     chalk: "npm:^4.1.2"
     cross-spawn: "npm:^7.0.3"
     debug: "npm:^4.3.4"
     fs-extra: "npm:^10.1.0"
-    http-proxy-agent: "npm:^5.0.0"
-    https-proxy-agent: "npm:^5.0.1"
+    http-proxy-agent: "npm:^7.0.0"
+    https-proxy-agent: "npm:^7.0.0"
     is-ci: "npm:^3.0.0"
     js-yaml: "npm:^4.1.0"
     source-map-support: "npm:^0.5.19"
     stat-mode: "npm:^1.0.0"
     temp-file: "npm:^3.4.0"
-  checksum: 10/0d2dea388b8e845479433c51b7fa2e27bc1560e5ea2bc434b62ba58b5bdd62154ee4631501ba6d12149519ecc2b2bc4605f9fc78b79a3d040b9a0505ddebd18a
+  checksum: 10/180817a9f5e24770050a2b23acb6b47e55156ee83c7296329ee538a1ec202cf21a626de9d731f4b674ab1d63bd995b152b02d8e8a4b3133a1964a586f0cc9037
   languageName: node
   linkType: hard
 
@@ -16829,35 +16766,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cacache@npm:^16.1.0":
-  version: 16.1.3
-  resolution: "cacache@npm:16.1.3"
-  dependencies:
-    "@npmcli/fs": "npm:^2.1.0"
-    "@npmcli/move-file": "npm:^2.0.0"
-    chownr: "npm:^2.0.0"
-    fs-minipass: "npm:^2.1.0"
-    glob: "npm:^8.0.1"
-    infer-owner: "npm:^1.0.4"
-    lru-cache: "npm:^7.7.1"
-    minipass: "npm:^3.1.6"
-    minipass-collect: "npm:^1.0.2"
-    minipass-flush: "npm:^1.0.5"
-    minipass-pipeline: "npm:^1.2.4"
-    mkdirp: "npm:^1.0.4"
-    p-map: "npm:^4.0.0"
-    promise-inflight: "npm:^1.0.1"
-    rimraf: "npm:^3.0.2"
-    ssri: "npm:^9.0.0"
-    tar: "npm:^6.1.11"
-    unique-filename: "npm:^2.0.0"
-  checksum: 10/a14524d90e377ee691d63a81173b33c473f8bc66eb299c64290b58e1d41b28842397f8d6c15a01b4c57ca340afcec019ae112a45c2f67a79f76130d326472e92
-  languageName: node
-  linkType: hard
-
-"cacache@npm:^18.0.2":
-  version: 18.0.3
-  resolution: "cacache@npm:18.0.3"
+"cacache@npm:^18.0.0, cacache@npm:^18.0.2":
+  version: 18.0.4
+  resolution: "cacache@npm:18.0.4"
   dependencies:
     "@npmcli/fs": "npm:^3.1.0"
     fs-minipass: "npm:^3.0.0"
@@ -16871,7 +16782,7 @@ __metadata:
     ssri: "npm:^10.0.0"
     tar: "npm:^6.1.11"
     unique-filename: "npm:^3.0.0"
-  checksum: 10/d4c161f071524bb636334b8cf94780c014e29c180a886b8184da8f2f44d2aca88d5664797c661e9f74bdbd34697c2f231ed7c24c256cecbb0a0563ad1ada2219
+  checksum: 10/ca2f7b2d3003f84d362da9580b5561058ccaecd46cba661cbcff0375c90734b610520d46b472a339fd032d91597ad6ed12dde8af81571197f3c9772b5d35b104
   languageName: node
   linkType: hard
 
@@ -16892,13 +16803,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cacheable-lookup@npm:^6.0.4":
-  version: 6.1.0
-  resolution: "cacheable-lookup@npm:6.1.0"
-  checksum: 10/9b37d31fba27ff244254294814dfdad69e3d257cb283932f58823141de5043a46d35339fa81ec40fdbb5d76d1578324258995f41a4fd37ed05d4e9b54823802e
-  languageName: node
-  linkType: hard
-
 "cacheable-request@npm:^7.0.2":
   version: 7.0.2
   resolution: "cacheable-request@npm:7.0.2"
@@ -16928,7 +16832,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2, call-bind@npm:^1.0.4, call-bind@npm:^1.0.5, call-bind@npm:^1.0.7":
+"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2, call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7":
   version: 1.0.7
   resolution: "call-bind@npm:1.0.7"
   dependencies:
@@ -17037,10 +16941,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001578, caniuse-lite@npm:^1.0.30001579, caniuse-lite@npm:^1.0.30001646":
-  version: 1.0.30001657
-  resolution: "caniuse-lite@npm:1.0.30001657"
-  checksum: 10/5eb2f4e6dd114056d2c8563f70d9de9b0e7442622a2243ce902fbc00bce5b9951c8e8edd8bcb15a9d5dec1b849536d616f23611f18650e51d6c4912c09d3f179
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001578, caniuse-lite@npm:^1.0.30001579, caniuse-lite@npm:^1.0.30001669":
+  version: 1.0.30001677
+  resolution: "caniuse-lite@npm:1.0.30001677"
+  checksum: 10/e07439bdeade5ffdd974691f44f8549ae0730fcf510acaa32d0b657c10370cd5aad09eeca37248966205fb37fce5f464dbce73ce177b4a1fdc3a34adbcfd7192
   languageName: node
   linkType: hard
 
@@ -17060,6 +16964,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"case@npm:^1.6.3":
+  version: 1.6.3
+  resolution: "case@npm:1.6.3"
+  checksum: 10/2fc1df75bbb4118339e06141b9a54aba95cc62460ac92730290144fbec6b6a04f5bf7abf6a6486a1338f5821bd184402f216cec8cea0472451759c27e20fc332
+  languageName: node
+  linkType: hard
+
 "caseless@npm:~0.12.0":
   version: 0.12.0
   resolution: "caseless@npm:0.12.0"
@@ -17125,6 +17036,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chalk@npm:4.1.2, chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "chalk@npm:4.1.2"
+  dependencies:
+    ansi-styles: "npm:^4.1.0"
+    supports-color: "npm:^7.1.0"
+  checksum: 10/cb3f3e594913d63b1814d7ca7c9bafbf895f75fbf93b92991980610dfd7b48500af4e3a5d4e3a8f337990a96b168d7eb84ee55efdce965e2ee8efc20f8c8f139
+  languageName: node
+  linkType: hard
+
 "chalk@npm:^1.1.3":
   version: 1.1.3
   resolution: "chalk@npm:1.1.3"
@@ -17159,16 +17080,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "chalk@npm:4.1.2"
-  dependencies:
-    ansi-styles: "npm:^4.1.0"
-    supports-color: "npm:^7.1.0"
-  checksum: 10/cb3f3e594913d63b1814d7ca7c9bafbf895f75fbf93b92991980610dfd7b48500af4e3a5d4e3a8f337990a96b168d7eb84ee55efdce965e2ee8efc20f8c8f139
-  languageName: node
-  linkType: hard
-
 "chalk@npm:^5.2.0":
   version: 5.3.0
   resolution: "chalk@npm:5.3.0"
@@ -17299,7 +17210,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chownr@npm:^1.1.1, chownr@npm:^1.1.4":
+"chownr@npm:^1.1.1":
   version: 1.1.4
   resolution: "chownr@npm:1.1.4"
   checksum: 10/115648f8eb38bac5e41c3857f3e663f9c39ed6480d1349977c4d96c95a47266fcacc5a5aabf3cb6c481e22d72f41992827db47301851766c4fd77ac21a4f081d
@@ -17383,19 +17294,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cids@npm:^0.7.1":
-  version: 0.7.5
-  resolution: "cids@npm:0.7.5"
-  dependencies:
-    buffer: "npm:^5.5.0"
-    class-is: "npm:^1.1.0"
-    multibase: "npm:~0.6.0"
-    multicodec: "npm:^1.0.0"
-    multihashes: "npm:~0.4.15"
-  checksum: 10/b916b0787e238dd9f84fb5e155333cadf07fd7ad34ea8dbd47f98bb618eecc9c70760767c0966d0eae73050c4fa6080fdc387e515565b009d2126253c7775fac
-  languageName: node
-  linkType: hard
-
 "cipher-base@npm:^1.0.0, cipher-base@npm:^1.0.1, cipher-base@npm:^1.0.3":
   version: 1.0.4
   resolution: "cipher-base@npm:1.0.4"
@@ -17413,13 +17311,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"class-is@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "class-is@npm:1.1.0"
-  checksum: 10/8147a3e4ce86eb103d78621d665b87e8e33fcb3f54932fdca894b8222820903b43b2f6b4335d8822104702a5dc904c8f187127fdea4e7d48d905488b35c9e6a7
-  languageName: node
-  linkType: hard
-
 "classnames@npm:^2.2.6":
   version: 2.3.2
   resolution: "classnames@npm:2.3.2"
@@ -17443,16 +17334,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-color@npm:^2.0.2":
-  version: 2.0.3
-  resolution: "cli-color@npm:2.0.3"
+"cli-color@npm:^2.0.2, cli-color@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "cli-color@npm:2.0.4"
   dependencies:
     d: "npm:^1.0.1"
-    es5-ext: "npm:^0.10.61"
+    es5-ext: "npm:^0.10.64"
     es6-iterator: "npm:^2.0.3"
     memoizee: "npm:^0.4.15"
     timers-ext: "npm:^0.1.7"
-  checksum: 10/35244ba10cd7e5e38df02fbe54128dd11362f0114fdcaf44ee5a59c6af8b7680258fee4954de114cc3f824ed5bf7337270098b15e05bde6ae3877a4f67558b41
+  checksum: 10/6706fbb98f5db62c47deaba7116a1e37470c936dc861b84a180b5ce1a58fbf50ae6582b30a65e4b30ddb39e0469d3bac6851a9d925ded02b7e0c1c00858ef14b
   languageName: node
   linkType: hard
 
@@ -17735,15 +17626,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"color-support@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "color-support@npm:1.1.3"
-  bin:
-    color-support: bin.js
-  checksum: 10/4bcfe30eea1498fe1cabc852bbda6c9770f230ea0e4faf4611c5858b1b9e4dde3730ac485e65f54ca182f4c50b626c1bea7c8441ceda47367a54a818c248aa7a
-  languageName: node
-  linkType: hard
-
 "color@npm:^4.2.3":
   version: 4.2.3
   resolution: "color@npm:4.2.3"
@@ -17838,6 +17720,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"commander@npm:^12.0.0":
+  version: 12.1.0
+  resolution: "commander@npm:12.1.0"
+  checksum: 10/cdaeb672d979816853a4eed7f1310a9319e8b976172485c2a6b437ed0db0a389a44cfb222bfbde772781efa9f215bdd1b936f80d6b249485b465c6cb906e1f93
+  languageName: node
+  linkType: hard
+
 "commander@npm:^2.19.0, commander@npm:^2.20.0, commander@npm:^2.20.3":
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
@@ -17873,10 +17762,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^9.4.1":
-  version: 9.4.1
-  resolution: "commander@npm:9.4.1"
-  checksum: 10/9d0d1d7e816545cf5ebf25e303533e45af2f941731063587d04917ac9fb6c81f59690aa8bda60d9b88d8aac018fdef6735ed953e72fdab08bb8b778bd4e0ef95
+"commander@npm:^9.3.0, commander@npm:^9.4.1":
+  version: 9.5.0
+  resolution: "commander@npm:9.5.0"
+  checksum: 10/41c49b3d0f94a1fbeb0463c85b13f15aa15a9e0b4d5e10a49c0a1d58d4489b549d62262b052ae0aa6cfda53299bee487bfe337825df15e342114dde543f82906
   languageName: node
   linkType: hard
 
@@ -18025,29 +17914,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"connect-deeplink-expo-example@workspace:packages/connect-examples/deeplink-expo":
-  version: 0.0.0-use.local
-  resolution: "connect-deeplink-expo-example@workspace:packages/connect-examples/deeplink-expo"
-  dependencies:
-    "@babel/core": "npm:^7.20.0"
-    "@trezor/connect-deeplink": "workspace:*"
-    "@types/react": "npm:18.2.45"
-    expo: "npm:51.0.31"
-    expo-linking: "npm:6.3.1"
-    expo-status-bar: "npm:1.12.1"
-    react: "npm:18.2.0"
-    react-native: "npm:0.75.2"
-    typescript: "npm:^5.3.3"
-  languageName: unknown
-  linkType: soft
-
 "connect-example-electron-main@workspace:packages/connect-examples/electron-main-process":
   version: 0.0.0-use.local
   resolution: "connect-example-electron-main@workspace:packages/connect-examples/electron-main-process"
   dependencies:
     "@trezor/connect": "workspace:*"
-    electron: "npm:32.1.2"
-    electron-builder: "npm:25.0.5"
+    "@trezor/eslint": "workspace:*"
+    electron: "npm:33.1.0"
+    electron-builder: "npm:25.1.8"
   languageName: unknown
   linkType: soft
 
@@ -18055,8 +17929,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "connect-example-electron-renderer-popup@workspace:packages/connect-examples/electron-renderer-with-popup"
   dependencies:
-    electron: "npm:32.1.2"
-    electron-builder: "npm:25.0.5"
+    "@trezor/eslint": "workspace:*"
+    electron: "npm:33.1.0"
+    electron-builder: "npm:25.1.8"
   languageName: unknown
   linkType: soft
 
@@ -18065,17 +17940,20 @@ __metadata:
   resolution: "connect-example-electron-renderer-with-assets@workspace:packages/connect-examples/electron-renderer-with-assets"
   dependencies:
     "@trezor/connect": "workspace:*"
+    "@trezor/connect-web": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     babel-loader: "npm:^9.1.3"
     concurrently: "npm:^8.2.2"
     copy-webpack-plugin: "npm:^12.0.2"
-    electron: "npm:32.1.2"
-    electron-builder: "npm:25.0.5"
+    electron: "npm:33.1.0"
+    electron-builder: "npm:25.1.8"
     html-webpack-plugin: "npm:^5.6.0"
     terser-webpack-plugin: "npm:^5.3.9"
     wait-on: "npm:^7.0.1"
-    webpack: "npm:^5.94.0"
+    webpack: "npm:^5.96.1"
     webpack-cli: "npm:^5.1.4"
     webpack-dev-server: "npm:^5.0.4"
+    webpack-plugin-serve: "npm:^1.6.0"
     worker-loader: "npm:^3.0.8"
   languageName: unknown
   linkType: soft
@@ -18102,6 +17980,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"connect-mobile-example@workspace:packages/connect-examples/mobile-expo":
+  version: 0.0.0-use.local
+  resolution: "connect-mobile-example@workspace:packages/connect-examples/mobile-expo"
+  dependencies:
+    "@babel/core": "npm:^7.20.0"
+    "@trezor/connect-mobile": "workspace:*"
+    "@types/react": "npm:18.2.45"
+    expo: "npm:51.0.31"
+    expo-linking: "npm:6.3.1"
+    expo-status-bar: "npm:1.12.1"
+    react: "npm:18.2.0"
+    react-native: "npm:0.75.2"
+    typescript: "npm:^5.3.3"
+  languageName: unknown
+  linkType: soft
+
 "connect@npm:^3.6.5, connect@npm:^3.7.0":
   version: 3.7.0
   resolution: "connect@npm:3.7.0"
@@ -18121,13 +18015,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"console-control-strings@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "console-control-strings@npm:1.1.0"
-  checksum: 10/27b5fa302bc8e9ae9e98c03c66d76ca289ad0c61ce2fe20ab288d288bee875d217512d2edb2363fc83165e88f1c405180cf3f5413a46e51b4fe1a004840c6cdb
-  languageName: node
-  linkType: hard
-
 "constants-browserify@npm:^1.0.0":
   version: 1.0.0
   resolution: "constants-browserify@npm:1.0.0"
@@ -18144,17 +18031,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"content-hash@npm:^2.5.2":
-  version: 2.5.2
-  resolution: "content-hash@npm:2.5.2"
-  dependencies:
-    cids: "npm:^0.7.1"
-    multicodec: "npm:^0.5.5"
-    multihashes: "npm:^0.4.15"
-  checksum: 10/7c5d05052aecead40a1bbdd251468a6cc9bf4c48b361b4f138d60e6d876dc3028da6142031578ddc42e44e0024f91cc01b7a539bdb0bf7187e36bec15052e02d
-  languageName: node
-  linkType: hard
-
 "content-type@npm:^1.0.4, content-type@npm:^1.0.5, content-type@npm:~1.0.4, content-type@npm:~1.0.5":
   version: 1.0.5
   resolution: "content-type@npm:1.0.5"
@@ -18190,7 +18066,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:0.6.0, cookie@npm:^0.6.0":
+"cookie@npm:0.7.1":
+  version: 0.7.1
+  resolution: "cookie@npm:0.7.1"
+  checksum: 10/aec6a6aa0781761bf55d60447d6be08861d381136a0fe94aa084fddd4f0300faa2b064df490c6798adfa1ebaef9e0af9b08a189c823e0811b8b313b3d9a03380
+  languageName: node
+  linkType: hard
+
+"cookie@npm:^0.6.0":
   version: 0.6.0
   resolution: "cookie@npm:0.6.0"
   checksum: 10/c1f8f2ea7d443b9331680598b0ae4e6af18a618c37606d1bbdc75bec8361cce09fe93e727059a673f2ba24467131a9fb5a4eec76bb1b149c1b3e1ccb268dc583
@@ -18276,7 +18159,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cors@npm:^2.8.1, cors@npm:^2.8.5, cors@npm:~2.8.5":
+"cors@npm:^2.8.5, cors@npm:~2.8.5":
   version: 2.8.5
   resolution: "cors@npm:2.8.5"
   dependencies:
@@ -18347,7 +18230,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"crc-32@npm:^1.2.0":
+"crc-32@npm:^1.2.0, crc-32@npm:^1.2.2":
   version: 1.2.2
   resolution: "crc-32@npm:1.2.2"
   bin:
@@ -18826,6 +18709,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cubic2quad@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "cubic2quad@npm:1.2.1"
+  checksum: 10/a8a613d7e6566dbd21935b236801cfd26fc09095c21c89351629c8620d244e2aa61c9bf6ddc75edf3c2e2e453fd574592a0076db93374b9d7797eaba73bd3624
+  languageName: node
+  linkType: hard
+
 "custom-event@npm:~1.0.0":
   version: 1.0.1
   resolution: "custom-event@npm:1.0.1"
@@ -19371,6 +19261,39 @@ __metadata:
   languageName: node
   linkType: hard
 
+"data-view-buffer@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "data-view-buffer@npm:1.0.1"
+  dependencies:
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10/5919a39a18ee919573336158fd162fdf8ada1bc23a139f28543fd45fac48e0ea4a3ad3bfde91de124d4106e65c4a7525f6a84c20ba0797ec890a77a96d13a82a
+  languageName: node
+  linkType: hard
+
+"data-view-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "data-view-byte-length@npm:1.0.1"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10/f33c65e58d8d0432ad79761f2e8a579818d724b5dc6dc4e700489b762d963ab30873c0f1c37d8f2ed12ef51c706d1195f64422856d25f067457aeec50cc40aac
+  languageName: node
+  linkType: hard
+
+"data-view-byte-offset@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "data-view-byte-offset@npm:1.0.0"
+  dependencies:
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10/96f34f151bf02affb7b9f98762fb7aca1dd5f4553cb57b80bce750ca609c15d33ca659568ef1d422f7e35680736cbccb893a3d4b012760c758c1446bbdc4c6db
+  languageName: node
+  linkType: hard
+
 "dataloader@npm:^1.4.0":
   version: 1.4.0
   resolution: "dataloader@npm:1.4.0"
@@ -19417,7 +19340,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:*, debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:~4.3.1, debug@npm:~4.3.2, debug@npm:~4.3.4":
+"debug@npm:*, debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:~4.3.1, debug@npm:~4.3.2, debug@npm:~4.3.4":
   version: 4.3.6
   resolution: "debug@npm:4.3.6"
   dependencies:
@@ -19496,22 +19419,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decode-uri-component@npm:^0.2.0, decode-uri-component@npm:^0.2.2":
+"decode-uri-component@npm:^0.2.2":
   version: 0.2.2
   resolution: "decode-uri-component@npm:0.2.2"
   checksum: 10/17a0e5fa400bf9ea84432226e252aa7b5e72793e16bf80b907c99b46a799aeacc139ec20ea57121e50c7bd875a1a4365928f884e92abf02e21a5a13790a0f33e
   languageName: node
   linkType: hard
 
-"decompress-response@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "decompress-response@npm:3.3.0"
-  dependencies:
-    mimic-response: "npm:^1.0.0"
-  checksum: 10/952552ac3bd7de2fc18015086b09468645c9638d98a551305e485230ada278c039c91116e946d07894b39ee53c0f0d5b6473f25a224029344354513b412d7380
-  languageName: node
-  linkType: hard
-
 "decompress-response@npm:^6.0.0":
   version: 6.0.0
   resolution: "decompress-response@npm:6.0.0"
@@ -19660,7 +19574,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"defer-to-connect@npm:^2.0.0, defer-to-connect@npm:^2.0.1":
+"defer-to-connect@npm:^2.0.0":
   version: 2.0.1
   resolution: "defer-to-connect@npm:2.0.1"
   checksum: 10/8a9b50d2f25446c0bfefb55a48e90afd58f85b21bcf78e9207cd7b804354f6409032a1705c2491686e202e64fc05f147aa5aa45f9aa82627563f045937f5791b
@@ -19831,7 +19745,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dequal@npm:^2.0.0, dequal@npm:^2.0.2, dequal@npm:^2.0.3":
+"dequal@npm:^2.0.0, dequal@npm:^2.0.2":
   version: 2.0.3
   resolution: "dequal@npm:2.0.3"
   checksum: 10/6ff05a7561f33603df87c45e389c9ac0a95e3c056be3da1a0c4702149e3a7f6fe5ffbb294478687ba51a9e95f3a60e8b6b9005993acd79c292c7d15f71964b6b
@@ -20081,13 +19995,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dmg-builder@npm:25.0.5":
-  version: 25.0.5
-  resolution: "dmg-builder@npm:25.0.5"
+"dmg-builder@npm:25.1.8":
+  version: 25.1.8
+  resolution: "dmg-builder@npm:25.1.8"
   dependencies:
-    app-builder-lib: "npm:25.0.5"
-    builder-util: "npm:25.0.3"
-    builder-util-runtime: "npm:9.2.5"
+    app-builder-lib: "npm:25.1.8"
+    builder-util: "npm:25.1.7"
+    builder-util-runtime: "npm:9.2.10"
     dmg-license: "npm:^1.0.11"
     fs-extra: "npm:^10.1.0"
     iconv-lite: "npm:^0.6.2"
@@ -20095,7 +20009,7 @@ __metadata:
   dependenciesMeta:
     dmg-license:
       optional: true
-  checksum: 10/8d2f65a97d7669a8853d7620b28cd42c5b8cffd26c0e9bf9d0011e2a51088a623846b36d9e9a558ff61525b540bf0ca1a653f8ab1f8b3bf4a2f52ff66e4bdce8
+  checksum: 10/e776d27f1841a585db56e63b946b91aae89a1661ba5801b3adf0ff39996f7aad6090889eea6cc4db19c1664d86d9958ab0b3001bc2b69e97375e63ce3e5fe24e
   languageName: node
   linkType: hard
 
@@ -20204,13 +20118,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dom-walk@npm:^0.1.0":
-  version: 0.1.2
-  resolution: "dom-walk@npm:0.1.2"
-  checksum: 10/19eb0ce9c6de39d5e231530685248545d9cd2bd97b2cb3486e0bfc0f2a393a9addddfd5557463a932b52fdfcf68ad2a619020cd2c74a5fe46fbecaa8e80872f3
-  languageName: node
-  linkType: hard
-
 "domain-browser@npm:^1.1.1":
   version: 1.2.0
   resolution: "domain-browser@npm:1.2.0"
@@ -20455,25 +20362,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-builder@npm:25.0.5":
-  version: 25.0.5
-  resolution: "electron-builder@npm:25.0.5"
+"electron-builder@npm:25.1.8":
+  version: 25.1.8
+  resolution: "electron-builder@npm:25.1.8"
   dependencies:
-    app-builder-lib: "npm:25.0.5"
-    builder-util: "npm:25.0.3"
-    builder-util-runtime: "npm:9.2.5"
+    app-builder-lib: "npm:25.1.8"
+    builder-util: "npm:25.1.7"
+    builder-util-runtime: "npm:9.2.10"
     chalk: "npm:^4.1.2"
-    dmg-builder: "npm:25.0.5"
+    dmg-builder: "npm:25.1.8"
     fs-extra: "npm:^10.1.0"
     is-ci: "npm:^3.0.0"
     lazy-val: "npm:^1.0.5"
-    read-config-file: "npm:6.4.0"
     simple-update-notifier: "npm:2.0.0"
     yargs: "npm:^17.6.2"
   bin:
     electron-builder: cli.js
     install-app-deps: install-app-deps.js
-  checksum: 10/dcbcee76d0e405a2c062a46ede5144c38bdd9b9ce6d3fccf4b6c166f31485ba09fbceacae95a6e19fb2aa6ea5199186b81e6eddc525101bd33a1c892590b5b29
+  checksum: 10/d7eb5fd600f243a2824851eb6e4d2fa947bf17c3a78429f9dabc35f4bc32a5c5be90ed98b871475d56aaa2a490168a19d906a5aa5eb0d9744885f45412bef1b7
   languageName: node
   linkType: hard
 
@@ -20496,18 +20402,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-publish@npm:25.0.3":
-  version: 25.0.3
-  resolution: "electron-publish@npm:25.0.3"
+"electron-publish@npm:25.1.7":
+  version: 25.1.7
+  resolution: "electron-publish@npm:25.1.7"
   dependencies:
     "@types/fs-extra": "npm:^9.0.11"
-    builder-util: "npm:25.0.3"
-    builder-util-runtime: "npm:9.2.5"
+    builder-util: "npm:25.1.7"
+    builder-util-runtime: "npm:9.2.10"
     chalk: "npm:^4.1.2"
     fs-extra: "npm:^10.1.0"
     lazy-val: "npm:^1.0.5"
     mime: "npm:^2.5.2"
-  checksum: 10/ac0d4166c0c6eef9b78801b1e34157c2fae3b8a2e299ae21dc492f97caa27372ea224eb50b91d6403558068b45e8568afb79a4e98ae4872cc73e8edd4c3cf456
+  checksum: 10/75a3e6bcb796423456e01fb79d7c39257ae9a9ea9820ddbc64321ac888867da33198693af87366137d6c13b66a4273e89d15c268184bbddc24db6585d16067c1
   languageName: node
   linkType: hard
 
@@ -20521,18 +20427,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.5.4":
-  version: 1.5.14
-  resolution: "electron-to-chromium@npm:1.5.14"
-  checksum: 10/eb5e0304ae952bf258caeb5eec77cbd8e493f54312c228f68cae1e4f11a8b26aaa8fb11222aa9bcbd701970c4c3634275c44b714eafdea144defee135cd7956b
+"electron-to-chromium@npm:^1.5.41":
+  version: 1.5.52
+  resolution: "electron-to-chromium@npm:1.5.52"
+  checksum: 10/464ea25529a901fcfcf69c5cf5d39d31607a4ea34d98012c18e22b32154280c90f830b8ac6acbad047b13f2966852ef7d5b78f49396548401757d9a9b025f028
   languageName: node
   linkType: hard
 
-"electron-updater@npm:6.3.4":
-  version: 6.3.4
-  resolution: "electron-updater@npm:6.3.4"
+"electron-updater@npm:6.3.9":
+  version: 6.3.9
+  resolution: "electron-updater@npm:6.3.9"
   dependencies:
-    builder-util-runtime: "npm:9.2.5"
+    builder-util-runtime: "npm:9.2.10"
     fs-extra: "npm:^10.1.0"
     js-yaml: "npm:^4.1.0"
     lazy-val: "npm:^1.0.5"
@@ -20540,20 +20446,20 @@ __metadata:
     lodash.isequal: "npm:^4.5.0"
     semver: "npm:^7.6.3"
     tiny-typed-emitter: "npm:^2.1.0"
-  checksum: 10/e31d827fc7f7372a5856e118e83e6e37ed22e5db26b8c2bc5ce7cebbd739bd9bacc1b6ed3fef21d69f2508a0266477ec6a0ec238a504b3ba108a3372f8c7b30b
+  checksum: 10/98a8a451fde48d6af71ef1e6c09df678feee59444ad296cb6276a01d8a2d0718b6233f884402ba61b736a8d7a16a5df7a86a8cf837ed686f9d3101ab4f34171f
   languageName: node
   linkType: hard
 
-"electron@npm:32.1.2":
-  version: 32.1.2
-  resolution: "electron@npm:32.1.2"
+"electron@npm:33.1.0":
+  version: 33.1.0
+  resolution: "electron@npm:33.1.0"
   dependencies:
     "@electron/get": "npm:^2.0.0"
     "@types/node": "npm:^20.9.0"
     extract-zip: "npm:^2.0.1"
   bin:
     electron: cli.js
-  checksum: 10/a4793dd12b2d1dffff53420092ac7612eee41d193f07e847783136ee296b5380abb169eb1a4c1929b01a99b1d93bf53f071f2c5128e8241e70ec930d303fba51
+  checksum: 10/3347167d715e93a5ef8d9ca16981763b3c5b5e08be69226c5ec3bc7770160c7fffa8d063d7d92d0a76e5f6b8720a3b6e3e04bb1e1af81f89ebbc17dd7440a285
   languageName: node
   linkType: hard
 
@@ -20564,9 +20470,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"elliptic@npm:6.5.4, elliptic@npm:^6.4.0, elliptic@npm:^6.5.3, elliptic@npm:^6.5.4":
-  version: 6.5.4
-  resolution: "elliptic@npm:6.5.4"
+"elliptic@npm:^6.4.0, elliptic@npm:^6.5.3, elliptic@npm:^6.5.4":
+  version: 6.5.7
+  resolution: "elliptic@npm:6.5.7"
   dependencies:
     bn.js: "npm:^4.11.9"
     brorand: "npm:^1.1.0"
@@ -20575,7 +20481,7 @@ __metadata:
     inherits: "npm:^2.0.4"
     minimalistic-assert: "npm:^1.0.1"
     minimalistic-crypto-utils: "npm:^1.0.1"
-  checksum: 10/2cd7ff4b69720dbb2ca1ca650b2cf889d1df60c96d4a99d331931e4fe21e45a7f3b8074e86618ca7e56366c4b6258007f234f9d61d9b0c87bbbc8ea990b99e94
+  checksum: 10/fbad1fad0a5cc07df83f80cc1f7a784247ef59075194d3e340eaeb2f4dd594825ee24c7e9b0cf279c9f1982efe610503bb3139737926428c4821d4fca1bcf348
   languageName: node
   linkType: hard
 
@@ -20797,50 +20703,57 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.19.2, es-abstract@npm:^1.20.1, es-abstract@npm:^1.20.4, es-abstract@npm:^1.22.1":
-  version: 1.22.3
-  resolution: "es-abstract@npm:1.22.3"
+"es-abstract@npm:^1.17.5, es-abstract@npm:^1.19.2, es-abstract@npm:^1.20.1, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3":
+  version: 1.23.3
+  resolution: "es-abstract@npm:1.23.3"
   dependencies:
-    array-buffer-byte-length: "npm:^1.0.0"
-    arraybuffer.prototype.slice: "npm:^1.0.2"
-    available-typed-arrays: "npm:^1.0.5"
-    call-bind: "npm:^1.0.5"
-    es-set-tostringtag: "npm:^2.0.1"
+    array-buffer-byte-length: "npm:^1.0.1"
+    arraybuffer.prototype.slice: "npm:^1.0.3"
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
+    data-view-buffer: "npm:^1.0.1"
+    data-view-byte-length: "npm:^1.0.1"
+    data-view-byte-offset: "npm:^1.0.0"
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    es-set-tostringtag: "npm:^2.0.3"
     es-to-primitive: "npm:^1.2.1"
     function.prototype.name: "npm:^1.1.6"
-    get-intrinsic: "npm:^1.2.2"
-    get-symbol-description: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.2.4"
+    get-symbol-description: "npm:^1.0.2"
     globalthis: "npm:^1.0.3"
     gopd: "npm:^1.0.1"
-    has-property-descriptors: "npm:^1.0.0"
-    has-proto: "npm:^1.0.1"
+    has-property-descriptors: "npm:^1.0.2"
+    has-proto: "npm:^1.0.3"
     has-symbols: "npm:^1.0.3"
-    hasown: "npm:^2.0.0"
-    internal-slot: "npm:^1.0.5"
-    is-array-buffer: "npm:^3.0.2"
+    hasown: "npm:^2.0.2"
+    internal-slot: "npm:^1.0.7"
+    is-array-buffer: "npm:^3.0.4"
     is-callable: "npm:^1.2.7"
-    is-negative-zero: "npm:^2.0.2"
+    is-data-view: "npm:^1.0.1"
+    is-negative-zero: "npm:^2.0.3"
     is-regex: "npm:^1.1.4"
-    is-shared-array-buffer: "npm:^1.0.2"
+    is-shared-array-buffer: "npm:^1.0.3"
     is-string: "npm:^1.0.7"
-    is-typed-array: "npm:^1.1.12"
+    is-typed-array: "npm:^1.1.13"
     is-weakref: "npm:^1.0.2"
     object-inspect: "npm:^1.13.1"
     object-keys: "npm:^1.1.1"
-    object.assign: "npm:^4.1.4"
-    regexp.prototype.flags: "npm:^1.5.1"
-    safe-array-concat: "npm:^1.0.1"
-    safe-regex-test: "npm:^1.0.0"
-    string.prototype.trim: "npm:^1.2.8"
-    string.prototype.trimend: "npm:^1.0.7"
-    string.prototype.trimstart: "npm:^1.0.7"
-    typed-array-buffer: "npm:^1.0.0"
-    typed-array-byte-length: "npm:^1.0.0"
-    typed-array-byte-offset: "npm:^1.0.0"
-    typed-array-length: "npm:^1.0.4"
+    object.assign: "npm:^4.1.5"
+    regexp.prototype.flags: "npm:^1.5.2"
+    safe-array-concat: "npm:^1.1.2"
+    safe-regex-test: "npm:^1.0.3"
+    string.prototype.trim: "npm:^1.2.9"
+    string.prototype.trimend: "npm:^1.0.8"
+    string.prototype.trimstart: "npm:^1.0.8"
+    typed-array-buffer: "npm:^1.0.2"
+    typed-array-byte-length: "npm:^1.0.1"
+    typed-array-byte-offset: "npm:^1.0.2"
+    typed-array-length: "npm:^1.0.6"
     unbox-primitive: "npm:^1.0.2"
-    which-typed-array: "npm:^1.1.13"
-  checksum: 10/e1ea9738ece15f810733b7bd71d825b555e01bb8c860272560d7d901467a9db1265214d6cf44f3beeb5d73ae421a609b9ad93a39aa47bbcd8cde510d5e0aa875
+    which-typed-array: "npm:^1.1.15"
+  checksum: 10/2da795a6a1ac5fc2c452799a409acc2e3692e06dc6440440b076908617188899caa562154d77263e3053bcd9389a07baa978ab10ac3b46acc399bd0c77be04cb
   languageName: node
   linkType: hard
 
@@ -20860,32 +20773,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-errors@npm:^1.3.0":
+"es-errors@npm:^1.2.1, es-errors@npm:^1.3.0":
   version: 1.3.0
   resolution: "es-errors@npm:1.3.0"
   checksum: 10/96e65d640156f91b707517e8cdc454dd7d47c32833aa3e85d79f24f9eb7ea85f39b63e36216ef0114996581969b59fe609a94e30316b08f5f4df1d44134cf8d5
   languageName: node
   linkType: hard
 
-"es-iterator-helpers@npm:^1.0.12, es-iterator-helpers@npm:^1.0.15":
-  version: 1.0.15
-  resolution: "es-iterator-helpers@npm:1.0.15"
+"es-iterator-helpers@npm:^1.1.0":
+  version: 1.2.0
+  resolution: "es-iterator-helpers@npm:1.2.0"
   dependencies:
-    asynciterator.prototype: "npm:^1.0.0"
-    call-bind: "npm:^1.0.2"
+    call-bind: "npm:^1.0.7"
     define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.22.1"
-    es-set-tostringtag: "npm:^2.0.1"
-    function-bind: "npm:^1.1.1"
-    get-intrinsic: "npm:^1.2.1"
-    globalthis: "npm:^1.0.3"
-    has-property-descriptors: "npm:^1.0.0"
-    has-proto: "npm:^1.0.1"
+    es-abstract: "npm:^1.23.3"
+    es-errors: "npm:^1.3.0"
+    es-set-tostringtag: "npm:^2.0.3"
+    function-bind: "npm:^1.1.2"
+    get-intrinsic: "npm:^1.2.4"
+    globalthis: "npm:^1.0.4"
+    gopd: "npm:^1.0.1"
+    has-property-descriptors: "npm:^1.0.2"
+    has-proto: "npm:^1.0.3"
     has-symbols: "npm:^1.0.3"
-    internal-slot: "npm:^1.0.5"
-    iterator.prototype: "npm:^1.1.2"
-    safe-array-concat: "npm:^1.0.1"
-  checksum: 10/78535c00c49d81df603e650886d3806f3cd8d288e2c07703cfb145725753a3d2df19bff9feeb14cd1baed02252d1f85c4bbc922c8db02841722ab3ec02e78339
+    internal-slot: "npm:^1.0.7"
+    iterator.prototype: "npm:^1.1.3"
+    safe-array-concat: "npm:^1.1.2"
+  checksum: 10/a4159e36c6bae03d4b636894fff2ff1acfcedc16c622939298b00adf4d2da6356ad92f682cc75c037a012a4b06adb903f67dfdfd05bac61847e9b763de2acbcb
   languageName: node
   linkType: hard
 
@@ -20896,18 +20810,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-set-tostringtag@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "es-set-tostringtag@npm:2.0.2"
+"es-object-atoms@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "es-object-atoms@npm:1.0.0"
   dependencies:
-    get-intrinsic: "npm:^1.2.2"
-    has-tostringtag: "npm:^1.0.0"
-    hasown: "npm:^2.0.0"
-  checksum: 10/afcec3a4c9890ae14d7ec606204858441c801ff84f312538e1d1ccf1e5493c8b17bd672235df785f803756472cb4f2d49b87bde5237aef33411e74c22f194e07
+    es-errors: "npm:^1.3.0"
+  checksum: 10/f8910cf477e53c0615f685c5c96210591841850871b81924fcf256bfbaa68c254457d994a4308c60d15b20805e7f61ce6abc669375e01a5349391a8c1767584f
   languageName: node
   linkType: hard
 
-"es-shim-unscopables@npm:^1.0.0":
+"es-set-tostringtag@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "es-set-tostringtag@npm:2.0.3"
+  dependencies:
+    get-intrinsic: "npm:^1.2.4"
+    has-tostringtag: "npm:^1.0.2"
+    hasown: "npm:^2.0.1"
+  checksum: 10/7227fa48a41c0ce83e0377b11130d324ac797390688135b8da5c28994c0165be8b252e15cd1de41e1325e5a5412511586960213e88f9ab4a5e7d028895db5129
+  languageName: node
+  linkType: hard
+
+"es-shim-unscopables@npm:^1.0.0, es-shim-unscopables@npm:^1.0.2":
   version: 1.0.2
   resolution: "es-shim-unscopables@npm:1.0.2"
   dependencies:
@@ -20927,7 +20850,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.46, es5-ext@npm:^0.10.50, es5-ext@npm:^0.10.53, es5-ext@npm:^0.10.61, es5-ext@npm:^0.10.62, es5-ext@npm:~0.10.14, es5-ext@npm:~0.10.2, es5-ext@npm:~0.10.46":
+"es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.46, es5-ext@npm:^0.10.50, es5-ext@npm:^0.10.53, es5-ext@npm:^0.10.62, es5-ext@npm:^0.10.64, es5-ext@npm:~0.10.14, es5-ext@npm:~0.10.2, es5-ext@npm:~0.10.46":
   version: 0.10.64
   resolution: "es5-ext@npm:0.10.64"
   dependencies:
@@ -21361,7 +21284,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escalade@npm:^3.1.0, escalade@npm:^3.1.1, escalade@npm:^3.1.2":
+"escalade@npm:^3.1.0, escalade@npm:^3.1.1, escalade@npm:^3.2.0":
   version: 3.2.0
   resolution: "escalade@npm:3.2.0"
   checksum: 10/9d7169e3965b2f9ae46971afa392f6e5a25545ea30f2e2dd99c9b0a95a3f52b5653681a84f5b2911a413ddad2d7a93d3514165072f349b5ffc59c75a899970d6
@@ -21493,106 +21416,107 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-module-utils@npm:^2.8.0":
-  version: 2.8.0
-  resolution: "eslint-module-utils@npm:2.8.0"
+"eslint-module-utils@npm:^2.12.0":
+  version: 2.12.0
+  resolution: "eslint-module-utils@npm:2.12.0"
   dependencies:
     debug: "npm:^3.2.7"
   peerDependenciesMeta:
     eslint:
       optional: true
-  checksum: 10/a9a7ed93eb858092e3cdc797357d4ead2b3ea06959b0eada31ab13862d46a59eb064b9cb82302214232e547980ce33618c2992f6821138a4934e65710ed9cc29
+  checksum: 10/dd27791147eca17366afcb83f47d6825b6ce164abb256681e5de4ec1d7e87d8605641eb869298a0dbc70665e2446dbcc2f40d3e1631a9475dd64dd23d4ca5dee
   languageName: node
   linkType: hard
 
-"eslint-plugin-chai-friendly@npm:^0.7.4":
-  version: 0.7.4
-  resolution: "eslint-plugin-chai-friendly@npm:0.7.4"
+"eslint-plugin-chai-friendly@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "eslint-plugin-chai-friendly@npm:1.0.1"
   peerDependencies:
     eslint: ">=3.0.0"
-  checksum: 10/c7022be5f864dfc8a1a18494f0de357f245a37cf3f5ca0fec95b14bc3fb249e5ccfa01c3ab66a2203163b61272df495fa6b71b496467a49c131a35d1f8a0f9df
+  checksum: 10/459c0162b606d290bc6b10caa7bd7b67a3ce3d37d98ee1b9b91646842553d7282887858efd20cb6a6b8cbaa42746e83258244a32bce0e1d038ebe5559e747730
   languageName: node
   linkType: hard
 
-"eslint-plugin-cypress@npm:^2.15.1":
-  version: 2.15.1
-  resolution: "eslint-plugin-cypress@npm:2.15.1"
+"eslint-plugin-cypress@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "eslint-plugin-cypress@npm:4.1.0"
   dependencies:
-    globals: "npm:^13.20.0"
+    globals: "npm:^15.11.0"
   peerDependencies:
-    eslint: ">= 3.2.1"
-  checksum: 10/46344892f26e4f2c905a98e9d391bf1f930aa95e79f6678a1ca75ff466a6ca277fd51cde650fbcbc828068659acbad60601d239481402f443d177a1ef5934190
+    eslint: ">=9"
+  checksum: 10/50d3650e70410bf1924e88695532fa532c9823210f8791ac0bc0d05f451e6199c7ba3323b90c4753122de3f1bdfc3140bea33c772a2f827c92d4d412606bd5fe
   languageName: node
   linkType: hard
 
-"eslint-plugin-import@npm:^2.29.1":
-  version: 2.29.1
-  resolution: "eslint-plugin-import@npm:2.29.1"
+"eslint-plugin-import@npm:^2.31.0":
+  version: 2.31.0
+  resolution: "eslint-plugin-import@npm:2.31.0"
   dependencies:
-    array-includes: "npm:^3.1.7"
-    array.prototype.findlastindex: "npm:^1.2.3"
+    "@rtsao/scc": "npm:^1.1.0"
+    array-includes: "npm:^3.1.8"
+    array.prototype.findlastindex: "npm:^1.2.5"
     array.prototype.flat: "npm:^1.3.2"
     array.prototype.flatmap: "npm:^1.3.2"
     debug: "npm:^3.2.7"
     doctrine: "npm:^2.1.0"
     eslint-import-resolver-node: "npm:^0.3.9"
-    eslint-module-utils: "npm:^2.8.0"
-    hasown: "npm:^2.0.0"
-    is-core-module: "npm:^2.13.1"
+    eslint-module-utils: "npm:^2.12.0"
+    hasown: "npm:^2.0.2"
+    is-core-module: "npm:^2.15.1"
     is-glob: "npm:^4.0.3"
     minimatch: "npm:^3.1.2"
-    object.fromentries: "npm:^2.0.7"
-    object.groupby: "npm:^1.0.1"
-    object.values: "npm:^1.1.7"
+    object.fromentries: "npm:^2.0.8"
+    object.groupby: "npm:^1.0.3"
+    object.values: "npm:^1.2.0"
     semver: "npm:^6.3.1"
+    string.prototype.trimend: "npm:^1.0.8"
     tsconfig-paths: "npm:^3.15.0"
   peerDependencies:
-    eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-  checksum: 10/5865f05c38552145423c535326ec9a7113ab2305c7614c8b896ff905cfabc859c8805cac21e979c9f6f742afa333e6f62f812eabf891a7e8f5f0b853a32593c1
+    eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
+  checksum: 10/6b76bd009ac2db0615d9019699d18e2a51a86cb8c1d0855a35fb1b418be23b40239e6debdc6e8c92c59f1468ed0ea8d7b85c817117a113d5cc225be8a02ad31c
   languageName: node
   linkType: hard
 
-"eslint-plugin-jest@npm:^27.6.3":
-  version: 27.6.3
-  resolution: "eslint-plugin-jest@npm:27.6.3"
+"eslint-plugin-jest@npm:^28.8.3":
+  version: 28.8.3
+  resolution: "eslint-plugin-jest@npm:28.8.3"
   dependencies:
-    "@typescript-eslint/utils": "npm:^5.10.0"
+    "@typescript-eslint/utils": "npm:^6.0.0 || ^7.0.0 || ^8.0.0"
   peerDependencies:
-    "@typescript-eslint/eslint-plugin": ^5.0.0 || ^6.0.0
-    eslint: ^7.0.0 || ^8.0.0
+    "@typescript-eslint/eslint-plugin": ^6.0.0 || ^7.0.0 || ^8.0.0
+    eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
     jest: "*"
   peerDependenciesMeta:
     "@typescript-eslint/eslint-plugin":
       optional: true
     jest:
       optional: true
-  checksum: 10/a29319d5a090633e30658da7521f9fa0468f861403509538e0927175ab2a46a7f60bd7fd344b54f7fb5f8e8b6385d8db67c305502a4de1291f32191163e74725
+  checksum: 10/3f1798c61e143981eefcfb2fbc4b2e5b329378ebaafdec6485f443c79ee0d3304e9409e8ea8ce089ac15abb4e700d8d838e0a1da29feb528d77a2b3cce6989ec
   languageName: node
   linkType: hard
 
-"eslint-plugin-jsx-a11y@npm:^6.8.0":
-  version: 6.8.0
-  resolution: "eslint-plugin-jsx-a11y@npm:6.8.0"
+"eslint-plugin-jsx-a11y@npm:^6.10.2":
+  version: 6.10.2
+  resolution: "eslint-plugin-jsx-a11y@npm:6.10.2"
   dependencies:
-    "@babel/runtime": "npm:^7.23.2"
-    aria-query: "npm:^5.3.0"
-    array-includes: "npm:^3.1.7"
+    aria-query: "npm:^5.3.2"
+    array-includes: "npm:^3.1.8"
     array.prototype.flatmap: "npm:^1.3.2"
     ast-types-flow: "npm:^0.0.8"
-    axe-core: "npm:=4.7.0"
-    axobject-query: "npm:^3.2.1"
+    axe-core: "npm:^4.10.0"
+    axobject-query: "npm:^4.1.0"
     damerau-levenshtein: "npm:^1.0.8"
     emoji-regex: "npm:^9.2.2"
-    es-iterator-helpers: "npm:^1.0.15"
-    hasown: "npm:^2.0.0"
+    hasown: "npm:^2.0.2"
     jsx-ast-utils: "npm:^3.3.5"
     language-tags: "npm:^1.0.9"
     minimatch: "npm:^3.1.2"
-    object.entries: "npm:^1.1.7"
-    object.fromentries: "npm:^2.0.7"
+    object.fromentries: "npm:^2.0.8"
+    safe-regex-test: "npm:^1.0.3"
+    string.prototype.includes: "npm:^2.0.1"
   peerDependencies:
-    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 10/7a8e4498531a43d988ce2f12502a3f5ce96eacfec13f956cf927f24bb041b724fb7fc0f0306ea19d143bfc79e138bf25e25acca0822847206ac6bf5ce095e846
+    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9
+  checksum: 10/388550798548d911e2286d530a29153ca00434a06fcfc0e31e0dda46a5e7960005e532fb29ce1ccbf1e394a3af3e5cf70c47ca43778861eacc5e3ed799adb79c
   languageName: node
   linkType: hard
 
@@ -21632,42 +21556,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-react-hooks@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "eslint-plugin-react-hooks@npm:4.6.0"
+"eslint-plugin-react-hooks@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "eslint-plugin-react-hooks@npm:5.0.0"
   peerDependencies:
-    eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
-  checksum: 10/3c63134e056a6d98d66e2c475c81f904169db817e89316d14e36269919e31f4876a2588aa0e466ec8ef160465169c627fe823bfdaae7e213946584e4a165a3ac
+    eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0
+  checksum: 10/b762789832806b6981e2d910994e72aa7a85136fe0880572334b26cf1274ba37bd3b1365e77d2c2f92465337c4a65c84ef647bc499d33b86fc1110f2df7ef1bb
   languageName: node
   linkType: hard
 
-"eslint-plugin-react@npm:^7.33.2":
-  version: 7.33.2
-  resolution: "eslint-plugin-react@npm:7.33.2"
+"eslint-plugin-react@npm:^7.37.2":
+  version: 7.37.2
+  resolution: "eslint-plugin-react@npm:7.37.2"
   dependencies:
-    array-includes: "npm:^3.1.6"
-    array.prototype.flatmap: "npm:^1.3.1"
-    array.prototype.tosorted: "npm:^1.1.1"
+    array-includes: "npm:^3.1.8"
+    array.prototype.findlast: "npm:^1.2.5"
+    array.prototype.flatmap: "npm:^1.3.2"
+    array.prototype.tosorted: "npm:^1.1.4"
     doctrine: "npm:^2.1.0"
-    es-iterator-helpers: "npm:^1.0.12"
+    es-iterator-helpers: "npm:^1.1.0"
     estraverse: "npm:^5.3.0"
+    hasown: "npm:^2.0.2"
     jsx-ast-utils: "npm:^2.4.1 || ^3.0.0"
     minimatch: "npm:^3.1.2"
-    object.entries: "npm:^1.1.6"
-    object.fromentries: "npm:^2.0.6"
-    object.hasown: "npm:^1.1.2"
-    object.values: "npm:^1.1.6"
+    object.entries: "npm:^1.1.8"
+    object.fromentries: "npm:^2.0.8"
+    object.values: "npm:^1.2.0"
     prop-types: "npm:^15.8.1"
-    resolve: "npm:^2.0.0-next.4"
+    resolve: "npm:^2.0.0-next.5"
     semver: "npm:^6.3.1"
-    string.prototype.matchall: "npm:^4.0.8"
+    string.prototype.matchall: "npm:^4.0.11"
+    string.prototype.repeat: "npm:^1.0.0"
   peerDependencies:
-    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 10/cb8c5dd5859cace330e24b7d74b9c652c0d93ef1d87957261fe1ac2975c27c918d0d5dc607f25aba4972ce74d04456f4f93883a16ac10cd598680d047fc3495d
+    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
+  checksum: 10/df2f7ab198018d3378f305a8a5ceceebc9bd31f019fc7567a2ef9c77789dc8a6a2c3c3957f8b0805f26c11c02f9f86c972e02cd0eda12f4d0370526c11f8a9a3
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:5.1.1, eslint-scope@npm:^5.1.1":
+"eslint-scope@npm:5.1.1":
   version: 5.1.1
   resolution: "eslint-scope@npm:5.1.1"
   dependencies:
@@ -21677,13 +21603,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:^7.2.2":
-  version: 7.2.2
-  resolution: "eslint-scope@npm:7.2.2"
+"eslint-scope@npm:^8.2.0":
+  version: 8.2.0
+  resolution: "eslint-scope@npm:8.2.0"
   dependencies:
     esrecurse: "npm:^4.3.0"
     estraverse: "npm:^5.2.0"
-  checksum: 10/5c660fb905d5883ad018a6fea2b49f3cb5b1cbf2cd4bd08e98646e9864f9bc2c74c0839bed2d292e90a4a328833accc197c8f0baed89cbe8d605d6f918465491
+  checksum: 10/cd9ab60d5a68f3a0fcac04d1cff5a7383d0f331964d5f1c446259123caec5b3ccc542284d07846e4f4d1389da77750821cc9a6e1ce18558c674977351666f9a6
   languageName: node
   linkType: hard
 
@@ -21694,51 +21620,60 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:^8.56.0":
-  version: 8.56.0
-  resolution: "eslint@npm:8.56.0"
+"eslint-visitor-keys@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "eslint-visitor-keys@npm:4.2.0"
+  checksum: 10/9651b3356b01760e586b4c631c5268c0e1a85236e3292bf754f0472f465bf9a856c0ddc261fceace155334118c0151778effafbab981413dbf9288349343fa25
+  languageName: node
+  linkType: hard
+
+"eslint@npm:^9.13.0":
+  version: 9.14.0
+  resolution: "eslint@npm:9.14.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
-    "@eslint-community/regexpp": "npm:^4.6.1"
-    "@eslint/eslintrc": "npm:^2.1.4"
-    "@eslint/js": "npm:8.56.0"
-    "@humanwhocodes/config-array": "npm:^0.11.13"
+    "@eslint-community/regexpp": "npm:^4.12.1"
+    "@eslint/config-array": "npm:^0.18.0"
+    "@eslint/core": "npm:^0.7.0"
+    "@eslint/eslintrc": "npm:^3.1.0"
+    "@eslint/js": "npm:9.14.0"
+    "@eslint/plugin-kit": "npm:^0.2.0"
+    "@humanfs/node": "npm:^0.16.6"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
-    "@nodelib/fs.walk": "npm:^1.2.8"
-    "@ungap/structured-clone": "npm:^1.2.0"
+    "@humanwhocodes/retry": "npm:^0.4.0"
+    "@types/estree": "npm:^1.0.6"
+    "@types/json-schema": "npm:^7.0.15"
     ajv: "npm:^6.12.4"
     chalk: "npm:^4.0.0"
     cross-spawn: "npm:^7.0.2"
     debug: "npm:^4.3.2"
-    doctrine: "npm:^3.0.0"
     escape-string-regexp: "npm:^4.0.0"
-    eslint-scope: "npm:^7.2.2"
-    eslint-visitor-keys: "npm:^3.4.3"
-    espree: "npm:^9.6.1"
-    esquery: "npm:^1.4.2"
+    eslint-scope: "npm:^8.2.0"
+    eslint-visitor-keys: "npm:^4.2.0"
+    espree: "npm:^10.3.0"
+    esquery: "npm:^1.5.0"
     esutils: "npm:^2.0.2"
     fast-deep-equal: "npm:^3.1.3"
-    file-entry-cache: "npm:^6.0.1"
+    file-entry-cache: "npm:^8.0.0"
     find-up: "npm:^5.0.0"
     glob-parent: "npm:^6.0.2"
-    globals: "npm:^13.19.0"
-    graphemer: "npm:^1.4.0"
     ignore: "npm:^5.2.0"
     imurmurhash: "npm:^0.1.4"
     is-glob: "npm:^4.0.0"
-    is-path-inside: "npm:^3.0.3"
-    js-yaml: "npm:^4.1.0"
     json-stable-stringify-without-jsonify: "npm:^1.0.1"
-    levn: "npm:^0.4.1"
     lodash.merge: "npm:^4.6.2"
     minimatch: "npm:^3.1.2"
     natural-compare: "npm:^1.4.0"
     optionator: "npm:^0.9.3"
-    strip-ansi: "npm:^6.0.1"
     text-table: "npm:^0.2.0"
+  peerDependencies:
+    jiti: "*"
+  peerDependenciesMeta:
+    jiti:
+      optional: true
   bin:
     eslint: bin/eslint.js
-  checksum: 10/ef6193c6e4cef20774b985a5cc2fd4bf6d3c4decd423117cbc4a0196617861745db291217ad3c537bc3a160650cca965bc818f55e1f3e446af1fcb293f9940a5
+  checksum: 10/6ce59dda56ecff9483c6e8cd28e91138d2c43cbf08c923f731f507fd9b4aba9d72761c99882dc313a72ea915a5e380ab0b4f01e208a7a37d71490ddfd29ee063
   languageName: node
   linkType: hard
 
@@ -21761,7 +21696,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"espree@npm:^9.0.0, espree@npm:^9.6.0, espree@npm:^9.6.1":
+"espree@npm:^10.0.1, espree@npm:^10.3.0":
+  version: 10.3.0
+  resolution: "espree@npm:10.3.0"
+  dependencies:
+    acorn: "npm:^8.14.0"
+    acorn-jsx: "npm:^5.3.2"
+    eslint-visitor-keys: "npm:^4.2.0"
+  checksum: 10/3412d44d4204c9e29d6b5dd0277400cfa0cd68495dc09eae1b9ce79d0c8985c1c5cc09cb9ba32a1cd963f48a49b0c46bdb7736afe395a300aa6bb1c0d86837e8
+  languageName: node
+  linkType: hard
+
+"espree@npm:^9.0.0, espree@npm:^9.6.1":
   version: 9.6.1
   resolution: "espree@npm:9.6.1"
   dependencies:
@@ -21792,12 +21738,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esquery@npm:^1.4.2":
-  version: 1.5.0
-  resolution: "esquery@npm:1.5.0"
+"esquery@npm:^1.5.0":
+  version: 1.6.0
+  resolution: "esquery@npm:1.6.0"
   dependencies:
     estraverse: "npm:^5.1.0"
-  checksum: 10/e65fcdfc1e0ff5effbf50fb4f31ea20143ae5df92bb2e4953653d8d40aa4bc148e0d06117a592ce4ea53eeab1dafdfded7ea7e22a5be87e82d73757329a1b01d
+  checksum: 10/c587fb8ec9ed83f2b1bc97cf2f6854cc30bf784a79d62ba08c6e358bf22280d69aee12827521cf38e69ae9761d23fb7fde593ce315610f85655c139d99b05e5a
   languageName: node
   linkType: hard
 
@@ -21949,41 +21895,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eth-ens-namehash@npm:2.0.8":
-  version: 2.0.8
-  resolution: "eth-ens-namehash@npm:2.0.8"
-  dependencies:
-    idna-uts46-hx: "npm:^2.3.1"
-    js-sha3: "npm:^0.5.7"
-  checksum: 10/098c04378b0b998191b4bcd2f1a59be976946bbb80cea7bc2a6d1df3a035e061b2fd120b16bf41558c4beb2dd846433742058b091b20195e4b0e1fc64b67979f
-  languageName: node
-  linkType: hard
-
-"eth-lib@npm:0.2.8":
-  version: 0.2.8
-  resolution: "eth-lib@npm:0.2.8"
-  dependencies:
-    bn.js: "npm:^4.11.6"
-    elliptic: "npm:^6.4.0"
-    xhr-request-promise: "npm:^0.1.2"
-  checksum: 10/85a6f1673c7106252864fdf6c86973d6bfdf454b238ee8d07d8f642599fa9f390129b6fbd060742a5be7c197be924951535a0c0ebb3e912cfd9f2130b64f74ce
-  languageName: node
-  linkType: hard
-
-"eth-lib@npm:^0.1.26":
-  version: 0.1.29
-  resolution: "eth-lib@npm:0.1.29"
-  dependencies:
-    bn.js: "npm:^4.11.6"
-    elliptic: "npm:^6.4.0"
-    nano-json-stream-parser: "npm:^0.1.2"
-    servify: "npm:^0.1.12"
-    ws: "npm:^3.0.0"
-    xhr-request-promise: "npm:^0.1.2"
-  checksum: 10/ee4fcd8400fad0b637c25bd0a4483a54c986b78ac6c4d7fd2a5df12b41468abfa50a66684e315e16894b870d2fcf5d2273a81f429f89c460b275bf4477365f60
-  languageName: node
-  linkType: hard
-
 "eth-phishing-detect@npm:^1.2.0":
   version: 1.2.0
   resolution: "eth-phishing-detect@npm:1.2.0"
@@ -21993,70 +21904,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ethereum-bloom-filters@npm:^1.0.6":
-  version: 1.0.10
-  resolution: "ethereum-bloom-filters@npm:1.0.10"
-  dependencies:
-    js-sha3: "npm:^0.8.0"
-  checksum: 10/dc4191c5d810db864ace106886f340b541bf03f1ad3249459ac630cab9c191f1e45c03e935887cca903cca884326e3ac97acfef0a083c7e1a004108f5991f9ba
-  languageName: node
-  linkType: hard
-
-"ethereum-cryptography@npm:^0.1.3":
-  version: 0.1.3
-  resolution: "ethereum-cryptography@npm:0.1.3"
-  dependencies:
-    "@types/pbkdf2": "npm:^3.0.0"
-    "@types/secp256k1": "npm:^4.0.1"
-    blakejs: "npm:^1.1.0"
-    browserify-aes: "npm:^1.2.0"
-    bs58check: "npm:^2.1.2"
-    create-hash: "npm:^1.2.0"
-    create-hmac: "npm:^1.1.7"
-    hash.js: "npm:^1.1.7"
-    keccak: "npm:^3.0.0"
-    pbkdf2: "npm:^3.0.17"
-    randombytes: "npm:^2.1.0"
-    safe-buffer: "npm:^5.1.2"
-    scrypt-js: "npm:^3.0.0"
-    secp256k1: "npm:^4.0.1"
-    setimmediate: "npm:^1.0.5"
-  checksum: 10/975e476782746acd97d5b37366801ae622a52fb31e5d83f600804be230a61ef7b9d289dcecd9c308fb441967caf3a6e3768dd7c8add6441fcc60c398175d5a96
-  languageName: node
-  linkType: hard
-
-"ethereum-cryptography@npm:^2.0.0, ethereum-cryptography@npm:^2.1.2, ethereum-cryptography@npm:^2.1.3":
-  version: 2.1.3
-  resolution: "ethereum-cryptography@npm:2.1.3"
-  dependencies:
-    "@noble/curves": "npm:1.3.0"
-    "@noble/hashes": "npm:1.3.3"
-    "@scure/bip32": "npm:1.3.3"
-    "@scure/bip39": "npm:1.2.2"
-  checksum: 10/cc5aa9a4368dc1dd7680ba921957c098ced7b3d7dbb1666334013ab2f8d4cd25a785ad84e66fd9f5c5a9b6de337930ea24ff8c722938f36a9c00cec597ca16b5
-  languageName: node
-  linkType: hard
-
-"ethereumjs-util@npm:^7.1.5":
-  version: 7.1.5
-  resolution: "ethereumjs-util@npm:7.1.5"
-  dependencies:
-    "@types/bn.js": "npm:^5.1.0"
-    bn.js: "npm:^5.1.2"
-    create-hash: "npm:^1.1.2"
-    ethereum-cryptography: "npm:^0.1.3"
-    rlp: "npm:^2.2.4"
-  checksum: 10/f28fc1ebb8f35bf9e418f76f51be737d94d603b912c3e014c4e87cd45ccd1b10bdfef764c8f152574b57e9faa260a18773cbc110f9e0a754d6b3730699e54dc9
-  languageName: node
-  linkType: hard
-
-"ethjs-unit@npm:0.1.6":
-  version: 0.1.6
-  resolution: "ethjs-unit@npm:0.1.6"
+"ethereum-cryptography@npm:^2.0.0, ethereum-cryptography@npm:^2.1.2, ethereum-cryptography@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "ethereum-cryptography@npm:2.2.1"
   dependencies:
-    bn.js: "npm:4.11.6"
-    number-to-bn: "npm:1.7.0"
-  checksum: 10/35086cb671806992ec36d5dd43ab67e68ad7a9237e42c0e963f9081c88e40147cda86c1a258b0a3180bf2b7bc1960e607c5bcaefdb2196e0f3564acf73276189
+    "@noble/curves": "npm:1.4.2"
+    "@noble/hashes": "npm:1.4.0"
+    "@scure/bip32": "npm:1.4.0"
+    "@scure/bip39": "npm:1.3.0"
+  checksum: 10/ab123bbfe843500ac2d645ce9edc4bc814962ffb598db6bf8bf01fbecac656e6c81ff4cf2472f1734844bbcbad2bf658d8b699cb7248d768e0f06ae13ecf43b8
   languageName: node
   linkType: hard
 
@@ -22091,13 +21947,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eventemitter3@npm:4.0.4":
-  version: 4.0.4
-  resolution: "eventemitter3@npm:4.0.4"
-  checksum: 10/6a85beb36d7ff2363de71aa19a17c24ecde7a92f706347891befc5901793e41ac847ce9c04c96dc0f5095384890cc737e64f21ed334e75c523d2352056fc6a9e
-  languageName: node
-  linkType: hard
-
 "eventemitter3@npm:^4.0.0, eventemitter3@npm:^4.0.1, eventemitter3@npm:^4.0.4":
   version: 4.0.7
   resolution: "eventemitter3@npm:4.0.7"
@@ -22440,6 +22289,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"expo-eas-client@npm:~0.12.0":
+  version: 0.12.0
+  resolution: "expo-eas-client@npm:0.12.0"
+  checksum: 10/84f9f00fc7343e1ef38499a8c09644435bac5c09cf6f0c62386dbeaf506062ece82959a8216e2e0765cf3d8ac165548babb0d9e3b012cf560c7becb0409e67b0
+  languageName: node
+  linkType: hard
+
 "expo-file-system@npm:~17.0.1":
   version: 17.0.1
   resolution: "expo-file-system@npm:17.0.1"
@@ -22632,6 +22488,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"expo-structured-headers@npm:~3.8.0":
+  version: 3.8.0
+  resolution: "expo-structured-headers@npm:3.8.0"
+  checksum: 10/8d723dc76e96e4190469695e9a2a833a66eb908689cb63aac244f67ff63d2d111b761592ce9f50d67d12bcd38f31cc5bf385fc582a37c51bd0aef379e4ec451a
+  languageName: node
+  linkType: hard
+
 "expo-system-ui@npm:3.0.7":
   version: 3.0.7
   resolution: "expo-system-ui@npm:3.0.7"
@@ -22653,6 +22516,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"expo-updates@npm:^0.25.27":
+  version: 0.25.27
+  resolution: "expo-updates@npm:0.25.27"
+  dependencies:
+    "@expo/code-signing-certificates": "npm:0.0.5"
+    "@expo/config": "npm:~9.0.0-beta.0"
+    "@expo/config-plugins": "npm:~8.0.8"
+    "@expo/fingerprint": "npm:^0.10.2"
+    "@expo/spawn-async": "npm:^1.7.2"
+    arg: "npm:4.1.0"
+    chalk: "npm:^4.1.2"
+    expo-eas-client: "npm:~0.12.0"
+    expo-manifests: "npm:~0.14.0"
+    expo-structured-headers: "npm:~3.8.0"
+    expo-updates-interface: "npm:~0.16.2"
+    fast-glob: "npm:^3.3.2"
+    fbemitter: "npm:^3.0.0"
+    ignore: "npm:^5.3.1"
+    resolve-from: "npm:^5.0.0"
+  peerDependencies:
+    expo: "*"
+  bin:
+    expo-updates: bin/cli.js
+  checksum: 10/727518a51f638fed6e42bc948536074b1d469650693a02aa331d254a492779c96ac0f4c718b8a37c8ab0256570a9314a1b40169e403dcebedd49c5a3450a0e9e
+  languageName: node
+  linkType: hard
+
 "expo@npm:51.0.31":
   version: 51.0.31
   resolution: "expo@npm:51.0.31"
@@ -22685,16 +22575,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"express@npm:^4.14.0, express@npm:^4.17.3, express@npm:^4.18.2, express@npm:^4.21.0":
-  version: 4.21.0
-  resolution: "express@npm:4.21.0"
+"express@npm:^4.17.3, express@npm:^4.18.2, express@npm:^4.21.1":
+  version: 4.21.1
+  resolution: "express@npm:4.21.1"
   dependencies:
     accepts: "npm:~1.3.8"
     array-flatten: "npm:1.1.1"
     body-parser: "npm:1.20.3"
     content-disposition: "npm:0.5.4"
     content-type: "npm:~1.0.4"
-    cookie: "npm:0.6.0"
+    cookie: "npm:0.7.1"
     cookie-signature: "npm:1.0.6"
     debug: "npm:2.6.9"
     depd: "npm:2.0.0"
@@ -22720,7 +22610,7 @@ __metadata:
     type-is: "npm:~1.6.18"
     utils-merge: "npm:1.0.1"
     vary: "npm:~1.1.2"
-  checksum: 10/3b1ee5bc5b1bd996f688702519cebc9b63a24e506965f6e1773268238cfa2c24ffdb38cc3fcb4fde66f77de1c0bebd9ee058dad06bb9c6f084b525f3c09164d3
+  checksum: 10/5d4a36dd03c1d1cce93172e9b185b5cd13a978d29ee03adc51cd278be7b4a514ae2b63e2fdaec0c00fdc95c6cfb396d9dd1da147917ffd337d6cd0778e08c9bc
   languageName: node
   linkType: hard
 
@@ -22821,6 +22711,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fantasticon@npm:3.0.0":
+  version: 3.0.0
+  resolution: "fantasticon@npm:3.0.0"
+  dependencies:
+    case: "npm:^1.6.3"
+    cli-color: "npm:^2.0.4"
+    commander: "npm:^12.0.0"
+    glob: "npm:^10.3.12"
+    handlebars: "npm:^4.7.8"
+    slugify: "npm:^1.6.6"
+    svg2ttf: "npm:^6.0.3"
+    svgicons2svgfont: "npm:^12.0.0"
+    ttf2eot: "npm:^3.1.0"
+    ttf2woff: "npm:^3.0.0"
+    ttf2woff2: "npm:^5.0.0"
+  bin:
+    fantasticon: bin/fantasticon
+  checksum: 10/26e22d7055457c2ed7f83bec669d878f7b7c54e0143924fcf51b277cc9059d3973934b5cfc2254d7f058e632c7dd773cdbe0b12068dbd0bbce31f5c0c8cfa4d7
+  languageName: node
+  linkType: hard
+
 "fast-copy@npm:^3.0.2":
   version: 3.0.2
   resolution: "fast-copy@npm:3.0.2"
@@ -23198,15 +23109,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"file-entry-cache@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "file-entry-cache@npm:6.0.1"
-  dependencies:
-    flat-cache: "npm:^3.0.4"
-  checksum: 10/099bb9d4ab332cb93c48b14807a6918a1da87c45dce91d4b61fd40e6505d56d0697da060cb901c729c90487067d93c9243f5da3dc9c41f0358483bfdebca736b
-  languageName: node
-  linkType: hard
-
 "file-entry-cache@npm:^8.0.0":
   version: 8.0.0
   resolution: "file-entry-cache@npm:8.0.0"
@@ -23544,13 +23446,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"form-data-encoder@npm:1.7.1":
-  version: 1.7.1
-  resolution: "form-data-encoder@npm:1.7.1"
-  checksum: 10/1abc9059d991b105ba4122a36f9b5c17fd0af77ce8fa59a826a5b9ce56d616807e7780963616dd7e7906ec7aa1ba28cfb7c9defd9747ad10484e039a2b946cca
-  languageName: node
-  linkType: hard
-
 "form-data@npm:4.0.0, form-data@npm:^4.0.0":
   version: 4.0.0
   resolution: "form-data@npm:4.0.0"
@@ -23695,17 +23590,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-extra@npm:^4.0.2":
-  version: 4.0.3
-  resolution: "fs-extra@npm:4.0.3"
-  dependencies:
-    graceful-fs: "npm:^4.1.2"
-    jsonfile: "npm:^4.0.0"
-    universalify: "npm:^0.1.0"
-  checksum: 10/c1ab28ac6b19a1e37f9c0fb3a233b7333bd4d12ea2a514b5469ba956f022fa0e2aefa3b351d1117b80ed45495bb779427c8f64727c150bb1599c2ce9ab3b42ac
-  languageName: node
-  linkType: hard
-
 "fs-extra@npm:^7.0.1":
   version: 7.0.1
   resolution: "fs-extra@npm:7.0.1"
@@ -23740,16 +23624,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-minipass@npm:^1.2.7":
-  version: 1.2.7
-  resolution: "fs-minipass@npm:1.2.7"
-  dependencies:
-    minipass: "npm:^2.6.0"
-  checksum: 10/6a2d39963eaad748164530ffab49606d0f3462c7867748521af3b7039d13689be533636d50a04e8ba6bd327d4d2e899d0907f8830d1161fe2db467d59cc46dc3
-  languageName: node
-  linkType: hard
-
-"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0":
+"fs-minipass@npm:^2.0.0":
   version: 2.1.0
   resolution: "fs-minipass@npm:2.1.0"
   dependencies:
@@ -23859,22 +23734,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gauge@npm:^4.0.3":
-  version: 4.0.4
-  resolution: "gauge@npm:4.0.4"
-  dependencies:
-    aproba: "npm:^1.0.3 || ^2.0.0"
-    color-support: "npm:^1.1.3"
-    console-control-strings: "npm:^1.1.0"
-    has-unicode: "npm:^2.0.1"
-    signal-exit: "npm:^3.0.7"
-    string-width: "npm:^4.2.3"
-    strip-ansi: "npm:^6.0.1"
-    wide-align: "npm:^1.1.5"
-  checksum: 10/09535dd53b5ced6a34482b1fa9f3929efdeac02f9858569cde73cef3ed95050e0f3d095706c1689614059898924b7a74aa14042f51381a1ccc4ee5c29d2389c4
-  languageName: node
-  linkType: hard
-
 "gemoji@npm:^8.0.0":
   version: 8.1.0
   resolution: "gemoji@npm:8.1.0"
@@ -23910,7 +23769,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2, get-intrinsic@npm:^1.2.4":
+"get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
   version: 1.2.4
   resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
@@ -24018,13 +23877,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-symbol-description@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "get-symbol-description@npm:1.0.0"
+"get-symbol-description@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "get-symbol-description@npm:1.0.2"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.1.1"
-  checksum: 10/7e5f298afe0f0872747dce4a949ce490ebc5d6dd6aefbbe5044543711c9b19a4dfaebdbc627aee99e1299d58a435b2fbfa083458c1d58be6dc03a3bada24d359
+    call-bind: "npm:^1.0.5"
+    es-errors: "npm:^1.3.0"
+    get-intrinsic: "npm:^1.2.4"
+  checksum: 10/e1cb53bc211f9dbe9691a4f97a46837a553c4e7caadd0488dc24ac694db8a390b93edd412b48dcdd0b4bbb4c595de1709effc75fc87c0839deedc6968f5bd973
   languageName: node
   linkType: hard
 
@@ -24105,6 +23965,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"git-url-parse@npm:^15.0.0":
+  version: 15.0.0
+  resolution: "git-url-parse@npm:15.0.0"
+  dependencies:
+    git-up: "npm:^7.0.0"
+  checksum: 10/b6e54fc58bb4f4c9bfb1060ec93c3d1462880c6bec76926978e32b2bbfac3535001c87efd1ef0dca9cd9ee0ffdaacba2f50dc4f7032ba09ad92d93e9acc9936b
+  languageName: node
+  linkType: hard
+
 "github-from-package@npm:0.0.0":
   version: 0.0.0
   resolution: "github-from-package@npm:0.0.0"
@@ -24240,7 +24109,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^8.0.0, glob@npm:^8.0.1, glob@npm:^8.0.3":
+"glob@npm:^8.0.0, glob@npm:^8.0.3":
   version: 8.1.0
   resolution: "glob@npm:8.1.0"
   dependencies:
@@ -24320,16 +24189,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"global@npm:~4.4.0":
-  version: 4.4.0
-  resolution: "global@npm:4.4.0"
-  dependencies:
-    min-document: "npm:^2.19.0"
-    process: "npm:^0.11.10"
-  checksum: 10/9c057557c8f5a5bcfbeb9378ba4fe2255d04679452be504608dd5f13b54edf79f7be1db1031ea06a4ec6edd3b9f5f17d2d172fb47e6c69dae57fd84b7e72b77f
-  languageName: node
-  linkType: hard
-
 "globals@npm:^11.1.0":
   version: 11.12.0
   resolution: "globals@npm:11.12.0"
@@ -24337,21 +24196,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:^13.19.0, globals@npm:^13.20.0":
-  version: 13.23.0
-  resolution: "globals@npm:13.23.0"
-  dependencies:
-    type-fest: "npm:^0.20.2"
-  checksum: 10/bf6a8616f4a64959c0b9a8eb4dc8a02e7dd0082385f7f06bc9694d9fceabe39f83f83789322cfe0470914dc8b273b7a29af5570b9e1a0507d3fb7348a64703a3
+"globals@npm:^14.0.0":
+  version: 14.0.0
+  resolution: "globals@npm:14.0.0"
+  checksum: 10/03939c8af95c6df5014b137cac83aa909090c3a3985caef06ee9a5a669790877af8698ab38007e4c0186873adc14c0b13764acc754b16a754c216cc56aa5f021
   languageName: node
   linkType: hard
 
-"globalthis@npm:^1.0.1, globalthis@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "globalthis@npm:1.0.3"
+"globals@npm:^15.11.0":
+  version: 15.12.0
+  resolution: "globals@npm:15.12.0"
+  checksum: 10/07cac4ee7cc9befa7894be9b4d1a57f46eeedf9065939f39ffb875009394908eb7bac84147712cfd4bbabab5abc7ab98fc3a6d0fd881f9548fffa10ba2e4bf67
+  languageName: node
+  linkType: hard
+
+"globalthis@npm:^1.0.1, globalthis@npm:^1.0.3, globalthis@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "globalthis@npm:1.0.4"
   dependencies:
-    define-properties: "npm:^1.1.3"
-  checksum: 10/45ae2f3b40a186600d0368f2a880ae257e8278b4c7704f0417d6024105ad7f7a393661c5c2fa1334669cd485ea44bc883a08fdd4516df2428aec40c99f52aa89
+    define-properties: "npm:^1.2.1"
+    gopd: "npm:^1.0.1"
+  checksum: 10/1f1fd078fb2f7296306ef9dd51019491044ccf17a59ed49d375b576ca108ff37e47f3d29aead7add40763574a992f16a5367dd1e2173b8634ef18556ab719ac4
   languageName: node
   linkType: hard
 
@@ -24454,27 +24319,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"got@npm:12.1.0":
-  version: 12.1.0
-  resolution: "got@npm:12.1.0"
-  dependencies:
-    "@sindresorhus/is": "npm:^4.6.0"
-    "@szmarczak/http-timer": "npm:^5.0.1"
-    "@types/cacheable-request": "npm:^6.0.2"
-    "@types/responselike": "npm:^1.0.0"
-    cacheable-lookup: "npm:^6.0.4"
-    cacheable-request: "npm:^7.0.2"
-    decompress-response: "npm:^6.0.0"
-    form-data-encoder: "npm:1.7.1"
-    get-stream: "npm:^6.0.1"
-    http2-wrapper: "npm:^2.1.10"
-    lowercase-keys: "npm:^3.0.0"
-    p-cancelable: "npm:^3.0.0"
-    responselike: "npm:^2.0.0"
-  checksum: 10/d1dab1884b14d1f59d10005ee3834faf6d9b43530c7faf603c176d35dceb2b8e0e2e01b9e0d4fc320409ac1b4d958196ff928dc6df0ddd0a3e7a254aa9edfd45
-  languageName: node
-  linkType: hard
-
 "got@npm:^11.7.0, got@npm:^11.8.5, got@npm:^11.8.6":
   version: 11.8.6
   resolution: "got@npm:11.8.6"
@@ -24577,12 +24421,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"handlebars@npm:^4.7.7":
-  version: 4.7.7
-  resolution: "handlebars@npm:4.7.7"
+"handlebars@npm:^4.7.7, handlebars@npm:^4.7.8":
+  version: 4.7.8
+  resolution: "handlebars@npm:4.7.8"
   dependencies:
     minimist: "npm:^1.2.5"
-    neo-async: "npm:^2.6.0"
+    neo-async: "npm:^2.6.2"
     source-map: "npm:^0.6.1"
     uglify-js: "npm:^3.1.4"
     wordwrap: "npm:^1.0.0"
@@ -24591,24 +24435,7 @@ __metadata:
       optional: true
   bin:
     handlebars: bin/handlebars
-  checksum: 10/617b1e689b7577734abc74564bdb8cdaddf8fd48ce72afdb489f426e9c60a7d6ee2a2707c023720c4059070128243c948bded8f2716e4543378033e3971b85ea
-  languageName: node
-  linkType: hard
-
-"har-schema@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "har-schema@npm:2.0.0"
-  checksum: 10/d8946348f333fb09e2bf24cc4c67eabb47c8e1d1aa1c14184c7ffec1140a49ec8aa78aa93677ae452d71d5fc0fdeec20f0c8c1237291fc2bcb3f502a5d204f9b
-  languageName: node
-  linkType: hard
-
-"har-validator@npm:~5.1.3":
-  version: 5.1.5
-  resolution: "har-validator@npm:5.1.5"
-  dependencies:
-    ajv: "npm:^6.12.3"
-    har-schema: "npm:^2.0.0"
-  checksum: 10/b998a7269ca560d7f219eedc53e2c664cd87d487e428ae854a6af4573fc94f182fe9d2e3b92ab968249baec7ebaf9ead69cf975c931dc2ab282ec182ee988280
+  checksum: 10/bd528f4dd150adf67f3f857118ef0fa43ff79a153b1d943fa0a770f2599e38b25a7a0dbac1a3611a4ec86970fd2325a81310fb788b5c892308c9f8743bd02e11
   languageName: node
   linkType: hard
 
@@ -24658,10 +24485,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-proto@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "has-proto@npm:1.0.1"
-  checksum: 10/eab2ab0ed1eae6d058b9bbc4c1d99d2751b29717be80d02fd03ead8b62675488de0c7359bc1fdd4b87ef6fd11e796a9631ad4d7452d9324fdada70158c2e5be7
+"has-proto@npm:^1.0.1, has-proto@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "has-proto@npm:1.0.3"
+  checksum: 10/0b67c2c94e3bea37db3e412e3c41f79d59259875e636ba471e94c009cdfb1fa82bf045deeffafc7dbb9c148e36cae6b467055aaa5d9fad4316e11b41e3ba551a
   languageName: node
   linkType: hard
 
@@ -24672,19 +24499,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-tostringtag@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-tostringtag@npm:1.0.0"
+"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-tostringtag@npm:1.0.2"
   dependencies:
-    has-symbols: "npm:^1.0.2"
-  checksum: 10/95546e7132efc895a9ae64a8a7cf52588601fc3d52e0304ed228f336992cdf0baaba6f3519d2655e560467db35a1ed79f6420c286cc91a13aa0647a31ed92570
-  languageName: node
-  linkType: hard
-
-"has-unicode@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "has-unicode@npm:2.0.1"
-  checksum: 10/041b4293ad6bf391e21c5d85ed03f412506d6623786b801c4ab39e4e6ca54993f13201bceb544d92963f9e0024e6e7fbf0cb1d84c9d6b31cb9c79c8c990d13d8
+    has-symbols: "npm:^1.0.3"
+  checksum: 10/c74c5f5ceee3c8a5b8bc37719840dc3749f5b0306d818974141dda2471a1a2ca6c8e46b9d6ac222c5345df7a901c9b6f350b1e6d62763fec877e26609a401bfe
   languageName: node
   linkType: hard
 
@@ -24719,7 +24539,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hash.js@npm:1.1.7, hash.js@npm:^1.0.0, hash.js@npm:^1.0.3, hash.js@npm:^1.1.7":
+"hash.js@npm:^1.0.0, hash.js@npm:^1.0.3":
   version: 1.1.7
   resolution: "hash.js@npm:1.1.7"
   dependencies:
@@ -24729,12 +24549,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hasown@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "hasown@npm:2.0.0"
+"hasown@npm:^2.0.0, hasown@npm:^2.0.1, hasown@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "hasown@npm:2.0.2"
   dependencies:
     function-bind: "npm:^1.1.2"
-  checksum: 10/c330f8d93f9d23fe632c719d4db3d698ef7d7c367d51548b836069e06a90fa9151e868c8e67353cfe98d67865bf7354855db28fa36eb1b18fa5d4a3f4e7f1c90
+  checksum: 10/7898a9c1788b2862cf0f9c345a6bec77ba4a0c0983c7f19d610c382343d4f98fa260686b225dfb1f88393a66679d2ec58ee310c1d6868c081eda7918f32cc70a
   languageName: node
   linkType: hard
 
@@ -25308,7 +25128,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0":
+"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.1":
   version: 4.1.1
   resolution: "http-cache-semantics@npm:4.1.1"
   checksum: 10/362d5ed66b12ceb9c0a328fb31200b590ab1b02f4a254a697dc796850cc4385603e75f53ec59f768b2dad3bfa1464bd229f7de278d2899a0e3beffc634b6683f
@@ -25360,13 +25180,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-https@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "http-https@npm:1.0.0"
-  checksum: 10/fd3c0802982b1e951a03206690271dacb641b39b80d1820e95095db923d8f63cc7f0df1259969400c8487787a2a46f7b33383c0427ec780a78131b153741b144
-  languageName: node
-  linkType: hard
-
 "http-parser-js@npm:>=0.5.1":
   version: 0.5.8
   resolution: "http-parser-js@npm:0.5.8"
@@ -25437,17 +25250,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-signature@npm:~1.2.0":
-  version: 1.2.0
-  resolution: "http-signature@npm:1.2.0"
-  dependencies:
-    assert-plus: "npm:^1.0.0"
-    jsprim: "npm:^1.2.2"
-    sshpk: "npm:^1.7.0"
-  checksum: 10/2ff7112e6b0d8f08b382dfe705078c655501f2ddd76cf589d108445a9dd388a0a9be928c37108261519a7f53e6bbd1651048d74057b804807cce1ec49e87a95b
-  languageName: node
-  linkType: hard
-
 "http-signature@npm:~1.3.6":
   version: 1.3.6
   resolution: "http-signature@npm:1.3.6"
@@ -25469,16 +25271,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http2-wrapper@npm:^2.1.10":
-  version: 2.2.1
-  resolution: "http2-wrapper@npm:2.2.1"
-  dependencies:
-    quick-lru: "npm:^5.1.1"
-    resolve-alpn: "npm:^1.2.0"
-  checksum: 10/e7a5ac6548318e83fc0399cd832cdff6bbf902b165d211cad47a56ee732922e0aa1107246dd884b12532a1c4649d27c4d44f2480911c65202e93c90bde8fa29d
-  languageName: node
-  linkType: hard
-
 "https-browserify@npm:^1.0.0":
   version: 1.0.0
   resolution: "https-browserify@npm:1.0.0"
@@ -25506,13 +25298,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:^7.0.2":
-  version: 7.0.4
-  resolution: "https-proxy-agent@npm:7.0.4"
+"https-proxy-agent@npm:^7.0.0, https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2":
+  version: 7.0.5
+  resolution: "https-proxy-agent@npm:7.0.5"
   dependencies:
     agent-base: "npm:^7.0.2"
     debug: "npm:4"
-  checksum: 10/405fe582bba461bfe5c7e2f8d752b384036854488b828ae6df6a587c654299cbb2c50df38c4b6ab303502c3c5e029a793fbaac965d1e86ee0be03faceb554d63
+  checksum: 10/6679d46159ab3f9a5509ee80c3a3fc83fba3a920a5e18d32176c3327852c3c00ad640c0c4210a8fd70ea3c4a6d3a1b375bf01942516e7df80e2646bdc77658ab
   languageName: node
   linkType: hard
 
@@ -25604,15 +25396,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"idna-uts46-hx@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "idna-uts46-hx@npm:2.3.1"
-  dependencies:
-    punycode: "npm:2.1.0"
-  checksum: 10/5cb65dbc375d42ce9b38dab6e2a7f41b8c059f9a88d236bc9ca32084485f5f22fec11ea5b4e6b61239448148443c3f825fddaa5f298d22e12ecfe845de71a807
-  languageName: node
-  linkType: hard
-
 "ieee754@npm:^1.1.13, ieee754@npm:^1.1.4, ieee754@npm:^1.2.1":
   version: 1.2.1
   resolution: "ieee754@npm:1.2.1"
@@ -25719,13 +25502,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"infer-owner@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "infer-owner@npm:1.0.4"
-  checksum: 10/181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89
-  languageName: node
-  linkType: hard
-
 "inflight@npm:^1.0.4":
   version: 1.0.6
   resolution: "inflight@npm:1.0.6"
@@ -25833,14 +25609,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.5":
-  version: 1.0.6
-  resolution: "internal-slot@npm:1.0.6"
+"internal-slot@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "internal-slot@npm:1.0.7"
   dependencies:
-    get-intrinsic: "npm:^1.2.2"
+    es-errors: "npm:^1.3.0"
     hasown: "npm:^2.0.0"
     side-channel: "npm:^1.0.4"
-  checksum: 10/bc2022eb1f277f2fcb2a60e7ced451c7ffc7a769b12e63c7a3fb247af8b5a1bed06428ce724046a8bca39ed6eb5b6832501a42f2e9a5ec4a9a7dc4e634431616
+  checksum: 10/3e66720508831153ecf37d13def9f6856f9f2960989ec8a0a0476c98f887fca9eff0163127466485cb825c900c2d6fc601aa9117b7783b90ffce23a71ea5d053
   languageName: node
   linkType: hard
 
@@ -25929,6 +25705,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ip-address@npm:^9.0.5":
+  version: 9.0.5
+  resolution: "ip-address@npm:9.0.5"
+  dependencies:
+    jsbn: "npm:1.1.0"
+    sprintf-js: "npm:^1.1.3"
+  checksum: 10/1ed81e06721af012306329b31f532b5e24e00cb537be18ddc905a84f19fe8f83a09a1699862bf3a1ec4b9dea93c55a3fa5faf8b5ea380431469df540f38b092c
+  languageName: node
+  linkType: hard
+
 "ip-regex@npm:^2.1.0":
   version: 2.1.0
   resolution: "ip-regex@npm:2.1.0"
@@ -26001,14 +25787,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "is-array-buffer@npm:3.0.2"
+"is-array-buffer@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "is-array-buffer@npm:3.0.4"
   dependencies:
     call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.2.0"
-    is-typed-array: "npm:^1.1.10"
-  checksum: 10/dcac9dda66ff17df9cabdc58214172bf41082f956eab30bb0d86bc0fab1e44b690fc8e1f855cf2481245caf4e8a5a006a982a71ddccec84032ed41f9d8da8c14
+    get-intrinsic: "npm:^1.2.1"
+  checksum: 10/34a26213d981d58b30724ef37a1e0682f4040d580fa9ff58fdfdd3cefcb2287921718c63971c1c404951e7b747c50fdc7caf6e867e951353fa71b369c04c969b
   languageName: node
   linkType: hard
 
@@ -26104,12 +25889,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.12.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1, is-core-module@npm:^2.9.0":
-  version: 2.13.1
-  resolution: "is-core-module@npm:2.13.1"
+"is-core-module@npm:^2.12.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.15.1":
+  version: 2.15.1
+  resolution: "is-core-module@npm:2.15.1"
   dependencies:
-    hasown: "npm:^2.0.0"
-  checksum: 10/d53bd0cc24b0a0351fb4b206ee3908f71b9bbf1c47e9c9e14e5f06d292af1663704d2abd7e67700d6487b2b7864e0d0f6f10a1edf1892864bdffcb197d1845a2
+    hasown: "npm:^2.0.2"
+  checksum: 10/77316d5891d5743854bcef2cd2f24c5458fb69fbc9705c12ca17d54a2017a67d0693bbf1ba8c77af376c0eef6bf6d1b27a4ab08e4db4e69914c3789bdf2ceec5
+  languageName: node
+  linkType: hard
+
+"is-data-view@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-data-view@npm:1.0.1"
+  dependencies:
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10/4ba4562ac2b2ec005fefe48269d6bd0152785458cd253c746154ffb8a8ab506a29d0cfb3b74af87513843776a88e4981ae25c89457bf640a33748eab1a7216b5
   languageName: node
   linkType: hard
 
@@ -26219,13 +26013,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-function@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "is-function@npm:1.0.2"
-  checksum: 10/7d564562e07b4b51359547d3ccc10fb93bb392fd1b8177ae2601ee4982a0ece86d952323fc172a9000743a3971f09689495ab78a1d49a9b14fc97a7e28521dc0
-  languageName: node
-  linkType: hard
-
 "is-generator-fn@npm:^2.0.0":
   version: 2.1.0
   resolution: "is-generator-fn@npm:2.1.0"
@@ -26267,13 +26054,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-hex-prefixed@npm:1.0.0":
-  version: 1.0.0
-  resolution: "is-hex-prefixed@npm:1.0.0"
-  checksum: 10/5ac58e6e528fb029cc43140f6eeb380fad23d0041cc23154b87f7c9a1b728bcf05909974e47248fd0b7fcc11ba33cf7e58d64804883056fabd23e2b898be41de
-  languageName: node
-  linkType: hard
-
 "is-hexadecimal@npm:^1.0.0":
   version: 1.0.4
   resolution: "is-hexadecimal@npm:1.0.4"
@@ -26333,9 +26113,9 @@ __metadata:
   linkType: hard
 
 "is-map@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "is-map@npm:2.0.2"
-  checksum: 10/60ba910f835f2eacb1fdf5b5a6c60fe1c702d012a7673e6546992bcc0c873f62ada6e13d327f9e48f1720d49c152d6cdecae1fa47a261ef3d247c3ce6f0e1d39
+  version: 2.0.3
+  resolution: "is-map@npm:2.0.3"
+  checksum: 10/8de7b41715b08bcb0e5edb0fb9384b80d2d5bcd10e142188f33247d19ff078abaf8e9b6f858e2302d8d05376a26a55cd23a3c9f8ab93292b02fcd2cc9e4e92bb
   languageName: node
   linkType: hard
 
@@ -26349,10 +26129,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-negative-zero@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "is-negative-zero@npm:2.0.2"
-  checksum: 10/edbec1a9e6454d68bf595a114c3a72343d2d0be7761d8173dae46c0b73d05bb8fe9398c85d121e7794a66467d2f40b4a610b0be84cd804262d234fc634c86131
+"is-negative-zero@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-negative-zero@npm:2.0.3"
+  checksum: 10/8fe5cffd8d4fb2ec7b49d657e1691889778d037494c6f40f4d1a524cadd658b4b53ad7b6b73a59bcb4b143ae9a3d15829af864b2c0f9d65ac1e678c4c80f17e5
   languageName: node
   linkType: hard
 
@@ -26400,7 +26180,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-path-inside@npm:^3.0.2, is-path-inside@npm:^3.0.3":
+"is-path-inside@npm:^3.0.2":
   version: 3.0.3
   resolution: "is-path-inside@npm:3.0.3"
   checksum: 10/abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9
@@ -26492,18 +26272,18 @@ __metadata:
   linkType: hard
 
 "is-set@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "is-set@npm:2.0.2"
-  checksum: 10/d89e82acdc7760993474f529e043f9c4a1d63ed4774d21cc2e331d0e401e5c91c27743cd7c889137028f6a742234759a4bd602368fbdbf0b0321994aefd5603f
+  version: 2.0.3
+  resolution: "is-set@npm:2.0.3"
+  checksum: 10/5685df33f0a4a6098a98c72d94d67cad81b2bc72f1fb2091f3d9283c4a1c582123cd709145b02a9745f0ce6b41e3e43f1c944496d1d74d4ea43358be61308669
   languageName: node
   linkType: hard
 
-"is-shared-array-buffer@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "is-shared-array-buffer@npm:1.0.2"
+"is-shared-array-buffer@npm:^1.0.2, is-shared-array-buffer@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "is-shared-array-buffer@npm:1.0.3"
   dependencies:
-    call-bind: "npm:^1.0.2"
-  checksum: 10/23d82259d6cd6dbb7c4ff3e4efeff0c30dbc6b7f88698498c17f9821cb3278d17d2b6303a5341cbd638ab925a28f3f086a6c79b3df70ac986cc526c725d43b4f
+    call-bind: "npm:^1.0.7"
+  checksum: 10/bc5402900dc62b96ebb2548bf5b0a0bcfacc2db122236fe3ab3b3e3c884293a0d5eb777e73f059bcbf8dc8563bb65eae972fee0fb97e38a9ae27c8678f62bcfe
   languageName: node
   linkType: hard
 
@@ -26555,16 +26335,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9":
-  version: 1.1.12
-  resolution: "is-typed-array@npm:1.1.12"
+"is-typed-array@npm:^1.1.13, is-typed-array@npm:^1.1.3":
+  version: 1.1.13
+  resolution: "is-typed-array@npm:1.1.13"
   dependencies:
-    which-typed-array: "npm:^1.1.11"
-  checksum: 10/d953adfd3c41618d5e01b2a10f21817e4cdc9572772fa17211100aebb3811b6e3c2e308a0558cc87d218a30504cb90154b833013437776551bfb70606fb088ca
+    which-typed-array: "npm:^1.1.14"
+  checksum: 10/f850ba08286358b9a11aee6d93d371a45e3c59b5953549ee1c1a9a55ba5c1dd1bd9952488ae194ad8f32a9cf5e79c8fa5f0cc4d78c00720aa0bbcf238b38062d
   languageName: node
   linkType: hard
 
-"is-typedarray@npm:^1.0.0, is-typedarray@npm:~1.0.0":
+"is-typedarray@npm:~1.0.0":
   version: 1.0.0
   resolution: "is-typedarray@npm:1.0.0"
   checksum: 10/4b433bfb0f9026f079f4eb3fbaa4ed2de17c9995c3a0b5c800bec40799b4b2a8b4e051b1ada77749deb9ded4ae52fe2096973f3a93ff83df1a5a7184a669478c
@@ -26687,6 +26467,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"isexe@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "isexe@npm:3.1.1"
+  checksum: 10/7fe1931ee4e88eb5aa524cd3ceb8c882537bc3a81b02e438b240e47012eef49c86904d0f0e593ea7c3a9996d18d0f1f3be8d3eaa92333977b0c3a9d353d5563e
+  languageName: node
+  linkType: hard
+
 "isobject@npm:^3.0.1":
   version: 3.0.1
   resolution: "isobject@npm:3.0.1"
@@ -26801,16 +26588,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iterator.prototype@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "iterator.prototype@npm:1.1.2"
+"iterator.prototype@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "iterator.prototype@npm:1.1.3"
   dependencies:
     define-properties: "npm:^1.2.1"
     get-intrinsic: "npm:^1.2.1"
     has-symbols: "npm:^1.0.3"
     reflect.getprototypeof: "npm:^1.0.4"
     set-function-name: "npm:^2.0.1"
-  checksum: 10/b5013967ad8f28c9ca1be8e159eb10f591b8e46deae87476fe39d668c04374fe9158c815e8b6d2f45885b0a3fd842a8ba13f497ec762b3a0eff49bec278670b1
+  checksum: 10/1a2a508d3baac121b76c834404ff552d1bb96a173b1d74ff947b2c5763840c0b1e5be01be7e2183a19b08e99e38729812668ff1f23b35f6655a366017bc32519
   languageName: node
   linkType: hard
 
@@ -26871,9 +26658,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jayson@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "jayson@npm:4.1.0"
+"jayson@npm:^4.1.1":
+  version: 4.1.2
+  resolution: "jayson@npm:4.1.2"
   dependencies:
     "@types/connect": "npm:^3.4.33"
     "@types/node": "npm:^12.12.54"
@@ -26886,10 +26673,10 @@ __metadata:
     isomorphic-ws: "npm:^4.0.1"
     json-stringify-safe: "npm:^5.0.1"
     uuid: "npm:^8.3.2"
-    ws: "npm:^7.4.5"
+    ws: "npm:^7.5.10"
   bin:
     jayson: bin/jayson.js
-  checksum: 10/d76b3f220e14388007958b8f79e793009d6bc572b6e5ea65848a0f027b324d1950d836468986d7e38ddfb30b660e8b048b459c8bc8456e9b38dbbebc60a563b4
+  checksum: 10/7ad5e80e11ef39b7382509d046546883d2595998aa245768b342bcc0a63843e011e16f02a023d5a78fb74df788b5f97c1e850568fc1b90c138fa4772cc55572c
   languageName: node
   linkType: hard
 
@@ -27601,20 +27388,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-sha3@npm:0.8.0, js-sha3@npm:^0.8.0":
-  version: 0.8.0
-  resolution: "js-sha3@npm:0.8.0"
-  checksum: 10/a49ac6d3a6bfd7091472a28ab82a94c7fb8544cc584ee1906486536ba1cb4073a166f8c7bb2b0565eade23c5b3a7b8f7816231e0309ab5c549b737632377a20c
-  languageName: node
-  linkType: hard
-
-"js-sha3@npm:^0.5.7":
-  version: 0.5.7
-  resolution: "js-sha3@npm:0.5.7"
-  checksum: 10/32885c7edb50fca04017bacada8e5315c072d21d3d35e071e9640fc5577e200076a4718e0b2f33d86ab704accb68d2ade44f1e2ca424cc73a5929b9129dab948
-  languageName: node
-  linkType: hard
-
 "js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
   version: 4.0.0
   resolution: "js-tokens@npm:4.0.0"
@@ -27661,6 +27434,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsbn@npm:1.1.0":
+  version: 1.1.0
+  resolution: "jsbn@npm:1.1.0"
+  checksum: 10/bebe7ae829bbd586ce8cbe83501dd8cb8c282c8902a8aeeed0a073a89dc37e8103b1244f3c6acd60278bcbfe12d93a3f83c9ac396868a3b3bbc3c5e5e3b648ef
+  languageName: node
+  linkType: hard
+
 "jsbn@npm:~0.1.0":
   version: 0.1.1
   resolution: "jsbn@npm:0.1.1"
@@ -28113,18 +27893,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsprim@npm:^1.2.2":
-  version: 1.4.2
-  resolution: "jsprim@npm:1.4.2"
-  dependencies:
-    assert-plus: "npm:1.0.0"
-    extsprintf: "npm:1.3.0"
-    json-schema: "npm:0.4.0"
-    verror: "npm:1.10.0"
-  checksum: 10/df2bf234eab1b5078d01bcbff3553d50a243f7b5c10a169745efeda6344d62798bd1d85bcca6a8446f3b5d0495e989db45f9de8dae219f0f9796e70e0c776089
-  languageName: node
-  linkType: hard
-
 "jsprim@npm:^2.0.2":
   version: 2.0.2
   resolution: "jsprim@npm:2.0.2"
@@ -28310,18 +28078,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"keccak@npm:^3.0.0":
-  version: 3.0.2
-  resolution: "keccak@npm:3.0.2"
-  dependencies:
-    node-addon-api: "npm:^2.0.0"
-    node-gyp: "npm:latest"
-    node-gyp-build: "npm:^4.2.0"
-    readable-stream: "npm:^3.6.0"
-  checksum: 10/03f8d513040562f90ae892765431de29de0abf329dec40f1ef8b17eae634d56e283a7aeec5ae62e6ef96b9e8d1601329f2ef5c30a9d6c7baa6062d0f78d11b58
-  languageName: node
-  linkType: hard
-
 "keyboardevent-from-electron-accelerator@npm:^2.0.0":
   version: 2.0.0
   resolution: "keyboardevent-from-electron-accelerator@npm:2.0.0"
@@ -28515,9 +28271,9 @@ __metadata:
   linkType: hard
 
 "language-subtag-registry@npm:^0.3.20":
-  version: 0.3.22
-  resolution: "language-subtag-registry@npm:0.3.22"
-  checksum: 10/5591f4abd775d1ab5945355a5ba894327d2d94c900607bdb69aac1bc5bb921dbeeeb5f616df95e8c0ae875501d19c1cfa0e852ece822121e95048deb34f2b4d2
+  version: 0.3.23
+  resolution: "language-subtag-registry@npm:0.3.23"
+  checksum: 10/fe13ed74ab9f862db8e5747b98cc9aa08d52a19f85b5cdb4975cd364c8539bd2da3380e4560d2dbbd728ec33dff8a4b4421fcb2e5b1b1bdaa21d16f91a54d0d4
   languageName: node
   linkType: hard
 
@@ -29112,7 +28868,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:^4.17.11, lodash@npm:^4.17.13, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.7.0":
+"lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.13, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.7.0":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: 10/c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532
@@ -29279,13 +29035,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lowercase-keys@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "lowercase-keys@npm:3.0.0"
-  checksum: 10/67a3f81409af969bc0c4ca0e76cd7d16adb1e25aa1c197229587eaf8671275c8c067cd421795dbca4c81be0098e4c426a086a05e30de8a9c587b7a13c0c7ccc5
-  languageName: node
-  linkType: hard
-
 "lru-cache@npm:^10.0.0, lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0":
   version: 10.4.3
   resolution: "lru-cache@npm:10.4.3"
@@ -29328,13 +29077,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^7.7.1":
-  version: 7.18.3
-  resolution: "lru-cache@npm:7.18.3"
-  checksum: 10/6029ca5aba3aacb554e919d7ef804fffd4adfc4c83db00fac8248c7c78811fb6d4b6f70f7fd9d55032b3823446546a007edaa66ad1f2377ae833bd983fac5d98
-  languageName: node
-  linkType: hard
-
 "lru-queue@npm:^0.1.0":
   version: 0.1.0
   resolution: "lru-queue@npm:0.1.0"
@@ -29406,27 +29148,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"make-fetch-happen@npm:^10.0.3":
-  version: 10.2.1
-  resolution: "make-fetch-happen@npm:10.2.1"
+"make-fetch-happen@npm:^13.0.0":
+  version: 13.0.1
+  resolution: "make-fetch-happen@npm:13.0.1"
   dependencies:
-    agentkeepalive: "npm:^4.2.1"
-    cacache: "npm:^16.1.0"
-    http-cache-semantics: "npm:^4.1.0"
-    http-proxy-agent: "npm:^5.0.0"
-    https-proxy-agent: "npm:^5.0.0"
+    "@npmcli/agent": "npm:^2.0.0"
+    cacache: "npm:^18.0.0"
+    http-cache-semantics: "npm:^4.1.1"
     is-lambda: "npm:^1.0.1"
-    lru-cache: "npm:^7.7.1"
-    minipass: "npm:^3.1.6"
-    minipass-collect: "npm:^1.0.2"
-    minipass-fetch: "npm:^2.0.3"
+    minipass: "npm:^7.0.2"
+    minipass-fetch: "npm:^3.0.0"
     minipass-flush: "npm:^1.0.5"
     minipass-pipeline: "npm:^1.2.4"
     negotiator: "npm:^0.6.3"
+    proc-log: "npm:^4.2.0"
     promise-retry: "npm:^2.0.1"
-    socks-proxy-agent: "npm:^7.0.0"
-    ssri: "npm:^9.0.0"
-  checksum: 10/fef5acb865a46f25ad0b5ad7d979799125db5dbb24ea811ffa850fbb804bc8e495df2237a8ec3a4fc6250e73c2f95549cca6d6d36a73b1faa61224504eb1188f
+    ssri: "npm:^10.0.0"
+  checksum: 10/11bae5ad6ac59b654dbd854f30782f9de052186c429dfce308eda42374528185a100ee40ac9ffdc36a2b6c821ecaba43913e4730a12f06f15e895ea9cb23fa59
   languageName: node
   linkType: hard
 
@@ -30526,6 +30264,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"microbuffer@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "microbuffer@npm:1.0.0"
+  checksum: 10/1c18d7fd9f0e7553f91ae19b5a21694ca16c84fa21da91f61bf688f86b07447f584bb145bf1c4c0fe2037d9aa9c1f9bb44827063d49987a31bdca44619e02eb8
+  languageName: node
+  linkType: hard
+
 "micromark-core-commonmark@npm:^1.0.0, micromark-core-commonmark@npm:^1.0.1":
   version: 1.1.0
   resolution: "micromark-core-commonmark@npm:1.1.0"
@@ -31454,7 +31199,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime-types@npm:^2.1.12, mime-types@npm:^2.1.16, mime-types@npm:^2.1.18, mime-types@npm:^2.1.25, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
+"mime-types@npm:^2.1.12, mime-types@npm:^2.1.18, mime-types@npm:^2.1.25, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
   version: 2.1.35
   resolution: "mime-types@npm:2.1.35"
   dependencies:
@@ -31523,15 +31268,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"min-document@npm:^2.19.0":
-  version: 2.19.0
-  resolution: "min-document@npm:2.19.0"
-  dependencies:
-    dom-walk: "npm:^0.1.0"
-  checksum: 10/4e45a0686c81cc04509989235dc6107e2678a59bb48ce017d3c546d7d9a18d782e341103e66c78081dd04544704e2196e529905c41c2550bca069b69f95f07c8
-  languageName: node
-  linkType: hard
-
 "min-indent@npm:^1.0.1":
   version: 1.0.1
   resolution: "min-indent@npm:1.0.1"
@@ -31624,15 +31360,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass-collect@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "minipass-collect@npm:1.0.2"
-  dependencies:
-    minipass: "npm:^3.0.0"
-  checksum: 10/14df761028f3e47293aee72888f2657695ec66bd7d09cae7ad558da30415fdc4752bbfee66287dcc6fd5e6a2fa3466d6c484dc1cbd986525d9393b9523d97f10
-  languageName: node
-  linkType: hard
-
 "minipass-collect@npm:^2.0.1":
   version: 2.0.1
   resolution: "minipass-collect@npm:2.0.1"
@@ -31642,18 +31369,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass-fetch@npm:^2.0.3":
-  version: 2.1.2
-  resolution: "minipass-fetch@npm:2.1.2"
+"minipass-fetch@npm:^3.0.0":
+  version: 3.0.5
+  resolution: "minipass-fetch@npm:3.0.5"
   dependencies:
     encoding: "npm:^0.1.13"
-    minipass: "npm:^3.1.6"
+    minipass: "npm:^7.0.3"
     minipass-sized: "npm:^1.0.3"
     minizlib: "npm:^2.1.2"
   dependenciesMeta:
     encoding:
       optional: true
-  checksum: 10/8cfc589563ae2a11eebbf79121ef9a526fd078fca949ed3f1e4a51472ca4a4aad89fcea1738982ce9d7d833116ecc9c6ae9ebbd844832a94e3f4a3d4d1b9d3b9
+  checksum: 10/c669948bec1373313aaa8f104b962a3ced9f45c49b26366a4b0ae27ccdfa9c5740d72c8a84d3f8623d7a61c5fc7afdfda44789008c078f61a62441142efc4a97
   languageName: node
   linkType: hard
 
@@ -31684,17 +31411,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^2.6.0, minipass@npm:^2.9.0":
-  version: 2.9.0
-  resolution: "minipass@npm:2.9.0"
-  dependencies:
-    safe-buffer: "npm:^5.1.2"
-    yallist: "npm:^3.0.0"
-  checksum: 10/fdd1a77996c184991f8d2ce7c5b3979bec624e2a3225e2e1e140c4038fd65873d7eb90fb29779f8733735a8827b2686f283871a0c74c908f4f7694c56fa8dadf
-  languageName: node
-  linkType: hard
-
-"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6":
+"minipass@npm:^3.0.0":
   version: 3.3.6
   resolution: "minipass@npm:3.3.6"
   dependencies:
@@ -31717,22 +31434,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.3, minipass@npm:^7.0.4, minipass@npm:^7.1.2":
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4, minipass@npm:^7.1.2":
   version: 7.1.2
   resolution: "minipass@npm:7.1.2"
   checksum: 10/c25f0ee8196d8e6036661104bacd743785b2599a21de5c516b32b3fa2b83113ac89a2358465bc04956baab37ffb956ae43be679b2262bf7be15fce467ccd7950
   languageName: node
   linkType: hard
 
-"minizlib@npm:^1.3.3":
-  version: 1.3.3
-  resolution: "minizlib@npm:1.3.3"
-  dependencies:
-    minipass: "npm:^2.9.0"
-  checksum: 10/9c2c47e5687d7f896431a9b5585988ef72f848b56c6a974c9489534e8f619388d500d986ef82e1c13aedd46f3a0e81b6a88110cb1b27de7524cc8dabe8885e17
-  languageName: node
-  linkType: hard
-
 "minizlib@npm:^2.1.1, minizlib@npm:^2.1.2":
   version: 2.1.2
   resolution: "minizlib@npm:2.1.2"
@@ -31760,24 +31468,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp-promise@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "mkdirp-promise@npm:5.0.1"
-  dependencies:
-    mkdirp: "npm:*"
-  checksum: 10/31ddc9478216adf6d6bee9ea7ce9ccfe90356d9fcd1dfb18128eac075390b4161356d64c3a7b0a75f9de01a90aadd990a0ec8c7434036563985c4b853a053ee2
-  languageName: node
-  linkType: hard
-
-"mkdirp@npm:*, mkdirp@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "mkdirp@npm:3.0.1"
-  bin:
-    mkdirp: dist/cjs/src/bin.js
-  checksum: 10/16fd79c28645759505914561e249b9a1f5fe3362279ad95487a4501e4467abeb714fd35b95307326b8fd03f3c7719065ef11a6f97b7285d7888306d1bd2232ba
-  languageName: node
-  linkType: hard
-
 "mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.4, mkdirp@npm:^0.5.5, mkdirp@npm:~0.5.1":
   version: 0.5.6
   resolution: "mkdirp@npm:0.5.6"
@@ -31798,6 +31488,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mkdirp@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "mkdirp@npm:3.0.1"
+  bin:
+    mkdirp: dist/cjs/src/bin.js
+  checksum: 10/16fd79c28645759505914561e249b9a1f5fe3362279ad95487a4501e4467abeb714fd35b95307326b8fd03f3c7719065ef11a6f97b7285d7888306d1bd2232ba
+  languageName: node
+  linkType: hard
+
 "mlly@npm:^1.2.0, mlly@npm:^1.4.0":
   version: 1.6.1
   resolution: "mlly@npm:1.6.1"
@@ -31810,13 +31509,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mock-fs@npm:^4.1.0":
-  version: 4.14.0
-  resolution: "mock-fs@npm:4.14.0"
-  checksum: 10/20facbc85bb62df02dbfc946b354fcdd8b2b2aeafef4986adab18dc9a23efccb34ce49d4dac22aaed1a24420fc50c53d77e90984cc888bcce314e18e0e21872a
-  languageName: node
-  linkType: hard
-
 "moment@npm:^2.19.3":
   version: 2.30.1
   resolution: "moment@npm:2.30.1"
@@ -31895,26 +31587,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"multibase@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "multibase@npm:0.7.0"
-  dependencies:
-    base-x: "npm:^3.0.8"
-    buffer: "npm:^5.5.0"
-  checksum: 10/a5cbbf00b8aa61bcb92a706e210d8f258e8413cff2893584fedbc316c98bf2a44b8f648b57c124ddfaa29750c3b686ee5ba973cb8da84a896c19d63101b09445
-  languageName: node
-  linkType: hard
-
-"multibase@npm:~0.6.0":
-  version: 0.6.1
-  resolution: "multibase@npm:0.6.1"
-  dependencies:
-    base-x: "npm:^3.0.8"
-    buffer: "npm:^5.5.0"
-  checksum: 10/c9e3bf20dc1b109019b94b14a76731ea0a6b0e654a4ef627ba154bfc2b8602ac43b160c44d8245d18cd6a9ed971826efb204230f22b929c8b3e72da13dbc1859
-  languageName: node
-  linkType: hard
-
 "multicast-dns@npm:^7.2.5":
   version: 7.2.5
   resolution: "multicast-dns@npm:7.2.5"
@@ -31927,36 +31599,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"multicodec@npm:^0.5.5":
-  version: 0.5.7
-  resolution: "multicodec@npm:0.5.7"
-  dependencies:
-    varint: "npm:^5.0.0"
-  checksum: 10/b61bbf04e1bfff180f77693661b8111bf94f65580abc455e6d83d2240c227d8c2e8af99ca93b6c02500c5da43d16e2b028dbbec1b376a85145a774f542d9ca2c
-  languageName: node
-  linkType: hard
-
-"multicodec@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "multicodec@npm:1.0.4"
-  dependencies:
-    buffer: "npm:^5.6.0"
-    varint: "npm:^5.0.0"
-  checksum: 10/3a78ac54d3715e6b095a1805f63b4c4e7d5bb4642445691c0c4e6442cad9f97823469634e73ee362ba748596570db1050d69d5cc74a88928b1e9658916cdfbcd
-  languageName: node
-  linkType: hard
-
-"multihashes@npm:^0.4.15, multihashes@npm:~0.4.15":
-  version: 0.4.21
-  resolution: "multihashes@npm:0.4.21"
-  dependencies:
-    buffer: "npm:^5.5.0"
-    multibase: "npm:^0.7.0"
-    varint: "npm:^5.0.0"
-  checksum: 10/a482d9ba7ed0ad41db22ca589f228e4b7a30207a229a64dfc9888796752314fca00a8d03025fe40d6d73965bbb246f54b73626c5a235463e30c06c7bf7a8785f
-  languageName: node
-  linkType: hard
-
 "multimatch@npm:^5.0.0":
   version: 5.0.0
   resolution: "multimatch@npm:5.0.0"
@@ -32026,12 +31668,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nan@npm:^2.13.2, nan@npm:^2.14.0":
-  version: 2.18.0
-  resolution: "nan@npm:2.18.0"
+"nan@npm:^2.13.2, nan@npm:^2.14.0, nan@npm:^2.14.2":
+  version: 2.22.0
+  resolution: "nan@npm:2.22.0"
   dependencies:
     node-gyp: "npm:latest"
-  checksum: 10/5520e22c64e2b5b495b1d765d6334c989b848bbe1502fec89c5857cabcc7f9f0474563377259e7574bff1c8a041d3b90e9ffa1f5e15502ffddee7b2550cc26a0
+  checksum: 10/ab165ba910e549fcc21fd561a33f534d86e81ae36c97b1019dcfe506b09692ff867c97794a54b49c9a83b8b485f529f0f58d24966c3a11863c97dc70814f4d50
   languageName: node
   linkType: hard
 
@@ -32054,14 +31696,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nano-json-stream-parser@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "nano-json-stream-parser@npm:0.1.2"
-  checksum: 10/00a3ce63d3b66220def9fd6c26cd495100efd155e7bda54a11f1dfd185ba6750d5ce266076e0f229bad3f5ef892e2017f24da012669f146b404a8e47a44568ec
-  languageName: node
-  linkType: hard
-
-"nanoid@npm:^3.1.23, nanoid@npm:^3.1.3, nanoid@npm:^3.3.4, nanoid@npm:^3.3.6, nanoid@npm:^3.3.7":
+"nanoid@npm:^3.1.23, nanoid@npm:^3.1.3, nanoid@npm:^3.3.1, nanoid@npm:^3.3.4, nanoid@npm:^3.3.6, nanoid@npm:^3.3.7":
   version: 3.3.7
   resolution: "nanoid@npm:3.3.7"
   bin:
@@ -32126,7 +31761,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"neo-async@npm:^2.5.0, neo-async@npm:^2.6.0, neo-async@npm:^2.6.2":
+"neo-async@npm:^2.5.0, neo-async@npm:^2.6.2":
   version: 2.6.2
   resolution: "neo-async@npm:2.6.2"
   checksum: 10/1a7948fea86f2b33ec766bc899c88796a51ba76a4afc9026764aedc6e7cde692a09067031e4a1bf6db4f978ccd99e7f5b6c03fe47ad9865c3d4f99050d67e002
@@ -32365,15 +32000,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-addon-api@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "node-addon-api@npm:2.0.2"
-  dependencies:
-    node-gyp: "npm:latest"
-  checksum: 10/e4ce4daac5b2fefa6b94491b86979a9c12d9cceba571d2c6df1eb5859f9da68e5dc198f128798e1785a88aafee6e11f4992dcccd4bf86bec90973927d158bd60
-  languageName: node
-  linkType: hard
-
 "node-addon-api@npm:^3.0.0":
   version: 3.2.1
   resolution: "node-addon-api@npm:3.2.1"
@@ -32436,7 +32062,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-fetch@npm:2.7.0, node-fetch@npm:^2.0.0, node-fetch@npm:^2.2.0, node-fetch@npm:^2.5.0, node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.11, node-fetch@npm:^2.6.12, node-fetch@npm:^2.6.6, node-fetch@npm:^2.6.7, node-fetch@npm:^2.7.0":
+"node-fetch@npm:2.7.0, node-fetch@npm:^2.0.0, node-fetch@npm:^2.2.0, node-fetch@npm:^2.5.0, node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.11, node-fetch@npm:^2.6.12, node-fetch@npm:^2.6.4, node-fetch@npm:^2.6.6, node-fetch@npm:^2.6.7, node-fetch@npm:^2.7.0":
   version: 2.7.0
   resolution: "node-fetch@npm:2.7.0"
   dependencies:
@@ -32457,7 +32083,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-gyp-build@npm:^4.2.0, node-gyp-build@npm:^4.2.2, node-gyp-build@npm:^4.3.0, node-gyp-build@npm:^4.5.0, node-gyp-build@npm:^4.8.0":
+"node-gyp-build@npm:^4.2.2, node-gyp-build@npm:^4.3.0, node-gyp-build@npm:^4.5.0, node-gyp-build@npm:^4.8.0":
   version: 4.8.1
   resolution: "node-gyp-build@npm:4.8.1"
   bin:
@@ -32468,44 +32094,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-gyp@npm:^9.0.0":
-  version: 9.4.1
-  resolution: "node-gyp@npm:9.4.1"
+"node-gyp@npm:10.2.0":
+  version: 10.2.0
+  resolution: "node-gyp@npm:10.2.0"
   dependencies:
     env-paths: "npm:^2.2.0"
     exponential-backoff: "npm:^3.1.1"
-    glob: "npm:^7.1.4"
-    graceful-fs: "npm:^4.2.6"
-    make-fetch-happen: "npm:^10.0.3"
-    nopt: "npm:^6.0.0"
-    npmlog: "npm:^6.0.0"
-    rimraf: "npm:^3.0.2"
-    semver: "npm:^7.3.5"
-    tar: "npm:^6.1.2"
-    which: "npm:^2.0.2"
-  bin:
-    node-gyp: bin/node-gyp.js
-  checksum: 10/329b109b138e48cb0416a6bca56e171b0e479d6360a548b80f06eced4bef3cf37652a3d20d171c20023fb18d996bd7446a49d4297ddb59fc48100178a92f432d
-  languageName: node
-  linkType: hard
-
-"node-gyp@npm:latest":
-  version: 9.3.0
-  resolution: "node-gyp@npm:9.3.0"
-  dependencies:
-    env-paths: "npm:^2.2.0"
-    glob: "npm:^7.1.4"
+    glob: "npm:^10.3.10"
     graceful-fs: "npm:^4.2.6"
-    make-fetch-happen: "npm:^10.0.3"
-    nopt: "npm:^6.0.0"
-    npmlog: "npm:^6.0.0"
-    rimraf: "npm:^3.0.2"
+    make-fetch-happen: "npm:^13.0.0"
+    nopt: "npm:^7.0.0"
+    proc-log: "npm:^4.1.0"
     semver: "npm:^7.3.5"
-    tar: "npm:^6.1.2"
-    which: "npm:^2.0.2"
+    tar: "npm:^6.2.1"
+    which: "npm:^4.0.0"
   bin:
     node-gyp: bin/node-gyp.js
-  checksum: 10/b64c70a3984f9f23b9ae4606940e16c99edb93e7c455965afb0342ac961680efc4e553fed9f2654b9816072298da59fadfb832aeac6c625517cc228edb54c2c3
+  checksum: 10/41773093b1275751dec942b985982fd4e7a69b88cae719b868babcef3880ee6168aaec8dcaa8cd0b9fa7c84873e36cc549c6cac6a124ee65ba4ce1f1cc108cfe
   languageName: node
   linkType: hard
 
@@ -32593,17 +32198,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nopt@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "nopt@npm:6.0.0"
-  dependencies:
-    abbrev: "npm:^1.0.0"
-  bin:
-    nopt: bin/nopt.js
-  checksum: 10/3c1128e07cd0241ae66d6e6a472170baa9f3e84dd4203950ba8df5bafac4efa2166ce917a57ef02b01ba7c40d18b2cc64b29b225fd3640791fe07b24f0b33a32
-  languageName: node
-  linkType: hard
-
 "nopt@npm:^7.0.0":
   version: 7.2.0
   resolution: "nopt@npm:7.2.0"
@@ -32701,18 +32295,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npmlog@npm:^6.0.0":
-  version: 6.0.2
-  resolution: "npmlog@npm:6.0.2"
-  dependencies:
-    are-we-there-yet: "npm:^3.0.0"
-    console-control-strings: "npm:^1.1.0"
-    gauge: "npm:^4.0.3"
-    set-blocking: "npm:^2.0.0"
-  checksum: 10/82b123677e62deb9e7472e27b92386c09e6e254ee6c8bcd720b3011013e4168bc7088e984f4fbd53cb6e12f8b4690e23e4fa6132689313e0d0dc4feea45489bb
-  languageName: node
-  linkType: hard
-
 "nth-check@npm:^2.0.1":
   version: 2.1.1
   resolution: "nth-check@npm:2.1.1"
@@ -32729,16 +32311,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"number-to-bn@npm:1.7.0":
-  version: 1.7.0
-  resolution: "number-to-bn@npm:1.7.0"
-  dependencies:
-    bn.js: "npm:4.11.6"
-    strip-hex-prefix: "npm:1.0.0"
-  checksum: 10/702e8f00b6b90abd23f711056005179c3bd5ce3b063c47d468250f63ab3b9b4b82e27bff3b4642a9e71e06c717d5ed359873501746df0a64c3db1fa6d704e704
-  languageName: node
-  linkType: hard
-
 "nwsapi@npm:^2.2.2":
   version: 2.2.7
   resolution: "nwsapi@npm:2.2.7"
@@ -32830,13 +32402,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"oauth-sign@npm:~0.9.0":
-  version: 0.9.0
-  resolution: "oauth-sign@npm:0.9.0"
-  checksum: 10/1809a366d258f41fdf4ab5310cff3d1e15f96b187503bc7333cef4351de7bd0f52cb269bc95800f1fae5fb04dd886287df1471985fd67e8484729fdbcf857119
-  languageName: node
-  linkType: hard
-
 "ob1@npm:0.80.11":
   version: 0.80.11
   resolution: "ob1@npm:0.80.11"
@@ -32884,7 +32449,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.assign@npm:^4.1.4":
+"object.assign@npm:^4.1.4, object.assign@npm:^4.1.5":
   version: 4.1.5
   resolution: "object.assign@npm:4.1.5"
   dependencies:
@@ -32896,25 +32461,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.entries@npm:^1.1.6, object.entries@npm:^1.1.7":
-  version: 1.1.7
-  resolution: "object.entries@npm:1.1.7"
+"object.entries@npm:^1.1.8":
+  version: 1.1.8
+  resolution: "object.entries@npm:1.1.8"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-  checksum: 10/03f0bd0f23a8626c94429d15abf26ccda7723f08cd26be2c09c72d436765f8c7468605b5476ca58d4a7cec1ec7eca5be496dbd938fd4236b77ed6d05a8680048
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10/2301918fbd1ee697cf6ff7cd94f060c738c0a7d92b22fd24c7c250e9b593642c9707ad2c44d339303c1439c5967d8964251cdfc855f7f6ec55db2dd79e8dc2a7
   languageName: node
   linkType: hard
 
-"object.fromentries@npm:^2.0.6, object.fromentries@npm:^2.0.7":
-  version: 2.0.7
-  resolution: "object.fromentries@npm:2.0.7"
+"object.fromentries@npm:^2.0.8":
+  version: 2.0.8
+  resolution: "object.fromentries@npm:2.0.8"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-  checksum: 10/1bfbe42a51f8d84e417d193fae78e4b8eebb134514cdd44406480f8e8a0e075071e0717635d8e3eccd50fec08c1d555fe505c38804cbac0808397187653edd59
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10/5b2e80f7af1778b885e3d06aeb335dcc86965e39464671adb7167ab06ac3b0f5dd2e637a90d8ebd7426d69c6f135a4753ba3dd7d0fe2a7030cf718dcb910fd92
   languageName: node
   linkType: hard
 
@@ -32930,36 +32496,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.groupby@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "object.groupby@npm:1.0.1"
-  dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    get-intrinsic: "npm:^1.2.1"
-  checksum: 10/b7123d91403f95d63978513b23a6079c30f503311f64035fafc863c291c787f287b58df3b21ef002ce1d0b820958c9009dd5a8ab696e0eca325639d345e41524
-  languageName: node
-  linkType: hard
-
-"object.hasown@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "object.hasown@npm:1.1.2"
+"object.groupby@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "object.groupby@npm:1.0.3"
   dependencies:
-    define-properties: "npm:^1.1.4"
-    es-abstract: "npm:^1.20.4"
-  checksum: 10/94031022a2ba6006c15c6f1e0c4f51a7fa5b36aee64800192335b979fcc8bd823b18c35cb1a728af68fdfdbbe6d765f77a3c5437306c031f63654b8a34b9e639
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+  checksum: 10/44cb86dd2c660434be65f7585c54b62f0425b0c96b5c948d2756be253ef06737da7e68d7106e35506ce4a44d16aa85a413d11c5034eb7ce5579ec28752eb42d0
   languageName: node
   linkType: hard
 
-"object.values@npm:^1.1.6, object.values@npm:^1.1.7":
-  version: 1.1.7
-  resolution: "object.values@npm:1.1.7"
+"object.values@npm:^1.1.6, object.values@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "object.values@npm:1.2.0"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-  checksum: 10/20ab42c0bbf984405c80e060114b18cf5d629a40a132c7eac4fb79c5d06deb97496311c19297dcf9c61f45c2539cd4c7f7c5d6230e51db360ff297bbc9910162
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10/db2e498019c354428c5dd30d02980d920ac365b155fce4dcf63eb9433f98ccf0f72624309e182ce7cc227c95e45d474e1d483418e60de2293dd23fa3ebe34903
   languageName: node
   linkType: hard
 
@@ -32977,15 +32532,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"oboe@npm:2.1.5":
-  version: 2.1.5
-  resolution: "oboe@npm:2.1.5"
-  dependencies:
-    http-https: "npm:^1.0.0"
-  checksum: 10/451d0c28b45f518fc86d4689075cf74c7fea92fb09e2f994dd1208e5c5516a6958f9dc476714b61c62c959a3e7e0db8a69999c59ff63777c7a8af24fbddd0848
-  languageName: node
-  linkType: hard
-
 "obuf@npm:^1.0.0, obuf@npm:^1.1.2":
   version: 1.1.2
   resolution: "obuf@npm:1.1.2"
@@ -33266,13 +32812,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-cancelable@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "p-cancelable@npm:3.0.0"
-  checksum: 10/a5eab7cf5ac5de83222a014eccdbfde65ecfb22005ee9bc242041f0b4441e07fac7629432c82f48868aa0f8413fe0df6c6067c16f76bf9217cd8dc651923c93d
-  languageName: node
-  linkType: hard
-
 "p-debounce@npm:^2.1.0":
   version: 2.1.0
   resolution: "p-debounce@npm:2.1.0"
@@ -33424,6 +32963,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pako@npm:^1.0.0, pako@npm:~1.0.5":
+  version: 1.0.11
+  resolution: "pako@npm:1.0.11"
+  checksum: 10/1ad07210e894472685564c4d39a08717e84c2a68a70d3c1d9e657d32394ef1670e22972a433cbfe48976cb98b154ba06855dcd3fcfba77f60f1777634bec48c0
+  languageName: node
+  linkType: hard
+
 "pako@npm:^2.1.0":
   version: 2.1.0
   resolution: "pako@npm:2.1.0"
@@ -33431,13 +32977,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pako@npm:~1.0.5":
-  version: 1.0.11
-  resolution: "pako@npm:1.0.11"
-  checksum: 10/1ad07210e894472685564c4d39a08717e84c2a68a70d3c1d9e657d32394ef1670e22972a433cbfe48976cb98b154ba06855dcd3fcfba77f60f1777634bec48c0
-  languageName: node
-  linkType: hard
-
 "param-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "param-case@npm:3.0.4"
@@ -33500,13 +33039,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse-headers@npm:^2.0.0":
-  version: 2.0.5
-  resolution: "parse-headers@npm:2.0.5"
-  checksum: 10/210b13bc0f99cf6f1183896f01de164797ac35b2720c9f1c82a3e2ceab256f87b9048e8e16a14cfd1b75448771f8379cd564bd1674a179ab0168c90005d4981b
-  languageName: node
-  linkType: hard
-
 "parse-json@npm:^4.0.0":
   version: 4.0.0
   resolution: "parse-json@npm:4.0.0"
@@ -33792,7 +33324,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pbkdf2@npm:^3.0.17, pbkdf2@npm:^3.0.3":
+"pbkdf2@npm:^3.0.3":
   version: 3.1.2
   resolution: "pbkdf2@npm:3.1.2"
   dependencies:
@@ -33860,10 +33392,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1":
-  version: 1.1.0
-  resolution: "picocolors@npm:1.1.0"
-  checksum: 10/a2ad60d94d185c30f2a140b19c512547713fb89b920d32cc6cf658fa786d63a37ba7b8451872c3d9fc34883971fb6e5878e07a20b60506e0bb2554dce9169ccb
+"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1, picocolors@npm:^1.1.0":
+  version: 1.1.1
+  resolution: "picocolors@npm:1.1.1"
+  checksum: 10/e1cf46bf84886c79055fdfa9dcb3e4711ad259949e3565154b004b260cd356c5d54b31a1437ce9782624bf766272fe6b0154f5f0c744fb7af5d454d2b60db045
   languageName: node
   linkType: hard
 
@@ -34142,6 +33674,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"possible-typed-array-names@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "possible-typed-array-names@npm:1.0.0"
+  checksum: 10/8ed3e96dfeea1c5880c1f4c9cb707e5fb26e8be22f14f82ef92df20fd2004e635c62ba47fbe8f2bb63bfd80dac1474be2fb39798da8c2feba2815435d1f749af
+  languageName: node
+  linkType: hard
+
 "postcss-calc@npm:^9.0.1":
   version: 9.0.1
   resolution: "postcss-calc@npm:9.0.1"
@@ -34829,6 +34368,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"proc-log@npm:^4.1.0, proc-log@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "proc-log@npm:4.2.0"
+  checksum: 10/4e1394491b717f6c1ade15c570ecd4c2b681698474d3ae2d303c1e4b6ab9455bd5a81566211e82890d5a5ae9859718cc6954d5150bb18b09b72ecb297beae90a
+  languageName: node
+  linkType: hard
+
 "process-nextick-args@npm:~2.0.0":
   version: 2.0.1
   resolution: "process-nextick-args@npm:2.0.1"
@@ -34857,13 +34403,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"promise-inflight@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "promise-inflight@npm:1.0.1"
-  checksum: 10/1560d413ea20c5a74f3631d39ba8cbd1972b9228072a755d01e1f5ca5110382d9af76a1582d889445adc6e75bb5ac4886b56dc4b6eae51b30145d7bb1ac7505b
-  languageName: node
-  linkType: hard
-
 "promise-polyfill@npm:^6.0.1":
   version: 6.1.0
   resolution: "promise-polyfill@npm:6.1.0"
@@ -35029,13 +34568,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proxy-compare@npm:2.4.0":
-  version: 2.4.0
-  resolution: "proxy-compare@npm:2.4.0"
-  checksum: 10/56b97f040d4bc5addcfcc0df3cc07e63a8f6f2af8f1cd4e72e7c1c66e4f75a27029e92c3b42a5111ee286f8076157d9eac242b8f95996491471fc12db3f2f464
-  languageName: node
-  linkType: hard
-
 "proxy-from-env@npm:1.0.0":
   version: 1.0.0
   resolution: "proxy-from-env@npm:1.0.0"
@@ -35050,15 +34582,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proxy-memoize@npm:2.0.2":
-  version: 2.0.2
-  resolution: "proxy-memoize@npm:2.0.2"
-  dependencies:
-    proxy-compare: "npm:2.4.0"
-  checksum: 10/680f2799bacc76098a4b44c9ac0448750e5f446dcd8bf8aa31d9663e2b197e97961139d2f30589cd42934ec697169e1cd19f00c00a24dc6a82e7581b097756f9
-  languageName: node
-  linkType: hard
-
 "pseudomap@npm:^1.0.2":
   version: 1.0.2
   resolution: "pseudomap@npm:1.0.2"
@@ -35066,7 +34589,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"psl@npm:^1.1.28, psl@npm:^1.1.33":
+"psl@npm:^1.1.33":
   version: 1.9.0
   resolution: "psl@npm:1.9.0"
   checksum: 10/d07879d4bfd0ac74796306a8e5a36a93cfb9c4f4e8ee8e63fbb909066c192fe1008cd8f12abd8ba2f62ca28247949a20c8fb32e1d18831d9e71285a1569720f9
@@ -35132,13 +34655,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"punycode@npm:2.1.0":
-  version: 2.1.0
-  resolution: "punycode@npm:2.1.0"
-  checksum: 10/012f9443fe56baf485db702d0d07cef7d89c0670ce1ac4da8fb8b5bd3677e42a8f5d2b35f595ffa31ba843661c9c6766f2feb1e1e3393e1ff1033120d0f94d60
-  languageName: node
-  linkType: hard
-
 "punycode@npm:^1.2.4":
   version: 1.4.1
   resolution: "punycode@npm:1.4.1"
@@ -35237,24 +34753,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qs@npm:~6.5.2":
-  version: 6.5.3
-  resolution: "qs@npm:6.5.3"
-  checksum: 10/485c990fba7ad17671e16c92715fb064c1600337738f5d140024eb33a49fbc1ed31890d3db850117c760caeb9c9cc9f4ba22a15c20dd119968e41e3d3fe60b28
-  languageName: node
-  linkType: hard
-
-"query-string@npm:^5.0.1":
-  version: 5.1.1
-  resolution: "query-string@npm:5.1.1"
-  dependencies:
-    decode-uri-component: "npm:^0.2.0"
-    object-assign: "npm:^4.1.0"
-    strict-uri-encode: "npm:^1.0.0"
-  checksum: 10/8834591ed02c324ac10397094c2ae84a3d3460477ef30acd5efe03b1afbf15102ccc0829ab78cc58ecb12f70afeb7a1f81e604487a9ad4859742bb14748e98cc
-  languageName: node
-  linkType: hard
-
 "query-string@npm:^7.1.3":
   version: 7.1.3
   resolution: "query-string@npm:7.1.3"
@@ -35612,12 +35110,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-hook-form@npm:^7.53.0":
-  version: 7.53.0
-  resolution: "react-hook-form@npm:7.53.0"
+"react-hook-form@npm:^7.53.1":
+  version: 7.53.1
+  resolution: "react-hook-form@npm:7.53.1"
   peerDependencies:
     react: ^16.8.0 || ^17 || ^18 || ^19
-  checksum: 10/b7d73696b7c10e042f6ea6fcec01f951091146bfbc89d1378327a970bcd724b968e93fae1657bddada75caf648cfaf8693c5ba03c25e96816b755079d29f65da
+  checksum: 10/41ac7140add546b90f75b0aef343b67b795d26a60da7bfeac1ded7716ec01234c6050f5c00a4487c28a73c24f9c9347cda741173a8083d7f4b02b588203e7544
   languageName: node
   linkType: hard
 
@@ -35770,9 +35268,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-reanimated@npm:3.15.0":
-  version: 3.15.0
-  resolution: "react-native-reanimated@npm:3.15.0"
+"react-native-reanimated@npm:3.16.1":
+  version: 3.16.1
+  resolution: "react-native-reanimated@npm:3.16.1"
   dependencies:
     "@babel/plugin-transform-arrow-functions": "npm:^7.0.0-0"
     "@babel/plugin-transform-class-properties": "npm:^7.0.0-0"
@@ -35789,7 +35287,7 @@ __metadata:
     "@babel/core": ^7.0.0-0
     react: "*"
     react-native: "*"
-  checksum: 10/f40a19983d859109e3dc5809999cc2f06a5e5f985a7bb08a672d6f218fccc240f86835d28a6e521fe09d8e40bac36799e9e1efff8a8ba272e2874fefe62340f0
+  checksum: 10/3e46c32655a5e3d89dd79606179ebd6da96cedf31f15c64a32d4cea2c35ec5724411099aeaa59e5f8220c93fc268ee1b391b3210e7e87e43544e279edd2a2ccc
   languageName: node
   linkType: hard
 
@@ -36251,20 +35749,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read-config-file@npm:6.4.0":
-  version: 6.4.0
-  resolution: "read-config-file@npm:6.4.0"
-  dependencies:
-    config-file-ts: "npm:0.2.8-rc1"
-    dotenv: "npm:^16.4.5"
-    dotenv-expand: "npm:^11.0.6"
-    js-yaml: "npm:^4.1.0"
-    json5: "npm:^2.2.3"
-    lazy-val: "npm:^1.0.5"
-  checksum: 10/b75325b7de94e8478badbb60daca1635ccde8cc8d7db3f494152602f21edc15b5da20baf2d52e6583e3f4fbd9e1eac433d73846d5db9d06c86905a74c0205a31
-  languageName: node
-  linkType: hard
-
 "read-package-json-fast@npm:^3.0.0, read-package-json-fast@npm:^3.0.2":
   version: 3.0.2
   resolution: "read-package-json-fast@npm:3.0.2"
@@ -36616,14 +36100,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.1":
-  version: 1.5.1
-  resolution: "regexp.prototype.flags@npm:1.5.1"
+"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.5.2":
+  version: 1.5.3
+  resolution: "regexp.prototype.flags@npm:1.5.3"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    set-function-name: "npm:^2.0.0"
-  checksum: 10/3fa5610b8e411bbc3a43ddfd13162f3a817beb43155fbd8caa24d4fd0ce2f431a8197541808772a5a06e5946cebfb68464c827827115bde0d11720a92fe2981a
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-errors: "npm:^1.3.0"
+    set-function-name: "npm:^2.0.2"
+  checksum: 10/fe17bc4eebbc72945aaf9dd059eb7784a5ca453a67cc4b5b3e399ab08452c9a05befd92063e2c52e7b24d9238c60031656af32dd57c555d1ba6330dbf8c23b43
   languageName: node
   linkType: hard
 
@@ -36909,34 +36394,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"request@npm:^2.79.0":
-  version: 2.88.2
-  resolution: "request@npm:2.88.2"
-  dependencies:
-    aws-sign2: "npm:~0.7.0"
-    aws4: "npm:^1.8.0"
-    caseless: "npm:~0.12.0"
-    combined-stream: "npm:~1.0.6"
-    extend: "npm:~3.0.2"
-    forever-agent: "npm:~0.6.1"
-    form-data: "npm:~2.3.2"
-    har-validator: "npm:~5.1.3"
-    http-signature: "npm:~1.2.0"
-    is-typedarray: "npm:~1.0.0"
-    isstream: "npm:~0.1.2"
-    json-stringify-safe: "npm:~5.0.1"
-    mime-types: "npm:~2.1.19"
-    oauth-sign: "npm:~0.9.0"
-    performance-now: "npm:^2.1.0"
-    qs: "npm:~6.5.2"
-    safe-buffer: "npm:^5.1.2"
-    tough-cookie: "npm:~2.5.0"
-    tunnel-agent: "npm:^0.6.0"
-    uuid: "npm:^3.3.2"
-  checksum: 10/005b8b237b56f1571cfd4ecc09772adaa2e82dcb884fc14ea2bb25e23dbf7c2009f9929e0b6d3fd5802e33ed8ee705a3b594c8f9467c1458cd973872bf89db8e
-  languageName: node
-  linkType: hard
-
 "require-directory@npm:^2.1.1":
   version: 2.1.1
   resolution: "require-directory@npm:2.1.1"
@@ -37001,17 +36458,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"reselect@npm:^4.1.8":
-  version: 4.1.8
-  resolution: "reselect@npm:4.1.8"
-  checksum: 10/199984d9872f71cd207f4aa6e6fd2bd48d95154f7aa9b3aee3398335f39f5491059e732f28c12e9031d5d434adab2c458dc8af5afb6564d0ad37e1644445e09c
-  languageName: node
-  linkType: hard
-
-"reselect@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "reselect@npm:5.1.0"
-  checksum: 10/657c379d9461781b7cb5f0a32133e23b4266886660c94fcc77c102bec8abe484b32bf43a911b99b747ecf7439f157696561d744d40dc920024611beb1a0d921f
+"reselect@npm:5.1.1":
+  version: 5.1.1
+  resolution: "reselect@npm:5.1.1"
+  checksum: 10/1fdae11a39ed9c8d85a24df19517c8372ee24fefea9cce3fae9eaad8e9cefbba5a3d4940c6fe31296b6addf76e035588c55798f7e6e147e1b7c0855f119e7fa5
   languageName: node
   linkType: hard
 
@@ -37022,7 +36472,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve-alpn@npm:^1.0.0, resolve-alpn@npm:^1.2.0":
+"resolve-alpn@npm:^1.0.0":
   version: 1.2.1
   resolution: "resolve-alpn@npm:1.2.1"
   checksum: 10/744e87888f0b6fa0b256ab454ca0b9c0b80808715e2ef1f3672773665c92a941f6181194e30ccae4a8cd0adbe0d955d3f133102636d2ee0cca0119fec0bc9aec
@@ -37120,16 +36570,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^2.0.0-next.4":
-  version: 2.0.0-next.4
-  resolution: "resolve@npm:2.0.0-next.4"
+"resolve@npm:^2.0.0-next.5":
+  version: 2.0.0-next.5
+  resolution: "resolve@npm:2.0.0-next.5"
   dependencies:
-    is-core-module: "npm:^2.9.0"
+    is-core-module: "npm:^2.13.0"
     path-parse: "npm:^1.0.7"
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 10/20d5293f5015aa0b65c488ee365f9dfc30b954b04f9074425a6fb738d78fa63825a82ba8574b7ee200af7ebd5e98c41786831d1d4c1612da3cd063980dfa06a3
+  checksum: 10/2d6fd28699f901744368e6f2032b4268b4c7b9185fd8beb64f68c93ac6b22e52ae13560ceefc96241a665b985edf9ffd393ae26d2946a7d3a07b7007b7d51e79
   languageName: node
   linkType: hard
 
@@ -37162,16 +36612,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A^2.0.0-next.4#optional!builtin<compat/resolve>":
-  version: 2.0.0-next.4
-  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#optional!builtin<compat/resolve>::version=2.0.0-next.4&hash=c3c19d"
+"resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin<compat/resolve>":
+  version: 2.0.0-next.5
+  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=c3c19d"
   dependencies:
-    is-core-module: "npm:^2.9.0"
+    is-core-module: "npm:^2.13.0"
     path-parse: "npm:^1.0.7"
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 10/27bff19d8219385bb1e271066317e553cff18daa2a19db9598d94ae444417ef3f5aec19e86927872d6cb241d02649cfb35a4c0d9d10ef2afa6325bce8bc8d903
+  checksum: 10/05fa778de9d0347c8b889eb7a18f1f06bf0f801b0eb4610b4871a4b2f22e220900cf0ad525e94f990bb8d8921c07754ab2122c0c225ab4cdcea98f36e64fa4c2
   languageName: node
   linkType: hard
 
@@ -37391,17 +36841,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rlp@npm:^2.2.4":
-  version: 2.2.7
-  resolution: "rlp@npm:2.2.7"
-  dependencies:
-    bn.js: "npm:^5.2.0"
-  bin:
-    rlp: bin/rlp
-  checksum: 10/cf1919a2dc99f336191b3363b76299db567c192b7ee3c6f5c722728c34f65577883c9c88eeb7a1bfcbc26693c8a4f1fb0662e79ee86f0c98dd258d6987303498
-  languageName: node
-  linkType: hard
-
 "roarr@npm:^2.15.3":
   version: 2.15.4
   resolution: "roarr@npm:2.15.4"
@@ -37597,15 +37036,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-array-concat@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "safe-array-concat@npm:1.0.1"
+"safe-array-concat@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "safe-array-concat@npm:1.1.2"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.2.1"
+    call-bind: "npm:^1.0.7"
+    get-intrinsic: "npm:^1.2.4"
     has-symbols: "npm:^1.0.3"
     isarray: "npm:^2.0.5"
-  checksum: 10/44f073d85ca12458138e6eff103ac63cec619c8261b6579bd2fa3ae7b6516cf153f02596d68e40c5bbe322a29c930017800efff652734ddcb8c0f33b2a71f89c
+  checksum: 10/a54f8040d7cb696a1ee38d19cc71ab3cfb654b9b81bae00c6459618cfad8214ece7e6666592f9c925aafef43d0a20c5e6fbb3413a2b618e1ce9d516a2e6dcfc5
   languageName: node
   linkType: hard
 
@@ -37630,14 +37069,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-regex-test@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "safe-regex-test@npm:1.0.0"
+"safe-regex-test@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "safe-regex-test@npm:1.0.3"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.1.3"
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
     is-regex: "npm:^1.1.4"
-  checksum: 10/c7248dfa07891aa634c8b9c55da696e246f8589ca50e7fd14b22b154a106e83209ddf061baf2fa45ebfbd485b094dc7297325acfc50724de6afe7138451b42a9
+  checksum: 10/b04de61114b10274d92e25b6de7ccb5de07f11ea15637ff636de4b5190c0f5cd8823fe586dde718504cf78055437d70fd8804976894df502fcf5a210c970afb3
   languageName: node
   linkType: hard
 
@@ -37761,13 +37200,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scrypt-js@npm:^3.0.0, scrypt-js@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "scrypt-js@npm:3.0.1"
-  checksum: 10/2f8aa72b7f76a6f9c446bbec5670f80d47497bccce98474203d89b5667717223eeb04a50492ae685ed7adc5a060fc2d8f9fd988f8f7ebdaf3341967f3aeff116
-  languageName: node
-  linkType: hard
-
 "sdp@npm:^2.12.0, sdp@npm:^2.6.0":
   version: 2.12.0
   resolution: "sdp@npm:2.12.0"
@@ -37775,18 +37207,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"secp256k1@npm:^4.0.1":
-  version: 4.0.3
-  resolution: "secp256k1@npm:4.0.3"
-  dependencies:
-    elliptic: "npm:^6.5.4"
-    node-addon-api: "npm:^2.0.0"
-    node-gyp: "npm:latest"
-    node-gyp-build: "npm:^4.2.0"
-  checksum: 10/8b45820cd90fd2f95cc8fdb9bf8a71e572de09f2311911ae461a951ffa9e30c99186a129d0f1afeb380dd67eca0c10493f8a7513c39063fda015e99995088e3b
-  languageName: node
-  linkType: hard
-
 "section-matter@npm:^1.0.0":
   version: 1.0.0
   resolution: "section-matter@npm:1.0.0"
@@ -37962,19 +37382,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"servify@npm:^0.1.12":
-  version: 0.1.12
-  resolution: "servify@npm:0.1.12"
-  dependencies:
-    body-parser: "npm:^1.16.0"
-    cors: "npm:^2.8.1"
-    express: "npm:^4.14.0"
-    request: "npm:^2.79.0"
-    xhr: "npm:^2.3.3"
-  checksum: 10/d61b145034aa26c143d7081a56c544aceff256eead27a5894b6785346254438d2b387ac7411bf664024d258779a00dc6c5d9da65f8d60382dac23a8cba0b0d9e
-  languageName: node
-  linkType: hard
-
 "set-blocking@npm:^2.0.0":
   version: 2.0.0
   resolution: "set-blocking@npm:2.0.0"
@@ -38003,14 +37410,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"set-function-name@npm:^2.0.0, set-function-name@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "set-function-name@npm:2.0.1"
+"set-function-name@npm:^2.0.1, set-function-name@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "set-function-name@npm:2.0.2"
   dependencies:
-    define-data-property: "npm:^1.0.1"
+    define-data-property: "npm:^1.1.4"
+    es-errors: "npm:^1.3.0"
     functions-have-names: "npm:^1.2.3"
-    has-property-descriptors: "npm:^1.0.0"
-  checksum: 10/4975d17d90c40168eee2c7c9c59d023429f0a1690a89d75656306481ece0c3c1fb1ebcc0150ea546d1913e35fbd037bace91372c69e543e51fc5d1f31a9fa126
+    has-property-descriptors: "npm:^1.0.2"
+  checksum: 10/c7614154a53ebf8c0428a6c40a3b0b47dac30587c1a19703d1b75f003803f73cdfa6a93474a9ba678fa565ef5fbddc2fae79bca03b7d22ab5fd5163dbe571a74
   languageName: node
   linkType: hard
 
@@ -38216,17 +37624,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"simple-get@npm:^2.7.0":
-  version: 2.8.2
-  resolution: "simple-get@npm:2.8.2"
-  dependencies:
-    decompress-response: "npm:^3.3.0"
-    once: "npm:^1.3.1"
-    simple-concat: "npm:^1.0.0"
-  checksum: 10/b827672695bbe504217311c47c6a106358babcfbf3d69c8d67ad56da40c2ed05185eec12538dfe3637e1cf0441bcd5931b022a84dc7f8f2d84969d595f7f7fda
-  languageName: node
-  linkType: hard
-
 "simple-get@npm:^4.0.0, simple-get@npm:^4.0.1":
   version: 4.0.1
   resolution: "simple-get@npm:4.0.1"
@@ -38426,35 +37823,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"socks-proxy-agent@npm:6.1.1":
-  version: 6.1.1
-  resolution: "socks-proxy-agent@npm:6.1.1"
-  dependencies:
-    agent-base: "npm:^6.0.2"
-    debug: "npm:^4.3.1"
-    socks: "npm:^2.6.1"
-  checksum: 10/53fb7d34bf3e5ed9cf4de73bf5c18b351d75c4a8757a0c0e384c2a7c86adf688e5f5e8f72eee7bc6c01ff619458f621ccf9d172bc986adb05f10fa0c9599c39e
-  languageName: node
-  linkType: hard
-
-"socks-proxy-agent@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "socks-proxy-agent@npm:7.0.0"
+"socks-proxy-agent@npm:8.0.4, socks-proxy-agent@npm:^8.0.3":
+  version: 8.0.4
+  resolution: "socks-proxy-agent@npm:8.0.4"
   dependencies:
-    agent-base: "npm:^6.0.2"
-    debug: "npm:^4.3.3"
-    socks: "npm:^2.6.2"
-  checksum: 10/26c75d9c62a9ed3fd494df60e65e88da442f78e0d4bc19bfd85ac37bd2c67470d6d4bba5202e804561cda6674db52864c9e2a2266775f879bc8d89c1445a5f4c
+    agent-base: "npm:^7.1.1"
+    debug: "npm:^4.3.4"
+    socks: "npm:^2.8.3"
+  checksum: 10/c8e7c2b398338b49a0a0f4d2bae5c0602aeeca6b478b99415927b6c5db349ca258448f2c87c6958ebf83eea17d42cbc5d1af0bfecb276cac10b9658b0f07f7d7
   languageName: node
   linkType: hard
 
-"socks@npm:^2.6.1, socks@npm:^2.6.2":
-  version: 2.7.1
-  resolution: "socks@npm:2.7.1"
+"socks@npm:^2.8.3":
+  version: 2.8.3
+  resolution: "socks@npm:2.8.3"
   dependencies:
-    ip: "npm:^2.0.0"
+    ip-address: "npm:^9.0.5"
     smart-buffer: "npm:^4.2.0"
-  checksum: 10/5074f7d6a13b3155fa655191df1c7e7a48ce3234b8ccf99afa2ccb56591c195e75e8bb78486f8e9ea8168e95a29573cbaad55b2b5e195160ae4d2ea6811ba833
+  checksum: 10/ffcb622c22481dfcd7589aae71fbfd71ca34334064d181df64bf8b7feaeee19706aba4cffd1de35cc7bbaeeaa0af96be2d7f40fcbc7bc0ab69533a7ae9ffc4fb
   languageName: node
   linkType: hard
 
@@ -38685,10 +38071,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sprintf-js@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "sprintf-js@npm:1.1.2"
-  checksum: 10/0044322a252b36bffc3d8a462a4882de57830e18d37d1cc000104ff4744b512d6a9b1ca6240e7ad141a987a1eaad071668fe12d11c496c11d3641c4797a6cf3f
+"sprintf-js@npm:^1.1.2, sprintf-js@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "sprintf-js@npm:1.1.3"
+  checksum: 10/e7587128c423f7e43cc625fe2f87e6affdf5ca51c1cc468e910d8aaca46bb44a7fbcfa552f787b1d3987f7043aeb4527d1b99559e6621e01b42b3f45e5a24cbb
   languageName: node
   linkType: hard
 
@@ -38699,7 +38085,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sshpk@npm:^1.14.1, sshpk@npm:^1.7.0":
+"sshpk@npm:^1.14.1":
   version: 1.18.0
   resolution: "sshpk@npm:1.18.0"
   dependencies:
@@ -38736,15 +38122,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ssri@npm:^9.0.0":
-  version: 9.0.1
-  resolution: "ssri@npm:9.0.1"
-  dependencies:
-    minipass: "npm:^3.1.1"
-  checksum: 10/7638a61e91432510718e9265d48d0438a17d53065e5184f1336f234ef6aa3479663942e41e97df56cda06bb24d9d0b5ef342c10685add3cac7267a82d7fa6718
-  languageName: node
-  linkType: hard
-
 "stack-generator@npm:^2.0.5":
   version: 2.0.10
   resolution: "stack-generator@npm:2.0.10"
@@ -39004,13 +38381,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strict-uri-encode@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "strict-uri-encode@npm:1.1.0"
-  checksum: 10/9466d371f7b36768d43f7803f26137657559e4c8b0161fb9e320efb8edba3ae22f8e99d4b0d91da023b05a13f62ec5412c3f4f764b5788fac11d1fea93720bb3
-  languageName: node
-  linkType: hard
-
 "strict-uri-encode@npm:^2.0.0":
   version: 2.0.0
   resolution: "strict-uri-encode@npm:2.0.0"
@@ -39045,7 +38415,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
   version: 4.2.3
   resolution: "string-width@npm:4.2.3"
   dependencies:
@@ -39078,52 +38448,78 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.matchall@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "string.prototype.matchall@npm:4.0.8"
+"string.prototype.includes@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "string.prototype.includes@npm:2.0.1"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.1.4"
-    es-abstract: "npm:^1.20.4"
-    get-intrinsic: "npm:^1.1.3"
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.3"
+  checksum: 10/939a5447e4a99a86f29cc97fa24f358e5071f79e34746de4c7eb2cd736ed626ad24870a1e356f33915b3b352bb87f7e4d1cebc15d1e1aaae0923777e21b1b28b
+  languageName: node
+  linkType: hard
+
+"string.prototype.matchall@npm:^4.0.11":
+  version: 4.0.11
+  resolution: "string.prototype.matchall@npm:4.0.11"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.2.4"
+    gopd: "npm:^1.0.1"
     has-symbols: "npm:^1.0.3"
-    internal-slot: "npm:^1.0.3"
-    regexp.prototype.flags: "npm:^1.4.3"
-    side-channel: "npm:^1.0.4"
-  checksum: 10/9de2e9e33344002e08c03c13533d88d0c557d5a3d9214a4f2cc8d63349f7c35af895804dec08e43224cc4c0345651c678e14260c5933967fd97aad4640a7e485
+    internal-slot: "npm:^1.0.7"
+    regexp.prototype.flags: "npm:^1.5.2"
+    set-function-name: "npm:^2.0.2"
+    side-channel: "npm:^1.0.6"
+  checksum: 10/a902ff4500f909f2a08e55cc5ab1ffbbc905f603b36837674370ee3921058edd0392147e15891910db62a2f31ace2adaf065eaa3bc6e9810bdbc8ca48e05a7b5
   languageName: node
   linkType: hard
 
-"string.prototype.trim@npm:^1.2.8":
-  version: 1.2.8
-  resolution: "string.prototype.trim@npm:1.2.8"
+"string.prototype.repeat@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "string.prototype.repeat@npm:1.0.0"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-  checksum: 10/9301f6cb2b6c44f069adde1b50f4048915985170a20a1d64cf7cb2dc53c5cd6b9525b92431f1257f894f94892d6c4ae19b5aa7f577c3589e7e51772dffc9d5a4
+    define-properties: "npm:^1.1.3"
+    es-abstract: "npm:^1.17.5"
+  checksum: 10/4b1bd91b75fa8fdf0541625184ebe80e445a465ce4253c19c3bccd633898005dadae0f74b85ae72662a53aafb8035bf48f8f5c0755aec09bc106a7f13959d05e
   languageName: node
   linkType: hard
 
-"string.prototype.trimend@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "string.prototype.trimend@npm:1.0.7"
+"string.prototype.trim@npm:^1.2.9":
+  version: 1.2.9
+  resolution: "string.prototype.trim@npm:1.2.9"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-  checksum: 10/3f0d3397ab9bd95cd98ae2fe0943bd3e7b63d333c2ab88f1875cf2e7c958c75dc3355f6fe19ee7c8fca28de6f39f2475e955e103821feb41299a2764a7463ffa
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.0"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10/b2170903de6a2fb5a49bb8850052144e04b67329d49f1343cdc6a87cb24fb4e4b8ad00d3e273a399b8a3d8c32c89775d93a8f43cb42fbff303f25382079fb58a
   languageName: node
   linkType: hard
 
-"string.prototype.trimstart@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "string.prototype.trimstart@npm:1.0.7"
+"string.prototype.trimend@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "string.prototype.trimend@npm:1.0.8"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-  checksum: 10/6e594d3a61b127d243b8be1312e9f78683abe452cfe0bcafa3e0dc62ad6f030ccfb64d87ed3086fb7cb540fda62442c164d237cc5cc4d53c6e3eb659c29a0aeb
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10/c2e862ae724f95771da9ea17c27559d4eeced9208b9c20f69bbfcd1b9bc92375adf8af63a103194dba17c4cc4a5cb08842d929f415ff9d89c062d44689c8761b
+  languageName: node
+  linkType: hard
+
+"string.prototype.trimstart@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "string.prototype.trimstart@npm:1.0.8"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10/160167dfbd68e6f7cb9f51a16074eebfce1571656fc31d40c3738ca9e30e35496f2c046fe57b6ad49f65f238a152be8c86fd9a2dd58682b5eba39dad995b3674
   languageName: node
   linkType: hard
 
@@ -39233,15 +38629,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-hex-prefix@npm:1.0.0":
-  version: 1.0.0
-  resolution: "strip-hex-prefix@npm:1.0.0"
-  dependencies:
-    is-hex-prefixed: "npm:1.0.0"
-  checksum: 10/4cafe7caee1d281d3694d14920fd5d3c11adf09371cef7e2ccedd5b83efd9e9bd2219b5d6ce6e809df6e0f437dc9d30db1192116580875698aad164a6d6b285b
-  languageName: node
-  linkType: hard
-
 "strip-indent@npm:^4.0.0":
   version: 4.0.0
   resolution: "strip-indent@npm:4.0.0"
@@ -39620,6 +39007,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"svg-pathdata@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "svg-pathdata@npm:6.0.3"
+  checksum: 10/ed20b3fd20fd2f9dfa519fee2a690ec6bff84be00882c04b1461d6e5a250da3e37236c1f3abe2dae9c8dae841cc33f2700396186f894e1953dc6c0149201ac21
+  languageName: node
+  linkType: hard
+
 "svg-tags@npm:^1.0.0":
   version: 1.0.0
   resolution: "svg-tags@npm:1.0.0"
@@ -39627,6 +39021,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"svg2ttf@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "svg2ttf@npm:6.0.3"
+  dependencies:
+    "@xmldom/xmldom": "npm:^0.7.2"
+    argparse: "npm:^2.0.1"
+    cubic2quad: "npm:^1.2.1"
+    lodash: "npm:^4.17.10"
+    microbuffer: "npm:^1.0.0"
+    svgpath: "npm:^2.1.5"
+  bin:
+    svg2ttf: svg2ttf.js
+  checksum: 10/94b7d36df599fc9cd2eeb5a98fbfb284dbf89593bbf95ddd5222f30111d7a3369aaa22a0493b8cdbbb5601ef416ebb9fd8815c8eb382d4073c65dfec985216b3
+  languageName: node
+  linkType: hard
+
+"svgicons2svgfont@npm:^12.0.0":
+  version: 12.0.0
+  resolution: "svgicons2svgfont@npm:12.0.0"
+  dependencies:
+    commander: "npm:^9.3.0"
+    glob: "npm:^8.0.3"
+    sax: "npm:^1.2.4"
+    svg-pathdata: "npm:^6.0.3"
+  bin:
+    svgicons2svgfont: bin/svgicons2svgfont.js
+  checksum: 10/e862295988c269ef7c8e07011dc3e683908243f7b5d0392f12e173ea70dad08f4e3df9af47581ab7855c56ff7642e4f63278ab1c8522fa671d46a74227c9a304
+  languageName: node
+  linkType: hard
+
 "svgo@npm:3.2.0, svgo@npm:^3.2.0":
   version: 3.2.0
   resolution: "svgo@npm:3.2.0"
@@ -39644,22 +39068,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"swarm-js@npm:^0.1.40":
-  version: 0.1.42
-  resolution: "swarm-js@npm:0.1.42"
-  dependencies:
-    bluebird: "npm:^3.5.0"
-    buffer: "npm:^5.0.5"
-    eth-lib: "npm:^0.1.26"
-    fs-extra: "npm:^4.0.2"
-    got: "npm:^11.8.5"
-    mime-types: "npm:^2.1.16"
-    mkdirp-promise: "npm:^5.0.1"
-    mock-fs: "npm:^4.1.0"
-    setimmediate: "npm:^1.0.5"
-    tar: "npm:^4.0.2"
-    xhr-request: "npm:^1.0.1"
-  checksum: 10/341bcfef6daadc1904ea87b1781f10dc99ec14e33c9a9041e43e9617dcc3b7d632230e1baf2fafecb8e10e63c2e4eeb7cce7c85592dc0cf0dde935f49c77050b
+"svgpath@npm:^2.1.5":
+  version: 2.6.0
+  resolution: "svgpath@npm:2.6.0"
+  checksum: 10/88533d11fe44eae7db3751def85f72687554bf60224e7e8fd7cd40564c3c58cb93cf6f32470cb28a2fc29b4ba43273c478f0461f9be07f7233454740ee117873
   languageName: node
   linkType: hard
 
@@ -39839,22 +39251,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar@npm:^4.0.2":
-  version: 4.4.19
-  resolution: "tar@npm:4.4.19"
-  dependencies:
-    chownr: "npm:^1.1.4"
-    fs-minipass: "npm:^1.2.7"
-    minipass: "npm:^2.9.0"
-    minizlib: "npm:^1.3.3"
-    mkdirp: "npm:^0.5.5"
-    safe-buffer: "npm:^5.2.1"
-    yallist: "npm:^3.1.1"
-  checksum: 10/2715b5964578424ba5164632905a85e5a98c8dffeba657860aafa3a771b2602e6fd2a350bca891d78b8bda8cab5c53134c683ed2269b9925533477a24722e73b
-  languageName: node
-  linkType: hard
-
-"tar@npm:^6.0.5, tar@npm:^6.1.11, tar@npm:^6.1.12, tar@npm:^6.1.13, tar@npm:^6.1.2, tar@npm:^6.2.0":
+"tar@npm:^6.0.5, tar@npm:^6.1.11, tar@npm:^6.1.12, tar@npm:^6.1.13, tar@npm:^6.2.0, tar@npm:^6.2.1":
   version: 6.2.1
   resolution: "tar@npm:6.2.1"
   dependencies:
@@ -40158,13 +39555,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"timed-out@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "timed-out@npm:4.0.1"
-  checksum: 10/d52648e5fc0ebb0cae1633737a1db1b7cb464d5d43d754bd120ddebd8067a1b8f42146c250d8cfb9952183b7b0f341a99fc71b59c52d659218afae293165004f
-  languageName: node
-  linkType: hard
-
 "timers-browserify@npm:^2.0.4":
   version: 2.0.12
   resolution: "timers-browserify@npm:2.0.12"
@@ -40393,16 +39783,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:~2.5.0":
-  version: 2.5.0
-  resolution: "tough-cookie@npm:2.5.0"
-  dependencies:
-    psl: "npm:^1.1.28"
-    punycode: "npm:^2.1.1"
-  checksum: 10/024cb13a4d1fe9af57f4323dff765dd9b217cc2a69be77e3b8a1ca45600aa33a097b6ad949f225d885e904f4bd3ceccef104741ef202d8378e6ca78e850ff82f
-  languageName: node
-  linkType: hard
-
 "tr46@npm:^2.1.0":
   version: 2.1.0
   resolution: "tr46@npm:2.1.0"
@@ -40486,28 +39866,21 @@ __metadata:
     "@babel/preset-typescript": "npm:^7.24.7"
     "@babel/runtime": "npm:^7.23.9"
     "@suite-common/wallet-types": "workspace:*"
+    "@trezor/eslint": "workspace:*"
     "@types/jest": "npm:29.5.12"
     "@types/node": "npm:20.12.7"
     "@types/prettier": "npm:^3.0.0"
     "@types/semver": "npm:^7.5.6"
     "@types/tar": "npm:^6.1.11"
-    "@typescript-eslint/eslint-plugin": "npm:^8.5.0"
-    "@typescript-eslint/parser": "npm:^8.5.0"
     babel-jest: "npm:29.7.0"
     depcheck: "npm:^1.4.7"
-    eslint: "npm:^8.56.0"
-    eslint-plugin-chai-friendly: "npm:^0.7.4"
-    eslint-plugin-cypress: "npm:^2.15.1"
-    eslint-plugin-import: "npm:^2.29.1"
-    eslint-plugin-jest: "npm:^27.6.3"
-    eslint-plugin-jsx-a11y: "npm:^6.8.0"
-    eslint-plugin-local-rules: "npm:^3.0.2"
-    eslint-plugin-react: "npm:^7.33.2"
-    eslint-plugin-react-hooks: "npm:^4.6.0"
+    eslint: "npm:^9.13.0"
+    globals: "npm:^15.11.0"
     jest: "npm:29.7.0"
     jest-environment-jsdom: "npm:29.7.0"
     jest-expo: "npm:^50.0.2"
     metro-react-native-babel-preset: "npm:0.77.0"
+    node-fetch: "npm:^2.6.4"
     nx: "npm:^18.0.3"
     patch-package: "npm:8.0.0"
     prettier: "npm:^3.3.2"
@@ -40726,7 +40099,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^1.13.0, tslib@npm:^1.8.1, tslib@npm:^1.9.0":
+"tslib@npm:^1.13.0, tslib@npm:^1.9.0":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
   checksum: 10/7dbf34e6f55c6492637adb81b555af5e3b4f9cc6b998fb440dac82d3b42bdc91560a35a5fb75e20e24a076c651438234da6743d139e4feabf0783f3cdfe1dddb
@@ -40740,17 +40113,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tsutils@npm:^3.21.0":
-  version: 3.21.0
-  resolution: "tsutils@npm:3.21.0"
-  dependencies:
-    tslib: "npm:^1.8.1"
-  peerDependencies:
-    typescript: ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-  checksum: 10/ea036bec1dd024e309939ffd49fda7a351c0e87a1b8eb049570dd119d447250e2c56e0e6c00554e8205760e7417793fdebff752a46e573fbe07d4f375502a5b2
-  languageName: node
-  linkType: hard
-
 "tsx@npm:^4.16.3":
   version: 4.16.3
   resolution: "tsx@npm:4.16.3"
@@ -40767,6 +40129,43 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ttf2eot@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "ttf2eot@npm:3.1.0"
+  dependencies:
+    argparse: "npm:^2.0.1"
+  bin:
+    ttf2eot: ttf2eot.js
+  checksum: 10/1660d713c207779af73c8dcb2bbcbb6ff795e7d5edbf5b02d94e3f044932b573ec77764329ad50f57f6567cbe594a0ad2cf3bdc67c2bea4acea2a29138f54ff7
+  languageName: node
+  linkType: hard
+
+"ttf2woff2@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "ttf2woff2@npm:5.0.0"
+  dependencies:
+    bindings: "npm:^1.5.0"
+    bufferstreams: "npm:^3.0.0"
+    nan: "npm:^2.14.2"
+    node-gyp: "npm:^9.0.0"
+  bin:
+    ttf2woff2: bin/ttf2woff2.js
+  checksum: 10/dddf81d16cd192025efbb966677db02a95b0f6f173303daa8fa44b08d69f424c5b81edd06e447603cf2816e9d207e234602607f4e2bbccd3c6bced2ed05c517b
+  languageName: node
+  linkType: hard
+
+"ttf2woff@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "ttf2woff@npm:3.0.0"
+  dependencies:
+    argparse: "npm:^2.0.1"
+    pako: "npm:^1.0.0"
+  bin:
+    ttf2woff: ttf2woff.js
+  checksum: 10/c8fca24616e1d4356c4141c7ec2e3d7f839185b7b6f3baf0bfb13f2eebba64e5ab3620f9f882161ac71e7c36980a70c6fc2548599ea2f66876e5947acaf65765
+  languageName: node
+  linkType: hard
+
 "tty-browserify@npm:0.0.0":
   version: 0.0.0
   resolution: "tty-browserify@npm:0.0.0"
@@ -40860,59 +40259,55 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typed-array-buffer@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-buffer@npm:1.0.0"
+"typed-array-buffer@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "typed-array-buffer@npm:1.0.2"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.2.1"
-    is-typed-array: "npm:^1.1.10"
-  checksum: 10/3e0281c79b2a40cd97fe715db803884301993f4e8c18e8d79d75fd18f796e8cd203310fec8c7fdb5e6c09bedf0af4f6ab8b75eb3d3a85da69328f28a80456bd3
+    call-bind: "npm:^1.0.7"
+    es-errors: "npm:^1.3.0"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10/02ffc185d29c6df07968272b15d5319a1610817916ec8d4cd670ded5d1efe72901541ff2202fcc622730d8a549c76e198a2f74e312eabbfb712ed907d45cbb0b
   languageName: node
   linkType: hard
 
-"typed-array-byte-length@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-byte-length@npm:1.0.0"
+"typed-array-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "typed-array-byte-length@npm:1.0.1"
   dependencies:
-    call-bind: "npm:^1.0.2"
+    call-bind: "npm:^1.0.7"
     for-each: "npm:^0.3.3"
-    has-proto: "npm:^1.0.1"
-    is-typed-array: "npm:^1.1.10"
-  checksum: 10/6f376bf5d988f00f98ccee41fd551cafc389095a2a307c18fab30f29da7d1464fc3697139cf254cda98b4128bbcb114f4b557bbabdc6d9c2e5039c515b31decf
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10/e4a38329736fe6a73b52a09222d4a9e8de14caaa4ff6ad8e55217f6705b017d9815b7284c85065b3b8a7704e226ccff1372a72b78c2a5b6b71b7bf662308c903
   languageName: node
   linkType: hard
 
-"typed-array-byte-offset@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-byte-offset@npm:1.0.0"
+"typed-array-byte-offset@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "typed-array-byte-offset@npm:1.0.2"
   dependencies:
-    available-typed-arrays: "npm:^1.0.5"
-    call-bind: "npm:^1.0.2"
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
     for-each: "npm:^0.3.3"
-    has-proto: "npm:^1.0.1"
-    is-typed-array: "npm:^1.1.10"
-  checksum: 10/2d81747faae31ca79f6c597dc18e15ae3d5b7e97f7aaebce3b31f46feeb2a6c1d6c92b9a634d901c83731ffb7ec0b74d05c6ff56076f5ae39db0cd19b16a3f92
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10/ac26d720ebb2aacbc45e231347c359e6649f52e0cfe0e76e62005912f8030d68e4cb7b725b1754e8fdd48e433cb68df5a8620a3e420ad1457d666e8b29bf9150
   languageName: node
   linkType: hard
 
-"typed-array-length@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "typed-array-length@npm:1.0.4"
+"typed-array-length@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "typed-array-length@npm:1.0.6"
   dependencies:
-    call-bind: "npm:^1.0.2"
+    call-bind: "npm:^1.0.7"
     for-each: "npm:^0.3.3"
-    is-typed-array: "npm:^1.1.9"
-  checksum: 10/0444658acc110b233176cb0b7689dcb828b0cfa099ab1d377da430e8553b6fdcdce882360b7ffe9ae085b6330e1d39383d7b2c61574d6cd8eef651d3e4a87822
-  languageName: node
-  linkType: hard
-
-"typedarray-to-buffer@npm:^3.1.5":
-  version: 3.1.5
-  resolution: "typedarray-to-buffer@npm:3.1.5"
-  dependencies:
-    is-typedarray: "npm:^1.0.0"
-  checksum: 10/7c850c3433fbdf4d04f04edfc751743b8f577828b8e1eb93b95a3bce782d156e267d83e20fb32b3b47813e69a69ab5e9b5342653332f7d21c7d1210661a7a72c
+    gopd: "npm:^1.0.1"
+    has-proto: "npm:^1.0.3"
+    is-typed-array: "npm:^1.1.13"
+    possible-typed-array-names: "npm:^1.0.0"
+  checksum: 10/05e96cf4ff836743ebfc593d86133b8c30e83172cb5d16c56814d7bacfed57ce97e87ada9c4b2156d9aaa59f75cdef01c25bd9081c7826e0b869afbefc3e8c39
   languageName: node
   linkType: hard
 
@@ -40930,6 +40325,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript-eslint@npm:^8.12.2":
+  version: 8.13.0
+  resolution: "typescript-eslint@npm:8.13.0"
+  dependencies:
+    "@typescript-eslint/eslint-plugin": "npm:8.13.0"
+    "@typescript-eslint/parser": "npm:8.13.0"
+    "@typescript-eslint/utils": "npm:8.13.0"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10/74e9371e684c93cb74892bede3b22bbc15bf953eedf47cb40fb58bbc8bafaf164c82a7cf69923197ebabaecc138915d3d7cd364532b1791ae64d8f7385ffd728
+  languageName: node
+  linkType: hard
+
 "typescript-styled-plugin@npm:^0.18.3":
   version: 0.18.3
   resolution: "typescript-styled-plugin@npm:0.18.3"
@@ -41039,13 +40448,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ultron@npm:~1.1.0":
-  version: 1.1.1
-  resolution: "ultron@npm:1.1.1"
-  checksum: 10/7cc6e8e98a2c62c87ab25a79a274f90492f13f5cf7c622dbda1ec85913e207aed392c26e76ed6250c4f05f842571b05dcce1f8ad0f5ecded64a99002b1fdf6e5
-  languageName: node
-  linkType: hard
-
 "unbox-primitive@npm:^1.0.2":
   version: 1.0.2
   resolution: "unbox-primitive@npm:1.0.2"
@@ -41196,15 +40598,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unique-filename@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "unique-filename@npm:2.0.1"
-  dependencies:
-    unique-slug: "npm:^3.0.0"
-  checksum: 10/807acf3381aff319086b64dc7125a9a37c09c44af7620bd4f7f3247fcd5565660ac12d8b80534dcbfd067e6fe88a67e621386dd796a8af828d1337a8420a255f
-  languageName: node
-  linkType: hard
-
 "unique-filename@npm:^3.0.0":
   version: 3.0.0
   resolution: "unique-filename@npm:3.0.0"
@@ -41214,15 +40607,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unique-slug@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "unique-slug@npm:3.0.0"
-  dependencies:
-    imurmurhash: "npm:^0.1.4"
-  checksum: 10/26fc5bc209a875956dd5e84ca39b89bc3be777b112504667c35c861f9547df95afc80439358d836b878b6d91f6ee21fe5ba1a966e9ec2e9f071ddf3fd67d45ee
-  languageName: node
-  linkType: hard
-
 "unique-slug@npm:^4.0.0":
   version: 4.0.0
   resolution: "unique-slug@npm:4.0.0"
@@ -41529,17 +40913,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"update-browserslist-db@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "update-browserslist-db@npm:1.1.0"
+"update-browserslist-db@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "update-browserslist-db@npm:1.1.1"
   dependencies:
-    escalade: "npm:^3.1.2"
-    picocolors: "npm:^1.0.1"
+    escalade: "npm:^3.2.0"
+    picocolors: "npm:^1.1.0"
   peerDependencies:
     browserslist: ">= 4.21.0"
   bin:
     update-browserslist-db: cli.js
-  checksum: 10/d70b9efeaf4601aadb1a4f6456a7a5d9118e0063d995866b8e0c5e0cf559482671dab6ce7b079f9536b06758a344fbd83f974b965211e1c6e8d1958540b0c24c
+  checksum: 10/7678dd8609750588d01aa7460e8eddf2ff9d16c2a52fb1811190e0d056390f1fdffd94db3cf8fb209cf634ab4fa9407886338711c71cc6ccade5eeb22b093734
   languageName: node
   linkType: hard
 
@@ -41576,13 +40960,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"url-set-query@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "url-set-query@npm:1.0.0"
-  checksum: 10/a6e4d1ac5c3e7db8644655a2774b9462d8d95ec7abae341ff53d4a3d03adc2dabc38650dc757659fcbce4859372bbea4a896ac842dd5b54cc22aae087ba35664
-  languageName: node
-  linkType: hard
-
 "url@npm:^0.11.0":
   version: 0.11.0
   resolution: "url@npm:0.11.0"
@@ -41695,13 +41072,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"utf8@npm:3.0.0":
-  version: 3.0.0
-  resolution: "utf8@npm:3.0.0"
-  checksum: 10/31d19c4faacbb65b09ebc1c21c32b20bdb0919c6f6773cee5001b99bb83f8e503e7233c08fc71ebb34f7cfebd95cec3243b81d90176097aa2f286cccb4ce866e
-  languageName: node
-  linkType: hard
-
 "util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1":
   version: 1.0.2
   resolution: "util-deprecate@npm:1.0.2"
@@ -41754,16 +41124,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "uuid@npm:10.0.0"
+"uuid@npm:^11.0.2":
+  version: 11.0.2
+  resolution: "uuid@npm:11.0.2"
   bin:
-    uuid: dist/bin/uuid
-  checksum: 10/35aa60614811a201ff90f8ca5e9ecb7076a75c3821e17f0f5ff72d44e36c2d35fcbc2ceee9c4ac7317f4cc41895da30e74f3885e30313bee48fda6338f250538
+    uuid: dist/esm/bin/uuid
+  checksum: 10/b98082f398fa2ece8cacc2264402f739256ca70def4bb82e3a14ec70777d189c01ce1054764c3b59b8fc098b62b135a15d1b24914712904c988822e2ac9b4f44
   languageName: node
   linkType: hard
 
-"uuid@npm:^3.0.1, uuid@npm:^3.3.2":
+"uuid@npm:^3.0.1":
   version: 3.4.0
   resolution: "uuid@npm:3.4.0"
   bin:
@@ -41873,13 +41243,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"varint@npm:^5.0.0":
-  version: 5.0.2
-  resolution: "varint@npm:5.0.2"
-  checksum: 10/e1a66bf9a6cea96d1f13259170d4d41b845833acf3a9df990ea1e760d279bd70d5b1f4c002a50197efd2168a2fd43eb0b808444600fd4d23651e8d42fe90eb05
-  languageName: node
-  linkType: hard
-
 "varuint-bitcoin@npm:2.0.0":
   version: 2.0.0
   resolution: "varuint-bitcoin@npm:2.0.0"
@@ -42414,293 +41777,236 @@ __metadata:
   languageName: node
   linkType: hard
 
-"web3-bzz@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-bzz@npm:1.10.3"
-  dependencies:
-    "@types/node": "npm:^12.12.6"
-    got: "npm:12.1.0"
-    swarm-js: "npm:^0.1.40"
-  checksum: 10/c3985e345c3149238189497b5df0b0d6a7f290f67782d4f77c733c17f0ed85ac063d9d2e1cc4c4592d668ba5ae333c6bab94cbd7c78f7f3553c1a10d478d90a6
-  languageName: node
-  linkType: hard
-
-"web3-core-helpers@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-core-helpers@npm:1.10.3"
-  dependencies:
-    web3-eth-iban: "npm:1.10.3"
-    web3-utils: "npm:1.10.3"
-  checksum: 10/4ec48d8ab81f3fcaabdab028e40aa958d08abc5bbd48f37b9cfba48ccc0f9e7a556754960b524199fb333688e71c073281dc78639e2944d17b2c57fc6ecf744d
-  languageName: node
-  linkType: hard
-
-"web3-core-method@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-core-method@npm:1.10.3"
-  dependencies:
-    "@ethersproject/transactions": "npm:^5.6.2"
-    web3-core-helpers: "npm:1.10.3"
-    web3-core-promievent: "npm:1.10.3"
-    web3-core-subscriptions: "npm:1.10.3"
-    web3-utils: "npm:1.10.3"
-  checksum: 10/cd201944b4158ba0e267e02f1c2c043a79d29aa54c2e59e3abdef8b4145e5fd4c3b2839f1bd6a5cea705178919fb19039ecdaeae185ad13d9aa05aeb734bf8c5
-  languageName: node
-  linkType: hard
-
-"web3-core-promievent@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-core-promievent@npm:1.10.3"
-  dependencies:
-    eventemitter3: "npm:4.0.4"
-  checksum: 10/5406e3d84a4f02e301ddae7e560be7e83c0f5f87988e1b1efb141697d816bbba8e4ddd0d0160123745a43fa152a5b986135b16901639172490abee4f9e16d106
-  languageName: node
-  linkType: hard
-
-"web3-core-requestmanager@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-core-requestmanager@npm:1.10.3"
-  dependencies:
-    util: "npm:^0.12.5"
-    web3-core-helpers: "npm:1.10.3"
-    web3-providers-http: "npm:1.10.3"
-    web3-providers-ipc: "npm:1.10.3"
-    web3-providers-ws: "npm:1.10.3"
-  checksum: 10/9ec5fe7f621fbab0fe9acab3fd115e46bf86d7b398306e261073b471205c0e1171c4e276ebbe8a0b49906b37677a21b8b1b6d5da83ef86ee7dd29ff87b09e0a6
-  languageName: node
-  linkType: hard
-
-"web3-core-subscriptions@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-core-subscriptions@npm:1.10.3"
-  dependencies:
-    eventemitter3: "npm:4.0.4"
-    web3-core-helpers: "npm:1.10.3"
-  checksum: 10/202d54cba012999dad34b2711afca831e7a64d2a4ea9dbf6486cd1465df7df40b884760c1606b524cf30a403389ad19627fd99bcfee58058e3d5a080a5beef5d
-  languageName: node
-  linkType: hard
-
-"web3-core@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-core@npm:1.10.3"
-  dependencies:
-    "@types/bn.js": "npm:^5.1.1"
-    "@types/node": "npm:^12.12.6"
-    bignumber.js: "npm:^9.0.0"
-    web3-core-helpers: "npm:1.10.3"
-    web3-core-method: "npm:1.10.3"
-    web3-core-requestmanager: "npm:1.10.3"
-    web3-utils: "npm:1.10.3"
-  checksum: 10/2e1db4570acadd94fa5206a1a92be094adc0b1e98f8b53c8d289395cc56d56ab587d259f508d24fb811f5d46330beac2c25e831628522d31589ec3fad94c6053
+"web3-core@npm:^4.4.0, web3-core@npm:^4.5.0, web3-core@npm:^4.5.1, web3-core@npm:^4.6.0, web3-core@npm:^4.7.0":
+  version: 4.7.0
+  resolution: "web3-core@npm:4.7.0"
+  dependencies:
+    web3-errors: "npm:^1.3.0"
+    web3-eth-accounts: "npm:^4.2.1"
+    web3-eth-iban: "npm:^4.0.7"
+    web3-providers-http: "npm:^4.2.0"
+    web3-providers-ipc: "npm:^4.0.7"
+    web3-providers-ws: "npm:^4.0.8"
+    web3-types: "npm:^1.8.1"
+    web3-utils: "npm:^4.3.2"
+    web3-validator: "npm:^2.0.6"
+  dependenciesMeta:
+    web3-providers-ipc:
+      optional: true
+  checksum: 10/76f740cff838f32e21992a2d263b770256562fe9cad5c7b6b220db9990b09b940ff7eb7261400dab971fc2a00bfb75ab4f89f9b5b67c4e70cac099072c177944
   languageName: node
   linkType: hard
 
-"web3-errors@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "web3-errors@npm:1.2.0"
+"web3-errors@npm:^1.1.3, web3-errors@npm:^1.2.0, web3-errors@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "web3-errors@npm:1.3.0"
   dependencies:
-    web3-types: "npm:^1.6.0"
-  checksum: 10/99d0ecc4368c2969cc799ed4ef1b35f233dc3e7e0ccde713bcc850be4e75725ce175127342512504057ca48186266d6a053f129634f20ae23c405855a766d13d
+    web3-types: "npm:^1.7.0"
+  checksum: 10/613b01013b697dcaaad0ff9cfac8c4c69557fb0ffbc9efe86ac3eaf5179c6f18687fdcd2e53faf0a2c3ee68409491171968eb2017444cb14ffa74663ff77556f
   languageName: node
   linkType: hard
 
-"web3-eth-abi@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-eth-abi@npm:1.10.3"
+"web3-eth-abi@npm:^4.2.3, web3-eth-abi@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "web3-eth-abi@npm:4.3.0"
   dependencies:
-    "@ethersproject/abi": "npm:^5.6.3"
-    web3-utils: "npm:1.10.3"
-  checksum: 10/8b2ab1c381957102f367fa29300010a0cdedfd29017585d285c4bedf7eeae0a70801b135661c5bf977713b48ab424df107c0236dbe2387290adaa0750136067f
+    abitype: "npm:0.7.1"
+    web3-errors: "npm:^1.3.0"
+    web3-types: "npm:^1.8.1"
+    web3-utils: "npm:^4.3.2"
+    web3-validator: "npm:^2.0.6"
+  checksum: 10/e490ad7142ae14c2def2b596551b54e83727af76a96ee4854e236cd19477028960eb944af258c42efc4646fc0b685ae4f3b3f2e0c4c75e15bfc346fc05c1ff6e
   languageName: node
   linkType: hard
 
-"web3-eth-accounts@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-eth-accounts@npm:1.10.3"
+"web3-eth-accounts@npm:^4.2.1":
+  version: 4.2.1
+  resolution: "web3-eth-accounts@npm:4.2.1"
   dependencies:
-    "@ethereumjs/common": "npm:2.6.5"
-    "@ethereumjs/tx": "npm:3.5.2"
-    "@ethereumjs/util": "npm:^8.1.0"
-    eth-lib: "npm:0.2.8"
-    scrypt-js: "npm:^3.0.1"
-    uuid: "npm:^9.0.0"
-    web3-core: "npm:1.10.3"
-    web3-core-helpers: "npm:1.10.3"
-    web3-core-method: "npm:1.10.3"
-    web3-utils: "npm:1.10.3"
-  checksum: 10/ad534fe6b602d2f1c7317dc35e23a7a53951a52f4cd24b8b53a27d92bd8bedf8c61438a230dea06913224c20117e5b07fb849d8e437690b3765aaa11665759e8
+    "@ethereumjs/rlp": "npm:^4.0.1"
+    crc-32: "npm:^1.2.2"
+    ethereum-cryptography: "npm:^2.0.0"
+    web3-errors: "npm:^1.3.0"
+    web3-types: "npm:^1.7.0"
+    web3-utils: "npm:^4.3.1"
+    web3-validator: "npm:^2.0.6"
+  checksum: 10/a19a2bad97ed9cc7a82af6ce6acba906f3ed8829116bda1dcd72dd4ee7e31d332239f7464cfa89f053dffcef857fc284777474571e68878dbc2377057f9ea329
   languageName: node
   linkType: hard
 
-"web3-eth-contract@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-eth-contract@npm:1.10.3"
+"web3-eth-contract@npm:^4.5.0, web3-eth-contract@npm:^4.7.0":
+  version: 4.7.0
+  resolution: "web3-eth-contract@npm:4.7.0"
   dependencies:
-    "@types/bn.js": "npm:^5.1.1"
-    web3-core: "npm:1.10.3"
-    web3-core-helpers: "npm:1.10.3"
-    web3-core-method: "npm:1.10.3"
-    web3-core-promievent: "npm:1.10.3"
-    web3-core-subscriptions: "npm:1.10.3"
-    web3-eth-abi: "npm:1.10.3"
-    web3-utils: "npm:1.10.3"
-  checksum: 10/53e09738e8cf5f4c41538a927ea298ad27666ed879065104b69f1db8d2a020d0bb932088b8d0c3da98e41cfeab30451fa1e728b05205c5f6ec3386019642d572
+    "@ethereumjs/rlp": "npm:^5.0.2"
+    web3-core: "npm:^4.5.1"
+    web3-errors: "npm:^1.3.0"
+    web3-eth: "npm:^4.8.2"
+    web3-eth-abi: "npm:^4.2.3"
+    web3-types: "npm:^1.7.0"
+    web3-utils: "npm:^4.3.1"
+    web3-validator: "npm:^2.0.6"
+  checksum: 10/1ae62530fdf1389aa896af527c028e3c39ca16e2318e010d07e6b7d421abb8b1c6a6dbe834d3317098a29a6c8ad47f057d17e1c9602dc0060b689c331c3ce440
   languageName: node
   linkType: hard
 
-"web3-eth-ens@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-eth-ens@npm:1.10.3"
+"web3-eth-ens@npm:^4.4.0":
+  version: 4.4.0
+  resolution: "web3-eth-ens@npm:4.4.0"
   dependencies:
-    content-hash: "npm:^2.5.2"
-    eth-ens-namehash: "npm:2.0.8"
-    web3-core: "npm:1.10.3"
-    web3-core-helpers: "npm:1.10.3"
-    web3-core-promievent: "npm:1.10.3"
-    web3-eth-abi: "npm:1.10.3"
-    web3-eth-contract: "npm:1.10.3"
-    web3-utils: "npm:1.10.3"
-  checksum: 10/5bb7cc1bbba7b6519feccba2d1193d58eda8c7c52bb1392c29c884555c383b5b2bea6a23afd0be7afeaddce767a243f12552b89016c073ae080ee3d32cc3ba42
+    "@adraffy/ens-normalize": "npm:^1.8.8"
+    web3-core: "npm:^4.5.0"
+    web3-errors: "npm:^1.2.0"
+    web3-eth: "npm:^4.8.0"
+    web3-eth-contract: "npm:^4.5.0"
+    web3-net: "npm:^4.1.0"
+    web3-types: "npm:^1.7.0"
+    web3-utils: "npm:^4.3.0"
+    web3-validator: "npm:^2.0.6"
+  checksum: 10/25a1535e095d8ffcbc0641041af69e42aa60ba2989477108a5678c42a06135df9134ccc6024c89c216cb3408848e3905ee178d5b12e3bb740e895ee6ee0bd2cf
   languageName: node
   linkType: hard
 
-"web3-eth-iban@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-eth-iban@npm:1.10.3"
+"web3-eth-iban@npm:^4.0.7":
+  version: 4.0.7
+  resolution: "web3-eth-iban@npm:4.0.7"
   dependencies:
-    bn.js: "npm:^5.2.1"
-    web3-utils: "npm:1.10.3"
-  checksum: 10/ad711fc182cbe883a9987b1c496ebedfe32fcae438ac3ac6e5ac0bdea7a622db8f4fb16f18fb5ed94519dda21050e022a7c05d539a6e72de52d6672f614b2bb0
+    web3-errors: "npm:^1.1.3"
+    web3-types: "npm:^1.3.0"
+    web3-utils: "npm:^4.0.7"
+    web3-validator: "npm:^2.0.3"
+  checksum: 10/9d7521b4d4aef3a0d697905c7859d8e4d7ce82234320beecba9b24d254592a7ccf0354f329289b4e11a816fcbe3eceb842c4c87678f5e8ec622c8351bc1b9170
   languageName: node
   linkType: hard
 
-"web3-eth-personal@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-eth-personal@npm:1.10.3"
+"web3-eth-personal@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "web3-eth-personal@npm:4.1.0"
   dependencies:
-    "@types/node": "npm:^12.12.6"
-    web3-core: "npm:1.10.3"
-    web3-core-helpers: "npm:1.10.3"
-    web3-core-method: "npm:1.10.3"
-    web3-net: "npm:1.10.3"
-    web3-utils: "npm:1.10.3"
-  checksum: 10/47c67687eccea6e906561a18da305d69f5d4384c854cee984aded3534651628265dcfe4ed693910dd1b84e91108b5dc96a715a085e3bb1618fb54143f56b743e
+    web3-core: "npm:^4.6.0"
+    web3-eth: "npm:^4.9.0"
+    web3-rpc-methods: "npm:^1.3.0"
+    web3-types: "npm:^1.8.0"
+    web3-utils: "npm:^4.3.1"
+    web3-validator: "npm:^2.0.6"
+  checksum: 10/a560b0ef1f28961101c47824aa6fc71722c4e581ef5ffc5b68cf1b7db0fd5804032239f872a167a589b3c0ebe223353b8112b38e247e1f5b5ac48991e12f853c
   languageName: node
   linkType: hard
 
-"web3-eth@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-eth@npm:1.10.3"
+"web3-eth@npm:^4.10.0, web3-eth@npm:^4.8.0, web3-eth@npm:^4.8.2, web3-eth@npm:^4.9.0":
+  version: 4.10.0
+  resolution: "web3-eth@npm:4.10.0"
   dependencies:
-    web3-core: "npm:1.10.3"
-    web3-core-helpers: "npm:1.10.3"
-    web3-core-method: "npm:1.10.3"
-    web3-core-subscriptions: "npm:1.10.3"
-    web3-eth-abi: "npm:1.10.3"
-    web3-eth-accounts: "npm:1.10.3"
-    web3-eth-contract: "npm:1.10.3"
-    web3-eth-ens: "npm:1.10.3"
-    web3-eth-iban: "npm:1.10.3"
-    web3-eth-personal: "npm:1.10.3"
-    web3-net: "npm:1.10.3"
-    web3-utils: "npm:1.10.3"
-  checksum: 10/7d5557c5853786de06d8183c0c2dbaee80979fbc3bd6ee65cef0e07b9d88f58677e0e0cff624ec2b433097a9f365c616a57231fa250719de4da1cf557ae0481a
+    setimmediate: "npm:^1.0.5"
+    web3-core: "npm:^4.7.0"
+    web3-errors: "npm:^1.3.0"
+    web3-eth-abi: "npm:^4.3.0"
+    web3-eth-accounts: "npm:^4.2.1"
+    web3-net: "npm:^4.1.0"
+    web3-providers-ws: "npm:^4.0.8"
+    web3-rpc-methods: "npm:^1.3.0"
+    web3-types: "npm:^1.8.1"
+    web3-utils: "npm:^4.3.2"
+    web3-validator: "npm:^2.0.6"
+  checksum: 10/9dcbce05e160cde8148f2ad9919c56e0ad242beb05c2a013219a7d7ab697f5ca7e3c55089d27bdff50c28eebc36a9e1ae4b8b40c57432bdf5a200ace46d8cdc8
   languageName: node
   linkType: hard
 
-"web3-net@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-net@npm:1.10.3"
+"web3-net@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "web3-net@npm:4.1.0"
   dependencies:
-    web3-core: "npm:1.10.3"
-    web3-core-method: "npm:1.10.3"
-    web3-utils: "npm:1.10.3"
-  checksum: 10/35ab560f51d5fa4d241ef514c0d7894b187a76ce7a73b03046281348e0ed2080eb20b8acb263ceb66b4e7874ecd4016833a83c24eae39fd4179cb53674c2b840
+    web3-core: "npm:^4.4.0"
+    web3-rpc-methods: "npm:^1.3.0"
+    web3-types: "npm:^1.6.0"
+    web3-utils: "npm:^4.3.0"
+  checksum: 10/2899ed28d9afda9f9faee6424752cb967dabf79128bce25321318e069a41571b9bd9477b480f290fd65f07cd6c0c641def0d72f31a730705112bd14c301f4e5e
   languageName: node
   linkType: hard
 
-"web3-providers-http@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-providers-http@npm:1.10.3"
+"web3-providers-http@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "web3-providers-http@npm:4.2.0"
   dependencies:
-    abortcontroller-polyfill: "npm:^1.7.5"
     cross-fetch: "npm:^4.0.0"
-    es6-promise: "npm:^4.2.8"
-    web3-core-helpers: "npm:1.10.3"
-  checksum: 10/78d475e6aceb265956bcda07b57c8005f95805be12373907ba00dd4ef32f4d6ff77c8db3f7a05d75e01b71ef3401a10fe5389dfb7419a0c49e19278e8ded7a25
+    web3-errors: "npm:^1.3.0"
+    web3-types: "npm:^1.7.0"
+    web3-utils: "npm:^4.3.1"
+  checksum: 10/812b05d1e0dd8b6c5005bdcfe3c5fbddfe6cdd082bd2654dfe171ad98c3b7ff85b0bab371c70366d2bace2cf45fbf7d2f087b4cb281dbfa12372b902b8138eeb
   languageName: node
   linkType: hard
 
-"web3-providers-ipc@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-providers-ipc@npm:1.10.3"
+"web3-providers-ipc@npm:^4.0.7":
+  version: 4.0.7
+  resolution: "web3-providers-ipc@npm:4.0.7"
   dependencies:
-    oboe: "npm:2.1.5"
-    web3-core-helpers: "npm:1.10.3"
-  checksum: 10/2038d69831eb0fb63f06023b5a3ab307ba0337caead0e0bb0aee3279bfcebec586cd50602565ed98c9e1e16fb99a5b2e57b8aa980e0685bfb35bfb99b9cf4859
+    web3-errors: "npm:^1.1.3"
+    web3-types: "npm:^1.3.0"
+    web3-utils: "npm:^4.0.7"
+  checksum: 10/b953818479f5d9c7b748e10977430fd7e377696f9160ae19b1917c0317e89671c4be824c06723b6fda190258927160fcec0e8e7c1aa87a5f0344008ef7649cda
   languageName: node
   linkType: hard
 
-"web3-providers-ws@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-providers-ws@npm:1.10.3"
+"web3-providers-ws@npm:^4.0.8":
+  version: 4.0.8
+  resolution: "web3-providers-ws@npm:4.0.8"
   dependencies:
-    eventemitter3: "npm:4.0.4"
-    web3-core-helpers: "npm:1.10.3"
-    websocket: "npm:^1.0.32"
-  checksum: 10/0fbf9be16939d5defbd9e9addae9718e119098e3c3d5ea0b6e54f9e3be5145731f7d1750a8e8f61a577608ca4b5f99a48a324bb7d7432ec62402f14d7a87ebe5
+    "@types/ws": "npm:8.5.3"
+    isomorphic-ws: "npm:^5.0.0"
+    web3-errors: "npm:^1.2.0"
+    web3-types: "npm:^1.7.0"
+    web3-utils: "npm:^4.3.1"
+    ws: "npm:^8.17.1"
+  checksum: 10/9b9fa96fa1fc9455fb1b632de50f542d2589710002ea2cb0cd6a5c1ed9f72960d80ce219ac66b038ea6d0a767056fe653aa258a1c084aa78d5745870cc2703b4
   languageName: node
   linkType: hard
 
-"web3-shh@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-shh@npm:1.10.3"
+"web3-rpc-methods@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "web3-rpc-methods@npm:1.3.0"
   dependencies:
-    web3-core: "npm:1.10.3"
-    web3-core-method: "npm:1.10.3"
-    web3-core-subscriptions: "npm:1.10.3"
-    web3-net: "npm:1.10.3"
-  checksum: 10/0697f7ee54e65f27daa237d396fb8c375088e9de1693bf3fffcc05a98cf06ee4a66813971e594d56023023d0559538bd5ef89273e44243bb16c52e614a51eeb7
+    web3-core: "npm:^4.4.0"
+    web3-types: "npm:^1.6.0"
+    web3-validator: "npm:^2.0.6"
+  checksum: 10/8c134b1f2ae1cf94d5c452c53fe699d5951c22c62ea82084559db06722a5f0db2047be4209172ff90432c42f70cf8081fea0ea85a024e4cbcd0e037efd9acfa8
   languageName: node
   linkType: hard
 
-"web3-types@npm:^1.6.0, web3-types@npm:^1.7.0":
-  version: 1.7.0
-  resolution: "web3-types@npm:1.7.0"
-  checksum: 10/fcd5d7a9a94579fcd01fa86dfa70e6afb269f66a7ce60e6786849e64ff6e4a107f1c25cb2784343a48952ac36d4bf3093a73b75de6ebcc971308e6b44abb211f
+"web3-rpc-providers@npm:^1.0.0-rc.2":
+  version: 1.0.0-rc.2
+  resolution: "web3-rpc-providers@npm:1.0.0-rc.2"
+  dependencies:
+    web3-errors: "npm:^1.3.0"
+    web3-providers-http: "npm:^4.2.0"
+    web3-providers-ws: "npm:^4.0.8"
+    web3-types: "npm:^1.7.0"
+    web3-utils: "npm:^4.3.1"
+    web3-validator: "npm:^2.0.6"
+  checksum: 10/8f1fb9a798cec61f245e6e13b796f1b43231d7bd5eb0db8b5b636b4e2facc75ee1453541237f057292ec7ecdb56ba284c29734cd17ea010c27c5580d6edea787
   languageName: node
   linkType: hard
 
-"web3-utils@npm:1.10.3":
-  version: 1.10.3
-  resolution: "web3-utils@npm:1.10.3"
-  dependencies:
-    "@ethereumjs/util": "npm:^8.1.0"
-    bn.js: "npm:^5.2.1"
-    ethereum-bloom-filters: "npm:^1.0.6"
-    ethereum-cryptography: "npm:^2.1.2"
-    ethjs-unit: "npm:0.1.6"
-    number-to-bn: "npm:1.7.0"
-    randombytes: "npm:^2.1.0"
-    utf8: "npm:3.0.0"
-  checksum: 10/7303919fbea2be4a720eb7688a51edb84f993e481bf08ac482c0e3a8f100300ce9a1b51b2775a8356fd397aa2a64fa016d9621d9ced05bdbfe1013d6b5ea90ef
+"web3-types@npm:^1.3.0, web3-types@npm:^1.6.0, web3-types@npm:^1.7.0, web3-types@npm:^1.8.0, web3-types@npm:^1.8.1":
+  version: 1.8.1
+  resolution: "web3-types@npm:1.8.1"
+  checksum: 10/e64f7e59806e1875e34a1daaa34e98043fcaebfd2fc96ab9948789129e8da73e812de62f63cf32c347c202d6ba40121f87516b183bb7074f27331fc7f90a46d9
   languageName: node
   linkType: hard
 
-"web3-utils@npm:^4.3.1":
-  version: 4.3.1
-  resolution: "web3-utils@npm:4.3.1"
+"web3-utils@npm:^4.0.7, web3-utils@npm:^4.3.0, web3-utils@npm:^4.3.1, web3-utils@npm:^4.3.2":
+  version: 4.3.2
+  resolution: "web3-utils@npm:4.3.2"
   dependencies:
     ethereum-cryptography: "npm:^2.0.0"
     eventemitter3: "npm:^5.0.1"
-    web3-errors: "npm:^1.2.0"
-    web3-types: "npm:^1.7.0"
+    web3-errors: "npm:^1.3.0"
+    web3-types: "npm:^1.8.1"
     web3-validator: "npm:^2.0.6"
-  checksum: 10/88e39a6d43b756e965226b25ddc54855f26a7c13f6240b99fb521e1bae35a20a24f637f09fd0f4ef5d3f5a9e46b7f843bb5fd7ac2c9f99cfe18bb71817390f6e
+  checksum: 10/3fff4418782b0fb05587c9150daedbad90a9ebadd1e3b115a71a72fea885ce10341054758087e47ab81f3cc67da812eaf9077f05e07a872e63d27299f285a81a
   languageName: node
   linkType: hard
 
-"web3-validator@npm:^2.0.6":
+"web3-validator@npm:^2.0.3, web3-validator@npm:^2.0.6":
   version: 2.0.6
   resolution: "web3-validator@npm:2.0.6"
   dependencies:
@@ -42713,18 +42019,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"web3@npm:^1.9.0":
-  version: 1.10.3
-  resolution: "web3@npm:1.10.3"
-  dependencies:
-    web3-bzz: "npm:1.10.3"
-    web3-core: "npm:1.10.3"
-    web3-eth: "npm:1.10.3"
-    web3-eth-personal: "npm:1.10.3"
-    web3-net: "npm:1.10.3"
-    web3-shh: "npm:1.10.3"
-    web3-utils: "npm:1.10.3"
-  checksum: 10/6087dc7efaed48ba8f9f944bdf0ac223e99ccb5f132fda791a314f8ce531b1a182e4274c8ee8a0191ae3203e70a762f52eea7e038ee2822719a849f4ec4c9e22
+"web3@npm:^4.14.0":
+  version: 4.14.0
+  resolution: "web3@npm:4.14.0"
+  dependencies:
+    web3-core: "npm:^4.7.0"
+    web3-errors: "npm:^1.3.0"
+    web3-eth: "npm:^4.10.0"
+    web3-eth-abi: "npm:^4.3.0"
+    web3-eth-accounts: "npm:^4.2.1"
+    web3-eth-contract: "npm:^4.7.0"
+    web3-eth-ens: "npm:^4.4.0"
+    web3-eth-iban: "npm:^4.0.7"
+    web3-eth-personal: "npm:^4.1.0"
+    web3-net: "npm:^4.1.0"
+    web3-providers-http: "npm:^4.2.0"
+    web3-providers-ws: "npm:^4.0.8"
+    web3-rpc-methods: "npm:^1.3.0"
+    web3-rpc-providers: "npm:^1.0.0-rc.2"
+    web3-types: "npm:^1.8.1"
+    web3-utils: "npm:^4.3.2"
+    web3-validator: "npm:^2.0.6"
+  checksum: 10/cd8db8ace62c73b7c9ae4a1e1eaec99d8c107295e75e1e6fe770c52bcce919ef17c1d84b835d33c595ac72972207f23ae5cbdcb5382656709cc91db82437fc07
   languageName: node
   linkType: hard
 
@@ -43020,17 +42336,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:5, webpack@npm:^5, webpack@npm:^5.94.0":
-  version: 5.94.0
-  resolution: "webpack@npm:5.94.0"
+"webpack@npm:5, webpack@npm:^5, webpack@npm:^5.96.1":
+  version: 5.96.1
+  resolution: "webpack@npm:5.96.1"
   dependencies:
-    "@types/estree": "npm:^1.0.5"
+    "@types/eslint-scope": "npm:^3.7.7"
+    "@types/estree": "npm:^1.0.6"
     "@webassemblyjs/ast": "npm:^1.12.1"
     "@webassemblyjs/wasm-edit": "npm:^1.12.1"
     "@webassemblyjs/wasm-parser": "npm:^1.12.1"
-    acorn: "npm:^8.7.1"
-    acorn-import-attributes: "npm:^1.9.5"
-    browserslist: "npm:^4.21.10"
+    acorn: "npm:^8.14.0"
+    browserslist: "npm:^4.24.0"
     chrome-trace-event: "npm:^1.0.2"
     enhanced-resolve: "npm:^5.17.1"
     es-module-lexer: "npm:^1.2.1"
@@ -43052,7 +42368,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 10/648449c5fbbb0839814116e3b2b044ac6c75a7ba272435155ddeb1e64dfaa2f8079be3adfbb691f648b69900756ce0f6fb73beab0ced3cf5e0fd46868b4593a6
+  checksum: 10/d3419ffd198252e1d0301bd0c072cee93172f3e47937c745aa8202691d2f5d529d4ba4a1965d1450ad89a1bcd3c1f70ae09e57232b0d01dd38d69c1060e964d5
   languageName: node
   linkType: hard
 
@@ -43084,20 +42400,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"websocket@npm:^1.0.32":
-  version: 1.0.34
-  resolution: "websocket@npm:1.0.34"
-  dependencies:
-    bufferutil: "npm:^4.0.1"
-    debug: "npm:^2.2.0"
-    es5-ext: "npm:^0.10.50"
-    typedarray-to-buffer: "npm:^3.1.5"
-    utf-8-validate: "npm:^5.0.2"
-    yaeti: "npm:^0.0.6"
-  checksum: 10/b72e3dcc3fa92b4a4511f0df89b25feed6ab06979cb9e522d2736f09855f4bf7588d826773b9405fcf3f05698200eb55ba9da7ef333584653d4912a5d3b13c18
-  languageName: node
-  linkType: hard
-
 "whatwg-encoding@npm:^2.0.0":
   version: 2.0.0
   resolution: "whatwg-encoding@npm:2.0.0"
@@ -43241,16 +42543,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
-  version: 1.1.13
-  resolution: "which-typed-array@npm:1.1.13"
+"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
+  version: 1.1.15
+  resolution: "which-typed-array@npm:1.1.15"
   dependencies:
-    available-typed-arrays: "npm:^1.0.5"
-    call-bind: "npm:^1.0.4"
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
     for-each: "npm:^0.3.3"
     gopd: "npm:^1.0.1"
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10/605e3e10b7118af904a0e79d0d50b95275102f06ec902734024989cd71354929f7acee50de43529d3baf5858e2e4eb32c75e6ebd226c888ad976d8140e4a3e71
+    has-tostringtag: "npm:^1.0.2"
+  checksum: 10/c3b6a99beadc971baa53c3ee5b749f2b9bdfa3b3b9a70650dd8511a48b61d877288b498d424712e9991d16019633086bd8b5923369460d93463c5825fa36c448
   languageName: node
   linkType: hard
 
@@ -43276,6 +42578,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"which@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "which@npm:4.0.0"
+  dependencies:
+    isexe: "npm:^3.1.1"
+  bin:
+    node-which: bin/which.js
+  checksum: 10/f17e84c042592c21e23c8195108cff18c64050b9efb8459589116999ea9da6dd1509e6a1bac3aeebefd137be00fabbb61b5c2bc0aa0f8526f32b58ee2f545651
+  languageName: node
+  linkType: hard
+
 "why-is-node-running@npm:^2.2.2":
   version: 2.2.2
   resolution: "why-is-node-running@npm:2.2.2"
@@ -43288,15 +42601,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wide-align@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "wide-align@npm:1.1.5"
-  dependencies:
-    string-width: "npm:^1.0.2 || 2 || 3 || 4"
-  checksum: 10/d5f8027b9a8255a493a94e4ec1b74a27bff6679d5ffe29316a3215e4712945c84ef73ca4045c7e20ae7d0c72f5f57f296e04a4928e773d4276a2f1222e4c2e99
-  languageName: node
-  linkType: hard
-
 "wif@npm:^5.0.0":
   version: 5.0.0
   resolution: "wif@npm:5.0.0"
@@ -43424,17 +42728,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^3.0.0":
-  version: 3.3.3
-  resolution: "ws@npm:3.3.3"
-  dependencies:
-    async-limiter: "npm:~1.0.0"
-    safe-buffer: "npm:~5.1.0"
-    ultron: "npm:~1.1.0"
-  checksum: 10/4b4a7e5d11025e399d82a7471bfb4818d563c892f5d953c2de937d262bd8e8acc8b340220001c01f8392574fccbc2df153d6031e285b8b38441187ea0c2cfd72
-  languageName: node
-  linkType: hard
-
 "ws@npm:^6.1.0, ws@npm:^6.2.2, ws@npm:^6.2.3":
   version: 6.2.3
   resolution: "ws@npm:6.2.3"
@@ -43444,7 +42737,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^7, ws@npm:^7.0.0, ws@npm:^7.2.0, ws@npm:^7.3.1, ws@npm:^7.4.5, ws@npm:^7.5.10, ws@npm:^7.5.3":
+"ws@npm:^7, ws@npm:^7.0.0, ws@npm:^7.2.0, ws@npm:^7.3.1, ws@npm:^7.5.10, ws@npm:^7.5.3":
   version: 7.5.10
   resolution: "ws@npm:7.5.10"
   peerDependencies:
@@ -43459,7 +42752,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.16.0, ws@npm:^8.18.0, ws@npm:^8.2.3, ws@npm:^8.5.0":
+"ws@npm:^8.11.0, ws@npm:^8.12.1, ws@npm:^8.16.0, ws@npm:^8.17.1, ws@npm:^8.18.0, ws@npm:^8.2.3, ws@npm:^8.5.0":
   version: 8.18.0
   resolution: "ws@npm:8.18.0"
   peerDependencies:
@@ -43499,42 +42792,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xhr-request-promise@npm:^0.1.2":
-  version: 0.1.3
-  resolution: "xhr-request-promise@npm:0.1.3"
-  dependencies:
-    xhr-request: "npm:^1.1.0"
-  checksum: 10/49ec3474884858faa55349894b1879c872422a24485097c8b71ba9046027d27f1d54eb61dfdb9d72e78892c7371d22d9cc6a4e101b6767bb4df89a0b6d739f85
-  languageName: node
-  linkType: hard
-
-"xhr-request@npm:^1.0.1, xhr-request@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "xhr-request@npm:1.1.0"
-  dependencies:
-    buffer-to-arraybuffer: "npm:^0.0.5"
-    object-assign: "npm:^4.1.1"
-    query-string: "npm:^5.0.1"
-    simple-get: "npm:^2.7.0"
-    timed-out: "npm:^4.0.1"
-    url-set-query: "npm:^1.0.0"
-    xhr: "npm:^2.0.4"
-  checksum: 10/531c5e1e47d2e680c1ae1296af7fa375d752cd83c3fa1f9bd9e82fc4fb305ce8e7aaf266256e82bbd34e2a4891ec535bcc4e9f8db2691ab64bb3b6ff40296b9a
-  languageName: node
-  linkType: hard
-
-"xhr@npm:^2.0.4, xhr@npm:^2.3.3":
-  version: 2.6.0
-  resolution: "xhr@npm:2.6.0"
-  dependencies:
-    global: "npm:~4.4.0"
-    is-function: "npm:^1.0.1"
-    parse-headers: "npm:^2.0.0"
-    xtend: "npm:^4.0.0"
-  checksum: 10/31f34aba708955008c87bcd21482be6afc7ff8adc28090e633b1d3f8d3e8e93150bac47b262738b046d7729023a884b655d55cf34e9d14d5850a1275ab49fb37
-  languageName: node
-  linkType: hard
-
 "xml-name-validator@npm:^4.0.0":
   version: 4.0.0
   resolution: "xml-name-validator@npm:4.0.0"
@@ -43646,13 +42903,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaeti@npm:^0.0.6":
-  version: 0.0.6
-  resolution: "yaeti@npm:0.0.6"
-  checksum: 10/6db12c152f7c363b80071086a3ebf5032e03332604eeda988872be50d6c8469e1f13316175544fa320f72edad696c2d83843ad0ff370659045c1a68bcecfcfea
-  languageName: node
-  linkType: hard
-
 "yallist@npm:^2.1.2":
   version: 2.1.2
   resolution: "yallist@npm:2.1.2"
@@ -43660,7 +42910,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yallist@npm:^3.0.0, yallist@npm:^3.0.2, yallist@npm:^3.1.1":
+"yallist@npm:^3.0.2":
   version: 3.1.1
   resolution: "yallist@npm:3.1.1"
   checksum: 10/9af0a4329c3c6b779ac4736c69fae4190ac03029fa27c1aef4e6bcc92119b73dea6fe5db5fe881fb0ce2a0e9539a42cdf60c7c21eda04d1a0b8c082e38509efb