diff --git a/src/pandroid/app/src/main/res/values/themes.xml b/src/pandroid/app/src/main/res/values/themes.xml
index 95e4afc8b..4411e5a96 100644
--- a/src/pandroid/app/src/main/res/values/themes.xml
+++ b/src/pandroid/app/src/main/res/values/themes.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
     <style name="Base.Theme.Pandroid" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your light theme here. -->
@@ -25,11 +25,10 @@
     </style>
 
 <style name="Theme.Pandroid" parent="Base.Theme.Pandroid">
-    <item name="android:enforceNavigationBarContrast">false</item>
-    <item name="android:navigationBarColor">@android:color/transparent</item>
-    <item name="android:windowTranslucentNavigation">false</item>
+    <item name="android:enforceNavigationBarContrast" tools:targetApi="o_mr1">false</item>
+    <item name="android:navigationBarColor" tools:targetApi="o_mr1">@android:color/transparent</item>
+    <item name="android:windowTranslucentNavigation" tools:targetApi="o_mr1">false</item>
     <item name="android:statusBarColor">?colorSurfaceVariant</item>
-
 </style>
 
 
@@ -61,7 +60,7 @@
         <item name="android:textColorPrimary">@color/text_secondary_light</item>
         <item name="android:textColorSecondary">@color/text_secondary_light</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
     </style>
 
     <style name="Theme.Pandroid.Black" parent="Theme.Pandroid.Custom">
@@ -80,7 +79,7 @@
         <item name="android:textColorPrimary">@color/text_secondary_light</item>
         <item name="android:textColorSecondary">@color/text_secondary_light</item>
         <item name="android:windowLightStatusBar">false</item>
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
     </style>
 
     <style name="Theme.Pandroid.Light" parent="Theme.Pandroid.Custom">
@@ -99,7 +98,7 @@
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:textColorPrimary">@color/text_secondary_dark</item>
         <item name="android:textColorSecondary">@color/text_secondary_dark</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
     </style>
 
 </resources>