diff --git a/res/drawable-xhdpi/add_field_default.png b/res/drawable-xhdpi/add_field_default.png
index 80291fd42..1d0fbdd34 100644
Binary files a/res/drawable-xhdpi/add_field_default.png and b/res/drawable-xhdpi/add_field_default.png differ
diff --git a/res/drawable-xhdpi/add_field_over.png b/res/drawable-xhdpi/add_field_over.png
deleted file mode 100644
index 2a2ce2f74..000000000
Binary files a/res/drawable-xhdpi/add_field_over.png and /dev/null differ
diff --git a/res/drawable-xhdpi/attachment_delete.png b/res/drawable-xhdpi/attachment_delete.png
deleted file mode 100644
index 8c8b89c15..000000000
Binary files a/res/drawable-xhdpi/attachment_delete.png and /dev/null differ
diff --git a/res/drawable-xhdpi/back_disabled.png b/res/drawable-xhdpi/back_disabled.png
deleted file mode 100644
index 0afa9d189..000000000
Binary files a/res/drawable-xhdpi/back_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/call_start_body_default.png b/res/drawable-xhdpi/call_start_body_default.png
deleted file mode 100644
index f2c474a34..000000000
Binary files a/res/drawable-xhdpi/call_start_body_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/call_start_body_disabled.png b/res/drawable-xhdpi/call_start_body_disabled.png
deleted file mode 100644
index 801708d34..000000000
Binary files a/res/drawable-xhdpi/call_start_body_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/call_start_body_over.png b/res/drawable-xhdpi/call_start_body_over.png
deleted file mode 100644
index 9bc6ada2b..000000000
Binary files a/res/drawable-xhdpi/call_start_body_over.png and /dev/null differ
diff --git a/res/drawable-xhdpi/call_start_default.png b/res/drawable-xhdpi/call_start_default.png
new file mode 100644
index 000000000..bcbd2e068
Binary files /dev/null and b/res/drawable-xhdpi/call_start_default.png differ
diff --git a/res/drawable-xhdpi/camera_switch_disabled.png b/res/drawable-xhdpi/camera_switch_disabled.png
deleted file mode 100644
index 2f3d64306..000000000
Binary files a/res/drawable-xhdpi/camera_switch_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/chat_attachment.png b/res/drawable-xhdpi/chat_attachment.png
deleted file mode 100644
index f46b54e12..000000000
Binary files a/res/drawable-xhdpi/chat_attachment.png and /dev/null differ
diff --git a/res/drawable-xhdpi/chat_attachment_default.png b/res/drawable-xhdpi/chat_attachment_default.png
deleted file mode 100644
index 30513f83d..000000000
Binary files a/res/drawable-xhdpi/chat_attachment_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/chat_attachment_over.png b/res/drawable-xhdpi/chat_attachment_over.png
deleted file mode 100644
index c8c75feaf..000000000
Binary files a/res/drawable-xhdpi/chat_attachment_over.png and /dev/null differ
diff --git a/res/drawable-xhdpi/chat_file_default.png b/res/drawable-xhdpi/chat_file_default.png
new file mode 100644
index 000000000..8aa4bbdb4
Binary files /dev/null and b/res/drawable-xhdpi/chat_file_default.png differ
diff --git a/res/drawable-xhdpi/chat_file_over.png b/res/drawable-xhdpi/chat_file_over.png
new file mode 100644
index 000000000..3781846f9
Binary files /dev/null and b/res/drawable-xhdpi/chat_file_over.png differ
diff --git a/res/drawable-xhdpi/chat_message_inprogress.png b/res/drawable-xhdpi/chat_message_inprogress.png
deleted file mode 100644
index f762b2d5e..000000000
Binary files a/res/drawable-xhdpi/chat_message_inprogress.png and /dev/null differ
diff --git a/res/drawable-xhdpi/chat_picture_over.png b/res/drawable-xhdpi/chat_picture_over.png
deleted file mode 100644
index d53230dd0..000000000
Binary files a/res/drawable-xhdpi/chat_picture_over.png and /dev/null differ
diff --git a/res/drawable-xhdpi/chat_secure.png b/res/drawable-xhdpi/chat_secure.png
deleted file mode 100644
index cc4b93786..000000000
Binary files a/res/drawable-xhdpi/chat_secure.png and /dev/null differ
diff --git a/res/drawable-xhdpi/chat_send_default.png b/res/drawable-xhdpi/chat_send_default.png
index 2432e1ce0..6f16bc29e 100644
Binary files a/res/drawable-xhdpi/chat_send_default.png and b/res/drawable-xhdpi/chat_send_default.png differ
diff --git a/res/drawable-xhdpi/chat_send_over.png b/res/drawable-xhdpi/chat_send_over.png
index dd66994a0..cd1f69268 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
deleted file mode 100644
index 8a8fcce1c..000000000
Binary files a/res/drawable-xhdpi/chat_start_body_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/chat_start_body_disabled.png b/res/drawable-xhdpi/chat_start_body_disabled.png
deleted file mode 100644
index 81dc3557b..000000000
Binary files a/res/drawable-xhdpi/chat_start_body_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/chat_start_body_over.png b/res/drawable-xhdpi/chat_start_body_over.png
deleted file mode 100644
index e7aa3b022..000000000
Binary files a/res/drawable-xhdpi/chat_start_body_over.png and /dev/null differ
diff --git a/res/drawable-xhdpi/chat_start_default.png b/res/drawable-xhdpi/chat_start_default.png
new file mode 100644
index 000000000..3bb7892f9
Binary files /dev/null and b/res/drawable-xhdpi/chat_start_default.png differ
diff --git a/res/drawable-xhdpi/conference_exit_over.png b/res/drawable-xhdpi/conference_exit_over.png
deleted file mode 100644
index 8035a5e48..000000000
Binary files a/res/drawable-xhdpi/conference_exit_over.png and /dev/null differ
diff --git a/res/drawable-xhdpi/dialer_alt_next.png b/res/drawable-xhdpi/dialer_alt_next.png
deleted file mode 100644
index 29035643d..000000000
Binary files a/res/drawable-xhdpi/dialer_alt_next.png and /dev/null differ
diff --git a/res/drawable-xhdpi/invite_linphone.png b/res/drawable-xhdpi/invite_linphone.png
deleted file mode 100644
index 20606be43..000000000
Binary files a/res/drawable-xhdpi/invite_linphone.png and /dev/null differ
diff --git a/res/drawable-xhdpi/lime_ko.png b/res/drawable-xhdpi/lime_ko.png
deleted file mode 100644
index 17dea795e..000000000
Binary files a/res/drawable-xhdpi/lime_ko.png and /dev/null differ
diff --git a/res/drawable-xhdpi/menu_about.png b/res/drawable-xhdpi/menu_about.png
deleted file mode 100644
index 37b24bbaa..000000000
Binary files a/res/drawable-xhdpi/menu_about.png and /dev/null differ
diff --git a/res/drawable-xhdpi/menu_assistant.png b/res/drawable-xhdpi/menu_assistant.png
deleted file mode 100644
index 8b6955242..000000000
Binary files a/res/drawable-xhdpi/menu_assistant.png and /dev/null differ
diff --git a/res/drawable-xhdpi/menu_link_account.png b/res/drawable-xhdpi/menu_link_account.png
deleted file mode 100644
index 448f37100..000000000
Binary files a/res/drawable-xhdpi/menu_link_account.png and /dev/null differ
diff --git a/res/drawable-xhdpi/menu_options.png b/res/drawable-xhdpi/menu_options.png
deleted file mode 100644
index 3a1c7800f..000000000
Binary files a/res/drawable-xhdpi/menu_options.png and /dev/null differ
diff --git a/res/drawable-xhdpi/menu_recordings.png b/res/drawable-xhdpi/menu_recordings.png
deleted file mode 100644
index 3bef81d13..000000000
Binary files a/res/drawable-xhdpi/menu_recordings.png and /dev/null differ
diff --git a/res/drawable-xhdpi/micro_disabled.png b/res/drawable-xhdpi/micro_disabled.png
deleted file mode 100644
index a2e952780..000000000
Binary files a/res/drawable-xhdpi/micro_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/options_disabled.png b/res/drawable-xhdpi/options_disabled.png
deleted file mode 100644
index 533713d97..000000000
Binary files a/res/drawable-xhdpi/options_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/options_rec_default.png b/res/drawable-xhdpi/options_rec_default.png
deleted file mode 100644
index 075c09314..000000000
Binary files a/res/drawable-xhdpi/options_rec_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/options_rec_selected.png b/res/drawable-xhdpi/options_rec_selected.png
deleted file mode 100644
index 0ef1ca322..000000000
Binary files a/res/drawable-xhdpi/options_rec_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/pause_small_disabled.png b/res/drawable-xhdpi/pause_small_disabled.png
deleted file mode 100644
index 75f0d05e0..000000000
Binary files a/res/drawable-xhdpi/pause_small_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/recording.png b/res/drawable-xhdpi/recording.png
deleted file mode 100644
index 7f1e07ad3..000000000
Binary files a/res/drawable-xhdpi/recording.png and /dev/null differ
diff --git a/res/drawable-xhdpi/routes_selected.png b/res/drawable-xhdpi/routes_selected.png
deleted file mode 100644
index 455b83343..000000000
Binary files a/res/drawable-xhdpi/routes_selected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/security_1_button.png b/res/drawable-xhdpi/security_1_button.png
deleted file mode 100644
index 25942adc8..000000000
Binary files a/res/drawable-xhdpi/security_1_button.png and /dev/null differ
diff --git a/res/drawable-xhdpi/security_2_authentification.png b/res/drawable-xhdpi/security_2_authentification.png
deleted file mode 100644
index 213f23fc4..000000000
Binary files a/res/drawable-xhdpi/security_2_authentification.png and /dev/null differ
diff --git a/res/drawable-xhdpi/security_2_button.png b/res/drawable-xhdpi/security_2_button.png
deleted file mode 100644
index d56769b14..000000000
Binary files a/res/drawable-xhdpi/security_2_button.png and /dev/null differ
diff --git a/res/drawable-xhdpi/security_alert_authentification.png b/res/drawable-xhdpi/security_alert_authentification.png
deleted file mode 100644
index 9821c2a33..000000000
Binary files a/res/drawable-xhdpi/security_alert_authentification.png and /dev/null differ
diff --git a/res/drawable-xhdpi/security_indicator.png b/res/drawable-xhdpi/security_indicator.png
deleted file mode 100644
index 05cdab3b5..000000000
Binary files a/res/drawable-xhdpi/security_indicator.png and /dev/null differ
diff --git a/res/drawable-xhdpi/speaker_disabled.png b/res/drawable-xhdpi/speaker_disabled.png
deleted file mode 100644
index aa2a0b78a..000000000
Binary files a/res/drawable-xhdpi/speaker_disabled.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_available.png b/res/drawable-xhdpi/status_available.png
deleted file mode 100644
index f57919fd0..000000000
Binary files a/res/drawable-xhdpi/status_available.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_available_desktop.png b/res/drawable-xhdpi/status_available_desktop.png
deleted file mode 100644
index fc64f9cc8..000000000
Binary files a/res/drawable-xhdpi/status_available_desktop.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_available_phone.png b/res/drawable-xhdpi/status_available_phone.png
deleted file mode 100644
index 12262bbe8..000000000
Binary files a/res/drawable-xhdpi/status_available_phone.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_away.png b/res/drawable-xhdpi/status_away.png
deleted file mode 100644
index 0cb280dd3..000000000
Binary files a/res/drawable-xhdpi/status_away.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_away_desktop.png b/res/drawable-xhdpi/status_away_desktop.png
deleted file mode 100644
index 6900b7c36..000000000
Binary files a/res/drawable-xhdpi/status_away_desktop.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_away_phone.png b/res/drawable-xhdpi/status_away_phone.png
deleted file mode 100644
index 05863265f..000000000
Binary files a/res/drawable-xhdpi/status_away_phone.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_busy.png b/res/drawable-xhdpi/status_busy.png
deleted file mode 100644
index 7040944dd..000000000
Binary files a/res/drawable-xhdpi/status_busy.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_busy_desktop.png b/res/drawable-xhdpi/status_busy_desktop.png
deleted file mode 100644
index ad8965b31..000000000
Binary files a/res/drawable-xhdpi/status_busy_desktop.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_busy_phone.png b/res/drawable-xhdpi/status_busy_phone.png
deleted file mode 100644
index a129c022a..000000000
Binary files a/res/drawable-xhdpi/status_busy_phone.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_disconnected.png b/res/drawable-xhdpi/status_disconnected.png
deleted file mode 100644
index aa354e37d..000000000
Binary files a/res/drawable-xhdpi/status_disconnected.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_disconnected_desktop.png b/res/drawable-xhdpi/status_disconnected_desktop.png
deleted file mode 100644
index 45599a8fd..000000000
Binary files a/res/drawable-xhdpi/status_disconnected_desktop.png and /dev/null differ
diff --git a/res/drawable-xhdpi/status_disconnected_phone.png b/res/drawable-xhdpi/status_disconnected_phone.png
deleted file mode 100644
index 4195447dc..000000000
Binary files a/res/drawable-xhdpi/status_disconnected_phone.png and /dev/null differ
diff --git a/res/drawable/cancel_with_padding.xml b/res/drawable/cancel_with_padding.xml
deleted file mode 100644
index affe6337e..000000000
--- a/res/drawable/cancel_with_padding.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="40dp"
-        android:left="20dp"
-        android:right="20dp"
-        android:top="40dp">
-
-        <bitmap android:src="@drawable/cancel_edit"/>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/chat_attachment.xml b/res/drawable/chat_attachment.xml
new file mode 100644
index 000000000..faf13b811
--- /dev/null
+++ b/res/drawable/chat_attachment.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="@color/colorA"/>
+    <size android:width="120dp" android:height="120dp"/>
+</shape>
diff --git a/res/drawable/chat_file.xml b/res/drawable/chat_file.xml
new file mode 100644
index 000000000..b44e30bd2
--- /dev/null
+++ b/res/drawable/chat_file.xml
@@ -0,0 +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/chat_file_over" />
+	<item
+		android:drawable="@drawable/chat_file_default" />
+</selector>
diff --git a/res/drawable/line.xml b/res/drawable/line.xml
deleted file mode 100644
index e3f2eaacf..000000000
--- a/res/drawable/line.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@android:color/darker_gray" />
-
-    <padding
-        android:top="10dp"
-        android:left="10dp"
-        android:right="10dp"
-        android:bottom="10dp"/>
-</shape>
\ No newline at end of file
diff --git a/res/drawable/line_drawable.xml b/res/drawable/line_drawable.xml
deleted file mode 100644
index de26172a6..000000000
--- a/res/drawable/line_drawable.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!--<item-->
-        <!--android:state_pressed="true"-->
-        <!--android:drawable="@drawable/line"/>-->
-
-    <!--<item-->
-        <!--android:drawable="@drawable/line"/>-->
-</selector>
\ No newline at end of file
diff --git a/res/drawable/list_delete.xml b/res/drawable/list_delete.xml
deleted file mode 100644
index d453abfd5..000000000
--- a/res/drawable/list_delete.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/delete_field_over" />
-    <item
-         android:drawable="@drawable/delete_field_default" />
-</selector>
diff --git a/res/drawable/chat_send_file.xml b/res/drawable/round_button_background.xml
similarity index 53%
rename from res/drawable/chat_send_file.xml
rename to res/drawable/round_button_background.xml
index a26285ecf..52a2a199b 100644
--- a/res/drawable/chat_send_file.xml
+++ b/res/drawable/round_button_background.xml
@@ -1,8 +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/chat_attachment_over" />
-    <item
-         android:drawable="@drawable/chat_attachment_default" />
+		  android:drawable="@drawable/round_button_background_over" />
+	<item
+		android:drawable="@drawable/round_button_background_default" />
 </selector>
