diff --git a/astrid/res/drawable-hdpi/custom_tab_indicator_focused.9.png b/astrid/res/drawable-hdpi/custom_tab_indicator_focused.9.png
deleted file mode 100755
index 8d36d7de7..000000000
Binary files a/astrid/res/drawable-hdpi/custom_tab_indicator_focused.9.png and /dev/null differ
diff --git a/astrid/res/drawable-hdpi/custom_tab_indicator_unselected.9.png b/astrid/res/drawable-hdpi/custom_tab_indicator_unselected.9.png
deleted file mode 100755
index 43ec872c5..000000000
Binary files a/astrid/res/drawable-hdpi/custom_tab_indicator_unselected.9.png and /dev/null differ
diff --git a/astrid/res/drawable/custom_tab_indicator.xml b/astrid/res/drawable/custom_tab_indicator.xml
index e71b9c3c1..709b7829f 100755
--- a/astrid/res/drawable/custom_tab_indicator.xml
+++ b/astrid/res/drawable/custom_tab_indicator.xml
@@ -15,20 +15,13 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+
     <!-- Non focused states -->
-    <item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected_pressed" />
+    <item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected" />
     <item android:state_focused="false" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected" />
 
     <!-- Focused states -->
     <item android:state_focused="true" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected_focused" />
-    <item android:state_focused="true" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected" />
-
-    <!-- Pressed -->
-    <!--    Non focused states -->
-    <item android:state_focused="false" android:state_selected="false" android:state_pressed="true" android:drawable="@drawable/custom_tab_indicator_unselected" />
-    <item android:state_focused="false" android:state_selected="true"  android:state_pressed="true" android:drawable="@drawable/custom_tab_indicator_selected" />
+    <item android:state_focused="true" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected_focused" />
 
-    <!--    Focused states -->
-    <item android:state_focused="true" android:state_selected="false" android:state_pressed="true" android:drawable="@drawable/custom_tab_indicator_unselected" />
-    <item android:state_focused="true" android:state_selected="true"  android:state_pressed="true" android:drawable="@drawable/custom_tab_indicator_selected" />
 </selector>
diff --git a/astrid/res/drawable/custom_tab_indicator_dark.xml b/astrid/res/drawable/custom_tab_indicator_dark.xml
new file mode 100755
index 000000000..0cba346e8
--- /dev/null
+++ b/astrid/res/drawable/custom_tab_indicator_dark.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Non focused states -->
+    <item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_unselected" />
+    <item android:state_focused="false" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_selected" />
+
+    <!-- Focused states -->
+    <item android:state_focused="true" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_unselected_focused" />
+    <item android:state_focused="true" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_selected_focused" />
+
+</selector>
diff --git a/astrid/res/drawable/custom_tab_indicator_dark_selected.9.png b/astrid/res/drawable/custom_tab_indicator_dark_selected.9.png
new file mode 100644
index 000000000..4dd0f9bbb
Binary files /dev/null and b/astrid/res/drawable/custom_tab_indicator_dark_selected.9.png differ
diff --git a/astrid/res/drawable-hdpi/custom_tab_indicator_unselected_pressed.9.png b/astrid/res/drawable/custom_tab_indicator_dark_selected_focused.9.png
old mode 100755
new mode 100644
similarity index 92%
rename from astrid/res/drawable-hdpi/custom_tab_indicator_unselected_pressed.9.png
rename to astrid/res/drawable/custom_tab_indicator_dark_selected_focused.9.png
index 50fbb169e..b8f9ccdcf
Binary files a/astrid/res/drawable-hdpi/custom_tab_indicator_unselected_pressed.9.png and b/astrid/res/drawable/custom_tab_indicator_dark_selected_focused.9.png differ
diff --git a/astrid/res/drawable/custom_tab_indicator_dark_unselected.9.png b/astrid/res/drawable/custom_tab_indicator_dark_unselected.9.png
new file mode 100644
index 000000000..6621e3dfa
Binary files /dev/null and b/astrid/res/drawable/custom_tab_indicator_dark_unselected.9.png differ
diff --git a/astrid/res/drawable-hdpi/custom_tab_indicator_selected_pressed.9.png b/astrid/res/drawable/custom_tab_indicator_dark_unselected_focused.9.png
old mode 100755
new mode 100644
similarity index 92%
rename from astrid/res/drawable-hdpi/custom_tab_indicator_selected_pressed.9.png
rename to astrid/res/drawable/custom_tab_indicator_dark_unselected_focused.9.png
index a0fe23105..1523e0f15
Binary files a/astrid/res/drawable-hdpi/custom_tab_indicator_selected_pressed.9.png and b/astrid/res/drawable/custom_tab_indicator_dark_unselected_focused.9.png differ
diff --git a/astrid/res/drawable-hdpi/custom_tab_indicator_selected.9.png b/astrid/res/drawable/custom_tab_indicator_selected.9.png
similarity index 100%
rename from astrid/res/drawable-hdpi/custom_tab_indicator_selected.9.png
rename to astrid/res/drawable/custom_tab_indicator_selected.9.png
diff --git a/astrid/res/drawable-hdpi/custom_tab_indicator_selected_focused.9.png b/astrid/res/drawable/custom_tab_indicator_selected_focused.9.png
similarity index 92%
rename from astrid/res/drawable-hdpi/custom_tab_indicator_selected_focused.9.png
rename to astrid/res/drawable/custom_tab_indicator_selected_focused.9.png
index 536d483ed..56bdd19b0 100755
Binary files a/astrid/res/drawable-hdpi/custom_tab_indicator_selected_focused.9.png and b/astrid/res/drawable/custom_tab_indicator_selected_focused.9.png differ
diff --git a/astrid/res/drawable/custom_tab_indicator_unselected.9.png b/astrid/res/drawable/custom_tab_indicator_unselected.9.png
new file mode 100755
index 000000000..b08250f56
Binary files /dev/null and b/astrid/res/drawable/custom_tab_indicator_unselected.9.png differ
diff --git a/astrid/res/drawable-hdpi/custom_tab_indicator_unselected_focused.9.png b/astrid/res/drawable/custom_tab_indicator_unselected_focused.9.png
similarity index 92%
rename from astrid/res/drawable-hdpi/custom_tab_indicator_unselected_focused.9.png
rename to astrid/res/drawable/custom_tab_indicator_unselected_focused.9.png
index 50fbb169e..24da9420b 100755
Binary files a/astrid/res/drawable-hdpi/custom_tab_indicator_unselected_focused.9.png and b/astrid/res/drawable/custom_tab_indicator_unselected_focused.9.png differ
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index 0b18e0a97..2998e0f68 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="3dip"
                 android:gravity="center_vertical"
