From 4f5feb98a2f51233ab7b7f74109c6ff83b2d00fd Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 2 Sep 2009 08:26:24 +0000
Subject: [PATCH] UI improvements on OS X still need to work out the
 appropriate opacity for the glow on each individual toolbar button, and to
 make some similar changes for Windows

---
 .../zotero-platform/mac/attachmentbox.css     |   9 +
 .../content/zotero-platform/mac/itembox.css   |  34 ++
 .../zotero-platform/mac/noteeditor.css        |   9 +
 .../content/zotero-platform/mac/overlay.css   | 369 ++++++++++++++++++
 .../zotero-platform/mac/tagselector.css       |  35 ++
 .../mac/treesource-collection.png             | Bin 0 -> 320 bytes
 .../zotero-platform/mac/treesource-search.png | Bin 0 -> 549 bytes
 .../zotero-platform/mac/zoterotbbutton.xml    |  58 +++
 .../zotero-platform/unix/attachmentbox.css    |   0
 .../zotero-platform/unix/noteeditor.css       |   0
 .../content/zotero-platform/unix/overlay.css  |   0
 .../zotero-platform/unix/tagselector.css      |   0
 .../unix/treesource-collection.png            | Bin 0 -> 537 bytes
 .../unix/treesource-search.png                | Bin 0 -> 679 bytes
 .../zotero-platform/win/attachmentbox.css     |   0
 .../content/zotero-platform/win/itembox.css   |  11 -
 .../zotero-platform/win/noteeditor.css        |   0
 .../content/zotero-platform/win/overlay.css   |   0
 .../zotero-platform/win/tagselector.css       |   0
 .../win/treesource-collection.png             | Bin 0 -> 537 bytes
 .../zotero-platform/win/treesource-search.png | Bin 0 -> 679 bytes
 .../content/zotero/bindings/attachmentbox.xml |  81 ++--
 chrome/content/zotero/bindings/itembox.xml    |  26 +-
 chrome/content/zotero/bindings/noteeditor.xml |  27 +-
 .../content/zotero/bindings/tagselector.xml   | 103 ++---
 chrome/content/zotero/overlay.js              |  10 +-
 chrome/content/zotero/overlay.xul             |  32 +-
 .../zotero/xpcom/collectionTreeView.js        |   6 +-
 chrome/locale/en-US/zotero/zotero.dtd         |  11 +-
 .../default/zotero/bindings/attachmentbox.css |  23 ++
 .../skin/default/zotero/bindings/itembox.css  |  82 +++-
 .../default/zotero/bindings/noteeditor.css    |  22 ++
 .../default/zotero/bindings/tagselector.css   |  11 +-
 chrome/skin/default/zotero/mac/arrow-down.png | Bin 0 -> 163 bytes
 .../default/zotero/mac/folderDropArrow.png    | Bin 0 -> 195 bytes
 chrome/skin/default/zotero/mac/hgrippy.png    | Bin 0 -> 3464 bytes
 chrome/skin/default/zotero/mac/hsplitter.png  | Bin 0 -> 3402 bytes
 .../zotero/mac/menubutton-end-pressed.png     | Bin 0 -> 679 bytes
 .../default/zotero/mac/menubutton-end.png     | Bin 0 -> 573 bytes
 .../zotero/mac/menubutton-mid-pressed.png     | Bin 0 -> 188 bytes
 .../zotero/mac/menubutton-start-pressed.png   | Bin 0 -> 759 bytes
 .../default/zotero/mac/menubutton-start.png   | Bin 0 -> 653 bytes
 .../zotero/mac/selected-focused-gradient.png  | Bin 0 -> 323 bytes
 .../default/zotero/mac/selected-gradient.png  | Bin 0 -> 212 bytes
 chrome/skin/default/zotero/mac/vgrippy.png    | Bin 0 -> 3460 bytes
 chrome/skin/default/zotero/mac/vsplitter.png  | Bin 0 -> 3396 bytes
 chrome/skin/default/zotero/minus-active.png   | Bin 0 -> 573 bytes
 chrome/skin/default/zotero/minus.png          | Bin 0 -> 599 bytes
 chrome/skin/default/zotero/overlay.css        |  36 +-
 chrome/skin/default/zotero/plus-active.png    | Bin 0 -> 585 bytes
 chrome/skin/default/zotero/plus.png           | Bin 0 -> 600 bytes
 chrome/skin/default/zotero/zotero.css         |  46 ++-
 52 files changed, 856 insertions(+), 185 deletions(-)
 create mode 100644 chrome/content/zotero-platform/mac/attachmentbox.css
 create mode 100644 chrome/content/zotero-platform/mac/noteeditor.css
 create mode 100644 chrome/content/zotero-platform/mac/overlay.css
 create mode 100644 chrome/content/zotero-platform/mac/tagselector.css
 create mode 100644 chrome/content/zotero-platform/mac/treesource-collection.png
 create mode 100644 chrome/content/zotero-platform/mac/treesource-search.png
 create mode 100644 chrome/content/zotero-platform/mac/zoterotbbutton.xml
 create mode 100644 chrome/content/zotero-platform/unix/attachmentbox.css
 create mode 100644 chrome/content/zotero-platform/unix/noteeditor.css
 create mode 100644 chrome/content/zotero-platform/unix/overlay.css
 create mode 100644 chrome/content/zotero-platform/unix/tagselector.css
 create mode 100644 chrome/content/zotero-platform/unix/treesource-collection.png
 create mode 100644 chrome/content/zotero-platform/unix/treesource-search.png
 create mode 100644 chrome/content/zotero-platform/win/attachmentbox.css
 create mode 100644 chrome/content/zotero-platform/win/noteeditor.css
 create mode 100644 chrome/content/zotero-platform/win/overlay.css
 create mode 100644 chrome/content/zotero-platform/win/tagselector.css
 create mode 100644 chrome/content/zotero-platform/win/treesource-collection.png
 create mode 100644 chrome/content/zotero-platform/win/treesource-search.png
 create mode 100644 chrome/skin/default/zotero/mac/arrow-down.png
 create mode 100644 chrome/skin/default/zotero/mac/folderDropArrow.png
 create mode 100644 chrome/skin/default/zotero/mac/hgrippy.png
 create mode 100644 chrome/skin/default/zotero/mac/hsplitter.png
 create mode 100644 chrome/skin/default/zotero/mac/menubutton-end-pressed.png
 create mode 100644 chrome/skin/default/zotero/mac/menubutton-end.png
 create mode 100644 chrome/skin/default/zotero/mac/menubutton-mid-pressed.png
 create mode 100644 chrome/skin/default/zotero/mac/menubutton-start-pressed.png
 create mode 100644 chrome/skin/default/zotero/mac/menubutton-start.png
 create mode 100644 chrome/skin/default/zotero/mac/selected-focused-gradient.png
 create mode 100644 chrome/skin/default/zotero/mac/selected-gradient.png
 create mode 100644 chrome/skin/default/zotero/mac/vgrippy.png
 create mode 100644 chrome/skin/default/zotero/mac/vsplitter.png
 create mode 100644 chrome/skin/default/zotero/minus-active.png
 create mode 100644 chrome/skin/default/zotero/minus.png
 create mode 100644 chrome/skin/default/zotero/plus-active.png
 create mode 100644 chrome/skin/default/zotero/plus.png

diff --git a/chrome/content/zotero-platform/mac/attachmentbox.css b/chrome/content/zotero-platform/mac/attachmentbox.css
new file mode 100644
index 0000000000..6206fe8397
--- /dev/null
+++ b/chrome/content/zotero-platform/mac/attachmentbox.css
@@ -0,0 +1,9 @@
+row > label:first-child
+{
+	color: #7f7f7f;
+}
+
+*[zoteroFontSize=small] #attachment-box
+{
+	font-size: 10px;
+}
\ No newline at end of file
diff --git a/chrome/content/zotero-platform/mac/itembox.css b/chrome/content/zotero-platform/mac/itembox.css
index 8b13789179..3556bd463c 100644
--- a/chrome/content/zotero-platform/mac/itembox.css
+++ b/chrome/content/zotero-platform/mac/itembox.css
@@ -1 +1,35 @@
+row > label:first-child, .creator-type-label
+{
+	color: #7f7f7f;
+}
 
