diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
index 35bdb1b9b..29ca91f80 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -199,6 +199,7 @@ public class TagSettingsActivity extends Activity {
         }
 
         refreshSettingsPage();
+        finish();
     }
 
     @SuppressWarnings("nls")
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
index b5d802a86..c5352bbb6 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
@@ -10,6 +10,7 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.AbstractModel;
@@ -21,6 +22,7 @@ import com.todoroo.andlib.sql.Functions;
 import com.todoroo.andlib.sql.Join;
 import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.QueryTemplate;
+import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.AstridFilterExposer;
 import com.todoroo.astrid.api.Filter;
@@ -69,6 +71,9 @@ public class GtasksFilterExposer extends BroadcastReceiver implements AstridFilt
                 values);
         filter.listingIcon = ((BitmapDrawable)context.getResources().getDrawable(R.drawable.gtasks_icon)).getBitmap();
         filter.customTaskList = new ComponentName(ContextManager.getContext(), GtasksListActivity.class);
+        Bundle extras = new Bundle();
+        extras.putBoolean(TaskListActivity.TOKEN_OVERRIDE_ANIM, true);
+        filter.customExtras = extras;
 
         return filter;
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
index 1eeaac56b..7dc2993a7 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -29,6 +29,7 @@ import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.actfm.TagViewActivity;
+import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.AstridFilterExposer;
 import com.todoroo.astrid.api.Filter;
@@ -95,6 +96,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
         Bundle extras = new Bundle();
         extras.putString(TagViewActivity.EXTRA_TAG_NAME, tag.tag);
         extras.putLong(TagViewActivity.EXTRA_TAG_REMOTE_ID, tag.remoteId);
+        extras.putBoolean(TaskListActivity.TOKEN_OVERRIDE_ANIM, true);
         filter.customExtras = extras;
 
         return filter;
diff --git a/astrid/res/drawable/icon_blank.png b/astrid/res/drawable/icon_blank.png
index d490f6130..2d4ba6d03 100644
Binary files a/astrid/res/drawable/icon_blank.png and b/astrid/res/drawable/icon_blank.png differ
diff --git a/astrid/res/layout/control_set_assigned.xml b/astrid/res/layout/control_set_assigned.xml
index 45cfd9342..623c2fd31 100644
--- a/astrid/res/layout/control_set_assigned.xml
+++ b/astrid/res/layout/control_set_assigned.xml
@@ -7,7 +7,8 @@
   
     <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:padding="5dip">
   		<com.todoroo.astrid.ui.ContactsAutoComplete
           android:id="@+id/assigned_custom"
           android:layout_width="fill_parent"
@@ -21,7 +22,7 @@
           android:layout_width="32dip"
           android:layout_height="32dip"
           android:layout_gravity="center"
-          android:layout_marginRight="7dip"
+          android:layout_marginRight="3dip"
           android:layout_marginLeft="4dip"
           android:gravity="center_vertical" />
     </LinearLayout>
diff --git a/astrid/res/layout/control_set_title.xml b/astrid/res/layout/control_set_title.xml
index 85fb79ed4..d70b4e7c0 100644
--- a/astrid/res/layout/control_set_title.xml
+++ b/astrid/res/layout/control_set_title.xml
@@ -35,9 +35,11 @@
 			  android:paddingTop="8dip"
 			  android:paddingBottom="8dip"
 			  android:paddingLeft="5dip"
+			  android:singleLine="false"
+			  android:scrollbars="vertical"
 			  android:text=""
 			  android:background="@android:color/transparent"
-			  android:capitalize="sentences" 
+			  android:capitalize="sentences"
 			  android:freezesText="true"/>
 		</LinearLayout>
 		<Button
diff --git a/astrid/res/layout/tag_settings_activity.xml b/astrid/res/layout/tag_settings_activity.xml
index 638eace6e..c28f4dcc5 100644
--- a/astrid/res/layout/tag_settings_activity.xml
+++ b/astrid/res/layout/tag_settings_activity.xml
@@ -148,12 +148,15 @@
             android:orientation="horizontal"
             android:baselineAligned="false">
             
-            <ImageButton
-                android:id="@+id/saveMembers"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:src="@drawable/tango_save" />
+	    <Button 
+	        android:id="@+id/saveMembers"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:layout_gravity="center"
+            style="@style/TextAppearance.TEA_action"
+            android:textStyle="bold"
+            android:text="@string/DLG_save"/>
               
     </LinearLayout>