3 files changed, 3 insertions, 12 deletions
diff --git a/modules/toolbar/toolbar.css b/modules/toolbar/toolbar.css
index 086378eb8..e64d353cc 100644
--- a/modules/toolbar/toolbar.css
+++ b/modules/toolbar/toolbar.css
@@ -76,7 +76,7 @@ div#toolbar div.toolbar-menu {
 
 div#toolbar div.toolbar-menu #toolbar-user {
   position: absolute;
-  right: 10px;
+  right: 35px;
 }
 
 div#toolbar div.toolbar-menu #toolbar-menu {
@@ -84,16 +84,9 @@ div#toolbar div.toolbar-menu #toolbar-menu {
   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;
-  left: 10px;
+  right: 10px;
   cursor: pointer;
   background: url(toolbar.png) 0 -60px no-repeat;
   text-indent: -9999px;
diff --git a/modules/toolbar/toolbar.js b/modules/toolbar/toolbar.js
index 61bfb91d4..c2653d91a 100644
--- a/modules/toolbar/toolbar.js
+++ b/modules/toolbar/toolbar.js
@@ -10,9 +10,6 @@ Drupal.behaviors.admin = {
     // 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();
diff --git a/modules/toolbar/toolbar.tpl.php b/modules/toolbar/toolbar.tpl.php
index 0da130872..8a68998af 100644
--- a/modules/toolbar/toolbar.tpl.php
+++ b/modules/toolbar/toolbar.tpl.php
@@ -16,6 +16,7 @@
 ?>
 <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>