diff --git a/res/drawable/ic_timer_00_12.xml b/res/drawable/ic_timer_00_12.xml
new file mode 100644
index 0000000000..de6d32d21f
--- /dev/null
+++ b/res/drawable/ic_timer_00_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M9.42,10.923a6.014,6.014 0,0 1,-0.865 0.5l-0.508,-0.88a4.959,4.959 0,0 0,0.866 -0.5ZM5.5,1.041a4.915,4.915 0,0 1,1 0L6.5,0.026a6.07,6.07 0,0 0,-1 0ZM10.536,8.041a4.966,4.966 0,0 1,-0.5 0.866l0.889,0.513a6,6 0,0 0,0.5 -0.866ZM10.923,2.579 L10.046,3.086a4.959,4.959 0,0 1,0.5 0.866l0.88,-0.508A6.014,6.014 0,0 0,10.923 2.58ZM10.96,6.5h1.014a6.07,6.07 0,0 0,0 -1L10.959,5.5A4.915,4.915 0,0 1,10.96 6.5ZM8.042,1.463a5.008,5.008 0,0 1,0.866 0.5l0.513,-0.889a6.057,6.057 0,0 0,-0.866 -0.5ZM2.581,1.076l0.506,0.878a4.959,4.959 0,0 1,0.866 -0.5L3.446,0.576A5.994,5.994 0,0 0,2.581 1.076ZM3.958,10.536a4.966,4.966 0,0 1,-0.866 -0.5l-0.513,0.889a6,6 0,0 0,0.866 0.5ZM6.5,10.959a4.915,4.915 0,0 1,-1 0v1.014a6.07,6.07 0,0 0,1 0ZM1.954,8.913a4.959,4.959 0,0 1,-0.5 -0.866l-0.88,0.508a6.014,6.014 0,0 0,0.5 0.865ZM1.04,5.5L0.026,5.5a6.07,6.07 0,0 0,0 1L1.041,6.5A4.915,4.915 0,0 1,1.04 5.5ZM1.464,3.958a4.966,4.966 0,0 1,0.5 -0.866l-0.889,-0.513a6,6 0,0 0,-0.5 0.866ZM6.25,2h-0.5l-0.5,4a0.75,0.75 0,0 0,1.5 0Z"/>
+</vector>
diff --git a/res/drawable/ic_timer_00_16.xml b/res/drawable/ic_timer_00_16.xml
deleted file mode 100644
index d2a85220f0..0000000000
--- a/res/drawable/ic_timer_00_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M8.25,2h-0.5L7.75,1h0.5ZM8.25,3h-0.5l-0.5,5a0.75,0.75 0,0 0,1.5 0Z"/>
-</vector>
diff --git a/res/drawable/ic_timer_05_12.xml b/res/drawable/ic_timer_05_12.xml
new file mode 100644
index 0000000000..b401c124a0
--- /dev/null
+++ b/res/drawable/ic_timer_05_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M5.5,0.025A6,6 0,0 1,9.421 1.074l-0.513,0.889A4.972,4.972 0,0 0,5.5 1.041ZM10.536,8.042a4.966,4.966 0,0 1,-0.5 0.866l0.889,0.513a6,6 0,0 0,0.5 -0.866ZM8.913,10.042a4.959,4.959 0,0 1,-0.866 0.5l0.508,0.88a6.014,6.014 0,0 0,0.865 -0.5ZM10.544,3.949 L11.424,3.441a6.014,6.014 0,0 0,-0.5 -0.865l-0.877,0.507A4.959,4.959 0,0 1,10.544 3.953ZM10.96,6.5h1.014a6.07,6.07 0,0 0,0 -1L10.959,5.5A4.915,4.915 0,0 1,10.96 6.5ZM1.954,8.913a4.959,4.959 0,0 1,-0.5 -0.866l-0.88,0.508a6.014,6.014 0,0 0,0.5 0.865ZM2.581,1.076 L3.087,1.954a4.959,4.959 0,0 1,0.866 -0.5L3.446,0.576A5.994,5.994 0,0 0,2.581 1.076ZM6.5,10.959a4.915,4.915 0,0 1,-1 0v1.014a6.07,6.07 0,0 0,1 0ZM1.464,3.959a4.966,4.966 0,0 1,0.5 -0.866l-0.889,-0.513a6,6 0,0 0,-0.5 0.866ZM1.04,5.5L0.026,5.5a6.07,6.07 0,0 0,0 1L1.041,6.5A4.915,4.915 0,0 1,1.04 5.5ZM3.958,10.536a4.966,4.966 0,0 1,-0.866 -0.5l-0.513,0.889a6,6 0,0 0,0.866 0.5ZM7.784,2.411 L5.351,5.625a0.75,0.75 0,0 0,1.3 0.75L8.216,2.661Z"/>
+</vector>
diff --git a/res/drawable/ic_timer_05_16.xml b/res/drawable/ic_timer_05_16.xml
deleted file mode 100644
index df924cc202..0000000000
--- a/res/drawable/ic_timer_05_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M8.65,8.375l-0.011,-0.006A0.739,0.739 0,0 1,8 8.75,0.75 0.75,0 0,1 7.25,8a0.732,0.732 0,0 1,0.111 -0.369L7.35,7.625l2.933,-4.08 0.434,0.25L8.694,8.276l-0.015,0.034ZM11.5,1.942A6.946,6.946 0,0 0,8 1V2a5.952,5.952 0,0 1,3 0.809Z"/>
-</vector>
diff --git a/res/drawable/ic_timer_10_12.xml b/res/drawable/ic_timer_10_12.xml
new file mode 100644
index 0000000000..83bfa77384
--- /dev/null
+++ b/res/drawable/ic_timer_10_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M1.041,6.5L0.025,6.5a6.07,6.07 0,0 1,0 -1L1.04,5.5A4.915,4.915 0,0 0,1.041 6.5ZM5.5,1.041a4.988,4.988 0,0 1,5.044 2.912l0.88,-0.508A6,6 0,0 0,5.5 0.025ZM10.536,8.041a4.966,4.966 0,0 1,-0.5 0.866l0.889,0.513a6,6 0,0 0,0.5 -0.866ZM10.96,6.5h1.014a6.07,6.07 0,0 0,0 -1L10.959,5.5A4.915,4.915 0,0 1,10.96 6.5ZM8.913,10.046a4.959,4.959 0,0 1,-0.866 0.5l0.508,0.88a6.014,6.014 0,0 0,0.865 -0.5ZM2.581,1.076l0.506,0.878a4.959,4.959 0,0 1,0.866 -0.5L3.446,0.576A5.994,5.994 0,0 0,2.581 1.076ZM6.5,10.959a4.915,4.915 0,0 1,-1 0v1.014a6.07,6.07 0,0 0,1 0ZM3.958,10.536a4.966,4.966 0,0 1,-0.866 -0.5l-0.513,0.889a6,6 0,0 0,0.866 0.5ZM1.958,8.913a4.959,4.959 0,0 1,-0.5 -0.866l-0.88,0.508a6.014,6.014 0,0 0,0.5 0.865ZM1.468,3.958a4.966,4.966 0,0 1,0.5 -0.866l-0.889,-0.513a6,6 0,0 0,-0.5 0.866ZM9.343,3.784L5.625,5.35a0.75,0.75 0,0 0,0.75 1.3L9.589,4.216Z"/>
+</vector>
diff --git a/res/drawable/ic_timer_10_16.xml b/res/drawable/ic_timer_10_16.xml
deleted file mode 100644
index 546472307f..0000000000
--- a/res/drawable/ic_timer_10_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M8.375,8.65l-0.006,-0.011A0.732,0.732 0,0 1,8 8.75,0.75 0.75,0 0,1 7.25,8a0.739,0.739 0,0 1,0.381 -0.639L7.625,7.35l0.065,-0.029 0.034,-0.015 4.481,-2.022 0.25,0.432ZM13.19,5l0.867,-0.5A6.989,6.989 0,0 0,8 1V2A6,6 0,0 1,13.19 5Z"/>
-</vector>
diff --git a/res/drawable/ic_timer_15_12.xml b/res/drawable/ic_timer_15_12.xml
new file mode 100644
index 0000000000..55b412926c
--- /dev/null
+++ b/res/drawable/ic_timer_15_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M1.05,6.5h-1a5.963,5.963 0,0 1,0 -1h1A5.063,5.063 0,0 0,1.05 6.5ZM10.545,8.047a4.907,4.907 0,0 1,-0.5 0.865l0.874,0.5a5.94,5.94 0,0 0,0.491 -0.87ZM5.5,1.05A4.932,4.932 0,0 1,10.95 6.5h1A5.924,5.924 0,0 0,5.5 0.048ZM9.416,10.918 L8.916,10.044a4.907,4.907 0,0 1,-0.865 0.5l0.5,0.864A5.889,5.889 0,0 0,9.416 10.918ZM3.953,10.545a4.846,4.846 0,0 1,-0.865 -0.5l-0.5,0.874a5.94,5.94 0,0 0,0.87 0.491ZM6.5,10.945a5.063,5.063 0,0 1,-1 0v1a5.963,5.963 0,0 0,1 0ZM2.584,1.082l0.5,0.873a4.97,4.97 0,0 1,0.865 -0.5l-0.5,-0.863A5.94,5.94 0,0 0,2.584 1.082ZM1.956,8.912a4.907,4.907 0,0 1,-0.5 -0.865l-0.864,0.5a5.94,5.94 0,0 0,0.491 0.87ZM1.456,3.953a4.907,4.907 0,0 1,0.5 -0.865l-0.874,-0.5a5.94,5.94 0,0 0,-0.491 0.87ZM6,5.25a0.75,0.75 0,0 0,0 1.5l4,-0.5v-0.5Z"/>
+</vector>
diff --git a/res/drawable/ic_timer_15_16.xml b/res/drawable/ic_timer_15_16.xml
deleted file mode 100644
index 230e22b16e..0000000000
--- a/res/drawable/ic_timer_15_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M13,7.75v0.5l-5,0.5a0.75,0.75 0,0 1,0 -1.5ZM14,8h1A7,7 0,0 0,8 1V2A6.007,6.007 0,0 1,14 8Z"/>
-</vector>
diff --git a/res/drawable/ic_timer_20_12.xml b/res/drawable/ic_timer_20_12.xml
new file mode 100644
index 0000000000..9f985f5b27
--- /dev/null
+++ b/res/drawable/ic_timer_20_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M5.5,0.026A5.986,5.986 0,0 1,10.923 9.42l-0.877,-0.507A4.965,4.965 0,0 0,5.5 1.04ZM2.58,10.926a6.014,6.014 0,0 0,0.865 0.5l0.508,-0.88a4.959,4.959 0,0 1,-0.866 -0.5ZM1.041,5.5L0.025,5.5a6.07,6.07 0,0 0,0 1L1.04,6.5A4.915,4.915 0,0 1,1.041 5.5ZM9.421,10.926 L8.908,10.037a4.966,4.966 0,0 1,-0.866 0.5l0.513,0.889A6,6 0,0 0,9.421 10.926ZM6.5,10.96a4.915,4.915 0,0 1,-1 0v1.016a6.07,6.07 0,0 0,1 0ZM2.579,1.074l0.513,0.889a5.008,5.008 0,0 1,0.866 -0.5L3.445,0.575A6.057,6.057 0,0 0,2.579 1.074ZM1.963,8.908a4.966,4.966 0,0 1,-0.5 -0.866l-0.889,0.513a6,6 0,0 0,0.5 0.866ZM1.456,3.953a4.959,4.959 0,0 1,0.5 -0.866L1.077,2.58a6.014,6.014 0,0 0,-0.5 0.865ZM6.375,5.353a0.75,0.75 0,0 0,-0.75 1.3L9.339,8.216l0.25,-0.432Z"/>
+</vector>
diff --git a/res/drawable/ic_timer_20_16.xml b/res/drawable/ic_timer_20_16.xml
deleted file mode 100644
index 3a1f1f0713..0000000000
--- a/res/drawable/ic_timer_20_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M8,2L8,1a6.992,6.992 0,0 1,6.058 10.5l-0.867,-0.5A5.991,5.991 0,0 0,8 2ZM12.205,10.716 L12.455,10.284L8.375,7.35l-0.006,0.011A0.732,0.732 0,0 0,8 7.25,0.75 0.75,0 0,0 7.25,8a0.739,0.739 0,0 0,0.381 0.639l-0.006,0.011 0.065,0.029 0.034,0.015Z"/>
-</vector>
diff --git a/res/drawable/ic_timer_25_12.xml b/res/drawable/ic_timer_25_12.xml
new file mode 100644
index 0000000000..7628fab791
--- /dev/null
+++ b/res/drawable/ic_timer_25_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M1.077,9.42a6.014,6.014 0,0 1,-0.5 -0.865l0.88,-0.508a4.959,4.959 0,0 0,0.5 0.866ZM1.464,3.958a4.966,4.966 0,0 1,0.5 -0.866l-0.889,-0.513a6,6 0,0 0,-0.5 0.866ZM1.04,5.5L0.026,5.5a6.07,6.07 0,0 0,0 1L1.041,6.5A4.915,4.915 0,0 1,1.04 5.5ZM2.581,1.076l0.506,0.878a4.959,4.959 0,0 1,0.866 -0.5L3.446,0.576A5.994,5.994 0,0 0,2.581 1.076ZM3.958,10.536a4.966,4.966 0,0 1,-0.866 -0.5l-0.513,0.889a6,6 0,0 0,0.866 0.5ZM11.8,4.447A6,6 0,0 0,5.5 0.025L5.5,1.041a4.981,4.981 0,0 1,2.547 9.5l0.508,0.88A6,6 0,0 0,11.8 4.447ZM6.5,10.959a4.915,4.915 0,0 1,-1 0v1.014a6.07,6.07 0,0 0,1 0ZM6.65,5.625a0.75,0.75 0,1 0,-1.3 0.75L7.784,9.589l0.432,-0.25Z"/>
+</vector>
diff --git a/res/drawable/ic_timer_25_16.xml b/res/drawable/ic_timer_25_16.xml
deleted file mode 100644
index 690c632574..0000000000
--- a/res/drawable/ic_timer_25_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M15,8a6.989,6.989 0,0 1,-3.5 6.057L11,13.19A6,6 0,0 0,8 2V1A7,7 0,0 1,15 8ZM8.694,7.724 L8.679,7.69 8.65,7.625l-0.011,0.006A0.739,0.739 0,0 0,8 7.25,0.75 0.75,0 0,0 7.25,8a0.732,0.732 0,0 0,0.111 0.369l-0.011,0.006 2.933,4.08 0.434,-0.25Z"/>
-</vector>
diff --git a/res/drawable/ic_timer_30_12.xml b/res/drawable/ic_timer_30_12.xml
new file mode 100644
index 0000000000..13639f7f84
--- /dev/null
+++ b/res/drawable/ic_timer_30_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M1.05,6.5h-1a5.963,5.963 0,0 1,0 -1h1A5.063,5.063 0,0 0,1.05 6.5ZM1.956,8.912a4.907,4.907 0,0 1,-0.5 -0.865l-0.864,0.5a5.94,5.94 0,0 0,0.491 0.87ZM1.456,3.953a4.907,4.907 0,0 1,0.5 -0.865l-0.874,-0.5a5.94,5.94 0,0 0,-0.491 0.87ZM10.244,1.753A5.962,5.962 0,0 0,5.5 0.048v1a4.978,4.978 0,1 1,0 9.9v1A5.976,5.976 0,0 0,10.243 1.757ZM2.584,1.082l0.5,0.873a4.97,4.97 0,0 1,0.865 -0.5l-0.5,-0.863A5.94,5.94 0,0 0,2.584 1.082ZM3.953,10.545a4.907,4.907 0,0 1,-0.865 -0.5l-0.5,0.874a5.94,5.94 0,0 0,0.87 0.491ZM6,5.25A0.75,0.75 0,0 0,5.25 6l0.5,4h0.5l0.5,-4A0.75,0.75 0,0 0,6 5.25Z"/>
+</vector>
diff --git a/res/drawable/ic_timer_30_16.xml b/res/drawable/ic_timer_30_16.xml
deleted file mode 100644
index b3536a7023..0000000000
--- a/res/drawable/ic_timer_30_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M7.25,8a0.75,0.75 0,0 1,1.5 0l-0.5,5h-0.5ZM8,1V2A6,6 0,0 1,8 14v1A7,7 0,0 0,8 1Z"/>
-</vector>
diff --git a/res/drawable/ic_timer_35_12.xml b/res/drawable/ic_timer_35_12.xml
new file mode 100644
index 0000000000..ff02bad9b4
--- /dev/null
+++ b/res/drawable/ic_timer_35_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M1.04,6.5L0.026,6.5a6.07,6.07 0,0 1,0 -1L1.041,5.5A4.915,4.915 0,0 0,1.04 6.5ZM0.576,3.445l0.88,0.508a4.959,4.959 0,0 1,0.5 -0.866L1.077,2.58A6.014,6.014 0,0 0,0.576 3.445ZM0.576,8.555a6,6 0,0 0,0.5 0.866l0.889,-0.513a4.966,4.966 0,0 1,-0.5 -0.866ZM2.576,1.074 L3.089,1.963a5.008,5.008 0,0 1,0.866 -0.5L3.445,0.575A6.057,6.057 0,0 0,2.579 1.074ZM7.553,0.2A6,6 0,0 0,5.5 0.026L5.5,1.04a4.994,4.994 0,1 1,-0.794 9.79,4.961 4.961,0 0,1 -1.619,-0.784l-0.507,0.877A6,6 0,1 0,7.553 0.2ZM6.375,5.35a0.751,0.751 0,0 0,-1.025 0.275L3.784,9.339l0.432,0.25L6.65,6.375A0.751,0.751 0,0 0,6.375 5.35Z"/>
+</vector>
diff --git a/res/drawable/ic_timer_35_16.xml b/res/drawable/ic_timer_35_16.xml
deleted file mode 100644
index d5373b3eee..0000000000
--- a/res/drawable/ic_timer_35_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M15,8A6.992,6.992 0,0 1,4.5 14.058l0.5,-0.867A6,6 0,1 0,8 2V1A7,7 0,0 1,15 8ZM8.75,8A0.75,0.75 0,0 0,8 7.25a0.739,0.739 0,0 0,-0.639 0.381L7.35,7.625l-0.029,0.065 -0.015,0.034L5.283,12.205l0.434,0.25L8.65,8.375l-0.011,-0.006A0.732,0.732 0,0 0,8.75 8Z"/>
-</vector>
diff --git a/res/drawable/ic_timer_40_12.xml b/res/drawable/ic_timer_40_12.xml
new file mode 100644
index 0000000000..4cbcac258b
--- /dev/null
+++ b/res/drawable/ic_timer_40_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M1.074,2.579l0.889,0.513a5.035,5.035 0,0 0,-0.5 0.866L0.575,3.445A6,6 0,0 1,1.074 2.579ZM0.026,5.5a6.07,6.07 0,0 0,0 1H1.041a4.915,4.915 0,0 1,0 -1ZM11.8,4.447A6,6 0,0 0,5.5 0.025V1.041A4.991,4.991 0,1 1,1.456 8.047l-0.88,0.508A6,6 0,0 0,11.8 4.447ZM2.581,1.076l0.506,0.878a4.959,4.959 0,0 1,0.866 -0.5L3.446,0.576A5.994,5.994 0,0 0,2.581 1.076ZM6.65,5.625A0.751,0.751 0,0 0,5.625 5.35L2.411,7.784l0.25,0.432L6.375,6.649A0.749,0.749 0,0 0,6.65 5.625Z"/>
+</vector>
diff --git a/res/drawable/ic_timer_40_16.xml b/res/drawable/ic_timer_40_16.xml
deleted file mode 100644
index bd85eb118c..0000000000
--- a/res/drawable/ic_timer_40_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M15,8A7,7 0,0 1,1.943 11.5L2.81,11A6,6 0,1 0,8 2V1A7,7 0,0 1,15 8ZM8.75,8A0.75,0.75 0,0 0,8 7.25a0.732,0.732 0,0 0,-0.369 0.111L7.625,7.35l-4.08,2.934 0.25,0.432L8.276,8.694l0.034,-0.015 0.065,-0.029 -0.006,-0.011A0.739,0.739 0,0 0,8.75 8Z"/>
-</vector>
diff --git a/res/drawable/ic_timer_45_12.xml b/res/drawable/ic_timer_45_12.xml
new file mode 100644
index 0000000000..9e868025a2
--- /dev/null
+++ b/res/drawable/ic_timer_45_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M1.082,2.584l0.874,0.5a4.907,4.907 0,0 0,-0.5 0.865l-0.864,-0.5A5.94,5.94 0,0 1,1.082 2.584ZM2.582,1.084 L3.082,1.957a4.97,4.97 0,0 1,0.865 -0.5l-0.5,-0.863A5.94,5.94 0,0 0,2.584 1.082ZM10.241,1.759A5.962,5.962 0,0 0,5.5 0.048v1A5,5 0,1 1,1.05 5.5h-1a5.989,5.989 0,1 0,10.2 -3.743ZM6,5.25l-4,0.5v0.5l4,0.5a0.75,0.75 0,0 0,0 -1.5Z"/>
+</vector>
diff --git a/res/drawable/ic_timer_45_16.xml b/res/drawable/ic_timer_45_16.xml
deleted file mode 100644
index 9d56666c68..0000000000
--- a/res/drawable/ic_timer_45_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M8,7.25a0.75,0.75 0,0 1,0 1.5l-5,-0.5v-0.5ZM8,1V2A6,6 0,1 1,2 8H1A7,7 0,1 0,8 1Z"/>
-</vector>
diff --git a/res/drawable/ic_timer_50_12.xml b/res/drawable/ic_timer_50_12.xml
new file mode 100644
index 0000000000..00bf75c4ec
--- /dev/null
+++ b/res/drawable/ic_timer_50_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M3.445,0.575l0.513,0.888a5.008,5.008 0,0 0,-0.866 0.5l-0.513,-0.889A6.057,6.057 0,0 1,3.445 0.575ZM7.553,0.2A6,6 0,0 0,5.5 0.026V1.04A4.991,4.991 0,1 1,1.17 4.706a4.961,4.961 0,0 1,0.784 -1.619L1.077,2.58A6,6 0,1 0,7.553 0.2ZM6.375,5.35 L2.661,3.784l-0.25,0.432L5.625,6.649a0.75,0.75 0,1 0,0.75 -1.3Z"/>
+</vector>
diff --git a/res/drawable/ic_timer_50_16.xml b/res/drawable/ic_timer_50_16.xml
deleted file mode 100644
index a671f312d0..0000000000
--- a/res/drawable/ic_timer_50_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M15,8A7,7 0,1 1,1.942 4.5l0.867,0.5A6,6 0,1 0,8 2V1A7,7 0,0 1,15 8ZM8.369,7.361l0.006,-0.011L8.31,7.321l-0.034,-0.015L3.8,5.284l-0.25,0.432L7.625,8.65l0.006,-0.011A0.732,0.732 0,0 0,8 8.75,0.75 0.75,0 0,0 8.75,8 0.739,0.739 0,0 0,8.369 7.361Z"/>
-</vector>
diff --git a/res/drawable/ic_timer_55_12.xml b/res/drawable/ic_timer_55_12.xml
new file mode 100644
index 0000000000..bb66f6a4d1
--- /dev/null
+++ b/res/drawable/ic_timer_55_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M11.2,9A6,6 0,1 1,3.445 0.575l0.507,0.879A4.989,4.989 0,1 0,8.5 1.67a4.958,4.958 0,0 0,-3 -0.631V0.024A6,6 0,0 1,11.2 9ZM6.65,5.625 L4.216,2.411l-0.432,0.25L5.35,6.375a0.75,0.75 0,0 0,1.3 -0.75Z"/>
+</vector>
diff --git a/res/drawable/ic_timer_55_16.xml b/res/drawable/ic_timer_55_16.xml
deleted file mode 100644
index 769754652b..0000000000
--- a/res/drawable/ic_timer_55_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M8.75,8A0.75,0.75 0,0 1,8 8.75a0.739,0.739 0,0 1,-0.639 -0.381l-0.011,0.006L7.321,8.31l-0.015,-0.034L5.283,3.8l0.434,-0.25L8.65,7.625l-0.011,0.006A0.732,0.732 0,0 1,8.75 8ZM8,1V2a6.019,6.019 0,1 1,-3 0.81l-0.5,-0.867A6.991,6.991 0,1 0,8 1Z"/>
-</vector>
diff --git a/res/drawable/ic_timer_60_12.xml b/res/drawable/ic_timer_60_12.xml
new file mode 100644
index 0000000000..57d3316994
--- /dev/null
+++ b/res/drawable/ic_timer_60_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M6,1A5,5 0,1 1,1 6,5.006 5.006,0 0,1 6,1M6,0a6,6 0,1 0,6 6A6,6 0,0 0,6 0ZM6.25,2h-0.5l-0.5,4a0.75,0.75 0,0 0,1.5 0Z"/>
+</vector>
diff --git a/res/drawable/ic_timer_60_16.xml b/res/drawable/ic_timer_60_16.xml
deleted file mode 100644
index 1a7da0ec8c..0000000000
--- a/res/drawable/ic_timer_60_16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M8,2A6,6 0,1 1,2 8,6.007 6.007,0 0,1 8,2M8,1a7,7 0,1 0,7 7A7,7 0,0 0,8 1ZM8.25,3h-0.5l-0.5,5a0.75,0.75 0,0 0,1.5 0Z"/>
-</vector>
diff --git a/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java b/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java
index 33a0004339..052e772d1f 100644
--- a/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java
+++ b/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java
@@ -19,19 +19,19 @@ public class ExpirationTimerView extends androidx.appcompat.widget.AppCompatImag
   private boolean visible = false;
   private boolean stopped = true;
 
