diff --git a/core/modules/toolbar/templates/toolbar-tray-wrapper.html.twig b/core/modules/toolbar/templates/toolbar-tray-wrapper.html.twig
new file mode 100644
index 0000000..4eb8d36
--- /dev/null
+++ b/core/modules/toolbar/templates/toolbar-tray-wrapper.html.twig
@@ -0,0 +1,26 @@
+{#
+/**
+ * Default theme implementation for a toolbar tray wrapper.
+ *
+ * Available variables:
+ * - label: The toolbar tray heading label.
+ * - children: The content of the toolbar tray.
+ * - attributes: HTML attributes to apply to the wrapper.
+ *
+ * @see template_preprocess_toolbar_tray_wrapper()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if children %}
+  {% spaceless %}
+  <div{{ attributes }}>
+    <div class="lining clearfix">
+      {% if label %}
+        <h3 class="visually-hidden">{{ label }}</h3>
+      {% endif %}
+      {{ children }}
+    </div>
+  </div>
+  {% endspaceless %}
+{% endif %}
diff --git a/core/modules/toolbar/templates/toolbar.html.twig b/core/modules/toolbar/templates/toolbar.html.twig
new file mode 100644
index 0000000..0e48a40
--- /dev/null
+++ b/core/modules/toolbar/templates/toolbar.html.twig
@@ -0,0 +1,27 @@
+{#
+/**
+ * Default theme implementation for the administrative toolbar.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the wrapper.
+ * - toolbar_attributes: HTML attributes to apply to the toolbar.
+ * - toolbar_heading: The heading or label for the toolbar.
+ * - tabs: List of tabs for the toolbar.
+ *   - tab.attributes: HTML Attributes for the tab container.
+ *   - tab.link: Link or button for the menu tab.
+ * - trays: Toolbar trays, each associated with a tab.
+ *
+ * @see template_preprocess_toolbar()
+ *
+ * @ingroup themeable
+ */
+#}
+<nav{{ attributes }}>
+  <div{{ toolbar_attributes }}>
+    <h2 class="visually-hidden">{{ toolbar_heading }}</h2>
+    {% for tab in tabs %}
+      <div {{ tab.attributes }}>{{ tab.link }}</div>
+    {% endfor %}
+  </div>
+  {{ trays }}
+</nav>
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index bae1b07..3a855b2 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -45,18 +45,14 @@ function toolbar_permission() {
 function toolbar_theme($existing, $type, $theme, $path) {
   $items['toolbar'] = array(
     'render element' => 'element',
+    'template' => 'toolbar',
   );
   $items['toolbar_item'] = array(
     'render element' => 'element',
   );
-  $items['toolbar_tab_wrapper'] = array(
-    'render element' => 'element',
-  );
   $items['toolbar_tray_wrapper'] = array(
     'render element' => 'element',
-  );
-  $items['toolbar_tray_heading_wrapper'] = array(
-    'render element' => 'element',
+    'template' => 'toolbar-tray-wrapper',
   );
   return $items;
 }
@@ -102,7 +98,6 @@ function toolbar_element_info() {
   $elements['toolbar_item'] = array(
     '#pre_render' => array('toolbar_pre_render_item'),
     '#theme' => 'toolbar_item',
-    '#theme_wrappers' => array('toolbar_tab_wrapper'),
     'tab' => array(
       '#type' => 'link',
       '#title' => NULL,
@@ -217,24 +212,47 @@ function ($object) {
 }
 
 /**
- * Returns HTML that wraps the administration toolbar.
+ * Prepares variables for administration toolbar templates.
+ *
+ * Default template: toolbar.html.twig.
  *
  * @param array $variables
  *   An associative array containing:
  *   - element: An associative array containing the properties and children of
  *     the tray. Properties used: #children, #attributes and #bar.
  */
-function theme_toolbar(&$variables) {
-  if (!empty($variables['element']['#children'])) {
-    $element = $variables['element'];
-    $trays = '';
-    foreach (element_children($element) as $key) {
-      $trays .= drupal_render($element[$key]['tray']);
+function template_preprocess_toolbar(&$variables) {
+  $element = $variables['element'];
+
+  // Prepare the toolbar attributes.
+  $variables['attributes'] = $element['#attributes'];
+  $variables['toolbar_attributes'] = new Attribute($element['#bar']['#attributes']);
+  $variables['toolbar_heading'] = $element['#bar']['#heading'];
+
+  // Prepaare the trays and tabs for each toolbar item.
+  $variables['trays'] = array();
+  $variables['tabs'] = array();
+  foreach (element_children($element) as $key) {
+    // Add the tray.
+    if (isset($element[$key]['tray'])) {
+      $variables['trays'][$key] = $element[$key]['tray'];
+      unset($element[$key]['tray']);
     }
-    return '<nav' . new Attribute($element['#attributes']) . '>'
-      . '<div' . new Attribute($element['#bar']['#attributes']) . '>'
-      . '<h2 class="visually-hidden">' . $element['#bar']['#heading'] . '</h2>'
-      . $element['#children'] . '</div>' . $trays . '</nav>';
+
+    // Pass the wrapper attributes along.
+    if (array_key_exists('#wrapper_attributes', $element[$key])) {
+      $element[$key]['#wrapper_attributes']['class'][] = 'toolbar-tab';
+      $attributes = $element[$key]['#wrapper_attributes'];
+    }
+    else {
+      $attributes = array('class' => array('toolbar-tab'));
+    }
+
+    // Add the tab.
+    $variables['tabs'][$key] = array(
+      'link' => $element[$key]['tab'],
+      'attributes' => new Attribute($attributes),
+    );
   }
 }
 
@@ -251,7 +269,6 @@ function theme_toolbar(&$variables) {
  *   A renderable array.
  */
 function toolbar_pre_render_item($element) {
-
   // If tray content is present, markup the tray and its associated trigger.
   if (!empty($element['tray'])) {
 
@@ -290,66 +307,18 @@ function toolbar_pre_render_item($element) {
     }
     // Add the standard theme_wrapper for trays.
     array_unshift($element['tray']['#theme_wrappers'], 'toolbar_tray_wrapper');
-    // If a #heading is provided for the tray, provided a #theme_wrapper
-    // function to append it.
-    if (!empty($element['tray']['#heading'])) {
-      array_unshift($element['tray']['#theme_wrappers'], 'toolbar_tray_heading_wrapper');
-    }
   }
 
   return $element;
 }
 
 /**
- * Implements template_preprocess_HOOK().
- */
-function template_preprocess_toolbar_tab_wrapper(&$variables) {
-  if (!isset($variables['element']['#wrapper_attributes'])) {
-    $variables['element']['#wrapper_attributes'] = array();
-  }
-  $variables['element']['#wrapper_attributes']['class'][] = 'toolbar-tab';
-}
-
-/**
- * Returns HTML for a toolbar item.
+ * Prepares variables for toolbar tray wrapper templates.
  *
- * This theme function only renders the tab portion of the toolbar item. The
- * tray portion will be rendered later.
+ * Default template: toolbar-tray-wrapper.html.twig.
  *
- * @param array $variables
- *   An associative array containing:
- *   - element: An associative array containing the properties and children of
- *     the tray. Property used: tab.
- *
- * @see toolbar_pre_render_item().
- * @see theme_toolbar().
- */
-function theme_toolbar_item(&$variables) {
-  return drupal_render($variables['element']['tab']);
-}
-
-/**
- * Returns HTML for wrapping a toolbar tab.
- *
- * Toolbar tabs have a common styling and placement with the toolbar's bar area.
- *
- * @param array $variables
- *   An associative array containing:
- *   - element: An associative array containing the properties and children of
- *     the tray. Properties used: #children and #attributes.
- */
-function theme_toolbar_tab_wrapper(&$variables) {
-  if (!empty($variables['element']['#children'])) {
-    $element = $variables['element'];
-    return '<div' . new Attribute($element['#wrapper_attributes']) . '>' . $element['#children'] . '</div>';
-  }
-}
-
-/**
- * Returns HTML for wrapping a toolbar tray.
- *
- * Used in combination with theme_toolbar_tab() to create an
- * association between a link tag in the administration bar and a tray.
+ * Used in combination with theme_toolbar_tab() to create an association between
+ * a link tag in the administration bar and a tray.
  *
  * @param array $variables
  *   An associative array containing:
@@ -357,25 +326,14 @@ function theme_toolbar_tab_wrapper(&$variables) {
  *     the tray. Properties used: #children, #toolbar_identifier and
  *     #attributes.
  */
-function theme_toolbar_tray_wrapper(&$variables) {
-  if (!empty($variables['element']['#children'])) {
-    $element = $variables['element'];
-    return '<div' . new Attribute($element['#wrapper_attributes']) . '><div class="toolbar-lining clearfix">' . $element['#children'] . '</div></div>';
-  }
-}
-
-/**
- * Returns HTML for prepending a heading to a toolbar tray.
- *
- * @param array $variables
- *   An associative array containing:
- *   - element: An associative array containing the properties and children of
- *     the tray. Properties used: #children and #heading.
- */
-function theme_toolbar_tray_heading_wrapper(&$variables) {
+function template_preprocess_toolbar_tray_wrapper(&$variables) {
+  $variables['label'] = $variables['children'] = NULL;
+  $variables['children'] = NULL;
   if (!empty($variables['element']['#children'])) {
     $element = $variables['element'];
-    return '<h3 class="visually-hidden">' . $element['#heading'] . '</h3>' . $element['#children'];
+    $variables['label'] = (!empty($element['#heading'])) ? $element['#heading'] : NULL;
+    $variables['attributes'] = $element['#wrapper_attributes'];
+    $variables['children'] = $element['#children'];
   }
 }