diff --git a/tests/snapshots/stax/test_swap_exact_eth_for_token/00000.png b/tests/snapshots/stax/test_swap_exact_eth_for_token/00000.png
index 4c7af8db..defe9213 100644
Binary files a/tests/snapshots/stax/test_swap_exact_eth_for_token/00000.png and b/tests/snapshots/stax/test_swap_exact_eth_for_token/00000.png differ
diff --git a/tests/snapshots/stax/test_swap_exact_eth_for_token/00001.png b/tests/snapshots/stax/test_swap_exact_eth_for_token/00001.png
index 4b49ec2b..62104ee6 100644
Binary files a/tests/snapshots/stax/test_swap_exact_eth_for_token/00001.png and b/tests/snapshots/stax/test_swap_exact_eth_for_token/00001.png differ
diff --git a/tests/snapshots/stax/test_swap_exact_eth_for_token/00002.png b/tests/snapshots/stax/test_swap_exact_eth_for_token/00002.png
index d8fb2022..856f63ab 100644
Binary files a/tests/snapshots/stax/test_swap_exact_eth_for_token/00002.png and b/tests/snapshots/stax/test_swap_exact_eth_for_token/00002.png differ
diff --git a/tests/snapshots/stax/test_swap_exact_eth_for_token/00003.png b/tests/snapshots/stax/test_swap_exact_eth_for_token/00003.png
index 6b0f8de0..392165d4 100644
Binary files a/tests/snapshots/stax/test_swap_exact_eth_for_token/00003.png and b/tests/snapshots/stax/test_swap_exact_eth_for_token/00003.png differ
diff --git a/tests/snapshots/stax/test_swap_exact_eth_for_token/00004.png b/tests/snapshots/stax/test_swap_exact_eth_for_token/00004.png
index 2ba6d27d..339db1b4 100644
Binary files a/tests/snapshots/stax/test_swap_exact_eth_for_token/00004.png and b/tests/snapshots/stax/test_swap_exact_eth_for_token/00004.png differ
diff --git a/tests/test_swap.py b/tests/test_swap.py
index 439ef667..d4cf09c2 100644
--- a/tests/test_swap.py
+++ b/tests/test_swap.py
@@ -61,14 +61,14 @@ def test_swap_exact_eth_for_token(backend, firmware, navigator, test_name, walle
     # send the transaction
     with client.sign(DERIVATION_PATH, tx_params):
         # Validate the on-screen request by performing the navigation appropriate for this device
-        if firmware.device.startswith("nano"):
+        if firmware.is_nano:
             navigator.navigate_until_text_and_compare(NavInsID.RIGHT_CLICK,
                                                       [NavInsID.BOTH_CLICK],
                                                       "Accept",
                                                       ROOT_SCREENSHOT_PATH,
                                                       test_name)
         else:
-            navigator.navigate_until_text_and_compare(NavInsID.USE_CASE_REVIEW_TAP,
+            navigator.navigate_until_text_and_compare(NavInsID.SWIPE_CENTER_TO_LEFT,
                                                       [NavInsID.USE_CASE_REVIEW_CONFIRM,
                                                        NavInsID.USE_CASE_STATUS_DISMISS],
                                                       "Hold to sign",