diff --git a/lib/config/themes.dart b/lib/config/themes.dart
index 3235dbbc..a9ccee32 100644
--- a/lib/config/themes.dart
+++ b/lib/config/themes.dart
@@ -99,7 +99,6 @@ abstract class FluffyThemes {
     appBarTheme: AppBarTheme(
       brightness: Brightness.light,
       color: Colors.white,
-      systemOverlayStyle: SystemUiOverlayStyle.dark,
       textTheme: TextTheme(
         headline6: TextStyle(
           color: Colors.black,
@@ -178,7 +177,6 @@ abstract class FluffyThemes {
     appBarTheme: AppBarTheme(
       brightness: Brightness.dark,
       color: Color(0xff1D1D1D),
-      systemOverlayStyle: SystemUiOverlayStyle.light,
       textTheme: TextTheme(
         headline6: TextStyle(
           color: Colors.white,
diff --git a/lib/main.dart b/lib/main.dart
index 5720b5e2..a03ea399 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -80,9 +80,14 @@ class FluffyChatApp extends StatelessWidget {
           builder: (context) {
             WidgetsBinding.instance.addPostFrameCallback((_) {
               SystemChrome.setSystemUIOverlayStyle(
-                Theme.of(context).brightness == Brightness.light
-                    ? SystemUiOverlayStyle.light
-                    : SystemUiOverlayStyle.dark,
+                SystemUiOverlayStyle(
+                  statusBarColor: Colors.transparent,
+                  systemNavigationBarColor: Theme.of(context).backgroundColor,
+                  systemNavigationBarIconBrightness:
+                      Theme.of(context).brightness == Brightness.light
+                          ? Brightness.dark
+                          : Brightness.light,
+                ),
               );
             });
             return Matrix(
diff --git a/lib/views/ui/settings_3pid_ui.dart b/lib/views/ui/settings_3pid_ui.dart
index e935bcd5..70c90524 100644
--- a/lib/views/ui/settings_3pid_ui.dart
+++ b/lib/views/ui/settings_3pid_ui.dart
@@ -12,8 +12,7 @@ class Settings3PidUI extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    controller.request ??=
-        Matrix.of(context).client.getAccount3PIDs();
+    controller.request ??= Matrix.of(context).client.getAccount3PIDs();
     return Scaffold(
       appBar: AppBar(
         leading: BackButton(),