diff --git a/res/drawable-xhdpi/chat_group_informations.png b/res/drawable-xhdpi/chat_group_informations_default.png
similarity index 100%
rename from res/drawable-xhdpi/chat_group_informations.png
rename to res/drawable-xhdpi/chat_group_informations_default.png
diff --git a/res/drawable-xhdpi/contact_add.png b/res/drawable-xhdpi/contact_add_default.png
similarity index 100%
rename from res/drawable-xhdpi/contact_add.png
rename to res/drawable-xhdpi/contact_add_default.png
diff --git a/res/drawable-xhdpi/delete.png b/res/drawable-xhdpi/delete_default.png
similarity index 100%
rename from res/drawable-xhdpi/delete.png
rename to res/drawable-xhdpi/delete_default.png
diff --git a/res/drawable-xhdpi/edit_list.png b/res/drawable-xhdpi/edit_list_default.png
similarity index 100%
rename from res/drawable-xhdpi/edit_list.png
rename to res/drawable-xhdpi/edit_list_default.png
diff --git a/res/drawable-xhdpi/menu.png b/res/drawable-xhdpi/menu_default.png
similarity index 100%
rename from res/drawable-xhdpi/menu.png
rename to res/drawable-xhdpi/menu_default.png
diff --git a/res/drawable-xhdpi/menu_disabled.png b/res/drawable-xhdpi/menu_disabled.png
index afe4c19b0..072589694 100644
Binary files a/res/drawable-xhdpi/menu_disabled.png and b/res/drawable-xhdpi/menu_disabled.png differ
diff --git a/res/drawable-xhdpi/options_add_call.png b/res/drawable-xhdpi/options_add_call_default.png
similarity index 100%
rename from res/drawable-xhdpi/options_add_call.png
rename to res/drawable-xhdpi/options_add_call_default.png
diff --git a/res/drawable-xhdpi/options_start_conference.png b/res/drawable-xhdpi/options_start_conference_default.png
similarity index 100%
rename from res/drawable-xhdpi/options_start_conference.png
rename to res/drawable-xhdpi/options_start_conference_default.png
diff --git a/res/drawable-xhdpi/options_transfer_call.png b/res/drawable-xhdpi/options_transfer_call_default.png
similarity index 100%
rename from res/drawable-xhdpi/options_transfer_call.png
rename to res/drawable-xhdpi/options_transfer_call_default.png
diff --git a/res/drawable-xhdpi/resizable_assistant_button.9.png b/res/drawable-xhdpi/resizable_assistant_button_default.9.png
similarity index 100%
rename from res/drawable-xhdpi/resizable_assistant_button.9.png
rename to res/drawable-xhdpi/resizable_assistant_button_default.9.png
diff --git a/res/drawable-xhdpi/route_bluetooth.png b/res/drawable-xhdpi/route_bluetooth_default.png
similarity index 100%
rename from res/drawable-xhdpi/route_bluetooth.png
rename to res/drawable-xhdpi/route_bluetooth_default.png
diff --git a/res/drawable-xhdpi/route_earpiece.png b/res/drawable-xhdpi/route_earpiece_default.png
similarity index 100%
rename from res/drawable-xhdpi/route_earpiece.png
rename to res/drawable-xhdpi/route_earpiece_default.png
diff --git a/res/drawable-xhdpi/route_speaker.png b/res/drawable-xhdpi/route_speaker_default.png
similarity index 100%
rename from res/drawable-xhdpi/route_speaker.png
rename to res/drawable-xhdpi/route_speaker_default.png
diff --git a/res/drawable-xhdpi/valid.png b/res/drawable-xhdpi/valid_default.png
similarity index 100%
rename from res/drawable-xhdpi/valid.png
rename to res/drawable-xhdpi/valid_default.png
diff --git a/res/drawable/assistant_button.xml b/res/drawable/assistant_button.xml
index 1d6cbee82..6dd7bfb0d 100644
--- a/res/drawable/assistant_button.xml
+++ b/res/drawable/assistant_button.xml
@@ -5,6 +5,6 @@
 	<item android:state_enabled="false"
 		  android:drawable="@drawable/resizable_assistant_button_disabled" />
 	<item
