diff --git a/res/drawable/ic_settings_home.xml b/res/drawable/ic_settings_home.xml
new file mode 100644
index 00000000000..1cc959347c8
--- /dev/null
+++ b/res/drawable/ic_settings_home.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:fillColor="#FFFFFFFF"
+          android:pathData="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z" />
+    <path android:pathData="M0 0h24v24H0z" />
+</vector>
diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index a8740200a04..bf1dc7586ea 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -15,24 +15,26 @@
 -->
 
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/wifi_configure_titlebar">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/wifi_configure_titlebar">
 
     <SwitchPreference
             android:key="enable_wifi_wakeup"
             android:title="@string/wifi_wakeup"
+            android:icon="@drawable/ic_settings_home"
             android:summary="@string/wifi_wakeup_summary" />
 
     <SwitchPreference
-        android:key="notify_open_networks"
-        android:title="@string/wifi_notify_open_networks"
-        android:summary="@string/wifi_notify_open_networks_summary" />
+            android:key="notify_open_networks"
+            android:title="@string/wifi_notify_open_networks"
+            android:icon="@drawable/ic_settings_notifications"
+            android:summary="@string/wifi_notify_open_networks_summary" />
 
     <SwitchPreference
-        android:key="wifi_cellular_data_fallback"
-        android:title="@string/wifi_cellular_data_fallback_title"
-        android:summary="@string/wifi_cellular_data_fallback_summary"/>
+            android:key="wifi_cellular_data_fallback"
+            android:title="@string/wifi_cellular_data_fallback_title"
+            android:summary="@string/wifi_cellular_data_fallback_summary"/>
 
     <ListPreference
             android:key="sleep_policy"
@@ -51,10 +53,10 @@
     </Preference>
 
     <Preference
-        android:key="wifi_calling_settings"
-        android:title="@string/wifi_calling_settings_title"
-        android:fragment="com.android.settings.WifiCallingSettings"
-        settings:keywords="@string/keywords_wifi_calling"/>
+            android:key="wifi_calling_settings"
+            android:title="@string/wifi_calling_settings_title"
+            android:fragment="com.android.settings.WifiCallingSettings"
+            settings:keywords="@string/keywords_wifi_calling"/>
 
     <Preference
             android:key="wifi_direct"