diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
old mode 100644
new mode 100755
index 70f12bf..09c2559
--- 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;
 }
@@ -85,12 +86,10 @@ function toolbar_toggle_page() {
  *   - collapsed: A boolean value representing the toolbar drawer's visibility.
  *   - attributes: An associative array of HTML attributes.
  *
- * @return
- *   An HTML string representing the element for toggling.
  *
  * @ingroup themable
  */
-function theme_toolbar_toggle($variables) {
+function toolbar_preprocess_toolbar_toggle(&$variables) {
   if ($variables['collapsed']) {
     $toggle_text = t('Show shortcuts');
   }
@@ -98,7 +97,9 @@ function theme_toolbar_toggle($variables) {
     $toggle_text = t('Hide shortcuts');
     $variables['attributes']['class'][] = 'toggle-active';
   }
-  return l($toggle_text, 'toolbar/toggle', array('query' => drupal_get_destination(), 'attributes' => array('title' => $toggle_text) + $variables['attributes']));
+  $variables['attributes']['title'] = $toggle_text;
+  $variables['path'] = url('toolbar/toggle', array('query' => drupal_get_destination()));
+  $variables['text'] = $toggle_text;
 }
 
 /**