diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index e3afab37a2d287e1183d54da25fecd430b6b2854..6867bbeb5312dee62ccf185620b3ed95c61c077a 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -208,6 +208,8 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
 				break;
 			case Message.STATUS_SEND_RECEIVED:
 			case Message.STATUS_SEND_DISPLAYED:
+				viewHolder.indicatorReceived.setImageResource(darkBackground ? R.drawable.ic_done_white_18dp : R.drawable.ic_done_black_18dp);
+				viewHolder.indicatorReceived.setAlpha(darkBackground ? 0.7f : 0.57f);
 				viewHolder.indicatorReceived.setVisibility(View.VISIBLE);
 				break;
 			case Message.STATUS_SEND_FAILED:
diff --git a/src/main/res/drawable-hdpi/ic_done_black_18dp.png b/src/main/res/drawable-hdpi/ic_done_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d867ac01c83890e875a454a4d2d0a2a8b4e4dff
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_done_black_18dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_done_white_18dp.png b/src/main/res/drawable-hdpi/ic_done_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ca17253318fbb10c7fce3d7c38d5c880a08d1b3
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_done_white_18dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_received_indicator.png b/src/main/res/drawable-hdpi/ic_received_indicator.png
deleted file mode 100644
index 6d842d6cbdebd202be9f2552d5b95080c43b7e38..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_received_indicator.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_done_black_18dp.png b/src/main/res/drawable-mdpi/ic_done_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7ed067bf970efccda5e886d113522df6a173f06
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_done_black_18dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_done_black_24dp.png b/src/main/res/drawable-mdpi/ic_done_black_24dp.png
deleted file mode 100644
index 5e5e7cf2b14732802095661e2de6a8c6eac3e8b5..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_done_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_done_white_18dp.png b/src/main/res/drawable-mdpi/ic_done_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..90c92b3d89f533c61b7ed22cd35f2c845219cfcc
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_done_white_18dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_received_indicator.png b/src/main/res/drawable-mdpi/ic_received_indicator.png
deleted file mode 100644
index cd9fd96962075c0f075926dad0a202088a4c554b..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_received_indicator.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_done_black_24dp.png b/src/main/res/drawable-xhdpi/ic_done_black_18dp.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_done_black_24dp.png
rename to src/main/res/drawable-xhdpi/ic_done_black_18dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_done_black_24dp.png b/src/main/res/drawable-xhdpi/ic_done_black_24dp.png
deleted file mode 100644
index 64a4944f7531ab9fb745fd34dd00c778cff1573f..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_done_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_done_white_18dp.png b/src/main/res/drawable-xhdpi/ic_done_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c278b6c2b30ba9bb52391af71120270e908a7502
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_done_white_18dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_received_indicator.png b/src/main/res/drawable-xhdpi/ic_received_indicator.png
deleted file mode 100644
index 799593b24d7b69acfe4ccba5082fff6c4b460445..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_received_indicator.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_done_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_done_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c4739e006b28c05b7a19e80f293b7b5f8c73ee1
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_done_black_18dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_done_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_done_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e389d2535e43255ff49819e64ad2c55b1f4370f2
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_done_white_18dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxhdpi/ic_received_indicator.png
deleted file mode 100644
index 7ee61364e136e5f1e291422cf0f1c556faf92636..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_received_indicator.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_done_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_done_black_18dp.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_done_black_24dp.png
rename to src/main/res/drawable-xxxhdpi/ic_done_black_18dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_done_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_done_black_24dp.png
deleted file mode 100644
index 2f6d6386de9510fa6dd8c83cbb61a6f2e0fab9b2..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_done_black_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_done_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_done_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ebb55559b55f99df3270796763745a71f113078
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_done_white_18dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png
deleted file mode 100644
index 0fb694c9f6528f2503d69280480e1d7a710bf5e3..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_received_indicator.png and /dev/null differ
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 29ac6fc6535bb732d49f052b811e336e6f2d2be1..ef6030cbca136334a9a174e2f600bb00e20befd2 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -1,49 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingBottom="3dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:paddingTop="3dp">
-
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingLeft="8dp"
+    android:paddingTop="3dp"
+    android:paddingRight="8dp"
+    android:paddingBottom="3dp">
 
 
     <LinearLayout
         android:id="@+id/message_photo_box"
