1 files changed, 22 insertions, 19 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
index 63c1ee70f..cd7a79663 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
@@ -7,23 +7,6 @@
     android:singleLine="true">
 
     <LinearLayout
-        android:id="@+id/user_id_item_certified_layout"
-        android:layout_width="22dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/user_id_item_certified"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/status_signature_unverified_cutout_24px"
-            android:layout_gravity="center_horizontal" />
-
-    </LinearLayout>
-
-    <LinearLayout
         android:orientation="vertical"
         android:layout_gravity="center_vertical"
         android:layout_width="0dip"
@@ -57,11 +40,31 @@
 
     </LinearLayout>
 
+
+    <LinearLayout
+        android:id="@+id/user_id_item_certified_layout"
+        android:layout_width="22dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/user_id_item_certified"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/status_signature_unverified_cutout_24dp"
+            android:layout_gravity="center_horizontal" />
+
+    </LinearLayout>
+
     <ImageView
         android:id="@+id/user_id_item_edit_image"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:src="@drawable/ic_action_edit"
+        android:src="@drawable/ic_mode_edit_grey_24dp"
         android:padding="8dp"
         android:layout_gravity="center_vertical" />
 
@@ -70,7 +73,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:padding="8dp"
-        android:src="@drawable/ic_action_cancel"
+        android:src="@drawable/ic_close_grey_24dp"
         android:layout_gravity="center_vertical"
         style="@style/SelectableItem" />