diff --git a/res/layout-sw600dp-land/main.xml b/res/layout-sw600dp-land/main.xml
index 234060977..f88231705 100644
--- a/res/layout-sw600dp-land/main.xml
+++ b/res/layout-sw600dp-land/main.xml
@@ -26,7 +26,8 @@
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.2"
-		    android:scaleType="fitEnd"
+            android:scaleType="fitXY"
+            android:adjustViewBounds="true"
 		    android:src="@drawable/mark"
 		    android:visibility="invisible" />
 		
@@ -35,7 +36,8 @@
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.2"
-		    android:scaleType="fitEnd"
+            android:scaleType="fitXY"
+            android:adjustViewBounds="true"
 		    android:src="@drawable/mark"
 		    android:visibility="invisible" />
 		
@@ -44,7 +46,8 @@
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.24"
-		    android:scaleType="fitEnd"
+            android:scaleType="fitXY"
+            android:adjustViewBounds="true"
 		    android:src="@drawable/mark"
 		    android:visibility="invisible" />
 		
@@ -53,7 +56,8 @@
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.2"
-		    android:scaleType="fitEnd"
+            android:scaleType="fitXY"
+            android:adjustViewBounds="true"
 		    android:src="@drawable/mark"
 		    android:visibility="invisible" />
 		
@@ -62,7 +66,8 @@
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="0.2"
-		    android:scaleType="fitEnd"
+            android:scaleType="fitXY"
+            android:adjustViewBounds="true"
 		    android:src="@drawable/mark"
 		    android:visibility="invisible" />
         
diff --git a/res/layout/edit_contact.xml b/res/layout/edit_contact.xml
index b433120c7..30981a28a 100644
--- a/res/layout/edit_contact.xml
+++ b/res/layout/edit_contact.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
   	android:background="@drawable/background"
-    android:orientation="vertical" >
+  	android:orientation="vertical">
     
     <LinearLayout 
 	    android:layout_width="match_parent"
diff --git a/src/org/linphone/EditContactFragment.java b/src/org/linphone/EditContactFragment.java
index c442ad483..019af5977 100644
--- a/src/org/linphone/EditContactFragment.java
+++ b/src/org/linphone/EditContactFragment.java
@@ -103,7 +103,7 @@ public class EditContactFragment extends Fragment {
 		lastName.addTextChangedListener(new TextWatcher() {
 			@Override
 			public void onTextChanged(CharSequence s, int start, int before, int count) {
-				if (lastName.getText().length() > 0) {
+				if (lastName.getText().length() > 0 || firstName.getText().length() > 0) {
 					ok.setEnabled(true);
 				} else {
 					ok.setEnabled(false);
@@ -123,7 +123,7 @@ public class EditContactFragment extends Fragment {
 		firstName.addTextChangedListener(new TextWatcher() {
 			@Override
 			public void onTextChanged(CharSequence s, int start, int before, int count) {
-				if (firstName.getText().length() > 0) {
+				if (firstName.getText().length() > 0 || lastName.getText().length() > 0) {
 					ok.setEnabled(true);
 				} else {
 					ok.setEnabled(false);