diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_0_teal.png
deleted file mode 100644
index d0c9b304579..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_0_teal.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_teal.png
deleted file mode 100644
index 0bef891976a..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_1_teal.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_teal.png
deleted file mode 100644
index 9252d90f1dd..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_2_teal.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_teal.png
deleted file mode 100644
index a758ad47b82..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_3_teal.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_teal.png
deleted file mode 100644
index 8378399f9c1..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_4_teal.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_0_teal.png b/res/drawable-hdpi/ic_wifi_signal_0_teal.png
deleted file mode 100644
index 3030279d93f..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_signal_0_teal.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1_teal.png b/res/drawable-hdpi/ic_wifi_signal_1_teal.png
deleted file mode 100644
index 3340d958fbd..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_signal_1_teal.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2_teal.png b/res/drawable-hdpi/ic_wifi_signal_2_teal.png
deleted file mode 100644
index 180f7b1d573..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_signal_2_teal.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3_teal.png b/res/drawable-hdpi/ic_wifi_signal_3_teal.png
deleted file mode 100644
index af27fb0c583..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_signal_3_teal.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4_teal.png b/res/drawable-hdpi/ic_wifi_signal_4_teal.png
deleted file mode 100644
index 5c82e8bcbf1..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_signal_4_teal.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_0_teal.png
deleted file mode 100644
index d746c1e2d00..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_0_teal.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_teal.png
deleted file mode 100644
index 01f6f875019..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_1_teal.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_teal.png
deleted file mode 100644
index 230b1a36cfe..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_2_teal.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_teal.png
deleted file mode 100644
index 20fe9a5de7f..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_3_teal.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_teal.png
deleted file mode 100644
index 938a2039c91..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_4_teal.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_0_teal.png b/res/drawable-mdpi/ic_wifi_signal_0_teal.png
deleted file mode 100644
index 9dcdf91f4ec..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_signal_0_teal.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1_teal.png b/res/drawable-mdpi/ic_wifi_signal_1_teal.png
deleted file mode 100644
index b58d5f46e0e..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_signal_1_teal.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2_teal.png b/res/drawable-mdpi/ic_wifi_signal_2_teal.png
deleted file mode 100644
index 5cbb5a322c2..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_signal_2_teal.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3_teal.png b/res/drawable-mdpi/ic_wifi_signal_3_teal.png
deleted file mode 100644
index cec46b0a35c..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_signal_3_teal.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4_teal.png b/res/drawable-mdpi/ic_wifi_signal_4_teal.png
deleted file mode 100644
index 6b81932f482..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_signal_4_teal.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_0_teal.png
deleted file mode 100644
index 8d99e313bb9..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_0_teal.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_teal.png
deleted file mode 100644
index da282b6783c..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_1_teal.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_teal.png
deleted file mode 100644
index b6a378f79e2..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_2_teal.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_teal.png
deleted file mode 100644
index 7227b0868e1..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_3_teal.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_teal.png
deleted file mode 100644
index 92257c3281d..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_4_teal.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_0_teal.png b/res/drawable-xhdpi/ic_wifi_signal_0_teal.png
deleted file mode 100644
index 08aba96767a..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_signal_0_teal.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_teal.png b/res/drawable-xhdpi/ic_wifi_signal_1_teal.png
deleted file mode 100644
index 8d282c9fb98..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_signal_1_teal.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_teal.png b/res/drawable-xhdpi/ic_wifi_signal_2_teal.png
deleted file mode 100644
index 6caedf93650..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_signal_2_teal.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_teal.png b/res/drawable-xhdpi/ic_wifi_signal_3_teal.png
deleted file mode 100644
index 799c9e33486..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_signal_3_teal.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_teal.png b/res/drawable-xhdpi/ic_wifi_signal_4_teal.png
deleted file mode 100644
index ad6a98ec41d..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_signal_4_teal.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_0_teal.png
deleted file mode 100644
index 544c0412ad3..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_lock_signal_0_teal.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_teal.png
deleted file mode 100644
index ac0cb625dc6..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_teal.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_teal.png
deleted file mode 100644
index beb6e12cb89..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_teal.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_teal.png
deleted file mode 100644
index 3eaaf39e828..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_teal.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_teal.png
deleted file mode 100644
index 8b6bfb1d9a0..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_teal.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_0_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_0_teal.png
deleted file mode 100644
index f28f0ad3039..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_signal_0_teal.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_1_teal.png
deleted file mode 100644
index 1728dc72014..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_signal_1_teal.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_2_teal.png
deleted file mode 100644
index e7e4788c46d..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_signal_2_teal.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_3_teal.png
deleted file mode 100644
index c2967ed93d1..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_signal_3_teal.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_4_teal.png
deleted file mode 100644
index 3058e988e82..00000000000
Binary files a/res/drawable-xxhdpi/ic_wifi_signal_4_teal.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_teal.png
deleted file mode 100644
index 74c9c31cc92..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_teal.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_teal.png
deleted file mode 100644
index dab15c41c7a..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_teal.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_teal.png
deleted file mode 100644
index 66a7736cadf..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_teal.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_teal.png
deleted file mode 100644
index d23cf22d6fa..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_teal.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_teal.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_teal.png
deleted file mode 100644
index 83e49882f43..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_teal.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_0_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_0_teal.png
deleted file mode 100644
index 3dc5cbe1518..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_signal_0_teal.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_1_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_1_teal.png
deleted file mode 100644
index d80ac48fb05..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_signal_1_teal.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_2_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_2_teal.png
deleted file mode 100644
index 4fdd825b95f..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_signal_2_teal.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_3_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_3_teal.png
deleted file mode 100644
index e1cbcb83cd7..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_signal_3_teal.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_4_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_4_teal.png
deleted file mode 100644
index bcc423370a8..00000000000
Binary files a/res/drawable-xxxhdpi/ic_wifi_signal_4_teal.png and /dev/null differ
diff --git a/res/drawable/ic_wifi_signal_0.xml b/res/drawable/ic_wifi_signal_0.xml
new file mode 100644
index 00000000000..388816140c3
--- /dev/null
+++ b/res/drawable/ic_wifi_signal_0.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+</vector>
diff --git a/res/drawable/ic_wifi_signal_1.xml b/res/drawable/ic_wifi_signal_1.xml
new file mode 100644
index 00000000000..e0a207266d1
--- /dev/null
+++ b/res/drawable/ic_wifi_signal_1.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.1,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.5,6.5L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0z"/>
+    <path
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.1,22.0l5.5,-6.8c-0.2,-0.2 -2.3,-1.9 -5.5,-1.9s-5.3,1.8 -5.5,1.9L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0L13.1,22.0z"/>
+</vector>
diff --git a/res/drawable/ic_wifi_signal_2.xml b/res/drawable/ic_wifi_signal_2.xml
new file mode 100644
index 00000000000..d0daa603604
--- /dev/null
+++ b/res/drawable/ic_wifi_signal_2.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+    <path
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.0,22.0l7.6,-9.4C20.3,12.4 17.4,10.0 13.0,10.0s-7.3,2.4 -7.6,2.7L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+</vector>
diff --git a/res/drawable/ic_wifi_signal_3.xml b/res/drawable/ic_wifi_signal_3.xml
new file mode 100644
index 00000000000..c542c69c520
--- /dev/null
+++ b/res/drawable/ic_wifi_signal_3.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.3"
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+    <path
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.0,22.0l9.2,-11.4c-0.4,-0.3 -3.9,-3.2 -9.2,-3.2s-8.9,3.0 -9.2,3.2L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+</vector>
diff --git a/res/drawable/ic_wifi_signal_4.xml b/res/drawable/ic_wifi_signal_4.xml
new file mode 100644
index 00000000000..bb7dbd04b29
--- /dev/null
+++ b/res/drawable/ic_wifi_signal_4.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?attr/wifi_signal_color"
+        android:pathData="M13.0,22.0L25.6,6.5C25.1,6.1 20.3,2.1 13.0,2.1S0.9,6.1 0.4,6.5L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0L13.0,22.0z"/>
+</vector>
diff --git a/res/drawable/ic_wifi_signal_lock.xml b/res/drawable/ic_wifi_signal_lock.xml
new file mode 100644
index 00000000000..b94f06c1d4e
--- /dev/null
+++ b/res/drawable/ic_wifi_signal_lock.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+    <group
+        android:translateX="52.0"
+        android:translateY="42.0">
+        <path
+            android:fillColor="?attr/wifi_signal_color"
+            android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.76 -2.24,-5.0 -5.0,-5.0S7.0,3.24 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.0 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-6.0,9.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0 2.0,0.9 2.0,2.0 -0.9,2.0 -2.0,2.0zm3.1,-9.0L8.9,8.0L8.9,6.0c0.0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0.0 3.1,1.39 3.1,3.1l0.0,2.0z"/>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/wifi_signal.xml b/res/drawable/wifi_signal.xml
new file mode 100644
index 00000000000..78540755a24
--- /dev/null
+++ b/res/drawable/wifi_signal.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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">
+        <layer-list>
+            <item>
+                <level-list>
+                    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1" />
+                    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2" />
+                    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3" />
+                    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4" />
+                </level-list>
+            </item>
+            <item android:drawable="@drawable/ic_wifi_signal_lock" />
+        </layer-list>
+    </item>
+    <item settings:state_encrypted="false">
+        <level-list>
+            <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1" />
+            <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2" />
+            <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3" />
+            <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4" />
+        </level-list>
+    </item>
+</selector>
+
diff --git a/res/drawable/wifi_signal_colored.xml b/res/drawable/wifi_signal_colored.xml
deleted file mode 100644
index 91f8b88a530..00000000000
--- a/res/drawable/wifi_signal_colored.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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">
-        <level-list>
-            <item android:maxLevel="0">
-                <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_1_teal"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-            <item android:maxLevel="1">
-                <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_2_teal"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-            <item android:maxLevel="2">
-                <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_3_teal"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-            <item android:maxLevel="3">
-                <bitmap
-                    android:src="@drawable/ic_wifi_lock_signal_4_teal"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-        </level-list>
-    </item>
-    <item settings:state_encrypted="false">
-        <level-list>
-            <item android:maxLevel="0">
-                <bitmap
-                    android:src="@drawable/ic_wifi_signal_1_teal"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-            <item android:maxLevel="1">
-                <bitmap
-                    android:src="@drawable/ic_wifi_signal_2_teal"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-            <item android:maxLevel="2">
-                <bitmap
-                    android:src="@drawable/ic_wifi_signal_3_teal"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-            <item android:maxLevel="3">
-                <bitmap
-                    android:src="@drawable/ic_wifi_signal_4_teal"
-                    android:tint="?attr/wifi_signal_color" />
-            </item>
-        </level-list>
-    </item>
-</selector>
-
diff --git a/res/drawable/wifi_signal_lock_teal.xml b/res/drawable/wifi_signal_lock_teal.xml
deleted file mode 100644
index 2e79274063c..00000000000
--- a/res/drawable/wifi_signal_lock_teal.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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_teal" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2_teal" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3_teal" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4_teal" />
-</level-list>
-
diff --git a/res/drawable/wifi_signal_open_teal.xml b/res/drawable/wifi_signal_open_teal.xml
deleted file mode 100644
index eb4ba8a4880..00000000000
--- a/res/drawable/wifi_signal_open_teal.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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_teal" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2_teal" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3_teal" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4_teal" />
-</level-list>
-
diff --git a/res/drawable/wifi_signal_teal.xml b/res/drawable/wifi_signal_teal.xml
deleted file mode 100644
index 637336f0243..00000000000
--- a/res/drawable/wifi_signal_teal.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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_teal" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open_teal" />
-</selector>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e9da7fed411..671ad48705d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -75,6 +75,7 @@
     <color name="switch_accent_color">#ff7fcac3</color>
 
     <color name="wifi_divider">#ffe0e0e0</color>
