diff --git a/camino/BrowserWindow.nib/objects.nib b/camino/BrowserWindow.nib/objects.nib
index 84342d90f12d..4522c739ffc7 100644
Binary files a/camino/BrowserWindow.nib/objects.nib and b/camino/BrowserWindow.nib/objects.nib differ
diff --git a/camino/CHBookmarksButton.mm b/camino/CHBookmarksButton.mm
index 79ab4bc09348..1f3dfb304cf7 100644
--- a/camino/CHBookmarksButton.mm
+++ b/camino/CHBookmarksButton.mm
@@ -112,6 +112,10 @@
     [self setImage: [NSImage imageNamed: @"smallbookmark"]];
     [self setAction: @selector(openBookmark:)];
     [self setTarget: self];
+    nsAutoString href;
+    mElement->GetAttribute(NS_LITERAL_STRING("href"), href);
+    NSString* helpText = [NSString stringWithCharacters: href.get() length: nsCRT::strlen(href.get())];
+    [self setToolTip: helpText];
   }
   
   nsAutoString name;
diff --git a/camino/English.lproj/BrowserWindow.nib/objects.nib b/camino/English.lproj/BrowserWindow.nib/objects.nib
index 84342d90f12d..4522c739ffc7 100644
Binary files a/camino/English.lproj/BrowserWindow.nib/objects.nib and b/camino/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
index 84342d90f12d..4522c739ffc7 100644
Binary files a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib and b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/camino/src/bookmarks/BookmarksButton.mm b/camino/src/bookmarks/BookmarksButton.mm
index 79ab4bc09348..1f3dfb304cf7 100644
--- a/camino/src/bookmarks/BookmarksButton.mm
+++ b/camino/src/bookmarks/BookmarksButton.mm
@@ -112,6 +112,10 @@
     [self setImage: [NSImage imageNamed: @"smallbookmark"]];
     [self setAction: @selector(openBookmark:)];
     [self setTarget: self];
+    nsAutoString href;
+    mElement->GetAttribute(NS_LITERAL_STRING("href"), href);
+    NSString* helpText = [NSString stringWithCharacters: href.get() length: nsCRT::strlen(href.get())];
+    [self setToolTip: helpText];
   }
   
   nsAutoString name;
diff --git a/chimera/BrowserWindow.nib/objects.nib b/chimera/BrowserWindow.nib/objects.nib
index 84342d90f12d..4522c739ffc7 100644
Binary files a/chimera/BrowserWindow.nib/objects.nib and b/chimera/BrowserWindow.nib/objects.nib differ
diff --git a/chimera/CHBookmarksButton.mm b/chimera/CHBookmarksButton.mm
index 79ab4bc09348..1f3dfb304cf7 100644
--- a/chimera/CHBookmarksButton.mm
+++ b/chimera/CHBookmarksButton.mm
@@ -112,6 +112,10 @@
     [self setImage: [NSImage imageNamed: @"smallbookmark"]];
     [self setAction: @selector(openBookmark:)];
     [self setTarget: self];
+    nsAutoString href;
+    mElement->GetAttribute(NS_LITERAL_STRING("href"), href);
+    NSString* helpText = [NSString stringWithCharacters: href.get() length: nsCRT::strlen(href.get())];
+    [self setToolTip: helpText];
   }
   
   nsAutoString name;
diff --git a/chimera/English.lproj/BrowserWindow.nib/objects.nib b/chimera/English.lproj/BrowserWindow.nib/objects.nib
index 84342d90f12d..4522c739ffc7 100644
Binary files a/chimera/English.lproj/BrowserWindow.nib/objects.nib and b/chimera/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
index 84342d90f12d..4522c739ffc7 100644
Binary files a/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib and b/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/chimera/src/bookmarks/BookmarksButton.mm b/chimera/src/bookmarks/BookmarksButton.mm
index 79ab4bc09348..1f3dfb304cf7 100644
--- a/chimera/src/bookmarks/BookmarksButton.mm
+++ b/chimera/src/bookmarks/BookmarksButton.mm
@@ -112,6 +112,10 @@
     [self setImage: [NSImage imageNamed: @"smallbookmark"]];
     [self setAction: @selector(openBookmark:)];
     [self setTarget: self];
+    nsAutoString href;
+    mElement->GetAttribute(NS_LITERAL_STRING("href"), href);
+    NSString* helpText = [NSString stringWithCharacters: href.get() length: nsCRT::strlen(href.get())];
+    [self setToolTip: helpText];
   }
   
   nsAutoString name;