Index: modules/toolbar/toolbar.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.css,v
retrieving revision 1.1
diff -u -p -r1.1 toolbar.css
--- modules/toolbar/toolbar.css	4 Jul 2009 05:37:30 -0000	1.1
+++ modules/toolbar/toolbar.css	12 Jul 2009 02:24:22 -0000
@@ -29,6 +29,7 @@ div#toolbar * {
  * Base styles.
  */
 div#toolbar {
+  min-width: 1000px;
   font: normal 11px/20px "Lucida Grande", Verdana, sans-serif;
   background: #666;
   color: #ccc;
@@ -49,7 +50,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 +68,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 +76,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 -300px no-repeat;
   text-indent: -9999px;
   overflow: hidden;
   width: 25px;
@@ -96,13 +93,15 @@ div#toolbar div.toolbar-menu span.toggle
 }
 
 div#toolbar div.toolbar-menu span.toggle-active {
-  background-position:  -25px -60px;
+  background-position:  -25px -300px;
 }
 
 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 {
Index: modules/toolbar/toolbar.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.module,v
retrieving revision 1.3
diff -u -p -r1.3 toolbar.module
--- modules/toolbar/toolbar.module	7 Jul 2009 07:54:35 -0000	1.3
+++ modules/toolbar/toolbar.module	12 Jul 2009 02:24:23 -0000
@@ -79,11 +79,17 @@ function toolbar_build() {
   );
 
   // Add logout & user account links
+  // Shorten the name when it is too long so it does not reduce space available for menus.
+    if (drupal_strlen($user->name) > 20) {
+      $name = drupal_substr($user->name, 0, 17) . '...';
+    } else {
+      $name = $user->name;
+    }
   $build['toolbar_user'] = array(
     '#theme' => 'links',
     '#links' => array(
       'account' => array(
-        'title' => t('Hello <strong>@username</strong>', array('@username' => $user->name)),
+        'title' => t('Hello') . '&nbsp;<strong>' . $name . '</strong>',
         'href' => 'user',
         'html' => TRUE,
       ),
Index: modules/toolbar/toolbar.png
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.png,v
retrieving revision 1.1
diff -u -p -r1.1 toolbar.png
Binary files /tmp/cvslX7yOX and toolbar.png differ