diff --git a/app/src/main/res/layout/fragment_legend_messages.xml b/app/src/main/res/layout/fragment_legend_messages.xml
index ff8c07d05c..d56afe6cda 100644
--- a/app/src/main/res/layout/fragment_legend_messages.xml
+++ b/app/src/main/res/layout/fragment_legend_messages.xml
@@ -479,48 +479,70 @@
             app:layout_constraintTop_toTopOf="@id/ivStarred" />
 
         <ImageView
-            android:id="@+id/ivContacts"
+            android:id="@+id/ivSearch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/title_legend_contacts"
+            android:contentDescription="@string/title_legend_search"
             android:padding="12dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivStarred"
-            app:srcCompat="@drawable/twotone_import_contacts_24" />
+            app:srcCompat="@drawable/twotone_search_24" />
 
         <eu.faircode.email.FixedTextView
-            android:id="@+id/tvContacts"
+            android:id="@+id/tvSearch"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:gravity="center_vertical"
-            android:text="@string/title_legend_contacts"
+            android:text="@string/title_legend_search"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivContacts"
+            app:layout_constraintBottom_toBottomOf="@id/ivSearch"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/ivContacts"
-            app:layout_constraintTop_toTopOf="@id/ivContacts" />
+            app:layout_constraintStart_toEndOf="@id/ivSearch"
+            app:layout_constraintTop_toTopOf="@id/ivSearch" />
 
         <ImageView
-            android:id="@+id/ivSearch"
+            android:id="@+id/ivPin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/title_legend_search"
+            android:contentDescription="@string/title_pin"
             android:padding="12dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivContacts"
-            app:srcCompat="@drawable/twotone_search_24" />
+            app:layout_constraintTop_toBottomOf="@id/ivSearch"
+            app:srcCompat="@drawable/twotone_person_pin_circle_24" />
 
         <eu.faircode.email.FixedTextView
-            android:id="@+id/tvSearch"
+            android:id="@+id/tvPin"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:gravity="center_vertical"
-            android:text="@string/title_legend_search"
+            android:text="@string/title_pin"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="@id/ivSearch"
+            app:layout_constraintBottom_toBottomOf="@id/ivPin"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/ivSearch"
-            app:layout_constraintTop_toTopOf="@id/ivSearch" />
+            app:layout_constraintStart_toEndOf="@id/ivPin"
+            app:layout_constraintTop_toTopOf="@id/ivPin" />
+
+        <ImageView
+            android:id="@+id/ivContacts"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/title_legend_contacts"
+            android:padding="12dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ivPin"
+            app:srcCompat="@drawable/twotone_import_contacts_24" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvContacts"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:gravity="center_vertical"
+            android:text="@string/title_legend_contacts"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="@id/ivContacts"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/ivContacts"
+            app:layout_constraintTop_toTopOf="@id/ivContacts" />
 
         <ImageView
             android:id="@+id/ivView"
@@ -529,7 +551,7 @@
             android:contentDescription="@string/title_legend_view"
             android:padding="12dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ivSearch"
+            app:layout_constraintTop_toBottomOf="@id/ivContacts"
             app:srcCompat="@drawable/twotone_visibility_24" />
 
         <eu.faircode.email.FixedTextView
diff --git a/app/src/main/res/layout/include_message_addresses.xml b/app/src/main/res/layout/include_message_addresses.xml
index cf0bf1a74c..14eafb0da5 100644
--- a/app/src/main/res/layout/include_message_addresses.xml
+++ b/app/src/main/res/layout/include_message_addresses.xml
@@ -97,7 +97,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="12dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/title_legend_notify"
+        android:contentDescription="@string/title_pin"
         android:tooltipText="@string/title_pin"
         app:layout_constraintEnd_toStartOf="@+id/ibAddContact"
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"