diff --git a/XiaomiDoze/res/drawable/ic_pickup.xml b/XiaomiDoze/res/drawable/ic_pickup.xml
new file mode 100644
index 00000000..f5744968
--- /dev/null
+++ b/XiaomiDoze/res/drawable/ic_pickup.xml
@@ -0,0 +1,9 @@
+<!-- drawable/arrow-decision_auto -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M12,5H9L13,1L17,5H14V9.43C13.25,9.89 12.58,10.46 12,11.12V5M10.4,15H8.5L7.8,13H4.6L3.9,15H2L5.2,6H7.2L10.4,15M7.35,11.65L6.2,8L5.05,11.65H7.35M23,11L19,7V10C15.39,9.85 12.31,12.57 12,16.17C10.44,16.72 9.62,18.44 10.17,20C10.72,21.56 12.44,22.38 14,21.83C15.56,21.27 16.38,19.56 15.83,18C15.53,17.14 14.85,16.47 14,16.17C14.47,12.17 18.47,11.97 18.95,11.97V14.97L23,11Z" />
+</vector>
diff --git a/XiaomiDoze/res/drawable/ic_pocket.xml b/XiaomiDoze/res/drawable/ic_pocket.xml
new file mode 100644
index 00000000..9a4e3b2c
--- /dev/null
+++ b/XiaomiDoze/res/drawable/ic_pocket.xml
@@ -0,0 +1,9 @@
+<!-- drawable/pocket.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M21.9,4.26C21.64,3.55 20.96,3.07 20.2,3.07H20.19L18.46,3.07H3.81C3.07,3.07 2.39,3.54 2.12,4.24C2.04,4.45 2,4.66 2,4.88V10.92L2.07,12.12C2.36,14.85 3.78,17.23 5.97,18.9C6,18.93 6.05,18.96 6.09,19H6.11C7.29,19.86 8.6,20.44 10,20.73C10.68,20.86 11.35,20.93 12,20.93C12.63,20.93 13.25,20.87 13.85,20.76C13.93,20.75 14,20.73 14.07,20.72C14.09,20.71 14.11,20.7 14.14,20.69C15.5,20.4 16.76,19.83 17.89,19H17.91C17.95,18.96 18,18.93 18.03,18.9C20.22,17.23 21.64,14.85 21.93,12.12L22,10.92V4.88C22,4.68 21.97,4.47 21.9,4.26M17.67,10.55L12.96,15.06C12.7,15.32 12.35,15.44 12,15.44C11.67,15.44 11.33,15.32 11.06,15.06L6.36,10.55C5.81,10.03 5.79,9.16 6.32,8.61C6.84,8.06 7.71,8.05 8.26,8.57L12,12.17L15.77,8.57C16.31,8.05 17.18,8.07 17.71,8.61C18.23,9.16 18.21,10.03 17.67,10.55Z" />
+</vector>
diff --git a/XiaomiDoze/res/drawable/ic_wave.xml b/XiaomiDoze/res/drawable/ic_wave.xml
new file mode 100644
index 00000000..e0e6e01b
--- /dev/null
+++ b/XiaomiDoze/res/drawable/ic_wave.xml
@@ -0,0 +1,9 @@
+<!-- drawable/arrow-decision_auto -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+   <path android:fillColor="#000" android:pathData="M21,6.58V18.67A3.33,3.33 0 0,1 17.67,22H11.58C10.68,22 9.83,21.64 9.21,21L2.67,14.36C2.67,14.36 3.72,13.33 3.75,13.32C3.93,13.16 4.16,13.07 4.41,13.07C4.59,13.07 4.76,13.12 4.91,13.21C4.94,13.22 8.5,15.26 8.5,15.26V5.33A1.25,1.25 0 0,1 9.75,4.08A1.25,1.25 0 0,1 11,5.33V11.17H11.83V3.25A1.25,1.25 0 0,1 13.08,2C13.78,2 14.33,2.56 14.33,3.25V11.17H15.17V4.08C15.17,3.39 15.72,2.83 16.42,2.83A1.25,1.25 0 0,1 17.67,4.08V11.17H18.5V6.58A1.25,1.25 0 0,1 19.75,5.33A1.25,1.25 0 0,1 21,6.58Z" />
+</vector>
diff --git a/XiaomiDoze/res/values/strings.xml b/XiaomiDoze/res/values/strings.xml
index 39c0cf5d..29644687 100644
--- a/XiaomiDoze/res/values/strings.xml
+++ b/XiaomiDoze/res/values/strings.xml
@@ -32,7 +32,7 @@
     <string name="tilt_sensor_title">Tilt Sensor Gestures</string>
 
     <!-- Proximity sensor -->
-    <string name="proximity_sensor_title">Proximity sensor</string>
+    <string name="proximity_sensor_title">Proximity Sensor Gestures</string>
 
     <!-- Hand wave gesture -->
     <string name="hand_wave_gesture_title">Hand wave</string>
diff --git a/XiaomiDoze/res/xml/doze_settings.xml b/XiaomiDoze/res/xml/doze_settings.xml
index 6863e2be..5c759d0d 100644
--- a/XiaomiDoze/res/xml/doze_settings.xml
+++ b/XiaomiDoze/res/xml/doze_settings.xml
@@ -23,6 +23,7 @@
         <SwitchPreference
             android:key="gesture_pick_up"
             android:defaultValue="false"
+            android:icon="@drawable/ic_pickup"
             android:title="@string/pick_up_gesture_title"
             android:summary="@string/pick_up_gesture_summary" />
         
@@ -43,12 +44,14 @@
         <SwitchPreference
             android:key="gesture_hand_wave"
             android:defaultValue="false"
+            android:icon="@drawable/ic_wave"
             android:title="@string/hand_wave_gesture_title"
             android:summary="@string/hand_wave_gesture_summary" />
 
         <SwitchPreference
             android:key="gesture_pocket"
             android:defaultValue="false"
+            android:icon="@drawable/ic_pocket"
             android:title="@string/pocket_gesture_title"
             android:summary="@string/pocket_gesture_summary" />