diff --git a/res/drawable/conversation_item_received_shape.xml b/res/drawable/conversation_item_received_shape.xml
index 6fe3fd6b8..6a9a81d79 100644
--- a/res/drawable/conversation_item_received_shape.xml
+++ b/res/drawable/conversation_item_received_shape.xml
@@ -3,14 +3,14 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#09000000" />
+            <solid android:color="@color/conversation_item_received_shadow_light" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>
 
     <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
         <shape xmlns:android="http://schemas.android.com/apk/res/android">
-            <solid android:color="#ffeeeeee" />
+            <solid android:color="@color/conversation_item_received_background_light" />
             <!--stroke android:width="0.5dp" android:color="#03000000" /-->
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
diff --git a/res/drawable/conversation_item_received_shape_dark.xml b/res/drawable/conversation_item_received_shape_dark.xml
index 619499d0f..4b77765f6 100644
--- a/res/drawable/conversation_item_received_shape_dark.xml
+++ b/res/drawable/conversation_item_received_shape_dark.xml
@@ -3,14 +3,14 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#ff222222" />
+            <solid android:color="@color/conversation_item_received_shadow_dark" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>
 
     <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
         <shape xmlns:android="http://schemas.android.com/apk/res/android">
-            <solid android:color="#ff333333" />
+            <solid android:color="@color/conversation_item_received_background_dark" />
             <!--stroke android:width="0.5dp" android:color="#03000000" /-->
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
diff --git a/res/drawable/conversation_item_received_triangle_shape.xml b/res/drawable/conversation_item_received_triangle_shape.xml
index 90ecd5653..3ba9878d9 100644
--- a/res/drawable/conversation_item_received_triangle_shape.xml
+++ b/res/drawable/conversation_item_received_triangle_shape.xml
@@ -9,7 +9,7 @@
             <shape
                 android:shape="rectangle" >
                 <solid
-                    android:color="#ffeeeeee" />
+                    android:color="@color/conversation_item_received_background_light" />
             </shape>
         </rotate>
     </item>
diff --git a/res/drawable/conversation_item_received_triangle_shape_dark.xml b/res/drawable/conversation_item_received_triangle_shape_dark.xml
index d5e495a13..afa9b598e 100644
--- a/res/drawable/conversation_item_received_triangle_shape_dark.xml
+++ b/res/drawable/conversation_item_received_triangle_shape_dark.xml
@@ -9,7 +9,7 @@
             <shape
                 android:shape="rectangle" >
                 <solid
-                    android:color="#ff333333" />
+                    android:color="@color/conversation_item_received_background_dark" />
             </shape>
         </rotate>
     </item>
diff --git a/res/drawable/conversation_item_sent_pending_shape.xml b/res/drawable/conversation_item_sent_pending_shape.xml
index f1be25bf4..1c94b51dd 100644
--- a/res/drawable/conversation_item_sent_pending_shape.xml
+++ b/res/drawable/conversation_item_sent_pending_shape.xml
@@ -3,7 +3,7 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#09000000" />
+            <solid android:color="@color/conversation_item_sent_shadow_light" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>
diff --git a/res/drawable/conversation_item_sent_pending_shape_dark.xml b/res/drawable/conversation_item_sent_pending_shape_dark.xml
index 5164247f1..122b0963d 100644
--- a/res/drawable/conversation_item_sent_pending_shape_dark.xml
+++ b/res/drawable/conversation_item_sent_pending_shape_dark.xml
@@ -3,7 +3,7 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#09000000" />
+            <solid android:color="@color/conversation_item_sent_shadow_dark" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>
diff --git a/res/drawable/conversation_item_sent_push_pending_shape.xml b/res/drawable/conversation_item_sent_push_pending_shape.xml
index a7afe1aed..24663a56b 100644
--- a/res/drawable/conversation_item_sent_push_pending_shape.xml
+++ b/res/drawable/conversation_item_sent_push_pending_shape.xml
@@ -3,7 +3,7 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#09000000" />
+            <solid android:color="@color/conversation_item_sent_shadow_light" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>
diff --git a/res/drawable/conversation_item_sent_push_pending_shape_dark.xml b/res/drawable/conversation_item_sent_push_pending_shape_dark.xml
index acdc77dcc..358e82879 100644
--- a/res/drawable/conversation_item_sent_push_pending_shape_dark.xml
+++ b/res/drawable/conversation_item_sent_push_pending_shape_dark.xml
@@ -3,7 +3,7 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#09000000" />
+            <solid android:color="@color/conversation_item_sent_shadow_dark" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>
diff --git a/res/drawable/conversation_item_sent_push_shape.xml b/res/drawable/conversation_item_sent_push_shape.xml
index 62d54a7f0..d88015c76 100644
--- a/res/drawable/conversation_item_sent_push_shape.xml
+++ b/res/drawable/conversation_item_sent_push_shape.xml
@@ -3,7 +3,7 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#09000000" />
+            <solid android:color="@color/conversation_item_sent_shadow_light" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>
diff --git a/res/drawable/conversation_item_sent_push_shape_dark.xml b/res/drawable/conversation_item_sent_push_shape_dark.xml
index fe00bf8fd..0e37a4d81 100644
--- a/res/drawable/conversation_item_sent_push_shape_dark.xml
+++ b/res/drawable/conversation_item_sent_push_shape_dark.xml
@@ -3,7 +3,7 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#09000000" />
+            <solid android:color="@color/conversation_item_sent_shadow_dark" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>
diff --git a/res/drawable/conversation_item_sent_shape.xml b/res/drawable/conversation_item_sent_shape.xml
index 1fbe63d48..f7878f67e 100644
--- a/res/drawable/conversation_item_sent_shape.xml
+++ b/res/drawable/conversation_item_sent_shape.xml
@@ -3,7 +3,7 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#09000000" />
+            <solid android:color="@color/conversation_item_sent_shadow_light" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>
diff --git a/res/drawable/conversation_item_sent_shape_dark.xml b/res/drawable/conversation_item_sent_shape_dark.xml
index d40ec16ba..44a303120 100644
--- a/res/drawable/conversation_item_sent_shape_dark.xml
+++ b/res/drawable/conversation_item_sent_shape_dark.xml
@@ -3,7 +3,7 @@
 
     <item>
         <shape  android:shape="rectangle">