-
diff --git a/res/drawable/round_button_background_default.xml b/res/drawable/round_button_background_default.xml
new file mode 100644
index 000000000..dea53353a
--- /dev/null
+++ b/res/drawable/round_button_background_default.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="@color/colorF"/>
+    <size android:width="30dp" android:height="30dp"/>
+</shape>
diff --git a/res/drawable/round_button_background_over.xml b/res/drawable/round_button_background_over.xml
new file mode 100644
index 000000000..309f91c56
--- /dev/null
+++ b/res/drawable/round_button_background_over.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="@color/colorA"/>
+    <size android:width="30dp" android:height="30dp"/>
+</shape>
diff --git a/res/drawable/round_orange_button_background.xml b/res/drawable/round_orange_button_background.xml
new file mode 100644
index 000000000..941c2bcb9
--- /dev/null
+++ b/res/drawable/round_orange_button_background.xml
@@ -0,0 +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/round_orange_button_background_over" />
+	<item
+		android:drawable="@drawable/round_orange_button_background_default" />
+</selector>
diff --git a/res/drawable/round_orange_button_background_default.xml b/res/drawable/round_orange_button_background_default.xml
new file mode 100644
index 000000000..309f91c56
--- /dev/null
+++ b/res/drawable/round_orange_button_background_default.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="@color/colorA"/>
+    <size android:width="30dp" android:height="30dp"/>
+</shape>
diff --git a/res/drawable/round_orange_button_background_over.xml b/res/drawable/round_orange_button_background_over.xml
new file mode 100644
index 000000000..9e7ef1ff9
--- /dev/null
+++ b/res/drawable/round_orange_button_background_over.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="@color/colorL"/>
+    <size android:width="30dp" android:height="30dp"/>
+</shape>
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index 0b9656ecb..eddc75394 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -132,7 +132,8 @@
 
 			<ImageView
 				android:id="@+id/send_picture"
