diff --git a/res/layout-land/assistant_ec_calibration.xml b/res/layout-land/assistant_ec_calibration.xml
new file mode 100644
index 000000000..83b6c88f3
--- /dev/null
+++ b/res/layout-land/assistant_ec_calibration.xml
@@ -0,0 +1,29 @@
+<?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="match_parent"
+	android:padding="30dp"
+	android:orientation="vertical" >
+
+	<TextView
+		android:text="@string/assistant_ec_calibration"
+		style="@style/font6"
+		android:textAllCaps="true"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:layout_centerHorizontal="true"/>
+	
+  	<ImageView
+		android:src="@drawable/linphone_logo_orange"
+	    android:layout_width="150dp"
+	    android:layout_height="150dp"
+	    android:layout_centerInParent="true"/>
+  	
+    <ProgressBar 
+        android:layout_height="wrap_content" 
+        android:layout_width="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true" />
+    
+</RelativeLayout>
diff --git a/res/layout-land/assistant_remote_provisioning_login.xml b/res/layout-land/assistant_remote_provisioning_login.xml
new file mode 100644
index 000000000..3e2d459c8
--- /dev/null
+++ b/res/layout-land/assistant_remote_provisioning_login.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:background="@color/colorG"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:padding="20dp"
+	    android:orientation="vertical" android:layout_toLeftOf="@+id/imageView"
+		android:layout_toStartOf="@+id/imageView">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+
+			<ImageView
+				android:src="@drawable/linphone_logo"
+				android:layout_width="50dp"
+				android:layout_height="50dp"
+				android:layout_gravity="bottom"/>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="20dp"
+				android:layout_gravity="bottom"
+				android:orientation="vertical">
+
+				<TextView
+					android:text="@string/welcome"
+					style="@style/font13"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+
+				<TextView
+					android:text="@string/assistant_remote_provisioning_login"
+					style="@style/font11"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+			</LinearLayout>
+
+		</LinearLayout>
+
+		<TextView
+			android:text="@string/username"
+			style="@style/font9"
+			android:layout_marginTop="10dp"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
+
+		<EditText
+			android:id="@+id/assistant_username"
+			android:background="@drawable/resizable_textfield"
+			android:textColor="@color/colorC"
+			android:textCursorDrawable="@null"
+			android:inputType="textEmailAddress"
+			android:layout_width="match_parent"
+			android:layout_height="30dp"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:singleLine="true"/>
+
+		<TextView
+			android:text="@string/domain"
+			style="@style/font9"
+			android:paddingTop="10dp"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
+
+		<EditText
+			android:id="@+id/assistant_domain"
+			android:background="@drawable/resizable_textfield"
+			android:textColor="@color/colorC"
+			android:textCursorDrawable="@null"
+			android:inputType="textEmailAddress"
+			android:layout_width="match_parent"
+			android:layout_height="30dp"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:singleLine="true"/>
+
+		<TextView
+			android:text="@string/password"
+			style="@style/font9"
+			android:paddingTop="10dp"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
+
+		<EditText
+			android:id="@+id/assistant_password"
+			android:background="@drawable/resizable_textfield"
+			android:textColor="@color/colorC"
+			android:textCursorDrawable="@null"
+			android:inputType="textPassword"
+			android:layout_width="match_parent"
+			android:layout_height="30dp"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:singleLine="true"/>
+
+		<Button
+			android:id="@+id/assistant_connect"
+			android:text="@string/connect"
+			android:background="@drawable/assistant_button"
+			style="@style/font5"
+			android:textAllCaps="false"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:layout_marginTop="20dp"
+			android:layout_centerInParent="true"
+			android:layout_centerVertical="true"/>
+
+	</LinearLayout>
+
+	<ImageView
+		android:src="@drawable/logo_orange"
+		android:layout_width="60dp"
+		android:layout_height="60dp"
+		android:layout_margin="30dp"
+		android:layout_alignParentBottom="true"
+		android:layout_alignParentRight="true" android:id="@+id/imageView"/>
+ 
+</RelativeLayout>
diff --git a/res/layout-land/call.xml b/res/layout-land/call.xml
index b812e58d4..450293da2 100644
--- a/res/layout-land/call.xml
+++ b/res/layout-land/call.xml
@@ -5,39 +5,31 @@
     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.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">
+        <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" />
+				android:orientation="horizontal"/>
 
 			<FrameLayout
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
-				android:layout_above="@+id/menu">
+				android:layout_above="@+id/call_bar">
 
 				<RelativeLayout
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content">
+					android:layout_height="wrap_content"
+					android:layout_marginTop="40dp">
 
 					<LinearLayout
 						android:id="@+id/conference_list"
@@ -51,125 +43,102 @@
 
 					<RelativeLayout
 						android:id="@+id/active_call"
+						android:background="@color/colorA"
 						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">
+                        <LinearLayout
+                            android:id="@+id/active_call_info"
+                            android:background="@color/colorG"
+                            android:layout_width="match_parent"
+                            android:layout_height="80dp"
+                            android:orientation="vertical"
+                            android:layout_alignParentBottom="true"
+                            android:layout_alignParentLeft="true"
+                            android:layout_alignParentStart="true">
 
-							<TextView
-								android:id="@+id/current_contact_name"
-								style="@style/font5"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:layout_gravity="bottom"/>
+                            <TextView
+                                android:id="@+id/current_contact_name"
+                                style="@style/font13"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:paddingTop="5dp"
+                                android:layout_alignParentTop="true"
+                                android:layout_gravity="center"/>
 
-							<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>
+                            <Chronometer
+                                android:id="@+id/current_call_timer"
+                                style="@style/font11"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_below="@id/current_contact_name"
+                                android:layout_gravity="center"/>
+                        </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_big"
+                            android:contentDescription="@string/content_description_contact_picture"
+                            android:layout_centerInParent="true"
+                            android:layout_width="100dp"
+                            android:layout_height="100dp"
+                            android:paddingBottom="20dp"/>
 
-							<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"/>
+                        <LinearLayout
+                            android:id="@+id/remote_pause"
+                            android:background="@color/colorA"
+                            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: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"/>
+                            <ImageView
+                                android:src="@drawable/waiting_time"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"/>
 
-						</RelativeLayout>
+                            <TextView
+                                android:text="@string/call_paused_by_remote"
+                                style="@style/font4"
+                                android:gravity="center"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"/>
 
-						<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">
+                        </LinearLayout>
 
-							<ImageView
-								android:src="@drawable/waiting_time"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:layout_gravity="center"/>
+                        <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="15dp"
+                            android:layout_below="@+id/active_call_info"
+                            android:layout_alignParentRight="true"
+							android:layout_alignParentTop="true"/>
 
-							<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"/>
+                        <ImageView
+                            android:id="@+id/switchCamera"
+                            android:src="@drawable/switch_camera"
+                            android:layout_width="80dp"
+                            android:layout_height="80dp"
+                            android:padding="15dp"
+                            android:contentDescription="@string/content_description_switch_camera"
+                            android:visibility="invisible"
+                            android:layout_below="@+id/active_call_info"
+                            android:layout_alignParentLeft="true"
+							android:layout_alignParentTop="true"/>
 
-						</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:background="@color/colorA"
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
 						android:orientation="vertical"
@@ -185,225 +154,244 @@
 
 						<TextView
 							android:text="@string/no_current_call"
-							style="@style/font16"
+							style="@style/font4"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
+							android:gravity="center"
 							android:layout_gravity="center"/>
 					</LinearLayout>
 
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_alignParentBottom="true">
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1"/>
+
+                        <LinearLayout
+                            android:id="@+id/calls_list"
+                            android:background="@color/colorG"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:divider="@color/colorF"
+                            android:dividerHeight="1dp"
+                            android:orientation="vertical">
+                        </LinearLayout>
+                    </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/call_bar"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_alignParentBottom="true"
+                android:layout_gravity="center"
+                android:orientation="horizontal" >
+
+                <LinearLayout
+                    android:id="@+id/main_bar"
+                    android:layout_width="match_parent"
+                    android:layout_weight="1"
+                    android:layout_height="60dp"
+                    android:layout_gravity="center"
+                    android:orientation="horizontal" >
+
+                    <ImageView
+                        android:id="@+id/dialer"
+                        android:src="@drawable/dialer"
+                        android:background="@color/colorC"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.8"
+                        android:padding="15dp" />
+
+                    <ImageView
+                        android:id="@+id/hang_up"
+                        android:src="@drawable/call_hangup"
+                        android:background="@drawable/hangup"
+                        android:layout_gravity="center"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.4"
+                        android:padding="12dp"/>
+
+                    <ImageView
+                        android:id="@+id/chat"
+                        android:src="@drawable/chat"
+                        android:background="@color/colorC"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.8"
+                        android:padding="15dp"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/menu"
+                    android:layout_width="match_parent"
+                    android:layout_weight="1"
+                    android:layout_height="60dp"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:background="@color/colorF"
+                        android:layout_width="match_parent"
+                        android:layout_height="60dp"
+                        android:orientation="horizontal">
+
+                        <RelativeLayout
+                            android:background="@drawable/button_background"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+
+                            <ImageView
+                                android:id="@+id/video"
+                                android:src="@drawable/camera_default"
+                                android:background="@drawable/button_background"
+                                android:padding="20dp"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"/>
+
+                            <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="12dp"
+                        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="15dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:id="@+id/audio_route"
+                        android:src="@drawable/routes"
+                        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="15dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
+                </LinearLayout>
+
+            </LinearLayout>
+        </LinearLayout>
 
 			<LinearLayout
-				android:id="@+id/menu"
-				android:layout_width="wrap_content"
-				android:layout_height="60dp"
-				android:layout_alignParentBottom="true"
-				android:orientation="horizontal">
+                android:id="@+id/menu_bottom"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_above="@id/menu"
+                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">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="invisible"
+                    android:layout_weight="0.5"/>
 
-					<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="15dp" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="invisible"
+                    android:layout_weight="0.5"/>
 
-					<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="12dp"/>
+                <ImageView
+                    android:id="@+id/route_bluetooth"
+                    android:src="@drawable/route_bluetooth"
+                    android:background="@drawable/button_call_background"
+                    android:padding="15dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5" />
 
-					<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="15dp"/>
-				</LinearLayout>
+                <ImageView
+                    android:id="@+id/add_call"
+                    android:src="@drawable/options_add_call"
+                    android:background="@drawable/button_call_background"
+                    android:padding="15dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5" />
 
+            </LinearLayout>
 
-				<LinearLayout
-					android:layout_width="match_parent"
-					android:layout_height="60dp"
-					android:layout_weight="1"
-					android:orientation="horizontal">
+            <LinearLayout
+                android:id="@+id/menu_middle"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_above="@id/menu_bottom"
+                android:orientation="horizontal" >
 
-					<RelativeLayout
-						android:background="@drawable/button_background"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:layout_weight="1">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="invisible"
+                    android:layout_weight="0.5"/>
 
-						<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"/>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="invisible"
+                    android:layout_weight="0.5"/>
 
