Bug 513392: Use styles on the normal icon rather than a separate hardcoded image for plugin icons. r=robstrong

toolkit/mozapps/extensions/content/extensions.css

@@ -192,11 +192,6 @@ richlistitem[type="4"] .disableHide {
   display: none;
 }
 
-richlistitem:not([plugin]) .pluginIcon ,
-richlistitem[plugin] .addonIcon:not(.pluginIcon) {
-  display: none;
-}
-
 richlistitem[action] .addonInstallButton {
   display: none;
 }

toolkit/mozapps/extensions/content/extensions.xml

@@ -713,9 +713,6 @@
         <xul:vbox pack="center" align="center" class="addonIcon">
           <xul:image xbl:inherits="src=iconURL"/>
         </xul:vbox>
-        <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"/>
         </xul:vbox>

toolkit/themes/gnomestripe/mozapps/extensions/extensions.css

@@ -138,6 +138,10 @@ richlistitem[selected="true"] .text-link {
   max-height: 32px;
 }
 
+richlistitem[plugin] .addonIcon > image {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}
+
 .updateBadge,
 .notifyBadge {
   width: 16px;

toolkit/themes/pinstripe/mozapps/extensions/extensions.css

@@ -130,6 +130,10 @@ richlistitem:not([selected="true"]) .addon-description {
   max-height: 32px;
 }
 
+richlistitem[plugin] .addonIcon > image {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}
+
 .updateBadge,
 .notifyBadge {
   width: 16px;

toolkit/themes/winstripe/mozapps/extensions/extensions.css

@@ -128,6 +128,10 @@ richlistitem[selected="true"] .text-link {
   max-height: 32px;
 }
 
+richlistitem[plugin] .addonIcon > image {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}
+
 .updateBadge,
 .notifyBadge {
   width: 16px;