diff --git a/app/build.gradle b/app/build.gradle
index 4e621c47f..d1653425c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,6 +19,7 @@ android {
         versionName "6.9.1"
         multiDexEnabled true
         setProperty("archivesBaseName", "gallery")
+        vectorDrawables.useSupportLibrary = true
     }
 
     signingConfigs {
@@ -61,7 +62,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.15.22'
+    implementation 'com.simplemobiletools:commons:5.15.24'
     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/res/layout/directory_item_grid.xml b/app/src/main/res/layout/directory_item_grid.xml
index 5a24ac9e9..f1145d6db 100644
--- a/app/src/main/res/layout/directory_item_grid.xml
+++ b/app/src/main/res/layout/directory_item_grid.xml
@@ -39,7 +39,7 @@
         android:background="@drawable/circle_background"
         android:contentDescription="@null"
         android:padding="@dimen/tiny_margin"
-        android:src="@drawable/ic_check"
+        android:src="@drawable/ic_check_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 133f24f7a..dae03b1d4 100644
--- a/app/src/main/res/layout/directory_item_list.xml
+++ b/app/src/main/res/layout/directory_item_list.xml
@@ -39,7 +39,7 @@
         android:background="@drawable/circle_background"
         android:contentDescription="@null"
         android:padding="@dimen/tiny_margin"
-        android:src="@drawable/ic_check"
+        android:src="@drawable/ic_check_vector"
         android:visibility="gone"/>
 
     <TextView
diff --git a/app/src/main/res/layout/photo_video_item_grid.xml b/app/src/main/res/layout/photo_video_item_grid.xml
index b873ffe5e..834214464 100644
--- a/app/src/main/res/layout/photo_video_item_grid.xml
+++ b/app/src/main/res/layout/photo_video_item_grid.xml
@@ -53,7 +53,7 @@
         android:background="@drawable/circle_background"
         android:contentDescription="@null"
         android:padding="@dimen/tiny_margin"
-        android:src="@drawable/ic_check"
+        android:src="@drawable/ic_check_vector"
         android:visibility="gone"/>
 
     <TextView
diff --git a/app/src/main/res/layout/photo_video_item_list.xml b/app/src/main/res/layout/photo_video_item_list.xml
index 24ae7dd88..b7876521a 100644
--- a/app/src/main/res/layout/photo_video_item_list.xml
+++ b/app/src/main/res/layout/photo_video_item_list.xml
@@ -25,7 +25,7 @@
         android:layout_margin="@dimen/small_margin"
         android:background="@drawable/circle_background"
         android:padding="@dimen/tiny_margin"
-        android:src="@drawable/ic_check"
+        android:src="@drawable/ic_check_vector"
         android:visibility="gone"/>
 
     <TextView
diff --git a/app/src/main/res/menu/cab_media.xml b/app/src/main/res/menu/cab_media.xml
index 5f3a83a8b..df7a58a2a 100644
--- a/app/src/main/res/menu/cab_media.xml
+++ b/app/src/main/res/menu/cab_media.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/cab_confirm_selection"
-        android:icon="@drawable/ic_check"
+        android:icon="@drawable/ic_check_vector"
         android:title="@string/confirm_selection"
         app:showAsAction="ifRoom"/>
     <item
diff --git a/app/src/main/res/menu/menu_editor.xml b/app/src/main/res/menu/menu_editor.xml
index bf319ba75..41b64055a 100644
--- a/app/src/main/res/menu/menu_editor.xml
+++ b/app/src/main/res/menu/menu_editor.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/save_as"
-        android:icon="@drawable/ic_check"
+        android:icon="@drawable/ic_check_vector"
         android:title="@string/save_as"
         app:showAsAction="ifRoom"/>
     <item
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index a7a56c606..ebbad2923 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -9,7 +9,7 @@
         app:showAsAction="collapseActionView|always"/>
     <item
         android:id="@+id/open_camera"
-        android:icon="@drawable/ic_camera"
+        android:icon="@drawable/ic_camera_vector"
         android:title="@string/open_camera"
         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 1db3d9709..65dce2f21 100644
--- a/app/src/main/res/menu/menu_media.xml
+++ b/app/src/main/res/menu/menu_media.xml
@@ -40,7 +40,7 @@
         app:showAsAction="never"/>
     <item
         android:id="@+id/open_camera"
-        android:icon="@drawable/ic_camera"
+        android:icon="@drawable/ic_camera_vector"
         android:title="@string/open_camera"
         app:showAsAction="ifRoom"/>
     <item
diff --git a/app/src/main/res/menu/menu_set_wallpaper.xml b/app/src/main/res/menu/menu_set_wallpaper.xml
index 82547aaa2..a10009346 100644
--- a/app/src/main/res/menu/menu_set_wallpaper.xml
+++ b/app/src/main/res/menu/menu_set_wallpaper.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/save"
-        android:icon="@drawable/ic_check"
+        android:icon="@drawable/ic_check_vector"
         android:title="@string/save"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/menu/menu_viewpager.xml b/app/src/main/res/menu/menu_viewpager.xml
index ed3dcc8ac..36724a6a7 100644
--- a/app/src/main/res/menu/menu_viewpager.xml
+++ b/app/src/main/res/menu/menu_viewpager.xml
@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_save_as"
-        android:icon="@drawable/ic_check"
+        android:icon="@drawable/ic_check_vector"
         android:title="@string/save_as"
         android:visible="false"
         app:showAsAction="ifRoom"/>