diff --git a/Modules/RefsViews/Branches/BranchesView.cpp b/Modules/RefsViews/Branches/BranchesView.cpp
index cc65be45..a5ba4108 100644
--- a/Modules/RefsViews/Branches/BranchesView.cpp
+++ b/Modules/RefsViews/Branches/BranchesView.cpp
@@ -51,7 +51,7 @@ BranchesView::BranchesView()
     setupActions( this );
 
     setViewName( tr( "References" ) );
-    setToolBar( tbBranchesTB );
+    setToolBar( tbRefsViewTB );
     setWidget( mTree );
 
     setFlags( ConsumesContexts | DataPerContext );
@@ -87,14 +87,28 @@ void BranchesView::showContextMenu(const QModelIndex& index, const QPoint& globa
         return;
     }
 
-    Heaven::Menu* menu = 0;
-    if (item->type() == RefItem::Branch) {
-        menu = menuCtxMenuRefsView;
-        //menu->setActivationContext( item );
+    Heaven::Menu* menu = nullptr;
+    switch (item->type()) {
+    case RefItem::Branch:
+        menu = menuMnuBranch;
+        break;
+
+    case RefItem::Remote:
+        menu = menuMnuRemote;
+        break;
+
+    case RefItem::Tag:
+        menu = menuMnuTag;
+        break;
+
+    default:
+        break;
     }
 
-    if ( menu )
+    if ( menu ) {
+        //menu->setActivationContext( item );
         menu->showPopup( globalPos );
+    }
 }
 
 void BranchesView::onCheckoutRef()
diff --git a/Modules/RefsViews/Branches/BranchesViewActions.hid b/Modules/RefsViews/Branches/BranchesViewActions.hid
index 4f287f63..8d313ad3 100644
--- a/Modules/RefsViews/Branches/BranchesViewActions.hid
+++ b/Modules/RefsViews/Branches/BranchesViewActions.hid
@@ -34,14 +34,63 @@ Ui BranchesViewActions {
         ConnectTo       onRenameRef();
     };
 
-    ToolBar BranchesTB {
-        // placeholder for the real toolbar
+    ToolBar RefsViewTB {
+        Action ShowLocalBranches {
+            Text        "Branches";
+            ConnectTo   onShowBranches();
+            Checkable   true;
+            Checked     true;
+        };
+        Action ShowRemotes {
+            Text        "Remotes";
+            ConnectTo   onShowRemotes();
+            Checkable   true;
+            Checked     true;
+        };
+        Action ShowTags {
+            Text        "Tags";
+            ConnectTo   onShowTags();
+            Checkable   true;
+            Checked     true;
+        };
     };
 
-    Menu CtxMenuRefsView {
+    Menu MnuBranch {
         Action      CheckoutRef;
         Action      RenameRef;
         Separator;
+
+        MergePlace  FetchMP;
+        MergePlace  PushMP;
+        Separator;
+
+        Action      RemoveRef;
+    };
+
+    Menu MnuRemote {
+        Action      RenameRef;
+        Separator;
+
+        MergePlace  FetchThisMP;
+        Separator;
+
+        Action      RemoveRef;
+    };
+
+    Menu MnuRemoteBranch {
+        Action      CheckoutRef;
+        Separator;
+
+        MergePlace  FetchThisMP;
+        Separator;
+
+        Action      RemoveRef;
+    };
+
+    Menu MnuTag {
+        Action      CheckoutRef;
+        Separator;
+
         Action      RemoveRef;
     };