diff --git a/.github/workflows/test-trezor-user-env-link-e2e.yml b/.github/workflows/test-trezor-user-env-link-e2e.yml
index b97569a7c3..6da43ab6f7 100644
--- a/.github/workflows/test-trezor-user-env-link-e2e.yml
+++ b/.github/workflows/test-trezor-user-env-link-e2e.yml
@@ -39,5 +39,5 @@ jobs:
 
       - name: Run e2e tests
         run: |
-          docker run -d --network=host ghcr.io/trezor/trezor-user-env:52fc1535d962415ddc40fc452dc1739771d0d9d0
+          docker run -d --network=host ghcr.io/trezor/trezor-user-env:e9411ccc936756438d4c60a1ab4d035a4648e6a2
           yarn workspace @trezor/trezor-user-env-link test:e2e
diff --git a/docker/docker-compose.connect-test.yml b/docker/docker-compose.connect-test.yml
index 53f48fd1e9..e6a682b2af 100644
--- a/docker/docker-compose.connect-test.yml
+++ b/docker/docker-compose.connect-test.yml
@@ -1,6 +1,6 @@
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:52fc1535d962415ddc40fc452dc1739771d0d9d0
+    image: ghcr.io/trezor/trezor-user-env:e9411ccc936756438d4c60a1ab4d035a4648e6a2
     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 d69ba5c484..77175e03de 100644
--- a/docker/docker-compose.connect-webextension-test.yml
+++ b/docker/docker-compose.connect-webextension-test.yml
@@ -1,6 +1,6 @@
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:52fc1535d962415ddc40fc452dc1739771d0d9d0
+    image: ghcr.io/trezor/trezor-user-env:e9411ccc936756438d4c60a1ab4d035a4648e6a2
     environment:
       - SDL_VIDEODRIVER=dummy
       - XDG_RUNTIME_DIR=/var/tmp
diff --git a/docker/docker-compose.suite-ci-e2e.yml b/docker/docker-compose.suite-ci-e2e.yml
index e6dd0469ef..64cb8c6b16 100644
--- a/docker/docker-compose.suite-ci-e2e.yml
+++ b/docker/docker-compose.suite-ci-e2e.yml
@@ -1,6 +1,6 @@
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:52fc1535d962415ddc40fc452dc1739771d0d9d0
+    image: ghcr.io/trezor/trezor-user-env:e9411ccc936756438d4c60a1ab4d035a4648e6a2
     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 f83e2a0f75..436fbfd1ee 100644
--- a/docker/docker-compose.suite-desktop-ci.yml
+++ b/docker/docker-compose.suite-desktop-ci.yml
@@ -1,6 +1,6 @@
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:52fc1535d962415ddc40fc452dc1739771d0d9d0
+    image: ghcr.io/trezor/trezor-user-env:e9411ccc936756438d4c60a1ab4d035a4648e6a2
     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 9108e4a602..e232f6c681 100644
--- a/docker/docker-compose.suite-dev.yml
+++ b/docker/docker-compose.suite-dev.yml
@@ -3,7 +3,7 @@
 
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:52fc1535d962415ddc40fc452dc1739771d0d9d0
+    image: ghcr.io/trezor/trezor-user-env:e9411ccc936756438d4c60a1ab4d035a4648e6a2
     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 e31561d1a5..2915f9f6b1 100644
--- a/docker/docker-compose.suite-native-ci.yml
+++ b/docker/docker-compose.suite-native-ci.yml
@@ -2,7 +2,7 @@ services:
   trezor-user-env-unix:
     network_mode: "host"
     container_name: trezor-user-env.unix
-    image: ghcr.io/trezor/trezor-user-env:52fc1535d962415ddc40fc452dc1739771d0d9d0
+    image: ghcr.io/trezor/trezor-user-env:e9411ccc936756438d4c60a1ab4d035a4648e6a2
     environment:
       - SDL_VIDEODRIVER=dummy
       - XDG_RUNTIME_DIR=/var/tmp
diff --git a/docker/docker-compose.transport-test-ci.yml b/docker/docker-compose.transport-test-ci.yml
index 70dc9e1ac1..e351bf1f6a 100644
--- a/docker/docker-compose.transport-test-ci.yml
+++ b/docker/docker-compose.transport-test-ci.yml
@@ -1,6 +1,6 @@
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:52fc1535d962415ddc40fc452dc1739771d0d9d0
+    image: ghcr.io/trezor/trezor-user-env:e9411ccc936756438d4c60a1ab4d035a4648e6a2
     environment:
       - SDL_VIDEODRIVER=dummy
       - XDG_RUNTIME_DIR=/var/tmp
