diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d6ebef7ca..8f1b57fa0 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest package="org.linphone"
           xmlns:android="http://schemas.android.com/apk/res/android"
           android:installLocation="auto"
-          android:versionCode="3996"
-          android:versionName="3.99.5">
+          android:versionCode="1400"
+          android:versionName="1.4.0">
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/prepare.conf b/prepare.conf
index d32d173a7..d8d2c2899 100644
--- a/prepare.conf
+++ b/prepare.conf
@@ -18,4 +18,3 @@
 -DENABLE_VPX=ON
 -DENABLE_X264=OFF
 -DENABLE_CODEC2=OFF
--DENABLE_QRCODE=ON
diff --git a/res/drawable-xhdpi/arrow_accept.png b/res/drawable-xhdpi/arrow_accept.png
index c90817e48..97958ebb4 100644
Binary files a/res/drawable-xhdpi/arrow_accept.png and b/res/drawable-xhdpi/arrow_accept.png differ
diff --git a/res/drawable-xhdpi/arrow_decline.png b/res/drawable-xhdpi/arrow_decline.png
new file mode 100644
index 000000000..a4afcb560
Binary files /dev/null and b/res/drawable-xhdpi/arrow_decline.png differ
diff --git a/res/drawable-xhdpi/avatar_big_secure1.png b/res/drawable-xhdpi/avatar_big_secure1.png
new file mode 100644
index 000000000..98d48f654
Binary files /dev/null and b/res/drawable-xhdpi/avatar_big_secure1.png differ
diff --git a/res/drawable-xhdpi/avatar_big_secure2.png b/res/drawable-xhdpi/avatar_big_secure2.png
new file mode 100644
index 000000000..720b108d2
Binary files /dev/null and b/res/drawable-xhdpi/avatar_big_secure2.png differ
diff --git a/res/drawable-xhdpi/avatar_big_unsecure.png b/res/drawable-xhdpi/avatar_big_unsecure.png
new file mode 100644
index 000000000..88bbeda35
Binary files /dev/null and b/res/drawable-xhdpi/avatar_big_unsecure.png differ
diff --git a/res/drawable-xhdpi/avatar_group_small_secure1.png b/res/drawable-xhdpi/avatar_group_small_secure1.png
new file mode 100644
index 000000000..474418823
Binary files /dev/null and b/res/drawable-xhdpi/avatar_group_small_secure1.png differ
diff --git a/res/drawable-xhdpi/avatar_group_small_secure2.png b/res/drawable-xhdpi/avatar_group_small_secure2.png
new file mode 100644
index 000000000..2f62bee5d
Binary files /dev/null and b/res/drawable-xhdpi/avatar_group_small_secure2.png differ
diff --git a/res/drawable-xhdpi/avatar_group_small_unregistered.png b/res/drawable-xhdpi/avatar_group_small_unregistered.png
new file mode 100644
index 000000000..b7298b694
Binary files /dev/null and b/res/drawable-xhdpi/avatar_group_small_unregistered.png differ
diff --git a/res/drawable-xhdpi/avatar_group_small_unsecure.png b/res/drawable-xhdpi/avatar_group_small_unsecure.png
new file mode 100644
index 000000000..0ca70810b
Binary files /dev/null and b/res/drawable-xhdpi/avatar_group_small_unsecure.png differ
diff --git a/res/drawable-xhdpi/avatar_medium_secure1.png b/res/drawable-xhdpi/avatar_medium_secure1.png
new file mode 100644
index 000000000..3134f9082
Binary files /dev/null and b/res/drawable-xhdpi/avatar_medium_secure1.png differ
diff --git a/res/drawable-xhdpi/avatar_medium_secure2.png b/res/drawable-xhdpi/avatar_medium_secure2.png
new file mode 100644
index 000000000..c599d14f5
Binary files /dev/null and b/res/drawable-xhdpi/avatar_medium_secure2.png differ
diff --git a/res/drawable-xhdpi/avatar_medium_unregistered.png b/res/drawable-xhdpi/avatar_medium_unregistered.png
new file mode 100644
index 000000000..96733fea0
Binary files /dev/null and b/res/drawable-xhdpi/avatar_medium_unregistered.png differ
diff --git a/res/drawable-xhdpi/avatar_medium_unsecure.png b/res/drawable-xhdpi/avatar_medium_unsecure.png
new file mode 100644
index 000000000..76bf03da6
Binary files /dev/null and b/res/drawable-xhdpi/avatar_medium_unsecure.png differ
diff --git a/res/drawable-xhdpi/avatar_small_secure1.png b/res/drawable-xhdpi/avatar_small_secure1.png
new file mode 100644
index 000000000..a11d7b2db
Binary files /dev/null and b/res/drawable-xhdpi/avatar_small_secure1.png differ
diff --git a/res/drawable-xhdpi/avatar_small_secure2.png b/res/drawable-xhdpi/avatar_small_secure2.png
new file mode 100644
index 000000000..01f958744
Binary files /dev/null and b/res/drawable-xhdpi/avatar_small_secure2.png differ
diff --git a/res/drawable-xhdpi/avatar_small_secure_1.png b/res/drawable-xhdpi/avatar_small_secure_1.png
new file mode 100644
index 000000000..f78f49513
Binary files /dev/null and b/res/drawable-xhdpi/avatar_small_secure_1.png differ
diff --git a/res/drawable-xhdpi/avatar_small_unregistered.png b/res/drawable-xhdpi/avatar_small_unregistered.png
new file mode 100644
index 000000000..ab9fd584e
Binary files /dev/null and b/res/drawable-xhdpi/avatar_small_unregistered.png differ
diff --git a/res/drawable-xhdpi/avatar_small_unsecure.png b/res/drawable-xhdpi/avatar_small_unsecure.png
new file mode 100644
index 000000000..73a35d961
Binary files /dev/null and b/res/drawable-xhdpi/avatar_small_unsecure.png differ
diff --git a/res/drawable-xhdpi/back.png b/res/drawable-xhdpi/back.png
index d5f76299b..f56b2cd26 100644
Binary files a/res/drawable-xhdpi/back.png and b/res/drawable-xhdpi/back.png differ
diff --git a/res/drawable-xhdpi/back_over.png b/res/drawable-xhdpi/back_over.png
index 8ca8a6cfa..fd21b5f32 100644
Binary files a/res/drawable-xhdpi/back_over.png and b/res/drawable-xhdpi/back_over.png differ
diff --git a/res/drawable-xhdpi/backspace.png b/res/drawable-xhdpi/backspace.png
new file mode 100644
index 000000000..e1e1ccd23
Binary files /dev/null and b/res/drawable-xhdpi/backspace.png differ
diff --git a/res/drawable-xhdpi/call_alt_back.png b/res/drawable-xhdpi/call_alt_back.png
index a4e125b7a..b1c691188 100644
Binary files a/res/drawable-xhdpi/call_alt_back.png and b/res/drawable-xhdpi/call_alt_back.png differ
diff --git a/res/drawable-xhdpi/call_alt_start.png b/res/drawable-xhdpi/call_alt_start.png
index 82aff2e72..45741b6a5 100644
Binary files a/res/drawable-xhdpi/call_alt_start.png and b/res/drawable-xhdpi/call_alt_start.png differ
diff --git a/res/drawable-xhdpi/call_alt_start_over.png b/res/drawable-xhdpi/call_alt_start_over.png
index ab7e89c76..efc27daec 100644
Binary files a/res/drawable-xhdpi/call_alt_start_over.png and b/res/drawable-xhdpi/call_alt_start_over.png differ
diff --git a/res/drawable-xhdpi/call_audio_start.png b/res/drawable-xhdpi/call_audio_start.png
index cef5a096c..569b11c73 100644
Binary files a/res/drawable-xhdpi/call_audio_start.png and b/res/drawable-xhdpi/call_audio_start.png differ
diff --git a/res/drawable-xhdpi/call_back.png b/res/drawable-xhdpi/call_back.png
index bbdb97bb4..677f3bac9 100644
Binary files a/res/drawable-xhdpi/call_back.png and b/res/drawable-xhdpi/call_back.png differ
diff --git a/res/drawable-xhdpi/call_back_over.png b/res/drawable-xhdpi/call_back_over.png
index c4b10b4bc..dd88b6f79 100644
Binary files a/res/drawable-xhdpi/call_back_over.png and b/res/drawable-xhdpi/call_back_over.png differ
diff --git a/res/drawable-xhdpi/call_hangup.png b/res/drawable-xhdpi/call_hangup.png
index 350ae74cf..ded7fade7 100644
Binary files a/res/drawable-xhdpi/call_hangup.png and b/res/drawable-xhdpi/call_hangup.png differ
diff --git a/res/drawable-xhdpi/call_incoming.png b/res/drawable-xhdpi/call_incoming.png
index 89d593a4c..9d519e17a 100644
Binary files a/res/drawable-xhdpi/call_incoming.png and b/res/drawable-xhdpi/call_incoming.png differ
diff --git a/res/drawable-xhdpi/call_missed.png b/res/drawable-xhdpi/call_missed.png
index e1074ffaf..003142696 100644
Binary files a/res/drawable-xhdpi/call_missed.png and b/res/drawable-xhdpi/call_missed.png differ
diff --git a/res/drawable-xhdpi/call_outgoing.png b/res/drawable-xhdpi/call_outgoing.png
index c6df94bd9..89b5ee98f 100644
Binary files a/res/drawable-xhdpi/call_outgoing.png and b/res/drawable-xhdpi/call_outgoing.png differ
diff --git a/res/drawable-xhdpi/call_quality_indicator_0.png b/res/drawable-xhdpi/call_quality_indicator_0.png
index 8ed1bfc8d..4fec4933c 100644
Binary files a/res/drawable-xhdpi/call_quality_indicator_0.png and b/res/drawable-xhdpi/call_quality_indicator_0.png differ
diff --git a/res/drawable-xhdpi/call_quality_indicator_1.png b/res/drawable-xhdpi/call_quality_indicator_1.png
index 1c347c44e..09890e7a2 100644
Binary files a/res/drawable-xhdpi/call_quality_indicator_1.png and b/res/drawable-xhdpi/call_quality_indicator_1.png differ
diff --git a/res/drawable-xhdpi/call_quality_indicator_2.png b/res/drawable-xhdpi/call_quality_indicator_2.png
index 34c426a61..7df6951e5 100644
Binary files a/res/drawable-xhdpi/call_quality_indicator_2.png and b/res/drawable-xhdpi/call_quality_indicator_2.png differ
diff --git a/res/drawable-xhdpi/call_quality_indicator_3.png b/res/drawable-xhdpi/call_quality_indicator_3.png
index 33098f8e2..909f83f55 100644
Binary files a/res/drawable-xhdpi/call_quality_indicator_3.png and b/res/drawable-xhdpi/call_quality_indicator_3.png differ
diff --git a/res/drawable-xhdpi/call_quality_indicator_4.png b/res/drawable-xhdpi/call_quality_indicator_4.png
index 07a52cb7a..caf994135 100644
Binary files a/res/drawable-xhdpi/call_quality_indicator_4.png and b/res/drawable-xhdpi/call_quality_indicator_4.png differ
diff --git a/res/drawable-xhdpi/call_start.png b/res/drawable-xhdpi/call_start.png
new file mode 100644
index 000000000..fed0508e8
Binary files /dev/null and b/res/drawable-xhdpi/call_start.png differ
diff --git a/res/drawable-xhdpi/call_start_body_default.png b/res/drawable-xhdpi/call_start_body_default.png
index 7ad7f840b..ad0a6e1dc 100644
Binary files a/res/drawable-xhdpi/call_start_body_default.png and b/res/drawable-xhdpi/call_start_body_default.png differ
diff --git a/res/drawable-xhdpi/call_start_body_over.png b/res/drawable-xhdpi/call_start_body_over.png
index 4d51c61c9..adbbd2711 100644
Binary files a/res/drawable-xhdpi/call_start_body_over.png and b/res/drawable-xhdpi/call_start_body_over.png differ
diff --git a/res/drawable-xhdpi/call_start_over.png b/res/drawable-xhdpi/call_start_over.png
new file mode 100644
index 000000000..a2d5fe0f5
Binary files /dev/null and b/res/drawable-xhdpi/call_start_over.png differ
diff --git a/res/drawable-xhdpi/call_status_incoming.png b/res/drawable-xhdpi/call_status_incoming.png
index c8785ce55..9d519e17a 100644
Binary files a/res/drawable-xhdpi/call_status_incoming.png and b/res/drawable-xhdpi/call_status_incoming.png differ
diff --git a/res/drawable-xhdpi/call_status_missed.png b/res/drawable-xhdpi/call_status_missed.png
index d00cc0f63..003142696 100644
Binary files a/res/drawable-xhdpi/call_status_missed.png and b/res/drawable-xhdpi/call_status_missed.png differ
diff --git a/res/drawable-xhdpi/call_status_outgoing.png b/res/drawable-xhdpi/call_status_outgoing.png
index 9d752947a..89b5ee98f 100644
Binary files a/res/drawable-xhdpi/call_status_outgoing.png and b/res/drawable-xhdpi/call_status_outgoing.png differ
diff --git a/res/drawable-xhdpi/call_transfer.png b/res/drawable-xhdpi/call_transfer.png
index ad8e37513..4ae3210cb 100644
Binary files a/res/drawable-xhdpi/call_transfer.png and b/res/drawable-xhdpi/call_transfer.png differ
diff --git a/res/drawable-xhdpi/call_transfer_over.png b/res/drawable-xhdpi/call_transfer_over.png
new file mode 100644
index 000000000..53647043b
Binary files /dev/null and b/res/drawable-xhdpi/call_transfer_over.png differ
diff --git a/res/drawable-xhdpi/camera.png b/res/drawable-xhdpi/camera.png
new file mode 100644
index 000000000..33e11f025
Binary files /dev/null and b/res/drawable-xhdpi/camera.png differ
diff --git a/res/drawable-xhdpi/camera_switch_default.png b/res/drawable-xhdpi/camera_switch_default.png
index f72975189..66dd87ed0 100644
Binary files a/res/drawable-xhdpi/camera_switch_default.png and b/res/drawable-xhdpi/camera_switch_default.png differ
diff --git a/res/drawable-xhdpi/camera_switch_over.png b/res/drawable-xhdpi/camera_switch_over.png
index 8ef782b56..c35bc1624 100644
Binary files a/res/drawable-xhdpi/camera_switch_over.png and b/res/drawable-xhdpi/camera_switch_over.png differ
diff --git a/res/drawable-xhdpi/chat_add.png b/res/drawable-xhdpi/chat_add.png
index 1e7284fa7..0a7012cc4 100644
Binary files a/res/drawable-xhdpi/chat_add.png and b/res/drawable-xhdpi/chat_add.png differ
diff --git a/res/drawable-xhdpi/chat_attachment.png b/res/drawable-xhdpi/chat_attachment.png
index f46b54e12..4aaba7cf0 100644
Binary files a/res/drawable-xhdpi/chat_attachment.png and b/res/drawable-xhdpi/chat_attachment.png differ
diff --git a/res/drawable-xhdpi/chat_attachment_over.png b/res/drawable-xhdpi/chat_attachment_over.png
index 7a4fefdec..20328f722 100644
Binary files a/res/drawable-xhdpi/chat_attachment_over.png and b/res/drawable-xhdpi/chat_attachment_over.png differ
diff --git a/res/drawable-xhdpi/chat_list_indicator.png b/res/drawable-xhdpi/chat_list_indicator.png
index e5929d6e7..f848174ed 100644
Binary files a/res/drawable-xhdpi/chat_list_indicator.png and b/res/drawable-xhdpi/chat_list_indicator.png differ
diff --git a/res/drawable-xhdpi/chat_send.png b/res/drawable-xhdpi/chat_send.png
new file mode 100644
index 000000000..36364d0dd
Binary files /dev/null and b/res/drawable-xhdpi/chat_send.png differ
diff --git a/res/drawable-xhdpi/chat_send_over.png b/res/drawable-xhdpi/chat_send_over.png
index 9aea01ebd..098d179f1 100644
Binary files a/res/drawable-xhdpi/chat_send_over.png and b/res/drawable-xhdpi/chat_send_over.png differ
diff --git a/res/drawable-xhdpi/chat_start_body_default.png b/res/drawable-xhdpi/chat_start_body_default.png
index e9254e2c9..43f9ab7fd 100644
Binary files a/res/drawable-xhdpi/chat_start_body_default.png and b/res/drawable-xhdpi/chat_start_body_default.png differ
diff --git a/res/drawable-xhdpi/chat_start_body_over.png b/res/drawable-xhdpi/chat_start_body_over.png
index baa3cd9a7..114c04bc7 100644
Binary files a/res/drawable-xhdpi/chat_start_body_over.png and b/res/drawable-xhdpi/chat_start_body_over.png differ
diff --git a/res/drawable-xhdpi/check.png b/res/drawable-xhdpi/check.png
new file mode 100644
index 000000000..07298e894
Binary files /dev/null and b/res/drawable-xhdpi/check.png differ
diff --git a/res/drawable-xhdpi/checkbox_checked.png b/res/drawable-xhdpi/checkbox_checked.png
index f1cba03e8..6c964c2a0 100644
Binary files a/res/drawable-xhdpi/checkbox_checked.png and b/res/drawable-xhdpi/checkbox_checked.png differ
diff --git a/res/drawable-xhdpi/checkbox_unchecked.png b/res/drawable-xhdpi/checkbox_unchecked.png
index 8b61efacd..c5643affb 100644
Binary files a/res/drawable-xhdpi/checkbox_unchecked.png and b/res/drawable-xhdpi/checkbox_unchecked.png differ
diff --git a/res/drawable-xhdpi/clean_field_default.png b/res/drawable-xhdpi/clean_field_default.png
index 32ccc8a87..6dc689b85 100644
Binary files a/res/drawable-xhdpi/clean_field_default.png and b/res/drawable-xhdpi/clean_field_default.png differ
diff --git a/res/drawable-xhdpi/clean_field_over.png b/res/drawable-xhdpi/clean_field_over.png
index ec2daffa7..f4993b7ce 100644
Binary files a/res/drawable-xhdpi/clean_field_over.png and b/res/drawable-xhdpi/clean_field_over.png differ
diff --git a/res/drawable-xhdpi/conference_exit.png b/res/drawable-xhdpi/conference_exit.png
new file mode 100644
index 000000000..271e53740
Binary files /dev/null and b/res/drawable-xhdpi/conference_exit.png differ
diff --git a/res/drawable-xhdpi/delete.png b/res/drawable-xhdpi/delete.png
index dc5ae3cf4..e7b6f38df 100644
Binary files a/res/drawable-xhdpi/delete.png and b/res/drawable-xhdpi/delete.png differ
diff --git a/res/drawable-xhdpi/delete_disabled.png b/res/drawable-xhdpi/delete_disabled.png
index dc5ae3cf4..e7b6f38df 100644
Binary files a/res/drawable-xhdpi/delete_disabled.png and b/res/drawable-xhdpi/delete_disabled.png differ
diff --git a/res/drawable-xhdpi/delete_over.png b/res/drawable-xhdpi/delete_over.png
new file mode 100644
index 000000000..5b957ca94
Binary files /dev/null and b/res/drawable-xhdpi/delete_over.png differ
diff --git a/res/drawable-xhdpi/deselect_all.png b/res/drawable-xhdpi/deselect_all.png
index 1f26fad45..626449750 100644
Binary files a/res/drawable-xhdpi/deselect_all.png and b/res/drawable-xhdpi/deselect_all.png differ
diff --git a/res/drawable-xhdpi/deselect_all_over.png b/res/drawable-xhdpi/deselect_all_over.png
index cc2294abf..58a3487ed 100644
Binary files a/res/drawable-xhdpi/deselect_all_over.png and b/res/drawable-xhdpi/deselect_all_over.png differ
diff --git a/res/drawable-xhdpi/dialer_alt_back.png b/res/drawable-xhdpi/dialer_alt_back.png
index a4e125b7a..b7069de35 100644
Binary files a/res/drawable-xhdpi/dialer_alt_back.png and b/res/drawable-xhdpi/dialer_alt_back.png differ
diff --git a/res/drawable-xhdpi/footer_chat.png b/res/drawable-xhdpi/footer_chat.png
index c8a9cf058..f972559b3 100644
Binary files a/res/drawable-xhdpi/footer_chat.png and b/res/drawable-xhdpi/footer_chat.png differ
diff --git a/res/drawable-xhdpi/footer_contacts.png b/res/drawable-xhdpi/footer_contacts.png
index 7a525691e..232c8ac57 100644
Binary files a/res/drawable-xhdpi/footer_contacts.png and b/res/drawable-xhdpi/footer_contacts.png differ
diff --git a/res/drawable-xhdpi/footer_dialer.png b/res/drawable-xhdpi/footer_dialer.png
index 7ad787589..57d484e08 100644
Binary files a/res/drawable-xhdpi/footer_dialer.png and b/res/drawable-xhdpi/footer_dialer.png differ
diff --git a/res/drawable-xhdpi/footer_history.png b/res/drawable-xhdpi/footer_history.png
index 768d80bbc..373c222d6 100644
Binary files a/res/drawable-xhdpi/footer_history.png and b/res/drawable-xhdpi/footer_history.png differ
diff --git a/res/drawable-xhdpi/history_all.png b/res/drawable-xhdpi/history_all.png
index e91eea5d0..0f8e8fa55 100644
Binary files a/res/drawable-xhdpi/history_all.png and b/res/drawable-xhdpi/history_all.png differ
diff --git a/res/drawable-xhdpi/history_all_selected.png b/res/drawable-xhdpi/history_all_selected.png
index cf4a2293a..13abf6bd0 100644
Binary files a/res/drawable-xhdpi/history_all_selected.png and b/res/drawable-xhdpi/history_all_selected.png differ
diff --git a/res/drawable-xhdpi/history_chat_indicator.png b/res/drawable-xhdpi/history_chat_indicator.png
index 876499a64..8c5c0fe36 100644
Binary files a/res/drawable-xhdpi/history_chat_indicator.png and b/res/drawable-xhdpi/history_chat_indicator.png differ
diff --git a/res/drawable-xhdpi/history_missed.png b/res/drawable-xhdpi/history_missed.png
index 2f70ae1ae..86d90e3fb 100644
Binary files a/res/drawable-xhdpi/history_missed.png and b/res/drawable-xhdpi/history_missed.png differ
diff --git a/res/drawable-xhdpi/history_missed_selected.png b/res/drawable-xhdpi/history_missed_selected.png
index f7d893608..0c5e33f13 100644
Binary files a/res/drawable-xhdpi/history_missed_selected.png and b/res/drawable-xhdpi/history_missed_selected.png differ
diff --git a/res/drawable-xhdpi/led_connected.png b/res/drawable-xhdpi/led_connected.png
index b7082f153..64aae6004 100644
Binary files a/res/drawable-xhdpi/led_connected.png and b/res/drawable-xhdpi/led_connected.png differ
diff --git a/res/drawable-xhdpi/led_disconnected.png b/res/drawable-xhdpi/led_disconnected.png
index bcb9d840a..326f9d135 100644
Binary files a/res/drawable-xhdpi/led_disconnected.png and b/res/drawable-xhdpi/led_disconnected.png differ
diff --git a/res/drawable-xhdpi/led_error.png b/res/drawable-xhdpi/led_error.png
index 38527f061..153700367 100644
Binary files a/res/drawable-xhdpi/led_error.png and b/res/drawable-xhdpi/led_error.png differ
diff --git a/res/drawable-xhdpi/led_inprogress.png b/res/drawable-xhdpi/led_inprogress.png
index b11bbddac..fa2b8d589 100644
Binary files a/res/drawable-xhdpi/led_inprogress.png and b/res/drawable-xhdpi/led_inprogress.png differ
diff --git a/res/drawable-xhdpi/liste_details_default.png b/res/drawable-xhdpi/liste_details_default.png
new file mode 100644
index 000000000..537b219bb
Binary files /dev/null and b/res/drawable-xhdpi/liste_details_default.png differ
diff --git a/res/drawable-xhdpi/liste_details_over.png b/res/drawable-xhdpi/liste_details_over.png
new file mode 100644
index 000000000..537b219bb
Binary files /dev/null and b/res/drawable-xhdpi/liste_details_over.png differ
diff --git a/res/drawable-xhdpi/logo_orange.png b/res/drawable-xhdpi/logo_orange.png
index f30ec2532..7d782dc38 100644
Binary files a/res/drawable-xhdpi/logo_orange.png and b/res/drawable-xhdpi/logo_orange.png differ
diff --git a/res/drawable-xhdpi/logo_secure_phone_big.png b/res/drawable-xhdpi/logo_secure_phone_big.png
new file mode 100644
index 000000000..143f32c2e
Binary files /dev/null and b/res/drawable-xhdpi/logo_secure_phone_big.png differ
diff --git a/res/drawable-xhdpi/logo_secure_phone_small.png b/res/drawable-xhdpi/logo_secure_phone_small.png
new file mode 100644
index 000000000..9023373ad
Binary files /dev/null and b/res/drawable-xhdpi/logo_secure_phone_small.png differ
diff --git a/res/drawable-xhdpi/logo_topbar.png b/res/drawable-xhdpi/logo_topbar.png
new file mode 100644
index 000000000..d03b182ff
Binary files /dev/null and b/res/drawable-xhdpi/logo_topbar.png differ
diff --git a/res/drawable-xhdpi/menu.png b/res/drawable-xhdpi/menu.png
index 4dfbcf06f..608c2bf31 100644
Binary files a/res/drawable-xhdpi/menu.png and b/res/drawable-xhdpi/menu.png differ
diff --git a/res/drawable-xhdpi/message_lu.png b/res/drawable-xhdpi/message_lu.png
new file mode 100644
index 000000000..52c2d54cd
Binary files /dev/null and b/res/drawable-xhdpi/message_lu.png differ
diff --git a/res/drawable-xhdpi/message_recu.png b/res/drawable-xhdpi/message_recu.png
new file mode 100644
index 000000000..3ce176076
Binary files /dev/null and b/res/drawable-xhdpi/message_recu.png differ
diff --git a/res/drawable-xhdpi/message_undelivered.png b/res/drawable-xhdpi/message_undelivered.png
index 764d90627..98714526e 100644
Binary files a/res/drawable-xhdpi/message_undelivered.png and b/res/drawable-xhdpi/message_undelivered.png differ
diff --git a/res/drawable-xhdpi/micro.png b/res/drawable-xhdpi/micro.png
index 6513847b8..5238a0928 100644
Binary files a/res/drawable-xhdpi/micro.png and b/res/drawable-xhdpi/micro.png differ
diff --git a/res/drawable-xhdpi/next.png b/res/drawable-xhdpi/next.png
index 0b552b5ce..4c9738498 100644
Binary files a/res/drawable-xhdpi/next.png and b/res/drawable-xhdpi/next.png differ
diff --git a/res/drawable-xhdpi/next_over.png b/res/drawable-xhdpi/next_over.png
new file mode 100644
index 000000000..6aa654b7f
Binary files /dev/null and b/res/drawable-xhdpi/next_over.png differ
diff --git a/res/drawable-xhdpi/numpad_0.png b/res/drawable-xhdpi/numpad_0.png
index 149bc063b..9d37c796b 100644
Binary files a/res/drawable-xhdpi/numpad_0.png and b/res/drawable-xhdpi/numpad_0.png differ
diff --git a/res/drawable-xhdpi/numpad_0_over.png b/res/drawable-xhdpi/numpad_0_over.png
index b1e3e2989..8362f0dbe 100644
Binary files a/res/drawable-xhdpi/numpad_0_over.png and b/res/drawable-xhdpi/numpad_0_over.png differ
diff --git a/res/drawable-xhdpi/numpad_1.png b/res/drawable-xhdpi/numpad_1.png
index d2cccb3bd..d24a5f71c 100644
Binary files a/res/drawable-xhdpi/numpad_1.png and b/res/drawable-xhdpi/numpad_1.png differ
diff --git a/res/drawable-xhdpi/numpad_1_over.png b/res/drawable-xhdpi/numpad_1_over.png
index 52b676008..80806b851 100644
Binary files a/res/drawable-xhdpi/numpad_1_over.png and b/res/drawable-xhdpi/numpad_1_over.png differ
diff --git a/res/drawable-xhdpi/numpad_2.png b/res/drawable-xhdpi/numpad_2.png
index d7d4dfaf8..0db7e5205 100644
Binary files a/res/drawable-xhdpi/numpad_2.png and b/res/drawable-xhdpi/numpad_2.png differ
diff --git a/res/drawable-xhdpi/numpad_2_over.png b/res/drawable-xhdpi/numpad_2_over.png
index 44437f218..51ba92d14 100644
Binary files a/res/drawable-xhdpi/numpad_2_over.png and b/res/drawable-xhdpi/numpad_2_over.png differ
diff --git a/res/drawable-xhdpi/numpad_3.png b/res/drawable-xhdpi/numpad_3.png
index 8cbc4aa25..53b3ceed2 100644
Binary files a/res/drawable-xhdpi/numpad_3.png and b/res/drawable-xhdpi/numpad_3.png differ
diff --git a/res/drawable-xhdpi/numpad_3_over.png b/res/drawable-xhdpi/numpad_3_over.png
index c734d3a72..78444d7b7 100644
Binary files a/res/drawable-xhdpi/numpad_3_over.png and b/res/drawable-xhdpi/numpad_3_over.png differ
diff --git a/res/drawable-xhdpi/numpad_4.png b/res/drawable-xhdpi/numpad_4.png
index 44dfb1bfb..6db2d6174 100644
Binary files a/res/drawable-xhdpi/numpad_4.png and b/res/drawable-xhdpi/numpad_4.png differ
diff --git a/res/drawable-xhdpi/numpad_4_over.png b/res/drawable-xhdpi/numpad_4_over.png
index 5be50f0c6..0c46659cb 100644
Binary files a/res/drawable-xhdpi/numpad_4_over.png and b/res/drawable-xhdpi/numpad_4_over.png differ
diff --git a/res/drawable-xhdpi/numpad_5.png b/res/drawable-xhdpi/numpad_5.png
index df7a3d301..b8553cccf 100644
Binary files a/res/drawable-xhdpi/numpad_5.png and b/res/drawable-xhdpi/numpad_5.png differ
diff --git a/res/drawable-xhdpi/numpad_5_over.png b/res/drawable-xhdpi/numpad_5_over.png
index b3ae791e7..1e7d4cc77 100644
Binary files a/res/drawable-xhdpi/numpad_5_over.png and b/res/drawable-xhdpi/numpad_5_over.png differ
diff --git a/res/drawable-xhdpi/numpad_6.png b/res/drawable-xhdpi/numpad_6.png
index 566eebe0a..b26fe91a2 100644
Binary files a/res/drawable-xhdpi/numpad_6.png and b/res/drawable-xhdpi/numpad_6.png differ
diff --git a/res/drawable-xhdpi/numpad_6_over.png b/res/drawable-xhdpi/numpad_6_over.png
index 36e495727..109b3b872 100644
Binary files a/res/drawable-xhdpi/numpad_6_over.png and b/res/drawable-xhdpi/numpad_6_over.png differ
diff --git a/res/drawable-xhdpi/numpad_7.png b/res/drawable-xhdpi/numpad_7.png
index eb789c7f6..e9fe497fe 100644
Binary files a/res/drawable-xhdpi/numpad_7.png and b/res/drawable-xhdpi/numpad_7.png differ
diff --git a/res/drawable-xhdpi/numpad_7_over.png b/res/drawable-xhdpi/numpad_7_over.png
index 116c49995..242fc4c05 100644
Binary files a/res/drawable-xhdpi/numpad_7_over.png and b/res/drawable-xhdpi/numpad_7_over.png differ
diff --git a/res/drawable-xhdpi/numpad_8.png b/res/drawable-xhdpi/numpad_8.png
index 94e52b705..1156c7325 100644
Binary files a/res/drawable-xhdpi/numpad_8.png and b/res/drawable-xhdpi/numpad_8.png differ
diff --git a/res/drawable-xhdpi/numpad_8_over.png b/res/drawable-xhdpi/numpad_8_over.png
index 49c6a5efa..aa5e1bfc9 100644
Binary files a/res/drawable-xhdpi/numpad_8_over.png and b/res/drawable-xhdpi/numpad_8_over.png differ
diff --git a/res/drawable-xhdpi/numpad_9.png b/res/drawable-xhdpi/numpad_9.png
index 6bcf21957..daf88ec29 100644
Binary files a/res/drawable-xhdpi/numpad_9.png and b/res/drawable-xhdpi/numpad_9.png differ
diff --git a/res/drawable-xhdpi/numpad_9_over.png b/res/drawable-xhdpi/numpad_9_over.png
index 487dff463..26e23e75e 100644
Binary files a/res/drawable-xhdpi/numpad_9_over.png and b/res/drawable-xhdpi/numpad_9_over.png differ
diff --git a/res/drawable-xhdpi/numpad_hash.png b/res/drawable-xhdpi/numpad_hash.png
index 38bd59dc6..3b7f3b822 100644
Binary files a/res/drawable-xhdpi/numpad_hash.png and b/res/drawable-xhdpi/numpad_hash.png differ
diff --git a/res/drawable-xhdpi/numpad_hash_over.png b/res/drawable-xhdpi/numpad_hash_over.png
index 127ee4f78..77743dfbe 100644
Binary files a/res/drawable-xhdpi/numpad_hash_over.png and b/res/drawable-xhdpi/numpad_hash_over.png differ
diff --git a/res/drawable-xhdpi/numpad_star.png b/res/drawable-xhdpi/numpad_star.png
index fea08233c..29b84c25f 100644
Binary files a/res/drawable-xhdpi/numpad_star.png and b/res/drawable-xhdpi/numpad_star.png differ
diff --git a/res/drawable-xhdpi/numpad_star_over.png b/res/drawable-xhdpi/numpad_star_over.png
index dd0eba5f3..210661eff 100644
Binary files a/res/drawable-xhdpi/numpad_star_over.png and b/res/drawable-xhdpi/numpad_star_over.png differ
diff --git a/res/drawable-xhdpi/options.png b/res/drawable-xhdpi/options.png
index dceca5d79..ed1cf41a0 100644
Binary files a/res/drawable-xhdpi/options.png and b/res/drawable-xhdpi/options.png differ
diff --git a/res/drawable-xhdpi/options_add_call_default.png b/res/drawable-xhdpi/options_add_call_default.png
new file mode 100644
index 000000000..7dcaf44d0
Binary files /dev/null and b/res/drawable-xhdpi/options_add_call_default.png differ
diff --git a/res/drawable-xhdpi/options_start_conference_disabled.png b/res/drawable-xhdpi/options_start_conference_disabled.png
index 99b347d90..6a1a8108b 100644
Binary files a/res/drawable-xhdpi/options_start_conference_disabled.png and b/res/drawable-xhdpi/options_start_conference_disabled.png differ
diff --git a/res/drawable-xhdpi/options_transfer_call_default.png b/res/drawable-xhdpi/options_transfer_call_default.png
new file mode 100644
index 000000000..89931829b
Binary files /dev/null and b/res/drawable-xhdpi/options_transfer_call_default.png differ
diff --git a/res/drawable-xhdpi/pause_big_default.png b/res/drawable-xhdpi/pause_big_default.png
index 30f18d4d4..52337cb4b 100644
Binary files a/res/drawable-xhdpi/pause_big_default.png and b/res/drawable-xhdpi/pause_big_default.png differ
diff --git a/res/drawable-xhdpi/pause_big_over.png b/res/drawable-xhdpi/pause_big_over.png
index 96fa6b163..8e08a1f82 100644
Binary files a/res/drawable-xhdpi/pause_big_over.png and b/res/drawable-xhdpi/pause_big_over.png differ
diff --git a/res/drawable-xhdpi/pause_small_default.png b/res/drawable-xhdpi/pause_small_default.png
index 7fd5c20eb..7aa736fce 100644
Binary files a/res/drawable-xhdpi/pause_small_default.png and b/res/drawable-xhdpi/pause_small_default.png differ
diff --git a/res/drawable-xhdpi/pause_small_over.png b/res/drawable-xhdpi/pause_small_over.png
index 271ee3dbf..3ca0b0bff 100644
Binary files a/res/drawable-xhdpi/pause_small_over.png and b/res/drawable-xhdpi/pause_small_over.png differ
diff --git a/res/drawable-xhdpi/quit_default.png b/res/drawable-xhdpi/quit_default.png
index b0de6b178..7330cde71 100644
Binary files a/res/drawable-xhdpi/quit_default.png and b/res/drawable-xhdpi/quit_default.png differ
diff --git a/res/drawable-xhdpi/resizable_cancel_button.9.png b/res/drawable-xhdpi/resizable_cancel_button.9.png
deleted file mode 100644
index 8923cf47a..000000000
Binary files a/res/drawable-xhdpi/resizable_cancel_button.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/resizable_cancel_button.png b/res/drawable-xhdpi/resizable_cancel_button.png
new file mode 100644
index 000000000..f5de1ecda
Binary files /dev/null and b/res/drawable-xhdpi/resizable_cancel_button.png differ
diff --git a/res/drawable-xhdpi/resizable_cancel_button_over.png b/res/drawable-xhdpi/resizable_cancel_button_over.png
new file mode 100644
index 000000000..bc4c2799e
Binary files /dev/null and b/res/drawable-xhdpi/resizable_cancel_button_over.png differ
diff --git a/res/drawable-xhdpi/resizable_chat_bubble_incoming.9.png b/res/drawable-xhdpi/resizable_chat_bubble_incoming.9.png
deleted file mode 100644
index 9c200e4d4..000000000
Binary files a/res/drawable-xhdpi/resizable_chat_bubble_incoming.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/resizable_chat_bubble_incoming.png b/res/drawable-xhdpi/resizable_chat_bubble_incoming.png
new file mode 100644
index 000000000..78541ab00
Binary files /dev/null and b/res/drawable-xhdpi/resizable_chat_bubble_incoming.png differ
diff --git a/res/drawable-xhdpi/resizable_chat_bubble_outgoing.9.png b/res/drawable-xhdpi/resizable_chat_bubble_outgoing.9.png
deleted file mode 100644
index cca504a1d..000000000
Binary files a/res/drawable-xhdpi/resizable_chat_bubble_outgoing.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/resizable_chat_bubble_outgoing.png b/res/drawable-xhdpi/resizable_chat_bubble_outgoing.png
new file mode 100644
index 000000000..39ab2c039
Binary files /dev/null and b/res/drawable-xhdpi/resizable_chat_bubble_outgoing.png differ
diff --git a/res/drawable-xhdpi/resizable_confirm_delete_button.9.png b/res/drawable-xhdpi/resizable_confirm_delete_button.9.png
deleted file mode 100644
index 509a20e49..000000000
Binary files a/res/drawable-xhdpi/resizable_confirm_delete_button.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/resizable_confirm_delete_button.png b/res/drawable-xhdpi/resizable_confirm_delete_button.png
new file mode 100644
index 000000000..8e62d4db1
Binary files /dev/null and b/res/drawable-xhdpi/resizable_confirm_delete_button.png differ
diff --git a/res/drawable-xhdpi/resizable_confirm_delete_button_over.png b/res/drawable-xhdpi/resizable_confirm_delete_button_over.png
new file mode 100644
index 000000000..cb4fd206a
Binary files /dev/null and b/res/drawable-xhdpi/resizable_confirm_delete_button_over.png differ
diff --git a/res/drawable-xhdpi/resizable_textfield.9.png b/res/drawable-xhdpi/resizable_textfield.9.png
deleted file mode 100644
index 51ad75cf4..000000000
Binary files a/res/drawable-xhdpi/resizable_textfield.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/resizable_textfield.png b/res/drawable-xhdpi/resizable_textfield.png
new file mode 100644
index 000000000..12158a3a4
Binary files /dev/null and b/res/drawable-xhdpi/resizable_textfield.png differ
diff --git a/res/drawable-xhdpi/resizable_textfield_error.9.png b/res/drawable-xhdpi/resizable_textfield_error.9.png
deleted file mode 100644
index 3b6fe1140..000000000
Binary files a/res/drawable-xhdpi/resizable_textfield_error.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/resizable_textfield_error.png b/res/drawable-xhdpi/resizable_textfield_error.png
new file mode 100644
index 000000000..5fceee99a
Binary files /dev/null and b/res/drawable-xhdpi/resizable_textfield_error.png differ
diff --git a/res/drawable-xhdpi/route_bluetooth.png b/res/drawable-xhdpi/route_bluetooth.png
index f92c65060..55f8e3803 100644
Binary files a/res/drawable-xhdpi/route_bluetooth.png and b/res/drawable-xhdpi/route_bluetooth.png differ
diff --git a/res/drawable-xhdpi/route_earpiece_default.png b/res/drawable-xhdpi/route_earpiece_default.png
new file mode 100644
index 000000000..9c15af242
Binary files /dev/null and b/res/drawable-xhdpi/route_earpiece_default.png differ
diff --git a/res/drawable-xhdpi/route_speaker_default.png b/res/drawable-xhdpi/route_speaker_default.png
new file mode 100644
index 000000000..23d5df3da
Binary files /dev/null and b/res/drawable-xhdpi/route_speaker_default.png differ
diff --git a/res/drawable-xhdpi/routes.png b/res/drawable-xhdpi/routes.png
index 1136d6cc3..3a94480d5 100644
Binary files a/res/drawable-xhdpi/routes.png and b/res/drawable-xhdpi/routes.png differ
diff --git a/res/drawable-xhdpi/security_0.png b/res/drawable-xhdpi/security_0.png
new file mode 100644
index 000000000..08524f3fe
Binary files /dev/null and b/res/drawable-xhdpi/security_0.png differ
diff --git a/res/drawable-xhdpi/security_1.png b/res/drawable-xhdpi/security_1.png
new file mode 100644
index 000000000..9a3272c86
Binary files /dev/null and b/res/drawable-xhdpi/security_1.png differ
diff --git a/res/drawable-xhdpi/security_2.png b/res/drawable-xhdpi/security_2.png
new file mode 100644
index 000000000..26e4e50ae
Binary files /dev/null and b/res/drawable-xhdpi/security_2.png differ
diff --git a/res/drawable-xhdpi/security_button1_default.png b/res/drawable-xhdpi/security_button1_default.png
new file mode 100644
index 000000000..d59f37410
Binary files /dev/null and b/res/drawable-xhdpi/security_button1_default.png differ
diff --git a/res/drawable-xhdpi/security_button1_over.png b/res/drawable-xhdpi/security_button1_over.png
new file mode 100644
index 000000000..21ba2fc96
Binary files /dev/null and b/res/drawable-xhdpi/security_button1_over.png differ
diff --git a/res/drawable-xhdpi/security_button2_over.png b/res/drawable-xhdpi/security_button2_over.png
new file mode 100644
index 000000000..ff5554c37
Binary files /dev/null and b/res/drawable-xhdpi/security_button2_over.png differ
diff --git a/res/drawable-xhdpi/security_button_default.png b/res/drawable-xhdpi/security_button_default.png
new file mode 100644
index 000000000..9843b6d39
Binary files /dev/null and b/res/drawable-xhdpi/security_button_default.png differ
diff --git a/res/drawable-xhdpi/select_all.png b/res/drawable-xhdpi/select_all.png
index eb6b57422..e1c09b1ca 100644
Binary files a/res/drawable-xhdpi/select_all.png and b/res/drawable-xhdpi/select_all.png differ
diff --git a/res/drawable-xhdpi/select_all_over.png b/res/drawable-xhdpi/select_all_over.png
index 4d389a566..61f3ae04e 100644
Binary files a/res/drawable-xhdpi/select_all_over.png and b/res/drawable-xhdpi/select_all_over.png differ
diff --git a/res/drawable-xhdpi/speaker.png b/res/drawable-xhdpi/speaker.png
index 302e05a79..1cea6001b 100644
Binary files a/res/drawable-xhdpi/speaker.png and b/res/drawable-xhdpi/speaker.png differ
diff --git a/res/drawable-xhdpi/spinner.png b/res/drawable-xhdpi/spinner.png
new file mode 100644
index 000000000..de447f248
Binary files /dev/null and b/res/drawable-xhdpi/spinner.png differ
diff --git a/res/drawable-xhdpi/topbar_call_notification.png b/res/drawable-xhdpi/topbar_call_notification.png
index 5eee49bd1..e13a71f0d 100644
Binary files a/res/drawable-xhdpi/topbar_call_notification.png and b/res/drawable-xhdpi/topbar_call_notification.png differ
diff --git a/res/drawable-xhdpi/topbar_chat_notification.png b/res/drawable-xhdpi/topbar_chat_notification.png
index 375ed4281..7d8742777 100644
Binary files a/res/drawable-xhdpi/topbar_chat_notification.png and b/res/drawable-xhdpi/topbar_chat_notification.png differ
diff --git a/res/drawable-xhdpi/topbar_videocall_notification.png b/res/drawable-xhdpi/topbar_videocall_notification.png
index 7607432e9..2ad4498ac 100644
Binary files a/res/drawable-xhdpi/topbar_videocall_notification.png and b/res/drawable-xhdpi/topbar_videocall_notification.png differ
diff --git a/res/drawable-xhdpi/valid.png b/res/drawable-xhdpi/valid.png
index 52bc36535..c786f68de 100644
Binary files a/res/drawable-xhdpi/valid.png and b/res/drawable-xhdpi/valid.png differ
diff --git a/res/drawable-xhdpi/valid_over.png b/res/drawable-xhdpi/valid_over.png
new file mode 100644
index 000000000..7c0122277
Binary files /dev/null and b/res/drawable-xhdpi/valid_over.png differ
diff --git a/res/drawable-xhdpi/waiting_time.png b/res/drawable-xhdpi/waiting_time.png
index 55aaf4fd5..4a2a242ad 100644
Binary files a/res/drawable-xhdpi/waiting_time.png and b/res/drawable-xhdpi/waiting_time.png differ
diff --git a/res/drawable/call.xml b/res/drawable/call.xml
index 7564861e6..9e30778e1 100644
--- a/res/drawable/call.xml
+++ b/res/drawable/call.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" 
+    <item android:state_pressed="true"
         android:drawable="@color/colorL" />
 	<item android:state_enabled="false"
 		  android:drawable="@color/colorL" />
     <item
