diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 4d7294c6d8c1d25bdf1f98de70c5911fc2dee400..9de75bca74ce2edaa9ba4b0f827f9088a78d6bcc 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -37,14 +37,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/touch_to_choose_picture"
-                android:textColor="?attr/color_text_secondary"/>
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
 
             <TextView
                 android:id="@+id/secondary_hint"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/or_long_press_for_default"
-                android:textColor="?attr/color_text_secondary"/>
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                android:text="@string/or_long_press_for_default"/>
 
             <TextView
                 android:id="@+id/hint_or_warning"
@@ -52,8 +52,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
-                android:textColor="?attr/color_text_primary"
-                android:textSize="?attr/TextSizeBody"/>
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
 
         </LinearLayout>
     </android.support.v7.widget.CardView>
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index 4806f492e9cdb4900726df5ea108838692d99042..d49347aa920900cb3d2924c15360e5a86484c4e8 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -38,17 +38,14 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/error_trustkeys_title"
-                            android:textColor="?attr/color_text_primary"
-                            android:textSize="?attr/TextSizeHeadline"
-                            android:textStyle="bold"/>
+                            android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
 
                         <TextView
                             android:id="@+id/key_error_message"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:padding="8dp"
-                            android:textColor="?attr/color_text_primary"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
                     </LinearLayout>
 
                 </android.support.v7.widget.CardView>
@@ -67,24 +64,20 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:padding="@dimen/card_padding_regular">
+                        android:padding="@dimen/card_padding_list">
 
                         <TextView
                             android:id="@+id/own_keys_title"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="?attr/color_text_primary"
-                            android:textSize="?attr/TextSizeHeadline"
-                            android:textStyle="bold"/>
+                            android:layout_margin="@dimen/list_padding"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
 
                         <LinearLayout
                             android:id="@+id/own_keys_details"
                             android:layout_width="fill_parent"
                             android:layout_height="wrap_content"
-                            android:divider="?android:dividerHorizontal"
-                            android:orientation="vertical"
-                            android:showDividers="middle">
-                        </LinearLayout>
+                            android:orientation="vertical"/>
                     </LinearLayout>
 
                 </android.support.v7.widget.CardView>
diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml
deleted file mode 100644
index de61a66f713e2c8755f2d2174d89f72bf54dc9fe..0000000000000000000000000000000000000000
--- a/src/main/res/layout/activity_verify_otr.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="?attr/color_background_primary">
-
-	<ScrollView
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:layout_above="@+id/button_bar">
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:orientation="vertical"
-			android:layout_marginLeft="@dimen/activity_horizontal_margin"
-			android:layout_marginRight="@dimen/activity_horizontal_margin"
-			android:layout_marginTop="@dimen/activity_vertical_margin"
-			android:layout_marginBottom="@dimen/activity_vertical_margin">
-
-			<TextView
-				android:id="@+id/verification_explanation"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
-
-			<LinearLayout
-				android:id="@+id/manual_verification_area"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="16dp"
-				android:orientation="vertical">
-
-				<TextView
-					android:id="@+id/your_fingerprint"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textColor="?attr/color_text_primary"
-					android:textSize="?attr/TextSizeBody"
-					android:typeface="monospace"
-					android:fontFamily="monospace"/>
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="@string/your_fingerprint"
-					android:textColor="?attr/color_text_secondary"
-					android:textSize="?attr/TextSizeInfo"/>
-
-				<TextView
-					android:id="@+id/remote_fingerprint"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="20dp"
-					android:textColor="?attr/color_text_primary"
-					android:textSize="?attr/TextSizeBody"
-					android:typeface="monospace"
-					android:fontFamily="monospace"/>
-
-				<TextView
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="20dp"
-					android:text="@string/remote_fingerprint"
-					android:textColor="?attr/color_text_secondary"
-					android:textSize="?attr/TextSizeInfo"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:id="@+id/smp_verification_area"
-				android:layout_width="fill_parent"
-				android:layout_height="fill_parent"
-				android:layout_marginTop="16dp"
-				android:orientation="vertical">
-
-				<TextView
-					android:id="@+id/status_message"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_gravity="center_horizontal"
-					android:text="@string/verified"
-					android:textColor="?attr/color_text_primary"
-					android:textSize="?attr/TextSizeHeadline"
-					android:textStyle="bold"
-					android:visibility="gone"/>
-
-				<TextView
-					android:id="@+id/shared_secret_hint"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="8dp"
-					android:textColor="?attr/color_text_primary"
-					android:textSize="?attr/TextSizeBody"
-					android:textStyle="bold"
-					android:visibility="gone"/>
-
-				<EditText
-					android:id="@+id/shared_secret_hint_editable"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="8dp"
-					android:hint="@string/shared_secret_hint"
-					android:inputType="textAutoComplete"
-					android:textColor="?attr/color_text_primary"
-					android:textColorHint="?attr/color_text_secondary"
-					android:textSize="?attr/TextSizeBody"/>
-
-				<EditText
-					android:id="@+id/shared_secret_secret"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="8dp"
-					android:hint="@string/shared_secret_secret"
-					android:inputType="textPassword"
-					android:textColor="?attr/color_text_primary"
-					android:textColorHint="?attr/color_text_secondary"
-					android:textSize="?attr/TextSizeBody"/>
-			</LinearLayout>
-		</LinearLayout>
-	</ScrollView>
-
-	<LinearLayout
-		android:id="@+id/button_bar"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_alignParentBottom="true"
-		android:layout_alignParentLeft="true"
-		android:layout_alignParentRight="true">
-
-		<Button
-			android:id="@+id/left_button"
-			style="?android:attr/borderlessButtonStyle"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"/>
-
-		<View
-			android:layout_width="1dp"
-			android:layout_height="fill_parent"
-			android:layout_marginBottom="7dp"
-			android:layout_marginTop="7dp"
-			android:background="?attr/divider"/>
-
-		<Button
-			android:id="@+id/right_button"
-			style="?android:attr/borderlessButtonStyle"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"/>
-	</LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml
index 70f2c12d9b70700febc4e5872bc8b454faa825f3..568cc728120d319640e1f2d4d9193d9e95b7c55e 100644
--- a/src/main/res/layout/keys_card.xml
+++ b/src/main/res/layout/keys_card.xml
@@ -15,33 +15,29 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="@dimen/card_padding_regular">
+            android:padding="@dimen/card_padding_list">
 
             <TextView
                 android:id="@+id/foreign_keys_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="?attr/color_text_primary"
-                android:textSize="?attr/TextSizeHeadline"
-                android:textStyle="bold"/>
+                android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                android:layout_margin="@dimen/list_padding"/>
 
             <LinearLayout
                 android:id="@+id/foreign_keys_details"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:divider="?android:dividerHorizontal"
-                android:orientation="vertical"
-                android:showDividers="middle">
+                android:orientation="vertical">
             </LinearLayout>
 
             <TextView
                 android:id="@+id/no_keys_to_accept"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
                 android:text="@string/no_keys_just_confirm"
-                android:textColor="?attr/color_text_primary"
-                android:textSize="?attr/TextSizeBody"/>
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                android:layout_margin="@dimen/list_padding"/>
         </LinearLayout>
     </android.support.v7.widget.CardView>
 </layout>
\ No newline at end of file