diff --git a/app/build.gradle b/app/build.gradle
index 9c69b7722..55e188564 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,7 +62,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.15.26'
+    implementation 'com.simplemobiletools:commons:5.15.31'
     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/PanoramaPhotoActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaPhotoActivity.kt
index c69cd5271..c89d2aefc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaPhotoActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaPhotoActivity.kt
@@ -45,7 +45,7 @@ open class PanoramaPhotoActivity : SimpleActivity() {
         explore.setOnClickListener {
             isExploreEnabled = !isExploreEnabled
             panorama_view.setPureTouchTracking(isExploreEnabled)
-            explore.setImageResource(if (isExploreEnabled) R.drawable.ic_explore else R.drawable.ic_explore_off)
+            explore.setImageResource(if (isExploreEnabled) R.drawable.ic_explore_vector else R.drawable.ic_explore_off_vector)
         }
 
         handlePermission(PERMISSION_WRITE_STORAGE) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaVideoActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaVideoActivity.kt
index e394858d2..c4803333c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaVideoActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PanoramaVideoActivity.kt
@@ -259,7 +259,7 @@ open class PanoramaVideoActivity : SimpleActivity(), SeekBar.OnSeekBarChangeList
         explore.setOnClickListener {
             mIsExploreEnabled = !mIsExploreEnabled
             vr_video_view.setPureTouchTracking(mIsExploreEnabled)
-            explore.setImageResource(if (mIsExploreEnabled) R.drawable.ic_explore else R.drawable.ic_explore_off)
+            explore.setImageResource(if (mIsExploreEnabled) R.drawable.ic_explore_vector else R.drawable.ic_explore_off_vector)
         }
     }
 
