diff --git a/res/layout/expiration_dialog.xml b/res/layout/expiration_dialog.xml
index 6401a95645..5cde71f443 100644
--- a/res/layout/expiration_dialog.xml
+++ b/res/layout/expiration_dialog.xml
@@ -12,7 +12,8 @@
             android:layout_alignParentTop="true"
             app:npv_WrapSelectorWheel="false"
             app:npv_DividerColor="#cbc8ea"
-            app:npv_TextColorSelected="@color/black"
+            app:npv_TextColorNormal="?conversation_number_picker_text_color_normal"
+            app:npv_TextColorSelected="?conversation_number_picker_text_color_selected"
             app:npv_ItemPaddingVertical="20dp"
             app:npv_TextColorHint="@color/grey_600"
             app:npv_TextSizeNormal="16sp"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 43c6510696..e6780cdfeb 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -40,6 +40,8 @@
     <attr name="conversation_attach_sound" format="reference"/>
     <attr name="conversation_attach_contact_info" format="reference"/>
     <attr name="conversation_attach" format="reference"/>
+    <attr name="conversation_number_picker_text_color_normal" format="reference|color"/>
+    <attr name="conversation_number_picker_text_color_selected" format="reference|color"/>
 
     <attr name="emoji_tab_strip_background" format="color" />
     <attr name="emoji_tab_indicator" format="color" />
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 8fb41c3556..d816fcae1b 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -124,6 +124,8 @@
         <item name="conversation_attach_sound">@drawable/ic_volume_up_light</item>
         <item name="conversation_attach_contact_info">@drawable/ic_account_box_light</item>
         <item name="conversation_attach">@drawable/ic_attach_grey600_24dp</item>
+        <item name="conversation_number_picker_text_color_normal">@color/gray65</item>
+        <item name="conversation_number_picker_text_color_selected">@color/black</item>
 
         <item name="emoji_tab_strip_background">@color/gray12</item>
         <item name="emoji_tab_indicator">#66555555</item>
@@ -262,6 +264,8 @@
         <item name="conversation_attach_sound">@drawable/ic_volume_up_dark</item>
         <item name="conversation_attach_contact_info">@drawable/ic_account_box_dark</item>
         <item name="conversation_attach">@drawable/ic_attach_white_24dp</item>
+        <item name="conversation_number_picker_text_color_normal">@color/gray13</item>
+        <item name="conversation_number_picker_text_color_selected">@color/white</item>
 
         <item name="emoji_tab_strip_background">@color/gray95</item>
         <item name="emoji_tab_indicator">@color/gray65</item>