diff --git a/mozilla/themes/classic/editor/editorPrimaryToolbar.css b/mozilla/themes/classic/editor/editorPrimaryToolbar.css
index 8e4225d6e1a..901b632bd56 100644
--- a/mozilla/themes/classic/editor/editorPrimaryToolbar.css
+++ b/mozilla/themes/classic/editor/editorPrimaryToolbar.css
@@ -79,19 +79,19 @@
 }
 
 #publishButton {
-  -moz-image-region: rect(209px 16px 224px 0);
+  -moz-image-region: rect(176px 16px 192px 0);
 }
 
 #publishButton:hover {
-  -moz-image-region: rect(209px 32px 224px 16px);
+  -moz-image-region: rect(176px 32px 192px 16px);
 }
 
 #publishButton:hover:active {
-  -moz-image-region: rect(209px 48px 224px 32px);
+  -moz-image-region: rect(176px 48px 192px 32px);
 }
 
 #publishButton[disabled="true"] {
-  -moz-image-region: rect(209px 64px 224px 48px) !important;
+  -moz-image-region: rect(176px 64px 192px 48px) !important;
 }
 
 #previewButton {
@@ -111,19 +111,19 @@
 }
 
 #printButton {
-  -moz-image-region: rect(175px 64px 191px 48px);
+  -moz-image-region: rect(160px 16px 176px 0);
 }
 
 #printButton[buttonover="true"] {
-  -moz-image-region: rect(191px 16px 207px 0);
+  -moz-image-region: rect(160px 32px 176px 16px);
 }
 
 #printButton[buttondown="true"] {
-  -moz-image-region: rect(191px 32px 207px 16px);
+  -moz-image-region: rect(160px 48px 176px 32px);
 }
 
 #printButton[disabled="true"] {
-  -moz-image-region: rect(191px 48px 207px 32px) !important;
+  -moz-image-region: rect(160px 64px 176px 48px) !important;
 }
 
 #linkButton {
@@ -143,35 +143,35 @@
 }
 
 #imageButton {
-  -moz-image-region: rect(159px 64px 175px 48px);
+  -moz-image-region: rect(144px 16px 160px 0);
 }
 
 #imageButton:hover {
-  -moz-image-region: rect(175px 16px 191px 0);
+  -moz-image-region: rect(144px 32px 160px 16px);
 }
 
 #imageButton:hover:active {
-  -moz-image-region: rect(175px 32px 191px 16px);
+  -moz-image-region: rect(144px 48px 160px 32px);
 }
 
 #imageButton[disabled="true"] {
-  -moz-image-region: rect(175px 48px 191px 32px) !important;
+  -moz-image-region: rect(144px 64px 160px 48px) !important;
 }
 
 #namedAnchorButton {
-  -moz-image-region: rect(143px 64px 159px 48px);
+  -moz-image-region: rect(128px 16px 144px 0);
 }
 
 #namedAnchorButton:hover {
-  -moz-image-region: rect(159px 16px 175px 0);
+  -moz-image-region: rect(128px 32px 144px 16px);
 }
 
 #namedAnchorButton:hover:active {
-  -moz-image-region: rect(159px 32px 175px 16px);
+  -moz-image-region: rect(128px 48px 144px 32px);
 }
 
 #namedAnchorButton[disabled="true"] {
-  -moz-image-region: rect(159px 48px 175px 32px) !important;
+  -moz-image-region: rect(128px 64px 144px 48px) !important;
 }
 
 #hlineButton {
@@ -191,97 +191,113 @@
 }
 
 #tableButton {
-  -moz-image-region: rect(122px 62px 138px 46px);
+  -moz-image-region: rect(112px 16px 128px 0);
 }
 
 #tableButton:hover {
-  -moz-image-region: rect(143px 16px 159px 0);
+  -moz-image-region: rect(112px 32px 128px 16px);
 }
 
 #tableButton:hover:active {
-  -moz-image-region: rect(143px 32px 159px 16px);
+  -moz-image-region: rect(112px 48px 128px 32px);
 }
 
 #tableButton[disabled="true"] {
-  -moz-image-region: rect(143px 48px 159px 32px) !important;
+  -moz-image-region: rect(112px 64px 128px 48px) !important;
 }
 
 #spellingButton {
