diff --git a/res/drawable-xhdpi/linphone_logo.png b/res/drawable-xhdpi/linphone_logo.png
index f7a9f7545..5331e7766 100644
Binary files a/res/drawable-xhdpi/linphone_logo.png and b/res/drawable-xhdpi/linphone_logo.png differ
diff --git a/res/drawable-xhdpi/logo_secure_phone.png b/res/drawable-xhdpi/logo_secure_phone.png
deleted file mode 100644
index 5331e7766..000000000
Binary files a/res/drawable-xhdpi/logo_secure_phone.png and /dev/null differ
diff --git a/res/drawable/contact_add_disabled.xml b/res/drawable/contact_add_disabled.xml
index 339f89829..59156764c 100644
--- a/res/drawable/contact_add_disabled.xml
+++ b/res/drawable/contact_add_disabled.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:src="@drawable/conf_status_paused"
+	android:src="@drawable/contact_add_button"
 	android:alpha="0.2" />
diff --git a/res/drawable/status_level.xml b/res/drawable/status_level.xml
index 2852a9c03..0aafe1562 100644
--- a/res/drawable/status_level.xml
+++ b/res/drawable/status_level.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
-	  <item android:maxLevel="0" android:drawable="@drawable/linphone_notification_icon" />
+	  <item android:maxLevel="0" android:drawable="@drawable/logo_secure_phone_icon" />
 	  <item android:maxLevel="1" android:drawable="@drawable/linphone_notification_icon" />
 	  <item android:maxLevel="2" android:drawable="@drawable/linphone_notification_icon" />
 	  <item android:maxLevel="3" android:drawable="@drawable/linphone_notification_icon" />