-         android:drawable="@color/colorA" />
+        android:drawable="@color/colorH"/>
 </selector>
 
diff --git a/res/drawable/footer_button.xml b/res/drawable/footer_button.xml
index 9baeba680..0f72a1153 100644
--- a/res/drawable/footer_button.xml
+++ b/res/drawable/footer_button.xml
@@ -2,9 +2,9 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:drawable="@color/colorA"
 		  android:state_pressed="true"/>
-	<item android:drawable="@color/colorF"
+	<item android:drawable="@color/colorN"
 		  android:state_selected="true"/>
 
 	<item
-		android:drawable="@color/colorF"/>
+		android:drawable="@color/colorN"/>
 </selector>
diff --git a/res/drawable/list_selector.xml b/res/drawable/list_selector.xml
index 5862e219b..799039e55 100644
--- a/res/drawable/list_selector.xml
+++ b/res/drawable/list_selector.xml
@@ -4,5 +4,5 @@
         android:drawable="@color/colorG"
         android:state_pressed="true"/>
     <item
-        android:drawable="@color/colorG"/>
+        android:drawable="@color/colorH"/>
 </selector>
\ No newline at end of file
diff --git a/res/drawable/numpad_eight.xml b/res/drawable/numpad_eight.xml
index 0bc160196..cc0dcfcd0 100644
--- a/res/drawable/numpad_eight.xml
+++ b/res/drawable/numpad_eight.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/numpad_8_over" />
+    <item android:drawable="@drawable/numpad_8_over"
+          android:state_pressed="true"/>
     <item
          android:drawable="@drawable/numpad_8" />
 </selector>
