diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index fe2fad390..b4deb398a 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -5,8 +5,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.tasks"
-    android:versionName="4.6.18"
-    android:versionCode="333">
+    android:versionName="4.7"
+    android:versionCode="334">
 
     <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
     <!--    android:installLocation="internalOnly"> -->
diff --git a/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java b/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java
index 7a880b981..fd4764d50 100644
--- a/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java
+++ b/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java
@@ -30,7 +30,7 @@ public class DescriptionControlSet extends PopupControlSet {
     protected ImageView image;
 
     public DescriptionControlSet(ActivityPreferences preferences, Activity activity) {
-        super(preferences, activity, R.layout.control_set_notes, R.layout.control_set_notes_display, R.string.TEA_note_label);
+        super(preferences, activity, R.layout.control_set_description, R.layout.control_set_notes_display, R.string.TEA_note_label);
         image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon);
     }
 
diff --git a/src/main/res/drawable-hdpi/ic_action_add_light.png b/src/main/res/drawable-hdpi/ic_action_add_light.png
index fd4c54c13..ed83eb4aa 100644
Binary files a/src/main/res/drawable-hdpi/ic_action_add_light.png and b/src/main/res/drawable-hdpi/ic_action_add_light.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_attachment_2.png b/src/main/res/drawable-hdpi/ic_action_attachment_2.png
index 81c0a9d00..b7c3ab555 100644
Binary files a/src/main/res/drawable-hdpi/ic_action_attachment_2.png and b/src/main/res/drawable-hdpi/ic_action_attachment_2.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_camera.png b/src/main/res/drawable-hdpi/ic_action_camera.png
index 6527f16b8..9d70d54bf 100644
Binary files a/src/main/res/drawable-hdpi/ic_action_camera.png and b/src/main/res/drawable-hdpi/ic_action_camera.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_mic.png b/src/main/res/drawable-hdpi/ic_action_mic.png
index 40c9a7fb0..d0568d659 100644
Binary files a/src/main/res/drawable-hdpi/ic_action_mic.png and b/src/main/res/drawable-hdpi/ic_action_mic.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_save.png b/src/main/res/drawable-hdpi/ic_action_save.png
index c4b7783cc..75d82303c 100644
Binary files a/src/main/res/drawable-hdpi/ic_action_save.png and b/src/main/res/drawable-hdpi/ic_action_save.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_search.png b/src/main/res/drawable-hdpi/ic_action_search.png
index 06ed75b7a..89633d0e4 100644
Binary files a/src/main/res/drawable-hdpi/ic_action_search.png and b/src/main/res/drawable-hdpi/ic_action_search.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_add_light.png b/src/main/res/drawable-xhdpi/ic_action_add_light.png
index b1badb1fe..c44c055f7 100644
Binary files a/src/main/res/drawable-xhdpi/ic_action_add_light.png and b/src/main/res/drawable-xhdpi/ic_action_add_light.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_attachment_2.png b/src/main/res/drawable-xhdpi/ic_action_attachment_2.png
index 991f35003..72b5ac693 100644
Binary files a/src/main/res/drawable-xhdpi/ic_action_attachment_2.png and b/src/main/res/drawable-xhdpi/ic_action_attachment_2.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_camera.png b/src/main/res/drawable-xhdpi/ic_action_camera.png
index 839d12fe6..ee02782a6 100644
Binary files a/src/main/res/drawable-xhdpi/ic_action_camera.png and b/src/main/res/drawable-xhdpi/ic_action_camera.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_mic.png b/src/main/res/drawable-xhdpi/ic_action_mic.png
index 2dff43ea2..f8c6f5b36 100644
Binary files a/src/main/res/drawable-xhdpi/ic_action_mic.png and b/src/main/res/drawable-xhdpi/ic_action_mic.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_save.png b/src/main/res/drawable-xhdpi/ic_action_save.png
index 29c5f4d3b..e2d2c1dcd 100644
Binary files a/src/main/res/drawable-xhdpi/ic_action_save.png and b/src/main/res/drawable-xhdpi/ic_action_save.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_search.png b/src/main/res/drawable-xhdpi/ic_action_search.png
index 92408a071..1fba8b8d8 100644
Binary files a/src/main/res/drawable-xhdpi/ic_action_search.png and b/src/main/res/drawable-xhdpi/ic_action_search.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_add_light.png b/src/main/res/drawable-xxhdpi/ic_action_add_light.png
index 7b126f7bd..f44a7aac4 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_action_add_light.png and b/src/main/res/drawable-xxhdpi/ic_action_add_light.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_attachment_2.png b/src/main/res/drawable-xxhdpi/ic_action_attachment_2.png
index 36754368e..d2a16ba3a 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_action_attachment_2.png and b/src/main/res/drawable-xxhdpi/ic_action_attachment_2.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_camera.png b/src/main/res/drawable-xxhdpi/ic_action_camera.png
index 40cb395d1..5414e6059 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_action_camera.png and b/src/main/res/drawable-xxhdpi/ic_action_camera.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_mic.png b/src/main/res/drawable-xxhdpi/ic_action_mic.png
index 3bdde4673..d992ad586 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_action_mic.png and b/src/main/res/drawable-xxhdpi/ic_action_mic.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_save.png b/src/main/res/drawable-xxhdpi/ic_action_save.png
index 744350049..d9511b36c 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_action_save.png and b/src/main/res/drawable-xxhdpi/ic_action_save.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_search.png b/src/main/res/drawable-xxhdpi/ic_action_search.png
index b4a483a2c..4acec5e7a 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_action_search.png and b/src/main/res/drawable-xxhdpi/ic_action_search.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_up.png b/src/main/res/drawable-xxhdpi/ic_up.png
new file mode 100644
index 000000000..3396894f8
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_up.png differ
diff --git a/src/main/res/drawable/ic_action_add_light.png b/src/main/res/drawable/ic_action_add_light.png
index b10609263..80fbf27d1 100644
Binary files a/src/main/res/drawable/ic_action_add_light.png and b/src/main/res/drawable/ic_action_add_light.png differ
diff --git a/src/main/res/drawable/ic_action_attachment_2.png b/src/main/res/drawable/ic_action_attachment_2.png
index 95bda0636..b2a187233 100644
Binary files a/src/main/res/drawable/ic_action_attachment_2.png and b/src/main/res/drawable/ic_action_attachment_2.png differ
diff --git a/src/main/res/drawable/ic_action_camera.png b/src/main/res/drawable/ic_action_camera.png
index cdec38651..5b7a8a253 100644
Binary files a/src/main/res/drawable/ic_action_camera.png and b/src/main/res/drawable/ic_action_camera.png differ
diff --git a/src/main/res/drawable/ic_action_mic.png b/src/main/res/drawable/ic_action_mic.png
index c113cf78b..5bcf43b59 100644
Binary files a/src/main/res/drawable/ic_action_mic.png and b/src/main/res/drawable/ic_action_mic.png differ
diff --git a/src/main/res/drawable/ic_action_save.png b/src/main/res/drawable/ic_action_save.png
index 61304a68c..d93bf8805 100644
Binary files a/src/main/res/drawable/ic_action_save.png and b/src/main/res/drawable/ic_action_save.png differ
diff --git a/src/main/res/drawable/ic_action_search.png b/src/main/res/drawable/ic_action_search.png
index 270054fac..c460f3332 100644
Binary files a/src/main/res/drawable/ic_action_search.png and b/src/main/res/drawable/ic_action_search.png differ
diff --git a/src/main/res/layout/control_set_notes.xml b/src/main/res/layout/control_set_description.xml
similarity index 96%
rename from src/main/res/layout/control_set_notes.xml
rename to src/main/res/layout/control_set_description.xml
index 59cba3263..aeb1170c4 100644
--- a/src/main/res/layout/control_set_notes.xml
+++ b/src/main/res/layout/control_set_description.xml
@@ -39,7 +39,6 @@
 	      android:autoText="true"
 	      android:capitalize="sentences"
 	      android:singleLine="false"
