diff --git a/modules/shortcut/shortcut.css b/modules/shortcut/shortcut.css
index 3afcb94..e97e6a4 100644
--- a/modules/shortcut/shortcut.css
+++ b/modules/shortcut/shortcut.css
@@ -1,7 +1,7 @@
 div#toolbar a#edit-shortcuts {
   float: right;
-  padding: 5px 10px 5px 5px;
-  line-height: 24px;
+  padding: .5em 1em .5em 5em;
+  line-height: 2.4em;
   color: #fefefe;
 }
 div#toolbar a#edit-shortcuts:focus,
@@ -12,19 +12,19 @@ div#toolbar a#edit-shortcuts.active {
 }
 
 div#toolbar div.toolbar-shortcuts ul {
-  padding: 5px 0 2px 0;
+  padding: .5em 0 0.2em 0;
   height: 28px;
-  line-height: 24px;
+  line-height: 2.4em;
   float: left; /* LTR */
-  margin-left:5px; /* LTR */
+  margin-left: 0.5em; /* LTR */
 }
 
 div#toolbar div.toolbar-shortcuts ul li a {
-  padding: 0 5px 0 5px;
-  margin-right: 5px; /* LTR */
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
+  padding: 0 0.5em 0 0.5em;
+  margin-right: 0.5em; /* LTR */
+  -moz-border-radius: 0.5em;
+  -webkit-border-radius: 0.5em;
+  border-radius: 0.5em;
 }
 
 div#toolbar div.toolbar-shortcuts ul li a:focus,
@@ -41,58 +41,58 @@ div#toolbar div.toolbar-shortcuts ul li a.active {
 div#toolbar div.toolbar-shortcuts span.icon {
   float: left; /* LTR */
   background: #444;
-  width: 30px;
-  height: 30px;
-  margin-right: 5px; /* LTR */
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
+  width: 3em;
+  height: 3em;
+  margin-right: .5em; /* LTR */
+  -moz-border-radius: .5em;
+  -webkit-border-radius: .5em;
+  border-radius: .5em;
 }
 
 div.add-or-remove-shortcuts {
-  padding-top: 5px;
+  padding-top: .5em;
 }
 
 div.add-or-remove-shortcuts a span.icon {
   display: block;
-  width: 12px;
+  width: 1.2em;
   background: transparent url(shortcut.png) no-repeat scroll 0 0;
-  height: 12px;
+  height: 1.2em;
   float: left;
-  margin-left:8px;
+  margin-left: 0.8em;
 }
 
 div.add-shortcut a:focus span.icon,
 div.add-shortcut a:hover span.icon {
-  background-position: 0 -12px;
+  background-position: 0 -1.2em;
 }
 div.remove-shortcut a span.icon {
-  background-position: -12px 0;
+  background-position: -1.2em 0;
 }
 div.remove-shortcut a:focus span.icon,
 div.remove-shortcut a:hover span.icon {
-  background-position: -12px -12px;
+  background-position: -1.2em -1.2em;
 }
 
 div.add-or-remove-shortcuts a span.text {
   float: left;
-  padding-left:10px;
+  padding-left: 1em;
   display: none;
 }
 
 div.add-or-remove-shortcuts a:focus span.text,
 div.add-or-remove-shortcuts a:hover span.text {
-  font-size: 10px;
-  line-height: 12px;
+  font-size: 1em;
+  line-height: 1.2em;
   color: #fff;
   background-color: #5f605b;
   display: block;
-  padding-right: 6px; /* LTR */
+  padding-right: .5em; /* LTR */
   cursor: pointer;
-  -moz-border-radius: 0 5px 5px 0; /* LTR */
-  -webkit-border-top-right-radius: 5px; /* LTR */
-  -webkit-border-bottom-right-radius: 5px; /* LTR */
-  border-radius: 0 5px 5px 0; /* LTR */
+  -moz-border-radius: 0 .5em .5em 0; /* LTR */
+  -webkit-border-top-right-radius: .5em; /* LTR */
+  -webkit-border-bottom-right-radius: .5em; /* LTR */
+  border-radius: 0 .5em .5em 0; /* LTR */
 }
 
 #shortcut-set-switch .form-type-radios {
@@ -102,5 +102,5 @@ div.add-or-remove-shortcuts a:hover span.text {
 
 #shortcut-set-switch .form-item-new {
   padding-top: 0;
-  padding-left: 17px; /* LTR */
+  padding-left: 1.7em; /* LTR */
 }
diff --git a/modules/toolbar/toolbar-rtl.css b/modules/toolbar/toolbar-rtl.css
index acbc98f..67596a7 100644
--- a/modules/toolbar/toolbar-rtl.css
+++ b/modules/toolbar/toolbar-rtl.css
@@ -12,7 +12,7 @@
   zoom: 1;
 }
 #toolbar div.toolbar-menu {
