diff --git a/res/layout/chatlist.xml b/res/layout/chatlist.xml
index a8788457c..55cfa0572 100644
--- a/res/layout/chatlist.xml
+++ b/res/layout/chatlist.xml
@@ -54,7 +54,7 @@
 
             <ImageView
                 android:id="@+id/edit"
-                android:src="@drawable/edit_list"
+                android:src="@drawable/delete"
                 android:background="@drawable/toolbar_button"
                 android:contentDescription="@string/content_description_edit_list"
                 android:layout_width="0dp"
diff --git a/res/layout/contacts_list.xml b/res/layout/contacts_list.xml
index 21359384f..8f47d0ccf 100644
--- a/res/layout/contacts_list.xml
+++ b/res/layout/contacts_list.xml
@@ -76,7 +76,7 @@
 
 		<ImageView
 			android:id="@+id/edit"
-			android:src="@drawable/edit_list"
+			android:src="@drawable/delete"
 			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_edit_list"
 			android:layout_width="0dp"
diff --git a/res/layout/history.xml b/res/layout/history.xml
index 7b76a2736..748b5d2c1 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -65,7 +65,7 @@
 
 		<ImageView
 			android:id="@+id/edit"
-			android:src="@drawable/edit_list"
+			android:src="@drawable/delete"
 			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_edit_list"
 			android:layout_width="0dp"
diff --git a/src/android/org/linphone/contacts/ContactsListFragment.java b/src/android/org/linphone/contacts/ContactsListFragment.java
index ed6bda877..df1af6cc0 100644
--- a/src/android/org/linphone/contacts/ContactsListFragment.java
+++ b/src/android/org/linphone/contacts/ContactsListFragment.java
@@ -50,7 +50,7 @@ import java.util.List;
 public class ContactsListFragment extends Fragment implements OnItemClickListener, ContactsUpdatedListener, ContactsListAdapter.ViewHolder.ClickListener, SelectableHelper.DeleteListener {
     private RecyclerView contactsList;
     private TextView noSipContact, noContact;
-    private ImageView allContacts, linphoneContacts, newContact, edit;
+    private ImageView allContacts, linphoneContacts, newContact;
     private boolean onlyDisplayLinphoneContacts;
     private View allContactsSelected, linphoneContactsSelected;
     private int lastKnownPosition;
@@ -85,7 +85,6 @@ public class ContactsListFragment extends Fragment implements OnItemClickListene
         linphoneContacts = view.findViewById(R.id.linphone_contacts);
         allContactsSelected = view.findViewById(R.id.all_contacts_select);
         linphoneContactsSelected = view.findViewById(R.id.linphone_contacts_select);
-        edit = view.findViewById(R.id.edit);
         contactsFetchInProgress = view.findViewById(R.id.contactsFetchInProgress);
         newContact = view.findViewById(R.id.newContact);
 
@@ -247,7 +246,6 @@ public class ContactsListFragment extends Fragment implements OnItemClickListene
             mSelectionHelper.enterEditionMode();
         }
         contactsList.setAdapter(mContactAdapter);
-        edit.setEnabled(true);
 
         mContactAdapter.notifyDataSetChanged();
 
diff --git a/src/android/org/linphone/fragments/HistoryListFragment.java b/src/android/org/linphone/fragments/HistoryListFragment.java
index a9f349c5a..1f0b151c8 100644
--- a/src/android/org/linphone/fragments/HistoryListFragment.java
+++ b/src/android/org/linphone/fragments/HistoryListFragment.java
@@ -52,7 +52,7 @@ import java.util.List;
 public class HistoryListFragment extends Fragment implements OnClickListener, OnItemClickListener, CallHistoryAdapter.ViewHolder.ClickListener, ContactsUpdatedListener, SelectableHelper.DeleteListener {
     private RecyclerView historyList;
     private TextView noCallHistory, noMissedCallHistory;
-    private ImageView missedCalls, allCalls, edit;
+    private ImageView missedCalls, allCalls;
     private View allCallsSelected, missedCallsSelected;
     private boolean mOnlyDisplayMissedCalls;
     private List<CallLog> mLogs;
@@ -94,8 +94,6 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
         allCalls.setEnabled(false);
         mOnlyDisplayMissedCalls = false;
 
-        edit = view.findViewById(R.id.edit);
-
         return view;
     }
 
