diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 391ec6fc..5c928f61 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,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/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
index 49f6bb4b..3bdbc8eb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
@@ -121,7 +121,7 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho
             } else if (intent.action == MediaStore.ACTION_VIDEO_CAPTURE) {
                 mIsVideoCaptureIntent = true
                 hideToggleModeAbout()
-                shutter.setImageDrawable(mRes.getDrawable(R.mipmap.video_rec))
+                shutter.setImageDrawable(mRes.getDrawable(R.drawable.ic_video_rec))
             }
         }
     }
@@ -139,7 +139,7 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho
         mPreview = Preview(this, camera_view, this)
         mPreview!!.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
         view_holder.addView(mPreview)
-        toggle_camera.setImageResource(if (mCurrCamera == Camera.CameraInfo.CAMERA_FACING_BACK) R.mipmap.camera_front else R.mipmap.camera_back)
+        toggle_camera.setImageResource(if (mCurrCamera == Camera.CameraInfo.CAMERA_FACING_BACK) R.drawable.ic_camera_front else R.drawable.ic_camera_back)
 
         mFocusRectView = FocusRectView(applicationContext)
         view_holder.addView(mFocusRectView)
@@ -198,11 +198,11 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho
         }
 
         config.lastUsedCamera = mCurrCamera
-        var newIconId = R.mipmap.camera_front
+        var newIconId = R.drawable.ic_camera_front
         mPreview?.releaseCamera()
         if (mPreview?.setCamera(mCurrCamera) == true) {
             if (mCurrCamera == Camera.CameraInfo.CAMERA_FACING_FRONT) {
-                newIconId = R.mipmap.camera_back
+                newIconId = R.drawable.ic_camera_back
             }
             toggle_camera.setImageResource(newIconId)
             disableFlash()
@@ -249,14 +249,14 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho
 
     private fun disableFlash() {
         mPreview?.disableFlash()
-        toggle_flash.setImageResource(R.mipmap.flash_off)
+        toggle_flash.setImageResource(R.drawable.ic_flash_off)
         mIsFlashEnabled = false
         config.lastFlashlightState = mIsFlashEnabled
     }
 
     private fun enableFlash() {
         mPreview?.enableFlash()
-        toggle_flash.setImageResource(R.mipmap.flash_on)
+        toggle_flash.setImageResource(R.drawable.ic_flash_on)
         mIsFlashEnabled = true
         config.lastFlashlightState = mIsFlashEnabled
     }
@@ -274,11 +274,11 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho
             Handler().postDelayed({ toggleBottomButtons(false) }, Preview.PHOTO_PREVIEW_LENGTH.toLong())
         } else {
             if (mPreview?.toggleRecording() == true) {
-                shutter.setImageDrawable(mRes.getDrawable(R.mipmap.video_stop))
+                shutter.setImageDrawable(mRes.getDrawable(R.drawable.ic_video_stop))
                 toggle_camera.visibility = View.INVISIBLE
                 showTimer()
             } else {
-                shutter.setImageDrawable(mRes.getDrawable(R.mipmap.video_rec))
+                shutter.setImageDrawable(mRes.getDrawable(R.drawable.ic_video_rec))
                 toggle_camera.visibility = View.VISIBLE
                 hideTimer()
             }
@@ -335,8 +335,8 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho
     }
 
     private fun initPhotoButtons() {
-        toggle_photo_video.setImageDrawable(mRes.getDrawable(R.mipmap.videocam))
-        shutter.setImageDrawable(mRes.getDrawable(R.mipmap.camera))
+        toggle_photo_video.setImageDrawable(mRes.getDrawable(R.drawable.ic_video))
+        shutter.setImageDrawable(mRes.getDrawable(R.drawable.ic_shutter))
         mPreview?.initPhotoMode()
         setupPreviewImage(true)
     }
