diff --git a/mozilla/editor/ui/composer/content/TextEditorAppShell.xul b/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
index 12d8688d946..46229cf9fa3 100644
--- a/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
+++ b/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
@@ -28,7 +28,7 @@
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://editor/locale/EditorAppShell.dtd"> 
+<!DOCTYPE window SYSTEM "chrome://editor/locale/editor.dtd"> 
 
 <!-- NOTE: If we don't have "title" set, text editor doesn't work! -->
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -57,8 +57,7 @@
 	<!-- keys are appended from the overlay -->
   <keyset id="defaultKeySet"/>
 
-  <toolbox id="EditorToolbars">
-    <menubar>
+<menubar>
     <menu id="fileMenu"/>
     <menu id="editMenu"/>
 
@@ -120,8 +119,9 @@
     <menu accesskey="h" id="menu_Help"/>
 
   <spring flex="100%"/>
-  </menubar>
+</menubar>
 
+<toolbox>
    <!-- toolbar filled out from editorOverlay -->
    <toolbar id="EditToolbar">
       <titledbutton id="newButton"/>
@@ -141,6 +141,6 @@
     <editor type="content-primary" id="content-frame" src="about:blank" flex="100%"/>
 
     <!-- status bar, from editorOverlay.xul -->
-    <box id="EditorStatusBar" />
+    <box id="status-bar" />
 
 </window>
diff --git a/mozilla/editor/ui/composer/content/editor.xul b/mozilla/editor/ui/composer/content/editor.xul
index 4828903f43c..2e818f9dbda 100644
--- a/mozilla/editor/ui/composer/content/editor.xul
+++ b/mozilla/editor/ui/composer/content/editor.xul
@@ -32,7 +32,7 @@
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://sidebar/content/sidebarOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://editor/locale/EditorAppShell.dtd"> 
+<!DOCTYPE window SYSTEM "chrome://editor/locale/editor.dtd"> 
 
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -61,16 +61,7 @@
 	<!-- keys are appended from the overlay -->
   <keyset id="defaultKeySet"/>
 
-<!-- sidebar/toolbar/content/status -->
-<box id="sidebar-parent" align="horizontal" flex="100%">
-  <!-- toolbar/content/status -->
-
-  <box id="sidebar-box" chromeclass="extrachrome" style="display:none"/>
-  <splitter id="sidebar-splitter" chromeclass="extrachrome" style="display:none"/>
-  
-  <box id="appcontent" align="vertical" flex="100%">
-  <toolbox id="EditorToolbars">
-    <menubar>
+  <menubar id="main-menubar" chromeclass="menubar">
     <menu id="fileMenu"/>
     <menu id="editMenu"/>
 
@@ -136,8 +127,10 @@
     <spring flex="100%"/>
   </menubar>
 
+<toolbox>
    <!-- toolbar filled out from editorOverlay -->
-   <toolbar id="EditToolbar">
+   <!-- add  class="standard" for dark blue background (icons need rework first) -->
+   <toolbar id="EditToolbar" persist="collapsed">
       <titledbutton id="newButton"/>
       <titledbutton id="openButton"/>
       <titledbutton id="saveButton"/>
@@ -163,7 +156,7 @@
       <spring flex="100%"/>
     </toolbar>
     
-    <toolbar id="FormatToolbar">
+    <toolbar id="FormatToolbar" persist="collapsed">
       <!-- buttons are filled out from editorOverlay -->
       <menu>
       	<titledbutton id="ParagraphPopupButton"/>
@@ -210,6 +203,14 @@
     </toolbar>
     </toolbox>
 
+<!-- sidebar/toolbar/content/status -->
+<box id="sidebar-parent" align="horizontal" flex="100%">
+  <!-- toolbar/content/status -->
+
+  <box id="sidebar-box" chromeclass="extrachrome" style="display:none"/>
+  <splitter id="sidebar-splitter" chromeclass="extrachrome" style="display:none"/>
+  
+  <box id="appcontent" align="vertical" flex="100%">
     <editor type="content-primary" id="content-frame" src="about:blank" flex="100%"/>
 
     <box align="horizontal" id="DisplayModeBar" style="padding-top: 0px;">