diff --git a/res/drawable/toolbar_button.xml b/res/drawable/toolbar_button.xml
index b498d407d..3271bb50d 100644
--- a/res/drawable/toolbar_button.xml
+++ b/res/drawable/toolbar_button.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:drawable="@color/colorG"
+	<item android:drawable="@color/colorH"
 		  android:state_pressed="true"/>
-	<item android:drawable="@color/colorG"
+	<item android:drawable="@color/colorH"
 		  android:state_selected="true"/>
 	<item
-		android:drawable="@color/colorG"/>
+		android:drawable="@color/colorH"/>
 </selector>
\ No newline at end of file
diff --git a/res/layout/about.xml b/res/layout/about.xml
index 372c819d0..e02985c07 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:background="@color/colorG"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
+              android:background="@color/colorB"
               android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/top_bar"
         android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:background="@color/colorF"
+        android:layout_height="50dp"
+        android:background="@color/colorB"
         android:orientation="horizontal">
 
         <View
@@ -19,14 +19,16 @@
 
         <TextView
             android:id="@+id/menu_name"
-            style="@style/font22"
             android:layout_width="0dp"
             android:layout_height="match_parent"
+            android:layout_gravity="center"
             android:layout_weight="0.4"
             android:gravity="center"
+            android:lineSpacingExtra="13.3sp"
             android:maxLines="1"
             android:text="@string/about"
-            android:textAllCaps="true"/>
+            android:textColor="#ffffff"
+            android:textSize="20sp"/>
 
         <ImageView
             android:id="@+id/cancel"
@@ -34,69 +36,74 @@
             android:layout_height="match_parent"
             android:layout_weight="0.2"
             android:contentDescription="@string/content_description_edit"
-            android:padding="15dp"
-            android:src="@drawable/footer_dialer"/>
+            android:padding="10dp"
+            android:src="@drawable/footer_contacts"/>
     </LinearLayout>
 
     <LinearLayout
-        android:background="@color/colorE"
-        android:orientation="vertical"
-        android:padding="10dp"
-        android:gravity="center"
-        android:layout_weight="1"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_gravity="center">
+        android:layout_gravity="center"
+        android:layout_weight="1"
+        android:background="@color/colorB"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="10dp">
 
         <ImageView
-            android:src="@drawable/linphone_logo"
-            android:layout_width="wrap_content"
-            android:layout_height="80dp"
-            android:layout_gravity="center"/>
+            android:layout_width="183.3dp"
+            android:layout_height="183.3dp"
+            android:layout_gravity="center"
+            android:paddingBottom="10dp"
+            android:paddingTop="30dp"
+            android:src="@drawable/logo_secure_phone_big"/>
 
         <TextView
-            style="@style/font22"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lineSpacingExtra="6.7sp"
+            android:paddingBottom="10dp"
+            android:text="@string/app_name"
+            android:textColor="#ffffff"
+            android:textSize="20sp"/>
+
+        <TextView
+            style="@style/font2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginTop="10dp"
-            android:text="@string/app_name"/>
-
-        <TextView
             android:text="@string/app_description"
-            style="@style/font2"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"/>
+            android:visibility="gone"/>
 
         <TextView
             android:id="@+id/about_android_version"
-            style="@style/font15"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:paddingTop="20dp"
+            android:textSize="11.7sp"
+            android:textColor="#ffffff"
+            android:lineSpacingExtra="5sp"
+            android:gravity="center_horizontal"
             android:text="@string/about_version"/>
 
         <TextView
             android:id="@+id/about_liblinphone_version"
-            style="@style/font15"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
+            android:textSize="11.7sp"
+            android:textColor="#ffffff"
+            android:lineSpacingExtra="5sp"
+            android:gravity="center_horizontal"
             android:text="@string/about_liblinphone_version"/>
 
     </LinearLayout>
 
     <ImageView
-        android:src="@drawable/logo_orange"
         android:layout_width="60dp"
         android:layout_height="60dp"
-        android:layout_margin="30dp"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true" android:layout_gravity="right"/>
+        android:layout_alignParentRight="true"
+        android:layout_gravity="right"
+        android:layout_margin="30dp"
+        android:src="@drawable/logo_orange"/>
 
 </LinearLayout>
diff --git a/res/layout/call.xml b/res/layout/call.xml
index e88dc6bb2..f5d22e687 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -43,56 +43,51 @@
 					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"
+					<ImageView
+						android:id="@+id/pause"
+						android:layout_width="80dp"
+						android:layout_height="50dp"
+						android:layout_alignParentRight="true"
+						android:contentDescription="@string/content_description_pause"
+						android:paddingRight="20dp"
+						android:src="@drawable/pause_big_default"/>
+
+					<ImageView
+						android:id="@+id/switchCamera"
+						android:src="@drawable/switch_camera"
+						android:layout_width="80dp"
 						android:layout_height="80dp"
-						android:layout_centerHorizontal="true"
-						android:orientation="vertical">
-
-						<TextView
-							android:id="@+id/current_contact_name"
-							style="@style/font5"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:paddingTop="5dp"
-							android:gravity="center"
-							android:layout_gravity="center"/>
-
-						<Chronometer
-							android:id="@+id/current_call_timer"
-							style="@style/font2"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_gravity="center"/>
-					</LinearLayout>
+						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
 						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:layout_below="@id/pause"
 						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"/>
+							android:adjustViewBounds="true"
+							android:contentDescription="@string/content_description_contact_picture"
+							android:src="@drawable/avatar_big_secure1"/>
 
 						<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"/>
+							android:adjustViewBounds="true"
+							android:contentDescription="@string/content_description_contact_picture"
+							android:src="@drawable/avatar_mask_border"
+							android:visibility="gone"/>
 
 					</RelativeLayout>
 
@@ -121,26 +116,32 @@
 
 					</LinearLayout>
 
-					<ImageView
-						android:id="@+id/pause"
-						android:src="@drawable/pause_big_default"
-						android:contentDescription="@string/content_description_pause"
-						android:layout_width="80dp"
+					<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:padding="10dp"
-						android:layout_below="@+id/active_call_info"
-						android:layout_alignParentRight="true"/>
+						android:layout_below="@id/avatar_layout"
+						android:layout_centerHorizontal="true"
+						android:orientation="vertical">
 
-					<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"/>
+						<TextView
+							android:id="@+id/current_contact_name"
+							style="@style/font5"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:paddingTop="5dp"
+							android:gravity="center"
+							android:layout_gravity="center"/>
+
+						<Chronometer
+							android:id="@+id/current_call_timer"
+							style="@style/font2"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_gravity="center"/>
+					</LinearLayout>
 				</RelativeLayout>
 
 				<LinearLayout
@@ -187,9 +188,9 @@
 				android:orientation="vertical">
 
 				<LinearLayout
-					android:background="@color/colorF"
 					android:layout_width="match_parent"
 					android:layout_height="60dp"
+					android:background=" #595959 "
 					android:orientation="horizontal">
 
 					<RelativeLayout
@@ -199,118 +200,112 @@
 
 						<ImageView
 							android:id="@+id/video"
-							android:src="@drawable/camera_button"
-							android:background="@drawable/button_background"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
 							android:contentDescription="@string/content_description_switch_video"
 							android:padding="20dp"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"/>
+							android:src="@drawable/camera_button"/>
 
 						<ProgressBar
 							android:id="@+id/video_in_progress"
 							style="?android:attr/progressBarStyle"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
 							android:layout_centerHorizontal="true"
 							android:layout_centerVertical="true"
-							android:visibility="gone"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"/>
+							android:visibility="gone"/>
 
 					</RelativeLayout>
 
 					<ImageView
 						android:id="@+id/micro"
-						android:src="@drawable/micro_default"
-						android:background="@drawable/button_background"
-						android:contentDescription="@string/content_description_toggle_micro"
-						android:padding="10dp"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_weight="1" />
+						android:layout_weight="1"
+						android:contentDescription="@string/content_description_toggle_micro"
+						android:padding="10dp"
+						android:src="@drawable/micro_default"/>
 
 					<ImageView
 						android:id="@+id/speaker"
-						android:src="@drawable/speaker_default"
-						android:background="@drawable/button_background"
-						android:contentDescription="@string/content_description_toggle_speaker"
-						android:padding="15dp"
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
-						android:layout_weight="1" />
+						android:layout_weight="1"
+						android:contentDescription="@string/content_description_toggle_speaker"
+						android:padding="15dp"
+						android:src="@drawable/speaker_default"/>
 
 					<ImageView
 						android:id="@+id/audio_route"
-						android:src="@drawable/routes_default"
-						android:background="@drawable/button_background"
-						android:contentDescription="@string/content_description_audio_route"
-						android:visibility="gone"
-						android:padding="15dp"
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
-						android:layout_weight="1" />
+						android:layout_weight="1"
+						android:contentDescription="@string/content_description_audio_route"
+						android:padding="15dp"
+						android:src="@drawable/routes_default"
+						android:visibility="gone"/>
 
 					<ImageView
 						android:id="@+id/options"
-						android:src="@drawable/options_default"
-						android:background="@drawable/button_background"
-						android:contentDescription="@string/content_description_call_options"
-						android:padding="15dp"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_weight="1" />
+						android:layout_weight="1"
+						android:contentDescription="@string/content_description_call_options"
+						android:padding="15dp"
+						android:src="@drawable/options_default"/>
 				</LinearLayout>
 
 				<LinearLayout
 					android:id="@+id/main_bar"
 					android:layout_width="match_parent"
-					android:layout_height="60dp"
+					android:layout_height="50dp"
 					android:layout_alignParentBottom="true"
 					android:layout_gravity="center"
-					android:orientation="horizontal" >
+					android:orientation="horizontal">
 
 					<ImageView
 						android:id="@+id/dialer"
-						android:src="@drawable/footer_dialer"
-						android:background="@color/colorC"
-						android:contentDescription="@string/content_description_numpad"
 						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
+						android:layout_height="match_parent"
 						android:layout_weight="0.8"
-						android:padding="15dp" />
+						android:background="@color/colorB"
+						android:contentDescription="@string/content_description_numpad"
+						android:padding="10dp"
+						android:src="@drawable/footer_dialer"/>
 
 					<ImageView
 						android:id="@+id/hang_up"
-						android:src="@drawable/call_hangup"
-						android:background="@drawable/hangup"
-						android:contentDescription="@string/content_description_hang_up"
-						android:layout_gravity="center"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
+						android:layout_gravity="center"
 						android:layout_weight="0.4"
-						android:padding="12dp"/>
+						android:background="@color/colorB"
+						android:contentDescription="@string/content_description_hang_up"
+						android:src="@drawable/call_hangup"/>
 
 					<RelativeLayout
-						android:background="@drawable/footer_button"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_weight="0.8">
+						android:layout_weight="0.8"
+						android:background="@drawable/footer_button">
 
 						<ImageView
 							android:id="@+id/chat"
-							android:src="@drawable/footer_chat"
-							android:background="@color/colorC"
-							android:contentDescription="@string/content_description_chat_button"
 							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:padding="15dp"
-							android:layout_centerInParent="true"/>
+							android:layout_height="match_parent"
+							android:layout_centerInParent="true"
+							android:background="@color/colorB"
+							android:contentDescription="@string/content_description_chat_button"
+							android:padding="10dp"
+							android:src="@drawable/footer_chat"/>
 
 						<TextView
 							android:id="@+id/missed_chats"
-							android:background="@drawable/history_chat_indicator"
 							style="@style/font18"
 							android:layout_width="20dp"
 							android:layout_height="20dp"
 							android:layout_margin="15dp"
+							android:background="@drawable/history_chat_indicator"
 							android:gravity="center"
 							android:visibility="gone"/>
 					</RelativeLayout>
@@ -479,7 +474,7 @@
 		android:id="@+id/status"
 		android:name="org.linphone.fragments.StatusFragment"
 		android:layout_width="match_parent"
-		android:layout_height="40dp"
-		tools:layout="@layout/status" />
+		android:layout_height="30dp"
+		tools:layout="@layout/status"/>
 
 </RelativeLayout>
diff --git a/res/layout/call_incoming.xml b/res/layout/call_incoming.xml
index 4fec8bc8e..7544cd73b 100644
--- a/res/layout/call_incoming.xml
+++ b/res/layout/call_incoming.xml
@@ -10,8 +10,8 @@
 		android:id="@+id/status"
 		android:name="org.linphone.fragments.StatusFragment"
 		android:layout_width="match_parent"
-		android:layout_height="40dp"
-		tools:layout="@layout/status" />
+		android:layout_height="30dp"
+		tools:layout="@layout/status"/>
 
 	<RelativeLayout
 		android:id="@+id/top_bar"
@@ -87,91 +87,91 @@
 	<LinearLayout
 		android:id="@+id/menu"
 		android:layout_width="match_parent"
-		android:layout_height="60dp"
+		android:layout_height="50dp"
 		android:layout_alignParentBottom="true"
-		android:orientation="horizontal" >
+		android:orientation="horizontal">
 
 		<ImageView
 			android:id="@+id/decline"
-			android:src="@drawable/call_hangup"
-			android:background="@drawable/hangup"
-			android:contentDescription="@string/content_description_decline"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:padding="12dp"/>
+			android:background="@drawable/hangup"
+			android:contentDescription="@string/content_description_decline"
+			android:padding="12dp"
+			android:src="@drawable/call_hangup"/>
 
 		<LinearLayout
 			android:id="@+id/acceptUnlock"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:visibility="gone"
-			android:orientation="horizontal"
+			android:layout_gravity="bottom"
 			android:background="@color/colorA"
+			android:orientation="horizontal"
+			android:paddingBottom="15dp"
 			android:paddingLeft="15dp"
 			android:paddingTop="15dp"
-			android:paddingBottom="15dp"
-			android:layout_gravity="bottom">
+			android:visibility="gone">
 
 			<ImageView
-				android:src="@drawable/arrow_accept"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
-
-			<ImageView
-				android:src="@drawable/arrow_accept"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:alpha="0.6"/>
+				android:src="@drawable/arrow_accept"/>
+
+			<ImageView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:alpha="0.6"
+				android:src="@drawable/arrow_accept"/>
 
 			<ImageView
 				android:id="@+id/acceptArrow"
-				android:src="@drawable/arrow_accept"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:alpha="0.2"/>
+				android:alpha="0.2"
+				android:src="@drawable/arrow_accept"/>
 		</LinearLayout>
 
 		<ImageView
 			android:id="@+id/accept"
-			android:src="@drawable/call_audio_start"
-			android:background="@drawable/call"
-			android:contentDescription="@string/content_description_accept"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:padding="12dp"/>
+			android:background="@drawable/call"
+			android:contentDescription="@string/content_description_accept"
+			android:padding="12dp"
+			android:src="@drawable/call_audio_start"/>
 
 		<LinearLayout
 			android:id="@+id/declineUnlock"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:visibility="gone"
-			android:orientation="horizontal"
+			android:layout_gravity="bottom"
 			android:background="@color/colorD"
+			android:orientation="horizontal"
+			android:paddingBottom="15dp"
 			android:paddingLeft="15dp"
 			android:paddingTop="15dp"
-			android:paddingBottom="15dp"
-			android:layout_gravity="bottom">
+			android:visibility="gone">
 
 			<ImageView
 				android:id="@+id/arrow_hangup"
-				android:src="@drawable/arrow_hangup"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:alpha="0.2"/>
+				android:alpha="0.2"
+				android:src="@drawable/arrow_hangup"/>
 
 
 			<ImageView
-				android:src="@drawable/arrow_hangup"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:alpha="0.6"/>
+				android:alpha="0.6"
+				android:src="@drawable/arrow_hangup"/>
 
 			<ImageView
-				android:src="@drawable/arrow_hangup"
 				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
+				android:layout_height="wrap_content"
+				android:src="@drawable/arrow_hangup"/>
 
 		</LinearLayout>
 	</LinearLayout>
diff --git a/res/layout/call_outgoing.xml b/res/layout/call_outgoing.xml
index 654d88384..d2a7e52ea 100644
--- a/res/layout/call_outgoing.xml
+++ b/res/layout/call_outgoing.xml
@@ -9,9 +9,9 @@
 	<fragment
 		android:id="@+id/status"
 		android:name="org.linphone.fragments.StatusFragment"
-		tools:layout="@layout/status"
 		android:layout_width="match_parent"
-		android:layout_height="40dp"/>
+		android:layout_height="30dp"
+		tools:layout="@layout/status"/>
 
 	<RelativeLayout
 		android:id="@+id/top_bar"
@@ -95,40 +95,40 @@
 	<LinearLayout
 		android:id="@+id/menu"
 		android:layout_width="match_parent"
-		android:layout_height="60dp"
+		android:layout_height="50dp"
 		android:layout_alignParentBottom="true"
 		android:layout_alignParentLeft="true"
-		android:orientation="horizontal" >
+		android:orientation="horizontal">
 
 		<ImageView
 			android:id="@+id/micro"