@@ -130,7 +128,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
         }
     }
 
-    private boolean hideHistoryListAndDisplayMessageIfEmpty() {
+    private void hideHistoryListAndDisplayMessageIfEmpty() {
         removeNotMissedCallsFromLogs();
         if (mLogs.isEmpty()) {
             if (mOnlyDisplayMissedCalls) {
@@ -139,14 +137,10 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
                 noCallHistory.setVisibility(View.VISIBLE);
             }
             historyList.setVisibility(View.GONE);
-            edit.setEnabled(false);
-            return true;
         } else {
             noCallHistory.setVisibility(View.GONE);
             noMissedCallHistory.setVisibility(View.GONE);
             historyList.setVisibility(View.VISIBLE);
-            edit.setEnabled(true);
-            return false;
         }
     }
 
@@ -162,12 +156,11 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
         }
 
         mLogs = Arrays.asList(LinphoneManager.getLc().getCallLogs());
-        if (!hideHistoryListAndDisplayMessageIfEmpty()) {
-            mHistoryAdapter = new CallHistoryAdapter(getActivity().getApplicationContext(), mLogs, this, mSelectionHelper);
-            historyList.setAdapter(mHistoryAdapter);
-            mSelectionHelper.setAdapter(mHistoryAdapter);
-            mSelectionHelper.setDialogMessage(R.string.chat_room_delete_dialog);
-        }
+        hideHistoryListAndDisplayMessageIfEmpty();
+        mHistoryAdapter = new CallHistoryAdapter(getActivity().getApplicationContext(), mLogs, this, mSelectionHelper);
+        historyList.setAdapter(mHistoryAdapter);
+        mSelectionHelper.setAdapter(mHistoryAdapter);
+        mSelectionHelper.setDialogMessage(R.string.chat_room_delete_dialog);
     }
 
     @Override
@@ -205,14 +198,11 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
             missedCalls.setEnabled(false);
             mOnlyDisplayMissedCalls = true;
         }
-        if (!hideHistoryListAndDisplayMessageIfEmpty()) {
-//			historyList.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE);
-            mHistoryAdapter = new CallHistoryAdapter(mContext, mLogs, this, mSelectionHelper);
-            historyList.setAdapter(mHistoryAdapter);
-            mSelectionHelper.setAdapter(mHistoryAdapter);
-            mSelectionHelper.setDialogMessage(R.string.chat_room_delete_dialog);
-        }
-
+        hideHistoryListAndDisplayMessageIfEmpty();
+        mHistoryAdapter = new CallHistoryAdapter(mContext, mLogs, this, mSelectionHelper);
+        historyList.setAdapter(mHistoryAdapter);
+        mSelectionHelper.setAdapter(mHistoryAdapter);
+        mSelectionHelper.setDialogMessage(R.string.chat_room_delete_dialog);
     }
 
     @Override
diff --git a/src/android/org/linphone/ui/SelectableHelper.java b/src/android/org/linphone/ui/SelectableHelper.java
index 92ba14421..d201962c7 100644
--- a/src/android/org/linphone/ui/SelectableHelper.java
+++ b/src/android/org/linphone/ui/SelectableHelper.java
@@ -62,6 +62,7 @@ public class SelectableHelper {
         });
 
         mEditButton = view.findViewById(R.id.edit);
+        mEditButton.setEnabled(false);
 
         mEditButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -125,6 +126,7 @@ public class SelectableHelper {
 
     public void setAdapter(SelectableAdapter adapter) {
         mAdapter = adapter;
+        mEditButton.setEnabled(mAdapter.getItemCount() != 0);
     }
 
     public void updateSelectionButtons(boolean isSelectionEmpty, boolean isSelectionFull) {