diff --git a/res/drawable-xhdpi/checkbox_checked.png b/res/drawable-xhdpi/checkbox_checked.png
new file mode 100644
index 000000000..ac8b29bbd
Binary files /dev/null and b/res/drawable-xhdpi/checkbox_checked.png differ
diff --git a/res/drawable-xhdpi/checkbox_unchecked.png b/res/drawable-xhdpi/checkbox_unchecked.png
new file mode 100644
index 000000000..e6168abb7
Binary files /dev/null and b/res/drawable-xhdpi/checkbox_unchecked.png differ
diff --git a/res/drawable-xhdpi/history_all_default.png b/res/drawable-xhdpi/history_all_default.png
index 93a2170ec..867e2cf70 100644
Binary files a/res/drawable-xhdpi/history_all_default.png and b/res/drawable-xhdpi/history_all_default.png differ
diff --git a/res/drawable-xhdpi/history_all_selected.png b/res/drawable-xhdpi/history_all_selected.png
index ffe0a6769..cf4a2293a 100644
Binary files a/res/drawable-xhdpi/history_all_selected.png and b/res/drawable-xhdpi/history_all_selected.png differ
diff --git a/res/layout/history.xml b/res/layout/history.xml
index 4729fcc8a..8227099d5 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -49,6 +49,7 @@
 				android:contentDescription="@string/content_description_missed_calls"
 				android:id="@+id/missed_calls"
 				android:src="@drawable/history_missed"
+				android:background="@drawable/toolbar_button"
 				android:padding="10dp"
 				android:gravity="center"
 				android:layout_width="wrap_content"
diff --git a/res/layout/history_cell.xml b/res/layout/history_cell.xml
index f7d5d0899..f842f7762 100644
--- a/res/layout/history_cell.xml
+++ b/res/layout/history_cell.xml
@@ -74,6 +74,7 @@
 
 		<CheckBox
 			android:id="@+id/delete"
+			android:button="@drawable/checkbox"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignParentRight="true"
diff --git a/src/org/linphone/HistoryDetailFragment.java b/src/org/linphone/HistoryDetailFragment.java
index b8d71d941..34e405d6e 100644
--- a/src/org/linphone/HistoryDetailFragment.java
+++ b/src/org/linphone/HistoryDetailFragment.java
@@ -39,7 +39,7 @@ import android.widget.TextView;
  * @author Sylvain Berfini
  */
 public class HistoryDetailFragment extends Fragment implements OnClickListener {
-	private ImageView dialBack, chat, addToContacts;
+	private ImageView dialBack, chat, addToContacts, back;
 	private View view;
 	private ImageView contactPicture;
 	private TextView contactName, contactAddress, callDirection, time, date;
@@ -59,6 +59,9 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
 		
 		dialBack = (ImageView) view.findViewById(R.id.dialBack);
 		dialBack.setOnClickListener(this);
+
+		back = (ImageView) view.findViewById(R.id.back);
+		back.setOnClickListener(this);
 		
 		chat = (ImageView) view.findViewById(R.id.chat);
 		chat.setOnClickListener(this);
@@ -151,8 +154,10 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
 	@Override
 	public void onClick(View v) {
 		int id = v.getId();
-		
-		if (id == R.id.dialBack) {
+
+		if (id == R.id.back) {
+			getFragmentManager().popBackStackImmediate();
+		} if (id == R.id.dialBack) {
 			LinphoneActivity.instance().setAddresGoToDialerAndCall(sipUri, displayName, pictureUri == null ? null : Uri.parse(pictureUri));
 		} else if (id == R.id.chat) {
 			LinphoneActivity.instance().displayChat(sipUri);
diff --git a/src/org/linphone/HistoryFragment.java b/src/org/linphone/HistoryFragment.java
index c09f0e6f4..48a043d71 100644
--- a/src/org/linphone/HistoryFragment.java
+++ b/src/org/linphone/HistoryFragment.java
@@ -32,14 +32,10 @@ import org.linphone.mediastream.Log;
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.app.Fragment;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -144,15 +140,15 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem
 				noMissedCallHistory.setVisibility(View.VISIBLE);
 			} else {
 				noCallHistory.setVisibility(View.VISIBLE);
-				edit.setEnabled(false);
 			}
 			historyList.setVisibility(View.GONE);
+			edit.setEnabled(false);
 			return true;
 		} else {
 			noCallHistory.setVisibility(View.GONE);
 			noMissedCallHistory.setVisibility(View.GONE);
-			edit.setEnabled(true);
 			historyList.setVisibility(View.VISIBLE);
+			edit.setEnabled(true);
 			return false;
 		}
 	}
@@ -163,10 +159,6 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem
 
 		if (LinphoneActivity.isInstanciated()) {
 			LinphoneActivity.instance().selectMenu(FragmentsAvailable.HISTORY);
-
-			if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) {
-				LinphoneActivity.instance().hideStatusBar();
-			}
 		}
 
 		mLogs = Arrays.asList(LinphoneManager.getLc().getCallLogs());