-		android:drawable="@drawable/resizable_assistant_button" />
+		android:drawable="@drawable/resizable_assistant_button_default" />
 </selector>
 
diff --git a/res/drawable/camera_button.xml b/res/drawable/camera.xml
similarity index 100%
rename from res/drawable/camera_button.xml
rename to res/drawable/camera.xml
diff --git a/res/drawable/chat_group_informations.xml b/res/drawable/chat_group_informations.xml
new file mode 100644
index 000000000..efd354b8c
--- /dev/null
+++ b/res/drawable/chat_group_informations.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_enabled="false"
+        android:drawable="@drawable/chat_group_informations_disabled" />
+    <item
+         android:drawable="@drawable/chat_group_informations_default" />
+</selector>
diff --git a/res/drawable/chat_room_creation_confirm.xml b/res/drawable/chat_room_creation_confirm.xml
index 4ed8dd63b..43da7ea12 100644
--- a/res/drawable/chat_room_creation_confirm.xml
+++ b/res/drawable/chat_room_creation_confirm.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_enabled="true" 
-        android:drawable="@drawable/valid" />
+        android:drawable="@drawable/valid_default" />
     <item android:state_enabled="false"
          android:drawable="@drawable/valid_disabled" />
 </selector>
diff --git a/res/drawable/contact_add_button.xml b/res/drawable/contact_add.xml
similarity index 80%
rename from res/drawable/contact_add_button.xml
rename to res/drawable/contact_add.xml
index c688770db..dc67799c5 100644
--- a/res/drawable/contact_add_button.xml
+++ b/res/drawable/contact_add.xml
@@ -3,6 +3,6 @@
 	<item android:state_enabled="false"
 		  android:drawable="@drawable/contact_add_disabled" />
 	<item
-		android:drawable="@drawable/contact_add" />
+		android:drawable="@drawable/contact_add_default" />
 </selector>
 
diff --git a/res/drawable/delete_button.xml b/res/drawable/delete.xml
similarity index 81%
rename from res/drawable/delete_button.xml
rename to res/drawable/delete.xml
index e70740455..fc8292837 100644
--- a/res/drawable/delete_button.xml
+++ b/res/drawable/delete.xml
@@ -3,5 +3,5 @@
 	<item android:state_enabled="false"
 		  android:drawable="@drawable/delete_disabled" />
 	<item
-		android:drawable="@drawable/delete" />
+		android:drawable="@drawable/delete_default" />
 </selector>
diff --git a/res/drawable/edit_list_button.xml b/res/drawable/edit_list.xml
similarity index 79%
rename from res/drawable/edit_list_button.xml
rename to res/drawable/edit_list.xml
index d53758283..dcd5230cc 100644
--- a/res/drawable/edit_list_button.xml
+++ b/res/drawable/edit_list.xml
@@ -3,5 +3,5 @@
     <item android:state_enabled="false"
         android:drawable="@drawable/edit_list_disabled" />
     <item
-         android:drawable="@drawable/edit_list" />
+         android:drawable="@drawable/edit_list_default" />
 </selector>
diff --git a/res/drawable/menu_burger.xml b/res/drawable/menu.xml
similarity index 82%
rename from res/drawable/menu_burger.xml
rename to res/drawable/menu.xml
index 1a8ea79ab..4e9c8df94 100644
--- a/res/drawable/menu_burger.xml
+++ b/res/drawable/menu.xml
@@ -3,5 +3,5 @@
 	<item android:state_enabled="false"
 		  android:drawable="@drawable/menu_disabled" />
 	<item
-		android:drawable="@drawable/menu" />
+		android:drawable="@drawable/menu_default" />
 </selector>
diff --git a/res/drawable/micro.xml b/res/drawable/micro.xml
index 1780f755d..8570c32c3 100644
--- a/res/drawable/micro.xml
+++ b/res/drawable/micro.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true"
+    <item android:state_selected="true"
 	android:drawable="@drawable/micro_selected" />
     <item
          android:drawable="@drawable/micro_default" />
