diff --git a/mozilla/browser/base/content/browser.xul b/mozilla/browser/base/content/browser.xul
index 406f30a4d82..f6e162cfb77 100644
--- a/mozilla/browser/base/content/browser.xul
+++ b/mozilla/browser/base/content/browser.xul
@@ -224,6 +224,7 @@
                      completeselectedindex="true"
                      tabscrolling="true"
                      showcommentcolumn="true"
+                     showimagecolumn="true" 
                      enablehistory="true"
                      maxrows="10"
                      newlines="stripsurroundingwhitespace"
diff --git a/mozilla/browser/themes/pinstripe/browser/browser.css b/mozilla/browser/themes/pinstripe/browser/browser.css
index 9de75f6ea15..bd910452cc2 100755
--- a/mozilla/browser/themes/pinstripe/browser/browser.css
+++ b/mozilla/browser/themes/pinstripe/browser/browser.css
@@ -977,6 +977,23 @@ statusbarpanel#statusbar-display {
   height: 16px;
 }
 
+#treecolAutoCompleteImage {
+ max-width : 36px; 
+ padding-end: 18px;
+}
+
+.autocomplete-treebody::-moz-tree-image(favicon, treecolAutoCompleteImage) {
+  list-style-image: url("chrome://browser/skin/places/starPage.png");
+  width: 16px;
+  height: 16px;
+}
+
+.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
+  list-style-image: url("chrome://browser/skin/places/pageStarred.png");
+  width: 16px;
+  height: 16px;
+}
+
 .autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
   color: #555566;
 }
diff --git a/mozilla/browser/themes/winstripe/browser/browser.css b/mozilla/browser/themes/winstripe/browser/browser.css
index db53a667fbe..129ab342aeb 100644
--- a/mozilla/browser/themes/winstripe/browser/browser.css
+++ b/mozilla/browser/themes/winstripe/browser/browser.css
@@ -970,6 +970,23 @@ statusbarpanel#statusbar-display {
   height: 16px;
 }
 
+#treecolAutoCompleteImage {
+ max-width : 36px; 
+ padding-end: 18px;
+}
+
+.autocomplete-treebody::-moz-tree-image(favicon, treecolAutoCompleteImage) {
+  list-style-image: url("chrome://browser/skin/places/starPage.png");
+  width: 16px;
+  height: 16px;
+}
+
+.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
+  list-style-image: url("chrome://browser/skin/places/pageStarred.png");
+  width: 16px;
+  height: 16px;
+}
+
 .autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
   color: #555566;
 }
diff --git a/mozilla/toolkit/components/autocomplete/public/nsIAutoCompleteInput.idl b/mozilla/toolkit/components/autocomplete/public/nsIAutoCompleteInput.idl
index c365233f51f..97ba504b63c 100644
--- a/mozilla/toolkit/components/autocomplete/public/nsIAutoCompleteInput.idl
+++ b/mozilla/toolkit/components/autocomplete/public/nsIAutoCompleteInput.idl
@@ -40,7 +40,7 @@
 
 interface nsIAutoCompletePopup;
 
