diff --git a/res/drawable-hdpi/sel_call.png b/res/drawable-hdpi/cell_call.png
similarity index 100%
rename from res/drawable-hdpi/sel_call.png
rename to res/drawable-hdpi/cell_call.png
diff --git a/res/drawable-hdpi/sel_call_first.png b/res/drawable-hdpi/cell_call_first.png
similarity index 100%
rename from res/drawable-hdpi/sel_call_first.png
rename to res/drawable-hdpi/cell_call_first.png
diff --git a/res/drawable-hdpi/cell_call_first_highlight.png b/res/drawable-hdpi/cell_call_first_highlight.png
new file mode 100644
index 000000000..1b6d58e0a
Binary files /dev/null and b/res/drawable-hdpi/cell_call_first_highlight.png differ
diff --git a/res/drawable-hdpi/cell_call_highlight.png b/res/drawable-hdpi/cell_call_highlight.png
new file mode 100644
index 000000000..babfa85c3
Binary files /dev/null and b/res/drawable-hdpi/cell_call_highlight.png differ
diff --git a/res/layout/active_call.xml b/res/layout/active_call.xml
index 6483df9ad..fd7f0cdbc 100644
--- a/res/layout/active_call.xml
+++ b/res/layout/active_call.xml
@@ -9,7 +9,7 @@
 	    android:id="@+id/row"
 	    android:layout_width="match_parent"
 	    android:layout_height="75dp"
-	    android:background="@drawable/sel_call_first"
+	    android:background="@drawable/cell_call_first"
 	    android:gravity="center_vertical">
 	    
 	    <TextView
diff --git a/res/layout/incoming.xml b/res/layout/incoming.xml
index 4a78420bb..89abc366e 100644
--- a/res/layout/incoming.xml
+++ b/res/layout/incoming.xml
@@ -25,7 +25,7 @@
 		        android:layout_width="match_parent"
 		        android:layout_height="wrap_content"
 		        android:scaleType="fitCenter"
-		        android:src="@drawable/sel_call" />
+		        android:src="@drawable/cell_call" />
 		    
 		    <TextView
 			    android:id="@+id/incoming_caller_number"
diff --git a/src/org/linphone/AudioCallFragment.java b/src/org/linphone/AudioCallFragment.java
index 7bb40d5b5..32db60dce 100644
--- a/src/org/linphone/AudioCallFragment.java
+++ b/src/org/linphone/AudioCallFragment.java
@@ -79,7 +79,7 @@ public class AudioCallFragment extends Fragment implements OnClickListener {
 		setContactName(callView, lAddress, sipUri, resources);
 		boolean hide = displayCallStatusIconAndReturnCallPaused(callView, call);
 		displayOrHideContactPicture(callView, pictureUri, hide);
-		setRowBackgroundAndPadding(callView, resources, index);
+		setRowBackgroundAndPadding(callView, resources, index, !hide);
 		registerCallDurationTimer(callView, call);
 		previousCallIsActive = !hide;
 	}
@@ -127,11 +127,18 @@ public class AudioCallFragment extends Fragment implements OnClickListener {
 		}
 	}
 	
-	private void setRowBackgroundAndPadding(LinearLayout callView, Resources resources, int index) {
+	private void setRowBackgroundAndPadding(LinearLayout callView, Resources resources, int index, boolean active) {
+		int backgroundResource;
 		if (index == 0) {
-    		callView.findViewById(R.id.row).setBackgroundResource(R.drawable.sel_call_first);
-    	} else {
-    		callView.findViewById(R.id.row).setBackgroundResource(R.drawable.sel_call);
+//			backgroundResource = active ? R.drawable.cell_call_first_highlight : R.drawable.cell_call_first;
+			backgroundResource = R.drawable.cell_call_first;
+		} else {
+//			backgroundResource = active ? R.drawable.cell_call_highlight : R.drawable.cell_call;
+			backgroundResource = R.drawable.cell_call;
+		}
+		callView.findViewById(R.id.row).setBackgroundResource(backgroundResource);
+		
+		if (index != 0) {
     		if (previousCallIsActive) {
     			callView.setPadding(0, LinphoneUtils.pixelsToDpi(resources, topMarginWithImage * index), 0, 0);
     		} else {
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 59d849a88..d3d358599 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -794,12 +794,12 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		try {
 			mTimer.cancel();
 			mLc.destroy();
-			mServiceContext.unregisterReceiver(instance.mKeepAliveReceiver);
 		} 
 		catch (RuntimeException e) {
 			e.printStackTrace();
 		}
 		finally {
+			mServiceContext.unregisterReceiver(instance.mKeepAliveReceiver);
 			mLc = null;
 			instance = null;
 		}