diff --git a/core/modules/toolbar/css/toolbar.icons.css b/core/modules/toolbar/css/toolbar.icons.css
index 34d6d8f..3fb17fb 100644
--- a/core/modules/toolbar/css/toolbar.icons.css
+++ b/core/modules/toolbar/css/toolbar.icons.css
@@ -2,14 +2,13 @@
  * @file
  * Styling for toolbar module icons.
  */
-
 .toolbar .toolbar-icon {
-  padding-left: 2.75em; /* LTR */
+  padding-left: 2.769230769em; /* LTR */
   position: relative;
 }
 [dir="rtl"] .toolbar .toolbar-icon {
-  padding-left: 1.3333em;
-  padding-right: 2.75em;
+  padding-left: 1.30769230769em;
+  padding-right: 2.769230769em;
 }
 .toolbar .toolbar-icon:before {
   background-attachment: scroll;
@@ -20,14 +19,14 @@
   content: '';
   display: block;
   height: 100%;
-  left: 0.6667em; /* LTR */
+  left: 0.69230769em; /* LTR */
   position: absolute;
   top: 0;
   width: 20px;
 }
 [dir="rtl"] .toolbar .toolbar-icon:before {
   left: auto;
-  right: 0.6667em;
+  right: 0.69230769em;
 }
 .toolbar button.toolbar-icon {
   background-color: transparent;
@@ -35,28 +34,28 @@
   font-size: 1em;
 }
 .toolbar .menu ul .toolbar-icon {
-  padding-left: 1.3333em; /* LTR */
+  padding-left: 1.30769230769em; /* LTR */
 }
 [dir="rtl"] .toolbar .menu ul .toolbar-icon {
   padding-left: 0;
-  padding-right: 1.3333em;
+  padding-right: 1.30769230769em;
 }
 .toolbar .menu ul a.toolbar-icon:before {
   display: none;
 }
 .toolbar .toolbar-tray-vertical .menu ul a {
-  padding-left: 2.75em; /* LTR */
+  padding-left: 2.769230769em; /* LTR */
 }
 [dir="rtl"] .toolbar .toolbar-tray-vertical .menu ul a {
   padding-left: 0;
-  padding-right: 2.75em;
+  padding-right: 2.769230769em;
 }
 .toolbar .toolbar-tray-vertical .menu ul ul a {
-  padding-left: 3.75em; /* LTR */
+  padding-left: 3.7692307692em; /* LTR */
 }
 [dir="rtl"] .toolbar .toolbar-tray-vertical .menu ul ul a {
   padding-left: 0;
-  padding-right: 3.75em;
+  padding-right: 3.7692307692em;
 }
 
 /**
@@ -163,24 +162,24 @@
 @media only screen and (min-width: 36em) {
   .toolbar .toolbar-bar .toolbar-icon {
     background-position: left center; /* LTR */
-    padding-left: 2.75em; /* LTR */
-    padding-right: 1.3333em; /* LTR */
+    padding-left: 2.769230769em; /* LTR */
+    padding-right: 1.30769230769em; /* LTR */
     text-indent: 0;
     width: auto;
   }
   [dir="rtl"] .toolbar .toolbar-bar .toolbar-icon {
     background-position: right center;
-    padding-left: 1.3333em;
-    padding-right: 2.75em;
+    padding-left: 1.30769230769em;
+    padding-right: 2.769230769em;
   }
   .toolbar .toolbar-bar .toolbar-icon:before {
     background-size: 100% auto;
-    left: 0.6667em; /* LTR */
+    left: 0.69230769em; /* LTR */
     width: 20px;
   }
   [dir="rtl"] .toolbar .toolbar-bar .toolbar-icon:before {
     left: 0;
-    right: 0.6667em;
+    right: 0.69230769em;
   }
 }
 
diff --git a/core/modules/toolbar/css/toolbar.menu.css b/core/modules/toolbar/css/toolbar.menu.css
index 5e4d9c8..dc57750 100644
--- a/core/modules/toolbar/css/toolbar.menu.css
+++ b/core/modules/toolbar/css/toolbar.menu.css
@@ -21,7 +21,7 @@
 .toolbar .toolbar-tray-vertical .menu ul {
   display: none;
 }