@@ -228,7 +229,7 @@
     </box>
 
     <!-- status bar, from editorOverlay.xul -->
-    <box id="EditorStatusBar" />
+    <box id="status-bar" />
   </box>
 </box>
 
diff --git a/mozilla/editor/ui/composer/content/editorOverlay.xul b/mozilla/editor/ui/composer/content/editorOverlay.xul
index d86e1a62fa1..c210aa6947e 100644
--- a/mozilla/editor/ui/composer/content/editorOverlay.xul
+++ b/mozilla/editor/ui/composer/content/editorOverlay.xul
@@ -187,6 +187,7 @@
 			</menu>
       <menuitem accesskey="&fileopen.accesskey;"            key="openeditorkb"   observes="Editor:Open"/>
       <menuseparator />
+      <menuitem accesskey="&fileclose.accesskey;"           key="closekb"        observes="Editor:Close"/>
       <menuitem accesskey="&filesave.accesskey;"            key="savekb"         observes="Editor:Save"/>
       <menuitem accesskey="&filesaveas.accesskey;"                               observes="Editor:SaveAs"/>
       <menuseparator />
@@ -194,7 +195,6 @@
       <menuitem accesskey="&fileprintpreview.accesskey;"                         observes="Editor:PrintPreview"/>
       <menuitem accesskey="&fileprint.accesskey;"           key="printkb"        observes="Editor:Print"/>
       <menuseparator />
-      <menuitem accesskey="&fileclose.accesskey;"           key="closekb"        observes="Editor:Close"/>
       <menuitem accesskey="&fileexit.accesskey;"            key="exitkb"         observes="Editor:Exit"/>
     </menupopup>
     </menu>
@@ -637,7 +637,7 @@
     <!-- end DEBUG only -->
 
     <!-- Window bottom -->
-    <box align="horizontal" id="EditorStatusBar">
+    <box align="horizontal" id="status-bar">
       <titledbutton value="&tempNotification.label;" onclick="doTests()"/>
       <box id="EditorProgressBox" align="vertical" flex="100%">
         <spring flex="100%"/>
@@ -648,5 +648,4 @@
       <titledbutton id="statusText" align="right" flex="100%" value="&tempDoneLoading.label;" style="font-family:sans-serif;font-size:2.5mm">
       </titledbutton>
     </box>
-
 </overlay>
diff --git a/mozilla/editor/ui/composer/locale/en-US/MANIFEST b/mozilla/editor/ui/composer/locale/en-US/MANIFEST
index c63ea8dff2e..12db5404298 100644
--- a/mozilla/editor/ui/composer/locale/en-US/MANIFEST
+++ b/mozilla/editor/ui/composer/locale/en-US/MANIFEST
@@ -22,7 +22,7 @@
 
 # composer:locale:en-US directory
 
-EditorAppShell.dtd
+editor.dtd
 sidebar-editor-rdf.dtd
 sidebar-editor.dtd
 viewSource.dtd
diff --git a/mozilla/editor/ui/composer/locale/en-US/Makefile.in b/mozilla/editor/ui/composer/locale/en-US/Makefile.in
index b69f4cf16ba..67d84ecbed0 100644
--- a/mozilla/editor/ui/composer/locale/en-US/Makefile.in
+++ b/mozilla/editor/ui/composer/locale/en-US/Makefile.in
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_RESOURCE_CONTENT = \
-		$(srcdir)/EditorAppShell.dtd \
+		$(srcdir)/editor.dtd \
 		$(srcdir)/sidebar-editor-rdf.dtd \
 		$(srcdir)/sidebar-editor.dtd \
 		$(srcdir)/viewSource.dtd \
