diff --git a/mozilla/editor/ui/composer/content/editor.xul b/mozilla/editor/ui/composer/content/editor.xul
index c338634186c..6fba1122c27 100644
--- a/mozilla/editor/ui/composer/content/editor.xul
+++ b/mozilla/editor/ui/composer/content/editor.xul
@@ -25,7 +25,7 @@
    -    Sammy Ford
   -->
 
-<?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://editor/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
@@ -129,7 +129,7 @@
 <toolbox id="EditorToolbox">
   <!-- toolbar filled out from editorOverlay -->
   <!-- add  class="standard" for dark blue background (icons need rework first) -->
-  <toolbar id="EditToolbar" class="standard chromeclass-toolbar" persist="collapsed">
+  <toolbar class="toolbar-primary chromeclass-toolbar" id="EditToolbar" persist="collapsed">
     <button id="newButton"/>
     <button id="openButton"/>
     <button id="saveButton"/>
@@ -145,13 +145,10 @@
     <button id="namedAnchorButton"/>
     <spring flex="1"/>
 
-	  <box id="toolbar_throbber_box" align="vertical">
-			<titledbutton id="Throbber" oncommand='goClickThrobber("editor.throbber.url")'>
-        <observes element="Editor:Throbber" attribute="busy"/>
-			</titledbutton>
-	  </box>
+    <button class="plain" id="navigator-throbber" oncommand='goClickThrobber("editor.throbber.url")'>
+      <observes element="Editor:Throbber" attribute="busy"/>
+    </button>
   </toolbar>
-
   <toolbar id="FormatToolbar" class="chromeclass-toolbar" persist="collapsed">
   <!-- We need this else menulists get stretched -->
   <box autostretch="never">
@@ -189,7 +186,6 @@
   <splitter id="sidebar-splitter" class="chromeclass-extrachrome"/>
 
   <box id="appcontent" orient="vertical" flex="1">
-  
     <editor type="content-primary" id="content-frame" src="about:blank" flex="1"/>
 
     <toolbar id="EditModeToolbar" chromeclass="extrachrome" persist="collapsed">
diff --git a/mozilla/editor/ui/composer/content/editorOverlay.xul b/mozilla/editor/ui/composer/content/editorOverlay.xul
index e0af2d0dd44..d117a316c30 100644
--- a/mozilla/editor/ui/composer/content/editorOverlay.xul
+++ b/mozilla/editor/ui/composer/content/editorOverlay.xul
@@ -622,19 +622,19 @@
 
   <!-- Editor toolbar items -->
   <!-- note that we override the submenu item label "Blank Window" with "New" used for the menu -->
-  <button class="key-toolbar left" orient="vertical" id="newButton" observes="cmd_newEditor" value="&newMenu.label;" />
-  <button class="key-toolbar left" orient="vertical" id="openButton" observes="Editor:Open" value="&openToolbarCmd.label;"/>
-  <button class="key-toolbar left" orient="vertical" id="saveButton" observes="Editor:Save"/>
-  <button class="key-toolbar left" orient="vertical" id="previewButton" observes="Editor:Preview" value="&previewToolbarCmd.label;"/>
-  <button class="toolbar left" orient="vertical" id="printButton" observes="Editor:Print" value="&printToolbarCmd.label;"/>
-  <button class="toolbar left" orient="vertical" id="findButton" observes="cmd_find" value="&findToolbarCmd.label;"/>
-  <button class="toolbar left" orient="vertical" id="spellingButton" value="&spellToolbarCmd.label;" oncommand="CheckSpelling()"/>
+  <button class="button-toolbar-2 top" id="newButton" observes="cmd_newEditor" value="&newMenu.label;" />
+  <button class="button-toolbar-2 top" id="openButton" observes="Editor:Open" value="&openToolbarCmd.label;"/>
+  <button class="button-toolbar-2 top" id="saveButton" observes="Editor:Save"/>
+  <button class="button-toolbar-2 top" id="previewButton" observes="Editor:Preview" value="&previewToolbarCmd.label;"/>
+  <button class="button-toolbar-2 top" id="printButton" observes="Editor:Print" value="&printToolbarCmd.label;"/>
+  <button class="button-toolbar-2 top" id="findButton" observes="cmd_find" value="&findToolbarCmd.label;"/>
+  <button class="button-toolbar-2 top" id="spellingButton" value="&spellToolbarCmd.label;" oncommand="CheckSpelling()"/>
 
-  <button class="toolbar left" orient="vertical" id="imageButton" value="&imageToolbarCmd.label;" oncommand="EditorInsertOrEditImage()"/>
-  <button class="toolbar left" orient="vertical" id="hlineButton" value="&hruleToolbarCmd.label;" oncommand="EditorInsertOrEditHLine()"/>
-  <button class="toolbar left" orient="vertical" id="tableButton" value="&tableToolbarCmd.label;" oncommand="EditorInsertOrEditTable(true)"/>
-  <button class="toolbar left" orient="vertical" id="linkButton" value="&linkToolbarCmd.label;" oncommand="EditorInsertOrEditLink()"/>
-  <button class="toolbar left" orient="vertical" id="namedAnchorButton" value="&anchorToolbarCmd.label;" oncommand="EditorInsertOrEditNamedAnchor()"/>
+  <button class="button-toolbar-2 top" id="imageButton" value="&imageToolbarCmd.label;" oncommand="EditorInsertOrEditImage()"/>
+  <button class="button-toolbar-2 top" id="hlineButton" value="&hruleToolbarCmd.label;" oncommand="EditorInsertOrEditHLine()"/>
+  <button class="button-toolbar-2 top" id="tableButton" value="&tableToolbarCmd.label;" oncommand="EditorInsertOrEditTable(true)"/>
+  <button class="button-toolbar-2 top" id="linkButton" value="&linkToolbarCmd.label;" oncommand="EditorInsertOrEditLink()"/>
+  <button class="button-toolbar-2 top" id="namedAnchorButton" value="&anchorToolbarCmd.label;" oncommand="EditorInsertOrEditNamedAnchor()"/>
 
   <!-- Formatting toolbar items. "data" are HTML tagnames, don't translate -->
   <menulist id="ParagraphSelect">