diff --git a/res/layout/conversation_item_footer.xml b/res/layout/conversation_item_footer.xml
index e22bd7f1c..18950a0a7 100644
--- a/res/layout/conversation_item_footer.xml
+++ b/res/layout/conversation_item_footer.xml
@@ -29,11 +29,11 @@
         tools:text="30 mins"/>
 
     <ImageView android:id="@+id/delivery_indicator"
-               android:layout_width="20dp"
+               android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical|end"
+               android:layout_marginLeft="6dp"
                android:tint="?attr/conversation_item_outgoing_text_secondary_color"
-               android:paddingLeft="2dp"
                android:visibility="gone" />
 
 </merge>
diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml
index bad497d70..836c2d2d6 100644
--- a/res/layout/conversation_list_item_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -118,11 +118,10 @@
                           android:background="@drawable/archived_indicator_background" />
 
                 <ImageView android:id="@+id/delivery_indicator"
-                           android:layout_marginTop="6dp"
+                           android:layout_marginTop="4dp"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_gravity="center_vertical|end"
-                           android:paddingLeft="2dp"
                            android:tint="?attr/conversation_item_outgoing_text_secondary_color"
                            android:visibility="gone" />
 
diff --git a/res/layout/delivery_status_view.xml b/res/layout/delivery_status_view.xml
deleted file mode 100644
index 71e05fb43..000000000
--- a/res/layout/delivery_status_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:tools="http://schemas.android.com/tools">
-
-
-
-</merge>
\ No newline at end of file