--- a/editor/ui/composer/content/editingOverlay.xul
+++ b/editor/ui/composer/content/editingOverlay.xul
@@ -172,9 +172,29 @@
               label="&publishSettings.label;"
               accesskey="&publishSettings.accesskey;"
               command="cmd_publishSettings"/>
   </menupopup>
 
   <!-- View menu items -->
   <menupopup id="composerCharsetMenuPopup"
              onpopupshowing="updateCharsetPopupMenu(this);"/>
+
+  <!-- Toolbar buttons/items -->
+  <toolbarbutton id="newButton"
+                 class="toolbarbutton-1"
+                 label="&newToolbarCmd.label;"
+                 command="cmd_newEditor"
+                 tooltiptext="&newToolbarCmd.tooltip;"/>
+  <toolbarbutton id="openButton"
+                 class="toolbarbutton-1"
+                 label="&openToolbarCmd.label;"
+                 command="cmd_open"
+                 tooltiptext="&openToolbarCmd.tooltip;"/>
+  <toolbarbutton id="saveButton"
+                 class="toolbarbutton-1"
+                 command="cmd_save"
+                 tooltiptext="&saveToolbarCmd.tooltip;"/>
+  <toolbarbutton id="publishButton"
+                 class="toolbarbutton-1"
+                 command="cmd_publish"
+                 tooltiptext="&publishToolbarCmd.tooltip;"/>
 </overlay>

--- a/editor/ui/composer/content/editorOverlay.xul
+++ b/editor/ui/composer/content/editorOverlay.xul
@@ -1008,34 +1008,16 @@
                 command="cmd_table"
                 label="&tableToolbarCmd.label;"
                 tooltiptext="&tableToolbarCmd.tooltip;"/>
     </menupopup>
   </toolbarbutton>
 
   <!-- Editor toolbar items -->
   <!-- note that we override the submenu item label "Blank Window" with "New" used for the menu -->
-  <toolbarbutton id="newButton"
-                 class="toolbarbutton-1"
-                 label="&newToolbarCmd.label;"
-                 command="cmd_newEditor"
-                 tooltiptext="&newToolbarCmd.tooltip;"/>
-  <toolbarbutton id="openButton"
-                 class="toolbarbutton-1"
-                 label="&openToolbarCmd.label;"
-                 command="cmd_open"
-                 tooltiptext="&openToolbarCmd.tooltip;"/>
-  <toolbarbutton id="saveButton"
-                 class="toolbarbutton-1"
-                 command="cmd_save"
-                 tooltiptext="&saveToolbarCmd.tooltip;"/>
-  <toolbarbutton id="publishButton"
-                 class="toolbarbutton-1"
-                 command="cmd_publish"
-                 tooltiptext="&publishToolbarCmd.tooltip;"/>
   <toolbarbutton id="cutButton" class="toolbarbutton-1"
                  command="cmd_cut"
                  tooltiptext="&cutToolbarCmd.tooltip;"/>
   <toolbarbutton id="copyButton" class="toolbarbutton-1"
                  command="cmd_copy"
                  tooltiptext="&copyToolbarCmd.tooltip;"/>
   <toolbarbutton id="pasteButton" class="toolbarbutton-1"
                  command="cmd_paste"

--- a/editor/ui/locales/en-US/chrome/composer/editingOverlay.dtd
+++ b/editor/ui/locales/en-US/chrome/composer/editingOverlay.dtd
@@ -63,8 +63,16 @@
 <!ENTITY publishAsCmd.label "Publish As…">
 <!ENTITY publishAsCmd.accesskey "h">
 <!ENTITY fileRevert.label "Revert">
 <!ENTITY fileRevert.accesskey "t">
 
 <!-- Edit menu items -->
 <!ENTITY publishSettings.label "Publishing Site Settings…">
 <!ENTITY publishSettings.accesskey "b">
+
+<!-- Toolbar buttons/items -->
+<!ENTITY newToolbarCmd.label "New">
+<!ENTITY newToolbarCmd.tooltip "Create a new Composer page">
+<!ENTITY openToolbarCmd.label "Open">
+<!ENTITY openToolbarCmd.tooltip "Open a local file">
+<!ENTITY saveToolbarCmd.tooltip "Save file to a local location">
+<!ENTITY publishToolbarCmd.tooltip "Upload file to a remote location">

--- a/editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/locales/en-US/chrome/composer/editorOverlay.dtd
@@ -321,22 +321,16 @@
 <!ENTITY convertToTable.label "Create Table from Selection">
 <!ENTITY convertToTable.accesskey "r">
 <!ENTITY tableProperties.label "Table Properties…">
 <!ENTITY tableProperties.accesskey "o">
 
 <!-- Toolbar-only items -->
 <!ENTITY menuBar.tooltip "Menu Bar">
 <!ENTITY formatToolbar.tooltip "Formatting Toolbar">
-<!ENTITY newToolbarCmd.label "New">
-<!ENTITY newToolbarCmd.tooltip "Create a new Composer page">
-<!ENTITY openToolbarCmd.label "Open">
-<!ENTITY openToolbarCmd.tooltip "Open a local file">
-<!ENTITY saveToolbarCmd.tooltip "Save file to a local location">
-<!ENTITY publishToolbarCmd.tooltip "Upload file to a remote location">
 <!ENTITY cutToolbarCmd.tooltip "Cut">
 <!ENTITY copyToolbarCmd.tooltip "Copy">
 <!ENTITY pasteToolbarCmd.tooltip "Paste">
 <!ENTITY printToolbarCmd.label "Print">
 <!ENTITY printToolbarCmd.tooltip "Print this page">
 <!ENTITY findToolbarCmd.label "Find">
 <!ENTITY findToolbarCmd.tooltip "Find text in page">
 <!ENTITY spellToolbarCmd.label "Spell">