Bug 925712 - Back and forward buttons are shorter than other toolbar buttons. r=mdeboer

browser/base/content/browser.xul

@@ -559,7 +559,7 @@
              context="toolbar-context-menu">
 
       <hbox id="nav-bar-customizationtarget" class="customization-target" flex="501">
-        <toolbaritem id="urlbar-container" align="center" flex="400" persist="width"
+        <toolbaritem id="urlbar-container" flex="400" persist="width"
                      forwarddisabled="true" title="&locationItem.title;" removable="false"
                      customizableui-areatype="toolbar"
                      class="chromeclass-location" overflows="false">
@@ -582,7 +582,7 @@
                                               this.parentNode.removeAttribute('forwarddisabled');">
             <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
           </dummyobservertarget>
-          <hbox id="urlbar-wrapper" flex="1">
+          <hbox id="urlbar-wrapper" flex="1" align="center">
             <textbox id="urlbar" flex="1"
                      placeholder="&urlbar.placeholder2;"
                      type="autocomplete"

browser/themes/osx/browser.css

@@ -1464,6 +1464,10 @@ toolbarbutton.bookmark-item > menupopup {
   box-shadow: @focusRingShadow@;
 }
 
+#urlbar-container {
+  -moz-box-align: center;
+}
+
 #urlbar {
   -moz-padding-end: 4px;
   border-radius: @toolbarbuttonCornerRadius@;

browser/themes/windows/browser.css

@@ -829,8 +829,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 }
 
 #urlbar-container {
-  -moz-box-orient: horizontal;
-  -moz-box-align: stretch;
+  -moz-box-align: center;
 }
 
 .urlbar-textbox-container {