diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 04ab0624497..cef3665c541 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -5467,8 +5467,10 @@ function updatePageLivemarks()
   var livemarkLinks = gBrowser.mCurrentBrowser.livemarkLinks;
   if (!livemarkLinks || livemarkLinks.length == 0) {
     gLivemarksButton.removeAttribute("livemarks");
+    gLivemarksButton.setAttribute("tooltiptext", gNavigatorBundle.getString("livemarkNoLivemarksTooltip"));
   } else {
     gLivemarksButton.setAttribute("livemarks", "true");
+    gLivemarksButton.setAttribute("tooltiptext", gNavigatorBundle.getString("livemarkHasLivemarksTooltip"));
   }
 }
 
@@ -5476,7 +5478,7 @@ function livemarkFillPopup(menuPopup)
 {
   var livemarkLinks = gBrowser.mCurrentBrowser.livemarkLinks;
   if (livemarkLinks == null) {
-    return;
+    return false;
   }
 
   while (menuPopup.firstChild) {
@@ -5492,6 +5494,8 @@ function livemarkFillPopup(menuPopup)
     menuItem.setAttribute("tooltiptext", markinfo.href);
     menuPopup.appendChild(menuItem);
   }
+
+  return true;
 }
 
 function livemarkAddMark(wincontent, data) {
diff --git a/mozilla/browser/base/content/browser.xul b/mozilla/browser/base/content/browser.xul
index a6c8f8c368f..e8b9c68d6d8 100644
--- a/mozilla/browser/base/content/browser.xul
+++ b/mozilla/browser/base/content/browser.xul
@@ -456,8 +456,8 @@
         <menuseparator/>
       </menupopup>
     </statusbarpanel>
-    <statusbarpanel id="livemark-button" type="menu" class="statusbarpanel-menu-iconic" tooltiptext="&livemarkIcon.tooltip;">
-      <menupopup onpopupshowing="livemarkFillPopup(this);"
+    <statusbarpanel id="livemark-button" type="menu" class="statusbarpanel-menu-iconic">
+      <menupopup onpopupshowing="return livemarkFillPopup(this);"
                  oncommand="livemarkAddMark(window._content, event.target.getAttribute('data'));" />
     </statusbarpanel>
     <statusbarpanel id="statusbar-updates"/>
diff --git a/mozilla/browser/locales/en-US/chrome/browser/browser.dtd b/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
index ebdda7ca977..82ee4f75d54 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
@@ -329,7 +329,6 @@
 
 <!ENTITY pageThemeIcon.tooltip            "Switch to an alternate stylesheet">
 <!ENTITY pageReportIcon.tooltip            "Change popup blocking settings for this website">
-<!ENTITY livemarkIcon.tooltip             "Create Livemark for this page">
 
 <!ENTITY find.label "Find:">
 <!ENTITY findNext.label "Find Next">
diff --git a/mozilla/browser/locales/en-US/chrome/browser/browser.properties b/mozilla/browser/locales/en-US/chrome/browser/browser.properties
index 94e1a6afafb..b37cf767cce 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/browser.properties
+++ b/mozilla/browser/locales/en-US/chrome/browser/browser.properties
@@ -73,3 +73,7 @@ popupBlock=Block popups for %S
 popupWarningDontShowFromMessage=Don't show this message when popups are blocked
 popupWarningDontShowFromStatusbar=Don't show info message when popups are blocked
 popupShowPopupPrefix=Show '%S'
+
+livemarkHasLivemarksTooltip=Add Livemark for this page's feed
+livemarkNoLivemarksTooltip=Page has no feeds for Livemark
+