diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_attachment_2.png b/astrid/src/main/res/drawable-hdpi/ic_action_attachment_2.png
new file mode 100644
index 000000000..81c0a9d00
Binary files /dev/null and b/astrid/src/main/res/drawable-hdpi/ic_action_attachment_2.png differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_camera.png b/astrid/src/main/res/drawable-hdpi/ic_action_camera.png
index 87649ad19..6527f16b8 100644
Binary files a/astrid/src/main/res/drawable-hdpi/ic_action_camera.png and b/astrid/src/main/res/drawable-hdpi/ic_action_camera.png differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_mic.png b/astrid/src/main/res/drawable-hdpi/ic_action_mic.png
index eafd19584..40c9a7fb0 100644
Binary files a/astrid/src/main/res/drawable-hdpi/ic_action_mic.png and b/astrid/src/main/res/drawable-hdpi/ic_action_mic.png differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_new_attachment.png b/astrid/src/main/res/drawable-hdpi/ic_action_new_attachment.png
deleted file mode 100644
index 28507da2d..000000000
Binary files a/astrid/src/main/res/drawable-hdpi/ic_action_new_attachment.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-hdpi/ic_action_search.png b/astrid/src/main/res/drawable-hdpi/ic_action_search.png
index f594b4e48..06ed75b7a 100644
Binary files a/astrid/src/main/res/drawable-hdpi/ic_action_search.png and b/astrid/src/main/res/drawable-hdpi/ic_action_search.png differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_attachment_2.png b/astrid/src/main/res/drawable-xhdpi/ic_action_attachment_2.png
new file mode 100644
index 000000000..991f35003
Binary files /dev/null and b/astrid/src/main/res/drawable-xhdpi/ic_action_attachment_2.png differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_camera.png b/astrid/src/main/res/drawable-xhdpi/ic_action_camera.png
index b4bd762f9..839d12fe6 100644
Binary files a/astrid/src/main/res/drawable-xhdpi/ic_action_camera.png and b/astrid/src/main/res/drawable-xhdpi/ic_action_camera.png differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_mic.png b/astrid/src/main/res/drawable-xhdpi/ic_action_mic.png
index c0c3952f7..2dff43ea2 100644
Binary files a/astrid/src/main/res/drawable-xhdpi/ic_action_mic.png and b/astrid/src/main/res/drawable-xhdpi/ic_action_mic.png differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_new_attachment.png b/astrid/src/main/res/drawable-xhdpi/ic_action_new_attachment.png
deleted file mode 100644
index 4948feec2..000000000
Binary files a/astrid/src/main/res/drawable-xhdpi/ic_action_new_attachment.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xhdpi/ic_action_search.png b/astrid/src/main/res/drawable-xhdpi/ic_action_search.png
index 96deb0131..92408a071 100644
Binary files a/astrid/src/main/res/drawable-xhdpi/ic_action_search.png and b/astrid/src/main/res/drawable-xhdpi/ic_action_search.png differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_attachment_2.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_attachment_2.png
new file mode 100644
index 000000000..36754368e
Binary files /dev/null and b/astrid/src/main/res/drawable-xxhdpi/ic_action_attachment_2.png differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_camera.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_camera.png
index a83d40c70..40cb395d1 100644
Binary files a/astrid/src/main/res/drawable-xxhdpi/ic_action_camera.png and b/astrid/src/main/res/drawable-xxhdpi/ic_action_camera.png differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_mic.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_mic.png
index 88769122c..3bdde4673 100644
Binary files a/astrid/src/main/res/drawable-xxhdpi/ic_action_mic.png and b/astrid/src/main/res/drawable-xxhdpi/ic_action_mic.png differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png
deleted file mode 100644
index 47c47c44f..000000000
Binary files a/astrid/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable-xxhdpi/ic_action_search.png b/astrid/src/main/res/drawable-xxhdpi/ic_action_search.png
index 2afc10aa6..b4a483a2c 100644
Binary files a/astrid/src/main/res/drawable-xxhdpi/ic_action_search.png and b/astrid/src/main/res/drawable-xxhdpi/ic_action_search.png differ
diff --git a/astrid/src/main/res/drawable/ic_action_attachment_2.png b/astrid/src/main/res/drawable/ic_action_attachment_2.png
new file mode 100644
index 000000000..95bda0636
Binary files /dev/null and b/astrid/src/main/res/drawable/ic_action_attachment_2.png differ
diff --git a/astrid/src/main/res/drawable/ic_action_camera.png b/astrid/src/main/res/drawable/ic_action_camera.png
index bf2af6e5d..cdec38651 100644
Binary files a/astrid/src/main/res/drawable/ic_action_camera.png and b/astrid/src/main/res/drawable/ic_action_camera.png differ
diff --git a/astrid/src/main/res/drawable/ic_action_mic.png b/astrid/src/main/res/drawable/ic_action_mic.png
index a9c001f8b..c113cf78b 100644
Binary files a/astrid/src/main/res/drawable/ic_action_mic.png and b/astrid/src/main/res/drawable/ic_action_mic.png differ
diff --git a/astrid/src/main/res/drawable/ic_action_new_attachment.png b/astrid/src/main/res/drawable/ic_action_new_attachment.png
deleted file mode 100644
index 354c49d38..000000000
Binary files a/astrid/src/main/res/drawable/ic_action_new_attachment.png and /dev/null differ
diff --git a/astrid/src/main/res/drawable/ic_action_search.png b/astrid/src/main/res/drawable/ic_action_search.png
index abf509be3..270054fac 100644
Binary files a/astrid/src/main/res/drawable/ic_action_search.png and b/astrid/src/main/res/drawable/ic_action_search.png differ
diff --git a/astrid/src/main/res/layout/task_edit_activity.xml b/astrid/src/main/res/layout/task_edit_activity.xml
index 6c761fb6e..b5805958c 100644
--- a/astrid/src/main/res/layout/task_edit_activity.xml
+++ b/astrid/src/main/res/layout/task_edit_activity.xml
@@ -107,7 +107,6 @@
             android:capitalize="sentences"
             android:imeOptions="flagNoExtractUi"
             android:hint="@string/TVA_add_comment"