diff --git a/app/src/main/res/drawable-hdpi/ic_aspect_ratio.png b/app/src/main/res/drawable-hdpi/ic_aspect_ratio.png
deleted file mode 100644
index 81c7958d6..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_aspect_ratio.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_crop_rotate.png b/app/src/main/res/drawable-hdpi/ic_crop_rotate.png
deleted file mode 100644
index 3cf5e4e71..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_crop_rotate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_draw.png b/app/src/main/res/drawable-hdpi/ic_draw.png
deleted file mode 100644
index b2c513174..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_draw.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_explore.png b/app/src/main/res/drawable-hdpi/ic_explore.png
deleted file mode 100644
index ad948505a..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_explore.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_explore_off.png b/app/src/main/res/drawable-hdpi/ic_explore_off.png
deleted file mode 100644
index 59363f9ab..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_explore_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_flip_horizontally.png b/app/src/main/res/drawable-hdpi/ic_flip_horizontally.png
deleted file mode 100644
index ae3b9dbfb..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_flip_horizontally.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_flip_vertically.png b/app/src/main/res/drawable-hdpi/ic_flip_vertically.png
deleted file mode 100644
index eff105482..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_flip_vertically.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_pause.png b/app/src/main/res/drawable-hdpi/ic_pause.png
deleted file mode 100644
index eeb009d81..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_pause.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_photo_filter.png b/app/src/main/res/drawable-hdpi/ic_photo_filter.png
deleted file mode 100644
index 724d01d69..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_photo_filter.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_play.png b/app/src/main/res/drawable-hdpi/ic_play.png
deleted file mode 100644
index a2efea8dc..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_play.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_rotate_left.png b/app/src/main/res/drawable-hdpi/ic_rotate_left.png
deleted file mode 100644
index df19b1863..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_rotate_left.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_rotate_one_eighty.png b/app/src/main/res/drawable-hdpi/ic_rotate_one_eighty.png
deleted file mode 100644
index 6ec58172a..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_rotate_one_eighty.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_rotate_right.png b/app/src/main/res/drawable-hdpi/ic_rotate_right.png
deleted file mode 100644
index 7b1d07af3..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_rotate_right.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_set_as.png b/app/src/main/res/drawable-hdpi/ic_set_as.png
deleted file mode 100644
index d4de4c2b5..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_set_as.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_slideshow.png b/app/src/main/res/drawable-hdpi/ic_slideshow.png
deleted file mode 100644
index 53427ee8c..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_slideshow.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_aspect_ratio.png b/app/src/main/res/drawable-xhdpi/ic_aspect_ratio.png
deleted file mode 100644
index 8a69e996e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_aspect_ratio.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_crop_rotate.png b/app/src/main/res/drawable-xhdpi/ic_crop_rotate.png
deleted file mode 100644
index fe2eca85c..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_crop_rotate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_draw.png b/app/src/main/res/drawable-xhdpi/ic_draw.png
deleted file mode 100644
index 534bf7180..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_draw.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_explore.png b/app/src/main/res/drawable-xhdpi/ic_explore.png
deleted file mode 100644
index c5e971610..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_explore.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_explore_off.png b/app/src/main/res/drawable-xhdpi/ic_explore_off.png
deleted file mode 100644
index a2cb5e92b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_explore_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_flip_horizontally.png b/app/src/main/res/drawable-xhdpi/ic_flip_horizontally.png
deleted file mode 100644
index 5717ef76a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_flip_horizontally.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_flip_vertically.png b/app/src/main/res/drawable-xhdpi/ic_flip_vertically.png
deleted file mode 100644
index 4e9647fa9..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_flip_vertically.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pause.png b/app/src/main/res/drawable-xhdpi/ic_pause.png
deleted file mode 100644
index 7192ad487..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_pause.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_photo_filter.png b/app/src/main/res/drawable-xhdpi/ic_photo_filter.png
deleted file mode 100644
index 05226c215..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_photo_filter.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_play.png b/app/src/main/res/drawable-xhdpi/ic_play.png
deleted file mode 100644
index bb5d7c623..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_play.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_rotate_left.png b/app/src/main/res/drawable-xhdpi/ic_rotate_left.png
deleted file mode 100644
index e07494c64..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_rotate_left.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_rotate_one_eighty.png b/app/src/main/res/drawable-xhdpi/ic_rotate_one_eighty.png
deleted file mode 100644
index fa913d37d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_rotate_one_eighty.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_rotate_right.png b/app/src/main/res/drawable-xhdpi/ic_rotate_right.png
deleted file mode 100644
index 0f5ac605f..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_rotate_right.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_set_as.png b/app/src/main/res/drawable-xhdpi/ic_set_as.png
deleted file mode 100644
index 728313d9e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_set_as.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_slideshow.png b/app/src/main/res/drawable-xhdpi/ic_slideshow.png
deleted file mode 100644
index 9af0ae476..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_slideshow.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_aspect_ratio.png b/app/src/main/res/drawable-xxhdpi/ic_aspect_ratio.png
deleted file mode 100644
index cc07c4c25..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_aspect_ratio.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_crop_rotate.png b/app/src/main/res/drawable-xxhdpi/ic_crop_rotate.png
deleted file mode 100644
index 292f93bf6..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_crop_rotate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_draw.png b/app/src/main/res/drawable-xxhdpi/ic_draw.png
deleted file mode 100644
index 3e42d0923..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_draw.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_explore.png b/app/src/main/res/drawable-xxhdpi/ic_explore.png
deleted file mode 100644
index 2260fa95e..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_explore.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_explore_off.png b/app/src/main/res/drawable-xxhdpi/ic_explore_off.png
deleted file mode 100644
index 1007be3b7..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_explore_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_flip_horizontally.png b/app/src/main/res/drawable-xxhdpi/ic_flip_horizontally.png
deleted file mode 100644
index 79910ffe0..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_flip_horizontally.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_flip_vertically.png b/app/src/main/res/drawable-xxhdpi/ic_flip_vertically.png
deleted file mode 100644
index 45a93784f..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_flip_vertically.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause.png b/app/src/main/res/drawable-xxhdpi/ic_pause.png
deleted file mode 100644
index fb63ddc5a..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_pause.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_photo_filter.png b/app/src/main/res/drawable-xxhdpi/ic_photo_filter.png
deleted file mode 100644
index d555dd355..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_photo_filter.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_play.png b/app/src/main/res/drawable-xxhdpi/ic_play.png
deleted file mode 100644
index b568f7387..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_play.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_rotate_left.png b/app/src/main/res/drawable-xxhdpi/ic_rotate_left.png
deleted file mode 100644
index fec5b4164..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_rotate_left.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_rotate_one_eighty.png b/app/src/main/res/drawable-xxhdpi/ic_rotate_one_eighty.png
deleted file mode 100644
index 17a070205..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_rotate_one_eighty.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_rotate_right.png b/app/src/main/res/drawable-xxhdpi/ic_rotate_right.png
deleted file mode 100644
index 82f3e5493..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_rotate_right.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_set_as.png b/app/src/main/res/drawable-xxhdpi/ic_set_as.png
deleted file mode 100644
index 60f34eb20..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_set_as.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_slideshow.png b/app/src/main/res/drawable-xxhdpi/ic_slideshow.png
deleted file mode 100644
index 27b37c2c1..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_slideshow.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_aspect_ratio.png b/app/src/main/res/drawable-xxxhdpi/ic_aspect_ratio.png
deleted file mode 100644
index 3c52ec564..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_aspect_ratio.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_crop_rotate.png b/app/src/main/res/drawable-xxxhdpi/ic_crop_rotate.png
deleted file mode 100644
index 13dc42b28..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_crop_rotate.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_draw.png b/app/src/main/res/drawable-xxxhdpi/ic_draw.png
deleted file mode 100644
index 6c1924bdf..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_draw.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_explore.png b/app/src/main/res/drawable-xxxhdpi/ic_explore.png
deleted file mode 100644
index e127a202b..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_explore.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_explore_off.png b/app/src/main/res/drawable-xxxhdpi/ic_explore_off.png
deleted file mode 100644
index a6638ac85..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_explore_off.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_flip_horizontally.png b/app/src/main/res/drawable-xxxhdpi/ic_flip_horizontally.png
deleted file mode 100644
index d47ba4a7e..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_flip_horizontally.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_flip_vertically.png b/app/src/main/res/drawable-xxxhdpi/ic_flip_vertically.png
deleted file mode 100644
index 0053524c4..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_flip_vertically.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pause.png b/app/src/main/res/drawable-xxxhdpi/ic_pause.png
deleted file mode 100644
index 3ea7e03e5..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_pause.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_photo_filter.png b/app/src/main/res/drawable-xxxhdpi/ic_photo_filter.png
deleted file mode 100644
index f947149cb..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_photo_filter.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play.png b/app/src/main/res/drawable-xxxhdpi/ic_play.png
deleted file mode 100644
index 0bdaa8d04..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_play.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_rotate_left.png b/app/src/main/res/drawable-xxxhdpi/ic_rotate_left.png
deleted file mode 100644
index 3ffcf9cc0..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_rotate_left.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_rotate_one_eighty.png b/app/src/main/res/drawable-xxxhdpi/ic_rotate_one_eighty.png
deleted file mode 100644
index 707f4e9d1..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_rotate_one_eighty.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_rotate_right.png b/app/src/main/res/drawable-xxxhdpi/ic_rotate_right.png
deleted file mode 100644
index 13e03d530..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_rotate_right.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_set_as.png b/app/src/main/res/drawable-xxxhdpi/ic_set_as.png
deleted file mode 100644
index 303e1780f..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_set_as.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_slideshow.png b/app/src/main/res/drawable-xxxhdpi/ic_slideshow.png
deleted file mode 100644
index 2b5278bb9..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_slideshow.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_aspect_ratio_vector.xml b/app/src/main/res/drawable/ic_aspect_ratio_vector.xml
new file mode 100644
index 000000000..4f30d2612
--- /dev/null
+++ b/app/src/main/res/drawable/ic_aspect_ratio_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="M19,12h-2v3h-3v2h5v-5zM7,9h3L10,7L5,7v5h2L7,9zM21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19.01L3,19.01L3,4.99h18v14.02z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_crop_rotate_vector.xml b/app/src/main/res/drawable/ic_crop_rotate_vector.xml
new file mode 100644
index 000000000..09059a8b4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_crop_rotate_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.47,21.49C4.2,19.93 1.86,16.76 1.5,13L0,13c0.51,6.16 5.66,11 11.95,11 0.23,0 0.44,-0.02 0.66,-0.03L8.8,20.15l-1.33,1.34zM12.05,0c-0.23,0 -0.44,0.02 -0.66,0.04l3.81,3.81 1.33,-1.33C19.8,4.07 22.14,7.24 22.5,11L24,11c-0.51,-6.16 -5.66,-11 -11.95,-11zM16,14h2L18,8c0,-1.11 -0.9,-2 -2,-2h-6v2h6v6zM8,16L8,4L6,4v2L4,6v2h2v8c0,1.1 0.89,2 2,2h8v2h2v-2h2v-2L8,16z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_draw_vector.xml b/app/src/main/res/drawable/ic_draw_vector.xml
new file mode 100644
index 000000000..4ad8e70ee
--- /dev/null
+++ b/app/src/main/res/drawable/ic_draw_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="M4.59,6.89c0.7,-0.71 1.4,-1.35 1.71,-1.22 0.5,0.2 0,1.03 -0.3,1.52 -0.25,0.42 -2.86,3.89 -2.86,6.31 0,1.28 0.48,2.34 1.34,2.98 0.75,0.56 1.74,0.73 2.64,0.46 1.07,-0.31 1.95,-1.4 3.06,-2.77 1.21,-1.49 2.83,-3.44 4.08,-3.44 1.63,0 1.65,1.01 1.76,1.79 -3.78,0.64 -5.38,3.67 -5.38,5.37 0,1.7 1.44,3.09 3.21,3.09 1.63,0 4.29,-1.33 4.69,-6.1L21,14.88v-2.5h-2.47c-0.15,-1.65 -1.09,-4.2 -4.03,-4.2 -2.25,0 -4.18,1.91 -4.94,2.84 -0.58,0.73 -2.06,2.48 -2.29,2.72 -0.25,0.3 -0.68,0.84 -1.11,0.84 -0.45,0 -0.72,-0.83 -0.36,-1.92 0.35,-1.09 1.4,-2.86 1.85,-3.52 0.78,-1.14 1.3,-1.92 1.3,-3.28C8.95,3.69 7.31,3 6.44,3 5.12,3 3.97,4 3.72,4.25c-0.36,0.36 -0.66,0.66 -0.88,0.93l1.75,1.71zM13.88,18.55c-0.31,0 -0.74,-0.26 -0.74,-0.72 0,-0.6 0.73,-2.2 2.87,-2.76 -0.3,2.69 -1.43,3.48 -2.13,3.48z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_explore_off_vector.xml b/app/src/main/res/drawable/ic_explore_off_vector.xml
new file mode 100644
index 000000000..a67123134
--- /dev/null
+++ b/app/src/main/res/drawable/ic_explore_off_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.19,14.19l-1.41,-1.41 -1.56,-1.56L11,11 9.81,9.81 4.93,4.93 2.27,2.27 1,3.54l2.78,2.78c-0.11,0.16 -0.21,0.32 -0.31,0.48 -0.04,0.07 -0.09,0.14 -0.13,0.21 -0.09,0.15 -0.17,0.31 -0.25,0.47 -0.05,0.1 -0.1,0.21 -0.16,0.32 -0.06,0.14 -0.13,0.28 -0.19,0.43 -0.1,0.24 -0.19,0.48 -0.27,0.73l-0.09,0.3c-0.05,0.2 -0.1,0.39 -0.14,0.59 -0.02,0.11 -0.04,0.22 -0.07,0.33 -0.04,0.2 -0.07,0.4 -0.09,0.61 -0.01,0.1 -0.03,0.2 -0.03,0.3 -0.03,0.29 -0.05,0.6 -0.05,0.91 0,5.52 4.48,10 10,10 0.31,0 0.62,-0.02 0.92,-0.05l0.3,-0.03c0.2,-0.02 0.41,-0.06 0.61,-0.09 0.11,-0.02 0.22,-0.04 0.33,-0.07 0.2,-0.04 0.39,-0.09 0.58,-0.15 0.1,-0.03 0.2,-0.05 0.3,-0.09 0.25,-0.08 0.49,-0.17 0.73,-0.27 0.15,-0.06 0.29,-0.13 0.43,-0.19 0.11,-0.05 0.22,-0.1 0.33,-0.16 0.16,-0.08 0.31,-0.16 0.46,-0.25 0.07,-0.04 0.14,-0.09 0.21,-0.13 0.16,-0.1 0.32,-0.2 0.48,-0.31L20.46,23l1.27,-1.27 -2.66,-2.66 -4.88,-4.88zM6,18l3,-6.46L12.46,15 6,18zM22,12c0,0.31 -0.02,0.62 -0.05,0.92l-0.03,0.3c-0.02,0.2 -0.06,0.41 -0.09,0.61 -0.02,0.11 -0.04,0.22 -0.07,0.33 -0.04,0.2 -0.09,0.39 -0.15,0.58 -0.03,0.1 -0.05,0.21 -0.09,0.31 -0.08,0.25 -0.17,0.49 -0.27,0.73 -0.06,0.15 -0.13,0.29 -0.19,0.43 -0.05,0.11 -0.1,0.22 -0.16,0.33 -0.08,0.16 -0.16,0.31 -0.25,0.46 -0.04,0.07 -0.09,0.14 -0.13,0.21 -0.1,0.16 -0.2,0.32 -0.31,0.48L15,12.46 18,6l-6.46,3 -5.22,-5.22c0.16,-0.11 0.32,-0.21 0.48,-0.31 0.07,-0.04 0.14,-0.09 0.21,-0.13 0.15,-0.09 0.31,-0.17 0.46,-0.25 0.11,-0.05 0.22,-0.1 0.33,-0.16 0.14,-0.06 0.28,-0.13 0.43,-0.19 0.24,-0.1 0.48,-0.19 0.73,-0.27l0.31,-0.09c0.19,-0.05 0.38,-0.11 0.58,-0.15 0.11,-0.02 0.22,-0.04 0.33,-0.07 0.2,-0.04 0.4,-0.07 0.61,-0.09 0.1,-0.01 0.2,-0.03 0.3,-0.03 0.29,-0.02 0.6,-0.04 0.91,-0.04 5.52,0 10,4.48 10,10z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_explore_vector.xml b/app/src/main/res/drawable/ic_explore_vector.xml
new file mode 100644
index 000000000..07d304b87
--- /dev/null
+++ b/app/src/main/res/drawable/ic_explore_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,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_flip_horizontally_vector.xml b/app/src/main/res/drawable/ic_flip_horizontally_vector.xml
new file mode 100644
index 000000000..7b82d9d7c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flip_horizontally_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="M15,21h2v-2h-2v2zM19,9h2L21,7h-2v2zM3,5v14c0,1.1 0.9,2 2,2h4v-2L5,19L5,5h4L9,3L5,3c-1.1,0 -2,0.9 -2,2zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM11,23h2L13,1h-2v22zM19,17h2v-2h-2v2zM15,5h2L17,3h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_flip_vertically_vector.xml b/app/src/main/res/drawable/ic_flip_vertically_vector.xml
new file mode 100644
index 000000000..4d9437cf6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flip_vertically_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,9 l-0,-2 -2,0 -0,2 2,0zM9,5l0,-2 -2,0 0,2 2,0zM5,21 L19,21c1.1,0 2,-0.9 2,-2l0,-4 -2,-0 0,4 -14,0 0,-4 -2,-0 -0,4c-0,1.1 0.9,2 2,2zM3,5l2,-0 0,-2C3.9,3 3,3.9 3,5ZM23,13 L23,11 1,11 1,13 23,13ZM17,5 L17,3 15,3 15,5 17,5zM5,9 L5,7L3,7 3,9l2,-0zM13,5 L13,3 11,3 11,5 13,5zM21,5C21,3.9 20.1,3 19,3l0,2 2,0z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_photo_filter_vector.xml b/app/src/main/res/drawable/ic_photo_filter_vector.xml
new file mode 100644
index 000000000..7bf8aa41a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_photo_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="M19.02,10v9L5,19L5,5h9L14,3L5.02,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-9h-2zM17,10l0.94,-2.06L20,7l-2.06,-0.94L17,4l-0.94,2.06L14,7l2.06,0.94zM13.25,10.75L12,8l-1.25,2.75L8,12l2.75,1.25L12,16l1.25,-2.75L16,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_rotate_right_vector.xml b/app/src/main/res/drawable/ic_rotate_right_vector.xml
new file mode 100644
index 000000000..ba4935170
--- /dev/null
+++ b/app/src/main/res/drawable/ic_rotate_right_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="M15.55,5.55L11,1v3.07C7.06,4.56 4,7.92 4,12s3.05,7.44 7,7.93v-2.02c-2.84,-0.48 -5,-2.94 -5,-5.91s2.16,-5.43 5,-5.91L11,10l4.55,-4.45zM19.93,11c-0.17,-1.39 -0.72,-2.73 -1.62,-3.89l-1.42,1.42c0.54,0.75 0.88,1.6 1.02,2.47h2.02zM13,17.9v2.02c1.39,-0.17 2.74,-0.71 3.9,-1.61l-1.44,-1.44c-0.75,0.54 -1.59,0.89 -2.46,1.03zM16.89,15.48l1.42,1.41c0.9,-1.16 1.45,-2.5 1.62,-3.89h-2.02c-0.14,0.87 -0.48,1.72 -1.02,2.48z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_set_as_vector.xml b/app/src/main/res/drawable/ic_set_as_vector.xml
new file mode 100644
index 000000000..51a983f3b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_set_as_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="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_slideshow_vector.xml b/app/src/main/res/drawable/ic_slideshow_vector.xml
new file mode 100644
index 000000000..a9bc8667b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_slideshow_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,8v8l5,-4 -5,-4zM19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_panorama_photo.xml b/app/src/main/res/layout/activity_panorama_photo.xml
index 7b589f5d3..f4a92234d 100644
--- a/app/src/main/res/layout/activity_panorama_photo.xml
+++ b/app/src/main/res/layout/activity_panorama_photo.xml
@@ -36,6 +36,6 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentBottom="true"
         android:padding="@dimen/activity_margin"
