Replace system standard bitmap drawables with vector drawables

151 files changed, 268 insertions, 63 deletions

diff --git a/main/src/main/res/drawable-hdpi/ic_menu_archive.png b/main/src/main/res/drawable-hdpi/ic_menu_archive.png
deleted file mode 100644
index e2d9bc1a..00000000
--- a/main/src/main/res/drawable-hdpi/ic_menu_archive.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-hdpi/ic_menu_copy_holo_light.png b/main/src/main/res/drawable-hdpi/ic_menu_copy_holo_light.png
deleted file mode 100644
index 0dd8865f..00000000
--- a/main/src/main/res/drawable-hdpi/ic_menu_copy_holo_light.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-hdpi/ic_menu_log.png b/main/src/main/res/drawable-hdpi/ic_menu_log.png
deleted file mode 100644
index 474ec16e..00000000
--- a/main/src/main/res/drawable-hdpi/ic_menu_log.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-hdpi/vpn_item_settings.png b/main/src/main/res/drawable-hdpi/vpn_item_settings.png
deleted file mode 100644
index 47b4ba23..00000000
--- a/main/src/main/res/drawable-hdpi/vpn_item_settings.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-mdpi/ic_menu_archive.png b/main/src/main/res/drawable-mdpi/ic_menu_archive.png
deleted file mode 100644
index 49ac569d..00000000
--- a/main/src/main/res/drawable-mdpi/ic_menu_archive.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-mdpi/ic_menu_copy_holo_light.png b/main/src/main/res/drawable-mdpi/ic_menu_copy_holo_light.png
deleted file mode 100644
index 74cb920f..00000000
--- a/main/src/main/res/drawable-mdpi/ic_menu_copy_holo_light.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-mdpi/ic_menu_log.png b/main/src/main/res/drawable-mdpi/ic_menu_log.png
deleted file mode 100644
index c8d60977..00000000
--- a/main/src/main/res/drawable-mdpi/ic_menu_log.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-mdpi/vpn_item_settings.png b/main/src/main/res/drawable-mdpi/vpn_item_settings.png
deleted file mode 100644
index 79281042..00000000
--- a/main/src/main/res/drawable-mdpi/vpn_item_settings.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-xhdpi/ic_menu_archive.png b/main/src/main/res/drawable-xhdpi/ic_menu_archive.png
deleted file mode 100644
index b1be9d5b..00000000
--- a/main/src/main/res/drawable-xhdpi/ic_menu_archive.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-xhdpi/ic_menu_copy_holo_light.png b/main/src/main/res/drawable-xhdpi/ic_menu_copy_holo_light.png
deleted file mode 100644
index 364b1692..00000000
--- a/main/src/main/res/drawable-xhdpi/ic_menu_copy_holo_light.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-xhdpi/ic_menu_log.png b/main/src/main/res/drawable-xhdpi/ic_menu_log.png
deleted file mode 100644
index 29c1faed..00000000
--- a/main/src/main/res/drawable-xhdpi/ic_menu_log.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-xhdpi/vpn_item_settings.png b/main/src/main/res/drawable-xhdpi/vpn_item_settings.png
deleted file mode 100644
index a057db8b..00000000
--- a/main/src/main/res/drawable-xhdpi/vpn_item_settings.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-xxhdpi/ic_menu_copy_holo_light.png b/main/src/main/res/drawable-xxhdpi/ic_menu_copy_holo_light.png
deleted file mode 100644
index 91043c9d..00000000
--- a/main/src/main/res/drawable-xxhdpi/ic_menu_copy_holo_light.png
+++ /dev/null
diff --git a/main/src/main/res/drawable-xxhdpi/ic_menu_log.png b/main/src/main/res/drawable-xxhdpi/ic_menu_log.png
deleted file mode 100644
index d91c632b..00000000
--- a/main/src/main/res/drawable-xxhdpi/ic_menu_log.png
+++ /dev/null
diff --git a/main/src/main/res/drawable/ic_baseline_add_circle_outline_24.xml b/main/src/main/res/drawable/ic_baseline_add_circle_outline_24.xml
new file mode 100644
index 00000000..d243c2f3
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_add_circle_outline_24.xml
@@ -0,0 +1,10 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" 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/main/src/main/res/drawable/ic_baseline_archive_24.xml b/main/src/main/res/drawable/ic_baseline_archive_24.xml
new file mode 100644
index 00000000..3e7b6df1
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_archive_24.xml
@@ -0,0 +1,10 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
+</vector>
diff --git a/main/src/main/res/drawable/ic_baseline_check_24.xml b/main/src/main/res/drawable/ic_baseline_check_24.xml
new file mode 100644
index 00000000..0a3aedb6
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_check_24.xml
@@ -0,0 +1,10 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <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/main/src/main/res/drawable/ic_baseline_close_24.xml b/main/src/main/res/drawable/ic_baseline_close_24.xml
new file mode 100644
index 00000000..57cc2c2a
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_close_24.xml
@@ -0,0 +1,10 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/main/src/main/res/drawable/ic_baseline_delete_24.xml b/main/src/main/res/drawable/ic_baseline_delete_24.xml
new file mode 100644
index 00000000..0e28eccf
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_delete_24.xml
@@ -0,0 +1,15 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:tint="?attr/colorControlNormal"
+        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/main/src/main/res/drawable/ic_baseline_delete_outline_24.xml b/main/src/main/res/drawable/ic_baseline_delete_outline_24.xml
new file mode 100644
index 00000000..3486e426
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_delete_outline_24.xml
@@ -0,0 +1,10 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8,9h8v10L8,19L8,9zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
+</vector>
diff --git a/main/src/main/res/drawable/ic_baseline_edit_24.xml b/main/src/main/res/drawable/ic_baseline_edit_24.xml
new file mode 100644
index 00000000..ef50295e
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_edit_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#AFAFAF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/main/src/main/res/drawable/ic_baseline_file_copy_24.xml b/main/src/main/res/drawable/ic_baseline_file_copy_24.xml
new file mode 100644
index 00000000..ecd94523
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_file_copy_24.xml
@@ -0,0 +1,10 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5l6,6v10c0,1.1 -0.9,2 -2,2L7.99,23C6.89,23 6,22.1 6,21l0.01,-14c0,-1.1 0.89,-2 1.99,-2h7zM14,12h5.5L14,6.5L14,12z"/>
+</vector>
diff --git a/main/src/main/res/drawable/ic_baseline_file_present_24.xml b/main/src/main/res/drawable/ic_baseline_file_present_24.xml
new file mode 100644
index 00000000..7ecee740
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_file_present_24.xml
@@ -0,0 +1,10 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15,2L6,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,7l-5,-5zM6,20L6,4h8v4h4v12L6,20zM16,10v5c0,2.21 -1.79,4 -4,4s-4,-1.79 -4,-4L8,8.5c0,-1.47 1.26,-2.64 2.76,-2.49 1.3,0.13 2.24,1.32 2.24,2.63L13,15h-2L11,8.5c0,-0.28 -0.22,-0.5 -0.5,-0.5s-0.5,0.22 -0.5,0.5L10,15c0,1.1 0.9,2 2,2s2,-0.9 2,-2v-5h2z"/>
+</vector>
diff --git a/main/src/main/res/drawable/ic_baseline_filter_list_24.xml b/main/src/main/res/drawable/ic_baseline_filter_list_24.xml
new file mode 100644
index 00000000..3775d893
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_filter_list_24.xml
@@ -0,0 +1,10 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+</vector>
diff --git a/main/src/main/res/drawable/ic_baseline_folder_24.xml b/main/src/main/res/drawable/ic_baseline_folder_24.xml
new file mode 100644
index 00000000..ddb19f72
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_folder_24.xml
@@ -0,0 +1,10 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+</vector>
diff --git a/main/src/main/res/drawable/ic_baseline_pause_24.xml b/main/src/main/res/drawable/ic_baseline_pause_24.xml
new file mode 100644
index 00000000..ddf43821
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_pause_24.xml
@@ -0,0 +1,10 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>
diff --git a/main/src/main/res/drawable/ic_baseline_play_arrow_24.xml b/main/src/main/res/drawable/ic_baseline_play_arrow_24.xml
new file mode 100644
index 00000000..bc2dc1f2
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_play_arrow_24.xml
@@ -0,0 +1,10 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M8,5v14l11,-7z"/>
+</vector>
diff --git a/main/src/main/res/drawable/ic_baseline_receipt_long_24.xml b/main/src/main/res/drawable/ic_baseline_receipt_long_24.xml
new file mode 100644
index 00000000..0880a35b
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_receipt_long_24.xml
@@ -0,0 +1,14 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="?attr/colorControlNormal" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19.5,3.5L18,2l-1.5,1.5L15,2l-1.5,1.5L12,2l-1.5,1.5L9,2L7.5,3.5L6,2v14H3v3c0,1.66 1.34,3 3,3h12c1.66,0 3,-1.34 3,-3V2L19.5,3.5zM19,19c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1v-3H8V5h11V19z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M9,7h6v2h-6z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M16,7h2v2h-2z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M9,10h6v2h-6z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M16,10h2v2h-2z"/>
+</vector>
diff --git a/main/src/main/res/drawable/ic_baseline_search_24.xml b/main/src/main/res/drawable/ic_baseline_search_24.xml
new file mode 100644
index 00000000..8a14314b
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_search_24.xml
@@ -0,0 +1,10 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/main/src/main/res/drawable/ic_baseline_share_24.xml b/main/src/main/res/drawable/ic_baseline_share_24.xml
new file mode 100644
index 00000000..36f1711a
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_share_24.xml
@@ -0,0 +1,15 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:tint="?attr/colorControlNormal"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+            android:fillColor="@android:color/white"
+            android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
+</vector>
diff --git a/main/src/main/res/drawable/ic_baseline_sort_24.xml b/main/src/main/res/drawable/ic_baseline_sort_24.xml
new file mode 100644
index 00000000..332d4031
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_sort_24.xml
@@ -0,0 +1,10 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="?attr/colorControlNormal" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+</vector>
diff --git a/main/src/main/res/drawable/ic_baseline_warning_24.xml b/main/src/main/res/drawable/ic_baseline_warning_24.xml
new file mode 100644
index 00000000..6a3283fe
--- /dev/null
+++ b/main/src/main/res/drawable/ic_baseline_warning_24.xml
@@ -0,0 +1,10 @@
+<!--
+  ~ Copyright (c) 2012-2022 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+</vector>
diff --git a/main/src/main/res/drawable/ic_edit.xml b/main/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 00000000..98b15783
--- /dev/null
+++ b/main/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:tint="?attr/colorControlNormal"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+            android:fillColor="@android:color/white"
+            android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
+</vector>
diff --git a/main/src/main/res/values/attrs.xml b/main/src/main/res/values/attrs.xml
index 502a691b..06caf3f0 100644
--- a/main/src/main/res/values/attrs.xml
+++ b/main/src/main/res/values/attrs.xml
@@ -6,7 +6,8 @@
   -->
 
 <resources>