diff --git a/mozilla/editor/ui/composer/locale/en-US/editor.dtd b/mozilla/editor/ui/composer/locale/en-US/editor.dtd
new file mode 100644
index 00000000000..0666089278c
--- /dev/null
+++ b/mozilla/editor/ui/composer/locale/en-US/editor.dtd
@@ -0,0 +1,52 @@
+<!--
+   - The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   -  
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -  
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1999 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+  -->
+
+<!-- Window title -->
+<!-- LOCALIZATION NOTE  mainWindow.title: Do NOT localize "Composer" -->
+<!ENTITY editorWindow.titlemodifier "Composer"> 
+<!ENTITY editorWindow.titlemodifiermenuseparator " - ">
+<!ENTITY textEditorWindow.titlemodifier "Text Editor"> 
+
+<!-- Menu items:  the . means that the menu item isn't implemented yet -->
+
+<!-- View menu items -->
+<!ENTITY viewMenu.label "View">
+<!ENTITY viewmenu.accesskey "v">
+
+<!-- Format menu items -->
+<!ENTITY formatMenu.label "Format">
+<!ENTITY formatmenu.accesskey "o">
+
+<!-- Table menu items -->
+<!ENTITY tableMenu.label "Table">
+<!ENTITY tablemenu.accesskey "t">
+
+<!ENTITY helpMenu.label "Help">
+<!ENTITY aboutCmd.label ".About">
+
+<!-- Display Mode Toolbar -->
+<!ENTITY displayMode.label "Edit Mode:">
+<!ENTITY editModeButton.label "Normal">
+<!ENTITY browserModeButton.label "Browser">
+<!ENTITY viewModeButton.label "View Mode:">
+<!ENTITY htmlModeButton.label "HTML Source">
+<!ENTITY treeModeButton.label "Tag Tree">
diff --git a/mozilla/editor/ui/composer/locale/en-US/editor.properties b/mozilla/editor/ui/composer/locale/en-US/editor.properties
index 39d37b6796e..89a6512dd58 100644
--- a/mozilla/editor/ui/composer/locale/en-US/editor.properties
+++ b/mozilla/editor/ui/composer/locale/en-US/editor.properties
@@ -12,6 +12,8 @@ DontSave=Don't Save
 More=More
 Fewer=Fewer
 Less=Less
+MoreAttributes=More Attributes
+FewerAttributes=Fewer Attributes
 None=None
 none=none
 OpenHTMLFile=Open HTML File
diff --git a/mozilla/editor/ui/composer/locale/en-US/makefile.win b/mozilla/editor/ui/composer/locale/en-US/makefile.win
index 31fd02f1d8b..ef31e2e3020 100644
--- a/mozilla/editor/ui/composer/locale/en-US/makefile.win
+++ b/mozilla/editor/ui/composer/locale/en-US/makefile.win
@@ -20,7 +20,7 @@ DEPTH=..\..\..\..\..
 include <$(DEPTH)\config\rules.mak>
 
 install::
-	$(MAKE_INSTALL) EditorAppShell.dtd        $(DIST)\bin\chrome\editor\locale\en-US
+	$(MAKE_INSTALL) editor.dtd                $(DIST)\bin\chrome\editor\locale\en-US
 	$(MAKE_INSTALL) sidebar-editor-rdf.dtd    $(DIST)\bin\chrome\editor\locale\en-US
 	$(MAKE_INSTALL) sidebar-editor.dtd        $(DIST)\bin\chrome\editor\locale\en-US
 	$(MAKE_INSTALL) viewSource.dtd            $(DIST)\bin\chrome\editor\locale\en-US
@@ -28,7 +28,7 @@ install::
 	$(MAKE_INSTALL) editor.properties         $(DIST)\bin\chrome\editor\locale\en-US
 
 clobber::
-  rm -f $(DIST)\bin\chrome\editor\locale\en-US\EditorAppShell.dtd 
+  rm -f $(DIST)\bin\chrome\editor\locale\en-US\editor.dtd 
   rm -f $(DIST)\bin\chrome\editor\locale\en-US\sidebar-editor-rdf.dtd 
   rm -f $(DIST)\bin\chrome\editor\locale\en-US\sidebar-editor.dtd 
   rm -f $(DIST)\bin\chrome\editor\locale\en-US\viewSource.dtd 
diff --git a/mozilla/editor/ui/composer/skin/editor.css b/mozilla/editor/ui/composer/skin/editor.css
index c923b97c79c..241e60d090d 100644
--- a/mozilla/editor/ui/composer/skin/editor.css
+++ b/mozilla/editor/ui/composer/skin/editor.css
@@ -30,33 +30,15 @@ toolbox#EditorToolbars {
   min-width: 20px;
 }
 