diff --git a/res/layout-land/assistant_linphone_login.xml b/res/layout-land/assistant_linphone_login.xml
deleted file mode 100644
index da2143e02..000000000
--- a/res/layout-land/assistant_linphone_login.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-	<TextView
-		android:text="@string/assistant_linphone_account_title"
-		android:contentDescription="@string/content_description_welcome"
-		style="@style/font6"
-		android:textAllCaps="true"
-		android:padding="5dp"
-		android:layout_gravity="center"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:gravity="center_horizontal"/>
-
-	<TableLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-
-		<TableRow
-			android:layout_weight="1"
-			android:gravity="center">
-
-			<TextView
-				android:text="@string/username"
-				style="@style/font13"
-				android:textAllCaps="true"
-				android:layout_marginLeft="5dp"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_weight="1"/>
-
-			<TextView
-				android:text="@string/password"
-				style="@style/font13"
-				android:textAllCaps="true"
-				android:layout_marginLeft="5dp"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_weight="1"/>
-
-		</TableRow>
-
-		<TableRow
-			android:layout_weight="1"
-			android:gravity="center">
-
-			<EditText
-				android:id="@+id/assistant_username"
-				android:background="@drawable/resizable_textfield"
-				android:textColor="@color/colorB"
-				android:textCursorDrawable="@null"
-				android:inputType="textEmailAddress"
-				android:layout_width="0dp"
-				android:layout_height="30dp"
-				android:layout_weight="1"
-				android:layout_margin="5dp"
-				android:singleLine="true"/>
-
-			<EditText
-				android:id="@+id/assistant_password"
-				android:background="@drawable/resizable_textfield"
-				android:textColor="@color/colorB"
-				android:textCursorDrawable="@null"
-				android:inputType="textPassword"
-				android:layout_width="0dp"
-				android:layout_height="30dp"
-				android:layout_weight="1"
-				android:layout_margin="5dp"
-				android:singleLine="true"/>
-		</TableRow>
-
-		<TableRow
-			android:layout_weight="1"
-			android:gravity="center">
-
-			<TextView
-				android:text="@string/assistant_display_name"
-				style="@style/font13"
-				android:textAllCaps="true"
-				android:layout_marginLeft="5dp"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_weight="1"/>
-
-			<TextView
-				android:layout_margin="5dp"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_weight="1"/>
-
-		</TableRow>
-
-		<TableRow
-			android:layout_weight="1"
-			android:gravity="center">
-
-			<EditText
-				android:id="@+id/assistant_display_name"
-				android:background="@drawable/resizable_textfield"
-				android:textColor="@color/colorB"
-				android:textCursorDrawable="@null"
-				android:inputType="textEmailAddress"
-				android:layout_width="0dp"
-				android:layout_height="30dp"
-				android:layout_weight="1"
-				android:layout_margin="5dp"
-				android:singleLine="true"/>
-
-			<TextView
-				android:layout_margin="5dp"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_weight="1"/>
-		</TableRow>
-
-	</TableLayout>
-
-	<Button
-		android:id="@+id/assistant_apply"
-		android:text="@string/assistant_login"
-		android:background="@drawable/assistant_button"
-		style="@style/font8"
-		android:contentDescription="@string/content_description_validate"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_margin="10dp"
-		android:layout_gravity="center_horizontal"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-land/call.xml b/res/layout-land/call.xml
deleted file mode 100644
index 561a27ade..000000000
--- a/res/layout-land/call.xml
+++ /dev/null
@@ -1,463 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/topLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-	<fragment
-		android:id="@+id/status"
-		android:name="org.linphone.StatusFragment"
-		android:layout_width="match_parent"
-		android:layout_height="35dp"
-		tools:layout="@layout/status" />
-
-
-	<android.support.v4.widget.DrawerLayout
-		android:id="@+id/side_menu"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_below="@id/status">
-
-		<RelativeLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:layout_below="@id/status">
-
-			<LinearLayout
-				android:id="@+id/fragmentContainer"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:orientation="horizontal" />
-
-			<FrameLayout
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:layout_above="@+id/menu">
-
-				<RelativeLayout
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content">
-
-					<LinearLayout
-						android:id="@+id/conference_list"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_gravity="top"
-						android:layout_alignParentTop="true"
-						android:orientation="vertical"
-						android:visibility="gone">
-					</LinearLayout>
-
-					<RelativeLayout
-						android:id="@+id/active_call"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:visibility="visible">
-
-						<LinearLayout
-							android:id="@+id/active_call_info"
-							android:background="@color/colorH"
-							android:alpha="0.8"
-							android:paddingBottom="10dp"
-							android:layout_width="match_parent"
-							android:layout_height="60dp"
-							android:gravity="center_horizontal"
-							android:orientation="horizontal">
-
-							<TextView
-								android:id="@+id/current_contact_name"
-								style="@style/font5"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:layout_gravity="bottom"/>
-
-							<Chronometer
-								android:id="@+id/current_call_timer"
-								style="@style/font2"
-								android:layout_marginLeft="10dp"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:layout_gravity="bottom"/>
-						</LinearLayout>
-
-						<RelativeLayout
-							android:id="@+id/avatar_layout"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:layout_below="@id/active_call_info"
-							android:layout_margin="5dp"
-							android:paddingTop="10dp"
-							android:gravity="center_horizontal">
-
-							<ImageView
-								android:id="@+id/contact_picture"
-								android:src="@drawable/avatar"
-								android:contentDescription="@string/content_description_contact_picture"
-								android:layout_width="150dp"
-								android:layout_height="150dp"
-								android:adjustViewBounds="true"/>
-
-							<ImageView
-								android:id="@+id/mask"
-								android:src="@drawable/avatar_mask_border"
-								android:contentDescription="@string/content_description_contact_picture"
-								android:layout_width="150dp"
-								android:layout_height="150dp"
-								android:adjustViewBounds="true"/>
-
-						</RelativeLayout>
-
-						<LinearLayout
-							android:id="@+id/remote_pause"
-							android:background="@color/colorC"
-							android:alpha="0.9"
-							android:layout_width="match_parent"
-							android:layout_height="match_parent"
-							android:gravity="center"
-							android:orientation="vertical"
-							android:visibility="gone">
-
-							<ImageView
-								android:src="@drawable/waiting_time"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:layout_gravity="center"/>
-
-							<TextView
-								android:text="@string/call_paused_by_remote"
-								style="@style/font16"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:layout_gravity="center"/>
-
-						</LinearLayout>
-
-						<ImageView
-							android:id="@+id/pause"
-							android:src="@drawable/pause_big_default"
-							android:contentDescription="@string/content_description_pause"
-							android:layout_width="80dp"
-							android:layout_height="80dp"
-							android:padding="10dp"
-							android:layout_below="@+id/active_call_info"
-							android:layout_alignParentRight="true"/>
-
-						<ImageView
-							android:id="@+id/switchCamera"
-							android:src="@drawable/switch_camera"
-							android:layout_width="80dp"
-							android:layout_height="80dp"
-							android:padding="10dp"
-							android:contentDescription="@string/content_description_switch_camera"
-							android:visibility="invisible"
-							android:layout_below="@+id/active_call_info"
-							android:layout_alignParentLeft="true"/>
-					</RelativeLayout>
-
-
-					<LinearLayout
-						android:id="@+id/calls_list"
-						android:background="@color/colorH"
-						android:layout_width="match_parent"
-						android:layout_weight="0.5"
-						android:layout_height="wrap_content"
-						android:layout_alignParentBottom="true"
-						android:layout_gravity="bottom"
-						android:orientation="vertical">
-					</LinearLayout>
-
-					<LinearLayout
-						android:id="@+id/no_current_call"
-						android:background="@color/colorC"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:orientation="vertical"
-						android:layout_above="@id/calls_list"
-						android:gravity="center_vertical"
-						android:visibility="gone">
-
-						<ImageView
-							android:src="@drawable/waiting_time"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_gravity="center"/>
-
-						<TextView
-							android:text="@string/no_current_call"
-							style="@style/font16"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_gravity="center"/>
-					</LinearLayout>
-
-				</RelativeLayout>
-			</FrameLayout>
-
-			<org.linphone.ui.Numpad
-				android:id="@+id/numpad"
-				android:background="@color/colorF"
-				android:contentDescription="@string/content_description_numpad"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:visibility="gone"
-				android:layout_margin="10dp"
-				android:layout_above="@id/menu"
-				android:layout_centerHorizontal="true"
-				android:layout_centerVertical="true"/>
-
-			<LinearLayout
-				android:id="@+id/menu"
-				android:layout_width="wrap_content"
-				android:layout_height="60dp"
-				android:layout_alignParentBottom="true"
-				android:orientation="horizontal">
-
-				<LinearLayout
-					android:id="@+id/main_bar"
-					android:background="@color/colorF"
-					android:layout_width="match_parent"
-					android:layout_height="60dp"
-					android:layout_weight="1"
-					android:orientation="horizontal">
-
-					<ImageView
-						android:id="@+id/dialer"
-						android:src="@drawable/footer_dialer"
-						android:background="@color/colorC"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						android:padding="20dp" />
-
-					<ImageView
-						android:id="@+id/hang_up"
-						android:src="@drawable/call_hangup"
-						android:background="@drawable/hangup"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="0.5"
-						android:padding="15dp"/>
-
-					<ImageView
-						android:id="@+id/chat"
-						android:src="@drawable/footer_chat"
-						android:background="@color/colorC"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						android:padding="18dp"/>
-				</LinearLayout>
-
-
-				<LinearLayout
-					android:layout_width="match_parent"
-					android:layout_height="60dp"
-					android:layout_weight="1"
-					android:orientation="horizontal">
-
-					<RelativeLayout
-						android:background="@drawable/button_background"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:layout_weight="1">
-
-						<ImageView
-							android:id="@+id/video"
-							android:src="@drawable/camera_default"
-							android:background="@drawable/button_background"
-							android:padding="22dp"
-							android:layout_width="match_parent"
-							android:layout_height="match_parent"/>
-
-						<ProgressBar
-							android:id="@+id/video_in_progress"
-							style="?android:attr/progressBarStyle"
-							android:layout_centerHorizontal="true"
-							android:layout_centerVertical="true"
-							android:visibility="gone"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"/>
-
-					</RelativeLayout>
-
-					<ImageView
-						android:id="@+id/micro"
-						android:src="@drawable/micro_default"
-						android:background="@drawable/button_background"
-						android:padding="15dp"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1" />
-
-					<ImageView
-						android:id="@+id/speaker"
-						android:src="@drawable/speaker_default"
-						android:background="@drawable/button_background"
-						android:padding="18dp"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:layout_weight="1" />
-
-					<ImageView
-						android:id="@+id/audio_route"
-						android:src="@drawable/routes_default"
-						android:background="@drawable/button_background"
-						android:visibility="gone"
-						android:padding="20dp"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:layout_weight="1" />
-
-					<ImageView
-						android:id="@+id/options"
-						android:src="@drawable/options_default"
-						android:background="@drawable/button_background"
-						android:padding="18dp"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1" />
-
-				</LinearLayout>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:id="@+id/menu_bottom"
-				android:layout_width="match_parent"
-				android:layout_height="60dp"
-				android:layout_above="@id/menu"
-				android:orientation="horizontal" android:layout_alignParentLeft="true"
-				android:layout_alignParentStart="true">
-
-				<TextView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"
-					android:layout_weight="1"/>
-
-				<TextView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"
-					android:layout_weight="1"/>
-
-				<ImageView
-					android:id="@+id/route_bluetooth"
-					android:src="@drawable/route_bluetooth"
-					android:background="@drawable/button_background"
-					android:padding="20dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4" />
-
-				<ImageView
-					android:id="@+id/add_call"
-					android:src="@drawable/options_add_call"
-					android:background="@drawable/button_background"
-					android:padding="20dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4" />
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:id="@+id/menu_middle"
-				android:layout_width="match_parent"
-				android:layout_height="60dp"
-				android:layout_above="@id/menu_bottom"
-				android:orientation="horizontal" >
-
-				<TextView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"
-					android:layout_weight="1"/>
-
-				<TextView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"
-					android:layout_weight="1"/>
-
-				<ImageView
-					android:id="@+id/route_earpiece"
-					android:src="@drawable/route_earpiece"
-					android:background="@drawable/button_background"
-					android:padding="20dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4"/>
-
-				<ImageView
-					android:id="@+id/transfer"
-					android:src="@drawable/options_transfer_call"
-					android:background="@drawable/button_background"
-					android:padding="20dp"
-					android:visibility="invisible"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:layout_above="@id/menu_middle"
-				android:layout_width="match_parent"
-				android:layout_height="60dp"
-				android:orientation="horizontal" >
-
-				<TextView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"
-					android:layout_weight="1"/>
-
-				<TextView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"
-					android:layout_weight="1"/>
-
-				<ImageView
-					android:id="@+id/route_speaker"
-					android:src="@drawable/route_speaker"
-					android:background="@drawable/button_background"
-					android:visibility="invisible"
-					android:padding="20dp"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4"/>
-
-				<ImageView
-					android:id="@+id/conference"
-					android:src="@drawable/options_start_conference"
-					android:background="@drawable/button_background"
-					android:visibility="invisible"
-					android:padding="20dp"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_weight="1.4"/>
-
-			</LinearLayout>
-
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:id="@+id/side_menu_content"
-			android:background="@color/colorH"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:layout_gravity="left">
-
-			<include layout="@layout/incall_stats" android:id="@+id/incall_stats"/>
-
-		</RelativeLayout>
-
-	</android.support.v4.widget.DrawerLayout>
-
-</RelativeLayout>
diff --git a/res/layout-land/call_incoming.xml b/res/layout-land/call_incoming.xml
deleted file mode 100644
index 43392d1eb..000000000
--- a/res/layout-land/call_incoming.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				xmlns:tools="http://schemas.android.com/tools"
-				android:id="@+id/topLayout"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:background="@color/colorH">
-
-	<fragment
-		android:id="@+id/status"
-		android:name="org.linphone.StatusFragment"
-		android:layout_width="match_parent"
-		android:layout_height="40dp"
-		tools:layout="@layout/status" />
-
-	<RelativeLayout
-		android:id="@+id/top_bar"
-		android:background="@color/colorF"
-		android:layout_width="match_parent"
-		android:layout_height="50dp"
-		android:layout_below="@id/status">
-
-		<TextView
-			android:text="@string/incoming_call"
-			style="@style/font1"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:gravity="center"/>
-
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:id="@+id/contact_detail"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_below="@id/top_bar"
-		android:paddingTop="10dp"
-		android:layout_above="@+id/menu">
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_centerHorizontal="true"
-			android:layout_centerVertical="true"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content">
-
-			<RelativeLayout
-				android:id="@+id/avatar_layout"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_margin="5dp"
-				android:gravity="center">
-
-				<ImageView
-					android:id="@+id/contact_picture"
-					android:src="@drawable/avatar"
-					android:contentDescription="@string/content_description_contact_picture"
-					android:layout_width="200dp"
-					android:layout_height="wrap_content"
-					android:adjustViewBounds="true"/>
-
-				<ImageView
-					android:src="@drawable/avatar_mask_border"
-					android:layout_width="200dp"
-					android:layout_height="wrap_content"
-					android:adjustViewBounds="true"
-					android:layout_alignParentTop="true"/>
-
-			</RelativeLayout>
-
-			<LinearLayout
-				android:orientation="vertical"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center_vertical">
-
-				<TextView
-					android:id="@+id/contact_name"
-					style="@style/font5"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_alignParentTop="true"
-					android:layout_centerHorizontal="true"
-					android:paddingTop="5dp"/>
-
-				<TextView
-					android:id="@+id/contact_number"
-					style="@style/font2"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_below="@id/contact_name"
-					android:layout_gravity="center"
-					android:layout_centerHorizontal="true"
-					android:paddingBottom="10dp"/>
-
-			</LinearLayout>
-		</LinearLayout>
-
-	</RelativeLayout>
-
-	<LinearLayout
-		android:id="@+id/menu"
-		android:layout_width="match_parent"
-		android:layout_height="60dp"
-		android:layout_alignParentBottom="true"
-		android:orientation="horizontal" >
-
-		<ImageView
-			android:id="@+id/decline"
-			android:src="@drawable/call_hangup"
-			android:background="@drawable/hangup"
-			android:contentDescription="@string/content_description_decline"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:padding="15dp"/>
-
-		<LinearLayout
-			android:id="@+id/acceptUnlock"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:visibility="gone"
-			android:orientation="horizontal"
-			android:background="@color/colorA"
-			android:paddingLeft="15dp"
-			android:paddingTop="15dp"
-			android:paddingBottom="15dp"
-			android:layout_gravity="bottom">
-
-			<ImageView
-				android:src="@drawable/arrow_accept"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
-
-			<ImageView
-				android:src="@drawable/arrow_accept"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:alpha="0.6"/>
-
-			<ImageView
-				android:id="@+id/acceptArrow"
-				android:src="@drawable/arrow_accept"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:alpha="0.2"/>
-		</LinearLayout>
-
-		<ImageView
-			android:id="@+id/accept"
-			android:src="@drawable/call_audio_start"
-			android:background="@drawable/call"
-			android:contentDescription="@string/content_description_accept"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:padding="15dp"/>
-
-		<LinearLayout
-			android:id="@+id/declineUnlock"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:visibility="gone"
-			android:orientation="horizontal"
-			android:background="@color/colorD"
-			android:paddingLeft="15dp"
-			android:paddingTop="15dp"
-			android:paddingBottom="15dp"
-			android:layout_gravity="bottom">
-
-			<ImageView
-				android:id="@+id/arrow_hangup"
-				android:src="@drawable/arrow_hangup"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:alpha="0.2"/>
-
-
-			<ImageView
-				android:src="@drawable/arrow_hangup"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:alpha="0.6"/>
-
-			<ImageView
-				android:src="@drawable/arrow_hangup"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
-
-		</LinearLayout>
-	</LinearLayout>
-
-</RelativeLayout>
diff --git a/res/layout-land/call_outgoing.xml b/res/layout-land/call_outgoing.xml
deleted file mode 100644
index 88b3e9560..000000000
--- a/res/layout-land/call_outgoing.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				xmlns:tools="http://schemas.android.com/tools"
-				android:id="@+id/topLayout"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:background="@color/colorH">
-
-	<fragment
-		android:id="@+id/status"
-		android:name="org.linphone.StatusFragment"
-		tools:layout="@layout/status"
-		android:layout_width="match_parent"
-		android:layout_height="40dp"/>
-
-	<RelativeLayout
-		android:id="@+id/top_bar"
-		android:background="@color/colorF"
-		android:layout_width="match_parent"
-		android:layout_height="50dp"
-		android:layout_below="@id/status">
-
-		<TextView
-			android:text="@string/outgoing_call"
-			style="@style/font1"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:paddingLeft="10dp"
-			android:gravity="center"/>
-
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:id="@+id/contact_detail"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_above="@id/menu"
-		android:layout_below="@id/top_bar"
-		android:paddingTop="10dp">
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_centerHorizontal="true"
-			android:layout_centerVertical="true"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content">
-
-			<RelativeLayout
-				android:id="@+id/avatar_layout"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_margin="5dp"
-				android:gravity="center">
-
-				<ImageView
-					android:id="@+id/contact_picture"
-					android:src="@drawable/avatar"
-					android:contentDescription="@string/content_description_contact_picture"
-					android:layout_width="200dp"
-					android:layout_height="wrap_content"
-					android:adjustViewBounds="true"/>
-
-				<ImageView
-					android:src="@drawable/avatar_mask_border"
-					android:layout_width="200dp"
-					android:layout_height="wrap_content"
-					android:adjustViewBounds="true"
-					android:layout_alignParentTop="true"/>
-
-			</RelativeLayout>
-
-			<LinearLayout
-				android:orientation="vertical"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center_vertical">
-
-				<TextView
-					android:id="@+id/contact_name"
-					style="@style/font5"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_alignParentTop="true"
-					android:layout_centerHorizontal="true"
-					android:paddingTop="5dp"/>
-
-				<TextView
-					android:id="@+id/contact_number"
-					style="@style/font2"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_below="@id/contact_name"
-					android:layout_gravity="center"
-					android:layout_centerHorizontal="true"
-					android:paddingBottom="10dp"/>
-
-			</LinearLayout>
-		</LinearLayout>
-
-	</RelativeLayout>
-
-	<org.linphone.mediastream.video.display.GL2JNIView
-		android:id="@+id/videoSurface"
-		android:layout_width="match_parent"
-		android:layout_height="0dip"
-		android:layout_weight="1"
-		android:visibility="gone" />
-
-	<LinearLayout
-		android:id="@+id/menu"
-		android:layout_width="match_parent"
-		android:layout_height="60dp"
-		android:layout_alignParentBottom="true"
-		android:layout_alignParentLeft="true"
-		android:orientation="horizontal" >
-
-		<ImageView
-			android:id="@+id/micro"
-			android:src="@drawable/micro_default"
-			android:background="@drawable/button_background"
-			android:contentDescription="@string/content_description_toggle_micro"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:padding="15dp"/>
-
-		<ImageView
-			android:id="@+id/speaker"
-			android:src="@drawable/speaker_default"
-			android:background="@drawable/button_background"
-			android:contentDescription="@string/content_description_toggle_speaker"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:padding="20dp"/>
-
-		<ImageView
-			android:id="@+id/hang_up"
-			android:src="@drawable/call_hangup"
-			android:background="@drawable/hangup"
-			android:contentDescription="@string/content_description_hang_up"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="0.7"
-			android:padding="15dp"/>
-
-	</LinearLayout>
-
-</RelativeLayout>
diff --git a/res/layout-land/chatlist_cell.xml b/res/layout-land/chatlist_cell.xml
deleted file mode 100644
index 550482130..000000000
--- a/res/layout-land/chatlist_cell.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="60dp"
-    android:gravity="center_vertical"
-    android:paddingLeft="10dp"
-	android:paddingRight="10dp"
-	android:paddingTop="5dp"
-    android:background="@drawable/list_selector">
-
-	<CheckBox
-		android:id="@+id/delete"
-		android:button="@drawable/checkbox"
-		android:contentDescription="@string/content_description_delete"
-		android:paddingRight="5dp"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:adjustViewBounds="true"
-		android:layout_alignParentRight="true"
-		android:layout_centerVertical="true"
-		android:visibility="invisible" />
-	
-	<TextView 
-	    android:id="@+id/draft"
-	    android:visibility="gone"
-	    android:layout_centerVertical="true"
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:textAppearance="?android:attr/textAppearanceSmall"
-	    android:textColor="@color/colorB"
-	    android:text="@string/draft"
-	    android:layout_marginLeft="5dp"
-	    android:layout_marginRight="5dp" />
-	
-	<LinearLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
-	    android:layout_centerVertical="true"
-	    android:layout_toLeftOf="@id/draft"
-	    android:orientation="horizontal">
-
-		<RelativeLayout
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:gravity="center">
-
-			<RelativeLayout
-				android:id="@+id/avatar_layout"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_centerHorizontal="true">
-
-				<ImageView
-					android:id="@+id/contact_picture"
-					android:src="@drawable/avatar"
-					android:contentDescription="@string/content_description_contact_picture"
-					android:layout_width="35dp"
-					android:layout_height="35dp"
-					android:adjustViewBounds="true"/>
-
-				<ImageView
-					android:id="@+id/mask"
-					android:src="@drawable/avatar_mask"
-					android:contentDescription="@string/content_description_contact_picture"
-					android:layout_width="35dp"
-					android:layout_height="35dp"
-					android:adjustViewBounds="true"/>
-
-			</RelativeLayout>
-
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:paddingLeft="10dp">
-
-			<TextView
-				android:id="@+id/date"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="5dp"
-				android:singleLine="true"
-				style="@style/font2"/>
-
-			<TextView
-				android:id="@+id/sipUri"
-				android:lines="1"
-				android:ellipsize="marquee"
-				android:marqueeRepeatLimit="marquee_forever"
-				android:scrollHorizontally="true"
-				android:fadingEdge="horizontal"
-				android:singleLine="true"
-				style="@style/font6"
-				android:paddingLeft="10dp"
-				android:layout_marginTop="5dp"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/date"
-				android:layout_marginRight="30dp"/>
-
-			<TextView
-				android:id="@+id/unreadMessages"
-				android:layout_width="25dp"
-				android:layout_height="25dp"
-				android:background="@drawable/chat_list_indicator"
-				style="@style/font18"
-				android:gravity="center"
-				android:singleLine="true"
-				android:layout_above="@+id/lastMessage"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentEnd="true"/>
-
-			<TextView
-				android:id="@+id/lastMessage"
-				android:maxLines="2"
-				android:ellipsize="end"
-				android:layout_below="@id/sipUri"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				style="@style/font11"/>
-
-		</RelativeLayout>
-	    
-	</LinearLayout>
-    
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
deleted file mode 100644
index cfa44cfe0..000000000
--- a/res/layout-land/main.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-	xmlns:tools="http://schemas.android.com/tools"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<fragment
-		android:id="@+id/status"
-		android:name="org.linphone.StatusFragment"
-		android:layout_width="match_parent"
-		android:layout_height="35dp"
-		tools:layout="@layout/status" />
-
-	<android.support.v4.widget.DrawerLayout
-		android:id="@+id/side_menu"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_below="@id/status">
-
-		<RelativeLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent">
-
-			<RelativeLayout
-				android:id="@+id/top_bar"
-				android:background="@color/colorF"
-				android:layout_width="match_parent"
-				android:layout_height="60dp"
-				android:visibility="gone"
-				android:layout_alignParentTop="true">
-
-				<TextView
-					android:id="@+id/menu_name"
-					android:text="@string/settings"
-					style="@style/font1"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:layout_centerInParent="true"
-					android:gravity="center_vertical"/>
-
-				<ImageView
-					android:id="@+id/cancel"
-					android:src="@drawable/dialer_back"
-					android:layout_width="wrap_content"
-					android:layout_height="match_parent"
-					android:padding="15dp"
-					android:layout_centerInParent="true"
-					android:layout_alignParentRight="true"/>
-
-			</RelativeLayout>
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:orientation="vertical"
-				android:layout_below="@id/top_bar" android:layout_alignBottom="@+id/top_bar"
-				android:layout_toRightOf="@+id/footer" android:layout_toEndOf="@+id/footer">
-
-				<FrameLayout
-					android:layout_width="match_parent"
-					android:layout_height="match_parent"
-					android:layout_alignParentTop="true">
-
-					<LinearLayout
-						android:id="@+id/fragmentContainer"
-						android:layout_width="match_parent"
-						android:layout_height="match_parent"
-						android:orientation="horizontal" />
-				</FrameLayout>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:id="@+id/footer"
-				android:layout_width="60dp"
-				android:layout_height="match_parent"
-				android:layout_alignParentBottom="true"
-				android:orientation="vertical">
-
-				<RelativeLayout
-					android:id="@+id/history"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="60dp"
-					android:layout_height="0dp">
-
-					<ImageView
-						android:src="@drawable/footer_history"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
-
-					<View
-						android:id="@+id/history_select"
-						android:background="@color/colorA"
-						android:layout_width="5dp"
-						android:layout_height="match_parent"
-						android:layout_alignParentLeft="true"
-						android:visibility="gone"/>
-
-					<TextView
-						android:id="@+id/missed_calls"
-						android:background="@drawable/history_chat_indicator"
-						style="@style/font18"
-						android:layout_width="25dp"
-						android:layout_height="25dp"
-						android:layout_margin="12dp"
-						android:gravity="center"
-						android:visibility="gone"/>
-
-				</RelativeLayout>
-
-				<RelativeLayout
-					android:id="@+id/contacts"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="60dp"
-					android:layout_height="0dp">
-
-					<ImageView
-						android:src="@drawable/footer_contacts"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
-
-					<View
-						android:id="@+id/contacts_select"
-						android:background="@color/colorA"
-						android:layout_width="5dp"
-						android:layout_height="match_parent"
-						android:layout_alignParentLeft="true"
-						android:visibility="gone"/>
-				</RelativeLayout>
-
-				<RelativeLayout
-					android:id="@+id/dialer"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="60dp"
-					android:layout_height="0dp">
-
-					<ImageView
-						android:src="@drawable/footer_dialer"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true"/>
-
-					<View
-						android:id="@+id/dialer_select"
-						android:background="@color/colorA"
-						android:layout_width="5dp"
-						android:layout_height="match_parent"
-						android:layout_alignParentLeft="true"/>
-
-				</RelativeLayout>
-
-				<RelativeLayout
-					android:id="@+id/chat"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="60dp"
-					android:layout_height="0dp">
-
-					<ImageView
-						android:src="@drawable/footer_chat"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:padding="15dp"
-						android:layout_centerInParent="true" />
-
-					<View
-						android:id="@+id/chat_select"
-						android:background="@color/colorA"
-						android:visibility="gone"
-						android:layout_width="5dp"
-						android:layout_height="match_parent"
-						android:layout_alignParentLeft="true"/>
-
-					<TextView
-						android:id="@+id/missed_chats"
-						android:background="@drawable/history_chat_indicator"
-						style="@style/font18"
-						android:layout_width="25dp"
-						android:layout_height="25dp"
-						android:layout_margin="12dp"
-						android:gravity="center"
-						android:visibility="gone" />
-
-				</RelativeLayout>
-			</LinearLayout>
-
-			<LinearLayout
-				android:id="@+id/fragmentContainer2"
-				android:visibility="gone"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:orientation="vertical">
-
-			</LinearLayout>
-		</RelativeLayout>
-
-	<!-- Side Menu -->
-	<RelativeLayout
-		android:id="@+id/side_menu_content"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_gravity="left">
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:orientation="vertical">
-
-			<include layout="@layout/side_menu_main_account"/>
-
-			<ListView
-				android:id="@+id/accounts_list"
-				android:background="@color/colorB"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:choiceMode="singleChoice"
-				android:cacheColorHint="@color/transparent"
-				android:divider="@android:color/transparent"
-				android:dividerHeight="0dp"/>
-
-			<ListView
-				android:id="@+id/item_list"
-				android:background="@color/colorH"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:choiceMode="singleChoice"
-				android:divider="@color/colorE"
-				android:listSelector="@color/colorH"
-				android:dividerHeight="1dp"/>
-		</LinearLayout>
-
-		<RelativeLayout
-			android:id="@+id/side_menu_quit"
-			android:background="@color/colorA"
-			android:gravity="bottom"
-			android:layout_alignParentBottom="true"
-			android:layout_width="match_parent"
-			android:layout_height="50dp">
-
-			<ImageView
-				android:id="@+id/quit_button"
-				android:src="@drawable/quit"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:padding="5dp"
-				android:layout_alignParentLeft="true"
-				android:layout_centerVertical="true" />
-
-			<TextView
-				android:id="@+id/quit"
-				android:text="@string/quit"
-				style="@style/font14"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/quit_button"
-				android:gravity="center_vertical"
-				android:layout_centerInParent="true"/>
-
-		</RelativeLayout>
-
-	</RelativeLayout>
-
-</android.support.v4.widget.DrawerLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-land/video.xml b/res/layout-land/video.xml
deleted file mode 100644
index 207405d19..000000000
--- a/res/layout-land/video.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/video_frame"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    
-    <org.linphone.mediastream.video.display.GL2JNIView 
-        android:visibility="visible" 
-        android:layout_height="match_parent" 
-        android:layout_width="match_parent" 
-        android:id="@+id/videoSurface" />
-	
-	<SurfaceView
-	    android:id="@+id/videoCaptureSurface"
-	    android:layout_width="145dp"
-	    android:layout_height="120dp"
-	    android:layout_alignParentBottom="true"
-	    android:layout_alignParentRight="true" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/about.xml b/res/layout/about.xml
index 1a30ad136..7915e6c8a 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorH"
+    android:background="@color/colorG"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -25,7 +25,6 @@
         <ImageView
             android:id="@+id/cancel"
             android:src="@drawable/dialer_back"
