diff --git a/app/src/main/res/layout/item_emoji_pref.xml b/app/src/main/res/layout/item_emoji_pref.xml
index 539677f1..d8755a3d 100644
--- a/app/src/main/res/layout/item_emoji_pref.xml
+++ b/app/src/main/res/layout/item_emoji_pref.xml
@@ -6,8 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:paddingBottom="8dp"
-    android:paddingTop="8dp">
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp">
 
     <!--This is a thumbnail picture-->
     <ImageView
@@ -15,23 +15,25 @@
         android:layout_width="42dp"
         android:layout_height="42dp"
         android:layout_marginStart="16dp"
+        android:importantForAccessibility="no"
         android:padding="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_emoji_24dp" />
+        app:srcCompat="@drawable/ic_emoji_24dp"
+        app:tint="#0000" /> <!-- unset the preference theme tint -->
 
     <!--This is the font's name-->
     <TextView
         android:id="@+id/emojicompat_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="72dp"
         android:layout_marginStart="12dp"
+        android:layout_marginEnd="72dp"
         android:textColor="?android:textColorPrimary"
-        app:layout_constraintEnd_toEndOf="parent"
         android:textSize="?attr/status_text_medium"
         app:layout_constraintBottom_toTopOf="@+id/emojicompat_caption"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/emojicompat_thumb"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@string/system_default" />
@@ -58,8 +60,8 @@
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="72dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="72dp"
         android:indeterminate="false"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"