diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart
index 02bffdec..8c93fac4 100644
--- a/lib/pages/chat_list/chat_list_view.dart
+++ b/lib/pages/chat_list/chat_list_view.dart
@@ -113,7 +113,9 @@ class ChatListView extends StatelessWidget {
                     ),
                   )
                 : null,
-            bottomNavigationBar: const ConnectionStatusHeader(),
+            bottomNavigationBar: const SafeArea(
+              child: ConnectionStatusHeader(),
+            ),
           ),
         );
       },
diff --git a/lib/pages/new_private_chat/new_private_chat_view.dart b/lib/pages/new_private_chat/new_private_chat_view.dart
index 519fe96e..671dfc65 100644
--- a/lib/pages/new_private_chat/new_private_chat_view.dart
+++ b/lib/pages/new_private_chat/new_private_chat_view.dart
@@ -48,8 +48,10 @@ class NewPrivateChatView extends StatelessWidget {
                 borderRadius: BorderRadius.circular(12),
                 child: Material(
                   borderRadius: BorderRadius.circular(12),
-                  elevation: 4,
+                  elevation: 6,
                   color: Colors.white,
+                  shadowColor: const Color(0x44000000),
+                  clipBehavior: Clip.hardEdge,
                   child: Column(
                     mainAxisSize: MainAxisSize.min,
                     children: [
diff --git a/lib/widgets/connection_status_header.dart b/lib/widgets/connection_status_header.dart
index 4d44e7d9..3ff19bc4 100644
--- a/lib/widgets/connection_status_header.dart
+++ b/lib/widgets/connection_status_header.dart
@@ -50,7 +50,7 @@ class _ConnectionStatusHeaderState extends State<ConnectionStatusHeader> {
       curve: Curves.bounceInOut,
       height: hide ? 0 : 36,
       clipBehavior: Clip.hardEdge,
-      decoration: BoxDecoration(color: Theme.of(context).secondaryHeaderColor),
+      decoration: BoxDecoration(color: Theme.of(context).colorScheme.surface),
       padding: const EdgeInsets.symmetric(horizontal: 12),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.center,
@@ -68,6 +68,7 @@ class _ConnectionStatusHeaderState extends State<ConnectionStatusHeader> {
             _status.toLocalizedString(context),
             maxLines: 1,
             overflow: TextOverflow.ellipsis,
+            style: TextStyle(color: Theme.of(context).colorScheme.onSurface),
           ),
         ],
       ),