Index: modules/toolbar/toolbar.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.css,v
retrieving revision 1.2
diff -u -p -r1.2 toolbar.css
--- modules/toolbar/toolbar.css	29 Jul 2009 12:28:41 -0000	1.2
+++ modules/toolbar/toolbar.css	2 Sep 2009 04:18:53 -0000
@@ -47,11 +47,19 @@ div#toolbar div.shadow {
   position: absolute;
   left: 0;
   right: 0;
-  bottom: -15px;
-  height: 15px;
+  bottom: -7px;
+  height: 7px;
   background: url(toolbar.png) 0 -85px repeat-x;
 }
 
+table.sticky-header-expanded {
+  margin-top: 80px;
+}
+
+table.sticky-header-collapsed {
+  margin-top: 30px;
+}
+
 div#toolbar a {
   text-decoration: none;
   color: #fff;
Index: modules/toolbar/toolbar.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.js,v
retrieving revision 1.3
diff -u -p -r1.3 toolbar.js
--- modules/toolbar/toolbar.js	31 Aug 2009 16:48:37 -0000	1.3
+++ modules/toolbar/toolbar.js	2 Sep 2009 04:18:53 -0000
@@ -45,7 +45,9 @@ Drupal.admin.toolbar.init = function() {
  */
 Drupal.admin.toolbar.collapse = function() {
   $('#toolbar div.toolbar-shortcuts').addClass('collapsed');
+  $('table.sticky-header').addClass('sticky-header-collapsed');
   $('#toolbar span.toggle').removeClass('toggle-active');
+  $('table.sticky-header').removeClass('sticky-header-expanded');
   $('body').removeClass('toolbar-shortcuts');
   $.cookie(
     'Drupal.admin.toolbar.collapsed', 
@@ -59,7 +61,9 @@ Drupal.admin.toolbar.collapse = function
  */
 Drupal.admin.toolbar.expand = function() {
   $('#toolbar div.toolbar-shortcuts').removeClass('collapsed');
+  $('table.sticky-header').removeClass('sticky-header-collapsed');
   $('#toolbar span.toggle').addClass('toggle-active');
+  $('table.sticky-header').addClass('sticky-header-expanded');
   $('body').addClass('toolbar-shortcuts');
   $.cookie(
     'Drupal.admin.toolbar.collapsed',