Index: modules/shortcut/shortcut.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/shortcut/shortcut.css,v
retrieving revision 1.6
diff -u -p -r1.6 shortcut.css
--- modules/shortcut/shortcut.css	25 Jan 2010 17:01:02 -0000	1.6
+++ modules/shortcut/shortcut.css	3 Feb 2010 14:33:10 -0000
@@ -1,8 +1,8 @@
 /* $Id: shortcut.css,v 1.6 2010/01/25 17:01:02 dries Exp $ */
 div#toolbar a#edit-shortcuts {
   float: right;
-  padding: 5px 10px 5px 5px;
-  line-height: 24px;
+  padding: .5em 10px .5em 5px;
+  line-height: 2.3em;
   color: #bbb;
 }
 div#toolbar a#edit-shortcuts:focus,
@@ -12,9 +12,8 @@ div#toolbar a#edit-shortcuts.active {
 }
 
 div#toolbar div.toolbar-shortcuts ul {
-  padding: 5px 0 2px 0;
-  height: 28px;
-  line-height: 24px;
+  padding: .5em 0;
+  line-height: 2.3em;
   float: left;
   margin-left:5px;
 }
Index: modules/toolbar/toolbar.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.css,v
retrieving revision 1.17
diff -u -p -r1.17 toolbar.css
--- modules/toolbar/toolbar.css	30 Jan 2010 07:59:26 -0000	1.17
+++ modules/toolbar/toolbar.css	3 Feb 2010 14:33:13 -0000
@@ -1,11 +1,11 @@
 /* $Id: toolbar.css,v 1.17 2010/01/30 07:59:26 dries Exp $ */
 
 body.toolbar {
-  padding-top: 2.2em;
+  padding-top: 2.52em;
 }
 
 body.toolbar-drawer {
-  padding-top: 6.6em;
+  padding-top: 5.49em;
 }
 
 /**
@@ -29,7 +29,7 @@ body.toolbar-drawer {
  * Base styles.
  */
 #toolbar {
-  font: normal 0.9em "Lucida Grande", Verdana, sans-serif;
+  font: normal .9em "Lucida Grande", Verdana, sans-serif;
   background: #666;
   color: #ccc;
   position: fixed;
@@ -68,8 +68,8 @@ body.toolbar-drawer {
  */
 #toolbar div.toolbar-menu {
   background: #000;
-  line-height: 20px;
-  padding: 5px 50px 5px 10px;
+  line-height: 1.8em;
+  padding: .5em 50px .5em 10px;
   position: relative;
 }
 
Index: modules/toolbar/toolbar.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.js,v
retrieving revision 1.14
diff -u -p -r1.14 toolbar.js
--- modules/toolbar/toolbar.js	26 Jan 2010 21:42:37 -0000	1.14
+++ modules/toolbar/toolbar.js	3 Feb 2010 14:33:13 -0000
@@ -20,6 +20,15 @@ Drupal.behaviors.toolbar = {
       $(window).triggerHandler('resize.overlay-event');
       return false;
     });
+
+    // Equalize body paddingTop on resize
+    // We use a timeout because some browsers fire a ton of these
+    var resizeTimeout;
+
+    $(window).bind('resize', function() {
+      clearTimeout(resizeTimeout);
+      resizeTimeout = setTimeout(Drupal.toolbar.adjustHeight, 500);
+    });
   }
 };
 
@@ -49,7 +58,8 @@ Drupal.toolbar.collapse = function() {
     .removeClass('toggle-active')
     .attr('title',  toggle_text)
     .html(toggle_text);
-  $('body').removeClass('toolbar-drawer').css('paddingTop', $('#toolbar').outerHeight());
+  $('body').removeClass('toolbar-drawer');
+  this.adjustHeight();
   $.cookie(
     'Drupal.toolbar.collapsed',
     1,
@@ -71,7 +81,8 @@ Drupal.toolbar.expand = function() {
     .addClass('toggle-active')
     .attr('title',  toggle_text)
     .html(toggle_text);
-  $('body').addClass('toolbar-drawer').css('paddingTop', $('#toolbar').outerHeight());
+  $('body').addClass('toolbar-drawer');
+  this.adjustHeight();
   $.cookie(
     'Drupal.toolbar.collapsed',
     0,
@@ -96,7 +107,11 @@ Drupal.toolbar.toggle = function() {
 };
 
 Drupal.toolbar.height = function() {
-  return $("#toolbar").height();
+  return $("#toolbar").outerHeight();
+};
+
+Drupal.toolbar.adjustHeight = function() {
+  $('body').css('padding-top', Drupal.toolbar.height()/parseFloat($('body').css('fontSize')) + 'em');
 };
 
 })(jQuery);