diff --git a/core/modules/toolbar/toolbar-rtl.css b/core/modules/toolbar/toolbar-rtl.css
index e121547..9e473b2 100644
--- a/core/modules/toolbar/toolbar-rtl.css
+++ b/core/modules/toolbar/toolbar-rtl.css
@@ -1,23 +1,23 @@
 
-#toolbar,
-#toolbar * {
+nav.toolbar,
+nav.toolbar * {
   text-align: right;
 }
-#toolbar ul li {
+nav.toolbar ul li {
   float: right;
 }
-#toolbar ul li a {
+nav.toolbar ul li a {
   display: inline-block;
   float: none;
   zoom: 1;
 }
-#toolbar div.toolbar-menu {
+nav.toolbar div.toolbar-menu {
   padding: 5px 50px 5px 50px;
 }
 #toolbar-user {
   float: left;
 }
-#toolbar ul#toolbar-user li {
+nav.toolbar #toolbar-user li {
   float: none;
   display: inline;
 }
@@ -27,11 +27,11 @@
 #toolbar-home {
   float: right;
 }
-#toolbar ul li.home a {
+nav.toolbar ul .home a {
   position: absolute;
   right: 10px;
 }
-#toolbar div.toolbar-menu a.toggle {
+nav.toolbar div.toolbar-menu .toggle {
   left: 10px;
   right: auto;
 }
diff --git a/core/modules/toolbar/toolbar.css b/core/modules/toolbar/toolbar.css
index ec6f35c..2f009f2 100644
--- a/core/modules/toolbar/toolbar.css
+++ b/core/modules/toolbar/toolbar.css
@@ -10,14 +10,13 @@ body.toolbar-drawer {
  * Aggressive resets so we can achieve a consistent look in hostile CSS
  * environments.
  */
-#toolbar,
-#toolbar * {
+
+nav.toolbar * {
   border: 0;
   font-size: 100%;
   line-height: inherit;
   list-style: none;
   margin: 0;
-  outline: 0;
   padding: 0;
   text-align: left; /* LTR */
   vertical-align: baseline;
@@ -29,7 +28,7 @@ body.toolbar-drawer {
  * We use a keyword for the toolbar font size to make it display consistently
  * across different themes, while still allowing browsers to resize the text.
  */
-#toolbar {
+nav.toolbar {
   background: #666;
   color: #ccc;
   font: normal small "Lucida Grande", Verdana, sans-serif;
@@ -42,24 +41,25 @@ body.toolbar-drawer {
   box-shadow: 0 3px 20px #000;
   z-index: 600;
 }
-#toolbar div.collapsed {
+nav.toolbar .collapsed {
   display: none;
   visibility: hidden;
 }
-#toolbar a {
+nav.toolbar a {
   color: #fff;
   font-size: .846em;
   text-decoration: none;
 }
-#toolbar ul li,
-#toolbar ul li a {
+nav.toolbar ul li,
+nav.toolbar ul li a {
   float: left; /* LTR */
+  list-style: none;
 }
 
 /**
  * Administration menu.
  */
-#toolbar div.toolbar-menu {
+nav.toolbar div.toolbar-menu {
   background: #000;
   line-height: 20px;
   padding: 5px 50px 5px 10px; /* LTR */
@@ -69,9 +69,9 @@ body.toolbar-drawer {
   background: url(toolbar.png) no-repeat 0 -45px;
   display: block;
   height: 14px;
-  margin: 3px 0px;
+  margin: 3px 0;
   text-indent: -9999px;
-  vertical-align: text-bottom;
+  direction: ltr;
   width: 11px;
 }
 #toolbar-user {
@@ -80,7 +80,7 @@ body.toolbar-drawer {
 #toolbar-menu {
   float: left; /* LTR */
 }
-#toolbar div.toolbar-menu a.toggle {
+nav.toolbar div.toolbar-menu a.toggle {
   background: url(toolbar.png) 0 -20px no-repeat;
   bottom: 0;
   cursor: pointer;
@@ -89,34 +89,36 @@ body.toolbar-drawer {
   position: absolute;
   right: 10px; /* LTR */
   text-indent: -9999px;
+  direction: ltr;
   width: 25px;
 }
-#toolbar div.toolbar-menu a.toggle:focus,
-#toolbar div.toolbar-menu a.toggle:hover {
+nav.toolbar div.toolbar-menu a.toggle:focus,
+nav.toolbar div.toolbar-menu a.toggle:hover {
   background-position:  -50px -20px;
 }
-#toolbar div.toolbar-menu a.toggle-active {
+nav.toolbar div.toolbar-menu a.toggle-active {
   background-position:  -25px -20px;
 }
-#toolbar div.toolbar-menu a.toggle-active.toggle:focus,
-#toolbar div.toolbar-menu a.toggle-active.toggle:hover {
+nav.toolbar div.toolbar-menu a.toggle-active .toggle:focus,
+nav.toolbar div.toolbar-menu a.toggle-active .toggle:hover {
   background-position:  -75px -20px;
 }
-#toolbar div.toolbar-menu ul li a {
+nav.toolbar div.toolbar-menu ul li a {
   padding: 0 10px;
+  -webkit-border-radius: 10px;
   -moz-border-radius: 10px;
   border-radius: 10px;
 }
-#toolbar div.toolbar-menu ul li a:focus,
-#toolbar div.toolbar-menu ul li a:hover,
-#toolbar div.toolbar-menu ul li a:active,
-#toolbar div.toolbar-menu ul li a.active:focus {
+nav.toolbar div.toolbar-menu ul li a:focus,
+nav.toolbar div.toolbar-menu ul li a:hover,
+nav.toolbar div.toolbar-menu ul li a:active,
+nav.toolbar div.toolbar-menu ul li a.active:focus {
   background: #444;
 }
-#toolbar div.toolbar-menu ul li a.active:hover,
-#toolbar div.toolbar-menu ul li a.active:active,
-#toolbar div.toolbar-menu ul li a.active,
-#toolbar div.toolbar-menu ul li.active-trail a {
+nav.toolbar div.toolbar-menu ul li a.active:hover,
+nav.toolbar div.toolbar-menu ul li a.active:active,
+nav.toolbar div.toolbar-menu ul li a.active,
+nav.toolbar div.toolbar-menu ul .active-trail a {
   background: url(toolbar.png) 0 0 repeat-x;
   text-shadow: #333 0 1px 0;
 }
@@ -124,7 +126,7 @@ body.toolbar-drawer {
 /**
  * Collapsed drawer of additional toolbar content.
  */
-#toolbar div.toolbar-drawer {
+nav.toolbar div.toolbar-drawer {
   position: relative;
   padding: 0 10px;
 }