-            android:background="@drawable/toolbar_button"
             android:layout_width="60dp"
             android:layout_height="match_parent"
             android:padding="12dp"
diff --git a/res/layout/assistant_remote_provisioning_login.xml b/res/layout/assistant_remote_provisioning_login.xml
index 661398c32..68dd38d6c 100644
--- a/res/layout/assistant_remote_provisioning_login.xml
+++ b/res/layout/assistant_remote_provisioning_login.xml
@@ -16,7 +16,7 @@
 			android:orientation="horizontal">
 
 			<ImageView
-				android:src="@drawable/logo_secure_phone"
+				android:src="@drawable/linphone_logo"
 				android:layout_width="60dp"
 				android:layout_height="60dp"
 				android:layout_gravity="bottom"/>
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index fcbe278f9..18864e546 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -31,10 +31,10 @@
 			android:id="@+id/start_call"
 			android:src="@drawable/call_alt_start"
 			android:contentDescription="@string/content_description_call"
-			android:layout_toLeftOf="@id/edit"
 			android:layout_width="60dp"
 			android:layout_height="match_parent"
-			android:padding="15dp"/>
+			android:padding="15dp"
+			android:layout_toLeftOf="@+id/edit"/>
 
 		<ImageView
 			android:id="@+id/back_to_call"