-     <declare-styleable name="FileSelectLayout">
+
+    <declare-styleable name="FileSelectLayout">
        <attr name="fileTitle" format="string|reference" />
       <attr name="certificate" format="boolean" />
 <!--     <attr name="taskid" format="integer" /> -->
diff --git a/main/src/main/res/values/refs.xml b/main/src/main/res/values/refs.xml
new file mode 100644
index 00000000..ebed84fa
--- /dev/null
+++ b/main/src/main/res/values/refs.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2012-2016 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<resources>
+    <drawable name="ic_menu_close_clear_cancel">@drawable/ic_baseline_close_24</drawable>
+    <drawable name="ic_menu_play">@drawable/ic_baseline_play_arrow_24</drawable>
+    <drawable name="ic_menu_pause">@drawable/ic_baseline_pause_24</drawable>
+    <drawable name="ic_menu_share">@drawable/ic_baseline_share_24</drawable>
+    <drawable name="ic_menu_save">@drawable/ic_baseline_check_24</drawable>
+    <drawable name="ic_menu_view">@drawable/ic_baseline_filter_list_24</drawable>
+    <drawable name="ic_menu_delete">@drawable/ic_baseline_delete_outline_24</drawable>
+    <drawable name="ic_menu_copy">@drawable/ic_baseline_file_copy_24</drawable>
+    <drawable name="ic_menu_delete_grey">@drawable/ic_baseline_delete_outline_24</drawable>
+    <drawable name="ic_search">@drawable/ic_baseline_search_24</drawable>
+
+    <drawable name="ic_menu_edit">@drawable/ic_edit</drawable>
+    <drawable name="ic_menu_import">@drawable/ic_baseline_archive_24</drawable>
+    <drawable name="ic_menu_add">@drawable/ic_baseline_add_circle_outline_24</drawable>
+    <drawable name="ic_dialog_alert">@drawable/ic_baseline_warning_24</drawable>
+    <drawable name="ic_menu_add_grey">@drawable/ic_baseline_add_circle_outline_24</drawable>
+    <drawable name="ic_menu_import_grey">@drawable/ic_baseline_archive_24</drawable>
+    <drawable name="ic_receipt">@drawable/ic_baseline_receipt_long_24</drawable>
+    <drawable name="ic_sort">@drawable/ic_baseline_sort_24</drawable>
+
+</resources>
\ No newline at end of file
diff --git a/main/src/skeleton/res/values/attrs.xml b/main/src/skeleton/res/values/attrs.xml
new file mode 100644
index 00000000..051e23d0
--- /dev/null
+++ b/main/src/skeleton/res/values/attrs.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<resources>
+    <!-- allows to share the vector graphics with ui build, a little bit hacky... -->
+    <attr name="colorControlNormal" format="color" />
+</resources>
\ No newline at end of file
diff --git a/main/src/skeleton/res/values/refs.xml b/main/src/skeleton/res/values/refs.xml
deleted file mode 100644
index a5105456..00000000
--- a/main/src/skeleton/res/values/refs.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2012-2016 Arne Schwabe
-  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-  -->
-
-
-<resources>
-    <drawable name="ic_menu_close_clear_cancel">@android:drawable/ic_menu_close_clear_cancel</drawable>
-    <drawable name="ic_menu_play">@android:drawable/ic_media_play</drawable>
-    <drawable name="ic_menu_pause">@android:drawable/ic_media_pause</drawable>
-    <drawable name="ic_menu_share">@android:drawable/ic_menu_share</drawable>
-    <drawable name="ic_menu_save">@android:drawable/ic_menu_save</drawable>
-    <drawable name="ic_menu_view">@android:drawable/ic_menu_view</drawable>
-    <drawable name="ic_menu_delete">@android:drawable/ic_menu_delete</drawable>
-    <drawable name="ic_menu_edit">@android:drawable/ic_menu_edit</drawable>
-    <drawable name="ic_menu_import">@drawable/ic_menu_archive</drawable>
-    <drawable name="vpn_item_edit">@drawable/vpn_item_settings</drawable>
-    <drawable name="ic_menu_add">@android:drawable/ic_menu_add</drawable>
-    <drawable name="ic_dialog_alert">@android:drawable/ic_dialog_alert</drawable>
-    <drawable name="ic_menu_add_grey">@android:drawable/ic_menu_add</drawable>
-    <drawable name="ic_menu_import_grey">@drawable/ic_menu_archive</drawable>
-    <drawable name="ic_menu_delete_grey">@android:drawable/ic_menu_delete</drawable>
-    <drawable name="ic_menu_copy">@drawable/ic_menu_copy_holo_light</drawable>
-    <drawable name="ic_receipt">@drawable/ic_menu_log</drawable>
-    <drawable name="ic_sort">@android:drawable/ic_menu_sort_by_size</drawable>
-
-</resources>
\ No newline at end of file
diff --git a/main/src/skeleton/res/values/styles.xml b/main/src/skeleton/res/values/styles.xml
index dbe2d1e4..9a6ca1e8 100644
--- a/main/src/skeleton/res/values/styles.xml
+++ b/main/src/skeleton/res/values/styles.xml
@@ -14,5 +14,4 @@
 
     <style name="blinkt" parent="blinkt.baseTheme" />
 
