diff --git a/app/src/main/res/drawable/ic_access_time_black_24dp.xml b/app/src/main/res/drawable/ic_access_time_black_24dp.xml
new file mode 100644
index 0000000..2239a4f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_access_time_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_add_circle_outline_black_24dp.xml b/app/src/main/res/drawable/ic_add_circle_outline_black_24dp.xml
new file mode 100644
index 0000000..900f227
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_circle_outline_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,7h-2v4L7,11v2h4v4h2v-4h4v-2h-4L13,7zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_battery_alert_black_24dp.xml b/app/src/main/res/drawable/ic_battery_alert_black_24dp.xml
new file mode 100644
index 0000000..4966395
--- /dev/null
+++ b/app/src/main/res/drawable/ic_battery_alert_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.67,4L14,4L14,2h-4v2L8.33,4C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33L17,5.33C17,4.6 16.4,4 15.67,4zM13,18h-2v-2h2v2zM13,14h-2L11,9h2v5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_block_black_24dp.xml b/app/src/main/res/drawable/ic_block_black_24dp.xml
new file mode 100644
index 0000000..4510bf5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_block_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_devices_other_black_24dp.xml b/app/src/main/res/drawable/ic_devices_other_black_24dp.xml
new file mode 100644
index 0000000..c98c256
--- /dev/null
+++ b/app/src/main/res/drawable/ic_devices_other_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_signal_wifi_off_black_24dp.xml b/app/src/main/res/drawable/ic_signal_wifi_off_black_24dp.xml
new file mode 100644
index 0000000..8339d79
--- /dev/null
+++ b/app/src/main/res/drawable/ic_signal_wifi_off_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4 -1.5,0 -2.89,0.19 -4.15,0.48L18.18,13.8 23.64,7zM17.04,15.22L3.27,1.44 2,2.72l2.05,2.06C1.91,5.76 0.59,6.82 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01 3.9,-4.86 3.32,3.32 1.27,-1.27 -3.46,-3.46z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_timer_black_24dp.xml b/app/src/main/res/drawable/ic_timer_black_24dp.xml
new file mode 100644
index 0000000..f41be80
--- /dev/null
+++ b/app/src/main/res/drawable/ic_timer_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15,1L9,1v2h6L15,1zM11,14h2L13,8h-2v6zM19.03,7.39l1.42,-1.42c-0.43,-0.51 -0.9,-0.99 -1.41,-1.41l-1.42,1.42C16.07,4.74 14.12,4 12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9 9,-4.03 9,-9c0,-2.12 -0.74,-4.07 -1.97,-5.61zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+</vector>
diff --git a/app/src/main/res/layout/lock_fragment.xml b/app/src/main/res/layout/lock_fragment.xml
index ca5995b..c31d328 100644
--- a/app/src/main/res/layout/lock_fragment.xml
+++ b/app/src/main/res/layout/lock_fragment.xml
@@ -166,6 +166,12 @@
                         android:layout_height="wrap_content">
 
                         <TextView
+                            android:paddingStart="8dp"
+                            android:paddingEnd="0dp"
+                            tools:ignore="UnusedAttribute"
+                            android:drawablePadding="16dp"
+                            android:drawableTint="?colorOnSurface"
+                            android:drawableStart="@drawable/ic_add_circle_outline_black_24dp"
                             android:visibility="@{reason == BlockingReason.NotPartOfAnCategory ? View.VISIBLE : View.GONE}"
                             android:textAppearance="?android:textAppearanceMedium"
                             android:text="@string/lock_reason_no_category"
@@ -173,6 +179,12 @@
                             android:layout_height="wrap_content" />
 
                         <TextView
+                            android:paddingStart="8dp"
+                            android:paddingEnd="0dp"
+                            tools:ignore="UnusedAttribute"
+                            android:drawablePadding="16dp"
+                            android:drawableTint="?colorOnSurface"
+                            android:drawableStart="@drawable/ic_block_black_24dp"
                             android:visibility="@{reason == BlockingReason.TemporarilyBlocked ? View.VISIBLE : View.GONE}"
                             android:textAppearance="?android:textAppearanceMedium"
                             android:text="@{@string/lock_reason_temporarily_blocked(blockedKindLabel)}"