+.zotero-field-toggle
+{
+	color: transparent;
+	margin: 0px 5px 0px 0px !important;
+	width: 26px !important;
+	max-width: 26px !important;
+	min-width: 26px !important;
+}
+
+.zotero-field-toggle .toolbarbutton-text
+{	
+	visibility: hidden;
+}
+
+.zotero-field-toggle .toolbarbutton-icon
+{
+	margin: 0px !important;
+}
+
+*[zoteroFontSize=small] #item-box
+{
+	font-size: 10px;
+}
+
+.creator-type-label > image {
+	margin: 1px .2em 1px;
+	list-style-image: url('chrome://zotero/skin/mac/arrow-down.png');
+	max-width: 7px;
+	max-height: 7px;
+}
\ No newline at end of file
diff --git a/chrome/content/zotero-platform/mac/noteeditor.css b/chrome/content/zotero-platform/mac/noteeditor.css
new file mode 100644
index 0000000000..9c23d1e91b
--- /dev/null
+++ b/chrome/content/zotero-platform/mac/noteeditor.css
@@ -0,0 +1,9 @@
+row > label:first-child
+{
+	color: #7f7f7f;
+}
+
+*[zoteroFontSize=small] #note-editor
+{
+	font-size: 10px;
+}
\ No newline at end of file
diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
new file mode 100644
index 0000000000..951051bf5e
--- /dev/null
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -0,0 +1,369 @@
+#zotero-pane
+{
+	padding: 0 !important;
+}
+
+#zotero-splitter
+{
+	border-top: none;
+	border-bottom: 1px solid #A3A3A3;
+	min-height: 1px !important;
+	max-height: 1px !important;
+	background-image: none;
+}
+
+#zotero-pane .toolbar {
+	-moz-appearance: -moz-mac-unified-toolbar;
+	margin-left: -1px;
+}
+
+#zotero-items-toolbar[state=collapsed]
+{
+	margin-left: -8px !important;
+}
+
+#zotero-pane toolbarseparator {
+	margin-left: 7px;
+}
+
+.zotero-tb-button {
+  -moz-margin-start: 5px;
+  -moz-padding-end: 10px;
+  background: url("chrome://zotero/skin/mac/menubutton-end.png") right center no-repeat;
+}
+
+.zotero-tb-button[open="true"],
+.zotero-tb-button:hover:active, 
+#zotero-pane-stack[fullscreenmode="true"] #zotero-tb-fullscreen  {
+  background: url("chrome://zotero/skin/mac/menubutton-end-pressed.png") right center no-repeat;
+}
+
+.zotero-tb-button > menupopup {
+  -moz-margin-start: 2px;
+  margin-top: -4px;
+}
+
+.zotero-tb-button > .toolbarbutton-icon {
+  -moz-binding: url('chrome://zotero-platform/content/zoterotbbutton.xml#zotero-tb-button');
+  background: url("chrome://zotero/skin/mac/menubutton-start.png") left center no-repeat;
+  outline-color: black;
+  -moz-padding-start: 10px;
+}
+
+.zotero-tb-button[open="true"] > .toolbarbutton-icon,
+.zotero-tb-button:hover:active > .toolbarbutton-icon, 
+#zotero-pane-stack[fullscreenmode="true"] #zotero-tb-fullscreen > .toolbarbutton-icon {
+  background: url("chrome://zotero/skin/mac/menubutton-start-pressed.png") left center no-repeat;
+}
+
+.zotero-tb-button > .toolbarbutton-text {
+  display:  none;
+}
+
+.zotero-tb-button[type="menu"] > .toolbarbutton-icon {
+  -moz-padding-end: 4px;
+}
+
+.zotero-tb-button[type="menu"] > .toolbarbutton-menu-dropmarker {
+  list-style-image: url("chrome://zotero/skin/mac/folderDropArrow.png");
+  padding: 0;
+}
+
+/* This property controls the strength of the SVG outer glow mask on the toolbar buttons */
+.zotero-tb-button > .toolbarbutton-icon > stack > .zotero-tb-glow {
+	opacity: .7;
+}
+
+#zotero-tb-sync > .toolbarbutton-icon {
+	-moz-binding: none !important;
+}
+
+#zotero-close-button {
+	margin: 0px !important;
+	padding: 0px 0px 0px 10px !important;
+}
+
+#zotero-tb-sync {
+	margin: none;
+}
+
+#zotero-view-tabbox {
+	background-color: #fff;
+	padding: 0;
+	margin: 0;
+}
+
+#zotero-item-pane-content .groupbox-body {
+	-moz-appearance: none;
+	background-color: #ffffff;
+}
+
+#zotero-view-selected-label {
+	color: #7f7f7f;
+}
+
+#zotero-view-tabbox tabpanels {
+	-moz-appearance: none;
+}
+
+#zotero-view-tabbox > tabs {
+  -moz-appearance: -moz-mac-unified-toolbar; 
+  padding: 2px;
+}
+
+#zotero-view-tabbox > tabs > tab > hbox > .tab-icon {
+	display: none;
+}
+
+#zotero-view-tabbox > tabs > tab > hbox .tab-text {
+  text-shadow: rgba(255, 255, 255, 0.4) 0 1px !important;
+}
+#zotero-view-tabbox > tabs > tab:active:hover > hbox > .tab-text,
+#zotero-view-tabbox > tabs > tab[selected=true] > hbox > .tab-text {
+  text-shadow: none !important;
+}
+
+#zotero-view-tabbox > tabs > tab {
+  -moz-box-orient: vertical;
+  -moz-box-align: center;
+  -moz-appearance: none;
+  margin: 0;
+  padding: 3px 0 0;
+  background-color: transparent;
+  border: solid transparent;
+  border-width: 0 4px 0 5px;
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle.png") 0 4 0 5 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > tab:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-down.png") 0 4 0 5 repeat stretch;
+  text-shadow: none !important;
+}
+
+#zotero-view-tabbox > tabs > tab[selected=true] {
+  color: #FFF !important;
+  text-shadow: rgba(0, 0, 0, 0.4) 0 1px;
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-selected.png") 0 4 0 5 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > tab[selected=true]:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-selected-down.png") 0 4 0 5 repeat stretch;
+}
+
+:root:not([active]) #zotero-view-tabbox > tabs > * {
+  color: #7C7C7C !important; /* remove this when we support click-through */
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-inactive.png") 0 4 0 5 repeat stretch;
+}
+
+:root:not([active]) #zotero-view-tabbox > tabs > tab[selected=true] {
+  color: #C5C5C5 !important; /* remove this when we support click-through */
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-selected-inactive.png") 0 4 0 5 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > :first-child,
+#zotero-view-tabbox > tabs > [first-visible],
+#zotero-view-tabbox > tabs[chromedir=rtl] > :last-child,
+#zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] {
+  border-width: 0 4px 0 6px;
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left.png") 0 4 0 6 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > :first-child:active:hover,
+#zotero-view-tabbox > tabs > [first-visible]:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > :last-child:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible]:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-down.png") 0 4 0 6 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > tab:first-child[selected=true],
+#zotero-view-tabbox > tabs > tab[first-visible][selected=true],
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true],
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-selected.png") 0 4 0 6 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > tab:first-child[selected=true]:active:hover,
+#zotero-view-tabbox > tabs > tab[first-visible][selected=true]:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true]:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true]:active:hover, {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-selected-down.png") 0 4 0 6 repeat stretch;
+}
+
+:root:not([active]) #zotero-view-tabbox > tabs > :first-child,
+:root:not([active]) #zotero-view-tabbox > tabs > [first-visible],
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > :last-child,
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-inactive.png") 0 4 0 6 repeat stretch;
+}
+
+:root:not([active]) #zotero-view-tabbox > tabs > tab:first-child[selected=true],
+:root:not([active]) #zotero-view-tabbox > tabs > tab[first-visible][selected=true],
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true],
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-selected-inactive.png") 0 4 0 6 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > :last-child,
+#zotero-view-tabbox > tabs > [last-visible],
+#zotero-view-tabbox > tabs[chromedir=rtl] > :first-child,
+#zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible] {
+  border-width: 0 6px 0 5px;
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right.png") 0 6 0 5 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > :last-child:active:hover,
+#zotero-view-tabbox > tabs > [last-visible]:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > :first-child:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible]:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-down.png") 0 6 0 5 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > tab:last-child[selected=true],
+#zotero-view-tabbox > tabs > tab[last-visible][selected=true],
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true],
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-selected.png") 0 6 0 5 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > tab:last-child[selected=true]:active:hover,
+#zotero-view-tabbox > tabs > tab[last-visible][selected=true]:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true]:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true]:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-selected-down.png") 0 6 0 5 repeat stretch;
+}
+
+:root:not([active]) #zotero-view-tabbox > tabs > :last-child,
+:root:not([active]) #zotero-view-tabbox > tabs > [last-visible],
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > :first-child,
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-inactive.png") 0 6 0 5 repeat stretch;
+}
+
+:root:not([active]) #zotero-view-tabbox > tabs > tab:last-child[selected=true],
+:root:not([active]) #zotero-view-tabbox > tabs > tab[last-visible][selected=true],
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true],
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-selected-inactive.png") 0 6 0 5 repeat stretch;
+}
+
+#zotero-collections-tree {
+	-moz-appearance: none;
+	border: none;
+	margin: 0;
+	padding: 0;
+	min-height: 5.2em;
+	background-color: #d2d8e2;
+}
+
+:root:not([active="true"]) #zotero-collections-tree {
+	background-color: rgb(232, 232, 232);
+}
+
+#zotero-collections-tree treechildren::-moz-tree-row {
+  background-color: transparent;
+  border-color: transparent;
+}
+
+#zotero-collections-tree treechildren::-moz-tree-cell(selected) {  
+  background-color: #6f81a9;
+  background-image: url("chrome://zotero/skin/mac/selected-gradient.png");
+  background-repeat: repeat-x;
+  background-position: bottom left;
+  border-top: 1px solid #979797;
+}
+
+#zotero-collections-tree treechildren::-moz-tree-cell(selected,focus) {  
+  background-image: url("chrome://zotero/skin/mac/selected-focused-gradient.png");
+  background-color: #8a8a8a !important;
+  border-top: 1px solid #91a0c0;
+}
+
+#zotero-collections-tree treechildren::-moz-tree-cell(leaf) ,
+#zotero-collections-tree treechildren::-moz-tree-image(leaf) {
+  cursor: pointer;
+}
+
+#zotero-collections-tree treechildren::-moz-tree-cell-text(leaf, hover) {
+  cursor: pointer;
+  text-decoration: underline;
+}
+
+#zotero-collections-tree treechildren::-moz-tree-cell(separator) {
+  cursor: default;
+}
+
+#zotero-collections-tree treechildren::-moz-tree-cell-text(selected) {  
+  font-weight: bold !important;
+  color: #ffffff !important;
+}
+
+#zotero-tree-splitter, #zotero-view-splitter
+{
+	-moz-appearance: none;
+	-moz-border-start: none !important;
+	-moz-border-end: none !important;
+	max-width: 1px !important;
+	min-width: 1px !important;
+	width: 1px !important;
+	background-color: #8b8b8b !important;
+}
+
+#zotero-tree-splitter[state=collapsed]
+{
+	border-right: 1px;
+	border-color: #A5A5A5;
+	max-width: 8px !important;
+	min-width: 8px !important;
+	width: 8px !important;
+	background-image: url("chrome://zotero/skin/mac/vsplitter.png");
+	background-repeat: repeat-y;
+	padding: none;
+}
+
+#zotero-tree-splitter[state=collapsed] > grippy
+{
+	-moz-appearance: none;
+	background-image: url("chrome://zotero/skin/mac/vgrippy.png");
+	background-position: center;
+	background-repeat: no-repeat;
+	width: 8px;
+}
+
+#zotero-tags-splitter
+{
+	-moz-appearance: none;
+	border-top: 1px;
+	border-bottom: 1px;
+	border-color: #A5A5A5;
+	height: 8px;
+	background-image: url("chrome://zotero/skin/mac/hsplitter.png") !important;
+	background-repeat: repeat-x;
+	padding: none;
+}
+
+#zotero-tags-splitter > grippy
+{
+	-moz-appearance: none;
+	background-image: url("chrome://zotero/skin/mac/hgrippy.png");
+	background-position: center;
+	background-repeat: no-repeat;
+	height: 8px;
+}
+
+#zotero-tags-splitter > grippy:hover, #zotero-tree-splitter > grippy:hover
+{
+	background-color:transparent;
+}
+
+#zotero-items-tree
+{
+	-moz-appearance: none;
+	border: none;
+	margin: 0;
+	padding: 0;
+}
+
+#zotero-items-tree treechildren::-moz-tree-cell,
+#zotero-items-tree treechildren::-moz-tree-column {
+  border-right: 1px solid #d7dad7;
+}
\ No newline at end of file
diff --git a/chrome/content/zotero-platform/mac/tagselector.css b/chrome/content/zotero-platform/mac/tagselector.css
new file mode 100644
index 0000000000..fed6e6ccb4
--- /dev/null
+++ b/chrome/content/zotero-platform/mac/tagselector.css
@@ -0,0 +1,35 @@
+groupbox
+{
+	background-color: white;
+}
+
+groupbox > .groupbox-body
+{
+	-moz-appearance: none;
+	margin: 0;
+	padding: 0;
+}
+
+#tags-toggle
+{
+	font-size: 10px;
+}
+
+#view-settings-menu .toolbarbutton-menu-dropmarker
+{
+	margin-left: -12px !important;
+}
+
+#no-tags-box
+{
+	color: #7f7f7f;
+}
+
+#tag-controls
+{
+	background-color: rgb(240,240,240);
+	border-width: 1px 0 0 0;
+	border-style: solid;
+	border-color: rgb(220,220,220);
+	padding: 2px 2px 2px 5px;
+}
\ No newline at end of file
diff --git a/chrome/content/zotero-platform/mac/treesource-collection.png b/chrome/content/zotero-platform/mac/treesource-collection.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f21ff790a3fec82a2db69d749ebd234fcaa75a7
GIT binary patch
literal 320
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`)Ym%P6qNh3p^r=
z85p>QL70(Y)*K0-;3H2L#}JFt$v^)8w`W$B@M)Ry{XDnUyMO&Xj!7=k43{o!`6R)`
z)+w0kkWqQx^Zl7$|4+uA4%kp0_P2ihm#94wOT=@2FJ;&7JS6V;!;Y!>OB3&n(tr2<
z`!3I$*s^{8?q-98(=TuT50~HTCv>mik=mh#t;g5>k1u*)<XLg_;c5<M2d2&CbJaP|
z-!B$SJn&}j^Z)+0YG$d}l)jd1VH7r>|LgwFZxWt6s_z!IFv@24{mqZ5>rlC~<&nUl
zhF_`d|HJiexeKjhO4`9F%KiPX{=D6@Q+Ui90wx`8J;=t;$Rn_NVrMGDg(+Jv-Lr9V
Q2l|%5)78&qol`;+0RB6MX#fBK

literal 0
HcmV?d00001

diff --git a/chrome/content/zotero-platform/mac/treesource-search.png b/chrome/content/zotero-platform/mac/treesource-search.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ccb8470256d32b201cfb508c7276310b7d7e46b
GIT binary patch
literal 549
zcmV+=0^0qFP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz$4Nv%RCwB?Q_C*{K^*>VcTu7QO&a2r
zxOmhfk~VRXN+c4FPENw1{tE{O4*miT#LY!qaB}EPQ0m|&LDNW6>bcs^?#}F*N4r~T
zQ^F>*nfbooe81;NmSw?zK85|l^BY@);DusBmX+<zou$QJ39!qdQ0N;GiA0#-&jQr@
zDbiGUeS7>yAng<8W>+ib=c#WwQ>gdg@=CaboSGR1D07`d`MRyI?FM-Y>BlT+8nKN`
z(*l=Eg7cFkKL^HIZOjh6%H`C+&`mHj6GS~MI6k@uNs^$W%fqq5y<1@2nw;*Y#T6o!
zSyV)w3TV0$K~HZJAcR4#7GB!A>cQ<+027lgVM9!j2Di|tabX?o-$42)1K1!iIO64t
z?HR_nf*r~kP6W9e1BG;ZX9Hl}f{cM7aj$YLqhgywIg+0f$q_)v5$N}OAr?(hLkw3J
zDLXB9tpY=SAH2RG5xT2bfU4^GE<7Yucur?&&Q-Q(ja%jz<78RXMUsk&$Z}$xC=lZl
zoxBT|=OTj9fRA?}mCOLaq;!;-cf&AkFcJUYv(h)v%+K+=cP?D+-Eo0v?6~}_URQnx
nb+wJaGHGY~KfdPdmjD9*$A{ukNh|z>00000NkvXXu0mjfQMC8L

literal 0
HcmV?d00001

diff --git a/chrome/content/zotero-platform/mac/zoterotbbutton.xml b/chrome/content/zotero-platform/mac/zoterotbbutton.xml
new file mode 100644
index 0000000000..0ab3d61333
--- /dev/null
+++ b/chrome/content/zotero-platform/mac/zoterotbbutton.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!--
+    ***** BEGIN LICENSE BLOCK *****
+    
+    Copyright (c) 2006  Center for History and New Media
+                        George Mason University, Fairfax, Virginia, USA
+                        http://chnm.gmu.edu
+    
+    Licensed under the Educational Community License, Version 1.0 (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.opensource.org/licenses/ecl1.php
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    
+    ***** END LICENSE BLOCK *****
+-->
+
+<bindings xmlns="http://www.mozilla.org/xbl"
+		  xmlns:xbl="http://www.mozilla.org/xbl" xmlns:svg="http://www.w3.org/2000/svg" 
+		  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+	<binding id="zotero-tb-button" display="xul:button"
+           extends="chrome://global/content/bindings/button.xml#button-base">
+		<resources>
+			<stylesheet src="chrome://global/skin/toolbarbutton.css"/>
+		</resources>
+		<implementation>
+			<constructor>
+				<![CDATA[
+					var imageURL = document.defaultView.getComputedStyle(this, null).listStyleImage;
+					if(imageURL.substr(0, 4) == "url(") {
+						imageURL = imageURL.substring(4, imageURL.length-1);
+					} else if(imageURL.substr(0, 5) == "url('" || imageURL.substr(0, 5) == "url(\"") {
+						imageURL = imageURL.substring(5, imageURL.length-2);
+					}
+					document.getAnonymousElementByAttribute(this, "anonid", "tb-image")
+						.setAttributeNS("http://www.w3.org/1999/xlink", "href", imageURL);
+				]]>
+			</constructor>
+		</implementation>
+		<content>
+			<xul:stack>
+				<svg:svg class="zotero-tb-glow" xmlns="http://www.w3.org/2000/svg" width="18" height="24" version="1.1">
+					<svg:filter id="DropShadow">
+					   <svg:feGaussianBlur in="SourceAlpha" stdDeviation="1" result="MyBlur"/>
+					</svg:filter>
+					<svg:image anonid="tb-image" filter="url(#DropShadow)" x="1" y="4" width="16" height="16"/>	
+				</svg:svg>
+				<xul:image xbl:inherits="src=image" style="padding: 4px 1px 4px 1px;"/>
+			</xul:stack>
+		</content>
+	</binding>
+</bindings>
\ No newline at end of file
diff --git a/chrome/content/zotero-platform/unix/attachmentbox.css b/chrome/content/zotero-platform/unix/attachmentbox.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/chrome/content/zotero-platform/unix/noteeditor.css b/chrome/content/zotero-platform/unix/noteeditor.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/chrome/content/zotero-platform/unix/overlay.css b/chrome/content/zotero-platform/unix/overlay.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/chrome/content/zotero-platform/unix/tagselector.css b/chrome/content/zotero-platform/unix/tagselector.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/chrome/content/zotero-platform/unix/treesource-collection.png b/chrome/content/zotero-platform/unix/treesource-collection.png
new file mode 100644
index 0000000000000000000000000000000000000000..784e8fa48234f4f64b6922a6758f254ee0ca08ec
GIT binary patch
literal 537
zcmV+!0_OdRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzt4TybR5;7U
zle>x(K@^6+>g^d@v4;gkbWsEoXE%32*i1tcpTNXd5CcIl)ECgqz|2rE6EW}s7R?kl
za1q`0GCkMruC6-2LANtwVlsgzsp4?{@7$`KBv!G66>Vie3h?3OmEEkjwdLG0PgLVi
z`!N((f$A@n17Ldj#`};0I3@iHJ5M{#IZz|UIYRm4(!uV7eYIYIwQf&}_2J~}>pQ^n
z6o8--^T(=hkBNQ_k{-_GWE<Dm*nZeW0t{q;aLLKDA7AX;UjS;C$UM<^kqJBcOg%kd
za`=W$b`Dg7d87aY^8Vc}vWxQ>;FMW7!p}f{N<AKt_ivG%+H4#CQ-PWa(shVQx&YJ(
z>G3nHZ{D5<3d8&tLh%a4AqqnjMkr3m&fkMdECD3N5}Unig5wy40;>lo4j~k+e}v)`
zR6)J8Mk*u=SpB`p6o)7j?S0T@9?bz#m@l>gc*zk__|*!FMcHwP!gwLJvS~9c0px8E
zW<O8VlWvaXiPQnhL8noy0FRR9bV($ZrR1$z0Ltpo-jkc#i0e4=f4*G-?ybl4tXbgy
b{*Au@zK9=x;oF){00000NkvXXu0mjfJ%;Z&

literal 0
HcmV?d00001

diff --git a/chrome/content/zotero-platform/unix/treesource-search.png b/chrome/content/zotero-platform/unix/treesource-search.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ba939184d5e2257e380004ed799f00f66a49277
GIT binary patch
literal 679
zcmV;Y0$BZtP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!IY~r8R2Uhh
z!97S-VF1VB-+S(Rk5}`Uq1M$1(Z$;rv?K@)K|xS0ZB5lsEzZ%_$5?YvQxP;Z1`!cO
zGzNjxU>|B!lwB?F)%&66ocFx{jBe!85I&EQ#75Y65B5(Mx_0d{Cg3j-*JeIvt~v(9
ztY`S8F>>s+V~sTmN;}4H=Z!HS)(DKjt$rUaPhR;f5G}c|OUlyu`rOm=z&+MjoL2Ek
zTm0<?S(1aG3u7V*0|yxxy&56`9^?UGg3jXm`{NgZd#tgfCXi3ak`Q^}S3Z$8%GBqd
zkuUUvQt%0q0~}H5LWukzEf%AKcPk`KP|_f+EfbYaQRvwT7(jpr2@uA1Ll#(CENOsk
z-%9t+Gk^yP;ql2AT=fali@khU9%NyqNPAnJo=tTI+!jNNC6$z|;+wBfwuG`8a#eg<
zVY*V}V|swnP$zrxIp&uVDz%u|&eL``zXild-r>^)e6oN~%J`&=(gmjK2N~YhK_xcK
zEoV5BWBb;K=H{^+EtW(wWXLTdS4FOhvL)n}sIMf1VICJdydZX>U~@QG{;*1X#WjC)
zr1dbuM}d?FAAx%5Xv>qN8EFR2i(h1**=X>G)oOfg_U7?X#32k3>qH~N`C9QvE@}^n
zGhqY6++vD;yw#&i6Q>Sed3?u6;$N;m{5aHRIk}}XyzB+bjo7>Llo{{)Y8o@oYqL`?
z&lySlkNcO8o-Otluk{V>>wfd%Vbe(Bf8CuZo#-Fld&_&*ZX~f0KLJ#yHcZ$RnzjG{
N002ovPDHLkV1g<!GM4}V

literal 0
HcmV?d00001

diff --git a/chrome/content/zotero-platform/win/attachmentbox.css b/chrome/content/zotero-platform/win/attachmentbox.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/chrome/content/zotero-platform/win/itembox.css b/chrome/content/zotero-platform/win/itembox.css
index a14cf4f1a1..81d57de653 100644
--- a/chrome/content/zotero-platform/win/itembox.css
+++ b/chrome/content/zotero-platform/win/itembox.css
@@ -7,17 +7,6 @@ row > vbox
 	padding-bottom: 0 !important;
 }
 