-box#EditorStatusBar {
-  min-width: 50px;
-  border-top: 1px solid darkgray;
-}
-
-box#EditorProgessBox {
-  min-width:30px;
-}
-
+/* global.css has "box#status-bar". 
+   This should be a class so we can use the same colors here 
+*/
 box#DisplayModeBar {
   /*margin-top: -2px;*/
   border-top: 1px solid darkgray;
-  min-width:30px;
-  background-color: inherit;
-}
-
-window.popup {
-  border: 2px outset;
-}
-
-select.combobox {
-  font-family: Sans-Serif;
-  font-size: 8pt;
-  border-top: 3px;
-  border-left: 4px;
-  border-right: 4px;
-  border-style: outset;
+  border-bottom: 1px solid darkgray;
+  min-width:1em;
+	background-color: #CCCCCC;
 }
 
 titledbutton#TextColorPopupButton {
@@ -104,39 +86,25 @@ titledbutton[class~=DisplayModeButton] {
   border-width: 1px;
   border: 1px solid transparent;
   border-left: 1px solid darkgray;
-}
-
-/* Color must be same as for DisplayModeButton's border-left */
-div.VerticalSeparator { 
-	 height: 100%; 
-	 max-width: 1px; 
-   border-left: 1px solid darkgray;
-	 margin: 1px 0px;
+  
+  /* This is the same as the "grippy" area on left edge of toolbar*/
+	background-color: #CCCCCC;
 }
 
 titledbutton[class~=DisplayModeButton][selected="1"] {
   border:  1px white outset;
   padding: 2px 4px 0px 4px;
   margin: -2px 0px 0px 0px;
-  background-color: white;
+  /* This is the same as the "grippy" area on left edge of toolbar*/
+	background-color: #99CCCC;
 }
 
