diff --git a/mozilla/themes/blue/editor/EditorDialog.css b/mozilla/themes/blue/editor/EditorDialog.css
index 5841d4b687e..36952909977 100644
--- a/mozilla/themes/blue/editor/EditorDialog.css
+++ b/mozilla/themes/blue/editor/EditorDialog.css
@@ -87,10 +87,10 @@ titledbox {
 }
 
 .color-well {
-  width:20px;
-  height: 16px; 
-  border: 1px inset #CCCCCC;
-  margin: 4px 2px 5px 8px;
+  width: 20px;
+  height: 12px; 
+  border: 1px inset #B4C3D4;
+  margin: 4px; 10px 4px 10px;
 }
 
 .color-well[default="true"] {
@@ -100,7 +100,9 @@ titledbox {
 
 button.color-button {
   /* need to override large default min-width */
-  min-width : 44px;
+  min-width : 32px;
+  width : 32px;
+  margin: 4px;
 }
 
 #ColorPickerSwatch {
diff --git a/mozilla/themes/classic/editor/EditorDialog.css b/mozilla/themes/classic/editor/EditorDialog.css
index 57b0e1f607c..25cdf8d8c77 100644
--- a/mozilla/themes/classic/editor/EditorDialog.css
+++ b/mozilla/themes/classic/editor/EditorDialog.css
@@ -85,11 +85,12 @@ titledbox {
   margin-top    : 6px;
   margin-bottom : 6px;
 }
+
 .color-well {
-  width:20px;
-  height: 16px; 
+  width: 20px;
+  height: 12px; 
   border: 1px inset #CCCCCC;
-  margin: 4px 2px 5px 8px;
+  margin: 4px; 10px 4px 10px;
 }
 
 .color-well[default="true"] {
@@ -99,7 +100,13 @@ titledbox {
 
 button.color-button {
   /* need to override large default min-width */
-  min-width : 44px;
+  min-width : 32px;
+  width : 32px;
+  margin: 4px;
+}
+
+.menu-list[focused="true"] {
+  color: white;
 }
 
 #ColorPickerSwatch {
diff --git a/mozilla/themes/classic/editor/images/img-align-bottom.gif b/mozilla/themes/classic/editor/images/img-align-bottom.gif
index 32695115966..a8ba1579703 100644
Binary files a/mozilla/themes/classic/editor/images/img-align-bottom.gif and b/mozilla/themes/classic/editor/images/img-align-bottom.gif differ
diff --git a/mozilla/themes/classic/editor/images/img-align-middle.gif b/mozilla/themes/classic/editor/images/img-align-middle.gif
index 911ba464a18..4189f7ac335 100644
Binary files a/mozilla/themes/classic/editor/images/img-align-middle.gif and b/mozilla/themes/classic/editor/images/img-align-middle.gif differ
diff --git a/mozilla/themes/classic/editor/images/img-align-top.gif b/mozilla/themes/classic/editor/images/img-align-top.gif
index 251e1862e9d..d871945929d 100644
Binary files a/mozilla/themes/classic/editor/images/img-align-top.gif and b/mozilla/themes/classic/editor/images/img-align-top.gif differ
diff --git a/mozilla/themes/classic/editor/mac/EditorDialog.css b/mozilla/themes/classic/editor/mac/EditorDialog.css
index 452483a215e..25cdf8d8c77 100644
--- a/mozilla/themes/classic/editor/mac/EditorDialog.css
+++ b/mozilla/themes/classic/editor/mac/EditorDialog.css
@@ -85,11 +85,12 @@ titledbox {
   margin-top    : 6px;
   margin-bottom : 6px;
 }
+
 .color-well {
-  width:20px;
-  height: 16px; 
+  width: 20px;
+  height: 12px; 
   border: 1px inset #CCCCCC;
-  margin: 4px 2px 5px 8px;
+  margin: 4px; 10px 4px 10px;
 }
 
 .color-well[default="true"] {
@@ -99,7 +100,13 @@ titledbox {
 
 button.color-button {
   /* need to override large default min-width */
-  min-width : 37px;
+  min-width : 32px;
+  width : 32px;
+  margin: 4px;
+}
+
+.menu-list[focused="true"] {
+  color: white;
 }
 
 #ColorPickerSwatch {
diff --git a/mozilla/themes/classic/editor/win/EditorDialog.css b/mozilla/themes/classic/editor/win/EditorDialog.css
index 5d293d00a27..25cdf8d8c77 100644
--- a/mozilla/themes/classic/editor/win/EditorDialog.css
+++ b/mozilla/themes/classic/editor/win/EditorDialog.css
@@ -85,11 +85,12 @@ titledbox {
   margin-top    : 6px;
   margin-bottom : 6px;
 }
+
 .color-well {
-  width:20px;
-  height: 16px; 
+  width: 20px;
+  height: 12px; 
   border: 1px inset #CCCCCC;
-  margin: 4px 2px 5px 8px;
+  margin: 4px; 10px 4px 10px;
 }
 
 .color-well[default="true"] {
@@ -99,7 +100,13 @@ titledbox {
 
 button.color-button {
   /* need to override large default min-width */
-  min-width : 34px;
+  min-width : 32px;
+  width : 32px;
+  margin: 4px;
+}
+
+.menu-list[focused="true"] {
+  color: white;
 }
 
 #ColorPickerSwatch {
diff --git a/mozilla/themes/modern/editor/EditorDialog.css b/mozilla/themes/modern/editor/EditorDialog.css
index f5a6c113088..fd98d0ce806 100644
--- a/mozilla/themes/modern/editor/EditorDialog.css
+++ b/mozilla/themes/modern/editor/EditorDialog.css
@@ -87,20 +87,27 @@ titledbox {
 }
 
 .color-well {
-  width:20px;
-  height: 13px; 
-  border: 1px inset #B4C3D4;
-  margin: 4px 2px 4px 8px;
+  width: 20px;
+  height: 12px; 
+/*  border: 1px inset #B4C3D4; */
+  border: blue;
+  margin: 4px; 10px 4px 10px;
 }
 
 .color-well[default="true"] {
-  border: 1px solid transparent;
+  border: 1px solid blue;
   background-color: inherit;
 }
 
 button.color-button {
   /* need to override large default min-width */
-  min-width : 37px;
+  min-width : 32px;
+  width : 32px;
+  margin: 4px;
+}
+
+.menu-list[selected="true"] {
+  color: black;
 }
 
 #ColorPickerSwatch {
diff --git a/mozilla/themes/modern/editor/images/img-align-bottom.gif b/mozilla/themes/modern/editor/images/img-align-bottom.gif
index 32695115966..a8ba1579703 100644
Binary files a/mozilla/themes/modern/editor/images/img-align-bottom.gif and b/mozilla/themes/modern/editor/images/img-align-bottom.gif differ
diff --git a/mozilla/themes/modern/editor/images/img-align-middle.gif b/mozilla/themes/modern/editor/images/img-align-middle.gif
index 911ba464a18..4189f7ac335 100644
Binary files a/mozilla/themes/modern/editor/images/img-align-middle.gif and b/mozilla/themes/modern/editor/images/img-align-middle.gif differ
diff --git a/mozilla/themes/modern/editor/images/img-align-top.gif b/mozilla/themes/modern/editor/images/img-align-top.gif
index 251e1862e9d..d871945929d 100644
Binary files a/mozilla/themes/modern/editor/images/img-align-top.gif and b/mozilla/themes/modern/editor/images/img-align-top.gif differ