diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..f2fb620
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
+# Checklist
+<!-- Put an `x` in each box when you have completed the items. -->
+- [ ] App update process has been followed <!-- See comment below -->
+- [ ] Target branch is `develop` <!-- unless you have a very good reason -->
+- [ ] Application version has been bumped <!-- required if your changes are to be deployed -->
+
+<!-- Make sure you followed the process described in https://developers.ledger.com/docs/device-app/deliver/maintenance before opening your Pull Request.
+Don't hesitate to contact us directly on Discord if you have any questions ! https://developers.ledger.com/discord -->
diff --git a/Makefile b/Makefile
index a5aab00..89d973c 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ APP_LOAD_PARAMS += $(COMMON_LOAD_PARAMS)
 
 APPVERSION_M=1
 APPVERSION_N=3
-APPVERSION_P=1
+APPVERSION_P=2
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 
 ifeq ($(TARGET_NAME),TARGET_NANOS)
diff --git a/glyphs/stax_id_64px.gif b/glyphs/stax_id_64px.gif
index 37da047..9f2ebd0 100644
Binary files a/glyphs/stax_id_64px.gif and b/glyphs/stax_id_64px.gif differ
diff --git a/icons/stax_id_32px.gif b/icons/stax_id_32px.gif
index 6687dd0..f5a80b0 100644
Binary files a/icons/stax_id_32px.gif and b/icons/stax_id_32px.gif differ
diff --git a/ledger_app.toml b/ledger_app.toml
new file mode 100644
index 0000000..20a7198
--- /dev/null
+++ b/ledger_app.toml
@@ -0,0 +1,8 @@
+[app]
+build_directory = "./"
+sdk = "C"
+devices = ["nanos", "nanox", "nanos+", "stax"]
+
+[tests]
+unit_directory = "./tests/unit-tests/"
+pytest_directory = "./tests/speculos/"
diff --git a/src/config.c b/src/config.c
index 0f957c0..66c35e0 100644
--- a/src/config.c
+++ b/src/config.c
@@ -22,8 +22,6 @@
 #include "config.h"
 #include "globals.h"
 
