Bug 414597: AMO-provided icons aren't always 32x32. r=robstring, a=schrep

toolkit/mozapps/extensions/content/extensions.xml

@@ -649,11 +649,11 @@
   <binding id="addon-icon">
     <content>
       <xul:stack class="addonIconStack">
-        <xul:vbox pack="start" align="start">
-          <xul:image class="addonIcon" xbl:inherits="src=iconURL"/>
+        <xul:vbox pack="center" align="center" class="addonIcon">
+          <xul:image xbl:inherits="src=iconURL"/>
         </xul:vbox>
-        <xul:vbox pack="start" align="start">
-          <xul:image class="addonIcon pluginIcon" src="chrome://mozapps/skin/plugins/pluginGeneric.png"/>
+        <xul:vbox pack="start" align="start" class="addonIcon pluginIcon">
+          <xul:image src="chrome://mozapps/skin/plugins/pluginGeneric.png"/>
         </xul:vbox>
         <xul:vbox pack="end" align="start">
           <xul:image class="notifyBadge"/>

toolkit/mozapps/xpinstall/content/xpinstallItem.xml

@@ -13,7 +13,7 @@
     </resources>
     <content>
       <xul:hbox flex="1">
-        <xul:vbox align="center" pack="center">
+        <xul:vbox align="center" pack="center" class="xpinstallIconContainer">
           <xul:image class="xpinstallItemIcon" xbl:inherits="src=icon"/>
         </xul:vbox>
         <xul:vbox flex="1" pack="center">

toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallConfirm.css

@@ -38,7 +38,7 @@ installitem {
   margin-bottom: 1em;
 }
 
-.xpinstallItemIcon {
+.xpinstallIconContainer {
   width: 32px;
   height: 32px;
   max-width: 32px !important;

toolkit/themes/winstripe/mozapps/xpinstall/xpinstallConfirm.css

@@ -42,7 +42,7 @@ installitem {
   margin-bottom: 1em;
 }
 
-.xpinstallItemIcon {
+.xpinstallIconContainer {
   width: 32px;
   height: 32px;
   max-width: 32px !important;