diff --git a/mozilla/suite/themes/classic/communicator/bookmarks/bookmarks.css b/mozilla/suite/themes/classic/communicator/bookmarks/bookmarks.css
index 6bdf61fd29a..b278d6544da 100644
--- a/mozilla/suite/themes/classic/communicator/bookmarks/bookmarks.css
+++ b/mozilla/suite/themes/classic/communicator/bookmarks/bookmarks.css
@@ -67,3 +67,16 @@ outlinerbody:-moz-outliner-image(Name) {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item-updated.gif") !important;
 }
 
+.bookmark-item > .toolbarbutton-box > .toolbarbutton-icon
+{
+  list-style-image: inherit;
+  width: 16px;
+  height: 16px;
+}
+
+.tree-cell-icon, .tree-cell-primary-icon {
+  list-style-image: inherit;
+  height: 16px;
+  max-width: 32px;   /* 32 pixel hack to get too-large favicons to show; fix when tree becomes outliner */
+  max-height: 16px;
+}
diff --git a/mozilla/suite/themes/modern/communicator/bookmarks/bookmarks.css b/mozilla/suite/themes/modern/communicator/bookmarks/bookmarks.css
index c250137cf7e..db7084da2be 100644
--- a/mozilla/suite/themes/modern/communicator/bookmarks/bookmarks.css
+++ b/mozilla/suite/themes/modern/communicator/bookmarks/bookmarks.css
@@ -53,3 +53,16 @@
   list-style-image: url("chrome://communicator/skin/icons/loading.gif") !important;
 }
 
+.bookmark-item > .toolbarbutton-box > .toolbarbutton-icon
+{
+  list-style-image: inherit;
+  width: 16px;
+  height: 16px;
+}
+
+.tree-cell-icon, .tree-cell-primary-icon {
+  list-style-image: inherit;
+  height: 16px;
+  max-width: 32px;   /* 32 pixel hack to get too-large favicons to show; fix when tree becomes outliner */
+  max-height: 16px;
+}
diff --git a/mozilla/suite/themes/modern/global/menu.css b/mozilla/suite/themes/modern/global/menu.css
index 1b273a3db20..86042464853 100644
--- a/mozilla/suite/themes/modern/global/menu.css
+++ b/mozilla/suite/themes/modern/global/menu.css
@@ -68,16 +68,17 @@ menuitem[menuactive="true"][disabled="true"] {
   padding-right: 14px;
 }
 
-.menu-iconic-left {
-  width: 16px;
-  list-style-image: inherit;
-}
-
 .menu-iconic-accel {
   margin-left: 4px;
   padding-right: 14px;
 }
 
+.menu-iconic-icon {
+  width: 16px;
+  height: 16px;
+  list-style-image: inherit;
+}
+
 /* ..... menu arrow box ..... */
 
 .menu-right {