-  -moz-image-region: rect(101px 23px 122px 0);
+  -moz-image-region: rect(96px 16px 112px 0);
 }
 
 #spellingButton:hover {
-  -moz-image-region: rect(101px 46px 122px 23px);
+  -moz-image-region: rect(96px 32px 112px 16px);
 }
 
 #spellingButton:hover:active {
-  -moz-image-region: rect(122px 23px 143px 0);
+  -moz-image-region: rect(96px 48px 112px 32px);
 }
 
 #spellingButton[disabled="true"] {
-  -moz-image-region: rect(122px 46px 143px 23px) !important;
+  -moz-image-region: rect(96px 64px 112px 48px) !important;
 }
 
 #cutButton {
-  -moz-image-region: rect(227px 16px 243px 0);
+  -moz-image-region: rect(192px 16px 208px 0);
 }
 
 #cutButton:hover {
-  -moz-image-region: rect(227px 32px 243px 16px);
+  -moz-image-region: rect(192px 32px 208px 16px);
 }
 
 #cutButton:hover:active {
-  -moz-image-region: rect(227px 48px 243px 32px);
+  -moz-image-region: rect(192px 48px 208px 32px);
 }
 
 #cutButton[disabled="true"] {
-  -moz-image-region: rect(227px 64px 243px 48px) !important;
+  -moz-image-region: rect(192px 64px 208px 48px) !important;
 }
 
 #copyButton {
-  -moz-image-region: rect(243px 16px 259px 0);
+  -moz-image-region: rect(208px 16px 224px 0);
 }
 
 #copyButton:hover {
-  -moz-image-region: rect(243px 32px 259px 16px);
+  -moz-image-region: rect(208px 32px 224px 16px);
 }
 
 #copyButton:hover:active {
-  -moz-image-region: rect(243px 48px 259px 32px);
+  -moz-image-region: rect(208px 48px 224px 32px);
 }
 
 #copyButton[disabled="true"] {
-  -moz-image-region: rect(243px 64px 259px 48px) !important;
+  -moz-image-region: rect(208px 64px 224px 48px) !important;
 }
 
 #pasteButton {
-  -moz-image-region: rect(259px 16px 275px 0);
+  -moz-image-region: rect(224px 16px 240px 0);
 }
 
 #pasteButton:hover {
-  -moz-image-region: rect(259px 32px 275px 16px);
+  -moz-image-region: rect(224px 32px 240px 16px);
 }
 
 #pasteButton:hover:active {
-  -moz-image-region: rect(259px 48px 275px 32px);
+  -moz-image-region: rect(224px 48px 240px 32px);
 }
 
 #pasteButton[disabled="true"] {
-  -moz-image-region: rect(259px 64px 275px 48px) !important;
+  -moz-image-region: rect(224px 64px 240px 48px) !important;
 }
 
 #findButton {
-  -moz-image-region: rect(276px 16px 292px 0);
+  -moz-image-region: rect(240px 16px 256px 0);
 }
 
 #findButton:hover {
-  -moz-image-region: rect(276px 32px 292px 16px);
+  -moz-image-region: rect(240px 32px 256px 16px);
 }
 
 #findButton:hover:active {
-  -moz-image-region: rect(276px 48px 292px 32px);
+  -moz-image-region: rect(240px 48px 256px 32px);
 }
 
 #findButton[disabled="true"] {
-  -moz-image-region: rect(276px 64px 292px 48px) !important;
+  -moz-image-region: rect(240px 64px 256px 48px) !important;
+}
+
+#formButton {
+  -moz-image-region: rect(256px 16px 272px 0);
+}
+
+#formButton[buttonover="true"] {
+  -moz-image-region: rect(256px 32px 272px 16px);
+}
+
+#formButton[buttondown="true"] {
+  -moz-image-region: rect(256px 48px 272px 32px);
+}
+
+#formButton[disabled="true"] {
+  -moz-image-region: rect(256px 64px 272px 48px) !important;
 }
diff --git a/mozilla/themes/classic/editor/icons/btn1.gif b/mozilla/themes/classic/editor/icons/btn1.gif
index 5a458d07a42..9d7127951e8 100644
Binary files a/mozilla/themes/classic/editor/icons/btn1.gif and b/mozilla/themes/classic/editor/icons/btn1.gif differ