-			android:src="@drawable/micro_default"
-			android:background="@drawable/button_background"
-			android:contentDescription="@string/content_description_toggle_micro"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:padding="10dp"/>
+			android:background="@drawable/button_background"
+			android:contentDescription="@string/content_description_toggle_micro"
+			android:padding="10dp"
+			android:src="@drawable/micro_default"/>
 
 		<ImageView
 			android:id="@+id/speaker"
-			android:src="@drawable/speaker_default"
-			android:background="@drawable/button_background"
-			android:contentDescription="@string/content_description_toggle_speaker"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:padding="15dp"/>
+			android:background="@drawable/button_background"
+			android:contentDescription="@string/content_description_toggle_speaker"
+			android:padding="15dp"
+			android:src="@drawable/speaker_default"/>
 
 		<ImageView
 			android:id="@+id/outgoing_hang_up"
-			android:src="@drawable/call_hangup"
-			android:background="@drawable/hangup"
-			android:contentDescription="@string/content_description_hang_up"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="0.7"
-			android:padding="12dp"/>
+			android:background="@drawable/hangup"
+			android:contentDescription="@string/content_description_hang_up"
+			android:padding="12dp"
+			android:src="@drawable/call_hangup"/>
 
 	</LinearLayout>
 
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index c5821fc9f..092e640fb 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -2,9 +2,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
-				android:background="@color/colorG">
+				android:background="@color/colorH">
 
-    <RelativeLayout
+	<RelativeLayout
 		android:id="@+id/top"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
@@ -12,19 +12,18 @@
 		<LinearLayout
 			android:id="@+id/top_bar"
 			android:layout_width="match_parent"
-			android:layout_height="60dp"
-			android:background="@color/colorG"
+			android:layout_height="50dp"
+			android:background="@color/colorH"
 			android:orientation="horizontal">
 
-            <ImageView
-                android:id="@+id/back"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
-                android:contentDescription="@string/content_description_back"
-                android:padding="18dp"
-                android:src="@drawable/back"/>
+			<ImageView
+				android:id="@+id/back"
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_weight="0.2"
+				android:background="@drawable/toolbar_button"
+				android:contentDescription="@string/content_description_back"
+				android:src="@drawable/back"/>
 
 			<LinearLayout
 				android:layout_width="0dp"
@@ -51,6 +50,14 @@
 					android:maxLines="1"
 					android:textColor="@color/colorC"/>
 
+				<TextView
+					android:id="@+id/remote_composing"
+					style="@style/font11"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_above="@id/footer"
+					android:text="@string/remote_composing"/>
+
 			</LinearLayout>
 
 			<ImageView
@@ -60,7 +67,6 @@
 				android:layout_weight="0.2"
 				android:background="@drawable/toolbar_button"
 				android:contentDescription="@string/content_description_call"
-				android:padding="15dp"
 				android:src="@drawable/call_alt_start"/>
 
 			<ImageView
@@ -70,7 +76,7 @@
 				android:layout_weight="0.2"
 				android:background="@drawable/toolbar_button"
 				android:contentDescription="@string/content_description_conversation_infos"
-				android:padding="15dp"
+				android:padding="10dp"
 				android:src="@drawable/chat_room_group_infos"/>
 
 			<ImageView
@@ -91,23 +97,22 @@
 				android:layout_weight="0.2"
 				android:background="@drawable/toolbar_button"
 				android:contentDescription="@string/content_description_edit_list"
-				android:padding="15dp"
-				android:src="@drawable/edit_list_button"/>
+				android:src="@drawable/delete"/>
 		</LinearLayout>
 
 		<include layout="@layout/edit_list"/>
 
-    </RelativeLayout>
+	</RelativeLayout>
 
 	<LinearLayout
 		android:id="@+id/footer"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_height="50dp"
 		android:layout_alignParentBottom="true"
-		android:background="@color/colorC"
+		android:background="#595959"
 		android:orientation="vertical">
 
-        <HorizontalScrollView
+		<HorizontalScrollView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:orientation="horizontal">
@@ -134,7 +139,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:contentDescription="@string/content_description_send_file"
-				android:padding="5dp"
+				android:padding="10dp"
 				android:src="@drawable/chat_send_file"/>
 
 			<EditText
@@ -144,13 +149,13 @@
 				android:layout_gravity="center_vertical"
 				android:layout_margin="5dp"
 				android:layout_weight="1"
-				android:background="@drawable/resizable_textfield"
+				android:background="@color/colorH"
 				android:contentDescription="@string/content_description_message"
 				android:imeOptions="flagNoExtractUi"
 				android:inputType="textShortMessage|textMultiLine|textAutoComplete|textAutoCorrect|textCapSentences"
 				android:maxLines="6"
 				android:padding="5dp"
-				android:textColor="@color/colorF"
+				android:textColor="@color/colorH"
 				android:textCursorDrawable="@null"/>
 
 			<ImageView
@@ -158,33 +163,25 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:contentDescription="@string/content_description_send_message"
-				android:padding="5dp"
+				android:padding="10dp"
 				android:src="@drawable/chat_send_message"/>
 
 		</LinearLayout>
 
 	</LinearLayout>
 
-	<TextView
-		android:id="@+id/remote_composing"
-		style="@style/font11"
+	<View
+		android:id="@+id/view"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_above="@id/footer"
-		android:text="@string/remote_composing"/>
-
-    <View
-        android:id="@+id/view"
-        android:layout_width="match_parent"
-        android:layout_below="@+id/top"
-        android:layout_height="1dp"
-        android:background="@color/colorE"/>
+		android:layout_height="1dp"
+		android:layout_below="@+id/top"
+		android:background="@color/colorE"/>
 
 	<ListView
 		android:id="@+id/chat_message_list"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-        android:layout_above="@id/remote_composing"
+		android:layout_above="@id/footer"
 		android:layout_below="@+id/view"
 		android:layout_margin="10dp"
 		android:cacheColorHint="@color/transparent"
diff --git a/res/layout/chat_bubble.xml b/res/layout/chat_bubble.xml
index 4b33a52be..383a87a7a 100644
--- a/res/layout/chat_bubble.xml
+++ b/res/layout/chat_bubble.xml
@@ -57,30 +57,31 @@
 
 	<RelativeLayout
 		android:id="@+id/bubble"
-		android:layout_width="wrap_content"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/delete_message">
+		android:layout_toLeftOf="@id/delete_message">
 
 		<LinearLayout
-		    android:id="@+id/background"
-			android:layout_width="wrap_content"
+			android:id="@+id/background"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:orientation="horizontal">
 
-		    <RelativeLayout
+			<RelativeLayout
 				android:id="@+id/avatar_layout"
 				android:layout_width="wrap_content"
-				android:layout_height="wrap_content">
+				android:layout_height="wrap_content"
+				android:visibility="gone">
 
 				<ImageView
 					android:id="@+id/contact_picture"
-					android:src="@drawable/avatar"
+					android:layout_width="45dp"
+					android:layout_height="45dp"
+					android:adjustViewBounds="true"
 					android:contentDescription="@string/content_description_contact_picture"
 					android:paddingLeft="10dp"
 					android:paddingTop="10dp"
-					android:layout_width="45dp"
-					android:layout_height="45dp"
-					android:adjustViewBounds="true"/>
+					android:src="@drawable/avatar"/>
 
 				<ImageView
 					android:id="@+id/mask"
@@ -95,111 +96,134 @@
 			</RelativeLayout>
 
 			<LinearLayout
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:orientation="vertical"
-				android:paddingTop="10dp"
 				android:paddingLeft="10dp"
-				android:paddingRight="10dp">
+				android:paddingRight="10dp"
+				android:paddingTop="10dp">
 
 				<TextView
 					android:id="@+id/contact_header"
-					android:maxLines="1"
 					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"/>
+					android:layout_height="wrap_content"
+					android:maxLines="1"
+					android:textColor="#595959"
+					android:textSize="13.3sp"
+					android:textStyle="bold"/>
 
 				<RelativeLayout
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content">
 
-                    <TextView
-                        android:id="@+id/file_name"
-                        style="@style/font26"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
+					<TextView
+						android:id="@+id/file_name"
+						style="@style/font26"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"/>
 
-                    <ImageView
-                        android:id="@+id/image"
-                        android:layout_width="150dp"
-                        android:layout_height="150dp"
-                        android:layout_below="@id/file_name"
-                        android:layout_centerHorizontal="true"
-                        android:scaleType="centerInside"/>
+					<ImageView
+						android:id="@+id/image"
+						android:layout_width="150dp"
+						android:layout_height="150dp"
+						android:layout_below="@id/file_name"
+						android:layout_centerHorizontal="true"
+						android:scaleType="centerInside"/>
 
-                    <Button
-                        android:id="@+id/open_file"
-                        android:textAppearance="@style/font8"
-                        android:text="@string/open"
-                        android:background="@drawable/resizable_assistant_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/file_name"
-                        android:layout_centerVertical="true"
-                        android:visibility="gone"/>
+					<Button
+						android:id="@+id/open_file"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_below="@id/file_name"
+						android:layout_centerVertical="true"
+						android:background="@drawable/resizable_assistant_button"
+						android:text="@string/open"
+						android:textAppearance="@style/font8"
+						android:visibility="gone"/>
 
 				</RelativeLayout>
 
-                <TextView
-                    android:id="@+id/message"
-                    style="@style/font11"
-                    android:autoLink="web"
-                    android:linksClickable="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+				<TextView
+					android:id="@+id/message"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:autoLink="web"
+					android:linksClickable="true"
+					android:textColor="#595959"
+					android:textSize="13.3sp"/>
 
 				<RelativeLayout
 					android:id="@+id/file_transfer_layout"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-                    android:visibility="gone">
+					android:visibility="gone">
 
 					<ProgressBar
 						android:id="@+id/progress_bar"
 						style="@android:style/Widget.ProgressBar.Horizontal"
-						android:paddingRight="5dp"
-						android:layout_marginTop="10dp"
-						android:layout_marginBottom="10dp"
 						android:layout_width="150dp"
-						android:layout_height="5dp"/>
+						android:layout_height="5dp"
+						android:layout_marginBottom="10dp"
+						android:layout_marginTop="10dp"
+						android:paddingRight="5dp"/>
 
 					<Button
 						android:id="@+id/file_transfer_action"
-                        android:textAppearance="@style/font8"
-                        android:background="@drawable/resizable_assistant_button"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:layout_below="@id/progress_bar"/>
+						android:layout_below="@id/progress_bar"
+						android:background="@drawable/resizable_assistant_button"
+						android:textAppearance="@style/font8"/>
 
 				</RelativeLayout>
 
 				<LinearLayout
-					android:id="@+id/imdmLayout"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_alignParentRight="true"
-					android:layout_marginTop="2dp"
-					android:layout_marginBottom="2dp"
-					android:orientation="horizontal"
-					android:layout_gravity="right"
-					android:gravity="right"
-					android:visibility="invisible">
+					android:layout_gravity="right">
 
 					<TextView
-						android:id="@+id/imdmText"
+						android:id="@+id/message_date"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:text="Displayed"
-						android:textSize="12sp"
-						android:paddingRight="3dp"/>
+						android:layout_gravity="right"
+						android:layout_toLeftOf="@id/imdmLayout"
+						android:layout_weight="1"
+						android:gravity="right"
+						android:orientation="horizontal"
+						android:paddingRight="5dp"
+						android:textColor="#595959"
+						android:textSize="8.3sp"/>
 
-					<ImageView
-						android:id="@+id/imdmIcon"
-						android:layout_width="10dp"
-						android:layout_height="10dp"
-						android:src="@drawable/valid"
-						android:scaleType="fitCenter"
-						android:layout_marginTop="2dp" />
+					<LinearLayout
+						android:id="@+id/imdmLayout"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="right"
+						android:layout_marginBottom="2dp"
+						android:layout_marginTop="2dp"
+						android:gravity="right"
+						android:orientation="horizontal"
+						android:visibility="gone">
 
+						<TextView
+							android:id="@+id/imdmText"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:paddingRight="3dp"
+							android:text="Displayed"
+							android:textSize="8.3sp"/>
+
+						<ImageView
+							android:id="@+id/imdmIcon"
+							android:layout_width="8dp"
+							android:layout_height="8dp"
+							android:layout_marginTop="2dp"
+							android:scaleType="fitCenter"
+							android:src="@drawable/chat_read"/>
+
+					</LinearLayout>
 				</LinearLayout>
 
 			</LinearLayout>
@@ -207,32 +231,32 @@
 		</LinearLayout>
 
 		<RelativeLayout
-		    android:layout_alignRight="@id/background"
-		    android:layout_alignTop="@id/background"
 			android:layout_width="15dp"
 			android:layout_height="15dp"
-			android:paddingTop="5dp"
-			android:paddingBottom="3dp">
+			android:layout_alignRight="@id/background"
+			android:layout_alignTop="@id/background"
+			android:paddingBottom="3dp"
+			android:paddingTop="5dp">
 
 			<ImageView
 				android:id="@+id/status"
-				android:contentDescription="@string/content_description_message_status"
-				android:visibility="invisible"
-				android:layout_alignParentTop="true"
-				android:layout_alignParentRight="true"
-				android:paddingRight="5dp"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
-				android:adjustViewBounds="true" />
+				android:layout_alignParentRight="true"
+				android:layout_alignParentTop="true"
+				android:adjustViewBounds="true"
+				android:contentDescription="@string/content_description_message_status"
+				android:paddingRight="5dp"
+				android:visibility="invisible"/>
 
 			<ProgressBar
 				android:id="@+id/inprogress"
-                android:progressTint="@color/colorB"
-				android:layout_alignParentTop="true"
-				android:layout_alignParentRight="true"
-				android:paddingRight="5dp"
 				android:layout_width="match_parent"
-				android:layout_height="match_parent"/>
+				android:layout_height="match_parent"
+				android:layout_alignParentRight="true"
+				android:layout_alignParentTop="true"
+				android:paddingRight="5dp"
+				android:progressTint="@color/colorB"/>
 
 		</RelativeLayout>
 
diff --git a/res/layout/chat_create.xml b/res/layout/chat_create.xml
index adcd03d23..865ae2812 100644
--- a/res/layout/chat_create.xml
+++ b/res/layout/chat_create.xml
@@ -13,7 +13,7 @@
         <LinearLayout
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
+            android:layout_height="50dp"
             android:background="@color/colorF"
             android:orientation="horizontal">
 
diff --git a/res/layout/chat_infos.xml b/res/layout/chat_infos.xml
index 86b1b24b9..8bc5d2c59 100644
--- a/res/layout/chat_infos.xml
+++ b/res/layout/chat_infos.xml
@@ -11,10 +11,10 @@
 
         <LinearLayout
             android:id="@+id/top_bar"
-            android:orientation="horizontal"
-            android:background="@color/colorF"
             android:layout_width="match_parent"
-            android:layout_height="60dp">
+            android:layout_height="50dp"
+            android:background="@color/colorF"
+            android:orientation="horizontal">
 
             <ImageView
                 android:id="@+id/back"
@@ -28,25 +28,25 @@
                 android:src="@drawable/back"/>
 
             <TextView
-                android:text="@string/chat_room_infos_title"
                 style="@style/font6"
-                android:ellipsize="end"
-                android:maxLines="1"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="0.4"
-                android:gravity="center"/>
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:text="@string/chat_room_infos_title"/>
 
             <ImageView
                 android:id="@+id/confirm"
-                android:src="@drawable/chat_room_creation_confirm"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
+                android:layout_gravity="right"
                 android:layout_weight="0.2"
                 android:background="@drawable/toolbar_button"
                 android:contentDescription="@string/content_description_valid"
                 android:padding="18dp"
-                android:layout_gravity="right"/>
+                android:src="@drawable/chat_room_creation_confirm"/>
 
         </LinearLayout>
 
diff --git a/res/layout/chatlist.xml b/res/layout/chatlist.xml
index c2997a416..4946707a6 100644
--- a/res/layout/chatlist.xml
+++ b/res/layout/chatlist.xml
@@ -6,26 +6,16 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorG"
+        android:background="@color/colorH"
         android:orientation="vertical">
 
         <LinearLayout
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:background="@color/colorG"
+            android:layout_height="50dp"
+            android:background="@color/colorH"
             android:orientation="horizontal">
 
-            <ImageView
-                android:id="@+id/new_discussion"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:background="@drawable/toolbar_button"
-                android:contentDescription="@string/content_description_new_discussion"
-                android:padding="15dp"
-                android:src="@drawable/chat_add"/>
-
             <ImageView
                 android:id="@+id/back_in_call"
                 android:layout_width="0dp"
@@ -37,6 +27,13 @@
                 android:src="@drawable/call_back"
                 android:visibility="invisible"/>
 
+            <ImageView
+                android:id="@+id/useless"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.2"
+                android:visibility="invisible"/>
+
             <View
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
@@ -49,8 +46,7 @@
                 android:layout_weight="0.2"
                 android:background="@drawable/toolbar_button"
                 android:contentDescription="@string/content_description_edit_list"
-                android:padding="15dp"
-                android:src="@drawable/edit_list_button"/>
+                android:src="@drawable/delete"/>
         </LinearLayout>
 
         <include layout="@layout/edit_list"/>
@@ -66,7 +62,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:cacheColorHint="@color/transparent"
-            android:divider="@color/colorH"
+            android:divider="@color/colorE"
             android:dividerHeight="1dp"/>
 
     </LinearLayout>
@@ -82,4 +78,15 @@
 
     <include layout="@layout/wait_layout" android:id="@+id/waitScreen"/>
 
+    <ImageView
+        android:id="@+id/new_discussion"
+        android:layout_width="55dp"
+        android:layout_height="55dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginBottom="10dp"
+        android:layout_marginRight="10dp"
+        android:contentDescription="@string/content_description_new_discussion"
+        android:src="@drawable/chat_add"/>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/chatlist_cell.xml b/res/layout/chatlist_cell.xml
index 9fd687d69..a09176735 100644
--- a/res/layout/chatlist_cell.xml
+++ b/res/layout/chatlist_cell.xml
@@ -1,29 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="80dp"
-    android:gravity="center_vertical"
-    android:paddingLeft="10dp"
-	android:paddingRight="10dp"
-	android:paddingTop="5dp"
-    android:background="@drawable/list_selector">
-
-	<CheckBox
-		android:id="@+id/delete_chatroom"
-		android:button="@drawable/checkbox"
-		android:contentDescription="@string/content_description_delete"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:adjustViewBounds="true"
-		android:layout_alignParentRight="true"
-		android:layout_centerVertical="true"
-		android:visibility="invisible" android:layout_alignParentTop="true"/>
+				android:layout_width="match_parent"
+				android:layout_height="72dp"
+				android:background="@drawable/list_selector"
+				android:gravity="center_vertical"
+				android:paddingLeft="10dp"
+				android:paddingRight="10dp"
+				android:paddingTop="5dp">
 
 	<LinearLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
-	    android:layout_centerVertical="true"
-	    android:orientation="horizontal">
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_centerVertical="true"
+		android:orientation="horizontal">
 
 		<RelativeLayout
 			android:layout_width="wrap_content"
@@ -38,11 +27,12 @@
 
 				<ImageView
 					android:id="@+id/contact_picture"
-					android:src="@drawable/avatar"
+					android:layout_width="40dp"
+					android:layout_height="40dp"
+					android:adjustViewBounds="true"
 					android:contentDescription="@string/content_description_contact_picture"
-					android:layout_width="35dp"
-					android:layout_height="35dp"
-					android:adjustViewBounds="true"/>
+					android:foregroundGravity="center"
+					android:src="@drawable/avatar_big_secure1"/>
 
 				<ImageView
 					android:id="@+id/mask"
@@ -54,15 +44,6 @@
 
 			</RelativeLayout>
 
-			<TextView
-				android:id="@+id/date"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/avatar_layout"
-				android:layout_marginTop="5dp"
-				android:maxLines="1"
-				style="@style/font2"/>
-
 		</RelativeLayout>
 
 		<RelativeLayout
@@ -71,53 +52,98 @@
 			android:layout_toLeftOf="@id/delete_chatroom"
 			android:paddingLeft="10dp">
 
-			<TextView
-				android:id="@+id/sipUri"
-				android:lines="1"
-				android:ellipsize="end"
-				android:scrollHorizontally="true"
-				android:maxLines="1"
-				style="@style/font6"
+			<CheckBox
+				android:id="@+id/delete_chatroom"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginRight="30dp"/>
+				android:layout_alignParentRight="true"
+				android:layout_alignParentTop="true"
+				android:layout_centerVertical="true"
+				android:layout_marginEnd="18dp"
+				android:layout_marginTop="10dp"
+				android:adjustViewBounds="true"
+				android:button="@drawable/checkbox"
+				android:contentDescription="@string/content_description_delete"
+				android:scaleX="0.8"
+				android:scaleY="0.8"
+				android:visibility="gone"/>
+
+			<TextView
+				android:id="@+id/date"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentEnd="true"
+				android:layout_alignParentTop="true"
+				android:layout_alignRight="@+id/unreadMessages"
+				android:layout_marginEnd="18dp"
+				android:layout_marginTop="14dp"
+				android:maxLines="1"
+				android:textColor="#ff5e00"
+				android:textSize="13.3sp"/>
+
+			<TextView
+				android:id="@+id/sipUri"
+				android:layout_width="180dp"
+				android:layout_height="wrap_content"
+				android:layout_marginRight="30dp"
+				android:layout_marginTop="8dp"
+				android:ellipsize="end"
+				android:lineSpacingExtra="13.3sp"
+				android:lines="1"
+				android:maxLines="1"
+				android:scrollHorizontally="true"
+				android:textColor="#ff6600"
+				android:textSize="20sp"/>
 
 			<TextView
 				android:id="@+id/unreadMessages"
