diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index 5b3838ae2..33115416a 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -809,7 +809,7 @@
 					
 					// Switch to single-field mode
 					if (fieldMode == 1) {
-						button.style.MozBorderImage = 'url("chrome://zotero/skin/textfield-dual.png") 0 0 0 0 stretch';
+						button.style.backgroundImage = 'url("chrome://zotero/skin/textfield-dual.png")';
 						button.setAttribute('tooltiptext', Zotero.getString('pane.item.switchFieldMode.two'));
 						lastName.setAttribute('fieldMode', '1');
 						button.setAttribute('onclick', "document.getBindingParent(this).switchCreatorMode(Zotero.getAncestorByTagName(this, 'row'), 0)");
@@ -840,7 +840,7 @@
 					}
 					// Switch to two-field mode
 					else {
-						button.style.MozBorderImage = 'url("chrome://zotero/skin/textfield-single.png") 0 0 0 0 stretch';
+						button.style.backgroundImage = 'url("chrome://zotero/skin/textfield-single.png")';
 						button.setAttribute('tooltiptext', Zotero.getString('pane.item.switchFieldMode.one'));
 						lastName.setAttribute('fieldMode', '0');
 						button.setAttribute('onclick', "document.getBindingParent(this).switchCreatorMode(Zotero.getAncestorByTagName(this, 'row'), 1)");
diff --git a/chrome/skin/default/zotero/bindings/itembox.css b/chrome/skin/default/zotero/bindings/itembox.css
index 6f32da310..6583f6afa 100644
--- a/chrome/skin/default/zotero/bindings/itembox.css
+++ b/chrome/skin/default/zotero/bindings/itembox.css
@@ -152,5 +152,8 @@ hbox.zotero-date-field-status label
 	height: 14px;
 	padding: 0 !important;
 	margin: 0 5px 0 0 !important;
-	border-width: 3px !important;
+	background-repeat: no-repeat !important;
+	background-position: center !important;
+	border-width: 0 !important;
+	-moz-border-radius: 4px !important;
 }
\ No newline at end of file
diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css
index 10ad8efc7..7bb9abeaf 100644
--- a/chrome/skin/default/zotero/zotero.css
+++ b/chrome/skin/default/zotero/zotero.css
@@ -159,24 +159,29 @@ zoteromergepane {
 }
 
 .zotero-clicky[value="-"] {
-	-moz-border-image: url('chrome://zotero/skin/minus.png') 0 0 0 0 stretch;
+	background-image: url('chrome://zotero/skin/minus.png') !important;
+	background-position: center !important;
+	background-repeat: no-repeat !important;
+	border: 0px !important;
 }
 
 .zotero-clicky[value="+"] {
-	-moz-border-image: url('chrome://zotero/skin/plus.png') 0 0 0 0 stretch;
+	background-image: url('chrome://zotero/skin/plus.png') !important;
+	background-position: center !important;
+	background-repeat: no-repeat !important;
+	border: 0px !important;
 }
 
 .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;
+	background-image: url('chrome://zotero/skin/plus-active.png') !important;
 }
 
 .zotero-clicky[value="-"]:not([disabled=true]):active {
-	-moz-border-image: url('chrome://zotero/skin/minus-active.png') 0 0 0 0 stretch;
+	background-image: url('chrome://zotero/skin/minus-active.png') !important;
 }
 
 .zotero-clicky:not([disabled=true]):hover,