diff --git a/app/src/main/assets/calendar_sync.svg b/app/src/main/assets/calendar_sync.svg
new file mode 100644
index 000000000..a64ad7bc3
--- /dev/null
+++ b/app/src/main/assets/calendar_sync.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="calendar_today-24px-1.svg"
+   id="svg6"
+   version="1.1"
+   width="24"
+   viewBox="0 0 24 24"
+   height="24">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg6"
+     inkscape:window-maximized="1"
+     inkscape:window-y="38"
+     inkscape:window-x="0"
+     inkscape:cy="14.262503"
+     inkscape:cx="14.320308"
+     inkscape:zoom="22.185475"
+     showgrid="false"
+     id="namedview8"
+     inkscape:window-height="1042"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <path
+     id="path2"
+     fill="none"
+     d="M0 0h24v24H0V0z" />
+  <path
+     id="path4"
+     d="m 20.018677,3 h -1 V 1 h -2 V 3 H 7.0186774 V 1 h -2 v 2 h -1 c -1.1,0 -2,0.9 -2,2 v 16 c 0,1.1 0.9,2 2,2 H 20.018677 c 1.1,0 2,-0.9 2,-2 V 5 c 0,-1.1 -0.9,-2 -2,-2 z m 0,18 H 4.0186774 V 10 H 20.018677 Z m 0,-13 H 4.0186774 V 5 H 20.018677 Z" />
+  <path
+     style="stroke-width:0.999998"
+     d="m 12.018677,11.629269 v -1.465936 l -1.954583,1.954582 1.954583,1.954582 v -1.465936 c 1.617417,0 2.931873,1.314456 2.931873,2.931873 0,0.493532 -0.122161,0.962632 -0.342052,1.368207 l 0.713423,0.713423 c 0.381143,-0.601034 0.60592,-1.314457 0.60592,-2.08163 0,-2.159814 -1.749351,-3.909165 -3.909164,-3.909165 z m 0,6.841038 c -1.617417,0 -2.9318731,-1.314456 -2.9318731,-2.931873 0,-0.493532 0.1221614,-0.962632 0.3420519,-1.368208 L 8.7154333,13.456804 c -0.3811435,0.601034 -0.6059204,1.314456 -0.6059204,2.08163 0,2.159813 1.7493508,3.909164 3.9091641,3.909164 v 1.465937 l 1.954582,-1.954583 -1.954582,-1.954582 z"
+     id="path4-3" />
+</svg>
diff --git a/app/src/main/assets/ic_no_watch.svg b/app/src/main/assets/ic_no_watch.svg
new file mode 100644
index 000000000..1257e6b41
--- /dev/null
+++ b/app/src/main/assets/ic_no_watch.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="ic_no_watch.svg"
+   id="svg6"
+   version="1.1"
+   width="24"
+   viewBox="0 0 24 24"
+   height="24">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <inkscape:path-effect
+       simplify_just_coalesce="false"
+       simplify_individual_paths="false"
+       helper_size="0"
+       smooth_angles="360"
+       threshold="0.00108696"
+       steps="1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect3556"
+       effect="simplify" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:current-layer="svg6"
+     inkscape:window-maximized="1"
+     inkscape:window-y="38"
+     inkscape:window-x="0"
+     inkscape:cy="11.716102"
+     inkscape:cx="18.443347"
+     inkscape:zoom="32"
+     inkscape:guide-bbox="true"
+     showguides="true"
+     showgrid="false"
+     id="namedview8"
+     inkscape:window-height="1042"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff">
+    <sodipodi:guide
+       id="guide837"
+       orientation="0,-1"
+       position="-8.5737052,20.015936" />
+    <sodipodi:guide
+       id="guide839"
+       orientation="0,-1"
+       position="-9.7211155,4.0159363" />
+    <sodipodi:guide
+       id="guide845"
+       orientation="0,-1"
+       position="4.1752988,24" />
+    <sodipodi:guide
+       id="guide847"
+       orientation="0,-1"
+       position="7.6494024,22.007968" />
+    <sodipodi:guide
+       id="guide3420"
+       orientation="0,-1"
+       position="5.7695406,6.0152602" />
+    <sodipodi:guide
+       id="guide3422"
+       orientation="0,-1"
+       position="4.0567082,2.0036265" />
+    <sodipodi:guide
+       id="guide3550"
+       orientation="1,0"
+       position="2.032932,17.149903" />
+    <sodipodi:guide
+       id="guide3552"
+       orientation="1,0"
+       position="22.185475,15.824078" />
+    <sodipodi:guide
+       id="guide3558"
+       orientation="0,-1"
+       position="2.9610096,18.696699" />
+    <sodipodi:guide
+       id="guide3560"
+       orientation="1,0"
+       position="11.534679,13.084039" />
+    <sodipodi:guide
+       id="guide3562"
+       orientation="0,-1"
+       position="22.516932,5.0848936" />
+  </sodipodi:namedview>
+  <path
+     id="path2"
+     fill="none"
+     d="M0 0h24v24H0V0z" />
+  <path
+     d="M 8 0 L 7.0507812 5.7304688 C 6.8273015 5.9058883 6.6255018 6.1054426 6.4238281 6.3046875 L 8.1308594 7.4375 C 8.5054322 7.1202052 8.9128027 6.8403522 9.3574219 6.6210938 C 10.15599 6.2272895 11.050552 6 12 6 C 13.173766 6 14.265876 6.3435073 15.191406 6.9277344 C 16.875856 7.991018 18 9.8637657 18 12 C 18 12.628035 17.902201 13.23348 17.722656 13.802734 L 19.431641 14.935547 C 19.792399 14.025062 20 13.037464 20 12 C 20 10.148663 19.361897 8.4452049 18.302734 7.0898438 C 17.908745 6.5856742 17.462523 6.1263145 16.960938 5.7304688 L 16 0 L 8 0 z M 9.6992188 2 L 14.310547 2 L 14.720703 4.4804688 C 13.870703 4.1704687 12.96 4 12 4 C 11.05 4 10.129063 4.1707031 9.2890625 4.4707031 L 9.6992188 2 z M 5.3867188 7.5253906 C 4.515003 8.7993422 4 10.335029 4 12 C 4 14.55 5.1907813 16.809531 7.0507812 18.269531 L 8 24 L 16 24 L 16.960938 18.269531 C 17.62693 17.743937 18.203786 17.110661 18.673828 16.400391 L 17.011719 15.291016 C 15.938243 16.920962 14.094668 18 12 18 C 8.69 18 6 15.31 6 12 C 6 10.749526 6.3915691 9.5950783 7.0488281 8.6347656 L 5.3867188 7.5253906 z M 14.720703 19.519531 L 14.310547 22 L 9.6992188 22 L 9.2890625 19.529297 C 10.129062 19.829297 11.05 20 12 20 C 12.96 20 13.870703 19.829531 14.720703 19.519531 z "
+     id="path4" />
+  <path
+     id="path3564"
+     d="M 2.032932,5.303301 22.185475,18.915106"
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/app/src/main/res/drawable/ic_calendar_sync.xml b/app/src/main/res/drawable/ic_calendar_sync.xml
new file mode 100644
index 000000000..df634bb4e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_calendar_sync.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/secondarytext"
+      android:pathData="m20.0187,3h-1L19.0187,1h-2L17.0187,3L7.0187,3L7.0187,1h-2v2h-1c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2L20.0187,23c1.1,0 2,-0.9 2,-2L22.0187,5c0,-1.1 -0.9,-2 -2,-2zM20.0187,21L4.0187,21L4.0187,10L20.0187,10ZM20.0187,8L4.0187,8L4.0187,5L20.0187,5Z"/>
+  <path
+      android:fillColor="@color/secondarytext"
+      android:pathData="m12.0187,11.6293v-1.4659l-1.9546,1.9546 1.9546,1.9546v-1.4659c1.6174,0 2.9319,1.3145 2.9319,2.9319 0,0.4935 -0.1222,0.9626 -0.3421,1.3682l0.7134,0.7134c0.3811,-0.601 0.6059,-1.3145 0.6059,-2.0816 0,-2.1598 -1.7494,-3.9092 -3.9092,-3.9092zM12.0187,18.4703c-1.6174,0 -2.9319,-1.3145 -2.9319,-2.9319 0,-0.4935 0.1222,-0.9626 0.3421,-1.3682L8.7154,13.4568c-0.3811,0.601 -0.6059,1.3145 -0.6059,2.0816 0,2.1598 1.7494,3.9092 3.9092,3.9092v1.4659l1.9546,-1.9546 -1.9546,-1.9546z"
+      android:strokeWidth="0.999998"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_nights_stay.xml b/app/src/main/res/drawable/ic_nights_stay.xml
new file mode 100644
index 000000000..95650be95
--- /dev/null
+++ b/app/src/main/res/drawable/ic_nights_stay.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19.78,17.51c-2.47,0 -6.57,-1.33 -8.68,-5.43C8.77,7.57 10.6,3.6 11.63,2.01C6.27,2.2 1.98,6.59 1.98,12c0,0.14 0.02,0.28 0.02,0.42C2.61,12.16 3.28,12 3.98,12c0,0 0,0 0,0c0,-3.09 1.73,-5.77 4.3,-7.1C7.78,7.09 7.74,9.94 9.32,13c1.57,3.04 4.18,4.95 6.8,5.86c-1.23,0.74 -2.65,1.15 -4.13,1.15c-0.5,0 -1,-0.05 -1.48,-0.14c-0.37,0.7 -0.94,1.27 -1.64,1.64c0.98,0.32 2.03,0.5 3.11,0.5c3.5,0 6.58,-1.8 8.37,-4.52C20.18,17.5 19.98,17.51 19.78,17.51z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7,16l-0.18,0C6.4,14.84 5.3,14 4,14c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.62,0 2.49,0 3,0c1.1,0 2,-0.9 2,-2C9,16.9 8.1,16 7,16z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_no_watch.xml b/app/src/main/res/drawable/ic_no_watch.xml
new file mode 100644
index 000000000..52ad589f9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_no_watch.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/secondarytext"
+      android:pathData="M8,0L7.0508,5.7305C6.8273,5.9059 6.6255,6.1054 6.4238,6.3047L8.1309,7.4375C8.5054,7.1202 8.9128,6.8404 9.3574,6.6211C10.156,6.2273 11.0506,6 12,6C13.1738,6 14.2659,6.3435 15.1914,6.9277C16.8759,7.991 18,9.8638 18,12C18,12.628 17.9022,13.2335 17.7227,13.8027L19.4316,14.9355C19.7924,14.0251 20,13.0375 20,12C20,10.1487 19.3619,8.4452 18.3027,7.0898C17.9087,6.5857 17.4625,6.1263 16.9609,5.7305L16,0L8,0zM9.6992,2L14.3105,2L14.7207,4.4805C13.8707,4.1705 12.96,4 12,4C11.05,4 10.1291,4.1707 9.2891,4.4707L9.6992,2zM5.3867,7.5254C4.515,8.7993 4,10.335 4,12C4,14.55 5.1908,16.8095 7.0508,18.2695L8,24L16,24L16.9609,18.2695C17.6269,17.7439 18.2038,17.1107 18.6738,16.4004L17.0117,15.291C15.9382,16.921 14.0947,18 12,18C8.69,18 6,15.31 6,12C6,10.7495 6.3916,9.5951 7.0488,8.6348L5.3867,7.5254zM14.7207,19.5195L14.3105,22L9.6992,22L9.2891,19.5293C10.1291,19.8293 11.05,20 12,20C12.96,20 13.8707,19.8295 14.7207,19.5195z"/>
+  <path
+      android:pathData="M2.0329,5.3033 L22.1855,18.9151"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="2"
+      android:fillColor="@color/secondarytext"
+      android:strokeColor="@color/secondarytext"
+      android:fillType="evenOdd"
+      android:strokeLineCap="butt"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sunny.xml b/app/src/main/res/drawable/ic_sunny.xml
new file mode 100644
index 000000000..8bac9e686
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sunny.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6.76,4.84l-1.8,-1.79 -1.41,1.41 1.79,1.79zM1,10.5h3v2L1,12.5zM11,0.55h2L13,3.5h-2zM19.04,3.045l1.408,1.407 -1.79,1.79 -1.407,-1.408zM17.24,18.16l1.79,1.8 1.41,-1.41 -1.8,-1.79zM20,10.5h3v2h-3zM12,5.5c-3.31,0 -6,2.69 -6,6s2.69,6 6,6 6,-2.69 6,-6 -2.69,-6 -6,-6zM12,15.5c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4 4,1.79 4,4 -1.79,4 -4,4zM11,19.5h2v2.95h-2zM3.55,18.54l1.41,1.41 1.79,-1.8 -1.41,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/xml/devicesettings_device_actions.xml b/app/src/main/res/xml/devicesettings_device_actions.xml
index 73a44bbb7..5172a57ad 100644
--- a/app/src/main/res/xml/devicesettings_device_actions.xml
+++ b/app/src/main/res/xml/devicesettings_device_actions.xml
@@ -7,7 +7,9 @@
         android:summary="@string/prefs_events_forwarding_summary"
         android:title="@string/prefs_events_forwarding_title">
 
