Index: modules/toolbar/toolbar.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.css,v
retrieving revision 1.2
diff -u -r1.2 toolbar.css
--- modules/toolbar/toolbar.css	29 Jul 2009 12:28:41 -0000	1.2
+++ modules/toolbar/toolbar.css	8 Sep 2009 14:30:19 -0000
@@ -76,7 +76,7 @@
 
 div#toolbar div.toolbar-menu #toolbar-user {
   position: absolute;
-  right: 35px;
+  right: 10px;
 }
 
 div#toolbar div.toolbar-menu #toolbar-menu {
@@ -84,9 +84,16 @@
   left: 10px;
 }
 
+/**
+ * Give space for the shortcuts visibility toggling element when it is added.
+ */
+div#toolbar.toolbar-processed div.toolbar-menu #toolbar-menu {
+  left: 45px;
+}
+
 div#toolbar div.toolbar-menu span.toggle {
   position: absolute;
-  right: 10px;
+  left: 10px;
   cursor: pointer;
   background: url(toolbar.png) 0 -60px no-repeat;
   text-indent: -9999px;
Index: modules/toolbar/toolbar.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.js,v
retrieving revision 1.3
diff -u -r1.3 toolbar.js
--- modules/toolbar/toolbar.js	31 Aug 2009 16:48:37 -0000	1.3
+++ modules/toolbar/toolbar.js	7 Sep 2009 22:04:08 -0000
@@ -10,6 +10,9 @@
     // Set the intial state of the toolbar.
     $('#toolbar', context).once('toolbar', Drupal.admin.toolbar.init);
 
+    // Add the toggling element for shortcuts visibility.
+    $('#toolbar div.toolbar-menu').prepend('<span class="toggle toggle-active"><a href="#">' + Drupal.t('Show shortcuts') + '</a></span>');
+
     // Toggling of admin shortcuts visibility.
     $('#toolbar span.toggle', context).once('toolbar-toggle').click(function() {
       Drupal.admin.toolbar.toggle();
Index: modules/toolbar/toolbar.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.tpl.php,v
retrieving revision 1.2
diff -u -r1.2 toolbar.tpl.php
--- modules/toolbar/toolbar.tpl.php	29 Jul 2009 12:28:41 -0000	1.2
+++ modules/toolbar/toolbar.tpl.php	7 Sep 2009 22:04:08 -0000
@@ -16,7 +16,6 @@
 ?>
 <div id="toolbar" class="clearfix">
   <div class="toolbar-menu clearfix">
-    <span class="toggle toggle-active"><?php print t('Show shortcuts'); ?></span>
     <?php print render($toolbar['toolbar_menu']); ?>
     <?php print render($toolbar['toolbar_user']); ?>
   </div>