diff --git a/app/src/main/res/layout/activity_conversation_details.xml b/app/src/main/res/layout/activity_conversation_details.xml
index 45a1f701..ea329c8d 100644
--- a/app/src/main/res/layout/activity_conversation_details.xml
+++ b/app/src/main/res/layout/activity_conversation_details.xml
@@ -23,16 +23,15 @@
 
         <TextView
             android:id="@+id/notifications_heading"
-            style="@style/MaterialSectionLabelStyle"
+            style="@style/SettingsSectionLabelStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/activity_margin"
-            android:layout_marginEnd="@dimen/activity_margin"
             android:visibility="gone"
             android:text="@string/notifications" />
 
         <RelativeLayout
             android:id="@+id/custom_notifications_holder"
+            style="@style/SettingsHolderCheckboxStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone">
@@ -42,24 +41,25 @@
                 style="@style/SettingsCheckboxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="@dimen/bigger_margin"
-                android:layout_marginStart="@dimen/activity_margin"
-                android:layout_marginEnd="@dimen/activity_margin"
-                android:layout_marginBottom="@dimen/bigger_margin"
-                android:paddingBottom="@dimen/activity_margin"
                 android:text="@string/enable_custom_notifications" />
 
         </RelativeLayout>
 
-        <org.fossify.commons.views.MyTextView
-            android:id="@+id/custom_notifications_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/activity_margin"
-            android:layout_marginEnd="@dimen/activity_margin"
-            android:layout_marginBottom="@dimen/bigger_margin"
-            android:visibility="gone"
-            android:text="@string/customize_notifications" />
+        <RelativeLayout
+            android:id="@+id/custom_notifications_button_holder"
+            style="@style/SettingsHolderTextViewOneLinerStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <org.fossify.commons.views.MyTextView
+                android:id="@+id/custom_notifications_button"
+                style="@style/SettingsTextLabelStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:text="@string/customize_notifications" />
+
+        </RelativeLayout>
 
         <include
             android:id="@+id/settings_conversation_notifications_divider"
@@ -67,31 +67,32 @@
 
         <TextView
             android:id="@+id/conversation_name_heading"
-            style="@style/MaterialSectionLabelStyle"
+            style="@style/SettingsSectionLabelStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/activity_margin"
-            android:layout_marginEnd="@dimen/activity_margin"
             android:text="@string/conversation_name" />
 
-        <org.fossify.commons.views.MyTextView
-            android:id="@+id/conversation_name"
+        <RelativeLayout
+            android:id="@+id/settings_customize_notifications_holder"
+            style="@style/SettingsHolderTextViewOneLinerStyle"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/small_margin"
-            android:background="?attr/selectableItemBackground"
-            android:clickable="true"
-            android:drawableEnd="@drawable/ic_edit_vector"
-            android:drawablePadding="@dimen/bigger_margin"
-            android:ellipsize="end"
-            android:focusable="true"
-            android:maxLines="1"
-            android:paddingStart="@dimen/activity_margin"
-            android:paddingTop="@dimen/bigger_margin"
-            android:paddingEnd="@dimen/activity_margin"
-            android:paddingBottom="@dimen/bigger_margin"
-            android:textSize="@dimen/bigger_text_size"
-            tools:text="Conversation name" />
+            android:layout_height="wrap_content">
+
+            <org.fossify.commons.views.MyTextView
+                android:id="@+id/conversation_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:drawableEnd="@drawable/ic_edit_vector"
+                android:drawablePadding="@dimen/bigger_margin"
+                android:ellipsize="end"
+                android:focusable="true"
+                android:maxLines="1"
+                android:textSize="@dimen/bigger_text_size"
+                tools:text="Conversation name" />
+
+        </RelativeLayout>
 
         <include
             android:id="@+id/settings_conversation_name_divider"
@@ -99,18 +100,15 @@
 
         <TextView
             android:id="@+id/members_heading"
-            style="@style/MaterialSectionLabelStyle"
+            style="@style/SettingsSectionLabelStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/activity_margin"
-            android:layout_marginEnd="@dimen/activity_margin"
             android:text="@string/members" />
 
         <org.fossify.commons.views.MyRecyclerView
             android:id="@+id/participants_recyclerview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="@dimen/normal_margin"
             android:clipToPadding="false"
             app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager"
             tools:itemCount="3"