diff --git a/.github/workflows/test-trezor-user-env-link-e2e.yml b/.github/workflows/test-trezor-user-env-link-e2e.yml
index ec890b7c34a..bf02698a852 100644
--- a/.github/workflows/test-trezor-user-env-link-e2e.yml
+++ b/.github/workflows/test-trezor-user-env-link-e2e.yml
@@ -36,5 +36,5 @@ jobs:
 
       - name: Run e2e tests
         run: |
-          docker run -d --network=host ghcr.io/trezor/trezor-user-env:dadc035aa0c121140dba0991ec6abdb786e18406
+          docker run -d --network=host ghcr.io/trezor/trezor-user-env:ee7f945dc2cc47e0a5776f3f86dfe5b70455a725
           yarn workspace @trezor/trezor-user-env-link test:e2e
diff --git a/docker/docker-compose.connect-popup-ci.yml b/docker/docker-compose.connect-popup-ci.yml
index 17cbc9b64f7..db07b897906 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:dadc035aa0c121140dba0991ec6abdb786e18406
+    image: ghcr.io/trezor/trezor-user-env:ee7f945dc2cc47e0a5776f3f86dfe5b70455a725
     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 7d03b3d82fe..cdb62288499 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:dadc035aa0c121140dba0991ec6abdb786e18406
+    image: ghcr.io/trezor/trezor-user-env:ee7f945dc2cc47e0a5776f3f86dfe5b70455a725
     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 596412752d5..9dbd967f168 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:dadc035aa0c121140dba0991ec6abdb786e18406
+    image: ghcr.io/trezor/trezor-user-env:ee7f945dc2cc47e0a5776f3f86dfe5b70455a725
     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 e1a75ab8489..21dd40f2b68 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:dadc035aa0c121140dba0991ec6abdb786e18406
+    image: ghcr.io/trezor/trezor-user-env:ee7f945dc2cc47e0a5776f3f86dfe5b70455a725
     environment:
       - SDL_VIDEODRIVER=dummy
       - XDG_RUNTIME_DIR=/var/tmp
diff --git a/docker/docker-compose.suite-ci-pw.yml b/docker/docker-compose.suite-ci-pw.yml
index 37e8facf7d5..fbf8d1fa92d 100644
--- a/docker/docker-compose.suite-ci-pw.yml
+++ b/docker/docker-compose.suite-ci-pw.yml
@@ -1,7 +1,7 @@
 version: "3.9"
 services:
   trezor-user-env-unix:
-    image: ghcr.io/trezor/trezor-user-env:dadc035aa0c121140dba0991ec6abdb786e18406
+    image: ghcr.io/trezor/trezor-user-env:ee7f945dc2cc47e0a5776f3f86dfe5b70455a725
     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 37e8facf7d5..fbf8d1fa92d 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:dadc035aa0c121140dba0991ec6abdb786e18406
+    image: ghcr.io/trezor/trezor-user-env:ee7f945dc2cc47e0a5776f3f86dfe5b70455a725
     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 ef6dd0ec258..1d6d9eb71c4 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:dadc035aa0c121140dba0991ec6abdb786e18406
+    image: ghcr.io/trezor/trezor-user-env:ee7f945dc2cc47e0a5776f3f86dfe5b70455a725
     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 908672d6595..a11b135dbd0 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:dadc035aa0c121140dba0991ec6abdb786e18406
+    image: ghcr.io/trezor/trezor-user-env:ee7f945dc2cc47e0a5776f3f86dfe5b70455a725
     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 85070c09d0c..3c215f8a4d5 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:dadc035aa0c121140dba0991ec6abdb786e18406
+    image: ghcr.io/trezor/trezor-user-env:ee7f945dc2cc47e0a5776f3f86dfe5b70455a725
     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 ff4626f647a..80ee72fd3ba 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:dadc035aa0c121140dba0991ec6abdb786e18406
+    image: ghcr.io/trezor/trezor-user-env:ee7f945dc2cc47e0a5776f3f86dfe5b70455a725
     environment:
       - SDL_VIDEODRIVER=dummy
       - XDG_RUNTIME_DIR=/var/tmp
diff --git a/submodules/trezor-common b/submodules/trezor-common
index e8792ecc265..648fff95111 160000
--- a/submodules/trezor-common
+++ b/submodules/trezor-common
@@ -1 +1 @@
-Subproject commit e8792ecc2659d756798f38c85482238c8a9da942
+Subproject commit 648fff95111282683f25f9beed6308c8b3f712d4