diff --git a/layout/html/document/src/Makefile.in b/layout/html/document/src/Makefile.in
index 119df17113ac..f5550c3d9113 100644
--- a/layout/html/document/src/Makefile.in
+++ b/layout/html/document/src/Makefile.in
@@ -79,18 +79,16 @@ _FILES	= \
 	$(NULL)
 
 ifeq ($(OS_ARCH),OS2)
-FORMS_CSS	= $(srcdir)/os2/forms.css
-else
-FORMS_CSS	= $(srcdir)/forms.css
+PLATFORM_FORMS_CSS	= $(srcdir)/os2/platform-forms.css
 endif
 
 GARBAGE		+= $(addprefix $(DIST)/bin/res/,$(_FILES)) $(DIST)/bin/res/ua.css
 
-libs:: $(_FILES) $(FORMS_CSS)
+libs:: $(_FILES) $(srcdir)/forms.css  $(PLATFORM_FORMS_CSS)
 	$(INSTALL) $^ $(DIST)/bin/res
 	rm -f $(DIST)/bin/res/ua.css
 	cp $(srcdir)/ua.css $(DIST)/bin/res
 
-install:: $(_FILES) $(FORMS_CSS) ua.css
+install:: $(_FILES) $(srcdir)/forms.css ua.css $(PLATFORM_FORMS_CSS)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res
 
