diff --git a/res/drawable/assistant_button.xml b/res/drawable/assistant_button.xml
index 9f509e491..e42184824 100644
--- a/res/drawable/assistant_button.xml
+++ b/res/drawable/assistant_button.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true"
-		  android:drawable="@drawable/resizable_assistant_button_over" />
+		  android:drawable="@drawable/resizable_cancel_button_over" />
 	<item android:state_enabled="false"
-		  android:drawable="@drawable/resizable_cancel_button" />
+		  android:drawable="@drawable/resizable_cancel_button_over" />
 	<item
 		android:drawable="@drawable/resizable_cancel_button" />
 </selector>
diff --git a/res/drawable/list_selector.xml b/res/drawable/list_selector.xml
index a24232d1d..583709ebb 100644
--- a/res/drawable/list_selector.xml
+++ b/res/drawable/list_selector.xml
@@ -2,7 +2,10 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item 
     	android:state_pressed="true" 
-        android:drawable="@color/colorH" />
+        android:drawable="@color/colorF" />
     <item
-         android:drawable="@color/colorH" />
+        android:state_selected="true"
+        android:drawable="@color/colorF" />
+    <item
+         android:drawable="@color/colorG" />
 </selector>
\ No newline at end of file
diff --git a/res/layout-land/about.xml b/res/layout-land/about.xml
deleted file mode 100644
index 6d1896de8..000000000
--- a/res/layout-land/about.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:background="@color/colorH"
-              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/colorF"
-        android:layout_width="match_parent"
-        android:layout_height="60dp">
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"/>
-
-        <TextView
-            android:id="@+id/menu_name"
-            android:text="@string/about"
-            style="@style/font1"
-            android:singleLine="true"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.4"
-            android:gravity="center"
-            android:padding="15dp"/>
-
-        <ImageView
-            android:id="@+id/cancel"
-            android:src="@drawable/dialer_back"
-            android:background="@drawable/toolbar_button"
-            android:contentDescription="@string/content_description_edit"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"
-            android:padding="15dp"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:background="@color/colorC"
-        android:orientation="horizontal"
-        android:layout_weight="1"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_gravity="center">
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:layout_gravity="center">
-
-            <ImageView
-                android:src="@drawable/splashscreen"
-                android:layout_width="wrap_content"
-                android:layout_height="60dp"
-                android:layout_gravity="center"/>
-
-            <TextView
-                android:text="@string/app_name"
-                style="@style/font15"
-                android:paddingTop="5dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"/>
-
-            <TextView
-                android:text="@string/app_description"
-                style="@style/font3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_weight="1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_gravity="center">
-
-            <TextView
-                android:id="@+id/about_android_version"
-                android:text="@string/about_version"
-                style="@style/font12"
-                android:layout_gravity="left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-            <TextView
-                android:id="@+id/about_liblinphone_version"
-                android:text="@string/about_liblinphone_version"
-                style="@style/font12"
-                android:layout_gravity="left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:background="@color/colorH"
-        android:orientation="vertical"
-        android:padding="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_gravity="center">
-
-        <TextView
-            android:id="@+id/about_link"
-            android:text="@string/about_link"
-            android:autoLink="web"
-            style="@style/font2"
-            android:textColorLink="@color/colorA"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
-        <TextView
-            android:id="@+id/about_text"
-            android:text="@string/about_text"
-            style="@style/font23"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:textSize="18sp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-
-        <View
-            android:background="@color/colorE"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"/>
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center">
-
-            <Button
-                android:id="@+id/send_log"
-                android:background="@drawable/button_background"
-                android:layout_margin="5dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/menu_send_log" />
-
-            <Button
-                android:id="@+id/reset_log"
-                android:background="@drawable/button_background"
-                android:layout_margin="5dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/menu_reset_log" />
-
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout-land/chatlist_cell.xml b/res/layout-land/chatlist_cell.xml
deleted file mode 100644
index 3b02ab4ff..000000000
--- a/res/layout-land/chatlist_cell.xml
+++ /dev/null
@@ -1,114 +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_chatroom"
-		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" />
-
-	<LinearLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
-	    android:layout_centerVertical="true"
-	    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/about.xml b/res/layout/about.xml
index 7e16e3bbe..abb66b800 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -21,12 +21,12 @@
             android:id="@+id/menu_name"
             android:text="@string/about"
             style="@style/font6"
