diff --git a/app/src/main/res/layout/fragment_legend.xml b/app/src/main/res/layout/fragment_legend.xml
index 93e0d98757..58e57d58de 100644
--- a/app/src/main/res/layout/fragment_legend.xml
+++ b/app/src/main/res/layout/fragment_legend.xml
@@ -29,48 +29,6 @@
             app:layout_constraintStart_toEndOf="@id/ivInbox"
             app:layout_constraintTop_toTopOf="@id/ivInbox" />
 
-        <ImageView
-            android:id="@+id/ivNotify"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginTop="24dp"
-            android:src="@drawable/baseline_notifications_24"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivInbox" />
-
-        <TextView
-            android:id="@+id/tvNotify"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
-            android:text="@string/title_legend_notify"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivNotify"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/ivNotify"
-            app:layout_constraintTop_toTopOf="@id/ivNotify" />
-
-        <ImageView
-            android:id="@+id/ivUnified"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginTop="24dp"
-            android:src="@drawable/baseline_folder_special_24"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivNotify" />
-
-        <TextView
-            android:id="@+id/tvUnified"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
-            android:text="@string/title_legend_unified"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivUnified"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/ivUnified"
-            app:layout_constraintTop_toTopOf="@id/ivUnified" />
-
         <ImageView
             android:id="@+id/ivArchive"
             android:layout_width="24dp"
@@ -78,7 +36,7 @@
             android:layout_marginTop="24dp"
             android:src="@drawable/baseline_archive_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivUnified" />
+            app:layout_constraintTop_toBottomOf="@id/ivInbox" />
 
         <TextView
             android:id="@+id/tvArchive"
@@ -134,6 +92,48 @@
             app:layout_constraintStart_toEndOf="@id/ivJunk"
             app:layout_constraintTop_toTopOf="@id/ivJunk" />
 
+        <ImageView
+            android:id="@+id/ivNotify"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="24dp"
+            android:src="@drawable/baseline_notifications_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ivJunk" />
+
+        <TextView
+            android:id="@+id/tvNotify"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:text="@string/title_legend_notify"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="@id/ivNotify"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/ivNotify"
+            app:layout_constraintTop_toTopOf="@id/ivNotify" />
+
+        <ImageView
+            android:id="@+id/ivUnified"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="24dp"
+            android:src="@drawable/baseline_folder_special_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ivNotify" />
+
+        <TextView
+            android:id="@+id/tvUnified"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:text="@string/title_legend_unified"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="@id/ivUnified"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/ivUnified"
+            app:layout_constraintTop_toTopOf="@id/ivUnified" />
+
         <ImageView
             android:id="@+id/ivPrimaryDisconnected"
             android:layout_width="24dp"
@@ -141,7 +141,7 @@
             android:layout_marginTop="24dp"
             android:src="@drawable/baseline_folder_open_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivJunk" />
+            app:layout_constraintTop_toBottomOf="@id/ivUnified" />
 
         <TextView
             android:id="@+id/tvPrimaryDisconnected"
@@ -176,6 +176,15 @@
             app:layout_constraintStart_toEndOf="@id/ivPrimaryConnected"
             app:layout_constraintTop_toTopOf="@id/ivPrimaryConnected" />
 
+        <View
+            android:id="@+id/vSeparatorFolder"
+            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/ivPrimaryConnected" />
+
         <ImageView
             android:id="@+id/ivThread"
             android:layout_width="24dp"
@@ -183,7 +192,7 @@
             android:layout_marginTop="24dp"
             android:src="@drawable/baseline_message_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivPrimaryConnected" />
+            app:layout_constraintTop_toBottomOf="@id/vSeparatorFolder" />
 
         <TextView
             android:id="@+id/tvThread"
@@ -324,6 +333,27 @@
             app:layout_constraintStart_toEndOf="@id/ivAttachment"
             app:layout_constraintTop_toTopOf="@id/ivAttachment" />
 
+        <ImageView
+            android:id="@+id/ivStarred"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="24dp"
+            android:src="@drawable/baseline_star_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvAttachment" />
+
+        <TextView
+            android:id="@+id/tvStarred"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="18dp"
+            android:text="@string/title_legend_flagged"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="@id/ivStarred"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/ivStarred"
+            app:layout_constraintTop_toTopOf="@id/ivStarred" />
+
         <ImageView
             android:id="@+id/ivContacts"
             android:layout_width="24dp"
@@ -331,7 +361,7 @@
             android:layout_marginTop="24dp"
             android:src="@drawable/baseline_import_contacts_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivAttachment" />
+            app:layout_constraintTop_toBottomOf="@id/ivStarred" />
 
         <TextView
             android:id="@+id/tvContacts"
@@ -450,6 +480,15 @@
             app:layout_constraintStart_toEndOf="@id/ivBrokenImage"
             app:layout_constraintTop_toTopOf="@id/ivBrokenImage" />
 
