diff --git a/res/layout-finger/edit_contact.xml b/res/layout-finger/edit_contact.xml
index 027af9a..a33d447 100644
--- a/res/layout-finger/edit_contact.xml
+++ b/res/layout-finger/edit_contact.xml
@@ -29,33 +29,29 @@
 
         <LinearLayout android:id="@+id/banner"
             android:layout_width="fill_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:background="@android:drawable/bottom_bar"
             android:padding="0dip"
             android:gravity="center_vertical"
             android:baselineAligned="false"
         >
 
             <FrameLayout
-                android:layout_width="58dip"
-                android:layout_height="58dip"
-                android:layout_marginLeft="6dip"
-                android:layout_marginRight="10dip"
+                android:layout_width="84dip"
+                android:layout_height="84dip"
+                android:layout_marginTop="4dip"
+                android:layout_marginLeft="3dip"
+                android:layout_marginBottom="3dip"
+                android:layout_marginRight="2dip"
             >
-                <ImageButton android:id="@+id/photoButton"
-                    android:layout_width="fill_parent"
-                    android:layout_height="fill_parent"
-                    android:src="@drawable/ic_menu_add_picture"
-                    android:gravity="center"
-                />
-
                 <ImageView android:id="@+id/photoImage"
                     style="?android:attr/imageWellStyle"
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:clickable="true"
                     android:focusable="true"
+                    android:src="@drawable/ic_menu_add_picture"
+                    android:scaleType="center"
                     android:background="@drawable/border"
                 />
             </FrameLayout>
@@ -104,6 +100,8 @@
             <RelativeLayout
                 android:layout_width="fill_parent"
                 android:layout_height="?android:attr/listPreferredItemHeight"
+                android:layout_marginLeft="8dip"
+                android:layout_marginRight="6dip"
             >
 
                 <TextView
@@ -111,7 +109,6 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_alignParentLeft="true"
-                    android:layout_marginLeft="4dip"
                     android:text="@string/send_to_voicemail_checkbox"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                 />
@@ -121,7 +118,6 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:layout_alignParentRight="true"
-                    android:nextFocusDown="@+id/saveButton"
                 />
 
             </RelativeLayout>
@@ -132,44 +128,77 @@
                 android:background="?android:attr/listDivider"
             />
 
-            <!-- The add more button -->
-            <Button android:id="@+id/addMore"
+            <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:background="@android:drawable/dark_header"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textStyle="bold"
+                android:textSize="14sp"
+                android:text="@string/listSeparatorMore_edit"
+                android:paddingLeft="8dip"
+            />
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider"
+            />
+
+            <LinearLayout
                 android:layout_width="fill_parent"
                 android:layout_height="?android:attr/listPreferredItemHeight"
-                android:layout_marginTop="3dip"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="@string/menu_addItem"
-                android:gravity="left|center_vertical"
-                android:drawableLeft="@android:drawable/ic_input_add"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:baselineAligned="false"
+            >
+
+                <!-- The add more button -->
+                <Button android:id="@+id/addMore"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:text="@string/add_more_items"
+                    android:gravity="left|center_vertical"
+                    android:background="@android:drawable/btn_dropdown"
+                />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="32dip"
             />
 
         </LinearLayout>
 
-        <RelativeLayout
+        <LinearLayout
+            android:orientation="horizontal"
             android:layout_width="fill_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:layout_marginTop="1dip"
+            android:layout_height="wrap_content"
+            android:paddingTop="5dip"
+            android:paddingLeft="4dip"
+            android:paddingRight="4dip"
+            android:paddingBottom="1dip"   
             android:background="@android:drawable/bottom_bar"
         >
+
             <Button android:id="@+id/saveButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_alignParentLeft="true"
-                android:text="@string/button_save"
-                android:minWidth="120dip"
-                android:minHeight="48dip"
+                android:layout_width="0dip"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:text="@string/menu_done"
             />
 
             <Button android:id="@+id/discardButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_alignParentRight="true"
-                android:text="@string/button_discard"
-                android:minWidth="120dip"
-                android:minHeight="48dip"
+                android:layout_width="0dip"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:text="@string/menu_doNotSave"
             />
-        </RelativeLayout>
+
+        </LinearLayout>
+                
     </LinearLayout>
 </ScrollView>
diff --git a/res/layout-finger/edit_contact_entry.xml b/res/layout-finger/edit_contact_entry.xml
index eb01782..8512dd4 100644
--- a/res/layout-finger/edit_contact_entry.xml
+++ b/res/layout-finger/edit_contact_entry.xml
@@ -38,7 +38,7 @@
             android:layout_width="0dip"
             android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dip"
+            android:layout_marginLeft="4dip"
         />
 
         <ImageButton android:id="@+id/delete"
@@ -51,6 +51,6 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="1dip"
-        android:background="@android:drawable/divider_horizontal_dark"
+        android:background="?android:attr/listDivider"
     />
 </LinearLayout>