@@ -53,10 +53,10 @@
 			android:singleLine="true"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:layout_toRightOf="@id/back"
 			android:layout_toLeftOf="@id/start_call"
 			android:paddingLeft="10dp"
-			android:gravity="center"/>
+			android:gravity="center" android:layout_toRightOf="@+id/back"
+			android:layout_toEndOf="@+id/back"/>
 
 		<View
 			android:background="@color/colorF"
@@ -78,12 +78,12 @@
    		android:background="@color/colorD">
        
 	    <RelativeLayout 
-	        android:id="@+id/messageLayout"
+	        android:id="@+id/message_layout"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content">
 	        
 	        <ImageView
-	            android:id="@+id/sendPicture"
+	            android:id="@+id/send_picture"
 				android:padding="15dp"
 				android:scaleType="center"
 				android:layout_width="wrap_content"
@@ -93,7 +93,7 @@
 				android:src="@drawable/chat_send_file" />
 
 			<ImageView
-				android:id="@+id/sendMessage"
+				android:id="@+id/send_message"
 				android:gravity="center"
 				android:padding="15dp"
 				android:scaleType="center"
@@ -114,39 +114,22 @@
 	            android:layout_width="match_parent"
 	            android:layout_height="40dp"
 				android:padding="10dp"
-	            android:layout_toRightOf="@id/sendPicture"
-	            android:layout_toLeftOf="@id/sendMessage"
+	            android:layout_toRightOf="@id/send_picture"
+	            android:layout_toLeftOf="@id/send_message"
 	            android:background="@drawable/resizable_textfield"
 	            android:layout_centerVertical="true"/>
 	        
 	    </RelativeLayout>
