diff --git a/app/src/main/res/layout/fragment_legend_compose.xml b/app/src/main/res/layout/fragment_legend_compose.xml
index da2a8d06cc..421abe0bfc 100644
--- a/app/src/main/res/layout/fragment_legend_compose.xml
+++ b/app/src/main/res/layout/fragment_legend_compose.xml
@@ -18,21 +18,22 @@
android:layout_height="wrap_content"
android:contentDescription="@string/title_legend_pick"
android:padding="12dp"
+ app:layout_constraintBottom_toBottomOf="@+id/tvPick"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/tvPick"
app:srcCompat="@drawable/twotone_person_add_24" />
+ app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toBottomOf="@id/tvPick" />
+ app:layout_constraintTop_toBottomOf="@id/tvCC" />
+ app:layout_constraintTop_toBottomOf="@id/tvLink" />
+ app:layout_constraintTop_toBottomOf="@id/tvFile" />
+ app:layout_constraintTop_toBottomOf="@id/tvPicture" />
+ app:layout_constraintTop_toBottomOf="@id/tvPhoto" />
+ app:layout_constraintTop_toBottomOf="@id/tvAudio" />
+ app:layout_constraintTop_toBottomOf="@id/tvBold" />
+ app:layout_constraintTop_toBottomOf="@id/tvItalic" />
+ app:layout_constraintTop_toBottomOf="@id/tvUnderline" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_legend_folders.xml b/app/src/main/res/layout/fragment_legend_folders.xml
index 6fd738c2ba..532ec8ebc3 100644
--- a/app/src/main/res/layout/fragment_legend_folders.xml
+++ b/app/src/main/res/layout/fragment_legend_folders.xml
@@ -18,21 +18,22 @@
android:layout_height="wrap_content"
android:contentDescription="@string/title_legend_unified"
android:padding="12dp"
+ app:layout_constraintBottom_toBottomOf="@+id/tvUnified"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/tvUnified"
app:srcCompat="@drawable/twotone_folder_special_24" />
+ app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toBottomOf="@id/tvUnified" />
+ app:layout_constraintTop_toBottomOf="@id/tvInbox" />
+ app:layout_constraintTop_toBottomOf="@id/tvDrafts" />
+ app:layout_constraintTop_toBottomOf="@id/tvSent" />
+ app:layout_constraintTop_toBottomOf="@id/tvArchive" />
+ app:layout_constraintTop_toBottomOf="@id/tvTrash" />
+ app:layout_constraintTop_toBottomOf="@id/tvJunk" />
+ app:layout_constraintTop_toBottomOf="@id/tvPrimary" />
+ app:layout_constraintTop_toBottomOf="@id/tvSubscribed" />
+ app:layout_constraintTop_toBottomOf="@id/tvRule" />
+ app:layout_constraintTop_toBottomOf="@id/tvNotify" />
+ app:layout_constraintTop_toBottomOf="@id/tvSyncKeepLegend" />
diff --git a/app/src/main/res/layout/fragment_legend_keyboard.xml b/app/src/main/res/layout/fragment_legend_keyboard.xml
index 85164aff41..041ce89435 100644
--- a/app/src/main/res/layout/fragment_legend_keyboard.xml
+++ b/app/src/main/res/layout/fragment_legend_keyboard.xml
@@ -20,21 +20,22 @@
android:text="Enter"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorPrimary"
+ app:layout_constraintBottom_toBottomOf="@+id/tvOpen"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/tvOpen"
app:srcCompat="@drawable/twotone_person_add_24" />
+ app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="@id/tvArchive" />
+ app:layout_constraintTop_toBottomOf="@id/tvOpen" />
+ app:layout_constraintTop_toTopOf="@id/tvCompose" />
+ app:layout_constraintTop_toBottomOf="@id/tvArchive" />
+ app:layout_constraintTop_toTopOf="@id/tvTrash" />
+ app:layout_constraintTop_toBottomOf="@id/tvCompose" />
+ app:layout_constraintTop_toTopOf="@id/tvMenu" />
+ app:layout_constraintTop_toBottomOf="@id/tvTrash" />
+ app:layout_constraintTop_toTopOf="@id/tvNext" />
+ app:layout_constraintTop_toBottomOf="@id/tvMenu" />
+ app:layout_constraintTop_toTopOf="@id/tvPrevious" />
+ app:layout_constraintTop_toBottomOf="@id/tvNext" />
+ app:layout_constraintTop_toTopOf="@id/tvReply" />
+ app:layout_constraintTop_toBottomOf="@id/tvPrevious" />
+ app:layout_constraintTop_toTopOf="@id/tvSelect" />
+ app:layout_constraintTop_toBottomOf="@id/tvReply" />
+ app:layout_constraintTop_toTopOf="@id/tvFocus" />
+ app:layout_constraintTop_toBottomOf="@id/tvSelect" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_legend_messages.xml b/app/src/main/res/layout/fragment_legend_messages.xml
index 2d5cdfd217..c8aaab5235 100644
--- a/app/src/main/res/layout/fragment_legend_messages.xml
+++ b/app/src/main/res/layout/fragment_legend_messages.xml
@@ -18,21 +18,22 @@
android:layout_height="wrap_content"
android:contentDescription="@string/title_legend_thread"
android:padding="12dp"
+ app:layout_constraintBottom_toBottomOf="@+id/tvThread"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/tvThread"
app:srcCompat="@drawable/twotone_message_24" />
+ app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toBottomOf="@id/tvThread" />
+ app:layout_constraintTop_toBottomOf="@id/tvBookmark" />
+ app:layout_constraintTop_toBottomOf="@id/tvZoom" />
+ app:layout_constraintTop_toBottomOf="@id/tvDraft" />
+ app:layout_constraintTop_toBottomOf="@id/tvAuth" />
+ app:layout_constraintTop_toBottomOf="@id/tvHighPriority" />
+ app:layout_constraintTop_toBottomOf="@id/tvLowPriority" />
+ app:layout_constraintTop_toBottomOf="@id/tvHighImportance" />
+ app:layout_constraintTop_toBottomOf="@id/tvLowImportance" />
+ app:layout_constraintTop_toBottomOf="@id/tvSigned" />
+ app:layout_constraintTop_toBottomOf="@id/tvEncrypted" />
+ app:layout_constraintTop_toBottomOf="@id/tvClassified" />
+ app:layout_constraintTop_toBottomOf="@id/tvSnoozed" />
+ app:layout_constraintTop_toBottomOf="@id/tvAnswered" />
+ app:layout_constraintTop_toBottomOf="@id/tvForwarded" />
+ app:layout_constraintTop_toBottomOf="@id/tvPlain" />
+ app:layout_constraintTop_toBottomOf="@id/tvReceiptType" />
+ app:layout_constraintTop_toBottomOf="@id/tvAutoSubmitted" />
+ app:layout_constraintTop_toBottomOf="@id/tvBrowsed" />
+ app:layout_constraintTop_toBottomOf="@id/tvAttachment" />
+ app:layout_constraintTop_toBottomOf="@id/tvStarred" />
+ app:layout_constraintTop_toBottomOf="@id/tvSearch" />
+ app:layout_constraintTop_toBottomOf="@id/tvPin" />
+ app:layout_constraintTop_toBottomOf="@id/tvContacts" />
+ app:layout_constraintTop_toBottomOf="@id/tvView" />
+ app:layout_constraintTop_toBottomOf="@id/tvHide" />
+ app:layout_constraintTop_toBottomOf="@id/tvDownload" />
+ app:layout_constraintTop_toBottomOf="@id/tvRule" />
+ app:layout_constraintTop_toBottomOf="@id/tvUnsubscribe" />
+ app:layout_constraintTop_toBottomOf="@id/tvOriginal" />
+ app:layout_constraintTop_toBottomOf="@id/tvReformatted" />
+ app:layout_constraintTop_toBottomOf="@id/tvExternalImage" />
+ app:layout_constraintTop_toBottomOf="@id/tvEmbeddedImage" />
+ app:layout_constraintTop_toBottomOf="@id/tvTrackingPixel" />
+ app:layout_constraintTop_toBottomOf="@id/tvBrokenImage" />
diff --git a/app/src/main/res/layout/fragment_legend_synchronization.xml b/app/src/main/res/layout/fragment_legend_synchronization.xml
index c3364a8718..77f29dfa96 100644
--- a/app/src/main/res/layout/fragment_legend_synchronization.xml
+++ b/app/src/main/res/layout/fragment_legend_synchronization.xml
@@ -18,6 +18,7 @@
android:layout_height="wrap_content"
android:contentDescription="@string/title_legend_oauth"
android:padding="12dp"
+ app:layout_constraintBottom_toBottomOf="@+id/tvOauth"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/twotone_security_24" />
@@ -25,14 +26,14 @@
+ app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toBottomOf="@id/tvOauth" />
+ app:layout_constraintTop_toBottomOf="@id/tvPrimaryConnected" />
+ app:layout_constraintTop_toBottomOf="@id/tvPrimaryDisconnected" />
+ app:layout_constraintTop_toBottomOf="@id/tvDownloadOn" />
+ app:layout_constraintTop_toBottomOf="@id/tvDownloadOff" />
+ app:layout_constraintTop_toBottomOf="@id/tvSynchronize" />
+ app:layout_constraintTop_toBottomOf="@id/tvSynchronizeOff" />
+ app:layout_constraintTop_toBottomOf="@id/tvSynchronizePoll" />
+ app:layout_constraintTop_toBottomOf="@id/tvDisconnected" />
+ app:layout_constraintTop_toBottomOf="@id/tvConnecting" />
+ app:layout_constraintTop_toBottomOf="@id/tvConnected" />
+ app:layout_constraintTop_toBottomOf="@id/tvBackoff" />
+ app:layout_constraintTop_toBottomOf="@id/tvQuota" />
+ app:layout_constraintTop_toBottomOf="@id/tvExecuting" />
+ app:layout_constraintTop_toBottomOf="@id/tvSynchronizing" />
+ app:layout_constraintTop_toBottomOf="@id/tvDownloading" />