-        <PreferenceCategory android:title="@string/prefs_events_forwarding_fellsleep">
+        <PreferenceCategory
+            android:title="@string/prefs_events_forwarding_fellsleep"
+            android:icon="@drawable/ic_nights_stay">
 
             <ListPreference
                 android:entries="@array/device_action_options"
@@ -22,7 +24,9 @@
                 android:title="@string/prefs_events_forwarding_broadcast_title" />
         </PreferenceCategory>
 
-        <PreferenceCategory android:title="@string/prefs_events_forwarding_wokeup">
+        <PreferenceCategory
+            android:title="@string/prefs_events_forwarding_wokeup"
+            android:icon="@drawable/ic_sunny">
 
             <ListPreference
                 android:entries="@array/device_action_options"
@@ -37,7 +41,9 @@
                 android:title="@string/prefs_events_forwarding_broadcast_title" />
         </PreferenceCategory>
 
-        <PreferenceCategory android:title="@string/prefs_events_forwarding_startnonwear">
+        <PreferenceCategory
+            android:title="@string/prefs_events_forwarding_startnonwear"
+            android:icon="@drawable/ic_no_watch">
 
             <ListPreference
                 android:entries="@array/device_action_options"
diff --git a/app/src/main/res/xml/devicesettings_sync_calendar.xml b/app/src/main/res/xml/devicesettings_sync_calendar.xml
index 1d6c3ae34..28b9bfb7a 100644
--- a/app/src/main/res/xml/devicesettings_sync_calendar.xml
+++ b/app/src/main/res/xml/devicesettings_sync_calendar.xml
@@ -2,7 +2,7 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <SwitchPreference
         android:defaultValue="false"
-        android:icon="@drawable/ic_calendar_today"
+        android:icon="@drawable/ic_calendar_sync"
         android:key="sync_calendar"
         android:summary="@string/pref_summary_sync_calendar"
         android:title="@string/pref_title_sync_caldendar" />