-	    
-	    <RelativeLayout 
-	        android:id="@+id/uploadLayout"
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content">
-	        
-	        <ImageView 
-	            android:contentDescription="@string/content_description_cancel"
-	            android:id="@+id/cancelUpload"
-	            android:src="@drawable/clean_field_default"
-	            android:layout_width="wrap_content"
-	            android:layout_height="wrap_content"
-	            android:adjustViewBounds="true"
-	            android:layout_alignParentRight="true"
-	            android:padding="20dp" />
-	        
-	    </RelativeLayout>
-    
 	</LinearLayout>
 
 	<TextView
-        android:id="@+id/remoteComposing"
+        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_above="@+id/footer" android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"/>
 
 	<ListView
 		android:id="@+id/chat_message_list"
diff --git a/res/layout/chatlist.xml b/res/layout/chatlist.xml
index 178c87e3c..b2025751d 100644
--- a/res/layout/chatlist.xml
+++ b/res/layout/chatlist.xml
@@ -8,14 +8,8 @@
 	<RelativeLayout
 		android:id="@+id/top_bar"
 		android:layout_width="match_parent"
-<<<<<<< HEAD
-		android:layout_height="60dp"
-		android:layout_gravity="top">
-=======
 		android:layout_height="50dp"
-		android:layout_gravity="top"
-		android:background="@color/colorF">
->>>>>>> linphone-android/master
+		android:layout_gravity="top">
 
 		<ImageView
 			android:id="@+id/new_discussion"
