Fix for:

http://bugzilla.mozilla.org/show_bug.cgi?id=68229

r=andreww, sr=sfraser. checking in for anatoliya

editor/jar.mn

@@ -127,12 +127,15 @@ comm.jar:
 	content/editor/images/tag-var.gif                        (ui/composer/content/images/tag-var.gif)
 	content/editor/images/tag-userdefined.gif                (ui/composer/content/images/tag-userdefined.gif)
     content/editor/images/smile.gif                          (ui/composer/content/images/smile.gif)
+	content/editor/images/s_smile.gif                        (ui/composer/content/images/s_smile.gif)
     content/editor/images/smile_active.gif                   (ui/composer/content/images/smile_active.gif)
     content/editor/images/smile_disabled.gif                 (ui/composer/content/images/smile_disabled.gif)
     content/editor/images/smile_hover.gif                    (ui/composer/content/images/smile_hover.gif)
     content/editor/images/frown.gif                          (ui/composer/content/images/frown.gif)
     content/editor/images/wink.gif                           (ui/composer/content/images/wink.gif)
     content/editor/images/sick.gif                           (ui/composer/content/images/sick.gif)
+    content/editor/images/s_frown.gif                        (ui/composer/content/images/s_frown.gif)
+    content/editor/images/s_wink.gif                         (ui/composer/content/images/s_wink.gif)
 	content/editor/EdDialogCommon.js                         (ui/dialogs/content/EdDialogCommon.js) 
 	content/editor/EdLinkProps.xul                           (ui/dialogs/content/EdLinkProps.xul) 
 	content/editor/EdLinkProps.js                            (ui/dialogs/content/EdLinkProps.js) 

editor/ui/composer/content/EditorContent.css