-            android:textColor="?attr/asTextColor"
             android:paddingLeft="10dip"
             android:textSize="16sp" />
 
diff --git a/astrid/src/main/res/values-v11/styles.xml b/astrid/src/main/res/values-v11/styles.xml
index 6ed1b39b5..4806c1e27 100644
--- a/astrid/src/main/res/values-v11/styles.xml
+++ b/astrid/src/main/res/values-v11/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
     </style>
 
     <style name="DialogTheme" parent="@android:style/Theme.Dialog">
diff --git a/astrid/src/main/res/values-v21/styles.xml b/astrid/src/main/res/values-v21/styles.xml
index 4d23050f0..1d3c5fb79 100644
--- a/astrid/src/main/res/values-v21/styles.xml
+++ b/astrid/src/main/res/values-v21/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/astrid/src/main/res/values/styles.xml b/astrid/src/main/res/values/styles.xml
index 8950e5feb..6813b2e15 100644
--- a/astrid/src/main/res/values/styles.xml
+++ b/astrid/src/main/res/values/styles.xml
@@ -2,15 +2,15 @@
 
     <!-- ========================================================== General  -->
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
     </style>
 
     <style name="DialogTheme" parent="@android:style/Theme.Dialog">
     </style>
 
     <style name="Tasks" parent="AppTheme">
-        <!--<item name="colorPrimary">@android:color/holo_orange_light</item>-->
-        <item name="colorPrimaryDark">#636363</item>
+        <item name="colorPrimary">#607d8b</item>
+        <item name="colorPrimaryDark">#4d646f</item>
         <!--<item name="colorAccent">@android:color/holo_purple</item>-->
 
         <item name="android:windowBackground">@null</item>
@@ -31,9 +31,9 @@
         <item name="asFilterSelectedIcon">@drawable/filter_selected_icon_black</item>
         <item name="asTaskRowSelector">@drawable/task_row_bg_white</item>
         <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
-        <item name="asAbBackgroundColor">#e9e9e9</item>
-        <item name="ic_action_add">@drawable/ic_action_add</item>
-        <item name="ic_action_new_attachment">@drawable/ic_action_new_attachment</item>
+        <item name="asAbBackgroundColor">#607d8b</item>
+        <item name="ic_action_add">@drawable/ic_action_add_light</item>
+        <item name="ic_action_new_attachment">@drawable/ic_action_attachment_2</item>
         <item name="ic_action_discard">@drawable/ic_action_discard</item>
         <item name="ic_action_save">@drawable/ic_action_save</item>
         <item name="ic_action_cancel">@drawable/ic_action_cancel</item>