diff --git a/res/layout-xlarge-land/contact_detail_list_item.xml b/res/layout-xlarge-land/contact_detail_list_item.xml
index 47af40a..9749f2a 100644
--- a/res/layout-xlarge-land/contact_detail_list_item.xml
+++ b/res/layout-xlarge-land/contact_detail_list_item.xml
@@ -97,14 +97,26 @@
                 android:layout_marginRight="14dip"
                 android:background="?android:attr/dividerVertical" />
 
-            <ImageView
-                android:id="@+id/secondary_action_button"
-                android:layout_width="32dip"
+            <FrameLayout
+                android:id="@+id/secondary_action_button_container"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_centerVertical="true"
-                android:gravity="center"
-                android:scaleType="center"
-                android:background="?android:attr/selectableItemBackground" />
+                android:layout_marginTop="10dip"
+                android:paddingLeft="@dimen/detail_item_icon_margin"
+                android:paddingRight="@dimen/detail_item_icon_margin"
+                android:duplicateParentState="false"
+                android:background="?android:attr/selectableItemBackground">
+
+                <ImageView
+                    android:id="@+id/secondary_action_button"
+                    android:layout_width="32dip"
+                    android:layout_height="match_parent"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:scaleType="center"
+                    android:duplicateParentState="false" />
+
+             </FrameLayout>
         </LinearLayout>
     </LinearLayout>
 
diff --git a/res/layout-xlarge/phonetic_name_editor_view.xml b/res/layout-xlarge/phonetic_name_editor_view.xml
index 0ce560e..be36915 100644
--- a/res/layout-xlarge/phonetic_name_editor_view.xml
+++ b/res/layout-xlarge/phonetic_name_editor_view.xml
@@ -53,8 +53,8 @@
             layout="@layout/edit_field_list" />
 
         <include
-            android:id="@+id/expansion_button_container"
-            layout="@layout/edit_expansion_button"
+            android:id="@+id/expansion_view_container"
+            layout="@layout/edit_expansion_view"
             android:visibility="gone" />
 
         <include
diff --git a/res/layout-xlarge/structured_name_editor_view.xml b/res/layout-xlarge/structured_name_editor_view.xml
index 048d1db..87f788a 100644
--- a/res/layout-xlarge/structured_name_editor_view.xml
+++ b/res/layout-xlarge/structured_name_editor_view.xml
@@ -52,8 +52,8 @@
             layout="@layout/edit_field_list" />
 
         <include
-            android:id="@+id/expansion_button_container"
-            layout="@layout/edit_expansion_button"
+            android:id="@+id/expansion_view_container"
+            layout="@layout/edit_expansion_view"
             android:visibility="gone" />
 
         <include
diff --git a/res/layout-xlarge/text_fields_editor_view.xml b/res/layout-xlarge/text_fields_editor_view.xml
index 927654b..5e77a97 100644
--- a/res/layout-xlarge/text_fields_editor_view.xml
+++ b/res/layout-xlarge/text_fields_editor_view.xml
@@ -48,8 +48,8 @@
             android:visibility="gone" />
 
         <include
-            android:id="@+id/expansion_button_container"
-            layout="@layout/edit_expansion_button"
+            android:id="@+id/expansion_view_container"
+            layout="@layout/edit_expansion_view"
             android:visibility="gone" />
 
         <include
diff --git a/res/layout/contact_detail_list_item.xml b/res/layout/contact_detail_list_item.xml
index db37862..b504fe0 100644
--- a/res/layout/contact_detail_list_item.xml
+++ b/res/layout/contact_detail_list_item.xml
@@ -85,15 +85,22 @@
             android:layout_marginBottom="8dip"
             android:background="?android:attr/dividerVertical" />
 
-        <ImageView
-            android:id="@+id/secondary_action_button"
-            android:layout_width="32dip"
+        <FrameLayout
+            android:id="@+id/secondary_action_button_container"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/detail_item_icon_margin"
-            android:layout_marginRight="@dimen/detail_item_icon_margin"
+            android:layout_marginTop="10dip"
+            android:paddingLeft="@dimen/detail_item_icon_margin"
+            android:paddingRight="@dimen/detail_item_icon_margin"
             android:duplicateParentState="false"
-            android:layout_gravity="bottom"
-            android:background="?android:attr/selectableItemBackground" />
+            android:background="?android:attr/selectableItemBackground">
+            <ImageView
+                android:id="@+id/secondary_action_button"
+                android:layout_width="32dip"
+                android:layout_height="match_parent"
+                android:duplicateParentState="false" />
+        </FrameLayout>
+
     </LinearLayout>
 
     <!-- Separating line (only for the last row) -->
diff --git a/res/layout/edit_delete_button.xml b/res/layout/edit_delete_button.xml
index c0a895e..790163e 100644
--- a/res/layout/edit_delete_button.xml
+++ b/res/layout/edit_delete_button.xml
@@ -21,7 +21,7 @@
     android:layout_width="wrap_content"
     android:layout_height="@dimen/editor_min_line_item_height"
     android:layout_gravity="top">
-    <ImageButton
+    <ImageView
         android:id="@+id/delete_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout/edit_expansion_button.xml b/res/layout/edit_expansion_view.xml
similarity index 95%
rename from res/layout/edit_expansion_button.xml
rename to res/layout/edit_expansion_view.xml
index 27e6102..6368c4b 100644
--- a/res/layout/edit_expansion_button.xml
+++ b/res/layout/edit_expansion_view.xml
@@ -21,8 +21,8 @@
     android:layout_width="wrap_content"
     android:layout_height="@dimen/editor_min_line_item_height"
     android:layout_gravity="top">
-    <ImageButton
-        android:id="@+id/expansion_button"
+    <ImageView
+        android:id="@+id/expansion_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:duplicateParentState="true"
diff --git a/res/layout/phonetic_name_editor_view.xml b/res/layout/phonetic_name_editor_view.xml
index 3a3987d..1f17f69 100644
--- a/res/layout/phonetic_name_editor_view.xml
+++ b/res/layout/phonetic_name_editor_view.xml
@@ -49,8 +49,8 @@
             layout="@layout/edit_field_list" />
 
         <include
-            android:id="@+id/expansion_button_container"
-            layout="@layout/edit_expansion_button"
+            android:id="@+id/expansion_view_container"
+            layout="@layout/edit_expansion_view"
             android:visibility="gone" />
 
         <include
diff --git a/res/layout/structured_name_editor_view.xml b/res/layout/structured_name_editor_view.xml
index 8820c56..039baa8 100644
--- a/res/layout/structured_name_editor_view.xml
+++ b/res/layout/structured_name_editor_view.xml
@@ -48,8 +48,8 @@
             layout="@layout/edit_field_list" />
 
         <include
-            android:id="@+id/expansion_button_container"
-            layout="@layout/edit_expansion_button"
+            android:id="@+id/expansion_view_container"
+            layout="@layout/edit_expansion_view"
             android:visibility="gone" />
 
         <include
diff --git a/res/layout/text_fields_editor_view.xml b/res/layout/text_fields_editor_view.xml
index f9e6a29..8279ee7 100644
--- a/res/layout/text_fields_editor_view.xml
+++ b/res/layout/text_fields_editor_view.xml
@@ -48,8 +48,8 @@
             layout="@layout/edit_field_list" />
 
         <include
-            android:id="@+id/expansion_button_container"
-            layout="@layout/edit_expansion_button"
+            android:id="@+id/expansion_view_container"
+            layout="@layout/edit_expansion_view"
             android:visibility="gone" />
 
         <include