diff --git a/app/src/main/res/drawable-hdpi/ic_error.png b/app/src/main/res/drawable-hdpi/ic_error.png
deleted file mode 100644
index 5b57c7458f..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_error.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_maintenance.png b/app/src/main/res/drawable-hdpi/ic_maintenance.png
deleted file mode 100644
index 60f34eb201..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_maintenance.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_reminder.png b/app/src/main/res/drawable-hdpi/ic_reminder.png
deleted file mode 100644
index b45924d4eb..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_reminder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_warning.png b/app/src/main/res/drawable-hdpi/ic_warning.png
deleted file mode 100644
index d7aa344bca..0000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_warning.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_error.png b/app/src/main/res/drawable-mdpi/ic_error.png
deleted file mode 100644
index 68a4b0e48c..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_error.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_maintenance.png b/app/src/main/res/drawable-mdpi/ic_maintenance.png
deleted file mode 100644
index 728313d9e7..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_maintenance.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_reminder.png b/app/src/main/res/drawable-mdpi/ic_reminder.png
deleted file mode 100644
index 2c269d5530..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_reminder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_warning.png b/app/src/main/res/drawable-mdpi/ic_warning.png
deleted file mode 100644
index 1ff44a152a..0000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_warning.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_error.png b/app/src/main/res/drawable-xhdpi/ic_error.png
deleted file mode 100644
index dee2d5af82..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_error.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_maintenance.png b/app/src/main/res/drawable-xhdpi/ic_maintenance.png
deleted file mode 100644
index 303e1780f9..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_maintenance.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_reminder.png b/app/src/main/res/drawable-xhdpi/ic_reminder.png
deleted file mode 100644
index 904a608285..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_reminder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_warning.png b/app/src/main/res/drawable-xhdpi/ic_warning.png
deleted file mode 100644
index 652a1bb1d9..0000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_warning.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_error.png b/app/src/main/res/drawable-xxhdpi/ic_error.png
deleted file mode 100644
index cf389b5d96..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_error.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_maintenance.png b/app/src/main/res/drawable-xxhdpi/ic_maintenance.png
deleted file mode 100644
index 952e7b9ef3..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_maintenance.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_reminder.png b/app/src/main/res/drawable-xxhdpi/ic_reminder.png
deleted file mode 100644
index e918305ba0..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_reminder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_warning.png b/app/src/main/res/drawable-xxhdpi/ic_warning.png
deleted file mode 100644
index 7ab70f77c2..0000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_warning.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_error.png b/app/src/main/res/drawable-xxxhdpi/ic_error.png
deleted file mode 100644
index b8743474f7..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_error.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_maintenance.png b/app/src/main/res/drawable-xxxhdpi/ic_maintenance.png
deleted file mode 100644
index 1046459dc3..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_maintenance.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_reminder.png b/app/src/main/res/drawable-xxxhdpi/ic_reminder.png
deleted file mode 100644
index 6aa4e934d0..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_reminder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_warning.png b/app/src/main/res/drawable-xxxhdpi/ic_warning.png
deleted file mode 100644
index 607e14b7d2..0000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_warning.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
new file mode 100644
index 0000000000..fe665ee185
--- /dev/null
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -0,0 +1,9 @@
+<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="M12.028,2.042c-5.523,0 -10,4.477 -10,10c0,5.523 4.477,10 10,10s10,-4.477 10,-10C22.028,6.519 17.551,2.042 12.028,2.042zM13.007,16.958h-1.958V11h1.958V16.958zM13.007,8.958h-1.958V7h1.958V8.958z"
+      android:fillColor="@color/white"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_maintenance.xml b/app/src/main/res/drawable/ic_maintenance.xml
new file mode 100644
index 0000000000..7f606d8b44
--- /dev/null
+++ b/app/src/main/res/drawable/ic_maintenance.xml
@@ -0,0 +1,9 @@
+<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="M12.064,2.891c-2.006,-2.006 -4.997,-2.417 -7.414,-1.246l4.398,4.398L6.044,9.049L1.645,4.651c-1.171,2.417 -0.76,5.408 1.246,7.414c1.86,1.86 4.568,2.349 6.879,1.477l9.17,9.17c0.391,0.391 1.024,0.391 1.414,0l2.357,-2.357c0.391,-0.391 0.391,-1.024 0,-1.414l-9.17,-9.17C14.413,7.459 13.925,4.751 12.064,2.891z"
+      android:fillColor="@color/white"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_reminder2.xml b/app/src/main/res/drawable/ic_reminder.xml
similarity index 92%
rename from app/src/main/res/drawable/ic_reminder2.xml
rename to app/src/main/res/drawable/ic_reminder.xml
index 35c3148df5..b2d8e7ee7a 100644
--- a/app/src/main/res/drawable/ic_reminder2.xml
+++ b/app/src/main/res/drawable/ic_reminder.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/white"
         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>
diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml
new file mode 100644
index 0000000000..484c065ece
--- /dev/null
+++ b/app/src/main/res/drawable/ic_warning.xml
@@ -0,0 +1,9 @@
+<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="M12,2.411L0.927,21.589h22.146L12,2.411zM13.042,18.446h-1.958v-1.958h1.958V18.446zM11.083,14.488v-4h1.958v4H11.083z"
+      android:fillColor="#231F20"/>
+</vector>
diff --git a/icons/ic_error.svg b/icons/ic_error.svg
new file mode 100644
index 0000000000..ce9df53b43
--- /dev/null
+++ b/icons/ic_error.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_error">
+	<path fill="#FFFFFF" d="M12.028,2.042c-5.523,0-10,4.477-10,10c0,5.523,4.477,10,10,10s10-4.477,10-10
+		C22.028,6.519,17.551,2.042,12.028,2.042z M13.007,16.958h-1.958V11h1.958V16.958z M13.007,8.958h-1.958V7h1.958V8.958z"/>
+</g>
+</svg>
diff --git a/icons/ic_maintenance.svg b/icons/ic_maintenance.svg
new file mode 100644
index 0000000000..cc3d228360
--- /dev/null
+++ b/icons/ic_maintenance.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_maintenance">
+	<path fill="#FFFFFF" d="M12.064,2.891c-2.006-2.006-4.997-2.417-7.414-1.246l4.398,4.398L6.044,9.049L1.645,4.651
+		c-1.171,2.417-0.76,5.408,1.246,7.414c1.86,1.86,4.568,2.349,6.879,1.477l9.17,9.17c0.391,0.391,1.024,0.391,1.414,0l2.357-2.357
+		c0.391-0.391,0.391-1.024,0-1.414l-9.17-9.17C14.413,7.459,13.925,4.751,12.064,2.891z"/>
+</g>
+</svg>
diff --git a/icons/ic_warning.svg b/icons/ic_warning.svg
new file mode 100644
index 0000000000..6ec4720d84
--- /dev/null
+++ b/icons/ic_warning.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_warning">
+	<path fill="#231F20" d="M12,2.411L0.927,21.589h22.146L12,2.411z M13.042,18.446h-1.958v-1.958h1.958V18.446z M11.083,14.488v-4
+		h1.958v4H11.083z"/>
+</g>
+</svg>