--- a/browser/base/content/sanitize.xul
+++ b/browser/base/content/sanitize.xul
@@ -123,16 +123,18 @@
           <menuseparator/>
           <menuitem label="&clearTimeDuration.everything;" value="0"/>
         </menupopup>
       </menulist>
       <label id="sanitizeDurationSuffixLabel"
              value="&clearTimeDuration.suffix;"/>
     </hbox>
 
+    <separator class="thin"/>
+
 #ifdef CRH_DIALOG_TREE_VIEW
     <deck id="durationDeck">
       <tree id="placesTree" flex="1" hidecolumnpicker="true" rows="10"
             disabled="true" disableKeyNavigation="true">
         <treecols>
           <treecol id="date" label="&clearTimeDuration.dateColumn;" flex="1"/>
           <splitter class="tree-splitter"/>
           <treecol id="title" label="&clearTimeDuration.nameColumn;" flex="5"/>
@@ -144,17 +146,17 @@
                       onmousedown="gSanitizePromptDialog.grippyMoved('onmousedown', event);"/>
       </tree>
 #endif
 
       <vbox id="sanitizeEverythingWarningBox">
         <spacer flex="1"/>
         <hbox align="center">
           <image id="sanitizeEverythingWarningIcon"/>
-          <vbox id="sanitizeEverythingWarningDescBox">
+          <vbox id="sanitizeEverythingWarningDescBox" flex="1">
             <description id="sanitizeEverythingWarning"/>
             <description id="sanitizeEverythingUndoWarning">&sanitizeEverythingUndoWarning;</description>
           </vbox>
         </hbox>
         <spacer flex="1"/>
       </vbox>
 
 #ifdef CRH_DIALOG_TREE_VIEW

--- a/browser/themes/gnomestripe/browser/preferences/preferences.css
+++ b/browser/themes/gnomestripe/browser/preferences/preferences.css
@@ -152,23 +152,11 @@ radio[pane=paneAdvanced] {
    of the groupbox from being cutoff */
 .bottomBox {
   padding-bottom: 4px;
 }
 
 /**
  * Clear Private Data
  */
-#SanitizeDurationBox {
-  padding-bottom: 10px;
-}
-
-#sanitizeDurationChoice {
-  margin: 0; 
-}
-
-#sanitizeDurationLabel {
-  -moz-margin-start: 3px;
-}
-
 #SanitizeDialogPane > groupbox {
   margin-top: 0;
 }

--- a/browser/themes/gnomestripe/browser/sanitizeDialog.css
+++ b/browser/themes/gnomestripe/browser/sanitizeDialog.css
@@ -1,8 +1,18 @@
+#sanitizeDurationChoice {
+  -moz-margin-end: 0;
+}
+
+/* Align the duration label with the warning box and item list */
+#sanitizeDurationLabel {
+  -moz-margin-start: 3px;
+}
+
+
 /* Hide the duration dropdown suffix label if it's empty.  Otherwise it
    takes up a little space, causing the end of the dropdown to not be aligned
    with the warning box. */
 #sanitizeDurationSuffixLabel[value=""] {
   display: none;
 }
 
 
@@ -27,29 +37,28 @@
 
 #sanitizeEverythingWarningIcon {
   list-style-image: url("chrome://global/skin/icons/warning-large.png");
   padding: 0;
   margin: 0;
 }
 
 #sanitizeEverythingWarningDescBox {
-  padding: 0;
+  padding: 0 16px;
   margin: 0;
-  padding-left: 16px;
 }
 
 
 /* Progressive disclosure button */
 #detailsExpanderWrapper {
   padding: 0;
   margin-top: 6px;
   margin-bottom: 6px;
-  margin-left: -6px;
-  margin-right: 0;
+  -moz-margin-start: -6px;
+  -moz-margin-end: 0;
 }
 
 .expander-up,
 .expander-down {
   min-width: 0;
   padding: 2px 0;
   -moz-padding-start: 2px;
 }
@@ -68,21 +77,20 @@
 
 .expander-up:hover:active {
   list-style-image: url("chrome://global/skin/arrow/arrow-up-hov.gif");
 }
 
 
 /* Make the item list the same width as the warning box */
 #itemList {
-  margin-left: 0;
-  margin-right: 0;
+  -moz-margin-start: 0;
+  -moz-margin-end: 0;
 }
 
 
-/* Make the rightmost dialog button ("accept") align wih right side of the
-   warning box */
+/* Align the last dialog button with the end of the warning box */
 .prefWindow-dlgbuttons {
-  margin-right: 0;
+  -moz-margin-end: 0;
 }
 .dialog-button[dlgtype="accept"] {
-  margin-right: 0;
+  -moz-margin-end: 0;
 }

--- a/browser/themes/pinstripe/browser/preferences/preferences.css
+++ b/browser/themes/pinstripe/browser/preferences/preferences.css
@@ -271,23 +271,11 @@ caption {
 
 .updateControls {
   -moz-margin-start: 10px;
 }
 
 /**
  * Clear Private Data
  */
-#SanitizeDurationBox {
-  padding-bottom: 10px;
-}
-
-#sanitizeDurationChoice {
-  margin: 0; 
-}
-
-#sanitizeDurationLabel {
-  -moz-margin-start: 3px;
-}
-
 #SanitizeDialogPane > groupbox {
   margin-top: 0;
 }

