diff --git a/astrid/res/drawable/custom_tab_indicator_alt.xml b/astrid/res/drawable/custom_tab_indicator_alt.xml
new file mode 100644
index 000000000..f8f0fa5f6
--- /dev/null
+++ b/astrid/res/drawable/custom_tab_indicator_alt.xml
@@ -0,0 +1,27 @@
+<?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_unselected_alt" />
+    <item android:state_focused="false" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected_alt" />
+
+    <!-- Focused states -->
+    <item android:state_focused="true" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected_focused_alt" />
+    <item android:state_focused="true" android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected_focused_alt" />
+
+</selector>
diff --git a/astrid/res/drawable/custom_tab_indicator_selected_alt.9.png b/astrid/res/drawable/custom_tab_indicator_selected_alt.9.png
new file mode 100644
index 000000000..0a1dc8e86
Binary files /dev/null and b/astrid/res/drawable/custom_tab_indicator_selected_alt.9.png differ
diff --git a/astrid/res/drawable/custom_tab_indicator_selected_focused_alt.9.png b/astrid/res/drawable/custom_tab_indicator_selected_focused_alt.9.png
new file mode 100644
index 000000000..657df6674
Binary files /dev/null and b/astrid/res/drawable/custom_tab_indicator_selected_focused_alt.9.png differ
diff --git a/astrid/res/drawable/custom_tab_indicator_unselected_alt.9.png b/astrid/res/drawable/custom_tab_indicator_unselected_alt.9.png
new file mode 100644
index 000000000..e98bd9329
Binary files /dev/null and b/astrid/res/drawable/custom_tab_indicator_unselected_alt.9.png differ
diff --git a/astrid/res/drawable/custom_tab_indicator_unselected_focused_alt.9.png b/astrid/res/drawable/custom_tab_indicator_unselected_focused_alt.9.png
new file mode 100644
index 000000000..bb2088c74
Binary files /dev/null and b/astrid/res/drawable/custom_tab_indicator_unselected_focused_alt.9.png differ
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 23b3f825d..4adfd5870 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -144,6 +144,7 @@
         <item name="asFilledCommentButtonImg">@drawable/comment_blue_filled_alt</item>
         <item name="asMainMenu">@drawable/menu_button_blue_alt</item>
         <item name="asListsDisclosure">@drawable/lists_disclosure_blue_alt</item>
+        <item name="asEditTabBackground">@drawable/custom_tab_indicator_alt</item>
         <item name="asThemeTextColor">@color/blue_theme_color</item>
         <item name="abLogo">@drawable/home_button_blue_alt</item>
         <item name="abBackground">@drawable/header_blue_alt</item>
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index 2cee290cd..abdbaa3bf 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -1208,7 +1208,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
             item = menu.add(Menu.NONE, MENU_COMMENTS_REFRESH_ID, Menu.NONE,
                     R.string.ENA_refresh_comments);
             item.setIcon(R.drawable.icn_menu_refresh_dark);
-        } else {
+        } else if (wouldShowComments && !showEditComments) {
             item = menu.add(Menu.NONE, MENU_SHOW_COMMENTS_ID, Menu.NONE, R.string.TEA_menu_comments);
             item.setIcon(commentIcon);
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);