diff --git a/suite/e2e/tests/metadata/suite-sync/suite-sync.test.ts b/suite/e2e/tests/metadata/suite-sync/suite-sync.test.ts
index b8316fb2ea..48cdaa1446 100644
--- a/suite/e2e/tests/metadata/suite-sync/suite-sync.test.ts
+++ b/suite/e2e/tests/metadata/suite-sync/suite-sync.test.ts
@@ -51,7 +51,6 @@ test.describe(
     { tag: ['@webOnly', '@specificFirmware', '@T3W1', '@T3T1'] },
     () => {
         test.use({
-            firmwareVersion: '2-main',
             deviceSetup: { passphrase_protection: true },
         });
 
diff --git a/suite/e2e/tests/metadata/suite-sync/sync-from-server.test.ts b/suite/e2e/tests/metadata/suite-sync/sync-from-server.test.ts
index 5b350f4da0..7416f636f5 100644
--- a/suite/e2e/tests/metadata/suite-sync/sync-from-server.test.ts
+++ b/suite/e2e/tests/metadata/suite-sync/sync-from-server.test.ts
@@ -33,7 +33,6 @@ test.describe(
     { tag: ['@webOnly', '@specificFirmware', '@T3W1', '@T3T1'] },
     () => {
         test.use({
-            firmwareVersion: '2-main',
             deviceSetup: { passphrase_protection: true },
         });
 
diff --git a/suite/e2e/tests/staking/sol/initial-stake.test.ts b/suite/e2e/tests/staking/sol/initial-stake.test.ts
index 9d383ec220..2a1fad7983 100644
--- a/suite/e2e/tests/staking/sol/initial-stake.test.ts
+++ b/suite/e2e/tests/staking/sol/initial-stake.test.ts
@@ -86,10 +86,10 @@ test.describe('sol staking', { tag: ['@webOnly', '@T3W1', '@T3T1'] }, () => {
                 );
 
                 const feeWrapped = device.wrapText(solanaStakingMock.stakeFeeFormatted, {
-                    isAmount: true,
+                    wrapByWords: true,
                 });
                 const amountWrapped = device.wrapText(stakedAndRentFormatted, {
-                    isAmount: true,
+                    wrapByWords: true,
                 });
                 await expect(device).toShowOnDisplay({
                     T3W1: {
diff --git a/suite/e2e/tests/staking/sol/stake-more.test.ts b/suite/e2e/tests/staking/sol/stake-more.test.ts
index 5412c427dc..6b7a5fd0eb 100644
--- a/suite/e2e/tests/staking/sol/stake-more.test.ts
+++ b/suite/e2e/tests/staking/sol/stake-more.test.ts
@@ -103,10 +103,10 @@ test.describe('sol staking', { tag: ['@webOnly', '@T3W1', '@T3T1'] }, () => {
                 );
 
                 const feeWrapped = device.wrapText(solanaStakingMock.stakeFeeFormatted, {
-                    isAmount: true,
+                    wrapByWords: true,
                 });
                 const amountWrapped = device.wrapText(stakeMoreAndRentFormatted, {
-                    isAmount: true,
+                    wrapByWords: true,
                 });
                 await expect(device).toShowOnDisplay({
                     T3W1: {
diff --git a/suite/e2e/tests/staking/sol/unstake.test.ts b/suite/e2e/tests/staking/sol/unstake.test.ts
index ebce4194a5..df6539d761 100644
--- a/suite/e2e/tests/staking/sol/unstake.test.ts
+++ b/suite/e2e/tests/staking/sol/unstake.test.ts
@@ -104,7 +104,7 @@ test.describe('sol staking', { tag: ['@webOnly', '@T3W1', '@T3T1'] }, () => {
                 );
 
                 const feeWrapped = device.wrapText(solanaStakingMock.unstakeFeeFormatted, {
-                    isAmount: true,
+                    wrapByWords: true,
                 });
                 await expect(device).toShowOnDisplay({
                     T3W1: {
@@ -194,10 +194,10 @@ test.describe('sol staking', { tag: ['@webOnly', '@T3W1', '@T3T1'] }, () => {
                 );
 
                 const feeWrapped = device.wrapText(solanaStakingMock.claimFeeFormatted, {
-                    isAmount: true,
+                    wrapByWords: true,
                 });
                 const amountWrapped = device.wrapText(unstakingAndRentFormatted, {
-                    isAmount: true,
+                    wrapByWords: true,
                 });
                 await expect(device).toShowOnDisplay({
                     T3W1: {
diff --git a/suite/e2e/tests/trading/swap-coins.test.ts b/suite/e2e/tests/trading/swap-coins.test.ts
index 724c39b973..cb4ff4a582 100644
--- a/suite/e2e/tests/trading/swap-coins.test.ts
+++ b/suite/e2e/tests/trading/swap-coins.test.ts
@@ -134,7 +134,7 @@ test.describe('Trading - Swap coins', { tag: ['@webOnly', '@T3T1', '@T3W1'] }, (
                         ['Amount:'],
                         [formattedSendAmount],
                         ['Transaction fee:'],
-                        device.wrapText(`${solanaFee} SOL`, { isAmount: true }),
+                        device.wrapText(`${solanaFee} SOL`, { wrapByWords: true }),
                     ],
                     actions: { right_button: 'Hold to sign' },
                 },
diff --git a/suite/e2e/tests/wallet/send-sol.test.ts b/suite/e2e/tests/wallet/send-sol.test.ts
index 963599ccfe..57f639be8f 100644
--- a/suite/e2e/tests/wallet/send-sol.test.ts
+++ b/suite/e2e/tests/wallet/send-sol.test.ts
@@ -114,7 +114,7 @@ test.describe('Send - Solana', { tag: ['@webOnly', '@T3T1', '@T3W1', '@smoke'] }
 
                 // verify amount & fee
                 const amountWrapped = device.wrapText(`${sendMaxAmountWithReserve} SOL`, {
-                    isAmount: true,
+                    wrapByWords: true,
                 });
                 await expect(device).toShowOnDisplay({
                     [Model.T3W1]: {
@@ -123,7 +123,7 @@ test.describe('Send - Solana', { tag: ['@webOnly', '@T3T1', '@T3W1', '@smoke'] }
                             ['Amount:'],
                             amountWrapped,
                             ['Transaction fee:'],
-                            device.wrapText(`${maxFee} SOL`, { isAmount: true }),
+                            device.wrapText(`${maxFee} SOL`, { wrapByWords: true }),
                         ],
                         actions: { right_button: 'Hold to sign' },
                     },