diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 01b73c1..b2059fc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,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/java/com/simplemobiletools/draw/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/draw/activities/MainActivity.java
index a7c3fab..3fea094 100644
--- a/app/src/main/java/com/simplemobiletools/draw/activities/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/draw/activities/MainActivity.java
@@ -329,11 +329,7 @@ public class MainActivity extends SimpleActivity implements MyCanvas.PathsChange
     }
 
     private void setBackgroundColor(int pickedColor) {
-        if (Utils.shouldUseWhite(pickedColor)) {
-            ((ImageView) mUndoBtn).setImageResource(R.mipmap.undo_white);
-        } else {
-            ((ImageView) mUndoBtn).setImageResource(R.mipmap.undo_black);
-        }
+        ((ImageView) mUndoBtn).setImageResource(R.drawable.ic_undo);
         mMyCanvas.setBackgroundColor(pickedColor);
     }
 
diff --git a/app/src/main/res/mipmap-hdpi/ic_clear.png b/app/src/main/res/drawable-hdpi/ic_clear.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_clear.png
rename to app/src/main/res/drawable-hdpi/ic_clear.png
diff --git a/app/src/main/res/mipmap-hdpi/save.png b/app/src/main/res/drawable-hdpi/ic_save.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/save.png
rename to app/src/main/res/drawable-hdpi/ic_save.png
diff --git a/app/src/main/res/mipmap-hdpi/undo_white.png b/app/src/main/res/drawable-hdpi/ic_undo.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/undo_white.png
rename to app/src/main/res/drawable-hdpi/ic_undo.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_clear.png b/app/src/main/res/drawable-mdpi/ic_clear.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_clear.png
rename to app/src/main/res/drawable-mdpi/ic_clear.png
diff --git a/app/src/main/res/mipmap-mdpi/save.png b/app/src/main/res/drawable-mdpi/ic_save.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/save.png
rename to app/src/main/res/drawable-mdpi/ic_save.png
diff --git a/app/src/main/res/mipmap-mdpi/undo_white.png b/app/src/main/res/drawable-mdpi/ic_undo.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/undo_white.png
rename to app/src/main/res/drawable-mdpi/ic_undo.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_clear.png b/app/src/main/res/drawable-xhdpi/ic_clear.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_clear.png
rename to app/src/main/res/drawable-xhdpi/ic_clear.png
diff --git a/app/src/main/res/mipmap-xhdpi/save.png b/app/src/main/res/drawable-xhdpi/ic_save.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/save.png
rename to app/src/main/res/drawable-xhdpi/ic_save.png
diff --git a/app/src/main/res/mipmap-xhdpi/undo_white.png b/app/src/main/res/drawable-xhdpi/ic_undo.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/undo_white.png
rename to app/src/main/res/drawable-xhdpi/ic_undo.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_clear.png b/app/src/main/res/drawable-xxhdpi/ic_clear.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_clear.png
rename to app/src/main/res/drawable-xxhdpi/ic_clear.png
diff --git a/app/src/main/res/mipmap-xxhdpi/save.png b/app/src/main/res/drawable-xxhdpi/ic_save.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/save.png
rename to app/src/main/res/drawable-xxhdpi/ic_save.png
diff --git a/app/src/main/res/mipmap-xxhdpi/undo_white.png b/app/src/main/res/drawable-xxhdpi/ic_undo.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/undo_white.png
rename to app/src/main/res/drawable-xxhdpi/ic_undo.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_clear.png b/app/src/main/res/drawable-xxxhdpi/ic_clear.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_clear.png
rename to app/src/main/res/drawable-xxxhdpi/ic_clear.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/save.png b/app/src/main/res/drawable-xxxhdpi/ic_save.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/save.png
rename to app/src/main/res/drawable-xxxhdpi/ic_save.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/undo_white.png b/app/src/main/res/drawable-xxxhdpi/ic_undo.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/undo_white.png
rename to app/src/main/res/drawable-xxxhdpi/ic_undo.png
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5ee3c59..a14fcaa 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,7 +23,7 @@
         android:layout_alignParentRight="true"
         android:layout_below="@id/color_picker"
         android:padding="@dimen/medium_margin"
-        android:src="@mipmap/undo_black"
+        android:src="@drawable/ic_undo"
         android:visibility="gone"/>
 
     <SeekBar
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
index ec7ed6b..45ca228 100644
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu.xml
@@ -3,17 +3,17 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_save"
-        android:icon="@mipmap/save"
+        android:icon="@drawable/ic_save"
         android:title="@string/save"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/clear"
-        android:icon="@mipmap/ic_clear"
+        android:icon="@drawable/ic_clear"
         android:title="@string/clear"
         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
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/share.png b/app/src/main/res/mipmap-hdpi/share.png
deleted file mode 100644
index b09a692..0000000
Binary files a/app/src/main/res/mipmap-hdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/undo_black.png b/app/src/main/res/mipmap-hdpi/undo_black.png
deleted file mode 100644
index 818191c..0000000
Binary files a/app/src/main/res/mipmap-hdpi/undo_black.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/share.png b/app/src/main/res/mipmap-mdpi/share.png
deleted file mode 100644
index e944fd7..0000000
Binary files a/app/src/main/res/mipmap-mdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/undo_black.png b/app/src/main/res/mipmap-mdpi/undo_black.png
deleted file mode 100644
index 3d23409..0000000
Binary files a/app/src/main/res/mipmap-mdpi/undo_black.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/share.png b/app/src/main/res/mipmap-xhdpi/share.png
deleted file mode 100644
index 22a8783..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/undo_black.png b/app/src/main/res/mipmap-xhdpi/undo_black.png
deleted file mode 100644
index 9ca7eb7..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/undo_black.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/share.png b/app/src/main/res/mipmap-xxhdpi/share.png
deleted file mode 100644
index a35b3cd..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/undo_black.png b/app/src/main/res/mipmap-xxhdpi/undo_black.png
deleted file mode 100644
index 8ac4546..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/undo_black.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/share.png b/app/src/main/res/mipmap-xxxhdpi/share.png
deleted file mode 100644
index e351c7b..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/share.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/undo_black.png b/app/src/main/res/mipmap-xxxhdpi/undo_black.png
deleted file mode 100644
index ce458bd..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/undo_black.png and /dev/null differ