diff --git a/astrid/res/drawable/lists_disclosure_blue.xml b/astrid/res/drawable/lists_disclosure_blue.xml
new file mode 100644
index 000000000..2c8a4d6ec
--- /dev/null
+++ b/astrid/res/drawable/lists_disclosure_blue.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_selected="false" android:drawable="@drawable/lists_disclosure_blue_off"/>
+    <item android:state_selected="true" android:drawable="@drawable/lists_disclosure_blue_on"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/lists_disclosure_gray.png b/astrid/res/drawable/lists_disclosure_blue_off.png
similarity index 94%
rename from astrid/res/drawable/lists_disclosure_gray.png
rename to astrid/res/drawable/lists_disclosure_blue_off.png
index 7d9674aba..c672dd388 100644
Binary files a/astrid/res/drawable/lists_disclosure_gray.png and b/astrid/res/drawable/lists_disclosure_blue_off.png differ
diff --git a/astrid/res/drawable/lists_disclosure_blue_on.png b/astrid/res/drawable/lists_disclosure_blue_on.png
new file mode 100644
index 000000000..f5753d10a
Binary files /dev/null and b/astrid/res/drawable/lists_disclosure_blue_on.png differ
diff --git a/astrid/res/drawable/lists_disclosure_red.xml b/astrid/res/drawable/lists_disclosure_red.xml
new file mode 100644
index 000000000..42d6033c4
--- /dev/null
+++ b/astrid/res/drawable/lists_disclosure_red.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_selected="false" android:drawable="@drawable/lists_disclosure_red_off"/>
+    <item android:state_selected="true" android:drawable="@drawable/lists_disclosure_red_on"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/lists_disclosure_red.png b/astrid/res/drawable/lists_disclosure_red_off.png
similarity index 100%
rename from astrid/res/drawable/lists_disclosure_red.png
rename to astrid/res/drawable/lists_disclosure_red_off.png
diff --git a/astrid/res/drawable/lists_disclosure_white.png b/astrid/res/drawable/lists_disclosure_red_on.png
similarity index 100%
rename from astrid/res/drawable/lists_disclosure_white.png
rename to astrid/res/drawable/lists_disclosure_red_on.png
diff --git a/astrid/res/drawable/menu_button_blue.xml b/astrid/res/drawable/menu_button_blue.xml
new file mode 100644
index 000000000..c3c0837c1
--- /dev/null
+++ b/astrid/res/drawable/menu_button_blue.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_selected="false" android:drawable="@drawable/menu_button_blue_off"/>
+    <item android:state_selected="true" android:drawable="@drawable/menu_button_blue_on"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/menu_button_blue_off.png b/astrid/res/drawable/menu_button_blue_off.png
new file mode 100644
index 000000000..dcacc121b
Binary files /dev/null and b/astrid/res/drawable/menu_button_blue_off.png differ
diff --git a/astrid/res/drawable/menu_button_blue_on.png b/astrid/res/drawable/menu_button_blue_on.png
new file mode 100644
index 000000000..61775f825
Binary files /dev/null and b/astrid/res/drawable/menu_button_blue_on.png differ
diff --git a/astrid/res/drawable/menu_button_red.xml b/astrid/res/drawable/menu_button_red.xml
new file mode 100644
index 000000000..035efd291
--- /dev/null
+++ b/astrid/res/drawable/menu_button_red.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_selected="false" android:drawable="@drawable/menu_button_red_off"/>
+    <item android:state_selected="true" android:drawable="@drawable/menu_button_red_on"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/menu_button_red_off.png b/astrid/res/drawable/menu_button_red_off.png
new file mode 100644
index 000000000..b3cac75dc
Binary files /dev/null and b/astrid/res/drawable/menu_button_red_off.png differ
diff --git a/astrid/res/drawable/menu_button_red_on.png b/astrid/res/drawable/menu_button_red_on.png
new file mode 100644
index 000000000..640b27b20
Binary files /dev/null and b/astrid/res/drawable/menu_button_red_on.png differ
diff --git a/astrid/res/drawable/menu.png b/astrid/res/drawable/plus_button_blue.png
similarity index 93%
rename from astrid/res/drawable/menu.png
rename to astrid/res/drawable/plus_button_blue.png
index 322034549..5edfff928 100644
Binary files a/astrid/res/drawable/menu.png and b/astrid/res/drawable/plus_button_blue.png differ
diff --git a/astrid/res/layout-land/filter_list_activity.xml b/astrid/res/layout-land/filter_list_activity.xml
index e06640db0..5f7b3661b 100644
--- a/astrid/res/layout-land/filter_list_activity.xml
+++ b/astrid/res/layout-land/filter_list_activity.xml
@@ -10,22 +10,31 @@
     <!-- List -->
     <ListView android:id="@android:id/list"
         android:layout_width="fill_parent"