+            android:textAllCaps="true"
             android:singleLine="true"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.4"
-            android:gravity="center"
-            android:padding="15dp"/>
+            android:gravity="center"/>
 
         <ImageView
             android:id="@+id/cancel"
@@ -39,7 +39,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:background="@color/colorG"
+        android:background="@color/colorE"
         android:orientation="vertical"
         android:padding="10dp"
         android:gravity="center"
@@ -56,7 +56,7 @@
 
         <TextView
             android:text="@string/app_name"
-            style="@style/font22"
+            style="@style/font6"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
@@ -65,6 +65,7 @@
         <TextView
             android:text="@string/app_description"
             style="@style/font2"
+            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"/>
@@ -72,7 +73,7 @@
         <TextView
             android:id="@+id/about_android_version"
             android:text="@string/about_version"
-            style="@style/font12"
+            style="@style/font7"
             android:paddingTop="20dp"
             android:layout_gravity="center"
             android:gravity="center"
@@ -82,7 +83,7 @@
         <TextView
             android:id="@+id/about_liblinphone_version"
             android:text="@string/about_liblinphone_version"
-            style="@style/font12"
+            style="@style/font7"
             android:layout_gravity="center"
             android:gravity="center"
             android:layout_width="wrap_content"
@@ -91,12 +92,13 @@
     </LinearLayout>
 
     <LinearLayout
-        android:background="@color/colorH"
+        android:background="@color/colorG"
         android:orientation="vertical"
         android:padding="10dp"
+        android:visibility="invisible"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
+        android:layout_weight="0.48"
         android:layout_gravity="center">
 
         <TextView
@@ -154,4 +156,12 @@
         </LinearLayout>
     </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:layout_gravity="right"/>
+
 </LinearLayout>
diff --git a/res/layout/assistant_remote_provisioning_login.xml b/res/layout/assistant_remote_provisioning_login.xml
index 130e1a2e7..b1d3ea2ef 100644
--- a/res/layout/assistant_remote_provisioning_login.xml
+++ b/res/layout/assistant_remote_provisioning_login.xml
@@ -29,7 +29,7 @@
 				android:orientation="vertical">
 
 				<TextView
-					android:text="@string/assistant_welcome"
+					android:text="@string/welcome"
 					style="@style/font13"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
diff --git a/res/layout/call.xml b/res/layout/call.xml
index 45d9dfe79..a545a09f7 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -41,11 +41,24 @@
 						android:visibility="gone">
 					</LinearLayout>
 
+                    <LinearLayout
+                        android:id="@+id/calls_list"
+                        android:background="@color/colorG"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentBottom="true"
+                        android:layout_gravity="bottom"
+                        android:divider="@color/colorF"
+                        android:dividerHeight="1dp"
+                        android:orientation="vertical">
+                    </LinearLayout>
+
 					<RelativeLayout
 						android:id="@+id/active_call"
 						android:background="@color/colorA"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
+                        android:layout_above="@id/calls_list"
 						android:visibility="visible">
 
 						<LinearLayout
@@ -135,18 +148,6 @@
 
 					</RelativeLayout>
 
-					<LinearLayout
-						android:id="@+id/calls_list"
-                        android:background="@color/colorG"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_alignParentBottom="true"
-						android:layout_gravity="bottom"
-                        android:divider="@color/colorF"
-                        android:dividerHeight="1dp"
-						android:orientation="vertical">
-					</LinearLayout>
-
 					<LinearLayout
 						android:id="@+id/no_current_call"
                         android:background="@color/colorA"
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index 6c964e070..9c247643f 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -7,7 +7,7 @@
 	<LinearLayout
 		android:id="@+id/top_bar"
 		android:orientation="horizontal"