-row > hbox > hbox
-{
-	-moz-box-align: center;
-}
-
-row hbox hbox label
-{
-	margin-top: 0;
-	margin-bottom: 0;
-}
-
 row vbox[fieldname=abstractNote],
 row vbox[fieldname=extra]
 {
diff --git a/chrome/content/zotero-platform/win/noteeditor.css b/chrome/content/zotero-platform/win/noteeditor.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/chrome/content/zotero-platform/win/overlay.css b/chrome/content/zotero-platform/win/overlay.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/chrome/content/zotero-platform/win/tagselector.css b/chrome/content/zotero-platform/win/tagselector.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/chrome/content/zotero-platform/win/treesource-collection.png b/chrome/content/zotero-platform/win/treesource-collection.png
new file mode 100644
index 0000000000000000000000000000000000000000..784e8fa48234f4f64b6922a6758f254ee0ca08ec
GIT binary patch
literal 537
zcmV+!0_OdRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzt4TybR5;7U
zle>x(K@^6+>g^d@v4;gkbWsEoXE%32*i1tcpTNXd5CcIl)ECgqz|2rE6EW}s7R?kl
za1q`0GCkMruC6-2LANtwVlsgzsp4?{@7$`KBv!G66>Vie3h?3OmEEkjwdLG0PgLVi
z`!N((f$A@n17Ldj#`};0I3@iHJ5M{#IZz|UIYRm4(!uV7eYIYIwQf&}_2J~}>pQ^n
z6o8--^T(=hkBNQ_k{-_GWE<Dm*nZeW0t{q;aLLKDA7AX;UjS;C$UM<^kqJBcOg%kd
za`=W$b`Dg7d87aY^8Vc}vWxQ>;FMW7!p}f{N<AKt_ivG%+H4#CQ-PWa(shVQx&YJ(
z>G3nHZ{D5<3d8&tLh%a4AqqnjMkr3m&fkMdECD3N5}Unig5wy40;>lo4j~k+e}v)`
zR6)J8Mk*u=SpB`p6o)7j?S0T@9?bz#m@l>gc*zk__|*!FMcHwP!gwLJvS~9c0px8E
zW<O8VlWvaXiPQnhL8noy0FRR9bV($ZrR1$z0Ltpo-jkc#i0e4=f4*G-?ybl4tXbgy
b{*Au@zK9=x;oF){00000NkvXXu0mjfJ%;Z&

literal 0
HcmV?d00001

diff --git a/chrome/content/zotero-platform/win/treesource-search.png b/chrome/content/zotero-platform/win/treesource-search.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ba939184d5e2257e380004ed799f00f66a49277
GIT binary patch
literal 679
zcmV;Y0$BZtP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!IY~r8R2Uhh
z!97S-VF1VB-+S(Rk5}`Uq1M$1(Z$;rv?K@)K|xS0ZB5lsEzZ%_$5?YvQxP;Z1`!cO
zGzNjxU>|B!lwB?F)%&66ocFx{jBe!85I&EQ#75Y65B5(Mx_0d{Cg3j-*JeIvt~v(9
ztY`S8F>>s+V~sTmN;}4H=Z!HS)(DKjt$rUaPhR;f5G}c|OUlyu`rOm=z&+MjoL2Ek
zTm0<?S(1aG3u7V*0|yxxy&56`9^?UGg3jXm`{NgZd#tgfCXi3ak`Q^}S3Z$8%GBqd
zkuUUvQt%0q0~}H5LWukzEf%AKcPk`KP|_f+EfbYaQRvwT7(jpr2@uA1Ll#(CENOsk
z-%9t+Gk^yP;ql2AT=fali@khU9%NyqNPAnJo=tTI+!jNNC6$z|;+wBfwuG`8a#eg<
zVY*V}V|swnP$zrxIp&uVDz%u|&eL``zXild-r>^)e6oN~%J`&=(gmjK2N~YhK_xcK
zEoV5BWBb;K=H{^+EtW(wWXLTdS4FOhvL)n}sIMf1VICJdydZX>U~@QG{;*1X#WjC)
zr1dbuM}d?FAAx%5Xv>qN8EFR2i(h1**=X>G)oOfg_U7?X#32k3>qH~N`C9QvE@}^n
zGhqY6++vD;yw#&i6Q>Sed3?u6;$N;m{5aHRIk}}XyzB+bjo7>Llo{{)Y8o@oYqL`?
z&lySlkNcO8o-Otluk{V>>wfd%Vbe(Bf8CuZo#-Fld&_&*ZX~f0KLJ#yHcZ$RnzjG{
N002ovPDHLkV1g<!GM4}V

literal 0
HcmV?d00001

diff --git a/chrome/content/zotero/bindings/attachmentbox.xml b/chrome/content/zotero/bindings/attachmentbox.xml
index dfc437f5b9..8fa89d6e82 100644
--- a/chrome/content/zotero/bindings/attachmentbox.xml
+++ b/chrome/content/zotero/bindings/attachmentbox.xml
@@ -31,6 +31,7 @@
 	<binding id="attachment-box">
 		<resources>
 			<stylesheet src="chrome://zotero/skin/bindings/attachmentbox.css"/>
+			<stylesheet src="chrome://zotero-platform/content/attachmentbox.css"/>
 		</resources>
 		
 		<implementation>
@@ -145,8 +146,8 @@
 					var showButton = this._id('show');
 					var fileNameRow = this._id('fileNameRow');
 					var urlField = this._id('url');
-					var accessed = this._id('accessed');
-					var pagesRow = this._id('pages');
+					var accessed = this._id('accessedRow');
+					var pagesRow = this._id('pagesRow');
 					var dateModifiedRow = this._id('dateModified');
 					var indexBox = this._id('index-box');
 					var selectButton = this._id('select-button');
@@ -235,13 +236,10 @@
 						
 						// Access date
 						if (this.displayAccessed) {
-							accessed.value = Zotero.localeJoin([
-								Zotero.getString('itemFields.accessDate'),
-								': ',
-								Zotero.Date.sqlToDate(
+							document.getElementById("accessed-label").value = Zotero.getString('itemFields.accessDate')+": ";
+							document.getElementById("accessed").value = Zotero.Date.sqlToDate(
 									this.item.getField('accessDate'), true
-								).toLocaleString()
-							], '');
+								).toLocaleString();
 							accessed.hidden = false;
 						}
 						else {
@@ -263,11 +261,8 @@
 						var file = this.item.getFile(false, true);
 						var fileName = file.leafName;
 						if (fileName) {
-							fileNameRow.value = Zotero.localeJoin([
-								'Filename', // TODO: localize
-								': ', // TODO: probably needs to be in localized string
-								fileName
-							], '');
+							document.getElementById("fileName-label").value = "Filename: ";
+							document.getElementById("fileName").value = fileName;
 							fileNameRow.hidden = false;
 						}
 						else {
@@ -286,12 +281,8 @@
 						var pages = Zotero.Fulltext.getPages(this.item.id);
 						var pages = pages ? pages.total : null;
 						if (pages) {
-							var str = Zotero.localeJoin([
-								Zotero.getString('itemFields.pages'),
-								': ',
-								pages
-							], '');
-							pagesRow.value = str;
+							document.getElementById("pages-label").value = Zotero.getString('itemFields.pages')+': ';
+							document.getElementById("pages").value = pages;
 							pagesRow.hidden = false;
 						}
 						else {
@@ -303,14 +294,10 @@
 					}
 					
 					if (this.displayDateModified) {
-						var str = Zotero.localeJoin([
-							Zotero.getString('itemFields.dateModified'),
-							': ',
-							Zotero.Date.sqlToDate(
+						document.getElementById("dateModified-label").value = Zotero.getString('itemFields.dateModified')+': ';
+						document.getElementById("dateModified").value = Zotero.Date.sqlToDate(
 								this.item.getField('dateModified'), true
-							).toLocaleString()
-						], '');
-						dateModifiedRow.value = str;
+							).toLocaleString();
 						dateModifiedRow.hidden = false;
 					}
 					else {
@@ -468,9 +455,8 @@
 							str = 'general.yes';
 							break;
 					}
-					str = Zotero.getString('fulltext.indexState.indexed') + ': ' +
-						Zotero.getString(str);
-					indexStatus.setAttribute('value', str);
+					document.getElementById("index-status-label").value = Zotero.getString('fulltext.indexState.indexed') + ': ';
+					indexStatus.value = Zotero.getString(str);
 					
 					// Reindex button tooltip (string stored in zotero.properties)
 					var str = Zotero.getString('pane.items.menu.reindexItem');
@@ -508,14 +494,39 @@
 					<button id="show" label="&zotero.item.attachment.file.show;" flex="1"/>
 				</hbox>
 				<label id="url" crop="end"/>
-				<label id="fileNameRow" crop="end"/>
-				<label id="accessed"/>
-				<label id="pages"/>
-				<label id="dateModified"/>
+				<grid>
+					<columns>
+						<column/>
+						<column flex="1"/>
+					</columns>
+					<rows>
+						<row id="fileNameRow">
+							<label id="fileName-label"/>
+							<label id="fileName" crop="end"/>
+						</row>
+						<row id="accessedRow">
+							<label id="accessed-label"/>
+							<label id="accessed"/>
+						</row>
+						<row id="pagesRow">
+							<label id="pages-label"/>
+							<label id="pages"/>
+						</row>
+						<row id="dateModifiedRow">
+							<label id="dateModified-label"/>
+							<label id="dateModified"/>
+						</row>
+						<row>
+							<label id="index-status-label"/>
+							<hbox>
+								<label id="index-status"/>
+								<toolbarbutton id="reindex" oncommand="this.hidden = true; setTimeout(function () { ZoteroPane.reindexItem(); }, 50)"/>
+							</hbox>
+						</row>
+					</rows>
+				</grid>
 				
 				<hbox id="index-box">
-					<label id="index-status"/>
-					<toolbarbutton id="reindex" oncommand="this.hidden = true; setTimeout(function () { ZoteroPane.reindexItem(); }, 50)"/>
 				</hbox>
 				
 				<zoteronoteeditor id="note-editor" notitle="1" flex="1"/>
diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index 5c2af7ed78..1053c414f6 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -357,8 +357,8 @@
 					//
 					// Clear and rebuild metadata fields
 					//
-					while (this._dynamicFields.hasChildNodes()) {
-						this._dynamicFields.removeChild(this._dynamicFields.firstChild);
+					while (this._dynamicFields.childNodes.length > 1) {
+						this._dynamicFields.removeChild(this._dynamicFields.lastChild);
 					}
 					
 					var fieldNames = [];
@@ -632,7 +632,6 @@
 					if (this.editable) {
 						typeBox.className = 'creator-type-label zotero-clicky';
 						var img = document.createElement('image');
-						img.setAttribute('src', 'chrome://zotero/skin/arrow-down.gif');
 						typeBox.appendChild(img);
 					}
 					else {
@@ -645,6 +644,7 @@
 					typeBox.appendChild(label);
 					
 					var hbox = document.createElement("hbox");
+					hbox.className = 'creator-type-value';
 					
 					// Name
 					var firstlast = document.createElement("hbox");
@@ -685,7 +685,7 @@
 					var toggleButton = document.createElement('toolbarbutton');
 					toggleButton.setAttribute('fieldname',
 						'creator-' + this._creatorCount + '-fieldMode');
-					toggleButton.className = 'zotero-clicky';
+					toggleButton.className = 'zotero-field-toggle zotero-clicky';
 					hbox.appendChild(toggleButton);
 					
 					// Minus (-) button
@@ -2178,7 +2178,7 @@
 						</menu>
 					</popup>
 				</popupset>
-				<hbox id="go-buttons" align="center" hidden="true">
+				<hbox id="go-buttons" align="center">
 					<button id="view-button"
 						onfocus="document.getBindingParent(this).ensureElementIsVisible(this)"
 						oncommand="document.getBindingParent(this).onViewClick(this, event)" disabled="false"/>
@@ -2193,18 +2193,22 @@
 					</button>
 				</hbox>
 				<hbox align="center" hidden="true">
-					<menulist id="item-type-menu" oncommand="document.getBindingParent(this).changeTypeTo(this.value, this)" flex="1"
-						onfocus="document.getBindingParent(this).ensureElementIsVisible(this)"
-						onkeypress="if (event.keyCode == event.DOM_VK_TAB){ if (!event.shiftKey) { document.getBindingParent(this).focusFirstField('info'); event.preventDefault(); } }">
-						<menupopup/>
-					</menulist>
 				</hbox>
 				<grid flex="1">
 					<columns>
 						<column/>
 						<column flex="1"/>
 					</columns>
-					<rows id="dynamic-fields" flex="1"/>
+					<rows id="dynamic-fields" flex="1">
+						<row>
+							<label value="&zotero.items.itemType;:"/>
+							<menulist class="zotero-clicky" id="item-type-menu" oncommand="document.getBindingParent(this).changeTypeTo(this.value, this)" flex="1"
+								onfocus="document.getBindingParent(this).ensureElementIsVisible(this)"
+								onkeypress="if (event.keyCode == event.DOM_VK_TAB){ if (!event.shiftKey) { document.getBindingParent(this).focusFirstField('info'); event.preventDefault(); } }">
+								<menupopup/>
+							</menulist>
+						</row>
+					</rows>
 				</grid>
 			</scrollbox>
 		</content>
diff --git a/chrome/content/zotero/bindings/noteeditor.xml b/chrome/content/zotero/bindings/noteeditor.xml
index 18f8344174..47396481ed 100644
--- a/chrome/content/zotero/bindings/noteeditor.xml
+++ b/chrome/content/zotero/bindings/noteeditor.xml
@@ -28,6 +28,7 @@
 	<binding id="note-editor">
 		<resources>
 			<stylesheet src="chrome://zotero/skin/bindings/noteeditor.css"/>
+			<stylesheet src="chrome://zotero-platform/content/noteeditor.css"/>
 		</resources>
 		
 		<implementation>
@@ -431,7 +432,8 @@
 							v = "[" + Zotero.getString('pane.item.noteEditor.clickHere') + "]";
 						}
 						
-						this.id('tagsLabel').value = Zotero.getString('pane.item.tags') + " " + v;
+						this.id('tagsLabel').value = Zotero.getString('pane.item.tags');
+						this.id('tagsClick').value = v;
 					]]>
 				</body>
 			</method>
@@ -465,7 +467,8 @@
 							v = "[" + Zotero.getString('pane.item.noteEditor.clickHere') + "]";
 						}
 						
-						this.id('seeAlsoLabel').value = Zotero.getString('pane.item.related') + " " + v;
+						this.id('seeAlsoLabel').value = Zotero.getString('pane.item.related');
+						this.id('seeAlsoClick').value = v;
 					]]>
 				</body>
 			</method>