-						<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"/>
+                <ImageView
+                    android:id="@+id/route_earpiece"
+                    android:src="@drawable/route_earpiece"
+                    android:background="@drawable/button_call_background"
+                    android:padding="15dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"/>
 
-					</RelativeLayout>
+                <ImageView
+                    android:id="@+id/transfer"
+                    android:src="@drawable/options_transfer_call"
+                    android:background="@drawable/button_call_background"
+                    android:padding="15dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"/>
 
-					<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="15dp"
-						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="15dp"
-						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>
 
 			<LinearLayout
 				android:layout_above="@id/menu_middle"
@@ -415,41 +403,54 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:visibility="invisible"
-					android:layout_weight="1"/>
+					android:layout_weight="0.5"/>
 
 				<TextView
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:visibility="invisible"
-					android:layout_weight="1"/>
+					android:layout_weight="0.5"/>
 
 				<ImageView
 					android:id="@+id/route_speaker"
 					android:src="@drawable/route_speaker"
-					android:background="@drawable/button_background"
+					android:background="@drawable/button_call_background"
 					android:visibility="invisible"
-					android:padding="20dp"
+					android:padding="15dp"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_weight="1.4"/>
+					android:layout_weight="0.5"/>
 
 				<ImageView
 					android:id="@+id/conference"
 					android:src="@drawable/options_start_conference"
-					android:background="@drawable/button_background"
+					android:background="@drawable/button_call_background"
 					android:visibility="invisible"
-					android:padding="20dp"
+					android:padding="15dp"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_weight="1.4"/>
+					android:layout_weight="0.5"/>
 
 			</LinearLayout>
 
-		</RelativeLayout>
+			<org.linphone.ui.Numpad
+				android:id="@+id/numpad"
+				android:background="@color/colorC"
+				android:contentDescription="@string/content_description_numpad"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:visibility="gone"
+				android:layout_marginTop="50dp"
+				android:layout_marginBottom="10dp"
+				android:layout_above="@id/menu"
+				android:layout_centerHorizontal="true"
+				android:layout_centerVertical="true"/>
+        </RelativeLayout>
 
 		<RelativeLayout
 			android:id="@+id/side_menu_content"
-			android:background="@color/colorH"
+			android:background="@color/colorD"
+			android:layout_marginTop="40dp"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:layout_gravity="left">
@@ -460,4 +461,11 @@
 
 	</android.support.v4.widget.DrawerLayout>
 
+	<fragment
+		android:id="@+id/status"
+		android:name="org.linphone.StatusFragment"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		tools:layout="@layout/status" />
+
 </RelativeLayout>
diff --git a/res/layout-land/call_incoming.xml b/res/layout-land/call_incoming.xml
index 68b24ec2a..e6260d477 100644
--- a/res/layout-land/call_incoming.xml
+++ b/res/layout-land/call_incoming.xml
@@ -1,10 +1,10 @@
 <?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">
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/topLayout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/colorA">
 
 	<fragment
 		android:id="@+id/status"
@@ -13,21 +13,40 @@
 		android:layout_height="40dp"
 		tools:layout="@layout/status" />
 
-	<RelativeLayout
+	<LinearLayout
 		android:id="@+id/top_bar"
-		android:background="@color/colorF"
+		android:background="@color/colorG"
 		android:layout_width="match_parent"
-		android:layout_height="50dp"
-		android:layout_below="@id/status">
+		android:layout_height="60dp"
+		android:orientation="horizontal"
+		android:layout_below="@id/status"
+		android:gravity="center">
+
+		<ImageView
+			android:src="@drawable/call_status_incoming"
+			android:paddingRight="10dp"
+			android:paddingTop="15dp"
+			android:paddingBottom="15dp"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"/>
 
 		<TextView
 			android:text="@string/incoming_call"
-			style="@style/font1"
-			android:layout_width="match_parent"
+			style="@style/font2"
+			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
 			android:gravity="center"/>
 
-	</RelativeLayout>
+	</LinearLayout>
+
+	<ImageView
+		android:id="@+id/contact_picture"
+		android:src="@drawable/avatar_big"
+		android:contentDescription="@string/content_description_contact_picture"
+		android:layout_centerInParent="true"
+		android:layout_width="100dp"
+		android:layout_height="100dp"
+		android:paddingBottom="20dp"/>
 
 	<RelativeLayout
 		android:id="@+id/contact_detail"
@@ -38,62 +57,29 @@
 		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">
+			android:background="@color/colorG"
+			android:layout_alignParentBottom="true"
+			android:layout_width="match_parent"
+			android:layout_height="80dp"
+			android:gravity="center_horizontal"
+			android:orientation="vertical">
 
-			<RelativeLayout
-				android:id="@+id/avatar_layout"
+			<TextView
+				android:id="@+id/contact_name"
+				style="@style/font13"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_margin="5dp"
-				android:gravity="center">
+				android:paddingTop="5dp"
+				android:layout_alignParentTop="true"
+				android:layout_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"
+			<TextView
+				android:id="@+id/contact_number"
+				style="@style/font11"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_gravity="center_vertical">
+				android:layout_gravity="center"/>
 
-				<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>
@@ -162,7 +148,7 @@
 			android:layout_height="wrap_content"
 			android:visibility="gone"
 			android:orientation="horizontal"
-			android:background="@color/colorD"
+			android:background="@color/colorC"
 			android:paddingLeft="15dp"
 			android:paddingTop="15dp"
 			android:paddingBottom="15dp"
diff --git a/res/layout-land/call_outgoing.xml b/res/layout-land/call_outgoing.xml
index 310a30ecf..861fa8566 100644
--- a/res/layout-land/call_outgoing.xml
+++ b/res/layout-land/call_outgoing.xml
@@ -1,10 +1,10 @@
 <?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">
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/topLayout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/colorA">
 
 	<fragment
 		android:id="@+id/status"
@@ -13,22 +13,40 @@
 		android:layout_width="match_parent"
 		android:layout_height="40dp"/>
 
-	<RelativeLayout
+	<LinearLayout
 		android:id="@+id/top_bar"
-		android:background="@color/colorF"
+		android:background="@color/colorG"
 		android:layout_width="match_parent"
-		android:layout_height="50dp"
-		android:layout_below="@id/status">
+		android:layout_height="60dp"
+		android:orientation="horizontal"
+		android:layout_below="@id/status"
+		android:gravity="center">
+
+		<ImageView
+			android:src="@drawable/call_status_outgoing"
+			android:paddingRight="10dp"
+			android:paddingTop="15dp"
+			android:paddingBottom="15dp"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"/>
 
 		<TextView
 			android:text="@string/outgoing_call"
-			style="@style/font1"
-			android:layout_width="match_parent"
+			style="@style/font2"
+			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
-			android:paddingLeft="10dp"
 			android:gravity="center"/>
 
-	</RelativeLayout>
+	</LinearLayout>
+
+	<ImageView
+		android:id="@+id/contact_picture"
+		android:src="@drawable/avatar_big"
+		android:contentDescription="@string/content_description_contact_picture"
+		android:layout_centerInParent="true"
+		android:layout_width="100dp"
+		android:layout_height="100dp"
+		android:paddingBottom="20dp"/>
 
 	<RelativeLayout
 		android:id="@+id/contact_detail"
@@ -39,62 +57,29 @@
 		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">
+			android:background="@color/colorG"
+			android:layout_alignParentBottom="true"
+			android:layout_width="match_parent"
+			android:layout_height="80dp"
+			android:gravity="center_horizontal"
+			android:orientation="vertical">
 
-			<RelativeLayout
-				android:id="@+id/avatar_layout"
+			<TextView
+				android:id="@+id/contact_name"
+				style="@style/font13"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_margin="5dp"
-				android:gravity="center">
+				android:paddingTop="5dp"
+				android:layout_alignParentTop="true"
+				android:layout_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"
+			<TextView
+				android:id="@+id/contact_number"
+				style="@style/font11"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_gravity="center_vertical">
+				android:layout_gravity="center"/>
 
-				<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>
diff --git a/res/layout-land/dialog.xml b/res/layout-land/dialog.xml
new file mode 100644
index 000000000..9941357e0
--- /dev/null
+++ b/res/layout-land/dialog.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+  	android:layout_width="fill_parent"
+  	android:layout_height="fill_parent"
+ 	android:gravity="center">
+
+	<TextView
+		android:id="@+id/customText"
+		style="@style/font4"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:padding="20dp"/>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:gravity="center"
+		android:layout_margin="20dp"
+		android:orientation="vertical">
+
+		<Button
+			android:id="@+id/delete_button"
+			android:text="@string/delete"
+			android:background="@drawable/resizable_confirm_delete_button"
+			style="@style/font5"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="10dp"
+			android:padding="10dp"/>
+
+		<Button
+			android:id="@+id/cancel"
+			android:text="@string/cancel"
+			android:background="@drawable/resizable_cancel_button"
+			style="@style/font5"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="10dp"
+			android:padding="10dp"/>
+
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
index 3afa756a3..88d6d7d6f 100644
--- a/res/layout-land/main.xml
+++ b/res/layout-land/main.xml
@@ -9,7 +9,7 @@
 		android:id="@+id/status"
 		android:name="org.linphone.StatusFragment"
 		android:layout_width="match_parent"
-		android:layout_height="35dp"
+		android:layout_height="40dp"
 		tools:layout="@layout/status" />
 
 	<android.support.v4.widget.DrawerLayout
@@ -54,8 +54,8 @@
 				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_below="@id/top_bar">
 
 				<FrameLayout
 					android:layout_width="match_parent"
@@ -75,120 +75,87 @@
 				android:id="@+id/footer"
 				android:layout_width="60dp"
 				android:layout_height="match_parent"
-				android:layout_alignParentBottom="true"
+				android:layout_alignParentLeft="true"
 				android:orientation="vertical">
 
 				<RelativeLayout
 					android:id="@+id/history"
 					android:background="@drawable/footer_button"
 					android:layout_weight="1"
-					android:layout_width="60dp"
+					android:layout_width="match_parent"
 					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:id="@+id/history_image"
+						android:layout_width="match_parent"
 						android:layout_height="match_parent"
-						android:layout_alignParentLeft="true"
-						android:visibility="gone"/>
+						android:padding="18dp"
+						android:layout_centerInParent="true"
+						android:contentDescription="@string/content_description_history"
+						android:src="@drawable/footer_history"/>
 
 					<TextView
 						android:id="@+id/missed_calls"
-						android:background="@drawable/history_chat_indicator"
-						style="@style/font18"
+						style="@style/font7"
 						android:layout_width="25dp"
 						android:layout_height="25dp"
 						android:layout_margin="12dp"
+						android:background="@drawable/history_chat_indicator"
+						android:visibility="gone"
 						android:gravity="center"
-						android:visibility="gone"/>
+						android:layout_alignParentBottom="true"
+						android:layout_alignParentRight="true"/>
 
 				</RelativeLayout>
 
-				<RelativeLayout
+				<ImageView
 					android:id="@+id/contacts"
+					android:src="@drawable/footer_contacts"
 					android:background="@drawable/footer_button"
