diff --git a/app/build.gradle b/app/build.gradle
index 2932b7dd6..0a7c3db83 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -78,7 +78,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:29a10478d1'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:a7344ae945'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.22'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SetWallpaperActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SetWallpaperActivity.kt
index a616a1285..46e609400 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SetWallpaperActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SetWallpaperActivity.kt
@@ -92,7 +92,7 @@ class SetWallpaperActivity : SimpleActivity(), CropImageView.OnCropImageComplete
     private fun setupAspectRatio() {
         val wallpaperWidth = if (isLandscapeRatio) wallpaperManager.desiredMinimumWidth else wallpaperManager.desiredMinimumWidth / 2
         crop_image_view.setAspectRatio(wallpaperWidth, wallpaperManager.desiredMinimumHeight)
-        bottom_set_wallpaper_aspect_ratio.setImageResource(if (isLandscapeRatio) R.drawable.ic_minimize else R.drawable.ic_maximize)
+        bottom_set_wallpaper_aspect_ratio.setImageResource(if (isLandscapeRatio) R.drawable.ic_minimize_vector else R.drawable.ic_maximize_vector)
     }
 
     private fun changeAspectRatio(isLandscape: Boolean) {
diff --git a/app/src/main/res/drawable-hdpi/ic_cardboard.png b/app/src/main/res/drawable-hdpi/ic_cardboard.png
deleted file mode 100644
index 0df820802..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_cardboard.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_maximize.png b/app/src/main/res/drawable-hdpi/ic_maximize.png
deleted file mode 100644
index 7f5c94003..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_maximize.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_minimize.png b/app/src/main/res/drawable-hdpi/ic_minimize.png
deleted file mode 100644
index fe86cd0d4..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_minimize.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_cardboard.png b/app/src/main/res/drawable-xhdpi/ic_cardboard.png
deleted file mode 100644
index 1c978a019..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_cardboard.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_maximize.png b/app/src/main/res/drawable-xhdpi/ic_maximize.png
deleted file mode 100644
index 95b324a90..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_maximize.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_minimize.png b/app/src/main/res/drawable-xhdpi/ic_minimize.png
deleted file mode 100644
index 8a389fdbc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_minimize.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_cardboard.png b/app/src/main/res/drawable-xxhdpi/ic_cardboard.png
deleted file mode 100644
index 71c05230d..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_cardboard.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_maximize.png b/app/src/main/res/drawable-xxhdpi/ic_maximize.png
deleted file mode 100644
index cd9bcb195..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_maximize.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_minimize.png b/app/src/main/res/drawable-xxhdpi/ic_minimize.png
deleted file mode 100644
index 6a9adb38e..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_minimize.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cardboard.png b/app/src/main/res/drawable-xxxhdpi/ic_cardboard.png
deleted file mode 100644
index d33c6ef77..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_cardboard.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_maximize.png b/app/src/main/res/drawable-xxxhdpi/ic_maximize.png
deleted file mode 100644
index 6d89e4665..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_maximize.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_minimize.png b/app/src/main/res/drawable-xxxhdpi/ic_minimize.png
deleted file mode 100644
index 5746cb51d..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_minimize.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
index d0ebe2814..3fcbb3683 100644
--- a/app/src/main/res/drawable/ic_aspect_ratio_vector.xml
+++ b/app/src/main/res/drawable/ic_aspect_ratio_vector.xml
@@ -1,9 +1,3 @@
-<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 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 12c-0.55 0-1 0.45-1 1v2h-2c-0.55 0-1 0.45-1 1s0.45 1 1 1h3c0.55 0 1-0.45 1-1v-3c0-0.55-0.45-1-1-1zM7 9h2c0.55 0 1-0.45 1-1S9.55 7 9 7H6C5.45 7 5 7.45 5 8v3c0 0.55 0.45 1 1 1s1-0.45 1-1V9zm14-6H3C1.9 3 1 3.9 1 5v14c0 1.1 0.9 2 2 2h18c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm-1 16.01H4c-0.55 0-1-0.45-1-1V5.99c0-0.55 0.45-1 1-1h16c0.55 0 1 0.45 1 1v12.02c0 0.55-0.45 1-1 1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cardboard_vector.xml b/app/src/main/res/drawable/ic_cardboard_vector.xml
new file mode 100644
index 000000000..e250fe73d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cardboard_vector.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="100" android:viewportHeight="100">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M78.529 26.588h-57.3c-6.5 0-11.7 5.3-11.7 11.7v23.1c0 6.5 5.3 11.7 11.7 11.7h17.7c1.6 0 2.8-1.3 2.8-2.8 0-0.7 0.1-1.5 0.3-2.2 0.8-3.1 3.4-5.4 6.5-6 5.2-0.9 9.6 3.1 9.6 8.1 0 1.6 1.2 2.9 2.8 2.9h17.7c6.5 0 11.7-5.3 11.7-11.7v-23c-0.1-6.5-5.3-11.8-11.8-11.8zm-43.6 30.5c-4.5 0-8.2-3.7-8.2-8.2 0-4.5 3.7-8.2 8.2-8.2 4.5 0 8.2 3.7 8.2 8.2 0 4.5-3.7 8.2-8.2 8.2zm29.9 0c-4.5 0-8.2-3.7-8.2-8.2 0-4.5 3.7-8.2 8.2-8.2 4.5 0 8.2 3.7 8.2 8.2 0 4.5-3.7 8.2-8.2 8.2z"/>
+</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
index 681d300cd..d24e5faf5 100644
--- a/app/src/main/res/drawable/ic_crop_rotate_vector.xml
+++ b/app/src/main/res/drawable/ic_crop_rotate_vector.xml
@@ -1,9 +1,3 @@
-<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 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 9v5h2V8c0-1.1-0.9-2-2-2h-6v2h5c0.55 0 1 0.45 1 1zm3 7H9c-0.55 0-1-0.45-1-1V5c0-0.55-0.45-1-1-1S6 4.45 6 5v1H5C4.45 6 4 6.45 4 7s0.45 1 1 1h1v8c0 1.1 0.9 2 2 2h8v1c0 0.55 0.45 1 1 1s1-0.45 1-1v-1h1c0.55 0 1-0.45 1-1s-0.45-1-1-1zM17.66 1.4c-1.67-0.89-3.83-1.51-6.27-1.36l3.81 3.81 1.33-1.33c3.09 1.46 5.34 4.37 5.89 7.86 0.06 0.41 0.44 0.69 0.86 0.62 0.41-0.06 0.69-0.45 0.62-0.86-0.6-3.8-2.96-7-6.24-8.74zM7.47 21.49c-3.09-1.46-5.34-4.37-5.89-7.86-0.06-0.41-0.44-0.69-0.86-0.62-0.41 0.06-0.69 0.45-0.62 0.86 0.6 3.81 2.96 7.01 6.24 8.75 1.67 0.89 3.83 1.51 6.27 1.36L8.8 20.16l-1.33 1.33z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_draw_vector.xml b/app/src/main/res/drawable/ic_draw_vector.xml
index 1e296d845..dfa88b66e 100644
--- a/app/src/main/res/drawable/ic_draw_vector.xml
+++ b/app/src/main/res/drawable/ic_draw_vector.xml
@@ -1,9 +1,3 @@
-<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 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.85 10.39l1.06-1.06c0.78-0.78 0.78-2.05 0-2.83L18.5 5.09c-0.78-0.78-2.05-0.78-2.83 0l-1.06 1.06 4.24 4.24zm-5.66-2.83l-9.05 9.05C4.05 16.7 4 16.83 4 16.96v3.54C4 20.78 4.22 21 4.5 21h3.54c0.13 0 0.26-0.05 0.35-0.15l9.05-9.05-4.25-4.24zM19 17.5c0 2.19-2.54 3.5-5 3.5-0.55 0-1-0.45-1-1s0.45-1 1-1c1.54 0 3-0.73 3-1.5 0-0.47-0.48-0.87-1.23-1.2l1.48-1.48C18.32 15.45 19 16.29 19 17.5zM4.58 13.35C3.61 12.79 3 12.06 3 11c0-1.8 1.89-2.63 3.56-3.36C7.59 7.18 9 6.56 9 6c0-0.41-0.78-1-2-1-1.26 0-1.8 0.61-1.83 0.64-0.35 0.41-0.98 0.46-1.4 0.12-0.41-0.34-0.49-0.95-0.15-1.38C3.73 4.24 4.76 3 7 3s4 1.32 4 3c0 1.87-1.93 2.72-3.64 3.47C6.42 9.88 5 10.5 5 11c0 0.31 0.43 0.6 1.07 0.86l-1.49 1.49z"/>
 </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
index a67123134..8005ddbfd 100644
--- a/app/src/main/res/drawable/ic_explore_off_vector.xml
+++ b/app/src/main/res/drawable/ic_explore_off_vector.xml
@@ -1,9 +1,3 @@
-<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 xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#FFFFFF" android:pathData="M18 6l-2.91 6.26 5.25 5.25C21.39 15.93 22 14.04 22 12c0-5.52-4.48-10-10-10-2.04 0-3.93 0.61-5.51 1.66l5.25 5.25L18 6zM2.81 5.64l0.85 0.85c-1.37 2.07-2 4.68-1.48 7.45 0.75 3.95 3.92 7.13 7.88 7.88 2.77 0.52 5.38-0.1 7.45-1.48l0.85 0.85c0.39 0.39 1.02 0.39 1.41 0 0.39-0.39 0.39-1.02 0-1.41L4.22 4.22c-0.39-0.39-1.02-0.39-1.41 0-0.39 0.39-0.39 1.03 0 1.42zm6.1 6.1l3.35 3.35L6 18l2.91-6.26z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_explore_vector.xml b/app/src/main/res/drawable/ic_explore_vector.xml
index 07d304b87..5545365c3 100644
--- a/app/src/main/res/drawable/ic_explore_vector.xml
+++ b/app/src/main/res/drawable/ic_explore_vector.xml
@@ -1,9 +1,3 @@
-<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 xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path 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 2zm2.19 12.19L6 18l3.81-8.19L18 6l-3.81 8.19z" android:fillColor="#FFFFFF"/>
 </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
index 7b82d9d7c..42733799a 100644
--- a/app/src/main/res/drawable/ic_flip_horizontally_vector.xml
+++ b/app/src/main/res/drawable/ic_flip_horizontally_vector.xml
@@ -1,9 +1,3 @@
-<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 xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M15 21h2v-2h-2v2zm4-12h2V7h-2v2zM3 5v14c0 1.1 0.9 2 2 2h3c0.55 0 1-0.45 1-1s-0.45-1-1-1H6c-0.55 0-1-0.45-1-1V6c0-0.55 0.45-1 1-1h2c0.55 0 1-0.45 1-1S8.55 3 8 3H5C3.9 3 3 3.9 3 5zm16-2v2h2c0-1.1-0.9-2-2-2zm-7 20c0.55 0 1-0.45 1-1V2c0-0.55-0.45-1-1-1s-1 0.45-1 1v20c0 0.55 0.45 1 1 1zm7-6h2v-2h-2v2zM15 5h2V3h-2v2zm4 8h2v-2h-2v2zm0 8c1.1 0 2-0.9 2-2h-2v2z" android:fillColor="#FFFFFF"/>
 </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
index 4d9437cf6..92eb70ba3 100644
--- a/app/src/main/res/drawable/ic_flip_vertically_vector.xml
+++ b/app/src/main/res/drawable/ic_flip_vertically_vector.xml
@@ -1,9 +1,3 @@
-<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 xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M21 9V7h-2v2zM9 5V3H7v2zM5 21h14c1.1 0 2-0.9 2-2v-3c0-0.55-0.45-1-1-1s-1 0.45-1 1v2c0 0.55-0.45 1-1 1H6c-0.55 0-1-0.45-1-1v-2c0-0.55-0.45-1-1-1s-1 0.45-1 1v3c0 1.1 0.9 2 2 2zM3 5h2V3C3.9 3 3 3.9 3 5zm20 7c0-0.55-0.45-1-1-1H2c-0.55 0-1 0.45-1 1s0.45 1 1 1h20c0.55 0 1-0.45 1-1zm-6-7V3h-2v2zM5 9V7H3v2zm8-4V3h-2v2zm8 0c0-1.1-0.9-2-2-2v2z" android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_maximize_vector.xml b/app/src/main/res/drawable/ic_maximize_vector.xml
new file mode 100644
index 000000000..7598ad394
--- /dev/null
+++ b/app/src/main/res/drawable/ic_maximize_vector.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M15.85 3.85L17.3 5.3l-2.18 2.16c-0.39 0.39-0.39 1.03 0 1.42 0.39 0.39 1.03 0.39 1.42 0L18.7 6.7l1.45 1.45C20.46 8.46 21 8.24 21 7.79V3.5C21 3.22 20.78 3 20.5 3h-4.29c-0.45 0-0.67 0.54-0.36 0.85zm-12 4.3L5.3 6.7l2.16 2.18c0.39 0.39 1.03 0.39 1.42 0 0.39-0.39 0.39-1.03 0-1.42L6.7 5.3l1.45-1.45C8.46 3.54 8.24 3 7.79 3H3.5C3.22 3 3 3.22 3 3.5v4.29c0 0.45 0.54 0.67 0.85 0.36zm4.3 12L6.7 18.7l2.18-2.16c0.39-0.39 0.39-1.03 0-1.42-0.39-0.39-1.03-0.39-1.42 0L5.3 17.3l-1.45-1.45C3.54 15.54 3 15.76 3 16.21v4.29C3 20.78 3.22 21 3.5 21h4.29c0.45 0 0.67-0.54 0.36-0.85zm12-4.3L18.7 17.3l-2.16-2.18c-0.39-0.39-1.03-0.39-1.42 0-0.39 0.39-0.39 1.03 0 1.42l2.18 2.16-1.45 1.45C15.54 20.46 15.76 21 16.21 21h4.29c0.28 0 0.5-0.22 0.5-0.5v-4.29c0-0.45-0.54-0.67-0.85-0.36z" android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_minimize_vector.xml b/app/src/main/res/drawable/ic_minimize_vector.xml
new file mode 100644
index 000000000..77e8c0f3c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_minimize_vector.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M3 8c0 0.55 0.45 1 1 1h4c0.55 0 1-0.45 1-1V4c0-0.55-0.45-1-1-1S7 3.45 7 4v1.59L4.62 3.21c-0.39-0.39-1.02-0.39-1.41 0-0.39 0.39-0.39 1.02 0 1.41L5.59 7H4C3.45 7 3 7.45 3 8zm17-1h-1.59l2.38-2.38c0.39-0.39 0.39-1.02 0-1.41-0.39-0.39-1.02-0.39-1.41 0L17 5.59V4c0-0.55-0.45-1-1-1s-1 0.45-1 1v4c0 0.55 0.45 1 1 1h4c0.55 0 1-0.45 1-1s-0.45-1-1-1zM4 17h1.59l-2.38 2.38c-0.39 0.39-0.39 1.02 0 1.41 0.39 0.39 1.02 0.39 1.41 0L7 18.41V20c0 0.55 0.45 1 1 1s1-0.45 1-1v-4c0-0.55-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1zm17-1c0-0.55-0.45-1-1-1h-4c-0.55 0-1 0.45-1 1v4c0 0.55 0.45 1 1 1s1-0.45 1-1v-1.59l2.38 2.38c0.39 0.39 1.02 0.39 1.41 0 0.39-0.39 0.39-1.02 0-1.41L18.41 17H20c0.55 0 1-0.45 1-1z" android:fillColor="#FFFFFF"/>
+</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
index 127f154be..7b2290b49 100644
--- a/app/src/main/res/drawable/ic_photo_filter_vector.xml
+++ b/app/src/main/res/drawable/ic_photo_filter_vector.xml
@@ -1,9 +1,3 @@
-<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 xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#FFFFFF" android:pathData="M19.02 10.99V18c0 0.55-0.45 1-1 1H6c-0.55 0-1-0.45-1-1V6c0-0.55 0.45-1 1-1h7c0.55 0 1-0.45 1-1s-0.45-1-1-1H5.02c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2H19c1.1 0 2-0.89 2-2v-8.01c0-0.55-0.44-0.99-0.99-0.99s-0.99 0.44-0.99 0.99zm-5.77-0.24L12.46 9c-0.18-0.39-0.73-0.39-0.91 0l-0.79 1.75L9 11.54c-0.39 0.18-0.39 0.73 0 0.91l1.75 0.79 0.79 1.76c0.18 0.39 0.73 0.39 0.91 0l0.79-1.75L15 12.46c0.39-0.18 0.39-0.73 0-0.91l-1.75-0.8zm4.69-4.69l-0.6-1.32c-0.13-0.29-0.55-0.29-0.69 0l-0.6 1.32-1.32 0.6c-0.29 0.13-0.29 0.55 0 0.69l1.32 0.6 0.6 1.32c0.13 0.29 0.55 0.29 0.69 0l0.6-1.32 1.32-0.6c0.29-0.13 0.29-0.55 0-0.69l-1.32-0.6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_portrait_photo_vector.xml b/app/src/main/res/drawable/ic_portrait_photo_vector.xml
index e94d39587..54c8f9624 100644
--- a/app/src/main/res/drawable/ic_portrait_photo_vector.xml
+++ b/app/src/main/res/drawable/ic_portrait_photo_vector.xml
@@ -1,9 +1,3 @@
-<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,12.25c1.24,0 2.25,-1.01 2.25,-2.25S13.24,7.75 12,7.75 9.75,8.76 9.75,10s1.01,2.25 2.25,2.25zM16.5,16.25c0,-1.5 -3,-2.25 -4.5,-2.25s-4.5,0.75 -4.5,2.25L7.5,17h9v-0.75zM19,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 xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M12 12.25c1.24 0 2.25-1.01 2.25-2.25S13.24 7.75 12 7.75 9.75 8.76 9.75 10s1.01 2.25 2.25 2.25zm4.5 4c0-1.5-3-2.25-4.5-2.25s-4.5 0.75-4.5 2.25V17h9v-0.75zM19 3H5C3.9 3 3 3.9 3 5v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm-1 16H6c-0.55 0-1-0.45-1-1V6c0-0.55 0.45-1 1-1h12c0.55 0 1 0.45 1 1v12c0 0.55-0.45 1-1 1z" android:fillColor="#FFFFFF"/>
 </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
index ba4935170..fed0c5047 100644
--- a/app/src/main/res/drawable/ic_rotate_right_vector.xml
+++ b/app/src/main/res/drawable/ic_rotate_right_vector.xml
@@ -1,9 +1,3 @@
-<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 xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#FFFFFF" android:pathData="M14.83 4.83L12.7 2.7C12.08 2.08 11 2.52 11 3.41v0.66C7.06 4.56 4 7.92 4 12c0 3.64 2.43 6.71 5.77 7.68 0.62 0.18 1.23-0.32 1.23-0.96v-0.03c0-0.43-0.27-0.82-0.68-0.94C7.82 17.03 6 14.73 6 12c0-2.97 2.16-5.43 5-5.91v1.53c0 0.89 1.07 1.33 1.7 0.71l2.13-2.08c0.4-0.38 0.4-1.02 0-1.42zm4.84 4.93c-0.16-0.55-0.38-1.08-0.66-1.59-0.31-0.57-1.1-0.66-1.56-0.2l-0.01 0.01c-0.31 0.31-0.38 0.78-0.17 1.16 0.2 0.37 0.36 0.76 0.48 1.16 0.12 0.42 0.51 0.7 0.94 0.7h0.02c0.65 0 1.15-0.62 0.96-1.24zM13 18.68v0.02c0 0.65 0.62 1.14 1.24 0.96 0.55-0.16 1.08-0.38 1.59-0.66 0.57-0.31 0.66-1.1 0.2-1.56l-0.02-0.02c-0.31-0.31-0.78-0.38-1.16-0.17-0.37 0.21-0.76 0.37-1.16 0.49-0.41 0.12-0.69 0.51-0.69 0.94zm4.44-2.65c0.46 0.46 1.25 0.37 1.56-0.2 0.28-0.51 0.5-1.04 0.67-1.59 0.18-0.62-0.31-1.24-0.96-1.24h-0.02c-0.44 0-0.82 0.28-0.94 0.7-0.12 0.4-0.28 0.79-0.48 1.17-0.21 0.38-0.13 0.86 0.17 1.16z"/>
 </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
index 51a983f3b..5f00129cc 100644
--- a/app/src/main/res/drawable/ic_set_as_vector.xml
+++ b/app/src/main/res/drawable/ic_set_as_vector.xml
@@ -1,9 +1,3 @@
-<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 xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="100" android:viewportHeight="100">
+    <path android:fillColor="#FFFFFF" android:pathData="M27.109 13.725c6.939-2.277 14.878-0.678 20.396 4.839 6.065 6.065 7.398 15.056 4.044 22.428l34.14 34.14c2.742 2.742 2.742 7.157 0 9.899-2.742 2.742-7.157 2.742-9.899 0l-34.14-34.14c-7.373 3.354-16.364 2.021-22.429-4.044-5.517-5.517-7.117-13.457-4.839-20.396l8.375 8.375c3.526 3.526 9.202 3.526 12.728 0s3.526-9.202 0-12.728z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_slideshow_vector.xml b/app/src/main/res/drawable/ic_slideshow_vector.xml
index a9bc8667b..f8e373b4e 100644
--- a/app/src/main/res/drawable/ic_slideshow_vector.xml
+++ b/app/src/main/res/drawable/ic_slideshow_vector.xml
@@ -1,9 +1,3 @@
-<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 xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M10 9.04v5.92c0 0.42 0.48 0.65 0.81 0.39l3.7-2.96c0.25-0.2 0.25-0.58 0-0.78l-3.7-2.96C10.48 8.39 10 8.62 10 9.04zM19 3H5C3.9 3 3 3.9 3 5v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm-1 16H6c-0.55 0-1-0.45-1-1V6c0-0.55 0.45-1 1-1h12c0.55 0 1 0.45 1 1v12c0 0.55-0.45 1-1 1z" android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_panorama_photo.xml b/app/src/main/res/layout/activity_panorama_photo.xml
index f4a92234d..4884433e5 100644
--- a/app/src/main/res/layout/activity_panorama_photo.xml
+++ b/app/src/main/res/layout/activity_panorama_photo.xml
@@ -27,7 +27,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:padding="@dimen/activity_margin"
-        android:src="@drawable/ic_cardboard"/>
+        android:src="@drawable/ic_cardboard_vector"/>
 
     <ImageView
         android:id="@+id/explore"
diff --git a/app/src/main/res/layout/activity_panorama_video.xml b/app/src/main/res/layout/activity_panorama_video.xml
index 337b4a375..a9912952b 100644
--- a/app/src/main/res/layout/activity_panorama_video.xml
+++ b/app/src/main/res/layout/activity_panorama_video.xml
@@ -29,6 +29,6 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:padding="@dimen/activity_margin"
-        android:src="@drawable/ic_cardboard"/>
+        android:src="@drawable/ic_cardboard_vector"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/bottom_actions.xml b/app/src/main/res/layout/bottom_actions.xml
index bcab016a1..87ad8a698 100644
--- a/app/src/main/res/layout/bottom_actions.xml
+++ b/app/src/main/res/layout/bottom_actions.xml
@@ -210,7 +210,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/move"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_move"
+        android:src="@drawable/ic_move_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_resize"
         app:layout_constraintHorizontal_bias="0.5"
@@ -225,7 +225,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/resize"
         android:padding="@dimen/medium_margin"
-        android:src="@drawable/ic_minimize"
+        android:src="@drawable/ic_minimize_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_crop_rotate_actions.xml b/app/src/main/res/layout/bottom_editor_crop_rotate_actions.xml
index 93dcbb4e6..057abe682 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
@@ -28,7 +28,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/resize"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_minimize"
+        android:src="@drawable/ic_minimize_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_aspect_ratio"
         app:layout_constraintHorizontal_bias="0.5"
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 3be00ceaa..6cecacfc0 100644
--- a/app/src/main/res/layout/bottom_set_wallpaper_actions.xml
+++ b/app/src/main/res/layout/bottom_set_wallpaper_actions.xml
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="@dimen/normal_margin"
-        android:src="@drawable/ic_minimize"
+        android:src="@drawable/ic_minimize_vector"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/bottom_set_wallpaper_rotate"
         app:layout_constraintHorizontal_bias="0.5"