diff --git a/core/modules/toolbar/css/toolbar.module.css b/core/modules/toolbar/css/toolbar.module.css
index 7374547..8dd3f62 100644
--- a/core/modules/toolbar/css/toolbar.module.css
+++ b/core/modules/toolbar/css/toolbar.module.css
@@ -78,17 +78,17 @@
 }
 /* Flickering fix */
 @media (min-width:61em) {
-  .toolbar-loading .toolbar .toolbar-bar .toolbar-tab:last-child .toolbar-tray {
+  .toolbar-loading.toolbar-horizontal .toolbar .toolbar-bar .toolbar-tab:last-child .toolbar-tray {
     position: relative;
     display: block;
     z-index: -999;
     visibility: hidden;
     width: 1px;
   }
-  .toolbar-loading .toolbar .toolbar-bar .toolbar-tab:last-child .toolbar-tray .toolbar-lining {
+  .toolbar-loading.toolbar-horizontal .toolbar .toolbar-bar .toolbar-tab:last-child .toolbar-tray .toolbar-lining {
     width: 999em;
   }
-  .toolbar-loading .toolbar .toolbar-bar .home-toolbar-tab + .toolbar-tab .toolbar-tray {
+  .toolbar-loading.toolbar-horizontal .toolbar .toolbar-bar .home-toolbar-tab + .toolbar-tab .toolbar-tray {
     display: block;
   }
 }
@@ -113,10 +113,12 @@ body.toolbar-tray-open.toolbar-fixed.toolbar-vertical .toolbar-oriented {
 /* Present the admin toolbar tabs horizontally as a default on user agents that
  * do not understand media queries or on user agents where JavaScript is
  * disabled. */
+.toolbar-loading.toolbar-horizontal .toolbar .toolbar-tray .toolbar-menu > li,
 .toolbar .toolbar-bar .toolbar-tab,
 .toolbar .toolbar-tray-horizontal li {
   float: left; /* LTR */
 }
+[dir="rtl"] .toolbar-loading.toolbar-horizontal .toolbar .toolbar-tray .toolbar-menu > li,
 [dir="rtl"] .toolbar .toolbar-bar .toolbar-tab,
 [dir="rtl"] .toolbar .toolbar-tray-horizontal li {
   float: right;
diff --git a/core/modules/toolbar/css/toolbar.theme.css b/core/modules/toolbar/css/toolbar.theme.css
index 625196d..981ee00 100644
--- a/core/modules/toolbar/css/toolbar.theme.css
+++ b/core/modules/toolbar/css/toolbar.theme.css
@@ -93,7 +93,8 @@
 .toolbar-tray a:hover,
 .toolbar-tray a:active,
 .toolbar-tray a:focus,
-.toolbar-tray a.is-active {
+.toolbar-tray a.is-active
+ {
   color: #000;
   text-decoration: underline;
 }
diff --git a/core/modules/toolbar/js/models/ToolbarModel.js b/core/modules/toolbar/js/models/ToolbarModel.js
index 0244d29..537601d 100644
--- a/core/modules/toolbar/js/models/ToolbarModel.js
+++ b/core/modules/toolbar/js/models/ToolbarModel.js
@@ -3,7 +3,7 @@
  * A Backbone Model for the toolbar.
  */
 
-(function ($, Backbone, Drupal) {
+(function (Backbone, Drupal) {
 
   'use strict';
 
@@ -154,4 +154,4 @@
     }
   });
 
-}(jQuery, Backbone, Drupal));
+}(Backbone, Drupal));
diff --git a/core/modules/toolbar/js/views/BodyVisualView.js b/core/modules/toolbar/js/views/BodyVisualView.js
index 0b45065..6bae4a5 100644
--- a/core/modules/toolbar/js/views/BodyVisualView.js
+++ b/core/modules/toolbar/js/views/BodyVisualView.js
@@ -19,6 +19,7 @@
     initialize: function () {
       this.listenTo(this.model, 'change:orientation change:activeTray change:isOriented change:isFixed change:isViewportOverflowConstrained', this.render);
     },
+
     /**
      * @inheritdoc
      */
diff --git a/core/modules/toolbar/js/views/ToolbarVisualView.js b/core/modules/toolbar/js/views/ToolbarVisualView.js
index 03a33ac..84668a4 100644
--- a/core/modules/toolbar/js/views/ToolbarVisualView.js
+++ b/core/modules/toolbar/js/views/ToolbarVisualView.js
@@ -64,6 +64,7 @@
       // page load. This will call render.
       this.model.trigger('change:activeTab');
     },
+
     /**
      * Update the toolbar element height.
      *
@@ -74,6 +75,7 @@
     updateToolbarHeight: function () {
       this.model.set('height', $('#toolbar-bar').find('.toolbar-tab').outerHeight() + $('.is-active.toolbar-tray-horizontal').outerHeight());
     },
+
     /**
      * Set the toolbar element height.
      *
@@ -83,18 +85,20 @@
      */
     setToolbarHeight: function () {
       $('#toolbar-administration').css({
-        'height': this.model.get('height')
+        height: this.model.get('height')
       });
       this.triggerDisplace();
     },
+
     // Trigger a recalculation of viewport displacing elements. Use setTimeout
     // to ensure this recalculation happens after changes to visual elements
     // have processed.
     triggerDisplace: function () {
       _.defer(function () {
         Drupal.displace(true);
-      })
+      });
     },