-				android:src="@drawable/chat_send_file"
+				android:src="@drawable/chat_file"
+				android:background="@drawable/round_button_background"
 				android:contentDescription="@string/content_description_send_file"
                 android:padding="5dp"
 				android:layout_width="wrap_content"
@@ -157,6 +158,7 @@
 			<ImageView
 				android:id="@+id/send_message"
 				android:src="@drawable/chat_send_message"
+                android:background="@drawable/round_button_background"
 				android:contentDescription="@string/content_description_send_message"
                 android:padding="5dp"
 				android:layout_width="wrap_content"
diff --git a/res/layout/chatlist_cell.xml b/res/layout/chatlist_cell.xml
index d563b87ba..af74557f8 100644
--- a/res/layout/chatlist_cell.xml
+++ b/res/layout/chatlist_cell.xml
@@ -92,7 +92,7 @@
 
 				<ImageView
 					android:id="@+id/lastMessageFileTransfer"
-					android:src="@drawable/chat_file_message"
+					android:src="@drawable/chat_file"
 					android:layout_marginLeft="5dp"
 					android:visibility="gone"
 					android:layout_width="wrap_content"
diff --git a/res/layout/contact_control_row.xml b/res/layout/contact_control_row.xml
index 99f1254c3..d658c7cd7 100644
--- a/res/layout/contact_control_row.xml
+++ b/res/layout/contact_control_row.xml
@@ -65,7 +65,8 @@
 
 			<ImageView
 				android:id="@+id/contact_call"
