diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 47e428fb6..5215fafe9 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -22,7 +22,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="@dimen/infocard_padding">
+                android:padding="@dimen/card_padding_regular">
 
 
                 <android.support.design.widget.TextInputLayout
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 94e30a14e..6f5f366d9 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -25,7 +25,7 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="@dimen/infocard_padding">
+                    android:padding="@dimen/card_padding_regular">
 
                     <QuickContactBadge
                         android:id="@+id/details_contact_badge"
@@ -121,7 +121,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:padding="@dimen/infocard_padding">
+                    android:padding="@dimen/card_padding_list">
 
                     <LinearLayout
                         android:id="@+id/details_contact_keys"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 00146e635..d7b8bf0cd 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -33,7 +33,7 @@
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:padding="@dimen/infocard_padding">
+                        android:padding="@dimen/card_padding_regular">
 
                         <com.makeramen.roundedimageview.RoundedImageView
                             android:id="@+id/avater"
@@ -169,7 +169,7 @@
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:padding="@dimen/infocard_padding">
+                        android:padding="@dimen/card_padding_regular">
 
                         <TextView
                             android:id="@+id/os_optimization_headline"
@@ -221,7 +221,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:padding="@dimen/infocard_padding">
+                        android:padding="@dimen/card_padding_regular">
 
                         <TableLayout
                             android:layout_width="match_parent"
@@ -652,7 +652,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:padding="@dimen/infocard_padding">
+                        android:padding="@dimen/card_padding_list">
 
                         <TextView
                             android:id="@+id/other_device_keys_title"
@@ -661,6 +661,7 @@
                             android:text="@string/other_devices"
                             android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeHeadline"
+                            android:layout_margin="@dimen/list_padding"
                             android:textStyle="bold"/>
 
                         <LinearLayout
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index b6191b744..aeb866a99 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="@dimen/infocard_padding">
+                android:padding="@dimen/card_padding_regular">
 
                 <TextView
                     android:id="@+id/muc_jabberid"
@@ -194,7 +194,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="@dimen/infocard_padding">
+                android:padding="@dimen/card_padding_list">
 
                 <LinearLayout
                     android:id="@+id/muc_members"
diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml
index 11c2a923e..0acb07000 100644
--- a/src/main/res/layout/activity_set_presence.xml
+++ b/src/main/res/layout/activity_set_presence.xml
@@ -24,7 +24,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:padding="@dimen/infocard_padding">
+                    android:padding="@dimen/card_padding_regular">
 
                     <EditText
                         android:id="@+id/presence_status_message"
@@ -79,7 +79,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:padding="@dimen/infocard_padding"/>
+                    android:padding="@dimen/card_padding_regular"/>
             </android.support.v7.widget.CardView>
         </LinearLayout>
     </ScrollView>
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index 7ba6fd674..4806f492e 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -31,7 +31,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:padding="@dimen/infocard_padding">
+                        android:padding="@dimen/card_padding_regular">
 
                         <TextView
                             android:id="@+id/key_error_message_title"
@@ -67,7 +67,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:padding="@dimen/infocard_padding">
+                        android:padding="@dimen/card_padding_regular">
 
                         <TextView
                             android:id="@+id/own_keys_title"
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 7a6be7761..e999bc64f 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -4,7 +4,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?android:attr/activatedBackgroundIndicator"
-                android:padding="8dp">
+                android:padding="@dimen/list_padding">
 
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/contact_photo"
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index f227531c4..386b9057a 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -9,9 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-        android:paddingBottom="8dp"
-        android:paddingLeft="8dp"
-        android:paddingTop="8dp">
+        android:padding="@dimen/list_padding">
 
         <TextView
             android:id="@+id/key"
@@ -50,8 +48,7 @@
             android:longClickable="true"/>
         <LinearLayout
             android:id="@+id/action_container"
-            android:layout_width="96dp"
-            android:layout_marginRight="-32dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:layout_alignParentRight="true"
@@ -65,7 +62,6 @@
                 android:background="?android:selectableItemBackground"
                 android:padding="@dimen/image_button_padding"
                 android:src="?attr/icon_remove"
-                android:layout_marginRight="16dp"
                 android:visibility="gone" />
 
             <ImageView
@@ -74,13 +70,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginRight="16dp"
+                android:padding="@dimen/image_button_padding"
                 android:src="@drawable/ic_verified_fingerprint" />
 
             <android.support.v7.widget.SwitchCompat
                 android:id="@+id/tgl_trust"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
                 android:visibility="gone" />
         </LinearLayout>
 
diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml
index b312e4227..70f2c12d9 100644
--- a/src/main/res/layout/keys_card.xml
+++ b/src/main/res/layout/keys_card.xml
@@ -15,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="@dimen/infocard_padding">
+            android:padding="@dimen/card_padding_regular">
 
             <TextView
                 android:id="@+id/foreign_keys_title"
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index a18f770d1..98161fcc1 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -2,7 +2,9 @@
 	<!-- Default screen margins, per the Android Design guidelines. -->
 	<dimen name="activity_horizontal_margin">8dp</dimen>
 	<dimen name="activity_vertical_margin">8dp</dimen>
-	<dimen name="infocard_padding">16dp</dimen>
+	<dimen name="card_padding_regular">16dp</dimen>
+	<dimen name="card_padding_list">8dp</dimen> <!-- card_padding_regular minus list_padding -->
+	<dimen name="list_padding">8dp</dimen>
 	<dimen name="image_button_padding">12dp</dimen>
 	<dimen name="fineprint_size">11sp</dimen>
 	<dimen name="audio_player_width">224dp</dimen>