diff --git a/res/layout/conversation_list_fragment.xml b/res/layout/conversation_list_fragment.xml
index 9f66583d49..01692dfc57 100644
--- a/res/layout/conversation_list_fragment.xml
+++ b/res/layout/conversation_list_fragment.xml
@@ -75,10 +75,10 @@
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="88dp"
-        android:src="@drawable/ic_camera_alt_white_24dp"
-        android:tint="@color/core_grey_60"
+        android:src="@drawable/ic_camera_filled_24"
+        android:tint="?conversation_list_camera_icon_tint"
         android:focusable="true"
-        app:backgroundTint="@color/core_white"/>
+        app:backgroundTint="?conversation_list_camera_button_background"/>
 
     <org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton
             android:id="@+id/fab"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 2754046368..1c766e9e05 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -16,6 +16,8 @@
     <attr name="conversation_list_item_divider" format="reference"/>
     <attr name="conversation_list_toolbar_background" format="reference"/>
     <attr name="conversation_list_typing_tint" format="color"/>
+    <attr name="conversation_list_camera_icon_tint" format="color"/>
+    <attr name="conversation_list_camera_button_background" format="color"/>
 
     <attr name="conversation_sent_card_background" format="reference|color"/>
     <attr name="conversation_group_member_name" format="reference|color"/>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index fa31a40658..c64e6b32d9 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -151,6 +151,8 @@
         <item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape</item>
         <item name="conversation_list_toolbar_background">@color/core_blue</item>
         <item name="conversation_list_typing_tint">@color/core_grey_60</item>
+        <item name="conversation_list_camera_icon_tint">@color/core_grey_60</item>
+        <item name="conversation_list_camera_button_background">@color/core_white</item>
 
         <item name="fab_color">@color/textsecure_primary</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_dark</item>
@@ -336,6 +338,8 @@
         <item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape_dark</item>
         <item name="conversation_list_toolbar_background">@color/core_grey_90</item>
         <item name="conversation_list_typing_tint">@color/core_white</item>
+        <item name="conversation_list_camera_icon_tint">@color/core_white</item>
+        <item name="conversation_list_camera_button_background">@color/core_grey_85</item>
 
         <item name="conversation_group_member_name">#99ffffff</item>