-#define RNG_MODULO 5
-
 config_t const N_u2f_real;
 
 static void derive_and_store_keys(void) {
@@ -33,7 +31,6 @@ static void derive_and_store_keys(void) {
     keyPath[0] = PRIVATE_KEY_PATH;
 
     // privateHmacKey
-    keyPath[0] = PRIVATE_KEY_PATH;
     os_perso_derive_node_bip32(CX_CURVE_SECP256R1, keyPath, 1, key, key + 32);
     if (memcmp(key, (uint8_t *) N_u2f.privateHmacKey, sizeof(N_u2f.privateHmacKey)) == 0) {
         // Keys are already initialized with the proper seed and resetGeneration
diff --git a/src/ui_shared.c b/src/ui_shared.c
index b4763de..acc0068 100644
--- a/src/ui_shared.c
+++ b/src/ui_shared.c
@@ -83,7 +83,7 @@ static void ui_menu_about() {
 void ui_idle(void) {
     nbgl_useCaseHome(APPNAME,
                      &C_stax_id_64px,
-                     "Ready to authenticate",
+                     "This app enables using\nyour Ledger device for\nTwo Factor Authentication.",
                      false,
                      ui_menu_about,
                      app_quit);
diff --git a/tests/speculos/client.py b/tests/speculos/client.py
index 1d3f01e..087f64d 100644
--- a/tests/speculos/client.py
+++ b/tests/speculos/client.py
@@ -49,15 +49,12 @@ class LedgerCtapHidConnection(CtapHidConnection):
     to speculos raw socket.
     """
     def __init__(self, transport, debug=False):
-        self.sock = socket.create_connection(('127.0.0.1', 9999))
+        self.sock = socket.create_connection(('127.0.0.1', 5001))
         self.u2f_hid_endpoint = (transport.upper() == "U2F")
         self.debug = debug
 
-        if self.u2f_hid_endpoint:
-            # Device answers should be fast
-            self.sock.settimeout(1)
-        else:
-            self.sock.settimeout(10)
+        # Set a timeout to allow tests to raise on socket rx failure
+        self.sock.settimeout(5)
 
     def write_packet(self, packet):
         packet = bytes(packet)
diff --git a/tests/speculos/conftest.py b/tests/speculos/conftest.py
index 9c1817a..314fd0e 100644
--- a/tests/speculos/conftest.py
+++ b/tests/speculos/conftest.py
@@ -50,7 +50,7 @@ def prepare_speculos_args(root_pytest_dir: Path, firmware: Firmware, display: bo
     if display:
         speculos_args += ["--display", "qt"]
 
-    device = firmware.device
+    device = firmware.name
     if device == "nanosp":
         device = "nanos2"
 
diff --git a/tests/speculos/ctap1_client.py b/tests/speculos/ctap1_client.py
index 114eb08..a34c812 100644
--- a/tests/speculos/ctap1_client.py
+++ b/tests/speculos/ctap1_client.py
@@ -58,8 +58,8 @@ def confirm(self):
         self.navigator.navigate(instructions,
                                 screen_change_after_last_instruction=False)
 
-    def wait_for_return_on_dashboard(self):
-        if self.model == "stax":
+    def wait_for_return_on_dashboard(self, dismiss=False):
+        if dismiss and self.model == "stax":
             # On Stax tap on the center to dismiss the status message faster
             self.navigator.navigate([NavInsID.USE_CASE_STATUS_DISMISS],
                                     screen_change_before_first_instruction=True)
@@ -161,11 +161,11 @@ def register(self, client_param, app_param, user_accept=True,
                 response = self.parse_response(response)
             else:
                 if user_accept is not None:
-                    self.wait_for_return_on_dashboard()
+                    self.wait_for_return_on_dashboard(dismiss=True)
                 raise e
 
         if user_accept is not None:
-            self.wait_for_return_on_dashboard()
+            self.wait_for_return_on_dashboard(dismiss=True)
 
         return RegistrationData(response)
 
@@ -243,10 +243,10 @@ def authenticate(self, client_param, app_param, key_handle,
                 response = self.parse_response(response)
             else:
                 if user_accept is not None:
-                    self.wait_for_return_on_dashboard()
+                    self.wait_for_return_on_dashboard(dismiss=True)
                 raise e
 
         if user_accept is not None:
-            self.wait_for_return_on_dashboard()
+            self.wait_for_return_on_dashboard(dismiss=True)
 
         return SignatureData(response)
diff --git a/tests/speculos/requirements.txt b/tests/speculos/requirements.txt
index bda766c..f46a987 100644
--- a/tests/speculos/requirements.txt
+++ b/tests/speculos/requirements.txt
@@ -1,3 +1,4 @@
 ragger[tests,speculos]>=1.7.0
 pytest>=6.1.1,<7.0.0
+cryptography>=3.3.1,<4.0.0
 fido2==1.0.0
diff --git a/tests/speculos/setup.cfg b/tests/speculos/setup.cfg
index 91e651e..53b753e 100644
--- a/tests/speculos/setup.cfg
+++ b/tests/speculos/setup.cfg
@@ -1,8 +1,15 @@
 [flake8]
-ignore = C0114,  # missing-module-docstring
-         C0115,  # missing-class-docstring
-         C0116,  # missing-function-docstring
-         C0103,  # invalid-name
-         R0801,  # duplicate-code
-         R0913,  # too-many-arguments
+ignore =
+         # missing-module-docstring
+         C114,
+         # missing-class-docstring
+         C115,
+         # missing-function-docstring
+         C116,
+         # invalid-name
+         C103,
+         # duplicate-code
+         R801,
+         # too-many-arguments
+         R913,
 max-line-length = 100
diff --git a/tests/speculos/snapshots/nanos/test_u2f_screens_idle/00001.png b/tests/speculos/snapshots/nanos/test_u2f_screens_idle/00001.png
index 86e59b2..04ba7ef 100644
Binary files a/tests/speculos/snapshots/nanos/test_u2f_screens_idle/00001.png and b/tests/speculos/snapshots/nanos/test_u2f_screens_idle/00001.png differ
diff --git a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/25_Slush Pool/00000.png b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/25_Slush Pool/00000.png
index f736aeb..0ae7d6d 100644
Binary files a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/25_Slush Pool/00000.png and b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/25_Slush Pool/00000.png differ
diff --git a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/25_Slush Pool/00004.png b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/25_Slush Pool/00004.png
index f736aeb..0ae7d6d 100644
Binary files a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/25_Slush Pool/00004.png and b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/25_Slush Pool/00004.png differ
diff --git a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/26_Stripe/00000.png b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/26_Stripe/00000.png
index 0bcbcd7..c1a02b8 100644
Binary files a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/26_Stripe/00000.png and b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/26_Stripe/00000.png differ
diff --git a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/26_Stripe/00004.png b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/26_Stripe/00004.png
index 0bcbcd7..c1a02b8 100644
Binary files a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/26_Stripe/00004.png and b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/log/26_Stripe/00004.png differ
diff --git a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00000.png b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00000.png
index c5246fd..8039224 100644
Binary files a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00000.png and b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00000.png differ
diff --git a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00004.png b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00004.png
index c5246fd..8039224 100644
Binary files a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00004.png and b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00004.png differ
diff --git a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/26_Stripe/00000.png b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/26_Stripe/00000.png
index 4ebae92..77c5ef6 100644
Binary files a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/26_Stripe/00000.png and b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/26_Stripe/00000.png differ
diff --git a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/26_Stripe/00004.png b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/26_Stripe/00004.png
index 4ebae92..77c5ef6 100644
Binary files a/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/26_Stripe/00004.png and b/tests/speculos/snapshots/nanosp/test_u2f_screens_fido_known_list/reg/26_Stripe/00004.png differ
diff --git a/tests/speculos/snapshots/nanosp/test_u2f_screens_idle/00001.png b/tests/speculos/snapshots/nanosp/test_u2f_screens_idle/00001.png
index c9d7fae..2dae2b0 100644
Binary files a/tests/speculos/snapshots/nanosp/test_u2f_screens_idle/00001.png and b/tests/speculos/snapshots/nanosp/test_u2f_screens_idle/00001.png differ
diff --git a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/25_Slush Pool/00000.png b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/25_Slush Pool/00000.png
index f736aeb..0ae7d6d 100644
Binary files a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/25_Slush Pool/00000.png and b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/25_Slush Pool/00000.png differ
diff --git a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/25_Slush Pool/00004.png b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/25_Slush Pool/00004.png
index f736aeb..0ae7d6d 100644
Binary files a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/25_Slush Pool/00004.png and b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/25_Slush Pool/00004.png differ
diff --git a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/26_Stripe/00000.png b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/26_Stripe/00000.png
index 0bcbcd7..c1a02b8 100644
Binary files a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/26_Stripe/00000.png and b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/26_Stripe/00000.png differ
diff --git a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/26_Stripe/00004.png b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/26_Stripe/00004.png
index 0bcbcd7..c1a02b8 100644
Binary files a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/26_Stripe/00004.png and b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/log/26_Stripe/00004.png differ
diff --git a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00000.png b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00000.png
index c5246fd..8039224 100644
Binary files a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00000.png and b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00000.png differ
diff --git a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00004.png b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00004.png
index c5246fd..8039224 100644
Binary files a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00004.png and b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00004.png differ
diff --git a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/26_Stripe/00000.png b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/26_Stripe/00000.png
index 4ebae92..77c5ef6 100644
Binary files a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/26_Stripe/00000.png and b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/26_Stripe/00000.png differ
diff --git a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/26_Stripe/00004.png b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/26_Stripe/00004.png
index 4ebae92..77c5ef6 100644
Binary files a/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/26_Stripe/00004.png and b/tests/speculos/snapshots/nanox/test_u2f_screens_fido_known_list/reg/26_Stripe/00004.png differ
diff --git a/tests/speculos/snapshots/nanox/test_u2f_screens_idle/00001.png b/tests/speculos/snapshots/nanox/test_u2f_screens_idle/00001.png
index c9d7fae..2dae2b0 100644
Binary files a/tests/speculos/snapshots/nanox/test_u2f_screens_idle/00001.png and b/tests/speculos/snapshots/nanox/test_u2f_screens_idle/00001.png differ
diff --git a/tests/speculos/snapshots/stax/test_authenticate_ok/00000.png b/tests/speculos/snapshots/stax/test_authenticate_ok/00000.png
index 203e727..1d0c5fb 100644
Binary files a/tests/speculos/snapshots/stax/test_authenticate_ok/00000.png and b/tests/speculos/snapshots/stax/test_authenticate_ok/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_authenticate_user_refused/00000.png b/tests/speculos/snapshots/stax/test_authenticate_user_refused/00000.png
index 203e727..1d0c5fb 100644
Binary files a/tests/speculos/snapshots/stax/test_authenticate_user_refused/00000.png and b/tests/speculos/snapshots/stax/test_authenticate_user_refused/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_register_ok/00000.png b/tests/speculos/snapshots/stax/test_register_ok/00000.png
index ef54208..9f0d7ad 100644
Binary files a/tests/speculos/snapshots/stax/test_register_ok/00000.png and b/tests/speculos/snapshots/stax/test_register_ok/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_register_user_refused/00000.png b/tests/speculos/snapshots/stax/test_register_user_refused/00000.png
index ef54208..9f0d7ad 100644
Binary files a/tests/speculos/snapshots/stax/test_register_user_refused/00000.png and b/tests/speculos/snapshots/stax/test_register_user_refused/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/0_Apple/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/0_Apple/00000.png
index 9ce66e4..299975f 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/0_Apple/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/0_Apple/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/10_Dropbox/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/10_Dropbox/00000.png
index d959a98..4ed93ab 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/10_Dropbox/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/10_Dropbox/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/11_Duo/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/11_Duo/00000.png
index d9232f3..6c21210 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/11_Duo/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/11_Duo/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/12_Facebook/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/12_Facebook/00000.png
index 099ecc7..774d3b0 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/12_Facebook/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/12_Facebook/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/13_FastMail/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/13_FastMail/00000.png
index 8d049fb..5dfe6f6 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/13_FastMail/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/13_FastMail/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/14_Fedora/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/14_Fedora/00000.png
index d827ede..2b2ee43 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/14_Fedora/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/14_Fedora/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/15_Gandi/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/15_Gandi/00000.png
index b419ee3..f314224 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/15_Gandi/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/15_Gandi/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/16_Github/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/16_Github/00000.png
index a497e01..5b3ff78 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/16_Github/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/16_Github/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/17_GitHub/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/17_GitHub/00000.png
index 1a17f7e..d33126d 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/17_GitHub/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/17_GitHub/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/18_GitLab/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/18_GitLab/00000.png
index 5f55151..fc58087 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/18_GitLab/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/18_GitLab/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/19_Google/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/19_Google/00000.png
index e9b7787..b2ac1ce 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/19_Google/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/19_Google/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/1_Amazon/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/1_Amazon/00000.png
index 8f869d6..78b9bdf 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/1_Amazon/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/1_Amazon/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/20_Google/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/20_Google/00000.png
index f48e118..16295de 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/20_Google/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/20_Google/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/21_Keeper/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/21_Keeper/00000.png
index b467b8d..65681c5 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/21_Keeper/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/21_Keeper/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/22_Kraken/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/22_Kraken/00000.png
index 480e58f..e5a1b3d 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/22_Kraken/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/22_Kraken/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/23_LastPass/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/23_LastPass/00000.png
index e9f4620..5c7fe3e 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/23_LastPass/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/23_LastPass/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/24_Microsoft/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/24_Microsoft/00000.png
index d7fed81..55a27ab 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/24_Microsoft/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/24_Microsoft/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/25_Slush Pool/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/25_Slush Pool/00000.png
index c48dea7..5daa3b4 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/25_Slush Pool/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/25_Slush Pool/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/26_Stripe/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/26_Stripe/00000.png
index 7ac3743..c621b0c 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/26_Stripe/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/26_Stripe/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/27_u2f.bin.coffee/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/27_u2f.bin.coffee/00000.png
index 355c5f0..dd325c2 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/27_u2f.bin.coffee/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/27_u2f.bin.coffee/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/28_webauthn.bin.coffee/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/28_webauthn.bin.coffee/00000.png
index 73a387e..8217a7f 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/28_webauthn.bin.coffee/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/28_webauthn.bin.coffee/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/29_WebAuthn.io/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/29_WebAuthn.io/00000.png
index b882b82..d6b5424 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/29_WebAuthn.io/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/29_WebAuthn.io/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/2_Binance/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/2_Binance/00000.png
index 4d2a946..a07536e 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/2_Binance/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/2_Binance/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/30_WebAuthn.me/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/30_WebAuthn.me/00000.png
index 4cb4acf..84015df 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/30_WebAuthn.me/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/30_WebAuthn.me/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/31_demo.yubico.com/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/31_demo.yubico.com/00000.png
index cd7071a..495c618 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/31_demo.yubico.com/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/31_demo.yubico.com/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/3_Binance/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/3_Binance/00000.png
index e247f9a..40a1d19 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/3_Binance/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/3_Binance/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/4_Bitbucket/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/4_Bitbucket/00000.png
index 240624b..2c89be7 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/4_Bitbucket/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/4_Bitbucket/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/5_Bitfinex/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/5_Bitfinex/00000.png
index 3d508b9..575a970 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/5_Bitfinex/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/5_Bitfinex/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/6_Bitwarden/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/6_Bitwarden/00000.png
index 35d5f92..c7540ce 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/6_Bitwarden/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/6_Bitwarden/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/7_Coinbase/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/7_Coinbase/00000.png
index b835f7f..5a19533 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/7_Coinbase/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/7_Coinbase/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/8_Dashlane/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/8_Dashlane/00000.png
index 074f9d6..19ff9e9 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/8_Dashlane/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/8_Dashlane/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/9_Dropbox/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/9_Dropbox/00000.png
index 4033356..243fa73 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/9_Dropbox/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/log/9_Dropbox/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/0_Apple/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/0_Apple/00000.png
index 0598cc4..2e93aa1 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/0_Apple/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/0_Apple/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/10_Dropbox/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/10_Dropbox/00000.png
index 435e75d..bfdd724 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/10_Dropbox/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/10_Dropbox/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/11_Duo/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/11_Duo/00000.png
index 9a76785..4965971 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/11_Duo/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/11_Duo/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/12_Facebook/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/12_Facebook/00000.png
index f359347..40fa03c 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/12_Facebook/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/12_Facebook/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/13_FastMail/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/13_FastMail/00000.png
index 288d342..318baf7 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/13_FastMail/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/13_FastMail/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/14_Fedora/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/14_Fedora/00000.png
index f0d4d9f..b01223a 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/14_Fedora/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/14_Fedora/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/15_Gandi/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/15_Gandi/00000.png
index ca2f016..3161623 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/15_Gandi/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/15_Gandi/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/16_Github/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/16_Github/00000.png
index 4f1a585..07c2f90 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/16_Github/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/16_Github/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/17_GitHub/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/17_GitHub/00000.png
index 79ec410..ca199ce 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/17_GitHub/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/17_GitHub/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/18_GitLab/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/18_GitLab/00000.png
index 0309f2b..842e70e 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/18_GitLab/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/18_GitLab/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/19_Google/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/19_Google/00000.png
index b995bac..19d4594 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/19_Google/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/19_Google/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/1_Amazon/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/1_Amazon/00000.png
index c35f9ca..3aa1750 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/1_Amazon/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/1_Amazon/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/20_Google/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/20_Google/00000.png
index 38a49a0..bde8b68 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/20_Google/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/20_Google/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/21_Keeper/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/21_Keeper/00000.png
index d34ef84..1b0948e 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/21_Keeper/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/21_Keeper/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/22_Kraken/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/22_Kraken/00000.png
index c3688e5..881af0b 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/22_Kraken/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/22_Kraken/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/23_LastPass/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/23_LastPass/00000.png
index 89ab146..e71d324 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/23_LastPass/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/23_LastPass/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/24_Microsoft/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/24_Microsoft/00000.png
index e7576df..c792a47 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/24_Microsoft/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/24_Microsoft/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00000.png
index bd78e29..8890964 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/25_Slush Pool/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/26_Stripe/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/26_Stripe/00000.png
index a3859fd..5997996 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/26_Stripe/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/26_Stripe/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/27_u2f.bin.coffee/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/27_u2f.bin.coffee/00000.png
index 7e16035..1a4571d 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/27_u2f.bin.coffee/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/27_u2f.bin.coffee/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/28_webauthn.bin.coffee/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/28_webauthn.bin.coffee/00000.png
index b39553c..dcf3388 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/28_webauthn.bin.coffee/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/28_webauthn.bin.coffee/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/29_WebAuthn.io/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/29_WebAuthn.io/00000.png
index 3aeeb67..d457a97 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/29_WebAuthn.io/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/29_WebAuthn.io/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/2_Binance/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/2_Binance/00000.png
index 7ecbede..918b977 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/2_Binance/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/2_Binance/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/30_WebAuthn.me/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/30_WebAuthn.me/00000.png
index fd7c643..a6ab5b9 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/30_WebAuthn.me/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/30_WebAuthn.me/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/31_demo.yubico.com/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/31_demo.yubico.com/00000.png
index b783ab5..e4eaeab 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/31_demo.yubico.com/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/31_demo.yubico.com/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/3_Binance/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/3_Binance/00000.png
index 9b586c6..d11baa9 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/3_Binance/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/3_Binance/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/4_Bitbucket/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/4_Bitbucket/00000.png
index aee607a..963aa0b 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/4_Bitbucket/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/4_Bitbucket/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/5_Bitfinex/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/5_Bitfinex/00000.png
index 6210a26..995d6ff 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/5_Bitfinex/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/5_Bitfinex/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/6_Bitwarden/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/6_Bitwarden/00000.png
index bda4e64..c5bebde 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/6_Bitwarden/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/6_Bitwarden/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/7_Coinbase/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/7_Coinbase/00000.png
index 40110d2..8dbddee 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/7_Coinbase/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/7_Coinbase/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/8_Dashlane/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/8_Dashlane/00000.png
index abf5f7b..9aff738 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/8_Dashlane/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/8_Dashlane/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/9_Dropbox/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/9_Dropbox/00000.png
index fd73dd4..5f2c797 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/9_Dropbox/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_fido_known_list/reg/9_Dropbox/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_idle/00000.png b/tests/speculos/snapshots/stax/test_u2f_screens_idle/00000.png
index ee6344d..67726f2 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_idle/00000.png and b/tests/speculos/snapshots/stax/test_u2f_screens_idle/00000.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_idle/00001.png b/tests/speculos/snapshots/stax/test_u2f_screens_idle/00001.png
index 927c0be..4dd0238 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_idle/00001.png and b/tests/speculos/snapshots/stax/test_u2f_screens_idle/00001.png differ
diff --git a/tests/speculos/snapshots/stax/test_u2f_screens_idle/00002.png b/tests/speculos/snapshots/stax/test_u2f_screens_idle/00002.png
index ee6344d..67726f2 100644
Binary files a/tests/speculos/snapshots/stax/test_u2f_screens_idle/00002.png and b/tests/speculos/snapshots/stax/test_u2f_screens_idle/00002.png differ
diff --git a/tests/speculos/u2f/test_authenticate_cmd.py b/tests/speculos/u2f/test_authenticate_cmd.py
index abadbf3..6f222c7 100644
--- a/tests/speculos/u2f/test_authenticate_cmd.py
+++ b/tests/speculos/u2f/test_authenticate_cmd.py
@@ -1,7 +1,6 @@
 import cryptography
 import pytest
 import struct
-import time
 
 from fido2.ctap1 import Ctap1, ApduError, SignatureData
 from fido2.hid import CTAPHID
@@ -127,7 +126,7 @@ def test_authenticate_with_reboot_ok(client):
 
 def test_authenticate_multiple_ok(client):
     registrations = []
-    for _ in range(10):
+    for _ in range(5):
         app_param, registration_data = register(client)
         registrations.append((app_param, registration_data))
 
@@ -145,7 +144,7 @@ def test_authenticate_counter_increment(client):
     app_param, registration_data = register(client)
 
     prev = 0
-    for _ in range(10):
+    for _ in range(5):
         challenge = generate_random_bytes(32)
 
         authentication_data = client.ctap1.authenticate(challenge,
@@ -324,11 +323,6 @@ def test_authenticate_raw(client):
             # On U2F endpoint, the device should return APDU.SW_CONDITIONS_NOT_SATISFIED
             # until user validate.
             for i in range(5):
-
-                if client.model == "stax":
-                    # Patch issue with more time needed on Stax on CI or slow computers
-                    time.sleep(0.5)
-
                 client.ctap1.send_apdu_nowait(ins=Ctap1.INS.AUTHENTICATE,
                                               p1=p1, data=data)
 
diff --git a/tests/speculos/u2f/test_register_cmd.py b/tests/speculos/u2f/test_register_cmd.py
index df791f2..8dd4b2f 100644
--- a/tests/speculos/u2f/test_register_cmd.py
+++ b/tests/speculos/u2f/test_register_cmd.py
@@ -1,6 +1,5 @@
 import pytest
 import socket
-import time
 
 from cryptography.x509 import load_der_x509_certificate
 
@@ -85,7 +84,7 @@ def test_register_duplicate(client):
 
 
 def test_register_multiple_ok(client):
-    for i in range(10):
+    for _ in range(5):
         challenge = generate_random_bytes(32)
         app_param = generate_random_bytes(32)
 
@@ -153,11 +152,6 @@ def test_register_raw(client):
     # On U2F endpoint, the device should return APDU.SW_CONDITIONS_NOT_SATISFIED
     # until user validate.
     for i in range(5):
-
-        if client.model == "stax":
-            # Patch issue with more time needed on Stax on CI or slow computers
-            time.sleep(0.5)
-
         client.ctap1.send_apdu_nowait(cla=0x00,
                                       ins=Ctap1.INS.REGISTER,
                                       p1=0x00,
@@ -244,6 +238,10 @@ def test_register_raw_u2f_fake_channel_security_crc(client):
                                       screen_change_after_last_instruction=False)
 
         # App should then recover and allow new requests
+        client.ctap1.wait_for_return_on_dashboard()
+
+        challenge = bytearray(generate_random_bytes(32))
+        app_param = generate_random_bytes(32)
         registration_data = client.ctap1.register(challenge, app_param)
         registration_data.verify(app_param, challenge)
 
@@ -294,6 +292,10 @@ def test_register_raw_u2f_fake_channel_security_length(client):
                                   screen_change_after_last_instruction=False)
 
     # App should then recover and allow new requests
+    client.ctap1.wait_for_return_on_dashboard()
+
+    challenge = generate_random_bytes(32)
+    app_param = generate_random_bytes(32)
     registration_data = client.ctap1.register(challenge, app_param)
     registration_data.verify(app_param, challenge)