diff --git a/services_app/src/main/res/drawable-hdpi/ic_delete_black_24dp.png b/services_app/src/main/res/drawable-hdpi/ic_delete_black_24dp.png
deleted file mode 100644
index dbbb602a0..000000000
Binary files a/services_app/src/main/res/drawable-hdpi/ic_delete_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-hdpi/ic_done_white_24dp.png b/services_app/src/main/res/drawable-hdpi/ic_done_white_24dp.png
deleted file mode 100644
index c278b6c2b..000000000
Binary files a/services_app/src/main/res/drawable-hdpi/ic_done_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-hdpi/ic_error_white_24dp.png b/services_app/src/main/res/drawable-hdpi/ic_error_white_24dp.png
deleted file mode 100644
index 69cbb1e0b..000000000
Binary files a/services_app/src/main/res/drawable-hdpi/ic_error_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-hdpi/ic_exit_24dp.png b/services_app/src/main/res/drawable-hdpi/ic_exit_24dp.png
deleted file mode 100644
index c5bb23aed..000000000
Binary files a/services_app/src/main/res/drawable-hdpi/ic_exit_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-hdpi/ic_launch_black_24dp.png b/services_app/src/main/res/drawable-hdpi/ic_launch_black_24dp.png
deleted file mode 100644
index 4cfcf84be..000000000
Binary files a/services_app/src/main/res/drawable-hdpi/ic_launch_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png b/services_app/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png
deleted file mode 100644
index e05e76ffc..000000000
Binary files a/services_app/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-hdpi/ic_warning_white_24dp.png b/services_app/src/main/res/drawable-hdpi/ic_warning_white_24dp.png
deleted file mode 100644
index 55c68431b..000000000
Binary files a/services_app/src/main/res/drawable-hdpi/ic_warning_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-mdpi/ic_delete_black_24dp.png b/services_app/src/main/res/drawable-mdpi/ic_delete_black_24dp.png
deleted file mode 100644
index 999aa4ccc..000000000
Binary files a/services_app/src/main/res/drawable-mdpi/ic_delete_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-mdpi/ic_done_white_24dp.png b/services_app/src/main/res/drawable-mdpi/ic_done_white_24dp.png
deleted file mode 100644
index 6d84e1431..000000000
Binary files a/services_app/src/main/res/drawable-mdpi/ic_done_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-mdpi/ic_error_white_24dp.png b/services_app/src/main/res/drawable-mdpi/ic_error_white_24dp.png
deleted file mode 100644
index ca148fc7c..000000000
Binary files a/services_app/src/main/res/drawable-mdpi/ic_error_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-mdpi/ic_exit_24dp.png b/services_app/src/main/res/drawable-mdpi/ic_exit_24dp.png
deleted file mode 100644
index d3880d1d3..000000000
Binary files a/services_app/src/main/res/drawable-mdpi/ic_exit_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-mdpi/ic_launch_black_24dp.png b/services_app/src/main/res/drawable-mdpi/ic_launch_black_24dp.png
deleted file mode 100644
index cc2892dc7..000000000
Binary files a/services_app/src/main/res/drawable-mdpi/ic_launch_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png b/services_app/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png
deleted file mode 100644
index f7ac2a184..000000000
Binary files a/services_app/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-mdpi/ic_warning_white_24dp.png b/services_app/src/main/res/drawable-mdpi/ic_warning_white_24dp.png
deleted file mode 100644
index 04365b98a..000000000
Binary files a/services_app/src/main/res/drawable-mdpi/ic_warning_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png b/services_app/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png
deleted file mode 100644
index 796ccd225..000000000
Binary files a/services_app/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png b/services_app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png
deleted file mode 100644
index 3b2b65d26..000000000
Binary files a/services_app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xhdpi/ic_error_white_24dp.png b/services_app/src/main/res/drawable-xhdpi/ic_error_white_24dp.png
deleted file mode 100644
index 9829698dd..000000000
Binary files a/services_app/src/main/res/drawable-xhdpi/ic_error_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xhdpi/ic_exit_24dp.png b/services_app/src/main/res/drawable-xhdpi/ic_exit_24dp.png
deleted file mode 100644
index 42d8b1259..000000000
Binary files a/services_app/src/main/res/drawable-xhdpi/ic_exit_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xhdpi/ic_launch_black_24dp.png b/services_app/src/main/res/drawable-xhdpi/ic_launch_black_24dp.png
deleted file mode 100644
index 4ebc46b56..000000000
Binary files a/services_app/src/main/res/drawable-xhdpi/ic_launch_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png b/services_app/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png
deleted file mode 100644
index a8761c90a..000000000
Binary files a/services_app/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xhdpi/ic_warning_white_24dp.png b/services_app/src/main/res/drawable-xhdpi/ic_warning_white_24dp.png
deleted file mode 100644
index a43fa3c27..000000000
Binary files a/services_app/src/main/res/drawable-xhdpi/ic_warning_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png b/services_app/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png
deleted file mode 100644
index 6d7cb81c5..000000000
Binary files a/services_app/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png b/services_app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png
deleted file mode 100644
index 0ebb55559..000000000
Binary files a/services_app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xxhdpi/ic_error_white_24dp.png b/services_app/src/main/res/drawable-xxhdpi/ic_error_white_24dp.png
deleted file mode 100644
index abe2573b1..000000000
Binary files a/services_app/src/main/res/drawable-xxhdpi/ic_error_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xxhdpi/ic_exit_24dp.png b/services_app/src/main/res/drawable-xxhdpi/ic_exit_24dp.png
deleted file mode 100644
index c07dfbe5a..000000000
Binary files a/services_app/src/main/res/drawable-xxhdpi/ic_exit_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xxhdpi/ic_launch_black_24dp.png b/services_app/src/main/res/drawable-xxhdpi/ic_launch_black_24dp.png
deleted file mode 100644
index 4305f566e..000000000
Binary files a/services_app/src/main/res/drawable-xxhdpi/ic_launch_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png b/services_app/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png
deleted file mode 100644
index 16b1e4e24..000000000
Binary files a/services_app/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xxhdpi/ic_warning_white_24dp.png b/services_app/src/main/res/drawable-xxhdpi/ic_warning_white_24dp.png
deleted file mode 100644
index 807b9fa18..000000000
Binary files a/services_app/src/main/res/drawable-xxhdpi/ic_warning_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png b/services_app/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png
deleted file mode 100644
index f2b75c311..000000000
Binary files a/services_app/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png b/services_app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png
deleted file mode 100644
index d670618c7..000000000
Binary files a/services_app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xxxhdpi/ic_error_white_24dp.png b/services_app/src/main/res/drawable-xxxhdpi/ic_error_white_24dp.png
deleted file mode 100644
index 830fb7e1e..000000000
Binary files a/services_app/src/main/res/drawable-xxxhdpi/ic_error_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xxxhdpi/ic_exit_24dp.png b/services_app/src/main/res/drawable-xxxhdpi/ic_exit_24dp.png
deleted file mode 100644
index 628b696c7..000000000
Binary files a/services_app/src/main/res/drawable-xxxhdpi/ic_exit_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xxxhdpi/ic_launch_black_24dp.png b/services_app/src/main/res/drawable-xxxhdpi/ic_launch_black_24dp.png
deleted file mode 100644
index 4eb7b166c..000000000
Binary files a/services_app/src/main/res/drawable-xxxhdpi/ic_launch_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png b/services_app/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png
deleted file mode 100644
index f04166536..000000000
Binary files a/services_app/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable-xxxhdpi/ic_warning_white_24dp.png b/services_app/src/main/res/drawable-xxxhdpi/ic_warning_white_24dp.png
deleted file mode 100644
index 8683a2ea9..000000000
Binary files a/services_app/src/main/res/drawable-xxxhdpi/ic_warning_white_24dp.png and /dev/null differ
diff --git a/services_app/src/main/res/drawable/ic_delete_black_24dp.xml b/services_app/src/main/res/drawable/ic_delete_black_24dp.xml
new file mode 100644
index 000000000..7c34c8194
--- /dev/null
+++ b/services_app/src/main/res/drawable/ic_delete_black_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
+</vector>
diff --git a/services_app/src/main/res/drawable/ic_done_white_24dp.xml b/services_app/src/main/res/drawable/ic_done_white_24dp.xml
new file mode 100644
index 000000000..5ecf9a46e
--- /dev/null
+++ b/services_app/src/main/res/drawable/ic_done_white_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
+</vector>
diff --git a/services_app/src/main/res/drawable/ic_error_white_24dp.xml b/services_app/src/main/res/drawable/ic_error_white_24dp.xml
new file mode 100644
index 000000000..9cdedaed3
--- /dev/null
+++ b/services_app/src/main/res/drawable/ic_error_white_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
+</vector>
diff --git a/services_app/src/main/res/drawable/ic_exit_24dp.xml b/services_app/src/main/res/drawable/ic_exit_24dp.xml
new file mode 100644
index 000000000..2e9004713
--- /dev/null
+++ b/services_app/src/main/res/drawable/ic_exit_24dp.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="256"
+    android:viewportHeight="256">
+    <path
+        android:fillColor="#000000"
+        android:fillType="nonZero"
+        android:pathData="M244.07,131.43c0.09,-0.18 0.17,-0.37 0.24,-0.56c0.12,-0.31 0.21,-0.62 0.29,-0.94c0.04,-0.17 0.1,-0.35 0.13,-0.52c0.1,-0.51 0.15,-1.02 0.15,-1.54l0,0c0,0 0,0 0,0c0,-0.52 -0.06,-1.03 -0.15,-1.54c-0.03,-0.18 -0.08,-0.35 -0.13,-0.52c-0.08,-0.32 -0.17,-0.64 -0.29,-0.94c-0.07,-0.19 -0.15,-0.38 -0.24,-0.56c-0.13,-0.28 -0.28,-0.55 -0.44,-0.81c-0.11,-0.18 -0.22,-0.35 -0.34,-0.52c-0.06,-0.08 -0.09,-0.16 -0.15,-0.24L210.23,79.89c-2.84,-3.69 -8.13,-4.39 -11.82,-1.55c-3.69,2.84 -4.39,8.13 -1.55,11.82L219.35,119.43L88.24,119.43c-4.66,0 -8.43,3.77 -8.43,8.43c0,4.66 3.77,8.43 8.43,8.43l131.1,0l-22.48,29.26c-2.84,3.69 -2.14,8.98 1.55,11.82c1.53,1.18 3.34,1.75 5.13,1.75c2.53,0 5.03,-1.13 6.69,-3.29l32.91,-42.83c0.06,-0.08 0.1,-0.16 0.15,-0.24c0.12,-0.17 0.22,-0.34 0.33,-0.52C243.79,131.97 243.94,131.7 244.07,131.43z"
+        android:strokeWidth="2.81"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+    <path
+        android:fillColor="#000000"
+        android:fillType="nonZero"
+        android:pathData="M171.25,254.31L27.69,254.31c-4.66,0 -8.43,-3.77 -8.43,-8.43L19.26,9.84c0,-4.66 3.77,-8.43 8.43,-8.43l143.56,0c4.66,0 8.43,3.77 8.43,8.43l0,84.45c0,4.66 -3.77,8.43 -8.43,8.43s-8.43,-3.77 -8.43,-8.43L162.82,18.27L36.12,18.27l0,219.18l126.7,0L162.82,157.67c0,-4.66 3.77,-8.43 8.43,-8.43s8.43,3.77 8.43,8.43L179.68,245.88C179.68,250.53 175.91,254.31 171.25,254.31z"
+        android:strokeWidth="2.81"
+        android:strokeColor="#00000000"
+        android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" />
+</vector>
diff --git a/services_app/src/main/res/drawable/ic_launch_black_24dp.xml b/services_app/src/main/res/drawable/ic_launch_black_24dp.xml
new file mode 100644
index 000000000..613016c37
--- /dev/null
+++ b/services_app/src/main/res/drawable/ic_launch_black_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z" />
+</vector>
diff --git a/services_app/src/main/res/drawable/ic_vpn_key_black_24dp.xml b/services_app/src/main/res/drawable/ic_vpn_key_black_24dp.xml
new file mode 100644
index 000000000..7044954f5
--- /dev/null
+++ b/services_app/src/main/res/drawable/ic_vpn_key_black_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
+</vector>
diff --git a/services_app/src/main/res/drawable/ic_warning_white_24dp.xml b/services_app/src/main/res/drawable/ic_warning_white_24dp.xml
new file mode 100644
index 000000000..bcea5851d
--- /dev/null
+++ b/services_app/src/main/res/drawable/ic_warning_white_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorOnPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z" />
+</vector>