-          android:textColorHint="@color/text_color_hint"
 	      android:textColor="?attr/asTextColor"
 	      android:freezesText="true" />
 	  </LinearLayout>
diff --git a/src/main/res/layout/control_set_title.xml b/src/main/res/layout/control_set_title.xml
index 32bf2120a..209e2ac3a 100644
--- a/src/main/res/layout/control_set_title.xml
+++ b/src/main/res/layout/control_set_title.xml
@@ -39,7 +39,6 @@
         android:scrollbars="vertical"
         android:imeOptions="flagNoExtractUi"
         android:text=""
-        android:textColorHint="@color/text_color_hint"
         android:textColor="?attr/asTextColor" />
 
 </LinearLayout>
diff --git a/src/main/res/layout/task_edit_activity.xml b/src/main/res/layout/task_edit_activity.xml
index b5805958c..12d87090e 100644
--- a/src/main/res/layout/task_edit_activity.xml
+++ b/src/main/res/layout/task_edit_activity.xml
@@ -107,6 +107,8 @@
             android:capitalize="sentences"
             android:imeOptions="flagNoExtractUi"
             android:hint="@string/TVA_add_comment"
+            android:textColor="@color/white_text"
+            android:textColorHint="@color/white_text_hint"
             android:paddingLeft="10dip"
             android:textSize="16sp" />
 
diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/toolbar.xml
index 2258db962..e66fad4f0 100644
--- a/src/main/res/layout/toolbar.xml
+++ b/src/main/res/layout/toolbar.xml
@@ -1,5 +1,9 @@
 <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tasks="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:background="?attr/asAbBackgroundColor" />
+    android:background="?attr/asAbBackgroundColor"
+    tasks:theme="@style/ActionBarThemeOverlay"
+    tasks:popupTheme="@style/ActionBarPopupThemeOverlay"
+    tasks:titleTextAppearance="@style/ActionBar.TitleText" />
diff --git a/src/main/res/values-v11/styles.xml b/src/main/res/values-v11/styles.xml
index 4806c1e27..6ed1b39b5 100644
--- a/src/main/res/values-v11/styles.xml
+++ b/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.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
     </style>
 
     <style name="DialogTheme" parent="@android:style/Theme.Dialog">
diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml
index 1d3c5fb79..4d23050f0 100644
--- a/src/main/res/values-v21/styles.xml
+++ b/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.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index e3a81587f..be35f5f5c 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -7,7 +7,6 @@
 <resources>
     <color name="task_list_overdue">#FFFB6666</color>
     <color name="task_list_done">#ff777777</color>
-    <color name="text_color_hint">#dde0e0e0</color>
     <color name="task_edit_deadline_gray">#888888</color>
     
     <color name="blue_theme_color">#33b5e5</color>
@@ -27,6 +26,8 @@
 
     <color name="drawer_background_selected">#dddddd</color>
     <color name="drawer_background">#efefef</color>
+    <color name="white_text">#fff</color>
+    <color name="white_text_hint">#eee</color>
 
     <color name="importance_1">#ffff5555</color>
     <color name="importance_2">#fffea400</color>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 85ae54463..b73ad4035 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -2,7 +2,7 @@
 
     <!-- ========================================================== General  -->
 
-    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
     </style>
 
     <style name="DialogTheme" parent="@android:style/Theme.Dialog">
@@ -55,10 +55,24 @@
         <item name="drawer_text">#000</item>
 
         <!-- actionbar-styling -->
+        <item name="homeAsUpIndicator">@drawable/ic_up</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_up</item>
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
+    <style name="ActionBar.TitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textColor">#fff</item>
+    </style>
+
+    <style name="ActionBarThemeOverlay" parent="">
+        <item name="android:textColorPrimary">#fff</item>
+        <item name="colorControlNormal">#fff</item>
+        <item name="colorControlHighlight">#3fff</item>
+    </style>
+
+    <style name="ActionBarPopupThemeOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
     <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">false</item>
     </style>