diff --git a/app/build.gradle b/app/build.gradle
index ea1c51863..5eacf3711 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,7 +32,7 @@ android {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.1.1'
+    compile 'com.simplemobiletools:commons:2.1.2'
     compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
     compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1'
     compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8146f9538..546f1c5e7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_launcher_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt
index 0250bd811..ab446d44e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt
@@ -206,7 +206,7 @@ class VideoFragment : ViewPagerFragment(), View.OnClickListener, SurfaceHolder.C
     private fun pauseVideo() {
         mIsPlaying = false
         mMediaPlayer?.pause()
-        mView.video_play_outline.setImageDrawable(resources.getDrawable(R.mipmap.play_outline_big))
+        mView.video_play_outline.setImageDrawable(resources.getDrawable(R.drawable.img_play_outline_big))
         activity.window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     }
 
diff --git a/app/src/main/res/mipmap-hdpi/edit.png b/app/src/main/res/drawable-hdpi/ic_edit.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/edit.png
rename to app/src/main/res/drawable-hdpi/ic_edit.png
diff --git a/app/src/main/res/mipmap-hdpi/hide.png b/app/src/main/res/drawable-hdpi/ic_hide.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/hide.png
rename to app/src/main/res/drawable-hdpi/ic_hide.png
diff --git a/app/src/main/res/mipmap-hdpi/pin.png b/app/src/main/res/drawable-hdpi/ic_pin.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/pin.png
rename to app/src/main/res/drawable-hdpi/ic_pin.png
diff --git a/app/src/main/res/mipmap-hdpi/resize.png b/app/src/main/res/drawable-hdpi/ic_resize.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/resize.png
rename to app/src/main/res/drawable-hdpi/ic_resize.png
diff --git a/app/src/main/res/mipmap-hdpi/rotate.png b/app/src/main/res/drawable-hdpi/ic_rotate.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/rotate.png
rename to app/src/main/res/drawable-hdpi/ic_rotate.png
diff --git a/app/src/main/res/mipmap-hdpi/toggle_filename.png b/app/src/main/res/drawable-hdpi/ic_toggle_filename.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/toggle_filename.png
rename to app/src/main/res/drawable-hdpi/ic_toggle_filename.png
diff --git a/app/src/main/res/mipmap-hdpi/unhide.png b/app/src/main/res/drawable-hdpi/ic_unhide.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/unhide.png
rename to app/src/main/res/drawable-hdpi/ic_unhide.png
diff --git a/app/src/main/res/mipmap-hdpi/unpin.png b/app/src/main/res/drawable-hdpi/ic_unpin.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/unpin.png
rename to app/src/main/res/drawable-hdpi/ic_unpin.png
diff --git a/app/src/main/res/mipmap-hdpi/play_outline.png b/app/src/main/res/drawable-hdpi/img_play_outline.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/play_outline.png
rename to app/src/main/res/drawable-hdpi/img_play_outline.png
diff --git a/app/src/main/res/mipmap-hdpi/play_outline_big.png b/app/src/main/res/drawable-hdpi/img_play_outline_big.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/play_outline_big.png
rename to app/src/main/res/drawable-hdpi/img_play_outline_big.png
diff --git a/app/src/main/res/mipmap-mdpi/edit.png b/app/src/main/res/drawable-mdpi/ic_edit.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/edit.png
rename to app/src/main/res/drawable-mdpi/ic_edit.png
diff --git a/app/src/main/res/mipmap-mdpi/hide.png b/app/src/main/res/drawable-mdpi/ic_hide.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/hide.png
rename to app/src/main/res/drawable-mdpi/ic_hide.png
diff --git a/app/src/main/res/mipmap-mdpi/pin.png b/app/src/main/res/drawable-mdpi/ic_pin.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/pin.png
rename to app/src/main/res/drawable-mdpi/ic_pin.png
diff --git a/app/src/main/res/mipmap-mdpi/resize.png b/app/src/main/res/drawable-mdpi/ic_resize.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/resize.png
rename to app/src/main/res/drawable-mdpi/ic_resize.png
diff --git a/app/src/main/res/mipmap-mdpi/rotate.png b/app/src/main/res/drawable-mdpi/ic_rotate.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/rotate.png
rename to app/src/main/res/drawable-mdpi/ic_rotate.png
diff --git a/app/src/main/res/mipmap-mdpi/toggle_filename.png b/app/src/main/res/drawable-mdpi/ic_toggle_filename.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/toggle_filename.png
rename to app/src/main/res/drawable-mdpi/ic_toggle_filename.png
diff --git a/app/src/main/res/mipmap-mdpi/unhide.png b/app/src/main/res/drawable-mdpi/ic_unhide.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/unhide.png
rename to app/src/main/res/drawable-mdpi/ic_unhide.png
diff --git a/app/src/main/res/mipmap-mdpi/unpin.png b/app/src/main/res/drawable-mdpi/ic_unpin.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/unpin.png
rename to app/src/main/res/drawable-mdpi/ic_unpin.png
diff --git a/app/src/main/res/mipmap-mdpi/play_outline.png b/app/src/main/res/drawable-mdpi/img_play_outline.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/play_outline.png
rename to app/src/main/res/drawable-mdpi/img_play_outline.png
diff --git a/app/src/main/res/mipmap-mdpi/play_outline_big.png b/app/src/main/res/drawable-mdpi/img_play_outline_big.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/play_outline_big.png
rename to app/src/main/res/drawable-mdpi/img_play_outline_big.png
diff --git a/app/src/main/res/mipmap-xhdpi/edit.png b/app/src/main/res/drawable-xhdpi/ic_edit.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/edit.png
rename to app/src/main/res/drawable-xhdpi/ic_edit.png
diff --git a/app/src/main/res/mipmap-xhdpi/hide.png b/app/src/main/res/drawable-xhdpi/ic_hide.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/hide.png
rename to app/src/main/res/drawable-xhdpi/ic_hide.png
diff --git a/app/src/main/res/mipmap-xhdpi/pin.png b/app/src/main/res/drawable-xhdpi/ic_pin.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/pin.png
rename to app/src/main/res/drawable-xhdpi/ic_pin.png
diff --git a/app/src/main/res/mipmap-xhdpi/resize.png b/app/src/main/res/drawable-xhdpi/ic_resize.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/resize.png
rename to app/src/main/res/drawable-xhdpi/ic_resize.png
diff --git a/app/src/main/res/mipmap-xhdpi/rotate.png b/app/src/main/res/drawable-xhdpi/ic_rotate.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/rotate.png
rename to app/src/main/res/drawable-xhdpi/ic_rotate.png
diff --git a/app/src/main/res/mipmap-xhdpi/toggle_filename.png b/app/src/main/res/drawable-xhdpi/ic_toggle_filename.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/toggle_filename.png
rename to app/src/main/res/drawable-xhdpi/ic_toggle_filename.png
diff --git a/app/src/main/res/mipmap-xhdpi/unhide.png b/app/src/main/res/drawable-xhdpi/ic_unhide.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/unhide.png
rename to app/src/main/res/drawable-xhdpi/ic_unhide.png
diff --git a/app/src/main/res/mipmap-xhdpi/unpin.png b/app/src/main/res/drawable-xhdpi/ic_unpin.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/unpin.png
rename to app/src/main/res/drawable-xhdpi/ic_unpin.png
diff --git a/app/src/main/res/mipmap-xhdpi/play_outline.png b/app/src/main/res/drawable-xhdpi/img_play_outline.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/play_outline.png
rename to app/src/main/res/drawable-xhdpi/img_play_outline.png
diff --git a/app/src/main/res/mipmap-xhdpi/play_outline_big.png b/app/src/main/res/drawable-xhdpi/img_play_outline_big.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/play_outline_big.png
rename to app/src/main/res/drawable-xhdpi/img_play_outline_big.png
diff --git a/app/src/main/res/mipmap-xxhdpi/edit.png b/app/src/main/res/drawable-xxhdpi/ic_edit.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/edit.png
rename to app/src/main/res/drawable-xxhdpi/ic_edit.png
diff --git a/app/src/main/res/mipmap-xxhdpi/hide.png b/app/src/main/res/drawable-xxhdpi/ic_hide.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/hide.png
rename to app/src/main/res/drawable-xxhdpi/ic_hide.png
diff --git a/app/src/main/res/mipmap-xxhdpi/pin.png b/app/src/main/res/drawable-xxhdpi/ic_pin.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/pin.png
rename to app/src/main/res/drawable-xxhdpi/ic_pin.png
diff --git a/app/src/main/res/mipmap-xxhdpi/resize.png b/app/src/main/res/drawable-xxhdpi/ic_resize.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/resize.png
rename to app/src/main/res/drawable-xxhdpi/ic_resize.png
diff --git a/app/src/main/res/mipmap-xxhdpi/rotate.png b/app/src/main/res/drawable-xxhdpi/ic_rotate.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/rotate.png
rename to app/src/main/res/drawable-xxhdpi/ic_rotate.png
diff --git a/app/src/main/res/mipmap-xxhdpi/toggle_filename.png b/app/src/main/res/drawable-xxhdpi/ic_toggle_filename.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/toggle_filename.png
rename to app/src/main/res/drawable-xxhdpi/ic_toggle_filename.png
diff --git a/app/src/main/res/mipmap-xxhdpi/unhide.png b/app/src/main/res/drawable-xxhdpi/ic_unhide.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/unhide.png
rename to app/src/main/res/drawable-xxhdpi/ic_unhide.png
diff --git a/app/src/main/res/mipmap-xxhdpi/unpin.png b/app/src/main/res/drawable-xxhdpi/ic_unpin.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/unpin.png
rename to app/src/main/res/drawable-xxhdpi/ic_unpin.png
diff --git a/app/src/main/res/mipmap-xxhdpi/play_outline.png b/app/src/main/res/drawable-xxhdpi/img_play_outline.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/play_outline.png
rename to app/src/main/res/drawable-xxhdpi/img_play_outline.png
diff --git a/app/src/main/res/mipmap-xxhdpi/play_outline_big.png b/app/src/main/res/drawable-xxhdpi/img_play_outline_big.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/play_outline_big.png
rename to app/src/main/res/drawable-xxhdpi/img_play_outline_big.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/edit.png b/app/src/main/res/drawable-xxxhdpi/ic_edit.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/edit.png
rename to app/src/main/res/drawable-xxxhdpi/ic_edit.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/hide.png b/app/src/main/res/drawable-xxxhdpi/ic_hide.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/hide.png
rename to app/src/main/res/drawable-xxxhdpi/ic_hide.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/pin.png b/app/src/main/res/drawable-xxxhdpi/ic_pin.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/pin.png
rename to app/src/main/res/drawable-xxxhdpi/ic_pin.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/resize.png b/app/src/main/res/drawable-xxxhdpi/ic_resize.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/resize.png
rename to app/src/main/res/drawable-xxxhdpi/ic_resize.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/rotate.png b/app/src/main/res/drawable-xxxhdpi/ic_rotate.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/rotate.png
rename to app/src/main/res/drawable-xxxhdpi/ic_rotate.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/toggle_filename.png b/app/src/main/res/drawable-xxxhdpi/ic_toggle_filename.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/toggle_filename.png
rename to app/src/main/res/drawable-xxxhdpi/ic_toggle_filename.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/unhide.png b/app/src/main/res/drawable-xxxhdpi/ic_unhide.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/unhide.png
rename to app/src/main/res/drawable-xxxhdpi/ic_unhide.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/unpin.png b/app/src/main/res/drawable-xxxhdpi/ic_unpin.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/unpin.png
rename to app/src/main/res/drawable-xxxhdpi/ic_unpin.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/play_outline.png b/app/src/main/res/drawable-xxxhdpi/img_play_outline.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/play_outline.png
rename to app/src/main/res/drawable-xxxhdpi/img_play_outline.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/play_outline_big.png b/app/src/main/res/drawable-xxxhdpi/img_play_outline_big.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/play_outline_big.png
rename to app/src/main/res/drawable-xxxhdpi/img_play_outline_big.png
diff --git a/app/src/main/res/layout/directory_item.xml b/app/src/main/res/layout/directory_item.xml
index 664998b2a..fa376280c 100644
--- a/app/src/main/res/layout/directory_item.xml
+++ b/app/src/main/res/layout/directory_item.xml
@@ -16,7 +16,7 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:layout_margin="@dimen/small_margin"
-        android:src="@mipmap/pin"/>
+        android:src="@drawable/ic_pin"/>
 
     <RelativeLayout
         android:id="@+id/dir_shadow_holder"
diff --git a/app/src/main/res/layout/pager_video_item.xml b/app/src/main/res/layout/pager_video_item.xml
index 7d6564f15..8b13750c1 100644
--- a/app/src/main/res/layout/pager_video_item.xml
+++ b/app/src/main/res/layout/pager_video_item.xml
@@ -18,7 +18,7 @@
         android:layout_height="@dimen/play_outline_size_big"
         android:layout_centerInParent="true"
         android:background="@android:color/transparent"
-        android:src="@mipmap/play_outline_big"/>
+        android:src="@drawable/img_play_outline_big"/>
 
     <RelativeLayout
         android:id="@+id/video_time_holder"
diff --git a/app/src/main/res/layout/photo_video_item.xml b/app/src/main/res/layout/photo_video_item.xml
index 5bab01fde..21ff37172 100644
--- a/app/src/main/res/layout/photo_video_item.xml
+++ b/app/src/main/res/layout/photo_video_item.xml
@@ -16,7 +16,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:layout_margin="@dimen/tiny_margin"
-        android:src="@mipmap/play_outline"
+        android:src="@drawable/img_play_outline"
         android:visibility="gone"/>
 
     <TextView
diff --git a/app/src/main/res/menu/cab_directories.xml b/app/src/main/res/menu/cab_directories.xml
index 9005a67b3..169d1de93 100644
--- a/app/src/main/res/menu/cab_directories.xml
+++ b/app/src/main/res/menu/cab_directories.xml
@@ -3,47 +3,47 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/cab_properties"
-        android:icon="@mipmap/info"
+        android:icon="@drawable/ic_info"
         android:title="@string/properties"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_pin"
-        android:icon="@mipmap/pin"
+        android:icon="@drawable/ic_pin"
         android:title="@string/pin_folder"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_unpin"
-        android:icon="@mipmap/unpin"
+        android:icon="@drawable/ic_unpin"
         android:title="@string/unpin_folder"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_rename"
-        android:icon="@mipmap/rename"
+        android:icon="@drawable/ic_rename"
         android:title="@string/rename"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_hide"
-        android:icon="@mipmap/hide"
+        android:icon="@drawable/ic_hide"
         android:title="@string/hide_folder"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_unhide"
-        android:icon="@mipmap/unhide"
+        android:icon="@drawable/ic_unhide"
         android:title="@string/unhide_folder"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_copy_move"
-        android:icon="@mipmap/copy"
+        android:icon="@drawable/ic_copy"
         android:title="@string/copy_move"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_select_all"
-        android:icon="@mipmap/select_all"
+        android:icon="@drawable/ic_select_all"
         android:title="@string/select_all"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_delete"
-        android:icon="@mipmap/delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/delete"
         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 bfdf3224e..693c68d71 100644
--- a/app/src/main/res/menu/cab_media.xml
+++ b/app/src/main/res/menu/cab_media.xml
@@ -3,37 +3,37 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/cab_delete"
-        android:icon="@mipmap/delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_share"
-        android:icon="@mipmap/share"
+        android:icon="@drawable/ic_share"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_properties"
-        android:icon="@mipmap/info"
+        android:icon="@drawable/ic_info"
         android:title="@string/properties"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_copy_move"
-        android:icon="@mipmap/copy"
+        android:icon="@drawable/ic_copy"
         android:title="@string/copy_move"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_rename"
-        android:icon="@mipmap/rename"
+        android:icon="@drawable/ic_rename"
         android:title="@string/rename"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_edit"
-        android:icon="@mipmap/edit"
+        android:icon="@drawable/ic_edit"
         android:title="@string/edit"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/cab_select_all"
-        android:icon="@mipmap/select_all"
+        android:icon="@drawable/ic_select_all"
         android:title="@string/select_all"
         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 d50dbdb0e..88531d04f 100644
--- a/app/src/main/res/menu/menu_editor.xml
+++ b/app/src/main/res/menu/menu_editor.xml
@@ -3,17 +3,17 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/save_as"
-        android:icon="@mipmap/check"
+        android:icon="@drawable/ic_check"
         android:title="@string/save_as"
         app:showAsAction="always"/>
     <item
         android:id="@+id/rotate"
-        android:icon="@mipmap/rotate"
+        android:icon="@drawable/ic_rotate"
         android:title="@string/rotate"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/resize"
-        android:icon="@mipmap/resize"
+        android:icon="@drawable/ic_resize"
         android:title="@string/resize"
         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 1ccd86b4a..457ca6d8f 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -3,12 +3,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/sort"
-        android:icon="@mipmap/sort"
+        android:icon="@drawable/ic_sort"
         android:title="@string/sort_by"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/open_camera"
-        android:icon="@mipmap/camera"
+        android:icon="@drawable/ic_camera"
         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 ea91cb7e1..07306f9ce 100644
--- a/app/src/main/res/menu/menu_media.xml
+++ b/app/src/main/res/menu/menu_media.xml
@@ -3,17 +3,17 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/sort"
-        android:icon="@mipmap/sort"
+        android:icon="@drawable/ic_sort"
         android:title="@string/sort_by"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/toggle_filename"
-        android:icon="@mipmap/toggle_filename"
+        android:icon="@drawable/ic_toggle_filename"
         android:title="@string/toggle_filename"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/open_camera"
-        android:icon="@mipmap/camera"
+        android:icon="@drawable/ic_camera"
         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 d1ffb1215..d28ed23a0 100644
--- a/app/src/main/res/menu/menu_set_wallpaper.xml
+++ b/app/src/main/res/menu/menu_set_wallpaper.xml
@@ -3,12 +3,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/rotate"
-        android:icon="@mipmap/rotate"
+        android:icon="@drawable/ic_rotate"
         android:title="@string/rotate"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/save"
-        android:icon="@mipmap/check"
+        android:icon="@drawable/ic_check"
         android:title="@string/save"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/menu/photo_video_menu.xml b/app/src/main/res/menu/photo_video_menu.xml
index 661fad548..4cfd9dfa1 100644
--- a/app/src/main/res/menu/photo_video_menu.xml
+++ b/app/src/main/res/menu/photo_video_menu.xml
@@ -3,12 +3,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_share"
-        android:icon="@mipmap/share"
+        android:icon="@drawable/ic_share"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_edit"
-        android:icon="@mipmap/edit"
+        android:icon="@drawable/ic_edit"
         android:title="@string/edit"
         app:showAsAction="ifRoom"/>
     <item
diff --git a/app/src/main/res/menu/viewpager_menu.xml b/app/src/main/res/menu/viewpager_menu.xml
index 13f756e5f..62afbc6db 100644
--- a/app/src/main/res/menu/viewpager_menu.xml
+++ b/app/src/main/res/menu/viewpager_menu.xml
@@ -15,27 +15,27 @@
         app:showAsAction="never"/>
     <item
         android:id="@+id/menu_delete"
-        android:icon="@mipmap/delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/delete"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_share"
-        android:icon="@mipmap/share"
+        android:icon="@drawable/ic_share"
         android:title="@string/share"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_edit"
-        android:icon="@mipmap/edit"
+        android:icon="@drawable/ic_edit"
         android:title="@string/edit"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_rename"
-        android:icon="@mipmap/rename"
+        android:icon="@drawable/ic_rename"
         android:title="@string/rename"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_properties"
-        android:icon="@mipmap/info"
+        android:icon="@drawable/ic_info"
         android:title="@string/properties"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/mipmap-hdpi/camera.png b/app/src/main/res/mipmap-hdpi/camera.png
deleted file mode 100644
index 497c88ca8..000000000
Binary files a/app/src/main/res/mipmap-hdpi/camera.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/check.png b/app/src/main/res/mipmap-hdpi/check.png
deleted file mode 100644
index 729f29010..000000000
Binary files a/app/src/main/res/mipmap-hdpi/check.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/copy.png b/app/src/main/res/mipmap-hdpi/copy.png
deleted file mode 100644
index 70eb07378..000000000
Binary files a/app/src/main/res/mipmap-hdpi/copy.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/delete.png b/app/src/main/res/mipmap-hdpi/delete.png
deleted file mode 100644
index 4a9f76947..000000000
Binary files a/app/src/main/res/mipmap-hdpi/delete.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/facebook.png b/app/src/main/res/mipmap-hdpi/facebook.png
deleted file mode 100644
index c36f37fd4..000000000
Binary files a/app/src/main/res/mipmap-hdpi/facebook.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/gplus.png b/app/src/main/res/mipmap-hdpi/gplus.png
deleted file mode 100644
index 897f103c6..000000000
Binary files a/app/src/main/res/mipmap-hdpi/gplus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/launcher.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/info.png b/app/src/main/res/mipmap-hdpi/info.png
deleted file mode 100644
index d2c435f92..000000000
Binary files a/app/src/main/res/mipmap-hdpi/info.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/rename.png b/app/src/main/res/mipmap-hdpi/rename.png
deleted file mode 100644
index d3ff58dcc..000000000
Binary files a/app/src/main/res/mipmap-hdpi/rename.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/select_all.png b/app/src/main/res/mipmap-hdpi/select_all.png
deleted file mode 100644
index 2d971a94b..000000000
Binary files a/app/src/main/res/mipmap-hdpi/select_all.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/share.png b/app/src/main/res/mipmap-hdpi/share.png
deleted file mode 100644
index b09a6926d..000000000
Binary files a/app/src/main/res/mipmap-hdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/sort.png b/app/src/main/res/mipmap-hdpi/sort.png
deleted file mode 100644
index c62475e1f..000000000
Binary files a/app/src/main/res/mipmap-hdpi/sort.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/camera.png b/app/src/main/res/mipmap-mdpi/camera.png
deleted file mode 100644
index e83052200..000000000
Binary files a/app/src/main/res/mipmap-mdpi/camera.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/check.png b/app/src/main/res/mipmap-mdpi/check.png
deleted file mode 100644
index dfcb55d02..000000000
Binary files a/app/src/main/res/mipmap-mdpi/check.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/copy.png b/app/src/main/res/mipmap-mdpi/copy.png
deleted file mode 100644
index 80c069557..000000000
Binary files a/app/src/main/res/mipmap-mdpi/copy.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/delete.png b/app/src/main/res/mipmap-mdpi/delete.png
deleted file mode 100644
index e2f5f3555..000000000
Binary files a/app/src/main/res/mipmap-mdpi/delete.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/facebook.png b/app/src/main/res/mipmap-mdpi/facebook.png
deleted file mode 100644
index 998649f5b..000000000
Binary files a/app/src/main/res/mipmap-mdpi/facebook.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/gplus.png b/app/src/main/res/mipmap-mdpi/gplus.png
deleted file mode 100644
index 54f1b83e2..000000000
Binary files a/app/src/main/res/mipmap-mdpi/gplus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/launcher.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/info.png b/app/src/main/res/mipmap-mdpi/info.png
deleted file mode 100644
index b28f517a1..000000000
Binary files a/app/src/main/res/mipmap-mdpi/info.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/rename.png b/app/src/main/res/mipmap-mdpi/rename.png
deleted file mode 100644
index 12b09f1d9..000000000
Binary files a/app/src/main/res/mipmap-mdpi/rename.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/select_all.png b/app/src/main/res/mipmap-mdpi/select_all.png
deleted file mode 100644
index 966938b9d..000000000
Binary files a/app/src/main/res/mipmap-mdpi/select_all.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/share.png b/app/src/main/res/mipmap-mdpi/share.png
deleted file mode 100644
index e944fd70c..000000000
Binary files a/app/src/main/res/mipmap-mdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/sort.png b/app/src/main/res/mipmap-mdpi/sort.png
deleted file mode 100644
index 552bb7c33..000000000
Binary files a/app/src/main/res/mipmap-mdpi/sort.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/camera.png b/app/src/main/res/mipmap-xhdpi/camera.png
deleted file mode 100644
index be9fb226a..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/camera.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/check.png b/app/src/main/res/mipmap-xhdpi/check.png
deleted file mode 100644
index 3b2b65d26..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/check.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/copy.png b/app/src/main/res/mipmap-xhdpi/copy.png
deleted file mode 100644
index 537fd4e8b..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/copy.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/delete.png b/app/src/main/res/mipmap-xhdpi/delete.png
deleted file mode 100644
index 388b5b060..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/delete.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/facebook.png b/app/src/main/res/mipmap-xhdpi/facebook.png
deleted file mode 100644
index ff957192e..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/facebook.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/gplus.png b/app/src/main/res/mipmap-xhdpi/gplus.png
deleted file mode 100644
index 47bd6ef31..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/gplus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/launcher.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/info.png b/app/src/main/res/mipmap-xhdpi/info.png
deleted file mode 100644
index 4fd6a43ce..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/info.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/rename.png b/app/src/main/res/mipmap-xhdpi/rename.png
deleted file mode 100644
index 5a06bff5a..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/rename.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/select_all.png b/app/src/main/res/mipmap-xhdpi/select_all.png
deleted file mode 100644
index b99012a3b..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/select_all.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/share.png b/app/src/main/res/mipmap-xhdpi/share.png
deleted file mode 100644
index 22a8783e7..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/sort.png b/app/src/main/res/mipmap-xhdpi/sort.png
deleted file mode 100644
index 1f9dccfd8..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/sort.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/camera.png b/app/src/main/res/mipmap-xxhdpi/camera.png
deleted file mode 100644
index c8e69dceb..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/camera.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/check.png b/app/src/main/res/mipmap-xxhdpi/check.png
deleted file mode 100644
index 2c2ad771f..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/check.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/copy.png b/app/src/main/res/mipmap-xxhdpi/copy.png
deleted file mode 100644
index 9dff893e7..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/copy.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/delete.png b/app/src/main/res/mipmap-xxhdpi/delete.png
deleted file mode 100644
index 3fcdfdb55..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/delete.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/facebook.png b/app/src/main/res/mipmap-xxhdpi/facebook.png
deleted file mode 100644
index 7f23d9050..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/facebook.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/gplus.png b/app/src/main/res/mipmap-xxhdpi/gplus.png
deleted file mode 100644
index d580cd5f6..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/gplus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/launcher.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/info.png b/app/src/main/res/mipmap-xxhdpi/info.png
deleted file mode 100644
index db51fc705..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/info.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/rename.png b/app/src/main/res/mipmap-xxhdpi/rename.png
deleted file mode 100644
index 02e19d045..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/rename.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/select_all.png b/app/src/main/res/mipmap-xxhdpi/select_all.png
deleted file mode 100644
index 162ab9847..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/select_all.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/share.png b/app/src/main/res/mipmap-xxhdpi/share.png
deleted file mode 100644
index a35b3cd14..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/sort.png b/app/src/main/res/mipmap-xxhdpi/sort.png
deleted file mode 100644
index 42cf9765f..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/sort.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/camera.png b/app/src/main/res/mipmap-xxxhdpi/camera.png
deleted file mode 100644
index 777658e95..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/camera.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/check.png b/app/src/main/res/mipmap-xxxhdpi/check.png
deleted file mode 100644
index d670618c7..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/check.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/copy.png b/app/src/main/res/mipmap-xxxhdpi/copy.png
deleted file mode 100644
index 4ddee9ef0..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/copy.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/delete.png b/app/src/main/res/mipmap-xxxhdpi/delete.png
deleted file mode 100644
index 8d322aa9b..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/delete.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/facebook.png b/app/src/main/res/mipmap-xxxhdpi/facebook.png
deleted file mode 100644
index 7635bf3c5..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/facebook.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/gplus.png b/app/src/main/res/mipmap-xxxhdpi/gplus.png
deleted file mode 100644
index 932c51ae1..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/gplus.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/launcher.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/info.png b/app/src/main/res/mipmap-xxxhdpi/info.png
deleted file mode 100644
index 3a82cab3b..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/info.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/rename.png b/app/src/main/res/mipmap-xxxhdpi/rename.png
deleted file mode 100644
index d6668a051..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/rename.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/select_all.png b/app/src/main/res/mipmap-xxxhdpi/select_all.png
deleted file mode 100644
index 896e1ac21..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/select_all.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/share.png b/app/src/main/res/mipmap-xxxhdpi/share.png
deleted file mode 100644
index e351c7beb..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/sort.png b/app/src/main/res/mipmap-xxxhdpi/sort.png
deleted file mode 100644
index f2454f114..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/sort.png and /dev/null differ