1 files changed, 30 insertions, 40 deletions

diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 77b26f70d..0aa695ea8 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -1,65 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:longClickable="true">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <RelativeLayout
-        android:id="@+id/key_data"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:padding="@dimen/list_padding">
 
-        <TextView
-            android:id="@+id/key"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
             android:layout_toLeftOf="@+id/action_container"
-            android:clickable="true"
-            android:fontFamily="monospace"
-            android:longClickable="true"
-            android:textColor="@color/black87"
-            android:textSize="?attr/TextSizeBody"
-            android:typeface="monospace" />
+            android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/key_type"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_below="@+id/key"
-            android:clickable="true"
-            android:longClickable="true"
-            android:maxLines="1"
-            android:textColor="@color/black54"
-            android:textSize="?attr/TextSizeInfo" />
+            <TextView
+                android:id="@+id/key"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
 
-        <TextView
-            android:id="@+id/key_trust"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_below="@+id/key"
-            android:longClickable="true"
-            android:textColor="@color/black54"
-            android:textSize="?attr/TextSizeInfo"
-            android:visibility="gone" />
+                android:clickable="true"
+                android:fontFamily="monospace"
+                android:longClickable="true"
+                android:textColor="?attr/color_text_primary"
+                android:textSize="?attr/TextSizeBody"
+                android:typeface="monospace" />
+
+            <TextView
+                android:id="@+id/key_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clickable="true"
+                android:longClickable="true"
+                android:maxLines="1"
+                android:textColor="?attr/color_text_secondary"
+                android:textSize="?attr/TextSizeInfo" />
+        </LinearLayout>
 
         <LinearLayout
             android:id="@+id/action_container"
             android:layout_width="@dimen/key_action_width"
             android:layout_height="48dp"
             android:layout_alignParentRight="true"
-            android:gravity="center"
             android:layout_centerVertical="true"
+            android:gravity="center"
             android:orientation="vertical">
 
             <ImageButton
                 android:id="@+id/button_remove"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:alpha="?attr/icon_alpha"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:padding="@dimen/image_button_padding"
                 android:src="?attr/icon_remove"
@@ -84,12 +76,10 @@
 
             <android.support.v7.widget.SwitchCompat
                 android:id="@+id/tgl_trust"
-                style="@style/MD"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
                 android:visibility="gone" />
         </LinearLayout>
+
     </RelativeLayout>
-</RelativeLayout>
\ No newline at end of file
+</layout>
\ No newline at end of file