diff --git a/mozilla/editor/ui/dialogs/content/EdColorProps.xul b/mozilla/editor/ui/dialogs/content/EdColorProps.xul
index 5ecd7c7c34f..b6814d8c8b4 100644
--- a/mozilla/editor/ui/dialogs/content/EdColorProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdColorProps.xul
@@ -46,96 +46,97 @@
   <broadcaster id="args" value=""/>
   <popupset id="aTooltipSet" />
 
-  <text class="label bold" value="&pageColors.label;"/>
-  <box orient="vertical">
-    <radiogroup id="pageColorGroup" orient="vertical" autostretch="never">
-      <radio group="pageColorGroup" id="DefaultColorsRadio" value="&defaultColorsRadio.label;" oncommand="UseDefaultColors()"
-        tooltip="aTooltip"     tooltiptext="&defaultColorsRadio.tooltip;" />
-      <radio group="pageColorGroup" id="CustomColorsRadio" value="&customColorsRadio.label;" oncommand="UseCustomColors()"
-        tooltip="aTooltip"     tooltiptext="&customColorsRadio.tooltip;" />
-    </radiogroup>
-  </box>
-  <spring class="spacer"/>
-  <box class="big-left-margin">
-    <grid>
-      <columns><column/><column/></columns>
-      <rows>
-        <row>
-          <text class="label" value="&normalText.label;&colon.character;" />
-          <menu class="colorpicker">
-    	      <box>
-              <spring id="textCW" class="color-well"/>
-              <image class="popup-trigger"/>
-            </box>
-    	      <menupopup id="normalMenuPopup">
-              <colorpicker id="textCP" palettename="standard" onclick="GetColorAndUpdate('textCP','textCW',this);"/>
-    	      </menupopup>
-          </menu>
-        </row>
-        <row>
-        <text class="label" value="&linkText.label;&colon.character;" />
-          <menu class="colorpicker">
-    	      <box>
-              <spring id="linkCW" class="color-well"/>
-              <image class="popup-trigger"/>
-            </box>
-    	      <menupopup>
-              <colorpicker id="linkCP" palettename="standard" onclick="GetColorAndUpdate('linkCP','linkCW',this);"/>
-    	      </menupopup>
-          </menu>
-        </row>
-        <row>
-          <text class="label" value="&activeLinkText.label;&colon.character;" />
-          <menu class="colorpicker">
-    	      <box>
-              <spring id="activeCW" class="color-well"/>
-              <image class="popup-trigger"/>
-            </box>
-    	      <menupopup>
-              <colorpicker id="activeCP" palettename="standard" onclick="GetColorAndUpdate('activeCP','activeCW',this);"/>
-    	      </menupopup>
-          </menu>
-        </row>
-        <row>
-          <text class="label" value ="&visitedLinkText.label;&colon.character;" />
-          <menu class="colorpicker">
-    	      <box>
-              <spring id="visitedCW" class="color-well"/>
-              <image class="popup-trigger"/>
-            </box>
-    	      <menupopup>
-              <colorpicker id="visitedCP" palettename="standard" onclick="GetColorAndUpdate('visitedCP','visitedCW',this);"/>
-    	      </menupopup>
-          </menu>
-        </row>
-        <row>
-          <text class="label" value="&background.label;" />
-          <menu class="colorpicker">
-    	      <box>
-              <spring id="backgroundCW" class="color-well"/>
-              <image class="popup-trigger"/>
-            </box>
-    	      <menupopup>
-              <colorpicker id="backgroundCP" palettename="standard" onclick="GetColorAndUpdate('backgroundCP','backgroundCW',this);"/>
-    	      </menupopup>
-          </menu>
-        </row>
-      </rows>
-    </grid>
-    <box orient="vertical" id="ColorPreview">
-      <text class="label" id="NormalText" value="&normalText.label;"/>
-      <text class="label" id="LinkText" value="&linkText.label;"/>
-      <text class="label" id="ActiveLinkText" value="&activeLinkText.label;"/>
-      <text class="label" id="VisitedLinkText" value="&visitedLinkText.label;"/>
+  <titledbox orient="vertical"><title><text class="label" value="&pageColors.label;"/></title>
+    <box orient="vertical">
+      <radiogroup id="pageColorGroup" orient="vertical" autostretch="never">
+        <radio group="pageColorGroup" id="DefaultColorsRadio" value="&defaultColorsRadio.label;" oncommand="UseDefaultColors()"
+          tooltip="aTooltip"     tooltiptext="&defaultColorsRadio.tooltip;" />
+        <radio group="pageColorGroup" id="CustomColorsRadio" value="&customColorsRadio.label;" oncommand="UseCustomColors()"
+          tooltip="aTooltip"     tooltiptext="&customColorsRadio.tooltip;" />
+      </radiogroup>
     </box>
