diff --git a/res/layout/setup_ec_calibration.xml b/res/layout/setup_ec_calibration.xml
index 0b795c433..3b4f84d7c 100644
--- a/res/layout/setup_ec_calibration.xml
+++ b/res/layout/setup_ec_calibration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical" >
@@ -8,20 +8,25 @@
         android:contentDescription="@string/content_description_welcome"
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent" 
-	    android:layout_weight="0.3"
+	    android:adjustViewBounds="true"
+	    android:scaleType="centerCrop"
+	    android:layout_centerInParent="true"
 	    android:src="@drawable/logo"/>
   	
     <ProgressBar 
         android:layout_height="wrap_content" 
         android:layout_width="wrap_content"
-        android:layout_gravity="center_horizontal|bottom" />
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true" />
 
     <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="0.7"
-        android:gravity="center_horizontal|top"
-        android:text="@string/setup_ec_calibration"
-        android:textColor="@android:color/white" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@android:color/black"
+        android:textStyle="bold"
+        android:textSize="20dp"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:text="@string/setup_ec_calibration" />
     
-</FrameLayout>
+</RelativeLayout>
diff --git a/res/values-FR/strings.xml b/res/values-FR/strings.xml
index 351f9e4c6..c9ca66e8b 100644
--- a/res/values-FR/strings.xml
+++ b/res/values-FR/strings.xml
@@ -336,4 +336,6 @@
 	<string name="linphone_friend_new_request_title">Requête d\'ami</string>
 	<string name="linphone_friend_new_request_desc">voudrait être partager son status avec vous et voir le votre.</string>
 	
+	<string name="setup_ec_calibration">Calibration de l\'annulateur d\'écho en cours</string>
+	
 </resources>
diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java
index b35e48124..231a91ac2 100644
--- a/src/org/linphone/setup/SetupActivity.java
+++ b/src/org/linphone/setup/SetupActivity.java
@@ -151,8 +151,8 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
 				EchoCancellerCalibrationFragment fragment = new EchoCancellerCalibrationFragment();
 				changeFragment(fragment);
 				currentFragment = SetupFragments.ECHO_CANCELLER_CALIBRATION;
-				back.setVisibility(View.GONE);
-				next.setVisibility(View.VISIBLE);
+				back.setVisibility(View.VISIBLE);
+				next.setVisibility(View.GONE);
 				next.setEnabled(false);
 				cancel.setEnabled(false);
 			} else {