@@ -42,7 +36,6 @@
 			android:layout_width="70dp"
 			android:layout_height="match_parent"
 			android:layout_alignParentRight="true"
-<<<<<<< HEAD
 			android:padding="15dp"/>
 
 		<View
@@ -50,9 +43,6 @@
 			android:layout_alignParentBottom="true"
 			android:layout_width="match_parent"
 			android:layout_height="1dp"/>
-=======
-			android:padding="12dp"/>
->>>>>>> linphone-android/master
 	</RelativeLayout>
 
 	<include layout="@layout/edit_list"/>
@@ -68,11 +58,7 @@
     <TextView 
         android:id="@+id/noChatHistory"
 		android:text="@string/no_chat_history"
-<<<<<<< HEAD
 		style="@style/font2"
-=======
-		style="@style/font6"
->>>>>>> linphone-android/master
         android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/conference_paused_row.xml b/res/layout/conference_paused_row.xml
index 3404787d6..d1633cf09 100644
--- a/res/layout/conference_paused_row.xml
+++ b/res/layout/conference_paused_row.xml
@@ -29,7 +29,7 @@
     
     <ImageView
 		android:id="@+id/call_pause"
-		android:src="@drawable/pause_small_over_selected"
+		android:src="@drawable/pause_small_default"
 		android:contentDescription="@string/content_description_pause"
         android:layout_width="40dp"
         android:layout_height="40dp"
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index 2d5ff27d8..f1bb7a4d7 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -83,7 +83,6 @@
 			android:layout_width="match_parent"
 			android:layout_height="40dp"
 			android:gravity="center"/>
