diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
index 1d1240bb444..c5453931ea8 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
@@ -281,6 +281,13 @@ class ConversationInfoActivity :
                 binding.notificationSettingsView.notificationSettingsCallNotifications
             ).forEach(viewThemeUtils.talk::ConversationInfoCardView)
         }
+        binding.run {
+            listOf(
+                binding.notificationSettingsView.notificationSettingsCategory,
+                binding.webinarInfoView.webinarSettingsCategory,
+                binding.guestAccessView.guestAccessSettingsCategory
+            )
+        }.forEach(viewThemeUtils.platform::colorTextView)
     }
 
     private fun showSharedItems() {
diff --git a/app/src/main/res/layout/activity_conversation_info.xml b/app/src/main/res/layout/activity_conversation_info.xml
index 87ef63454c6..4fc4b4c1feb 100644
--- a/app/src/main/res/layout/activity_conversation_info.xml
+++ b/app/src/main/res/layout/activity_conversation_info.xml
@@ -86,7 +86,9 @@
 
                 <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent">
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/standard_margin"
+                    android:layout_marginEnd="@dimen/standard_margin">
 
                     <ImageView
                         android:id="@+id/avatar_image"
@@ -104,6 +106,7 @@
                         android:layout_below="@id/avatar_image"
                         android:layout_centerHorizontal="true"
                         android:layout_marginTop="@dimen/margin_between_elements"
+                        android:textSize="@dimen/headline_text_size"
                         tools:text="Jane Doe" />
 
                 </RelativeLayout>
@@ -124,9 +127,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerHorizontal="true"
-                    android:layout_margin="@dimen/standard_half_margin"
+                    android:layout_marginTop="@dimen/standard_half_margin"
+                    android:layout_marginBottom="@dimen/standard_half_margin"
+                    android:layout_marginStart="@dimen/standard_margin"
+                    android:layout_marginEnd="@dimen/standard_margin"
                     android:autoLink="web"
-                    android:padding="@dimen/standard_half_padding"
                     tools:text="Hello world!" />
             </com.google.android.material.card.MaterialCardView>
 
@@ -223,7 +228,6 @@
                         android:textStyle="bold"
                         android:padding="@dimen/standard_padding"/>
 
-
                     <com.google.android.material.card.MaterialCardView
                         android:id="@+id/shared_items_button"
                         android:layout_width="match_parent"
@@ -254,7 +258,6 @@
                         </LinearLayout>
                     </com.google.android.material.card.MaterialCardView>
 
-
                 </LinearLayout>
 
             </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_guest_access_settings.xml b/app/src/main/res/layout/item_guest_access_settings.xml
index f70242833c8..aac1979b483 100644
--- a/app/src/main/res/layout/item_guest_access_settings.xml
+++ b/app/src/main/res/layout/item_guest_access_settings.xml
@@ -2,9 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/guest_access_settings"
@@ -13,52 +13,54 @@
         android:elevation="0dp">
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            >
+            android:orientation="vertical">
 
             <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/guest_access_settings_category"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/standard_margin"
+                android:layout_marginEnd="@dimen/standard_margin"
+                android:paddingTop="@dimen/standard_padding"
+                android:paddingBottom="@dimen/standard_half_padding"
                 android:text="@string/nc_guest_access"
-                android:textSize="@dimen/md_title_textsize"
                 android:textColor="@color/colorPrimary"
-                android:textStyle="bold"
-                android:padding="@dimen/standard_padding"/>
+                android:textStyle="bold" />
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/guest_access_settings_allow_guest"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_quarter_margin"
-                android:layout_marginLeft="@dimen/standard_margin"
-                >
+                android:layout_marginTop="@dimen/standard_quarter_margin">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="horizontal"
-                    android:padding="@dimen/standard_half_padding">
+                    android:layout_marginStart="@dimen/standard_margin"
+                    android:layout_marginTop="@dimen/standard_half_margin"
+                    android:layout_marginEnd="@dimen/standard_margin"
+                    android:layout_marginBottom="@dimen/standard_half_margin"
+                    android:orientation="horizontal">
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:layout_marginRight="@dimen/standard_half_margin"
-                        android:layout_weight="1">
+                        android:layout_weight="1"
+                        android:orientation="vertical">
 
                         <com.google.android.material.textview.MaterialTextView
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:text="@string/nc_guest_access_allow_title"
-
-                            android:textSize="@dimen/two_line_primary_text_size"/>
+                            android:textSize="@dimen/headline_text_size" />
 
                         <com.google.android.material.textview.MaterialTextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:hint="@string/nc_guest_access_allow_summary" />
+                            android:hint="@string/nc_guest_access_allow_summary"
+                            android:textSize="@dimen/supporting_text_text_size" />
 
                     </LinearLayout>
 
@@ -67,7 +69,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        />
+                        android:layout_marginStart="@dimen/standard_margin" />
 
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
@@ -75,16 +77,16 @@
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/guest_access_settings_password_protection"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_quarter_margin"
-                android:layout_marginLeft="@dimen/standard_margin"
-                >
+                android:layout_height="wrap_content">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/standard_margin"
+                    android:layout_marginTop="@dimen/standard_half_margin"
+                    android:layout_marginEnd="@dimen/standard_margin"
+                    android:layout_marginBottom="@dimen/standard_half_margin"
                     android:orientation="horizontal"
-                    android:padding="@dimen/standard_half_padding"
                     android:visibility="gone"
                     tools:visibility="visible">
 
@@ -95,17 +97,16 @@
                         android:orientation="vertical">
 
                         <com.google.android.material.textview.MaterialTextView
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:text="@string/nc_guest_access_password_title"
-
-                            android:textSize="@dimen/two_line_primary_text_size" />
+                            android:textSize="@dimen/headline_text_size" />
 
                         <com.google.android.material.textview.MaterialTextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginRight="@dimen/standard_half_margin"
-                            android:hint="@string/nc_guest_access_password_summary" />
+                            android:hint="@string/nc_guest_access_password_summary"
+                            android:textSize="@dimen/supporting_text_text_size" />
 
                     </LinearLayout>
 
@@ -113,7 +114,8 @@
                         android:id="@+id/password_protection_switch"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical" />
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="@dimen/standard_margin" />
 
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
@@ -121,39 +123,39 @@
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/share_conversation_button"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_quarter_margin"
-                >
+                android:layout_height="wrap_content">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/standard_margin"
+                    android:layout_marginTop="@dimen/standard_half_margin"
+                    android:layout_marginEnd="@dimen/standard_margin"
+                    android:layout_marginBottom="@dimen/standard_half_margin"
                     android:orientation="horizontal"
-                    android:padding="@dimen/standard_half_padding"
                     android:visibility="gone"
                     tools:visibility="visible">
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:orientation="horizontal">
 
-                        <com.google.android.material.button.MaterialButton
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@color/transparent"
-                            app:icon="@drawable/ic_share_variant"
-                            app:iconGravity="textStart"
-                            app:iconSize="@dimen/sm_icon_height"
-                            app:iconTint="@color/grey_600" />
+                        <ImageView
+                            android:layout_width="24dp"
+                            android:layout_height="40dp"
+                            android:layout_marginEnd="@dimen/standard_margin"
+                            android:contentDescription="@null"
+                            android:src="@drawable/ic_share_variant"
+                            app:tint="@color/grey_600" />
 
                         <com.google.android.material.textview.MaterialTextView
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:gravity="center_vertical"
                             android:text="@string/nc_guest_access_share_link"
-                            android:textSize="@dimen/two_line_primary_text_size" />
+                            android:textSize="@dimen/headline_text_size" />
 
 
                     </LinearLayout>
@@ -163,39 +165,39 @@
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/resend_invitations_button"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_quarter_margin"
-                >
+                android:layout_height="wrap_content">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/standard_margin"
+                    android:layout_marginTop="@dimen/standard_half_margin"
+                    android:layout_marginEnd="@dimen/standard_margin"
+                    android:layout_marginBottom="@dimen/standard_half_margin"
                     android:orientation="horizontal"
-                    android:padding="@dimen/standard_half_padding"
                     android:visibility="gone"
                     tools:visibility="visible">
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:orientation="horizontal">
 
-                        <com.google.android.material.button.MaterialButton
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@color/transparent"
-                            app:icon="@drawable/ic_email"
-                            app:iconGravity="textStart"
-                            app:iconSize="@dimen/sm_icon_height"
-                            app:iconTint="@color/grey_600" />
+                        <ImageView
+                            android:layout_width="24dp"
+                            android:layout_height="40dp"
+                            android:layout_marginEnd="@dimen/standard_margin"
+                            android:contentDescription="@null"
+                            android:src="@drawable/ic_email"
+                            app:tint="@color/grey_600" />
 
                         <com.google.android.material.textview.MaterialTextView
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:gravity="center_vertical"
                             android:text="@string/nc_guest_access_resend_invitations"
-                            android:textSize="@dimen/two_line_primary_text_size" />
+                            android:textSize="@dimen/headline_text_size" />
 
 
                     </LinearLayout>
@@ -203,7 +205,6 @@
             </com.google.android.material.card.MaterialCardView>
 
 
-
         </LinearLayout>
 
     </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_notification_settings.xml b/app/src/main/res/layout/item_notification_settings.xml
index c215b833ab9..5b3309fe72f 100644
--- a/app/src/main/res/layout/item_notification_settings.xml
+++ b/app/src/main/res/layout/item_notification_settings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/notification_settings"
@@ -12,51 +12,53 @@
         android:elevation="0dp">
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            >
+            android:orientation="vertical">
 
             <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/notification_settings_category"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/standard_margin"
+                android:layout_marginEnd="@dimen/standard_margin"
+                android:paddingTop="@dimen/standard_padding"
+                android:paddingBottom="@dimen/standard_half_padding"
                 android:text="@string/nc_notification_settings"
-                android:textSize="@dimen/md_title_textsize"
                 android:textColor="@color/colorPrimary"
-                android:textStyle="bold"
-                android:padding="@dimen/standard_padding"/>
+                android:textStyle="bold" />
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/notification_settings_important_conversation"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_quarter_margin"
-                android:layout_marginLeft="@dimen/standard_margin"
-                >
+                android:layout_height="wrap_content">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="horizontal"
-                    android:padding="@dimen/standard_half_padding">
+                    android:layout_marginStart="@dimen/standard_margin"
+                    android:layout_marginTop="@dimen/standard_half_margin"
+                    android:layout_marginEnd="@dimen/standard_margin"
+                    android:layout_marginBottom="@dimen/standard_half_margin"
+                    android:orientation="horizontal">
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:layout_weight="1">
+                        android:layout_weight="1"
+                        android:orientation="vertical">
 
                         <com.google.android.material.textview.MaterialTextView
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:text="@string/nc_important_conversation"
-                            android:textSize="@dimen/two_line_primary_text_size"/>
+                            android:textSize="@dimen/headline_text_size" />
 
                         <com.google.android.material.textview.MaterialTextView
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginRight="@dimen/standard_half_margin"
-                            android:hint="@string/nc_important_conversation_desc" />
+                            android:hint="@string/nc_important_conversation_desc"
+                            android:textSize="@dimen/supporting_text_text_size" />
 
                     </LinearLayout>
 
@@ -65,7 +67,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        />
+                        android:layout_marginStart="@dimen/standard_margin" />
 
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
@@ -75,10 +77,12 @@
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/standard_half_margin"
+                android:layout_marginStart="@dimen/standard_margin"
+                android:layout_marginTop="@dimen/standard_half_margin"
+                android:layout_marginEnd="@dimen/standard_margin"
+                android:layout_marginBottom="@dimen/standard_half_margin"
                 android:hint="@string/nc_plain_old_messages"
-                app:boxStrokeWidth="@dimen/zero"
-                >
+                app:boxStrokeWidth="1dp">
 
                 <com.google.android.material.textfield.MaterialAutoCompleteTextView
                     android:id="@+id/conversation_info_message_notifications_dropdown"
@@ -87,7 +91,7 @@
                     android:inputType="none"
                     android:lines="1"
                     android:popupTheme="@style/ThemeOverlay.AppTheme.PopupMenu"
-                    android:text=""/>
+                    android:text="" />
 
 
             </com.google.android.material.textfield.TextInputLayout>
@@ -95,37 +99,35 @@
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/notification_settings_call_notifications"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_quarter_margin"
-                android:layout_marginLeft="@dimen/standard_margin"
-                >
+                android:layout_height="56dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:orientation="horizontal"
-                    android:padding="@dimen/standard_half_padding">
+                    android:paddingTop="@dimen/standard_half_padding"
+                    android:paddingBottom="@dimen/standard_half_padding"
+                    android:layout_marginStart="@dimen/standard_margin"
+                    android:layout_marginEnd="@dimen/standard_margin">
 
-                        <com.google.android.material.textview.MaterialTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/nc_call_notifications"
-                            android:textSize="@dimen/two_line_primary_text_size"/>
+                    <com.google.android.material.textview.MaterialTextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/nc_call_notifications"
+                        android:textSize="@dimen/headline_text_size" />
 
                     <com.google.android.material.materialswitch.MaterialSwitch
                         android:id="@+id/call_notifications_switch"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:checked="true"
-                        android:layout_weight="1"
-                        />
+                        android:layout_marginStart="@dimen/standard_margin"
+                        android:checked="true" />
 
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
 
 
-
-
         </LinearLayout>
 
     </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_webinar_info.xml b/app/src/main/res/layout/item_webinar_info.xml
index 810ed20c34c..5ba5785329c 100644
--- a/app/src/main/res/layout/item_webinar_info.xml
+++ b/app/src/main/res/layout/item_webinar_info.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/webinar_settings"
@@ -12,54 +12,56 @@
         android:elevation="0dp">
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            >
+            android:orientation="vertical">
 
             <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/webinar_settings_category"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/standard_margin"
+                android:layout_marginEnd="@dimen/standard_margin"
+                android:paddingTop="@dimen/standard_padding"
+                android:paddingBottom="@dimen/standard_half_padding"
                 android:text="@string/nc_webinar"
-                android:textSize="@dimen/md_title_textsize"
                 android:textColor="@color/colorPrimary"
-                android:textStyle="bold"
-                android:padding="@dimen/standard_padding"/>
+                android:textStyle="bold" />
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/webinar_settings_lobby"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_quarter_margin"
-                >
+                android:layout_height="wrap_content">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="horizontal"
-                    android:padding="@dimen/standard_half_padding">
+                    android:layout_marginStart="@dimen/standard_margin"
+                    android:layout_marginEnd="@dimen/standard_margin"
+                    android:orientation="horizontal">
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:layout_weight="1">
-
-                        <com.google.android.material.button.MaterialButton
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@color/transparent"
-                            app:iconTint="@color/grey_600"
-                            app:iconSize="@dimen/sm_icon_height"
-                            app:icon="@drawable/ic_room_service_black_24dp"
-                            app:iconGravity="textStart"/>
+                        android:layout_marginTop="@dimen/standard_half_margin"
+                        android:layout_marginBottom="@dimen/standard_half_margin"
+                        android:layout_weight="1"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:layout_width="24dp"
+                            android:layout_height="40dp"
+                            android:layout_marginEnd="@dimen/standard_margin"
+                            android:contentDescription="@null"
+                            android:src="@drawable/ic_room_service_black_24dp"
+                            app:tint="@color/grey_600" />
 
                         <com.google.android.material.textview.MaterialTextView
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
+                            android:gravity="center_vertical"
                             android:text="@string/nc_lobby"
-                            android:textSize="@dimen/two_line_primary_text_size"
-                            android:gravity="center_vertical"/>
+                            android:textSize="@dimen/headline_text_size" />
 
 
                     </LinearLayout>
@@ -67,10 +69,11 @@
                     <com.google.android.material.materialswitch.MaterialSwitch
                         android:id="@+id/lobby_switch"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_gravity="center_vertical"
-                        android:checked="true"
-                        />
+                        android:layout_marginStart="@dimen/standard_margin"
+                        android:layout_marginEnd="1dp"
+                        android:checked="true" />
 
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
@@ -78,45 +81,46 @@
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/start_time_button"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_quarter_margin"
-                >
+                android:layout_height="wrap_content">
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal"
-                    android:padding="@dimen/standard_half_padding">
-
-                    <com.google.android.material.button.MaterialButton
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@color/transparent"
-                        app:iconTint="@color/grey_600"
-                        app:iconSize="@dimen/sm_icon_height"
-                        app:icon="@drawable/ic_timer_black_24dp"
-                        app:iconGravity="textStart"/>
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/standard_margin"
+                    android:layout_marginTop="@dimen/standard_half_margin"
+                    android:layout_marginEnd="@dimen/standard_margin"
+                    android:layout_marginBottom="@dimen/standard_half_margin"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="56dp"
+                        android:layout_marginEnd="@dimen/standard_margin"
+                        android:contentDescription="@null"
+                        android:src="@drawable/ic_timer_black_24dp"
+                        app:tint="@color/grey_600" />
 
                     <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:layout_weight="1">
+                        android:layout_weight="1"
+                        android:orientation="vertical">
 
                         <com.google.android.material.textview.MaterialTextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_gravity="start"
                             android:text="@string/nc_start_time"
-                            android:textSize="@dimen/two_line_primary_text_size"
-                            android:layout_gravity="start"/>
+                            android:textSize="@dimen/headline_text_size" />
 
                         <com.google.android.material.textview.MaterialTextView
                             android:id="@+id/start_time_button_summary"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_gravity="start"
                             android:hint="@string/nc_manual"
-                            android:textSize="@dimen/two_line_primary_text_size"
-                            android:layout_gravity="start"/>
+                            android:textSize="@dimen/supporting_text_text_size" />
 
 
                     </LinearLayout>
@@ -125,8 +129,6 @@
             </com.google.android.material.card.MaterialCardView>
 
 
-
-
         </LinearLayout>
 
     </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 149b0be4ba1..d5c617524e5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -52,6 +52,8 @@
     <dimen name="button_corner_radius">24dp</dimen>
     <dimen name="standard_margin">16dp</dimen>
     <dimen name="two_line_primary_text_size">16sp</dimen>
+    <dimen name="headline_text_size">16sp</dimen>
+    <dimen name="supporting_text_text_size">14sp</dimen>
     <dimen name="iconized_single_line_item_layout_height">56dp</dimen>
     <dimen name="iconized_single_line_item_icon_size">24dp</dimen>
     <dimen name="standard_double_margin">32dp</dimen>