diff --git a/layout/html/document/src/html.css b/layout/html/document/src/html.css
index 5be1439fd8e2..a7351e339e74 100644
--- a/layout/html/document/src/html.css
+++ b/layout/html/document/src/html.css
@@ -917,10 +917,21 @@ label {
 }
 
 /* Combo box style */
+select:-moz-display-comboboxcontrol-frame {
+  overflow:hidden;
+	white-space:nowrap;
+	background-color: inherit;
+	color: inherit;
+	text-align: inherit;
+  padding-left:   4px;
+  padding-right:  5px;
+  padding-bottom: 1px;
+  padding-top:    1px;
+}
+
 select:-moz-dummy-option { 
   visibility: hidden; 
-  content: "X"; 
-  /*display: block;*/
+  content: "XX"; 
 }
 
 select[size] {
@@ -991,53 +1002,14 @@ select[disabled] > input[type="button"] {
 
 
 /* combobox display area */
-select > input#-moz-display {
-  font-family: inherit;
-  font-size: inherit;
-  border: none;
-  background-color: inherit;
-  background-image: none;
-  -moz-border-radius:0px;
-  padding-left:   0px;
-  padding-right:  0px;
-  padding-top:    1px;
-  padding-bottom: 1px;
-  margin: 0px;
-}
-
 select > input:button-content {
   text-align: left;
 }
 
-select[disabled] > input#-moz-display {
-  font-family: inherit;
-  font-size: inherit;
-  border: none;
+select[disabled]:-moz-display-comboboxcontrol-frame {
   color: gray;
-  background-color: inherit;
-  background-image: none;
-  -moz-border-radius:0px;
-  padding-left:   0px;
-  padding-right:  0px;
-  padding-top:    1px;
-  padding-bottom: 1px;
 }
 
-/* combbox display area - active */
-select > input#-moz-display:active {
-  font-family: inherit;
-  font-size: inherit;
-  border: none;
-  background-color:inherit;
-  background-image: none;
-  -moz-border-radius:0px;
-  padding-left:   0px;
-  padding-right:  0px;
-  padding-top:    1px;
-  padding-bottom: 1px;
-}
-
-
 option {
   min-height: 1em;
   display:block;
@@ -1055,18 +1027,19 @@ option[label]:before {
 select[size] option {
   padding-left:   3px;
   padding-top:    0px;
-  padding-right:  11px;
+  padding-right:  5px;
   padding-bottom: 0px;
 }
 
 select option, select[size="1"] option {
   padding-left:   3px;
   padding-top:    0px;
-  padding-right:  5px;
+  padding-right:  0px;
   padding-bottom: 0px;
 }
 
-select[disabled] > option {
+
+select[disabled] option {
   color:rgb(153, 153, 153);
   background-color:white; 
 }
@@ -1103,44 +1076,11 @@ select[size="1"] option[-moz-option-selected] {
   background-color:rgb(51,51,102); 
 }
 
-select[size="1"][disabled] option[-moz-option-selected] {
+select[size="1"] option[disabled][-moz-option-selected] {
   color:rgb(153,153,153); 
   background-color:rgb(204,204,204); 
 }
 
-select[multiple] option[-moz-option-selected] {
-  color:white;
-  background-color:rgb(51,51,102); 
-}
-
-select[multiple][disabled] option[-moz-option-selected] {
-  color:rgb(153,153,153); 
-  background-color:rgb(204,204,204); 
-}
-
-select[multiple][size="1"] option[-moz-option-selected] {
-  color:white;
-  background-color:rgb(51,51,102); 
-}
-
-select > input[type="button"]#-moz-display:-moz-focus-inner {
-   border:none;
-   padding-left  : 3px;
-   padding-right : 0px;
-   padding-top   : 0px;
-   padding-bottom: 0px;
-   margin: 0px;
-}
-
-select > input[type="button"]#-moz-display:focus:-moz-focus-inner {
-   border:none;
-   padding-left  : 0px;
-   padding-right : 0px;
-   padding-top   : 0px;
-   padding-bottom: 0px;
-   margin: 0px;
-}
-
 optgroup {
   font-family: sans-serif;
   font-size: small;
@@ -1181,14 +1121,6 @@ select[multiple]:focus {
   border: 2px dotted rgb(128,128,128);
 }
 
-select:focus > input#-moz-display {
-  border: none;
-}
-
-select[size="1"]:focus > input#-moz-display {
-  border: none;
-}
-
 /* Begin - Margin setting for form controls inside tables for Nav Quirks */
 
 td select[size] {
diff --git a/layout/style/html.css b/layout/style/html.css
index 5be1439fd8e2..a7351e339e74 100644
--- a/layout/style/html.css
+++ b/layout/style/html.css
@@ -917,10 +917,21 @@ label {
 }
 
 /* Combo box style */
+select:-moz-display-comboboxcontrol-frame {
+  overflow:hidden;
+	white-space:nowrap;
+	background-color: inherit;
+	color: inherit;
+	text-align: inherit;
+  padding-left:   4px;
+  padding-right:  5px;
+  padding-bottom: 1px;
+  padding-top:    1px;
+}
+
 select:-moz-dummy-option { 
   visibility: hidden; 
-  content: "X"; 
-  /*display: block;*/
+  content: "XX"; 
 }
 
 select[size] {
@@ -991,53 +1002,14 @@ select[disabled] > input[type="button"] {
 
 
 /* combobox display area */
-select > input#-moz-display {
-  font-family: inherit;
-  font-size: inherit;
-  border: none;
-  background-color: inherit;
-  background-image: none;
-  -moz-border-radius:0px;
-  padding-left:   0px;
-  padding-right:  0px;
-  padding-top:    1px;
-  padding-bottom: 1px;
-  margin: 0px;
-}
-
 select > input:button-content {
   text-align: left;
 }
 
-select[disabled] > input#-moz-display {
-  font-family: inherit;
-  font-size: inherit;
-  border: none;
+select[disabled]:-moz-display-comboboxcontrol-frame {
   color: gray;
-  background-color: inherit;
-  background-image: none;
-  -moz-border-radius:0px;
-  padding-left:   0px;
-  padding-right:  0px;
-  padding-top:    1px;
-  padding-bottom: 1px;
 }
 
-/* combbox display area - active */
-select > input#-moz-display:active {
-  font-family: inherit;
-  font-size: inherit;
-  border: none;
-  background-color:inherit;
-  background-image: none;
-  -moz-border-radius:0px;
-  padding-left:   0px;
-  padding-right:  0px;
-  padding-top:    1px;
-  padding-bottom: 1px;
-}
-
-
 option {
   min-height: 1em;
   display:block;
@@ -1055,18 +1027,19 @@ option[label]:before {
 select[size] option {
   padding-left:   3px;
   padding-top:    0px;
-  padding-right:  11px;
+  padding-right:  5px;
   padding-bottom: 0px;
 }
 
 select option, select[size="1"] option {
   padding-left:   3px;
   padding-top:    0px;
-  padding-right:  5px;
+  padding-right:  0px;
   padding-bottom: 0px;
 }
 
-select[disabled] > option {
+
+select[disabled] option {
   color:rgb(153, 153, 153);
   background-color:white; 
 }
@@ -1103,44 +1076,11 @@ select[size="1"] option[-moz-option-selected] {
   background-color:rgb(51,51,102); 
 }
 
-select[size="1"][disabled] option[-moz-option-selected] {
+select[size="1"] option[disabled][-moz-option-selected] {
   color:rgb(153,153,153); 
   background-color:rgb(204,204,204); 
 }
 
-select[multiple] option[-moz-option-selected] {
-  color:white;
-  background-color:rgb(51,51,102); 
-}
-
-select[multiple][disabled] option[-moz-option-selected] {
-  color:rgb(153,153,153); 
-  background-color:rgb(204,204,204); 
-}
-
-select[multiple][size="1"] option[-moz-option-selected] {
-  color:white;
-  background-color:rgb(51,51,102); 
-}
-
-select > input[type="button"]#-moz-display:-moz-focus-inner {
-   border:none;
-   padding-left  : 3px;
-   padding-right : 0px;
-   padding-top   : 0px;
-   padding-bottom: 0px;
-   margin: 0px;
-}
-
-select > input[type="button"]#-moz-display:focus:-moz-focus-inner {
-   border:none;
-   padding-left  : 0px;
-   padding-right : 0px;
-   padding-top   : 0px;
-   padding-bottom: 0px;
-   margin: 0px;
-}
-
 optgroup {
   font-family: sans-serif;
   font-size: small;
@@ -1181,14 +1121,6 @@ select[multiple]:focus {
   border: 2px dotted rgb(128,128,128);
 }
 
-select:focus > input#-moz-display {
-  border: none;
-}
-
-select[size="1"]:focus > input#-moz-display {
-  border: none;
-}
-
 /* Begin - Margin setting for form controls inside tables for Nav Quirks */
 
 td select[size] {
diff --git a/xpfe/global/resources/skin/global.css b/xpfe/global/resources/skin/global.css
index 0e9668149d55..5dd8cb25d3bd 100644
--- a/xpfe/global/resources/skin/global.css
+++ b/xpfe/global/resources/skin/global.css
@@ -1756,7 +1756,7 @@ html|select > html|input[type="button"]:hover {
   border: 1px solid #003366;
 }
 
-html|select > html|input#-moz-display:hover {
+html|select:-moz-display-comboboxcontrol-frame:hover {
   border: 1px solid #003366;
   border-right: none;
 }
@@ -1830,7 +1830,7 @@ html|select[disabled] > html|input[type="button"] {
 
 
 /* combobox display area */
-html|select > html|input#-moz-display {
+html|select:-moz-display-comboboxcontrol-frame {
   font-family: inherit;
   font-size: inherit;
   border-top: 1px solid #666666;
@@ -1839,7 +1839,7 @@ html|select > html|input#-moz-display {
   border-right: none;
   background-color: #CCCCCC;
   background-image: none;
-  padding: 0px 0px 3px 0px;
+  padding: 0px 0px 1px 3px;
   margin: 0px;
   vertical-align: bottom;
 }
@@ -1848,7 +1848,7 @@ html|select > html|input:button-content {
   text-align: left;
 }
 
-html|select[disabled] > html|input#-moz-display {
+html|select[disabled]:-moz-display-comboboxcontrol-frame {
   font-family: inherit;
   font-size: inherit;
   border: none;
@@ -1856,12 +1856,12 @@ html|select[disabled] > html|input#-moz-display {
   background-color: #CCCCCC;
   background-image: none;
   -moz-border-radius: 0px;
-  padding: 0px 0px 3px 0px;
+  padding: 0px 0px 1px 3px;
   vertical-align: bottom;
 }
 
 /* combbox display area - active */
-html|select > html|input#-moz-display:active {
+html|select:-moz-display-comboboxcontrol-frame:active {
   font-family: inherit;
   font-size: inherit;
   border-top: 1px solid #666666;
@@ -1871,7 +1871,7 @@ html|select > html|input#-moz-display:active {
   background-color: #CCCCCC;
   background-image: none;
   -moz-border-radius: 0px;
-  padding: 0px 0px 3px 0px;
+  padding: 0px 0px 1px 3px;
   vertical-align: bottom;
 }
 
@@ -1961,23 +1961,6 @@ html|select[multiple][size="1"] html|option[-moz-option-selected] {
   background-color: #336699;
 }
 
-html|select > html|input[type="button"]#-moz-display:-moz-focus-inner {
-   /*border:none;
-   padding-left  : 3px;
-   padding-right : 0px;
-   padding-top   : 0px;
-   padding-bottom: 0px;
-   margin: 0px;*/
-}
-
-html|select > html|input[type="button"]#-moz-display:focus:-moz-focus-inner {
-   /*border:none;
-   padding-left  : 0px;
-   padding-right : 0px;
-   padding-top   : 0px;
-   padding-bottom: 0px;
-   margin: 0px;*/
-}
 
 html|optgroup {
   font-family: inherit;
@@ -1999,11 +1982,11 @@ html|optgroup:before {
   content:attr(label);
 }
 
-html|select:focus > html|input#-moz-display {
+html|select:-moz-display-comboboxcontrol-frame:focus {
   border: none;
 }
 
-html|select[size="1"]:focus > html|input#-moz-display {
+html|select[size="1"]:-moz-display-comboboxcontrol-frame:focus {
   border: none;
 }