@@ -479,9 +482,23 @@
 			</method>
 		</implementation>
 		<content>
-			<xul:vbox xbl:inherits="flex">
-				<xul:label id="seeAlsoLabel" class="zotero-clicky" crop="end" onclick="document.getBindingParent(this).seeAlsoClick();"/>
-				<xul:label id="tagsLabel" class="zotero-clicky" crop="end" onclick="document.getBindingParent(this).tagsClick();"/>
+			<xul:vbox id="note-editor" xbl:inherits="flex">
+				<xul:grid>
+					<xul:columns>
+						<xul:column/>
+						<xul:column flex="1"/>
+					</xul:columns>
+					<xul:rows>
+						<xul:row>
+							<xul:label id="seeAlsoLabel"/>
+							<xul:label id="seeAlsoClick" class="zotero-clicky" crop="end" onclick="document.getBindingParent(this).seeAlsoClick();"/>
+						</xul:row>
+						<xul:row>
+							<xul:label id="tagsLabel"/>
+							<xul:label id="tagsClick" class="zotero-clicky" crop="end" onclick="document.getBindingParent(this).tagsClick();"/>
+						</xul:row>
+					</xul:rows>
+				</xul:grid>
 				<xul:popupset>
 					<xul:popup id="seeAlsoPopup" width="300" onpopupshowing="this.firstChild.reload();">
 						<xul:seealsobox id="seeAlso" flex="1"/>
diff --git a/chrome/content/zotero/bindings/tagselector.xml b/chrome/content/zotero/bindings/tagselector.xml
index 22ff97bee2..56773a7463 100644
--- a/chrome/content/zotero/bindings/tagselector.xml
+++ b/chrome/content/zotero/bindings/tagselector.xml
@@ -30,6 +30,7 @@
 	<binding id="tag-selector">
 		<resources>
 			<stylesheet src="chrome://zotero/skin/bindings/tagselector.css"/>
+			<stylesheet src="chrome://zotero-platform/content/tagselector.css"/>
 		</resources>
 		
 		<implementation>
