diff --git a/res/layout-sw533dp-land/main.xml b/res/layout-sw533dp-land/main.xml
index f88231705..ac85fef4b 100644
--- a/res/layout-sw533dp-land/main.xml
+++ b/res/layout-sw533dp-land/main.xml
@@ -90,14 +90,16 @@
 	            android:id="@+id/fragmentContainer"
 	            android:layout_width="match_parent"
 	            android:layout_height="match_parent"
-	            android:layout_weight="0.67" />
+	            android:layout_weight="0.67"
+	            android:orientation="horizontal" />
 	        
 	        <LinearLayout
 	            android:id="@+id/fragmentContainer2"
 	            android:visibility="gone"
 	            android:layout_width="match_parent"
 	            android:layout_height="match_parent"
-	            android:layout_weight="0.33" />
+	            android:layout_weight="0.33"
+	            android:orientation="horizontal"/>
         
         </LinearLayout>
 
diff --git a/res/layout-sw533dp-land/setup.xml b/res/layout-sw533dp-land/setup.xml
new file mode 100644
index 000000000..4f0fe608c
--- /dev/null
+++ b/res/layout-sw533dp-land/setup.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+  	android:background="@drawable/background"
+	android:layout_height="match_parent">
+	
+	<LinearLayout
+		android:id="@+id/fragmentContainer"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:padding="20dp"
+		android:layout_above="@id/menu"
+		android:orientation="horizontal" />
+	  
+	<LinearLayout
+		android:id="@+id/menu"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:orientation="horizontal">
+	    
+		<include layout="@layout/setup_cancel_button" />
+		          
+		<include layout="@layout/setup_next_button" />
+		
+		<include layout="@layout/setup_back_button" />    
+	  
+	</LinearLayout>
+ 
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp-land/setup_generic_login.xml b/res/layout-sw533dp-land/setup_generic_login.xml
new file mode 100644
index 000000000..4d4aafa67
--- /dev/null
+++ b/res/layout-sw533dp-land/setup_generic_login.xml
@@ -0,0 +1,96 @@
+<?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: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="wrap_content"
+	    android:paddingTop="40dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+	    android:gravity="center"
+	    android:orientation="vertical">
+        
+        <EditText
+            android:textCursorDrawable="@null"
+            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:textCursorDrawable="@null"
+            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:textCursorDrawable="@null"
+            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>
+        
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp-land/setup_linphone_login.xml b/res/layout-sw533dp-land/setup_linphone_login.xml
new file mode 100644
index 000000000..53effc74f
--- /dev/null
+++ b/res/layout-sw533dp-land/setup_linphone_login.xml
@@ -0,0 +1,83 @@
+<?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: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="wrap_content"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:paddingTop="40dp"
+	    android:gravity="center"
+	    android:orientation="vertical">
+        
+        <EditText
+            android:textCursorDrawable="@null"
+            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:textCursorDrawable="@null"
+            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:id="@+id/setup_apply_button"
+            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>
+        
+    </LinearLayout>
+    
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp-land/setup_menu.xml b/res/layout-sw533dp-land/setup_menu.xml
new file mode 100644
index 000000000..bd465eff1
--- /dev/null
+++ b/res/layout-sw533dp-land/setup_menu.xml
@@ -0,0 +1,121 @@
+<?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:paddingTop="40dp"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:src="@drawable/setup_title_assistant"/>
+    
+    <LinearLayout 
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:gravity="center"
+	    android:paddingTop="40dp"
+	    android:orientation="vertical">
+        
+        <RelativeLayout
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:layout_weight="1"
+            android:paddingLeft="10dp"
+            android:layout_marginTop="10dp"
+            android:paddingRight="10dp">
+            
+	        <ImageView
+	            android:id="@+id/setup_create_account"
+	            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_account"
+			    android:textColor="@android:color/black"/>
+        
+        </RelativeLayout>
+        
+        <RelativeLayout
+            android:id="@+id/setup_login_linphone_layout"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:layout_weight="1"
+            android:layout_marginTop="10dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp">
+            
+	        <ImageView
+	            android:id="@+id/setup_login_linphone"
+	            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_login_linphone"
+			    android:textColor="@android:color/black"/>
+	        
+        </RelativeLayout>
+        
+        <RelativeLayout
+            android:id="@+id/setup_login_generic_layout"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:layout_weight="1" 
+            android:layout_marginTop="10dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp">
+            
+	        <ImageView
+	            android:id="@+id/setup_login_generic"
+	            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_login_generic"
+			    android:textColor="@android:color/black"/>
+        
+        </RelativeLayout>
+        
+        <RelativeLayout
+            android:id="@+id/setup_remote_provisioning_layout"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:layout_weight="1"    
+            android:layout_marginTop="10dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp">
+            
+	        <ImageView
+	            android:id="@+id/setup_remote_provisioning"
+	            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_remote_provisioning"
+			    android:textColor="@android:color/black"/>
+        
+        </RelativeLayout>
+        
+    </LinearLayout>
+    
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp-land/setup_wizard.xml b/res/layout-sw533dp-land/setup_wizard.xml
new file mode 100644
index 000000000..c24f77ff0
--- /dev/null
+++ b/res/layout-sw533dp-land/setup_wizard.xml
@@ -0,0 +1,174 @@
+<?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: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="wrap_content"
+        android:gravity="center"
+        android:paddingTop="40dp"
+        android:paddingLeft="10dp"      
+        android:paddingRight="10dp" 
+        android:orientation="vertical" >
+        
+        <RelativeLayout 
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            
+	        <EditText
+	            android:textCursorDrawable="@null"
+	            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:textCursorDrawable="@null"
+	            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" />
+	        
+	        <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:textCursorDrawable="@null"
+	            android:id="@+id/setup_password_confirm"
+	            android:layout_width="match_parent"
+	            android:layout_height="wrap_content"
+	            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_confirm_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:textCursorDrawable="@null"
+	            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>
+        
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file