+				style="@style/font18"
 				android:layout_width="20dp"
 				android:layout_height="20dp"
-				android:contentDescription="@string/content_description_unread_chat_message"
+				android:layout_alignBottom="@+id/sipUri"
+				android:layout_alignParentEnd="true"
+				android:layout_marginBottom="4dp"
+				android:layout_marginEnd="100dp"
 				android:background="@drawable/chat_list_indicator"
-				style="@style/font18"
+				android:contentDescription="@string/content_description_unread_chat_message"
 				android:gravity="center"
-				android:maxLines="1"
-				android:layout_above="@+id/lastMessageLayout"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentEnd="true"/>
+				android:maxLines="1"/>
 
-            <LinearLayout
-                android:id="@id/lastMessageLayout"
-                android:layout_below="@id/sipUri"
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+			<LinearLayout
+				android:id="@id/lastMessageLayout"
+				android:layout_width="match_parent"
+				android:layout_height="21dp"
+				android:layout_below="@id/sipUri"
+				android:orientation="horizontal">
 
-                <TextView
-                    android:id="@+id/lastMessageSender"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/font11"/>
+				<ImageView
+					android:id="@+id/lastMessageStatus"
+					android:layout_width="11dp"
+					android:layout_height="11dp"
+					android:layout_gravity="center_vertical|center_horizontal|center"
+					android:foregroundGravity="center"
+					android:src="@drawable/chat_read"
+					android:visibility="gone"/>
 
-                <TextView
-                    android:id="@+id/lastMessage"
-                    android:maxLines="2"
-                    android:ellipsize="end"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="30dp"
-                    style="@style/font11"/>
+				<TextView
+					android:id="@+id/lastMessageSender"
+					android:layout_width="wrap_content"
+					android:layout_height="match_parent"
+					android:textColor="#595959"
+					android:textSize="16.7sp"/>
 
-            </LinearLayout>
+				<TextView
+					android:id="@+id/lastMessage"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:layout_marginEnd="18dp"
+					android:layout_marginStart="5dp"
+					android:ellipsize="end"
+					android:maxLines="1"
+					android:textColor="#aeaeae"
+					android:textSize="16.7sp"/>
+
+			</LinearLayout>
 
 		</RelativeLayout>
 
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index 52c86465f..a78bc437b 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -11,7 +11,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="60dp"
+            android:layout_height="50dp"
             android:background="@color/colorG"
             android:orientation="horizontal">
 
diff --git a/res/layout/contact_cell.xml b/res/layout/contact_cell.xml
index 5642cfb3b..4705ba167 100644
--- a/res/layout/contact_cell.xml
+++ b/res/layout/contact_cell.xml
@@ -15,10 +15,13 @@
 
 		<TextView
 			android:id="@+id/separator_text"
-			style="@style/font1"
 			android:layout_width="match_parent"
-			android:layout_height="40dp"
-			android:gravity="center" />
+			android:layout_height="23dp"
+			android:background="@color/colorN"
+			android:gravity="center"
+			android:textColor="#ffffff"
+			android:textSize="13.3sp"
+			android:textStyle="bold"/>
 
 		<ImageView
 			android:background="@color/colorE"
@@ -41,22 +44,23 @@
 
 			<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_width="40dp"
+				android:layout_height="40dp"
 				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="5dp"/>
+				android:layout_marginLeft="5dp"
+				android:adjustViewBounds="true"
+				android:contentDescription="@string/content_description_contact_picture"
+				android:src="@drawable/avatar_big_secure1"/>
 
 			<ImageView
 				android:id="@+id/mask"
-				android:src="@drawable/avatar_mask"
 				android:layout_width="35dp"
 				android:layout_height="35dp"
-				android:adjustViewBounds="true"
 				android:layout_alignParentLeft="true"
-				android:layout_marginLeft="5dp"/>
+				android:layout_marginLeft="5dp"
+				android:adjustViewBounds="true"
+				android:src="@drawable/avatar_mask"
+				android:visibility="gone"/>
 
 		</RelativeLayout>
 
diff --git a/res/layout/contact_edit.xml b/res/layout/contact_edit.xml
index 27c316e83..6e175c63b 100644
--- a/res/layout/contact_edit.xml
+++ b/res/layout/contact_edit.xml
@@ -7,7 +7,7 @@
 
 	<LinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="60dp"
+		android:layout_height="50dp"
 		android:background="@color/colorG"
 		android:orientation="horizontal">
 
diff --git a/res/layout/contacts_list.xml b/res/layout/contacts_list.xml
index 2c8d357d7..6b58949e2 100644
--- a/res/layout/contacts_list.xml
+++ b/res/layout/contacts_list.xml
@@ -89,30 +89,29 @@
 
 	<RelativeLayout
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_height="33dp"
 		android:layout_margin="10dp"
 		android:background="@color/colorH">
 
 		<EditText
 			android:id="@+id/searchField"
 			android:layout_width="match_parent"
-			android:layout_height="40dp"
-			android:background="@drawable/resizable_textfield"
+			android:layout_height="34dp"
+			android:layout_gravity="center"
+			android:layout_marginRight="20dp"
+			android:layout_toLeftOf="@+id/clearSearchField"
+			android:background=" #f3f3f3 "
 			android:contentDescription="@string/content_description_search_contact"
-			android:gravity="center"
 			android:inputType="textPersonName"
-			android:paddingRight="5dp"
 			android:textColor="@android:color/black"
 			android:textCursorDrawable="@null"/>
 
 		<ImageView
 			android:id="@+id/clearSearchField"
-			android:layout_width="30dp"
-			android:layout_height="30dp"
+			android:layout_width="40dp"
+			android:layout_height="40dp"
 			android:layout_alignParentRight="true"
 			android:layout_centerVertical="true"
-			android:paddingLeft="5dp"
-			android:paddingRight="5dp"
 			android:src="@drawable/clean_field_default"/>
 
 	</RelativeLayout>
@@ -132,9 +131,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:divider="@color/colorE"
-			android:fastScrollEnabled="true"
-			android:fastScrollAlwaysVisible="true"
-			android:dividerHeight="1dp" />
+			android:dividerHeight="1dp"/>
 
 		<ProgressBar
 			android:id="@+id/contactsFetchInProgress"
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index ea2fa9f6a..7df577a8e 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -1,25 +1,23 @@
 <?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:background="@color/colorH"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+				xmlns:tools="http://schemas.android.com/tools"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent">
 
 	<RelativeLayout
 		android:id="@+id/dialer"
-		android:background="@color/colorH"
-		android:layout_marginBottom="50dp"
-		android:layout_centerHorizontal="true"
-		android:layout_alignParentBottom="true"
 		android:layout_width="300dp"
 		android:layout_height="460dp"
+		android:layout_alignParentBottom="true"
+		android:layout_centerHorizontal="true"
+		android:layout_marginBottom="50dp"
 		android:visibility="gone">
 	</RelativeLayout>
 
 	<RelativeLayout
 		android:id="@+id/address_bar"
 		android:layout_width="match_parent"
-		android:layout_height="60dp"
+		android:layout_height="50dp"
 		android:layout_alignParentTop="true"
 		android:background="@color/colorG">
 
@@ -48,7 +46,7 @@
 			android:inputType="textEmailAddress"
 			android:paddingLeft="20dp"
 			android:paddingRight="5dp"
-			android:textColorHint="@color/colorE"/>
+			android:textColorHint="@color/colorB"/>
 
 	</RelativeLayout>
 
@@ -59,14 +57,15 @@
 		android:layout_above="@id/controls"
 		android:layout_below="@id/address_bar"
 		android:layout_centerInParent="true"
-		android:background="@color/colorF"
+		android:background="@color/colorB"
 		android:padding="10dp"/>
 
-    <LinearLayout
-        android:id="@+id/controls"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="60dp">
+	<LinearLayout
+		android:id="@+id/controls"
+		android:layout_width="match_parent"
+		android:layout_height="50dp"
+		android:layout_alignParentBottom="true"
+		>
 
 		<RelativeLayout
 			android:layout_width="match_parent"
@@ -81,23 +80,22 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_alignParentBottom="true"
-				android:background="@drawable/toolbar_button"
 				android:contentDescription="@string/content_description_add_contact"
 				android:padding="15dp"
-				android:src="@drawable/contact_add_button"
-				/>
+				android:src="@drawable/contact_add_button"/>
 
 		</RelativeLayout>
 
-        <org.linphone.ui.CallButton
+		<org.linphone.ui.CallButton
 			android:id="@+id/call"
-			android:src="@drawable/call_audio_start"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_gravity="center"
+			android:layout_weight="1"
+			android:adjustViewBounds="true"
 			android:background="@drawable/call"
-			android:contentDescription="@string/content_description_call"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-			android:padding="12dp"
-            android:layout_weight="0.5"/>
+			android:scaleType="center"
+			android:src="@drawable/call_alt_start_over"/>
 
 	</LinearLayout>
 
diff --git a/res/layout/dialog.xml b/res/layout/dialog.xml
index 252cd8c62..1e8256b04 100644
--- a/res/layout/dialog.xml
+++ b/res/layout/dialog.xml
@@ -17,30 +17,33 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"
+		android:layout_margin="20dp"
 		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:orientation="vertical">
 
 		<Button
 			android:id="@+id/delete_button"
-			android:text="@string/delete"
-			android:background="@drawable/resizable_confirm_delete_button"
-			style="@style/font15"
-			android:layout_width="wrap_content"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_margin="10dp"
-			android:padding="10dp"/>
+			android:background=" #ff6600"
+			android:padding="10dp"
+			android:text="@string/delete"
+			android:textColor="#ffffff"
+			android:textSize="20sp"/>
 
-		</LinearLayout>
+		<Button
+			android:id="@+id/cancel"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="10dp"
+			android:background=" #595959"
+			android:padding="10dp"
+			android:text="@string/cancel"
+			android:textColor="#ffffff"
+			android:textSize="20sp"/>
+
+	</LinearLayout>
 
 
 
diff --git a/res/layout/edit_list.xml b/res/layout/edit_list.xml
index 2b457e46e..84341c607 100644
--- a/res/layout/edit_list.xml
+++ b/res/layout/edit_list.xml
@@ -2,8 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:id="@+id/edit_list"
 			  android:layout_width="match_parent"
-			  android:layout_height="60dp"
-			  android:background="@color/colorG"
+			  android:layout_height="50dp"
+			  android:background="@color/colorH"
 			  android:orientation="horizontal"
 			  android:visibility="gone">
 
@@ -14,8 +14,7 @@
 		android:layout_weight="0.2"
 		android:background="@drawable/toolbar_button"
 		android:contentDescription="@string/content_description_cancel_button"
-		android:padding="15dp"
-		android:src="@drawable/cancel_edit"/>
+		android:src="@drawable/back"/>
 
 	<View
 		android:layout_width="0dp"
@@ -30,7 +29,6 @@
 		android:layout_weight="0.2"
 		android:background="@drawable/toolbar_button"
 		android:contentDescription="@string/content_description_select_all"
-		android:padding="15dp"
 		android:src="@drawable/select_all"/>
 
 	<ImageView
@@ -40,7 +38,6 @@
 		android:layout_weight="0.2"
 		android:background="@drawable/toolbar_button"
 		android:contentDescription="@string/content_description_deselect_all"
-		android:padding="15dp"
 		android:src="@drawable/deselect_all"
 		android:visibility="gone"/>
 
@@ -51,7 +48,6 @@
 		android:layout_weight="0.2"
 		android:background="@drawable/toolbar_button"
 		android:contentDescription="@string/content_description_delete_selection"
-		android:padding="15dp"
 		android:src="@drawable/delete_button"/>
 
 
diff --git a/res/layout/history.xml b/res/layout/history.xml
index 05c8bcd36..ac0d2e13a 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -8,8 +8,8 @@
 	<LinearLayout
 		android:id="@+id/top_bar"
 		android:layout_width="match_parent"
-		android:layout_height="60dp"
-		android:background="@color/colorG"
+		android:layout_height="50dp"
+		android:background="@color/colorH"
 		android:orientation="horizontal">
 
 		<RelativeLayout
@@ -23,8 +23,8 @@
 				android:layout_height="match_parent"
 				android:background="@drawable/toolbar_button"
 				android:contentDescription="@string/content_description_all_contacts"
-				android:padding="15dp"
-				android:src="@drawable/history_all"/>
+				android:src="@drawable/history_all"
+				/>
 
 			<ImageView
 				android:id="@+id/all_calls_select"
@@ -32,8 +32,8 @@
 				android:layout_height="match_parent"
 				android:background="@drawable/toolbar_button"
 				android:contentDescription="@string/content_description_all_contacts"
-				android:padding="15dp"
-				android:src="@drawable/history_all_over"/>
+				android:src="@drawable/history_all_selected"
+				/>
 		</RelativeLayout>
 
 		<RelativeLayout
@@ -48,7 +48,6 @@
 				android:background="@drawable/toolbar_button"
 				android:contentDescription="@string/content_description_linphone_contacts"
 				android:gravity="center"
-				android:padding="15dp"
 				android:src="@drawable/history_missed"/>
 
 			<ImageView
@@ -58,14 +57,14 @@
 				android:background="@drawable/toolbar_button"
 				android:contentDescription="@string/content_description_linphone_contacts"
 				android:gravity="center"
-				android:padding="15dp"
-				android:src="@drawable/history_missed_over"/>
+				android:src="@drawable/history_missed_selected"/>
 		</RelativeLayout>
 
 		<View
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
-			android:layout_weight="0.4"/>
+			android:layout_weight="0.4"
+			android:background="@color/colorH"/>
 
 		<ImageView
 			android:id="@+id/edit"
@@ -74,8 +73,7 @@
 			android:layout_weight="0.2"
 			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_edit_list"
-			android:padding="15dp"
-			android:src="@drawable/edit_list_button"/>
+			android:src="@drawable/delete"/>
 	</LinearLayout>
 
 	<include layout="@layout/edit_list"/>
diff --git a/res/layout/history_cell.xml b/res/layout/history_cell.xml
index 2907c0a2a..9b6f30c56 100644
--- a/res/layout/history_cell.xml
+++ b/res/layout/history_cell.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:layout_width="match_parent"
 			  android:layout_height="wrap_content"
-			  android:background="@color/colorG"
+			  android:background="@color/colorH"
 			  android:gravity="center_vertical"
 			  android:orientation="vertical">
 
@@ -14,16 +14,17 @@
 
 		<TextView
 			android:id="@+id/separator_text"
-			style="@style/font8"
 			android:layout_width="match_parent"
-			android:layout_height="40dp"
-			android:background="@color/colorA"
-			android:gravity="center"/>
+			android:layout_height="23.3dp"
+			android:background="@color/colorN"
+			android:gravity="center_horizontal"
+			android:textColor="#ffffff"
+			android:textSize="13.3sp"/>
 
 		<ImageView
 			android:layout_width="match_parent"
 			android:layout_height="1dp"
-			android:background="@color/colorE"/>
+			android:background="@color/colorH"/>
 
 	</LinearLayout>
 
@@ -32,7 +33,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="40dp"
 		android:layout_margin="5dp"
-		android:background="@color/colorG"
+		android:background="@color/colorH"
 		android:gravity="center_vertical">
 
 		<ImageView
@@ -40,21 +41,20 @@
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
 			android:layout_alignParentRight="true"
+			android:layout_margin="10dp"
 			android:adjustViewBounds="true"
 			android:contentDescription="@string/content_description_detail"
-			android:paddingLeft="5dp"
-			android:paddingRight="5dp"
 			android:src="@drawable/list_detail"/>
 
 		<CheckBox
 			android:id="@+id/delete"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
+			android:layout_height="match_parent"
 			android:layout_alignParentRight="true"
 			android:layout_centerInParent="true"
 			android:button="@drawable/checkbox"
 			android:contentDescription="@string/content_description_delete"
-			android:padding="5dp"
+			android:paddingRight="5dp"
 			android:visibility="gone"/>
 
 		<RelativeLayout
@@ -78,7 +78,7 @@
 					android:layout_marginLeft="5dp"
 					android:adjustViewBounds="true"
 					android:contentDescription="@string/content_description_contact_picture"
-					android:src="@drawable/avatar"/>
+					android:src="@drawable/avatar_big_secure1"/>
 
 				<ImageView
 					android:id="@+id/mask"
@@ -105,13 +105,14 @@
 
 			<TextView
 				android:id="@+id/sip_uri"
-				style="@style/font6"
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
 				android:layout_marginLeft="10dp"
 				android:layout_toRightOf="@id/icon"
 				android:ellipsize="end"
-				android:gravity="center_vertical"
+				android:textSize="20sp"
+				android:textColor="#000000"
+				android:lineSpacingExtra="13.3sp"
 				android:lines="1"
 				android:maxLines="1"/>
 		</RelativeLayout>
diff --git a/res/layout/history_detail.xml b/res/layout/history_detail.xml
index 3e3a0d6b6..bc7c99fb2 100644
--- a/res/layout/history_detail.xml
+++ b/res/layout/history_detail.xml
@@ -12,8 +12,8 @@
         <LinearLayout
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:background="@color/colorG"
+            android:layout_height="50dp"
+            android:background="@color/colorH"
             android:orientation="horizontal">
 
             <ImageView
@@ -23,7 +23,6 @@
                 android:layout_weight="0.2"
                 android:background="@drawable/toolbar_button"
                 android:contentDescription="@string/content_description_back"
-                android:padding="18dp"
                 android:src="@drawable/back"/>
 
             <View
@@ -39,7 +38,8 @@
                 android:background="@drawable/toolbar_button"
                 android:contentDescription="@string/content_description_add_contact"
                 android:padding="15dp"
-                android:src="@drawable/contact_add"/>
+                android:src="@drawable/contact_add"
+                android:visibility="gone"/>
 
             <ImageView
                 android:id="@+id/goto_contact"
@@ -61,64 +61,78 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:padding="20dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:paddingTop="20dp">
 
                 <RelativeLayout
                     android:id="@+id/avatar_layout"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="66dp"
                     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:layout_height="100dp"
+                        android:contentDescription="@string/content_description_contact_picture"
+                        android:src="@drawable/avatar_big_secure1"/>
 
                     <ImageView
                         android:id="@+id/mask"
-                        android:src="@drawable/avatar_mask"
                         android:layout_width="100dp"
-                        android:layout_height="100dp"/>
+                        android:layout_height="100dp"
+                        android:src="@drawable/avatar_mask"/>
 
                 </RelativeLayout>
 
                 <TextView
                     android:id="@+id/contact_name"
                     style="@style/font5"
-                    android:gravity="center_horizontal"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"/>
 
                 <TextView
                     android:id="@+id/contact_address"
                     style="@style/font2"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:visibility="invisible"/>
+
+                <TextView
+                    android:id="@+id/separator_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="23.3dp"
+                    android:background="@color/colorN"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:text="appel sécurisé"
+                    android:textAllCaps="true"
+                    android:textColor="#ffffff"
+                    android:textSize="13.3sp"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="20dp"
+                    android:layout_marginTop="10dp"
                     android:gravity="center"
                     android:orientation="horizontal">
 
                     <ImageView
                         android:id="@+id/call"
-                        android:src="@drawable/call_start_body_default"
+                        android:layout_width="50dp"
+                        android:layout_height="50dp"
+                        android:layout_margin="10dp"
                         android:contentDescription="@string/content_description_call"
-                        android:layout_width="60dp"
-                        android:layout_height="60dp"
-                        android:layout_margin="10dp"/>
+                        android:src="@drawable/call_start_body_default"/>
 
                     <ImageView
                         android:id="@+id/chat"
-                        android:src="@drawable/chat_start_body_default"
+                        android:layout_width="50dp"
+                        android:layout_height="50dp"
+                        android:layout_margin="10dp"
                         android:contentDescription="@string/content_description_chat"
-                        android:layout_width="60dp"
-                        android:layout_height="60dp"
-                        android:layout_margin="10dp"/>
+                        android:src="@drawable/chat_start_body_default"/>
 
                 </LinearLayout>
 
@@ -129,39 +143,41 @@
                     android:orientation="vertical">
 
                     <View
-                        android:background="@color/colorE"
                         android:layout_width="wrap_content"
-                        android:layout_height="1dp"/>
+                        android:layout_height="1dp"
+                        android:background="@color/colorH"/>
 
                     <TextView
-                        android:text="@string/call"
+                        android:id="@+id/call_text"
                         style="@style/font13"
-                        android:textAllCaps="true"
-                        android:layout_marginTop="2dp"
-                        android:layout_gravity="center"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginTop="2dp"
+                        android:text="@string/call"
+                        android:textAllCaps="false"
+                        android:visibility="gone"/>
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="15dp"
                         android:gravity="center"
-                        android:padding="10dp">
+                        android:orientation="horizontal">
 
                         <ImageView
                             android:id="@+id/direction"
-                            android:paddingLeft="10dp"
-                            android:paddingRight="10dp"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"/>
+                            android:layout_width="28dp"
+                            android:layout_height="28dp"
+                            android:paddingRight="5dp"/>
 
                         <TextView
                             android:id="@+id/date"
                             style="@style/font10"
-                            android:paddingRight="10dp"
                             android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"/>
+                            android:layout_height="wrap_content"
+                            android:paddingRight="10dp"/>
 
                         <TextView
                             android:id="@+id/time"
diff --git a/res/layout/launch_screen.xml b/res/layout/launch_screen.xml
index 18e9040fc..47d124468 100644
--- a/res/layout/launch_screen.xml
+++ b/res/layout/launch_screen.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			 android:layout_width="match_parent"
 			 android:layout_height="match_parent"
