Bug 631812 - URLBar broken on certain themes; r=gavin a=blocking-final+

browser/base/content/urlbarBindings.xml

@@ -52,12 +52,12 @@
   <binding id="urlbar" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete">
 
     <content sizetopopup="pref">
-      <children includes="image|deck|stack|box">
-        <xul:image class="autocomplete-icon" allowevents="true"/>
-      </children>
       <xul:hbox anonid="textbox-container"
                 class="autocomplete-textbox-container urlbar-textbox-container"
                 flex="1" xbl:inherits="focused">
+        <children includes="image|deck|stack|box">
+          <xul:image class="autocomplete-icon" allowevents="true"/>
+        </children>
         <xul:hbox anonid="textbox-input-box"
                   class="textbox-input-box urlbar-input-box"
                   flex="1" xbl:inherits="tooltiptext=inputtooltiptext">

browser/themes/gnomestripe/browser/browser.css

@@ -908,6 +908,7 @@ toolbar[iconsize="small"] #feed-button {
 
 .urlbar-textbox-container {
   -moz-appearance: none;
+  -moz-box-align: stretch;
 }
 
 .urlbar-history-dropmarker {

browser/themes/winstripe/browser/browser.css

@@ -1105,6 +1105,10 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   -moz-box-align: stretch;
 }
 
+.urlbar-textbox-container {
+  -moz-box-align: stretch;
+}
+
 #urlbar-icons {
   height: 18px;
   -moz-box-align: center;