diff --git a/res/layout-land/assistant_linphone_login.xml b/res/layout-land/assistant_linphone_login.xml
deleted file mode 100644
index 96877d420..000000000
--- a/res/layout-land/assistant_linphone_login.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?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">
-
-	<TextView
-		android:text="@string/assistant_linphone_account"
-		android:contentDescription="@string/content_description_welcome"
-		style="@style/font6"
-		android:textAllCaps="true"
-		android:padding="5dp"
-		android:layout_gravity="center"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:gravity="center_horizontal"/>
-
-	<TableLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-
-		<TableRow
-			android:layout_weight="1"
-			android:gravity="center">
-
-			<TextView
-				android:text="@string/username"
-				style="@style/font13"
-				android:textAllCaps="true"
-				android:layout_marginLeft="5dp"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_weight="1"/>
-
-			<TextView
-				android:text="@string/password"
-				style="@style/font13"
-				android:textAllCaps="true"
-				android:layout_marginLeft="5dp"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_weight="1"/>
-
-		</TableRow>
-
-		<TableRow
-			android:layout_weight="1"
-			android:gravity="center">
-
-			<EditText
-				android:id="@+id/assistant_username"
-				android:background="@drawable/resizable_textfield"
-				android:textColor="@color/colorB"
-				android:textCursorDrawable="@null"
-				android:inputType="textEmailAddress"
-				android:layout_width="0dp"
-				android:layout_height="30dp"
-				android:layout_weight="1"
-				android:layout_margin="5dp"
-				android:singleLine="true"/>
-
-			<EditText
-				android:id="@+id/assistant_password"
-				android:background="@drawable/resizable_textfield"
-				android:textColor="@color/colorB"
-				android:textCursorDrawable="@null"
-				android:inputType="textPassword"
-				android:layout_width="0dp"
-				android:layout_height="30dp"
-				android:layout_weight="1"
-				android:layout_margin="5dp"
-				android:singleLine="true"/>
-		</TableRow>
-
-		<TableRow
-			android:layout_weight="1"
-			android:gravity="center">
-
-			<TextView
-				android:text="@string/assistant_display_name_optional"
-				style="@style/font13"
-				android:textAllCaps="true"
-				android:layout_marginLeft="5dp"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_weight="1"/>
-
-			<TextView
-				android:layout_margin="5dp"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_weight="1"/>
-
-		</TableRow>
-
-		<TableRow
-			android:layout_weight="1"
-			android:gravity="center">
-
-			<EditText
-				android:id="@+id/assistant_display_name"
-				android:background="@drawable/resizable_textfield"
-				android:textColor="@color/colorB"
-				android:textCursorDrawable="@null"
-				android:inputType="textEmailAddress"
-				android:layout_width="0dp"
-				android:layout_height="30dp"
-				android:layout_weight="1"
-				android:layout_margin="5dp"
-				android:singleLine="true"/>
-
-			<TextView
-				android:layout_margin="5dp"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_weight="1"/>
-		</TableRow>
-
-	</TableLayout>
-
-	<Button
-		android:id="@+id/assistant_apply"
-		android:text="@string/assistant_login"
-		android:background="@drawable/assistant_button"
-		style="@style/font8"
-		android:contentDescription="@string/content_description_validate"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_margin="10dp"
-		android:layout_gravity="center_horizontal"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-land/call_outgoing.xml b/res/layout-land/call_outgoing.xml
index 88b3e9560..64f02eebe 100644
--- a/res/layout-land/call_outgoing.xml
+++ b/res/layout-land/call_outgoing.xml
@@ -135,7 +135,7 @@
 			android:padding="20dp"/>
 
 		<ImageView
-			android:id="@+id/hang_up"
+			android:id="@+id/outgoing_hang_up"
 			android:src="@drawable/call_hangup"
 			android:background="@drawable/hangup"
 			android:contentDescription="@string/content_description_hang_up"
