diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.properties b/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.properties
index f31042b63fb..dd968a731d3 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.properties
+++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.properties
@@ -69,6 +69,9 @@ activities.category.terminals.description=Use the terminal to connect to remote
 activities.activity.terminals.views.name=Terminal Views
 activities.activity.terminals.views.description=Terminal related views.
 
+activities.activity.terminals.maintoolbar.name=Terminal Main Toolbar
+activities.activity.terminals.maintoolbar.description=Terminal main toolbar buttons.
+
 # ----- Preference Pages -----
 
 preference.page.name=Local Terminal
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml
index b4c5e77f1f1..fcaa0db55bf 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml
+++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml
@@ -457,11 +457,7 @@
       </activityPatternBinding>
       <activityPatternBinding
             activityId="org.eclipse.tm.terminal.view.ui.activity.views"
-            pattern="org\.eclipse\.tm\.terminal\.view\.ui/org\.eclipse\.tm\.terminal\.view\.ui\.toolbar">
-      </activityPatternBinding>
-      <activityPatternBinding
-            activityId="org.eclipse.tm.terminal.view.ui.activity.views"
-            pattern="org\.eclipse\.tm\.terminal\.view\.ui/org\.eclipse\.tm\.terminal\.view\.ui\.commands\..*">
+            pattern="org\.eclipse\.tm\.terminal\.view\.ui/org\.eclipse\.tm\.terminal\.view\.ui\.commands\.^(?!org\.eclipse\.tm\.terminal\.view\.ui\.commands\.launchToolbar).*">
       </activityPatternBinding>
       
       <categoryActivityBinding
@@ -492,6 +488,37 @@
       </categoryActivityBinding>
       -->
    </extension>
+   <extension point="org.eclipse.ui.activities">
+      <category
+            description="%activities.category.terminals.description"
+            id="org.eclipse.tm.terminal.view.ui.category"
+            name="%activities.category.terminals.name">
+      </category>
+
+      <activity
+            description="%activities.activity.terminals.maintoolbar.description"
+            id="org.eclipse.tm.terminal.view.ui.activity.maintoolbar"
+            name="%activities.activity.terminals.maintoolbar.name">
+      </activity>
+
+      <activityPatternBinding
+            activityId="org.eclipse.tm.terminal.view.ui.activity.maintoolbar"
+            pattern="org\.eclipse\.tm\.terminal\.view\.ui/org\.eclipse\.tm\.terminal\.view\.ui\.toolbar">
+      </activityPatternBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.tm.terminal.view.ui.activity.maintoolbar"
+            pattern="org\.eclipse\.tm\.terminal\.view\.ui/org\.eclipse\.tm\.terminal\.view\.ui\.commands\.launchToolbar">
+      </activityPatternBinding>
+
+      <categoryActivityBinding
+            activityId="org.eclipse.tm.terminal.view.ui.activity.maintoolbar"
+            categoryId="org.eclipse.tm.terminal.view.ui.category">
+      </categoryActivityBinding>
+
+      <defaultEnablement
+            id="org.eclipse.tm.terminal.view.ui.activity.maintoolbar">
+      </defaultEnablement>
+   </extension>
 
    <extension point="org.eclipse.ui.contexts">
       <context