-            <solid android:color="#ff003c00" />
+            <solid android:color="@color/conversation_item_sent_shadow_dark" />
             <corners android:radius="@dimen/conversation_item_corner_radius" />
         </shape>
     </item>
diff --git a/res/drawable/conversation_list_divider_shape.xml b/res/drawable/conversation_list_divider_shape.xml
index cdad68c81..4f0dbd5d3 100644
--- a/res/drawable/conversation_list_divider_shape.xml
+++ b/res/drawable/conversation_list_divider_shape.xml
@@ -7,7 +7,7 @@
     </item>
     <item android:left="83dp" android:right="10dp">
         <shape android:shape="rectangle">
-            <solid android:color="#15000000" />
+            <solid android:color="@color/conversation_list_divider_light" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/res/drawable/conversation_list_divider_shape_dark.xml b/res/drawable/conversation_list_divider_shape_dark.xml
index 7aa5dec2c..51603a346 100644
--- a/res/drawable/conversation_list_divider_shape_dark.xml
+++ b/res/drawable/conversation_list_divider_shape_dark.xml
@@ -7,7 +7,7 @@
     </item>
     <item android:left="83dp" android:right="10dp">
         <shape android:shape="rectangle">
-            <solid android:color="#22ffffff" />
+            <solid android:color="@color/conversation_list_divider_dark" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0d096526d..66eb21559 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -9,18 +9,25 @@
     <color name="conversation_list_item_background_read_dark">#ff000000</color>
     <color name="conversation_list_item_background_unread_dark">#ff333333</color>
 
+    <color name="conversation_list_divider_light">#15000000</color>
+    <color name="conversation_list_divider_dark">#22ffffff</color>
+
     <color name="textsecure_holo_blue_light">#ff33b5e5</color>
 
     <color name="touch_highlight">#400099cc</color>
 
     <color name="conversation_item_sent_background_dark">#ff284e0a</color>
     <color name="conversation_item_sent_background_light">#ff64a926</color>
+    <color name="conversation_item_sent_shadow_light">#ffd5d5d5</color>
+    <color name="conversation_item_sent_shadow_dark">#ff222222</color>
     <color name="conversation_item_sent_pending_background_light">#5564A926</color>
     <color name="conversation_item_sent_pending_background_dark">#55284e0a</color>
     <color name="conversation_item_sent_push_background_light">#ff3a7ef2</color>
     <color name="conversation_item_sent_push_background_dark">#ff213b77</color>
     <color name="conversation_item_sent_push_pending_background_light">#ff7bacf2</color>
     <color name="conversation_item_sent_push_pending_background_dark">#55213b77</color>
-    <color name="conversation_item_received_background_dark">#ff284e0a</color>
-    <color name="conversation_item_received_background_light">#ff284e0a</color>
+    <color name="conversation_item_received_background_light">#ffeeeeee</color>
+    <color name="conversation_item_received_background_dark">#ff333333</color>
+    <color name="conversation_item_received_shadow_light">#ffd5d5d5</color>
+    <color name="conversation_item_received_shadow_dark">#ff222222</color>
 </resources>
\ No newline at end of file