diff --git a/mozilla/camino/src/bookmarks/BookmarkButton.mm b/mozilla/camino/src/bookmarks/BookmarkButton.mm
index 5b2922be9fb..25fa160c512 100644
--- a/mozilla/camino/src/bookmarks/BookmarkButton.mm
+++ b/mozilla/camino/src/bookmarks/BookmarkButton.mm
@@ -61,6 +61,7 @@
 
 
 @implementation BookmarkButton
+
 - (id)initWithFrame:(NSRect)frame
 {
   if ( (self = [super initWithFrame:frame]) )
diff --git a/mozilla/camino/src/bookmarks/BookmarkToolbar.mm b/mozilla/camino/src/bookmarks/BookmarkToolbar.mm
index 89fbeb7ec6a..b316c7a508b 100644
--- a/mozilla/camino/src/bookmarks/BookmarkToolbar.mm
+++ b/mozilla/camino/src/bookmarks/BookmarkToolbar.mm
@@ -224,8 +224,9 @@ static const int kBMBarScanningStep = 5;
 #define kMinBookmarkButtonWidth          16.0
 #define kMaxBookmarkButtonWidth         150.0
 #define kBookmarkButtonHorizPadding       5.0
+#define kBookmarkToolbarTopPadding        2.0
 #define kBookmarkButtonVerticalPadding    1.0
-#define kBookmarkToolbarBottomPadding     1.0
+#define kBookmarkToolbarBottomPadding     2.0
 
 -(void)reflowButtonsStartingAtIndex: (int)aIndex
 {
@@ -236,7 +237,7 @@ static const int kBMBarScanningStep = 5;
   // to bottom right.
   float oldHeight = [self frame].size.height;
   int   count         = [mButtons count];
-  float curRowYOrigin = 0.0;
+  float curRowYOrigin = kBookmarkToolbarTopPadding;
   float curX          = kBookmarkButtonHorizPadding;
 
   for (int i = 0; i < count; i ++)
@@ -263,9 +264,11 @@ static const int kBMBarScanningStep = 5;
 
       if (NSMaxX(buttonRect) > NSWidth([self bounds]))
       {
+        // jump to the next line
+        curX = kBookmarkButtonHorizPadding;
         curRowYOrigin += (kBookmarkButtonHeight + 2 * kBookmarkButtonVerticalPadding);
-        buttonRect = NSMakeRect(kBookmarkButtonHorizPadding, curRowYOrigin + kBookmarkButtonVerticalPadding, width, kBookmarkButtonHeight);
-        curX = NSWidth(buttonRect);
+        buttonRect = NSMakeRect(curX, curRowYOrigin + kBookmarkButtonVerticalPadding, width, kBookmarkButtonHeight);
+        curX += NSWidth(buttonRect) + kBookmarkButtonHorizPadding;
       }
 
       [button setFrame: buttonRect];