diff --git a/res/layout/contact_edit_row.xml b/res/layout/contact_edit_row.xml
index 6dc03cd3d..0fcd30a54 100644
--- a/res/layout/contact_edit_row.xml
+++ b/res/layout/contact_edit_row.xml
@@ -18,7 +18,7 @@
 			android:layout_toStartOf="@+id/delete"/>
 
 		<ImageView
-			android:id="@+id/delete"
+			android:id="@+id/delete_field"
 			android:src="@drawable/delete_field_default"
 			android:contentDescription="@string/content_description_add"
 			android:layout_gravity="center"
diff --git a/src/org/linphone/ContactEditorFragment.java b/src/org/linphone/ContactEditorFragment.java
index 28f733f71..680f10e7a 100644
--- a/src/org/linphone/ContactEditorFragment.java
+++ b/src/org/linphone/ContactEditorFragment.java
@@ -588,7 +588,7 @@ public class ContactEditorFragment extends Fragment {
 			nounoa.setNewNumberOrAddress(noa.getText().toString());
 		}
 		
-		ImageView delete = (ImageView) view.findViewById(R.id.delete);
+		ImageView delete = (ImageView) view.findViewById(R.id.delete_field);
 		delete.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -626,7 +626,7 @@ public class ContactEditorFragment extends Fragment {
 			}
 		});
 		
-		final ImageView delete = (ImageView) view.findViewById(R.id.delete);
+		final ImageView delete = (ImageView) view.findViewById(R.id.delete_field);
 		delete.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
diff --git a/tests/src/org/linphone/test/CallsAudio.java b/tests/src/org/linphone/test/CallsAudio.java
index cfe5a9f80..d59bbceca 100644
--- a/tests/src/org/linphone/test/CallsAudio.java
+++ b/tests/src/org/linphone/test/CallsAudio.java
@@ -50,7 +50,7 @@ public class CallsAudio extends SampleTest {
 
 		assertOutgoingCallIsCorrectlyRunning();
 		
-		solo.clickOnView(solo.getView(org.linphone.R.id.hang_up));
+		solo.clickOnView(solo.getView(org.linphone.R.id.outgoing_hang_up));
 		solo.waitForActivity("LinphoneActivity", 5000);
 		solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
 	}
diff --git a/tests/src/org/linphone/test/Contacts.java b/tests/src/org/linphone/test/Contacts.java
index a2cfecdd4..19fc953b6 100644
--- a/tests/src/org/linphone/test/Contacts.java
+++ b/tests/src/org/linphone/test/Contacts.java
@@ -77,7 +77,7 @@ public class Contacts extends SampleTest {
 		
 		solo.clickOnText(iContext.getString(org.linphone.test.R.string.contact_name));
 		solo.clickOnView(solo.getView(org.linphone.R.id.editContact));
-		solo.clickOnView(solo.getView(org.linphone.R.id.delete));
+		solo.clickOnView(solo.getView(org.linphone.R.id.delete_field));
 		solo.enterText(2, iContext.getString(org.linphone.test.R.string.contact_sip));
 		solo.clickOnView(solo.getView(org.linphone.R.id.ok));