diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 85910aa4..aa06d92c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -124,7 +124,7 @@
         </receiver>
         <activity android:name=".opp.BluetoothOppLauncherActivity"
             android:process="@string/process"
-            android:theme="@android:style/Theme.Material.Light.Dialog"
+            android:theme="@android:style/Theme.Material.DayNight.Dialog"
             android:label="@string/bt_share_picker_label"
             android:enabled="@bool/profile_supported_opp">
             <intent-filter>
@@ -164,30 +164,30 @@
         <activity android:name=".opp.BluetoothOppBtEnableActivity"
                   android:process="@string/process"
                   android:excludeFromRecents="true"
-                  android:theme="@android:style/Theme.Material.Light.Dialog.Alert"
+                  android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"
                   android:enabled="@bool/profile_supported_opp">
         </activity>
         <activity android:name=".opp.BluetoothOppBtErrorActivity"
                   android:process="@string/process"
                   android:excludeFromRecents="true"
-                  android:theme="@android:style/Theme.Material.Light.Dialog.Alert">
+                  android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert">
         </activity>
         <activity android:name=".opp.BluetoothOppBtEnablingActivity"
                   android:process="@string/process"
                   android:excludeFromRecents="true"
-                  android:theme="@android:style/Theme.Material.Light.Dialog.Alert"
+                  android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"
                   android:enabled="@bool/profile_supported_opp">
         </activity>
         <activity android:name=".opp.BluetoothOppIncomingFileConfirmActivity"
                   android:process="@string/process"
                   android:excludeFromRecents="true"
-                  android:theme="@android:style/Theme.Material.Light.Dialog.Alert"
+                  android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"
                   android:enabled="@bool/profile_supported_opp">
         </activity>
         <activity android:name=".opp.BluetoothOppTransferActivity"
                   android:process="@string/process"
                   android:excludeFromRecents="true"
-                  android:theme="@android:style/Theme.Material.Light.Dialog.Alert"
+                  android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"
                   android:enabled="@bool/profile_supported_opp">
         </activity>
         <activity android:name=".opp.BluetoothOppTransferHistory"
@@ -200,7 +200,7 @@
         <activity android:name=".pbap.BluetoothPbapActivity"
             android:process="@string/process"
             android:excludeFromRecents="true"
-            android:theme="@android:style/Theme.Material.Light.Dialog.Alert"
+            android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert"
             android:enabled="@bool/profile_supported_pbap">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/AndroidManifest_test.xml b/AndroidManifest_test.xml
index ae21b887..638484cb 100644
--- a/AndroidManifest_test.xml
+++ b/AndroidManifest_test.xml
@@ -46,7 +46,7 @@
         </receiver>
         <activity android:name=".opp.BluetoothOppLauncherActivity"
             android:process="@string/process"
-            android:theme="@android:style/Theme.Material.Light.Dialog"
+            android:theme="@android:style/Theme.Material.DayNight.Dialog"
             android:label="@string/bt_share_picker_label">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -76,7 +76,7 @@
         </activity>
         <activity android:name=".opp.BluetoothOppBtEnablingActivity"
             android:process="@string/process"
-            android:theme="@android:style/Theme.Material.Light.Dialog">
+            android:theme="@android:style/Theme.Material.DayNight.Dialog">
         </activity>
         <activity android:name=".opp.BluetoothOppIncomingFileConfirmActivity"
             android:process="@string/process">
@@ -87,7 +87,7 @@
         <activity android:name=".pbap.BluetoothPbapActivity"
             android:process="@string/process"
             android:label=" "
-            android:theme="@android:style/Theme.Material.Light.Dialog.Alert">
+            android:theme="@android:style/Theme.Material.DayNight.Dialog.Alert">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>