-        android:layout_height="200dip"
+        android:layout_height="180dip"
         android:layout_alignParentTop="true"
         android:scrollbars="vertical"
         android:divider="@android:color/transparent"
         android:cacheColorHint="#00000000"/>
     
+    <include layout="@layout/fla_separator"/>
+
     <!-- Footer -->
     <LinearLayout
         android:id="@+id/lists_footer"
         android:layout_width="fill_parent" 
         android:layout_height="50dip"
-        android:orientation="vertical"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
         android:layout_alignParentBottom="true">
-
-        <include layout="@layout/fla_separator"/>
         
+        <ImageView
+            android:layout_width="39dip"
+            android:layout_height="39dip"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="8dip"
+            android:src="?attr/asAddButtonImg"
+            android:scaleType="fitCenter"/>
+            
         <TextView
             android:id="@+id/new_list_button"
             android:layout_width="fill_parent"
diff --git a/astrid/res/layout/filter_list_activity.xml b/astrid/res/layout/filter_list_activity.xml
index 1fcb5e822..9dde8be81 100644
--- a/astrid/res/layout/filter_list_activity.xml
+++ b/astrid/res/layout/filter_list_activity.xml
@@ -3,29 +3,38 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent" 
     android:layout_height="wrap_content"
-    android:background="#eeffffff"
+    android:background="@drawable/list_popover_bg"
     android:orientation="vertical">
 
 
     <!-- List -->
     <ListView android:id="@android:id/list"
         android:layout_width="fill_parent"
-        android:layout_height="300dip"
+        android:layout_height="320dip"
         android:layout_alignParentTop="true"
         android:scrollbars="vertical"
         android:divider="@android:color/transparent"
         android:cacheColorHint="#00000000"/>
     
+    <include layout="@layout/fla_separator"/>
+
     <!-- Footer -->
     <LinearLayout
         android:id="@+id/lists_footer"
         android:layout_width="fill_parent" 
         android:layout_height="50dip"
-        android:orientation="vertical"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
         android:layout_alignParentBottom="true">
         
-        <include layout="@layout/fla_separator"/>
-        
+        <ImageView
+            android:layout_width="39dip"
+            android:layout_height="39dip"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="8dip"
+            android:src="?attr/asAddButtonImg"
+            android:scaleType="fitCenter"/>
+            
         <TextView
 		    android:id="@+id/new_list_button"
 		    android:layout_width="fill_parent"
diff --git a/astrid/res/layout/header_nav_views.xml b/astrid/res/layout/header_nav_views.xml
index eb2cb7e66..da88e5cf6 100644
--- a/astrid/res/layout/header_nav_views.xml
+++ b/astrid/res/layout/header_nav_views.xml
@@ -7,9 +7,8 @@
     <ImageView
         android:id="@+id/main_menu"
         android:layout_width="51dip"
-        android:padding="10dip"
         android:layout_height="fill_parent"
-        android:src="@drawable/menu"
+        android:src="?attr/asMainMenu"
         android:scaleType="fitCenter"/>
         
         
@@ -41,7 +40,7 @@
 	        android:layout_marginLeft="10dip" 
 	        android:layout_toRightOf="@id/list_title"
 	        android:layout_alignBottom="@id/list_title"
-	        android:src="@drawable/lists_disclosure_red"
+	        android:src="?attr/asListsDisclosure"
 	        android:scaleType="fitCenter"/>
 	
 	</RelativeLayout>
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index 550fd8278..93f0fd849 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -20,12 +20,12 @@
   <attr name="asSeparatorBackground" format="color"/>
   
   <attr name="asThemeTextColor" format="color"/>
-  
+  <attr name="asListsDisclosure" format="reference"/>
   <attr name="asAddButtonImg" format="reference" />
   <attr name="asMicButtonImg" format="reference" />
   <attr name="asCameraButtonImg" format="reference" />
