--- a/toolkit/components/apppicker/content/appPicker.js
+++ b/toolkit/components/apppicker/content/appPicker.js
@@ -72,23 +72,28 @@ AppPicker.prototype =
           var file = fileList.queryElementAt(idx, nsILocalHandlerApp);
           try {
               if (!file.executable || !file.executable.isFile())
                 continue;
           } catch (err) {
             continue;
           }
 
-          var item = document.createElement("listitem");
-          item.className = "listitem-iconic";
+          var item = document.createElement("richlistitem");
           item.handlerApp = file;
-          item.setAttribute("label", this.getFileDisplayName(file.executable));
-          item.setAttribute("image", this.getFileIconURL(file.executable));
           list.appendChild(item);
 
+          var image = document.createElement("image");
+          image.setAttribute("src", this.getFileIconURL(file.executable));
+          item.appendChild(image);
+
+          var label = document.createElement("label");
+          label.setAttribute("value", this.getFileDisplayName(file.executable));
+          item.appendChild(label);
+
           primaryCount++;
         }
 
         if ( primaryCount == 0 ) {
           // display a message saying nothing is configured
           document.getElementById("app-picker-notfound").removeAttribute("hidden");
         }
     },

--- a/toolkit/components/apppicker/content/appPicker.xul
+++ b/toolkit/components/apppicker/content/appPicker.xul
@@ -28,13 +28,13 @@
       <vbox flex="1">
         <label id="content-description" crop="center" value=""/>
         <label id="suggested-filename" crop="center" value=""/>
       </vbox>
     </hbox>
 
     <label id="sendto-message" value="&SendMsg.label;" control="app-picker-listbox"/>
 
-    <listbox id="app-picker-listbox" rows="5"
-             ondblclick="g_dialog.appDoubleClick();"/>
+    <richlistbox id="app-picker-listbox"
+                 ondblclick="g_dialog.appDoubleClick();"/>
 
     <label id="app-picker-notfound" value="&NoAppFound.label;" hidden="true"/>
   </dialog>

--- a/toolkit/themes/shared/appPicker.css
+++ b/toolkit/themes/shared/appPicker.css
@@ -6,18 +6,28 @@
 #app-picker {
   width: 320px;
 }
 
 #content-description {
   font-weight: bold;
 }
 
+#app-picker-listbox {
+  height: 212px;
+}
+
+#app-picker-listbox > richlistitem {
+  -moz-box-align: center;
+}
+
 #content-icon,
-.listcell-icon {
+#app-picker-listbox > richlistitem > image {
   margin: 5px;
   width: 32px;
   height: 32px;
 }
 
-.listcell-label {
+#app-picker-listbox > richlistitem > label {
+  margin: 0px;
   padding: 5px;
+  white-space: nowrap;
 }