@@ -156,6 +157,10 @@
 					this.id('display-all-tags').setAttribute('checked', !this.filterToScope);
 					this.id('show-automatic').setAttribute('checked', this.showAutomatic);
 					this.dragObserver = new this._dragObserverConstructor;
+					if(Zotero.isFx30) {
+						this.id('tags-search-filter').hidden = false;
+						this.id('tags-search').setAttribute('type', 'timed');
+					}
 				]]>
 			</constructor>
 			
@@ -768,59 +773,61 @@
 				
 				<xul:vbox id="tags-toggle" flex="1"/>
 				
-				<xul:hbox>
-					<xul:hbox pack="start">
-						<!-- TODO: localize or change -->
-						<!-- <xul:checkbox id="display-all-tags" label="&zotero.tagSelector.displayAll;"-->
-						<xul:checkbox id="display-all-tags" label="Display all tags in this library"
-							oncommand="var ts = document.getBindingParent(this); ts.filterToScope = !this.checked; event.stopPropagation();">
-						</xul:checkbox>
-					</xul:hbox>
-					
-					<!--
+				<xul:vbox id="tag-controls">
 					<xul:hbox>
-						<xul:radiogroup orient="horizontal">
-							<xul:radio label="any"/>
-							<xul:radio label="all"/>
-						</xul:radiogroup>
+						<xul:hbox pack="start">
+							<!-- TODO: localize or change -->
+							<!-- <xul:checkbox id="display-all-tags" label="&zotero.tagSelector.displayAll;"-->
+							<xul:checkbox id="display-all-tags" label="Display all tags in this library"
+								oncommand="var ts = document.getBindingParent(this); ts.filterToScope = !this.checked; event.stopPropagation();">
+							</xul:checkbox>
+						</xul:hbox>
+						
+						<!--
+						<xul:hbox>
+							<xul:radiogroup orient="horizontal">
+								<xul:radio label="any"/>
+								<xul:radio label="all"/>
+							</xul:radiogroup>
+						</xul:hbox>
+						-->
 					</xul:hbox>
-					-->
-				</xul:hbox>
-					
-				<xul:hbox>
-					<xul:label value="&zotero.tagSelector.filter;"/>
-					<xul:textbox id="tags-search" flex="1" type="timed" timeout="250" dir="reverse"
-						oncommand="this.parentNode.parentNode.parentNode.handleKeyPress(); event.stopPropagation()"
-						onkeypress="if (event.keyCode == event.DOM_VK_ESCAPE) { this.parentNode.parentNode.parentNode.handleKeyPress(true); }">
-						<xul:toolbarbutton id="search-cancel"
-							oncommand="this.parentNode.focus(); this.parentNode.parentNode.parentNode.parentNode.handleKeyPress(true)" hidden="true"/>
-					</xul:textbox>
-					<xul:toolbarbutton id="view-settings-menu" tooltiptext="&zotero.toolbar.actions.label;"
-							image="chrome://zotero/skin/tag-selector-menu.png" type="menu">
-						<xul:menupopup id="view-settings-popup">
-							<xul:menuitem id="show-automatic" label="&zotero.tagSelector.showAutomatic;" autocheck="true" type="checkbox"
-								oncommand="var ts = this.parentNode.parentNode.parentNode.parentNode.parentNode; ts._dirty = true; ts.setAttribute('showAutomatic', this.getAttribute('checked') == 'true')"/>
-						</xul:menupopup>
-					</xul:toolbarbutton>
-				</xul:hbox>
-				
-				<xul:hbox>
-					<xul:hbox pack="center">
-						<xul:label id="num-selected"/>
+						
+					<xul:hbox>
+						<xul:label id="tags-search-filter" value="&zotero.tagSelector.filter;" hidden="true"/>
+						<xul:textbox id="tags-search" flex="1" type="search" timeout="250" dir="reverse"
+							oncommand="this.parentNode.parentNode.parentNode.handleKeyPress(); event.stopPropagation()"
+							onkeypress="if (event.keyCode == event.DOM_VK_ESCAPE) { this.parentNode.parentNode.parentNode.parentNode.handleKeyPress(true); }">
+							<xul:toolbarbutton id="search-cancel"
+								oncommand="this.parentNode.focus(); this.parentNode.parentNode.parentNode.parentNode.parentNode.handleKeyPress(true)" hidden="true"/>
+						</xul:textbox>
+						<xul:toolbarbutton id="view-settings-menu" tooltiptext="&zotero.toolbar.actions.label;"
+								image="chrome://zotero/skin/tag-selector-menu.png" type="menu">
+							<xul:menupopup id="view-settings-popup">
+								<xul:menuitem id="show-automatic" label="&zotero.tagSelector.showAutomatic;" autocheck="true" type="checkbox"
+									oncommand="var ts = this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode; ts._dirty = true; ts.setAttribute('showAutomatic', this.getAttribute('checked') == 'true')"/>
+							</xul:menupopup>
+						</xul:toolbarbutton>
 					</xul:hbox>
 					
-					<!--
-					Disabled (at least) until there's an ANY search mode
-					<xul:toolbarbutton label="&zotero.tagSelector.selectVisible;"
-						oncommand="this.parentNode.parentNode.parentNode.parentNode.selectVisible()"/>
-					<xul:button label="&zotero.tagSelector.clearVisible;"
-						oncommand="this.parentNode.parentNode.parentNode.parentNode.clearVisible()"/> -->
-					<xul:toolbarseparator/>
-					<xul:hbox pack="center">
-						<xul:button label="&zotero.tagSelector.clearAll;"
-							oncommand="this.parentNode.parentNode.parentNode.parentNode.clearAll(); event.stopPropagation();"/>
+					<xul:hbox align="center">
+						<xul:hbox pack="center">
+							<xul:label id="num-selected"/>
+						</xul:hbox>
+						
+						<!--
+						Disabled (at least) until there's an ANY search mode
+						<xul:toolbarbutton label="&zotero.tagSelector.selectVisible;"
+							oncommand="this.parentNode.parentNode.parentNode.parentNode.selectVisible()"/>
+						<xul:button label="&zotero.tagSelector.clearVisible;"
+							oncommand="this.parentNode.parentNode.parentNode.parentNode.clearVisible()"/> -->
+						<xul:toolbarseparator/>
+						<xul:hbox pack="center">
+							<xul:button label="&zotero.tagSelector.clearAll;"
+								oncommand="this.parentNode.parentNode.parentNode.parentNode.parentNode.clearAll(); event.stopPropagation();"/>
+						</xul:hbox>
 					</xul:hbox>
-				</xul:hbox>
+				</xul:vbox>
 			</xul:groupbox>
 		</content>
 	</binding>
diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 9eb045d98f..3ee477fafa 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -110,9 +110,9 @@ var ZoteroPane = new function()
 		
 		if (Zotero.isMac) {
 			//document.getElementById('zotero-tb-actions-zeroconf-update').setAttribute('hidden', false);
-			document.getElementById('zotero-pane').setAttribute('platform', 'mac');
+			document.getElementById('zotero-pane-stack').setAttribute('platform', 'mac');
 		} else if(Zotero.isWin) {
-			document.getElementById('zotero-pane').setAttribute('platform', 'win');
+			document.getElementById('zotero-pane-stack').setAttribute('platform', 'win');
 		}
 		
 		//Initialize collections view
@@ -212,6 +212,12 @@ var ZoteroPane = new function()
 		if (Zotero.Prefs.get('debugShowDuplicates')) {
 			document.getElementById('zotero-tb-actions-showDuplicates').hidden = false;
 		}