diff --git a/layout/html/document/src/os2/forms.css b/layout/html/document/src/os2/forms.css
deleted file mode 100644
index 2e93b6d929f0..000000000000
--- a/layout/html/document/src/os2/forms.css
+++ /dev/null
@@ -1,426 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/** 
-  Styles for old GFX form widgets
- **/ 
- 
-
-@namespace url(http://www.w3.org/1999/xhtml); /* set default namespace to HTML */
-@namespace xul url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-
-*|*:-moz-fieldset-content {
-  display: block;
-}
-
-form {
-  display: block;
-  margin: 0 0 1em 0;
-}
-
-/* miscellaneous form elements */
-
-legend {
-  padding-left: 2px;
-  padding-right: 2px;
-  border: none;
-}
-
-fieldset {
-  display: block;
-  margin-left: 2px;
-  margin-right: 2px;
-  padding: 0.75em 0.625em;
-  border: 2px groove ThreeDFace;
-}
-
-label {
-  /* our <label> support is badly broken. 
-     does not support display types other than inline(b=100801) 
-   */
-  display: inline !important;
-}
-
-
-/* default inputs, text inputs, and selects */
-input {
-  padding: 1px 0 1px 0;
-  border: 2px inset ThreeDFace;
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-  text-align: start;
-  vertical-align: text-bottom;
-  cursor: text;
-  -moz-box-sizing: border-box;
-  -moz-user-focus: normal;
-  -moz-binding: url("resource:///res/builtin/platformHTMLBindings.xml#inputFields");
-}
-
-textarea {
-  margin: 1px 0 1px 0;
-  border: 2px inset ThreeDFace;
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-  font: medium -moz-fixed;
-  text-align: start;
-  vertical-align: text-bottom;
-  cursor: text;
-  -moz-box-sizing: border-box;
-  -moz-user-focus: normal;
-  -moz-binding: url("resource:///res/builtin/platformHTMLBindings.xml#textAreas");
-}
-
-textarea > scrollbar {
-  cursor: default;
-}
-
-*|*:-moz-singleline-textcontrol-frame {
-  overflow: hidden;
-  white-space: nowrap;
-  background-color: inherit;
-  text-align: inherit;
-}
-
-select {
-  margin: 0;
-  border-color: ThreeDFace;
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-  white-space: nowrap;
-  text-align: start; 
-  vertical-align: text-bottom;
-  cursor: default;
-  -moz-box-sizing: border-box;
-  -moz-user-select: none;
-  -moz-user-focus: normal;
-
-  border-width: 2px !important;
-  border-style: inset !important;
-  -moz-border-radius: 0 !important;
-}
-
-select[size] {
-  padding: 1px 0 1px 0;
-}
-select[size="1"] {
-  padding: 0;
-}
-
-select > input[type="button"] {
-  width: 12px;
-  height: 12px;
-  white-space: nowrap;
-  -moz-user-focus: none;
-
-  position: static !important;
-  background-image: url("arrow.gif") !important;
-  background-repeat: no-repeat !important;
-  background-position: center !important;
-}
-
-select > input[type="button"]:active {
-  background-image: url("arrowd.gif") !important;
-}
-
-select[size], :-moz-select-scrolled-content {
-  overflow: -moz-scrollbars-vertical;
-}
-
-select:-moz-dummy-option { 
-  visibility: hidden; 
-  content: "XX"; /* demo 8, edge case test 1 */
-}
-
-*|*:-moz-display-comboboxcontrol-frame {
-  overflow: hidden;
-  padding: 1px 0 1px 4px;
-  background-color: inherit;
-  color: inherit;
-  white-space: nowrap;
-  text-align: inherit;
-  -moz-user-select: none;
-}
-
-option {
-  display: block;
-  min-height: 1em;
-  -moz-user-select: none;
-  -moz-user-focus: none;
-}
-
-select > option {
-  padding: 0 5px 0 3px;
-}
-
-option:checked {
-  background-color: Highlight ! important;
-  color: HighlightText ! important;
-}
-
-optgroup {
-  display: block;
-  font-style: italic;
-  font-weight: bold;
-  -moz-user-select: none;
-  -moz-user-focus: none;
-}
-
-optgroup > option {
-  padding-left: 20px;
-  font-style: normal;
-  font-weight: normal;
-}
-
-optgroup:before {
-  display: block;
-  content: attr(label);
-}
-
-*|*:-moz-dropdown-list {
-  z-index: 2147483647;
-  background-color: inherit;
-  -moz-user-select: none;
-
-  border: 1px outset black !important; 
-} 
-
-input[disabled],
-textarea[disabled],
-option[disabled],
-optgroup[disabled],
-select[disabled],
-select[disabled]:-moz-display-comboboxcontrol-frame {
-  color: GrayText;
-  background-color: ThreeDFace;
-  cursor: default;
-}
-
-option[disabled],
-optgroup[disabled] {
-  background-color: -moz-field;
-}
-
-/* hidden inputs */
-input[type="hidden"] {
-  display: none;
-  -moz-binding: none;
-}
-
-/* image buttons */
-input[type="image"] {
-  padding: 0;
-  border: none;
-  background-color: transparent;
-  font-family: sans-serif;
-  font-size: small;
-  vertical-align: baseline;
-  cursor: pointer;
-  -moz-binding: none;
-}
-
-input[type="image"][disabled] {
-  cursor: default;
-}
-
-input[type="image"]:focus {
-  -moz-outline: 1px dotted -moz-FieldText;
-}
-
-/* file selector */
-input[type="file"] {
-  white-space: nowrap;
-  cursor: default;
-  -moz-binding: none;
-
-  padding: 0 !important;
-  border-style: none !important;
-}
-
-input[type="file"] > input[type="text"] {
-  border-color: inherit;
-  background-color: inherit;
-  color: inherit;
-}
-
-/* button part of file selector */
-input[type="file"] > input[type="button"] {
-  height: inherit;
-}
-
-input[type="file"] > input[type="button"]:-moz-focus-inner
- {
-  padding: 0px 2px 0px 2px;
-  border: 1px dotted transparent;
-}
-
-/* radio buttons */
-input[type="radio"] {
-  width: 12px;
-  height: 12px;
-  margin: 3px 3px 0px 5px;
-  padding: 0;
-  vertical-align: baseline;
-  cursor: default;
-  -moz-binding: none;
-
-  border-width: 2px !important;
-  border-style: inset !important;
-  -moz-border-radius: 100% !important;
-}
-
-/* check boxes */
-input[type="checkbox"] {
-  width: 13px;
-  height: 13px;
-  margin: 3px 3px 3px 4px;
-  padding: 0;
-  vertical-align: text-bottom;
-  cursor: default;
-  -moz-binding: none;
-
-  border-width: 2px !important;
-  border-style: inset !important;
-  -moz-border-radius: 0 !important;
-}
-
-/* common features of radio buttons and check boxes */
-input[type="radio"][disabled],
-input[type="radio"][disabled]:active,
-input[type="radio"][disabled]:hover,
-input[type="radio"][disabled]:hover:active,
-input[type="checkbox"][disabled],
-input[type="checkbox"][disabled]:active,
-input[type="checkbox"][disabled]:hover,
-input[type="checkbox"][disabled]:hover:active {
-  padding: 1px;
-  border-color: ThreeDShadow;
-
-  border-width: 1px !important;
-  border-style: inset !important;
-}
-
-input[type="checkbox"]:focus,
-input[type="radio"]:focus {
-  border-style: groove !important;
-}
-
-input[type="checkbox"]:hover:active,
-input[type="radio"]:hover:active {
-  background-color: ThreeDFace;
-
-  border-style: inset !important;
-}
-
-*|*:-moz-radio {
-  width: 4px;
-  height: 4px;
-  left: 6px;
-  top: 6px;
-  background-color: -moz-FieldText;
-  -moz-border-radius: 3px;
-}
-
-/* buttons */
-button, 
-input[type="reset"],
-input[type="button"],
-input[type="submit"] { 
-  padding: 2px 0 2px 0;
-  border: 2px outset ButtonFace;
-  background-color: ButtonFace;
-  color: ButtonText; 
-  white-space: pre;
-  cursor: default;
-  -moz-box-sizing: border-box;
-  -moz-user-select: none;
-  -moz-user-focus: normal;
-  -moz-binding: none;
-}
-
-*|*:-moz-button-content {
-  display: block;
-  text-align: center;
-}
-
-button:active:hover,
-input[type="reset"]:active:hover,
-input[type="button"]:active:hover,
-input[type="submit"]:active:hover {
-  padding: 3px 0 1px 0;
-  border-style: inset;
-}
-
-button:-moz-focus-inner,
-input[type="reset"]:-moz-focus-inner,
-input[type="button"]:-moz-focus-inner,
-input[type="submit"]:-moz-focus-inner {
-  padding: 1px 2px 1px 2px;
-  border: 1px dotted transparent;
-}
-
-button:focus:-moz-focus-inner,
-input[type="reset"]:focus:-moz-focus-inner,
-input[type="button"]:focus:-moz-focus-inner,
-input[type="submit"]:focus:-moz-focus-inner,
-input[type="file"] > input[type="button"]:focus:-moz-focus-inner {
-  border-color: ButtonText;
-}
-
-button[disabled]:active, button[disabled],
-input[type="reset"][disabled]:active,
-input[type="reset"][disabled],
-input[type="button"][disabled]:active,
-input[type="button"][disabled],
-input[type="file"][disabled] > input[type="button"],
-input[type="file"][disabled] > input[type="button"]:active,
-select[disabled] > input[type="button"],
-select[disabled] > input[type="button"]:active,
-input[type="submit"][disabled]:active,
-input[type="submit"][disabled] {
-  padding: 3px 1px 3px 1px;
-  border: 1px outset ButtonShadow;
-  color: GrayText;
-}
-
-@media print {
-  input, textarea, select, button {
-    -moz-user-focus: none !important;
-    -moz-user-input: none !important;
-  }
-
-  input[type="file"] { height: 2em; }
-}
-
diff --git a/layout/html/document/src/os2/platform-forms.css b/layout/html/document/src/os2/platform-forms.css
new file mode 100644
index 000000000000..5a72ef2d084a
--- /dev/null
+++ b/layout/html/document/src/os2/platform-forms.css
@@ -0,0 +1,58 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+@import url("resource:/res/forms.css");
+
+input {
+  font: inherit !important;
+}
+
+/* Taking out for now - messes up some Yahoo! news stories
+select {
+  font: inherit !important;
+} */
+
+optgroup {
+  font: inherit !important;
+}
+
+button, 
+input[type="reset"],
+input[type="button"],
+input[type="submit"] { 
+  font: inherit !important;
+}
+