-        android:src="@drawable/ic_explore"/>
+        android:src="@drawable/ic_explore_vector"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_panorama_video.xml b/app/src/main/res/layout/activity_panorama_video.xml
index 45e5fb637..337b4a375 100644
--- a/app/src/main/res/layout/activity_panorama_video.xml
+++ b/app/src/main/res/layout/activity_panorama_video.xml
@@ -20,7 +20,7 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentBottom="true"
         android:padding="@dimen/activity_margin"
-        android:src="@drawable/ic_explore"/>
+        android:src="@drawable/ic_explore_vector"/>
 
     <ImageView
         android:id="@+id/cardboard"
diff --git a/app/src/main/res/layout/bottom_actions.xml b/app/src/main/res/layout/bottom_actions.xml
index 825dfc772..88906f599 100644
--- a/app/src/main/res/layout/bottom_actions.xml
+++ b/app/src/main/res/layout/bottom_actions.xml
@@ -76,7 +76,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/rotate_right"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_rotate_right"
+        android:src="@drawable/ic_rotate_right_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_properties"
         app:layout_constraintHorizontal_bias="0.5"
@@ -121,7 +121,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/slideshow"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_slideshow"
+        android:src="@drawable/ic_slideshow_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_show_on_map"
         app:layout_constraintHorizontal_bias="0.5"
