Index: skins/colibri/src/main/resources/colibri/colibri.css
===================================================================
--- skins/colibri/src/main/resources/colibri/colibri.css	(revision 23256)
+++ skins/colibri/src/main/resources/colibri/colibri.css	(working copy)
@@ -1450,7 +1450,6 @@
     height: 20px;
     float: left;
     margin-right: -1px;
-    text-align: center;
     line-height: 20px;
     font-size: 0.9em;
     font-weight: bold;
@@ -1473,16 +1472,12 @@
 .rightmenu {
     position: absolute;
     right: 0;
-    margin-right: 25px;
+    margin-right: 0px;
 }
 
-#actionmenu .leftmenu #tmDoc {
-    width: 20px;
-}
-
 .leftmenu {
     position: absolute;
-    left: 25px;
+    left: 15px;
 }
 
 .topmenuentry {
@@ -1490,10 +1485,6 @@
     float: left;
 }
 
-.rightmenu .topmenuentry {
-    float: right;
-}
-
 .submenu {
     display: block;
     width: 12em;
@@ -1521,9 +1512,8 @@
     text-align: left;
 }
 
-#actionmenu .submenuitem a:hover {
+#actionmenu .submenuitem a:hover, #actionmenu  a:hover {
     text-decoration: underline;
-    background-image: none;
 }
 
 /* @end */
@@ -3569,19 +3559,12 @@
 /**********************************************************************************************/
 /** Menu **/
 
-#actionmenu div.leftmenu div:hover a,
-    #actionmenu a:hover {
-  background: none;
-}
-
 .submenu {
   background: $theme.menuBackgroundColor;
-  border: 0;
 }
 
 #actionmenu {
   background: $theme.menuBackgroundColor;
-  border: 0;
   min-width: 970px;
 }
 
@@ -3590,7 +3573,6 @@
 }
 
 #actionmenu a {
-  border: 0;
   color: $theme.menuLinkColor;
   width: auto;
 }
@@ -3611,29 +3593,11 @@
   color: $theme.menuSelectedEntryLinkColor;
 }
 
-.leftmenu {
-  left:5px;
-  margin-left:10px;
-}
-
-.rightmenu {
-  margin-right: 0px;
-}
-
-#actionmenu .leftmenu a {
+#actionmenu a {
   padding:0 20px 0 5px;
   color: $theme.menuLinkColor;
 }
 
-#actionmenu .rightmenu a {
-  width: auto;
-  padding:0 20px 0 5px;
-}
-
-#actionmenu .rightmenu .submenuitem a {
-  text-align: right;
-}
-
 /**********************************************************************************************/
 /** Data Content **/
 
Index: skins/colibri/src/main/resources/colibri/menuview.vm
===================================================================
--- skins/colibri/src/main/resources/colibri/menuview.vm	(revision 23256)
+++ skins/colibri/src/main/resources/colibri/menuview.vm	(working copy)
@@ -3,30 +3,6 @@
 <strong id="xwikimenutitle" class="hidden">$msg.get('menu')</strong>
 <div class="rightmenu">
 ##
-## User specific links
-#if(!$context.action.startsWith('login'))
-  #if($isGuest)
-    #set($loginurl = $xwiki.getURL('XWiki.XWikiLogin', 'login', "xredirect=$util.encodeURI($xwiki.getRequestURL())"))
-    #xwikitopmenuentry($!loginurl $!msg.get('login') 'tmLogin')
-  #else
-    #set($logouturl = $xwiki.getURL('XWiki.XWikiLogout', 'logout', "xredirect=$util.encodeURI($xwiki.getRequestURL())"))
-    #xwikitopmenuentry($!logouturl $!msg.get('logout') 'tmLogout')
-  #end
-#end
-#if($isGuest && $xwiki.hasAccessLevel('register', 'XWiki.XWikiPreferences'))
-  #set($regurl = $xwiki.getURL('XWiki.Register', 'register'))
-  #xwikitopmenuentry($!regurl $!msg.get('core.register') 'tmRegister')
-#end
-##
-##
-#if (!$isGuest)
-#if ($context.user == 'XWiki.superadmin')
-      #xwikitopmenuentry('#' $!msg.get('superadmin') 'tmUser')
-#else
-      #xwikitopmenuentry($xwiki.getURL($context.user, 'view') $!xwiki.getUserName($context.user, false) 'tmUser')
-#end
-#end
-##
 ## Administration
 #set ($hasAdminSpaceRights = $xwiki.hasAccessLevel('admin', "${doc.space}.XWikiPreferences"))
 #set ($hasAdminWikiRights = $xwiki.hasAccessLevel('admin', 'XWiki.XWikiPreferences'))
@@ -50,6 +26,30 @@
     #end
   #end
 #end
+##
+#if (!$isGuest)
+#if ($context.user == 'XWiki.superadmin')
+      #xwikitopmenuentry('#' $!msg.get('superadmin') 'tmUser')
+#else
+      #xwikitopmenuentry($xwiki.getURL($context.user, 'view') $!xwiki.getUserName($context.user, false) 'tmUser')
+#end
+#end
+##
+## User specific links
+#if($isGuest && $xwiki.hasAccessLevel('register', 'XWiki.XWikiPreferences'))
+  #set($regurl = $xwiki.getURL('XWiki.Register', 'register'))
+  #xwikitopmenuentry($!regurl $!msg.get('core.register') 'tmRegister')
+#end
+#if(!$context.action.startsWith('login'))
+  #if($isGuest)
+    #set($loginurl = $xwiki.getURL('XWiki.XWikiLogin', 'login', "xredirect=$util.encodeURI($xwiki.getRequestURL())"))
+    #xwikitopmenuentry($!loginurl $!msg.get('login') 'tmLogin')
+  #else
+    #set($logouturl = $xwiki.getURL('XWiki.XWikiLogout', 'logout', "xredirect=$util.encodeURI($xwiki.getRequestURL())"))
+    #xwikitopmenuentry($!logouturl $!msg.get('logout') 'tmLogout')
+  #end
+#end
+##
 </div>
 <div class="leftmenu">
 ##