@@ -188,6 +180,9 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem
 		LinphoneCallLog log = mLogs.get(info.position);
 		LinphoneManager.getLc().removeCallLog(log);
 		mLogs = Arrays.asList(LinphoneManager.getLc().getCallLogs());
+		if (!hideHistoryListAndDisplayMessageIfEmpty()) {
+			historyList.setAdapter(new CallHistoryAdapter(getActivity()));
+		}
 		return true;
 	}
 
@@ -200,6 +195,7 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem
 			Button delete = (Button) dialog.findViewById(R.id.delete);
 			Button cancel = (Button) dialog.findViewById(R.id.cancel);
 
+			isEditMode = false;
 			delete.setOnClickListener(new OnClickListener() {
 				@Override
 				public void onClick(View view) {
@@ -210,7 +206,6 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem
 							LinphoneManager.getLc().removeCallLog(log);
 						}
 					}
-					isEditMode = false;
 					refresh();
 					historyList.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE);
 					historyList.setAdapter(new CallHistoryAdapter(getActivity()));
@@ -231,15 +226,12 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem
 			deselectAll.setVisibility(View.GONE);
 			deleteAll.setVisibility(View.GONE);
 		}
-		else if (id == R.id.edit) {
+		if (id == R.id.edit) {
 			edit.setVisibility(View.GONE);
 			selectAll.setVisibility(View.VISIBLE);
 			deleteAll.setVisibility(View.VISIBLE);
 			isEditMode = true;
-			historyList.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE);
-			historyList.setAdapter(new CallHistoryAdapter(getActivity()));
 		}
-
 		if (id == R.id.all_calls) {
 			allCalls.setEnabled(false);
 			allCallsSelected.setVisibility(View.VISIBLE);
@@ -249,13 +241,25 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem
 
 			mLogs = Arrays.asList(LinphoneManager.getLc().getCallLogs());
 		}
