diff --git a/build.gradle b/build.gradle
index 9e5bcb019..83f922edf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 21
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '5.15.24'
+        propVersionName = '5.15.25'
         kotlin_version = '1.3.41'
     }
 
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt
index 3fb7168cc..5dd3e3507 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/CustomizationActivity.kt
@@ -77,7 +77,7 @@ class CustomizationActivity : BaseSimpleActivity() {
             baseConfig.isUsingSharedTheme = false
         }
 
-        supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_cross)
+        supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_cross_vector)
         updateTextColors(customization_holder)
         originalAppIconColor = baseConfig.appIconColor
     }
diff --git a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt
index b48cd8e50..3376a8135 100644
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt
@@ -19,8 +19,8 @@ import kotlinx.android.synthetic.main.filepicker_list_item.view.*
 class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: List<FileDirItem>, recyclerView: MyRecyclerView,
                              itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) {
 
-    private val folderDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_folder, textColor)
-    private val fileDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_file, textColor)
+    private val folderDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_folder_vector, textColor)
+    private val fileDrawable = activity.resources.getColoredDrawableWithColor(R.drawable.ic_file_vector, textColor)
 
     init {
         folderDrawable.alpha = 180
diff --git a/commons/src/main/res/drawable-hdpi/ic_clock.png b/commons/src/main/res/drawable-hdpi/ic_clock.png
deleted file mode 100644
index 4651478fc..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_clock.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_cross.png b/commons/src/main/res/drawable-hdpi/ic_cross.png
deleted file mode 100644
index 943ce2eec..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_cross.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_cross_big.png b/commons/src/main/res/drawable-hdpi/ic_cross_big.png
deleted file mode 100644
index 6a3e766fc..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_cross_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_delete.png b/commons/src/main/res/drawable-hdpi/ic_delete.png
deleted file mode 100644
index 4a9f76947..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_delete.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_edit.png b/commons/src/main/res/drawable-hdpi/ic_edit.png
deleted file mode 100644
index d3ff58dcc..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_edit.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_email.png b/commons/src/main/res/drawable-hdpi/ic_email.png
deleted file mode 100644
index 852774d3f..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_email.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_email_big.png b/commons/src/main/res/drawable-hdpi/ic_email_big.png
deleted file mode 100644
index 8deac8102..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_email_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_file.png b/commons/src/main/res/drawable-hdpi/ic_file.png
deleted file mode 100644
index 84755e488..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_file.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_filter.png b/commons/src/main/res/drawable-hdpi/ic_filter.png
deleted file mode 100644
index 7e8a6b536..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_filter.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_fingerprint.png b/commons/src/main/res/drawable-hdpi/ic_fingerprint.png
deleted file mode 100644
index 66b6cf368..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_fingerprint.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_folder.png b/commons/src/main/res/drawable-hdpi/ic_folder.png
deleted file mode 100644
index 02ea533a8..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_folder.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_label.png b/commons/src/main/res/drawable-hdpi/ic_label.png
deleted file mode 100644
index 5d336d631..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_label.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_lock_huge.png b/commons/src/main/res/drawable-hdpi/ic_lock_huge.png
deleted file mode 100644
index 1b2185c6d..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_lock_huge.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_minus.png b/commons/src/main/res/drawable-hdpi/ic_minus.png
deleted file mode 100644
index ee654f907..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_minus.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_minus_circle.png b/commons/src/main/res/drawable-hdpi/ic_minus_circle.png
deleted file mode 100644
index 021e6f022..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_minus_circle.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_open.png b/commons/src/main/res/drawable-hdpi/ic_open.png
deleted file mode 100644
index f25d504ca..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_open.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_orientation_auto.png b/commons/src/main/res/drawable-hdpi/ic_orientation_auto.png
deleted file mode 100644
index ca8874b16..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_orientation_auto.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_orientation_landscape.png b/commons/src/main/res/drawable-hdpi/ic_orientation_landscape.png
deleted file mode 100644
index d9779d42d..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_orientation_landscape.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_orientation_portrait.png b/commons/src/main/res/drawable-hdpi/ic_orientation_portrait.png
deleted file mode 100644
index 1383d3c94..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_orientation_portrait.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_pause.png b/commons/src/main/res/drawable-hdpi/ic_pause.png
deleted file mode 100644
index dfca9cd35..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_pause.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_person.png b/commons/src/main/res/drawable-hdpi/ic_person.png
deleted file mode 100644
index a48e98275..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_person.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_person_biggest.png b/commons/src/main/res/drawable-hdpi/ic_person_biggest.png
deleted file mode 100755
index 31bf1d04b..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_person_biggest.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_phone_big.png b/commons/src/main/res/drawable-hdpi/ic_phone_big.png
deleted file mode 100644
index 6f4dcea1f..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_phone_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_place.png b/commons/src/main/res/drawable-hdpi/ic_place.png
deleted file mode 100644
index 976811e91..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_place.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_place_big.png b/commons/src/main/res/drawable-hdpi/ic_place_big.png
deleted file mode 100644
index b345cffca..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_place_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_play.png b/commons/src/main/res/drawable-hdpi/ic_play.png
deleted file mode 100644
index d561e77c6..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_play.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_plus.png b/commons/src/main/res/drawable-hdpi/ic_plus.png
deleted file mode 100644
index 76f27e6ed..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_plus.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_properties.png b/commons/src/main/res/drawable-hdpi/ic_properties.png
deleted file mode 100644
index d2c435f92..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_properties.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-hdpi/ic_unhide.png b/commons/src/main/res/drawable-hdpi/ic_unhide.png
deleted file mode 100644
index 4791d9f7d..000000000
Binary files a/commons/src/main/res/drawable-hdpi/ic_unhide.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_clock.png b/commons/src/main/res/drawable-xhdpi/ic_clock.png
deleted file mode 100644
index 52cf597b0..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_clock.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_cross.png b/commons/src/main/res/drawable-xhdpi/ic_cross.png
deleted file mode 100644
index 150058aa0..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_cross.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_cross_big.png b/commons/src/main/res/drawable-xhdpi/ic_cross_big.png
deleted file mode 100644
index f5a903fd7..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_cross_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_delete.png b/commons/src/main/res/drawable-xhdpi/ic_delete.png
deleted file mode 100644
index 388b5b060..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_delete.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_edit.png b/commons/src/main/res/drawable-xhdpi/ic_edit.png
deleted file mode 100644
index 5a06bff5a..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_edit.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_email.png b/commons/src/main/res/drawable-xhdpi/ic_email.png
deleted file mode 100644
index 9756b8015..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_email.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_email_big.png b/commons/src/main/res/drawable-xhdpi/ic_email_big.png
deleted file mode 100644
index fa89f4716..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_email_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_file.png b/commons/src/main/res/drawable-xhdpi/ic_file.png
deleted file mode 100644
index 798ebd4e2..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_file.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_filter.png b/commons/src/main/res/drawable-xhdpi/ic_filter.png
deleted file mode 100644
index 9416c70ec..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_filter.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_fingerprint.png b/commons/src/main/res/drawable-xhdpi/ic_fingerprint.png
deleted file mode 100644
index 8793f6a6a..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_fingerprint.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_folder.png b/commons/src/main/res/drawable-xhdpi/ic_folder.png
deleted file mode 100644
index 71a5a137c..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_folder.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_label.png b/commons/src/main/res/drawable-xhdpi/ic_label.png
deleted file mode 100644
index 10b6b6ab0..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_label.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_lock_huge.png b/commons/src/main/res/drawable-xhdpi/ic_lock_huge.png
deleted file mode 100644
index 46ccaa18e..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_lock_huge.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_minus.png b/commons/src/main/res/drawable-xhdpi/ic_minus.png
deleted file mode 100644
index e1f9bde8d..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_minus.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_minus_circle.png b/commons/src/main/res/drawable-xhdpi/ic_minus_circle.png
deleted file mode 100644
index 3ad570ed8..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_minus_circle.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_open.png b/commons/src/main/res/drawable-xhdpi/ic_open.png
deleted file mode 100644
index 1ca52cd3e..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_open.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_orientation_auto.png b/commons/src/main/res/drawable-xhdpi/ic_orientation_auto.png
deleted file mode 100644
index fc7b12524..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_orientation_auto.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_orientation_landscape.png b/commons/src/main/res/drawable-xhdpi/ic_orientation_landscape.png
deleted file mode 100644
index a9a0c65e6..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_orientation_landscape.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_orientation_portrait.png b/commons/src/main/res/drawable-xhdpi/ic_orientation_portrait.png
deleted file mode 100644
index b748114f7..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_orientation_portrait.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_pause.png b/commons/src/main/res/drawable-xhdpi/ic_pause.png
deleted file mode 100644
index 15e24fa53..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_pause.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_person.png b/commons/src/main/res/drawable-xhdpi/ic_person.png
deleted file mode 100644
index 184f7418d..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_person.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_person_biggest.png b/commons/src/main/res/drawable-xhdpi/ic_person_biggest.png
deleted file mode 100755
index e41aa700a..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_person_biggest.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_phone_big.png b/commons/src/main/res/drawable-xhdpi/ic_phone_big.png
deleted file mode 100644
index 90ead2e45..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_phone_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_place.png b/commons/src/main/res/drawable-xhdpi/ic_place.png
deleted file mode 100644
index d226e78f1..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_place.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_place_big.png b/commons/src/main/res/drawable-xhdpi/ic_place_big.png
deleted file mode 100644
index 078b10d4f..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_place_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_play.png b/commons/src/main/res/drawable-xhdpi/ic_play.png
deleted file mode 100644
index ae32825c7..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_play.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_plus.png b/commons/src/main/res/drawable-xhdpi/ic_plus.png
deleted file mode 100644
index d8ef0f451..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_plus.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_properties.png b/commons/src/main/res/drawable-xhdpi/ic_properties.png
deleted file mode 100644
index 4fd6a43ce..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_properties.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xhdpi/ic_unhide.png b/commons/src/main/res/drawable-xhdpi/ic_unhide.png
deleted file mode 100644
index 604bfd012..000000000
Binary files a/commons/src/main/res/drawable-xhdpi/ic_unhide.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_clock.png b/commons/src/main/res/drawable-xxhdpi/ic_clock.png
deleted file mode 100644
index cf9551f91..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_clock.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_cross.png b/commons/src/main/res/drawable-xxhdpi/ic_cross.png
deleted file mode 100644
index fcfcd26c2..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_cross.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_cross_big.png b/commons/src/main/res/drawable-xxhdpi/ic_cross_big.png
deleted file mode 100644
index 412081ebf..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_cross_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_delete.png b/commons/src/main/res/drawable-xxhdpi/ic_delete.png
deleted file mode 100644
index 3fcdfdb55..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_delete.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_edit.png b/commons/src/main/res/drawable-xxhdpi/ic_edit.png
deleted file mode 100644
index 02e19d045..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_edit.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_email.png b/commons/src/main/res/drawable-xxhdpi/ic_email.png
deleted file mode 100644
index fa89f4716..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_email.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_email_big.png b/commons/src/main/res/drawable-xxhdpi/ic_email_big.png
deleted file mode 100644
index 6d6c0f186..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_email_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_file.png b/commons/src/main/res/drawable-xxhdpi/ic_file.png
deleted file mode 100644
index f3e153b45..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_file.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_filter.png b/commons/src/main/res/drawable-xxhdpi/ic_filter.png
deleted file mode 100644
index 1263ae82e..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_filter.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_fingerprint.png b/commons/src/main/res/drawable-xxhdpi/ic_fingerprint.png
deleted file mode 100644
index b7e20cddc..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_fingerprint.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_folder.png b/commons/src/main/res/drawable-xxhdpi/ic_folder.png
deleted file mode 100644
index b93d5a1e4..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_folder.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_label.png b/commons/src/main/res/drawable-xxhdpi/ic_label.png
deleted file mode 100644
index bd872419c..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_label.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_lock_huge.png b/commons/src/main/res/drawable-xxhdpi/ic_lock_huge.png
deleted file mode 100644
index c7fae8b98..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_lock_huge.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_minus.png b/commons/src/main/res/drawable-xxhdpi/ic_minus.png
deleted file mode 100644
index c4808d402..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_minus.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_minus_circle.png b/commons/src/main/res/drawable-xxhdpi/ic_minus_circle.png
deleted file mode 100644
index 67165c81d..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_minus_circle.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_open.png b/commons/src/main/res/drawable-xxhdpi/ic_open.png
deleted file mode 100644
index 5fc50ad8f..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_open.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_orientation_auto.png b/commons/src/main/res/drawable-xxhdpi/ic_orientation_auto.png
deleted file mode 100644
index 37bad635c..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_orientation_auto.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_orientation_landscape.png b/commons/src/main/res/drawable-xxhdpi/ic_orientation_landscape.png
deleted file mode 100644
index 0eff52c4f..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_orientation_landscape.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_orientation_portrait.png b/commons/src/main/res/drawable-xxhdpi/ic_orientation_portrait.png
deleted file mode 100644
index 0df5c58cc..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_orientation_portrait.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_pause.png b/commons/src/main/res/drawable-xxhdpi/ic_pause.png
deleted file mode 100644
index ffd90619b..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_pause.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_person.png b/commons/src/main/res/drawable-xxhdpi/ic_person.png
deleted file mode 100644
index bc48e5154..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_person.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_person_biggest.png b/commons/src/main/res/drawable-xxhdpi/ic_person_biggest.png
deleted file mode 100755
index 1dbe45573..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_person_biggest.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_phone_big.png b/commons/src/main/res/drawable-xxhdpi/ic_phone_big.png
deleted file mode 100644
index 8bdea6c60..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_phone_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_place.png b/commons/src/main/res/drawable-xxhdpi/ic_place.png
deleted file mode 100644
index 9f973cff7..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_place.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_place_big.png b/commons/src/main/res/drawable-xxhdpi/ic_place_big.png
deleted file mode 100644
index 633bc5695..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_place_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_play.png b/commons/src/main/res/drawable-xxhdpi/ic_play.png
deleted file mode 100644
index 8e6b3d103..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_play.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_plus.png b/commons/src/main/res/drawable-xxhdpi/ic_plus.png
deleted file mode 100644
index b97c0e28a..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_plus.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_properties.png b/commons/src/main/res/drawable-xxhdpi/ic_properties.png
deleted file mode 100644
index db51fc705..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_properties.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxhdpi/ic_unhide.png b/commons/src/main/res/drawable-xxhdpi/ic_unhide.png
deleted file mode 100644
index 196ab015f..000000000
Binary files a/commons/src/main/res/drawable-xxhdpi/ic_unhide.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_clock.png b/commons/src/main/res/drawable-xxxhdpi/ic_clock.png
deleted file mode 100644
index f156937ad..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_clock.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_cross.png b/commons/src/main/res/drawable-xxxhdpi/ic_cross.png
deleted file mode 100644
index 47eebc95c..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_cross.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_cross_big.png b/commons/src/main/res/drawable-xxxhdpi/ic_cross_big.png
deleted file mode 100644
index 0c02f3556..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_cross_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_delete.png b/commons/src/main/res/drawable-xxxhdpi/ic_delete.png
deleted file mode 100644
index 8d322aa9b..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_delete.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_edit.png b/commons/src/main/res/drawable-xxxhdpi/ic_edit.png
deleted file mode 100644
index d6668a051..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_edit.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_email.png b/commons/src/main/res/drawable-xxxhdpi/ic_email.png
deleted file mode 100644
index 6947be051..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_email.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_email_big.png b/commons/src/main/res/drawable-xxxhdpi/ic_email_big.png
deleted file mode 100644
index 309263b51..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_email_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_file.png b/commons/src/main/res/drawable-xxxhdpi/ic_file.png
deleted file mode 100644
index 5bd56903d..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_file.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_filter.png b/commons/src/main/res/drawable-xxxhdpi/ic_filter.png
deleted file mode 100644
index cb2207f11..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_filter.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_fingerprint.png b/commons/src/main/res/drawable-xxxhdpi/ic_fingerprint.png
deleted file mode 100644
index 1b16dc2c1..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_fingerprint.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_folder.png b/commons/src/main/res/drawable-xxxhdpi/ic_folder.png
deleted file mode 100644
index a1afbe9da..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_folder.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_label.png b/commons/src/main/res/drawable-xxxhdpi/ic_label.png
deleted file mode 100644
index dde0fc77f..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_label.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_lock_huge.png b/commons/src/main/res/drawable-xxxhdpi/ic_lock_huge.png
deleted file mode 100644
index bbac333bd..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_lock_huge.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_minus.png b/commons/src/main/res/drawable-xxxhdpi/ic_minus.png
deleted file mode 100644
index 8a0f2e1ac..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_minus.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_minus_circle.png b/commons/src/main/res/drawable-xxxhdpi/ic_minus_circle.png
deleted file mode 100644
index 2433f68c9..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_minus_circle.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_open.png b/commons/src/main/res/drawable-xxxhdpi/ic_open.png
deleted file mode 100644
index dea54e408..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_open.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_orientation_auto.png b/commons/src/main/res/drawable-xxxhdpi/ic_orientation_auto.png
deleted file mode 100644
index 711a7e27a..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_orientation_auto.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_orientation_landscape.png b/commons/src/main/res/drawable-xxxhdpi/ic_orientation_landscape.png
deleted file mode 100644
index 231311a6f..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_orientation_landscape.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_orientation_portrait.png b/commons/src/main/res/drawable-xxxhdpi/ic_orientation_portrait.png
deleted file mode 100644
index cdfbb16b6..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_orientation_portrait.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_pause.png b/commons/src/main/res/drawable-xxxhdpi/ic_pause.png
deleted file mode 100644
index fe83ca54a..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_pause.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_person.png b/commons/src/main/res/drawable-xxxhdpi/ic_person.png
deleted file mode 100644
index 6a14714bf..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_person.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_person_biggest.png b/commons/src/main/res/drawable-xxxhdpi/ic_person_biggest.png
deleted file mode 100755
index ea31ad695..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_person_biggest.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_phone_big.png b/commons/src/main/res/drawable-xxxhdpi/ic_phone_big.png
deleted file mode 100644
index a8e295a42..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_phone_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_place.png b/commons/src/main/res/drawable-xxxhdpi/ic_place.png
deleted file mode 100644
index 85e4caa97..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_place.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_place_big.png b/commons/src/main/res/drawable-xxxhdpi/ic_place_big.png
deleted file mode 100644
index 42ab08cf7..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_place_big.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_play.png b/commons/src/main/res/drawable-xxxhdpi/ic_play.png
deleted file mode 100644
index 2745c3ab9..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_play.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_plus.png b/commons/src/main/res/drawable-xxxhdpi/ic_plus.png
deleted file mode 100644
index 2bef05958..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_plus.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_properties.png b/commons/src/main/res/drawable-xxxhdpi/ic_properties.png
deleted file mode 100644
index 3a82cab3b..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_properties.png and /dev/null differ
diff --git a/commons/src/main/res/drawable-xxxhdpi/ic_unhide.png b/commons/src/main/res/drawable-xxxhdpi/ic_unhide.png
deleted file mode 100644
index 8382da2ea..000000000
Binary files a/commons/src/main/res/drawable-xxxhdpi/ic_unhide.png and /dev/null differ
diff --git a/commons/src/main/res/drawable/ic_baseline_description_24px.xml b/commons/src/main/res/drawable/ic_baseline_description_24px.xml
new file mode 100644
index 000000000..b15b0208e
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_baseline_description_24px.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M14,2 L6,2C4.9,2 4.01,2.9 4.01,4L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8ZM13,9 L13,3.5 18.5,9Z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_clock_vector.xml b/commons/src/main/res/drawable/ic_clock_vector.xml
new file mode 100644
index 000000000..1d81f9df4
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_clock_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m12.4492,7.339 l-1.5,0 0,6 4.75,2.85 0.75,-1.23 -4,-2.37zM11.9492,3.339c-4.97,0 -9,4.03 -9,9 0,4.97 4.02,9 9,9 4.97,0 9,-4.03 9,-9 0,-4.97 -4.03,-9 -9,-9zM11.9492,19.339c-3.87,0 -7,-3.13 -7,-7 0,-3.87 3.13,-7 7,-7 3.87,0 7,3.13 7,7 0,3.87 -3.13,7 -7,7z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_cross_vector.xml b/commons/src/main/res/drawable/ic_cross_vector.xml
new file mode 100644
index 000000000..1d81f9df4
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_cross_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m12.4492,7.339 l-1.5,0 0,6 4.75,2.85 0.75,-1.23 -4,-2.37zM11.9492,3.339c-4.97,0 -9,4.03 -9,9 0,4.97 4.02,9 9,9 4.97,0 9,-4.03 9,-9 0,-4.97 -4.03,-9 -9,-9zM11.9492,19.339c-3.87,0 -7,-3.13 -7,-7 0,-3.87 3.13,-7 7,-7 3.87,0 7,3.13 7,7 0,3.87 -3.13,7 -7,7z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_delete_vector.xml b/commons/src/main/res/drawable/ic_delete_vector.xml
new file mode 100644
index 000000000..40e175221
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_delete_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      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/commons/src/main/res/drawable/ic_edit_vector.xml b/commons/src/main/res/drawable/ic_edit_vector.xml
new file mode 100644
index 000000000..40e175221
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_edit_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      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/commons/src/main/res/drawable/ic_email_vector.xml b/commons/src/main/res/drawable/ic_email_vector.xml
new file mode 100644
index 000000000..40e175221
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_email_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      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/commons/src/main/res/drawable/ic_file_vector.xml b/commons/src/main/res/drawable/ic_file_vector.xml
new file mode 100644
index 000000000..b15b0208e
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_file_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M14,2 L6,2C4.9,2 4.01,2.9 4.01,4L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8ZM13,9 L13,3.5 18.5,9Z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_filter_vector.xml b/commons/src/main/res/drawable/ic_filter_vector.xml
new file mode 100644
index 000000000..c349e0101
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_filter_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_fingerprint_vector.xml b/commons/src/main/res/drawable/ic_fingerprint_vector.xml
new file mode 100644
index 000000000..6c6d6e51b
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_fingerprint_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M17.81,4.47c-0.08,0 -0.16,-0.02 -0.23,-0.06C15.66,3.42 14,3 12.01,3c-1.98,0 -3.86,0.47 -5.57,1.41 -0.24,0.13 -0.54,0.04 -0.68,-0.2 -0.13,-0.24 -0.04,-0.55 0.2,-0.68C7.82,2.52 9.86,2 12.01,2c2.13,0 3.99,0.47 6.03,1.52 0.25,0.13 0.34,0.43 0.21,0.67 -0.09,0.18 -0.26,0.28 -0.44,0.28zM3.5,9.72c-0.1,0 -0.2,-0.03 -0.29,-0.09 -0.23,-0.16 -0.28,-0.47 -0.12,-0.7 0.99,-1.4 2.25,-2.5 3.75,-3.27C9.98,4.04 14,4.03 17.15,5.65c1.5,0.77 2.76,1.86 3.75,3.25 0.16,0.22 0.11,0.54 -0.12,0.7 -0.23,0.16 -0.54,0.11 -0.7,-0.12 -0.9,-1.26 -2.04,-2.25 -3.39,-2.94 -2.87,-1.47 -6.54,-1.47 -9.4,0.01 -1.36,0.7 -2.5,1.7 -3.4,2.96 -0.08,0.14 -0.23,0.21 -0.39,0.21zM9.75,21.79c-0.13,0 -0.26,-0.05 -0.35,-0.15 -0.87,-0.87 -1.34,-1.43 -2.01,-2.64 -0.69,-1.23 -1.05,-2.73 -1.05,-4.34 0,-2.97 2.54,-5.39 5.66,-5.39s5.66,2.42 5.66,5.39c0,0.28 -0.22,0.5 -0.5,0.5s-0.5,-0.22 -0.5,-0.5c0,-2.42 -2.09,-4.39 -4.66,-4.39 -2.57,0 -4.66,1.97 -4.66,4.39 0,1.44 0.32,2.77 0.93,3.85 0.64,1.15 1.08,1.64 1.85,2.42 0.19,0.2 0.19,0.51 0,0.71 -0.11,0.1 -0.24,0.15 -0.37,0.15zM16.92,19.94c-1.19,0 -2.24,-0.3 -3.1,-0.89 -1.49,-1.01 -2.38,-2.65 -2.38,-4.39 0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,1.41 0.72,2.74 1.94,3.56 0.71,0.48 1.54,0.71 2.54,0.71 0.24,0 0.64,-0.03 1.04,-0.1 0.27,-0.05 0.53,0.13 0.58,0.41 0.05,0.27 -0.13,0.53 -0.41,0.58 -0.57,0.11 -1.07,0.12 -1.21,0.12zM14.91,22c-0.04,0 -0.09,-0.01 -0.13,-0.02 -1.59,-0.44 -2.63,-1.03 -3.72,-2.1 -1.4,-1.39 -2.17,-3.24 -2.17,-5.22 0,-1.62 1.38,-2.94 3.08,-2.94 1.7,0 3.08,1.32 3.08,2.94 0,1.07 0.93,1.94 2.08,1.94s2.08,-0.87 2.08,-1.94c0,-3.77 -3.25,-6.83 -7.25,-6.83 -2.84,0 -5.44,1.58 -6.61,4.03 -0.39,0.81 -0.59,1.76 -0.59,2.8 0,0.78 0.07,2.01 0.67,3.61 0.1,0.26 -0.03,0.55 -0.29,0.64 -0.26,0.1 -0.55,-0.04 -0.64,-0.29 -0.49,-1.31 -0.73,-2.61 -0.73,-3.96 0,-1.2 0.23,-2.29 0.68,-3.24 1.33,-2.79 4.28,-4.6 7.51,-4.6 4.55,0 8.25,3.51 8.25,7.83 0,1.62 -1.38,2.94 -3.08,2.94s-3.08,-1.32 -3.08,-2.94c0,-1.07 -0.93,-1.94 -2.08,-1.94s-2.08,0.87 -2.08,1.94c0,1.71 0.66,3.31 1.87,4.51 0.95,0.94 1.86,1.46 3.27,1.85 0.27,0.07 0.42,0.35 0.35,0.61 -0.05,0.23 -0.26,0.38 -0.47,0.38z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_folder_open_vector.xml b/commons/src/main/res/drawable/ic_folder_open_vector.xml
new file mode 100644
index 000000000..ffbd657b8
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_folder_open_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_folder_vector.xml b/commons/src/main/res/drawable/ic_folder_vector.xml
new file mode 100644
index 000000000..c4c4c0cd6
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_folder_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      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/commons/src/main/res/drawable/ic_label_vector.xml b/commons/src/main/res/drawable/ic_label_vector.xml
new file mode 100644
index 000000000..8e410e884
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_label_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M20,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,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_lock_vector.xml b/commons/src/main/res/drawable/ic_lock_vector.xml
new file mode 100644
index 000000000..0c649cadd
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_lock_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      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/commons/src/main/res/drawable/ic_minus_circle_vector.xml b/commons/src/main/res/drawable/ic_minus_circle_vector.xml
new file mode 100644
index 000000000..4f0225639
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_minus_circle_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M7,11v2h10v-2L7,11zM12,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/commons/src/main/res/drawable/ic_minus_vector.xml b/commons/src/main/res/drawable/ic_minus_vector.xml
new file mode 100644
index 000000000..59fbb84e9
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_minus_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m8.2712,10.8983 l0,2 8,0 0,-2z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_orientation_auto_vector.xml b/commons/src/main/res/drawable/ic_orientation_auto_vector.xml
new file mode 100644
index 000000000..10b9a512b
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_orientation_auto_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M16.48,2.52c3.27,1.55 5.61,4.72 5.97,8.48h1.5C23.44,4.84 18.29,0 12,0l-0.66,0.03 3.81,3.81 1.33,-1.32zM10.23,1.75c-0.59,-0.59 -1.54,-0.59 -2.12,0L1.75,8.11c-0.59,0.59 -0.59,1.54 0,2.12l12.02,12.02c0.59,0.59 1.54,0.59 2.12,0l6.36,-6.36c0.59,-0.59 0.59,-1.54 0,-2.12L10.23,1.75zM14.83,21.19L2.81,9.17l6.36,-6.36 12.02,12.02 -6.36,6.36zM7.52,21.48C4.25,19.94 1.91,16.76 1.55,13L0.05,13C0.56,19.16 5.71,24 12,24l0.66,-0.03 -3.81,-3.81 -1.33,1.32z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_orientation_landscape_vector.xml b/commons/src/main/res/drawable/ic_orientation_landscape_vector.xml
new file mode 100644
index 000000000..5121f1805
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_orientation_landscape_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M21,5L3,5c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,7c0,-1.1 -0.9,-2 -2,-2zM19,17L5,17L5,7h14v10zM10,16h4c0.55,0 1,-0.45 1,-1v-3c0,-0.55 -0.45,-1 -1,-1v-1c0,-1.11 -0.9,-2 -2,-2 -1.11,0 -2,0.9 -2,2v1c-0.55,0 -1,0.45 -1,1v3c0,0.55 0.45,1 1,1zM10.8,10c0,-0.66 0.54,-1.2 1.2,-1.2 0.66,0 1.2,0.54 1.2,1.2v1h-2.4v-1z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_orientation_portrait_vector.xml b/commons/src/main/res/drawable/ic_orientation_portrait_vector.xml
new file mode 100644
index 000000000..8c75da7a7
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_orientation_portrait_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M10,16h4c0.55,0 1,-0.45 1,-1v-3c0,-0.55 -0.45,-1 -1,-1v-1c0,-1.11 -0.9,-2 -2,-2 -1.11,0 -2,0.9 -2,2v1c-0.55,0 -1,0.45 -1,1v3c0,0.55 0.45,1 1,1zM10.8,10c0,-0.66 0.54,-1.2 1.2,-1.2 0.66,0 1.2,0.54 1.2,1.2v1h-2.4v-1zM17,1L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-2 -2,-2zM17,19L7,19L7,5h10v14z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_pause_vector.xml b/commons/src/main/res/drawable/ic_pause_vector.xml
new file mode 100644
index 000000000..d62dc6514
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_pause_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_person_vector.xml b/commons/src/main/res/drawable/ic_person_vector.xml
new file mode 100644
index 000000000..4c60341dc
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_person_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_phone_vector.xml b/commons/src/main/res/drawable/ic_phone_vector.xml
new file mode 100644
index 000000000..b10b03cd7
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_phone_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_place_vector.xml b/commons/src/main/res/drawable/ic_place_vector.xml
new file mode 100644
index 000000000..39f48633d
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_place_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_play_vector.xml b/commons/src/main/res/drawable/ic_play_vector.xml
new file mode 100644
index 000000000..c85bcf3a5
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_play_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M8,5v14l11,-7z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_plus_vector.xml b/commons/src/main/res/drawable/ic_plus_vector.xml
new file mode 100644
index 000000000..36db1a89a
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_plus_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m13.2719,6.964 l-2,0 0,4 -4,0 0,2 4,0 0,4 2,0 0,-4 4,0 0,-2 -4,0z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_properties_vector.xml b/commons/src/main/res/drawable/ic_properties_vector.xml
new file mode 100644
index 000000000..fce3ba469
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_properties_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/ic_unhide_vector.xml b/commons/src/main/res/drawable/ic_unhide_vector.xml
new file mode 100644
index 000000000..448c89d85
--- /dev/null
+++ b/commons/src/main/res/drawable/ic_unhide_vector.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+</vector>
diff --git a/commons/src/main/res/drawable/shortcut_plus.xml b/commons/src/main/res/drawable/shortcut_plus.xml
index 88e181386..00a8ab121 100644
--- a/commons/src/main/res/drawable/shortcut_plus.xml
+++ b/commons/src/main/res/drawable/shortcut_plus.xml
@@ -8,7 +8,7 @@
 
     <item
         android:bottom="@dimen/medium_margin"
-        android:drawable="@drawable/ic_plus"
+        android:drawable="@drawable/ic_plus_vector"
         android:left="@dimen/medium_margin"
         android:right="@dimen/medium_margin"
         android:top="@dimen/medium_margin"/>
diff --git a/commons/src/main/res/layout/dialog_filepicker.xml b/commons/src/main/res/layout/dialog_filepicker.xml
index 5fe8135a0..308063d61 100644
--- a/commons/src/main/res/layout/dialog_filepicker.xml
+++ b/commons/src/main/res/layout/dialog_filepicker.xml
@@ -35,9 +35,7 @@
             android:layout_alignTop="@+id/filepicker_list"
             android:layout_alignBottom="@+id/filepicker_list"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:paddingStart="@dimen/normal_margin"
-            android:paddingLeft="@dimen/normal_margin">
+            android:paddingStart="@dimen/normal_margin">
 
             <include layout="@layout/fastscroller_handle_vertical"/>
 
@@ -49,9 +47,9 @@
         android:layout_width="@dimen/fab_size"
         android:layout_height="@dimen/fab_size"
         android:layout_gravity="bottom|end"
-        android:layout_marginRight="@dimen/activity_margin"
+        android:layout_marginEnd="@dimen/activity_margin"
         android:layout_marginBottom="@dimen/activity_margin"
-        android:src="@drawable/ic_unhide"/>
+        android:src="@drawable/ic_unhide_vector"/>
 
     <com.simplemobiletools.commons.views.MyFloatingActionButton
         android:id="@+id/filepicker_fab"
@@ -59,7 +57,7 @@
         android:layout_height="@dimen/fab_size"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/activity_margin"
-        android:src="@drawable/ic_plus"
+        android:src="@drawable/ic_plus_vector"
         android:visibility="gone"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/commons/src/main/res/layout/filepicker_list_item.xml b/commons/src/main/res/layout/filepicker_list_item.xml
index 8ce4739e5..773570228 100644
--- a/commons/src/main/res/layout/filepicker_list_item.xml
+++ b/commons/src/main/res/layout/filepicker_list_item.xml
@@ -8,8 +8,7 @@
     android:background="?attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
-    android:paddingEnd="@dimen/activity_margin"
-    android:paddingRight="@dimen/activity_margin">
+    android:paddingEnd="@dimen/activity_margin">
 
     <ImageView
         android:id="@+id/list_item_icon"
@@ -17,14 +16,13 @@
         android:layout_height="@dimen/normal_icon_size"
         android:layout_centerVertical="true"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_folder"/>
+        android:src="@drawable/ic_folder_vector"/>
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toEndOf="@+id/list_item_icon"
-        android:layout_toRightOf="@+id/list_item_icon"
         android:padding="@dimen/small_margin">
 
         <com.simplemobiletools.commons.views.MyTextView
diff --git a/commons/src/main/res/layout/tab_fingerprint.xml b/commons/src/main/res/layout/tab_fingerprint.xml
index 19170c094..31b20b891 100644
--- a/commons/src/main/res/layout/tab_fingerprint.xml
+++ b/commons/src/main/res/layout/tab_fingerprint.xml
@@ -19,7 +19,7 @@
         android:layout_below="@+id/fingerprint_lock_title"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/activity_margin"
-        android:src="@drawable/ic_fingerprint"/>
+        android:src="@drawable/ic_fingerprint_vector"/>
 
     <com.simplemobiletools.commons.views.MyTextView
         android:id="@+id/fingerprint_label"
diff --git a/commons/src/main/res/menu/cab_delete_only.xml b/commons/src/main/res/menu/cab_delete_only.xml
index af34568ba..642b5e421 100644
--- a/commons/src/main/res/menu/cab_delete_only.xml
+++ b/commons/src/main/res/menu/cab_delete_only.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/cab_delete"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_delete_vector"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/commons/src/main/res/menu/cab_remove_only.xml b/commons/src/main/res/menu/cab_remove_only.xml
index bc4ee98e5..62cea206c 100644
--- a/commons/src/main/res/menu/cab_remove_only.xml
+++ b/commons/src/main/res/menu/cab_remove_only.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/cab_remove"
-        android:icon="@drawable/ic_minus_circle"
+        android:icon="@drawable/ic_minus_circle_vector"
         android:title="@string/remove"
         app:showAsAction="ifRoom"/>
 </menu>