diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 04a9e842b83..13408805080 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1992,7 +1992,7 @@
                   android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
                   android:windowSoftInputMode="stateVisible|adjustResize"
-                  android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
+                  android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
             <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/res/drawable-hdpi/ic_lockscreen_ime.png b/res/drawable-hdpi/ic_lockscreen_ime.png
deleted file mode 100644
index 70d35bf8e27..00000000000
Binary files a/res/drawable-hdpi/ic_lockscreen_ime.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_lockscreen_ime.png b/res/drawable-mdpi/ic_lockscreen_ime.png
deleted file mode 100644
index 3216776def0..00000000000
Binary files a/res/drawable-mdpi/ic_lockscreen_ime.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_ime.png b/res/drawable-xhdpi/ic_lockscreen_ime.png
deleted file mode 100644
index 02cc3afd776..00000000000
Binary files a/res/drawable-xhdpi/ic_lockscreen_ime.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_lockscreen_ime.png b/res/drawable-xxhdpi/ic_lockscreen_ime.png
deleted file mode 100644
index f23b0e78d27..00000000000
Binary files a/res/drawable-xxhdpi/ic_lockscreen_ime.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_lockscreen_ime.png b/res/drawable-xxxhdpi/ic_lockscreen_ime.png
deleted file mode 100644
index 2eb8a927644..00000000000
Binary files a/res/drawable-xxxhdpi/ic_lockscreen_ime.png and /dev/null differ