diff --git a/res/drawable/options.xml b/res/drawable/options.xml
new file mode 100644
index 000000000..863f137ac
--- /dev/null
+++ b/res/drawable/options.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_selected="true"
+		  android:drawable="@drawable/options_selected" />
+	<item
+		android:drawable="@drawable/options_default" />
+</selector>
diff --git a/res/drawable/options_add_call_button.xml b/res/drawable/options_add_call.xml
similarity index 79%
rename from res/drawable/options_add_call_button.xml
rename to res/drawable/options_add_call.xml
index 83a0120bc..9fb115ad4 100644
--- a/res/drawable/options_add_call_button.xml
+++ b/res/drawable/options_add_call.xml
@@ -3,5 +3,5 @@
 	<item android:state_enabled="false"
 		  android:drawable="@drawable/options_add_call_disabled" />
 	<item
-		android:drawable="@drawable/options_add_call" />
+		android:drawable="@drawable/options_add_call_default" />
 </selector>
diff --git a/res/drawable/options_start_conference_button.xml b/res/drawable/options_start_conference.xml
similarity index 77%
rename from res/drawable/options_start_conference_button.xml
rename to res/drawable/options_start_conference.xml
index b04e79480..56c2ff309 100644
--- a/res/drawable/options_start_conference_button.xml
+++ b/res/drawable/options_start_conference.xml
@@ -3,5 +3,5 @@
 	<item android:state_enabled="false"
 		  android:drawable="@drawable/options_start_conference_disabled" />
 	<item
-		android:drawable="@drawable/options_start_conference" />
+		android:drawable="@drawable/options_start_conference_default" />
 </selector>
diff --git a/res/drawable/options_transfer_call_button.xml b/res/drawable/options_transfer_call.xml
similarity index 78%
rename from res/drawable/options_transfer_call_button.xml
rename to res/drawable/options_transfer_call.xml
index 4ba682b61..a02c56ed0 100644
--- a/res/drawable/options_transfer_call_button.xml
+++ b/res/drawable/options_transfer_call.xml
@@ -3,5 +3,5 @@
 	<item android:state_enabled="false"
 		  android:drawable="@drawable/options_transfer_call_disabled" />
 	<item
-		android:drawable="@drawable/options_transfer_call" />
+		android:drawable="@drawable/options_transfer_call_default" />
 </selector>
diff --git a/res/drawable/resizable_assistant_button.xml b/res/drawable/resizable_assistant_button.xml
new file mode 100644
index 000000000..4fa102bfb
--- /dev/null
+++ b/res/drawable/resizable_assistant_button.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_enabled="false"
+		  android:drawable="@drawable/resizable_assistant_button_disabled" />
+	<item android:state_pressed="true"
+		android:drawable="@drawable/resizable_assistant_button_over" />
+	<item
+		android:drawable="@drawable/resizable_assistant_button_default" />
+</selector>
diff --git a/res/drawable/route_bluetooth.xml b/res/drawable/route_bluetooth.xml
new file mode 100644
index 000000000..153c218db
--- /dev/null
+++ b/res/drawable/route_bluetooth.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_selected="true"
+		  android:drawable="@drawable/route_bluetooth_selected" />
+	<item
+		android:drawable="@drawable/route_bluetooth_default" />
+</selector>
diff --git a/res/drawable/route_earpiece.xml b/res/drawable/route_earpiece.xml
new file mode 100644
index 000000000..ecbec5c61
--- /dev/null
+++ b/res/drawable/route_earpiece.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_selected="true"
+		  android:drawable="@drawable/route_earpiece_selected" />
+	<item
+		android:drawable="@drawable/route_earpiece_default" />
+</selector>
diff --git a/res/drawable/route_speaker.xml b/res/drawable/route_speaker.xml
new file mode 100644
index 000000000..136cc9f71
--- /dev/null
+++ b/res/drawable/route_speaker.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_selected="true"
+		  android:drawable="@drawable/route_speaker_selected" />
+	<item
+		android:drawable="@drawable/route_speaker_default" />
+</selector>
diff --git a/res/drawable/speaker.xml b/res/drawable/speaker.xml
index ac67e2924..ec5f9c595 100644
--- a/res/drawable/speaker.xml
+++ b/res/drawable/speaker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true"
+    <item android:state_selected="true"
         android:drawable="@drawable/speaker_selected" />
     <item
          android:drawable="@drawable/speaker_default" />