+    <color name="wifi_signal_icon_color">#ff009688</color>
     <color name="sim_noitification">@*android:color/material_deep_teal_500</color>
 
     <color name="warning">#ff5621</color>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index a52ea045954..f3d5e40c23a 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -41,7 +41,7 @@
         <item name="setup_divider_color">@color/setup_divider_color_dark</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
-        <item name="wifi_signal">@drawable/wifi_signal_colored</item>
+        <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
 
         <!-- LockPatternView colors -->
@@ -62,7 +62,7 @@
         <item name="setup_divider_color">@color/setup_divider_color_light</item>
         <item name="side_margin">0dip</item>
         <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
-        <item name="wifi_signal">@drawable/wifi_signal_colored</item>
+        <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="preferenceBackgroundColor">?android:attr/colorBackground</item>
 
         <!-- LockPatternView colors -->
@@ -106,7 +106,8 @@
         <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
         <item name="ic_wps">@drawable/ic_wps_light</item>
-        <item name="wifi_signal">@drawable/wifi_signal_teal</item>
+        <item name="wifi_signal">@drawable/wifi_signal</item>
+        <item name="wifi_signal_color">@color/wifi_signal_icon_color</item>
         <item name="side_margin">@dimen/settings_side_margin</item>
 
         <!-- Redefine the ActionBar style for contentInsetStart -->