diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_0_light.png
deleted file mode 100644
index 0bc41098cd2..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_0_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png
deleted file mode 100644
index 72ae32f32b4..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png
deleted file mode 100644
index 2259d3dbb11..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png
deleted file mode 100644
index 356f2fa727f..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png
deleted file mode 100644
index 4f69b279d99..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_0_light.png b/res/drawable-hdpi/ic_wifi_signal_0_light.png
deleted file mode 100644
index 99c493284bb..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_signal_0_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1_light.png b/res/drawable-hdpi/ic_wifi_signal_1_light.png
deleted file mode 100644
index 217b7ffac72..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_signal_1_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2_light.png b/res/drawable-hdpi/ic_wifi_signal_2_light.png
deleted file mode 100644
index a9927200409..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_signal_2_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3_light.png b/res/drawable-hdpi/ic_wifi_signal_3_light.png
deleted file mode 100644
index 8789d64f30a..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_signal_3_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4_light.png b/res/drawable-hdpi/ic_wifi_signal_4_light.png
deleted file mode 100644
index a8dcaaf79fa..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_signal_4_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_0_light.png
deleted file mode 100644
index df556143298..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_0_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png
deleted file mode 100644
index f18211a2dfa..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png
deleted file mode 100644
index ee212bc7563..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png
deleted file mode 100644
index 8ab15d98e57..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png
deleted file mode 100644
index 60a98332c10..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_0_light.png b/res/drawable-mdpi/ic_wifi_signal_0_light.png
deleted file mode 100644
index c9f97e9d229..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_signal_0_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1_light.png b/res/drawable-mdpi/ic_wifi_signal_1_light.png
deleted file mode 100644
index 1f80018b7f1..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_signal_1_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2_light.png b/res/drawable-mdpi/ic_wifi_signal_2_light.png
deleted file mode 100644
index 2b1ed627a6d..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_signal_2_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3_light.png b/res/drawable-mdpi/ic_wifi_signal_3_light.png
deleted file mode 100644
index ecbe438712c..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_signal_3_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4_light.png b/res/drawable-mdpi/ic_wifi_signal_4_light.png
deleted file mode 100644
index 48321977c35..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_signal_4_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_0_light.png
deleted file mode 100644
index b4bf6672d6e..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_0_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png
deleted file mode 100644
index 0328b639ee9..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png
deleted file mode 100644
index 5a64d46efd4..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png
deleted file mode 100644
index 5ce95e5eb62..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png
deleted file mode 100644
index 91bbbc2176b..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_0_light.png b/res/drawable-xhdpi/ic_wifi_signal_0_light.png
deleted file mode 100644
index c7cd1ee8dd5..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_signal_0_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_signal_1_light.png
deleted file mode 100644
index a3c1ce44c46..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_signal_1_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_signal_2_light.png
deleted file mode 100644
index 0c0a3d0975c..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_signal_2_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_signal_3_light.png
deleted file mode 100644
index 0ac41ce6c8b..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_signal_3_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_signal_4_light.png
deleted file mode 100644
index 58cf07a1d7b..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_signal_4_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_0_light.png
deleted file mode 100644
index 22e7f0fbc82..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_lock_signal_0_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png
deleted file mode 100644
index 526bd287e0d..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png
deleted file mode 100644
index 97a01f739de..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png
deleted file mode 100644
index 7c34d42556e..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png
deleted file mode 100644
index 60e39ff74af..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_0_light.png b/res/drawable-xxhdpi/ic_wifi_signal_0_light.png
deleted file mode 100644
index 678d3c49a39..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_signal_0_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_signal_1_light.png
deleted file mode 100644
index 698cee08f73..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_signal_1_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_signal_2_light.png
deleted file mode 100644
index 9ae3c7c2cf8..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_signal_2_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_signal_3_light.png
deleted file mode 100644
index 6b8ef69c6f5..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_signal_3_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_signal_4_light.png
deleted file mode 100644
index b9d0cf2ef0a..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_signal_4_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_dark.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_dark.png
index e1e0a117f4a..b9ab604fd3f 100644
Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_dark.png and b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_dark.png differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_light.png
deleted file mode 100644
index b9ab604fd3f..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_light.png
deleted file mode 100644
index f31dedf0675..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_light.png
deleted file mode 100644
index 81767419ff8..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_light.png
deleted file mode 100644
index 0c4741e2d33..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_light.png
deleted file mode 100644
index 68b0cb57df1..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_0_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_0_light.png
deleted file mode 100644
index 2e674393d47..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_signal_0_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_1_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_1_light.png
deleted file mode 100644
index 1b2b597a85c..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_signal_1_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_2_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_2_light.png
deleted file mode 100644
index 8474c5305b9..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_signal_2_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_3_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_3_light.png
deleted file mode 100644
index eb410812f8d..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_signal_3_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_4_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_4_light.png
deleted file mode 100644
index 62796af4c0c..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_signal_4_light.png and /dev/null differ
diff --git a/res/drawable/wifi_signal_light.xml b/res/drawable/wifi_signal_light.xml
deleted file mode 100644
index f1f74e3105a..00000000000
--- a/res/drawable/wifi_signal_light.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock_light" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open_light" />
-</selector>
-
diff --git a/res/drawable/wifi_signal_lock_light.xml b/res/drawable/wifi_signal_lock_light.xml
deleted file mode 100644
index bf2d3604c83..00000000000
--- a/res/drawable/wifi_signal_lock_light.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1_light" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2_light" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3_light" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4_light" />
-</level-list>
-
diff --git a/res/drawable/wifi_signal_open_light.xml b/res/drawable/wifi_signal_open_light.xml
deleted file mode 100644
index c54e9e93d78..00000000000
--- a/res/drawable/wifi_signal_open_light.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1_light" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2_light" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3_light" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4_light" />
-</level-list>
-