diff --git a/res/drawable/valid.xml b/res/drawable/valid.xml
new file mode 100644
index 000000000..4ad5c5858
--- /dev/null
+++ b/res/drawable/valid.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_enabled="false"
+		  android:drawable="@drawable/valid_disabled" />
+	<item
+		android:drawable="@drawable/valid_default" />
+</selector>
diff --git a/res/layout-land/call_outgoing.xml b/res/layout-land/call_outgoing.xml
index 656abcbeb..1227a7a94 100644
--- a/res/layout-land/call_outgoing.xml
+++ b/res/layout-land/call_outgoing.xml
@@ -116,7 +116,7 @@
 
 		<ImageView
 			android:id="@+id/micro"
-			android:src="@drawable/micro_default"
+			android:src="@drawable/micro"
 			android:background="@drawable/button_background"
 			android:contentDescription="@string/content_description_toggle_micro"
 			android:layout_width="match_parent"
@@ -126,7 +126,7 @@
 
 		<ImageView
 			android:id="@+id/speaker"
-			android:src="@drawable/speaker_default"
+			android:src="@drawable/speaker"
 			android:background="@drawable/button_background"
 			android:contentDescription="@string/content_description_toggle_speaker"
 			android:layout_width="match_parent"
diff --git a/res/layout-land/dialer.xml b/res/layout-land/dialer.xml
index 62c0f9e1a..b5662afc3 100644
--- a/res/layout-land/dialer.xml
+++ b/res/layout-land/dialer.xml
@@ -82,7 +82,7 @@
 
 			<ImageView
 				android:id="@+id/add_contact"
-				android:src="@drawable/contact_add_button"
+				android:src="@drawable/contact_add"
 				android:background="@drawable/toolbar_button"
 				android:contentDescription="@string/content_description_add_contact"
 				android:layout_width="match_parent"
diff --git a/res/layout-sw533dp-land/call_outgoing.xml b/res/layout-sw533dp-land/call_outgoing.xml
index 4d1b0cdd7..970ac27ec 100644
--- a/res/layout-sw533dp-land/call_outgoing.xml
+++ b/res/layout-sw533dp-land/call_outgoing.xml
@@ -116,7 +116,7 @@
 
 		<ImageView
 			android:id="@+id/micro"
-			android:src="@drawable/micro_default"
+			android:src="@drawable/micro"
 			android:background="@drawable/button_background"
 			android:contentDescription="@string/content_description_toggle_micro"
 			android:layout_width="match_parent"
@@ -126,7 +126,7 @@
 
 		<ImageView
 			android:id="@+id/speaker"
-			android:src="@drawable/speaker_default"
+			android:src="@drawable/speaker"
 			android:background="@drawable/button_background"
 			android:contentDescription="@string/content_description_toggle_speaker"
 			android:layout_width="match_parent"
diff --git a/res/layout-sw533dp-land/dialer.xml b/res/layout-sw533dp-land/dialer.xml
index b2d68e2c6..6b78897ef 100644
--- a/res/layout-sw533dp-land/dialer.xml
+++ b/res/layout-sw533dp-land/dialer.xml
@@ -79,7 +79,7 @@
 
 				<ImageView
 					android:id="@+id/add_contact"
-					android:src="@drawable/contact_add_button"
+					android:src="@drawable/contact_add"
 					android:contentDescription="@string/content_description_add_contact"
 					android:background="@drawable/toolbar_button"
 					android:layout_width="match_parent"