diff --git a/res/layout-sw533dp-land/assistant_account_creation.xml b/res/layout-sw533dp-land/assistant_account_creation.xml
new file mode 100644
index 000000000..38415e4e4
--- /dev/null
+++ b/res/layout-sw533dp-land/assistant_account_creation.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="30dp"
+		android:orientation="vertical">
+
+		<TextView
+			android:text="@string/assistant_create_account"
+			style="@style/font6"
+			android:textAllCaps="true"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"/>
+
+		<TextView
+			android:text="@string/assistant_create_account_part_1"
+			style="@style/font11"
+			android:paddingTop="10dp"
+			android:layout_gravity="center"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>
+
+		<TableLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="30dp"
+			android:orientation="horizontal">
+
+		<TableRow
+			android:layout_weight="1"
+			android:gravity="center"
+			android:layout_marginLeft="10dp"
+			android:layout_marginRight="10dp">
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="0dp"
+				android:layout_weight="1"
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:id="@+id/username_label"
+					android:text="@string/username"
+					style="@style/font13"
+					android:textAllCaps="true"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
+				<EditText
+					android:id="@+id/username"
+					android:background="@drawable/resizable_textfield"
+					android:textColor="@color/colorB"
+					android:inputType="text|textEmailAddress"
+					android:layout_width="match_parent"
+					android:layout_height="40dp"
+					android:singleLine="true"/>
+
+				<TextView
+					android:id="@+id/username_error"
+					android:text="@string/error"
+					style="@style/font20"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="invisible"/>
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:paddingLeft="30dp"
+				android:layout_width="0dp"
+				android:layout_weight="1"
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:id="@+id/password_label"
+					style="@style/font13"
+					android:text="@string/password"
+					android:textAllCaps="true"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
+				<EditText
+					android:id="@+id/password"
+					android:background="@drawable/resizable_textfield"
+					android:textColor="@color/colorB"
+					android:inputType="textPassword"
+					android:textCursorDrawable="@null"
+					android:layout_width="match_parent"
+					android:layout_height="40dp"
+					android:paddingLeft="10dp"
+					android:paddingRight="10dp"
+					android:singleLine="true"/>
+
+				<TextView
+					android:id="@+id/password_error"
+					android:text="@string/error"
+					style="@style/font20"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="invisible"/>
+
+			</LinearLayout>
+		</TableRow>
+
+		<TableRow
+			android:layout_weight="1"
+			android:gravity="center"
+			android:layout_marginLeft="10dp"
+			android:layout_marginRight="10dp">
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="0dp"
+				android:layout_weight="1"
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:id="@+id/confirm_password_label"
+					android:text="@string/confirm_password"
+					style="@style/font13"
+					android:textAllCaps="true"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
+				<EditText
+					android:id="@+id/confirm_password"
+					android:background="@drawable/resizable_textfield"
+					android:textColor="@color/colorB"
+					android:inputType="textPassword"
+					android:textCursorDrawable="@null"
+					android:layout_width="match_parent"
+					android:layout_height="40dp"
+					android:paddingLeft="10dp"
+					android:paddingRight="10dp"
+					android:singleLine="true"/>
+
+				<TextView
+					android:id="@+id/confirm_password_error"
+					android:text="@string/error"
+					style="@style/font20"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="invisible"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="0dp"
+				android:layout_weight="1"
+				android:paddingLeft="30dp"
+				android:layout_height="wrap_content">
+
+			<TextView
+					android:id="@+id/email_label"
+					android:text="@string/email"
+					style="@style/font13"
+					android:textAllCaps="true"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
+				<EditText
+					android:id="@+id/email"
+					android:background="@drawable/resizable_textfield"
+					android:textColor="@color/colorB"
+					android:inputType="text|textEmailAddress"
+					android:textCursorDrawable="@null"
+					android:layout_width="match_parent"
+					android:layout_height="40dp"
+					android:paddingLeft="10dp"
+					android:paddingRight="10dp"
+					android:singleLine="true"/>
+
+				<TextView
+					android:id="@+id/email_error"
+					android:text="@string/error"
+					style="@style/font20"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="invisible"/>
+
+			</LinearLayout>
+		</TableRow>
+	</TableLayout>
+
+	<Button
+		android:id="@+id/assistant_create"
+		android:text="@string/assistant_create_account"
+		android:background="@drawable/assistant_button"
+		android:textColor="@drawable/assistant_button_text_color"
+		style="@style/font8"
+		android:layout_gravity="center"
+		android:layout_width="wrap_content"
+		android:layout_height="40dp"
+		android:paddingLeft="10dp"
+		android:paddingRight="10dp"
+		android:layout_marginTop="20dp"/>
+
+	</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout-sw533dp-land/assistant_linphone_login.xml b/res/layout-sw533dp-land/assistant_linphone_login.xml
new file mode 100644
index 000000000..ba91408ed
--- /dev/null
+++ b/res/layout-sw533dp-land/assistant_linphone_login.xml
@@ -0,0 +1,132 @@
+<?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:padding="30dp"
+    android:orientation="vertical">
+
+	<TextView
+		android:text="@string/assistant_linphone_account"
+		style="@style/font6"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"/>
+
+	<TextView
+		android:text="@string/assistant_linphone_login_desc"
+		style="@style/font11"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="10dp"
+		android:layout_gravity="center"/>
+
+	<TableLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="30dp"
+		android:orientation="horizontal">
+
+		<TableRow
+			android:layout_weight="1"
+			android:gravity="center"
+			android:layout_margin="10dp">
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="0dp"
+				android:layout_weight="1"
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:text="@string/username"
+					style="@style/font13"
+					android:textAllCaps="true"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
+				<EditText
+					android:id="@+id/assistant_username"
+					android:background="@drawable/resizable_textfield"
+					android:textColor="@color/colorB"
+					android:inputType="text|textEmailAddress"
+					android:layout_width="match_parent"
+					android:layout_height="40dp"
+					android:singleLine="true"/>
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:paddingLeft="30dp"
+				android:layout_width="0dp"
+				android:layout_weight="1"
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:text="@string/password"
+					style="@style/font13"
+					android:textAllCaps="true"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
+				<EditText
+					android:id="@+id/assistant_password"
+					android:background="@drawable/resizable_textfield"
+					android:textColor="@color/colorB"
+					android:inputType="textPassword"
+					android:layout_width="match_parent"
+					android:layout_height="40dp"
+					android:singleLine="true"/>
+			</LinearLayout>
+		</TableRow>
+
+		<TableRow
+			android:layout_weight="1"
+			android:gravity="center"
+			android:layout_margin="10dp">
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="0dp"
+				android:layout_weight="1"
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:text="@string/assistant_display_name_optional"
+					style="@style/font13"
+					android:textAllCaps="true"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
+				<EditText
+					android:id="@+id/assistant_display_name"
+					android:background="@drawable/resizable_textfield"
+					android:textColor="@color/colorB"
+					android:inputType="textEmailAddress"
+					android:layout_width="match_parent"
+					android:layout_height="40dp"
+					android:singleLine="true"/>
+			</LinearLayout>
+
+			<View
+				android:layout_width="0dp"
+				android:layout_weight="1"
+				android:layout_height="0dp"/>
+
+		</TableRow>
+	</TableLayout>
+
+	<Button
+		android:id="@+id/assistant_apply"
+		android:text="@string/assistant_login"
+		android:background="@drawable/assistant_button"
+		android:textColor="@drawable/assistant_button_text_color"
+		style="@style/font8"
+		android:layout_gravity="center"
+		android:layout_width="wrap_content"
+		android:layout_height="40dp"
+		android:paddingLeft="10dp"
+		android:paddingRight="10dp"
+		android:layout_marginTop="20dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp-land/assistant_login.xml b/res/layout-sw533dp-land/assistant_login.xml
new file mode 100644
index 000000000..0f36ca6cb
--- /dev/null
+++ b/res/layout-sw533dp-land/assistant_login.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="fill_parent">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:padding="30dp"
+		android:orientation="vertical">
+
+		<TextView
+			android:text="@string/assistant_generic_account"
+			style="@style/font6"
+			android:textAllCaps="true"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"/>
+
+		<TextView
+			android:text="@string/assistant_login_desc"
+			style="@style/font11"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:paddingTop="10dp"
+			android:layout_gravity="center"/>
+
+		<TableLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="30dp"
+			android:orientation="horizontal">
+
+			<TableRow
+				android:layout_weight="1"
+				android:gravity="center"
+				android:layout_margin="10dp">
+
+				<LinearLayout
+					android:orientation="vertical"
+					android:layout_width="0dp"
+					android:layout_weight="1"
+					android:layout_height="wrap_content">
+
+					<TextView
+						android:text="@string/username"
+						style="@style/font13"
+						android:textAllCaps="true"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
+
+					<EditText
+						android:id="@+id/assistant_username"
+						android:background="@drawable/resizable_textfield"
+						android:textColor="@color/colorB"
+						android:inputType="text|textEmailAddress"
+						android:layout_width="match_parent"
+						android:layout_height="40dp"
+						android:singleLine="true"/>
+				</LinearLayout>
+
+				<LinearLayout
+					android:orientation="vertical"
+					android:paddingLeft="30dp"
+					android:layout_width="0dp"
+					android:layout_weight="1"
+					android:layout_height="wrap_content">
+
+					<TextView
+						android:text="@string/password"
+						style="@style/font13"
+						android:textAllCaps="true"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
+
+					<EditText
+						android:id="@+id/assistant_password"
+						android:background="@drawable/resizable_textfield"
+						android:textColor="@color/colorB"
+						android:inputType="textPassword"
+						android:layout_width="match_parent"
+						android:layout_height="40dp"
+						android:singleLine="true"/>
+				</LinearLayout>
+			</TableRow>
+
+			<TableRow
+				android:layout_weight="1"
+				android:gravity="center"
+				android:layout_margin="10dp">
+
+				<LinearLayout
+					android:orientation="vertical"
+					android:layout_width="0dp"
+					android:layout_weight="1"
+					android:layout_height="wrap_content">
+
+					<TextView
+						android:text="@string/assistant_display_name_optional"
+						style="@style/font13"
+						android:textAllCaps="true"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
+
+					<EditText
+						android:id="@+id/assistant_display_name"
+						android:background="@drawable/resizable_textfield"
+						android:textColor="@color/colorB"
+						android:inputType="textEmailAddress"
+						android:layout_width="match_parent"
+						android:layout_height="40dp"
+						android:singleLine="true"/>
+				</LinearLayout>
+
+				<LinearLayout
+					android:orientation="vertical"
+					android:layout_width="0dp"
+					android:layout_weight="1"
+					android:paddingLeft="30dp"
+					android:layout_height="wrap_content">
+
+					<TextView
+						android:text="@string/domain"
+						style="@style/font13"
+						android:textAllCaps="true"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
+
+					<EditText
+						android:id="@+id/assistant_domain"
+						android:background="@drawable/resizable_textfield"
+						android:textColor="@color/colorB"
+						android:inputType="textEmailAddress"
+						android:layout_width="match_parent"
+						android:layout_height="40dp"
+						android:singleLine="true"/>
+				</LinearLayout>
+
+			</TableRow>
+
+			<TableRow
+				android:layout_weight="1"
+				android:gravity="center"
+				android:layout_margin="10dp">
+
+				<LinearLayout
+					android:orientation="vertical"
+					android:layout_width="0dp"
+					android:layout_weight="1"
+					android:layout_height="wrap_content">
+
+					<TextView
+						android:text="@string/transport"
+						style="@style/font13"
+						android:textAllCaps="true"
+						android:gravity="center"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
+
+					<RadioGroup
+						android:id="@+id/assistant_transports"
+						android:orientation="horizontal"
+						android:gravity="center"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content">
+
+						<RadioButton
+							android:id="@+id/transport_udp"
+							android:text="@string/pref_transport_udp"
+							android:layout_margin="5dp"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"/>
+
+						<RadioButton
+							android:id="@+id/transport_tcp"
+							android:text="@string/pref_transport_tcp"
+							android:layout_margin="5dp"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"/>
+
+						<RadioButton
+							android:id="@+id/transport_tls"
+							android:text="@string/pref_transport_tls"
+							android:layout_margin="5dp"
+							android:checked="true"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"/>
+					</RadioGroup>
+
+				</LinearLayout>
+			</TableRow>
+		</TableLayout>
+
+		<Button
+			android:id="@+id/assistant_apply"
+			android:text="@string/assistant_login"
+			android:background="@drawable/assistant_button"
+			android:textColor="@drawable/assistant_button_text_color"
+			style="@style/font8"
+			android:layout_gravity="center"
+			android:layout_width="wrap_content"
+			android:layout_height="40dp"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:layout_marginTop="20dp"/>
+
+	</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout-sw533dp-land/assistant_welcome.xml b/res/layout-sw533dp-land/assistant_welcome.xml
new file mode 100644
index 000000000..102aa04da
--- /dev/null
+++ b/res/layout-sw533dp-land/assistant_welcome.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="30dp"
+		android:orientation="vertical">
+
+		<TextView
+			android:text="@string/welcome"
+			style="@style/font6"
+			android:textAllCaps="true"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"/>
+
+		<TextView
+			android:text="@string/assistant_welcome_desc"
+			style="@style/font11"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:paddingTop="20dp"
+			android:layout_gravity="center"/>
+
+		<TableLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="30dp"
+			android:orientation="horizontal">
+
+		<TableRow
+			android:layout_weight="1"
+			android:gravity="center"
+			android:layout_margin="10dp">
+
+			<Button
+				android:id="@+id/create_account"
+				android:text="@string/assistant_create_account"
+				android:background="@drawable/assistant_button"
+				style="@style/font8"
+				android:contentDescription="@string/assistant_create_account"
+				android:layout_width="0dp"
+				android:layout_weight="1"
+				android:layout_height="40dp"/>
+
+			<Button
+				android:id="@+id/login_linphone"
+				android:text="@string/assistant_login_linphone"
+				android:background="@drawable/assistant_button"
+				style="@style/font8"
+				android:contentDescription="@string/assistant_login_linphone"
+				android:layout_width="0dp"
+				android:layout_weight="1"
+				android:layout_height="40dp"
+				android:layout_marginLeft="30dp"/>
+		</TableRow>
+
+		<TableRow
+			android:layout_weight="1"
+			android:gravity="center"
+			android:layout_margin="10dp">
+
+			<Button
+				android:id="@+id/login_generic"
+				android:text="@string/assistant_login_generic"
+				android:background="@drawable/assistant_button"
+				style="@style/font8"
+				android:contentDescription="@string/assistant_login_generic"
+				android:layout_width="0dp"
+				android:layout_weight="1"
+				android:layout_height="40dp"/>
+
+			<Button
+				android:id="@+id/remote_provisioning"
+				android:text="@string/assistant_remote_provisioning"
+				android:background="@drawable/assistant_button"
+				style="@style/font8"
+				android:contentDescription="@string/assistant_remote_provisioning"
+				android:layout_width="0dp"
+				android:layout_weight="1"
+				android:layout_height="40dp"
+				android:layout_marginLeft="30dp"/>
+
+		</TableRow>
+	</TableLayout>
+
+	</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout-sw533dp-land/call.xml b/res/layout-sw533dp-land/call.xml
new file mode 100644
index 000000000..561a27ade
--- /dev/null
+++ b/res/layout-sw533dp-land/call.xml
@@ -0,0 +1,463 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/topLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+	<fragment
+		android:id="@+id/status"
+		android:name="org.linphone.StatusFragment"
+		android:layout_width="match_parent"
+		android:layout_height="35dp"
+		tools:layout="@layout/status" />
+
+
+	<android.support.v4.widget.DrawerLayout
+		android:id="@+id/side_menu"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_below="@id/status">
+
+		<RelativeLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_below="@id/status">
+
+			<LinearLayout
+				android:id="@+id/fragmentContainer"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:orientation="horizontal" />
+
+			<FrameLayout
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:layout_above="@+id/menu">
+
+				<RelativeLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content">
+
+					<LinearLayout
+						android:id="@+id/conference_list"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_gravity="top"
+						android:layout_alignParentTop="true"
+						android:orientation="vertical"
+						android:visibility="gone">
+					</LinearLayout>
+
+					<RelativeLayout
+						android:id="@+id/active_call"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:visibility="visible">
+
+						<LinearLayout
+							android:id="@+id/active_call_info"
+							android:background="@color/colorH"
+							android:alpha="0.8"
+							android:paddingBottom="10dp"
+							android:layout_width="match_parent"
+							android:layout_height="60dp"
+							android:gravity="center_horizontal"
+							android:orientation="horizontal">
+
+							<TextView
+								android:id="@+id/current_contact_name"
+								style="@style/font5"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_gravity="bottom"/>
+
+							<Chronometer
+								android:id="@+id/current_call_timer"
+								style="@style/font2"
+								android:layout_marginLeft="10dp"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_gravity="bottom"/>
+						</LinearLayout>
+
+						<RelativeLayout
+							android:id="@+id/avatar_layout"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:layout_below="@id/active_call_info"
+							android:layout_margin="5dp"
+							android:paddingTop="10dp"
+							android:gravity="center_horizontal">
+
+							<ImageView
+								android:id="@+id/contact_picture"
+								android:src="@drawable/avatar"
+								android:contentDescription="@string/content_description_contact_picture"
+								android:layout_width="150dp"
+								android:layout_height="150dp"
+								android:adjustViewBounds="true"/>
+
+							<ImageView
+								android:id="@+id/mask"
+								android:src="@drawable/avatar_mask_border"
+								android:contentDescription="@string/content_description_contact_picture"
+								android:layout_width="150dp"
+								android:layout_height="150dp"
+								android:adjustViewBounds="true"/>
+
+						</RelativeLayout>
+
+						<LinearLayout
+							android:id="@+id/remote_pause"
+							android:background="@color/colorC"
+							android:alpha="0.9"
+							android:layout_width="match_parent"
+							android:layout_height="match_parent"
+							android:gravity="center"
+							android:orientation="vertical"
+							android:visibility="gone">
+
+							<ImageView
+								android:src="@drawable/waiting_time"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_gravity="center"/>
+
+							<TextView
+								android:text="@string/call_paused_by_remote"
+								style="@style/font16"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:layout_gravity="center"/>
+
+						</LinearLayout>
+
+						<ImageView
+							android:id="@+id/pause"
+							android:src="@drawable/pause_big_default"
+							android:contentDescription="@string/content_description_pause"
+							android:layout_width="80dp"
+							android:layout_height="80dp"
+							android:padding="10dp"
+							android:layout_below="@+id/active_call_info"
+							android:layout_alignParentRight="true"/>
+
+						<ImageView
+							android:id="@+id/switchCamera"
+							android:src="@drawable/switch_camera"
+							android:layout_width="80dp"
+							android:layout_height="80dp"
+							android:padding="10dp"
+							android:contentDescription="@string/content_description_switch_camera"
+							android:visibility="invisible"
+							android:layout_below="@+id/active_call_info"
+							android:layout_alignParentLeft="true"/>
+					</RelativeLayout>
+
+
+					<LinearLayout
+						android:id="@+id/calls_list"
+						android:background="@color/colorH"
+						android:layout_width="match_parent"
+						android:layout_weight="0.5"
+						android:layout_height="wrap_content"
+						android:layout_alignParentBottom="true"
+						android:layout_gravity="bottom"
+						android:orientation="vertical">
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/no_current_call"
+						android:background="@color/colorC"
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:orientation="vertical"
+						android:layout_above="@id/calls_list"
+						android:gravity="center_vertical"
+						android:visibility="gone">
+
+						<ImageView
+							android:src="@drawable/waiting_time"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_gravity="center"/>
+
+						<TextView
+							android:text="@string/no_current_call"
+							style="@style/font16"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_gravity="center"/>
+					</LinearLayout>
+
+				</RelativeLayout>
+			</FrameLayout>
+
+			<org.linphone.ui.Numpad
+				android:id="@+id/numpad"
+				android:background="@color/colorF"
+				android:contentDescription="@string/content_description_numpad"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:visibility="gone"
+				android:layout_margin="10dp"
+				android:layout_above="@id/menu"
+				android:layout_centerHorizontal="true"
+				android:layout_centerVertical="true"/>
+
+			<LinearLayout
+				android:id="@+id/menu"
+				android:layout_width="wrap_content"
+				android:layout_height="60dp"
+				android:layout_alignParentBottom="true"
+				android:orientation="horizontal">
+
+				<LinearLayout
+					android:id="@+id/main_bar"
+					android:background="@color/colorF"
+					android:layout_width="match_parent"
+					android:layout_height="60dp"
+					android:layout_weight="1"
+					android:orientation="horizontal">
+
+					<ImageView
+						android:id="@+id/dialer"
+						android:src="@drawable/footer_dialer"
+						android:background="@color/colorC"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:padding="20dp" />
+
+					<ImageView
+						android:id="@+id/hang_up"
+						android:src="@drawable/call_hangup"
+						android:background="@drawable/hangup"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="0.5"
+						android:padding="15dp"/>
+
+					<ImageView
+						android:id="@+id/chat"
+						android:src="@drawable/footer_chat"
+						android:background="@color/colorC"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:padding="18dp"/>
+				</LinearLayout>
+
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="60dp"
+					android:layout_weight="1"
+					android:orientation="horizontal">
+
+					<RelativeLayout
+						android:background="@drawable/button_background"
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:layout_weight="1">
+
+						<ImageView
+							android:id="@+id/video"
+							android:src="@drawable/camera_default"
+							android:background="@drawable/button_background"
+							android:padding="22dp"
+							android:layout_width="match_parent"
+							android:layout_height="match_parent"/>
+
+						<ProgressBar
+							android:id="@+id/video_in_progress"
+							style="?android:attr/progressBarStyle"
+							android:layout_centerHorizontal="true"
+							android:layout_centerVertical="true"
+							android:visibility="gone"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"/>
+
+					</RelativeLayout>
+
+					<ImageView
+						android:id="@+id/micro"
+						android:src="@drawable/micro_default"
+						android:background="@drawable/button_background"
+						android:padding="15dp"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1" />
+
+					<ImageView
+						android:id="@+id/speaker"
+						android:src="@drawable/speaker_default"
+						android:background="@drawable/button_background"
+						android:padding="18dp"
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:layout_weight="1" />
+
+					<ImageView
+						android:id="@+id/audio_route"
+						android:src="@drawable/routes_default"
+						android:background="@drawable/button_background"
+						android:visibility="gone"
+						android:padding="20dp"
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:layout_weight="1" />
+
+					<ImageView
+						android:id="@+id/options"
+						android:src="@drawable/options_default"
+						android:background="@drawable/button_background"
+						android:padding="18dp"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1" />
+
+				</LinearLayout>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/menu_bottom"
+				android:layout_width="match_parent"
+				android:layout_height="60dp"
+				android:layout_above="@id/menu"
+				android:orientation="horizontal" android:layout_alignParentLeft="true"
+				android:layout_alignParentStart="true">
+
+				<TextView
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="invisible"
+					android:layout_weight="1"/>
+
+				<TextView
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="invisible"
+					android:layout_weight="1"/>
+
+				<ImageView
+					android:id="@+id/route_bluetooth"
+					android:src="@drawable/route_bluetooth"
+					android:background="@drawable/button_background"
+					android:padding="20dp"
+					android:visibility="invisible"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_weight="1.4" />
+
+				<ImageView
+					android:id="@+id/add_call"
+					android:src="@drawable/options_add_call"
+					android:background="@drawable/button_background"
+					android:padding="20dp"
+					android:visibility="invisible"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_weight="1.4" />
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/menu_middle"
+				android:layout_width="match_parent"
+				android:layout_height="60dp"
+				android:layout_above="@id/menu_bottom"
+				android:orientation="horizontal" >
+
+				<TextView
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="invisible"
+					android:layout_weight="1"/>
+
+				<TextView
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="invisible"
+					android:layout_weight="1"/>
+
+				<ImageView
+					android:id="@+id/route_earpiece"
+					android:src="@drawable/route_earpiece"
+					android:background="@drawable/button_background"
+					android:padding="20dp"
+					android:visibility="invisible"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_weight="1.4"/>
+
+				<ImageView
+					android:id="@+id/transfer"
+					android:src="@drawable/options_transfer_call"
+					android:background="@drawable/button_background"
+					android:padding="20dp"
+					android:visibility="invisible"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_weight="1.4"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:layout_above="@id/menu_middle"
+				android:layout_width="match_parent"
+				android:layout_height="60dp"
+				android:orientation="horizontal" >
+
+				<TextView
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="invisible"
+					android:layout_weight="1"/>
+
+				<TextView
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="invisible"
+					android:layout_weight="1"/>
+
+				<ImageView
+					android:id="@+id/route_speaker"
+					android:src="@drawable/route_speaker"
+					android:background="@drawable/button_background"
+					android:visibility="invisible"
+					android:padding="20dp"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_weight="1.4"/>
+
+				<ImageView
+					android:id="@+id/conference"
+					android:src="@drawable/options_start_conference"
+					android:background="@drawable/button_background"
+					android:visibility="invisible"
+					android:padding="20dp"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_weight="1.4"/>
+
+			</LinearLayout>
+
+		</RelativeLayout>
+
+		<RelativeLayout
+			android:id="@+id/side_menu_content"
+			android:background="@color/colorH"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_gravity="left">
+
+			<include layout="@layout/incall_stats" android:id="@+id/incall_stats"/>
+
+		</RelativeLayout>
+
+	</android.support.v4.widget.DrawerLayout>
+
+</RelativeLayout>
diff --git a/res/layout-sw533dp-land/call_incoming.xml b/res/layout-sw533dp-land/call_incoming.xml
new file mode 100644
index 000000000..43392d1eb
--- /dev/null
+++ b/res/layout-sw533dp-land/call_incoming.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+				xmlns:tools="http://schemas.android.com/tools"
+				android:id="@+id/topLayout"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:background="@color/colorH">
+
+	<fragment
+		android:id="@+id/status"
+		android:name="org.linphone.StatusFragment"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		tools:layout="@layout/status" />
+
+	<RelativeLayout
+		android:id="@+id/top_bar"
+		android:background="@color/colorF"
+		android:layout_width="match_parent"
+		android:layout_height="50dp"
+		android:layout_below="@id/status">
+
+		<TextView
+			android:text="@string/incoming_call"
+			style="@style/font1"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:gravity="center"/>
+
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:id="@+id/contact_detail"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_below="@id/top_bar"
+		android:paddingTop="10dp"
+		android:layout_above="@+id/menu">
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_centerHorizontal="true"
+			android:layout_centerVertical="true"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content">
+
+			<RelativeLayout
+				android:id="@+id/avatar_layout"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_margin="5dp"
+				android:gravity="center">
+
+				<ImageView
+					android:id="@+id/contact_picture"
+					android:src="@drawable/avatar"
+					android:contentDescription="@string/content_description_contact_picture"
+					android:layout_width="200dp"
+					android:layout_height="wrap_content"
+					android:adjustViewBounds="true"/>
+
+				<ImageView
+					android:src="@drawable/avatar_mask_border"
+					android:layout_width="200dp"
+					android:layout_height="wrap_content"
+					android:adjustViewBounds="true"
+					android:layout_alignParentTop="true"/>
+
+			</RelativeLayout>
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical">
+
+				<TextView
+					android:id="@+id/contact_name"
+					style="@style/font5"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_alignParentTop="true"
+					android:layout_centerHorizontal="true"
+					android:paddingTop="5dp"/>
+
+				<TextView
+					android:id="@+id/contact_number"
+					style="@style/font2"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_below="@id/contact_name"
+					android:layout_gravity="center"
+					android:layout_centerHorizontal="true"
+					android:paddingBottom="10dp"/>
+
+			</LinearLayout>
+		</LinearLayout>
+
+	</RelativeLayout>
+
+	<LinearLayout
+		android:id="@+id/menu"
+		android:layout_width="match_parent"
+		android:layout_height="60dp"
+		android:layout_alignParentBottom="true"
+		android:orientation="horizontal" >
+
+		<ImageView
+			android:id="@+id/decline"
+			android:src="@drawable/call_hangup"
+			android:background="@drawable/hangup"
+			android:contentDescription="@string/content_description_decline"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:padding="15dp"/>
+
+		<LinearLayout
+			android:id="@+id/acceptUnlock"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:visibility="gone"
+			android:orientation="horizontal"
+			android:background="@color/colorA"
+			android:paddingLeft="15dp"
+			android:paddingTop="15dp"
+			android:paddingBottom="15dp"
+			android:layout_gravity="bottom">
+
+			<ImageView
+				android:src="@drawable/arrow_accept"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+			<ImageView
+				android:src="@drawable/arrow_accept"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:alpha="0.6"/>
+
+			<ImageView
+				android:id="@+id/acceptArrow"
+				android:src="@drawable/arrow_accept"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:alpha="0.2"/>
+		</LinearLayout>
+
+		<ImageView
+			android:id="@+id/accept"
+			android:src="@drawable/call_audio_start"
+			android:background="@drawable/call"
+			android:contentDescription="@string/content_description_accept"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:padding="15dp"/>
+
+		<LinearLayout
+			android:id="@+id/declineUnlock"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:visibility="gone"
+			android:orientation="horizontal"
+			android:background="@color/colorD"
+			android:paddingLeft="15dp"
+			android:paddingTop="15dp"
+			android:paddingBottom="15dp"
+			android:layout_gravity="bottom">
+
+			<ImageView
+				android:id="@+id/arrow_hangup"
+				android:src="@drawable/arrow_hangup"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:alpha="0.2"/>
+
+
+			<ImageView
+				android:src="@drawable/arrow_hangup"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:alpha="0.6"/>
+
+			<ImageView
+				android:src="@drawable/arrow_hangup"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+		</LinearLayout>
+	</LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout-sw533dp-land/call_outgoing.xml b/res/layout-sw533dp-land/call_outgoing.xml
new file mode 100644
index 000000000..64f02eebe
--- /dev/null
+++ b/res/layout-sw533dp-land/call_outgoing.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+				xmlns:tools="http://schemas.android.com/tools"
+				android:id="@+id/topLayout"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:background="@color/colorH">
+
+	<fragment
+		android:id="@+id/status"
+		android:name="org.linphone.StatusFragment"
+		tools:layout="@layout/status"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"/>
+
+	<RelativeLayout
+		android:id="@+id/top_bar"
+		android:background="@color/colorF"
+		android:layout_width="match_parent"
+		android:layout_height="50dp"
+		android:layout_below="@id/status">
+
+		<TextView
+			android:text="@string/outgoing_call"
+			style="@style/font1"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:paddingLeft="10dp"
+			android:gravity="center"/>
+
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:id="@+id/contact_detail"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_above="@id/menu"
+		android:layout_below="@id/top_bar"
+		android:paddingTop="10dp">
+
+		<LinearLayout
+			android:orientation="horizontal"
+			android:layout_centerHorizontal="true"
+			android:layout_centerVertical="true"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content">
+
+			<RelativeLayout
+				android:id="@+id/avatar_layout"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_margin="5dp"
+				android:gravity="center">
+
+				<ImageView
+					android:id="@+id/contact_picture"
+					android:src="@drawable/avatar"
+					android:contentDescription="@string/content_description_contact_picture"
+					android:layout_width="200dp"
+					android:layout_height="wrap_content"
+					android:adjustViewBounds="true"/>
+
+				<ImageView
+					android:src="@drawable/avatar_mask_border"
+					android:layout_width="200dp"
+					android:layout_height="wrap_content"
+					android:adjustViewBounds="true"
+					android:layout_alignParentTop="true"/>
+
+			</RelativeLayout>
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical">
+
+				<TextView
+					android:id="@+id/contact_name"
+					style="@style/font5"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_alignParentTop="true"
+					android:layout_centerHorizontal="true"
+					android:paddingTop="5dp"/>
+
+				<TextView
+					android:id="@+id/contact_number"
+					style="@style/font2"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_below="@id/contact_name"
+					android:layout_gravity="center"
+					android:layout_centerHorizontal="true"
+					android:paddingBottom="10dp"/>
+
+			</LinearLayout>
+		</LinearLayout>
+
+	</RelativeLayout>
+
+	<org.linphone.mediastream.video.display.GL2JNIView
+		android:id="@+id/videoSurface"
+		android:layout_width="match_parent"
+		android:layout_height="0dip"
+		android:layout_weight="1"
+		android:visibility="gone" />
+
+	<LinearLayout
+		android:id="@+id/menu"
+		android:layout_width="match_parent"
+		android:layout_height="60dp"
+		android:layout_alignParentBottom="true"
+		android:layout_alignParentLeft="true"
+		android:orientation="horizontal" >
+
+		<ImageView
+			android:id="@+id/micro"
+			android:src="@drawable/micro_default"
+			android:background="@drawable/button_background"
+			android:contentDescription="@string/content_description_toggle_micro"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:padding="15dp"/>
+
+		<ImageView
+			android:id="@+id/speaker"
+			android:src="@drawable/speaker_default"
+			android:background="@drawable/button_background"
+			android:contentDescription="@string/content_description_toggle_speaker"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:padding="20dp"/>
+
+		<ImageView
+			android:id="@+id/outgoing_hang_up"
+			android:src="@drawable/call_hangup"
+			android:background="@drawable/hangup"
+			android:contentDescription="@string/content_description_hang_up"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="0.7"
+			android:padding="15dp"/>
+
+	</LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout-sw533dp-land/chatlist_cell.xml b/res/layout-sw533dp-land/chatlist_cell.xml
new file mode 100644
index 000000000..550482130
--- /dev/null
+++ b/res/layout-sw533dp-land/chatlist_cell.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="60dp"
+    android:gravity="center_vertical"
+    android:paddingLeft="10dp"
+	android:paddingRight="10dp"
+	android:paddingTop="5dp"
+    android:background="@drawable/list_selector">
+
+	<CheckBox
+		android:id="@+id/delete"
+		android:button="@drawable/checkbox"
+		android:contentDescription="@string/content_description_delete"
+		android:paddingRight="5dp"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:adjustViewBounds="true"
+		android:layout_alignParentRight="true"
+		android:layout_centerVertical="true"
+		android:visibility="invisible" />
+	
+	<TextView 
+	    android:id="@+id/draft"
+	    android:visibility="gone"
+	    android:layout_centerVertical="true"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:textAppearance="?android:attr/textAppearanceSmall"
+	    android:textColor="@color/colorB"
+	    android:text="@string/draft"
+	    android:layout_marginLeft="5dp"
+	    android:layout_marginRight="5dp" />
+	
+	<LinearLayout
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent"
+	    android:layout_centerVertical="true"
+	    android:layout_toLeftOf="@id/draft"
+	    android:orientation="horizontal">
+
+		<RelativeLayout
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:gravity="center">
+
+			<RelativeLayout
+				android:id="@+id/avatar_layout"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_centerHorizontal="true">
+
+				<ImageView
+					android:id="@+id/contact_picture"
+					android:src="@drawable/avatar"
+					android:contentDescription="@string/content_description_contact_picture"
+					android:layout_width="35dp"
+					android:layout_height="35dp"
+					android:adjustViewBounds="true"/>
+
+				<ImageView
+					android:id="@+id/mask"
+					android:src="@drawable/avatar_mask"
+					android:contentDescription="@string/content_description_contact_picture"
+					android:layout_width="35dp"
+					android:layout_height="35dp"
+					android:adjustViewBounds="true"/>
+
+			</RelativeLayout>
+
+		</RelativeLayout>
+
+		<RelativeLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:paddingLeft="10dp">
+
+			<TextView
+				android:id="@+id/date"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="5dp"
+				android:singleLine="true"
+				style="@style/font2"/>
+
+			<TextView
+				android:id="@+id/sipUri"
+				android:lines="1"
+				android:ellipsize="marquee"
+				android:marqueeRepeatLimit="marquee_forever"
+				android:scrollHorizontally="true"
+				android:fadingEdge="horizontal"
+				android:singleLine="true"
+				style="@style/font6"
+				android:paddingLeft="10dp"
+				android:layout_marginTop="5dp"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_toRightOf="@id/date"
+				android:layout_marginRight="30dp"/>
+
+			<TextView
+				android:id="@+id/unreadMessages"
+				android:layout_width="25dp"
+				android:layout_height="25dp"
+				android:background="@drawable/chat_list_indicator"
+				style="@style/font18"
+				android:gravity="center"
+				android:singleLine="true"
+				android:layout_above="@+id/lastMessage"
+				android:layout_alignParentRight="true"
+				android:layout_alignParentEnd="true"/>
+
+			<TextView
+				android:id="@+id/lastMessage"
+				android:maxLines="2"
+				android:ellipsize="end"
+				android:layout_below="@id/sipUri"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				style="@style/font11"/>
+
+		</RelativeLayout>
+	    
+	</LinearLayout>
+    
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp-land/dialer.xml b/res/layout-sw533dp-land/dialer.xml
new file mode 100644
index 000000000..d30a7d4d3
--- /dev/null
+++ b/res/layout-sw533dp-land/dialer.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:background="@color/colorH"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+	<RelativeLayout
+		android:id="@+id/address_bar"
+		android:background="@color/colorF"
+		android:layout_width="match_parent"
+		android:layout_height="60dp"
+		android:layout_marginBottom="10dp"
+		android:layout_alignParentTop="true">
+
+		<org.linphone.ui.EraseButton
+			android:id="@+id/erase"
+			android:src="@drawable/backspace"
+			android:layout_width="40dp"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_centerVertical="true"
+			android:layout_marginRight="10dp"
+			android:layout_marginLeft="10dp" />
+
+		<org.linphone.ui.AddressText
+			android:id="@+id/address"
+			android:background="@color/colorF"
+			android:textColorHint="@color/colorE"
+			style="@style/font5"
+			android:ellipsize="start"
+			android:inputType="textEmailAddress"
+			android:hint="@string/address_bar_hint"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:paddingLeft="20dp"
+			android:paddingRight="5dp"
+			android:layout_toLeftOf="@id/erase"
+			android:layout_centerVertical="true"/>
+
+	</RelativeLayout>
+
+	<org.linphone.ui.Numpad
+		android:id="@+id/numpad"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:padding="10dp"
+		android:layout_above="@id/controls"
+		android:layout_below="@id/address_bar"
+		android:layout_centerInParent="true"/>
+    
+    <LinearLayout
+        android:id="@+id/controls"
+        android:layout_alignParentBottom="true"
+        android:layout_width="match_parent"
+        android:layout_height="60dp">
+
+		<RelativeLayout
+			android:focusable="true"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:adjustViewBounds="true">
+
+			<ImageView
+				android:id="@+id/add_contact"
+				android:src="@drawable/contact_add_button"
+				android:background="@drawable/toolbar_button"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:padding="15dp"
+				android:layout_alignParentBottom="true"/>
+
+		</RelativeLayout>
+
+        <org.linphone.ui.CallButton
+			android:id="@+id/call"
+			android:src="@drawable/call_audio_start"
+			android:background="@drawable/call"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+			android:padding="12dp"
+            android:layout_weight="0.5"/>
+
+	</LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout-sw533dp-land/main.xml b/res/layout-sw533dp-land/main.xml
new file mode 100644
index 000000000..cff1fe36f
--- /dev/null
+++ b/res/layout-sw533dp-land/main.xml
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:tools="http://schemas.android.com/tools"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<fragment
+		android:id="@+id/status"
+		android:name="org.linphone.StatusFragment"
+		android:layout_width="match_parent"
+		android:layout_height="35dp"
+		tools:layout="@layout/status" />
+
+	<android.support.v4.widget.DrawerLayout
+		android:id="@+id/side_menu"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_below="@id/status">
+
+		<RelativeLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent">
+
+			<RelativeLayout
+				android:id="@+id/top_bar"
+				android:background="@color/colorF"
+				android:layout_width="match_parent"
+				android:layout_height="60dp"
+				android:visibility="gone"
+				android:layout_alignParentTop="true">
+
+				<TextView
+					android:id="@+id/menu_name"
+					android:text="@string/settings"
+					style="@style/font1"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:layout_centerInParent="true"
+					android:gravity="center_vertical"/>
+
+				<ImageView
+					android:id="@+id/cancel"
+					android:src="@drawable/dialer_back"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:padding="15dp"
+					android:layout_centerInParent="true"
+					android:layout_alignParentRight="true"/>
+
+			</RelativeLayout>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:orientation="vertical"
+				android:layout_below="@id/top_bar" android:layout_toRightOf="@+id/footer"
+				android:layout_toEndOf="@+id/footer">
+
+				<FrameLayout
+					android:layout_width="match_parent"
+					android:layout_height="match_parent">
+
+					<LinearLayout
+						android:baselineAligned="false"
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:orientation="horizontal">
+
+						<LinearLayout
+							android:id="@+id/fragmentContainer"
+							android:layout_width="match_parent"
+							android:layout_height="match_parent"
+							android:layout_weight="0.63"
+							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.37"
+							android:orientation="horizontal"/>
+
+					</LinearLayout>
+				</FrameLayout>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/footer"
+				android:layout_width="60dp"
+				android:layout_height="match_parent"
+				android:layout_alignParentBottom="true"
+				android:orientation="vertical">
+
+				<RelativeLayout
+					android:id="@+id/history"
+					android:background="@drawable/footer_button"
+					android:layout_weight="1"
+					android:layout_width="60dp"
+					android:layout_height="0dp">
+
+					<ImageView
+						android:src="@drawable/footer_history"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:padding="15dp"
+						android:layout_centerInParent="true"/>
+
+					<View
+						android:id="@+id/history_select"
+						android:background="@color/colorA"
+						android:layout_width="5dp"
+						android:layout_height="match_parent"
+						android:layout_alignParentLeft="true"
+						android:visibility="gone"/>
+
+					<TextView
+						android:id="@+id/missed_calls"
+						android:background="@drawable/history_chat_indicator"
+						style="@style/font18"
+						android:layout_width="25dp"
+						android:layout_height="25dp"
+						android:layout_margin="12dp"
+						android:gravity="center"
+						android:visibility="gone"/>
+
+				</RelativeLayout>
+
+				<RelativeLayout
+					android:id="@+id/contacts"
+					android:background="@drawable/footer_button"
+					android:layout_weight="1"
+					android:layout_width="60dp"
+					android:layout_height="0dp">
+
+					<ImageView
+						android:src="@drawable/footer_contacts"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:padding="15dp"
+						android:layout_centerInParent="true"/>
+
+					<View
+						android:id="@+id/contacts_select"
+						android:background="@color/colorA"
+						android:layout_width="5dp"
+						android:layout_height="match_parent"
+						android:layout_alignParentLeft="true"
+						android:visibility="gone"/>
+				</RelativeLayout>
+
+				<RelativeLayout
+					android:id="@+id/dialer"
+					android:background="@drawable/footer_button"
+					android:layout_weight="1"
+					android:layout_width="60dp"
+					android:layout_height="0dp">
+
+					<ImageView
+						android:src="@drawable/footer_dialer"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:padding="15dp"
+						android:layout_centerInParent="true"/>
+
+					<View
+						android:id="@+id/dialer_select"
+						android:background="@color/colorA"
+						android:layout_width="5dp"
+						android:layout_height="match_parent"
+						android:layout_alignParentLeft="true"/>
+
+				</RelativeLayout>
+
+				<RelativeLayout
+					android:id="@+id/chat"
+					android:background="@drawable/footer_button"
+					android:layout_weight="1"
+					android:layout_width="60dp"
+					android:layout_height="0dp">
+
+					<ImageView
+						android:src="@drawable/footer_chat"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:padding="15dp"
+						android:layout_centerInParent="true" />
+
+					<View
+						android:id="@+id/chat_select"
+						android:background="@color/colorA"
+						android:visibility="gone"
+						android:layout_width="5dp"
+						android:layout_height="match_parent"
+						android:layout_alignParentLeft="true"/>
+
+					<TextView
+						android:id="@+id/missed_chats"
+						android:background="@drawable/history_chat_indicator"
+						style="@style/font18"
+						android:layout_width="25dp"
+						android:layout_height="25dp"
+						android:layout_margin="12dp"
+						android:gravity="center"
+						android:visibility="gone" />
+
+				</RelativeLayout>
+			</LinearLayout>
+		</RelativeLayout>
+
+	<!-- Side Menu -->
+	<RelativeLayout
+		android:id="@+id/side_menu_content"
+		android:layout_width="400dp"
+		android:layout_height="match_parent"
+		android:layout_gravity="left">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:orientation="vertical">
+
+			<include layout="@layout/side_menu_main_account"/>
+
+			<ListView
+				android:id="@+id/accounts_list"
+				android:background="@color/colorB"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:choiceMode="singleChoice"
+				android:cacheColorHint="@color/transparent"
+				android:divider="@android:color/transparent"
+				android:dividerHeight="0dp"/>
+
+			<ListView
+				android:id="@+id/item_list"
+				android:background="@color/colorH"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:choiceMode="singleChoice"
+				android:divider="@color/colorE"
+				android:listSelector="@color/colorH"
+				android:dividerHeight="1dp"/>
+		</LinearLayout>
+
+		<RelativeLayout
+			android:id="@+id/side_menu_quit"
+			android:background="@color/colorA"
+			android:gravity="bottom"
+			android:layout_alignParentBottom="true"
+			android:layout_width="match_parent"
+			android:layout_height="50dp">
+
+			<ImageView
+				android:id="@+id/quit_button"
+				android:src="@drawable/quit"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:padding="5dp"
+				android:layout_alignParentLeft="true"
+				android:layout_centerVertical="true" />
+
+			<TextView
+				android:id="@+id/quit"
+				android:text="@string/quit"
+				style="@style/font14"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_toRightOf="@id/quit_button"
+				android:gravity="center_vertical"
+				android:layout_centerInParent="true"/>
+
+		</RelativeLayout>
+
+	</RelativeLayout>
+
+</android.support.v4.widget.DrawerLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/call_outgoing.xml b/res/layout/call_outgoing.xml
index 0716bc839..22575c3be 100644
--- a/res/layout/call_outgoing.xml
+++ b/res/layout/call_outgoing.xml
@@ -120,7 +120,7 @@
 			android:padding="20dp"/>
 
 		<ImageView