-			 android:background="@color/colorF">
+			 android:background="@color/colorB">
 
 	<LinearLayout
 		android:layout_width="wrap_content"
@@ -16,14 +16,14 @@
 			android:layout_width="200dp"
 			android:layout_height="200dp"
 			android:layout_gravity="center"
-			android:src="@drawable/linphone_logo"/>
+			android:src="@drawable/logo_secure_phone_big"/>
 
 		<TextView
-			style="@style/font22"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center"
-			android:layout_marginTop="20dp"
+			android:textSize="26.7sp"
+			android:textColor="#ffffff"
+			android:lineSpacingExtra="-13.3sp"
 			android:text="@string/app_name"/>
 
 	</LinearLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 634329816..8b9e58d81 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -9,8 +9,8 @@
 		android:id="@+id/status"
 		android:name="org.linphone.fragments.StatusFragment"
 		android:layout_width="match_parent"
-		android:layout_height="40dp"
-		tools:layout="@layout/status" />
+		android:layout_height="30dp"
+		tools:layout="@layout/status"/>
 
 	<android.support.v4.widget.DrawerLayout
 		android:id="@+id/side_menu"
@@ -75,7 +75,7 @@
 			<LinearLayout
 				android:id="@+id/footer"
 				android:layout_width="match_parent"
-				android:layout_height="60dp"
+				android:layout_height="50dp"
 				android:layout_alignParentBottom="true"
 				android:orientation="horizontal">
 
@@ -86,49 +86,94 @@
 					android:layout_weight="1"
 					android:background="@drawable/footer_button">
 
+					<View
+						android:id="@+id/history_select"
+						android:layout_width="match_parent"
+						android:layout_height="3dp"
+						android:layout_alignParentTop="true"
+						android:background="@color/colorB"
+						android:visibility="gone"/>
+
 					<ImageView
 						android:id="@+id/history_image"
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
 						android:layout_centerInParent="true"
+						android:layout_margin="10dp"
 						android:background="@drawable/footer_button"
 						android:contentDescription="@string/content_description_history"
-						android:padding="18dp"
 						android:src="@drawable/footer_history"/>
 
 					<TextView
 						android:id="@+id/missed_calls"
-						style="@style/font18"
-						android:layout_width="20dp"
-						android:layout_height="20dp"
-						android:layout_margin="15dp"
+						android:layout_width="12dp"
+						android:layout_height="12dp"
+						android:layout_marginLeft="55dp"
+						android:layout_marginTop="30dp"
 						android:background="@drawable/history_chat_indicator"
 						android:gravity="center"
+						android:text="1"
+						android:textColor="#000000"
+						android:textSize="8.3sp"
 						android:visibility="gone"/>
 
 				</RelativeLayout>
 
-				<ImageView
-					android:id="@+id/contacts"
+				<RelativeLayout
+					android:id="@+id/contact_footer"
 					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_centerInParent="true"
+					android:layout_height="match_parent"
 					android:layout_weight="1"
-					android:background="@drawable/footer_button"
-					android:contentDescription="@string/content_description_contacts"
-					android:padding="18dp"
-					android:src="@drawable/footer_contacts"/>
+					android:background="@drawable/footer_button">
 
-				<ImageView
-					android:id="@+id/dialer"
+					<View
+						android:id="@+id/contacts_select"
+						android:layout_width="match_parent"
+						android:layout_height="3dp"
+						android:layout_alignParentTop="true"
+						android:background="@color/colorB"
+						android:visibility="gone"/>
+
+					<ImageView
+						android:id="@+id/contacts"
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:layout_centerInParent="true"
+						android:layout_margin="10dp"
+						android:layout_weight="1"
+						android:background="@drawable/footer_button"
+						android:contentDescription="@string/content_description_contacts"
+						android:src="@drawable/footer_contacts"/>
+
+				</RelativeLayout>
+
+				<RelativeLayout
+					android:id="@+id/dialer_footer"
 					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_centerInParent="true"
+					android:layout_height="match_parent"
 					android:layout_weight="1"
-					android:background="@drawable/footer_button"
-					android:contentDescription="@string/content_description_dialer"
-					android:padding="18dp"
-					android:src="@drawable/footer_dialer"/>
+					android:background="@drawable/footer_button">
+
+					<View
+						android:id="@+id/dialer_select"
+						android:layout_width="match_parent"
+						android:layout_height="3dp"
+						android:layout_alignParentTop="true"
+						android:background="@color/colorB"
+						android:visibility="gone"/>
+
+					<ImageView
+						android:id="@+id/dialer"
+						android:layout_width="match_parent"
+						android:layout_height="match_parent"
+						android:layout_centerInParent="true"
+						android:layout_margin="10dp"
+						android:layout_weight="1"
+						android:background="@drawable/footer_button"
+						android:contentDescription="@string/content_description_dialer"
+						android:src="@drawable/footer_dialer"/>
+
+				</RelativeLayout>
 
 				<RelativeLayout
 					android:id="@+id/chat"
@@ -137,23 +182,34 @@
 					android:layout_weight="1"
 					android:background="@drawable/footer_button">
 
+					<View
+						android:id="@+id/chat_select"
+						android:layout_width="match_parent"
+						android:layout_height="3dp"
+						android:layout_alignParentTop="true"
+						android:background="@color/colorB"
+						android:visibility="gone"/>
+
 					<ImageView
 						android:id="@+id/chat_image"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:layout_centerInParent="true"
+						android:layout_margin="10dp"
 						android:background="@drawable/footer_button"
-						android:padding="18dp"
 						android:src="@drawable/footer_chat"/>
 
 					<TextView
 						android:id="@+id/missed_chats"
-						style="@style/font18"
-						android:layout_width="20dp"
-						android:layout_height="20dp"
-						android:layout_margin="15dp"
+						android:layout_width="12dp"
+						android:layout_height="12dp"
+						android:layout_marginLeft="55dp"
+						android:layout_marginTop="30dp"
 						android:background="@drawable/history_chat_indicator"
 						android:gravity="center"
+						android:textAlignment="center"
+						android:textColor="#000000"
+						android:textSize="8.3sp"
 						android:visibility="gone"/>
 
 				</RelativeLayout>
@@ -189,7 +245,7 @@
 				android:src="@drawable/quit"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:padding="5dp"
+				android:padding="14dp"
 				android:layout_alignParentLeft="true"
 				android:layout_centerVertical="true" />
 
@@ -204,42 +260,42 @@
 				android:layout_centerInParent="true"/>
 		</RelativeLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@id/side_menu_quit"
-            android:background="@color/colorG"
-            android:orientation="vertical">
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:layout_above="@id/side_menu_quit"
+			android:background="@color/colorH"
+			android:orientation="vertical">
 
-            <include layout="@layout/side_menu_main_account"/>
+			<include layout="@layout/side_menu_main_account"/>
 
-            <ListView
-                android:id="@+id/accounts_list"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/colorG"
-                android:cacheColorHint="@color/transparent"
-                android:choiceMode="singleChoice"
-                android:divider="@android:color/transparent"
-                android:dividerHeight="0dp"/>
+			<ListView
+				android:id="@+id/accounts_list"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="@color/colorH"
+				android:cacheColorHint="@color/transparent"
+				android:choiceMode="singleChoice"
+				android:divider="@android:color/transparent"
+				android:dividerHeight="0dp"/>
 
 			<ListView
 				android:id="@+id/item_list"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:background="@color/colorG"
+				android:background="@color/colorH"
 				android:choiceMode="singleChoice"
 				android:divider="@color/colorE"
 				android:dividerHeight="1dp"
 				android:footerDividersEnabled="true"
-				android:listSelector="@color/colorG"/>
+				android:listSelector="@color/colorH"/>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/colorE"/>
+			<View
+				android:layout_width="match_parent"
+				android:layout_height="1dp"
+				android:background="@color/colorH"/>
 
-        </LinearLayout>
+		</LinearLayout>
 	</RelativeLayout>
 
 </android.support.v4.widget.DrawerLayout>
diff --git a/res/layout/numpad.xml b/res/layout/numpad.xml
index a308eaab1..e6f876383 100644
--- a/res/layout/numpad.xml
+++ b/res/layout/numpad.xml
@@ -4,7 +4,13 @@
 			 android:layout_width="match_parent" android:layout_height="match_parent" >
 
 <TableRow android:layout_weight="1" android:gravity="center">
-	<org.linphone.ui.Digit android:id="@+id/Digit1"	android:text="1" style="@style/DialerDigit" android:background="@drawable/numpad_one" android:soundEffectsEnabled="true"/>
+
+	<org.linphone.ui.Digit
+		android:id="@+id/Digit1"
+		style="@style/DialerDigit"
+		android:background="@drawable/numpad_one"
+		android:soundEffectsEnabled="true"
+		android:text="1"/>
 	<org.linphone.ui.Digit android:id="@+id/Digit2"	android:text="2" style="@style/DialerDigit" android:background="@drawable/numpad_two" android:soundEffectsEnabled="true" />
 	<org.linphone.ui.Digit android:id="@+id/Digit3"	android:text="3" style="@style/DialerDigit" android:background="@drawable/numpad_three" android:soundEffectsEnabled="true" />
 </TableRow>
diff --git a/res/layout/side_menu_item_cell.xml b/res/layout/side_menu_item_cell.xml
index c16e611e1..32e8b1f98 100644
--- a/res/layout/side_menu_item_cell.xml
+++ b/res/layout/side_menu_item_cell.xml
@@ -4,7 +4,9 @@
 		  style="@style/font6"
 		  android:layout_width="match_parent"
 		  android:layout_height="45dp"
-		  android:background="@color/colorG"
+		  android:textSize="20sp"
+		  android:textColor="#000000"
+		  android:lineSpacingExtra="13.3sp"
 		  android:gravity="center_vertical"
 		  android:paddingLeft="16dp"
 		  android:paddingRight="16dp"/>
\ No newline at end of file
diff --git a/res/layout/side_menu_main_account.xml b/res/layout/side_menu_main_account.xml
index a83ef4054..3adad82f0 100644
--- a/res/layout/side_menu_main_account.xml
+++ b/res/layout/side_menu_main_account.xml
@@ -3,17 +3,17 @@
 				android:id="@+id/default_account"
 				android:layout_width="match_parent"
 				android:layout_height="70dp"
-				android:background="@color/colorH"
+				android:background="@color/colorM"
 				android:contentDescription="@string/content_description_default_account">
 
 	<ImageView
 		android:id="@+id/main_account_avatar"
-		android:layout_width="30dp"
-		android:layout_height="30dp"
+		android:layout_width="40dp"
+		android:layout_height="40dp"
 		android:layout_centerVertical="true"
-		android:layout_marginLeft="12dp"
-		android:layout_marginRight="12dp"
-		android:src="@drawable/avatar"/>
+		android:layout_marginLeft="10dp"
+		android:layout_marginRight="10dp"
+		android:src="@drawable/avatar_small_secure_1"/>
 
 	<LinearLayout
 		android:id="@+id/layout"
@@ -25,15 +25,18 @@
 
 		<TextView
 			android:id="@+id/main_account_display_name"
-			style="@style/font7"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
+			android:layout_height="wrap_content"
+			android:lineSpacingExtra="15sp"
+			android:textColor="#000000"
+			android:textSize="18.3sp"/>
 
 		<TextView
 			android:id="@+id/main_account_address"
-			style="@style/font3"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
+			android:layout_height="wrap_content"
+			android:textColor="#ff5e00"
+			android:textSize="13.3sp"/>
 
 	</LinearLayout>
 
@@ -45,6 +48,8 @@
 		android:layout_alignParentTop="true"
 		android:layout_marginTop="10dp"
 		android:padding="5dp"
-		android:src="@drawable/status_available"/>
+		android:src="@drawable/status_available"
+		android:visibility="gone"
+		/>
 
 </RelativeLayout>
diff --git a/res/layout/status.xml b/res/layout/status.xml
index 5505e92cb..c9fb4b377 100644
--- a/res/layout/status.xml
+++ b/res/layout/status.xml
@@ -2,14 +2,15 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 				android:id="@+id/status"
 				android:layout_width="match_parent"
-				android:layout_height="40dp"
+				android:layout_height="30dp"
 				android:background="@color/colorF"
 				android:orientation="horizontal">
 
 	<RelativeLayout
 		android:id="@+id/status_bar"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent">
+		android:layout_height="match_parent"
+		android:background="#ff6600">
 
 		<ImageView
 			android:id="@+id/side_menu_button"
@@ -18,7 +19,9 @@
 			android:layout_alignParentLeft="true"
 			android:layout_centerInParent="true"
 			android:contentDescription="@string/content_description_menu"
-			android:padding="10dp"
+			android:paddingBottom="6.7dp"
+			android:paddingLeft="10dp"
+			android:paddingTop="6.7dp"
 			android:src="@drawable/menu_burger"/>
 
 		<ImageView
@@ -33,25 +36,34 @@
 			android:visibility="invisible"/>
 
 		<ImageView
-			android:id="@+id/status_led"
-			android:layout_width="20dp"
-			android:layout_height="wrap_content"
+			android:id="@+id/logo_app"
+			android:layout_width="18dp"
+			android:layout_height="18dp"
 			android:layout_centerInParent="true"
-			android:layout_toRightOf="@id/side_menu_button"
+			android:layout_toLeftOf="@id/status_text"
 			android:adjustViewBounds="true"
-			android:paddingLeft="5dp"
-			android:src="@drawable/led_disconnected"/>
+			android:src="@drawable/linphone_notification_icon"/>
 
 		<TextView
 			android:id="@+id/status_text"
-			style="@style/font16"
 			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:layout_centerVertical="true"
-			android:layout_toRightOf="@id/status_led"
+			android:layout_height="30dp"
+			android:layout_centerInParent="true"
 			android:gravity="center_vertical"
-			android:paddingLeft="5dp"
-			android:text="@string/status_not_connected"/>
+			android:lineSpacingExtra="0sp"
+			android:text="@string/app_name"
+			android:textColor="#ffffff"
+			android:textSize="13.3sp"/>
+
+		<ImageView
+			android:id="@+id/status_led"
+			android:layout_width="30dp"
+			android:layout_height="wrap_content"
+			android:layout_alignParentEnd="true"
+			android:gravity="end"
+			android:layout_alignParentTop="true"
+			android:adjustViewBounds="true"
+			android:src="@drawable/led_disconnected"/>
 
 		<ImageView
 			android:id="@+id/voicemail"
diff --git a/res/layout/zrtp_dialog.xml b/res/layout/zrtp_dialog.xml
index 33ba216eb..db01e3f8c 100644
--- a/res/layout/zrtp_dialog.xml
+++ b/res/layout/zrtp_dialog.xml
@@ -5,7 +5,7 @@
 	android:layout_height="wrap_content"
 	android:background="@color/colorB"
 	android:orientation="vertical" >
-	
+
 	<TextView
 		android:id="@+id/toastMessage"
 		android:textColor="@android:color/black"
@@ -17,7 +17,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal">
-		
+
 		<ImageView
 		   android:id="@+id/toastNotOK"
 		   android:src="@drawable/security_pending"
@@ -27,7 +27,7 @@
 		   android:adjustViewBounds="true"
 		   android:layout_width="match_parent"
 		   android:layout_height="wrap_content" />
-		
+
 		<ImageView
 		   android:id="@+id/toastOK"
 		   android:src="@drawable/security_ok"
@@ -37,7 +37,7 @@
 		   android:adjustViewBounds="true"
 		   android:layout_width="match_parent"
 		   android:layout_height="wrap_content" />
-	
+
 	</LinearLayout>
 
 </LinearLayout>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d252e8878..90418d88f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Custom-->
-  <string name="app_name">Linphone</string>
-  <string name="service_name">Linphone Service</string>
-  <string name="addressbook_label">Linphone</string>
-  <string name="notification_title">Linphone</string>
+  <string name="app_name">Mobile Security Intense</string>
+  <string name="service_name">Mobile Security Intense Service</string>
+  <string name="addressbook_label">Mobile Security Intense</string>
+  <string name="notification_title">Mobile Security Intense</string>
   <string name="wait_dialog_text">Démarrage</string>
   <string name="notification_registered">%s enregistré</string>
   <string name="notification_register_failure">%s n\'a pas pu s\'enregistrer</string>
   <string name="tunnel_host"></string>
-  <string name="about_version">Linphone Android %s</string>
-  <string name="about_liblinphone_version">Linphone Core %s</string>
+  <string name="about_version">Mobile Security Intense Version %s</string>
+  <string name="about_liblinphone_version">Mobile Security Intense Core %s</string>
   <string name="about_text">GNU General Public License V2\n © 2010-2017 Belledonne Communications</string>
   <string name="about_link">www.linphone.org</string>
-  <string name="sync_account_name">contacts linphone</string>
+  <string name="sync_account_name">contacts Mobile Security Intense</string>
   <!--Common-->
   <string name="username">Nom d\'utilisateur</string>
   <string name="phone_number">Numéro de téléphone</string>
diff --git a/res/values/color.xml b/res/values/color.xml
index 7b0f80064..5554b2e92 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorA">#ff6600</color>
-    <color name="colorB">#ffe8d9</color>
-    <color name="colorC">#595959</color>
-    <color name="colorD">#595959</color>
-    <color name="colorE">#aeaeae</color>
-    <color name="colorF">#000000</color>
-    <color name="colorG">#ffffff</color>
-    <color name="colorH">#f1f1f1</color>
-    <color name="colorI">#f5a623</color>
-    <color name="colorJ">#7ed321</color>
-    <color name="colorK">#444444</color>
+    <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="colorL">#96c11f</color>
-    <color name="colorM">#3eb5c0</color>
+    <color name="colorM">#f1f1f1</color>
+    <color name="colorN">#ff6600</color>
     <color name="notification_color_led">#FF8000</color>
 
     <color name="transparent">#00000000</color>
+
+    <color name="yellow">#fecf33</color>
+    <color name="light_orange">#fdbd39</color>
+    <color name="peach">#ee6723</color>
 </resources>
diff --git a/res/values/digit_style.xml b/res/values/digit_style.xml
index de1ecbe02..48ae2403b 100644
--- a/res/values/digit_style.xml
+++ b/res/values/digit_style.xml
@@ -1,10 +1,10 @@
 <?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_height">50dp</item>
+		<item name="android:layout_width">65dp</item>
+		<item name="android:layout_height">65dp</item>
 		<item name="android:textColor">@android:color/transparent</item>
-		<item name="android:textSize">20sp</item>
+		<item name="android:textSize">25sp</item>
 		<item name="android:layout_margin">25dp</item>
 	</style>
 
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index d2a5c766a..8e8b4cfe9 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -10,16 +10,16 @@
 	<bool name="orientation_portrait_only">false</bool>
 	<bool name="show_statusbar_only_on_dialer">false</bool>
 	<bool name="force_use_of_linphone_friends">false</bool>
-	<bool name="use_linphone_tag">true</bool>
+	<bool name="use_linphone_tag">false</bool>
 
 	<!-- Time -->
 	<string name="history_date_format">EEE, d MMM</string>
 	<string name="history_detail_date_format">yyyy/MM/dd - HH:mm - </string>
 	<string name="inapp_popup_date_format">yyyy/MM/dd</string>
 	<string name="inapp_popup_date_day">dd</string>
-	<string name="messages_date_format">dd/MM, HH:mm</string>
+	<string name="messages_date_format">yyyy/dd</string>
 	<string name="messages_list_date_format">dd/MM</string>
-	<string name="today_date_format">HH:mm</string>
+	<string name="today_date_format">dd/MM - HH:mm</string>
 
 	<!-- Phone numbers -->
 	<bool name="use_phone_number_validation">true</bool><!-- Use phone number for validation -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 947104395..4db7563df 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12,7 +12,7 @@
     <string name="tunnel_host"></string>
     <string name="about_version">Mobile Security Intense Version %s</string>
     <string name="about_liblinphone_version">Mobile Security Intense Core %s</string>
-    <string name="about_text">GNU General Public License V2\n © 2010-2017 Belledonne Communications</string>
+    <string name="about_text">GNU General Public License V2\n © 2010-2018 Belledonne Communications</string>
     <string name="about_link">www.linphone.org</string>
     <string name="sync_account_name">Mobile Security Intense contacts</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5afad826a..512ba9a51 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -58,8 +58,9 @@
 	</style>
 
 	<style name="font8" parent="@android:style/TextAppearance.Medium">
-		<item name="android:textColor">@color/colorG</item>
-		<item name="android:textSize">22sp</item>
+		<item name="android:textColor">@color/colorC</item>
+		<item name="android:textAllCaps">true</item>
+		<item name="android:textSize">16sp</item>
 	</style>
 
 	<style name="font9" parent="@android:style/TextAppearance.Small">
@@ -88,23 +89,23 @@
 	</style>
 
 	<style name="font14" parent="@android:style/TextAppearance.Small">
-		<item name="android:textColor">@color/colorG</item>
+		<item name="android:textColor">@color/colorH</item>
 		<item name="android:textSize">21sp</item>
 	</style>
 
 	<style name="font15" parent="@android:style/TextAppearance.Small">
-		<item name="android:textColor">@color/colorG</item>
+		<item name="android:textColor">@color/colorH</item>
 		<item name="android:textAllCaps">true</item>
 		<item name="android:textSize">16sp</item>
 	</style>
 
 	<style name="font16" parent="@android:style/TextAppearance.Small">
-		<item name="android:textColor">@color/colorG</item>
+		<item name="android:textColor">@color/colorH</item>
 		<item name="android:textSize">15sp</item>
 	</style>
 
 	<style name="font17" parent="@android:style/TextAppearance.Small">
