diff --git a/rhodecode/public/css/contextbar.css b/rhodecode/public/css/contextbar.css
--- a/rhodecode/public/css/contextbar.css
+++ b/rhodecode/public/css/contextbar.css
@@ -274,8 +274,7 @@ ul#context-actions {
 #context-pages a,
 #context-pages .admin_menu a {
     display: block;
-    padding: 0px 10px 1px 30px;
-    padding-left: 30px;
+    padding: 0px 10px 1px 10px;
     line-height: 35px;
 }
 
diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css
--- a/rhodecode/public/css/style.css
+++ b/rhodecode/public/css/style.css
@@ -995,15 +995,10 @@ tbody .yui-dt-editable { cursor: pointer
 }
 
 #content div.box div.title ul.links li a {
-    border-left: 1px solid #316293;
-    color: #FFFFFF;
-    display: block;
-    float: left;
     font-size: 13px;
     font-weight: 700;
     height: 1%;
-    margin: 0;
-    padding: 11px 22px 12px;
+    margin: 4px;
     text-decoration: none;
 }
 
@@ -1741,7 +1736,7 @@ div.form div.fields div.field div.button
 
 #summary-menu-stats a {
     display: block;
-    padding: 12px 30px;
+    padding: 12px 10px;
     background-repeat: no-repeat;
     background-position: 10px 50%;
     padding-right: 10px;
@@ -4999,3 +4994,7 @@ div.comment:target>.comment-wrapp {
 #help_kb {
     display: none;
 }
+
+.repo-switcher-dropdown .select2-result-label span.repo-icons {
+    margin-left: -12px;
+}
diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html
--- a/rhodecode/templates/base/base.html
+++ b/rhodecode/templates/base/base.html
@@ -365,6 +365,7 @@
             var tmpl = '';
 
             if(obj_dict && state.type == 'repo'){
+                tmpl += '<span class="repo-icons">';
                 if(obj_dict['repo_type'] === 'hg'){
                     tmpl += '<i class="icon-hg"></i> ';
                 }
@@ -377,6 +378,7 @@
                 else if(visual_show_public_icon){
                     tmpl += '<i class="icon-unlock-alt"></i> ';
                 }
+                tmpl += '</span>';
             }
             if(obj_dict && state.type == 'group'){
                     tmpl += '<i class="icon-folder-close"></i> ';