diff --git a/lib/features/chat/views/chat_page.dart b/lib/features/chat/views/chat_page.dart
index f9e5f56..8ed8a88 100644
--- a/lib/features/chat/views/chat_page.dart
+++ b/lib/features/chat/views/chat_page.dart
@@ -2129,11 +2129,9 @@ class _ChatPageState extends ConsumerState<ChatPage> {
 
                       // Floating Scroll to Bottom Button with smooth appear/disappear
                       Positioned(
-                        bottom:
-                            ((_inputHeight > 0)
-                                ? _inputHeight
-                                : (Spacing.xxl + Spacing.xxxl)) +
-                            Spacing.sm,
+                        bottom: (_inputHeight > 0)
+                            ? _inputHeight
+                            : (Spacing.xxl + Spacing.xxxl),
                         left: 0,
                         right: 0,
                         child: AnimatedSwitcher(
diff --git a/lib/shared/theme/app_theme.dart b/lib/shared/theme/app_theme.dart
index d7f9684..ccd8877 100644
--- a/lib/shared/theme/app_theme.dart
+++ b/lib/shared/theme/app_theme.dart
@@ -2,6 +2,7 @@ import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'theme_extensions.dart';
 import 'tweakcn_themes.dart';
@@ -115,6 +116,13 @@ class AppTheme {
         elevation: Elevation.none,
         backgroundColor: surfaces.background,
         foregroundColor: tokens.neutralOnSurface,
+        systemOverlayStyle: SystemUiOverlayStyle(
+          statusBarBrightness: brightness,
+          statusBarIconBrightness: isDark ? Brightness.light : Brightness.dark,
+          systemNavigationBarIconBrightness: isDark
+              ? Brightness.light
+              : Brightness.dark,
+        ),
       ),
       bottomSheetTheme: BottomSheetThemeData(
         backgroundColor: surfaces.card,