--- modules/toolbar/toolbar.css	2009-07-10 18:21:44.000000000 +1200
+++ modules/toolbar/toolbar.css	2009-07-10 18:57:54.000000000 +1200
@@ -49,7 +49,7 @@ div#toolbar div.shadow {
   right: 0;
   bottom: -15px;
   height: 15px;
-  background: url(toolbar.png) 0 -85px repeat-x;
+  background: url(toolbar.png) 0 -325px repeat-x;
 }
 
 div#toolbar a {
@@ -67,7 +67,7 @@ div#toolbar ul li a {
  */
 div#toolbar div.toolbar-menu {
   background: url(toolbar.png) 0 -20px repeat-x;
-  height: 25px;
+  min-height: 25px;
   line-height: 20px;
   padding: 5px 10px 0;
   overflow: hidden;
@@ -75,20 +75,16 @@ div#toolbar div.toolbar-menu {
 }
 
 div#toolbar div.toolbar-menu #toolbar-user {
-  position: absolute;
-  right: 35px;
-}
-
-div#toolbar div.toolbar-menu #toolbar-menu {
-  position: absolute;
-  left: 10px;
+  float: right;
+  margin-right: 35px;
 }
 
 div#toolbar div.toolbar-menu span.toggle {
   position: absolute;
   right: 10px;
+  bottom: 0;
   cursor: pointer;
-  background: url(toolbar.png) 0 -60px no-repeat;
+  background: url(toolbar.png) 0 -95px no-repeat;
   text-indent: -9999px;
   overflow: hidden;
   width: 25px;
@@ -96,13 +92,15 @@ div#toolbar div.toolbar-menu span.toggle
 }
 
 div#toolbar div.toolbar-menu span.toggle-active {
-  background-position:  -25px -60px;
+  background-position:  -25px -95px;
 }
 
 div#toolbar div.toolbar-menu ul li a {
   -moz-border-radius: 10px;
   -webkit-border-radius: 10px;
   padding: 0 10px;
+  margin-bottom: 4px;
+  white-space: nowrap;
 }
 
 div#toolbar div.toolbar-menu ul li a:hover {