-		android:background="@color/colorF"
+		android:background="@color/colorG"
 		android:layout_width="match_parent"
 		android:layout_height="60dp">
 
@@ -59,6 +59,12 @@
 
 	<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"
diff --git a/res/layout/chatlist.xml b/res/layout/chatlist.xml
index d9a94224d..80090fa34 100644
--- a/res/layout/chatlist.xml
+++ b/res/layout/chatlist.xml
@@ -8,7 +8,7 @@
 	<LinearLayout
 		android:id="@+id/top_bar"
 		android:orientation="horizontal"
-		android:background="@color/colorF"
+		android:background="@color/colorG"
 		android:layout_width="match_parent"
 		android:layout_height="60dp">
 
@@ -50,7 +50,7 @@
 	<include layout="@layout/edit_list"/>
 
 	<View
-		android:background="@color/colorF"
+		android:background="@color/colorE"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"/>
     
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index 71f4fdd08..0832ef893 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -7,7 +7,7 @@
 
 	<LinearLayout
 		android:orientation="horizontal"
-		android:background="@color/colorF"
+		android:background="@color/colorG"
 		android:layout_width="match_parent"
 		android:layout_height="60dp">
 
@@ -27,8 +27,7 @@
 	</LinearLayout>
 
 	<View
-		android:background="@color/colorF"
-		android:layout_alignParentBottom="true"
+		android:background="@color/colorE"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"/>
 
diff --git a/res/layout/empty_fragment.xml b/res/layout/empty_fragment.xml
index 6afe9a59a..deed6c54b 100644
--- a/res/layout/empty_fragment.xml
+++ b/res/layout/empty_fragment.xml
@@ -13,7 +13,7 @@
 		android:layout_height="60dp"/>
 
 	<View
-		android:background="@color/colorF"
+		android:background="@color/colorE"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"/>
 
diff --git a/res/layout/history.xml b/res/layout/history.xml
index 350271cbe..e795ac71c 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -48,7 +48,7 @@
 	<include layout="@layout/edit_list"/>
 
 	<View
-		android:background="@color/colorF"
+		android:background="@color/colorE"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"/>
 
diff --git a/res/layout/history_cell.xml b/res/layout/history_cell.xml
index 04b582b15..8292e2c5b 100644
--- a/res/layout/history_cell.xml
+++ b/res/layout/history_cell.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="@color/colorG"
+	android:background="@drawable/list_selector"
 	android:gravity="center_vertical"
 	android:orientation="vertical" >
 
diff --git a/res/layout/history_detail.xml b/res/layout/history_detail.xml
index 27763952c..0d1fd6dd3 100644
--- a/res/layout/history_detail.xml
+++ b/res/layout/history_detail.xml
@@ -28,8 +28,7 @@
 	</LinearLayout>
 
 	<View
-		android:background="@color/colorF"
-		android:layout_alignParentBottom="true"
+		android:background="@color/colorE"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"/>
 
@@ -73,6 +72,15 @@
 
 	</LinearLayout>
 
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+
 	<TextView
 		android:text="@string/address_sip"
 		style="@style/font8"
@@ -156,4 +164,6 @@
 
 		</LinearLayout>
 	</LinearLayout>
+			</LinearLayout>
+	</ScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 0050c8112..ec4399b25 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -186,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"
diff --git a/res/raw-sw600dp/linphonerc_factory b/res/raw-sw600dp/linphonerc_factory
index a1314bcce..06ffbdb91 100644
--- a/res/raw-sw600dp/linphonerc_factory
+++ b/res/raw-sw600dp/linphonerc_factory
@@ -5,6 +5,13 @@
 [net]
 mtu=1300
 