--- a/browser/themes/pinstripe/browser/sanitizeDialog.css
+++ b/browser/themes/pinstripe/browser/sanitizeDialog.css
@@ -1,8 +1,14 @@
+/* Align the duration label with the warning box and item list */
+#sanitizeDurationLabel {
+  -moz-margin-start: 1px;
+}
+
+
 /* Hide the duration dropdown suffix label if it's empty.  Otherwise it
    takes up a little space, causing the end of the dropdown to not be aligned
    with the warning box. */
 #sanitizeDurationSuffixLabel[value=""] {
   display: none;
 }
 
 
@@ -27,29 +33,28 @@
 
 #sanitizeEverythingWarningIcon {
   list-style-image: url("chrome://global/skin/icons/warning-large.png");
   padding: 0;
   margin: 0;
 }
 
 #sanitizeEverythingWarningDescBox {
-  padding: 0;
+  padding: 0 16px;
   margin: 0;
-  padding-left: 16px;
 }
 
 
 /* Progressive disclosure button */
 #detailsExpanderWrapper {
   padding: 0;
   margin-top: 6px;
   margin-bottom: 6px;
-  margin-left: -2px;
-  margin-right: 0;
+  -moz-margin-start: -2px;
+  -moz-margin-end: 0;
 }
 
 .expander-up,
 .expander-down {
   -moz-appearance: none;
   min-width: 0;
   padding: 0;
   margin: 0;
@@ -69,21 +74,20 @@
 
 .expander-down:hover:active {
   list-style-image: url("chrome://browser/skin/places/expander-closed-active.png");
 }
 
 
 /* Make the item list the same width as the warning box */
 #itemList {
-  margin-left: 0;
-  margin-right: 0;
+  -moz-margin-start: 0;
+  -moz-margin-end: 0;
 }
 
 
-/* Make the rightmost dialog button ("accept") align wih right side of the
-   warning box */
+/* Align the last dialog button with the end of the warning box */
 .prefWindow-dlgbuttons {
-  margin-right: 0;
+  -moz-margin-end: 0;
 }
 .dialog-button[dlgtype="accept"] {
-  margin-right: 0;
+  -moz-margin-end: 0;
 }

--- a/browser/themes/winstripe/browser/preferences/preferences.css
+++ b/browser/themes/winstripe/browser/preferences/preferences.css
@@ -172,23 +172,11 @@ radio[pane=paneAdvanced][selected="true"
    of the groupbox from being cutoff */
 .bottomBox {
   padding-bottom: 4px;
 }
 
 /**
  * Clear Private Data
  */
-#SanitizeDurationBox {
-  padding-bottom: 10px;
-}
-
-#sanitizeDurationChoice {
-  margin: 0; 
-}
-
-#sanitizeDurationLabel {
-  -moz-margin-start: 3px;
-}
-
 #SanitizeDialogPane > groupbox {
   margin-top: 0;
 }

--- a/browser/themes/winstripe/browser/sanitizeDialog.css
+++ b/browser/themes/winstripe/browser/sanitizeDialog.css
@@ -1,8 +1,18 @@
+#sanitizeDurationChoice {
+  -moz-margin-end: 0;
+}
+
+/* Align the duration label with the warning box and item list */
+#sanitizeDurationLabel {
+  -moz-margin-start: 3px;
+}
+
+
 /* Hide the duration dropdown suffix label if it's empty.  Otherwise it
    takes up a little space, causing the end of the dropdown to not be aligned
    with the warning box. */
 #sanitizeDurationSuffixLabel[value=""] {
   display: none;
 }
 
 
@@ -27,29 +37,28 @@
 
 #sanitizeEverythingWarningIcon {
   list-style-image: url("chrome://global/skin/icons/warning-large.png");
   padding: 0;
   margin: 0;
 }
 
 #sanitizeEverythingWarningDescBox {
-  padding: 0;
+  padding: 0 16px;
   margin: 0;
-  padding-left: 16px;
 }
 
 
 /* Progressive disclosure button */
 #detailsExpanderWrapper {
   padding: 0;
   margin-top: 6px;
   margin-bottom: 6px;
-  margin-left: -1px;
-  margin-right: 0;
+  -moz-margin-start: -1px;
+  -moz-margin-end: 0;
 }
 
 .expander-up,
 .expander-down {
   min-width: 0;
   margin: 0;
 }
 
@@ -64,21 +73,20 @@
 
 .expander-down {
   list-style-image: url("chrome://global/skin/icons/expand.png");
 }
 
 
 /* Make the item list the same width as the warning box */
 #itemList {
-  margin-left: 0;
-  margin-right: 0;
+  -moz-margin-start: 0;
+  -moz-margin-end: 0;
 }
 
 
-/* Make the rightmost dialog button ("cancel") align wih right side of the
-   warning box */
+/* Align the last dialog button with the end of the warning box */
 .prefWindow-dlgbuttons {
-  margin-right: 0;
+  -moz-margin-end: 0;
 }
 .dialog-button[dlgtype="cancel"] {
-  margin-right: 0;
+  -moz-margin-end: 0;
 }