diff --git a/android/app/src/main/res/values-v27/styles.xml b/android/app/src/main/res/values-v27/styles.xml
new file mode 100644
index 00000000..39ca7516
--- /dev/null
+++ b/android/app/src/main/res/values-v27/styles.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="LaunchTheme" parent="LaunchThemeBase">
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-v29/styles.xml b/android/app/src/main/res/values-v29/styles.xml
index 55cd3519..b3e48202 100644
--- a/android/app/src/main/res/values-v29/styles.xml
+++ b/android/app/src/main/res/values-v29/styles.xml
@@ -2,10 +2,11 @@
 <resources>
 
     <style name="LaunchTheme" parent="LaunchThemeBase">
+        <item name="android:windowLightNavigationBar">false</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
-    <style name="NormalTheme" parent="Theme.MaterialComponents.DayNight">
+    <style name="NormalTheme" parent="BaseTheme">
         <item name="android:defaultFocusHighlightEnabled">false</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
new file mode 100644
index 00000000..98ddf193
--- /dev/null
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="LaunchTheme" parent="LaunchThemeBase">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowSplashScreenBackground">@color/yubico_green</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index fc3caf32..6b00fca2 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
-    <style name="LaunchThemeBase" parent="Theme.MaterialComponents.DayNight">
+    <style name="BaseTheme" parent="Theme.MaterialComponents.DayNight">
         <item name="colorPrimary">@color/yubico_green</item>
         <item name="colorPrimaryVariant">@color/yubico_green</item>
         <item name="colorPrimaryDark">@color/yubico_green</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+    </style>
+
+    <style name="LaunchThemeBase" parent="BaseTheme">
         <item name="android:windowBackground">@drawable/launch_background</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowLightNavigationBar" tools:targetApi="27">false</item>
         <item name="android:fitsSystemWindows">false</item>
     </style>
 
@@ -16,9 +19,8 @@
         <item name="android:navigationBarColor">@color/yubico_green</item>
     </style>
 
-    <style name="NormalTheme" parent="Theme.MaterialComponents.DayNight">
+    <style name="NormalTheme" parent="BaseTheme">
         <item name="android:windowBackground">?android:colorBackground</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
     </style>
 
     <style name="NdefActivityTheme" parent="NormalTheme">