+					android:contentDescription="@string/content_description_contacts"
 					android:layout_weight="1"
-					android:layout_width="60dp"
-					android:layout_height="0dp">
+					android:layout_width="match_parent"
+					android:layout_height="0dp"
+					android:padding="18dp"
+					android:layout_centerInParent="true" />
 
-					<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
+				<ImageView
 					android:id="@+id/dialer"
+					android:src="@drawable/footer_dialer"
 					android:background="@drawable/footer_button"
+					android:contentDescription="@string/content_description_dialer"
 					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>
+					android:layout_width="match_parent"
+					android:layout_height="0dp"
+					android:padding="18dp"
+					android:layout_centerInParent="true"/>
 
 				<RelativeLayout
 					android:id="@+id/chat"
 					android:background="@drawable/footer_button"
 					android:layout_weight="1"
-					android:layout_width="60dp"
+					android:layout_width="match_parent"
 					android:layout_height="0dp">
 
 					<ImageView
+						android:id="@+id/chat_image"
 						android:src="@drawable/footer_chat"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:padding="15dp"
+						android:padding="18dp"
 						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"
+						style="@style/font7"
 						android:layout_width="25dp"
 						android:layout_height="25dp"
 						android:layout_margin="12dp"
+						android:background="@drawable/history_chat_indicator"
+						android:visibility="gone"
 						android:gravity="center"
-						android:visibility="gone" />
+						android:layout_alignParentBottom="true"
+						android:layout_alignParentRight="true"/>
 
 				</RelativeLayout>
 			</LinearLayout>
@@ -219,7 +186,7 @@
 
 			<ListView
 				android:id="@+id/accounts_list"
-				android:background="@color/colorB"
+				android:background="@color/colorG"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:choiceMode="singleChoice"
@@ -229,12 +196,12 @@
 
 			<ListView
 				android:id="@+id/item_list"
-				android:background="@color/colorH"
+				android:background="@color/colorG"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
 				android:choiceMode="singleChoice"
 				android:divider="@color/colorE"
-				android:listSelector="@color/colorH"
+				android:listSelector="@color/colorG"
 				android:dividerHeight="1dp"/>
 		</LinearLayout>
 
@@ -246,6 +213,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="50dp">
 
+
 			<ImageView
 				android:id="@+id/quit_button"
 				android:src="@drawable/quit"
@@ -258,7 +226,7 @@
 			<TextView
 				android:id="@+id/quit"
 				android:text="@string/quit"
-				style="@style/font14"
+				style="@style/font8"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_toRightOf="@id/quit_button"
diff --git a/res/layout-sw533dp-land/assistant_remote_provisioning_login.xml b/res/layout-sw533dp-land/assistant_remote_provisioning_login.xml
new file mode 100644
index 000000000..7c429ce05
--- /dev/null
+++ b/res/layout-sw533dp-land/assistant_remote_provisioning_login.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:background="@color/colorG"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:layout_centerInParent="true"
+		android:gravity="center"
+	    android:orientation="vertical">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+
+			<ImageView
+				android:src="@drawable/linphone_logo"
+				android:layout_width="60dp"
+				android:layout_height="60dp"
+				android:layout_gravity="bottom"/>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="20dp"
+				android:layout_gravity="bottom"
+				android:orientation="vertical">
+
+				<TextView
+					android:text="@string/welcome"
+					style="@style/font13"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+
+				<TextView
+					android:text="@string/assistant_remote_provisioning_login"
+					style="@style/font11"
+					android:singleLine="true"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+			</LinearLayout>
+
+		</LinearLayout>
+
+		<TextView
+			android:text="@string/username"
+			style="@style/font9"
+			android:layout_marginTop="30dp"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
+
+		<EditText
+			android:id="@+id/assistant_username"
+			android:background="@drawable/resizable_textfield"
+			android:textColor="@color/colorC"
+			android:textCursorDrawable="@null"
+			android:inputType="textEmailAddress"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:singleLine="true"/>
+
+		<TextView
+			android:text="@string/domain"
+			style="@style/font9"
+			android:paddingTop="20dp"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
+
+		<EditText
+			android:id="@+id/assistant_domain"
+			android:background="@drawable/resizable_textfield"
+			android:textColor="@color/colorC"
+			android:textCursorDrawable="@null"
+			android:inputType="textEmailAddress"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:singleLine="true"/>
+
+		<TextView
+			android:text="@string/password"
+			style="@style/font9"
+			android:paddingTop="20dp"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
+
+		<EditText
+			android:id="@+id/assistant_password"
+			android:background="@drawable/resizable_textfield"
+			android:textColor="@color/colorC"
+			android:textCursorDrawable="@null"
+			android:inputType="textPassword"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:singleLine="true"/>
+
+		<Button
+			android:id="@+id/assistant_connect"
+			android:text="@string/connect"
+			android:background="@drawable/assistant_button"
+			style="@style/font5"
+			android:textAllCaps="false"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:layout_marginTop="20dp"
+			android:layout_centerInParent="true"
+			android:layout_centerVertical="true"/>
+
+	</LinearLayout>
+
+	<ImageView
+		android:src="@drawable/logo_orange"
+		android:layout_width="60dp"
+		android:layout_height="60dp"
+		android:layout_margin="30dp"
+		android:layout_alignParentBottom="true"
+		android:layout_alignParentRight="true"/>
+
+</RelativeLayout>
diff --git a/res/layout-sw533dp-land/call.xml b/res/layout-sw533dp-land/call.xml
index 561a27ade..c9994dafb 100644
--- a/res/layout-sw533dp-land/call.xml
+++ b/res/layout-sw533dp-land/call.xml
@@ -5,39 +5,31 @@
     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.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">
+        <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" />
+				android:orientation="horizontal"/>
 
 			<FrameLayout
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
-				android:layout_above="@+id/menu">
+				android:layout_above="@+id/call_bar">
 
 				<RelativeLayout
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content">
+					android:layout_height="wrap_content"
+					android:layout_marginTop="40dp">
 
 					<LinearLayout
 						android:id="@+id/conference_list"
@@ -51,129 +43,106 @@
 
 					<RelativeLayout
 						android:id="@+id/active_call"
+						android:background="@color/colorA"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
+                        android:layout_above="@id/menu"
 						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">
+                        <LinearLayout
+                            android:id="@+id/active_call_info"
+                            android:background="@color/colorG"
+                            android:layout_width="match_parent"
+                            android:layout_height="80dp"
+                            android:orientation="vertical"
+                            android:layout_alignParentBottom="true"
+                            android:layout_alignParentLeft="true"
+                            android:layout_alignParentStart="true">
 
-							<TextView
-								android:id="@+id/current_contact_name"
-								style="@style/font5"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:layout_gravity="bottom"/>
+                            <TextView
+                                android:id="@+id/current_contact_name"
+                                style="@style/font13"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:paddingTop="5dp"
+                                android:layout_alignParentTop="true"
+                                android:layout_gravity="center"/>
 
-							<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>
+                            <Chronometer
+                                android:id="@+id/current_call_timer"
+                                style="@style/font11"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_below="@id/current_contact_name"
+                                android:layout_gravity="center"/>
+                        </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_big"
+                            android:contentDescription="@string/content_description_contact_picture"
+                            android:layout_centerInParent="true"
+                            android:layout_width="200dp"
+                            android:layout_height="200dp"
+                            android:paddingBottom="20dp"/>
 
-							<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"/>
+                        <LinearLayout
+                            android:id="@+id/remote_pause"
+                            android:background="@color/colorA"
+                            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: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"/>
+                            <ImageView
+                                android:src="@drawable/waiting_time"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"/>
 
-						</RelativeLayout>
+                            <TextView
+                                android:text="@string/call_paused_by_remote"
+                                style="@style/font4"
+                                android:gravity="center"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"/>
 
-						<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">
+                        </LinearLayout>
 
-							<ImageView
-								android:src="@drawable/waiting_time"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:layout_gravity="center"/>
+                        <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="15dp"
+                            android:layout_below="@+id/active_call_info"
+                            android:layout_alignParentRight="true"
+							android:layout_alignParentTop="true"/>
 
-							<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"/>
+                        <ImageView
+                            android:id="@+id/switchCamera"
+                            android:src="@drawable/switch_camera"
+                            android:layout_width="80dp"
+                            android:layout_height="80dp"
+                            android:padding="15dp"
+                            android:contentDescription="@string/content_description_switch_camera"
+                            android:visibility="invisible"
+                            android:layout_below="@+id/active_call_info"
+                            android:layout_alignParentLeft="true"
+							android:layout_alignParentTop="true"/>
 
-						</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:background="@color/colorA"
 						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">
 
@@ -185,271 +154,285 @@
 
 						<TextView
 							android:text="@string/no_current_call"
-							style="@style/font16"
+							style="@style/font4"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
+							android:gravity="center"
 							android:layout_gravity="center"/>
 					</LinearLayout>
 
-				</RelativeLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_alignParentBottom="true">
+
+                        <LinearLayout
+                            android:id="@+id/calls_list"
+                            android:background="@color/colorG"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="0.6"
+                            android:divider="@color/colorF"
+                            android:dividerHeight="1dp"
+                            android:orientation="vertical">
+                        </LinearLayout>
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="0.4"/>
+
+                    </LinearLayout>
+
+
+                </RelativeLayout>
 			</FrameLayout>
 
+            <LinearLayout
+                android:id="@+id/call_bar"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_alignParentBottom="true"
+                android:layout_gravity="center"
+                android:orientation="horizontal" >
+
+                <LinearLayout
+                    android:id="@+id/main_bar"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_weight="0.3"
+                    android:orientation="horizontal" >
+
+                    <ImageView
+                        android:id="@+id/dialer"
+                        android:src="@drawable/dialer"
+                        android:background="@color/colorC"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.8"
+                        android:padding="15dp" />
+
+                    <ImageView
+                        android:id="@+id/chat"
+                        android:src="@drawable/chat"
+                        android:background="@color/colorC"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.8"
+                        android:padding="15dp"/>
+                    <ImageView
+                        android:id="@+id/hang_up"
+                        android:src="@drawable/call_hangup"
+                        android:background="@drawable/hangup"
+                        android:layout_gravity="center"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.2"
+                        android:padding="12dp"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/menu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.7"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:background="@color/colorF"
+                        android:layout_width="match_parent"
+                        android:layout_height="60dp"
+                        android:orientation="horizontal">
+
+                        <RelativeLayout
+                            android:background="@drawable/button_background"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+
+                            <ImageView
+                                android:id="@+id/video"
+                                android:src="@drawable/camera_default"
+                                android:background="@drawable/button_background"
+                                android:padding="20dp"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"/>
+
+                            <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="12dp"
+                            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="15dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1" />
+
+                        <ImageView
+                            android:id="@+id/audio_route"
+                            android:src="@drawable/routes"
+                            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="15dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+                    </LinearLayout>
+
+                </LinearLayout>
+            </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/menu_bottom"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_above="@id/call_bar"
+                    android:orientation="horizontal" >
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="invisible"
+                        android:layout_weight="0.2"/>
+
+                    <ImageView
+                        android:id="@+id/route_bluetooth"
+                        android:src="@drawable/route_bluetooth"
+                        android:background="@drawable/button_call_background"
+                        android:padding="15dp"
+                        android:visibility="invisible"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.22" />
+
+                    <ImageView
+                        android:id="@+id/add_call"
+                        android:src="@drawable/options_add_call"
+                        android:background="@drawable/button_call_background"
+                        android:padding="15dp"
+                        android:visibility="invisible"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.22" />
+
+                </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="0.2"/>
+
+                    <ImageView
+                        android:id="@+id/route_earpiece"
+                        android:src="@drawable/route_earpiece"
+                        android:background="@drawable/button_call_background"
+                        android:padding="15dp"
+                        android:visibility="invisible"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.22" />
+
+                    <ImageView
+                        android:id="@+id/transfer"
+                        android:src="@drawable/options_transfer_call"
+                        android:background="@drawable/button_call_background"
+                        android:padding="15dp"
+                        android:visibility="invisible"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.22" />
+
+                </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="0.2"/>
+
+                    <ImageView
+                        android:id="@+id/route_speaker"
+                        android:src="@drawable/route_speaker"
+                        android:background="@drawable/button_call_background"
+                        android:visibility="invisible"
+                        android:padding="15dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.22" />
+
+                    <ImageView
+                        android:id="@+id/conference"
+                        android:src="@drawable/options_start_conference"
+                        android:background="@drawable/button_call_background"
+                        android:visibility="invisible"
+                        android:padding="15dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.22" />
+                </LinearLayout>
+
 			<org.linphone.ui.Numpad
 				android:id="@+id/numpad"
