diff --git a/core/modules/toolbar/templates/toolbar.html.twig b/core/modules/toolbar/templates/toolbar.html.twig
index b20a647..728cec6 100644
--- a/core/modules/toolbar/templates/toolbar.html.twig
+++ b/core/modules/toolbar/templates/toolbar.html.twig
@@ -7,8 +7,8 @@
  * - 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.
+ *   - attributes: HTML Attributes for the tab container.
+ *   - link: Link or button for the menu tab.
  * - trays: Toolbar trays, each associated with a tab.
  *
  * @see template_preprocess_toolbar()
@@ -20,13 +20,13 @@
   <div{{ toolbar_attributes }}>
     <h2 class="visually-hidden">{{ toolbar_heading }}</h2>
     {% for tab in tabs %}
-      <div {{ tab.attributes }}>{{ tab.link }}</div>
+      <div{{ tab.attributes }}>{{ tab.link }}</div>
     {% endfor %}
   </div>
   {% for tray in trays %}
     {% spaceless %}
     <div{{ tray.attributes }}>
-      <div class="lining clearfix">
+      <div class="toolbar-lining clearfix">
         {% if tray.label %}
           <h3 class="toolbar-tray-name visually-hidden">{{ tray.label }}</h3>
         {% endif %}
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index c71112f..39b441f 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -222,7 +222,7 @@ function template_preprocess_toolbar(&$variables) {
   $variables['toolbar_attributes'] = new Attribute($element['#bar']['#attributes']);
   $variables['toolbar_heading'] = $element['#bar']['#heading'];
 
-  // Prepaare the trays and tabs for each toolbar item.
+  // Prepare the trays and tabs for each toolbar item.
   $variables['trays'] = array();
   $variables['tabs'] = array();
   foreach (element_children($element) as $key) {