@@ -352,9 +352,9 @@ class MainActivity : SimpleActivity(), SensorEventListener, PreviewListener, Pho
     }
 
     private fun initVideoButtons() {
-        toggle_photo_video.setImageDrawable(mRes.getDrawable(R.mipmap.photo))
+        toggle_photo_video.setImageDrawable(mRes.getDrawable(R.drawable.ic_camera))
         toggle_camera.visibility = View.VISIBLE
-        shutter.setImageDrawable(mRes.getDrawable(R.mipmap.video_rec))
+        shutter.setImageDrawable(mRes.getDrawable(R.drawable.ic_video_rec))
         checkFlash()
         setupPreviewImage(false)
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 15fc58d7..13dc83a8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -24,7 +24,7 @@
         android:layout_marginRight="@dimen/normal_margin"
         android:layout_marginTop="@dimen/normal_margin"
         android:padding="@dimen/normal_margin"
-        android:src="@mipmap/settings"/>
+        android:src="@drawable/ic_settings_cog"/>
 
     <ImageView
         android:id="@+id/toggle_photo_video"
@@ -34,7 +34,7 @@
         android:layout_below="@+id/settings"
         android:layout_marginRight="@dimen/normal_margin"
         android:padding="@dimen/normal_margin"
-        android:src="@mipmap/videocam"/>
+        android:src="@drawable/ic_video"/>
 
     <ImageView
         android:id="@+id/last_photo_video_preview"
@@ -59,14 +59,14 @@
             android:layout_height="@dimen/icon_size"
             android:layout_weight="1"
             android:padding="@dimen/normal_margin"
-            android:src="@mipmap/camera_front"/>
+            android:src="@drawable/ic_camera_front"/>
 
         <ImageView
             android:id="@+id/shutter"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
             android:layout_weight="1"
-            android:src="@mipmap/camera"/>
+            android:src="@drawable/ic_shutter"/>
 
         <ImageView
             android:id="@+id/toggle_flash"
@@ -74,7 +74,7 @@
             android:layout_height="@dimen/icon_size"
             android:layout_weight="1"
             android:padding="@dimen/normal_margin"
-            android:src="@mipmap/flash_off"/>
+            android:src="@drawable/ic_flash_off"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/mipmap-hdpi/ic_camera.png b/app/src/main/res/mipmap-hdpi/ic_camera.png
deleted file mode 100644
index c8e69dce..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_camera.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_camera_back.png b/app/src/main/res/mipmap-hdpi/ic_camera_back.png
deleted file mode 100644
index 8392b2a8..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_camera_back.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_camera_front.png b/app/src/main/res/mipmap-hdpi/ic_camera_front.png
deleted file mode 100644
index 3eb24d1f..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_camera_front.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_cog.png b/app/src/main/res/mipmap-hdpi/ic_cog.png
deleted file mode 100644
index a8bc6bd1..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_cog.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_flash_off.png b/app/src/main/res/mipmap-hdpi/ic_flash_off.png
deleted file mode 100644
index 3cf30f3e..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_flash_off.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_flash_on.png b/app/src/main/res/mipmap-hdpi/ic_flash_on.png
deleted file mode 100644
index 4e116af4..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_flash_on.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_video.png b/app/src/main/res/mipmap-hdpi/ic_video.png
deleted file mode 100644
index 44c28e2f..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_video.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_video_rec.png b/app/src/main/res/mipmap-hdpi/ic_video_rec.png
deleted file mode 100644
index 3555237b..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_video_rec.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_video_stop.png b/app/src/main/res/mipmap-hdpi/ic_video_stop.png
deleted file mode 100644
index 72847bb3..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_video_stop.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_camera.png b/app/src/main/res/mipmap-mdpi/ic_camera.png
deleted file mode 100644
index be9fb226..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_camera.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_camera_back.png b/app/src/main/res/mipmap-mdpi/ic_camera_back.png
deleted file mode 100644
index b0768e30..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_camera_back.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_camera_front.png b/app/src/main/res/mipmap-mdpi/ic_camera_front.png
deleted file mode 100644
index a80ccde5..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_camera_front.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_cog.png b/app/src/main/res/mipmap-mdpi/ic_cog.png
deleted file mode 100644
index 506f2716..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_cog.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_flash_off.png b/app/src/main/res/mipmap-mdpi/ic_flash_off.png
deleted file mode 100644
index 23c854e9..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_flash_off.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_flash_on.png b/app/src/main/res/mipmap-mdpi/ic_flash_on.png
deleted file mode 100644
index bedc4eb8..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_flash_on.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_video.png b/app/src/main/res/mipmap-mdpi/ic_video.png
deleted file mode 100644
index 1b2583d3..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_video.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_video_rec.png b/app/src/main/res/mipmap-mdpi/ic_video_rec.png
deleted file mode 100644
index 82472b27..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_video_rec.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_video_stop.png b/app/src/main/res/mipmap-mdpi/ic_video_stop.png
deleted file mode 100644
index e649243a..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_video_stop.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_camera.png b/app/src/main/res/mipmap-xhdpi/ic_camera.png
deleted file mode 100644
index 777658e9..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_camera.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_camera_back.png b/app/src/main/res/mipmap-xhdpi/ic_camera_back.png
deleted file mode 100644
index 8b2415ba..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_camera_back.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_camera_front.png b/app/src/main/res/mipmap-xhdpi/ic_camera_front.png
deleted file mode 100644
index 951bc12c..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_camera_front.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_cog.png b/app/src/main/res/mipmap-xhdpi/ic_cog.png
deleted file mode 100644
index 165aab51..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_cog.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_flash_off.png b/app/src/main/res/mipmap-xhdpi/ic_flash_off.png
deleted file mode 100644
index 1d774f24..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_flash_off.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_flash_on.png b/app/src/main/res/mipmap-xhdpi/ic_flash_on.png
deleted file mode 100644
index cb606113..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_flash_on.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_video.png b/app/src/main/res/mipmap-xhdpi/ic_video.png
deleted file mode 100644
index ed20c070..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_video.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_video_rec.png b/app/src/main/res/mipmap-xhdpi/ic_video_rec.png
deleted file mode 100644
index 6cebd9be..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_video_rec.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_video_stop.png b/app/src/main/res/mipmap-xhdpi/ic_video_stop.png
deleted file mode 100644
index 4726160d..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_video_stop.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_camera.png b/app/src/main/res/mipmap-xxhdpi/ic_camera.png
deleted file mode 100644
index a4e7aea7..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_camera.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_camera_back.png b/app/src/main/res/mipmap-xxhdpi/ic_camera_back.png
deleted file mode 100644
index e3cac8e7..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_camera_back.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_camera_front.png b/app/src/main/res/mipmap-xxhdpi/ic_camera_front.png
deleted file mode 100644
index 9f43e207..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_camera_front.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_cog.png b/app/src/main/res/mipmap-xxhdpi/ic_cog.png
deleted file mode 100644
index 815ed6dd..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_cog.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_flash_off.png b/app/src/main/res/mipmap-xxhdpi/ic_flash_off.png
deleted file mode 100644
index 2a1c047f..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_flash_off.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_flash_on.png b/app/src/main/res/mipmap-xxhdpi/ic_flash_on.png
deleted file mode 100644
index 7f6306af..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_flash_on.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_video.png b/app/src/main/res/mipmap-xxhdpi/ic_video.png
deleted file mode 100644
index eff5923d..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_video.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_video_rec.png b/app/src/main/res/mipmap-xxhdpi/ic_video_rec.png
deleted file mode 100644
index b833e67c..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_video_rec.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_video_stop.png b/app/src/main/res/mipmap-xxhdpi/ic_video_stop.png
deleted file mode 100644
index c6896893..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_video_stop.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_camera.png b/app/src/main/res/mipmap-xxxhdpi/ic_camera.png
deleted file mode 100644
index f2fe54bd..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_camera.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_camera_back.png b/app/src/main/res/mipmap-xxxhdpi/ic_camera_back.png
deleted file mode 100644
index 1eec9575..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_camera_back.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_camera_front.png b/app/src/main/res/mipmap-xxxhdpi/ic_camera_front.png
deleted file mode 100644
index 134fdc51..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_camera_front.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_cog.png b/app/src/main/res/mipmap-xxxhdpi/ic_cog.png
deleted file mode 100644
index 9e242e77..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_cog.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_flash_off.png b/app/src/main/res/mipmap-xxxhdpi/ic_flash_off.png
deleted file mode 100644
index a192b0ef..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_flash_off.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_flash_on.png b/app/src/main/res/mipmap-xxxhdpi/ic_flash_on.png
deleted file mode 100644
index 79e4e3ba..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_flash_on.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_video.png b/app/src/main/res/mipmap-xxxhdpi/ic_video.png
deleted file mode 100644
index c384d594..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_video.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_video_rec.png b/app/src/main/res/mipmap-xxxhdpi/ic_video_rec.png
deleted file mode 100644
index e53f62fa..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_video_rec.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_video_stop.png b/app/src/main/res/mipmap-xxxhdpi/ic_video_stop.png
deleted file mode 100644
index c3670ced..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_video_stop.png and /dev/null differ