diff --git a/res/layout-sw533dp/dialer.xml b/res/layout-sw533dp/dialer.xml
index 5e7e3c10f..0a98c38aa 100644
--- a/res/layout-sw533dp/dialer.xml
+++ b/res/layout-sw533dp/dialer.xml
@@ -79,7 +79,7 @@
 
 				<ImageView
 					android:id="@+id/add_contact"
-					android:src="@drawable/contact_add_button"
+					android:src="@drawable/contact_add"
 					android:background="@drawable/toolbar_button"
 					android:contentDescription="@string/content_description_add_contact"
 					android:layout_width="match_parent"
diff --git a/res/layout/assistant_country_list.xml b/res/layout/assistant_country_list.xml
index f28d50e08..b65b6133c 100644
--- a/res/layout/assistant_country_list.xml
+++ b/res/layout/assistant_country_list.xml
@@ -40,7 +40,7 @@
             android:id="@+id/clearSearchField"
             android:layout_width="30dp"
             android:layout_height="30dp"
-            android:src="@drawable/clean_field_default"
+            android:src="@drawable/clean_field"
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
             android:paddingLeft="5dp"
diff --git a/res/layout/call.xml b/res/layout/call.xml
index 5293afc8f..043e53a72 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -199,7 +199,7 @@
 
 						<ImageView
 							android:id="@+id/video"
-							android:src="@drawable/camera_button"
+							android:src="@drawable/camera"
 							android:background="@drawable/button_background"
 							android:contentDescription="@string/content_description_switch_video"
 							android:padding="20dp"
@@ -219,7 +219,7 @@
 
 					<ImageView
 						android:id="@+id/micro"
-						android:src="@drawable/micro_default"
+						android:src="@drawable/micro"
 						android:background="@drawable/button_background"
 						android:contentDescription="@string/content_description_toggle_micro"
 						android:padding="10dp"
@@ -229,7 +229,7 @@
 
 					<ImageView
 						android:id="@+id/speaker"
-						android:src="@drawable/speaker_default"
+						android:src="@drawable/speaker"
 						android:background="@drawable/button_background"
 						android:contentDescription="@string/content_description_toggle_speaker"
 						android:padding="15dp"
@@ -250,7 +250,7 @@
 
 					<ImageView
 						android:id="@+id/options"
-						android:src="@drawable/options_default"
+						android:src="@drawable/options"
 						android:background="@drawable/button_background"
 						android:contentDescription="@string/content_description_call_options"
 						android:padding="15dp"
@@ -350,7 +350,7 @@
 
 				<ImageView
 					android:id="@+id/add_call"
-					android:src="@drawable/options_add_call_button"
+					android:src="@drawable/options_add_call"
 					android:background="@drawable/button_background"
 					android:contentDescription="@string/content_description_add_call"
 					android:padding="15dp"
@@ -393,7 +393,7 @@
 
 				<ImageView
 					android:id="@+id/transfer"
-					android:src="@drawable/options_transfer_call_button"
+					android:src="@drawable/options_transfer_call"
 					android:background="@drawable/button_background"
 					android:contentDescription="@string/content_description_transfer"
 					android:padding="15dp"
@@ -435,7 +435,7 @@
 
 				<ImageView
 					android:id="@+id/conference"
-					android:src="@drawable/options_start_conference_button"
+					android:src="@drawable/options_start_conference"
 					android:background="@drawable/button_background"
 					android:contentDescription="@string/content_description_conference"
 					android:visibility="invisible"
diff --git a/res/layout/call_outgoing.xml b/res/layout/call_outgoing.xml
index 654d88384..81b3f5283 100644
--- a/res/layout/call_outgoing.xml
+++ b/res/layout/call_outgoing.xml
@@ -102,7 +102,7 @@
 
 		<ImageView
 			android:id="@+id/micro"
-			android:src="@drawable/micro_default"
+			android:src="@drawable/micro"
 			android:background="@drawable/button_background"
 			android:contentDescription="@string/content_description_toggle_micro"
 			android:layout_width="match_parent"
@@ -112,7 +112,7 @@
 
 		<ImageView
 			android:id="@+id/speaker"