diff --git a/res/layout-finger/edit_contact_entry_org.xml b/res/layout-finger/edit_contact_entry_org.xml
index f29696b..a2f5863 100644
--- a/res/layout-finger/edit_contact_entry_org.xml
+++ b/res/layout-finger/edit_contact_entry_org.xml
@@ -50,7 +50,7 @@
                     android:layout_width="0dip"
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dip"
+                    android:layout_marginLeft="4dip"
                 />
 
                 <ImageButton android:id="@+id/delete"
@@ -72,7 +72,7 @@
                     android:layout_width="0dip"
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dip"
+                    android:layout_marginLeft="4dip"
                 />
 
                 <ImageButton android:id="@+id/delete2"
@@ -87,6 +87,6 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="1dip"
-        android:background="@android:drawable/divider_horizontal_dark"
+        android:background="?android:attr/listDivider"
     />
 </LinearLayout>
diff --git a/res/layout-finger/edit_contact_entry_ringtone.xml b/res/layout-finger/edit_contact_entry_ringtone.xml
index e566e31..b1665d7 100644
--- a/res/layout-finger/edit_contact_entry_ringtone.xml
+++ b/res/layout-finger/edit_contact_entry_ringtone.xml
@@ -23,37 +23,36 @@
 
     <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="?android:attr/listPreferredItemHeight"
-        android:layout_marginTop="2dip"
+        android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:baselineAligned="false"
         android:gravity="center_vertical"
     >
 
+        <!-- We still provide a label for our parent, but we keep it hidden -->
         <TextView android:id="@+id/label"
-            android:layout_width="102dip"
-            android:layout_height="fill_parent"
-            android:paddingLeft="4dip"
-            android:gravity="left|center_vertical"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="0dip"
+            android:layout_height="0dip"
+            android:visibility="gone"
         />
 
         <Button android:id="@+id/data"
-            android:layout_width="0dip"
-            android:layout_weight="1"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLargeInverse"
+            android:textAppearance="?android:attr/textAppearanceMediumInverse"
             android:baselineAligned="false"
             android:background="@android:drawable/btn_dropdown"
-            android:gravity="center_vertical"
+            android:gravity="left|center_vertical"
             android:maxLines="1"
+            android:layout_marginTop="6dip"
+            android:layout_marginBottom="6dip"
         />
-        
+
     </LinearLayout>
 
     <View
         android:layout_width="fill_parent"
         android:layout_height="1dip"
-        android:background="@android:drawable/divider_horizontal_dark"
+        android:background="?android:attr/listDivider"
     />
 </LinearLayout>
diff --git a/res/layout-finger/edit_contact_entry_static_label.xml b/res/layout-finger/edit_contact_entry_static_label.xml
index 830872a..12c8148 100644
--- a/res/layout-finger/edit_contact_entry_static_label.xml
+++ b/res/layout-finger/edit_contact_entry_static_label.xml
@@ -54,6 +54,6 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="1dip"
-        android:background="@android:drawable/divider_horizontal_dark"
+        android:background="?android:attr/listDivider"
     />
 </LinearLayout>
diff --git a/res/layout-finger/edit_separator.xml b/res/layout-finger/edit_separator.xml
index 57bb53a..82fc12e 100644
--- a/res/layout-finger/edit_separator.xml
+++ b/res/layout-finger/edit_separator.xml
@@ -26,7 +26,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:background="@drawable/dark_header_dithered"
+        android:background="@android:drawable/dark_header"
         android:textColor="?android:attr/textColorSecondary"
         android:textStyle="bold"
         android:textSize="14sp"
diff --git a/res/layout-finger/list_separator.xml b/res/layout-finger/list_separator.xml
index e6f75ab..5d93d36 100644
--- a/res/layout-finger/list_separator.xml
+++ b/res/layout-finger/list_separator.xml
@@ -19,7 +19,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:background="@drawable/dark_header_dithered"
+    android:background="@android:drawable/dark_header"
     android:textColor="?android:attr/textColorSecondary"
     android:textStyle="bold"
     android:textSize="14sp"
diff --git a/res/layout-finger/view_contact.xml b/res/layout-finger/view_contact.xml
index e02e143..d52b447 100644
--- a/res/layout-finger/view_contact.xml
+++ b/res/layout-finger/view_contact.xml
@@ -24,7 +24,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:background="@android:drawable/title_bar"
+        android:background="@android:drawable/title_bar_tall"
         android:padding="0dip"
         android:gravity="center_vertical"
     >
diff --git a/res/layout-finger/view_contact_name.xml b/res/layout-finger/view_contact_name.xml
index 01a361b..126c69b 100644
--- a/res/layout-finger/view_contact_name.xml
+++ b/res/layout-finger/view_contact_name.xml
@@ -23,4 +23,6 @@
     android:textAppearance="?android:attr/textAppearanceLarge"
     android:shadowColor="#BB000000"
     android:shadowRadius="2.75"
+    android:maxLines="2"
+    android:ellipsize="end"
     />