diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
index 00a77255..4a152feb 100644
--- a/app/src/main/res/values-night-v31/themes.xml
+++ b/app/src/main/res/values-night-v31/themes.xml
@@ -19,6 +19,10 @@
         <item name="colorOnSurface">@color/white</item>
         <item name="colorOnError">@color/white</item>
 
+        <!-- Navigation bar -->
+        <item name="android:navigationBarColor">?attr/colorSurface</item>
+        <item name="android:windowLightNavigationBar">?attr/isLightTheme</item>
+
         <item name="elevationOverlayEnabled">false</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml
new file mode 100644
index 00000000..bb741d7e
--- /dev/null
+++ b/app/src/main/res/values-v27/themes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Findroid" parent="Base.Theme.Findroid">
+        <!-- Navigation bar -->
+        <item name="android:navigationBarColor">?attr/colorSurface</item>
+        <item name="android:windowLightNavigationBar">?attr/isLightTheme</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index bcb44740..5c909153 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -6,5 +6,9 @@
         <item name="colorPrimaryVariant">@android:color/system_accent1_800</item>
         <item name="colorSecondary">@android:color/system_accent2_500</item>
         <item name="colorSecondaryVariant">@android:color/system_accent2_800</item>
+
+        <!-- Navigation bar -->
+        <item name="android:navigationBarColor">?attr/colorSurface</item>
+        <item name="android:windowLightNavigationBar">?attr/isLightTheme</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5b6bf1c5..597bb742 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -25,9 +25,6 @@
         <item name="android:statusBarColor">?attr/colorSurface</item>
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
 
-        <!-- Navigation bar -->
-        <item name="android:navigationBarColor">?attr/colorSurface</item>
-
         <!-- Shapes -->
         <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.Findroid.SmallComponent</item>
         <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.Findroid.MediumComponent</item>