+        <View
+            android:id="@+id/vSeparatorMessage"
+            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/ivBrokenImage" />
+
         <ImageView
             android:id="@+id/ivDownloadOff"
             android:layout_width="24dp"
@@ -457,7 +496,7 @@
             android:layout_marginTop="24dp"
             android:src="@drawable/baseline_mail_outline_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivBrokenImage" />
+            app:layout_constraintTop_toBottomOf="@id/vSeparatorMessage" />
 
         <TextView
             android:id="@+id/tvDownloadOff"
@@ -681,6 +720,15 @@
             app:layout_constraintStart_toEndOf="@id/ivClosing"
             app:layout_constraintTop_toTopOf="@id/ivClosing" />
 
+        <View
+            android:id="@+id/vSeparatorSync"
+            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/ivClosing" />
+
         <ImageView
             android:id="@+id/ivStop"
             android:layout_width="24dp"
@@ -688,7 +736,7 @@
             android:layout_marginTop="24dp"
             android:src="@drawable/baseline_stop_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvClosing" />
+            app:layout_constraintTop_toBottomOf="@id/vSeparatorSync" />
 
         <TextView
             android:id="@+id/tvStop"
@@ -702,6 +750,15 @@
             app:layout_constraintStart_toEndOf="@id/ivStop"
             app:layout_constraintTop_toTopOf="@id/ivStop" />
 
+        <View
+            android:id="@+id/vSeparatorRules"
+            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/ivStop" />
+
         <TextView
             android:id="@+id/tvDownloadFetch"
             android:layout_width="wrap_content"
@@ -712,7 +769,7 @@
             android:textAppearance="@android:style/TextAppearance.Small"
             app:layout_constraintBottom_toBottomOf="@+id/tvDownloadFetchLegend"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvStop" />
+            app:layout_constraintTop_toBottomOf="@id/vSeparatorRules" />
 
         <ImageView
             android:id="@+id/ivDownloadFetch"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b5b34d769b..836a5e60ff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -427,43 +427,49 @@
     <string name="title_action_trash">Trash</string>
 
     <string name="title_legend_inbox">Inbox</string>
-    <string name="title_legend_notify">Notify new messages</string>
-    <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_archive">Archive</string>
     <string name="title_legend_trash">Trash</string>
     <string name="title_legend_junk">Spam</string>
+    <string name="title_legend_notify">Notify new messages</string>
+    <string name="title_legend_unified">Unified inbox</string>
     <string name="title_legend_primary_disconnected">Account disconnected</string>
     <string name="title_legend_primary_connected">Account connected</string>
+
     <string name="title_legend_thread">Conversation</string>
     <string name="title_legend_cc">CC/BCC</string>
-    <string name="title_legend_attachment">Attachment</string>
     <string name="title_legend_draft">Draft/edit</string>
     <string name="title_legend_snoozed">Snoozed</string>
     <string name="title_legend_browsed">Browsed or searched</string>
     <string name="title_legend_answered">Answered</string>
+    <string name="title_legend_attachment">Attachment</string>
+    <string name="title_legend_flagged">Starred</string>
     <string name="title_legend_contacts">Contacts</string>
     <string name="title_legend_view">View content</string>
     <string name="title_legend_download">Download content</string>
     <string name="title_legend_external_image">External image placeholder</string>
     <string name="title_legend_embedded_image">Embedded image placeholder</string>
     <string name="title_legend_broken_image">Broken image</string>
+
     <string name="title_legend_download_off">Download message content on demand </string>
     <string name="title_legend_download_on">Download message content automatically</string>
     <string name="title_legend_synchronize_on">Synchronize on</string>
     <string name="title_legend_synchronize_off">Synchronize off</string>
-    <string name="title_legend_primary">Primary/starred</string>
+    <string name="title_legend_primary">Primary</string>
     <string name="title_legend_disconnected">Disconnected</string>
     <string name="title_legend_connecting">Connecting</string>
     <string name="title_legend_connected">Connected</string>
     <string name="title_legend_synchronizing">Synchronizing</string>
     <string name="title_legend_downloading">Downloading</string>
     <string name="title_legend_closing">Closing</string>
+
     <string name="title_legend_stop">Stop processing rules</string>
-    <string name="title_legend_metered">Connection is metered</string>
-    <string name="title_legend_unmetered">Connection is unmetered</string>
+
     <string name="title_legend_sync_keep">Number of days to synchronize / to keep messages</string>
     <string name="title_legend_download_fetch">Number of message bodies downloaded / headers fetched</string>
 
+    <string name="title_legend_metered">Connection is metered</string>
+    <string name="title_legend_unmetered">Connection is unmetered</string>
+
     <string name="title_hint_folder_actions">Long press for options</string>
     <string name="title_hint_folder_sync">To limit battery and network usage not all folders and not all messages will be synchronized by default</string>
     <string name="title_hint_support">If you have a question or a problem, please use the support menu to get help</string>