-  private final int[] frames = new int[]{ R.drawable.ic_timer_00_16,
-                                          R.drawable.ic_timer_05_16,
-                                          R.drawable.ic_timer_10_16,
-                                          R.drawable.ic_timer_15_16,
-                                          R.drawable.ic_timer_20_16,
-                                          R.drawable.ic_timer_25_16,
-                                          R.drawable.ic_timer_30_16,
-                                          R.drawable.ic_timer_35_16,
-                                          R.drawable.ic_timer_40_16,
-                                          R.drawable.ic_timer_45_16,
-                                          R.drawable.ic_timer_50_16,
-                                          R.drawable.ic_timer_55_16,
-                                          R.drawable.ic_timer_60_16 };
+  private final int[] frames = new int[]{ R.drawable.ic_timer_00_12,
+                                          R.drawable.ic_timer_05_12,
+                                          R.drawable.ic_timer_10_12,
+                                          R.drawable.ic_timer_15_12,
+                                          R.drawable.ic_timer_20_12,
+                                          R.drawable.ic_timer_25_12,
+                                          R.drawable.ic_timer_30_12,
+                                          R.drawable.ic_timer_35_12,
+                                          R.drawable.ic_timer_40_12,
+                                          R.drawable.ic_timer_45_12,
+                                          R.drawable.ic_timer_50_12,
+                                          R.drawable.ic_timer_55_12,
+                                          R.drawable.ic_timer_60_12 };
 
   public ExpirationTimerView(Context context) {
     super(context);