+[app]
+animations=0
+show_login_view=1
+debug_popup_magic=#1234
+debug=1
+server_url=http://85.233.205.218:443/xmlrpc
+
 [sip]
 guess_hostname=1
 inc_timeout=15
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 272e6c460..785851bef 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -40,5 +40,4 @@ ec_calibrator_cool_tones=1
 
 [misc]
 max_calls=10
-log_collection_upload_server_url=https://www.linphone.org:444/lft.php
-
+log_collection_upload_server_url=https://www.linphone.org:444/lft.php
\ No newline at end of file
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e1fa6550d..b64e5e6b1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -15,8 +15,6 @@
   <string name="wait_dialog_text">Démarrage</string>
   <string name="notification_registered">%s enregistré</string>
   <string name="notification_register_failure">%s n\'a pas pu s\'enregistrer</string>
-  <string name="about_version">OrangeSecurePhone Version %s</string>
-  <string name="about_liblinphone_version">Linphone Core %s</string>
   <string name="about_text">GNU General Public License V2\n © 2010-2016 Belledonne Communications</string>
   <string name="about_link">www.linphone.org</string>
 
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 160942245..2a446dd74 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -10,7 +10,7 @@
 	<bool name="assistant_use_linphone_login_as_first_fragment">false</bool>
 	<bool name="hide_in_call_stats">false</bool>
 	<bool name="use_linphone_friend">true</bool>
-	<bool name="orientation_portrait_only">true</bool>
+	<bool name="orientation_portrait_only">false</bool>
 	<bool name="show_statusbar_only_on_dialer">false</bool>
 	<bool name="replace_assistant_with_old_interface">false</bool>
 	<string name="wizard_url">https://www.linphone.org/wizard.php</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ef8e7cc1b..5a1324090 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8,8 +8,8 @@
 	<string name="wait_dialog_text">Starting up</string>
 	<string name="notification_registered">Registered to %s </string>
 	<string name="notification_register_failure">Fails to register to %s</string>
-	<string name="about_version">OrangeSecurePhone Version %s</string>
-	<string name="about_liblinphone_version">Linphone Core %s</string>
+	<string name="about_version">Orange Secure Phone Version %s</string>
+	<string name="about_liblinphone_version">Orange Secure Phone Core %s</string>
 	<string name="about_text">GNU General Public License V2\n © 2010-2016 Belledonne Communications</string>
 	<string name="about_link">www.linphone.org</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 48513d7c4..125e7170d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -69,7 +69,7 @@
 	<style name="font13" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorK</item>
 		<item name="android:textStyle">bold</item>
-		<item name="android:textSize">30sp</item>
+		<item name="android:textSize">28sp</item>
 	</style>
 
 	<style name="font14" parent="@android:style/TextAppearance.Small">