@@ -86,15 +86,15 @@ span[-moz-smiley="s4"] {
 }
 
 span[-moz-smiley="s5"] {
-  background-image: url(chrome://editor/content/images/smile.gif);
+  background-image: url(chrome://editor/content/images/s_smile.gif);
 }
 
 span[-moz-smiley="s6"] {
-  background-image: url(chrome://editor/content/images/frown.gif);
+  background-image: url(chrome://editor/content/images/s_frown.gif);
 }
 
 
 span[-moz-smiley="s7"] {
-  background-image: url(chrome://editor/content/images/wink.gif);
+  background-image: url(chrome://editor/content/images/s_wink.gif);
 }
 

editor/ui/composer/content/editorOverlay.xul

@@ -25,7 +25,6 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/editorOverlay.dtd">
 
 <?xml-stylesheet href="chrome://editor/skin/EditorToolbars.css" type="text/css"?> 
-<?xml-stylesheet href="chrome://editor/content/EditorExtra.css" type="text/css"?>
 
 <overlay id="editorOverlay"
         xmlns:html="http://www.w3.org/1999/xhtml"
@@ -582,7 +581,7 @@
                <menuitem oncommand="doStatefulCommand('cmd_smiley', ';-)' )">
                        <button class="plain" id="insert-wink" align="left"   value="&smiley3Cmd.label;"/>
                </menuitem>
-               <menuitem oncommand="doStatefulCommand('cmd_smiley', ';-P' )">
+               <menuitem oncommand="doStatefulCommand('cmd_smiley', ':-P' )">
                        <button class="plain" id="insert-sick" align="left"   value="&smiley4Cmd.label;"/>
                </menuitem>
                <menuitem oncommand="doStatefulCommand('cmd_smiley', ':)' )">

netwerk/streamconv/converters/mozTXTToHTMLConv.cpp

@@ -681,13 +681,13 @@ mozTXTToHTMLConv::GlyphHit(const PRUnichar * aInString, PRInt32 aInLength, PRBoo
       )
       &&
         (
-          SmilyHit(aInString, aInLength, col0, ":-)", 3, "<img src=\"chrome://messenger/skin/smile.gif\" alt=\":-)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
-          SmilyHit(aInString, aInLength, col0, ":)",  2, "<img src=\"chrome://messenger/skin/smile.gif\" alt=\":)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
-          SmilyHit(aInString, aInLength, col0, ":-(", 3, "<img src=\"chrome://messenger/skin/frown.gif\" alt=\":-(\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
-          SmilyHit(aInString, aInLength, col0, ":(",  2, "<img src=\"chrome://messenger/skin/frown.gif\" alt=\":(\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
-          SmilyHit(aInString, aInLength, col0, ";-)", 3, "<img src=\"chrome://messenger/skin/wink.gif\" alt=\";-)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
-          SmilyHit(aInString, aInLength, col0, ";)", 2, "<img src=\"chrome://messenger/skin/wink.gif\" alt=\";)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
-          SmilyHit(aInString, aInLength, col0, ";-P", 3, "<img src=\"chrome://messenger/skin/sick.gif\" alt=\";-P\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen)
+          SmilyHit(aInString, aInLength, col0, ":-)", 3, "<img src=\"chrome://editor/content/images/smile.gif\" alt=\":-)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
+          SmilyHit(aInString, aInLength, col0, ":)",  2, "<img src=\"chrome://editor/content/images/s_smile.gif\" alt=\":)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
+          SmilyHit(aInString, aInLength, col0, ":-(", 3, "<img src=\"chrome://editor/content/images/frown.gif\" alt=\":-(\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
+          SmilyHit(aInString, aInLength, col0, ":(",  2, "<img src=\"chrome://editor/content/images/s_frown.gif\" alt=\":(\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
+          SmilyHit(aInString, aInLength, col0, ";-)", 3, "<img src=\"chrome://editor/content/images/wink.gif\" alt=\";-)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
+          SmilyHit(aInString, aInLength, col0, ";)", 2, "<img src=\"chrome://editor/content/images/s_wink.gif\" alt=\";)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
+          SmilyHit(aInString, aInLength, col0, ":-P", 3, "<img src=\"chrome://editor/content/images/sick.gif\" alt=\":-P\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen)
         )
     )
   {
@@ -707,13 +707,13 @@ mozTXTToHTMLConv::GlyphHit(const PRUnichar * aInString, PRInt32 aInLength, PRBoo
       )
       &&
         (
-          SmilyHit(aInString, aInLength, PR_FALSE, ":-)", 3, "<img src=\"chrome://messenger/skin/smile.gif\" alt=\":-)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
-          SmilyHit(aInString, aInLength, PR_FALSE, ":)",  2, "<img src=\"chrome://messenger/skin/smile.gif\" alt=\":)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
-          SmilyHit(aInString, aInLength, PR_FALSE, ":-(", 3, "<img src=\"chrome://messenger/skin/frown.gif\" alt=\":-(\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
-          SmilyHit(aInString, aInLength, PR_FALSE, ":(",  2, "<img src=\"chrome://messenger/skin/frown.gif\" alt=\":(\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
-          SmilyHit(aInString, aInLength, PR_FALSE, ";-)", 3, "<img src=\"chrome://messenger/skin/wink.gif\" alt=\";-)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
-          SmilyHit(aInString, aInLength, PR_FALSE, ";)", 2, "<img src=\"chrome://messenger/skin/wink.gif\" alt=\";)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
-          SmilyHit(aInString, aInLength, PR_FALSE, ";-P", 3, "<img src=\"chrome://messenger/skin/sick.gif\" alt=\";-P\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen)
+          SmilyHit(aInString, aInLength, PR_FALSE, ":-)", 3, "<img src=\"chrome://editor/content/images/smile.gif\" alt=\":-)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
+          SmilyHit(aInString, aInLength, PR_FALSE, ":)",  2, "<img src=\"chrome://editor/content/images/s_smile.gif\" alt=\":)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
+          SmilyHit(aInString, aInLength, PR_FALSE, ":-(", 3, "<img src=\"chrome://editor/content/images/frown.gif\" alt=\":-(\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
+          SmilyHit(aInString, aInLength, PR_FALSE, ":(",  2, "<img src=\"chrome://editor/content/images/s_frown.gif\" alt=\":(\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
+          SmilyHit(aInString, aInLength, PR_FALSE, ";-)", 3, "<img src=\"chrome://editor/content/images/wink.gif\" alt=\";-)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
+          SmilyHit(aInString, aInLength, PR_FALSE, ";)", 2, "<img src=\"chrome://editor/content/images/s_wink.gif\" alt=\";)\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen) ||
+          SmilyHit(aInString, aInLength, PR_FALSE, ":-P", 3, "<img src=\"chrome://editor/content/images/sick.gif\" alt=\":-P\" class=\"moz-txt-smily\" height=17 width=17 align=ABSCENTER>", outputHTML, glyphTextLen)
         )
     )
   {

themes/classic/editor/EditorToolbars.css

@@ -139,48 +139,57 @@ button.edit-mode[selected="1"]:hover:active
     list-style-image      : url("chrome://editor/skin/images/bold-hover-active.gif");
   } 
 
+#smilyPopup{
+
+    width : 130px;
+}
+
 #smileButton {
-  list-style-image:url(chrome://messenger/skin/smile.gif); 
+  list-style-image:url("chrome://editor/skin/images/smile.gif"); 
 }
 
-#smileButton:hover, #smileButton[toggled="true"]:hover:active {
-  list-style-image:url(chrome://messenger/skin/smile.gif); 
+menu:hover > #smileButton, 
+menu:hover:active > #smileButton[toggled="true"] {
+	list-style-image:url("chrome://editor/skin/images/smile_hover.gif");
 }
 
-#smileButton[toggled="true"], #smileButton:hover:active {
-  list-style-image:url(chrome://messenger/skin/smile.gif); 
+menu:hover:active > #smileButton,
+menu:hover > #smileButton[toggled="true"] {
+	list-style-image:url("chrome://editor/skin/images/smile_active.gif");
 }
 
-#smileButton[disabled="true"], #smileButton[disabled="true"]:hover:active {
-  list-style-image:url(chrome://messenger/skin/smile.gif); 
+#smileButton[disabled="true"], 
+menu:hover > #smileButton[disabled="true"], 
+menu:hover:active > #smileButton[disabled="true"] {
+	list-style-image:url("chrome://editor/skin/images/smile_disabled.gif");
 }
 
 #insert-smile {
-  list-style-image:url(chrome://messenger/skin/smile.gif); 
+  list-style-image:url(chrome://editor/skin/images/smile.gif); 
 }
 
 #insert-sick {
-  list-style-image:url(chrome://messenger/skin/sick.gif); 
+  list-style-image:url(chrome://editor/skin/images/sick.gif); 
 }
 
 #insert-frown {
-  list-style-image:url(chrome://messenger/skin/frown.gif); 
+  list-style-image:url(chrome://editor/skin/images/frown.gif); 
 }
 
 #insert-wink {
-  list-style-image:url(chrome://messenger/skin/wink.gif); 
+  list-style-image:url(chrome://editor/skin/images/wink.gif); 
 }
 
 #insert-smile5 {
-  list-style-image:url(chrome://messenger/skin/smile.gif); 
+  list-style-image:url(chrome://editor/skin/images/s_smile.gif); 
 }
 
 #insert-smile6 {
-  list-style-image:url(chrome://messenger/skin/frown.gif); 
+  list-style-image:url(chrome://editor/skin/images/s_frown.gif); 
 }
 
 #insert-smile7 {
-  list-style-image:url(chrome://messenger/skin/wink.gif); 
+  list-style-image:url(chrome://editor/skin/images/s_wink.gif); 
 }
 
 

themes/classic/editor/mac/EditorToolbars.css

@@ -150,6 +150,60 @@ button.edit-mode[selected="1"]:hover:active
     list-style-image      : url("chrome://editor/skin/images/bold-hover-active.gif");
   } 
 
+#smilyPopup{
+
+    width : 130px;
+}
+
+#smileButton {
+  list-style-image:url("chrome://editor/skin/images/smile.gif"); 
+}
+
+menu:hover > #smileButton, 
+menu:hover:active > #smileButton[toggled="true"] {
+	list-style-image:url("chrome://editor/skin/images/smile_hover.gif");
+}
+
+menu:hover:active > #smileButton,
+menu:hover > #smileButton[toggled="true"] {
+	list-style-image:url("chrome://editor/skin/images/smile_active.gif");
+}
+
+#smileButton[disabled="true"], 
+menu:hover > #smileButton[disabled="true"], 
+menu:hover:active > #smileButton[disabled="true"] {
+	list-style-image:url("chrome://editor/skin/images/smile_disabled.gif");
+}
+
+#insert-smile {
+  list-style-image:url(chrome://editor/skin/images/smile.gif); 
+}
+
+#insert-sick {
+  list-style-image:url(chrome://editor/skin/images/sick.gif); 
+}
+
+#insert-frown {
+  list-style-image:url(chrome://editor/skin/images/frown.gif); 
+}
+
+#insert-wink {
+  list-style-image:url(chrome://editor/skin/images/wink.gif); 
+}
+
+#insert-smile5 {
+  list-style-image:url(chrome://editor/skin/images/s_smile.gif); 
+}
+
+#insert-smile6 {
+  list-style-image:url(chrome://editor/skin/images/s_frown.gif); 
+}
+
+#insert-smile7 {
+  list-style-image:url(chrome://editor/skin/images/s_wink.gif); 
+}
+
+
 #italicButton
   {
     list-style-image      : url("chrome://editor/skin/images/italic.gif");

themes/classic/editor/win/EditorToolbars.css

@@ -139,6 +139,60 @@ button.edit-mode[selected="1"]:hover:active
     list-style-image      : url("chrome://editor/skin/images/bold-hover-active.gif");
   } 
 
+#smilyPopup{
+
+    width : 130px;
+}
+
+#smileButton {
+  list-style-image:url("chrome://editor/skin/images/smile.gif"); 
+}
+
+menu:hover > #smileButton, 
+menu:hover:active > #smileButton[toggled="true"] {
+	list-style-image:url("chrome://editor/skin/images/smile_hover.gif");
+}
+
+menu:hover:active > #smileButton,
+menu:hover > #smileButton[toggled="true"] {
+	list-style-image:url("chrome://editor/skin/images/smile_active.gif");
+}
+
+#smileButton[disabled="true"], 
+menu:hover > #smileButton[disabled="true"], 
+menu:hover:active > #smileButton[disabled="true"] {
+	list-style-image:url("chrome://editor/skin/images/smile_disabled.gif");
+}
+
+#insert-smile {
+  list-style-image:url(chrome://editor/skin/images/smile.gif); 
+}
+
+#insert-sick {
+  list-style-image:url(chrome://editor/skin/images/sick.gif); 
+}
+
+#insert-frown {
+  list-style-image:url(chrome://editor/skin/images/frown.gif); 
+}
+
+#insert-wink {
+  list-style-image:url(chrome://editor/skin/images/wink.gif); 
+}
+
+#insert-smile5 {
+  list-style-image:url(chrome://editor/skin/images/s_smile.gif); 
+}
+
+#insert-smile6 {
+  list-style-image:url(chrome://editor/skin/images/s_frown.gif); 
+}
+
+#insert-smile7 {
+  list-style-image:url(chrome://editor/skin/images/s_wink.gif); 
+}
+
+
 #italicButton
   {
     list-style-image      : url("chrome://editor/skin/images/italic.gif");

themes/classic/jar.mn

@@ -7,7 +7,7 @@ classic.jar:
     skin/classic/communicator/broken.gif                                 (communicator/broken.gif)
     skin/classic/communicator/lock.gif                                   (communicator/lock.gif)
     skin/classic/communicator/unlock.gif                                 (communicator/unlock.gif)
-+    skin/classic/communicator/menubuttonBindings.xml                     (communicator/menubuttonBindings.xml)
+    skin/classic/communicator/menubuttonBindings.xml                     (communicator/menubuttonBindings.xml)
     skin/classic/communicator/offline.gif                                (communicator/offline.gif)
     skin/classic/communicator/online.gif                                 (communicator/online.gif)
     skin/classic/communicator/securityOverlay.css                        (communicator/securityOverlay.css)
@@ -31,9 +31,7 @@ classic.jar:
     skin/classic/communicator/bookmarks/location-clicked.gif             (communicator/bookmarks/location-clicked.gif)
     skin/classic/communicator/bookmarks/location-hover.gif               (communicator/bookmarks/location-hover.gif)
     skin/classic/communicator/bookmarks/iefolder.gif                     (communicator/bookmarks/iefolder.gif)
-+   skin/classic/communicator/bookmarks/bookmarksWindow.css              (communicator/bookmarks/bookmarksWindow.css)
-+   skin/classic/communicator/bookmarks/bookmarksToolbar.css             (communicator/bookmarks/bookmarksToolbar.css)
-+   skin/classic/communicator/bookmarks/bookmarks.css                    (communicator/bookmarks/bookmarks.css)
+    skin/classic/communicator/bookmarks/bookmarks.css                    (communicator/bookmarks/bookmarks.css)
     skin/classic/communicator/bookmarks/schedule.gif                     (communicator/bookmarks/schedule.gif)
     skin/classic/communicator/bookmarks/notification.gif                 (communicator/bookmarks/notification.gif)
     skin/classic/communicator/directory/directory.css                    (communicator/directory/directory.css)
@@ -207,6 +205,16 @@ classic.jar:
     skin/classic/editor/images/underline-hover-active.gif                (editor/images/underline-hover-active.gif)
     skin/classic/editor/images/underline-hover.gif                       (editor/images/underline-hover.gif)
     skin/classic/editor/images/underline.gif                             (editor/images/underline.gif)
+	skin/classic/editor/images/smile.gif								 (editor/images/smile.gif)
+    skin/classic/editor/images/s_smile.gif								 (editor/images/s_smile.gif)
+    skin/classic/editor/images/frown.gif								 (editor/images/frown.gif)
+    skin/classic/editor/images/s_frown.gif								 (editor/images/s_frown.gif)
+    skin/classic/editor/images/wink.gif									 (editor/images/wink.gif)
+    skin/classic/editor/images/s_wink.gif								 (editor/images/s_wink.gif)
+    skin/classic/editor/images/sick.gif									 (editor/images/sick.gif)
+    skin/classic/editor/images/smile_active.gif                          (editor/images/smile_active.gif)
+    skin/classic/editor/images/smile_disabled.gif                        (editor/images/smile_disabled.gif)
+    skin/classic/editor/images/smile_hover.gif                           (editor/images/smile_hover.gif)
     skin/classic/editor/images/editmode-normal.gif                       (editor/images/editmode-normal.gif)
     skin/classic/editor/images/editmode-tags.gif                         (editor/images/editmode-tags.gif)
     skin/classic/editor/images/editmode-html.gif                         (editor/images/editmode-html.gif)

themes/modern/editor/EditorToolbars.css

@@ -451,48 +451,57 @@ button.edit-mode > .button-internal-box > .button.icon:hover:active
   list-style-image:url(chrome://editor/skin/images/bold_disabled.gif); 
 }
 
+#smilyPopup  {
+
+    width : 130px;
+}
+
 #smileButton {
-  list-style-image:url(chrome://messenger/skin/smile.gif); 
+  list-style-image:url("chrome://editor/skin/images/smile.gif"); 
 }
 
-#smileButton:hover, #smileButton[toggled="true"]:hover:active {
-  list-style-image:url(chrome://messenger/skin/smile.gif); 
+menu:hover > #smileButton, 
+menu:hover:active > #smileButton[toggled="true"] {
+	list-style-image:url("chrome://editor/skin/images/smile_hover.gif");
 }
 
-#smileButton[toggled="true"], #smileButton:hover:active {
-  list-style-image:url(chrome://messenger/skin/smile.gif); 
+menu:hover:active > #smileButton,
+menu:hover > #smileButton[toggled="true"] {
+	list-style-image:url("chrome://editor/skin/images/smile_active.gif");
 }
 
-#smileButton[disabled="true"], #smileButton[disabled="true"]:hover:active {
-  list-style-image:url(chrome://messenger/skin/smile.gif); 
+#smileButton[disabled="true"], 
+menu:hover > #smileButton[disabled="true"], 
+menu:hover:active > #smileButton[disabled="true"] {
+	list-style-image:url("chrome://editor/skin/images/smile_disabled.gif");
 }
 
 #insert-smile {
-  list-style-image:url(chrome://messenger/skin/smile.gif); 
+  list-style-image:url(chrome://editor/skin/images/smile.gif); 
 }
 
 #insert-sick {
-  list-style-image:url(chrome://messenger/skin/sick.gif); 
+  list-style-image:url(chrome://editor/skin/images/sick.gif); 
 }
 
 #insert-frown {
-  list-style-image:url(chrome://messenger/skin/frown.gif); 
+  list-style-image:url(chrome://editor/skin/images/frown.gif); 
 }
 
 #insert-wink {
-  list-style-image:url(chrome://messenger/skin/wink.gif); 
+  list-style-image:url(chrome://editor/skin/images/wink.gif); 
 }
 
 #insert-smile5 {
-  list-style-image:url(chrome://messenger/skin/smile.gif); 
+  list-style-image:url(chrome://editor/skin/images/s_smile.gif); 
 }
 
 #insert-smile6 {
-  list-style-image:url(chrome://messenger/skin/frown.gif); 
+  list-style-image:url(chrome://editor/skin/images/s_frown.gif); 
 }
 
 #insert-smile7 {
-  list-style-image:url(chrome://messenger/skin/wink.gif); 
+  list-style-image:url(chrome://editor/skin/images/s_wink.gif); 
 }
 
 

themes/modern/jar.mn

@@ -189,7 +189,7 @@ modern.jar:
     skin/modern/global/toolbar-menu-arrow-hover.gif                   (global/toolbar-menu-arrow-hover.gif)
     skin/modern/global/toolbar-menu-arrow.gif                         (global/toolbar-menu-arrow.gif)
     skin/modern/global/toolbar.css                                    (global/toolbar.css)
-    skin/modern/global/outliner.css                                   (global/outliner.css)
+	skin/modern/global/outliner.css                                   (global/outliner.css)
     skin/modern/global/tree.css                                       (global/tree.css)
     skin/modern/global/wizardOverlay.css                              (global/wizardOverlay.css)
     skin/modern/global/loading.gif                                    (global/loading.gif)
@@ -543,8 +543,6 @@ modern.jar:
     skin/modern/communicator/bookmarks/bookmark-folder-open.gif       (communicator/bookmarks/bookmark-folder-open.gif)
     skin/modern/communicator/bookmarks/bookmark-item.gif              (communicator/bookmarks/bookmark-item.gif)
     skin/modern/communicator/bookmarks/bookmarks.css                  (communicator/bookmarks/bookmarks.css)
-    skin/modern/communicator/bookmarks/bookmarksWindow.css            (communicator/bookmarks/bookmarksWindow.css)
-    skin/modern/communicator/bookmarks/bookmarksToolbar.css           (communicator/bookmarks/bookmarksToolbar.css)
     skin/modern/communicator/bookmarks/home-sel.gif                   (communicator/bookmarks/home-sel.gif)
     skin/modern/communicator/bookmarks/home.gif                       (communicator/bookmarks/home.gif)
     skin/modern/communicator/bookmarks/iefavorite.gif                 (communicator/bookmarks/iefavorite.gif)
@@ -730,6 +728,16 @@ modern.jar:
     skin/modern/editor/images/right_hover.gif                         (editor/images/right_hover.gif)
     skin/modern/editor/images/underline_active.gif                    (editor/images/underline_active.gif)
     skin/modern/editor/images/underline_hover.gif                     (editor/images/underline_hover.gif)
+    skin/modern/editor/images/smile.gif                               (editor/images/smile.gif)
+    skin/modern/editor/images/s_smile.gif                             (editor/images/s_smile.gif)
+    skin/modern/editor/images/frown.gif                               (editor/images/frown.gif)
+    skin/modern/editor/images/s_frown.gif                             (editor/images/s_frown.gif)
+    skin/modern/editor/images/wink.gif                                (editor/images/wink.gif)
+    skin/modern/editor/images/s_wink.gif                              (editor/images/s_wink.gif)
+    skin/modern/editor/images/sick.gif                                (editor/images/sick.gif)
+    skin/modern/editor/images/smile_active.gif                        (editor/images/smile_active.gif)
+    skin/modern/editor/images/smile_disabled.gif                      (editor/images/smile_disabled.gif)
+    skin/modern/editor/images/smile_hover.gif                         (editor/images/smile_hover.gif)
     skin/modern/messenger/addressbook/directory.gif                   (messenger/addressbook/directory.gif)
     skin/modern/messenger/addressbook/directory-open.gif              (messenger/addressbook/directory-open.gif)
     skin/modern/messenger/addressbook/abnewmsg.gif                    (messenger/addressbook/abnewmsg.gif)