-[scriptable, uuid(AC029254-06DD-4dff-878C-A292117DE2D3)]
+[scriptable, uuid(8a5918dc-89ba-4bd0-934c-90e9c21568b8)]
 interface nsIAutoCompleteInput : nsISupports
 {  
   /*
@@ -96,7 +96,13 @@ interface nsIAutoCompleteInput : nsISupports
    * Option to show a second column in the popup which contains
    * the comment for each autocomplete result
    */
-  attribute unsigned long showCommentColumn;
+  attribute boolean showCommentColumn;
+
+  /*
+   * Option to show a third column in the popup which contains
+   * an additional image for each autocomplete result
+   */
+  attribute boolean showImageColumn;
 
   /* 
    * Number of milliseconds after a keystroke before a search begins
diff --git a/mozilla/toolkit/components/satchel/src/nsFormFillController.cpp b/mozilla/toolkit/components/satchel/src/nsFormFillController.cpp
index 7280d9fc5fe..b362701d23b 100644
--- a/mozilla/toolkit/components/satchel/src/nsFormFillController.cpp
+++ b/mozilla/toolkit/components/satchel/src/nsFormFillController.cpp
@@ -339,13 +339,26 @@ nsFormFillController::SetMaxRows(PRUint32 aMaxRows)
 }
 
 NS_IMETHODIMP
-nsFormFillController::GetShowCommentColumn(PRUint32 *aShowCommentColumn)
+nsFormFillController::GetShowImageColumn(PRBool *aShowImageColumn)
+{
+  *aShowImageColumn = PR_FALSE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsFormFillController::SetShowImageColumn(PRBool aShowImageColumn)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+NS_IMETHODIMP
+nsFormFillController::GetShowCommentColumn(PRBool *aShowCommentColumn)
 {
   *aShowCommentColumn = PR_FALSE;
   return NS_OK;
 }
 
-NS_IMETHODIMP nsFormFillController::SetShowCommentColumn(PRUint32 aShowCommentColumn)
+NS_IMETHODIMP nsFormFillController::SetShowCommentColumn(PRBool aShowCommentColumn)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
diff --git a/mozilla/toolkit/content/widgets/autocomplete.xml b/mozilla/toolkit/content/widgets/autocomplete.xml
index aa808911ffe..1792a050a4e 100644
--- a/mozilla/toolkit/content/widgets/autocomplete.xml
+++ b/mozilla/toolkit/content/widgets/autocomplete.xml
@@ -151,6 +151,10 @@
                 onset="this.setAttribute('showcommentcolumn', val); return val;"
                 onget="return this.getAttribute('showcommentcolumn') == 'true';"/>
 
+      <property name="showImageColumn"
+                onset="this.setAttribute('showimagecolumn', val); return val;"
+                onget="return this.getAttribute('showimagecolumn') == 'true';"/>
+
       <property name="timeout"
                 onset="this.setAttribute('timeout', val); return val;"
                 onget="return parseInt(this.getAttribute('timeout')) || 50;"/>
@@ -533,7 +537,8 @@
       <field name="mInput">null</field>
       <field name="mPopupOpen">false</field>
       <field name="mShowCommentCol">false</field>
-      
+      <field name="mShowImageCol">false</field>
+
       <constructor><![CDATA[
         this.setAttribute("ignorekeys", "true");
       ]]></constructor>
@@ -576,7 +581,8 @@
             this.invalidate();
             
             this.showCommentColumn = this.mInput.showCommentColumn;
-            
+            this.showImageColumn = this.mInput.showImageColumn;
+
             this.setAttribute("width", aWidth < 100 ? 100 : aWidth);
 
             document.popupNode = null;
@@ -674,7 +680,7 @@
                 onget="return this.mShowCommentColumn;">
         <setter><![CDATA[
           if (!val && this.mShowCommentColumn) {
-            // reset the flex on the value column and add the comment column
+            // reset the flex on the value column and remove the comment column
             document.getElementById("treecolAutoCompleteValue").setAttribute("flex", 1);
             this.removeColumn("treecolAutoCompleteComment");
           } else if (val && !this.mShowCommentColumn) {
@@ -687,6 +693,23 @@
         ]]></setter>
       </property>
 
+      <property name="showImageColumn"
+                onget="return this.mShowImageColumn;">
+        <setter>
+          <![CDATA[
+          if (!val && this.mShowImageColumn) {
+            // remove the image column
+            this.removeColumn("treecolAutoCompleteImage");
+          } else if (val && !this.mShowImageColumn) {
+            // add the image column
+            this.addColumn({id: "treecolAutoCompleteImage", flex: 1});
+          }
+          this.mShowImageColumn = val;
+          return val;
+        ]]>
+        </setter>
+      </property>
+
       <method name="addColumn">
         <parameter name="aAttrs"/>
         <body><![CDATA[