diff --git a/mobile/src/main/res/values-night/bools.xml b/mobile/src/main/res/values-night/bools.xml
new file mode 100644
index 00000000..be80a8de
--- /dev/null
+++ b/mobile/src/main/res/values-night/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="is_day">false</bool>
+</resources>
diff --git a/mobile/src/main/res/values-night/colors.xml b/mobile/src/main/res/values-night/colors.xml
index 5af275c7..4f30ef87 100644
--- a/mobile/src/main/res/values-night/colors.xml
+++ b/mobile/src/main/res/values-night/colors.xml
@@ -3,4 +3,6 @@
     <color name="colorPrimary">#2e7d32</color>
     <color name="colorPrimaryDark">#005005</color>
     <color name="colorSecondary">#AEEA00</color>
+    <!-- This actually takes precedence over v27: https://developer.android.com/guide/topics/resources/providing-resources.html#BestMatch -->
+    <color name="navigationBarColor">@android:color/black</color>
 </resources>
diff --git a/mobile/src/main/res/values-night/styles.xml b/mobile/src/main/res/values-night/styles.xml
deleted file mode 100644
index 30c39d2d..00000000
--- a/mobile/src/main/res/values-night/styles.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.MaterialComponents.DayNight.NoActionBar" parent="Theme.MaterialComponents.NoActionBar"/>
-</resources>
diff --git a/mobile/src/main/res/values/bools.xml b/mobile/src/main/res/values/bools.xml
index 86a4cdf3..bfcb1477 100644
--- a/mobile/src/main/res/values/bools.xml
+++ b/mobile/src/main/res/values/bools.xml
@@ -2,4 +2,5 @@
 <resources>
     <bool name="api_ge_26">false</bool>
     <bool name="api_lt_25">true</bool>
+    <bool name="is_day">true</bool>
 </resources>
diff --git a/mobile/src/main/res/values/styles.xml b/mobile/src/main/res/values/styles.xml
index 3a9273fc..516802ef 100644
--- a/mobile/src/main/res/values/styles.xml
+++ b/mobile/src/main/res/values/styles.xml
@@ -1,11 +1,8 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.MaterialComponents.DayNight.NoActionBar" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <item name="android:navigationBarColor">@color/navigationBarColor</item>
-        <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
-    </style>
-
     <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="android:navigationBarColor">@color/navigationBarColor</item>
+        <item name="android:windowLightNavigationBar" tools:ignore="NewApi">@bool/is_day</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorSecondary">@color/colorSecondary</item>