-  <attr name="asMainMenuOn" format="reference" />
-  <attr name="asMainMenuOff" format="reference" />
+  
+  <attr name="asMainMenu" format="reference" />
 
   <declare-styleable name="ContactsAutoComplete">
     <attr name="allowMultiple" format="boolean"/>
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index cbbbe8587..80a6b63e1 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -19,15 +19,15 @@
         <item name="asFilterHeaderBackground">@drawable/edit_titlebar</item>
         <item name="asMembersHeaderBackground">@drawable/ios_fabric_480_dark</item>
         <item name="asSeparatorBackground">#888888</item>
-        <item name="asAddButtonImg">@drawable/plus_button_red</item>
+        <item name="asAddButtonImg">@drawable/plus_button_blue</item>
         <item name="asMicButtonImg">@drawable/mic_button_gray</item>
         <item name="asCameraButtonImg">@drawable/camera_button_gray</item>
         <item name="asEditBackground">#171317</item>
         <item name="asEditRowBackground">@drawable/task_edit_background</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator_dark</item>
-        <item name="asMainMenuOn">@drawable/menu</item>
-        <item name="asMainMenuOff">@drawable/menu</item>
+        <item name="asMainMenu">@drawable/menu_button_blue</item>
         <item name="asThemeTextColor">@color/blue_theme_color</item>
+        <item name="asListsDisclosure">@drawable/lists_disclosure_blue</item>
         <!-- actionbar-styling -->
         <item name="abBackground">@android:color/black</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
@@ -76,9 +76,9 @@
         <item name="asCameraButtonImg">@drawable/camera_button_red</item>
         <item name="asEditRowBackground">@drawable/task_edit_background_white</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator</item>
-        <item name="asMainMenuOn">@drawable/menu</item>
-        <item name="asMainMenuOff">@drawable/menu</item>
+        <item name="asMainMenu">@drawable/menu_button_red</item>
         <item name="asThemeTextColor">@color/red_theme_color</item>
+        <item name="asListsDisclosure">@drawable/lists_disclosure_red</item>
         <!-- actionbar-styling -->
         <item name="abBackground">@android:color/white</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
@@ -186,7 +186,7 @@
    	</style>
    	
    	<style name="TextAppearance.ActionBar_ListsHeader.Selected">   	    
-   	    <item name="android:textColor">@android:color/white</item>
+   	    <item name="android:textColor">?attr/asContentBackground</item>
    	</style>
    	
     <!--================================================== Custom Dialogs == -->
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
index 1b4fe65b8..fd4e2ae25 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
@@ -45,7 +45,7 @@ public class TaskListWrapperActivity extends AstridWrapperActivity implements Ma
     private final OnClickListener mainMenuClickListener = new OnClickListener() {
         @Override
         public void onClick(View v) {
-            setMainMenuSelected(true);
+            mainMenu.setSelected(true);
             mainMenuPopover.show(v);
         }
     };
@@ -159,7 +159,7 @@ public class TaskListWrapperActivity extends AstridWrapperActivity implements Ma
         mainMenuPopover.setOnDismissListener(new OnDismissListener() {
             @Override
             public void onDismiss() {
-                setMainMenuSelected(false);
+                mainMenu.setSelected(false);
             }
         });
     }
@@ -204,19 +204,12 @@ public class TaskListWrapperActivity extends AstridWrapperActivity implements Ma
 	private void setListsDropdownSelected(boolean selected) {
 	    int oldTextColor = lists.getTextColors().getDefaultColor();
 	    int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected : R.style.TextAppearance_ActionBar_ListsHeader);
+
+	    TypedValue listDisclosure = new TypedValue();
+	    getTheme().resolveAttribute(R.attr.asListsDisclosure, listDisclosure, false);
 	    lists.setTextAppearance(this, textStyle);
 	    listsNav.setBackgroundColor(selected ? oldTextColor : android.R.color.transparent);
-	    listsNavDisclosure.setImageResource(selected ? R.drawable.lists_disclosure_white : R.drawable.lists_disclosure_red);
-	}
-
-	private void setMainMenuSelected(boolean selected) {
-	    TypedValue onImage = new TypedValue();
-	    TypedValue offImage = new TypedValue();
-
-	    getTheme().resolveAttribute(R.attr.asMainMenuOn, onImage, false);
-	    getTheme().resolveAttribute(R.attr.asMainMenuOff, offImage, false);
-
-	    mainMenu.setImageResource(selected ? onImage.data : offImage.data);
+	    listsNavDisclosure.setSelected(selected);
 	}
 
     @Override