diff --git a/app/src/main/res/layout/include_message_compact.xml b/app/src/main/res/layout/include_message_compact.xml
index 5f54b7157f..e0affffdf6 100644
--- a/app/src/main/res/layout/include_message_compact.xml
+++ b/app/src/main/res/layout/include_message_compact.xml
@@ -204,28 +204,28 @@
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_search_24" />
 
-    <eu.faircode.email.FixedImageView
-        android:id="@+id/ivClassified"
+    <eu.faircode.email.FixedImageButton
+        android:id="@+id/ibSnoozed"
         android:layout_width="21dp"
         android:layout_height="21dp"
         android:layout_marginStart="6dp"
-        android:contentDescription="@string/title_legend_classified"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/title_legend_snoozed"
         app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
         app:layout_constraintStart_toEndOf="@id/ivFound"
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
-        app:srcCompat="@drawable/twotone_push_pin_24" />
+        app:srcCompat="@drawable/twotone_timelapse_24" />
 
-    <eu.faircode.email.FixedImageButton
-        android:id="@+id/ibSnoozed"
+    <eu.faircode.email.FixedImageView
+        android:id="@+id/ivClassified"
         android:layout_width="21dp"
         android:layout_height="21dp"
         android:layout_marginStart="6dp"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/title_legend_snoozed"
+        android:contentDescription="@string/title_legend_classified"
         app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
-        app:layout_constraintStart_toEndOf="@id/ivClassified"
+        app:layout_constraintStart_toEndOf="@id/ibSnoozed"
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
-        app:srcCompat="@drawable/twotone_timelapse_24" />
+        app:srcCompat="@drawable/twotone_push_pin_24" />
 
     <eu.faircode.email.FixedImageView
         android:id="@+id/ivAnswered"
@@ -234,7 +234,7 @@
         android:layout_marginStart="6dp"
         android:contentDescription="@string/title_legend_answered"
         app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
-        app:layout_constraintStart_toEndOf="@id/ibSnoozed"
+        app:layout_constraintStart_toEndOf="@id/ivClassified"
         app:layout_constraintTop_toTopOf="@+id/tvSubject"
         app:srcCompat="@drawable/twotone_reply_24" />
 
diff --git a/app/src/main/res/layout/include_message_normal.xml b/app/src/main/res/layout/include_message_normal.xml
index f45a874866..0c90b4bf0b 100644
--- a/app/src/main/res/layout/include_message_normal.xml
+++ b/app/src/main/res/layout/include_message_normal.xml
@@ -244,28 +244,28 @@
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_search_24" />
 
-    <eu.faircode.email.FixedImageView
-        android:id="@+id/ivClassified"
+    <eu.faircode.email.FixedImageButton
+        android:id="@+id/ibSnoozed"
         android:layout_width="21dp"
         android:layout_height="21dp"
         android:layout_marginStart="6dp"
-        android:contentDescription="@string/title_legend_classified"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/title_legend_snoozed"
         app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
         app:layout_constraintStart_toEndOf="@id/ivFound"
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
-        app:srcCompat="@drawable/twotone_push_pin_24" />
+        app:srcCompat="@drawable/twotone_timelapse_24" />
 
-    <eu.faircode.email.FixedImageButton
-        android:id="@+id/ibSnoozed"
+    <eu.faircode.email.FixedImageView
+        android:id="@+id/ivClassified"
         android:layout_width="21dp"
         android:layout_height="21dp"
         android:layout_marginStart="6dp"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/title_legend_snoozed"
+        android:contentDescription="@string/title_legend_classified"
         app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
-        app:layout_constraintStart_toEndOf="@id/ivClassified"
+        app:layout_constraintStart_toEndOf="@id/ibSnoozed"
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
-        app:srcCompat="@drawable/twotone_timelapse_24" />
+        app:srcCompat="@drawable/twotone_push_pin_24" />
 
     <eu.faircode.email.FixedImageView
         android:id="@+id/ivAnswered"
@@ -274,7 +274,7 @@
         android:layout_marginStart="6dp"
         android:contentDescription="@string/title_legend_answered"
         app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
-        app:layout_constraintStart_toEndOf="@id/ibSnoozed"
+        app:layout_constraintStart_toEndOf="@id/ivClassified"
         app:layout_constraintTop_toTopOf="@+id/tvFolder"
         app:srcCompat="@drawable/twotone_reply_24" />