diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index bece5a245..4bba90dd4 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -1034,6 +1034,8 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
             super.onViewCreated(view, savedInstanceState);
             registerForContextMenu(getListView());
             getListView().setFastScrollEnabled(true);
+            getListView().setDivider(null);
+            getListView().setDividerHeight(0);
         }
 
         @Override
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index bf6893e28..3e6048a07 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -13,7 +13,6 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentLeft="true"
-        android:src="@drawable/ic_profile"
         android:contentDescription="@string/account_image_description"
         app:riv_corner_radius="2dp" />
 
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index f0cc0251d..94e30a14e 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -47,9 +47,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/account_settings_example_jabber_id"
-                            android:textColor="?attr/color_text_primary"
-                            android:textSize="?attr/TextSizeHeadline"
-                            android:textStyle="bold"/>
+                            android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
 
                         <com.wefika.flowlayout.FlowLayout
                             android:id="@+id/tags"
@@ -66,17 +64,14 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="4dp"
-                            android:textColor="?attr/color_text_primary"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
 
                         <TextView
                             android:id="@+id/status_message"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="8dp"
-                            android:textColor="?attr/color_text_secondary"
-                            android:textSize="?attr/TextSizeBody"
-                            android:textStyle="italic"/>
+                            android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
 
                         <Button
                             android:id="@+id/add_contact_button"
@@ -91,16 +86,14 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="8dp"
                             android:text="@string/send_presence_updates"
-                            android:textColor="?attr/color_text_primary"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
 
                         <CheckBox
                             android:id="@+id/details_receive_presence"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/receive_presence_updates"
-                            android:textColor="?attr/color_text_primary"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
                     </LinearLayout>
 
                     <TextView
@@ -111,8 +104,7 @@
                         android:layout_below="@+id/details_jidbox"
                         android:layout_marginTop="32dp"
                         android:text="@string/using_account"
-                        android:textColor="?attr/color_text_secondary"
-                        android:textSize="?attr/TextSizeInfo"/>
+                        android:textAppearance="@style/TextAppearance.AppCompat.Caption"/>
                 </RelativeLayout>
             </android.support.v7.widget.CardView>
 
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 88604c970..b6191b744 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">fill_parent
+                android:padding="@dimen/infocard_padding">
 
                 <TextView
                     android:id="@+id/muc_jabberid"
@@ -31,9 +31,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="16dp"
                     android:text="@string/account_settings_example_jabber_id"
-                    android:textColor="?attr/color_text_primary"
-                    android:textSize="?attr/TextSizeHeadline"
-                    android:textStyle="bold"/>
+                    android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
 
                 <RelativeLayout
                     android:layout_width="fill_parent"
@@ -45,7 +43,6 @@
                         android:layout_width="48dp"
                         android:layout_height="48dp"
                         android:layout_alignParentLeft="true"
-                        android:src="@drawable/ic_profile"
                         app:riv_corner_radius="2dp"/>
 
                     <LinearLayout
@@ -61,16 +58,14 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:singleLine="true"
-                            android:textColor="?attr/color_text_primary"
-                            android:textSize="?attr/TextSizeHeadline"/>
+                            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
 
                         <TextView
                             android:id="@+id/muc_role"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:singleLine="true"
-                            android:textColor="?attr/color_text_primary"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary"/>
                     </LinearLayout>
 
                     <ImageButton
@@ -98,8 +93,7 @@
                         android:layout_centerVertical="true"
                         android:layout_toLeftOf="@+id/change_conference_button"
                         android:text="@string/private_conference"
-                        android:textColor="?attr/color_text_primary"
-                        android:textSize="?attr/TextSizeBody"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                         />
 
                     <ImageButton
@@ -128,8 +122,7 @@
                         android:layout_centerVertical="true"
                         android:layout_toLeftOf="@+id/notification_status_button"
                         android:text="@string/notify_on_all_messages"
-                        android:textColor="?attr/color_text_primary"
-                        android:textSize="?attr/TextSizeBody"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                         />
 
                     <ImageButton
@@ -164,8 +157,7 @@
                             android:ellipsize="end"
                             android:singleLine="true"
                             android:text="@string/server_info_mam"
-                            android:textColor="?attr/color_text_primary"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
 
                         <TextView
                             android:id="@+id/muc_info_mam"
@@ -173,8 +165,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
                             android:paddingLeft="4dp"
-                            android:textColor="?attr/color_text_primary"
-                            android:textSize="?attr/TextSizeBody"/>
+                            android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
                     </TableRow>
 
                 </TableLayout>
@@ -186,8 +177,7 @@
                     android:layout_gravity="right"
                     android:layout_marginTop="32dp"
                     android:text="@string/using_account"
-                    android:textColor="?attr/color_text_secondary"
-                    android:textSize="?attr/TextSizeInfo"/>
+                    android:textAppearance="@style/TextAppearance.AppCompat.Caption"/>
             </LinearLayout>
         </android.support.v7.widget.CardView>
 
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 68db0d701..7a6be7761 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -12,7 +12,6 @@
         android:layout_height="48dp"
         android:layout_alignParentLeft="true"
         android:scaleType="centerCrop"
-        android:src="@drawable/ic_profile"
         app:riv_corner_radius="2dp" />
 
     <LinearLayout
@@ -21,23 +20,21 @@
         android:layout_centerVertical="true"
         android:layout_toRightOf="@+id/contact_photo"
         android:orientation="vertical"
-        android:paddingLeft="8dp" >
+        android:paddingLeft="16dp" >
 
         <TextView
             android:id="@+id/contact_display_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textColor="?attr/color_text_primary"
-            android:textSize="?attr/TextSizeHeadline" />
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
         <TextView
             android:id="@+id/contact_jid"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textColor="?attr/color_text_primary"
-            android:textSize="?attr/TextSizeBody" />
+            android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary"/>
         <com.wefika.flowlayout.FlowLayout
             android:id="@+id/tags"
             android:layout_width="wrap_content"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 0cf320b1d..fe8124905 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -16,7 +16,6 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:scaleType="fitXY"
-        android:src="@drawable/ic_profile"
         app:riv_corner_radius="2dp" />
 
     <LinearLayout
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index dfa8c91f9..0e4ec200e 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -15,7 +15,6 @@
         android:layout_height="48dp"
         android:scaleType="fitXY"
         android:paddingBottom="3dp"
-        android:src="@drawable/ic_profile"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index c4ca3597a..6cc3be9f3 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -27,7 +27,6 @@
         android:layout_marginRight="-1.5dp"
         android:padding="0dp"
         android:scaleType="fitXY"
-        android:src="@drawable/ic_profile"
         app:riv_corner_radius="1dp"/>
 
     <TextView
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 70c333111..5804acce0 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -1,7 +1,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="Divider">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1.5dp</item>
-        <item name="android:background">@color/black12</item>
+    <style name="TextAppearance.Conversations.Body1.Secondary" parent="TextAppearance.AppCompat.Body1">
+        <item name="android:textColor">?android:textColorSecondary</item>
     </style>
 </resources>
\ No newline at end of file