diff --git a/res/layout/bookmark_thumbnail.xml b/res/layout/bookmark_thumbnail.xml
index 61ac50a..d53350b 100644
--- a/res/layout/bookmark_thumbnail.xml
+++ b/res/layout/bookmark_thumbnail.xml
@@ -17,17 +17,14 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:orientation="vertical"
-    android:padding="4dip"
+    android:padding="0dip"
     >
 
-    <!-- Keep the width in sync with BrowserBookmarksPage and
-            BrowserActivity.updateScreenshot -->
     <ImageView android:id="@+id/thumb"
         android:src="@drawable/ic_launcher_shortcut_browser_bookmark"
         android:scaleType="center"
-        android:layout_width="100dip"
-        android:layout_height="80dip"
-        android:background="@drawable/bookmark_shadow"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
         />
 
     <!-- FIXME: Want to have a gradient over the thumb -->
@@ -37,7 +34,7 @@
         android:layout_height="fill_parent"
         android:layout_width="fill_parent"
         android:orientation="horizontal"
-        android:background="#cc000000"
+        android:background="#99000000"
         android:gravity="center"
         android:layout_alignBottom="@+id/thumb"
         android:layout_alignTop="@+id/thumb"
@@ -45,8 +42,6 @@
         <ImageView
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:layout_marginTop="3dip"
-            android:layout_marginBottom="3dip"
             android:src="@drawable/ic_tab_browser_bookmark_selected"
             />
         <TextView
@@ -60,17 +55,19 @@
     </LinearLayout>
 
     <TextView android:id="@+id/label"
-        android:layout_width="100dip"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textStyle="bold"
         android:textColor="@color/white"
         android:maxLines="1"
-        android:paddingTop="3dip"
-        android:paddingBottom="3dip"
         android:paddingLeft="2dip"
         android:paddingRight="2dip"
+        android:paddingTop="0dip"
+        android:paddingBottom="0dip"
+        android:layout_marginTop="0dip"
+        android:layout_marginBottom="16dip"
         android:scrollHorizontally="true"
         android:ellipsize="marquee"
         android:layout_below="@+id/thumb"