-		<item name="android:textColor">@color/colorG</item>
+		<item name="android:textColor">@color/colorH</item>
 		<item name="android:textStyle">bold</item>
 		<item name="android:textSize">13sp</item>
 	</style>
@@ -156,27 +157,34 @@
 		<item name="android:textStyle">bold</item>
 	</style>
 
-    <style name="font26" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorD</item>
-        <item name="android:textSize">12sp</item>
-    </style>
+	<style name="font26" parent="@android:style/TextAppearance.Medium">
+		<item name="android:textColor">@color/colorD</item>
+		<item name="android:textSize">12sp</item>
+	</style>
 
-    <style name="font27" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorK</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
+	<style name="font27" parent="@android:style/TextAppearance.Medium">
+		<item name="android:textColor">@color/colorK</item>
+		<item name="android:textSize">15sp</item>
+		<item name="android:textStyle">bold</item>
+	</style>
 
-    <style name="font28" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorD</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
+	<style name="font28" parent="@android:style/TextAppearance.Medium">
+		<item name="android:textColor">@color/colorD</item>
+		<item name="android:textSize">15sp</item>
+		<item name="android:textStyle">bold</item>
+	</style>
 
-    <style name="font29" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textColor">@color/colorI</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
+	<style name="font29" parent="@android:style/TextAppearance.Medium">
+		<item name="android:textColor">@color/colorI</item>
+		<item name="android:textSize">15sp</item>
+		<item name="android:textStyle">bold</item>
+	</style>
+
+	<style name="Header">
+		<item name="android:textSize">8sp</item>
+		<item name="android:fontFamily">sans-serif</item>
+		<item name="android:textStyle">normal</item>
+		<item name="android:textColor">#574751</item>
+	</style>
 
 </resources>
\ No newline at end of file
diff --git a/src/android/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java
index 2391e4b7f..aeed8ea39 100644
--- a/src/android/org/linphone/LinphoneUtils.java
+++ b/src/android/org/linphone/LinphoneUtils.java
@@ -64,6 +64,7 @@ import org.linphone.core.LogLevel;
 import org.linphone.core.LoggingService;
 import org.linphone.core.LoggingServiceListener;
 import org.linphone.core.ProxyConfig;
+import org.linphone.core.RegistrationState;
 import org.linphone.mediastream.Log;
 import org.linphone.mediastream.video.capture.hwconf.Hacks;
 
@@ -206,11 +207,11 @@ public final class LinphoneUtils {
 			cal.setTimeInMillis(timestamp * 1000); // Core returns timestamps in seconds...
 
 			SimpleDateFormat dateFormat;
-			if (isToday(cal)) {
+			/*if (isToday(cal)) {
 				dateFormat = new SimpleDateFormat(context.getResources().getString(R.string.today_date_format), Locale.getDefault());
-			} else {
+			} else {*/
 				dateFormat = new SimpleDateFormat(format, Locale.getDefault());
-			}
+			//}
 
 			return dateFormat.format(cal.getTime());
 		} catch (NumberFormatException nfe) {
@@ -598,6 +599,24 @@ public final class LinphoneUtils {
 		}
 	}
 
+	public static String getTextFromRegistrationStatement(Context ctxt, ProxyConfig prx) {
+		try {
+			if (prx.getState() == RegistrationState.Ok) {
+				return ctxt.getString(R.string.status_connected);
+			} else if (prx.getState() == RegistrationState.Progress) {
+				return ctxt.getString(R.string.status_in_progress);
+			} else if (prx.getState() == RegistrationState.Failed) {
+				return ctxt.getString(R.string.status_error);
+			} else {
+				return ctxt.getString(R.string.status_not_connected);
+			}
+		} catch (Exception e) {
+			Log.e(e);
+		}
+
+		return ctxt.getString(R.string.status_not_connected);
+	}
+
 
 	/************************************************************************************************
 	 *							Picasa/Photos management workaround									*
diff --git a/src/android/org/linphone/activities/LinphoneActivity.java b/src/android/org/linphone/activities/LinphoneActivity.java
index 16362fd33..4ced21cb8 100644
--- a/src/android/org/linphone/activities/LinphoneActivity.java
+++ b/src/android/org/linphone/activities/LinphoneActivity.java
@@ -125,6 +125,8 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
+import static org.linphone.LinphoneUtils.getTextFromRegistrationStatement;
+
 
 public class LinphoneActivity extends LinphoneGenericActivity implements OnClickListener, ContactPicked, ActivityCompat.OnRequestPermissionsResultCallback {
 	public static final String PREF_FIRST_LAUNCH = "pref_first_launch";
@@ -143,6 +145,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 	private TextView missedCalls, missedChats;
 	private ImageView contacts, history, dialer, chat;
 	private RelativeLayout mTopBar;
+	private View contacts_selected, history_selected, dialer_selected, chat_selected;
 	private ImageView cancel;
 	private FragmentsAvailable pendingFragmentTransaction, currentFragment, leftFragment;
 	private Fragment fragment;
@@ -326,6 +329,11 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 
 		missedCalls = (TextView) findViewById(R.id.missed_calls);
 		missedChats = (TextView) findViewById(R.id.missed_chats);
+
+		history_selected = findViewById(R.id.history_select);
+		contacts_selected = findViewById(R.id.contacts_select);
+		dialer_selected = findViewById(R.id.dialer_select);
+		chat_selected = findViewById(R.id.chat_select);
 	}
 
 	public boolean isTablet() {
@@ -573,7 +581,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 	}
 
 	public void displayHistoryDetail(String sipUri, CallLog log) {
-		Address lAddress = null;
+		Address lAddress;
 		LinphoneContact c = null;
 
 		lAddress = Factory.instance().createAddress(sipUri);
@@ -584,19 +592,24 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 		String displayName = c != null ? c.getFullName() : LinphoneUtils.getAddressDisplayName(sipUri);
 		String pictureUri = c != null && c.getPhotoUri() != null ? c.getPhotoUri().toString() : null;
 
-		String status;
-		if (log.getDir() == Call.Dir.Outgoing) {
-			status = getString(R.string.outgoing);
-		} else {
-			if (log.getStatus() == Call.Status.Missed) {
-				status = getString(R.string.missed);
-			} else {
-				status = getString(R.string.incoming);
-			}
-		}
+		String status = "";
+		String callTime = "";
+		String callDate = "";
 
-		String callTime = secondsToDisplayableString(log.getDuration());
-		String callDate = String.valueOf(log.getStartDate());
+		if (log != null) {
+			if (log.getDir() == Call.Dir.Outgoing) {
+				status = getString(R.string.outgoing);
+			} else {
+				if (log.getStatus() == Call.Status.Missed) {
+					status = getString(R.string.missed);
+				} else {
+					status = getString(R.string.incoming);
+				}
+			}
+
+			callTime = secondsToDisplayableString(log.getDuration());
+			callDate = String.valueOf(log.getStartDate());
+		}
 
 		Fragment fragment2 = getFragmentManager().findFragmentById(R.id.fragmentContainer2);
 		if (fragment2 != null && fragment2.isVisible() && currentFragment == FragmentsAvailable.HISTORY_DETAIL) {
@@ -729,6 +742,9 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 				extras.putString("messageDraft", shareInfos.getString("messageDraft"));
 		}
 
+		LinphoneManager.getInstance().updateUnreadCountForChatRoom(sipUri, 0);
+		displayMissedChats(LinphoneManager.getInstance().getUnreadMessageCount());
+
 		if (isTablet()) {
 			Fragment fragment2 = getFragmentManager().findFragmentById(R.id.fragmentContainer2);
 			if (fragment2 != null && fragment2.isVisible() && currentFragment == FragmentsAvailable.GROUP_CHAT && !emptyFragment) {
@@ -740,9 +756,6 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 		} else {
 			changeCurrentFragment(FragmentsAvailable.GROUP_CHAT, extras);
 		}
-
-		LinphoneManager.getInstance().updateUnreadCountForChatRoom(sipUri, 0);
-		displayMissedChats(LinphoneManager.getInstance().getUnreadMessageCount());
 	}
 
 	public void goToChatGroupInfos(String address, ArrayList<ContactAddress> contacts, String subject, boolean isEditionEnabled, boolean isGoBack, Bundle shareInfos) {
@@ -826,18 +839,26 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 
 		if (id == R.id.history_image) {
 			changeCurrentFragment(FragmentsAvailable.HISTORY_LIST, null);
-			history.setImageResource(R.drawable.footer_history_selected);
+			//history.setImageResource(R.drawable.footer_history_selected);
+			history.setAlpha(1f);
+			history_selected.setVisibility(View.VISIBLE);
 			LinphoneManager.getLc().resetMissedCallsCount();
 			displayMissedCalls(0);
 		} else if (id == R.id.contacts) {
 			changeCurrentFragment(FragmentsAvailable.CONTACTS_LIST, null);
-			contacts.setImageResource(R.drawable.footer_contacts_selected);
+			//contacts.setImageResource(R.drawable.footer_contacts_selected);
+			contacts.setAlpha(1f);
+			contacts_selected.setVisibility(View.VISIBLE);
 		} else if (id == R.id.dialer) {
 			changeCurrentFragment(FragmentsAvailable.DIALER, null);
-			dialer.setImageResource(R.drawable.footer_dialer_selected);
+			//dialer.setImageResource(R.drawable.footer_dialer_selected);
+			dialer.setAlpha(1f);
+			dialer_selected.setVisibility(View.VISIBLE);
 		} else if (id == R.id.chat_image) {
 			changeCurrentFragment(FragmentsAvailable.CHAT_LIST, null);
-			chat.setImageResource(R.drawable.footer_chat_selected);
+			//chat.setImageResource(R.drawable.footer_chat_selected);
+			chat.setAlpha(1f);
+			chat_selected.setVisibility(View.VISIBLE);
 		} else if (id == R.id.cancel){
 			hideTopBar();
 			displayDialer();
@@ -845,10 +866,19 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 	}
 
 	private void resetSelection() {
+		history.setAlpha(0.5f);
+		contacts.setAlpha(0.5f);
+		dialer.setAlpha(0.5f);
+		chat.setAlpha(0.5f);
 		history.setImageResource(R.drawable.footer_history);
 		contacts.setImageResource(R.drawable.footer_contacts);
 		dialer.setImageResource(R.drawable.footer_dialer);
 		chat.setImageResource(R.drawable.footer_chat);
+
+		if (history_selected != null) history_selected.setVisibility(View.GONE);
+		if (contacts_selected != null) contacts_selected.setVisibility(View.GONE);
+		if (dialer_selected != null) dialer_selected.setVisibility(View.GONE);
+		if (chat_selected != null) chat_selected.setVisibility(View.GONE);
 	}
 
 	public void hideTabBar(Boolean hide) {
@@ -871,15 +901,21 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 		switch (menuToSelect) {
 		case HISTORY_LIST:
 		case HISTORY_DETAIL:
-			history.setImageResource(R.drawable.footer_history_selected);
+			//history.setImageResource(R.drawable.footer_history_selected);
+			history.setAlpha(1f);
+			history_selected.setVisibility(View.VISIBLE);
 			break;
 		case CONTACTS_LIST:
-			contacts.setImageResource(R.drawable.footer_contacts_selected);
+			//contacts.setImageResource(R.drawable.footer_contacts_selected);
+			contacts.setAlpha(1f);
+			contacts_selected.setVisibility(View.VISIBLE);
 			case CONTACT_DETAIL:
 			case CONTACT_EDITOR:
 			break;
 		case DIALER:
-			dialer.setImageResource(R.drawable.footer_dialer_selected);
+			//dialer.setImageResource(R.drawable.footer_dialer_selected);
+			dialer.setAlpha(1f);
+			dialer_selected.setVisibility(View.VISIBLE);
 			break;
 		case SETTINGS:
 		case ACCOUNT_SETTINGS:
@@ -889,13 +925,15 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 		case ABOUT:
 			hideTabBar(true);
 			break;
-		case CHAT_LIST:
 		case CREATE_CHAT:
 		case GROUP_CHAT:
 		case INFO_GROUP_CHAT:
 		case MESSAGE_IMDN:
 		case CHAT:
-			chat.setImageResource(R.drawable.footer_chat_selected);
+		case CHAT_LIST:
+			//chat.setImageResource(R.drawable.footer_chat_selected);
+			chat.setAlpha(1f);
+			chat_selected.setVisibility(View.VISIBLE);
 			break;
 		}
 	}
@@ -1657,7 +1695,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 
 	private void displayMainAccount(){
 		defaultAccount.setVisibility(View.VISIBLE);
-		ImageView status = (ImageView) defaultAccount.findViewById(R.id.main_account_status);
+		//ImageView status = (ImageView) defaultAccount.findViewById(R.id.main_account_status);
 		TextView address = (TextView) defaultAccount.findViewById(R.id.main_account_address);
 		TextView displayName = (TextView) defaultAccount.findViewById(R.id.main_account_display_name);
 
@@ -1665,23 +1703,23 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 		ProxyConfig proxy = LinphoneManager.getLc().getDefaultProxyConfig();
 		if(proxy == null) {
 			displayName.setText(getString(R.string.no_account));
-			status.setVisibility(View.GONE);
-			address.setText("");
+			//status.setVisibility(View.GONE);
+			address.setText(getTextFromRegistrationStatement(this, proxy));
 			statusFragment.resetAccountStatus();
 			LinphoneManager.getInstance().subscribeFriendList(false);
 
 			defaultAccount.setOnClickListener(null);
 		} else {
-			address.setText(proxy.getIdentityAddress().asStringUriOnly());
+			address.setText(getTextFromRegistrationStatement(this, proxy));
 			displayName.setText(LinphoneUtils.getAddressDisplayName(proxy.getIdentityAddress()));
-			status.setImageResource(getStatusIconResource(proxy.getState()));
-			status.setVisibility(View.VISIBLE);
+			//status.setImageResource(getStatusIconResource(proxy.getState()));
+			//status.setVisibility(View.VISIBLE);
 
 			defaultAccount.setOnClickListener(new OnClickListener() {
 				@Override
 				public void onClick(View view) {
-					LinphoneActivity.instance().displayAccountSettings(LinphonePreferences.instance().getDefaultAccountIndex());
-					openOrCloseSideMenu(false);
+					//LinphoneActivity.instance().displayAccountSettings(LinphonePreferences.instance().getDefaultAccountIndex());
+					//openOrCloseSideMenu(false);
 				}
 			});
 		}
diff --git a/src/android/org/linphone/chat/ChatBubbleViewHolder.java b/src/android/org/linphone/chat/ChatBubbleViewHolder.java
index 0977a0a3a..5b6159b3e 100644
--- a/src/android/org/linphone/chat/ChatBubbleViewHolder.java
+++ b/src/android/org/linphone/chat/ChatBubbleViewHolder.java
@@ -50,6 +50,7 @@ public class ChatBubbleViewHolder {
 	public TextView imdmLabel;
 
 	public TextView messageText;
+	public TextView messageDate;
 	public ImageView messageImage;
 
 	public RelativeLayout fileTransferLayout;
@@ -79,6 +80,7 @@ public class ChatBubbleViewHolder {
 	    imdmLabel = view.findViewById(R.id.imdmText);
 
 	    messageText = view.findViewById(R.id.message);
+		messageDate = view.findViewById(R.id.message_date);
 	    messageImage = view.findViewById(R.id.image);
 
 	    fileTransferLayout = view.findViewById(R.id.file_transfer_layout);
diff --git a/src/android/org/linphone/chat/ChatCreationFragment.java b/src/android/org/linphone/chat/ChatCreationFragment.java
index 13b9c75d2..3732a7470 100644
--- a/src/android/org/linphone/chat/ChatCreationFragment.java
+++ b/src/android/org/linphone/chat/ChatCreationFragment.java
@@ -49,6 +49,7 @@ import org.linphone.core.ChatRoomListenerStub;
 import org.linphone.core.Core;
 import org.linphone.core.Factory;
 import org.linphone.core.ProxyConfig;
+import org.linphone.fragments.FragmentsAvailable;
 import org.linphone.mediastream.Log;
 import org.linphone.ui.ContactSelectView;
 import org.linphone.contacts.ContactsUpdatedListener;
@@ -83,6 +84,7 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
 		mInflater = inflater;
 		View view = inflater.inflate(R.layout.chat_create, container, false);
 
+		LinphoneActivity.instance().hideTabBar(true);
 		mContactsSelected = new ArrayList<>();
 		mChatRoomSubject = null;
 		mChatRoomAddress = null;
@@ -215,6 +217,10 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
 		if (getActivity().getCurrentFocus() != null) {
 			inputMethodManager.hideSoftInputFromWindow(getActivity().getCurrentFocus().getWindowToken(), 0);
 		}
+
+		if (LinphoneActivity.isInstanciated()) {
+			LinphoneActivity.instance().selectMenu(FragmentsAvailable.CREATE_CHAT);
+		}
 	}
 
 	@Override
diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 509d9b246..87e16d7d5 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -185,9 +185,9 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
 	    holder.fileTransferAction.setEnabled(true);
 	    holder.fileName.setVisibility(View.GONE);
 	    holder.openFileButton.setVisibility(View.GONE);
-	    holder.messageStatus.setVisibility(View.INVISIBLE);
+	    holder.messageStatus.setVisibility(View.GONE);
 	    holder.messageSendingInProgress.setVisibility(View.GONE);
-	    holder.imdmLayout.setVisibility(View.INVISIBLE);
+	    holder.imdmLayout.setVisibility(View.GONE);
 	    holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
 
 	    if (isEditionEnabled()) {
@@ -219,10 +219,10 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
 				    holder.messageSendingInProgress.setVisibility(View.VISIBLE);
 			    }
 
-			    if (!message.isSecured() && LinphoneManager.getLc().limeEnabled() == LimeState.Mandatory && status != ChatMessage.State.InProgress) {
+			    /*if (!message.isSecured() && LinphoneManager.getLc().limeEnabled() == LimeState.Mandatory && status != ChatMessage.State.InProgress) {
 				    holder.messageStatus.setVisibility(View.VISIBLE);
 				    holder.messageStatus.setImageResource(R.drawable.chat_unsecure);
-			    }
+			    }*/
 
 			    if (status == ChatMessage.State.Delivered) {
 				    /*holder.imdmLayout.setVisibility(View.VISIBLE);
@@ -259,8 +259,9 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
 				    layoutParams.setMargins(100, 10, 10, 10);
 			    }
 
-			    holder.background.setBackgroundResource(R.drawable.resizable_chat_bubble_outgoing);
-			    Compatibility.setTextAppearance(holder.contactName, mContext, R.style.font3);
+			    holder.background.setBackgroundColor(0x26ff6600);
+			    //Compatibility.setTextAppearance(holder.contactName, mContext, R.style.font3);
+			    holder.contactName.setVisibility(View.GONE);
 			    Compatibility.setTextAppearance(holder.fileTransferAction, mContext, R.style.font15);
 			    holder.fileTransferAction.setBackgroundResource(R.drawable.resizable_confirm_delete_button);
 			    holder.contactPictureMask.setImageResource(R.drawable.avatar_chat_mask_outgoing);
@@ -280,8 +281,9 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
 				    layoutParams.setMargins(10, 10, 100, 10);
 			    }
 
-			    holder.background.setBackgroundResource(R.drawable.resizable_chat_bubble_incoming);
-			    Compatibility.setTextAppearance(holder.contactName, mContext, R.style.font9);
+			    holder.background.setBackgroundColor(0x19595959);
+			    //Compatibility.setTextAppearance(holder.contactName, mContext, R.style.font9);
+			    holder.contactName.setVisibility(View.VISIBLE);
 			    Compatibility.setTextAppearance(holder.fileTransferAction, mContext, R.style.font8);
 			    holder.fileTransferAction.setBackgroundResource(R.drawable.resizable_assistant_button);
 			    holder.contactPictureMask.setImageResource(R.drawable.avatar_chat_mask);
@@ -305,8 +307,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
 			    displayName = LinphoneUtils.getAddressDisplayName(remoteSender);
 			    holder.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
 		    }
-		    holder.contactName.setText(LinphoneUtils.timestampToHumanDate(mContext, message.getTime(), R.string.messages_date_format) + " - " + displayName);
-
+		    holder.contactName.setText(displayName);
 		    if (message.hasTextContent()) {
 			    String msg = message.getTextContent();
 			    Spanned text = LinphoneUtils.getTextWithHttpLinks(msg);
@@ -369,6 +370,8 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
 					}
 				});
 			}
+		    holder.messageDate.setText(LinphoneUtils.timestampToHumanDate(mContext, message.getTime(), R.string.today_date_format));
+		    holder.messageDate.setVisibility(View.VISIBLE);
 
 		    holder.bubbleLayout.setLayoutParams(layoutParams);
 	    } else { // Event is not chat message
diff --git a/src/android/org/linphone/chat/ChatRoomsAdapter.java b/src/android/org/linphone/chat/ChatRoomsAdapter.java
index c916ffdff..a941ea942 100644
--- a/src/android/org/linphone/chat/ChatRoomsAdapter.java
+++ b/src/android/org/linphone/chat/ChatRoomsAdapter.java
@@ -61,6 +61,7 @@ public class ChatRoomsAdapter extends ListSelectionAdapter {
 		public TextView unreadMessages;
 		public CheckBox delete;
 		public ImageView contactPicture;
+		public ImageView messageStatus;
 
 		public ChatRoomViewHolder(View view) {
 			lastMessageSenderView = view.findViewById(R.id.lastMessageSender);
@@ -70,6 +71,7 @@ public class ChatRoomsAdapter extends ListSelectionAdapter {
 			unreadMessages = view.findViewById(R.id.unreadMessages);
 			delete = view.findViewById(R.id.delete_chatroom);
 			contactPicture = view.findViewById(R.id.contact_picture);
+			messageStatus = view.findViewById(R.id.lastMessageStatus);
 		}
 	}
 
@@ -84,8 +86,8 @@ public class ChatRoomsAdapter extends ListSelectionAdapter {
 		mContext = context;
 		mLayoutInflater = inflater;
 		mRooms = new ArrayList<>();
-		mDefaultBitmap = ContactsManager.getInstance().getDefaultAvatarBitmap();
-		mDefaultGroupBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.chat_group_avatar);
+		mDefaultBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.avatar_big_secure1);
+		mDefaultGroupBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.avatar_group_small_unregistered);
 
 		mListener = new ChatRoomListenerStub() {
 			@Override
@@ -176,12 +178,31 @@ public class ChatRoomsAdapter extends ListSelectionAdapter {
 				holder.lastMessageView.setText(lastMessage.getTextContent());
 			}
 
-			Address lastMessageSenderAddress = lastMessage.getFromAddress();
-			LinphoneContact contact = ContactsManager.getInstance().findContactFromAddress(lastMessageSenderAddress);
-			if (contact != null) {
-				holder.lastMessageSenderView.setText(contact.getFullName() + mContext.getString(R.string.separator));
+			if (lastMessage.isOutgoing()) {
+				holder.messageStatus.setVisibility(View.VISIBLE);
+				holder.lastMessageSenderView.setVisibility(View.GONE);
+				if (lastMessage.getState().toInt() == ChatMessage.State.Delivered.toInt() ||
+						lastMessage.getState().toInt() == ChatMessage.State.DeliveredToUser.toInt() ||
+						lastMessage.getState().toInt() == ChatMessage.State.FileTransferDone.toInt()) {
+					holder.messageStatus.setImageResource(R.drawable.message_delivered);
+				} else if (lastMessage.getState().toInt() == ChatMessage.State.Displayed.toInt()) {
+					holder.messageStatus.setImageResource(R.drawable.message_read);
+				} else if (lastMessage.getState().toInt() == ChatMessage.State.Idle.toInt() ||
+						lastMessage.getState().toInt() == ChatMessage.State.InProgress.toInt()) {
+					holder.messageStatus.setImageResource(R.drawable.chat_message_inprogress);
+				} else {
+					holder.messageStatus.setImageResource(R.drawable.message_undelivered);
+				}
 			} else {
-				holder.lastMessageSenderView.setText(LinphoneUtils.getAddressDisplayName(lastMessageSenderAddress) +  mContext.getString(R.string.separator));
+				Address lastMessageSenderAddress = lastMessage.getFromAddress();
+				LinphoneContact contact = ContactsManager.getInstance().findContactFromAddress(lastMessageSenderAddress);
+				holder.lastMessageSenderView.setVisibility(View.VISIBLE);
+				holder.messageStatus.setVisibility(View.GONE);
+				if (contact != null) {
+					holder.lastMessageSenderView.setText(contact.getFullName() + mContext.getString(R.string.separator));
+				} else {
+					holder.lastMessageSenderView.setText(LinphoneUtils.getAddressDisplayName(lastMessageSenderAddress) + mContext.getString(R.string.separator));
+				}
 			}
 		}
 
@@ -194,7 +215,7 @@ public class ChatRoomsAdapter extends ListSelectionAdapter {
 				contact = ContactsManager.getInstance().findContactFromAddress(chatRoom.getParticipants()[0].getAddress());
 				if (contact != null) {
 					holder.displayName.setText(contact.getFullName());
-					LinphoneUtils.setThumbnailPictureFromUri(LinphoneActivity.instance(), holder.contactPicture, contact.getThumbnailUri());
+					//LinphoneUtils.setThumbnailPictureFromUri(LinphoneActivity.instance(), holder.contactPicture, contact.getThumbnailUri());
 				} else {
 					holder.displayName.setText(LinphoneUtils.getAddressDisplayName(chatRoom.getParticipants()[0].getAddress()));
 				}
@@ -202,14 +223,22 @@ public class ChatRoomsAdapter extends ListSelectionAdapter {
 				contact = ContactsManager.getInstance().findContactFromAddress(contactAddress);
 				if (contact != null) {
 					holder.displayName.setText(contact.getFullName());
-					LinphoneUtils.setThumbnailPictureFromUri(LinphoneActivity.instance(), holder.contactPicture, contact.getThumbnailUri());
+					//LinphoneUtils.setThumbnailPictureFromUri(LinphoneActivity.instance(), holder.contactPicture, contact.getThumbnailUri());
 				} else {
 					holder.displayName.setText(LinphoneUtils.getAddressDisplayName(contactAddress));
 				}
 			}
+
+			if (chatRoom.limeAvailable()) {
+				holder.contactPicture.setImageResource(R.drawable.avatar_big_secure2);
+			}
 		} else {
 			holder.displayName.setText(chatRoom.getSubject());
-			holder.contactPicture.setImageBitmap(mDefaultGroupBitmap);
+			if (chatRoom.limeAvailable()) {
+				holder.contactPicture.setImageResource(R.drawable.avatar_group_small_secure2);
+			} else {
+				holder.contactPicture.setImageBitmap(mDefaultGroupBitmap);
+			}
 		}
 
 		if (unreadMessagesCount > 0) {
@@ -239,6 +268,7 @@ public class ChatRoomsAdapter extends ListSelectionAdapter {
 			holder.delete.setChecked(getSelectedItemsPosition().contains(position));
 			holder.delete.setTag(position);
 			holder.delete.setOnCheckedChangeListener(getDeleteListener());
+			holder.date.setVisibility(View.GONE);
 		} else {
 			view.setOnClickListener(new View.OnClickListener() {
 				@Override
@@ -248,6 +278,7 @@ public class ChatRoomsAdapter extends ListSelectionAdapter {
 				}
 			});
 			holder.delete.setVisibility(isEditionEnabled() ? View.VISIBLE : View.GONE);
+			holder.date.setVisibility(View.VISIBLE);
 		}
 		return view;
 	}
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index b8792d393..e40b66019 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -75,6 +75,7 @@ import org.linphone.core.LimeState;
 import org.linphone.core.Participant;
 import org.linphone.contacts.ContactsUpdatedListener;
 import org.linphone.core.Reason;
+import org.linphone.fragments.FragmentsAvailable;
 import org.linphone.mediastream.Log;
 import org.linphone.ui.ListSelectionHelper;
 
@@ -119,6 +120,8 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 		mInflater = inflater;
 		View view = inflater.inflate(R.layout.chat, container, false);
 
+		LinphoneActivity.instance().hideTabBar(true);
+
 		mSelectionHelper = new ListSelectionHelper(view, this);
 
 		mBackButton = view.findViewById(R.id.back);
@@ -241,9 +244,6 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 	public void onResume() {
 		super.onResume();
 
-		if (LinphoneActivity.isInstanciated()) {
-			LinphoneActivity.instance().selectMenu(CHAT);
-		}
 		ContactsManager.addContactsListener(this);
 
 		addVirtualKeyboardVisiblityListener();
@@ -521,7 +521,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 			mBackToCallButton.setVisibility(View.VISIBLE);
 		} else {
 			mBackToCallButton.setVisibility(View.GONE);
-			if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
+			if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt()) || mChatRoom.getNbParticipants() <= 1) {
 				mCallButton.setVisibility(View.VISIBLE);
 				mGroupInfosButton.setVisibility(View.GONE);
 				mParticipantsLabel.setVisibility(View.GONE);
diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java
index d7906c08c..9134b0698 100644
--- a/src/android/org/linphone/chat/GroupInfoFragment.java
+++ b/src/android/org/linphone/chat/GroupInfoFragment.java
@@ -49,6 +49,7 @@ import org.linphone.core.ChatRoomListener;
 import org.linphone.core.ChatRoomListenerStub;
 import org.linphone.core.EventLog;
 import org.linphone.core.Participant;
+import org.linphone.fragments.FragmentsAvailable;
 import org.linphone.mediastream.Log;
 
 import java.util.ArrayList;
@@ -79,6 +80,8 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
 		mInflater = inflater;
 		View view = inflater.inflate(R.layout.chat_infos, container, false);
 
+		LinphoneActivity.instance().hideTabBar(true);
+
 		if (getArguments() == null || getArguments().isEmpty()) {
 			return null;
 		}
diff --git a/src/android/org/linphone/chat/ImdnFragment.java b/src/android/org/linphone/chat/ImdnFragment.java
index d3ecd797a..b3eb3ab47 100644
--- a/src/android/org/linphone/chat/ImdnFragment.java
+++ b/src/android/org/linphone/chat/ImdnFragment.java
@@ -46,6 +46,7 @@ import org.linphone.core.ChatMessageListenerStub;
 import org.linphone.core.ChatRoom;
 import org.linphone.core.Core;
 import org.linphone.core.ParticipantImdnState;
+import org.linphone.fragments.FragmentsAvailable;
 
 public class ImdnFragment extends Fragment {
 	private LayoutInflater mInflater;
@@ -65,6 +66,8 @@ public class ImdnFragment extends Fragment {
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
+		LinphoneActivity.instance().hideTabBar(true);
+
 		if (getArguments() != null) {
 			mRoomUri = getArguments().getString("SipUri");
 			mRoomAddr = LinphoneManager.getLc().createAddress(mRoomUri);
@@ -113,7 +116,7 @@ public class ImdnFragment extends Fragment {
 		mBubble.fileTransferLayout.setVisibility(View.GONE);
 		mBubble.fileName.setVisibility(View.GONE);
 		mBubble.openFileButton.setVisibility(View.GONE);
-		mBubble.messageStatus.setVisibility(View.INVISIBLE);
+		mBubble.messageStatus.setVisibility(View.GONE);
 		mBubble.messageSendingInProgress.setVisibility(View.GONE);
 		mBubble.imdmLayout.setVisibility(View.INVISIBLE);
 		mBubble.contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
@@ -131,13 +134,13 @@ public class ImdnFragment extends Fragment {
 		layoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
 		layoutParams.setMargins(100, 10, 10, 10);
 		if (mMessage.isOutgoing()) {
-			mBubble.background.setBackgroundResource(R.drawable.resizable_chat_bubble_outgoing);
+			mBubble.background.setBackgroundColor(0x26ff6600);
 			Compatibility.setTextAppearance(mBubble.contactName, getActivity(), R.style.font3);
 			Compatibility.setTextAppearance(mBubble.fileTransferAction, getActivity(), R.style.font15);
 			mBubble.fileTransferAction.setBackgroundResource(R.drawable.resizable_confirm_delete_button);
 			mBubble.contactPictureMask.setImageResource(R.drawable.avatar_chat_mask_outgoing);
 		} else {
-			mBubble.background.setBackgroundResource(R.drawable.resizable_chat_bubble_incoming);
+			mBubble.background.setBackgroundColor(0x19595959);
 			Compatibility.setTextAppearance(mBubble.contactName, getActivity(), R.style.font9);
 			Compatibility.setTextAppearance(mBubble.fileTransferAction, getActivity(), R.style.font8);
 			mBubble.fileTransferAction.setBackgroundResource(R.drawable.resizable_assistant_button);
diff --git a/src/android/org/linphone/contacts/ContactsListFragment.java b/src/android/org/linphone/contacts/ContactsListFragment.java
index 1ff11e1e4..fbe4ec615 100644
--- a/src/android/org/linphone/contacts/ContactsListFragment.java
+++ b/src/android/org/linphone/contacts/ContactsListFragment.java
@@ -383,12 +383,16 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 	@Override
 	public void onItemClick(AdapterView<?> adapter, View view, int position, long id) {
 		LinphoneContact contact = (LinphoneContact) adapter.getItemAtPosition(position);
-		if (editOnClick) {
+		/*if (editOnClick) {
 			editConsumed = true;
 			LinphoneActivity.instance().editContact(contact, sipAddressToAdd);
 		} else {
 			lastKnownPosition = contactsList.getFirstVisiblePosition();
 			LinphoneActivity.instance().displayContact(contact, onlyDisplayChatAddress);
+		}*/
+		// Obiane spec
+		if (LinphoneActivity.isInstanciated() && contact.getNumbersOrAddresses() != null) {
+			LinphoneActivity.instance().displayHistoryDetail(contact.getNumbersOrAddresses().get(0).getValue(), null);
 		}
 	}
 