diff --git a/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java
index 3ccb47b53..1071eb4a4 100644
--- a/src/org/linphone/CallActivity.java
+++ b/src/org/linphone/CallActivity.java
@@ -252,7 +252,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
 			@Override
 			public void callEncryptionChanged(LinphoneCore lc, final LinphoneCall call, boolean encrypted, String authenticationToken) {
 				if (status != null) {
-					if(call.getCurrentParamsCopy().getMediaEncryption().equals(LinphoneCore.MediaEncryption.ZRTP)/* && !call.isAuthenticationTokenVerified()*/){
+					if(call.getCurrentParamsCopy().getMediaEncryption().equals(LinphoneCore.MediaEncryption.ZRTP) && !call.isAuthenticationTokenVerified()){
 						status.showZRTPDialog(call);
 					}
 					status.refreshStatusItems(call, call.getCurrentParamsCopy().getVideoEnabled());
@@ -757,10 +757,8 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
 
 	private void displayAudioCall(){
 		mControlsLayout.setVisibility(View.VISIBLE);
-		mActiveCallHeader.setVisibility(View.VISIBLE);
 		mActiveCallHeader.setAlpha(1f);
-		callInfo.setVisibility(View.VISIBLE);
-		contactPicture.setVisibility(View.VISIBLE);
+		mActiveCallHeader.setVisibility(View.VISIBLE);
 		mNoCurrentCall.setVisibility(View.GONE);
 		callsList.setVisibility(View.VISIBLE);
 		switchCamera.setVisibility(View.GONE);
@@ -848,8 +846,8 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
 		if(display) {
 			showStatusBar();
 			mControlsLayout.setVisibility(View.VISIBLE);
-			mActiveCallHeader.setVisibility(View.VISIBLE);
 			mActiveCallHeader.setAlpha(0.7f);
+			mActiveCallHeader.setVisibility(View.VISIBLE);
 			callInfo.setVisibility(View.VISIBLE);
 			contactPicture.setVisibility(View.GONE);
 			mNoCurrentCall.setVisibility(View.GONE);
@@ -862,6 +860,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
 			mControlsLayout.setVisibility(View.GONE);
 			mActiveCallHeader.setVisibility(View.GONE);
 			mActiveCallHeader.setAlpha(1f);
+			contactPicture.setVisibility(View.GONE);
 			switchCamera.setVisibility(View.GONE);
 			callsList.setVisibility(View.GONE);
 		}
diff --git a/src/org/linphone/ChatListFragment.java b/src/org/linphone/ChatListFragment.java
index 7d6ac7cca..3fb10e79f 100644
--- a/src/org/linphone/ChatListFragment.java
+++ b/src/org/linphone/ChatListFragment.java
@@ -31,16 +31,10 @@ import org.linphone.core.LinphoneFriend;
 import org.linphone.mediastream.Log;
 
 import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.graphics.Bitmap;
 import android.graphics.Typeface;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
-import android.preference.PreferenceManager;
 import android.app.Fragment;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
@@ -60,7 +54,6 @@ import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 /**
@@ -322,6 +315,8 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 	public void onItemClick(AdapterView<?> adapter, View view, int position, long id) {
 		String sipUri = (String) view.getTag();
 
+		view.setSelected(true);
+
 		if (LinphoneActivity.isInstanciated() && !isEditMode) {
 			LinphoneActivity.instance().displayChat(sipUri);
 		}
@@ -432,13 +427,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 
 			/*if(contact != null){
 				LinphoneUtils.setImagePictureFromUri(view.getContext(), contactPicture, contact.getPhotoUri(), contact.getThumbnailUri());
-<<<<<<< HEAD
 			}*/
-=======
-			} else {
-				contactPicture.setImageResource(R.drawable.avatar);
-			}
->>>>>>> linphone-android/master
 
 			if (unreadMessagesCount > 0) {
 				unreadMessages.setVisibility(View.VISIBLE);
diff --git a/src/org/linphone/Contact.java b/src/org/linphone/Contact.java
index 16f1925a3..03cdf394a 100644
--- a/src/org/linphone/Contact.java
+++ b/src/org/linphone/Contact.java
@@ -122,7 +122,7 @@ public class Contact implements Serializable {
 	}
 	
 	public void refresh(ContentResolver cr) {
-		this.numbersOrAddresses = Compatibility.extractContactNumbersAndAddresses(id, cr);
+		//this.numbersOrAddresses = Compatibility.extractContactNumbersAndAddresses(id, cr);
 		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
 		if(lc != null && lc.getFriendList() != null) {
 			for (LinphoneFriend friend :lc.getFriendList()){
diff --git a/src/org/linphone/ContactDetailsFragment.java b/src/org/linphone/ContactDetailsFragment.java
index 68cb7a2f7..41c8e52fa 100644
--- a/src/org/linphone/ContactDetailsFragment.java
+++ b/src/org/linphone/ContactDetailsFragment.java
@@ -103,7 +103,7 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 	
 	public void changeDisplayedContact(Contact newContact) {
 		contact = newContact;
-		contact.refresh(getActivity().getContentResolver());
+		//contact.refresh(getActivity().getContentResolver());
 		displayContact(inflater, view);
 	}
 	
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 1f5a8c778..c58135f06 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -107,7 +107,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	private ChatFragment chatFragment;
 	private Fragment.SavedState dialerSavedState;
 	private boolean newProxyConfig;
-	private boolean isAnimationDisabled = false, preferLinphoneContacts = false;
+	private boolean isAnimationDisabled = true, preferLinphoneContacts = false;
 	private OrientationEventListener mOrientationHelper;
 	private LinphoneCoreListenerBase mListener;
 	private LinearLayout mTabBar;
@@ -461,6 +461,9 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		case CHAT:
 			newFragment = new ChatFragment();
 			break;
+		case EMPTY:
+			newFragment = new EmptyFragment();
+			break;
 		default:
 			break;
 		}
@@ -526,54 +529,56 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		LinearLayout ll = (LinearLayout) findViewById(R.id.fragmentContainer2);
 
 		FragmentTransaction transaction = getFragmentManager().beginTransaction();
-		if (newFragmentType.shouldAddItselfToTheRightOf(currentFragment)) {
+		if(newFragmentType == FragmentsAvailable.EMPTY){
 			ll.setVisibility(View.VISIBLE);
-
-			if(newFragmentType == FragmentsAvailable.CONTACT_EDITOR){
-				transaction.addToBackStack(newFragmentType.toString());
-			}
-			transaction.replace(R.id.fragmentContainer2, newFragment);
+			transaction.replace(R.id.fragmentContainer2, new EmptyFragment());
+			transaction.commitAllowingStateLoss();
+			getFragmentManager().executePendingTransactions();
 		} else {
-			if(newFragmentType == FragmentsAvailable.EMPTY) {
+			if (newFragmentType.shouldAddItselfToTheRightOf(currentFragment)) {
 				ll.setVisibility(View.VISIBLE);
-				transaction.replace(R.id.fragmentContainer2, new EmptyFragment());
-			}
 
-			if (newFragmentType == FragmentsAvailable.DIALER
-					|| newFragmentType == FragmentsAvailable.ABOUT
-					|| newFragmentType == FragmentsAvailable.SETTINGS
-					|| newFragmentType == FragmentsAvailable.ACCOUNT_SETTINGS) {
-				ll.setVisibility(View.GONE);
+				if (newFragmentType == FragmentsAvailable.CONTACT_EDITOR) {
+					transaction.addToBackStack(newFragmentType.toString());
+				}
+				transaction.replace(R.id.fragmentContainer2, newFragment);
 			} else {
-				ll.setVisibility(View.VISIBLE);
-				transaction.replace(R.id.fragmentContainer2, new EmptyFragment());
-			}
-
-			if (!withoutAnimation && !isAnimationDisabled && currentFragment.shouldAnimate()) {
-				if (newFragmentType.isRightOf(currentFragment)) {
-					transaction.setCustomAnimations(R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left, R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right);
+				if (newFragmentType == FragmentsAvailable.DIALER
+						|| newFragmentType == FragmentsAvailable.ABOUT
+						|| newFragmentType == FragmentsAvailable.SETTINGS
+						|| newFragmentType == FragmentsAvailable.ACCOUNT_SETTINGS) {
+					ll.setVisibility(View.GONE);
 				} else {
-					transaction.setCustomAnimations(R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right, R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left);
+					ll.setVisibility(View.VISIBLE);
+					transaction.replace(R.id.fragmentContainer2, new EmptyFragment());
+				}
+
+				if (!withoutAnimation && !isAnimationDisabled && currentFragment.shouldAnimate()) {
+					if (newFragmentType.isRightOf(currentFragment)) {
+						transaction.setCustomAnimations(R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left, R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right);
+					} else {
+						transaction.setCustomAnimations(R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right, R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left);
+					}
+				}
+				transaction.replace(R.id.fragmentContainer, newFragment);
+			}
+			transaction.commitAllowingStateLoss();
+			getFragmentManager().executePendingTransactions();
+
+			currentFragment = newFragmentType;
+			if (newFragmentType == FragmentsAvailable.DIALER
+					|| newFragmentType == FragmentsAvailable.SETTINGS
+					|| newFragmentType == FragmentsAvailable.CONTACTS_LIST
+					|| newFragmentType == FragmentsAvailable.CHAT_LIST
+					|| newFragmentType == FragmentsAvailable.HISTORY_LIST) {
+				try {
+					getFragmentManager().popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+				} catch (java.lang.IllegalStateException e) {
+
 				}
 			}
-			transaction.replace(R.id.fragmentContainer, newFragment);
+			fragmentsHistory.add(currentFragment);
 		}
-		transaction.commitAllowingStateLoss();
-		getFragmentManager().executePendingTransactions();
-
-		currentFragment = newFragmentType;
-		if (newFragmentType == FragmentsAvailable.DIALER
-				|| newFragmentType == FragmentsAvailable.SETTINGS
-				|| newFragmentType == FragmentsAvailable.CONTACTS_LIST
-				|| newFragmentType == FragmentsAvailable.CHAT_LIST
-				|| newFragmentType == FragmentsAvailable.HISTORY_LIST) {
-			try {
-				getFragmentManager().popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
-			} catch (java.lang.IllegalStateException e) {
-
-			}
-		}
-		fragmentsHistory.add(currentFragment);
 	}
 
 	public void displayHistoryDetail(String sipUri, LinphoneCallLog log) {
@@ -624,7 +629,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	}
 
 	public void displayEmptyFragment(){
-		changeCurrentFragment(FragmentsAvailable.HISTORY_LIST, new Bundle());
+		changeCurrentFragment(FragmentsAvailable.EMPTY, new Bundle());
 	}
 
 	@SuppressLint("SimpleDateFormat")
@@ -1346,7 +1351,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 						if (call.getCurrentParamsCopy().getVideoEnabled()) {
 							//startVideoActivity(call);
 						} else {
-							Log.w("outgoing call");
 							//startIncallActivity(call);
 						}
 					}
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 678a66c9f..6f31d1d5c 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -634,7 +634,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 		}
 
 		mLc.setContext(mServiceContext);
-		mLc.setZrtpSecretsCache(basePath + "/zrtp_secrets");
+		mLc.setZrtpSecretsCache(null);
 
 		try {
 			String versionName = mServiceContext.getPackageManager().getPackageInfo(mServiceContext.getPackageName(), 0).versionName;
diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java
index a0913c030..c2e3a9488 100644
--- a/src/org/linphone/StatusFragment.java
+++ b/src/org/linphone/StatusFragment.java
@@ -405,7 +405,7 @@ public class StatusFragment extends Fragment {
 			TextView customText = (TextView) ZRTPdialog.findViewById(R.id.customText);
 			String newText = getString(R.string.zrtp_dialog).replace("%s", call.getAuthenticationToken());
 			customText.setText(newText);
-			Button delete = (Button) ZRTPdialog.findViewById(R.id.delete);
+			Button delete = (Button) ZRTPdialog.findViewById(R.id.delete_button);
 			delete.setText(R.string.accept);
 			Button cancel = (Button) ZRTPdialog.findViewById(R.id.cancel);
 			cancel.setText(R.string.deny);
diff --git a/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java b/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
index 9e5706374..013de9258 100644
--- a/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
+++ b/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
@@ -104,7 +104,7 @@ public class RemoteProvisioningLoginActivity extends Activity implements OnClick
 	private boolean storeAccount(String username, String password, String domain) {
 		LinphoneCore lc = LinphoneManager.getLc();
 
-		LinphonePreferences.instance().setRemoteProvisioningUrl("http://85.233.205.218/xmlrpc?username=" + username + "&password=" + password + "&domain=" + domain);
+		LinphonePreferences.instance().setRemoteProvisioningUrl("https://85.233.205.218/xmlrpc?username=" + username + "&password=" + password + "&domain=" + domain);
 		LinphoneManager.getInstance().restartLinphoneCore();
 		LinphoneManager.getLc().addListener(mListener);