-				android:background="@color/colorF"
+				android:background="@color/colorC"
 				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_marginTop="50dp"
+				android:layout_marginBottom="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>
 
 		<RelativeLayout
 			android:id="@+id/side_menu_content"
-			android:background="@color/colorH"
+			android:background="@color/colorD"
+			android:layout_marginTop="40dp"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:layout_gravity="left">
@@ -460,4 +443,11 @@
 
 	</android.support.v4.widget.DrawerLayout>
 
+	<fragment
+		android:id="@+id/status"
+		android:name="org.linphone.StatusFragment"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		tools:layout="@layout/status" />
+
 </RelativeLayout>
diff --git a/res/layout-sw533dp-land/call_incoming.xml b/res/layout-sw533dp-land/call_incoming.xml
index 43392d1eb..674aa02c8 100644
--- a/res/layout-sw533dp-land/call_incoming.xml
+++ b/res/layout-sw533dp-land/call_incoming.xml
@@ -1,10 +1,10 @@
 <?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">
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/topLayout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/colorA">
 
 	<fragment
 		android:id="@+id/status"
@@ -13,21 +13,40 @@
 		android:layout_height="40dp"
 		tools:layout="@layout/status" />
 
-	<RelativeLayout
+	<LinearLayout
 		android:id="@+id/top_bar"
-		android:background="@color/colorF"
+		android:background="@color/colorG"
 		android:layout_width="match_parent"
-		android:layout_height="50dp"
-		android:layout_below="@id/status">
+		android:layout_height="60dp"
+		android:orientation="horizontal"
+		android:layout_below="@id/status"
+		android:gravity="center">
+
+		<ImageView
+			android:src="@drawable/call_status_incoming"
+			android:paddingRight="10dp"
+			android:paddingTop="15dp"
+			android:paddingBottom="15dp"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"/>
 
 		<TextView
 			android:text="@string/incoming_call"
-			style="@style/font1"
-			android:layout_width="match_parent"
+			style="@style/font2"
+			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
 			android:gravity="center"/>
 
-	</RelativeLayout>
+	</LinearLayout>
+
+	<ImageView
+		android:id="@+id/contact_picture"
+		android:src="@drawable/avatar_big"
+		android:contentDescription="@string/content_description_contact_picture"
+		android:layout_centerInParent="true"
+		android:layout_width="200dp"
+		android:layout_height="200dp"
+		android:paddingBottom="20dp"/>
 
 	<RelativeLayout
 		android:id="@+id/contact_detail"
@@ -38,62 +57,29 @@
 		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">
+			android:background="@color/colorG"
+			android:layout_alignParentBottom="true"
+			android:layout_width="match_parent"
+			android:layout_height="80dp"
+			android:gravity="center_horizontal"
+			android:orientation="vertical">
 
-			<RelativeLayout
-				android:id="@+id/avatar_layout"
+			<TextView
+				android:id="@+id/contact_name"
+				style="@style/font13"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_margin="5dp"
-				android:gravity="center">
+				android:paddingTop="5dp"
+				android:layout_alignParentTop="true"
+				android:layout_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"
+			<TextView
+				android:id="@+id/contact_number"
+				style="@style/font11"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_gravity="center_vertical">
+				android:layout_gravity="center"/>
 
-				<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>
@@ -113,7 +99,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:padding="15dp"/>
+			android:padding="12dp"/>
 
 		<LinearLayout
 			android:id="@+id/acceptUnlock"
@@ -154,7 +140,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:padding="15dp"/>
+			android:padding="12dp"/>
 
 		<LinearLayout
 			android:id="@+id/declineUnlock"
@@ -162,7 +148,7 @@
 			android:layout_height="wrap_content"
 			android:visibility="gone"
 			android:orientation="horizontal"
-			android:background="@color/colorD"
+			android:background="@color/colorC"
 			android:paddingLeft="15dp"
 			android:paddingTop="15dp"
 			android:paddingBottom="15dp"
diff --git a/res/layout-sw533dp-land/call_outgoing.xml b/res/layout-sw533dp-land/call_outgoing.xml
index 64f02eebe..7629283be 100644
--- a/res/layout-sw533dp-land/call_outgoing.xml
+++ b/res/layout-sw533dp-land/call_outgoing.xml
@@ -1,10 +1,10 @@
 <?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">
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/topLayout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/colorA">
 
 	<fragment
 		android:id="@+id/status"
@@ -13,22 +13,40 @@
 		android:layout_width="match_parent"
 		android:layout_height="40dp"/>
 
-	<RelativeLayout
+	<LinearLayout
 		android:id="@+id/top_bar"
-		android:background="@color/colorF"
+		android:background="@color/colorG"
 		android:layout_width="match_parent"
-		android:layout_height="50dp"
-		android:layout_below="@id/status">
+		android:layout_height="60dp"
+		android:orientation="horizontal"
+		android:layout_below="@id/status"
+		android:gravity="center">
+
+		<ImageView
+			android:src="@drawable/call_status_outgoing"
+			android:paddingRight="10dp"
+			android:paddingTop="15dp"
+			android:paddingBottom="15dp"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"/>
 
 		<TextView
 			android:text="@string/outgoing_call"
-			style="@style/font1"
-			android:layout_width="match_parent"
+			style="@style/font2"
+			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
-			android:paddingLeft="10dp"
 			android:gravity="center"/>
 
-	</RelativeLayout>
+	</LinearLayout>
+
+	<ImageView
+		android:id="@+id/contact_picture"
+		android:src="@drawable/avatar_big"
+		android:contentDescription="@string/content_description_contact_picture"
+		android:layout_centerInParent="true"
+		android:layout_width="200dp"
+		android:layout_height="200dp"
+		android:paddingBottom="20dp"/>
 
 	<RelativeLayout
 		android:id="@+id/contact_detail"
@@ -39,62 +57,29 @@
 		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">
+			android:background="@color/colorG"
+			android:layout_alignParentBottom="true"
+			android:layout_width="match_parent"
+			android:layout_height="80dp"
+			android:gravity="center_horizontal"
+			android:orientation="vertical">
 
-			<RelativeLayout
-				android:id="@+id/avatar_layout"
+			<TextView
+				android:id="@+id/contact_name"
+				style="@style/font13"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_margin="5dp"
-				android:gravity="center">
+				android:paddingTop="5dp"
+				android:layout_alignParentTop="true"
+				android:layout_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"
+			<TextView
+				android:id="@+id/contact_number"
+				style="@style/font11"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_gravity="center_vertical">
+				android:layout_gravity="center"/>
 
-				<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>
@@ -122,7 +107,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:padding="15dp"/>
+			android:padding="12dp"/>
 
 		<ImageView
 			android:id="@+id/speaker"
@@ -132,7 +117,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:padding="20dp"/>
+			android:padding="15dp"/>
 
 		<ImageView
 			android:id="@+id/outgoing_hang_up"
@@ -142,7 +127,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="0.7"
-			android:padding="15dp"/>
+			android:padding="12dp"/>
 
 	</LinearLayout>
 
diff --git a/res/layout-sw533dp-land/chat.xml b/res/layout-sw533dp-land/chat.xml
new file mode 100644
index 000000000..f70d6a717
--- /dev/null
+++ b/res/layout-sw533dp-land/chat.xml
@@ -0,0 +1,172 @@
+<?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="match_parent"
+  	android:background="@color/colorF" >
+
+	<LinearLayout
+		android:id="@+id/top_bar"
+		android:orientation="horizontal"
+		android:background="@color/colorF"
+		android:layout_width="match_parent"
+		android:layout_height="60dp">
+
+		<ImageView
+			android:id="@+id/back"
+			android:src="@drawable/back_button"
+			android:contentDescription="@string/content_description_back"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:visibility="gone"
+			android:padding="15dp"/>
+
+		<TextView
+			android:id="@+id/contact_name"
+			style="@style/font2"
+			android:ellipsize="end"
+			android:singleLine="true"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.6"
+			android:layout_gravity="left"
+			android:padding="15dp"/>
+
+		<ImageView
+			android:id="@+id/start_call"
+			android:src="@drawable/call_alt_start_button"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
+
+		<ImageView
+			android:id="@+id/back_to_call"
+			android:src="@drawable/call_back_button"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:visibility="gone"
+			android:padding="12dp"/>
+
+		<ImageView
+			android:id="@+id/edit"
+			android:src="@drawable/edit_list_button"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
+	</LinearLayout>
+
+	<include layout="@layout/edit_list"/>
+
+	<View
+		android:background="@color/colorE"
+		android:layout_below="@id/top_bar"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"/>
+
+	<LinearLayout
+        android:id="@+id/footer"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:orientation="vertical"
+	    android:layout_alignParentBottom="true"
+	    android:layout_centerHorizontal="true"
+   		android:background="@color/colorD">
+       
+	    <RelativeLayout 
+	        android:id="@+id/message_layout"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content">
+	        
+	        <ImageView
+	            android:id="@+id/send_picture"
+				android:padding="15dp"
+				android:scaleType="center"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentLeft="true"
+				android:layout_centerVertical="true"
+				android:src="@drawable/chat_send_file" />
+
+			<ImageView
+				android:id="@+id/send_message"
+				android:gravity="center"
+				android:padding="15dp"
+				android:scaleType="center"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:src="@drawable/chat_send_message"
+				android:layout_alignTop="@+id/message"
+				android:layout_alignParentRight="true"/>
+
+
+			<EditText
+				android:id="@+id/message"
+                android:imeOptions="flagNoExtractUi"
+	            android:textCursorDrawable="@null"
+            	android:inputType="textMultiLine"
+            	android:maxLines="2"
+	            android:textColor="@android:color/black"
+	            android:layout_width="match_parent"
+	            android:layout_height="40dp"
+				android:padding="10dp"
+	            android:layout_toRightOf="@id/send_picture"
+	            android:layout_toLeftOf="@id/send_message"
+	            android:background="@drawable/resizable_textfield"
+	            android:layout_centerVertical="true"/>
+	        
+	    </RelativeLayout>
+	</LinearLayout>
+
+	<TextView
+        android:id="@+id/remote_composing"
+		android:text="@string/remote_composing"
+		style="@style/font14"
+		android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+		android:layout_above="@+id/footer" android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"/>
+
+	<ListView
+		android:id="@+id/chat_message_list"
+		android:divider="@android:color/transparent"
+		android:stackFromBottom="true"
+		android:transcriptMode="alwaysScroll"
+		android:dividerHeight="10dp"
+		android:layout_marginLeft="10dp"
+		android:layout_marginRight="10dp"
+		android:cacheColorHint="@color/transparent"
+		android:layout_above="@id/remote_composing"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_margin="10dp"
+		android:layout_below="@+id/top_bar"/>
+
+	<EditText
+		android:id="@+id/search_contact_field"
+		android:contentDescription="@string/content_description_search"
+		android:textCursorDrawable="@null"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		android:visibility="gone"
+		android:textColor="@android:color/black"
+		android:background="@drawable/resizable_textfield"
+		android:layout_margin="5dp"
+		android:layout_below="@id/top_bar"
+		android:inputType="textPersonName"/>
+
+	<ListView
+		android:id="@+id/result_contacts"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:divider="@color/colorE"
+		android:visibility="gone"
+		android:layout_below="@id/search_contact_field"
+		android:fastScrollAlwaysVisible="true"
+		android:fastScrollEnabled="true"
+		android:dividerHeight="1dp"
+		android:layout_above="@+id/footer"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp-land/chatlist_cell.xml b/res/layout-sw533dp-land/chatlist_cell.xml
index 9d22432dc..ba8a46342 100644
--- a/res/layout-sw533dp-land/chatlist_cell.xml
+++ b/res/layout-sw533dp-land/chatlist_cell.xml
@@ -31,12 +31,6 @@
 			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"
