diff --git a/res/drawable-hdpi/ic_settings_wireless.png b/res/drawable-hdpi/ic_settings_wireless.png
index 28409db7ff9..5c82e8bcbf1 100644
Binary files a/res/drawable-hdpi/ic_settings_wireless.png and b/res/drawable-hdpi/ic_settings_wireless.png differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_0_teal.png b/res/drawable-hdpi/ic_wifi_lock_signal_0_teal.png
new file mode 100644
index 00000000000..d0c9b304579
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_0_teal.png 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
new file mode 100644
index 00000000000..0bef891976a
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_1_teal.png 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
new file mode 100644
index 00000000000..9252d90f1dd
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_2_teal.png 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
new file mode 100644
index 00000000000..a758ad47b82
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_3_teal.png 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
new file mode 100644
index 00000000000..8378399f9c1
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_4_teal.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_0_teal.png b/res/drawable-hdpi/ic_wifi_signal_0_teal.png
new file mode 100644
index 00000000000..3030279d93f
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_0_teal.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1_teal.png b/res/drawable-hdpi/ic_wifi_signal_1_teal.png
new file mode 100644
index 00000000000..3340d958fbd
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_1_teal.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2_teal.png b/res/drawable-hdpi/ic_wifi_signal_2_teal.png
new file mode 100644
index 00000000000..180f7b1d573
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_2_teal.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3_teal.png b/res/drawable-hdpi/ic_wifi_signal_3_teal.png
new file mode 100644
index 00000000000..af27fb0c583
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_3_teal.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4_teal.png b/res/drawable-hdpi/ic_wifi_signal_4_teal.png
new file mode 100644
index 00000000000..5c82e8bcbf1
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_4_teal.png differ
diff --git a/res/drawable-mdpi/ic_settings_wireless.png b/res/drawable-mdpi/ic_settings_wireless.png
index 59ed4d458b8..6b81932f482 100644
Binary files a/res/drawable-mdpi/ic_settings_wireless.png and b/res/drawable-mdpi/ic_settings_wireless.png 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
new file mode 100644
index 00000000000..d746c1e2d00
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_0_teal.png 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
new file mode 100644
index 00000000000..01f6f875019
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_1_teal.png 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
new file mode 100644
index 00000000000..230b1a36cfe
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_2_teal.png 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
new file mode 100644
index 00000000000..20fe9a5de7f
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_3_teal.png 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
new file mode 100644
index 00000000000..938a2039c91
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_4_teal.png differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_0_teal.png b/res/drawable-mdpi/ic_wifi_signal_0_teal.png
new file mode 100644
index 00000000000..9dcdf91f4ec
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_0_teal.png differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1_teal.png b/res/drawable-mdpi/ic_wifi_signal_1_teal.png
new file mode 100644
index 00000000000..b58d5f46e0e
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_1_teal.png differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2_teal.png b/res/drawable-mdpi/ic_wifi_signal_2_teal.png
new file mode 100644
index 00000000000..5cbb5a322c2
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_2_teal.png differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3_teal.png b/res/drawable-mdpi/ic_wifi_signal_3_teal.png
new file mode 100644
index 00000000000..cec46b0a35c
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_3_teal.png differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4_teal.png b/res/drawable-mdpi/ic_wifi_signal_4_teal.png
new file mode 100644
index 00000000000..6b81932f482
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_4_teal.png differ
diff --git a/res/drawable-xhdpi/ic_settings_wireless.png b/res/drawable-xhdpi/ic_settings_wireless.png
index d7a6955a8f1..ad6a98ec41d 100644
Binary files a/res/drawable-xhdpi/ic_settings_wireless.png and b/res/drawable-xhdpi/ic_settings_wireless.png 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
new file mode 100644
index 00000000000..8d99e313bb9
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_0_teal.png 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
new file mode 100644
index 00000000000..da282b6783c
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_1_teal.png 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
new file mode 100644
index 00000000000..b6a378f79e2
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_2_teal.png 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
new file mode 100644
index 00000000000..7227b0868e1
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_3_teal.png 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
new file mode 100644
index 00000000000..92257c3281d
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_4_teal.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_0_teal.png b/res/drawable-xhdpi/ic_wifi_signal_0_teal.png
new file mode 100644
index 00000000000..08aba96767a
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_0_teal.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_teal.png b/res/drawable-xhdpi/ic_wifi_signal_1_teal.png
new file mode 100644
index 00000000000..8d282c9fb98
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_1_teal.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_teal.png b/res/drawable-xhdpi/ic_wifi_signal_2_teal.png
new file mode 100644
index 00000000000..6caedf93650
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_2_teal.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_teal.png b/res/drawable-xhdpi/ic_wifi_signal_3_teal.png
new file mode 100644
index 00000000000..799c9e33486
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_3_teal.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_teal.png b/res/drawable-xhdpi/ic_wifi_signal_4_teal.png
new file mode 100644
index 00000000000..ad6a98ec41d
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_4_teal.png differ
diff --git a/res/drawable-xxhdpi/ic_settings_wireless.png b/res/drawable-xxhdpi/ic_settings_wireless.png
index 4125f9fd7c5..3058e988e82 100644
Binary files a/res/drawable-xxhdpi/ic_settings_wireless.png and b/res/drawable-xxhdpi/ic_settings_wireless.png 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
new file mode 100644
index 00000000000..544c0412ad3
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_0_teal.png 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
new file mode 100644
index 00000000000..ac0cb625dc6
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_teal.png 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
new file mode 100644
index 00000000000..beb6e12cb89
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_teal.png 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
new file mode 100644
index 00000000000..3eaaf39e828
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_teal.png 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
new file mode 100644
index 00000000000..8b6bfb1d9a0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_teal.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_0_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_0_teal.png
new file mode 100644
index 00000000000..f28f0ad3039
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_0_teal.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_1_teal.png
new file mode 100644
index 00000000000..1728dc72014
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_1_teal.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_2_teal.png
new file mode 100644
index 00000000000..e7e4788c46d
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_2_teal.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_3_teal.png
new file mode 100644
index 00000000000..c2967ed93d1
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_3_teal.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_teal.png b/res/drawable-xxhdpi/ic_wifi_signal_4_teal.png
new file mode 100644
index 00000000000..3058e988e82
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_4_teal.png differ
diff --git a/res/drawable-xxxhdpi/ic_settings_wireless.png b/res/drawable-xxxhdpi/ic_settings_wireless.png
index ed05fb3ecea..bcc423370a8 100644
Binary files a/res/drawable-xxxhdpi/ic_settings_wireless.png and b/res/drawable-xxxhdpi/ic_settings_wireless.png 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
new file mode 100644
index 00000000000..74c9c31cc92
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_teal.png 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
new file mode 100644
index 00000000000..dab15c41c7a
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_teal.png 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
new file mode 100644
index 00000000000..66a7736cadf
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_teal.png 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
new file mode 100644
index 00000000000..d23cf22d6fa
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_teal.png 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
new file mode 100644
index 00000000000..83e49882f43
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_teal.png differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_0_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_0_teal.png
new file mode 100644
index 00000000000..3dc5cbe1518
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_wifi_signal_0_teal.png differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_1_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_1_teal.png
new file mode 100644
index 00000000000..d80ac48fb05
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_wifi_signal_1_teal.png differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_2_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_2_teal.png
new file mode 100644
index 00000000000..4fdd825b95f
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_wifi_signal_2_teal.png differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_3_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_3_teal.png
new file mode 100644
index 00000000000..e1cbcb83cd7
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_wifi_signal_3_teal.png differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_4_teal.png b/res/drawable-xxxhdpi/ic_wifi_signal_4_teal.png
new file mode 100644
index 00000000000..bcc423370a8
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_wifi_signal_4_teal.png differ
diff --git a/res/drawable/wifi_signal_lock_teal.xml b/res/drawable/wifi_signal_lock_teal.xml
new file mode 100644
index 00000000000..2e79274063c
--- /dev/null
+++ b/res/drawable/wifi_signal_lock_teal.xml
@@ -0,0 +1,23 @@
+<?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
new file mode 100644
index 00000000000..eb4ba8a4880
--- /dev/null
+++ b/res/drawable/wifi_signal_open_teal.xml
@@ -0,0 +1,23 @@
+<?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
new file mode 100644
index 00000000000..637336f0243
--- /dev/null
+++ b/res/drawable/wifi_signal_teal.xml
@@ -0,0 +1,21 @@
+<?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/themes.xml b/res/values/themes.xml
index aa463410b9c..ef536180033 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -35,7 +35,7 @@
         <item name="ic_wps">@drawable/ic_wps_dark</item>
         <item name="setup_divider_color">@color/setup_divider_color_dark</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_teal</item>
         <item name="preferenceBackgroundColor">@color/setup_wizard_preference_background_color_dark</item>
     </style>
 
@@ -52,7 +52,7 @@
         <item name="ic_wps">@drawable/ic_wps_light</item>
         <item name="setup_divider_color">@color/setup_divider_color_light</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_teal</item>
         <item name="preferenceBackgroundColor">@color/setup_wizard_preference_background_color_light</item>
     </style>
 
@@ -91,7 +91,7 @@
         <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_dark</item>
-        <item name="wifi_signal">@drawable/wifi_signal_light</item>
+        <item name="wifi_signal">@drawable/wifi_signal_teal</item>
 
         <!-- Redefine the ActionBar style for contentInsetStart -->
         <item name="android:actionBarStyle">@style/Theme.ActionBar</item>