diff --git a/app/build.gradle b/app/build.gradle
index d1653425c..6cb891a5c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,7 +62,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.15.24'
+    implementation 'com.simplemobiletools:commons:5.15.25'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
index a4783ced3..314cffd36 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
@@ -620,12 +620,12 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
     private fun getChangeOrientationIcon(): Int {
         return if (mIsOrientationLocked) {
             if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
-                R.drawable.ic_orientation_portrait
+                R.drawable.ic_orientation_portrait_vector
             } else {
-                R.drawable.ic_orientation_landscape
+                R.drawable.ic_orientation_landscape_vector
             }
         } else {
-            R.drawable.ic_orientation_auto
+            R.drawable.ic_orientation_auto_vector
         }
     }
 
@@ -801,7 +801,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
         val favoriteIcon = if (medium.isFavorite) R.drawable.ic_star_on else R.drawable.ic_star_off
         bottom_favorite.setImageResource(favoriteIcon)
 
-        val hideIcon = if (medium.isHidden()) R.drawable.ic_unhide else R.drawable.ic_hide
+        val hideIcon = if (medium.isHidden()) R.drawable.ic_unhide_vector else R.drawable.ic_hide
         bottom_toggle_file_visibility.setImageResource(hideIcon)
 
         bottom_rotate.beVisibleIf(config.visibleBottomActions and BOTTOM_ACTION_ROTATE != 0 && getCurrentMedium()?.isImage() == true)
diff --git a/app/src/main/res/layout/bottom_actions.xml b/app/src/main/res/layout/bottom_actions.xml
index 23f9b7dc6..a22d4303b 100644
--- a/app/src/main/res/layout/bottom_actions.xml
+++ b/app/src/main/res/layout/bottom_actions.xml
@@ -31,7 +31,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/edit"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_edit"
+        android:src="@drawable/ic_edit_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_share"
         app:layout_constraintHorizontal_bias="0.5"
@@ -61,7 +61,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/delete"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_delete"
+        android:src="@drawable/ic_delete_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_rotate"
         app:layout_constraintHorizontal_bias="0.5"
@@ -91,7 +91,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/properties"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_properties"
+        android:src="@drawable/ic_properties_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_change_orientation"
         app:layout_constraintHorizontal_bias="0.5"
@@ -106,7 +106,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/change_orientation"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_orientation_auto"
+        android:src="@drawable/ic_orientation_auto_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_slideshow"
         app:layout_constraintHorizontal_bias="0.5"
@@ -136,7 +136,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/show_on_map"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_place"
+        android:src="@drawable/ic_place_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_toggle_file_visibility"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/dialog_directory_picker.xml b/app/src/main/res/layout/dialog_directory_picker.xml
index b41be6412..a3cc14860 100644
--- a/app/src/main/res/layout/dialog_directory_picker.xml
+++ b/app/src/main/res/layout/dialog_directory_picker.xml
@@ -50,7 +50,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/activity_margin"
-        android:src="@drawable/ic_unhide"
+        android:src="@drawable/ic_unhide_vector"
         android:visibility="gone"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/directory_item_grid.xml b/app/src/main/res/layout/directory_item_grid.xml
index f1145d6db..b40156665 100644
--- a/app/src/main/res/layout/directory_item_grid.xml
+++ b/app/src/main/res/layout/directory_item_grid.xml
@@ -25,7 +25,7 @@
         android:background="@color/default_background_color"
         android:contentDescription="@string/lock_folder"
         android:padding="@dimen/lock_padding"
-        android:src="@drawable/ic_lock_huge"
+        android:src="@drawable/ic_lock_vector"
         android:visibility="gone"/>
 
     <ImageView
diff --git a/app/src/main/res/layout/directory_item_list.xml b/app/src/main/res/layout/directory_item_list.xml
index dae03b1d4..5812af1ad 100644
--- a/app/src/main/res/layout/directory_item_list.xml
+++ b/app/src/main/res/layout/directory_item_list.xml
@@ -26,7 +26,7 @@
         android:background="@color/default_background_color"
         android:contentDescription="@string/lock_folder"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_lock_huge"
+        android:src="@drawable/ic_lock_vector"
         android:visibility="gone"/>
 
     <ImageView
diff --git a/app/src/main/res/menu/cab_directories.xml b/app/src/main/res/menu/cab_directories.xml
index e3930cd52..205d402ec 100644
--- a/app/src/main/res/menu/cab_directories.xml
+++ b/app/src/main/res/menu/cab_directories.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"/>
     <item
@@ -33,7 +33,7 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_unhide"
-        android:icon="@drawable/ic_unhide"
+        android:icon="@drawable/ic_unhide_vector"
         android:title="@string/unhide_folder"
         app:showAsAction="ifRoom"/>
     <item
diff --git a/app/src/main/res/menu/cab_hidden_folders.xml b/app/src/main/res/menu/cab_hidden_folders.xml
index 3bc48d529..938f82f7f 100644
--- a/app/src/main/res/menu/cab_hidden_folders.xml
+++ b/app/src/main/res/menu/cab_hidden_folders.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/cab_unhide"
-        android:icon="@drawable/ic_unhide"
+        android:icon="@drawable/ic_unhide_vector"
         android:title="@string/unhide"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/menu/cab_media.xml b/app/src/main/res/menu/cab_media.xml
index df7a58a2a..8afa12210 100644
--- a/app/src/main/res/menu/cab_media.xml
+++ b/app/src/main/res/menu/cab_media.xml
@@ -8,7 +8,7 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_delete"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_delete_vector"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
     <item