-			android:id="@+id/hang_up"
+			android:id="@+id/outgoing_hang_up"
 			android:src="@drawable/call_hangup"
 			android:background="@drawable/hangup"
 			android:contentDescription="@string/content_description_hang_up"
diff --git a/src/org/linphone/CallOutgoingActivity.java b/src/org/linphone/CallOutgoingActivity.java
index 6001a69ea..0b8d981cd 100644
--- a/src/org/linphone/CallOutgoingActivity.java
+++ b/src/org/linphone/CallOutgoingActivity.java
@@ -83,7 +83,7 @@ public class CallOutgoingActivity extends Activity implements OnClickListener{
 		int flags = WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
 		getWindow().addFlags(flags);
 
-		hangUp = (ImageView) findViewById(R.id.hang_up);
+		hangUp = (ImageView) findViewById(R.id.outgoing_hang_up);
 		hangUp.setOnClickListener(this);
 
 		mListener = new LinphoneCoreListenerBase(){
@@ -188,7 +188,7 @@ public class CallOutgoingActivity extends Activity implements OnClickListener{
 			}
 			LinphoneManager.getLc().enableSpeaker(isSpeakerEnabled);
 		}
-		if (id == R.id.hang_up) {
+		if (id == R.id.outgoing_hang_up) {
 			decline();
 		}
 	}