-			android:src="@drawable/speaker_default"
+			android:src="@drawable/speaker"
 			android:background="@drawable/button_background"
 			android:contentDescription="@string/content_description_toggle_speaker"
 			android:layout_width="match_parent"
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index eddc75394..313dbaadb 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -86,7 +86,7 @@
 
             <ImageView
                 android:id="@+id/edit"
-                android:src="@drawable/edit_list_button"
+                android:src="@drawable/edit_list"
                 android:background="@drawable/toolbar_button"
                 android:contentDescription="@string/content_description_edit_list"
                 android:layout_width="0dp"
diff --git a/res/layout/chatlist.xml b/res/layout/chatlist.xml
index bee0767ec..a8788457c 100644
--- a/res/layout/chatlist.xml
+++ b/res/layout/chatlist.xml
@@ -54,7 +54,7 @@
 
             <ImageView
                 android:id="@+id/edit"
-                android:src="@drawable/edit_list_button"
+                android:src="@drawable/edit_list"
                 android:background="@drawable/toolbar_button"
                 android:contentDescription="@string/content_description_edit_list"
                 android:layout_width="0dp"
diff --git a/res/layout/contacts_list.xml b/res/layout/contacts_list.xml
index c178d3666..a0f99d262 100644
--- a/res/layout/contacts_list.xml
+++ b/res/layout/contacts_list.xml
@@ -76,7 +76,7 @@
 
 		<ImageView
 			android:id="@+id/edit"
-			android:src="@drawable/edit_list_button"
+			android:src="@drawable/edit_list"
 			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_edit_list"
 			android:layout_width="0dp"
diff --git a/res/layout/context_bar.xml b/res/layout/context_bar.xml
index da3df3d29..d96f7cf57 100644
--- a/res/layout/context_bar.xml
+++ b/res/layout/context_bar.xml
@@ -123,7 +123,7 @@
 
 		<ImageView
 			android:id="@+id/edit"
-			android:src="@drawable/edit_list_button"
+			android:src="@drawable/edit_list"
 			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_edit_list"
 			android:layout_width="0dp"
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index cb3409994..f8b46b3a3 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -76,7 +76,7 @@
 
 			<ImageView
 				android:id="@+id/add_contact"
-				android:src="@drawable/contact_add_button"
+				android:src="@drawable/contact_add"
 				android:background="@drawable/toolbar_button"
 				android:contentDescription="@string/content_description_add_contact"
 				android:layout_width="match_parent"
diff --git a/res/layout/edit_list.xml b/res/layout/edit_list.xml
index 472011b97..eba0325a5 100644
--- a/res/layout/edit_list.xml
+++ b/res/layout/edit_list.xml
@@ -45,7 +45,7 @@
 
 	<ImageView
 		android:id="@+id/delete"
-		android:src="@drawable/delete_button"
+		android:src="@drawable/delete"
 		android:background="@drawable/toolbar_button"
 		android:contentDescription="@string/content_description_delete_selection"
 		android:layout_width="0dp"
diff --git a/res/layout/history.xml b/res/layout/history.xml
index aa8a31ca0..7b76a2736 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -65,7 +65,7 @@
 
 		<ImageView
 			android:id="@+id/edit"
-			android:src="@drawable/edit_list_button"
+			android:src="@drawable/edit_list"
 			android:background="@drawable/toolbar_button"
 			android:contentDescription="@string/content_description_edit_list"
 			android:layout_width="0dp"
diff --git a/res/layout/status.xml b/res/layout/status.xml
index 314c3d9e2..d191f6e00 100644
--- a/res/layout/status.xml
+++ b/res/layout/status.xml
@@ -13,7 +13,7 @@
 
 		<ImageView
 			android:id="@+id/side_menu_button"
-			android:src="@drawable/menu_burger"
+			android:src="@drawable/menu"
 			android:contentDescription="@string/content_description_menu"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java
