diff --git a/res/layout/assistant_account_creation.xml b/res/layout/assistant_account_creation.xml
index edc650767..109cbfead 100644
--- a/res/layout/assistant_account_creation.xml
+++ b/res/layout/assistant_account_creation.xml
@@ -71,7 +71,7 @@
 			android:background="@drawable/resizable_textfield"
 			android:textColor="@color/colorB"
 			android:textCursorDrawable="@null"
-			android:inputType="textEmailAddress"
+			android:inputType="textPassword"
 			android:layout_width="match_parent"
 			android:layout_height="40dp"
 			android:paddingLeft="10dp"
@@ -92,7 +92,7 @@
 			android:background="@drawable/resizable_textfield"
 			android:textColor="@color/colorB"
 			android:textCursorDrawable="@null"
-			android:inputType="text"
+			android:inputType="textPassword"
 			android:layout_width="match_parent"
 			android:layout_height="40dp"
 			android:paddingLeft="10dp"
diff --git a/res/layout/assistant_topbar.xml b/res/layout/assistant_topbar.xml
index d2c73418c..507a95e29 100644
--- a/res/layout/assistant_topbar.xml
+++ b/res/layout/assistant_topbar.xml
@@ -9,9 +9,9 @@
 		android:id="@+id/back"
 		android:src="@drawable/back"
 		android:contentDescription="@string/content_description_back"
-		android:layout_width="30dp"
+		android:layout_width="70dp"
 		android:layout_height="match_parent"
-		android:layout_margin="20dp"
+		android:padding="20dp"
 		android:layout_alignParentLeft="true"
 		android:layout_centerInParent="true"/>
 
@@ -27,9 +27,9 @@
 		android:id="@+id/cancel"
 		android:src="@drawable/dialer_back"
 		android:contentDescription="@string/content_description_dialer"
-		android:layout_width="30dp"
+		android:layout_width="70dp"
 		android:layout_height="match_parent"
-		android:layout_margin="20dp"
+		android:padding="20dp"
 		android:layout_centerInParent="true"
 		android:layout_alignParentRight="true"/>
 
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index 6cf2893d4..84cf1ad6b 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -43,7 +43,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.Toast;
 /**
  * @author Sylvain Berfini
diff --git a/src/org/linphone/assistant/EchoCancellerCalibrationFragment.java b/src/org/linphone/assistant/EchoCancellerCalibrationFragment.java
index 2a8f8a1fb..59e920d94 100644
--- a/src/org/linphone/assistant/EchoCancellerCalibrationFragment.java
+++ b/src/org/linphone/assistant/EchoCancellerCalibrationFragment.java
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 import java.net.URL;
 
 import org.linphone.LinphoneManager;
-import org.linphone.LinphonePreferences;
 import org.linphone.R;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCore;
diff --git a/src/org/linphone/assistant/LinphoneLoginFragment.java b/src/org/linphone/assistant/LinphoneLoginFragment.java
index 09cd92f56..cc693bbe7 100644
--- a/src/org/linphone/assistant/LinphoneLoginFragment.java
+++ b/src/org/linphone/assistant/LinphoneLoginFragment.java
@@ -17,12 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-import org.linphone.LinphoneManager;
 import org.linphone.R;
 
 import android.app.Fragment;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
diff --git a/src/org/linphone/assistant/RemoteProvisioningFragment.java b/src/org/linphone/assistant/RemoteProvisioningFragment.java
index 3373763cb..6fd08962e 100644
--- a/src/org/linphone/assistant/RemoteProvisioningFragment.java
+++ b/src/org/linphone/assistant/RemoteProvisioningFragment.java
@@ -1,4 +1,23 @@
 package org.linphone.assistant;
+/*
+RemoteProvisioningFragment.java
+Copyright (C) 2014  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 
 import org.linphone.LinphoneActivity;
 import org.linphone.LinphoneLauncherActivity;
diff --git a/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java b/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
index f0448a5dd..cc40937f2 100644
--- a/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
+++ b/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
@@ -33,7 +33,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 
 /**
  * @author Sylvain Berfini