diff --git a/app/src/main/res/layout/fragment_options_notifications.xml b/app/src/main/res/layout/fragment_options_notifications.xml
index efaf1f190e..2348b89edc 100644
--- a/app/src/main/res/layout/fragment_options_notifications.xml
+++ b/app/src/main/res/layout/fragment_options_notifications.xml
@@ -194,10 +194,10 @@
                     android:layout_marginTop="12dp"
                     android:drawableEnd="@drawable/twotone_open_in_new_12"
                     android:drawablePadding="6dp"
-                    app:drawableTint="?android:attr/textColorLink"
                     android:text="@string/title_advanced_notify_separate_hint"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textColor="?android:attr/textColorLink"
+                    app:drawableTint="?android:attr/textColorLink"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/ibWhy" />
 
@@ -236,19 +236,46 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swNotifySummary" />
 
+                <TextView
+                    android:id="@+id/tvNotifyActionsHint"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/title_advanced_notify_action_hint"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textStyle="italic"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tvNotifyActions" />
+
+                <TextView
+                    android:id="@+id/tvNotifyActionsPro"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/title_pro_feature"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textColor="?android:attr/textColorLink"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tvNotifyActionsHint" />
+
                 <CheckBox
                     android:id="@+id/cbNotifyActionTrash"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="6dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="12dp"
                     android:text="@string/title_advanced_notify_action_trash"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvNotifyActions" />
+                    app:layout_constraintTop_toBottomOf="@id/tvNotifyActionsPro" />
 
                 <CheckBox
                     android:id="@+id/cbNotifyActionJunk"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
                     android:text="@string/title_advanced_notify_action_junk"
                     app:layout_constraintStart_toStartOf="parent"
@@ -258,7 +285,7 @@
                     android:id="@+id/cbNotifyActionBlockSender"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
+                    android:layout_marginStart="48dp"
                     android:layout_marginTop="6dp"
                     android:text="@string/title_block_sender"
                     app:layout_constraintStart_toStartOf="parent"
@@ -268,6 +295,7 @@
                     android:id="@+id/cbNotifyActionArchive"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
                     android:text="@string/title_advanced_notify_action_archive"
                     app:layout_constraintStart_toStartOf="parent"
@@ -277,6 +305,7 @@
                     android:id="@+id/cbNotifyActionMove"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
                     android:text="@string/title_advanced_notify_action_move"
                     app:layout_constraintStart_toStartOf="parent"
@@ -286,6 +315,7 @@
                     android:id="@+id/tvNotifyActionMoveHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginEnd="48dp"
                     android:text="@string/title_advanced_move_hint"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
@@ -298,6 +328,7 @@
                     android:id="@+id/cbNotifyActionReply"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
                     android:text="@string/title_advanced_notify_action_reply"
                     app:layout_constraintStart_toStartOf="parent"
@@ -307,6 +338,7 @@
                     android:id="@+id/cbNotifyActionReplyDirect"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
                     android:text="@string/title_advanced_notify_action_reply_direct"
                     app:layout_constraintStart_toStartOf="parent"
@@ -316,6 +348,7 @@
                     android:id="@+id/cbNotifyActionFlag"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
                     android:text="@string/title_advanced_notify_action_flag"
                     app:layout_constraintStart_toStartOf="parent"
@@ -325,6 +358,7 @@
                     android:id="@+id/cbNotifyActionSeen"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
                     android:text="@string/title_advanced_notify_action_seen"
                     app:layout_constraintStart_toStartOf="parent"
@@ -334,6 +368,7 @@
                     android:id="@+id/cbNotifyActionHide"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
                     android:text="@string/title_advanced_notify_action_hide"
                     app:layout_constraintStart_toStartOf="parent"
@@ -343,36 +378,12 @@
                     android:id="@+id/cbNotifyActionSnooze"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
                     android:text="@string/title_advanced_notify_action_snooze"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/cbNotifyActionHide" />
 
-                <TextView
-                    android:id="@+id/tvNotifyActionsHint"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginEnd="48dp"
-                    android:text="@string/title_advanced_notify_action_hint"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textStyle="italic"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/cbNotifyActionSnooze" />
-
-                <TextView
-                    android:id="@+id/tvNotifyActionsPro"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="48dp"
-                    android:text="@string/title_pro_feature"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textColor="?android:attr/textColorLink"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvNotifyActionsHint" />
-
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/swLight"
                     android:layout_width="0dp"
@@ -381,7 +392,7 @@
                     android:text="@string/title_advanced_light"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvNotifyActionsPro"
+                    app:layout_constraintTop_toBottomOf="@id/cbNotifyActionSnooze"
                     app:switchPadding="12dp" />
 
                 <Button
@@ -458,12 +469,12 @@
                     android:layout_height="wrap_content"
                     android:drawableStart="@drawable/twotone_warning_24"
                     android:drawablePadding="6dp"
-                    app:drawableTint="?attr/colorWarning"
                     android:gravity="center"
                     android:text="@string/title_setup_advanced"
                     android:textAppearance="@style/TextAppearance.AppCompat.Large"
                     android:textColor="?attr/colorWarning"
                     android:textStyle="bold"
+                    app:drawableTint="?attr/colorWarning"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />