diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
index 9df2794a1a..b2505e4d52 100644
--- a/library/ui-styles/src/main/res/values/colors.xml
+++ b/library/ui-styles/src/main/res/values/colors.xml
@@ -26,8 +26,11 @@
     <color name="vctr_notice_secondary_alpha12">#1E61708B</color>
 
     <!-- Other useful color -->
-    <!-- Emoji text has to use a black text color -->
+    <!-- Upstream says: Emoji text has to use a black text color -->
+    <!-- SchildiChat says: no, it doesn't, it just needs to use some theme-specific color without transparency. We have non-emoji reactions... -->
+    <!--
     <color name="emoji_color">@android:color/black</color>
+    -->
     <color name="join_conference_animated_color">#0BAC7E</color>
 
     <color name="half_transparent_status_bar">#80000000</color>
diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector/src/debug/res/layout/item_sas_emoji.xml
index a6a0e28058..04bc59d302 100644
--- a/vector/src/debug/res/layout/item_sas_emoji.xml
+++ b/vector/src/debug/res/layout/item_sas_emoji.xml
@@ -26,7 +26,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:textColor="@color/emoji_color"
+        android:textColor="?vctr_content_primary"
         tools:text="🔧" />
 
     <LinearLayout
diff --git a/vector/src/main/res/layout/item_autocomplete_emoji.xml b/vector/src/main/res/layout/item_autocomplete_emoji.xml
index 5ba4faa698..346008beab 100644
--- a/vector/src/main/res/layout/item_autocomplete_emoji.xml
+++ b/vector/src/main/res/layout/item_autocomplete_emoji.xml
@@ -14,7 +14,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:textColor="@color/emoji_color"
+        android:textColor="?vctr_content_primary"
         tools:ignore="SpUsage"
         tools:text="@sample/reactions.json/data/reaction" />
 
diff --git a/vector/src/main/res/layout/item_emoji_result.xml b/vector/src/main/res/layout/item_emoji_result.xml
index 26f85d8c97..a26a28d04d 100644
--- a/vector/src/main/res/layout/item_emoji_result.xml
+++ b/vector/src/main/res/layout/item_emoji_result.xml
@@ -17,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:textColor="@color/emoji_color"
+        android:textColor="?vctr_content_primary"
         tools:ignore="SpUsage"
         tools:text="@sample/reactions.json/data/reaction" />
 
diff --git a/vector/src/main/res/layout/item_emoji_verif.xml b/vector/src/main/res/layout/item_emoji_verif.xml
index 0ef46c56a6..9039aa801c 100644
--- a/vector/src/main/res/layout/item_emoji_verif.xml
+++ b/vector/src/main/res/layout/item_emoji_verif.xml
@@ -14,7 +14,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:textColor="@color/emoji_color"
+        android:textColor="?vctr_content_primary"
         android:textSize="40dp"
         tools:ignore="SpUsage"
         tools:text="🌵"
diff --git a/vector/src/main/res/layout/item_simple_reaction_info.xml b/vector/src/main/res/layout/item_simple_reaction_info.xml
index 6f473c209d..e8b2aa4698 100644
--- a/vector/src/main/res/layout/item_simple_reaction_info.xml
+++ b/vector/src/main/res/layout/item_simple_reaction_info.xml
@@ -18,7 +18,7 @@
         android:layout_marginEnd="8dp"
         android:gravity="center"
         android:lines="1"
-        android:textColor="@color/emoji_color"
+        android:textColor="?vctr_content_primary"
         tools:text="@sample/reactions.json/data/reaction" />
 
     <TextView