diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1c1d926..7866721 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -21,7 +21,7 @@
         android:layout_height="@dimen/icon_size"
         android:layout_alignParentRight="true"
         android:layout_below="@id/color_picker"
-        android:padding="4dp"
+        android:padding="@dimen/icon_padding"
         android:src="@mipmap/undo"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
index f17239b..910c951 100644
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu.xml
@@ -3,14 +3,14 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_save"
-        android:icon="@android:drawable/ic_menu_save"
-        android:title="Save"
-        app:showAsAction="always"/>
+        android:icon="@mipmap/save"
+        android:title="@string/save"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_share"
-        android:icon="@android:drawable/ic_menu_share"
-        android:title="Share"
-        app:showAsAction="always"/>
+        android:icon="@mipmap/share"
+        android:title="@string/share"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/about"
         android:title="@string/about"
diff --git a/app/src/main/res/mipmap-hdpi/save.png b/app/src/main/res/mipmap-hdpi/save.png
new file mode 100644
index 0000000..dd3f106
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/save.png differ
diff --git a/app/src/main/res/mipmap-hdpi/share.png b/app/src/main/res/mipmap-hdpi/share.png
new file mode 100644
index 0000000..b09a692
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/share.png differ
diff --git a/app/src/main/res/mipmap-hdpi/undo.png b/app/src/main/res/mipmap-hdpi/undo.png
index 69e4e73..10deccf 100644
Binary files a/app/src/main/res/mipmap-hdpi/undo.png and b/app/src/main/res/mipmap-hdpi/undo.png differ
diff --git a/app/src/main/res/mipmap-mdpi/save.png b/app/src/main/res/mipmap-mdpi/save.png
new file mode 100644
index 0000000..015062e
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/save.png differ
diff --git a/app/src/main/res/mipmap-mdpi/share.png b/app/src/main/res/mipmap-mdpi/share.png
new file mode 100644
index 0000000..e944fd7
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/share.png differ
diff --git a/app/src/main/res/mipmap-mdpi/undo.png b/app/src/main/res/mipmap-mdpi/undo.png
new file mode 100644
index 0000000..a0e2b68
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/undo.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/save.png b/app/src/main/res/mipmap-xhdpi/save.png
new file mode 100644
index 0000000..adda095
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/save.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/share.png b/app/src/main/res/mipmap-xhdpi/share.png
new file mode 100644
index 0000000..22a8783
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/share.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/undo.png b/app/src/main/res/mipmap-xhdpi/undo.png
new file mode 100644
index 0000000..3d23409
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/undo.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/save.png b/app/src/main/res/mipmap-xxhdpi/save.png
new file mode 100644
index 0000000..3e0ce1a
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/save.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/share.png b/app/src/main/res/mipmap-xxhdpi/share.png
new file mode 100644
index 0000000..a35b3cd
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/share.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/undo.png b/app/src/main/res/mipmap-xxhdpi/undo.png
new file mode 100644
index 0000000..818191c
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/undo.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/save.png b/app/src/main/res/mipmap-xxxhdpi/save.png
new file mode 100644
index 0000000..bd80bf1
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/save.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/share.png b/app/src/main/res/mipmap-xxxhdpi/share.png
new file mode 100644
index 0000000..e351c7b
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/share.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/undo.png b/app/src/main/res/mipmap-xxxhdpi/undo.png
new file mode 100644
index 0000000..9ca7eb7
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/undo.png differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3ab3e9c..bd44e5c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#ffff6f00</color>
+    <color name="colorPrimaryDark">#ffe46300</color>
+    <color name="colorAccent">@color/colorPrimary</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index fb8151c..fbea909 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,4 +1,5 @@
 <resources>
     <dimen name="activity_margin">16dp</dimen>
     <dimen name="icon_size">48dp</dimen>
+    <dimen name="icon_padding">8dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index be11e48..1e17e43 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,7 @@
 <resources>
     <string name="app_name">Simple Draw</string>
+    <string name="save">Save</string>
+    <string name="share">Share</string>
     <string name="share_via">Share via</string>
     <string name="saving_error">Could not save the file</string>
     <string name="saving_ok">Image has been saved successfully</string>