diff --git a/themes/modern/communicator/bookmarks/bookmarksToolbar.css b/themes/modern/communicator/bookmarks/bookmarksToolbar.css
index 758833ec426a..ddc7f4202e43 100644
--- a/themes/modern/communicator/bookmarks/bookmarksToolbar.css
+++ b/themes/modern/communicator/bookmarks/bookmarksToolbar.css
@@ -58,7 +58,7 @@ toolbarbutton.bookmark-item[disabled="true"]:hover:active
 {
   color               : #9399AB;
   text-decoration     : none;
-  list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-item-disabled.gif");
+  list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-item-dis.gif");
   cursor              : default;
 }
 
@@ -67,17 +67,17 @@ toolbarbutton.bookmark-item[disabled="true"][container="true"]:hover,
 toolbarbutton.bookmark-item[disabled="true"][container="true"]:hover:active
 {
   border              : 1px solid transparent !important;
-  list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-folder-disabled.gif");
+  list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-folder-dis.gif");
 }
 
 .menuitem-iconic.bookmark-item[disabled="true"]
 {
-  list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-item-disabled.gif");
+  list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-item-dis.gif");
 }
 
 .menu-iconic.bookmark-item[disabled="true"][container="true"]
 {
-  list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-folder-disabled.gif");
+  list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-folder-dis.gif");
 }
 
 .bookmark-item > .toolbarbutton-box > .toolbarbutton-dropmarker {
diff --git a/xpfe/browser/resources/content/linkToolbarItem.js b/xpfe/browser/resources/content/linkToolbarItem.js
index ebac3c8adbd6..186ebf1a5e48 100644
--- a/xpfe/browser/resources/content/linkToolbarItem.js
+++ b/xpfe/browser/resources/content/linkToolbarItem.js
@@ -258,8 +258,21 @@ function LinkToolbarTransientMenu (linkType) {
     if(!this.__proto__.displayLink.apply(this, [linkElement])) return false;
 
     this.getXULElement().removeAttribute("collapsed");
-    showMiscellaneousSeperator();
+    showMiscellaneousSeparator();
     return true;
   }
 }
+
+showMiscellaneousSeparator =
+function()
+{
+  document.getElementById("misc-separator").removeAttribute("collapsed");
+}
+
+hideMiscellaneousSeparator =
+function()
+{
+  document.getElementById("misc-separator").setAttribute("collapsed", "true");
+}
 LinkToolbarTransientMenu.prototype = new LinkToolbarMenu;
+
diff --git a/xpfe/browser/resources/content/linkToolbarOverlay.js b/xpfe/browser/resources/content/linkToolbarOverlay.js
index f08f3d567175..2bf9a20c6d0a 100644
--- a/xpfe/browser/resources/content/linkToolbarOverlay.js
+++ b/xpfe/browser/resources/content/linkToolbarOverlay.js
@@ -136,13 +136,16 @@ function()
   if (!linkToolbarUI.isLinkToolbarEnabled())
     return;
 
+  if (!linkToolbarHandler.hasItems)
+    return;
+
   linkToolbarUI.doClear();
 }
 
 LinkToolbarUI.prototype.doClear =
 function()
 {
-  this.hideMiscellaneousSeperator();
+  hideMiscellaneousSeparator();
   linkToolbarHandler.clearAllItems();
 }
 
@@ -185,17 +188,6 @@ function(checkedItem)
     this.doClear();
 }
 
-LinkToolbarUI.prototype.showMiscellaneousSeperator =
-function()
-{
-  document.getElementById("misc-seperator").removeAttribute("collapsed");
-}
-
-LinkToolbarUI.prototype.hideMiscellaneousSeperator =
-function()
-{
-  document.getElementById("misc-seperator").setAttribute("collapsed", "true");
-}
 LinkToolbarUI.prototype.initLinkbarVisibilityMenu = 
 function()
 {
diff --git a/xpfe/browser/resources/content/linkToolbarOverlay.xul b/xpfe/browser/resources/content/linkToolbarOverlay.xul
index 397bdc38056f..bc9d72fd3a3c 100644
--- a/xpfe/browser/resources/content/linkToolbarOverlay.xul
+++ b/xpfe/browser/resources/content/linkToolbarOverlay.xul
@@ -183,7 +183,7 @@
             <menupopup id="link-alternate-popup" />
           </menu>
 
-          <menuseparator collapsed="true" id="misc-seperator" />
+          <menuseparator collapsed="true" id="misc-separator" />
 
         </menupopup>
       </toolbarbutton>
diff --git a/xpfe/browser/resources/locale/en-US/linkToolbar.dtd b/xpfe/browser/resources/locale/en-US/linkToolbar.dtd
index 50e622137e1a..3e1e34740f6e 100644
--- a/xpfe/browser/resources/locale/en-US/linkToolbar.dtd
+++ b/xpfe/browser/resources/locale/en-US/linkToolbar.dtd
@@ -37,7 +37,7 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- Link Toolbar Title -->
-<!ENTITY linkToolbar.label "Link Toolbar">
+<!ENTITY linkToolbar.label "Site Navigation Bar">
 
 <!-- Link Toolbar visibility options -->
 <!ENTITY linkToolbarAlways.label "Show Always">