diff --git a/astrid/res/drawable/edit_title_background_dark.xml b/astrid/res/drawable/edit_title_background_dark.xml
new file mode 100644
index 000000000..bcd7f4319
--- /dev/null
+++ b/astrid/res/drawable/edit_title_background_dark.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+      android:startColor="#111111"
+      android:endColor="#181818"
+      android:angle="270"
+      android:height="20dp" />
+  <stroke 
+      android:color="#707070"
+      android:width="1dip" />
+  <size android:width="45dip"
+        android:height="45dip"/>
+</shape>
diff --git a/astrid/res/layout/control_set_title.xml b/astrid/res/layout/control_set_title.xml
index 0e74064d8..8c42f2af0 100644
--- a/astrid/res/layout/control_set_title.xml
+++ b/astrid/res/layout/control_set_title.xml
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="100"
         android:autoText="true"
-        android:background="@drawable/edit_title_background"
+        android:background="?attr/asEditTextBackground"
         android:capitalize="sentences"
         android:freezesText="true"
         android:hint="@string/TEA_title_hint"
@@ -33,6 +33,6 @@
         android:paddingLeft="5dip"
         android:scrollbars="vertical"
         android:text=""
-        android:textColor="@android:color/black" />
+        android:textColor="?attr/asTextColor" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/quick_add_bar.xml b/astrid/res/layout/quick_add_bar.xml
index 9a90970e6..8138af042 100644
--- a/astrid/res/layout/quick_add_bar.xml
+++ b/astrid/res/layout/quick_add_bar.xml
@@ -45,11 +45,11 @@
 	            android:layout_marginBottom="2dip"
 	            android:layout_weight="100"
 	            android:paddingLeft="5dip"
-	            android:background="@drawable/edit_title_background"
+	            android:background="?attr/asEditTextBackground"
+	            android:textColor="?attr/asTextColor"
 	            android:hint="@string/TLA_quick_add_hint"
 	            android:textSize="16sp"
 	            android:autoText="true"
-	            android:textColor="@android:color/black"
 	            android:capitalize="sentences"/>
 	        
 	        <!-- Extended Add Button -->
diff --git a/astrid/res/layout/tag_edit_row.xml b/astrid/res/layout/tag_edit_row.xml
index 63fc849bb..837a45c4e 100644
--- a/astrid/res/layout/tag_edit_row.xml
+++ b/astrid/res/layout/tag_edit_row.xml
@@ -22,7 +22,6 @@
         android:hint="@string/TEA_tag_hint"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
         android:layout_weight="1"
         android:layout_gravity="center_vertical"/>
         
diff --git a/astrid/res/layout/tag_updates_fragment.xml b/astrid/res/layout/tag_updates_fragment.xml
index f3754f086..3dc761c7f 100644
--- a/astrid/res/layout/tag_updates_fragment.xml
+++ b/astrid/res/layout/tag_updates_fragment.xml
@@ -84,11 +84,11 @@
             android:layout_marginRight="1dip"
             android:layout_weight="100"
             android:autoText="true"
-            android:background="@drawable/footer_comment_edittext"
+            android:background="?attr/asEditTextBackground"
             android:capitalize="sentences"
             android:hint="@string/TVA_add_comment"
             android:paddingLeft="10dip"
-            android:textColor="@android:color/black"
+            android:textColor="?attr/asTextColor"
             android:textSize="16sp" />
 
         <!-- Extended Add Button -->
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index d5a2102ad..49f44fa71 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -135,10 +135,10 @@
             android:layout_marginBottom="2dip"
             android:layout_weight="100"
             android:autoText="true"
-            android:background="@drawable/footer_comment_edittext"
+            android:background="?attr/asEditTextBackground"
             android:capitalize="sentences"
             android:hint="@string/TVA_add_comment"
-            android:textColor="@android:color/black"
+            android:textColor="?attr/asTextColor"
             android:paddingLeft="10dip"
             android:textSize="16sp" />
 
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index 0c800d5ec..ded0e8c8b 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -22,6 +22,7 @@
   <attr name="asListDividerColor" format="color"/>
   
   <attr name="asThemeTextColor" format="color"/>
+  <attr name="asEditTextBackground" format="reference"/>
   <attr name="asListsDisclosure" format="reference"/>
   <attr name="asAddButtonImg" format="reference" />
   <attr name="asMicButtonImg" format="reference" />
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 15e8fbdc8..a3ee58178 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -23,6 +23,7 @@
         <item name="asMicButtonImg">@drawable/mic_button_blue</item>
         <item name="asCommentButtonImg">@drawable/comment_blue</item>
         <item name="asFilledCommentButtonImg">@drawable/comment_blue_filled</item>
+        <item name="asEditTextBackground">@drawable/edit_title_background_dark</item>
         <item name="asEditBackground">#101010</item>
         <item name="asEditRowBackground">@drawable/task_edit_background</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator_dark</item>
@@ -74,6 +75,7 @@
         <item name="asCommentButtonImg">@drawable/comment_red</item>
         <item name="asFilledCommentButtonImg">@drawable/comment_red_filled</item>
         <item name="asEditRowBackground">@drawable/task_edit_background_white</item>
+        <item name="asEditTextBackground">@drawable/edit_title_background</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator</item>
         <item name="asMainMenu">@drawable/menu_button_red</item>
         <item name="asPeopleMenu">@drawable/people_menu_button_red</item>