diff --git a/app/src/main/res/layout/fragment_rule.xml b/app/src/main/res/layout/fragment_rule.xml
index af06183467..10071e5f26 100644
--- a/app/src/main/res/layout/fragment_rule.xml
+++ b/app/src/main/res/layout/fragment_rule.xml
@@ -80,6 +80,15 @@
 
             <!-- condition -->
 
+            <View
+                android:id="@+id/vSeparatorSender"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="24dp"
+                android:background="?attr/colorSeparator"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/cbStop" />
+
             <TextView
                 android:id="@+id/tvSender"
                 android:layout_width="0dp"
@@ -97,10 +106,9 @@
                 android:id="@+id/cbSender"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
                 android:text="@string/title_rule_regex"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/cbStop" />
+                app:layout_constraintTop_toBottomOf="@id/vSeparatorSender" />
 
             <EditText
                 android:id="@+id/etSender"
@@ -114,7 +122,7 @@
                 app:layout_constraintTop_toBottomOf="@id/cbSender" />
 
             <TextView
-                android:id="@+id/tvAndSender"
+                android:id="@+id/tvAndSubject"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
@@ -125,6 +133,14 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/etSender" />
 
+            <View
+                android:id="@+id/vSeparatorSubject"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?attr/colorSeparator"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tvAndSubject" />
+
             <TextView
                 android:id="@+id/tvSubject"
                 android:layout_width="0dp"
@@ -142,10 +158,9 @@
                 android:id="@+id/cbSubject"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
                 android:text="@string/title_rule_regex"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvAndSender" />
+                app:layout_constraintTop_toBottomOf="@id/vSeparatorSubject" />
 
             <EditText
                 android:id="@+id/etSubject"
@@ -159,7 +174,7 @@
                 app:layout_constraintTop_toBottomOf="@id/cbSubject" />
 
             <TextView
-                android:id="@+id/tvAndSubject"
+                android:id="@+id/tvAndHeader"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
@@ -170,6 +185,14 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/etSubject" />
 
+            <View
+                android:id="@+id/vSeparatorHeader"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?attr/colorSeparator"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tvAndHeader" />
+
             <TextView
                 android:id="@+id/tvHeader"
                 android:layout_width="0dp"
@@ -187,10 +210,9 @@
                 android:id="@+id/cbHeader"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
                 android:text="@string/title_rule_regex"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvAndSubject" />
+                app:layout_constraintTop_toBottomOf="@id/vSeparatorHeader" />
 
             <EditText
                 android:id="@+id/etHeader"
@@ -203,15 +225,23 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/cbHeader" />
 
+            <View
+                android:id="@+id/vSeparatorAction"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="24dp"
+                android:background="?attr/colorSeparator"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/etHeader" />
+
             <TextView
                 android:id="@+id/tvAction"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
                 android:text="@string/title_rule_action"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/etHeader" />
+                app:layout_constraintTop_toBottomOf="@+id/vSeparatorAction" />
 
             <Spinner
                 android:id="@+id/spAction"
@@ -221,15 +251,23 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvAction" />
 
+            <View
+                android:id="@+id/vSeparatorParameters"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="24dp"
+                android:background="?attr/colorSeparator"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/spAction" />
+
             <TextView
                 android:id="@+id/tvMoveTarget"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
                 android:text="@string/title_rule_folder"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/spAction" />
+                app:layout_constraintTop_toBottomOf="@+id/vSeparatorParameters" />
 
             <Spinner
                 android:id="@+id/spTarget"
@@ -243,7 +281,6 @@
                 android:id="@+id/tvAnswerIdentity"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
                 android:text="@string/title_rule_identity"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 app:layout_constraintStart_toStartOf="parent"