-				android:src="@drawable/call_start_body_default"
+				android:src="@drawable/call_start_default"
+				android:background="@drawable/round_orange_button_background"
 				android:contentDescription="@string/content_description_call"
 				android:layout_width="60dp"
 				android:layout_height="60dp"
@@ -75,7 +76,8 @@
 
 			<ImageView
 				android:id="@+id/contact_chat"
-				android:src="@drawable/chat_start_body_default"
+				android:src="@drawable/chat_start_default"
+				android:background="@drawable/round_orange_button_background"
 				android:contentDescription="@string/content_description_chat"
 				android:layout_width="60dp"
 				android:layout_height="60dp"
diff --git a/res/layout/contact_edit.xml b/res/layout/contact_edit.xml
index 933c88ab2..1f4a05dd1 100644
--- a/res/layout/contact_edit.xml
+++ b/res/layout/contact_edit.xml
@@ -181,11 +181,12 @@
 					<ImageView
 						android:id="@+id/add_address_field"
 						android:src="@drawable/add_field_default"
+						android:background="@drawable/round_orange_button_background"
 						android:contentDescription="@string/content_description_add"
 						android:layout_alignParentRight="true"
 						android:layout_width="30dp"
 						android:layout_height="30dp"
-						android:paddingLeft="5dp"/>
+                        android:layout_marginLeft="5dp"/>
 				</RelativeLayout>
 
 				<LinearLayout
@@ -221,11 +222,12 @@
 					<ImageView
 						android:id="@+id/add_number_field"
 						android:src="@drawable/add_field_default"
+						android:background="@drawable/round_orange_button_background"
 						android:contentDescription="@string/content_description_add"
 						android:layout_alignParentRight="true"
 						android:layout_width="30dp"
 						android:layout_height="30dp"
-						android:paddingLeft="5dp"/>
+						android:layout_marginLeft="5dp"/>
 				</RelativeLayout>
 
 				<LinearLayout
diff --git a/res/layout/history_detail.xml b/res/layout/history_detail.xml
index d848ae759..0a682c071 100644
--- a/res/layout/history_detail.xml
+++ b/res/layout/history_detail.xml
@@ -106,7 +106,8 @@
 
                     <ImageView
                         android:id="@+id/call"
-                        android:src="@drawable/call_start_body_default"
+                        android:src="@drawable/call_start_default"
+                        android:background="@drawable/round_orange_button_background"
                         android:contentDescription="@string/content_description_call"
                         android:layout_width="60dp"
                         android:layout_height="60dp"
@@ -114,7 +115,8 @@
 
                     <ImageView
                         android:id="@+id/chat"
-                        android:src="@drawable/chat_start_body_default"
+                        android:src="@drawable/chat_start_default"
+                        android:background="@drawable/round_orange_button_background"
                         android:contentDescription="@string/content_description_chat"
                         android:layout_width="60dp"
                         android:layout_height="60dp"
