diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index aa72d66a4..11d2e8fda 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -30,46 +30,40 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <com.google.android.material.card.MaterialCardView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                    android:layout_marginTop="@dimen/activity_vertical_margin"
-                    android:layout_marginRight="@dimen/activity_horizontal_margin"
-                    android:layout_marginBottom="@dimen/activity_vertical_margin">
-
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:padding="@dimen/card_padding_regular">
 
-                        <eu.siacs.conversations.ui.widget.AvatarView
-                            android:id="@+id/details_contact_badge"
-                            android:layout_width="@dimen/avatar_on_details_screen_size"
-                            android:layout_height="@dimen/avatar_on_details_screen_size"
-                            android:layout_alignParentTop="true"
-                            android:scaleType="centerCrop" />
-
                         <LinearLayout
                             android:id="@+id/details_jidbox"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="16dp"
-                            android:layout_toRightOf="@+id/details_contact_badge"
                             android:orientation="vertical">
 
+
+                            <eu.siacs.conversations.ui.widget.AvatarView
+                                android:id="@+id/details_contact_badge"
+                                android:layout_width="@dimen/avatar_on_details_screen_size"
+                                android:layout_height="@dimen/avatar_on_details_screen_size"
+                                android:scaleType="centerCrop"
+                                android:layout_marginBottom="24dp"
+                                android:layout_gravity="center" />
+
                             <TextView
                                 android:id="@+id/details_contactjid"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/account_settings_example_jabber_id"
                                 android:textIsSelectable="true"
+                                android:layout_gravity="center"
                                 android:textAppearance="?textAppearanceTitleMedium" />
 
                             <androidx.constraintlayout.widget.ConstraintLayout
                                 android:id="@+id/tags"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:layout_gravity="center"
                                 android:layout_marginTop="8sp">
 
                                 <androidx.constraintlayout.helper.widget.Flow
@@ -109,8 +103,9 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="8dp"
+                                android:layout_marginBottom="8dp"
                                 android:textAppearance="?textAppearanceBodyMedium"
-                                tools:text="Hey there! I’m using Conversations" />
+                                tools:text="Hey there! I’m using monocles chat" />
 
                             <Button
                                 android:id="@+id/add_contact_button"
@@ -144,16 +139,19 @@
                             android:text="@string/using_account"
                             android:textAppearance="?textAppearanceLabelMedium" />
                     </RelativeLayout>
-                </com.google.android.material.card.MaterialCardView>
 
-                <com.google.android.material.card.MaterialCardView
+                <LinearLayout
                     android:id="@+id/profile"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
-                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                    android:layout_marginRight="@dimen/activity_horizontal_margin"
-                    android:layout_marginTop="@dimen/activity_vertical_margin">
+                    android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:orientation="vertical">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="0.05dp"
+                        android:background="?android:attr/textColorPrimary" />
 
                     <ListView
                         android:id="@+id/profile_items"
@@ -162,16 +160,20 @@
                         android:divider="@android:color/transparent"
                         android:dividerHeight="0dp"></ListView>
 
-                </com.google.android.material.card.MaterialCardView>
+                </LinearLayout>
 
-                <com.google.android.material.card.MaterialCardView
+                <LinearLayout
                     android:id="@+id/recent_threads_wrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
-                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                    android:layout_marginRight="@dimen/activity_horizontal_margin"
-                    android:layout_marginTop="@dimen/activity_vertical_margin">
+                    android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:orientation="vertical">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="0.05dp"
+                        android:background="?android:attr/textColorPrimary" />
 
                     <ListView
                         android:id="@+id/recent_threads"
@@ -180,16 +182,20 @@
                         android:divider="@android:color/transparent"
                         android:dividerHeight="0dp"></ListView>
 
-                </com.google.android.material.card.MaterialCardView>
+                </LinearLayout>
 
-                <com.google.android.material.card.MaterialCardView
+                <LinearLayout
                     android:id="@+id/media_wrapper"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
-                    android:layout_marginRight="@dimen/activity_horizontal_margin"
-                    android:layout_marginBottom="@dimen/activity_vertical_margin">
+                    android:layout_marginBottom="@dimen/activity_vertical_margin"
+                    android:orientation="vertical">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="0.05dp"
+                        android:background="?android:attr/textColorPrimary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -242,16 +248,20 @@
                                 android:text="@string/view_media" />
                         </LinearLayout>
                     </LinearLayout>
