diff --git a/app/src/main/res/drawable-hdpi/ic_action_add.png b/app/src/main/res/drawable-hdpi/ic_action_add_light.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_action_add.png
rename to app/src/main/res/drawable-hdpi/ic_action_add_light.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_add.png b/app/src/main/res/drawable-mdpi/ic_action_add_light.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_action_add.png
rename to app/src/main/res/drawable-mdpi/ic_action_add_light.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_add.png b/app/src/main/res/drawable-xhdpi/ic_action_add_light.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_action_add.png
rename to app/src/main/res/drawable-xhdpi/ic_action_add_light.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_add.png b/app/src/main/res/drawable-xxhdpi/ic_action_add_light.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_action_add.png
rename to app/src/main/res/drawable-xxhdpi/ic_action_add_light.png
diff --git a/app/src/main/res/layout/edit_habit.xml b/app/src/main/res/layout/edit_habit.xml
index 493dc1c67..1ff10c036 100644
--- a/app/src/main/res/layout/edit_habit.xml
+++ b/app/src/main/res/layout/edit_habit.xml
@@ -45,7 +45,7 @@
                 android:id="@+id/buttonPickColor"
                 style="@style/dialogFormInputColor"
                 android:contentDescription="@string/color_picker_default_title"
-                android:src="@drawable/ic_action_color_light"/>
+                android:src="?dialogIconChangeColor"/>
         </LinearLayout>
 
         <EditText
diff --git a/app/src/main/res/menu-v21/list_habits_context.xml b/app/src/main/res/menu-v21/list_habits_context.xml
deleted file mode 100644
index b632f3c99..000000000
--- a/app/src/main/res/menu-v21/list_habits_context.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/action_edit_habit"
-        android:title="@string/edit"
-        android:icon="@drawable/ic_action_edit_dark"/>
-
-    <item
-        android:id="@+id/action_color"
-        android:title="@string/color_picker_default_title"
-        android:icon="@drawable/ic_action_color_dark"/>
-
-    <item
-        android:id="@+id/action_archive_habit"
-        android:title="@string/archive"
-        android:icon="@drawable/ic_action_archive_dark" />
-
-    <item
-        android:id="@+id/action_unarchive_habit"
-        android:title="@string/unarchive"
-        android:icon="@drawable/ic_action_unarchive_dark"/>
-
-    <item
-        android:id="@+id/action_delete"
-        android:title="@string/delete"
-        android:showAsAction="never" />
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu-v21/list_habits_options.xml b/app/src/main/res/menu-v21/list_habits_options.xml
deleted file mode 100644
index eac148ffb..000000000
--- a/app/src/main/res/menu-v21/list_habits_options.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="org.isoron.uhabits.MainActivity" >
-    
-    <item
-        android:id="@+id/action_add"
-        android:title="@string/add_habit" android:showAsAction="always" android:icon="@drawable/ic_action_add_dark"/>
-
-</menu>
diff --git a/app/src/main/res/menu-v21/show_habit_fragment_menu.xml b/app/src/main/res/menu-v21/show_habit_fragment_menu.xml
deleted file mode 100644
index c4a051c8c..000000000
--- a/app/src/main/res/menu-v21/show_habit_fragment_menu.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/action_edit_habit"
-        android:showAsAction="ifRoom"
-        android:icon="@drawable/ic_action_edit_dark"
-        android:title="@string/edit"/>
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/list_habits_context.xml b/app/src/main/res/menu/list_habits_context.xml
index b48ffc38c..8b4ae18ea 100644
--- a/app/src/main/res/menu/list_habits_context.xml
+++ b/app/src/main/res/menu/list_habits_context.xml
@@ -23,25 +23,26 @@
     <item
         android:id="@+id/action_edit_habit"
         android:title="@string/edit"
-        android:icon="@drawable/ic_action_edit_light"/>
+        android:icon="?iconEdit"/>
 
     <item
         android:id="@+id/action_color"
         android:title="@string/color_picker_default_title"
-        android:icon="@drawable/ic_action_color_light"/>
+        android:icon="?iconChangeColor"/>
 
     <item
         android:id="@+id/action_archive_habit"
         android:title="@string/archive"
-        android:icon="@drawable/ic_action_archive_light" />
+        android:icon="?iconArchive" />
 
     <item
         android:id="@+id/action_unarchive_habit"
         android:title="@string/unarchive"
-        android:icon="@drawable/ic_action_unarchive_light"/>
+        android:icon="?iconUnarchive"/>
 
     <item
         android:id="@+id/action_delete"
