diff --git a/src/com/markupartist/iglaset/activity/StartActivity.java b/src/com/markupartist/iglaset/activity/StartActivity.java
@@ -35,6 +35,7 @@
 
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
+import com.markupartist.android.widget.ActionBar;
 import com.markupartist.iglaset.IglasetApplication;
 import com.markupartist.iglaset.R;
 import com.markupartist.iglaset.provider.AuthStore;
@@ -58,6 +59,9 @@ public void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.start);
 
+        ActionBar actionBar = (ActionBar) findViewById(R.id.actionbar);
+        actionBar.setHomeLogo(R.drawable.logo_top);
+
         mSearchView = (AutoCompleteTextView) findViewById(R.id.search_text);
         mSearchView.setAdapter(new AutoCompleteSearchAdapter(this, R.layout.simple_list_row_inverted));
         mSearchView.setOnEditorActionListener(this);
@@ -317,4 +321,10 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
 
 		return false;
 	}
+
+    public static Intent createIntent(Context context) {
+        Intent intent = new Intent(context, StartActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        return intent;
+    }
 }
diff --git a/src/com/markupartist/iglaset/activity/TagActivity.java b/src/com/markupartist/iglaset/activity/TagActivity.java
@@ -5,12 +5,15 @@
 import java.util.List;
 import java.util.Map;
 
+import com.markupartist.android.widget.ActionBar;
+import com.markupartist.android.widget.ActionBar.IntentAction;
 import com.markupartist.iglaset.R;
 import com.markupartist.iglaset.provider.Tag;
 import com.markupartist.iglaset.provider.TagsStore;
 import com.markupartist.iglaset.util.ListUtils;
 import com.markupartist.iglaset.util.MultiHashMap;
 import com.markupartist.iglaset.util.StringUtils;
+import com.markupartist.iglaset.widget.SearchAction;
 import com.markupartist.iglaset.widget.SectionedAdapter;
 
 import android.app.Dialog;
@@ -66,7 +69,17 @@ public void onCreate(Bundle savedInstanceState) {
         Bundle extras = getIntent().getExtras();
 
         setContentView(R.layout.tag_list);
-        setTitle(extras.getString(EXTRA_CATEGORY_NAME));
+
+        ActionBar actionBar = (ActionBar) findViewById(R.id.actionbar);
+        actionBar.setHomeAction(new IntentAction(this, StartActivity.createIntent(this), R.drawable.ic_actionbar_home_default));
+        actionBar.setTitle(extras.getString(EXTRA_CATEGORY_NAME));
+        actionBar.addAction(new SearchAction() {
+            @Override
+            public void performAction() {
+                onSearchRequested();
+            }
+        });
+
         categoryId = extras.getInt(EXTRA_CATEGORY_ID);
 
         View tagSearchLayout = this.findViewById(R.id.tagSearchLayout);
@@ -156,7 +169,7 @@ public void onClick(View v) {
 			break;
 		}
 	}
-	
+
 	private void doSearch() {
         Intent searchIntent = new Intent(this, SearchResultActivity.class);
         searchIntent.putExtra(SearchResultActivity.EXTRA_SEARCH_CATEGORY_ID, categoryId);
@@ -171,7 +184,10 @@ private void doSearch() {
         	}
         }
 
+        TextView numSelectedView = (TextView) findViewById(R.id.tagSearchSelectedText);
+
         searchIntent.putExtra(SearchResultActivity.EXTRA_SEARCH_TAGS, checkedIds);
+        searchIntent.putExtra(SearchResultActivity.EXTRA_SEARCH_TAGS_SELECTED, numSelectedView.getText());
         startActivity(searchIntent); 
 	}
 

diff --git a/src/com/markupartist/iglaset/widget/SearchAction.java b/src/com/markupartist/iglaset/widget/SearchAction.java
@@ -0,0 +1,12 @@
+package com.markupartist.iglaset.widget;
+
+import com.markupartist.android.widget.ActionBar.AbstractAction;
+import com.markupartist.iglaset.R;
+
+public abstract class SearchAction extends AbstractAction {
+
+    public SearchAction() {
+        super(R.drawable.ic_actionbar_search_default);
+    }
+
+}