diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
index 440f5d15e..bd4238c96 100644
--- a/assets/l10n/intl_en.arb
+++ b/assets/l10n/intl_en.arb
@@ -2820,5 +2820,6 @@
   "pleaseFillOut": "Please fill out",
   "invalidUrl": "Invalid url",
   "addLink": "Add link",
-  "unableToJoinChat": "Unable to join chat. Maybe the other party has already closed the conversation."
+  "unableToJoinChat": "Unable to join chat. Maybe the other party has already closed the conversation.",
+  "previous": "Previous"
 }
diff --git a/lib/pages/image_viewer/image_viewer_view.dart b/lib/pages/image_viewer/image_viewer_view.dart
index 5d1ed2fa8..c96b16b0b 100644
--- a/lib/pages/image_viewer/image_viewer_view.dart
+++ b/lib/pages/image_viewer/image_viewer_view.dart
@@ -57,9 +57,7 @@ class ImageViewerView extends StatelessWidget {
                 padding: const EdgeInsets.only(right: 8.0),
                 child: Builder(
                   builder: (context) => IconButton(
-                    style: IconButton.styleFrom(
-                      backgroundColor: Colors.black.withAlpha(128),
-                    ),
+                    style: iconButtonStyle,
                     onPressed: () => controller.shareFileAction(context),
                     tooltip: L10n.of(context).share,
                     color: Colors.white,
@@ -82,12 +80,16 @@ class ImageViewerView extends StatelessWidget {
                   child: Center(
                     child: Hero(
                       tag: controller.allEvents[i].eventId,
-                      child: MxcImage(
-                        key: ValueKey(controller.allEvents[i].eventId),
-                        event: controller.allEvents[i],
-                        fit: BoxFit.contain,
-                        isThumbnail: false,
-                        animated: true,
+                      child: GestureDetector(
+                        // Ignore taps to not go back here:
+                        onTap: () {},
+                        child: MxcImage(
+                          key: ValueKey(controller.allEvents[i].eventId),
+                          event: controller.allEvents[i],
+                          fit: BoxFit.contain,
+                          isThumbnail: false,
+                          animated: true,
+                        ),
                       ),
                     ),
                   ),
@@ -100,6 +102,7 @@ class ImageViewerView extends StatelessWidget {
                     padding: const EdgeInsets.all(12.0),
                     child: IconButton(
                       style: iconButtonStyle,
+                      tooltip: L10n.of(context).previous,
                       icon: const Icon(Icons.chevron_left_outlined),
                       onPressed: () => controller.pageController.previousPage(
                         duration: FluffyThemes.animationDuration,
@@ -115,6 +118,7 @@ class ImageViewerView extends StatelessWidget {
                     padding: const EdgeInsets.all(12.0),
                     child: IconButton(
                       style: iconButtonStyle,
+                      tooltip: L10n.of(context).next,
                       icon: const Icon(Icons.chevron_right_outlined),
                       onPressed: () => controller.pageController.nextPage(
                         duration: FluffyThemes.animationDuration,