diff --git a/res/drawable/conversation_list_divider_shape.xml b/res/drawable/conversation_list_divider_shape.xml
index 12adb1cfef..cbb8a10a06 100644
--- a/res/drawable/conversation_list_divider_shape.xml
+++ b/res/drawable/conversation_list_divider_shape.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
+    <item android:left="83dp">
         <shape android:shape="rectangle">
-            <solid android:color="@color/conversation_list_item_background_read_light" />
-        </shape>
-    </item>
-    <item android:left="83dp" android:right="10dp">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/conversation_list_divider_light" />
+            <solid android:color="@color/gray27" />
             <size android:height="1px" />
         </shape>
     </item>
diff --git a/res/drawable/conversation_list_divider_shape_dark.xml b/res/drawable/conversation_list_divider_shape_dark.xml
index cc259b2440..425c926052 100644
--- a/res/drawable/conversation_list_divider_shape_dark.xml
+++ b/res/drawable/conversation_list_divider_shape_dark.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
+    <item android:left="83dp">
         <shape android:shape="rectangle">
-            <solid android:color="@color/conversation_list_item_background_read_dark" />
-        </shape>
-    </item>
-    <item android:left="83dp" android:right="10dp">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/conversation_list_divider_dark" />
+            <solid android:color="#33ffffff" />
             <size android:height="1px" />
         </shape>
     </item>
diff --git a/res/drawable/share_list_divider_shape.xml b/res/drawable/share_list_divider_shape.xml
deleted file mode 100644
index aa46fbd9f0..0000000000
--- a/res/drawable/share_list_divider_shape.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/conversation_list_item_background_read_light" />
-        </shape>
-    </item>
-    <item android:left="73dp" android:right="10dp">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/conversation_list_divider_light" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/share_list_divider_shape_dark.xml b/res/drawable/share_list_divider_shape_dark.xml
deleted file mode 100644
index d33a7d39ea..0000000000
--- a/res/drawable/share_list_divider_shape_dark.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/conversation_list_item_background_read_dark" />
-        </shape>
-    </item>
-    <item android:left="73dp" android:right="10dp">
-        <shape android:shape="rectangle">
-            <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 bd380c8220..6ce9a15bdd 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,8 +32,8 @@
     <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="conversation_list_divider_light">#15000000</color>-->
+    <!--<color name="conversation_list_divider_dark">#22ffffff</color>-->
 
     <color name="textsecure_holo_blue_light">#ff33b5e5</color>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 24b1c886ea..dfc50988c7 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -124,8 +124,6 @@
         <item name="conversation_list_item_date_color">#ff999999</item>
         <item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape</item>
 
-        <item name="share_list_item_divider">@drawable/share_list_divider_shape</item>
-
         <item name="fab_color">@color/textsecure_primary</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_dark</item>
 
@@ -251,8 +249,6 @@
         <item name="conversation_list_item_date_color">#ffdddddd</item>
         <item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape_dark</item>
 
-        <item name="share_list_item_divider">@drawable/share_list_divider_shape_dark</item>
-
         <item name="conversation_group_member_name">#99ffffff</item>
 
         <item name="conversation_item_bubble_background">#ff333333</item>
diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index b9d7eeb8de..fccbecb68d 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -27,6 +27,7 @@ import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
@@ -38,6 +39,7 @@ import android.support.v4.content.Loader;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.view.ActionMode;
+import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
@@ -125,6 +127,13 @@ public class ConversationListFragment extends Fragment
     list.setLayoutManager(new LinearLayoutManager(getActivity()));
     list.setItemAnimator(new DeleteItemAnimator());
 
+    TypedArray            typedArray     = getContext().obtainStyledAttributes(new int[]{R.attr.conversation_list_item_divider});
+    Drawable              itemDrawable   = typedArray.getDrawable(0);
+    DividerItemDecoration itemDecoration = new DividerItemDecoration(getActivity(), LinearLayoutManager.VERTICAL);
+    itemDecoration.setDrawable(itemDrawable);
+    list.addItemDecoration(itemDecoration);
+    typedArray.recycle();
+
     new ItemTouchHelper(new ArchiveListenerCallback()).attachToRecyclerView(list);
 
     return view;
@@ -551,7 +560,7 @@ public class ConversationListFragment extends Fragment
       }
     }
   }
-
+  
 }