diff --git a/mozilla/editor/base/nsIEditProperty.h b/mozilla/editor/base/nsIEditProperty.h
index 05714a447fe..7635f576ef4 100644
--- a/mozilla/editor/base/nsIEditProperty.h
+++ b/mozilla/editor/base/nsIEditProperty.h
@@ -111,6 +111,8 @@ public:
   static nsIAtom *dt;        
   static nsIAtom *dd;        
   static nsIAtom *legend;    
+
+  /** properties **/
   static nsIAtom *color;     
   static nsIAtom *face;      
   static nsIAtom *size;      
diff --git a/mozilla/editor/libeditor/base/nsIEditProperty.h b/mozilla/editor/libeditor/base/nsIEditProperty.h
index 05714a447fe..7635f576ef4 100644
--- a/mozilla/editor/libeditor/base/nsIEditProperty.h
+++ b/mozilla/editor/libeditor/base/nsIEditProperty.h
@@ -111,6 +111,8 @@ public:
   static nsIAtom *dt;        
   static nsIAtom *dd;        
   static nsIAtom *legend;    
+
+  /** properties **/
   static nsIAtom *color;     
   static nsIAtom *face;      
   static nsIAtom *size;      
diff --git a/mozilla/editor/ui/composer/content/EditorAppShell.xul b/mozilla/editor/ui/composer/content/EditorAppShell.xul
index 9e31cbddc32..4d7e5c05922 100644
--- a/mozilla/editor/ui/composer/content/EditorAppShell.xul
+++ b/mozilla/editor/ui/composer/content/EditorAppShell.xul
@@ -328,7 +328,6 @@
         </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 src="chrome://editor/skin/images/ED_ClearStyle.gif" align="bottom" onclick="EditorRemoveStyle('all')"/>
 	      <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/mozilla/editor/ui/composer/skin/images/ED_Bold.gif b/mozilla/editor/ui/composer/skin/images/ED_Bold.gif
index 0d1b5db5aef..8d4c063daa5 100644
Binary files a/mozilla/editor/ui/composer/skin/images/ED_Bold.gif and b/mozilla/editor/ui/composer/skin/images/ED_Bold.gif differ
diff --git a/mozilla/editor/ui/composer/skin/images/ED_Italic.gif b/mozilla/editor/ui/composer/skin/images/ED_Italic.gif
index d84a4336dc0..71604421f78 100644
Binary files a/mozilla/editor/ui/composer/skin/images/ED_Italic.gif and b/mozilla/editor/ui/composer/skin/images/ED_Italic.gif differ
diff --git a/mozilla/editor/ui/composer/skin/images/ED_Underline.gif b/mozilla/editor/ui/composer/skin/images/ED_Underline.gif
index 6a830a691c0..08b42284735 100644
Binary files a/mozilla/editor/ui/composer/skin/images/ED_Underline.gif and b/mozilla/editor/ui/composer/skin/images/ED_Underline.gif differ