diff --git a/res/drawable-xhdpi/call_alt_back.png b/res/drawable-xhdpi/call_alt_back.png
deleted file mode 100644
index 6af067d4f..000000000
Binary files a/res/drawable-xhdpi/call_alt_back.png and /dev/null differ
diff --git a/res/drawable-xhdpi/contacts_all_.png b/res/drawable-xhdpi/contacts_all_.png
deleted file mode 100644
index 07d00c6a2..000000000
Binary files a/res/drawable-xhdpi/contacts_all_.png and /dev/null differ
diff --git a/res/drawable-xhdpi/pause_big_default.png b/res/drawable-xhdpi/pause_default.png
similarity index 100%
rename from res/drawable-xhdpi/pause_big_default.png
rename to res/drawable-xhdpi/pause_default.png
diff --git a/res/drawable-xhdpi/pause_big_disabled.png b/res/drawable-xhdpi/pause_disabled.png
similarity index 100%
rename from res/drawable-xhdpi/pause_big_disabled.png
rename to res/drawable-xhdpi/pause_disabled.png
diff --git a/res/drawable-xhdpi/pause_big_over_selected.png b/res/drawable-xhdpi/pause_over_selected.png
similarity index 100%
rename from res/drawable-xhdpi/pause_big_over_selected.png
rename to res/drawable-xhdpi/pause_over_selected.png
diff --git a/res/drawable-xhdpi/pause_small_default.png b/res/drawable-xhdpi/pause_small_default.png
deleted file mode 100644
index c51c8f113..000000000
Binary files a/res/drawable-xhdpi/pause_small_default.png and /dev/null differ
diff --git a/res/drawable-xhdpi/pause_small_over_selected.png b/res/drawable-xhdpi/pause_small_over_selected.png
deleted file mode 100644
index f3b5a78a0..000000000
Binary files a/res/drawable-xhdpi/pause_small_over_selected.png and /dev/null differ
diff --git a/res/drawable/pause.xml b/res/drawable/pause.xml
index db65212ca..e472ae14a 100644
--- a/res/drawable/pause.xml
+++ b/res/drawable/pause.xml
@@ -1,8 +1,12 @@
 <?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/pause_disabled" />
+    <item android:state_selected="true"
+        android:drawable="@drawable/pause_over_selected" />
     <item android:state_pressed="true" 
-        android:drawable="@drawable/pause_small_over_selected" />
+        android:drawable="@drawable/pause_over_selected" />
     <item
-         android:drawable="@drawable/pause_small_default" />
+         android:drawable="@drawable/pause_default" />
 </selector>
 
diff --git a/res/layout-land/call.xml b/res/layout-land/call.xml
index cf5c8c257..d1912daf7 100644
--- a/res/layout-land/call.xml
+++ b/res/layout-land/call.xml
@@ -127,7 +127,7 @@
 
 						<ImageView
 							android:id="@+id/pause"
-							android:src="@drawable/pause_big_default"
+							android:src="@drawable/pause"
 							android:contentDescription="@string/content_description_pause"
 							android:layout_width="80dp"
 							android:layout_height="80dp"
diff --git a/res/layout-sw533dp-land/call.xml b/res/layout-sw533dp-land/call.xml
index c27a6f7fd..13a82f3c2 100644
--- a/res/layout-sw533dp-land/call.xml
+++ b/res/layout-sw533dp-land/call.xml
@@ -135,7 +135,7 @@
 
 						<ImageView
 							android:id="@+id/pause"
-							android:src="@drawable/pause_big_default"
+							android:src="@drawable/pause"
 							android:contentDescription="@string/content_description_pause"
 							android:layout_width="80dp"
 							android:layout_height="80dp"
diff --git a/res/layout/call.xml b/res/layout/call.xml
index df353c0e8..5293afc8f 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -123,7 +123,7 @@
 
 					<ImageView
 						android:id="@+id/pause"
-						android:src="@drawable/pause_big_default"
+						android:src="@drawable/pause"
 						android:contentDescription="@string/content_description_pause"
 						android:layout_width="80dp"
 						android:layout_height="80dp"