+
     /**
      * @inheritdoc
      *
diff --git a/core/modules/toolbar/src/Element/ToolbarItem.php b/core/modules/toolbar/src/Element/ToolbarItem.php
index f543500..e39295f 100644
--- a/core/modules/toolbar/src/Element/ToolbarItem.php
+++ b/core/modules/toolbar/src/Element/ToolbarItem.php
@@ -77,7 +77,6 @@ public static function preRenderToolbarItem($element) {
       }
       $element['tray']['#wrapper_attributes'] += $attributes;
       $element['tray']['#wrapper_attributes']['class'][] = 'toolbar-tray';
-      $element['tray']['#wrapper_attributes']['class'][] = 'toolbar-tray-horizontal';
     }
 
     $element['tab']['#attributes']['class'][] = 'toolbar-item';
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index bacf236..afa4d39 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -285,7 +285,7 @@ function toolbar_preprocess_html(&$variables) {
   }
 
   $variables['attributes'] = new Attribute(array(
-    'class' => ['toolbar-tray-open', 'toolbar-horizontal', 'toolbar-loading'],
+    'class' => ['toolbar-tray-open', 'toolbar-horizontal', 'toolbar-fixed', 'toolbar-loading'],
   ));
 }
 
diff --git a/core/themes/stable/css/toolbar/toolbar.module.css b/core/themes/stable/css/toolbar/toolbar.module.css
index 7374547..8dd3f62 100644
--- a/core/themes/stable/css/toolbar/toolbar.module.css
+++ b/core/themes/stable/css/toolbar/toolbar.module.css
@@ -78,17 +78,17 @@
 }
 /* Flickering fix */
 @media (min-width:61em) {
-  .toolbar-loading .toolbar .toolbar-bar .toolbar-tab:last-child .toolbar-tray {
+  .toolbar-loading.toolbar-horizontal .toolbar .toolbar-bar .toolbar-tab:last-child .toolbar-tray {
     position: relative;
     display: block;
     z-index: -999;
     visibility: hidden;
     width: 1px;
   }
-  .toolbar-loading .toolbar .toolbar-bar .toolbar-tab:last-child .toolbar-tray .toolbar-lining {
+  .toolbar-loading.toolbar-horizontal .toolbar .toolbar-bar .toolbar-tab:last-child .toolbar-tray .toolbar-lining {
     width: 999em;
   }
-  .toolbar-loading .toolbar .toolbar-bar .home-toolbar-tab + .toolbar-tab .toolbar-tray {
+  .toolbar-loading.toolbar-horizontal .toolbar .toolbar-bar .home-toolbar-tab + .toolbar-tab .toolbar-tray {
     display: block;
   }
 }
@@ -113,10 +113,12 @@ body.toolbar-tray-open.toolbar-fixed.toolbar-vertical .toolbar-oriented {
 /* Present the admin toolbar tabs horizontally as a default on user agents that
  * do not understand media queries or on user agents where JavaScript is
  * disabled. */
+.toolbar-loading.toolbar-horizontal .toolbar .toolbar-tray .toolbar-menu > li,
 .toolbar .toolbar-bar .toolbar-tab,
 .toolbar .toolbar-tray-horizontal li {
   float: left; /* LTR */
 }
+[dir="rtl"] .toolbar-loading.toolbar-horizontal .toolbar .toolbar-tray .toolbar-menu > li,
 [dir="rtl"] .toolbar .toolbar-bar .toolbar-tab,
 [dir="rtl"] .toolbar .toolbar-tray-horizontal li {
   float: right;
diff --git a/core/themes/stable/css/toolbar/toolbar.theme.css b/core/themes/stable/css/toolbar/toolbar.theme.css
index 625196d..981ee00 100644
--- a/core/themes/stable/css/toolbar/toolbar.theme.css
+++ b/core/themes/stable/css/toolbar/toolbar.theme.css
@@ -93,7 +93,8 @@
 .toolbar-tray a:hover,
 .toolbar-tray a:active,
 .toolbar-tray a:focus,
-.toolbar-tray a.is-active {
+.toolbar-tray a.is-active
+ {
   color: #000;
   text-decoration: underline;
 }