diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
index 5443cd53..8c6a62c3 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
@@ -315,9 +315,9 @@ public class MusicControllerActivity extends AbsFabActivity {
 
     private void setUpPrevNext() {
         nextButton.setImageDrawable(Util.getTintedDrawable(this,
-                R.drawable.ic_skip_next_white_48dp, DialogUtils.resolveColor(this, R.attr.themed_drawable_color)));
+                R.drawable.ic_skip_next_white_36dp, DialogUtils.resolveColor(this, R.attr.themed_drawable_color)));
         prevButton.setImageDrawable(Util.getTintedDrawable(this,
-                R.drawable.ic_skip_previous_white_48dp, DialogUtils.resolveColor(this, R.attr.themed_drawable_color)));
+                R.drawable.ic_skip_previous_white_36dp, DialogUtils.resolveColor(this, R.attr.themed_drawable_color)));
         nextButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -345,11 +345,11 @@ public class MusicControllerActivity extends AbsFabActivity {
     private void updateShuffleState() {
         switch (MusicPlayerRemote.getShuffleMode()) {
             case MusicService.SHUFFLE_MODE_SHUFFLE:
-                shuffleButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_shuffle_white_48dp,
+                shuffleButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_shuffle_white_36dp,
                         getThemeColorAccent() == Color.WHITE ? Color.BLACK : getThemeColorAccent()));
                 break;
             default:
-                shuffleButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_shuffle_white_48dp,
+                shuffleButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_shuffle_white_36dp,
                         DialogUtils.resolveColor(this, R.attr.themed_drawable_color)));
                 break;
         }
@@ -368,15 +368,15 @@ public class MusicControllerActivity extends AbsFabActivity {
     private void updateRepeatState() {
         switch (MusicPlayerRemote.getRepeatMode()) {
             case MusicService.REPEAT_MODE_NONE:
-                repeatButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_repeat_white_48dp,
+                repeatButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_repeat_white_36dp,
                         DialogUtils.resolveColor(this, R.attr.themed_drawable_color)));
                 break;
             case MusicService.REPEAT_MODE_ALL:
-                repeatButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_repeat_white_48dp,
+                repeatButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_repeat_white_36dp,
                         getThemeColorAccent() == Color.WHITE ? Color.BLACK : getThemeColorAccent()));
                 break;
             default:
-                repeatButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_repeat_one_white_48dp,
+                repeatButton.setImageDrawable(Util.getTintedDrawable(this, R.drawable.ic_repeat_one_white_36dp,
                         getThemeColorAccent() == Color.WHITE ? Color.BLACK : getThemeColorAccent()));
                 break;
         }
diff --git a/app/src/main/res/drawable-hdpi/ic_repeat_one_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_repeat_one_white_48dp.png
deleted file mode 100644
index 36ea5321..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_repeat_one_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_repeat_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_repeat_white_48dp.png
deleted file mode 100644
index 63f8de50..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_repeat_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_skip_next_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_skip_next_white_48dp.png
deleted file mode 100644
index 4fe60888..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_skip_next_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_skip_previous_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_skip_previous_white_48dp.png
deleted file mode 100644
index 2c9310af..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_skip_previous_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_repeat_one_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_repeat_one_white_48dp.png
deleted file mode 100644
index e4dfdbeb..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_repeat_one_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_repeat_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_repeat_white_48dp.png
deleted file mode 100644
index 72922006..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_repeat_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_skip_next_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_skip_next_white_48dp.png
deleted file mode 100644
index f282b924..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_skip_next_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_skip_previous_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_skip_previous_white_48dp.png
deleted file mode 100644
index 2522877d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_skip_previous_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-v21/colored_notification_selector.xml b/app/src/main/res/drawable-v21/colored_notification_selector.xml
index 1941b7a4..f0360419 100644
--- a/app/src/main/res/drawable-v21/colored_notification_selector.xml
+++ b/app/src/main/res/drawable-v21/colored_notification_selector.xml
@@ -1,7 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_dark">
-    <item android:id="@android:id/mask">
-        <color android:color="@color/white" />
-    </item>
-</ripple>
\ No newline at end of file
+    android:color="@color/ripple_material_dark" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/notification_selector.xml b/app/src/main/res/drawable-v21/notification_selector.xml
index 95959882..83aed83c 100644
--- a/app/src/main/res/drawable-v21/notification_selector.xml
+++ b/app/src/main/res/drawable-v21/notification_selector.xml
@@ -1,7 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_light">
-    <item android:id="@android:id/mask">
-        <color android:color="@color/white" />
-    </item>
-</ripple>
\ No newline at end of file
+    android:color="@color/ripple_material_light" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xhdpi/ic_repeat_one_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_repeat_one_white_48dp.png
deleted file mode 100644
index 5143bf81..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_repeat_one_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_repeat_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_repeat_white_48dp.png
deleted file mode 100644
index f3c28433..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_repeat_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_next_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_next_white_48dp.png
deleted file mode 100644
index 126b88c3..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_skip_next_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_48dp.png
deleted file mode 100644
index fcf2d0cf..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_repeat_one_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_repeat_one_white_48dp.png
deleted file mode 100644
index 875414e5..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_repeat_one_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_repeat_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_repeat_white_48dp.png
deleted file mode 100644
index 773e6a60..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_repeat_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_48dp.png
deleted file mode 100644
index 84df4f5e..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_skip_next_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_48dp.png
deleted file mode 100644
index b39b486c..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_repeat_one_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_repeat_one_white_48dp.png
deleted file mode 100755
index 0d7ca9c3..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_repeat_one_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_repeat_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_repeat_white_48dp.png
deleted file mode 100755
index 1dc6a5dd..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_repeat_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_48dp.png
deleted file mode 100755
index 47dcc949..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_white_48dp.png
deleted file mode 100755
index 33c0beab..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_skip_previous_white_48dp.png and /dev/null differ
diff --git a/app/src/main/res/layout/activity_music_controller.xml b/app/src/main/res/layout/activity_music_controller.xml
index bf74e10b..f8b421ab 100644
--- a/app/src/main/res/layout/activity_music_controller.xml
+++ b/app/src/main/res/layout/activity_music_controller.xml
@@ -125,7 +125,7 @@
                 android:elevation="8dp"
                 android:padding="22dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_skip_previous_white_48dp" />
+                android:src="@drawable/ic_skip_previous_white_36dp" />
 
             <ImageButton
                 android:id="@+id/next_button"
@@ -140,7 +140,7 @@
                 android:elevation="8dp"
                 android:padding="22dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_skip_next_white_48dp" />
+                android:src="@drawable/ic_skip_next_white_36dp" />
 
             <ImageButton
                 android:id="@+id/repeat_button"
@@ -155,7 +155,7 @@
                 android:elevation="8dp"
                 android:padding="22dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_repeat_white_48dp" />
+                android:src="@drawable/ic_repeat_white_36dp" />
 
             <ImageButton
                 android:id="@+id/shuffle_button"
@@ -170,7 +170,7 @@
                 android:elevation="8dp"
                 android:padding="22dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_shuffle_white_48dp" />
+                android:src="@drawable/ic_shuffle_white_36dp" />
 
             <android.support.design.widget.FloatingActionButton
                 android:id="@+id/fab"