diff --git a/toolkit/content/widgets/richlistbox.xml b/toolkit/content/widgets/richlistbox.xml
index ceb92121757..e4650299ffc 100644
--- a/toolkit/content/widgets/richlistbox.xml
+++ b/toolkit/content/widgets/richlistbox.xml
@@ -53,6 +53,10 @@
       </xul:scrollbox>
     </content>
 
+    <resources>
+      <stylesheet src="chrome://global/skin/richlistbox.css"/>
+    </resources>
+
     <implementation implements="nsIDOMXULSelectControlElement">
       <field name="scrollBoxObject">null</field>
       <constructor>
@@ -124,7 +128,8 @@
           <![CDATA[
             // if nothing selected, we go from the bottom
             for (var i = this.selectedItem ? this.selectedItem.previousSibling : this.lastChild; i; i = i.previousSibling) {
-              if ("fireEvent" in i) {
+              // could have a template element, which would be a sibling
+              if (i instanceof Components.interfaces.nsIDOMXULSelectControlItemElement) {
                 this.selectedItem = i;
                 return true;
               }
@@ -139,7 +144,8 @@
           <![CDATA[
             // if nothing selected, we go from the top
             for (var i = this.selectedItem ? this.selectedItem.nextSibling : this.firstChild; i; i = i.nextSibling) {
-              if ("fireEvent" in i) {
+              // could have a template element, which would be a sibling
+              if (i instanceof Components.interfaces.nsIDOMXULSelectControlItemElement) {
                 this.selectedItem = i;
                 return true;
               }
@@ -242,6 +248,10 @@
       <children />
     </content>
 
+    <resources>
+      <stylesheet src="chrome://global/skin/richlistbox.css"/>
+    </resources>
+
     <implementation implements="nsIAccessibleProvider, nsIDOMXULSelectControlItemElement">
       <!-- ///////////////// nsIAccessibleProvider ///////////////// -->
       <property name="accessible">
@@ -289,7 +299,7 @@
           <![CDATA[
             var parent = this.parentNode;
             while (parent) {
-              if (parent.localName == "richlistbox")
+              if (parent instanceof Components.interfaces.nsIDOMXULSelectControlElement)
                 return parent;
               parent = parent.parentNode;
             }
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
index f41b6b4b1c8..2831f86f865 100644
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -1017,4 +1017,10 @@ expander {
 richlistbox {
   -moz-binding: url('chrome://global/content/bindings/richlistbox.xml#richlistbox');
   -moz-user-focus: normal;
+  -moz-appearance: listbox;
 }
+
+richlistitem {
+  -moz-binding: url('chrome://global/content/bindings/richlistbox.xml#richlistitem');
+}
+
diff --git a/toolkit/themes/pinstripe/global/jar.mn b/toolkit/themes/pinstripe/global/jar.mn
index 6006bbc8df3..6e61c9583cc 100644
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@@ -37,6 +37,7 @@ classic.jar:
 +  skin/classic/global/popup.css
 +  skin/classic/global/progressmeter.css
 +  skin/classic/global/radio.css
++  skin/classic/global/richlistbox.css
 +  skin/classic/global/scrollbars.css
 +  skin/classic/global/scrollbox.css
 +  skin/classic/global/spinbuttons.css
diff --git a/toolkit/themes/pinstripe/global/richlistbox.css b/toolkit/themes/pinstripe/global/richlistbox.css
new file mode 100644
index 00000000000..2db665d1cc2
--- /dev/null
+++ b/toolkit/themes/pinstripe/global/richlistbox.css
@@ -0,0 +1,53 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 Richlistbox CSS.
+ *
+ * The Initial Developer of the Original Code is
+ * IBM Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Doron Rosenberg <doronr@us.ibm.com> (original author)
+ *
+ * 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 MPL, 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 MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+richlistbox {
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+}
+
+richlistbox[disabled="true"] {
+  color: GrayText;
+}
+
+richlistitem[selected="true"] {
+  background-color: Highlight;
+  color: HighlightText;
+}
+
diff --git a/toolkit/themes/qute/global/jar.mn b/toolkit/themes/qute/global/jar.mn
index dfecf585dc6..501b53f5b36 100644
--- a/toolkit/themes/qute/global/jar.mn
+++ b/toolkit/themes/qute/global/jar.mn
@@ -33,6 +33,7 @@ classic.jar:
   skin/classic/global/printPreview.css
   skin/classic/global/progressmeter.css
   skin/classic/global/radio.css
+  skin/classic/global/richlistbox.css
   skin/classic/global/scrollbars.css
   skin/classic/global/scrollbox.css
   skin/classic/global/spinbuttons.css
diff --git a/toolkit/themes/qute/global/richlistbox.css b/toolkit/themes/qute/global/richlistbox.css
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/toolkit/themes/winstripe/global/jar.mn b/toolkit/themes/winstripe/global/jar.mn
index 56d80526e16..7d8f5a1452a 100644
--- a/toolkit/themes/winstripe/global/jar.mn
+++ b/toolkit/themes/winstripe/global/jar.mn
@@ -26,6 +26,7 @@ classic.jar:
         skin/classic/global/printPreview.css
         skin/classic/global/progressmeter.css
         skin/classic/global/radio.css
+        skin/classic/global/richlistbox.css
         skin/classic/global/scrollbars.css
         skin/classic/global/scrollbox.css
         skin/classic/global/spinbuttons.css
diff --git a/toolkit/themes/winstripe/global/richlistbox.css b/toolkit/themes/winstripe/global/richlistbox.css
new file mode 100644
index 00000000000..2db665d1cc2
--- /dev/null
+++ b/toolkit/themes/winstripe/global/richlistbox.css
@@ -0,0 +1,53 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * 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 Richlistbox CSS.
+ *
+ * The Initial Developer of the Original Code is
+ * IBM Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Doron Rosenberg <doronr@us.ibm.com> (original author)
+ *
+ * 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 MPL, 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 MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+richlistbox {
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+}
+
+richlistbox[disabled="true"] {
+  color: GrayText;
+}
+
+richlistitem[selected="true"] {
+  background-color: Highlight;
+  color: HighlightText;
+}
+