-                </com.google.android.material.card.MaterialCardView>
+                </LinearLayout>
 
-                <com.google.android.material.card.MaterialCardView
+                <LinearLayout
                     android:id="@+id/keys_wrapper"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
-                    android:layout_marginRight="@dimen/activity_horizontal_margin"
-                    android:layout_marginBottom="@dimen/activity_vertical_margin">
+                    android:layout_marginBottom="@dimen/activity_vertical_margin"
+                    android:orientation="vertical">
+
+                    <View
+                        android:layout_width="fill_parent"
+                        android:layout_height="0.05dp"
+                        android:background="?android:attr/textColorPrimary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -303,7 +313,7 @@
                                 android:text="@string/show_inactive_devices" />
                         </LinearLayout>
                     </LinearLayout>
-                </com.google.android.material.card.MaterialCardView>
+                </LinearLayout>
             </LinearLayout>
         </ScrollView>
     </LinearLayout>
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 4d99df191..433af74c6 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -30,19 +30,19 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <com.google.android.material.card.MaterialCardView
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
-                    android:layout_marginRight="@dimen/activity_horizontal_margin"
-                    android:layout_marginBottom="@dimen/activity_vertical_margin">
+                    android:padding="@dimen/card_padding_regular"
+                    android:layout_marginBottom="@dimen/activity_vertical_margin"
+                    android:orientation="vertical">
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="@dimen/card_padding_regular"
-                        android:orientation="vertical">
+                        <eu.siacs.conversations.ui.widget.AvatarView
+                            android:id="@+id/your_photo"
+                            android:layout_width="@dimen/avatar_on_details_screen_size"
+                            android:layout_height="@dimen/avatar_on_details_screen_size"
+                            android:layout_gravity="center" />
 
                         <RelativeLayout
                             android:layout_width="fill_parent"
@@ -50,18 +50,21 @@
                             android:layout_marginBottom="32dp"
                             android:paddingHorizontal="@dimen/card_padding_regular">
 
-                            <eu.siacs.conversations.ui.widget.AvatarView
-                                android:id="@+id/your_photo"
-                                android:layout_width="@dimen/avatar_on_details_screen_size"
-                                android:layout_height="@dimen/avatar_on_details_screen_size"
-                                android:layout_alignParentStart="true"
-                                android:layout_marginEnd="@dimen/avatar_item_distance" />
+                            <ImageButton
+                                android:id="@+id/edit_muc_name_button"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_alignParentTop="true"
+                                android:layout_alignParentEnd="true"
+                                android:padding="4dp"
+                                android:background="?attr/selectableItemBackgroundBorderless"
+                                android:src="@drawable/ic_edit_24dp" />
 
                             <LinearLayout
                                 android:layout_width="fill_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_alignParentTop="true"
-                                android:layout_toEndOf="@+id/your_photo"
+                                android:layout_below="@+id/edit_muc_name_button"
+                                android:gravity="center_horizontal"
                                 android:orientation="vertical">
 
                                 <RelativeLayout
@@ -70,16 +73,16 @@
 
                                     <LinearLayout
                                         android:id="@+id/muc_display"
-                                        android:layout_width="wrap_content"
+                                        android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
-                                        android:layout_alignParentStart="true"
-                                        android:layout_toStartOf="@+id/edit_muc_name_button"
                                         android:orientation="vertical">
 
                                         <TextView
                                             android:id="@+id/muc_title"
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
+                                            android:layout_gravity="center_horizontal"
+                                            android:layout_marginBottom="24dp"
                                             android:textAppearance="?textAppearanceTitleLarge" />
 
                                         <TextView
@@ -117,7 +120,6 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:layout_alignParentStart="true"
-                                        android:layout_toStartOf="@+id/edit_muc_name_button"
                                         android:orientation="vertical"
                                         android:visibility="gone">
 
@@ -151,16 +153,6 @@
                                             android:layout_marginBottom="4dp" />
 
                                     </LinearLayout>
-
-                                    <ImageButton
-                                        android:id="@+id/edit_muc_name_button"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:layout_alignParentTop="true"
-                                        android:layout_alignParentEnd="true"
-                                        android:background="?attr/selectableItemBackgroundBorderless"
-                                        android:padding="@dimen/image_button_padding"
-                                        android:src="@drawable/ic_edit_24dp" />
                                 </RelativeLayout>
                             </LinearLayout>
                         </RelativeLayout>