diff --git a/res/layout/call_inactive_row.xml b/res/layout/call_inactive_row.xml
index e1cb2818a..c0a955e0b 100644
--- a/res/layout/call_inactive_row.xml
+++ b/res/layout/call_inactive_row.xml
@@ -4,7 +4,6 @@
 	android:alpha="0.5"
 	android:layout_height="50dp"
 	android:layout_width="match_parent"
-	android:layout_margin="2dp"
 	android:gravity="center_vertical"
 	android:orientation="horizontal"
 	android:padding="5dp">
@@ -37,7 +36,7 @@
 
     <ImageView
 		android:id="@+id/call_pause"
-		android:src="@drawable/pause_small_over_selected"
+		android:src="@drawable/pause"
 		android:contentDescription="@string/content_description_pause"
         android:layout_width="40dp"
         android:layout_height="40dp"
diff --git a/res/layout/conference_header.xml b/res/layout/conference_header.xml
index 5d164af57..61f22c68c 100644
--- a/res/layout/conference_header.xml
+++ b/res/layout/conference_header.xml
@@ -38,7 +38,7 @@
         android:adjustViewBounds="true"
 		android:layout_centerInParent="true"
 		android:padding="10dp"
-        android:src="@drawable/pause_big_default"/>
+		android:src="@drawable/pause"/>
 
 	<View
 		android:layout_width="match_parent"
diff --git a/res/layout/conference_paused_row.xml b/res/layout/conference_paused_row.xml
index 1b7907a50..d55dbd687 100644
--- a/res/layout/conference_paused_row.xml
+++ b/res/layout/conference_paused_row.xml
@@ -29,7 +29,7 @@
 
     <ImageView
 		android:id="@+id/conference_pause"
-		android:src="@drawable/pause_small_over_selected"
+		android:src="@drawable/pause"
 		android:contentDescription="@string/content_description_pause"
         android:layout_width="40dp"
         android:layout_height="40dp"
diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java
index 26c9182cc..9f899e521 100644
--- a/src/android/org/linphone/call/CallActivity.java
+++ b/src/android/org/linphone/call/CallActivity.java
@@ -728,10 +728,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
     private void enabledPauseButton(boolean enabled) {
         if (enabled) {
             pause.setEnabled(true);
-            pause.setImageResource(R.drawable.pause_big_default);
         } else {
             pause.setEnabled(false);
-            pause.setImageResource(R.drawable.pause_big_disabled);
         }
     }
 
@@ -918,14 +916,14 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
             if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) {
                 isVideoCallPaused = true;
             }
-            pause.setImageResource(R.drawable.pause_big_over_selected);
+            pause.setSelected(true);
         } else if (call != null) {
             if (call.getState() == State.Paused) {
                 lc.resumeCall(call);
                 if (isVideoCallPaused) {
                     isVideoCallPaused = false;
                 }
-                pause.setImageResource(R.drawable.pause_big_default);
+                pause.setSelected(false);
             }
         }
     }
@@ -1496,10 +1494,10 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
         conferenceStatus = findViewById(R.id.conference_pause);
         if (conferenceStatus != null) {
             if (lc.isInConference()) {
-                conferenceStatus.setImageResource(R.drawable.pause_big_over_selected);
+                conferenceStatus.setSelected(true);
                 lc.leaveConference();
             } else {
-                conferenceStatus.setImageResource(R.drawable.pause_big_default);
+                conferenceStatus.setSelected(false);
                 lc.enterConference();
             }
         }
diff --git a/src/android/org/linphone/fragments/DialerFragment.java b/src/android/org/linphone/fragments/DialerFragment.java
index 019e7ed5b..b2885fc82 100644
--- a/src/android/org/linphone/fragments/DialerFragment.java
+++ b/src/android/org/linphone/fragments/DialerFragment.java
@@ -200,7 +200,7 @@ public class DialerFragment extends Fragment {
                 mCall.resetClickListener();
             }
             mAddContact.setEnabled(true);
-            mAddContact.setImageResource(R.drawable.call_alt_back);
+            mAddContact.setImageResource(R.drawable.call_back);
             mAddContact.setOnClickListener(cancelListener);
         } else {
             if (LinphoneManager.getLc().getVideoActivationPolicy().getAutomaticallyInitiate()) {