-button.PopupButton {
-  align: left;
-  margin: 0px;
-  min-width: 5em;
-  border: 1px solid transparent;
-}
-
-button.PopupButton:hover {
-  border: 1px outset white;
-  min-width: 5em;
-  text-decoration: none;
-}
-
-button.PopupButton:active {
-  min-width: 5em;
-  border: 1px inset;
+/* Color must be same as for DisplayModeButton's border-left */
+html|div.VerticalSeparator { 
+	 height: 100%; 
+	 max-width: 1px; 
+   border-left: 1px solid darkgray;
+	 margin: 1px 0px;
 }
 
 titledbutton.PopupButton {
@@ -152,22 +120,3 @@ titledbutton#SaveButton {
 titledbutton#SaveButton[dirty="true"] {
   list-style-image:url(chrome://editor/skin/images/savemod.gif); 
 }
-
-titledbutton[toggled="1"]:hover {
-    border:                     1px solid white;
-}
-
-titledbutton[toggled="1"] {
-    border:                     1px white inset;
-}
-
-/* Messenger uses this -- IT SHOULD BE IN XUL.CSS */
-spring.spacer {
-      width:                    5px;
-      height:                   5px;
-}
-
-spring.bigspacer {
-      width:                    10px;
-      height:                   10px;
-}
diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.js b/mozilla/editor/ui/dialogs/content/EdImageProps.js
index 60d2a4d3ae0..31f7fbf85a0 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdImageProps.js
@@ -25,7 +25,7 @@
 
 var insertNew                           = true;
 var imageElement;
-var doSeeAll                            = true;
+var SeeMore                            = true;
 var wasEnableAll                        = false;
 var oldSourceInt                        = 0;
 
@@ -60,15 +60,11 @@ function Startup()
   dialog.imagetbInput                   = document.getElementById( "imagetopbottomInput" );
   dialog.imageborderInput               = document.getElementById( "imageborderInput" );
 
-  // Start in the mode initialized in the "doSeeAll" var above
-  // THIS IS NOT WORKING NOW - After switching to "basic" mode,
-  // then back to 
-
-  if (doSeeAll) {
-    dialog.MoreRow.style.visibility     = "inherit"; // visible
-  } else {
-    dialog.MoreRow.style.visibility     = "collapse"; // use "hidden" if still too many problems
-  }
+  // Start in the mode initialized in the "SeeMore" var above
+  //TODO; We should get the current state of the "More" area from a pref
+  // Initialize to true, but calling this will toggle to "collapsed"
+  SeeMore = true;
+  onMoreFewer();
 
   if (null == dialog.srcInput || 
       null == dialog.altTextInput )
@@ -216,19 +212,23 @@ function chooseFile()
 
 function onMoreFewer()
 {
-  if (doSeeAll)
+  if (SeeMore)
   {
-    void(null);    
-    doSeeAll                            = false;
-    dialog.MoreRow.style.visibility     = "collapse"; // use "hidden" if still too many problems
+    SeeMore = false;
+    dialog.MoreFewerButton.setAttribute("value",GetString("MoreAttributes"));
+// This has too many bugs to use now (10/22/99)
+    dialog.MoreRow.style.visibility     = "collapse";
+//    dialog.MoreRow.setAttribute("style","display: none");
+    dialog.MoreFewerButton.removeAttribute("more");
   }
   else
   {
-    doSeeAll                            = true;
-    dialog.MoreRow.style.visibility     = "inherit"; // was visible; show doesn't seem to work
+    SeeMore = true;
+    dialog.MoreFewerButton.setAttribute("value",GetString("FewerAttributes"));
+    dialog.MoreRow.style.visibility     = "inherit";
+//    dialog.MoreRow.setAttribute("style","display: inherit");
+    dialog.MoreFewerButton.setAttribute("more","1");
   }
-  // When visibility = "collapse" works,
-  // Use this to resize dialog:
   window.sizeToContent();
 }
 
@@ -572,7 +572,7 @@ function setPopup(dim)
       else
         dialog.imageheightSelect.setAttribute("value",GetString("PercentOfCell"));
     
-    else
+    } else 
     {
       if (dim == "w")
         dialog.imagewidthSelect.setAttribute("value",GetString("PercentOfWindow"));
diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.xul b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
index 0813c409de9..5e9adc231ef 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
@@ -138,14 +138,7 @@
     </tr>
     <tr>
       <td>
-      
-        <button 
-                id              = "MoreFewerButton" 
-                class           = "disabled" 
-                onclick         = "onMoreFewer()">
-
-          &FewerButton.label;
-        </button>  
+        <xul:titledbutton id="MoreFewerButton" align="left" style="width: 10em" onclick="onMoreFewer()"/>
       </td>
       <td/>
     </tr>
@@ -481,13 +474,13 @@
 <!-- from EdDialogOverlay -->
 <xul:box id="AdvancedEditButtonNoHR"/>
 
-</div> <!-- END of "MoreRow" block that is hidden by More/Fewer button -->
+</div> <!-- END of block that is hidden by More/Less button -->
 
 <!-- ///////////////////// End Parent Table //////////////////////////////////// -->
    </td>
   </tr>
 </table>
-<div><hr width="100%"/></div>
+<div class="separator" align="horizontal"/>
 <!-- ////////////////////////// OK CANCEL Box /////////////////////////////// -->
 
   <!-- from global dialogOverlay -->
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.js b/mozilla/editor/ui/dialogs/content/EdLinkProps.js
index 618d9d751b6..e5f48d248ab 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.js
@@ -293,24 +293,22 @@ function onMoreFewer()
 {
   if (SeeMore)
   {
+    SeeMore = false;
 // This doesn't work very well - lots of layout bugs
 //    MoreSection.setAttribute("style","visibility:collapse");
     MoreSection.setAttribute("style","display: none");
-    MoreFewerButton.setAttribute("value",GetString("More"));
+    MoreFewerButton.setAttribute("value",GetString("MoreAttributes"));
     MoreFewerButton.removeAttribute("more");
     //AdvancedEditSection.setAttribute("style","display: none");
-    dump("Set button text\n");
-
-    SeeMore = false;
   }
   else
   {
+    SeeMore = true;
 //    MoreSection.setAttribute("style","visibility: inherit");
     MoreSection.setAttribute("style","display: inherit");
-    MoreFewerButton.setAttribute("value",GetString("Fewer"));
+    MoreFewerButton.setAttribute("value",GetString("FewerAttributes"));
     MoreFewerButton.setAttribute("more","1");
     //AdvancedEditSection.setAttribute("style","display: inherit");
-    SeeMore = true;
   }
   window.sizeToContent();
 }
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
index 2adcbdca70d..ab38151ad7b 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
@@ -30,6 +30,7 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorLinkProperties.dtd">
 
 <window title="&windowTitle.label;"
+   class="dialog"
 	 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	 xmlns:html="http://www.w3.org/TR/REC-html40"
    onload = "Startup()"
@@ -65,7 +66,7 @@
           </box>
         </box>
         <!-- ***** The style: width setting is need to cover a bug in button width resizing when text changes ***** -->
-        <html:div><titledbutton id="MoreFewerButton" align="left" style="width: 6em" onclick="onMoreFewer()"/></html:div>
+        <html:div><titledbutton id="MoreFewerButton" align="left" style="width: 10em" onclick="onMoreFewer()"/></html:div>
         <box id="MoreSection" align="vertical">
           <spring class="spacer"/>
           <html:div>&NamedAnchorMsg.label;</html:div>
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EdAdvancedEdit.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EdAdvancedEdit.dtd
index 0e4495fabf4..37974141f39 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/EdAdvancedEdit.dtd
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EdAdvancedEdit.dtd
@@ -31,9 +31,9 @@
 <!ENTITY tree.attributeHeader.label     "Attribute">
 <!ENTITY tree.valueHeader.label         "Value">
 <!ENTITY tabHTML.label                  "HTML Attributes">
-<!ENTITY tabCSS.label                   "Style/Appearance">
+<!ENTITY tabCSS.label                   "Inline Style">
 <!ENTITY tabJSE.label                   "JavaScript Events">
 
 <!ENTITY AddJSEAttributeLabel.label     "Add a JavaScript Event Handler">
 <!ENTITY AddHTMLAttributeLabel.label    "Add a HTML Attribute">
-<!ENTITY AddCSSAttributeLabel.label     "Add a CSS/Style Attribute">
\ No newline at end of file
+<!ENTITY AddCSSAttributeLabel.label     "Add a Style Attribute">
diff --git a/mozilla/editor/ui/dialogs/skin/EditorDialog.css b/mozilla/editor/ui/dialogs/skin/EditorDialog.css
index 9d977d7fb23..951731696dd 100644
--- a/mozilla/editor/ui/dialogs/skin/EditorDialog.css
+++ b/mozilla/editor/ui/dialogs/skin/EditorDialog.css
@@ -35,16 +35,6 @@ tab {
     padding: 0px 3px;
 }
 
-/*
-titledbutton[class=~spaced] { 
-    margin-left:  5px;
-    margin-right: 5px;
-}
-
-titledbutton {
-    padding: 2px 5px;
-}
-*/
 titledbutton#MoreFewerButton {
   list-style-image: url(chrome://global/skin/scroll-down.gif)
 }
diff --git a/mozilla/suite/debugQA/content/debugQATextEditorShell.xul b/mozilla/suite/debugQA/content/debugQATextEditorShell.xul
index 12d8688d946..46229cf9fa3 100644
--- a/mozilla/suite/debugQA/content/debugQATextEditorShell.xul
+++ b/mozilla/suite/debugQA/content/debugQATextEditorShell.xul
@@ -28,7 +28,7 @@
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://editor/locale/EditorAppShell.dtd"> 
+<!DOCTYPE window SYSTEM "chrome://editor/locale/editor.dtd"> 
 
 <!-- NOTE: If we don't have "title" set, text editor doesn't work! -->
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -57,8 +57,7 @@
 	<!-- keys are appended from the overlay -->
   <keyset id="defaultKeySet"/>
 
-  <toolbox id="EditorToolbars">
-    <menubar>
+<menubar>
     <menu id="fileMenu"/>
     <menu id="editMenu"/>
 
@@ -120,8 +119,9 @@
     <menu accesskey="h" id="menu_Help"/>
 
   <spring flex="100%"/>
-  </menubar>
+</menubar>
 
+<toolbox>
    <!-- toolbar filled out from editorOverlay -->
    <toolbar id="EditToolbar">
       <titledbutton id="newButton"/>
@@ -141,6 +141,6 @@
     <editor type="content-primary" id="content-frame" src="about:blank" flex="100%"/>
 
     <!-- status bar, from editorOverlay.xul -->
-    <box id="EditorStatusBar" />
+    <box id="status-bar" />
 
 </window>