@@ -44,17 +38,6 @@
 					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
@@ -78,7 +61,7 @@
 				android:scrollHorizontally="true"
 				android:fadingEdge="horizontal"
 				android:singleLine="true"
-				style="@style/font6"
+				style="@style/font2"
 				android:paddingLeft="10dp"
 				android:layout_marginTop="5dp"
 				android:layout_width="wrap_content"
@@ -88,15 +71,15 @@
 
 			<TextView
 				android:id="@+id/unreadMessages"
-				android:layout_width="25dp"
-				android:layout_height="25dp"
+				android:layout_width="20dp"
+				android:layout_height="20dp"
 				android:background="@drawable/chat_list_indicator"
-				style="@style/font18"
+				style="@style/font7"
 				android:gravity="center"
 				android:singleLine="true"
-				android:layout_above="@+id/lastMessage"
 				android:layout_alignParentRight="true"
-				android:layout_alignParentEnd="true"/>
+				android:layout_alignParentEnd="true"
+				android:layout_alignBottom="@+id/sipUri"/>
 
 			<TextView
 				android:id="@+id/lastMessage"
diff --git a/res/layout-sw533dp-land/contact.xml b/res/layout-sw533dp-land/contact.xml
new file mode 100644
index 000000000..1a6bb2554
--- /dev/null
+++ b/res/layout-sw533dp-land/contact.xml
@@ -0,0 +1,103 @@
+<?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:background="@color/colorF"
+    android:orientation="vertical" >
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:background="@color/colorG"
+		android:layout_width="match_parent"
+		android:visibility="gone"
+		android:layout_height="60dp">
+
+		<ImageView
+			android:id="@+id/back"
+			android:src="@drawable/back_button"
+			android:contentDescription="@string/content_description_back"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:padding="18dp"/>
+
+		<View
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.8"/>
+	</LinearLayout>
+
+	<View
+		android:background="@color/colorE"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"/>
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:padding="10dp"
+			android:orientation="vertical">
+
+			<ImageView
+				android:id="@+id/contact_picture"
+				android:src="@drawable/avatar"
+				android:contentDescription="@string/content_description_contact_picture"
+				android:layout_width="80dp"
+				android:layout_height="80dp"
+				android:adjustViewBounds="true"
+				android:layout_gravity="center"/>
+
+			<LinearLayout
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:orientation="vertical">
+
+				<TextView
+					android:id="@+id/contact_name"
+					style="@style/font13"
+					android:lines="2"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+
+				<TextView
+					android:id="@+id/contact_function"
+					style="@style/font2"
+					android:singleLine="true"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+
+			</LinearLayout>
+		</LinearLayout>
+
+		<TextView
+			android:text="@string/address_sip"
+			style="@style/font8"
+			android:textStyle="bold"
+			android:background="@color/colorE"
+			android:textAllCaps="true"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:gravity="center"/>
+        
+	    <TableLayout
+	        android:id="@+id/controls"
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content"
+	        android:stretchColumns="*"
+	        android:paddingTop="10dp"/>
+
+		</LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp-land/dialer.xml b/res/layout-sw533dp-land/dialer.xml
index cf3875d5f..612971258 100644
--- a/res/layout-sw533dp-land/dialer.xml
+++ b/res/layout-sw533dp-land/dialer.xml
@@ -1,27 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:background="@color/colorD"
+	android:background="@color/colorE"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-	<ImageView
-		android:src="@drawable/dialer_background"
-		android:layout_width="wrap_content"
-		android:layout_height="300dp"
-		android:layout_centerVertical="true"/>
-
 	<RelativeLayout
 		android:id="@+id/dialer"
-		android:background="@color/colorH"
-		android:layout_marginRight="50dp"
+		android:background="@color/colorC"
+		android:layout_marginLeft="50dp"
 		android:layout_centerVertical="true"
-		android:layout_alignParentRight="true"
+		android:layout_alignParentLeft="true"
 		android:layout_width="300dp"
 		android:layout_height="460dp">
 
 		<RelativeLayout
 			android:id="@+id/address_bar"
-			android:background="@color/colorF"
+			android:background="@color/colorG"
 			android:layout_width="match_parent"
 			android:layout_height="60dp"
 			android:layout_marginBottom="10dp"
@@ -39,9 +33,9 @@
 
 			<org.linphone.ui.AddressText
 				android:id="@+id/address"
-				android:background="@color/colorF"
+				android:background="@color/colorG"
 				android:textColorHint="@color/colorE"
-				style="@style/font5"
+				style="@style/font1"
 				android:ellipsize="start"
 				android:inputType="textEmailAddress"
 				android:hint="@string/address_bar_hint"
@@ -69,23 +63,14 @@
 			android:layout_width="match_parent"
 			android:layout_height="60dp">
 
-			<RelativeLayout
-				android:focusable="true"
-				android:layout_width="match_parent"
+			<ImageView
+				android:id="@+id/back"
+				android:src="@drawable/dialer_alt_back"
+				android:background="@drawable/button_back_background"
+				android:layout_width="102dp"
 				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>
+				android:padding="20dp"
+				android:visibility="gone"/>
 
 			<org.linphone.ui.CallButton
 				android:id="@+id/call"
@@ -95,6 +80,7 @@
 				android:layout_height="wrap_content"
 				android:padding="12dp"
 				android:layout_weight="0.5"/>
+
 		</LinearLayout>
 	</RelativeLayout>
 
diff --git a/res/layout-sw533dp-land/dialog.xml b/res/layout-sw533dp-land/dialog.xml
new file mode 100644
index 000000000..12cb150c3
--- /dev/null
+++ b/res/layout-sw533dp-land/dialog.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+  	android:layout_width="fill_parent"
+  	android:layout_height="fill_parent"
+ 	android:gravity="center">
+
+	<TextView
+		android:id="@+id/customText"
+		style="@style/font4"
+		android:layout_margin="20dp"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:padding="20dp"/>
+
+	<LinearLayout
+		android:layout_width="400dp"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:gravity="center"
+		android:layout_margin="20dp"
+		android:orientation="vertical">
+
+		<Button
+			android:id="@+id/delete_button"
+			android:text="@string/delete"
+			android:background="@drawable/resizable_confirm_delete_button"
+			style="@style/font5"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="10dp"
+			android:padding="10dp"/>
+
+		<Button
+			android:id="@+id/cancel"
+			android:text="@string/cancel"
+			android:background="@drawable/resizable_cancel_button"
+			style="@style/font5"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="10dp"
+			android:padding="10dp"/>
+
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp-land/history_detail.xml b/res/layout-sw533dp-land/history_detail.xml
new file mode 100644
index 000000000..46eb8905c
--- /dev/null
+++ b/res/layout-sw533dp-land/history_detail.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:background="@color/colorF"
+			  android:layout_width="match_parent"
+			  android:layout_height="match_parent"
+			  android:orientation="vertical" >
+
+	<LinearLayout
+		android:id="@+id/top_bar"
+		android:orientation="horizontal"
+		android:background="@color/colorG"
+		android:layout_width="match_parent"
+		android:visibility="gone"
+		android:layout_height="60dp">
+
+		<ImageView
+			android:id="@+id/back"
+			android:src="@drawable/back_button"
+			android:contentDescription="@string/content_description_back"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:padding="18dp"/>
+
+		<View
+			android:layout_weight="0.8"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"/>
+	</LinearLayout>
+
+	<View
+		android:background="@color/colorE"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"/>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="20dp"
+		android:orientation="vertical">
+
+		<ImageView
+			android:id="@+id/contact_picture"
+			android:src="@drawable/avatar"
+			android:contentDescription="@string/content_description_contact_picture"
+			android:layout_width="80dp"
+			android:layout_height="80dp"
+			android:adjustViewBounds="true"
+			android:layout_gravity="center"/>
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/contact_name"
+				style="@style/font13"
+				android:lines="2"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+			<TextView
+				android:id="@+id/contact_function"
+				style="@style/font2"
+				android:singleLine="true"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+	<TextView
+		android:text="@string/address_sip"
+		style="@style/font8"
+		android:textStyle="bold"
+		android:background="@color/colorE"
+		android:textAllCaps="true"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		android:gravity="center"/>
+
+	<TextView
+		android:id="@+id/contact_address"
+		style="@style/font2"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:padding="2dp"
+		android:layout_gravity="center"/>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:orientation="horizontal">
+
+		<ImageView
+			android:id="@+id/call"
+			android:src="@drawable/call_start_button"
+			android:contentDescription="@string/content_description_dial_back"
+			android:layout_width="60dp"
+			android:layout_height="60dp"
+			android:layout_margin="10dp"
+			android:adjustViewBounds="true"
+			android:layout_centerInParent="true"/>
+
+		<ImageView
+			android:id="@+id/chat"
+			android:src="@drawable/chat_start_button"
+			android:contentDescription="@string/content_description_chat"
+			android:layout_width="60dp"
+			android:layout_height="60dp"
+			android:layout_margin="10dp"
+			android:adjustViewBounds="true"
+			android:layout_centerInParent="true" />
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:id="@+id/log_row"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingTop="5dp">
+
+		<TextView
+			android:id="@+id/direction"
+			android:text="@string/history_log_label"
+			style="@style/font9"
+			android:layout_marginTop="2dp"
+			android:layout_gravity="center"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal"
+			android:gravity="center"
+			android:padding="10dp">
+
+			<TextView
+				android:id="@+id/date"
+				style="@style/font2"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+			<TextView
+				android:id="@+id/time"
+				style="@style/font2"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+		</LinearLayout>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp-land/main.xml b/res/layout-sw533dp-land/main.xml
index cbb36d0aa..54375b5a6 100644
--- a/res/layout-sw533dp-land/main.xml
+++ b/res/layout-sw533dp-land/main.xml
@@ -108,77 +108,47 @@
 					android:layout_height="0dp">
 
 					<ImageView