@@ -517,11 +521,11 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 		}
 
 		public View getView(final int position, View convertView, ViewGroup parent) {
-			View view = null;
 			LinphoneContact contact = (LinphoneContact) getItem(position);
 			if (contact == null) return null;
 
-			ViewHolder holder = null;
+			View view;
+			ViewHolder holder;
 			if (convertView != null) {
 				view = convertView;
 				holder = (ViewHolder) view.getTag();
diff --git a/src/android/org/linphone/contacts/ContactsManager.java b/src/android/org/linphone/contacts/ContactsManager.java
index 0a60449eb..c48ec134a 100644
--- a/src/android/org/linphone/contacts/ContactsManager.java
+++ b/src/android/org/linphone/contacts/ContactsManager.java
@@ -82,7 +82,7 @@ public class ContactsManager extends ContentObserver {
 	private ContactsManager(Handler handler) {
 		super(handler);
 		this.handler = handler;
-		defaultAvatar = BitmapFactory.decodeResource(LinphoneService.instance().getResources(), R.drawable.avatar);
+		defaultAvatar = BitmapFactory.decodeResource(LinphoneService.instance().getResources(), R.drawable.avatar_big_secure1);
 		androidContactsCache = new HashMap<String, LinphoneContact>();
 		contactsUpdatedListeners = new ArrayList<ContactsUpdatedListener>();
 		contacts = new ArrayList<LinphoneContact>();
diff --git a/src/android/org/linphone/fragments/DialerFragment.java b/src/android/org/linphone/fragments/DialerFragment.java
index 30e3a50e5..c45d17fe5 100644
--- a/src/android/org/linphone/fragments/DialerFragment.java
+++ b/src/android/org/linphone/fragments/DialerFragment.java
@@ -74,11 +74,11 @@ public class DialerFragment extends Fragment {
 				mCall.setImageResource(R.drawable.call_add);
 			}
 		} else {
-			if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null && LinphoneManager.getLcIfManagerNotDestroyedOrNull().getVideoActivationPolicy().getAutomaticallyInitiate()) {
+			/*if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null && LinphoneManager.getLcIfManagerNotDestroyedOrNull().getVideoActivationPolicy().getAutomaticallyInitiate()) {
 				mCall.setImageResource(R.drawable.call_video_start);
-			} else {
-				mCall.setImageResource(R.drawable.call_audio_start);
-			}
+			} else {*/
+				mCall.setImageResource(R.drawable.call_alt_start_selected);
+			//}
 		}
 
 		numpad = (AddressAware) view.findViewById(R.id.numpad);
@@ -206,11 +206,11 @@ public class DialerFragment extends Fragment {
 			mAddContact.setImageResource(R.drawable.call_alt_back);
 			mAddContact.setOnClickListener(cancelListener);
 		} else {
-			if (LinphoneManager.getLc().getVideoActivationPolicy().getAutomaticallyInitiate()) {
+			/*if (LinphoneManager.getLc().getVideoActivationPolicy().getAutomaticallyInitiate()) {
 				mCall.setImageResource(R.drawable.call_video_start);
-			} else {
-				mCall.setImageResource(R.drawable.call_audio_start);
-			}
+			} else {*/
+				mCall.setImageResource(R.drawable.call_alt_start_selected);
+			//}
 			mAddContact.setEnabled(false);
 			mAddContact.setImageResource(R.drawable.contact_add_button);
 			mAddContact.setOnClickListener(addContactListener);
diff --git a/src/android/org/linphone/fragments/HistoryDetailFragment.java b/src/android/org/linphone/fragments/HistoryDetailFragment.java
index a1a62063a..0f2eb4efc 100644
--- a/src/android/org/linphone/fragments/HistoryDetailFragment.java
+++ b/src/android/org/linphone/fragments/HistoryDetailFragment.java
@@ -49,7 +49,7 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
 	private ImageView dialBack, chat, addToContacts, goToContact, back;
 	private View view;
 	private ImageView contactPicture, callDirection;
-	private TextView contactName, contactAddress, time, date;
+	private TextView contactName, contactAddress, time, date, callText;
 	private String sipUri, displayName, pictureUri;
 	private RelativeLayout mWaitLayout;
 	private LinphoneContact contact;
@@ -102,7 +102,13 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
 		time = (TextView) view.findViewById(R.id.time);
 		date = (TextView) view.findViewById(R.id.date);
 
-		displayHistory(status, callTime, callDate);
+		callText = (TextView) view.findViewById(R.id.call_text);
+
+		// Obiane spec
+		if (!status.isEmpty() && !callTime.isEmpty() && !callDate.isEmpty()) {
+			displayHistory(status, callTime, callDate);
+			callText.setVisibility(View.VISIBLE);
+		}
 
 		mChatRoomCreationListener = new ChatRoomListenerStub() {
 			@Override
@@ -150,14 +156,14 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener {
 			contact = ContactsManager.getInstance().findContactFromAddress(lAddress);
 			if (contact != null) {
 				contactName.setText(contact.getFullName());
-				LinphoneUtils.setImagePictureFromUri(view.getContext(),contactPicture,contact.getPhotoUri(),contact.getThumbnailUri());
-				addToContacts.setVisibility(View.GONE);
-				goToContact.setVisibility(View.VISIBLE);
+				//LinphoneUtils.setImagePictureFromUri(view.getContext(),contactPicture,contact.getPhotoUri(),contact.getThumbnailUri());
+				//addToContacts.setVisibility(View.GONE);
+				//goToContact.setVisibility(View.VISIBLE);
 			} else {
 				contactName.setText(displayName == null ? LinphoneUtils.getAddressDisplayName(sipUri) : displayName);
-				contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
-				addToContacts.setVisibility(View.VISIBLE);
-				goToContact.setVisibility(View.GONE);
+				//contactPicture.setImageBitmap(ContactsManager.getInstance().getDefaultAvatarBitmap());
+				//addToContacts.setVisibility(View.VISIBLE);
+				//goToContact.setVisibility(View.GONE);
 			}
 		} else {
 			contactAddress.setText(sipUri);
diff --git a/src/android/org/linphone/fragments/StatusFragment.java b/src/android/org/linphone/fragments/StatusFragment.java
index 60c3818b3..64e611cf3 100644
--- a/src/android/org/linphone/fragments/StatusFragment.java
+++ b/src/android/org/linphone/fragments/StatusFragment.java
@@ -53,6 +53,8 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import static org.linphone.LinphoneUtils.getTextFromRegistrationStatement;
+
 public class StatusFragment extends Fragment {
 	private Handler refreshHandler = new Handler();
 	private TextView statusText, voicemailCount;
@@ -88,21 +90,21 @@ public class StatusFragment extends Fragment {
 
 				if(lc.getProxyConfigList() == null){
 					statusLed.setImageResource(R.drawable.led_disconnected);
-					statusText.setText(getString(R.string.no_account));
+					//statusText.setText(getString(R.string.no_account));
 				} else {
 					statusLed.setVisibility(View.VISIBLE);
 				}
 
 				if (lc.getDefaultProxyConfig() != null && lc.getDefaultProxyConfig().equals(proxy)) {
 					statusLed.setImageResource(getStatusIconResource(state, true));
-					statusText.setText(getStatusIconText(state));
+					//statusText.setText(getStatusIconText(state));
 				} else if(lc.getDefaultProxyConfig() == null) {
 					statusLed.setImageResource(getStatusIconResource(state, true));
-					statusText.setText(getStatusIconText(state));
+					//statusText.setText(getStatusIconText(state));
 				}
 
 				try {
-					statusText.setOnClickListener(new OnClickListener() {
+					statusLed.setOnClickListener(new OnClickListener() {
 						@Override
 						public void onClick(View v) {
 							lc.refreshRegisters();
@@ -223,28 +225,14 @@ public class StatusFragment extends Fragment {
 		return R.drawable.led_disconnected;
 	}
 
-	private String getStatusIconText(RegistrationState state) {
+	private String getStatusIconText(ProxyConfig proxy) {
 		Context context = getActivity();
 		if (!isAttached && LinphoneActivity.isInstanciated())
 			context = LinphoneActivity.instance();
 		else if (!isAttached && LinphoneService.isReady())
 			context = LinphoneService.instance();
 
-		try {
-			if (state == RegistrationState.Ok && LinphoneManager.getLcIfManagerNotDestroyedOrNull().getDefaultProxyConfig().getState() == RegistrationState.Ok) {
-				return context.getString(R.string.status_connected);
-			} else if (state == RegistrationState.Progress) {
-				return context.getString(R.string.status_in_progress);
-			} else if (state == RegistrationState.Failed) {
-				return context.getString(R.string.status_error);
-			} else {
-				return context.getString(R.string.status_not_connected);
-			}
-		} catch (Exception e) {
-			Log.e(e);
-		}
-
-		return context.getString(R.string.status_not_connected);
+		return getTextFromRegistrationStatement(context, proxy);
 	}
 
 	//INCALL STATUS BAR
@@ -326,7 +314,7 @@ public class StatusFragment extends Fragment {
 					statusText.setText(getString(R.string.no_account));
 				} else {
 					statusLed.setImageResource(getStatusIconResource(lc.getDefaultProxyConfig().getState(),true));
-					statusText.setText(getStatusIconText(lc.getDefaultProxyConfig().getState()));
+					statusText.setText(getStatusIconText(lc.getDefaultProxyConfig()));
 				}
 			}
 		} else {