+		
+		// use appropriate search box
+		if(Zotero.isFx30) {
+			document.getElementById("zotero-tb-search-label").hidden = false;
+			document.getElementById("zotero-tb-search").setAttribute("type", "conditional-timed");
+		}
 	}
 	
 	
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index fdf8b83fec..e2bdb9014b 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -21,6 +21,7 @@
     ***** END LICENSE BLOCK *****
 -->
 <?xml-stylesheet href="chrome://zotero/skin/overlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://zotero-platform/content/overlay.css" type="text/css"?>
 
 <!DOCTYPE overlay [
 	<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
@@ -141,10 +142,10 @@
 						the tag selector to max height -->
 				<vbox flex="1">
 					<hbox class="toolbar">
-						<toolbarbutton id="zotero-tb-collection-add" tooltiptext="&zotero.toolbar.newCollection.label;" oncommand="ZoteroPane.newCollection()"/>
-						<toolbarbutton id="zotero-tb-group-add" tooltiptext="&zotero.toolbar.newGroup;" oncommand="ZoteroPane.newGroup()"/>
+						<toolbarbutton id="zotero-tb-collection-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newCollection.label;" oncommand="ZoteroPane.newCollection()"/>
+						<toolbarbutton id="zotero-tb-group-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newGroup;" oncommand="ZoteroPane.newGroup()"/>
 						<spacer flex="1"/>
-						<toolbarbutton id="zotero-tb-actions-menu" tooltiptext="&zotero.toolbar.actions.label;" type="menu">
+						<toolbarbutton id="zotero-tb-actions-menu" class="zotero-tb-button" tooltiptext="&zotero.toolbar.actions.label;" type="menu">
 							<menupopup id="zotero-tb-actions-popup" onpopupshowing="document.getElementById('cmd_zotero_reportErrors').setAttribute('disabled', Zotero.getErrors().length == 0)">
 								<menuitem id="zotero-tb-actions-import" label="&zotero.toolbar.import.label;" oncommand="Zotero_File_Interface.importFile();"/>
 								<menuitem id="zotero-tb-actions-import-clipboard" label="&zotero.toolbar.importFromClipboard;" oncommand="Zotero_File_Interface.importFromClipboard();" />
@@ -200,13 +201,14 @@
 					oncommand="ZoteroPane.updateTagFilter()"/>
 			</vbox>
 			
-			<splitter id="zotero-tree-splitter" resizebefore="closest" resizeafter="closest" collapse="before">
+			<splitter id="zotero-tree-splitter" resizebefore="closest" resizeafter="closest" collapse="before"
+				onmousemove="document.getElementById('zotero-items-toolbar').setAttribute('state', this.getAttribute('state'));">
 				<grippy/>
 			</splitter>
 			
 			<vbox id="zotero-items-pane" persist="width" flex="1">
-				<hbox class="toolbar" align="center">
-					<toolbarbutton id="zotero-tb-add" tooltiptext="&zotero.toolbar.newItem.label;" type="menu">
+				<hbox class="toolbar"  id="zotero-items-toolbar" align="center">
+					<toolbarbutton id="zotero-tb-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newItem.label;" type="menu">
 						<!-- New Item drop-down built in overlay.js::onLoad() -->
 						<menupopup>
 							<menuseparator/>
@@ -218,14 +220,14 @@
 							</menu>
 						</menupopup>
 					</toolbarbutton>
-					<toolbarbutton id="zotero-tb-item-from-page" tooltiptext="&zotero.toolbar.newItemFromPage.label;" oncommand="ZoteroPane.addItemFromPage('temporaryPDFHack', event.shiftKey ? !Zotero.Prefs.get('automaticSnapshots') : null)"/>
-					<toolbarbutton id="zotero-tb-lookup" tooltiptext="&zotero.toolbar.lookup.label;" oncommand="ZoteroPane.openLookupWindow()"/>
-					<toolbarbutton id="zotero-tb-note-add" tooltiptext="&zotero.toolbar.note.standalone;" oncommand="ZoteroPane.newNote(event.shiftKey);"/>
+					<toolbarbutton id="zotero-tb-item-from-page" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newItemFromPage.label;" oncommand="ZoteroPane.addItemFromPage('temporaryPDFHack', event.shiftKey ? !Zotero.Prefs.get('automaticSnapshots') : null)"/>
+					<toolbarbutton id="zotero-tb-lookup" class="zotero-tb-button" tooltiptext="&zotero.toolbar.lookup.label;" oncommand="ZoteroPane.openLookupWindow()"/>
+					<toolbarbutton id="zotero-tb-note-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.note.standalone;" oncommand="ZoteroPane.newNote(event.shiftKey);"/>
 					<toolbarseparator/>
-					<toolbarbutton id="zotero-tb-advanced-search" tooltiptext="&zotero.toolbar.advancedSearch;" oncommand="ZoteroPane.openAdvancedSearchWindow()"/>
+					<toolbarbutton id="zotero-tb-advanced-search" class="zotero-tb-button" tooltiptext="&zotero.toolbar.advancedSearch;" oncommand="ZoteroPane.openAdvancedSearchWindow()"/>
 					<spacer flex="1"/>
-					<label value="&zotero.toolbar.search.label;" control="zotero-tb-search"/>
-					<textbox id="zotero-tb-search" type="conditional-timed" timeout="250" command="cmd_zotero_search" dir="reverse"
+					<label id="zotero-tb-search-label" value="&zotero.toolbar.search.label;" control="zotero-tb-search" hidden="true"/>
+					<textbox id="zotero-tb-search" type="search" timeout="250" command="cmd_zotero_search" dir="reverse"
 						onkeypress="ZoteroPane.handleSearchKeypress(this, event)"
 						oninput="ZoteroPane.handleSearchInput(this, event)"
 						testcode="me.value.indexOf('&quot;') == -1"
@@ -373,7 +375,7 @@
 							</grid>
 						</tooltip>
 					</hbox>
-					<toolbarbutton id="zotero-tb-sync" class="zotero-small-progress-indicator" tooltip="_child"
+					<toolbarbutton id="zotero-tb-sync" class="zotero-tb-button" tooltip="_child"
 							oncommand="Zotero.Sync.Server.canAutoResetClient = true; Zotero.Sync.Runner.sync()">
 						<tooltip
 								onpopupshowing="ZoteroPane.setLastSyncStatus(this)"
@@ -384,8 +386,8 @@
 						</tooltip>
 					</toolbarbutton>
 					<toolbarseparator/>
-					<toolbarbutton id="zotero-tb-fullscreen" tooltiptext="&zotero.toolbar.fullscreen.tooltip;" oncommand="ZoteroPane.fullScreen();"/>
-					<toolbarbutton class="tabs-closebutton" oncommand="ZoteroPane.toggleDisplay()"/>
+					<toolbarbutton id="zotero-tb-fullscreen" tooltiptext="&zotero.toolbar.fullscreen.tooltip;" oncommand="ZoteroPane.fullScreen();" class="zotero-tb-button"/>
+					<toolbarbutton id="zotero-close-button" class="tabs-closebutton" oncommand="ZoteroPane.toggleDisplay()"/>
 				</hbox>
 				<!-- TODO: localize -->
 				<button id="zotero-item-restore-button" label="Restore to Library"
diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
index 15a5e96d46..d39832a298 100644
--- a/chrome/content/zotero/xpcom/collectionTreeView.js
+++ b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -490,7 +490,11 @@ Zotero.CollectionTreeView.prototype.getImageSrc = function(row, col)
 		
 		case 'collection':
 			// TODO: group collection
-			break;
+			return "chrome://zotero-platform/content/treesource-collection.png";
+ 		
+		case 'search':
+			// TODO: is this platform independent?
+			return "chrome://zotero-platform/content/treesource-search.png";
 		
 		case 'header':
 			if (source.ref.id == 'group-libraries-header') {
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index 409fc03592..cea28e54fa 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -29,6 +29,7 @@
 <!ENTITY zotero.tabs.related.label						"Related">
 <!ENTITY zotero.notes.separate							"Edit in a separate window">
 
+<!ENTITY zotero.items.itemType							"Item Type">
 <!ENTITY zotero.items.type_column						"Type">
 <!ENTITY zotero.items.title_column						"Title">
 <!ENTITY zotero.items.creator_column					"Creator">
@@ -94,11 +95,11 @@
 
 <!ENTITY zotero.tagSelector.noTagsToDisplay			"No tags to display">
 <!ENTITY zotero.tagSelector.filter					"Filter:">
-<!ENTITY zotero.tagSelector.showAutomatic			"Show automatic">
-<!ENTITY zotero.tagSelector.displayAll				"Display all tags">
-<!ENTITY zotero.tagSelector.selectVisible			"Select visible">
-<!ENTITY zotero.tagSelector.clearVisible				"Deselect visible">
-<!ENTITY zotero.tagSelector.clearAll					"Deselect all">
+<!ENTITY zotero.tagSelector.showAutomatic			"Show Automatic">
+<!ENTITY zotero.tagSelector.displayAll				"Display All Tags">
+<!ENTITY zotero.tagSelector.selectVisible			"Select Visible">
+<!ENTITY zotero.tagSelector.clearVisible				"Deselect Visible">
+<!ENTITY zotero.tagSelector.clearAll					"Deselect All">
 <!ENTITY zotero.tagSelector.renameTag				"Rename Tag...">
 <!ENTITY zotero.tagSelector.deleteTag				"Delete Tag...">
 
diff --git a/chrome/skin/default/zotero/bindings/attachmentbox.css b/chrome/skin/default/zotero/bindings/attachmentbox.css
index 74eb6a9877..735a4e51b7 100644
--- a/chrome/skin/default/zotero/bindings/attachmentbox.css
+++ b/chrome/skin/default/zotero/bindings/attachmentbox.css
@@ -34,3 +34,26 @@
 	font-size: .95em;
 	padding: 0;
 }
+
+row > label:first-child
+{
+	font-weight: bold;
+}
+
+label
+{
+	-moz-margin-start: 1px !important;
+	-moz-margin-end: 5px !important;
+	padding: 1px 1px 0 2px;
+}
+
+zoteronoteeditor
+{
+	margin: 2px 2px 0 2px;
+}
+
+#title
+{
+	font-size: 12px;
+	font-weight: bold;
+}
\ No newline at end of file
diff --git a/chrome/skin/default/zotero/bindings/itembox.css b/chrome/skin/default/zotero/bindings/itembox.css
index 66ab3f8965..300cbdba08 100644
--- a/chrome/skin/default/zotero/bindings/itembox.css
+++ b/chrome/skin/default/zotero/bindings/itembox.css
@@ -59,13 +59,20 @@ row label
 }
 
 /* creator type menu */
-.creator-type-label {
+.creator-type-label, .creator-type-value {
 	-moz-box-align: center;
 	-moz-box-pack: end;
+	height: 1.8em !important;
+	min-height: none !important;
+	max-height: 1.8em !important;
+	padding: 0;
+	margin: 0;
 }
+
  
-.creator-type-label image {
-	margin: 0 .5em 1px;
+.creator-type-label > image {
+	margin: 0 1em 1px;
+	list-style-image: url('chrome://zotero/skin/arrow-down.gif');
 }
 
 /* no space between last name and comma */
@@ -74,16 +81,15 @@ row hbox label:first-child
 	margin-right: 1px;
 }
 
-row hbox label.comma
+row label,
+row > vbox[fieldname=abstractNote],
+row > vbox[fieldname=extra]
 {
-	
-}
-
-row vbox[fieldname=abstractNote],
-row vbox[fieldname=extra]
-{
-	margin-top: 1px;
-	margin-left: 6px;
+	margin-top: 0px;
+	margin-bottom: 0px;
+	-moz-margin-start: 1px !important;
+	-moz-margin-end: 5px !important;
+	padding: 1px 1px 0 2px;
 }
 
 hbox.zotero-date-field-status
@@ -97,3 +103,55 @@ hbox.zotero-date-field-status label
 	color: #666;
 	margin: 0 0 0 1px;
 }
+
+#item-type-menu
+{
+	-moz-appearance: none;
+	color: black;
+	height: 1.5em !important;
+	min-height: 1.5em !important;
+	padding: 0 0 0 2px !important;
+	margin: 1px 5px 0 0 !important;
+	max-height: 1.5em !important;
+	border: 1px solid transparent;	
+	-moz-border-top-colors: none;
+	-moz-border-right-colors: none;
+	-moz-border-bottom-colors: none;
+	-moz-border-left-colors: none;
+	background-color: transparent;
+}
+
+#item-type-menu > .menulist-label-box
+{
+	-moz-box-flex: 0 !important;
+}
+
+#item-type-menu > .menulist-label-box, #item-type-menu > .menulist-label-box > .menulist-label
+{
+	margin: 0 !important;
+	padding: 0 !important;
+}
+
+#item-type-menu > .menulist-dropmarker
+{
+	display: none;
+}
+
+.zotero-field-toggle
+{
+	color: transparent;
+	margin: 0px 5px 0px 0px !important;
+	width: 26px !important;
+	max-width: 26px !important;
+	min-width: 26px !important;
+}
+
+.zotero-field-toggle .toolbarbutton-text
+{	
+	visibility: hidden;
+}
+
+.zotero-field-toggle .toolbarbutton-icon
+{
+	margin: 0px !important;
+}
\ No newline at end of file
diff --git a/chrome/skin/default/zotero/bindings/noteeditor.css b/chrome/skin/default/zotero/bindings/noteeditor.css
index 21e73f27f1..7076925fe9 100644
--- a/chrome/skin/default/zotero/bindings/noteeditor.css
+++ b/chrome/skin/default/zotero/bindings/noteeditor.css
@@ -8,3 +8,25 @@
 #tagsPopup {
 	min-width: 300px;
 }
+
+linksbox
+{
+	margin-top: 4px;
+}
+
+row > label:first-child
+{
+	text-align: right;
+}
+
+row > label:first-child
+{
+	font-weight: bold;
+}
+
+label
+{
+	-moz-margin-start: 1px !important;
+	-moz-margin-end: 5px !important;
+	padding: 1px 1px 0 2px;
+}
\ No newline at end of file
diff --git a/chrome/skin/default/zotero/bindings/tagselector.css b/chrome/skin/default/zotero/bindings/tagselector.css
index 92ae399f34..acd3b4d51a 100644
--- a/chrome/skin/default/zotero/bindings/tagselector.css
+++ b/chrome/skin/default/zotero/bindings/tagselector.css
@@ -23,11 +23,7 @@ checkbox
 	margin-right: .2em;
 	padding: .15em .25em;
 	-moz-user-focus: ignore;
-}
-
-#tags-toggle label[selected="true"]
-{
-	background: #a9c6f0 !important;
+	max-width: 250px;
 }
 
 /* Visible out-of-scope tags should be grey */
@@ -85,3 +81,8 @@ toolbarbutton.zotero-clicky
 	padding:1px;
 	height:1em;
 }