+						android:id="@+id/history_image"
 						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"
+						style="@style/font7"
 						android:layout_width="25dp"
 						android:layout_height="25dp"
-						android:layout_margin="12dp"
+						android:visibility="gone"
+						android:layout_marginBottom="10dp"
+						android:layout_alignBottom="@+id/history_image"
 						android:gravity="center"
-						android:visibility="gone"/>
+						android:layout_alignParentRight="true"/>
 
 				</RelativeLayout>
 
-				<RelativeLayout
+				<ImageView
 					android:id="@+id/contacts"
+					android:src="@drawable/footer_contacts"
 					android:background="@drawable/footer_button"
 					android:layout_weight="1"
 					android:layout_width="60dp"
-					android:layout_height="0dp">
+					android:layout_height="0dp"
+					android:padding="15dp"
+					android:layout_centerInParent="true" />
 
-					<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
+				<ImageView
 					android:id="@+id/dialer"
+					android:src="@drawable/footer_dialer"
 					android:background="@drawable/footer_button"
+					android:contentDescription="@string/content_description_dialer"
 					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>
+					android:layout_height="0dp"
+					android:padding="15dp"
+					android:layout_centerInParent="true"/>
 
 				<RelativeLayout
 					android:id="@+id/chat"
@@ -188,29 +158,25 @@
 					android:layout_height="0dp">
 
 					<ImageView
+						android:id="@+id/chat_image"
 						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"
+						style="@style/font7"
 						android:layout_width="25dp"
 						android:layout_height="25dp"
-						android:layout_margin="12dp"
+						android:visibility="gone"
+						android:layout_alignBottom="@+id/chat_image"
+						android:layout_marginBottom="10dp"
 						android:gravity="center"
-						android:visibility="gone" />
+						android:layout_alignParentRight="true"
+						android:layout_alignParentEnd="true"/>
 
 				</RelativeLayout>
 			</LinearLayout>
@@ -242,12 +208,12 @@
 
 			<ListView
 				android:id="@+id/item_list"
-				android:background="@color/colorH"
+				android:background="@color/colorG"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
 				android:choiceMode="singleChoice"
 				android:divider="@color/colorE"
-				android:listSelector="@color/colorH"
+				android:listSelector="@color/colorG"
 				android:dividerHeight="1dp"/>
 		</LinearLayout>
 
