diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ca5d75d85..f2954560e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,7 +43,7 @@
 
 	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/>
     
-    <application android:label="@string/app_name" android:icon="@drawable/logo_linphone_57x57" android:largeHeap="true" android:allowBackup="true">
+    <application android:label="@string/app_name" android:icon="@drawable/logo_secure_phone" android:largeHeap="true" android:allowBackup="true">
 
 		<activity android:name="org.linphone.LinphoneLauncherActivity"
 		    android:label="@string/app_name"
diff --git a/res/drawable-xhdpi/add_field_default.png b/res/drawable-xhdpi/add_field_default.png
deleted file mode 100644
index 80291fd42..000000000
Binary files a/res/drawable-xhdpi/add_field_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/add_field_over.png b/res/drawable-xhdpi/add_field_over.png
deleted file mode 100644
index 2a2ce2f74..000000000
Binary files a/res/drawable-xhdpi/add_field_over.png and /dev/null differ
diff --git a/res/drawable-xhdpi/avatar_mask.png b/res/drawable-xhdpi/avatar_mask.png
deleted file mode 100644
index 0ab25721f..000000000
Binary files a/res/drawable-xhdpi/avatar_mask.png and /dev/null differ
diff --git a/res/drawable-xhdpi/avatar_mask_border.png b/res/drawable-xhdpi/avatar_mask_border.png
deleted file mode 100644
index 606d9012e..000000000
Binary files a/res/drawable-xhdpi/avatar_mask_border.png and /dev/null differ
diff --git a/res/drawable-xhdpi/backspace_default.png b/res/drawable-xhdpi/backspace_default.png
deleted file mode 100644
index 1280f1698..000000000
Binary files a/res/drawable-xhdpi/backspace_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/call_incoming.png b/res/drawable-xhdpi/call_incoming.png
deleted file mode 100644
index 89d593a4c..000000000
Binary files a/res/drawable-xhdpi/call_incoming.png and /dev/null differ
diff --git a/res/drawable-xhdpi/call_missed.png b/res/drawable-xhdpi/call_missed.png
deleted file mode 100644
index e1074ffaf..000000000
Binary files a/res/drawable-xhdpi/call_missed.png and /dev/null differ
diff --git a/res/drawable-xhdpi/call_outgoing.png b/res/drawable-xhdpi/call_outgoing.png
deleted file mode 100644
index c6df94bd9..000000000
Binary files a/res/drawable-xhdpi/call_outgoing.png and /dev/null differ
diff --git a/res/drawable-xhdpi/camera_default.png b/res/drawable-xhdpi/camera_default.png
deleted file mode 100644
index 34a6c1c82..000000000
Binary files a/res/drawable-xhdpi/camera_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/camera_selected.png b/res/drawable-xhdpi/camera_selected.png
deleted file mode 100644
index 4d3664d84..000000000
Binary files a/res/drawable-xhdpi/camera_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/chat_message_delivered.png b/res/drawable-xhdpi/chat_message_delivered.png
deleted file mode 100644
index b98f73db2..000000000
Binary files a/res/drawable-xhdpi/chat_message_delivered.png and /dev/null differ
diff --git a/res/drawable-xhdpi/chat_message_inprogress.png b/res/drawable-xhdpi/chat_message_inprogress.png
deleted file mode 100644
index f762b2d5e..000000000
Binary files a/res/drawable-xhdpi/chat_message_inprogress.png and /dev/null differ
diff --git a/res/drawable-xhdpi/contact_add.png b/res/drawable-xhdpi/contact_add.png
deleted file mode 100644
index a16e6e006..000000000
Binary files a/res/drawable-xhdpi/contact_add.png and /dev/null differ
diff --git a/res/drawable-xhdpi/contacts_all_default.png b/res/drawable-xhdpi/contacts_all_default.png
deleted file mode 100644
index 07d00c6a2..000000000
Binary files a/res/drawable-xhdpi/contacts_all_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/contacts_all_selected.png b/res/drawable-xhdpi/contacts_all_selected.png
deleted file mode 100644
index c590b7ac7..000000000
Binary files a/res/drawable-xhdpi/contacts_all_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/contacts_sip_default.png b/res/drawable-xhdpi/contacts_sip_default.png
deleted file mode 100644
index 48184b73a..000000000
Binary files a/res/drawable-xhdpi/contacts_sip_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/contacts_sip_selected.png b/res/drawable-xhdpi/contacts_sip_selected.png
deleted file mode 100644
index f05340cbe..000000000
Binary files a/res/drawable-xhdpi/contacts_sip_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/delete_field_default.png b/res/drawable-xhdpi/delete_field_default.png
deleted file mode 100644
index e750f2c0a..000000000
Binary files a/res/drawable-xhdpi/delete_field_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/delete_field_over.png b/res/drawable-xhdpi/delete_field_over.png
deleted file mode 100644
index ca6aa09fc..000000000
Binary files a/res/drawable-xhdpi/delete_field_over.png and /dev/null differ
diff --git a/res/drawable-xhdpi/edit.png b/res/drawable-xhdpi/edit.png
deleted file mode 100644
index 5550b05a2..000000000
Binary files a/res/drawable-xhdpi/edit.png and /dev/null differ
diff --git a/res/drawable-xhdpi/history_all_default.png b/res/drawable-xhdpi/history_all_default.png
deleted file mode 100644
index 867e2cf70..000000000
Binary files a/res/drawable-xhdpi/history_all_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/history_all_selected.png b/res/drawable-xhdpi/history_all_selected.png
deleted file mode 100644
index cf4a2293a..000000000
Binary files a/res/drawable-xhdpi/history_all_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/history_missed_default.png b/res/drawable-xhdpi/history_missed_default.png
deleted file mode 100644
index 0ccad7b92..000000000
Binary files a/res/drawable-xhdpi/history_missed_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/history_missed_selected.png b/res/drawable-xhdpi/history_missed_selected.png
deleted file mode 100644
index f7d893608..000000000
Binary files a/res/drawable-xhdpi/history_missed_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/incoming_call.png b/res/drawable-xhdpi/incoming_call.png
deleted file mode 100644
index f8bf5b558..000000000
Binary files a/res/drawable-xhdpi/incoming_call.png and /dev/null differ
diff --git a/res/drawable-xhdpi/incoming_call_unlock.png b/res/drawable-xhdpi/incoming_call_unlock.png
deleted file mode 100644
index 7d5048def..000000000
Binary files a/res/drawable-xhdpi/incoming_call_unlock.png and /dev/null differ
diff --git a/res/drawable-xhdpi/micro_default.png b/res/drawable-xhdpi/micro_default.png
deleted file mode 100644
index 3b3f2d958..000000000
Binary files a/res/drawable-xhdpi/micro_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/micro_selected.png b/res/drawable-xhdpi/micro_selected.png
deleted file mode 100644
index 065a417f8..000000000
Binary files a/res/drawable-xhdpi/micro_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/options_default.png b/res/drawable-xhdpi/options_default.png
deleted file mode 100644
index e13c5942c..000000000
Binary files a/res/drawable-xhdpi/options_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/options_selected.png b/res/drawable-xhdpi/options_selected.png
deleted file mode 100644
index 3123fcf77..000000000
Binary files a/res/drawable-xhdpi/options_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/pause_big_over_selected.png b/res/drawable-xhdpi/pause_big_over_selected.png
deleted file mode 100644
index d4f16fa34..000000000
Binary files a/res/drawable-xhdpi/pause_big_over_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/pause_small_over_selected.png b/res/drawable-xhdpi/pause_small_over_selected.png
deleted file mode 100644
index f3b5a78a0..000000000
Binary files a/res/drawable-xhdpi/pause_small_over_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/route_bluetooth_selected.png b/res/drawable-xhdpi/route_bluetooth_selected.png
deleted file mode 100644
index 2ece4746e..000000000
Binary files a/res/drawable-xhdpi/route_bluetooth_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/route_earpiece_selected.png b/res/drawable-xhdpi/route_earpiece_selected.png
deleted file mode 100644
index 8d85693f8..000000000
Binary files a/res/drawable-xhdpi/route_earpiece_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/route_speaker_selected.png b/res/drawable-xhdpi/route_speaker_selected.png
deleted file mode 100644
index 3ea594615..000000000
Binary files a/res/drawable-xhdpi/route_speaker_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/routes_default.png b/res/drawable-xhdpi/routes_default.png
deleted file mode 100644
index cd78857df..000000000
Binary files a/res/drawable-xhdpi/routes_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/routes_selected.png b/res/drawable-xhdpi/routes_selected.png
deleted file mode 100644
index 455b83343..000000000
Binary files a/res/drawable-xhdpi/routes_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/speaker_default.png b/res/drawable-xhdpi/speaker_default.png
deleted file mode 100644
index e3621092e..000000000
Binary files a/res/drawable-xhdpi/speaker_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/speaker_selected.png b/res/drawable-xhdpi/speaker_selected.png
deleted file mode 100644
index b7f86d022..000000000
Binary files a/res/drawable-xhdpi/speaker_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/splashscreen.png b/res/drawable-xhdpi/splashscreen.png
deleted file mode 100644
index a02ddb045..000000000
Binary files a/res/drawable-xhdpi/splashscreen.png and /dev/null differ
diff --git a/res/drawable-xhdpi/statebar_background.png b/res/drawable-xhdpi/statebar_background.png
deleted file mode 100644
index 001991fb0..000000000
Binary files a/res/drawable-xhdpi/statebar_background.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_available.png b/res/drawable-xhdpi/status_available.png
deleted file mode 100644
index f57919fd0..000000000
Binary files a/res/drawable-xhdpi/status_available.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_available_desktop.png b/res/drawable-xhdpi/status_available_desktop.png
deleted file mode 100644
index fc64f9cc8..000000000
Binary files a/res/drawable-xhdpi/status_available_desktop.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_available_phone.png b/res/drawable-xhdpi/status_available_phone.png
deleted file mode 100644
index 12262bbe8..000000000
Binary files a/res/drawable-xhdpi/status_available_phone.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_away.png b/res/drawable-xhdpi/status_away.png
deleted file mode 100644
index 0cb280dd3..000000000
Binary files a/res/drawable-xhdpi/status_away.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_away_desktop.png b/res/drawable-xhdpi/status_away_desktop.png
deleted file mode 100644
index 6900b7c36..000000000
Binary files a/res/drawable-xhdpi/status_away_desktop.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_away_phone.png b/res/drawable-xhdpi/status_away_phone.png
deleted file mode 100644
index 05863265f..000000000
Binary files a/res/drawable-xhdpi/status_away_phone.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_busy.png b/res/drawable-xhdpi/status_busy.png
deleted file mode 100644
index 7040944dd..000000000
Binary files a/res/drawable-xhdpi/status_busy.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_busy_desktop.png b/res/drawable-xhdpi/status_busy_desktop.png
deleted file mode 100644
index ad8965b31..000000000
Binary files a/res/drawable-xhdpi/status_busy_desktop.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_busy_phone.png b/res/drawable-xhdpi/status_busy_phone.png
deleted file mode 100644
index a129c022a..000000000
Binary files a/res/drawable-xhdpi/status_busy_phone.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_disconnected.png b/res/drawable-xhdpi/status_disconnected.png
deleted file mode 100644
index aa354e37d..000000000
Binary files a/res/drawable-xhdpi/status_disconnected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_disconnected_desktop.png b/res/drawable-xhdpi/status_disconnected_desktop.png
deleted file mode 100644
index 45599a8fd..000000000
Binary files a/res/drawable-xhdpi/status_disconnected_desktop.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_disconnected_phone.png b/res/drawable-xhdpi/status_disconnected_phone.png
deleted file mode 100644
index 4195447dc..000000000
Binary files a/res/drawable-xhdpi/status_disconnected_phone.png and /dev/null differ
diff --git a/res/drawable/assistant_button.xml b/res/drawable/assistant_button.xml
index 77d349fce..4d4295934 100644
--- a/res/drawable/assistant_button.xml
+++ b/res/drawable/assistant_button.xml
@@ -1,8 +1,8 @@
 <?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:drawable="@drawable/resizable_assistant_button" />
+		android:drawable="@drawable/resizable_cancel_button" />
 </selector>
 
diff --git a/res/drawable/avatar_mask_chat.xml b/res/drawable/avatar_mask_chat.xml
index 421a627ca..200072ea0 100644
--- a/res/drawable/avatar_mask_chat.xml
+++ b/res/drawable/avatar_mask_chat.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:src="@drawable/backspace_default"/>
+	android:src="@drawable/backspace"/>
diff --git a/res/drawable/backspace.xml b/res/drawable/backspace.xml
deleted file mode 100644
index e5209e310..000000000
--- a/res/drawable/backspace.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/backspace_over" />
-	<item android:state_enabled="false"
-		  android:drawable="@drawable/backspace_disabled" />
-    <item
-         android:drawable="@drawable/backspace_default" />
-</selector>
-
diff --git a/res/drawable/backspace_disabled.xml b/res/drawable/backspace_disabled.xml
index 9805546bd..48f4d0967 100644
--- a/res/drawable/backspace_disabled.xml
+++ b/res/drawable/backspace_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/backspace_default"
+	android:src="@drawable/backspace"
 	android:alpha="0.2" />
diff --git a/res/drawable/button_background.xml b/res/drawable/button_background.xml
index 2a0ff0c72..04a87bfb6 100644
--- a/res/drawable/button_background.xml
+++ b/res/drawable/button_background.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true"
-		  android:drawable="@color/colorE" />
+		  android:drawable="@color/colorA" />
 	<item android:state_enabled="false"
-		  android:drawable="@color/colorF" />
+		  android:drawable="@color/colorD" />
 	<item
-		android:drawable="@color/colorF" />
+		android:drawable="@color/colorD" />
 </selector>
 
diff --git a/res/drawable/call.xml b/res/drawable/call.xml
index 7564861e6..2b0a0d3eb 100644
--- a/res/drawable/call.xml
+++ b/res/drawable/call.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="@color/colorL" />
+        android:drawable="@color/colorJ" />
 	<item android:state_enabled="false"
-		  android:drawable="@color/colorL" />
+		  android:drawable="@color/colorA" />
     <item
          android:drawable="@color/colorA" />
 </selector>
diff --git a/res/drawable/contact_add_button.xml b/res/drawable/contact_add_button.xml
index c688770db..d0df80de9 100644
--- a/res/drawable/contact_add_button.xml
+++ b/res/drawable/contact_add_button.xml
@@ -3,6 +3,6 @@
 	<item android:state_enabled="false"
 		  android:drawable="@drawable/contact_add_disabled" />
 	<item
-		android:drawable="@drawable/contact_add" />
+		android:drawable="@drawable/contact_add_disabled" />
 </selector>
 
diff --git a/res/drawable/contact_add_disabled.xml b/res/drawable/contact_add_disabled.xml
index 91d8435cc..339f89829 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/contact_add"
+	android:src="@drawable/conf_status_paused"
 	android:alpha="0.2" />
diff --git a/res/drawable/contacts_all.xml b/res/drawable/contacts_all.xml
deleted file mode 100644
index 2e9d33e73..000000000
--- a/res/drawable/contacts_all.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
-        android:drawable="@drawable/contacts_all_default" />
-    <item android:state_enabled="false"
-         android:drawable="@drawable/contacts_all_selected" />
-</selector>
-
diff --git a/res/drawable/contacts_sip.xml b/res/drawable/contacts_sip.xml
deleted file mode 100644
index 089d67756..000000000
--- a/res/drawable/contacts_sip.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
-        android:drawable="@drawable/contacts_sip_default" />
-    <item android:state_enabled="false"
-         android:drawable="@drawable/contacts_sip_selected" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/edit_list_button.xml b/res/drawable/edit_list_button.xml
index d53758283..f671ac705 100644
--- a/res/drawable/edit_list_button.xml
+++ b/res/drawable/edit_list_button.xml
@@ -1,7 +1,10 @@
 <?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/edit_list_over" />
     <item android:state_enabled="false"
-        android:drawable="@drawable/edit_list_disabled" />
+          android:drawable="@drawable/edit_list_disabled" />
     <item
-         android:drawable="@drawable/edit_list" />
+        android:drawable="@drawable/edit_list" />
 </selector>
+
diff --git a/res/drawable/hangup.xml b/res/drawable/hangup.xml
index 3a15ca838..3e17c3c40 100644
--- a/res/drawable/hangup.xml
+++ b/res/drawable/hangup.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true"
-		  android:drawable="@color/colorI" />
+		  android:drawable="@color/colorH" />
 	<item android:state_enabled="false"
-		  android:drawable="@color/colorD" />
+		  android:drawable="@color/colorC" />
 	<item
-		android:drawable="@color/colorD" />
+		android:drawable="@color/colorC" />
 </selector>
 
diff --git a/res/drawable/history_all.xml b/res/drawable/history_all.xml
deleted file mode 100644
index 2a20b0e07..000000000
--- a/res/drawable/history_all.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
-        android:drawable="@drawable/history_all_default"/>
-    <item android:state_enabled="false"
-         android:drawable="@drawable/history_all_selected" />
-</selector>
-
diff --git a/res/drawable/history_missed.xml b/res/drawable/history_missed.xml
deleted file mode 100644
index e201649fb..000000000
--- a/res/drawable/history_missed.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
-        android:drawable="@drawable/history_missed_default" />
-    <item android:state_enabled="false"
-         android:drawable="@drawable/history_missed_selected" />
-</selector>
diff --git a/res/drawable/list_delete.xml b/res/drawable/list_delete.xml
index d453abfd5..727b5d2d5 100644
--- a/res/drawable/list_delete.xml
+++ b/res/drawable/list_delete.xml
@@ -1,7 +1,7 @@
 <?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/delete_field_over" />
+    <item android:state_pressed="true"
+          android:drawable="@drawable/list_details_over" />
     <item
-         android:drawable="@drawable/delete_field_default" />
+        android:drawable="@drawable/list_details_default" />
 </selector>
diff --git a/res/drawable/micro.xml b/res/drawable/micro.xml
deleted file mode 100644
index 1780f755d..000000000
--- a/res/drawable/micro.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true"
-	android:drawable="@drawable/micro_selected" />
-    <item
-         android:drawable="@drawable/micro_default" />
-</selector>
diff --git a/res/drawable/pause.xml b/res/drawable/pause.xml
index db65212ca..3fb68a4d1 100644
--- a/res/drawable/pause.xml
+++ b/res/drawable/pause.xml
@@ -1,7 +1,7 @@
 <?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/pause_small_over_selected" />
+        android:drawable="@drawable/pause_small_over" />
     <item
          android:drawable="@drawable/pause_small_default" />
 </selector>
diff --git a/res/drawable/speaker.xml b/res/drawable/speaker.xml
deleted file mode 100644
index ac67e2924..000000000
--- a/res/drawable/speaker.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true"
-        android:drawable="@drawable/speaker_selected" />
-    <item
-         android:drawable="@drawable/speaker_default" />
-</selector>
diff --git a/res/drawable/status_level.xml b/res/drawable/status_level.xml
index 015c07b1b..c806fe16b 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_user" />
+	  <item android:maxLevel="0" android:drawable="@drawable/logo_secure_phone" />
 	  <item android:maxLevel="1" android:drawable="@drawable/status_green" />
 	  <item android:maxLevel="2" android:drawable="@drawable/status_red" />
 	  <item android:maxLevel="3" android:drawable="@drawable/status_offline" />
diff --git a/res/drawable/toolbar_button.xml b/res/drawable/toolbar_button.xml
deleted file mode 100644
index b10f6f259..000000000
--- a/res/drawable/toolbar_button.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true"
-		  android:drawable="@color/colorE" />
-	<item android:state_selected="true"
-		  android:drawable="@color/colorF" />
-	<item
-		android:drawable="@color/colorF" />
-</selector>
\ No newline at end of file
diff --git a/res/layout/about.xml b/res/layout/about.xml
index 1006819ba..333f23a86 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -21,7 +21,6 @@
 
         <ImageView
             android:id="@+id/cancel"
-            android:src="@drawable/dialer_back"
             android:contentDescription="@string/content_description_dialer"
             android:layout_width="70dp"
             android:layout_height="match_parent"
@@ -32,7 +31,6 @@
     </RelativeLayout>
 
     <ImageView
-        android:src="@drawable/linphone_orange"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -73,7 +71,6 @@
 
 		<Button
        		android:id="@+id/send_log"
-			android:background="@drawable/button_background"
 			android:padding="10dp"
 			android:layout_margin="5dp"
         	android:layout_width="match_parent"
@@ -82,7 +79,6 @@
 
 		<Button
             android:id="@+id/reset_log"
-			android:background="@drawable/button_background"
 			android:padding="10dp"
 			android:layout_margin="5dp"
             android:layout_width="wrap_content"
diff --git a/res/layout/accounts.xml b/res/layout/accounts.xml
index c03a37811..7a1ed0462 100644
--- a/res/layout/accounts.xml
+++ b/res/layout/accounts.xml
@@ -15,7 +15,7 @@
 
 	<ImageView
 		android:id="@+id/status_led"
-		android:src="@drawable/status_available"
+		android:src="@drawable/led_connected"
 		android:layout_width="25dp"
 		android:layout_height="25dp"
 		android:padding="5dp"
diff --git a/res/layout/assistant.xml b/res/layout/assistant.xml
index c396fb848..76f9eb706 100644
--- a/res/layout/assistant.xml
+++ b/res/layout/assistant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:background="@color/colorH"
+	android:background="@color/colorG"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical">
diff --git a/res/layout/assistant_account_creation.xml b/res/layout/assistant_account_creation.xml
index d7a17a68c..6b0e3d69a 100644
--- a/res/layout/assistant_account_creation.xml
+++ b/res/layout/assistant_account_creation.xml
@@ -58,7 +58,6 @@
 			<TextView
 				android:id="@+id/username_error"
 				android:text="@string/error"
-				style="@style/font20"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:visibility="invisible"/>
diff --git a/res/layout/assistant_linphone_login.xml b/res/layout/assistant_linphone_login.xml
index d1b5facff..d2ced98e3 100644
--- a/res/layout/assistant_linphone_login.xml
+++ b/res/layout/assistant_linphone_login.xml
@@ -25,7 +25,7 @@
 
 		<TextView
 			android:text="@string/username"
-			style="@style/font13"
+			style="@style/font9"
 			android:textAllCaps="true"
 			android:paddingTop="10dp"
 			android:layout_width="match_parent"
@@ -45,7 +45,7 @@
 
 		<TextView
 			android:text="@string/password"
-			style="@style/font13"
+			style="@style/font9"
 			android:textAllCaps="true"
 			android:paddingTop="10dp"
 			android:layout_width="match_parent"
@@ -65,7 +65,7 @@
 
 		<TextView
 			android:text="@string/assistant_display_name"
-			style="@style/font13"
+			style="@style/font9"
 			android:textAllCaps="true"
 			android:paddingTop="10dp"
 			android:layout_width="match_parent"
diff --git a/res/layout/assistant_remote_provisioning_login.xml b/res/layout/assistant_remote_provisioning_login.xml
index 17aa63ab1..661398c32 100644
--- a/res/layout/assistant_remote_provisioning_login.xml
+++ b/res/layout/assistant_remote_provisioning_login.xml
@@ -1,49 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:background="@color/colorG"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical">
-
-
-
-<TextView
-		android:text="@string/assistant_remote_provisioning_title"
-		android:contentDescription="@string/content_description_welcome"
-		style="@style/font6"
-		android:textAllCaps="true"
-		android:paddingTop="20dp"
-		android:layout_gravity="center"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:gravity="center_horizontal"/>
-
-	<TextView
-		android:text="@string/assistant_remote_provisioning_login"
-		style="@style/font11"
-		android:layout_gravity="center"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"/>
+	android:layout_height="match_parent">
 
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:paddingLeft="10dp"
-		android:paddingRight="10dp"
-		android:gravity="center"
-		android:orientation="vertical">
+		android:padding="20dp"
+	    android:orientation="vertical">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal">
+
+			<ImageView
+				android:src="@drawable/logo_secure_phone"
+				android:layout_width="60dp"
+				android:layout_height="60dp"
+				android:layout_gravity="bottom"/>
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="20dp"
+				android:layout_gravity="bottom"
+				android:orientation="vertical">
+
+				<TextView
+					android:text="@string/assistant_welcome"
+					style="@style/font13"
+					android:contentDescription="@string/content_description_welcome"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"/>
+
+				<TextView
+					android:text="@string/assistant_remote_provisioning_login"
+					style="@style/font11"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+			</LinearLayout>
+
+		</LinearLayout>
 
 		<TextView
 			android:text="@string/username"
-			style="@style/font13"
-			android:textAllCaps="true"
-			android:paddingTop="10dp"
+			style="@style/font9"
+			android:layout_marginTop="30dp"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"/>
 
 		<EditText
 			android:id="@+id/assistant_username"
 			android:background="@drawable/resizable_textfield"
-			android:textColor="@color/colorB"
+			android:textColor="@color/colorC"
+			android:textCursorDrawable="@null"
+			android:inputType="textEmailAddress"
+			android:layout_width="match_parent"
+			android:layout_height="40dp"
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:singleLine="true"/>
+
+		<TextView
+			android:text="@string/domain"
+			style="@style/font9"
+			android:paddingTop="20dp"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"/>
+
+		<EditText
+			android:id="@+id/assistant_domain"
+			android:background="@drawable/resizable_textfield"
+			android:textColor="@color/colorC"
 			android:textCursorDrawable="@null"
 			android:inputType="textEmailAddress"
 			android:layout_width="match_parent"
@@ -54,16 +84,15 @@
 
 		<TextView
 			android:text="@string/password"
-			style="@style/font13"
-			android:textAllCaps="true"
-			android:paddingTop="10dp"
+			style="@style/font9"
+			android:paddingTop="20dp"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"/>
 
 		<EditText
 			android:id="@+id/assistant_password"
 			android:background="@drawable/resizable_textfield"
-			android:textColor="@color/colorB"
+			android:textColor="@color/colorC"
 			android:textCursorDrawable="@null"
 			android:inputType="textPassword"
 			android:layout_width="match_parent"
@@ -72,35 +101,14 @@
 			android:paddingRight="10dp"
 			android:singleLine="true"/>
 
-
-		<TextView
-			android:text="@string/domain"
-			style="@style/font13"
-			android:textAllCaps="true"
-			android:paddingTop="10dp"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"/>
-
-
-		<EditText
-			android:id="@+id/assistant_domain"
-			android:background="@drawable/resizable_textfield"
-			android:textColor="@color/colorB"
-			android:textCursorDrawable="@null"
-			android:inputType="textEmailAddress"
-			android:layout_width="match_parent"
-			android:layout_height="40dp"
-			android:paddingLeft="10dp"
-			android:paddingRight="10dp"
-			android:singleLine="true"/>
-
 		<Button
 			android:id="@+id/assistant_connect"
 			android:text="@string/assistant_connect"
 			android:background="@drawable/assistant_button"
-			style="@style/font8"
+			style="@style/font5"
+			android:textAllCaps="false"
 			android:contentDescription="@string/content_description_validate"
-			android:layout_width="wrap_content"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:paddingLeft="10dp"
 			android:paddingRight="10dp"
@@ -109,5 +117,13 @@
 			android:layout_centerVertical="true"/>
 
 	</LinearLayout>
+
+	<ImageView
+		android:src="@drawable/logo_orange"
+		android:layout_width="60dp"
+		android:layout_height="60dp"
+		android:layout_margin="30dp"
+		android:layout_alignParentBottom="true"
+		android:layout_alignParentRight="true"/>
  
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/assistant_topbar.xml b/res/layout/assistant_topbar.xml
index 507a95e29..ca16b3d18 100644
--- a/res/layout/assistant_topbar.xml
+++ b/res/layout/assistant_topbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/topbar"
-	android:background="@color/colorF"
+	android:background="@color/colorG"
 	android:layout_width="match_parent"
 	android:layout_height="70dp">
 
diff --git a/res/layout/audio.xml b/res/layout/audio.xml
index f2207a6e1..b9882a604 100644
--- a/res/layout/audio.xml
+++ b/res/layout/audio.xml
@@ -3,6 +3,6 @@
 	android:layout_width="match_parent" 
 	android:layout_height="match_parent"
     android:paddingTop="40dp"
-	android:background="@color/colorH">
+	android:background="@color/colorA">
 	
 </ScrollView>
\ No newline at end of file
diff --git a/res/layout/call.xml b/res/layout/call.xml
index dce208b02..9a947434f 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -5,456 +5,441 @@
     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="40dp"
-		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:layout_width="match_parent"
-							android:layout_height="80dp"
-							android:layout_centerHorizontal="true"
-							android:orientation="vertical">
-
-							<TextView
-								android:id="@+id/contact_name"
-								style="@style/font5"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:paddingTop="5dp"
-								android:layout_alignParentTop="true"
-								android:layout_gravity="center"/>
-
-							<Chronometer
-								android:id="@+id/call_timer"
-								style="@style/font2"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:layout_below="@id/contact_name"
-								android:layout_gravity="center"/>
-						</LinearLayout>
-
-						<RelativeLayout
-							android:id="@+id/avatar_layout"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:layout_below="@id/active_call_info"
-							android:layout_margin="5dp"
-							android:paddingTop="10dp"
-							android:gravity="center_horizontal">
-
-							<ImageView
-								android:id="@+id/contact_picture"
-								android:src="@drawable/avatar"
-								android:contentDescription="@string/content_description_contact_picture"
-								android:layout_width="200dp"
-								android:layout_height="200dp"
-								android:adjustViewBounds="true"/>
-
-							<ImageView
-								android:id="@+id/mask"
-								android:src="@drawable/avatar_mask_border"
-								android:contentDescription="@string/content_description_contact_picture"
-								android:layout_width="200dp"
-								android:layout_height="200dp"
-								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_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="wrap_content"
-				android:layout_alignParentBottom="true"
-				android:orientation="vertical">
-
-				<LinearLayout
-					android:background="@color/colorF"
-					android:layout_width="match_parent"
-					android:layout_height="70dp"
-					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="25dp"
-						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="20dp"
-						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="20dp"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1" />
-				</LinearLayout>
-
-				<LinearLayout
-					android:id="@+id/main_bar"
-					android:layout_width="match_parent"
-					android:layout_height="70dp"
-					android:layout_alignParentBottom="true"
-					android:layout_gravity="center"
-					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_gravity="center"
-						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="20dp"/>
-				</LinearLayout>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:id="@+id/menu_bottom"
-				android:layout_width="match_parent"
-				android:layout_height="70dp"
-				android:layout_above="@id/menu"
-				android:orientation="horizontal" >
-
-				<TextView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"
-					android:layout_weight="0.5"/>
-
-				<TextView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"
-					android:layout_weight="0.5"/>
-
-				<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="0.5" />
-
-				<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="0.5" />
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:id="@+id/menu_middle"
-				android:layout_width="match_parent"
-				android:layout_height="70dp"
-				android:layout_above="@id/menu_bottom"
-				android:orientation="horizontal" >
-
-				<TextView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"
-					android:layout_weight="0.5"/>
-
-				<TextView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"
-					android:layout_weight="0.5"/>
-
-				<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="0.5"/>
-
-				<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="0.5"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:layout_above="@id/menu_middle"
-				android:layout_width="match_parent"
-				android:layout_height="70dp"
-				android:orientation="horizontal" >
-
-				<TextView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"
-					android:layout_weight="0.5"/>
-
-				<TextView
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:visibility="invisible"
-					android:layout_weight="0.5"/>
-
-				<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="0.5"/>
-
-				<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="0.5"/>
-
-			</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>
+    <fragment
+        android:id="@+id/status"
+        android:name="org.linphone.StatusFragment"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        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>
+
+                    <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:orientation="vertical">
+                    </LinearLayout>
+
+                    <RelativeLayout
+                        android:id="@+id/active_call"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_above="@id/calls_list"
+                        android:visibility="visible">
+
+                        <ImageView
+                            android:id="@+id/contact_picture"
+                            android:src="@drawable/avatar_big"
+                            android:contentDescription="@string/content_description_contact_picture"
+                            android:layout_width="200dp"
+                            android:layout_height="200dp"
+                            android:layout_centerInParent="true"
+                            android:adjustViewBounds="true"/>
+
+                        <LinearLayout
+                            android:id="@+id/active_call_info"
+                            android:background="@color/colorG"
+                            android:layout_width="match_parent"
+                            android:layout_height="80dp"
+                            android:layout_centerHorizontal="true"
+                            android:layout_alignParentBottom="true"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/contact_name"
+                                style="@style/font13"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:paddingTop="5dp"
+                                android:layout_alignParentTop="true"
+                                android:layout_gravity="center"/>
+
+                            <Chronometer
+                                android:id="@+id/call_timer"
+                                style="@style/font11"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_below="@id/contact_name"
+                                android:layout_gravity="center"/>
+                        </LinearLayout>
+
+
+                        <LinearLayout
+                            android:id="@+id/remote_pause"
+                            android:background="@color/colorA"
+                            android:alpha="0.9"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:orientation="vertical"
+                            android:visibility="gone">
+
+                            <ImageView
+                                android:src="@drawable/waiting_time"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"/>
+
+                            <TextView
+                                android:text="@string/call_paused_by_remote"
+                                style="@style/font4"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"/>
+
+                        </LinearLayout>
+
+                        <ImageView
+                            android:id="@+id/pause"
+                            android:src="@drawable/pause_big_default"
+                            android:contentDescription="@string/content_description_pause"
+                            android:layout_width="80dp"
+                            android:layout_height="80dp"
+                            android:padding="15dp"
+                            android:layout_below="@+id/active_call_info"
+                            android:layout_alignParentTop="true"
+                            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/no_current_call"
+                        android:background="@color/colorA"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical"
+                        android:layout_above="@id/calls_list"
+                        android:gravity="center_vertical"
+                        android:visibility="gone">
+
+                        <ImageView
+                            android:src="@drawable/waiting_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"/>
+
+                        <TextView
+                            android:text="@string/no_current_call"
+                            style="@style/font4"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"/>
+                    </LinearLayout>
+
+                </RelativeLayout>
+            </FrameLayout>
+
+            <org.linphone.ui.Numpad
+                android:id="@+id/numpad"
+                android:background="@color/colorC"
+                android:contentDescription="@string/content_description_numpad"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:layout_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="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:background="@color/colorF"
+                    android:layout_width="match_parent"
+                    android:layout_height="70dp"
+                    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="25dp"
+                            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="20dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:id="@+id/audio_route"
+                        android:src="@drawable/routes"
+                        android:background="@drawable/button_background"
+                        android:visibility="gone"
+                        android:padding="20dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1" />
+
+                    <ImageView
+                        android:id="@+id/options"
+                        android:src="@drawable/options_default"
+                        android:background="@drawable/button_background"
+                        android:padding="20dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/main_bar"
+                    android:layout_width="match_parent"
+                    android:layout_height="70dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_gravity="center"
+                    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_gravity="center"
+                        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="20dp"/>
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/menu_bottom"
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:layout_above="@id/menu"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="invisible"
+                    android:layout_weight="0.5"/>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="invisible"
+                    android:layout_weight="0.5"/>
+
+                <ImageView
+                    android:id="@+id/route_bluetooth"
+                    android:src="@drawable/route_bluetooth"
+                    android:background="@drawable/button_call_background"
+                    android:padding="20dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5" />
+
+                <ImageView
+                    android:id="@+id/add_call"
+                    android:src="@drawable/add_call_button"
+                    android:background="@drawable/button_call_background"
+                    android:padding="20dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/menu_middle"
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:layout_above="@id/menu_bottom"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="invisible"
+                    android:layout_weight="0.5"/>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="invisible"
+                    android:layout_weight="0.5"/>
+
+                <ImageView
+                    android:id="@+id/route_earpiece"
+                    android:src="@drawable/route_earpiece"
+                    android:background="@drawable/button_call_background"
+                    android:padding="20dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"/>
+
+                <ImageView
+                    android:id="@+id/transfer"
+                    android:src="@drawable/transfer_button"
+                    android:background="@drawable/button_call_background"
+                    android:padding="20dp"
+                    android:visibility="invisible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_above="@id/menu_middle"
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:orientation="horizontal" >
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="invisible"
+                    android:layout_weight="0.5"/>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="invisible"
+                    android:layout_weight="0.5"/>
+
+                <ImageView
+                    android:id="@+id/route_speaker"
+                    android:src="@drawable/route_speaker"
+                    android:background="@drawable/button_call_background"
+                    android:visibility="invisible"
+                    android:padding="20dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"/>
+
+                <ImageView
+                    android:id="@+id/conference"
+                    android:src="@drawable/conference_button"
+                    android:background="@drawable/button_call_background"
+                    android:visibility="invisible"
+                    android:padding="20dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"/>
+
+            </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/call_inactive_row.xml b/res/layout/call_inactive_row.xml
index 46aaff9af..baa4c7470 100644
--- a/res/layout/call_inactive_row.xml
+++ b/res/layout/call_inactive_row.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:background="@color/colorA"
-	android:alpha="0.5"
+	android:background="@color/colorG"
 	android:layout_height="60dp"
 	android:layout_width="match_parent"
 	android:layout_margin="2dp"
@@ -17,7 +16,7 @@
 
    	<TextView
         android:id="@+id/contact_name"
-		style="@style/font14"
+		style="@style/font9"
 		android:singleLine="true"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
@@ -28,7 +27,7 @@
 
 	<Chronometer
 		android:id="@+id/call_timer"
-		style="@style/font16"
+		style="@style/font12"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:paddingLeft="10dp"
@@ -37,7 +36,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/call_incoming.xml b/res/layout/call_incoming.xml
index 2b7ee03ea..599caf1e8 100644
--- a/res/layout/call_incoming.xml
+++ b/res/layout/call_incoming.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				xmlns:tools="http://schemas.android.com/tools"
-				android:id="@+id/topLayout"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:background="@color/colorH">
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/topLayout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/colorA">
 
 	<fragment
 		android:id="@+id/status"
@@ -13,21 +13,40 @@
 		android:layout_height="40dp"
 		tools:layout="@layout/status" />
 
-	<RelativeLayout
+	<LinearLayout
 		android:id="@+id/top_bar"
-		android:background="@color/colorF"
+		android:background="@color/colorG"
 		android:layout_width="match_parent"
 		android:layout_height="60dp"
-		android:layout_below="@id/status">
+		android:orientation="horizontal"
+		android:layout_below="@id/status"
+		android:gravity="center">
+
+		<ImageView
+			android:src="@drawable/call_status_incoming"
+			android:paddingRight="10dp"
+			android:paddingTop="15dp"
+			android:paddingBottom="15dp"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"/>
 
 		<TextView
 			android:text="@string/incoming_call"
-			style="@style/font1"
-			android:layout_width="match_parent"
+			style="@style/font2"
+			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
 			android:gravity="center"/>
 
-	</RelativeLayout>
+	</LinearLayout>
+
+	<ImageView
+		android:id="@+id/contact_picture"
+		android:src="@drawable/avatar_big"
+		android:contentDescription="@string/content_description_contact_picture"
+		android:layout_centerInParent="true"
+		android:layout_width="200dp"
+		android:layout_height="200dp"
+		android:paddingBottom="20dp"/>
 
 	<RelativeLayout
 		android:id="@+id/contact_detail"
@@ -37,49 +56,30 @@
 		android:paddingTop="10dp"
 		android:layout_above="@+id/menu">
 
-		<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"/>
-
-		<RelativeLayout
-			android:id="@+id/avatar_layout"
+		<LinearLayout
+			android:background="@color/colorG"
+			android:layout_alignParentBottom="true"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@id/contact_number"
-			android:layout_margin="5dp"
-			android:gravity="center">
+			android:gravity="center_horizontal"
+			android:orientation="vertical">
 
-			<ImageView
-				android:id="@+id/contact_picture"
-				android:src="@drawable/avatar"
-				android:contentDescription="@string/content_description_contact_picture"
-				android:layout_width="200dp"
+			<TextView
+				android:id="@+id/contact_name"
+				style="@style/font13"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:adjustViewBounds="true"/>
+				android:paddingTop="5dp"/>
 
-			<ImageView
-				android:src="@drawable/avatar_mask_border"
-				android:layout_width="200dp"
+			<TextView
+				android:id="@+id/contact_number"
+				style="@style/font11"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:adjustViewBounds="true"
-				android:layout_alignParentTop="true"/>
+				android:paddingBottom="10dp"
+				android:layout_below="@id/contact_name"/>
 
-		</RelativeLayout>
+		</LinearLayout>
 
 	</RelativeLayout>
 
@@ -147,7 +147,7 @@
 			android:layout_height="wrap_content"
 			android:visibility="gone"
 			android:orientation="horizontal"
-			android:background="@color/colorD"
+			android:background="@color/colorC"
 			android:paddingLeft="15dp"
 			android:paddingTop="15dp"
 			android:paddingBottom="15dp"
diff --git a/res/layout/call_outgoing.xml b/res/layout/call_outgoing.xml
index 0716bc839..42ed3f912 100644
--- a/res/layout/call_outgoing.xml
+++ b/res/layout/call_outgoing.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				xmlns:tools="http://schemas.android.com/tools"
-				android:id="@+id/topLayout"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:background="@color/colorH">
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/topLayout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/colorA">
 
 	<fragment
 		android:id="@+id/status"
@@ -13,22 +13,40 @@
 		android:layout_width="match_parent"
 		android:layout_height="40dp"/>
 
-	<RelativeLayout
+	<LinearLayout
 		android:id="@+id/top_bar"
-		android:background="@color/colorF"
+		android:background="@color/colorG"
 		android:layout_width="match_parent"
 		android:layout_height="60dp"
-		android:layout_below="@id/status">
+		android:orientation="horizontal"
+		android:layout_below="@id/status"
+		android:gravity="center">
+
+		<ImageView
+			android:src="@drawable/call_status_outgoing"
+			android:paddingRight="10dp"
+			android:paddingTop="15dp"
+			android:paddingBottom="15dp"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"/>
 
 		<TextView
 			android:text="@string/outgoing_call"
-			style="@style/font1"
-			android:layout_width="match_parent"
+			style="@style/font2"
+			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
-			android:paddingLeft="10dp"
 			android:gravity="center"/>
 
-	</RelativeLayout>
+	</LinearLayout>
+
+	<ImageView
+		android:id="@+id/contact_picture"
+		android:src="@drawable/avatar_big"
+		android:contentDescription="@string/content_description_contact_picture"
+		android:layout_centerInParent="true"
+		android:layout_width="200dp"
+		android:layout_height="200dp"
+		android:paddingBottom="20dp"/>
 
 	<RelativeLayout
 		android:id="@+id/contact_detail"
@@ -38,49 +56,30 @@
 		android:layout_below="@id/top_bar"
 		android:paddingTop="10dp">
 
-		<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"/>
-
-		<RelativeLayout
-			android:id="@+id/avatar_layout"
+		<LinearLayout
+			android:background="@color/colorG"
+			android:layout_alignParentBottom="true"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_below="@id/contact_number"
-			android:layout_margin="5dp"
-			android:gravity="center">
+			android:gravity="center_horizontal"
+			android:orientation="vertical">
 
-			<ImageView
-				android:id="@+id/contact_picture"
-				android:src="@drawable/avatar"
-				android:contentDescription="@string/content_description_contact_picture"
-				android:layout_width="200dp"
+			<TextView
+				android:id="@+id/contact_name"
+				style="@style/font13"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:adjustViewBounds="true"/>
+				android:paddingTop="5dp"/>
 
-			<ImageView
-				android:src="@drawable/avatar_mask_border"
-				android:layout_width="200dp"
+			<TextView
+				android:id="@+id/contact_number"
+				style="@style/font11"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:adjustViewBounds="true"
-				android:layout_alignParentTop="true"/>
+				android:paddingBottom="10dp"
+				android:layout_below="@id/contact_name"/>
 
-		</RelativeLayout>
+		</LinearLayout>
 
 	</RelativeLayout>
 
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index 538f5d7fd..55fda991c 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -2,19 +2,17 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-  	android:background="@color/colorH" >
+  	android:background="@color/colorG" >
 
 	<RelativeLayout
 		android:id="@+id/top_bar"
-		android:background="@color/colorF"
 		android:layout_width="match_parent"
 		android:layout_height="60dp"
 		android:layout_gravity="bottom">
 
 		<ImageView
 			android:id="@+id/back"
-			android:src="@drawable/back"
-			android:background="@drawable/toolbar_button"
+			android:src="@drawable/back_button"
 			android:contentDescription="@string/content_description_back"
 			android:layout_width="70dp"
 			android:layout_height="match_parent"
@@ -24,7 +22,6 @@
 		<ImageView
 			android:id="@+id/edit"
 			android:src="@drawable/edit_list_button"
-			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_edit"
 			android:layout_width="70dp"
 			android:layout_height="match_parent"
@@ -34,7 +31,6 @@
 		<ImageView
 			android:id="@+id/start_call"
 			android:src="@drawable/call_alt_start"
-			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_call"
 			android:layout_toLeftOf="@id/edit"
 			android:layout_width="70dp"
@@ -43,7 +39,7 @@
 
 		<TextView
 			android:id="@+id/contact_name"
-			style="@style/font6"
+			style="@style/font2"
 			android:ellipsize="end"
 			android:singleLine="true"
 			android:layout_width="match_parent"
@@ -52,6 +48,12 @@
 			android:layout_toLeftOf="@id/start_call"
 			android:paddingLeft="10dp"
 			android:gravity="center"/>
+
+		<View
+			android:background="@color/colorF"
+			android:layout_alignParentBottom="true"
+			android:layout_width="match_parent"
+			android:layout_height="1dp"/>
 	</RelativeLayout>
 
 	<include layout="@layout/edit_list"/>
@@ -63,7 +65,7 @@
 	    android:orientation="vertical"
 	    android:layout_alignParentBottom="true"
 	    android:layout_centerHorizontal="true"
-   		android:background="@color/colorF">
+   		android:background="@color/colorD">
        
 	    <RelativeLayout 
 	        android:id="@+id/messageLayout"
@@ -72,7 +74,7 @@
 	        
 	        <ImageView
 	            android:id="@+id/sendPicture"
-				android:padding="5dp"
+				android:padding="15dp"
 				android:scaleType="center"
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
@@ -83,7 +85,7 @@
 	        <ImageView
 	            android:id="@+id/sendMessage"
 	            android:gravity="center"
-				android:padding="5dp"
+				android:padding="15dp"
 				android:scaleType="center"
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
@@ -92,14 +94,15 @@
 				android:layout_alignParentRight="true"/>
 	        
 	        <EditText
+				android:id="@+id/message"
                 android:imeOptions="flagNoExtractUi"
 	            android:textCursorDrawable="@null"
-	            android:id="@+id/message"
             	android:inputType="textMultiLine"
-            	android:maxLines="3"
+            	android:maxLines="2"
 	            android:textColor="@android:color/black"
 	            android:layout_width="match_parent"
-	            android:layout_height="wrap_content"
+	            android:layout_height="40dp"
+				android:padding="10dp"
 	            android:layout_toRightOf="@id/sendPicture"
 	            android:layout_toLeftOf="@id/sendMessage"
 	            android:background="@drawable/resizable_textfield"
@@ -121,7 +124,6 @@
 	            android:adjustViewBounds="true"
 	            android:layout_alignParentRight="true"
 	            android:padding="20dp" />
-
 	        
 	    </RelativeLayout>
     
@@ -129,10 +131,10 @@
         
 	<TextView
         android:id="@+id/remoteComposing"
-        android:layout_width="match_parent"
+		android:text="@string/remote_composing"
+		style="@style/font14"
+		android:layout_width="match_parent"
         android:layout_height="wrap_content"
-		android:textColor="@color/colorB"
-        android:text="@string/remote_composing"
         android:layout_above="@id/footer"/>
 
 	<ListView
@@ -147,7 +149,6 @@
 		android:layout_above="@id/remoteComposing"
 		android:layout_marginLeft="10dp"
 		android:layout_marginRight="10dp"
-		android:layout_marginBottom="10dp"
 		android:layout_below="@+id/top_bar"/>
 
 	<AutoCompleteTextView
@@ -158,7 +159,7 @@
 		android:id="@+id/searchContactField"
 		android:layout_width="match_parent"
 		android:layout_height="40dp"
-		android:textColor="@android:color/black"
+		android:textColor="@color/colorC"
 		android:background="@drawable/resizable_textfield"
 		android:gravity="center"
 		android:completionThreshold="1"
diff --git a/res/layout/chat_bubble_incoming.xml b/res/layout/chat_bubble_incoming.xml
index 8870b3fcc..64681ad40 100644
--- a/res/layout/chat_bubble_incoming.xml
+++ b/res/layout/chat_bubble_incoming.xml
@@ -12,51 +12,23 @@
 		android:background="@drawable/resizable_chat_bubble_incoming"
 		android:orientation="horizontal" >
 
-	<RelativeLayout
-		android:id="@+id/avatar_layout"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="10dp">
-
-		<ImageView
-			android:id="@+id/contact_picture"
-			android:src="@drawable/avatar"
-			android:contentDescription="@string/content_description_contact_picture"
-			android:layout_width="40dp"
-			android:layout_height="40dp"
-			android:adjustViewBounds="true"
-			android:layout_alignParentLeft="true"
-			android:layout_marginLeft="5dp"/>
-
-		<ImageView
-			android:id="@+id/mask"
-			android:src="@drawable/avatar_mask"
-			android:contentDescription="@string/content_description_contact_picture"
-			android:layout_width="40dp"
-			android:layout_height="40dp"
-			android:adjustViewBounds="true"
-			android:layout_alignParentLeft="true"
-			android:layout_marginLeft="5dp"/>
-
-	</RelativeLayout>
-
-
 	<LinearLayout
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
-		android:padding="12dp">
+		android:paddingLeft="10dp"
+		android:paddingRight="10dp">
 
 		<TextView
 			android:id="@+id/contact_header"
-			style="@style/font9"
+			style="@style/font12"
 			android:singleLine="true"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content" />
 
 		<TextView
 			android:id="@+id/message"
-			style="@style/font11"
+			style="@style/font14"
 			android:linksClickable="true"
 			android:autoLink="web"
 			android:layout_gravity="left"
diff --git a/res/layout/chat_bubble_outgoing.xml b/res/layout/chat_bubble_outgoing.xml
index 13ead5d46..976033e3b 100644
--- a/res/layout/chat_bubble_outgoing.xml
+++ b/res/layout/chat_bubble_outgoing.xml
@@ -11,45 +11,29 @@
 		android:background="@drawable/resizable_chat_bubble_outgoing"
 		android:orientation="horizontal" >
 
-		<ImageView
-			android:id="@+id/contact_picture"
-			android:src="@drawable/avatar"
-			android:layout_width="50dp"
-			android:layout_height="50dp"
-			android:paddingTop="10dp"
-			android:paddingLeft="10dp"/>
-
 		<LinearLayout
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
-			android:padding="12dp">
+			android:paddingLeft="10dp"
+			android:paddingRight="10dp">
 
 			<TextView
 				android:id="@+id/contact_header"
-				style="@style/font3"
+				style="@style/font12"
 				android:singleLine="true"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"/>
 
 			<TextView
 				android:id="@+id/message"
-				style="@style/font11"
+				style="@style/font14"
 				android:autoLink="web"
 				android:linksClickable="true"
 				android:visibility="gone"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content" />
 
-			<ProgressBar
-				android:id="@+id/inprogress"
-				android:visibility="gone"
-				android:paddingRight="5dp"
-				android:paddingTop="5dp"
-				android:layout_gravity="top|right"
-				android:layout_width="20dp"
-				android:layout_height="20dp"/>
-
 			<ImageView
 				android:id="@+id/image"
 				android:visibility="gone"
@@ -72,6 +56,7 @@
 					style="@android:style/Widget.ProgressBar.Horizontal"
 					android:layout_width="200dp"
 					android:layout_height="5dp"/>
+
 				<Button
 					android:id="@+id/cancel_upload"
 					android:text="@string/cancel"
@@ -87,21 +72,26 @@
 
 		</LinearLayout>
 
-	<ImageView
-		android:id="@+id/status"
-		android:contentDescription="@string/content_description_message_status"
-		android:visibility="invisible"
-		android:paddingRight="5dp"
-		android:paddingTop="5dp"
-		android:layout_gravity="top|right"
-		android:layout_width="20dp"
-		android:layout_height="20dp"
-		android:adjustViewBounds="true" />
+		<ImageView
+			android:id="@+id/status"
+			android:contentDescription="@string/content_description_message_status"
+			android:visibility="invisible"
+			android:paddingRight="5dp"
+			android:layout_gravity="top|right"
+			android:layout_width="20dp"
+			android:layout_height="20dp"
+			android:adjustViewBounds="true" />
+
+		<ProgressBar
+			android:id="@+id/inprogress"
+			android:visibility="gone"
+			android:paddingRight="5dp"
+			android:layout_gravity="top|right"
+			android:layout_width="20dp"
+			android:layout_height="20dp"/>
 
 	</LinearLayout>
 
-
-
 	<CheckBox
 		android:id="@+id/delete"
 		android:button="@drawable/checkbox"
diff --git a/res/layout/chatlist.xml b/res/layout/chatlist.xml
index e6afaea73..6edc8f567 100644
--- a/res/layout/chatlist.xml
+++ b/res/layout/chatlist.xml
@@ -2,20 +2,18 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-  	android:background="@color/colorH"
+  	android:background="@color/colorG"
     android:orientation="vertical" >
 
 	<RelativeLayout
 		android:id="@+id/top_bar"
 		android:layout_width="match_parent"
 		android:layout_height="60dp"
-		android:layout_gravity="top"
-		android:background="@color/colorF">
+		android:layout_gravity="top">
 
 		<ImageView
 			android:id="@+id/new_discussion"
-			android:src="@drawable/chat_add"
-			android:background="@drawable/toolbar_button"
+			android:src="@drawable/chat_add_button"
 			android:contentDescription="@string/content_description_new_discussion"
 			android:layout_width="70dp"
 			android:layout_height="match_parent"
@@ -25,12 +23,17 @@
 		<ImageView
 			android:id="@+id/edit"
 			android:src="@drawable/edit_list_button"
-			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_edit"
 			android:layout_width="70dp"
 			android:layout_height="match_parent"
 			android:layout_alignParentRight="true"
 			android:padding="15dp"/>
+
+		<View
+			android:background="@color/colorF"
+			android:layout_alignParentBottom="true"
+			android:layout_width="match_parent"
+			android:layout_height="1dp"/>
 	</RelativeLayout>
 
 	<include layout="@layout/edit_list"/>
@@ -39,7 +42,7 @@
         android:id="@+id/chatList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:divider="@color/colorE"
+        android:divider="@color/colorF"
         android:cacheColorHint="@color/transparent"
         android:dividerHeight="1dp" />
     
diff --git a/res/layout/chatlist_cell.xml b/res/layout/chatlist_cell.xml
index 3bee3b5a9..500283dec 100644
--- a/res/layout/chatlist_cell.xml
+++ b/res/layout/chatlist_cell.xml
@@ -5,8 +5,7 @@
     android:gravity="center_vertical"
     android:paddingLeft="10dp"
 	android:paddingRight="10dp"
-	android:paddingTop="5dp"
-    android:background="@drawable/list_selector">
+	android:paddingTop="5dp">
 
 	<CheckBox
 		android:id="@+id/delete"
@@ -18,7 +17,7 @@
 		android:adjustViewBounds="true"
 		android:layout_alignParentRight="true"
 		android:layout_centerVertical="true"
-		android:visibility="invisible" />
+		android:visibility="gone" />
 	
 	<TextView 
 	    android:id="@+id/draft"
@@ -36,7 +35,7 @@
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
 	    android:layout_centerVertical="true"
-	    android:layout_toLeftOf="@id/draft"
+	    android:layout_toLeftOf="@id/delete"
 	    android:orientation="horizontal">
 
 		<RelativeLayout
@@ -58,24 +57,16 @@
 					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>
 
 			<TextView
 				android:id="@+id/date"
+				style="@style/font12"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_below="@id/avatar_layout"
 				android:layout_marginTop="5dp"
-				android:singleLine="true"
-				style="@style/font2"/>
+				android:singleLine="true"/>
 
 		</RelativeLayout>
 
@@ -92,7 +83,7 @@
 				android:scrollHorizontally="true"
 				android:fadingEdge="horizontal"
 				android:singleLine="true"
-				style="@style/font6"
+				style="@style/font2"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_marginRight="30dp"/>
@@ -102,12 +93,12 @@
 				android:layout_width="25dp"
 				android:layout_height="25dp"
 				android:background="@drawable/chat_list_indicator"
-				style="@style/font18"
+				style="@style/font7"
 				android:gravity="center"
 				android:singleLine="true"
-				android:layout_above="@+id/lastMessage"
 				android:layout_alignParentRight="true"
-				android:layout_alignParentEnd="true"/>
+				android:layout_alignParentEnd="true"
+				android:layout_alignBottom="@+id/sipUri"/>
 
 			<TextView
 				android:id="@+id/lastMessage"
@@ -116,7 +107,7 @@
 				android:layout_below="@id/sipUri"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				style="@style/font11"/>
+				style="@style/font9"/>
 
 		</RelativeLayout>
 	    
diff --git a/res/layout/conf_call_control_row.xml b/res/layout/conf_call_control_row.xml
index 736582f21..b94ae5a12 100644
--- a/res/layout/conf_call_control_row.xml
+++ b/res/layout/conf_call_control_row.xml
@@ -5,7 +5,7 @@
 	android:layout_margin="2dp"
 	android:gravity="center_vertical"
 	android:orientation="horizontal"
-	android:background="@color/colorH"
+	android:background="@color/colorG"
 	android:padding="2dp"
 	android:divider="@color/colorE"
 	android:dividerHeight="1dp">
@@ -25,7 +25,7 @@
 
 		<TextView
 			android:id="@+id/contactNameOrNumber"
-			style="@style/font6"
+			style="@style/font2"
 			android:singleLine="true"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
 
 		<Chronometer
 			android:id="@+id/call_timer"
-			style="@style/font2"
+			style="@style/font12"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:paddingLeft="10dp"
diff --git a/res/layout/conference_header.xml b/res/layout/conference_header.xml
index 9379fc2fd..bf6dda607 100644
--- a/res/layout/conference_header.xml
+++ b/res/layout/conference_header.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="75dp"
     android:gravity="center_vertical"
-    android:background="@color/colorH">
+    android:background="@color/colorG">
 
 	<LinearLayout
 		android:layout_width="wrap_content"
@@ -13,13 +13,14 @@
 
 		<TextView
 			android:text="@string/conference"
-			style="@style/font5"
+			style="@style/font13"
+			android:gravity="center"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
+			android:layout_height="match_parent"/>
 
 		<Chronometer
 			android:id="@+id/callTimer"
-			style="@style/font2"
+			style="@style/font13"
 			android:visibility="gone"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"/>
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index 635ef6df7..8d64618eb 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -2,92 +2,81 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-  	android:background="@color/colorH"
+  	android:background="@color/colorG"
     android:orientation="vertical" >
 
 	<RelativeLayout
 		android:layout_width="match_parent"
 		android:layout_height="60dp"
-		android:layout_gravity="bottom"
-		android:background="@color/colorF">
+		android:layout_gravity="bottom">
 
 		<ImageView
 			android:id="@+id/back"
-			android:src="@drawable/back"
-			android:background="@drawable/toolbar_button"
+			android:src="@drawable/back_button"
 			android:contentDescription="@string/content_description_back"
 			android:layout_width="70dp"
 			android:layout_height="match_parent"
 			android:layout_alignParentLeft="true"
 			android:padding="20dp"/>
 
-		<ImageView
-			android:contentDescription="@string/content_description_edit"
-			android:id="@+id/editContact"
-			android:layout_alignParentRight="true"
-			android:padding="15dp"
-			android:src="@drawable/edit"
-			android:layout_width="70dp"
-			android:layout_height="match_parent"/>
-
-		<ImageView
-			android:contentDescription="@string/content_description_delete"
-			android:id="@+id/deleteContact"
-			android:padding="15dp"
-			android:src="@drawable/delete"
-			android:gravity="center"
-			android:layout_width="70dp"
-			android:layout_height="match_parent"
-			android:layout_toLeftOf="@+id/editContact"/>
-
+		<View
+			android:background="@color/colorF"
+			android:layout_alignParentBottom="true"
+			android:layout_width="match_parent"
+			android:layout_height="1dp"/>
 	</RelativeLayout>
 
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:paddingTop="20dp"
-		android:gravity="center"
-		android:orientation="vertical">
+		android:padding="20dp"
+		android:orientation="horizontal">
 
-		<RelativeLayout
-			android:id="@+id/avatar_layout"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center">
+		<ImageView
+			android:id="@+id/contact_picture"
+			android:src="@drawable/avatar"
+			android:contentDescription="@string/content_description_contact_picture"
+			android:layout_width="80dp"
+			android:layout_height="80dp"
+			android:adjustViewBounds="true"
+			android:layout_alignParentLeft="true"
+			android:layout_marginLeft="5dp"/>
 
-			<ImageView
-				android:id="@+id/contact_picture"
-				android:src="@drawable/avatar"
-				android:contentDescription="@string/content_description_contact_picture"
-				android:layout_width="100dp"
-				android:layout_height="100dp"
-				android:adjustViewBounds="true"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="5dp"/>
-
-			<ImageView
-				android:id="@+id/mask"
-				android:src="@drawable/avatar_mask"
-				android:contentDescription="@string/content_description_contact_picture"
-				android:layout_width="100dp"
-				android:layout_height="100dp"
-				android:adjustViewBounds="true"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="5dp"/>
-
-		</RelativeLayout>
-
-		<TextView
-			android:id="@+id/contact_name"
-			style="@style/font5"
-			android:singleLine="true"
-			android:layout_gravity="center"
+		<LinearLayout
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
+			android:layout_height="wrap_content"
+			android:paddingLeft="10dp"
+			android:orientation="vertical">
+
+			<TextView
+				android:id="@+id/contact_name"
+				style="@style/font13"
+				android:lines="2"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+			<TextView
+				android:id="@+id/contact_function"
+				style="@style/font2"
+				android:singleLine="true"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
+
+		</LinearLayout>
 
 	</LinearLayout>
-    
-    <ScrollView
+
+	<TextView
+		android:text="@string/address_sip"
+		style="@style/font8"
+		android:textStyle="bold"
+		android:background="@color/colorA"
+		android:textAllCaps="true"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		android:gravity="center"/>
+
+	<ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         
@@ -96,7 +85,7 @@
 	        android:layout_width="match_parent"
 	        android:layout_height="wrap_content"
 	        android:stretchColumns="*"
-	        android:paddingTop="20dp"/>
+	        android:paddingTop="10dp"/>
     
     </ScrollView>
 
diff --git a/res/layout/contact_cell.xml b/res/layout/contact_cell.xml
index 412c7f5c7..d19f1056b 100644
--- a/res/layout/contact_cell.xml
+++ b/res/layout/contact_cell.xml
@@ -4,28 +4,18 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-	android:background="@color/colorH"
+	android:background="@color/colorG"
     android:orientation="vertical">
 
-	<LinearLayout
+	<TextView
 		android:id="@+id/separator"
+		style="@style/font8"
+		android:textStyle="bold"
+		android:background="@color/colorA"
+		android:textAllCaps="true"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical">
-
-		<TextView
-			android:id="@+id/separator_text"
-			style="@style/font1"
-			android:layout_width="match_parent"
-			android:layout_height="40dp"
-			android:gravity="center" />
-
-		<ImageView
-			android:background="@color/colorE"
-			android:layout_width="match_parent"
-			android:layout_height="1dp"/>
-
-	</LinearLayout>
+		android:layout_height="35dp"
+		android:gravity="center"/>
 
 	<RelativeLayout
 		android:layout_width="match_parent"
@@ -33,41 +23,23 @@
 		android:layout_margin="5dp"
 		android:gravity="center_vertical">
 
-		<RelativeLayout
-			android:id="@+id/avatar_layout"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:gravity="center">
+		<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"
+			android:layout_alignParentLeft="true"
+			android:layout_marginLeft="5dp"/>
 
-			<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"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="5dp"/>
-
-			<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"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="5dp"/>
-
-		</RelativeLayout>
-		    
 		<TextView 
 		    android:id="@+id/name"
 		    android:lines="1"
-			style="@style/font6"
+			style="@style/font2"
 		    android:layout_width="match_parent"
 		    android:layout_height="wrap_content"
-		    android:layout_toRightOf="@id/avatar_layout"
+		    android:layout_toRightOf="@id/contact_picture"
 		    android:layout_centerVertical="true"
 			android:layout_toLeftOf="@id/delete"
 		    android:layout_marginLeft="10dp" />
diff --git a/res/layout/contact_control_row.xml b/res/layout/contact_control_row.xml
index 9d91776f4..f871c1b13 100644
--- a/res/layout/contact_control_row.xml
+++ b/res/layout/contact_control_row.xml
@@ -10,25 +10,9 @@
 		android:layout_height="wrap_content"
 		android:orientation="vertical">
 
-		<View
-			android:layout_width="wrap_content"
-			android:layout_height="1dp"
-			android:layout_marginLeft="10dp"
-			android:layout_marginRight="10dp"
-			android:background="@color/colorE"/>
-
-		<TextView
-			android:id="@+id/address_label"
-			android:layout_marginTop="10dp"
-			android:layout_gravity="center"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:textAllCaps="true"
-			android:textColor="@color/colorE" />
-
 		<TextView
 			android:id="@+id/numeroOrAddress"
-			style="@style/font6"
+			style="@style/font2"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:ellipsize="marquee"
@@ -41,13 +25,13 @@
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:paddingTop="20dp"
+			android:paddingTop="5dp"
 			android:gravity="center"
 			android:orientation="horizontal">
 
 			<ImageView
 				android:id="@+id/call"
-				android:src="@drawable/call_start_body_default"
+				android:src="@drawable/call_start_button"
 				android:contentDescription="@string/content_description_dial_back"
 				android:layout_width="60dp"
 				android:layout_height="60dp"
@@ -57,7 +41,7 @@
 
 			<ImageView
 				android:id="@+id/chat"
-				android:src="@drawable/chat_start_body_default"
+				android:src="@drawable/chat_start_button"
 				android:contentDescription="@string/content_description_chat"
 				android:layout_width="60dp"
 				android:layout_height="60dp"
diff --git a/res/layout/contact_edit_row.xml b/res/layout/contact_edit_row.xml
index 4a016383c..fec69e9f9 100644
--- a/res/layout/contact_edit_row.xml
+++ b/res/layout/contact_edit_row.xml
@@ -18,7 +18,6 @@
 
 		<ImageView
 			android:id="@+id/delete"
-			android:src="@drawable/delete_field_default"
 			android:contentDescription="@string/content_description_add"
 			android:layout_alignParentRight="true"
 			android:layout_width="match_parent"
diff --git a/res/layout/contacts_list.xml b/res/layout/contacts_list.xml
index 78f15d341..68238297c 100644
--- a/res/layout/contacts_list.xml
+++ b/res/layout/contacts_list.xml
@@ -2,124 +2,40 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="@color/colorH"
+	android:background="@color/colorG"
 	android:orientation="vertical" >
 
-	<RelativeLayout
-		android:id="@+id/top_bar"
-		android:layout_width="match_parent"
-		android:layout_height="60dp"
-		android:layout_gravity="bottom"
-		android:background="@color/colorF">
-
-
-		<RelativeLayout
-			android:id="@+id/all_contacts_layout"
-			android:layout_width="70dp"
-			android:layout_height="wrap_content"
-			android:adjustViewBounds="true">
-
-			<ImageView
-				android:id="@+id/all_contacts"
-				android:contentDescription="@string/content_description_all_contacts"
-				android:layout_alignParentLeft="true"
-				android:src="@drawable/contacts_all"
-				android:gravity="center"
-				android:padding="15dp"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"/>
-
-			<RelativeLayout
-				android:id="@+id/all_contacts_select"
-				android:contentDescription="@string/content_description_contacts"
-				android:background="@color/colorA"
-				android:layout_alignRight="@id/all_contacts"
-				android:layout_width="match_parent"
-				android:layout_height="5dp"
-				android:layout_alignParentBottom="true"/>
-
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_toRightOf="@id/all_contacts_layout"
-			android:layout_width="70dp"
-			android:layout_height="wrap_content"
-			android:adjustViewBounds="true">
-
-			<ImageView
-				android:contentDescription="@string/content_description_linphone_contacts"
-				android:id="@+id/linphone_contacts"
-				android:src="@drawable/contacts_sip"
-				android:gravity="center"
-				android:padding="15dp"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"/>
-
-			<RelativeLayout
-				android:id="@+id/linphone_contacts_select"
-				android:contentDescription="@string/content_description_contacts"
-				android:background="@color/colorA"
-				android:layout_alignRight="@id/linphone_contacts"
-				android:layout_width="match_parent"
-				android:layout_height="5dp"
-				android:visibility="invisible"
-				android:layout_alignParentBottom="true"/>
-
-		</RelativeLayout>
-
-		<ImageView
-			android:id="@+id/newContact"
-			android:src="@drawable/contact_add"
-			android:contentDescription="@string/content_description_new_contact"
-			android:layout_width="70dp"
-			android:layout_height="match_parent"
-			android:layout_toLeftOf="@id/edit"
-			android:padding="15dp"
-			android:adjustViewBounds="true"/>
-
-		<ImageView
-			android:id="@+id/edit"
-			android:src="@drawable/edit_list_button"
-			android:background="@drawable/toolbar_button"
-			android:contentDescription="@string/content_description_edit"
-			android:layout_width="70dp"
-			android:layout_height="match_parent"
-			android:layout_alignParentRight="true"
-			android:padding="15dp"
-			android:adjustViewBounds="true"/>
-	</RelativeLayout>
-
-	<include layout="@layout/edit_list"/>
-
-	<RelativeLayout
+	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:orientation="horizontal"
 		android:layout_margin="10dp">
 
 		<EditText
             android:contentDescription="@string/content_description_search"
 			android:textCursorDrawable="@null"
 			android:id="@+id/searchField"
+			android:layout_weight="0.15"
 			android:layout_width="match_parent"
 			android:layout_height="40dp"
-			android:textColor="@android:color/black"
+			android:paddingLeft="10dp"
+			android:textColorHint="@color/colorE"
+			android:hint="@string/search_contact"
+			android:textColor="@color/colorC"
 			android:background="@drawable/resizable_textfield"
-			android:gravity="center"
-			android:paddingRight="5dp"
 			android:inputType="textPersonName"/>
 
 		<ImageView
 			android:contentDescription="@string/content_description_cancel"
 			android:id="@+id/clearSearchField"
-			android:layout_width="30dp"
+			android:layout_weight="0.9"
+			android:layout_width="match_parent"
 			android:layout_height="30dp"
-			android:src="@drawable/clean_field_default"
-			android:layout_centerVertical="true"
-			android:layout_alignParentRight="true"
-			android:paddingLeft="5dp"
-			android:paddingRight="5dp"/>
+			android:src="@drawable/clean_field_button"
+			android:layout_gravity="center"
+			android:layout_marginLeft="5dp"/>
 
-	</RelativeLayout>
+	</LinearLayout>
 
 	<RelativeLayout
 		android:layout_width="match_parent"
@@ -129,7 +45,7 @@
 			android:id="@+id/contactsList"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:divider="@color/colorE"
+			android:divider="@color/colorF"
 			android:fastScrollAlwaysVisible="true"
 			android:fastScrollEnabled="true"
 			android:dividerHeight="1dp" />
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index 8c549233d..658980d56 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -2,11 +2,11 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-  	android:background="@color/colorH">
+  	android:background="@color/colorC">
 
 	<RelativeLayout
 		android:id="@+id/address_bar"
-		android:background="@color/colorF"
+		android:background="@color/colorG"
 		android:layout_width="match_parent"
 		android:layout_height="60dp"
 		android:layout_marginBottom="10dp"
@@ -14,7 +14,7 @@
 
 		<org.linphone.ui.EraseButton
 			android:id="@+id/erase"
-			android:src="@drawable/backspace"
+			android:src="@drawable/erase_button"
 			android:layout_width="40dp"
 			android:layout_height="wrap_content"
 			android:layout_alignParentRight="true"
@@ -24,9 +24,9 @@
 
 		<org.linphone.ui.AddressText
 			android:id="@+id/address"
-			android:background="@color/colorF"
+			android:background="@color/colorG"
 			android:textColorHint="@color/colorE"
-			style="@style/font5"
+			style="@style/font1"
 			android:ellipsize="start"
 			android:inputType="textEmailAddress"
 			android:hint="@string/address_bar_hint"
@@ -46,23 +46,14 @@
         android:layout_width="match_parent"
         android:layout_height="70dp">
 
-		<RelativeLayout
-			android:focusable="true"
-			android:layout_width="match_parent"
+		<ImageView
+			android:id="@+id/back"
+			android:src="@drawable/dialer_alt_back"
+			android:background="@drawable/button_back_background"
+			android:layout_width="102dp"
 			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:adjustViewBounds="true">
-
-			<ImageView
-				android:id="@+id/add_contact"
-				android:src="@drawable/contact_add_button"
-				android:background="@drawable/toolbar_button"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:padding="20dp"
-				android:layout_alignParentBottom="true"/>
-
-		</RelativeLayout>
+			android:padding="20dp"
+			android:visibility="gone"/>
 
         <org.linphone.ui.CallButton
 			android:id="@+id/call"
@@ -85,4 +76,14 @@
         android:layout_below="@id/address_bar"
 		android:layout_centerInParent="true"/>
 
+	<ScrollView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/scrollView"
+		android:layout_alignParentBottom="true"
+		android:layout_alignParentLeft="true"
+		android:layout_alignParentStart="true"
+		android:layout_marginLeft="478dp"
+		android:layout_marginStart="478dp"/>
+
 </RelativeLayout>
diff --git a/res/layout/dialog.xml b/res/layout/dialog.xml
index 7dde3504d..d32620150 100644
--- a/res/layout/dialog.xml
+++ b/res/layout/dialog.xml
@@ -7,7 +7,8 @@
 
 	<TextView
 		android:id="@+id/customText"
-		style="@style/font14"
+		style="@style/font4"
+		android:layout_margin="20dp"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:gravity="center"
@@ -18,24 +19,25 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"
 		android:gravity="center"
-		android:orientation="horizontal">
-
-		<Button
-			android:id="@+id/cancel"
-			android:text="@string/cancel"
-			android:background="@drawable/resizable_cancel_button"
-			style="@style/font8"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_margin="10dp"
-			android:padding="10dp"/>
+		android:layout_margin="20dp"
+		android:orientation="vertical">
 
 		<Button
 			android:id="@+id/delete"
 			android:text="@string/delete"
 			android:background="@drawable/resizable_confirm_delete_button"
-			style="@style/font15"
-			android:layout_width="wrap_content"
+			style="@style/font5"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="10dp"
+			android:padding="10dp"/>
+
+		<Button
+			android:id="@+id/cancel"
+			android:text="@string/cancel"
+			android:background="@drawable/resizable_cancel_button"
+			style="@style/font5"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_margin="10dp"
 			android:padding="10dp"/>
diff --git a/res/layout/edit_contact.xml b/res/layout/edit_contact.xml
index 6b33c9870..ea8bdc401 100644
--- a/res/layout/edit_contact.xml
+++ b/res/layout/edit_contact.xml
@@ -14,7 +14,6 @@
 		<ImageView
 			android:id="@+id/back"
 			android:src="@drawable/back"
-			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_back"
 			android:layout_width="70dp"
 			android:layout_height="match_parent"
@@ -63,34 +62,15 @@
 				android:gravity="center"
 				android:orientation="vertical">
 
-				<RelativeLayout
-					android:id="@+id/avatar_layout"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:gravity="center">
-
-					<ImageView
-						android:id="@+id/contact_picture"
-						android:src="@drawable/avatar"
-						android:contentDescription="@string/content_description_contact_picture"
-						android:layout_width="100dp"
-						android:layout_height="100dp"
-						android:adjustViewBounds="true"
-						android:layout_alignParentLeft="true"
-						android:layout_marginLeft="5dp"/>
-
-					<ImageView
-						android:id="@+id/mask"
-						android:src="@drawable/avatar_mask"
-						android:contentDescription="@string/content_description_contact_picture"
-						android:layout_width="100dp"
-						android:layout_height="100dp"
-						android:adjustViewBounds="true"
-						android:layout_alignParentLeft="true"
-						android:layout_marginLeft="5dp"/>
-
-				</RelativeLayout>
-
+				<ImageView
+					android:id="@+id/contact_picture"
+					android:src="@drawable/avatar"
+					android:contentDescription="@string/content_description_contact_picture"
+					android:layout_width="100dp"
+					android:layout_height="100dp"
+					android:adjustViewBounds="true"
+					android:layout_alignParentLeft="true"
+					android:layout_marginLeft="5dp"/>
 
 				<TextView
 					android:text="@string/contact_last_name"
@@ -152,7 +132,6 @@
 
 					<ImageView
 						android:id="@+id/add_address_field"
-						android:src="@drawable/add_field_default"
 						android:contentDescription="@string/content_description_add"
 						android:layout_alignParentRight="true"
 						android:layout_width="30dp"
@@ -191,7 +170,6 @@
 
 					<ImageView
 						android:id="@+id/add_number_field"
-						android:src="@drawable/add_field_default"
 						android:contentDescription="@string/content_description_add"
 						android:layout_alignParentRight="true"
 						android:layout_width="30dp"
diff --git a/res/layout/edit_list.xml b/res/layout/edit_list.xml
index 08d995487..d74448092 100644
--- a/res/layout/edit_list.xml
+++ b/res/layout/edit_list.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/edit_list"
-	android:background="@color/colorF"
+	android:background="@color/colorG"
 	android:layout_width="match_parent"
 	android:layout_height="60dp"
 	android:visibility="gone">
 
 	<ImageView
 		android:id="@+id/cancel"
-		android:src="@drawable/cancel_edit"
-		android:background="@drawable/toolbar_button"
+		android:src="@drawable/cancel_button"
 		android:contentDescription="@string/content_description_valid"
 		android:layout_width="70dp"
 		android:layout_height="match_parent"
@@ -18,8 +17,7 @@
 
 	<ImageView
 		android:id="@+id/delete"
-		android:src="@drawable/delete"
-		android:background="@drawable/toolbar_button"
+		android:src="@drawable/delete_button"
 		android:contentDescription="@string/content_description_valid"
 		android:layout_width="70dp"
 		android:layout_height="match_parent"
@@ -28,8 +26,7 @@
 
 	<ImageView
 		android:id="@+id/select_all"
-		android:src="@drawable/select_all"
-		android:background="@drawable/toolbar_button"
+		android:src="@drawable/select_all_button"
 		android:contentDescription="@string/content_description_valid"
 		android:layout_width="70dp"
 		android:layout_height="match_parent"
@@ -38,8 +35,7 @@
 
 	<ImageView
 		android:id="@+id/deselect_all"
-		android:src="@drawable/deselect_all"
-		android:background="@drawable/toolbar_button"
+		android:src="@drawable/deselect_all_button"
 		android:contentDescription="@string/content_description_valid"
 		android:layout_width="70dp"
 		android:layout_height="match_parent"
diff --git a/res/layout/history.xml b/res/layout/history.xml
index 888fffc42..580396ac3 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -2,79 +2,49 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="@color/colorH"
+	android:background="@color/colorG"
 	android:orientation="vertical" >
 
 	<RelativeLayout
 		android:id="@+id/top_bar"
-		android:background="@color/colorF"
+		android:background="@color/colorG"
 		android:layout_width="match_parent"
 		android:layout_height="60dp"
 		android:layout_gravity="top">
 
-		<RelativeLayout
-			android:id="@+id/all_calls_layout"
-			android:layout_width="70dp"
-			android:layout_height="match_parent">
+		<ImageView
+			android:id="@+id/all_calls"
+			android:src="@drawable/history_all_button"
+			android:contentDescription="@string/content_description_all_calls"
+			android:padding="15dp"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"/>
 
-			<ImageView
-				android:id="@+id/all_calls"
-				android:src="@drawable/history_all"
-				android:background="@drawable/toolbar_button"
-				android:contentDescription="@string/content_description_all_calls"
-				android:gravity="center"
-				android:padding="15dp"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"/>
-
-			<RelativeLayout
-				android:id="@+id/all_calls_select"
-				android:background="@color/colorA"
-				android:contentDescription="@string/content_description_contacts"
-				android:layout_alignRight="@id/all_calls"
-				android:layout_width="match_parent"
-				android:layout_height="5dp"
-				android:layout_alignParentBottom="true"/>
-
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_toRightOf="@id/all_calls_layout"
-			android:layout_width="70dp"
+		<ImageView
+			android:id="@+id/missed_calls"
+			android:src="@drawable/history_missed_button"
+			android:contentDescription="@string/content_description_missed_calls"
+			android:padding="15dp"
+			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
-			android:adjustViewBounds="true">
-
-			<ImageView
-				android:id="@+id/missed_calls"
-				android:src="@drawable/history_missed"
-				android:background="@drawable/toolbar_button"
-				android:contentDescription="@string/content_description_missed_calls"
-				android:gravity="center"
-				android:padding="15dp"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"/>
-
-			<RelativeLayout
-				android:id="@+id/missed_calls_select"
-				android:background="@color/colorA"
-				android:contentDescription="@string/content_description_contacts"
-				android:layout_alignRight="@id/missed_calls"
-				android:layout_width="match_parent"
-				android:layout_height="5dp"
-				android:layout_alignParentBottom="true"
-				android:visibility="gone"/>
-
-		</RelativeLayout>
+			android:layout_alignParentTop="true"
+			android:layout_toRightOf="@+id/all_calls"
+			android:layout_toEndOf="@+id/all_calls"/>
 
 		<ImageView
 			android:id="@+id/edit"
 			android:src="@drawable/edit_list_button"
-			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_edit"
 			android:layout_width="70dp"
 			android:layout_height="match_parent"
 			android:layout_alignParentRight="true"
 			android:padding="15dp"/>
+
+		<View
+			android:background="@color/colorF"
+			android:layout_alignParentBottom="true"
+			android:layout_width="match_parent"
+			android:layout_height="1dp"/>
 	</RelativeLayout>
 
 	<include layout="@layout/edit_list"/>
@@ -83,14 +53,14 @@
 		android:id="@+id/history_list"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:divider="@color/colorE"
+		android:divider="@color/colorF"
 		android:cacheColorHint="@color/transparent"
 		android:dividerHeight="1dp" />
 
 	<TextView
 		android:id="@+id/no_call_history"
 		android:text="@string/no_call_history"
-		style="@style/font6"
+		style="@style/font14"
 		android:visibility="gone"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
@@ -99,7 +69,7 @@
 	<TextView
 		android:id="@+id/no_missed_call_history"
 		android:text="@string/no_missed_call_history"
-		style="@style/font6"
+		style="@style/font14"
 		android:visibility="gone"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
diff --git a/res/layout/history_cell.xml b/res/layout/history_cell.xml
index 026ac64ba..04b582b15 100644
--- a/res/layout/history_cell.xml
+++ b/res/layout/history_cell.xml
@@ -2,30 +2,19 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="@color/colorH"
+	android:background="@color/colorG"
 	android:gravity="center_vertical"
 	android:orientation="vertical" >
 
-	<LinearLayout
+	<TextView
 		android:id="@+id/separator"
+		style="@style/font8"
+		android:textStyle="bold"
+		android:background="@color/colorA"
+		android:textAllCaps="true"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="vertical">
-
-		<TextView
-			android:id="@+id/separator_text"
-			style="@style/font1"
-			android:layout_width="match_parent"
-			android:layout_height="40dp"
-			android:gravity="center"/>
-
-		<ImageView
-			android:background="@color/colorE"
-			android:layout_width="match_parent"
-			android:layout_height="1dp"/>
-
-	</LinearLayout>
-
+		android:layout_height="35dp"
+		android:gravity="center"/>
 
 	<RelativeLayout
 		android:layout_width="match_parent"
@@ -33,40 +22,22 @@
 		android:layout_margin="5dp"
 		android:gravity="center_vertical">
 
-		<RelativeLayout
-			android:id="@+id/avatar_layout"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:gravity="center">
-
-			<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"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="5dp"/>
-
-			<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"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="5dp"/>
-
-		</RelativeLayout>
+		<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"
+			android:layout_alignParentLeft="true"
+			android:layout_marginLeft="5dp"/>
 
 		<ImageView
 			android:id="@+id/icon"
 			android:src="@drawable/call_status_incoming"
 			android:contentDescription="@string/content_description_call_direction"
 			android:padding="7dp"
-			android:layout_toRightOf="@id/avatar_layout"
+			android:layout_toRightOf="@id/contact_picture"
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
 			android:adjustViewBounds="true"
@@ -76,7 +47,7 @@
 			android:id="@+id/detail"
 			android:src="@drawable/list_detail"
 			android:contentDescription="@string/content_description_detail"
-			android:layout_width="wrap_content"
+			android:layout_width="35dp"
 			android:layout_height="match_parent"
 			android:layout_alignParentRight="true"
 			android:adjustViewBounds="true"
@@ -96,7 +67,7 @@
 
 		<TextView
 			android:id="@+id/sip_uri"
-			style="@style/font6"
+			style="@style/font2"
 			android:lines="1"
 			android:ellipsize="marquee"
 			android:marqueeRepeatLimit="marquee_forever"
diff --git a/res/layout/history_detail.xml b/res/layout/history_detail.xml
index 186ec33c4..b7c851689 100644
--- a/res/layout/history_detail.xml
+++ b/res/layout/history_detail.xml
@@ -1,20 +1,18 @@
 <?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" >
 
 	<RelativeLayout
-		android:background="@color/colorF"
 		android:layout_width="match_parent"
 		android:layout_height="60dp"
 		android:layout_gravity="bottom">
 
 		<ImageView
 			android:id="@+id/back"
-			android:src="@drawable/back"
-			android:background="@drawable/toolbar_button"
+			android:src="@drawable/back_button"
 			android:contentDescription="@string/content_description_back"
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
@@ -22,83 +20,80 @@
 			android:padding="20dp"
 			android:adjustViewBounds="true"/>
 
-
-		<ImageView
-			android:id="@+id/add_contact"
-			android:src="@drawable/contact_add"
-			android:background="@drawable/toolbar_button"
-			android:contentDescription="@string/content_description_add_contact"
-			android:layout_alignParentRight="true"
-			android:padding="15dp"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:adjustViewBounds="true"/>
-
+		<View
+			android:background="@color/colorF"
+			android:layout_alignParentBottom="true"
+			android:layout_width="match_parent"
+			android:layout_height="1dp"/>
 	</RelativeLayout>
     
     <LinearLayout 
 	    android:layout_width="match_parent"
 	    android:layout_height="wrap_content"
-	    android:paddingTop="20dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-	    android:gravity="center"
-	    android:orientation="vertical">
+	    android:padding="20dp"
+	    android:orientation="horizontal">
 
+		<ImageView
+			android:id="@+id/contact_picture"
+			android:src="@drawable/avatar"
+			android:contentDescription="@string/content_description_contact_picture"
+			android:layout_width="80dp"
+			android:layout_height="80dp"
+			android:adjustViewBounds="true"
+			android:layout_alignParentLeft="true"
+			android:layout_marginLeft="5dp"/>
 
-		<RelativeLayout
-			android:id="@+id/avatar_layout"
-			android:layout_width="match_parent"
+		<LinearLayout
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:gravity="center">
+			android:paddingLeft="10dp"
+			android:orientation="vertical">
 
-			<ImageView
-				android:id="@+id/contact_picture"
-				android:src="@drawable/avatar"
-				android:contentDescription="@string/content_description_contact_picture"
-				android:layout_width="100dp"
-				android:layout_height="100dp"
-				android:adjustViewBounds="true"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="5dp"/>
+			<TextView
+				android:id="@+id/contact_name"
+				style="@style/font13"
+				android:lines="2"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
 
-			<ImageView
-				android:id="@+id/mask"
-				android:src="@drawable/avatar_mask"
-				android:contentDescription="@string/content_description_contact_picture"
-				android:layout_width="100dp"
-				android:layout_height="100dp"
-				android:adjustViewBounds="true"
-				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="5dp"/>
+			<TextView
+				android:id="@+id/contact_function"
+				style="@style/font2"
+				android:singleLine="true"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"/>
 
-		</RelativeLayout>
-
-		<TextView
-			android:id="@+id/contact_name"
-			style="@style/font5"
-			android:singleLine="true"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
-	        
-		<TextView
-			android:id="@+id/contact_address"
-			style="@style/font2"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
+		</LinearLayout>
 
     </LinearLayout>
-    
+
+	<TextView
+		android:text="@string/address_sip"
+		style="@style/font8"
+		android:textStyle="bold"
+		android:background="@color/colorA"
+		android:textAllCaps="true"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		android:gravity="center"/>
+
+	<TextView
+		android:id="@+id/contact_address"
+		style="@style/font2"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:padding="2dp"
+		android:layout_gravity="center"/>
+
     <LinearLayout
 	    android:layout_width="match_parent"
 	    android:layout_height="wrap_content"
-	    android:paddingTop="20dp"
 		android:gravity="center"
 		android:orientation="horizontal">
 
 		<ImageView
 			android:id="@+id/call"
-			android:src="@drawable/call_start_body_default"
+			android:src="@drawable/call_start_button"
 			android:contentDescription="@string/content_description_dial_back"
 			android:layout_width="60dp"
 			android:layout_height="60dp"
@@ -108,7 +103,7 @@
 
 		<ImageView
 			android:id="@+id/chat"
-			android:src="@drawable/chat_start_body_default"
+			android:src="@drawable/chat_start_button"
 			android:contentDescription="@string/content_description_chat"
 			android:layout_width="60dp"
 			android:layout_height="60dp"
@@ -123,19 +118,12 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
-		android:paddingTop="20dp">
-
-		<View
-			android:background="@color/colorE"
-			android:layout_width="wrap_content"
-			android:layout_height="1dp"
-			android:layout_marginLeft="10dp"
-			android:layout_marginRight="10dp"/>
+		android:paddingTop="5dp">
 
 		<TextView
-			android:text="@string/call"
-			style="@style/font13"
-			android:textAllCaps="true"
+			android:id="@+id/direction"
+			android:text="@string/history_log_label"
+			style="@style/font9"
 			android:layout_marginTop="2dp"
 			android:layout_gravity="center"
 			android:layout_width="wrap_content"
@@ -148,24 +136,15 @@
 			android:gravity="center"
 			android:padding="10dp">
 
-			<ImageView
-				android:id="@+id/direction"
-				android:paddingLeft="10dp"
-				android:paddingRight="10dp"
-				android:paddingTop="10dp"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
-
 			<TextView
 				android:id="@+id/date"
-				style="@style/font10"
-				android:paddingRight="10dp"
+				style="@style/font2"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"/>
 
 			<TextView
 				android:id="@+id/time"
-				style="@style/font10"
+				style="@style/font2"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"/>
 
diff --git a/res/layout/launch_screen.xml b/res/layout/launch_screen.xml
index fb691d241..b39461f75 100644
--- a/res/layout/launch_screen.xml
+++ b/res/layout/launch_screen.xml
@@ -6,32 +6,26 @@
 
 	<LinearLayout
 		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_height="match_parent"
 		android:layout_gravity="center"
+		android:layout_marginBottom="20dp"
+		android:gravity="center"
 		android:orientation="vertical">
 
 		<ImageView
-			android:src="@drawable/splashscreen"
+			android:src="@drawable/logo_secure_phone"
 			android:layout_width="200dp"
 			android:layout_height="200dp"
 			android:layout_gravity="center"/>
 
 		<TextView
 			android:text="@string/app_name"
-			style="@style/font21"
+			style="@style/font6"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="20dp"
 			android:layout_gravity="center"/>
 
-		<TextView
-			android:text="@string/app_description"
-			android:textSize="28sp"
-			android:textColor="@color/colorA"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center"/>
-
 	</LinearLayout>
 
     <ProgressBar 
@@ -40,10 +34,11 @@
 		android:layout_marginBottom="20dp"
         android:layout_gravity="center_horizontal|bottom" />
 
-	<View
-		android:background="@color/colorA"
-		android:layout_height="10dp"
-		android:layout_width="100dp"
-		android:layout_gravity="center_horizontal|bottom" />
+	<ImageView
+		android:src="@drawable/logo_orange"
+		android:layout_width="80dp"
+		android:layout_height="80dp"
+		android:padding="10dp"
+		android:layout_gravity="right|bottom"/>
 
 </FrameLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 60cdb9bf8..50347f114 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -57,81 +57,49 @@
 					android:layout_height="match_parent">
 
 					<ImageView
+						android:id="@+id/history_image"
 						android:layout_width="match_parent"
 						android:layout_height="35dp"
 						android:layout_centerInParent="true"
 						android:contentDescription="@string/content_description_history"
-						android:src="@drawable/footer_history"
-						android:id="@+id/imageView"/>
-
-					<RelativeLayout
-						android:id="@+id/history_select"
-						android:background="@color/colorA"
-						android:layout_width="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"
-						android:visibility="gone" />
+						android:src="@drawable/footer_history"/>
 
 					<TextView
 						android:id="@+id/missedCalls"
-						style="@style/font18"
+						style="@style/font7"
 						android:layout_width="25dp"
 						android:layout_height="25dp"
 						android:layout_margin="12dp"
 						android:background="@drawable/history_chat_indicator"
+						android:visibility="gone"
 						android:gravity="center"
-						android:visibility="gone"/>
-
-				</RelativeLayout>
-
-				<RelativeLayout
-					android:id="@+id/contacts"
-					android:background="@drawable/footer_button"
-					android:layout_weight="1"
-					android:layout_width="0dp"
-					android:layout_height="match_parent"
-					android:adjustViewBounds="true">
-
-					<ImageView
-						android:src="@drawable/footer_contacts"
-						android:contentDescription="@string/content_description_contacts"
-						android:layout_width="match_parent"
-						android:layout_height="35dp"
-						android:layout_centerInParent="true" />
-
-					<RelativeLayout
-						android:id="@+id/contacts_select"
-						android:background="@color/colorA"
-						android:layout_width="match_parent"
-						android:layout_height="5dp"
 						android:layout_alignParentBottom="true"
-						android:visibility="gone" />
+						android:layout_alignParentRight="true"/>
+
 				</RelativeLayout>
 
-
-				<RelativeLayout
-					android:id="@+id/dialer"
+				<ImageView
+					android:id="@+id/contacts"
+					android:src="@drawable/footer_contacts"
 					android:background="@drawable/footer_button"
+					android:contentDescription="@string/content_description_contacts"
 					android:layout_weight="1"
 					android:layout_width="0dp"
 					android:layout_height="match_parent"
-					android:adjustViewBounds="true">
+					android:padding="18dp"
+					android:layout_centerInParent="true" />
 
-					<ImageView
-						android:src="@drawable/footer_dialer"
-						android:contentDescription="@string/content_description_dialer"
-						android:layout_width="match_parent"
-						android:layout_height="35dp"
-						android:layout_centerInParent="true"/>
+				<ImageView
+					android:id="@+id/dialer"
+					android:src="@drawable/footer_dialer"
+					android:background="@drawable/footer_button"
+					android:contentDescription="@string/content_description_dialer"
+					android:layout_weight="1"
+					android:layout_width="0dp"
+					android:layout_height="match_parent"
+					android:padding="18dp"
+					android:layout_centerInParent="true"/>
 
-					<RelativeLayout
-						android:id="@+id/dialer_select"
-						android:background="@color/colorA"
-						android:layout_width="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"/>
-
-				</RelativeLayout>
 
 				<RelativeLayout
 					android:id="@+id/chat"
@@ -141,29 +109,24 @@
 					android:layout_height="match_parent">
 
 					<ImageView
+						android:id="@+id/chat_image"
 						android:src="@drawable/footer_chat"
 						android:contentDescription="@string/content_description_chat"
 						android:layout_width="match_parent"
 						android:layout_height="35dp"
 						android:layout_centerInParent="true" />
 
-					<RelativeLayout
-						android:id="@+id/chat_select"
-						android:background="@color/colorA"
-						android:layout_width="match_parent"
-						android:layout_height="5dp"
-						android:layout_alignParentBottom="true"
-						android:visibility="gone"/>
-
 					<TextView
 						android:id="@+id/missedChats"
-						style="@style/font18"
+						style="@style/font7"
 						android:layout_width="25dp"
 						android:layout_height="25dp"
 						android:layout_margin="12dp"
 						android:background="@drawable/history_chat_indicator"
+						android:visibility="gone"
 						android:gravity="center"
-						android:visibility="gone" />
+						android:layout_alignParentBottom="true"
+						android:layout_alignParentRight="true"/>
 
 				</RelativeLayout>
 			</LinearLayout>
@@ -207,9 +170,9 @@
 				android:layout_height="match_parent"
 				android:choiceMode="singleChoice"
 				android:divider="@color/colorE"
-				android:listSelector="@color/colorH"
+				android:listSelector="@color/colorG"
 				android:dividerHeight="1dp"
-				android:background="@color/colorH"/>
+				android:background="@color/colorG"/>
 		</LinearLayout>
 
 		<RelativeLayout
@@ -217,7 +180,7 @@
 			android:gravity="bottom"
 			android:layout_alignParentBottom="true"
 			android:layout_width="match_parent"
-			android:layout_height="50dp"
+			android:layout_height="60dp"
 			android:background="@color/colorA">
 
 			<ImageView
@@ -226,13 +189,12 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_alignParentLeft="true"
-				android:padding="5dp"
 				android:layout_centerVertical="true" />
 
 			<TextView
 				android:id="@+id/quit"
 				android:text="@string/quit"
-				style="@style/font14"
+				style="@style/font8"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_toRightOf="@id/quit_button"
diff --git a/res/layout/search_contact_cell.xml b/res/layout/search_contact_cell.xml
index 69de1b610..a521bcb07 100644
--- a/res/layout/search_contact_cell.xml
+++ b/res/layout/search_contact_cell.xml
@@ -4,21 +4,21 @@
     android:layout_width="match_parent"
     android:layout_height="50dp"
     android:gravity="center_vertical"
-    android:background="@drawable/list_selector"
+    android:background="@color/colorG"
     android:orientation="vertical" >
 
 	<TextView
 		android:id="@+id/Contact_name"
 		android:lines="1"
+		style="@style/font2"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_toRightOf="@id/icon"
-		android:layout_centerVertical="true"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		android:textColor="@color/colorB" />
+		android:layout_centerVertical="true" />
 
 	<TextView
 		android:id="@+id/contact_address"
+		style="@style/font9"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_alignParentRight="true"
diff --git a/res/layout/side_menu_default_account.xml b/res/layout/side_menu_default_account.xml
index cc8c5a8a3..551e9b481 100644
--- a/res/layout/side_menu_default_account.xml
+++ b/res/layout/side_menu_default_account.xml
@@ -8,8 +8,8 @@
 	<ImageView
 		android:id="@+id/icon"
 		android:src="@drawable/avatar"
-		android:layout_width="30dp"
-		android:layout_height="30dp"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
 		android:layout_marginLeft="12dp"
 		android:layout_marginRight="12dp"
 		android:layout_centerVertical="true" />
@@ -24,14 +24,14 @@
 
 		<TextView
 			android:id="@+id/display_name"
-			style="@style/font7"
+			style="@style/font3"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:editable="false"/>
 
 		<TextView
 			android:id="@+id/address"
-			style="@style/font3"
+			style="@style/font12"
 			android:editable="false"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"/>
@@ -42,7 +42,7 @@
 		android:id="@+id/status_led"
 		android:layout_width="25dp"
 		android:layout_height="25dp"
-		android:src="@drawable/status_available"
+		android:src="@drawable/led_connected"
 		android:padding="5dp"
 		android:layout_marginBottom="10dp"
 		android:layout_alignParentRight="true"
diff --git a/res/layout/side_menu_item.xml b/res/layout/side_menu_item.xml
index 8ff9cbe10..2ad6b7a81 100644
--- a/res/layout/side_menu_item.xml
+++ b/res/layout/side_menu_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@android:id/text1"
-	style="@style/font6"
+	style="@style/font2"
 	android:layout_width="match_parent"
 	android:layout_height="50dp"
 	android:gravity="center_vertical"
diff --git a/res/layout/status.xml b/res/layout/status.xml
index f6bcc9450..e3da91bcb 100644
--- a/res/layout/status.xml
+++ b/res/layout/status.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/status"
-	android:background="@color/colorA"
+	android:background="@color/colorC"
     android:layout_width="match_parent"
     android:layout_height="40dp"
     android:orientation="horizontal">
@@ -45,7 +45,7 @@
 		<TextView
 			android:id="@+id/status_text"
 			android:text="@string/status_not_connected"
-			style="@style/font16"
+			style="@style/font7"
 			android:paddingLeft="5dp"
 			android:layout_centerVertical="true"
 			android:layout_width="wrap_content"
diff --git a/res/layout/toast.xml b/res/layout/toast.xml
index 12b51c18d..93a526fae 100644
--- a/res/layout/toast.xml
+++ b/res/layout/toast.xml
@@ -3,7 +3,7 @@
 	android:id="@+id/toastRoot"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:background="@color/colorB"
+	android:background="@color/colorC"
 	android:orientation="vertical" >
 	
 	<TextView
diff --git a/res/layout/zrtp_dialog.xml b/res/layout/zrtp_dialog.xml
deleted file mode 100644
index 33ba216eb..000000000
--- a/res/layout/zrtp_dialog.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/toastRoot"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:background="@color/colorB"
-	android:orientation="vertical" >
-	
-	<TextView
-		android:id="@+id/toastMessage"
-		android:textColor="@android:color/black"
-		android:layout_marginTop="5dp"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" />
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-		
-		<ImageView
-		   android:id="@+id/toastNotOK"
-		   android:src="@drawable/security_pending"
-		   android:layout_weight="1"
-		   android:layout_marginTop="10dp"
-		   android:layout_gravity="center_horizontal"
-		   android:adjustViewBounds="true"
-		   android:layout_width="match_parent"
-		   android:layout_height="wrap_content" />
-		
-		<ImageView
-		   android:id="@+id/toastOK"
-		   android:src="@drawable/security_ok"
-		   android:layout_weight="1"
-		   android:layout_marginTop="10dp"
-		   android:layout_gravity="center_horizontal"
-		   android:adjustViewBounds="true"
-		   android:layout_width="match_parent"
-		   android:layout_height="wrap_content" />
-	
-	</LinearLayout>
-
-</LinearLayout>
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 763694075..62874db7a 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -3,6 +3,7 @@ mtu=1300
 
 [app]
 animations=0
+show_login_view=1
 
 [sip]
 guess_hostname=1
diff --git a/res/values-ar/custom.xml b/res/values-ar/custom.xml
deleted file mode 100644
index 2cb1d57b2..000000000
--- a/res/values-ar/custom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="history_date_format">d MMM</string>
-  <string name="history_detail_date_format">EEEE MMM d HH:mm</string>
-  <string name="messages_date_format">HH:mm d MMM</string>
-  <string name="today_date_format">HH:mm</string>
-  <string name="picture_name_format">linphone-mms-%s.jpg</string>
-  <string name="app_name">لِنْفُونْ</string>
-  <string name="service_name">خدمة لِنْفُونْ</string>
-  <string name="addressbook_label">لِنْفُونْ</string>
-  <string name="notification_title">لِنْفُونْ</string>
-  <string name="wait_dialog_text">يجري التشغيل</string>
-  <string name="notification_registered">مُسجَّل في %s</string>
-  <string name="notification_register_failure">فشِل التسجيل في %s</string>
-  <string name="about_text">لِنْفُونْ %s الهاتف الموافق لـ SIP (rfc 3261) برخصة جْنُو العمومية الإصدار 2</string>
-  <string name="setup_welcome">سيمكنك هذا المرشد من إعداد حسابك SIP لإجراء المكالمات.</string>
-  <string name="setup_create_account">إنشاء حساب في linphone.org</string>
-  <string name="setup_login_linphone">أتوفر على حساب في linphone.org</string>
-  <string name="setup_login_generic">أتوفر على حساب SIP</string>
-  <string name="setup_linphone_account_hint">ادخل إسم المستخدم وكلمة السر لحسابك في linphone.org</string>
-  <string name="setup_general_account_hint">ادخل إسم المستخدم وكلمة السر وكذا نطاق SIP.</string>
-  <string name="setup_username_hint">إسم المستخدم</string>
-  <string name="button_sip_contacts">SIP</string>
-  <string name="tunnel_host"></string>
-</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
deleted file mode 100644
index 765e747a9..000000000
--- a/res/values-ar/strings.xml
+++ /dev/null
@@ -1,404 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="pref_disable_account">إيقاف</string>
-  <string name="pref_tunnel">النفق</string>
-  <string name="pref_tunnel_host">إسم المضيف</string>
-  <string name="pref_tunnel_port">المنفذ</string>
-  <string name="pref_tunnel_mode">الوضع</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>غير مُشغَّل</item>
-    <item>3G فقط</item>
-    <item>دائما</item>
-    <item>تلقائي</item>
-  </string-array>
-  <string name="incall_notif_active">المكالمة الصوتية الجارية</string>
-  <string name="incall_notif_paused">المكالمة الموقَّفة مؤقتا الجارية</string>
-  <string name="incall_notif_video">المكالمة المرئية الجارية</string>
-  <string name="not_ready_to_make_new_call">غير جاهز لإجراء مكالمة جديدة</string>
-  <string name="bad_target_uri">جهة اتصال سيئة : %s</string>
-  <string name="reset_sas_fmt">إلغاء التحقق %s</string>
-  <string name="verify_sas_fmt">تحقق من %s</string>
-  <string name="communication_encrypted">مُعمَّى</string>
-  <string name="waiting_for_startup">يجري التشغيل...</string>
-  <string name="couldnt_accept_call">حدث خطأ خلال قبول المكالمة</string>
-  <string name="error_adding_new_call">خطأ خلال إضافة مكالمة</string>
-  <string name="transfer_started">بدأ التحويل</string>
-  <string name="transfer_dialog_title">تحويل المكالمة إلى</string>
-  <string name="transfer_to_new_call">مكالمة جديدة</string>
-  <string name="resume_dialog_title">استرجاع المكالمة</string>
-  <string name="cannot_resume_paused_by_remote_call">تعذر استرجاع المكالمة الموقَّفة مؤقتا من طرف المُراسِل</string>
-  <string name="conf_show_details_text">إظهار التفاصيل</string>
-  <string name="skipable_error_service_not_ready">تحذير : الخدمة غير جاهزة</string>
-  <string name="close_button_text">إغلاق</string>
-  <string name="status_conf_call">اجتماع</string>
-  <string name="status_active_call">نشيط</string>
-  <string name="state_paused">مُوقَّف مؤقتا</string>
-  <string name="state_paused_by_remote">مُوقَّف مؤقتا من طرف المُراسِل</string>
-  <string name="state_streams_running"></string>
-  <string name="state_incoming_received">وارد</string>
-  <string name="state_outgoing_ringing">يَرنّ</string>
-  <string name="state_outgoing_progress">يتصل</string>
-  <string name="mutemic_button_txt">كتم</string>
-  <string name="speaker_button_txt">مكبر الصوت</string>
-  <string name="bluetooth_button_txt">بلوتوث</string>
-  <string name="CancelButtonText">إلغاء</string>
-  <string name="AddCallButtonText">إضافة مكالمة</string>
-  <string name="TransferCallButtonText">تحويل المكالمة</string>
-  <string name="conf_admin_choice_enter">دخول اجتماع</string>
-  <string name="conf_admin_choice_leave">مغادرة الاجتماع مؤقتا </string>
-  <string name="conf_admin_choice_terminate">إنهاء الاجتماع</string>
-  <string name="hangup">ضع السماعة</string>
-  <string name="conf_simple_merge_bt_txt">دمج</string>
-  <string name="conf_simple_transfer_bt_txt">تحويل</string>
-  <string name="conf_simple_video_bt_txt">فيديو</string>
-  <!--<string name="conf_simple_no_current_call">No active call</string>-->
-  <string name="show_send_dtmfs_button">لوحة الاتصال الهاتفي</string>
-  <string name="conf_conference">اجتماع</string>
-  <string name="in_conf">أنت ضِمنها</string>
-  <string name="in_conf_leave">الخروج</string>
-  <string name="out_conf">أنت خارج الاجتماع</string>
-  <string name="out_conf_enter">الدخول</string>
-  <string name="pref_audio_hacks_title">تطويعات الصوت</string>
-  <string name="pref_audio_use_specific_mode_title">استخدم وضع محددا للتطويع</string>
-  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (افتراضي)، 2=MODE_IN_CALL</string>
-  <string name="pref_audio_hacks_use_routing_api_title">استخدم تطويعات API التوجيه</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">استخدم تطويعات الصوت لـ Galaxy S</string>
-  <string name="pref_audio_soft_volume_title">استخدام شدة صوت البرمجي</string>
-  <string name="pref_ipv6_title">استخدم ipv6 عوض ipv4</string>
-  <string name="error_while_accepting_pending_call">خطأ خلال قبول المكالمة المنتظرة</string>
-  <string name="incoming_call_dialog_title">%s يتصل بك</string>
-  <string name="accept">قبول</string>
-  <string name="decline">رفض</string>
-  <string name="unknown_incoming_call_name">مجهول</string>
-  <string name="pref_network_title">الشبكة</string>
-  <string name="pref_transport">النقل</string>
-  <string name="pref_transport_udp">UDP</string>
-  <string name="pref_transport_tcp">TCP</string>
-  <string name="pref_transport_tls">TLS</string>
-  <string name="pref_transport_use_random_ports">استخدم منافذ عشوائية</string>
-  <string name="pref_sip_port_title">منفذ SIP المُراد استخدامه</string>
-  <string name="at_least_a_protocol">عنصر واحد على الأقل ضروري</string>
-  <string name="first_launch_ok">نجح التسجيل</string>
-  <string name="error">خطأ</string>
-  <string name="click_to_show_first_login_view">البدء</string>
-  <string name="dialer_null_on_new_intent">التطبيق غير جاهز</string>
-  <string name="pref_add_account">إضافة حساب</string>
-  <string name="no_phone_numbers">لم يعثر على أرقام هاتف %s</string>
-  <string name="filter_contacts">ترشيح جهات الاتصال</string>
-  <string name="title_numbers_dialog">أرقام هاتف %s</string>
-  <string name="pref_delete_account">حذف هذا الحساب</string>
-  <string name="pref_default_account">استخدام كافتراضي</string>
-  <string name="pref_echo_canceller_calibration">معايرة مزيل الصدى</string>
-  <string name="pref_video_use_front_camera_title">استخدام الكاميرا الأمامية</string>
-  <string name="pref_video">الفيديو</string>
-  <string name="pref_preferences">التفضيلات</string>
-  <string name="pref_video_codecs_title">المراميز</string>
-  <string name="pref_preferred_video_size">حجم الفيديو المفضل</string>
-  <string name="menu_videocall_back_to_dialer_title">عرض لوحة المفاتيح</string>
-  <string name="menu_videocall_switch_camera_title">الكاميرا الأمامية/الخلفية</string>
-  <string name="menu_videocall_change_resolution_when_low_resolution">جرِّب الدقة العالية</string>
-  <string name="menu_videocall_change_resolution_when_high_resolution">منخفض الدقة</string>
-  <string name="menu_videocall_change_resolution_title">تغيير الدقة</string>
-  <string name="menu_videocall_toggle_camera_title">كتم/إزالة كتم الكاميرا</string>
-  <string name="menu_videocall_toggle_camera_disable">إيقاف الكاميرا</string>
-  <string name="menu_videocall_toggle_camera_enable">تشغيل الكاميرا</string>
-  <string name="menu_videocall_terminate_call_title">إنهاء المكالمة</string>
-  <string name="pref_video_settings_title">إعدادات الفيديو</string>
-  <string name="pref_video_automatically_share_my_video_title">شارك الكاميرا</string>
-  <string name="pref_video_automatically_accept_video_title">قبول طلبات الفيديو الواردة</string>
-  <string name="pref_video_automatically_share_my_video">أرسِل تلقائيا الكاميرا الخاصة بي</string>
-  <string name="pref_video_automatically_accept_video">قبول طلبات الفيديو دائما</string>
-  <string name="pref_video_initiate_call_with_video_title">بدء اتصالات بالصورة</string>
-  <string name="pref_video_initiate_call_with_video">أرسِل دائما طلبات الفيديو</string>
-  <string name="pref_video_enable_title">تشغيل الفيديو</string>
-  <string name="pref_animation_enable_title">تشغيل التحريكات</string>
-  <string name="pref_escape_plus">استبدال + بـ 00</string>
-  <string name="pref_ilbc_summary">قد يكون iLBC غير متاحة وذلك حسب معالج ARM وإصدار نظام تشغيل أندرويد.</string>
-  <string name="pref_echo_cancellation">إزالة الصدى</string>
-  <string name="pref_autostart">البدء خلال الإقلاع</string>
-  <string name="pref_enable_outbound_proxy">وسيط التوجُّه</string>
-  <string name="pref_codecs">المراميز</string>
-  <string name="pref_communication_expire_title">مهلة الاتصال</string>
-  <string name="pref_incoming_expire_title">مهلة المكالمة الواردة</string>
-  <string name="pref_video_port_title">منفذ الفيديو أو نطاق المنفذ</string>
-  <string name="pref_audio_port_title">منفذ الصوت أو نطاق المنفذ</string>
-  <string name="pref_video_port_description">منفذ الفيديو أو نطاق المنفذ (الأدنى – الأقصى)</string>
-  <string name="pref_audio_port_description">منفذ الصوت أو نطاق المنفذ (الأدنى – الأقصى)</string>
-  <string name="pref_incoming_call_timeout_title">مهلة المكالمة الواردة (بالثواني)</string>
-  <string name="place_call_chooser">إجراء مكالمة</string>
-  <string name="pref_adaptive_rate_control">التحكم في ملائمة الصبيب</string>
-  <string name="pref_adaptive_rate_algorithm">خوارزمية ملائمة الصبيب</string>
-  <string name="pref_codec_bitrate_limit">حد صبيب المِرماز</string>
-  <string-array name="limit_bitrate_entries">
-    <item>10 ك.بِتْ/ثانية</item>
-    <item>15 ك.بِتْ/ثانية</item>
-    <item>20 ك.بِتْ/ثانية</item>
-    <item>36 ك.بِتْ/ثانية</item>
-    <item>64 ك.بِتْ/ثانية</item>
-    <item>128 ك.بِتْ/ثانية</item>
-  </string-array>
-  <string name="pref_debug">التنقيح</string>
-  <string name="about_report_issue">ابلغْ عن عطب</string>
-  <string name="about_bugreport_email_text">اشرح المشكل هنا</string>
-  <string name="about_error_generating_bugreport_attachement">حدث خطأ في توليد تقرير العلل</string>
-  <string name="about_logs_not_found">لم يعثر على السجلات.</string>
-  <string name="about_reading_logs">يقرأ السجلات، قد تأخذ بعض الوقت...</string>
-  <string name="about_mailer_chooser_text">إرسال تقرير العلل مع...</string>
-  <string name="menu_about">حول</string>
-  <string name="menu_send_log">إرسال السجل</string>
-  <string name="menu_reset_log">إعادة تعيين السجل</string>
-  <string name="pref_audio">الصوت</string>
-  <string name="menu_exit">الخروج</string>
-  <string name="pref_prefix">البادِئة</string>
-  <string name="pref_advanced">متقدم</string>
-  <string name="menu_settings">اﻹعدادات</string>
-  <string name="pref_proxy">الوسيط</string>
-  <string name="pref_domain">النطاق*</string>
-  <string name="pref_passwd">كلمة السر*</string>
-  <string name="pref_username">إسم المستخدم*</string>
-  <string name="pref_sipaccount">حساب SIP</string>
-  <string name="wrong_username">إسم المستخدم خاطئ</string>
-  <string name="wrong_passwd">كلمة السر خاطئة</string>
-  <string name="wrong_domain">النطاق خاطئ</string>
-  <string name="wrong_settings">الإعدادات خاطئة</string>
-  <string name="tab_dialer">لوحة المفاتيح</string>
-  <string name="tab_contact">جهة الاتصال</string>
-  <string name="call_error">لا يمكن الاتصال بـ %s</string>
-  <string name="yes">نعم</string>
-  <string name="no">لا</string>
-  <string name="dismiss">تجاهل</string>
-  <string name="cont">استمرار</string>
-  <string name="never_remind">لا تذكرني أبدا</string>
-  <string name="config_error">%s، هل تريد الذهاب إلى صفحة الإعدادات ؟</string>
-  <string name="ec_calibration_launch_message">يبدأ في معايرة إزالة صدى الصوت</string>
-  <string name="warning_already_incall">تعذر بدء المكالمة لأنها جارية مسبقا</string>
-  <string name="tab_history">التاريخ</string>
-  <string name="warning_wrong_destination_address">تعذر تركيب عنوان الوجهة من  [%s]</string>
-  <string name="menu_clear_history">محو</string>
-  <string name="error_cannot_get_call_parameters">تعذر جلب مُعامِلات المكالمة</string>
-  <string name="error_cannot_create_default_parameters">تعذر إنشاء مُعامِلات المكالمة الافتراضية</string>
-  <string name="error_cannot_invite_address">تعذرت دعوة عنوان الوجهة [%s]</string>
-  <string name="notification_started">بدَأ</string>
-  <string name="pref_echo_cancellation_summary">إزالة الصدى المسموع من الطرف الآخر</string>
-  <string name="pref_stun_server">خادم STUN</string>
-  <string name="pref_ice_enable">تشغيل ICE</string>
-  <string name="pref_ice_enable_summary">يجب تهيئة خادم STUN لاستخدام ICE</string>
-  <string name="ec_calibrating">يُعايِر...</string>
-  <string name="ec_calibrated">تمت المعايرة [%s ميلي-ث]</string>
-  <string name="no_echo">لا وجود لصدى</string>
-  <string name="failed">فشِل</string>
-  <string name="first_login_explanation">ادخل إسم المستخدم وكلمة السر للاتصال بالخدمة.</string>
-  <string name="first_login_username">إسم المستخدم</string>
-  <string name="first_login_password">كلمة السر</string>
-  <string name="first_login_connect">اتصال</string>
-  <string name="first_launch_no_login_password">يُرجى إدخال إسم المستخدم وكلمة السر</string>
-  <string name="first_launch_bad_login_password">تعذر الاتصال ؛ تحقق من إسم المستخدم وكلمة السر ثم أعد مرة أخرى</string>
-  <string name="pref_amr_summary">لا وجود مِرماز AMR في هاتفك</string>
-  <string name="pref_media_encryption">وسيط التعمية</string>
-  <string name="media_encryption_none">بدون</string>
-  <string name="pref_video_codec_h264_unavailable">المِرماز غير مُشغَّل، ابْنِ التطبيق من مصادره لتشغيله</string>
-  <string name="pref_video_codec_mpeg4_unavailable">المِرماز غير مُشغَّل، ابْنِ التطبيق من مصادره لتشغيله</string>
-  <string name="pref_sipaccounts">حسابات SIP</string>
-  <string name="pref_wifi_only">استخدم WiFi فقط</string>
-  <string name="pref_push_notification">تشغيل إشعارات التنبيه</string>
-  <string name="wizard_failed">حدث خطأ، حاول لاحقا.</string>
-  <string name="wizard_server_unavailable">تعذر الوصول للخادم، تحقق من اتصالك باﻹنترنت.</string>
-  <string name="wizard_username_unavailable">إن إسم المستخدم هذا مُستعمَل.</string>
-  <string name="wizard_username_incorrect">إسم المستخدم غير صحيح.</string>
-  <string name="wizard_email_incorrect">عنوانك الإلكتروني غير صحيح.</string>
-  <string name="wizard_password_incorrect">كلمة السر غير صالحة (على الأقل 6 حروف).</string>
-  <string name="wizard_passwords_unmatched">كلمتا السر غير متطابقتين.</string>
-  <string name="pref_help_proxy">إسم مضيف وسيط SIP أو عنوان IP (اختياري)</string>
-  <string name="pref_help_outbound_proxy">توجيه كل المكالمات عبر وسيط SIP</string>
-  <string name="pref_help_username">مثلا : john إذا كان حسابك john@sip.example.org</string>
-  <string name="pref_help_domain">sip.example.org إذا كان حسابك john@sip.example.org</string>
-  <string name="pref_help_password">يجب عليك إدخال كلمة السر مرة أخرى إذا أردت تحرير إسم المستخدم أو النطاق</string>
-  <string name="delete">حذف</string>
-  <string name="chat">محادثة</string>
-  <string name="call">مكالمة</string>
-  <string name="add_to_contacts">إضافة إلى جهات الاتصال</string>
-  <string name="status_connected">مُسجَّل</string>
-  <string name="status_not_connected">غير مُسجَّل</string>
-  <string name="status_in_progress">يجري التسجيل</string>
-  <string name="status_error">فشِل التسجيل</string>
-  <string name="addressHint">الرقم أو العنوان</string>
-  <string name="conference">اجتماع</string>
-  <string name="incoming">المكالمة الواردة</string>
-  <string name="draft">مسودة</string>
-  <string name="new_fast_chat">ادخل عنوان SIP للتحدث مع...</string>
-  <string name="no_call_history">لا وجود لأي مكالمة في التاريخ.</string>
-  <string name="no_missed_call_history">لا وجود لأي مكالمة فائتة في التاريخ.</string>
-  <string name="no_contact">لا وجود لأي جهة اتصال في دفتر عناوينك.</string>
-  <string name="no_sip_contact">لا وجود لأي جهة اتصال SIP في دفتر عناوينك.</string>
-  <string name="no_chat_history">لا وجود لتاريخ أي محادثة.</string>
-  <string name="call_stats_audio">الصوت</string>
-  <string name="call_stats_video">الفيديو</string>
-  <string name="call_stats_codec">المِرماز :</string>
-  <string name="call_stats_upload">صبيب الرفع :</string>
-  <string name="call_stats_download">صبيب التنزيل :</string>
-  <string name="call_stats_ice">توصيل ICE :</string>
-  <string name="call_stats_video_resolution">حجم الفيديو :</string>
-  <!--Used by Android to help blind people by describing them images-->
-  <string name="content_description_add_contact">إضافة إلى زر جهات الاتصال</string>
-  <string name="content_description_new_contact">جهة اتصال جديدة</string>
-  <string name="content_description_call">مكالمة</string>
-  <string name="content_description_backspace">مسافة</string>
-  <string name="content_description_about">صفحة \"حَوْلَ\"</string>
-  <string name="content_description_chat">المحادثة</string>
-  <string name="content_description_dial_back">إعادة الاتصال</string>
-  <string name="content_description_contact_picture">صورة جهة الاتصال</string>
-  <string name="content_description_send_message">إرسال رسالة</string>
-  <string name="content_description_detail">التفاصيل</string>
-  <string name="content_description_delete">حذف الزر</string>
-  <string name="content_description_add">إضافة زر</string>
-  <string name="content_description_new_discussion">محادثة جديدة</string>
-  <string name="content_description_edit">تحرير الزر</string>
-  <string name="content_description_validate">التحقق من الزر</string>
-  <string name="content_description_search">بحث</string>
-  <string name="content_description_all_contacts">كل جهات الاتصال</string>
-  <string name="content_description_linphone_contacts">جهات اتصال Linphone</string>
-  <string name="content_description_call_direction">اتجاه الاتصال</string>
-  <string name="content_description_all_calls">كل الاتصالات</string>
-  <string name="content_description_missed_calls">الاتصالات الفائتة</string>
-  <string name="content_description_switch_video">تبديل الفيديو</string>
-  <string name="content_description_toggle_speaker">تبديل مكبر الصوت</string>
-  <string name="content_description_toggle_micro">تبديل الميكروفون</string>
-  <string name="content_description_add_call">إضافة مكالمة</string>
-  <string name="content_description_pause">توقيف مؤقت</string>
-  <string name="content_description_hang_up">ضع السماعة</string>
-  <string name="content_description_numpad">لوحة الأرقام</string>
-  <string name="content_description_settings">زر الإعدادات</string>
-  <string name="content_description_dialer">لوحة المفاتيح</string>
-  <string name="content_description_history">زر التاريخ</string>
-  <string name="content_description_chat_button">زر المحادثات</string>
-  <string name="content_description_contacts">رز جهات الاتصال</string>
-  <string name="content_description_led"></string>
-  <string name="content_description_call_quality">جودة المكالمة</string>
-  <string name="content_description_encryption">التعمية</string>
-  <string name="content_description_switch_camera">تبديل الكاميرا</string>
-  <string name="content_description_welcome">مرحبا بك في مرشد إعداد الحساب</string>
-  <string name="content_description_cancel">إلغاء</string>
-  <string name="content_description_cancel_button">زر الإلغاء</string>
-  <string name="content_description_next">زر التالي</string>
-  <string name="content_description_back">زر الرجوع</string>
-  <string name="content_description_setup_ok">موافق</string>
-  <string name="content_description_message_status">حالة الرسالة</string>
-  <string name="content_description_conference">اجتماع</string>
-  <string name="content_description_mark"></string>
-  <string name="setup_title">مرشد إعداد الحساب</string>
-  <string name="setup_apply">تطبيق</string>
-  <string name="setup_password_hint">كلمة السر</string>
-  <string name="setup_domain_hint">النطاق</string>
-  <string name="setup_password_confirm_hint">تأكيد كلمة السر</string>
-  <string name="setup_email_hint">البريد الإلكتروني</string>
-  <string name="setup_create">إنشاء حساب</string>
-  <string name="setup_validate_account">أُرسِلت رسالة إلى العنوان الذي أدخلتَ. لتنشيط حسابك، يجب عليك الضغط على الوصلة التي داخلها. حالما تقوم بذلك، ارجع إلى هنا واضغط على الزر أعلاه.</string>
-  <string name="setup_check_account_validation">تحقق</string>
-  <string name="setup_account_not_validated">لم يتم تأكيد حسابك بعد.</string>
-  <string name="setup_account_validated">تم تأكيد حسابك.</string>
-  <string name="button_history">التاريخ</string>
-  <string name="button_contacts">الأسماء</string>
-  <string name="button_settings">اﻹعدادات</string>
-  <string name="button_chat">المحادثة</string>
-  <string name="button_about">حول</string>
-  <string name="button_setup_cancel">إلغاء</string>
-  <string name="button_setup_back">الرجوع</string>
-  <string name="button_setup_next">هيا بنا</string>
-  <string name="button_new_chat">محادثة جديدة</string>
-  <string name="button_edit">تحرير</string>
-  <string name="button_cancel">إلغاء</string>
-  <string name="button_ok">حسنا</string>
-  <string name="button_back">الرجوع</string>
-  <string name="button_all_contacts">الكل</string>
-  <string name="button_add_contact">جهة اتصال جديدة</string>
-  <string name="button_all_call">الكل</string>
-  <string name="button_missed_call">الفائتة</string>
-  <string name="button_delete_all">حذف</string>
-  <string name="button_transfer">تحويل</string>
-  <string name="button_add_call">إضافة مكالمة</string>
-  <string name="button_video">الفيديو</string>
-  <string name="button_micro">الميكروفون</string>
-  <string name="button_speaker">مكبر الصوت</string>
-  <string name="button_route">توجيه</string>
-  <string name="button_receiver">السماعة</string>
-  <string name="button_bluetooth">بلوتوث</string>
-  <string name="button_options">الخيارات</string>
-  <string name="button_send_message">إرسال</string>
-  <string name="button_send_picture">صورة</string>
-  <string name="uploading_image">يجري الرفع...</string>
-  <string name="call_update_title">هناك طلب لتحديث المكالمة</string>
-  <string name="call_update_desc">يريد المُراسِل إضافة الصورة إلى هذه المكالمة.</string>
-  <string name="call_update_yes">قبول</string>
-  <string name="call_update_no">رفض</string>
-  <string name="share_picture_size_small">صغيرة</string>
-  <string name="share_picture_size_medium">متوسطة</string>
-  <string name="share_picture_size_large">كبيرة</string>
-  <string name="share_picture_size_real">الحجم الحقيقي</string>
-  <string name="save_picture">حفظ الصورة</string>
-  <string name="text_copied_to_clipboard">نُسخ النص في الحافظة</string>
-  <string name="copy_text">نسخ النص</string>
-  <string name="image_picker_title">اختر المصدر</string>
-  <string name="image_saved">حُفظَت الصورة</string>
-  <string name="image_not_saved">خطأ، لم تُحفَظ الصورة</string>
-  <string name="pref_linphone_friend_title">الأصدقاء</string>
-  <string name="pref_auto_accept_friends_title">أصدقاء جدد</string>
-  <string name="linphone_friend_new_request_title">طلب صديق</string>
-  <string name="linphone_friend_new_request_desc">يريد مشاركة حالة حضوره معك ويريد كذلك أن يكون مطَّلعا على حالة حضورك.</string>
-  <string name="setup_ec_calibration">تجري معايرة مزيل الصدى</string>
-  <string name="pref_image_sharing_server_title">خادم المشاركة</string>
-  <string name="pref_remote_provisioning_title">التهيئة عن بعد</string>
-  <string name="delete_contact">حذف</string>
-  <string name="sip_address">عنوان SIP</string>
-  <string name="phone_number">رقم الهاتف</string>
-  <string name="contact_first_name">اﻹسم</string>
-  <string name="contact_last_name">اللقب</string>
-  <string name="pref_primary_account_title">الحساب اﻷوَّلي</string>
-  <string name="pref_display_name_title">الإسم المعروض</string>
-  <string name="pref_user_name_title">إسم المستخدم</string>
-  <string name="pref_expire_title">انتهاء الصلاحية</string>
-  <string name="pref_avpf">AVPF</string>
-  <string name="pref_avpf_rr_interval">نطاق RTCP الاعتيادي لـ AVPF بالثواني (ما بين 1 و 5)</string>
-  <string name="pref_rfc2833_dtmf">إرسال RFC2833 DTMFs</string>
-  <string name="pref_sipinfo_dtmf">إرسال SIP INFO DTMFs</string>
-  <string name="pref_voice_mail">عنوان العلبة الصوتية</string>
-  <string name="voicemail_unread">الرسائل غير المقروءة</string>
-  <string name="error_unknown">خطأ مجهول</string>
-  <string name="error_call_declined">مكالمة مرفوضة</string>
-  <string name="error_user_not_found">لم يعثر على المستخدم</string>
-  <string name="error_incompatible_media">مُعامِلات الوسائط غير متوافقة</string>
-  <string name="error_low_bandwidth">سعة قناة مُراسِلك ضعيفة، لا يمكن بدء الصورة</string>
-  <string name="error_network_unreachable">تعذر الوصول إلى الشبكة</string>
-  <string name="today">اليوم</string>
-  <string name="yesterday">اﻷمس</string>
-  <string name="call_state_missed">الفائتة</string>
-  <string name="call_state_outgoing">الصادرة</string>
-  <string name="call_state_incoming">الواردة</string>
-  <string name="pref_background_mode">وضع الخلفية</string>
-  <string name="show_image">إظهار</string>
-  <string name="download_image">تنزيل</string>
-  <string name="download_image_failed">فشِل التنزيل. يُرجى التحقق من الوصول للإنترنت أو الإعادة لاحقا.</string>
-  <string name="pref_auth_userid">مُعرِّف استيثاق المستخدم</string>
-  <string name="pref_help_auth_userid">ادخل مُعرِّف استيثاق المستخدم (اختيارية)</string>
-  <string name="pref_display_name">الإسم المعروض</string>
-  <string name="pref_help_display_name">ادخل الإسم المعروض (اختياري)</string>
-  <string name="pref_upnp_enable">تشغيل UPnP</string>
-  <string name="pref_manage">الإدارة</string>
-  <string name="wait">يُرجى الانتظار...</string>
-  <string name="importing_messages">يجري تحديث قاعدة بيانات الرسائل</string>
-  <string name="default_account_flag">الحساب الافتراضي</string>
-  <string name="setup_remote_provisioning">تنزيل التهيئة</string>
-  <string name="setup_remote_provisioning_hint">سينزِّل هذا المرشد تهيئة موجودة</string>
-  <string name="setup_remote_provisioning_url_hint">عنوان التهيئة</string>
-  <string name="setup_remote_provisioning_login_hint">لا تتضمن التهيئة التي نزَّلت هذا الحساب. يُرجى ملؤه فيها.</string>
-  <string name="setup_title_assistant">مرشد تهيئة الحساب</string>
-  <string name="zrtp_accept">قبول</string>
-  <string name="zrtp_deny">رفض</string>
-  <string name="zrtp_help">يتحتم عليك القبول فقط إذا كان لك ولمُراسِلك نفس الرمز (انظر أعلاه)</string>
-  <string name="remote_composing">المُراسِل يكتب...</string>
-  <string name="unread_messages">%i رسائل غير مقروءة</string>
-  <string name="retry">إعادة المحاولة</string>
-  <string name="remote_provisioning_failure">فشِل تنزيل أو تطبيق تشكيلة التهيئة عن بعد</string>
-  <string name="remote_provisioning_again_title">التهيئة عن بعد</string>
-  <string name="remote_provisioning_again_message">هل تريد تغيير عنوان التهيئة ؟</string>
-</resources>
diff --git a/res/values-de/custom.xml b/res/values-de/custom.xml
deleted file mode 100644
index b26ce853f..000000000
--- a/res/values-de/custom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="history_date_format">t MMM</string>
-  <string name="messages_date_format">HH:mm t MMM</string>
-  <string name="today_date_format">HH:mm</string>
-  <string name="picture_name_format">linphone-mms-%s.jpg</string>
-  <string name="app_name">Linphone</string>
-  <string name="service_name">Linphone-Dienst</string>
-  <string name="addressbook_label">Linphone</string>
-  <string name="notification_title">Linphone</string>
-  <string name="wait_dialog_text">Startvorgang</string>
-  <string name="notification_registered">Registriert auf %s </string>
-  <string name="about_text">Linphone %s SIP-kompatibles Telefon (RFC 3261) unter der GNU Public License V2</string>
-  <string name="setup_create_account">Erstellen Sie ein Konto auf linphone.org</string>
-  <string name="setup_login_linphone">Ich habe bereits ein linphone.org-Konto</string>
-  <string name="setup_login_generic">Ich habe bereits ein SIP-Konto</string>
-  <string name="setup_linphone_account_hint">Geben Sie Ihren Benutzernamen und Passwort für linphone.org ein</string>
-  <string name="setup_general_account_hint">Geben Sie den Benutzernamen, das Passwort und die Domäne Ihres SIP-Kontos ein</string>
-  <string name="setup_username_hint">Benutzername</string>
-  <string name="button_sip_contacts">SIP</string>
-  <string name="tunnel_host"></string>
-</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
deleted file mode 100644
index 3ca10974f..000000000
--- a/res/values-de/strings.xml
+++ /dev/null
@@ -1,392 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="pref_disable_account">Deaktivieren</string>
-  <string name="pref_tunnel">Tunnel</string>
-  <string name="pref_tunnel_host">Hostname</string>
-  <string name="pref_tunnel_port">Port</string>
-  <string name="pref_tunnel_mode">Modus</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>deaktiviert</item>
-    <item>nur 3G</item>
-    <item>immer</item>
-    <item>auto</item>
-  </string-array>
-  <string name="incall_notif_active">Anruf fortsetzen</string>
-  <string name="incall_notif_paused">Pausierten Anruf fortsetzen</string>
-  <string name="incall_notif_video">Video-Anruf fortsetzen</string>
-  <string name="not_ready_to_make_new_call">Nicht bereit für einen neuen Anruf</string>
-  <string name="bad_target_uri">Falscher Kontakt: %s</string>
-  <string name="reset_sas_fmt">Geprüfte %s zurücksetzen</string>
-  <string name="verify_sas_fmt">%s überprüfen</string>
-  <string name="communication_encrypted">Verschlüsselt</string>
-  <string name="waiting_for_startup">Startvorgang...</string>
-  <string name="couldnt_accept_call">Beim Annehmen des Anrufs ist ein Fehler aufgetreten</string>
-  <string name="error_adding_new_call">Fehler beim Hinzufügen eines neuen Anrufs</string>
-  <string name="transfer_started">Übertragung gestartet</string>
-  <string name="transfer_dialog_title">Anruf weiterleiten zu</string>
-  <string name="transfer_to_new_call">Neuer Anruf</string>
-  <string name="resume_dialog_title">Anruf fortsetzen</string>
-  <string name="cannot_resume_paused_by_remote_call">Kann pausierten Anruf nicht fortsetzen</string>
-  <string name="conf_show_details_text">Details anzeigen</string>
-  <string name="skipable_error_service_not_ready">Warnung: Dienst ist nicht bereit</string>
-  <string name="close_button_text">Schließen</string>
-  <string name="status_conf_call">conf</string>
-  <string name="status_active_call">Aktiv</string>
-  <string name="state_paused">Pausiert</string>
-  <string name="state_paused_by_remote">Pausiert durch Partner</string>
-  <string name="state_streams_running"></string>
-  <string name="state_incoming_received">Eingehend</string>
-  <string name="state_outgoing_ringing">Klingelt</string>
-  <string name="state_outgoing_progress">Anrufen</string>
-  <string name="mutemic_button_txt">Stumm</string>
-  <string name="speaker_button_txt">Lautsprecher</string>
-  <string name="bluetooth_button_txt">Bluetooth</string>
-  <string name="CancelButtonText">Abbrechen</string>
-  <string name="AddCallButtonText">Anruf hinzufügen</string>
-  <string name="TransferCallButtonText">Anruf weiterleiten</string>
-  <string name="conf_admin_choice_enter">Konferenz beitreten</string>
-  <string name="conf_admin_choice_leave">Konferenz vorübergehend verlassen</string>
-  <string name="conf_admin_choice_terminate">Konferenz beenden</string>
-  <string name="hangup">Auflegen</string>
-  <string name="conf_simple_merge_bt_txt">Zusammenführen</string>
-  <string name="conf_simple_transfer_bt_txt">Weiterleiten</string>
-  <string name="conf_simple_video_bt_txt">Video</string>
-  <!--<string name="conf_simple_no_current_call">No active call</string>-->
-  <string name="show_send_dtmfs_button">Wähltasten</string>
-  <string name="conf_conference">Konferenz</string>
-  <string name="in_conf">Du bist ein Teil davon</string>
-  <string name="in_conf_leave">ausgehen</string>
-  <string name="out_conf">Sie sind außen vor</string>
-  <string name="out_conf_enter">hineingehen</string>
-  <string name="pref_audio_hacks_title">Audio Hacks</string>
-  <string name="pref_audio_use_specific_mode_title">Speziellen Modus Hack verwenden</string>
-  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (Standard), 2=MODE_IN_CALL</string>
-  <string name="pref_audio_hacks_use_routing_api_title">Routing-API-Hack verwenden</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Galaxy-S-Audio-Hack verwenden</string>
-  <string name="pref_audio_soft_volume_title">Software-Lautstärke verwenden</string>
-  <string name="pref_ipv6_title">IPv6 anstatt IPv4 verwenden</string>
-  <string name="error_while_accepting_pending_call">Fehler beim Annehmen des wartenden Anrufs</string>
-  <string name="incoming_call_dialog_title">%s ruft Sie an</string>
-  <string name="accept">Annehmen</string>
-  <string name="decline">Ablehnen</string>
-  <string name="unknown_incoming_call_name">Unbekannt</string>
-  <string name="pref_network_title">Netzwerk</string>
-  <string name="pref_transport">Transport</string>
-  <string name="pref_transport_udp">UDP</string>
-  <string name="pref_transport_tcp">TCP</string>
-  <string name="pref_transport_tls">TLS</string>
-  <string name="pref_transport_use_random_ports">Zufällige Ports verwenden</string>
-  <string name="pref_sip_port_title">Zu benutzender SIP-Port</string>
-  <string name="at_least_a_protocol">Es wird mindestens ein Element benötigt</string>
-  <string name="first_launch_ok">Registrierung erfolgreich</string>
-  <string name="error">Fehler</string>
-  <string name="click_to_show_first_login_view">Start</string>
-  <string name="dialer_null_on_new_intent">Anwendung nicht bereit</string>
-  <string name="pref_add_account">Konto hinzufügen</string>
-  <string name="no_phone_numbers">Keine Telefonummern für %s gefunden</string>
-  <string name="filter_contacts">Kontakte filtern</string>
-  <string name="title_numbers_dialog">Telefonnummern von %s</string>
-  <string name="pref_delete_account">Konto löschen</string>
-  <string name="pref_default_account">Als Standard benutzen</string>
-  <string name="pref_echo_canceller_calibration">Echounterdrückung kalibrieren</string>
-  <string name="pref_video_use_front_camera_title">Frontkamera benutzen</string>
-  <string name="pref_video">Video</string>
-  <string name="pref_preferences">Einstellungen</string>
-  <string name="pref_video_codecs_title">Codecs</string>
-  <string name="pref_preferred_video_size">Bevorzugte Videogröße</string>
-  <string name="menu_videocall_back_to_dialer_title">Wählgerät anzeigen</string>
-  <string name="menu_videocall_switch_camera_title">Vorder-/Rück-Kamera</string>
-  <string name="menu_videocall_change_resolution_when_low_resolution">Hohe Auflösung benutzen</string>
-  <string name="menu_videocall_change_resolution_when_high_resolution">Geringe Auflösung</string>
-  <string name="menu_videocall_change_resolution_title">Auflösung ändern</string>
-  <string name="menu_videocall_toggle_camera_title">Kamera de-/aktivieren</string>
-  <string name="menu_videocall_toggle_camera_disable">Kamera deaktivieren</string>
-  <string name="menu_videocall_toggle_camera_enable">Kamera aktivieren</string>
-  <string name="menu_videocall_terminate_call_title">Anruf beenden</string>
-  <string name="pref_video_settings_title">Videoeinstellungen</string>
-  <string name="pref_video_automatically_share_my_video_title">Aktiviere meine Kamera</string>
-  <string name="pref_video_automatically_accept_video_title">Eingehende Videoanfragen annehmen</string>
-  <string name="pref_video_automatically_share_my_video">Meine Kamera automatisch aktivieren</string>
-  <string name="pref_video_automatically_accept_video">Videoanfragen immer annehmen</string>
-  <string name="pref_video_initiate_call_with_video_title">Videoanrufe starten</string>
-  <string name="pref_video_initiate_call_with_video">Immer Videoanfragen senden</string>
-  <string name="pref_video_enable_title">Video aktivieren</string>
-  <string name="pref_animation_enable_title">Animationen aktivieren</string>
-  <string name="pref_escape_plus">Ersetzen + durch 00</string>
-  <string name="pref_ilbc_summary">iLBC ist möglicherweise nicht verfügbar, abhängig vom ARM-Prozessor und der Android-Betriebssystemversion.</string>
-  <string name="pref_echo_cancellation">Echounterdrückung</string>
-  <string name="pref_autostart">Beim Einschalten starten</string>
-  <string name="pref_enable_outbound_proxy">Ausgehender Proxy</string>
-  <string name="pref_codecs">Codecs</string>
-  <string name="pref_communication_expire_title">Zeitüberschreitung der Kommunikation</string>
-  <string name="pref_incoming_expire_title">Zeitüberschreitung bei eingehendem Anruf</string>
-  <string name="pref_video_port_title">Videoport oder Portbereich</string>
-  <string name="pref_audio_port_title">Audioport oder Portbereich</string>
-  <string name="pref_video_port_description">Videoport oder Portbereich (Min.Port-Max.Port)</string>
-  <string name="pref_audio_port_description">Audioport oder Portbereich (Min.Port-Max.Port)</string>
-  <string name="pref_incoming_call_timeout_title">Zeitüberschreitung bei eingehendem Anruf (in Sekunden)</string>
-  <string name="place_call_chooser">Anrufen</string>
-  <string name="pref_adaptive_rate_control">Adaptive Ratenregelung</string>
-  <string name="pref_adaptive_rate_algorithm">Adaptiver Ratenalgorithmus</string>
-  <string name="pref_codec_bitrate_limit">Codec-Bitratenbegrenzung</string>
-  <string-array name="limit_bitrate_entries">
-    <item>10 kbits/s</item>
-    <item>15 kbits/s</item>
-    <item>20 kbits/s</item>
-    <item>36 kbits/s</item>
-    <item>64 kbits/s</item>
-    <item>128 kbits/s</item>
-  </string-array>
-  <string name="pref_debug">Debug</string>
-  <string name="about_report_issue">Problembeschreibung</string>
-  <string name="about_bugreport_email_text">Problem hier beschreiben</string>
-  <string name="about_error_generating_bugreport_attachement">Fehler beim Erstellen des Fehlerberichts</string>
-  <string name="about_logs_not_found">Protokolle nicht gefunden.</string>
-  <string name="about_reading_logs">Protokolle laden, kann etwas Zeit in Anspruch nehmen...</string>
-  <string name="about_mailer_chooser_text">Fehlerbericht senden per...</string>
-  <string name="menu_about">Über</string>
-  <string name="menu_send_log">Protokoll senden</string>
-  <string name="menu_reset_log">Protokoll zurücksetzen</string>
-  <string name="pref_audio">Audio</string>
-  <string name="menu_exit">Ausgang</string>
-  <string name="pref_prefix">Präfix</string>
-  <string name="pref_advanced">Erweitert</string>
-  <string name="menu_settings">Einstellungen</string>
-  <string name="pref_proxy">Proxy</string>
-  <string name="pref_domain">Domain*</string>
-  <string name="pref_passwd">Passwort*</string>
-  <string name="pref_username">Benutzername*</string>
-  <string name="pref_sipaccount">SIP-Konto</string>
-  <string name="wrong_username">falscher Benutzername</string>
-  <string name="wrong_passwd">falsches Passwort</string>
-  <string name="wrong_domain">falsche Domain</string>
-  <string name="wrong_settings">falsche Einstellungen</string>
-  <string name="tab_dialer">Wählgerät</string>
-  <string name="tab_contact">Kontakt</string>
-  <string name="call_error">Kann %s nicht anrufen</string>
-  <string name="yes">Ja</string>
-  <string name="no">Nein</string>
-  <string name="cont">Fortsetzen</string>
-  <string name="never_remind">Niemals erinnern</string>
-  <string name="config_error">%s. Wollen Sie zu den Einstellungen wechseln?</string>
-  <string name="ec_calibration_launch_message">Starte Kalibrierung der Echounterdrückung</string>
-  <string name="tab_history">Chronik</string>
-  <string name="menu_clear_history">Leeren</string>
-  <string name="error_cannot_get_call_parameters">Kann Anrufparameter nicht empfangen</string>
-  <string name="error_cannot_create_default_parameters">Kann Standard-Anrufparameter nicht erstellen</string>
-  <string name="error_cannot_invite_address">Kann Zieladresse [%s] nicht einladen</string>
-  <string name="notification_started">begonnen</string>
-  <string name="pref_stun_server">Stun-Server</string>
-  <string name="pref_ice_enable">ICE aktivieren</string>
-  <string name="pref_ice_enable_summary">aktiviere ICE</string>
-  <string name="ec_calibrating">Kalibrierung...</string>
-  <string name="ec_calibrated">Kalibriert [%s ms]</string>
-  <string name="no_echo">Kein Echo</string>
-  <string name="failed">fehlgeschlagen</string>
-  <string name="first_login_explanation">Benutzername und Passwort eingeben, um sich zum Dienst zu verbinden.</string>
-  <string name="first_login_username">Benutzername</string>
-  <string name="first_login_password">Passwort</string>
-  <string name="first_login_connect">Verbinden</string>
-  <string name="first_launch_no_login_password">Bitte geben Sie Ihren Benutzername und Ihr Passwort ein</string>
-  <string name="first_launch_bad_login_password">Verbindung nicht möglich; Prüfen Sie Ihre Zugangsdaten und versuchen Sie es erneut</string>
-  <string name="pref_amr_summary">AMR Codec ist möglicherweise nicht auf Ihrem Telefon vorhanden</string>
-  <string name="pref_media_encryption">Medienverschlüsselung</string>
-  <string name="media_encryption_none">Keine</string>
-  <string name="pref_video_codec_h264_unavailable">Codec deaktiviert, Erstellen Sie die App aus dem Source-Code, um Ihn zu aktivieren.</string>
-  <string name="pref_video_codec_mpeg4_unavailable">Codec deaktiviert, Erstellen Sie die App aus dem Source-Code, um Ihn zu aktivieren.</string>
-  <string name="pref_sipaccounts">SIP-Konten</string>
-  <string name="pref_wifi_only">nur WLAN verwenden</string>
-  <string name="pref_push_notification">Push-Benachrichtigungen aktivieren</string>
-  <string name="wizard_failed">Es ist ein Fehler aufgetreten, versuchen Sie es später nochmal</string>
-  <string name="wizard_server_unavailable">Server nicht erreichbar, prüfen Sie Ihre Internetverbindung</string>
-  <string name="wizard_username_unavailable">Der Benutzername wird bereits verwendet.</string>
-  <string name="wizard_username_incorrect">Ihr Benutzername ist nicht gültig.</string>
-  <string name="wizard_email_incorrect">Ihre E-Mail-Adresse ist nicht gültig.</string>
-  <string name="wizard_password_incorrect">Ihr Passwort ist nicht gültig (min. 6 Zeichen).</string>
-  <string name="wizard_passwords_unmatched">Passwörter stimmen nicht überein.</string>
-  <string name="pref_help_proxy">SIP-Proxy-Hostname oder IP-Adresse (optional)</string>
-  <string name="pref_help_outbound_proxy">Alle Anrufe üder einen SIP Proxy leiten</string>
-  <string name="pref_help_username">Beispiel: John, wenn ihr Konto john@sip.example.org ist</string>
-  <string name="pref_help_domain">sip.example.org, wenn Ihr Konto john@sip.example.org ist</string>
-  <string name="pref_help_password">Sie müssen Ihr Passwort erneut eingeben, wenn Sie Ihren Benutzernamen und/oder Domain ändern</string>
-  <string name="delete">Löschen</string>
-  <string name="chat">Nachrichten</string>
-  <string name="call">Anruf</string>
-  <string name="add_to_contacts">Zu Kontakten hinzufügen</string>
-  <string name="status_connected">Registriert</string>
-  <string name="status_not_connected">Nicht registriert</string>
-  <string name="status_in_progress">Registrierung in Arbeit</string>
-  <string name="status_error">Registierung fehlgeschlagen</string>
-  <string name="addressHint">Nummer oder Adresse</string>
-  <string name="conference">Konferenz</string>
-  <string name="incoming">Eingehender Anruf</string>
-  <string name="draft">Entwurf</string>
-  <string name="no_call_history">Kein Anruf in Ihrer Chronik.</string>
-  <string name="no_missed_call_history">Kein verpasster Anruf in Ihrer Chronik.</string>
-  <string name="no_contact">Kein Kontakt in Ihrem Adressbuch.</string>
-  <string name="no_sip_contact">Kein SIP-Kontakt in Ihrem Adressbuch.</string>
-  <string name="no_chat_history">Keine Nachrichtenchronik.</string>
-  <string name="call_stats_audio">Audio</string>
-  <string name="call_stats_video">Video</string>
-  <string name="call_stats_codec">Codec:</string>
-  <string name="call_stats_upload">Upload-Bandbreite:</string>
-  <string name="call_stats_download">Download-Bandbreite:</string>
-  <string name="call_stats_ice">ICE-Konnektivität:</string>
-  <string name="call_stats_video_resolution">Videogröße:</string>
-  <!--Used by Android to help blind people by describing them images-->
-  <string name="content_description_add_contact">Zu Kontakten hinzufügen</string>
-  <string name="content_description_new_contact">Neuer Kontakt</string>
-  <string name="content_description_call">Call</string>
-  <string name="content_description_backspace">Zurückschalten</string>
-  <string name="content_description_about">Seite Über</string>
-  <string name="content_description_chat">Nachrichten</string>
-  <string name="content_description_dial_back">Zurückrufen</string>
-  <string name="content_description_contact_picture">Kontaktbild</string>
-  <string name="content_description_send_message">Nachricht senden</string>
-  <string name="content_description_detail">Detail</string>
-  <string name="content_description_delete">Schaltfläche löschen</string>
-  <string name="content_description_add">Schaltfläche hinzufügen</string>
-  <string name="content_description_new_discussion">Neue Diskussion</string>
-  <string name="content_description_edit">Schaltfläche bearbeiten</string>
-  <string name="content_description_validate">Schaltfläche Bestätigen</string>
-  <string name="content_description_search">Suchen</string>
-  <string name="content_description_all_contacts">Alle Kontakte</string>
-  <string name="content_description_linphone_contacts">Linphone-Kontakte</string>
-  <string name="content_description_call_direction">Anrufrichtung</string>
-  <string name="content_description_all_calls">Alle Anrufe</string>
-  <string name="content_description_missed_calls">Verpasste Anrufe</string>
-  <string name="content_description_switch_video">Video umschalten</string>
-  <string name="content_description_toggle_speaker">Lautsprecher umschalten</string>
-  <string name="content_description_toggle_micro">Mikrofon umschalten</string>
-  <string name="content_description_add_call">Anruf hinzufügen</string>
-  <string name="content_description_pause">Pause</string>
-  <string name="content_description_hang_up">Auflegen</string>
-  <string name="content_description_numpad">Nummernblock</string>
-  <string name="content_description_settings">Schaltfläche Einstellungen</string>
-  <string name="content_description_dialer">Wählgerät</string>
-  <string name="content_description_history">Schaltfläche Verlauf</string>
-  <string name="content_description_chat_button">Schaltfläche Chat</string>
-  <string name="content_description_contacts">Schaltfläche Kontakte</string>
-  <string name="content_description_led"></string>
-  <string name="content_description_call_quality">Anrufqualität</string>
-  <string name="content_description_encryption">Verschlüsselung</string>
-  <string name="content_description_switch_camera">Kamera umschalten</string>
-  <string name="content_description_welcome">Willkommen beim Kontoeinrichtungsassistent</string>
-  <string name="content_description_cancel">Abbrechen</string>
-  <string name="content_description_cancel_button">Schaltfläche Abbrechen</string>
-  <string name="content_description_next">Schaltfläche Weiter</string>
-  <string name="content_description_back">Schaltfläche Zurück</string>
-  <string name="content_description_setup_ok">OK</string>
-  <string name="content_description_message_status">Nachrichtenstatus</string>
-  <string name="content_description_conference">Konferenz</string>
-  <string name="content_description_mark"></string>
-  <string name="setup_title">Kontoeinrichtungsassistent</string>
-  <string name="setup_apply">Anwenden</string>
-  <string name="setup_password_hint">Passwort</string>
-  <string name="setup_domain_hint">Domain</string>
-  <string name="setup_password_confirm_hint">Passwort bestätigen</string>
-  <string name="setup_email_hint">E-Mail</string>
-  <string name="setup_create">Konto erstellen</string>
-  <string name="setup_check_account_validation">Prüfen</string>
-  <string name="setup_account_not_validated">Ihr Konto wurde noch nicht überprüft.</string>
-  <string name="setup_account_validated">Ihr Konto wurde überprüft.</string>
-  <string name="button_history">Chronik</string>
-  <string name="button_contacts">Kontakte</string>
-  <string name="button_settings">Einstellungen</string>
-  <string name="button_chat">Nachrichten</string>
-  <string name="button_about">Über</string>
-  <string name="button_setup_cancel">Abbrechen</string>
-  <string name="button_setup_back">Zurück</string>
-  <string name="button_setup_next">Los geht\'s</string>
-  <string name="button_new_chat">Neues Gespräch</string>
-  <string name="button_edit">Ändern</string>
-  <string name="button_cancel">Abbrechen</string>
-  <string name="button_ok">OK</string>
-  <string name="button_back">Zurück</string>
-  <string name="button_all_contacts">Alle</string>
-  <string name="button_add_contact">Neuer Kontakt</string>
-  <string name="button_all_call">Alle</string>
-  <string name="button_missed_call">Verpasst</string>
-  <string name="button_delete_all">Löschen</string>
-  <string name="button_transfer">Weiterleiten</string>
-  <string name="button_add_call">Anruf hinzufügen</string>
-  <string name="button_video">Video</string>
-  <string name="button_micro">Mikrofon</string>
-  <string name="button_speaker">Lautsprecher</string>
-  <string name="button_route">Weiterleiten</string>
-  <string name="button_receiver">Empfänger</string>
-  <string name="button_bluetooth">Bluetooth</string>
-  <string name="button_options">Optionen</string>
-  <string name="button_send_message">Senden</string>
-  <string name="button_send_picture">Bild</string>
-  <string name="uploading_image">Hochladen...</string>
-  <string name="call_update_title">Anrufaktualisierung angefordert</string>
-  <string name="call_update_yes">Annehmen</string>
-  <string name="call_update_no">Ablehnen</string>
-  <string name="share_picture_size_small">Klein</string>
-  <string name="share_picture_size_medium">Mittel</string>
-  <string name="share_picture_size_large">Groß</string>
-  <string name="share_picture_size_real">Echte Größe</string>
-  <string name="save_picture">Bild speichern</string>
-  <string name="text_copied_to_clipboard">Text in die Zwischenablage kopiert</string>
-  <string name="copy_text">Kopiere Text</string>
-  <string name="image_picker_title">Wähle Quelle</string>
-  <string name="image_saved">Bild gespeichert</string>
-  <string name="image_not_saved">Fehler, Bild nicht gespeichert</string>
-  <string name="pref_linphone_friend_title">Freunde</string>
-  <string name="pref_auto_accept_friends_title">Neue Freunde</string>
-  <string name="linphone_friend_new_request_title">Freundschaftsanfrage</string>
-  <string name="setup_ec_calibration">Echounterdrückung kalibrieren in Arbeit</string>
-  <string name="pref_remote_provisioning_title">Fernbereitstellung</string>
-  <string name="delete_contact">Löschen</string>
-  <string name="sip_address">SIP-Adresse</string>
-  <string name="phone_number">Telefonnummer</string>
-  <string name="contact_first_name">Vorname</string>
-  <string name="contact_last_name">Nachname</string>
-  <string name="pref_primary_account_title">Primäres Konto</string>
-  <string name="pref_display_name_title">Anzeigename</string>
-  <string name="pref_user_name_title">Benutzername</string>
-  <string name="pref_expire_title">Ablaufen</string>
-  <string name="pref_avpf">AVPF</string>
-  <string name="pref_avpf_rr_interval"> AVPF Standard RTCP Interval in Sekunden (zwischen 1 und 5)</string>
-  <string name="pref_rfc2833_dtmf">RFC2833 DTMFs senden</string>
-  <string name="pref_sipinfo_dtmf">SIP INFO DTMFs senden</string>
-  <string name="pref_voice_mail">Sprachnachricht-URI</string>
-  <string name="voicemail_unread">ungelesene Nachrichten</string>
-  <string name="error_unknown">Unbekannter Fehler</string>
-  <string name="error_call_declined">Anruf abgelehnt</string>
-  <string name="error_user_not_found">Benutzer nicht gefunden</string>
-  <string name="error_incompatible_media">Inkompatible Medienparameter</string>
-  <string name="error_low_bandwidth">Ihr Partner hat eine geringe Bandbreite, Video kann nicht gestartet werden</string>
-  <string name="error_network_unreachable">Netzwerk ist nicht erreichbar</string>
-  <string name="today">Heute</string>
-  <string name="yesterday">Gestern</string>
-  <string name="call_state_missed">Verpasst</string>
-  <string name="call_state_outgoing">Ausgehend</string>
-  <string name="call_state_incoming">Eingehend</string>
-  <string name="pref_background_mode">Hintergrundmodus</string>
-  <string name="show_image">Anzeigen</string>
-  <string name="download_image">Herunterladen</string>
-  <string name="download_image_failed">Herunterladen fehlgeschlagen. Bitte prüfen Sie Ihre Internetverbindung oder versuchen Sie es später nochmal.</string>
-  <string name="pref_auth_userid">Authentifizierungs-Benutzerkennung</string>
-  <string name="pref_help_auth_userid">Authentifizierungs-Benutzerkennung eingeben (optional)</string>
-  <string name="pref_display_name">Anzeigename</string>
-  <string name="pref_help_display_name">Anzeigename eingeben (optional)</string>
-  <string name="pref_upnp_enable">UPNP aktivieren</string>
-  <string name="pref_manage">Verwalten</string>
-  <string name="wait">Bitte warten...</string>
-  <string name="importing_messages">Nachrichtendatenbank wird aktualisiert</string>
-  <string name="default_account_flag">Standardkonto</string>
-  <string name="setup_remote_provisioning_hint">Dieser Assistent lädt eine existierende Konfiguration herunter.</string>
-  <string name="setup_remote_provisioning_url_hint">Bereitstellungs-URL</string>
-  <string name="setup_title_assistant">Kontoeinrichtungsassistent</string>
-  <string name="zrtp_accept">Annehmen</string>
-  <string name="zrtp_deny">Verweigern</string>
-  <string name="zrtp_help">Sie sollten nur annehmen, wenn Sie den selben Code (siehe oben) sehen, wie ihr Gesprächspartner.</string>
-  <string name="remote_composing">Partner schreibt...</string>
-  <string name="unread_messages">%i ungelesene Nachrichten</string>
-  <string name="retry">Erneut versuchen</string>
-  <string name="remote_provisioning_again_title">Fernbereitstellung</string>
-  <string name="remote_provisioning_again_message">Möchten Sie die Bereitstellungs-URI ändern?</string>
-</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
deleted file mode 100644
index da5c13535..000000000
--- a/res/values-es/strings.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="pref_disable_account">Deshabilitar</string>
-  <string name="pref_tunnel">Túnel</string>
-  <string name="pref_tunnel_port">Puerto</string>
-  <string name="pref_tunnel_mode">Modo</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>deshabilitado</item>
-    <item>sólo 3G</item>
-    <item>siempre</item>
-    <item>auto</item>
-  </string-array>
-  <string name="not_ready_to_make_new_call">No preparado para una nueva llamada</string>
-  <string name="bad_target_uri">Contacto erróneo: %s</string>
-  <string name="verify_sas_fmt">Verifica %s</string>
-  <string name="communication_encrypted">Cifrado</string>
-  <string name="waiting_for_startup">Comenzando...</string>
-  <string name="couldnt_accept_call">Ocurrió un error al aceptar la llamada</string>
-  <string name="error_adding_new_call">Error al añadir nueva llamada</string>
-  <string name="transfer_started">Transferencia iniciada</string>
-  <string name="transfer_dialog_title">Transferir llamada a</string>
-  <string name="transfer_to_new_call">Nueva llamada</string>
-  <string name="resume_dialog_title">Continuar llamada</string>
-  <string name="cannot_resume_paused_by_remote_call">No puedo continuar una llamada puesta en pausa remotamente</string>
-  <string name="conf_show_details_text">Mostrar detalles</string>
-  <string name="skipable_error_service_not_ready">Aviso: el servicio no está preparado</string>
-  <string name="close_button_text">Cerrar</string>
-  <string name="status_active_call">activa</string>
-  <string name="state_paused">puesta en pausa</string>
-  <string name="state_paused_by_remote">puesta en pausa remotamente</string>
-  <string name="state_streams_running"></string>
-  <string name="state_incoming_received">entrante</string>
-  <string name="state_outgoing_ringing">sonando</string>
-  <string name="state_outgoing_progress">llamando</string>
-  <string name="mutemic_button_txt">Silenciar</string>
-  <string name="speaker_button_txt">Altavoz</string>
-  <string name="bluetooth_button_txt">Bluetooth</string>
-  <string name="CancelButtonText">Cancelar</string>
-  <string name="AddCallButtonText">Añadir llamada</string>
-  <string name="TransferCallButtonText">Transferir llamada</string>
-  <string name="conf_admin_choice_enter">Entrar en conferencia</string>
-  <string name="conf_admin_choice_leave">Dejar momentáneamente la conferencia</string>
-  <string name="conf_admin_choice_terminate">Terminar la conferencia</string>
-  <string name="hangup">Colgar</string>
-  <string name="conf_simple_merge_bt_txt">Unir</string>
-  <string name="conf_simple_transfer_bt_txt">Transferir</string>
-  <string name="conf_simple_video_bt_txt">vídeo</string>
-  <!--<string name="conf_simple_no_current_call">No active call</string>-->
-  <string name="show_send_dtmfs_button">Teclado numérico</string>
-  <string name="conf_conference">Conferencia</string>
-  <string name="in_conf">Eres parte de ella</string>
-  <string name="in_conf_leave">Salir</string>
-  <string name="out_conf">Has salido de ella</string>
-  <string name="out_conf_enter">Entrar</string>
-  <string name="pref_audio_soft_volume_title">Usar volumen por software</string>
-  <string name="pref_ipv6_title">Usar ipv6 en vez de ipv4</string>
-  <string name="incoming_call_dialog_title">%s le está llamando</string>
-  <string name="accept">Aceptar</string>
-  <string name="decline">Declinar</string>
-  <string name="unknown_incoming_call_name">Desconocido</string>
-  <string name="pref_network_title">Red</string>
-  <string name="pref_transport">Transporte</string>
-  <string name="pref_transport_udp">UDP</string>
-  <string name="pref_transport_tcp">TCP</string>
-  <string name="pref_transport_tls">TLS</string>
-  <string name="pref_transport_use_random_ports">Usar puertos aleatorios</string>
-  <string name="pref_sip_port_title">Puerto SIP a usar</string>
-  <string name="at_least_a_protocol">Se requiere al menos un elemento</string>
-  <string name="error">Error</string>
-  <string name="click_to_show_first_login_view">Empezar</string>
-  <string name="dialer_null_on_new_intent">Aplicación no preparado</string>
-  <string name="pref_add_account">Añadir cuenta</string>
-  <string name="no_phone_numbers">No se encontraron números de teléfono para %s</string>
-  <string name="filter_contacts">Filtrar contactos</string>
-  <string name="title_numbers_dialog">números de teléfono de %s</string>
-  <string name="pref_delete_account">Borrar ésta cuenta</string>
-  <string name="pref_default_account">Usar como predeterminada</string>
-  <string name="pref_echo_canceller_calibration">Calibrado del cancelador de eco</string>
-  <string name="pref_video_use_front_camera_title">Usar cámara frontal</string>
-  <string name="pref_video">Vídeo</string>
-  <string name="pref_preferences">Preferencias</string>
-  <string name="pref_video_codecs_title">Codecs</string>
-  <string name="pref_preferred_video_size">Tamaño de vídeo preferido</string>
-  <string name="menu_videocall_switch_camera_title">Cámara frontal/trasera</string>
-  <string name="menu_videocall_change_resolution_when_low_resolution">Probar alta resolución</string>
-  <string name="menu_videocall_change_resolution_when_high_resolution">Baja resolución</string>
-  <string name="menu_videocall_change_resolution_title">Cambiar resolución</string>
-  <string name="menu_videocall_toggle_camera_disable">Deshabilitar cámara</string>
-  <string name="menu_videocall_toggle_camera_enable">Habilitar cámara</string>
-  <string name="menu_videocall_terminate_call_title">Terminar llamada</string>
-  <string name="pref_video_automatically_share_my_video_title">Compartir mi cámara</string>
-  <string name="pref_video_automatically_accept_video_title">Aceptar peticiones de vídeo entrantes</string>
-  <string name="pref_video_automatically_share_my_video">Enviar mi cámara automáticamente</string>
-  <string name="pref_video_automatically_accept_video">Aceptar peticiones de vídeo siempre</string>
-  <string name="pref_video_initiate_call_with_video_title">Iniciar videollamadas</string>
-  <string name="pref_video_initiate_call_with_video">Siempre enviar peticiones de vídeo</string>
-  <string name="pref_video_enable_title">Habilitar Vídeo</string>
-  <string name="pref_animation_enable_title">Habilitar animaciones</string>
-  <string name="pref_escape_plus">Sustituir + por 00</string>
-  <string name="pref_ilbc_summary">iLBC puede no estar disponible dependiendo del procesador ARM y la versión de S.O. Android</string>
-  <string name="pref_echo_cancellation">Cancelación de eco</string>
-  <string name="pref_enable_outbound_proxy">Proxy saliente</string>
-  <string name="pref_codecs">Codecs</string>
-  <string name="conference">Conferencia</string>
-  <string name="call_stats_video">Vídeo</string>
-  <!--Used by Android to help blind people by describing them images-->
-  <string name="content_description_add_call">Añadir llamada</string>
-  <string name="content_description_hang_up">Colgar</string>
-  <string name="content_description_led"></string>
-  <string name="content_description_cancel">Cancelar</string>
-  <string name="content_description_conference">Conferencia</string>
-  <string name="content_description_mark"></string>
-  <string name="button_setup_cancel">Cancelar</string>
-  <string name="button_cancel">Cancelar</string>
-  <string name="button_transfer">Transferir</string>
-  <string name="button_add_call">Añadir llamada</string>
-  <string name="button_video">Vídeo</string>
-  <string name="button_speaker">Altavoz</string>
-  <string name="button_bluetooth">Bluetooth</string>
-  <string name="call_update_yes">Aceptar</string>
-  <string name="call_update_no">Declinar</string>
-  <string name="zrtp_accept">Aceptar</string>
-</resources>
diff --git a/res/values-fr/custom.xml b/res/values-fr/custom.xml
index 2df500bb5..2e1164f4b 100644
--- a/res/values-fr/custom.xml
+++ b/res/values-fr/custom.xml
@@ -1,12 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="history_date_format">d MMM</string>
-  <string name="history_detail_date_format">EEEE MMM d HH:mm</string>
+  <string name="history_detail_date_format">dd/MM/yyyy - HH:mm - </string>
   <string name="messages_date_format">HH:mm d MMM</string>
   <string name="today_date_format">HH:mm</string>
-  <string name="picture_name_format">linphone-mms-%s.jpg</string>
-  <string name="app_name">Linphone</string>
-  <string name="service_name">Linphone Service</string>
+
+
   <string name="addressbook_label">Linphone</string>
   <string name="sync_account_type">org.linphone</string>
   <string name="sync_account_name">contacts linphone</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 52e8524fa..1a1be54c4 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,412 +1,83 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="pref_disable_account">Désactiver</string>
-  <string name="pref_tunnel">Tunnel</string>
-  <string name="pref_tunnel_host">Hôte</string>
-  <string name="pref_tunnel_port">Port</string>
-  <string name="pref_tunnel_mode">Mode</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>désactivé</item>
-    <item>3G seulement</item>
-    <item>toujours</item>
-    <item>auto</item>
-  </string-array>
-  <string name="incall_notif_active">Appel audio en cours</string>
-  <string name="incall_notif_paused">Appel en pause</string>
-  <string name="incall_notif_video">Appel vidéo en cours</string>
-  <string name="not_ready_to_make_new_call">Pas prêt pour un nouvel appel</string>
-  <string name="bad_target_uri">Mauvais contact : %s</string>
-  <string name="reset_sas_fmt">Annuler vérification %s</string>
-  <string name="verify_sas_fmt">Vérifier %s</string>
-  <string name="communication_encrypted">Encrypté</string>
-  <string name="waiting_for_startup">Démarrage…</string>
-  <string name="couldnt_accept_call">Une erreur est survenue pendant l\'acceptation d\'un appel</string>
-  <string name="error_adding_new_call">Erreur lors de l\'ajout de l\'appel</string>
-  <string name="transfer_started">Transfert commencé</string>
-  <string name="transfer_dialog_title">Transférer l\'appel vers</string>
-  <string name="transfer_to_new_call">Nouvel appel</string>
-  <string name="resume_dialog_title">Reprendre l\'appel</string>
-  <string name="cannot_resume_paused_by_remote_call">Impossible de reprendre l\'appel mis en pause par votre correspondant</string>
-  <string name="conf_show_details_text">Montrer les détails</string>
-  <string name="skipable_error_service_not_ready">Attention : le service n\'est pas prêt</string>
-  <string name="close_button_text">Fermer</string>
-  <string name="status_conf_call">conf</string>
-  <string name="status_active_call">actif</string>
-  <string name="state_paused">en pause</string>
-  <string name="state_paused_by_remote">mis en pause par le correspondant</string>
-  <string name="state_streams_running"></string>
-  <string name="state_incoming_received">entrant</string>
-  <string name="state_outgoing_ringing">sonnant</string>
-  <string name="state_outgoing_progress">sortant</string>
-  <string name="mutemic_button_txt">Silence</string>
-  <string name="speaker_button_txt">HP</string>
-  <string name="bluetooth_button_txt">Bluetooth</string>
-  <string name="CancelButtonText">Annuler</string>
-  <string name="AddCallButtonText">Ajouter un appel</string>
-  <string name="TransferCallButtonText">Transférer appel</string>
-  <string name="conf_admin_choice_enter">Entrer dans la onférence</string>
-  <string name="conf_admin_choice_leave">Quitter temporairement la conférence</string>
-  <string name="conf_admin_choice_terminate">Terminer la conférence</string>
-  <string name="hangup">Raccrocher</string>
-  <string name="conf_simple_merge_bt_txt">Fusionner</string>
-  <string name="conf_simple_transfer_bt_txt">Transférer</string>
-  <string name="conf_simple_video_bt_txt">Vidéo</string>
-  <!--<string name="conf_simple_no_current_call">No active call</string>-->
-  <string name="show_send_dtmfs_button">Dialpad</string>
-  <string name="conf_conference">Conférence</string>
-  <string name="in_conf">Conférence en cours</string>
-  <string name="in_conf_leave">Sortir</string>
-  <string name="out_conf">Conférence terminée</string>
-  <string name="out_conf_enter">Rentrer</string>
-  <string name="pref_audio_hacks_title">Bidouilles audio</string>
-  <string name="pref_audio_use_specific_mode_title">Utiliser la bidouille de mode spécifique</string>
-  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (défaut), 2=MODE_IN_CALL</string>
-  <string name="pref_audio_hacks_use_routing_api_title">Utiliser la bidouille de l\'API de routage</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Utiliser la bidouille d\'audio pour Galaxy S</string>
-  <string name="pref_audio_soft_volume_title">Utiliser volume logiciel</string>
-  <string name="pref_ipv6_title">Utiliser ipv6 au lieu de ipv4</string>
-  <string name="error_while_accepting_pending_call">Erreur pendant l\'acceptation de l\'appel</string>
-  <string name="incoming_call_dialog_title">%s vous apelle</string>
-  <string name="accept">Accepter</string>
-  <string name="decline">Refuser</string>
-  <string name="unknown_incoming_call_name">Inconnu</string>
-  <string name="pref_network_title">Réseau</string>
-  <string name="pref_transport">Transport</string>
-  <string name="pref_transport_udp">UDP</string>
-  <string name="pref_transport_tcp">TCP</string>
-  <string name="pref_transport_tls">TLS</string>
-  <string name="pref_transport_use_random_ports">Utiliser des ports aléatoires</string>
-  <string name="pref_sip_port_title">Port SIP à utiliser si port aléatoire désactivé</string>
-  <string name="at_least_a_protocol">Au moins un est requis</string>
-  <string name="first_launch_ok">Enregistré avec succès</string>
-  <string name="error">Erreur</string>
-  <string name="click_to_show_first_login_view">Commencer</string>
-  <string name="dialer_null_on_new_intent">Application pas prête</string>
-  <string name="pref_add_account">Ajouter un compte</string>
-  <string name="no_phone_numbers">Aucun numéro trouvé pour %s</string>
-  <string name="filter_contacts">Filtrer contacts</string>
-  <string name="title_numbers_dialog">Numéros de %s</string>
-  <string name="pref_delete_account">Supprimer ce compte</string>
-  <string name="pref_default_account">Utiliser par défaut</string>
-  <string name="pref_echo_canceller_calibration">Calibration de l\'annulateur d\'écho</string>
-  <string name="pref_video_use_front_camera_title">Utiliser la caméra en façade</string>
-  <string name="pref_video">Vidéo</string>
-  <string name="pref_preferences">Préférences</string>
-  <string name="pref_video_codecs_title">Codecs</string>
-  <string name="pref_preferred_video_size">Taille de vidéo préférée</string>
-  <string name="menu_videocall_back_to_dialer_title">Afficher le dialer</string>
-  <string name="menu_videocall_switch_camera_title">Caméra frontale / arrière</string>
-  <string name="menu_videocall_change_resolution_when_low_resolution">Tester haute résolution</string>
-  <string name="menu_videocall_change_resolution_when_high_resolution">Basse résolution</string>
-  <string name="menu_videocall_change_resolution_title">Changer résolution</string>
-  <string name="menu_videocall_toggle_camera_title">Activer / Désactiver caméra</string>
-  <string name="menu_videocall_toggle_camera_disable">Désactiver caméra</string>
-  <string name="menu_videocall_toggle_camera_enable">Activer caméra</string>
-  <string name="menu_videocall_terminate_call_title">Terminer l\'appel</string>
-  <string name="pref_video_settings_title">Paramètres vidéo</string>
-  <string name="pref_video_automatically_share_my_video_title">Partager ma vidéo</string>
-  <string name="pref_video_automatically_accept_video_title">Accepter appels vidéo</string>
-  <string name="pref_video_automatically_share_my_video">Envoyer ma vidéo automatiquement</string>
-  <string name="pref_video_automatically_accept_video">Toujours accepter les demandes d\'appels vidéo</string>
-  <string name="pref_video_initiate_call_with_video_title">Initier les appels en vidéo</string>
-  <string name="pref_video_initiate_call_with_video">Toujours envoyer des demandes d\'appels vidéo</string>
-  <string name="pref_video_enable_title">Activer la vidéo</string>
-  <string name="pref_bandwidth_limit">Bande passante maximale en kb/s</string>
-  <string name="pref_animation_enable_title">Activer les animations</string>
-  <string name="pref_escape_plus">Remplacer + par 00</string>
-  <string name="pref_ilbc_summary">iLBC peut être indisponible suivant le processeur ARM et la version d\'Android.</string>
-  <string name="pref_echo_cancellation">Annulateur d\'écho</string>
-  <string name="pref_autostart">Démarrer au lancement du téléphone</string>
-  <string name="pref_enable_outbound_proxy">Outbound proxy</string>
-  <string name="pref_codecs">Codecs</string>
-  <string name="pref_communication_expire_title">Time out de communication</string>
-  <string name="pref_incoming_expire_title">Time out d\'appel entrant</string>
-  <string name="pref_video_port_title">Port ou plage de port vidéo</string>
-  <string name="pref_audio_port_title">Port ou plage de port audio</string>
-  <string name="pref_video_port_description">Port ou plage (min-max) pour l\'audio</string>
-  <string name="pref_audio_port_description">Port ou plage (min-max) pour la video</string>
-  <string name="pref_incoming_call_timeout_title">Timeout (en secondes) pour les appels entrants</string>
-  <string name="place_call_chooser">Réaliser un appel</string>
-  <string name="pref_adaptive_rate_control">Contrôle qualité adaptatif</string>
-  <string name="pref_adaptive_rate_algorithm">Algorithme de contrôle adaptatif</string>
-  <string name="pref_codec_bitrate_limit">Limite de débit du codec</string>
-  <string-array name="limit_bitrate_entries">
-    <item>10 kbits/s</item>
-    <item>15 kbits/s</item>
-    <item>20 kbits/s</item>
-    <item>36 kbits/s</item>
-    <item>64 kbits/s</item>
-    <item>128 kbits/s</item>
-  </string-array>
-  <string name="pref_debug">Activer les traces de débogage</string>
-  <string name="about_report_issue">Reporter un problème</string>
-  <string name="about_bugreport_email_text">Décrivez le problème ici</string>
-  <string name="about_error_generating_bugreport_attachement">Erreur pendant la génération du rapport d\'incident</string>
-  <string name="about_logs_not_found">Traces non trouvées.</string>
-  <string name="about_reading_logs">En train de lire les traces, peut prendre du temps…</string>
-  <string name="about_mailer_chooser_text">Envoyer le rapport avec…</string>
-  <string name="menu_about">A propos</string>
-  <string name="menu_send_log">Envoyer les logs</string>
-  <string name="menu_reset_log">Vider les logs</string>
-  <string name="pref_audio">Audio</string>
-  <string name="menu_exit">Quitter</string>
-  <string name="pref_prefix">Préfixe</string>
-  <string name="pref_advanced">Avancé</string>
-  <string name="menu_settings">Paramètres</string>
-  <string name="pref_proxy">Serveur mandataire</string>
-  <string name="pref_domain">Domaine*</string>
-  <string name="pref_passwd">Mot de passe*</string>
-  <string name="pref_username">Nom d\'utilisateur*</string>
-  <string name="pref_sipaccount">Compte SIP</string>
-  <string name="wrong_username">Mauvais nom d\'utilisateur</string>
-  <string name="wrong_passwd">Mauvais mot de passe</string>
-  <string name="wrong_domain">Mauvais domaine</string>
-  <string name="wrong_settings">Mauvais paramètre(s)</string>
-  <string name="tab_dialer">Dialer</string>
-  <string name="tab_contact">Contact</string>
-  <string name="call_error">Erreur lors de l\'appel de %s</string>
-  <string name="yes">Oui</string>
-  <string name="no">Non</string>
-  <string name="dismiss">Annuler</string>
-  <string name="cont">Continuer</string>
-  <string name="never_remind">Ne plus me le rapeller</string>
-  <string name="config_error">%s, voulez-vous aller dans les paramètres ?</string>
-  <string name="ec_calibration_launch_message">Démarrage de la calibration de l\'annulateur d\'écho</string>
-  <string name="warning_already_incall">Impossible de démarrer un nouvel appel, un appel est en cours</string>
-  <string name="tab_history">Historique</string>
-  <string name="warning_wrong_destination_address">Impossible de construire l\'adresse de destination depuis [%s]</string>
-  <string name="menu_clear_history">Nettoyer</string>
-  <string name="error_cannot_get_call_parameters">Impossible de récupérer les paramètres de l\'appel</string>
-  <string name="error_cannot_create_default_parameters">Impossible de créer les paramètres par défaut de l\'appel</string>
-  <string name="error_cannot_invite_address">Impossible d\'inviter l\'adresse [%s]</string>
-  <string name="notification_started">démarré</string>
-  <string name="pref_echo_cancellation_summary">Supprime l\'écho entendu de l\'autre côté</string>
-  <string name="pref_stun_server">Serveur Stun</string>
-  <string name="pref_ice_enable">Activer ICE</string>
-  <string name="pref_ice_enable_summary">Un serveur STUN doit être configuré pour utiliser ICE</string>
-  <string name="ec_calibrating">Calibration…</string>
-  <string name="ec_calibrated">Calibré [%s ms]</string>
-  <string name="no_echo">Pas d\'écho</string>
-  <string name="failed">échoué</string>
-  <string name="first_login_explanation">Entrez votre nom d\'utilisateur et votre mot de passe pour vous connecter au service.</string>
-  <string name="first_login_username">Nom d\'utilisateur</string>
-  <string name="first_login_password">Mot de passe</string>
-  <string name="first_login_connect">Connexion</string>
-  <string name="first_launch_no_login_password">Entrez votre nom d\'utilisateur et votre mot de passe</string>
-  <string name="first_launch_bad_login_password">Impossible de se connecter; Vérifiez vos informations de connexion et réessayez</string>
-  <string name="pref_amr_summary">Le codec AMR codec peut ne pas être disponible sur votre téléphone</string>
-  <string name="pref_media_encryption">Encryption</string>
-  <string name="media_encryption_none">Aucune</string>
-  <string name="pref_video_codec_h264_unavailable">Codec désactivé, compilez l\'application depuis le code source pour l\'activer</string>
-  <string name="pref_video_codec_mpeg4_unavailable">Codec désactivé, compilez l\'application depuis le code source pour l\'activer</string>
-  <string name="pref_sipaccounts">Comptes SIP</string>
-  <string name="pref_wifi_only">Wi-Fi uniquement</string>
-  <string name="pref_push_notification">Activer les notifications poussées</string>
-  <string name="wizard_failed">Une erreur est survenue, réessayez plus tard.</string>
-  <string name="wizard_server_unavailable">Serveur injoignable, vérifiez votre connexion internet.</string>
-  <string name="wizard_username_unavailable">Ce nom d\'utilisateur est déjà pris.</string>
-  <string name="wizard_username_incorrect">Votre nom d\'utilisateur n\'est pas valide.</string>
-  <string name="wizard_email_incorrect">Votre courriel n\'est pas valide.</string>
-  <string name="wizard_password_incorrect">Votre mot de passe n\'est pas valide (6 caractères min).</string>
-  <string name="wizard_passwords_unmatched">Les mots de passe sont différents.</string>
-  <string name="pref_help_proxy">Adresse IP ou nom de domaine du serveur mandataire SIP (facultatif)</string>
-  <string name="pref_help_outbound_proxy">Faire passer tous les appels via le serveur mandataire SIP</string>
-  <string name="pref_help_username">Exemple: john si votre compte est john@sip.example.org</string>
-  <string name="pref_help_domain">sip.example.org si votre compte est john@sip.example.org</string>
-  <string name="pref_help_password">Vous devrez retaper votre mot de passe si vous changez votre nom d\'utilisateur ou le domaine</string>
-  <string name="delete">Supprimer</string>
-  <string name="chat">Chat</string>
-  <string name="call">Appel</string>
-  <string name="add_to_contacts">Ajouter aux contacts</string>
-  <string name="status_connected">Enregistré</string>
-  <string name="status_not_connected">Pas Enregistré</string>
-  <string name="status_in_progress">Enregistrement en cours</string>
-  <string name="status_error">Enregistrement échoué</string>
-  <string name="addressHint">Numéro ou adresse</string>
-  <string name="conference">Conférence</string>
-  <string name="incoming">Appel entrant</string>
-  <string name="draft">Brouillon</string>
-  <string name="new_fast_chat">Entrez une adresse SIP…</string>
-  <string name="no_call_history">Aucun appel dans votre historique.</string>
-  <string name="no_missed_call_history">Aucun appel manqué dans votre historique.</string>
-  <string name="no_contact">Aucun contact dans votre carnet d\'adresse.</string>
-  <string name="no_sip_contact">Aucun contact SIP dans votre carnet d\'adresse.</string>
-  <string name="no_chat_history">Aucun historique de chat.</string>
-  <string name="call_stats_audio">Audio</string>
-  <string name="call_stats_video">Vidéo</string>
-  <string name="call_stats_codec">Codec :</string>
-  <string name="call_stats_upload">Bande passante envoi :</string>
-  <string name="call_stats_download">Bande passante réception :</string>
-  <string name="call_stats_ice">Connexion ICE :</string>
-  <string name="call_stats_video_resolution">Taille vidéo:</string>
-  <!--Used by Android to help blind people by describing them images-->
-  <string name="content_description_add_contact">Button Ajouter aux contacts</string>
-  <string name="content_description_new_contact">Nouveau contact</string>
-  <string name="content_description_call">Appel</string>
-  <string name="content_description_backspace">Retour</string>
-  <string name="content_description_about">À propos</string>
-  <string name="content_description_chat">Chat</string>
-  <string name="content_description_dial_back">Rappeler</string>
-  <string name="content_description_contact_picture">Photo contact</string>
-  <string name="content_description_send_message">Envoyer message</string>
-  <string name="content_description_detail">Detail</string>
-  <string name="content_description_delete">Boutton supprimer</string>
-  <string name="content_description_add">Boutton ajouter</string>
-  <string name="content_description_new_discussion">Nouvelle discussion</string>
-  <string name="content_description_edit">Bouton éditer</string>
-  <string name="content_description_validate">Bouton valider</string>
-  <string name="content_description_search">Rechercher</string>
-  <string name="content_description_all_contacts">Tous les contacts</string>
-  <string name="content_description_linphone_contacts">Contacts Linphone</string>
-  <string name="content_description_call_direction">Direction d\'appel</string>
-  <string name="content_description_all_calls">Tous les appels</string>
-  <string name="content_description_missed_calls">Appels manqués </string>
-  <string name="content_description_switch_video">Basculer video </string>
-  <string name="content_description_toggle_speaker">Basculer haut-parleur</string>
-  <string name="content_description_toggle_micro">Basculer micro</string>
-  <string name="content_description_add_call">Ajouter un appel</string>
-  <string name="content_description_pause">Mettre en pause</string>
-  <string name="content_description_hang_up">Raccrocher</string>
-  <string name="content_description_numpad">Clavier numerique </string>
-  <string name="content_description_settings">Bouton paramètres  </string>
-  <string name="content_description_dialer">Dialer</string>
-  <string name="content_description_history">Bouton historique</string>
-  <string name="content_description_chat_button">Bouton chat</string>
-  <string name="content_description_contacts">Bouton contacts</string>
-  <string name="content_description_led"></string>
-  <string name="content_description_call_quality">Qualite d\'appel</string>
-  <string name="content_description_encryption">Chiffrement</string>
-  <string name="content_description_switch_camera">Basculer camera</string>
-  <string name="content_description_welcome">Bienvenue dans l\'assistant de configuration de compte</string>
-  <string name="content_description_cancel">Annuler</string>
-  <string name="content_description_cancel_button">Bouton annuler</string>
-  <string name="content_description_next">Bouton suivant</string>
-  <string name="content_description_back">Bouton precedent </string>
-  <string name="content_description_setup_ok">Ok</string>
-  <string name="content_description_message_status">Status de message</string>
-  <string name="content_description_conference">Conférence</string>
-  <string name="content_description_mark"></string>
-  <string name="setup_title">Assistant de configuration des comptes</string>
-  <string name="setup_apply">Appliquer</string>
-  <string name="setup_password_hint">mot de passe</string>
-  <string name="setup_domain_hint">domaine</string>
-  <string name="setup_password_confirm_hint">confirmez le mot de passe</string>
-  <string name="setup_email_hint">courriel</string>
-  <string name="setup_create">Créer le compte</string>
-  <string name="setup_validate_account">Un courriel vous à été envoyé. Pour activer votre compte, vous devez cliquer sur le lien qu\'il contient. Une fois ceci fait, revenez ici et cliquez sur le bouton ci-dessous.</string>
-  <string name="setup_check_account_validation">Vérifier</string>
-  <string name="setup_account_not_validated">Votre compte n\'a pas encore été validé.</string>
-  <string name="setup_account_validated">Votre compte à été validé.</string>
-  <string name="button_history">Historique</string>
-  <string name="button_contacts">Contacts</string>
-  <string name="button_settings">Options</string>
-  <string name="button_chat">Chat</string>
-  <string name="button_about">A propos</string>
-  <string name="button_setup_cancel">Annuler</string>
-  <string name="button_setup_back">Retour</string>
-  <string name="button_setup_next">Allons-y</string>
-  <string name="button_new_chat">+ Chat</string>
-  <string name="button_edit">Modifier</string>
-  <string name="button_cancel">Annuler</string>
-  <string name="button_ok">Valider</string>
-  <string name="button_back">Retour</string>
-  <string name="button_all_contacts">Tous</string>
-  <string name="button_add_contact">+ Contact</string>
-  <string name="button_all_call">Tous</string>
-  <string name="button_missed_call">Manqués</string>
-  <string name="button_delete_all">Supprimer</string>
-  <string name="button_transfer">Transfert</string>
-  <string name="button_add_call">+ Appel</string>
-  <string name="button_video">Vidéo</string>
-  <string name="button_micro">Micro</string>
-  <string name="button_speaker">HP</string>
-  <string name="button_route">Route</string>
-  <string name="button_receiver">Ecouteur</string>
-  <string name="button_bluetooth">Bluetooth</string>
-  <string name="button_options">Options</string>
-  <string name="button_send_message">Envoyer</string>
-  <string name="button_send_picture">Img</string>
-  <string name="uploading_image">Envoi en cours…</string>
-  <string name="call_update_title">Mise à jour de l\'appel</string>
-  <string name="call_update_desc">Votre correspondant souhaite ajouter la vidéo à l\'appel en cours.</string>
-  <string name="call_update_yes">Accepter</string>
-  <string name="call_update_no">Refuser</string>
-  <string name="share_picture_size_small">Petite</string>
-  <string name="share_picture_size_medium">Moyenne</string>
-  <string name="share_picture_size_large">Grande</string>
-  <string name="share_picture_size_real">Taille réelle</string>
-  <string name="save_picture">Sauvegarder l\'image</string>
-  <string name="text_copied_to_clipboard">Texte copié dans le presse papier</string>
-  <string name="copy_text">Copier le texte</string>
-  <string name="image_picker_title">Choisissez la source</string>
-  <string name="image_saved">Image sauvegardée</string>
-  <string name="image_not_saved">Erreur, image non sauvegardée</string>
-  <string name="pref_linphone_friend_title">Amis</string>
-  <string name="pref_auto_accept_friends_title">Nouveaux amis</string>
-  <string name="pref_auto_accept_friends_desc">Toujours accepter les demandes d\'amis</string>
-  <string name="linphone_friend_new_request_title">Requête d\'ami</string>
-  <string name="linphone_friend_new_request_desc">voudrait être partager son status avec vous et voir le votre.</string>
-  <string name="setup_ec_calibration">Calibration de l\'annulateur d\'écho en cours</string>
-  <string name="pref_image_sharing_server_title">Serveur de partage</string>
-  <string name="pref_remote_provisioning_title">Configuration distante</string>
-  <string name="delete_contact">Supprimer</string>
-  <string name="delete_contact_dialog">Ce contact va être supprimé.</string>
-  <string name="sip_address">Adresse SIP</string>
-  <string name="phone_number">Numéro de téléphone</string>
-  <string name="contact_first_name">Prénom</string>
-  <string name="contact_last_name">Nom</string>
-  <string name="pref_primary_account_title">Compte principal</string>
-  <string name="pref_display_name_title">Nom d\'affichage</string>
-  <string name="pref_user_name_title">Nom d\'utilisateur</string>
-  <string name="pref_expire_title">Expiration</string>
-  <string name="pref_avpf">AVPF</string>
-  <string name="pref_avpf_rr_interval">Intervalle AVPF RTCP régulier en secondes (entre 1 et 5) </string>
-  <string name="pref_rfc2833_dtmf">Envoyer les DTMFs RFC2833</string>
-  <string name="pref_sipinfo_dtmf">Envoyer les DTMFs en SIP INFO</string>
-  <string name="pref_voice_mail">Adresse messagerie vocale</string>
-  <string name="voicemail_unread">messages non lus</string>
-  <string name="error_unknown">Erreur inconnue</string>
-  <string name="error_call_declined">Appel rejeté</string>
-  <string name="error_user_not_found">Utilisateur non trouvé</string>
-  <string name="error_incompatible_media">Paramètres média incompatibles</string>
-  <string name="error_low_bandwidth">Votre correspondant à un débit faible, la vidéo ne peut démarrer</string>
-  <string name="error_network_unreachable">Le réseau n\'est pas joignable</string>
-  <string name="error_bad_credentials">Nom d\'utilisateur ou mot de passe incorrect.</string>
-  <string name="error_unauthorized">Non autorisé</string>
-  <string name="error_io_error">Erreur réseau</string>
+  <!-- Common -->
+  <string name="username">nom d\'utilisateur</string>
+  <string name="display_name">Display name</string>
+  <string name="password">mot de passe</string>
+  <string name="confirm_password">Password confirmation</string>
+  <string name="domain">nom de domaine</string>
+  <string name="remote_provisioning_url">Provisioning url</string>
+  <string name="email">Email</string>
+  <string name="delete_text">Êtes-vous sûr(e) de vouloir supprimer cette selection ?</string>
+  <string name="delete">supprimer</string>
+  <string name="retry">Retry</string>
+  <string name="cancel">annuler</string>
+  <string name="accept">confirmer</string>
+  <string name="about">About</string>
+  <string name="deny">refuser</string>
+  <string name="no_account">No account configured</string>
+  <string name="address_sip">Adresse Sip</string>
+
+  <!-- splashscreen -->
+  <string name="app_description">free SIP VOIP client</string>
+
+  <!-- 0. Assistant -->
+  <string name="assistant_welcome">Bienvenue</string>
+  <string name="assistant_title">Assistant</string>
+  <string name="assistant_create_account">Create a linphone account</string>
+  <string name="assistant_login_linphone">I have a linphone account</string>
+  <string name="assistant_login_generic">I have a sip account</string>
+  <string name="assistant_remote_provisioning">Remote provisioning</string>
+  <string name="assistant_create_account_title">Create an account</string>
+  <string name="assistant_create_account_part_1">1/2</string>
+  <string name="assistant_create_account_part_2">2/2</string>
+  <string name="assistant_display_name">Display name (optional)</string>
+  <string name="assistant_linphone_account_title">Configure linphohe account</string>
+  <string name="assistant_general_account_title">Configure Sip account</string>
+  <string name="assistant_remote_provisioning_title">Remote provisioning</string>
+  <string name="assistant_create">Create account</string>
+  <string name="assistant_apply">Apply</string>
+  <string name="assistant_ec_calibration">Echo canceller calibration in progress</string>
+  <string name="assistant_remote_provisioning_login">Saisissez vos identifiants</string>
+  <string name="assistant_connect">connexion</string>
+
+  <!-- 1. Dailer -->
+  <string name="address_bar_hint">Enter a number or an address</string>
+
+  <!-- 2. History -->
+  <string name="no_call_history">No call in your history</string>
+  <string name="no_missed_call_history">No missed call in your history</string>
+  <string name="delete_history_log">Do you want to delete selected log?</string>
+  <string name="history_log_label">appel reçu</string>
   <string name="today">Aujourd\'hui</string>
   <string name="yesterday">Hier</string>
-  <string name="call_state_missed">Manqué</string>
-  <string name="call_state_outgoing">Émis</string>
-  <string name="call_state_incoming">Reçu</string>
-  <string name="pref_background_mode">Actif en arrière plan</string>
-  <string name="show_image">Afficher</string>
-  <string name="download_image">Télécharger</string>
-  <string name="download_image_failed">Téléchargement échoué. Vérifiez votre connexion internet ou reéssayez plus tard.</string>
-  <string name="pref_auth_userid">Identifiant d\'authentification</string>
-  <string name="pref_help_auth_userid">Entrez votre identifiant (optionnel)</string>
-  <string name="pref_display_name">Nom d\'affichage</string>
-  <string name="pref_help_display_name">Entrez votre nom (optionnel)</string>
-  <string name="pref_upnp_enable">Activer UPNP</string>
-  <string name="pref_manage">Gestion</string>
-  <string name="wait">Merci de patienter...</string>
-  <string name="importing_messages">Mise à jour de la base des messages</string>
-  <string name="default_account_flag">Compte par défaut</string>
-  <string name="setup_remote_provisioning">Télécharger ma configuration</string>
-  <string name="setup_remote_provisioning_hint">Cet assistant va télécharger une configuration existante.</string>
-  <string name="setup_remote_provisioning_url_hint">addresse où télécharger la configuration</string>
-  <string name="setup_remote_provisioning_login_hint">La configuration téléchargée ne contient pas votre compte. Veuillez le remplir.</string>
-  <string name="setup_confirm_username">Votre nom d\'utilisateur sera %s.\r\n\r\nIl peut être différent de celui que vous aviez entré.\r\nAcceptez-vous ce nom d\'utilisateur ?</string>
-  <string name="setup_title_assistant">Assistant de création de compte</string>
-  <string name="zrtp_accept">Accepter</string>
-  <string name="zrtp_deny">Refuser</string>
-  <string name="zrtp_help">Vous ne devriez accepter que si vous avez le même code (ci-dessus) que votre contact</string>
-  <string name="remote_composing">Votre correspondant est en train de taper...</string>
-  <string name="unread_messages">%i messages non lus</string>
-  <string name="retry">Renvoyer</string>
-  <string name="remote_provisioning_failure">Erreur durant le téléchargement ou l\'application de la configuration distante...</string>
-  <string name="remote_provisioning_again_title">Configuration distante</string>
-  <string name="remote_provisioning_again_message">Souhaitez-vous changer l\'URI de configuration ?</string>
-  <string name="processing_image">Traitement de l\'image, cela peut prendre quelques secondes selon sa taille</string>
+
+
+  <!-- 3. Contacts -->
+  <string name="no_contact">No contact in your address book.</string>
+  <string name="no_sip_contact">No SIP contact in your address book.</string>
+  <string name="delete_contacts">Do you want to delete selected contact?</string>
+  <string name="delete_contact">Do you want to delete selected this contact?</string>
+  <string name="search_contact">Rechercher un contact</string>
+
+  <!-- 4. Chat -->
+  <string name="no_chat_history">No conversations</string>
+  <string name="delete_conversation">Do you want to delete selected conversation?</string>
+  <string name="delete_message">Do you want to delete selected message?</string>
+
+  <!-- Side Menu -->
+  <string-array name="side_menu_item">
+    <item>Assistant</item>
+    <item>Settings</item>
+    <item>About</item>
+  </string-array>
+  <string name="quit">Quitter</string>
+
+  <!-- Call -->
+  <string name="incoming_call">Appel entrant</string>
+  <string name="outgoing_call">Appel sortant</string>
+  <string name="add_video_dialog">Votre corespondant(e) souhaiterais ajouter la vidéo</string>
+  <string name="no_current_call">Toutes vos conversations sont en pause</string>
+  <string name="call_paused_by_remote">%s a mis la conversation en pause.</string>
+  <string name="zrtp_dialog">Veuillez vérifier par oral avec votre interlocuteur qu\'il a le code suivant :\n%s</string>
 </resources>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
deleted file mode 100644
index b8f592e23..000000000
--- a/res/values-he/strings.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="pref_disable_account">נטרל</string>
-  <string name="pref_tunnel_host">שם מארח</string>
-  <string name="pref_tunnel_port">פורט</string>
-  <string name="pref_tunnel_mode">מצב</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string name="conf_show_details_text">הצג פרטים</string>
-  <string name="close_button_text">סגור</string>
-  <string name="state_streams_running"></string>
-  <string name="mutemic_button_txt">השתק</string>
-  <string name="speaker_button_txt">רמקול</string>
-  <string name="CancelButtonText">ביטול</string>
-  <string name="AddCallButtonText">הוסף שיחה</string>
-  <string name="TransferCallButtonText">העבר שיחה</string>
-  <string name="hangup">סיים</string>
-  <string name="conf_simple_merge_bt_txt">מזג</string>
-  <string name="conf_simple_transfer_bt_txt">העבר</string>
-  <string name="conf_simple_video_bt_txt">וידאו</string>
-  <!--<string name="conf_simple_no_current_call">No active call</string>-->
-  <string name="show_send_dtmfs_button">לוח חיוג</string>
-  <string name="conf_conference">ועידה</string>
-  <string name="pref_audio_soft_volume_title">השתמש בעוצמת קול של תוכנה</string>
-  <string name="accept">קבל</string>
-  <string name="decline">דחה</string>
-  <string name="unknown_incoming_call_name">לא מוכר</string>
-  <string name="pref_network_title">רשת</string>
-  <string name="pref_transport">טרנספורט</string>
-  <string name="error">שגיאה</string>
-  <string name="click_to_show_first_login_view">התחל</string>
-  <string name="pref_add_account">הוסף חשבון</string>
-  <string name="pref_default_account">השתמש בתור ברירת מחדל</string>
-  <string name="pref_video">וידאו</string>
-  <string name="pref_preferences">העדפות</string>
-  <string name="menu_videocall_back_to_dialer_title">הצג לוח חיוג</string>
-  <string name="menu_videocall_toggle_camera_disable">נטרל מצלמה</string>
-  <string name="menu_videocall_toggle_camera_enable">אפשר מצלמה</string>
-  <string name="menu_videocall_terminate_call_title">סיים שיחה</string>
-  <string name="pref_video_settings_title">הגדרות וידאו</string>
-  <string name="pref_video_enable_title">אפשר וידאו</string>
-  <string name="pref_animation_enable_title">אפשר הנפשות</string>
-  <string name="pref_escape_plus">החלף + עם 00</string>
-  <string name="menu_about">אודות</string>
-  <string name="pref_audio">שמע</string>
-  <string name="menu_exit">יציאה</string>
-  <string name="pref_prefix">קידומת</string>
-  <string name="pref_advanced">מתקדם</string>
-  <string name="menu_settings">הגדרות</string>
-  <string name="pref_proxy">פרוקסי</string>
-  <string name="pref_domain">מתחם*</string>
-  <string name="pref_passwd">סיסמה*</string>
-  <string name="pref_username">שם משתמש*</string>
-  <string name="pref_sipaccount">חשבון SIP</string>
-  <string name="tab_contact">איש קשר</string>
-  <string name="yes">כן</string>
-  <string name="no">לא</string>
-  <string name="cont">המשך</string>
-  <string name="tab_history">היסטוריה</string>
-  <string name="menu_clear_history">טהר</string>
-  <string name="pref_stun_server">שרת Stun</string>
-  <string name="pref_ice_enable">אפשר ICE</string>
-  <string name="failed">נכשל</string>
-  <string name="first_login_username">שם משתמש</string>
-  <string name="first_login_password">סיסמה</string>
-  <string name="first_login_connect">התחבר</string>
-  <string name="pref_media_encryption">הצפנת מדיה</string>
-  <string name="media_encryption_none">בלי</string>
-  <string name="pref_sipaccounts">חשבונות SIP</string>
-  <string name="pref_wifi_only">Wifi בלבד</string>
-  <string name="delete">מחק</string>
-  <string name="chat">שיחה</string>
-  <string name="call">קריאה</string>
-  <string name="conference">ועידה</string>
-  <string name="no_chat_history">אין היסטוריית שיחה.</string>
-  <string name="call_stats_audio">שמע</string>
-  <string name="call_stats_video">וידאו</string>
-  <string name="call_stats_codec">קודק:</string>
-  <!--Used by Android to help blind people by describing them images-->
-  <string name="content_description_new_contact">איש קשר חדש</string>
-  <string name="content_description_call">קריאה</string>
-  <string name="content_description_chat">שיחה</string>
-  <string name="content_description_add_call">הוסף שיחה</string>
-  <string name="content_description_hang_up">סיים</string>
-  <string name="content_description_led"></string>
-  <string name="content_description_cancel">ביטול</string>
-  <string name="content_description_conference">ועידה</string>
-  <string name="content_description_mark"></string>
-  <string name="setup_apply">החל</string>
-  <string name="setup_password_hint">סיסמה</string>
-  <string name="setup_domain_hint">מתחם</string>
-  <string name="setup_password_confirm_hint">הזן שוב סיסמה</string>
-  <string name="setup_create">צור חשבון</string>
-  <string name="button_history">היסטוריה</string>
-  <string name="button_contacts">אנשי קשר</string>
-  <string name="button_settings">הגדרות</string>
-  <string name="button_chat">שיחה</string>
-  <string name="button_about">אודות</string>
-  <string name="button_setup_cancel">ביטול</string>
-  <string name="button_setup_back">חזור</string>
-  <string name="button_setup_next">קדימה</string>
-  <string name="button_new_chat">דיון חדש</string>
-  <string name="button_edit">ערוך</string>
-  <string name="button_cancel">ביטול</string>
-  <string name="button_ok">אישור</string>
-  <string name="button_back">חזור</string>
-  <string name="button_all_contacts">הכל</string>
-  <string name="button_add_contact">איש קשר חדש</string>
-  <string name="button_all_call">הכל</string>
-  <string name="button_delete_all">מחק</string>
-  <string name="button_transfer">העבר</string>
-  <string name="button_add_call">הוסף שיחה</string>
-  <string name="button_video">וידאו</string>
-  <string name="button_speaker">רמקול</string>
-  <string name="button_options">אפשרויות</string>
-  <string name="call_update_yes">קבל</string>
-  <string name="call_update_no">דחה</string>
-  <string name="delete_contact">מחק</string>
-  <string name="pref_user_name_title">שם משתמש</string>
-  <string name="today">היום</string>
-  <string name="yesterday">אתמול</string>
-  <string name="show_image">הצג</string>
-  <string name="download_image">הורד</string>
-  <string name="pref_upnp_enable">אפשר UPNP</string>
-  <string name="wait">אנא המתן...</string>
-  <string name="default_account_flag">חשבון שגרתי</string>
-  <string name="zrtp_accept">קבל</string>
-  <string name="retry">נסה שוב</string>
-</resources>
diff --git a/res/values-ja/custom.xml b/res/values-ja/custom.xml
deleted file mode 100644
index 916643b9b..000000000
--- a/res/values-ja/custom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="history_date_format">d MMM</string>
-  <string name="history_detail_date_format">EEEE MMM d HH:mm</string>
-  <string name="messages_date_format">d MMM HH:mm</string>
-  <string name="today_date_format">HH:mm</string>
-  <string name="picture_name_format">linphone-mms-%s.jpg</string>
-  <string name="app_name">Linphone</string>
-  <string name="service_name">Linphone サービス</string>
-  <string name="addressbook_label">Linphone</string>
-  <string name="notification_title">Linphone</string>
-  <string name="wait_dialog_text">はじめる</string>
-  <string name="notification_registered">%s に登録しました</string>
-  <string name="notification_register_failure">%s への登録に失敗しました</string>
-  <string name="about_text">Linphone %s SIP (rfc 3261) compatible phone under GNU Public License V2</string>
-  <string name="setup_welcome">アシスタントがSIPアカウントを使ってあなたの通話を助けます。</string>
-  <string name="setup_create_account">linphone.orgのアカウントを作成する</string>
-  <string name="setup_login_linphone">linphone.orgのアカウントをすでに持っている</string>
-  <string name="setup_login_generic">SIPアカウントをすでに持っている</string>
-  <string name="setup_linphone_account_hint">linphone.orgのユーザー名とパスワードを入力してください</string>
-  <string name="setup_general_account_hint">SIPアカウントのユーザー名とパスワードとドメインを入力してください</string>
-  <string name="setup_username_hint">ユーザー名</string>
-  <string name="button_sip_contacts">SIP</string>
-  <string name="tunnel_host"></string>
-</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
deleted file mode 100644
index 8bc0e7690..000000000
--- a/res/values-ja/strings.xml
+++ /dev/null
@@ -1,404 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="pref_disable_account">無効</string>
-  <string name="pref_tunnel">トンネル</string>
-  <string name="pref_tunnel_host">ホスト名</string>
-  <string name="pref_tunnel_port">ポート</string>
-  <string name="pref_tunnel_mode">モード</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>無効</item>
-    <item>3Gのみ</item>
-    <item>常に</item>
-    <item>自動</item>
-  </string-array>
-  <string name="incall_notif_active">オーディオの呼び出し継続中</string>
-  <string name="incall_notif_paused">コールの一時停止中</string>
-  <string name="incall_notif_video">ビデオキャプチャーコール進行中</string>
-  <string name="not_ready_to_make_new_call">呼び出しの準備ができていません</string>
-  <string name="bad_target_uri">不正規な接続 : %s</string>
-  <string name="reset_sas_fmt">リセットを検証 %s</string>
-  <string name="verify_sas_fmt">%s を確認してください</string>
-  <string name="communication_encrypted">暗号化</string>
-  <string name="waiting_for_startup">起動中...</string>
-  <string name="couldnt_accept_call">コールの受け入れにエラーが発生しました</string>
-  <string name="error_adding_new_call">新しいコールにエラーが発生しました</string>
-  <string name="transfer_started">転送を開始する</string>
-  <string name="transfer_dialog_title">転送コール</string>
-  <string name="transfer_to_new_call">新しい呼び出し</string>
-  <string name="resume_dialog_title">呼び出しを再開</string>
-  <string name="cannot_resume_paused_by_remote_call">リモートで呼び出しの一時停止を再開することはできません</string>
-  <string name="conf_show_details_text">詳細を表示</string>
-  <string name="skipable_error_service_not_ready">警告：サービスが準備できていません</string>
-  <string name="close_button_text">閉じる</string>
-  <string name="status_conf_call">設定</string>
-  <string name="status_active_call">活動</string>
-  <string name="state_paused">停止</string>
-  <string name="state_paused_by_remote">リモート停止</string>
-  <string name="state_streams_running"></string>
-  <string name="state_incoming_received">着信</string>
-  <string name="state_outgoing_ringing">鳴動</string>
-  <string name="state_outgoing_progress">呼び出し中</string>
-  <string name="mutemic_button_txt">ミュート</string>
-  <string name="speaker_button_txt">スピーカー</string>
-  <string name="bluetooth_button_txt">Bluetooth</string>
-  <string name="CancelButtonText">キャンセル</string>
-  <string name="AddCallButtonText">呼び出し追加</string>
-  <string name="TransferCallButtonText">呼び出し転送</string>
-  <string name="conf_admin_choice_enter">会議を入力してください</string>
-  <string name="conf_admin_choice_leave">会議を瞬間的に残す</string>
-  <string name="conf_admin_choice_terminate">会議を終了</string>
-  <string name="hangup">ハングアップ</string>
-  <string name="conf_simple_merge_bt_txt">結合</string>
-  <string name="conf_simple_transfer_bt_txt">転送</string>
-  <string name="conf_simple_video_bt_txt">ビデオ</string>
-  <!--<string name="conf_simple_no_current_call">No active call</string>-->
-  <string name="show_send_dtmfs_button">ダイヤル画面</string>
-  <string name="conf_conference">会議</string>
-  <string name="in_conf">あなたはそこの一員です</string>
-  <string name="in_conf_leave">外出</string>
-  <string name="out_conf">あなたはそこの一員ではありません</string>
-  <string name="out_conf_enter">入る</string>
-  <string name="pref_audio_hacks_title">オーディオ設定</string>
-  <string name="pref_audio_use_specific_mode_title">特定のハックを使用する</string>
-  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (デフォルト), 2=MODE_IN_CALL</string>
-  <string name="pref_audio_hacks_use_routing_api_title">ルーティングAPIを使用する</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Galaxy Sハックを使用する</string>
-  <string name="pref_audio_soft_volume_title">ソフトウェアボリュームを使用する</string>
-  <string name="pref_ipv6_title">IPv4ではなくIPv6を使用する</string>
-  <string name="error_while_accepting_pending_call">エラー保留中の通話を受け入れる</string>
-  <string name="incoming_call_dialog_title">%s があなたを呼び出しています</string>
-  <string name="accept">受理</string>
-  <string name="decline">辞退</string>
-  <string name="unknown_incoming_call_name">不明</string>
-  <string name="pref_network_title">ネットワーク</string>
-  <string name="pref_transport">トランスポート</string>
-  <string name="pref_transport_udp">UDP</string>
-  <string name="pref_transport_tcp">TCP</string>
-  <string name="pref_transport_tls">TLS</string>
-  <string name="pref_transport_use_random_ports">ランダムポートを使用する</string>
-  <string name="pref_sip_port_title">SIPポートを使用する</string>
-  <string name="at_least_a_protocol">少なくとも一つの選択が必要です</string>
-  <string name="first_launch_ok">正常に登録されました</string>
-  <string name="error">エラー</string>
-  <string name="click_to_show_first_login_view">スタート</string>
-  <string name="dialer_null_on_new_intent">準備ができていません</string>
-  <string name="pref_add_account">アカウントを追加する</string>
-  <string name="no_phone_numbers">%s 用の電話番号が見つかりません</string>
-  <string name="filter_contacts">フィルターの連絡先</string>
-  <string name="title_numbers_dialog">%s の電話番号</string>
-  <string name="pref_delete_account">このアカウントを削除する</string>
-  <string name="pref_default_account">デフォルトで使用する</string>
-  <string name="pref_echo_canceller_calibration">エコーキャンセラーの調整</string>
-  <string name="pref_video_use_front_camera_title">フロントカメラを使用する</string>
-  <string name="pref_video">ビデオ</string>
-  <string name="pref_preferences">設定</string>
-  <string name="pref_video_codecs_title">コーデック</string>
-  <string name="pref_preferred_video_size">動画の大きさ</string>
-  <string name="menu_videocall_back_to_dialer_title">ダイヤル画面を表示</string>
-  <string name="menu_videocall_switch_camera_title">フロント/リア カメラ</string>
-  <string name="menu_videocall_change_resolution_when_low_resolution">高解像度にする</string>
-  <string name="menu_videocall_change_resolution_when_high_resolution">低解像度にする</string>
-  <string name="menu_videocall_change_resolution_title">解像度を変更する</string>
-  <string name="menu_videocall_toggle_camera_title">停止/再開 カメラ</string>
-  <string name="menu_videocall_toggle_camera_disable">カメラを無効にする</string>
-  <string name="menu_videocall_toggle_camera_enable">カメラを有効にする</string>
-  <string name="menu_videocall_terminate_call_title">呼び出しを終了する</string>
-  <string name="pref_video_settings_title">ビデオ設定</string>
-  <string name="pref_video_automatically_share_my_video_title">カメラを共有する</string>
-  <string name="pref_video_automatically_accept_video_title">ビデオ表示の要求を受け入れる</string>
-  <string name="pref_video_automatically_share_my_video">カメラ映像を自動で送信する</string>
-  <string name="pref_video_automatically_accept_video">ビデオ表示の要求を常に受け入れる</string>
-  <string name="pref_video_initiate_call_with_video_title">ビデオ通話を開始する</string>
-  <string name="pref_video_initiate_call_with_video">ビデオ表示の要請を常に送信</string>
-  <string name="pref_video_enable_title">ビデオを有効にする</string>
-  <string name="pref_animation_enable_title">アニメーションを有効にする</string>
-  <string name="pref_escape_plus">00 で置き換える</string>
-  <string name="pref_ilbc_summary">iLBCは、 ARMプロセッサとAndroid OSのバージョンによっては使用できないことがあります。</string>
-  <string name="pref_echo_cancellation">エコーキャンセル</string>
-  <string name="pref_autostart">起動時に開始する</string>
-  <string name="pref_enable_outbound_proxy">Outbound proxy</string>
-  <string name="pref_codecs">Codecs</string>
-  <string name="pref_communication_expire_title">通信がタイムアウト</string>
-  <string name="pref_incoming_expire_title">呼び出し時間のタイムアウト</string>
-  <string name="pref_video_port_title">ビデオのポートまたはポート範囲</string>
-  <string name="pref_audio_port_title">オーディオのポートまたはポート範囲</string>
-  <string name="pref_video_port_description">ビデオのポートまたはポート範囲 (最小-最大)</string>
-  <string name="pref_audio_port_description">オーディオのポートまたはポート範囲 (最小-最大)</string>
-  <string name="pref_incoming_call_timeout_title">呼び出しを終了する (秒単位)</string>
-  <string name="place_call_chooser">電話をかける</string>
-  <string name="pref_adaptive_rate_control">適応レート制御</string>
-  <string name="pref_adaptive_rate_algorithm">適応レート方式</string>
-  <string name="pref_codec_bitrate_limit">コーデックのビットレート制限</string>
-  <string-array name="limit_bitrate_entries">
-    <item>10 kbits/s</item>
-    <item>15 kbits/s</item>
-    <item>20 kbits/s</item>
-    <item>36 kbits/s</item>
-    <item>64 kbits/s</item>
-    <item>128 kbits/s</item>
-  </string-array>
-  <string name="pref_debug">デバッグ</string>
-  <string name="about_report_issue">問題をレポート</string>
-  <string name="about_bugreport_email_text">問題点を説明してください</string>
-  <string name="about_error_generating_bugreport_attachement">問題点の報告にエラーが発生しました</string>
-  <string name="about_logs_not_found">ログが見つかりません。</string>
-  <string name="about_reading_logs">ログを読むには時間がかかります...</string>
-  <string name="about_mailer_chooser_text">これでバグレポートを送信</string>
-  <string name="menu_about">アバウト</string>
-  <string name="menu_send_log">ログを送信する</string>
-  <string name="menu_reset_log">ログをリセットする</string>
-  <string name="pref_audio">オーディオ</string>
-  <string name="menu_exit">退出</string>
-  <string name="pref_prefix">プレフィックス</string>
-  <string name="pref_advanced">拡張</string>
-  <string name="menu_settings">設定</string>
-  <string name="pref_proxy">プロキシ</string>
-  <string name="pref_domain">ドメイン*</string>
-  <string name="pref_passwd">パスワード*</string>
-  <string name="pref_username">ユーザー名*</string>
-  <string name="pref_sipaccount">SIPアカウント</string>
-  <string name="wrong_username">ユーザー名が間違っています</string>
-  <string name="wrong_passwd">パスワードが間違っています</string>
-  <string name="wrong_domain">ドメイン名が間違っています</string>
-  <string name="wrong_settings">設定が間違っています</string>
-  <string name="tab_dialer">ダイヤラー</string>
-  <string name="tab_contact">連絡先</string>
-  <string name="call_error">%s には呼び出しができません</string>
-  <string name="yes">はい</string>
-  <string name="no">いいえ</string>
-  <string name="dismiss">辞退</string>
-  <string name="cont">続行</string>
-  <string name="never_remind">思い出させない</string>
-  <string name="config_error">%s さん、あなたは設定ページに行きたいですか？</string>
-  <string name="ec_calibration_launch_message">エコーキャンセルのためのオーディオ調整を開始する</string>
-  <string name="warning_already_incall">呼び出しを実行しているため、新しい呼び出しは開始できません</string>
-  <string name="tab_history">履歴</string>
-  <string name="warning_wrong_destination_address">[%s] からの送信先アドレスは構築できません</string>
-  <string name="menu_clear_history">消去</string>
-  <string name="error_cannot_get_call_parameters">呼び出しのパラメータが取得できません</string>
-  <string name="error_cannot_create_default_parameters">デフォルトのコールパラメータを作成できません</string>
-  <string name="error_cannot_invite_address">[%s] の宛先アドレスは招待できません</string>
-  <string name="notification_started">はじめる</string>
-  <string name="pref_echo_cancellation_summary">相手が聞こえるエコーを削除する</string>
-  <string name="pref_stun_server">Stunサーバー</string>
-  <string name="pref_ice_enable">ICEを有効にする</string>
-  <string name="pref_ice_enable_summary">STUNサーバーはICEを使用する必要があります</string>
-  <string name="ec_calibrating">調整中...</string>
-  <string name="ec_calibrated">調整完了 [%s ms]</string>
-  <string name="no_echo">エコーなし</string>
-  <string name="failed">失敗</string>
-  <string name="first_login_explanation">接続するにはユーザー名とパスワードを入力します。</string>
-  <string name="first_login_username">ユーザー名</string>
-  <string name="first_login_password">パスワード</string>
-  <string name="first_login_connect">接続</string>
-  <string name="first_launch_no_login_password">ユーザー名とパスワードを入力してください</string>
-  <string name="first_launch_bad_login_password">接続できません: ユーザー名とパスワードを確認して再度実行する</string>
-  <string name="pref_amr_summary">AMRコーデックは、お使いの電話で使用できない場合があります</string>
-  <string name="pref_media_encryption">メディアの暗号化</string>
-  <string name="media_encryption_none">なし</string>
-  <string name="pref_video_codec_h264_unavailable">無効なコーデックです。有効にするには、ソースコードからアプリを構築する必要があります。</string>
-  <string name="pref_video_codec_mpeg4_unavailable">無効なコーデックです。有効にするには、ソースコードからアプリを構築する必要があります。</string>
-  <string name="pref_sipaccounts">SIPアカウント</string>
-  <string name="pref_wifi_only">WiFIでのみ使用</string>
-  <string name="pref_push_notification">プッシュ通知を有効にする</string>
-  <string name="wizard_failed">エラーが発生しました。のちほど再試行してください。</string>
-  <string name="wizard_server_unavailable">サーバーに接続できません。インターネットへの接続を確認してください。</string>
-  <string name="wizard_username_unavailable">このユーザー名はすでに使われています。</string>
-  <string name="wizard_username_incorrect">不正なユーザー名です。</string>
-  <string name="wizard_email_incorrect">不正なメールアドレスです。</string>
-  <string name="wizard_password_incorrect">不正なパスワードです (6文字以上の必要があります)。</string>
-  <string name="wizard_passwords_unmatched">パスワードが異なっています。</string>
-  <string name="pref_help_proxy">SIP のプロキシ名 もしくは IPアドレス (任意)</string>
-  <string name="pref_help_outbound_proxy">SIP プロキシ経由で呼び出しを実行する</string>
-  <string name="pref_help_username">一例: john であればあなたのアカウント は john@sip.example.org</string>
-  <string name="pref_help_domain">sip.example.org であればあなたのアカウント は john@sip.example.org</string>
-  <string name="pref_help_password">あなたのユーザ名/またはドメインを編集した場合はパスワードを再入力する必要があります。</string>
-  <string name="delete">削除</string>
-  <string name="chat">チャット</string>
-  <string name="call">呼び出し</string>
-  <string name="add_to_contacts">連絡相手に登録する</string>
-  <string name="status_connected">登録済</string>
-  <string name="status_not_connected">未登録</string>
-  <string name="status_in_progress">登録に問題があります</string>
-  <string name="status_error">登録できませんでした</string>
-  <string name="addressHint">番号もしくはアドレス</string>
-  <string name="conference">会議</string>
-  <string name="incoming">着信</string>
-  <string name="draft">計画</string>
-  <string name="new_fast_chat">...とチャットするSIPアドレスを入力してください</string>
-  <string name="no_call_history">呼び出し履歴がありません</string>
-  <string name="no_missed_call_history">呼び出しミス履歴がありません</string>
-  <string name="no_contact">電話帳に連絡先がありません</string>
-  <string name="no_sip_contact">電話帳にSIPの連絡先がありません</string>
-  <string name="no_chat_history">チャット履歴はありません。</string>
-  <string name="call_stats_audio">オーディオ</string>
-  <string name="call_stats_video">ビデオ</string>
-  <string name="call_stats_codec">コーデック:</string>
-  <string name="call_stats_upload">アップロード幅:</string>
-  <string name="call_stats_download">ダウンロード幅:</string>
-  <string name="call_stats_ice">ICE 接続:</string>
-  <string name="call_stats_video_resolution">ビデオ解像度:</string>
-  <!--Used by Android to help blind people by describing them images-->
-  <string name="content_description_add_contact">連絡先に追加</string>
-  <string name="content_description_new_contact">新しい連絡先</string>
-  <string name="content_description_call">発信</string>
-  <string name="content_description_backspace">バックスペース</string>
-  <string name="content_description_about">ページについて</string>
-  <string name="content_description_chat">チャット</string>
-  <string name="content_description_dial_back">コールバック</string>
-  <string name="content_description_contact_picture">連絡相手の画像</string>
-  <string name="content_description_send_message">送信メッセージ</string>
-  <string name="content_description_detail">詳細</string>
-  <string name="content_description_delete">削除ボタン</string>
-  <string name="content_description_add">追加ボタン</string>
-  <string name="content_description_new_discussion">新しいやりとりを行う</string>
-  <string name="content_description_edit">編集ボタン</string>
-  <string name="content_description_validate">有効化ボタン</string>
-  <string name="content_description_search">検索</string>
-  <string name="content_description_all_contacts">すべての連絡先</string>
-  <string name="content_description_linphone_contacts">Linphoneの連絡先</string>
-  <string name="content_description_call_direction">宛先を指定</string>
-  <string name="content_description_all_calls">すべての呼出</string>
-  <string name="content_description_missed_calls">失敗した呼出</string>
-  <string name="content_description_switch_video">ビデオの切り替え</string>
-  <string name="content_description_toggle_speaker">スピーカー切り替えトグルスイッチ</string>
-  <string name="content_description_toggle_micro">マイク切り替えトグルスイッチ</string>
-  <string name="content_description_add_call">追加発信</string>
-  <string name="content_description_pause">一時停止</string>
-  <string name="content_description_hang_up">ハングアップ</string>
-  <string name="content_description_numpad">キーパッド</string>
-  <string name="content_description_settings">設定ボタン</string>
-  <string name="content_description_dialer">ダイヤラー</string>
-  <string name="content_description_history">履歴ボタン</string>
-  <string name="content_description_chat_button">チャットボタン</string>
-  <string name="content_description_contacts">連絡ボタン</string>
-  <string name="content_description_led"></string>
-  <string name="content_description_call_quality">通話品質</string>
-  <string name="content_description_encryption">暗号化</string>
-  <string name="content_description_switch_camera">カメラをスイッチする</string>
-  <string name="content_description_welcome">アカウント設定にようこそ</string>
-  <string name="content_description_cancel">キャンセル</string>
-  <string name="content_description_cancel_button">キャンセルボタン</string>
-  <string name="content_description_next">進むボタン</string>
-  <string name="content_description_back">戻るボタン</string>
-  <string name="content_description_setup_ok">OK</string>
-  <string name="content_description_message_status">メッセージ状態</string>
-  <string name="content_description_conference">会談</string>
-  <string name="content_description_mark"></string>
-  <string name="setup_title">アカウント設定アシスタント</string>
-  <string name="setup_apply">適用</string>
-  <string name="setup_password_hint">パスワード</string>
-  <string name="setup_domain_hint">ドメイン</string>
-  <string name="setup_password_confirm_hint">パスワード再入力</string>
-  <string name="setup_email_hint">メール</string>
-  <string name="setup_create">アカウントを作成する</string>
-  <string name="setup_validate_account">あなたのメールアドレスにメールが送信されました。アカウントを作成するため、あなたはメール内にあるリンクをクリックする必要があります。それが完了次第、こちらに戻って、上のボタンをクリックしてください。</string>
-  <string name="setup_check_account_validation">確認</string>
-  <string name="setup_account_not_validated">あなたのアカウントはまだ確認されていません。</string>
-  <string name="setup_account_validated">あなたのアカウントは確認されています。</string>
-  <string name="button_history">履歴</string>
-  <string name="button_contacts">コンタクト</string>
-  <string name="button_settings">設定</string>
-  <string name="button_chat">チャット</string>
-  <string name="button_about">アバウト</string>
-  <string name="button_setup_cancel">キャンセル</string>
-  <string name="button_setup_back">戻る</string>
-  <string name="button_setup_next">はじめましょう</string>
-  <string name="button_new_chat">新しい会話</string>
-  <string name="button_edit">編集</string>
-  <string name="button_cancel">キャンセル</string>
-  <string name="button_ok">はい</string>
-  <string name="button_back">戻る</string>
-  <string name="button_all_contacts">すべて</string>
-  <string name="button_add_contact">新しい連絡先</string>
-  <string name="button_all_call">すべて</string>
-  <string name="button_missed_call">ミス</string>
-  <string name="button_delete_all">削除</string>
-  <string name="button_transfer">転送</string>
-  <string name="button_add_call">追加発信</string>
-  <string name="button_video">ビデオ</string>
-  <string name="button_micro">マイクロ</string>
-  <string name="button_speaker">スピーカー</string>
-  <string name="button_route">ルート</string>
-  <string name="button_receiver">レシーバー</string>
-  <string name="button_bluetooth">Bluetooth</string>
-  <string name="button_options">オプション</string>
-  <string name="button_send_message">送信</string>
-  <string name="button_send_picture">Pic</string>
-  <string name="uploading_image">アップロード中...</string>
-  <string name="call_update_title">コール更新が要求されました</string>
-  <string name="call_update_desc">あなたの通話相手は現在の通話にビデオを追加しようとしています。</string>
-  <string name="call_update_yes">受理</string>
-  <string name="call_update_no">辞退</string>
-  <string name="share_picture_size_small">小さい</string>
-  <string name="share_picture_size_medium">中くらい</string>
-  <string name="share_picture_size_large">大きい</string>
-  <string name="share_picture_size_real">原寸大</string>
-  <string name="save_picture">写真を保存する</string>
-  <string name="text_copied_to_clipboard">テキストをクリップボードにコピーする</string>
-  <string name="copy_text">コピーしたテキスト</string>
-  <string name="image_picker_title">選択したソース</string>
-  <string name="image_saved">保存した画像</string>
-  <string name="image_not_saved">エラー、画像が保存できません。</string>
-  <string name="pref_linphone_friend_title">友だち</string>
-  <string name="pref_auto_accept_friends_title">新しい友だち</string>
-  <string name="linphone_friend_new_request_title">友だちリクエスト</string>
-  <string name="linphone_friend_new_request_desc">あなたとプレゼンス状態のシェアをしたいと考えています。</string>
-  <string name="setup_ec_calibration">エコーキャンセラーの調整進行中</string>
-  <string name="pref_image_sharing_server_title">共有サーバー</string>
-  <string name="pref_remote_provisioning_title">遠隔準備</string>
-  <string name="delete_contact">削除</string>
-  <string name="sip_address">SIPアドレス</string>
-  <string name="phone_number">電話番号</string>
-  <string name="contact_first_name">名前</string>
-  <string name="contact_last_name">名字</string>
-  <string name="pref_primary_account_title">優先アカウント</string>
-  <string name="pref_display_name_title">表示名</string>
-  <string name="pref_user_name_title">ユーザー名</string>
-  <string name="pref_expire_title">Expire</string>
-  <string name="pref_avpf">AVPF</string>
-  <string name="pref_avpf_rr_interval">AVPFによる正規のRTCP間隔 (1秒 から 5秒)</string>
-  <string name="pref_rfc2833_dtmf">DTMFをRFC2833で送信する</string>
-  <string name="pref_sipinfo_dtmf">DTMFをSIP情報で送信する</string>
-  <string name="pref_voice_mail">ボイスメールのuri</string>
-  <string name="voicemail_unread">未読メッセージ</string>
-  <string name="error_unknown">不明なエラー</string>
-  <string name="error_call_declined">呼び出しが辞退されました</string>
-  <string name="error_user_not_found">ユーザーがおりません</string>
-  <string name="error_incompatible_media">互換性のないメディアパラメーター</string>
-  <string name="error_low_bandwidth">あなたの通話相手は低帯域幅なのでビデオを開始できませんでした。</string>
-  <string name="error_network_unreachable">ネットワークに到達できません</string>
-  <string name="today">今日</string>
-  <string name="yesterday">昨日</string>
-  <string name="call_state_missed">ミス</string>
-  <string name="call_state_outgoing">発信</string>
-  <string name="call_state_incoming">着信</string>
-  <string name="pref_background_mode">背後作動モード</string>
-  <string name="show_image">見せる</string>
-  <string name="download_image">ダウンロード</string>
-  <string name="download_image_failed">ダウンロードに失敗しました。インターネット接続を確認するか、のちほどお試しください。</string>
-  <string name="pref_auth_userid">ユーザーIDを認証</string>
-  <string name="pref_help_auth_userid">認証したいユーザーIDを入力します (任意)</string>
-  <string name="pref_display_name">表示名</string>
-  <string name="pref_help_display_name">表示名を入力 (オプション)</string>
-  <string name="pref_upnp_enable">UPNPを有効にする</string>
-  <string name="pref_manage">管理</string>
-  <string name="wait">お待ちください...</string>
-  <string name="importing_messages">メッセージのデータベースを更新する</string>
-  <string name="default_account_flag">デフォルトのアカウント</string>
-  <string name="setup_remote_provisioning">プロビジョニングを保存</string>
-  <string name="setup_remote_provisioning_hint">このアシスタントは、既存の設定をダウンロードします。</string>
-  <string name="setup_remote_provisioning_url_hint">プロビジョニングのURL</string>
-  <string name="setup_remote_provisioning_login_hint">ダウンロードした設定にはあなたのアカウント情報が含まれていませんのでそれを記入してください。</string>
-  <string name="setup_title_assistant">アカウント設定アシスタント</string>
-  <string name="zrtp_accept">受理</string>
-  <string name="zrtp_deny">拒否</string>
-  <string name="zrtp_help">あなたの通話相手と同じコード(上記参照)を持っている場合のみ受け入れてください</string>
-  <string name="remote_composing">リモート先が入力中...</string>
-  <string name="unread_messages">%i 未読メッセージ</string>
-  <string name="retry">再送</string>
-  <string name="remote_provisioning_failure">ダウンロードした、リモートプロビジョニング設定を適用できませんでした...</string>
-  <string name="remote_provisioning_again_title">遠隔準備</string>
-  <string name="remote_provisioning_again_message">プロビジョニングURIを変更しますか？</string>
-</resources>
diff --git a/res/values-nl/custom.xml b/res/values-nl/custom.xml
deleted file mode 100644
index f3f54f223..000000000
--- a/res/values-nl/custom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="history_date_format">d MMM</string>
-  <string name="history_detail_date_format">EEEE MMM d HH:mm</string>
-  <string name="messages_date_format">HH:mm d MMM</string>
-  <string name="today_date_format">HH:mm</string>
-  <string name="picture_name_format">linphone-mms-%s.jpg</string>
-  <string name="app_name">Linphone</string>
-  <string name="service_name">Linphone-dienst</string>
-  <string name="addressbook_label">Linphone</string>
-  <string name="notification_title">Linphone</string>
-  <string name="wait_dialog_text">Bezig met opstarten</string>
-  <string name="notification_registered">Geregistreerd naar %s</string>
-  <string name="notification_register_failure">Het registreren naar %s is mislukt</string>
-  <string name="about_text">Linphone %s SIP (rfc 3261)-compatibele telefoonapp onder de licentie van GNU Public License V2</string>
-  <string name="setup_welcome">Deze wizard zal u helpen bij het gebruiken van een SIP-account voor uw oproepen.</string>
-  <string name="setup_create_account">Creëer een account op linphone.org</string>
-  <string name="setup_login_linphone">Ik heb al een linphone.org-account</string>
-  <string name="setup_login_generic">Ik heb al een SIP-account</string>
-  <string name="setup_linphone_account_hint">Vul uw linphone.org-gebruikersnaam en -wachtwoord in</string>
-  <string name="setup_general_account_hint">Vul uw SIP-account-gebruikersnaam, -wachtwoord en -domeinnaam in</string>
-  <string name="setup_username_hint">gebruikersnaam</string>
-  <string name="button_sip_contacts">SIP</string>
-  <string name="tunnel_host"></string>
-</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
deleted file mode 100644
index dfbe6afe1..000000000
--- a/res/values-nl/strings.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="pref_disable_account">Uitschakelen</string>
-  <string name="pref_tunnel">Tunnel</string>
-  <string name="pref_tunnel_host">Hostnaam</string>
-  <string name="pref_tunnel_port">Poort</string>
-  <string name="pref_tunnel_mode">Modus</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string name="verify_sas_fmt">%s verifiëren</string>
-  <string name="communication_encrypted">Versleuteld</string>
-  <string name="waiting_for_startup">Opstarten…</string>
-  <string name="transfer_to_new_call">Nieuwe oproep</string>
-  <string name="resume_dialog_title">Oproep hervatten</string>
-  <string name="conf_show_details_text">Details tonen</string>
-  <string name="close_button_text">Sluiten</string>
-  <string name="status_conf_call">conf</string>
-  <string name="status_active_call">actief</string>
-  <string name="state_paused">gepauzeerd</string>
-  <string name="state_streams_running"></string>
-  <string name="state_incoming_received">inkomend</string>
-  <string name="state_outgoing_progress">bellen</string>
-  <string name="speaker_button_txt">Luidspreker</string>
-  <string name="bluetooth_button_txt">Bluetoot</string>
-  <string name="CancelButtonText">Annuleren</string>
-  <string name="AddCallButtonText">Oproep toevoegen</string>
-  <string name="TransferCallButtonText">Doorschakelen</string>
-  <string name="hangup">Ophangen</string>
-  <string name="conf_simple_video_bt_txt">video</string>
-  <!--<string name="conf_simple_no_current_call">No active call</string>-->
-  <string name="show_send_dtmfs_button">Toetsenblok</string>
-  <string name="pref_audio_hacks_title">Audiohacks</string>
-  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (standaard), 2=MODE_IN_CALL</string>
-  <string name="pref_audio_hacks_use_routing_api_title">Routing API-hack gebruiken</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Galaxy S-audiohack gebruiken</string>
-  <string name="pref_audio_soft_volume_title">Softwarevolume gebruiken</string>
-  <string name="pref_ipv6_title">IPv6 in plaats van IPv4 gebruiken</string>
-  <string name="accept">Accepteren</string>
-  <string name="decline">Weigeren</string>
-  <string name="unknown_incoming_call_name">Onbekend</string>
-  <string name="pref_network_title">Netwerk</string>
-  <string name="pref_transport">Transport</string>
-  <string name="pref_transport_udp">UDP</string>
-  <string name="pref_transport_tcp">TCP</string>
-  <string name="pref_transport_tls">TLS</string>
-  <string name="pref_transport_use_random_ports">Willekeurige poorten gebruiken</string>
-  <string name="error">Fout</string>
-  <string name="pref_add_account">Account toevoegen</string>
-  <string name="pref_video">Video</string>
-  <string name="pref_preferences">Voorkeuren</string>
-  <string name="pref_video_codecs_title">Codecs</string>
-  <string name="menu_videocall_change_resolution_when_low_resolution">Hoge resolutie proberen</string>
-  <string name="menu_videocall_change_resolution_when_high_resolution">Lage resolutie</string>
-  <string name="menu_videocall_change_resolution_title">Resolutie veranderen</string>
-  <string name="menu_videocall_toggle_camera_disable">Camera uitschakelen</string>
-  <string name="menu_videocall_toggle_camera_enable">Camera inschakelen</string>
-  <string name="menu_videocall_terminate_call_title">Oproep beëindigen</string>
-  <string name="pref_video_settings_title">Video-instellingen</string>
-  <string name="pref_video_enable_title">Video inschakelen</string>
-  <string name="pref_animation_enable_title">Animaties inschakelen</string>
-  <string name="pref_escape_plus">+ door 00 vervangen</string>
-  <string name="pref_codecs">Codecs</string>
-  <string-array name="limit_bitrate_entries">
-    <item>10 kbits/s</item>
-    <item>15 kbits/s</item>
-    <item>20 kbits/s</item>
-    <item>36 kbits/s</item>
-    <item>64 kbits/s</item>
-    <item>128 kbits/s</item>
-  </string-array>
-  <string name="pref_debug">Foutopsporing</string>
-  <string name="about_report_issue">Problem rapporteren</string>
-  <string name="menu_about">Over</string>
-  <string name="menu_send_log">Log versturen</string>
-  <string name="pref_audio">Audio</string>
-  <string name="menu_exit">Afsluiten</string>
-  <string name="pref_prefix">Voorvoegsel</string>
-  <string name="pref_advanced">Geavanceerd</string>
-  <string name="menu_settings">Instellingen</string>
-  <string name="pref_proxy">Proxy</string>
-  <string name="pref_domain">Domein*</string>
-  <string name="pref_passwd">Wachtwoord*</string>
-  <string name="pref_username">Gebruikersnaam*</string>
-  <string name="pref_sipaccount">SIP-account</string>
-  <string name="wrong_username">verkeerde gebruikersnaam</string>
-  <string name="wrong_passwd">verkeerd wachtwoord</string>
-  <string name="wrong_domain">Verkeerd domein</string>
-  <string name="wrong_settings">Verkeerde instellingen</string>
-  <string name="tab_contact">Contact</string>
-  <string name="yes">Ja</string>
-  <string name="no">Nee</string>
-  <string name="never_remind">Nooit onthouden</string>
-  <string name="tab_history">Geschiedenis</string>
-  <string name="menu_clear_history">Wissen</string>
-  <string name="pref_stun_server">Stun-server</string>
-  <string name="pref_ice_enable">ICE inschakelen</string>
-  <string name="failed">gefaald</string>
-  <string name="first_login_username">Gebruikersnaam</string>
-  <string name="first_login_password">Wachtwoord</string>
-  <string name="first_login_connect">Verbinden</string>
-  <string name="pref_media_encryption">Mediaversleuteling</string>
-  <string name="media_encryption_none">Geen</string>
-  <string name="pref_sipaccounts">SIP-accounts</string>
-  <string name="delete">Verwijderen</string>
-  <string name="chat">Chat</string>
-  <string name="call">Oproep</string>
-  <string name="status_connected">Geregistreerd</string>
-  <string name="status_not_connected">Niet geregistreerd</string>
-  <string name="no_chat_history">Geen chatgeschiedenis.</string>
-  <string name="call_stats_audio">Audio</string>
-  <string name="call_stats_video">Video</string>
-  <string name="call_stats_codec">Codec:</string>
-  <string name="call_stats_upload">Uploadbandbreedte:</string>
-  <string name="call_stats_download">Downloadbandbreedte:</string>
-  <string name="call_stats_video_resolution">Videogrootte:</string>
-  <!--Used by Android to help blind people by describing them images-->
-  <string name="content_description_new_contact">Nieuw contact</string>
-  <string name="content_description_call">Oproep</string>
-  <string name="content_description_chat">Chat</string>
-  <string name="content_description_add_call">Oproep toevoegen</string>
-  <string name="content_description_hang_up">Ophangen</string>
-  <string name="content_description_led"></string>
-  <string name="content_description_cancel">Annuleren</string>
-  <string name="content_description_mark"></string>
-  <string name="setup_apply">Toepassen</string>
-  <string name="setup_password_hint">wachtwoord</string>
-  <string name="setup_domain_hint">domein</string>
-  <string name="setup_email_hint">e-mail</string>
-  <string name="button_history">Geschiedenis</string>
-  <string name="button_contacts">Contacten</string>
-  <string name="button_settings">Instellingen</string>
-  <string name="button_chat">Chat</string>
-  <string name="button_about">Over</string>
-  <string name="button_setup_cancel">Annuleren</string>
-  <string name="button_cancel">Annuleren</string>
-  <string name="button_all_contacts">Alle</string>
-  <string name="button_add_contact">Nieuw contact</string>
-  <string name="button_all_call">Alle</string>
-  <string name="button_missed_call">Gemist</string>
-  <string name="button_delete_all">Verwijderen</string>
-  <string name="button_add_call">Oproep toevoegen</string>
-  <string name="button_video">Video</string>
-  <string name="button_micro">Micro</string>
-  <string name="button_speaker">Luidspreker</string>
-  <string name="button_bluetooth">Bluetooth</string>
-  <string name="button_options">Opties</string>
-  <string name="call_update_yes">Accepteren</string>
-  <string name="call_update_no">Weigeren</string>
-  <string name="share_picture_size_small">Klein</string>
-  <string name="share_picture_size_medium">Middel</string>
-  <string name="share_picture_size_large">Groot</string>
-  <string name="save_picture">Afbeelding opslaan</string>
-  <string name="pref_linphone_friend_title">Vrienden</string>
-  <string name="pref_auto_accept_friends_title">Nieuwe vrienden</string>
-  <string name="linphone_friend_new_request_title">Vriendverzoek</string>
-  <string name="delete_contact">Verwijderen</string>
-  <string name="sip_address">SIP-adres</string>
-  <string name="phone_number">Telefoonnummer</string>
-  <string name="contact_first_name">Voornaam</string>
-  <string name="contact_last_name">Achternaam</string>
-  <string name="pref_primary_account_title">Primaire account</string>
-  <string name="pref_display_name_title">Weergavenaam</string>
-  <string name="pref_user_name_title">Gebruikersnaam</string>
-  <string name="pref_avpf">AVPF</string>
-  <string name="today">Vandaag</string>
-  <string name="yesterday">Gisteren</string>
-  <string name="call_state_missed">Gemist</string>
-  <string name="call_state_outgoing">Uitgaande</string>
-  <string name="call_state_incoming">Inkomende</string>
-  <string name="pref_background_mode">Achtergrondsmodus</string>
-  <string name="show_image">Weergeven</string>
-  <string name="pref_display_name">Weergavenaam</string>
-  <string name="pref_upnp_enable">UPNP inschakelen</string>
-  <string name="pref_manage">Beheren</string>
-  <string name="default_account_flag">Standaard account</string>
-  <string name="zrtp_accept">Accepteren</string>
-  <string name="zrtp_deny">Weigeren</string>
-</resources>
diff --git a/res/values-ru/custom.xml b/res/values-ru/custom.xml
deleted file mode 100755
index 66296cb8a..000000000
--- a/res/values-ru/custom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="history_detail_date_format">EEEE d MMM HH:mm</string>
-  <string name="app_name">Linphone</string>
-  <string name="addressbook_label">Linphone</string>
-  <string name="notification_title">Linphone</string>
-  <string name="wait_dialog_text">Загружается</string>
-  <string name="notification_registered">Зарегистрирован в %s </string>
-  <string name="notification_register_failure">Ошибка регистрации в %s</string>
-  <string name="about_text">Linphone %s SIP (rfc 3261) совместимый телефон под GPL V2 лицензией</string>
-  <string name="setup_welcome">Этот помощник поможет Вам настроить учётную запись SIP для звонков.</string>
-  <string name="setup_create_account">Создать учётную запись на linphone.org</string>
-  <string name="setup_login_linphone">Уже есть учётная запись на linphone.org</string>
-  <string name="setup_login_generic">Уже есть учётная запись SIP</string>
-  <string name="setup_linphone_account_hint">Введите имя пользователя и пароль учётной записи linphone.org</string>
-  <string name="setup_general_account_hint">Введите имя пользователя, пароль и сервер учётной записи SIP</string>
-  <string name="button_sip_contacts">SIP</string>
-  <string name="tunnel_host"></string>
-</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
deleted file mode 100755
index 8baa8fd65..000000000
--- a/res/values-ru/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="pref_disable_account">Деактивировать</string>
-  <string name="pref_tunnel">Туннель</string>
-  <string name="pref_tunnel_host">Сервер</string>
-  <string name="pref_tunnel_port">Порт</string>
-  <string name="pref_tunnel_mode">Режим</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string-array name="tunnel_mode_entries">
-    <item>выключено</item>
-    <item>только 3G</item>
-    <item>всегда</item>
-    <item>авто</item>
-  </string-array>
-  <string name="incall_notif_active">Идёт Аудио звонок</string>
-  <string name="incall_notif_paused">Звонок на Паузе</string>
-  <string name="incall_notif_video">Идёт Видео звонок</string>
-  <string name="not_ready_to_make_new_call">Невозможно совершить новый звонок</string>
-  <string name="bad_target_uri">Плохой контакт: %s</string>
-  <string name="reset_sas_fmt">Сброс подтверждён %s</string>
-  <string name="verify_sas_fmt">Подтвердить %s</string>
-  <string name="communication_encrypted">Зашифровано</string>
-  <string name="waiting_for_startup">Загружается…</string>
-  <string name="couldnt_accept_call">При приёме звонка произошла ошибка</string>
-  <string name="error_adding_new_call">Ошибка при добавлении звонка</string>
-  <string name="transfer_started">Начат перевод</string>
-  <string name="transfer_dialog_title">Перевод звонка на</string>
-  <string name="transfer_to_new_call">Новый звонок</string>
-  <string name="resume_dialog_title">Возобновить звонок</string>
-  <string name="cannot_resume_paused_by_remote_call">Невозможно возобновить звонок поставленный на паузу оппонентом</string>
-  <string name="conf_show_details_text">Показать детали</string>
-  <string name="skipable_error_service_not_ready">Внимание : сервис не готов</string>
-  <string name="close_button_text">Закрыть</string>
-  <string name="status_conf_call">конф</string>
-  <string name="status_active_call">активен</string>
-  <string name="state_paused">на паузе</string>
-  <string name="state_paused_by_remote">поставлен на паузу оппонентом</string>
-  <string name="state_streams_running"></string>
-  <string name="state_incoming_received">входящий</string>
-  <string name="state_outgoing_ringing">звонящий</string>
-  <string name="state_outgoing_progress">в процессе</string>
-  <string name="mutemic_button_txt">Выключить микрофон</string>
-  <string name="speaker_button_txt">Громкоговоритель</string>
-  <string name="bluetooth_button_txt">Bluetooth</string>
-  <string name="CancelButtonText">Отменить</string>
-  <string name="AddCallButtonText">Добавить звонок</string>
-  <string name="TransferCallButtonText">Перевести звонок</string>
-  <string name="conf_admin_choice_enter">Присоединиться к конференции</string>
-  <string name="conf_admin_choice_leave">Покинуть конференцию</string>
-  <string name="conf_admin_choice_terminate">Прервать конференцию</string>
-  <string name="hangup">Положить трубку</string>
-  <string name="conf_simple_merge_bt_txt">Объединить</string>
-  <string name="conf_simple_transfer_bt_txt">Перевести</string>
-  <string name="conf_simple_video_bt_txt">Видео</string>
-  <!--<string name="conf_simple_no_current_call">No active call</string>-->
-  <string name="show_send_dtmfs_button">Клавиатура</string>
-  <string name="conf_conference">Конференция</string>
-  <string name="in_conf">Вы часть её</string>
-  <string name="in_conf_leave">Выйти</string>
-  <string name="out_conf">Вы вышли</string>
-  <string name="out_conf_enter">Войти</string>
-  <string name="pref_audio_hacks_title">Audio хаки</string>
-  <string name="pref_audio_use_specific_mode_title">Использовать хаки спец. режима</string>
-  <string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (по умолчанию), 2=MODE_IN_CALL</string>
-  <string name="pref_audio_hacks_use_routing_api_title">Использовать хак API маршрутизации</string>
-  <string name="pref_audio_hacks_use_galaxys_hack_title">Использовать аудио хак Galaxy S</string>
-  <string name="pref_audio_soft_volume_title">Использовать \"программную\" громкость</string>
-  <string name="pref_ipv6_title">Использовать ipv6 вместо ipv4</string>
-  <string name="error_while_accepting_pending_call">Ошибка во время приёма входящего звонка</string>
-  <string name="incoming_call_dialog_title">%s звонит Вам</string>
-  <string name="accept">Принять</string>
-  <string name="decline">Отклонить</string>
-  <string name="unknown_incoming_call_name">Неизвестнвй</string>
-  <string name="pref_network_title">Сеть</string>
-  <string name="pref_transport">Транспорт</string>
-  <string name="pref_transport_udp">UDP</string>
-  <string name="pref_transport_tcp">TCP</string>
-  <string name="pref_transport_tls">TLS</string>
-  <string name="pref_transport_use_random_ports">Использовать случайный порт</string>
-  <string name="pref_sip_port_title">SIP порт занят</string>
-  <string name="at_least_a_protocol">По крайней мере 1 протокол обязателен</string>
-  <string name="first_launch_ok">Регистрация успешна</string>
-  <string name="error">Ошибка</string>
-  <string name="click_to_show_first_login_view">Начать</string>
-  <string name="dialer_null_on_new_intent">Приложение не готово</string>
-  <string name="pref_add_account">Добавить учётную запись</string>
-  <string name="no_phone_numbers">Телефонных номеров для %s не найдено</string>
-  <string name="filter_contacts">Фильтровать контакты</string>
-  <string name="title_numbers_dialog">Телефонные номера %s</string>
-  <string name="pref_delete_account">Удалить учётную запись</string>
-  <string name="pref_default_account">Использовать как основную</string>
-  <string name="pref_echo_canceller_calibration">Настроить шумоподавление</string>
-  <string name="pref_video_use_front_camera_title">Использовать фронтальную камеру</string>
-  <string name="pref_video">Видео</string>
-  <string name="pref_preferences">Настройки</string>
-  <string name="pref_video_codecs_title">Кодеки</string>
-  <string name="pref_preferred_video_size">Preferred video size</string>
-  <string name="menu_videocall_back_to_dialer_title">Показать клавиатуру</string>
-  <string name="menu_videocall_switch_camera_title">Лицевая/Задняя камера</string>
-  <string name="menu_videocall_change_resolution_when_low_resolution">Высокое разрешение</string>
-  <string name="menu_videocall_change_resolution_when_high_resolution">Низкое разрешение</string>
-  <string name="menu_videocall_change_resolution_title">Сменить разрешение</string>
-  <string name="menu_videocall_toggle_camera_title">Включить/Выключить камеру</string>
-  <string name="menu_videocall_toggle_camera_disable">Запретить камеру</string>
-  <string name="menu_videocall_toggle_camera_enable">Разрешить камеру</string>
-  <string name="menu_videocall_terminate_call_title">Прекратить звонок</string>
-  <string name="pref_video_settings_title">Настройки видео</string>
-  <string name="pref_video_automatically_share_my_video_title">Совмесный доступ к камере</string>
-  <string name="pref_video_automatically_accept_video_title">Принимать входящие видео звонки</string>
-  <string name="pref_video_automatically_share_my_video">Автоматически посылать видео</string>
-  <string name="pref_video_automatically_accept_video">Всегда принимать видео запросы</string>
-  <string name="pref_video_initiate_call_with_video_title">Начинать видео звонки</string>
-  <string name="pref_video_initiate_call_with_video">Всегда посылать видео запросы</string>
-  <string name="pref_video_enable_title">Разрешить видео</string>
-  <string name="pref_animation_enable_title">Разрешить анимацию</string>
-  <string name="pref_escape_plus">Заменить + на 00</string>
-  <string name="pref_ilbc_summary">iLBC может быть недоступно в Вашей версии ARM процессора и Android OS.</string>
-  <string name="pref_echo_cancellation">Шумоподавление</string>
-  <string name="pref_autostart">Запускаться с системой</string>
-  <string name="pref_enable_outbound_proxy">Исходящий прокси</string>
-  <string name="pref_codecs">Кодеки</string>
-  <string name="pref_communication_expire_title">Таймаут соединения</string>
-  <string name="pref_incoming_expire_title">Таймаут входящего соединения</string>
-  <string name="pref_video_port_title">Видео порт или диапазон портов</string>
-  <string name="pref_audio_port_title">Аудио порт или диапазон портов</string>
-  <string name="pref_video_port_description">Видео порт или диапазон портов (минимум-максимум)</string>
-  <string name="pref_audio_port_description">Аудио порт или диапазон портов (минимум-максимум)</string>
-  <string name="pref_incoming_call_timeout_title">Таймаут входящего соединения (в секундах)</string>
-  <string name="place_call_chooser">Разместить звонок</string>
-  <string name="pref_debug">Отладка</string>
-  <string name="about_report_issue">Сообщить об ошибке</string>
-  <string name="about_bugreport_email_text">Опишите проблему</string>
-  <string name="about_error_generating_bugreport_attachement">Ошибка при генерации отчёта об ошибке</string>
-  <string name="about_logs_not_found">Логи не найдены.</string>
-  <string name="about_reading_logs">Читаю логи, может занять время…</string>
-  <string name="about_mailer_chooser_text">Послать отчёт об ошибке с…</string>
-  <string name="menu_about">О программе</string>
-  <string name="pref_audio">Аудио</string>
-  <string name="menu_exit">Выход</string>
-  <string name="pref_prefix">Префикс</string>
-  <string name="pref_advanced">Продвинутые</string>
-  <string name="menu_settings">Настройки</string>
-  <string name="pref_proxy">Прокси</string>
-  <string name="pref_domain">Сервер*</string>
-  <string name="pref_passwd">Пароль*</string>
-  <string name="pref_username">Имя пользователя*</string>
-  <string name="pref_sipaccount">Имя SIP</string>
-  <string name="wrong_username">неправильное имя поьлзователя</string>
-  <string name="wrong_passwd">неправильный пароль</string>
-  <string name="wrong_domain">Неправильный сервер</string>
-  <string name="wrong_settings">Неправильные настройки</string>
-  <string name="tab_dialer">Клавиатура</string>
-  <string name="tab_contact">Контакт</string>
-  <string name="call_error">Невозможно набрать %s</string>
-  <string name="yes">Да</string>
-  <string name="no">Нет</string>
-  <string name="dismiss">Убрать</string>
-  <string name="cont">Продолжить</string>
-  <string name="never_remind">Больше не напоминать</string>
-  <string name="config_error">%s, хотите ли вы перейти к настройкам ?</string>
-  <string name="ec_calibration_launch_message">Начинаем автоматическую настройку шумоподавления</string>
-  <string name="warning_already_incall">Невозможно начать новый звонок, звонок уже идёт</string>
-  <string name="tab_history">История</string>
-  <string name="warning_wrong_destination_address">Невозможно создать адрес получателя из [%s]</string>
-  <string name="menu_clear_history">Очистить</string>
-  <string name="error_cannot_get_call_parameters">Невозможно получить параметры звонка</string>
-  <string name="error_cannot_create_default_parameters">Невозможно создать параметры звонка по умолчанию</string>
-  <string name="error_cannot_invite_address">Невозможно пригласить получателя [%s]</string>
-  <string name="notification_started">начат</string>
-  <string name="pref_echo_cancellation_summary">Удаляет эхо, слышимое другой стороной</string>
-  <string name="pref_stun_server">Сервер Stun</string>
-  <string name="pref_ice_enable">Разрешить ICE</string>
-  <string name="pref_ice_enable_summary">Сервер STUN должен быть настроен чтобы использовать ICE</string>
-  <string name="ec_calibrating">Настраиваем…</string>
-  <string name="ec_calibrated">Настроено за [%s ms]</string>
-  <string name="no_echo">Нет эха</string>
-  <string name="failed">неудавшийся</string>
-  <string name="first_login_explanation">Введите имя пользователя и пароль для соединения с сервисом.</string>
-  <string name="first_login_username">Имя пользователя</string>
-  <string name="first_login_password">Пароль</string>
-  <string name="first_login_connect">Соединиться</string>
-  <string name="first_launch_no_login_password">Пожалуйста введите имя пользователя и пароль</string>
-  <string name="first_launch_bad_login_password">Невозможно соединиться; проверьте имя пользователя и пароль и попробуйте ещё</string>
-  <string name="pref_amr_summary">Кодек AMR возможно отсутствует в телефоне</string>
-  <string name="pref_media_encryption">Шифрование потока</string>
-  <string name="media_encryption_none">Отсутствует</string>
-  <string name="pref_video_codec_h264_unavailable">Кодек поддерживается только если построено из исходников</string>
-  <string name="pref_video_codec_mpeg4_unavailable">Кодек поддерживается только если построено из исходников</string>
-  <string name="pref_sipaccounts">Учётные записи SIP</string>
-  <string name="pref_wifi_only">Использовать только wifi</string>
-  <string name="pref_push_notification">Разрешить серверные уведомления</string>
-  <string name="wizard_failed">Произошла ошибка, попробуйте повторить позже.</string>
-  <string name="wizard_server_unavailable">Сервер недоступен, проверьте Ваше соединение с интернетом.</string>
-  <string name="wizard_username_unavailable">Это имя пользователя уже использовано.</string>
-  <string name="wizard_username_incorrect">Имя пользователя недопустимо.</string>
-  <string name="wizard_email_incorrect">Недопустимый адрес электронной почты.</string>
-  <string name="wizard_password_incorrect">Недопустимый пароль (минимум 6 знаков).</string>
-  <string name="wizard_passwords_unmatched">Введённые пароли отличаются.</string>
-  <string name="pref_help_proxy">Имя сервера SIP прокси или адрес ip (необязательно)</string>
-  <string name="pref_help_outbound_proxy">Отправить все звонки через SIP прокси</string>
-  <string name="pref_help_username">Например: john если Ваш адрес john@sip.example.org</string>
-  <string name="pref_help_domain">sip.example.org если Ваш адрес john@sip.example.org</string>
-  <string name="pref_help_password">You have to re-enter your password if you edit the username and/or the domain</string>
-  <string name="delete">Удалить</string>
-  <string name="chat">Чат</string>
-  <string name="call">Звонок</string>
-  <string name="add_to_contacts">Добавить к контактам</string>
-  <string name="status_connected">Зарегистрирован</string>
-  <string name="status_not_connected">Незарегистрирован</string>
-  <string name="status_in_progress">В процессе регистрации</string>
-  <string name="status_error">Ошибка регистрации</string>
-  <string name="addressHint">Номер или Адрес</string>
-  <string name="conference">Конференция</string>
-  <string name="incoming">Входящий звонок</string>
-  <string name="draft">Черновик</string>
-  <string name="new_fast_chat">Введите адрес SIP для чата…</string>
-  <string name="no_call_history">Нет звонков в вашей истории.</string>
-  <string name="no_missed_call_history">Нет пропущенных звонков в вашей истории.</string>
-  <string name="no_contact">Нет контакта в Вашей адресной книге.</string>
-  <string name="no_sip_contact">Нет SIP контакта в Вашей адресной книге.</string>
-  <string name="no_chat_history">Нет истории чата.</string>
-  <string name="call_stats_audio">Аудио</string>
-  <string name="call_stats_video">Видео</string>
-  <string name="call_stats_codec">Кодек:</string>
-  <string name="call_stats_upload">Полоса пропускания загрузки:</string>
-  <string name="call_stats_download">Полоса пропускания скачивания:</string>
-  <string name="call_stats_ice">Подключение ICE:</string>
-  <string name="call_stats_video_resolution">Video size:</string>
-  <!--Used by Android to help blind people by describing them images-->
-  <string name="content_description_add_contact">Кнопка добавить к контактам</string>
-  <string name="content_description_new_contact">Новый контакт</string>
-  <string name="content_description_call">Звонок</string>
-  <string name="content_description_chat">Чат</string>
-  <string name="content_description_add_call">Добавить звонок</string>
-  <string name="content_description_hang_up">Положить трубку</string>
-  <string name="content_description_dialer">Клавиатура</string>
-  <string name="content_description_led"></string>
-  <string name="content_description_cancel">Отменить</string>
-  <string name="content_description_conference">Конференция</string>
-  <string name="content_description_mark"></string>
-  <string name="setup_title">Помощник Настройки учётной записи</string>
-  <string name="setup_apply">Применить</string>
-  <string name="setup_password_hint">пароль</string>
-  <string name="setup_domain_hint">сервер</string>
-  <string name="setup_password_confirm_hint">подтвердить пароль</string>
-  <string name="setup_email_hint">адрес электронной почты</string>
-  <string name="setup_create">Создать учётную запись</string>
-  <string name="setup_validate_account">Электронное письмо было послано на указанный адрес. Пройдите по ссылке из этого письма, чтобы активировать Вашу учётную запись. После этого вернитесь сюда и нажмите на кнопку выше.</string>
-  <string name="setup_check_account_validation">Проверить</string>
-  <string name="setup_account_not_validated">Ваша учётная запись ещё не подтверждена.</string>
-  <string name="setup_account_validated">Ваша учётная запись подтверждена.</string>
-  <string name="button_history">История</string>
-  <string name="button_contacts">Контакты</string>
-  <string name="button_settings">Настройки</string>
-  <string name="button_chat">Чат</string>
-  <string name="button_about">О программе</string>
-  <string name="button_setup_cancel">Отменить</string>
-  <string name="button_setup_back">Назад</string>
-  <string name="button_setup_next">Далее</string>
-  <string name="button_new_chat">Новый разговор</string>
-  <string name="button_edit">Редактировать</string>
-  <string name="button_cancel">Отменить</string>
-  <string name="button_ok">ОК</string>
-  <string name="button_back">Назад</string>
-  <string name="button_all_contacts">Все</string>
-  <string name="button_add_contact">Новый контакт</string>
-  <string name="button_all_call">Все</string>
-  <string name="button_missed_call">Пропущенные</string>
-  <string name="button_delete_all">Удалить</string>
-  <string name="button_transfer">Перевести</string>
-  <string name="button_add_call">Добавить звонок</string>
-  <string name="button_video">Видео</string>
-  <string name="button_micro">Микрофон</string>
-  <string name="button_speaker">Громкость</string>
-  <string name="button_route">Маршрут</string>
-  <string name="button_receiver">Получатель</string>
-  <string name="button_bluetooth">Bluetooth</string>
-  <string name="button_options">Настройки</string>
-  <string name="button_send_message">Послать</string>
-  <string name="button_send_picture">Рис.</string>
-  <string name="uploading_image">Загружаем…</string>
-  <string name="call_update_title">Запрошено обновление звонка</string>
-  <string name="call_update_desc">Ваш собеседник хотел бы добавить видео к звонку.</string>
-  <string name="call_update_yes">Принять</string>
-  <string name="call_update_no">Отклонить</string>
-  <string name="share_picture_size_small">Маленький</string>
-  <string name="share_picture_size_medium">Средний</string>
-  <string name="share_picture_size_large">Большой</string>
-  <string name="share_picture_size_real">Оригинальный размер</string>
-  <string name="save_picture">Сохранить картинку</string>
-  <string name="text_copied_to_clipboard">Текст скопирован в буфер обмена</string>
-  <string name="copy_text">Скопировать текст</string>
-  <string name="image_picker_title">Выбрать источник</string>
-  <string name="image_saved">Картинка сохранена</string>
-  <string name="image_not_saved">Ошибка, картинка не сохранена</string>
-  <string name="pref_linphone_friend_title">Друзья</string>
-  <string name="pref_auto_accept_friends_title">Новые друзья</string>
-  <string name="linphone_friend_new_request_title">Запрос дружбы</string>
-  <string name="linphone_friend_new_request_desc">хочет поделиться своим статусом с Вами и получать обновления Вашего статуса.</string>
-  <string name="setup_ec_calibration">Идёт настройка шумоподавления</string>
-  <string name="pref_image_sharing_server_title">Общий сервер</string>
-  <string name="pref_remote_provisioning_title">Удалённое резервирование</string>
-  <string name="delete_contact">Удалить</string>
-  <string name="sip_address">адрес SIP</string>
-  <string name="phone_number">Номер телефона</string>
-  <string name="contact_first_name">Имя</string>
-  <string name="contact_last_name">Фамилия</string>
-  <string name="pref_primary_account_title">Основная учётная запись</string>
-  <string name="pref_display_name_title">Отображаемое имя</string>
-  <string name="pref_user_name_title">Имя пользователя</string>
-  <string name="pref_expire_title">Истекает</string>
-  <string name="pref_rfc2833_dtmf">Послать RFC2833 DTMFs</string>
-  <string name="pref_sipinfo_dtmf">Послать SIP INFO DTMFs</string>
-  <string name="error_call_declined">Звонок сброшен</string>
-  <string name="error_user_not_found">Пользователь не найден</string>
-  <string name="error_incompatible_media">Несовместимые параметры потока</string>
-  <string name="error_low_bandwidth">У ваш собеседника низкая скорость подключения, видео не может быть использовано</string>
-  <string name="error_network_unreachable">Сеть недоступна</string>
-  <string name="today">Сегодня</string>
-  <string name="yesterday">Вчера</string>
-  <string name="call_state_missed">Пропущенный</string>
-  <string name="call_state_outgoing">Исходящий</string>
-  <string name="call_state_incoming">Входящий</string>
-  <string name="pref_background_mode">Фоновый режим</string>
-  <string name="show_image">Show</string>
-  <string name="download_image">Скачать</string>
-  <string name="download_image_failed">Ошибка скачивания. Проверьте ваше интернет соединение или попробуйте позже.</string>
-  <string name="pref_auth_userid">Auth userid</string>
-  <string name="pref_help_auth_userid">Enter authentication userid (optionnal)</string>
-  <string name="pref_display_name">Display name</string>
-  <string name="pref_help_display_name">Enter display name (optionnal)</string>
-  <string name="pref_upnp_enable">Enable UPNP</string>
-  <string name="pref_manage">Manage</string>
-  <string name="wait">Please wait...</string>
-  <string name="importing_messages">Updating messages database</string>
-  <string name="default_account_flag">Default account</string>
-  <string name="setup_remote_provisioning">Download provisioning</string>
-  <string name="setup_remote_provisioning_hint">This assistant will download an existing configuration.</string>
-  <string name="setup_remote_provisioning_url_hint">provisioning url</string>
-  <string name="setup_title_assistant">Account setup assistant</string>
-  <string name="zrtp_accept">Accept</string>
-  <string name="zrtp_deny">Deny</string>
-  <string name="zrtp_help">You should only accept if you have the same code (see above) as your correspondent</string>
-  <string name="remote_composing">Remote is writing...</string>
-  <string name="unread_messages">%i unread messages</string>
-  <string name="retry">Retry</string>
-  <string name="remote_provisioning_failure">Failed to download or apply remote provisioning profile...</string>
-  <string name="remote_provisioning_again_title">Remote provisioning</string>
-  <string name="remote_provisioning_again_message">Do you want to change the provisioning URI ?</string>
-</resources>
diff --git a/res/values-sr/custom.xml b/res/values-sr/custom.xml
deleted file mode 100644
index 35fb0843e..000000000
--- a/res/values-sr/custom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="history_date_format">д МММ</string>
-  <string name="history_detail_date_format">ГГГГ МММ д ЧЧ:мм</string>
-  <string name="messages_date_format">ЧЧ:мм д МММ</string>
-  <string name="today_date_format">ЧЧ:мм</string>
-  <string name="picture_name_format">linphone-mms-%s.jpg</string>
-  <string name="app_name">Линфон</string>
-  <string name="service_name">Услуга Линфона</string>
-  <string name="addressbook_label">Линфон</string>
-  <string name="notification_title">Линфон</string>
-  <string name="wait_dialog_text">Покрећем се</string>
-  <string name="notification_registered">Уписан на „%s“ </string>
-  <string name="notification_register_failure">Нисам успео да се упишем на „%s“</string>
-  <string name="about_text">Линфон %s телефон сагласан са СИП-ом (rfc 3261) под Гнуовом Јавном Лиценцом и2</string>
-  <string name="setup_welcome">Овај помоћник ће вам помоћи да користите СИП налог за ваше позиве.</string>
-  <string name="setup_create_account">Направи налог на линфон.орг-у</string>
-  <string name="setup_login_linphone">Већ имам налог линфон.орг-а</string>
-  <string name="setup_login_generic">Већ имам СИП налог</string>
-  <string name="setup_linphone_account_hint">Унесите ваше корисничко име и лозинку линфон.орг-а</string>
-  <string name="setup_general_account_hint">Унесите ваше корисничко име, лозинку и домен СИП налога</string>
-  <string name="setup_username_hint">корисничко име</string>
-  <string name="tunnel_host"></string>
-</resources>
diff --git a/res/values-tr/custom.xml b/res/values-tr/custom.xml
deleted file mode 100644
index 65b017a66..000000000
--- a/res/values-tr/custom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="today_date_format">SS:dd</string>
-  <string name="app_name">Linphone</string>
-  <string name="service_name">Linphone Hizmeti</string>
-  <string name="addressbook_label">Linphone</string>
-  <string name="notification_title">Linphone</string>
-  <string name="wait_dialog_text">Başlatılıyor</string>
-  <string name="setup_welcome">Bu yardımcı, aramalarınız için bir SİP hesabı kullanmanıza yardım edecek.</string>
-  <string name="setup_create_account">linphone.org\'da bir hesap oluşturun</string>
-  <string name="setup_login_linphone">Zaten bir linphone.org hesabım var</string>
-  <string name="setup_login_generic">Zaten bir SİP hesabım var</string>
-  <string name="setup_linphone_account_hint">linphone.org kullanıcı adını ve parolasını girin</string>
-  <string name="setup_general_account_hint">SİP hesabınızın kullanıcı adını,parolasını ve alan adını girin</string>
-  <string name="setup_username_hint">kullanıcı adı</string>
-  <string name="tunnel_host"></string>
-</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
deleted file mode 100644
index 711a6c6e5..000000000
--- a/res/values-tr/strings.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="pref_disable_account">Etkin değil</string>
-  <string name="pref_tunnel_host">Makine Adı</string>
-  <string name="pref_tunnel_port">Bağlanma Noktası</string>
-  <string name="pref_tunnel_mode">Kip</string>
-  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
-  <string name="incall_notif_active">Sesli arama sürüyor</string>
-  <string name="not_ready_to_make_new_call">Yeni arama için hazır değil</string>
-  <string name="communication_encrypted">Şifreli</string>
-  <string name="waiting_for_startup">Başlatılıyor...</string>
-  <string name="couldnt_accept_call">Çağrı kabul edilirken bir hata oluştu</string>
-  <string name="error_adding_new_call">Yeni çağrı ekleme hatası</string>
-  <string name="transfer_started">Aktarma başlatıldı</string>
-  <string name="transfer_to_new_call">Yeni arama</string>
-  <string name="conf_show_details_text">Ayrıntıları göster</string>
-  <string name="close_button_text">Kapalı</string>
-  <string name="status_active_call">Etkin</string>
-  <string name="state_paused">Duraklatıldı</string>
-  <string name="state_streams_running"></string>
-  <string name="state_incoming_received">gelen</string>
-  <string name="mutemic_button_txt">Sessiz</string>
-  <string name="speaker_button_txt">Hoparlör</string>
-  <string name="bluetooth_button_txt">Bluetooth</string>
-  <string name="CancelButtonText">İptal</string>
-  <string name="AddCallButtonText">Arama ekle</string>
-  <string name="conf_admin_choice_enter">Çoklu görüşme giriş</string>
-  <string name="conf_admin_choice_leave">Çoklu görüşmeden geçici olarak ayrıl</string>
-  <string name="conf_admin_choice_terminate">Çoklu görüşmeyi sonlandır</string>
-  <string name="hangup">Telefonu kapat</string>
-  <string name="conf_simple_merge_bt_txt">Birleştirme</string>
-  <string name="conf_simple_transfer_bt_txt">Aktarma</string>
-  <string name="conf_simple_video_bt_txt">görüntü</string>
-  <!--<string name="conf_simple_no_current_call">No active call</string>-->
-  <string name="show_send_dtmfs_button">Tuş takımı</string>
-  <string name="conf_conference">Çoklu görüşme</string>
-  <string name="in_conf_leave">Dışarı çık</string>
-  <string name="accept">Kabul et</string>
-  <string name="decline">Reddet</string>
-  <string name="unknown_incoming_call_name">Bilinmeyen</string>
-  <string name="pref_network_title">Ağ</string>
-  <string name="pref_transport_udp">UDP</string>
-  <string name="pref_transport_tcp">TCP</string>
-  <string name="pref_transport_tls">TLS</string>
-  <string name="pref_transport_use_random_ports">Rastgele bağlanma noktası kullan</string>
-  <string name="first_launch_ok">Kayıt başarılı</string>
-  <string name="error">Hata</string>
-  <string name="click_to_show_first_login_view">Başla</string>
-  <string name="dialer_null_on_new_intent">Uygulama hazır değil</string>
-  <string name="pref_add_account">Hesap ekle</string>
-  <string name="filter_contacts">Bağlantı süzgeci</string>
-  <string name="pref_delete_account">Bu hesabı sil</string>
-  <string name="pref_default_account">Öntanımlıyı kullan</string>
-  <string name="pref_video_use_front_camera_title">Ön kamerayı kullan</string>
-  <string name="pref_video">Görüntü</string>
-  <string name="pref_preferences">Yeğlenenler</string>
-  <string name="pref_video_codecs_title">Çözücüler</string>
-  <string name="pref_preferred_video_size">Yeğlenen görüntü boyutu</string>
-  <string name="menu_videocall_switch_camera_title">Ön/Arka Kamera</string>
-  <string name="menu_videocall_change_resolution_when_low_resolution">Yüksek Çözünürlüğü Dene</string>
-  <string name="menu_videocall_change_resolution_when_high_resolution">Düşük Çözünürlük</string>
-  <string name="menu_videocall_change_resolution_title">Çözünürlüğü değiştir</string>
-  <string name="menu_videocall_toggle_camera_disable">Kamera devre dışı</string>
-  <string name="menu_videocall_toggle_camera_enable">Kamera etkin</string>
-  <string name="menu_videocall_terminate_call_title">Çağrıyı sonlandır</string>
-  <string name="pref_video_settings_title">Görüntü ayarları</string>
-  <string name="pref_video_automatically_share_my_video_title">Kameramı paylaş</string>
-  <string name="pref_video_enable_title">Görüntü etkin</string>
-  <string name="pref_codecs">Çözücüler</string>
-  <string name="pref_communication_expire_title">İletişim zaman aşımına uğradı</string>
-  <string name="pref_incoming_expire_title">Gelen çağrı zaman aşımına uğradı</string>
-  <string name="pref_video_port_title">Görüntü bağlantı noktası veya bağlantı noktası aralığı</string>
-  <string name="pref_debug">Hata ayıklama</string>
-  <string name="about_report_issue">Sorun bildirimi</string>
-  <string name="about_logs_not_found">Kayıtlar bulunamadı.</string>
-  <string name="menu_about">Hakkında</string>
-  <string name="pref_audio">Ses</string>
-  <string name="menu_exit">Çıkış</string>
-  <string name="pref_prefix">Önek</string>
-  <string name="pref_advanced">Gelişmiş</string>
-  <string name="menu_settings">Ayarlar</string>
-  <string name="pref_proxy">Vekil</string>
-  <string name="pref_domain">Alan adı*</string>
-  <string name="pref_passwd">Parola*</string>
-  <string name="pref_username">Kullanıcı adı*</string>
-  <string name="pref_sipaccount">SİP Hesabı</string>
-  <string name="wrong_username">yanlış kullanıcı adı</string>
-  <string name="wrong_passwd">yanlış parola</string>
-  <string name="wrong_domain">Yanlış alan adı</string>
-  <string name="wrong_settings">Yanlış ayarlar</string>
-  <string name="tab_dialer">Telefon numarası çevirici</string>
-  <string name="tab_contact">Bağlantı</string>
-  <string name="yes">Evet</string>
-  <string name="no">Hayır</string>
-  <string name="dismiss">Reddet</string>
-  <string name="cont">Sürdürmek</string>
-  <string name="never_remind">Beni asla anımsama</string>
-  <string name="tab_history">Geçmiş</string>
-  <string name="menu_clear_history">Temizle</string>
-  <string name="pref_ice_enable">İCE Etkin</string>
-  <string name="ec_calibrating">Ayarlama...</string>
-  <string name="no_echo">Eko yok</string>
-  <string name="failed">başarısız</string>
-  <string name="first_login_username">Kullanıcı adı</string>
-  <string name="first_login_password">Parola</string>
-  <string name="first_login_connect">Bağlamak</string>
-  <string name="pref_media_encryption">Ortam şifreleme</string>
-  <string name="pref_sipaccounts">SİP Hesabı</string>
-  <string name="pref_wifi_only">Sadece wifi kullan</string>
-  <string name="wizard_failed">Bir hata oluştu,daha sonra tekrar deneyin.</string>
-  <string name="wizard_username_unavailable">Bu kullanıcı adı zaten kullanılıyor.</string>
-  <string name="wizard_username_incorrect">Kullanıcı adınız geçersizdir.</string>
-  <string name="wizard_email_incorrect">E-posta adresiniz geçersizdir.</string>
-  <string name="wizard_password_incorrect">Parolanız geçersiz (en az 6 karakter).</string>
-  <string name="wizard_passwords_unmatched">Girdiğiniz parolalar farklı.</string>
-  <string name="delete">Sil</string>
-  <string name="chat">Sohbet</string>
-  <string name="call">Çağrı</string>
-  <string name="add_to_contacts">Bağlantı ekle</string>
-  <string name="status_connected">Kayıtlı</string>
-  <string name="status_not_connected">Kayıtlı değil</string>
-  <string name="status_in_progress">Kayıt sürüyor</string>
-  <string name="status_error">Kayıt başarısız</string>
-  <string name="addressHint">Numara veya adres</string>
-  <string name="conference">Çoklu görüşme</string>
-  <string name="incoming">Gelen çağrı</string>
-  <string name="draft">Taslak</string>
-  <string name="call_stats_audio">Ses</string>
-  <string name="call_stats_video">Görüntü</string>
-  <string name="call_stats_codec">Çözücü:</string>
-  <string name="call_stats_video_resolution">Görüntü boyutu:</string>
-  <!--Used by Android to help blind people by describing them images-->
-  <string name="content_description_add_contact">Bağlantılara ekle</string>
-  <string name="content_description_new_contact">Yeni bağlantı</string>
-  <string name="content_description_call">Çağrı</string>
-  <string name="content_description_backspace">Geri alma</string>
-  <string name="content_description_chat">Sohbet</string>
-  <string name="content_description_send_message">İleti gönder</string>
-  <string name="content_description_detail">Ayrıntı</string>
-  <string name="content_description_delete">Düğmeyi sil</string>
-  <string name="content_description_add">Düğme ekle</string>
-  <string name="content_description_new_discussion">Yeni tartışma</string>
-  <string name="content_description_search">Arama</string>
-  <string name="content_description_all_contacts">Tüm bağlantılar</string>
-  <string name="content_description_linphone_contacts">Linphone bağlantıları</string>
-  <string name="content_description_call_direction">Çağrı yönlendirme</string>
-  <string name="content_description_all_calls">Tüm çağrılar</string>
-  <string name="content_description_missed_calls">Yanıtsız çağrılar</string>
-  <string name="content_description_add_call">Arama ekle</string>
-  <string name="content_description_pause">Duraklat</string>
-  <string name="content_description_hang_up">Telefonu kapat</string>
-  <string name="content_description_numpad">Sayısal tuş takımı</string>
-  <string name="content_description_settings">Ayarlar düğmesi</string>
-  <string name="content_description_dialer">Telefon numarası çevirici</string>
-  <string name="content_description_history">Geçmiş düğmesi</string>
-  <string name="content_description_chat_button">Sohbet düğmesi</string>
-  <string name="content_description_contacts">Bağlantılar düğmesi</string>
-  <string name="content_description_led"></string>
-  <string name="content_description_call_quality">Çağrı kalitesi</string>
-  <string name="content_description_encryption">Şifreleme</string>
-  <string name="content_description_cancel">İptal</string>
-  <string name="content_description_cancel_button">İptal düğmesi</string>
-  <string name="content_description_setup_ok">Tamam</string>
-  <string name="content_description_conference">Çoklu görüşme</string>
-  <string name="content_description_mark"></string>
-  <string name="setup_title">Hesap Ayar Yardımcısı</string>
-  <string name="setup_apply">Uygulamak</string>
-  <string name="setup_password_hint">parola</string>
-  <string name="setup_domain_hint">alan adı</string>
-  <string name="setup_password_confirm_hint">parolayı onayla</string>
-  <string name="setup_email_hint">eposta</string>
-  <string name="button_history">Geçmiş</string>
-  <string name="button_settings">Ayarlar</string>
-  <string name="button_chat">Sohbet</string>
-  <string name="button_about">Hakkında</string>
-  <string name="button_setup_cancel">İptal</string>
-  <string name="button_cancel">İptal</string>
-  <string name="button_add_contact">Yeni bağlantı</string>
-  <string name="button_delete_all">Sil</string>
-  <string name="button_transfer">Aktarma</string>
-  <string name="button_add_call">Arama ekle</string>
-  <string name="button_video">Görüntü</string>
-  <string name="button_speaker">Hoparlör</string>
-  <string name="button_bluetooth">Bluetooth</string>
-  <string name="call_update_yes">Kabul et</string>
-  <string name="call_update_no">Reddet</string>
-  <string name="delete_contact">Sil</string>
-  <string name="pref_user_name_title">Kullanıcı adı</string>
-  <string name="zrtp_accept">Kabul et</string>
-</resources>
diff --git a/res/values/color.xml b/res/values/color.xml
index 336f84bde..4d967f54e 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorA">#ff5e00</color>
-    <color name="colorB">#000000</color>
-    <color name="colorC">#444444</color>
-    <color name="colorD">#808080</color>
-    <color name="colorE">#c4c4c4</color>
-    <color name="colorF">#e1e1e1</color>
-    <color name="colorG">#f3f3f3</color>
-    <color name="colorH">#ffffff</color>
-    <color name="colorI">#ff0000</color>
-    <color name="colorJ">#ffa645</color>
-    <color name="colorK">#3eb5c0</color>
+    <color name="colorA">#ff6600</color>
+    <color name="colorB">#ffe8d9</color>
+    <color name="colorC">#000000</color>
+    <color name="colorD">#595959</color>
+    <color name="colorE">#aeaeae</color>
+    <color name="colorF">#f1f1f1</color>
+    <color name="colorG">#ffffff</color>
+    <color name="colorH">#d0021b</color>
+    <color name="colorI">#f5a623</color>
+    <color name="colorJ">#7ed321</color>
+    <color name="colorK">#444444</color>
     <color name="colorL">#96c11f</color>
 
     <color name="transparent">#00000000</color>
diff --git a/res/values/custom.xml b/res/values/custom.xml
index d4fc85174..9bc7f7793 100644
--- a/res/values/custom.xml
+++ b/res/values/custom.xml
@@ -5,15 +5,15 @@
 	<string name="messages_date_format">dd/MM, HH:mm </string>
 	<string name="messages_list_date_format">dd/MM</string>
 	<string name="today_date_format">HH:mm</string>
-	<string name="picture_name_format">linphone-mms-%s.jpg</string>
+	<string name="picture_name_format">orange-secure-phone-mms-%s.jpg</string>
 
-	<string name="app_name">Linphone</string>
-	<string name="service_name">Linphone Service</string>
+	<string name="app_name">Orange Secure Phone</string>
+	<string name="service_name">Orange Secure Phone Service</string>
 	<string name="addressbook_label">Linphone</string>
 	<string name="sync_account_type">org.linphone</string>
 	<string name="sync_account_name">linphone contacts</string>
 	<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string>
-	<string name="notification_title">Linphone</string>
+	<string name="notification_title">Orange Secure Phone</string>
 	<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>
diff --git a/res/values/digit_style.xml b/res/values/digit_style.xml
index 1fb8cd745..2263270c9 100644
--- a/res/values/digit_style.xml
+++ b/res/values/digit_style.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<style name="DialerDigit" parent="@android:style/TextAppearance.Medium">
-		<item name="android:layout_width">50dp</item>
+		<item name="android:layout_width">60dp</item>
 		<item name="android:layout_height">50dp</item>
 		<item name="android:textColor">@android:color/transparent</item>
 		<item name="android:textSize">20sp</item>
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 9a8b01131..13c66f60a 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<!-- New settings -->
-	<!-- TODO Migrate it in linphonerc -->
 	<bool name="assistant_use_linphone_login_as_first_fragment">false</bool>
 	<bool name="hide_in_call_stats">false</bool>
 	<string name="default_domain">sip.linphone.org</string>
 	<string name="default_stun">stun.linphone.org</string>
-	<bool name="use_linphone_friend">false</bool>
+	<bool name="use_linphone_friend">true</bool>
 
 	<string name="wizard_url">https://www.linphone.org/wizard.php</string>
+	<bool name="display_remote_provisioning_login_activity">false</bool>
 
 	<!-- Push notification settings -->
 	<bool name="enable_push_id">true</bool>
@@ -27,7 +27,7 @@
 	<bool name="allow_only_phone_numbers_in_wizard">false</bool>
 
 	<bool name="enable_linphone_friends">false</bool>
-	<bool name="use_linphone_tag">true</bool>
+	<bool name="use_linphone_tag">false</bool>
 	<bool name="disable_options_in_call">false</bool>
 
 	<bool name="pre_fill_email_in_wizard">true</bool> <!-- Set the email field of the wizard with one of the gmail account registered on the device -->
@@ -50,7 +50,7 @@
 
 	<bool name="automatically_start_intercepted_outgoing_gsm_call">true</bool>
 	<!-- This settings handle the behavior of the view waiting for the remote provisioning configuration to be done -->
-	<bool name="display_sms_remote_provisioning_activity">false</bool>
+
 	<bool name="forbid_app_usage_until_remote_provisioning_completed">false</bool>
 	<bool name="display_confirmation_popup_after_first_configuration">false</bool>
 	<bool name="enable_log_collect">false</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9694c6cf3..46780c5c3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-
-	<!-- NEW STRINGS -->
-
 	<!-- Common -->
 	<string name="username">Username</string>
 	<string name="display_name">Display name</string>
@@ -19,6 +16,7 @@
 	<string name="about">About</string>
 	<string name="deny">Deny</string>
 	<string name="no_account">No account configured</string>
+	<string name="address_sip">Address Sip</string>
 
 	<!-- splashscreen -->
 	<string name="app_description">free SIP VOIP client</string>
@@ -44,7 +42,6 @@
 	<string name="assistant_remote_provisioning_login">Enter your login</string>
 	<string name="assistant_connect">Connection</string>
 
-
 	<!-- 1. Dailer -->
 	<string name="address_bar_hint">Enter a number or an address</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 46f499f4e..21a9febf9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -6,79 +6,76 @@
 	<style name="FullScreen" parent="android:Theme.Holo.Light.NoActionBar.Fullscreen" />
 
 	<style name="font1" parent="@android:style/TextAppearance.Medium">
-		<item name="android:textColor">@color/colorA</item>
-		<item name="android:textAllCaps">true</item>
-		<item name="android:textStyle">bold</item>
-		<item name="android:textSize">28sp</item>
-	</style>
-
-	<style name="font2" parent="@android:style/TextAppearance.Medium">
-		<item name="android:textColor">@color/colorA</item>
-		<item name="android:textSize">18sp</item>
-	</style>
-
-	<style name="font3" parent="@android:style/TextAppearance.Small">
-		<item name="android:textColor">@color/colorA</item>
-		<item name="android:textSize">16sp</item>
-	</style>
-
-	<style name="font4" parent="@android:style/TextAppearance.Medium">
-		<item name="android:textColor">@color/colorB</item>
-		<item name="android:textAllCaps">true</item>
-		<item name="android:textStyle">bold</item>
-		<item name="android:textSize">28sp</item>
-	</style>
-
-	<style name="font5" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorC</item>
 		<item name="android:textSize">32sp</item>
 	</style>
 
-	<style name="font6" parent="@android:style/TextAppearance.Medium">
+	<style name="font2" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorC</item>
 		<item name="android:textSize">20sp</item>
 	</style>
 
-	<style name="font7" parent="@android:style/TextAppearance.Medium">
+	<style name="font3" parent="@android:style/TextAppearance.Small">
 		<item name="android:textColor">@color/colorC</item>
+		<item name="android:textSize">16sp</item>
 		<item name="android:textStyle">bold</item>
+	</style>
+
+	<style name="font4" parent="@android:style/TextAppearance.Medium">
+		<item name="android:textColor">@color/colorG</item>
 		<item name="android:textSize">26sp</item>
 	</style>
 
-	<style name="font8" parent="@android:style/TextAppearance.Medium">
-		<item name="android:textColor">@color/colorC</item>
-		<item name="android:textAllCaps">true</item>
-		<item name="android:textSize">18sp</item>
+	<style name="font5" parent="@android:style/TextAppearance.Medium">
+		<item name="android:textColor">@color/colorG</item>
+		<item name="android:textSize">26sp</item>
 	</style>
 
-	<style name="font9" parent="@android:style/TextAppearance.Small">
-		<item name="android:textColor">@color/colorC</item>
+	<style name="font6" parent="@android:style/TextAppearance.Medium">
+		<item name="android:textColor">@color/colorG</item>
+		<item name="android:textStyle">bold</item>
+		<item name="android:textSize">30sp</item>
+	</style>
+
+	<style name="font7" parent="@android:style/TextAppearance.Small">
+		<item name="android:textColor">@color/colorG</item>
 		<item name="android:textSize">16sp</item>
 	</style>
 
-	<style name="font10" parent="@android:style/TextAppearance.Medium">
-		<item name="android:textColor">@color/colorD</item>
+	<style name="font8" parent="@android:style/TextAppearance.Medium">
+		<item name="android:textColor">@color/colorG</item>
+		<item name="android:textSize">24sp</item>
+	</style>
+
+	<style name="font9" parent="@android:style/TextAppearance.Medium">
+		<item name="android:textColor">@color/colorE</item>
+		<item name="android:textSize">18sp</item>
+	</style>
+
+	<style name="font10" parent="@android:style/TextAppearance.Small">
+		<item name="android:textColor">@color/colorA</item>
 		<item name="android:textSize">20sp</item>
 	</style>
 
-	<style name="font11" parent="@android:style/TextAppearance.Medium">
-		<item name="android:textColor">@color/colorD</item>
+	<style name="font11" parent="@android:style/TextAppearance.Small">
+		<item name="android:textColor">@color/colorA</item>
 		<item name="android:textSize">16sp</item>
 	</style>
 
 	<style name="font12" parent="@android:style/TextAppearance.Small">
-		<item name="android:textColor">@color/colorE</item>
-		<item name="android:textSize">25sp</item>
+		<item name="android:textColor">@color/colorA</item>
+		<item name="android:textSize">14sp</item>
 	</style>
 
 	<style name="font13" parent="@android:style/TextAppearance.Medium">
-		<item name="android:textColor">@color/colorE</item>
-		<item name="android:textSize">18sp</item>
+		<item name="android:textColor">@color/colorK</item>
+		<item name="android:textStyle">bold</item>
+		<item name="android:textSize">34sp</item>
 	</style>
 
 	<style name="font14" parent="@android:style/TextAppearance.Small">
-		<item name="android:textColor">@color/colorH</item>
-		<item name="android:textSize">26sp</item>
+		<item name="android:textColor">@color/colorK</item>
+		<item name="android:textSize">16sp</item>
 	</style>
 
 	<style name="font15" parent="@android:style/TextAppearance.Small">
diff --git a/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java
index fadd84ba0..e1b3c3257 100644
--- a/src/org/linphone/CallActivity.java
+++ b/src/org/linphone/CallActivity.java
@@ -82,7 +82,7 @@ public class CallActivity extends Activity implements OnClickListener {
 	private Handler mControlsHandler = new Handler();
 	private Runnable mControls;
 	private ImageView switchCamera;
-	private RelativeLayout mActiveCallHeader, sideMenuContent, avatar_layout;
+	private RelativeLayout mActiveCallHeader, sideMenuContent;
 	private ImageView pause, hangUp, dialer, video, micro, speaker, options, addCall, transfer, conference, conferenceStatus, contactPicture;
 	private ImageView audioRoute, routeSpeaker, routeEarpiece, routeBluetooth, menu;
 	private LinearLayout mNoCurrentCall, callInfo, mCallPaused;
@@ -168,8 +168,9 @@ public class CallActivity extends Activity implements OnClickListener {
 				if (state == State.StreamsRunning) {
 					switchVideo(isVideoEnabled(call));
 					//Check media in progress
-					if(LinphonePreferences.instance().isVideoEnabled() && !call.mediaInProgress()){
-						enabledVideoButton(true);
+					if(!call.mediaInProgress()){
+						if(LinphonePreferences.instance().isVideoEnabled())
+							enabledVideoButton(true);
 						enabledPauseButton(true);
 					}
 
@@ -341,7 +342,6 @@ public class CallActivity extends Activity implements OnClickListener {
 		mCallPaused = (LinearLayout) findViewById(R.id.remote_pause);
 
 		contactPicture = (ImageView) findViewById(R.id.contact_picture);
-		avatar_layout = (RelativeLayout) findViewById(R.id.avatar_layout);
 
 		/*if(isTablet()){
 			speaker.setEnabled(false);
@@ -441,28 +441,28 @@ public class CallActivity extends Activity implements OnClickListener {
 
 		if(LinphoneManager.getLc().getCurrentCall() != null){
 			if(isTransferAllowed)
-				enabledTransferButton(true);
+				transfer.setEnabled(true);
 			if(!isVideoEnabled(LinphoneManager.getLc().getCurrentCall()))
 				callInfo.setVisibility(View.VISIBLE);
 		}
 
 		if(LinphoneManager.getLc().getCallsNb() > 1){
 			callsList.setVisibility(View.VISIBLE);
-			enabledConferenceButton(true);
+			conference.setEnabled(true);
 		} else {
 			if(LinphoneManager.getLc().getCallsNb() == 1 && LinphoneManager.getLc().getCurrentCall() == null){
 				callsList.setVisibility(View.VISIBLE);
 				if(isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) {
-					avatar_layout.setVisibility(View.GONE);
+					contactPicture.setVisibility(View.GONE);
 				} else {
-					avatar_layout.setVisibility(View.VISIBLE);
+					contactPicture.setVisibility(View.VISIBLE);
 				}
 				if(isTransferAllowed)
-					enabledTransferButton(false);
+					transfer.setEnabled(false);
 			} else {
 				callsList.setVisibility(View.GONE);
 			}
-			enabledConferenceButton(false);
+			conference.setEnabled(false);
 
 		}
 
@@ -478,7 +478,7 @@ public class CallActivity extends Activity implements OnClickListener {
 		} else {
 			if(video.isEnabled()) {
 				if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) {
-					video.setImageResource(R.drawable.camera_selected);
+					video.setImageResource(R.drawable.camera);
 					videoProgress.setVisibility(View.INVISIBLE);
 				} else {
 					video.setImageResource(R.drawable.camera_default);
@@ -487,20 +487,20 @@ public class CallActivity extends Activity implements OnClickListener {
 		}
 
 		if (isSpeakerEnabled) {
-			speaker.setImageResource(R.drawable.speaker_selected);
+			speaker.setImageResource(R.drawable.speaker);
 		} else {
 			speaker.setImageResource(R.drawable.speaker_default);
 		}
 
 		if (isMicMuted) {
-			micro.setImageResource(R.drawable.micro_selected);
+			micro.setImageResource(R.drawable.micro);
 		} else {
 			micro.setImageResource(R.drawable.micro_default);
 		}
 
 		try {
 			if (isSpeakerEnabled) {
-				routeSpeaker.setImageResource(R.drawable.route_speaker_selected);
+				routeSpeaker.setImageResource(R.drawable.route_speaker);
 				routeEarpiece.setImageResource(R.drawable.route_earpiece);
 				routeBluetooth.setImageResource(R.drawable.route_bluetooth);
 			}
@@ -508,9 +508,9 @@ public class CallActivity extends Activity implements OnClickListener {
 			routeSpeaker.setImageResource(R.drawable.route_speaker);
 			if (BluetoothManager.getInstance().isUsingBluetoothAudioRoute()) {
 				routeEarpiece.setImageResource(R.drawable.route_earpiece);
-				routeBluetooth.setImageResource(R.drawable.route_bluetooth_selected);
+				routeBluetooth.setImageResource(R.drawable.route_bluetooth);
 			} else {
-				routeEarpiece.setImageResource(R.drawable.route_earpiece_selected);
+				routeEarpiece.setImageResource(R.drawable.route_earpiece);
 				routeBluetooth.setImageResource(R.drawable.route_bluetooth);
 			}
 		} catch (NullPointerException npe) {
@@ -533,7 +533,7 @@ public class CallActivity extends Activity implements OnClickListener {
 		transfer.setEnabled(true);
 		pause.setEnabled(true);
 		dialer.setEnabled(true);
-		enabledConferenceButton(true);
+		conference.setEnabled(true);
 	}
 
 	public void updateStatusFragment(StatusFragment statusFragment) {
@@ -590,7 +590,7 @@ public class CallActivity extends Activity implements OnClickListener {
 		else if (id == R.id.route_bluetooth) {
 			if (BluetoothManager.getInstance().routeAudioToBluetooth()) {
 				isSpeakerEnabled = false;
-				routeBluetooth.setImageResource(R.drawable.route_bluetooth_selected);
+				routeBluetooth.setImageResource(R.drawable.route_bluetooth);
 				routeSpeaker.setImageResource(R.drawable.route_speaker);
 				routeEarpiece.setImageResource(R.drawable.route_earpiece);
 			}
@@ -601,14 +601,14 @@ public class CallActivity extends Activity implements OnClickListener {
 			isSpeakerEnabled = false;
 			routeBluetooth.setImageResource(R.drawable.route_bluetooth);
 			routeSpeaker.setImageResource(R.drawable.route_speaker);
-			routeEarpiece.setImageResource(R.drawable.route_earpiece_selected);
+			routeEarpiece.setImageResource(R.drawable.route_earpiece);
 			hideOrDisplayAudioRoutes();
 		}
 		else if (id == R.id.route_speaker) {
 			LinphoneManager.getInstance().routeAudioToSpeaker();
 			isSpeakerEnabled = true;
 			routeBluetooth.setImageResource(R.drawable.route_bluetooth);
-			routeSpeaker.setImageResource(R.drawable.route_speaker_selected);
+			routeSpeaker.setImageResource(R.drawable.route_speaker);
 			routeEarpiece.setImageResource(R.drawable.route_earpiece);
 			hideOrDisplayAudioRoutes();
 		}
@@ -642,26 +642,6 @@ public class CallActivity extends Activity implements OnClickListener {
 		}
 	}
 
-	private void enabledTransferButton(boolean enabled){
-		if(enabled) {
-			transfer.setEnabled(true);
-			transfer.setImageAlpha(250);
-		} else {
-			transfer.setEnabled(false);
-			transfer.setImageAlpha(50);
-		}
-	}
-
-	private void enabledConferenceButton(boolean enabled){
-		if(enabled) {
-			conference.setEnabled(true);
-			conference.setImageAlpha(250);
-		} else {
-			conference.setEnabled(false);
-			conference.setImageAlpha(50);
-		}
-	}
-
 	private void enabledOrDisabledVideo(final boolean isVideoEnabled) {
 		final LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
 		if (call == null) {
@@ -761,7 +741,7 @@ public class CallActivity extends Activity implements OnClickListener {
 	private void displayAudioCall(){
 		mActiveCallHeader.setVisibility(View.VISIBLE);
 		callInfo.setVisibility(View.VISIBLE);
-		avatar_layout.setVisibility(View.VISIBLE);
+		contactPicture.setVisibility(View.VISIBLE);
 		mNoCurrentCall.setVisibility(View.GONE);
 		callsList.setVisibility(View.VISIBLE);
 		switchCamera.setVisibility(View.GONE);
@@ -794,7 +774,7 @@ public class CallActivity extends Activity implements OnClickListener {
 		isMicMuted = !isMicMuted;
 		lc.muteMic(isMicMuted);
 		if (isMicMuted) {
-			micro.setImageResource(R.drawable.micro_selected);
+			micro.setImageResource(R.drawable.micro);
 		} else {
 			micro.setImageResource(R.drawable.micro_default);
 		}
@@ -804,7 +784,7 @@ public class CallActivity extends Activity implements OnClickListener {
 		isSpeakerEnabled = !isSpeakerEnabled;
 		if (isSpeakerEnabled) {
 			LinphoneManager.getInstance().routeAudioToSpeaker();
-			speaker.setImageResource(R.drawable.speaker_selected);
+			speaker.setImageResource(R.drawable.speaker);
 			LinphoneManager.getLc().enableSpeaker(isSpeakerEnabled);
 		} else {
 			Log.d("Toggle speaker off, routing back to earpiece");
@@ -820,7 +800,7 @@ public class CallActivity extends Activity implements OnClickListener {
 			if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) {
 				isVideoCallPaused = true;
 			}
-			pause.setImageResource(R.drawable.pause_big_over_selected);
+			pause.setImageResource(R.drawable.pause_big_over);
 		} else if (call != null) {
 			if (call.getState() == State.Paused) {
 				lc.resumeCall(call);
@@ -851,7 +831,7 @@ public class CallActivity extends Activity implements OnClickListener {
 			mControlsLayout.setVisibility(View.VISIBLE);
 			mActiveCallHeader.setVisibility(View.VISIBLE);
 			callInfo.setVisibility(View.VISIBLE);
-			avatar_layout.setVisibility(View.GONE);
+			contactPicture.setVisibility(View.GONE);
 			mNoCurrentCall.setVisibility(View.GONE);
 			callsList.setVisibility(View.VISIBLE);
 			if (cameraNumber > 1) {
@@ -863,7 +843,6 @@ public class CallActivity extends Activity implements OnClickListener {
 			mActiveCallHeader.setVisibility(View.GONE);
 			switchCamera.setVisibility(View.GONE);
 			mNoCurrentCall.setVisibility(View.GONE);
-			Log.w("Call list gone");
 			callsList.setVisibility(View.GONE);
 		}
 	}
@@ -918,7 +897,7 @@ public class CallActivity extends Activity implements OnClickListener {
 						addCall.setVisibility(View.INVISIBLE);
 						displayVideoCall(false);
 						numpad.setVisibility(View.GONE);
-						options.setImageResource(R.drawable.options_default);
+						options.setImageResource(R.drawable.options);
 					} else {
 						Animation animation = slideOutTopToBottom;
 						animation.setAnimationListener(new AnimationListener() {
@@ -938,7 +917,7 @@ public class CallActivity extends Activity implements OnClickListener {
 								addCall.setVisibility(View.INVISIBLE);
 								displayVideoCall(false);
 								numpad.setVisibility(View.GONE);
-								options.setImageResource(R.drawable.options_default);
+								options.setImageResource(R.drawable.options);
 								animation.setAnimationListener(null);
 							}
 						});
@@ -1118,7 +1097,7 @@ public class CallActivity extends Activity implements OnClickListener {
 
 			@Override
 			public void onAnimationEnd(Animation animation) {
-				options.setBackgroundResource(R.drawable.options_default);
+				options.setBackgroundResource(R.drawable.options);
 				if (isTransferAllowed) {
 					transfer.setVisibility(View.VISIBLE);
 				}
@@ -1146,7 +1125,7 @@ public class CallActivity extends Activity implements OnClickListener {
 			@Override
 			public void onAnimationEnd(Animation animation) {
 				addCall.setAnimation(null);
-				options.setBackgroundResource(R.drawable.options_default);
+				options.setBackgroundResource(R.drawable.options);
 				addCall.setVisibility(View.VISIBLE);
 				if (isTransferAllowed) {
 					animation.setAnimationListener(new AnimationListener() {
@@ -1210,7 +1189,7 @@ public class CallActivity extends Activity implements OnClickListener {
 				}
 				addCall.setVisibility(View.VISIBLE);
 				conference.setVisibility(View.VISIBLE);
-				options.setImageResource(R.drawable.options_selected);
+				options.setImageResource(R.drawable.options);
 			} else {
 				if (isOrientationLandscape) {
 					showAnimatedLandscapeCallOptions();
@@ -1460,6 +1439,14 @@ public class CallActivity extends Activity implements OnClickListener {
 		LinphoneAddress lAddress = call.getRemoteAddress();
 		TextView contactName = (TextView) findViewById(R.id.contact_name);
 
+		Contact lContact  = ContactsManager.getInstance().findContactWithAddress(getContentResolver(), lAddress);
+		if (lContact == null) {
+			contactName.setText(lAddress.getUserName());
+		} else {
+			contactName.setText(lContact.getName());
+			//LinphoneUtils.setImagePictureFromUri(contactPicture.getContext(), contactPicture, lContact.getPhotoUri(), lContact.getThumbnailUri());
+		}
+
 		setContactInformation(contactName, contactPicture, lAddress);
 		registerCallDurationTimer(null, call);
 	}
@@ -1489,14 +1476,7 @@ public class CallActivity extends Activity implements OnClickListener {
 	}
 
 	private void setContactInformation(TextView contactName, ImageView contactPicture,  LinphoneAddress lAddress) {
-		Contact lContact  = ContactsManager.getInstance().findContactWithAddress(contactName.getContext().getContentResolver(), lAddress);
-		if (lContact == null) {
-			contactName.setText(LinphoneUtils.getAddressDisplayName(lAddress));
-			contactPicture.setImageResource(R.drawable.avatar);
-		} else {
-			contactName.setText(lContact.getName());
-			LinphoneUtils.setImagePictureFromUri(contactPicture.getContext(), contactPicture, lContact.getPhotoUri(), lContact.getThumbnailUri());
-		}
+		contactName.setText(LinphoneUtils.getAddressDisplayName(lAddress));
 	}
 
 	private boolean displayCallStatusIconAndReturnCallPaused(LinearLayout callView, LinphoneCall call) {
@@ -1621,7 +1601,7 @@ public class CallActivity extends Activity implements OnClickListener {
 	public void pauseOrResumeConference() {
 		LinphoneCore lc = LinphoneManager.getLc();
 		if (lc.isInConference()) {
-			conferenceStatus.setImageResource(R.drawable.pause_big_over_selected);
+			conferenceStatus.setImageResource(R.drawable.pause_big_over);
 			lc.leaveConference();
 		} else {
 			conferenceStatus.setImageResource(R.drawable.pause_big_default);
diff --git a/src/org/linphone/CallIncomingActivity.java b/src/org/linphone/CallIncomingActivity.java
index 4826fd9ca..b480cde6a 100644
--- a/src/org/linphone/CallIncomingActivity.java
+++ b/src/org/linphone/CallIncomingActivity.java
@@ -48,7 +48,7 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
 	private static CallIncomingActivity instance;
 
 	private TextView name, number;
-	private ImageView contactPicture, acceptArrow, accept, acceptCall, decline;
+	private ImageView contactPicture, accept, decline;
 	private LinphoneCall mCall;
 	private LinphoneCoreListenerBase mListener;
 	private LinearLayout acceptUnlock;
@@ -81,6 +81,7 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
 		int flags = WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
 		getWindow().addFlags(flags);
 
+
 		PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH) {
 			isActive = pm.isInteractive();
@@ -88,12 +89,12 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
 			isActive = pm.isScreenOn();
 		}
 
+		final int screenWidth = getResources().getDisplayMetrics().widthPixels;
+
 		acceptUnlock = (LinearLayout) findViewById(R.id.acceptUnlock);
 		declineUnlock = (LinearLayout) findViewById(R.id.declineUnlock);
-		//mIncomingCallWidget = (LinphoneSliders) findViewById(R.id.sliding_widget);
 
 		accept = (ImageView) findViewById(R.id.accept);
-		acceptArrow = (ImageView) findViewById(R.id.acceptArrow);
 		decline = (ImageView) findViewById(R.id.decline);
 		accept.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -120,9 +121,10 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
 							break;
 						case MotionEvent.ACTION_MOVE:
 							curX = motionEvent.getX();
-							view.scrollBy((int) (answerX - curX), view.getScrollY());
+							if((answerX - curX) >= 0)
+								view.scrollBy((int) (answerX - curX), view.getScrollY());
 							answerX = curX;
-							if (curX < 50) {
+							if (curX < screenWidth/4) {
 								answer();
 								return true;
 							}
@@ -132,7 +134,6 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
 							decline.setVisibility(View.VISIBLE);
 							acceptUnlock.setVisibility(View.GONE);
 							break;
-
 					}
 					return true;
 				}
@@ -153,8 +154,8 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
 							view.scrollBy((int) (declineX - curX), view.getScrollY());
 							declineX = curX;
 							Log.w(curX);
-							if (curX > 800) {
-								//decline();
+							if (curX > (screenWidth/2)){
+								decline();
 								return true;
 							}
 							break;
@@ -182,9 +183,6 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
 			}
 		});
 
-
-
-
 		mListener = new LinphoneCoreListenerBase(){
 			@Override
 			public void callState(LinphoneCore lc, LinphoneCall call, State state, String message) {
@@ -230,7 +228,7 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
 		LinphoneAddress address = mCall.getRemoteAddress();
 		Contact contact = ContactsManager.getInstance().findContactWithAddress(getContentResolver(), address);
 		if (contact != null) {
-			LinphoneUtils.setImagePictureFromUri(this, contactPicture, contact.getPhotoUri(), contact.getThumbnailUri());
+			//LinphoneUtils.setImagePictureFromUri(this, contactPicture, contact.getPhotoUri(), contact.getThumbnailUri());
 			name.setText(contact.getName());
 		} else {
 			name.setText(LinphoneUtils.getAddressDisplayName(address));
@@ -268,6 +266,7 @@ public class CallIncomingActivity extends Activity implements LinphoneSliderTrig
 
 	private void decline() {
 		LinphoneManager.getLc().terminateCall(mCall);
+		finish();
 	}
 
 	private void answer() {
diff --git a/src/org/linphone/CallOutgoingActivity.java b/src/org/linphone/CallOutgoingActivity.java
index 6001a69ea..c3509fb92 100644
--- a/src/org/linphone/CallOutgoingActivity.java
+++ b/src/org/linphone/CallOutgoingActivity.java
@@ -76,7 +76,7 @@ public class CallOutgoingActivity extends Activity implements OnClickListener{
 
 		micro = (ImageView) findViewById(R.id.micro);
 		micro.setOnClickListener(this);
-		speaker = (ImageView) findViewById(R.id.speaker);
+		speaker = (ImageView) findViewById(R.id.speaker);;
 		speaker.setOnClickListener(this);
 
 		// set this flag so this activity will stay in front of the keyguard
@@ -89,6 +89,7 @@ public class CallOutgoingActivity extends Activity implements OnClickListener{
 		mListener = new LinphoneCoreListenerBase(){
 			@Override
 			public void callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State state, String message) {
+				Log.w("State " + state);
 				if (LinphoneManager.getLc().getCallsNb() == 0) {
 					finish();
 					return;
@@ -141,14 +142,17 @@ public class CallOutgoingActivity extends Activity implements OnClickListener{
 		}
 
 		LinphoneAddress address = mCall.getRemoteAddress();
-		Contact contact = ContactsManager.getInstance().findContactWithAddress(getContentResolver(), address);
+		Log.w(mCall.getRemoteAddress().asStringUriOnly());
+		/*Contact contact = ContactsManager.getInstance().findContactWithAddress(getContentResolver(), address);
 		if (contact != null) {
-			LinphoneUtils.setImagePictureFromUri(this, contactPicture, contact.getPhotoUri(), contact.getThumbnailUri());
+			//LinphoneUtils.setImagePictureFromUri(this, contactPicture, contact.getPhotoUri(), contact.getThumbnailUri());
 			name.setText(contact.getName());
 		} else {
-			name.setText(LinphoneUtils.getAddressDisplayName(address));
-		}
+
+		}*/
+		name.setText(LinphoneUtils.getAddressDisplayName(address));
 		number.setText(address.asStringUriOnly());
+		Log.w(address.asStringUriOnly());
 	}
 
 	@Override
@@ -173,7 +177,7 @@ public class CallOutgoingActivity extends Activity implements OnClickListener{
 		if (id == R.id.micro) {
 			isMicMuted = !isMicMuted;
 			if(isMicMuted) {
-				micro.setImageResource(R.drawable.micro_selected);
+				micro.setImageResource(R.drawable.micro);
 			} else {
 				micro.setImageResource(R.drawable.micro_default);
 			}
@@ -182,7 +186,7 @@ public class CallOutgoingActivity extends Activity implements OnClickListener{
 		if (id == R.id.speaker) {
 			isSpeakerEnabled = !isSpeakerEnabled;
 			if(isSpeakerEnabled) {
-				speaker.setImageResource(R.drawable.speaker_selected);
+				speaker.setImageResource(R.drawable.speaker);
 			} else {
 				speaker.setImageResource(R.drawable.speaker_default);
 			}
diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index fb3396d7d..3e9c015ac 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -197,6 +197,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 			searchContactField.setAdapter(new SearchContactsListAdapter(ContactsManager.getInstance().getAllContacts(), null, inflater));
 			edit.setVisibility(View.INVISIBLE);
 			startCall.setVisibility(View.INVISIBLE);
+			contactName.setVisibility(View.INVISIBLE);
 		} else {
 			LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
 			if (lc != null) {
@@ -435,11 +436,11 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 	}
 
 	private void displayChatHeader(LinphoneAddress address) {
-		if(contact != null) {
-			contactName.setText(contact.getName());
-		} else if(address != null){
+		//if(contact != null) {
+		//	contactName.setText(contact.getName());
+		//} else if(address != null){
 			contactName.setText(LinphoneUtils.getAddressDisplayName(address));
-		}
+		//}
 	}
 
 	public void changeDisplayedChat(String newSipUri, String displayName, String pictureUri) {
@@ -656,7 +657,6 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 		}
 
 		if (id == R.id.cancel) {
-			Log.w("Cancel");
 			quitEditMode();
 			return;
 		}
@@ -837,8 +837,6 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 				progressDialog.dismiss();
 			}
 
-			Log.w("Post execute");
-			
 			mUploadingImageStream = new ByteArrayInputStream(result);
 			
 			LinphoneContent content = LinphoneCoreFactory.instance().createLinphoneContent("image", "jpeg", result, null);
@@ -982,7 +980,6 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 
 	@Override
 	public void onLinphoneChatMessageStateChanged(LinphoneChatMessage msg, State state) {
-		Log.w("ICI");
 		if (state == State.FileTransferDone || state == State.FileTransferError) {
 			currentMessageInFileTransferUploadState = null;
 		}
diff --git a/src/org/linphone/ChatListFragment.java b/src/org/linphone/ChatListFragment.java
index d3349c770..0e736f29c 100644
--- a/src/org/linphone/ChatListFragment.java
+++ b/src/org/linphone/ChatListFragment.java
@@ -27,6 +27,7 @@ import org.linphone.core.LinphoneChatMessage;
 import org.linphone.core.LinphoneChatRoom;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
+import org.linphone.core.LinphoneFriend;
 import org.linphone.mediastream.Log;
 
 import android.app.Dialog;
@@ -434,10 +435,13 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 				return view;
 			}
 
-			Contact contact = ContactsManager.getInstance().findContactWithAddress(getActivity().getContentResolver(), address);
+			//Contact contact = ContactsManager.getInstance().findContactWithAddress(getActivity().getContentResolver(), address);
 			String message = "";
 			Long time;
 
+			//Obiane specification
+			LinphoneFriend friend = ContactsManager.getInstance().findLinphoneFriend(address);
+
 			TextView lastMessageView = (TextView) view.findViewById(R.id.lastMessage);
 			TextView date = (TextView) view.findViewById(R.id.date);
 			TextView displayName = (TextView) view.findViewById(R.id.sipUri);
@@ -453,23 +457,23 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 			if(msg.getFileTransferInformation() != null || msg.getExternalBodyUrl() != null || msg.getAppData() != null ){
 				lastMessageView.setBackgroundResource(R.drawable.chat_file_message);
 				time = msg.getTime();
-				date.setText(LinphoneUtils.timestampToHumanDate(getActivity(),time,getString(R.string.messages_list_date_format)));
+				date.setText(LinphoneUtils.timestampToHumanDate(getActivity(),time,getString(R.string.messages_list_date_format),true));
 				lastMessageView.setText("");
 			} else if (msg.getText() != null && msg.getText().length() > 0 ){
 				message = msg.getText();
 				lastMessageView.setBackgroundResource(0);
 				time = msg.getTime();
-				date.setText(LinphoneUtils.timestampToHumanDate(getActivity(),time,getString(R.string.messages_list_date_format)));
+				date.setText(LinphoneUtils.timestampToHumanDate(getActivity(),time,getString(R.string.messages_list_date_format),true));
 				lastMessageView.setText(message);
 			}
 
 			displayName.setSelected(true); // For animation
-			displayName.setText(contact == null ? LinphoneUtils.getAddressDisplayName(address) : contact.getName());
+			displayName.setText(LinphoneUtils.getAddressDisplayName(address));
 
 
-			if(contact != null){
+			/*if(contact != null){
 				LinphoneUtils.setImagePictureFromUri(view.getContext(), contactPicture, contact.getPhotoUri(), contact.getThumbnailUri());
-			}
+			}*/
 
 			if (unreadMessagesCount > 0) {
 				unreadMessages.setVisibility(View.VISIBLE);
@@ -477,9 +481,11 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 				if(unreadMessagesCount > 99){
 					unreadMessages.setTextSize(12);
 				}
+				displayName.setTextColor(getResources().getColor(R.color.colorA));
 				displayName.setTypeface(null, Typeface.BOLD);
 			} else {
 				unreadMessages.setVisibility(View.GONE);
+				displayName.setTextColor(getResources().getColor(R.color.colorC));
 				displayName.setTypeface(null, Typeface.NORMAL);
 			}
 
diff --git a/src/org/linphone/ContactDetailsFragment.java b/src/org/linphone/ContactDetailsFragment.java
index 8a6921306..9c3e65007 100644
--- a/src/org/linphone/ContactDetailsFragment.java
+++ b/src/org/linphone/ContactDetailsFragment.java
@@ -46,7 +46,7 @@ import android.widget.TextView;
  */
 public class ContactDetailsFragment extends Fragment implements OnClickListener {
 	private Contact contact;
-	private ImageView editContact, deleteContact, back;
+	private ImageView back;
 	private LayoutInflater inflater;
 	private View view;
 	private boolean displayChatAddressOnly = false;
@@ -56,6 +56,7 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 		public void onClick(View v) {
 			if (LinphoneActivity.isInstanciated()) {
 				LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
+				Log.w("Dial");
 				if (lc != null) {
 					LinphoneProxyConfig lpc = lc.getDefaultProxyConfig();
 					String to;
@@ -69,7 +70,7 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 					} else {
 						to = v.getTag().toString();
 					}
-					LinphoneActivity.instance().setAddresGoToDialerAndCall(to, contact.getName(), contact.getPhotoUri());
+					LinphoneActivity.instance().setAddresGoToDialerAndCall(to, null, null);
 				}
 			}
 		}
@@ -85,6 +86,7 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 	};
 	
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		Log.w("onCreateView");
 		contact = (Contact) getArguments().getSerializable("Contact");
 		
 		this.inflater = inflater;
@@ -93,12 +95,6 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 		if (getArguments() != null) {
 			displayChatAddressOnly = getArguments().getBoolean("ChatAddressOnly");
 		}
-		
-		editContact = (ImageView) view.findViewById(R.id.editContact);
-		editContact.setOnClickListener(this);
-		
-		deleteContact = (ImageView) view.findViewById(R.id.deleteContact);
-		deleteContact.setOnClickListener(this);
 
 		ImageView back = (ImageView) view.findViewById(R.id.back);
 		back.setOnClickListener(new OnClickListener() {
@@ -120,95 +116,111 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 	@SuppressLint("InflateParams")
 	private void displayContact(LayoutInflater inflater, View view) {
 		ImageView contactPicture = (ImageView) view.findViewById(R.id.contact_picture);
-		if (contact.getPhotoUri() != null) {
+		/*if (contact.getPhotoUri() != null) {
 			InputStream input = Compatibility.getContactPictureInputStream(LinphoneActivity.instance().getContentResolver(), contact.getID());
 			contactPicture.setImageBitmap(BitmapFactory.decodeStream(input));
         } else {
         	contactPicture.setImageResource(R.drawable.avatar);
-        }
-		
+        }*/
+
 		TextView contactName = (TextView) view.findViewById(R.id.contact_name);
 		contactName.setText(contact.getName());
 		
 		TableLayout controls = (TableLayout) view.findViewById(R.id.controls);
 		controls.removeAllViews();
-		for (String numberOrAddress : contact.getNumbersOrAddresses()) {
-			View v = inflater.inflate(R.layout.contact_control_row, null);
-			
-			String displayednumberOrAddress = numberOrAddress;
-			if (numberOrAddress.startsWith("sip:")) {
-				displayednumberOrAddress = displayednumberOrAddress.replace("sip:", "");
-			}
 
-			TextView label = (TextView) v.findViewById(R.id.address_label);
-			if(LinphoneUtils.isSipAddress(numberOrAddress)) {
-				label.setText(R.string.sip_address);
-			} else {
-				label.setText(R.string.phone_number);
-			}
-			
+		if(contact.getLinphoneAddress() != null){
+			View v = inflater.inflate(R.layout.contact_control_row, null);
+
 			TextView tv = (TextView) v.findViewById(R.id.numeroOrAddress);
-			tv.setText(displayednumberOrAddress);
-			tv.setSelected(true);
-			
+			tv.setText(contact.getLinphoneAddress().asStringUriOnly());
+
 			if (!displayChatAddressOnly) {
 				v.findViewById(R.id.call).setOnClickListener(dialListener);
-				v.findViewById(R.id.call).setTag(displayednumberOrAddress);
+				v.findViewById(R.id.call).setTag(contact.getLinphoneAddress().asStringUriOnly());
 			} else {
 				v.findViewById(R.id.call).setVisibility(View.GONE);
 			}
 
 			v.findViewById(R.id.chat).setOnClickListener(chatListener);
-			LinphoneProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig();
-			if (lpc != null) {
-				displayednumberOrAddress = lpc.normalizePhoneNumber(displayednumberOrAddress);
-				if (!displayednumberOrAddress.startsWith("sip:")) {
-					numberOrAddress = "sip:" + displayednumberOrAddress;
-				}
-				
-				String tag = numberOrAddress;
-				if (!numberOrAddress.contains("@")) {
-					tag = numberOrAddress + "@" + lpc.getDomain();
-				}
-				v.findViewById(R.id.chat).setTag(tag);
-			} else {
-				v.findViewById(R.id.chat).setTag(numberOrAddress);
-			}
-			
-			final String finalNumberOrAddress = numberOrAddress;
-			/*ImageView friend = (ImageView) v.findViewById(R.id.addFriend);
-			if (getResources().getBoolean(R.bool.enable_linphone_friends) && !displayChatAddressOnly) {
-				friend.setVisibility(View.VISIBLE);
-				
-				boolean isAlreadyAFriend = LinphoneManager.getLc().findFriendByAddress(finalNumberOrAddress) != null;
-				if (!isAlreadyAFriend) {
-					friend.setImageResource(R.drawable.contact_add);
-					friend.setOnClickListener(new OnClickListener() {
-						@Override
-						public void onClick(View v) {
-							if (ContactsManager.getInstance().createNewFriend(contact, finalNumberOrAddress)) {
-								displayContact(ContactFragment.this.inflater, ContactFragment.this.view);
-							}
-						}
-					});
-				} else {
-					friend.setImageResource(R.drawable.delete);
-					friend.setOnClickListener(new OnClickListener() {
-						@Override
-						public void onClick(View v) {
-							if (ContactsManager.getInstance().removeFriend(finalNumberOrAddress)) {
-								displayContact(ContactFragment.this.inflater, ContactFragment.this.view);
-							}
-						}
-					});
-				}
-			}*/
-			
+			v.findViewById(R.id.chat).setTag(contact.getLinphoneAddress().asStringUriOnly());
+
 			if (getResources().getBoolean(R.bool.disable_chat)) {
 				v.findViewById(R.id.chat).setVisibility(View.GONE);
 			}
-			
+
 			controls.addView(v);
+		} else {
+			for (String numberOrAddress : contact.getNumbersOrAddresses()) {
+				View v = inflater.inflate(R.layout.contact_control_row, null);
+
+				String displayednumberOrAddress = numberOrAddress;
+				if (numberOrAddress.startsWith("sip:")) {
+					displayednumberOrAddress = displayednumberOrAddress.replace("sip:", "");
+				}
+
+				TextView tv = (TextView) v.findViewById(R.id.numeroOrAddress);
+				tv.setText(displayednumberOrAddress);
+				tv.setSelected(true);
+
+				if (!displayChatAddressOnly) {
+					v.findViewById(R.id.call).setOnClickListener(dialListener);
+					v.findViewById(R.id.call).setTag(displayednumberOrAddress);
+				} else {
+					v.findViewById(R.id.call).setVisibility(View.GONE);
+				}
+
+				v.findViewById(R.id.chat).setOnClickListener(chatListener);
+				LinphoneProxyConfig lpc = LinphoneManager.getLc().getDefaultProxyConfig();
+				if (lpc != null) {
+					displayednumberOrAddress = lpc.normalizePhoneNumber(displayednumberOrAddress);
+					if (!displayednumberOrAddress.startsWith("sip:")) {
+						numberOrAddress = "sip:" + displayednumberOrAddress;
+					}
+
+					String tag = numberOrAddress;
+					if (!numberOrAddress.contains("@")) {
+						tag = numberOrAddress + "@" + lpc.getDomain();
+					}
+					v.findViewById(R.id.chat).setTag(tag);
+				} else {
+					v.findViewById(R.id.chat).setTag(numberOrAddress);
+				}
+
+				final String finalNumberOrAddress = numberOrAddress;
+				/*ImageView friend = (ImageView) v.findViewById(R.id.addFriend);
+				if (getResources().getBoolean(R.bool.enable_linphone_friends) && !displayChatAddressOnly) {
+					friend.setVisibility(View.VISIBLE);
+
+					boolean isAlreadyAFriend = LinphoneManager.getLc().findFriendByAddress(finalNumberOrAddress) != null;
+					if (!isAlreadyAFriend) {
+						friend.setImageResource(R.drawable.contact_add);
+						friend.setOnClickListener(new OnClickListener() {
+							@Override
+							public void onClick(View v) {
+								if (ContactsManager.getInstance().createNewFriend(contact, finalNumberOrAddress)) {
+									displayContact(ContactFragment.this.inflater, ContactFragment.this.view);
+								}
+							}
+						});
+					} else {
+						friend.setImageResource(R.drawable.delete);
+						friend.setOnClickListener(new OnClickListener() {
+							@Override
+							public void onClick(View v) {
+								if (ContactsManager.getInstance().removeFriend(finalNumberOrAddress)) {
+									displayContact(ContactFragment.this.inflater, ContactFragment.this.view);
+								}
+							}
+						});
+					}
+				}*/
+				if (getResources().getBoolean(R.bool.disable_chat)) {
+					v.findViewById(R.id.chat).setVisibility(View.GONE);
+				}
+
+				controls.addView(v);
+			}
 		}
 	}
 	
@@ -220,7 +232,7 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 			LinphoneActivity.instance().selectMenu(FragmentsAvailable.CONTACT_DETAIL);
 			LinphoneActivity.instance().hideTabBar(false);
 		}
-		contact.refresh(getActivity().getContentResolver());
+		//contact.refresh(getActivity().getContentResolver());
 		if (contact.getName() == null || contact.getName().equals("")) {
 			//Contact has been deleted, return
 			LinphoneActivity.instance().displayContacts(false);
@@ -232,22 +244,7 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
 	@Override
 	public void onClick(View v) {
 		int id = v.getId();
-			
-		if (id == R.id.editContact) {
-			LinphoneActivity.instance().editContact(contact);
-		} else if (id == R.id.deleteContact) {
-			AlertDialog.Builder alertDialog = new AlertDialog.Builder(getActivity());
-			alertDialog.setMessage(getString(R.string.delete_contact_dialog));
-			alertDialog.setPositiveButton(getString(R.string.button_ok),new DialogInterface.OnClickListener() {
-				public void onClick(DialogInterface dialog, int which) {
-				deleteExistingContact();
-				ContactsManager.getInstance().removeContactFromLists(getActivity().getContentResolver(),contact);
-				LinphoneActivity.instance().displayContacts(false);
-				}
-			});
-			alertDialog.setNegativeButton(getString(R.string.button_cancel),null);
-			alertDialog.show();
-		}
+
 	}
 	
 	private void deleteExistingContact() {
diff --git a/src/org/linphone/ContactsListFragment.java b/src/org/linphone/ContactsListFragment.java
index a19efcdb6..b591915a5 100644
--- a/src/org/linphone/ContactsListFragment.java
+++ b/src/org/linphone/ContactsListFragment.java
@@ -21,12 +21,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.linphone.compatibility.Compatibility;
-import org.linphone.core.LinphoneFriend;
-import org.linphone.core.PresenceActivityType;
 import org.linphone.mediastream.Log;
 
 import android.annotation.SuppressLint;
-import android.app.Dialog;
 import android.content.ContentProviderOperation;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -45,12 +42,9 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AlphabetIndexer;
 import android.widget.BaseAdapter;
-import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.SectionIndexer;
@@ -64,7 +58,6 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 	private LayoutInflater mInflater;
 	private ListView contactsList;
 	private TextView noSipContact, noContact;
-	private ImageView allContacts, linphoneContacts, newContact, edit, selectAll, deselectAll, delete, cancel;
 	private boolean onlyDisplayLinphoneContacts, isEditMode;
 	private RelativeLayout allContactsSelected, linphoneContactsSelected, editList, topbar;
 	private int lastKnownPosition;
@@ -103,44 +96,10 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
         
         contactsList = (ListView) view.findViewById(R.id.contactsList);
         contactsList.setOnItemClickListener(this);
-        
-        allContacts = (ImageView) view.findViewById(R.id.all_contacts);
-        allContacts.setOnClickListener(this);
-        
-        linphoneContacts = (ImageView) view.findViewById(R.id.linphone_contacts);
-        linphoneContacts.setOnClickListener(this);
-
-		allContactsSelected = (RelativeLayout) view.findViewById(R.id.all_contacts_select);
-		allContactsSelected.setOnClickListener(this);
-
-		linphoneContactsSelected = (RelativeLayout) view.findViewById(R.id.linphone_contacts_select);
-		linphoneContactsSelected.setOnClickListener(this);
-        
-        newContact = (ImageView) view.findViewById(R.id.newContact);
-        newContact.setOnClickListener(this);
-        newContact.setEnabled(LinphoneManager.getLc().getCallsNb() == 0);
-        
-        allContacts.setEnabled(onlyDisplayLinphoneContacts);
-        linphoneContacts.setEnabled(!allContacts.isEnabled());
-
-		selectAll = (ImageView) view.findViewById(R.id.select_all);
-		selectAll.setOnClickListener(this);
-
-		deselectAll = (ImageView) view.findViewById(R.id.deselect_all);
-		deselectAll.setOnClickListener(this);
-
-		delete = (ImageView) view.findViewById(R.id.delete);
-		delete.setOnClickListener(this);
 
 		editList = (RelativeLayout) view.findViewById(R.id.edit_list);
 		topbar = (RelativeLayout) view.findViewById(R.id.top_bar);
 
-		cancel = (ImageView) view.findViewById(R.id.cancel);
-		cancel.setOnClickListener(this);
-
-		edit = (ImageView) view.findViewById(R.id.edit);
-		edit.setOnClickListener(this);
-        
 		clearSearchField = (ImageView) view.findViewById(R.id.clearSearchField);
 		clearSearchField.setOnClickListener(this);
 		
@@ -148,15 +107,15 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 		searchField.addTextChangedListener(new TextWatcher() {
 			@Override
 			public void onTextChanged(CharSequence s, int start, int before, int count) {
-				
+
 			}
-			
+
 			@Override
 			public void beforeTextChanged(CharSequence s, int start, int count,
-					int after) {
-				
+										  int after) {
+
 			}
-			
+
 			@Override
 			public void afterTextChanged(Editable s) {
 				searchContacts(searchField.getText().toString());
@@ -177,106 +136,17 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 		return nb;
 	}
 
-	public void enabledDeleteButton(Boolean enabled){
-		if(enabled){
-			delete.setEnabled(true);
-			delete.setAlpha(1f);
-		} else {
-			if (getNbItemsChecked() == 0){
-				delete.setEnabled(false);
-				delete.setAlpha(0.2f);
-			}
-		}
-	}
-
 	@Override
 	public void onClick(View v) {
 		int id = v.getId();
 
-		if (id == R.id.select_all) {
-			deselectAll.setVisibility(View.VISIBLE);
-			selectAll.setVisibility(View.GONE);
-			enabledDeleteButton(true);
-			selectAllList(true);
-			return;
-		}
-		if (id == R.id.deselect_all) {
-			deselectAll.setVisibility(View.GONE);
-			selectAll.setVisibility(View.VISIBLE);
-			enabledDeleteButton(false);
-			selectAllList(false);
-			return;
-		}
-
-		if (id == R.id.cancel) {
-			quitEditMode();
-			return;
-		}
-
-		if (id == R.id.delete) {
-			final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text));
-			Button delete = (Button) dialog.findViewById(R.id.delete);
-			Button cancel = (Button) dialog.findViewById(R.id.cancel);
-
-			delete.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					removeContacts();
-					dialog.dismiss();
-					quitEditMode();
-				}
-			});
-
-			cancel.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					dialog.dismiss();
-					quitEditMode();
-				}
-			});
-			dialog.show();
-			return;
-		}
-
-		if (id == R.id.edit) {
-			editList.setVisibility(View.VISIBLE);
-			topbar.setVisibility(View.GONE);
-			enabledDeleteButton(false);
-			isEditMode = true;
-		}
-		
-		if (id == R.id.all_contacts) {
-			onlyDisplayLinphoneContacts = false;
-			allContactsSelected.setVisibility(View.VISIBLE);
-			allContacts.setEnabled(false);
-			linphoneContacts.setEnabled(true);
-			linphoneContactsSelected.setVisibility(View.INVISIBLE);
-		} 
-		else if (id == R.id.linphone_contacts) {
-			allContactsSelected.setVisibility(View.INVISIBLE);
-			linphoneContactsSelected.setVisibility(View.VISIBLE);
-			linphoneContacts.setEnabled(false);
-			allContacts.setEnabled(true);
-			onlyDisplayLinphoneContacts = true;
-
-		}
-
-		if(isEditMode){
-			deselectAll.setVisibility(View.GONE);
-			selectAll.setVisibility(View.VISIBLE);
-		}
-
 		if (searchField.getText().toString().length() > 0) {
 			searchContacts();
 		} else {
 			changeContactsAdapter();
 		}
 
-		if (id == R.id.newContact) {
-			editConsumed = true;
-			LinphoneActivity.instance().addContact(null, sipAddressToAdd);
-		} 
-		else if (id == R.id.clearSearchField) {
+		if (id == R.id.clearSearchField) {
 			searchField.setText("");
 		}
 	}
@@ -333,17 +203,15 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 			changeContactsAdapter();
 			return;
 		}
-		changeContactsToggle();
-		
+
 		if (searchCursor != null) {
 			searchCursor.close();
 		}
 
 		if(LinphoneActivity.instance().getResources().getBoolean(R.bool.use_linphone_friend)) {
-			//searchCursor = Compatibility.getSIPContactsCursor(getActivity().getContentResolver(), search, ContactsManager.getInstance().getContactsId());
-			//indexer = new AlphabetIndexer(searchCursor, Compatibility.getCursorDisplayNameColumnIndex(searchCursor), " ABCDEFGHIJKLMNOPQRSTUVWXYZ");
-			//contactsList.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE);
-			//contactsList.setAdapter(new ContactsListAdapter(null, searchCursor));
+			searchCursor = ContactsManager.getInstance().searchFriends(search);
+			indexer = new AlphabetIndexer(searchCursor, Compatibility.getCursorDisplayNameColumnIndex(searchCursor), " ABCDEFGHIJKLMNOPQRSTUVWXYZ");
+			contactsList.setAdapter(new ContactsListAdapter(ContactsManager.getInstance().getSearchContacts(), searchCursor));
 		} else{
 			if (onlyDisplayLinphoneContacts) {
 				searchCursor = Compatibility.getSIPContactsCursor(getActivity().getContentResolver(), search, ContactsManager.getInstance().getContactsId());
@@ -360,8 +228,6 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 	}
 	
 	private void changeContactsAdapter() {
-		changeContactsToggle();
-		
 		if (searchCursor != null) {
 			searchCursor.close();
 		}
@@ -400,16 +266,6 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 		}
 		ContactsManager.getInstance().setLinphoneContactsPrefered(onlyDisplayLinphoneContacts);
 	}
-	
-	private void changeContactsToggle() {
-		if (onlyDisplayLinphoneContacts) {
-			allContacts.setEnabled(true);
-			linphoneContacts.setEnabled(false);
-		} else {
-			allContacts.setEnabled(false);
-			linphoneContacts.setEnabled(true);
-		}
-	}
 
 	@Override
 	public void onItemClick(AdapterView<?> adapter, View view, int position, long id) {
@@ -444,6 +300,7 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 	
 	@Override
 	public void onPause() {
+		Log.w("onPause ");
 		instance = null;
 		if (searchCursor != null) {
 			searchCursor.close();
@@ -475,14 +332,15 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 		}
 		
 		public int getCount() {
-			if(LinphoneActivity.instance().getResources().getBoolean(R.bool.use_linphone_friend)) {
-				return LinphoneManager.getLc().getFriendList().length;
-			} else {
-				return cursor.getCount();
-			}
+			return cursor.getCount();
 		}
 
 		public Object getItem(int position) {
+			if(getResources().getBoolean(R.bool.use_linphone_friend)){
+				if(contacts != null){
+					return contacts.get(position);
+				}
+			}
 			if (contacts == null || position >= contacts.size()) {
 				return Compatibility.getContact(getActivity().getContentResolver(), cursor, position);
 			} else {
@@ -512,57 +370,26 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 			TextView name = (TextView) view.findViewById(R.id.name);
 			name.setText(contact.getName());
 
-			LinearLayout separator = (LinearLayout) view.findViewById(R.id.separator);
-			TextView separatorText = (TextView) view.findViewById(R.id.separator_text);
+			TextView separator = (TextView) view.findViewById(R.id.separator);
 			if (getPositionForSection(getSectionForPosition(position)) != position) {
 				separator.setVisibility(View.GONE);
 			} else {
 				separator.setVisibility(View.VISIBLE);
-				separatorText.setText(String.valueOf(contact.getName().charAt(0)));
+				separator.setText(String.valueOf(contact.getName().charAt(0)));
 			}
 			
 			ImageView icon = (ImageView) view.findViewById(R.id.contact_picture);
-			if (contact.getPhoto() != null) {
+			/*if (contact.getPhoto() != null) {
 				icon.setImageBitmap(contact.getPhoto());
 			} else if (contact.getPhotoUri() != null) {
 				icon.setImageURI(contact.getPhotoUri());
 			} else {
 				icon.setImageResource(R.drawable.avatar);
-			}
+			}*/
 
-			if (isEditMode) {
-				delete.setVisibility(View.VISIBLE);
-				delete.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-					@Override
-					public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-						contactsList.setItemChecked(position, b);
-						if(getNbItemsChecked() == getCount()){
-							deselectAll.setVisibility(View.VISIBLE);
-							selectAll.setVisibility(View.GONE);
-							enabledDeleteButton(true);
-						} else {
-							if(getNbItemsChecked() == 0){
-								deselectAll.setVisibility(View.GONE);
-								selectAll.setVisibility(View.VISIBLE);
-								enabledDeleteButton(false);
-							} else {
-								deselectAll.setVisibility(View.GONE);
-								selectAll.setVisibility(View.VISIBLE);
-								enabledDeleteButton(true);
-							}
-						}
-					}
-				});
-				if(contactsList.isItemChecked(position)) {
-					delete.setChecked(true);
-				} else {
-					delete.setChecked(false);
-				}
-			} else {
-				delete.setVisibility(View.GONE);
-			}
+			icon.setImageResource(R.drawable.avatar);
 			
-			ImageView friendStatus = (ImageView) view.findViewById(R.id.friendStatus);
+			/*ImageView friendStatus = (ImageView) view.findViewById(R.id.friendStatus);
 			LinphoneFriend[] friends = LinphoneManager.getLc().getFriendList();
 			if (!ContactsManager.getInstance().isContactPresenceDisabled() && friends != null) {
 				friendStatus.setVisibility(View.VISIBLE);
@@ -578,7 +405,7 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 				} else {
 					friendStatus.setImageResource(R.drawable.call_quality_indicator_0);
 				}
-			}
+			}*/
 			
 			return view;
 		}
diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java
index 357eb3f9d..2f29746c7 100644
--- a/src/org/linphone/ContactsManager.java
+++ b/src/org/linphone/ContactsManager.java
@@ -44,7 +44,7 @@ import java.util.Set;
 
 public class ContactsManager {
 	private static ContactsManager instance;
-	private List<Contact> contactList, sipContactList;
+	private List<Contact> contactList, sipContactList, searchContactList;
 	private Cursor contactCursor, sipContactCursor;
 	private Account mAccount;
 	private boolean preferLinphoneContacts = false, isContactPresenceDisabled = true;
@@ -66,6 +66,10 @@ public class ContactsManager {
 		return sipContactList;
 	}
 
+	public List<Contact> getSearchContacts() {
+		return searchContactList;
+	}
+
 	public Cursor getAllContactsCursor() {
 		return contactCursor;
 	}
@@ -173,7 +177,7 @@ public class ContactsManager {
 		);
 	}
 
-//Manage Linphone Friend if we cannot use Sip address
+	//Manage Linphone Friend if we cannot use Sip address
 	public boolean createNewFriend(Contact contact, String sipUri) {
 		if (!sipUri.startsWith("sip:")) {
 			sipUri = "sip:" + sipUri;
@@ -239,6 +243,32 @@ public class ContactsManager {
 		}
 	}
 
+	public Cursor searchFriends(String search) {
+		searchContactList =  new ArrayList<Contact>();
+		for (LinphoneFriend friend : LinphoneManager.getLcIfManagerNotDestroyedOrNull().getFriendList()) {
+			if (friend.getAddress().getUserName().contains(search)) {
+				searchContactList.add(new Contact(friend.getRefKey(), friend.getAddress()));
+			}
+		}
+
+		if(searchContactList != null){
+			return getFriendListCursor(searchContactList,true);
+		}
+		return null;
+	}
+
+	public LinphoneFriend findLinphoneFriend(LinphoneAddress address) {
+		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
+		if (lc != null && lc.getFriendList() != null && LinphoneManager.getLcIfManagerNotDestroyedOrNull().getFriendList().length > 0) {
+			for (LinphoneFriend friend : LinphoneManager.getLcIfManagerNotDestroyedOrNull().getFriendList()) {
+				if (friend.getAddress().equals(address)) {
+					return friend;
+				}
+			}
+		}
+		return null;
+	}
+
 	public Contact findContactWithDisplayName(String displayName) {
 		String[] projection = {ContactsContract.Data.CONTACT_ID, ContactsContract.Data.DISPLAY_NAME};
 		String selection = new StringBuilder()
@@ -389,7 +419,7 @@ public class ContactsManager {
 			sipUri = sipUri.substring(4);
 
 		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
-		if(lc != null && lc.getFriendList() != null && LinphoneManager.getLcIfManagerNotDestroyedOrNull().getFriendList().length > 0) {
+		if (lc != null && lc.getFriendList() != null && LinphoneManager.getLcIfManagerNotDestroyedOrNull().getFriendList().length > 0) {
 			for (LinphoneFriend friend : LinphoneManager.getLcIfManagerNotDestroyedOrNull().getFriendList()) {
 				if (friend.getAddress().equals(address)) {
 					return getContact(friend.getRefKey(), contentResolver);
@@ -399,7 +429,7 @@ public class ContactsManager {
 
 		//Find Sip address
 		Contact contact;
-		String [] projection = new String[]  {ContactsContract.Data.CONTACT_ID, ContactsContract.Data.DISPLAY_NAME};
+		String[] projection = new String[]{ContactsContract.Data.CONTACT_ID, ContactsContract.Data.DISPLAY_NAME};
 		String selection = new StringBuilder()
 				.append(ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS)
 				.append(" = ?").toString();
@@ -420,7 +450,7 @@ public class ContactsManager {
 
 		//Find number
 		Uri lookupUri = Uri.withAppendedPath(android.provider.ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(address.getUserName()));
-		projection = new String[] {ContactsContract.PhoneLookup._ID,ContactsContract.PhoneLookup.NUMBER,ContactsContract.PhoneLookup.DISPLAY_NAME };
+		projection = new String[]{ContactsContract.PhoneLookup._ID, ContactsContract.PhoneLookup.NUMBER, ContactsContract.PhoneLookup.DISPLAY_NAME};
 		Cursor c = contentResolver.query(lookupUri, projection, null, null, null);
 		contact = checkPhoneQueryResult(contentResolver, c, ContactsContract.PhoneLookup.NUMBER, ContactsContract.PhoneLookup._ID, address.getUserName());
 
@@ -429,6 +459,7 @@ public class ContactsManager {
 		}
 
 		return null;
+
 	}
 
 	public void removeContactFromLists(ContentResolver contentResolver, Contact contact) {
@@ -571,7 +602,6 @@ public class ContactsManager {
 			}
 
 			contactCursor = getFriendListCursor(contactList,true);
-			Log.w(contactCursor.getCount());
 			return;
 		}
 
@@ -703,5 +733,4 @@ public class ContactsManager {
 		}
 		return result;
 	}
-
 }
diff --git a/src/org/linphone/DialerFragment.java b/src/org/linphone/DialerFragment.java
index f8bbd1be1..f128957cd 100644
--- a/src/org/linphone/DialerFragment.java
+++ b/src/org/linphone/DialerFragment.java
@@ -46,8 +46,8 @@ public class DialerFragment extends Fragment {
 	private AddressAware numpad;
 	private AddressText mAddress;
 	private CallButton mCall;
-	private ImageView mAddContact;
 	private OnClickListener addContactListener, cancelListener, transferListener;
+	private ImageView mCancel;
 	private boolean shouldEmptyAddressField = true;
 	
 	@Override
@@ -78,9 +78,14 @@ public class DialerFragment extends Fragment {
 		if (numpad != null) {
 			numpad.setAddressWidget(mAddress);
 		}
-		
-		mAddContact = (ImageView) view.findViewById(R.id.add_contact);
-		mAddContact.setEnabled(!(LinphoneActivity.isInstanciated() && LinphoneManager.getLc().getCallsNb() > 0));
+
+		mCancel = (ImageView) view.findViewById(R.id.back);
+		if(!(LinphoneActivity.isInstanciated() && LinphoneManager.getLc().getCallsNb() > 0)){
+			mCancel.setVisibility(View.VISIBLE);
+		} else {
+			mCancel.setVisibility(View.GONE);
+		}
+
 		
 		addContactListener = new OnClickListener() {
 			@Override
@@ -135,6 +140,7 @@ public class DialerFragment extends Fragment {
 	
 	@Override
 	public void onResume() {
+		Log.w("onResume ");
 		super.onResume();
 		
 		if (LinphoneActivity.isInstanciated()) {
@@ -174,20 +180,22 @@ public class DialerFragment extends Fragment {
 				mCall.setImageResource(R.drawable.call_add);
 				mCall.resetClickListener();
 			}
-			mAddContact.setEnabled(true);
-			mAddContact.setImageResource(R.drawable.call_back);
-			mAddContact.setOnClickListener(cancelListener);
+			mCancel.setVisibility(View.VISIBLE);
+			mCancel.setEnabled(true);
+			mCancel.setImageResource(R.drawable.call_alt_back);
+			mCancel.setOnClickListener(cancelListener);
 		} else {
 			mCall.setImageResource(R.drawable.call_audio_start);
-			mAddContact.setEnabled(false);
+			mCancel.setVisibility(View.GONE);
+		/*	mAddContact.setEnabled(false);
 			mAddContact.setImageResource(R.drawable.contact_add_button);
-			mAddContact.setOnClickListener(addContactListener);
-			enableDisableAddContact();
+			mAddContact.setOnClickListener(addContactListener);*/
+			//enableDisableAddContact();
 		}
 	}
 	
 	public void enableDisableAddContact() {
-		mAddContact.setEnabled(LinphoneManager.getLc().getCallsNb() > 0 || !mAddress.getText().toString().equals(""));
+		//mAddContact.setEnabled(LinphoneManager.getLc().getCallsNb() > 0 || !mAddress.getText().toString().equals(""));
 	}
 	
 	public void displayTextInAddressBar(String numberOrSipAddress) {
diff --git a/src/org/linphone/HistoryDetailFragment.java b/src/org/linphone/HistoryDetailFragment.java
index de8c3ef76..0ac9d7a17 100644
--- a/src/org/linphone/HistoryDetailFragment.java
+++ b/src/org/linphone/HistoryDetailFragment.java
@@ -23,6 +23,7 @@ import java.util.Calendar;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
+import org.linphone.core.LinphoneFriend;
 
 import android.annotation.SuppressLint;
 import android.net.Uri;
@@ -41,8 +42,8 @@ import android.widget.TextView;
 public class HistoryDetailFragment extends Fragment implements OnClickListener {
 	private ImageView dialBack, chat, addToContacts, back;
 	private View view;
-	private ImageView contactPicture, callDirection;
-	private TextView contactName, contactAddress, time, date;
+	private ImageView contactPicture;
+	private TextView contactName, contactAddress, time, date, callDirection;
 	private String sipUri, displayName, pictureUri;
 	
 	@Override
@@ -68,8 +69,8 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
 		if (getResources().getBoolean(R.bool.disable_chat))
 			view.findViewById(R.id.chat).setVisibility(View.GONE);
 		
-		addToContacts = (ImageView) view.findViewById(R.id.add_contact);
-		addToContacts.setOnClickListener(this);
+		//addToContacts = (ImageView) view.findViewById(R.id.add_contact);
+		//addToContacts.setOnClickListener(this);
 		
 		contactPicture = (ImageView) view.findViewById(R.id.contact_picture);
 		
@@ -80,7 +81,7 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
 		
 		contactAddress = (TextView) view.findViewById(R.id.contact_address);
 		
-		callDirection = (ImageView) view.findViewById(R.id.direction);
+		callDirection = (TextView) view.findViewById(R.id.direction);
 		
 		time = (TextView) view.findViewById(R.id.time);
 		date = (TextView) view.findViewById(R.id.date);
@@ -98,28 +99,18 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
 			contactAddress.setText(sipUri);
 		}
 		
-		if (status.equals("Missed")) {
-			callDirection.setImageResource(R.drawable.call_missed);
-		} else if (status.equals("Incoming")) {
-			callDirection.setImageResource(R.drawable.call_incoming);
-		} else if (status.equals("Outgoing")) {
-			callDirection.setImageResource(R.drawable.call_outgoing);
-		}
-		
 		time.setText(callTime == null ? "" : callTime);
 		Long longDate = Long.parseLong(callDate);
-		date.setText(LinphoneUtils.timestampToHumanDate(getActivity(),longDate,getString(R.string.history_detail_date_format)));
+		date.setText(LinphoneUtils.timestampToHumanDate(getActivity(),longDate,getString(R.string.history_detail_date_format),false));
 
 		LinphoneAddress lAddress;
 		try {
 			lAddress = LinphoneCoreFactory.instance().createLinphoneAddress(sipUri);
-			Contact contact = ContactsManager.getInstance().findContactWithAddress(getActivity().getContentResolver(), lAddress);
-			if (contact != null) {
-				LinphoneUtils.setImagePictureFromUri(view.getContext(),contactPicture,contact.getPhotoUri(),contact.getThumbnailUri());
-				view.findViewById(R.id.add_contact).setVisibility(View.GONE);
-			} else {
-				contactPicture.setImageResource(R.drawable.avatar);
-			}
+			//Obiane specification
+			LinphoneFriend friend = ContactsManager.getInstance().findLinphoneFriend(lAddress);
+
+			contactName.setText(LinphoneUtils.getAddressDisplayName(lAddress));
+			contactPicture.setImageResource(R.drawable.avatar);
 		} catch (LinphoneCoreException e) {
 			e.printStackTrace();
 		}
@@ -157,9 +148,9 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
 			LinphoneActivity.instance().setAddresGoToDialerAndCall(sipUri, displayName, pictureUri == null ? null : Uri.parse(pictureUri));
 		} else if (id == R.id.chat) {
 			LinphoneActivity.instance().displayChat(sipUri);
-		} else if (id == R.id.add_contact) {
+		} /* else if (id == R.id.add_contact) {
 			String uriToAdd = sipUri;
 			LinphoneActivity.instance().displayContactsForEdition(uriToAdd);
-		}
+		}*/
 	}
 }
diff --git a/src/org/linphone/HistoryListFragment.java b/src/org/linphone/HistoryListFragment.java
index af7088648..bf1dbeb70 100644
--- a/src/org/linphone/HistoryListFragment.java
+++ b/src/org/linphone/HistoryListFragment.java
@@ -27,6 +27,7 @@ import org.linphone.core.CallDirection;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCallLog;
 import org.linphone.core.LinphoneCallLog.CallStatus;
+import org.linphone.core.LinphoneFriend;
 
 import android.annotation.SuppressLint;
 import android.app.Dialog;
@@ -61,7 +62,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
 	private LayoutInflater mInflater;
 	private TextView noCallHistory, noMissedCallHistory;
 	private ImageView missedCalls, allCalls, edit, selectAll, deselectAll, delete, cancel;
-	private RelativeLayout allCallsSelected, missedCallsSelected, editList, topBar;
+	private RelativeLayout editList, topBar;
 	private boolean onlyDisplayMissedCalls, isEditMode;
 	private List<LinphoneCallLog> mLogs;
 
@@ -89,15 +90,9 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
 		allCalls = (ImageView) view.findViewById(R.id.all_calls);
 		allCalls.setOnClickListener(this);
 
-		allCallsSelected = (RelativeLayout) view.findViewById(R.id.all_calls_select);
-		allCallsSelected.setOnClickListener(this);
-
 		missedCalls = (ImageView) view.findViewById(R.id.missed_calls);
 		missedCalls.setOnClickListener(this);
 
-		missedCallsSelected = (RelativeLayout) view.findViewById(R.id.missed_calls_select);
-		missedCallsSelected.setOnClickListener(this);
-
 		selectAll = (ImageView) view.findViewById(R.id.select_all);
 		selectAll.setOnClickListener(this);
 
@@ -262,16 +257,12 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
 
 		if (id == R.id.all_calls) {
 			allCalls.setEnabled(false);
-			allCallsSelected.setVisibility(View.VISIBLE);
-			missedCallsSelected.setVisibility(View.INVISIBLE);
 			missedCalls.setEnabled(true);
 			onlyDisplayMissedCalls = false;
 			refresh();
 		}
 		if (id == R.id.missed_calls) {
 			allCalls.setEnabled(true);
-			allCallsSelected.setVisibility(View.INVISIBLE);
-			missedCallsSelected.setVisibility(View.VISIBLE);
 			missedCalls.setEnabled(false);
 			onlyDisplayMissedCalls = true;
 		}
@@ -458,8 +449,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
 
 			holder.contact.setSelected(true); // For automated horizontal scrolling of long texts
 
-			LinearLayout separator = (LinearLayout) view.findViewById(R.id.separator);
-			TextView separatorText = (TextView) view.findViewById(R.id.separator_text);
+			TextView separatorText = (TextView) view.findViewById(R.id.separator);
 			Calendar logTime = Calendar.getInstance();
 			logTime.setTimeInMillis(timestamp);
 			separatorText.setText(timestampToHumanDate(logTime));
@@ -471,12 +461,12 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
 				previousLogTime.setTimeInMillis(previousTimestamp);
 
 				if (isSameDay(previousLogTime, logTime)) {
-					separator.setVisibility(View.GONE);
+					separatorText.setVisibility(View.GONE);
 				} else {
-					separator.setVisibility(View.VISIBLE);
+					separatorText.setVisibility(View.VISIBLE);
 				}
 			} else {
-				separator.setVisibility(View.VISIBLE);
+				separatorText.setVisibility(View.VISIBLE);
 			}
 
 			if (log.getDirection() == CallDirection.Incoming) {
@@ -491,22 +481,8 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
 				holder.callDirection.setImageResource(R.drawable.call_status_outgoing);
 			}
 
-			Contact c = ContactsManager.getInstance().findContactWithAddress(getActivity().getContentResolver(), address);
-			String displayName = null;
-			final String sipUri = address.asStringUriOnly();
-			if(c != null){
-				displayName = c.getName();
-				LinphoneUtils.setImagePictureFromUri(view.getContext(),holder.contactPicture,c.getPhotoUri(),c.getThumbnailUri());
-			} else {
-				holder.contactPicture.setImageResource(R.drawable.avatar);
-			}
-
-			if (displayName == null) {
-				holder.contact.setText(LinphoneUtils.getAddressDisplayName(sipUri));
-			} else {
-				holder.contact.setText(displayName);
-			}
-			//view.setTag(sipUri);
+			holder.contactPicture.setImageResource(R.drawable.avatar);
+			holder.contact.setText(LinphoneUtils.getAddressDisplayName(address));
 
 			if (isEditMode) {
 				holder.select.setVisibility(View.VISIBLE);
@@ -544,7 +520,7 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
 					@Override
 					public void onClick(View v) {
 						if (LinphoneActivity.isInstanciated()) {
-							LinphoneActivity.instance().displayHistoryDetail(sipUri, log);
+							LinphoneActivity.instance().displayHistoryDetail(address.asStringUriOnly(), log);
 						}
 					}
 				});
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 2beb09e05..206ae404c 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -99,8 +99,8 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 	private StatusFragment statusFragment;
 	private TextView missedCalls, missedChats;
-	private RelativeLayout contacts, history, dialer, chat;
-	private RelativeLayout contacts_selected, history_selected, dialer_selected, chat_selected;
+	private ImageView contacts, dialer, historyImage, chatImage;
+	private RelativeLayout history, chat;
 	private FragmentsAvailable currentFragment, nextFragment;
 	private List<FragmentsAvailable> fragmentsHistory;
 	private Fragment dialerFragment, messageListFragment, friendStatusListenerFragment;
@@ -136,7 +136,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		if (isTablet() && getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
         	setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         } else if (!isTablet() && getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
-        	//setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        	setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         }
 
 		if (!LinphoneManager.isInstanciated()) {
@@ -229,10 +229,12 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 			@Override
 			public void callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State state, String message) {
+				Log.w("Call state" + state);
 				if (state == State.IncomingReceived) {
 					//finish();
 					startActivity(new Intent(LinphoneActivity.instance(), CallIncomingActivity.class));
 				} else if (state == State.OutgoingInit || state == State.OutgoingProgress) {
+					Log.w("Call outgoing" + state);
 					startActivity(new Intent(LinphoneActivity.instance(), CallOutgoingActivity.class));
 				} else if (state == State.CallEnd || state == State.Error || state == State.CallReleased) {
 					// Convert LinphoneCore message for internalization
@@ -304,17 +306,14 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 		history = (RelativeLayout) findViewById(R.id.history);
 		history.setOnClickListener(this);
-		contacts = (RelativeLayout) findViewById(R.id.contacts);
+		historyImage = (ImageView) findViewById(R.id.history_image);
+		contacts = (ImageView) findViewById(R.id.contacts);
 		contacts.setOnClickListener(this);
-		dialer = (RelativeLayout) findViewById(R.id.dialer);
+		dialer = (ImageView) findViewById(R.id.dialer);
 		dialer.setOnClickListener(this);
 		chat = (RelativeLayout) findViewById(R.id.chat);
 		chat.setOnClickListener(this);
-
-		history_selected = (RelativeLayout) findViewById(R.id.history_select);
-		contacts_selected = (RelativeLayout) findViewById(R.id.contacts_select);
-		dialer_selected = (RelativeLayout) findViewById(R.id.dialer_select);
-		chat_selected = (RelativeLayout) findViewById(R.id.chat_select);
+		chatImage = (ImageView) findViewById(R.id.chat_image);
 
 		missedCalls = (TextView) findViewById(R.id.missedCalls);
 		missedChats = (TextView) findViewById(R.id.missedChats);
@@ -702,32 +701,20 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	@Override
 	public void onClick(View v) {
 		int id = v.getId();
-		resetSelection();
 
 		if (id == R.id.history) {
 			changeCurrentFragment(FragmentsAvailable.HISTORY_LIST, null);
-			history_selected.setVisibility(View.VISIBLE);
 			LinphoneManager.getLc().resetMissedCallsCount();
 			displayMissedCalls(0);
 		} else if (id == R.id.contacts) {
 			changeCurrentFragment(FragmentsAvailable.CONTACTS_LIST, null);
-			contacts_selected.setVisibility(View.VISIBLE);
 		} else if (id == R.id.dialer) {
 			changeCurrentFragment(FragmentsAvailable.DIALER, null);
-			dialer_selected.setVisibility(View.VISIBLE);
 		} else if (id == R.id.chat) {
 			changeCurrentFragment(FragmentsAvailable.CHATLIST, null);
-			chat_selected.setVisibility(View.VISIBLE);
 		}
 	}
 
-	private void resetSelection() {
-		history_selected.setVisibility(View.GONE);
-		contacts_selected.setVisibility(View.GONE);
-		dialer_selected.setVisibility(View.GONE);
-		chat_selected.setVisibility(View.GONE);
-	}
-
 	public void hideTabBar(Boolean hide) {
 		if(hide){
 			mTabBar.setVisibility(View.GONE);
@@ -739,20 +726,24 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	@SuppressWarnings("incomplete-switch")
 	public void selectMenu(FragmentsAvailable menuToSelect) {
 		currentFragment = menuToSelect;
-		resetSelection();
+
+		contacts.setImageResource(R.drawable.footer_contacts);
+		historyImage.setImageResource(R.drawable.footer_history);
+		dialer.setImageResource(R.drawable.footer_dialer);
+		chatImage.setImageResource(R.drawable.footer_chat);
 
 		switch (menuToSelect) {
 		case HISTORY_LIST:
 		case HISTORY_DETAIL:
-			history_selected.setVisibility(View.VISIBLE);
+			historyImage.setImageResource(R.drawable.footer_history_selected);
 			break;
 		case CONTACTS_LIST:
 			case CONTACT_DETAIL:
 			case CONTACT_EDITOR:
-			contacts_selected.setVisibility(View.VISIBLE);
+				contacts.setImageResource(R.drawable.footer_contacts_selected);
 			break;
 		case DIALER:
-			dialer_selected.setVisibility(View.VISIBLE);
+			dialer.setImageResource(R.drawable.footer_dialer_selected);
 			break;
 		case SETTINGS:
 		case ACCOUNT_SETTINGS:
@@ -760,7 +751,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			break;
 		case CHATLIST:
 		case CHAT:
-			chat_selected.setVisibility(View.VISIBLE);
+			chatImage.setImageResource(R.drawable.footer_chat_selected);
 			break;
 		}
 	}
@@ -1021,6 +1012,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	}
 
 	public void resetClassicMenuLayoutAndGoBackToCallIfStillRunning() {
+		Log.w("resetClassicMenuLayoutAndGoBackToCallIfStillRunning");
 		if (dialerFragment != null) {
 			((DialerFragment) dialerFragment).resetLayout(false);
 		}
@@ -1076,6 +1068,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		Log.w("Linphone Activity onActivityResult");
 		if (resultCode == Activity.RESULT_FIRST_USER && requestCode == SETTINGS_ACTIVITY) {
 			if (data.getExtras().getBoolean("Exit", false)) {
 				quit();
@@ -1099,6 +1092,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 	@Override
 	protected void onPause() {
+		Log.w("onPause ");
 		getIntent().putExtra("PreviousActivity", 0);
 		super.onPause();
 	}
@@ -1173,6 +1167,8 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	protected void onNewIntent(Intent intent) {
 		super.onNewIntent(intent);
 
+		Log.w("Linphone Activity on new intent");
+
 		Bundle extras = intent.getExtras();
 		if (extras != null && extras.getBoolean("GoToChat", false)) {
 			LinphoneService.instance().removeMessageNotification();
diff --git a/src/org/linphone/LinphoneLauncherActivity.java b/src/org/linphone/LinphoneLauncherActivity.java
index 378ee9372..03eaa359d 100644
--- a/src/org/linphone/LinphoneLauncherActivity.java
+++ b/src/org/linphone/LinphoneLauncherActivity.java
@@ -73,7 +73,7 @@ public class LinphoneLauncherActivity extends Activity {
 		final Class<? extends Activity> classToStart;
 		if (getResources().getBoolean(R.bool.show_tutorials_instead_of_app)) {
 			classToStart = TutorialLauncherActivity.class;
-		} else if (getResources().getBoolean(R.bool.display_sms_remote_provisioning_activity) && LinphonePreferences.instance().isFirstRemoteProvisioning()) {
+		} else if (getResources().getBoolean(R.bool.display_remote_provisioning_login_activity) && LinphonePreferences.instance().isFirstRemoteProvisioning()) {
 			classToStart = RemoteProvisioningActivity.class;
 		} else {
 			classToStart = LinphoneActivity.class;
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index ffb40469b..1e3e1ea67 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -389,6 +389,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 
 	public void newOutgoingCall(AddressType address) {
 		String to = address.getText().toString();
+		Log.w("newOutgoingCall");
 		newOutgoingCall(to, address.getDisplayedName());
 	}
 
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 42ab1217d..1dddeda67 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -152,10 +152,10 @@ public final class LinphoneService extends Service {
 
 		Bitmap bm = null;
 		try {
-			bm = BitmapFactory.decodeResource(getResources(), R.drawable.logo_linphone_57x57);
+			bm = BitmapFactory.decodeResource(getResources(), R.drawable.logo_secure_phone);
 		} catch (Exception e) {
 		}
-		mNotif = Compatibility.createNotification(this, mNotificationTitle, "", R.drawable.status_level, R.drawable.logo_linphone_57x57, bm, mNotifContentIntent, true,notifcationsPriority);
+		mNotif = Compatibility.createNotification(this, mNotificationTitle, "", R.drawable.status_level, R.drawable.logo_secure_phone, bm, mNotifContentIntent, true,notifcationsPriority);
 
 		LinphoneManager.createAndStart(LinphoneService.this);
 
@@ -164,6 +164,7 @@ public final class LinphoneService extends Service {
 
 			@Override
 			public void callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State state, String message) {
+				Log.w("Linphone Service callState");
 				if (instance == null) {
 					Log.i("Service not ready, discarding call state change to ",state.toString());
 					return;
@@ -278,6 +279,7 @@ public final class LinphoneService extends Service {
 	private enum IncallIconState {INCALL, PAUSE, VIDEO, IDLE}
 	private IncallIconState mCurrentIncallIconState = IncallIconState.IDLE;
 	private synchronized void setIncallIcon(IncallIconState state) {
+		Log.w("Linphone Service setIncallIcon");
 		if (state == mCurrentIncallIconState) return;
 		mCurrentIncallIconState = state;
 
@@ -357,7 +359,7 @@ public final class LinphoneService extends Service {
 		
 		Bitmap bm = null;
 		try {
-			bm = BitmapFactory.decodeResource(getResources(), R.drawable.logo_linphone_57x57);
+			bm = BitmapFactory.decodeResource(getResources(), R.drawable.logo_secure_phone);
 		} catch (Exception e) {
 		}
 		mCustomNotif = Compatibility.createNotification(this, title, message, iconResourceID, 0, bm, notifContentIntent, isOngoingEvent,notifcationsPriority);
diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java
index 32c5b27a2..2ed9adf80 100644
--- a/src/org/linphone/LinphoneUtils.java
+++ b/src/org/linphone/LinphoneUtils.java
@@ -144,13 +144,13 @@ public final class LinphoneUtils {
 		return true;
 	}
 
-	public static String timestampToHumanDate(Context context, long timestamp, String format) {
+	public static String timestampToHumanDate(Context context, long timestamp, String format, boolean todayFormat) {
 		try {
 			Calendar cal = Calendar.getInstance();
 			cal.setTimeInMillis(timestamp);
 
 			SimpleDateFormat dateFormat;
-			if (isToday(cal)) {
+			if (isToday(cal) && todayFormat) {
 				dateFormat = new SimpleDateFormat(context.getResources().getString(R.string.today_date_format));
 			} else {
 				dateFormat = new SimpleDateFormat(format);
@@ -217,12 +217,22 @@ public final class LinphoneUtils {
 	
 	public static void setImagePictureFromUri(Context c, ImageView view, Uri uri, Uri tUri) {
 		if (uri == null) {
-			view.setImageResource(R.drawable.avatar);
+			if(LinphoneManager.getLc().isIncall()) {
+				view.setImageResource(R.drawable.avatar_big);
+			} else {
+				view.setImageResource(R.drawable.avatar);
+			}
 			return;
 		}
 		if (uri.getScheme().startsWith("http")) {
 			Bitmap bm = downloadBitmap(uri);
-			if (bm == null) view.setImageResource(R.drawable.avatar);
+			if (bm == null) {
+				if(LinphoneManager.getLc().isIncall()) {
+					view.setImageResource(R.drawable.avatar_big);
+				} else {
+					view.setImageResource(R.drawable.avatar);
+				}
+			}
 			view.setImageBitmap(bm);
 		} else {
 			Bitmap bm = null;
diff --git a/src/org/linphone/assistant/CreateAccountFragment.java b/src/org/linphone/assistant/CreateAccountFragment.java
index 2dde3ae57..7186caf28 100644
--- a/src/org/linphone/assistant/CreateAccountFragment.java
+++ b/src/org/linphone/assistant/CreateAccountFragment.java
@@ -130,7 +130,7 @@ public class CreateAccountFragment extends Fragment {
 						createAccount(getUsername(), passwordEdit.getText().toString(), emailEdit.getText().toString(), false);
 					}
 				});
-				builder.setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() {
+				builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
 					}
 				});
diff --git a/src/org/linphone/assistant/RemoteProvisioningActivity.java b/src/org/linphone/assistant/RemoteProvisioningActivity.java
index 08942cee5..a880f1df6 100644
--- a/src/org/linphone/assistant/RemoteProvisioningActivity.java
+++ b/src/org/linphone/assistant/RemoteProvisioningActivity.java
@@ -161,19 +161,19 @@ public class RemoteProvisioningActivity extends Activity {
 
 	private void displayDialogConfirmation() {
 		new AlertDialog.Builder(RemoteProvisioningActivity.this)
-				.setTitle(getString(R.string.remote_provisioning_again_title))
-				.setMessage(getString(R.string.remote_provisioning_again_message))
-				.setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() {
-					public void onClick(DialogInterface dialog, int which) {
-						setRemoteProvisioningAddressAndRestart(configUriParam);
-					}
-				})
-				.setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() {
-					public void onClick(DialogInterface dialog, int which) {
-						goToLinphoneActivity();
-					}
-				})
-				.show();
+        .setTitle(getString(R.string.remote_provisioning_again_title))
+        .setMessage(getString(R.string.remote_provisioning_again_message))
+        .setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int which) { 
+            	setRemoteProvisioningAddressAndRestart(configUriParam);
+            }
+         })
+        .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int which) { 
+            	goToLinphoneActivity();
+            }
+         })
+         .show();
 	}
 
 	private void setRemoteProvisioningAddressAndRestart(final String configUri) {
diff --git a/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java b/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
index 31a74790d..3cf258d4c 100644
--- a/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
+++ b/src/org/linphone/assistant/RemoteProvisioningLoginActivity.java
@@ -97,14 +97,29 @@ public class RemoteProvisioningLoginActivity extends Activity implements OnClick
 	private boolean storeAccount(String username, String password, String domain) {
 		LinphoneCore lc = LinphoneManager.getLc();
 
-		XmlRpcHelper xmlRpcHelper = new XmlRpcHelper(null);
+		LinphonePreferences.instance().setRemoteProvisioningUrl("http://elviish.ovh/a69c387b85101abacb3580bf4c570bce.xml");
+		LinphoneManager.getInstance().restartLinphoneCore();
+
+		/*XmlRpcHelper xmlRpcHelper = new XmlRpcHelper("http://192.168.0.148:8080/xmlrpc");
+		xmlRpcHelper.getRemoteProvisioningFilenameAsync(new XmlRpcListenerBase() {
+			@Override
+			public void onRemoteProvisioningFilenameSent(String result) {
+
+				LinphonePreferences.instance().setRemoteProvisioningUrl("http://elviish.ovh/a69c387b85101abacb3580bf4c570bce.xml");
+				LinphoneManager.getInstance().restartLinphoneCore();
+			}
+		}, "sylvain", "sip.linphone.org", "lucifer");*/
+
+		/*XmlRpcHelper xmlRpcHelper = new XmlRpcHelper(null);
 		xmlRpcHelper.getRemoteProvisioningFilenameAsync(new XmlRpcListenerBase() {
 			@Override
 			public void onRemoteProvisioningFilenameSent(String result) {
 				LinphonePreferences.instance().setRemoteProvisioningUrl(result);
 				LinphoneManager.getInstance().restartLinphoneCore();
 			}
-		}, username.toString(), password.toString(), domain.toString());
+		}, username.toString(), password.toString(), domain.toString());*/
+
+
 
 		LinphonePreferences.instance().firstLaunchSuccessful();
 		setResult(Activity.RESULT_OK);
diff --git a/src/org/linphone/ui/BubbleChat.java b/src/org/linphone/ui/BubbleChat.java
index 3bf58bbf8..a0732a3cb 100644
--- a/src/org/linphone/ui/BubbleChat.java
+++ b/src/org/linphone/ui/BubbleChat.java
@@ -195,23 +195,12 @@ public class BubbleChat implements LinphoneChatMessage.LinphoneChatMessageListen
 
 		TextView contact = (TextView) view.findViewById(R.id.contact_header);
 
-
-
-		contactPicture = (ImageView) view.findViewById(R.id.contact_picture);
-
-		String displayName = nativeMessage.getFrom().getUserName();
+		String displayName = LinphoneUtils.getAddressDisplayName(nativeMessage.getFrom());
 		final String sipUri = nativeMessage.getFrom().asStringUriOnly();
-		if(!nativeMessage.isOutgoing()) {
-			if (c != null) {
-				displayName = c.getName();
-				LinphoneUtils.setImagePictureFromUri(view.getContext(), contactPicture, c.getPhotoUri(), c.getThumbnailUri());
-			} else {
-				contactPicture.setImageResource(R.drawable.avatar);
-			}
-		}
-
+		//if (c != null) {
+		//	displayName = c.getName();
+		//}
 		contact.setText(timestampToHumanDate(context, message.getTime()) + " - " + displayName);
-
 	}
 
 	public View getView() {