Bug 422559: Toolbar alignment issues on Windows, patch by Kai Liu <kliu.bugzilla.3c9f@mail.kailiu.com>, r=beltzner/zeniko, ui-r=beltzner, a=beltzner

browser/themes/winstripe/browser/browser-aero.css

@@ -15,7 +15,7 @@
 /* ::::: Identity Indicator Styling ::::: */
 
 #urlbar[chromedir="ltr"] {
-  -moz-margin-start: 6px;
+  -moz-margin-start: 8px;
 }
 
 #identity-box[chromedir="ltr"] {

browser/themes/winstripe/browser/browser.css

@@ -62,6 +62,10 @@
   visibility: hidden;
 }
 
+#navigator-toolbox:-moz-system-metric(windows-default-theme) {
+  padding-bottom: 1px; /* uxtheme border drawing fix/hack */
+}
+
 #navigator-toolbox[inFullscreen="true"],
 #navigator-toolbox[inFullscreen="true"] > #nav-bar {
   border-top: none;
@@ -222,6 +226,15 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
   padding: 5px !important;
 }
 
+toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1:-moz-system-metric(windows-default-theme),
+.toolbarbutton-menubutton-button:-moz-system-metric(windows-default-theme) {
+  padding: 6px; /* uxtheme border drawing fix/hack */
+}
+
+toolbar[iconsize="large"][mode="icons"] .toolbarbutton-1[checked="true"]:-moz-system-metric(windows-default-theme) {
+  padding: 6px !important; /* uxtheme border drawing fix/hack */
+}
+
 /* ::::: unified back and forward buttons ::::: */
 
 /* unified back button with keyhole icons */
@@ -1298,6 +1311,7 @@ statusbarpanel#statusbar-display {
   border-top: 0px;
   border-bottom: 0px;
   padding-bottom: 1px;
+  -moz-margin-end: 1px;
 }
 
 toolbar[iconsize="small"] #navigator-throbber,
@@ -1765,7 +1779,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 /* Location bar visuals*/
 
 #urlbar[chromedir="ltr"] {
-  -moz-margin-start: 4px;
+  -moz-margin-start: 6px;
 }
 
 #urlbar > .autocomplete-textbox-container {
@@ -1968,3 +1982,23 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
   -moz-image-region: auto;
 }
+
+/* If the nav toolbar is tall enough and an input box is the last item, add
+   extra end spacing so that horizontal spacing matches vertical spacing. */
+#nav-bar[mode="full"]:not([currentset]),
+#nav-bar[mode="full"][currentset$=",urlbar-container"],
+#nav-bar[mode="full"][currentset$=",search-container"],
+#nav-bar[iconsize="large"][mode="icons"]:not([currentset]),
+#nav-bar[iconsize="large"][mode="icons"][currentset$=",urlbar-container"],
+#nav-bar[iconsize="large"][mode="icons"][currentset$=",search-container"] {
+  -moz-padding-end: 2px;
+}
+
+#nav-bar[mode="full"]:not([currentset]):-moz-system-metric(windows-default-theme),
+#nav-bar[mode="full"][currentset$=",urlbar-container"]:-moz-system-metric(windows-default-theme),
+#nav-bar[mode="full"][currentset$=",search-container"]:-moz-system-metric(windows-default-theme),
+#nav-bar[iconsize="large"][mode="icons"]:not([currentset]):-moz-system-metric(windows-default-theme),
+#nav-bar[iconsize="large"][mode="icons"][currentset$=",urlbar-container"]:-moz-system-metric(windows-default-theme),
+#nav-bar[iconsize="large"][mode="icons"][currentset$=",search-container"]:-moz-system-metric(windows-default-theme) {
+  -moz-padding-end: 3px;
+}