diff --git a/l10n/messages.pot b/l10n/messages.pot
index 07abe61b..666c12cc 100644
--- a/l10n/messages.pot
+++ b/l10n/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: seedsigner 0.8.5-rc1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-01-19 10:20-0600\n"
+"POT-Creation-Date: 2025-01-28 13:28-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -221,6 +221,11 @@ msgstr ""
 msgid "Classified Info!"
 msgstr ""
 
+#: src/seedsigner/gui/screens/screen.py src/seedsigner/views/scan_views.py
+#: src/seedsigner/views/view.py
+msgid "Error"
+msgstr ""
+
 #: src/seedsigner/gui/screens/screen.py
 msgid "Restarting"
 msgstr ""
@@ -506,7 +511,7 @@ msgid "Home"
 msgstr ""
 
 #: src/seedsigner/gui/screens/tools_screens.py
-msgid "click joystick"
+msgid "click a button"
 msgstr ""
 
 #. A prompt to the user to either accept or reshoot the image
@@ -943,23 +948,6 @@ msgstr ""
 msgid "Wrong QR Type"
 msgstr ""
 
-#: src/seedsigner/views/scan_views.py src/seedsigner/views/view.py
-msgid "Error"
-msgstr ""
-
-#: src/seedsigner/views/scan_views.py
-msgid "Unknown QR Type"
-msgstr ""
-
-#: src/seedsigner/views/scan_views.py
-msgid "QRCode is invalid or is a data format not yet supported."
-msgstr ""
-
-#: src/seedsigner/views/scan_views.py src/seedsigner/views/seed_views.py
-#: src/seedsigner/views/view.py
-msgid "Done"
-msgstr ""
-
 #: src/seedsigner/views/scan_views.py src/seedsigner/views/seed_views.py
 msgid "Scan PSBT"
 msgstr ""
@@ -992,6 +980,19 @@ msgstr ""
 msgid "Expected an address QR"
 msgstr ""
 
+#: src/seedsigner/views/scan_views.py
+msgid "Unknown QR Type"
+msgstr ""
+
+#: src/seedsigner/views/scan_views.py
+msgid "QRCode is invalid or is a data format not yet supported."
+msgstr ""
+
+#: src/seedsigner/views/scan_views.py src/seedsigner/views/seed_views.py
+#: src/seedsigner/views/view.py
+msgid "Done"
+msgstr ""
+
 #. This is on the opening splash screen, displayed above the HRF logo
 #: src/seedsigner/views/screensaver.py
 msgid "With support from:"
diff --git a/pyproject.toml b/pyproject.toml
index 84757b94..7f34e326 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,7 +13,7 @@ description = "Build an offline, airgapped Bitcoin signing device for less than
 name = "seedsigner"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "0.8.5-rc1"
+version = "0.8.5"
 
 [project.urls]
 "Bug Tracker" = "https://github.com/SeedSigner/seedsigner/issues"
diff --git a/seedsigner-screenshots b/seedsigner-screenshots
index f3139067..8e97151b 160000
--- a/seedsigner-screenshots
+++ b/seedsigner-screenshots
@@ -1 +1 @@
-Subproject commit f313906766347bbcc99a167d434d055407c34dd7
+Subproject commit 8e97151b7e0658dcffc02e7551e1606abcc572bf
diff --git a/src/seedsigner/controller.py b/src/seedsigner/controller.py
index 5d34fa29..7505408c 100644
--- a/src/seedsigner/controller.py
+++ b/src/seedsigner/controller.py
@@ -99,7 +99,7 @@ class Controller(Singleton):
         rather than at the top in order avoid circular imports.
     """
 
-    VERSION = "0.8.5-rc1"
+    VERSION = "0.8.5"
 
     # Declare class member vars with type hints to enable richer IDE support throughout
     # the code.
diff --git a/src/seedsigner/gui/screens/tools_screens.py b/src/seedsigner/gui/screens/tools_screens.py
index 0b291c01..8fab9a16 100644
--- a/src/seedsigner/gui/screens/tools_screens.py
+++ b/src/seedsigner/gui/screens/tools_screens.py
@@ -43,8 +43,8 @@ def _run(self):
                 time.sleep(0.01)
                 continue
 
-            # Check for joystick click to take final entropy image
-            if self.hw_inputs.check_for_low(HardwareButtonsConstants.KEY_PRESS):
+            # Check for ANYCLICK to take final entropy image
+            if self.hw_inputs.check_for_low(keys=HardwareButtonsConstants.KEYS__ANYCLICK):
                 # Have to manually update last input time since we're not in a wait_for loop
                 self.hw_inputs.update_last_input_time()
                 self.camera.stop_video_stream_mode()
@@ -77,7 +77,7 @@ def _run(self):
                         int(self.renderer.canvas_width/2),
                         self.renderer.canvas_height - GUIConstants.EDGE_PADDING
                     ),
-                    text="< " + _("back") + "  |  " + _("click joystick"),  # TODO: Render with UI elements instead of text
+                    text="< " + _("back") + "  |  " + _("click a button"),  # TODO: Render with UI elements instead of text
                     fill=GUIConstants.BODY_FONT_COLOR,
                     font=instructions_font,
                     stroke_width=4,
@@ -123,7 +123,8 @@ def _run(self):
             )
             self.renderer.show_image()
 
-        input = self.hw_inputs.wait_for([HardwareButtonsConstants.KEY_LEFT, HardwareButtonsConstants.KEY_RIGHT])
+        # LEFT = reshoot, RIGHT / ANYCLICK = accept
+        input = self.hw_inputs.wait_for([HardwareButtonsConstants.KEY_LEFT, HardwareButtonsConstants.KEY_RIGHT] + HardwareButtonsConstants.KEYS__ANYCLICK)
         if input == HardwareButtonsConstants.KEY_LEFT:
             return RET_CODE__BACK_BUTTON
 
diff --git a/src/seedsigner/resources/seedsigner-translations b/src/seedsigner/resources/seedsigner-translations
index 281a3dab..10ee02ae 160000
--- a/src/seedsigner/resources/seedsigner-translations
+++ b/src/seedsigner/resources/seedsigner-translations
@@ -1 +1 @@
-Subproject commit 281a3dab8304ab17eef57fb6b1a7170ae53c204b
+Subproject commit 10ee02ae23156ab97600a407b2da66b84e89d29d