diff --git a/VitamioBundle/res/layout/mediacontroller.xml b/VitamioBundle/res/layout/mediacontroller.xml
index 0128b2c..65b08da 100644
--- a/VitamioBundle/res/layout/mediacontroller.xml
+++ b/VitamioBundle/res/layout/mediacontroller.xml
@@ -40,63 +40,37 @@
 
             <ImageButton
                 android:id="@+id/mediacontroller_play_pause"
-                android:layout_width="30dip"
+                android:layout_width="54.6dip"
                 android:layout_height="30dip"
                 android:layout_centerHorizontal="true"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
                 android:background="#00000000"
                 android:contentDescription="@string/mediacontroller_play_pause"
                 android:gravity="center"
-                android:src="@android:drawable/ic_media_pause" />
+                android:src="@drawable/mediacontroller_pause_button" />
 
             <ImageButton
                 android:id="@+id/ImageButton01"
-                android:layout_width="30dip"
+                android:layout_width="54.6dip"
                 android:layout_height="30dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
+                android:layout_marginRight="20dp"
                 android:layout_toLeftOf="@+id/mediacontroller_play_pause"
                 android:background="#00000000"
                 android:gravity="center"
                 android:scaleType="fitCenter"
-                android:src="@android:drawable/ic_media_rew" />
+                android:src="@drawable/mediacontroller_ff_left" />
 
             <ImageButton
                 android:id="@+id/ImageButton02"
-                android:layout_width="30dip"
-                android:layout_height="30dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:layout_toRightOf="@+id/mediacontroller_play_pause"
-                android:background="#00000000"
-                android:gravity="center"
-                android:scaleType="fitCenter"
-                android:src="@android:drawable/ic_media_ff" />
-
-            <ImageButton
-                android:id="@+id/ImageButton04"
-                android:layout_width="30dip"
-                android:layout_height="30dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="20dip"
-                android:layout_toRightOf="@id/ImageButton02"
-                android:background="#00000000"
-                android:gravity="center"
-                android:scaleType="fitCenter"
-                android:src="@android:drawable/ic_media_next" />
-
-            <ImageButton
-                android:id="@+id/ImageButton03"
-                android:layout_width="30dip"
+                android:layout_width="54.6dip"
                 android:layout_height="30dip"
+                android:layout_alignParentTop="true"
                 android:layout_marginLeft="20dip"
-                android:layout_marginRight="10dip"
-                android:layout_toLeftOf="@id/ImageButton01"
+                android:layout_marginRight="40dip"
+                android:layout_toRightOf="@+id/mediacontroller_play_pause"
                 android:background="#00000000"
                 android:gravity="center"
                 android:scaleType="fitCenter"
-                android:src="@android:drawable/ic_media_previous" />
+                android:src="@drawable/mediacontroller_ff_right" />
 
         </RelativeLayout>
 
diff --git a/VitamioBundle/src/io/vov/vitamio/widget/MediaController.java b/VitamioBundle/src/io/vov/vitamio/widget/MediaController.java
index 8fc01ee..a695f03 100644
--- a/VitamioBundle/src/io/vov/vitamio/widget/MediaController.java
+++ b/VitamioBundle/src/io/vov/vitamio/widget/MediaController.java
@@ -20,7 +20,6 @@ package io.vov.vitamio.widget;
 import io.vov.utils.Log;
 import io.vov.utils.StringUtils;
 import io.vov.vitamio.R;
-import android.R.drawable;
 import android.content.Context;
 import android.graphics.Rect;
 import android.media.AudioManager;
@@ -469,9 +468,9 @@ public class MediaController extends FrameLayout {
 			return;
 
 		if (mPlayer.isPlaying())
-			mPauseButton.setImageResource(drawable.ic_media_pause);
+			mPauseButton.setImageResource(R.drawable.mediacontroller_pause_button);
 		else
-			mPauseButton.setImageResource(drawable.ic_media_play);
+			mPauseButton.setImageResource(R.drawable.mediacontroller_play_button);
 	}
 
 	private void doPauseResume() {