diff --git a/Habitica/res/values-night-v30/colors.xml b/Habitica/res/values-night-v30/colors.xml
new file mode 100644
index 000000000..b33a17daa
--- /dev/null
+++ b/Habitica/res/values-night-v30/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="system_bars">@color/transparent</color>
+</resources>
diff --git a/Habitica/res/values-v30/colors.xml b/Habitica/res/values-v30/colors.xml
new file mode 100644
index 000000000..b33a17daa
--- /dev/null
+++ b/Habitica/res/values-v30/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="system_bars">@color/transparent</color>
+</resources>
diff --git a/Habitica/res/values-v30/values.xml b/Habitica/res/values-v30/values.xml
new file mode 100644
index 000000000..1c0e099bb
--- /dev/null
+++ b/Habitica/res/values-v30/values.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="edge_to_edge">true</bool>
+</resources>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 77007e147..c0ba51079 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -58,9 +58,9 @@
         <item name="alertDialogTheme">@style/AlertDialogTheme</item>
         <item name="android:windowTranslucentStatus">false</item>
 
-        <item name="android:statusBarColor">@color/transparent</item>
-        <item name="android:navigationBarColor">@color/transparent</item>
-        <item name="enableEdgeToEdge">true</item>
+        <item name="android:statusBarColor">@color/system_bars</item>
+        <item name="android:navigationBarColor">@color/system_bars</item>
+        <item name="enableEdgeToEdge">@bool/edge_to_edge</item>
 
         <item name="searchViewStyle">@style/SearchViewStyle</item>
         <item name="toolbarContentColor">@color/text_primary</item>
diff --git a/Habitica/res/values/values.xml b/Habitica/res/values/values.xml
index a542a4ebc..8b121cc01 100644
--- a/Habitica/res/values/values.xml
+++ b/Habitica/res/values/values.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <bool name="edge_to_edge">true</bool>
+
     <string-array name="repeatables_frequencies">
         <item>@string/repeatables_frequency_daily</item>
         <item>@string/repeatables_frequency_weekly</item>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/WindowInsetsCompatExtensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/WindowInsetsCompatExtensions.kt
index 24894f244..d75d889d2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/WindowInsetsCompatExtensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/WindowInsetsCompatExtensions.kt
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.extensions
 
 import android.os.Build
 import android.view.View
+import android.view.WindowInsets
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
@@ -11,6 +12,11 @@ fun consumeWindowInsetsAbove30(insets: WindowInsetsCompat): WindowInsetsCompat {
     return insets
 }
 
+fun consumeWindowInsetsAbove30(insets: WindowInsets?): WindowInsets? {
+    if (Build.VERSION.SDK_INT >= 30) return WindowInsets.CONSUMED
+    return insets
+}
+
 fun applyScrollContentWindowInsets(view: View,
                                    applyTop: Boolean = false,
                                    applyBottom: Boolean = true,
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
index fb7633d14..befde2482 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
@@ -102,7 +102,9 @@ abstract class BaseActivity : AppCompatActivity() {
     internal var navigationBarStyle: SystemBarStyle? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge(navigationBarStyle = navigationBarStyle ?: defaultNavigationBarStyle)
+        if (resources.getBoolean(R.bool.edge_to_edge)) {
+            enableEdgeToEdge(navigationBarStyle = navigationBarStyle ?: defaultNavigationBarStyle)
+        }
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
         val languageHelper = LanguageHelper(sharedPreferences.getString("language", "en"))
         resources.forceLocale(this, languageHelper.locale)
@@ -116,7 +118,6 @@ abstract class BaseActivity : AppCompatActivity() {
         loadTheme(sharedPreferences)
 
         super.onCreate(savedInstanceState)
-        WindowCompat.setDecorFitsSystemWindows(window, false)
 
         habiticaApplication
         getLayoutResId()?.let {