diff --git a/res/drawable/emoji_variation_selector_background_dark.xml b/res/drawable/emoji_variation_selector_background_dark.xml
new file mode 100644
index 0000000000..b6139e6b5e
--- /dev/null
+++ b/res/drawable/emoji_variation_selector_background_dark.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="5dp" />
+    <solid android:color="@color/core_grey_85" />
+
+</shape>
\ No newline at end of file
diff --git a/res/layout/emoji_variation_selector.xml b/res/layout/emoji_variation_selector.xml
index bf5bea46cb..249ed5de65 100644
--- a/res/layout/emoji_variation_selector.xml
+++ b/res/layout/emoji_variation_selector.xml
@@ -4,6 +4,6 @@
     android:orientation="horizontal"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/emoji_variation_selector_background_light">
+    android:background="?attr/emoji_variation_selector_background">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 5a2aad97d9..882491504e 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -64,6 +64,7 @@
     <attr name="emoji_category_symbol" format="reference"/>
     <attr name="emoji_category_flags" format="reference"/>
     <attr name="emoji_category_emoticons" format="reference"/>
+    <attr name="emoji_variation_selector_background" format="reference|color" />
     <attr name="quick_camera_icon" format="reference"/>
     <attr name="quick_mic_icon" format="reference"/>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 7a118297a2..a625d8cf2a 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -185,6 +185,7 @@
         <item name="emoji_category_symbol">@drawable/emoji_category_symbol_light</item>
         <item name="emoji_category_flags">@drawable/emoji_category_flags_light</item>
         <item name="emoji_category_emoticons">@drawable/emoji_category_emoticons_light</item>
+        <item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_light</item>
 
 
         <item name="conversation_item_bubble_background">@color/core_grey_05</item>
@@ -362,6 +363,7 @@
         <item name="emoji_category_symbol">@drawable/emoji_category_symbol_dark</item>
         <item name="emoji_category_flags">@drawable/emoji_category_flags_dark</item>
         <item name="emoji_category_emoticons">@drawable/emoji_category_emoticons_dark</item>
+        <item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_dark</item>
 
         <item name="quick_camera_icon">@drawable/quick_camera_dark</item>
         <item name="quick_mic_icon">@drawable/ic_mic_white_24dp</item>