diff --git a/res/layout-sw533dp/assistant_remote_provisioning_login.xml b/res/layout-sw533dp/assistant_remote_provisioning_login.xml
new file mode 100644
index 000000000..7c429ce05
--- /dev/null
+++ b/res/layout-sw533dp/assistant_remote_provisioning_login.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:background="@color/colorG"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:layout_centerInParent="true"
+		android:gravity="center"
+	    android:orientation="vertical">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+
+			<ImageView
+				android:src="@drawable/linphone_logo"
+				android:layout_width="60dp"
+				android:layout_height="60dp"
+				android:layout_gravity="bottom"/>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="20dp"
+				android:layout_gravity="bottom"
+				android:orientation="vertical">
+
+				<TextView
+					android:text="@string/welcome"
+					style="@style/font13"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+
+				<TextView
+					android:text="@string/assistant_remote_provisioning_login"
+					style="@style/font11"
+					android:singleLine="true"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+			</LinearLayout>
+
+		</LinearLayout>
+
+		<TextView
+			android:text="@string/username"
+			style="@style/font9"
+			android:layout_marginTop="30dp"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
+
+		<EditText
+			android:id="@+id/assistant_username"
+			android:background="@drawable/resizable_textfield"
+			android:textColor="@color/colorC"
+			android:textCursorDrawable="@null"
+			android:inputType="textEmailAddress"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:singleLine="true"/>
+
+		<TextView
+			android:text="@string/domain"
+			style="@style/font9"
+			android:paddingTop="20dp"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
+
+		<EditText
+			android:id="@+id/assistant_domain"
+			android:background="@drawable/resizable_textfield"
+			android:textColor="@color/colorC"
+			android:textCursorDrawable="@null"
+			android:inputType="textEmailAddress"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:singleLine="true"/>
+
+		<TextView
+			android:text="@string/password"
+			style="@style/font9"
+			android:paddingTop="20dp"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
+
+		<EditText
+			android:id="@+id/assistant_password"
+			android:background="@drawable/resizable_textfield"
+			android:textColor="@color/colorC"
+			android:textCursorDrawable="@null"
+			android:inputType="textPassword"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:singleLine="true"/>
+
+		<Button
+			android:id="@+id/assistant_connect"
+			android:text="@string/connect"
+			android:background="@drawable/assistant_button"
+			style="@style/font5"
+			android:textAllCaps="false"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:layout_marginTop="20dp"
+			android:layout_centerInParent="true"
+			android:layout_centerVertical="true"/>
+
+	</LinearLayout>
+
+	<ImageView
+		android:src="@drawable/logo_orange"
+		android:layout_width="60dp"
+		android:layout_height="60dp"
+		android:layout_margin="30dp"
+		android:layout_alignParentBottom="true"
+		android:layout_alignParentRight="true"/>
+
+</RelativeLayout>
diff --git a/res/layout-sw533dp/call.xml b/res/layout-sw533dp/call.xml
new file mode 100644
index 000000000..ee33e6d51
--- /dev/null
+++ b/res/layout-sw533dp/call.xml
@@ -0,0 +1,452 @@
+<?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.support.v4.widget.DrawerLayout
+        android:id="@+id/side_menu"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <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/call_bar">
+
+				<RelativeLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginTop="40dp">
+
+					<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:background="@color/colorA"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:visibility="visible">
+
+						<LinearLayout
+							android:id="@+id/active_call_info"
+                            android:background="@color/colorG"
+							android:layout_width="match_parent"
+							android:layout_height="80dp"
+                            android:orientation="vertical"
+                            android:layout_alignParentBottom="true"
+                            android:layout_alignParentLeft="true"
+                            android:layout_alignParentStart="true">
+
+                            <TextView
+                                android:id="@+id/current_contact_name"
+                                style="@style/font13"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:paddingTop="5dp"
+                                android:layout_alignParentTop="true"
+                                android:layout_gravity="center"/>
+
+                            <Chronometer
+                                android:id="@+id/current_call_timer"
+                                style="@style/font11"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_below="@id/current_contact_name"
+                                android:layout_gravity="center"/>
+						</LinearLayout>
+
+                        <ImageView
+                            android:id="@+id/contact_picture"
+                            android:src="@drawable/avatar_big"
+                            android:contentDescription="@string/content_description_contact_picture"
+                            android:layout_centerInParent="true"
+                            android:layout_width="200dp"
+                            android:layout_height="200dp"
+                            android:paddingBottom="20dp"/>
+
+                        <LinearLayout
+                            android:id="@+id/remote_pause"
+                            android:background="@color/colorA"
+                            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/font4"
+                                android:gravity="center"
+                                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="15dp"
+                            android:layout_below="@+id/active_call_info"
+                            android:layout_alignParentRight="true"
+							android:layout_alignParentTop="true"/>
+
+                        <ImageView
+                            android:id="@+id/switchCamera"
+                            android:src="@drawable/switch_camera"
+                            android:layout_width="80dp"
+                            android:layout_height="80dp"
+                            android:padding="15dp"
+                            android:contentDescription="@string/content_description_switch_camera"
+                            android:visibility="invisible"
+                            android:layout_below="@+id/active_call_info"
+                            android:layout_alignParentLeft="true"
+							android:layout_alignParentTop="true"/>
+
+					</RelativeLayout>
+
+					<LinearLayout
+						android:id="@+id/no_current_call"
+                        android:background="@color/colorA"
+						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/font4"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:gravity="center"
+							android:layout_gravity="center"/>
+					</LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_alignParentBottom="true">
+
+                        <LinearLayout
+                            android:id="@+id/calls_list"
+                            android:background="@color/colorG"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="0.6"
+                            android:divider="@color/colorF"
+                            android:dividerHeight="1dp"
+                            android:orientation="vertical">
+                        </LinearLayout>
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="0.4"/>
+
+                    </LinearLayout>
+
+				</RelativeLayout>
+			</FrameLayout>
+
+            <LinearLayout
+                android:id="@+id/call_bar"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_alignParentBottom="true"
+                android:layout_gravity="center"
+                android:orientation="horizontal" >
+
+                <LinearLayout
+                    android:id="@+id/main_bar"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_weight="0.5"
+                    android:orientation="horizontal" >
+
+                    <ImageView
+                        android:id="@+id/dialer"
+                        android:src="@drawable/dialer"
+                        android:background="@color/colorC"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.6"
+                        android:padding="15dp" />
+
+                    <ImageView
+                        android:id="@+id/chat"
+                        android:src="@drawable/chat"
+                        android:background="@color/colorC"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.6"
+                        android:padding="15dp"/>
+                    <ImageView
+                        android:id="@+id/hang_up"
+                        android:src="@drawable/call_hangup"
+                        android:background="@drawable/hangup"
+                        android:layout_gravity="center"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.4"
+                        android:padding="12dp"/>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/menu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:background="@color/colorF"
+                        android:layout_width="match_parent"
+                        android:layout_height="60dp"
+                        android:orientation="horizontal">
+
+                        <RelativeLayout
+                            android:background="@drawable/button_background"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+
+                            <ImageView
+                                android:id="@+id/video"
+                                android:src="@drawable/camera_default"
+                                android:background="@drawable/button_background"
+                                android:padding="20dp"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"/>
+
+                            <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="12dp"
+                            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="15dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1" />
+
+                        <ImageView
+                            android:id="@+id/audio_route"
+                            android:src="@drawable/routes"
+                            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="15dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+                    </LinearLayout>
+
+                </LinearLayout>
+            </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/menu_bottom"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_above="@id/call_bar"
+                    android:orientation="horizontal" >
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="invisible"
+                        android:layout_weight="0.2"/>
+
+                    <ImageView
+                        android:id="@+id/route_bluetooth"
+                        android:src="@drawable/route_bluetooth"
+                        android:background="@drawable/button_call_background"
+                        android:padding="15dp"
+                        android:visibility="invisible"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.7" />
+
+                    <ImageView
+                        android:id="@+id/add_call"
+                        android:src="@drawable/options_add_call"
+                        android:background="@drawable/button_call_background"
+                        android:padding="15dp"
+                        android:visibility="invisible"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.7" />
+
+                </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="0.2"/>
+
+                    <ImageView
+                        android:id="@+id/route_earpiece"
+                        android:src="@drawable/route_earpiece"
+                        android:background="@drawable/button_call_background"
+                        android:padding="15dp"
+                        android:visibility="invisible"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.22" />
+
+                    <ImageView
+                        android:id="@+id/transfer"
+                        android:src="@drawable/options_transfer_call"
+                        android:background="@drawable/button_call_background"
+                        android:padding="15dp"
+                        android:visibility="invisible"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.22" />
+
+                </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="0.2"/>
+
+                    <ImageView
+                        android:id="@+id/route_speaker"
+                        android:src="@drawable/route_speaker"
+                        android:background="@drawable/button_call_background"
+                        android:visibility="invisible"
+                        android:padding="15dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.22" />
+
+                    <ImageView
+                        android:id="@+id/conference"
+                        android:src="@drawable/options_start_conference"
+                        android:background="@drawable/button_call_background"
+                        android:visibility="invisible"
+                        android:padding="15dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.22" />
+                </LinearLayout>
+
+			<org.linphone.ui.Numpad
+				android:id="@+id/numpad"
+				android:background="@color/colorC"
+				android:contentDescription="@string/content_description_numpad"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:visibility="gone"
+				android:layout_marginTop="50dp"
+				android:layout_marginBottom="10dp"
+				android:layout_above="@id/menu"
+				android:layout_centerHorizontal="true"
+				android:layout_centerVertical="true"/>
+        </RelativeLayout>
+
+		<RelativeLayout
+			android:id="@+id/side_menu_content"
+			android:background="@color/colorD"
+			android:layout_marginTop="40dp"
+			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>
+
+	<fragment
+		android:id="@+id/status"
+		android:name="org.linphone.StatusFragment"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		tools:layout="@layout/status" />
+
+</RelativeLayout>
diff --git a/res/layout-sw533dp/call_incoming.xml b/res/layout-sw533dp/call_incoming.xml
new file mode 100644
index 000000000..674aa02c8
--- /dev/null
+++ b/res/layout-sw533dp/call_incoming.xml
@@ -0,0 +1,179 @@
+<?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/colorA">
+
+	<fragment
+		android:id="@+id/status"
+		android:name="org.linphone.StatusFragment"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		tools:layout="@layout/status" />
+
+	<LinearLayout
+		android:id="@+id/top_bar"
+		android:background="@color/colorG"
+		android:layout_width="match_parent"
+		android:layout_height="60dp"
+		android:orientation="horizontal"
+		android:layout_below="@id/status"
+		android:gravity="center">
+
+		<ImageView
+			android:src="@drawable/call_status_incoming"
+			android:paddingRight="10dp"
+			android:paddingTop="15dp"
+			android:paddingBottom="15dp"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"/>
+
+		<TextView
+			android:text="@string/incoming_call"
+			style="@style/font2"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:gravity="center"/>
+
+	</LinearLayout>
+
+	<ImageView
+		android:id="@+id/contact_picture"
+		android:src="@drawable/avatar_big"
+		android:contentDescription="@string/content_description_contact_picture"
+		android:layout_centerInParent="true"
+		android:layout_width="200dp"
+		android:layout_height="200dp"
+		android:paddingBottom="20dp"/>
+
+	<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:background="@color/colorG"
+			android:layout_alignParentBottom="true"
+			android:layout_width="match_parent"
+			android:layout_height="80dp"
+			android:gravity="center_horizontal"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/contact_name"
+				style="@style/font13"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:paddingTop="5dp"
+				android:layout_alignParentTop="true"
+				android:layout_gravity="center"/>
+
+			<TextView
+				android:id="@+id/contact_number"
+				style="@style/font11"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"/>
+
+		</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="12dp"/>
+
+		<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="12dp"/>
+
+		<LinearLayout
+			android:id="@+id/declineUnlock"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:visibility="gone"
+			android:orientation="horizontal"
+			android:background="@color/colorC"
+			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/call_outgoing.xml b/res/layout-sw533dp/call_outgoing.xml
new file mode 100644
index 000000000..7629283be
--- /dev/null
+++ b/res/layout-sw533dp/call_outgoing.xml
@@ -0,0 +1,134 @@
+<?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/colorA">
+
+	<fragment
+		android:id="@+id/status"
+		android:name="org.linphone.StatusFragment"
+		tools:layout="@layout/status"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"/>
+
+	<LinearLayout
+		android:id="@+id/top_bar"
+		android:background="@color/colorG"
+		android:layout_width="match_parent"
+		android:layout_height="60dp"
+		android:orientation="horizontal"
+		android:layout_below="@id/status"
+		android:gravity="center">
+
+		<ImageView
+			android:src="@drawable/call_status_outgoing"
+			android:paddingRight="10dp"
+			android:paddingTop="15dp"
+			android:paddingBottom="15dp"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"/>
+
+		<TextView
+			android:text="@string/outgoing_call"
+			style="@style/font2"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:gravity="center"/>
+
+	</LinearLayout>
+
+	<ImageView
+		android:id="@+id/contact_picture"
+		android:src="@drawable/avatar_big"
+		android:contentDescription="@string/content_description_contact_picture"
+		android:layout_centerInParent="true"
+		android:layout_width="200dp"
+		android:layout_height="200dp"
+		android:paddingBottom="20dp"/>
+
+	<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:background="@color/colorG"
+			android:layout_alignParentBottom="true"
+			android:layout_width="match_parent"
+			android:layout_height="80dp"
+			android:gravity="center_horizontal"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/contact_name"
+				style="@style/font13"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:paddingTop="5dp"
+				android:layout_alignParentTop="true"
+				android:layout_gravity="center"/>
+
+			<TextView
+				android:id="@+id/contact_number"
+				style="@style/font11"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"/>
+
+		</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="12dp"/>
+
+		<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="15dp"/>
+
+		<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="12dp"/>
+
+	</LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout-sw533dp/chat.xml b/res/layout-sw533dp/chat.xml
new file mode 100644
index 000000000..f70d6a717
--- /dev/null
+++ b/res/layout-sw533dp/chat.xml
@@ -0,0 +1,172 @@
+<?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="match_parent"
+  	android:background="@color/colorF" >
+
+	<LinearLayout
+		android:id="@+id/top_bar"
+		android:orientation="horizontal"
+		android:background="@color/colorF"
+		android:layout_width="match_parent"
+		android:layout_height="60dp">
+
+		<ImageView
+			android:id="@+id/back"
+			android:src="@drawable/back_button"
+			android:contentDescription="@string/content_description_back"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:visibility="gone"
+			android:padding="15dp"/>
+
+		<TextView
+			android:id="@+id/contact_name"
+			style="@style/font2"
+			android:ellipsize="end"
+			android:singleLine="true"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.6"
+			android:layout_gravity="left"
+			android:padding="15dp"/>
+
+		<ImageView
+			android:id="@+id/start_call"
+			android:src="@drawable/call_alt_start_button"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
+
+		<ImageView
+			android:id="@+id/back_to_call"
+			android:src="@drawable/call_back_button"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:visibility="gone"
+			android:padding="12dp"/>
+
+		<ImageView
+			android:id="@+id/edit"
+			android:src="@drawable/edit_list_button"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:padding="15dp"/>
+	</LinearLayout>
+
+	<include layout="@layout/edit_list"/>
+
+	<View
+		android:background="@color/colorE"
+		android:layout_below="@id/top_bar"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"/>
+
+	<LinearLayout
+        android:id="@+id/footer"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:orientation="vertical"
+	    android:layout_alignParentBottom="true"
+	    android:layout_centerHorizontal="true"
+   		android:background="@color/colorD">
+       
+	    <RelativeLayout 
+	        android:id="@+id/message_layout"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content">
+	        
+	        <ImageView
+	            android:id="@+id/send_picture"
+				android:padding="15dp"
+				android:scaleType="center"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentLeft="true"
+				android:layout_centerVertical="true"
+				android:src="@drawable/chat_send_file" />
+
+			<ImageView
+				android:id="@+id/send_message"
+				android:gravity="center"
+				android:padding="15dp"
+				android:scaleType="center"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:src="@drawable/chat_send_message"
+				android:layout_alignTop="@+id/message"
+				android:layout_alignParentRight="true"/>
+
+
+			<EditText
+				android:id="@+id/message"
+                android:imeOptions="flagNoExtractUi"
+	            android:textCursorDrawable="@null"
+            	android:inputType="textMultiLine"
+            	android:maxLines="2"
+	            android:textColor="@android:color/black"
+	            android:layout_width="match_parent"
+	            android:layout_height="40dp"
+				android:padding="10dp"
+	            android:layout_toRightOf="@id/send_picture"
+	            android:layout_toLeftOf="@id/send_message"
+	            android:background="@drawable/resizable_textfield"
+	            android:layout_centerVertical="true"/>
+	        
+	    </RelativeLayout>
+	</LinearLayout>
+
+	<TextView
+        android:id="@+id/remote_composing"
+		android:text="@string/remote_composing"
+		style="@style/font14"
+		android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+		android:layout_above="@+id/footer" android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"/>
+
+	<ListView
+		android:id="@+id/chat_message_list"
+		android:divider="@android:color/transparent"
+		android:stackFromBottom="true"
+		android:transcriptMode="alwaysScroll"
+		android:dividerHeight="10dp"
+		android:layout_marginLeft="10dp"
+		android:layout_marginRight="10dp"
+		android:cacheColorHint="@color/transparent"
+		android:layout_above="@id/remote_composing"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_margin="10dp"
+		android:layout_below="@+id/top_bar"/>
+
+	<EditText
+		android:id="@+id/search_contact_field"
+		android:contentDescription="@string/content_description_search"
+		android:textCursorDrawable="@null"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		android:visibility="gone"
+		android:textColor="@android:color/black"
+		android:background="@drawable/resizable_textfield"
+		android:layout_margin="5dp"
+		android:layout_below="@id/top_bar"
+		android:inputType="textPersonName"/>
+
+	<ListView
+		android:id="@+id/result_contacts"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:divider="@color/colorE"
+		android:visibility="gone"
+		android:layout_below="@id/search_contact_field"
+		android:fastScrollAlwaysVisible="true"
+		android:fastScrollEnabled="true"
+		android:dividerHeight="1dp"
+		android:layout_above="@+id/footer"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp/contact.xml b/res/layout-sw533dp/contact.xml
new file mode 100644
index 000000000..1a6bb2554
--- /dev/null
+++ b/res/layout-sw533dp/contact.xml
@@ -0,0 +1,103 @@
+<?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:background="@color/colorF"
+    android:orientation="vertical" >
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:background="@color/colorG"
+		android:layout_width="match_parent"
+		android:visibility="gone"
+		android:layout_height="60dp">
+
+		<ImageView
+			android:id="@+id/back"
+			android:src="@drawable/back_button"
+			android:contentDescription="@string/content_description_back"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:padding="18dp"/>
+
+		<View
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.8"/>
+	</LinearLayout>
+
+	<View
+		android:background="@color/colorE"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"/>
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:padding="10dp"
+			android:orientation="vertical">
+
+			<ImageView
+				android:id="@+id/contact_picture"
+				android:src="@drawable/avatar"
+				android:contentDescription="@string/content_description_contact_picture"
+				android:layout_width="80dp"
+				android:layout_height="80dp"
+				android:adjustViewBounds="true"
+				android:layout_gravity="center"/>
+
+			<LinearLayout
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:orientation="vertical">
+
+				<TextView
+					android:id="@+id/contact_name"
+					style="@style/font13"
+					android:lines="2"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+
+				<TextView
+					android:id="@+id/contact_function"
+					style="@style/font2"
+					android:singleLine="true"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+
+			</LinearLayout>
+		</LinearLayout>
+
+		<TextView
+			android:text="@string/address_sip"
+			style="@style/font8"
+			android:textStyle="bold"
+			android:background="@color/colorE"
+			android:textAllCaps="true"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:gravity="center"/>
+        
+	    <TableLayout
+	        android:id="@+id/controls"
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content"
+	        android:stretchColumns="*"
+	        android:paddingTop="10dp"/>
+
+		</LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp/dialer.xml b/res/layout-sw533dp/dialer.xml
index 85eadecaa..d4cf2d8a4 100644
--- a/res/layout-sw533dp/dialer.xml
+++ b/res/layout-sw533dp/dialer.xml
@@ -1,26 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:background="@color/colorD"
+	android:background="@color/colorE"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-	<ImageView
-		android:src="@drawable/dialer_background"
-		android:layout_centerHorizontal="true"
-		android:layout_width="400dp"
-		android:layout_height="wrap_content"/>
-
 	<RelativeLayout
