diff --git a/mozilla/editor/ui/composer.js b/mozilla/editor/ui/composer.js
index baf397697be..689350c79f3 100644
--- a/mozilla/editor/ui/composer.js
+++ b/mozilla/editor/ui/composer.js
@@ -87,6 +87,10 @@ pref("editor.toolbars.showbutton.ol", true);
 pref("editor.toolbars.showbutton.outdent", true);
 pref("editor.toolbars.showbutton.indent", true);
 
+pref("editor.toolbars.showbutton.absolutePosition", true);
+pref("editor.toolbars.showbutton.decreaseZIndex", true);
+pref("editor.toolbars.showbutton.increaseZIndex", true);
+
 pref("editor.auto_save",                    false);
 pref("editor.auto_save_delay",              10);    // minutes
 pref("editor.use_html_editor",              0);
@@ -123,3 +127,6 @@ pref("editor.always_show_publish_dialog",    false);
  *            other special markup symbols as defined in HTML4.
  */
 //pref("editor.encode_entity",                 "html");
+
+pref("editor.resizing.preserve_ratio",       true);
+pref("editor.positioning.offset",            0);
diff --git a/mozilla/modules/libpref/src/init/editor.js b/mozilla/modules/libpref/src/init/editor.js
index baf397697be..689350c79f3 100644
--- a/mozilla/modules/libpref/src/init/editor.js
+++ b/mozilla/modules/libpref/src/init/editor.js
@@ -87,6 +87,10 @@ pref("editor.toolbars.showbutton.ol", true);
 pref("editor.toolbars.showbutton.outdent", true);
 pref("editor.toolbars.showbutton.indent", true);
 
+pref("editor.toolbars.showbutton.absolutePosition", true);
+pref("editor.toolbars.showbutton.decreaseZIndex", true);
+pref("editor.toolbars.showbutton.increaseZIndex", true);
+
 pref("editor.auto_save",                    false);
 pref("editor.auto_save_delay",              10);    // minutes
 pref("editor.use_html_editor",              0);
@@ -123,3 +127,6 @@ pref("editor.always_show_publish_dialog",    false);
  *            other special markup symbols as defined in HTML4.
  */
 //pref("editor.encode_entity",                 "html");
+
+pref("editor.resizing.preserve_ratio",       true);
+pref("editor.positioning.offset",            0);
diff --git a/mozilla/themes/classic/editor/editorFormatToolbar.css b/mozilla/themes/classic/editor/editorFormatToolbar.css
index 8969c6a981e..691b98c4623 100644
--- a/mozilla/themes/classic/editor/editorFormatToolbar.css
+++ b/mozilla/themes/classic/editor/editorFormatToolbar.css
@@ -534,3 +534,46 @@
   -moz-image-region: rect(260px 64px 272px 48px);
 }
 
+
+#absolutePositionButton{
+  -moz-image-region: rect(273px 16px 289px 0px);
+}
+
+#absolutePositionButton:hover {
+  -moz-image-region: rect(273px 32px 289px 16px);
+}
+
+#absolutePositionButton:hover:active {
+  -moz-image-region: rect(273px 48px 289px 32px);
+}
+
+#absolutePositionButton[disabled="true"] {
+  -moz-image-region: rect(273px 64px 289px 48px) ! important;
+}
+
+
+#absolutePositionButton[checked="true"]{
+  -moz-image-region: rect(289px 16px 305px 0px);
+}
+
+#absolutePositionButton[checked="true"]:hover {
+  -moz-image-region: rect(289px 32px 305px 16px);
+}
+
+#absolutePositionButton[checked="true"]:hover:active {
+  -moz-image-region: rect(289px 48px 305px 32px);
+}
+
+
+#FormatToolbar > #increaseZIndexButton {
+  list-style-image: url("chrome://editor/content/images/bringtofront.gif");
+}
+#FormatToolbar > #increaseZIndexButton[disabled="true"] {
+  list-style-image: url("chrome://editor/content/images/bringtofront-disabled.gif");
+}
+#FormatToolbar > #decreaseZIndexButton {
+  list-style-image: url("chrome://editor/content/images/sendtoback.gif");
+}
+#FormatToolbar > #decreaseZIndexButton[disabled="true"] {
+  list-style-image: url("chrome://editor/content/images/sendtoback-disabled.gif");
+}
diff --git a/mozilla/themes/classic/editor/icons/btn2.gif b/mozilla/themes/classic/editor/icons/btn2.gif
index 2b2621553b8..8f4ac899fbe 100644
Binary files a/mozilla/themes/classic/editor/icons/btn2.gif and b/mozilla/themes/classic/editor/icons/btn2.gif differ
diff --git a/mozilla/themes/modern/editor/editorFormatToolbar.css b/mozilla/themes/modern/editor/editorFormatToolbar.css
index 31187c183e3..9e07e776f78 100644
--- a/mozilla/themes/modern/editor/editorFormatToolbar.css
+++ b/mozilla/themes/modern/editor/editorFormatToolbar.css
@@ -557,3 +557,44 @@
 #HighlightColorButton[disabled="true"]:hover:active {
   -moz-image-region: rect(372px 22px 389px 0px);
 }
+
+#absolutePositionButton {
+  -moz-image-region: rect(372px 44px 389px 22px);
+}
+
+#absolutePositionButton:hover {
+  -moz-image-region: rect(372px 66px 389px 44px);
+}
+
+#absolutePositionButton:hover:active {
+  -moz-image-region: rect(372px 88px 389px 66px);
+}
+
+#absolutePositionButton[checked="true"]{
+  -moz-image-region: rect(389px 22px 406px 0px);
+}
+
+#absolutePositionButton[checked="true"]:hover {
+  -moz-image-region: rect(389px 44px 406px 22px);
+}
+
+#absolutePositionButton[checked="true"]:hover:active {
+  -moz-image-region: rect(389px 66px 406px 44px);
+}
+
+#absolutePositionButton[disabled="true"] {
+  -moz-image-region: rect(389px 88px 406px 66px) !important;
+}
+
+#FormatToolbar > #increaseZIndexButton {
+  list-style-image: url("chrome://editor/content/images/bringtofront.gif");
+}
+#FormatToolbar > #increaseZIndexButton[disabled="true"] {
+  list-style-image: url("chrome://editor/content/images/bringtofront-disabled.gif");
+}
+#FormatToolbar > #decreaseZIndexButton {
+  list-style-image: url("chrome://editor/content/images/sendtoback.gif");
+}
+#FormatToolbar > #decreaseZIndexButton[disabled="true"] {
+  list-style-image: url("chrome://editor/content/images/sendtoback-disabled.gif");
+}
diff --git a/mozilla/themes/modern/editor/icons/btn2.gif b/mozilla/themes/modern/editor/icons/btn2.gif
index 1733f44b249..5a00dcb368e 100644
Binary files a/mozilla/themes/modern/editor/icons/btn2.gif and b/mozilla/themes/modern/editor/icons/btn2.gif differ