diff --git a/CHANGELOG.md b/CHANGELOG.md
index e99986375..1197b8c4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 Changes:
 
 - Automatically focus text field when creating or editing a group
+- Fix blurry icons (use SVG everywhere)
 
 ## v1.5.1 (2020-12-03)
 
diff --git a/app/src/main/java/protect/card_locker/AboutActivity.java b/app/src/main/java/protect/card_locker/AboutActivity.java
index 617c1b570..3cb2a5d24 100644
--- a/app/src/main/java/protect/card_locker/AboutActivity.java
+++ b/app/src/main/java/protect/card_locker/AboutActivity.java
@@ -60,7 +60,7 @@ public class AboutActivity extends AppCompatActivity
 
         final Map<String, String> USED_ASSETS = ImmutableMap.of
                 (
-                        "Save by Bernar Novalyi", "https://thenounproject.com/term/save/716011"
+                        "Android icons", "https://www.apache.org/licenses/LICENSE-2.0.txt"
                 );
 
         StringBuilder libs = new StringBuilder().append("<br/>");
diff --git a/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png
deleted file mode 100644
index 694179bd4..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png b/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png
deleted file mode 100644
index f782543d3..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_baseline_arrow_drop_down_24.png b/app/src/main/res/drawable-hdpi/ic_baseline_arrow_drop_down_24.png
deleted file mode 100644
index 147a62da6..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_baseline_arrow_drop_down_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_baseline_arrow_drop_up_24.png b/app/src/main/res/drawable-hdpi/ic_baseline_arrow_drop_up_24.png
deleted file mode 100644
index ee405d5ed..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_baseline_arrow_drop_up_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_camera_white.png b/app/src/main/res/drawable-hdpi/ic_camera_white.png
deleted file mode 100644
index 7a95405cc..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_camera_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 4a9f76947..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_folder_white.png b/app/src/main/res/drawable-hdpi/ic_folder_white.png
deleted file mode 100644
index a667cd078..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_folder_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_import_export_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_import_export_white_24dp.png
deleted file mode 100644
index 5b6c02010..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_import_export_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png
deleted file mode 100644
index 6bae68f56..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_lock_outline_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_lock_outline_white_24dp.png
deleted file mode 100644
index e53f54186..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_lock_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png
deleted file mode 100644
index 595ff10ac..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_search_white.png b/app/src/main/res/drawable-hdpi/ic_search_white.png
deleted file mode 100644
index b74d89872..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_search_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_share_white.png b/app/src/main/res/drawable-hdpi/ic_share_white.png
deleted file mode 100644
index 629f50dcd..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_share_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_starred_white.png b/app/src/main/res/drawable-hdpi/ic_starred_white.png
deleted file mode 100644
index 8d1595bfc..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_starred_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_unstarred_white.png b/app/src/main/res/drawable-hdpi/ic_unstarred_white.png
deleted file mode 100644
index 0b5f3a650..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_unstarred_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/save_24dp.png b/app/src/main/res/drawable-hdpi/save_24dp.png
deleted file mode 100644
index 32638e886..000000000
Binary files a/app/src/main/res/drawable-hdpi/save_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png
deleted file mode 100644
index 3856041d7..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_back_white.png b/app/src/main/res/drawable-mdpi/ic_arrow_back_white.png
deleted file mode 100644
index 222690b0b..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_arrow_back_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_baseline_arrow_drop_down_24.png b/app/src/main/res/drawable-mdpi/ic_baseline_arrow_drop_down_24.png
deleted file mode 100644
index 1634ad4e1..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_baseline_arrow_drop_down_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_baseline_arrow_drop_up_24.png b/app/src/main/res/drawable-mdpi/ic_baseline_arrow_drop_up_24.png
deleted file mode 100644
index 0df4fbfcf..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_baseline_arrow_drop_up_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_camera_white.png b/app/src/main/res/drawable-mdpi/ic_camera_white.png
deleted file mode 100644
index 77cda3d9c..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_camera_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
deleted file mode 100644
index e2f5f3555..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_folder_white.png b/app/src/main/res/drawable-mdpi/ic_folder_white.png
deleted file mode 100644
index 56b8a6895..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_folder_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_import_export_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_import_export_white_24dp.png
deleted file mode 100644
index 151188cf8..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_import_export_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png
deleted file mode 100644
index 3f47b54cf..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_lock_outline_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_lock_outline_white_24dp.png
deleted file mode 100644
index 13f432fe0..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_lock_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png
deleted file mode 100644
index 12b09f1d9..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_search_white.png b/app/src/main/res/drawable-mdpi/ic_search_white.png
deleted file mode 100644
index 65709b258..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_search_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_share_white.png b/app/src/main/res/drawable-mdpi/ic_share_white.png
deleted file mode 100644
index f2e4b472b..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_share_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_starred_white.png b/app/src/main/res/drawable-mdpi/ic_starred_white.png
deleted file mode 100644
index 4b83e9972..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_starred_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_unstarred_white.png b/app/src/main/res/drawable-mdpi/ic_unstarred_white.png
deleted file mode 100644
index 0dc507138..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_unstarred_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/save_24dp.png b/app/src/main/res/drawable-mdpi/save_24dp.png
deleted file mode 100644
index 1a8b8c630..000000000
Binary files a/app/src/main/res/drawable-mdpi/save_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
deleted file mode 100644
index 67bb598e5..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png b/app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png
deleted file mode 100644
index c4e8d91ba..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_baseline_arrow_drop_down_24.png b/app/src/main/res/drawable-xhdpi/ic_baseline_arrow_drop_down_24.png
deleted file mode 100644
index 075ce9a46..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_baseline_arrow_drop_down_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_baseline_arrow_drop_up_24.png b/app/src/main/res/drawable-xhdpi/ic_baseline_arrow_drop_up_24.png
deleted file mode 100644
index 35b396406..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_baseline_arrow_drop_up_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_camera_white.png b/app/src/main/res/drawable-xhdpi/ic_camera_white.png
deleted file mode 100644
index 40d34844d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_camera_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 388b5b060..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_folder_white.png b/app/src/main/res/drawable-xhdpi/ic_folder_white.png
deleted file mode 100644
index 12f88a2b3..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_folder_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_import_export_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_import_export_white_24dp.png
deleted file mode 100644
index e22e18866..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_import_export_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png
deleted file mode 100644
index cbe9e1cd0..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_outline_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_lock_outline_white_24dp.png
deleted file mode 100644
index e2d109130..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_lock_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png
deleted file mode 100644
index 5a06bff5a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_search_white.png b/app/src/main/res/drawable-xhdpi/ic_search_white.png
deleted file mode 100644
index a35ff9349..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_search_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_share_white.png b/app/src/main/res/drawable-xhdpi/ic_share_white.png
deleted file mode 100644
index 56443526e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_share_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_starred_white.png b/app/src/main/res/drawable-xhdpi/ic_starred_white.png
deleted file mode 100644
index 4f35df0be..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_starred_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_unstarred_white.png b/app/src/main/res/drawable-xhdpi/ic_unstarred_white.png
deleted file mode 100644
index 8eabc3d50..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_unstarred_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/save_24dp.png b/app/src/main/res/drawable-xhdpi/save_24dp.png
deleted file mode 100644
index bd446cff9..000000000
Binary files a/app/src/main/res/drawable-xhdpi/save_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
deleted file mode 100644
index 0fdced8fc..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png
deleted file mode 100644
index 575d5075c..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_baseline_arrow_drop_down_24.png b/app/src/main/res/drawable-xxhdpi/ic_baseline_arrow_drop_down_24.png
deleted file mode 100644
index eadfd35c3..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_baseline_arrow_drop_down_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_baseline_arrow_drop_up_24.png b/app/src/main/res/drawable-xxhdpi/ic_baseline_arrow_drop_up_24.png
deleted file mode 100644
index 7f8426e04..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_baseline_arrow_drop_up_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_camera_white.png b/app/src/main/res/drawable-xxhdpi/ic_camera_white.png
deleted file mode 100644
index 11dcfb087..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_camera_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 3fcdfdb55..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder_white.png b/app/src/main/res/drawable-xxhdpi/ic_folder_white.png
deleted file mode 100644
index 3eb3a8df9..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_folder_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_import_export_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_import_export_white_24dp.png
deleted file mode 100644
index 33c21c5c4..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_import_export_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png
deleted file mode 100644
index 1d1b0f4d3..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock_outline_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_lock_outline_white_24dp.png
deleted file mode 100644
index bd2cf4dae..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_lock_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png
deleted file mode 100644
index 02e19d045..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_mode_edit_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_search_white.png b/app/src/main/res/drawable-xxhdpi/ic_search_white.png
deleted file mode 100644
index 0f1207e2c..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_search_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_white.png b/app/src/main/res/drawable-xxhdpi/ic_share_white.png
deleted file mode 100644
index 7904aedee..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_share_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_starred_white.png b/app/src/main/res/drawable-xxhdpi/ic_starred_white.png
deleted file mode 100644
index 3de9cd6a7..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_starred_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_unstarred_white.png b/app/src/main/res/drawable-xxhdpi/ic_unstarred_white.png
deleted file mode 100644
index d495c468d..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_unstarred_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/save_24dp.png b/app/src/main/res/drawable-xxhdpi/save_24dp.png
deleted file mode 100644
index 74b7e9081..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/save_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png
deleted file mode 100644
index d64c22e9e..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
deleted file mode 100644
index 8d322aa9b..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_import_export_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_import_export_white_24dp.png
deleted file mode 100644
index a5e55a470..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_import_export_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_lock_open_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_lock_open_white_24dp.png
deleted file mode 100644
index 8ab410727..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_lock_open_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_24dp.png
deleted file mode 100644
index de1d564b1..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png
deleted file mode 100644
index d6668a051..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/save_24dp.png b/app/src/main/res/drawable-xxxhdpi/save_24dp.png
deleted file mode 100644
index 3d2af06eb..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/save_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml
new file mode 100644
index 000000000..70046c48f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_back_white.xml b/app/src/main/res/drawable/ic_arrow_back_white.xml
new file mode 100644
index 000000000..fa122e182
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back_white.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml
new file mode 100644
index 000000000..3dbfedba2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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="M7,10l5,5 5,-5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_arrow_drop_up_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_drop_up_24.xml
new file mode 100644
index 000000000..ba9e5039a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_arrow_drop_up_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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="M7,14l5,-5 5,5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_camera_white.xml b/app/src/main/res/drawable/ic_camera_white.xml
new file mode 100644
index 000000000..91411013b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_camera_white.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
+    <path android:fillColor="@android:color/white" android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml
new file mode 100644
index 000000000..282594cdb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_folder_white.xml b/app/src/main/res/drawable/ic_folder_white.xml
new file mode 100644
index 000000000..e337bfd7b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_white.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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/app/src/main/res/drawable/ic_import_export_white_24dp.xml b/app/src/main/res/drawable/ic_import_export_white_24dp.xml
new file mode 100644
index 000000000..6b866be78
--- /dev/null
+++ b/app/src/main/res/drawable/ic_import_export_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock_open_white_24dp.xml b/app/src/main/res/drawable/ic_lock_open_white_24dp.xml
new file mode 100644
index 000000000..7f4c3149d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_open_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock_outline_white_24dp.xml b/app/src/main/res/drawable/ic_lock_outline_white_24dp.xml
new file mode 100644
index 000000000..6c6b2603e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_outline_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_mode_edit_white_24dp.xml b/app/src/main/res/drawable/ic_mode_edit_white_24dp.xml
new file mode 100644
index 000000000..faddfce42
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mode_edit_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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/app/src/main/res/drawable/ic_search_white.xml b/app/src/main/res/drawable/ic_search_white.xml
new file mode 100644
index 000000000..e2dd96c6d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search_white.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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/app/src/main/res/drawable/ic_share_white.xml b/app/src/main/res/drawable/ic_share_white.xml
new file mode 100644
index 000000000..9300daf6f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share_white.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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="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/app/src/main/res/drawable/ic_starred_white.xml b/app/src/main/res/drawable/ic_starred_white.xml
new file mode 100644
index 000000000..954e7723b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_starred_white.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_unstarred_white.xml b/app/src/main/res/drawable/ic_unstarred_white.xml
new file mode 100644
index 000000000..a024d756b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_unstarred_white.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/save_24dp.xml b/app/src/main/res/drawable/save_24dp.xml
new file mode 100644
index 000000000..999020dcf
--- /dev/null
+++ b/app/src/main/res/drawable/save_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    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="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+</vector>
diff --git a/app/src/main/res/layout/group_layout.xml b/app/src/main/res/layout/group_layout.xml
index 32f5b894d..0d5aaefba 100644
--- a/app/src/main/res/layout/group_layout.xml
+++ b/app/src/main/res/layout/group_layout.xml
@@ -42,7 +42,7 @@
             android:layout_width="@dimen/cardThumbnailSize"
             android:layout_height="@dimen/cardThumbnailSize"
             android:layout_weight="1"