index 9f899e521..f6d009fc5 100644
--- a/src/android/org/linphone/call/CallActivity.java
+++ b/src/android/org/linphone/call/CallActivity.java
@@ -541,50 +541,42 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
         } else {
             if (video.isEnabled()) {
                 if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) {
-                    video.setImageResource(R.drawable.camera_selected);
+                    video.setSelected(true);
                     videoProgress.setVisibility(View.INVISIBLE);
                 } else {
-                    video.setImageResource(R.drawable.camera_button);
+                    video.setSelected(false);
                 }
             } else {
-                video.setImageResource(R.drawable.camera_button);
+                video.setSelected(false);
             }
         }
         if (getPackageManager().checkPermission(Manifest.permission.CAMERA, getPackageName()) != PackageManager.PERMISSION_GRANTED) {
-            video.setImageResource(R.drawable.camera_button);
+            video.setSelected(false);
         }
 
-        if (isSpeakerEnabled) {
-            speaker.setImageResource(R.drawable.speaker_selected);
-        } else {
-            speaker.setImageResource(R.drawable.speaker_default);
-        }
+        speaker.setSelected(isSpeakerEnabled);
 
         if (getPackageManager().checkPermission(Manifest.permission.RECORD_AUDIO, getPackageName()) != PackageManager.PERMISSION_GRANTED) {
             isMicMuted = true;
         }
-        if (isMicMuted) {
-            micro.setImageResource(R.drawable.micro_selected);
-        } else {
-            micro.setImageResource(R.drawable.micro_default);
-        }
+        micro.setSelected(isMicMuted);
 
         try {
-            routeSpeaker.setImageResource(R.drawable.route_speaker);
+            routeSpeaker.setSelected(false);
             if (BluetoothManager.getInstance().isUsingBluetoothAudioRoute()) {
                 isSpeakerEnabled = false; // We need this if isSpeakerEnabled wasn't set correctly
-                routeEarpiece.setImageResource(R.drawable.route_earpiece);
-                routeBluetooth.setImageResource(R.drawable.route_bluetooth_selected);
+                routeEarpiece.setSelected(false);
+                routeBluetooth.setSelected(true);
                 return;
             } else {
-                routeEarpiece.setImageResource(R.drawable.route_earpiece_selected);
-                routeBluetooth.setImageResource(R.drawable.route_bluetooth);
+                routeEarpiece.setSelected(true);
+                routeBluetooth.setSelected(false);
             }
 
             if (isSpeakerEnabled) {
-                routeSpeaker.setImageResource(R.drawable.route_speaker_selected);
-                routeEarpiece.setImageResource(R.drawable.route_earpiece);
-                routeBluetooth.setImageResource(R.drawable.route_bluetooth);
+                routeSpeaker.setSelected(true);
+                routeEarpiece.setSelected(false);
+                routeBluetooth.setSelected(false);
             }
         } catch (NullPointerException npe) {
             Log.e("Bluetooth: Audio routes menu disabled on tablets for now (4)");
@@ -690,24 +682,24 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
         } else if (id == R.id.route_bluetooth) {
             if (BluetoothManager.getInstance().routeAudioToBluetooth()) {
                 isSpeakerEnabled = false;
-                routeBluetooth.setImageResource(R.drawable.route_bluetooth_selected);
-                routeSpeaker.setImageResource(R.drawable.route_speaker);
-                routeEarpiece.setImageResource(R.drawable.route_earpiece);
+                routeBluetooth.setSelected(true);
+                routeSpeaker.setSelected(false);
+                routeEarpiece.setSelected(false);
             }
             hideOrDisplayAudioRoutes();
         } else if (id == R.id.route_earpiece) {
             LinphoneManager.getInstance().routeAudioToReceiver();
             isSpeakerEnabled = false;
-            routeBluetooth.setImageResource(R.drawable.route_bluetooth);
-            routeSpeaker.setImageResource(R.drawable.route_speaker);
-            routeEarpiece.setImageResource(R.drawable.route_earpiece_selected);
+            routeBluetooth.setSelected(false);
+            routeSpeaker.setSelected(false);
+            routeEarpiece.setSelected(true);
             hideOrDisplayAudioRoutes();
         } else if (id == R.id.route_speaker) {
             LinphoneManager.getInstance().routeAudioToSpeaker();
             isSpeakerEnabled = true;
-            routeBluetooth.setImageResource(R.drawable.route_bluetooth);
-            routeSpeaker.setImageResource(R.drawable.route_speaker_selected);
-            routeEarpiece.setImageResource(R.drawable.route_earpiece);
+            routeBluetooth.setSelected(false);
+            routeSpeaker.setSelected(true);
+            routeEarpiece.setSelected(false);
             hideOrDisplayAudioRoutes();
         } else if (id == R.id.call_pause) {
             Call call = (Call) v.getTag();
@@ -883,11 +875,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
         Core lc = LinphoneManager.getLc();
         isMicMuted = !isMicMuted;
         lc.enableMic(!isMicMuted);
-        if (isMicMuted) {
-            micro.setImageResource(R.drawable.micro_selected);
-        } else {
-            micro.setImageResource(R.drawable.micro_default);
-        }
+        micro.setSelected(isMicMuted);
     }
 
     protected void toggleSpeaker() {
@@ -898,14 +886,13 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
             else
                 LinphoneManager.getInstance().enableProximitySensing(!isSpeakerEnabled);
         }
