diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
index 8dc24594..d63114b6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
@@ -313,7 +313,7 @@ fun Context.getTimerNotification(timer: Timer, pendingIntent: PendingIntent, add
     val builder = NotificationCompat.Builder(this)
         .setContentTitle(if(timer.label.isEmpty()) getString(R.string.timer) else timer.label)
         .setContentText(getString(R.string.time_expired))
-        .setSmallIcon(R.drawable.ic_timer)
+        .setSmallIcon(R.drawable.ic_hourglass_vector)
         .setContentIntent(pendingIntent)
         .setPriority(NotificationCompat.PRIORITY_MAX)
         .setDefaults(Notification.DEFAULT_LIGHTS)
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt
index 9aa37fb8..b2dc7b6d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt
@@ -267,7 +267,7 @@ class StopwatchFragment : Fragment() {
     }
 
     private fun updateSortingIndicators() {
-        var bitmap = requireContext().resources.getColoredBitmap(R.drawable.ic_sorting_triangle, requireContext().getAdjustedPrimaryColor())
+        var bitmap = requireContext().resources.getColoredBitmap(R.drawable.ic_sorting_triangle_vector, requireContext().getAdjustedPrimaryColor())
         view.apply {
             stopwatch_sorting_indicator_1.beInvisibleIf(sorting and SORT_BY_LAP == 0)
             stopwatch_sorting_indicator_2.beInvisibleIf(sorting and SORT_BY_LAP_TIME == 0)
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/services/TimerService.kt b/app/src/main/kotlin/com/simplemobiletools/clock/services/TimerService.kt
index ea8e7f36..efce8159 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/services/TimerService.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/services/TimerService.kt
@@ -102,7 +102,7 @@ class TimerService : Service() {
         val builder = NotificationCompat.Builder(this)
             .setContentTitle(title)
             .setContentText(contentText)
-            .setSmallIcon(R.drawable.ic_timer)
+            .setSmallIcon(R.drawable.ic_hourglass_vector)
             .setPriority(Notification.PRIORITY_DEFAULT)
             .setSound(null)
             .setOngoing(true)
diff --git a/app/src/main/res/drawable-hdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-hdpi/ic_dismiss_alarm_big.png
deleted file mode 100644
index 28988eb4..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_dismiss_alarm_big.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_sorting_triangle.png b/app/src/main/res/drawable-hdpi/ic_sorting_triangle.png
deleted file mode 100644
index 0bb1f5e6..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_sorting_triangle.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_timer.png b/app/src/main/res/drawable-hdpi/ic_timer.png
deleted file mode 100644
index b2360106..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_timer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-xhdpi/ic_dismiss_alarm_big.png
deleted file mode 100644
index 4703ce91..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_dismiss_alarm_big.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_sorting_triangle.png b/app/src/main/res/drawable-xhdpi/ic_sorting_triangle.png
deleted file mode 100644
index a2f99e7d..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_sorting_triangle.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_timer.png b/app/src/main/res/drawable-xhdpi/ic_timer.png
deleted file mode 100644
index 621fb4d4..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_timer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-xxhdpi/ic_dismiss_alarm_big.png
deleted file mode 100644
index fadca3b5..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_dismiss_alarm_big.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_sorting_triangle.png b/app/src/main/res/drawable-xxhdpi/ic_sorting_triangle.png
deleted file mode 100644
index 3422289b..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_sorting_triangle.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_timer.png b/app/src/main/res/drawable-xxhdpi/ic_timer.png
deleted file mode 100644
index d662b66e..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_timer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_dismiss_alarm_big.png b/app/src/main/res/drawable-xxxhdpi/ic_dismiss_alarm_big.png
deleted file mode 100644
index 222be58d..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_dismiss_alarm_big.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_sorting_triangle.png b/app/src/main/res/drawable-xxxhdpi/ic_sorting_triangle.png
deleted file mode 100644
index 4c0f76b6..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_sorting_triangle.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_timer.png b/app/src/main/res/drawable-xxxhdpi/ic_timer.png
deleted file mode 100644
index 1c68403a..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_timer.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_alarm_off_vector.xml b/app/src/main/res/drawable/ic_alarm_off_vector.xml
new file mode 100644
index 00000000..3ed91869
--- /dev/null
+++ b/app/src/main/res/drawable/ic_alarm_off_vector.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M10.04 6.29C10.66 6.11 11.32 6 12 6c3.86 0 7 3.14 7 7 0 0.68-0.11 1.34-0.29 1.96l1.56 1.56C20.74 15.44 21 14.25 21 13c0-4.97-4.03-9-9-9-1.25 0-2.44 0.26-3.53 0.72l1.57 1.57zm-6.33-3.5c-0.38-0.38-1-0.38-1.39 0L2.3 2.82c-0.39 0.39-0.39 1.01 0 1.39l0.68 0.68-0.17 0.14C2.39 5.37 2.34 5.99 2.68 6.41l0.03 0.03c0.35 0.42 0.96 0.47 1.38 0.12L4.4 6.31l0.8 0.8C3.83 8.69 3 10.75 3 13c0 4.97 4.03 9 9 9 2.25 0 4.31-0.83 5.89-2.2l1.41 1.41c0.38 0.38 1 0.38 1.39 0l0.03-0.03c0.38-0.38 0.38-1 0-1.39l-17.01-17zM12 20c-3.86 0-7-3.14-7-7 0-1.7 0.61-3.26 1.62-4.47l9.85 9.85C15.26 19.39 13.7 20 12 20zm7.91-13.44c0.42 0.35 1.03 0.29 1.38-0.12l0.03-0.03c0.35-0.42 0.29-1.03-0.12-1.38l-3.1-2.59c-0.42-0.35-1.03-0.29-1.38 0.12l-0.03 0.03c-0.35 0.42-0.29 1.03 0.12 1.38l3.1 2.59zM7.43 3.68c0.18-0.34 0.15-0.77-0.11-1.09L7.29 2.56c-0.3-0.36-0.8-0.43-1.2-0.22l1.34 1.34z" android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_alarm_vector.xml b/app/src/main/res/drawable/ic_alarm_vector.xml
index a1ba6700..c02d78ba 100644
--- a/app/src/main/res/drawable/ic_alarm_vector.xml
+++ b/app/src/main/res/drawable/ic_alarm_vector.xml
@@ -1,11 +1,3 @@
-<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="#FF000000"
-        android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M15.87 15.25l-3.37-2V8.72c0-0.4-0.32-0.72-0.72-0.72h-0.06C11.32 8 11 8.32 11 8.72v4.72c0 0.35 0.18 0.68 0.49 0.86l3.65 2.19c0.34 0.2 0.78 0.1 0.98-0.24 0.21-0.35 0.1-0.8-0.25-1zm5.31-10.24L18.1 2.45c-0.42-0.35-1.05-0.3-1.41 0.13C16.34 3 16.4 3.63 16.82 3.99l3.07 2.56c0.42 0.35 1.05 0.3 1.41-0.13 0.36-0.42 0.3-1.05-0.12-1.41zM4.1 6.55l3.07-2.56C7.6 3.63 7.66 3 7.3 2.58 6.95 2.15 6.32 2.1 5.9 2.45L2.82 5.01C2.4 5.37 2.34 6 2.7 6.42 3.05 6.85 3.68 6.9 4.1 6.55zM12 4c-4.97 0-9 4.03-9 9s4.03 9 9 9 9-4.03 9-9-4.03-9-9-9zm0 16c-3.86 0-7-3.14-7-7s3.14-7 7-7 7 3.14 7 7-3.14 7-7 7z" android:fillColor="#FFFFFFFF"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_hourglass_vector.xml b/app/src/main/res/drawable/ic_hourglass_vector.xml
new file mode 100644
index 00000000..3b724473
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hourglass_vector.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M16 22c1.1 0 2-0.9 2-2l-0.01-3.18c0-0.53-0.21-1.03-0.58-1.41L14 12l3.41-3.43c0.37-0.37 0.58-0.88 0.58-1.41L18 4c0-1.1-0.9-2-2-2H8C6.9 2 6 2.9 6 4v3.16C6 7.69 6.21 8.2 6.58 8.58L10 12l-3.41 3.4C6.21 15.78 6 16.29 6 16.82V20c0 1.1 0.9 2 2 2h8zM8 7.09V5c0-0.55 0.45-1 1-1h6c0.55 0 1 0.45 1 1v2.09c0 0.27-0.11 0.52-0.29 0.71L12 11.5 8.29 7.79C8.11 7.61 8 7.35 8 7.09z" android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_sorting_triangle_vector.xml b/app/src/main/res/drawable/ic_sorting_triangle_vector.xml
new file mode 100644
index 00000000..3d549803
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sorting_triangle_vector.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="12dp" android:viewportWidth="24" android:viewportHeight="12">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M22.959 10.408H1.02l10.97-8.993z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_stopwatch_vector.xml b/app/src/main/res/drawable/ic_stopwatch_vector.xml
index 166f126b..f35f4d5a 100644
--- a/app/src/main/res/drawable/ic_stopwatch_vector.xml
+++ b/app/src/main/res/drawable/ic_stopwatch_vector.xml
@@ -1,9 +1,4 @@
-<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="#FFFFFFFF"
-      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 xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M19.03 7.39l0.844-0.763c0.333-0.3 0.297-0.879-0.063-1.249-0.352-0.362-0.85-0.366-1.234-0.089L17.62 5.98C16.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"/>
+    <path android:fillColor="#FFFFFFFF" android:pathData="M13.003 12.099V8.094c0.002-0.547-0.44-1-1-1.002-0.547 0-0.993 0.448-1.002 1.002l-0.007 3.997c0 0.547 0.44 1 1.002 1.001 0.553 0.009 0.999-0.44 1.007-0.993zM9.992 3.234h4.005c0.547 0.001 1-0.44 1.001-1 0.001-0.547-0.448-0.994-1-1.002L10 1.225c-0.547 0-1 0.44-1.001 1.001-0.009 0.553 0.44 1 0.993 1.008z"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ec3574aa..8097fc96 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -38,7 +38,7 @@
             android:id="@+id/tab_timer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:icon="@drawable/ic_timer"/>
+            android:icon="@drawable/ic_hourglass_vector"/>
     </com.google.android.material.tabs.TabLayout>
 
     <com.duolingo.open.rtlviewpager.RtlViewPager
diff --git a/app/src/main/res/layout/activity_reminder.xml b/app/src/main/res/layout/activity_reminder.xml
index 786a6562..76df940e 100644
--- a/app/src/main/res/layout/activity_reminder.xml
+++ b/app/src/main/res/layout/activity_reminder.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/reminder_holder"
@@ -17,7 +16,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@string/time_expired"/>
+        tools:text="@string/time_expired" />
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/reminder_text"
@@ -28,7 +27,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/reminder_title"
-        tools:text="14:00"/>
+        tools:text="14:00" />
 
     <ImageView
         android:id="@+id/reminder_snooze"
@@ -41,7 +40,7 @@
         app:layout_constraintEnd_toStartOf="@+id/reminder_draggable"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/reminder_draggable"/>
+        app:layout_constraintTop_toTopOf="@+id/reminder_draggable" />
 
     <ImageView
         android:id="@+id/reminder_draggable_background"
@@ -55,7 +54,7 @@
         app:layout_constraintEnd_toStartOf="@+id/reminder_dismiss"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/reminder_snooze"
-        app:layout_constraintTop_toBottomOf="@+id/reminder_text"/>
+        app:layout_constraintTop_toBottomOf="@+id/reminder_text" />
 
     <ImageView
         android:id="@+id/reminder_draggable"
@@ -68,7 +67,7 @@
         app:layout_constraintEnd_toStartOf="@+id/reminder_dismiss"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/reminder_snooze"
-        app:layout_constraintTop_toBottomOf="@+id/reminder_text"/>
+        app:layout_constraintTop_toBottomOf="@+id/reminder_text" />
 
     <ImageView
         android:id="@+id/reminder_dismiss"
@@ -76,12 +75,12 @@
         android:layout_height="@dimen/reminder_background_min_size"
         android:clickable="false"
         android:padding="@dimen/activity_margin"
-        android:src="@drawable/ic_dismiss_alarm_big"
+        android:src="@drawable/ic_alarm_off_vector"
         app:layout_constraintBottom_toBottomOf="@+id/reminder_draggable"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/reminder_draggable"
-        app:layout_constraintTop_toTopOf="@+id/reminder_draggable"/>
+        app:layout_constraintTop_toTopOf="@+id/reminder_draggable" />
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/reminder_guide"
@@ -92,7 +91,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/reminder_draggable"/>
+        app:layout_constraintTop_toBottomOf="@+id/reminder_draggable" />
 
     <ImageView
         android:id="@+id/reminder_stop"
@@ -104,6 +103,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_edit_timer.xml b/app/src/main/res/layout/dialog_edit_timer.xml
index f72ba1b4..7eee2199 100644
--- a/app/src/main/res/layout/dialog_edit_timer.xml
+++ b/app/src/main/res/layout/dialog_edit_timer.xml
@@ -18,7 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:drawableLeft="@drawable/ic_timer"
+            android:drawableStart="@drawable/ic_hourglass_vector"
             android:drawablePadding="@dimen/normal_margin"
             android:padding="@dimen/activity_margin"
             android:textSize="@dimen/bigger_text_size"
@@ -39,7 +39,7 @@
                 android:layout_height="wrap_content"
                 android:background="@null"
                 android:clickable="false"
-                android:drawableLeft="@drawable/ic_vibrate_vector"
+                android:drawableStart="@drawable/ic_vibrate_vector"
                 android:drawablePadding="@dimen/normal_margin"
                 android:text="@string/vibrate"
                 android:textSize="@dimen/bigger_text_size" />
@@ -51,7 +51,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/selectableItemBackground"
-            android:drawableLeft="@drawable/ic_bell_vector"
+            android:drawableStart="@drawable/ic_bell_vector"
             android:drawablePadding="@dimen/normal_margin"
             android:padding="@dimen/activity_margin"
             android:textSize="@dimen/bigger_text_size"