-            android:src="@drawable/ic_baseline_arrow_drop_up_24"
+            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
             android:contentDescription="@string/moveUp"
             app:tint="@color/iconColor"
             android:onClick="moveGroupUp"/>
@@ -52,7 +52,7 @@
             android:layout_width="@dimen/cardThumbnailSize"
             android:layout_height="@dimen/cardThumbnailSize"
             android:layout_weight="1"
-            android:src="@drawable/ic_baseline_arrow_drop_down_24"
+            app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
             android:contentDescription="@string/moveDown"
             app:tint="@color/iconColor"
             android:onClick="moveGroupDown"/>
@@ -62,7 +62,7 @@
             android:layout_width="@dimen/cardThumbnailSize"
             android:layout_height="@dimen/cardThumbnailSize"
             android:layout_weight="1"
-            android:src="@drawable/ic_mode_edit_white_24dp"
+            app:srcCompat="@drawable/ic_mode_edit_white_24dp"
             android:contentDescription="@string/edit"
             app:tint="@color/iconColor"
             android:onClick="editGroup" />
@@ -72,7 +72,7 @@
             android:layout_width="@dimen/cardThumbnailSize"
             android:layout_height="@dimen/cardThumbnailSize"
             android:layout_weight="1"
-            android:src="@drawable/ic_delete_white_24dp"
+            app:srcCompat="@drawable/ic_delete_white_24dp"
             android:contentDescription="@string/delete"
             app:tint="@color/iconColor"
             android:onClick="deleteGroup"/>
