diff --git a/editor/ui/composer/content/editor.xul b/editor/ui/composer/content/editor.xul
index 63ec9f85ce1..8441d2387b9 100644
--- a/editor/ui/composer/content/editor.xul
+++ b/editor/ui/composer/content/editor.xul
@@ -225,11 +225,12 @@
     </deck>
 
     <toolbar id="EditModeToolbar" hidden="true" autostretch="never" valign="middle" persist="hidden collapsed">
-      <text id="EditModeLabel" class="margin-left-right" value="&editMode.label;"/>
-      <button id="NormalModeButton"/>
-      <button id="TagModeButton"/>
-      <button id="SourceModeButton"/>
-      <button id="PreviewModeButton"/>
+      <tabbox class="tabbox-bottom" orient="horizontal" flex="1">
+     	<tab id="NormalModeButton"/>
+      	<tab id="TagModeButton"/>
+      	<tab id="SourceModeButton"/>
+      	<tab id="PreviewModeButton"/>
+	  </tabbox>
     </toolbar>
 
     <!-- Some of this is from globarOverlay.xul -->
diff --git a/editor/ui/composer/content/editorOverlay.xul b/editor/ui/composer/content/editorOverlay.xul
index 35ac7501f50..bc023bc924c 100644
--- a/editor/ui/composer/content/editorOverlay.xul
+++ b/editor/ui/composer/content/editorOverlay.xul
@@ -761,13 +761,13 @@
   </button>
   
   <!-- Edit Mode toolbar -->
-  <button id="NormalModeButton"   class="edit-mode _plain" type="text" selected="1" value="&NormalModeTab.label;"  onclick="SetEditMode(1)"
+  <tab id="NormalModeButton"   class="tab-bottom edit-mode _plain" type="text" selected="1" value="&NormalModeTab.label;"  onclick="SetEditMode(1)"
           tooltip="aTooltip"      tooltiptext="&NormalMode.tooltip;"/>
-  <button id="TagModeButton"      class="edit-mode _plain" type="text" selected="0" value="&AllTagsMode.label;"    onclick="SetEditMode(2)"
+  <tab id="TagModeButton"      class="tab-bottom edit-mode _plain" type="text" selected="0" value="&AllTagsMode.label;"    onclick="SetEditMode(2)"
           tooltip="aTooltip"      tooltiptext="&AllTagsMode.tooltip;"/>
-  <button id="SourceModeButton"   class="edit-mode _plain" type="text" selected="0" value="&SourceMode.label;"     onclick="SetEditMode(3)"
+  <tab id="SourceModeButton"   class="tab-bottom edit-mode _plain" type="text" selected="0" value="&SourceMode.label;"     onclick="SetEditMode(3)"
           tooltip="aTooltip"      tooltiptext="&HTMLSourceMode.tooltip;"/>
-  <button id="PreviewModeButton"  class="edit-mode _plain" type="text" selected="0" value="&PreviewMode.label;"    onclick="SetEditMode(0)"
+  <tab id="PreviewModeButton"  class="tab-bottom edit-mode _plain" type="text" selected="0" value="&PreviewMode.label;"    onclick="SetEditMode(0)"
           tooltip="aTooltip"      tooltiptext="&PreviewMode.tooltip;"/>
 
   <!-- InsertPopupButton is used by messengercompose.xul -->