+        speaker.setSelected(isSpeakerEnabled);
         if (isSpeakerEnabled) {
             LinphoneManager.getInstance().routeAudioToSpeaker();
-            speaker.setImageResource(R.drawable.speaker_selected);
             LinphoneManager.getInstance().enableSpeaker(isSpeakerEnabled);
         } else {
             Log.d("Toggle speaker off, routing back to earpiece");
             LinphoneManager.getInstance().routeAudioToReceiver();
-            speaker.setImageResource(R.drawable.speaker_default);
         }
     }
 
@@ -987,7 +974,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
                     conference.setVisibility(View.INVISIBLE);
                     displayVideoCall(false);
                     numpad.setVisibility(View.GONE);
-                    options.setImageResource(R.drawable.options_default);
+                    options.setSelected(false);
                 }
             }, SECONDS_BEFORE_HIDING_CONTROLS);
         }
@@ -1037,7 +1024,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
     private void hideOrDisplayCallOptions() {
         //Hide options
         if (addCall.getVisibility() == View.VISIBLE) {
-            options.setImageResource(R.drawable.options_default);
+            options.setSelected(false);
             if (isTransferAllowed) {
                 transfer.setVisibility(View.INVISIBLE);
             }
@@ -1049,7 +1036,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
             }
             addCall.setVisibility(View.VISIBLE);
             conference.setVisibility(View.VISIBLE);
-            options.setImageResource(R.drawable.options_selected);
+            options.setSelected(true);
             transfer.setEnabled(LinphoneManager.getLc().getCurrentCall() != null);
         }
     }
@@ -1363,7 +1350,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
         onCallStateChanged.setOnClickListener(this);
 
         if (call.getState() == State.Paused || call.getState() == State.PausedByRemote || call.getState() == State.Pausing) {
-            onCallStateChanged.setImageResource(R.drawable.pause);
+            onCallStateChanged.setSelected(false);
             isCallPaused = true;
             isInConference = false;
         } else if (call.getState() == State.OutgoingInit || call.getState() == State.OutgoingProgress || call.getState() == State.OutgoingRinging) {
diff --git a/src/android/org/linphone/fragments/DialerFragment.java b/src/android/org/linphone/fragments/DialerFragment.java
index b2885fc82..26d252385 100644
--- a/src/android/org/linphone/fragments/DialerFragment.java
+++ b/src/android/org/linphone/fragments/DialerFragment.java
@@ -209,7 +209,7 @@ public class DialerFragment extends Fragment {
                 mCall.setImageResource(R.drawable.call_audio_start);
             }
             mAddContact.setEnabled(false);
-            mAddContact.setImageResource(R.drawable.contact_add_button);
+            mAddContact.setImageResource(R.drawable.contact_add);
             mAddContact.setOnClickListener(addContactListener);
             enableDisableAddContact();
         }