-        android:orientation="vertical"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true">
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:orientation="vertical">
+
         <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/message_photo"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:scaleType="fitXY"
             app:riv_corner_radius="2dp" />
+
         <View
             android:id="@+id/placeholder"
-            android:layout_height="3dp"
             android:layout_width="48dp"
-        />
+            android:layout_height="3dp" />
     </LinearLayout>
 
 
-
     <LinearLayout
         android:id="@+id/message_box"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
+        android:layout_marginLeft="-4dp"
         android:layout_toLeftOf="@+id/message_photo_box"
         android:background="?attr/message_bubble_sent"
-        android:minHeight="53dp"
-        android:layout_marginLeft="-4dp"
-        android:longClickable="true">
+        android:longClickable="true"
+        android:minHeight="53dp">
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -52,7 +51,7 @@
             android:orientation="vertical"
             android:padding="2dp">
 
-            <include layout="@layout/message_content"/>
+            <include layout="@layout/message_content" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -66,16 +65,17 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:layout_marginEnd="4sp"
+                    android:layout_marginRight="4sp"
                     android:gravity="center_vertical"
                     android:text="@string/sending"
-                    android:textAppearance="@style/TextAppearance.Conversations.Caption"/>
+                    android:textAppearance="@style/TextAppearance.Conversations.Caption" />
 
                 <ImageView
                     android:id="@+id/security_indicator"
                     android:layout_width="?attr/TextSizeCaption"
                     android:layout_height="?attr/TextSizeCaption"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="4sp"
                     android:alpha="0.54"
                     android:gravity="center_vertical"
                     android:src="@drawable/ic_lock_black_18dp" />
@@ -85,7 +85,6 @@
                     android:layout_width="?attr/TextSizeCaption"
                     android:layout_height="?attr/TextSizeCaption"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="4sp"
                     android:alpha="0.54"
                     android:gravity="center_vertical"
                     android:src="@drawable/ic_mode_edit_black_18dp" />
@@ -95,10 +94,9 @@
                     android:layout_width="?attr/TextSizeCaption"
                     android:layout_height="?attr/TextSizeCaption"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="4sp"
                     android:alpha="0.54"
                     android:gravity="center_vertical"
-                    android:src="@drawable/ic_received_indicator" />
+                    android:src="@drawable/ic_done_black_18dp" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 6ebf7505c1285708bcf754b042d92888e97fc156..219fb6702e47437df529340dc7767b2070224e4c 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -87,7 +87,6 @@
         <item type="reference" name="icon_edit">@drawable/ic_edit_white_24dp</item>
         <item type="reference" name="icon_edit_body">@drawable/ic_edit_black_24dp</item>
         <item type="reference" name="icon_save">@drawable/ic_save_black_24dp</item>
-        <item type="reference" name="icon_done">@drawable/ic_done_black_24dp</item>
         <item type="reference" name="icon_group">@drawable/ic_group_white_24dp</item>
         <item type="reference" name="icon_new">@drawable/ic_add_white_24dp</item>
         <item type="reference" name="icon_quote">@drawable/ic_reply_white_24dp</item>
@@ -202,7 +201,6 @@
         <item type="reference" name="icon_edit">@drawable/ic_edit_white_24dp</item>
         <item type="reference" name="icon_edit_body">@drawable/ic_edit_white_24dp</item>
         <item type="reference" name="icon_save">@drawable/ic_save_white_24dp</item>
-        <item type="reference" name="icon_done">@drawable/ic_done_black_24dp</item>
         <item type="reference" name="icon_group">@drawable/ic_group_white_24dp</item>
         <item type="reference" name="icon_new">@drawable/ic_add_white_24dp</item>
         <item type="reference" name="icon_quote">@drawable/ic_reply_white_24dp</item>