diff --git a/mozilla/suite/themes/classic/editor/editorFormatToolbar.css b/mozilla/suite/themes/classic/editor/editorFormatToolbar.css
index e018481d80e..77cf1461ac2 100644
--- a/mozilla/suite/themes/classic/editor/editorFormatToolbar.css
+++ b/mozilla/suite/themes/classic/editor/editorFormatToolbar.css
@@ -445,6 +445,44 @@
   list-style-image: url("chrome://editor/content/images/undecided_n.gif"); 
 }
 
+.insert-surprise > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/surprise_n.gif"); 
+}
+
+.insert-kiss > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/kiss_n.gif"); 
+}
+
+.insert-yell > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/yell_n.gif"); 
+}
+
+.insert-cool > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/cool_n.gif"); 
+}
+
+.insert-undecided > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/undecided_n.gif"); 
+}
+
+.insert-money > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/money_n.gif"); 
+}
+
+.insert-foot > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/foot_n.gif"); 
+}
+
+.insert-innocent > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/innocent_n.gif"); 
+}
+
+.insert-sealed > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/sealed_n.gif"); 
+}
+
+
+
 /* ::::: fg/bg color picker ::::: */
 
 .ColorPickerLabel {
diff --git a/mozilla/suite/themes/classic/messenger/messageBody.css b/mozilla/suite/themes/classic/messenger/messageBody.css
index e29b5570b91..6d8463603a8 100644
--- a/mozilla/suite/themes/classic/messenger/messageBody.css
+++ b/mozilla/suite/themes/classic/messenger/messageBody.css
@@ -150,7 +150,18 @@ span.moz-smiley-s3,
 span.moz-smiley-s4,
 span.moz-smiley-s5,
 span.moz-smiley-s6,
-span.moz-smiley-s7 {
+span.moz-smiley-s7, 
+span.moz-smiley-s8, 
+span.moz-smiley-s9, 
+span.moz-smiley-s10, 
+span.moz-smiley-s11, 
+span.moz-smiley-s12, 
+span.moz-smiley-s13, 
+span.moz-smiley-s14, 
+span.moz-smiley-s15, 
+span.moz-smiley-s16 
+
+{
   min-height: 17px; margin-left: 2px; margin-top: 2px;
   padding-left: 20px; 
   background-repeat: no-repeat; 
@@ -163,7 +174,17 @@ span.moz-smiley-s3 > span,
 span.moz-smiley-s4 > span,
 span.moz-smiley-s5 > span,
 span.moz-smiley-s6 > span,
-span.moz-smiley-s7 > span {
+span.moz-smiley-s7 > span, 
+span.moz-smiley-s8 > span, 
+span.moz-smiley-s9 > span, 
+span.moz-smiley-s10 > span, 
+span.moz-smiley-s11 > span, 
+span.moz-smiley-s12 > span, 
+span.moz-smiley-s13 > span, 
+span.moz-smiley-s14 > span, 
+span.moz-smiley-s15 > span, 
+span.moz-smiley-s16 > span 
+{
     display: none;
 }
 
@@ -194,3 +215,39 @@ span.moz-smiley-s6 {
 span.moz-smiley-s7 {
   background-image: url("chrome://editor/content/images/undecided_n.gif");
 }
+
+span.moz-smiley-s8 {
+  background-image: url("chrome://editor/content/images/surprise_n.gif");
+}
+
+span.moz-smiley-s9 {
+  background-image: url("chrome://editor/content/images/kiss_n.gif");
+}
+
+span.moz-smiley-s10 {
+  background-image: url("chrome://editor/content/images/yell_n.gif");
+}
+
+span.moz-smiley-s11 {
+  background-image: url("chrome://editor/content/images/cool_n.gif");
+}
+
+span.moz-smiley-s12 {
+  background-image: url("chrome://editor/content/images/money_n.gif");
+}
+
+span.moz-smiley-s13 {
+  background-image: url("chrome://editor/content/images/foot_n.gif");
+}
+
+span.moz-smiley-s14 {
+  background-image: url("chrome://editor/content/images/innocent_n.gif");
+}
+
+span.moz-smiley-s15 {
+  background-image: url("chrome://editor/content/images/cry_n.gif");
+}
+
+span.moz-smiley-s16 {
+  background-image: url("chrome://editor/content/images/sealed_n.gif");
+}
diff --git a/mozilla/suite/themes/modern/editor/editorFormatToolbar.css b/mozilla/suite/themes/modern/editor/editorFormatToolbar.css
index 140ce33538e..31187c183e3 100644
--- a/mozilla/suite/themes/modern/editor/editorFormatToolbar.css
+++ b/mozilla/suite/themes/modern/editor/editorFormatToolbar.css
@@ -472,6 +472,43 @@
   list-style-image: url("chrome://editor/content/images/undecided_n.gif"); 
 }
 
+.insert-surprise > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/surprise_n.gif"); 
+}
+
+.insert-kiss > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/kiss_n.gif"); 
+}
+
+.insert-yell > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/yell_n.gif"); 
+}
+
+.insert-cool > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/cool_n.gif"); 
+}
+
+.insert-money > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/money_n.gif"); 
+}
+
+.insert-foot > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/foot_n.gif"); 
+}
+
+.insert-innocent > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/innocent_n.gif"); 
+}
+
+.insert-cry > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/cry_n.gif"); 
+}
+
+.insert-sealed > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/sealed_n.gif"); 
+}
+
+
 /* ::::: fg/bg color picker ::::: */
 
 .color-button {
diff --git a/mozilla/suite/themes/modern/messenger/messageBody.css b/mozilla/suite/themes/modern/messenger/messageBody.css
index d0f143c8384..804096f7878 100644
--- a/mozilla/suite/themes/modern/messenger/messageBody.css
+++ b/mozilla/suite/themes/modern/messenger/messageBody.css
@@ -150,7 +150,17 @@ span.moz-smiley-s3,
 span.moz-smiley-s4,
 span.moz-smiley-s5,
 span.moz-smiley-s6,
-span.moz-smiley-s7 {
+span.moz-smiley-s7, 
+span.moz-smiley-s8, 
+span.moz-smiley-s9, 
+span.moz-smiley-s10, 
+span.moz-smiley-s11, 
+span.moz-smiley-s12, 
+span.moz-smiley-s13, 
+span.moz-smiley-s14, 
+span.moz-smiley-s15, 
+span.moz-smiley-s16 
+{
   min-height: 17px; margin-left: 2px; margin-top: 2px;
   padding-left: 20px; 
   background-repeat: no-repeat; 
@@ -163,7 +173,17 @@ span.moz-smiley-s3 > span,
 span.moz-smiley-s4 > span,
 span.moz-smiley-s5 > span,
 span.moz-smiley-s6 > span,
-span.moz-smiley-s7 > span {
+span.moz-smiley-s7 > span, 
+span.moz-smiley-s8 > span, 
+span.moz-smiley-s9 > span, 
+span.moz-smiley-s10 > span, 
+span.moz-smiley-s11 > span, 
+span.moz-smiley-s12 > span, 
+span.moz-smiley-s13 > span, 
+span.moz-smiley-s14 > span, 
+span.moz-smiley-s15 > span, 
+span.moz-smiley-s16 > span 
+{
     display: none;
 }
 
@@ -194,3 +214,39 @@ span.moz-smiley-s6 {
 span.moz-smiley-s7 {
   background-image: url("chrome://editor/content/images/undecided_n.gif");
 }
+
+span.moz-smiley-s8 {
+  background-image: url("chrome://editor/content/images/surprise_n.gif");
+}
+
+span.moz-smiley-s9 {
+  background-image: url("chrome://editor/content/images/kiss_n.gif");
+}
+
+span.moz-smiley-s10 {
+  background-image: url("chrome://editor/content/images/yell_n.gif");
+}
+
+span.moz-smiley-s11 {
+  background-image: url("chrome://editor/content/images/cool_n.gif");
+}
+
+span.moz-smiley-s12 {
+  background-image: url("chrome://editor/content/images/money_n.gif");
+}
+
+span.moz-smiley-s13 {
+  background-image: url("chrome://editor/content/images/foot_n.gif");
+}
+
+span.moz-smiley-s14 {
+  background-image: url("chrome://editor/content/images/innocent_n.gif");
+}
+
+span.moz-smiley-s15 {
+  background-image: url("chrome://editor/content/images/cry_n.gif");
+}
+
+span.moz-smiley-s16 {
+  background-image: url("chrome://editor/content/images/sealed_n.gif");
+}