+
+#view-settings-menu .toolbarbutton-menu-dropmarker
+{
+	margin-left: -12px !important;
+}
\ No newline at end of file
diff --git a/chrome/skin/default/zotero/mac/arrow-down.png b/chrome/skin/default/zotero/mac/arrow-down.png
new file mode 100644
index 0000000000000000000000000000000000000000..75c9b661350cf8189b583c180e98cb1b09ca52e7
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+0wnXI=SKi3&H|6fVg?3oVGw3ym^DWND5#L^
z5#-CjkUN8cp}3EM;gcT&L#rH63y}TPmVv=okAXqr;$ESSdZ1cOPZ!4!j_b)k&NuK#
zUf41H-}A!{RVSQS`oA*a+|mC5N2f24*%8OVeprKn`<qqagEQCf12r*ty85}Sb4q9e
E0EbjC1^@s6

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/mac/folderDropArrow.png b/chrome/skin/default/zotero/mac/folderDropArrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ae0f23b7cda89741dc8c2affa3baccdb1d49422
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^>_E)Q!3HEdXMMW?q*&4&eH|GXuHCreA7KRKS9!WP
zhE&{&>0ZdiqA23}K6;t|tQ_$zyb^z9_7^o(?mLhoVA2s9Fk^f6%nj^$7BPI5&n;RS
z>X%Ge@Osyc>i#*Ot2q=CdJbNTQqI=B|GoE~^|#vgAg--pzj_SAT%T7yvf#^D8|byr
tQhnR=$^&OSG%v1yAfc=q|C`Hz;jyxHz%I)j3P4vdc)I$ztaD0e0s!WPNsRyi

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/mac/hgrippy.png b/chrome/skin/default/zotero/mac/hgrippy.png
new file mode 100644
index 0000000000000000000000000000000000000000..3700ddd8eae64c68446ff164b7e9c0dc9dfafd96
GIT binary patch
literal 3464
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

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/mac/hsplitter.png b/chrome/skin/default/zotero/mac/hsplitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..904928bce760e9da8947e96d80939680cd7b8354
GIT binary patch
literal 3402
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

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/mac/menubutton-end-pressed.png b/chrome/skin/default/zotero/mac/menubutton-end-pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec7d722dd12a2cca4f1a51ce93ac405ddf7e0123
GIT binary patch
literal 679
zcmV;Y0$BZtP)<h;3K|Lk000e1NJLTq000pH000*V1^@s6?KGt40000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!Nl8RORCwByR6EZSQ4pPl%lokuw1k!h
z3s4ecK}RW(j>d{u(ip-YF!?M@jE%p*XzXk>#@ZNTVl**d_Z1o>$a{G%EG#(Z#w8m+
zb^|v#naeWw%$d0}S1Fgvd-}Kb`@P+oY`?Q@vwhF@HQUjDKGG`1V(~y?UzQV=&*!6H
zFgW3Fj~UPSlWr#w>2&%S2brcxo6UyS>ow`RPP5reWuglqM1>FDWtTseugGSz*AxIC
z0l{*)q{(DL<MCL632%i$p)c%n8>vc?R4R2%#csEgM3xee42MJNcDvN;^+22ohr@3;
z&>eO+L@X9NS`PqZ+wGR3(I~->6_DTWr*^vyMK^i>ko_(MWIHWIQON7{5=SMjh1>%;
z(`vQg(que$C9yA%Kn?s+=*40|{eEBN0QUvtp1PonZ-^3!gv4kx!u8)fiv)G@cs#N$
zkw`?=h>L&YY!VdPB7!PS)6}y`P!rkeoEpfu(B|1B@CU4p4g><@lS!=JF$_aCAb`E9
zs=rUVV*4oIAg&m|o;&`ts}lR9f&jj&)r#ixxf}(qi(aWzUI^sn7Tw<dh-?ickk9Ae
zGQJ7q=Jbx>FkpWcpkgo>pnHGSYPBb&Qppf#U#B!I0=o)yDW{<|o6Sf37JZc?!H<n&
z9qcL)Y&xBy-G4S3ji<R>?iH($1r_+i?K-VA__tmt6h74J^_R(H@*NW#QV^X^$MJT!
z2U_uXT+3uKm(^<ZBg_B9pMO{i4ui=N9=No~kb#JJJgyk)V@`hs7ytq#;KSlaRAT@D
N002ovPDHLkV1hHZH>3an

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/mac/menubutton-end.png b/chrome/skin/default/zotero/mac/menubutton-end.png
new file mode 100644
index 0000000000000000000000000000000000000000..a885c9c7e3ed1564f8ccea3d3deec499c6306feb
GIT binary patch
literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq000pH000*V1^@s6?KGt40000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz-$_J4RCwB?l+Q~7Q4q&x{ecIC1@RW@
z!HX9|v_R;rD8fpD2QM8vdhyUnPaQgh(%)bd9X%uwc#}v=3PS`*Nj4!B%a9aT*KM9?
zm{{oU7iNd|cHZaBd(0ck=kp0Ll^_W7o=5+PzK;G1{RR5>g_wz_gxP38<M9}()hg8M
zb;x8gkj-X4d7eMQ@RL+3)t|+=-EN@p$5P0m%H=Y|Vle`}LlA?Yw;4o+5Lm@bCKJTt
zabOr`o1&<k$K%<UZ9w&Uy_GVVS2CG|L?UsI@Esg-ve9S+>zdc=1&712g&BnjR1}0*
zAP@khQh9(3S}`0BL5#FoE!gdLI-k$)iG~naEEXsf3cHdZ27>``{iY;{Mxz0a<7fqb
zL_-FH0m$WYUQ#CQb{kYG)rTZVtyUvPdX)qzl}e!3>u+TQBF0*+7I~C?zu$i<I+Jud
z4OXl55)1A@K}vXCVU<Fo(Wr&P;bWJ}#jOP)Eg_f7L9tluM5EC|qtTcr^D9G|&F16?
z_;Oz&kx1NTvz_DgWU+$K{}Q>pZnq1SN(ES!?c@2cL!r=_PNz%Z@2{Vx<a9d!Y)Uju
zvud@vV>X+M!C)|h>EGb=6W+tG^hu-M|F0;gJF;lcq|%oKeG4!Ex1x>~fYLYA00000
LNkvXXu0mjfHfaNz

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/mac/menubutton-mid-pressed.png b/chrome/skin/default/zotero/mac/menubutton-mid-pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..8441993ed05c7ee09488305028af24822f726f57
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^oIotj!3HF6`lkK{Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JisC$7978H@-MO%l_kaQqgX4rtMomXq&OFlHWVM!ckwe2A
z!F>x)T@SAf3FW_#oW>Y<Zf2ln>%<NNFHJ+M=P^#z@8uU)b6<<<c{Zo#m_$$2`<|%m
ko~*SUi+1mCv14Ron9XC+u|7d@AJ8TSPgg&ebxsLQ0Qb2=c>n+a

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/mac/menubutton-start-pressed.png b/chrome/skin/default/zotero/mac/menubutton-start-pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..9793ec83b1f944df3551e3bbf98943e08ede558b
GIT binary patch
literal 759
zcmV<T0to$yP)<h;3K|Lk000e1NJLTq0077U000*V1^@s6PA~vu0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!nMp)JRCwC#n!BnRQ51%^*YPqs8gGL#
zm?B+B2zX8t(yAd{BoIiE<~%?MDNHM*GnK7vz%~TZ_yS3x*ovKyMiiojjyhhl*2Xyu
zhmZ%z{y$h}%N(nXAM0PbeD!)=_<TOWcu%T(^zt>G&*?1D`Gn5E-S-0UKNI}RvnbU&
zs*l_4)^Hr>_8*V}s4j>}5_~%x4%Z}yh(sbn*L9(3nh1qLA`l4R#(=VdaE$t4+qT6b
z6bc2APN#)o7$O#nNlEzmC4S-NfI5Pl&*w0G_`hy88;fPg=krpKOeP}*aXSc$;rIJ-
zYd|eQ=!5@(BGpwq9v7ujNfe7kDM&Jzlrbw93`#N3J%EaW7*tJ`z%)%^S(cQ8J4ZMi
zzLkQyj4S|@5`-jpOVP^6<#JMtY&I(riG=JLm-r=)$0KeEs3{1|7B6}DPNh<^I8t%P
zIGs+i08m;G$8jD<qfx>02S+NNHCPP9DF8^2{eEw7=kUsLI2<sH1Hgh%ygHH?L3a>m
zIrxMi0FWS>rv0XvW%3}-a`0*i1Oeb8h_36uR;!h{+wBAw$1GP6NCK1>#ImfP^ZESB
zwr#=X?ptB41OO7G(P(@bjYc=rMWVcB;tuNkJBTX@15tpIf>bJ%5!LtMaQKP^VG(#9
z;cvC>u9!d)pqwDJT5aF$c0W%hlk3G|QFc3scg3Bbd6yI+3Q$H6{!=cOhs|d5Q>)c#
z&t|g}f0M=C#O)%kB#;BBhOb(!$`}29KTa|0rrmD8UoMyTd6SoaUH5ho%p*WqK`xT$
z6tiA*I-NIz!JtMWMBS+6-RuQGNkJ}>aO`?Colc+jdc9}k@%Z6-y-uxGD+|{JloRA1
pONkoQ11c6HPL;uR0oC{;zyNph)HySfvmO8d002ovPDHLkV1oOPP_zI5

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/mac/menubutton-start.png b/chrome/skin/default/zotero/mac/menubutton-start.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f374ba627291bb79da0627c2c5ba184f073112a
GIT binary patch
literal 653
zcmV;80&@L{P)<h;3K|Lk000e1NJLTq0077U000*V1^@s6PA~vu0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!FG)l}RCwC#nm?=BP#A|#%vG^f6pJEA
zv}kd#Sc-a8ikqlaL8(*<MZ5F^TxvnP2qN9=<m%eu-bHXPt%I`;E`e?;#lZ~zOW#0m
z$qn`kG`|N<-sI#=KX`c0A>s1*JmWZyDX1$AC*8iH`kbnl>Qkz`b}az^Ggr!GJRbj@
zC>DzrDmMm$;X^W+w5QW)=Jk46AP`_Qhs1#X1X0Q1q0aD?gt%@tn=BLx-C2A-pOF~Q
zryzww!Al+Dd%0W|>h(G^nM~|-Iw2vTYdGZ$LYR1-|JG<U;+0ATsQ{qvAhfM|pGu|T
zrBaC<k4K~efJzX%(P(VfYBk6KfL0JXYrKiYVs@v~$qt7D5&=Lh2z8Gakw^q`0B}hV
z661-_=Yt>sToPoz-`lNLD+B@Hk{~?KpCn1TGMmjv0|2ccB*w4JX5(?WTu1`|tsu0$
z`YDQ{$Kh}w4FI%)2!ilqKA*?K;V{wwKr2YKTK(MZcHgd6D+{^^0C(YJSvGY#oiE$%
z_GP(TMj`;HJ4h~<+Yg7sPpww#dODr@W3d=g0pL~;<>L4IXYF?TW3SiiOOoVBBod70
zd87j%$e((QMx!IzYTfJi`|p;^<-<%S!`yB+5(4@@gJiQ=HknLrpRMclx;PjNUe9K;
zoFE96U@*vRHXFlt5};c_)Q~JnSBZ$C_-r&9r5B6E<K1rOphLWXxPa~ik!AT`@05Q}
n9??+5xKHB&;sSc(w*UhGjCGT^w#(b<00000NkvXXu0mjfDrqKX

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/mac/selected-focused-gradient.png b/chrome/skin/default/zotero/mac/selected-focused-gradient.png
new file mode 100644
index 0000000000000000000000000000000000000000..13c0edc79f946b9d633b938b26e6d5a7afa9368c
GIT binary patch
literal 323
zcmV-J0lfZ+P)<h;3K|Lk000e1NJLTq000mG000vR0ssI276lrZ00004XF*Lt006O$
zeEU(800009a7bBm000XU000XU0RWnu7ytkO<w-<AR4C7llgVwwKnw({fyqAzXW&Sj
z&<x9u5uwAo3-cjJ1g~mR`TG9huz(PtUj&k<NdR@MRXjo-2}BH?P*po9Np&TZfC2{8
z9F@lG4*xU9TBUndl;jf+Fsf?%EeM`O*JmdrW3JUTFL1a&+h6UkQFZVb5#zy}Jt;vU
zxO;6`{R4M0+-P*nIn$)479JWr#88LgL3*uqMDHNz`N-MfTJ@fL8+4Qh5H{CU*t@EQ
zW3{Ze{k+>-7=22&s_AQb_$|g<>(#Q}9L9YQuSp-tLv7~TSMd2<$DFelbpBZ%>=$KM
V#k4VFT!{bx002ovPDHLkV1fw<f@=T(

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/mac/selected-gradient.png b/chrome/skin/default/zotero/mac/selected-gradient.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c19d02a83fdb33c25cfe30ef607d0772af1adf6
GIT binary patch
literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^{6H+s!2~1^EI9BNNU@|l`Z_W&Z0xJ~9XJ`t=PdAu
zEM{Qf76xHPhFNnYfP!V7E{-7@=eGtq@*Pm%$QJ(pU%GDjrsiWajy1OT3M;O?5H(AZ
zp<MmtI|euBpl1wTYelbzioNH$8}*y_ZZ-dulQoO(d(8-5YN6V4RYs=gkKA;YeEE=f
z(#l_Uq}-R&(A(W{WAdN!l=MlHpT2juJo$H@<7A&AB`G<k<;%_rC5GPxx`4sc)z4*}
HQ$iB}$S_OE

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/mac/vgrippy.png b/chrome/skin/default/zotero/mac/vgrippy.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a1a7e37aa3ad076dba9454f14507a4b1500ad96
GIT binary patch
literal 3460
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

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/mac/vsplitter.png b/chrome/skin/default/zotero/mac/vsplitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b283733c7347424d3278ae3ed1a49c80b91871a
GIT binary patch
literal 3396
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
aMgjmQ?iZh_rBLDk0000<MNUMnLSTZk(}Ym~

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/minus-active.png b/chrome/skin/default/zotero/minus-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..d43c58fe00b500287304e26acf6c668f1eb1d642
GIT binary patch
literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00004XF*Lt006O$
zeEU(800009a7bBm000XU000XU0RWnu7ytkP-$_J4R5;76lu3>nF&KsW2+0+=N2DxS
z^*-wyfn9FEv}6H7YBd7HDj)#@1W3&DBtaO(d<V9F>a)sj=s@=-i%<32e(%|3yXr|q
zp8f}SJEPI)cZ-)`FeqNHS3yl5W1j|DqAwOnjFCu0(&@C6N+kvL>uW^ZZa0BRw0DE-
zkZ~v!l5)8$)oN90wVI+{ud640jG;k$9d;d*M4*k0Mnjs-rh&GGKszjX6U2M-I+aRA
znOd!uwA*b(r_(Vt{eT9o$Kw&bXFBL59*>&<%-wGHhF-6yo;nyU9=s+f5C}-ISTqLc
z_xp;$V4%=#(1CdHnjn_QEQp4~p}1VG57EJR*b)=u^ZC>&#^bR}CX-Kt(2PbSwKBio
z{}#jva2m7OOy={sEEWq{E|-SYYNeoN49#>pRi}&hX0x-|tP-!+YuRiz4`Cb#&15n+
zo9)=`cE7^munO94w_>#w)Q>=m2QL}=LOKhDg0QON@hFGG;UD(<y@58`TrO9{dwsLN
zUM`oP*7x)$pU*4d`Fu8<PA5|{hK6qs58n45t%Ct(NhA{L_Og5(K+S<L#;vwP9FKk@
zq&s<UYu4YXR7zs8n1Y%<drzEtB_IBe?3un<JX`#*dA9o;_dI_A&!6o4f*y|z00000
LNkvXXu0mjf#y0@A

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/minus.png b/chrome/skin/default/zotero/minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba868c1b24ac94761aad1305ff76f7a4ab10f5df
GIT binary patch
literal 599
zcmV-d0;v6oP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00004XF*Lt006O$
zeEU(800009a7bBm000XU000XU0RWnu7ytkP`AI}UR5;76l)G*kK^TSo2;>!bk4ThM
z?o;Ox=u+_xPH!R6#GqI)1&GwN7|^=lvh0NggM-*zFd%47{xhCg?OG&hf^_(onRC9m
zvR44E{)gVa-hHaoYC&`>azxN_bX(!QKLcVFQ%-a*3I~G$*6TISrxQ*hKC_K|+LKFX
z6Oe{H(sVc+RQP;8tD4q+zlR3Vo4W*J=l$_`06|$DlV^fhjXwj@dlE)bgxzj;QLnq#
z%<s)+W0qM+gKj&W4&o?A9LLyhw^FyNUJ^Y~7!g!vHUU*C6=ysit5L!*1ZQRx$B_!M
zMxsyv^l|ft!y%YWKsPsEF$-o`u2y(?`Gr!c^j9rcOFTa>;rl+A&43)&!F)c)VzKxq
zh`t~QVB2;U#Od|>eKo>tHd96eH8O2MFjpSW^U&>fvrE%Aw(L5tGSEnIR3l%vaWHyp
zdx9Si4@hrzemb3g;Za&omYS~Xx=OwTyp&wmgLuJ%u`Ej+KeJ?*KV7leZ2sg08_7wG
zMk7on69u)W_FEMZz&@VVx4Szq!)&rN(FeJ$pBs(F6JazGq$FVi%y0J9>vhn}46|vF
zS|U62%y?tVJOBge^?GQx+iE%VXh=Tu8cB)tBG=t&wZ7MCHP5_8_{=uFCq*-pKY^0j
li9U+1MW3{;bzA;Y<~Ox$<{bxP+&BOL002ovPDHLkV1ltb19JcX

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 8ba3423392..7e8eb8cbc4 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -24,17 +24,6 @@
 	overflow: hidden;
 }
 
-/* these are hacks to display a window separator in full screen mode on OS X */
-window #zotero-pane-stack[fullscreenmode="true"][platform="mac"]
-{
-	border-top: 1px solid #A3A3A3;
-}
-
-window[active="true"] #zotero-pane-stack[fullscreenmode="true"][platform="mac"]
-{
-	border-top: 1px solid black;
-}
-
 #zotero-collections-pane
 {
 	min-width: 150px;
@@ -56,12 +45,16 @@ window[active="true"] #zotero-pane-stack[fullscreenmode="true"][platform="mac"]
 	background: #FFFF99;
 }
 
+#zotero-collections-tree treechildren::-moz-tree-cell-text(hover) {
+	text-decoration: none !important;
+	cursor: auto !important;
+}
 
 #zotero-pane splitter
 {
 	border: 0;
 	width: 10px;
-	background-color: transparent !important;
+	background-color: transparent;
 	background-image: none;
 }
 
@@ -112,7 +105,6 @@ window[active="true"] #zotero-pane-stack[fullscreenmode="true"][platform="mac"]
 #zotero-tb-collection-add
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-collection-add.png');
-	margin-top: -2px;
 }
 
 #zotero-tb-group-add
@@ -132,20 +124,6 @@ window[active="true"] #zotero-pane-stack[fullscreenmode="true"][platform="mac"]
 	padding: 0;
 }
 
-/* These fix a rendering bug in Fx2.0b2 */
-#zotero-pane toolbarbutton .toolbarbutton-text
-{
-	margin:0 2px;
-}
-#zotero-pane .toolbarbutton-menu-dropmarker
-{
-	margin-right:4px;
-}
-#zotero-tb-fullscreen .toolbarbutton-text, #zotero-editpane-dynamic-fields .toolbarbutton-text
-{
-	margin:0;
-}
-
 
 #zotero-tb-actions-menu
 {
@@ -274,7 +252,7 @@ window[active="true"] #zotero-pane-stack[fullscreenmode="true"][platform="mac"]
 	width: 150px;
 }
 
-#zotero-tb-search-cancel
+#zotero-tb-search[type=conditional-timed] > #zotero-tb-search-cancel
 {
 	width: 10px;
 	height: 10px;
@@ -285,7 +263,7 @@ window[active="true"] #zotero-pane-stack[fullscreenmode="true"][platform="mac"]
 	-moz-appearance: none !important; /* Fix rendering problems on Linux */
 }
 
-#zotero-tb-search-cancel:hover:active
+#zotero-tb-search[type=conditional-timed] > #zotero-tb-search-cancel:hover:active
 {
 	list-style-image: url('chrome://zotero/skin/search-cancel-active.png');
 }
diff --git a/chrome/skin/default/zotero/plus-active.png b/chrome/skin/default/zotero/plus-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d1dd11be871cf4d123c61c42fd5f735699acd3d
GIT binary patch
literal 585
zcmV-P0=E5$P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00004XF*Lt006O$
zeEU(800009a7bBm000XU000XU0RWnu7ytkP>q$gGR5;76lSyg<K@^5_gm{I%N5G{k
z_gUu%?s5aCr3*z68x>bkP*G_G=XnB+BhGhl`%?c)SH+=2HW5C3Rqy}*uIjR$i0J7*
z`2M>4#9}eKAQB7)$?Nqps4<7$z5XFch@J&07<FBzOeRC6Qi(wwjq2ofyAhaz)-uQp
z8HYk4DwoSttyZa4t1<O@oqsWh9yHL(u=}7C1k%`OG^p8ZDlnEH&<so61YzIUPNh;|
zQ>)dYcDv2ETrLJR<^eR&dORM4*{_2li9|vLbUGdCcDsxW>h*d&Mo)&q1Fs4S1Oj9j
z1`A;T{eGX3L2?XaAUyD@AS@A2foM1!D)Vm)1_Rc@gIA)0d_EtqVmuzxWHR|P2%6Do
z#4Gdr{XaoC0i4EcHlz7`PK(8Ymdhn0&8yXl$LK*bolg05;k|j;xm=FL>-Cy8n~g#S
z$uar>q1kNq=4ETU-R?ac4s+0UyCpGZP|G0H*FXyoyvUH3&QUBD39C9Dk90U39@y{q
z3XGx6=ko@<YHI@9<#Krw_vy1xD6sH+J}XYAld92!26qo0cyF!<mWKwOl1wJ~-;3qT
z0Ms}T^zg4XLp00VZ>Br2Z}HTRbUID(c$`6vIrE)hJGO`0Z-FLw5jX{}CQfrsv+{fa
X#-^Rz4==o$00000NkvXXu0mjf$YlLj

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/plus.png b/chrome/skin/default/zotero/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1cc606882c27987bf7e3f54fc43e04f17f875af
GIT binary patch
literal 600
zcmV-e0;m0nP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00004XF*Lt006O$
zeEU(800009a7bBm000XU000XU0RWnu7ytkP`bk7VR5;76l)G*kK^TSo2=*)R9+4<r
zxlf%(pi9L&IK72L6N6&K6d+R5VnFMH%d%H6IEdW^1A^w{KjWDdi;2<%=`h30Ip5s5
z0C4d?^!|17DVNK6(VfT<LCeu?`BVP~keDt-52C2o>tV52;IQ9gFJhf-?9-mhvmgz5
zqG`L`s_@}(Q01{Un+-JR$-quQ?0nemwje00U0NrIrSWG#dQYM_j<H^^Gb$7cN^k48
zO#5=VG|S8%gYH_b7LqtYk|bEIR#L81X+W$S(Gy28K}BX$P^naMhQpy6C5j?&W<~~-
zB=TDn34lIse!t%bvnlBI_8WpQz-&Ip>+A0{{5Q?!GrYXa;QKz9&43)&!DKSQbUOVf
zh`ulkVcT{V#OZarT{S`w1j={{HEm%yQ6A6p&~CT0OVc;D=sK=4&`5Dq1M+nn2cyTf
zNBH^ph~v%9jmP7!JWA`?Qqy%^SIL)v0Ws{l9>fbCjAdEs_?accJi6<8z5a_AY#=8w
z7z{8PjTF=#+wY}_0QT{;zTe-28D`U^iLT_feyP=J&xFxPkdlN6Fu&PXtyV!VGt6e5
z2&cymJu}|eA`id-I-L%h&8AuoJsOfb`}#Hgn(J;f8b2zPif8^tSZABw6E5fK!|Okz
moamG2M)X<hMz`h8W&Qxs=)GL!i6fB!0000<MNUMnLSTZswiWaM

literal 0
HcmV?d00001

diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css
index 0b5156c4b8..b2672bd1c9 100644
--- a/chrome/skin/default/zotero/zotero.css
+++ b/chrome/skin/default/zotero/zotero.css
@@ -146,27 +146,61 @@ zoteromergepane {
 .zotero-clicky
 {	
 	-moz-border-radius: 6px;
+	border: 1px solid transparent;
 }
 
 .zotero-clicky[value="-"], .zotero-clicky[value="+"]
 {
-	margin: 0px;
-	padding-left: 4px;
-	padding-right: 4px;
+	color: transparent !important;
+	padding: 0 !important;
+	margin: 0 5px 0 0 !important;
+	width: 19px;
+	height: 12px;
+}
+
+.zotero-clicky[value="-"] {
+	-moz-border-image: url('chrome://zotero/skin/minus.png') 0 0 0 0 stretch;
+	min-width: 18px;
+	min-height: 18px;
+	max-width: 18px;
+	max-height: 18px;
+}
+
+.zotero-clicky[value="+"] {
+	-moz-border-image: url('chrome://zotero/skin/plus.png') 0 0 0 0 stretch;
+	min-width: 18px;
+	min-height: 18px;
+	max-width: 18px;
+	max-height: 18px;
+}
+
+.zotero-clicky[value="+"][disabled=true] {
+	-moz-border-image: url('chrome://zotero/skin/plus.png') 0 0 0 0 stretch;
+	opacity: .5;
+}
+
+.zotero-clicky[value="+"]:not([disabled=true]):active {
+	-moz-border-image: url('chrome://zotero/skin/plus-active.png') 0 0 0 0 stretch;
+}
+
+.zotero-clicky[value="-"]:not([disabled=true]):active {
+	-moz-border-image: url('chrome://zotero/skin/minus-active.png') 0 0 0 0 stretch;
 }
 
 .zotero-clicky:not([disabled=true]):hover,
 .zotero-clicky:not([disabled=true]):hover .toolbarbutton-text
 {
-	color: white;
 	background: #666;
+	background: rgb(187, 206, 241);
+	border: 1px solid rgb(109, 149, 224) !important;
 }
 
 .zotero-clicky:not([disabled=true]):active,
-.zotero-clicky:not([disabled=true]):active .toolbarbutton-text
+.zotero-clicky:not([disabled=true]):active .toolbarbutton-text,
+.zotero-clicky[selected="true"]
 {
 	color: white;
-	background: #333;
+	background: rgb(89, 139, 236) !important;
 }