-                android:background="@drawable/task_edit_background"
+                style="@style/EditRow"
                 android:orientation="horizontal"
                 android:paddingRight="6dip" >
                 
@@ -58,7 +58,7 @@
                 android:layout_height="fill_parent"
                 android:layout_margin="3dip"
                 android:layout_marginTop="10dip"
-                android:background="@drawable/task_edit_background"
+                style="@style/EditRow"
                 android:orientation="vertical" >
             </LinearLayout>
 
@@ -67,7 +67,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:orientation="vertical"
-                android:background="@drawable/task_edit_background"
+                style="@style/EditRow"
                 android:visibility="gone" >
 -                 
 
@@ -88,7 +88,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="3dip"
                 android:layout_marginBottom="0dip"
-                android:background="@drawable/task_edit_background"
+                style="@style/EditRow"
                 android:orientation="vertical"
                 android:visibility="gone">
                 
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index d666a9827..cb5186cf8 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -5,6 +5,7 @@
   <attr name="asContentBackground" format="reference"/>
   <attr name="asEditBackground" format="color"/>
   <attr name="asEditRowBackground" format="reference"/>
+  <attr name="asEditTabBackground" format="reference"/>
   <attr name="asHeaderBackground" format="reference"/>
   <attr name="asHeaderButtonBackground" format="reference"/>
   <attr name="asTextColor" format="color"/>
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index b209e0b48..7c7526f82 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -23,8 +23,9 @@
         <item name="asMicButtonImg">@drawable/mic_button_gray</item>
         <item name="asCameraButtonImg">@drawable/camera_button_gray</item>
         <item name="asListsDisclosure">@drawable/lists_disclosure_gray</item>
-        <item name="asEditBackground">#272327</item>
+        <item name="asEditBackground">#171317</item>
         <item name="asEditRowBackground">@drawable/task_edit_background</item>
+        <item name="asEditTabBackground">@drawable/custom_tab_indicator_dark</item>
         <!-- actionbar-styling -->
         <item name="abBackground">@drawable/header_background</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
@@ -74,6 +75,7 @@
         <item name="asCameraButtonImg">@drawable/camera_button_red</item>
         <item name="asListsDisclosure">@drawable/lists_disclosure_red</item>
         <item name="asEditRowBackground">@drawable/task_edit_background_white</item>
+        <item name="asEditTabBackground">@drawable/custom_tab_indicator</item>
         <!-- actionbar-styling -->
         <item name="abBackground">@android:color/white</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
@@ -344,10 +346,11 @@
     </style> 
     
     <style name="CustomTabPageIndicator" parent="Widget.TabPageIndicator">
-        <item name="android:background">@drawable/custom_tab_indicator</item>
+        <item name="android:background">?attr/asEditTabBackground</item>
+        <item name="android:textColor">#FFFF00FF</item>
     </style>
     <style name="CustomTabPageIndicator.Text" parent="Widget.TabPageIndicator.Text">
-        <item name="android:textColor">#FF555555</item>
+        <item name="android:textColor">#FF00FF00</item>
         <item name="android:textSize">15sp</item>
         <item name="android:textStyle">bold</item>
         <item name="android:layout_marginLeft">5dip</item>