@@ -181,6 +193,12 @@
                             android:layout_height="wrap_content" />
 
                         <TextView
+                            android:paddingStart="8dp"
+                            android:paddingEnd="0dp"
+                            tools:ignore="UnusedAttribute"
+                            android:drawablePadding="16dp"
+                            android:drawableTint="?colorOnSurface"
+                            android:drawableStart="@drawable/ic_time_white_24dp"
                             android:visibility="@{reason == BlockingReason.BlockedAtThisTime ? View.VISIBLE : View.GONE}"
                             android:textAppearance="?android:textAppearanceMedium"
                             android:text="@{@string/lock_reason_blocked_time(blockedKindLabel)}"
@@ -189,6 +207,12 @@
                             android:layout_height="wrap_content" />
 
                         <TextView
+                            android:paddingStart="8dp"
+                            android:paddingEnd="0dp"
+                            tools:ignore="UnusedAttribute"
+                            android:drawablePadding="16dp"
+                            android:drawableTint="?colorOnSurface"
+                            android:drawableStart="@drawable/ic_timer_black_24dp"
                             android:visibility="@{reason == BlockingReason.TimeOver ? View.VISIBLE : View.GONE}"
                             android:textAppearance="?android:textAppearanceMedium"
                             android:text="@{@string/lock_reason_time_over(blockedKindLabel)}"
@@ -197,6 +221,12 @@
                             android:layout_height="wrap_content" />
 
                         <TextView
+                            android:paddingStart="8dp"
+                            android:paddingEnd="0dp"
+                            tools:ignore="UnusedAttribute"
+                            android:drawablePadding="16dp"
+                            android:drawableTint="?colorOnSurface"
+                            android:drawableStart="@drawable/ic_timer_black_24dp"
                             android:visibility="@{reason == BlockingReason.TimeOverExtraTimeCanBeUsedLater ? View.VISIBLE : View.GONE}"
                             android:textAppearance="?android:textAppearanceMedium"
                             android:text="@string/lock_reason_time_over_etra_time_can_be_used_later"
@@ -204,6 +234,12 @@
                             android:layout_height="wrap_content" />
 
                         <TextView
+                            android:paddingStart="8dp"
+                            android:paddingEnd="0dp"
+                            tools:ignore="UnusedAttribute"
+                            android:drawablePadding="16dp"
+                            android:drawableTint="?colorOnSurface"
+                            android:drawableStart="@drawable/ic_signal_wifi_off_black_24dp"
                             android:visibility="@{reason == BlockingReason.MissingNetworkTime ? View.VISIBLE : View.GONE}"
                             android:textAppearance="?android:textAppearanceMedium"
                             android:text="@string/lock_reason_missing_network_time"
@@ -212,6 +248,12 @@
                             android:layout_height="wrap_content" />
 
                         <TextView
+                            android:paddingStart="8dp"
+                            android:paddingEnd="0dp"
+                            tools:ignore="UnusedAttribute"
+                            android:drawablePadding="16dp"
+                            android:drawableTint="?colorOnSurface"
+                            android:drawableStart="@drawable/ic_devices_other_black_24dp"
                             android:visibility="@{reason == BlockingReason.RequiresCurrentDevice ? View.VISIBLE : View.GONE}"
                             android:textAppearance="?android:textAppearanceMedium"
                             android:text="@{@string/lock_reason_requires_current_device(blockedKindLabel)}"
@@ -220,6 +262,12 @@
                             android:layout_height="wrap_content" />
 
                         <TextView
+                            android:paddingStart="8dp"
+                            android:paddingEnd="0dp"
+                            tools:ignore="UnusedAttribute"
+                            android:drawablePadding="16dp"
+                            android:drawableTint="?colorOnSurface"
+                            android:drawableStart="@drawable/ic_battery_alert_black_24dp"
                             android:visibility="@{reason == BlockingReason.BatteryLimit ? View.VISIBLE : View.GONE}"
                             android:textAppearance="?android:textAppearanceMedium"
                             android:text="@{@string/lock_reason_battery_limit(blockedKindLabel)}"