diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index aa2b78d4d..63704f953 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -1080,6 +1080,9 @@ class ChatController extends State<ChatPageWithRoom>
 
   void forwardEventsAction() async {
     if (selectedEvents.length == 1) {
+      // #Pangea
+      MatrixState.pAnyState.closeOverlay();
+      // Pangea#
       Matrix.of(context).shareContent =
           selectedEvents.first.getDisplayEvent(timeline!).content;
     } else {
@@ -1111,6 +1114,7 @@ class ChatController extends State<ChatPageWithRoom>
       replyEvent = replyTo ?? selectedEvents.first;
       selectedEvents.clear();
     });
+    MatrixState.pAnyState.closeOverlay();
     inputFocus.requestFocus();
   }
 
diff --git a/lib/pages/image_viewer/image_viewer.dart b/lib/pages/image_viewer/image_viewer.dart
index 94ab19dd4..f7d3ea544 100644
--- a/lib/pages/image_viewer/image_viewer.dart
+++ b/lib/pages/image_viewer/image_viewer.dart
@@ -1,11 +1,10 @@
+import 'package:fluffychat/pages/image_viewer/image_viewer_view.dart';
+import 'package:fluffychat/utils/platform_infos.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
-
 import 'package:go_router/go_router.dart';
 import 'package:matrix/matrix.dart';
 
-import 'package:fluffychat/pages/image_viewer/image_viewer_view.dart';
-import 'package:fluffychat/utils/platform_infos.dart';
-import 'package:fluffychat/widgets/matrix.dart';
 import '../../utils/matrix_sdk_extensions/event_extension.dart';
 
 class ImageViewer extends StatefulWidget {
diff --git a/lib/pangea/widgets/chat/message_toolbar.dart b/lib/pangea/widgets/chat/message_toolbar.dart
index c798e01f9..bac8e58eb 100644
--- a/lib/pangea/widgets/chat/message_toolbar.dart
+++ b/lib/pangea/widgets/chat/message_toolbar.dart
@@ -126,7 +126,7 @@ class ToolbarDisplayController {
       transformTargetId: targetId,
       targetAnchor: Alignment.center,
       followerAnchor: Alignment.center,
-      backgroundColor: const Color.fromRGBO(0, 0, 0, 1).withAlpha(100),
+      backgroundColor: const Color.fromRGBO(0, 0, 0, 1).withAlpha(200),
       closePrevOverlay:
           MatrixState.pangeaController.subscriptionController.isSubscribed,
       targetScreen: true,
diff --git a/lib/pangea/widgets/chat/overlay_footer.dart b/lib/pangea/widgets/chat/overlay_footer.dart
index c886bc54d..a571155ab 100644
--- a/lib/pangea/widgets/chat/overlay_footer.dart
+++ b/lib/pangea/widgets/chat/overlay_footer.dart
@@ -47,7 +47,7 @@ class OverlayFooter extends StatelessWidget {
             ReplyDisplay(controller),
             ChatInputRow(controller),
             SizedBox(
-              height: (FluffyThemes.isColumnMode(context) ? 16.0 : 8.0),
+              height: (FluffyThemes.isColumnMode(context) ? 18.0 : 10.0),
             ),
           ],
         ),
diff --git a/lib/pangea/widgets/chat/overlay_header.dart b/lib/pangea/widgets/chat/overlay_header.dart
index 3bac468c1..f6b686c6b 100644
--- a/lib/pangea/widgets/chat/overlay_header.dart
+++ b/lib/pangea/widgets/chat/overlay_header.dart
@@ -20,6 +20,7 @@ class OverlayHeader extends StatelessWidget {
     final Event selectedEvent = controller.selectedEvents.single;
 
     return AppBar(
+      backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest,
       actionsIconTheme: IconThemeData(
         color: Theme.of(context).colorScheme.primary,
       ),