diff --git a/chrome/content/zotero/bibliography.xhtml b/chrome/content/zotero/bibliography.xhtml
index 6bc7977c27..57a8b00cc0 100644
--- a/chrome/content/zotero/bibliography.xhtml
+++ b/chrome/content/zotero/bibliography.xhtml
@@ -1,10 +1,12 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://zotero/skin/zotero.css"?>
 <?xml-stylesheet href="chrome://zotero/skin/bibliography.css"?>
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 
 <window
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+	xmlns:html="http://www.w3.org/1999/xhtml"
 	title="&zotero.bibliography.title;"
 	onload="Zotero_File_Interface_Bibliography.init()">
 <dialog
@@ -16,28 +18,28 @@
 	
 	<vbox id="zotero-bibliography-container">
 		<groupbox>
-			<label>&zotero.bibliography.style.label;</label>
+			<label><html:h2>&zotero.bibliography.style.label;</html:h2></label>
 			<richlistbox id="style-listbox" onselect="Zotero_File_Interface_Bibliography.styleChanged()"/>
-			<hbox align="right">
+			<hbox pack="end">
 				<label id="manage-styles" class="text-link"
 					onclick="Zotero_File_Interface_Bibliography.manageStyles()">&zotero.bibliography.manageStyles;</label>
 			</hbox>
 		</groupbox>
-		<groupbox>
+		<groupbox id="locale-box">
 			<hbox align="center">
-				<label>&zotero.bibliography.locale.label;</label>
+				<label><html:h2>&zotero.bibliography.locale.label;</html:h2></label>
 				<menulist id="locale-menu" oncommand="Zotero_File_Interface_Bibliography.localeChanged(this.selectedItem.value)"/>
 			</hbox>
 		</groupbox>
 		<groupbox>
-			<label>&zotero.bibliography.outputMode;</label>
+			<label><html:h2>&zotero.bibliography.outputMode;</html:h2></label>
 			<radiogroup id="output-mode-radio">
 				<radio id="citations"/>
 				<radio id="bibliography" label="&zotero.bibliography.bibliography;"/>
 			</radiogroup>
 		</groupbox>
 		<groupbox>
-			<label>&zotero.bibliography.outputMethod;</label>
+			<label><html:h2>&zotero.bibliography.outputMethod;</html:h2></label>
 			<radiogroup id="output-method-radio">
 				<radio id="save-as-rtf" label="&zotero.bibliography.saveAsRTF.label;"/>
 				<radio id="save-as-html" label="&zotero.bibliography.saveAsHTML.label;"/>
diff --git a/chrome/skin/default/zotero/bibliography.css b/chrome/skin/default/zotero/bibliography.css
index 071867f7fb..6aea2731f4 100644
--- a/chrome/skin/default/zotero/bibliography.css
+++ b/chrome/skin/default/zotero/bibliography.css
@@ -4,22 +4,12 @@
 	width: 325pt;
 }
 
-#style-listbox > richlistitem {
-	padding: 0.2em 0.4em;
+#manage-styles {
+	text-decoration: none;
 }
 
-groupbox > label:first-child {
-	margin-top: 0.5em;
-	font-size: 1.2em;
-}
-
-#locale-box .groupbox-body {
-	padding-top: 3px;
-}
-
-#locale-box label:first-child {
-	padding-top: 0;
-	padding-bottom: 0;
+#locale-box h2 {
+	font-size: 14px;
 }
 
 radio:not(:first-child)
diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css
index 3ac48b9454..da82fba795 100644
--- a/chrome/skin/default/zotero/zotero.css
+++ b/chrome/skin/default/zotero/zotero.css
@@ -119,6 +119,18 @@ zoterofilesyncstatus {
 	-moz-binding: url('chrome://zotero/content/bindings/filesyncstatus.xml#file-sync-status');
 }
 
+richlistitem {
+	padding: 0.2em 0.4em;
+	overflow-x: hidden;
+	text-overflow: ellipsis;
+}
+
+groupbox > label > h2 {
+	font-size: 14px;
+	margin-top: 1em;
+	margin-bottom: .3em;
+}
+
 label.zotero-text-link {
 	-moz-binding: url('chrome://zotero/content/bindings/text-link.xml#text-link');
 	-moz-user-focus: normal;