diff --git a/res/layout/side_menu_account_cell.xml b/res/layout/side_menu_account_cell.xml
index 673a95483..43e499312 100644
--- a/res/layout/side_menu_account_cell.xml
+++ b/res/layout/side_menu_account_cell.xml
@@ -16,7 +16,7 @@
 
 	<ImageView
 		android:id="@+id/account_status"
-		android:src="@drawable/status_available"
+		android:src="@drawable/led_connected"
 		android:layout_width="25dp"
 		android:layout_height="25dp"
 		android:padding="5dp"
diff --git a/res/layout/side_menu_main_account.xml b/res/layout/side_menu_main_account.xml
index e4e89707f..ed7a41d08 100644
--- a/res/layout/side_menu_main_account.xml
+++ b/res/layout/side_menu_main_account.xml
@@ -39,7 +39,7 @@
 
 	<ImageView
 		android:id="@+id/main_account_status"
-		android:src="@drawable/status_available"
+		android:src="@drawable/led_connected"
 		android:layout_width="25dp"
 		android:layout_height="25dp"
 		android:padding="5dp"
diff --git a/src/android/org/linphone/LinphoneService.java b/src/android/org/linphone/LinphoneService.java
index 6fedb3176..396142372 100644
--- a/src/android/org/linphone/LinphoneService.java
+++ b/src/android/org/linphone/LinphoneService.java
@@ -642,12 +642,12 @@ public final class LinphoneService extends Service {
             mChatNotifMap.put(conferenceAddress, notif);
         }
 
-        Bitmap bm = null;
+        Bitmap bm;
         if (fromPictureUri != null) {
             try {
                 bm = MediaStore.Images.Media.getBitmap(getContentResolver(), fromPictureUri);
             } catch (Exception e) {
-                bm = BitmapFactory.decodeResource(getResources(), R.drawable.topbar_avatar);
+                bm = BitmapFactory.decodeResource(getResources(), R.drawable.chat_group_avatar);
             }
         } else {
             bm = BitmapFactory.decodeResource(getResources(), R.drawable.topbar_avatar);
@@ -680,7 +680,7 @@ public final class LinphoneService extends Service {
             mChatNotifMap.put(fromSipUri, notif);
         }
 
-        Bitmap bm = null;
+        Bitmap bm;
         if (fromPictureUri != null) {
             try {
                 bm = MediaStore.Images.Media.getBitmap(getContentResolver(), fromPictureUri);
diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 7d1697d92..356454e00 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -464,12 +464,7 @@ public class ChatEventsAdapter extends SelectableAdapter<ChatBubbleViewHolder> {
 
     private void loadBitmap(String path, ImageView imageView) {
         if (cancelPotentialWork(path, imageView)) {
-            if (LinphoneUtils.isExtensionImage(path)) {
-                mDefaultBitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.chat_attachment_over);
-            } else {
-                mDefaultBitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.chat_attachment);
-            }
-
+            mDefaultBitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.chat_file);
             BitmapWorkerTask task = new BitmapWorkerTask(imageView);
             final AsyncBitmap asyncBitmap = new AsyncBitmap(mContext.getResources(), mDefaultBitmap, task);
             imageView.setImageDrawable(asyncBitmap);