@@ -181,7 +181,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/set_as"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_set_as"
+        android:src="@drawable/ic_set_as_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_copy"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/bottom_editor_crop_rotate_actions.xml b/app/src/main/res/layout/bottom_editor_crop_rotate_actions.xml
index e27cf482d..93dcbb4e6 100644
--- a/app/src/main/res/layout/bottom_editor_crop_rotate_actions.xml
+++ b/app/src/main/res/layout/bottom_editor_crop_rotate_actions.xml
@@ -14,7 +14,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/rotate"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_rotate_right"
+        android:src="@drawable/ic_rotate_right_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_resize"
         app:layout_constraintHorizontal_bias="0.5"
@@ -42,7 +42,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/free_aspect_ratio"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_aspect_ratio"
+        android:src="@drawable/ic_aspect_ratio_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_flip_horizontally"
         app:layout_constraintHorizontal_bias="0.5"
@@ -56,7 +56,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/flip_horizontally"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_flip_horizontally"
+        android:src="@drawable/ic_flip_horizontally_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_flip_vertically"
         app:layout_constraintHorizontal_bias="0.5"
@@ -70,7 +70,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/flip_vertically"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_flip_vertically"
+        android:src="@drawable/ic_flip_vertically_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/layout/bottom_editor_primary_actions.xml b/app/src/main/res/layout/bottom_editor_primary_actions.xml
index fd7210674..ed600ed0e 100644
--- a/app/src/main/res/layout/bottom_editor_primary_actions.xml
+++ b/app/src/main/res/layout/bottom_editor_primary_actions.xml
@@ -14,7 +14,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/filter"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_photo_filter"
+        android:src="@drawable/ic_photo_filter_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_primary_crop_rotate"
         app:layout_constraintStart_toStartOf="parent"