-		android:background="@color/colorH"
-		android:layout_marginBottom="50dp"
-		android:layout_centerHorizontal="true"
-		android:layout_alignParentBottom="true"
+		android:background="@color/colorC"
 		android:layout_width="300dp"
-		android:layout_height="460dp">
+		android:layout_height="460dp"
+		android:layout_margin="50dp"
+		android:layout_alignParentBottom="true"
+		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true">
 
 		<RelativeLayout
 			android:id="@+id/address_bar"
-			android:background="@color/colorF"
+			android:background="@color/colorG"
 			android:layout_width="match_parent"
 			android:layout_height="60dp"
 			android:layout_marginBottom="10dp"
@@ -38,9 +33,9 @@
 
 			<org.linphone.ui.AddressText
 				android:id="@+id/address"
-				android:background="@color/colorF"
+				android:background="@color/colorG"
 				android:textColorHint="@color/colorE"
-				style="@style/font5"
+				style="@style/font1"
 				android:ellipsize="start"
 				android:inputType="textEmailAddress"
 				android:hint="@string/address_bar_hint"
@@ -68,23 +63,14 @@
 			android:layout_width="match_parent"
 			android:layout_height="60dp">
 
-			<RelativeLayout
-				android:focusable="true"
-				android:layout_width="match_parent"
+			<ImageView
+				android:id="@+id/back"
+				android:src="@drawable/dialer_alt_back"
+				android:background="@drawable/button_back_background"
+				android:layout_width="102dp"
 				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>
+				android:padding="20dp"
+				android:visibility="gone"/>
 
 			<org.linphone.ui.CallButton
 				android:id="@+id/call"
@@ -94,6 +80,7 @@
 				android:layout_height="wrap_content"
 				android:padding="12dp"
 				android:layout_weight="0.5"/>
+
 		</LinearLayout>
 	</RelativeLayout>
 
diff --git a/res/layout-sw533dp/history_detail.xml b/res/layout-sw533dp/history_detail.xml
new file mode 100644
index 000000000..46eb8905c
--- /dev/null
+++ b/res/layout-sw533dp/history_detail.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:background="@color/colorF"
+			  android:layout_width="match_parent"
+			  android:layout_height="match_parent"
+			  android:orientation="vertical" >
+
+	<LinearLayout
+		android:id="@+id/top_bar"
+		android:orientation="horizontal"
+		android:background="@color/colorG"
+		android:layout_width="match_parent"
+		android:visibility="gone"
+		android:layout_height="60dp">
+
+		<ImageView
+			android:id="@+id/back"
+			android:src="@drawable/back_button"
+			android:contentDescription="@string/content_description_back"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="0.2"
+			android:padding="18dp"/>
+
+		<View
+			android:layout_weight="0.8"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"/>
+	</LinearLayout>
+
+	<View
+		android:background="@color/colorE"
+		android:layout_width="match_parent"
+		android:layout_height="1dp"/>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="20dp"
+		android:orientation="vertical">
+
+		<ImageView
+			android:id="@+id/contact_picture"
+			android:src="@drawable/avatar"
+			android:contentDescription="@string/content_description_contact_picture"
+			android:layout_width="80dp"
+			android:layout_height="80dp"
+			android:adjustViewBounds="true"
+			android:layout_gravity="center"/>
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/contact_name"
+				style="@style/font13"
+				android:lines="2"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+			<TextView
+				android:id="@+id/contact_function"
+				style="@style/font2"
+				android:singleLine="true"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+	<TextView
+		android:text="@string/address_sip"
+		style="@style/font8"
+		android:textStyle="bold"
+		android:background="@color/colorE"
+		android:textAllCaps="true"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		android:gravity="center"/>
+
+	<TextView
+		android:id="@+id/contact_address"
+		style="@style/font2"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:padding="2dp"
+		android:layout_gravity="center"/>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:orientation="horizontal">
+
+		<ImageView
+			android:id="@+id/call"
+			android:src="@drawable/call_start_button"
+			android:contentDescription="@string/content_description_dial_back"
+			android:layout_width="60dp"
+			android:layout_height="60dp"
+			android:layout_margin="10dp"
+			android:adjustViewBounds="true"
+			android:layout_centerInParent="true"/>
+
+		<ImageView
+			android:id="@+id/chat"
+			android:src="@drawable/chat_start_button"
+			android:contentDescription="@string/content_description_chat"
+			android:layout_width="60dp"
+			android:layout_height="60dp"
+			android:layout_margin="10dp"
+			android:adjustViewBounds="true"
+			android:layout_centerInParent="true" />
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:id="@+id/log_row"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingTop="5dp">
+
+		<TextView
+			android:id="@+id/direction"
+			android:text="@string/history_log_label"
+			style="@style/font9"
+			android:layout_marginTop="2dp"
+			android:layout_gravity="center"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal"
+			android:gravity="center"
+			android:padding="10dp">
+
+			<TextView
+				android:id="@+id/date"
+				style="@style/font2"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+			<TextView
+				android:id="@+id/time"
+				style="@style/font2"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+		</LinearLayout>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp/main.xml b/res/layout-sw533dp/main.xml
index 0e15eb382..bbec2e26d 100644
--- a/res/layout-sw533dp/main.xml
+++ b/res/layout-sw533dp/main.xml
@@ -109,77 +109,49 @@
 					android:layout_height="match_parent">
 
 					<ImageView
-						android:src="@drawable/footer_history"
+						android:id="@+id/history_image"
 						android:layout_width="match_parent"
-						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="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"
-						android:visibility="gone"/>
+						android:layout_height="match_parent"
+						android:padding="18dp"
+						android:layout_centerInParent="true"
+						android:contentDescription="@string/content_description_history"
+						android:src="@drawable/footer_history"/>
 
 					<TextView
 						android:id="@+id/missed_calls"
+						style="@style/font7"
+						android:layout_width="25dp"
+						android:layout_height="25dp"
+						android:layout_margin="12dp"
 						android:background="@drawable/history_chat_indicator"
-						style="@style/font18"
-						android:layout_width="20dp"
-						android:layout_height="20dp"
-						android:layout_margin="15dp"
+						android:visibility="gone"
 						android:gravity="center"
-						android:visibility="gone"/>
-
-				</RelativeLayout>
-
-				<RelativeLayout
-					android:id="@+id/contacts"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="0dp"
-					android:layout_height="match_parent">
-
-					<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="match_parent"
-						android:layout_height="5dp"
 						android:layout_alignParentBottom="true"
-						android:visibility="gone"/>
+						android:layout_alignParentRight="true"/>
+
 				</RelativeLayout>
 
-				<RelativeLayout
-					android:id="@+id/dialer"
+				<ImageView
+					android:id="@+id/contacts"
+					android:src="@drawable/footer_contacts"
 					android:background="@drawable/footer_button"
+					android:contentDescription="@string/content_description_contacts"
 					android:layout_weight="1"
 					android:layout_width="0dp"
-					android:layout_height="match_parent">
+					android:layout_height="match_parent"
+					android:padding="18dp"
+					android:layout_centerInParent="true" />
 
-					<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="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"/>
-
-				</RelativeLayout>
+				<ImageView
+					android:id="@+id/dialer"
+					android:src="@drawable/footer_dialer"
+					android:background="@drawable/footer_button"
+					android:contentDescription="@string/content_description_dialer"
+					android:layout_weight="1"
+					android:layout_width="0dp"
+					android:layout_height="match_parent"
+					android:padding="18dp"
+					android:layout_centerInParent="true"/>
 
 				<RelativeLayout
 					android:id="@+id/chat"
@@ -189,29 +161,24 @@
 					android:layout_height="match_parent">
 
 					<ImageView
+						android:id="@+id/chat_image"
 						android:src="@drawable/footer_chat"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:padding="15dp"
+						android:padding="18dp"
 						android:layout_centerInParent="true" />
 
-					<View
-						android:id="@+id/chat_select"
-						android:background="@color/colorA"
-						android:layout_width="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"
-						android:visibility="gone"/>
-
 					<TextView
 						android:id="@+id/missed_chats"
+						style="@style/font7"
+						android:layout_width="25dp"
+						android:layout_height="25dp"
+						android:layout_margin="12dp"
 						android:background="@drawable/history_chat_indicator"
-						style="@style/font18"
-						android:layout_width="20dp"
-						android:layout_height="20dp"
-						android:layout_margin="15dp"
+						android:visibility="gone"
 						android:gravity="center"
-						android:visibility="gone"/>
+						android:layout_alignParentBottom="true"
+						android:layout_alignParentRight="true"/>
 
 				</RelativeLayout>
 			</LinearLayout>
@@ -243,12 +210,12 @@
 
 			<ListView
 				android:id="@+id/item_list"
-				android:background="@color/colorH"
+				android:background="@color/colorG"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
 				android:choiceMode="singleChoice"
 				android:divider="@color/colorE"
-				android:listSelector="@color/colorH"
+				android:listSelector="@color/colorG"
 				android:dividerHeight="1dp"/>
 		</LinearLayout>