-		else if (id == R.id.missed_calls) {
+		if (id == R.id.missed_calls) {
 			allCalls.setEnabled(true);
 			allCallsSelected.setVisibility(View.INVISIBLE);
 			missedCallsSelected.setVisibility(View.VISIBLE);
 			missedCalls.setEnabled(false);
 			onlyDisplayMissedCalls = true;
-		}else if (id == R.id.select_all) {
+		}
+
+		if (!hideHistoryListAndDisplayMessageIfEmpty()) {
+			historyList.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE);
+			historyList.setAdapter(new CallHistoryAdapter(getActivity().getApplicationContext()));
+		}
+
+		if(isEditMode){
+			deselectAll.setVisibility(View.GONE);
+			selectAll.setVisibility(View.VISIBLE);
+		}
+
+		if (id == R.id.select_all) {
 			deselectAll.setVisibility(View.VISIBLE);
 			selectAll.setVisibility(View.GONE);
 			int size = historyList.getAdapter().getCount();
@@ -265,7 +269,8 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem
 
 			isSelectAll = true;
 			isDeselectAll = false;
-		} else if (id == R.id.deselect_all) {
+		}
+		if (id == R.id.deselect_all) {
 			deselectAll.setVisibility(View.GONE);
 			selectAll.setVisibility(View.VISIBLE);
 			int size = historyList.getAdapter().getCount();
@@ -356,15 +361,7 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem
 	}
 
 	class CallHistoryAdapter extends  BaseAdapter {
-		private Bitmap missedCall, outgoingCall, incomingCall;
-
 		CallHistoryAdapter(Context aContext) {
-			missedCall = BitmapFactory.decodeResource(getResources(), R.drawable.call_status_missed);
-
-			if (!onlyDisplayMissedCalls) {
-				outgoingCall = BitmapFactory.decodeResource(getResources(), R.drawable.call_status_outgoing);
-				incomingCall = BitmapFactory.decodeResource(getResources(), R.drawable.call_status_incoming);
-			}
 		}
 		public int getCount() {
 			return mLogs.size();
@@ -418,18 +415,21 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem
 				view = convertView;
 			} else {
 				view = mInflater.inflate(R.layout.history_cell, parent,false);
+				ViewHolder holder = new ViewHolder();
+				holder.contact = (TextView) view.findViewById(R.id.sipUri);
+				holder.detail = (ImageView) view.findViewById(R.id.detail);
+				holder.delete = (CheckBox) view.findViewById(R.id.delete);
+				holder.callDirection = (ImageView) view.findViewById(R.id.icon);
+				view.setTag(holder);
 			}
 
+			ViewHolder holder = (ViewHolder) view.getTag();
+
 			final LinphoneCallLog log = mLogs.get(position);
 			long timestamp = log.getTimestamp();
 			final LinphoneAddress address;
 
-			TextView contact = (TextView) view.findViewById(R.id.sipUri);
-			contact.setSelected(true); // For automated horizontal scrolling of long texts
-
-			ImageView detail = (ImageView) view.findViewById(R.id.detail);
-			CheckBox delete = (CheckBox) view.findViewById(R.id.delete);
-			ImageView callDirection = (ImageView) view.findViewById(R.id.icon);
+			holder.contact.setSelected(true); // For automated horizontal scrolling of long texts
 
 			TextView separator = (TextView) view.findViewById(R.id.separator);
 			Calendar logTime = Calendar.getInstance();
@@ -454,16 +454,16 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem
 			if (log.getDirection() == CallDirection.Incoming) {
 				address = log.getFrom();
 				if (log.getStatus() == CallStatus.Missed) {
-					callDirection.setImageBitmap(missedCall);
+					holder.callDirection.setImageResource(R.drawable.call_status_missed);
 				} else {
-					callDirection.setImageBitmap(incomingCall);
+					holder.callDirection.setImageResource(R.drawable.call_status_incoming);
 				}
 			} else {
 				address = log.getTo();
-				callDirection.setImageBitmap(outgoingCall);
+				holder.callDirection.setImageResource(R.drawable.call_status_outgoing);
 			}
 
-			Contact c = ContactsManager.getInstance().findContactWithAddress(getActivity().getContentResolver(), address);
+			Contact c = ContactsManager.getInstance().findContactWithAddress(address);
 			String displayName = null;
 			final String sipUri = address.asStringUriOnly();
 			if(c != null){
@@ -472,37 +472,37 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem
 
 			if (displayName == null) {
 				if (getResources().getBoolean(R.bool.only_display_username_if_unknown) && LinphoneUtils.isSipAddress(sipUri)) {
-					contact.setText(address.getUserName());
+					holder.contact.setText(address.getUserName());
 				} else {
-					contact.setText(sipUri);
+					holder.contact.setText(sipUri);
 				}
 			} else {
 				if (getResources().getBoolean(R.bool.only_display_username_if_unknown) && LinphoneUtils.isSipAddress(address.getDisplayName())) {
-					contact.setText(displayName);
+					holder.contact.setText(displayName);
 				} else {
-					contact.setText(sipUri);
+					holder.contact.setText(sipUri);
 				}
 			}
-			view.setTag(sipUri);
+			//view.setTag(sipUri);
 
 			if (isEditMode) {
-				delete.setVisibility(View.VISIBLE);
-				delete.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+				holder.delete.setVisibility(View.VISIBLE);
+				holder.delete.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
 					@Override
 					public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
 						historyList.setItemChecked(position, b);
 					}
 				});
-				detail.setVisibility(View.GONE);
+				holder.detail.setVisibility(View.GONE);
 				if(historyList.isItemChecked(position)) {
-					delete.setChecked(true);
+					holder.delete.setChecked(true);
 				} else {
-					delete.setChecked(false);
+					holder.delete.setChecked(false);
 				}
 			} else {
-				delete.setVisibility(View.GONE);
-				detail.setVisibility(View.VISIBLE);
-				detail.setOnClickListener(new OnClickListener() {
+				holder.delete.setVisibility(View.GONE);
+				holder.detail.setVisibility(View.VISIBLE);
+				holder.detail.setOnClickListener(new OnClickListener() {
 					@Override
 					public void onClick(View v) {
 						if (LinphoneActivity.isInstanciated()) {
@@ -511,8 +511,15 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem
 					}
 				});
 			}
-
 			return view;
 		}
 	}
+
+	static class ViewHolder {
+		TextView contact;
+		ImageView detail;
+		CheckBox delete;
+		ImageView callDirection;
+		int position;
+	}
 }
\ No newline at end of file