diff --git a/res/drawable/ic_auto_wifi.xml b/res/drawable/ic_auto_wifi.xml
new file mode 100644
index 00000000000..82e42f09e12
--- /dev/null
+++ b/res/drawable/ic_auto_wifi.xml
@@ -0,0 +1,35 @@
+<!--
+    Copyright (C) 2017 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="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M18 10l3 0 -10 -9 -10 9 3 0 0 8 7.1 0c0 -0.3 -0.1 -0.7 -0.1 -1 0 -3.9 3.1 -7 7 -7z"
+        android:fillColor="#FFFFFFFF" />
+    <path
+        android:pathData="M18 14l0 1.6 2.1 -2.1 -2.1 -2.2 0 1.6c-2.3 0 -4.2 1.9 -4.2 4.3 0 0.8 0.2 1.6 0.7 2.3l0.8 -0.8C15.1 18.3 14.9 17.8 14.9 17.2 14.8 15.4 16.2 14 18 14"
+        android:strokeWidth="0.5"
+        android:fillColor="#FFFFFFFF"
+        android:strokeMiterLimit="10" />
+    <path
+        android:pathData="M20.8 15.7c0.2 0.4 0.4 0.9 0.4 1.5 0 1.8 -1.4 3.2 -3.2 3.2l0 -1.6 -2.1 2.1 2.1 2.1 0 -1.6c2.3 0 4.2 -1.9 4.2 -4.2 0 -0.8 -0.2 -1.6 -0.7 -2.3l-0.7 0.8z"
+        android:strokeWidth="0.5"
+        android:fillColor="#FFFFFFFF"
+        android:strokeMiterLimit="10" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_open_wifi_autoconnect.xml b/res/drawable/ic_open_wifi_autoconnect.xml
new file mode 100644
index 00000000000..c752522fd90
--- /dev/null
+++ b/res/drawable/ic_open_wifi_autoconnect.xml
@@ -0,0 +1,25 @@
+<!--
+    Copyright (C) 2017 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="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M12.7 10C11.9 7.7 9.7 6 7 6 3.7 6 1 8.7 1 12c0 3.3 2.7 6 6 6 2.6 0 4.8 -1.7 5.7 -4l4.3 0 0 4 4 0 0 -4 2 0 0 -4 -10.3 0zM7 16C4.8 16 3 14.2 3 12 3 9.8 4.8 8 7 8 8.1 8 9 8.4 9.6 9.1L8.5 10.2C8.3 9.9 7.8 9.5 7 9.5 5.6 9.5 4.6 10.6 4.6 12c0 1.4 1.1 2.5 2.4 2.5 1.6 0 2.1 -1.1 2.2 -1.7l-2.2 0 0 -1.4 3.8 0c0 0.2 0.1 0.4 0.1 0.6 -0.1 2.3 -1.7 4 -3.9 4z"
+        android:fillColor="#FFFFFFFF"/>
+</vector>
diff --git a/res/drawable/ic_open_wifi_notifications.xml b/res/drawable/ic_open_wifi_notifications.xml
new file mode 100644
index 00000000000..5435bdb476a
--- /dev/null
+++ b/res/drawable/ic_open_wifi_notifications.xml
@@ -0,0 +1,37 @@
+<!--
+    Copyright (C) 2016 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="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M8 22.5c0.8 0 1.5 -0.7 1.5 -1.5l-3 0c0 0.8 0.7 1.5 1.5 1.5z"
+        android:fillColor="#FFFFFFFF" />
+    <path
+        android:pathData="M12.5 17.8l0 -3.6C12.5 12 11.3 10.1 9.1 9.6l0 -0.5C9.1 8.5 8.6 8 8 8 7.4 8 6.9 8.5 6.9 9.1l0 0.5C4.8 10.1 3.5 12 3.5 14.2l0 3.6 -1.5 1.5 0 0.7 12 0 0 -0.7 -1.5 -1.5z"
+        android:fillColor="#FFFFFFFF" />
+    <path
+        android:pathData="M10 4.6l1.1 1.1c2.8 -2.8 7.4 -2.8 10.2 0L22.4 4.6C19 1.1 13.5 1.1 10 4.6"
+        android:fillColor="#FFFFFFFF" />
+    <path
+        android:pathData="M14.5 9.1L16.2 10.8 18 9.1C17 8.2 15.5 8.2 14.5 9.1"
+        android:fillColor="#FFFFFFFF" />
+    <path
+        android:pathData="M12.3 6.9L13.4 8C15 6.4 17.5 6.4 19.1 8L20.2 6.9C18 4.7 14.5 4.7 12.3 6.9"
+        android:fillColor="#FFFFFFFF" />
+</vector>
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index b1625cc72e4..14990a5b1c9 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -22,19 +22,19 @@
     <SwitchPreference
             android:key="enable_wifi_wakeup"
             android:title="@string/wifi_wakeup"
-            android:icon="@drawable/ic_settings_home"
+            android:icon="@drawable/ic_auto_wifi"
             android:summary="@string/wifi_wakeup_summary" />
 
     <SwitchPreference
         android:key="use_open_wifi_automatically"
-        android:icon="@drawable/ic_vpn_key"
+        android:icon="@drawable/ic_open_wifi_autoconnect"
         android:title="@string/use_open_wifi_automatically_title"
         android:summary="@string/use_open_wifi_automatically_summary" />
 
     <Preference
             android:key="notify_open_networks"
             android:title="@string/wifi_notify_open_networks"
-            android:icon="@drawable/ic_settings_notifications"/>
+            android:icon="@drawable/ic_open_wifi_notifications"/>
 
     <SwitchPreference
         android:key="wifi_cellular_data_fallback"