-  padding: 5px 50px 5px 50px;
+  padding: .5em 5em;
 }
 #toolbar-user {
   float: left;
@@ -29,10 +29,10 @@
 }
 #toolbar ul li.home a {
   position: absolute;
-  right: 10px;
+  right: 1em;
 }
 #toolbar div.toolbar-menu a.toggle {
-  left: 10px;
+  left: 1em;
   right: auto;
 }
 * html #toolbar {
diff --git a/modules/toolbar/toolbar.css b/modules/toolbar/toolbar.css
index cbf3c14..a09d62d 100644
--- a/modules/toolbar/toolbar.css
+++ b/modules/toolbar/toolbar.css
@@ -34,14 +34,14 @@ body.toolbar-drawer {
   color: #ccc;
   font: normal small "Lucida Grande", Verdana, sans-serif;
   left: 0;
-  margin: 0 -20px;
-  padding: 0 20px;
+  margin: 0 -2em;
+  padding: 0 2em;
   position: fixed;
   right: 0;
   top: 0;
-  -moz-box-shadow: 0 3px 20px #000;
-  -webkit-box-shadow: 0 3px 20px #000;
-  box-shadow: 0 3px 20px #000;
+  -moz-box-shadow: 0 .3em 2em #000;
+  -webkit-box-shadow: 0 .3em 2em #000;
+  box-shadow: 0 .3em 2em #000;
   filter: progid:DXImageTransform.Microsoft.Shadow(color=#000000, direction='180', strength='10');
   -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(color=#000000, direction='180', strength='10')";
   z-index: 600;
@@ -65,18 +65,18 @@ body.toolbar-drawer {
  */
 #toolbar div.toolbar-menu {
   background: #000;
-  line-height: 20px;
-  padding: 5px 50px 5px 10px; /* LTR */
+  line-height: 2em;
+  padding: .5em 5em .5em 1em; /* LTR */
   position: relative;
 }
 #toolbar-home a span {
   background: url(toolbar.png) no-repeat 0 -45px;
   display: block;
-  height: 14px;
-  margin: 3px 0px;
-  text-indent: -9999px;
+  height: 1.4em;
+  margin: .3em 0;
+  text-indent: -9999em;
   vertical-align: text-bottom;
-  width: 11px;
+  width: 1em;
 }
 #toolbar-user {
   float: right; /* LTR */
@@ -85,32 +85,32 @@ body.toolbar-drawer {
   float: left; /* LTR */
 }
 #toolbar div.toolbar-menu a.toggle {
-  background: url(toolbar.png) 0 -20px no-repeat;
+  background: url(toolbar.png) 0 -2em no-repeat;
   bottom: 0;
   cursor: pointer;
-  height: 25px;
+  height: 2.5em;
   overflow: hidden;
   position: absolute;
-  right: 10px; /* LTR */
-  text-indent: -9999px;
-  width: 25px;
+  right: 1em; /* LTR */
+  text-indent: -9999em;
+  width: 25em;
 }
 #toolbar div.toolbar-menu a.toggle:focus,
 #toolbar div.toolbar-menu a.toggle:hover {
-  background-position:  -50px -20px;
+  background-position:  -5em -2em;
 }
 #toolbar div.toolbar-menu a.toggle-active {
-  background-position:  -25px -20px;
+  background-position:  -2.5em -2em;
 }
 #toolbar div.toolbar-menu a.toggle-active.toggle:focus,
 #toolbar div.toolbar-menu a.toggle-active.toggle:hover {
-  background-position:  -75px -20px;
+  background-position:  -7.5em -2em;
 }
 #toolbar div.toolbar-menu ul li a {
-  padding: 0 10px;
-  -moz-border-radius: 10px;
-  -webkit-border-radius: 10px;
-  border-radius: 10px;
+  padding: 0 1em;
+  -moz-border-radius: 1em;
+  -webkit-border-radius: 1em;
+  border-radius: 1em;
 }
 #toolbar div.toolbar-menu ul li a:focus,
 #toolbar div.toolbar-menu ul li a:hover,
@@ -123,7 +123,7 @@ body.toolbar-drawer {
 #toolbar div.toolbar-menu ul li a.active,
 #toolbar div.toolbar-menu ul li.active-trail a {
   background: url(toolbar.png) 0 0 repeat-x;
-  text-shadow: #333 0 1px 0;
+  text-shadow: #333 0 .1em 0;
 }
 
 /**
@@ -131,7 +131,7 @@ body.toolbar-drawer {
  */
 #toolbar div.toolbar-drawer {
   position: relative;
-  padding: 0 10px;
+  padding: 0 1em;
 }
 
 /**
@@ -141,7 +141,7 @@ body.toolbar-drawer {
  * it with position:absolute; toolbar needs its z-index to stay above overlay.
  */
 * html #toolbar {
-  left: -20px;
+  left: -2em;
   margin: 0;
   padding-right: 0;
   position: absolute;