-  </box>
-  <separator class="groove"/>
+    <spring class="spacer"/>
+    <box class="big-left-margin">
+      <grid>
+        <columns><column/><column/></columns>
+        <rows>
+          <row>
+            <text class="label" value="&normalText.label;&colon.character;" />
+            <menu class="colorpicker">
+    	        <box>
+                <spring id="textCW" class="color-well"/>
+                <image class="popup-trigger"/>
+              </box>
+    	        <menupopup id="normalMenuPopup">
+                <colorpicker id="textCP" palettename="standard" onclick="GetColorAndUpdate('textCP','textCW',this);"/>
+    	        </menupopup>
+            </menu>
+          </row>
+          <row>
+          <text class="label" value="&linkText.label;&colon.character;" />
+            <menu class="colorpicker">
+    	        <box>
+                <spring id="linkCW" class="color-well"/>
+                <image class="popup-trigger"/>
+              </box>
+    	        <menupopup>
+                <colorpicker id="linkCP" palettename="standard" onclick="GetColorAndUpdate('linkCP','linkCW',this);"/>
+    	        </menupopup>
+            </menu>
+          </row>
+          <row>
+            <text class="label" value="&activeLinkText.label;&colon.character;" />
+            <menu class="colorpicker">
+    	        <box>
+                <spring id="activeCW" class="color-well"/>
+                <image class="popup-trigger"/>
+              </box>
+    	        <menupopup>
+                <colorpicker id="activeCP" palettename="standard" onclick="GetColorAndUpdate('activeCP','activeCW',this);"/>
+    	        </menupopup>
+            </menu>
+          </row>
+          <row>
+            <text class="label" value ="&visitedLinkText.label;&colon.character;" />
+            <menu class="colorpicker">
+    	        <box>
+                <spring id="visitedCW" class="color-well"/>
+                <image class="popup-trigger"/>
+              </box>
+    	        <menupopup>
+                <colorpicker id="visitedCP" palettename="standard" onclick="GetColorAndUpdate('visitedCP','visitedCW',this);"/>
+    	        </menupopup>
+            </menu>
+          </row>
+          <row>
+            <text class="label" value="&background.label;" />
+            <menu class="colorpicker">
+    	        <box>
+                <spring id="backgroundCW" class="color-well"/>
+                <image class="popup-trigger"/>
+              </box>
+    	        <menupopup>
+                <colorpicker id="backgroundCP" palettename="standard" onclick="GetColorAndUpdate('backgroundCP','backgroundCW',this);"/>
+    	        </menupopup>
+            </menu>
+          </row>
+        </rows>
+      </grid>
+      <box orient="vertical" id="ColorPreview">
+        <text class="label" id="NormalText" value="&normalText.label;"/>
+        <text class="label" id="LinkText" value="&linkText.label;"/>
+        <text class="label" id="ActiveLinkText" value="&activeLinkText.label;"/>
+        <text class="label" id="VisitedLinkText" value="&visitedLinkText.label;"/>
+      </box>
+    </box>
+  <spring class="spacer"/>
+  </titledbox>
   <checkbox id="BackgroundImageCheckbox" value="&backgroundImage.label;" oncommand="onBackgroundImageCheckbox()"
        tooltip="aTooltip" tooltiptext="&backgroundImage.tooltip;" />
   <grid>
     <columns><column/><column/></columns>
     <rows>
-      <row>
+      <row style="margin-bottom: 5px">
         <textfield id="BackgroundImageInput"/>
         <button class="dialog" id="ChooseFile" flex="1" />
       </row>