-
         
 	    <TableLayout
 	        android:id="@+id/controls"
diff --git a/res/layout/contact_edit.xml b/res/layout/contact_edit.xml
index 03eadea17..44a1c5c00 100644
--- a/res/layout/contact_edit.xml
+++ b/res/layout/contact_edit.xml
@@ -27,7 +27,6 @@
 			android:layout_alignParentRight="true"
 			android:padding="15dp"
 			android:src="@drawable/valid"
-			android:background="@drawable/toolbar_button"
 			android:gravity="center"
 			android:layout_width="70dp"
 			android:layout_height="match_parent"/>
@@ -37,7 +36,6 @@
 			android:contentDescription="@string/content_description_delete"
 			android:padding="12dp"
 			android:src="@drawable/delete"
-			android:background="@drawable/toolbar_button"
 			android:gravity="center"
 			android:layout_width="70dp"
 			android:layout_height="match_parent"
diff --git a/res/layout/launch_screen.xml b/res/layout/launch_screen.xml
index b39461f75..ac5d917c3 100644
--- a/res/layout/launch_screen.xml
+++ b/res/layout/launch_screen.xml
@@ -13,7 +13,7 @@
 		android:orientation="vertical">
 
 		<ImageView
-			android:src="@drawable/logo_secure_phone"
+			android:src="@drawable/linphone_logo"
 			android:layout_width="200dp"
 			android:layout_height="200dp"
 			android:layout_gravity="center"/>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 6623ce00c..ca82c7439 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -94,7 +94,7 @@
 						android:src="@drawable/footer_history"/>
 
 					<TextView
-						android:id="@+id/missedCalls"
+						android:id="@+id/missed_calls"
 						style="@style/font7"
 						android:layout_width="25dp"
 						android:layout_height="25dp"
@@ -145,7 +145,7 @@
 						android:layout_centerInParent="true" />
 
 					<TextView
-						android:id="@+id/missedChats"
+						android:id="@+id/missed_chats"
 						style="@style/font7"
 						android:layout_width="25dp"
 						android:layout_height="25dp"
diff --git a/res/layout/side_menu_account_cell.xml b/res/layout/side_menu_account_cell.xml
index 697c85a84..ff33683ca 100644
--- a/res/layout/side_menu_account_cell.xml
+++ b/res/layout/side_menu_account_cell.xml
@@ -6,7 +6,7 @@
 				android:gravity="center">
 
 	<TextView
-		android:id="@+id/address"
+		android:id="@+id/account_address"
 		style="@style/font13"
 		android:paddingLeft="10dp"
 		android:gravity="center_vertical"
@@ -14,7 +14,7 @@
 		android:layout_height="match_parent"/>
 
 	<ImageView
-		android:id="@+id/status_led"
+		android:id="@+id/account_status"
 		android:src="@drawable/led_connected"
 		android:layout_width="25dp"
 		android:layout_height="25dp"
diff --git a/res/layout/side_menu_main_account.xml b/res/layout/side_menu_main_account.xml
index 637648574..222e0f3f9 100644
--- a/res/layout/side_menu_main_account.xml
+++ b/res/layout/side_menu_main_account.xml
@@ -23,13 +23,13 @@
 		android:gravity="center_vertical">
 
 		<TextView
-			android:id="@+id/display_name"
+			android:id="@+id/main_account_display_name"
 			style="@style/font3"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"/>
 
 		<TextView
-			android:id="@+id/address"
+			android:id="@+id/main_account_address"
 			style="@style/font12"
 			android:editable="false"
 			android:layout_width="wrap_content"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 21a9febf9..a7596cc81 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
 	<style name="Default" parent="android:Theme.Holo.Light" />
 	<style name="NoTitle" parent="android:Theme.Holo.Light.NoActionBar" />
 	<style name="FullScreen" parent="android:Theme.Holo.Light.NoActionBar.Fullscreen" />