@@ -50,12 +50,12 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_unhide"
-        android:icon="@drawable/ic_unhide"
+        android:icon="@drawable/ic_unhide_vector"
         android:title="@string/unhide"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_edit"
-        android:icon="@drawable/ic_edit"
+        android:icon="@drawable/ic_edit_vector"
         android:title="@string/edit"
         app:showAsAction="ifRoom"/>
     <item
diff --git a/app/src/main/res/menu/menu_add_folder.xml b/app/src/main/res/menu/menu_add_folder.xml
index 4671dcd0f..3551a8a4d 100644
--- a/app/src/main/res/menu/menu_add_folder.xml
+++ b/app/src/main/res/menu/menu_add_folder.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/add_folder"
-        android:icon="@drawable/ic_plus"
+        android:icon="@drawable/ic_plus_vector"
         android:title="@string/add_folder"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/menu/menu_editor.xml b/app/src/main/res/menu/menu_editor.xml
index 41b64055a..01ae613ec 100644
--- a/app/src/main/res/menu/menu_editor.xml
+++ b/app/src/main/res/menu/menu_editor.xml
@@ -8,7 +8,7 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/edit"
-        android:icon="@drawable/ic_edit"
+        android:icon="@drawable/ic_edit_vector"
         android:title="@string/edit_with"
         app:showAsAction="ifRoom"/>
     <item
diff --git a/app/src/main/res/menu/menu_included_folders.xml b/app/src/main/res/menu/menu_included_folders.xml
index 4671dcd0f..3551a8a4d 100644
--- a/app/src/main/res/menu/menu_included_folders.xml
+++ b/app/src/main/res/menu/menu_included_folders.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/add_folder"
-        android:icon="@drawable/ic_plus"
+        android:icon="@drawable/ic_plus_vector"
         android:title="@string/add_folder"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index ebbad2923..eaacbea7b 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -19,7 +19,7 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/filter"
-        android:icon="@drawable/ic_filter"
+        android:icon="@drawable/ic_filter_vector"
         android:title="@string/filter_media"
         app:showAsAction="ifRoom"/>
     <item
diff --git a/app/src/main/res/menu/menu_media.xml b/app/src/main/res/menu/menu_media.xml
index 65dce2f21..c30d651a3 100644
--- a/app/src/main/res/menu/menu_media.xml
+++ b/app/src/main/res/menu/menu_media.xml
@@ -9,7 +9,7 @@
         app:showAsAction="collapseActionView|ifRoom"/>
     <item
         android:id="@+id/toggle_filename"
-        android:icon="@drawable/ic_label"
+        android:icon="@drawable/ic_label_vector"
         android:title="@string/toggle_filename"
         app:showAsAction="ifRoom"/>
     <item
@@ -19,7 +19,7 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/filter"
-        android:icon="@drawable/ic_filter"
+        android:icon="@drawable/ic_filter_vector"
         android:title="@string/filter_media"
         app:showAsAction="ifRoom"/>
     <item
diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml
index 80fe3f2f4..fcd91c617 100644
--- a/app/src/main/res/menu/menu_search.xml
+++ b/app/src/main/res/menu/menu_search.xml
@@ -9,7 +9,7 @@
         app:showAsAction="collapseActionView|always"/>
     <item
         android:id="@+id/toggle_filename"
-        android:icon="@drawable/ic_label"
+        android:icon="@drawable/ic_label_vector"
         android:title="@string/toggle_filename"
         app:showAsAction="always"/>
 </menu>
diff --git a/app/src/main/res/menu/menu_video_player.xml b/app/src/main/res/menu/menu_video_player.xml
index 00e818ca3..3651763fb 100644
--- a/app/src/main/res/menu/menu_video_player.xml
+++ b/app/src/main/res/menu/menu_video_player.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_change_orientation"
-        android:icon="@drawable/ic_orientation_auto"
+        android:icon="@drawable/ic_orientation_auto_vector"
         android:title="@string/change_orientation"
         app:showAsAction="ifRoom"/>
     <item
diff --git a/app/src/main/res/menu/menu_viewpager.xml b/app/src/main/res/menu/menu_viewpager.xml
index 36724a6a7..7b4c1d97b 100644
--- a/app/src/main/res/menu/menu_viewpager.xml
+++ b/app/src/main/res/menu/menu_viewpager.xml
@@ -9,7 +9,7 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_delete"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_delete_vector"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
     <item
@@ -50,7 +50,7 @@
         app:showAsAction="never"/>
     <item
         android:id="@+id/menu_change_orientation"
-        android:icon="@drawable/ic_orientation_auto"
+        android:icon="@drawable/ic_orientation_auto_vector"
         android:title="@string/change_orientation"
         app:showAsAction="ifRoom">
         <menu>
@@ -87,7 +87,7 @@
         app:showAsAction="never"/>
     <item
         android:id="@+id/menu_edit"
-        android:icon="@drawable/ic_edit"
+        android:icon="@drawable/ic_edit_vector"
         android:title="@string/edit"
         app:showAsAction="ifRoom"/>
     <item
diff --git a/app/src/main/res/menu/photo_video_menu.xml b/app/src/main/res/menu/photo_video_menu.xml
index 1a5913f9f..bdb2e77ef 100644
--- a/app/src/main/res/menu/photo_video_menu.xml
+++ b/app/src/main/res/menu/photo_video_menu.xml
@@ -13,7 +13,7 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_edit"
-        android:icon="@drawable/ic_edit"
+        android:icon="@drawable/ic_edit_vector"
         android:title="@string/edit"
         app:showAsAction="ifRoom"/>
     <item