diff --git a/lib/pangea/widgets/chat/message_selection_overlay.dart b/lib/pangea/widgets/chat/message_selection_overlay.dart
index ea42c9854..f614bb4e2 100644
--- a/lib/pangea/widgets/chat/message_selection_overlay.dart
+++ b/lib/pangea/widgets/chat/message_selection_overlay.dart
@@ -550,7 +550,13 @@ class MessageOverlayController extends State<MessageSelectionOverlay>
                     messageOffset!.dy -
                     messageSize!.height -
                     belowMessageHeight,
-                child: overlayMessage,
+                child: Padding(
+                  padding: EdgeInsets.only(
+                    left: horizontalPadding,
+                    right: horizontalPadding,
+                  ),
+                  child: overlayMessage,
+                ),
               )
         : AnimatedBuilder(
             animation: _overlayPositionAnimation!,
@@ -564,39 +570,33 @@ class MessageOverlayController extends State<MessageSelectionOverlay>
             },
           );
 
-    return Padding(
-      padding: EdgeInsets.only(
-        left: horizontalPadding,
-        right: horizontalPadding,
-      ),
-      child: Stack(
-        children: [
-          positionedOverlayMessage,
-          Align(
-            alignment: Alignment.bottomCenter,
-            child: Row(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Expanded(
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      OverlayFooter(controller: widget.chatController),
-                    ],
-                  ),
+    return Stack(
+      children: [
+        positionedOverlayMessage,
+        Align(
+          alignment: Alignment.bottomCenter,
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Expanded(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    OverlayFooter(controller: widget.chatController),
+                  ],
                 ),
-                if (showDetails)
-                  const SizedBox(
-                    width: FluffyThemes.columnWidth,
-                  ),
-              ],
-            ),
-          ),
-          Material(
-            child: OverlayHeader(controller: widget.chatController),
+              ),
+              if (showDetails)
+                const SizedBox(
+                  width: FluffyThemes.columnWidth,
+                ),
+            ],
           ),
-        ],
-      ),
+        ),
+        Material(
+          child: OverlayHeader(controller: widget.chatController),
+        ),
+      ],
     );
   }
 }
diff --git a/lib/pangea/widgets/chat/overlay_header.dart b/lib/pangea/widgets/chat/overlay_header.dart
index cce47adcc..7588cea8a 100644
--- a/lib/pangea/widgets/chat/overlay_header.dart
+++ b/lib/pangea/widgets/chat/overlay_header.dart
@@ -1,7 +1,7 @@
 import 'package:fluffychat/pages/chat/chat.dart';
-import 'package:fluffychat/pages/chat/chat_app_bar_title.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:matrix/matrix.dart';
 
 class OverlayHeader extends StatelessWidget {
@@ -21,21 +21,12 @@ class OverlayHeader extends StatelessWidget {
           actionsIconTheme: IconThemeData(
             color: Theme.of(context).colorScheme.primary,
           ),
-          leading: IconButton(
-            icon: const Icon(Icons.close),
-            onPressed: controller.clearSelectedEvents,
-            tooltip: L10n.of(context)!.close,
-            color: Theme.of(context).colorScheme.primary,
-          ),
-          titleSpacing: 0,
-          title: ChatAppBarTitle(controller),
           actions: [
-            if (controller.canEditSelectedEvents)
-              IconButton(
-                icon: const Icon(Icons.edit_outlined),
-                tooltip: L10n.of(context)!.edit,
-                onPressed: controller.editSelectedEventAction,
-              ),
+            IconButton(
+              icon: const Icon(Symbols.forward),
+              tooltip: L10n.of(context)!.forward,
+              onPressed: controller.forwardEventsAction,
+            ),
             if (controller.selectedEvents.length == 1 &&
                 controller.selectedEvents.single.messageType ==
                     MessageTypes.Text)
@@ -44,27 +35,30 @@ class OverlayHeader extends StatelessWidget {
                 tooltip: L10n.of(context)!.copy,
                 onPressed: controller.copyEventsAction,
               ),
-            if (controller.canSaveSelectedEvent)
-              // Use builder context to correctly position the share dialog on iPad
-              Builder(
-                builder: (context) => IconButton(
-                  icon: Icon(Icons.adaptive.share),
-                  tooltip: L10n.of(context)!.share,
-                  onPressed: () => controller.saveSelectedEvent(context),
-                ),
-              ),
             if (controller.canPinSelectedEvents)
               IconButton(
                 icon: const Icon(Icons.push_pin_outlined),
                 onPressed: controller.pinEvent,
                 tooltip: L10n.of(context)!.pinMessage,
               ),
+            if (controller.canEditSelectedEvents)
+              IconButton(
+                icon: const Icon(Icons.edit_outlined),
+                tooltip: L10n.of(context)!.edit,
+                onPressed: controller.editSelectedEventAction,
+              ),
             if (controller.canRedactSelectedEvents)
               IconButton(
                 icon: const Icon(Icons.delete_outlined),
                 tooltip: L10n.of(context)!.redactMessage,
                 onPressed: controller.redactEventsAction,
               ),
+            if (controller.selectedEvents.length == 1)
+              IconButton(
+                icon: const Icon(Icons.shield_outlined),
+                tooltip: L10n.of(context)!.reportMessage,
+                onPressed: controller.reportEventAction,
+              ),
             if (controller.selectedEvents.length == 1)
               IconButton(
                 icon: const Icon(Icons.info_outlined),
@@ -74,12 +68,6 @@ class OverlayHeader extends StatelessWidget {
                   controller.clearSelectedEvents();
                 },
               ),
-            if (controller.selectedEvents.length == 1)
-              IconButton(
-                icon: const Icon(Icons.shield_outlined),
-                tooltip: L10n.of(context)!.reportMessage,
-                onPressed: controller.reportEventAction,
-              ),
           ],
         ),
       ],