@@ -253,17 +245,20 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="end"
                             android:textAppearance="?textAppearanceLabelMedium" />
-                    </LinearLayout>
-                </com.google.android.material.card.MaterialCardView>
+                </LinearLayout>
 
-                <com.google.android.material.card.MaterialCardView
+                <LinearLayout
                     android:id="@+id/users_wrapper"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
-                    android:layout_marginRight="@dimen/activity_horizontal_margin"
-                    android:layout_marginBottom="@dimen/activity_vertical_margin">
+                    android:layout_marginBottom="@dimen/activity_vertical_margin"
+                    android:orientation="vertical">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="0.05dp"
+                        android:background="?android:attr/textColorPrimary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -308,15 +303,19 @@
                                 tools:text="View n Participants" />
                         </LinearLayout>
                     </LinearLayout>
-                </com.google.android.material.card.MaterialCardView>
+                </LinearLayout>
 
-                <com.google.android.material.card.MaterialCardView
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
-                    android:layout_marginRight="@dimen/activity_horizontal_margin"
-                    android:layout_marginBottom="@dimen/activity_vertical_margin">
+                    android:layout_marginBottom="@dimen/activity_vertical_margin"
+                    android:orientation="vertical">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="0.05dp"
+                        android:background="?android:attr/textColorPrimary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -398,16 +397,20 @@
                             android:text="@string/using_account"
                             android:textAppearance="?textAppearanceLabelMedium" />
                     </LinearLayout>
-                </com.google.android.material.card.MaterialCardView>
+                </LinearLayout>
 
-                <com.google.android.material.card.MaterialCardView
+                <LinearLayout
                     android:id="@+id/recent_threads_wrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
-                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                    android:layout_marginRight="@dimen/activity_horizontal_margin"
-                    android:layout_marginTop="@dimen/activity_vertical_margin">
+                    android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:orientation="vertical">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="0.05dp"
+                        android:background="?android:attr/textColorPrimary" />
 
                     <ListView
                         android:id="@+id/recent_threads"
@@ -416,16 +419,20 @@
                         android:divider="@android:color/transparent"
                         android:dividerHeight="0dp"></ListView>
 
-                </com.google.android.material.card.MaterialCardView>
+                </LinearLayout>
 
-                <com.google.android.material.card.MaterialCardView
+                <LinearLayout
                     android:id="@+id/media_wrapper"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
-                    android:layout_marginRight="@dimen/activity_horizontal_margin"
-                    android:layout_marginBottom="@dimen/activity_vertical_margin">
+                    android:layout_marginBottom="@dimen/activity_vertical_margin"
+                    android:orientation="vertical">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="0.05dp"
+                        android:background="?android:attr/textColorPrimary" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -478,7 +485,7 @@
                                 android:text="@string/view_media" />
                         </LinearLayout>
                     </LinearLayout>
-                </com.google.android.material.card.MaterialCardView>
+                </LinearLayout>
 
             </LinearLayout>
         </ScrollView>
diff --git a/src/main/res/values-w384dp/dimens.xml b/src/main/res/values-w384dp/dimens.xml
index 3c5d3c6f2..8a88e4216 100644
--- a/src/main/res/values-w384dp/dimens.xml
+++ b/src/main/res/values-w384dp/dimens.xml
@@ -8,7 +8,7 @@
     <dimen name="fineprint_size">12sp</dimen>
     <dimen name="audio_player_width">288dp</dimen>
     <dimen name="image_preview_width">288dp</dimen>
-    <dimen name="avatar_on_details_screen_size">72dp</dimen>
+    <dimen name="avatar_on_details_screen_size">96dp</dimen>
     <dimen name="media_size">64dp</dimen> <!-- ideally not larger than avatar_on_details_screen -->
     <dimen name="sd_label_max_width">288dp</dimen>
 </resources>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 19e61fa96..0b565529d 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -28,7 +28,7 @@
     <dimen name="avatar_radius">10dp</dimen>
     <dimen name="bubble_radius">10dp</dimen>
     <dimen name="image_radius">6dp</dimen>
-    <dimen name="avatar_on_details_screen_size">56dp</dimen>
+    <dimen name="avatar_on_details_screen_size">96dp</dimen>
     <dimen name="avatar_on_conversation_overview">56dp</dimen>
     <dimen name="avatar_on_drawer">128dp</dimen>