diff --git a/app/src/main/res/layout/loyalty_card_edit_activity.xml b/app/src/main/res/layout/loyalty_card_edit_activity.xml
index 2e12d50e4..020d08289 100644
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
-        android:src="@drawable/save_24dp"
+        app:srcCompat="@drawable/save_24dp"
         android:contentDescription="@string/save"
         android:layout_margin="16dp" />
 
diff --git a/app/src/main/res/layout/loyalty_card_layout.xml b/app/src/main/res/layout/loyalty_card_layout.xml
index ac75d9da3..4170d7464 100644
--- a/app/src/main/res/layout/loyalty_card_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_layout.xml
@@ -58,7 +58,7 @@
         android:layout_width="@dimen/cardThumbnailSize"
         android:layout_height="@dimen/cardThumbnailSize"
         android:layout_marginStart="@dimen/activity_margin"
-        android:src="@drawable/ic_starred_white"
+        app:srcCompat="@drawable/ic_starred_white"
         app:tint="@color/iconColor"
         android:contentDescription="@string/starImage"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/loyalty_card_view_layout.xml b/app/src/main/res/layout/loyalty_card_view_layout.xml
index 61106b1a1..4a344e68e 100644
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -93,7 +93,7 @@
             android:layout_height="80dp"
             android:background="@color/colorPrimary"
             android:gravity="center"
-            android:src="@drawable/ic_baseline_arrow_drop_up_24"
+            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
             android:adjustViewBounds="true"
             android:scaleType="fitCenter"
             android:tint="@android:color/white" />
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 37c12d509..b386269b2 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -13,7 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
-        android:src="@drawable/ic_add_white_24dp"
+        app:srcCompat="@drawable/ic_add_white_24dp"
         android:contentDescription="@string/action_add"
         android:layout_margin="16dp" />
 
diff --git a/app/src/main/res/layout/manage_groups_activity.xml b/app/src/main/res/layout/manage_groups_activity.xml
index 5c472ccb0..072167c6f 100644
--- a/app/src/main/res/layout/manage_groups_activity.xml
+++ b/app/src/main/res/layout/manage_groups_activity.xml
@@ -13,7 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
-        android:src="@drawable/ic_add_white_24dp"
+        app:srcCompat="@drawable/ic_add_white_24dp"
         android:contentDescription="@string/action_add"
         android:layout_margin="16dp" />