diff --git a/lib/pages/chat/chat_app_bar_title.dart b/lib/pages/chat/chat_app_bar_title.dart
index 5a548b919..79a249bd9 100644
--- a/lib/pages/chat/chat_app_bar_title.dart
+++ b/lib/pages/chat/chat_app_bar_title.dart
@@ -23,7 +23,7 @@ class ChatAppBarTitle extends StatelessWidget {
       return Text(
         controller.selectedEvents.length.toString(),
         style: TextStyle(
-          color: Theme.of(context).colorScheme.tertiary,
+          color: Theme.of(context).colorScheme.onTertiaryContainer,
         ),
       );
     }
diff --git a/lib/pages/chat/chat_input_row.dart b/lib/pages/chat/chat_input_row.dart
index 7d5b92fee..3ec872e7a 100644
--- a/lib/pages/chat/chat_input_row.dart
+++ b/lib/pages/chat/chat_input_row.dart
@@ -37,6 +37,10 @@ class ChatInputRow extends StatelessWidget {
       );
     }
 
+    final selectedTextButtonStyle = TextButton.styleFrom(
+      foregroundColor: theme.colorScheme.onTertiaryContainer,
+    );
+
     return Row(
       crossAxisAlignment: CrossAxisAlignment.end,
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -63,6 +67,7 @@ class ChatInputRow extends StatelessWidget {
                 SizedBox(
                   height: height,
                   child: TextButton(
+                    style: selectedTextButtonStyle,
                     onPressed: controller.forwardEventsAction,
                     child: Row(
                       children: <Widget>[
@@ -80,6 +85,7 @@ class ChatInputRow extends StatelessWidget {
                       ? SizedBox(
                           height: height,
                           child: TextButton(
+                            style: selectedTextButtonStyle,
                             onPressed: controller.replyAction,
                             child: Row(
                               children: <Widget>[
@@ -92,6 +98,7 @@ class ChatInputRow extends StatelessWidget {
                       : SizedBox(
                           height: height,
                           child: TextButton(
+                            style: selectedTextButtonStyle,
                             onPressed: controller.sendAgainAction,
                             child: Row(
                               children: <Widget>[
diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index 0f00b72f9..4d24d1b58 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -3,6 +3,7 @@ import 'dart:ui' as ui;
 import 'package:flutter/material.dart';
 
 import 'package:badges/badges.dart';
+import 'package:desktop_drop/desktop_drop.dart';
 import 'package:go_router/go_router.dart';
 import 'package:matrix/matrix.dart';
 
@@ -193,15 +194,18 @@ class ChatView extends StatelessWidget {
                 actionsIconTheme: IconThemeData(
                   color: controller.selectedEvents.isEmpty
                       ? null
-                      : theme.colorScheme.tertiary,
+                      : theme.colorScheme.onTertiaryContainer,
                 ),
+                backgroundColor: controller.selectedEvents.isEmpty
+                    ? null
+                    : theme.colorScheme.tertiaryContainer,
                 automaticallyImplyLeading: false,
                 leading: controller.selectMode
                     ? IconButton(
                         icon: const Icon(Icons.close),
                         onPressed: controller.clearSelectedEvents,
                         tooltip: L10n.of(context).close,
-                        color: theme.colorScheme.tertiary,
+                        color: theme.colorScheme.onTertiaryContainer,
                       )
                     : FluffyThemes.isColumnMode(context)
                         ? null
@@ -297,12 +301,12 @@ class ChatView extends StatelessWidget {
                       ),
                     ),
                   SafeArea(
-                    child:
-                        // #Pangea
-                        Stack(
+                    // #Pangea
+                    // child: Column(
+                    child: Stack(
                       children: [
-                        // Pangea#
                         Column(
+                          // Pangea#
                           children: <Widget>[
                             Expanded(
                               child: GestureDetector(
@@ -335,7 +339,9 @@ class ChatView extends StatelessWidget {
                                 alignment: Alignment.center,
                                 child: Material(
                                   clipBehavior: Clip.hardEdge,
-                                  color: theme.colorScheme.surfaceContainerHigh,
+                                  color: controller.selectedEvents.isNotEmpty
+                                      ? theme.colorScheme.tertiaryContainer
+                                      : theme.colorScheme.surfaceContainerHigh,
                                   borderRadius: const BorderRadius.all(
                                     Radius.circular(24),
                                   ),