-
 </resources>
\ No newline at end of file
diff --git a/main/src/ui/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
index 121cf324..59607fd2 100644
--- a/main/src/ui/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
@@ -186,11 +186,11 @@ public class FileSelectionFragment extends ListFragment {
         if (!currentPath.equals(ROOT)) {
 
             item.add(ROOT);
-            addItem(ROOT, R.drawable.ic_root_folder_am);
+            addItem(ROOT, R.drawable.ic_baseline_folder_24);
             path.add(ROOT);
 
             item.add("../");
-            addItem("../", R.drawable.ic_root_folder_am);
+            addItem("../", R.drawable.ic_baseline_folder_24);
             path.add(f.getParent());
             parentPath = f.getParent();
 
@@ -248,11 +248,11 @@ public class FileSelectionFragment extends ListFragment {
                 ITEM_KEY, ITEM_IMAGE}, new int[]{R.id.fdrowtext, R.id.fdrowimage});
 
         for (String dir : dirsMap.tailMap("").values()) {
-            addItem(dir, R.drawable.ic_root_folder_am);
+            addItem(dir, R.drawable.ic_baseline_folder_24);
         }
 
         for (String file : filesMap.tailMap("").values()) {
-            addItem(file, R.drawable.ic_doc_generic_am);
+            addItem(file, R.drawable.ic_baseline_file_present_24);
         }
 
         fileList.notifyDataSetChanged();
diff --git a/main/src/ui/res/drawable-hdpi/ic_add_circle_outline_grey600_24dp.png b/main/src/ui/res/drawable-hdpi/ic_add_circle_outline_grey600_24dp.png
deleted file mode 100644
index 7e0a71cd..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_add_circle_outline_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_add_circle_outline_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_add_circle_outline_white_24dp.png
deleted file mode 100644
index d86d598e..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_add_circle_outline_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_archive_grey600_24dp.png b/main/src/ui/res/drawable-hdpi/ic_archive_grey600_24dp.png
deleted file mode 100644
index 2948d5fc..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_archive_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_archive_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_archive_white_24dp.png
deleted file mode 100644
index a9b0b240..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_archive_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_check_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_check_white_24dp.png
deleted file mode 100644
index f42a0e2d..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_check_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_close_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_close_white_24dp.png
deleted file mode 100644
index ceb1a1ee..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_close_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_content_copy_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_content_copy_white_24dp.png
deleted file mode 100644
index 03b1aac4..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_content_copy_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_delete_grey600_24dp.png b/main/src/ui/res/drawable-hdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index b72a9f3c..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_delete_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_delete_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_delete_white_24dp.png
deleted file mode 100644
index a9eac0ca..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_delete_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_doc_generic_am.png b/main/src/ui/res/drawable-hdpi/ic_doc_generic_am.png
deleted file mode 100644
index 55b9b7d3..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_doc_generic_am.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_edit_grey600_24dp.png b/main/src/ui/res/drawable-hdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index b5f88c80..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_edit_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_edit_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_edit_white_24dp.png
deleted file mode 100644
index 730416c9..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_edit_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_filter_list_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index 30122adf..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_filter_list_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_menu_copy_holo_dark.png b/main/src/ui/res/drawable-hdpi/ic_menu_copy_holo_dark.png
deleted file mode 100644
index d37d0a31..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_menu_copy_holo_dark.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_pause_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_pause_white_24dp.png
deleted file mode 100644
index 4d2ea05c..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_pause_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_play_arrow_white_24dp.png
deleted file mode 100644
index 57c9fa54..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_play_arrow_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_receipt_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_receipt_white_24dp.png
deleted file mode 100644
index bf781280..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_receipt_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_root_folder_am.png b/main/src/ui/res/drawable-hdpi/ic_root_folder_am.png
deleted file mode 100644
index 915e1182..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_root_folder_am.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_search_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_search_white_24dp.png
deleted file mode 100755
index bbfbc96c..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_search_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_share_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_share_white_24dp.png
deleted file mode 100644
index 93b3c219..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_share_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_sort_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_sort_white_24dp.png
deleted file mode 100644
index 55a429b6..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_sort_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-hdpi/ic_warning_black_36dp.png b/main/src/ui/res/drawable-hdpi/ic_warning_black_36dp.png
deleted file mode 100644
index d1cef177..00000000
--- a/main/src/ui/res/drawable-hdpi/ic_warning_black_36dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_add_circle_outline_grey600_24dp.png b/main/src/ui/res/drawable-mdpi/ic_add_circle_outline_grey600_24dp.png
deleted file mode 100644
index b5017d2a..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_add_circle_outline_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_add_circle_outline_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_add_circle_outline_white_24dp.png
deleted file mode 100644
index 6a1c32aa..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_add_circle_outline_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_archive_grey600_24dp.png b/main/src/ui/res/drawable-mdpi/ic_archive_grey600_24dp.png
deleted file mode 100644
index a42d774c..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_archive_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_archive_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_archive_white_24dp.png
deleted file mode 100644
index 8e4a0426..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_archive_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_check_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_check_white_24dp.png
deleted file mode 100644
index e91f9048..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_check_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_close_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_close_white_24dp.png
deleted file mode 100644
index af7f8288..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_close_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_content_copy_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_content_copy_white_24dp.png
deleted file mode 100644
index 6aa238c5..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_content_copy_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_delete_grey600_24dp.png b/main/src/ui/res/drawable-mdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index e757fdb0..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_delete_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_delete_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_delete_white_24dp.png
deleted file mode 100644
index e4ea52ef..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_delete_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_doc_generic_am.png b/main/src/ui/res/drawable-mdpi/ic_doc_generic_am.png
deleted file mode 100644
index a1bd14ea..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_doc_generic_am.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_edit_grey600_24dp.png b/main/src/ui/res/drawable-mdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index bae3480c..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_edit_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_edit_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_edit_white_24dp.png
deleted file mode 100644
index 85cff0b9..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_edit_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_filter_list_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index 49cec669..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_filter_list_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_menu_copy_holo_dark.png b/main/src/ui/res/drawable-mdpi/ic_menu_copy_holo_dark.png
deleted file mode 100644
index 97e8ac1b..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_menu_copy_holo_dark.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_pause_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_pause_white_24dp.png
deleted file mode 100644
index 2272d478..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_pause_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_play_arrow_white_24dp.png
deleted file mode 100644
index c61e948b..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_play_arrow_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_receipt_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_receipt_white_24dp.png
deleted file mode 100644
index 565c67ff..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_receipt_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_root_folder_am.png b/main/src/ui/res/drawable-mdpi/ic_root_folder_am.png
deleted file mode 100644
index 4352d08d..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_root_folder_am.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_search_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_search_white_24dp.png
deleted file mode 100755
index faefc59c..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_search_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_share_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_share_white_24dp.png
deleted file mode 100644
index 4d019722..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_share_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_sort_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_sort_white_24dp.png
deleted file mode 100644
index 3d84a444..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_sort_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-mdpi/ic_warning_black_36dp.png b/main/src/ui/res/drawable-mdpi/ic_warning_black_36dp.png
deleted file mode 100644
index 52273c3e..00000000
--- a/main/src/ui/res/drawable-mdpi/ic_warning_black_36dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_add_circle_outline_grey600_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_add_circle_outline_grey600_24dp.png
deleted file mode 100644
index b9a106fd..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_add_circle_outline_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_add_circle_outline_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_add_circle_outline_white_24dp.png
deleted file mode 100644
index 0399d60a..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_add_circle_outline_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_archive_grey600_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_archive_grey600_24dp.png
deleted file mode 100644
index 6725175d..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_archive_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_archive_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_archive_white_24dp.png
deleted file mode 100644
index 08228d1f..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_archive_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_check_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_check_white_24dp.png
deleted file mode 100644
index e5024472..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_check_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_close_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_close_white_24dp.png
deleted file mode 100644
index b7c7ffd0..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_close_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_content_copy_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_content_copy_white_24dp.png
deleted file mode 100644
index 04a0cc94..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_content_copy_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_delete_grey600_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index c6bb43e8..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_delete_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_delete_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index cdb230c2..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_delete_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_doc_generic_am.png b/main/src/ui/res/drawable-xhdpi/ic_doc_generic_am.png
deleted file mode 100644
index e05c4b48..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_doc_generic_am.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_edit_grey600_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index 4c95bd57..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_edit_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_edit_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_edit_white_24dp.png
deleted file mode 100644
index 7f0ea51b..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_edit_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_filter_list_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index d4ca77bf..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_filter_list_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_menu_copy_holo_dark.png b/main/src/ui/res/drawable-xhdpi/ic_menu_copy_holo_dark.png
deleted file mode 100644
index ba883aec..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_menu_copy_holo_dark.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_pause_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_pause_white_24dp.png
deleted file mode 100644
index f49aed75..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_pause_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
deleted file mode 100644
index a3c80e73..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_receipt_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_receipt_white_24dp.png
deleted file mode 100644
index 66dafa4f..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_receipt_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_root_folder_am.png b/main/src/ui/res/drawable-xhdpi/ic_root_folder_am.png
deleted file mode 100644
index c916e0be..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_root_folder_am.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_search_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_search_white_24dp.png
deleted file mode 100755
index bfc3e393..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_search_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_share_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_share_white_24dp.png
deleted file mode 100644
index dd536bca..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_share_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_sort_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_sort_white_24dp.png
deleted file mode 100644
index 6d4af1bc..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_sort_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xhdpi/ic_warning_black_36dp.png b/main/src/ui/res/drawable-xhdpi/ic_warning_black_36dp.png
deleted file mode 100644
index e1d6f7ac..00000000
--- a/main/src/ui/res/drawable-xhdpi/ic_warning_black_36dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_add_circle_outline_grey600_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_add_circle_outline_grey600_24dp.png
deleted file mode 100644
index d13b5195..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_add_circle_outline_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_add_circle_outline_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_add_circle_outline_white_24dp.png
deleted file mode 100644
index 7ae1b4a1..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_add_circle_outline_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_archive_grey600_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_archive_grey600_24dp.png
deleted file mode 100644
index 25cfc91a..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_archive_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_archive_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_archive_white_24dp.png
deleted file mode 100644
index aa186ce5..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_archive_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_check_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_check_white_24dp.png
deleted file mode 100644
index 6e03d54c..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_check_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_close_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_close_white_24dp.png
deleted file mode 100644
index 6b717e0d..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_close_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_content_copy_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
deleted file mode 100644
index 5fc17a4d..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_delete_grey600_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index 4886ab1e..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_delete_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_delete_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 0e95e9b1..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_delete_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_doc_generic_am.png b/main/src/ui/res/drawable-xxhdpi/ic_doc_generic_am.png
deleted file mode 100644
index c0988663..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_doc_generic_am.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_edit_grey600_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index 6ed4351c..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_edit_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_edit_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_edit_white_24dp.png
deleted file mode 100644
index 34ec7092..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_edit_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_filter_list_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index 802b3cd5..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_filter_list_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_menu_copy_holo_dark.png b/main/src/ui/res/drawable-xxhdpi/ic_menu_copy_holo_dark.png
deleted file mode 100644
index 9dd56eff..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_menu_copy_holo_dark.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_pause_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_pause_white_24dp.png
deleted file mode 100644
index 7192ad48..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_pause_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
deleted file mode 100644
index 547ef30a..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_receipt_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_receipt_white_24dp.png
deleted file mode 100644
index 2161c9a5..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_receipt_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_root_folder_am.png b/main/src/ui/res/drawable-xxhdpi/ic_root_folder_am.png
deleted file mode 100644
index 077c851c..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_root_folder_am.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_search_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_search_white_24dp.png
deleted file mode 100755
index abbb9895..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_search_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_share_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_share_white_24dp.png
deleted file mode 100644
index 9963c6a0..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_share_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_sort_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_sort_white_24dp.png
deleted file mode 100644
index b8ef1050..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_sort_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxhdpi/ic_warning_black_36dp.png b/main/src/ui/res/drawable-xxhdpi/ic_warning_black_36dp.png
deleted file mode 100644
index 2aab2278..00000000
--- a/main/src/ui/res/drawable-xxhdpi/ic_warning_black_36dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_add_circle_outline_grey600_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_add_circle_outline_grey600_24dp.png
deleted file mode 100644
index ae11fb25..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_add_circle_outline_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_add_circle_outline_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_add_circle_outline_white_24dp.png
deleted file mode 100644
index 1d436703..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_add_circle_outline_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_archive_grey600_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_archive_grey600_24dp.png
deleted file mode 100644
index 58d38997..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_archive_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_archive_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_archive_white_24dp.png
deleted file mode 100644
index 9d538ff4..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_archive_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_check_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_check_white_24dp.png
deleted file mode 100644
index 87892840..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_check_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_close_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_close_white_24dp.png
deleted file mode 100644
index 39641921..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_close_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
deleted file mode 100644
index 557c64f7..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index e4e21812..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index ccf8c716..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_delete_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index 0c0fd76f..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_edit_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_edit_white_24dp.png
deleted file mode 100644
index 9380370f..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_edit_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index 511008ce..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_pause_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_pause_white_24dp.png
deleted file mode 100644
index 660ac658..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_pause_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
deleted file mode 100644
index be5c062b..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_receipt_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_receipt_white_24dp.png
deleted file mode 100644
index 8cac119c..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_receipt_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_search_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_search_white_24dp.png
deleted file mode 100755
index dd5adfc7..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_search_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_share_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_share_white_24dp.png
deleted file mode 100644
index bb521c14..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_share_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_sort_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_sort_white_24dp.png
deleted file mode 100644
index 4796c33b..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_sort_white_24dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable-xxxhdpi/ic_warning_black_36dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_warning_black_36dp.png
deleted file mode 100644
index 58999574..00000000
--- a/main/src/ui/res/drawable-xxxhdpi/ic_warning_black_36dp.png
+++ /dev/null
diff --git a/main/src/ui/res/drawable/ic_warning.xml b/main/src/ui/res/drawable/ic_warning.xml
new file mode 100644
index 00000000..935b6357
--- /dev/null
+++ b/main/src/ui/res/drawable/ic_warning.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+        http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/textColorPrimary" >
+    <path
+            android:fillColor="@android:color/white"
+            android:pathData="M12,5.99L19.53,19H4.47L12,5.99 M12,2L1,21h22L12,2L12,2z" />
+    <path
+            android:fillColor="@android:color/white"
+            android:pathData="M 13 16 L 11 16 L 11 18 L 13 18 L 13 16 Z" />
+    <path
+            android:fillColor="@android:color/white"
+            android:pathData="M 13 10 L 11 10 L 11 14 L 13 14 L 13 10 Z" />
+</vector>
\ No newline at end of file
diff --git a/main/src/ui/res/layout-v21/profile_list_fabs.xml b/main/src/ui/res/layout-v21/profile_list_fabs.xml
index 4fe403b6..b4cd154d 100644
--- a/main/src/ui/res/layout-v21/profile_list_fabs.xml
+++ b/main/src/ui/res/layout-v21/profile_list_fabs.xml
@@ -18,7 +18,7 @@
         android:elevation="@dimen/elevation_low"
         android:layout_marginBottom="@dimen/add_button_margin_topfab"
         android:layout_marginEnd="@dimen/add_button_margin"
-        android:src="@drawable/ic_archive_grey600_24dp"
+        android:src="@drawable/ic_baseline_archive_24"
         android:contentDescription="@string/import_config" />
 
     <ImageButton
diff --git a/main/src/ui/res/layout/vpn_list_item.xml b/main/src/ui/res/layout/vpn_list_item.xml
index 5f2e8d0b..8aeb90b8 100644
--- a/main/src/ui/res/layout/vpn_list_item.xml
+++ b/main/src/ui/res/layout/vpn_list_item.xml
@@ -81,6 +81,6 @@
         android:paddingLeft="15dip"
         android:paddingRight="?android:attr/scrollbarSize"
         android:paddingStart="15dip"
-        android:src="@drawable/vpn_item_edit" />
+        android:src="@drawable/ic_edit" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/main/src/ui/res/menu/allowed_apps.xml b/main/src/ui/res/menu/allowed_apps.xml
index f357be69..7ef113c4 100644
--- a/main/src/ui/res/menu/allowed_apps.xml
+++ b/main/src/ui/res/menu/allowed_apps.xml
@@ -7,7 +7,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
             android:id="@+id/app_search_widget"
-            android:icon="@drawable/ic_search_white_24dp"
+            android:icon="@drawable/ic_search"
             app:showAsAction="always"
             android:title="@string/Search"
             app:actionViewClass="androidx.appcompat.widget.SearchView" />
diff --git a/main/src/ui/res/values/refs.xml b/main/src/ui/res/values/refs.xml
deleted file mode 100644
index 5d2ea134..00000000
--- a/main/src/ui/res/values/refs.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2012-2016 Arne Schwabe
-  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-  -->
-
-<resources>
-    <drawable name="ic_menu_close_clear_cancel">@drawable/ic_close_white_24dp</drawable>
-    <drawable name="ic_menu_play">@drawable/ic_play_arrow_white_24dp</drawable>
-    <drawable name="ic_menu_pause">@drawable/ic_pause_white_24dp</drawable>
-    <drawable name="ic_menu_share">@drawable/ic_share_white_24dp</drawable>
-    <drawable name="ic_menu_save">@drawable/ic_check_white_24dp</drawable>
-    <drawable name="ic_menu_view">@drawable/ic_filter_list_white_24dp</drawable>
-    <drawable name="ic_menu_delete">@drawable/ic_delete_white_24dp</drawable>
-    <drawable name="ic_menu_copy">@drawable/ic_content_copy_white_24dp</drawable>
-    <drawable name="ic_menu_delete_grey">@drawable/ic_delete_grey600_24dp</drawable>
-
-    <drawable name="ic_menu_edit">@drawable/ic_edit_white_24dp</drawable>
-    <drawable name="ic_menu_import">@drawable/ic_archive_white_24dp</drawable>
-    <drawable name="vpn_item_edit">@drawable/ic_edit_grey600_24dp</drawable>
-    <drawable name="ic_menu_add">@drawable/ic_add_circle_outline_white_24dp</drawable>
-    <drawable name="ic_dialog_alert">@drawable/ic_warning_black_36dp</drawable>
-    <drawable name="ic_menu_add_grey">@drawable/ic_add_circle_outline_grey600_24dp</drawable>
-    <drawable name="ic_menu_import_grey">@drawable/ic_archive_grey600_24dp</drawable>
-    <drawable name="ic_receipt">@drawable/ic_receipt_white_24dp</drawable>
-    <drawable name="ic_sort">@drawable/ic_sort_white_24dp</drawable>
-
-</resources>
\ No newline at end of file