-        android:title="@string/delete" />
+        android:title="@string/delete"
+        android:showAsAction="never"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/list_habits_options.xml b/app/src/main/res/menu/list_habits_options.xml
index 586b7595e..7704aed46 100644
--- a/app/src/main/res/menu/list_habits_options.xml
+++ b/app/src/main/res/menu/list_habits_options.xml
@@ -23,7 +23,7 @@
 
     <item
         android:id="@+id/action_add"
-        android:icon="@drawable/ic_action_add"
+        android:icon="?iconAdd"
         android:title="@string/add_habit"
         android:showAsAction="always"/>
 
diff --git a/app/src/main/res/menu/show_habit_fragment_menu.xml b/app/src/main/res/menu/show_habit_fragment_menu.xml
index d19555502..48872163b 100644
--- a/app/src/main/res/menu/show_habit_fragment_menu.xml
+++ b/app/src/main/res/menu/show_habit_fragment_menu.xml
@@ -22,7 +22,7 @@
 
     <item
         android:id="@+id/action_edit_habit"
-        android:icon="@drawable/ic_action_edit_light"
+        android:icon="?iconEdit"
         android:title="@string/edit"
         android:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 32334409f..0264d2dc2 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -46,6 +46,13 @@
         <item name="mediumContrastTextColor">@color/grey_500</item>
         <item name="lowContrastTextColor">@color/grey_300</item>
 
+        <item name="iconAdd">@drawable/ic_action_add_dark</item>
+        <item name="iconArchive">@drawable/ic_action_archive_dark</item>
+        <item name="iconEdit">@drawable/ic_action_edit_dark</item>
+        <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
+        <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
+        <item name="dialogIconChangeColor">@drawable/ic_action_color_light</item>
+
         <item name="aboutScreenColor">@color/blue_700</item>
     </style>
 
@@ -74,6 +81,13 @@
         <item name="mediumContrastReverseTextColor">@color/grey_700</item>
         <item name="lowContrastReverseTextColor">@color/grey_300</item>
 
+        <item name="iconAdd">@drawable/ic_action_add_dark</item>
+        <item name="iconArchive">@drawable/ic_action_archive_dark</item>
+        <item name="iconEdit">@drawable/ic_action_edit_dark</item>
+        <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
+        <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
+        <item name="dialogIconChangeColor">@drawable/ic_action_color_dark</item>
+
         <item name="palette">@array/darkPalette</item>
 
         <item name="aboutScreenColor">@color/blue_300</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index aa6965939..fac514547 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -35,6 +35,14 @@
     <attr name="mediumContrastReverseTextColor" format="reference"/>
     <attr name="lowContrastReverseTextColor" format="reference"/>
 
+    <attr name="iconAdd" format="reference"/>
+    <attr name="iconArchive" format="reference"/>
+    <attr name="iconChangeColor" format="reference"/>
+    <attr name="iconEdit" format="reference"/>
+    <attr name="iconUnarchive" format="reference"/>
+    <attr name="dialogIconChangeColor" format="reference"/>
+
+
     <!-- Pre-Lollipop -->
     <attr name="cardBackground" format="reference"/>
     <attr name="headerBackground" format="reference"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dd07830c7..5fd7339f4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -42,6 +42,13 @@
         <item name="mediumContrastTextColor">@color/grey_500</item>
         <item name="lowContrastTextColor">@color/grey_300</item>
 
+        <item name="iconAdd">@drawable/ic_action_add_light</item>
+        <item name="iconArchive">@drawable/ic_action_archive_light</item>
+        <item name="iconEdit">@drawable/ic_action_edit_light</item>
+        <item name="iconUnarchive">@drawable/ic_action_unarchive_light</item>
+        <item name="iconChangeColor">@drawable/ic_action_color_light</item>
+        <item name="dialogIconChangeColor">@drawable/ic_action_color_light</item>
+
         <item name="aboutScreenColor">@color/blue_700</item>
     </style>
 
@@ -64,6 +71,13 @@
         <item name="mediumContrastReverseTextColor">@color/grey_700</item>
         <item name="lowContrastReverseTextColor">@color/grey_300</item>
 
+        <item name="iconAdd">@drawable/ic_action_add_dark</item>
+        <item name="iconArchive">@drawable/ic_action_archive_dark</item>
+        <item name="iconEdit">@drawable/ic_action_edit_dark</item>
+        <item name="iconUnarchive">@drawable/ic_action_unarchive_dark</item>
+        <item name="iconChangeColor">@drawable/ic_action_color_dark</item>
+        <item name="dialogIconChangeColor">@drawable/ic_action_color_dark</item>
+
         <item name="palette">@array/darkPalette</item>
 
         <item name="aboutScreenColor">@color/blue_300</item>