diff --git a/editor/ui/composer/content/EditorAppShell.xul b/editor/ui/composer/content/EditorAppShell.xul
index 4d7e5c059225..348f5b48ddb9 100644
--- a/editor/ui/composer/content/EditorAppShell.xul
+++ b/editor/ui/composer/content/EditorAppShell.xul
@@ -16,6 +16,12 @@
 <!ENTITY fileMenu.label "File">
 <!ENTITY newCmd.label ".New Window">
 
+<!-- Toolbar items -->
+<!ENTITY formatToolbar.boldChar "B">
+<!ENTITY formatToolbar.italicChar "I">
+<!ENTITY formatToolbar.underlineChar "U">
+
+
 <!ENTITY dcharMenu.label "Character Set">
 <!ENTITY dcharIso1Cmd.label "ISO Latin 1 (ISO-8859-1)">
 <!ENTITY dcharIso2Cmd.label "ISO Latin 2 (ISO-8859-2)">
@@ -66,7 +72,6 @@
 <!ENTITY dcharIso8Cmd.label ".ISO Hebrew (ISO-8859-8)">
 <!ENTITY dcharCp1255Cmd.label "Windows Hebrew (windows-1255)">
 <!ENTITY dcharCp1256Cmd.label "Windows Arabic (windows-1256)">
-
 ]> 
 
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
@@ -302,7 +307,7 @@
 
   <box id="outer-box" align="vertical">
     <toolbox>
-      <toolbar>
+      <toolbar id="EditToolbar">
 	      <titledbutton src="chrome://editor/skin/images/ED_NewFile.gif" align="bottom" value="New" class="popup" onclick="EditorNew()"/>
 	      <titledbutton src="chrome://editor/skin/images/ED_OpenFile.gif" align="bottom" value="Open" class="popup" onclick="EditorOpen()"/>
 	      <titledbutton src="chrome://editor/skin/images/ED_SaveFile.gif" align="bottom" value="Save" class="popup" onclick="EditorSave()"/>
@@ -317,17 +322,24 @@
 	      <titledbutton src="chrome://editor/skin/images/ED_Spell.gif" align="bottom" value="Spell" class="popup" onclick="CheckSpelling()"/>
 		  <spring flex="100%"/>
 	  </toolbar>
-      <toolbar>
+      <toolbar id="FormatToolbar">
 		    <titledbutton id="ParagraphPopup" value="Paragraph" class="popup" align="left" popup="ParagraphMenu"/>
 		    <titledbutton id="FontFacePopup" value="Font" class="popup" align="left" popup="FontFaceMenu"/>
 		    <titledbutton id="FontSizePopup" value="Size" class="popup" align="left" popup="FontSizeMenu"/>
 		    <titledbutton id="TextColorPopup" src="chrome://editor/skin/images/ED_TextColor.gif" class="popup" popup="TextColorMenu"/>
 		    <titledbutton id="BackColorPopup" src="chrome://editor/skin/images/ED_BackColor.gif" class="popup" popup="BackColorMenu"/>
+        <titledbutton id="BoldButton" value="&formatToolbar.boldChar;" onclick="EditorApplyStyle('b')">
+		      <observes element="Editor:Style:IsBold" attribute="bold" onchange="onBoldChange()"/>
+        </titledbutton>
+	      <titledbutton id="ItalicButton" value="&formatToolbar.italicChar;" onclick="EditorApplyStyle('i')"/>
+	      <titledbutton id="UnderlineButton" value="&formatToolbar.underlineChar;" onclick="EditorApplyStyle('u')"/>
+<!--
         <titledbutton id="BoldButton" src="chrome://editor/skin/images/ED_Bold.gif" align="bottom" onclick="EditorApplyStyle('b')">
 		      <observes element="Editor:Style:IsBold" attribute="bold" onchange="onBoldChange()"/>
         </titledbutton>
-	      <titledbutton src="chrome://editor/skin/images/ED_Italic.gif" align="bottom" onclick="EditorApplyStyle('i')"/>
-	      <titledbutton src="chrome://editor/skin/images/ED_Underline.gif" align="bottom" onclick="EditorApplyStyle('u')"/>
+	      <titledbutton id="ItalicButton" src="chrome://editor/skin/images/ED_Italic.gif" align="bottom" onclick="EditorApplyStyle('i')"/>
+	      <titledbutton id="UnderlineButton" src="chrome://editor/skin/images/ED_Underline.gif" align="bottom" onclick="EditorApplyStyle('u')"/>
+-->
 	      <titledbutton src="chrome://editor/skin/images/ED_Bullets.gif" align="bottom" onclick="EditorInsertList('ul')"/>
 	      <titledbutton src="chrome://editor/skin/images/ED_Numbers.gif" align="bottom" onclick="EditorInsertList('ol')"/>
 	      <titledbutton src="chrome://editor/skin/images/ED_Outdent.gif" align="bottom" onclick="EditorIndent('outdent')"/>
diff --git a/editor/ui/composer/skin/Editor.css b/editor/ui/composer/skin/Editor.css
index 38dafabee0a0..49031e312abd 100644
--- a/editor/ui/composer/skin/Editor.css
+++ b/editor/ui/composer/skin/Editor.css
@@ -10,7 +10,6 @@ select.combobox {
   border-left: 4px;
   border-right: 4px;
   border-style: outset;
-  //background: silver;
 }
 
 titledbutton#TextColorPopup {
@@ -20,3 +19,35 @@ titledbutton#TextColorPopup {
 titledbutton#BackColorPopup {
   margin-left: -3px;
 }
+
+titledbutton#BoldButton {
+  min-width: 16px; 
+  font-size: 19px; 
+  font-weight: 900; 
+  font-family: times, serif, sans-serif;
+}
+
+titledbutton#BoldButton:hover {
+  text-decoration: none;
+}
+
+titledbutton#ItalicButton {
+  min-width: 16px; 
+  font-size: 19px; 
+  font-weight: 500; 
+  font-family: times, serif, sans-serif; 
+  font-style:  italic;
+}
+
+titledbutton#ItalicButton:hover {
+  text-decoration: none;
+}
+
+titledbutton#UnderlineButton {
+  min-width: 16px; 
+  font-size: 19px; 
+  font-weight: 500; 
+  font-family: times, serif, sans-serif; 
+  text-decoration: underline;
+}
+