diff --git a/core/modules/toolbar/css/toolbar.icons.css b/core/modules/toolbar/css/toolbar.icons.css
index 64d8bf4..f5882bf 100644
--- a/core/modules/toolbar/css/toolbar.icons.css
+++ b/core/modules/toolbar/css/toolbar.icons.css
@@ -377,4 +377,3 @@
 .no-svg .toolbar .toolbar-toggle-orientation [value="horizontal"]:hover:before {
   background-image: url("../../../misc/icons/787878/push-up.png");
 }
-
diff --git a/core/modules/toolbar/css/toolbar.menu.css b/core/modules/toolbar/css/toolbar.menu.css
index 5e70a02..3b99e55 100644
--- a/core/modules/toolbar/css/toolbar.menu.css
+++ b/core/modules/toolbar/css/toolbar.menu.css
@@ -1,6 +1,7 @@
 /**
  * @file toolbar.menu.css
  */
+
 .toolbar .menu,
 [dir="rtl"] .toolbar .menu {
   list-style: none;
@@ -29,7 +30,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;
 }
@@ -39,38 +40,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 860daef..5155c64 100644
--- a/core/modules/toolbar/css/toolbar.module.css
+++ b/core/modules/toolbar/css/toolbar.module.css
@@ -5,6 +5,7 @@
  * Aggressive resets so we can achieve a consistent look in hostile CSS
  * environments.
  */
+
 #toolbar-administration,
 #toolbar-administration * {
   -moz-box-sizing: border-box;
@@ -27,7 +28,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;
 }
@@ -209,7 +210,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 5c1f383..183fb86 100644
--- a/core/modules/toolbar/css/toolbar.theme.css
+++ b/core/modules/toolbar/css/toolbar.theme.css
@@ -1,6 +1,7 @@
 /**
  * @file toolbar.theme.css
  */
+
 .toolbar {
   font-family: "Source Sans Pro", "Lucida Grande", Verdana, sans-serif;
   /* Set base font size to 13px based on root ems. */
@@ -29,13 +30,13 @@
 .toolbar .toolbar-bar {
   background-color: #0f0f0f;
   box-shadow: -1px 0 3px 1px rgba(0, 0, 0, 0.3333); /* LTR */
-  color: #dddddd;
+  color: #ddd;
 }
 [dir="rtl"] .toolbar .toolbar-bar {
   box-shadow: 1px 0 3px 1px rgba(0, 0, 0, 0.3333);
 }
 .toolbar .toolbar-bar a {
-  color: #ffffff;
+  color: #fff;
 }
 .toolbar .toolbar-bar .toolbar-tab > a {
   font-weight: bold;
@@ -54,7 +55,7 @@
  * Toolbar tray.
  */
 .toolbar .toolbar-tray {
-  background-color: #ffffff;
+  background-color: #fff;
 }
 .toolbar .toolbar-tray-horizontal > .toolbar-lining {
   padding-right: 5em; /* LTR */
@@ -65,16 +66,17 @@
 }
 .toolbar .toolbar-tray-vertical {
   background-color: #f5f5f5;
-  border-right: 1px solid #aaaaaa; /* LTR */
+  border-right: 1px solid #aaa; /* LTR */
   box-shadow: -1px 0 5px 2px rgba(0, 0, 0, 0.3333); /* LTR */
 }
 [dir="rtl"] .toolbar .toolbar-tray-vertical {
   border-left: 1px solid #aaaaaa;
   border-right: 0 none;
+  border-left: 1px solid #aaa;
   box-shadow: 1px 0 5px 2px rgba(0, 0, 0, 0.3333);
 }
 .toolbar .toolbar-tray-horizontal {
-  border-bottom: 1px solid #aaaaaa;
+  border-bottom: 1px solid #aaa;
   box-shadow: -2px 1px 3px 1px rgba(0, 0, 0, 0.3333); /* LTR */
 }
 [dir="rtl"] .toolbar .toolbar-tray-horizontal {
@@ -92,33 +94,33 @@
   color: #000;
 }
 .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;
