diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
index c78847ad0..d187a02cf 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -98,8 +98,9 @@ public class TagSettingsActivity extends FragmentActivity {
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_TITLE);
-            actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowTitleEnabled(false);
+            actionBar.setDisplayShowCustomEnabled(true);
             actionBar.setCustomView(R.layout.header_title_view);
         }
 
@@ -448,6 +449,9 @@ public class TagSettingsActivity extends FragmentActivity {
         case MENU_SAVE_ID:
             saveSettings();
             break;
+        case android.R.id.home:
+            finish();
+            break;
         }
         return super.onOptionsItemSelected(item);
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java
index 705463b37..45be15103 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesActivity.java
@@ -2,6 +2,7 @@ package com.todoroo.astrid.actfm;
 
 import android.os.Bundle;
 import android.support.v4.app.ActionBar;
+import android.support.v4.view.MenuItem;
 import android.widget.TextView;
 
 import com.timsu.astrid.R;
@@ -17,14 +18,24 @@ public class TagUpdatesActivity extends AstridActivity {
         setContentView(R.layout.tag_updates_activity);
 
         ActionBar actionBar = getSupportActionBar();
-        actionBar.setDisplayShowHomeEnabled(false);
+        actionBar.setDisplayHomeAsUpEnabled(true);
         actionBar.setDisplayShowTitleEnabled(false);
 
-        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+        actionBar.setDisplayShowCustomEnabled(true);
         actionBar.setCustomView(R.layout.header_title_view);
         ((TextView) actionBar.getCustomView().findViewById(R.id.title)).setText(R.string.TAd_contextEditTask);
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch(item.getItemId()) {
+        case android.R.id.home:
+            finish();
+            break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     @Override
     public void finish() {
         super.finish();
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index cdb5b4e54..22f933003 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -35,7 +35,7 @@
         <!-- actionbar-styling -->
         <item name="abBackground">@drawable/header_blue</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
-        <item name="abLogo">@drawable/icon_48</item>
+        <item name="abLogo">?attr/asMainMenu</item>
         <item name="vpiTabPageIndicatorStyle">@style/CustomTabPageIndicator</item>
         <item name="vpiTabTextStyle">@style/CustomTabPageIndicator.Text</item>
     </style>
@@ -78,7 +78,7 @@
         <!-- actionbar-styling -->
         <item name="abBackground">@drawable/header_red</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
-        <item name="abLogo">@drawable/icon_48</item>
+        <item name="abLogo">?attr/asMainMenu</item>
     </style>
     
     <style name="Theme.TransparentWhite" parent="Theme.White">
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index 7c73b2f8e..f40c0a308 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -24,10 +24,10 @@ public class TaskEditActivity extends AstridActivity {
 		    setContentView(R.layout.task_edit_wrapper_activity);
 
 		ActionBar actionBar = getSupportActionBar();
-		actionBar.setDisplayShowHomeEnabled(false);
+		actionBar.setDisplayHomeAsUpEnabled(true);
 		actionBar.setDisplayShowTitleEnabled(false);
 
-		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+		actionBar.setDisplayShowCustomEnabled(true);
 		actionBar.setCustomView(R.layout.header_title_view);
 		((TextView) actionBar.getCustomView().findViewById(R.id.title)).setText(R.string.TAd_contextEditTask);
 	}