Rearrange

app/src/main/java/eu/faircode/email/AdapterContact.java

@@ -113,7 +113,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
             } else {
                 ivType.setImageDrawable(null);
                 ivType.setContentDescription(null);
-            } 
+            }
 
             if (contact.avatar == null || !contacts)
                 ivAvatar.setImageDrawable(null);

app/src/main/res/layout/item_contact.xml

@@ -14,10 +14,10 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:contentDescription="@string/title_accessibility_from"
-            app:srcCompat="@drawable/baseline_call_received_24"
             app:layout_constraintBottom_toBottomOf="@+id/ivAvatar"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/ivAvatar" />
+            app:layout_constraintTop_toTopOf="@+id/ivAvatar"
+            app:srcCompat="@drawable/baseline_call_received_24" />
 
         <ImageView
             android:id="@+id/ivAvatar"
@@ -25,10 +25,10 @@
             android:layout_height="0dp"
             android:layout_marginStart="6dp"
             android:padding="3dp"
-            app:srcCompat="@drawable/baseline_person_24"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintStart_toEndOf="@id/ivType"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/baseline_person_24" />
 
         <TextView
             android:id="@+id/tvName"
@@ -86,10 +86,10 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:contentDescription="@string/title_accessibility_flagged"
-            app:srcCompat="@drawable/baseline_star_24"
             android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="@+id/ivAvatar"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/ivAvatar" />
+            app:layout_constraintTop_toTopOf="@+id/ivAvatar"
+            app:srcCompat="@drawable/baseline_star_24" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>