diff --git a/res/drawable-land-xhdpi/splashscreen.png b/res/drawable-land-xhdpi/splashscreen.png
new file mode 100644
index 000000000..6ef7aa0c1
Binary files /dev/null and b/res/drawable-land-xhdpi/splashscreen.png differ
diff --git a/res/drawable-xhdpi/splashscreen.png b/res/drawable-xhdpi/splashscreen.png
new file mode 100644
index 000000000..168900c1c
Binary files /dev/null and b/res/drawable-xhdpi/splashscreen.png differ
diff --git a/res/drawable-xlarge-land-xhdpi/splashscreen.png b/res/drawable-xlarge-land-xhdpi/splashscreen.png
new file mode 100644
index 000000000..6ef7aa0c1
Binary files /dev/null and b/res/drawable-xlarge-land-xhdpi/splashscreen.png differ
diff --git a/res/drawable-xlarge-xhdpi/splashscreen.png b/res/drawable-xlarge-xhdpi/splashscreen.png
new file mode 100644
index 000000000..168900c1c
Binary files /dev/null and b/res/drawable-xlarge-xhdpi/splashscreen.png differ
diff --git a/res/drawable/splashscreen.png b/res/drawable/splashscreen.png
deleted file mode 100644
index 4018be680..000000000
Binary files a/res/drawable/splashscreen.png and /dev/null differ
diff --git a/res/layout-small/setup_generic_login.xml b/res/layout-small/setup_generic_login.xml
new file mode 100644
index 000000000..42abbe140
--- /dev/null
+++ b/res/layout-small/setup_generic_login.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+    
+    <ImageView 
+	    android:contentDescription="@string/content_description_welcome"
+	    android:paddingTop="40dp"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:visibility="gone"
+	    android:src="@drawable/setup_title_assistant"/>
+    
+    <TextView 
+	    android:paddingTop="10dp"
+	    android:gravity="center"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:text="@string/setup_general_account_hint"
+        android:textColor="@android:color/black"/>
+    
+    <LinearLayout 
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent"
+	    android:paddingTop="40dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+	    android:gravity="center"
+	    android:orientation="vertical">
+        
+        <EditText
+            android:id="@+id/setup_username"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/setup_username_hint"
+            android:inputType="textEmailAddress"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:singleLine="true"
+            android:textColor="@android:color/black"
+            android:background="@drawable/setup_field_background" />
+        
+        <EditText
+            android:id="@+id/setup_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/setup_password_hint"
+            android:inputType="textPassword"
+            android:layout_marginTop="5dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:singleLine="true"
+            android:textColor="@android:color/black"
+            android:background="@drawable/setup_field_background" />
+        
+        <EditText
+            android:id="@+id/setup_domain"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/setup_domain_hint"
+            android:inputType="textEmailAddress"
+            android:layout_marginTop="5dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:singleLine="true"
+            android:textColor="@android:color/black"
+            android:background="@drawable/setup_field_background" />
+        
+        <RelativeLayout
+            android:layout_marginTop="10dp"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content">
+            
+	        <ImageView
+	    		android:contentDescription="@string/content_description_validate"
+	            android:id="@+id/setup_apply"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:src="@drawable/button"
+		    	android:layout_centerInParent="true" />
+	        
+	         <TextView 
+		    	android:layout_centerInParent="true"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:text="@string/setup_apply"
+			    android:textColor="@android:color/black"/>
+        
+        </RelativeLayout>
+        
+        <View
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp" />
+        
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-small/setup_linphone_login.xml b/res/layout-small/setup_linphone_login.xml
new file mode 100644
index 000000000..c82f33dc4
--- /dev/null
+++ b/res/layout-small/setup_linphone_login.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    
+    <ImageView 
+   		android:contentDescription="@string/content_description_welcome"
+	    android:paddingTop="40dp"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:visibility="gone"
+	    android:src="@drawable/setup_title_assistant"/>
+    
+    <TextView 
+	    android:paddingTop="10dp"
+	    android:gravity="center"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:text="@string/setup_linphone_account_hint"
+        android:textColor="@android:color/black"/>
+    
+    <LinearLayout 
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent"
+	    android:paddingTop="40dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+	    android:gravity="center"
+	    android:orientation="vertical">
+        
+        <EditText
+            android:id="@+id/setup_username"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/setup_username_hint"
+            android:inputType="textEmailAddress"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:singleLine="true"
+            android:textColor="@android:color/black"
+            android:background="@drawable/setup_field_background" />
+        
+        <EditText
+            android:id="@+id/setup_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/setup_password_hint"
+            android:inputType="textPassword"
+            android:layout_marginTop="5dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:singleLine="true"
+            android:textColor="@android:color/black"
+            android:background="@drawable/setup_field_background" />
+        
+        <RelativeLayout
+            android:layout_marginTop="10dp"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content">
+            
+	        <ImageView
+	    		android:contentDescription="@string/content_description_validate"
+	            android:id="@+id/setup_apply"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:src="@drawable/button"
+		    	android:layout_centerInParent="true" />
+	        
+	         <TextView 
+		    	android:layout_centerInParent="true"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:text="@string/setup_apply"
+			    android:textColor="@android:color/black"/>
+        
+        </RelativeLayout>
+        
+        <View
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp" />
+        
+    </LinearLayout>
+    
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-small/setup_wizard.xml b/res/layout-small/setup_wizard.xml
new file mode 100644
index 000000000..af87e3974
--- /dev/null
+++ b/res/layout-small/setup_wizard.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+    
+    <ImageView 
+   		android:contentDescription="@string/content_description_welcome"
+	    android:paddingTop="40dp"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:visibility="gone"
+	    android:src="@drawable/setup_title_assistant"/>
+    
+   	<TextView 
+	    android:paddingTop="10dp"
+	    android:gravity="center"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:id="@+id/setup_error"
+        android:textColor="#ffff0000"/>
+    
+    <LinearLayout 
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent"
+	    android:paddingTop="40dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+	    android:gravity="center"
+	    android:orientation="vertical">
+        
+        <RelativeLayout 
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            
+	        <EditText
+	            android:id="@+id/setup_username"
+	            android:layout_width="match_parent"
+	            android:layout_height="wrap_content"
+	            android:hint="@string/setup_username_hint"
+	            android:inputType="textEmailAddress"
+	            android:paddingLeft="10dp"
+	            android:paddingRight="10dp"
+	            android:singleLine="true"
+	            android:textColor="@android:color/black"
+            	android:background="@drawable/setup_field_background" />
+	        
+	        <ImageView 
+	    		android:contentDescription="@string/content_description_setup_ok"
+	            android:id="@+id/setup_username_ok"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:paddingRight="5dp"
+	            android:layout_centerVertical="true"
+	            android:layout_alignParentRight="true"
+	            android:src="@drawable/wizard_notok"/>
+        
+        </RelativeLayout>
+        
+        <RelativeLayout 
+           	android:layout_marginTop="5dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            
+	        <EditText
+	            android:id="@+id/setup_password"
+	            android:layout_width="match_parent"
+	            android:layout_height="wrap_content"
+	            android:hint="@string/setup_password_hint"
+	            android:inputType="textPassword"
+	            android:paddingLeft="10dp"
+	            android:paddingRight="10dp"
+	            android:singleLine="true"
+	            android:textColor="@android:color/black"
+            	android:background="@drawable/setup_field_background" />
+	        
+	        <EditText
+	            android:id="@+id/setup_password_confirm"
+	            android:layout_width="match_parent"
+	            android:layout_height="wrap_content"
+	            android:layout_below="@id/setup_password"
+	            android:hint="@string/setup_password_confirm_hint"
+	            android:inputType="textPassword"
+	            android:paddingLeft="10dp"
+	            android:paddingRight="10dp"
+	            android:singleLine="true"
+	            android:textColor="@android:color/black"
+            	android:background="@drawable/setup_field_background" />
+	        
+	        <ImageView 
+	    		android:contentDescription="@string/content_description_setup_ok"
+	            android:id="@+id/setup_password_ok"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:paddingRight="5dp"
+	            android:layout_alignParentRight="true"
+	            android:layout_centerVertical="true"
+	            android:src="@drawable/wizard_notok"/>
+        
+        </RelativeLayout>
+        
+        <RelativeLayout 
+           	android:layout_marginTop="5dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            
+        	<EditText
+	            android:id="@+id/setup_email"
+	            android:layout_width="match_parent"
+	            android:layout_height="wrap_content"
+	            android:hint="@string/setup_email_hint"
+	            android:inputType="textEmailAddress"
+	            android:paddingLeft="10dp"
+	            android:paddingRight="10dp"
+	            android:singleLine="true"
+	            android:textColor="@android:color/black"
+            	android:background="@drawable/setup_field_background" />
+	        
+	        <ImageView 
+	    		android:contentDescription="@string/content_description_setup_ok"
+	            android:id="@+id/setup_email_ok"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:paddingRight="5dp"
+	            android:layout_centerVertical="true"
+	            android:layout_alignParentRight="true"
+	            android:src="@drawable/wizard_notok"/>
+        
+        </RelativeLayout>
+        
+        <RelativeLayout
+            android:layout_marginTop="10dp"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content">
+            
+	        <ImageView
+	    		android:contentDescription="@string/content_description_validate"
+	            android:id="@+id/setup_create"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:src="@drawable/button"
+		    	android:layout_centerInParent="true" />
+	        
+	         <TextView 
+		    	android:layout_centerInParent="true"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:text="@string/setup_create"
+			    android:textColor="@android:color/black"/>
+        
+        </RelativeLayout>
+        
+        <View
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp" />
+        
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-small/setup_wizard_confirm.xml b/res/layout-small/setup_wizard_confirm.xml
new file mode 100644
index 000000000..cd76d7a35
--- /dev/null
+++ b/res/layout-small/setup_wizard_confirm.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical" >
+    
+    <ImageView 
+	    android:paddingTop="40dp"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:visibility="gone"
+	    android:src="@drawable/setup_title_assistant"/>
+    
+    <TextView 
+	    android:paddingTop="40dp"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:text="@string/setup_validate_account"
+	    android:textColor="@android:color/black" />
+    
+    <RelativeLayout
+    	android:layout_marginTop="20dp"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content">
+           
+        <ImageView
+            android:id="@+id/setup_check"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/button"
+	    	android:layout_centerInParent="true" />
+        
+         <TextView 
+	    	android:layout_centerInParent="true"
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:text="@string/setup_check_account_validation"
+		    android:textColor="@android:color/black" />
+       
+       </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/setup_wizard_confirm.xml b/res/layout/setup_wizard_confirm.xml
index 757cf1d9a..c48c30967 100644
--- a/res/layout/setup_wizard_confirm.xml
+++ b/res/layout/setup_wizard_confirm.xml
@@ -19,7 +19,7 @@
 	    android:textColor="@android:color/black" />
     
     <RelativeLayout
-    	android:paddingTop="20dp"
+    	android:layout_marginTop="20dp"
 	    android:layout_width="match_parent"
 	    android:layout_height="wrap_content">
            
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 970da3872..14188b59c 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -720,7 +720,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			enableDisableAudioCodec("SILK", 12000, 1, R.string.pref_codec_silk12_key);
 			enableDisableAudioCodec("SILK", 8000, 1, R.string.pref_codec_silk8_key);
 
-
 			// Configure video codecs
 			for (PayloadType videoCodec : mLc.getVideoCodecs()) {
 				enableDisableVideoCodecs(videoCodec);