diff --git a/res/drawable-xhdpi/chat_delivered.png b/res/drawable-xhdpi/chat_delivered.png
deleted file mode 100644
index 9d741055d..000000000
Binary files a/res/drawable-xhdpi/chat_delivered.png and /dev/null differ
diff --git a/res/drawable/contacts_all.xml b/res/drawable/contacts_all.xml
index 2e9d33e73..5ec1f5aa4 100644
--- a/res/drawable/contacts_all.xml
+++ b/res/drawable/contacts_all.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
-        android:drawable="@drawable/contacts_all_default" />
     <item android:state_enabled="false"
-         android:drawable="@drawable/contacts_all_selected" />
+        android:drawable="@drawable/contacts_all_selected" />
+    <item
+        android:drawable="@drawable/contacts_all_default" />
 </selector>
 
diff --git a/res/drawable/contacts_sip.xml b/res/drawable/contacts_sip.xml
index 089d67756..b70fb7c4c 100644
--- a/res/drawable/contacts_sip.xml
+++ b/res/drawable/contacts_sip.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
-        android:drawable="@drawable/contacts_sip_default" />
     <item android:state_enabled="false"
-         android:drawable="@drawable/contacts_sip_selected" />
+        android:drawable="@drawable/contacts_sip_selected" />
+    <item
+        android:drawable="@drawable/contacts_sip_default" />
 </selector>
\ No newline at end of file
diff --git a/res/drawable/history_all.xml b/res/drawable/history_all.xml
index 2a20b0e07..21ae3a817 100644
--- a/res/drawable/history_all.xml
+++ b/res/drawable/history_all.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
-        android:drawable="@drawable/history_all_default"/>
     <item android:state_enabled="false"
-         android:drawable="@drawable/history_all_selected" />
+        android:drawable="@drawable/history_all_selected" />
+    <item
+        android:drawable="@drawable/history_all_default"/>
 </selector>
 
diff --git a/res/drawable/history_missed.xml b/res/drawable/history_missed.xml
index e201649fb..1521d4756 100644
--- a/res/drawable/history_missed.xml
+++ b/res/drawable/history_missed.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
-        android:drawable="@drawable/history_missed_default" />
     <item android:state_enabled="false"
-         android:drawable="@drawable/history_missed_selected" />
+        android:drawable="@drawable/history_missed_selected" />
+    <item
+        android:drawable="@drawable/history_missed_default" />
 </selector>
diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 356454e00..80875fac1 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -209,12 +209,7 @@ public class ChatEventsAdapter extends SelectableAdapter<ChatBubbleViewHolder> {
                     holder.messageStatus.setImageResource(R.drawable.chat_unsecure);
                 }
 
-                if (status == ChatMessage.State.Delivered) {
-				    /*holder.imdmLayout.setVisibility(View.VISIBLE);
-				    holder.imdmLabel.setText(R.string.sent);
-				    holder.imdmIcon.setImageResource(R.drawable.chat_delivered);
-				    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorD));*/
-                } else if (status == ChatMessage.State.DeliveredToUser) {
+                if (status == ChatMessage.State.DeliveredToUser) {
                     holder.imdmLayout.setVisibility(View.VISIBLE);
                     holder.imdmIcon.setImageResource(R.drawable.imdn_received);
                     holder.imdmLabel.setText(R.string.delivered);