diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index 40407a4..07559df 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -47,7 +47,7 @@ function toolbar_theme($existing, $type, $theme, $path) {
       'collapsed' => NULL,
       'attributes' => array(),
     ),
-    'template' => 'link'
+    'template' => 'toolbar-toggle'
   );
   return $items;
 }
diff --git a/core/themes/stark/templates/toolbar/toolbar-toggle.html.twig b/core/themes/stark/templates/toolbar/toolbar-toggle.html.twig
new file mode 100644
index 0000000..66d6f43
--- /dev/null
+++ b/core/themes/stark/templates/toolbar/toolbar-toggle.html.twig
@@ -0,0 +1,16 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a toolbar drawer's visibility.
+ *
+ * Available variables:
+ *
+ * @see template_preprocess
+ * @see template_preprocess_toolbar_toggle
+ *
+ * @ingroup themeable
+ */
+ @todo: clean up once http://drupal.org/node/1812562 is resolved
+ @todo: remove this file once http://drupal.org/node/1595614 is resolved?
+#}
+<a href="{{ url(path, options) }}" class="{{- attributes.class -}}" {{ attributes }}>{{ text }}</a>