diff --git a/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java
index d554379df..72517886d 100644
--- a/src/org/linphone/CallActivity.java
+++ b/src/org/linphone/CallActivity.java
@@ -337,7 +337,7 @@ public class CallActivity extends Activity implements OnClickListener {
 		pause.setOnClickListener(this);
 		enabledPauseButton(false);
 
-		mActiveCallHeader = (RelativeLayout) findViewById(R.id.active_call);
+		//mActiveCallHeader = (RelativeLayout) findViewById(R.id.active_call);
 		mNoCurrentCall = (LinearLayout) findViewById(R.id.no_current_call);
 		mCallPaused = (LinearLayout) findViewById(R.id.remote_pause);
 
@@ -1464,7 +1464,7 @@ public class CallActivity extends Activity implements OnClickListener {
 
 			TextView contactName = (TextView) callView.findViewById(R.id.contact_name);
 
-			contactName.setText(LinphoneUtils.getAddressDisplayName(lAddress));
+			contactName.setText(LinphoneUtils.getAddressDisplayName(call.getRemoteAddress()));
 			displayCallStatusIconAndReturnCallPaused(callView, call);
 			registerCallDurationTimer(callView, call);
 		}
diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 5869fe642..e36f659a1 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -1063,7 +1063,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 				view = mInflater.inflate(R.layout.search_contact_cell, parent, false);
 			}
 
-			TextView name = (TextView) view.findViewById(R.id.Contact_name);
+			TextView name = (TextView) view.findViewById(R.id.contact_name);
 			name.setText(LinphoneUtils.getAddressDisplayName(f.getAddress()));
 
 			final TextView address = (TextView) view.findViewById(R.id.contact_address);
diff --git a/src/org/linphone/ContactDetailsFragment.java b/src/org/linphone/ContactDetailsFragment.java
index dee574f48..121b2e0e0 100644
--- a/src/org/linphone/ContactDetailsFragment.java
+++ b/src/org/linphone/ContactDetailsFragment.java
@@ -137,16 +137,16 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 
 			if (!displayChatAddressOnly) {
 				v.findViewById(R.id.contact_call).setOnClickListener(dialListener);
-				v.findViewById(R.id.contact_call).setTag(displayednumberOrAddress);
+				v.findViewById(R.id.contact_call).setTag(contact.getLinphoneAddress());
 			} else {
 				v.findViewById(R.id.contact_call).setVisibility(View.GONE);
 			}
 
 			v.findViewById(R.id.contact_chat).setOnClickListener(chatListener);
-			v.findViewById(R.id.chat).setTag(contact.getLinphoneAddress());
+			v.findViewById(R.id.contact_chat).setTag(contact.getLinphoneAddress());
 
 			if (getResources().getBoolean(R.bool.disable_chat)) {
-				v.findViewById(R.id.chat).setVisibility(View.GONE);
+				v.findViewById(R.id.contact_chat).setVisibility(View.GONE);
 			}
 
 			controls.addView(v);
@@ -164,13 +164,13 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 				tv.setSelected(true);
 
 				if (!displayChatAddressOnly) {
-					v.findViewById(R.id.call).setOnClickListener(dialListener);
-					v.findViewById(R.id.call).setTag(displayednumberOrAddress);
+					v.findViewById(R.id.contact_call).setOnClickListener(dialListener);
+					v.findViewById(R.id.contact_call).setTag(displayednumberOrAddress);
 				} else {
-					v.findViewById(R.id.call).setVisibility(View.GONE);
+					v.findViewById(R.id.contact_call).setVisibility(View.GONE);
 				}
 
-				v.findViewById(R.id.chat).setOnClickListener(chatListener);
+				v.findViewById(R.id.contact_chat).setOnClickListener(chatListener);
 				LinphoneProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig();
 				if (lpc != null) {
 					displayednumberOrAddress = lpc.normalizePhoneNumber(displayednumberOrAddress);
@@ -182,14 +182,10 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 					if (!numberOrAddress.contains("@")) {
 						tag = numberOrAddress + "@" + lpc.getDomain();
 					}
-					v.findViewById(R.id.chat).setTag(tag);
+					v.findViewById(R.id.contact_chat).setTag(tag);
 				} else {
-					v.findViewById(R.id.chat).setTag(numberOrAddress);
+					v.findViewById(R.id.contact_chat).setTag(numberOrAddress);
 				}
-				v.findViewById(R.id.contact_chat).setTag(tag);
-			} else {
-				v.findViewById(R.id.contact_chat).setTag(numberOrAddress);
-			}
 			
 			final String finalNumberOrAddress = numberOrAddress;
 			/*ImageView friend = (ImageView) v.findViewById(R.id.addFriend);
diff --git a/src/org/linphone/HistoryDetailFragment.java b/src/org/linphone/HistoryDetailFragment.java
index 0ac9d7a17..1fff7ebe7 100644
--- a/src/org/linphone/HistoryDetailFragment.java
+++ b/src/org/linphone/HistoryDetailFragment.java
@@ -98,7 +98,7 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
 		} else {
 			contactAddress.setText(sipUri);
 		}
-		
+
 		time.setText(callTime == null ? "" : callTime);
 		Long longDate = Long.parseLong(callDate);
 		date.setText(LinphoneUtils.timestampToHumanDate(getActivity(),longDate,getString(R.string.history_detail_date_format),false));
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index ec086c1c3..16534228f 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -652,7 +652,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 		mLc.setRootCA(mLinphoneRootCaFile);
 		mLc.setPlayFile(mPauseSoundFile);
 		mLc.setChatDatabasePath(mChatDatabaseFile);
-		mLc.setCallLogsDatabasePath(mCallLogDatabaseFile);
+		//mLc.setCallLogsDatabasePath(mCallLogDatabaseFile);
 		//mLc.setCallErrorTone(Reason.NotFound, mErrorToneFile);
 
 		int availableCores = Runtime.getRuntime().availableProcessors();
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index daf2d5ef9..26ac4fac8 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -156,7 +156,7 @@ public final class LinphoneService extends Service {
 		} catch (Exception e) {
 		}
 
-		mNotif = Compatibility.createNotification(this, mNotificationTitle, "", R.drawable.status_level, R.drawable.logo_secure_phone, bm, mNotifContentIntent, true,notifcationsPriority);
+		mNotif = Compatibility.createNotification(this, mNotificationTitle, "", R.drawable.status_level, R.drawable.linphone_logo, bm, mNotifContentIntent, true,notifcationsPriority);
 
 
 		LinphoneManager.createAndStart(LinphoneService.this);