From 5f3313d13282f38a4c31bb07e3955f00d8b828aa Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 10 Feb 2016 04:52:25 -0500
Subject: [PATCH] Restore proper sizing of toolbar icons on HiDPI Windows/Linux

I guess the idea that switching to PNGs obviated the need for this was wishful
thinking (though it doesn't seem to be necessary for the single buttons anymore
on Linux, and it's no longer necessary on OS X, which has generally saner
styling in Firefox).
---
 chrome/content/zotero-platform/unix/overlay.css |  8 ++++++++
 chrome/content/zotero-platform/win/overlay.css  | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/chrome/content/zotero-platform/unix/overlay.css b/chrome/content/zotero-platform/unix/overlay.css
index 755a43c025..d858ce096d 100644
--- a/chrome/content/zotero-platform/unix/overlay.css
+++ b/chrome/content/zotero-platform/unix/overlay.css
@@ -9,6 +9,14 @@
 /*
  * Nav bar
  */
+toolbar[id="nav-bar"] #zotero-toolbar-main-button .toolbarbutton-icon {
+	width: 28px;
+}
+
+toolbar[id="nav-bar"] #zotero-toolbar-save-button .toolbarbutton-icon {
+	width: 30px;
+}
+
 toolbar[id="nav-bar"] #zotero-toolbar-buttons #zotero-toolbar-main-button {
 	margin-right: -1px;
 	padding: 0; /* avoid shift on :active */
diff --git a/chrome/content/zotero-platform/win/overlay.css b/chrome/content/zotero-platform/win/overlay.css
index a292230a4a..d27d45ec78 100644
--- a/chrome/content/zotero-platform/win/overlay.css
+++ b/chrome/content/zotero-platform/win/overlay.css
@@ -10,15 +10,25 @@
  * Nav bar
  */
 toolbar[id="nav-bar"] #zotero-toolbar-main-button .toolbarbutton-icon {
+	width: 30px; /* 16 + 1 + 1 + 6 + 6 */
 	padding-left: 6px !important;
 	padding-right: 6px !important;
 }
 
 toolbar[id="nav-bar"] #zotero-toolbar-save-button .toolbarbutton-icon {
+	width: 29px; /* 16 + 6 + 6 + 1 */
 	padding-left: 6px !important;
 	padding-right: 6px !important;
 }
 
+toolbar[id="nav-bar"] #zotero-toolbar-main-button-single .toolbarbutton-icon {
+	width: 32px;
+}
+
+toolbar[id="nav-bar"] #zotero-toolbar-save-button-single .toolbarbutton-icon {
+	width: 31px; /* Compensate for border on only one side */
+}
+
 toolbar[id="nav-bar"] #zotero-toolbar-buttons #zotero-toolbar-save-button > .toolbarbutton-menubutton-dropmarker .dropmarker-icon {
 	padding-left: 4px;
 	padding-right: 4px;