diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index 82f65a962..f196e3445 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -50,6 +50,7 @@ import android.widget.AbsListView.MultiChoiceModeListener;
 import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -475,7 +476,7 @@ public class KeyListFragment extends Fragment
             TextView mMainUserIdRest;
             View mStatusDivider;
             FrameLayout mStatusLayout;
-            Button mButton;
+            ImageButton mButton;
             TextView mRevoked;
             ImageView mVerified;
         }
@@ -488,7 +489,7 @@ public class KeyListFragment extends Fragment
             holder.mMainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest);
             holder.mStatusDivider = (View) view.findViewById(R.id.status_divider);
             holder.mStatusLayout = (FrameLayout) view.findViewById(R.id.status_layout);
-            holder.mButton = (Button) view.findViewById(R.id.edit);
+            holder.mButton = (ImageButton) view.findViewById(R.id.edit);
             holder.mRevoked = (TextView) view.findViewById(R.id.revoked);
             holder.mVerified = (ImageView) view.findViewById(R.id.verified);
             view.setTag(holder);
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index db61728c1..85d9afdd3 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -51,15 +51,16 @@
         android:layout_width="80dp"
         android:layout_height="match_parent">
 
-        <Button
+        <ImageButton
+            android:id="@+id/edit"
             style="@style/SelectableItem"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:id="@+id/edit"
             android:focusable="false"
             android:enabled="true"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/black"
+            android:src="@drawable/ic_action_edit"
             android:text="@string/edit" />
 
         <TextView