diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index 75deb1491d..d84a74af63 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -144,33 +144,45 @@
             tools:ignore="MissingConstraints" />
 
         <ImageButton
-            android:id="@+id/ibKeywords"
+            android:id="@+id/ibNotes"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/twotone_label_important_24"
+            app:srcCompat="@drawable/twotone_sticky_note_2_24"
             tools:ignore="MissingConstraints" />
 
         <ImageButton
-            android:id="@+id/ibLabels"
+            android:id="@+id/ibRule"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/title_legend_create_rule"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/twotone_label_24"
+            android:tooltipText="@string/title_legend_create_rule"
+            app:srcCompat="@drawable/twotone_filter_alt_24"
             tools:ignore="MissingConstraints" />
 
         <ImageButton
-            android:id="@+id/ibNotes"
+            android:id="@+id/ibKeywords"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/twotone_sticky_note_2_24"
+            app:srcCompat="@drawable/twotone_label_important_24"
+            tools:ignore="MissingConstraints" />
+
+        <ImageButton
+            android:id="@+id/ibLabels"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:padding="6dp"
+            android:scaleType="fitCenter"
+            app:srcCompat="@drawable/twotone_label_24"
             tools:ignore="MissingConstraints" />
 
         <ImageButton
@@ -209,18 +221,6 @@
             app:srcCompat="@drawable/twotone_visibility_off_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
-            android:id="@+id/ibTranslate"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/title_translate"
-            android:padding="6dp"
-            android:scaleType="fitCenter"
-            android:tooltipText="@string/title_translate"
-            app:srcCompat="@drawable/twotone_translate_24"
-            tools:ignore="MissingConstraints" />
-
         <ImageButton
             android:id="@+id/ibSearch"
             android:layout_width="36dp"
@@ -245,6 +245,18 @@
             app:srcCompat="@drawable/twotone_manage_search_24"
             tools:ignore="MissingConstraints" />
 
+        <ImageButton
+            android:id="@+id/ibTranslate"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/title_translate"
+            android:padding="6dp"
+            android:scaleType="fitCenter"
+            android:tooltipText="@string/title_translate"
+            app:srcCompat="@drawable/twotone_translate_24"
+            tools:ignore="MissingConstraints" />
+
         <ImageButton
             android:id="@+id/ibEvent"
             android:layout_width="36dp"
@@ -317,18 +329,6 @@
             app:srcCompat="@drawable/twotone_unsubscribe_24"
             tools:ignore="MissingConstraints" />
 
-        <ImageButton
-            android:id="@+id/ibRule"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/title_legend_create_rule"
-            android:padding="6dp"
-            android:scaleType="fitCenter"
-            android:tooltipText="@string/title_legend_create_rule"
-            app:srcCompat="@drawable/twotone_filter_alt_24"
-            tools:ignore="MissingConstraints" />
-
         <ImageButton
             android:id="@+id/ibUndo"
             android:layout_width="36dp"