@@ -26,7 +26,7 @@
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_crop_rotate"
+        android:src="@drawable/ic_crop_rotate_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_primary_draw"
         app:layout_constraintStart_toEndOf="@+id/bottom_primary_filter"
@@ -38,7 +38,7 @@
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_draw"
+        android:src="@drawable/ic_draw_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/bottom_primary_crop_rotate"
diff --git a/app/src/main/res/layout/bottom_set_wallpaper_actions.xml b/app/src/main/res/layout/bottom_set_wallpaper_actions.xml
index ddef09436..3be00ceaa 100644
--- a/app/src/main/res/layout/bottom_set_wallpaper_actions.xml
+++ b/app/src/main/res/layout/bottom_set_wallpaper_actions.xml
@@ -28,7 +28,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/rotate"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_rotate_right"
+        android:src="@drawable/ic_rotate_right_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/menu/cab_media.xml b/app/src/main/res/menu/cab_media.xml
index 83a9335d7..0d0bb7b5b 100644
--- a/app/src/main/res/menu/cab_media.xml
+++ b/app/src/main/res/menu/cab_media.xml
@@ -18,7 +18,7 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_rotate"
-        android:icon="@drawable/ic_rotate_right"
+        android:icon="@drawable/ic_rotate_right_vector"
         android:title="@string/rotate"
         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 ec0607510..42dc1c035 100644
--- a/app/src/main/res/menu/menu_viewpager.xml
+++ b/app/src/main/res/menu/menu_viewpager.xml
@@ -19,7 +19,7 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_rotate"
-        android:icon="@drawable/ic_rotate_right"
+        android:icon="@drawable/ic_rotate_right_vector"
         android:title="@string/rotate"
         app:showAsAction="ifRoom">
         <menu>
@@ -97,12 +97,12 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_slideshow"
-        android:icon="@drawable/ic_slideshow"
+        android:icon="@drawable/ic_slideshow_vector"
         android:title="@string/slideshow"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_set_as"
-        android:icon="@drawable/ic_set_as"
+        android:icon="@drawable/ic_set_as_vector"
         android:title="@string/set_as"
         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 15675cb33..eb7372b40 100644
--- a/app/src/main/res/menu/photo_video_menu.xml
+++ b/app/src/main/res/menu/photo_video_menu.xml
@@ -18,7 +18,7 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_set_as"
-        android:icon="@drawable/ic_set_as"
+        android:icon="@drawable/ic_set_as_vector"
         android:title="@string/set_as"
         app:showAsAction="ifRoom"/>
     <item