diff --git a/mozilla/browser/base/content/browser.xul b/mozilla/browser/base/content/browser.xul
index d6042ef9229..2b29582fc47 100644
--- a/mozilla/browser/base/content/browser.xul
+++ b/mozilla/browser/base/content/browser.xul
@@ -233,8 +233,8 @@
   <tooltip id="btTooltip" noautohide="true"
            onpopupshowing="return BookmarksEventHandler.fillInBTTooltip(document.tooltipNode)">
     <vbox id="btTooltipTextBox" flex="1">
-      <label id="btTitleText" />
-      <label id="btUrlText" />
+      <label id="btTitleText" class="tooltip-label" />
+      <label id="btUrlText" class="tooltip-label" />
     </vbox>
   </tooltip>
 
diff --git a/mozilla/toolkit/themes/gnomestripe/global/popup.css b/mozilla/toolkit/themes/gnomestripe/global/popup.css
index 46d78eeb546..00033d533ba 100644
--- a/mozilla/toolkit/themes/gnomestripe/global/popup.css
+++ b/mozilla/toolkit/themes/gnomestripe/global/popup.css
@@ -56,7 +56,8 @@ panel {
 tooltip {
   -moz-appearance: tooltip;
   margin-top: 21px;
-  padding: 2px 3px;
+  /* GTK hardcodes this to 4px */
+  padding: 4px;
   max-width: 40em;
   color: InfoText;
   font: message-box;