diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index 70f12bf..2d7a62f 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -47,6 +47,7 @@ function toolbar_theme($existing, $type, $theme, $path) {
       'collapsed' => NULL,
       'attributes' => array(),
     ),
+    'template' => 'link'
   );
   return $items;
 }
@@ -102,6 +103,34 @@ function theme_toolbar_toggle($variables) {
 }
 
 /**
+ * Formats an element used to toggle the toolbar drawer's visibility.
+ *
+ * @param $variables
+ *   An associative array containing:
+ *   - collapsed: A boolean value representing the toolbar drawer's visibility.
+ *   - attributes: An associative array of HTML attributes.
+ *   - path: A string containing toogle path.
+ *   - options: An associative array  of options for l().
+ *   - text: A string contains link text.
+ *
+ * @ingroup themable
+ */
+function toolbar_preprocess_toolbar_toggle(&$variables) {
+  if ($variables['collapsed']) {
+    $toggle_text = t('Show shortcuts');
+  }
+  else {
+    $toggle_text = t('Hide shortcuts');
+    $variables['attributes']['class'][] = 'toggle-active';
+  }
+  $variables['attributes']['class'][] = 'toggle';
+  $variables['attributes']['title'] = $toggle_text;
+  $variables['path'] = 'toolbar/toggle';
+  $variables['options'] = array('query' => drupal_get_destination());
+  $variables['text'] = $toggle_text;
+}
+
+/**
  * Determines the current state of the toolbar drawer's visibility.
  *
  * @return