-.toolbar .toolbar-tray-vertical li.open > ul {
+.toolbar .toolbar-tray-vertical .open > ul {
   display: block; /* Show the sub-menus */
 }
 .toolbar .toolbar-tray-vertical .toolbar-handle + a {
@@ -32,7 +32,7 @@
   margin-right: 0;
 }
 .toolbar .toolbar-tray .active-trail > .toolbar-box a,
-.toolbar .toolbar-tray a.active {
+.toolbar .toolbar-tray .active {
   color: #000;
   font-weight: bold;
 }
@@ -42,38 +42,38 @@
  */
 .toolbar .level-2 > ul {
   background-color: #fafafa;
-  border-bottom-color: #cccccc;
+  border-bottom-color: #ccc;
   border-top-color: #e5e5e5;
 }
 .toolbar .level-3 > ul {
   background-color: #f5f5f5;
   border-bottom-color: #c5c5c5;
-  border-top-color: #dddddd;
+  border-top-color: #ddd;
 }
 .toolbar .level-4 > ul {
-  background-color: #eeeeee;
-  border-bottom-color: #bbbbbb;
+  background-color: #eee;
+  border-bottom-color: #bbb;
   border-top-color: #d5d5d5;
 }
 .toolbar .level-5 > ul {
   background-color: #e5e5e5;
   border-bottom-color: #b5b5b5;
-  border-top-color: #cccccc;
+  border-top-color: #ccc;
 }
 .toolbar .level-6 > ul {
-  background-color: #eeeeee;
-  border-bottom-color: #aaaaaa;
+  background-color: #eee;
+  border-bottom-color: #aaa;
   border-top-color: #c5c5c5;
 }
 .toolbar .level-7 > ul {
   background-color: #fafafa;
   border-bottom-color: #b5b5b5;
-  border-top-color: #cccccc;
+  border-top-color: #ccc;
 }
 .toolbar .level-8 > ul {
-  background-color: #dddddd;
-  border-bottom-color: #cccccc;
-  border-top-color: #dddddd;
+  background-color: #ddd;
+  border-bottom-color: #ccc;
+  border-top-color: #ddd;
 }
 
 /**
diff --git a/core/modules/toolbar/css/toolbar.module.css b/core/modules/toolbar/css/toolbar.module.css
index c2388bc..38eb835 100644
--- a/core/modules/toolbar/css/toolbar.module.css
+++ b/core/modules/toolbar/css/toolbar.module.css
@@ -5,11 +5,11 @@
  * Aggressive resets so we can achieve a consistent look in hostile CSS
  * environments.
  */
-#toolbar-administration,
-#toolbar-administration * {
+#toolbar,
+#toolbar * {
   box-sizing: border-box;
 }
-#toolbar-administration {
+#toolbar {
   font-size: small;
   line-height: 1;
   margin: 0;
@@ -24,7 +24,7 @@
 .toolbar .menu li,
 .toolbar .item-list,
 .toolbar .item-list li,
-.toolbar .menu li.expanded {
+.toolbar .menu .expanded {
   list-style-type: none;
   list-style-image: none;
 }
@@ -207,7 +207,6 @@ body.toolbar-tray-open.toolbar-vertical.toolbar-fixed {
 }
 [dir="rtl"] body.toolbar-tray-open.toolbar-vertical.toolbar-fixed {
   margin-left: auto;
-  margin-left: auto;
   margin-right: 240px;
   margin-right: 15rem;
 }
diff --git a/core/modules/toolbar/css/toolbar.theme.css b/core/modules/toolbar/css/toolbar.theme.css
index d143a0b..56cbf50 100644
--- a/core/modules/toolbar/css/toolbar.theme.css
+++ b/core/modules/toolbar/css/toolbar.theme.css
@@ -5,6 +5,7 @@
   font-family: "Source Sans Pro", "Lucida Grande", Verdana, sans-serif;
   /* Set base font size to 13px based on root ems. */
   font-size: 0.8125rem;
+  line-height: 1.25rem;
   -moz-tap-highlight-color: rgba(0,0,0,0);
   -o-tap-highlight-color: rgba(0,0,0,0);
   -webkit-tap-highlight-color: rgba(0,0,0,0);
@@ -16,7 +17,7 @@
 }
 .toolbar .toolbar-item {
   cursor: pointer;
-  padding: 1em 1.3333em;
+  padding: 1em 1.30769230769em;
   line-height: 1em;
   text-decoration: none;
 }
@@ -29,14 +30,14 @@
  */
 .toolbar .toolbar-bar {
   background-color: #0f0f0f;
-  box-shadow: -1px 0 3px 1px rgba(0, 0, 0, 0.3333); /* LTR */
-  color: #dddddd;
+  box-shadow: -1px 0 3px 1px rgba(0, 0, 0, 0.33); /* LTR */
+  color: #ddd;
 }
 [dir="rtl"] .toolbar .toolbar-bar {
-  box-shadow: 1px 0 3px 1px rgba(0, 0, 0, 0.3333);
+  box-shadow: 1px 0 3px 1px rgba(0, 0, 0, 0.33);
 }
 .toolbar .toolbar-bar .toolbar-item {
-  color: #ffffff;
+  color: #fff;
 }
 .toolbar .toolbar-bar .toolbar-tab > .toolbar-item {
   font-weight: bold;
@@ -56,7 +57,7 @@
  * Toolbar tray.
  */
 .toolbar .toolbar-tray {
-  background-color: #ffffff;
+  background-color: #fff;
 }
 .toolbar .toolbar-tray-horizontal > .toolbar-lining {
   padding-right: 5em; /* LTR */
@@ -67,20 +68,20 @@
 }
 .toolbar .toolbar-tray-vertical {
   background-color: #f5f5f5;
-  border-right: 1px solid #aaaaaa; /* LTR */
-  box-shadow: -1px 0 5px 2px rgba(0, 0, 0, 0.3333); /* LTR */
+  border-right: 1px solid #aaa; /* LTR */
+  box-shadow: -1px 0 5px 2px rgba(0, 0, 0, 0.33); /* LTR */
 }
 [dir="rtl"] .toolbar .toolbar-tray-vertical {
-  border-left: 1px solid #aaaaaa;
+  border-left: 1px solid #aaa;
   border-right: 0 none;
-  box-shadow: 1px 0 5px 2px rgba(0, 0, 0, 0.3333);
+  box-shadow: 1px 0 5px 2px rgba(0, 0, 0, 0.33);
 }
 .toolbar .toolbar-tray-horizontal {
-  border-bottom: 1px solid #aaaaaa;
-  box-shadow: -2px 1px 3px 1px rgba(0, 0, 0, 0.3333); /* LTR */
+  border-bottom: 1px solid #aaa;
+  box-shadow: -2px 1px 3px 1px rgba(0, 0, 0, 0.33); /* LTR */
 }
 [dir="rtl"] .toolbar .toolbar-tray-horizontal {
-  box-shadow: 2px 1px 3px 1px rgba(0, 0, 0, 0.3333);
+  box-shadow: 2px 1px 3px 1px rgba(0, 0, 0, 0.33);
 }
 .toolbar .toolbar-tray-horizontal .toolbar-tray {
   background-color: #f5f5f5;
@@ -88,7 +89,7 @@
 .toolbar-tray a {
   color: #565656;
   cursor: pointer;
-  padding: 1em 1.3333em;
+  padding: 1em 1.30769230769em;
   text-decoration: none;
 }
 .toolbar-tray a:hover,
@@ -100,43 +101,43 @@
   text-decoration: underline;
 }
 .toolbar .menu {
-  background-color: #ffffff;
+  background-color: #fff;
 }
 .toolbar .toolbar-tray-horizontal .menu li + li {
-  border-left: 1px solid #dddddd; /* LTR */
+  border-left: 1px solid #ddd; /* LTR */
 }
 [dir="rtl"] .toolbar .toolbar-tray-horizontal .menu li + li {
   border-left: 0 none ;
-  border-right: 1px solid #dddddd;
+  border-right: 1px solid #ddd;
 }
 .toolbar .toolbar-tray-horizontal .menu li:last-child {
-  border-right: 1px solid #dddddd; /* LTR */
+  border-right: 1px solid #ddd; /* LTR */
 }
 [dir="rtl"] .toolbar .toolbar-tray-horizontal .menu li:last-child {
-  border-left: 1px solid #dddddd;
+  border-left: 1px solid #ddd;
 }
 .toolbar .toolbar-tray-vertical .menu li + li {
-  border-top: 1px solid #dddddd;
+  border-top: 1px solid #ddd;
 }
 .toolbar .toolbar-tray-vertical .menu li:last-child {
-  border-bottom: 1px solid #dddddd;
+  border-bottom: 1px solid #ddd;
 }
 .toolbar .toolbar-tray-vertical .menu .menu li {
   border: 0 none;
 }
 .toolbar .toolbar-tray-vertical .menu ul ul {
-  border-bottom: 1px solid #dddddd;
-  border-top: 1px solid #dddddd;
+  border-bottom: 1px solid #ddd;
+  border-top: 1px solid #ddd;
 }
 .toolbar .toolbar-tray-vertical .menu li:last-child > ul {
   border-bottom: 0;
 }
 .toolbar .toolbar-tray-vertical .menu .menu .menu .menu {
-  margin-left: 0.25em; /* LTR */
+  margin-left: 0.23076923em; /* LTR */
 }
 [dir="rtl"] .toolbar .toolbar-tray-vertical .menu .menu .menu .menu {
   margin-left: 0;
-  margin-right: 0.25em;
+  margin-right: 0.23076923em;
 }
 .toolbar .menu .menu a {
   color: #434343;
@@ -147,7 +148,7 @@
  */
 .toolbar .toolbar-toggle-orientation {
   background-color: #f5f5f5;
-  padding: 0.6667em;
+  padding: 0.69230769em;
 }
 .toolbar .toolbar-tray-horizontal .toolbar-toggle-orientation {
   border-left: 1px solid #c9c9c9; /* LTR */
@@ -158,7 +159,7 @@
 }
 .toolbar .toolbar-toggle-orientation > .toolbar-lining {
   float: right; /* LTR */
-  padding: 0.1667em;
+  padding: 0.15384615em;
 }
 [dir="rtl"] .toolbar .toolbar-toggle-orientation > .toolbar-lining {
   float: left;